From a6062c4cdd2d03f7938d6312bd56c99c8b2b56a8 Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Thu, 3 Jan 2019 23:03:22 +0900
Subject: [PATCH 0001/1732] improved completion for ant

---
 share/completions/ant.fish                    | 33 ++++++++
 .../__fish_complete_ant_targets.fish          | 76 ++++++++++++++++---
 .../functions/__fish_filter_ant_targets.fish  |  3 -
 3 files changed, 97 insertions(+), 15 deletions(-)
 delete mode 100644 share/functions/__fish_filter_ant_targets.fish

diff --git a/share/completions/ant.fish b/share/completions/ant.fish
index a5448c4a6..82b82a7a0 100644
--- a/share/completions/ant.fish
+++ b/share/completions/ant.fish
@@ -1,3 +1,36 @@
+# Apache Ant (1.9.5) completion for Fish Shell.
 
+# completion for ant targets
 complete -x -c ant -a "(__fish_complete_ant_targets)"
 
+# 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 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 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'
+complete -f -c ant -o debug -s d -d 'print debugging information'
+complete -f -c ant -o emacs -s e -d 'produce logging information without adornments'
+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 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'
+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 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 main -d 'override Ant\'s normal entry point'
diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
index e93b855c6..f7324006c 100644
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -1,16 +1,68 @@
 function __fish_complete_ant_targets -d "Print list of targets from build.xml and imported files"
-    set -l buildfile "build.xml"
-    if test -f $buildfile
-        # show ant targets
-        __fish_filter_ant_targets $buildfile
-
-        # find files with buildfile
-        set files (sed -n "s/^.*<import[^>]* file=[\"']\([^\"']*\)[\"'].*\$/\1/p" < $buildfile)
-
-        # iterate through files and display their targets
-        for file in $files
-
-            __fish_filter_ant_targets $file
+    function __filter_xml_start_tag -d "Filter xml start-tags in a buildfile"
+        set -l buildfile $argv[1] # full path to buildfile
+        set -l tag_pattern $argv[2] # regex pattern for tagname
+        # regex to filter start-tags ignoring newlines and '>' in attr values
+        # https://www.debuggex.com/r/wRgxHE1yTIgnjfNz
+        string join ' ' <$buildfile | string match -ar "<(?:$tag_pattern)(?:[^>\"']*?(?:(?:'[^']*?')|(?:\"[^\"]*\"))?)*?>"
+    end
+    function __filter_xml_attr_value -d "Filter xml attr value in a start-tag"
+        set -l tag $argv[1] # start-tag
+        set -l attr $argv[2] # attr name
+        # regex to filter attr values ignoring (single|double) quotes in attr values
+        # https://www.debuggex.com/r/x7lhtLJSP4msleik
+        string replace -rf "^.*$attr=((?:'(?:.*?)')|(?:\"(?:.*?)\")).*\$" '$1' $tag | string trim -c='"\''
+    end
+    function __get_buildfile -d "Get a buildfile that will be used by ant"
+        set -l tokens $argv # tokens from 'commandline -co'
+        set -l prev $tokens[1]
+        set -l buildfile "build.xml"
+        for token in $argv[2..-1]
+            switch $prev
+                case -buildfile -file -f
+                    set buildfile (eval echo $token)
+            end
+            set prev $token
+        end
+        # return last one
+        echo $buildfile
+    end
+    function __parse_ant_targets -d "Parse ant targets in the given build file"
+        set -l buildfile $argv[1] # full path to buildfile
+        set -l targets (__filter_xml_start_tag $buildfile 'target|extension-point')
+        for target in $targets
+            set -l target_name (__filter_xml_attr_value $target 'name')
+            if [ $status -eq 0 ]
+                set -l target_description (__filter_xml_attr_value $target 'description')
+                if [ $status -eq 0 ]
+                    echo $target_name\t$target_description
+                else
+                    echo $target_name
+                end
+            end
         end
     end
+    function __get_ant_targets -d "Get ant targets recursively"
+        set -l buildfile $argv[1] # full path to buildfile
+        __parse_ant_targets $buildfile
+
+        set -l basedir (string split -r -m 1 / $buildfile)[1]
+        set -l imports (__filter_xml_start_tag $buildfile 'import')
+        for import in $imports
+            set -l filepath (__filter_xml_attr_value $import 'file')
+            # Set basedir if $filepath is not a full path
+            if string match -rvq '^/.*' $filepath
+                set filename $basedir/$filepath
+            end
+            if [ -f $filepath ]
+                __get_ant_targets $filepath
+            end
+        end
+    end
+
+    set -l tokens (commandline -co)
+    set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
+    if [ $status -eq 0 ]
+        __get_ant_targets $buildfile
+    end
 end
diff --git a/share/functions/__fish_filter_ant_targets.fish b/share/functions/__fish_filter_ant_targets.fish
deleted file mode 100644
index 242cdb0bc..000000000
--- a/share/functions/__fish_filter_ant_targets.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_filter_ant_targets -d "Display targets within an ant build.xml file"
-    sed -n "s/^.*<target[^>]* name=[\"']\([^\"']*\)[\"'].*\$/\1/p" <$argv[1]
-end

From 48ed82b3f3590e415a955d4a4e97095a3fd377e3 Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Thu, 3 Jan 2019 23:33:21 +0900
Subject: [PATCH 0002/1732] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 708f924fc..9a8e0acb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
  - nothing yet...
 - Lots of improvements to completions.
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
-
+ - Improved completion for `ant`.
 ---
 
 # fish 3.0.0 (released December 28, 2018)

From 078907ef9dbe7ca3ea4787ebf1f8ceb5771c14ee Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Thu, 3 Jan 2019 23:59:56 +0900
Subject: [PATCH 0003/1732] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a8e0acb1..c08e1812a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
  - nothing yet...
 - Lots of improvements to completions.
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
- - Improved completion for `ant`.
+ - Improved completion for `ant` (#5475).
 ---
 
 # fish 3.0.0 (released December 28, 2018)

From 480e95147cc375df9967568fbeac7f5c32bf0184 Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Sun, 13 Jan 2019 21:36:05 +0900
Subject: [PATCH 0004/1732] use cache file for ant targets

---
 share/completions/ant.fish                    |  2 +-
 .../__fish_complete_ant_targets.fish          | 68 ++++++++-----------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/share/completions/ant.fish b/share/completions/ant.fish
index 82b82a7a0..7436876cb 100644
--- a/share/completions/ant.fish
+++ b/share/completions/ant.fish
@@ -1,7 +1,7 @@
 # Apache Ant (1.9.5) completion for Fish Shell.
 
 # completion for ant targets
-complete -x -c ant -a "(__fish_complete_ant_targets)"
+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'
diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
index f7324006c..d3013bb7b 100644
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -1,18 +1,4 @@
 function __fish_complete_ant_targets -d "Print list of targets from build.xml and imported files"
-    function __filter_xml_start_tag -d "Filter xml start-tags in a buildfile"
-        set -l buildfile $argv[1] # full path to buildfile
-        set -l tag_pattern $argv[2] # regex pattern for tagname
-        # regex to filter start-tags ignoring newlines and '>' in attr values
-        # https://www.debuggex.com/r/wRgxHE1yTIgnjfNz
-        string join ' ' <$buildfile | string match -ar "<(?:$tag_pattern)(?:[^>\"']*?(?:(?:'[^']*?')|(?:\"[^\"]*\"))?)*?>"
-    end
-    function __filter_xml_attr_value -d "Filter xml attr value in a start-tag"
-        set -l tag $argv[1] # start-tag
-        set -l attr $argv[2] # attr name
-        # regex to filter attr values ignoring (single|double) quotes in attr values
-        # https://www.debuggex.com/r/x7lhtLJSP4msleik
-        string replace -rf "^.*$attr=((?:'(?:.*?)')|(?:\"(?:.*?)\")).*\$" '$1' $tag | string trim -c='"\''
-    end
     function __get_buildfile -d "Get a buildfile that will be used by ant"
         set -l tokens $argv # tokens from 'commandline -co'
         set -l prev $tokens[1]
@@ -27,42 +13,42 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
         # return last one
         echo $buildfile
     end
-    function __parse_ant_targets -d "Parse ant targets in the given build file"
+    function __parse_ant_targets_from_projecthelp -d "Parse ant targets from projecthelp"
         set -l buildfile $argv[1] # full path to buildfile
-        set -l targets (__filter_xml_start_tag $buildfile 'target|extension-point')
+        set -l targets (ant -p -debug -f $buildfile 2> /dev/null | string match -r '^\s\S+.*$' $projecthelp)
         for target in $targets
-            set -l target_name (__filter_xml_attr_value $target 'name')
-            if [ $status -eq 0 ]
-                set -l target_description (__filter_xml_attr_value $target 'description')
-                if [ $status -eq 0 ]
-                    echo $target_name\t$target_description
-                else
-                    echo $target_name
-                end
+            set -l tokens (string match -r '^\s([[:graph:]]+)(?:\s+([[:print:]]+))?' "$target")
+            if [ (count $tokens) -ge 3 ]
+                echo $tokens[2]\t$tokens[3]
+            else if [ (count $tokens) -ge 2 ]
+                echo $tokens[2]
             end
         end
     end
-    function __get_ant_targets -d "Get ant targets recursively"
+    function __get_ant_targets_from_projecthelp -d "Get ant targets from projecthelp"
         set -l buildfile $argv[1] # full path to buildfile
-        __parse_ant_targets $buildfile
 
-        set -l basedir (string split -r -m 1 / $buildfile)[1]
-        set -l imports (__filter_xml_start_tag $buildfile 'import')
-        for import in $imports
-            set -l filepath (__filter_xml_attr_value $import 'file')
-            # Set basedir if $filepath is not a full path
-            if string match -rvq '^/.*' $filepath
-                set filename $basedir/$filepath
-            end
-            if [ -f $filepath ]
-                __get_ant_targets $filepath
-            end
+        set -l cache_dir
+        if [ \( -n $__fish_user_data_dir \) -a \( -d $__fish_user_data_dir \) ]
+            set cache_dir $__fish_user_data_dir/ant_completions
+        else
+            set cache_dir "$HOME/.local/share/fish/ant_completions"
         end
+        mkdir -p $cache_dir
+
+        set -l cache_file $cache_dir/(string escape --style=var $buildfile)
+        if [ ! -s $cache_file ]
+            # generate cache file if empty
+            __parse_ant_targets_from_projecthelp $buildfile > $cache_file
+        end
+
+        cat $cache_file
     end
 
-    set -l tokens (commandline -co)
-    set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
-    if [ $status -eq 0 ]
-        __get_ant_targets $buildfile
+    set -l tokens $argv
+    if not set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
+        return 1 # return nothing if buildfile does not exist
     end
+
+    __get_ant_targets_from_projecthelp $buildfile
 end

From 71f15f70ea90c2fc447b2202ff9e242268c50fee Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Mon, 14 Jan 2019 13:08:29 +0900
Subject: [PATCH 0005/1732] Fixed logic for cache file generation

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

diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
index d3013bb7b..0b50a39da 100644
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -15,8 +15,9 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
     end
     function __parse_ant_targets_from_projecthelp -d "Parse ant targets from projecthelp"
         set -l buildfile $argv[1] # full path to buildfile
-        set -l targets (ant -p -debug -f $buildfile 2> /dev/null | string match -r '^\s\S+.*$' $projecthelp)
+        set -l targets (ant -p -debug -f $buildfile 2> /dev/null | string match -r '^\s[[:graph:]].*$')
         for target in $targets
+            # Use [[:graph:]] and [[:print:]] to ignore ANSI escape code
             set -l tokens (string match -r '^\s([[:graph:]]+)(?:\s+([[:print:]]+))?' "$target")
             if [ (count $tokens) -ge 3 ]
                 echo $tokens[2]\t$tokens[3]
@@ -28,16 +29,14 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
     function __get_ant_targets_from_projecthelp -d "Get ant targets from projecthelp"
         set -l buildfile $argv[1] # full path to buildfile
 
-        set -l cache_dir
-        if [ \( -n $__fish_user_data_dir \) -a \( -d $__fish_user_data_dir \) ]
-            set cache_dir $__fish_user_data_dir/ant_completions
-        else
-            set cache_dir "$HOME/.local/share/fish/ant_completions"
+        if [ \( -z "$XDG_CACHE_HOME" \) -o \( ! -d "$XDG_CACHE_HOME" \) ]
+            set XDG_CACHE_HOME "$HOME/.cache/"
         end
+        set -l cache_dir "$XDG_CACHE_HOME/fish/ant_completions"
         mkdir -p $cache_dir
 
-        set -l cache_file $cache_dir/(string escape --style=var $buildfile)
-        if [ ! -s $cache_file ]
+        set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
+        if [ ! -s "$cache_file" ]
             # generate cache file if empty
             __parse_ant_targets_from_projecthelp $buildfile > $cache_file
         end

From 2c52c5285d12a10f6fed243e75c6b013fb7ccb89 Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Thu, 17 Jan 2019 16:32:57 +0900
Subject: [PATCH 0006/1732] Fix fail back value for XDG_CACHE_HOME

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

diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
index 0b50a39da..3203b2060 100644
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -30,8 +30,9 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
         set -l buildfile $argv[1] # full path to buildfile
 
         if [ \( -z "$XDG_CACHE_HOME" \) -o \( ! -d "$XDG_CACHE_HOME" \) ]
-            set XDG_CACHE_HOME "$HOME/.cache/"
+            set XDG_CACHE_HOME "$HOME/.cache"
         end
+
         set -l cache_dir "$XDG_CACHE_HOME/fish/ant_completions"
         mkdir -p $cache_dir
 

From 9a7079190d01c4f831d35c3afd4af61a6dbe61ba Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Fri, 18 Jan 2019 10:24:14 +0900
Subject: [PATCH 0007/1732] change validation of buildfile

---
 share/functions/__fish_complete_ant_targets.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 share/functions/__fish_complete_ant_targets.fish

diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
old mode 100644
new mode 100755
index 3203b2060..3c216b044
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -46,7 +46,8 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
     end
 
     set -l tokens $argv
-    if not set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
+    set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
+    if [ $status -ne 0 ]
         return 1 # return nothing if buildfile does not exist
     end
 

From 65d4f1b74e166250cf1b29386e431058971224a3 Mon Sep 17 00:00:00 2001
From: wyahiro <wyahiro@indeed.com>
Date: Mon, 21 Jan 2019 16:35:48 +0900
Subject: [PATCH 0008/1732] Format CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36503d94a..5f9070a9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
 - mandoc can now be used to format the output from `--help` if nroff is not installed
 
+
+=======
 # fish 3.0.1
 
 ### Fixes and improvements
@@ -23,6 +25,7 @@
 - exec now behaves properly inside functions (#5449)
 - while loops now evaluate to the last executed command in the loop body (or zero if the body was empty), matching POSIX semantics.
 
+
 # fish 3.0.0 (released December 28, 2018)
 
 fish 3 is a major release, which introduces some breaking changes alongside improved functionality. Although most existing scripts will continue to work, they should be reviewed against the list contained in the 3.0b1 release notes below.

From 0071ad040940baf82c9c8192e76fae9971571d16 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Tue, 26 Feb 2019 05:59:46 +0000
Subject: [PATCH 0009/1732] add __fish_status_to_signal.fish and
 __fish_pipestatus_with_signal.fish

---
 .../__fish_pipestatus_with_signal.fish        |  5 +++++
 share/functions/__fish_status_to_signal.fish  | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 share/functions/__fish_pipestatus_with_signal.fish
 create mode 100644 share/functions/__fish_status_to_signal.fish

diff --git a/share/functions/__fish_pipestatus_with_signal.fish b/share/functions/__fish_pipestatus_with_signal.fish
new file mode 100644
index 000000000..e85d1b79c
--- /dev/null
+++ b/share/functions/__fish_pipestatus_with_signal.fish
@@ -0,0 +1,5 @@
+function __fish_pipestatus_with_signal --description "Print arguments from \$pipestatus replacing values with signal names where appropriate"
+    for pstat in $argv
+        echo (__fish_status_to_signal $pstat)
+    end
+end
diff --git a/share/functions/__fish_status_to_signal.fish b/share/functions/__fish_status_to_signal.fish
new file mode 100644
index 000000000..de07dcb64
--- /dev/null
+++ b/share/functions/__fish_status_to_signal.fish
@@ -0,0 +1,22 @@
+function __fish_status_to_signal --description "Print signal name from argument (\$status), or just argument"
+    if test (count $argv) -ne 1
+        echo "expected single argument as integer from \$status" >&2
+        return 1
+    end
+
+    if test $argv[1] -gt 128
+        set -l signals SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGABRT SIGBUS \
+            SIGFPE SIGKILL SIGUSR1 SIGSEGV SIGUSR2 SIGPIPE SIGALRM \
+            SIGTERM SIGSTKFLT SIGCHLD SIGCONT SIGSTOP SIGTSTP \
+            SIGTTIN SIGTTOU SIGURG SIGXCPU SIGXFSZ SIGVTALRM \
+            SIGPROF SIGWINCH SIGIO SIGPWR SIGSYS
+        set -l sigix (math $argv[1] - 128)
+        if test $sigix -le (count $signals)
+            echo $signals[$sigix]
+            return 0
+        end
+    end
+
+    echo $argv[1]
+    return 0
+end

From 378b5d7295a1a42fa09fbfcd7df52c8f9338d700 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Tue, 26 Feb 2019 18:06:36 +0000
Subject: [PATCH 0010/1732] update classic_status.fish prompt to include
 $pipestatus

---
 .../web_config/sample_prompts/classic_status.fish | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index 4023a717c..c117ab501 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -3,10 +3,23 @@
 
 function fish_prompt --description "Write out the prompt"
     # Save our status
+    set -l last_pipestatus $pipestatus
     set -l last_status $status
 
+    # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
+    # TODO maybe have a common function that returns true if all array elements match a certain value?
+    if test (count $last_pipestatus) -gt 1
+        for pstat in $last_pipestatus
+            if test $pstat -ne 0
+                set -l last_pipestatus_string (string join "|" (__fish_pipestatus_with_signal $last_pipestatus))
+                printf "%s[%s]%s " (set_color yellow --bold) $last_pipestatus_string (set_color normal)
+                break
+            end
+        end
+    end
+
     if test $last_status -ne 0
-        printf "%s(%d)%s " (set_color red --bold) $last_status (set_color normal)
+        printf "%s(%s)%s " (set_color red --bold) (__fish_status_to_signal $last_status) (set_color normal)
     end
 
     set -l color_cwd

From a6f91409633ae3e489149b0b4996dc2f10a1030c Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Wed, 27 Feb 2019 05:39:17 +0000
Subject: [PATCH 0011/1732] remove redundant echo from
 __fish_pipestatus_with_signal.fish

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

diff --git a/share/functions/__fish_pipestatus_with_signal.fish b/share/functions/__fish_pipestatus_with_signal.fish
index e85d1b79c..b8c0fa35d 100644
--- a/share/functions/__fish_pipestatus_with_signal.fish
+++ b/share/functions/__fish_pipestatus_with_signal.fish
@@ -1,5 +1,5 @@
 function __fish_pipestatus_with_signal --description "Print arguments from \$pipestatus replacing values with signal names where appropriate"
     for pstat in $argv
-        echo (__fish_status_to_signal $pstat)
+         __fish_status_to_signal $pstat
     end
 end

From 8ebbe67ff1d0b02c55e7fa0ad0bd6b11bd1e7f7c Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Wed, 27 Feb 2019 06:11:03 +0000
Subject: [PATCH 0012/1732] Use `string match` instead of `for` loop to
 simplify classic_status.fish

---
 .../web_config/sample_prompts/classic_status.fish    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index c117ab501..0618fc9bd 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -7,15 +7,9 @@ function fish_prompt --description "Write out the prompt"
     set -l last_status $status
 
     # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
-    # TODO maybe have a common function that returns true if all array elements match a certain value?
-    if test (count $last_pipestatus) -gt 1
-        for pstat in $last_pipestatus
-            if test $pstat -ne 0
-                set -l last_pipestatus_string (string join "|" (__fish_pipestatus_with_signal $last_pipestatus))
-                printf "%s[%s]%s " (set_color yellow --bold) $last_pipestatus_string (set_color normal)
-                break
-            end
-        end
+    if test (count $last_pipestatus) -gt 1 && string match -qvr '^0$' $last_pipestatus
+        set -l last_pipestatus_string (string join "|" (__fish_pipestatus_with_signal $last_pipestatus))
+        printf "%s[%s]%s " (set_color yellow --bold) $last_pipestatus_string (set_color normal)
     end
 
     if test $last_status -ne 0

From ead26881f05b496fe7988653b4239a04f988b278 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Thu, 28 Feb 2019 06:19:09 +0000
Subject: [PATCH 0013/1732] create __fish_print_pipestatus function to reduce
 code duplication in other prompts when adding `$pipestatus`

---
 share/functions/__fish_print_pipestatus.fish  | 19 +++++++++++++++++++
 .../sample_prompts/classic_status.fish        |  6 +-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 share/functions/__fish_print_pipestatus.fish

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
new file mode 100644
index 000000000..9110d92f5
--- /dev/null
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -0,0 +1,19 @@
+function __fish_print_pipestatus --description "Print pipestatus for prompt"
+    # maybe these could be in global variables similar to __fish_color_status to allow
+    # users to set the variables to modify the braces/separator/color used
+    set -l left_brace $argv[1]
+    set -l right_brace $argv[2]
+    set -l separator $argv[3]
+    set -l brace_sep_color $argv[4]
+    set -l status_color $argv[5]
+    set -e argv[1 2 3 4 5]
+
+    # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
+    if set -q argv[2] && string match -qvr '^0$' $argv
+        set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
+        set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
+        printf "%s%s%s%s%s%s%s%s%s" $brace_sep_color $left_brace (set_color normal) \
+               $status_color $last_pipestatus_string (set_color normal) $brace_sep_color \
+               $right_brace (set_color normal)
+    end
+end
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index 0618fc9bd..b84af5ebf 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -6,11 +6,7 @@ function fish_prompt --description "Write out the prompt"
     set -l last_pipestatus $pipestatus
     set -l last_status $status
 
-    # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
-    if test (count $last_pipestatus) -gt 1 && string match -qvr '^0$' $last_pipestatus
-        set -l last_pipestatus_string (string join "|" (__fish_pipestatus_with_signal $last_pipestatus))
-        printf "%s[%s]%s " (set_color yellow --bold) $last_pipestatus_string (set_color normal)
-    end
+    __fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus
 
     if test $last_status -ne 0
         printf "%s(%s)%s " (set_color red --bold) (__fish_status_to_signal $last_status) (set_color normal)

From e157ba131b82f2e788a0656390b94b79acb21a3b Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Thu, 28 Feb 2019 06:37:56 +0000
Subject: [PATCH 0014/1732] add `$pipestatus` to informative.fish prompt

---
 share/functions/__fish_print_pipestatus.fish           | 6 +++---
 share/tools/web_config/sample_prompts/informative.fish | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 9110d92f5..6851d7791 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -12,8 +12,8 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
     if set -q argv[2] && string match -qvr '^0$' $argv
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
-        printf "%s%s%s%s%s%s%s%s%s" $brace_sep_color $left_brace (set_color normal) \
-               $status_color $last_pipestatus_string (set_color normal) $brace_sep_color \
-               $right_brace (set_color normal)
+        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
+               (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
+               $brace_sep_color $right_brace (set_color normal)
     end
 end
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 223a9a251..80a0cb3f0 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -4,6 +4,7 @@
 
 function fish_prompt --description 'Write out the prompt'
     #Save the return status of the previous command
+    set -l last_pipestatus $pipestatus
     set stat $status
 
     if not set -q __fish_prompt_normal
@@ -39,8 +40,8 @@ function fish_prompt --description 'Write out the prompt'
             if not set -q __fish_prompt_cwd
                 set -g __fish_prompt_cwd (set_color $fish_color_cwd)
             end
-
-            printf '[%s] %s%s@%s %s%s %s(%s)%s \f\r> ' (date "+%H:%M:%S") "$__fish_color_blue" $USER (prompt_hostname) "$__fish_prompt_cwd" "$PWD" "$__fish_color_status" "$stat" "$__fish_prompt_normal"
+            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
+            printf '[%s] %s%s@%s %s%s %s%s(%s)%s \f\r> ' (date "+%H:%M:%S") "$__fish_color_blue" $USER (prompt_hostname) "$__fish_prompt_cwd" "$PWD" "$pipestatus_string" "$__fish_color_status" "$stat" "$__fish_prompt_normal"
 
     end
 end

From d5c18350a76d514b3c56cb9a683e30e2f5fe6f19 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Fri, 1 Mar 2019 19:55:28 +0000
Subject: [PATCH 0015/1732] use global variables for `$pipestatus` in prompts
 to allow users to customize the look

---
 share/functions/__fish_print_pipestatus.fish | 38 ++++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 6851d7791..ecd0ec989 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -1,19 +1,35 @@
 function __fish_print_pipestatus --description "Print pipestatus for prompt"
-    # maybe these could be in global variables similar to __fish_color_status to allow
-    # users to set the variables to modify the braces/separator/color used
-    set -l left_brace $argv[1]
-    set -l right_brace $argv[2]
-    set -l separator $argv[3]
-    set -l brace_sep_color $argv[4]
-    set -l status_color $argv[5]
+
+    # allow users to customize these variables
+    if not set -q __fish_prompt_pipestatus_left_brace
+        set -g __fish_prompt_pipestatus_left_brace $argv[1]
+    end
+
+    if not set -q __fish_prompt_pipestatus_right_brace
+        set -g __fish_prompt_pipestatus_right_brace $argv[2]
+    end
+
+    if not set -q __fish_prompt_pipestatus_separator
+        set -g __fish_prompt_pipestatus_separator $argv[3]
+    end
+
+    if not set -q __fish_prompt_pipestatus_brace_sep_color
+        set -g __fish_prompt_pipestatus_brace_sep_color $argv[4]
+    end
+
+    if not set -q __fish_prompt_pipestatus_color
+        set -g __fish_prompt_pipestatus_color $argv[5]
+    end
+
     set -e argv[1 2 3 4 5]
 
     # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
     if set -q argv[2] && string match -qvr '^0$' $argv
-        set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
+        set -l sep (set_color normal){$__fish_prompt_pipestatus_brace_sep_color}{$__fish_prompt_pipestatus_separator}(set_color normal){$__fish_prompt_pipestatus_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
-        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
-               (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
-               $brace_sep_color $right_brace (set_color normal)
+        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal) $__fish_prompt_pipestatus_brace_sep_color \
+            $__fish_prompt_pipestatus_left_brace (set_color normal) $__fish_prompt_pipestatus_color \
+            $last_pipestatus_string (set_color normal) $__fish_prompt_pipestatus_brace_sep_color \
+            $__fish_prompt_pipestatus_right_brace (set_color normal)
     end
 end

From 0923712e3e243cd9e67e9138df7a3e0e611b674b Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Mon, 4 Mar 2019 18:14:42 +0000
Subject: [PATCH 0016/1732] add `$pipestatus` to informative_vcs.fish prompt

---
 share/tools/web_config/sample_prompts/informative_vcs.fish | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index a9eeeace8..99645fdaa 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -4,6 +4,7 @@
 
 
 function fish_prompt --description 'Write out the prompt'
+    set -l last_pipestatus $pipestatus
     set -l last_status $status
 
     if not set -q __fish_git_prompt_show_informative_status
@@ -88,6 +89,9 @@ function fish_prompt --description 'Write out the prompt'
 
     printf '%s ' (fish_vcs_prompt)
 
+    set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
+    echo -n "$pipestatus_string"
+
     if not test $last_status -eq 0
         set_color $fish_color_error
         echo -n "[$last_status] "

From da2925bad74f53fcf0c2c20d886326a90df4b872 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Mon, 4 Mar 2019 18:25:18 +0000
Subject: [PATCH 0017/1732] add `$pipestatus` to classic_vcs.fish prompt

---
 share/tools/web_config/sample_prompts/classic_vcs.fish | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 01608b958..768e782d3 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -3,6 +3,7 @@
 # vim: set noet:
 
 function fish_prompt --description 'Write out the prompt'
+    set -l last_pipestatus $pipestatus
     set -l last_status $status
     set -l normal (set_color normal)
 
@@ -62,9 +63,9 @@ function fish_prompt --description 'Write out the prompt'
             set suffix '>'
     end
 
-    set -l prompt_status
+    set -l prompt_status (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
     if test $last_status -ne 0
-        set prompt_status ' ' (set_color $fish_color_status) "[$last_status]" "$normal"
+        set prompt_status " $prompt_status" (set_color $fish_color_status) "[$last_status]" "$normal"
     end
 
     echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "

From d71e39f7562e3b5a9f925b9486dae3bc33058e78 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Tue, 5 Mar 2019 18:19:57 +0000
Subject: [PATCH 0018/1732] Revert "use global variables for `$pipestatus` in
 prompts to allow users to customize the look"

This reverts commit d5c18350a76d514b3c56cb9a683e30e2f5fe6f19.
---
 share/functions/__fish_print_pipestatus.fish | 38 ++++++--------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index ecd0ec989..6851d7791 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -1,35 +1,19 @@
 function __fish_print_pipestatus --description "Print pipestatus for prompt"
-
-    # allow users to customize these variables
-    if not set -q __fish_prompt_pipestatus_left_brace
-        set -g __fish_prompt_pipestatus_left_brace $argv[1]
-    end
-
-    if not set -q __fish_prompt_pipestatus_right_brace
-        set -g __fish_prompt_pipestatus_right_brace $argv[2]
-    end
-
-    if not set -q __fish_prompt_pipestatus_separator
-        set -g __fish_prompt_pipestatus_separator $argv[3]
-    end
-
-    if not set -q __fish_prompt_pipestatus_brace_sep_color
-        set -g __fish_prompt_pipestatus_brace_sep_color $argv[4]
-    end
-
-    if not set -q __fish_prompt_pipestatus_color
-        set -g __fish_prompt_pipestatus_color $argv[5]
-    end
-
+    # maybe these could be in global variables similar to __fish_color_status to allow
+    # users to set the variables to modify the braces/separator/color used
+    set -l left_brace $argv[1]
+    set -l right_brace $argv[2]
+    set -l separator $argv[3]
+    set -l brace_sep_color $argv[4]
+    set -l status_color $argv[5]
     set -e argv[1 2 3 4 5]
 
     # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
     if set -q argv[2] && string match -qvr '^0$' $argv
-        set -l sep (set_color normal){$__fish_prompt_pipestatus_brace_sep_color}{$__fish_prompt_pipestatus_separator}(set_color normal){$__fish_prompt_pipestatus_color}
+        set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
-        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal) $__fish_prompt_pipestatus_brace_sep_color \
-            $__fish_prompt_pipestatus_left_brace (set_color normal) $__fish_prompt_pipestatus_color \
-            $last_pipestatus_string (set_color normal) $__fish_prompt_pipestatus_brace_sep_color \
-            $__fish_prompt_pipestatus_right_brace (set_color normal)
+        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
+               (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
+               $brace_sep_color $right_brace (set_color normal)
     end
 end

From a634356bcca3845e5445d7a13e963d06b28bdc74 Mon Sep 17 00:00:00 2001
From: zabereer <albertpretorius@yahoo.co.uk>
Date: Tue, 5 Mar 2019 18:25:16 +0000
Subject: [PATCH 0019/1732] remove redundant comment from
 __fish_print_pipestatus.fish

---
 share/functions/__fish_print_pipestatus.fish | 2 --
 1 file changed, 2 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 6851d7791..1cec49653 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -1,6 +1,4 @@
 function __fish_print_pipestatus --description "Print pipestatus for prompt"
-    # maybe these could be in global variables similar to __fish_color_status to allow
-    # users to set the variables to modify the braces/separator/color used
     set -l left_brace $argv[1]
     set -l right_brace $argv[2]
     set -l separator $argv[3]

From c633c06e11adace516cd8202916106f590cf1b05 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 6 Mar 2019 22:07:03 +0100
Subject: [PATCH 0020/1732] Guess emoji width via system wcwidth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since Unicode 9, the width of some characters changed to 2.

Depending on the system, it might have support for it, or it might
not.

Instead of hardcoding specific glibc etc versions, we check what the
system wcwidth says to "😃", U+1F603 "Grinning Face With Big Eyes".

The intention is to, in most cases, make setting $fish_emoji_width
unnecessary, but since it sets the "guessed_emoji_width", that variable still takes precedence if it is set.

Unfortunately this approach has some caveats:

- It relies on the locale being set to a unicode-supporting one.
  (C.UTF-8 is unfortunately not standard, so we can't use it)
- It relies on the terminal's wcwidth having unicode9 support IFF the
  system wcwidth does.

This is like #5722, but at runtime.

The additional caveat is that we don't try to achieve a unicode
locale, but since we re-run the heuristic when the locale changes (and
we try to get a unicode locale), we should still often get the correct
value.

Plus if you use a C locale and your terminal still displays emoji,
you've misconfigured your system.

Fixes #5722.
---
 src/env.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 56da4dd20..b30ec18ed 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -561,16 +561,22 @@ static void guess_emoji_width() {
         version = strtod(narrow_version.c_str(), NULL);
     }
 
-    // iTerm2 defaults to Unicode 8 sizes.
-    // See https://gitlab.com/gnachman/iterm2/wikis/unicodeversionswitching
 
     if (term == L"Apple_Terminal" && version >= 400) {
         // Apple Terminal on High Sierra
         g_guessed_fish_emoji_width = 2;
         debug(2, "default emoji width: 2 for %ls", term.c_str());
-    } else {
+    } else if (term == L"iTerm.app") {
+        // iTerm2 defaults to Unicode 8 sizes.
+        // See https://gitlab.com/gnachman/iterm2/wikis/unicodeversionswitching
         g_guessed_fish_emoji_width = 1;
         debug(2, "default emoji width: 1");
+    } else {
+        // Default to whatever system wcwidth says to U+1F603,
+        // but only if it's at least 1.
+        int w = wcwidth(L'😃');
+        g_guessed_fish_emoji_width = w > 0 ? w : 1;
+        debug(2, "default emoji width: %d", g_guessed_fish_emoji_width);
     }
 }
 
@@ -849,6 +855,8 @@ static void handle_locale_change(const wcstring &op, const wcstring &var_name, e
     UNUSED(op);
     UNUSED(var_name);
     init_locale(vars);
+    // We need to re-guess emoji width because the locale might have changed to a multibyte one.
+    guess_emoji_width();
 }
 
 static void handle_curses_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {

From 91e70e38e76f94e77106c61eec841ffb22cc509d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 6 Mar 2019 13:52:20 -0800
Subject: [PATCH 0021/1732] Handle TERM_PROGRAM_VERSION with junk after the
 number.

We only care about the major version number.

Fixes #5725
---
 share/functions/__fish_config_interactive.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 23ec79d64..a204b31d8 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -263,7 +263,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     # Notify terminals when $PWD changes (issue #906).
     # VTE based terminals, Terminal.app, and iTerm.app (TODO) support this.
-    if test 0"$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal" -a 0"$TERM_PROGRAM_VERSION" -ge 309
+    if test 0"$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal" -a (string match -r '\d+' 0"$TERM_PROGRAM_VERSION") -ge 309
         function __update_cwd_osc --on-variable PWD --description 'Notify capable terminals when $PWD changes'
             if status --is-command-substitution || set -q INSIDE_EMACS
                 return

From 2b0b3d3193dcecde7b0c0b9ef4d30183a0b2b53c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 7 Mar 2019 10:00:39 +0100
Subject: [PATCH 0022/1732] Outputter_t: Handle C locale like everything else

This tried to skip conversion if the locale had MB_CUR_MAX == 1, but
in doing so it just entered an infinite recursion (because
writestr(wchar_t*) called writestr(wchar_t*)).

Instead, just let wcstombs handle it.

Fixes #5724.
---
 src/output.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/output.cpp b/src/output.cpp
index d89a08d98..ce44afb77 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -395,12 +395,6 @@ int outputter_t::writech(wint_t ch) {
 void outputter_t::writestr(const wchar_t *str) {
     assert(str && "Empty input string");
 
-    if (MB_CUR_MAX == 1) {
-        // Single-byte locale (C/POSIX/ISO-8859).
-        this->writestr(str);
-        return;
-    }
-
     size_t len = wcstombs(0, str, 0);  // figure amount of space needed
     if (len == (size_t)-1) {
         debug(1, L"Tried to print invalid wide character string");

From 1cd5b2f4e100cc18d70d3e37aca747a61ca42f3f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 7 Mar 2019 10:02:39 +0100
Subject: [PATCH 0023/1732] Pass string length instead of recomputing

This called `writestr(char*)`, which then just called `writestr(char*,
strlen(char*))`, when it had the string length right there!
---
 src/output.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/output.cpp b/src/output.cpp
index ce44afb77..581964101 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -410,7 +410,7 @@ void outputter_t::writestr(const wchar_t *str) {
         buffer = new char[len];
     }
     wcstombs(buffer, str, len);
-    this->writestr(buffer);
+    this->writestr(buffer, len);
     if (buffer != static_buffer) delete[] buffer;
 }
 

From b5b0e6804487ce912209ee5d418dd6ca3019bd92 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 7 Mar 2019 14:02:26 +0100
Subject: [PATCH 0024/1732] functions/seq: Stop using bc in the fallback

Just to remove the dependency - performance is probably about the
same.

This is used, AFAICT, exclusively on OpenBSD (not Free or Net).

CC @zanchey.
---
 share/functions/seq.fish | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/share/functions/seq.fish b/share/functions/seq.fish
index 74104b81b..fe1eb5bd2 100644
--- a/share/functions/seq.fish
+++ b/share/functions/seq.fish
@@ -39,10 +39,18 @@ if not command -sq seq
             end
         end
 
-        if [ $step -ge 0 ]
-            echo "for( i=$from; i<=$to ; i+=$step ) i;" | bc
+        if test $step -ge 0
+            set -l i $from
+            while test $i -le $to
+                echo $i
+                set i (math $i + $step)
+            end
         else
-            echo "for( i=$from; i>=$to ; i+=$step ) i;" | bc
+            set -l i $from
+            while test $i -ge $to
+                echo $i
+                set i (math $i + $step)
+            end
         end
     end
 end

From e35a30de0a61e5d847c03cb0b166878a6837a730 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 7 Mar 2019 12:00:09 -0800
Subject: [PATCH 0025/1732] Add NSAppleEventsUsageDescription

This is required to send Apple Events when built against the 10.14
SDK.

Fixes #5727
---
 osx/CMakeMacAppInfo.plist.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osx/CMakeMacAppInfo.plist.in b/osx/CMakeMacAppInfo.plist.in
index 212143cfa..695625441 100644
--- a/osx/CMakeMacAppInfo.plist.in
+++ b/osx/CMakeMacAppInfo.plist.in
@@ -24,6 +24,8 @@
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.6</string>
+	<key>NSAppleEventsUsageDescription</key>
+	<string>A Terminal window with the fish shell running in it will be opened.</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

From bd5232e0e2cee2a79e05e0db1fd08aa7303ad1bc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 7 Mar 2019 14:06:06 +0100
Subject: [PATCH 0026/1732] functions/seq: Fix negative numbers

25d83ed0d7104a2d95819463f835c5bced1ef864 (included in 3.0.0) added a `string` check that
did not use `--`, so negative numbers were interpreted as options.

Apparently nobody is using this.

(Again, this is for the `seq` fallback used on OpenBSD)
---
 share/functions/seq.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/seq.fish b/share/functions/seq.fish
index fe1eb5bd2..100b71722 100644
--- a/share/functions/seq.fish
+++ b/share/functions/seq.fish
@@ -33,7 +33,7 @@ if not command -sq seq
         end
 
         for i in $from $step $to
-            if not string match -rq '^-?[0-9]*([0-9]*|\.[0-9]+)$' $i
+            if not string match -rq -- '^-?[0-9]*([0-9]*|\.[0-9]+)$' $i
                 printf (_ "%s: '%s' is not a number\n") seq $i
                 return 1
             end
@@ -43,13 +43,13 @@ if not command -sq seq
             set -l i $from
             while test $i -le $to
                 echo $i
-                set i (math $i + $step)
+                set i (math -- $i + $step)
             end
         else
             set -l i $from
             while test $i -ge $to
                 echo $i
-                set i (math $i + $step)
+                set i (math -- $i + $step)
             end
         end
     end

From 49ba7f8c01d3a7048c491c6899a78e9f5720e121 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 7 Mar 2019 14:30:01 +0100
Subject: [PATCH 0027/1732] Update CHANGELOG

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5a33add6..7a4063bc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,9 +12,6 @@
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
-- Added completions for:
- - nothing yet...
-- Lots of improvements to completions.
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
 - mandoc can now be used to format the output from `--help` if nroff is not installed
 - New color options for the pager have been added (#5524).
@@ -23,12 +20,16 @@
 - The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
+- Fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), hopefully making setting $fish_emoji_width superfluous in most cases (#5722).
+- Lots of improvements to completions.
 - Added completions for
   - `cf`
   - `bosh`
+  - `vagrant`
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
+- The doxygen-based documenation system has been removed and replaced with one based on sphinx. All distributors and developers must migrate to that.
 
 ---
 

From 62526a3ac8e1b189d04032d7b997c5dd6968de75 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 8 Mar 2019 16:03:08 +0100
Subject: [PATCH 0028/1732] completions/git: Fix relative paths for older git

If the first file presented was in the current directory, this would
error out.

Fixes #5728.

[ci skip]
---
 share/completions/git.fish | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 067143253..3edea1aa2 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -272,7 +272,6 @@ function __fish_git_files
         # Cache the previous relative path because these are sorted, so we can reuse it
         # often for files in the same directory.
         set -l previous
-        set -l previousfile
         # Note that we can't use space as a delimiter between status and filename, because
         # the status can contain spaces - " M" is different from "M ".
         command git $git_opt status --porcelain -z $status_opt \
@@ -356,8 +355,14 @@ function __fish_git_files
                 # Computing relative path by hand.
                 set -l abs (string split / -- $relfile)
                 # If it's in the same directory, we just need to change the filename.
-                if test "$abs[1..-2]" = "$previousfile[1..-2]"
-                    set previous[-1] $abs[-1]
+                if test "$abs[1..-2]" = "$previous[1..-2]"
+                    # If we didn't have a previous file, and the current file is in the current directory,
+                    # this would error out.
+                    #
+                    # See #5728.
+                    set -q previous[1]
+                    and set previous[-1] $abs[-1]
+                    or set previous $abs
                 else
                     set -l pwd_list $_pwd_list
                     # Remove common prefix

From 7ececa4c69e549613859026db19477e5cc6b5155 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 07:11:43 -0800
Subject: [PATCH 0029/1732] dmesg completions for all the platforms

+ tweaks for Linux: shorter descriptions, suppress file completions
+ Add correct completions for macOS, NetBSD, FreeBSD, OpenBSD, DragonFly
+ Solaris dmesg has no options, so complete nothing there
---
 share/completions/dmesg.fish | 69 ++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/share/completions/dmesg.fish b/share/completions/dmesg.fish
index 0b17de138..aa71bbdc8 100644
--- a/share/completions/dmesg.fish
+++ b/share/completions/dmesg.fish
@@ -1,20 +1,51 @@
-set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
-complete -c dmesg -s C -l clear               -d 'Clear the kernel ring buffer'
-complete -c dmesg -s c -l read-clear          -d 'Read and clear all messages'
-complete -c dmesg -s D -l console-off         -d 'Disable printing messages to console'
-complete -c dmesg -s d -l show-delta          -d 'Show time delta between printed messages'
-complete -c dmesg -s E -l console-on          -d 'Enable printing messages to console'
-complete -c dmesg -s F -l file                -d 'Use the file instead of the kernel log buffer'
-complete -c dmesg -s f -l facility            -d 'Restrict output to defined facilities' -xa '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
-complete -c dmesg -s h -l help                -d 'Display this help and exit'
-complete -c dmesg -s k -l kernel              -d 'Display kernel messages'
-complete -c dmesg -s l -l level               -d 'Restrict output to defined levels' -xa $levels
-complete -c dmesg -s n -l console-level       -d 'Set level of messages printed to console' -xa $levels
-complete -c dmesg -s r -l raw                 -d 'Print the raw message buffer'
-complete -c dmesg -s s -l buffer-size         -d 'Buffer size to query the kernel ring buffer' -x
-complete -c dmesg -s T -l ctime               -d 'Show human readable timestamp '
-complete -c dmesg -s t -l notime              -d 'Don\'t print messages timestamp'
-complete -c dmesg -s u -l userspace           -d 'Display userspace messages'
-complete -c dmesg -s V -l version             -d 'Output version information and exit'
-complete -c dmesg -s x -l decode              -d 'Decode facility and level to readable string'
+complete -c dmesg -f -d 'Display system message buffer'
 
+switch (uname -s)
+	#
+	# Solaris
+	#
+	case SunOS
+		exit 1 # no options, we are done
+	#
+	# Loonix dmesg
+	#
+	case Linux
+		set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
+		complete -c dmesg -s C -l clear               -f -d'Clear kernel ring buffer'
+		complete -c dmesg -s c -l read-clear          -f -d'Read & clear all msgs'
+		complete -c dmesg -s D -l console-off         -f -d'Disable writing to console'
+		complete -c dmesg -s d -l show-delta          -f -d'Show timestamp deltas'
+		complete -c dmesg -s E -l console-on          -f -d'Enable writing to console'
+		complete -c dmesg -s F -l file             -r    -d'Use file instead of log buffer'
+		complete -c dmesg -s f -l facility      -x       -d'Only print for given facilities' -a '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
+		complete -c dmesg -s h -l help                -f -d'Display help'
+		complete -c dmesg -s k -l kernel              -f -d'Print kernel messages'
+		complete -c dmesg -s l -l level         -x       -d'Restrict output to given levels' -a $levels
+		complete -c dmesg -s n -l console-level -x       -d'Adjust threshold to print to console' -a $levels
+		complete -c dmesg -s r -l raw                 -f -d'Print raw message buffer'
+		complete -c dmesg -s s -l buffer-size   -x       -d'Buffer size to query kernel'
+		complete -c dmesg -s T -l ctime               -f -d'Human-readable timestamps'
+		complete -c dmesg -s t -l notime              -f -d'Don\'t print timestamps'
+		complete -c dmesg -s u -l userspace           -f -d'Print userspace messages'
+		complete -c dmesg -s V -l version             -f -d'Show dmesg version'
+		complete -c dmesg -s x -l decode              -f -d'Decode facility & level numbers'
+		exit 0 # done
+	#
+	# unique options specific BSDs have
+	#
+	case NetBSD
+		complete -c dmesg -s d                        -f -d'show timestamp deltas'
+		complete -c dmesg -s T                        -f -d'human-readable timestamps'
+		complete -c dmesg -s t                        -f -d'don\'t print timestamps'
+	case OpenBSD
+		complete -c dmesg -s S                        -f -d'display console message buffer-size'
+	case FreeBSD DragonFly
+		complete -c dmesg -s a                        -f -d'print all data in the message buffer'
+		complete -c dmesg -s c                        -f -d'clear kernel buffer after printing'
+end
+
+#
+# common BSD dmesg options (macOS only does these two)
+#
+complete 		 -c dmesg -s M                      -r   -d'get namelist values from given core'
+complete 		 -c dmesg -s N                      -r   -d'get namelist from given kernel'

From 5938f02db1123008f8ddf9e1d14fb51f31613b0f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 07:41:46 -0800
Subject: [PATCH 0030/1732] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4063bc7..4d10fabb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@
 ## Deprecations
 - The vcs-prompt functions have been renamed to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
 
-## Notable fixes and improvements
+## Notable Fixes and improvements
 - Add `$pipestatus` support
+- macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 - `string split0` now returns 0 if it split something (#5701).
 
 ### Syntax changes and new commands

From 3ac1c29f79dd5255bcc553a44e4ecccd3e2b9c1e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 07:54:50 -0800
Subject: [PATCH 0031/1732] cp completions: shorten descriptions

Enough to fit two pager columns into a 80-wide terminal.
---
 share/completions/cp.fish | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index e81ec8a7f..181b44bfc 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -41,27 +41,27 @@ else # BSD/macOS
 	else
 		complete -c cp -s R -d "Copy directories recursively"
 	end
-	complete -c cp -s H -d "with -R: Follow symlinks in cp arguments"
-	complete -c cp -s L -d "with -R: Follow all symlinks"
-	complete -c cp -s P -d "with -R: Don't follow symlinks (default)"
+	complete -c cp -s H -d "-R: Follow symlink arguments"
+	complete -c cp -s L -d "-R: Follow all symlinks"
+	complete -c cp -s P -d "-R: Don't follow symlinks (default)"
 
-	complete -c cp -s f -d "Replace destination without confirmation"
+	complete -c cp -s f -d "Don't confirm to overwrite"
 	complete -c cp -s i -d "Prompt before overwrite"
 	not contains "$uname" SunOS OpenBSD NetBSD
-		and complete -c cp -s n -d "Don't overwrite existing files"
+		and complete -c cp -s n -d "Don't overwrite existing"
 
-	complete -c cp -s p -d "Preserve attributes of source file"
+	complete -c cp -s p -d "Preserve attributes of source"
 	if [ "$uname" = SunOS ]
 		exit 0
 	end
-	complete -c cp -s v -d "Print file names as files are copied"
+	complete -c cp -s v -d "Print filenames as they're copied"
 	if [ "$uname" = OpenBSD ]
 		exit 0
 	end
 	complete -c cp -s a -d "Archive mode (-pPR)"
 	if [ "$uname" = Darwin ]
 		complete -c cp -s c -d "Clone using clonefile(2)"
-		complete -c cp -s X -d "Do not copy xattrs or resource forks"
+		complete -c cp -s X -d "Omit xattrs, resource forks"
 		exit 0
 	end
 	complete -c cp -s l -d "Hard link instead of copying"
@@ -69,7 +69,7 @@ else # BSD/macOS
 		complete -c cp -s N -d "Don't copy file flags"
 		exit 0
 	end
-	complete -c cp -s x -d "Don't traverse file system mount points"
+	complete -c cp -s x -d "Don't traverse mount points"
 	if [ "$uname" = FreeBSD ]
 		complete -c cp -s s -d "Symlink instead of copying"
 	end

From 9b1fb6938e0e82ffea181e844540d1a426d22217 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 9 Mar 2019 17:57:49 +0100
Subject: [PATCH 0032/1732] Add __fish_anypython helper function

This just finds the first usable python and echos it, so it can then
be used.

We have a few places where we use it and I'm about to add some more.
---
 share/functions/__fish_anypython.fish        | 10 ++++++++++
 share/functions/fish_config.fish             |  8 ++------
 share/functions/fish_update_completions.fish |  8 ++------
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 share/functions/__fish_anypython.fish

diff --git a/share/functions/__fish_anypython.fish b/share/functions/__fish_anypython.fish
new file mode 100644
index 000000000..3a3819864
--- /dev/null
+++ b/share/functions/__fish_anypython.fish
@@ -0,0 +1,10 @@
+function __fish_anypython
+    # Try python3 first, because that's usually faster and generally nicer.
+	for py in python3 python2 python
+        command -sq $py
+        and echo $py
+        and return 0
+    end
+    # We have no python.
+    return 1
+end
diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index d4ef02c9a..aa05fa0f0 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -1,11 +1,7 @@
 function fish_config --description "Launch fish's web based configuration"
     set -lx __fish_bin_dir $__fish_bin_dir
-    if command -sq python3
-        python3 "$__fish_data_dir/tools/web_config/webconfig.py" $argv
-    else if command -sq python2
-        python2 "$__fish_data_dir/tools/web_config/webconfig.py" $argv
-    else if command -sq python
-        python "$__fish_data_dir/tools/web_config/webconfig.py" $argv
+    if set -l python (__fish_anypython)
+        $python "$__fish_data_dir/tools/web_config/webconfig.py" $argv
     else
     	echo (set_color $fish_color_error)Cannot launch the web configuration tool:(set_color normal)
     	echo (set_color -o)fish_config(set_color normal) requires Python.
diff --git a/share/functions/fish_update_completions.fish b/share/functions/fish_update_completions.fish
index 96b55c59d..cf0151669 100644
--- a/share/functions/fish_update_completions.fish
+++ b/share/functions/fish_update_completions.fish
@@ -2,12 +2,8 @@ function fish_update_completions --description "Update man-page based completion
     # Don't write .pyc files, use the manpath, clean up old completions
     # display progress.
     set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in ~/.config/fish/generated_completions --progress $argv
-    if command -qs python3
-        python3 $update_args
-    else if command -qs python2
-        python2 $update_args
-    else if command -qs python
-        python $update_args
+    if set -l python (__fish_anypython)
+        $python $update_args
     else
         printf "%s\n" (_ "python executable not found")
         return 1

From b0e9405b115d8c3951cb3801131166dc03fb48e9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 9 Mar 2019 18:00:52 +0100
Subject: [PATCH 0033/1732] Read json via python

Apparently that's actually faster than jq, and it's more likely to be
installed.

Also it should convince the arch packager to remove the jq dependency.

The indentation is weird, though.

[ci skip]
---
 share/completions/bower.fish | 12 +++++++++---
 share/completions/npm.fish   | 15 ++++++++++++---
 share/completions/yarn.fish  | 15 ++++++++++-----
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index d4c45c949..e459a5c23 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -44,13 +44,19 @@ function __bower_matching_pkgs
 	bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
 end
 
-# Output of `bower list` is a) slow, b) convoluted. Use `jq` instead.
+# Output of `bower list` is a) slow, b) convoluted. Use `python` or `jq` instead.
 function __bower_list_installed
-	if not type -q jq
+	if not test -e bower.json
 		return 1
 	end
 
-	if not test -e bower.json
+    if set -l python (__fish_anypython)
+        $python -c 'import json, sys; data = json.load(sys.stdin);
+for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' bower.json 2>/dev/null
+        return
+    end
+
+	if not type -q jq
 		return 1
 	end
 
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 8fdb03d1d..607215086 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -84,10 +84,19 @@ function __fish_parse_npm_run_completions
 end
 
 function __fish_npm_run
-    # Like above, only try to call npm if there's a command by that name to facilitate aliases that call nvm.
-    if command -sq jq; and test -e package.json
-        jq -r '.scripts | to_entries[] | .key,.value' <package.json | __fish_parse_npm_run_completions
+    # Complete `npm run` scripts
+    # These are stored in package.json, which we need a tool to read.
+    # python is very probably installed (we use it for other things!),
+    # jq is slower but also a common tool,
+    # npm is dog-slow and might check for updates online!
+    if test -e package.json; and set -l python (__fish_anypython)
+        # Warning: That weird indentation is necessary, because python.
+        $python -c 'import json, sys; data = json.load(sys.stdin);
+for k,v in data["scripts"].items(): print(k + "\t" + v[:18])' <package.json 2>/dev/null
+    else if command -sq jq; and test -e package.json
+        jq -r '.scripts | to_entries | map("\(.key)\t\(.value | tostring | .[0:20])") | .[]' package.json
     else if command -sq npm
+        # Like above, only try to call npm if there's a command by that name to facilitate aliases that call nvm.
         command npm run | string match -r -v '^[^ ]|^$' | string trim | __fish_parse_npm_run_completions
     end
 end
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index d9549e071..be3ab0e11 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -71,11 +71,16 @@ complete -f -c yarn -n '__fish_use_subcommand' -a remove
 complete -f -c yarn -n '__fish_use_subcommand' -a run
 
 function __fish_yarn_run
-  if test -e package.json; and type -q jq
-    jq -r '.scripts | to_entries | map("\(.key)\t\(.value | tostring | .[0:20])") | .[]' package.json
-  else if type -q jq
-    command yarn run --json 2> /dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
-  end
+    if test -e package.json; and set -l python (__fish_anypython)
+        # Warning: That weird indentation is necessary, because python.
+        $python -c 'import json, sys; data = json.load(sys.stdin);
+for k,v in data["scripts"].items(): print(k + "\t" + v[:18])' <package.json 2>/dev/null
+    else if test -e package.json; and type -q jq
+        jq -r '.scripts | to_entries | map("\(.key)\t\(.value | tostring | .[0:20])") | .[]' package.json
+    else if type -q jq
+        # Yarn is quite slow and still requires `jq` because the normal format is unusable.
+        command yarn run --json 2> /dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
+    end
 end
 
 # Scripts can be used like normal subcommands, or with `yarn run SCRIPT`.

From bf926fd6c46888c2ed9054546267920f03968882 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 9 Mar 2019 18:03:19 +0100
Subject: [PATCH 0034/1732] completions/yarn: Don't offer files for `yarn run`

Pretty sure that, like npm, that's not valid.

[ci skip]
---
 share/completions/yarn.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index be3ab0e11..eed79e7fe 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -84,7 +84,7 @@ for k,v in data["scripts"].items(): print(k + "\t" + v[:18])' <package.json 2>/d
 end
 
 # Scripts can be used like normal subcommands, or with `yarn run SCRIPT`.
-complete -c yarn -n '__fish_use_subcommand; or __fish_seen_subcommand_from run' -a "(__fish_yarn_run)"
+complete -c yarn -n '__fish_use_subcommand; or __fish_seen_subcommand_from run' -xa "(__fish_yarn_run)"
 
 complete -f -c yarn -n '__fish_use_subcommand' -a tag
 complete -f -c yarn -n '__fish_seen_subcommand_from tag' -a 'add rm ls'

From ba1249763b410325f5083d9ed851a28a43d26b9b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 9 Mar 2019 18:30:17 +0100
Subject: [PATCH 0035/1732] functions/__fish_npm_helper: Use python for json

[ci skip]
---
 share/functions/fish_npm_helper.fish | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_npm_helper.fish b/share/functions/fish_npm_helper.fish
index bcbe42d7b..3ba7872b9 100644
--- a/share/functions/fish_npm_helper.fish
+++ b/share/functions/fish_npm_helper.fish
@@ -12,7 +12,7 @@ function __yarn_helper_installed
             set -l old (commandline)
             commandline -r ""
             echo \nfish: Run `$argv[1] all-the-package-names` to gain intelligent \
-                package completion > /dev/stderr
+                package completion >&2
             commandline -f repaint
             commandline -r $old
             set -g __fish_yarn_pkg_info_shown 1
@@ -57,7 +57,10 @@ function __yarn_installed_packages
         return 1
     end
 
-    if type -q jq
+    if set -l python (__fish_anypython)
+        $python -c 'import json, sys; data = json.load(sys.stdin);
+print("\n".join(data["dependencies"])); print("\n".join(data["devDependencies"]))' < $package_json 2>/dev/null
+    else if type -q jq
         jq -r '.dependencies as $a1 | .devDependencies as $a2 | ($a1 + $a2) | to_entries[] | .key' $package_json
     else
         set -l depsFound 0

From eaf496c1d44f9f2753182efe3fa0d853510bfef0 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 13:39:51 -0800
Subject: [PATCH 0036/1732] seq.fish: use gseq if available.

Apparently if you install gnu coreutils on OpenBSD, the tools are
g-prefixed. So we definitely want to just alias that rather than
provide our lousy shell script implementation.
---
 share/functions/seq.fish | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/share/functions/seq.fish b/share/functions/seq.fish
index 100b71722..e574a65c5 100644
--- a/share/functions/seq.fish
+++ b/share/functions/seq.fish
@@ -1,10 +1,18 @@
-    # If seq is not installed, then define a function that invokes __fish_fallback_seq
+# If seq is not installed, then define a function that invokes __fish_fallback_seq
 # We can't call type here because that also calls seq
 
 if not command -sq seq
-    # No seq command
-    function seq --description "Print sequences of numbers"
-        __fish_fallback_seq $argv
+    if command -sq gseq
+        # No seq provided by the OS, but GNU coreutils was apparently installed, fantastic
+        function seq --description "Print sequences of numbers (gseq)"
+            gseq $argv
+        end
+        exit
+    else
+        # No seq command
+        function seq --description "Print sequences of numbers"
+            __fish_fallback_seq $argv
+        end
     end
 
     function __fish_fallback_seq --description "Fallback implementation of the seq command"

From c1859b567840b910fde47356ca08082c8411ed7d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 14:52:08 -0800
Subject: [PATCH 0037/1732] `date` completions: show correct options for
 different BSDs, macOS

Also prevents file completions where they are not approprite, and
additionally shortened the descriptions to fit in two pager columns
in an 80-wide terminal for some platforms.
---
 share/completions/date.fish | 51 +++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/share/completions/date.fish b/share/completions/date.fish
index d033932d8..ed1a0f043 100644
--- a/share/completions/date.fish
+++ b/share/completions/date.fish
@@ -1,22 +1,41 @@
+complete -c date -f -d "display or set date and time"
 if date --version > /dev/null 2>/dev/null
 	complete -c date -s d -l date -d "Display date described by string" -x
 	complete -c date -s f -l file -d "Display date for each line in file" -r
-	complete -c date -s I -l iso-8601 -d "Output in ISO 8601 format" -x -a "date hours minutes seconds"
+	complete -c date -s I -l iso-8601 -d "Output in ISO-8601 format" -x -a "date hours minutes seconds"
 	complete -c date -s s -l set -d "Set time" -x
-	complete -c date -s R -l rfc-2822 -d "Output RFC-2822 compliant date string"
-	complete -c date -s r -l reference -d "Display the last modification time of file" -r
-	complete -c date -s u -l utc -d "Print or set Coordinated Universal Time"
-	complete -c date -l universal -d "Print or set Coordinated Universal Time"
-	complete -c date -s h -l help -d "Display help and exit"
-	complete -c date -s v -l version -d "Display version and exit"
-else # OS X
-	complete -c date -s d -d 'Set the kernel\'s value for daylight saving time' -x
-	complete -c date -s f -d 'Use format string to parse the date provided rather than default format'
-	complete -c date -s j -d 'Do no try to set the date'
-	complete -c date -s n -d 'Set the time for current machine only in the local group'
-	complete -c date -s r -d 'Print date and time represented by SEC since Epoch' -x
-	complete -c date -s t -d 'Set system\'s value for MINUTES west of GMT'
-	complete -c date -s u -d 'Display or set the date int UTC time'
-	complete -c date -s v -d 'Adjust the time component backward(-)/forward(+) according to VAL' -x
+	complete -c date -s R -l rfc-2822 -d "Output RFC-2822 date string"
+	complete -c date -s r -l reference -d "Display last modification time of file" -r
+	complete -c date -s u -l utc -d "Print/set UTC time" -f
+	complete -c date -l universal -d "Print/set UTC time" -f
+	complete -c date -s h -l help -d "Display help and exit" -f
+	complete -c date -s v -l version -d "Display version and exit" -f
+else
+	complete -c date -s u -d 'Display or set UTC time' -f
+	complete -c date -s j -d "Don't actually set the clock" -f
+	complete -c date -s d -d "Set system's value for DST" -x
+
+	set -l uname (uname -s)
+
+	test "$uname" != OpenBSD
+	and complete -c date -s n -d 'Set clock for local machine only' -f
+
+	switch $uname
+		case FreeBSD Darwin DragonFly
+			# only -u is actually POSIX. Rest are BSD extensions:
+			complete -c date -s r -d "Show file mtime, or format seconds" -r
+			complete -c date -s v -d 'Adjust clock +/- by time specified' -f
+		case NetBSD OpenBSD
+			complete -c date -s a -d "Change clock slowly with adjtime" -x
+			complete -c date -s r -d "Show date given seconds since epoch" -x
+			if test "$uname" = NetBSD
+				complete -c date -s d -d "Parse human-described date-time and show result" -x
+				exit
+			end
+			complete -c date -s z -d "Specify timezone for output" -x
+	end
+	
+	complete -c date -s t -d "Set system's minutes west of GMT" -x
+	complete -c date -s f -d 'Use format string to parse date' -f
 end
 

From 3e8c05e32b295a23e066a8408cab48e88b218270 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 9 Mar 2019 15:02:25 -0800
Subject: [PATCH 0038/1732] cat, mv, rm completions: shorten descriptions

---
 share/completions/cat.fish | 28 ++++++++++++++--------------
 share/completions/mv.fish  | 28 ++++++++++++++--------------
 share/completions/rm.fish  | 33 +++++++++++++++------------------
 3 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index 2a7bce379..8e9bf016d 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -1,21 +1,21 @@
 if cat --version 2>/dev/null > /dev/null # GNU
-	complete -c cat -s A -l show-all -d "Escape all non-printing characters"
-	complete -c cat -s b -l number-nonblank -d "Number nonblank lines"
-	complete -c cat -s e -d "Escape non-printing characters except tab"
-	complete -c cat -s E -l show-ends -d "Display \$ at end of line"
-	complete -c cat -s n -l number -d "Number all lines"
-	complete -c cat -s s -l squeeze-blank -d "Never more than single blank line"
-	complete -c cat -s t -d "Escape non-printing characters except newline"
+	complete -c cat -s A -l show-all -d "Escape all unprintables"
+	complete -c cat -s b -l number-nonblank -d "Number non-blank lines"
+	complete -c cat -s e -d "Escape unprintables except \\t"
+	complete -c cat -s E -l show-ends -d "Display \$ at line end"
+	complete -c cat -s n -l number -d "Enumerate lines"
+	complete -c cat -s s -l squeeze-blank -d "Never >1 blank line"
+	complete -c cat -s t -d "Escape unprintables except \\n"
 	complete -c cat -s T -l show-tabs -d "Escape tab"
-	complete -c cat -s v -d "Escape non-printing except newline and tab"
+	complete -c cat -s v -d "Escape unprintables except '\\n' and \\t"
 	complete -c cat -l help -d "Display help and exit"
 	complete -c cat -l version -d "Display version and exit"
 else # OS X
-	complete -c cat -s b -d "Number non-blank lines"
-	complete -c cat -s e -d "Display non-printing characters, and `\$' at the end of each line"
-	complete -c cat -s n -d "Number all lines"
-	complete -c cat -s s -d "Single spaced output by squeezing adjacent empty lines"
-	complete -c cat -s t -d "Display non-printing characters, and tab characters as `^I'"
+	complete -c cat -s b -d "Specify # of non-blank lines"
+	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 u -d "Disable output buffering"
-	complete -c cat -s v -d "Display non-printing characters so they're visible."
+	complete -c cat -s v -d "Escape non-printing chars"
 end
\ No newline at end of file
diff --git a/share/completions/mv.fish b/share/completions/mv.fish
index 24a116307..e8eb6f40d 100644
--- a/share/completions/mv.fish
+++ b/share/completions/mv.fish
@@ -13,21 +13,21 @@ if mv --version >/dev/null 2>/dev/null
                      simple\t'Make simple backups'
                      never\t'Make simple backups'"
     complete -c mv -s b -d "Backup each existing destination file"
-    complete -c mv -s f -l force -d "Don't prompt before overwriting"
-    complete -c mv -s i -l interactive -d "Prompt before overwriting"
-    complete -c mv -s n -l no-clobber -d "Don't overwrite existing files"
+    complete -c mv -s f -l force -d "Don't prompt to overwrite"
+    complete -c mv -s i -l interactive -d "Prompt to overwrite"
+    complete -c mv -s n -l no-clobber -d "Don't overwrite existing"
     # --reply has been deprecated for over a decade, and now GNU mv does not accept this option.
     # Better to use -f instead of --reply=yes.
     #   complete -c mv -l reply -x -a "yes no query" -d "Answer for overwrite questions"
-    complete -c mv -l strip-trailing-slashes -d "Remove trailing slashes from source args"
+    complete -c mv -l strip-trailing-slashes -d "Remove trailing '/' from source args"
     complete -c mv -s S -l suffix -x -d "Override default backup suffix"
-    complete -c mv -s t -l target-directory -d "Move all source args into DIRECTORY" \
-             -x -a "(__fish_complete_directories (commandline -ct) 'DIRECTORY')"
+    complete -c mv -s t -l target-directory -d "Move all source args into DIR" \
+             -x -a "(__fish_complete_directories (commandline -ct) 'Directory')"
     complete -c mv -s T -l no-target-directory -d "Treat DEST as a normal file"
-    complete -c mv -s u -l update -d "Don't overwrite newer files"
-    complete -c mv -s v -l verbose -d "Print each file as it is moved"
+    complete -c mv -s u -l update -d "Don't overwrite newer"
+    complete -c mv -s v -l verbose -d "Print filenames as it goes"
     test "$uname" = Linux
-        and complete -c mv -s Z -l context -d "Sets SELinux context to default"
+        and complete -c mv -s Z -l context -d "Set SELinux context to default"
 
     complete -c mv -l help -d "Print help and exit"
     complete -c mv -l version -d "Print version and exit"
@@ -41,22 +41,22 @@ else             #[posix][ext]
     # solaris:   mv [-fi][   ] src dst
 
     # POSIX options
-    complete -c mv -s f -d "Don't prompt before overwriting"
-    complete -c mv -s i -d "Prompt before overwriting existing files"
+    complete -c mv -s f -d "Don't prompt to overwrite"
+    complete -c mv -s i -d "Prompt to overwrite existing"
 
     test uname = SunOS # -fi
         and exit 0
 
     # Extensions
-    complete -c mv -s v -d "Print each file as it is moved"
+    complete -c mv -s v -d "Print filenames as it goes"
 
     contains "$uname" NetBSD OpenBSD # -fiv
         and exit 0
 
-    complete -c mv -s n -d "Don't overwrite existing files"
+    complete -c mv -s n -d "Don't overwrite existing"
 
     test "$uname" = Darwin # -fivn
         and exit 0
 
-    complete -c mv -s h -d "If target is a link to a directory, don't follow it"
+    complete -c mv -s h -d "Don't follow target if it links to a dir"
 end
diff --git a/share/completions/rm.fish b/share/completions/rm.fish
index f085ebaa8..5ca66833d 100644
--- a/share/completions/rm.fish
+++ b/share/completions/rm.fish
@@ -1,14 +1,14 @@
 #Completions for rm
 if rm --version >/dev/null 2>/dev/null # GNU
-	complete -c rm -s d -l directory -d "Unlink directory (Only by superuser)"
-	complete -c rm -s f -l force -d "Never prompt before removal"
-	complete -c rm -s i -l interactive -d "Prompt before removal"
-	complete -c rm -s I -d "Prompt before removing more than three files"
-	complete -c rm -s r -l recursive -d "Recursively remove subdirectories"
-	complete -c rm -s R -d "Recursively remove subdirectories"
+	complete -c rm -s d -l directory -d "Unlink directories"
+	complete -c rm -s f -l force -d "Never prompt for removal"
+	complete -c rm -s i -l interactive -d "Prompt for removal"
+	complete -c rm -s I -d "Prompt to remove >3 files"
+	complete -c rm -s r -l recursive -d "Recursively remove subdirs"
+	complete -c rm -s R -d "Recursively remove subdirs"
 	complete -c rm -s v -l verbose -d "Explain what is done"
-	complete -c rm -s h -l help -d "Display help and exit"
-	complete -c rm -l version -d "Display version and exit"
+	complete -c rm -s h -l help -d "Display help"
+	complete -c rm -l version -d "Display rm version"
 else
 	set -l uname (uname -s)
 	# solaris:   rm [-fi        ] file ...
@@ -18,24 +18,21 @@ else
 	# freebsd:   rm [-fidPRrvWxI] file ...
 	# dragonfly: rm [-fidPRrvWxI] file ... 
 
-	complete -c rm -s f -d "Never prompt before removal"
-	complete -c rm -s i -d "Prompt before removal"
+	complete -c rm -s f -d "Never prompt for removal"
+	complete -c rm -s i -d "Prompt for removal"
 	test "$uname" = SunOS
 		and exit 0
-	complete -c rm -s d -d "Attempt to remove directories as well"
+	complete -c rm -s d -d "Remove directories as well"
 	complete -c rm -s P -d "Overwrite before removal"
-	complete -c rm -s R -d "Recursively remove subdirectories"
-	complete -c rm -s r -d "Recursively remove subdirectories"
+	complete -c rm -s R -s r -d "Recursively remove subdirs"
 	complete -c rm -s v -d "Explain what is done"
 	test "$uname" = OpenBSD
 		and exit 0
-	complete -c rm -s W -d "Undelete the named files"
+	complete -c rm -s W -d "Undelete given filenames"
 	test "$uname" = Darwin
 		and exit 0
-	complete -c rm -s x -d "Do not traverse filesystem mount points"
+	complete -c rm -s x -d "Don't traverse mount points"
 	test "$uname" = NetBSD
 		and exit 0
-	complete -c rm -s I -d "Like -i, but only if 3 or more files affected"
+	complete -c rm -s I -d "Prompt to remove >=3 files"
 end
-
-

From 2ae6e5a5858571d52ec6fedc568627661c596f53 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 11 Mar 2019 14:53:26 -0700
Subject: [PATCH 0039/1732] Explicitly handle all enum values in more switch
 statements

This addresses a few places where -Wswitch-enum showed one or two missing
case's for enum values.

It did uncover and fix one apparent oversight:

$ function asd -p 100
   echo foo
end

$ functions --handlers-type exit
Event exit
asd

It looks like this should be showing a PID before 'asd' just like
job_exit handlers show the job id. It was falling
through to default: which just printed the function name.

$ functions --handlers-type exit
Event exit
100 asd
---
 src/builtin_functions.cpp |  1 +
 src/builtin_math.cpp      |  2 +-
 src/common.h              | 17 +++++++++++++++--
 src/event.cpp             |  8 ++++++--
 src/tokenizer.cpp         |  5 ++++-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 860f675e7..071d1cad2 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -176,6 +176,7 @@ static wcstring functions_def(const wcstring &name) {
                 append_format(out, L" --on-event %ls", d.str_param1.c_str());
                 break;
             }
+            case event_type_t::any:
             default: {
                 DIE("unexpected next->type");
                 break;
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 506f80a5c..a98ea5b74 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -131,9 +131,9 @@ static const wchar_t *math_get_arg(int *argidx, wchar_t **argv, wcstring *storag
 
 static wcstring math_describe_error(te_error_t& error) {
     if (error.position == 0) return L"NO ERROR?!?";
-    assert(error.type != TE_ERROR_NONE && L"Error has no position");
 
     switch(error.type) {
+        case TE_ERROR_NONE: DIE("Error has no position");
         case TE_ERROR_UNKNOWN_VARIABLE: return _(L"Unknown variable");
         case TE_ERROR_MISSING_CLOSING_PAREN: return _(L"Missing closing parenthesis");
         case TE_ERROR_MISSING_OPENING_PAREN: return _(L"Missing opening parenthesis");
diff --git a/src/common.h b/src/common.h
index d99524cd4..6007b4317 100644
--- a/src/common.h
+++ b/src/common.h
@@ -429,7 +429,15 @@ static inline bool match_type_requires_full_replacement(fuzzy_match_type_t t) {
         case fuzzy_match_prefix: {
             return false;
         }
-        default: { return true; }
+        case fuzzy_match_case_insensitive:
+        case fuzzy_match_prefix_case_insensitive:
+        case fuzzy_match_substring:
+        case fuzzy_match_substring_case_insensitive:
+        case fuzzy_match_subsequence_insertions_only:
+        case fuzzy_match_none:
+         {
+            return true;
+        }
     }
 }
 
@@ -442,7 +450,12 @@ static inline bool match_type_shares_prefix(fuzzy_match_type_t t) {
         case fuzzy_match_prefix_case_insensitive: {
             return true;
         }
-        default: { return false; }
+        case fuzzy_match_substring:
+        case fuzzy_match_substring_case_insensitive:
+        case fuzzy_match_subsequence_insertions_only:
+        case fuzzy_match_none: {
+            return false;
+        }
     }
 }
 
diff --git a/src/event.cpp b/src/event.cpp
index f04afefc0..79bbdd693 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -120,7 +120,8 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
         case event_type_t::generic: {
             return classv.desc.str_param1 == instance.desc.str_param1;
         }
-        default: {
+        case event_type_t::any: {
+        default:
             DIE("unexpected classv.type");
             return false;
         }
@@ -165,7 +166,7 @@ wcstring event_get_desc(const event_t &evt) {
                                          -ed.param1.pid);
                 }
             }
-            assert(0 && "Unreachable");
+            DIE("Unreachable");
         }
 
         case event_type_t::job_exit: {
@@ -182,6 +183,7 @@ wcstring event_get_desc(const event_t &evt) {
         case event_type_t::generic: {
             return format_string(_(L"handler for generic event '%ls'"), ed.str_param1.c_str());
         }
+        case event_type_t::any: { DIE("Unreachable"); }
         default:
             DIE("Unknown event type");
     }
@@ -409,6 +411,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                 streams.out.append_format(L"%ls %ls\n", sig2wcs(evt->desc.param1.signal),
                                           evt->function_name.c_str());
                 break;
+            case event_type_t::exit:
             case event_type_t::job_exit:
                 streams.out.append_format(L"%d %ls\n", evt->desc.param1,
                                           evt->function_name.c_str());
@@ -418,6 +421,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                 streams.out.append_format(L"%ls %ls\n", evt->desc.str_param1.c_str(),
                                           evt->function_name.c_str());
                 break;
+            case event_type_t::any: DIE("Unreachable");
             default:
                 streams.out.append_format(L"%ls\n", evt->function_name.c_str());
                 break;
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index fd997a361..38ec77029 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -408,7 +408,10 @@ int oflags_for_redirection_type(redirection_type_t type) {
         case redirection_type_t::input: {
             return O_RDONLY;
         }
-        default: { return -1; }
+        case redirection_type_t::fd:
+        default: {
+            return -1;
+        }
     }
 }
 

From 66887ca4bc94f99001bed1623780998b3bf52748 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 09:44:57 -0700
Subject: [PATCH 0040/1732] Fix OpenSUSE build

They treat -Wreturn-type as a critical thing apparently.
---
 src/common.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/common.h b/src/common.h
index 6007b4317..7c4f84c79 100644
--- a/src/common.h
+++ b/src/common.h
@@ -434,10 +434,13 @@ static inline bool match_type_requires_full_replacement(fuzzy_match_type_t t) {
         case fuzzy_match_substring:
         case fuzzy_match_substring_case_insensitive:
         case fuzzy_match_subsequence_insertions_only:
-        case fuzzy_match_none:
-         {
+        case fuzzy_match_none: {
             return true;
         }
+        default: {
+            DIE("Unreachable");
+            return false;
+        }
     }
 }
 
@@ -456,6 +459,10 @@ static inline bool match_type_shares_prefix(fuzzy_match_type_t t) {
         case fuzzy_match_none: {
             return false;
         }
+        default: {
+            DIE("Unreachabe");
+            return false;
+        }
     }
 }
 

From 8a0d794337046f023474ff47b33e34b814bfeeb8 Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Tue, 12 Mar 2019 09:01:05 +0100
Subject: [PATCH 0041/1732] fish_git_prompt: optionally show stash state in
 informative mode

---
 CHANGELOG.md                         |  1 +
 share/functions/fish_git_prompt.fish | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d10fabb4..0099e2300 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
   - `cf`
   - `bosh`
   - `vagrant`
+- The git prompt in informative mode now shows the number of stashes if enabled.
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index cb96b31eb..6f9657d1f 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -102,6 +102,7 @@
 #     invalidstate    (✖)
 #     stagedstate     (●)
 #     untrackedfiles  (…)
+#     stashstate      (⚑)
 #     cleanstate      (✔)
 #
 #
@@ -401,7 +402,7 @@ function fish_git_prompt --description "Prompt function for Git"
                 and test "$dirty" != false
                 and test "$untracked" != false
             end
-            set informative_status "$space"(__fish_git_prompt_informative_status)
+            set informative_status "$space"(__fish_git_prompt_informative_status $git_dir)
         else
             # This has to be set explicitly.
             if test "$dirty" = true
@@ -517,6 +518,9 @@ function __fish_git_prompt_dirty --description "fish_git_prompt helper, tells wh
 end
 
 set -g ___fish_git_prompt_status_order stagedstate invalidstate dirtystate untrackedfiles
+if set -q __fish_git_prompt_showstashstate
+    set -a ___fish_git_prompt_status_order stashstate
+end
 
 function __fish_git_prompt_informative_status
 
@@ -530,11 +534,16 @@ function __fish_git_prompt_informative_status
     set -l invalidstate (count (string match -r "U" -- $stagedFiles))
     set -l stagedstate (math $x - $invalidstate)
     set -l untrackedfiles (command git ls-files --others --exclude-standard | wc -l | string trim)
+    set -l stashstate 0
+    set -l stashfile "$argv[1]/logs/refs/stash"
+    if set -q __fish_git_prompt_showstashstate; and test -e "$stashfile"
+        set stashstate (wc -l $stashfile | string match -r '\d+')
+    end
 
     set -l info
 
     # If `math` fails for some reason, assume the state is clean - it's the simpler path
-    set -l state (math $dirtystate + $invalidstate + $stagedstate + $untrackedfiles 2>/dev/null)
+    set -l state (math $dirtystate + $invalidstate + $stagedstate + $untrackedfiles + $stashstate 2>/dev/null)
     if test -z "$state"
         or test "$state" = 0
         set info $___fish_git_prompt_color_cleanstate$___fish_git_prompt_char_cleanstate$___fish_git_prompt_color_cleanstate_done
@@ -686,7 +695,7 @@ function __fish_git_prompt_validate_chars --description "fish_git_prompt helper,
     __fish_git_prompt_set_char __fish_git_prompt_char_dirtystate '*' '✚'
     __fish_git_prompt_set_char __fish_git_prompt_char_invalidstate '#' '✖'
     __fish_git_prompt_set_char __fish_git_prompt_char_stagedstate '+' '●'
-    __fish_git_prompt_set_char __fish_git_prompt_char_stashstate '$'
+    __fish_git_prompt_set_char __fish_git_prompt_char_stashstate '$' '⚑'
     __fish_git_prompt_set_char __fish_git_prompt_char_stateseparator ' ' '|'
     __fish_git_prompt_set_char __fish_git_prompt_char_untrackedfiles '%' '…'
     __fish_git_prompt_set_char __fish_git_prompt_char_upstream_ahead '>' '↑'
@@ -778,7 +787,7 @@ function __fish_git_prompt_repaint $varargs --description "Event handler, repain
     if status --is-interactive
         if test $argv[3] = __fish_git_prompt_show_informative_status
             # Clear characters that have different defaults with/without informative status
-            for name in cleanstate dirtystate invalidstate stagedstate stateseparator untrackedfiles upstream_ahead upstream_behind
+            for name in cleanstate dirtystate invalidstate stagedstate stashstate stateseparator untrackedfiles upstream_ahead upstream_behind
                 set -e ___fish_git_prompt_char_$name
             end
         end

From bfb61879cdebe7df77ebaf4a41f688d29f47411e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 12 Mar 2019 18:49:08 +0100
Subject: [PATCH 0042/1732] Do create installation directories that already
 exist

Reverts 71329a250b09dfacaca48fb69c69fe59eeb0c15a.

That tried to fix problems with pkgconfig by not recreating it.
Instead, use the function we already have for not trying too hard to
create a directory.

Fixes #5735.
---
 cmake/Install.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index be7d10b23..f1537344a 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -53,9 +53,7 @@ ENDIF()
 # Define a function to help us create directories.
 FUNCTION(FISH_CREATE_DIRS)
   FOREACH(dir ${ARGV})
-      IF(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/${dir})
-        INSTALL(DIRECTORY DESTINATION ${dir})
-      ENDIF()
+    INSTALL(DIRECTORY DESTINATION ${dir})
   ENDFOREACH(dir)
 ENDFUNCTION(FISH_CREATE_DIRS)
 
@@ -113,9 +111,9 @@ INSTALL(FILES share/config.fish
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
-FISH_CREATE_DIRS(${rel_datadir}/pkgconfig)
 # Don't try too hard to create these directories as they may be outside our writeable area
 # https://github.com/Homebrew/homebrew-core/pull/2813
+FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
 FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir})
 
 # @echo "Installing pkgconfig file"

From ecfe4acd0c224c02d57f962fd62b8adb8c9e2a35 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 12 Mar 2019 20:25:04 +0100
Subject: [PATCH 0043/1732] complete: Do fuzzy match for --do-complete

This only did prefix matching, which is generally less useful.

All existing users _should_ be okay with this since they want to
provide completions.

Fixes #5467.
Fixes #2318.
---
 CHANGELOG.md             | 1 +
 src/builtin_complete.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0099e2300..2e4244899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
 - Fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), hopefully making setting $fish_emoji_width superfluous in most cases (#5722).
+- `complete --do-complete` now also does fuzzy matches (#5467).
 - Lots of improvements to completions.
 - Added completions for
   - `cf`
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 2a01fcd26..1af41f394 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -318,7 +318,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             recursion_level++;
 
             std::vector<completion_t> comp;
-            complete(do_complete_param, &comp, COMPLETION_REQUEST_DEFAULT, parser.vars());
+            complete(do_complete_param, &comp, COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_FUZZY_MATCH, parser.vars());
 
             for (size_t i = 0; i < comp.size(); i++) {
                 const completion_t &next = comp.at(i);

From d5ac239f680e3e3b32d28e87067662614af7db64 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 14:06:01 -0700
Subject: [PATCH 0044/1732] This commit changes wchar.h includes to cwchar, and
 uses std:: for everything it provides.

---
 src/autoload.cpp             |   2 +-
 src/builtin.cpp              |  12 ++---
 src/builtin_argparse.cpp     |   6 +--
 src/builtin_commandline.cpp  |  12 ++---
 src/builtin_commandline.h    |   2 +-
 src/builtin_complete.cpp     |   8 +--
 src/builtin_complete.h       |   2 +-
 src/builtin_contains.cpp     |   4 +-
 src/builtin_fg.cpp           |   4 +-
 src/builtin_functions.cpp    |   4 +-
 src/builtin_history.cpp      |   4 +-
 src/builtin_jobs.cpp         |   2 +-
 src/builtin_jobs.h           |   2 +-
 src/builtin_math.cpp         |   4 +-
 src/builtin_printf.cpp       |  10 ++--
 src/builtin_printf.h         |   2 +-
 src/builtin_random.cpp       |   4 +-
 src/builtin_read.cpp         |   6 +--
 src/builtin_realpath.cpp     |   2 +-
 src/builtin_set.cpp          |  10 ++--
 src/builtin_set.h            |   2 +-
 src/builtin_set_color.h      |   2 +-
 src/builtin_source.cpp       |   4 +-
 src/builtin_status.cpp       |  10 ++--
 src/builtin_string.cpp       |  16 +++---
 src/builtin_string.h         |   2 +-
 src/builtin_test.cpp         |   6 +--
 src/builtin_ulimit.h         |   2 +-
 src/builtin_wait.cpp         |   4 +-
 src/color.cpp                |   2 +-
 src/common.cpp               |  40 +++++++-------
 src/common.h                 |   6 +--
 src/complete.cpp             |  12 ++---
 src/env.cpp                  |  20 +++----
 src/env_universal_common.cpp |   6 +--
 src/event.cpp                |   4 +-
 src/expand.cpp               |   8 +--
 src/fallback.cpp             |   8 +--
 src/fallback.h               |   4 +-
 src/fish.cpp                 |   8 +--
 src/fish_indent.cpp          |  26 ++++-----
 src/fish_key_reader.cpp      |  70 ++++++++++++------------
 src/fish_tests.cpp           | 102 +++++++++++++++++------------------
 src/function.cpp             |   6 +--
 src/future_feature_flags.cpp |   8 +--
 src/highlight.cpp            |  20 +++----
 src/history.cpp              |   4 +-
 src/input.cpp                |   4 +-
 src/input_common.cpp         |   6 +--
 src/intern.cpp               |   6 +--
 src/io.cpp                   |  20 +++----
 src/io.h                     |   2 +-
 src/iothread.cpp             |   2 +-
 src/lru.h                    |   2 +-
 src/output.cpp               |   8 +--
 src/pager.cpp                |   4 +-
 src/parse_execution.cpp      |   6 +--
 src/parse_tree.cpp           |  12 ++---
 src/parse_util.cpp           |  22 ++++----
 src/parser.cpp               |  12 ++---
 src/path.cpp                 |   2 +-
 src/postfork.cpp             |   2 +-
 src/proc.cpp                 |  12 ++---
 src/reader.cpp               |  34 ++++++------
 src/screen.cpp               |  10 ++--
 src/screen.h                 |   2 +-
 src/tokenizer.cpp            |   8 +--
 src/util.cpp                 |   4 +-
 src/wcstringutil.cpp         |   2 +-
 src/wgetopt.cpp              |  36 ++++++-------
 src/wildcard.cpp             |  18 +++----
 src/wutil.cpp                |  18 +++----
 72 files changed, 379 insertions(+), 379 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 9f13bb8b2..95827dc2c 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -26,7 +26,7 @@
 static const int kAutoloadStalenessInterval = 15;
 
 file_access_attempt_t access_file(const wcstring &path, int mode) {
-    // fwprintf(stderr, L"Touch %ls\n", path.c_str());
+    // std::fwprintf(stderr, L"Touch %ls\n", path.c_str());
     file_access_attempt_t result = {};
     struct stat statbuf;
     if (wstat(path, &statbuf)) {
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 9473c9e94..be3c98fbe 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -76,11 +76,11 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 bool builtin_data_t::operator<(const wcstring &other) const {
-    return wcscmp(this->name, other.c_str()) < 0;
+    return std::wcscmp(this->name, other.c_str()) < 0;
 }
 
 bool builtin_data_t::operator<(const builtin_data_t *other) const {
-    return wcscmp(this->name, other->name) < 0;
+    return std::wcscmp(this->name, other->name) < 0;
 }
 
 /// Counts the number of arguments in the specified null-terminated array
@@ -215,7 +215,7 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *
                 // First move down 4 lines.
                 pos = str;
                 for (i = 0; (i < 4) && pos && *pos; i++) {
-                    pos = wcschr(pos + 1, L'\n');
+                    pos = std::wcschr(pos + 1, L'\n');
                 }
 
                 if (pos && *pos) {
@@ -311,7 +311,7 @@ static int builtin_count(parser_t &parser, io_streams_t &streams, wchar_t **argv
 /// This function handles both the 'continue' and the 'break' builtins that are used for loop
 /// control.
 static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
-    int is_break = (wcscmp(argv[0], L"break") == 0);
+    int is_break = (std::wcscmp(argv[0], L"break") == 0);
     int argc = builtin_count_args(argv);
 
     if (argc != 1) {
@@ -482,7 +482,7 @@ void builtin_init() {
     for (size_t i = 0; i < BUILTIN_COUNT; i++) {
         const wchar_t *name = builtin_datas[i].name;
         intern_static(name);
-        assert((i == 0 || wcscmp(builtin_datas[i - 1].name, name) < 0) &&
+        assert((i == 0 || std::wcscmp(builtin_datas[i - 1].name, name) < 0) &&
                "builtins are not sorted alphabetically");
     }
 }
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index c4b88736e..1e87a03a4 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -316,7 +316,7 @@ static int collect_option_specs(argparse_cmd_opts_t &opts, int *optind, int argc
     wchar_t *cmd = argv[0];
 
     while (true) {
-        if (wcscmp(L"--", argv[*optind]) == 0) {
+        if (std::wcscmp(L"--", argv[*optind]) == 0) {
             ++*optind;
             break;
         }
@@ -401,7 +401,7 @@ static int parse_cmd_opts(argparse_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
 
     if (opts.print_help) return STATUS_CMD_OK;
 
-    if (argc == w.woptind || wcscmp(L"--", argv[w.woptind - 1]) == 0) {
+    if (argc == w.woptind || std::wcscmp(L"--", argv[w.woptind - 1]) == 0) {
         // The user didn't specify any option specs.
         streams.err.append_format(_(L"%ls: No option specs were provided\n"), cmd);
         return STATUS_INVALID_ARGS;
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 5890fb1c0..de6cd8126 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "builtin.h"
 #include "common.h"
@@ -86,7 +86,7 @@ static void replace_part(const wchar_t *begin, const wchar_t *end, const wchar_t
     switch (append_mode) {
         case REPLACE_MODE: {
             out.append(insert);
-            out_pos = wcslen(insert) + (begin - buff);
+            out_pos = std::wcslen(insert) + (begin - buff);
             break;
         }
         case APPEND_MODE: {
@@ -99,7 +99,7 @@ static void replace_part(const wchar_t *begin, const wchar_t *end, const wchar_t
             out.append(begin, cursor);
             out.append(insert);
             out.append(begin + cursor, end - begin - cursor);
-            out_pos += wcslen(insert);
+            out_pos += std::wcslen(insert);
             break;
         }
         default: {
@@ -125,7 +125,7 @@ static void write_part(const wchar_t *begin, const wchar_t *end, int cut_at_curs
     size_t pos = cursor_pos - (begin - buffer);
 
     if (tokenize) {
-        // fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end );
+        // std::fwprintf( stderr, L"Subshell: %ls, end char %lc\n", buff, *end );
         wcstring out;
         wcstring buff(begin, end - begin);
         tokenizer_t tok(buff.c_str(), TOK_ACCEPT_UNFINISHED);
@@ -267,7 +267,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             }
             case 'I': {
                 current_buffer = w.woptarg;
-                current_cursor_pos = wcslen(w.woptarg);
+                current_cursor_pos = std::wcslen(w.woptarg);
                 break;
             }
             case 'C': {
@@ -424,7 +424,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     switch (buffer_part) {
         case STRING_MODE: {
             begin = current_buffer;
-            end = begin + wcslen(begin);
+            end = begin + std::wcslen(begin);
             break;
         }
         case PROCESS_MODE: {
diff --git a/src/builtin_commandline.h b/src/builtin_commandline.h
index a8cbd9568..4fa8ef083 100644
--- a/src/builtin_commandline.h
+++ b/src/builtin_commandline.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_COMMANDLINE_H
 #define FISH_BUILTIN_COMMANDLINE_H
 
-#include <wchar.h>
+#include <cwchar>
 #include <cstring>
 
 class parser_t;
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 1af41f394..438a33bab 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -2,7 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -49,7 +49,7 @@ static void builtin_complete_add2(const wchar_t *cmd, int cmd_type, const wchar_
                      comp, desc, flags);
     }
 
-    if (old_opt.empty() && gnu_opt.empty() && wcslen(short_opt) == 0) {
+    if (old_opt.empty() && gnu_opt.empty() && std::wcslen(short_opt) == 0) {
         complete_add(cmd, cmd_type, wcstring(), option_type_args_only, result_mode, condition, comp,
                      desc, flags);
     }
@@ -274,7 +274,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_INVALID_ARGS;
     }
 
-    if (condition && wcslen(condition)) {
+    if (condition && std::wcslen(condition)) {
         const wcstring condition_string = condition;
         parse_error_list_t errors;
         if (parse_util_detect_errors(condition_string, &errors,
@@ -289,7 +289,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
     }
 
-    if (comp && wcslen(comp)) {
+    if (comp && std::wcslen(comp)) {
         wcstring prefix;
         prefix.append(cmd);
         prefix.append(L": ");
diff --git a/src/builtin_complete.h b/src/builtin_complete.h
index 96d667cba..7cbaccd5b 100644
--- a/src/builtin_complete.h
+++ b/src/builtin_complete.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_COMPLETE_H
 #define FISH_BUILTIN_COMPLETE_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_contains.cpp b/src/builtin_contains.cpp
index 18d067a5c..2589f2dce 100644
--- a/src/builtin_contains.cpp
+++ b/src/builtin_contains.cpp
@@ -2,7 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "builtin.h"
 #include "builtin_contains.h"
@@ -75,7 +75,7 @@ int builtin_contains(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         streams.err.append_format(_(L"%ls: Key not specified\n"), cmd);
     } else {
         for (int i = optind + 1; i < argc; i++) {
-            if (!wcscmp(needle, argv[i])) {
+            if (!std::wcscmp(needle, argv[i])) {
                 if (opts.print_index) streams.out.append_format(L"%d\n", i - optind);
                 return STATUS_CMD_OK;
             }
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 605a1301a..a89f45866 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "builtin.h"
 #include "builtin_fg.h"
@@ -99,7 +99,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     } else {
         // If we aren't redirecting, send output to real stderr, since stuff in sb_err won't get
         // printed until the command finishes.
-        fwprintf(stderr, FG_MSG, j->job_id, j->command_wcstr());
+        std::fwprintf(stderr, FG_MSG, j->job_id, j->command_wcstr());
     }
 
     const wcstring ft = tok_first(j->command());
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 071d1cad2..c9d02753b 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <map>
@@ -247,7 +247,7 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
     }
 
     if (metadata_as_comments) {
-        if (wcscmp(path, L"stdin")) {
+        if (std::wcscmp(path, L"stdin")) {
             streams.out.append_format(L"# Defined in %ls @ line %d\n", path, line_number);
         }
     } else {
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index bd0a49fa0..583657ae9 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <string>
 #include <vector>
@@ -67,7 +67,7 @@ static bool set_hist_cmd(wchar_t *const cmd, hist_cmd_t *hist_cmd, hist_cmd_t su
         wchar_t err_text[1024];
         const wchar_t *subcmd_str1 = enum_to_str(*hist_cmd, hist_enum_map);
         const wchar_t *subcmd_str2 = enum_to_str(sub_cmd, hist_enum_map);
-        swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
+        std::swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
                  _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
                  subcmd_str2);
         streams.err.append_format(BUILTIN_ERR_COMBO2, cmd, err_text);
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index f57ed101b..6d9857992 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -40,7 +40,7 @@ static int cpu_use(const job_t *j) {
         double t1 = 1000000.0 * p->last_time.tv_sec + p->last_time.tv_usec;
         double t2 = 1000000.0 * t.tv_sec + t.tv_usec;
 
-        // fwprintf( stderr, L"t1 %f t2 %f p1 %d p2 %d\n", t1, t2, jiffies, p->last_jiffies );
+        // std::fwprintf( stderr, L"t1 %f t2 %f p1 %d p2 %d\n", t1, t2, jiffies, p->last_jiffies );
         u += ((double)(jiffies - p->last_jiffies)) / (t2 - t1);
     }
     return u * 1000000;
diff --git a/src/builtin_jobs.h b/src/builtin_jobs.h
index 5c37043ac..7f6babbf9 100644
--- a/src/builtin_jobs.h
+++ b/src/builtin_jobs.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_JOBS_H
 #define FISH_BUILTIN_JOBS_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index a98ea5b74..a1fb48d25 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -49,7 +49,7 @@ static int parse_cmd_opts(math_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
         switch (opt) {
             case 's': {
                 // "max" is the special value that tells us to pick the maximum scale.
-                if (wcscmp(w.woptarg, L"max") == 0) {
+                if (std::wcscmp(w.woptarg, L"max") == 0) {
                     opts.scale = 15;
                 } else {
                     opts.scale = fish_wcstoi(w.woptarg);
@@ -162,7 +162,7 @@ static wcstring format_double(double v, const math_cmd_opts_t &opts) {
         while (ret.back() == L'0') {
             ret.pop_back();
         }
-        if (!wcschr(digits, ret.back())) {
+        if (!std::wcschr(digits, ret.back())) {
             ret.pop_back();
         }
     }
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 6921f4097..1bcf05cc8 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include "builtin.h"
@@ -255,17 +255,17 @@ static T raw_string_to_scalar_type(const wchar_t *s, wchar_t **end);
 // #626
 template <>
 intmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
-    return wcstoll(s, end, 0);
+    return std::wcstoll(s, end, 0);
 }
 
 template <>
 uintmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
-    return wcstoull(s, end, 0);
+    return std::wcstoull(s, end, 0);
 }
 
 template <>
 long double raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
-    double val = wcstod(s, end);
+    double val = std::wcstod(s, end);
     if (**end == L'\0') return val;
     // The conversion using the user's locale failed. That may be due to the string not being a
     // valid floating point value. It could also be due to the locale using different separator
@@ -358,7 +358,7 @@ long builtin_printf_state_t::print_esc(const wchar_t *escstart, bool octal_0) {
              ++esc_length, ++p)
             esc_value = esc_value * 8 + octal_to_bin(*p);
         this->append_output(ENCODE_DIRECT_BASE + esc_value % 256);
-    } else if (*p && wcschr(L"\"\\abcefnrtv", *p)) {
+    } else if (*p && std::wcschr(L"\"\\abcefnrtv", *p)) {
         print_esc_char(*p++);
     } else if (*p == L'u' || *p == L'U') {
         wchar_t esc_char = *p;
diff --git a/src/builtin_printf.h b/src/builtin_printf.h
index 1f9d44d58..b0608cbb5 100644
--- a/src/builtin_printf.h
+++ b/src/builtin_printf.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_PRINTF_H
 #define FISH_BUILTIN_PRINTF_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index c8bbc7a1f..617082e51 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -3,7 +3,7 @@
 
 #include <errno.h>
 #include <stdint.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <random>
@@ -45,7 +45,7 @@ int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     long long start, end;
     unsigned long long step;
     bool choice = false;
-    if (arg_count >= 1 && !wcscmp(argv[optind], L"choice")) {
+    if (arg_count >= 1 && !std::wcscmp(argv[optind], L"choice")) {
         if (arg_count == 1) {
             streams.err.append_format(L"%ls: nothing to choose from\n", cmd);
             return STATUS_INVALID_ARGS;
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index fe4b842ae..523fb2d9e 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -222,7 +222,7 @@ static int read_interactive(wcstring &buff, int nchars, bool shell, bool silent,
     reader_set_exit_on_interrupt(true);
     reader_set_silent_status(silent);
 
-    reader_set_buffer(commandline, wcslen(commandline));
+    reader_set_buffer(commandline, std::wcslen(commandline));
     proc_push_interactive(1);
 
     event_fire_generic(L"fish_prompt");
@@ -317,7 +317,7 @@ static int read_one_char_at_a_time(int fd, wcstring &buff, int nchars, bool spli
                 res = (unsigned char)b;
                 finished = true;
             } else {
-                size_t sz = mbrtowc(&res, &b, 1, &state);
+                size_t sz = std::mbrtowc(&res, &b, 1, &state);
                 if (sz == (size_t)-1) {
                     memset(&state, 0, sizeof(state));
                 } else if (sz != (size_t)-2) {
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 89a1dab56..552eae5c1 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "builtin.h"
 #include "builtin_realpath.h"
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index e538689ca..c57b1d60f 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <iterator>
@@ -275,7 +275,7 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
             continue;
         }
 
-        const wchar_t *colon = wcschr(dir.c_str(), L':');
+        const wchar_t *colon = std::wcschr(dir.c_str(), L':');
         bool looks_like_colon_sep = colon && colon[1];
         if (!looks_like_colon_sep && any_success) {
             // Once we have one valid entry, skip the remaining ones unless we might warn.
@@ -297,7 +297,7 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
             streams.err.append_format(BUILTIN_SET_PATH_ERROR, cmd, key, dir.c_str(),
                                       strerror(errno));
             streams.err.append_format(BUILTIN_SET_PATH_HINT, cmd, key, key,
-                                      wcschr(dir.c_str(), L':') + 1);
+                                      std::wcschr(dir.c_str(), L':') + 1);
         }
     }
     return any_success;
@@ -365,7 +365,7 @@ static int env_set_reporting_errors(const wchar_t *cmd, const wchar_t *key, int
 ///   is modified to omit the index expression leaving just the var name.
 static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_streams_t &streams,
                        const environment_t &vars) {
-    wchar_t *p = wcschr(src, L'[');
+    wchar_t *p = std::wcschr(src, L'[');
     if (!p) return 0;  // no slices so nothing for us to do
     *p = L'\0';        // split the var name from the indexes/slices
     p++;
@@ -609,7 +609,7 @@ static int builtin_set_show(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
                 continue;
             }
 
-            if (wcschr(arg, L'[')) {
+            if (std::wcschr(arg, L'[')) {
                 streams.err.append_format(
                     _(L"%ls: `set --show` does not allow slices with the var names\n"), cmd);
                 builtin_print_help(parser, streams, cmd, streams.err);
diff --git a/src/builtin_set.h b/src/builtin_set.h
index 134fea28b..af930ad23 100644
--- a/src/builtin_set.h
+++ b/src/builtin_set.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_SET_H
 #define FISH_BUILTIN_SET_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_set_color.h b/src/builtin_set_color.h
index 65647018a..f35d57936 100644
--- a/src/builtin_set_color.h
+++ b/src/builtin_set_color.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_SET_COLOR_H
 #define FISH_BUILTIN_SET_COLOR_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 8784b0603..442e81784 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "builtin.h"
 #include "builtin_source.h"
@@ -39,7 +39,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     struct stat buf;
     const wchar_t *fn, *fn_intern;
 
-    if (argc == optind || wcscmp(argv[optind], L"-") == 0) {
+    if (argc == optind || std::wcscmp(argv[optind], L"-") == 0) {
         // Either a bare `source` which means to implicitly read from stdin or an explicit `-`.
         if (argc == optind && isatty(streams.stdin_fd)) {
             // Don't implicitly read from the terminal.
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 9a6b66c26..0f59405cd 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -2,7 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <string>
 
@@ -77,11 +77,11 @@ const enum_map<status_cmd_t> status_enum_map[] = {
 enum { TEST_FEATURE_ON, TEST_FEATURE_OFF, TEST_FEATURE_NOT_RECOGNIZED };
 
 int job_control_str_to_mode(const wchar_t *mode, wchar_t *cmd, io_streams_t &streams) {
-    if (wcscmp(mode, L"full") == 0) {
+    if (std::wcscmp(mode, L"full") == 0) {
         return JOB_CONTROL_ALL;
-    } else if (wcscmp(mode, L"interactive") == 0) {
+    } else if (std::wcscmp(mode, L"interactive") == 0) {
         return JOB_CONTROL_INTERACTIVE;
-    } else if (wcscmp(mode, L"none") == 0) {
+    } else if (std::wcscmp(mode, L"none") == 0) {
         return JOB_CONTROL_NONE;
     }
     streams.err.append_format(L"%ls: Invalid job control mode '%ls'\n", cmd, mode);
@@ -127,7 +127,7 @@ static bool set_status_cmd(wchar_t *const cmd, status_cmd_opts_t &opts, status_c
         wchar_t err_text[1024];
         const wchar_t *subcmd_str1 = enum_to_str(opts.status_cmd, status_enum_map);
         const wchar_t *subcmd_str2 = enum_to_str(sub_cmd, status_enum_map);
-        swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
+        std::swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
                  _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
                  subcmd_str2);
         streams.err.append_format(BUILTIN_ERR_COMBO2, cmd, err_text);
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 8b44f452e..a62392299 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -189,13 +189,13 @@ static int handle_flag_1(wchar_t **argv, parser_t &parser, io_streams_t &streams
     const wchar_t *cmd = argv[0];
 
     if (opts->style_valid) {
-        if (wcscmp(w.woptarg, L"script") == 0) {
+        if (std::wcscmp(w.woptarg, L"script") == 0) {
             opts->escape_style = STRING_STYLE_SCRIPT;
-        } else if (wcscmp(w.woptarg, L"url") == 0) {
+        } else if (std::wcscmp(w.woptarg, L"url") == 0) {
             opts->escape_style = STRING_STYLE_URL;
-        } else if (wcscmp(w.woptarg, L"var") == 0) {
+        } else if (std::wcscmp(w.woptarg, L"var") == 0) {
             opts->escape_style = STRING_STYLE_VAR;
-        } else if (wcscmp(w.woptarg, L"regex") == 0) {
+        } else if (std::wcscmp(w.woptarg, L"regex") == 0) {
             opts->escape_style = STRING_STYLE_REGEX;
         } else {
             string_error(streams, _(L"%ls: Invalid escape style '%ls'\n"), cmd, w.woptarg);
@@ -949,7 +949,7 @@ bool literal_replacer_t::replace_matches(const wcstring &arg) {
         replacement_occurred = true;
         result = arg;
     } else {
-        auto &cmp_func = opts.ignore_case ? wcsncasecmp : wcsncmp;
+        auto &cmp_func = opts.ignore_case ? wcsncasecmp : std::wcsncmp;
         const wchar_t *cur = arg.c_str();
         const wchar_t *end = cur + arg.size();
         while (cur < end) {
@@ -1311,13 +1311,13 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_INVALID_ARGS;
     }
 
-    if (wcscmp(argv[1], L"-h") == 0 || wcscmp(argv[1], L"--help") == 0) {
+    if (std::wcscmp(argv[1], L"-h") == 0 || std::wcscmp(argv[1], L"--help") == 0) {
         builtin_print_help(parser, streams, L"string", streams.out);
         return STATUS_CMD_OK;
     }
 
     const string_subcommand *subcmd = &string_subcommands[0];
-    while (subcmd->name != 0 && wcscmp(subcmd->name, argv[1]) != 0) {
+    while (subcmd->name != 0 && std::wcscmp(subcmd->name, argv[1]) != 0) {
         subcmd++;
     }
     if (!subcmd->handler) {
diff --git a/src/builtin_string.h b/src/builtin_string.h
index 0f530c641..22dcfb28e 100644
--- a/src/builtin_string.h
+++ b/src/builtin_string.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_STRING_H
 #define FISH_BUILTIN_STRING_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 327b0ea79..b49fa7bb6 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <cmath>
@@ -817,7 +817,7 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     // Whether we are invoked with bracket '[' or not.
     wchar_t *program_name = argv[0];
-    const bool is_bracket = !wcscmp(program_name, L"[");
+    const bool is_bracket = !std::wcscmp(program_name, L"[");
 
     size_t argc = 0;
     while (argv[argc + 1]) argc++;
@@ -825,7 +825,7 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // If we're bracket, the last argument ought to be ]; we ignore it. Note that argc is the number
     // of arguments after the command name; thus argv[argc] is the last argument.
     if (is_bracket) {
-        if (!wcscmp(argv[argc], L"]")) {
+        if (!std::wcscmp(argv[argc], L"]")) {
             // Ignore the closing bracket from now on.
             argc--;
         } else {
diff --git a/src/builtin_ulimit.h b/src/builtin_ulimit.h
index 1676b5a35..54de72642 100644
--- a/src/builtin_ulimit.h
+++ b/src/builtin_ulimit.h
@@ -2,7 +2,7 @@
 #ifndef FISH_BUILTIN_ULIMIT_H
 #define FISH_BUILTIN_ULIMIT_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <cstring>
 
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 2c596a2bd..b517f7a78 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -134,11 +134,11 @@ static bool iswnumeric(const wchar_t *n) {
 /// See if the process described by \c proc matches the commandline \c cmd.
 static bool match_pid(const wcstring &cmd, const wchar_t *proc) {
     // Don't wait for itself
-    if (wcscmp(proc, L"wait") == 0) return false;
+    if (std::wcscmp(proc, L"wait") == 0) return false;
 
     // Get the command to match against. We're only interested in the last path component.
     const wcstring base_cmd = wbasename(cmd);
-    return wcscmp(proc, base_cmd.c_str()) == 0;
+    return std::wcscmp(proc, base_cmd.c_str()) == 0;
 }
 
 /// It should search the job list for something matching the given proc.
diff --git a/src/color.cpp b/src/color.cpp
index 4cad60450..4dd60ef46 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wchar.h>  // IWYU pragma: keep
+#include <cwchar>  // IWYU pragma: keep
 
 #include "color.h"
 #include "common.h"
diff --git a/src/common.cpp b/src/common.cpp
index ac8705ff8..ba7da173d 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -19,7 +19,7 @@
 #include <sys/time.h>
 #include <termios.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -231,7 +231,7 @@ demangled_backtrace(int max_frames, int skip_levels) {
     // if this check is not done.
     //
     // Hack to avoid showing backtraces in the tester.
-    // if (program_name && !wcscmp(program_name, L"(ignore)")) return;
+    // if (program_name && !std::wcscmp(program_name, L"(ignore)")) return;
 
     debug_shared(msg_level, L"Backtrace:");
     std::vector<wcstring> bt = demangled_backtrace(frame_count, skip_levels + 2);
@@ -254,7 +254,7 @@ int fgetws2(wcstring *s, FILE *f) {
     while (1) {
         errno = 0;
 
-        c = fgetwc(f);
+        c = std::fgetwc(f);
         if (errno == EILSEQ || errno == EINTR) {
             continue;
         }
@@ -309,17 +309,17 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
         wchar_t wc = 0;
 
         if ((in[in_pos] & 0xF8) == 0xF8) {
-            // Protect against broken mbrtowc() implementations which attempt to encode UTF-8
+            // Protect against broken std::mbrtowc() implementations which attempt to encode UTF-8
             // sequences longer than four bytes (e.g., OS X Snow Leopard).
             use_encode_direct = true;
         } else if (sizeof(wchar_t) == 2 &&  //!OCLINT(constant if expression)
                    (in[in_pos] & 0xF8) == 0xF0) {
             // Assume we are in a UTF-16 environment (e.g., Cygwin) using a UTF-8 encoding.
             // The bits set check will be true for a four byte UTF-8 sequence that requires
-            // two UTF-16 chars. Something that doesn't work with our simple use of mbrtowc().
+            // two UTF-16 chars. Something that doesn't work with our simple use of std::mbrtowc().
             use_encode_direct = true;
         } else {
-            ret = mbrtowc(&wc, &in[in_pos], in_len - in_pos, &state);
+            ret = std::mbrtowc(&wc, &in[in_pos], in_len - in_pos, &state);
             // Determine whether to encode this character with our crazy scheme.
             if (wc >= ENCODE_DIRECT_BASE && wc < ENCODE_DIRECT_BASE + 256) {
                 use_encode_direct = true;
@@ -398,7 +398,7 @@ char *wcs2str(const wchar_t *in, size_t len) {
     return out;
 }
 
-char *wcs2str(const wchar_t *in) { return wcs2str(in, wcslen(in)); }
+char *wcs2str(const wchar_t *in) { return wcs2str(in, std::wcslen(in)); }
 char *wcs2str(const wcstring &in) { return wcs2str(in.c_str(), in.length()); }
 
 /// This function is distinguished from wcs2str_internal in that it allows embedded null bytes.
@@ -424,7 +424,7 @@ std::string wcs2string(const wcstring &input) {
             result.append(converted, 1);
         } else {
             memset(converted, 0, sizeof converted);
-            size_t len = wcrtomb(converted, wc, &state);
+            size_t len = std::wcrtomb(converted, wc, &state);
             if (len == (size_t)-1) {
                 debug(1, L"Wide character U+%4X has no narrow representation", wc);
                 memset(&state, 0, sizeof(state));
@@ -464,7 +464,7 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
                 out[out_pos++] = (unsigned char)in[in_pos];
             }
         } else {
-            size_t len = wcrtomb(&out[out_pos], in[in_pos], &state);
+            size_t len = std::wcrtomb(&out[out_pos], in[in_pos], &state);
             if (len == (size_t)-1) {
                 debug(1, L"Wide character U+%4X has no narrow representation", in[in_pos]);
                 memset(&state, 0, sizeof(state));
@@ -484,7 +484,7 @@ static bool can_be_encoded(wchar_t wc) {
     char converted[MB_LEN_MAX];
     mbstate_t state = {};
 
-    return wcrtomb(converted, wc, &state) != (size_t)-1;
+    return std::wcrtomb(converted, wc, &state) != (size_t)-1;
 }
 
 wcstring format_string(const wchar_t *format, ...) {
@@ -528,7 +528,7 @@ void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig) {
         // Try printing.
         va_list va;
         va_copy(va, va_orig);
-        status = vswprintf(buff, size / sizeof(wchar_t), format, va);
+        status = std::vswprintf(buff, size / sizeof(wchar_t), format, va);
         va_end(va);
     }
 
@@ -647,16 +647,16 @@ ssize_t read_loop(int fd, void *buff, size_t count) {
 /// like `debug()`. It is only intended to supress diagnostic noise from testing things like the
 /// fish parser where we expect a lot of diagnostic messages due to testing error conditions.
 bool should_suppress_stderr_for_tests() {
-    return program_name && !wcscmp(program_name, TESTS_PROGRAM_NAME);
+    return program_name && !std::wcscmp(program_name, TESTS_PROGRAM_NAME);
 }
 
 static void debug_shared(const wchar_t level, const wcstring &msg) {
     pid_t current_pid;
     if (!is_forked_child()) {
-        fwprintf(stderr, L"<%lc> %ls: %ls\n", (unsigned long)level, program_name, msg.c_str());
+        std::fwprintf(stderr, L"<%lc> %ls: %ls\n", (unsigned long)level, program_name, msg.c_str());
     } else {
         current_pid = getpid();
-        fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", (unsigned long)level, program_name, current_pid,
+        std::fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", (unsigned long)level, program_name, current_pid,
                  msg.c_str());
     }
 }
@@ -810,7 +810,7 @@ wcstring reformat_for_screen(const wcstring &msg) {
             int tok_width = 0;
 
             // Tokenize on whitespace, and also calculate the width of the token.
-            while (*pos && (!wcschr(L" \n\r\t", *pos))) {
+            while (*pos && (!std::wcschr(L" \n\r\t", *pos))) {
                 // Check is token is wider than one line. If so we mark it as an overflow and break
                 // the token.
                 if ((tok_width + fish_wcwidth(*pos)) > (screen_width - 1)) {
@@ -1178,7 +1178,7 @@ wcstring escape_string(const wchar_t *in, escape_flags_t flags, escape_string_st
 
     switch (style) {
         case STRING_STYLE_SCRIPT: {
-            escape_string_script(in, wcslen(in), result, flags);
+            escape_string_script(in, std::wcslen(in), result, flags);
             break;
         }
         case STRING_STYLE_URL: {
@@ -1493,10 +1493,10 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     // Note that this only recognizes %self if the string is literally %self.
                     // %self/foo will NOT match this.
                     if (unescape_special && input_position == 0 &&
-                        !wcscmp(input, PROCESS_EXPAND_SELF_STR)) {
+                        !std::wcscmp(input, PROCESS_EXPAND_SELF_STR)) {
                         to_append_or_none = PROCESS_EXPAND_SELF;
                         input_position +=
-                            wcslen(PROCESS_EXPAND_SELF_STR) - 1;  // skip over 'self' part.
+                            std::wcslen(PROCESS_EXPAND_SELF_STR) - 1;  // skip over 'self' part.
                     }
                     break;
                 }
@@ -1691,7 +1691,7 @@ bool unescape_string(const wchar_t *input, wcstring *output, unescape_flags_t es
     bool success = false;
     switch (style) {
         case STRING_STYLE_SCRIPT: {
-            success = unescape_string_internal(input, wcslen(input), output, escape_special);
+            success = unescape_string_internal(input, std::wcslen(input), output, escape_special);
             break;
         }
         case STRING_STYLE_URL: {
@@ -1884,7 +1884,7 @@ bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &val
 }
 
 bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value) {
-    size_t suffix_size = wcslen(proposed_suffix);
+    size_t suffix_size = std::wcslen(proposed_suffix);
     return suffix_size <= value.size() &&
            value.compare(value.size() - suffix_size, suffix_size, proposed_suffix) == 0;
 }
diff --git a/src/common.h b/src/common.h
index 7c4f84c79..c927e0c11 100644
--- a/src/common.h
+++ b/src/common.h
@@ -272,7 +272,7 @@ inline bool is_whitespace(const wchar_t *input) { return is_whitespace(wcstring(
 
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error);
 
-/// Shorthand for wgettext call in situations where a C-style string is needed (e.g., fwprintf()).
+/// Shorthand for wgettext call in situations where a C-style string is needed (e.g., std::fwprintf()).
 #define _(wstr) wgettext(wstr).c_str()
 
 /// Noop, used to tell xgettext that a string should be translated. Use this when a string cannot be
@@ -555,7 +555,7 @@ inline bool bool_from_string(const std::string &x) {
     }
 }
 
-inline bool bool_from_string(const wcstring &x) { return !x.empty() && wcschr(L"YTyt1", x.at(0)); }
+inline bool bool_from_string(const wcstring &x) { return !x.empty() && std::wcschr(L"YTyt1", x.at(0)); }
 
 wchar_t **make_null_terminated_array(const wcstring_list_t &lst);
 char **make_null_terminated_array(const std::vector<std::string> &lst);
@@ -933,7 +933,7 @@ static T str_to_enum(const wchar_t *name, const enum_map<T> map[], int len) {
 
     while (left < right) {
         size_t mid = left + (right - left) / 2;
-        int cmp = wcscmp(name, map[mid].str);
+        int cmp = std::wcscmp(name, map[mid].str);
         if (cmp < 0) {
             right = mid;  // name was smaller than mid
         } else if (cmp > 0) {
diff --git a/src/complete.cpp b/src/complete.cpp
index b0ae97cc1..30bab6506 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -8,7 +8,7 @@
 #include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -203,7 +203,7 @@ static complete_flags_t resolve_auto_space(const wcstring &comp, complete_flags_
     if (flags & COMPLETE_AUTO_SPACE) {
         new_flags &= ~COMPLETE_AUTO_SPACE;
         size_t len = comp.size();
-        if (len > 0 && (wcschr(L"/=@:", comp.at(len - 1)) != 0)) new_flags |= COMPLETE_NO_SPACE;
+        if (len > 0 && (std::wcschr(L"/=@:", comp.at(len - 1)) != 0)) new_flags |= COMPLETE_NO_SPACE;
     }
     return new_flags;
 }
@@ -402,7 +402,7 @@ void append_completion(std::vector<completion_t> *completions, wcstring comp, wc
 /// after a completion run to make sure that there are no stale completions.
 bool completer_t::condition_test(const wcstring &condition) {
     if (condition.empty()) {
-        // fwprintf( stderr, L"No condition specified\n" );
+        // std::fwprintf( stderr, L"No condition specified\n" );
         return true;
     }
 
@@ -1238,10 +1238,10 @@ bool completer_t::try_complete_user(const wcstring &str) {
     const wchar_t *cmd = str.c_str();
     const wchar_t *first_char = cmd;
 
-    if (*first_char != L'~' || wcschr(first_char, L'/')) return false;
+    if (*first_char != L'~' || std::wcschr(first_char, L'/')) return false;
 
     const wchar_t *user_name = first_char + 1;
-    const wchar_t *name_end = wcschr(user_name, L'~');
+    const wchar_t *name_end = std::wcschr(user_name, L'~');
     if (name_end) return false;
 
     double start_time = timef();
@@ -1260,7 +1260,7 @@ bool completer_t::try_complete_user(const wcstring &str) {
         }
         const wcstring pw_name_str = str2wcstring(pw->pw_name);
         const wchar_t *pw_name = pw_name_str.c_str();
-        if (wcsncmp(user_name, pw_name, name_len) == 0) {
+        if (std::wcsncmp(user_name, pw_name, name_len) == 0) {
             wcstring desc = format_string(COMPLETE_USER_DESC, pw_name);
             // Append a user name
             append_completion(&this->completions, &pw_name[name_len], desc, COMPLETE_NO_SPACE);
diff --git a/src/env.cpp b/src/env.cpp
index b30ec18ed..13d95763e 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -14,7 +14,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #if HAVE_CURSES_H
 #include <curses.h>
@@ -308,7 +308,7 @@ using string_set_t = const wchar_t *const[];
 template <typename T>
 bool string_set_contains(const T &set, const wchar_t *val) {
     for (const wchar_t *entry : set) {
-        if (!wcscmp(val, entry)) return true;
+        if (!std::wcscmp(val, entry)) return true;
     }
     return false;
 }
@@ -319,7 +319,7 @@ static bool is_read_only(const wchar_t *val) {
         L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status", L"version",
         L"FISH_VERSION", L"fish_pid", L"hostname", L"_",          L"fish_private_mode"};
     return string_set_contains(env_read_only, val) ||
-        (in_private_mode() && wcscmp(L"fish_history", val) == 0);
+        (in_private_mode() && std::wcscmp(L"fish_history", val) == 0);
 }
 
 static bool is_read_only(const wcstring &val) { return is_read_only(val.c_str()); }
@@ -443,15 +443,15 @@ static bool does_term_support_setting_title(const environment_t &vars) {
     const wcstring term_str = term_var->as_string();
     const wchar_t *term = term_str.c_str();
     bool recognized = contains(title_terms, term_var->as_string());
-    if (!recognized) recognized = !wcsncmp(term, L"xterm-", wcslen(L"xterm-"));
-    if (!recognized) recognized = !wcsncmp(term, L"screen-", wcslen(L"screen-"));
-    if (!recognized) recognized = !wcsncmp(term, L"tmux-", wcslen(L"tmux-"));
+    if (!recognized) recognized = !std::wcsncmp(term, L"xterm-", std::wcslen(L"xterm-"));
+    if (!recognized) recognized = !std::wcsncmp(term, L"screen-", std::wcslen(L"screen-"));
+    if (!recognized) recognized = !std::wcsncmp(term, L"tmux-", std::wcslen(L"tmux-"));
     if (!recognized) {
-        if (wcscmp(term, L"linux") == 0) return false;
-        if (wcscmp(term, L"dumb") == 0) return false;
+        if (std::wcscmp(term, L"linux") == 0) return false;
+        if (std::wcscmp(term, L"dumb") == 0) return false;
         // NetBSD
-        if (wcscmp(term, L"vt100") == 0) return false;
-        if (wcscmp(term, L"wsvt25") == 0) return false;
+        if (std::wcscmp(term, L"vt100") == 0) return false;
+        if (std::wcscmp(term, L"wsvt25") == 0) return false;
 
         char buf[PATH_MAX];
         int retval = ttyname_r(STDIN_FILENO, buf, PATH_MAX);
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 7fd8bf1e9..f30cbad56 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -28,7 +28,7 @@
 #include <sys/time.h>   // IWYU pragma: keep
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <atomic>
 #include <map>
@@ -136,7 +136,7 @@ static bool match(const wchar_t **inout_cursor, const char *cmd) {
 static bool is_universal_safe_to_encode_directly(wchar_t c) {
     if (c < 32 || c > 128) return false;
 
-    return iswalnum(c) || wcschr(L"/_", c);
+    return iswalnum(c) || std::wcschr(L"/_", c);
 }
 
 /// Escape specified string.
@@ -850,7 +850,7 @@ static const wchar_t *skip_spaces(const wchar_t *str) {
 bool env_universal_t::populate_1_variable(const wchar_t *input, env_var_t::env_var_flags_t flags,
                                           var_table_t *vars, wcstring *storage) {
     const wchar_t *str = skip_spaces(input);
-    const wchar_t *colon = wcschr(str, L':');
+    const wchar_t *colon = std::wcschr(str, L':');
     if (!colon) return false;
 
     // Parse out the value into storage, and decode it into a variable.
diff --git a/src/event.cpp b/src/event.cpp
index 79bbdd693..d2ae1959a 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -191,11 +191,11 @@ wcstring event_get_desc(const event_t &evt) {
 
 #if 0
 static void show_all_handlers(void) {
-    fwprintf(stdout, L"event handlers:\n");
+    std::fwprintf(stdout, L"event handlers:\n");
     for (event_list_t::const_iterator iter = events.begin(); iter != events.end(); ++iter) {
         const event_t *foo = *iter;
         wcstring tmp = event_get_desc(foo);
-        fwprintf(stdout, L"    handler now %ls\n", tmp.c_str());
+        std::fwprintf(stdout, L"    handler now %ls\n", tmp.c_str());
     }
 }
 #endif
diff --git a/src/expand.cpp b/src/expand.cpp
index 77ed98c1b..4c7532fc8 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #ifdef HAVE_SYS_SYSCTL_H
@@ -74,7 +74,7 @@ static bool expand_is_clean(const wcstring &in) {
     if (in.empty()) return true;
 
     // Test characters that have a special meaning in the first character position.
-    if (wcschr(UNCLEAN_FIRST, in.at(0)) != NULL) return false;
+    if (std::wcschr(UNCLEAN_FIRST, in.at(0)) != NULL) return false;
 
     // Test characters that have a special meaning in any character position.
     return in.find_first_of(UNCLEAN) == wcstring::npos;
@@ -572,7 +572,7 @@ static expand_error_t expand_braces(const wcstring &instr, expand_flags_t flags,
     }
 
     length_preceding_braces = (brace_begin - in);
-    length_following_braces = wcslen(brace_end) - 1;
+    length_following_braces = std::wcslen(brace_end) - 1;
     tot_len = length_preceding_braces + length_following_braces;
     item_begin = brace_begin + 1;
     for (const wchar_t *pos = (brace_begin + 1); true; pos++) {
@@ -1218,7 +1218,7 @@ maybe_t<wcstring> expand_abbreviation(const wcstring &src) {
 std::map<wcstring, wcstring> get_abbreviations() {
     // TODO: try to make this cheaper
     const auto &vars = env_stack_t::principal();
-    const size_t fish_abbr_len = wcslen(L"_fish_abbr_");
+    const size_t fish_abbr_len = std::wcslen(L"_fish_abbr_");
     auto names = vars.get_names(0);
     std::map<wcstring, wcstring> result;
     for (const wcstring &name : names) {
diff --git a/src/fallback.cpp b/src/fallback.cpp
index 485c93b51..f028e3f05 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>   // IWYU pragma: keep
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 #include <algorithm>
 #if HAVE_GETTEXT
@@ -37,7 +37,7 @@
 #include <ncurses/term.h>
 #endif
 #include <signal.h>  // IWYU pragma: keep
-#include <wchar.h>   // IWYU pragma: keep
+#include <cwchar>   // IWYU pragma: keep
 
 #include "common.h"    // IWYU pragma: keep
 #include "fallback.h"  // IWYU pragma: keep
@@ -75,7 +75,7 @@ int fish_mkstemp_cloexec(char *name_template) {
 /// are not referenced in this file.
 // cppcheck-suppress unusedFunction
 [[gnu::unused]] static wchar_t *wcsdup_fallback(const wchar_t *in) {
-    size_t len = wcslen(in);
+    size_t len = std::wcslen(in);
     wchar_t *out = (wchar_t *)malloc(sizeof(wchar_t) * (len + 1));
     if (out == 0) {
         return 0;
@@ -397,7 +397,7 @@ int flock(int fd, int op) {
 // thread-specific locale.
 double fish_compat::wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t loc) {
     locale_t prev_locale = uselocale(loc);
-    double ret = wcstod(enptr, endptr);
+    double ret = std::wcstod(enptr, endptr);
     uselocale(prev_locale);
     return ret;
 }
diff --git a/src/fallback.h b/src/fallback.h
index 93745df55..50796cad6 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -10,7 +10,7 @@
 // between the weak linking of `wcsdup` and `wcscasecmp` via `#define`s below and the declarations
 // in <wchar.h>. At least on OS X if we don't do this we get compilation errors do to the macro
 // substitution if wchar.h is included after this header.
-#include <wchar.h>  // IWYU pragma: keep
+#include <cwchar>  // IWYU pragma: keep
 
 /// The column width of ambiguous East Asian characters.
 extern int g_fish_ambiguous_width;
@@ -137,7 +137,7 @@ wchar_t *wcsndup(const wchar_t *in, size_t c);
 
 #ifndef HAVE_WCSLCPY
 /// Copy src to string dst of size siz.  At most siz-1 characters will be copied.  Always NUL
-/// terminates (unless siz == 0).  Returns wcslen(src); if retval >= siz, truncation occurred.
+/// terminates (unless siz == 0).  Returns std::wcslen(src); if retval >= siz, truncation occurred.
 ///
 /// This is the OpenBSD strlcpy function, modified for wide characters, and renamed to reflect this
 /// change.
diff --git a/src/fish.cpp b/src/fish.cpp
index 236c28a1b..4ec0ab190 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -250,7 +250,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
                     debug_level = (int)tmp;
                 } else {
-                    fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
                     exit(1);
                 }
                 break;
@@ -285,7 +285,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 break;
             }
             case 'v': {
-                fwprintf(stdout, _(L"%s, version %s\n"), PACKAGE_NAME, get_fish_version());
+                std::fwprintf(stdout, _(L"%s, version %s\n"), PACKAGE_NAME, get_fish_version());
                 exit(0);
                 break;
             }
@@ -299,7 +299,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
                     debug_stack_frames = (int)tmp;
                 } else {
-                    fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
                     exit(1);
                 }
                 break;
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 26c67e014..61633dc10 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #include <wctype.h>
 
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <vector>
@@ -55,7 +55,7 @@ static int ret = 0;
 static wcstring read_file(FILE *f) {
     wcstring result;
     while (1) {
-        wint_t c = fgetwc(f);
+        wint_t c = std::fgetwc(f);
 
         if (c == WEOF) {
             if (ferror(f)) {
@@ -157,7 +157,7 @@ static void dump_node(indent_t node_indent, const parse_node_t &node, const wcst
         nextc_str[1] = L'c';
         nextc_str[2] = nextc + '@';
     }
-    fwprintf(stderr, L"{off %4u, len %4u, indent %2u, kw %ls, %ls} [%ls|%ls|%ls]\n",
+    std::fwprintf(stderr, L"{off %4u, len %4u, indent %2u, kw %ls, %ls} [%ls|%ls|%ls]\n",
              node.source_start, node.source_length, node_indent, keyword_description(node.keyword),
              token_type_description(node.type), prevc_str, source_txt.c_str(), nextc_str);
 }
@@ -252,7 +252,7 @@ static wcstring prettify(const wcstring &src, bool do_indent) {
 
     if (dump_parse_tree) {
         const wcstring dump = parse_dump_tree(parse_tree, src);
-        fwprintf(stderr, L"%ls\n", dump.c_str());
+        std::fwprintf(stderr, L"%ls\n", dump.c_str());
     }
 
     // We may have a forest of disconnected trees on a parse failure. We have to handle all nodes
@@ -442,7 +442,7 @@ int main(int argc, char *argv[]) {
                 break;
             }
             case 'v': {
-                fwprintf(stderr, _(L"%ls, version %s\n"), program_name, get_fish_version());
+                std::fwprintf(stderr, _(L"%ls, version %s\n"), program_name, get_fish_version());
                 exit(0);
                 break;
             }
@@ -472,7 +472,7 @@ int main(int argc, char *argv[]) {
                 if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
                     debug_level = (int)tmp;
                 } else {
-                    fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
                     exit(1);
                 }
                 break;
@@ -487,7 +487,7 @@ int main(int argc, char *argv[]) {
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
                     debug_stack_frames = (int)tmp;
                 } else {
-                    fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
                     exit(1);
                 }
                 break;
@@ -506,7 +506,7 @@ int main(int argc, char *argv[]) {
     wcstring src;
     if (argc == 0) {
         if (output_type == output_type_file) {
-            fwprintf(stderr, _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
+            std::fwprintf(stderr, _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
                      program_name);
             exit(1);
         }
@@ -518,11 +518,11 @@ int main(int argc, char *argv[]) {
             fclose(fh);
             output_location = *argv;
         } else {
-            fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, strerror(errno));
+            std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, strerror(errno));
             exit(1);
         }
     } else {
-        fwprintf(stderr, _(L"Too many arguments\n"));
+        std::fwprintf(stderr, _(L"Too many arguments\n"));
         exit(1);
     }
 
@@ -544,11 +544,11 @@ int main(int argc, char *argv[]) {
         case output_type_file: {
             FILE *fh = fopen(output_location, "w");
             if (fh) {
-                fputws(output_wtext.c_str(), fh);
+                std::fputws(output_wtext.c_str(), fh);
                 fclose(fh);
                 exit(0);
             } else {
-                fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
+                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
                          strerror(errno));
                 exit(1);
             }
@@ -564,6 +564,6 @@ int main(int argc, char *argv[]) {
         }
     }
 
-    fputws(str2wcstring(colored_output).c_str(), stdout);
+    std::fputws(str2wcstring(colored_output).c_str(), stdout);
     return ret;
 }
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 28a432096..fba073944 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -54,12 +54,12 @@ static bool should_exit(wchar_t wc) {
     recent_chars[3] = c;
     if (c == shell_modes.c_cc[VINTR]) {
         if (recent_chars[2] == shell_modes.c_cc[VINTR]) return true;
-        fwprintf(stderr, L"Press [ctrl-%c] again to exit\n", shell_modes.c_cc[VINTR] + 0x40);
+        std::fwprintf(stderr, L"Press [ctrl-%c] again to exit\n", shell_modes.c_cc[VINTR] + 0x40);
         return false;
     }
     if (c == shell_modes.c_cc[VEOF]) {
         if (recent_chars[2] == shell_modes.c_cc[VEOF]) return true;
-        fwprintf(stderr, L"Press [ctrl-%c] again to exit\n", shell_modes.c_cc[VEOF] + 0x40);
+        std::fwprintf(stderr, L"Press [ctrl-%c] again to exit\n", shell_modes.c_cc[VEOF] + 0x40);
         return false;
     }
     return memcmp(recent_chars, "exit", 4) == 0 || memcmp(recent_chars, "quit", 4) == 0;
@@ -93,41 +93,41 @@ static char *sequence_name(wchar_t wc) {
 
 /// Return true if the character must be escaped when used in the sequence of chars to be bound in
 /// a `bind` command.
-static bool must_escape(wchar_t wc) { return wcschr(L"[]()<>{}*\\?$#;&|'\"", wc) != NULL; }
+static bool must_escape(wchar_t wc) { return std::wcschr(L"[]()<>{}*\\?$#;&|'\"", wc) != NULL; }
 
 static void ctrl_to_symbol(wchar_t *buf, int buf_len, wchar_t wc, bool bind_friendly) {
     if (ctrl_symbolic_names[wc]) {
         if (bind_friendly) {
-            swprintf(buf, buf_len, L"%ls", ctrl_symbolic_names[wc]);
+            std::swprintf(buf, buf_len, L"%ls", ctrl_symbolic_names[wc]);
         } else {
-            swprintf(buf, buf_len, L"\\c%c  (or %ls)", wc + 0x40, ctrl_symbolic_names[wc]);
+            std::swprintf(buf, buf_len, L"\\c%c  (or %ls)", wc + 0x40, ctrl_symbolic_names[wc]);
         }
     } else {
-        swprintf(buf, buf_len, L"\\c%c", wc + 0x40);
+        std::swprintf(buf, buf_len, L"\\c%c", wc + 0x40);
     }
 }
 
 static void space_to_symbol(wchar_t *buf, int buf_len, wchar_t wc, bool bind_friendly) {
     if (bind_friendly) {
-        swprintf(buf, buf_len, L"\\x%X", wc);
+        std::swprintf(buf, buf_len, L"\\x%X", wc);
     } else {
-        swprintf(buf, buf_len, L"\\x%X  (aka \"space\")", wc);
+        std::swprintf(buf, buf_len, L"\\x%X  (aka \"space\")", wc);
     }
 }
 
 static void del_to_symbol(wchar_t *buf, int buf_len, wchar_t wc, bool bind_friendly) {
     if (bind_friendly) {
-        swprintf(buf, buf_len, L"\\x%X", wc);
+        std::swprintf(buf, buf_len, L"\\x%X", wc);
     } else {
-        swprintf(buf, buf_len, L"\\x%X  (aka \"del\")", wc);
+        std::swprintf(buf, buf_len, L"\\x%X  (aka \"del\")", wc);
     }
 }
 
 static void ascii_printable_to_symbol(wchar_t *buf, int buf_len, wchar_t wc, bool bind_friendly) {
     if (bind_friendly && must_escape(wc)) {
-        swprintf(buf, buf_len, L"\\%c", wc);
+        std::swprintf(buf, buf_len, L"\\%c", wc);
     } else {
-        swprintf(buf, buf_len, L"%c", wc);
+        std::swprintf(buf, buf_len, L"%c", wc);
     }
 }
 
@@ -145,9 +145,9 @@ static wchar_t *char_to_symbol(wchar_t wc, bool bind_friendly) {
     } else if (wc < 0x80) {  // ASCII characters that are not control characters
         ascii_printable_to_symbol(buf, sizeof(buf) / sizeof(*buf), wc, bind_friendly);
     } else if (wc <= 0xFFFF) {  // BMP Unicode chararacter
-        swprintf(buf, sizeof(buf) / sizeof(*buf), L"\\u%04X", wc);
+        std::swprintf(buf, sizeof(buf) / sizeof(*buf), L"\\u%04X", wc);
     } else {  // Non-BMP Unicode chararacter
-        swprintf(buf, sizeof(buf) / sizeof(*buf), L"\\U%06X", wc);
+        std::swprintf(buf, sizeof(buf) / sizeof(*buf), L"\\U%06X", wc);
     }
 
     return buf;
@@ -159,23 +159,23 @@ static void add_char_to_bind_command(wchar_t wc, std::vector<wchar_t> &bind_char
 
 static void output_bind_command(std::vector<wchar_t> &bind_chars) {
     if (bind_chars.size()) {
-        fputws(L"bind ", stdout);
+        std::fputws(L"bind ", stdout);
         for (size_t i = 0; i < bind_chars.size(); i++) {
-            fputws(char_to_symbol(bind_chars[i], true), stdout);
+            std::fputws(char_to_symbol(bind_chars[i], true), stdout);
         }
-        fputws(L" 'do something'\n", stdout);
+        std::fputws(L" 'do something'\n", stdout);
         bind_chars.clear();
     }
 }
 
 static void output_info_about_char(wchar_t wc) {
-    fwprintf(stderr, L"hex: %4X  char: %ls\n", wc, char_to_symbol(wc, false));
+    std::fwprintf(stderr, L"hex: %4X  char: %ls\n", wc, char_to_symbol(wc, false));
 }
 
 static bool output_matching_key_name(wchar_t wc) {
     char *name = sequence_name(wc);
     if (name) {
-        fwprintf(stdout, L"bind -k %s 'do something'\n", name);
+        std::fwprintf(stdout, L"bind -k %s 'do something'\n", name);
         free(name);
         return true;
     }
@@ -187,11 +187,11 @@ static double output_elapsed_time(double prev_tstamp, bool first_char_seen) {
     double now = timef();
     long long int delta_tstamp_us = 1000000 * (now - prev_tstamp);
 
-    if (delta_tstamp_us >= 200000 && first_char_seen) fputwc(L'\n', stderr);
+    if (delta_tstamp_us >= 200000 && first_char_seen) std::fputwc(L'\n', stderr);
     if (delta_tstamp_us >= 1000000) {
-        fwprintf(stderr, L"              ");
+        std::fwprintf(stderr, L"              ");
     } else {
-        fwprintf(stderr, L"(%3lld.%03lld ms)  ", delta_tstamp_us / 1000, delta_tstamp_us % 1000);
+        std::fwprintf(stderr, L"(%3lld.%03lld ms)  ", delta_tstamp_us / 1000, delta_tstamp_us % 1000);
     }
     return now;
 }
@@ -202,7 +202,7 @@ static void process_input(bool continuous_mode) {
     double prev_tstamp = 0.0;
     std::vector<wchar_t> bind_chars;
 
-    fwprintf(stderr, L"Press a key\n\n");
+    std::fwprintf(stderr, L"Press a key\n\n");
     while (keep_running) {
         wchar_t wc;
         if (reader_test_and_clear_interrupted()) {
@@ -226,7 +226,7 @@ static void process_input(bool continuous_mode) {
         }
 
         if (should_exit(wc)) {
-            fwprintf(stderr, L"\nExiting at your request.\n");
+            std::fwprintf(stderr, L"\nExiting at your request.\n");
             break;
         }
 
@@ -238,7 +238,7 @@ static void process_input(bool continuous_mode) {
 /// Otherwise just report receipt of the signal.
 static struct sigaction old_sigactions[32];
 static void signal_handler(int signo, siginfo_t *siginfo, void *siginfo_arg) {
-    fwprintf(stdout, _(L"signal #%d (%ls) received\n"), signo, sig2wcs(signo));
+    std::fwprintf(stdout, _(L"signal #%d (%ls) received\n"), signo, sig2wcs(signo));
     if (signo == SIGHUP || signo == SIGTERM || signo == SIGABRT || signo == SIGSEGV) {
         keep_running = false;
     }
@@ -288,11 +288,11 @@ static void setup_and_process_keys(bool continuous_mode) {
     install_our_signal_handlers();
 
     if (continuous_mode) {
-        fwprintf(stderr, L"\n");
-        fwprintf(stderr, L"To terminate this program type \"exit\" or \"quit\" in this window,\n");
-        fwprintf(stderr, L"or press [ctrl-%c] or [ctrl-%c] twice in a row.\n",
+        std::fwprintf(stderr, L"\n");
+        std::fwprintf(stderr, L"To terminate this program type \"exit\" or \"quit\" in this window,\n");
+        std::fwprintf(stderr, L"or press [ctrl-%c] or [ctrl-%c] twice in a row.\n",
                  shell_modes.c_cc[VINTR] + 0x40, shell_modes.c_cc[VEOF] + 0x40);
-        fwprintf(stderr, L"\n");
+        std::fwprintf(stderr, L"\n");
     }
 
     process_input(continuous_mode);
@@ -308,7 +308,7 @@ static bool parse_debug_level_flag() {
     if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
         debug_level = (int)tmp;
     } else {
-        fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag\n"), optarg);
+        std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag\n"), optarg);
         return false;
     }
 
@@ -322,7 +322,7 @@ static bool parse_debug_frames_flag() {
     if (tmp > 0 && tmp <= 128 && !*end && !errno) {
         debug_stack_frames = (int)tmp;
     } else {
-        fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag\n"), optarg);
+        std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag\n"), optarg);
         return false;
     }
 
@@ -359,7 +359,7 @@ static bool parse_flags(int argc, char **argv, bool *continuous_mode) {
                 break;
             }
             case 'v': {
-                fwprintf(stdout, L"%s\n", get_fish_version());
+                std::fwprintf(stdout, L"%s\n", get_fish_version());
                 return false;
             }
             default: {
@@ -374,7 +374,7 @@ static bool parse_flags(int argc, char **argv, bool *continuous_mode) {
 
     argc -= optind;
     if (argc != 0) {
-        fwprintf(stderr, L"Expected no arguments, got %d\n", argc);
+        std::fwprintf(stderr, L"Expected no arguments, got %d\n", argc);
         return false;
     }
 
@@ -388,7 +388,7 @@ int main(int argc, char **argv) {
     if (!parse_flags(argc, argv, &continuous_mode)) return 1;
 
     if (!isatty(STDIN_FILENO)) {
-        fwprintf(stderr, L"Stdin must be attached to a tty.\n");
+        std::fwprintf(stderr, L"Stdin must be attached to a tty.\n");
         return 1;
     }
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 0e24c3c17..9059cf101 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -23,7 +23,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 #include <thread>
 
@@ -114,9 +114,9 @@ static int err_count = 0;
 static void say(const wchar_t *fmt, ...) {
     va_list va;
     va_start(va, fmt);
-    vfwprintf(stdout, fmt, va);
+    std::vfwprintf(stdout, fmt, va);
     va_end(va);
-    fwprintf(stdout, L"\n");
+    std::fwprintf(stdout, L"\n");
 }
 
 /// Print formatted error string.
@@ -130,18 +130,18 @@ static void err(const wchar_t *blah, ...) {
 
     // Show errors in red.
     if (colorize) {
-        fputws(L"\x1B[31m", stdout);
+        std::fputws(L"\x1B[31m", stdout);
     }
-    fwprintf(stdout, L"Error: ");
-    vfwprintf(stdout, blah, va);
+    std::fwprintf(stdout, L"Error: ");
+    std::vfwprintf(stdout, blah, va);
     va_end(va);
 
     // Return to normal color.
     if (colorize) {
-        fputws(L"\x1B[0m", stdout);
+        std::fputws(L"\x1B[0m", stdout);
     }
 
-    fwprintf(stdout, L"\n");
+    std::fwprintf(stdout, L"\n");
 }
 
 /// Joins a wcstring_list_t via commas.
@@ -459,8 +459,8 @@ static void test_format() {
 
         wchar_t wbuf1[128], wbuf2[128];
         format_long_safe(wbuf1, j);
-        swprintf(wbuf2, 128, L"%d", j);
-        do_test(!wcscmp(wbuf1, wbuf2));
+        std::swprintf(wbuf2, 128, L"%d", j);
+        do_test(!std::wcscmp(wbuf1, wbuf2));
     }
 
     long q = LONG_MIN;
@@ -599,12 +599,12 @@ static void test_tokenizer() {
         while (t.next(&token)) {
             if (i >= sizeof types / sizeof *types) {
                 err(L"Too many tokens returned from tokenizer");
-                fwprintf(stdout, L"Got excess token type %ld\n", (long)token.type);
+                std::fwprintf(stdout, L"Got excess token type %ld\n", (long)token.type);
                 break;
             }
             if (types[i] != token.type) {
                 err(L"Tokenization error:");
-                fwprintf(stdout,
+                std::fwprintf(stdout,
                          L"Token number %zu of string \n'%ls'\n, expected type %ld, got token type "
                          L"%ld\n",
                          i + 1, str, (long)types[i], (long)token.type);
@@ -1132,29 +1132,29 @@ static void test_parse_util_cmdsubst_extent() {
     const wchar_t *begin = NULL, *end = NULL;
 
     parse_util_cmdsubst_extent(a, 0, &begin, &end);
-    if (begin != a || end != begin + wcslen(begin)) {
+    if (begin != a || end != begin + std::wcslen(begin)) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
     parse_util_cmdsubst_extent(a, 1, &begin, &end);
-    if (begin != a || end != begin + wcslen(begin)) {
+    if (begin != a || end != begin + std::wcslen(begin)) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
     parse_util_cmdsubst_extent(a, 2, &begin, &end);
-    if (begin != a || end != begin + wcslen(begin)) {
+    if (begin != a || end != begin + std::wcslen(begin)) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
     parse_util_cmdsubst_extent(a, 3, &begin, &end);
-    if (begin != a || end != begin + wcslen(begin)) {
+    if (begin != a || end != begin + std::wcslen(begin)) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
 
     parse_util_cmdsubst_extent(a, 8, &begin, &end);
-    if (begin != a + wcslen(L"echo (")) {
+    if (begin != a + std::wcslen(L"echo (")) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
 
     parse_util_cmdsubst_extent(a, 17, &begin, &end);
-    if (begin != a + wcslen(L"echo (echo (")) {
+    if (begin != a + std::wcslen(L"echo (echo (")) {
         err(L"parse_util_cmdsubst_extent failed on line %ld", (long)__LINE__);
     }
 }
@@ -1864,43 +1864,43 @@ static void test_abbreviations() {
     if (!expanded) err(L"Command not expanded on line %ld", (long)__LINE__);
 
     expanded =
-        reader_expand_abbreviation_in_command(L"gc somebranch", wcslen(L"gc"), vars, &result);
+        reader_expand_abbreviation_in_command(L"gc somebranch", std::wcslen(L"gc"), vars, &result);
     if (!expanded) err(L"gc not expanded");
     if (result != L"git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     // Space separation.
     expanded =
-        reader_expand_abbreviation_in_command(L"gx somebranch", wcslen(L"gc"), vars, &result);
+        reader_expand_abbreviation_in_command(L"gx somebranch", std::wcslen(L"gc"), vars, &result);
     if (!expanded) err(L"gx not expanded");
     if (result != L"git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     expanded = reader_expand_abbreviation_in_command(L"echo hi ; gc somebranch",
-                                                     wcslen(L"echo hi ; g"), vars, &result);
+                                                     std::wcslen(L"echo hi ; g"), vars, &result);
     if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo hi ; git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     expanded = reader_expand_abbreviation_in_command(
-        L"echo (echo (echo (echo (gc ", wcslen(L"echo (echo (echo (echo (gc"), vars, &result);
+        L"echo (echo (echo (echo (gc ", std::wcslen(L"echo (echo (echo (echo (gc"), vars, &result);
     if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo (echo (echo (echo (git checkout ")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     // If commands should be expanded.
-    expanded = reader_expand_abbreviation_in_command(L"if gc", wcslen(L"if gc"), vars, &result);
+    expanded = reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars, &result);
     if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"if git checkout")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     // Others should not be.
-    expanded = reader_expand_abbreviation_in_command(L"of gc", wcslen(L"of gc"), vars, &result);
+    expanded = reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars, &result);
     if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     // Others should not be.
     expanded =
-        reader_expand_abbreviation_in_command(L"command gc", wcslen(L"command gc"), vars, &result);
+        reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"), vars, &result);
     if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     vars.pop();
@@ -2042,10 +2042,10 @@ struct pager_layout_testcase_t {
 
             wcstring text = sd.line(0).to_string();
             if (text != expected) {
-                fwprintf(stderr, L"width %zu got %zu<%ls>, expected %zu<%ls>\n", this->width,
+                std::fwprintf(stderr, L"width %zu got %zu<%ls>, expected %zu<%ls>\n", this->width,
                          text.length(), text.c_str(), expected.length(), expected.c_str());
                 for (size_t i = 0; i < std::max(text.length(), expected.length()); i++) {
-                    fwprintf(stderr, L"i %zu got <%lx> expected <%lx>\n", i,
+                    std::fwprintf(stderr, L"i %zu got <%lx> expected <%lx>\n", i,
                              i >= text.length() ? 0xffff : text[i],
                              i >= expected.length() ? 0xffff : expected[i]);
                 }
@@ -2137,7 +2137,7 @@ static void test_1_word_motion(word_motion_t motion, move_word_style_t style,
         size_t char_idx = (motion == word_motion_left ? idx - 1 : idx);
         wchar_t wc = command.at(char_idx);
         bool will_stop = !sm.consume_char(wc);
-        // fwprintf(stdout, L"idx %lu, looking at %lu (%c): %d\n", idx, char_idx, (char)wc,
+        // std::fwprintf(stdout, L"idx %lu, looking at %lu (%c): %d\n", idx, char_idx, (char)wc,
         //          will_stop);
         bool expected_stop = (stops.count(idx) > 0);
         if (will_stop != expected_stop) {
@@ -2384,7 +2384,7 @@ static void test_wcstod() {
     auto tod_test = [](const wchar_t *a, const char *b) {
         char *narrow_end = nullptr;
         wchar_t *wide_end = nullptr;
-        double val1 = wcstod(a, &wide_end);
+        double val1 = std::wcstod(a, &wide_end);
         double val2 = strtod(b, &narrow_end);
         do_test((std::isnan(val1) && std::isnan(val2)) || fabs(val1 - val2) <= __DBL_EPSILON__);
         do_test(wide_end - a == narrow_end - b);
@@ -2699,7 +2699,7 @@ static void test_1_completion(wcstring line, const wcstring &completion, complet
     wcstring result =
         completion_apply_to_command_line(completion, flags, line, &cursor_pos, append_only);
     if (result != expected) {
-        fwprintf(stderr, L"line %ld: %ls + %ls -> [%ls], expected [%ls]\n", source_line,
+        std::fwprintf(stderr, L"line %ld: %ls + %ls -> [%ls], expected [%ls]\n", source_line,
                  line.c_str(), completion.c_str(), result.c_str(), expected.c_str());
     }
     do_test(result == expected);
@@ -2743,12 +2743,12 @@ static void perform_one_autosuggestion_cd_test(const wcstring &command, const wc
     bool expects_error = (expected == L"<error>");
 
     if (comps.empty() && !expects_error) {
-        fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
+        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
                  command.c_str());
         do_test_from(!comps.empty(), line);
         return;
     } else if (!comps.empty() && expects_error) {
-        fwprintf(stderr,
+        std::fwprintf(stderr,
                  L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
                  L"for command %ls\n",
                  line, command.c_str());
@@ -2760,12 +2760,12 @@ static void perform_one_autosuggestion_cd_test(const wcstring &command, const wc
         const completion_t &suggestion = comps.at(0);
 
         if (suggestion.completion != expected) {
-            fwprintf(
+            std::fwprintf(
                 stderr,
                 L"line %ld: complete() for cd returned the wrong expected string for command %ls\n",
                 line, command.c_str());
-            fwprintf(stderr, L"  actual: %ls\n", suggestion.completion.c_str());
-            fwprintf(stderr, L"expected: %ls\n", expected.c_str());
+            std::fwprintf(stderr, L"  actual: %ls\n", suggestion.completion.c_str());
+            std::fwprintf(stderr, L"expected: %ls\n", expected.c_str());
             do_test_from(suggestion.completion == expected, line);
         }
     }
@@ -2779,12 +2779,12 @@ static void perform_one_completion_cd_test(const wcstring &command, const wcstri
     bool expects_error = (expected == L"<error>");
 
     if (comps.empty() && !expects_error) {
-        fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
+        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
                  command.c_str());
         do_test_from(!comps.empty(), line);
         return;
     } else if (!comps.empty() && expects_error) {
-        fwprintf(stderr,
+        std::fwprintf(stderr,
                  L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
                  L"for command %ls\n",
                  line, command.c_str());
@@ -2796,12 +2796,12 @@ static void perform_one_completion_cd_test(const wcstring &command, const wcstri
         const completion_t &suggestion = comps.at(0);
 
         if (suggestion.completion != expected) {
-            fwprintf(stderr,
+            std::fwprintf(stderr,
                      L"line %ld: complete() for cd tab completion returned the wrong expected "
                      L"string for command %ls\n",
                      line, command.c_str());
-            fwprintf(stderr, L"  actual: %ls\n", suggestion.completion.c_str());
-            fwprintf(stderr, L"expected: %ls\n", expected.c_str());
+            std::fwprintf(stderr, L"  actual: %ls\n", suggestion.completion.c_str());
+            std::fwprintf(stderr, L"expected: %ls\n", expected.c_str());
             do_test_from(suggestion.completion == expected, line);
         }
     }
@@ -2918,9 +2918,9 @@ static void perform_one_autosuggestion_should_ignore_test(const wcstring &comman
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
-        fwprintf(stderr, L"line %ld: complete() expected to return nothing for %ls\n", line,
+        std::fwprintf(stderr, L"line %ld: complete() expected to return nothing for %ls\n", line,
                  command.c_str());
-        fwprintf(stderr, L"  instead got: %ls\n", suggestion.c_str());
+        std::fwprintf(stderr, L"  instead got: %ls\n", suggestion.c_str());
     }
 }
 
@@ -3862,7 +3862,7 @@ void history_tests_t::test_history_speed(void)
         if (stop >= end)
             break;
     }
-    fwprintf(stdout, L"%lu items - %.2f msec per item\n", (unsigned long)count,
+    std::fwprintf(stdout, L"%lu items - %.2f msec per item\n", (unsigned long)count,
              (stop - start) * 1E6 / count);
     hist->clear();
 }
@@ -3945,7 +3945,7 @@ static void test_new_parser_fuzzing() {
     bool log_it = true;
     unsigned long max_len = 5;
     for (unsigned long len = 0; len < max_len; len++) {
-        if (log_it) fwprintf(stderr, L"%lu / %lu...", len, max_len);
+        if (log_it) std::fwprintf(stderr, L"%lu / %lu...", len, max_len);
 
         // We wish to look at all permutations of 4 elements of 'fuzzes' (with replacement).
         // Construct an int and keep incrementing it.
@@ -3954,7 +3954,7 @@ static void test_new_parser_fuzzing() {
                                       &src)) {
             parse_tree_from_string(src, parse_flag_continue_after_error, &node_tree, &errors);
         }
-        if (log_it) fwprintf(stderr, L"done (%lu)\n", permutation);
+        if (log_it) std::fwprintf(stderr, L"done (%lu)\n", permutation);
     }
     double end = timef();
     if (log_it) say(L"All fuzzed in %f seconds!", end - start);
@@ -4136,9 +4136,9 @@ static void test_new_parser_errors() {
 static wcstring_list_t separate_by_format_specifiers(const wchar_t *format) {
     wcstring_list_t result;
     const wchar_t *cursor = format;
-    const wchar_t *end = format + wcslen(format);
+    const wchar_t *end = format + std::wcslen(format);
     while (cursor < end) {
-        const wchar_t *next_specifier = wcschr(cursor, '%');
+        const wchar_t *next_specifier = std::wcschr(cursor, '%');
         if (next_specifier == NULL) {
             next_specifier = end;
         }
@@ -4157,7 +4157,7 @@ static wcstring_list_t separate_by_format_specifiers(const wchar_t *format) {
 
         cursor++;
         // Flag
-        if (wcschr(L"#0- +'", *cursor)) cursor++;
+        if (std::wcschr(L"#0- +'", *cursor)) cursor++;
         // Minimum field width
         while (iswdigit(*cursor)) cursor++;
         // Precision
@@ -4166,9 +4166,9 @@ static wcstring_list_t separate_by_format_specifiers(const wchar_t *format) {
             while (iswdigit(*cursor)) cursor++;
         }
         // Length modifier
-        if (!wcsncmp(cursor, L"ll", 2) || !wcsncmp(cursor, L"hh", 2)) {
+        if (!std::wcsncmp(cursor, L"ll", 2) || !std::wcsncmp(cursor, L"hh", 2)) {
             cursor += 2;
-        } else if (wcschr(L"hljtzqL", *cursor)) {
+        } else if (std::wcschr(L"hljtzqL", *cursor)) {
             cursor++;
         }
         // The format specifier itself. We allow any character except NUL.
@@ -5177,7 +5177,7 @@ int main(int argc, char **argv) {
             exit(-1);
         }
         if (!strcmp(wd, "/")) {
-            fwprintf(stderr,
+            std::fwprintf(stderr,
                      L"Unable to find 'tests' directory, which should contain file test.fish\n");
             exit(EXIT_FAILURE);
         }
diff --git a/src/function.cpp b/src/function.cpp
index bffa0d8cf..1f43efd54 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -8,7 +8,7 @@
 #include <dirent.h>
 #include <pthread.h>
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <map>
@@ -122,8 +122,8 @@ static void autoload_names(std::unordered_set<wcstring> &names, int get_hidden)
             const wchar_t *suffix;
             if (!get_hidden && fn[0] == L'_') continue;
 
-            suffix = wcsrchr(fn, L'.');
-            if (suffix && (wcscmp(suffix, L".fish") == 0)) {
+            suffix = std::wcsrchr(fn, L'.');
+            if (suffix && (std::wcscmp(suffix, L".fish") == 0)) {
                 wcstring name(fn, suffix - fn);
                 names.insert(name);
             }
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index 2cafa4533..4feca703b 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -1,6 +1,6 @@
 #include "config.h"  // IWYU pragma: keep
 
-#include <wchar.h>
+#include <cwchar>
 #include "future_feature_flags.h"
 
 /// The set of features applying to this instance.
@@ -18,7 +18,7 @@ const features_t::metadata_t features_t::metadata[features_t::flag_count] = {
 const struct features_t::metadata_t *features_t::metadata_for(const wchar_t *name) {
     assert(name && "null flag name");
     for (const auto &md : metadata) {
-        if (!wcscmp(name, md.name)) return &md;
+        if (!std::wcscmp(name, md.name)) return &md;
     }
     return nullptr;
 }
@@ -38,7 +38,7 @@ void features_t::set_from_string(const wcstring &str) {
         // A "no-" prefix inverts the sense.
         if (string_prefixes_string(L"no-", name)) {
             value = false;
-            name += 3;  // wcslen(L"no-")
+            name += 3;  // std::wcslen(L"no-")
         }
         // Look for a feature with this name. If we don't find it, assume it's a group name and set
         // all features whose group contain it. Do nothing even if the string is unrecognized; this
@@ -49,7 +49,7 @@ void features_t::set_from_string(const wcstring &str) {
             this->set(md->flag, value);
         } else {
             for (const metadata_t &md : metadata) {
-                if (wcsstr(md.groups, name) || !wcscmp(name, L"all")) {
+                if (std::wcsstr(md.groups, name) || !std::wcscmp(name, L"all")) {
                     this->set(md.flag, value);
                 }
             }
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 1f18e49b6..d45426024 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -532,7 +532,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
 
     // Hacky support for %self which must be an unquoted literal argument.
     if (buffstr == PROCESS_EXPAND_SELF_STR) {
-        std::fill_n(colors, wcslen(PROCESS_EXPAND_SELF_STR), highlight_role_t::operat);
+        std::fill_n(colors, std::wcslen(PROCESS_EXPAND_SELF_STR), highlight_role_t::operat);
         return;
     }
 
@@ -554,7 +554,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                     if (escaped_char == L'\0') {
                         fill_end = in_pos;
                         fill_color = highlight_role_t::error;
-                    } else if (wcschr(L"~%", escaped_char)) {
+                    } else if (std::wcschr(L"~%", escaped_char)) {
                         if (in_pos == 1) {
                             fill_end = in_pos + 1;
                         }
@@ -562,12 +562,12 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                         if (bracket_count) {
                             fill_end = in_pos + 1;
                         }
-                    } else if (wcschr(L"abefnrtv*?$(){}[]'\"<>^ \\#;|&", escaped_char)) {
+                    } else if (std::wcschr(L"abefnrtv*?$(){}[]'\"<>^ \\#;|&", escaped_char)) {
                         fill_end = in_pos + 1;
-                    } else if (wcschr(L"c", escaped_char)) {
+                    } else if (std::wcschr(L"c", escaped_char)) {
                         // Like \ci. So highlight three characters.
                         fill_end = in_pos + 1;
-                    } else if (wcschr(L"uUxX01234567", escaped_char)) {
+                    } else if (std::wcschr(L"uUxX01234567", escaped_char)) {
                         long long res = 0;
                         int chars = 2;
                         int base = 16;
@@ -720,7 +720,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                         // Backslash
                         if (in_pos + 1 < buff_len) {
                             const wchar_t escaped_char = buffstr.at(in_pos + 1);
-                            if (wcschr(L"\\\"\n$", escaped_char)) {
+                            if (std::wcschr(L"\\\"\n$", escaped_char)) {
                                 colors[in_pos] = highlight_role_t::escape;      // backslash
                                 colors[in_pos + 1] = highlight_role_t::escape;  // escaped char
                                 in_pos += 1;                                 // skip over backslash
@@ -1366,9 +1366,9 @@ static void highlight_universal_internal(const wcstring &buffstr,
 
         // Highlight matching parenthesis.
         const wchar_t c = buffstr.at(pos);
-        if (wcschr(L"()[]{}", c)) {
-            int step = wcschr(L"({[", c) ? 1 : -1;
-            wchar_t dec_char = *(wcschr(L"()[]{}", c) + step);
+        if (std::wcschr(L"()[]{}", c)) {
+            int step = std::wcschr(L"({[", c) ? 1 : -1;
+            wchar_t dec_char = *(std::wcschr(L"()[]{}", c) + step);
             wchar_t inc_char = c;
             int level = 0;
             bool match_found = false;
diff --git a/src/history.cpp b/src/history.cpp
index 36b3d081f..1c7abddfb 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -16,7 +16,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -422,7 +422,7 @@ static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
             c = (unsigned char)*pos;
             res = 1;
         } else {
-            res = mbrtowc(&c, pos, end - pos, &state);
+            res = std::mbrtowc(&c, pos, end - pos, &state);
         }
 
         if (res == (size_t)-1) {
diff --git a/src/input.cpp b/src/input.cpp
index 4d82bc413..dffa07f15 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -2,7 +2,7 @@
 #include "config.h"
 
 #include <errno.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 #if HAVE_TERM_H
 #include <curses.h>
@@ -746,7 +746,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
 
     for (size_t i = 0; i < terminfo_mappings.size(); i++) {
         const terminfo_mapping_t &m = terminfo_mappings.at(i);
-        if (!wcscmp(name, m.name)) {
+        if (!std::wcscmp(name, m.name)) {
             res = m.seq;
             err = EILSEQ;
             break;
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 3ebbe92d7..655f5dfc2 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <deque>
 #include <list>
@@ -165,7 +165,7 @@ void update_wait_on_escape_ms(const environment_t &vars) {
 
     long tmp = fish_wcstol(escape_time_ms->as_string().c_str());
     if (errno || tmp < 10 || tmp >= 5000) {
-        fwprintf(stderr,
+        std::fwprintf(stderr,
                  L"ignoring fish_escape_delay_ms: value '%ls' "
                  L"is not an integer or is < 10 or >= 5000 ms\n",
                  escape_time_ms->as_string().c_str());
@@ -201,7 +201,7 @@ wchar_t input_common_readch(int timed) {
             }
 
             char bb = b;
-            size_t sz = mbrtowc(&res, &bb, 1, &state);
+            size_t sz = std::mbrtowc(&res, &bb, 1, &state);
 
             switch (sz) {
                 case (size_t)(-1): {
diff --git a/src/intern.cpp b/src/intern.cpp
index a13e1b9ff..1073a6b07 100644
--- a/src/intern.cpp
+++ b/src/intern.cpp
@@ -2,7 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -12,7 +12,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "intern.h"
 
-bool string_less_than_string(const wchar_t *a, const wchar_t *b) { return wcscmp(a, b) < 0; }
+bool string_less_than_string(const wchar_t *a, const wchar_t *b) { return std::wcscmp(a, b) < 0; }
 
 /// The table of intern'd strings.
 owning_lock<std::vector<const wchar_t *>> string_table;
@@ -25,7 +25,7 @@ static const wchar_t *intern_with_dup(const wchar_t *in, bool dup) {
 
     const wchar_t *result;
     auto iter = std::lower_bound(table->begin(), table->end(), in, string_less_than_string);
-    if (iter != table->end() && wcscmp(*iter, in) == 0) {
+    if (iter != table->end() && std::wcscmp(*iter, in) == 0) {
         result = *iter;
     } else {
         result = dup ? wcsdup(in) : in;
diff --git a/src/io.cpp b/src/io.cpp
index 5dcff30de..5f2ed4166 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include "common.h"
 #include "exec.h"
@@ -18,17 +18,17 @@
 
 io_data_t::~io_data_t() = default;
 
-void io_close_t::print() const { fwprintf(stderr, L"close %d\n", fd); }
+void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
 
-void io_fd_t::print() const { fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
+void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
 
-void io_file_t::print() const { fwprintf(stderr, L"file (%s)\n", filename_cstr); }
+void io_file_t::print() const { std::fwprintf(stderr, L"file (%s)\n", filename_cstr); }
 
 void io_pipe_t::print() const {
-    fwprintf(stderr, L"pipe {%d} (input: %s)\n", pipe_fd(), is_input_ ? "yes" : "no");
+    std::fwprintf(stderr, L"pipe {%d} (input: %s)\n", pipe_fd(), is_input_ ? "yes" : "no");
 }
 
-void io_bufferfill_t::print() const { fwprintf(stderr, L"bufferfill {%d}\n", write_fd_.fd()); }
+void io_bufferfill_t::print() const { std::fwprintf(stderr, L"bufferfill {%d}\n", write_fd_.fd()); }
 
 void io_buffer_t::append_from_stream(const output_stream_t &stream) {
     if (stream.empty()) return;
@@ -223,21 +223,21 @@ void io_print(const io_chain_t &chain)
 {
     if (chain.empty())
     {
-        fwprintf(stderr, L"Empty chain %p\n", &chain);
+        std::fwprintf(stderr, L"Empty chain %p\n", &chain);
         return;
     }
 
-    fwprintf(stderr, L"Chain %p (%ld items):\n", &chain, (long)chain.size());
+    std::fwprintf(stderr, L"Chain %p (%ld items):\n", &chain, (long)chain.size());
     for (size_t i=0; i < chain.size(); i++)
     {
         const shared_ptr<io_data_t> &io = chain.at(i);
         if (io.get() == NULL)
         {
-            fwprintf(stderr, L"\t(null)\n");
+            std::fwprintf(stderr, L"\t(null)\n");
         }
         else
         {
-            fwprintf(stderr, L"\t%lu: fd:%d, ", (unsigned long)i, io->fd);
+            std::fwprintf(stderr, L"\t%lu: fd:%d, ", (unsigned long)i, io->fd);
             io->print();
         }
     }
diff --git a/src/io.h b/src/io.h
index 6f5e12447..4017af474 100644
--- a/src/io.h
+++ b/src/io.h
@@ -383,7 +383,7 @@ class output_stream_t {
 
     const separated_buffer_t<wcstring> &buffer() const { return buffer_; }
 
-    void append(const wchar_t *s) { append(s, wcslen(s)); }
+    void append(const wchar_t *s) { append(s, std::wcslen(s)); }
 
     void append(wchar_t s) { append(&s, 1); }
 
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 7aec8803e..a9d799b43 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -246,7 +246,7 @@ void iothread_drain_all() {
     }
 #if TIME_DRAIN
     double after = timef();
-    fwprintf(stdout, L"(Waited %.02f msec for %d thread(s) to drain)\n", 1000 * (after - now),
+    std::fwprintf(stdout, L"(Waited %.02f msec for %d thread(s) to drain)\n", 1000 * (after - now),
              thread_count);
 #endif
 }
diff --git a/src/lru.h b/src/lru.h
index f91c63f74..0cf7b08c2 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -2,7 +2,7 @@
 #ifndef FISH_LRU_H
 #define FISH_LRU_H
 
-#include <wchar.h>
+#include <cwchar>
 
 #include <unordered_map>
 
diff --git a/src/output.cpp b/src/output.cpp
index 581964101..5cca74258 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -17,7 +17,7 @@
 #include <ncurses/term.h>
 #endif
 #include <limits.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -379,7 +379,7 @@ int outputter_t::writech(wint_t ch) {
         len = 1;
     } else {
         mbstate_t state = {};
-        len = wcrtomb(buff, ch, &state);
+        len = std::wcrtomb(buff, ch, &state);
         if (len == (size_t)-1) {
             return 1;
         }
@@ -389,7 +389,7 @@ int outputter_t::writech(wint_t ch) {
 }
 
 /// Write a wide character string to stdout. This should not be used to output things like warning
-/// messages; just use debug() or fwprintf() for that. It should only be used to output user
+/// messages; just use debug() or std::fwprintf() for that. It should only be used to output user
 /// supplied strings that might contain literal bytes; e.g., "\342\224\214" from issue #1894. This
 /// is needed because those strings may contain chars specially encoded using ENCODE_DIRECT_BASE.
 void outputter_t::writestr(const wchar_t *str) {
@@ -508,7 +508,7 @@ rgb_color_t parse_color(const env_var_t &var, bool is_background) {
 
 #if 0
     wcstring desc = result.description();
-    fwprintf(stdout, L"Parsed %ls from %ls (%s)\n", desc.c_str(), val.c_str(),
+    std::fwprintf(stdout, L"Parsed %ls from %ls (%s)\n", desc.c_str(), val.c_str(),
              is_background ? "background" : "foreground");
 #endif
 
diff --git a/src/pager.cpp b/src/pager.cpp
index 5066240d2..03273037d 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -2,7 +2,7 @@
 
 // IWYU pragma: no_include <cstddef>
 #include <stddef.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -852,7 +852,7 @@ void pager_t::set_search_field_shown(bool flag) { this->search_field_shown = fla
 bool pager_t::is_search_field_shown() const { return this->search_field_shown; }
 
 size_t pager_t::cursor_position() const {
-    size_t result = wcslen(SEARCH_FIELD_PROMPT) + this->search_field_line.position;
+    size_t result = std::wcslen(SEARCH_FIELD_PROMPT) + this->search_field_line.position;
     // Clamp it to the right edge.
     if (available_term_width > 0 && result + 1 > available_term_width) {
         result = available_term_width - 1;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 6e8d2af36..3d83c9035 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -628,7 +628,7 @@ parse_execution_result_t parse_execution_context_t::report_errors(
 
         // Print it.
         if (!should_suppress_stderr_for_tests()) {
-            fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
+            std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
     }
     return parse_execution_errored;
@@ -673,7 +673,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     // status to 127, which is the standard number used by other shells like bash and zsh.
 
     const wchar_t *const cmd = cmd_str.c_str();
-    const wchar_t *const equals_ptr = wcschr(cmd, L'=');
+    const wchar_t *const equals_ptr = std::wcschr(cmd, L'=');
     if (equals_ptr != NULL) {
         // Try to figure out if this is a pure variable assignment (foo=bar), or if this appears to
         // be running a command (foo=bar ruby...).
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 245573d12..52be15884 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -4,7 +4,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <string>
@@ -407,17 +407,17 @@ class parse_ll_t {
         bool logit = false;
         if (logit) {
             int count = 0;
-            fwprintf(stderr, L"Applying production:\n");
+            std::fwprintf(stderr, L"Applying production:\n");
             for (int i = 0;; i++) {
                 production_element_t elem = production[i];
                 if (!production_element_is_valid(elem)) break;  // all done, bail out
                 parse_token_type_t type = production_element_type(elem);
                 parse_keyword_t keyword = production_element_keyword(elem);
-                fwprintf(stderr, L"\t%ls <%ls>\n", token_type_description(type),
+                std::fwprintf(stderr, L"\t%ls <%ls>\n", token_type_description(type),
                          keyword_description(keyword));
                 count++;
             }
-            if (!count) fwprintf(stderr, L"\t<empty>\n");
+            if (!count) std::fwprintf(stderr, L"\t<empty>\n");
         }
 
         // Get the parent index. But we can't get the parent parse node yet, since it may be made
@@ -524,9 +524,9 @@ void parse_ll_t::dump_stack(void) const {
         }
     }
 
-    fwprintf(stderr, L"Stack dump (%zu elements):\n", symbol_stack.size());
+    std::fwprintf(stderr, L"Stack dump (%zu elements):\n", symbol_stack.size());
     for (size_t idx = 0; idx < stack_lines.size(); idx++) {
-        fwprintf(stderr, L"    %ls\n", stack_lines.at(idx).c_str());
+        std::fwprintf(stderr, L"    %ls\n", stack_lines.at(idx).c_str());
     }
 }
 #endif
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index aa909b1ce..bcca52cb4 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -6,7 +6,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -117,7 +117,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
 
     for (pos = const_cast<wchar_t *>(in); *pos; pos++) {
         if (prev != '\\') {
-            if (wcschr(L"\'\"", *pos)) {
+            if (std::wcschr(L"\'\"", *pos)) {
                 wchar_t *q_end = quote_end(pos);
                 if (q_end && *q_end) {
                     pos = q_end;
@@ -165,7 +165,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
     }
 
     if (end) {
-        *end = paran_count ? (wchar_t *)in + wcslen(in) : paran_end;
+        *end = paran_count ? (wchar_t *)in + std::wcslen(in) : paran_end;
     }
 
     return 1;
@@ -239,7 +239,7 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
 
     CHECK(buff, );
 
-    const size_t bufflen = wcslen(buff);
+    const size_t bufflen = std::wcslen(buff);
     assert(cursor_pos <= bufflen);
 
     // ap and bp are the beginning and end of the tightest command substitition found so far.
@@ -360,7 +360,7 @@ void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar
     // pos is equivalent to cursor_pos within the range of the command substitution {begin, end}.
     size_t offset_within_cmdsubst = cursor_pos - (cmdsubst_begin - buff);
 
-    size_t bufflen = wcslen(buff);
+    size_t bufflen = std::wcslen(buff);
 
     a = cmdsubst_begin + offset_within_cmdsubst;
     b = a;
@@ -462,7 +462,7 @@ static wchar_t get_quote(const wcstring &cmd_str, size_t len) {
         } else {
             if (cmd[i] == L'\'' || cmd[i] == L'\"') {
                 const wchar_t *end = quote_end(&cmd[i]);
-                // fwprintf( stderr, L"Jump %d\n",  end-cmd );
+                // std::fwprintf( stderr, L"Jump %d\n",  end-cmd );
                 if ((end == 0) || (!*end) || (end > cmd + len)) {
                     res = cmd[i];
                     break;
@@ -500,7 +500,7 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
     bool finished = cmdlen != 0;
     if (finished) {
         finished = (quote == NULL);
-        if (finished && wcschr(L" \t\n\r", cmd_tmp[cmdlen - 1])) {
+        if (finished && std::wcschr(L" \t\n\r", cmd_tmp[cmdlen - 1])) {
             finished = cmdlen > 1 && cmd_tmp[cmdlen - 2] == L'\\';
         }
     }
@@ -509,7 +509,7 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
 
     if (offset != 0) {
         if (finished) {
-            while ((cmd_tmp[prev_pos] != 0) && (wcschr(L";|", cmd_tmp[prev_pos]) != 0)) prev_pos++;
+            while ((cmd_tmp[prev_pos] != 0) && (std::wcschr(L";|", cmd_tmp[prev_pos]) != 0)) prev_pos++;
             *offset = prev_pos;
         } else {
             *offset = pos;
@@ -729,7 +729,7 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
             // indentation level if a new line starts with whitespace.
             size_t prev_char_idx = i;
             while (prev_char_idx--) {
-                if (!wcschr(L" \n\t\r", src.at(prev_char_idx))) break;
+                if (!std::wcschr(L" \n\t\r", src.at(prev_char_idx))) break;
                 indents.at(prev_char_idx) = last_indent;
             }
         }
@@ -739,7 +739,7 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
     // indented even if it is empty.
     size_t suffix_idx = src_size;
     while (suffix_idx--) {
-        if (!wcschr(L" \n\t\r", src.at(suffix_idx))) break;
+        if (!std::wcschr(L" \n\t\r", src.at(suffix_idx))) break;
         indents.at(suffix_idx) = last_trailing_indent;
     }
 
@@ -771,7 +771,7 @@ static int parser_is_pipe_forbidden(const wcstring &word) {
 }
 
 bool parse_util_argument_is_help(const wchar_t *s) {
-    return wcscmp(L"-h", s) == 0 || wcscmp(L"--help", s) == 0;
+    return std::wcscmp(L"-h", s) == 0 || std::wcscmp(L"--help", s) == 0;
 }
 
 /// Check if the first argument under the given node is --help.
diff --git a/src/parser.cpp b/src/parser.cpp
index 72a263258..a8d30e0bf 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2,7 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stdio.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -275,19 +275,19 @@ static void print_profile(const std::vector<std::unique_ptr<profile_item_t>> &it
             continue;
         }
 
-        if (fwprintf(out, L"%d\t%d\t", my_time, me->parse + me->exec) < 0) {
+        if (std::fwprintf(out, L"%d\t%d\t", my_time, me->parse + me->exec) < 0) {
             wperror(L"fwprintf");
             return;
         }
 
         for (i = 0; i < me->level; i++) {
-            if (fwprintf(out, L"-") < 0) {
+            if (std::fwprintf(out, L"-") < 0) {
                 wperror(L"fwprintf");
                 return;
             }
         }
 
-        if (fwprintf(out, L"> %ls\n", me->cmd.c_str()) < 0) {
+        if (std::fwprintf(out, L"> %ls\n", me->cmd.c_str()) < 0) {
             wperror(L"fwprintf");
             return;
         }
@@ -301,7 +301,7 @@ void parser_t::emit_profiling(const char *path) const {
     if (!f) {
         debug(1, _(L"Could not write profiling information to file '%s'"), path);
     } else {
-        if (fwprintf(f, _(L"Time\tSum\tCommand\n"), profile_items.size()) < 0) {
+        if (std::fwprintf(f, _(L"Time\tSum\tCommand\n"), profile_items.size()) < 0) {
             wperror(L"fwprintf");
         } else {
             print_profile(profile_items, f);
@@ -639,7 +639,7 @@ int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_t
         this->get_backtrace(cmd, error_list, backtrace_and_desc);
 
         // Print it.
-        fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
+        std::fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
         return 1;
     }
     this->eval(ps, io, block_type);
diff --git a/src/path.cpp b/src/path.cpp
index 4117cec41..2523e4ef9 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
diff --git a/src/postfork.cpp b/src/postfork.cpp
index e24b3fd62..ca3607628 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -11,7 +11,7 @@
 #if FISH_USE_POSIX_SPAWN
 #include <spawn.h>
 #endif
-#include <wchar.h>
+#include <cwchar>
 
 #include "common.h"
 #include "exec.h"
diff --git a/src/proc.cpp b/src/proc.cpp
index c5005cbcb..e2ededc77 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -11,7 +11,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #if HAVE_TERM_H
@@ -441,7 +441,7 @@ static wcstring truncate_command(const wcstring &cmd) {
     }
 
     // Truncation required.
-    const size_t ellipsis_length = wcslen(ellipsis_str);  // no need for wcwidth
+    const size_t ellipsis_length = std::wcslen(ellipsis_str);  // no need for wcwidth
     size_t trunc_length = max_len - ellipsis_length;
     // Eat trailing whitespace.
     while (trunc_length > 0 && iswspace(cmd.at(trunc_length - 1))) {
@@ -547,7 +547,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
                     // we don't need to.
                     const wcstring job_number_desc =
                         only_one_job ? wcstring() : format_string(_(L"Job %d, "), j->job_id);
-                    fwprintf(stdout, _(L"%ls: %ls\'%ls\' terminated by signal %ls (%ls)"),
+                    std::fwprintf(stdout, _(L"%ls: %ls\'%ls\' terminated by signal %ls (%ls)"),
                              program_name, job_number_desc.c_str(),
                              truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
                              signal_get_desc(s.signal_code()));
@@ -556,13 +556,13 @@ static bool process_clean_after_marking(bool allow_interactive) {
                         only_one_job ? wcstring() : format_string(L"from job %d, ", j->job_id);
                     const wchar_t *fmt =
                         _(L"%ls: Process %d, \'%ls\' %ls\'%ls\' terminated by signal %ls (%ls)");
-                    fwprintf(stdout, fmt, program_name, p->pid, p->argv0(), job_number_desc.c_str(),
+                    std::fwprintf(stdout, fmt, program_name, p->pid, p->argv0(), job_number_desc.c_str(),
                              truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
                              signal_get_desc(s.signal_code()));
                 }
 
                 if (clr_eol) outputter_t::stdoutput().term_puts(clr_eol, 1);
-                fwprintf(stdout, L"\n");
+                std::fwprintf(stdout, L"\n");
             }
             found = false;
             // clear status so it is not reported more than once
@@ -641,7 +641,7 @@ unsigned long proc_get_jiffies(process_t *p) {
         wchan, nswap, cnswap;
     char comm[1024];
 
-    swprintf(fn, FN_SIZE, L"/proc/%d/stat", p->pid);
+    std::swprintf(fn, FN_SIZE, L"/proc/%d/stat", p->pid);
     FILE *f = wfopen(fn, "r");
     if (!f) return 0;
 
diff --git a/src/reader.cpp b/src/reader.cpp
index b29fec63d..505dae066 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -32,7 +32,7 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>
@@ -564,7 +564,7 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
         parse_util_token_extent(cmd, cmdline.size() - 1, &begin, NULL, NULL, NULL);
         bool last_token_contains_uppercase = false;
         if (begin) {
-            const wchar_t *end = begin + wcslen(begin);
+            const wchar_t *end = begin + std::wcslen(begin);
             last_token_contains_uppercase = (std::find_if(begin, end, iswupper) != end);
         }
         if (!last_token_contains_uppercase) {
@@ -884,9 +884,9 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
     if (exec_subshell(fish_title_command, parser_t::principal_parser(), lst,
                       false /* ignore exit status */) != -1 &&
         !lst.empty()) {
-        fputws(L"\x1B]0;", stdout);
+        std::fputws(L"\x1B]0;", stdout);
         for (size_t i = 0; i < lst.size(); i++) {
-            fputws(lst.at(i).c_str(), stdout);
+            std::fputws(lst.at(i).c_str(), stdout);
         }
         ignore_result(write(STDOUT_FILENO, "\a", 1));
     }
@@ -1146,7 +1146,7 @@ bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str,
         // space). Expand abbreviations.
         if (has_expansion_triggering_char && allow_expand_abbreviations) {
             assert(range_end > 0);
-            assert(wcschr(expansion_triggering_chars, str.at(range_end - 1)));
+            assert(std::wcschr(expansion_triggering_chars, str.at(range_end - 1)));
             expand_abbreviation_as_necessary(1);
         }
         cursor = range_end;
@@ -1330,7 +1330,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         if (!cursor_at_end && iswspace(last_char)) return nothing;
 
         // On the other hand, if the line ends with a quote, don't go dumping stuff after the quote.
-        if (wcschr(L"'\"", last_char) && cursor_at_end) return nothing;
+        if (std::wcschr(L"'\"", last_char) && cursor_at_end) return nothing;
 
         // Try normal completions.
         completion_request_flags_t complete_flags = COMPLETION_REQUEST_AUTOSUGGESTION;
@@ -1467,7 +1467,7 @@ static bool reader_can_replace(const wcstring &in, int flags) {
 
     // Test characters that have a special meaning in any character position.
     while (*str) {
-        if (wcschr(REPLACE_UNCLEAN, *str)) return false;
+        if (std::wcschr(REPLACE_UNCLEAN, *str)) return false;
         str++;
     }
 
@@ -2007,7 +2007,7 @@ parser_test_error_bits_t reader_shell_test(const wcstring &b) {
         if (!string_suffixes_string(L"\n", error_desc)) {
             error_desc.push_back(L'\n');
         }
-        fwprintf(stderr, L"\n%ls", error_desc.c_str());
+        std::fwprintf(stderr, L"\n%ls", error_desc.c_str());
     }
     return res;
 }
@@ -2204,13 +2204,13 @@ void reader_import_history_if_necessary() {
 bool shell_is_exiting() { return s_pending_exit.should_exit(); }
 
 void reader_bg_job_warning() {
-    fputws(_(L"There are still jobs active:\n"), stdout);
-    fputws(_(L"\n   PID  Command\n"), stdout);
+    std::fputws(_(L"There are still jobs active:\n"), stdout);
+    std::fputws(_(L"\n   PID  Command\n"), stdout);
 
     job_iterator_t jobs;
     while (job_t *j = jobs.next()) {
         if (!j->is_completed()) {
-            fwprintf(stdout, L"%6d  %ls\n", j->processes[0]->pid, j->command_wcstr());
+            std::fwprintf(stdout, L"%6d  %ls\n", j->processes[0]->pid, j->command_wcstr());
         }
     }
     fputws(L"\n", stdout);
@@ -2438,7 +2438,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
             is_interactive_read = 1;
             c = input_readch();
             is_interactive_read = was_interactive_read;
-            // fwprintf(stderr, L"C: %lx\n", (long)c);
+            // std::fwprintf(stderr, L"C: %lx\n", (long)c);
 
             if (((!fish_reserved_codepoint(c))) && (c > 31) && (c != 127) && can_read(0)) {
                 wchar_t arr[READAHEAD_MAX + 1];
@@ -2499,7 +2499,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         if (command_ends_paging(c, focused_on_search_field)) {
             clear_pager();
         }
-        // fwprintf(stderr, L"\n\nchar: %ls\n\n", describe_char(c).c_str());
+        // std::fwprintf(stderr, L"\n\nchar: %ls\n\n", describe_char(c).c_str());
 
         switch (c) {
             // Go to beginning of line.
@@ -2618,7 +2618,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     // up to the end of the token we're completing.
                     const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
 
-                    // fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
+                    // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
                     complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
                                                       COMPLETION_REQUEST_DESCRIPTIONS |
                                                       COMPLETION_REQUEST_FUZZY_MATCH;
@@ -2727,7 +2727,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
             case R_YANK: {
                 yank_str = kill_yank();
                 insert_string(active_edit_line(), yank_str);
-                yank_len = wcslen(yank_str);
+                yank_len = std::wcslen(yank_str);
                 break;
             }
             case R_YANK_POP: {
@@ -2736,7 +2736,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                     yank_str = kill_yank_rotate();
                     insert_string(active_edit_line(), yank_str);
-                    yank_len = wcslen(yank_str);
+                    yank_len = std::wcslen(yank_str);
                 }
                 break;
             }
@@ -3476,7 +3476,7 @@ static int read_ni(int fd, const io_chain_t &io) {
         } else {
             wcstring sb;
             parser.get_backtrace(str, errors, sb);
-            fwprintf(stderr, L"%ls", sb.c_str());
+            std::fwprintf(stderr, L"%ls", sb.c_str());
             res = 1;
         }
     } else {
diff --git a/src/screen.cpp b/src/screen.cpp
index 560868739..bc3161a40 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -13,7 +13,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #if HAVE_CURSES_H
 #include <curses.h>
@@ -101,12 +101,12 @@ static bool is_screen_name_escape_seq(const wchar_t *code, size_t *resulting_len
         return false;
     }
     const wchar_t *const screen_name_end_sentinel = L"\x1B\\";
-    const wchar_t *screen_name_end = wcsstr(&code[2], screen_name_end_sentinel);
+    const wchar_t *screen_name_end = std::wcsstr(&code[2], screen_name_end_sentinel);
     if (screen_name_end == NULL) {
         // Consider just <esc>k to be the code.
         *resulting_length = 2;
     } else {
-        const wchar_t *escape_sequence_end = screen_name_end + wcslen(screen_name_end_sentinel);
+        const wchar_t *escape_sequence_end = screen_name_end + std::wcslen(screen_name_end_sentinel);
         *resulting_length = escape_sequence_end - code;
     }
     return true;
@@ -403,7 +403,7 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
         if ((s->desired.cursor.x + cw) > screen_width) {
             // Current line is soft wrapped (assuming we support it).
             s->desired.line(s->desired.cursor.y).is_soft_wrapped = true;
-            // fwprintf(stderr, L"\n\n1 Soft wrapping %d\n\n", s->desired.cursor.y);
+            // std::fwprintf(stderr, L"\n\n1 Soft wrapping %d\n\n", s->desired.cursor.y);
 
             line_no = (int)s->desired.line_count();
             s->desired.add_line();
@@ -863,7 +863,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
 
     // Compute the width of the autosuggestion at all possible truncation offsets.
     std::vector<size_t> autosuggest_truncated_widths;
-    autosuggest_truncated_widths.reserve(1 + wcslen(autosuggestion));
+    autosuggest_truncated_widths.reserve(1 + std::wcslen(autosuggestion));
     size_t autosuggest_total_width = 0;
     for (size_t i = 0; autosuggestion[i] != L'\0'; i++) {
         autosuggest_truncated_widths.push_back(autosuggest_total_width);
diff --git a/src/screen.h b/src/screen.h
index 3a0afba73..d44e40457 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 #include <sys/stat.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <cstddef>
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 38ec77029..8de6f3da2 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <string>
@@ -223,7 +223,7 @@ tok_t tokenizer_t::read_string() {
                 this->buff = end;
             } else {
                 const wchar_t *error_loc = this->buff;
-                this->buff += wcslen(this->buff);
+                this->buff += std::wcslen(this->buff);
                 if ((!this->accept_unfinished)) {
                     return this->call_error(tokenizer_error_t::unterminated_quote, buff_start,
                                             error_loc);
@@ -637,7 +637,7 @@ bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
 bool move_word_state_machine_t::is_path_component_character(wchar_t c) {
     // Always treat separators as first. All this does is ensure that we treat ^ as a string
     // character instead of as stderr redirection, which I hypothesize is usually what is desired.
-    return tok_is_string_character(c, true) && !wcschr(L"/={,}'\"", c);
+    return tok_is_string_character(c, true) && !std::wcschr(L"/={,}'\"", c);
 }
 
 bool move_word_state_machine_t::consume_char_path_components(wchar_t c) {
@@ -650,7 +650,7 @@ bool move_word_state_machine_t::consume_char_path_components(wchar_t c) {
         s_end
     };
 
-    // fwprintf(stdout, L"state %d, consume '%lc'\n", state, c);
+    // std::fwprintf(stdout, L"state %d, consume '%lc'\n", state, c);
     bool consumed = false;
     while (state != s_end && !consumed) {
         switch (state) {
diff --git a/src/util.cpp b/src/util.cpp
index 550c1830b..5bb89e5ba 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <sys/time.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include "common.h"
@@ -85,7 +85,7 @@ int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
             // names are literally identical because that won't occur given how this function is
             // used. And even if it were to occur (due to being reused in some other context) it
             // would be so rare that it isn't worth optimizing for.
-            retval = wcscmp(orig_a, orig_b);
+            retval = std::wcscmp(orig_a, orig_b);
             return retval < 0 ? -1 : retval == 0 ? 0 : 1;
         }
         return -1;  // string a is a prefix of b and b is longer
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index b56da9d99..c8e47b30c 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -39,7 +39,7 @@ wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
         return input.substr(0, max_len);
     }
     if (etype == ellipsis_type::Prettiest) {
-        return input.substr(0, max_len - wcslen(ellipsis_str)).append(ellipsis_str);
+        return input.substr(0, max_len - std::wcslen(ellipsis_str)).append(ellipsis_str);
     }
     wcstring output = input.substr(0, max_len - 1);
     output.push_back(ellipsis_char);
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index 155759ad2..2355db669 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -39,7 +39,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stdio.h>
-#include <wchar.h>
+#include <cwchar>
 #include <string.h>
 
 // This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves
@@ -159,7 +159,7 @@ int wgetopter_t::_advance_to_next_argv(  //!OCLINT(high cyclomatic complexity)
     // The special ARGV-element `--' means premature end of options. Skip it like a null option,
     // then exchange with previous non-options as if it were an option, then skip everything
     // else like a non-option.
-    if (woptind != argc && !wcscmp(argv[woptind], L"--")) {
+    if (woptind != argc && !std::wcscmp(argv[woptind], L"--")) {
         woptind++;
 
         if (first_nonopt != last_nonopt && last_nonopt != woptind) {
@@ -198,14 +198,14 @@ int wgetopter_t::_advance_to_next_argv(  //!OCLINT(high cyclomatic complexity)
 int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
     // Look at and handle the next short option-character.
     wchar_t c = *nextchar++;
-    const wchar_t *temp = wcschr(shortopts, c);
+    const wchar_t *temp = std::wcschr(shortopts, c);
 
     // Increment `woptind' when we start to process its last character.
     if (*nextchar == '\0') ++woptind;
 
     if (temp == NULL || c == ':') {
         if (wopterr) {
-            fwprintf(stderr, _(L"%ls: Invalid option -- %lc\n"), argv[0], (wint_t)c);
+            std::fwprintf(stderr, _(L"%ls: Invalid option -- %lc\n"), argv[0], (wint_t)c);
         }
         woptopt = c;
 
@@ -236,7 +236,7 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
         } else if (woptind == argc) {
             if (wopterr) {
                 // 1003.2 specifies the format of this message.
-                fwprintf(stderr, _(L"%ls: Option requires an argument -- %lc\n"), argv[0],
+                std::fwprintf(stderr, _(L"%ls: Option requires an argument -- %lc\n"), argv[0],
                          (wint_t)c);
             }
             woptopt = c;
@@ -263,14 +263,14 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
         else {
             if (wopterr) {
                 if (argv[woptind - 1][1] == '-')  // --option
-                    fwprintf(stderr, _(L"%ls: Option '--%ls' doesn't allow an argument\n"), argv[0],
+                    std::fwprintf(stderr, _(L"%ls: Option '--%ls' doesn't allow an argument\n"), argv[0],
                              pfound->name);
                 else
                     // +option or -option
-                    fwprintf(stderr, _(L"%ls: Option '%lc%ls' doesn't allow an argument\n"),
+                    std::fwprintf(stderr, _(L"%ls: Option '%lc%ls' doesn't allow an argument\n"),
                              argv[0], argv[woptind - 1][0], pfound->name);
             }
-            nextchar += wcslen(nextchar);
+            nextchar += std::wcslen(nextchar);
             *retval = '?';
             return;
         }
@@ -279,15 +279,15 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
             woptarg = argv[woptind++];
         else {
             if (wopterr)
-                fwprintf(stderr, _(L"%ls: Option '%ls' requires an argument\n"), argv[0],
+                std::fwprintf(stderr, _(L"%ls: Option '%ls' requires an argument\n"), argv[0],
                          argv[woptind - 1]);
-            nextchar += wcslen(nextchar);
+            nextchar += std::wcslen(nextchar);
             *retval = missing_arg_return_colon ? ':' : '?';
             return;
         }
     }
 
-    nextchar += wcslen(nextchar);
+    nextchar += std::wcslen(nextchar);
     if (longind != NULL) *longind = option_index;
     if (pfound->flag) {
         *(pfound->flag) = pfound->val;
@@ -306,7 +306,7 @@ const struct woption *wgetopter_t::_find_matching_long_opt(const struct woption
 
     // Test all long options for either exact match or abbreviated matches.
     for (const struct woption *p = longopts; p->name; p++, option_index++) {
-        if (!wcsncmp(p->name, nextchar, nameend - nextchar)) {
+        if (!std::wcsncmp(p->name, nextchar, nameend - nextchar)) {
             if ((unsigned int)(nameend - nextchar) == (unsigned int)wcslen(p->name)) {
                 // Exact match found.
                 pfound = p;
@@ -342,9 +342,9 @@ bool wgetopter_t::_handle_long_opt(int argc, wchar_t **argv, const struct woptio
 
     if (ambig && !exact) {
         if (wopterr) {
-            fwprintf(stderr, _(L"%ls: Option '%ls' is ambiguous\n"), argv[0], argv[woptind]);
+            std::fwprintf(stderr, _(L"%ls: Option '%ls' is ambiguous\n"), argv[0], argv[woptind]);
         }
-        nextchar += wcslen(nextchar);
+        nextchar += std::wcslen(nextchar);
         woptind++;
         *retval = '?';
         return true;
@@ -358,13 +358,13 @@ bool wgetopter_t::_handle_long_opt(int argc, wchar_t **argv, const struct woptio
     // Can't find it as a long option.  If this is not getopt_long_only, or the option starts
     // with '--' or is not a valid short option, then it's an error. Otherwise interpret it as a
     // short option.
-    if (!long_only || argv[woptind][1] == '-' || wcschr(shortopts, *nextchar) == NULL) {
+    if (!long_only || argv[woptind][1] == '-' || std::wcschr(shortopts, *nextchar) == NULL) {
         if (wopterr) {
             if (argv[woptind][1] == '-')  // --option
-                fwprintf(stderr, _(L"%ls: Unrecognized option '--%ls'\n"), argv[0], nextchar);
+                std::fwprintf(stderr, _(L"%ls: Unrecognized option '--%ls'\n"), argv[0], nextchar);
             else
                 // +option or -option
-                fwprintf(stderr, _(L"%ls: Unrecognized option '%lc%ls'\n"), argv[0],
+                std::fwprintf(stderr, _(L"%ls: Unrecognized option '%lc%ls'\n"), argv[0],
                          argv[woptind][0], nextchar);
         }
         nextchar = (wchar_t *)L"";
@@ -441,7 +441,7 @@ int wgetopter_t::_wgetopt_internal(int argc, wchar_t **argv, const wchar_t *opts
     // This distinction seems to be the most useful approach.
     if (longopts != NULL &&
         (argv[woptind][1] == '-' ||
-         (long_only && (argv[woptind][2] || !wcschr(shortopts, argv[woptind][1]))))) {
+         (long_only && (argv[woptind][2] || !std::wcschr(shortopts, argv[woptind][1]))))) {
         int retval;
         if (_handle_long_opt(argc, argv, longopts, longind, long_only, &retval)) return retval;
     }
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 6172c3042..398b155d8 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 
 #include <memory>
 #include <string>
@@ -82,7 +82,7 @@ static bool wildcard_has_impl(const wchar_t *str, size_t len, bool internal) {
 
 bool wildcard_has(const wchar_t *str, bool internal) {
     assert(str != NULL);
-    return wildcard_has_impl(str, wcslen(str), internal);
+    return wildcard_has_impl(str, std::wcslen(str), internal);
 }
 
 bool wildcard_has(const wcstring &str, bool internal) {
@@ -99,9 +99,9 @@ static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const
                                                        bool leading_dots_fail_to_match) {
     // Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow
     // literal matches.
-    if (leading_dots_fail_to_match && (!wcscmp(str, L".") || !wcscmp(str, L".."))) {
+    if (leading_dots_fail_to_match && (!std::wcscmp(str, L".") || !std::wcscmp(str, L".."))) {
         // The string is '.' or '..'. Return true if the wildcard exactly matches.
-        return wcscmp(str, wc) ? fuzzy_match_none : fuzzy_match_exact;
+        return std::wcscmp(str, wc) ? fuzzy_match_none : fuzzy_match_exact;
     }
 
     // Near Linear implementation as proposed here https://research.swtch.com/glob.
@@ -235,8 +235,8 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
 
         // If we are not replacing the token, be careful to only store the part of the string after
         // the wildcard.
-        assert(!full_replacement || wcslen(wc) <= wcslen(str));
-        wcstring out_completion = full_replacement ? params.orig : str + wcslen(wc);
+        assert(!full_replacement || std::wcslen(wc) <= std::wcslen(str));
+        wcstring out_completion = full_replacement ? params.orig : str + std::wcslen(wc);
         wcstring out_desc = resolve_description(params.orig, &out_completion, params.expand_flags,
                                                 params.desc_func);
 
@@ -248,7 +248,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
     } else if (next_wc_char_pos > 0) {
         // Here we have a non-wildcard prefix. Note that we don't do fuzzy matching for stuff before
         // a wildcard, so just do case comparison and then recurse.
-        if (wcsncmp(str, wc, next_wc_char_pos) == 0) {
+        if (std::wcsncmp(str, wc, next_wc_char_pos) == 0) {
             // Normal match.
             return wildcard_complete_internal(str + next_wc_char_pos, wc + next_wc_char_pos, params,
                                               flags, out);
@@ -822,8 +822,8 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
     }
 
     // Get the current segment and compute interesting properties about it.
-    const size_t wc_len = wcslen(wc);
-    const wchar_t *const next_slash = wcschr(wc, L'/');
+    const size_t wc_len = std::wcslen(wc);
+    const wchar_t *const next_slash = std::wcschr(wc, L'/');
     const bool is_last_segment = (next_slash == NULL);
     const size_t wc_segment_len = next_slash ? next_slash - wc : wc_len;
     const wcstring wc_segment = wcstring(wc, wc_segment_len);
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 5dda39b87..b9aefb108 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -19,7 +19,7 @@
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wchar.h>
+#include <cwchar>
 #include <wctype.h>
 
 #include <string>
@@ -260,9 +260,9 @@ int wunlink(const wcstring &file_name) {
 void wperror(const wchar_t *s) {
     int e = errno;
     if (s[0] != L'\0') {
-        fwprintf(stderr, L"%ls: ", s);
+        std::fwprintf(stderr, L"%ls: ", s);
     }
-    fwprintf(stderr, L"%s\n", strerror(e));
+    std::fwprintf(stderr, L"%s\n", strerror(e));
 }
 
 int make_fd_nonblocking(int fd) {
@@ -604,7 +604,7 @@ int fish_iswgraph(wint_t wc) {
 /// Convenience variants on fish_wcwswidth().
 ///
 /// See fallback.h for the normal definitions.
-int fish_wcswidth(const wchar_t *str) { return fish_wcswidth(str, wcslen(str)); }
+int fish_wcswidth(const wchar_t *str) { return fish_wcswidth(str, std::wcslen(str)); }
 
 /// Convenience variants on fish_wcwswidth().
 ///
@@ -635,7 +635,7 @@ int fish_wcstoi(const wchar_t *str, const wchar_t **endptr, int base) {
 
     errno = 0;
     wchar_t *_endptr;
-    long result = wcstol(str, &_endptr, base);
+    long result = std::wcstol(str, &_endptr, base);
     if (result > INT_MAX) {
         result = INT_MAX;
         errno = ERANGE;
@@ -673,7 +673,7 @@ long fish_wcstol(const wchar_t *str, const wchar_t **endptr, int base) {
 
     errno = 0;
     wchar_t *_endptr;
-    long result = wcstol(str, &_endptr, base);
+    long result = std::wcstol(str, &_endptr, base);
     while (iswspace(*_endptr)) ++_endptr;  // skip trailing whitespace
     if (!errno && *_endptr) {
         if (_endptr == str) {
@@ -704,7 +704,7 @@ long long fish_wcstoll(const wchar_t *str, const wchar_t **endptr, int base) {
 
     errno = 0;
     wchar_t *_endptr;
-    long long result = wcstoll(str, &_endptr, base);
+    long long result = std::wcstoll(str, &_endptr, base);
     while (iswspace(*_endptr)) ++_endptr;  // skip trailing whitespace
     if (!errno && *_endptr) {
         if (_endptr == str) {
@@ -737,7 +737,7 @@ unsigned long long fish_wcstoull(const wchar_t *str, const wchar_t **endptr, int
 
     errno = 0;
     wchar_t *_endptr;
-    unsigned long long result = wcstoull(str, &_endptr, base);
+    unsigned long long result = std::wcstoull(str, &_endptr, base);
     while (iswspace(*_endptr)) ++_endptr;  // skip trailing whitespace
     if (!errno && *_endptr) {
         if (_endptr == str) {
@@ -755,7 +755,7 @@ unsigned long long fish_wcstoull(const wchar_t *str, const wchar_t **endptr, int
 double fish_wcstod(const wchar_t *str, wchar_t **endptr) {
     // The "fast path." If we're all ASCII and we fit inline, use strtod().
     char narrow[128];
-    size_t len = wcslen(str);
+    size_t len = std::wcslen(str);
     size_t len_plus_0 = 1 + len;
     auto is_digit = [](wchar_t c) { return '0' <= c && c <= '9'; };
     if (len_plus_0 <= sizeof narrow && std::all_of(str, str + len, is_digit)) {

From aaacdb89b628eb37bb2e7c461662a677baf9b23e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 15:07:07 -0700
Subject: [PATCH 0045/1732] Switches over to cstring from string.h.

---
 src/builtin.cpp              |  4 ++--
 src/builtin_math.cpp         |  2 +-
 src/builtin_printf.cpp       |  4 ++--
 src/builtin_pwd.cpp          |  4 ++--
 src/builtin_read.cpp         |  4 ++--
 src/builtin_realpath.cpp     |  4 ++--
 src/builtin_set.cpp          |  4 ++--
 src/builtin_test.cpp         |  4 ++--
 src/color.cpp                |  8 ++++----
 src/color.h                  |  4 ++--
 src/common.cpp               | 30 +++++++++++++++---------------
 src/env.cpp                  |  6 +++---
 src/env_universal_common.cpp | 30 +++++++++++++++---------------
 src/exec.cpp                 | 10 +++++-----
 src/expand.cpp               |  4 ++--
 src/fallback.cpp             |  4 ++--
 src/fish.cpp                 |  8 ++++----
 src/fish_indent.cpp          |  8 ++++----
 src/fish_key_reader.cpp      |  6 +++---
 src/fish_tests.cpp           | 26 +++++++++++++-------------
 src/history.cpp              | 36 ++++++++++++++++++------------------
 src/input_common.cpp         |  4 ++--
 src/io.cpp                   |  2 +-
 src/iothread.cpp             |  2 +-
 src/output.cpp               | 16 ++++++++--------
 src/output.h                 |  2 +-
 src/path.cpp                 |  4 ++--
 src/postfork.cpp             |  6 +++---
 src/print_help.cpp           |  4 ++--
 src/reader.cpp               |  8 ++++----
 src/screen.cpp               |  6 +++---
 src/tinyexpr.cpp             | 10 +++++-----
 src/wgetopt.cpp              |  2 +-
 src/wutil.cpp                | 12 ++++++------
 src/wutil.h                  |  2 +-
 35 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index be3c98fbe..76e235813 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <cwchar>
 
@@ -97,7 +97,7 @@ int builtin_count_args(const wchar_t *const *argv) {
 /// This function works like wperror, but it prints its result into the streams.err string instead
 /// to stderr. Used by the builtin commands.
 void builtin_wperror(const wchar_t *s, io_streams_t &streams) {
-    char *err = strerror(errno);
+    char *err = std::strerror(errno);
     if (s != NULL) {
         streams.err.append(s);
         streams.err.append(L": ");
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index a1fb48d25..7798fe1a8 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -3,7 +3,7 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <string.h>
+#include <cstring>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 1bcf05cc8..d12d9c596 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -57,7 +57,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <cwchar>
 #include <wctype.h>
@@ -238,7 +238,7 @@ void builtin_printf_state_t::verify_numeric(const wchar_t *s, const wchar_t *end
         if (errcode == ERANGE) {
             this->fatal_error(L"%ls: %ls", s, _(L"Number out of range"));
         } else {
-            this->fatal_error(L"%ls: %s", s, strerror(errcode));
+            this->fatal_error(L"%ls: %s", s, std::strerror(errcode));
         }
     } else if (*end) {
         if (s == end)
diff --git a/src/builtin_pwd.cpp b/src/builtin_pwd.cpp
index ca668b0ea..66fb64efc 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtin_pwd.cpp
@@ -1,7 +1,7 @@
 // Implementation of the pwd builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <string.h>
+#include <cstring>
 
 #include "builtin.h"
 #include "builtin_pwd.h"
@@ -58,7 +58,7 @@ int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         if (auto real_pwd = wrealpath(pwd)) {
             pwd = std::move(*real_pwd);
         } else {
-            const char *error = strerror(errno);
+            const char *error = std::strerror(errno);
             streams.err.append_format(L"%ls: realpath failed:", cmd, error);
             return STATUS_CMD_ERROR;
         }
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 523fb2d9e..a0f1ab91a 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <cwchar>
 
@@ -319,7 +319,7 @@ static int read_one_char_at_a_time(int fd, wcstring &buff, int nchars, bool spli
             } else {
                 size_t sz = std::mbrtowc(&res, &b, 1, &state);
                 if (sz == (size_t)-1) {
-                    memset(&state, 0, sizeof(state));
+                    std::memset(&state, 0, sizeof(state));
                 } else if (sz != (size_t)-2) {
                     finished = true;
                 }
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 552eae5c1..62edae85b 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <cwchar>
 
 #include "builtin.h"
@@ -43,7 +43,7 @@ int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             // realpath() just couldn't do it. Report the error and make it clear
             // this is an error from our builtin, not the system's realpath.
             streams.err.append_format(L"builtin %ls: %ls: %s\n", cmd, argv[optind],
-                                      strerror(errno));
+                                      std::strerror(errno));
         } else {
             // Who knows. Probably a bug in our wrealpath() implementation.
             streams.err.append_format(_(L"builtin %ls: Invalid path: %ls\n"), cmd, argv[optind]);
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index c57b1d60f..3a18e5a09 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <cwchar>
@@ -295,7 +295,7 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
             any_success = true;
         } else if (looks_like_colon_sep) {
             streams.err.append_format(BUILTIN_SET_PATH_ERROR, cmd, key, dir.c_str(),
-                                      strerror(errno));
+                                      std::strerror(errno));
             streams.err.append_format(BUILTIN_SET_PATH_HINT, cmd, key, key,
                                       std::wcschr(dir.c_str(), L':') + 1);
         }
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index b49fa7bb6..3951a7ecc 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -5,7 +5,7 @@
 
 #include <errno.h>
 #include <stdarg.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -675,7 +675,7 @@ static bool parse_number(const wcstring &arg, number_t *number, wcstring_list_t
             errors.push_back(format_string(_(L"Integer %lld in '%ls' followed by non-digit"),
                                            integral, argcs));
         } else {
-            errors.push_back(format_string(L"%s: '%ls'", strerror(errno), argcs));
+            errors.push_back(format_string(L"%s: '%ls'", std::strerror(errno), argcs));
         }
         return false;
     }
diff --git a/src/color.cpp b/src/color.cpp
index 4dd60ef46..ceaec1ffd 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -11,7 +11,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 
 bool rgb_color_t::try_parse_special(const wcstring &special) {
-    memset(&data, 0, sizeof data);
+    std::memset(&data, 0, sizeof data);
     const wchar_t *name = special.c_str();
     if (!wcscasecmp(name, L"normal")) {
         this->type = type_normal;
@@ -108,7 +108,7 @@ static unsigned char convert_color(const unsigned char rgb[3], const uint32_t *c
 }
 
 bool rgb_color_t::try_parse_rgb(const wcstring &name) {
-    memset(&data, 0, sizeof data);
+    std::memset(&data, 0, sizeof data);
     // We support the following style of rgb formats (case insensitive):
     //  #FA3
     //  #F3A035
@@ -185,7 +185,7 @@ wcstring_list_t rgb_color_t::named_color_names() {
 }
 
 bool rgb_color_t::try_parse_named(const wcstring &str) {
-    memset(&data, 0, sizeof data);
+    std::memset(&data, 0, sizeof data);
     size_t max = sizeof named_colors / sizeof *named_colors;
     for (size_t idx = 0; idx < max; idx++) {
         if (0 == wcscasecmp(str.c_str(), named_colors[idx].name)) {
@@ -299,7 +299,7 @@ void rgb_color_t::parse(const wcstring &str) {
     if (!success) success = try_parse_named(str);
     if (!success) success = try_parse_rgb(str);
     if (!success) {
-        memset(&this->data, 0, sizeof this->data);
+        std::memset(&this->data, 0, sizeof this->data);
         this->type = type_none;
     }
 }
diff --git a/src/color.h b/src/color.h
index ec6d29dbb..2e437b966 100644
--- a/src/color.h
+++ b/src/color.h
@@ -2,7 +2,7 @@
 #ifndef FISH_COLOR_H
 #define FISH_COLOR_H
 
-#include <string.h>
+#include <cstring>
 
 #include <string>
 
@@ -159,7 +159,7 @@ class rgb_color_t {
 
     /// Compare two colors for equality.
     bool operator==(const rgb_color_t &other) const {
-        return type == other.type && !memcmp(&data, &other.data, sizeof data);
+        return type == other.type && !std::memcmp(&data, &other.data, sizeof data);
     }
 
     /// Compare two colors for inequality.
diff --git a/src/common.cpp b/src/common.cpp
index ba7da173d..cb158912f 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <termios.h>
@@ -141,7 +141,7 @@ long convert_digit(wchar_t d, int base) {
 }
 
 /// Test whether the char is a valid hex digit as used by the `escape_string_*()` functions.
-static bool is_hex_digit(int c) { return strchr("0123456789ABCDEF", c) != NULL; }
+static bool is_hex_digit(int c) { return std::strchr("0123456789ABCDEF", c) != NULL; }
 
 /// This is a specialization of `convert_digit()` that only handles base 16 and only uppercase.
 long convert_hex_digit(wchar_t d) {
@@ -170,8 +170,8 @@ bool is_windows_subsystem_for_linux() {
         uname(&info);
 
         // Sample utsname.release under WSL: 4.4.0-17763-Microsoft
-        if (strstr(info.release, "Microsoft") != nullptr) {
-            const char *dash = strchr(info.release, '-');
+        if (std::strstr(info.release, "Microsoft") != nullptr) {
+            const char *dash = std::strchr(info.release, '-');
             if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
                 debug(1, "This version of WSL is not supported and fish will probably not work correctly!\n"
                         "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
@@ -346,11 +346,11 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
             wc = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos];
             result.push_back(wc);
             in_pos++;
-            memset(&state, 0, sizeof state);
+            std::memset(&state, 0, sizeof state);
         } else if (ret == 0) {  // embedded null byte!
             result.push_back(L'\0');
             in_pos++;
-            memset(&state, 0, sizeof state);
+            std::memset(&state, 0, sizeof state);
         } else {  // normal case
             result.push_back(wc);
             in_pos += ret;
@@ -362,7 +362,7 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
 
 wcstring str2wcstring(const char *in, size_t len) { return str2wcs_internal(in, len); }
 
-wcstring str2wcstring(const char *in) { return str2wcs_internal(in, strlen(in)); }
+wcstring str2wcstring(const char *in) { return str2wcs_internal(in, std::strlen(in)); }
 
 wcstring str2wcstring(const std::string &in) {
     // Handles embedded nulls!
@@ -423,11 +423,11 @@ std::string wcs2string(const wcstring &input) {
             converted[0] = wc;
             result.append(converted, 1);
         } else {
-            memset(converted, 0, sizeof converted);
+            std::memset(converted, 0, sizeof converted);
             size_t len = std::wcrtomb(converted, wc, &state);
             if (len == (size_t)-1) {
                 debug(1, L"Wide character U+%4X has no narrow representation", wc);
-                memset(&state, 0, sizeof(state));
+                std::memset(&state, 0, sizeof(state));
             } else {
                 result.append(converted, len);
             }
@@ -467,7 +467,7 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
             size_t len = std::wcrtomb(&out[out_pos], in[in_pos], &state);
             if (len == (size_t)-1) {
                 debug(1, L"Wide character U+%4X has no narrow representation", in[in_pos]);
-                memset(&state, 0, sizeof(state));
+                std::memset(&state, 0, sizeof(state));
             } else {
                 out_pos += len;
             }
@@ -707,8 +707,8 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
     size_t param_idx = 0;
     const char *cursor = msg;
     while (*cursor != '\0') {
-        const char *end = strchr(cursor, '%');
-        if (end == NULL) end = cursor + strlen(cursor);
+        const char *end = std::strchr(cursor, '%');
+        if (end == NULL) end = cursor + std::strlen(cursor);
 
         ignore_result(write(STDERR_FILENO, cursor, end - cursor));
 
@@ -717,7 +717,7 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
             assert(param_idx < sizeof params / sizeof *params);
             const char *format = params[param_idx++];
             if (!format) format = "(null)";
-            ignore_result(write(STDERR_FILENO, format, strlen(format)));
+            ignore_result(write(STDERR_FILENO, format, std::strlen(format)));
             cursor = end + 2;
         } else if (end[0] == '\0') {
             // Must be at the end of the string.
@@ -2138,7 +2138,7 @@ void append_str(char *buff, const char *str, size_t *inout_idx, size_t max_len)
 void format_size_safe(char buff[128], unsigned long long sz) {
     const size_t buff_size = 128;
     const size_t max_len = buff_size - 1;  // need to leave room for a null terminator
-    memset(buff, 0, buff_size);
+    std::memset(buff, 0, buff_size);
     size_t idx = 0;
     const char *const sz_name[] = {"kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL};
     if (sz < 1) {
@@ -2403,7 +2403,7 @@ void redirect_tty_output() {
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
     if (error) {
         debug(0, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
-              strerror(error));
+              std::strerror(error));
     } else {
         debug(0, L"%s:%zu: failed assertion: %s", file, line, msg);
     }
diff --git a/src/env.cpp b/src/env.cpp
index 13d95763e..40bc26b34 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
@@ -411,7 +411,7 @@ static void init_locale(const environment_t &vars) {
     debug(5, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
     debug(5, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
 #ifdef HAVE__NL_MSG_CAT_CNTR
-    if (strcmp(old_msg_locale, new_msg_locale)) {
+    if (std::strcmp(old_msg_locale, new_msg_locale)) {
         // Make change known to GNU gettext.
         extern int _nl_msg_cat_cntr;
         _nl_msg_cat_cntr++;
@@ -455,7 +455,7 @@ static bool does_term_support_setting_title(const environment_t &vars) {
 
         char buf[PATH_MAX];
         int retval = ttyname_r(STDIN_FILENO, buf, PATH_MAX);
-        if (retval != 0 || strstr(buf, "tty") || strstr(buf, "/vc/")) return false;
+        if (retval != 0 || std::strstr(buf, "tty") || std::strstr(buf, "/vc/")) return false;
     }
 
     return true;
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index f30cbad56..cde707860 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #ifdef __CYGWIN__
 #include <sys/mman.h>
 #endif
@@ -123,7 +123,7 @@ static maybe_t<wcstring> default_vars_path() {
 /// On success, updates the cursor to just past the command.
 static bool match(const wchar_t **inout_cursor, const char *cmd) {
     const wchar_t *cursor = *inout_cursor;
-    size_t len = strlen(cmd);
+    size_t len = std::strlen(cmd);
     if (!std::equal(cmd, cmd + len, cursor)) {
         return false;
     }
@@ -445,7 +445,7 @@ bool env_universal_t::write_to_fd(int fd, const wcstring &path) {
     bool success = true;
     std::string contents = serialize_with_vars(vars);
     if (write_loop(fd, contents.data(), contents.size()) < 0) {
-        const char *error = strerror(errno);
+        const char *error = std::strerror(errno);
         debug(0, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(), error);
         success = false;
     }
@@ -460,7 +460,7 @@ bool env_universal_t::write_to_fd(int fd, const wcstring &path) {
 bool env_universal_t::move_new_vars_file_into_place(const wcstring &src, const wcstring &dst) {
     int ret = wrename(src, dst);
     if (ret != 0) {
-        const char *error = strerror(errno);
+        const char *error = std::strerror(errno);
         debug(0, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
               error);
     }
@@ -521,7 +521,7 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
     }
 
     if (!success) {
-        const char *error = strerror(saved_errno);
+        const char *error = std::strerror(saved_errno);
         debug(0, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
     }
     return success;
@@ -583,7 +583,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) {
                 continue;
             }
 #endif
-            const char *error = strerror(errno);
+            const char *error = std::strerror(errno);
             debug(0, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(), error);
             break;
         }
@@ -801,7 +801,7 @@ uvar_format_t env_universal_t::format_for_contents(const std::string &s) {
         if (sscanf(line.c_str(), "# VERSION: %64s", versionbuf) != 1) continue;
 
         // Try reading the version.
-        if (!strcmp(versionbuf, UVARS_VERSION_3_0)) {
+        if (!std::strcmp(versionbuf, UVARS_VERSION_3_0)) {
             return uvar_format_t::fish_3_0;
         } else {
             // Unknown future version.
@@ -946,7 +946,7 @@ static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN],
         strncpy((char *)r.ifr_name, interface, sizeof r.ifr_name - 1);
         r.ifr_name[sizeof r.ifr_name - 1] = 0;
         if (ioctl(dummy, SIOCGIFHWADDR, &r) >= 0) {
-            memcpy(macaddr, r.ifr_hwaddr.sa_data, MAC_ADDRESS_MAX_LEN);
+            std::memcpy(macaddr, r.ifr_hwaddr.sa_data, MAC_ADDRESS_MAX_LEN);
             result = true;
         }
         close(dummy);
@@ -978,7 +978,7 @@ static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN],
 
             size_t alen = sdl.sdl_alen;
             if (alen > MAC_ADDRESS_MAX_LEN) alen = MAC_ADDRESS_MAX_LEN;
-            memcpy(macaddr, sdl.sdl_data + sdl.sdl_nlen, alen);
+            std::memcpy(macaddr, sdl.sdl_data + sdl.sdl_nlen, alen);
             ok = true;
             break;
         }
@@ -1053,7 +1053,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         bool errored = false;
         int fd = shm_open(path, O_RDWR | O_CREAT, 0600);
         if (fd < 0) {
-            const char *error = strerror(errno);
+            const char *error = std::strerror(errno);
             debug(0, _(L"Unable to open shared memory with path '%s': %s"), path, error);
             errored = true;
         }
@@ -1063,7 +1063,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         if (!errored) {
             struct stat buf = {};
             if (fstat(fd, &buf) < 0) {
-                const char *error = strerror(errno);
+                const char *error = std::strerror(errno);
                 debug(0, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
                       error);
                 errored = true;
@@ -1074,7 +1074,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         // Set the size, if it's too small.
         bool set_size = !errored && size < (off_t)sizeof(universal_notifier_shmem_t);
         if (set_size && ftruncate(fd, sizeof(universal_notifier_shmem_t)) < 0) {
-            const char *error = strerror(errno);
+            const char *error = std::strerror(errno);
             debug(0, _(L"Unable to truncate shared memory object with path '%s': %s"), path, error);
             errored = true;
         }
@@ -1084,7 +1084,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
             void *addr = mmap(NULL, sizeof(universal_notifier_shmem_t), PROT_READ | PROT_WRITE,
                               MAP_SHARED, fd, 0);
             if (addr == MAP_FAILED) {
-                const char *error = strerror(errno);
+                const char *error = std::strerror(errno);
                 debug(0, _(L"Unable to memory map shared memory object with path '%s': %s"), path,
                       error);
                 this->region = NULL;
@@ -1489,7 +1489,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
 
     int mkfifo_status = mkfifo(narrow_path.c_str(), 0600);
     if (mkfifo_status == -1 && errno != EEXIST) {
-        const char *error = strerror(errno);
+        const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to make a pipe for universal variables using '%ls': %s");
         debug(0, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
@@ -1498,7 +1498,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
 
     int fd = wopen_cloexec(vars_path, O_RDWR | O_NONBLOCK, 0600);
     if (fd < 0) {
-        const char *error = strerror(errno);
+        const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to open a pipe for universal variables using '%ls': %s");
         debug(0, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
diff --git a/src/exec.cpp b/src/exec.cpp
index 7d55ca99e..05ebea52a 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -14,7 +14,7 @@
 #include <spawn.h>
 #endif
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stack>
@@ -78,7 +78,7 @@ static bool redirection_is_to_real_file(const shared_ptr<io_data_t> &io) {
     if (io && io->io_mode == io_mode_t::file) {
         // It's a file redirection. Compare the path to /dev/null.
         const char *path = static_cast<const io_file_t *>(io.get())->filename_cstr;
-        if (strcmp(path, "/dev/null") != 0) {
+        if (std::strcmp(path, "/dev/null") != 0) {
             // It's not /dev/null.
             result = true;
         }
@@ -104,9 +104,9 @@ char *get_interpreter(const char *command, char *interpreter, size_t buff_size)
         close(fd);
     }
 
-    if (strncmp(interpreter, "#! /", 4) == 0) {
+    if (std::strncmp(interpreter, "#! /", 4) == 0) {
         return interpreter + 3;
-    } else if (strncmp(interpreter, "#!/", 3) == 0) {
+    } else if (std::strncmp(interpreter, "#!/", 3) == 0) {
         return interpreter + 2;
     }
 
@@ -1126,7 +1126,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
             const char *cursor = begin;
             while (cursor < end) {
                 // Look for the next separator.
-                const char *stop = (const char *)memchr(cursor, '\n', end - cursor);
+                const char *stop = (const char *)std::memchr(cursor, '\n', end - cursor);
                 const bool hit_separator = (stop != NULL);
                 if (!hit_separator) {
                     // If it's not found, just use the end.
diff --git a/src/expand.cpp b/src/expand.cpp
index 4c7532fc8..42c44d8fa 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -7,7 +7,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <cwchar>
 #include <wctype.h>
@@ -1156,7 +1156,7 @@ expand_error_t expand_to_command_and_args(const wcstring &instr, const environme
 
 static std::string escape_single_quoted_hack_hack_hack_hack(const char *str) {
     std::string result;
-    size_t len = strlen(str);
+    size_t len = std::strlen(str);
     result.reserve(len + 2);
     result.push_back('\'');
     for (size_t i = 0; i < len; i++) {
diff --git a/src/fallback.cpp b/src/fallback.cpp
index f028e3f05..b944c0406 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -14,7 +14,7 @@
 #include <stdarg.h>  // IWYU pragma: keep
 #include <stdio.h>   // IWYU pragma: keep
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>   // IWYU pragma: keep
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
@@ -81,7 +81,7 @@ int fish_mkstemp_cloexec(char *name_template) {
         return 0;
     }
 
-    memcpy(out, in, sizeof(wchar_t) * (len + 1));
+    std::memcpy(out, in, sizeof(wchar_t) * (len + 1));
     return out;
 }
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 4ec0ab190..21832b265 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <cwchar>
@@ -69,9 +69,9 @@ class fish_cmd_opts_t {
 static const char *s_profiling_output_filename = NULL;
 
 static bool has_suffix(const std::string &path, const char *suffix, bool ignore_case) {
-    size_t pathlen = path.size(), suffixlen = strlen(suffix);
+    size_t pathlen = path.size(), suffixlen = std::strlen(suffix);
     return pathlen >= suffixlen &&
-           !(ignore_case ? strcasecmp : strcmp)(path.c_str() + pathlen - suffixlen, suffix);
+           !(ignore_case ? strcasecmp : std::strcmp)(path.c_str() + pathlen - suffixlen, suffix);
 }
 
 /// Modifies the given path by calling realpath. Returns true if realpath succeeded, false
@@ -122,7 +122,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
                 bool seems_installed = (suffix == installed_suffix);
 
                 wcstring base_path = str2wcstring(exec_path);
-                base_path.resize(base_path.size() - strlen(suffix));
+                base_path.resize(base_path.size() - std::strlen(suffix));
 
                 paths.data = base_path + (seems_installed ? L"/share/fish" : L"/share");
                 paths.sysconf = base_path + (seems_installed ? L"/etc/fish" : L"/etc");
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 61633dc10..01d3a3b94 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <wctype.h>
 
 #include <cwchar>
@@ -63,7 +63,7 @@ static wcstring read_file(FILE *f) {
                     // Illegal byte sequence. Try to skip past it.
                     clearerr(f);
                     int ch = fgetc(f); // for printing the warning, and seeks forward 1 byte.
-                    debug(1, "%s (byte=%X)", strerror(errno), ch);
+                    debug(1, "%s (byte=%X)", std::strerror(errno), ch);
                     ret = 1;
                     continue;
                 } else {
@@ -518,7 +518,7 @@ int main(int argc, char *argv[]) {
             fclose(fh);
             output_location = *argv;
         } else {
-            std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, strerror(errno));
+            std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, std::strerror(errno));
             exit(1);
         }
     } else {
@@ -549,7 +549,7 @@ int main(int argc, char *argv[]) {
                 exit(0);
             } else {
                 std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
-                         strerror(errno));
+                         std::strerror(errno));
                 exit(1);
             }
             break;
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index fba073944..be845c63b 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <termios.h>
 #include <unistd.h>
 #include <cwchar>
@@ -62,7 +62,7 @@ static bool should_exit(wchar_t wc) {
         std::fwprintf(stderr, L"Press [ctrl-%c] again to exit\n", shell_modes.c_cc[VEOF] + 0x40);
         return false;
     }
-    return memcmp(recent_chars, "exit", 4) == 0 || memcmp(recent_chars, "quit", 4) == 0;
+    return std::memcmp(recent_chars, "exit", 4) == 0 || std::memcmp(recent_chars, "quit", 4) == 0;
 }
 
 /// Return the name if the recent sequence of characters matches a known terminfo sequence.
@@ -265,7 +265,7 @@ static void install_our_signal_handlers() {
 
     for (int signo = 1; signo < 32; signo++) {
         if (sigaction(signo, &new_sa, &old_sa) != -1) {
-            memcpy(&old_sigactions[signo], &old_sa, sizeof(old_sa));
+            std::memcpy(&old_sigactions[signo], &old_sa, sizeof(old_sa));
             if (old_sa.sa_handler == SIG_IGN) {
                 debug(3, "signal #%d (%ls) was being ignored", signo, sig2wcs(signo));
             }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 9059cf101..e459dc504 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -89,7 +89,7 @@ static bool should_test_function(const char *func_name) {
         result = true;
     } else {
         for (size_t i = 0; s_arguments[i] != NULL; i++) {
-            if (!strncmp(func_name, s_arguments[i], strlen(s_arguments[i]))) {
+            if (!std::strncmp(func_name, s_arguments[i], std::strlen(s_arguments[i]))) {
                 // Prefix match.
                 result = true;
                 break;
@@ -448,14 +448,14 @@ static void test_format() {
     for (i = 0; i < sizeof tests / sizeof *tests; i++) {
         char buff[128];
         format_size_safe(buff, tests[i].val);
-        do_test(!strcmp(buff, tests[i].expected));
+        do_test(!std::strcmp(buff, tests[i].expected));
     }
 
     for (int j = -129; j <= 129; j++) {
         char buff1[128], buff2[128];
         format_long_safe(buff1, j);
         sprintf(buff2, "%d", j);
-        do_test(!strcmp(buff1, buff2));
+        do_test(!std::strcmp(buff1, buff2));
 
         wchar_t wbuf1[128], wbuf2[128];
         format_long_safe(wbuf1, j);
@@ -467,12 +467,12 @@ static void test_format() {
     char buff1[128], buff2[128];
     format_long_safe(buff1, q);
     sprintf(buff2, "%ld", q);
-    do_test(!strcmp(buff1, buff2));
+    do_test(!std::strcmp(buff1, buff2));
 }
 
 /// Helper to convert a narrow string to a sequence of hex digits.
 static char *str2hex(const char *input) {
-    char *output = (char *)malloc(5 * strlen(input) + 1);
+    char *output = (char *)malloc(5 * std::strlen(input) + 1);
     char *p = output;
     for (; *input; input++) {
         sprintf(p, "0x%02X ", (int)*input & 0xFF);
@@ -511,12 +511,12 @@ static void test_convert() {
                 L"wcs2str");
         }
 
-        if (strcmp(o, n)) {
+        if (std::strcmp(o, n)) {
             char *o2 = str2hex(o);
             char *n2 = str2hex(n);
             err(L"Line %d - %d: Conversion cycle of string:\n%4d chars: %s\n"
                 L"produced different string:\n%4d chars: %s",
-                __LINE__, i, strlen(o), o2, strlen(n), n2);
+                __LINE__, i, std::strlen(o), o2, std::strlen(n), n2);
             free(o2);
             free(n2);
         }
@@ -1258,7 +1258,7 @@ static void test_utf82wchar(const char *src, size_t slen, const wchar_t *dst, si
 
     if (res != size) {
         err(L"u2w: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
-    } else if (mem && memcmp(mem, dst, size * sizeof(*mem)) != 0) {
+    } else if (mem && std::memcmp(mem, dst, size * sizeof(*mem)) != 0) {
         err(L"u2w: %s: BROKEN", descr);
     }
 
@@ -1303,7 +1303,7 @@ static void test_wchar2utf8(const wchar_t *src, size_t slen, const char *dst, si
     size = wchar_to_utf8(src, slen, mem, dlen, flags);
     if (res != size) {
         err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
-    } else if (dst && memcmp(mem, dst, size) != 0) {
+    } else if (dst && std::memcmp(mem, dst, size) != 0) {
         err(L"w2u: %s: BROKEN", descr);
     }
 
@@ -1459,7 +1459,7 @@ static void test_escape_sequences() {
         err(L"test_escape_sequences failed on line %d\n", __LINE__);
     if (escape_code_length(L"\x1B[2J") != 4)
         err(L"test_escape_sequences failed on line %d\n", __LINE__);
-    if (escape_code_length(L"\x1B[38;5;123mABC") != strlen("\x1B[38;5;123m"))
+    if (escape_code_length(L"\x1B[38;5;123mABC") != std::strlen("\x1B[38;5;123m"))
         err(L"test_escape_sequences failed on line %d\n", __LINE__);
     if (escape_code_length(L"\x1B@") != 2)
         err(L"test_escape_sequences failed on line %d\n", __LINE__);
@@ -3230,7 +3230,7 @@ static void test_universal_ok_to_save() {
     const char *contents = "# VERSION: 99999.99\n";
     FILE *fp = wfopen(UVARS_TEST_PATH, "w");
     assert(fp && "Failed to open UVARS_TEST_PATH for writing");
-    fwrite(contents, strlen(contents), 1, fp);
+    fwrite(contents, std::strlen(contents), 1, fp);
     fclose(fp);
 
     file_id_t before_id = file_id_for_path(UVARS_TEST_PATH);
@@ -5176,7 +5176,7 @@ int main(int argc, char **argv) {
             perror("getcwd");
             exit(-1);
         }
-        if (!strcmp(wd, "/")) {
+        if (!std::strcmp(wd, "/")) {
             std::fwprintf(stderr,
                      L"Unable to find 'tests' directory, which should contain file test.fish\n");
             exit(EXIT_FAILURE);
diff --git a/src/history.cpp b/src/history.cpp
index 1c7abddfb..d0deb6eb5 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <cstdint>
 // We need the sys/file.h for the flock() declaration on Linux but not OS X.
 #include <sys/file.h>  // IWYU pragma: keep
@@ -75,10 +75,10 @@ static constexpr int max_save_tries = 1024;
 
 namespace {
 
+static size_t safe_strlen(const char *s) { return s ? std::strlen(s) : 0; }
 /// Helper class for certain output. This is basically a string that allows us to ensure we only
 /// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to
 /// implement your own streambuf? Total insanity.
-static size_t safe_strlen(const char *s) { return s ? strlen(s) : 0; }
 class history_output_buffer_t {
     std::vector<char> buffer;
 
@@ -271,7 +271,7 @@ class history_file_contents_t {
                 ptr += amt;
             }
         }
-        memset(ptr, 0, remaining);
+        std::memset(ptr, 0, remaining);
         return true;
     }
 
@@ -350,7 +350,7 @@ static size_t read_line(const char *base, size_t cursor, size_t len, std::string
     // Locate the newline.
     assert(cursor <= len);
     const char *start = base + cursor;
-    const char *a_newline = (char *)memchr(start, '\n', len - cursor);
+    const char *a_newline = (char *)std::memchr(start, '\n', len - cursor);
     if (a_newline != NULL) {  // we found a newline
         result.assign(start, a_newline - start);
         // Return the amount to advance the cursor; skip over the newline.
@@ -513,7 +513,7 @@ static history_item_t decode_item_fish_2_0(const char *base, size_t len) {
                 size_t advance = read_line(base, cursor, len, line);
                 if (trim_leading_spaces(line) <= indent) break;
 
-                if (strncmp(line.c_str(), "- ", 2)) break;
+                if (std::strncmp(line.c_str(), "- ", 2)) break;
 
                 // We're going to consume this line.
                 cursor += advance;
@@ -636,7 +636,7 @@ static bool parse_timestamp(const char *str, time_t *out_when) {
 
     // Look for "when:".
     size_t when_len = 5;
-    if (strncmp(cursor, "when:", when_len) != 0) return false;
+    if (std::strncmp(cursor, "when:", when_len) != 0) return false;
     cursor += when_len;
 
     // Advance past spaces.
@@ -661,7 +661,7 @@ static const char *next_line(const char *start, size_t length) {
     const char *const end = start + length;
 
     // Skip past the next newline.
-    const char *nextline = (const char *)memchr(start, '\n', length);
+    const char *nextline = (const char *)std::memchr(start, '\n', length);
     if (!nextline || nextline >= end) {
         return NULL;
     }
@@ -671,7 +671,7 @@ static const char *next_line(const char *start, size_t length) {
     }
 
     // Make sure this new line is itself "newline terminated". If it's not, return NULL.
-    const char *next_newline = (const char *)memchr(nextline, '\n', end - nextline);
+    const char *next_newline = (const char *)std::memchr(nextline, '\n', end - nextline);
     if (!next_newline) {
         return NULL;
     }
@@ -694,7 +694,7 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         const char *line_start = contents.address_at(cursor);
 
         // Advance the cursor to the next line.
-        const char *a_newline = (const char *)memchr(line_start, '\n', length - cursor);
+        const char *a_newline = (const char *)std::memchr(line_start, '\n', length - cursor);
         if (a_newline == NULL) break;
 
         // Advance the cursor past this line. +1 is for the newline.
@@ -707,26 +707,26 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         if (a_newline - line_start < 3) continue;
 
         // Try to be a little YAML compatible. Skip lines with leading %, ---, or ...
-        if (!memcmp(line_start, "%", 1) || !memcmp(line_start, "---", 3) ||
-            !memcmp(line_start, "...", 3))
+        if (!std::memcmp(line_start, "%", 1) || !std::memcmp(line_start, "---", 3) ||
+            !std::memcmp(line_start, "...", 3))
             continue;
 
         // Hackish: fish 1.x rewriting a fish 2.0 history file can produce lines with lots of
         // leading "- cmd: - cmd: - cmd:". Trim all but one leading "- cmd:".
         const char *double_cmd = "- cmd: - cmd: ";
-        const size_t double_cmd_len = strlen(double_cmd);
+        const size_t double_cmd_len = std::strlen(double_cmd);
         while ((size_t)(a_newline - line_start) > double_cmd_len &&
-               !memcmp(line_start, double_cmd, double_cmd_len)) {
+               !std::memcmp(line_start, double_cmd, double_cmd_len)) {
             // Skip over just one of the - cmd. In the end there will be just one left.
-            line_start += strlen("- cmd: ");
+            line_start += std::strlen("- cmd: ");
         }
 
         // Hackish: fish 1.x rewriting a fish 2.0 history file can produce commands like "when:
         // 123456". Ignore those.
         const char *cmd_when = "- cmd:    when:";
-        const size_t cmd_when_len = strlen(cmd_when);
+        const size_t cmd_when_len = std::strlen(cmd_when);
         if ((size_t)(a_newline - line_start) >= cmd_when_len &&
-            !memcmp(line_start, cmd_when, cmd_when_len)) {
+            !std::memcmp(line_start, cmd_when, cmd_when_len)) {
             continue;
         }
 
@@ -1141,7 +1141,7 @@ wcstring history_search_t::current_string() const {
 }
 
 static void replace_all(std::string *str, const char *needle, const char *replacement) {
-    size_t needle_len = strlen(needle), replacement_len = strlen(replacement);
+    size_t needle_len = std::strlen(needle), replacement_len = std::strlen(replacement);
     size_t offset = 0;
     while ((offset = str->find(needle, offset)) != std::string::npos) {
         str->replace(offset, needle_len, replacement);
@@ -1820,7 +1820,7 @@ void history_t::populate_from_bash(FILE *stream) {
             }
 
             // Deal with the newline if present.
-            char *a_newline = strchr(buff, '\n');
+            char *a_newline = std::strchr(buff, '\n');
             if (a_newline) *a_newline = '\0';
             line.append(buff);
             if (a_newline) break;
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 655f5dfc2..19e4356a3 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -2,7 +2,7 @@
 #include "config.h"
 
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -205,7 +205,7 @@ wchar_t input_common_readch(int timed) {
 
             switch (sz) {
                 case (size_t)(-1): {
-                    memset(&state, '\0', sizeof(state));
+                    std::memset(&state, '\0', sizeof(state));
                     debug(2, L"Illegal input");
                     return R_NULL;
                 }
diff --git a/src/io.cpp b/src/io.cpp
index 5f2ed4166..727796c96 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <cwchar>
 
diff --git a/src/iothread.cpp b/src/iothread.cpp
index a9d799b43..d3f7220dc 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -4,7 +4,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/src/output.cpp b/src/output.cpp
index 5cca74258..14d210c3c 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #if HAVE_CURSES_H
 #include <curses.h>
 #elif HAVE_NCURSES_H
@@ -234,7 +234,7 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
         if (c == c2) c = (c2 == rgb_color_t::white()) ? rgb_color_t::black() : rgb_color_t::white();
     }
 
-    if ((enter_bold_mode != 0) && (strlen(enter_bold_mode) > 0)) {
+    if ((enter_bold_mode != 0) && (std::strlen(enter_bold_mode) > 0)) {
         if (bg_set && !last_bg_set) {
             // Background color changed and is set, so we enter bold mode to make reading easier.
             // This means bold mode is _always_ on when the background color is set.
@@ -295,7 +295,7 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
     }
 
     // Lastly, we set bold, underline, italics, dim, and reverse modes correctly.
-    if (is_bold && !was_bold && enter_bold_mode && strlen(enter_bold_mode) > 0 && !bg_set) {
+    if (is_bold && !was_bold && enter_bold_mode && std::strlen(enter_bold_mode) > 0 && !bg_set) {
         // The unconst cast is for NetBSD's benefit. DO NOT REMOVE!
         writembs_nofail(*this, tparm((char *)enter_bold_mode));
         was_bold = is_bold;
@@ -310,27 +310,27 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
     }
     was_underline = is_underline;
 
-    if (was_italics && !is_italics && enter_italics_mode && strlen(enter_italics_mode) > 0) {
+    if (was_italics && !is_italics && enter_italics_mode && std::strlen(enter_italics_mode) > 0) {
         writembs_nofail(*this, exit_italics_mode);
         was_italics = is_italics;
     }
 
-    if (!was_italics && is_italics && enter_italics_mode && strlen(enter_italics_mode) > 0) {
+    if (!was_italics && is_italics && enter_italics_mode && std::strlen(enter_italics_mode) > 0) {
         writembs_nofail(*this, enter_italics_mode);
         was_italics = is_italics;
     }
 
-    if (is_dim && !was_dim && enter_dim_mode && strlen(enter_dim_mode) > 0) {
+    if (is_dim && !was_dim && enter_dim_mode && std::strlen(enter_dim_mode) > 0) {
         writembs_nofail(*this, enter_dim_mode);
         was_dim = is_dim;
     }
 
     if (is_reverse && !was_reverse) {
         // Some terms do not have a reverse mode set, so standout mode is a fallback.
-        if (enter_reverse_mode && strlen(enter_reverse_mode) > 0) {
+        if (enter_reverse_mode && std::strlen(enter_reverse_mode) > 0) {
             writembs_nofail(*this, enter_reverse_mode);
             was_reverse = is_reverse;
-        } else if (enter_standout_mode && strlen(enter_standout_mode) > 0) {
+        } else if (enter_standout_mode && std::strlen(enter_standout_mode) > 0) {
             writembs_nofail(*this, enter_standout_mode);
             was_reverse = is_reverse;
         }
diff --git a/src/output.h b/src/output.h
index b0548aeb1..dee1ad982 100644
--- a/src/output.h
+++ b/src/output.h
@@ -69,7 +69,7 @@ class outputter_t {
     }
 
     /// Write a narrow NUL-terminated string.
-    void writestr(const char *str) { writestr(str, strlen(str)); }
+    void writestr(const char *str) { writestr(str, std::strlen(str)); }
 
     /// Write a narrow character.
     void push_back(char c) {
diff --git a/src/path.cpp b/src/path.cpp
index 2523e4ef9..93d941204 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -4,7 +4,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <cwchar>
@@ -272,7 +272,7 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
         const wchar_t *env_var = using_xdg ? xdg_var.c_str() : L"HOME";
         debug(0, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."), which_dir.c_str(),
               env_var, path.c_str());
-        debug(0, _(L"The error was '%s'."), strerror(saved_errno));
+        debug(0, _(L"The error was '%s'."), std::strerror(saved_errno));
         debug(0, _(L"Please set $%ls to a directory where you have write access."), env_var);
     }
     ignore_result(write(STDERR_FILENO, "\n", 1));
diff --git a/src/postfork.cpp b/src/postfork.cpp
index ca3607628..f4c14b6b6 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include <time.h>
 #include <memory>
 #if FISH_USE_POSIX_SPAWN
@@ -308,11 +308,11 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
             size_t sz = 0;
             const char *const *p;
             for (p = argv; *p; p++) {
-                sz += strlen(*p) + 1;
+                sz += std::strlen(*p) + 1;
             }
 
             for (p = envv; *p; p++) {
-                sz += strlen(*p) + 1;
+                sz += std::strlen(*p) + 1;
             }
 
             format_size_safe(sz1, sz);
diff --git a/src/print_help.cpp b/src/print_help.cpp
index c19a51dfc..db8ed074b 100644
--- a/src/print_help.cpp
+++ b/src/print_help.cpp
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 
 #include "common.h"
 #include "print_help.h"
@@ -17,6 +17,6 @@ void print_help(const char *c, int fd) {
     int printed = snprintf(cmd, CMD_LEN, "fish -c '__fish_print_help %s >&%d'", c, fd);
 
     if (printed < CMD_LEN && system(cmd) == -1) {
-        write_loop(2, HELP_ERR, strlen(HELP_ERR));
+        write_loop(2, HELP_ERR, std::strlen(HELP_ERR));
     }
 }
diff --git a/src/reader.cpp b/src/reader.cpp
index 505dae066..0b8861633 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -23,7 +23,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -969,13 +969,13 @@ void reader_init() {
     tcgetattr(STDIN_FILENO, &terminal_mode_on_startup);
 
     // Set the mode used for program execution, initialized to the current mode.
-    memcpy(&tty_modes_for_external_cmds, &terminal_mode_on_startup,
+    std::memcpy(&tty_modes_for_external_cmds, &terminal_mode_on_startup,
            sizeof tty_modes_for_external_cmds);
     tty_modes_for_external_cmds.c_iflag &= ~IXON;   // disable flow control
     tty_modes_for_external_cmds.c_iflag &= ~IXOFF;  // disable flow control
 
     // Set the mode used for the terminal, initialized to the current mode.
-    memcpy(&shell_modes, &terminal_mode_on_startup, sizeof shell_modes);
+    std::memcpy(&shell_modes, &terminal_mode_on_startup, sizeof shell_modes);
 
     shell_modes.c_iflag &= ~ICRNL;  // disable mapping CR (\cM) to NL (\cJ)
     shell_modes.c_iflag &= ~INLCR;  // disable mapping NL (\cJ) to CR (\cM)
@@ -2447,7 +2447,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                                                      (size_t)READAHEAD_MAX)
                                           : READAHEAD_MAX;
 
-                memset(arr, 0, sizeof(arr));
+                std::memset(arr, 0, sizeof(arr));
                 arr[0] = c;
 
                 for (i = 1; i < limit; ++i) {
diff --git a/src/screen.cpp b/src/screen.cpp
index bc3161a40..30efe600f 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <time.h>
 #include <unistd.h>
 #include <cwchar>
@@ -460,7 +460,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 
     y_steps = new_y - s->actual.cursor.y;
 
-    if (y_steps > 0 && (strcmp(cursor_down, "\n") == 0)) {
+    if (y_steps > 0 && (std::strcmp(cursor_down, "\n") == 0)) {
         // This is very strange - it seems some (all?) consoles use a simple newline as the cursor
         // down escape. This will of course move the cursor to the beginning of the line as well as
         // moving it down one step. The cursor_up does not have this behaviour...
@@ -496,7 +496,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
     // Use the bulk ('multi') output for cursor movement if it is supported and it would be shorter
     // Note that this is required to avoid some visual glitches in iTerm (issue #1448).
     bool use_multi =
-        multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * strlen(str) > strlen(multi_str);
+        multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * std::strlen(str) > std::strlen(multi_str);
     if (use_multi && cur_term) {
         char *multi_param = tparm((char *)multi_str, abs(x_steps));
         writembs(outp, multi_param);
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 842219dea..e4ae70a34 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -26,7 +26,7 @@
 #include "tinyexpr.h"
 #include <stdlib.h>
 #include <math.h>
-#include <string.h>
+#include <cstring>
 #include <stdio.h>
 #include <limits.h>
 
@@ -96,9 +96,9 @@ static te_expr *new_expr(const int type, const te_expr *parameters[]) {
     te_expr *ret = (te_expr *)malloc(size);
     // This sets float to 0, which depends on the implementation.
     // We rely on IEEE-754 floats anyway, so it's okay.
-    memset(ret, 0, size);
+    std::memset(ret, 0, size);
     if (arity && parameters) {
-        memcpy(ret->parameters, parameters, psize);
+        std::memcpy(ret->parameters, parameters, psize);
     }
     ret->type = type;
     return ret;
@@ -192,10 +192,10 @@ static const te_builtin *find_builtin(const char *name, int len) {
     const te_builtin *found = std::lower_bound(std::begin(functions), end, name,
                                                 [len](const te_builtin &lhs, const char *rhs) {
                                                     // The length is important because that's where the parens start
-                                                    return strncmp(lhs.name, rhs, len) < 0;
+                                                    return std::strncmp(lhs.name, rhs, len) < 0;
                                                 });
     // We need to compare again because we might have gotten the first "larger" element.
-    if (found != end && strncmp(found->name, name, len) == 0) return found;
+    if (found != end && std::strncmp(found->name, name, len) == 0) return found;
     return NULL;
 }
 
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index 2355db669..c39ccd730 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <cwchar>
-#include <string.h>
+#include <cstring>
 
 // This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves
 // differently for the user, since it allows the user to intersperse the options with the other
diff --git a/src/wutil.cpp b/src/wutil.cpp
index b9aefb108..2004dcf42 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -10,7 +10,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #if defined(__linux__)
 #include <sys/statfs.h>
@@ -130,7 +130,7 @@ const wcstring wgetcwd() {
         return str2wcstring(res);
     }
 
-    debug(0, _(L"getcwd() failed with errno %d/%s"), errno, strerror(errno));
+    debug(0, _(L"getcwd() failed with errno %d/%s"), errno, std::strerror(errno));
     return wcstring();
 }
 
@@ -262,7 +262,7 @@ void wperror(const wchar_t *s) {
     if (s[0] != L'\0') {
         std::fwprintf(stderr, L"%ls: ", s);
     }
-    std::fwprintf(stderr, L"%s\n", strerror(e));
+    std::fwprintf(stderr, L"%s\n", std::strerror(e));
 }
 
 int make_fd_nonblocking(int fd) {
@@ -318,7 +318,7 @@ int fd_check_is_remote(int fd) {
 }
 
 static inline void safe_append(char *buffer, const char *s, size_t buffsize) {
-    strncat(buffer, s, buffsize - strlen(buffer) - 1);
+    std::strncat(buffer, s, buffsize - std::strlen(buffer) - 1);
 }
 
 // In general, strerror is not async-safe, and therefore we cannot use it directly. So instead we
@@ -328,7 +328,7 @@ const char *safe_strerror(int err) {
 #if defined(__UCLIBC__)
     // uClibc does not have sys_errlist, however, its strerror is believed to be async-safe.
     // See issue #808.
-    return strerror(err);
+    return std::strerror(err);
 #elif defined(HAVE__SYS__ERRS) || defined(HAVE_SYS_ERRLIST)
 #ifdef HAVE_SYS_ERRLIST
     if (err >= 0 && err < sys_nerr && sys_errlist[err] != NULL) {
@@ -373,7 +373,7 @@ void safe_perror(const char *message) {
     safe_append(buff, safe_strerror(err), sizeof buff);
     safe_append(buff, "\n", sizeof buff);
 
-    ignore_result(write(STDERR_FILENO, buff, strlen(buff)));
+    ignore_result(write(STDERR_FILENO, buff, std::strlen(buff)));
     errno = err;
 }
 
diff --git a/src/wutil.h b/src/wutil.h
index 661e82d05..80eaf8005 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -59,7 +59,7 @@ void wperror(const wchar_t *s);
 /// Async-safe version of perror().
 void safe_perror(const char *message);
 
-/// Async-safe version of strerror().
+/// Async-safe version of std::strerror().
 const char *safe_strerror(int err);
 
 /// Wide character version of getcwd().

From b7c069a765e3f142fba8dc920863b08f3593e9b9 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 15:09:07 -0700
Subject: [PATCH 0046/1732] Remove two duplicated #includes

---
 src/common.cpp  | 1 -
 src/history.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index cb158912f..063d45d21 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -33,7 +33,6 @@
 
 #ifdef __linux__
 // Includes for WSL detection
-#include <cstring>
 #include <sys/utsname.h>
 #endif
 
diff --git a/src/history.cpp b/src/history.cpp
index d0deb6eb5..8ad1bfeb9 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -16,7 +16,6 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
 
 #include <algorithm>

From 2e4948e1f423d3cdac84425b3dda5de74775c1c5 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 15:27:13 -0700
Subject: [PATCH 0047/1732] Fix `switch` nesting in handler_matches

I guess this worked, but whoops.
---
 src/event.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/event.cpp b/src/event.cpp
index d2ae1959a..9cab7d427 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -120,8 +120,8 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
         case event_type_t::generic: {
             return classv.desc.str_param1 == instance.desc.str_param1;
         }
-        case event_type_t::any: {
-        default:
+        case event_type_t::any:
+        default: {
             DIE("unexpected classv.type");
             return false;
         }

From b318ab17d2b3d759d8d844e4e19e7e047f0f7a19 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 12 Mar 2019 23:29:03 +0100
Subject: [PATCH 0048/1732] wcwidth: Classify some Hangul Jamo as combiners

Hangul uses three codepoints to combine to one glyph. The first has a
width of 2 (like the final glyph), but the second and third were
assigned a width of 1, which seems to match EastAsianWidth.txt:

> 1160..11FF;N # Lo [160] HANGUL JUNGSEONG FILLER..HANGUL JONGSEONG SSANGNIEUN

Instead, we override that and treat the middle and end codepoint as combiners,
always, because there's no way to figure out what the terminal will
think and that's the way it's supposed to work.

If they stand by themselves or in another combination, they'll indeed
show up with a width of 1 so we'll get it wrong, but that's less
likely and not expressible with wcwidth().

Fixes #5729.
---
 src/fallback.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index b944c0406..2b8dacb62 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -287,6 +287,9 @@ int fish_wcwidth(wchar_t wc) {
     if (wc == variation_selector_16) return 1;
     else if (wc == variation_selector_15) return 0;
 
+    // Korean Hangul Jamo median vowels and final consonants.
+    // These are effectively combiners, so we handle them like combiners.
+    if (wc >= L'\u1160' && wc <= L'\u11FF') return wcwidth(wc);
     int width = widechar_wcwidth(wc);
     switch (width) {
         case widechar_nonprint:

From f92c2921d252af8c787915550505f23579d5d41a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 12 Mar 2019 22:38:42 -0700
Subject: [PATCH 0049/1732] Remove mini() and maxi()

C++11 provides std::min/std::max which we're using all over,
obviating the need for our own templates for this.

util.h now only provides two things: get_time and wcsfilecmp.
This commit removes everything that includes it which doesn't
use either; most because they no longer need mini or maxi from
it but some others were #including it unnecessarily.
---
 src/builtin_commandline.cpp  |  3 +--
 src/builtin_ulimit.cpp       |  3 +--
 src/env_universal_common.cpp |  4 ++--
 src/fallback.cpp             |  1 -
 src/input_common.cpp         |  5 ++---
 src/pager.cpp                |  7 +++----
 src/parse_util.cpp           |  1 -
 src/proc.cpp                 |  1 -
 src/reader.cpp               | 21 ++++++++++++---------
 src/screen.cpp               | 13 +++++++------
 src/util.h                   | 12 ------------
 11 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index de6cd8126..5f7c27a16 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -15,7 +15,6 @@
 #include "proc.h"
 #include "reader.h"
 #include "tokenizer.h"
-#include "util.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -398,7 +397,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             }
 
             current_buffer = reader_get_buffer();
-            new_pos = maxi(0L, mini(new_pos, (long)wcslen(current_buffer)));
+            new_pos = std::max(0L, std::min(new_pos, (long)std::wcslen(current_buffer)));
             reader_set_buffer(current_buffer, (size_t)new_pos);
         } else {
             streams.out.append_format(L"%lu\n", (unsigned long)reader_get_cursor_pos());
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index f7b9cf4c8..553c35514 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -9,7 +9,6 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
-#include "util.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -81,7 +80,7 @@ static void print_all(int hard, io_streams_t &streams) {
     int w = 0;
 
     for (i = 0; resource_arr[i].desc; i++) {
-        w = maxi(w, fish_wcswidth(resource_arr[i].desc));
+        w = std::max(w, fish_wcswidth(resource_arr[i].desc));
     }
 
     for (i = 0; resource_arr[i].desc; i++) {
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index cde707860..7a033f03c 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -1365,7 +1365,7 @@ class universal_notifier_named_pipe_t : public universal_notifier_t {
 
         // Now return the smaller of the two values. If we get ULONG_MAX, it means there's no more
         // need to poll; in that case return 0.
-        unsigned long result = mini(readback_delay, polling_delay);
+        unsigned long result = std::min(readback_delay, polling_delay);
         if (result == ULONG_MAX) {
             result = 0;
         }
@@ -1378,7 +1378,7 @@ class universal_notifier_named_pipe_t : public universal_notifier_t {
             // Read back what we wrote. We do nothing with the value.
             while (this->readback_amount > 0) {
                 char buff[64];
-                size_t amt_to_read = mini(this->readback_amount, sizeof buff);
+                size_t amt_to_read = std::min(this->readback_amount, sizeof(buff));
                 ignore_result(read(this->pipe_fd, buff, amt_to_read));
                 this->readback_amount -= amt_to_read;
             }
diff --git a/src/fallback.cpp b/src/fallback.cpp
index 2b8dacb62..9f5542ba5 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -41,7 +41,6 @@
 
 #include "common.h"    // IWYU pragma: keep
 #include "fallback.h"  // IWYU pragma: keep
-#include "util.h"      // IWYU pragma: keep
 
 #if defined(TPARM_SOLARIS_KLUDGE)
 #undef tparm
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 19e4356a3..765a9d667 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -25,7 +25,6 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "input_common.h"
 #include "iothread.h"
-#include "util.h"
 #include "wutil.h"
 
 /// Time in milliseconds to wait for another byte to be available for reading
@@ -82,7 +81,7 @@ static wint_t readb() {
         FD_SET(0, &fdset);
         if (ioport > 0) {
             FD_SET(ioport, &fdset);
-            fd_max = maxi(fd_max, ioport);
+            fd_max = std::max(fd_max, ioport);
         }
 
         // Get our uvar notifier.
@@ -92,7 +91,7 @@ static wint_t readb() {
         int notifier_fd = notifier.notification_fd();
         if (notifier_fd > 0) {
             FD_SET(notifier_fd, &fdset);
-            fd_max = maxi(fd_max, notifier_fd);
+            fd_max = std::max(fd_max, notifier_fd);
         }
 
         // Get its suggested delay (possibly none).
diff --git a/src/pager.cpp b/src/pager.cpp
index 03273037d..8f6e864ca 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -18,7 +18,6 @@
 #include "pager.h"
 #include "reader.h"
 #include "screen.h"
-#include "util.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 typedef pager_t::comp_t comp_t;
@@ -422,7 +421,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
         this->available_term_height - 1 -
         (search_field_shown ? 1 : 0);  // we always subtract 1 to make room for a comment row
     if (!this->fully_disclosed) {
-        term_height = mini(term_height, (size_t)PAGER_UNDISCLOSED_MAX_ROWS);
+        term_height = std::min(term_height, (size_t)PAGER_UNDISCLOSED_MAX_ROWS);
     }
 
     size_t row_count = divide_round_up(lst.size(), cols);
@@ -478,7 +477,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
         // suggested_start_row.
         assert(row_count > term_height);
         size_t last_starting_row = row_count - term_height;
-        start_row = mini(suggested_start_row, last_starting_row);
+        start_row = std::min(suggested_start_row, last_starting_row);
         stop_row = start_row + term_height;
         assert(start_row <= last_starting_row);
     }
@@ -660,7 +659,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
         // Cardinal directions. We have a completion index; we wish to compute its row and column.
         size_t current_row = this->get_selected_row(rendering);
         size_t current_col = this->get_selected_column(rendering);
-        size_t page_height = maxi(rendering.term_height - 1, (size_t)1);
+        size_t page_height = std::max(rendering.term_height - 1, 1UL);
 
         switch (direction) {
             case direction_page_north: {
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index bcca52cb4..5d8fe3cc8 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -22,7 +22,6 @@
 #include "parser.h"
 #include "tnode.h"
 #include "tokenizer.h"
-#include "util.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/proc.cpp b/src/proc.cpp
index e2ededc77..7c5016a14 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -46,7 +46,6 @@
 #include "reader.h"
 #include "sanity.h"
 #include "signal.h"
-#include "util.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// Statuses of last job's processes to exit - ensure we start off with one entry of 0.
diff --git a/src/reader.cpp b/src/reader.cpp
index 0b8861633..8d2b0ec35 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -73,7 +73,6 @@
 #include "signal.h"
 #include "tnode.h"
 #include "tokenizer.h"
-#include "util.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 // Name of the variable that tells how long it took, in milliseconds, for the previous
@@ -137,8 +136,9 @@ static inline unsigned read_generation_count() {
 void editable_line_t::insert_string(const wcstring &str, size_t start, size_t len) {
     // Clamp the range to something valid.
     size_t string_length = str.size();
-    start = mini(start, string_length);      //!OCLINT(parameter reassignment)
-    len = mini(len, string_length - start);  //!OCLINT(parameter reassignment)
+
+    start = std::min(start, string_length);      //!OCLINT(parameter reassignment)
+    len = std::min(len, string_length - start);  //!OCLINT(parameter reassignment)
     this->text.insert(this->position, str, start, len);
     this->position += len;
 }
@@ -631,8 +631,8 @@ void reader_data_t::repaint() {
     // term size, minus the number of lines consumed by our string. (Note this doesn't yet consider
     // wrapping).
     int full_line_count = 1 + std::count(full_line.begin(), full_line.end(), '\n');
-    pager.set_term_size(maxi(1, common_get_width()),
-                        maxi(1, common_get_height() - full_line_count));
+    pager.set_term_size(std::max(1, common_get_width()),
+                        std::max(1, common_get_height() - full_line_count));
     pager.update_rendering(&current_page_rendering);
 
     bool focused_on_pager = active_edit_line() == &pager.search_field_line;
@@ -665,7 +665,7 @@ void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, i
     if (el->position > begin_idx) {
         // Move the buff position back by the number of characters we deleted, but don't go past
         // buff_pos.
-        size_t backtrack = mini(el->position - begin_idx, length);
+        size_t backtrack = std::min(el->position - begin_idx, length);
         update_buff_pos(el, el->position - backtrack);
     }
 
@@ -816,10 +816,12 @@ bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t curso
 bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) {
     bool result = false;
     editable_line_t *el = active_edit_line();
+
     if (expand_abbreviations && el == &command_line) {
         // Try expanding abbreviations.
         wcstring new_cmdline;
-        size_t cursor_pos = el->position - mini(el->position, cursor_backtrack);
+        size_t cursor_pos = el->position - std::min(el->position, cursor_backtrack);
+
         if (reader_expand_abbreviation_in_command(el->text, cursor_pos, vars(), &new_cmdline)) {
             // We expanded an abbreviation! The cursor moves by the difference in the command line
             // lengths.
@@ -1585,7 +1587,8 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
                 first = false;
             } else {
                 // Determine the shared prefix length.
-                size_t idx, max = mini(common_prefix.size(), el.completion.size());
+                size_t idx, max = std::min(common_prefix.size(), el.completion.size());
+
                 for (idx = 0; idx < max; idx++) {
                     wchar_t ac = common_prefix.at(idx), bc = el.completion.at(idx);
                     bool matches = (ac == bc);
@@ -2689,7 +2692,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 // If we landed on a newline, don't delete it.
                 if (*begin == L'\n') begin++;
                 assert(end >= begin);
-                size_t len = maxi<size_t>(end - begin, 1);
+                size_t len = std::max<size_t>(end - begin, 1);
                 begin = end - len;
                 kill(el, begin - buff, len, KILL_PREPEND, last_char != R_BACKWARD_KILL_LINE);
                 break;
diff --git a/src/screen.cpp b/src/screen.cpp
index 30efe600f..ae11033ab 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -39,7 +39,6 @@
 #include "output.h"
 #include "pager.h"
 #include "screen.h"
-#include "util.h"
 
 /// The number of characters to indent new blocks.
 #define INDENT_STEP 4u
@@ -86,7 +85,7 @@ static size_t next_tab_stop(size_t current_line_width) {
 }
 
 /// Like fish_wcwidth, but returns 0 for control characters instead of -1.
-static int fish_wcwidth_min_0(wchar_t widechar) { return maxi(0, fish_wcwidth(widechar)); }
+static int fish_wcwidth_min_0(wchar_t widechar) { return std::max(0, fish_wcwidth(widechar)); }
 
 /// Whether we permit soft wrapping. If so, in some cases we don't explicitly move to the second
 /// physical line on a wrapped logical line; instead we just output it.
@@ -225,7 +224,8 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
         if (!esc2[p]) continue;
         // Test both padded and unpadded version, just to be safe. Most versions of tparm don't
         // actually seem to do anything these days.
-        size_t esc_seq_len = maxi(try_sequence(tparm((char *)esc2[p]), code), try_sequence(esc2[p], code));
+        size_t esc_seq_len =
+            std::max(try_sequence(tparm((char *)esc2[p]), code), try_sequence(esc2[p], code));
         if (esc_seq_len) {
             *resulting_length = esc_seq_len;
             return true;
@@ -615,7 +615,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
 
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
-    const size_t lines_with_stuff = maxi(actual_lines_before_reset, scr->actual.line_count());
+    const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);
@@ -657,7 +657,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
                     }
                 }
                 if (next_line_will_change) {
-                    skip_remaining = mini(skip_remaining, (size_t)(scr->actual_width - 2));
+                    skip_remaining = std::min(skip_remaining, (size_t)(scr->actual_width - 2));
                 }
             }
         }
@@ -1073,7 +1073,8 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
     // underneath the cursor when resizing a window wider such that it reduces our desired line
     // count.
     if (!abandon_line) {
-        s->actual_lines_before_reset = maxi(s->actual_lines_before_reset, s->actual.line_count());
+        s->actual_lines_before_reset =
+            std::max(s->actual_lines_before_reset, s->actual.line_count());
     }
 
     if (repaint_prompt && !abandon_line) {
diff --git a/src/util.h b/src/util.h
index 9d2e4bbbb..f9f121849 100644
--- a/src/util.h
+++ b/src/util.h
@@ -2,18 +2,6 @@
 #ifndef FISH_UTIL_H
 #define FISH_UTIL_H
 
-/// Returns the larger of two ints.
-template <typename T>
-inline T maxi(T a, T b) {
-    return a > b ? a : b;
-}
-
-/// Returns the smaller of two ints.
-template <typename T>
-inline T mini(T a, T b) {
-    return a < b ? a : b;
-}
-
 /// Compares two wide character strings with an (arguably) intuitive ordering. This function tries
 /// to order strings in a way which is intuitive to humans with regards to sorting strings
 /// containing numbers.

From 51cc03ca75cb89335dade89cd0b7013dedd144fd Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Wed, 13 Mar 2019 10:00:09 +0100
Subject: [PATCH 0050/1732] reflect #1912 in documentation

---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 3c43779e1..20554418d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1014,7 +1014,7 @@ Universal variables are variables that are shared between all the users' fish se
 
 To see universal variables in action, start two fish sessions side by side, and issue the following command in one of them ``set fish_color_cwd blue``. Since ``fish_color_cwd`` is a universal variable, the color of the current working directory listing in the prompt will instantly change to blue on both terminals.
 
-`Universal variables <#variables-universal>`_ are stored in the file ``.config/fish/fishd.MACHINE_ID``, where MACHINE_ID is typically your MAC address. Do not edit this file directly, as your edits may be overwritten. Edit them through fish scripts or by using fish interactively instead.
+`Universal variables <#variables-universal>`_ are stored in the file ``.config/fish/fish_variables``. Do not edit this file directly, as your edits may be overwritten. Edit the variables through fish scripts or by using fish interactively instead.
 
 Do not append to universal variables in `config.fish <#initialization>`_, because these variables will then get longer with each new shell instance. Instead, simply set them once at the command line.
 

From 5a9d1533639e4a95ab63a010c9588e65905d6864 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 10:28:25 +0100
Subject: [PATCH 0051/1732] input: Use range-for

Also adds a couple of consts.
---
 src/input.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index dffa07f15..66205a628 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -227,8 +227,7 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands,
 
     auto& ml = user ? mapping_list : preset_mapping_list;
 
-    for (size_t i = 0; i < ml.size(); i++) {
-        input_mapping_t &m = ml.at(i);
+    for (input_mapping_t& m : ml) {
         if (m.seq == sequence && m.mode == mode) {
             m.commands = commands_vector;
             m.sets_mode = sets_mode;
@@ -744,8 +743,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
     const char *res = 0;
     int err = ENOENT;
 
-    for (size_t i = 0; i < terminfo_mappings.size(); i++) {
-        const terminfo_mapping_t &m = terminfo_mappings.at(i);
+    for (const terminfo_mapping_t &m : terminfo_mappings) {
         if (!std::wcscmp(name, m.name)) {
             res = m.seq;
             err = EILSEQ;
@@ -765,9 +763,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
 bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
     assert(input_initialized);
 
-    for (size_t i = 0; i < terminfo_mappings.size(); i++) {
-        terminfo_mapping_t &m = terminfo_mappings.at(i);
-
+    for (const terminfo_mapping_t &m : terminfo_mappings) {
         if (!m.seq) {
             continue;
         }
@@ -787,9 +783,7 @@ wcstring_list_t input_terminfo_get_names(bool skip_null) {
     wcstring_list_t result;
     result.reserve(terminfo_mappings.size());
 
-    for (size_t i = 0; i < terminfo_mappings.size(); i++) {
-        terminfo_mapping_t &m = terminfo_mappings.at(i);
-
+    for (const terminfo_mapping_t &m : terminfo_mappings) {
         if (skip_null && !m.seq) {
             continue;
         }

From ad0c8cfb83739508a9e0650ec490ab133b0fc2a6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 12:15:45 +0100
Subject: [PATCH 0052/1732] fish_clipboard_paste: Don't add histignore spaces

If we're at the beginning of the commandline, we trim leading whitespace so we don't trigger histignore.

Since that's the main issue of problems with histignore:
Closes #4327.
---
 share/functions/fish_clipboard_paste.fish | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index e56ff6b16..105ca1226 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -28,6 +28,11 @@ function fish_clipboard_paste
     if __fish_commandline_is_singlequoted
         set data (string replace -ra "(['\\\])" '\\\\\\\$1' -- $data)
     end
+    if not string length -q -- (commandline -c)
+        # If we're at the beginning of the first line, trim whitespace from the start,
+        # so we don't trigger ignoring history.
+        set data (string trim -l -- $data)
+    end
     if test -n "$data"
         commandline -i -- $data
     end

From a5a643f854db2e52fe72c56fbd6a8cc6636e7623 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 12:27:33 +0100
Subject: [PATCH 0053/1732] Bracketed paste: Strip leading spaces if they'd
 trigger histignore

Similar to the last commit, only for the in-terminal-paste stuff.

Also cleans up the comments on bracketed paste a bit - nobody has
stepped forward to report problems with old emacsen or windows, so
there's no need for a TODO comment.

See #4327.
---
 .../functions/__fish_shared_key_bindings.fish | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index d54887551..ad1d16b9b 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -110,7 +110,6 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     bind --preset $argv \ee edit_command_buffer
     bind --preset $argv \ev edit_command_buffer
 
-
     # Tmux' focus events.
     # Exclude paste mode because that should get _everything_ literally.
     for mode in (bind --list-modes | string match -v paste)
@@ -129,23 +128,17 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     #
     # We enable it after every command and disable it before (in __fish_config_interactive.fish)
     #
-    # Support for this seems to be ubiquitous - emacs enables it unconditionally (!) since 25.1 (though it only supports it since then,
-    # it seems to be the last term to gain support).
-    # TODO: Should we disable this in older emacsen?
+    # Support for this seems to be ubiquitous - emacs enables it unconditionally (!) since 25.1
+    # (though it only supports it since then, it seems to be the last term to gain support).
     #
     # NOTE: This is more of a "security" measure than a proper feature.
     # The better way to paste remains the `fish_clipboard_paste` function (bound to \cv by default).
     # We don't disable highlighting here, so it will be redone after every character (which can be slow),
-    # and it doesn't handle "paste-stop" sequences in the paste (which the terminal needs to strip, but KDE konsole doesn't).
+    # and it doesn't handle "paste-stop" sequences in the paste (which the terminal needs to strip).
     #
-    # See http://thejh.net/misc/website-terminal-copy-paste. The second case will not be caught in KDE konsole.
+    # See http://thejh.net/misc/website-terminal-copy-paste.
+
     # Bind the starting sequence in every bind mode, even user-defined ones.
-
-    # We usually just pass the text through as-is to facilitate pasting code,
-    # but when the current token contains an unbalanced single-quote (`'`),
-    # we escape all single-quotes and backslashes, effectively turning the paste
-    # into one literal token, to facilitate pasting non-code (e.g. markdown or git commitishes)
-
     # Exclude paste mode or there'll be an additional binding after switching between emacs and vi
     for mode in (bind --list-modes | string match -v paste)
         bind --preset -M $mode -m paste \e\[200~ '__fish_start_bracketed_paste'
@@ -155,10 +148,17 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     # In paste-mode, everything self-inserts except for the sequence to get out of it
     bind --preset -M paste "" self-insert
     # Without this, a \r will overwrite the other text, rendering it invisible - which makes the exercise kinda pointless.
-    # TODO: Test this in windows (\r\n line endings)
     bind --preset -M paste \r "commandline -i \n"
+
+    # We usually just pass the text through as-is to facilitate pasting code,
+    # but when the current token contains an unbalanced single-quote (`'`),
+    # we escape all single-quotes and backslashes, effectively turning the paste
+    # into one literal token, to facilitate pasting non-code (e.g. markdown or git commitishes)
     bind --preset -M paste "'" "__fish_commandline_insert_escaped \' \$__fish_paste_quoted"
     bind --preset -M paste \\ "__fish_commandline_insert_escaped \\\ \$__fish_paste_quoted"
+    # Only insert spaces if we're either quoted or not at the beginning of the commandline
+    # - this strips leading spaces if they would trigger histignore.
+    bind --preset -M paste \  'if set -q __fish_paste_quoted[1]; or string length -q -- (commandline -c); commandline -i " "; end'
 end
 
 function __fish_commandline_insert_escaped --description 'Insert the first arg escaped if a second arg is given'

From b792290c51e3736fa8006fd026ad0f3bc912d538 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 12:30:22 +0100
Subject: [PATCH 0054/1732] CHANGELOG pasting leading spaces

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e4244899..07447150b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
+- Pasting will now strip leading spaces if they would trigger history ignoring (#4327).
 - mandoc can now be used to format the output from `--help` if nroff is not installed
 - New color options for the pager have been added (#5524).
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).

From 028112e535f2f3aee8593b71558cf22d93939a61 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 12:32:17 +0100
Subject: [PATCH 0055/1732] CHANGELOG: Add "scripting improvements" paragraph

It felt weird to put `math --scale` under "interactive", and it's not
a syntax change, new command or particularly notable either.
---
 CHANGELOG.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07447150b..cbb93d6a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,24 +6,26 @@
 ## Notable Fixes and improvements
 - Add `$pipestatus` support
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
-- `string split0` now returns 0 if it split something (#5701).
 
 ### Syntax changes and new commands
 - None yet.
 
+### Scripting improvements
+- `string split0` now returns 0 if it split something (#5701).
+- mandoc can now be used to format the output from `--help` if nroff is not installed.
+- In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
+- `math` now accepts `--scale=max` for the maximum scale (#5579).
+- `complete --do-complete` now also does fuzzy matches (#5467).
+
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
 - Pasting will now strip leading spaces if they would trigger history ignoring (#4327).
-- mandoc can now be used to format the output from `--help` if nroff is not installed
 - New color options for the pager have been added (#5524).
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
-- In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
-- `math` now accepts `--scale=max` for the maximum scale (#5579).
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
 - Fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), hopefully making setting $fish_emoji_width superfluous in most cases (#5722).
-- `complete --do-complete` now also does fuzzy matches (#5467).
 - Lots of improvements to completions.
 - Added completions for
   - `cf`
@@ -33,7 +35,7 @@
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
-- The doxygen-based documenation system has been removed and replaced with one based on sphinx. All distributors and developers must migrate to that.
+- The doxygen-based documentation system has been removed and replaced with one based on sphinx. All distributors and developers must migrate to that.
 
 ---
 

From 05b9c07816499b7adf063e9ca4dad6d7b480a282 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 13 Mar 2019 12:37:24 +0100
Subject: [PATCH 0056/1732] wcwidth: Return 0 for median/final jamo

Fixes #5729.
---
 src/fallback.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index 9f5542ba5..722338c04 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -287,8 +287,10 @@ int fish_wcwidth(wchar_t wc) {
     else if (wc == variation_selector_15) return 0;
 
     // Korean Hangul Jamo median vowels and final consonants.
-    // These are effectively combiners, so we handle them like combiners.
-    if (wc >= L'\u1160' && wc <= L'\u11FF') return wcwidth(wc);
+    // 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;
     int width = widechar_wcwidth(wc);
     switch (width) {
         case widechar_nonprint:

From b879a2650cf826ca763424376cccfc5af48c0af4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 13 Mar 2019 07:43:29 -0700
Subject: [PATCH 0057/1732] Fix 32-bit build

Fixes #5740
---
 src/pager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pager.cpp b/src/pager.cpp
index 8f6e864ca..d8f8da40b 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -659,7 +659,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
         // Cardinal directions. We have a completion index; we wish to compute its row and column.
         size_t current_row = this->get_selected_row(rendering);
         size_t current_col = this->get_selected_column(rendering);
-        size_t page_height = std::max(rendering.term_height - 1, 1UL);
+        size_t page_height = std::max(rendering.term_height - 1, (size_t)1);
 
         switch (direction) {
             case direction_page_north: {

From f0998fed6ab52a6056d2330f2bf16b0a2b17e88f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 13 Mar 2019 13:52:11 -0700
Subject: [PATCH 0058/1732] simplify append_yaml_to_buffer

---
 src/history.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 8ad1bfeb9..fafcd72ce 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -608,17 +608,13 @@ static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
     std::string cmd = wcs2string(wcmd);
     escape_yaml(&cmd);
     buffer->append("- cmd: ", cmd.c_str(), "\n");
-
-    char timestamp_str[96];
-    snprintf(timestamp_str, sizeof timestamp_str, "%ld", (long)timestamp);
-    buffer->append("  when: ", timestamp_str, "\n");
+    buffer->append("  when: ", std::to_string(timestamp).c_str(), "\n");
 
     if (!required_paths.empty()) {
         buffer->append("  paths:\n");
 
-        for (path_list_t::const_iterator iter = required_paths.begin();
-             iter != required_paths.end(); ++iter) {
-            std::string path = wcs2string(*iter);
+        for (auto const &wpath : required_paths) {
+            std::string path = wcs2string(wpath);
             escape_yaml(&path);
             buffer->append("    - ", path.c_str(), "\n");
         }

From 6fc542dfca148e4a7578e74a581a445b62ec8be3 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 13 Mar 2019 14:05:23 -0700
Subject: [PATCH 0059/1732] Revert "simplify append_yaml_to_buffer"

This reverts commit f0998fed6ab52a6056d2330f2bf16b0a2b17e88f.
---
 src/history.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index fafcd72ce..8ad1bfeb9 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -608,13 +608,17 @@ static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
     std::string cmd = wcs2string(wcmd);
     escape_yaml(&cmd);
     buffer->append("- cmd: ", cmd.c_str(), "\n");
-    buffer->append("  when: ", std::to_string(timestamp).c_str(), "\n");
+
+    char timestamp_str[96];
+    snprintf(timestamp_str, sizeof timestamp_str, "%ld", (long)timestamp);
+    buffer->append("  when: ", timestamp_str, "\n");
 
     if (!required_paths.empty()) {
         buffer->append("  paths:\n");
 
-        for (auto const &wpath : required_paths) {
-            std::string path = wcs2string(wpath);
+        for (path_list_t::const_iterator iter = required_paths.begin();
+             iter != required_paths.end(); ++iter) {
+            std::string path = wcs2string(*iter);
             escape_yaml(&path);
             buffer->append("    - ", path.c_str(), "\n");
         }

From f798a02a2a5e24ae3f367a4efb112cee4d1c8e6e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 10:38:59 +0100
Subject: [PATCH 0060/1732] Remove unused variable

---
 src/expand.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 42c44d8fa..2d517bf3c 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -181,8 +181,7 @@ wcstring expand_escape_variable(const env_var_t &var) {
 /// Parse an array slicing specification Returns 0 on success. If a parse error occurs, returns the
 /// index of the bad token. Note that 0 can never be a bad index because the string always starts
 /// with [.
-static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx,
-                          std::vector<size_t> &source_positions, size_t array_size) {
+static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx, size_t array_size) {
     const long size = (long)array_size;
     size_t pos = 1;  // skip past the opening square brace
 
@@ -255,7 +254,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             for (long jjj = i1; jjj * direction <= i2 * direction; jjj += direction) {
                 // debug(0, L"Expand range [subst]: %i\n", jjj);
                 idx.push_back(jjj);
-                source_positions.push_back(number_start);
             }
             continue;
         }
@@ -263,7 +261,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
         // debug( 0, L"Push idx %d", tmp );
         literal_zero_index = literal_zero_index && tmp == 0;
         idx.push_back(i1);
-        source_positions.push_back(i1_src_pos);
     }
 
     if (literal_zero_index && zero_index != -1) {
@@ -365,9 +362,7 @@ static bool expand_variables(wcstring instr, std::vector<completion_t> *out, siz
     size_t var_name_and_slice_stop = var_name_stop;
     bool all_values = true;
     const size_t slice_start = var_name_stop;
-    // List of indexes, and parallel array of source positions of each index in the variable list.
     std::vector<long> var_idx_list;
-    std::vector<size_t> var_pos_list;
     if (slice_start < insize && instr.at(slice_start) == L'[') {
         all_values = false;
         const wchar_t *in = instr.c_str();
@@ -380,8 +375,7 @@ static bool expand_variables(wcstring instr, std::vector<completion_t> *out, siz
         } else if (history) {
             effective_val_count = history->size();
         }
-        size_t bad_pos = parse_slice(in + slice_start, &slice_end, var_idx_list, var_pos_list,
-                                     effective_val_count);
+        size_t bad_pos = parse_slice(in + slice_start, &slice_end, var_idx_list, effective_val_count);
         if (bad_pos != 0) {
             if (in[slice_start + bad_pos] == L'0') {
                 append_syntax_error(errors, slice_start + bad_pos,
@@ -657,13 +651,12 @@ static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *ou
     tail_begin = paren_end + 1;
     if (*tail_begin == L'[') {
         std::vector<long> slice_idx;
-        std::vector<size_t> slice_source_positions;
         const wchar_t *const slice_begin = tail_begin;
         wchar_t *slice_end;
         size_t bad_pos;
 
         bad_pos =
-            parse_slice(slice_begin, &slice_end, slice_idx, slice_source_positions, sub_res.size());
+            parse_slice(slice_begin, &slice_end, slice_idx, sub_res.size());
         if (bad_pos != 0) {
             append_syntax_error(errors, slice_begin - in + bad_pos, L"Invalid index value");
             return false;

From 29556efebd76abcf37c92724864db96341f989b8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:22:17 +0100
Subject: [PATCH 0061/1732] Drop rc.d completions

This was an arch utility that it used shortly before introducing
systemd.

It's been dropped upstream for years.
---
 share/completions/rc.d.fish                    | 7 -------
 share/functions/__fish_print_arch_daemons.fish | 4 ----
 2 files changed, 11 deletions(-)
 delete mode 100644 share/completions/rc.d.fish
 delete mode 100644 share/functions/__fish_print_arch_daemons.fish

diff --git a/share/completions/rc.d.fish b/share/completions/rc.d.fish
deleted file mode 100644
index 2a34f0f5c..000000000
--- a/share/completions/rc.d.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-
-complete -c rc.d -xa 'list start stop restart help' -n 'not __fish_seen_subcommand_from list start stop restart'
-complete -c rc.d -s s -l started -n '__fish_seen_subcommand_from list start stop restart' -d 'Filter started daemons'
-complete -c rc.d -s S -l stopped -n '__fish_seen_subcommand_from list start stop restart' -d 'Filter stopped daemons'
-complete -c rc.d -s a -l auto    -n '__fish_seen_subcommand_from list start stop restart' -d 'Filter auto started daemons'
-complete -c rc.d -s A -l noauto  -n '__fish_seen_subcommand_from list start stop restart' -d 'Filter manually started daemons'
-complete -c rc.d -n '__fish_seen_subcommand_from list start stop restart' -xa '( __fish_print_arch_daemons )'
diff --git a/share/functions/__fish_print_arch_daemons.fish b/share/functions/__fish_print_arch_daemons.fish
deleted file mode 100644
index 3a683c149..000000000
--- a/share/functions/__fish_print_arch_daemons.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_print_arch_daemons --description 'Print arch daemons'
-    find /etc/rc.d/ -executable -type f -printf '%f\n'
-
-end

From 7784a5f23c3a355445e76fce671e53c16e0ea5ed Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:39:47 +0100
Subject: [PATCH 0062/1732] __fish_describe_command: Remove awk

This is really the only important place we're using it.

See #5553.
---
 share/functions/__fish_describe_command.fish | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 7fb334d78..e11d49b0c 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -3,20 +3,8 @@
 #
 
 function __fish_describe_command -d "Command used to find descriptions for commands"
-    # We're going to try to build a regex out of $argv inside awk.
-    # Make sure $argv has no special characters.
-    # TODO: stop interpolating argv into regex, and remove this hack.
-    string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
-    or return
-    type -q apropos; or return
-    apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
-		split($1, names, ", ");
-		for (name in names)
-			if (names[name] ~ /^'"$argv"'.* *\([18]\)/ ) {
-				sub( "( |\t)*\\\([18]\\\)", "", names[name] );
-				sub( " \\\[.*\\\]", "", names[name] );
-				print names[name] "\t" $2;
-			}
-	}'
+    command -sq apropos; or return
+    # Some systems could use -s 1,8 here, but FreeBSD doesn't have that.
+    apropos $argv 2>/dev/null | string replace -rf '^(\S+) \(\S+\)\s+- (.*)' '$1\t$2' \
+    | string match (string replace -a '*' '\*' -- "$argv")"*"
 end
-

From 5859d205d814736d538f7cd1db2d610cb2e09a33 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:41:05 +0100
Subject: [PATCH 0063/1732] completions/apt-file: Remove `ls` call

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

diff --git a/share/completions/apt-file.fish b/share/completions/apt-file.fish
index 2a22b8000..20129557c 100644
--- a/share/completions/apt-file.fish
+++ b/share/completions/apt-file.fish
@@ -11,7 +11,7 @@ complete -f -c apt-file -s i -l ignore-case -d "Do not expand pattern"
 complete -f -c apt-file -s x -l regexp -d "Pattern is regexp"
 complete -f -c apt-file -s V -l version -d "Display version and exit"
 complete -f -c apt-file -s a -l architecture -d "Set arch"
-complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d "Set sources.list file"
+complete -r -c apt-file -s s -l sources-list -a '(set -l files /etc/apt/*; string replace /etc/apt/ "" -- $files)' -d "Set sources.list file"
 complete -f -c apt-file -s l -l package-only -d "Only display package name"
 complete -f -c apt-file -s F -l fixed-string -d "Do not expand pattern"
 complete -f -c apt-file -s y -l dummy -d "Run in dummy mode"

From c5d5089871ddaabf77145c04a83233b744a18153 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:45:08 +0100
Subject: [PATCH 0064/1732] fish_svn_prompt: Stringify

This was the only remaining use of `grep` in functions/.
---
 share/functions/fish_svn_prompt.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_svn_prompt.fish b/share/functions/fish_svn_prompt.fish
index 5b3a90e23..c010cda94 100644
--- a/share/functions/fish_svn_prompt.fish
+++ b/share/functions/fish_svn_prompt.fish
@@ -78,7 +78,7 @@ function __fish_svn_prompt_parse_status --argument flag_status_string --descript
         # resolve the name of the variable for the character representing the current status type
         set -l flag_index (contains -i $flag_type $__fish_svn_prompt_flag_names)
         # check to see if the status string for this column contains the character representing the current status type
-        if test (echo $flag_status_string | grep -c $__fish_svn_prompt_chars[$flag_index]) -eq 1
+        if test (count (string match $__fish_svn_prompt_chars[$flag_index] -- $flag_status_string)) -eq 1
             # if it does, then get the names of the variables for the display character and colour to format it with
             set -l flag_var_display __fish_svn_prompt_char_{$flag_type}_display
             set -l flag_var_color __fish_svn_prompt_char_{$flag_type}_color

From 3043d726bf83e210f323f54b16c97a75e10f6b82 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:46:48 +0100
Subject: [PATCH 0065/1732] completions/minikube: Stringify

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

diff --git a/share/completions/minikube.fish b/share/completions/minikube.fish
index 81b974bac..fff7cf999 100644
--- a/share/completions/minikube.fish
+++ b/share/completions/minikube.fish
@@ -67,7 +67,7 @@ end
 
 function __minikube_list_addons
     if set -q argv[1]
-        minikube addons list | grep $argv[1] | string replace -r -- "- ([^:]*): .*" '$1'
+        minikube addons list | string match -- "*$argv[1]*" | string replace -r -- "- ([^:]*): .*" '$1'
     else
         minikube addons list | string replace -r -- "- ([^:]*): .*" '$1'
     end

From a4d728c9deaa0a2b414c568861930575a3ec2a3c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 12:49:12 +0100
Subject: [PATCH 0066/1732] completions/ezjail-admin: Stringify

Specifically `grep`, these awks are still a bit too annoying to do
with `string`.
---
 share/completions/ezjail-admin.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/ezjail-admin.fish b/share/completions/ezjail-admin.fish
index 287bce118..5eb0fc74c 100644
--- a/share/completions/ezjail-admin.fish
+++ b/share/completions/ezjail-admin.fish
@@ -3,11 +3,11 @@ function __fish_complete_jails
 end
 
 function __fish_complete_running_jails
-    ezjail-admin list | tail +3 | grep '^.R' | awk '{ print $4 }'
+    ezjail-admin list | tail +3 | string match -r '^.R' | awk '{ print $4 }'
 end
 
 function __fish_complete_stopped_jails
-    ezjail-admin list | tail +3 | grep '^.S' | awk '{ print $4 }'
+    ezjail-admin list | tail +3 | string match -r '^.S' | awk '{ print $4 }'
 end
 
 # archive

From aa08504fe3c7d54d861fa84f7ce2d9bbc6f4f9c3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 13:07:10 +0100
Subject: [PATCH 0067/1732] completions/zpool: Stringify a bit

These are the simple bits - replace useless helper functions and uses
of grep/sed with string or other appropriate tools.
---
 share/completions/zpool.fish | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 379c87d10..20d47f41c 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -21,11 +21,7 @@ end
 
 # Does the current invocation need a command?
 function __fish_zpool_needs_command
-    if commandline -c | grep -E -q " (\?|add|attach|clear|create|destroy|detach|events|get|history|import|iostat|labelclear|list|offline|online|reguid|reopen|remove|replace|scrub|set|split|status|upgrade) "
-        return 1
-    else
-        return 0
-    end
+    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
 end
 
 function __fish_zpool_using_command # zpool command whose completions are looked for
@@ -40,11 +36,6 @@ function __fish_zpool_using_command # zpool command whose completions are looked
     end
 end
 
-function __fish_zpool_append -d "Internal completion function for appending string to the zpool commandline"
-    set str (commandline -tc| sed -ne "s/\(.*,\)[^,]*/\1/p"|sed -e "s/--.*=//")
-    printf "%s\n" "$str"$argv
-end
-
 function __fish_zpool_list_used_vdevs -a pool
     if test -z "$pool"
         zpool list -H -v | grep -E "^\s" | cut -f2 | grep -x -E -v "(spare|log|cache|mirror|raidz.?)"
@@ -68,12 +59,8 @@ function __fish_zpool_complete_vdevs
     # 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 reversedTokens ""
-    for i in (commandline -co)
-        set reversedTokens "$i $reversedTokens"
-    end
     set -l tokens 0
-    for i in (echo "$reversedTokens" | sed "s/ /\n/g")
+    for i in (commandline -co)[-1..1]
         switch $i
             case spare log cache # At least 1 item expected
                 if test $tokens -ge 1
@@ -289,9 +276,9 @@ complete -c zpool -x -n '__fish_zpool_using_command export' -d 'Pool to export'
 complete -c zpool -f -n '__fish_zpool_using_command get' -s p -d 'Print parsable (exact) values for numbers'
 complete -c zpool -f -n '__fish_zpool_using_command get' -s H -d 'Print output in a machine-parsable format'
 if contains -- $OS FreeBSD SunOS
-    complete -c zpool -x -n '__fish_zpool_using_command get' -s o -d 'Fields to display' -a '(__fish_zpool_append (__fish_zpool_list_get_fields))'
+    complete -c zpool -x -n '__fish_zpool_using_command get' -s o -d 'Fields to display' -a '(__fish_append , (__fish_zpool_list_get_fields))'
 end
-complete -c zpool -x -n '__fish_zpool_using_command get' -d 'Properties to get' -a '(__fish_zpool_append (__fish_zpool_list_importtime_properties; __fish_zpool_list_rw_properties; __fish_zpool_list_writeonce_properties; __fish_zpool_list_ro_properties; __fish_zpool_list_device_properties; echo -e "all\t"(_ "All properties")))'
+complete -c zpool -x -n '__fish_zpool_using_command get' -d 'Properties to get' -a '(__fish_append , (__fish_zpool_list_importtime_properties; __fish_zpool_list_rw_properties; __fish_zpool_list_writeonce_properties; __fish_zpool_list_ro_properties; __fish_zpool_list_device_properties; echo -e "all\t"(_ "All properties")))'
 complete -c zpool -x -n '__fish_zpool_using_command get' -d 'Pool to get properties of' -a '(__fish_complete_zfs_pools)'
 
 # history completions
@@ -303,7 +290,7 @@ complete -c zpool -f -n '__fish_zpool_using_command history' -d 'Pool to get com
 complete -c zpool -r -n '__fish_zpool_using_command import; and __fish_not_contain_opt -s d' -s c -d 'Read configuration from specified cache file'
 complete -c zpool -r -n '__fish_zpool_using_command import; and __fish_not_contain_opt -s c' -s d -d 'Search for devices or files in specified directory'
 complete -c zpool -f -n '__fish_zpool_using_command import' -s D -d 'List or import destroyed pools only (requires -f for importation)'
-complete -c zpool -x -n '__fish_zpool_using_command import' -s o -d 'Mount properties for contained datasets' -a '(__fish_zpool_append (__fish_complete_zfs_mountpoint_properties))'
+complete -c zpool -x -n '__fish_zpool_using_command import' -s o -d 'Mount properties for contained datasets' -a '(__fish_append , (__fish_complete_zfs_mountpoint_properties))'
 complete -c zpool -x -n '__fish_zpool_using_command import' -s o -d 'Properties of the imported pool' -a '(__fish_complete_zfs_mountpoint_properties; __fish_zpool_list_importtime_properties; __fish_zpool_list_rw_properties)'
 complete -c zpool -f -n '__fish_zpool_using_command import' -s f -d 'Force import'
 complete -c zpool -f -n '__fish_zpool_using_command import' -s F -d 'Recovery mode'
@@ -343,7 +330,7 @@ end
 complete -c zpool -f -n '__fish_zpool_using_command list' -s P -d 'Display device full path'
 complete -c zpool -x -n '__fish_zpool_using_command list' -s T -d 'Display a timestamp using specified format'
 complete -c zpool -f -n '__fish_zpool_using_command list' -s v -d 'Print verbose statistics'
-complete -c zpool -x -n '__fish_zpool_using_command list' -s o -d 'Property to list' -a '(__fish_zpool_append (__fish_zpool_list_importtime_properties; __fish_zpool_list_rw_properties; __fish_zpool_list_writeonce_properties; __fish_zpool_list_ro_properties; __fish_zpool_list_device_properties))'
+complete -c zpool -x -n '__fish_zpool_using_command list' -s o -d 'Property to list' -a '(__fish_append , (__fish_zpool_list_importtime_properties; __fish_zpool_list_rw_properties; __fish_zpool_list_writeonce_properties; __fish_zpool_list_ro_properties; __fish_zpool_list_device_properties))'
 complete -c zpool -f -n '__fish_zpool_using_command list' -d 'Pool to list properties of' -a '(__fish_complete_zfs_pools)'
 
 # offline completions
@@ -396,7 +383,7 @@ complete -c zpool -f -n '__fish_zpool_using_command split' -s n -d 'Dry run: onl
 complete -c zpool -r -n '__fish_zpool_using_command split' -s R -d 'Set altroot for newpool and automatically import it'
 complete -c zpool -x -n '__fish_zpool_using_command split' -s o -d 'Pool property' -a '(__fish_zpool_list_writeonce_properties; __fish_zpool_list_rw_properties)'
 if test $OS = 'FreeBSD'
-    complete -c zpool -x -n '__fish_zpool_using_command split; and __fish_contains_opt -s R' -s o -d 'Mount properties for contained datasets' -a '(__fish_zpool_append (__fish_complete_zfs_mountpoint_properties))'
+    complete -c zpool -x -n '__fish_zpool_using_command split; and __fish_contains_opt -s R' -s o -d 'Mount properties for contained datasets' -a '(__fish_append , (__fish_complete_zfs_mountpoint_properties))'
 end
 complete -c zpool -x -n '__fish_zpool_using_command split' -d 'Pool to split' -a '(__fish_complete_zfs_pools)'
 

From 05038fc8653b2c39edc7e65459528d3696c559c2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 13:15:40 +0100
Subject: [PATCH 0068/1732] completions/zfs: Stringify

---
 share/completions/zfs.fish | 52 ++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 4b8227231..914d27d70 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -25,22 +25,14 @@ switch (uname)
         set OS "unknown"
 end
 
-function __fish_zfs_append -d "Internal completion function for appending string to the ZFS commandline"
-    set str (commandline -tc | string replace -rf '(.*,)[^,]*' '$1' | string replace -r -- '--.*=' '')
-    printf "%s\n" "$str"$argv
-end
-
 # Does the current invocation need a command?
 function __fish_zfs_needs_command
     set -l bookmark ""
     if __fish_is_zfs_feature_enabled "feature@bookmarks"
-        set -l bookmark "|bookmark"
-    end
-    if commandline -c | grep -E -q " (\?|create|destroy|snap(shot)?|rollback|clone|promote|rename|list|set|get|inherit|upgrade|(user|group)space|(un?)?mount|(un)?share$bookmark|send|receive|recv|(un)?allow|holds?|release|diff|program) "
-        return 1
-    else
-        return 0
+        set bookmark "bookmark"
     end
+
+    not __fish_seen_subcommand_from \? create destroy snap{,shot} rollback clone promote rename list set get inherit upgrade {user,group}space {u,un,}mount {un,}share $bookmark send receive recv {un,}allow hold{s,} release diff program
 end
 
 function __fish_zfs_using_command # ZFS command whose completions are looked for
@@ -203,7 +195,7 @@ function __fish_zfs_list_permissions
         echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive, mixed)"
     end
     # Permissions set; if none are found, or if permission sets are not supported, no output is expected, even an error
-    for i in (zpool list -o name -H); zfs allow $i; end | grep -o '@[[:alnum:]]*' | sort -u
+    for i in (zpool list -o name -H); zfs allow $i; end | string match -r '@[[:alnum:]]*' | sort -u
 end
 
 complete -c zfs -f -n '__fish_zfs_needs_command' -s '?' -a '?' -d 'Display a help message'
@@ -245,7 +237,7 @@ end
 # create completions
 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_zfs_append (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
+    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
@@ -268,7 +260,7 @@ complete -c zfs -x -n '__fish_zfs_using_command destroy' -d 'Dataset to destroy'
 # snapshot completions
 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_zfs_append (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
+    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
@@ -283,7 +275,7 @@ complete -c zfs -x -n '__fish_zfs_using_command rollback' -d 'Snapshot to roll b
 # clone completions
 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_zfs_append (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties))'
+    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
@@ -307,7 +299,7 @@ complete -c zfs -x -n '__fish_zfs_using_command rename' -d 'Dataset to rename' -
 complete -c zfs -f -n '__fish_zfs_using_command list' -s H -d 'Print output in a machine-parsable format'
 complete -c zfs -f -n '__fish_zfs_using_command list' -s r -d 'Operate recursively on datasets'
 complete -c zfs -x -n '__fish_zfs_using_command list; and __fish_contains_opt -s r' -s d -d 'Maximum recursion depth'
-complete -c zfs -x -n '__fish_zfs_using_command list' -s o -d 'Property to list' -a '(__fish_zfs_append (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo -e "name\t"(_ "Dataset name")"; echo -e "space\t"(_ "Space properties")"))'
+complete -c zfs -x -n '__fish_zfs_using_command list' -s o -d 'Property to list' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo -e "name\t"(_ "Dataset name")"; echo -e "space\t"(_ "Space properties")"))'
 complete -c zfs -f -n '__fish_zfs_using_command list' -s p -d 'Print parsable (exact) values for numbers'
 complete -c zfs -x -n '__fish_zfs_using_command list; and __fish_not_contain_opt -s S' -s s -d 'Property to use for sorting output by ascending order' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo -e "name\t"(_ "Dataset name"))'
 complete -c zfs -x -n '__fish_zfs_using_command list; and __fish_not_contain_opt -s s' -s S -d 'Property to use for sorting output by descending order' -a '(__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo -e "name\t"(_ "Dataset name"))'
@@ -322,11 +314,11 @@ complete -c zfs -x -n '__fish_zfs_using_command set; and string match -q -r "zfs
 complete -c zfs -f -n '__fish_zfs_using_command get' -s r -d 'Operate recursively on datasets'
 complete -c zfs -x -n '__fish_zfs_using_command get; and __fish_contains_opt -s r' -s d -d 'Maximum recursion depth'
 complete -c zfs -f -n '__fish_zfs_using_command get' -s H -d 'Print output in a machine-parsable format'
-complete -c zfs -x -n '__fish_zfs_using_command get' -s o -d 'Fields to display' -a '(__fish_zfs_append (__fish_zfs_list_get_fields))'
-complete -c zfs -x -n '__fish_zfs_using_command get' -s s -d 'Property source to display' -a '(__fish_zfs_append (__fish_zfs_list_source_types))'
+complete -c zfs -x -n '__fish_zfs_using_command get' -s o -d 'Fields to display' -a '(__fish_append , (__fish_zfs_list_get_fields))'
+complete -c zfs -x -n '__fish_zfs_using_command get' -s s -d 'Property source to display' -a '(__fish_append , (__fish_zfs_list_source_types))'
 complete -c zfs -f -n '__fish_zfs_using_command get' -s p -d 'Print parsable (exact) values for numbers'
-complete -c zfs -x -n '__fish_zfs_using_command get' -s t -d 'Dataset type' -a '(__fish_zfs_append (__fish_zfs_list_dataset_types))'
-complete -c zfs -x -n '__fish_zfs_using_command get' -d 'Property to get' -a '(__fish_zfs_append (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo "all"))'
+complete -c zfs -x -n '__fish_zfs_using_command get' -s t -d 'Dataset type' -a '(__fish_append , (__fish_zfs_list_dataset_types))'
+complete -c zfs -x -n '__fish_zfs_using_command get' -d 'Property to get' -a '(__fish_append , (__fish_complete_zfs_rw_properties; __fish_complete_zfs_write_once_properties; __fish_complete_zfs_ro_properties; echo "all"))'
 complete -c zfs -x -n '__fish_zfs_using_command get' -d 'Dataset which properties is to be got' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes; __fish_print_zfs_snapshots)'
 
 # inherit completions
@@ -346,16 +338,16 @@ complete -c zfs -f -n '__fish_zfs_using_command userspace' -s n -d 'Print UID in
 complete -c zfs -f -n '__fish_zfs_using_command groupspace' -s n -d 'Print GID instead of group name'
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s H -d 'Print output in a machine-parsable format'
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s p -d 'Print parsable (exact) values for numbers'
-complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s o -d 'Field to display' -a '(__fish_zfs_append (__fish_zfs_list_space_fields))'
+complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s o -d 'Field to display' -a '(__fish_append , (__fish_zfs_list_space_fields))'
 complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s S' -s s -d 'Property to use for sorting output by ascending order' -a '__fish_zfs_list_space_fields'
 complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace; and __fish_not_contain_opt -s s' -s S -d 'Property to use for sorting output by descending order' -a '__fish_zfs_list_space_fields'
-complete -c zfs -x -n '__fish_zfs_using_command userspace' -s t -d 'Identity types to display' -a '(__fish_zfs_append (__fish_zfs_list_userspace_types))'
-complete -c zfs -x -n '__fish_zfs_using_command groupspace' -s t -d 'Identity types to display' -a '(__fish_zfs_append (__fish_zfs_list_groupspace_types))'
+complete -c zfs -x -n '__fish_zfs_using_command userspace' -s t -d 'Identity types to display' -a '(__fish_append , (__fish_zfs_list_userspace_types))'
+complete -c zfs -x -n '__fish_zfs_using_command groupspace' -s t -d 'Identity types to display' -a '(__fish_append , (__fish_zfs_list_groupspace_types))'
 complete -c zfs -f -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -s i -d 'Translate S(amba)ID to POSIX ID'
 complete -c zfs -x -n '__fish_zfs_using_command userspace; or __fish_zfs_using_command groupspace' -d 'Dataset which space usage is to be got' -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_zfs_append (__fish_complete_zfs_mountpoint_properties))'
+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))'
 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
@@ -424,23 +416,23 @@ complete -c zfs -x -n '__fish_zfs_using_command receive; or __fish_zfs_using_com
 # allow completions
 complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s d' -s l -d 'Delegate permissions only on the specified dataset'
 complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s l' -s d -d 'Delegate permissions only on the descendents dataset'
-complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s u -d 'User to delegate permissions to' -a '(__fish_zfs_append (__fish_complete_users))'
-complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s g -d 'Group to delegate permissions to' -a '(__fish_zfs_append (__fish_complete_groups))'
+complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s u -d 'User to delegate permissions to' -a '(__fish_append , (__fish_complete_users))'
+complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s e' -s g -d 'Group to delegate permissions to' -a '(__fish_append , (__fish_complete_groups))'
 if contains -- $OS SunOS FreeBSD
     complete -c zfs -f -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s u -s g -s e' -a 'everyone' -d 'Delegate permission to everyone'
 end
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s u -s g everyone' -s e -d 'Delegate permission to everyone'
-complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Delegate permissions only to the creator of later descendent datasets' -a '(__fish_zfs_append (__fish_zfs_list_permissions))'
+complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Delegate permissions only to the creator of later descendent datasets' -a '(__fish_zfs_append , (__fish_zfs_list_permissions))'
 complete -c zfs -x -n '__fish_zfs_using_command allow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s c' -s s -d 'Create a permission set or add permissions to an existing one'
 complete -c zfs -x -n '__fish_zfs_using_command allow' -d 'Dataset on which delegation is to be applied' -a '(__fish_print_zfs_filesystems; __fish_print_zfs_volumes)'
 
 # unallow completions
 complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s d' -s l -d 'Remove permissions only on the specified dataset'
 complete -c zfs -f -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l' -s d -d 'Remove permissions only on the descendents dataset'
-complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s e' -s u -d 'User to remove permissions from' -a '(__fish_zfs_append (__fish_complete_users))'
-complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s e' -s g -d 'Group to remove permissions from' -a '(__fish_zfs_append (__fish_complete_groups))'
+complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s e' -s u -d 'User to remove permissions from' -a '(__fish_zfs_append , (__fish_complete_users))'
+complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s e' -s g -d 'Group to remove permissions from' -a '(__fish_zfs_append , (__fish_complete_groups))'
 complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s u -s g everyone' -s e -d 'Remove permission from everyone'
-complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Remove permissions only on later created descendent datasets' -a '(__fish_zfs_append (__fish_zfs_list_permissions))'
+complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s s' -s c -d 'Remove permissions only on later created descendent datasets' -a '(__fish_zfs_append , (__fish_zfs_list_permissions))'
 complete -c zfs -x -n '__fish_zfs_using_command unallow; and __fish_not_contain_opt -s l -s d -s e -s g -s u -s c' -s s -d 'Remove a permission set or remove permissions from an existing one'
 if test $OS = 'SunOS'
     complete -c zfs -f -n '__fish_zfs_using_command unallow' -s r -d 'Remove permissions recursively'

From 912ba177ec881eb6c3298202a1fc531320dd7026 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 13:16:01 +0100
Subject: [PATCH 0069/1732] functions/__fish_append: Stringify

This called `sed`, twice.
---
 share/functions/__fish_append.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_append.fish b/share/functions/__fish_append.fish
index d1b6ece1e..d40163cab 100644
--- a/share/functions/__fish_append.fish
+++ b/share/functions/__fish_append.fish
@@ -1,7 +1,7 @@
-function __fish_append -d "Internal completion function for appending string to the commandline" --argument separator
+function __fish_append -d "Internal completion function for appending string to the commandline" --argument sep
     set -e argv[1]
-    set str (commandline -tc| sed -ne "s/\(.*$separator\)[^$separator]*/\1/p"|sed -e "s/--.*=//")
-    printf "%s\n" "$str"$argv "$str"(printf "%s\n" $argv|sed -e "s/\(\t\|\$\)/,\1/")
+    set str (commandline -tc | string replace -rf "(.*$sep)[^$sep]*" '$1' | string replace -r -- '--.*=' '')
+    printf "%s\n" "$str"$argv
 end
 
 

From 7766d0a7d04e75c296ae25fc929e042211bc92c1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 13:22:56 +0100
Subject: [PATCH 0070/1732] Remove outdated comment

[ci skip]
---
 share/completions/service.fish | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/completions/service.fish b/share/completions/service.fish
index 2c5a1d64f..6cee6e241 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -19,7 +19,6 @@ else if test -d /etc/init.d # SysV on Debian and other linuxen
 	__fish_complete_static_service_actions $service_commands
 else # FreeBSD
 	# Use the output of `service -v foo` to retrieve the list of service-specific verbs
-	# We can safely use `sed` here because this is platform-specific
 	complete -c service -n "not __fish_is_first_token" -xa "(__fish_complete_freebsd_service_actions)"
 end
 

From 605b1cfab6d709396a797891b198ab42d72ccf95 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 13:30:49 +0100
Subject: [PATCH 0071/1732] README: Update deps

- Remove `jq` since it can also use python now.

- Add specific UNIX utilities

Fixes #5553.

[ci skip]
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8c9918a0f..28c60704c 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Once installed, run `fish` from your current shell to try fish out!
 Running fish requires:
 
 * curses or ncurses (preinstalled on most \*nix systems)
-* some common \*nix system utilities (currently `mktemp` and `seq`), in addition to the basic POSIX utilities
+* some common \*nix system utilities (currently `mktemp`), in addition to the basic POSIX utilities (`cat`, `cut`, `dirname`, `ls`, `mkdir`, `mkfifo`, `rm`, `sort`, `tr`, `uname` and `sed` at least, but the full coreutils plus find, sed and awk is preferred)
 * gettext (library and `gettext` command), if compiled with translation support
 
 The following optional features also have specific requirements:
@@ -76,8 +76,7 @@ The following optional features also have specific requirements:
   `backports.lzma` module for Python 2.7
 * the `fish_config` web configuration tool requires Python (2.7+ or 3.3 +) and a web browser
 * system clipboard integration (with the default Ctrl-V and Ctrl-X bindings) require either the
-  `xsel` or `pbcopy`/`pbpaste` utilities
-* full completions for `yarn` and `bower` require the `jq` utility
+  `xsel`, `xclip`, `wl-copy`/`wl-paste` or `pbcopy`/`pbpaste` utilities
 * full completions for `yarn` and `npm` require the `all-the-package-names` NPM module
 
 ### Switching to fish

From 9dcb5abaf1d60753e134954db4be9a7f200f0642 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 17:15:09 +0100
Subject: [PATCH 0072/1732] completions/pandoc: Stringify

This should be the last call to `grep` outside of a script
specifically related to `grep`.

(With the exception of `zpool`, which I've already written, but which
will probably be merged later)
---
 share/completions/pandoc.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/pandoc.fish b/share/completions/pandoc.fish
index 1d45753f2..cb2927276 100644
--- a/share/completions/pandoc.fish
+++ b/share/completions/pandoc.fish
@@ -98,9 +98,9 @@ complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'ria')"
 complete -c pandoc -r -f -l lua-filter     -a "(__fish_complete_suffix 'lua')"
 
 # options that take files in DATADIR
-complete -c pandoc -r -s F -l filter       -a "(find $datadir/filters/** | sed -e 's|$datadir/filters/||')"
-complete -c pandoc -r -l template          -a "(find $datadir/templates/** | sed -e 's|$datadir/templates/||')"
-complete -c pandoc -r -f -l lua-filter     -a "(find $datadir/** | egrep '.lua\$' | sed -e 's|$datadir/||')"
+complete -c pandoc -r -s F -l filter       -a "(find $datadir/filters/** | string replace -- '$datadir/filters/' '')"
+complete -c pandoc -r -l template          -a "(find $datadir/templates/** | string replace -- '$datadir/templates/' '')"
+complete -c pandoc -r -f -l lua-filter     -a "(find $datadir/** | string match -r '.lua\$' | string replace -- '$datadir/' '')"
 
 # options that require arguments which cannot be autocompleted
 complete -c pandoc -x -l indented-code-classes

From 2bf554ae5e18fdc6b4cebc9ba746242e1f9d6d63 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 10:28:48 -0700
Subject: [PATCH 0073/1732] Simplify valid_var_name

---
 src/common.cpp | 14 +++-----------
 src/common.h   |  1 -
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 063d45d21..451ec6d52 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2414,21 +2414,13 @@ void redirect_tty_output() {
 bool valid_var_name_char(wchar_t chr) { return fish_iswalnum(chr) || chr == L'_'; }
 
 /// Test if the given string is a valid variable name.
-bool valid_var_name(const wchar_t *str) {
-    if (str[0] == L'\0') return false;
-    while (*str) {
-        if (!valid_var_name_char(*str)) return false;
-        str++;
-    }
-    return true;
+bool valid_var_name(const wcstring &str) {
+    return std::find_if(str.begin(), str.end(), valid_var_name_char) == str.end();
 }
 
-/// Test if the given string is a valid variable name.
-bool valid_var_name(const wcstring &str) { return valid_var_name(str.c_str()); }
-
 /// Test if the string is a valid function name.
 bool valid_func_name(const wcstring &str) {
-    if (str.size() == 0) return false;
+    if (str.empty()) return false;
     if (str.at(0) == L'-') return false;
     if (str.find_first_of(L'/') != wcstring::npos) return false;
     return true;
diff --git a/src/common.h b/src/common.h
index c927e0c11..c5522713d 100644
--- a/src/common.h
+++ b/src/common.h
@@ -971,7 +971,6 @@ void invalidate_termsize(bool invalidate_vars = false);
 struct winsize get_current_winsize();
 
 bool valid_var_name_char(wchar_t chr);
-bool valid_var_name(const wchar_t *str);
 bool valid_var_name(const wcstring &str);
 bool valid_func_name(const wcstring &str);
 

From 2636876472b8e00b8a652b2a237255d4a910766d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 13 Mar 2019 13:52:11 -0700
Subject: [PATCH 0074/1732] simplify append_yaml_to_buffer

---
 src/history.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 8ad1bfeb9..fafcd72ce 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -608,17 +608,13 @@ static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
     std::string cmd = wcs2string(wcmd);
     escape_yaml(&cmd);
     buffer->append("- cmd: ", cmd.c_str(), "\n");
-
-    char timestamp_str[96];
-    snprintf(timestamp_str, sizeof timestamp_str, "%ld", (long)timestamp);
-    buffer->append("  when: ", timestamp_str, "\n");
+    buffer->append("  when: ", std::to_string(timestamp).c_str(), "\n");
 
     if (!required_paths.empty()) {
         buffer->append("  paths:\n");
 
-        for (path_list_t::const_iterator iter = required_paths.begin();
-             iter != required_paths.end(); ++iter) {
-            std::string path = wcs2string(*iter);
+        for (auto const &wpath : required_paths) {
+            std::string path = wcs2string(wpath);
             escape_yaml(&path);
             buffer->append("    - ", path.c_str(), "\n");
         }

From cf570d4b11002112d2a24a58b9905d1c25543a05 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 10:37:13 -0700
Subject: [PATCH 0075/1732] fixup previous commit

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

diff --git a/src/common.cpp b/src/common.cpp
index 451ec6d52..3374bd6aa 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2415,7 +2415,7 @@ bool valid_var_name_char(wchar_t chr) { return fish_iswalnum(chr) || chr == L'_'
 
 /// Test if the given string is a valid variable name.
 bool valid_var_name(const wcstring &str) {
-    return std::find_if(str.begin(), str.end(), valid_var_name_char) == str.end();
+    return std::find_if_not(str.begin(), str.end(), valid_var_name_char) == str.end();
 }
 
 /// Test if the string is a valid function name.

From 0ee98628096151d1fc63b4c5957d5a6406cee937 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 10:52:26 -0700
Subject: [PATCH 0076/1732] Write out backtrace in one debug(), add \n after
 it.

The goal here is to make fish -dn -Dn output a little easier
to scan visually.
---
 src/common.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 3374bd6aa..de0759a5a 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -225,18 +225,8 @@ demangled_backtrace(int max_frames, int skip_levels) {
 [[gnu::noinline]] void show_stackframe(const wchar_t msg_level, int frame_count, int skip_levels) {
     if (frame_count < 1) return;
 
-    // TODO: Decide if this is still needed. I'm commenting it out because it caused me some grief
-    // while trying to debug a test failure. And the tests run just fine without spurious failures
-    // if this check is not done.
-    //
-    // Hack to avoid showing backtraces in the tester.
-    // if (program_name && !std::wcscmp(program_name, L"(ignore)")) return;
-
-    debug_shared(msg_level, L"Backtrace:");
-    std::vector<wcstring> bt = demangled_backtrace(frame_count, skip_levels + 2);
-    for (int i = 0; (size_t)i < bt.size(); i++) {
-        debug_shared(msg_level, bt[i]);
-    }
+    wcstring_list_t bt = demangled_backtrace(frame_count, skip_levels + 2);
+    debug_shared(msg_level, L"Backtrace:\n" + join_strings(bt, L'\n') + L'\n');
 }
 
 #else   // HAVE_BACKTRACE_SYMBOLS

From 477b2e8d7c21c93f7ae544af82ad51a818040dbf Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 11:15:50 -0700
Subject: [PATCH 0077/1732] std::vector<wcstring> is wcstring_list_t

---
 src/builtin_bind.cpp | 2 +-
 src/common.cpp       | 2 +-
 src/exec.cpp         | 2 +-
 src/exec.h           | 2 +-
 src/fish_tests.cpp   | 4 ++--
 src/highlight.cpp    | 2 +-
 src/input.cpp        | 3 +--
 src/path.cpp         | 2 +-
 src/reader.cpp       | 2 +-
 src/screen.h         | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 533d48399..dbf717347 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -53,7 +53,7 @@ struct bind_cmd_opts_t {
 /// Returns false if no binding with that sequence and mode exists.
 bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bool user,
                                   io_streams_t &streams) {
-    std::vector<wcstring> ecmds;
+    wcstring_list_t ecmds;
     wcstring sets_mode;
 
     if (!input_mapping_get(seq, bind_mode, &ecmds, user, &sets_mode)) {
diff --git a/src/common.cpp b/src/common.cpp
index de0759a5a..41d7ee3e0 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -198,7 +198,7 @@ demangled_backtrace(int max_frames, int skip_levels) {
     int n_frames = backtrace(callstack, n_max_frames);
     char **symbols = backtrace_symbols(callstack, n_frames);
     wchar_t text[1024];
-    std::vector<wcstring> backtrace_text;
+    wcstring_list_t backtrace_text;
 
     if (skip_levels + max_frames < n_frames) n_frames = skip_levels + max_frames;
 
diff --git a/src/exec.cpp b/src/exec.cpp
index 05ebea52a..b93c78f02 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1150,7 +1150,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     return subcommand_statuses.status;
 }
 
-int exec_subshell(const wcstring &cmd, parser_t &parser, std::vector<wcstring> &outputs,
+int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs,
                   bool apply_exit_status, bool is_subcmd) {
     ASSERT_IS_MAIN_THREAD();
     return exec_subshell_internal(cmd, parser, &outputs, apply_exit_status, is_subcmd);
diff --git a/src/exec.h b/src/exec.h
index 63b78abc7..12c5d9051 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -23,7 +23,7 @@ bool exec_job(parser_t &parser, std::shared_ptr<job_t> j);
 /// \param outputs The list to insert output into.
 ///
 /// \return the status of the last job to exit, or -1 if en error was encountered.
-int exec_subshell(const wcstring &cmd, parser_t &parser, std::vector<wcstring> &outputs,
+int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs,
                   bool preserve_exit_status, bool is_subcmd = false);
 int exec_subshell(const wcstring &cmd, parser_t &parser, bool preserve_exit_status,
                   bool is_subcmd = false);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e459dc504..217753c82 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3012,10 +3012,10 @@ static void test_line_iterator() {
     do_test((lines1 == std::vector<std::string>{"Alpha", "Beta", "Gamma", "", "Delta"}));
 
     wcstring text2 = L"\n\nAlpha\nBeta\nGamma\n\nDelta";
-    std::vector<wcstring> lines2;
+    wcstring_list_t lines2;
     line_iterator_t<wcstring> iter2(text2);
     while (iter2.next()) lines2.push_back(iter2.line());
-    do_test((lines2 == std::vector<wcstring>{L"", L"", L"Alpha", L"Beta", L"Gamma", L"", L"Delta"}));
+    do_test((lines2 == wcstring_list_t{L"", L"", L"Alpha", L"Beta", L"Gamma", L"", L"Delta"}));
 }
 
 #define UVARS_PER_THREAD 8
diff --git a/src/highlight.cpp b/src/highlight.cpp
index d45426024..bea5a6dc5 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -322,7 +322,7 @@ static bool is_potential_cd_path(const wcstring &path, const wcstring &working_d
     } else {
         // Get the CDPATH.
         auto cdpath = vars.get(L"CDPATH");
-        std::vector<wcstring> pathsv =
+        wcstring_list_t pathsv =
             cdpath.missing_or_empty() ? wcstring_list_t{L"."} : cdpath->as_list();
 
         for (auto next_path : pathsv) {
diff --git a/src/input.cpp b/src/input.cpp
index 66205a628..5cece3eeb 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -46,8 +46,7 @@ struct input_mapping_t {
     /// New mode that should be switched to after command evaluation.
     wcstring sets_mode;
 
-    input_mapping_t(wcstring s, std::vector<wcstring> c, wcstring m,
-                    wcstring sm)
+    input_mapping_t(wcstring s, wcstring_list_t c, wcstring m, wcstring sm)
         : seq(std::move(s)), commands(std::move(c)), mode(std::move(m)), sets_mode(std::move(sm)) {
         static unsigned int s_last_input_map_spec_order = 0;
         specification_order = ++s_last_input_map_spec_order;
diff --git a/src/path.cpp b/src/path.cpp
index 93d941204..8349dd50e 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -135,7 +135,7 @@ wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars) {
     }
 
     auto path_var = vars.get(L"PATH");
-    std::vector<wcstring> pathsv;
+    wcstring_list_t pathsv;
     if (path_var) path_var->to_list(pathsv);
     for (auto path : pathsv) {
         if (path.empty()) continue;
diff --git a/src/reader.cpp b/src/reader.cpp
index 8d2b0ec35..02c5a11bc 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -196,7 +196,7 @@ class reader_history_search_t {
             tokenizer_t tok(text.c_str(), TOK_ACCEPT_UNFINISHED);
             tok_t token;
 
-            std::vector<wcstring> local_tokens;
+            wcstring_list_t local_tokens;
             while (tok.next(&token)) {
                 if (token.type != TOK_STRING) continue;
                 wcstring text = tok.text_of(token);
diff --git a/src/screen.h b/src/screen.h
index d44e40457..a88d9d4ef 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -222,7 +222,7 @@ class layout_cache_t {
    private:
     // Cached escape sequences we've already detected in the prompt and similar strings, ordered
     // lexicographically.
-    std::vector<wcstring> esc_cache_;
+    wcstring_list_t esc_cache_;
 
     // LRU-list of prompts and their layouts.
     // Use a list so we can promote to the front on a cache hit.

From 4a67d9015b72a18de8f6ef29e486fd7c5c38a41b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 21:07:10 +0100
Subject: [PATCH 0078/1732] docs/command: Make it clearer that `-a` needs a
 commandname

Fixes #5107.

[ci skip]
---
 sphinx_doc_src/cmds/command.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/command.rst b/sphinx_doc_src/cmds/command.rst
index 6b9c1f026..8fc7c5dc5 100644
--- a/sphinx_doc_src/cmds/command.rst
+++ b/sphinx_doc_src/cmds/command.rst
@@ -14,7 +14,7 @@ Description
 
 The following options are available:
 
-- ``-a`` or ``--all`` returns all the external commands that are found in ``$PATH`` in the order they are found.
+- ``-a`` or ``--all`` returns all the external COMMANDNAMEs that are found in ``$PATH`` in the order they are found.
 
 - ``-q`` or ``--quiet``, silences the output and prints nothing, setting only the exit code. Implies ``--search``.
 

From d837eee09d481b7f47863e63d50d404c8f78f7ea Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 15:12:14 -0700
Subject: [PATCH 0079/1732] remove some wcstring -> wchar_t* -> wcstring
 conversions

Mostly related to usage _(L"foo"), keeping in mind the _
macro does a wcstring().c_str() already.

And a smattering of other trivial micro-optimizations certain
to not help tangibly.
---
 src/builtin.cpp          |  4 ++--
 src/builtin.h            |  2 +-
 src/builtin_argparse.cpp |  3 +--
 src/builtin_complete.cpp |  2 +-
 src/builtin_math.cpp     |  4 ++--
 src/builtin_string.cpp   |  2 +-
 src/common.cpp           |  3 +--
 src/complete.cpp         |  6 +++---
 src/env.cpp              |  4 ++--
 src/expand.h             |  1 +
 src/fish_tests.cpp       |  4 ++--
 src/history.cpp          |  4 ++--
 src/output.cpp           | 14 +++++++-------
 src/parse_tree.cpp       |  2 +-
 src/tokenizer.cpp        |  5 +++--
 src/tokenizer.h          |  2 +-
 src/wildcard.cpp         |  6 ++----
 src/wutil.cpp            |  4 ++--
 18 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 76e235813..f7103a0bf 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -545,8 +545,8 @@ void builtin_get_names(std::vector<completion_t> *list) {
 }
 
 /// Return a one-line description of the specified builtin.
-wcstring builtin_get_desc(const wcstring &name) {
-    wcstring result;
+const wchar_t *builtin_get_desc(const wcstring &name) {
+    const wchar_t *result;
     const builtin_data_t *builtin = builtin_lookup(name);
     if (builtin) {
         result = _(builtin->desc);
diff --git a/src/builtin.h b/src/builtin.h
index e9fcd2c78..8e5fd5e18 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -83,7 +83,7 @@ proc_status_t builtin_run(parser_t &parser, int job_pgrp, wchar_t **argv, io_str
 
 wcstring_list_t builtin_get_names();
 void builtin_get_names(std::vector<completion_t> *list);
-wcstring builtin_get_desc(const wcstring &b);
+const wchar_t *builtin_get_desc(const wcstring &b);
 
 /// Support for setting and removing transient command lines. This is used by
 /// 'complete -C' in order to make the commandline builtin operate on the string
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 1e87a03a4..4490ae7d2 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -448,8 +448,7 @@ static int validate_arg(parser_t &parser, const argparse_cmd_opts_t &opts, optio
     if (is_long_flag) {
         vars.set_one(var_name_prefix + L"name", ENV_LOCAL, opt_spec->long_flag);
     } else {
-        vars.set_one(var_name_prefix + L"name", ENV_LOCAL,
-                     wcstring(1, opt_spec->short_flag).c_str());
+        vars.set_one(var_name_prefix + L"name", ENV_LOCAL, wcstring(1, opt_spec->short_flag));
     }
     vars.set_one(var_name_prefix + L"value", ENV_LOCAL, woptarg);
 
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 438a33bab..c96571210 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -49,7 +49,7 @@ static void builtin_complete_add2(const wchar_t *cmd, int cmd_type, const wchar_
                      comp, desc, flags);
     }
 
-    if (old_opt.empty() && gnu_opt.empty() && std::wcslen(short_opt) == 0) {
+    if (old_opt.empty() && gnu_opt.empty() && short_opt[0] == L'\0') {
         complete_add(cmd, cmd_type, wcstring(), option_type_args_only, result_mode, condition, comp,
                      desc, flags);
     }
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 7798fe1a8..fdbe0a980 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -129,7 +129,7 @@ static const wchar_t *math_get_arg(int *argidx, wchar_t **argv, wcstring *storag
     return math_get_arg_argv(argidx, argv);
 }
 
-static wcstring math_describe_error(te_error_t& error) {
+static const wchar_t *math_describe_error(te_error_t& error) {
     if (error.position == 0) return L"NO ERROR?!?";
 
     switch(error.type) {
@@ -210,7 +210,7 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
             streams.out.push_back(L'\n');
         }
     } else {
-        streams.err.append_format(L"%ls: Error: %ls\n", cmd, math_describe_error(error).c_str());
+        streams.err.append_format(L"%ls: Error: %ls\n", cmd, math_describe_error(error));
         streams.err.append_format(L"'%ls'\n", expression.c_str());
         streams.err.append_format(L"%*ls%ls\n", error.position - 1, L" ",L"^");
         retval = STATUS_CMD_ERROR;
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index a62392299..a136b1fb2 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1008,13 +1008,13 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
         }
     }
 
-    wcstring outstr(output, outlen);
     bool rc = true;
     if (pcre2_rc < 0) {
         string_error(streams, _(L"%ls: Regular expression substitute error: %ls\n"), argv0,
                      pcre2_strerror(pcre2_rc).c_str());
         rc = false;
     } else {
+        wcstring outstr(output, outlen);
         bool replacement_occurred = pcre2_rc > 0;
         if (!opts.quiet && (!opts.filter || replacement_occurred)) {
             streams.out.append(outstr);
diff --git a/src/common.cpp b/src/common.cpp
index 41d7ee3e0..3728ff269 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1484,8 +1484,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     if (unescape_special && input_position == 0 &&
                         !std::wcscmp(input, PROCESS_EXPAND_SELF_STR)) {
                         to_append_or_none = PROCESS_EXPAND_SELF;
-                        input_position +=
-                            std::wcslen(PROCESS_EXPAND_SELF_STR) - 1;  // skip over 'self' part.
+                        input_position += PROCESS_EXPAND_SELF_STR_LEN - 1;  // skip over 'self's
                     }
                     break;
                 }
diff --git a/src/complete.cpp b/src/complete.cpp
index 30bab6506..481cff7d5 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -508,7 +508,7 @@ static void parse_cmd_string(const wcstring &str, wcstring *path, wcstring *cmd,
                              const environment_t &vars) {
     if (!path_get_path(str, path, vars)) {
         /// Use the empty string as the 'path' for commands that can not be found.
-        *path = L"";
+        path->clear();
     }
 
     // Make sure the path is not included in the command.
@@ -1150,8 +1150,8 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
             auto var = vars.get(env_name);
             if (!var) continue;
 
-            wcstring value = expand_escape_variable(*var);
             if (this->type() != COMPLETE_AUTOSUGGEST) {
+                wcstring value = expand_escape_variable(*var);
                 desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str());
             }
         }
@@ -1493,7 +1493,7 @@ void completer_t::perform() {
                 bool cursor_in_whitespace =
                     !plain_statement.location_in_or_at_end_of_source_range(pos);
                 if (cursor_in_whitespace) {
-                    current_argument = L"";
+                    current_argument.clear();
                     previous_argument = matching_arg;
                 } else {
                     current_argument = matching_arg;
diff --git a/src/env.cpp b/src/env.cpp
index 40bc26b34..3cfe58715 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -481,7 +481,7 @@ static void update_fish_color_support(const environment_t &vars) {
         debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
     } else if (term.find(L"xterm") != wcstring::npos) {
         // Assume that all 'xterm's can handle 256, except for Terminal.app from Snow Leopard
-        wcstring term_program, term_version;
+        wcstring term_program;
         if (auto tp = vars.get(L"TERM_PROGRAM")) term_program = tp->as_string();
         if (auto tpv = vars.get(L"TERM_PROGRAM_VERSION")) {
             if (term_program == L"Apple_Terminal" &&
@@ -821,7 +821,7 @@ static void handle_fish_history_change(const wcstring &op, const wcstring &var_n
                                        env_stack_t &vars) {
     UNUSED(op);
     UNUSED(var_name);
-    reader_change_history(history_session_id(vars).c_str());
+    reader_change_history(history_session_id(vars));
 }
 
 static void handle_function_path_change(const wcstring &op, const wcstring &var_name,
diff --git a/src/expand.h b/src/expand.h
index 8dd0da247..2386f45c4 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -102,6 +102,7 @@ enum expand_error_t {
 
 /// The string represented by PROCESS_EXPAND_SELF
 #define PROCESS_EXPAND_SELF_STR L"%self"
+#define PROCESS_EXPAND_SELF_STR_LEN 5
 
 /// Perform various forms of expansion on in, such as tilde expansion (\~USER becomes the users home
 /// directory), variable expansion (\$VAR_NAME becomes the value of the environment variable
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 217753c82..52692f0bc 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2668,7 +2668,7 @@ static void test_complete() {
     do_test((completions.at(1).flags & COMPLETE_NO_SPACE) != 0);
 
     // Test wraps.
-    do_test(comma_join(complete_get_wrap_targets(L"wrapper1")) == L"");
+    do_test(comma_join(complete_get_wrap_targets(L"wrapper1")).empty());
     complete_add_wrapper(L"wrapper1", L"wrapper2");
     do_test(comma_join(complete_get_wrap_targets(L"wrapper1")) == L"wrapper2");
     complete_add_wrapper(L"wrapper2", L"wrapper3");
@@ -2679,7 +2679,7 @@ static void test_complete() {
     do_test(comma_join(complete_get_wrap_targets(L"wrapper2")) == L"wrapper3");
     do_test(comma_join(complete_get_wrap_targets(L"wrapper3")) == L"wrapper1");
     complete_remove_wrapper(L"wrapper1", L"wrapper2");
-    do_test(comma_join(complete_get_wrap_targets(L"wrapper1")) == L"");
+    do_test(comma_join(complete_get_wrap_targets(L"wrapper1")).empty());
     do_test(comma_join(complete_get_wrap_targets(L"wrapper2")) == L"wrapper3");
     do_test(comma_join(complete_get_wrap_targets(L"wrapper3")) == L"wrapper1");
 }
diff --git a/src/history.cpp b/src/history.cpp
index fafcd72ce..dcc041c97 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -371,7 +371,7 @@ static size_t trim_leading_spaces(std::string &str) {
 
 static bool extract_prefix_and_unescape_yaml(std::string *key, std::string *value,
                                              const std::string &line) {
-    size_t where = line.find(":");
+    size_t where = line.find(':');
     if (where != std::string::npos) {
         key->assign(line, 0, where);
 
@@ -1868,7 +1868,7 @@ wcstring history_session_id(const environment_t &vars) {
     if (var) {
         wcstring session_id = var->as_string();
         if (session_id.empty()) {
-            result = L"";
+            result.clear();
         } else if (session_id == L"default") {
             ;  // using the default value
         } else if (valid_var_name(session_id)) {
diff --git a/src/output.cpp b/src/output.cpp
index 14d210c3c..ddabac3b4 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -234,7 +234,7 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
         if (c == c2) c = (c2 == rgb_color_t::white()) ? rgb_color_t::black() : rgb_color_t::white();
     }
 
-    if ((enter_bold_mode != 0) && (std::strlen(enter_bold_mode) > 0)) {
+    if (enter_bold_mode && enter_bold_mode[0] != '\0') {
         if (bg_set && !last_bg_set) {
             // Background color changed and is set, so we enter bold mode to make reading easier.
             // This means bold mode is _always_ on when the background color is set.
@@ -295,7 +295,7 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
     }
 
     // Lastly, we set bold, underline, italics, dim, and reverse modes correctly.
-    if (is_bold && !was_bold && enter_bold_mode && std::strlen(enter_bold_mode) > 0 && !bg_set) {
+    if (is_bold && !was_bold && enter_bold_mode && enter_bold_mode[0] != '\0' && !bg_set) {
         // The unconst cast is for NetBSD's benefit. DO NOT REMOVE!
         writembs_nofail(*this, tparm((char *)enter_bold_mode));
         was_bold = is_bold;
@@ -310,27 +310,27 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
     }
     was_underline = is_underline;
 
-    if (was_italics && !is_italics && enter_italics_mode && std::strlen(enter_italics_mode) > 0) {
+    if (was_italics && !is_italics && enter_italics_mode && enter_italics_mode[0] != '\0') {
         writembs_nofail(*this, exit_italics_mode);
         was_italics = is_italics;
     }
 
-    if (!was_italics && is_italics && enter_italics_mode && std::strlen(enter_italics_mode) > 0) {
+    if (!was_italics && is_italics && enter_italics_mode && enter_italics_mode[0] != '\0') {
         writembs_nofail(*this, enter_italics_mode);
         was_italics = is_italics;
     }
 
-    if (is_dim && !was_dim && enter_dim_mode && std::strlen(enter_dim_mode) > 0) {
+    if (is_dim && !was_dim && enter_dim_mode && enter_dim_mode[0] != '\0') {
         writembs_nofail(*this, enter_dim_mode);
         was_dim = is_dim;
     }
 
     if (is_reverse && !was_reverse) {
         // Some terms do not have a reverse mode set, so standout mode is a fallback.
-        if (enter_reverse_mode && std::strlen(enter_reverse_mode) > 0) {
+        if (enter_reverse_mode && enter_reverse_mode[0] != '\0') {
             writembs_nofail(*this, enter_reverse_mode);
             was_reverse = is_reverse;
-        } else if (enter_standout_mode && std::strlen(enter_standout_mode) > 0) {
+        } else if (enter_standout_mode && enter_standout_mode[0] != '\0') {
             writembs_nofail(*this, enter_standout_mode);
             was_reverse = is_reverse;
         }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 52be15884..cd7b35568 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -691,7 +691,7 @@ void parse_ll_t::report_tokenizer_error(const tok_t &tok) {
     parse_error_code_t parse_error_code = parse_error_from_tokenizer_error(tok.error);
     this->parse_error_at_location(tok.offset, tok.length, tok.offset + tok.error_offset,
                                   parse_error_code, L"%ls",
-                                  tokenizer_get_error_message(tok.error).c_str());
+                                  tokenizer_get_error_message(tok.error));
 }
 
 void parse_ll_t::parse_error_unexpected_token(const wchar_t *expected, parse_token_t token) {
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 8de6f3da2..ef55b7877 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -17,7 +17,8 @@
 #include "tokenizer.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-wcstring tokenizer_get_error_message(tokenizer_error_t err) {
+// _(s) is already wgettext(s).c_str(), so let's not convert back to wcstring
+const wchar_t * tokenizer_get_error_message(tokenizer_error_t err) {
     switch (err) {
         case tokenizer_error_t::none:
             return L"";
@@ -47,7 +48,7 @@ wcstring tokenizer_get_error_message(tokenizer_error_t err) {
             return _(L"Unexpected ')' found, expecting '}'");
     }
     assert(0 && "Unexpected tokenizer error");
-    return NULL;
+    return nullptr;
 }
 
 // Whether carets redirect stderr.
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 5eb0806a3..0d0527e86 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -61,7 +61,7 @@ enum class tokenizer_error_t {
 };
 
 /// Get the error message for an error \p err.
-wcstring tokenizer_get_error_message(tokenizer_error_t err);
+const wchar_t *tokenizer_get_error_message(tokenizer_error_t err);
 
 struct tok_t {
     // The type of the token.
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 398b155d8..5e0b47b22 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -336,7 +336,7 @@ bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_f
 /// \param stat_res The result of calling stat on the file
 /// \param buf The struct buf output of calling stat on the file
 /// \param err The errno value after a failed stat call on the file.
-static wcstring file_get_desc(const wcstring &filename, int lstat_res, const struct stat &lbuf,
+static const wchar_t *file_get_desc(const wcstring &filename, int lstat_res, const struct stat &lbuf,
                               int stat_res, const struct stat &buf, int err) {
     if (lstat_res) {
         return COMPLETE_FILE_DESC;
@@ -929,14 +929,12 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory
     // Check for a leading slash. If we find one, we have an absolute path: the prefix is empty, the
     // base dir is /, and the wildcard is the remainder. If we don't find one, the prefix is the
     // working directory, the base dir is empty.
-    wcstring prefix, base_dir, effective_wc;
+    wcstring prefix = L"", base_dir = L"", effective_wc;
     if (string_prefixes_string(L"/", wc)) {
-        prefix = L"";
         base_dir = L"/";
         effective_wc = wc.substr(1);
     } else {
         prefix = working_directory;
-        base_dir = L"";
         effective_wc = wc;
     }
 
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 2004dcf42..fa250c59b 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -39,7 +39,7 @@ static owning_lock<std::unordered_map<wcstring, wcstring>> wgettext_map;
 bool wreaddir_resolving(DIR *dir, const wcstring &dir_path, wcstring &out_name, bool *out_is_dir) {
     struct dirent *result = readdir(dir);
     if (!result) {
-        out_name = L"";
+        out_name.clear();
         return false;
     }
 
@@ -85,7 +85,7 @@ bool wreaddir_resolving(DIR *dir, const wcstring &dir_path, wcstring &out_name,
 bool wreaddir(DIR *dir, wcstring &out_name) {
     struct dirent *result = readdir(dir);
     if (!result) {
-        out_name = L"";
+        out_name.clear();
         return false;
     }
 

From 9a5022514f0767222e3a3496abceef959f92f1d4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 16:47:23 -0700
Subject: [PATCH 0080/1732] builtin_argparse: use std::swap

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

diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 4490ae7d2..9c6d930a3 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -105,9 +105,7 @@ static int check_for_mutually_exclusive_flags(const argparse_cmd_opts_t &opts,
                         // We want the flag order to be deterministic. Primarily to make unit
                         // testing easier.
                         if (flag1 > flag2) {
-                            wcstring tmp(flag1);
-                            flag1 = flag2;
-                            flag2 = tmp;
+                            std::swap(flag1, flag2);
                         }
                         streams.err.append_format(
                             _(L"%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"),

From cb36a9ca3639ae6ddabc7a2d2cd3dbbab0c1e8de Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 14 Mar 2019 21:45:31 -0700
Subject: [PATCH 0081/1732] builtin.cpp: ensure builtin_get_desc returns
 something initialized

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

diff --git a/src/builtin.cpp b/src/builtin.cpp
index f7103a0bf..802f95bc5 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -546,7 +546,7 @@ void builtin_get_names(std::vector<completion_t> *list) {
 
 /// Return a one-line description of the specified builtin.
 const wchar_t *builtin_get_desc(const wcstring &name) {
-    const wchar_t *result;
+    const wchar_t *result = L"";
     const builtin_data_t *builtin = builtin_lookup(name);
     if (builtin) {
         result = _(builtin->desc);

From e7a964fdfad1ad2125902896b04dcce441f0c6ed Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 4 Jan 2018 00:42:12 +0100
Subject: [PATCH 0082/1732] [count] Allow counting lines from stdin

As a simple replacement for `wc -l`.

This counts both lines on stdin _and_ arguments.

So if "file" has three lines, then `count a b c < file` will print 6.

And since it counts newlines, like wc, `echo -n foo | count` prints 0.
---
 sphinx_doc_src/cmds/count.rst | 13 ++++++++++++-
 src/builtin.cpp               | 28 +++++++++++++++++++++++++---
 tests/count.err               |  3 +++
 tests/count.in                |  9 +++++++++
 tests/count.out               |  6 ++++++
 5 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/cmds/count.rst b/sphinx_doc_src/cmds/count.rst
index 058ea1102..981acc915 100644
--- a/sphinx_doc_src/cmds/count.rst
+++ b/sphinx_doc_src/cmds/count.rst
@@ -5,17 +5,20 @@ Synopsis
 --------
 
 count $VARIABLE
+COMMAND | count
+count < FILE
 
 
 Description
 -----------
 
-``count`` prints the number of arguments that were passed to it. This is usually used to find out how many elements an environment variable array contains.
+``count`` prints the number of arguments that were passed to it, plus the number of newlines passed to it via stdin. This is usually used to find out how many elements an environment variable array contains, or how many lines there are in a text file.
 
 ``count`` does not accept any options, not even ``-h`` or ``--help``.
 
 ``count`` exits with a non-zero exit status if no arguments were passed to it, and with zero if at least one argument was passed.
 
+Note that, like ``wc -l``, reading from stdin counts newlines, so ``echo -n foo | count`` will print 0.
 
 Example
 -------
@@ -30,3 +33,11 @@ Example
     count *.txt
     # Returns the number of files in the current working directory ending with the suffix '.txt'.
 
+    git ls-files --others --exclude-standard | count
+    # Returns the number of untracked files in a git repository
+
+    printf '%s\n' foo bar | count baz
+    # Returns 3 (2 lines from stdin plus 1 argument)
+
+    count < /etc/hosts
+    # Counts the number of entries in the hosts file
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 802f95bc5..6efffd6b3 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -300,12 +300,34 @@ static int builtin_generic(parser_t &parser, io_streams_t &streams, wchar_t **ar
     return STATUS_CMD_ERROR;
 }
 
+// How many bytes we read() at once.
+// Since this is just for counting, it can be massive.
+#define COUNT_CHUNK_SIZE 512 * 256
 /// Implementation of the builtin count command, used to count the number of arguments sent to it.
 static int builtin_count(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     UNUSED(parser);
-    int argc = builtin_count_args(argv);
-    streams.out.append_format(L"%d\n", argc - 1);
-    return argc - 1 == 0 ? STATUS_CMD_ERROR : STATUS_CMD_OK;
+    int argc = 0;
+
+    // Count the newlines coming in via stdin like `wc -l`.
+    if (streams.stdin_is_directly_redirected) {
+        char buf[COUNT_CHUNK_SIZE];
+        while (true) {
+            long n = read_blocked(streams.stdin_fd, buf, COUNT_CHUNK_SIZE);
+            // Ignore all errors for now.
+            if (n <= 0) break;
+            for (int i = 0; i < n; i++) {
+                if (buf[i] == L'\n') {
+                    argc++;
+                }
+            }
+        }
+    }
+
+    // Always add the size of argv.
+    // That means if you call `something | count a b c`, you'll get the count of something _plus 3_.
+    argc += builtin_count_args(argv) - 1;
+    streams.out.append_format(L"%d\n", argc);
+    return argc == 0 ? STATUS_CMD_ERROR : STATUS_CMD_OK;
 }
 
 /// This function handles both the 'continue' and the 'break' builtins that are used for loop
diff --git a/tests/count.err b/tests/count.err
index b9b02b750..333edb967 100644
--- a/tests/count.err
+++ b/tests/count.err
@@ -13,3 +13,6 @@
 
 ####################
 # big counts
+
+####################
+# stdin
diff --git a/tests/count.in b/tests/count.in
index 81b54ce7d..e0a1480ed 100644
--- a/tests/count.in
+++ b/tests/count.in
@@ -27,3 +27,12 @@ for i in seq 500
         break
     end
 end
+
+logmsg stdin
+# Reading from stdin still counts the arguments
+printf '%s\n' 1 2 3 4 5 | count 6 7 8 9 10
+
+# Reading from stdin counts newlines - like `wc -l`.
+echo -n 0 | count
+
+echo 1 | count
diff --git a/tests/count.out b/tests/count.out
index f3c2bb10e..c53b726d4 100644
--- a/tests/count.out
+++ b/tests/count.out
@@ -21,3 +21,9 @@
 
 ####################
 # big counts
+
+####################
+# stdin
+10
+0
+1

From 18d7123ff4f2c5cdc37728b446d37c83e57492bf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 20:26:40 +0100
Subject: [PATCH 0083/1732] fish_git_prompt: Use `count` from stdin

Removes any uses of `wc` in our codebase.
---
 share/functions/fish_git_prompt.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index 6f9657d1f..6ee0a8e5c 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -533,11 +533,11 @@ function __fish_git_prompt_informative_status
     set -l x (count $stagedFiles)
     set -l invalidstate (count (string match -r "U" -- $stagedFiles))
     set -l stagedstate (math $x - $invalidstate)
-    set -l untrackedfiles (command git ls-files --others --exclude-standard | wc -l | string trim)
+    set -l untrackedfiles (command git ls-files --others --exclude-standard | count)
     set -l stashstate 0
     set -l stashfile "$argv[1]/logs/refs/stash"
     if set -q __fish_git_prompt_showstashstate; and test -e "$stashfile"
-        set stashstate (wc -l $stashfile | string match -r '\d+')
+        set stashstate (count < $stashfile)
     end
 
     set -l info

From b3f39096e7dd32d1cdc6b1f8d1c87223a5b02d49 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 20:34:37 +0100
Subject: [PATCH 0084/1732] CHANGELOG count from stdin

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbb93d6a2..27e8026c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - `complete --do-complete` now also does fuzzy matches (#5467).
+- `count` now also counts lines fed on stdin (#5744).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).

From 864bb1f7a6c7b3aa582578f875d110f1b1e801dd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 12 Jan 2019 20:20:35 +0100
Subject: [PATCH 0085/1732] Add string-replace-fewer-backslashes feature

This disables an extra round of escaping in the `string replace -r`
replacement string.

Currently, to add a backslash to an a or b (to "escape" it):

    string replace -ra '([ab])' '\\\\\\\$1' a

7 backslashes!

This removes one of the layers, so now 3 or 4 works (each one escaped
for the single-quotes, so pcre receives two, which it reads as one literal):

    string replace -ra '([ab])' '\\\\$1' a

This is backwards-incompatible as replacement strings will change
meaning, so we put it behind a feature flag.

The name is kinda crappy, though.

Fixes #5474.
---
 src/builtin_string.cpp                                 | 10 ++++++++--
 src/future_feature_flags.cpp                           |  1 +
 src/future_feature_flags.h                             |  3 +++
 .../invocation/features-string-backslashes-off.invoke  |  1 +
 tests/invocation/features-string-backslashes-off.out   |  1 +
 tests/invocation/features-string-backslashes.invoke    |  1 +
 tests/invocation/features-string-backslashes.out       |  1 +
 tests/status.out                                       |  1 +
 8 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 tests/invocation/features-string-backslashes-off.invoke
 create mode 100644 tests/invocation/features-string-backslashes-off.out
 create mode 100644 tests/invocation/features-string-backslashes.invoke
 create mode 100644 tests/invocation/features-string-backslashes.out

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index a136b1fb2..201e7ab25 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -26,6 +26,7 @@
 #include "builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "future_feature_flags.h"
 #include "io.h"
 #include "parse_util.h"
 #include "pcre2.h"
@@ -933,8 +934,13 @@ class regex_replacer_t : public string_replacer_t {
     regex_replacer_t(const wchar_t *argv0, const wcstring &pattern, const wcstring &replacement_,
                      const options_t &opts, io_streams_t &streams)
         : string_replacer_t(argv0, opts, streams),
-          regex(argv0, pattern, opts.ignore_case, streams),
-          replacement(interpret_escapes(replacement_)) {}
+          regex(argv0, pattern, opts.ignore_case, streams) {
+        if (feature_test(features_t::string_replace_backslash)) {
+            replacement = replacement_;
+        } else {
+            replacement = interpret_escapes(replacement_);
+        }
+    }
 
     bool replace_matches(const wcstring &arg) override;
 };
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index 4feca703b..2caf145f5 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -13,6 +13,7 @@ features_t &mutable_fish_features() { return global_features; }
 const features_t::metadata_t features_t::metadata[features_t::flag_count] = {
     {stderr_nocaret, L"stderr-nocaret", L"3.0", L"^ no longer redirects stderr"},
     {qmark_noglob, L"qmark-noglob", L"3.0", L"? no longer globs"},
+    {string_replace_backslash, L"string-replace-fewer-backslashes", L"3.1", L"string replace -r needs fewer backslashes in the replacement"},
 };
 
 const struct features_t::metadata_t *features_t::metadata_for(const wchar_t *name) {
diff --git a/src/future_feature_flags.h b/src/future_feature_flags.h
index 7ccc7f570..1c42cb21a 100644
--- a/src/future_feature_flags.h
+++ b/src/future_feature_flags.h
@@ -17,6 +17,9 @@ class features_t {
      /// Whether ? is supported as a glob.
      qmark_noglob,
 
+     /// Whether string replace -r double-unescapes the replacement.
+     string_replace_backslash,
+
      /// The number of flags.
      flag_count
  };
diff --git a/tests/invocation/features-string-backslashes-off.invoke b/tests/invocation/features-string-backslashes-off.invoke
new file mode 100644
index 000000000..600bde64f
--- /dev/null
+++ b/tests/invocation/features-string-backslashes-off.invoke
@@ -0,0 +1 @@
+--features 'no-string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
diff --git a/tests/invocation/features-string-backslashes-off.out b/tests/invocation/features-string-backslashes-off.out
new file mode 100644
index 000000000..2eba0a277
--- /dev/null
+++ b/tests/invocation/features-string-backslashes-off.out
@@ -0,0 +1 @@
+a\b\c
diff --git a/tests/invocation/features-string-backslashes.invoke b/tests/invocation/features-string-backslashes.invoke
new file mode 100644
index 000000000..e7923c0dc
--- /dev/null
+++ b/tests/invocation/features-string-backslashes.invoke
@@ -0,0 +1 @@
+--features 'string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
diff --git a/tests/invocation/features-string-backslashes.out b/tests/invocation/features-string-backslashes.out
new file mode 100644
index 000000000..e67f30541
--- /dev/null
+++ b/tests/invocation/features-string-backslashes.out
@@ -0,0 +1 @@
+a\\b\\c
diff --git a/tests/status.out b/tests/status.out
index ea2ab205e..283b13030 100644
--- a/tests/status.out
+++ b/tests/status.out
@@ -6,5 +6,6 @@ test_function
 # Future Feature Flags
 stderr-nocaret	off	3.0	^ no longer redirects stderr
 qmark-noglob	off	3.0	? no longer globs
+string-replace-fewer-backslashes	off	3.1	string replace -r needs fewer backslashes in the replacement
 1
 2

From 83932441bb0cbe8fe0e873fc9018b0127b329a61 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 20 Jan 2019 11:12:27 +0100
Subject: [PATCH 0086/1732] Fix fish_clipboard_paste with
 string-replace-fewer-backslashes

This is the one place in fish where we use a `\` in the replacement of
a `string replace -r`, so we'll have to check the feature.
---
 share/functions/fish_clipboard_paste.fish | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 105ca1226..f9ab3dabe 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -26,7 +26,11 @@ function fish_clipboard_paste
     #
     # This eases pasting non-code (e.g. markdown or git commitishes).
     if __fish_commandline_is_singlequoted
-        set data (string replace -ra "(['\\\])" '\\\\\\\$1' -- $data)
+        if status test-feature string-replace-fewer-backslashes
+            set data (string replace -ra "(['\\\])" '\\\\$1' -- $data)
+        else
+            set data (string replace -ra "(['\\\])" '\\\\\\\$1' -- $data)
+        end
     end
     if not string length -q -- (commandline -c)
         # If we're at the beginning of the first line, trim whitespace from the start,

From ef2fe0dfa0a50e18878d06fd32786908713108cf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 15:22:41 +0100
Subject: [PATCH 0087/1732] CHANGELOG string backslashes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e8026c9..b92b7ef24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - The vcs-prompt functions have been renamed to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
 
 ## Notable Fixes and improvements
+- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Add `$pipestatus` support
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 

From 86e9e60ae7ad6dbba851f037911dbf59a671dc15 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 11:19:13 +0100
Subject: [PATCH 0088/1732] completions/set: Fix `set -eU`

This had a typo where it completed `-u` variables. Only `-u` means
unexported, `-U` means universal.

[ci skip]
---
 share/completions/set.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index e7891b934..757fa6009 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -86,7 +86,7 @@ complete -c set -n '__fish_seen_argument -s e -l erase; and not __fish_seen_argu
 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 -U | string match -rv '^_|^fish_' | string replace ' ' \tUniversal\ Variable:\ )"
 # Complete scope-specific variables for `set --erase`
 complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s g -l global' -f -a "(set -g | string match -rv '^_|^fish_' | string replace ' ' \t'Global Variable: ')"
-complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s U -l universal' -f -a "(set -u | string match -rv '^_|^fish_' | string replace ' ' \t'Universal Variable: ')"
+complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s U -l universal' -f -a "(set -U | string match -rv '^_|^fish_' | string replace ' ' \t'Universal Variable: ')"
 complete -c set -n '__fish_seen_argument -s e -l erase; and __fish_seen_argument -s l -l local' -f -a "(set -l | string match -rv '^_|^fish_' | string replace ' ' \t'Local Variable: ')"
 
 # Color completions

From 9bd398b9fb919abf300f4390940d80c38ea4727e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 15:29:49 +0100
Subject: [PATCH 0089/1732] Document features more

This adds string-replace-fewer-backslashes, but also explains the
feature flag system a bit more.

[ci skip]
---
 sphinx_doc_src/index.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 20554418d..562d9c3f1 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1627,8 +1627,14 @@ You can see the current list of features via ``status features``::
     > status features
     stderr-nocaret  on     3.0      ^ no longer redirects stderr
     qmark-noglob    off    3.0      ? no longer globs
+    string-replace-fewer-backslashes        off     3.1     string replace -r needs fewer backslashes in the replacement
 
-There are two breaking changes in fish 3.0: caret ``^`` no longer redirects stderr, and question mark ``?`` is no longer a glob. These changes are off by default. They can be enabled on a per session basis::
+There are two breaking changes in fish 3.0: caret ``^`` no longer redirects stderr, and question mark ``?`` is no longer a glob.
+
+There is one breaking change in fish 3.1: ``string replace -r`` does a superfluous round of escaping for the replacement, so escaping backslashes would look like ``string replace -ra '([ab])' '\\\\\\\$1' a``. This flag removes that if turned on, so ``'\\\\$1'`` is enough.
+
+
+These changes are off by default. They can be enabled on a per session basis::
 
     > fish --features qmark-noglob,stderr-nocaret
 
@@ -1638,6 +1644,11 @@ or opted into globally for a user::
 
     > set -U fish_features stderr-nocaret qmark-noglob
 
+Features will only be set on startup, so this variable will only take effect if it is universal or exported.
+
+You can also use the version as a group, so ``3.0`` is equivalent to "stderr-nocaret" and "qmark-noglob".
+
+Prefixing a feature with ``no-`` turns it off instead.
 .. _other:
 
 Other features

From a1380a736b7d776b048225d475225ce6c2d515d9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 19:50:28 +0100
Subject: [PATCH 0090/1732] Move __fish_print_make_targets into make
 completions

A function file for a function used only by one completion (and
unlikely to be used anywhere else).

If another user shows up, we can move it out again.

Part of #5279

[ci skip]
---
 share/completions/make.fish                   | 33 +++++++++++++++++++
 .../functions/__fish_print_make_targets.fish  | 33 -------------------
 2 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 share/functions/__fish_print_make_targets.fish

diff --git a/share/completions/make.fish b/share/completions/make.fish
index 083e867f3..11d425924 100644
--- a/share/completions/make.fish
+++ b/share/completions/make.fish
@@ -1,4 +1,37 @@
 # Completions for make
+function __fish_print_make_targets --argument-names directory file
+    # Since we filter based on localized text, we need to ensure the
+    # text will be using the correct locale.
+    set -lx LC_ALL C
+
+    if test -z "$directory"
+        set directory '.'
+    end
+
+    if test -z "$file"
+        for standard_file in $directory/{GNUmakefile,Makefile,makefile}
+            if test -f $standard_file
+                set file $standard_file
+                break
+            end
+        end
+    end
+
+    set -l bsd_make
+    if make --version 2>/dev/null | string match -q 'GNU*'
+        set bsd_make 0
+    else
+        set bsd_make 1
+    end
+
+    if test "$bsd_make" = 0
+        # https://stackoverflow.com/a/26339924
+        make -C "$directory" -f "$file" -pRrq : 2>/dev/null | awk -v RS= -F: '/^# Files/,/^# Finished Make data base/ {if ($1 !~ "^[#.]") {print $1}}' 2>/dev/null
+    else
+        make -C "$directory" -f "$file" -d g1 -rn >/dev/null 2>| awk -F, '/^#\*\*\* Input graph:/,/^$/ {if ($1 !~ "^#... ") {gsub(/# /,"",$1); print $1}}' 2>/dev/null
+    end
+end
+
 function __fish_complete_make_targets
     set directory (string replace -r '^make .*(-C ?|--directory(=| +))([^ ]*) .*$' '$3' -- $argv)
     if not test $status -eq 0 -a -d $directory
diff --git a/share/functions/__fish_print_make_targets.fish b/share/functions/__fish_print_make_targets.fish
deleted file mode 100644
index fb8ce9c03..000000000
--- a/share/functions/__fish_print_make_targets.fish
+++ /dev/null
@@ -1,33 +0,0 @@
-function __fish_print_make_targets --argument-names directory file
-    # Since we filter based on localized text, we need to ensure the
-    # text will be using the correct locale.
-    set -lx LC_ALL C
-
-    if test -z "$directory"
-        set directory '.'
-    end
-
-    if test -z "$file"
-        for standard_file in $directory/{GNUmakefile,Makefile,makefile}
-            if test -f $standard_file
-                set file $standard_file
-                break
-            end
-        end
-    end
-
-    set -l bsd_make
-    if make --version 2>/dev/null | string match -q 'GNU*'
-        set bsd_make 0
-    else
-        set bsd_make 1
-    end
-
-    if test "$bsd_make" = 0
-        # https://stackoverflow.com/a/26339924
-        make -C "$directory" -f "$file" -pRrq : 2>/dev/null | awk -v RS= -F: '/^# Files/,/^# Finished Make data base/ {if ($1 !~ "^[#.]") {print $1}}' 2>/dev/null
-    else
-        make -C "$directory" -f "$file" -d g1 -rn >/dev/null 2>| awk -F, '/^#\*\*\* Input graph:/,/^$/ {if ($1 !~ "^#... ") {gsub(/# /,"",$1); print $1}}' 2>/dev/null
-    end
-end
-

From 1c3c76165e49bafd54f8feafada3dc71e3697cd1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 19:51:58 +0100
Subject: [PATCH 0091/1732] Move xrandr functions into randr completions

Part of #5279.

[ci skip]
---
 share/completions/xrandr.fish                    | 15 +++++++++++++++
 share/functions/__fish_print_xrandr_modes.fish   | 11 -----------
 share/functions/__fish_print_xrandr_outputs.fish |  3 ---
 3 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 share/functions/__fish_print_xrandr_modes.fish
 delete mode 100644 share/functions/__fish_print_xrandr_outputs.fish

diff --git a/share/completions/xrandr.fish b/share/completions/xrandr.fish
index a4a345b96..2eed8e9f3 100644
--- a/share/completions/xrandr.fish
+++ b/share/completions/xrandr.fish
@@ -1,3 +1,18 @@
+function __fish_print_xrandr_outputs --description 'Print xrandr outputs'
+	xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
+end
+
+function __fish_print_xrandr_modes --description 'Print xrandr modes'
+	set -l output
+	xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
+		switch $line
+		case '  *'
+			string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
+		case '*'
+			set output (string match -r '^\S+' $line)
+		end
+	end
+end
 complete -c xrandr -l verbose -d 'Be more verbose'
 complete -c xrandr -l dryrun  -d 'Make no changes'
 complete -c xrandr -l nograb  -d 'Apply modifications without grabbing the screen'
diff --git a/share/functions/__fish_print_xrandr_modes.fish b/share/functions/__fish_print_xrandr_modes.fish
deleted file mode 100644
index 0023abe54..000000000
--- a/share/functions/__fish_print_xrandr_modes.fish
+++ /dev/null
@@ -1,11 +0,0 @@
-function __fish_print_xrandr_modes --description 'Print xrandr modes'
-	set -l output
-	xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
-		switch $line
-		case '  *'
-			string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
-		case '*'
-			set output (string match -r '^\S+' $line)
-		end
-	end
-end
diff --git a/share/functions/__fish_print_xrandr_outputs.fish b/share/functions/__fish_print_xrandr_outputs.fish
deleted file mode 100644
index 43614a996..000000000
--- a/share/functions/__fish_print_xrandr_outputs.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_print_xrandr_outputs --description 'Print xrandr outputs'
-	xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
-end

From 2de3f7c68674e386df9c96819356bc158b6ac604 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 19:53:20 +0100
Subject: [PATCH 0092/1732] Move ninja functions into ninja completions

Part of #5279

[ci skip]
---
 share/completions/ninja.fish                    | 12 ++++++++++++
 share/functions/__fish_print_ninja_targets.fish |  5 -----
 share/functions/__fish_print_ninja_tools.fish   |  6 ------
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 share/functions/__fish_print_ninja_targets.fish
 delete mode 100644 share/functions/__fish_print_ninja_tools.fish

diff --git a/share/completions/ninja.fish b/share/completions/ninja.fish
index 0dd0174bf..935d324bd 100644
--- a/share/completions/ninja.fish
+++ b/share/completions/ninja.fish
@@ -1,3 +1,15 @@
+function __fish_print_ninja_tools
+    echo list
+    if test -f build.ninja
+        ninja -t list | string match -v '*:' | string replace -r '\s+(\w+).*' '$1'
+    end
+end
+
+function __fish_print_ninja_targets
+    if test -f build.ninja
+        ninja -t targets 2>/dev/null | string replace -r ':.*' ''
+    end
+end
 complete -c ninja -f -a '(__fish_print_ninja_targets)' -d target
 complete -x -c ninja -s t -x -a "(__fish_print_ninja_tools)" -d subtool
 complete -x -c ninja -s C -x -a "(__fish_complete_directories (commandline -ct))" -d "change to specified directory"
diff --git a/share/functions/__fish_print_ninja_targets.fish b/share/functions/__fish_print_ninja_targets.fish
deleted file mode 100644
index 18d62fba6..000000000
--- a/share/functions/__fish_print_ninja_targets.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function __fish_print_ninja_targets
-    if [ -f build.ninja ]
-        ninja -t targets 2>/dev/null | string replace -r ':.*' ''
-    end
-end
diff --git a/share/functions/__fish_print_ninja_tools.fish b/share/functions/__fish_print_ninja_tools.fish
deleted file mode 100644
index 385c91edc..000000000
--- a/share/functions/__fish_print_ninja_tools.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-function __fish_print_ninja_tools
-    echo list
-    if [ -f build.ninja ]
-        ninja -t list | string match -v '*:' | string replace -r '\s+(\w+).*' '$1'
-    end
-end

From a7ab8c6a4bfe6a4c566f17456f0c559f48140bef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 19:55:35 +0100
Subject: [PATCH 0093/1732] Remove __fish_test_arg helper function

This was a remnant from before `string` existed, and was only used by
the xterm completions.

Part of #5279

[ci skip]
---
 share/completions/xterm.fish         | 92 ++++++++++++++--------------
 share/functions/__fish_test_arg.fish |  9 ---
 2 files changed, 46 insertions(+), 55 deletions(-)
 delete mode 100644 share/functions/__fish_test_arg.fish

diff --git a/share/completions/xterm.fish b/share/completions/xterm.fish
index 4546f3730..036d0643e 100644
--- a/share/completions/xterm.fish
+++ b/share/completions/xterm.fish
@@ -1,52 +1,52 @@
 # completion for xterm
 
 
-complete -c xterm -n '__fish_test_arg "+*"' -a +ah -d 'Never highlight the text cursor'
-complete -c xterm -n '__fish_test_arg "+*"' -a +ai -d 'Enable active icon support'
-complete -c xterm -n '__fish_test_arg "+*"' -a +aw -d 'Disallow auto wraparound'
-complete -c xterm -n '__fish_test_arg "+*"' -a +bc -d 'Turn off cursor blinking'
-complete -c xterm -n '__fish_test_arg "+*"' -a +bdc -d 'Enable the display of bold characters'
-complete -c xterm -n '__fish_test_arg "+*"' -a +cb -d 'Set the vt100 resource cutToBeginningOfLine to \'true\''
-complete -c xterm -n '__fish_test_arg "+*"' -a +cjk_width -d 'Set the cjkWidth resource to \'false\''
-complete -c xterm -n '__fish_test_arg "+*"' -a +cm -d 'Enable recognition of ANSI color-change escape sequences'
-complete -c xterm -n '__fish_test_arg "+*"' -a +cn -d 'Cut newlines in line-mode selections'
-complete -c xterm -n '__fish_test_arg "+*"' -a +cu -d 'Don\'t workaround the bug in more(1)'
-complete -c xterm -n '__fish_test_arg "+*"' -a +dc -d 'Disable dynamic color changing'
-complete -c xterm -n '__fish_test_arg "+*"' -a +fbb -d 'Don\'t ensure compatibility between normal and bold fonts bounding boxes'
-complete -c xterm -n '__fish_test_arg "+*"' -a +fbx -d 'Normal and bold fonts have VT100 line-drawing characters'
-complete -c xterm -n '__fish_test_arg "+*"' -a +hf -d 'Don\'t generate HP Function Key escape codes for function keys'
-complete -c xterm -n '__fish_test_arg "+*"' -a +hold -d 'Close xterm\'s window after the shell exits'
-complete -c xterm -n '__fish_test_arg "+*"' -a +ie -d 'Don\'t use pseudo-terminal\'s sense of the stty erase value'
-complete -c xterm -n '__fish_test_arg "+*"' -a +im -d 'Don\'t force insert mode'
-complete -c xterm -n '__fish_test_arg "+*"' -a +j -d 'Don\'t use jump scrolling'
-complete -c xterm -n '__fish_test_arg "+*"' -a +k8 -d 'Don\'t treat C1 control characters as printable'
-complete -c xterm -n '__fish_test_arg "+*"' -a +l -d 'Turn off logging'
-complete -c xterm -n '__fish_test_arg "+*"' -a +lc -d 'Turn off support for encodings according the locale setting'
-complete -c xterm -n '__fish_test_arg "+*"' -a +ls -d 'The shell in xterm\'s window will not be login shell'
-complete -c xterm -n '__fish_test_arg "+*"' -a +mb -d 'Don\'t ring bell if the user types near the end of line'
-complete -c xterm -n '__fish_test_arg "+*"' -a +mesg -d 'Allow write access to the terminal'
-complete -c xterm -n '__fish_test_arg "+*"' -a +mk_width -d 'Don\'t use builtin version for the wide-character calculation'
-complete -c xterm -n '__fish_test_arg "+*"' -a +nul -d 'Enable underlining'
-complete -c xterm -n '__fish_test_arg "+*"' -a +pc -d 'Disable PC style bold colors'
-complete -c xterm -n '__fish_test_arg "+*"' -a +pob -d 'Don\'t raise window on Control-G'
-complete -c xterm -n '__fish_test_arg "+*"' -a +rvc -d 'Enable characters with reverse attribute as color'
-complete -c xterm -n '__fish_test_arg "+*"' -a +rw -d 'Disable reverse-wraparound'
-complete -c xterm -n '__fish_test_arg "+*"' -a +s -d 'Turn off asynchronous scrolling'
-complete -c xterm -n '__fish_test_arg "+*"' -a +samename -d 'Send title/icon change requests always'
-complete -c xterm -n '__fish_test_arg "+*"' -a +sb -d 'Don\'t display scrollbar'
-complete -c xterm -n '__fish_test_arg "+*"' -a +sf -d 'Don\'t generate Sun Function Key escape codes for function keys'
-complete -c xterm -n '__fish_test_arg "+*"' -a +si -d 'Move the screen to the bottom on input'
-complete -c xterm -n '__fish_test_arg "+*"' -a +sk -d 'Don\'t move the screen to the bottom on key press while scrolling'
-complete -c xterm -n '__fish_test_arg "+*"' -a +sm -d 'Don\'t setup session manager callbacks'
-complete -c xterm -n '__fish_test_arg "+*"' -a +sp -d 'Don\'t assume Sun/PC keyboard'
-complete -c xterm -n '__fish_test_arg "+*"' -a +t -d 'VT102 mode'
-complete -c xterm -n '__fish_test_arg "+*"' -a +tb -d 'Don\'t display toolbar or menubar'
-complete -c xterm -n '__fish_test_arg "+*"' -a +u8 -d 'Don\'t use UTF-8'
-complete -c xterm -n '__fish_test_arg "+*"' -a +ulc -d 'Display characters with underline attribute as color'
-complete -c xterm -n '__fish_test_arg "+*"' -a +ut -d 'Write to the system utmp log file'
-complete -c xterm -n '__fish_test_arg "+*"' -a +vb -d 'Don\'t use visual bell insead of audio bell'
-complete -c xterm -n '__fish_test_arg "+*"' -a +wc -d 'Don\'t use wide characters'
-complete -c xterm -n '__fish_test_arg "+*"' -a +wf -d 'Don\'t wait the first time for the window to be mapped'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ah -d 'Never highlight the text cursor'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ai -d 'Enable active icon support'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +aw -d 'Disallow auto wraparound'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +bc -d 'Turn off cursor blinking'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +bdc -d 'Enable the display of bold characters'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cb -d 'Set the vt100 resource cutToBeginningOfLine to \'true\''
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cjk_width -d 'Set the cjkWidth resource to \'false\''
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cm -d 'Enable recognition of ANSI color-change escape sequences'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cn -d 'Cut newlines in line-mode selections'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cu -d 'Don\'t workaround the bug in more(1)'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +dc -d 'Disable dynamic color changing'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +fbb -d 'Don\'t ensure compatibility between normal and bold fonts bounding boxes'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +fbx -d 'Normal and bold fonts have VT100 line-drawing characters'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +hf -d 'Don\'t generate HP Function Key escape codes for function keys'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +hold -d 'Close xterm\'s window after the shell exits'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ie -d 'Don\'t use pseudo-terminal\'s sense of the stty erase value'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +im -d 'Don\'t force insert mode'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +j -d 'Don\'t use jump scrolling'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +k8 -d 'Don\'t treat C1 control characters as printable'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +l -d 'Turn off logging'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +lc -d 'Turn off support for encodings according the locale setting'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ls -d 'The shell in xterm\'s window will not be login shell'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mb -d 'Don\'t ring bell if the user types near the end of line'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mesg -d 'Allow write access to the terminal'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mk_width -d 'Don\'t use builtin version for the wide-character calculation'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +nul -d 'Enable underlining'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +pc -d 'Disable PC style bold colors'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +pob -d 'Don\'t raise window on Control-G'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +rvc -d 'Enable characters with reverse attribute as color'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +rw -d 'Disable reverse-wraparound'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +s -d 'Turn off asynchronous scrolling'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +samename -d 'Send title/icon change requests always'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sb -d 'Don\'t display scrollbar'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sf -d 'Don\'t generate Sun Function Key escape codes for function keys'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +si -d 'Move the screen to the bottom on input'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sk -d 'Don\'t move the screen to the bottom on key press while scrolling'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sm -d 'Don\'t setup session manager callbacks'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sp -d 'Don\'t assume Sun/PC keyboard'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +t -d 'VT102 mode'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +tb -d 'Don\'t display toolbar or menubar'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +u8 -d 'Don\'t use UTF-8'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ulc -d 'Display characters with underline attribute as color'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ut -d 'Write to the system utmp log file'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +vb -d 'Don\'t use visual bell insead of audio bell'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +wc -d 'Don\'t use wide characters'
+complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +wf -d 'Don\'t wait the first time for the window to be mapped'
 
 complete -c xterm -o version -d 'Print version number to the standard output'
 complete -c xterm -o help -d 'Print out a verbose message describing the options'
diff --git a/share/functions/__fish_test_arg.fish b/share/functions/__fish_test_arg.fish
deleted file mode 100644
index 695c96866..000000000
--- a/share/functions/__fish_test_arg.fish
+++ /dev/null
@@ -1,9 +0,0 @@
-
-function __fish_test_arg --description "Test if the token under the cursor matches the specified wildcard"
-    switch (commandline -ct)
-        case $argv
-            return 0
-    end
-    return 1
-end
-

From 0b6d6a29eb64ea62c98c0d65046ab571db09b482 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 15 Mar 2019 20:09:55 +0100
Subject: [PATCH 0094/1732] completions/git: Fix broken conditions for `git
 config`

Classic case of not seeing `and` as a new command:

`__fish_git_using_command config and anotherthing`

causes `and anotherthing` to be passed as arguments to
`__fish_git_using_command` instead of being executed.

[ci skip]
---
 share/completions/git.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 3edea1aa2..98e0c30a7 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1494,8 +1494,8 @@ complete -f -c git -n '__fish_git_using_command config' -s f -l file -d 'Read co
 complete -f -c git -n '__fish_git_using_command config' -l blob -d 'Read config from blob' -ra '(__fish_complete_suffix '')'
 
 # If no argument is specified, it's as if --get was used
-complete -c git -n '__fish_git_using_command config and __fish_is_token_n 3' -fa '(__fish_git_config_keys)'
-complete -f -c git -n '__fish_git_using_command config and __fish_is_first_arg' -l get -d 'Get config with name' -ra '(__fish_git_config_keys)'
+complete -c git -n '__fish_git_using_command config; and __fish_is_token_n 3' -fa '(__fish_git_config_keys)'
+complete -f -c git -n '__fish_git_using_command config; and __fish_is_first_arg' -l get -d 'Get config with name' -ra '(__fish_git_config_keys)'
 complete -f -c git -n '__fish_git_using_command config' -l get -d 'Get config with name' -ra '(__fish_git_config_keys)'
 complete -f -c git -n '__fish_git_using_command config' -l get-all -d 'Get all values matching key' -a '(__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
@@ -1518,7 +1518,7 @@ complete -f -c git -n '__fish_git_using_command config' -s z -l null -d 'Termina
 complete -f -c git -n '__fish_git_using_command config' -l name-only -d 'Show variable names only'
 complete -f -c git -n '__fish_git_using_command config' -l includes -d 'Respect include directives'
 complete -f -c git -n '__fish_git_using_command config' -l show-origin -d 'Show origin of configuration'
-complete -f -c git -n '__fish_git_using_command config and __fish_seen_argument --get' -l default -d 'Use default value when missing entry'
+complete -f -c git -n '__fish_git_using_command config; and __fish_seen_argument --get' -l default -d 'Use default value when missing entry'
 
 
 

From 88d20e257b5fb87a616b358d9529527756d937af Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 15 Mar 2019 20:21:05 -0700
Subject: [PATCH 0095/1732] Remove some unused variables

---
 src/expand.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 2d517bf3c..408176166 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -206,7 +206,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             }
         }
 
-        const size_t i1_src_pos = pos;
         const wchar_t *end;
         long tmp = fish_wcstol(&in[pos], &end);
         // We don't test `*end` as is typically done because we expect it to not be the null char.
@@ -223,7 +222,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             pos += 2;
             while (in[pos] == INTERNAL_SEPARATOR) pos++;
 
-            const size_t number_start = pos;
             long tmp1 = fish_wcstol(&in[pos], &end);
             // Ignore the case of errno==-1 because it means the end char wasn't the null char.
             if (errno > 0) {

From 74a22ff4262b872668d9cca3279eece5b7e49350 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 16 Mar 2019 00:54:44 -0700
Subject: [PATCH 0096/1732] wcsfilecmp: punctuation [\]^_` after A-Z.

This tweaks wcsfilecmp such that certain punctuation characters will
come after A-Z.

A big win with `set <TAB>` - the __prefixed fish junk now comes
after the stuff users should care about.
---
 src/util.cpp                          | 4 ++--
 tests/__fish_complete_directories.out | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 5bb89e5ba..4ca1cec54 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -61,8 +61,8 @@ int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
             if (retval || *a == 0 || *b == 0) break;
         }
 
-        wint_t al = towlower(*a);
-        wint_t bl = towlower(*b);
+        wint_t al = towupper(*a);
+        wint_t bl = towupper(*b);
         if (al < bl) {
             retval = -1;
             break;
diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
index a098be2bb..a19636ac4 100644
--- a/tests/__fish_complete_directories.out
+++ b/tests/__fish_complete_directories.out
@@ -6,6 +6,8 @@ test/data/	Directory
 # __fish_complete_directories test/data/
 test/data/abc/	Directory
 test/data/abcd/	Directory
+test/data/fish-symlink/	Directory
+test/data/fish-symlink2/	Directory
 test/data/fish/	Directory
 test/data/xy/	Directory
 test/data/xyz/	Directory

From 6e525cc5d946965a31f74a28ab4dcb20cf01c11d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 16 Mar 2019 01:08:21 -0700
Subject: [PATCH 0097/1732] wcsfilecmp: sort - after everything else

Before this change, - was sorted with other punctuation before
A-Z. Now, it sorts above the rest of the characters.

This has a practical effect on completions, where when there are
both -s and --long with the same description, the short option
is now before the long option in the pager, which is what is now
selected when navigating `foo -<TAB>`. The long options can be
picked out with `foo --<TAB>`. Before, short options which
duplicated a long option literally could not be selected by
any means from the pager.

Fixes #5634
---
 src/util.cpp                          | 3 +++
 tests/__fish_complete_directories.out | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util.cpp b/src/util.cpp
index 4ca1cec54..0ca0ac7b2 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -63,6 +63,9 @@ int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
 
         wint_t al = towupper(*a);
         wint_t bl = towupper(*b);
+        if (al == L'-') al += 48;
+        if (bl == L'-') bl += 48;
+
         if (al < bl) {
             retval = -1;
             break;
diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
index a19636ac4..6d72a4d55 100644
--- a/tests/__fish_complete_directories.out
+++ b/tests/__fish_complete_directories.out
@@ -6,9 +6,9 @@ test/data/	Directory
 # __fish_complete_directories test/data/
 test/data/abc/	Directory
 test/data/abcd/	Directory
+test/data/fish/	Directory
 test/data/fish-symlink/	Directory
 test/data/fish-symlink2/	Directory
-test/data/fish/	Directory
 test/data/xy/	Directory
 test/data/xyz/	Directory
 # __fish_complete_directories test/data/abc

From aea406290655a2c94d3d063051291595114995e4 Mon Sep 17 00:00:00 2001
From: SanskritFritz <SanskritFritz+github@gmail.com>
Date: Sun, 17 Mar 2019 10:28:15 +0100
Subject: [PATCH 0098/1732] cower doesn't exist anymore, completions dropped

---
 share/completions/cower.fish | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 share/completions/cower.fish

diff --git a/share/completions/cower.fish b/share/completions/cower.fish
deleted file mode 100644
index 9b1c6269d..000000000
--- a/share/completions/cower.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-complete -c cower -f -s b -l 'brief'            -d 'Show output in a more script friendly format'
-complete -c cower -f -s d -l 'download'         -d 'Download [twice to fetch dependencies]'
-complete -c cower -f -s i -l 'info'             -d 'Show info for target [twice for more details]'
-complete -c cower -f -s m -l 'msearch'          -d 'Search for packages by maintainer'
-complete -c cower -f -s s -l 'search'           -d 'Search for packages by name'
-complete -c cower -f -s u -l 'update'           -d 'Check AUR packages for updates'
-complete -c cower -f -s c -l 'color' -xa 'always auto never' -d 'Use colored output'
-complete -c cower -f -s v -l 'debug'            -d 'Show debug output'
-complete -c cower -f -s f -l 'force'            -d 'Overwrite existing files when downloading'
-complete -c cower -f      -l 'format'           -d 'Print formatted'
-complete -c cower -f -s h -l 'help'             -d 'Display help and quit'
-complete -c cower -f      -l 'ignore' -xa "(pacman -Qq)" -d 'Ignore a package upgrade'
-complete -c cower -f      -l 'ignorerepo' -xa "(__fish_print_pacman_repos)" -d 'Ignore a binary repo when checking for updates'
-complete -c cower -f      -l 'listdelim'        -d 'Specify a delimiter for list formatters'
-complete -c cower -f -s q -l 'quiet'            -d 'Output less'
-complete -c cower -f -s t -l 'target'           -d 'Download targets to DIR'
-complete -c cower -f      -l 'threads'          -d 'Limit the number of threads created [10]'
-complete -c cower -f      -l 'timeout'          -d 'Curl timeout in seconds'
-complete -c cower -f -s v -l 'verbose'          -d 'Output more'
-
-# Complete with AUR packages:
-# If the search string is too short, cower prints an annoying message to stderr - ignore that
-complete -c cower -f -n 'not string match -q -- "-*" (commandline --current-token)' -a '(cower --format="%n\t%d\n" --search (commandline --current-token) 2>/dev/null)'

From 0bde698f819b9352ca246a3b435a72593f50405b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 17 Mar 2019 16:33:58 +0100
Subject: [PATCH 0099/1732] printf: Don't die on incomplete conversions

POSIX dictates here that incomplete conversions, like in

    printf %d\n 15.2

or

    printf %d 14g

are still printed along with any error.

This seems alright, as it allows users to silence stderr to accept incomplete conversions.

This commit implements it, but what's a bit weird is the ordering between stdout and stderr,
causing the error to be printed _after_, like

    15
    14
    15.1: value not completely converted
    14,2: value not completely converted

but that seems like a general issue with how we buffer the streams.

(I know that nonfatal_error is a copy of most of fatal_error - I tried
differently, and va_* is weird)

Fixes #5532.
---
 CHANGELOG.md           |  1 +
 src/builtin_printf.cpp | 27 +++++++++++++++++++++++----
 tests/printf.err       |  1 +
 tests/printf.in        |  4 ++++
 tests/printf.out       |  3 +++
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b92b7ef24..a476b3fb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - `complete --do-complete` now also does fuzzy matches (#5467).
 - `count` now also counts lines fed on stdin (#5744).
+- `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index d12d9c596..09b3a9283 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -90,8 +90,10 @@ struct builtin_printf_state_t {
 
     int print_formatted(const wchar_t *format, int argc, wchar_t **argv);
 
+    void nonfatal_error(const wchar_t *fmt, ...);
     void fatal_error(const wchar_t *format, ...);
 
+
     long print_esc(const wchar_t *escstart, bool octal_0);
     void print_esc_string(const wchar_t *str);
     void print_esc_char(wchar_t c);
@@ -193,6 +195,22 @@ static int octal_to_bin(wchar_t c) {
     }
 }
 
+void builtin_printf_state_t::nonfatal_error(const wchar_t *fmt, ...) {
+    // Don't error twice.
+    if (early_exit) return;
+
+    va_list va;
+    va_start(va, fmt);
+    wcstring errstr = vformat_string(fmt, va);
+    va_end(va);
+    streams.err.append(errstr);
+    if (!string_suffixes_string(L"\n", errstr)) streams.err.push_back(L'\n');
+
+    // We set the exit code to error, because one occured,
+    // but we don't do an early exit so we still print what we can.
+    this->exit_code = STATUS_CMD_ERROR;
+}
+
 void builtin_printf_state_t::fatal_error(const wchar_t *fmt, ...) {
     // Don't error twice.
     if (early_exit) return;
@@ -207,7 +225,6 @@ void builtin_printf_state_t::fatal_error(const wchar_t *fmt, ...) {
     this->exit_code = STATUS_CMD_ERROR;
     this->early_exit = true;
 }
-
 void builtin_printf_state_t::append_output(wchar_t c) {
     // Don't output if we're done.
     if (early_exit) return;
@@ -241,10 +258,12 @@ void builtin_printf_state_t::verify_numeric(const wchar_t *s, const wchar_t *end
             this->fatal_error(L"%ls: %s", s, std::strerror(errcode));
         }
     } else if (*end) {
-        if (s == end)
+        if (s == end) {
             this->fatal_error(_(L"%ls: expected a numeric value"), s);
-        else
-            this->fatal_error(_(L"%ls: value not completely converted"), s);
+        } else {
+            // This isn't entirely fatal - the value should still be printed.
+            this->nonfatal_error(_(L"%ls: value not completely converted"), s);
+        }
     }
 }
 
diff --git a/tests/printf.err b/tests/printf.err
index 40686c8f9..d8d4de233 100644
--- a/tests/printf.err
+++ b/tests/printf.err
@@ -1,2 +1,3 @@
 2,34: value not completely converted
 0xABCDEF12345678901: Number out of range
+15.1: value not completely converted
diff --git a/tests/printf.in b/tests/printf.in
index 9c8b9f9a8..d7174253e 100644
--- a/tests/printf.in
+++ b/tests/printf.in
@@ -72,3 +72,7 @@ printf 'long hex4 %X\n' 0xABCDEF12345678901
 printf 'long decimal %d\n' 498216206594
 printf 'long signed %d\n' -498216206595
 printf 'long signed to unsigned %u\n' -498216206596
+
+# Verify numeric conversion still happens even if it couldn't be fully converted
+printf '%d\n' 15.1
+echo $status
diff --git a/tests/printf.out b/tests/printf.out
index b965be413..40f19f791 100644
--- a/tests/printf.out
+++ b/tests/printf.out
@@ -16,6 +16,7 @@ a
 0000000 376
 0000001
 1.230000e+00
+2.000000e+00
 3,450000e+00
 4,560000e+00
 long hex1 73ffffff9a
@@ -24,3 +25,5 @@ long hex3 ABCDEF1234567890
 long hex4 long decimal 498216206594
 long signed -498216206595
 long signed to unsigned 18446743575493345020
+15
+1

From a58662dd46a6903e20ee0fc9e2cab33b1ada8f19 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 17 Mar 2019 12:47:24 -0700
Subject: [PATCH 0100/1732] Make maybe_t conditionally copyable

This allows it to be used with both e.g. unique_ptr and std::vector.
---
 src/fish_tests.cpp |  16 ++++
 src/maybe.h        | 184 +++++++++++++++++++++++++++++++--------------
 2 files changed, 145 insertions(+), 55 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 52692f0bc..364701fe0 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5015,6 +5015,22 @@ void test_maybe() {
     std::string res = acquire_test.acquire();
     do_test(!acquire_test);
     do_test(res == "def");
+
+    // maybe_t<T> should be copyable iff T is copyable.
+    using copyable = std::shared_ptr<int>;
+    using noncopyable = std::unique_ptr<int>;
+    do_test(std::is_copy_assignable<maybe_t<copyable>>::value == true);
+    do_test(std::is_copy_constructible<maybe_t<copyable>>::value == true);
+    do_test(std::is_copy_assignable<maybe_t<noncopyable>>::value == false);
+    do_test(std::is_copy_constructible<maybe_t<noncopyable>>::value == false);
+
+    maybe_t<std::string> c1{"abc"};
+    maybe_t<std::string> c2 = c1;
+    do_test(c1.value() == "abc");
+    do_test(c2.value() == "abc");
+    c2 = c1;
+    do_test(c1.value() == "abc");
+    do_test(c2.value() == "abc");
 }
 
 void test_layout_cache() {
diff --git a/src/maybe.h b/src/maybe.h
index 7f3f96cde..a3e5cebda 100644
--- a/src/maybe.h
+++ b/src/maybe.h
@@ -2,6 +2,116 @@
 #define FISH_MAYBE_H
 
 #include <cassert>
+#include <type_traits>
+
+namespace maybe_detail {
+// Template magic to make maybe_t<T> copyable iff T is copyable.
+// maybe_impl_t is the "too aggressive" implementation: it is always copyable.
+template <typename T>
+struct maybe_impl_t {
+    alignas(T) char storage[sizeof(T)];
+    bool filled = false;
+
+    T &value() {
+        assert(filled && "maybe_t does not have a value");
+        return *reinterpret_cast<T *>(storage);
+    }
+
+    const T &value() const {
+        assert(filled && "maybe_t does not have a value");
+        return *reinterpret_cast<const T *>(storage);
+    }
+
+    void reset() {
+        if (this->filled) {
+            value().~T();
+            this->filled = false;
+        }
+    }
+
+    T acquire() {
+        assert(filled && "maybe_t does not have a value");
+        T res = std::move(value());
+        reset();
+        return res;
+    }
+
+    maybe_impl_t() = default;
+
+    // Move construction/assignment from a T.
+    explicit maybe_impl_t(T &&v) : filled(true) { new (storage) T(std::forward<T>(v)); }
+    maybe_impl_t &operator=(T &&v) {
+        if (filled) {
+            value() = std::move(v);
+        } else {
+            new (storage) T(std::move(v));
+            filled = true;
+        }
+        return *this;
+    }
+
+    // Copy construction/assignment from a T.
+    explicit maybe_impl_t(const T &v) : filled(true) { new (storage) T(v); }
+    maybe_impl_t &operator=(const T &v) {
+        if (filled) {
+            value() = v;
+        } else {
+            new (storage) T(v);
+            filled = true;
+        }
+        return *this;
+    }
+
+    // Move construction/assignment from a maybe_impl.
+    maybe_impl_t(maybe_impl_t &&v) : filled(v.filled) {
+        if (filled) {
+            new (storage) T(std::move(v.value()));
+        }
+    }
+    maybe_impl_t &operator=(maybe_impl_t &&v) {
+        if (!v.filled) {
+            reset();
+        } else {
+            *this = std::move(v.value());
+        }
+        return *this;
+    }
+
+    // Copy construction/assignment from a maybe_impl.
+    maybe_impl_t(const maybe_impl_t &v) : filled(v.filled) {
+        if (v.filled) {
+            new (storage) T(v.value());
+        }
+    }
+    maybe_impl_t &operator=(const maybe_impl_t &v) {
+        if (&v == this) return *this;
+        if (!v.filled) {
+            reset();
+        } else {
+            *this = v.value();
+        }
+        return *this;
+    }
+
+    ~maybe_impl_t() { reset(); }
+};
+
+struct copyable_t {};
+struct noncopyable_t {
+    noncopyable_t() = default;
+    noncopyable_t(noncopyable_t &&) = default;
+    noncopyable_t &operator=(noncopyable_t &&) = default;
+    noncopyable_t(const noncopyable_t &) = delete;
+    noncopyable_t &operator=(const noncopyable_t &) = delete;
+};
+
+// conditionally_copyable_t is copyable iff T is copyable.
+// This enables conditionally copyable wrapper types by inheriting from it.
+template <typename T>
+using conditionally_copyable_t = typename std::conditional<std::is_copy_constructible<T>::value,
+                                                           copyable_t, noncopyable_t>::type;
+
+};  // namespace maybe_detail
 
 // A none_t is a helper type used to implicitly initialize maybe_t.
 // Example usage:
@@ -15,16 +125,15 @@ inline constexpr none_t none() { return none_t::none; }
 // Support for a maybe, also known as Optional.
 // This is a value-type class that stores a value of T in aligned storage.
 template <typename T>
-class maybe_t {
-    alignas(T) char storage[sizeof(T)];
-    bool filled = false;
+class maybe_t : private maybe_detail::conditionally_copyable_t<T> {
+    maybe_detail::maybe_impl_t<T> impl_;
 
    public:
     // return whether the receiver contains a value.
-    bool has_value() const { return filled; }
+    bool has_value() const { return impl_.filled; }
 
     // bool conversion indicates whether the receiver contains a value.
-    explicit operator bool() const { return filled; }
+    explicit operator bool() const { return impl_.filled; }
 
     // The default constructor constructs a maybe with no value.
     maybe_t() = default;
@@ -33,79 +142,46 @@ class maybe_t {
     /* implicit */ maybe_t(none_t n) { (void)n; }
 
     // Construct a maybe_t from a value T.
-    /* implicit */ maybe_t(T &&v) : filled(true) { new (storage) T(std::forward<T>(v)); }
+    /* implicit */ maybe_t(T &&v) : impl_(std::move(v)) {}
 
     // Construct a maybe_t from a value T.
-    /* implicit */ maybe_t(const T &v) : filled(true) { new (storage) T(v); }
+    /* implicit */ maybe_t(const T &v) : impl_(v) {}
 
     // Copy constructor.
-    maybe_t(const maybe_t &v) : filled(v.filled) {
-        if (v.filled) {
-            new (storage) T(v.value());
-        }
-    }
+    maybe_t(const maybe_t &v) = default;
 
     // Move constructor.
-    /* implicit */ maybe_t(maybe_t &&v) : filled(v.filled) {
-        if (v.filled) {
-            new (storage) T(std::move(v.value()));
-        }
-    }
+    /* implicit */ maybe_t(maybe_t &&v) = default;
 
     // Construct a value in-place.
     template <class... Args>
     void emplace(Args &&... args) {
         reset();
-        filled = true;
-        new (storage) T(std::forward<Args>(args)...);
+        impl_.filled = true;
+        new (impl_.storage) T(std::forward<Args>(args)...);
     }
 
     // Access the value.
-    T &value() {
-        assert(filled && "maybe_t does not have a value");
-        return *reinterpret_cast<T *>(storage);
-    }
+    T &value() { return impl_.value(); }
 
-    const T &value() const {
-        assert(filled && "maybe_t does not have a value");
-        return *reinterpret_cast<const T *>(storage);
-    }
+    const T &value() const { return impl_.value(); }
 
     // Transfer the value to the caller.
-    T acquire() {
-        assert(filled && "maybe_t does not have a value");
-        T res = std::move(value());
-        reset();
-        return res;
-    }
+    T acquire() { return impl_.acquire(); }
 
     // Clear the value.
-    void reset() {
-        if (filled) {
-            value().~T();
-            filled = false;
-        }
-    }
+    void reset() { impl_.reset(); }
 
     // Assign a new value.
     maybe_t &operator=(T &&v) {
-        if (filled) {
-            value() = std::move(v);
-        } else {
-            new (storage) T(std::move(v));
-            filled = true;
-        }
+        impl_ = std::move(v);
         return *this;
     }
 
-    maybe_t &operator=(maybe_t &&v) {
-        if (!v) {
-            reset();
-        } else {
-            *this = std::move(*v);
-        }
-        return *this;
-    }
+    // Note that defaulting these allows these to be conditionally deleted via
+    // conditionally_copyable_t().
+    maybe_t &operator=(const maybe_t &v) = default;
+    maybe_t &operator=(maybe_t &&v) = default;
 
     // Dereference support.
     const T *operator->() const { return &value(); }
@@ -127,8 +203,6 @@ class maybe_t {
     }
 
     bool operator!=(const maybe_t &rhs) const { return !(*this == rhs); }
-
-    ~maybe_t() { reset(); }
 };
 
 #endif

From 03454b7dcd88ae713a6e213f918a367f05778fda Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Mar 2019 09:52:46 -0700
Subject: [PATCH 0101/1732] Use a real struct type in fish_indent pending node
 stack

---
 src/fish_indent.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 01d3a3b94..c40c2fb24 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -99,9 +99,8 @@ struct prettifier_t {
 
     prettifier_t(const wcstring &source, bool do_indent) : source(source), do_indent(do_indent) {}
 
-    void prettify_node_nrecursive(const parse_node_tree_t &tree,
-                                 node_offset_t node_idx, indent_t node_indent,
-                                 parse_token_type_t parent_type);
+    void prettify_node(const parse_node_tree_t &tree, node_offset_t node_idx, indent_t node_indent,
+                       parse_token_type_t parent_type);
 
     void maybe_prepend_escaped_newline(const parse_node_t &node) {
         if (node.has_preceding_escaped_newline()) {
@@ -162,20 +161,23 @@ static void dump_node(indent_t node_indent, const parse_node_t &node, const wcst
              token_type_description(node.type), prevc_str, source_txt.c_str(), nextc_str);
 }
 
-void prettifier_t::prettify_node_nrecursive(const parse_node_tree_t &tree,
-                                            node_offset_t node_idx, indent_t node_indent,
-                                            parse_token_type_t parent_type) {
+void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t node_idx,
+                                 indent_t node_indent, parse_token_type_t parent_type) {
+    // Use an explicit stack to avoid stack overflow.
+    struct pending_node_t {
+        node_offset_t index;
+        indent_t indent;
+        parse_token_type_t parent_type;
+    };
+    std::stack<pending_node_t> pending_node_stack;
 
-    using call_tuple_t = std::tuple<node_offset_t, indent_t, parse_token_type_t>;
-    std::stack<call_tuple_t> explicit_stack;
-    explicit_stack.push(std::make_tuple(node_idx, node_indent, parent_type));
-    while(!explicit_stack.empty()){
-
-        call_tuple_t arguments = explicit_stack.top();
-        explicit_stack.pop();
-        auto node_idx = std::get<0>(arguments);
-        auto node_indent = std::get<1>(arguments);
-        auto parent_type = std::get<2>(arguments);
+    pending_node_stack.push({node_idx, node_indent, parent_type});
+    while (!pending_node_stack.empty()) {
+        pending_node_t args = pending_node_stack.top();
+        pending_node_stack.pop();
+        auto node_idx = args.index;
+        auto node_indent = args.indent;
+        auto parent_type = args.parent_type;
 
         const parse_node_t &node = tree.at(node_idx);
         const parse_token_type_t node_type = node.type;
@@ -236,7 +238,7 @@ void prettifier_t::prettify_node_nrecursive(const parse_node_tree_t &tree,
             // Note: We pass our type to our child, which becomes its parent node type.
             // Note: While node.child_start could be -1 (NODE_OFFSET_INVALID) the addition is safe
             // because we won't execute this call in that case since node.child_count should be zero.
-            explicit_stack.push(std::make_tuple(node.child_start + (idx - 1), node_indent, node_type));
+            pending_node_stack.push({node.child_start + (idx - 1), node_indent, node_type});
         }
     }
 }
@@ -262,7 +264,7 @@ static wcstring prettify(const wcstring &src, bool do_indent) {
         const parse_node_t &node = parse_tree.at(i);
         if (node.parent == NODE_OFFSET_INVALID || node.type == parse_special_type_parse_error) {
             // A root node.
-            prettifier.prettify_node_nrecursive(parse_tree, i, 0, symbol_job_list);
+            prettifier.prettify_node(parse_tree, i, 0, symbol_job_list);
         }
     }
     return std::move(prettifier.output);

From 69abbd7b2a9d0c97089d2fb86445acc291c353af Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 18 Mar 2019 17:09:48 +0100
Subject: [PATCH 0102/1732] docs: Mention $__fish_x_dir in autoloading chapter

That's what we want people to use instead of hardcoding
"/usr/share/fish", because that would break the code on other systems.

[ci skip]
---
 sphinx_doc_src/index.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 562d9c3f1..349aee5e1 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -452,9 +452,10 @@ Fish automatically searches through any directories in the array variable ``$fis
 
 By default, Fish searches the following for functions, using the first available file that it finds:
 - A directory for end-users to keep their own functions, usually ``~/.config/fish/functions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable).
-- A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions``.
+- A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions`` (really ``$__fish_sysconfdir/functions``).
 - A directory for third-party software vendors to ship their own functions for their software, usually ``/usr/share/fish/vendor_functions.d``.
-- The functions shipped with fish, usually installed in ``/usr/share/fish/functions``.
+  (set at compile time; by default, ``$__fish_data_dir/vendor_functions.d``)
+- The functions shipped with fish, usually installed in ``/usr/share/fish/functions`` (really ``$__fish_data_dir/functions``).
 
 These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
 
@@ -1581,7 +1582,7 @@ Configuration files are evaluated in the following order:
 - Configuration snippets in files ending in ``.fish``, in the directories:
   - ``$__fish_config_dir/conf.d`` (by default, ``~/.config/fish/conf.d/``)
   - ``$__fish_sysconf_dir/conf.d`` (by default, ``/etc/fish/conf.d``)
-  - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/conf.d``)
+  - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/vendor_conf.d``)
 
   If there are multiple files with the same name in these directories, only the first will be executed.
   They are executed in order of their filename, sorted (like globs) in a natural order (i.e. "01" sorts before "2").

From 805a8db7ef83a1ed409ad8b21095a665cd395d0c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 18 Mar 2019 22:25:58 +0100
Subject: [PATCH 0103/1732] functions/fish_hg_prompt: Show untracked files

Apparently "status --quiet" actually inhibits showing untracked files,
which explains why it's 20% faster (though it's quite weird use of
that option!)

Fixes #5749.

[ci skip]
---
 share/functions/fish_hg_prompt.fish | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/functions/fish_hg_prompt.fish b/share/functions/fish_hg_prompt.fish
index 584695f54..93c4d102b 100644
--- a/share/functions/fish_hg_prompt.fish
+++ b/share/functions/fish_hg_prompt.fish
@@ -38,9 +38,8 @@ function fish_hg_prompt --description 'Write out the hg prompt'
 
     echo -n '|'
 
-    # For some reason, "-q" still prints the same output, but ~20% faster.
     # Disabling color and pager is always a good idea.
-    set -l repo_status (hg status -q --color never --pager never | string sub -l 2 | sort -u)
+    set -l repo_status (hg status --color never --pager never | string sub -l 2 | sort -u)
 
     # Show nice color for a clean repo
     if test -z "$repo_status"

From f56bce3f977182710762a1501ec52de3ddaa29d2 Mon Sep 17 00:00:00 2001
From: ykai <yingkaidang@gmail.com>
Date: Tue, 19 Mar 2019 13:55:52 +0800
Subject: [PATCH 0104/1732] Fixed `mount -o<TAB>` exception

---
 .../functions/__fish_complete_mount_opts.fish | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/share/functions/__fish_complete_mount_opts.fish b/share/functions/__fish_complete_mount_opts.fish
index 9afc4020b..378262d8e 100644
--- a/share/functions/__fish_complete_mount_opts.fish
+++ b/share/functions/__fish_complete_mount_opts.fish
@@ -140,21 +140,22 @@ function __fish_complete_mount_opts
     set -l token (commandline -tc | string replace -r '^-o' -- '')
     set -l args (string split , -- $token)
 
-    set -l last_arg $args[-1]
-    set -e args[-1]
+    if test (count $args) -ne 0
+        set -l last_arg $args[-1]
+        set -e args[-1]
 
-    switch (string replace -r '=.*' '=' -- $last_arg)
-        case uid=
-            set -a fish_mount_opts uid=(__fish_print_user_ids)
-        case gid=
-            set -a fish_mount_opts gid=(__fish_print_group_ids)
-        case setuid=
-            set -a fish_mount_opts setuid=(__fish_print_user_ids)
-        case setgid=
-            set -a fish_mount_opts setgid=(__fish_print_group_ids)
+        switch (string replace -r '=.*' '=' -- $last_arg)
+            case uid=
+                set -a fish_mount_opts uid=(__fish_print_user_ids)
+            case gid=
+                set -a fish_mount_opts gid=(__fish_print_group_ids)
+            case setuid=
+                set -a fish_mount_opts setuid=(__fish_print_user_ids)
+            case setgid=
+                set -a fish_mount_opts setgid=(__fish_print_group_ids)
+        end
     end
 
-
     set -l prefix ''
     if set -q args[1]
         set prefix (string join , -- $args),

From 05ef157757c37db603b71bc9f755af31790d549a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Mar 2019 10:05:39 +0100
Subject: [PATCH 0105/1732] functions/fish_git_prompt: Let helper functions
 return useful status

If you use these to figure out if there _are_ staged files, or dirty
or whatever, you currently need to check the output, which relies on
the configured character.

Instead, we let them also return a useful status.
Notably, this is *not* simply the status of the git call.

__fish_git_prompt_X returns 0 if the repo is X.

This works for untracked, but the "diff" things return 1 if there is a
diff, so we invert the status for them.

See #5748.

[ci skip]
---
 share/functions/fish_git_prompt.fish | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index 6ee0a8e5c..19effdd62 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -485,36 +485,45 @@ end
 
 function __fish_git_prompt_staged --description "fish_git_prompt helper, tells whether or not the current branch has staged files"
     set -l sha $argv[1]
-
     set -l staged
+    set -l ret 0
 
     if test -n "$sha"
-        command git diff-index --cached --quiet HEAD -- 2>/dev/null
-        or set staged $___fish_git_prompt_char_stagedstate
+        # The "diff" functions all return > 0 if there _is_ a diff,
+        # but we want to return 0 if there are staged changes.
+        # So we invert the status.
+        not command git diff-index --cached --quiet HEAD -- 2>/dev/null
+        and set staged $___fish_git_prompt_char_stagedstate
+        set ret $status
     else
         set staged $___fish_git_prompt_char_invalidstate
+        set ret 2
     end
     echo $staged
+    return $ret
 end
 
 function __fish_git_prompt_untracked --description "fish_git_prompt helper, tells whether or not the current repository has untracked files"
-    set -l untracked
+    set -l ret 1
     if command git ls-files --others --exclude-standard --directory --no-empty-directory --error-unmatch -- :/ >/dev/null 2>&1
+        set ret $status
         set untracked $___fish_git_prompt_char_untrackedfiles
     end
     echo $untracked
+    return $ret
 end
 
 function __fish_git_prompt_dirty --description "fish_git_prompt helper, tells whether or not the current branch has tracked, modified files"
     set -l dirty
 
-    set -l os
-    command git diff --no-ext-diff --quiet --exit-code 2>/dev/null
-    set os $status
-    if test $os -ne 0
+    # Like staged, invert the status because we want 0 to mean there are dirty files.
+    not command git diff --no-ext-diff --quiet --exit-code 2>/dev/null
+    set -l os $status
+    if test $os -eq 0
         set dirty $___fish_git_prompt_char_dirtystate
     end
     echo $dirty
+    return $os
 end
 
 set -g ___fish_git_prompt_status_order stagedstate invalidstate dirtystate untrackedfiles

From 632c47be5466eef6bd503168236ff607ab5dabbd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Mar 2019 10:24:10 +0100
Subject: [PATCH 0106/1732] functions/fish_git_prompt: Remove literal tabs

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

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index 19effdd62..9b0a20539 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -281,7 +281,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
     end
 
     # Find how many commits we are ahead/behind our upstream
-    set count (command git rev-list --count --left-right $upstream...HEAD 2>/dev/null)
+    set count (command git rev-list --count --left-right $upstream...HEAD 2>/dev/null | string replace \t " ")
 
     # calculate the result
     if test -n "$verbose"
@@ -295,11 +295,11 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
         echo $count | read -l behind ahead
         switch "$count"
             case '' # no upstream
-            case "0	0" # equal to upstream
+            case "0 0" # equal to upstream
                 echo "$prefix$___fish_git_prompt_char_upstream_equal"
-            case "0	*" # ahead of upstream
+            case "0 *" # ahead of upstream
                 echo "$prefix$___fish_git_prompt_char_upstream_ahead$ahead"
-            case "*	0" # behind upstream
+            case "* 0" # behind upstream
                 echo "$prefix$___fish_git_prompt_char_upstream_behind$behind"
             case '*' # diverged from upstream
                 echo "$prefix$___fish_git_prompt_char_upstream_diverged$ahead-$behind"
@@ -311,10 +311,10 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
         echo $count | read -l behind ahead
         switch "$count"
             case '' # no upstream
-            case "0	0" # equal to upstream
-            case "0	*" # ahead of upstream
+            case "0 0" # equal to upstream
+            case "0 *" # ahead of upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_ahead$ahead"
-            case "*	0" # behind upstream
+            case "* 0" # behind upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_behind$behind"
             case '*' # diverged from upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_ahead$ahead$___fish_git_prompt_char_upstream_behind$behind"
@@ -322,11 +322,11 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
     else
         switch "$count"
             case '' # no upstream
-            case "0	0" # equal to upstream
+            case "0 0" # equal to upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_equal"
-            case "0	*" # ahead of upstream
+            case "0 *" # ahead of upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_ahead"
-            case "*	0" # behind upstream
+            case "* 0" # behind upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_behind"
             case '*' # diverged from upstream
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_diverged"

From f6226f08027c7b71b72563f94cbd832d2da8d245 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Mar 2019 10:24:40 +0100
Subject: [PATCH 0107/1732] functions/fish_git_prompt: Useful status for
 show_upstream

Returns 0 if there is no diversion, 1 otherwise.
---
 share/functions/fish_git_prompt.fish | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index 9b0a20539..ef839c611 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -332,6 +332,9 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
                 echo "$___fish_git_prompt_char_upstream_prefix$___fish_git_prompt_char_upstream_diverged"
         end
     end
+
+    # For the return status
+    test "$count" = "0 0"
 end
 
 function fish_git_prompt --description "Prompt function for Git"

From a649c5293e0e03560a4c7c909688a9baae7f2f9b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Mar 2019 10:27:25 +0100
Subject: [PATCH 0108/1732] functions/fish_git_prompt: Fix space prefix for
 verbose showupstream

This created another local version of the variable just for the if-block.

Can't say I love the space prefix, but then I think we have too many
of these modes anyway.
---
 share/functions/fish_git_prompt.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index ef839c611..cf3623bfa 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -289,7 +289,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for fish
         set -l prefix "$___fish_git_prompt_char_upstream_prefix"
         # Using two underscore version to check if user explicitly set to nothing
         if not set -q __fish_git_prompt_char_upstream_prefix
-            set -l prefix " "
+            set prefix " "
         end
 
         echo $count | read -l behind ahead

From f8b88d5b98d8f4f9a521b827d1d9527a572161d4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 19 Mar 2019 21:07:49 +0100
Subject: [PATCH 0109/1732] docs/fish_git_prompt: Better document variables

More accurate, also the code example can now be copy-pasted.

[ci skip]
---
 sphinx_doc_src/cmds/fish_git_prompt.rst | 62 +++++++++++++------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 298e436ae..08b1cb9b5 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -10,20 +10,20 @@ For obvious reasons, it requires having git installed.
 
 There are numerous configuration options, either as fish variables or git config variables. If a git config variable is supported, it will be used if set, and the fish variable will only be used if it isn't.
 
+- $__fish_git_prompt_show_informative_status or the git config option "bash.showInformativeStatus" can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, etc... In large repositories, this can take a lot of time, so it is recommended to disable it there, via ``git config bash.showInformativeStatus false``.
+
 - $__fish_git_prompt_showdirtystate or the git config option "bash.showDirtyState" can be set to show if the repository is "dirty", i.e. has uncommitted changes.
 
 - $__fish_git_prompt_showuntrackedfiles or the git config option "bash.showUntrackedFiles" can be set to show if the repository has untracked files (that aren't ignored).
 
-- $__fish_git_prompt_show_informative_status or the git config option "bash.showInformativeStatus" can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, etc... In large repositories, this can take a lot of time, so it is recommended to disable it there.
-
 - $__fish_git_prompt_showupstream can be set to a number of values to determine how changes between HEAD and upstream are shown:
 
      verbose        show number of commits ahead/behind (+/-) upstream
      name           if verbose, then also show the upstream abbrev name
-     informative    similar to verbose, but shows nothing when equal (fish only)
+     informative    similar to verbose, but shows nothing when equal - this is the default if show_informative_status is set.
      git            always compare HEAD to @{upstream}
      svn            always compare HEAD to your SVN upstream
-     none           disables (fish only, useful with show_informative_status)
+     none           disables (useful with show_informative_status)
 
 - $__fish_git_prompt_showstashstate can be set to display the state of the stash.
 
@@ -38,44 +38,48 @@ There are numerous configuration options, either as fish variables or git config
 
 - $__fish_git_prompt_showcolorhints can be set to enable coloring for certain things.
 
-A number of variables to set characters and color used to indicate things.
+A number of variables to set characters and color used to indicate things. Many of these have a different default if used with informative status enabled.
 
-- $__fish_git_prompt_char_cleanstate
-- $__fish_git_prompt_char_dirtystate
-- $__fish_git_prompt_char_invalidstate
-- $__fish_git_prompt_char_stagedstate
-- $__fish_git_prompt_char_stashstate
 - $__fish_git_prompt_char_stateseparator
-- $__fish_git_prompt_char_untrackedfiles
-- $__fish_git_prompt_char_upstream_ahead
-- $__fish_git_prompt_char_upstream_behind
-- $__fish_git_prompt_char_upstream_diverged
-- $__fish_git_prompt_char_upstream_equal
-- $__fish_git_prompt_char_upstream_prefix
 - $__fish_git_prompt_color
 - $__fish_git_prompt_color_prefix
 - $__fish_git_prompt_color_suffix
 - $__fish_git_prompt_color_bare
 - $__fish_git_prompt_color_merging
+
+Some variables are only used in some modes, like when informative status is enabled (by setting $__fish_git_prompt_show_informative_status):
+- $__fish_git_prompt_char_cleanstate
 - $__fish_git_prompt_color_cleanstate
+
+Variables used with showdirtystate:
+- $__fish_git_prompt_char_dirtystate
+- $__fish_git_prompt_char_invalidstate
+- $__fish_git_prompt_char_stagedstate
+- $__fish_git_prompt_color_dirtystate
 - $__fish_git_prompt_color_invalidstate
+- $__fish_git_prompt_color_stagedstate
+
+Variables used with showstashstate:
+- $__fish_git_prompt_char_stashstate
+- $__fish_git_prompt_color_stashstate
+
+Variables used with showuntrackedfiles:
+- $__fish_git_prompt_char_untrackedfiles
+- $__fish_git_prompt_color_untrackedfiles
+
+Variables used with showupstream (also implied by informative status):
+- $__fish_git_prompt_char_upstream_ahead
+- $__fish_git_prompt_char_upstream_behind
+- $__fish_git_prompt_char_upstream_diverged
+- $__fish_git_prompt_char_upstream_equal
+- $__fish_git_prompt_char_upstream_prefix
 - $__fish_git_prompt_color_upstream
 
 Colors used with showcolorhints:
-
-- $__fish_git_prompt_color_flags
 - $__fish_git_prompt_color_branch
-- $__fish_git_prompt_color_dirtystate
-- $__fish_git_prompt_color_stagedstate
-- $__fish_git_prompt_color_flags
-- $__fish_git_prompt_color_branch
-- $__fish_git_prompt_color_dirtystate
-- $__fish_git_prompt_color_stagedstate
 - $__fish_git_prompt_color_branch_detached
-
-Colors used with their respective flags enabled:
-- $__fish_git_prompt_color_stashstate
-- $__fish_git_prompt_color_untrackedfiles
+- $__fish_git_prompt_color_dirtystate
+- $__fish_git_prompt_color_flags
 
 Note that all colors can also have a corresponding "_done" color. E.g. $__fish_git_prompt_color_upstream_done, used right _after_ the upstream.
 
@@ -87,7 +91,7 @@ Example
 A simple prompt that displays git info::
 
     function fish_prompt
-        ...
+        # ...
         set -g __fish_git_prompt_showupstream auto
         printf '%s %s$' $PWD (fish_git_prompt)
     end

From 1a53bbeb9d35831ee21a9930b17c3c77ebd61ef9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 20 Mar 2019 08:54:40 +0100
Subject: [PATCH 0110/1732] src/fallback: Include locale.h for the wcstod_l
 fallback

Fixes #5753.
---
 src/fallback.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index 722338c04..64bbc1920 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -397,6 +397,7 @@ int flock(int fd, int op) {
 
 #if !defined(HAVE_WCSTOD_L) && !defined(__NetBSD__)
 #undef wcstod_l
+#include <locale.h>
 // For platforms without wcstod_l C extension, wrap wcstod after changing the
 // thread-specific locale.
 double fish_compat::wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t loc) {

From a8b01e1c996a90cae7f4801ed7206a5913bf1021 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 20 Mar 2019 09:01:20 +0100
Subject: [PATCH 0111/1732] src/output: Unconst-cast tputs

Fixes the build on Solaris/OpenIndiana/Illumos.
---
 src/output.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/output.cpp b/src/output.cpp
index ddabac3b4..64db9fba8 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -357,7 +357,9 @@ int outputter_t::term_puts(const char *str, int affcnt) {
     // scoped_push will restore it.
     scoped_lock locker{s_tputs_receiver_lock};
     scoped_push<outputter_t *> push(&s_tputs_receiver, this);
-    return tputs(str, affcnt, tputs_writer);
+    // On some systems, tputs takes a char*, on others a const char*.
+    // Like tparm, we just cast it to unconst, that should work everywhere.
+    return tputs((char *)str, affcnt, tputs_writer);
 }
 
 /// Write a wide character to the outputter. This should only be used when writing characters from

From f2896b2d83c473bbd0d429cf08f7f86d9c388733 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 20 Mar 2019 20:51:22 -0500
Subject: [PATCH 0112/1732] Fix junk memory read introduced in
 1cd5b2f4e100cc18d70d3e37aca747a61ca42f3f

The commit began passing the length of the wide string rather than the
length of the narrowed string after conversion via `wcstombs`. We *do*
have the actual length, but it's not (necessarily) the same as the
original value. We need to pass the result of `wcstombs` instead.
---
 src/output.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/output.cpp b/src/output.cpp
index 64db9fba8..1fadaa34a 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -127,7 +127,7 @@ bool outputter_t::write_color(rgb_color_t color, bool is_fg) {
 /// Since the terminfo string this function emits can potentially cause the screen to flicker, the
 /// function takes care to write as little as possible.
 ///
-/// Possible values for colors are rgb_color_t colors or special values like rgb_color_t::normal() 
+/// Possible values for colors are rgb_color_t colors or special values like rgb_color_t::normal()
 ///
 /// In order to set the color to normal, three terminfo strings may have to be written.
 ///
@@ -411,8 +411,9 @@ void outputter_t::writestr(const wchar_t *str) {
     } else {
         buffer = new char[len];
     }
-    wcstombs(buffer, str, len);
-    this->writestr(buffer, len);
+
+    int new_len = wcstombs(buffer, str, len);
+    this->writestr(buffer, new_len);
     if (buffer != static_buffer) delete[] buffer;
 }
 

From 4aded78fc9b21486ce9362b9b56e76e762007aa3 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 29 Jan 2019 19:59:41 -0600
Subject: [PATCH 0113/1732] Add `is_console_session()` to detect physical vty

---
 src/common.cpp | 24 ++++++++++++++++++++++++
 src/common.h   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/common.cpp b/src/common.cpp
index 3728ff269..5cd37f06e 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2482,3 +2482,27 @@ std::string get_path_to_tmp_dir() {
     return "/tmp";
 #endif
 }
+
+// This function attempts to distinguish between a console session (at the actual login vty) and a
+// session within a terminal emulator inside a desktop environment or over SSH. Unfortunately
+// there are few values of $TERM that we can interpret as being exclusively console sessions, and
+// most common operating systems do not use them. The value is cached for the duration of the fish
+// session. We err on the side of assuming it's not a console session. This approach isn't
+// bullet-proof and that's OK.
+bool is_console_session() {
+    static bool console_session = []() {
+        ASSERT_IS_MAIN_THREAD();
+
+        const char *tty_name = ttyname(0);
+        auto len = strlen("/dev/tty");
+        const char *TERM = getenv("TERM");
+        return
+            // Test that the tty matches /dev/(console|dcons|tty[uv\d])
+            tty_name && ((strncmp(tty_name, "/dev/tty", len) == 0 &&
+            (tty_name[len] == 'u' || tty_name[len] == 'v' || isdigit(tty_name[len])))
+            || strcmp(tty_name, "/dev/dcons") == 0 || strcmp(tty_name, "/dev/console") == 0)
+            // and that $TERM is simple, e.g. `xterm` or `vt100`, not `xterm-something`
+            && (!TERM || !strchr(TERM, '-') || !strcmp(TERM, "sun-color"));
+    }();
+    return console_session;
+}
diff --git a/src/common.h b/src/common.h
index c5522713d..811901ad1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1048,4 +1048,6 @@ struct cleanup_t {
     }
 };
 
-#endif
+bool is_console_session();
+
+#endif // FISH_COMMON_H

From da8e34307658b482532f66ae74165649fb893472 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 29 Jan 2019 20:00:09 -0600
Subject: [PATCH 0114/1732] Use is_console_session() to signal using system
 `wcwidth()`

The system version of `wcwidth()` reflects the capabilities of the
system's own virtual terminal's view of the width of the character in
question, while fish's enhanced version (`widechar_wcwidth`) is much too
smart for most login terminals, which generally barely support anything
beyond ASCII text.

If, at startup, it is detected that we are running under a physical
console rather than within a terminal emulator running in a desktop
environment, take that as a hint to use the system-provided `wcwidth`.
---
 src/fallback.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index 64bbc1920..870f81787 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -279,6 +279,13 @@ int fish_wcswidth(const wchar_t *str, size_t n) { return wcswidth(str, n); }
 #include "widecharwidth/widechar_width.h"
 
 int fish_wcwidth(wchar_t wc) {
+    // The system version of wcwidth should accurately reflect the ability to represent characters
+    // in the console session, but knows nothing about the capabilities of other terminal emulators
+    // or ttys. Use it from the start only if we are logged in to the physical console.
+    if (is_console_session()) {
+        return wcwidth(wc);
+    }
+
     // Check for VS16 which selects emoji presentation. This "promotes" a character like U+2764
     // (width 1) to an emoji (probably width 2). So treat it as width 1 so the sums work. See #2652.
     // VS15 selects text presentation.
@@ -292,6 +299,7 @@ int fish_wcwidth(wchar_t wc) {
     // we take the position that the typical way for them to show up is composed.
     if (wc >= L'\u1160' && wc <= L'\u11FF') return 0;
     int width = widechar_wcwidth(wc);
+
     switch (width) {
         case widechar_nonprint:
         case widechar_combining:

From 753d489376d480b92b5e587664229c2fef6f95b9 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 30 Jan 2019 14:31:11 -0600
Subject: [PATCH 0115/1732] Fall back to simpler special characters in console
 sessions

---
 src/common.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/common.cpp b/src/common.cpp
index 5cd37f06e..11b1ff8d5 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -576,11 +576,15 @@ void fish_setlocale() {
         ellipsis_char = L'$';  // "horizontal ellipsis"
         ellipsis_str = L"...";
     }
+
     if (is_windows_subsystem_for_linux()) {
         // neither of \u23CE and \u25CF can be displayed in the default fonts on Windows, though
         // they can be *encoded* just fine. Use alternative glyphs.
         omitted_newline_char = can_be_encoded(L'\u00b6') ? L'\u00b6' : L'~';   // "pilcrow"
         obfuscation_read_char = can_be_encoded(L'\u2022') ? L'\u2022' : L'*';  // "bullet"
+    } else if (is_console_session()) {
+        omitted_newline_char = L'@';
+        obfuscation_read_char = L'*';
     } else {
         omitted_newline_char = can_be_encoded(L'\u23CE') ? L'\u23CE' : L'~';   // "return"
         obfuscation_read_char = can_be_encoded(L'\u25CF') ? L'\u25CF' : L'#';  // "black circle"

From c50cce298d602cbf2b8cd1b0dd4df838c4415d04 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 30 Jan 2019 15:42:59 -0600
Subject: [PATCH 0116/1732] Allow the omitted new line character to be more
 than one char

The code already allowed for variable width (multicell) *display* of the
newline omitted character, but there was no way to define it as being
more than one `wchar_t`.

This lets us use a string on console sessions (^J aka newline feed)
instead of an ambiguous character like `@` (used in some versions of
vim for ^M) or `~` (what we were using).
---
 src/common.cpp | 19 ++++++++++++++-----
 src/common.h   |  3 ++-
 src/screen.cpp |  6 +++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 11b1ff8d5..b50bcac37 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -70,7 +70,8 @@ static bool thread_asserts_cfg_for_testing = false;
 
 wchar_t ellipsis_char;
 const wchar_t *ellipsis_str = nullptr;
-wchar_t omitted_newline_char;
+const wchar_t *omitted_newline_str;
+int omitted_newline_width;
 wchar_t obfuscation_read_char;
 bool g_profiling_active = false;
 const wchar_t *program_name;
@@ -580,13 +581,21 @@ void fish_setlocale() {
     if (is_windows_subsystem_for_linux()) {
         // neither of \u23CE and \u25CF can be displayed in the default fonts on Windows, though
         // they can be *encoded* just fine. Use alternative glyphs.
-        omitted_newline_char = can_be_encoded(L'\u00b6') ? L'\u00b6' : L'~';   // "pilcrow"
-        obfuscation_read_char = can_be_encoded(L'\u2022') ? L'\u2022' : L'*';  // "bullet"
+        omitted_newline_str = L"\u00b6";   // "pilcrow"
+        omitted_newline_width = 1;
+        obfuscation_read_char = L'\u2022'; // "bullet"
     } else if (is_console_session()) {
-        omitted_newline_char = L'@';
+        omitted_newline_str = L"^J";
+        omitted_newline_width = 2;
         obfuscation_read_char = L'*';
     } else {
-        omitted_newline_char = can_be_encoded(L'\u23CE') ? L'\u23CE' : L'~';   // "return"
+        if (can_be_encoded(L'\u23CE')) {
+            omitted_newline_str = L"\u23CE";
+            omitted_newline_width = 1;
+        } else {
+            omitted_newline_str = L"^J";
+            omitted_newline_width = 2;
+        }
         obfuscation_read_char = can_be_encoded(L'\u25CF') ? L'\u25CF' : L'#';  // "black circle"
     }
 }
diff --git a/src/common.h b/src/common.h
index 811901ad1..e84edaa50 100644
--- a/src/common.h
+++ b/src/common.h
@@ -201,7 +201,8 @@ extern wchar_t ellipsis_char;
 extern const wchar_t *ellipsis_str;
 
 /// Character representing an omitted newline at the end of text.
-extern wchar_t omitted_newline_char;
+extern const wchar_t *omitted_newline_str;
+extern int omitted_newline_width;
 
 /// Character used for the silent mode of the read command
 extern wchar_t obfuscation_read_char;
diff --git a/src/screen.cpp b/src/screen.cpp
index ae11033ab..bd34c94a1 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1102,7 +1102,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
 
         // Don't need to check for fish_wcwidth errors; this is done when setting up
         // omitted_newline_char in common.cpp.
-        int non_space_width = fish_wcwidth(omitted_newline_char);
+        int non_space_width = omitted_newline_width;
         // We do `>` rather than `>=` because the code below might require one extra space.
         if (screen_width > non_space_width) {
             bool justgrey = true;
@@ -1129,7 +1129,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
                 }
             }
 
-            abandon_line_string.push_back(omitted_newline_char);
+            abandon_line_string.append(omitted_newline_str);
 
             if (cur_term && exit_attribute_mode) {
                 abandon_line_string.append(
@@ -1141,7 +1141,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
         }
 
         abandon_line_string.push_back(L'\r');
-        abandon_line_string.push_back(omitted_newline_char);
+        abandon_line_string.append(omitted_newline_str);
         // Now we are certainly on a new line. But we may have dropped the omitted newline char on
         // it. So append enough spaces to overwrite the omitted newline char, and then clear all the
         // spaces from the new line.

From a1cba81d13c94479611b761f877a33f201d6bf4d Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 20 Mar 2019 21:13:27 -0500
Subject: [PATCH 0117/1732] Add note about console session improvements to
 CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a476b3fb9..8311bbfde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
 - Pasting will now strip leading spaces if they would trigger history ignoring (#4327).
 - New color options for the pager have been added (#5524).
+- Better detection and support for using fish from the system console, where limited colors and special characters are supported (#5552 and others)
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
 - The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)

From 277a94c118ff2f432b3fa0486d6ddc4e2a41e060 Mon Sep 17 00:00:00 2001
From: GReagle <GReagle@users.noreply.github.com>
Date: Thu, 21 Mar 2019 05:24:08 -0400
Subject: [PATCH 0118/1732] FAQ: how to check whether variable is defined or
 not empty (#5732)

* FAQ: how to check whether variable is defined or not empty

* FAQ: how to check whether variable is not empty: include test in answer
---
 sphinx_doc_src/faq.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index cb1eafa99..7f5871b49 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -112,6 +112,34 @@ You can also declare a local variable in a block::
     end
 
 
+How do I check whether a variable is defined?
+---------------------------------------------
+
+Use ``set -q var``.  For example, ``if set -q var; echo variable defined; end``.  To check multiple variables you can combine with ``and`` and ``or`` like so::
+
+    if set -q var1; or set -q var2
+        echo either variable defined
+    end
+
+Keep in mind that a defined variabled could be empty. Both of these commands define an empty variable: ``set var`` and ``set var ""``.
+
+
+How do I check whether a variable is not empty?
+-----------------------------------------------
+
+Use ``string length -q -- $var``.  For example, ``if string length -q -- $var; echo not empty; end``.  Note that ``string length`` will interpret a list of multiple variables as a disjunction (meaning any/or)::
+
+    if string length -q -- $var1 $var2 $var3
+        echo at least one of these variables is not empty
+    end
+
+Alternatively, use ``test -n "$var"``, but remember that **the variable must be double-quoted**.  For example, ``if test -n "$var"; echo not empty; end``. The ``test`` command provides its own and (-a) and or (-o)::
+
+    if test -n "$var1" -o -n "$var2" -o -n "$var3"
+        echo at least one of these variables is not empty
+    end
+
+
 Why doesn't ``set -Ux`` (exported universal variables) seem to work?
 --------------------------------------------------------------------
 A global variable of the same name already exists.

From 21c8be8cd1a2c430c53740eabf2f689841b76cdd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 22 Mar 2019 09:09:16 +0100
Subject: [PATCH 0119/1732] functions/help: Use open command everywhere

See #5756.

[ci skip]
---
 share/functions/help.fish | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index e42ad81b7..d1e724377 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -65,12 +65,11 @@ function help --description 'Show help for the fish shell'
                 set fish_browser xdg-open
             end
 
-            # On OS X, we go through open by default
-            if test (uname) = Darwin
-                if type -q open
-                    set fish_browser open
-                    set need_trampoline 1
-                end
+            # If we have an open _command_ we use it - otherwise it's our function,
+            # which might not have a backend to use.
+            if command -sq open
+                set fish_browser open
+                set need_trampoline 1
             end
         end
     end

From 4c61691377a33a2f36a78cb041e336b253769669 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 22 Mar 2019 12:38:23 +0100
Subject: [PATCH 0120/1732] functions/help: Don't eval to check for lynx

This called `eval $fish_browser --version` to figure out if it is
lynx.

That's really not worth it just to support edge-cases using a rather
unusual browser, to work around a bug in it.

Instead we just see if the browser name starts with "lynx", which
should work in 99.9% of cases.
---
 share/functions/help.fish | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index d1e724377..692d7ad0b 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -168,8 +168,7 @@ function help --description 'Show help for the fish shell'
     else
         # Work around lynx bug where <div class="contents"> always has the same formatting as links (unreadable)
         # by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170
-        set -l local_file 0
-        if eval $fish_browser --version 2>/dev/null | string match -qr Lynx
+        if string match -q 'lynx*' -- $fish_browser
             set fish_browser $fish_browser -lss={$__fish_data_dir}/lynx.lss
         end
         eval $fish_browser $page_url

From 25ba16d4b6db690fd4248e88176479768ee7dcbd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 22 Mar 2019 12:40:39 +0100
Subject: [PATCH 0121/1732] functions/help: Cleanup

---
 share/functions/help.fish | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 692d7ad0b..977818ed7 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -15,30 +15,28 @@ function help --description 'Show help for the fish shell'
     set -a help_topics expand-command-substitution expand-process
 
     #
-    # Find a suitable browser for viewing the help pages. This is needed
-    # by the help function defined below.
-    #
-    set -l fish_browser
-    set -l graphical_browsers htmlview x-www-browser firefox galeon mozilla konqueror epiphany opera netscape rekonq google-chrome chromium-browser
+    # Find a suitable browser for viewing the help pages.
+    # The first thing we try is $fish_help_browser.
+    set -l fish_browser $fish_help_browser
+
+    # A list of graphical browsers we know about.
+    set -l graphical_browsers htmlview x-www-browser firefox galeon mozilla
+    set -a graphical_browsers konqueror epiphany opera netscape rekonq google-chrome chromium-browser
 
     # On mac we may have to write a temporary file that redirects to the desired
     # help page, since `open` will drop fragments from file URIs (issue #4480).
     set -l need_trampoline
 
-    if set -q fish_help_browser[1]
-        # User has set a fish-specific help browser. This overrides the
-        # browser that may be defined by $BROWSER. The fish_help_browser
-        # variable may be an array containing a browser name plus options.
-        set fish_browser $fish_help_browser
-    else
-        set -l text_browsers htmlview www-browser links elinks lynx w3m
-
+    if not set -q fish_browser[1]
         if set -q BROWSER
             # User has manually set a preferred browser, so we respect that
             set fish_browser $BROWSER
         else
+            # No browser set up, inferring.
+            # We check a bunch and use the last we find.
+
             # Check for a text-based browser.
-            for i in $text_browsers
+            for i in htmlview www-browser links elinks lynx w3m
                 if type -q -f $i
                     set fish_browser $i
                     break
@@ -47,7 +45,7 @@ function help --description 'Show help for the fish shell'
 
             # If we are in a graphical environment, check if there is a graphical
             # browser to use instead.
-            if test "$DISPLAY" -a \( "$XAUTHORITY" = "$HOME/.Xauthority" -o "$XAUTHORITY" = "" \)
+            if test -n "$DISPLAY" -a \( "$XAUTHORITY" = "$HOME/.Xauthority" -o "$XAUTHORITY" = "" \)
                 for i in $graphical_browsers
                     if type -q -f $i
                         set fish_browser $i
@@ -69,6 +67,7 @@ function help --description 'Show help for the fish shell'
             # which might not have a backend to use.
             if command -sq open
                 set fish_browser open
+                # The open command needs a trampoline because the macOS version can't handle #-fragments.
                 set need_trampoline 1
             end
         end

From 7a74198aa3cf88585eee879bd608df36fca12ced Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 16 Mar 2019 19:32:07 -0700
Subject: [PATCH 0122/1732] parser: try to avoid some strings being copied

---
 src/parse_execution.cpp | 4 +---
 src/parse_tree.cpp      | 2 +-
 src/parse_tree.h        | 2 +-
 src/parser.cpp          | 2 +-
 src/parser.h            | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 3d83c9035..c14aadd7f 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -734,8 +734,6 @@ parse_execution_result_t parse_execution_context_t::expand_command(
 
     // Get the unexpanded command string. We expect to always get it here.
     wcstring unexp_cmd = *command_for_plain_statement(statement, pstree->src);
-    wcstring cmd;
-    wcstring_list_t args;
 
     // Expand the string to produce completions, and report errors.
     expand_error_t expand_err =
@@ -879,7 +877,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     proc->type = process_type;
     proc->set_argv(cmd_args);
     proc->set_io_chain(process_io_chain);
-    proc->actual_cmd = path_to_external_command;
+    proc->actual_cmd = std::move(path_to_external_command);
     return parse_execution_success;
 }
 
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index cd7b35568..d2e3774af 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1135,7 +1135,7 @@ const parse_node_t *parse_node_tree_t::get_child(const parse_node_t &parent, nod
     return result;
 }
 
-parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_error_list_t *errors,
+parsed_source_ref_t parse_source(const wcstring &src, parse_tree_flags_t flags, parse_error_list_t *errors,
                                  parse_token_type_t goal) {
     parse_node_tree_t tree;
     if (!parse_tree_from_string(src, flags, &tree, errors, goal)) return {};
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 9e032f11d..8fc536131 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -233,7 +233,7 @@ struct parsed_source_t {
 };
 /// Return a shared pointer to parsed_source_t, or null on failure.
 using parsed_source_ref_t = std::shared_ptr<const parsed_source_t>;
-parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_error_list_t *errors,
+parsed_source_ref_t parse_source(const wcstring &src, parse_tree_flags_t flags, parse_error_list_t *errors,
                                  parse_token_type_t goal = symbol_job_list);
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index a8d30e0bf..572f9b5bb 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -629,7 +629,7 @@ profile_item_t *parser_t::create_profile_item() {
     return result;
 }
 
-int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type) {
+int parser_t::eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type) {
     // Parse the source into a tree, if we can.
     parse_error_list_t error_list;
     parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list);
diff --git a/src/parser.h b/src/parser.h
index ac251a4be..264b09cc8 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -222,7 +222,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// \param block_type The type of block to push on the block stack
     ///
     /// \return 0 on success, 1 on a parse error.
-    int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type);
+    int eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluate the parsed source ps.
     void eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);

From a2a9709fd93a2a23fa5f350e3dfc04a491bb0f25 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 23 Mar 2019 12:33:03 -0700
Subject: [PATCH 0123/1732] Don't truncate hostnames over 32 characters

I believe this was selected to be artificially low for the sake
of it displaying well in prompts. But people should expect to get
the same output as can be gotten from `hostname`.

Fixes #5758
---
 src/env_universal_common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 7a033f03c..5ab4ad7ad 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -926,7 +926,7 @@ void env_universal_t::parse_message_2x_internal(const wcstring &msgstr, var_tabl
 }
 
 /// Maximum length of hostname. Longer hostnames are truncated.
-#define HOSTNAME_LEN 32
+#define HOSTNAME_LEN 255
 
 /// Length of a MAC address.
 #define MAC_ADDRESS_MAX_LEN 6

From 185805641c5b10148598041ed40af5d74722889b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 15 Mar 2019 01:11:15 -0700
Subject: [PATCH 0124/1732] Remove R_TIMEOUT

Promote timeout to a char_event_type_t, moving it out of the "char" namespace.
This will help simplify the readline implementation.
---
 src/fish_key_reader.cpp |   5 +-
 src/fish_tests.cpp      |   9 ++-
 src/input.cpp           | 144 +++++++++++++++++++---------------------
 src/input.h             |   5 +-
 src/input_common.cpp    | 125 ++++++++++++++++++----------------
 src/input_common.h      |  57 +++++++++++++---
 src/reader.cpp          |  54 ++++++++++-----
 7 files changed, 234 insertions(+), 165 deletions(-)

diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index be845c63b..71e374fbb 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -208,9 +208,10 @@ static void process_input(bool continuous_mode) {
         if (reader_test_and_clear_interrupted()) {
             wc = shell_modes.c_cc[VINTR];
         } else {
-            wc = input_common_readch(true);
+            auto mwc = input_common_readch_timed(true);
+            wc = mwc.is_char() ? mwc.get_char() : R_EOF;
         }
-        if (wc == R_TIMEOUT || wc == R_EOF) {
+        if (wc == R_EOF) {
             output_bind_command(bind_chars);
             if (first_char_seen && !continuous_mode) {
                 return;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 364701fe0..151488367 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2996,9 +2996,12 @@ static void test_input() {
     }
 
     // Now test.
-    wint_t c = input_readch();
-    if (c != R_DOWN_LINE) {
-        err(L"Expected to read char R_DOWN_LINE, but instead got %ls\n", describe_char(c).c_str());
+    auto evt = input_readch();
+    if (!evt.is_char()) {
+        err(L"Event is not a char");
+    } else if (evt.get_char() != R_DOWN_LINE) {
+        err(L"Expected to read char R_DOWN_LINE, but instead got %ls\n",
+            describe_char(evt.get_char()).c_str());
     }
 }
 
diff --git a/src/input.cpp b/src/input.cpp
index 5cece3eeb..7a00faa11 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -51,6 +51,9 @@ struct input_mapping_t {
         static unsigned int s_last_input_map_spec_order = 0;
         specification_order = ++s_last_input_map_spec_order;
     }
+
+    /// \return true if this is a generic mapping, i.e. acts as a fallback.
+    bool is_generic() const { return seq.empty(); }
 };
 
 /// A struct representing the mapping from a terminfo key name to a terminfo character sequence.
@@ -297,17 +300,19 @@ wchar_t input_function_pop_arg() { return input_function_args[--input_function_a
 
 void input_function_push_args(int code) {
     int arity = input_function_arity(code);
-    std::vector<wchar_t> skipped;
+    std::vector<char_event_t> skipped;
 
     for (int i = 0; i < arity; i++) {
-        wchar_t arg;
-
         // Skip and queue up any function codes. See issue #2357.
-        while ((arg = input_common_readch(0)) >= R_BEGIN_INPUT_FUNCTIONS &&
-               arg < R_END_INPUT_FUNCTIONS) {
-            skipped.push_back(arg);
+        wchar_t arg{};
+        for (;;) {
+            auto evt = input_common_readch();
+            if (evt.is_char() && !evt.is_readline()) {
+                arg = evt.get_char();
+                break;
+            }
+            skipped.push_back(evt);
         }
-
         input_function_push_arg(arg);
     }
 
@@ -384,15 +389,13 @@ static bool input_mapping_is_match(const input_mapping_t &m) {
 
     bool timed = false;
     for (size_t i = 0; i < str.size(); ++i) {
-        wchar_t read = input_common_readch(timed);
-
-        if (read != str[i]) {
-            // We didn't match the bind sequence/input mapping, (it timed out or they entered something else)
-            // Undo consumption of the read characters since we didn't match the bind sequence and abort.
-            input_common_next_ch(read);
-            while (i--) {
-                input_common_next_ch(str[i]);
-            }
+        auto evt = timed ? input_common_readch_timed() : input_common_readch();
+        if (!evt.is_char() || evt.get_char() != str[i]) {
+            // We didn't match the bind sequence/input mapping, (it timed out or they entered
+            // something else) Undo consumption of the read characters since we didn't match the
+            // bind sequence and abort.
+            input_common_next_ch(evt);
+            while (i--) input_common_next_ch(str[i]);
             return false;
         }
 
@@ -404,87 +407,77 @@ static bool input_mapping_is_match(const input_mapping_t &m) {
     return true;
 }
 
-void input_queue_ch(wint_t ch) { input_common_queue_ch(ch); }
+void input_queue_ch(char_event_t ch) { input_common_queue_ch(ch); }
 
-static void input_mapping_execute_matching_or_generic(bool allow_commands) {
+/// \return the first mapping that matches, walking first over the user's mapping list, then the
+/// preset list. \return null if nothing matches.
+static const input_mapping_t *find_mapping() {
     const input_mapping_t *generic = NULL;
-
     const auto &vars = parser_t::principal_parser().vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
 
-    for (auto& m : mapping_list) {
-        if (m.mode != bind_mode) {
-            continue;
-        }
+    const auto lists = {&mapping_list, &preset_mapping_list};
+    for (const auto *listp : lists) {
+        for (const auto &m : *listp) {
+            if (m.mode != bind_mode) {
+                continue;
+            }
 
-        if (m.seq.length() == 0) {
-            generic = &m;
-        } else if (input_mapping_is_match(m)) {
-            input_mapping_execute(m, allow_commands);
-            return;
+            if (m.is_generic()) {
+                if (!generic) generic = &m;
+            } else if (input_mapping_is_match(m)) {
+                return &m;
+            }
         }
     }
+    return generic;
+}
 
-    // HACK: This is ugly duplication.
-    for (auto& m : preset_mapping_list) {
-        if (m.mode != bind_mode) {
-            continue;
-        }
-
-        if (m.seq.length() == 0) {
-            // Only use this generic if the user list didn't have one.
-            if (!generic) generic = &m;
-        } else if (input_mapping_is_match(m)) {
-            input_mapping_execute(m, allow_commands);
-            return;
-        }
-    }
-
-    if (generic) {
-        input_mapping_execute(*generic, allow_commands);
+static void input_mapping_execute_matching_or_generic(bool allow_commands) {
+    const input_mapping_t *mapping = find_mapping();
+    if (mapping) {
+        input_mapping_execute(*mapping, allow_commands);
     } else {
         debug(2, L"no generic found, ignoring char...");
-        wchar_t c = input_common_readch(0);
-        if (c == R_EOF) {
-            input_common_next_ch(c);
+        auto evt = input_common_readch();
+        if (evt.is_char() && evt.get_char() == R_EOF) {
+            input_common_next_ch(evt);
         }
     }
 }
 
 /// Helper function. Picks through the queue of incoming characters until we get to one that's not a
 /// readline function.
-static wchar_t input_read_characters_only() {
-    std::vector<wchar_t> functions_to_put_back;
-    wchar_t char_to_return;
+static char_event_t input_read_characters_only() {
+    std::vector<char_event_t> saved_events;
+    char_event_t char_to_return{0};
     for (;;) {
-        char_to_return = input_common_readch(0);
-        bool is_readline_function =
-            (char_to_return >= R_BEGIN_INPUT_FUNCTIONS && char_to_return < R_END_INPUT_FUNCTIONS);
-        // R_NULL and R_EOF are more control characters than readline functions, so check specially
-        // for those.
-        if (!is_readline_function || char_to_return == R_NULL || char_to_return == R_EOF) {
-            break;
+        auto evt = input_common_readch();
+        if (evt.is_char()) {
+            auto c = evt.get_char();
+            if (!evt.is_readline() || c == R_NULL || c == R_EOF) {
+                char_to_return = evt;
+                break;
+            }
         }
-        // This is a readline function; save it off for later re-enqueing and try again.
-        functions_to_put_back.push_back(char_to_return);
+        saved_events.push_back(evt);
     }
     // Restore any readline functions, in reverse to preserve their original order.
-    size_t idx = functions_to_put_back.size();
-    while (idx--) {
-        input_common_next_ch(functions_to_put_back.at(idx));
+    for (auto iter = saved_events.rbegin(); iter != saved_events.rend(); ++iter) {
+        input_common_next_ch(*iter);
     }
     return char_to_return;
 }
 
-wint_t input_readch(bool allow_commands) {
+char_event_t input_readch(bool allow_commands) {
     // Clear the interrupted flag.
     reader_reset_interrupted();
     // Search for sequence in mapping tables.
     while (true) {
-        wchar_t c = input_common_readch(0);
+        auto evt = input_common_readch();
 
-        if (c >= R_BEGIN_INPUT_FUNCTIONS && c < R_END_INPUT_FUNCTIONS) {
-            switch (c) {
+        if (evt.is_readline()) {
+            switch (evt.get_char()) {
                 case R_SELF_INSERT: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
@@ -494,21 +487,20 @@ wint_t input_readch(bool allow_commands) {
                     if (input_function_status) {
                         return input_readch();
                     }
-                    c = input_common_readch(0);
-                    while (c >= R_BEGIN_INPUT_FUNCTIONS && c < R_END_INPUT_FUNCTIONS) {
-                        c = input_common_readch(0);
-                    }
-                    input_common_next_ch(c);
+                    do {
+                        evt = input_common_readch();
+                    } while (evt.is_readline());
+                    input_common_next_ch(evt);
                     return input_readch();
                 }
-                default: { return c; }
+                default: { return evt; }
             }
-        } else if (c == R_EOF) {
+        } else if (evt.is_char() && evt.get_char() == R_EOF) {
             // If we have R_EOF, we need to immediately quit.
             // There's no need to go through the input functions.
-            return R_EOF;
+            return evt;
         } else {
-            input_common_next_ch(c);
+            input_common_next_ch(evt);
             input_mapping_execute_matching_or_generic(allow_commands);
             // Regarding allow_commands, we're in a loop, but if a fish command
             // is executed, R_NULL is unread, so the next pass through the loop
diff --git a/src/input.h b/src/input.h
index 3ae272239..fc20d24db 100644
--- a/src/input.h
+++ b/src/input.h
@@ -9,6 +9,7 @@
 
 #include "builtin_bind.h"
 #include "common.h"
+#include "input_common.h"
 
 #define FISH_BIND_MODE_VAR L"fish_bind_mode"
 
@@ -32,11 +33,11 @@ void init_input();
 /// The argument determines whether fish commands are allowed to be run as bindings. If false, when
 /// a character is encountered that would invoke a fish command, it is unread and R_NULL is
 /// returned.
-wint_t input_readch(bool allow_commands = true);
+char_event_t input_readch(bool allow_commands = true);
 
 /// Enqueue a character or a readline function to the queue of unread characters that input_readch
 /// will return before actually reading from fd 0.
-void input_queue_ch(wint_t ch);
+void input_queue_ch(char_event_t ch);
 
 /// Add a key mapping from the specified sequence to the specified command.
 ///
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 765a9d667..8706d8a19 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -33,8 +33,8 @@
 #define WAIT_ON_ESCAPE_DEFAULT 30
 static int wait_on_escape_ms = WAIT_ON_ESCAPE_DEFAULT;
 
-/// Characters that have been read and returned by the sequence matching code.
-static std::deque<wchar_t> lookahead_list;
+/// Events which have been read and returned by the sequence matching code.
+static std::deque<char_event_t> lookahead_list;
 
 // Queue of pairs of (function pointer, argument) to be invoked. Expected to be mostly empty.
 typedef std::list<std::function<void(void)>> callback_queue_t;
@@ -43,17 +43,24 @@ static void input_flush_callbacks();
 
 static bool has_lookahead() { return !lookahead_list.empty(); }
 
-static wint_t lookahead_pop() {
-    wint_t result = lookahead_list.front();
+static char_event_t lookahead_pop() {
+    auto result = lookahead_list.front();
     lookahead_list.pop_front();
     return result;
 }
 
-static void lookahead_push_back(wint_t c) { lookahead_list.push_back(c); }
+/// \return the next lookahead char, or none if none. Discards timeouts.
+static maybe_t<wchar_t> lookahead_pop_char() {
+    while (has_lookahead()) {
+        auto evt = lookahead_pop();
+        if (evt.is_char()) return evt.get_char();
+    }
+    return none();
+}
 
-static void lookahead_push_front(wint_t c) { lookahead_list.push_front(c); }
+static void lookahead_push_back(char_event_t c) { lookahead_list.push_back(c); }
 
-static wint_t lookahead_front() { return lookahead_list.front(); }
+static void lookahead_push_front(char_event_t c) { lookahead_list.push_front(c); }
 
 /// Callback function for handling interrupts on reading.
 static int (*interrupt_handler)();
@@ -109,7 +116,9 @@ static wint_t readb() {
                 if (interrupt_handler) {
                     int res = interrupt_handler();
                     if (res) return res;
-                    if (has_lookahead()) return lookahead_pop();
+                    if (auto mc = lookahead_pop_char()) {
+                        return *mc;
+                    }
                 }
 
                 do_loop = true;
@@ -133,8 +142,8 @@ static wint_t readb() {
 
             if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
                 iothread_service_completion();
-                if (has_lookahead()) {
-                    return lookahead_pop();
+                if (auto mc = lookahead_pop_char()) {
+                    return *mc;
                 }
             }
 
@@ -173,63 +182,65 @@ void update_wait_on_escape_ms(const environment_t &vars) {
     }
 }
 
-wchar_t input_common_readch(int timed) {
-    if (!has_lookahead()) {
-        if (timed) {
-            fd_set fds;
-            FD_ZERO(&fds);
-            FD_SET(0, &fds);
-            struct timeval tm = {wait_on_escape_ms / 1000, 1000 * (wait_on_escape_ms % 1000)};
-            int count = select(1, &fds, 0, 0, &tm);
-            if (count <= 0) {
-                return R_TIMEOUT;
-            }
+char_event_t input_common_readch() {
+    if (auto mc = lookahead_pop_char()) {
+        return *mc;
+    }
+    wchar_t res;
+    mbstate_t state = {};
+    while (1) {
+        wint_t b = readb();
+
+        if (b >= R_NULL && b < R_END_INPUT_FUNCTIONS) return b;
+
+        if (MB_CUR_MAX == 1) {
+            return b;  // single-byte locale, all values are legal
         }
 
-        wchar_t res;
-        mbstate_t state = {};
+        char bb = b;
+        size_t sz = std::mbrtowc(&res, &bb, 1, &state);
 
-        while (1) {
-            wint_t b = readb();
-
-            if (b >= R_NULL && b < R_END_INPUT_FUNCTIONS) return b;
-
-            if (MB_CUR_MAX == 1) {
-                // return (unsigned char)b;  // single-byte locale, all values are legal
-                return b;  // single-byte locale, all values are legal
+        switch (sz) {
+            case (size_t)(-1): {
+                std::memset(&state, '\0', sizeof(state));
+                debug(2, L"Illegal input");
+                return R_NULL;
             }
-
-            char bb = b;
-            size_t sz = std::mbrtowc(&res, &bb, 1, &state);
-
-            switch (sz) {
-                case (size_t)(-1): {
-                    std::memset(&state, '\0', sizeof(state));
-                    debug(2, L"Illegal input");
-                    return R_NULL;
-                }
-                case (size_t)(-2): {
-                    break;
-                }
-                case 0: {
-                    return 0;
-                }
-                default: { return res; }
+            case (size_t)(-2): {
+                break;
             }
+            case 0: {
+                return 0;
+            }
+            default: { return res; }
         }
-    } else {
-        if (!timed) {
-            while (has_lookahead() && lookahead_front() == R_TIMEOUT) lookahead_pop();
-            if (!has_lookahead()) return input_common_readch(0);
-        }
-
-        return lookahead_pop();
     }
 }
 
-void input_common_queue_ch(wint_t ch) { lookahead_push_back(ch); }
+char_event_t input_common_readch_timed(bool dequeue_timeouts) {
+    char_event_t result{char_event_type_t::timeout};
+    if (has_lookahead()) {
+        result = lookahead_pop();
+    } else {
+        fd_set fds;
+        FD_ZERO(&fds);
+        FD_SET(STDIN_FILENO, &fds);
+        struct timeval tm = {wait_on_escape_ms / 1000, 1000 * (wait_on_escape_ms % 1000)};
+        if (select(1, &fds, 0, 0, &tm) > 0) {
+            result = input_common_readch();
+        }
+    }
+    // If we got a timeout, either through dequeuing or creating, ensure it stays on the queue.
+    if (result.is_timeout()) {
+        if (!dequeue_timeouts) lookahead_push_front(char_event_type_t::timeout);
+        return char_event_type_t::timeout;
+    }
+    return result.get_char();
+}
 
-void input_common_next_ch(wint_t ch) { lookahead_push_front(ch); }
+void input_common_queue_ch(char_event_t ch) { lookahead_push_back(ch); }
+
+void input_common_next_ch(char_event_t ch) { lookahead_push_front(ch); }
 
 void input_common_add_callback(std::function<void(void)> callback) {
     ASSERT_IS_MAIN_THREAD();
diff --git a/src/input_common.h b/src/input_common.h
index 58d1ac6f6..a0427e665 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -7,6 +7,7 @@
 #include <functional>
 
 #include "common.h"
+#include "maybe.h"
 
 enum {
     R_MIN = INPUT_COMMON_BASE,
@@ -74,35 +75,75 @@ enum {
     R_REPEAT_JUMP,
     R_REVERSE_REPEAT_JUMP,
 
-    R_TIMEOUT,  // we didn't get interactive input within wait_on_escape_ms
-
     // The range of key codes for inputrc-style keyboard functions that are passed on to the caller
     // of input_read().
     R_BEGIN_INPUT_FUNCTIONS = R_BEGINNING_OF_LINE,
     R_END_INPUT_FUNCTIONS = R_REVERSE_REPEAT_JUMP + 1
 };
 
+/// Represents an event on the character input stream.
+enum class char_event_type_t {
+    /// A character was entered.
+    charc,
+
+    /// A timeout was hit.
+    timeout,
+};
+
+class char_event_t {
+    /// Set if the type is charc.
+    wchar_t c_;
+
+   public:
+    char_event_type_t type;
+
+    bool is_timeout() const { return type == char_event_type_t::timeout; }
+
+    bool is_char() const { return type == char_event_type_t::charc; }
+
+    bool is_readline() const {
+        return is_char() && c_ >= R_BEGIN_INPUT_FUNCTIONS && c_ < R_END_INPUT_FUNCTIONS;
+    }
+
+    wchar_t get_char() const {
+        assert(type == char_event_type_t::charc && "Not a char type");
+        return c_;
+    }
+
+    /* implicit */ char_event_t(wchar_t c) : c_(c), type(char_event_type_t::charc) {}
+
+    /* implicit */ char_event_t(char_event_type_t type) : c_(0), type(type) {
+        assert(type != char_event_type_t::charc &&
+               "Cannot create a char event with this constructor");
+    }
+};
+
 /// Init the library.
 void input_common_init(int (*ih)());
 
 /// Adjust the escape timeout.
+class environment_t;
 void update_wait_on_escape_ms(const environment_t &vars);
 
 /// Function used by input_readch to read bytes from stdin until enough bytes have been read to
 /// convert them to a wchar_t. Conversion is done using mbrtowc. If a character has previously been
-/// read and then 'unread' using \c input_common_unreadch, that character is returned. If timed is
-/// true, readch2 will wait at most WAIT_ON_ESCAPE milliseconds for a character to be available for
-/// reading before returning with the value R_EOF.
-wchar_t input_common_readch(int timed);
+/// read and then 'unread' using \c input_common_unreadch, that character is returned.
+/// This function never returns a timeout.
+char_event_t input_common_readch();
+
+/// Like input_common_readch(), except it will wait at most WAIT_ON_ESCAPE milliseconds for a
+/// character to be available for reading.
+/// If \p dequeue_timeouts is set, remove any timeout from the queue; otherwise retain them.
+char_event_t input_common_readch_timed(bool dequeue_timeouts = false);
 
 /// Enqueue a character or a readline function to the queue of unread characters that input_readch
 /// will return before actually reading from fd 0.
-void input_common_queue_ch(wint_t ch);
+void input_common_queue_ch(char_event_t ch);
 
 /// Add a character or a readline function to the front of the queue of unread characters.  This
 /// will be the first character returned by input_readch (unless this function is called more than
 /// once).
-void input_common_next_ch(wint_t ch);
+void input_common_next_ch(char_event_t ch);
 
 /// Adds a callback to be invoked at the next turn of the "event loop." The callback function will
 /// be invoked and passed arg.
diff --git a/src/reader.cpp b/src/reader.cpp
index 02c5a11bc..63b88ad36 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2382,8 +2382,14 @@ static bool text_ends_in_comment(const wcstring &text) {
     return token.type == TOK_COMMENT;
 }
 
+/// \return true if an event is a normal character that should be inserted into the buffer.
+static bool event_is_normal_char(const char_event_t &evt) {
+    if (!evt.is_char()) return false;
+    auto c = evt.get_char();
+    return !fish_reserved_codepoint(c) && c > 31 && c != 127;
+}
+
 maybe_t<wcstring> reader_data_t::readline(int nchars) {
-    wint_t c;
     int last_char = 0;
     size_t yank_len = 0;
     const wchar_t *yank_str;
@@ -2436,37 +2442,44 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         // Sometimes strange input sequences seem to generate a zero byte. I believe these simply
         // mean a character was pressed but it should be ignored. (Example: Trying to add a tilde
         // (~) to digit).
+        maybe_t<char_event_t> event_needing_handling{};
         while (1) {
             int was_interactive_read = is_interactive_read;
             is_interactive_read = 1;
-            c = input_readch();
+            event_needing_handling = input_readch();
             is_interactive_read = was_interactive_read;
             // std::fwprintf(stderr, L"C: %lx\n", (long)c);
 
-            if (((!fish_reserved_codepoint(c))) && (c > 31) && (c != 127) && can_read(0)) {
-                wchar_t arr[READAHEAD_MAX + 1];
-                size_t i;
+            if (event_is_normal_char(*event_needing_handling) && can_read(STDIN_FILENO)) {
+                // This is a normal character input.
+                // We are going to handle it directly, accumulating more.
+                // Clear 'mevt' to mark that we handled this.
+                char_event_t evt = event_needing_handling.acquire();
                 size_t limit = 0 < nchars ? std::min((size_t)nchars - command_line.size(),
                                                      (size_t)READAHEAD_MAX)
                                           : READAHEAD_MAX;
 
-                std::memset(arr, 0, sizeof(arr));
-                arr[0] = c;
+                wchar_t arr[READAHEAD_MAX + 1] = {};
+                arr[0] = evt.get_char();
+                last_char = arr[0];
 
-                for (i = 1; i < limit; ++i) {
+                for (size_t i = 1; i < limit; ++i) {
                     if (!can_read(0)) {
-                        c = 0;
                         break;
                     }
                     // Only allow commands on the first key; otherwise, we might have data we
                     // need to insert on the commandline that the commmand might need to be able
                     // to see.
-                    c = input_readch(false);
-                    if (!fish_reserved_codepoint(c) && c > 31 && c != 127) {
-                        arr[i] = c;
-                        c = 0;
-                    } else
+                    auto next_event = input_readch(false);
+                    if (event_is_normal_char(next_event)) {
+                        arr[i] = next_event.get_char();
+                        last_char = arr[i];
+                    } else {
+                        // We need to process this in the outer loop.
+                        assert(!event_needing_handling && "Should not have an unhandled event");
+                        event_needing_handling = next_event;
                         break;
+                    }
                 }
 
                 editable_line_t *el = active_edit_line();
@@ -2476,17 +2489,24 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 if (el == &command_line) {
                     clear_pager();
                 }
-                last_char = c;
             }
 
-            if (c != 0) break;
+            // If there's still an event that we were unable to handle, then end the coalescing
+            // loop.
+            if (event_needing_handling.has_value()) break;
 
             if (0 < nchars && (size_t)nchars <= command_line.size()) {
-                c = R_NULL;
+                event_needing_handling.reset();
                 break;
             }
         }
 
+        if (!event_needing_handling) {
+            event_needing_handling = R_NULL;
+        }
+        assert(event_needing_handling->is_char() && "Should have a char event");
+        wchar_t c = event_needing_handling->get_char();
+
         // If we get something other than a repaint, then stop coalescing them.
         if (c != R_REPAINT) coalescing_repaints = false;
 

From 00f24695fe0c4f301fa17708e97dd64837c08799 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 12:35:49 -0700
Subject: [PATCH 0125/1732] Remove R_EOF

Promote R_EOF to a new char_event_type_t instead of keeping it as a char
value.
---
 src/fish_key_reader.cpp | 10 +++++-----
 src/input.cpp           | 18 ++++++++++--------
 src/input_common.cpp    | 18 ++++++++++++------
 src/input_common.h      |  6 +++++-
 src/reader.cpp          |  7 +++----
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 71e374fbb..ba688b4e7 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -204,14 +204,13 @@ static void process_input(bool continuous_mode) {
 
     std::fwprintf(stderr, L"Press a key\n\n");
     while (keep_running) {
-        wchar_t wc;
+        char_event_t evt{0};
         if (reader_test_and_clear_interrupted()) {
-            wc = shell_modes.c_cc[VINTR];
+            evt = char_event_t{shell_modes.c_cc[VINTR]};
         } else {
-            auto mwc = input_common_readch_timed(true);
-            wc = mwc.is_char() ? mwc.get_char() : R_EOF;
+            evt = input_common_readch_timed(true);
         }
-        if (wc == R_EOF) {
+        if (!evt.is_char()) {
             output_bind_command(bind_chars);
             if (first_char_seen && !continuous_mode) {
                 return;
@@ -219,6 +218,7 @@ static void process_input(bool continuous_mode) {
             continue;
         }
 
+        wchar_t wc = evt.get_char();
         prev_tstamp = output_elapsed_time(prev_tstamp, first_char_seen);
         add_char_to_bind_command(wc, bind_chars);
         output_info_about_char(wc);
diff --git a/src/input.cpp b/src/input.cpp
index 7a00faa11..edcd02910 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -440,22 +440,24 @@ static void input_mapping_execute_matching_or_generic(bool allow_commands) {
     } else {
         debug(2, L"no generic found, ignoring char...");
         auto evt = input_common_readch();
-        if (evt.is_char() && evt.get_char() == R_EOF) {
+        if (evt.is_eof()) {
             input_common_next_ch(evt);
         }
     }
 }
 
 /// Helper function. Picks through the queue of incoming characters until we get to one that's not a
-/// readline function.
-static char_event_t input_read_characters_only() {
+/// readline function, or EOF.
+static char_event_t input_read_characters_eof_only() {
     std::vector<char_event_t> saved_events;
     char_event_t char_to_return{0};
     for (;;) {
         auto evt = input_common_readch();
-        if (evt.is_char()) {
+        if (evt.is_eof()) {
+            return evt;
+        } else if (evt.is_char()) {
             auto c = evt.get_char();
-            if (!evt.is_readline() || c == R_NULL || c == R_EOF) {
+            if (!evt.is_readline() || c == R_NULL) {
                 char_to_return = evt;
                 break;
             }
@@ -481,7 +483,7 @@ char_event_t input_readch(bool allow_commands) {
                 case R_SELF_INSERT: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
-                    return input_read_characters_only();
+                    return input_read_characters_eof_only();
                 }
                 case R_AND: {
                     if (input_function_status) {
@@ -495,8 +497,8 @@ char_event_t input_readch(bool allow_commands) {
                 }
                 default: { return evt; }
             }
-        } else if (evt.is_char() && evt.get_char() == R_EOF) {
-            // If we have R_EOF, we need to immediately quit.
+        } else if (evt.is_eof()) {
+            // If we have EOF, we need to immediately quit.
             // There's no need to go through the input functions.
             return evt;
         } else {
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 8706d8a19..c72ba8c7c 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -69,7 +69,8 @@ void input_common_init(int (*ih)()) { interrupt_handler = ih; }
 
 /// Internal function used by input_common_readch to read one byte from fd 0. This function should
 /// only be called by input_common_readch().
-static wint_t readb() {
+/// \return the char, or none() on EOF.
+static maybe_t<wint_t> readb() {
     // do_loop must be set on every path through the loop; leaving it uninitialized allows the
     // static analyzer to assist in catching mistakes.
     unsigned char arr[1];
@@ -123,8 +124,8 @@ static wint_t readb() {
 
                 do_loop = true;
             } else {
-                // The terminal has been closed. Save and exit.
-                return R_EOF;
+                // The terminal has been closed.
+                return none();
             }
         } else {
             // Assume we loop unless we see a character in stdin.
@@ -149,8 +150,8 @@ static wint_t readb() {
 
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
                 if (read_blocked(0, arr, 1) != 1) {
-                    // The teminal has been closed. Save and exit.
-                    return R_EOF;
+                    // The teminal has been closed.
+                    return none();
                 }
 
                 // We read from stdin, so don't loop.
@@ -189,7 +190,12 @@ char_event_t input_common_readch() {
     wchar_t res;
     mbstate_t state = {};
     while (1) {
-        wint_t b = readb();
+        auto mb = readb();
+        if (!mb) {
+            // EOF
+            return char_event_type_t::eof;
+        }
+        wint_t b = *mb;
 
         if (b >= R_NULL && b < R_END_INPUT_FUNCTIONS) return b;
 
diff --git a/src/input_common.h b/src/input_common.h
index a0427e665..1c8a2db6b 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -14,7 +14,6 @@ enum {
     // R_NULL is sometimes returned by the input when a character was requested but none could be
     // delivered, or when an exception happened.
     R_NULL = R_MIN,
-    R_EOF,
 
     R_BEGINNING_OF_LINE,
     R_END_OF_LINE,
@@ -88,6 +87,9 @@ enum class char_event_type_t {
 
     /// A timeout was hit.
     timeout,
+
+    /// end-of-file was reached.
+    eof
 };
 
 class char_event_t {
@@ -101,6 +103,8 @@ class char_event_t {
 
     bool is_char() const { return type == char_event_type_t::charc; }
 
+    bool is_eof() const { return type == char_event_type_t::eof; }
+
     bool is_readline() const {
         return is_char() && c_ >= R_BEGIN_INPUT_FUNCTIONS && c_ < R_END_INPUT_FUNCTIONS;
     }
diff --git a/src/reader.cpp b/src/reader.cpp
index 63b88ad36..bf2a871fb 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2503,6 +2503,9 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
         if (!event_needing_handling) {
             event_needing_handling = R_NULL;
+        } else if (event_needing_handling->is_eof()) {
+            reader_force_exit();
+            continue;
         }
         assert(event_needing_handling->is_char() && "Should have a char event");
         wchar_t c = event_needing_handling->get_char();
@@ -2577,10 +2580,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_EOF: {
-                reader_force_exit();
-                break;
-            }
             case R_COMPLETE:
             case R_COMPLETE_AND_SEARCH: {
                 if (!complete_func) break;

From 1e5c1c82c71abe98ffa4184ef474d635b3c4848a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 13:33:42 -0700
Subject: [PATCH 0126/1732] Rename and simplify input_read_characters_eof_only

Clarify its role.
---
 src/input.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index edcd02910..d784419dc 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -447,28 +447,24 @@ static void input_mapping_execute_matching_or_generic(bool allow_commands) {
 }
 
 /// Helper function. Picks through the queue of incoming characters until we get to one that's not a
-/// readline function, or EOF.
-static char_event_t input_read_characters_eof_only() {
+/// readline function.
+static char_event_t input_read_characters_no_readline() {
     std::vector<char_event_t> saved_events;
-    char_event_t char_to_return{0};
+    char_event_t evt_to_return{0};
     for (;;) {
         auto evt = input_common_readch();
-        if (evt.is_eof()) {
-            return evt;
-        } else if (evt.is_char()) {
-            auto c = evt.get_char();
-            if (!evt.is_readline() || c == R_NULL) {
-                char_to_return = evt;
-                break;
-            }
+        if (evt.is_readline()) {
+            saved_events.push_back(evt);
+        } else {
+            evt_to_return = evt;
+            break;
         }
-        saved_events.push_back(evt);
     }
     // Restore any readline functions, in reverse to preserve their original order.
     for (auto iter = saved_events.rbegin(); iter != saved_events.rend(); ++iter) {
         input_common_next_ch(*iter);
     }
-    return char_to_return;
+    return evt_to_return;
 }
 
 char_event_t input_readch(bool allow_commands) {
@@ -483,7 +479,7 @@ char_event_t input_readch(bool allow_commands) {
                 case R_SELF_INSERT: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
-                    return input_read_characters_eof_only();
+                    return input_read_characters_no_readline();
                 }
                 case R_AND: {
                     if (input_function_status) {

From 46dfad52d97289b95d8dcd7922cc5c206956de86 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 13:52:07 -0700
Subject: [PATCH 0127/1732] Switch the input interrupt function to return
 maybe_t

Allow returning none() to mean do nothing.
---
 src/input.cpp        |  8 ++++++--
 src/input_common.cpp | 10 +++++-----
 src/input_common.h   |  8 ++++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index d784419dc..a228a9e44 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -249,14 +249,18 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *command, const wc
 
 /// Handle interruptions to key reading by reaping finshed jobs and propagating the interrupt to the
 /// reader.
-static int interrupt_handler() {
+static maybe_t<int> interrupt_handler() {
     // Fire any pending events.
     event_fire_delayed();
     // Reap stray processes, including printing exit status messages.
     if (job_reap(true)) reader_repaint_needed();
     // Tell the reader an event occured.
     if (reader_reading_interrupted()) {
-        return shell_modes.c_cc[VINTR];
+        auto vintr = shell_modes.c_cc[VINTR];
+        if (vintr == 0) {
+            return none();
+        }
+        return vintr;
     }
 
     return R_NULL;
diff --git a/src/input_common.cpp b/src/input_common.cpp
index c72ba8c7c..526a5d9e6 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -63,9 +63,9 @@ static void lookahead_push_back(char_event_t c) { lookahead_list.push_back(c); }
 static void lookahead_push_front(char_event_t c) { lookahead_list.push_front(c); }
 
 /// Callback function for handling interrupts on reading.
-static int (*interrupt_handler)();
+static interrupt_func_t interrupt_handler;
 
-void input_common_init(int (*ih)()) { interrupt_handler = ih; }
+void input_common_init(interrupt_func_t func) { interrupt_handler = func; }
 
 /// Internal function used by input_common_readch to read one byte from fd 0. This function should
 /// only be called by input_common_readch().
@@ -115,9 +115,9 @@ static maybe_t<wint_t> readb() {
         if (res == -1) {
             if (errno == EINTR || errno == EAGAIN) {
                 if (interrupt_handler) {
-                    int res = interrupt_handler();
-                    if (res) return res;
-                    if (auto mc = lookahead_pop_char()) {
+                    if (auto interrupt_evt = interrupt_handler()) {
+                        return *interrupt_evt;
+                    } else if (auto mc = lookahead_pop_char()) {
                         return *mc;
                     }
                 }
diff --git a/src/input_common.h b/src/input_common.h
index 1c8a2db6b..81c857d5d 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -122,8 +122,12 @@ class char_event_t {
     }
 };
 
-/// Init the library.
-void input_common_init(int (*ih)());
+/// A type of function invoked on interrupt.
+/// \return the event which is to be returned to the reader loop, or none if VINTR is 0.
+using interrupt_func_t = maybe_t<int> (*)();
+
+/// Init the library with an interrupt function.
+void input_common_init(interrupt_func_t func);
 
 /// Adjust the escape timeout.
 class environment_t;

From 1ef2404e1ca61bc5c47a0693366e7c9cab1b1ca4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 14:08:00 -0700
Subject: [PATCH 0128/1732] readb to return char_event_t

Avoids some annoying type conversions.
---
 src/input_common.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index 526a5d9e6..f344232a1 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -69,8 +69,7 @@ void input_common_init(interrupt_func_t func) { interrupt_handler = func; }
 
 /// Internal function used by input_common_readch to read one byte from fd 0. This function should
 /// only be called by input_common_readch().
-/// \return the char, or none() on EOF.
-static maybe_t<wint_t> readb() {
+static char_event_t readb() {
     // do_loop must be set on every path through the loop; leaving it uninitialized allows the
     // static analyzer to assist in catching mistakes.
     unsigned char arr[1];
@@ -125,7 +124,7 @@ static maybe_t<wint_t> readb() {
                 do_loop = true;
             } else {
                 // The terminal has been closed.
-                return none();
+                return char_event_type_t::eof;
             }
         } else {
             // Assume we loop unless we see a character in stdin.
@@ -151,7 +150,7 @@ static maybe_t<wint_t> readb() {
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
                 if (read_blocked(0, arr, 1) != 1) {
                     // The teminal has been closed.
-                    return none();
+                    return char_event_type_t::eof;
                 }
 
                 // We read from stdin, so don't loop.
@@ -190,13 +189,12 @@ char_event_t input_common_readch() {
     wchar_t res;
     mbstate_t state = {};
     while (1) {
-        auto mb = readb();
-        if (!mb) {
-            // EOF
-            return char_event_type_t::eof;
+        auto evt = readb();
+        if (!evt.is_char() || evt.is_readline()) {
+            return evt;
         }
-        wint_t b = *mb;
 
+        wint_t b = evt.get_char();
         if (b >= R_NULL && b < R_END_INPUT_FUNCTIONS) return b;
 
         if (MB_CUR_MAX == 1) {

From 70a92a97101b40046f52d2adbf2f4747ef6cf353 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 14:45:36 -0700
Subject: [PATCH 0129/1732] Switch interrupt_handler to return
 maybe_t<char_event_t>

Prepares to remove R_NULL
---
 src/input.cpp      | 6 +++---
 src/input_common.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index a228a9e44..4687ef283 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -249,7 +249,7 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *command, const wc
 
 /// Handle interruptions to key reading by reaping finshed jobs and propagating the interrupt to the
 /// reader.
-static maybe_t<int> interrupt_handler() {
+static maybe_t<char_event_t> interrupt_handler() {
     // Fire any pending events.
     event_fire_delayed();
     // Reap stray processes, including printing exit status messages.
@@ -260,10 +260,10 @@ static maybe_t<int> interrupt_handler() {
         if (vintr == 0) {
             return none();
         }
-        return vintr;
+        return char_event_t{vintr};
     }
 
-    return R_NULL;
+    return char_event_t{R_NULL};
 }
 
 static std::atomic<bool> input_initialized{false};
diff --git a/src/input_common.h b/src/input_common.h
index 81c857d5d..2dc302383 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -124,7 +124,7 @@ class char_event_t {
 
 /// A type of function invoked on interrupt.
 /// \return the event which is to be returned to the reader loop, or none if VINTR is 0.
-using interrupt_func_t = maybe_t<int> (*)();
+using interrupt_func_t = maybe_t<char_event_t> (*)();
 
 /// Init the library with an interrupt function.
 void input_common_init(interrupt_func_t func);

From 28b79a2c8868430cf536a5a7d356ae33d9afb761 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 15:49:35 -0700
Subject: [PATCH 0130/1732] Some further steps towards removing R_NULL

Introduce char_event_type_t::check_exit to represent "check for exit"
instead of R_NULL.
---
 src/input.cpp        | 14 +++++++-------
 src/input.h          |  4 ++--
 src/input_common.cpp | 14 ++++++++------
 src/input_common.h   | 10 +++++++---
 src/reader.cpp       |  2 +-
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 4687ef283..f344694f3 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -348,12 +348,12 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
     }
 
     if (has_commands && !allow_commands) {
-        // We don't want to run commands yet. Put the characters back and return R_NULL.
+        // We don't want to run commands yet. Put the characters back and return check_exit.
         for (wcstring::const_reverse_iterator it = m.seq.rbegin(), end = m.seq.rend(); it != end;
              ++it) {
             input_common_next_ch(*it);
         }
-        input_common_next_ch(R_NULL);
+        input_common_next_ch(char_event_type_t::check_exit);
         return;  // skip the input_set_bind_mode
     } else if (has_functions && !has_commands) {
         // Functions are added at the head of the input queue.
@@ -374,11 +374,11 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
             parser_t::principal_parser().eval(cmd, io_chain_t(), TOP);
         }
         proc_set_last_statuses(std::move(last_statuses));
-        input_common_next_ch(R_NULL);
+        input_common_next_ch(char_event_type_t::check_exit);
     } else {
         // Invalid binding, mixed commands and functions.  We would need to execute these one by
         // one.
-        input_common_next_ch(R_NULL);
+        input_common_next_ch(char_event_type_t::check_exit);
     }
 
     // Empty bind mode indicates to not reset the mode (#2871)
@@ -504,9 +504,9 @@ char_event_t input_readch(bool allow_commands) {
         } else {
             input_common_next_ch(evt);
             input_mapping_execute_matching_or_generic(allow_commands);
-            // Regarding allow_commands, we're in a loop, but if a fish command
-            // is executed, R_NULL is unread, so the next pass through the loop
-            // we'll break out and return it.
+            // Regarding allow_commands, we're in a loop, but if a fish command is executed,
+            // check_exit is unread, so the next pass through the loop we'll break out and return
+            // it.
         }
     }
 }
diff --git a/src/input.h b/src/input.h
index fc20d24db..a5d582306 100644
--- a/src/input.h
+++ b/src/input.h
@@ -31,8 +31,8 @@ void init_input();
 /// key press, and is returned as such.
 ///
 /// The argument determines whether fish commands are allowed to be run as bindings. If false, when
-/// a character is encountered that would invoke a fish command, it is unread and R_NULL is
-/// returned.
+/// a character is encountered that would invoke a fish command, it is unread and
+/// char_event_type_t::check_exit is returned.
 char_event_t input_readch(bool allow_commands = true);
 
 /// Enqueue a character or a readline function to the queue of unread characters that input_readch
diff --git a/src/input_common.cpp b/src/input_common.cpp
index f344232a1..d71bbb91f 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -50,10 +50,12 @@ static char_event_t lookahead_pop() {
 }
 
 /// \return the next lookahead char, or none if none. Discards timeouts.
-static maybe_t<wchar_t> lookahead_pop_char() {
+static maybe_t<char_event_t> lookahead_pop_evt() {
     while (has_lookahead()) {
         auto evt = lookahead_pop();
-        if (evt.is_char()) return evt.get_char();
+        if (! evt.is_timeout()) {
+            return evt;
+        }
     }
     return none();
 }
@@ -116,7 +118,7 @@ static char_event_t readb() {
                 if (interrupt_handler) {
                     if (auto interrupt_evt = interrupt_handler()) {
                         return *interrupt_evt;
-                    } else if (auto mc = lookahead_pop_char()) {
+                    } else if (auto mc = lookahead_pop_evt()) {
                         return *mc;
                     }
                 }
@@ -142,7 +144,7 @@ static char_event_t readb() {
 
             if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
                 iothread_service_completion();
-                if (auto mc = lookahead_pop_char()) {
+                if (auto mc = lookahead_pop_evt()) {
                     return *mc;
                 }
             }
@@ -183,7 +185,7 @@ void update_wait_on_escape_ms(const environment_t &vars) {
 }
 
 char_event_t input_common_readch() {
-    if (auto mc = lookahead_pop_char()) {
+    if (auto mc = lookahead_pop_evt()) {
         return *mc;
     }
     wchar_t res;
@@ -208,7 +210,7 @@ char_event_t input_common_readch() {
             case (size_t)(-1): {
                 std::memset(&state, '\0', sizeof(state));
                 debug(2, L"Illegal input");
-                return R_NULL;
+                return char_event_type_t::check_exit;
             }
             case (size_t)(-2): {
                 break;
diff --git a/src/input_common.h b/src/input_common.h
index 2dc302383..51aa41f60 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -11,8 +11,6 @@
 
 enum {
     R_MIN = INPUT_COMMON_BASE,
-    // R_NULL is sometimes returned by the input when a character was requested but none could be
-    // delivered, or when an exception happened.
     R_NULL = R_MIN,
 
     R_BEGINNING_OF_LINE,
@@ -89,7 +87,11 @@ enum class char_event_type_t {
     timeout,
 
     /// end-of-file was reached.
-    eof
+    eof,
+
+    /// An event was handled internally, or an interrupt was received. Check to see if the reader
+    /// loop should exit.
+    check_exit,
 };
 
 class char_event_t {
@@ -105,6 +107,8 @@ class char_event_t {
 
     bool is_eof() const { return type == char_event_type_t::eof; }
 
+    bool is_check_exit() const { return type == char_event_type_t::check_exit; }
+
     bool is_readline() const {
         return is_char() && c_ >= R_BEGIN_INPUT_FUNCTIONS && c_ < R_END_INPUT_FUNCTIONS;
     }
diff --git a/src/reader.cpp b/src/reader.cpp
index bf2a871fb..19c455b44 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2501,7 +2501,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
             }
         }
 
-        if (!event_needing_handling) {
+        if (!event_needing_handling || event_needing_handling->is_check_exit()) {
             event_needing_handling = R_NULL;
         } else if (event_needing_handling->is_eof()) {
             reader_force_exit();

From 14663089c87f5acdd44acb90a0e21c3643887e79 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 15:56:37 -0700
Subject: [PATCH 0131/1732] Finish removing R_NULL

---
 src/input.cpp        | 2 +-
 src/input_common.cpp | 2 --
 src/input_common.h   | 3 +--
 src/reader.cpp       | 9 +++------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index f344694f3..4b183b80c 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -263,7 +263,7 @@ static maybe_t<char_event_t> interrupt_handler() {
         return char_event_t{vintr};
     }
 
-    return char_event_t{R_NULL};
+    return char_event_t{char_event_type_t::check_exit};
 }
 
 static std::atomic<bool> input_initialized{false};
diff --git a/src/input_common.cpp b/src/input_common.cpp
index d71bbb91f..29826459a 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -197,8 +197,6 @@ char_event_t input_common_readch() {
         }
 
         wint_t b = evt.get_char();
-        if (b >= R_NULL && b < R_END_INPUT_FUNCTIONS) return b;
-
         if (MB_CUR_MAX == 1) {
             return b;  // single-byte locale, all values are legal
         }
diff --git a/src/input_common.h b/src/input_common.h
index 51aa41f60..85db7b5c6 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -11,9 +11,8 @@
 
 enum {
     R_MIN = INPUT_COMMON_BASE,
-    R_NULL = R_MIN,
 
-    R_BEGINNING_OF_LINE,
+    R_BEGINNING_OF_LINE = R_MIN,
     R_END_OF_LINE,
     R_FORWARD_CHAR,
     R_BACKWARD_CHAR,
diff --git a/src/reader.cpp b/src/reader.cpp
index 19c455b44..b911f2a2f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1044,7 +1044,6 @@ static bool command_ends_paging(wchar_t c, bool focused_on_search_field) {
         case R_FORWARD_CHAR:
         case R_UP_LINE:
         case R_DOWN_LINE:
-        case R_NULL:
         case R_REPAINT:
         case R_SUPPRESS_AUTOSUGGESTION:
         case R_BEGINNING_OF_HISTORY:
@@ -2502,7 +2501,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         }
 
         if (!event_needing_handling || event_needing_handling->is_check_exit()) {
-            event_needing_handling = R_NULL;
+            repaint_if_needed();
+            continue;
         } else if (event_needing_handling->is_eof()) {
             reader_force_exit();
             continue;
@@ -2562,9 +2562,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_NULL: {
-                break;
-            }
             case R_CANCEL: {
                 // The only thing we can cancel right now is paging, which we handled up above.
                 break;
@@ -3267,7 +3264,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
         if ((c != R_HISTORY_SEARCH_BACKWARD) && (c != R_HISTORY_SEARCH_FORWARD) &&
             (c != R_HISTORY_TOKEN_SEARCH_BACKWARD) && (c != R_HISTORY_TOKEN_SEARCH_FORWARD) &&
-            (c != R_NULL) && (c != R_REPAINT) && (c != R_FORCE_REPAINT)) {
+            (c != R_REPAINT) && (c != R_FORCE_REPAINT)) {
             history_search.reset();
         }
 

From c2be5e8986ae7c2f5ffa155be0efea09629548a6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 16:48:23 -0700
Subject: [PATCH 0132/1732] Introduce char_event_type_t::readline

Baby steps towards eliminating readline actions as characters.
---
 src/fish_tests.cpp   |  8 ++++----
 src/input.cpp        |  4 ++--
 src/input_common.cpp |  4 ++--
 src/input_common.h   | 22 ++++++++++++++++------
 src/reader.cpp       |  6 ++++--
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 151488367..5ace2a730 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2997,11 +2997,11 @@ static void test_input() {
 
     // Now test.
     auto evt = input_readch();
-    if (!evt.is_char()) {
-        err(L"Event is not a char");
-    } else if (evt.get_char() != R_DOWN_LINE) {
+    if (!evt.is_readline()) {
+        err(L"Event is not a readline");
+    } else if (evt.get_readline() != R_DOWN_LINE) {
         err(L"Expected to read char R_DOWN_LINE, but instead got %ls\n",
-            describe_char(evt.get_char()).c_str());
+            describe_char(evt.get_readline()).c_str());
     }
 }
 
diff --git a/src/input.cpp b/src/input.cpp
index 4b183b80c..227620dd7 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -311,7 +311,7 @@ void input_function_push_args(int code) {
         wchar_t arg{};
         for (;;) {
             auto evt = input_common_readch();
-            if (evt.is_char() && !evt.is_readline()) {
+            if (evt.is_char()) {
                 arg = evt.get_char();
                 break;
             }
@@ -479,7 +479,7 @@ char_event_t input_readch(bool allow_commands) {
         auto evt = input_common_readch();
 
         if (evt.is_readline()) {
-            switch (evt.get_char()) {
+            switch (evt.get_readline()) {
                 case R_SELF_INSERT: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 29826459a..df3bbfcd1 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -192,7 +192,7 @@ char_event_t input_common_readch() {
     mbstate_t state = {};
     while (1) {
         auto evt = readb();
-        if (!evt.is_char() || evt.is_readline()) {
+        if (!evt.is_char()) {
             return evt;
         }
 
@@ -239,7 +239,7 @@ char_event_t input_common_readch_timed(bool dequeue_timeouts) {
         if (!dequeue_timeouts) lookahead_push_front(char_event_type_t::timeout);
         return char_event_type_t::timeout;
     }
-    return result.get_char();
+    return result;
 }
 
 void input_common_queue_ch(char_event_t ch) { lookahead_push_back(ch); }
diff --git a/src/input_common.h b/src/input_common.h
index 85db7b5c6..550143ce3 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -82,6 +82,9 @@ enum class char_event_type_t {
     /// A character was entered.
     charc,
 
+    /// A readline event.
+    readline,
+
     /// A timeout was hit.
     timeout,
 
@@ -94,7 +97,7 @@ enum class char_event_type_t {
 };
 
 class char_event_t {
-    /// Set if the type is charc.
+    /// Set if the type is charc or readline.
     wchar_t c_;
 
    public:
@@ -108,19 +111,26 @@ class char_event_t {
 
     bool is_check_exit() const { return type == char_event_type_t::check_exit; }
 
-    bool is_readline() const {
-        return is_char() && c_ >= R_BEGIN_INPUT_FUNCTIONS && c_ < R_END_INPUT_FUNCTIONS;
-    }
+    bool is_readline() const { return type == char_event_type_t::readline; }
 
     wchar_t get_char() const {
         assert(type == char_event_type_t::charc && "Not a char type");
         return c_;
     }
 
-    /* implicit */ char_event_t(wchar_t c) : c_(c), type(char_event_type_t::charc) {}
+    wchar_t get_readline() const {
+        assert(type == char_event_type_t::readline && "Not a readline type");
+        return c_;
+    }
+
+    /* implicit */ char_event_t(wchar_t c)
+        : c_(c),
+          type(R_BEGIN_INPUT_FUNCTIONS <= c && c < R_END_INPUT_FUNCTIONS
+                   ? char_event_type_t::readline
+                   : char_event_type_t::charc) {}
 
     /* implicit */ char_event_t(char_event_type_t type) : c_(0), type(type) {
-        assert(type != char_event_type_t::charc &&
+        assert(type != char_event_type_t::charc && type != char_event_type_t::readline &&
                "Cannot create a char event with this constructor");
     }
 };
diff --git a/src/reader.cpp b/src/reader.cpp
index b911f2a2f..d2b4ddbad 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2507,8 +2507,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
             reader_force_exit();
             continue;
         }
-        assert(event_needing_handling->is_char() && "Should have a char event");
-        wchar_t c = event_needing_handling->get_char();
+        assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) &&
+               "Should have a char or readline");
+        wchar_t c = event_needing_handling->is_char() ? event_needing_handling->get_char()
+                                                      : event_needing_handling->get_readline();
 
         // If we get something other than a repaint, then stop coalescing them.
         if (c != R_REPAINT) coalescing_repaints = false;

From b68d3b84de2210862e5900383521a2d4845e4e46 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 17:05:33 -0700
Subject: [PATCH 0133/1732] Switch input_function_get_code() to return maybe_t

---
 src/builtin_commandline.cpp | 5 ++---
 src/input.cpp               | 8 ++++----
 src/input.h                 | 3 +--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 5f7c27a16..a4fb80f46 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -325,11 +325,10 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
         }
 
         for (i = w.woptind; i < argc; i++) {
-            wchar_t c = input_function_get_code(argv[i]);
-            if (c != INPUT_CODE_NONE) {
+            if (auto mc = input_function_get_code(argv[i])) {
                 // input_unreadch inserts the specified keypress or readline function at the back of
                 // the queue of unused keypresses.
-                input_queue_ch(c);
+                input_queue_ch(*mc);
             } else {
                 streams.err.append_format(_(L"%ls: Unknown input function '%ls'"), cmd, argv[i]);
                 builtin_print_help(parser, streams, cmd, streams.err);
diff --git a/src/input.cpp b/src/input.cpp
index 227620dd7..f68c5f179 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -335,7 +335,7 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
     bool has_commands = false, has_functions = false;
 
     for (const wcstring &cmd : m.commands) {
-        if (input_function_get_code(cmd) != INPUT_CODE_NONE)
+        if (input_function_get_code(cmd))
             has_functions = true;
         else
             has_commands = true;
@@ -360,7 +360,7 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
         for (wcstring_list_t::const_reverse_iterator it = m.commands.rbegin(),
                                                      end = m.commands.rend();
              it != end; ++it) {
-            wchar_t code = input_function_get_code(*it);
+            wchar_t code = input_function_get_code(*it).value();
             input_function_push_args(code);
             input_common_next_ch(code);
         }
@@ -794,11 +794,11 @@ wcstring_list_t input_function_get_names() {
     return result;
 }
 
-wchar_t input_function_get_code(const wcstring &name) {
+maybe_t<wchar_t> input_function_get_code(const wcstring &name) {
     for (const auto &md : input_function_metadata) {
         if (name == md.name) {
             return md.code;
         }
     }
-    return INPUT_CODE_NONE;
+    return none();
 }
diff --git a/src/input.h b/src/input.h
index a5d582306..bd3df452b 100644
--- a/src/input.h
+++ b/src/input.h
@@ -95,8 +95,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name);
 wcstring_list_t input_terminfo_get_names(bool skip_null);
 
 /// Returns the input function code for the given input function name.
-#define INPUT_CODE_NONE (wchar_t(-1))
-wchar_t input_function_get_code(const wcstring &name);
+maybe_t<wchar_t> input_function_get_code(const wcstring &name);
 
 /// Returns a list of all existing input function names.
 wcstring_list_t input_function_get_names(void);

From 08410724620d184416133108def8ccc3b3c16525 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 17:26:42 -0700
Subject: [PATCH 0134/1732] Minor cleanup of kill ring

---
 src/kill.cpp   | 19 ++++++++++---------
 src/kill.h     |  6 +++---
 src/reader.cpp |  9 ++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/kill.cpp b/src/kill.cpp
index b005ba824..89fa8124c 100644
--- a/src/kill.cpp
+++ b/src/kill.cpp
@@ -17,10 +17,11 @@
 typedef std::list<wcstring> kill_list_t;
 static kill_list_t kill_list;
 
-void kill_add(const wcstring &str) {
+void kill_add(wcstring str) {
     ASSERT_IS_MAIN_THREAD();
-    if (str.empty()) return;
-    kill_list.push_front(str);
+    if (!str.empty()) {
+        kill_list.push_front(std::move(str));
+    }
 }
 
 /// Remove first match for specified string from circular list.
@@ -35,19 +36,19 @@ void kill_replace(const wcstring &old, const wcstring &newv) {
     kill_add(newv);
 }
 
-const wchar_t *kill_yank_rotate() {
+wcstring kill_yank_rotate() {
     ASSERT_IS_MAIN_THREAD();
     // Move the first element to the end.
     if (kill_list.empty()) {
-        return NULL;
+        return {};
     }
     kill_list.splice(kill_list.end(), kill_list, kill_list.begin());
-    return kill_list.front().c_str();
+    return kill_list.front();
 }
 
-const wchar_t *kill_yank() {
+wcstring kill_yank() {
     if (kill_list.empty()) {
-        return L"";
+        return {};
     }
-    return kill_list.front().c_str();
+    return kill_list.front();
 }
diff --git a/src/kill.h b/src/kill.h
index e22fb57f6..8e959ca50 100644
--- a/src/kill.h
+++ b/src/kill.h
@@ -11,12 +11,12 @@
 void kill_replace(const wcstring &old, const wcstring &newv);
 
 /// Add a string to the top of the killring.
-void kill_add(const wcstring &str);
+void kill_add(wcstring str);
 
 /// Rotate the killring.
-const wchar_t *kill_yank_rotate();
+wcstring kill_yank_rotate();
 
 /// Paste from the killring.
-const wchar_t *kill_yank();
+wcstring kill_yank();
 
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index d2b4ddbad..f50c4bc5d 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2391,7 +2391,6 @@ static bool event_is_normal_char(const char_event_t &evt) {
 maybe_t<wcstring> reader_data_t::readline(int nchars) {
     int last_char = 0;
     size_t yank_len = 0;
-    const wchar_t *yank_str;
     bool comp_empty = true;
     std::vector<completion_t> comp;
     int finished = 0;
@@ -2746,18 +2745,18 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 break;
             }
             case R_YANK: {
-                yank_str = kill_yank();
+                wcstring yank_str = kill_yank();
                 insert_string(active_edit_line(), yank_str);
-                yank_len = std::wcslen(yank_str);
+                yank_len = yank_str.size();
                 break;
             }
             case R_YANK_POP: {
                 if (yank_len) {
                     for (size_t i = 0; i < yank_len; i++) remove_backward();
 
-                    yank_str = kill_yank_rotate();
+                    wcstring yank_str = kill_yank_rotate();
                     insert_string(active_edit_line(), yank_str);
-                    yank_len = std::wcslen(yank_str);
+                    yank_len = yank_str.size();
                 }
                 break;
             }

From 2c56e27d374e09f9b18e2aad13a1d873c7bcb223 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 16 Mar 2019 17:56:35 -0700
Subject: [PATCH 0135/1732] Switch readline commands to readline_cmd_t enum
 class

---
 src/fish_tests.cpp |   5 +-
 src/input.cpp      | 139 +++++++--------
 src/input.h        |   2 +-
 src/input_common.h |  44 ++---
 src/maybe.h        |   6 +
 src/reader.cpp     | 413 ++++++++++++++++++++++++---------------------
 6 files changed, 323 insertions(+), 286 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 5ace2a730..7d6a7109e 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2999,9 +2999,8 @@ static void test_input() {
     auto evt = input_readch();
     if (!evt.is_readline()) {
         err(L"Event is not a readline");
-    } else if (evt.get_readline() != R_DOWN_LINE) {
-        err(L"Expected to read char R_DOWN_LINE, but instead got %ls\n",
-            describe_char(evt.get_readline()).c_str());
+    } else if (evt.get_readline() != readline_cmd_t::R_DOWN_LINE) {
+        err(L"Expected to read char R_DOWN_LINE");
     }
 }
 
diff --git a/src/input.cpp b/src/input.cpp
index f68c5f179..860edb2b4 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -67,68 +67,69 @@ static constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS - R_BEGIN_I
 /// Input function metadata. This list should be kept in sync with the key code list in
 /// input_common.h.
 struct input_function_metadata_t {
-    wchar_t code;
+    readline_cmd_t code;
     const wchar_t *name;
 };
+
 static const input_function_metadata_t input_function_metadata[] = {
-    {R_BEGINNING_OF_LINE, L"beginning-of-line"},
-    {R_END_OF_LINE, L"end-of-line"},
-    {R_FORWARD_CHAR, L"forward-char"},
-    {R_BACKWARD_CHAR, L"backward-char"},
-    {R_FORWARD_WORD, L"forward-word"},
-    {R_BACKWARD_WORD, L"backward-word"},
-    {R_FORWARD_BIGWORD, L"forward-bigword"},
-    {R_BACKWARD_BIGWORD, L"backward-bigword"},
-    {R_HISTORY_SEARCH_BACKWARD, L"history-search-backward"},
-    {R_HISTORY_SEARCH_FORWARD, L"history-search-forward"},
-    {R_DELETE_CHAR, L"delete-char"},
-    {R_BACKWARD_DELETE_CHAR, L"backward-delete-char"},
-    {R_KILL_LINE, L"kill-line"},
-    {R_YANK, L"yank"},
-    {R_YANK_POP, L"yank-pop"},
-    {R_COMPLETE, L"complete"},
-    {R_COMPLETE_AND_SEARCH, L"complete-and-search"},
-    {R_PAGER_TOGGLE_SEARCH, L"pager-toggle-search"},
-    {R_BEGINNING_OF_HISTORY, L"beginning-of-history"},
-    {R_END_OF_HISTORY, L"end-of-history"},
-    {R_BACKWARD_KILL_LINE, L"backward-kill-line"},
-    {R_KILL_WHOLE_LINE, L"kill-whole-line"},
-    {R_KILL_WORD, L"kill-word"},
-    {R_KILL_BIGWORD, L"kill-bigword"},
-    {R_BACKWARD_KILL_WORD, L"backward-kill-word"},
-    {R_BACKWARD_KILL_PATH_COMPONENT, L"backward-kill-path-component"},
-    {R_BACKWARD_KILL_BIGWORD, L"backward-kill-bigword"},
-    {R_HISTORY_TOKEN_SEARCH_BACKWARD, L"history-token-search-backward"},
-    {R_HISTORY_TOKEN_SEARCH_FORWARD, L"history-token-search-forward"},
-    {R_SELF_INSERT, L"self-insert"},
-    {R_TRANSPOSE_CHARS, L"transpose-chars"},
-    {R_TRANSPOSE_WORDS, L"transpose-words"},
-    {R_UPCASE_WORD, L"upcase-word"},
-    {R_DOWNCASE_WORD, L"downcase-word"},
-    {R_CAPITALIZE_WORD, L"capitalize-word"},
-    {R_VI_ARG_DIGIT, L"vi-arg-digit"},
-    {R_VI_DELETE_TO, L"vi-delete-to"},
-    {R_EXECUTE, L"execute"},
-    {R_BEGINNING_OF_BUFFER, L"beginning-of-buffer"},
-    {R_END_OF_BUFFER, L"end-of-buffer"},
-    {R_REPAINT, L"repaint"},
-    {R_FORCE_REPAINT, L"force-repaint"},
-    {R_UP_LINE, L"up-line"},
-    {R_DOWN_LINE, L"down-line"},
-    {R_SUPPRESS_AUTOSUGGESTION, L"suppress-autosuggestion"},
-    {R_ACCEPT_AUTOSUGGESTION, L"accept-autosuggestion"},
-    {R_BEGIN_SELECTION, L"begin-selection"},
-    {R_SWAP_SELECTION_START_STOP, L"swap-selection-start-stop"},
-    {R_END_SELECTION, L"end-selection"},
-    {R_KILL_SELECTION, L"kill-selection"},
-    {R_FORWARD_JUMP, L"forward-jump"},
-    {R_BACKWARD_JUMP, L"backward-jump"},
-    {R_FORWARD_JUMP_TILL, L"forward-jump-till"},
-    {R_BACKWARD_JUMP_TILL, L"backward-jump-till"},
-    {R_REPEAT_JUMP, L"repeat-jump"},
-    {R_REVERSE_REPEAT_JUMP, L"repeat-jump-reverse"},
-    {R_AND, L"and"},
-    {R_CANCEL, L"cancel"}};
+    {readline_cmd_t::R_BEGINNING_OF_LINE, L"beginning-of-line"},
+    {readline_cmd_t::R_END_OF_LINE, L"end-of-line"},
+    {readline_cmd_t::R_FORWARD_CHAR, L"forward-char"},
+    {readline_cmd_t::R_BACKWARD_CHAR, L"backward-char"},
+    {readline_cmd_t::R_FORWARD_WORD, L"forward-word"},
+    {readline_cmd_t::R_BACKWARD_WORD, L"backward-word"},
+    {readline_cmd_t::R_FORWARD_BIGWORD, L"forward-bigword"},
+    {readline_cmd_t::R_BACKWARD_BIGWORD, L"backward-bigword"},
+    {readline_cmd_t::R_HISTORY_SEARCH_BACKWARD, L"history-search-backward"},
+    {readline_cmd_t::R_HISTORY_SEARCH_FORWARD, L"history-search-forward"},
+    {readline_cmd_t::R_DELETE_CHAR, L"delete-char"},
+    {readline_cmd_t::R_BACKWARD_DELETE_CHAR, L"backward-delete-char"},
+    {readline_cmd_t::R_KILL_LINE, L"kill-line"},
+    {readline_cmd_t::R_YANK, L"yank"},
+    {readline_cmd_t::R_YANK_POP, L"yank-pop"},
+    {readline_cmd_t::R_COMPLETE, L"complete"},
+    {readline_cmd_t::R_COMPLETE_AND_SEARCH, L"complete-and-search"},
+    {readline_cmd_t::R_PAGER_TOGGLE_SEARCH, L"pager-toggle-search"},
+    {readline_cmd_t::R_BEGINNING_OF_HISTORY, L"beginning-of-history"},
+    {readline_cmd_t::R_END_OF_HISTORY, L"end-of-history"},
+    {readline_cmd_t::R_BACKWARD_KILL_LINE, L"backward-kill-line"},
+    {readline_cmd_t::R_KILL_WHOLE_LINE, L"kill-whole-line"},
+    {readline_cmd_t::R_KILL_WORD, L"kill-word"},
+    {readline_cmd_t::R_KILL_BIGWORD, L"kill-bigword"},
+    {readline_cmd_t::R_BACKWARD_KILL_WORD, L"backward-kill-word"},
+    {readline_cmd_t::R_BACKWARD_KILL_PATH_COMPONENT, L"backward-kill-path-component"},
+    {readline_cmd_t::R_BACKWARD_KILL_BIGWORD, L"backward-kill-bigword"},
+    {readline_cmd_t::R_HISTORY_TOKEN_SEARCH_BACKWARD, L"history-token-search-backward"},
+    {readline_cmd_t::R_HISTORY_TOKEN_SEARCH_FORWARD, L"history-token-search-forward"},
+    {readline_cmd_t::R_SELF_INSERT, L"self-insert"},
+    {readline_cmd_t::R_TRANSPOSE_CHARS, L"transpose-chars"},
+    {readline_cmd_t::R_TRANSPOSE_WORDS, L"transpose-words"},
+    {readline_cmd_t::R_UPCASE_WORD, L"upcase-word"},
+    {readline_cmd_t::R_DOWNCASE_WORD, L"downcase-word"},
+    {readline_cmd_t::R_CAPITALIZE_WORD, L"capitalize-word"},
+    {readline_cmd_t::R_VI_ARG_DIGIT, L"vi-arg-digit"},
+    {readline_cmd_t::R_VI_DELETE_TO, L"vi-delete-to"},
+    {readline_cmd_t::R_EXECUTE, L"execute"},
+    {readline_cmd_t::R_BEGINNING_OF_BUFFER, L"beginning-of-buffer"},
+    {readline_cmd_t::R_END_OF_BUFFER, L"end-of-buffer"},
+    {readline_cmd_t::R_REPAINT, L"repaint"},
+    {readline_cmd_t::R_FORCE_REPAINT, L"force-repaint"},
+    {readline_cmd_t::R_UP_LINE, L"up-line"},
+    {readline_cmd_t::R_DOWN_LINE, L"down-line"},
+    {readline_cmd_t::R_SUPPRESS_AUTOSUGGESTION, L"suppress-autosuggestion"},
+    {readline_cmd_t::R_ACCEPT_AUTOSUGGESTION, L"accept-autosuggestion"},
+    {readline_cmd_t::R_BEGIN_SELECTION, L"begin-selection"},
+    {readline_cmd_t::R_SWAP_SELECTION_START_STOP, L"swap-selection-start-stop"},
+    {readline_cmd_t::R_END_SELECTION, L"end-selection"},
+    {readline_cmd_t::R_KILL_SELECTION, L"kill-selection"},
+    {readline_cmd_t::R_FORWARD_JUMP, L"forward-jump"},
+    {readline_cmd_t::R_BACKWARD_JUMP, L"backward-jump"},
+    {readline_cmd_t::R_FORWARD_JUMP_TILL, L"forward-jump-till"},
+    {readline_cmd_t::R_BACKWARD_JUMP_TILL, L"backward-jump-till"},
+    {readline_cmd_t::R_REPEAT_JUMP, L"repeat-jump"},
+    {readline_cmd_t::R_REVERSE_REPEAT_JUMP, L"repeat-jump-reverse"},
+    {readline_cmd_t::R_AND, L"and"},
+    {readline_cmd_t::R_CANCEL, L"cancel"}};
 
 static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0]) ==
                   input_function_count,
@@ -182,12 +183,12 @@ void input_set_bind_mode(const wcstring &bm) {
 }
 
 /// Returns the arity of a given input function.
-static int input_function_arity(int function) {
+static int input_function_arity(readline_cmd_t function) {
     switch (function) {
-        case R_FORWARD_JUMP:
-        case R_BACKWARD_JUMP:
-        case R_FORWARD_JUMP_TILL:
-        case R_BACKWARD_JUMP_TILL:
+        case readline_cmd_t::R_FORWARD_JUMP:
+        case readline_cmd_t::R_BACKWARD_JUMP:
+        case readline_cmd_t::R_FORWARD_JUMP_TILL:
+        case readline_cmd_t::R_BACKWARD_JUMP_TILL:
             return 1;
         default:
             return 0;
@@ -302,7 +303,7 @@ void input_function_push_arg(wchar_t arg) {
 
 wchar_t input_function_pop_arg() { return input_function_args[--input_function_args_index]; }
 
-void input_function_push_args(int code) {
+void input_function_push_args(readline_cmd_t code) {
     int arity = input_function_arity(code);
     std::vector<char_event_t> skipped;
 
@@ -360,7 +361,7 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
         for (wcstring_list_t::const_reverse_iterator it = m.commands.rbegin(),
                                                      end = m.commands.rend();
              it != end; ++it) {
-            wchar_t code = input_function_get_code(*it).value();
+            readline_cmd_t code = input_function_get_code(*it).value();
             input_function_push_args(code);
             input_common_next_ch(code);
         }
@@ -480,12 +481,12 @@ char_event_t input_readch(bool allow_commands) {
 
         if (evt.is_readline()) {
             switch (evt.get_readline()) {
-                case R_SELF_INSERT: {
+                case readline_cmd_t::R_SELF_INSERT: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
                     return input_read_characters_no_readline();
                 }
-                case R_AND: {
+                case readline_cmd_t::R_AND: {
                     if (input_function_status) {
                         return input_readch();
                     }
@@ -794,7 +795,7 @@ wcstring_list_t input_function_get_names() {
     return result;
 }
 
-maybe_t<wchar_t> input_function_get_code(const wcstring &name) {
+maybe_t<readline_cmd_t> input_function_get_code(const wcstring &name) {
     for (const auto &md : input_function_metadata) {
         if (name == md.name) {
             return md.code;
diff --git a/src/input.h b/src/input.h
index bd3df452b..f76cede6a 100644
--- a/src/input.h
+++ b/src/input.h
@@ -95,7 +95,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name);
 wcstring_list_t input_terminfo_get_names(bool skip_null);
 
 /// Returns the input function code for the given input function name.
-maybe_t<wchar_t> input_function_get_code(const wcstring &name);
+maybe_t<readline_cmd_t> input_function_get_code(const wcstring &name);
 
 /// Returns a list of all existing input function names.
 wcstring_list_t input_function_get_names(void);
diff --git a/src/input_common.h b/src/input_common.h
index 550143ce3..7bbf5bed7 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -9,10 +9,8 @@
 #include "common.h"
 #include "maybe.h"
 
-enum {
-    R_MIN = INPUT_COMMON_BASE,
-
-    R_BEGINNING_OF_LINE = R_MIN,
+enum class readline_cmd_t {
+    R_BEGINNING_OF_LINE = INPUT_COMMON_BASE,
     R_END_OF_LINE,
     R_FORWARD_CHAR,
     R_BACKWARD_CHAR,
@@ -70,15 +68,16 @@ enum {
     R_CANCEL,
     R_REPEAT_JUMP,
     R_REVERSE_REPEAT_JUMP,
+};
 
-    // The range of key codes for inputrc-style keyboard functions that are passed on to the caller
-    // of input_read().
-    R_BEGIN_INPUT_FUNCTIONS = R_BEGINNING_OF_LINE,
-    R_END_INPUT_FUNCTIONS = R_REVERSE_REPEAT_JUMP + 1
+// The range of key codes for inputrc-style keyboard functions.
+enum {
+    R_BEGIN_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::R_BEGINNING_OF_LINE),
+    R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::R_REVERSE_REPEAT_JUMP) + 1
 };
 
 /// Represents an event on the character input stream.
-enum class char_event_type_t {
+enum class char_event_type_t : uint8_t {
     /// A character was entered.
     charc,
 
@@ -97,8 +96,13 @@ enum class char_event_type_t {
 };
 
 class char_event_t {
-    /// Set if the type is charc or readline.
-    wchar_t c_;
+    union {
+        /// Set if the type is charc.
+        wchar_t c;
+
+        /// Set if the type is readline.
+        readline_cmd_t rl;
+    } v_{};
 
    public:
     char_event_type_t type;
@@ -115,21 +119,21 @@ class char_event_t {
 
     wchar_t get_char() const {
         assert(type == char_event_type_t::charc && "Not a char type");
-        return c_;
+        return v_.c;
     }
 
-    wchar_t get_readline() const {
+    readline_cmd_t get_readline() const {
         assert(type == char_event_type_t::readline && "Not a readline type");
-        return c_;
+        return v_.rl;
     }
 
-    /* implicit */ char_event_t(wchar_t c)
-        : c_(c),
-          type(R_BEGIN_INPUT_FUNCTIONS <= c && c < R_END_INPUT_FUNCTIONS
-                   ? char_event_type_t::readline
-                   : char_event_type_t::charc) {}
+    /* implicit */ char_event_t(wchar_t c) : type(char_event_type_t::charc) { v_.c = c; }
 
-    /* implicit */ char_event_t(char_event_type_t type) : c_(0), type(type) {
+    /* implicit */ char_event_t(readline_cmd_t rl) : type(char_event_type_t::readline) {
+        v_.rl = rl;
+    }
+
+    /* implicit */ char_event_t(char_event_type_t type) : type(type) {
         assert(type != char_event_type_t::charc && type != char_event_type_t::readline &&
                "Cannot create a char event with this constructor");
     }
diff --git a/src/maybe.h b/src/maybe.h
index a3e5cebda..b86b1c1ee 100644
--- a/src/maybe.h
+++ b/src/maybe.h
@@ -203,6 +203,12 @@ class maybe_t : private maybe_detail::conditionally_copyable_t<T> {
     }
 
     bool operator!=(const maybe_t &rhs) const { return !(*this == rhs); }
+
+    bool operator==(const T &rhs) const { return this->has_value() && this->value() == rhs; }
+
+    bool operator!=(const T &rhs) const { return !(*this == rhs); }
+
+    ~maybe_t() { reset(); }
 };
 
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index f50c4bc5d..8b663c2e7 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1027,67 +1027,83 @@ void reader_force_exit() {
 }
 
 /// Indicates if the given command char ends paging.
-static bool command_ends_paging(wchar_t c, bool focused_on_search_field) {
+static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field) {
+    using rl = readline_cmd_t;
     switch (c) {
-        case R_HISTORY_SEARCH_BACKWARD:
-        case R_HISTORY_SEARCH_FORWARD:
-        case R_HISTORY_TOKEN_SEARCH_BACKWARD:
-        case R_HISTORY_TOKEN_SEARCH_FORWARD:
-        case R_ACCEPT_AUTOSUGGESTION:
-        case R_CANCEL: {
+        case rl::R_HISTORY_SEARCH_BACKWARD:
+        case rl::R_HISTORY_SEARCH_FORWARD:
+        case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
+        case rl::R_HISTORY_TOKEN_SEARCH_FORWARD:
+        case rl::R_ACCEPT_AUTOSUGGESTION:
+        case rl::R_CANCEL: {
             // These commands always end paging.
             return true;
         }
-        case R_COMPLETE:
-        case R_COMPLETE_AND_SEARCH:
-        case R_BACKWARD_CHAR:
-        case R_FORWARD_CHAR:
-        case R_UP_LINE:
-        case R_DOWN_LINE:
-        case R_REPAINT:
-        case R_SUPPRESS_AUTOSUGGESTION:
-        case R_BEGINNING_OF_HISTORY:
-        case R_END_OF_HISTORY: {
+        case rl::R_COMPLETE:
+        case rl::R_COMPLETE_AND_SEARCH:
+        case rl::R_BACKWARD_CHAR:
+        case rl::R_FORWARD_CHAR:
+        case rl::R_UP_LINE:
+        case rl::R_DOWN_LINE:
+        case rl::R_REPAINT:
+        case rl::R_SUPPRESS_AUTOSUGGESTION:
+        case rl::R_BEGINNING_OF_HISTORY:
+        case rl::R_END_OF_HISTORY: {
             // These commands never end paging.
             return false;
         }
-        case R_EXECUTE: {
+        case rl::R_EXECUTE: {
             // R_EXECUTE does end paging, but only executes if it was not paging. So it's handled
             // specially.
             return false;
         }
-        case R_BEGINNING_OF_LINE:
-        case R_END_OF_LINE:
-        case R_FORWARD_WORD:
-        case R_BACKWARD_WORD:
-        case R_FORWARD_BIGWORD:
-        case R_BACKWARD_BIGWORD:
-        case R_DELETE_CHAR:
-        case R_BACKWARD_DELETE_CHAR:
-        case R_KILL_LINE:
-        case R_YANK:
-        case R_YANK_POP:
-        case R_BACKWARD_KILL_LINE:
-        case R_KILL_WHOLE_LINE:
-        case R_KILL_WORD:
-        case R_KILL_BIGWORD:
-        case R_BACKWARD_KILL_WORD:
-        case R_BACKWARD_KILL_PATH_COMPONENT:
-        case R_BACKWARD_KILL_BIGWORD:
-        case R_SELF_INSERT:
-        case R_TRANSPOSE_CHARS:
-        case R_TRANSPOSE_WORDS:
-        case R_UPCASE_WORD:
-        case R_DOWNCASE_WORD:
-        case R_CAPITALIZE_WORD:
-        case R_VI_ARG_DIGIT:
-        case R_VI_DELETE_TO:
-        case R_BEGINNING_OF_BUFFER:
-        case R_END_OF_BUFFER: {
+        case rl::R_BEGINNING_OF_LINE:
+        case rl::R_END_OF_LINE:
+        case rl::R_FORWARD_WORD:
+        case rl::R_BACKWARD_WORD:
+        case rl::R_FORWARD_BIGWORD:
+        case rl::R_BACKWARD_BIGWORD:
+        case rl::R_DELETE_CHAR:
+        case rl::R_BACKWARD_DELETE_CHAR:
+        case rl::R_KILL_LINE:
+        case rl::R_YANK:
+        case rl::R_YANK_POP:
+        case rl::R_BACKWARD_KILL_LINE:
+        case rl::R_KILL_WHOLE_LINE:
+        case rl::R_KILL_WORD:
+        case rl::R_KILL_BIGWORD:
+        case rl::R_BACKWARD_KILL_WORD:
+        case rl::R_BACKWARD_KILL_PATH_COMPONENT:
+        case rl::R_BACKWARD_KILL_BIGWORD:
+        case rl::R_SELF_INSERT:
+        case rl::R_TRANSPOSE_CHARS:
+        case rl::R_TRANSPOSE_WORDS:
+        case rl::R_UPCASE_WORD:
+        case rl::R_DOWNCASE_WORD:
+        case rl::R_CAPITALIZE_WORD:
+        case rl::R_VI_ARG_DIGIT:
+        case rl::R_VI_DELETE_TO:
+        case rl::R_BEGINNING_OF_BUFFER:
+        case rl::R_END_OF_BUFFER:
             // These commands operate on the search field if that's where the focus is.
             return !focused_on_search_field;
-        }
-        default: { return false; }
+        default:
+            return false;
+    }
+}
+
+/// Indicates if the given command ends the history search.
+static bool command_ends_history_search(readline_cmd_t c) {
+    switch (c) {
+        case readline_cmd_t::R_HISTORY_SEARCH_BACKWARD:
+        case readline_cmd_t::R_HISTORY_SEARCH_FORWARD:
+        case readline_cmd_t::R_HISTORY_TOKEN_SEARCH_BACKWARD:
+        case readline_cmd_t::R_HISTORY_TOKEN_SEARCH_FORWARD:
+        case readline_cmd_t::R_REPAINT:
+        case readline_cmd_t::R_FORCE_REPAINT:
+            return false;
+        default:
+            return true;
     }
 }
 
@@ -2389,7 +2405,8 @@ static bool event_is_normal_char(const char_event_t &evt) {
 }
 
 maybe_t<wcstring> reader_data_t::readline(int nchars) {
-    int last_char = 0;
+    using rl = readline_cmd_t;
+    maybe_t<readline_cmd_t> last_cmd{};
     size_t yank_len = 0;
     bool comp_empty = true;
     std::vector<completion_t> comp;
@@ -2459,7 +2476,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                 wchar_t arr[READAHEAD_MAX + 1] = {};
                 arr[0] = evt.get_char();
-                last_char = arr[0];
 
                 for (size_t i = 1; i < limit; ++i) {
                     if (!can_read(0)) {
@@ -2471,7 +2487,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     auto next_event = input_readch(false);
                     if (event_is_normal_char(next_event)) {
                         arr[i] = next_event.get_char();
-                        last_char = arr[i];
                     } else {
                         // We need to process this in the outer loop.
                         assert(!event_needing_handling && "Should not have an unhandled event");
@@ -2487,6 +2502,9 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 if (el == &command_line) {
                     clear_pager();
                 }
+
+                // Since we handled a normal character, we don't have a last command.
+                last_cmd.reset();
             }
 
             // If there's still an event that we were unable to handle, then end the coalescing
@@ -2508,29 +2526,38 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         }
         assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) &&
                "Should have a char or readline");
-        wchar_t c = event_needing_handling->is_char() ? event_needing_handling->get_char()
-                                                      : event_needing_handling->get_readline();
+        maybe_t<readline_cmd_t> readline_cmd{};
+        maybe_t<wchar_t> ordinary_char{};
+        if (event_needing_handling->is_readline()) {
+            readline_cmd = event_needing_handling->get_readline();
+        } else {
+            ordinary_char = event_needing_handling->get_char();
+        }
 
         // If we get something other than a repaint, then stop coalescing them.
-        if (c != R_REPAINT) coalescing_repaints = false;
+        if (readline_cmd != rl::R_REPAINT) coalescing_repaints = false;
 
-        if (last_char != R_YANK && last_char != R_YANK_POP) yank_len = 0;
+        if (last_cmd != rl::R_YANK && last_cmd != rl::R_YANK_POP) {
+            yank_len = 0;
+        }
 
         // Restore the text.
-        if (c == R_CANCEL && is_navigating_pager_contents()) {
-            set_command_line_and_position(&command_line, cycle_command_line, cycle_cursor_pos);
+        if (readline_cmd) {
+            if (*readline_cmd == rl::R_CANCEL && is_navigating_pager_contents()) {
+                set_command_line_and_position(&command_line, cycle_command_line, cycle_cursor_pos);
+            }
+
+            // Clear the pager if necessary.
+            bool focused_on_search_field = (active_edit_line() == &pager.search_field_line);
+            if (command_ends_paging(*readline_cmd, focused_on_search_field)) {
+                clear_pager();
+            }
         }
 
-        // Clear the pager if necessary.
-        bool focused_on_search_field = (active_edit_line() == &pager.search_field_line);
-        if (command_ends_paging(c, focused_on_search_field)) {
-            clear_pager();
-        }
-        // std::fwprintf(stderr, L"\n\nchar: %ls\n\n", describe_char(c).c_str());
-
+        readline_cmd_t c = readline_cmd ? *readline_cmd : static_cast<readline_cmd_t>(0);
         switch (c) {
             // Go to beginning of line.
-            case R_BEGINNING_OF_LINE: {
+            case rl::R_BEGINNING_OF_LINE: {
                 editable_line_t *el = active_edit_line();
                 while (el->position > 0 && el->text.at(el->position - 1) != L'\n') {
                     update_buff_pos(el, el->position - 1);
@@ -2539,7 +2566,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_END_OF_LINE: {
+            case rl::R_END_OF_LINE: {
                 editable_line_t *el = active_edit_line();
                 if (el->position < el->size()) {
                     const wchar_t *buff = el->text.c_str();
@@ -2553,22 +2580,22 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_BEGINNING_OF_BUFFER: {
+            case rl::R_BEGINNING_OF_BUFFER: {
                 update_buff_pos(&command_line, 0);
                 reader_repaint_needed();
                 break;
             }
-            case R_END_OF_BUFFER: {
+            case rl::R_END_OF_BUFFER: {
                 update_buff_pos(&command_line, command_line.size());
                 reader_repaint_needed();
                 break;
             }
-            case R_CANCEL: {
+            case rl::R_CANCEL: {
                 // The only thing we can cancel right now is paging, which we handled up above.
                 break;
             }
-            case R_FORCE_REPAINT:
-            case R_REPAINT: {
+            case rl::R_FORCE_REPAINT:
+            case rl::R_REPAINT: {
                 if (!coalescing_repaints) {
                     coalescing_repaints = true;
                     exec_prompt();
@@ -2578,21 +2605,21 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_COMPLETE:
-            case R_COMPLETE_AND_SEARCH: {
+            case rl::R_COMPLETE:
+            case rl::R_COMPLETE_AND_SEARCH: {
                 if (!complete_func) break;
 
                 // Use the command line only; it doesn't make sense to complete in any other line.
                 editable_line_t *el = &command_line;
-                if (is_navigating_pager_contents() || (!comp_empty && last_char == R_COMPLETE)) {
+                if (is_navigating_pager_contents() || (!comp_empty && last_cmd == rl::R_COMPLETE)) {
                     // The user typed R_COMPLETE more than once in a row. If we are not yet fully
                     // disclosed, then become so; otherwise cycle through our available completions.
                     if (current_page_rendering.remaining_to_disclose > 0) {
                         pager.set_fully_disclosed(true);
                         reader_repaint_needed();
                     } else {
-                        select_completion_in_direction(c == R_COMPLETE ? direction_next
-                                                                       : direction_prev);
+                        select_completion_in_direction(c == rl::R_COMPLETE ? direction_next
+                                                                           : direction_prev);
                     }
                 } else {
                     // Either the user hit tab only once, or we had no visible completion list.
@@ -2651,11 +2678,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     cycle_command_line = el->text;
                     cycle_cursor_pos = el->position;
 
-                    bool cont_after_prefix_insertion = (c == R_COMPLETE_AND_SEARCH);
+                    bool cont_after_prefix_insertion = (c == rl::R_COMPLETE_AND_SEARCH);
                     comp_empty = handle_completions(comp, cont_after_prefix_insertion);
 
                     // Show the search field if requested and if we printed a list of completions.
-                    if (c == R_COMPLETE_AND_SEARCH && !comp_empty && !pager.empty()) {
+                    if (c == rl::R_COMPLETE_AND_SEARCH && !comp_empty && !pager.empty()) {
                         pager.set_search_field_shown(true);
                         select_completion_in_direction(direction_next);
                         reader_repaint_needed();
@@ -2663,7 +2690,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_PAGER_TOGGLE_SEARCH: {
+            case rl::R_PAGER_TOGGLE_SEARCH: {
                 if (!pager.empty()) {
                     // Toggle search, and begin navigating if we are now searching.
                     bool sfs = pager.is_search_field_shown();
@@ -2676,7 +2703,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_KILL_LINE: {
+            case rl::R_KILL_LINE: {
                 editable_line_t *el = active_edit_line();
                 const wchar_t *buff = el->text.c_str();
                 const wchar_t *begin = &buff[el->position];
@@ -2688,11 +2715,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                 size_t len = end - begin;
                 if (len) {
-                    kill(el, begin - buff, len, KILL_APPEND, last_char != R_KILL_LINE);
+                    kill(el, begin - buff, len, KILL_APPEND, last_cmd != rl::R_KILL_LINE);
                 }
                 break;
             }
-            case R_BACKWARD_KILL_LINE: {
+            case rl::R_BACKWARD_KILL_LINE: {
                 editable_line_t *el = active_edit_line();
                 if (el->position <= 0) {
                     break;
@@ -2711,10 +2738,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 assert(end >= begin);
                 size_t len = std::max<size_t>(end - begin, 1);
                 begin = end - len;
-                kill(el, begin - buff, len, KILL_PREPEND, last_char != R_BACKWARD_KILL_LINE);
+                kill(el, begin - buff, len, KILL_PREPEND, last_cmd != rl::R_BACKWARD_KILL_LINE);
                 break;
             }
-            case R_KILL_WHOLE_LINE: {
+            case rl::R_KILL_WHOLE_LINE: {
                 // We match the emacs behavior here: "kills the entire line including the following
                 // newline".
                 editable_line_t *el = active_edit_line();
@@ -2740,17 +2767,17 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 assert(end >= begin);
 
                 if (end > begin) {
-                    kill(el, begin, end - begin, KILL_APPEND, last_char != R_KILL_WHOLE_LINE);
+                    kill(el, begin, end - begin, KILL_APPEND, last_cmd != rl::R_KILL_WHOLE_LINE);
                 }
                 break;
             }
-            case R_YANK: {
+            case rl::R_YANK: {
                 wcstring yank_str = kill_yank();
                 insert_string(active_edit_line(), yank_str);
                 yank_len = yank_str.size();
                 break;
             }
-            case R_YANK_POP: {
+            case rl::R_YANK_POP: {
                 if (yank_len) {
                     for (size_t i = 0; i < yank_len; i++) remove_backward();
 
@@ -2760,21 +2787,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            // Escape was pressed.
-            case L'\x1B': {
-                if (history_search.active()) {
-                    history_search.go_to_end();
-                    update_command_line_from_history_search();
-                    history_search.reset();
-                }
-                assert(!history_search.active());
-                break;
-            }
-            case R_BACKWARD_DELETE_CHAR: {
+            case rl::R_BACKWARD_DELETE_CHAR: {
                 remove_backward();
                 break;
             }
-            case R_DELETE_CHAR: {
+            case rl::R_DELETE_CHAR: {
                 // Remove the current character in the character buffer and on the screen using
                 // syntax highlighting, etc.
                 editable_line_t *el = active_edit_line();
@@ -2784,9 +2801,9 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            // Evaluate. If the current command is unfinished, or if the charater is escaped using a
-            // backslash, insert a newline.
-            case R_EXECUTE: {
+                // Evaluate. If the current command is unfinished, or if the charater is escaped
+                // using a backslash, insert a newline.
+            case rl::R_EXECUTE: {
                 // If the user hits return while navigating the pager, it only clears the pager.
                 if (is_navigating_pager_contents()) {
                     clear_pager();
@@ -2870,14 +2887,14 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 break;
             }
 
-            case R_HISTORY_SEARCH_BACKWARD:
-            case R_HISTORY_TOKEN_SEARCH_BACKWARD:
-            case R_HISTORY_SEARCH_FORWARD:
-            case R_HISTORY_TOKEN_SEARCH_FORWARD: {
+            case rl::R_HISTORY_SEARCH_BACKWARD:
+            case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
+            case rl::R_HISTORY_SEARCH_FORWARD:
+            case rl::R_HISTORY_TOKEN_SEARCH_FORWARD: {
                 if (history_search.is_at_end()) {
                     const editable_line_t *el = &command_line;
-                    bool by_token = (c == R_HISTORY_TOKEN_SEARCH_BACKWARD) ||
-                                    (c == R_HISTORY_TOKEN_SEARCH_FORWARD);
+                    bool by_token = (c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD) ||
+                                    (c == rl::R_HISTORY_TOKEN_SEARCH_FORWARD);
                     if (by_token) {
                         // Searching by token.
                         const wchar_t *begin, *end;
@@ -2904,16 +2921,16 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     }
                 }
                 if (history_search.active()) {
-                    history_search_direction_t dir =
-                        (c == R_HISTORY_SEARCH_BACKWARD || c == R_HISTORY_TOKEN_SEARCH_BACKWARD)
-                            ? history_search_direction_t::backward
-                            : history_search_direction_t::forward;
+                    history_search_direction_t dir = (c == rl::R_HISTORY_SEARCH_BACKWARD ||
+                                                      c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD)
+                                                         ? history_search_direction_t::backward
+                                                         : history_search_direction_t::forward;
                     history_search.move_in_direction(dir);
                     update_command_line_from_history_search();
                 }
                 break;
             }
-            case R_BACKWARD_CHAR: {
+            case rl::R_BACKWARD_CHAR: {
                 editable_line_t *el = active_edit_line();
                 if (is_navigating_pager_contents()) {
                     select_completion_in_direction(direction_west);
@@ -2923,7 +2940,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_FORWARD_CHAR: {
+            case rl::R_FORWARD_CHAR: {
                 editable_line_t *el = active_edit_line();
                 if (is_navigating_pager_contents()) {
                     select_completion_in_direction(direction_east);
@@ -2935,51 +2952,54 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_BACKWARD_KILL_WORD:
-            case R_BACKWARD_KILL_PATH_COMPONENT:
-            case R_BACKWARD_KILL_BIGWORD: {
+            case rl::R_BACKWARD_KILL_WORD:
+            case rl::R_BACKWARD_KILL_PATH_COMPONENT:
+            case rl::R_BACKWARD_KILL_BIGWORD: {
                 move_word_style_t style =
-                    (c == R_BACKWARD_KILL_BIGWORD
+                    (c == rl::R_BACKWARD_KILL_BIGWORD
                          ? move_word_style_whitespace
-                         : c == R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
-                                                               : move_word_style_punctuation);
+                         : c == rl::R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
+                                                                   : move_word_style_punctuation);
                 // Is this the same killring item as the last kill?
-                bool newv = (last_char != R_BACKWARD_KILL_WORD &&
-                             last_char != R_BACKWARD_KILL_PATH_COMPONENT &&
-                             last_char != R_BACKWARD_KILL_BIGWORD);
+                bool newv = (last_cmd != rl::R_BACKWARD_KILL_WORD &&
+                             last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
+                             last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
                 move_word(active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv);
                 break;
             }
-            case R_KILL_WORD:
-            case R_KILL_BIGWORD: {
-                // The "bigword" functions differ only in that they move to the next whitespace, not punctuation.
-                auto move_style = (c == R_KILL_WORD) ? move_word_style_punctuation : move_word_style_whitespace;
+            case rl::R_KILL_WORD:
+            case rl::R_KILL_BIGWORD: {
+                // The "bigword" functions differ only in that they move to the next whitespace, not
+                // punctuation.
+                auto move_style = (c == rl::R_KILL_WORD) ? move_word_style_punctuation
+                                                         : move_word_style_whitespace;
                 move_word(active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_style,
-                          last_char != c /* same kill item if same movement */);
+                          last_cmd != c /* same kill item if same movement */);
                 break;
             }
-            case R_BACKWARD_WORD:
-            case R_BACKWARD_BIGWORD: {
-                auto move_style = (c == R_BACKWARD_WORD) ? move_word_style_punctuation : move_word_style_whitespace;
+            case rl::R_BACKWARD_WORD:
+            case rl::R_BACKWARD_BIGWORD: {
+                auto move_style = (c == rl::R_BACKWARD_WORD) ? move_word_style_punctuation
+                                                             : move_word_style_whitespace;
                 move_word(active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_style,
                           false);
                 break;
             }
-            case R_FORWARD_WORD:
-            case R_FORWARD_BIGWORD: {
-                auto move_style = (c == R_FORWARD_WORD) ? move_word_style_punctuation : move_word_style_whitespace;
+            case rl::R_FORWARD_WORD:
+            case rl::R_FORWARD_BIGWORD: {
+                auto move_style = (c == rl::R_FORWARD_WORD) ? move_word_style_punctuation
+                                                            : move_word_style_whitespace;
                 editable_line_t *el = active_edit_line();
                 if (el->position < el->size()) {
-                    move_word(el, MOVE_DIR_RIGHT, false /* do not erase */,
-                              move_style, false);
+                    move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_style, false);
                 } else {
                     accept_autosuggestion(false, move_style);
                 }
                 break;
             }
-            case R_BEGINNING_OF_HISTORY:
-            case R_END_OF_HISTORY: {
-                bool up = (c == R_BEGINNING_OF_HISTORY);
+            case rl::R_BEGINNING_OF_HISTORY:
+            case rl::R_END_OF_HISTORY: {
+                bool up = (c == rl::R_BEGINNING_OF_HISTORY);
                 if (is_navigating_pager_contents()) {
                     select_completion_in_direction(up ? direction_page_north
                                                       : direction_page_south);
@@ -2993,12 +3013,12 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_UP_LINE:
-            case R_DOWN_LINE: {
+            case rl::R_UP_LINE:
+            case rl::R_DOWN_LINE: {
                 if (is_navigating_pager_contents()) {
                     // We are already navigating pager contents.
                     selection_direction_t direction;
-                    if (c == R_DOWN_LINE) {
+                    if (c == rl::R_DOWN_LINE) {
                         // Down arrow is always south.
                         direction = direction_south;
                     } else if (selection_is_at_top()) {
@@ -3013,15 +3033,15 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     select_completion_in_direction(direction);
                 } else if (!pager.empty()) {
                     // We pressed a direction with a non-empty pager, begin navigation.
-                    select_completion_in_direction(c == R_DOWN_LINE ? direction_south
-                                                                    : direction_north);
+                    select_completion_in_direction(c == rl::R_DOWN_LINE ? direction_south
+                                                                        : direction_north);
                 } else {
                     // Not navigating the pager contents.
                     editable_line_t *el = active_edit_line();
                     int line_old = parse_util_get_line_from_offset(el->text, el->position);
                     int line_new;
 
-                    if (c == R_UP_LINE)
+                    if (c == rl::R_UP_LINE)
                         line_new = line_old - 1;
                     else
                         line_new = line_old + 1;
@@ -3055,17 +3075,17 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_SUPPRESS_AUTOSUGGESTION: {
+            case rl::R_SUPPRESS_AUTOSUGGESTION: {
                 suppress_autosuggestion = true;
                 autosuggestion.clear();
                 reader_repaint_needed();
                 break;
             }
-            case R_ACCEPT_AUTOSUGGESTION: {
+            case rl::R_ACCEPT_AUTOSUGGESTION: {
                 accept_autosuggestion(true);
                 break;
             }
-            case R_TRANSPOSE_CHARS: {
+            case rl::R_TRANSPOSE_CHARS: {
                 editable_line_t *el = active_edit_line();
                 if (el->size() < 2) {
                     break;
@@ -3085,7 +3105,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_TRANSPOSE_WORDS: {
+            case rl::R_TRANSPOSE_WORDS: {
                 editable_line_t *el = active_edit_line();
                 size_t len = el->size();
                 const wchar_t *buff = el->text.c_str();
@@ -3126,9 +3146,9 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
                 break;
             }
-            case R_UPCASE_WORD:
-            case R_DOWNCASE_WORD:
-            case R_CAPITALIZE_WORD: {
+            case rl::R_UPCASE_WORD:
+            case rl::R_DOWNCASE_WORD:
+            case rl::R_CAPITALIZE_WORD: {
                 editable_line_t *el = active_edit_line();
                 // For capitalize_word, whether we've capitalized a character so far.
                 bool capitalized_first = false;
@@ -3142,10 +3162,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     // We always change the case; this decides whether we go uppercase (true) or
                     // lowercase (false).
                     bool make_uppercase;
-                    if (c == R_CAPITALIZE_WORD)
+                    if (c == rl::R_CAPITALIZE_WORD)
                         make_uppercase = !capitalized_first && iswalnum(chr);
                     else
-                        make_uppercase = (c == R_UPCASE_WORD);
+                        make_uppercase = (c == rl::R_UPCASE_WORD);
 
                     // Apply the operation and then record what we did.
                     if (make_uppercase)
@@ -3161,11 +3181,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_BEGIN_SELECTION:
-            case R_END_SELECTION: {
+            case rl::R_BEGIN_SELECTION:
+            case rl::R_END_SELECTION: {
                 sel_start_pos = command_line.position;
                 sel_stop_pos = command_line.position;
-                if (c == R_BEGIN_SELECTION) {
+                if (c == rl::R_BEGIN_SELECTION) {
                     sel_active = true;
                     sel_begin_pos = command_line.position;
                 } else {
@@ -3174,7 +3194,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                 break;
             }
-            case R_SWAP_SELECTION_START_STOP: {
+            case rl::R_SWAP_SELECTION_START_STOP: {
                 if (!sel_active) break;
                 size_t tmp = sel_begin_pos;
                 sel_begin_pos = command_line.position;
@@ -3183,22 +3203,24 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 update_buff_pos(el, tmp);
                 break;
             }
-            case R_KILL_SELECTION: {
-                bool newv = (last_char != R_KILL_SELECTION);
+            case rl::R_KILL_SELECTION: {
+                bool newv = (last_cmd != rl::R_KILL_SELECTION);
                 size_t start, len;
                 if (reader_get_selection(&start, &len)) {
                     kill(&command_line, start, len, KILL_APPEND, newv);
                 }
                 break;
             }
-            case R_FORWARD_JUMP:
-            case R_BACKWARD_JUMP:
-            case R_FORWARD_JUMP_TILL:
-            case R_BACKWARD_JUMP_TILL: {
-                auto direction = (c == R_FORWARD_JUMP || c == R_FORWARD_JUMP_TILL) ?
-                    jump_direction_t::forward : jump_direction_t::backward;
-                auto precision = (c == R_FORWARD_JUMP || c == R_BACKWARD_JUMP) ?
-                    jump_precision_t::to : jump_precision_t::till;
+            case rl::R_FORWARD_JUMP:
+            case rl::R_BACKWARD_JUMP:
+            case rl::R_FORWARD_JUMP_TILL:
+            case rl::R_BACKWARD_JUMP_TILL: {
+                auto direction = (c == rl::R_FORWARD_JUMP || c == rl::R_FORWARD_JUMP_TILL)
+                                     ? jump_direction_t::forward
+                                     : jump_direction_t::backward;
+                auto precision = (c == rl::R_FORWARD_JUMP || c == rl::R_BACKWARD_JUMP)
+                                     ? jump_precision_t::to
+                                     : jump_precision_t::till;
                 editable_line_t *el = active_edit_line();
                 wchar_t target = input_function_pop_arg();
                 bool success = jump(direction, precision, el, target);
@@ -3207,7 +3229,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_REPEAT_JUMP: {
+            case rl::R_REPEAT_JUMP: {
                 editable_line_t *el = active_edit_line();
                 bool success = false;
 
@@ -3219,7 +3241,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            case R_REVERSE_REPEAT_JUMP: {
+            case rl::R_REVERSE_REPEAT_JUMP: {
                 editable_line_t *el = active_edit_line();
                 bool success = false;
                 jump_direction_t original_dir, dir;
@@ -3241,36 +3263,41 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
-            default: {
-                // Other, if a normal character, we add it to the command.
-                if (!fish_reserved_codepoint(c) && (c >= L' ' || c == L'\n' || c == L'\r') &&
-                    c != 0x7F) {
-                    // Regular character.
-                    editable_line_t *el = active_edit_line();
-                    bool allow_expand_abbreviations = (el == &command_line);
-                    insert_char(active_edit_line(), c, allow_expand_abbreviations);
+        }
 
-                    // End paging upon inserting into the normal command line.
-                    if (el == &command_line) {
-                        clear_pager();
-                    }
-                } else {
-                    // This can happen if the user presses a control char we don't recognize. No
-                    // reason to report this to the user unless they've enabled debugging output.
-                    debug(2, _(L"Unknown key binding 0x%X"), c);
+        if (ordinary_char) {
+            wchar_t c = *ordinary_char;
+
+            if (c == L'\x1B') {
+                // Escape was pressed.
+                if (history_search.active()) {
+                    history_search.go_to_end();
+                    update_command_line_from_history_search();
+                    history_search.reset();
                 }
-                break;
+                assert(!history_search.active());
+            } else if (!fish_reserved_codepoint(c) && (c >= L' ' || c == L'\n' || c == L'\r') &&
+                       c != 0x7F) {
+                // Regular character.
+                editable_line_t *el = active_edit_line();
+                bool allow_expand_abbreviations = (el == &command_line);
+                insert_char(active_edit_line(), c, allow_expand_abbreviations);
+
+                // End paging upon inserting into the normal command line.
+                if (el == &command_line) {
+                    clear_pager();
+                }
+            } else {
+                // This can happen if the user presses a control char we don't recognize. No
+                // reason to report this to the user unless they've enabled debugging output.
+                debug(2, _(L"Unknown key binding 0x%X"), c);
             }
         }
 
-        if ((c != R_HISTORY_SEARCH_BACKWARD) && (c != R_HISTORY_SEARCH_FORWARD) &&
-            (c != R_HISTORY_TOKEN_SEARCH_BACKWARD) && (c != R_HISTORY_TOKEN_SEARCH_FORWARD) &&
-            (c != R_REPAINT) && (c != R_FORCE_REPAINT)) {
+        if (!readline_cmd || command_ends_history_search(*readline_cmd)) {
             history_search.reset();
         }
-
-        last_char = c;
-
+        last_cmd = readline_cmd;
         repaint_if_needed();
     }
 

From 6aba28ad3d098c7991d8698a3b11969d7e6ea526 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 17 Mar 2019 11:25:16 -0700
Subject: [PATCH 0136/1732] Add missing cases to readline loop

Handle all readline commands in our switch.
---
 src/reader.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/reader.cpp b/src/reader.cpp
index 8b663c2e7..769857847 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3263,6 +3263,19 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 reader_repaint_needed();
                 break;
             }
+
+                // Some commands should have been handled internally by input_readch().
+            case rl::R_SELF_INSERT: {
+                DIE("self-insert should have been handled by input_readch");
+            }
+            case rl::R_AND: {
+                DIE("self-insert should have been handled by input_readch");
+            }
+            case rl::R_VI_ARG_DIGIT:
+            case rl::R_VI_DELETE_TO: {
+                // TODO: what needs to happen with these?
+                break;
+            }
         }
 
         if (ordinary_char) {

From 7ae78650716e88b87c3e4f9abbc8031d3991574b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 17 Mar 2019 11:44:47 -0700
Subject: [PATCH 0137/1732] Factor reader_data_t::readline state into a new
 struct

Will help break up this monster.
---
 src/reader.cpp | 95 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 38 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 769857847..5ff59577b 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2404,19 +2404,35 @@ static bool event_is_normal_char(const char_event_t &evt) {
     return !fish_reserved_codepoint(c) && c > 31 && c != 127;
 }
 
+/// readline_loop_state_t encapsulates the state used in a readline loop.
+/// It is always stack allocated transient. This state should not be "publicly visible;" public
+/// state should be in reader_data_t.
+struct readline_loop_state_t {
+    /// The last command that was executed.
+    maybe_t<readline_cmd_t> last_cmd{};
+
+    /// If the last command was a yank, the length of yanking that occurred.
+    size_t yank_len{0};
+
+    /// If set, it means nothing has been inserted into the command line via completion machinery.
+    bool comp_empty{true};
+
+    /// List of completions.
+    std::vector<completion_t> comp;
+
+    /// Whether we are skipping redundant repaints.
+    bool coalescing_repaints = false;
+
+    /// Whether the loop has finished, due to reaching the character limit or through executing a
+    /// command.
+    bool finished{false};
+};
+
 maybe_t<wcstring> reader_data_t::readline(int nchars) {
     using rl = readline_cmd_t;
-    maybe_t<readline_cmd_t> last_cmd{};
-    size_t yank_len = 0;
-    bool comp_empty = true;
-    std::vector<completion_t> comp;
-    int finished = 0;
+    readline_loop_state_t rls{};
     struct termios old_modes;
 
-    // Coalesce redundant repaints. When we get a repaint, we set this to true, and skip repaints
-    // until we get something else.
-    bool coalescing_repaints = false;
-
     // The command line before completion.
     cycle_command_line.clear();
     cycle_cursor_pos = 0;
@@ -2433,6 +2449,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
     // Get the current terminal modes. These will be restored when the function returns.
     if (tcgetattr(STDIN_FILENO, &old_modes) == -1 && errno == EIO) redirect_tty_output();
+
     // Set the new modes.
     if (tcsetattr(0, TCSANOW, &shell_modes) == -1) {
         int err = errno;
@@ -2447,10 +2464,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         }
     }
 
-    while (!finished && !shell_is_exiting()) {
+    while (!rls.finished && !shell_is_exiting()) {
         if (0 < nchars && (size_t)nchars <= command_line.size()) {
             // We've already hit the specified character limit.
-            finished = 1;
+            rls.finished = true;
             break;
         }
 
@@ -2504,7 +2521,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 }
 
                 // Since we handled a normal character, we don't have a last command.
-                last_cmd.reset();
+                rls.last_cmd.reset();
             }
 
             // If there's still an event that we were unable to handle, then end the coalescing
@@ -2535,10 +2552,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         }
 
         // If we get something other than a repaint, then stop coalescing them.
-        if (readline_cmd != rl::R_REPAINT) coalescing_repaints = false;
+        if (readline_cmd != rl::R_REPAINT) rls.coalescing_repaints = false;
 
-        if (last_cmd != rl::R_YANK && last_cmd != rl::R_YANK_POP) {
-            yank_len = 0;
+        if (rls.last_cmd != rl::R_YANK && rls.last_cmd != rl::R_YANK_POP) {
+            rls.yank_len = 0;
         }
 
         // Restore the text.
@@ -2596,8 +2613,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
             }
             case rl::R_FORCE_REPAINT:
             case rl::R_REPAINT: {
-                if (!coalescing_repaints) {
-                    coalescing_repaints = true;
+                if (!rls.coalescing_repaints) {
+                    rls.coalescing_repaints = true;
                     exec_prompt();
                     s_reset(&screen, screen_reset_current_line_and_prompt);
                     screen_reset_needed = false;
@@ -2611,7 +2628,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                 // Use the command line only; it doesn't make sense to complete in any other line.
                 editable_line_t *el = &command_line;
-                if (is_navigating_pager_contents() || (!comp_empty && last_cmd == rl::R_COMPLETE)) {
+                if (is_navigating_pager_contents() ||
+                    (!rls.comp_empty && rls.last_cmd == rl::R_COMPLETE)) {
                     // The user typed R_COMPLETE more than once in a row. If we are not yet fully
                     // disclosed, then become so; otherwise cycle through our available completions.
                     if (current_page_rendering.remaining_to_disclose > 0) {
@@ -2633,7 +2651,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     const wchar_t *const buff = el->text.c_str();
 
                     // Clear the completion list.
-                    comp.clear();
+                    rls.comp.clear();
 
                     // Figure out the extent of the command substitution surrounding the cursor.
                     // This is because we only look at the current command substitution to form
@@ -2669,20 +2687,20 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
                                                       COMPLETION_REQUEST_DESCRIPTIONS |
                                                       COMPLETION_REQUEST_FUZZY_MATCH;
-                    complete_func(buffcpy, &comp, complete_flags, vars);
+                    complete_func(buffcpy, &rls.comp, complete_flags, vars);
 
                     // Munge our completions.
-                    completions_sort_and_prioritize(&comp);
+                    completions_sort_and_prioritize(&rls.comp);
 
                     // Record our cycle_command_line.
                     cycle_command_line = el->text;
                     cycle_cursor_pos = el->position;
 
                     bool cont_after_prefix_insertion = (c == rl::R_COMPLETE_AND_SEARCH);
-                    comp_empty = handle_completions(comp, cont_after_prefix_insertion);
+                    rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
 
                     // Show the search field if requested and if we printed a list of completions.
-                    if (c == rl::R_COMPLETE_AND_SEARCH && !comp_empty && !pager.empty()) {
+                    if (c == rl::R_COMPLETE_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
                         pager.set_search_field_shown(true);
                         select_completion_in_direction(direction_next);
                         reader_repaint_needed();
@@ -2715,7 +2733,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
 
                 size_t len = end - begin;
                 if (len) {
-                    kill(el, begin - buff, len, KILL_APPEND, last_cmd != rl::R_KILL_LINE);
+                    kill(el, begin - buff, len, KILL_APPEND, rls.last_cmd != rl::R_KILL_LINE);
                 }
                 break;
             }
@@ -2738,7 +2756,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 assert(end >= begin);
                 size_t len = std::max<size_t>(end - begin, 1);
                 begin = end - len;
-                kill(el, begin - buff, len, KILL_PREPEND, last_cmd != rl::R_BACKWARD_KILL_LINE);
+                kill(el, begin - buff, len, KILL_PREPEND, rls.last_cmd != rl::R_BACKWARD_KILL_LINE);
                 break;
             }
             case rl::R_KILL_WHOLE_LINE: {
@@ -2767,23 +2785,24 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 assert(end >= begin);
 
                 if (end > begin) {
-                    kill(el, begin, end - begin, KILL_APPEND, last_cmd != rl::R_KILL_WHOLE_LINE);
+                    kill(el, begin, end - begin, KILL_APPEND,
+                         rls.last_cmd != rl::R_KILL_WHOLE_LINE);
                 }
                 break;
             }
             case rl::R_YANK: {
                 wcstring yank_str = kill_yank();
                 insert_string(active_edit_line(), yank_str);
-                yank_len = yank_str.size();
+                rls.yank_len = yank_str.size();
                 break;
             }
             case rl::R_YANK_POP: {
-                if (yank_len) {
-                    for (size_t i = 0; i < yank_len; i++) remove_backward();
+                if (rls.yank_len) {
+                    for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
 
                     wcstring yank_str = kill_yank_rotate();
                     insert_string(active_edit_line(), yank_str);
-                    yank_len = yank_str.size();
+                    rls.yank_len = yank_str.size();
                 }
                 break;
             }
@@ -2871,7 +2890,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                     if (history != NULL && !el->empty() && el->text.at(0) != L' ') {
                         history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
                     }
-                    finished = 1;
+                    rls.finished = true;
                     update_buff_pos(&command_line, command_line.size());
                     repaint();
                 } else if (command_test_result == PARSER_TEST_INCOMPLETE) {
@@ -2961,9 +2980,9 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                          : c == rl::R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
                                                                    : move_word_style_punctuation);
                 // Is this the same killring item as the last kill?
-                bool newv = (last_cmd != rl::R_BACKWARD_KILL_WORD &&
-                             last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
-                             last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
+                bool newv = (rls.last_cmd != rl::R_BACKWARD_KILL_WORD &&
+                             rls.last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
+                             rls.last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
                 move_word(active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv);
                 break;
             }
@@ -2974,7 +2993,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 auto move_style = (c == rl::R_KILL_WORD) ? move_word_style_punctuation
                                                          : move_word_style_whitespace;
                 move_word(active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_style,
-                          last_cmd != c /* same kill item if same movement */);
+                          rls.last_cmd != c /* same kill item if same movement */);
                 break;
             }
             case rl::R_BACKWARD_WORD:
@@ -3204,7 +3223,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
                 break;
             }
             case rl::R_KILL_SELECTION: {
-                bool newv = (last_cmd != rl::R_KILL_SELECTION);
+                bool newv = (rls.last_cmd != rl::R_KILL_SELECTION);
                 size_t start, len;
                 if (reader_get_selection(&start, &len)) {
                     kill(&command_line, start, len, KILL_APPEND, newv);
@@ -3310,7 +3329,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         if (!readline_cmd || command_ends_history_search(*readline_cmd)) {
             history_search.reset();
         }
-        last_cmd = readline_cmd;
+        rls.last_cmd = readline_cmd;
         repaint_if_needed();
     }
 
@@ -3334,7 +3353,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
         outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset());
     }
 
-    return finished ? maybe_t<wcstring>{command_line.text} : none();
+    return rls.finished ? maybe_t<wcstring>{command_line.text} : none();
 }
 
 bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, editable_line_t *el,

From 42f4d2bd86c70e5c7ca87059ddd63a9ca00deb55 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 17 Mar 2019 23:37:46 -0700
Subject: [PATCH 0138/1732] Factor out the "read coalescing" part of
 reader_data_t::readline

---
 src/reader.cpp | 124 ++++++++++++++++++++++++++-----------------------
 1 file changed, 67 insertions(+), 57 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 5ff59577b..7d1668072 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -105,7 +105,7 @@
 /// The maximum number of characters to read from the keyboard without repainting. Note that this
 /// readahead will only occur if new characters are available for reading, fish will never block for
 /// more input without repainting.
-#define READAHEAD_MAX 256
+static constexpr size_t READAHEAD_MAX = 256;
 
 /// A mode for calling the reader_kill function. In this mode, the new string is appended to the
 /// current contents of the kill buffer.
@@ -316,6 +316,8 @@ struct highlight_result_t {
 
 }  // namespace
 
+struct readline_loop_state_t;
+
 /// A struct describing the state of the interactive reader. These states can be stacked, in case
 /// reader_readline() calls are nested. This happens when the 'read' builtin is used.
 class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
@@ -441,6 +443,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
                    bool newv);
 
     maybe_t<wcstring> readline(int nchars);
+    maybe_t<char_event_t> read_normal_chars(readline_loop_state_t &rls);
 
     void clear_pager();
     void select_completion_in_direction(enum selection_direction_t dir);
@@ -2426,13 +2429,72 @@ struct readline_loop_state_t {
     /// Whether the loop has finished, due to reaching the character limit or through executing a
     /// command.
     bool finished{false};
+
+    /// Maximum number of characters to read.
+    size_t nchars{std::numeric_limits<size_t>::max()};
 };
 
-maybe_t<wcstring> reader_data_t::readline(int nchars) {
+/// Read normal characters, inserting them into the command line.
+/// \return the next unhandled event.
+maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rls) {
+    int was_interactive_read = is_interactive_read;
+    is_interactive_read = 1;
+    maybe_t<char_event_t> event_needing_handling = input_readch();
+    is_interactive_read = was_interactive_read;
+
+    if (!event_is_normal_char(*event_needing_handling) || !can_read(STDIN_FILENO))
+        return event_needing_handling;
+
+    // This is a normal character input.
+    // We are going to handle it directly, accumulating more.
+    char_event_t evt = event_needing_handling.acquire();
+    size_t limit = std::min(rls.nchars - command_line.size(), READAHEAD_MAX);
+
+    wchar_t arr[READAHEAD_MAX + 1] = {};
+    arr[0] = evt.get_char();
+
+    for (size_t i = 1; i < limit; ++i) {
+        if (!can_read(0)) {
+            break;
+        }
+        // Only allow commands on the first key; otherwise, we might have data we
+        // need to insert on the commandline that the commmand might need to be able
+        // to see.
+        auto next_event = input_readch(false);
+        if (event_is_normal_char(next_event)) {
+            arr[i] = next_event.get_char();
+        } else {
+            // We need to process this in the outer loop.
+            assert(!event_needing_handling && "Should not have an unhandled event");
+            event_needing_handling = next_event;
+            break;
+        }
+    }
+
+    editable_line_t *el = active_edit_line();
+    insert_string(el, arr, true);
+
+    // End paging upon inserting into the normal command line.
+    if (el == &command_line) {
+        clear_pager();
+    }
+
+    // Since we handled a normal character, we don't have a last command.
+    rls.last_cmd.reset();
+    return event_needing_handling;
+}
+
+maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     using rl = readline_cmd_t;
     readline_loop_state_t rls{};
     struct termios old_modes;
 
+    // If nchars_or_0 is positive, then that's the maximum number of chars. Otherwise keep it at
+    // SIZE_MAX.
+    if (nchars_or_0 > 0) {
+        rls.nchars = static_cast<size_t>(nchars_or_0);
+    }
+
     // The command line before completion.
     cycle_command_line.clear();
     cycle_cursor_pos = 0;
@@ -2465,70 +2527,18 @@ maybe_t<wcstring> reader_data_t::readline(int nchars) {
     }
 
     while (!rls.finished && !shell_is_exiting()) {
-        if (0 < nchars && (size_t)nchars <= command_line.size()) {
+        if (rls.nchars <= command_line.size()) {
             // We've already hit the specified character limit.
             rls.finished = true;
             break;
         }
 
-        // Sometimes strange input sequences seem to generate a zero byte. I believe these simply
-        // mean a character was pressed but it should be ignored. (Example: Trying to add a tilde
-        // (~) to digit).
         maybe_t<char_event_t> event_needing_handling{};
         while (1) {
-            int was_interactive_read = is_interactive_read;
-            is_interactive_read = 1;
-            event_needing_handling = input_readch();
-            is_interactive_read = was_interactive_read;
-            // std::fwprintf(stderr, L"C: %lx\n", (long)c);
-
-            if (event_is_normal_char(*event_needing_handling) && can_read(STDIN_FILENO)) {
-                // This is a normal character input.
-                // We are going to handle it directly, accumulating more.
-                // Clear 'mevt' to mark that we handled this.
-                char_event_t evt = event_needing_handling.acquire();
-                size_t limit = 0 < nchars ? std::min((size_t)nchars - command_line.size(),
-                                                     (size_t)READAHEAD_MAX)
-                                          : READAHEAD_MAX;
-
-                wchar_t arr[READAHEAD_MAX + 1] = {};
-                arr[0] = evt.get_char();
-
-                for (size_t i = 1; i < limit; ++i) {
-                    if (!can_read(0)) {
-                        break;
-                    }
-                    // Only allow commands on the first key; otherwise, we might have data we
-                    // need to insert on the commandline that the commmand might need to be able
-                    // to see.
-                    auto next_event = input_readch(false);
-                    if (event_is_normal_char(next_event)) {
-                        arr[i] = next_event.get_char();
-                    } else {
-                        // We need to process this in the outer loop.
-                        assert(!event_needing_handling && "Should not have an unhandled event");
-                        event_needing_handling = next_event;
-                        break;
-                    }
-                }
-
-                editable_line_t *el = active_edit_line();
-                insert_string(el, arr, true);
-
-                // End paging upon inserting into the normal command line.
-                if (el == &command_line) {
-                    clear_pager();
-                }
-
-                // Since we handled a normal character, we don't have a last command.
-                rls.last_cmd.reset();
-            }
-
-            // If there's still an event that we were unable to handle, then end the coalescing
-            // loop.
+            event_needing_handling = read_normal_chars(rls);
             if (event_needing_handling.has_value()) break;
 
-            if (0 < nchars && (size_t)nchars <= command_line.size()) {
+            if (rls.nchars <= command_line.size()) {
                 event_needing_handling.reset();
                 break;
             }

From 6ba94fd81b1a11623258d0c2763e9edd5c811e59 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 18 Mar 2019 20:06:16 -0700
Subject: [PATCH 0139/1732] Factor readline command handling into new function
 handle_readline_command()

---
 src/reader.cpp | 1459 ++++++++++++++++++++++++------------------------
 1 file changed, 730 insertions(+), 729 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 7d1668072..a6f6a0644 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -444,6 +444,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 
     maybe_t<wcstring> readline(int nchars);
     maybe_t<char_event_t> read_normal_chars(readline_loop_state_t &rls);
+    void handle_readline_command(readline_cmd_t cmd, readline_loop_state_t &rls);
 
     void clear_pager();
     void select_completion_in_direction(enum selection_direction_t dir);
@@ -2484,6 +2485,731 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
     return event_needing_handling;
 }
 
+/// Handle a readline command \p c, updating the state \p rls.
+void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_state_t &rls) {
+    const auto &vars = parser_t::principal_parser().vars();
+    using rl = readline_cmd_t;
+    switch (c) {
+        // Go to beginning of line.
+        case rl::R_BEGINNING_OF_LINE: {
+            editable_line_t *el = active_edit_line();
+            while (el->position > 0 && el->text.at(el->position - 1) != L'\n') {
+                update_buff_pos(el, el->position - 1);
+            }
+
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_END_OF_LINE: {
+            editable_line_t *el = active_edit_line();
+            if (el->position < el->size()) {
+                const wchar_t *buff = el->text.c_str();
+                while (buff[el->position] && buff[el->position] != L'\n') {
+                    update_buff_pos(el, el->position + 1);
+                }
+            } else {
+                accept_autosuggestion(true);
+            }
+
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_BEGINNING_OF_BUFFER: {
+            update_buff_pos(&command_line, 0);
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_END_OF_BUFFER: {
+            update_buff_pos(&command_line, command_line.size());
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_CANCEL: {
+            // The only thing we can cancel right now is paging, which we handled up above.
+            break;
+        }
+        case rl::R_FORCE_REPAINT:
+        case rl::R_REPAINT: {
+            if (!rls.coalescing_repaints) {
+                rls.coalescing_repaints = true;
+                exec_prompt();
+                s_reset(&screen, screen_reset_current_line_and_prompt);
+                screen_reset_needed = false;
+                repaint();
+            }
+            break;
+        }
+        case rl::R_COMPLETE:
+        case rl::R_COMPLETE_AND_SEARCH: {
+            if (!complete_func) break;
+
+            // Use the command line only; it doesn't make sense to complete in any other line.
+            editable_line_t *el = &command_line;
+            if (is_navigating_pager_contents() ||
+                (!rls.comp_empty && rls.last_cmd == rl::R_COMPLETE)) {
+                // The user typed R_COMPLETE more than once in a row. If we are not yet fully
+                // disclosed, then become so; otherwise cycle through our available completions.
+                if (current_page_rendering.remaining_to_disclose > 0) {
+                    pager.set_fully_disclosed(true);
+                    reader_repaint_needed();
+                } else {
+                    select_completion_in_direction(c == rl::R_COMPLETE ? direction_next
+                                                                       : direction_prev);
+                }
+            } else {
+                // Either the user hit tab only once, or we had no visible completion list.
+                // Remove a trailing backslash. This may trigger an extra repaint, but this is
+                // rare.
+                if (is_backslashed(el->text, el->position)) {
+                    remove_backward();
+                }
+
+                // Get the string; we have to do this after removing any trailing backslash.
+                const wchar_t *const buff = el->text.c_str();
+
+                // Clear the completion list.
+                rls.comp.clear();
+
+                // Figure out the extent of the command substitution surrounding the cursor.
+                // This is because we only look at the current command substitution to form
+                // completions - stuff happening outside of it is not interesting.
+                const wchar_t *cmdsub_begin, *cmdsub_end;
+                parse_util_cmdsubst_extent(buff, el->position, &cmdsub_begin, &cmdsub_end);
+
+                // Figure out the extent of the token within the command substitution. Note we
+                // pass cmdsub_begin here, not buff.
+                const wchar_t *token_begin, *token_end;
+                parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin - buff),
+                                        &token_begin, &token_end, 0, 0);
+
+                // Hack: the token may extend past the end of the command substitution, e.g. in
+                // (echo foo) the last token is 'foo)'. Don't let that happen.
+                if (token_end > cmdsub_end) token_end = cmdsub_end;
+
+                // Figure out how many steps to get from the current position to the end of the
+                // current token.
+                size_t end_of_token_offset = token_end - buff;
+
+                // Move the cursor to the end.
+                if (el->position != end_of_token_offset) {
+                    update_buff_pos(el, end_of_token_offset);
+                    repaint();
+                }
+
+                // Construct a copy of the string from the beginning of the command substitution
+                // up to the end of the token we're completing.
+                const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
+
+                // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
+                complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
+                                                  COMPLETION_REQUEST_DESCRIPTIONS |
+                                                  COMPLETION_REQUEST_FUZZY_MATCH;
+                complete_func(buffcpy, &rls.comp, complete_flags, vars);
+
+                // Munge our completions.
+                completions_sort_and_prioritize(&rls.comp);
+
+                // Record our cycle_command_line.
+                cycle_command_line = el->text;
+                cycle_cursor_pos = el->position;
+
+                bool cont_after_prefix_insertion = (c == rl::R_COMPLETE_AND_SEARCH);
+                rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
+
+                // Show the search field if requested and if we printed a list of completions.
+                if (c == rl::R_COMPLETE_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
+                    pager.set_search_field_shown(true);
+                    select_completion_in_direction(direction_next);
+                    reader_repaint_needed();
+                }
+            }
+            break;
+        }
+        case rl::R_PAGER_TOGGLE_SEARCH: {
+            if (!pager.empty()) {
+                // Toggle search, and begin navigating if we are now searching.
+                bool sfs = pager.is_search_field_shown();
+                pager.set_search_field_shown(!sfs);
+                pager.set_fully_disclosed(true);
+                if (pager.is_search_field_shown() && !is_navigating_pager_contents()) {
+                    select_completion_in_direction(direction_south);
+                }
+                reader_repaint_needed();
+            }
+            break;
+        }
+        case rl::R_KILL_LINE: {
+            editable_line_t *el = active_edit_line();
+            const wchar_t *buff = el->text.c_str();
+            const wchar_t *begin = &buff[el->position];
+            const wchar_t *end = begin;
+
+            while (*end && *end != L'\n') end++;
+
+            if (end == begin && *end) end++;
+
+            size_t len = end - begin;
+            if (len) {
+                kill(el, begin - buff, len, KILL_APPEND, rls.last_cmd != rl::R_KILL_LINE);
+            }
+            break;
+        }
+        case rl::R_BACKWARD_KILL_LINE: {
+            editable_line_t *el = active_edit_line();
+            if (el->position <= 0) {
+                break;
+            }
+            const wchar_t *buff = el->text.c_str();
+            const wchar_t *end = &buff[el->position];
+            const wchar_t *begin = end;
+
+            begin--;  // make sure we delete at least one character (see issue #580)
+
+            // Delete until we hit a newline, or the beginning of the string.
+            while (begin > buff && *begin != L'\n') begin--;
+
+            // If we landed on a newline, don't delete it.
+            if (*begin == L'\n') begin++;
+            assert(end >= begin);
+            size_t len = std::max<size_t>(end - begin, 1);
+            begin = end - len;
+            kill(el, begin - buff, len, KILL_PREPEND, rls.last_cmd != rl::R_BACKWARD_KILL_LINE);
+            break;
+        }
+        case rl::R_KILL_WHOLE_LINE: {
+            // We match the emacs behavior here: "kills the entire line including the following
+            // newline".
+            editable_line_t *el = active_edit_line();
+            const wchar_t *buff = el->text.c_str();
+
+            // Back up to the character just past the previous newline, or go to the beginning
+            // of the command line. Note that if the position is on a newline, visually this
+            // looks like the cursor is at the end of a line. Therefore that newline is NOT the
+            // beginning of a line; this justifies the -1 check.
+            size_t begin = el->position;
+            while (begin > 0 && buff[begin - 1] != L'\n') {
+                begin--;
+            }
+
+            // Push end forwards to just past the next newline, or just past the last char.
+            size_t end = el->position;
+            while (buff[end] != L'\0') {
+                end++;
+                if (buff[end - 1] == L'\n') {
+                    break;
+                }
+            }
+            assert(end >= begin);
+
+            if (end > begin) {
+                kill(el, begin, end - begin, KILL_APPEND, rls.last_cmd != rl::R_KILL_WHOLE_LINE);
+            }
+            break;
+        }
+        case rl::R_YANK: {
+            wcstring yank_str = kill_yank();
+            insert_string(active_edit_line(), yank_str);
+            rls.yank_len = yank_str.size();
+            break;
+        }
+        case rl::R_YANK_POP: {
+            if (rls.yank_len) {
+                for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
+
+                wcstring yank_str = kill_yank_rotate();
+                insert_string(active_edit_line(), yank_str);
+                rls.yank_len = yank_str.size();
+            }
+            break;
+        }
+        case rl::R_BACKWARD_DELETE_CHAR: {
+            remove_backward();
+            break;
+        }
+        case rl::R_DELETE_CHAR: {
+            // Remove the current character in the character buffer and on the screen using
+            // syntax highlighting, etc.
+            editable_line_t *el = active_edit_line();
+            if (el->position < el->size()) {
+                update_buff_pos(el, el->position + 1);
+                remove_backward();
+            }
+            break;
+        }
+            // Evaluate. If the current command is unfinished, or if the charater is escaped
+            // using a backslash, insert a newline.
+        case rl::R_EXECUTE: {
+            // If the user hits return while navigating the pager, it only clears the pager.
+            if (is_navigating_pager_contents()) {
+                clear_pager();
+                break;
+            }
+
+            // Delete any autosuggestion.
+            autosuggestion.clear();
+
+            // The user may have hit return with pager contents, but while not navigating them.
+            // Clear the pager in that event.
+            clear_pager();
+
+            // We only execute the command line.
+            editable_line_t *el = &command_line;
+
+            // Allow backslash-escaped newlines.
+            bool continue_on_next_line = false;
+            if (el->position >= el->size()) {
+                // We're at the end of the text and not in a comment (issue #1225).
+                continue_on_next_line =
+                    is_backslashed(el->text, el->position) && !text_ends_in_comment(el->text);
+            } else {
+                // Allow mid line split if the following character is whitespace (issue #613).
+                if (is_backslashed(el->text, el->position) && iswspace(el->text.at(el->position))) {
+                    continue_on_next_line = true;
+                    // Check if the end of the line is backslashed (issue #4467).
+                } else if (is_backslashed(el->text, el->size()) &&
+                           !text_ends_in_comment(el->text)) {
+                    // Move the cursor to the end of the line.
+                    el->position = el->size();
+                    continue_on_next_line = true;
+                }
+            }
+            // If the conditions are met, insert a new line at the position of the cursor.
+            if (continue_on_next_line) {
+                insert_char(el, '\n');
+                break;
+            }
+
+            // See if this command is valid.
+            int command_test_result = test_func(el->text);
+            if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) {
+                // This command is valid, but an abbreviation may make it invalid. If so, we
+                // will have to test again.
+                bool abbreviation_expanded = expand_abbreviation_as_necessary(1);
+                if (abbreviation_expanded) {
+                    // It's our reponsibility to rehighlight and repaint. But everything we do
+                    // below triggers a repaint.
+                    command_test_result = test_func(el->text.c_str());
+
+                    // If the command is OK, then we're going to execute it. We still want to do
+                    // syntax highlighting, but a synchronous variant that performs no I/O, so
+                    // as not to block the user.
+                    bool skip_io = (command_test_result == 0);
+                    super_highlight_me_plenty(0, skip_io);
+                }
+            }
+
+            if (command_test_result == 0) {
+                // Finished command, execute it. Don't add items that start with a leading
+                // space.
+                const editable_line_t *el = &command_line;
+                if (history != NULL && !el->empty() && el->text.at(0) != L' ') {
+                    history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
+                }
+                rls.finished = true;
+                update_buff_pos(&command_line, command_line.size());
+                repaint();
+            } else if (command_test_result == PARSER_TEST_INCOMPLETE) {
+                // We are incomplete, continue editing.
+                insert_char(el, '\n');
+            } else {
+                // Result must be some combination including an error. The error message will
+                // already be printed, all we need to do is repaint.
+                s_reset(&screen, screen_reset_abandon_line);
+                reader_repaint_needed();
+            }
+
+            break;
+        }
+
+        case rl::R_HISTORY_SEARCH_BACKWARD:
+        case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
+        case rl::R_HISTORY_SEARCH_FORWARD:
+        case rl::R_HISTORY_TOKEN_SEARCH_FORWARD: {
+            if (history_search.is_at_end()) {
+                const editable_line_t *el = &command_line;
+                bool by_token = (c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD) ||
+                                (c == rl::R_HISTORY_TOKEN_SEARCH_FORWARD);
+                if (by_token) {
+                    // Searching by token.
+                    const wchar_t *begin, *end;
+                    const wchar_t *buff = el->text.c_str();
+                    parse_util_token_extent(buff, el->position, &begin, &end, 0, 0);
+                    if (begin) {
+                        wcstring token(begin, end);
+                        history_search.reset_to_mode(token, history,
+                                                     reader_history_search_t::token);
+                    } else {
+                        // No current token, refuse to do a token search.
+                        history_search.reset();
+                    }
+                } else {
+                    // Searching by line.
+                    history_search.reset_to_mode(el->text, history, reader_history_search_t::line);
+
+                    // Skip the autosuggestion in the history unless it was truncated.
+                    const wcstring &suggest = autosuggestion;
+                    if (!suggest.empty() && !screen.autosuggestion_is_truncated) {
+                        history_search.add_skip(suggest);
+                    }
+                }
+            }
+            if (history_search.active()) {
+                history_search_direction_t dir =
+                    (c == rl::R_HISTORY_SEARCH_BACKWARD || c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD)
+                        ? history_search_direction_t::backward
+                        : history_search_direction_t::forward;
+                history_search.move_in_direction(dir);
+                update_command_line_from_history_search();
+            }
+            break;
+        }
+        case rl::R_BACKWARD_CHAR: {
+            editable_line_t *el = active_edit_line();
+            if (is_navigating_pager_contents()) {
+                select_completion_in_direction(direction_west);
+            } else if (el->position > 0) {
+                update_buff_pos(el, el->position - 1);
+                reader_repaint_needed();
+            }
+            break;
+        }
+        case rl::R_FORWARD_CHAR: {
+            editable_line_t *el = active_edit_line();
+            if (is_navigating_pager_contents()) {
+                select_completion_in_direction(direction_east);
+            } else if (el->position < el->size()) {
+                update_buff_pos(el, el->position + 1);
+                reader_repaint_needed();
+            } else {
+                accept_autosuggestion(true);
+            }
+            break;
+        }
+        case rl::R_BACKWARD_KILL_WORD:
+        case rl::R_BACKWARD_KILL_PATH_COMPONENT:
+        case rl::R_BACKWARD_KILL_BIGWORD: {
+            move_word_style_t style =
+                (c == rl::R_BACKWARD_KILL_BIGWORD
+                     ? move_word_style_whitespace
+                     : c == rl::R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
+                                                               : move_word_style_punctuation);
+            // Is this the same killring item as the last kill?
+            bool newv = (rls.last_cmd != rl::R_BACKWARD_KILL_WORD &&
+                         rls.last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
+                         rls.last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
+            move_word(active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv);
+            break;
+        }
+        case rl::R_KILL_WORD:
+        case rl::R_KILL_BIGWORD: {
+            // The "bigword" functions differ only in that they move to the next whitespace, not
+            // punctuation.
+            auto move_style =
+                (c == rl::R_KILL_WORD) ? move_word_style_punctuation : move_word_style_whitespace;
+            move_word(active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_style,
+                      rls.last_cmd != c /* same kill item if same movement */);
+            break;
+        }
+        case rl::R_BACKWARD_WORD:
+        case rl::R_BACKWARD_BIGWORD: {
+            auto move_style = (c == rl::R_BACKWARD_WORD) ? move_word_style_punctuation
+                                                         : move_word_style_whitespace;
+            move_word(active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_style,
+                      false);
+            break;
+        }
+        case rl::R_FORWARD_WORD:
+        case rl::R_FORWARD_BIGWORD: {
+            auto move_style = (c == rl::R_FORWARD_WORD) ? move_word_style_punctuation
+                                                        : move_word_style_whitespace;
+            editable_line_t *el = active_edit_line();
+            if (el->position < el->size()) {
+                move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_style, false);
+            } else {
+                accept_autosuggestion(false, move_style);
+            }
+            break;
+        }
+        case rl::R_BEGINNING_OF_HISTORY:
+        case rl::R_END_OF_HISTORY: {
+            bool up = (c == rl::R_BEGINNING_OF_HISTORY);
+            if (is_navigating_pager_contents()) {
+                select_completion_in_direction(up ? direction_page_north : direction_page_south);
+            } else {
+                if (up) {
+                    history_search.go_to_beginning();
+                } else {
+                    history_search.go_to_end();
+                }
+                update_command_line_from_history_search();
+            }
+            break;
+        }
+        case rl::R_UP_LINE:
+        case rl::R_DOWN_LINE: {
+            if (is_navigating_pager_contents()) {
+                // We are already navigating pager contents.
+                selection_direction_t direction;
+                if (c == rl::R_DOWN_LINE) {
+                    // Down arrow is always south.
+                    direction = direction_south;
+                } else if (selection_is_at_top()) {
+                    // Up arrow, but we are in the first column and first row. End navigation.
+                    direction = direction_deselect;
+                } else {
+                    // Up arrow, go north.
+                    direction = direction_north;
+                }
+
+                // Now do the selection.
+                select_completion_in_direction(direction);
+            } else if (!pager.empty()) {
+                // We pressed a direction with a non-empty pager, begin navigation.
+                select_completion_in_direction(c == rl::R_DOWN_LINE ? direction_south
+                                                                    : direction_north);
+            } else {
+                // Not navigating the pager contents.
+                editable_line_t *el = active_edit_line();
+                int line_old = parse_util_get_line_from_offset(el->text, el->position);
+                int line_new;
+
+                if (c == rl::R_UP_LINE)
+                    line_new = line_old - 1;
+                else
+                    line_new = line_old + 1;
+
+                int line_count = parse_util_lineno(el->text.c_str(), el->size()) - 1;
+
+                if (line_new >= 0 && line_new <= line_count) {
+                    size_t base_pos_new;
+                    size_t base_pos_old;
+
+                    int indent_old;
+                    int indent_new;
+                    size_t line_offset_old;
+                    size_t total_offset_new;
+
+                    base_pos_new = parse_util_get_offset_from_line(el->text, line_new);
+
+                    base_pos_old = parse_util_get_offset_from_line(el->text, line_old);
+
+                    assert(base_pos_new != (size_t)(-1) && base_pos_old != (size_t)(-1));
+                    indent_old = indents.at(base_pos_old);
+                    indent_new = indents.at(base_pos_new);
+
+                    line_offset_old =
+                        el->position - parse_util_get_offset_from_line(el->text, line_old);
+                    total_offset_new = parse_util_get_offset(
+                        el->text, line_new, line_offset_old - 4 * (indent_new - indent_old));
+                    update_buff_pos(el, total_offset_new);
+                    reader_repaint_needed();
+                }
+            }
+            break;
+        }
+        case rl::R_SUPPRESS_AUTOSUGGESTION: {
+            suppress_autosuggestion = true;
+            autosuggestion.clear();
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_ACCEPT_AUTOSUGGESTION: {
+            accept_autosuggestion(true);
+            break;
+        }
+        case rl::R_TRANSPOSE_CHARS: {
+            editable_line_t *el = active_edit_line();
+            if (el->size() < 2) {
+                break;
+            }
+
+            // If the cursor is at the end, transpose the last two characters of the line.
+            if (el->position == el->size()) {
+                update_buff_pos(el, el->position - 1);
+            }
+
+            // Drag the character before the cursor forward over the character at the cursor,
+            // moving the cursor forward as well.
+            if (el->position > 0) {
+                wcstring local_cmd = el->text;
+                std::swap(local_cmd.at(el->position), local_cmd.at(el->position - 1));
+                set_command_line_and_position(el, local_cmd, el->position + 1);
+            }
+            break;
+        }
+        case rl::R_TRANSPOSE_WORDS: {
+            editable_line_t *el = active_edit_line();
+            size_t len = el->size();
+            const wchar_t *buff = el->text.c_str();
+            const wchar_t *tok_begin, *tok_end, *prev_begin, *prev_end;
+
+            // If we are not in a token, look for one ahead.
+            size_t buff_pos = el->position;
+            while (buff_pos != len && !iswalnum(buff[buff_pos])) buff_pos++;
+
+            update_buff_pos(el, buff_pos);
+
+            parse_util_token_extent(buff, el->position, &tok_begin, &tok_end, &prev_begin,
+                                    &prev_end);
+
+            // In case we didn't find a token at or after the cursor...
+            if (tok_begin == &buff[len]) {
+                // ...retry beginning from the previous token.
+                size_t pos = prev_end - &buff[0];
+                parse_util_token_extent(buff, pos, &tok_begin, &tok_end, &prev_begin, &prev_end);
+            }
+
+            // Make sure we have two tokens.
+            if (prev_begin < prev_end && tok_begin < tok_end && tok_begin > prev_begin) {
+                const wcstring prev(prev_begin, prev_end - prev_begin);
+                const wcstring sep(prev_end, tok_begin - prev_end);
+                const wcstring tok(tok_begin, tok_end - tok_begin);
+                const wcstring trail(tok_end, &buff[len] - tok_end);
+
+                // Compose new command line with swapped tokens.
+                wcstring new_buff(buff, prev_begin - buff);
+                new_buff.append(tok);
+                new_buff.append(sep);
+                new_buff.append(prev);
+                new_buff.append(trail);
+                // Put cursor right after the second token.
+                set_command_line_and_position(el, new_buff, tok_end - buff);
+            }
+            break;
+        }
+        case rl::R_UPCASE_WORD:
+        case rl::R_DOWNCASE_WORD:
+        case rl::R_CAPITALIZE_WORD: {
+            editable_line_t *el = active_edit_line();
+            // For capitalize_word, whether we've capitalized a character so far.
+            bool capitalized_first = false;
+
+            // We apply the operation from the current location to the end of the word.
+            size_t pos = el->position;
+            move_word(el, MOVE_DIR_RIGHT, false, move_word_style_punctuation, false);
+            for (; pos < el->position; pos++) {
+                wchar_t chr = el->text.at(pos);
+
+                // We always change the case; this decides whether we go uppercase (true) or
+                // lowercase (false).
+                bool make_uppercase;
+                if (c == rl::R_CAPITALIZE_WORD)
+                    make_uppercase = !capitalized_first && iswalnum(chr);
+                else
+                    make_uppercase = (c == rl::R_UPCASE_WORD);
+
+                // Apply the operation and then record what we did.
+                if (make_uppercase)
+                    chr = towupper(chr);
+                else
+                    chr = towlower(chr);
+
+                command_line.text.at(pos) = chr;
+                capitalized_first = capitalized_first || make_uppercase;
+            }
+            command_line_changed(el);
+            super_highlight_me_plenty();
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_BEGIN_SELECTION:
+        case rl::R_END_SELECTION: {
+            sel_start_pos = command_line.position;
+            sel_stop_pos = command_line.position;
+            if (c == rl::R_BEGIN_SELECTION) {
+                sel_active = true;
+                sel_begin_pos = command_line.position;
+            } else {
+                sel_active = false;
+            }
+
+            break;
+        }
+        case rl::R_SWAP_SELECTION_START_STOP: {
+            if (!sel_active) break;
+            size_t tmp = sel_begin_pos;
+            sel_begin_pos = command_line.position;
+            sel_start_pos = command_line.position;
+            editable_line_t *el = active_edit_line();
+            update_buff_pos(el, tmp);
+            break;
+        }
+        case rl::R_KILL_SELECTION: {
+            bool newv = (rls.last_cmd != rl::R_KILL_SELECTION);
+            size_t start, len;
+            if (reader_get_selection(&start, &len)) {
+                kill(&command_line, start, len, KILL_APPEND, newv);
+            }
+            break;
+        }
+        case rl::R_FORWARD_JUMP:
+        case rl::R_BACKWARD_JUMP:
+        case rl::R_FORWARD_JUMP_TILL:
+        case rl::R_BACKWARD_JUMP_TILL: {
+            auto direction = (c == rl::R_FORWARD_JUMP || c == rl::R_FORWARD_JUMP_TILL)
+                                 ? jump_direction_t::forward
+                                 : jump_direction_t::backward;
+            auto precision = (c == rl::R_FORWARD_JUMP || c == rl::R_BACKWARD_JUMP)
+                                 ? jump_precision_t::to
+                                 : jump_precision_t::till;
+            editable_line_t *el = active_edit_line();
+            wchar_t target = input_function_pop_arg();
+            bool success = jump(direction, precision, el, target);
+
+            input_function_set_status(success);
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_REPEAT_JUMP: {
+            editable_line_t *el = active_edit_line();
+            bool success = false;
+
+            if (last_jump_target) {
+                success = jump(last_jump_direction, last_jump_precision, el, last_jump_target);
+            }
+
+            input_function_set_status(success);
+            reader_repaint_needed();
+            break;
+        }
+        case rl::R_REVERSE_REPEAT_JUMP: {
+            editable_line_t *el = active_edit_line();
+            bool success = false;
+            jump_direction_t original_dir, dir;
+            original_dir = dir = last_jump_direction;
+
+            if (last_jump_direction == jump_direction_t::forward) {
+                dir = jump_direction_t::backward;
+            } else {
+                dir = jump_direction_t::forward;
+            }
+
+            if (last_jump_target) {
+                success = jump(dir, last_jump_precision, el, last_jump_target);
+            }
+
+            last_jump_direction = original_dir;
+
+            input_function_set_status(success);
+            reader_repaint_needed();
+            break;
+        }
+
+            // Some commands should have been handled internally by input_readch().
+        case rl::R_SELF_INSERT: {
+            DIE("self-insert should have been handled by input_readch");
+        }
+        case rl::R_AND: {
+            DIE("self-insert should have been handled by input_readch");
+        }
+        case rl::R_VI_ARG_DIGIT:
+        case rl::R_VI_DELETE_TO: {
+            // TODO: what needs to happen with these?
+            break;
+        }
+    }
+}
+
 maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     using rl = readline_cmd_t;
     readline_loop_state_t rls{};
@@ -2507,8 +3233,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     s_reset(&screen, screen_reset_abandon_line);
     repaint();
 
-    const auto &vars = parser_t::principal_parser().vars();
-
     // Get the current terminal modes. These will be restored when the function returns.
     if (tcgetattr(STDIN_FILENO, &old_modes) == -1 && errno == EIO) redirect_tty_output();
 
@@ -2579,732 +3303,13 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             if (command_ends_paging(*readline_cmd, focused_on_search_field)) {
                 clear_pager();
             }
-        }
 
-        readline_cmd_t c = readline_cmd ? *readline_cmd : static_cast<readline_cmd_t>(0);
-        switch (c) {
-            // Go to beginning of line.
-            case rl::R_BEGINNING_OF_LINE: {
-                editable_line_t *el = active_edit_line();
-                while (el->position > 0 && el->text.at(el->position - 1) != L'\n') {
-                    update_buff_pos(el, el->position - 1);
-                }
+            handle_readline_command(*readline_cmd, rls);
 
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_END_OF_LINE: {
-                editable_line_t *el = active_edit_line();
-                if (el->position < el->size()) {
-                    const wchar_t *buff = el->text.c_str();
-                    while (buff[el->position] && buff[el->position] != L'\n') {
-                        update_buff_pos(el, el->position + 1);
-                    }
-                } else {
-                    accept_autosuggestion(true);
-                }
-
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_BEGINNING_OF_BUFFER: {
-                update_buff_pos(&command_line, 0);
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_END_OF_BUFFER: {
-                update_buff_pos(&command_line, command_line.size());
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_CANCEL: {
-                // The only thing we can cancel right now is paging, which we handled up above.
-                break;
-            }
-            case rl::R_FORCE_REPAINT:
-            case rl::R_REPAINT: {
-                if (!rls.coalescing_repaints) {
-                    rls.coalescing_repaints = true;
-                    exec_prompt();
-                    s_reset(&screen, screen_reset_current_line_and_prompt);
-                    screen_reset_needed = false;
-                    repaint();
-                }
-                break;
-            }
-            case rl::R_COMPLETE:
-            case rl::R_COMPLETE_AND_SEARCH: {
-                if (!complete_func) break;
-
-                // Use the command line only; it doesn't make sense to complete in any other line.
-                editable_line_t *el = &command_line;
-                if (is_navigating_pager_contents() ||
-                    (!rls.comp_empty && rls.last_cmd == rl::R_COMPLETE)) {
-                    // The user typed R_COMPLETE more than once in a row. If we are not yet fully
-                    // disclosed, then become so; otherwise cycle through our available completions.
-                    if (current_page_rendering.remaining_to_disclose > 0) {
-                        pager.set_fully_disclosed(true);
-                        reader_repaint_needed();
-                    } else {
-                        select_completion_in_direction(c == rl::R_COMPLETE ? direction_next
-                                                                           : direction_prev);
-                    }
-                } else {
-                    // Either the user hit tab only once, or we had no visible completion list.
-                    // Remove a trailing backslash. This may trigger an extra repaint, but this is
-                    // rare.
-                    if (is_backslashed(el->text, el->position)) {
-                        remove_backward();
-                    }
-
-                    // Get the string; we have to do this after removing any trailing backslash.
-                    const wchar_t *const buff = el->text.c_str();
-
-                    // Clear the completion list.
-                    rls.comp.clear();
-
-                    // Figure out the extent of the command substitution surrounding the cursor.
-                    // This is because we only look at the current command substitution to form
-                    // completions - stuff happening outside of it is not interesting.
-                    const wchar_t *cmdsub_begin, *cmdsub_end;
-                    parse_util_cmdsubst_extent(buff, el->position, &cmdsub_begin, &cmdsub_end);
-
-                    // Figure out the extent of the token within the command substitution. Note we
-                    // pass cmdsub_begin here, not buff.
-                    const wchar_t *token_begin, *token_end;
-                    parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin - buff),
-                                            &token_begin, &token_end, 0, 0);
-
-                    // Hack: the token may extend past the end of the command substitution, e.g. in
-                    // (echo foo) the last token is 'foo)'. Don't let that happen.
-                    if (token_end > cmdsub_end) token_end = cmdsub_end;
-
-                    // Figure out how many steps to get from the current position to the end of the
-                    // current token.
-                    size_t end_of_token_offset = token_end - buff;
-
-                    // Move the cursor to the end.
-                    if (el->position != end_of_token_offset) {
-                        update_buff_pos(el, end_of_token_offset);
-                        repaint();
-                    }
-
-                    // Construct a copy of the string from the beginning of the command substitution
-                    // up to the end of the token we're completing.
-                    const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
-
-                    // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
-                    complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
-                                                      COMPLETION_REQUEST_DESCRIPTIONS |
-                                                      COMPLETION_REQUEST_FUZZY_MATCH;
-                    complete_func(buffcpy, &rls.comp, complete_flags, vars);
-
-                    // Munge our completions.
-                    completions_sort_and_prioritize(&rls.comp);
-
-                    // Record our cycle_command_line.
-                    cycle_command_line = el->text;
-                    cycle_cursor_pos = el->position;
-
-                    bool cont_after_prefix_insertion = (c == rl::R_COMPLETE_AND_SEARCH);
-                    rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
-
-                    // Show the search field if requested and if we printed a list of completions.
-                    if (c == rl::R_COMPLETE_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
-                        pager.set_search_field_shown(true);
-                        select_completion_in_direction(direction_next);
-                        reader_repaint_needed();
-                    }
-                }
-                break;
-            }
-            case rl::R_PAGER_TOGGLE_SEARCH: {
-                if (!pager.empty()) {
-                    // Toggle search, and begin navigating if we are now searching.
-                    bool sfs = pager.is_search_field_shown();
-                    pager.set_search_field_shown(!sfs);
-                    pager.set_fully_disclosed(true);
-                    if (pager.is_search_field_shown() && !is_navigating_pager_contents()) {
-                        select_completion_in_direction(direction_south);
-                    }
-                    reader_repaint_needed();
-                }
-                break;
-            }
-            case rl::R_KILL_LINE: {
-                editable_line_t *el = active_edit_line();
-                const wchar_t *buff = el->text.c_str();
-                const wchar_t *begin = &buff[el->position];
-                const wchar_t *end = begin;
-
-                while (*end && *end != L'\n') end++;
-
-                if (end == begin && *end) end++;
-
-                size_t len = end - begin;
-                if (len) {
-                    kill(el, begin - buff, len, KILL_APPEND, rls.last_cmd != rl::R_KILL_LINE);
-                }
-                break;
-            }
-            case rl::R_BACKWARD_KILL_LINE: {
-                editable_line_t *el = active_edit_line();
-                if (el->position <= 0) {
-                    break;
-                }
-                const wchar_t *buff = el->text.c_str();
-                const wchar_t *end = &buff[el->position];
-                const wchar_t *begin = end;
-
-                begin--;  // make sure we delete at least one character (see issue #580)
-
-                // Delete until we hit a newline, or the beginning of the string.
-                while (begin > buff && *begin != L'\n') begin--;
-
-                // If we landed on a newline, don't delete it.
-                if (*begin == L'\n') begin++;
-                assert(end >= begin);
-                size_t len = std::max<size_t>(end - begin, 1);
-                begin = end - len;
-                kill(el, begin - buff, len, KILL_PREPEND, rls.last_cmd != rl::R_BACKWARD_KILL_LINE);
-                break;
-            }
-            case rl::R_KILL_WHOLE_LINE: {
-                // We match the emacs behavior here: "kills the entire line including the following
-                // newline".
-                editable_line_t *el = active_edit_line();
-                const wchar_t *buff = el->text.c_str();
-
-                // Back up to the character just past the previous newline, or go to the beginning
-                // of the command line. Note that if the position is on a newline, visually this
-                // looks like the cursor is at the end of a line. Therefore that newline is NOT the
-                // beginning of a line; this justifies the -1 check.
-                size_t begin = el->position;
-                while (begin > 0 && buff[begin - 1] != L'\n') {
-                    begin--;
-                }
-
-                // Push end forwards to just past the next newline, or just past the last char.
-                size_t end = el->position;
-                while (buff[end] != L'\0') {
-                    end++;
-                    if (buff[end - 1] == L'\n') {
-                        break;
-                    }
-                }
-                assert(end >= begin);
-
-                if (end > begin) {
-                    kill(el, begin, end - begin, KILL_APPEND,
-                         rls.last_cmd != rl::R_KILL_WHOLE_LINE);
-                }
-                break;
-            }
-            case rl::R_YANK: {
-                wcstring yank_str = kill_yank();
-                insert_string(active_edit_line(), yank_str);
-                rls.yank_len = yank_str.size();
-                break;
-            }
-            case rl::R_YANK_POP: {
-                if (rls.yank_len) {
-                    for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
-
-                    wcstring yank_str = kill_yank_rotate();
-                    insert_string(active_edit_line(), yank_str);
-                    rls.yank_len = yank_str.size();
-                }
-                break;
-            }
-            case rl::R_BACKWARD_DELETE_CHAR: {
-                remove_backward();
-                break;
-            }
-            case rl::R_DELETE_CHAR: {
-                // Remove the current character in the character buffer and on the screen using
-                // syntax highlighting, etc.
-                editable_line_t *el = active_edit_line();
-                if (el->position < el->size()) {
-                    update_buff_pos(el, el->position + 1);
-                    remove_backward();
-                }
-                break;
-            }
-                // Evaluate. If the current command is unfinished, or if the charater is escaped
-                // using a backslash, insert a newline.
-            case rl::R_EXECUTE: {
-                // If the user hits return while navigating the pager, it only clears the pager.
-                if (is_navigating_pager_contents()) {
-                    clear_pager();
-                    break;
-                }
-
-                // Delete any autosuggestion.
-                autosuggestion.clear();
-
-                // The user may have hit return with pager contents, but while not navigating them.
-                // Clear the pager in that event.
-                clear_pager();
-
-                // We only execute the command line.
-                editable_line_t *el = &command_line;
-
-                // Allow backslash-escaped newlines.
-                bool continue_on_next_line = false;
-                if (el->position >= el->size()) {
-                    // We're at the end of the text and not in a comment (issue #1225).
-                    continue_on_next_line =
-                        is_backslashed(el->text, el->position) && !text_ends_in_comment(el->text);
-                } else {
-                    // Allow mid line split if the following character is whitespace (issue #613).
-                    if (is_backslashed(el->text, el->position) &&
-                        iswspace(el->text.at(el->position))) {
-                        continue_on_next_line = true;
-                        // Check if the end of the line is backslashed (issue #4467).
-                    } else if (is_backslashed(el->text, el->size()) &&
-                               !text_ends_in_comment(el->text)) {
-                        // Move the cursor to the end of the line.
-                        el->position = el->size();
-                        continue_on_next_line = true;
-                    }
-                }
-                // If the conditions are met, insert a new line at the position of the cursor.
-                if (continue_on_next_line) {
-                    insert_char(el, '\n');
-                    break;
-                }
-
-                // See if this command is valid.
-                int command_test_result = test_func(el->text);
-                if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) {
-                    // This command is valid, but an abbreviation may make it invalid. If so, we
-                    // will have to test again.
-                    bool abbreviation_expanded = expand_abbreviation_as_necessary(1);
-                    if (abbreviation_expanded) {
-                        // It's our reponsibility to rehighlight and repaint. But everything we do
-                        // below triggers a repaint.
-                        command_test_result = test_func(el->text.c_str());
-
-                        // If the command is OK, then we're going to execute it. We still want to do
-                        // syntax highlighting, but a synchronous variant that performs no I/O, so
-                        // as not to block the user.
-                        bool skip_io = (command_test_result == 0);
-                        super_highlight_me_plenty(0, skip_io);
-                    }
-                }
-
-                if (command_test_result == 0) {
-                    // Finished command, execute it. Don't add items that start with a leading
-                    // space.
-                    const editable_line_t *el = &command_line;
-                    if (history != NULL && !el->empty() && el->text.at(0) != L' ') {
-                        history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
-                    }
-                    rls.finished = true;
-                    update_buff_pos(&command_line, command_line.size());
-                    repaint();
-                } else if (command_test_result == PARSER_TEST_INCOMPLETE) {
-                    // We are incomplete, continue editing.
-                    insert_char(el, '\n');
-                } else {
-                    // Result must be some combination including an error. The error message will
-                    // already be printed, all we need to do is repaint.
-                    s_reset(&screen, screen_reset_abandon_line);
-                    reader_repaint_needed();
-                }
-
-                break;
-            }
-
-            case rl::R_HISTORY_SEARCH_BACKWARD:
-            case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
-            case rl::R_HISTORY_SEARCH_FORWARD:
-            case rl::R_HISTORY_TOKEN_SEARCH_FORWARD: {
-                if (history_search.is_at_end()) {
-                    const editable_line_t *el = &command_line;
-                    bool by_token = (c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD) ||
-                                    (c == rl::R_HISTORY_TOKEN_SEARCH_FORWARD);
-                    if (by_token) {
-                        // Searching by token.
-                        const wchar_t *begin, *end;
-                        const wchar_t *buff = el->text.c_str();
-                        parse_util_token_extent(buff, el->position, &begin, &end, 0, 0);
-                        if (begin) {
-                            wcstring token(begin, end);
-                            history_search.reset_to_mode(token, history,
-                                                         reader_history_search_t::token);
-                        } else {
-                            // No current token, refuse to do a token search.
-                            history_search.reset();
-                        }
-                    } else {
-                        // Searching by line.
-                        history_search.reset_to_mode(el->text, history,
-                                                     reader_history_search_t::line);
-
-                        // Skip the autosuggestion in the history unless it was truncated.
-                        const wcstring &suggest = autosuggestion;
-                        if (!suggest.empty() && !screen.autosuggestion_is_truncated) {
-                            history_search.add_skip(suggest);
-                        }
-                    }
-                }
-                if (history_search.active()) {
-                    history_search_direction_t dir = (c == rl::R_HISTORY_SEARCH_BACKWARD ||
-                                                      c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD)
-                                                         ? history_search_direction_t::backward
-                                                         : history_search_direction_t::forward;
-                    history_search.move_in_direction(dir);
-                    update_command_line_from_history_search();
-                }
-                break;
-            }
-            case rl::R_BACKWARD_CHAR: {
-                editable_line_t *el = active_edit_line();
-                if (is_navigating_pager_contents()) {
-                    select_completion_in_direction(direction_west);
-                } else if (el->position > 0) {
-                    update_buff_pos(el, el->position - 1);
-                    reader_repaint_needed();
-                }
-                break;
-            }
-            case rl::R_FORWARD_CHAR: {
-                editable_line_t *el = active_edit_line();
-                if (is_navigating_pager_contents()) {
-                    select_completion_in_direction(direction_east);
-                } else if (el->position < el->size()) {
-                    update_buff_pos(el, el->position + 1);
-                    reader_repaint_needed();
-                } else {
-                    accept_autosuggestion(true);
-                }
-                break;
-            }
-            case rl::R_BACKWARD_KILL_WORD:
-            case rl::R_BACKWARD_KILL_PATH_COMPONENT:
-            case rl::R_BACKWARD_KILL_BIGWORD: {
-                move_word_style_t style =
-                    (c == rl::R_BACKWARD_KILL_BIGWORD
-                         ? move_word_style_whitespace
-                         : c == rl::R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
-                                                                   : move_word_style_punctuation);
-                // Is this the same killring item as the last kill?
-                bool newv = (rls.last_cmd != rl::R_BACKWARD_KILL_WORD &&
-                             rls.last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
-                             rls.last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
-                move_word(active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv);
-                break;
-            }
-            case rl::R_KILL_WORD:
-            case rl::R_KILL_BIGWORD: {
-                // The "bigword" functions differ only in that they move to the next whitespace, not
-                // punctuation.
-                auto move_style = (c == rl::R_KILL_WORD) ? move_word_style_punctuation
-                                                         : move_word_style_whitespace;
-                move_word(active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_style,
-                          rls.last_cmd != c /* same kill item if same movement */);
-                break;
-            }
-            case rl::R_BACKWARD_WORD:
-            case rl::R_BACKWARD_BIGWORD: {
-                auto move_style = (c == rl::R_BACKWARD_WORD) ? move_word_style_punctuation
-                                                             : move_word_style_whitespace;
-                move_word(active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_style,
-                          false);
-                break;
-            }
-            case rl::R_FORWARD_WORD:
-            case rl::R_FORWARD_BIGWORD: {
-                auto move_style = (c == rl::R_FORWARD_WORD) ? move_word_style_punctuation
-                                                            : move_word_style_whitespace;
-                editable_line_t *el = active_edit_line();
-                if (el->position < el->size()) {
-                    move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_style, false);
-                } else {
-                    accept_autosuggestion(false, move_style);
-                }
-                break;
-            }
-            case rl::R_BEGINNING_OF_HISTORY:
-            case rl::R_END_OF_HISTORY: {
-                bool up = (c == rl::R_BEGINNING_OF_HISTORY);
-                if (is_navigating_pager_contents()) {
-                    select_completion_in_direction(up ? direction_page_north
-                                                      : direction_page_south);
-                } else {
-                    if (up) {
-                        history_search.go_to_beginning();
-                    } else {
-                        history_search.go_to_end();
-                    }
-                    update_command_line_from_history_search();
-                }
-                break;
-            }
-            case rl::R_UP_LINE:
-            case rl::R_DOWN_LINE: {
-                if (is_navigating_pager_contents()) {
-                    // We are already navigating pager contents.
-                    selection_direction_t direction;
-                    if (c == rl::R_DOWN_LINE) {
-                        // Down arrow is always south.
-                        direction = direction_south;
-                    } else if (selection_is_at_top()) {
-                        // Up arrow, but we are in the first column and first row. End navigation.
-                        direction = direction_deselect;
-                    } else {
-                        // Up arrow, go north.
-                        direction = direction_north;
-                    }
-
-                    // Now do the selection.
-                    select_completion_in_direction(direction);
-                } else if (!pager.empty()) {
-                    // We pressed a direction with a non-empty pager, begin navigation.
-                    select_completion_in_direction(c == rl::R_DOWN_LINE ? direction_south
-                                                                        : direction_north);
-                } else {
-                    // Not navigating the pager contents.
-                    editable_line_t *el = active_edit_line();
-                    int line_old = parse_util_get_line_from_offset(el->text, el->position);
-                    int line_new;
-
-                    if (c == rl::R_UP_LINE)
-                        line_new = line_old - 1;
-                    else
-                        line_new = line_old + 1;
-
-                    int line_count = parse_util_lineno(el->text.c_str(), el->size()) - 1;
-
-                    if (line_new >= 0 && line_new <= line_count) {
-                        size_t base_pos_new;
-                        size_t base_pos_old;
-
-                        int indent_old;
-                        int indent_new;
-                        size_t line_offset_old;
-                        size_t total_offset_new;
-
-                        base_pos_new = parse_util_get_offset_from_line(el->text, line_new);
-
-                        base_pos_old = parse_util_get_offset_from_line(el->text, line_old);
-
-                        assert(base_pos_new != (size_t)(-1) && base_pos_old != (size_t)(-1));
-                        indent_old = indents.at(base_pos_old);
-                        indent_new = indents.at(base_pos_new);
-
-                        line_offset_old =
-                            el->position - parse_util_get_offset_from_line(el->text, line_old);
-                        total_offset_new = parse_util_get_offset(
-                            el->text, line_new, line_offset_old - 4 * (indent_new - indent_old));
-                        update_buff_pos(el, total_offset_new);
-                        reader_repaint_needed();
-                    }
-                }
-                break;
-            }
-            case rl::R_SUPPRESS_AUTOSUGGESTION: {
-                suppress_autosuggestion = true;
-                autosuggestion.clear();
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_ACCEPT_AUTOSUGGESTION: {
-                accept_autosuggestion(true);
-                break;
-            }
-            case rl::R_TRANSPOSE_CHARS: {
-                editable_line_t *el = active_edit_line();
-                if (el->size() < 2) {
-                    break;
-                }
-
-                // If the cursor is at the end, transpose the last two characters of the line.
-                if (el->position == el->size()) {
-                    update_buff_pos(el, el->position - 1);
-                }
-
-                // Drag the character before the cursor forward over the character at the cursor,
-                // moving the cursor forward as well.
-                if (el->position > 0) {
-                    wcstring local_cmd = el->text;
-                    std::swap(local_cmd.at(el->position), local_cmd.at(el->position - 1));
-                    set_command_line_and_position(el, local_cmd, el->position + 1);
-                }
-                break;
-            }
-            case rl::R_TRANSPOSE_WORDS: {
-                editable_line_t *el = active_edit_line();
-                size_t len = el->size();
-                const wchar_t *buff = el->text.c_str();
-                const wchar_t *tok_begin, *tok_end, *prev_begin, *prev_end;
-
-                // If we are not in a token, look for one ahead.
-                size_t buff_pos = el->position;
-                while (buff_pos != len && !iswalnum(buff[buff_pos])) buff_pos++;
-
-                update_buff_pos(el, buff_pos);
-
-                parse_util_token_extent(buff, el->position, &tok_begin, &tok_end, &prev_begin,
-                                        &prev_end);
-
-                // In case we didn't find a token at or after the cursor...
-                if (tok_begin == &buff[len]) {
-                    // ...retry beginning from the previous token.
-                    size_t pos = prev_end - &buff[0];
-                    parse_util_token_extent(buff, pos, &tok_begin, &tok_end, &prev_begin,
-                                            &prev_end);
-                }
-
-                // Make sure we have two tokens.
-                if (prev_begin < prev_end && tok_begin < tok_end && tok_begin > prev_begin) {
-                    const wcstring prev(prev_begin, prev_end - prev_begin);
-                    const wcstring sep(prev_end, tok_begin - prev_end);
-                    const wcstring tok(tok_begin, tok_end - tok_begin);
-                    const wcstring trail(tok_end, &buff[len] - tok_end);
-
-                    // Compose new command line with swapped tokens.
-                    wcstring new_buff(buff, prev_begin - buff);
-                    new_buff.append(tok);
-                    new_buff.append(sep);
-                    new_buff.append(prev);
-                    new_buff.append(trail);
-                    // Put cursor right after the second token.
-                    set_command_line_and_position(el, new_buff, tok_end - buff);
-                }
-                break;
-            }
-            case rl::R_UPCASE_WORD:
-            case rl::R_DOWNCASE_WORD:
-            case rl::R_CAPITALIZE_WORD: {
-                editable_line_t *el = active_edit_line();
-                // For capitalize_word, whether we've capitalized a character so far.
-                bool capitalized_first = false;
-
-                // We apply the operation from the current location to the end of the word.
-                size_t pos = el->position;
-                move_word(el, MOVE_DIR_RIGHT, false, move_word_style_punctuation, false);
-                for (; pos < el->position; pos++) {
-                    wchar_t chr = el->text.at(pos);
-
-                    // We always change the case; this decides whether we go uppercase (true) or
-                    // lowercase (false).
-                    bool make_uppercase;
-                    if (c == rl::R_CAPITALIZE_WORD)
-                        make_uppercase = !capitalized_first && iswalnum(chr);
-                    else
-                        make_uppercase = (c == rl::R_UPCASE_WORD);
-
-                    // Apply the operation and then record what we did.
-                    if (make_uppercase)
-                        chr = towupper(chr);
-                    else
-                        chr = towlower(chr);
-
-                    command_line.text.at(pos) = chr;
-                    capitalized_first = capitalized_first || make_uppercase;
-                }
-                command_line_changed(el);
-                super_highlight_me_plenty();
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_BEGIN_SELECTION:
-            case rl::R_END_SELECTION: {
-                sel_start_pos = command_line.position;
-                sel_stop_pos = command_line.position;
-                if (c == rl::R_BEGIN_SELECTION) {
-                    sel_active = true;
-                    sel_begin_pos = command_line.position;
-                } else {
-                    sel_active = false;
-                }
-
-                break;
-            }
-            case rl::R_SWAP_SELECTION_START_STOP: {
-                if (!sel_active) break;
-                size_t tmp = sel_begin_pos;
-                sel_begin_pos = command_line.position;
-                sel_start_pos = command_line.position;
-                editable_line_t *el = active_edit_line();
-                update_buff_pos(el, tmp);
-                break;
-            }
-            case rl::R_KILL_SELECTION: {
-                bool newv = (rls.last_cmd != rl::R_KILL_SELECTION);
-                size_t start, len;
-                if (reader_get_selection(&start, &len)) {
-                    kill(&command_line, start, len, KILL_APPEND, newv);
-                }
-                break;
-            }
-            case rl::R_FORWARD_JUMP:
-            case rl::R_BACKWARD_JUMP:
-            case rl::R_FORWARD_JUMP_TILL:
-            case rl::R_BACKWARD_JUMP_TILL: {
-                auto direction = (c == rl::R_FORWARD_JUMP || c == rl::R_FORWARD_JUMP_TILL)
-                                     ? jump_direction_t::forward
-                                     : jump_direction_t::backward;
-                auto precision = (c == rl::R_FORWARD_JUMP || c == rl::R_BACKWARD_JUMP)
-                                     ? jump_precision_t::to
-                                     : jump_precision_t::till;
-                editable_line_t *el = active_edit_line();
-                wchar_t target = input_function_pop_arg();
-                bool success = jump(direction, precision, el, target);
-
-                input_function_set_status(success);
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_REPEAT_JUMP: {
-                editable_line_t *el = active_edit_line();
-                bool success = false;
-
-                if (last_jump_target) {
-                    success = jump(last_jump_direction, last_jump_precision, el, last_jump_target);
-                }
-
-                input_function_set_status(success);
-                reader_repaint_needed();
-                break;
-            }
-            case rl::R_REVERSE_REPEAT_JUMP: {
-                editable_line_t *el = active_edit_line();
-                bool success = false;
-                jump_direction_t original_dir, dir;
-                original_dir = dir = last_jump_direction;
-
-                if (last_jump_direction == jump_direction_t::forward) {
-                    dir = jump_direction_t::backward;
-                } else {
-                    dir = jump_direction_t::forward;
-                }
-
-                if (last_jump_target) {
-                    success = jump(dir, last_jump_precision, el, last_jump_target);
-                }
-
-                last_jump_direction = original_dir;
-
-                input_function_set_status(success);
-                reader_repaint_needed();
-                break;
-            }
-
-                // Some commands should have been handled internally by input_readch().
-            case rl::R_SELF_INSERT: {
-                DIE("self-insert should have been handled by input_readch");
-            }
-            case rl::R_AND: {
-                DIE("self-insert should have been handled by input_readch");
-            }
-            case rl::R_VI_ARG_DIGIT:
-            case rl::R_VI_DELETE_TO: {
-                // TODO: what needs to happen with these?
-                break;
+            if (!readline_cmd || command_ends_history_search(*readline_cmd)) {
+                history_search.reset();
             }
+            rls.last_cmd = readline_cmd;
         }
 
         if (ordinary_char) {
@@ -3336,10 +3341,6 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             }
         }
 
-        if (!readline_cmd || command_ends_history_search(*readline_cmd)) {
-            history_search.reset();
-        }
-        rls.last_cmd = readline_cmd;
         repaint_if_needed();
     }
 

From 9187458d51442e065d9a80d092fab377f72e1cad Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 20 Mar 2019 21:10:07 -0700
Subject: [PATCH 0140/1732] Continued refactoring of reader_data_t::readline

---
 src/reader.cpp | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index a6f6a0644..d11b72124 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3277,44 +3277,35 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         }
         assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) &&
                "Should have a char or readline");
-        maybe_t<readline_cmd_t> readline_cmd{};
-        maybe_t<wchar_t> ordinary_char{};
-        if (event_needing_handling->is_readline()) {
-            readline_cmd = event_needing_handling->get_readline();
-        } else {
-            ordinary_char = event_needing_handling->get_char();
-        }
-
-        // If we get something other than a repaint, then stop coalescing them.
-        if (readline_cmd != rl::R_REPAINT) rls.coalescing_repaints = false;
 
         if (rls.last_cmd != rl::R_YANK && rls.last_cmd != rl::R_YANK_POP) {
             rls.yank_len = 0;
         }
 
-        // Restore the text.
-        if (readline_cmd) {
-            if (*readline_cmd == rl::R_CANCEL && is_navigating_pager_contents()) {
+        if (event_needing_handling->is_readline()) {
+            readline_cmd_t readline_cmd = event_needing_handling->get_readline();
+            // If we get something other than a repaint, then stop coalescing them.
+            if (readline_cmd != rl::R_REPAINT) rls.coalescing_repaints = false;
+
+            if (readline_cmd == rl::R_CANCEL && is_navigating_pager_contents()) {
                 set_command_line_and_position(&command_line, cycle_command_line, cycle_cursor_pos);
             }
 
             // Clear the pager if necessary.
             bool focused_on_search_field = (active_edit_line() == &pager.search_field_line);
-            if (command_ends_paging(*readline_cmd, focused_on_search_field)) {
+            if (command_ends_paging(readline_cmd, focused_on_search_field)) {
                 clear_pager();
             }
 
-            handle_readline_command(*readline_cmd, rls);
+            handle_readline_command(readline_cmd, rls);
 
-            if (!readline_cmd || command_ends_history_search(*readline_cmd)) {
+            if (command_ends_history_search(readline_cmd)) {
                 history_search.reset();
             }
             rls.last_cmd = readline_cmd;
-        }
-
-        if (ordinary_char) {
-            wchar_t c = *ordinary_char;
-
+        } else {
+            // Ordinary char.
+            wchar_t c = event_needing_handling->get_char();
             if (c == L'\x1B') {
                 // Escape was pressed.
                 if (history_search.active()) {
@@ -3339,6 +3330,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
                 // reason to report this to the user unless they've enabled debugging output.
                 debug(2, _(L"Unknown key binding 0x%X"), c);
             }
+            rls.last_cmd = none();
         }
 
         repaint_if_needed();

From e7d7eff0eeee5966d485b6e72f8794c0353a8bfa Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Mar 2019 17:32:39 -0700
Subject: [PATCH 0141/1732] Rename all readline commands to lowercase and
 remove R_ prefix

---
 src/fish_tests.cpp |   4 +-
 src/input.cpp      | 128 ++++++++++----------
 src/input_common.h | 120 +++++++++----------
 src/reader.cpp     | 284 ++++++++++++++++++++++-----------------------
 4 files changed, 268 insertions(+), 268 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 7d6a7109e..dfee85398 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2999,8 +2999,8 @@ static void test_input() {
     auto evt = input_readch();
     if (!evt.is_readline()) {
         err(L"Event is not a readline");
-    } else if (evt.get_readline() != readline_cmd_t::R_DOWN_LINE) {
-        err(L"Expected to read char R_DOWN_LINE");
+    } else if (evt.get_readline() != readline_cmd_t::down_line) {
+        err(L"Expected to read char down_line");
     }
 }
 
diff --git a/src/input.cpp b/src/input.cpp
index 860edb2b4..256e0f62c 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -72,64 +72,64 @@ struct input_function_metadata_t {
 };
 
 static const input_function_metadata_t input_function_metadata[] = {
-    {readline_cmd_t::R_BEGINNING_OF_LINE, L"beginning-of-line"},
-    {readline_cmd_t::R_END_OF_LINE, L"end-of-line"},
-    {readline_cmd_t::R_FORWARD_CHAR, L"forward-char"},
-    {readline_cmd_t::R_BACKWARD_CHAR, L"backward-char"},
-    {readline_cmd_t::R_FORWARD_WORD, L"forward-word"},
-    {readline_cmd_t::R_BACKWARD_WORD, L"backward-word"},
-    {readline_cmd_t::R_FORWARD_BIGWORD, L"forward-bigword"},
-    {readline_cmd_t::R_BACKWARD_BIGWORD, L"backward-bigword"},
-    {readline_cmd_t::R_HISTORY_SEARCH_BACKWARD, L"history-search-backward"},
-    {readline_cmd_t::R_HISTORY_SEARCH_FORWARD, L"history-search-forward"},
-    {readline_cmd_t::R_DELETE_CHAR, L"delete-char"},
-    {readline_cmd_t::R_BACKWARD_DELETE_CHAR, L"backward-delete-char"},
-    {readline_cmd_t::R_KILL_LINE, L"kill-line"},
-    {readline_cmd_t::R_YANK, L"yank"},
-    {readline_cmd_t::R_YANK_POP, L"yank-pop"},
-    {readline_cmd_t::R_COMPLETE, L"complete"},
-    {readline_cmd_t::R_COMPLETE_AND_SEARCH, L"complete-and-search"},
-    {readline_cmd_t::R_PAGER_TOGGLE_SEARCH, L"pager-toggle-search"},
-    {readline_cmd_t::R_BEGINNING_OF_HISTORY, L"beginning-of-history"},
-    {readline_cmd_t::R_END_OF_HISTORY, L"end-of-history"},
-    {readline_cmd_t::R_BACKWARD_KILL_LINE, L"backward-kill-line"},
-    {readline_cmd_t::R_KILL_WHOLE_LINE, L"kill-whole-line"},
-    {readline_cmd_t::R_KILL_WORD, L"kill-word"},
-    {readline_cmd_t::R_KILL_BIGWORD, L"kill-bigword"},
-    {readline_cmd_t::R_BACKWARD_KILL_WORD, L"backward-kill-word"},
-    {readline_cmd_t::R_BACKWARD_KILL_PATH_COMPONENT, L"backward-kill-path-component"},
-    {readline_cmd_t::R_BACKWARD_KILL_BIGWORD, L"backward-kill-bigword"},
-    {readline_cmd_t::R_HISTORY_TOKEN_SEARCH_BACKWARD, L"history-token-search-backward"},
-    {readline_cmd_t::R_HISTORY_TOKEN_SEARCH_FORWARD, L"history-token-search-forward"},
-    {readline_cmd_t::R_SELF_INSERT, L"self-insert"},
-    {readline_cmd_t::R_TRANSPOSE_CHARS, L"transpose-chars"},
-    {readline_cmd_t::R_TRANSPOSE_WORDS, L"transpose-words"},
-    {readline_cmd_t::R_UPCASE_WORD, L"upcase-word"},
-    {readline_cmd_t::R_DOWNCASE_WORD, L"downcase-word"},
-    {readline_cmd_t::R_CAPITALIZE_WORD, L"capitalize-word"},
-    {readline_cmd_t::R_VI_ARG_DIGIT, L"vi-arg-digit"},
-    {readline_cmd_t::R_VI_DELETE_TO, L"vi-delete-to"},
-    {readline_cmd_t::R_EXECUTE, L"execute"},
-    {readline_cmd_t::R_BEGINNING_OF_BUFFER, L"beginning-of-buffer"},
-    {readline_cmd_t::R_END_OF_BUFFER, L"end-of-buffer"},
-    {readline_cmd_t::R_REPAINT, L"repaint"},
-    {readline_cmd_t::R_FORCE_REPAINT, L"force-repaint"},
-    {readline_cmd_t::R_UP_LINE, L"up-line"},
-    {readline_cmd_t::R_DOWN_LINE, L"down-line"},
-    {readline_cmd_t::R_SUPPRESS_AUTOSUGGESTION, L"suppress-autosuggestion"},
-    {readline_cmd_t::R_ACCEPT_AUTOSUGGESTION, L"accept-autosuggestion"},
-    {readline_cmd_t::R_BEGIN_SELECTION, L"begin-selection"},
-    {readline_cmd_t::R_SWAP_SELECTION_START_STOP, L"swap-selection-start-stop"},
-    {readline_cmd_t::R_END_SELECTION, L"end-selection"},
-    {readline_cmd_t::R_KILL_SELECTION, L"kill-selection"},
-    {readline_cmd_t::R_FORWARD_JUMP, L"forward-jump"},
-    {readline_cmd_t::R_BACKWARD_JUMP, L"backward-jump"},
-    {readline_cmd_t::R_FORWARD_JUMP_TILL, L"forward-jump-till"},
-    {readline_cmd_t::R_BACKWARD_JUMP_TILL, L"backward-jump-till"},
-    {readline_cmd_t::R_REPEAT_JUMP, L"repeat-jump"},
-    {readline_cmd_t::R_REVERSE_REPEAT_JUMP, L"repeat-jump-reverse"},
-    {readline_cmd_t::R_AND, L"and"},
-    {readline_cmd_t::R_CANCEL, L"cancel"}};
+    {readline_cmd_t::beginning_of_line, L"beginning-of-line"},
+    {readline_cmd_t::end_of_line, L"end-of-line"},
+    {readline_cmd_t::forward_char, L"forward-char"},
+    {readline_cmd_t::backward_char, L"backward-char"},
+    {readline_cmd_t::forward_word, L"forward-word"},
+    {readline_cmd_t::backward_word, L"backward-word"},
+    {readline_cmd_t::forward_bigword, L"forward-bigword"},
+    {readline_cmd_t::backward_bigword, L"backward-bigword"},
+    {readline_cmd_t::history_search_backward, L"history-search-backward"},
+    {readline_cmd_t::history_search_forward, L"history-search-forward"},
+    {readline_cmd_t::delete_char, L"delete-char"},
+    {readline_cmd_t::backward_delete_char, L"backward-delete-char"},
+    {readline_cmd_t::kill_line, L"kill-line"},
+    {readline_cmd_t::yank, L"yank"},
+    {readline_cmd_t::yank_POP, L"yank-pop"},
+    {readline_cmd_t::complete, L"complete"},
+    {readline_cmd_t::complete_AND_SEARCH, L"complete-and-search"},
+    {readline_cmd_t::pager_toggle_search, L"pager-toggle-search"},
+    {readline_cmd_t::beginning_of_history, L"beginning-of-history"},
+    {readline_cmd_t::end_of_history, L"end-of-history"},
+    {readline_cmd_t::backward_kill_line, L"backward-kill-line"},
+    {readline_cmd_t::kill_whole_line, L"kill-whole-line"},
+    {readline_cmd_t::kill_word, L"kill-word"},
+    {readline_cmd_t::kill_bigword, L"kill-bigword"},
+    {readline_cmd_t::backward_kill_word, L"backward-kill-word"},
+    {readline_cmd_t::backward_kill_path_component, L"backward-kill-path-component"},
+    {readline_cmd_t::backward_kill_bigword, L"backward-kill-bigword"},
+    {readline_cmd_t::history_token_search_backward, L"history-token-search-backward"},
+    {readline_cmd_t::history_token_search_forward, L"history-token-search-forward"},
+    {readline_cmd_t::self_insert, L"self-insert"},
+    {readline_cmd_t::transpose_chars, L"transpose-chars"},
+    {readline_cmd_t::transpose_words, L"transpose-words"},
+    {readline_cmd_t::upcase_word, L"upcase-word"},
+    {readline_cmd_t::downcase_word, L"downcase-word"},
+    {readline_cmd_t::capitalize_word, L"capitalize-word"},
+    {readline_cmd_t::vi_arg_digit, L"vi-arg-digit"},
+    {readline_cmd_t::vi_delete_to, L"vi-delete-to"},
+    {readline_cmd_t::execute, L"execute"},
+    {readline_cmd_t::beginning_of_buffer, L"beginning-of-buffer"},
+    {readline_cmd_t::end_of_buffer, L"end-of-buffer"},
+    {readline_cmd_t::repaint, L"repaint"},
+    {readline_cmd_t::force_repaint, L"force-repaint"},
+    {readline_cmd_t::up_line, L"up-line"},
+    {readline_cmd_t::down_line, L"down-line"},
+    {readline_cmd_t::suppress_autosuggestion, L"suppress-autosuggestion"},
+    {readline_cmd_t::accept_autosuggestion, L"accept-autosuggestion"},
+    {readline_cmd_t::begin_selection, L"begin-selection"},
+    {readline_cmd_t::swap_selection_start_stop, L"swap-selection-start-stop"},
+    {readline_cmd_t::end_selection, L"end-selection"},
+    {readline_cmd_t::kill_selection, L"kill-selection"},
+    {readline_cmd_t::forward_jump, L"forward-jump"},
+    {readline_cmd_t::backward_jump, L"backward-jump"},
+    {readline_cmd_t::forward_jump_till, L"forward-jump-till"},
+    {readline_cmd_t::backward_jump_till, L"backward-jump-till"},
+    {readline_cmd_t::repeat_jump, L"repeat-jump"},
+    {readline_cmd_t::reverse_repeat_jump, L"repeat-jump-reverse"},
+    {readline_cmd_t::func_and, L"and"},
+    {readline_cmd_t::cancel, L"cancel"}};
 
 static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0]) ==
                   input_function_count,
@@ -185,10 +185,10 @@ void input_set_bind_mode(const wcstring &bm) {
 /// Returns the arity of a given input function.
 static int input_function_arity(readline_cmd_t function) {
     switch (function) {
-        case readline_cmd_t::R_FORWARD_JUMP:
-        case readline_cmd_t::R_BACKWARD_JUMP:
-        case readline_cmd_t::R_FORWARD_JUMP_TILL:
-        case readline_cmd_t::R_BACKWARD_JUMP_TILL:
+        case readline_cmd_t::forward_jump:
+        case readline_cmd_t::backward_jump:
+        case readline_cmd_t::forward_jump_till:
+        case readline_cmd_t::backward_jump_till:
             return 1;
         default:
             return 0;
@@ -481,12 +481,12 @@ char_event_t input_readch(bool allow_commands) {
 
         if (evt.is_readline()) {
             switch (evt.get_readline()) {
-                case readline_cmd_t::R_SELF_INSERT: {
+                case readline_cmd_t::self_insert: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
                     return input_read_characters_no_readline();
                 }
-                case readline_cmd_t::R_AND: {
+                case readline_cmd_t::func_and: {
                     if (input_function_status) {
                         return input_readch();
                     }
diff --git a/src/input_common.h b/src/input_common.h
index 7bbf5bed7..27ad36d98 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -10,70 +10,70 @@
 #include "maybe.h"
 
 enum class readline_cmd_t {
-    R_BEGINNING_OF_LINE = INPUT_COMMON_BASE,
-    R_END_OF_LINE,
-    R_FORWARD_CHAR,
-    R_BACKWARD_CHAR,
-    R_FORWARD_WORD,
-    R_BACKWARD_WORD,
-    R_FORWARD_BIGWORD,
-    R_BACKWARD_BIGWORD,
-    R_HISTORY_SEARCH_BACKWARD,
-    R_HISTORY_SEARCH_FORWARD,
-    R_DELETE_CHAR,
-    R_BACKWARD_DELETE_CHAR,
-    R_KILL_LINE,
-    R_YANK,
-    R_YANK_POP,
-    R_COMPLETE,
-    R_COMPLETE_AND_SEARCH,
-    R_PAGER_TOGGLE_SEARCH,
-    R_BEGINNING_OF_HISTORY,
-    R_END_OF_HISTORY,
-    R_BACKWARD_KILL_LINE,
-    R_KILL_WHOLE_LINE,
-    R_KILL_WORD,
-    R_KILL_BIGWORD,
-    R_BACKWARD_KILL_WORD,
-    R_BACKWARD_KILL_PATH_COMPONENT,
-    R_BACKWARD_KILL_BIGWORD,
-    R_HISTORY_TOKEN_SEARCH_BACKWARD,
-    R_HISTORY_TOKEN_SEARCH_FORWARD,
-    R_SELF_INSERT,
-    R_TRANSPOSE_CHARS,
-    R_TRANSPOSE_WORDS,
-    R_UPCASE_WORD,
-    R_DOWNCASE_WORD,
-    R_CAPITALIZE_WORD,
-    R_VI_ARG_DIGIT,
-    R_VI_DELETE_TO,
-    R_EXECUTE,
-    R_BEGINNING_OF_BUFFER,
-    R_END_OF_BUFFER,
-    R_REPAINT,
-    R_FORCE_REPAINT,
-    R_UP_LINE,
-    R_DOWN_LINE,
-    R_SUPPRESS_AUTOSUGGESTION,
-    R_ACCEPT_AUTOSUGGESTION,
-    R_BEGIN_SELECTION,
-    R_SWAP_SELECTION_START_STOP,
-    R_END_SELECTION,
-    R_KILL_SELECTION,
-    R_FORWARD_JUMP,
-    R_BACKWARD_JUMP,
-    R_FORWARD_JUMP_TILL,
-    R_BACKWARD_JUMP_TILL,
-    R_AND,
-    R_CANCEL,
-    R_REPEAT_JUMP,
-    R_REVERSE_REPEAT_JUMP,
+    beginning_of_line = INPUT_COMMON_BASE,
+    end_of_line,
+    forward_char,
+    backward_char,
+    forward_word,
+    backward_word,
+    forward_bigword,
+    backward_bigword,
+    history_search_backward,
+    history_search_forward,
+    delete_char,
+    backward_delete_char,
+    kill_line,
+    yank,
+    yank_POP,
+    complete,
+    complete_AND_SEARCH,
+    pager_toggle_search,
+    beginning_of_history,
+    end_of_history,
+    backward_kill_line,
+    kill_whole_line,
+    kill_word,
+    kill_bigword,
+    backward_kill_word,
+    backward_kill_path_component,
+    backward_kill_bigword,
+    history_token_search_backward,
+    history_token_search_forward,
+    self_insert,
+    transpose_chars,
+    transpose_words,
+    upcase_word,
+    downcase_word,
+    capitalize_word,
+    vi_arg_digit,
+    vi_delete_to,
+    execute,
+    beginning_of_buffer,
+    end_of_buffer,
+    repaint,
+    force_repaint,
+    up_line,
+    down_line,
+    suppress_autosuggestion,
+    accept_autosuggestion,
+    begin_selection,
+    swap_selection_start_stop,
+    end_selection,
+    kill_selection,
+    forward_jump,
+    backward_jump,
+    forward_jump_till,
+    backward_jump_till,
+    func_and,
+    cancel,
+    repeat_jump,
+    reverse_repeat_jump,
 };
 
 // The range of key codes for inputrc-style keyboard functions.
 enum {
-    R_BEGIN_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::R_BEGINNING_OF_LINE),
-    R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::R_REVERSE_REPEAT_JUMP) + 1
+    R_BEGIN_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::beginning_of_line),
+    R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::reverse_repeat_jump) + 1
 };
 
 /// Represents an event on the character input stream.
diff --git a/src/reader.cpp b/src/reader.cpp
index d11b72124..409e69b46 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1034,61 +1034,61 @@ void reader_force_exit() {
 static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field) {
     using rl = readline_cmd_t;
     switch (c) {
-        case rl::R_HISTORY_SEARCH_BACKWARD:
-        case rl::R_HISTORY_SEARCH_FORWARD:
-        case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
-        case rl::R_HISTORY_TOKEN_SEARCH_FORWARD:
-        case rl::R_ACCEPT_AUTOSUGGESTION:
-        case rl::R_CANCEL: {
+        case rl::history_search_backward:
+        case rl::history_search_forward:
+        case rl::history_token_search_backward:
+        case rl::history_token_search_forward:
+        case rl::accept_autosuggestion:
+        case rl::cancel: {
             // These commands always end paging.
             return true;
         }
-        case rl::R_COMPLETE:
-        case rl::R_COMPLETE_AND_SEARCH:
-        case rl::R_BACKWARD_CHAR:
-        case rl::R_FORWARD_CHAR:
-        case rl::R_UP_LINE:
-        case rl::R_DOWN_LINE:
-        case rl::R_REPAINT:
-        case rl::R_SUPPRESS_AUTOSUGGESTION:
-        case rl::R_BEGINNING_OF_HISTORY:
-        case rl::R_END_OF_HISTORY: {
+        case rl::complete:
+        case rl::complete_AND_SEARCH:
+        case rl::backward_char:
+        case rl::forward_char:
+        case rl::up_line:
+        case rl::down_line:
+        case rl::repaint:
+        case rl::suppress_autosuggestion:
+        case rl::beginning_of_history:
+        case rl::end_of_history: {
             // These commands never end paging.
             return false;
         }
-        case rl::R_EXECUTE: {
-            // R_EXECUTE does end paging, but only executes if it was not paging. So it's handled
+        case rl::execute: {
+            // execute does end paging, but only executes if it was not paging. So it's handled
             // specially.
             return false;
         }
-        case rl::R_BEGINNING_OF_LINE:
-        case rl::R_END_OF_LINE:
-        case rl::R_FORWARD_WORD:
-        case rl::R_BACKWARD_WORD:
-        case rl::R_FORWARD_BIGWORD:
-        case rl::R_BACKWARD_BIGWORD:
-        case rl::R_DELETE_CHAR:
-        case rl::R_BACKWARD_DELETE_CHAR:
-        case rl::R_KILL_LINE:
-        case rl::R_YANK:
-        case rl::R_YANK_POP:
-        case rl::R_BACKWARD_KILL_LINE:
-        case rl::R_KILL_WHOLE_LINE:
-        case rl::R_KILL_WORD:
-        case rl::R_KILL_BIGWORD:
-        case rl::R_BACKWARD_KILL_WORD:
-        case rl::R_BACKWARD_KILL_PATH_COMPONENT:
-        case rl::R_BACKWARD_KILL_BIGWORD:
-        case rl::R_SELF_INSERT:
-        case rl::R_TRANSPOSE_CHARS:
-        case rl::R_TRANSPOSE_WORDS:
-        case rl::R_UPCASE_WORD:
-        case rl::R_DOWNCASE_WORD:
-        case rl::R_CAPITALIZE_WORD:
-        case rl::R_VI_ARG_DIGIT:
-        case rl::R_VI_DELETE_TO:
-        case rl::R_BEGINNING_OF_BUFFER:
-        case rl::R_END_OF_BUFFER:
+        case rl::beginning_of_line:
+        case rl::end_of_line:
+        case rl::forward_word:
+        case rl::backward_word:
+        case rl::forward_bigword:
+        case rl::backward_bigword:
+        case rl::delete_char:
+        case rl::backward_delete_char:
+        case rl::kill_line:
+        case rl::yank:
+        case rl::yank_POP:
+        case rl::backward_kill_line:
+        case rl::kill_whole_line:
+        case rl::kill_word:
+        case rl::kill_bigword:
+        case rl::backward_kill_word:
+        case rl::backward_kill_path_component:
+        case rl::backward_kill_bigword:
+        case rl::self_insert:
+        case rl::transpose_chars:
+        case rl::transpose_words:
+        case rl::upcase_word:
+        case rl::downcase_word:
+        case rl::capitalize_word:
+        case rl::vi_arg_digit:
+        case rl::vi_delete_to:
+        case rl::beginning_of_buffer:
+        case rl::end_of_buffer:
             // These commands operate on the search field if that's where the focus is.
             return !focused_on_search_field;
         default:
@@ -1099,12 +1099,12 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
 /// Indicates if the given command ends the history search.
 static bool command_ends_history_search(readline_cmd_t c) {
     switch (c) {
-        case readline_cmd_t::R_HISTORY_SEARCH_BACKWARD:
-        case readline_cmd_t::R_HISTORY_SEARCH_FORWARD:
-        case readline_cmd_t::R_HISTORY_TOKEN_SEARCH_BACKWARD:
-        case readline_cmd_t::R_HISTORY_TOKEN_SEARCH_FORWARD:
-        case readline_cmd_t::R_REPAINT:
-        case readline_cmd_t::R_FORCE_REPAINT:
+        case readline_cmd_t::history_search_backward:
+        case readline_cmd_t::history_search_forward:
+        case readline_cmd_t::history_token_search_backward:
+        case readline_cmd_t::history_token_search_forward:
+        case readline_cmd_t::repaint:
+        case readline_cmd_t::force_repaint:
             return false;
         default:
             return true;
@@ -2491,7 +2491,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
     using rl = readline_cmd_t;
     switch (c) {
         // Go to beginning of line.
-        case rl::R_BEGINNING_OF_LINE: {
+        case rl::beginning_of_line: {
             editable_line_t *el = active_edit_line();
             while (el->position > 0 && el->text.at(el->position - 1) != L'\n') {
                 update_buff_pos(el, el->position - 1);
@@ -2500,7 +2500,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::R_END_OF_LINE: {
+        case rl::end_of_line: {
             editable_line_t *el = active_edit_line();
             if (el->position < el->size()) {
                 const wchar_t *buff = el->text.c_str();
@@ -2514,22 +2514,22 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::R_BEGINNING_OF_BUFFER: {
+        case rl::beginning_of_buffer: {
             update_buff_pos(&command_line, 0);
             reader_repaint_needed();
             break;
         }
-        case rl::R_END_OF_BUFFER: {
+        case rl::end_of_buffer: {
             update_buff_pos(&command_line, command_line.size());
             reader_repaint_needed();
             break;
         }
-        case rl::R_CANCEL: {
+        case rl::cancel: {
             // The only thing we can cancel right now is paging, which we handled up above.
             break;
         }
-        case rl::R_FORCE_REPAINT:
-        case rl::R_REPAINT: {
+        case rl::force_repaint:
+        case rl::repaint: {
             if (!rls.coalescing_repaints) {
                 rls.coalescing_repaints = true;
                 exec_prompt();
@@ -2539,21 +2539,21 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_COMPLETE:
-        case rl::R_COMPLETE_AND_SEARCH: {
+        case rl::complete:
+        case rl::complete_AND_SEARCH: {
             if (!complete_func) break;
 
             // Use the command line only; it doesn't make sense to complete in any other line.
             editable_line_t *el = &command_line;
             if (is_navigating_pager_contents() ||
-                (!rls.comp_empty && rls.last_cmd == rl::R_COMPLETE)) {
-                // The user typed R_COMPLETE more than once in a row. If we are not yet fully
+                (!rls.comp_empty && rls.last_cmd == rl::complete)) {
+                // The user typed complete more than once in a row. If we are not yet fully
                 // disclosed, then become so; otherwise cycle through our available completions.
                 if (current_page_rendering.remaining_to_disclose > 0) {
                     pager.set_fully_disclosed(true);
                     reader_repaint_needed();
                 } else {
-                    select_completion_in_direction(c == rl::R_COMPLETE ? direction_next
+                    select_completion_in_direction(c == rl::complete ? direction_next
                                                                        : direction_prev);
                 }
             } else {
@@ -2613,11 +2613,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 cycle_command_line = el->text;
                 cycle_cursor_pos = el->position;
 
-                bool cont_after_prefix_insertion = (c == rl::R_COMPLETE_AND_SEARCH);
+                bool cont_after_prefix_insertion = (c == rl::complete_AND_SEARCH);
                 rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
 
                 // Show the search field if requested and if we printed a list of completions.
-                if (c == rl::R_COMPLETE_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
+                if (c == rl::complete_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
                     pager.set_search_field_shown(true);
                     select_completion_in_direction(direction_next);
                     reader_repaint_needed();
@@ -2625,7 +2625,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_PAGER_TOGGLE_SEARCH: {
+        case rl::pager_toggle_search: {
             if (!pager.empty()) {
                 // Toggle search, and begin navigating if we are now searching.
                 bool sfs = pager.is_search_field_shown();
@@ -2638,7 +2638,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_KILL_LINE: {
+        case rl::kill_line: {
             editable_line_t *el = active_edit_line();
             const wchar_t *buff = el->text.c_str();
             const wchar_t *begin = &buff[el->position];
@@ -2650,11 +2650,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
             size_t len = end - begin;
             if (len) {
-                kill(el, begin - buff, len, KILL_APPEND, rls.last_cmd != rl::R_KILL_LINE);
+                kill(el, begin - buff, len, KILL_APPEND, rls.last_cmd != rl::kill_line);
             }
             break;
         }
-        case rl::R_BACKWARD_KILL_LINE: {
+        case rl::backward_kill_line: {
             editable_line_t *el = active_edit_line();
             if (el->position <= 0) {
                 break;
@@ -2673,10 +2673,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             assert(end >= begin);
             size_t len = std::max<size_t>(end - begin, 1);
             begin = end - len;
-            kill(el, begin - buff, len, KILL_PREPEND, rls.last_cmd != rl::R_BACKWARD_KILL_LINE);
+            kill(el, begin - buff, len, KILL_PREPEND, rls.last_cmd != rl::backward_kill_line);
             break;
         }
-        case rl::R_KILL_WHOLE_LINE: {
+        case rl::kill_whole_line: {
             // We match the emacs behavior here: "kills the entire line including the following
             // newline".
             editable_line_t *el = active_edit_line();
@@ -2702,17 +2702,17 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             assert(end >= begin);
 
             if (end > begin) {
-                kill(el, begin, end - begin, KILL_APPEND, rls.last_cmd != rl::R_KILL_WHOLE_LINE);
+                kill(el, begin, end - begin, KILL_APPEND, rls.last_cmd != rl::kill_whole_line);
             }
             break;
         }
-        case rl::R_YANK: {
+        case rl::yank: {
             wcstring yank_str = kill_yank();
             insert_string(active_edit_line(), yank_str);
             rls.yank_len = yank_str.size();
             break;
         }
-        case rl::R_YANK_POP: {
+        case rl::yank_POP: {
             if (rls.yank_len) {
                 for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
 
@@ -2722,11 +2722,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_BACKWARD_DELETE_CHAR: {
+        case rl::backward_delete_char: {
             remove_backward();
             break;
         }
-        case rl::R_DELETE_CHAR: {
+        case rl::delete_char: {
             // Remove the current character in the character buffer and on the screen using
             // syntax highlighting, etc.
             editable_line_t *el = active_edit_line();
@@ -2738,7 +2738,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
             // Evaluate. If the current command is unfinished, or if the charater is escaped
             // using a backslash, insert a newline.
-        case rl::R_EXECUTE: {
+        case rl::execute: {
             // If the user hits return while navigating the pager, it only clears the pager.
             if (is_navigating_pager_contents()) {
                 clear_pager();
@@ -2821,14 +2821,14 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             break;
         }
 
-        case rl::R_HISTORY_SEARCH_BACKWARD:
-        case rl::R_HISTORY_TOKEN_SEARCH_BACKWARD:
-        case rl::R_HISTORY_SEARCH_FORWARD:
-        case rl::R_HISTORY_TOKEN_SEARCH_FORWARD: {
+        case rl::history_search_backward:
+        case rl::history_token_search_backward:
+        case rl::history_search_forward:
+        case rl::history_token_search_forward: {
             if (history_search.is_at_end()) {
                 const editable_line_t *el = &command_line;
-                bool by_token = (c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD) ||
-                                (c == rl::R_HISTORY_TOKEN_SEARCH_FORWARD);
+                bool by_token = (c == rl::history_token_search_backward) ||
+                                (c == rl::history_token_search_forward);
                 if (by_token) {
                     // Searching by token.
                     const wchar_t *begin, *end;
@@ -2855,7 +2855,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             if (history_search.active()) {
                 history_search_direction_t dir =
-                    (c == rl::R_HISTORY_SEARCH_BACKWARD || c == rl::R_HISTORY_TOKEN_SEARCH_BACKWARD)
+                    (c == rl::history_search_backward || c == rl::history_token_search_backward)
                         ? history_search_direction_t::backward
                         : history_search_direction_t::forward;
                 history_search.move_in_direction(dir);
@@ -2863,7 +2863,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_BACKWARD_CHAR: {
+        case rl::backward_char: {
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
                 select_completion_in_direction(direction_west);
@@ -2873,7 +2873,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_FORWARD_CHAR: {
+        case rl::forward_char: {
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
                 select_completion_in_direction(direction_east);
@@ -2885,42 +2885,42 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_BACKWARD_KILL_WORD:
-        case rl::R_BACKWARD_KILL_PATH_COMPONENT:
-        case rl::R_BACKWARD_KILL_BIGWORD: {
+        case rl::backward_kill_word:
+        case rl::backward_kill_path_component:
+        case rl::backward_kill_bigword: {
             move_word_style_t style =
-                (c == rl::R_BACKWARD_KILL_BIGWORD
+                (c == rl::backward_kill_bigword
                      ? move_word_style_whitespace
-                     : c == rl::R_BACKWARD_KILL_PATH_COMPONENT ? move_word_style_path_components
+                     : c == rl::backward_kill_path_component ? move_word_style_path_components
                                                                : move_word_style_punctuation);
             // Is this the same killring item as the last kill?
-            bool newv = (rls.last_cmd != rl::R_BACKWARD_KILL_WORD &&
-                         rls.last_cmd != rl::R_BACKWARD_KILL_PATH_COMPONENT &&
-                         rls.last_cmd != rl::R_BACKWARD_KILL_BIGWORD);
+            bool newv = (rls.last_cmd != rl::backward_kill_word &&
+                         rls.last_cmd != rl::backward_kill_path_component &&
+                         rls.last_cmd != rl::backward_kill_bigword);
             move_word(active_edit_line(), MOVE_DIR_LEFT, true /* erase */, style, newv);
             break;
         }
-        case rl::R_KILL_WORD:
-        case rl::R_KILL_BIGWORD: {
+        case rl::kill_word:
+        case rl::kill_bigword: {
             // The "bigword" functions differ only in that they move to the next whitespace, not
             // punctuation.
             auto move_style =
-                (c == rl::R_KILL_WORD) ? move_word_style_punctuation : move_word_style_whitespace;
+                (c == rl::kill_word) ? move_word_style_punctuation : move_word_style_whitespace;
             move_word(active_edit_line(), MOVE_DIR_RIGHT, true /* erase */, move_style,
                       rls.last_cmd != c /* same kill item if same movement */);
             break;
         }
-        case rl::R_BACKWARD_WORD:
-        case rl::R_BACKWARD_BIGWORD: {
-            auto move_style = (c == rl::R_BACKWARD_WORD) ? move_word_style_punctuation
+        case rl::backward_word:
+        case rl::backward_bigword: {
+            auto move_style = (c == rl::backward_word) ? move_word_style_punctuation
                                                          : move_word_style_whitespace;
             move_word(active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_style,
                       false);
             break;
         }
-        case rl::R_FORWARD_WORD:
-        case rl::R_FORWARD_BIGWORD: {
-            auto move_style = (c == rl::R_FORWARD_WORD) ? move_word_style_punctuation
+        case rl::forward_word:
+        case rl::forward_bigword: {
+            auto move_style = (c == rl::forward_word) ? move_word_style_punctuation
                                                         : move_word_style_whitespace;
             editable_line_t *el = active_edit_line();
             if (el->position < el->size()) {
@@ -2930,9 +2930,9 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_BEGINNING_OF_HISTORY:
-        case rl::R_END_OF_HISTORY: {
-            bool up = (c == rl::R_BEGINNING_OF_HISTORY);
+        case rl::beginning_of_history:
+        case rl::end_of_history: {
+            bool up = (c == rl::beginning_of_history);
             if (is_navigating_pager_contents()) {
                 select_completion_in_direction(up ? direction_page_north : direction_page_south);
             } else {
@@ -2945,12 +2945,12 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_UP_LINE:
-        case rl::R_DOWN_LINE: {
+        case rl::up_line:
+        case rl::down_line: {
             if (is_navigating_pager_contents()) {
                 // We are already navigating pager contents.
                 selection_direction_t direction;
-                if (c == rl::R_DOWN_LINE) {
+                if (c == rl::down_line) {
                     // Down arrow is always south.
                     direction = direction_south;
                 } else if (selection_is_at_top()) {
@@ -2965,7 +2965,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 select_completion_in_direction(direction);
             } else if (!pager.empty()) {
                 // We pressed a direction with a non-empty pager, begin navigation.
-                select_completion_in_direction(c == rl::R_DOWN_LINE ? direction_south
+                select_completion_in_direction(c == rl::down_line ? direction_south
                                                                     : direction_north);
             } else {
                 // Not navigating the pager contents.
@@ -2973,7 +2973,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 int line_old = parse_util_get_line_from_offset(el->text, el->position);
                 int line_new;
 
-                if (c == rl::R_UP_LINE)
+                if (c == rl::up_line)
                     line_new = line_old - 1;
                 else
                     line_new = line_old + 1;
@@ -3007,17 +3007,17 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_SUPPRESS_AUTOSUGGESTION: {
+        case rl::suppress_autosuggestion: {
             suppress_autosuggestion = true;
             autosuggestion.clear();
             reader_repaint_needed();
             break;
         }
-        case rl::R_ACCEPT_AUTOSUGGESTION: {
+        case rl::accept_autosuggestion: {
             accept_autosuggestion(true);
             break;
         }
-        case rl::R_TRANSPOSE_CHARS: {
+        case rl::transpose_chars: {
             editable_line_t *el = active_edit_line();
             if (el->size() < 2) {
                 break;
@@ -3037,7 +3037,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_TRANSPOSE_WORDS: {
+        case rl::transpose_words: {
             editable_line_t *el = active_edit_line();
             size_t len = el->size();
             const wchar_t *buff = el->text.c_str();
@@ -3077,9 +3077,9 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             break;
         }
-        case rl::R_UPCASE_WORD:
-        case rl::R_DOWNCASE_WORD:
-        case rl::R_CAPITALIZE_WORD: {
+        case rl::upcase_word:
+        case rl::downcase_word:
+        case rl::capitalize_word: {
             editable_line_t *el = active_edit_line();
             // For capitalize_word, whether we've capitalized a character so far.
             bool capitalized_first = false;
@@ -3093,10 +3093,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // We always change the case; this decides whether we go uppercase (true) or
                 // lowercase (false).
                 bool make_uppercase;
-                if (c == rl::R_CAPITALIZE_WORD)
+                if (c == rl::capitalize_word)
                     make_uppercase = !capitalized_first && iswalnum(chr);
                 else
-                    make_uppercase = (c == rl::R_UPCASE_WORD);
+                    make_uppercase = (c == rl::upcase_word);
 
                 // Apply the operation and then record what we did.
                 if (make_uppercase)
@@ -3112,11 +3112,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::R_BEGIN_SELECTION:
-        case rl::R_END_SELECTION: {
+        case rl::begin_selection:
+        case rl::end_selection: {
             sel_start_pos = command_line.position;
             sel_stop_pos = command_line.position;
-            if (c == rl::R_BEGIN_SELECTION) {
+            if (c == rl::begin_selection) {
                 sel_active = true;
                 sel_begin_pos = command_line.position;
             } else {
@@ -3125,7 +3125,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
             break;
         }
-        case rl::R_SWAP_SELECTION_START_STOP: {
+        case rl::swap_selection_start_stop: {
             if (!sel_active) break;
             size_t tmp = sel_begin_pos;
             sel_begin_pos = command_line.position;
@@ -3134,22 +3134,22 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             update_buff_pos(el, tmp);
             break;
         }
-        case rl::R_KILL_SELECTION: {
-            bool newv = (rls.last_cmd != rl::R_KILL_SELECTION);
+        case rl::kill_selection: {
+            bool newv = (rls.last_cmd != rl::kill_selection);
             size_t start, len;
             if (reader_get_selection(&start, &len)) {
                 kill(&command_line, start, len, KILL_APPEND, newv);
             }
             break;
         }
-        case rl::R_FORWARD_JUMP:
-        case rl::R_BACKWARD_JUMP:
-        case rl::R_FORWARD_JUMP_TILL:
-        case rl::R_BACKWARD_JUMP_TILL: {
-            auto direction = (c == rl::R_FORWARD_JUMP || c == rl::R_FORWARD_JUMP_TILL)
+        case rl::forward_jump:
+        case rl::backward_jump:
+        case rl::forward_jump_till:
+        case rl::backward_jump_till: {
+            auto direction = (c == rl::forward_jump || c == rl::forward_jump_till)
                                  ? jump_direction_t::forward
                                  : jump_direction_t::backward;
-            auto precision = (c == rl::R_FORWARD_JUMP || c == rl::R_BACKWARD_JUMP)
+            auto precision = (c == rl::forward_jump || c == rl::backward_jump)
                                  ? jump_precision_t::to
                                  : jump_precision_t::till;
             editable_line_t *el = active_edit_line();
@@ -3160,7 +3160,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::R_REPEAT_JUMP: {
+        case rl::repeat_jump: {
             editable_line_t *el = active_edit_line();
             bool success = false;
 
@@ -3172,7 +3172,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::R_REVERSE_REPEAT_JUMP: {
+        case rl::reverse_repeat_jump: {
             editable_line_t *el = active_edit_line();
             bool success = false;
             jump_direction_t original_dir, dir;
@@ -3196,14 +3196,14 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
 
             // Some commands should have been handled internally by input_readch().
-        case rl::R_SELF_INSERT: {
+        case rl::self_insert: {
             DIE("self-insert should have been handled by input_readch");
         }
-        case rl::R_AND: {
+        case rl::func_and: {
             DIE("self-insert should have been handled by input_readch");
         }
-        case rl::R_VI_ARG_DIGIT:
-        case rl::R_VI_DELETE_TO: {
+        case rl::vi_arg_digit:
+        case rl::vi_delete_to: {
             // TODO: what needs to happen with these?
             break;
         }
@@ -3278,16 +3278,16 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) &&
                "Should have a char or readline");
 
-        if (rls.last_cmd != rl::R_YANK && rls.last_cmd != rl::R_YANK_POP) {
+        if (rls.last_cmd != rl::yank && rls.last_cmd != rl::yank_POP) {
             rls.yank_len = 0;
         }
 
         if (event_needing_handling->is_readline()) {
             readline_cmd_t readline_cmd = event_needing_handling->get_readline();
             // If we get something other than a repaint, then stop coalescing them.
-            if (readline_cmd != rl::R_REPAINT) rls.coalescing_repaints = false;
+            if (readline_cmd != rl::repaint) rls.coalescing_repaints = false;
 
-            if (readline_cmd == rl::R_CANCEL && is_navigating_pager_contents()) {
+            if (readline_cmd == rl::cancel && is_navigating_pager_contents()) {
                 set_command_line_and_position(&command_line, cycle_command_line, cycle_cursor_pos);
             }
 

From 71f26a68137675c79e7caada6c5403e5a729f00b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Mar 2019 18:07:32 -0700
Subject: [PATCH 0142/1732] Remove INPUT_COMMON_BASE

We no longer store readline commands as characters, so there's no need to
reserve character space for them.
---
 src/common.cpp     | 3 +--
 src/common.h       | 2 --
 src/input_common.h | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index b50bcac37..d097f5844 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2382,8 +2382,7 @@ char **make_null_terminated_array(const std::vector<std::string> &lst) {
 // TODO: Actually implement the replacement as documented above.
 bool fish_reserved_codepoint(wchar_t c) {
     return (c >= RESERVED_CHAR_BASE && c < RESERVED_CHAR_END) ||
-           (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END) ||
-           (c >= INPUT_COMMON_BASE && c < INPUT_COMMON_END);
+           (c >= ENCODE_DIRECT_BASE && c < ENCODE_DIRECT_END);
 }
 
 /// Reopen stdin, stdout and/or stderr on /dev/null. This is invoked when we find that our tty has
diff --git a/src/common.h b/src/common.h
index e84edaa50..cf6963349 100644
--- a/src/common.h
+++ b/src/common.h
@@ -87,8 +87,6 @@ typedef std::vector<wcstring> wcstring_list_t;
 // on Mac OS X. See http://www.unicode.org/faq/private_use.html.
 #define ENCODE_DIRECT_BASE (wchar_t)0xF600
 #define ENCODE_DIRECT_END (ENCODE_DIRECT_BASE + 256)
-#define INPUT_COMMON_BASE (wchar_t)0xF700
-#define INPUT_COMMON_END (INPUT_COMMON_BASE + 64)
 
 // NAME_MAX is not defined on Solaris
 #if !defined(NAME_MAX)
diff --git a/src/input_common.h b/src/input_common.h
index 27ad36d98..7489f0e96 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -10,7 +10,7 @@
 #include "maybe.h"
 
 enum class readline_cmd_t {
-    beginning_of_line = INPUT_COMMON_BASE,
+    beginning_of_line,
     end_of_line,
     forward_char,
     backward_char,

From 5afd1336e860992c6d440264ae1067c06126f9db Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 10:46:42 +0100
Subject: [PATCH 0143/1732] functions/fish_npm_helper: Use physical pwd

This searched for package.json in any parent, so just like finding
.git and .hg directories it _needs_ to use the physical pwd because
that's what git/hg/yarn use.

In general, if you do _any_ logic on $PWD, it should be the physical
path. Logical $PWD is basically only good for display and cd-ing
around with symlinks.

[ci skip]
---
 share/functions/fish_npm_helper.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_npm_helper.fish b/share/functions/fish_npm_helper.fish
index 3ba7872b9..810154c01 100644
--- a/share/functions/fish_npm_helper.fish
+++ b/share/functions/fish_npm_helper.fish
@@ -38,7 +38,7 @@ function __yarn_filtered_list_packages
 end
 
 function __yarn_find_package_json
-    set parents (__fish_parent_directories (pwd))
+    set parents (__fish_parent_directories (pwd -P))
 
     for p in $parents
         if test -f "$p/package.json"

From 22d93826468bafb47103b520cf20a6bd97d8c4a8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 16:59:00 +0100
Subject: [PATCH 0144/1732] completions/service: Remove useless helper function

[ci skip]
---
 share/completions/service.fish | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/share/completions/service.fish b/share/completions/service.fish
index 6cee6e241..06265c44f 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -1,22 +1,13 @@
 # First argument is the names of the service, i.e. a file in /etc/init.d
 complete -c service -n "__fish_is_first_token" -xa "(__fish_print_service_names)" -d "Service"
 
-set -l service_commands
-function __fish_complete_static_service_actions
-	#The second argument is what action to take with the service
-	complete -c service -n "not __fish_is_first_token" -xa "$argv"
-end
-
 # as found in __fish_print_service_names.fish
 if test -d /run/systemd/system # Systemd systems
-	set service_commands start stop restart status enable disable
-	__fish_complete_static_service_actions $service_commands
+	complete -c service -n "not __fish_is_first_token" -xa "start stop restart status enable disable"
 else if type -f rc-service 2>/dev/null # OpenRC (Gentoo)
-	set service_commands start stop restart
-	__fish_complete_static_service_actions $service_commands
+	complete -c service -n "not __fish_is_first_token" -xa "start stop restart"
 else if test -d /etc/init.d # SysV on Debian and other linuxen
-	set service_commands start stop "--full-restart"
-	__fish_complete_static_service_actions $service_commands
+	complete -c service -n "not __fish_is_first_token" -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_first_token" -xa "(__fish_complete_freebsd_service_actions)"

From 77e71cfcb194619be09c806f66cce04082ab8fc0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 17:12:36 +0100
Subject: [PATCH 0145/1732] completions/git: Handle AM files

Fixes #5763.

[ci skip]
---
 share/completions/git.fish | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 98e0c30a7..6293142e7 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -190,6 +190,15 @@ function __fish_git_files
                     set -ql added
                     and set file "$line[9..-1]"
                     and set desc $added_desc
+                case "1 AM*"
+                    # Added files with additional modifications
+                    if set -ql added
+                        set file "$line[9..-1]"
+                        set desc $added_desc
+                    else if set -ql modified
+                        set file "$line[9..-1]"
+                        set desc $modified_desc
+                    end
                 case '1 .M*'
                     # Modified
                     # From the docs: "Ordinary changed entries have the following format:"

From 295286b184c63b8a1ea91998c2e484122cc39ca2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 19:44:45 +0100
Subject: [PATCH 0146/1732] docs: Fix remaining "\subsection" markup

See #5696.

[ci skip]
---
 sphinx_doc_src/cmds/fish_vcs_prompt.rst | 3 ++-
 sphinx_doc_src/cmds/source.rst          | 3 ++-
 sphinx_doc_src/cmds/string.rst          | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_vcs_prompt.rst b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
index 716c26d98..92a7d72ab 100644
--- a/sphinx_doc_src/cmds/fish_vcs_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
@@ -16,7 +16,8 @@ If a vcs isn't installed, the respective function does nothing.
 
 For more information, see their documentation.
 
-\subsection fish_vcs_prompt-example Example
+Example
+-------
 
 A simple prompt that displays vcs info::
 
diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 33b5dc0c3..21fd13b2b 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -31,6 +31,7 @@ Example
     # Causes fish to re-read its initialization file.
 
 
-\subsection Caveats
+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.
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index fafb3b013..99e7970d8 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -59,7 +59,8 @@ The following subcommands are available.
 
 ``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.
 
-\subsection string-join0 "join0" subcommand
+"join0" subcommand
+------------------
 
 ``string join`` 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.
 
@@ -113,7 +114,8 @@ Exit status: 0 if at least one replacement was performed, or 1 otherwise.
 
 See also ``read --delimiter``.
 
-\subsection string-split0 "split0" subcommand
+"split0" subcommand
+-------------------
 
 ``string split0`` splits each STRING on the zero byte (NUL). Options are the same as ``string split`` except that no separator is given.
 
@@ -344,7 +346,8 @@ Match Regex Examples
     <outp>0xBadC0de</outp>
 
 
-\subsection string-example-split0 NUL Delimited Examples
+NUL Delimited Examples
+----------------------
 
 
 

From 8837d17910ab9fbda486643aa268c977ab7935c8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 19:50:51 +0100
Subject: [PATCH 0147/1732] docs: Remove weird Commands subsection

This included another copy of the TOC in the middle of the index page
and called it "Commands"?

See #5696.

cc @ridiculousfish

[ci skip]
---
 sphinx_doc_src/index.rst | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 349aee5e1..8bd8f19d3 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -513,19 +513,6 @@ Help
 
 Help on a specific builtin can also be obtained with the ``-h`` parameter. For instance, to obtain help on the ``fg`` builtin, either type ``fg -h`` or ``help fg``.
 
-Commands
-========
-
-.. toctree::
-   :maxdepth: 1
-   
-   commands
-   design
-   tutorial
-   faq
-   license
-
-
 Autosuggestions
 ===============
 

From 848d538f085ced0ab0fb80768d43bd0c9305bc2f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 19:59:23 +0100
Subject: [PATCH 0148/1732] docs: Replace @key markup with :kbd:

The best I could find. It doesn't currently appear to render in the
html, but it's better than showing `@key{thing}`.
---
 sphinx_doc_src/cmds/abbr.rst   |   2 +-
 sphinx_doc_src/cmds/bind.rst   |   8 +--
 sphinx_doc_src/cmds/cdh.rst    |   2 +-
 sphinx_doc_src/cmds/funced.rst |   2 +-
 sphinx_doc_src/faq.rst         |   6 +-
 sphinx_doc_src/index.rst       | 112 ++++++++++++++++-----------------
 sphinx_doc_src/tutorial.rst    |  14 ++---
 7 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/sphinx_doc_src/cmds/abbr.rst b/sphinx_doc_src/cmds/abbr.rst
index a4bcad137..6b30925d2 100644
--- a/sphinx_doc_src/cmds/abbr.rst
+++ b/sphinx_doc_src/cmds/abbr.rst
@@ -16,7 +16,7 @@ Description
 
 ``abbr`` manages abbreviations - user-defined words that are replaced with longer phrases after they are entered.
 
-For example, a frequently-run command like ``git checkout`` can be abbreviated to ``gco``. After entering ``gco`` and pressing @key{Space} or @key{Enter}, the full text ``git checkout`` will appear in the command line.
+For example, a frequently-run command like ``git checkout`` can be abbreviated to ``gco``. After entering ``gco`` and pressing :kbd:`Space` or :kbd:`Enter`, the full text ``git checkout`` will appear in the command line.
 
 Options
 -------
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 76c182793..1d9c6ddc1 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -21,7 +21,7 @@ Description
 
 ``bind`` adds a binding for the specified key sequence to the specified command.
 
-SEQUENCE is the character sequence to bind to. These should be written as <a href="index.html#escapes">fish escape sequences</a>. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, @key{Alt,w} can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example @key{Control,X} (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
+SEQUENCE is the character sequence to bind to. These should be written as <a href="index.html#escapes">fish escape sequences</a>. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
 
 The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``````bind '' self-insert``````) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
 
@@ -155,7 +155,7 @@ Examples
 
     bind <asis>\\cd</asis> 'exit'
 
-Causes ``fish`` to exit when @key{Control,D} is pressed.
+Causes ``fish`` to exit when :kbd:`Control+D` is pressed.
 
 
 
@@ -163,7 +163,7 @@ Causes ``fish`` to exit when @key{Control,D} is pressed.
 
     bind -k ppage history-search-backward
 
-Performs a history search when the @key{Page Up} key is pressed.
+Performs a history search when the :kbd:`Page Up` key is pressed.
 
 
 
@@ -172,7 +172,7 @@ Performs a history search when the @key{Page Up} key is pressed.
     set -g fish_key_bindings fish_vi_key_bindings
     bind -M insert \\cc kill-whole-line force-repaint
 
-Turns on Vi key bindings and rebinds @key{Control,C} to clear the input line.
+Turns on Vi key bindings and rebinds :kbd:`Control+C` to clear the input line.
 
 
 Special Case: The escape Character
diff --git a/sphinx_doc_src/cmds/cdh.rst b/sphinx_doc_src/cmds/cdh.rst
index a29a53a9d..d013107f1 100644
--- a/sphinx_doc_src/cmds/cdh.rst
+++ b/sphinx_doc_src/cmds/cdh.rst
@@ -11,7 +11,7 @@ cdh [ directory ]
 Description
 -----------
 
-``cdh`` with no arguments presents a list of recently visited directories. You can then select one of the entries by letter or number. You can also press @key{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 directory``.
+``cdh`` with no arguments presents a list of recently visited directories. 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 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.
 
diff --git a/sphinx_doc_src/cmds/funced.rst b/sphinx_doc_src/cmds/funced.rst
index 5c9bfe5ad..2f33c6906 100644
--- a/sphinx_doc_src/cmds/funced.rst
+++ b/sphinx_doc_src/cmds/funced.rst
@@ -12,7 +12,7 @@ Description
 
 ``funced`` provides an interface to edit the definition of the function ``NAME``.
 
-If the ``$VISUAL`` environment variable is set, it will be used as the program to edit the function. If ``$VISUAL`` is unset but ``$EDITOR`` is set, that will be used. Otherwise, a built-in editor will be used. Note that to enter a literal newline using the built-in editor you should press @key{Alt,Enter}. Pressing @key{Enter} signals that you are done editing the function. This does not apply to an external editor like emacs or vim.
+If the ``$VISUAL`` environment variable is set, it will be used as the program to edit the function. If ``$VISUAL`` is unset but ``$EDITOR`` is set, that will be used. Otherwise, a built-in editor will be used. Note that to enter a literal newline using the built-in editor you should press :kbd:`Alt+Enter`. Pressing :kbd:`Enter` signals that you are done editing the function. This does not apply to an external editor like emacs or vim.
 
 If there is no function called ``NAME`` a new function will be created with the specified name
 
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 7f5871b49..143ba7063 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -235,11 +235,11 @@ Fish history recall is very simple yet effective:
 
   - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
 
-- @key{Alt,&uarr;,Up} recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
+- :kbd:`Alt+&uarr;,Up` recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
 
-  - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press @key{Alt,&uarr;,Up}.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
+  - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press :kbd:`Alt+&uarr;,Up`.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
 
-  - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (@key{Alt,D} and @key{Alt,Backspace} are your friends).
+  - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (:kbd:`Alt+D` and :kbd:`Alt+Backspace` are your friends).
 
 See <a href='index.html#editor'>documentation</a> for more details about line editing in fish.
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 8bd8f19d3..87f2e43c5 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -398,7 +398,7 @@ will start the emacs text editor in the background.
 Job control
 -----------
 
-Most programs allow you to suspend the program's execution and return control to ``fish`` by pressing @key{Control,Z} (also referred to as ``^Z``). Once back at the ``fish`` commandline, you can start other programs and do anything you want. If you then want you can go back to the suspended command by using the `fg <cmds/fg.html>`_ (foreground) command.
+Most programs allow you to suspend the program's execution and return control to ``fish`` by pressing :kbd:`Control+Z` (also referred to as ``^Z``). Once back at the ``fish`` commandline, you can start other programs and do anything you want. If you then want you can go back to the suspended command by using the `fg <cmds/fg.html>`_ (foreground) command.
 
 If you instead want to put a suspended job into the background, use the `bg <cmds/bg.html>`_ command.
 
@@ -518,7 +518,7 @@ Autosuggestions
 
 fish suggests commands as you type, based on command history, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
 
-To accept the autosuggestion (replacing the command line contents), press right arrow or @key{Control,F}. To accept the first suggested word, press @key{Alt,&rarr;,Right} or @key{Alt,F}. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
+To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+&rarr;,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
 
 Autosuggestions are a powerful way to quickly summon frequently entered commands, by typing the first few characters. They are also an efficient technique for navigating through directory hierarchies.
 
@@ -1352,64 +1352,64 @@ Shared bindings
 
 Some bindings are shared between emacs- and vi-mode because they aren't text editing bindings or because what Vi/Vim does for a particular key doesn't make sense for a shell.
 
-- @key{Tab} `completes <#completion>`_ the current token. @key{Shift, Tab} completes the current token and starts the pager's search mode.
+- :kbd:`Tab` `completes <#completion>`_ the current token. :kbd:`Shift, Tab` completes the current token and starts the pager's search mode.
 
-- @key{Alt,&larr;,Left} and @key{Alt,&rarr;,Right} move the cursor one word left or right (to the next space or punctuation mark), or moves forward/backward in the directory history if the command line is empty. If the cursor is already at the end of the line, and an autosuggestion is available, @key{Alt,&rarr;,Right} (or @key{Alt,F}) accepts the first word in the suggestion.
+- :kbd:`Alt+&larr;,Left` and :kbd:`Alt+&rarr;,Right` move the cursor one word left or right (to the next space or punctuation mark), or moves forward/backward in the directory history if the command line is empty. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`Alt+&rarr;,Right` (or :kbd:`Alt+F`) accepts the first word in the suggestion.
 
-- @key{Shift,&larr;,Left} and @key{Shift,&rarr;,Right} move the cursor one word left or right, without stopping on punctuation.
+- :kbd:`Shift,&larr;,Left` and :kbd:`Shift,&rarr;,Right` move the cursor one word left or right, without stopping on punctuation.
 
-- @cursor_key{&uarr;,Up} and @cursor_key{&darr;,Down} (or @key{Control,P} and @key{Control,N} for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
+- @cursor_key{&uarr;,Up} and @cursor_key{&darr;,Down} (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
 
-- @key{Alt,&uarr;,Up} and @key{Alt,&darr;,Down} search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`Alt+&uarr;,Up` and :kbd:`Alt+&darr;,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
 
-- @key{Control,C} cancels the entire line.
+- :kbd:`Control+C` cancels the entire line.
 
-- @key{Control,D} delete one character to the right of the cursor. If the command line is empty, @key{Control,D} will exit fish.
+- :kbd:`Control+D` delete one character to the right of the cursor. If the command line is empty, :kbd:`Control+D` will exit fish.
 
-- @key{Control,U} moves contents from the beginning of line to the cursor to the `killring <#killring>`_.
+- :kbd:`Control+U` moves contents from the beginning of line to the cursor to the `killring <#killring>`_.
 
-- @key{Control,L} clears and repaints the screen.
+- :kbd:`Control+L` clears and repaints the screen.
 
-- @key{Control,W} moves the previous path component (everything up to the previous "/") to the `killring <#killring>`_.
+- :kbd:`Control+W` moves the previous path component (everything up to the previous "/") to the `killring <#killring>`_.
 
-- @key{Control,X} copies the current buffer to the system's clipboard, @key{Control,V} inserts the clipboard contents.
+- :kbd:`Control+X` copies the current buffer to the system's clipboard, :kbd:`Control+V` inserts the clipboard contents.
 
-- @key{Alt,d} moves the next word to the `killring <#killring>`_.
+- :kbd:`Alt+d` moves the next word to the `killring <#killring>`_.
 
-- @key{Alt,h} (or @key{F1}) shows the manual page for the current command, if one exists.
+- :kbd:`Alt+h` (or :kbd:`F1`) shows the manual page for the current command, if one exists.
 
-- @key{Alt,l} lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed.
+- :kbd:`Alt+l` lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed.
 
-- @key{Alt,p} adds the string '``| less;``' to the end of the job under the cursor. The result is that the output of the command will be paged.
+- :kbd:`Alt+p` adds the string '``| less;``' to the end of the job under the cursor. The result is that the output of the command will be paged.
 
-- @key{Alt,w} prints a short description of the command under the cursor.
+- :kbd:`Alt+w` prints a short description of the command under the cursor.
 
-- @key{Alt,e} edit the current command line in an external editor. The editor is chosen from the first available of the ``$VISUAL`` or ``$EDITOR`` variables.
+- :kbd:`Alt+e` edit the current command line in an external editor. The editor is chosen from the first available of the ``$VISUAL`` or ``$EDITOR`` variables.
 
-- @key{Alt,v} Same as @key{Alt,e}.
+- :kbd:`Alt+v` Same as :kbd:`Alt+e`.
 
 .. _emacs-mode:
 
 Emacs mode commands
 -------------------
 
-- @key{Home} or @key{Control,A} moves the cursor to the beginning of the line.
+- :kbd:`Home` or :kbd:`Control+A` moves the cursor to the beginning of the line.
 
-- @key{End} or @key{Control,E} moves to the end of line. If the cursor is already at the end of the line, and an autosuggestion is available, @key{End} or @key{Control,E} accepts the autosuggestion.
+- :kbd:`End` or :kbd:`Control+E` moves to the end of line. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`End` or :kbd:`Control+E` accepts the autosuggestion.
 
-- @cursor_key{&larr;,Left} (or @key{Control,B}) and @cursor_key{&rarr;,Right} (or @key{Control,F}) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the @cursor_key{&rarr;,Right} key and the @key{Control,F} combination accept the suggestion.
+- @cursor_key{&larr;,Left} (or :kbd:`Control+B`) and @cursor_key{&rarr;,Right} (or :kbd:`Control+F`) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the @cursor_key{&rarr;,Right} key and the :kbd:`Control+F` combination accept the suggestion.
 
-- @key{Delete} and @key{Backspace} removes one character forwards or backwards respectively.
+- :kbd:`Delete` and :kbd:`Backspace` removes one character forwards or backwards respectively.
 
-- @key{Control,K} moves contents from the cursor to the end of line to the `killring <#killring>`_.
+- :kbd:`Control+K` moves contents from the cursor to the end of line to the `killring <#killring>`_.
 
-- @key{Alt,c} capitalizes the current word.
+- :kbd:`Alt+c` capitalizes the current word.
 
-- @key{Alt,u} makes the current word uppercase.
+- :kbd:`Alt+u` makes the current word uppercase.
 
-- @key{Control,t} transposes the last two characters
+- :kbd:`Control+t` transposes the last two characters
 
-- @key{Alt,t} transposes the last two words
+- :kbd:`Alt+t` transposes the last two words
 
 
 You can change these key bindings using the `bind <cmds/bind.html">`_ builtin.
@@ -1420,7 +1420,7 @@ You can change these key bindings using the `bind <cmds/bind.html">`_ builtin.
 Vi mode commands
 ----------------
 
-Vi mode allows for the use of Vi-like commands at the prompt. Initially, `insert mode <#vi-mode-insert>`_ is active. @key{Escape} enters `command mode <#vi-mode-command>`_. The commands available in command, insert and visual mode are described below. Vi mode shares `some bindings <#shared-binds>`_ with `Emacs mode <#emacs-mode>`_.
+Vi mode allows for the use of Vi-like commands at the prompt. Initially, `insert mode <#vi-mode-insert>`_ is active. :kbd:`Escape` enters `command mode <#vi-mode-command>`_. The commands available in command, insert and visual mode are described below. Vi mode shares `some bindings <#shared-binds>`_ with `Emacs mode <#emacs-mode>`_.
 
 It is also possible to add all emacs-mode bindings to vi-mode by using something like::
 
@@ -1444,40 +1444,40 @@ Command mode
 
 Command mode is also known as normal mode.
 
-- @key{h} moves the cursor left.
+- :kbd:`h` moves the cursor left.
 
-- @key{l} moves the cursor right.
+- :kbd:`l` moves the cursor right.
 
-- @key{i} enters `insert mode <#vi-mode-insert>`_ at the current cursor position.
+- :kbd:`i` enters `insert mode <#vi-mode-insert>`_ at the current cursor position.
 
-- @key{v} enters `visual mode <#vi-mode-visual>`_ at the current cursor position.
+- :kbd:`v` enters `visual mode <#vi-mode-visual>`_ at the current cursor position.
 
-- @key{a} enters `insert mode <#vi-mode-insert>`_ after the current cursor position.
+- :kbd:`a` enters `insert mode <#vi-mode-insert>`_ after the current cursor position.
 
-- @key{Shift,A} enters `insert mode <#vi-mode-insert>`_ at the end of the line.
+- :kbd:`Shift,A` enters `insert mode <#vi-mode-insert>`_ at the end of the line.
 
-- @key{0} (zero) moves the cursor to beginning of line (remaining in command mode).
+- :kbd:`0` (zero) moves the cursor to beginning of line (remaining in command mode).
 
-- @key{d}@key{d} deletes the current line and moves it to the `killring <#killring>`_.
+- :kbd:`d`:kbd:`d` deletes the current line and moves it to the `killring <#killring>`_.
 
-- @key{Shift,D} deletes text after the current cursor position and moves it to the `killring <#killring>`_.
+- :kbd:`Shift,D` deletes text after the current cursor position and moves it to the `killring <#killring>`_.
 
-- @key{p} pastes text from the `killring <#killring>`_.
+- :kbd:`p` pastes text from the `killring <#killring>`_.
 
-- @key{u} search history backwards.
+- :kbd:`u` search history backwards.
 
-- @key{[} and @key{]} search the command history for the previous/next token containing the token under the cursor before the search was started. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`[` and :kbd:`]` search the command history for the previous/next token containing the token under the cursor before the search was started. See the `history <#history>`_ section for more information on history searching.
 
-- @key{Backspace} moves the cursor left.
+- :kbd:`Backspace` moves the cursor left.
 
 .. _vi-mode-insert:
 
 Insert mode
 -----------
 
-- @key{Escape} enters `command mode <#vi-mode-command>`_.
+- :kbd:`Escape` enters `command mode <#vi-mode-command>`_.
 
-- @key{Backspace} removes one character to the left.
+- :kbd:`Backspace` removes one character to the left.
 
 .. _vi-mode-visual:
 
@@ -1486,20 +1486,20 @@ Visual mode
 
 - @cursor_key{&larr;,Left} and @cursor_key{&rarr;,Right} extend the selection backward/forward by one character.
 
-- @key{b} and @key{w} extend the selection backward/forward by one word.
+- :kbd:`b` and :kbd:`w` extend the selection backward/forward by one word.
 
-- @key{d} and @key{x} move the selection to the `killring <#killring>`_ and enter `command mode <#vi-mode-command>`_.
+- :kbd:`d` and :kbd:`x` move the selection to the `killring <#killring>`_ and enter `command mode <#vi-mode-command>`_.
 
-- @key{Escape} and @key{Control,C} enter `command mode <#vi-mode-command>`_.
+- :kbd:`Escape` and :kbd:`Control+C` enter `command mode <#vi-mode-command>`_.
 
 .. _killring:
 
 Copy and paste (Kill Ring)
 --------------------------
 
-``fish`` uses an Emacs style kill ring for copy and paste functionality. Use @key{Control,K} to cut from the current cursor position to the end of the line. The string that is cut (a.k.a. killed) is inserted into a linked list of kills, called the kill ring. To paste the latest value from the kill ring use @key{Control,Y}. After pasting, use @key{Alt,Y} to rotate to the previous kill.
+``fish`` uses an Emacs style kill ring for copy and paste functionality. Use :kbd:`Control+K` to cut from the current cursor position to the end of the line. The string that is cut (a.k.a. killed) is inserted into a linked list of kills, called the kill ring. To paste the latest value from the kill ring use :kbd:`Control+Y`. After pasting, use :kbd:`Alt+Y` to rotate to the previous kill.
 
-Copy and paste from outside are also supported, both via the @key{Control,X} / @key{Control,V} bindings and via the terminal's paste function, for which fish enables "Bracketed Paste Mode". When pasting inside single quotes, pasted single quotes and backslashes are automatically escaped so that the result can be used as a single token simply by closing the quote after.
+Copy and paste from outside are also supported, both via the :kbd:`Control+X` / :kbd:`Control+V` bindings and via the terminal's paste function, for which fish enables "Bracketed Paste Mode". When pasting inside single quotes, pasted single quotes and backslashes are automatically escaped so that the result can be used as a single token simply by closing the quote after.
 
 .. _history-search:
 
@@ -1508,7 +1508,7 @@ Searchable history
 
 After a command has been entered, it is inserted at the end of a history list. Any duplicate history items are automatically removed. By pressing the up and down keys, the user can search forwards and backwards in the history. If the current command line is not empty when starting a history search, only the commands containing the string entered into the command line are shown.
 
-By pressing @key{Alt,&uarr;,Up} and @key{Alt,&darr;,Down}, a history search is also performed, but instead of searching for a complete commandline, each commandline is broken into separate elements just like it would be before execution, and the history is searched for an element matching that under the cursor.
+By pressing :kbd:`Alt+&uarr;,Up` and :kbd:`Alt+&darr;,Down`, a history search is also performed, but instead of searching for a complete commandline, each commandline is broken into separate elements just like it would be before execution, and the history is searched for an element matching that under the cursor.
 
 History searches can be aborted by pressing the escape key.
 
@@ -1523,7 +1523,7 @@ Examples:
 
 To search for previous entries containing the word 'make', type ``make`` in the console and press the up key.
 
-If the commandline reads ``cd m``, place the cursor over the ``m`` character and press @key{Alt,&uarr;,Up} to search for previously typed words containing 'm'.
+If the commandline reads ``cd m``, place the cursor over the ``m`` character and press :kbd:`Alt+&uarr;,Up` to search for previously typed words containing 'm'.
 
 
 .. _multiline:
@@ -1533,11 +1533,11 @@ Multiline editing
 
 The fish commandline editor can be used to work on commands that are several lines long. There are three ways to make a command span more than a single line:
 
-- Pressing the @key{Enter} key while a block of commands is unclosed, such as when one or more block commands such as ``for``, ``begin`` or ``if`` do not have a corresponding ``end`` command.
+- Pressing the :kbd:`Enter` key while a block of commands is unclosed, such as when one or more block commands such as ``for``, ``begin`` or ``if`` do not have a corresponding ``end`` command.
 
-- Pressing @key{Alt,Enter} instead of pressing the @key{Enter} key.
+- Pressing :kbd:`Alt+Enter` instead of pressing the :kbd:`Enter` key.
 
-- By inserting a backslash (``\``) character before pressing the @key{Enter} key, escaping the newline.
+- By inserting a backslash (``\``) character before pressing the :kbd:`Enter` key, escaping the newline.
 
 The fish commandline editor works exactly the same in single line mode and in multiline mode. To move between lines use the left and right arrow keys and other such keyboard shortcuts.
 
@@ -1550,7 +1550,7 @@ Normally when ``fish`` starts a program, this program will be put in the foregro
 
 -# By ending a command with the ``&`` (ampersand) symbol, the user tells ``fish`` to put the specified command into the background. A background process will be run simultaneous with ``fish``. ``fish`` will retain control of the terminal, so the program will not be able to read from the keyboard.
 
--# By pressing @key{Control,Z}, the user stops a currently running foreground  program and returns control to ``fish``. Some programs do not support this feature, or remap it to another key. GNU Emacs uses @key{Control,X} @key{z} to stop running.
+-# By pressing :kbd:`Control+Z`, the user stops a currently running foreground  program and returns control to ``fish``. Some programs do not support this feature, or remap it to another key. GNU Emacs uses :kbd:`Control+X` :kbd:`z` to stop running.
 
 -# By using the `bg <cmds/bg.html>`_ and `fg <cmds/fg.html>`_ builtin commands, the user can send any currently running job into the foreground or background.
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 0cc4a6d28..5b386a755 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -123,7 +123,7 @@ Especially powerful is the recursive wildcard ** which searches directories recu
     <outp>/var/run/sntp.log</outp>
 
 
-If that directory traversal is taking a long time, you can @key{Control,C} out of it.
+If that directory traversal is taking a long time, you can :kbd:`Control+C` out of it.
 
 
 Pipes and Redirections
@@ -163,21 +163,21 @@ And history too. Type a command once, and you can re-summon it by just typing a
     >_ <eror>r<</eror><s>___sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
 
 
-To accept the autosuggestion, hit @cursor_key{&rarr;,right arrow} or @key{Control,F}. To accept a single word of the autosuggestion, @key{Alt,&rarr;} (right arrow). If the autosuggestion is not what you want, just ignore it.
+To accept the autosuggestion, hit @cursor_key{&rarr;,right arrow} or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+&rarr;` (right arrow). If the autosuggestion is not what you want, just ignore it.
 
 Tab Completions
 ---------------
 
 ``fish`` comes with a rich set of tab completions, that work "out of the box."
 
-Press @key{Tab}, and ``fish`` will attempt to complete the command, argument, or path::
+Press :kbd:`Tab`, and ``fish`` will attempt to complete the command, argument, or path::
 
-    >_ <eror>/pri</eror> @key{Tab} &rarr; /private/
+    >_ <eror>/pri</eror> :kbd:`Tab` &rarr; /private/
 
 
 If there's more than one possibility, it will list them::
 
-    >_ <eror>~/stuff/s</eror> @key{Tab}
+    >_ <eror>~/stuff/s</eror> :kbd:`Tab`
     <outp><mtch>~/stuff/s</outp>cript.sh  <i>(Executable, 4.8kB)</i>  \mtch{~/stuff/s</mtch>ources/  <i>(Directory)</i>}
 
 
@@ -185,8 +185,8 @@ Hit tab again to cycle through the possibilities.
 
 ``fish`` can also complete many commands, like git branches::
 
-    >_ git merge pr @key{Tab} &rarr; git merge prompt_designer
-    >_ git checkout b @key{Tab}
+    >_ git merge pr :kbd:`Tab` &rarr; git merge prompt_designer
+    >_ git checkout b :kbd:`Tab`
     <outp><mtch>b</outp>uiltin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
 
 

From 99d77c60492639abe206e922f7304f57e7032d0b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 24 Mar 2019 20:03:29 +0100
Subject: [PATCH 0149/1732] docs: Replace &.arr; markup with unicode arrows

This is still missing the @cursor_keys bit.

See #5696.

[ci skip]
---
 sphinx_doc_src/faq.rst      |  8 ++++----
 sphinx_doc_src/index.rst    | 22 +++++++++++-----------
 sphinx_doc_src/tutorial.rst |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 143ba7063..35742d8b9 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -31,7 +31,7 @@ You can also use the Web configuration tool, <a href="commands.html#fish_config"
 
 How do I run a command from history?
 ------------------------------------
-Type some part of the command, and then hit the @cursor_key{&uarr;,up} or @cursor_key{&darr;,down} arrow keys to navigate through history matches.
+Type some part of the command, and then hit the :kbd:`↑` (up) or :kbd:`↓` (down) arrow keys to navigate through history matches.
 
 
 How do I run a subcommand? The backtick doesn't work!
@@ -231,13 +231,13 @@ Because history substitution is an awkward interface that was invented before in
 
 Fish history recall is very simple yet effective:
 
-- As in any modern shell, the Up arrow, @cursor_key{&uarr;,Up} recalls whole lines, starting from the last line executed.  A single press replaces "!!", later presses replace "!-3" and the like.
+- As in any modern shell, the Up arrow, :kbd:`↑` recalls whole lines, starting from the last line executed.  A single press replaces "!!", later presses replace "!-3" and the like.
 
   - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
 
-- :kbd:`Alt+&uarr;,Up` recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
+- :kbd:`Alt+↑,Up` recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
 
-  - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press :kbd:`Alt+&uarr;,Up`.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
+  - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press :kbd:`Alt+↑,Up`.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
 
   - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (:kbd:`Alt+D` and :kbd:`Alt+Backspace` are your friends).
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 87f2e43c5..687efeec3 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -92,7 +92,7 @@ Commands versus Programs
 
 **Programs** in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out: 
 
-Arguments &rarr; |Program| &rarr; Return Values
+Arguments → |Program| → Return Values
 
 **Shell commands** are different:
 
@@ -102,7 +102,7 @@ Arguments &rarr; |Program| &rarr; Return Values
 
 <table with=100%>
 <tr><td>Input Stream &rArr;<td rowspan="2">|Shell Command|<td>&rArr; Output Stream
-<tr><td>switch and data as arguments &rarr;<td>&rarr; exit code
+<tr><td>switch and data as arguments →<td>→ exit code
 </table>
 
 This leads to another way of programming and especially of combining commands:
@@ -518,7 +518,7 @@ Autosuggestions
 
 fish suggests commands as you type, based on command history, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
 
-To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+&rarr;,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
+To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+→,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
 
 Autosuggestions are a powerful way to quickly summon frequently entered commands, by typing the first few characters. They are also an efficient technique for navigating through directory hierarchies.
 
@@ -1354,13 +1354,13 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Tab` `completes <#completion>`_ the current token. :kbd:`Shift, Tab` completes the current token and starts the pager's search mode.
 
-- :kbd:`Alt+&larr;,Left` and :kbd:`Alt+&rarr;,Right` move the cursor one word left or right (to the next space or punctuation mark), or moves forward/backward in the directory history if the command line is empty. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`Alt+&rarr;,Right` (or :kbd:`Alt+F`) accepts the first word in the suggestion.
+- :kbd:`Alt+←,Left` and :kbd:`Alt+→,Right` move the cursor one word left or right (to the next space or punctuation mark), or moves forward/backward in the directory history if the command line is empty. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`Alt+→,Right` (or :kbd:`Alt+F`) accepts the first word in the suggestion.
 
-- :kbd:`Shift,&larr;,Left` and :kbd:`Shift,&rarr;,Right` move the cursor one word left or right, without stopping on punctuation.
+- :kbd:`Shift,←,Left` and :kbd:`Shift,→,Right` move the cursor one word left or right, without stopping on punctuation.
 
-- @cursor_key{&uarr;,Up} and @cursor_key{&darr;,Down} (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
+- @cursor_key{↑,Up} and @cursor_key{↓,Down} (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
 
-- :kbd:`Alt+&uarr;,Up` and :kbd:`Alt+&darr;,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`Alt+↑,Up` and :kbd:`Alt+↓,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
 
 - :kbd:`Control+C` cancels the entire line.
 
@@ -1397,7 +1397,7 @@ Emacs mode commands
 
 - :kbd:`End` or :kbd:`Control+E` moves to the end of line. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`End` or :kbd:`Control+E` accepts the autosuggestion.
 
-- @cursor_key{&larr;,Left} (or :kbd:`Control+B`) and @cursor_key{&rarr;,Right} (or :kbd:`Control+F`) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the @cursor_key{&rarr;,Right} key and the :kbd:`Control+F` combination accept the suggestion.
+- @cursor_key{←,Left} (or :kbd:`Control+B`) and @cursor_key{→,Right} (or :kbd:`Control+F`) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the @cursor_key{→,Right} key and the :kbd:`Control+F` combination accept the suggestion.
 
 - :kbd:`Delete` and :kbd:`Backspace` removes one character forwards or backwards respectively.
 
@@ -1484,7 +1484,7 @@ Insert mode
 Visual mode
 -----------
 
-- @cursor_key{&larr;,Left} and @cursor_key{&rarr;,Right} extend the selection backward/forward by one character.
+- @cursor_key{←,Left} and @cursor_key{→,Right} extend the selection backward/forward by one character.
 
 - :kbd:`b` and :kbd:`w` extend the selection backward/forward by one word.
 
@@ -1508,7 +1508,7 @@ Searchable history
 
 After a command has been entered, it is inserted at the end of a history list. Any duplicate history items are automatically removed. By pressing the up and down keys, the user can search forwards and backwards in the history. If the current command line is not empty when starting a history search, only the commands containing the string entered into the command line are shown.
 
-By pressing :kbd:`Alt+&uarr;,Up` and :kbd:`Alt+&darr;,Down`, a history search is also performed, but instead of searching for a complete commandline, each commandline is broken into separate elements just like it would be before execution, and the history is searched for an element matching that under the cursor.
+By pressing :kbd:`Alt+↑,Up` and :kbd:`Alt+↓,Down`, a history search is also performed, but instead of searching for a complete commandline, each commandline is broken into separate elements just like it would be before execution, and the history is searched for an element matching that under the cursor.
 
 History searches can be aborted by pressing the escape key.
 
@@ -1523,7 +1523,7 @@ Examples:
 
 To search for previous entries containing the word 'make', type ``make`` in the console and press the up key.
 
-If the commandline reads ``cd m``, place the cursor over the ``m`` character and press :kbd:`Alt+&uarr;,Up` to search for previously typed words containing 'm'.
+If the commandline reads ``cd m``, place the cursor over the ``m`` character and press :kbd:`Alt+↑,Up` to search for previously typed words containing 'm'.
 
 
 .. _multiline:
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 5b386a755..405d02cce 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -163,7 +163,7 @@ And history too. Type a command once, and you can re-summon it by just typing a
     >_ <eror>r<</eror><s>___sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
 
 
-To accept the autosuggestion, hit @cursor_key{&rarr;,right arrow} or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+&rarr;` (right arrow). If the autosuggestion is not what you want, just ignore it.
+To accept the autosuggestion, hit @cursor_key{→,right arrow} or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+→` (right arrow). If the autosuggestion is not what you want, just ignore it.
 
 Tab Completions
 ---------------
@@ -172,7 +172,7 @@ Tab Completions
 
 Press :kbd:`Tab`, and ``fish`` will attempt to complete the command, argument, or path::
 
-    >_ <eror>/pri</eror> :kbd:`Tab` &rarr; /private/
+    >_ <eror>/pri</eror> :kbd:`Tab` → /private/
 
 
 If there's more than one possibility, it will list them::
@@ -185,7 +185,7 @@ Hit tab again to cycle through the possibilities.
 
 ``fish`` can also complete many commands, like git branches::
 
-    >_ git merge pr :kbd:`Tab` &rarr; git merge prompt_designer
+    >_ git merge pr :kbd:`Tab` → git merge prompt_designer
     >_ git checkout b :kbd:`Tab`
     <outp><mtch>b</outp>uiltin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
 

From 96b8ac70134be2f3caf530a5c96594bbc183b912 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Mar 2019 12:12:08 -0700
Subject: [PATCH 0150/1732] Promote job_control_t to an enum class

---
 src/builtin_status.cpp  | 46 ++++++++++++++++++++++-------------------
 src/parse_execution.cpp |  4 ++--
 src/proc.cpp            |  2 +-
 src/proc.h              | 12 +++++------
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 0f59405cd..c11aa4a5d 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -76,24 +76,25 @@ const enum_map<status_cmd_t> status_enum_map[] = {
 /// Values that may be returned from the test-feature option to status.
 enum { TEST_FEATURE_ON, TEST_FEATURE_OFF, TEST_FEATURE_NOT_RECOGNIZED };
 
-int job_control_str_to_mode(const wchar_t *mode, wchar_t *cmd, io_streams_t &streams) {
+static maybe_t<job_control_t> job_control_str_to_mode(const wchar_t *mode, wchar_t *cmd,
+                                                      io_streams_t &streams) {
     if (std::wcscmp(mode, L"full") == 0) {
-        return JOB_CONTROL_ALL;
+        return job_control_t::all;
     } else if (std::wcscmp(mode, L"interactive") == 0) {
-        return JOB_CONTROL_INTERACTIVE;
+        return job_control_t::interactive;
     } else if (std::wcscmp(mode, L"none") == 0) {
-        return JOB_CONTROL_NONE;
+        return job_control_t::none;
     }
     streams.err.append_format(L"%ls: Invalid job control mode '%ls'\n", cmd, mode);
-    return -1;
+    return none();
 }
 
 struct status_cmd_opts_t {
-    bool print_help = false;
-    int level = 1;
-    int new_job_control_mode = -1;
-    const wchar_t *feature_name;
-    status_cmd_t status_cmd = STATUS_UNDEF;
+    bool print_help{false};
+    int level{1};
+    maybe_t<job_control_t> new_job_control_mode{};
+    const wchar_t *feature_name{};
+    status_cmd_t status_cmd{STATUS_UNDEF};
 };
 
 /// Note: Do not add new flags that represent subcommands. We're encouraging people to switch to
@@ -230,10 +231,11 @@ static int parse_cmd_opts(status_cmd_opts_t &opts, int *optind,  //!OCLINT(high
                 if (!set_status_cmd(cmd, opts, STATUS_SET_JOB_CONTROL, streams)) {
                     return STATUS_CMD_ERROR;
                 }
-                opts.new_job_control_mode = job_control_str_to_mode(w.woptarg, cmd, streams);
-                if (opts.new_job_control_mode == -1) {
+                auto job_mode = job_control_str_to_mode(w.woptarg, cmd, streams);
+                if (!job_mode) {
                     return STATUS_CMD_ERROR;
                 }
+                opts.new_job_control_mode = job_mode;
                 break;
             }
             case 't': {
@@ -309,14 +311,14 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
             streams.out.append_format(
                 _(L"Job control: %ls\n"),
-                job_control_mode == JOB_CONTROL_INTERACTIVE
+                job_control_mode == job_control_t::interactive
                     ? _(L"Only on interactive jobs")
-                    : (job_control_mode == JOB_CONTROL_NONE ? _(L"Never") : _(L"Always")));
+                    : (job_control_mode == job_control_t::none ? _(L"Never") : _(L"Always")));
             streams.out.append(parser.stack_trace());
             break;
         }
         case STATUS_SET_JOB_CONTROL: {
-            if (opts.new_job_control_mode != -1) {
+            if (opts.new_job_control_mode) {
                 // Flag form was used.
                 CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
             } else {
@@ -326,12 +328,14 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                               args.size());
                     return STATUS_INVALID_ARGS;
                 }
-                opts.new_job_control_mode = job_control_str_to_mode(args[0].c_str(), cmd, streams);
-                if (opts.new_job_control_mode == -1) {
+                auto new_mode = job_control_str_to_mode(args[0].c_str(), cmd, streams);
+                if (!new_mode) {
                     return STATUS_CMD_ERROR;
                 }
+                opts.new_job_control_mode = new_mode;
             }
-            job_control_mode = opts.new_job_control_mode;
+            assert(opts.new_job_control_mode && "Should have a new mode");
+            job_control_mode = *opts.new_job_control_mode;
             break;
         }
         case STATUS_FEATURES: {
@@ -403,17 +407,17 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_FULL_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != JOB_CONTROL_ALL;
+            retval = job_control_mode != job_control_t::all;
             break;
         }
         case STATUS_IS_INTERACTIVE_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != JOB_CONTROL_INTERACTIVE;
+            retval = job_control_mode != job_control_t::interactive;
             break;
         }
         case STATUS_IS_NO_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != JOB_CONTROL_NONE;
+            retval = job_control_mode != job_control_t::none;
             break;
         }
         case STATUS_STACK_TRACE: {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c14aadd7f..85de38ab8 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1207,8 +1207,8 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), block_io, parent_job);
     job->tmodes = tmodes;
     job->set_flag(job_flag_t::JOB_CONTROL,
-                  (job_control_mode == JOB_CONTROL_ALL) ||
-                      ((job_control_mode == JOB_CONTROL_INTERACTIVE) && shell_is_interactive()));
+                  (job_control_mode == job_control_t::all) ||
+                      ((job_control_mode == job_control_t::interactive) && shell_is_interactive()));
 
     job->set_flag(job_flag_t::FOREGROUND, !job_node_is_background(job_node));
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 7c5016a14..df60dd461 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -79,7 +79,7 @@ bool is_block = false;
 bool is_breakpoint = false;
 bool is_login = false;
 int is_event = 0;
-int job_control_mode = JOB_CONTROL_INTERACTIVE;
+job_control_t job_control_mode = job_control_t::interactive;
 int no_exec = 0;
 
 static int is_interactive = -1;
diff --git a/src/proc.h b/src/proc.h
index b6f09376f..b161589ab 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -38,10 +38,10 @@ enum process_type_t {
     INTERNAL_EXEC
 };
 
-enum {
-    JOB_CONTROL_ALL,
-    JOB_CONTROL_INTERACTIVE,
-    JOB_CONTROL_NONE,
+enum class job_control_t {
+    all,
+    interactive,
+    none,
 };
 
 /// A proc_status_t is a value type that encapsulates logic around exited vs stopped vs signaled,
@@ -489,8 +489,8 @@ void set_proc_had_barrier(bool flag);
 
 /// The current job control mode.
 ///
-/// Must be one of JOB_CONTROL_ALL, JOB_CONTROL_INTERACTIVE and JOB_CONTROL_NONE.
-extern int job_control_mode;
+/// Must be one of job_control_t::all, job_control_t::interactive and job_control_t::none.
+extern job_control_t job_control_mode;
 
 /// If this flag is set, fish will never fork or run execve. It is used to put fish into a syntax
 /// verifier mode where fish tries to validate the syntax of a file but doesn't actually do

From 165c82e68ae16082b892a7d406d226ff8b6453f4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Mar 2019 12:29:25 -0700
Subject: [PATCH 0151/1732] Promote process_type_t to an enum class

---
 src/exec.cpp            | 31 ++++++++++++++++---------------
 src/parse_execution.cpp | 32 ++++++++++++++++----------------
 src/proc.cpp            |  2 +-
 src/proc.h              | 34 +++++++++++++++++-----------------
 4 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index b93c78f02..d22e81334 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -488,7 +488,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
 static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<job_t> &j,
                                        process_t *p, const io_pipe_t *pipe_read,
                                        const io_chain_t &proc_io_chain, io_streams_t &streams) {
-    assert(p->type == INTERNAL_BUILTIN && "Process must be a builtin");
+    assert(p->type == process_type_t::builtin && "Process must be a builtin");
     int local_builtin_stdin = STDIN_FILENO;
     autoclose_fd_t locally_opened_stdin{};
 
@@ -590,7 +590,7 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
 /// given in io_chain.
 static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
                                   io_chain_t *io_chain, const io_streams_t &builtin_io_streams) {
-    assert(p->type == INTERNAL_BUILTIN && "Process is not a builtin");
+    assert(p->type == process_type_t::builtin && "Process is not a builtin");
 
     const output_stream_t &stdout_stream = builtin_io_streams.out;
     const output_stream_t &stderr_stream = builtin_io_streams.err;
@@ -677,7 +677,7 @@ static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
 /// \return true on success, false if there is an exec error.
 static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t> &j,
                                   process_t *p, const io_chain_t &proc_io_chain) {
-    assert(p->type == EXTERNAL && "Process is not external");
+    assert(p->type == process_type_t::external && "Process is not external");
     // Get argv and envv before we fork.
     null_terminated_array_t<char> argv_array;
     convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
@@ -786,7 +786,7 @@ static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t
 /// our pipes. \return true on success, false on error.
 static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
                                        const io_chain_t &user_ios, io_chain_t io_chain) {
-    assert((p->type == INTERNAL_FUNCTION || p->type == INTERNAL_BLOCK_NODE) &&
+    assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
            "Unexpected process type");
 
     // Create an output buffer if we're piping to another process.
@@ -802,7 +802,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         io_chain.push_back(block_output_bufferfill);
     }
 
-    if (p->type == INTERNAL_FUNCTION) {
+    if (p->type == process_type_t::function) {
         const wcstring func_name = p->argv0();
         auto props = function_get_properties(func_name);
         if (!props) {
@@ -822,7 +822,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         parser.allow_function();
         parser.pop_block(fb);
     } else {
-        assert(p->type == INTERNAL_BLOCK_NODE);
+        assert(p->type == process_type_t::block_node);
         assert(p->block_node_source && p->internal_block_node && "Process is missing node info");
         internal_exec_helper(parser, p->block_node_source, p->internal_block_node, io_chain, j);
     }
@@ -939,7 +939,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     // to generate it, since that result would not get written back to the parent. This call
     // could be safely removed, but it would result in slightly lower performance - at least on
     // uniprocessor systems.
-    if (p->type == EXTERNAL) {
+    if (p->type == process_type_t::external) {
         // Apply universal barrier so we have the most recent uvar changes
         if (!get_proc_had_barrier()) {
             set_proc_had_barrier(true);
@@ -951,15 +951,15 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
-        case INTERNAL_FUNCTION:
-        case INTERNAL_BLOCK_NODE: {
+        case process_type_t::function:
+        case process_type_t::block_node: {
             if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain)) {
                 return false;
             }
             break;
         }
 
-        case INTERNAL_BUILTIN: {
+        case process_type_t::builtin: {
             io_streams_t builtin_io_streams{stdout_read_limit};
             if (!exec_internal_builtin_proc(parser, j, p, pipe_read.get(), process_net_io_chain,
                                             builtin_io_streams)) {
@@ -971,16 +971,17 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             break;
         }
 
-        case EXTERNAL: {
+        case process_type_t::external: {
             if (!exec_external_command(parser.vars(), j, p, process_net_io_chain)) {
                 return false;
             }
             break;
         }
 
-        case INTERNAL_EXEC: {
+        case process_type_t::exec: {
             // We should have handled exec up above.
-            DIE("INTERNAL_EXEC process found in pipeline, where it should never be. Aborting.");
+            DIE("process_type_t::exec process found in pipeline, where it should never be. "
+                "Aborting.");
             break;
         }
     }
@@ -1002,7 +1003,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     const std::shared_ptr<job_t> parent_job = j->get_parent();
 
     // Perhaps inherit our parent's pgid and job control flag.
-    if (parent_job && j->processes.front()->type == EXTERNAL) {
+    if (parent_job && j->processes.front()->type == process_type_t::external) {
         if (parent_job->pgid != INVALID_PID) {
             j->pgid = parent_job->pgid;
             j->set_flag(job_flag_t::JOB_CONTROL, true);
@@ -1019,7 +1020,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         }
     }
 
-    if (j->processes.front()->type == INTERNAL_EXEC) {
+    if (j->processes.front()->type == process_type_t::exec) {
         internal_exec(parser.vars(), j.get(), all_ios);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 85de38ab8..2034f0d56 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -143,9 +143,9 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
     return infinite_recursive_statement;
 }
 
-enum process_type_t parse_execution_context_t::process_type_for_command(
+process_type_t parse_execution_context_t::process_type_for_command(
     tnode_t<grammar::plain_statement> statement, const wcstring &cmd) const {
-    enum process_type_t process_type = EXTERNAL;
+    enum process_type_t process_type = process_type_t::external;
 
     // Determine the process type, which depends on the statement decoration (command, builtin,
     // etc).
@@ -153,19 +153,19 @@ enum process_type_t parse_execution_context_t::process_type_for_command(
 
     if (decoration == parse_statement_decoration_exec) {
         // Always exec.
-        process_type = INTERNAL_EXEC;
+        process_type = process_type_t::exec;
     } else if (decoration == parse_statement_decoration_command) {
         // Always a command.
-        process_type = EXTERNAL;
+        process_type = process_type_t::external;
     } else if (decoration == parse_statement_decoration_builtin) {
         // What happens if this builtin is not valid?
-        process_type = INTERNAL_BUILTIN;
+        process_type = process_type_t::builtin;
     } else if (function_exists(cmd)) {
-        process_type = INTERNAL_FUNCTION;
+        process_type = process_type_t::function;
     } else if (builtin_exists(cmd)) {
-        process_type = INTERNAL_BUILTIN;
+        process_type = process_type_t::builtin;
     } else {
-        process_type = EXTERNAL;
+        process_type = process_type_t::external;
     }
     return process_type;
 }
@@ -775,7 +775,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     enum process_type_t process_type = process_type_for_command(statement, cmd);
 
     // Check for stack overflow.
-    if (process_type == INTERNAL_FUNCTION &&
+    if (process_type == process_type_t::function &&
         parser->forbidden_function.size() > FISH_MAX_STACK_DEPTH) {
         this->report_error(statement, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
         return parse_execution_errored;
@@ -783,7 +783,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
 
     // Protect against exec with background processes running
     static uint32_t last_exec_run_counter =  -1;
-    if (process_type == INTERNAL_EXEC && shell_is_interactive()) {
+    if (process_type == process_type_t::exec && shell_is_interactive()) {
         job_iterator_t jobs;
         bool have_bg = false;
         const job_t *bg = nullptr;
@@ -811,7 +811,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     }
 
     wcstring path_to_external_command;
-    if (process_type == EXTERNAL || process_type == INTERNAL_EXEC) {
+    if (process_type == process_type_t::external || process_type == process_type_t::exec) {
         // Determine the actual command. This may be an implicit cd.
         bool has_command = path_get_path(cmd, &path_to_external_command, parser->vars());
 
@@ -847,7 +847,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         path_to_external_command.clear();
 
         // If we have defined a wrapper around cd, use it, otherwise use the cd builtin.
-        process_type = function_exists(L"cd") ? INTERNAL_FUNCTION : INTERNAL_BUILTIN;
+        process_type = function_exists(L"cd") ? process_type_t::function : process_type_t::builtin;
     } else {
         // Not implicit cd.
         const globspec_t glob_behavior = (cmd == L"set" || cmd == L"count") ? nullglob : failglob;
@@ -1006,8 +1006,8 @@ template <typename Type>
 parse_execution_result_t parse_execution_context_t::populate_block_process(
     job_t *job, process_t *proc, tnode_t<g::statement> statement,
     tnode_t<Type> specific_statement) {
-    // We handle block statements by creating INTERNAL_BLOCK_NODE, that will bounce back to us when
-    // it's time to execute them.
+    // We handle block statements by creating process_type_t::block_node, that will bounce back to
+    // us when it's time to execute them.
     UNUSED(job);
     static_assert(Type::token == symbol_block_statement || Type::token == symbol_if_statement ||
                       Type::token == symbol_switch_statement,
@@ -1022,7 +1022,7 @@ parse_execution_result_t parse_execution_context_t::populate_block_process(
     bool errored = !this->determine_io_chain(arguments, &process_io_chain);
     if (errored) return parse_execution_errored;
 
-    proc->type = INTERNAL_BLOCK_NODE;
+    proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
     proc->set_io_chain(process_io_chain);
@@ -1245,7 +1245,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         // Check to see if this contained any external commands.
         bool job_contained_external_command = false;
         for (const auto &proc : job->processes) {
-            if (proc->type == EXTERNAL) {
+            if (proc->type == process_type_t::external) {
                 job_contained_external_command = true;
                 break;
             }
diff --git a/src/proc.cpp b/src/proc.cpp
index df60dd461..119bbfeee 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -917,7 +917,7 @@ void proc_sanity_check() {
 
         for (const process_ptr_t &p : j->processes) {
             // Internal block nodes do not have argv - see issue #1545.
-            bool null_ok = (p->type == INTERNAL_BLOCK_NODE);
+            bool null_ok = (p->type == process_type_t::block_node);
             validate_pointer(p->get_argv(), _(L"Process argument list"), null_ok);
             validate_pointer(p->argv0(), _(L"Process name"), null_ok);
 
diff --git a/src/proc.h b/src/proc.h
index b161589ab..716fd42f7 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -25,17 +25,17 @@
 #include "topic_monitor.h"
 
 /// Types of processes.
-enum process_type_t {
+enum class process_type_t {
     /// A regular external command.
-    EXTERNAL,
+    external,
     /// A builtin command.
-    INTERNAL_BUILTIN,
+    builtin,
     /// A shellscript function.
-    INTERNAL_FUNCTION,
+    function,
     /// A block of commands, represented as a node.
-    INTERNAL_BLOCK_NODE,
+    block_node,
     /// The exec builtin.
-    INTERNAL_EXEC
+    exec,
 };
 
 enum class job_control_t {
@@ -137,21 +137,22 @@ class internal_proc_t {
 /// process, an internal builtin which may or may not spawn a fake IO process during execution, a
 /// shellscript function or a block of commands to be evaluated by calling eval. Lastly, this
 /// process can be the result of an exec command. The role of this process_t is determined by the
-/// type field, which can be one of EXTERNAL, INTERNAL_BUILTIN, INTERNAL_FUNCTION, INTERNAL_EXEC.
+/// type field, which can be one of process_type_t::external, process_type_t::builtin,
+/// process_type_t::function, process_type_t::exec.
 ///
 /// The process_t contains information on how the process should be started, such as command name
 /// and arguments, as well as runtime information on the status of the actual physical process which
 /// represents it. Shellscript functions, builtins and blocks of code may all need to spawn an
 /// external process that handles the piping and redirecting of IO for them.
 ///
-/// If the process is of type EXTERNAL or INTERNAL_EXEC, argv is the argument array and actual_cmd
-/// is the absolute path of the command to execute.
+/// If the process is of type process_type_t::external or process_type_t::exec, argv is the argument
+/// array and actual_cmd is the absolute path of the command to execute.
 ///
-/// If the process is of type INTERNAL_BUILTIN, argv is the argument vector, and argv[0] is the name
-/// of the builtin command.
+/// If the process is of type process_type_t::builtin, argv is the argument vector, and argv[0] is
+/// the name of the builtin command.
 ///
-/// If the process is of type INTERNAL_FUNCTION, argv is the argument vector, and argv[0] is the
-/// name of the shellscript function.
+/// If the process is of type process_type_t::function, argv is the argument vector, and argv[0] is
+/// the name of the shellscript function.
 class process_t {
    private:
     null_terminated_array_t<wchar_t> argv_array;
@@ -169,9 +170,8 @@ class process_t {
     bool is_first_in_job{false};
     bool is_last_in_job{false};
 
-    /// Type of process. Can be one of \c EXTERNAL, \c INTERNAL_BUILTIN, \c INTERNAL_FUNCTION, \c
-    /// INTERNAL_EXEC.
-    enum process_type_t type { EXTERNAL };
+    /// Type of process.
+    process_type_t type{process_type_t::external};
 
     /// For internal block processes only, the node offset of the statement.
     /// This is always either block, ifs, or switchs, never boolean or decorated.
@@ -208,7 +208,7 @@ class process_t {
     /// launch. This helps us avoid spurious waitpid calls.
     void check_generations_before_launch();
 
-    /// Actual command to pass to exec in case of EXTERNAL or INTERNAL_EXEC.
+    /// Actual command to pass to exec in case of process_type_t::external or process_type_t::exec.
     wcstring actual_cmd;
 
     /// Generation counts for reaping.

From 3bbee06248b073fc30ae5cc8e418c943c8cd6e11 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Mar 2019 14:27:23 -0700
Subject: [PATCH 0152/1732] Introduce the notion of a deferred process

In a job, a deferred process is the last fish internal process which pipes
to an external command. Execute the deferred process last; this will allow
for streaming its output.
---
 src/exec.cpp | 132 +++++++++++++++++++++++++++++++++++----------------
 src/io.h     |   4 ++
 2 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index d22e81334..4775dc27b 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -861,35 +861,14 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     return true;
 }
 
-/// Executes a process \p in job \j, using the read pipe \p pipe_current_read.
-/// If the process pipes to a command, the read end of the created pipe is returned in
-/// out_pipe_next_read. \returns true on success, false on exec error.
+/// Executes a process \p in job \j, using the pipes \p pipes (which may have invalid fds if this is
+/// the first or last process).
+/// deferred_pipes represents the pipes from our deferred process; if set ensure they get closed in
+/// any child.
+/// \returns true on success, false on exec error.
 static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
-                                autoclose_fd_t pipe_current_read,
-                                autoclose_fd_t *out_pipe_next_read, const io_chain_t &all_ios,
-                                size_t stdout_read_limit) {
-    // The pipe this command will write to (if any).
-    shared_ptr<io_pipe_t> pipe_write;
-    // The pipe this command will read from (if any).
-    shared_ptr<io_pipe_t> pipe_read;
-
-    // See if we need a pipe for the next command.
-    const bool pipes_to_next_command = !p->is_last_in_job;
-    if (pipes_to_next_command) {
-        // Construct our pipes.
-        auto local_pipes = make_autoclose_pipes(all_ios);
-        if (!local_pipes) {
-            debug(1, PIPE_ERROR);
-            wperror(L"pipe");
-            job_mark_process_as_failed(j, p);
-            return false;
-        }
-
-        pipe_write = std::make_shared<io_pipe_t>(p->pipe_write_fd, false /* not input */,
-                                                 std::move(local_pipes->write));
-        *out_pipe_next_read = std::move(local_pipes->read);
-    }
-
+                                autoclose_pipes_t pipes, const io_chain_t &all_ios,
+                                const autoclose_pipes_t &deferred_pipes, size_t stdout_read_limit) {
     // The write pipe (destined for stdout) needs to occur before redirections. For example,
     // with a redirection like this:
     //
@@ -920,20 +899,30 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     // The IO chain for this process.
     io_chain_t process_net_io_chain = j->block_io_chain();
-    if (pipe_write) {
-        process_net_io_chain.push_back(pipe_write);
+
+    if (pipes.write.valid()) {
+        process_net_io_chain.push_back(std::make_shared<io_pipe_t>(
+            p->pipe_write_fd, false /* not input */, std::move(pipes.write)));
     }
 
     // The explicit IO redirections associated with the process.
     process_net_io_chain.append(p->io_chain());
 
     // Read pipe goes last.
-    if (pipe_current_read.valid()) {
-        pipe_read = std::make_shared<io_pipe_t>(STDIN_FILENO, true /* input */,
-                                                std::move(pipe_current_read));
+    shared_ptr<io_pipe_t> pipe_read{};
+    if (pipes.read.valid()) {
+        pipe_read =
+            std::make_shared<io_pipe_t>(STDIN_FILENO, true /* input */, std::move(pipes.read));
         process_net_io_chain.push_back(pipe_read);
     }
 
+    // If we have stashed pipes, make sure those get closed in the child.
+    for (const autoclose_fd_t *afd : {&deferred_pipes.read, &deferred_pipes.write}) {
+        if (afd->valid()) {
+            process_net_io_chain.push_back(std::make_shared<io_close_t>(afd->fd()));
+        }
+    }
+
     // This call is used so the global environment variable array is regenerated, if needed,
     // before the fork. That way, we avoid a lot of duplicate work where EVERY child would need
     // to generate it, since that result would not get written back to the parent. This call
@@ -988,6 +977,31 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     return true;
 }
 
+// Do we have a fish internal process that pipes into a real process? If so, we are going to
+// launch it last (if there's more than one, just the last one). That is to prevent buffering
+// from blocking further processes. See #1396.
+// Example:
+//   for i in (seq 1 5); sleep 1; echo $i; end | cat
+// This should show the output as it comes, not buffer until the end.
+// Any such process (only one per job) will be called the "deferred" process.
+static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
+    process_t *last_internal = nullptr;
+    for (const auto &p : j->processes) {
+        if (p->type == process_type_t::exec) {
+            // No tail reordering for execs.
+            return nullptr;
+        } else if (p->type != process_type_t::external) {
+            last_internal = p.get();
+        }
+    }
+    if (last_internal && !last_internal->is_last_in_job) {
+        // This is the last internal process, and it pipes to an external process.
+        return last_internal;
+    } else {
+        return nullptr;
+    }
+}
+
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     assert(j && "null job_t passed to exec_job!");
 
@@ -1011,15 +1025,17 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     }
 
     size_t stdout_read_limit = 0;
-    const io_chain_t all_ios = j->all_io_redirections();
+    io_chain_t all_ios = j->all_io_redirections();
+
+    // The read limit is dictated by the last bufferfill.
     for (auto &io : all_ios) {
         if ((io->io_mode == io_mode_t::bufferfill)) {
-            // The read limit is dictated by the last bufferfill.
             const auto *bf = static_cast<io_bufferfill_t *>(io.get());
             stdout_read_limit = bf->buffer()->read_limit();
         }
     }
 
+    // Handle an exec call.
     if (j->processes.front()->type == process_type_t::exec) {
         internal_exec(parser.vars(), j.get(), all_ios);
         // internal_exec only returns if it failed to set up redirections.
@@ -1029,6 +1045,10 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         return false;
     }
 
+    // Get the deferred process, if any. We will have to remember its pipes.
+    autoclose_pipes_t deferred_pipes;
+    process_t *const deferred_process = get_deferred_process(j);
+
     // This loop loops over every process_t in the job, starting it as appropriate. This turns out
     // to be rather complex, since a process_t can be one of many rather different things.
     //
@@ -1041,16 +1061,46 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     // 3. The pipe that the next process should read from (courtesy of us)
     //
     autoclose_fd_t pipe_next_read;
-    for (const auto &unique_p : j->processes) {
-        autoclose_fd_t current_read = std::move(pipe_next_read);
-        if (!exec_process_in_job(parser, unique_p.get(), j, std::move(current_read),
-                                 &pipe_next_read, all_ios, stdout_read_limit)) {
-            exec_error = true;
-            break;
+    for (const auto &p : j->processes) {
+        // proc_pipes is the pipes applied to this process. That is, it is the read end
+        // containing the output of the previous process (if any), plus the write end that will
+        // output to the next process (if any).
+        autoclose_pipes_t proc_pipes;
+        proc_pipes.read = std::move(pipe_next_read);
+        if (!p->is_last_in_job) {
+            auto pipes = make_autoclose_pipes(all_ios);
+            if (!pipes) {
+                debug(1, PIPE_ERROR);
+                wperror(L"pipe");
+                job_mark_process_as_failed(j, p.get());
+                exec_error = true;
+                break;
+            }
+            pipe_next_read = std::move(pipes->read);
+            proc_pipes.write = std::move(pipes->write);
+        }
+
+        if (p.get() == deferred_process) {
+            deferred_pipes = std::move(proc_pipes);
+        } else {
+            if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios,
+                                     deferred_pipes, stdout_read_limit)) {
+                exec_error = true;
+                break;
+            }
         }
     }
     pipe_next_read.close();
 
+    // Now execute any deferred process.
+    if (!exec_error && deferred_process) {
+        assert(deferred_pipes.write.valid() && "Deferred process should always have a write pipe");
+        if (!exec_process_in_job(parser, deferred_process, j, std::move(deferred_pipes), all_ios,
+                                 {}, stdout_read_limit)) {
+            exec_error = true;
+        }
+    }
+
     debug(3, L"Created job %d from command '%ls' with pgrp %d", j->job_id, j->command_wcstr(),
           j->pgid);
 
diff --git a/src/io.h b/src/io.h
index 4017af474..e72a00291 100644
--- a/src/io.h
+++ b/src/io.h
@@ -352,6 +352,10 @@ struct autoclose_pipes_t {
 
     /// Write end of the pipe.
     autoclose_fd_t write;
+
+    autoclose_pipes_t() = default;
+    autoclose_pipes_t(autoclose_fd_t r, autoclose_fd_t w)
+        : read(std::move(r)), write(std::move(w)) {}
 };
 /// Call pipe(), populating autoclose fds, avoiding conflicts.
 /// The pipes are marked CLO_EXEC.

From 5eade35257aeb1302f57c112123ba7042c062b3e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Mar 2019 21:12:41 -0700
Subject: [PATCH 0153/1732] Stop buffering deferred function processes

If a function process is deferred, allow it to be unbuffered.
This permits certain simple cases where functions are piped to external
commands to execute without buffering.

This is a somewhat-hacky stopgap measure that can't really be extended
to more general concurrent processes. However it is overall an improvement
in user experience that might help flush out some bugs too.
---
 src/exec.cpp    | 26 +++++++++++++++++---------
 tests/test1.in  |  2 +-
 tests/test1.out |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 4775dc27b..ddf612d9d 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -783,15 +783,18 @@ static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t
 
 /// Execute a block node or function "process".
 /// \p user_ios contains the list of user-specified ios, used so we can avoid stomping on them with
-/// our pipes. \return true on success, false on error.
+/// our pipes.
+/// \p allow_buffering if true, permit buffering the output.
+/// \return true on success, false on error.
 static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
-                                       const io_chain_t &user_ios, io_chain_t io_chain) {
+                                       const io_chain_t &user_ios, io_chain_t io_chain,
+                                       bool allow_buffering) {
     assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
            "Unexpected process type");
 
     // Create an output buffer if we're piping to another process.
     shared_ptr<io_bufferfill_t> block_output_bufferfill{};
-    if (!p->is_last_in_job) {
+    if (!p->is_last_in_job && allow_buffering) {
         // Be careful to handle failure, e.g. too many open fds.
         block_output_bufferfill = io_bufferfill_t::create(user_ios);
         if (!block_output_bufferfill) {
@@ -863,12 +866,13 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 
 /// Executes a process \p in job \j, using the pipes \p pipes (which may have invalid fds if this is
 /// the first or last process).
-/// deferred_pipes represents the pipes from our deferred process; if set ensure they get closed in
-/// any child.
-/// \returns true on success, false on exec error.
+/// \p deferred_pipes represents the pipes from our deferred process; if set ensure they get closed
+/// in any child. If \p is_deferred_run is true, then this is a deferred run; this affects how
+/// certain buffering works. \returns true on success, false on exec error.
 static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
                                 autoclose_pipes_t pipes, const io_chain_t &all_ios,
-                                const autoclose_pipes_t &deferred_pipes, size_t stdout_read_limit) {
+                                const autoclose_pipes_t &deferred_pipes, size_t stdout_read_limit,
+                                bool is_deferred_run = false) {
     // The write pipe (destined for stdout) needs to occur before redirections. For example,
     // with a redirection like this:
     //
@@ -942,7 +946,11 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     switch (p->type) {
         case process_type_t::function:
         case process_type_t::block_node: {
-            if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain)) {
+            // Allow buffering unless this is a deferred run. If deferred, then processes after us
+            // were already launched, so they are ready to receive (or reject) our output.
+            bool allow_buffering = !is_deferred_run;
+            if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain,
+                                            allow_buffering)) {
                 return false;
             }
             break;
@@ -1096,7 +1104,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     if (!exec_error && deferred_process) {
         assert(deferred_pipes.write.valid() && "Deferred process should always have a write pipe");
         if (!exec_process_in_job(parser, deferred_process, j, std::move(deferred_pipes), all_ios,
-                                 {}, stdout_read_limit)) {
+                                 {}, stdout_read_limit, true)) {
             exec_error = true;
         }
     }
diff --git a/tests/test1.in b/tests/test1.in
index f006e774a..41fc71caa 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -109,7 +109,7 @@ end
 echo Test 5 $sta
 
 logmsg Verify that we can turn stderr into stdout and then pipe it
-# Note that the order here seems unspecified - 'errput' appears before 'output', why?
+# Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'.
 begin ; echo output ; echo errput 1>&2  ; end 2>&1 | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
 
 logmsg "Test that trailing ^ doesn't trigger redirection, see #1873"
diff --git a/tests/test1.out b/tests/test1.out
index 6c141412d..8ac15efc6 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -44,10 +44,10 @@ Test 5 pass
 
 ####################
 # Verify that we can turn stderr into stdout and then pipe it
-errput
 output
 errput
 output
+errput
 
 ####################
 # Test that trailing ^ doesn't trigger redirection, see #1873

From 93d70fae11f25e2ca04dfcd055685a97b2aa0f60 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Mar 2019 21:39:39 -0700
Subject: [PATCH 0154/1732] Relnote stop buffering deferred function processes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8311bbfde..e9649eb8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Add `$pipestatus` support
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
+- fish no longer requires buffering for the last function in a pipeline.
 
 ### Syntax changes and new commands
 - None yet.

From ea3a368c50cd838ca43e49f0d7dafc3772f7b40c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Mar 2019 00:41:04 -0700
Subject: [PATCH 0155/1732] Make env_var_t store its values via shared_ptr

This switches env_var_t to be an immutable value type, and stores its
contents via a shared_ptr. This eliminates string copying when fetching
env_var_t values.
---
 src/env.cpp | 25 +++++++++++++------------
 src/env.h   | 54 ++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 3cfe58715..4d338622d 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1239,17 +1239,16 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
                 has_changed_new = true;
             }
 
-            var.set_vals(std::move(val));
-            var.set_pathvar(var_mode & ENV_PATHVAR);
-            var.set_read_only(is_read_only(key));
+            var = var.setting_vals(std::move(val))
+                      .setting_exports(var_mode & ENV_EXPORT)
+                      .setting_pathvar(var_mode & ENV_PATHVAR)
+                      .setting_read_only(is_read_only(key));
 
             if (var_mode & ENV_EXPORT) {
                 // The new variable is exported.
-                var.set_exports(true);
                 node->exportv = true;
                 has_changed_new = true;
             } else {
-                var.set_exports(false);
                 // Set the node's exported when it changes something about exports
                 // (also when it redefines a variable to not be exported).
                 node->exportv = has_changed_old != has_changed_new;
@@ -1351,20 +1350,16 @@ int env_stack_t::remove(const wcstring &key, int var_mode) {
     return erased ? ENV_OK : ENV_NOT_FOUND;
 }
 
-const wcstring_list_t &env_var_t::as_list() const { return vals; }
+const wcstring_list_t &env_var_t::as_list() const { return *vals_; }
 
 wchar_t env_var_t::get_delimiter() const {
     return is_pathvar() ? PATH_ARRAY_SEP : NONPATH_ARRAY_SEP;
 }
 
 /// Return a string representation of the var.
-wcstring env_var_t::as_string() const {
-    return join_strings(vals, get_delimiter());
-}
+wcstring env_var_t::as_string() const { return join_strings(*vals_, get_delimiter()); }
 
-void env_var_t::to_list(wcstring_list_t &out) const {
-    out = vals;
-}
+void env_var_t::to_list(wcstring_list_t &out) const { out = *vals_; }
 
 env_var_t::env_var_flags_t env_var_t::flags_for(const wchar_t *name) {
     env_var_flags_t result = 0;
@@ -1372,6 +1367,12 @@ env_var_t::env_var_flags_t env_var_t::flags_for(const wchar_t *name) {
     return result;
 }
 
+/// \return a singleton empty list, to avoid unnecessary allocations in env_var_t.
+std::shared_ptr<const wcstring_list_t> env_var_t::empty_list() {
+    static const auto result = std::make_shared<const wcstring_list_t>();
+    return result;
+}
+
 maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
     const bool search_local = !has_scope || (mode & ENV_LOCAL);
diff --git a/src/env.h b/src/env.h
index f5d240b84..be26aefa2 100644
--- a/src/env.h
+++ b/src/env.h
@@ -66,13 +66,22 @@ void env_init(const struct config_paths_t *paths = NULL);
 /// routines.
 void misc_init();
 
+/// env_var_t is an immutable value-type data structure representing the value of an environment
+/// variable.
 class env_var_t {
    public:
     using env_var_flags_t = uint8_t;
 
    private:
-    wcstring_list_t vals;  // list of values assigned to the var
-    env_var_flags_t flags;
+    env_var_t(std::shared_ptr<const wcstring_list_t> vals, env_var_flags_t flags)
+        : vals_(std::move(vals)), flags_(flags) {}
+
+    /// The list of values in this variable.
+    /// shared_ptr allows for cheap copying.
+    std::shared_ptr<const wcstring_list_t> vals_{empty_list()};
+
+    /// Flag in this variable.
+    env_var_flags_t flags_{};
 
    public:
     enum {
@@ -82,24 +91,27 @@ class env_var_t {
     };
 
     // Constructors.
+    env_var_t() = default;
     env_var_t(const env_var_t &) = default;
     env_var_t(env_var_t &&) = default;
-    env_var_t(wcstring_list_t vals, env_var_flags_t flags) : vals(std::move(vals)), flags(flags) {}
+
+    env_var_t(wcstring_list_t vals, env_var_flags_t flags)
+        : env_var_t(std::make_shared<wcstring_list_t>(std::move(vals)), flags) {}
+
     env_var_t(wcstring val, env_var_flags_t flags)
         : env_var_t(wcstring_list_t{std::move(val)}, flags) {}
 
     // Constructors that infer the flags from a name.
     env_var_t(const wchar_t *name, wcstring_list_t vals)
         : env_var_t(std::move(vals), flags_for(name)) {}
+
     env_var_t(const wchar_t *name, wcstring val) : env_var_t(std::move(val), flags_for(name)) {}
 
-    env_var_t() = default;
-
-    bool empty() const { return vals.empty() || (vals.size() == 1 && vals[0].empty()); }
-    bool read_only() const { return flags & flag_read_only; }
-    bool exports() const { return flags & flag_export; }
-    bool is_pathvar() const { return flags & flag_pathvar; }
-    env_var_flags_t get_flags() const { return flags; }
+    bool empty() const { return vals_->empty() || (vals_->size() == 1 && vals_->front().empty()); }
+    bool read_only() const { return flags_ & flag_read_only; }
+    bool exports() const { return flags_ & flag_export; }
+    bool is_pathvar() const { return flags_ & flag_pathvar; }
+    env_var_flags_t get_flags() const { return flags_; }
 
     wcstring as_string() const;
     void to_list(wcstring_list_t &out) const;
@@ -108,38 +120,50 @@ class env_var_t {
     /// \return the character used when delimiting quoted expansion.
     wchar_t get_delimiter() const;
 
-    void set_vals(wcstring_list_t v) { vals = std::move(v); }
+    /// \return a copy of this variable with new values.
+    env_var_t setting_vals(wcstring_list_t vals) const {
+        return env_var_t{std::move(vals), flags_};
+    }
 
-    void set_exports(bool exportv) {
+    env_var_t setting_exports(bool exportv) const {
+        env_var_flags_t flags = flags_;
         if (exportv) {
             flags |= flag_export;
         } else {
             flags &= ~flag_export;
         }
+        return env_var_t{vals_, flags};
     }
 
-    void set_pathvar(bool pathvar) {
+    env_var_t setting_pathvar(bool pathvar) const {
+        env_var_flags_t flags = flags_;
         if (pathvar) {
             flags |= flag_pathvar;
         } else {
             flags &= ~flag_pathvar;
         }
+        return env_var_t{vals_, flags};
     }
 
-    void set_read_only(bool read_only) {
+    env_var_t setting_read_only(bool read_only) const {
+        env_var_flags_t flags = flags_;
         if (read_only) {
             flags |= flag_read_only;
         } else {
             flags &= ~flag_read_only;
         }
+        return env_var_t{vals_, flags};
     }
 
     static env_var_flags_t flags_for(const wchar_t *name);
+    static std::shared_ptr<const wcstring_list_t> empty_list();
 
     env_var_t &operator=(const env_var_t &var) = default;
     env_var_t &operator=(env_var_t &&) = default;
 
-    bool operator==(const env_var_t &rhs) const { return vals == rhs.vals && flags == rhs.flags; }
+    bool operator==(const env_var_t &rhs) const {
+        return *vals_ == *rhs.vals_ && flags_ == rhs.flags_;
+    }
     bool operator!=(const env_var_t &rhs) const { return ! (*this == rhs); }
 };
 

From 989f992a75f1a14e9ebbe95a0433cb9867f7c9e8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Mar 2019 00:49:52 -0700
Subject: [PATCH 0156/1732] Rearrange and inline some env code

---
 src/env.cpp | 182 ++++++++++++++++++++++++----------------------------
 1 file changed, 85 insertions(+), 97 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 4d338622d..1a4080d7d 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -136,7 +136,13 @@ class env_node_t {
 
     maybe_t<env_var_t> find_entry(const wcstring &key);
 
-    bool contains_any_of(const wcstring_list_t &vars) const;
+    /// Return whether this node contains any of the entries in the vars list.
+    bool contains_any_of(const wcstring_list_t &vars) const {
+        for (const auto &v : vars) {
+            if (env.count(v)) return true;
+        }
+        return false;
+    }
 };
 
 using env_node_ref_t = std::shared_ptr<env_node_t>;
@@ -175,18 +181,80 @@ struct var_stack_t {
 
     // Pushes a new node onto our stack
     // Optionally creates a new scope for the node
-    void push(bool new_scope);
+    void push(bool new_scope) {
+        auto node = std::make_shared<env_node_t>(new_scope);
+
+        // Copy local-exported variables.
+        auto top_node = top;
+        // Only if we introduce a new shadowing scope; i.e. not if it's just `begin; end` or
+        // "--no-scope-shadowing".
+        if (new_scope && top_node != this->global_env) {
+            for (const auto &var : top_node->env) {
+                if (var.second.exports()) node->env.insert(var);
+            }
+        }
+
+        node->next = this->top;
+        this->top = node;
+        if (new_scope && local_scope_exports(this->top)) {
+            this->mark_changed_exported();
+        }
+    }
 
     // Pops the top node if it's not global
-    void pop();
+    void pop() {
+        // Don't pop the top-most, global, level.
+        if (top == this->global_env) {
+            debug(0, _(L"Tried to pop empty environment stack."));
+            sanity_lose();
+            return;
+        }
+
+        bool locale_changed = top->contains_any_of(locale_variables);
+        bool curses_changed = top->contains_any_of(curses_variables);
+
+        if (top->new_scope) {  //!OCLINT(collapsible if statements)
+            if (top->exportv || local_scope_exports(top->next)) {
+                this->mark_changed_exported();
+            }
+        }
+
+        // Actually do the pop!
+        env_node_ref_t old_top = this->top;
+        this->top = old_top->next;
+        for (const auto &entry_pair : old_top->env) {
+            const env_var_t &var = entry_pair.second;
+            if (var.exports()) {
+                this->mark_changed_exported();
+                break;
+            }
+        }
+
+        // TODO: instantize this locale and curses
+        const auto &vars = env_stack_t::principal();
+        if (locale_changed) init_locale(vars);
+        if (curses_changed) init_curses(vars);
+    }
 
     // Returns the next scope to search for a given node, respecting the new_scope flag.
     // Returns an empty pointer if we're done.
-    env_node_ref_t next_scope_to_search(const env_node_ref_t &node) const;
+    env_node_ref_t next_scope_to_search(const env_node_ref_t &node) const {
+        assert(node != NULL);
+        if (node == this->global_env) {
+            return nullptr;
+        }
+        return node->new_scope ? this->global_env : node->next;
+    }
 
     // Returns the scope used for unspecified scopes. An unspecified scope is either the topmost
     // shadowing scope, or the global scope if none. This implements the default behavior of `set`.
-    env_node_ref_t resolve_unspecified_scope();
+    env_node_ref_t resolve_unspecified_scope() {
+        env_node_ref_t node = this->top;
+        while (node && !node->new_scope) {
+            node = node->next;
+        }
+        return node ? node : this->global_env;
+    }
 
     /// Copy this vars_stack.
     var_stack_t clone() const {
@@ -201,100 +269,12 @@ struct var_stack_t {
     void get_exported(const env_node_t *n, var_table_t &h) const;
 
     /// Returns the global variable set.
-    static env_node_ref_t globals();
+    static env_node_ref_t globals() {
+        static env_node_ref_t s_globals{std::make_shared<env_node_t>(false)};
+        return s_globals;
+    }
 };
 
-env_node_ref_t var_stack_t::globals() {
-    static env_node_ref_t s_globals{std::make_shared<env_node_t>(false)};
-    return s_globals;
-}
-
-void var_stack_t::push(bool new_scope) {
-    auto node = std::make_shared<env_node_t>(new_scope);
-
-    // Copy local-exported variables.
-    auto top_node = top;
-    // Only if we introduce a new shadowing scope; i.e. not if it's just `begin; end` or
-    // "--no-scope-shadowing".
-    if (new_scope && top_node != this->global_env) {
-        for (const auto &var : top_node->env) {
-            if (var.second.exports()) node->env.insert(var);
-        }
-    }
-
-    node->next = this->top;
-    this->top = node;
-    if (new_scope && local_scope_exports(this->top)) {
-        this->mark_changed_exported();
-    }
-}
-
-/// Return true if if the node contains any of the entries in the vars list.
-bool env_node_t::contains_any_of(const wcstring_list_t &vars) const {
-    for (const auto &v : vars) {
-        if (env.count(v)) return true;
-    }
-    return false;
-}
-
-void var_stack_t::pop() {
-    // Don't pop the top-most, global, level.
-    if (top == this->global_env) {
-        debug(0, _(L"Tried to pop empty environment stack."));
-        sanity_lose();
-        return;
-    }
-
-    bool locale_changed = top->contains_any_of(locale_variables);
-    bool curses_changed = top->contains_any_of(curses_variables);
-
-    if (top->new_scope) {  //!OCLINT(collapsible if statements)
-        if (top->exportv || local_scope_exports(top->next)) {
-            this->mark_changed_exported();
-        }
-    }
-
-    // Actually do the pop!
-    env_node_ref_t old_top = this->top;
-    this->top = old_top->next;
-    for (const auto &entry_pair : old_top->env) {
-        const env_var_t &var = entry_pair.second;
-        if (var.exports()) {
-            this->mark_changed_exported();
-            break;
-        }
-    }
-
-    // TODO: instantize this locale and curses
-    const auto &vars = env_stack_t::principal();
-    if (locale_changed) init_locale(vars);
-    if (curses_changed) init_curses(vars);
-}
-
-env_node_ref_t var_stack_t::next_scope_to_search(const env_node_ref_t &node) const {
-    assert(node != NULL);
-    if (node == this->global_env) {
-        return nullptr;
-    }
-    return node->new_scope ? this->global_env : node->next;
-}
-
-env_node_ref_t var_stack_t::resolve_unspecified_scope() {
-    env_node_ref_t node = this->top;
-    while (node && !node->new_scope) {
-        node = node->next;
-    }
-    return node ? node : this->global_env;
-}
-
-env_stack_t::env_stack_t() : vars_(make_unique<var_stack_t>()) {}
-env_stack_t::env_stack_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
-
-// Get the variable stack
-var_stack_t &env_stack_t::vars_stack() { return *vars_; }
-
-const var_stack_t &env_stack_t::vars_stack() const { return *vars_; }
-
 /// Universal variables global instance. Initialized in env_init.
 static env_universal_t *s_universal_variables = NULL;
 
@@ -334,6 +314,14 @@ static const string_set_t env_electric = {L"history", L"pipestatus", L"status",
 
 static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
 
+env_stack_t::env_stack_t() : vars_(make_unique<var_stack_t>()) {}
+env_stack_t::env_stack_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
+
+// Get the variable stack
+var_stack_t &env_stack_t::vars_stack() { return *vars_; }
+
+const var_stack_t &env_stack_t::vars_stack() const { return *vars_; }
+
 maybe_t<env_var_t> env_node_t::find_entry(const wcstring &key) {
     var_table_t::const_iterator entry = env.find(key);
     if (entry != env.end()) return entry->second;

From eeec6cc2fc7e0636d8ea9f50f1fa62a65db1472a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Mar 2019 02:26:50 -0700
Subject: [PATCH 0157/1732] Remove a single use of env_stack_t::principal

---
 src/builtin_read.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index a0f1ab91a..077bf164d 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -198,13 +198,12 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
 
 /// Read from the tty. This is only valid when the stream is stdin and it is attached to a tty and
 /// we weren't asked to split on null characters.
-static int read_interactive(wcstring &buff, int nchars, bool shell, bool silent,
+static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool shell, bool silent,
                             const wchar_t *prompt, const wchar_t *right_prompt,
                             const wchar_t *commandline) {
     int exit_res = STATUS_CMD_OK;
 
-    // TODO: rationalize this.
-    const auto &vars = env_stack_t::principal();
+    const auto &vars = parser.vars();
     wcstring read_history_ID = history_session_id(vars);
     if (!read_history_ID.empty()) read_history_ID += L"_read";
     reader_push(read_history_ID);
@@ -469,8 +468,8 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         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.
-            exit_res = read_interactive(buff, opts.nchars, opts.shell, opts.silent, opts.prompt,
-                                        opts.right_prompt, opts.commandline);
+            exit_res = read_interactive(parser, buff, opts.nchars, opts.shell, opts.silent,
+                                        opts.prompt, opts.right_prompt, opts.commandline);
         } 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);

From b86200938f8b9e9a2016cb2130c14d0bd3193a2f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 10:11:36 +0100
Subject: [PATCH 0158/1732] Always use "." for cd

Nobody doesn't want to use $PWD to cd, so if $CDPATH does not include
it that was a mistake.

Bash also appends "." here.

Fixes #4484.
---
 CHANGELOG.md               |  1 +
 sphinx_doc_src/cmds/cd.rst |  2 +-
 src/path.cpp               |  5 ++---
 tests/cd.err               |  3 +++
 tests/cd.in                | 10 ++++++++++
 tests/cd.out               |  6 ++++++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9649eb8f..99c4789e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Add `$pipestatus` support
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 - fish no longer requires buffering for the last function in a pipeline.
+- cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
 
 ### Syntax changes and new commands
 - None yet.
diff --git a/sphinx_doc_src/cmds/cd.rst b/sphinx_doc_src/cmds/cd.rst
index 2a6fcc748..623d853b8 100644
--- a/sphinx_doc_src/cmds/cd.rst
+++ b/sphinx_doc_src/cmds/cd.rst
@@ -13,7 +13,7 @@ Description
 
 If ``DIRECTORY`` is supplied, it will become the new directory. If no parameter is given, the contents of the ``HOME`` environment variable will be used.
 
-If ``DIRECTORY`` is a relative path, the paths found in the ``CDPATH`` environment variable array will be tried as prefixes for the specified path.
+If ``DIRECTORY`` is a relative path, the paths found in the ``CDPATH`` list will be tried as prefixes for the specified path, in addition to $PWD.
 
 Note that the shell will attempt to change directory without requiring ``cd`` if the name of a directory is provided (starting with ``.``, ``/`` or ``~``, or ending with ``/``).
 
diff --git a/src/path.cpp b/src/path.cpp
index 8349dd50e..937738664 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -173,9 +173,8 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
         if (auto cdpaths = env_vars.get(L"CDPATH")) {
             cdpathsv = cdpaths->as_list();
         }
-        if (cdpathsv.empty()) {
-            cdpathsv.push_back(L".");
-        }
+        // Always append $PWD
+        cdpathsv.push_back(L".");
         for (wcstring next_path : cdpathsv) {
             if (next_path.empty()) next_path = L".";
             if (next_path == L"." && !wd.empty()) {
diff --git a/tests/cd.err b/tests/cd.err
index 4653e2ee6..fae7b99e0 100644
--- a/tests/cd.err
+++ b/tests/cd.err
@@ -7,3 +7,6 @@
 
 ####################
 # Virtual PWD inheritance
+
+####################
+# CDPATH
diff --git a/tests/cd.in b/tests/cd.in
index 2d02d269c..e70a7f902 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -62,6 +62,16 @@ test (realpath $output_pwd) = $real_getcwd
 and echo "BogusPWD test 2 succeeded"
 or echo "BogusPWD test 2 failed: $output_pwd vs $real_getcwd"
 
+# $CDPATH
+logmsg CDPATH
+set -g CDPATH $base
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via CDPATH
+set -g CDPATH /tmp
+cd $base
+test $PWD = $base; and echo Gone to base
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
 
 # cd back before removing the test directory again.
 cd $oldpwd
diff --git a/tests/cd.out b/tests/cd.out
index 8fd581f17..d3801a10a 100644
--- a/tests/cd.out
+++ b/tests/cd.out
@@ -23,3 +23,9 @@ cd:
 PWD is /tmp/cdcomp_test/linkhome
 BogusPWD test 1 succeeded
 BogusPWD test 2 succeeded
+
+####################
+# CDPATH
+Gone to linkhome via CDPATH
+Gone to base
+Gone to linkhome via implicit . in CDPATH

From 39a601927f6f10240a971ef10e4e64d20fe1c6f4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 16:36:28 +0100
Subject: [PATCH 0159/1732] Remove useless empty lines from stack traces

This printed things like

```
in function 'f'
        called on standard input

in function 'd'
        called on standard input

in function 'b'
        called on standard input

in function 'a'
        called on standard input

```

As a first step, it removes the empty lines so it's now

```
in function 'f'
        called on standard input
in function 'd'
        called on standard input
in function 'b'
        called on standard input
in function 'a'
        called on standard input
```

See #5434.
---
 src/parser.cpp                               | 2 --
 tests/invocation/broken-config-continues.err | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 572f9b5bb..8e8c71138 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -416,8 +416,6 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
                 append_format(*buff, _(L"\twith parameter list '%ls'\n"), tmp.c_str());
             }
         }
-
-        append_format(*buff, L"\n");
     }
 
     // Recursively print the next block.
diff --git a/tests/invocation/broken-config-continues.err b/tests/invocation/broken-config-continues.err
index c4165a1a8..d15aebbd8 100644
--- a/tests/invocation/broken-config-continues.err
+++ b/tests/invocation/broken-config-continues.err
@@ -4,4 +4,3 @@ syntax-error
 ^
 from sourcing file $XDG_CONFIG_HOME/fish/config.fish
 	called during startup
-

From 71a2337c5f8f0e2ebecc30aca9d1e151110cd9de Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 17:18:07 +0100
Subject: [PATCH 0160/1732] Remove stray newlines in test

Sorry!
---
 tests/test_cmdsub.err | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_cmdsub.err b/tests/test_cmdsub.err
index 1d39d0ae7..5ef37be88 100644
--- a/tests/test_cmdsub.err
+++ b/tests/test_cmdsub.err
@@ -18,11 +18,9 @@ fish: Too much data emitted by command substitution so it was discarded
 in function 'subme'
 	called on standard input
 	with parameter list '513'
-
 in command substitution
 	called on standard input
 
-
 ####################
 # Make sure output from builtins outside of command substitution is not affected
 

From e723f02aa7969415dc11ef9fe4d80666aad6f830 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 17:10:45 +0100
Subject: [PATCH 0161/1732] Remove empty line also for event handlers

---
 src/parser.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 8e8c71138..ba0da627a 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -355,7 +355,6 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
         const event_block_t *eb = static_cast<const event_block_t *>(b);
         wcstring description = event_get_desc(eb->event);
         append_format(*buff, _(L"in event handler: %ls\n"), description.c_str());
-        buff->append(L"\n");
 
         // Stop recursing at event handler. No reason to believe that any other code is relevant.
         //

From 975023faf273243b1673d4267c94f75a60590849 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 17:15:51 +0100
Subject: [PATCH 0162/1732] Print arguments on the same line as the function

Now:

```
cd: Unknown option '-r'
~/dev/fish-shell/share/functions/cd.fish (line 40):
    builtin cd $argv
    ^
in function 'cd' with arguments '-r'
in function 'f'
in function 'd'
in function 'b' with arguments '-1q --wurst'
in function 'a'
	called on standard input
```

See #5434.
---
 src/parser.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index ba0da627a..bbc1edf3a 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -379,7 +379,21 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
             case FUNCTION_CALL:
             case FUNCTION_CALL_NO_SHADOW: {
                 const function_block_t *fb = static_cast<const function_block_t *>(b);
-                append_format(*buff, _(L"in function '%ls'\n"), fb->name.c_str());
+                append_format(*buff, _(L"in function '%ls'"), fb->name.c_str());
+                const process_t *const process = fb->process;
+                // Print arguments on the same line.
+                if (process->argv(1)) {
+                    wcstring tmp;
+
+                    for (i = 1; process->argv(i); i++) {
+                        if (i > 1) tmp.push_back(L' ');
+                        tmp.append(process->argv(i));
+                    }
+                    // TODO: Escape these.
+                    append_format(*buff, _(L" with arguments '%ls'\n"), tmp.c_str());
+                } else {
+                    buff->append(L"\n");
+                }
                 break;
             }
             case SUBST: {
@@ -402,19 +416,6 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
             append_format(*buff, _(L"\tcalled on standard input\n"));
         }
 
-        if (b->type() == FUNCTION_CALL) {
-            const function_block_t *fb = static_cast<const function_block_t *>(b);
-            const process_t *const process = fb->process;
-            if (process->argv(1)) {
-                wcstring tmp;
-
-                for (i = 1; process->argv(i); i++) {
-                    if (i > 1) tmp.push_back(L' ');
-                    tmp.append(process->argv(i));
-                }
-                append_format(*buff, _(L"\twith parameter list '%ls'\n"), tmp.c_str());
-            }
-        }
     }
 
     // Recursively print the next block.

From 7095de628c8f05b2142827a74511cd1c979c5c90 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 17:10:56 +0100
Subject: [PATCH 0163/1732] Remove "called on standard input" message

This was printed basically everywhere.

The user knows what they executed on standard input.

A good example:

```fish
set c (subme 513)
```

used to print

```
fish: Too much data emitted by command substitution so it was discarded

    set -l x (string repeat -n $argv x)
             ^
in function 'subme'
	called on standard input
	with parameter list '513'
in command substitution
	called on standard input
```

and now it is

```
fish: Too much data emitted by command substitution so it was discarded

    set -l x (string repeat -n $argv x)
             ^
in function 'subme' with arguments '513'
in command substitution
```

See #5434.
---
 src/parser.cpp        | 5 +++--
 tests/test_cmdsub.err | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index bbc1edf3a..a920b477d 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -405,6 +405,7 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
             }
         }
 
+        // Print where the function is called.
         const wchar_t *file = b->src_filename;
 
         if (file) {
@@ -413,9 +414,9 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
         } else if (is_within_fish_initialization()) {
             append_format(*buff, _(L"\tcalled during startup\n"));
         } else {
-            append_format(*buff, _(L"\tcalled on standard input\n"));
+            // This one is way too noisy
+            // append_format(*buff, _(L"\tcalled on standard input\n"));
         }
-
     }
 
     // Recursively print the next block.
diff --git a/tests/test_cmdsub.err b/tests/test_cmdsub.err
index 5ef37be88..62819c597 100644
--- a/tests/test_cmdsub.err
+++ b/tests/test_cmdsub.err
@@ -15,11 +15,8 @@ fish: Too much data emitted by command substitution so it was discarded
 
     set -l x (string repeat -n $argv x)
              ^
-in function 'subme'
-	called on standard input
-	with parameter list '513'
+in function 'subme' with arguments '513'
 in command substitution
-	called on standard input
 
 ####################
 # Make sure output from builtins outside of command substitution is not affected

From 88a935d8d1c63b18b240ad1a4d8196fc84f6b4c3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 17:45:25 +0100
Subject: [PATCH 0164/1732] Escape arguments in stacktraces

See #5434.
---
 src/parser.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index a920b477d..15871ed03 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -387,7 +387,13 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
 
                     for (i = 1; process->argv(i); i++) {
                         if (i > 1) tmp.push_back(L' ');
-                        tmp.append(process->argv(i));
+                        // We can't quote the arguments because we print this in quotes.
+                        // As a special-case, add the empty argument as "".
+                        if (process->argv(i)[0]) {
+                            tmp.append(escape_string(process->argv(i), ESCAPE_ALL | ESCAPE_NO_QUOTED));
+                        } else {
+                            tmp.append(L"\"\"");
+                        }
                     }
                     // TODO: Escape these.
                     append_format(*buff, _(L" with arguments '%ls'\n"), tmp.c_str());

From 88d2d54276c8c7cb9423b6e9f8868789e8ef85b3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 19:13:01 +0100
Subject: [PATCH 0165/1732] Stop printing help summary on error

This now displays

- the error message

- a (significantly shorter) backtrace

- A call to open `help $cmd` if necessary

See #5434.
Fixes #3404.
---
 src/builtin.cpp             | 85 +++++--------------------------------
 src/builtin.h               |  2 +
 src/builtin_argparse.cpp    |  8 +++-
 src/builtin_commandline.cpp | 16 +++----
 src/builtin_complete.cpp    |  2 +-
 src/builtin_disown.cpp      |  2 +-
 src/builtin_exit.cpp        |  4 +-
 src/builtin_fg.cpp          |  4 +-
 src/builtin_function.cpp    |  2 +-
 src/builtin_functions.cpp   | 14 +++---
 src/builtin_read.cpp        | 12 +++---
 src/builtin_return.cpp      |  6 +--
 src/builtin_set.cpp         | 34 +++++++--------
 src/builtin_ulimit.cpp      |  6 +--
 tests/string.err            |  6 ---
 15 files changed, 71 insertions(+), 132 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 6efffd6b3..f30162799 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -187,92 +187,29 @@ wcstring builtin_help_get(parser_t &parser, io_streams_t &streams, const wchar_t
 ///
 void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
                         output_stream_t &b) {
-    bool is_stderr = &b == &streams.err;
-    if (is_stderr) {
-        b.append(parser.current_line());
-    }
-
-    const wcstring h = builtin_help_get(parser, streams, cmd);
-
-    if (!h.size()) return;
-
-    wchar_t *str = wcsdup(h.c_str());
-    if (str) {
-        bool is_short = false;
-        if (is_stderr) {
-            // Interactive mode help to screen - only print synopsis if the rest won't fit.
-            int screen_height, my_lines;
-
-            screen_height = common_get_height();
-            my_lines = count_char(str, L'\n');
-            if (!shell_is_interactive() || (my_lines > 2 * screen_height / 3)) {
-                wchar_t *pos;
-                int cut = 0;
-                int i;
-
-                is_short = true;
-
-                // First move down 4 lines.
-                pos = str;
-                for (i = 0; (i < 4) && pos && *pos; i++) {
-                    pos = std::wcschr(pos + 1, L'\n');
-                }
-
-                if (pos && *pos) {
-                    // Then find the next empty line.
-                    for (; *pos; pos++) {
-                        if (*pos != L'\n') {
-                            continue;
-                        }
-
-                        int is_empty = 1;
-                        wchar_t *pos2;
-                        for (pos2 = pos + 1; *pos2; pos2++) {
-                            if (*pos2 == L'\n') break;
-
-                            if (*pos2 != L'\t' && *pos2 != L' ') {
-                                is_empty = 0;
-                                break;
-                            }
-                        }
-                        if (is_empty) {
-                            // And cut it.
-                            *(pos2 + 1) = L'\0';
-                            cut = 1;
-                            break;
-                        }
-                    }
-                }
-
-                // We did not find a good place to cut message to shorten it - so we make sure we
-                // don't print anything.
-                if (!cut) {
-                    *str = 0;
-                }
-            }
-        }
-
-        b.append(str);
-        if (is_short) {
-            b.append_format(_(L"%ls: Type 'help %ls' for related documentation\n\n"), cmd, cmd);
-        }
-
-        free(str);
-    }
+    b.append(builtin_help_get(parser, streams, cmd));
 }
 
 /// Perform error reporting for encounter with unknown option.
 void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
                             const wchar_t *opt) {
     streams.err.append_format(BUILTIN_ERR_UNKNOWN, cmd, opt);
-    builtin_print_help(parser, streams, cmd, streams.err);
+    builtin_print_error_trailer(parser, streams.err, cmd);
 }
 
 /// Perform error reporting for encounter with missing argument.
 void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
                               const wchar_t *opt) {
     streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt);
-    builtin_print_help(parser, streams, cmd, streams.err);
+    builtin_print_error_trailer(parser, streams.err, cmd);
+}
+
+/// Print the backtrace and call for help that we use at the end of error messages.
+void builtin_print_error_trailer(parser_t &parser, output_stream_t &b, const wchar_t *cmd) {
+    b.append(L"\n");
+    b.append(parser.current_line());
+    b.append(L"\n");
+    b.append_format(_(L"(Type 'help %ls' for related documentation)\n"), cmd);
 }
 
 /// A generic bultin that only supports showing a help message. This is only a placeholder that
diff --git a/src/builtin.h b/src/builtin.h
index 8e5fd5e18..6185267bf 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -115,6 +115,8 @@ void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar
 void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
                               const wchar_t *opt);
 
+void builtin_print_error_trailer(parser_t &parser, output_stream_t &b, const wchar_t *cmd);
+
 void builtin_wperror(const wchar_t *s, io_streams_t &streams);
 
 struct help_only_cmd_opts_t {
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 9c6d930a3..4c70fd657 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -548,7 +548,13 @@ static int argparse_parse_flags(parser_t &parser, const argparse_cmd_opts_t &opt
                 retval = validate_and_store_implicit_int(parser, opts, arg_contents, w, long_idx,
                                                          streams);
             } else {
-                builtin_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
+                streams.err.append_format(BUILTIN_ERR_UNKNOWN, cmd, argv[w.woptind - 1]);
+                // We don't use builtin_print_error_trailer as that
+                // says to use the cmd help,
+                // which doesn't work if it's a command that does not belong to fish.
+                //
+                // Plus this particular error is not an error in argparse usage.
+                streams.err.append(parser.current_line());
                 retval = STATUS_INVALID_ARGS;
             }
             if (retval != STATUS_CMD_OK) return retval;
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index a4fb80f46..d37e87384 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -196,7 +196,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
 
         streams.err.append(argv[0]);
         streams.err.append(L": Can not set commandline in non-interactive mode\n");
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_ERROR;
     }
 
@@ -315,7 +315,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
         if (buffer_part || cut_at_cursor || append_mode || tokenize || cursor_mode || line_mode ||
             search_mode || paging_mode) {
             streams.err.append_format(BUILTIN_ERR_COMBO, argv[0]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
 
@@ -331,7 +331,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
                 input_queue_ch(*mc);
             } else {
                 streams.err.append_format(_(L"%ls: Unknown input function '%ls'"), cmd, argv[i]);
-                builtin_print_help(parser, streams, cmd, streams.err);
+                builtin_print_error_trailer(parser, streams.err, cmd);
                 return STATUS_INVALID_ARGS;
             }
         }
@@ -351,14 +351,14 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     // Check for invalid switch combinations.
     if ((search_mode || line_mode || cursor_mode || paging_mode) && (argc - w.woptind > 1)) {
         streams.err.append_format(L"%ls: Too many arguments", argv[0]);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     if ((buffer_part || tokenize || cut_at_cursor) &&
         (cursor_mode || line_mode || search_mode || paging_mode)) {
         streams.err.append_format(BUILTIN_ERR_COMBO, argv[0]);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -366,7 +366,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
         streams.err.append_format(
             BUILTIN_ERR_COMBO2, cmd,
             L"--cut-at-cursor and --tokenize can not be used when setting the commandline");
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -374,7 +374,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
         streams.err.append_format(
             BUILTIN_ERR_COMBO2, cmd,
             L"insertion mode switches can not be used when not in insertion mode");
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -392,7 +392,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             long new_pos = fish_wcstol(argv[w.woptind]);
             if (errno) {
                 streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[w.woptind]);
-                builtin_print_help(parser, streams, cmd, streams.err);
+                builtin_print_error_trailer(parser, streams.err, cmd);
             }
 
             current_buffer = reader_get_buffer();
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index c96571210..c3b25cc75 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -270,7 +270,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (w.woptind != argc) {
         streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 382c95099..52e2c995b 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -19,7 +19,7 @@
 static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &streams, job_t *j) {
     if (j == 0) {
         streams.err.append_format(_(L"%ls: Unknown job '%ls'\n"), L"bg");
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index d089598ae..9337f7e23 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -73,7 +73,7 @@ int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (optind + 1 < argc) {
         streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -84,7 +84,7 @@ int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         if (errno) {
             streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd,
                                       argv[optind]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
     }
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index a89f45866..8a915ecc1 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -68,14 +68,14 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), cmd, argv[optind]);
         }
 
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
 
         j = 0;
     } else {
         int pid = abs(fish_wcstoi(argv[optind]));
         if (errno) {
             streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[optind]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
         } else {
             j = job_t::from_pid(pid);
             if (!j || !j->is_constructed() || j->is_completed()) {
diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 104a728d8..db9777f32 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -230,7 +230,7 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index c9d02753b..91b334e6e 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -282,7 +282,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool describe = opts.description ? true : false;
     if (describe + opts.erase + opts.list + opts.query + opts.copy > 1) {
         streams.err.append_format(_(L"%ls: Invalid combination of options\n"), cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -296,14 +296,14 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         if (argc - optind != 1) {
             streams.err.append_format(_(L"%ls: Expected exactly one function name\n"), cmd);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
 
         func = argv[optind];
         if (!function_exists(func)) {
             streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"), cmd, func);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_CMD_ERROR;
         }
 
@@ -370,7 +370,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(_(L"%ls: Expected exactly two names (current function name, "
                                         L"and new function name)\n"),
                                       cmd);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
         current_func = argv[optind];
@@ -379,14 +379,14 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         if (!function_exists(current_func)) {
             streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"), cmd,
                                       current_func.c_str());
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_CMD_ERROR;
         }
 
         if (!valid_func_name(new_func) || parser_keywords_is_reserved(new_func)) {
             streams.err.append_format(_(L"%ls: Illegal function name '%ls'\n"), cmd,
                                       new_func.c_str());
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
 
@@ -395,7 +395,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(
                 _(L"%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"), cmd,
                 new_func.c_str(), current_func.c_str());
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_CMD_ERROR;
         }
 
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 077bf164d..ec8dc974a 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -130,13 +130,13 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                     if (errno == ERANGE) {
                         streams.err.append_format(_(L"%ls: Argument '%ls' is out of range\n"), cmd,
                                                   w.woptarg);
-                        builtin_print_help(parser, streams, cmd, streams.err);
+                        builtin_print_error_trailer(parser, streams.err, cmd);
                         return STATUS_INVALID_ARGS;
                     }
 
                     streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd,
                                               w.woptarg);
-                    builtin_print_help(parser, streams, cmd, streams.err);
+                    builtin_print_error_trailer(parser, streams.err, cmd);
                     return STATUS_INVALID_ARGS;
                 }
                 break;
@@ -351,7 +351,7 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
                               const wchar_t *const *argv, parser_t &parser, io_streams_t &streams) {
     if (opts.prompt && opts.prompt_str) {
         streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd, L"-p", L"-P");
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -373,7 +373,7 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
 
     if ((opts.place & ENV_UNEXPORT) && (opts.place & ENV_EXPORT)) {
         streams.err.append_format(BUILTIN_ERR_EXPUNEXP, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -381,7 +381,7 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
             (opts.place & ENV_UNIVERSAL ? 1 : 0) >
         1) {
         streams.err.append_format(BUILTIN_ERR_GLOCAL, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -404,7 +404,7 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
     for (int i = 0; i < argc; i++) {
         if (!valid_var_name(argv[i])) {
             streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, argv[i]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
     }
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 27ce2beda..32a201af8 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -73,7 +73,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (optind + 1 < argc) {
         streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -83,7 +83,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         retval = fish_wcstoi(argv[1]);
         if (errno) {
             streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd, argv[1]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
         retval &= 0xFF;
@@ -98,7 +98,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (function_block_idx >= parser.block_count()) {
         streams.err.append_format(_(L"%ls: Not inside of function\n"), cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_ERROR;
     }
 
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 3a18e5a09..f435bbff7 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -175,42 +175,42 @@ static int validate_cmd_opts(const wchar_t *cmd, set_cmd_opts_t &opts,  //!OCLIN
     // Can't query and erase or list.
     if (opts.query && (opts.erase || opts.list)) {
         streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     // We can't both list and erase variables.
     if (opts.erase && opts.list) {
         streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     // Variables can only have one scope.
     if (opts.local + opts.global + opts.universal > 1) {
         streams.err.append_format(BUILTIN_ERR_GLOCAL, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     // Variables can only have one export status.
     if (opts.exportv && opts.unexport) {
         streams.err.append_format(BUILTIN_ERR_EXPUNEXP, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     // Variables can only have one path status.
     if (opts.pathvar && opts.unpathvar) {
         streams.err.append_format(BUILTIN_ERR_EXPUNEXP, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     // Trying to erase and (un)export at the same time doesn't make sense.
     if (opts.erase && (opts.exportv || opts.unexport)) {
         streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -218,13 +218,13 @@ static int validate_cmd_opts(const wchar_t *cmd, set_cmd_opts_t &opts,  //!OCLIN
     if (opts.show &&
         (opts.local || opts.global || opts.erase || opts.list || opts.exportv || opts.universal)) {
         streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     if (argc == 0 && opts.erase) {
         streams.err.append_format(BUILTIN_SET_ERASE_NO_VAR, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -519,7 +519,7 @@ static int builtin_set_query(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
         int idx_count = parse_index(indexes, dest, scope, streams, parser.vars());
         if (idx_count == -1) {
             free(dest);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_CMD_ERROR;
         }
 
@@ -612,7 +612,7 @@ static int builtin_set_show(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
             if (std::wcschr(arg, L'[')) {
                 streams.err.append_format(
                     _(L"%ls: `set --show` does not allow slices with the var names\n"), cmd);
-                builtin_print_help(parser, streams, cmd, streams.err);
+                builtin_print_error_trailer(parser, streams.err, cmd);
                 return STATUS_CMD_ERROR;
             }
 
@@ -631,7 +631,7 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
                              parser_t &parser, io_streams_t &streams) {
     if (argc != 1) {
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, L"--erase", 1, argc);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_ERROR;
     }
 
@@ -641,14 +641,14 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
     std::vector<long> indexes;
     int idx_count = parse_index(indexes, dest, scope, streams, parser.vars());
     if (idx_count == -1) {
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_ERROR;
     }
 
     int retval;
     if (!valid_var_name(dest)) {
         streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, dest);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -709,7 +709,7 @@ static int set_var_slices(const wchar_t *cmd, set_cmd_opts_t &opts, const wchar_
     if (opts.append || opts.prepend) {
         streams.err.append_format(
             L"%ls: Cannot use --append or --prepend when assigning to a slice", cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -740,7 +740,7 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
                            parser_t &parser, io_streams_t &streams) {
     if (argc == 0) {
         streams.err.append_format(BUILTIN_ERR_MIN_ARG_COUNT1, cmd, 1);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -752,13 +752,13 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
     std::vector<long> indexes;
     int idx_count = parse_index(indexes, varname, scope, streams, parser.vars());
     if (idx_count == -1) {
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     if (!valid_var_name(varname)) {
         streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, varname);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index 553c35514..40fe6bfef 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -269,7 +269,7 @@ int builtin_ulimit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     } else if (arg_count != 1) {
         streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -282,7 +282,7 @@ int builtin_ulimit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     rlim_t new_limit;
     if (*argv[w.woptind] == L'\0') {
         streams.err.append_format(_(L"%ls: New limit cannot be an empty string\n"), cmd);
-        builtin_print_help(parser, streams, cmd, streams.err);
+        builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     } else if (wcscasecmp(argv[w.woptind], L"unlimited") == 0) {
         new_limit = RLIM_INFINITY;
@@ -294,7 +294,7 @@ int builtin_ulimit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         new_limit = fish_wcstol(argv[w.woptind]);
         if (errno) {
             streams.err.append_format(_(L"%ls: Invalid limit '%ls'\n"), cmd, argv[w.woptind]);
-            builtin_print_help(parser, streams, cmd, streams.err);
+            builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
         new_limit *= get_multiplier(what);
diff --git a/tests/string.err b/tests/string.err
index 0b2106c73..d291768ce 100644
--- a/tests/string.err
+++ b/tests/string.err
@@ -185,9 +185,6 @@ string match: ^
 ####################
 # string invalidarg
 string: Subcommand 'invalidarg' is not valid
-Standard input (line 211): 
-string invalidarg; and echo "unexpected exit 0"
-^
 
 ####################
 # string length
@@ -270,9 +267,6 @@ string repeat: Expected argument
 ####################
 # string repeat -l fakearg 2>&1
 string repeat: Unknown option '-l'
-Standard input (line 287): 
-string repeat -l fakearg
-^
 
 ####################
 # string repeat ""

From 7fa454666d55264d6b8f78af302298694b21dee7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 19:29:44 +0100
Subject: [PATCH 0166/1732] Only append newline if stacktrace isn't empty

This printed weird things like

```fish
$ functions -x
functions: Unknown option '-x'

(Type 'help functions' for related documentation)
```

Instead, let's make it

```fish
$ functions -x
functions: Unknown option '-x'
(Type 'help functions' for related documentation)
```
---
 src/builtin.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index f30162799..347f5c216 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -207,8 +207,12 @@ void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wch
 /// Print the backtrace and call for help that we use at the end of error messages.
 void builtin_print_error_trailer(parser_t &parser, output_stream_t &b, const wchar_t *cmd) {
     b.append(L"\n");
-    b.append(parser.current_line());
-    b.append(L"\n");
+    const wcstring stacktrace = parser.current_line();
+    // Don't print two empty lines if we don't have a stacktrace.
+    if (!stacktrace.empty()) {
+        b.append(stacktrace);
+        b.append(L"\n");
+    }
     b.append_format(_(L"(Type 'help %ls' for related documentation)\n"), cmd);
 }
 

From 54156845e43a653ea74afbc34871193cc093709f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 19:33:20 +0100
Subject: [PATCH 0167/1732] CHANGELOG error changes

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99c4789e3..b2d167ff4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 - fish no longer requires buffering for the last function in a pipeline.
 - cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
+- Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 
 ### Syntax changes and new commands
 - None yet.

From 248200520e1c4a9e9a69f1aa9d486f2923012c04 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Mar 2019 09:03:17 +0100
Subject: [PATCH 0168/1732] functions/help: Prefer xdg-open/cygstart over open

Some systems like Debian have "open" as a symlink to "openvt" (for... historical
reasons).

See #5756.

[ci skip]
---
 share/functions/help.fish | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 977818ed7..99ca6a884 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -54,6 +54,16 @@ function help --description 'Show help for the fish shell'
                 end
             end
 
+            # If we have an open _command_ we use it - otherwise it's our function,
+            # which might not have a backend to use.
+            # Note that we prefer xdg-open, because this open might also be a symlink to "openvt"
+            # like it is on Debian.
+            if command -sq open
+                set fish_browser open
+                # The open command needs a trampoline because the macOS version can't handle #-fragments.
+                set need_trampoline 1
+            end
+
             # If the OS appears to be Windows (graphical), try to use cygstart
             if type -q cygstart
                 set fish_browser cygstart
@@ -62,14 +72,6 @@ function help --description 'Show help for the fish shell'
             else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
-
-            # If we have an open _command_ we use it - otherwise it's our function,
-            # which might not have a backend to use.
-            if command -sq open
-                set fish_browser open
-                # The open command needs a trampoline because the macOS version can't handle #-fragments.
-                set need_trampoline 1
-            end
         end
     end
 

From 2a51e42ee02e8f0d4043addc1e0c610a54f64e07 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 22 Mar 2019 17:24:10 +0100
Subject: [PATCH 0169/1732] functions/help: Try harder to find a browser on WSL

We now try cmd.exe via $PATH and via a common location, wsl-open, and
an open command.

Fixes #5756.

[ci skip]
---
 share/functions/help.fish | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 99ca6a884..95b153c20 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -72,6 +72,19 @@ function help --description 'Show help for the fish shell'
             else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
+
+            # Try to find cmd.exe via $PATH or one of the paths that it's often at.
+            #
+            # We use this instead of xdg-open because that's useless without a backend
+            # like wsl-open which we'll check in a minute.
+            if set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
+                # Use the first of these.
+                set fish_browser $cmd[1]
+            end
+
+            if type -q wsl-open
+                set fish_browser wsl-open
+            end
         end
     end
 
@@ -119,11 +132,6 @@ function help --description 'Show help for the fish shell'
             set fish_help_page "index.html"
     end
 
-    set -l wsl 0
-    if uname -a | string match -qr Microsoft
-        set wsl 1
-    end
-
     set -l page_url
     if test -f $__fish_help_dir/index.html
         # Help is installed, use it
@@ -155,8 +163,9 @@ function help --description 'Show help for the fish shell'
         end
     end
 
-    if test $wsl -eq 1
-        cmd.exe /c "start $page_url"
+    # cmd.exe needs more coaxing.
+    if string match -qr 'cmd.exe$' -- $fish_browser[1]
+        $fish_browser /c "start $page_url"
     # If browser is known to be graphical, put into background
     else if contains -- $fish_browser[1] $graphical_browsers
         switch $fish_browser[1]

From 6a9079899d77dee483bbae96cb124cf3c84009e0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Mar 2019 12:29:03 +0100
Subject: [PATCH 0170/1732] docs: Add an annotated completion example

It's not _perfect_, but should hopefully ease the introduction a
teensy bit.

We use `timedatectl` because it's a reasonably simple command that
still uses subcommands and some generated candidates.

[ci skip]
---
 sphinx_doc_src/index.rst | 51 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 687efeec3..974c97097 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -570,6 +570,57 @@ To provide a list of possible completions for myprog, use the ``-a`` switch. If
 
 There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the `complete <cmds/complete.html>`_ builtin, or write ``complete --help`` inside the ``fish`` shell.
 
+As a simple example, here's an excerpt of the completions for systemd's ``timedatectl``::
+
+  # All subcommands that timedatectl knows - this is useful for later.
+  set -l commands status set-time set-timezone list-timezones set-local-rtc set-ntp
+
+  # Disable file completions for the entire command
+  # because it does not take files anywhere
+  # Note that this can't be undone,
+  # so it's often better to only disable it for certain completions.
+  #
+  # File completions also need to be disabled
+  # if you wish to offer a certain set of files (e.g. just directories).
+  complete -c timedatectl -f
+
+  # This line offers the subcommands
+  # -"status",
+  # -"set-timezone",
+  # -"set-time"
+  # -"list-timezones"
+  # if no subcommand has been given so far.
+  #
+  # The `-n`/`--condition` option takes script as a string, which it executes.
+  # If it returns true, the completion is offered.
+  # Here the condition is the `__fish_seen_subcommands_from` helper function.
+  # If returns true if any of the given commands is used on the commandline,
+  # as determined by a simple heuristic.
+  # For more complex uses, you can write your own function.
+  # See e.g. the git completions for an example.
+  #
+  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status set-time set-timezone list-timezones"
+
+  # If the "set-timezone" subcommand is used,
+  # offer the output of `timedatectl list-timezones` as completions.
+  # Each line of output is used as a separate candidate,
+  # and anything after a tab is taken as the description.
+  # It's often useful to transform command output with `string` into that form.
+  complete -c timedatectl -n "__fish_seen_subcommand_from set-timezone" -a "(timedatectl list-timezones)"
+
+  # Completion candidates can also be described via `-d`,
+  # which is useful if the description is constant.
+  # Try to keep these short, because that means the user gets to see more at once.
+  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-local-rtc" -d "Maintain RTC in local time"
+
+  # We can also limit options to certain subcommands by using conditions.
+  complete -c timedatectl -n "__fish_seen_subcommand_from set-local-rtc" -l adjust-system-clock -d 'Synchronize system clock from the RTC'
+
+  # These are simple options that can be used everywhere.
+  complete -c timedatectl -s h -l help -d 'Print a short help text and exit'
+  complete -c timedatectl -l version -d 'Print a short version string and exit'
+  complete -c timedatectl -l no-pager -d 'Do not pipe output into a pager'
+
 For examples of how to write your own complex completions, study the completions in ``/usr/share/fish/completions``. (The exact path depends on your chosen installation prefix and may be slightly different)
 
 .. _completion-func:

From 4e7795217dc3ed7c07425dae03cfbadf17182629 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Mar 2019 12:43:26 +0100
Subject: [PATCH 0171/1732] docs: Replace @cursor_key

Should be the last of them.

See #5696.

[ci skip]
---
 sphinx_doc_src/index.rst    | 6 +++---
 sphinx_doc_src/tutorial.rst | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 974c97097..bc62c5d7f 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1409,7 +1409,7 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Shift,←,Left` and :kbd:`Shift,→,Right` move the cursor one word left or right, without stopping on punctuation.
 
-- @cursor_key{↑,Up} and @cursor_key{↓,Down} (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`↑` (Up) and :kbd:`↓` (Down) (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
 
 - :kbd:`Alt+↑,Up` and :kbd:`Alt+↓,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
 
@@ -1448,7 +1448,7 @@ Emacs mode commands
 
 - :kbd:`End` or :kbd:`Control+E` moves to the end of line. If the cursor is already at the end of the line, and an autosuggestion is available, :kbd:`End` or :kbd:`Control+E` accepts the autosuggestion.
 
-- @cursor_key{←,Left} (or :kbd:`Control+B`) and @cursor_key{→,Right} (or :kbd:`Control+F`) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the @cursor_key{→,Right} key and the :kbd:`Control+F` combination accept the suggestion.
+- :kbd:`←` (Left) (or :kbd:`Control+B`) and :kbd:`→` (Right) (or :kbd:`Control+F`) move the cursor left or right by one character. If the cursor is already at the end of the line, and an autosuggestion is available, the :kbd:`→` (Right) key and the :kbd:`Control+F` combination accept the suggestion.
 
 - :kbd:`Delete` and :kbd:`Backspace` removes one character forwards or backwards respectively.
 
@@ -1535,7 +1535,7 @@ Insert mode
 Visual mode
 -----------
 
-- @cursor_key{←,Left} and @cursor_key{→,Right} extend the selection backward/forward by one character.
+- :kbd:`←` (Left) and :kbd:`→` (Right) extend the selection backward/forward by one character.
 
 - :kbd:`b` and :kbd:`w` extend the selection backward/forward by one word.
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 405d02cce..01503482b 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -163,7 +163,7 @@ And history too. Type a command once, and you can re-summon it by just typing a
     >_ <eror>r<</eror><s>___sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
 
 
-To accept the autosuggestion, hit @cursor_key{→,right arrow} or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+→` (right arrow). If the autosuggestion is not what you want, just ignore it.
+To accept the autosuggestion, hit :kbd:`→` (right arrow) or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+→` (right arrow). If the autosuggestion is not what you want, just ignore it.
 
 Tab Completions
 ---------------

From e2ce63ff62c1964fb5371e406f96ce6b00df67c5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Mar 2019 12:46:51 +0100
Subject: [PATCH 0172/1732] functions/help: Adjust command paths to sphinx

We now build a separate page per-command in cmds/$cmd.html instead of
a section in the "commands.html" page.

See #5696.

[ci skip]
---
 share/functions/help.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 95b153c20..0a6c94dfd 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -105,11 +105,11 @@ function help --description 'Show help for the fish shell'
 
     switch "$fish_help_item"
         case "."
-            set fish_help_page "commands.html\#source"
+            set fish_help_page "cmds/source.html"
         case globbing
             set fish_help_page "index.html\#expand"
         case (__fish_print_commands)
-            set fish_help_page "commands.html\#$fish_help_item"
+            set fish_help_page "cmds/$fish_help_item.html"
         case $help_topics
             set fish_help_page "index.html\#$fish_help_item"
         case 'tut_*'

From d8ec4685ffec9cf53d81cea39c528852e6ea0aee Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 21:39:25 +0100
Subject: [PATCH 0173/1732] src/builtin_test: Remove weird leading tab from
 error message

This is a remainder from when we used to speak of "eval errors".
---
 src/builtin_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 3951a7ecc..821001ab1 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -864,7 +864,7 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (!eval_errors.empty()) {
         if (!should_suppress_stderr_for_tests()) {
             for (size_t i = 0; i < eval_errors.size(); i++) {
-                streams.err.append_format(L"\t%ls\n", eval_errors.at(i).c_str());
+                streams.err.append_format(L"%ls\n", eval_errors.at(i).c_str());
             }
         }
         return STATUS_INVALID_ARGS;

From 785945c861654793a889bcbd89c02d235b401569 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Mar 2019 21:40:10 +0100
Subject: [PATCH 0174/1732] src/builtin_test: Print backtrace on error

`test` is a common source of problems, and with the current system
they can be quite hard to find.

So we print a backtrace with line numbers and all.
---
 src/builtin_test.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 821001ab1..b36921297 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -21,6 +21,7 @@
 #include "builtin.h"
 #include "common.h"
 #include "io.h"
+#include "parser.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 using std::unique_ptr;
@@ -830,6 +831,7 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             argc--;
         } else {
             streams.err.append(L"[: the last argument must be ']'\n");
+            builtin_print_error_trailer(parser, streams.err, program_name);
             return STATUS_INVALID_ARGS;
         }
     }
@@ -848,14 +850,8 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wcstring err;
     unique_ptr<expression> expr = test_parser::parse_args(args, err, program_name);
     if (!expr) {
-#if 0
-        streams.err.append(L"Oops! test was given args:\n");
-        for (size_t i=0; i < argc; i++) {
-            streams.err.append_format(L"\t%ls\n", args.at(i).c_str());
-        }
-        streams.err.append_format(L"and returned parse error: %ls\n", err.c_str());
-#endif
         streams.err.append(err);
+        builtin_print_error_trailer(parser, streams.err, program_name);
         return STATUS_CMD_ERROR;
     }
 
@@ -866,6 +862,9 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             for (size_t i = 0; i < eval_errors.size(); i++) {
                 streams.err.append_format(L"%ls\n", eval_errors.at(i).c_str());
             }
+            // Add a backtrace but not the "see help" message
+            // because this isn't about passing the wrong options.
+            streams.err.append(parser.current_line());
         }
         return STATUS_INVALID_ARGS;
     }

From 5441ebc91f212aea38346c181d8dcda0bd8899f1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 28 Mar 2019 00:37:06 -0700
Subject: [PATCH 0175/1732] Remove some dead code

---
 src/builtin.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 347f5c216..d2b545536 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -143,15 +143,6 @@ int parse_help_only_cmd_opts(struct help_only_cmd_opts_t &opts, int *optind, int
     return STATUS_CMD_OK;
 }
 
-/// Count the number of times the specified character occurs in the specified string.
-static int count_char(const wchar_t *str, wchar_t c) {
-    int res = 0;
-    for (; *str; str++) {
-        res += (*str == c);
-    }
-    return res;
-}
-
 /// Obtain help/usage information for the specified builtin from manpage in subshell
 ///
 /// @param  name

From 21d8b465cced887bfea086bf066383a9f04f0ee6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 28 Mar 2019 11:55:27 +0100
Subject: [PATCH 0176/1732] nextd/prevd: Print BEL instead of "Hit end of
 history"

That message is just hugely annoying.

Hat-tip to @floam and d524bad5f16b5a18c22fefe440.
---
 CHANGELOG.md                          | 1 +
 share/functions/__fish_move_last.fish | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2d167ff4..508e1bdc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
   - `bosh`
   - `vagrant`
 - The git prompt in informative mode now shows the number of stashes if enabled.
+- The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
diff --git a/share/functions/__fish_move_last.fish b/share/functions/__fish_move_last.fish
index b9c57d805..751b3d2a0 100644
--- a/share/functions/__fish_move_last.fish
+++ b/share/functions/__fish_move_last.fish
@@ -6,7 +6,8 @@ function __fish_move_last -d "Move the last element of a directory history from
 
     if test $size_src = 0
         # Cannot make this step
-        printf (_ "Hit end of history…\n")
+        # Print a bel, which is the character to print for notifications like these.
+        printf \a
         return 1
     end
 

From 42acbaa5af59a93c8ecf74ccc696ab7df15a23eb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 28 Mar 2019 12:27:45 +0100
Subject: [PATCH 0177/1732] Remouve ouveroused U

Webster was right, gosh dang it!

[ci skip]
---
 src/complete.h | 2 +-
 src/output.cpp | 2 +-
 src/screen.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/complete.h b/src/complete.h
index 3b1655f5d..2563f34ca 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -73,7 +73,7 @@ class completion_t {
     wcstring description;
     /// The type of fuzzy match.
     string_fuzzy_match_t match;
-    /// Flags determining the completion behaviour.
+    /// Flags determining the completion behavior.
     ///
     /// Determines whether a space should be inserted after this completion if it is the only
     /// possible completion using the COMPLETE_NO_SPACE flag. The COMPLETE_NO_CASE can be used to
diff --git a/src/output.cpp b/src/output.cpp
index 1fadaa34a..80f0f51d8 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -180,7 +180,7 @@ void outputter_t::set_color(rgb_color_t c, rgb_color_t c2) {
         was_italics = false;
         was_dim = false;
         was_reverse = false;
-        // If we exit attibute mode, we must first set a color, or previously coloured text might
+        // If we exit attibute mode, we must first set a color, or previously colored text might
         // lose it's color. Terminals are weird...
         write_foreground_color(*this, 0);
         writembs(*this, exit_attribute_mode);
diff --git a/src/screen.cpp b/src/screen.cpp
index bd34c94a1..47d324d17 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -463,7 +463,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
     if (y_steps > 0 && (std::strcmp(cursor_down, "\n") == 0)) {
         // This is very strange - it seems some (all?) consoles use a simple newline as the cursor
         // down escape. This will of course move the cursor to the beginning of the line as well as
-        // moving it down one step. The cursor_up does not have this behaviour...
+        // moving it down one step. The cursor_up does not have this behavior...
         s->actual.cursor.x = 0;
     }
 

From c94fe0f8c921dc71dffda59120e96d69b5745900 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 28 Mar 2019 21:16:05 +0100
Subject: [PATCH 0178/1732] docs/fish_git_prompt: Document default settings

This should help with interpreting the results.

All this is quite convoluted, especially with defaults dependent on
other settings.

[ci skip]
---
 sphinx_doc_src/cmds/fish_git_prompt.rst | 43 ++++++++++++-------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 08b1cb9b5..59e2bc207 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -38,48 +38,47 @@ There are numerous configuration options, either as fish variables or git config
 
 - $__fish_git_prompt_showcolorhints can be set to enable coloring for certain things.
 
-A number of variables to set characters and color used to indicate things. Many of these have a different default if used with informative status enabled.
+A number of variables set characters and color used to indicate things. Many of these have a different default if used with informative status enabled. The normal default is given first, then the informative default if it is different. If no default for the colors is given, they default to $__fish_git_prompt_color.
 
-- $__fish_git_prompt_char_stateseparator
-- $__fish_git_prompt_color
+- $__fish_git_prompt_char_stateseparator (' ', |)
+- $__fish_git_prompt_color (nothing)
 - $__fish_git_prompt_color_prefix
 - $__fish_git_prompt_color_suffix
 - $__fish_git_prompt_color_bare
 - $__fish_git_prompt_color_merging
 
 Some variables are only used in some modes, like when informative status is enabled (by setting $__fish_git_prompt_show_informative_status):
-- $__fish_git_prompt_char_cleanstate
+- $__fish_git_prompt_char_cleanstate (✔)
 - $__fish_git_prompt_color_cleanstate
 
 Variables used with showdirtystate:
-- $__fish_git_prompt_char_dirtystate
-- $__fish_git_prompt_char_invalidstate
-- $__fish_git_prompt_char_stagedstate
-- $__fish_git_prompt_color_dirtystate
+- $__fish_git_prompt_char_dirtystate (*, ✚)
+- $__fish_git_prompt_char_invalidstate (#, ✖)
+- $__fish_git_prompt_char_stagedstate (+, ●)
+- $__fish_git_prompt_color_dirtystate (red with showcolorhints, same as color_flags otherwise)
 - $__fish_git_prompt_color_invalidstate
-- $__fish_git_prompt_color_stagedstate
+- $__fish_git_prompt_color_stagedstate (green with showcolorhints, color_flags otherwise)
 
 Variables used with showstashstate:
-- $__fish_git_prompt_char_stashstate
-- $__fish_git_prompt_color_stashstate
+- $__fish_git_prompt_char_stashstate ($, ⚑)
+- $__fish_git_prompt_color_stashstate (same as color_flags)
 
 Variables used with showuntrackedfiles:
-- $__fish_git_prompt_char_untrackedfiles
-- $__fish_git_prompt_color_untrackedfiles
+- $__fish_git_prompt_char_untrackedfiles (%, …)
+- $__fish_git_prompt_color_untrackedfiles (same as color_flags)
 
 Variables used with showupstream (also implied by informative status):
-- $__fish_git_prompt_char_upstream_ahead
-- $__fish_git_prompt_char_upstream_behind
-- $__fish_git_prompt_char_upstream_diverged
-- $__fish_git_prompt_char_upstream_equal
-- $__fish_git_prompt_char_upstream_prefix
+- $__fish_git_prompt_char_upstream_ahead (>, ↑)
+- $__fish_git_prompt_char_upstream_behind (<, ↓)
+- $__fish_git_prompt_char_upstream_diverged (<>)
+- $__fish_git_prompt_char_upstream_equal (=)
+- $__fish_git_prompt_char_upstream_prefix ('')
 - $__fish_git_prompt_color_upstream
 
 Colors used with showcolorhints:
-- $__fish_git_prompt_color_branch
-- $__fish_git_prompt_color_branch_detached
-- $__fish_git_prompt_color_dirtystate
-- $__fish_git_prompt_color_flags
+- $__fish_git_prompt_color_branch (green)
+- $__fish_git_prompt_color_branch_detached (red)
+- $__fish_git_prompt_color_flags (--bold blue)
 
 Note that all colors can also have a corresponding "_done" color. E.g. $__fish_git_prompt_color_upstream_done, used right _after_ the upstream.
 

From 6cf61d52355018b069d56688d8aae0e616559a4d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 28 Mar 2019 22:11:28 +0100
Subject: [PATCH 0179/1732] docs/fish_git_prompt: Fix formatting

Sphinx likes empty lines before lists.

Also give variable names the ``treatment``.

[ci skip]
---
 sphinx_doc_src/cmds/fish_git_prompt.rst | 82 +++++++++++++------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 59e2bc207..a3aeab276 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -10,13 +10,13 @@ For obvious reasons, it requires having git installed.
 
 There are numerous configuration options, either as fish variables or git config variables. If a git config variable is supported, it will be used if set, and the fish variable will only be used if it isn't.
 
-- $__fish_git_prompt_show_informative_status or the git config option "bash.showInformativeStatus" can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, etc... In large repositories, this can take a lot of time, so it is recommended to disable it there, via ``git config bash.showInformativeStatus false``.
+- ``$__fish_git_prompt_show_informative_status`` or the git config option "bash.showInformativeStatus" can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, etc... In large repositories, this can take a lot of time, so it is recommended to disable it there, via ``git config bash.showInformativeStatus false``.
 
-- $__fish_git_prompt_showdirtystate or the git config option "bash.showDirtyState" can be set to show if the repository is "dirty", i.e. has uncommitted changes.
+- ``$__fish_git_prompt_showdirtystate`` or the git config option "bash.showDirtyState" can be set to show if the repository is "dirty", i.e. has uncommitted changes.
 
-- $__fish_git_prompt_showuntrackedfiles or the git config option "bash.showUntrackedFiles" can be set to show if the repository has untracked files (that aren't ignored).
+- ``$__fish_git_prompt_showuntrackedfiles`` or the git config option "bash.showUntrackedFiles" can be set to show if the repository has untracked files (that aren't ignored).
 
-- $__fish_git_prompt_showupstream can be set to a number of values to determine how changes between HEAD and upstream are shown:
+- ``$__fish_git_prompt_showupstream`` can be set to a number of values to determine how changes between HEAD and upstream are shown:
 
      verbose        show number of commits ahead/behind (+/-) upstream
      name           if verbose, then also show the upstream abbrev name
@@ -25,62 +25,68 @@ There are numerous configuration options, either as fish variables or git config
      svn            always compare HEAD to your SVN upstream
      none           disables (useful with show_informative_status)
 
-- $__fish_git_prompt_showstashstate can be set to display the state of the stash.
+- ``$__fish_git_prompt_showstashstate`` can be set to display the state of the stash.
 
-- $__fish_git_prompt_shorten_branch_len can be set to the number of characters that the branch name will be shortened to.
+- ``$__fish_git_prompt_shorten_branch_len`` can be set to the number of characters that the branch name will be shortened to.
 
-- $__fish_git_prompt_describe_style can be set to a number of styles that describe the current HEAD:
+- ``$__fish_git_prompt_describe_style`` can be set to a number of styles that describe the current HEAD:
 
      contains
      branch
      describe
      default
 
-- $__fish_git_prompt_showcolorhints can be set to enable coloring for certain things.
+- ``$__fish_git_prompt_showcolorhints`` can be set to enable coloring for certain things.
 
-A number of variables set characters and color used to indicate things. Many of these have a different default if used with informative status enabled. The normal default is given first, then the informative default if it is different. If no default for the colors is given, they default to $__fish_git_prompt_color.
+A number of variables set characters and color used to indicate things. Many of these have a different default if used with informative status enabled. The normal default is given first, then the informative default if it is different. If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
 
-- $__fish_git_prompt_char_stateseparator (' ', |)
-- $__fish_git_prompt_color (nothing)
-- $__fish_git_prompt_color_prefix
-- $__fish_git_prompt_color_suffix
-- $__fish_git_prompt_color_bare
-- $__fish_git_prompt_color_merging
+- ``$__fish_git_prompt_char_stateseparator`` (' ', |)
+- ``$__fish_git_prompt_color`` ('')
+- ``$__fish_git_prompt_color_prefix``
+- ``$__fish_git_prompt_color_suffix``
+- ``$__fish_git_prompt_color_bare``
+- ``$__fish_git_prompt_color_merging``
 
-Some variables are only used in some modes, like when informative status is enabled (by setting $__fish_git_prompt_show_informative_status):
-- $__fish_git_prompt_char_cleanstate (✔)
-- $__fish_git_prompt_color_cleanstate
+Some variables are only used in some modes, like when informative status is enabled (by setting ``$__fish_git_prompt_show_informative_status``):
+
+- ``$__fish_git_prompt_char_cleanstate`` (✔)
+- ``$__fish_git_prompt_color_cleanstate``
 
 Variables used with showdirtystate:
-- $__fish_git_prompt_char_dirtystate (*, ✚)
-- $__fish_git_prompt_char_invalidstate (#, ✖)
-- $__fish_git_prompt_char_stagedstate (+, ●)
-- $__fish_git_prompt_color_dirtystate (red with showcolorhints, same as color_flags otherwise)
-- $__fish_git_prompt_color_invalidstate
-- $__fish_git_prompt_color_stagedstate (green with showcolorhints, color_flags otherwise)
+
+- ``$__fish_git_prompt_char_dirtystate`` (*, ✚)
+- ``$__fish_git_prompt_char_invalidstate`` (#, ✖)
+- ``$__fish_git_prompt_char_stagedstate`` (+, ●)
+- ``$__fish_git_prompt_color_dirtystate`` (red with showcolorhints, same as color_flags otherwise)
+- ``$__fish_git_prompt_color_invalidstate``
+- ``$__fish_git_prompt_color_stagedstate`` (green with showcolorhints, color_flags otherwise)
 
 Variables used with showstashstate:
-- $__fish_git_prompt_char_stashstate ($, ⚑)
-- $__fish_git_prompt_color_stashstate (same as color_flags)
+
+- ``$__fish_git_prompt_char_stashstate`` (``$``, ⚑)
+- ``$__fish_git_prompt_color_stashstate`` (same as color_flags)
 
 Variables used with showuntrackedfiles:
-- $__fish_git_prompt_char_untrackedfiles (%, …)
-- $__fish_git_prompt_color_untrackedfiles (same as color_flags)
+
+- ``$__fish_git_prompt_char_untrackedfiles`` (%, …)
+- ``$__fish_git_prompt_color_untrackedfiles`` (same as color_flags)
 
 Variables used with showupstream (also implied by informative status):
-- $__fish_git_prompt_char_upstream_ahead (>, ↑)
-- $__fish_git_prompt_char_upstream_behind (<, ↓)
-- $__fish_git_prompt_char_upstream_diverged (<>)
-- $__fish_git_prompt_char_upstream_equal (=)
-- $__fish_git_prompt_char_upstream_prefix ('')
-- $__fish_git_prompt_color_upstream
+
+- ``$__fish_git_prompt_char_upstream_ahead`` (>, ↑)
+- ``$__fish_git_prompt_char_upstream_behind`` (<, ↓)
+- ``$__fish_git_prompt_char_upstream_diverged`` (<>)
+- ``$__fish_git_prompt_char_upstream_equal`` (=)
+- ``$__fish_git_prompt_char_upstream_prefix`` ('')
+- ``$__fish_git_prompt_color_upstream``
 
 Colors used with showcolorhints:
-- $__fish_git_prompt_color_branch (green)
-- $__fish_git_prompt_color_branch_detached (red)
-- $__fish_git_prompt_color_flags (--bold blue)
 
-Note that all colors can also have a corresponding "_done" color. E.g. $__fish_git_prompt_color_upstream_done, used right _after_ the upstream.
+- ``$__fish_git_prompt_color_branch`` (green)
+- ``$__fish_git_prompt_color_branch_detached`` (red)
+- ``$__fish_git_prompt_color_flags`` (--bold blue)
+
+Note that all colors can also have a corresponding "_done" color. E.g. ``$__fish_git_prompt_color_upstream_done``, used right _after_ the upstream.
 
 See also fish_vcs_prompt, which will call all supported vcs-prompt functions, including git, hg and svn.
 

From 0c5015d4677faf8f2f983e5f8445c59bca60f3e1 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 18:23:32 -0500
Subject: [PATCH 0180/1732] Correct the reversed diff output for all tests

This has been driving nuts for years. The output of the diff emitted
when a test fails was always reversed, because the diff tool is called
with `${difftool} ${new} ${old}` so all the `-` and `+` contexts are
reversed, and the highlights are all screwed up.

The output of a `make test` run should show what has changed from the
baseline/expected, not how the expected differs from the actual. When
considered from both the perspective of intentional changes to the test
outputs and failed test outputs, it is desirable to see how the test
output has changed from the previously expected, and not the other way
around.

(If you were used to the previous behavior, I apologize. But it was
wrong.)
---
 tests/interactive.fish | 4 ++--
 tests/invocation.sh    | 8 ++++----
 tests/test.fish        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/interactive.fish b/tests/interactive.fish
index 933749446..f6a05a12b 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -69,11 +69,11 @@ function test_file
         say red "fail"
         if test $out_status -ne 0
             say yellow "Output differs for file $file. Diff follows:"
-            colordiff -u $file.tmp.out $file.out
+            colordiff -u $file.out $file.tmp.out
         end
         if test $err_status -ne 0
             say yellow "Error output differs for file $file. Diff follows:"
-            colordiff -u $file.tmp.err $file.err
+            colordiff -u $file.err $file.tmp.err
         end
         if test $exit_status -ne 0
             say yellow "Exit status differs for file $file."
diff --git a/tests/invocation.sh b/tests/invocation.sh
index 8ced43e4e..728636ca4 100755
--- a/tests/invocation.sh
+++ b/tests/invocation.sh
@@ -245,10 +245,10 @@ test_file() (
     mv -f "${test_stderr}.new" "${test_stderr}"
 
     # Check the results
-    if ! diff "${test_stdout}" "${want_stdout}" >/dev/null 2>/dev/null ; then
+    if ! diff "${want_stdout}" "${test_stdout}" >/dev/null 2>/dev/null ; then
         out_status=1
     fi
-    if ! diff "${test_stderr}" "${want_stderr}" >/dev/null 2>/dev/null ; then
+    if ! diff "${want_stderr}" "${test_stderr}" >/dev/null 2>/dev/null ; then
         err_status=1
     fi
 
@@ -264,11 +264,11 @@ test_file() (
 
         if [ "$out_status" != '0' ] ; then
             say "$term_yellow" "Output differs for file $file. Diff follows:"
-            "$difftool" -u "${test_stdout}" "${want_stdout}"
+            "$difftool" -u "${want_stdout}" "${test_stdout}"
         fi
         if [ "$err_status" != '0' ] ; then
             say "$term_yellow" "Error output differs for file $file. Diff follows:"
-            "$difftool" -u "${test_stderr}" "${want_stderr}"
+            "$difftool" -u  "${want_stderr}" "${test_stderr}"
         fi
         rc=1
     fi
diff --git a/tests/test.fish b/tests/test.fish
index 0711e0933..62025fe0d 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -55,11 +55,11 @@ function test_file
         say red "fail"
         if test $out_status -ne 0
             say yellow "Output differs for file $file. Diff follows:"
-            colordiff -u $base.tmp.out $base.out
+            colordiff -u $base.out $base.tmp.out
         end
         if test $err_status -ne 0
             say yellow "Error output differs for file $file. Diff follows:"
-            colordiff -u $base.tmp.err $base.err
+            colordiff -u $base.err $base.tmp.err
         end
         if test $exit_status -ne 0
             say yellow "Exit status differs for file $file."

From f8e0e0ef827f40928973850c375409bbcaed8060 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 30 Dec 2018 21:25:16 -0600
Subject: [PATCH 0181/1732] Remove abstractions around job list

Directly access the job list without the intermediate job_iterator_t,
and remove functions that are ripe for abuse by modifying a local
enumeration of the same list instead of operating on the iterators
directly (e.g. proc.cpp iterates jobs, and mid-iteration calls
parser::job_remove(j) with the job (and not the iterator to the job),
causing an invisible invalidation of the pre-existing local iterators.
---
 src/builtin_bg.cpp      | 10 +++----
 src/builtin_disown.cpp  | 24 ++++++++++-------
 src/builtin_fg.cpp      | 44 +++++++++++++++---------------
 src/builtin_jobs.cpp    | 12 +++------
 src/builtin_wait.cpp    | 20 +++++---------
 src/parse_execution.cpp | 16 ++++++++---
 src/parser.cpp          | 20 ++------------
 src/parser.h            |  3 ---
 src/proc.cpp            | 59 +++++++++++++----------------------------
 src/proc.h              | 23 ++--------------
 src/reader.cpp          |  6 ++---
 11 files changed, 87 insertions(+), 150 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index c97b1dddb..9af0cbbfc 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -51,19 +51,19 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (optind == argc) {
         // No jobs were specified so use the most recent (i.e., last) job.
-        job_t *j;
-        job_iterator_t jobs;
-        while ((j = jobs.next())) {
+        job_t *job = nullptr;
+        for (auto j : jobs()) {
             if (j->is_stopped() && j->get_flag(job_flag_t::JOB_CONTROL) && (!j->is_completed())) {
+                job = j.get();
                 break;
             }
         }
 
-        if (!j) {
+        if (!job) {
             streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), cmd);
             retval = STATUS_CMD_ERROR;
         } else {
-            retval = send_to_bg(parser, streams, j);
+            retval = send_to_bg(parser, streams, job);
         }
 
         return retval;
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 52e2c995b..dc766cc34 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -31,13 +31,17 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
         streams.err.append_format(fmt, cmd, j->job_id, j->command_wcstr());
     }
 
-    pid_t pgid = j->pgid;
-    if (!parser.job_remove(j)) {
-        return STATUS_CMD_ERROR;
+    for (auto itr = jobs().begin(); itr != jobs().end(); ++itr) {
+        auto job = itr->get();
+        if (job == j) {
+            pid_t pgid = j->pgid;
+            add_disowned_pgid(pgid);
+            jobs().erase(itr);
+            return STATUS_CMD_OK;
+        }
     }
 
-    add_disowned_pgid(pgid);
-    return STATUS_CMD_OK;
+    return STATUS_CMD_ERROR;
 }
 
 /// Builtin for removing jobs from the job list.
@@ -56,20 +60,20 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (argv[1] == 0) {
-        job_t *j;
         // Select last constructed job (ie first job in the job queue) that is possible to disown.
         // Stopped jobs can be disowned (they will be continued).
         // Foreground jobs can be disowned.
         // Even jobs that aren't under job control can be disowned!
-        job_iterator_t jobs;
-        while ((j = jobs.next())) {
+        job_t *job = nullptr;
+        for (auto j : jobs()) {
             if (j->is_constructed() && (!j->is_completed())) {
+                job = j.get();
                 break;
             }
         }
 
-        if (j) {
-            retval = disown_job(cmd, parser, streams, j);
+        if (job) {
+            retval = disown_job(cmd, parser, streams, job);
         } else {
             streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), cmd);
             retval = STATUS_CMD_ERROR;
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 8a915ecc1..0ef092740 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -33,20 +33,20 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     }
 
-    job_t *j = NULL;
-
+    job_t *job = nullptr;
     if (optind == argc) {
         // Select last constructed job (I.e. first job in the job que) that is possible to put in
         // the foreground.
-        job_iterator_t jobs;
-        while ((j = jobs.next())) {
+
+        for (auto j : jobs()) {
             if (j->is_constructed() && (!j->is_completed()) &&
                 ((j->is_stopped() || (!j->is_foreground())) &&
                  j->get_flag(job_flag_t::JOB_CONTROL))) {
+                job = j.get();
                 break;
             }
         }
-        if (!j) {
+        if (!job) {
             streams.err.append_format(_(L"%ls: There are no suitable jobs\n"), cmd);
         }
     } else if (optind + 1 < argc) {
@@ -58,8 +58,8 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         pid = fish_wcstoi(argv[optind]);
         if (!(errno || pid < 0)) {
-            j = job_t::from_pid(pid);
-            if (j) found_job = true;
+            job = job_t::from_pid(pid);
+            if (job) found_job = true;
         }
 
         if (found_job) {
@@ -70,46 +70,46 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         builtin_print_error_trailer(parser, streams.err, cmd);
 
-        j = 0;
+        job = 0;
     } else {
         int pid = abs(fish_wcstoi(argv[optind]));
         if (errno) {
             streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[optind]);
             builtin_print_error_trailer(parser, streams.err, cmd);
         } else {
-            j = job_t::from_pid(pid);
-            if (!j || !j->is_constructed() || j->is_completed()) {
+            job = job_t::from_pid(pid);
+            if (!job || !job->is_constructed() || job->is_completed()) {
                 streams.err.append_format(_(L"%ls: No suitable job: %d\n"), cmd, pid);
-                j = 0;
-            } else if (!j->get_flag(job_flag_t::JOB_CONTROL)) {
+                job = nullptr;
+            } else if (!job->get_flag(job_flag_t::JOB_CONTROL)) {
                 streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because "
                                             L"it is not under job control\n"),
-                                          cmd, pid, j->command_wcstr());
-                j = 0;
+                                          cmd, pid, job->command_wcstr());
+                job = 0;
             }
         }
     }
 
-    if (!j) {
+    if (!job) {
         return STATUS_INVALID_ARGS;
     }
 
     if (streams.err_is_redirected) {
-        streams.err.append_format(FG_MSG, j->job_id, j->command_wcstr());
+        streams.err.append_format(FG_MSG, job->job_id, job->command_wcstr());
     } else {
         // If we aren't redirecting, send output to real stderr, since stuff in sb_err won't get
         // printed until the command finishes.
-        std::fwprintf(stderr, FG_MSG, j->job_id, j->command_wcstr());
+        std::fwprintf(stderr, FG_MSG, job->job_id, job->command_wcstr());
     }
 
-    const wcstring ft = tok_first(j->command());
+    const wcstring ft = tok_first(job->command());
     //For compatibility with fish 2.0's $_, now replaced with `status current-command`
     if (!ft.empty()) parser.vars().set_one(L"_", ENV_EXPORT, ft);
-    reader_write_title(j->command());
+    reader_write_title(job->command());
 
-    j->promote();
-    j->set_flag(job_flag_t::FOREGROUND, true);
+    job->promote();
+    job->set_flag(job_flag_t::FOREGROUND, true);
 
-    j->continue_job(j->is_stopped());
+    job->continue_job(job->is_stopped());
     return STATUS_CMD_OK;
 }
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 6d9857992..c3673b89d 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -174,11 +174,9 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (print_last) {
         // Ignore unconstructed jobs, i.e. ourself.
-        job_iterator_t jobs;
-        const job_t *j;
-        while ((j = jobs.next())) {
+        for (auto j : jobs()) {
             if (j->is_constructed() && !j->is_completed()) {
-                builtin_jobs_print(j, mode, !streams.out_is_redirected, streams);
+                builtin_jobs_print(j.get(), mode, !streams.out_is_redirected, streams);
                 return STATUS_CMD_ERROR;
             }
         }
@@ -217,12 +215,10 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 }
             }
         } else {
-            job_iterator_t jobs;
-            const job_t *j;
-            while ((j = jobs.next())) {
+            for (auto j : jobs()) {
                 // Ignore unconstructed jobs, i.e. ourself.
                 if (j->is_constructed() && !j->is_completed()) {
-                    builtin_jobs_print(j, mode, !found && !streams.out_is_redirected, streams);
+                    builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected, streams);
                     found = true;
                 }
             }
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index b517f7a78..34a687bb1 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -16,10 +16,7 @@
 /// If a specified process has already finished but the job hasn't, parser_t::job_get_from_pid()
 /// doesn't work properly, so use this function in wait command.
 static job_id_t get_job_id_from_pid(pid_t pid) {
-    job_t *j;
-    job_iterator_t jobs;
-
-    while ((j = jobs.next()) != nullptr) {
+    for (auto j : jobs()) {
         if (j->pgid == pid) {
             return j->job_id;
         }
@@ -34,8 +31,7 @@ static job_id_t get_job_id_from_pid(pid_t pid) {
 }
 
 static bool all_jobs_finished() {
-    job_iterator_t jobs;
-    while (job_t *j = jobs.next()) {
+    for (auto j : jobs()) {
         // If any job is not completed, return false.
         // If there are stopped jobs, they are ignored.
         if (j->is_constructed() && !j->is_completed() && !j->is_stopped()) {
@@ -46,14 +42,13 @@ static bool all_jobs_finished() {
 }
 
 static bool any_jobs_finished(size_t jobs_len) {
-    job_iterator_t jobs;
     bool no_jobs_running = true;
 
     // If any job is removed from list, return true.
-    if (jobs_len != jobs.count()) {
+    if (jobs_len != jobs().size()) {
         return true;
     }
-    while (job_t *j = jobs.next()) {
+    for (auto j : jobs()) {
         // If any job is completed, return true.
         if (j->is_constructed() && (j->is_completed() || j->is_stopped())) {
             return true;
@@ -70,8 +65,7 @@ static bool any_jobs_finished(size_t jobs_len) {
 }
 
 static int wait_for_backgrounds(bool any_flag) {
-    job_iterator_t jobs;
-    size_t jobs_len = jobs.count();
+    size_t jobs_len = jobs().size();
 
     while ((!any_flag && !all_jobs_finished()) || (any_flag && !any_jobs_finished(jobs_len))) {
         if (reader_test_interrupted()) {
@@ -143,10 +137,9 @@ static bool match_pid(const wcstring &cmd, const wchar_t *proc) {
 
 /// It should search the job list for something matching the given proc.
 static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids) {
-    job_iterator_t jobs;
     bool found = false;
 
-    while (const job_t *j = jobs.next()) {
+    for (const auto j : jobs()) {
         if (j->command_is_empty()) continue;
 
         if (match_pid(j->command(), proc)) {
@@ -179,7 +172,6 @@ static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids) {
 int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     ASSERT_IS_MAIN_THREAD();
     int retval = STATUS_CMD_OK;
-    job_iterator_t jobs;
     const wchar_t *cmd = argv[0];
     int argc = builtin_count_args(argv);
     bool any_flag = false;  // flag for -n option
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2034f0d56..8bd145c77 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -784,10 +784,8 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     // Protect against exec with background processes running
     static uint32_t last_exec_run_counter =  -1;
     if (process_type == process_type_t::exec && shell_is_interactive()) {
-        job_iterator_t jobs;
         bool have_bg = false;
-        const job_t *bg = nullptr;
-        while ((bg = jobs.next())) {
+        for (const auto bg : jobs()) {
             // The assumption here is that if it is a foreground job,
             // it's related to us.
             // This stops us from asking if we're doing `exec` inside a function.
@@ -1130,6 +1128,16 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     return result;
 }
 
+static bool remove_job(job_t *job) {
+    for (auto j = jobs().begin(); j != jobs().end(); ++j) {
+        if (j->get() == job) {
+            jobs().erase(j);
+            return true;
+        }
+    }
+    return false;
+}
+
 parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
                                                               const block_t *associated_block) {
     if (should_cancel_execution(associated_block)) {
@@ -1253,7 +1261,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
         // Actually execute the job.
         if (!exec_job(*this->parser, job)) {
-            parser->job_remove(job.get());
+            remove_job(job.get());
         }
 
         // Only external commands require a new fishd barrier.
diff --git a/src/parser.cpp b/src/parser.cpp
index 15871ed03..2a94a6b8e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -570,19 +570,6 @@ void parser_t::job_add(shared_ptr<job_t> job) {
     this->my_job_list.push_front(std::move(job));
 }
 
-bool parser_t::job_remove(job_t *job) {
-    for (auto iter = my_job_list.begin(); iter != my_job_list.end(); ++iter) {
-        if (iter->get() == job) {
-            my_job_list.erase(iter);
-            return true;
-        }
-    }
-
-    debug(1, _(L"Job inconsistency"));
-    sanity_lose();
-    return false;
-}
-
 void parser_t::job_promote(job_t *job) {
     job_list_t::iterator loc;
     for (loc = my_job_list.begin(); loc != my_job_list.end(); ++loc) {
@@ -604,20 +591,17 @@ job_t *parser_t::job_get(job_id_t id) {
 }
 
 job_t *parser_t::job_get_from_pid(pid_t pid) const {
-    job_iterator_t jobs;
-    job_t *job;
-
     pid_t pgid = getpgid(pid);
 
     if (pgid == -1) {
         return 0;
     }
 
-    while ((job = jobs.next())) {
+    for (auto job : jobs()) {
         if (job->pgid == pgid) {
             for (const process_ptr_t &p : job->processes) {
                 if (p->pid == pid) {
-                    return job;
+                    return job.get();
                 }
             }
         }
diff --git a/src/parser.h b/src/parser.h
index 264b09cc8..e6409c283 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -288,9 +288,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Return the function name for the specified stack frame. Default is one (current frame).
     const wchar_t *get_function_name(int level = 1);
 
-    /// Removes a job.
-    bool job_remove(job_t *job);
-
     /// Promotes a job to the front of the list.
     void job_promote(job_t *job);
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 119bbfeee..2f0dc6b12 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -59,20 +59,11 @@ bool job_list_is_empty() {
     return parser_t::principal_parser().job_list().empty();
 }
 
-void job_iterator_t::reset() {
-    this->current = job_list->begin();
-    this->end = job_list->end();
-}
-
-job_iterator_t::job_iterator_t(job_list_t &jobs) : job_list(&jobs) { this->reset(); }
-
-job_iterator_t::job_iterator_t() : job_list(&parser_t::principal_parser().job_list()) {
+job_list_t& jobs() {
     ASSERT_IS_MAIN_THREAD();
-    this->reset();
+    return parser_t::principal_parser().job_list();
 }
 
-size_t job_iterator_t::count() const { return this->job_list->size(); }
-
 bool is_interactive_session = false;
 bool is_subshell = false;
 bool is_block = false;
@@ -110,23 +101,15 @@ static std::vector<int> interactive_stack;
 
 void proc_init() { proc_push_interactive(0); }
 
-/// Remove job from list of jobs.
-static int job_remove(job_t *j) {
-    ASSERT_IS_MAIN_THREAD();
-    return parser_t::principal_parser().job_remove(j);
-}
-
 void job_t::promote() {
     ASSERT_IS_MAIN_THREAD();
     parser_t::principal_parser().job_promote(this);
 }
 
 void proc_destroy() {
-    job_list_t &jobs = parser_t::principal_parser().job_list();
-    while (!jobs.empty()) {
-        job_t *job = jobs.front().get();
-        debug(2, L"freeing leaked job %ls", job->command_wcstr());
-        job_remove(job);
+    for (auto job = jobs().begin(); job != jobs().end(); ++job) {
+        debug(2, L"freeing leaked job %ls", (*job)->command_wcstr());
+        job = jobs().erase(job);
     }
 }
 
@@ -364,8 +347,7 @@ static void process_mark_finished_children(bool block_ok) {
     topic_set_t reaptopics{};
     generation_list_t gens{};
     gens.fill(invalid_generation);
-    job_iterator_t jobs;
-    while (auto *j = jobs.next()) {
+    for (const auto j: jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 topic_t topic = *mtopic;
@@ -390,8 +372,7 @@ static void process_mark_finished_children(bool block_ok) {
 
     // We got some changes. Since we last checked we received SIGCHLD, and or HUP/INT.
     // Update the hup/int generations and reap any reapable processes.
-    jobs.reset();
-    while (auto *j = jobs.next()) {
+    for (const auto j : jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 // Update the signal hup/int gen.
@@ -484,7 +465,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // avoid infinite recursion).
     static bool locked = false;
     if (locked) {
-        return 0;
+        return false;
     }
     locked = true;
 
@@ -492,9 +473,10 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // don't try to print in that case (#3222)
     const bool interactive = allow_interactive && cur_term != NULL;
 
-    job_iterator_t jobs;
-    const bool only_one_job = jobs.count() == 1;
-    while (job_t *const j = jobs.next()) {
+    bool erased = false;
+    const bool only_one_job = jobs().size() == 1;
+    for (auto itr = jobs().begin(); itr != jobs().end(); itr = (erased ? itr : (std::advance(itr, 1), itr)), erased = false) {
+        job_t *j = itr->get();
         // If we are reaping only jobs who do not need status messages sent to the console, do not
         // consider reaping jobs that need status messages.
         if ((!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) && (!interactive) &&
@@ -587,7 +569,8 @@ static bool process_clean_after_marking(bool allow_interactive) {
             }
             proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
 
-            job_remove(j);
+            itr = jobs().erase(itr);
+            erased = true;
         } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
             // Notify the user about newly stopped jobs.
             if (!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
@@ -663,10 +646,7 @@ unsigned long proc_get_jiffies(process_t *p) {
 
 /// Update the CPU time for all jobs.
 void proc_update_jiffies() {
-    job_t *job;
-    job_iterator_t j;
-
-    for (job = j.next(); job; job = j.next()) {
+    for (auto job : jobs()) {
         for (process_ptr_t &p : job->processes) {
             gettimeofday(&p->last_time, 0);
             p->last_jiffies = proc_get_jiffies(p.get());
@@ -901,8 +881,7 @@ void job_t::continue_job(bool send_sigcont) {
 void proc_sanity_check() {
     const job_t *fg_job = NULL;
 
-    job_iterator_t jobs;
-    while (const job_t *j = jobs.next()) {
+    for (const auto j : jobs()) {
         if (!j->is_constructed()) continue;
 
         // More than one foreground job?
@@ -912,7 +891,7 @@ void proc_sanity_check() {
                       fg_job->command_wcstr(), j->command_wcstr());
                 sanity_lose();
             }
-            fg_job = j;
+            fg_job = j.get();
         }
 
         for (const process_ptr_t &p : j->processes) {
@@ -959,9 +938,7 @@ void proc_wait_any() {
 }
 
 void hup_background_jobs() {
-    job_iterator_t jobs;
-
-    while (job_t *j = jobs.next()) {
+    for (auto j : jobs()) {
         // Make sure we don't try to SIGHUP the calling builtin
         if (j->pgid == INVALID_PID || !j->get_flag(job_flag_t::JOB_CONTROL)) {
             continue;
diff --git a/src/proc.h b/src/proc.h
index 716fd42f7..dbc899a44 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -456,27 +456,8 @@ typedef std::list<shared_ptr<job_t>> job_list_t;
 
 bool job_list_is_empty(void);
 
-/// A class to aid iteration over jobs list
-class job_iterator_t {
-    job_list_t *const job_list;
-    job_list_t::iterator current, end;
-
-   public:
-    void reset(void);
-
-    job_t *next() {
-        job_t *job = NULL;
-        if (current != end) {
-            job = current->get();
-            ++current;
-        }
-        return job;
-    }
-
-    explicit job_iterator_t(job_list_t &jobs);
-    job_iterator_t();
-    size_t count() const;
-};
+/// A helper function to more easily access the job list
+job_list_t &jobs();
 
 /// Whether a universal variable barrier roundtrip has already been made for the currently executing
 /// command. Such a roundtrip only needs to be done once on a given command, unless a universal
diff --git a/src/reader.cpp b/src/reader.cpp
index 409e69b46..e2c072700 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2229,8 +2229,7 @@ void reader_bg_job_warning() {
     std::fputws(_(L"There are still jobs active:\n"), stdout);
     std::fputws(_(L"\n   PID  Command\n"), stdout);
 
-    job_iterator_t jobs;
-    while (job_t *j = jobs.next()) {
+    for (auto j : jobs()) {
         if (!j->is_completed()) {
             std::fwprintf(stdout, L"%6d  %ls\n", j->processes[0]->pid, j->command_wcstr());
         }
@@ -2254,8 +2253,7 @@ static void handle_end_loop() {
         }
 
         bool bg_jobs = false;
-        job_iterator_t jobs;
-        while (const job_t *j = jobs.next()) {
+        for (const auto j : jobs()) {
             if (!j->is_completed()) {
                 bg_jobs = true;
                 break;

From 6fab7836473b0012fb5eed81c4d7c9b0610810a4 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 30 Dec 2018 23:53:26 -0600
Subject: [PATCH 0182/1732] Convert job_list to a dequeue again

Now that we have cleaned up access to the job list and removed
transparent invalidation of iterators, it is safe to convert it to a
dequeue.
---
 src/parser.cpp | 2 +-
 src/proc.cpp   | 2 +-
 src/proc.h     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 2a94a6b8e..d6751dac0 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -580,7 +580,7 @@ void parser_t::job_promote(job_t *job) {
     assert(loc != my_job_list.end());
 
     // Move the job to the beginning.
-    my_job_list.splice(my_job_list.begin(), my_job_list, loc);
+    std::rotate(my_job_list.begin(), loc, my_job_list.end());
 }
 
 job_t *parser_t::job_get(job_id_t id) {
diff --git a/src/proc.cpp b/src/proc.cpp
index 2f0dc6b12..b556d1cc5 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -475,7 +475,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
 
     bool erased = false;
     const bool only_one_job = jobs().size() == 1;
-    for (auto itr = jobs().begin(); itr != jobs().end(); itr = (erased ? itr : (std::advance(itr, 1), itr)), erased = false) {
+    for (auto itr = jobs().begin(); itr != jobs().end(); itr = erased ? itr : itr + 1, erased = false) {
         job_t *j = itr->get();
         // If we are reaping only jobs who do not need status messages sent to the console, do not
         // consider reaping jobs that need status messages.
diff --git a/src/proc.h b/src/proc.h
index dbc899a44..e7106dabe 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -12,7 +12,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <list>
+#include <deque>
 #include <memory>
 #include <vector>
 
@@ -451,8 +451,8 @@ extern bool is_login;
 /// nesting level.
 extern int is_event;
 
-// List of jobs. We sometimes mutate this while iterating - hence it must be a list, not a vector
-typedef std::list<shared_ptr<job_t>> job_list_t;
+// List of jobs.
+typedef std::deque<shared_ptr<job_t>> job_list_t;
 
 bool job_list_is_empty(void);
 

From 1f59976c2c53cc58f2b2872ea165e3b2bc026dae Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 31 Dec 2018 00:24:32 -0600
Subject: [PATCH 0183/1732] Further clean up job list manipulation

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

diff --git a/src/proc.cpp b/src/proc.cpp
index b556d1cc5..1530cdb9c 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -107,10 +107,10 @@ void job_t::promote() {
 }
 
 void proc_destroy() {
-    for (auto job = jobs().begin(); job != jobs().end(); ++job) {
-        debug(2, L"freeing leaked job %ls", (*job)->command_wcstr());
-        job = jobs().erase(job);
+    for (const auto job : jobs()) {
+        debug(2, L"freeing leaked job %ls", job->command_wcstr());
     }
+    jobs().clear();
 }
 
 void proc_set_last_statuses(statuses_t s) {
@@ -485,12 +485,11 @@ static bool process_clean_after_marking(bool allow_interactive) {
         }
 
         for (const process_ptr_t &p : j->processes) {
-            if (!p->completed) continue;
-
-            if (!p->pid) continue;
+            if (!p->completed || !p->pid) {
+                continue;
+            }
 
             auto s = p->status;
-
             // TODO: The generic process-exit event is useless and unused.
             // Remove this in future.
             // Update: This event is used for cleaning up the psub temporary files and folders.

From d4d5c03a03636df0293b2056fbf847e08822a541 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 2 Jan 2019 12:10:54 -0600
Subject: [PATCH 0184/1732] Clean up invalid job id detection in `fg` builtin

---
 src/builtin_fg.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 0ef092740..befff322c 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -35,8 +35,8 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     job_t *job = nullptr;
     if (optind == argc) {
-        // Select last constructed job (I.e. first job in the job que) that is possible to put in
-        // the foreground.
+        // Select last constructed job (i.e. first job in the job queue) that can be brought
+        // to the foreground.
 
         for (auto j : jobs()) {
             if (j->is_constructed() && (!j->is_completed()) &&
@@ -51,15 +51,12 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
     } else if (optind + 1 < argc) {
         // Specifying more than one job to put to the foreground is a syntax error, we still
-        // try to locate the job argv[1], since we want to know if this is an ambigous job
-        // specification or if this is an malformed job id.
-        int pid;
+        // try to locate the job $argv[1], since we need to determine which error message to
+        // emit (ambigous job specification vs malformed job id).
         bool found_job = false;
-
-        pid = fish_wcstoi(argv[optind]);
-        if (!(errno || pid < 0)) {
-            job = job_t::from_pid(pid);
-            if (job) found_job = true;
+        int pid = fish_wcstoi(argv[optind]);
+        if (errno == 0 && pid > 0) {
+            found_job = (job_t::from_pid(pid) != nullptr);
         }
 
         if (found_job) {
@@ -68,9 +65,8 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(_(L"%ls: '%ls' is not a job\n"), cmd, argv[optind]);
         }
 
+        job = nullptr;
         builtin_print_error_trailer(parser, streams.err, cmd);
-
-        job = 0;
     } else {
         int pid = abs(fish_wcstoi(argv[optind]));
         if (errno) {
@@ -85,7 +81,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because "
                                             L"it is not under job control\n"),
                                           cmd, pid, job->command_wcstr());
-                job = 0;
+                job = nullptr;
             }
         }
     }

From 36f3a6d7e05ff55ac4b3e306c6c4c4c04d2a828f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 20 Mar 2019 22:37:26 -0500
Subject: [PATCH 0185/1732] Use const auto for all jobs

---
 src/builtin_bg.cpp      |  2 +-
 src/builtin_disown.cpp  |  4 ++--
 src/builtin_fg.cpp      |  2 +-
 src/builtin_jobs.cpp    |  4 ++--
 src/builtin_wait.cpp    |  8 ++++----
 src/parse_execution.cpp |  2 +-
 src/parser.cpp          |  2 +-
 src/proc.cpp            | 10 +++++-----
 src/reader.cpp          |  4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 9af0cbbfc..e737edae4 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -52,7 +52,7 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (optind == argc) {
         // No jobs were specified so use the most recent (i.e., last) job.
         job_t *job = nullptr;
-        for (auto j : jobs()) {
+        for (const auto &j : jobs()) {
             if (j->is_stopped() && j->get_flag(job_flag_t::JOB_CONTROL) && (!j->is_completed())) {
                 job = j.get();
                 break;
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index dc766cc34..ad965b693 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -65,7 +65,7 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Foreground jobs can be disowned.
         // Even jobs that aren't under job control can be disowned!
         job_t *job = nullptr;
-        for (auto j : jobs()) {
+        for (const auto &j : jobs()) {
             if (j->is_constructed() && (!j->is_completed())) {
                 job = j.get();
                 break;
@@ -104,7 +104,7 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         // Disown all target jobs
-        for (auto j : jobs) {
+        for (const auto &j : jobs) {
             retval |= disown_job(cmd, parser, streams, j);
         }
     }
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index befff322c..5bd9221b6 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -38,7 +38,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Select last constructed job (i.e. first job in the job queue) that can be brought
         // to the foreground.
 
-        for (auto j : jobs()) {
+        for (const auto &j : jobs()) {
             if (j->is_constructed() && (!j->is_completed()) &&
                 ((j->is_stopped() || (!j->is_foreground())) &&
                  j->get_flag(job_flag_t::JOB_CONTROL))) {
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index c3673b89d..f4dab2411 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -174,7 +174,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (print_last) {
         // Ignore unconstructed jobs, i.e. ourself.
-        for (auto j : jobs()) {
+        for (const auto &j : jobs()) {
             if (j->is_constructed() && !j->is_completed()) {
                 builtin_jobs_print(j.get(), mode, !streams.out_is_redirected, streams);
                 return STATUS_CMD_ERROR;
@@ -215,7 +215,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 }
             }
         } else {
-            for (auto j : jobs()) {
+            for (const auto &j : jobs()) {
                 // Ignore unconstructed jobs, i.e. ourself.
                 if (j->is_constructed() && !j->is_completed()) {
                     builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected, streams);
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 34a687bb1..6df0d3abf 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -16,7 +16,7 @@
 /// If a specified process has already finished but the job hasn't, parser_t::job_get_from_pid()
 /// doesn't work properly, so use this function in wait command.
 static job_id_t get_job_id_from_pid(pid_t pid) {
-    for (auto j : jobs()) {
+    for (const auto &j : jobs()) {
         if (j->pgid == pid) {
             return j->job_id;
         }
@@ -31,7 +31,7 @@ static job_id_t get_job_id_from_pid(pid_t pid) {
 }
 
 static bool all_jobs_finished() {
-    for (auto j : jobs()) {
+    for (const auto &j : jobs()) {
         // If any job is not completed, return false.
         // If there are stopped jobs, they are ignored.
         if (j->is_constructed() && !j->is_completed() && !j->is_stopped()) {
@@ -48,7 +48,7 @@ static bool any_jobs_finished(size_t jobs_len) {
     if (jobs_len != jobs().size()) {
         return true;
     }
-    for (auto j : jobs()) {
+    for (const auto &j : jobs()) {
         // If any job is completed, return true.
         if (j->is_constructed() && (j->is_completed() || j->is_stopped())) {
             return true;
@@ -139,7 +139,7 @@ static bool match_pid(const wcstring &cmd, const wchar_t *proc) {
 static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids) {
     bool found = false;
 
-    for (const auto j : jobs()) {
+    for (const auto &j : jobs()) {
         if (j->command_is_empty()) continue;
 
         if (match_pid(j->command(), proc)) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8bd145c77..2af130d63 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -785,7 +785,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     static uint32_t last_exec_run_counter =  -1;
     if (process_type == process_type_t::exec && shell_is_interactive()) {
         bool have_bg = false;
-        for (const auto bg : jobs()) {
+        for (const auto &bg : jobs()) {
             // The assumption here is that if it is a foreground job,
             // it's related to us.
             // This stops us from asking if we're doing `exec` inside a function.
diff --git a/src/parser.cpp b/src/parser.cpp
index d6751dac0..4b0a75082 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -597,7 +597,7 @@ job_t *parser_t::job_get_from_pid(pid_t pid) const {
         return 0;
     }
 
-    for (auto job : jobs()) {
+    for (const auto &job : jobs()) {
         if (job->pgid == pgid) {
             for (const process_ptr_t &p : job->processes) {
                 if (p->pid == pid) {
diff --git a/src/proc.cpp b/src/proc.cpp
index 1530cdb9c..cc4705ffb 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -107,7 +107,7 @@ void job_t::promote() {
 }
 
 void proc_destroy() {
-    for (const auto job : jobs()) {
+    for (const auto &job : jobs()) {
         debug(2, L"freeing leaked job %ls", job->command_wcstr());
     }
     jobs().clear();
@@ -372,7 +372,7 @@ static void process_mark_finished_children(bool block_ok) {
 
     // We got some changes. Since we last checked we received SIGCHLD, and or HUP/INT.
     // Update the hup/int generations and reap any reapable processes.
-    for (const auto j : jobs()) {
+    for (const auto &j : jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 // Update the signal hup/int gen.
@@ -645,7 +645,7 @@ unsigned long proc_get_jiffies(process_t *p) {
 
 /// Update the CPU time for all jobs.
 void proc_update_jiffies() {
-    for (auto job : jobs()) {
+    for (const auto &job : jobs()) {
         for (process_ptr_t &p : job->processes) {
             gettimeofday(&p->last_time, 0);
             p->last_jiffies = proc_get_jiffies(p.get());
@@ -880,7 +880,7 @@ void job_t::continue_job(bool send_sigcont) {
 void proc_sanity_check() {
     const job_t *fg_job = NULL;
 
-    for (const auto j : jobs()) {
+    for (const auto &j : jobs()) {
         if (!j->is_constructed()) continue;
 
         // More than one foreground job?
@@ -937,7 +937,7 @@ void proc_wait_any() {
 }
 
 void hup_background_jobs() {
-    for (auto j : jobs()) {
+    for (const auto &j : jobs()) {
         // Make sure we don't try to SIGHUP the calling builtin
         if (j->pgid == INVALID_PID || !j->get_flag(job_flag_t::JOB_CONTROL)) {
             continue;
diff --git a/src/reader.cpp b/src/reader.cpp
index e2c072700..6ffd3da31 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2229,7 +2229,7 @@ void reader_bg_job_warning() {
     std::fputws(_(L"There are still jobs active:\n"), stdout);
     std::fputws(_(L"\n   PID  Command\n"), stdout);
 
-    for (auto j : jobs()) {
+    for (const auto &j : jobs()) {
         if (!j->is_completed()) {
             std::fwprintf(stdout, L"%6d  %ls\n", j->processes[0]->pid, j->command_wcstr());
         }
@@ -2253,7 +2253,7 @@ static void handle_end_loop() {
         }
 
         bool bg_jobs = false;
-        for (const auto j : jobs()) {
+        for (const auto &j : jobs()) {
             if (!j->is_completed()) {
                 bg_jobs = true;
                 break;

From 06adb1dc38f1b87dcd3e9a97a8a1f4adc55989c7 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 20 Mar 2019 22:57:38 -0500
Subject: [PATCH 0186/1732] Store jobs to erase in separate list

---
 src/proc.cpp | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index cc4705ffb..81584133b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -473,10 +473,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // don't try to print in that case (#3222)
     const bool interactive = allow_interactive && cur_term != NULL;
 
-    bool erased = false;
+    static std::vector<job_t *> erase_list;
     const bool only_one_job = jobs().size() == 1;
-    for (auto itr = jobs().begin(); itr != jobs().end(); itr = erased ? itr : itr + 1, erased = false) {
-        job_t *j = itr->get();
+    for (const auto &j : jobs()) {
         // If we are reaping only jobs who do not need status messages sent to the console, do not
         // consider reaping jobs that need status messages.
         if ((!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) && (!interactive) &&
@@ -554,7 +553,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
         if (j->is_completed()) {
             if (!j->is_foreground() && !j->get_flag(job_flag_t::NOTIFIED) &&
                 !j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
-                print_job_status(j, JOB_ENDED);
+                print_job_status(j.get(), JOB_ENDED);
                 found = true;
             }
             // TODO: The generic process-exit event is useless and unused.
@@ -568,22 +567,52 @@ static bool process_clean_after_marking(bool allow_interactive) {
             }
             proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
 
-            itr = jobs().erase(itr);
-            erased = true;
+            erase_list.push_back(j.get());
         } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
             // Notify the user about newly stopped jobs.
             if (!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
-                print_job_status(j, JOB_STOPPED);
+                print_job_status(j.get(), JOB_STOPPED);
                 found = true;
             }
             j->set_flag(job_flag_t::NOTIFIED, true);
         }
     }
 
-    if (found) fflush(stdout);
+    if (!erase_list.empty()) {
+        // The intersection of the two lists is typically O(m*n), but we know the order
+        // of the entries in erase_list is the same as their matches in jobs(), so we can
+        // use that to our advantage.
+        auto to_erase = erase_list.begin();
+        jobs().erase(std::remove_if(jobs().begin(), jobs().end(),
+                    [&to_erase](const shared_ptr<job_t> &j) {
+            if (to_erase == erase_list.end()) {
+                return false;
+            }
+            if (*to_erase == j.get()) {
+                ++to_erase;
+                return true;
+            }
+            return false;
+        }), jobs().end());
+
+        if (should_debug(2)) {
+            // Assertions prevent the application from continuing in case of invalid state. If we
+            // did not remove all objects from the list, it's not bad enough to abort and die, but
+            // leave this check here so that we can be alerted to the situtaion if running at a
+            // higher debug level. Or just remove it. But I wouldn't want to be the person that has
+            // to debug this without even this soft assertion in place when some C++ standard
+            // library decides to make std::remove_if iterate backwards or in random order!
+            assert(to_erase == erase_list.end()
+                && "Not all jobs slated for erasure have been erased!");
+        }
+    }
+    erase_list.clear();
+
+    if (found) {
+        fflush(stdout);
+    }
 
     locked = false;
-
     return found;
 }
 

From 7f5e58ae69759dc1f930cd26500f3df8cb1716a7 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 18:16:22 -0500
Subject: [PATCH 0187/1732] Only send JOB_EXIT after the job has been actually
 erased

---
 src/proc.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 81584133b..b1bb87431 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -461,7 +461,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
     bool found = false;
 
-    // this function may fire an event handler, we do not want to call ourselves recursively (to
+    // This function may fire an event handler, we do not want to call ourselves recursively (to
     // avoid infinite recursion).
     static bool locked = false;
     if (locked) {
@@ -469,11 +469,13 @@ static bool process_clean_after_marking(bool allow_interactive) {
     }
     locked = true;
 
-    // this may be invoked in an exit handler, after the TERM has been torn down
-    // don't try to print in that case (#3222)
+    // This may be invoked in an exit handler, after the TERM has been torn down
+    // Don't try to print in that case (#3222)
     const bool interactive = allow_interactive && cur_term != NULL;
 
-    static std::vector<job_t *> erase_list;
+    // If we ever drop the `static bool locked` above, this should be changed to a local or
+    // thread-local vector instead of a static vector. It is only static to reduce heap allocations.
+    static std::vector<shared_ptr<job_t>> erase_list;
     const bool only_one_job = jobs().size() == 1;
     for (const auto &j : jobs()) {
         // If we are reaping only jobs who do not need status messages sent to the console, do not
@@ -565,9 +567,8 @@ static bool process_clean_after_marking(bool allow_interactive) {
             if (j->pgid != INVALID_PID) {
                 proc_fire_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0);
             }
-            proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
 
-            erase_list.push_back(j.get());
+            erase_list.push_back(j);
         } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
             // Notify the user about newly stopped jobs.
             if (!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
@@ -585,10 +586,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
         auto to_erase = erase_list.begin();
         jobs().erase(std::remove_if(jobs().begin(), jobs().end(),
                     [&to_erase](const shared_ptr<job_t> &j) {
-            if (to_erase == erase_list.end()) {
-                return false;
-            }
-            if (*to_erase == j.get()) {
+            if (to_erase != erase_list.end() && *to_erase == j) {
                 ++to_erase;
                 return true;
             }
@@ -606,6 +604,12 @@ static bool process_clean_after_marking(bool allow_interactive) {
                 && "Not all jobs slated for erasure have been erased!");
         }
     }
+
+    // Only now notify any listeners of the job exit, so that the contract isn't violated
+    for (const auto &j : erase_list) {
+        proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
+    }
+
     erase_list.clear();
 
     if (found) {

From f8b2e818ed6606e4fd10bc416f2f6c9ad8b49f86 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 18:16:51 -0500
Subject: [PATCH 0188/1732] Remove legacy generic process/job exit events

---
 src/proc.cpp     | 16 ----------------
 tests/signal.out |  9 ---------
 2 files changed, 25 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index b1bb87431..24b266920 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -491,13 +491,6 @@ static bool process_clean_after_marking(bool allow_interactive) {
             }
 
             auto s = p->status;
-            // TODO: The generic process-exit event is useless and unused.
-            // Remove this in future.
-            // Update: This event is used for cleaning up the psub temporary files and folders.
-            // Removing it breaks the psub tests as a result.
-            proc_fire_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
-                            (s.signal_exited() ? -1 : s.exit_code()));
-
             // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
             // dies.
             if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
@@ -558,15 +551,6 @@ static bool process_clean_after_marking(bool allow_interactive) {
                 print_job_status(j.get(), JOB_ENDED);
                 found = true;
             }
-            // TODO: The generic process-exit event is useless and unused.
-            // Remove this in future.
-            // Don't fire the exit-event for jobs with pgid INVALID_PID.
-            // That's our "sentinel" pgid, for jobs that don't (yet) have a pgid,
-            // or jobs that consist entirely of builtins (and hence don't have a process).
-            // This causes issues if fish is PID 2, which is quite common on WSL. See #4582.
-            if (j->pgid != INVALID_PID) {
-                proc_fire_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0);
-            }
 
             erase_list.push_back(j);
         } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
diff --git a/tests/signal.out b/tests/signal.out
index 10aa9b5f3..f2cd4188c 100644
--- a/tests/signal.out
+++ b/tests/signal.out
@@ -1,17 +1,8 @@
 ALRM received
 command false:
-PROCESS_EXIT 1
-JOB_EXIT 0
 command true:
-PROCESS_EXIT 0
-JOB_EXIT 0
 command false | true:
-PROCESS_EXIT 1
-PROCESS_EXIT 0
-JOB_EXIT 0
 This is the process whose exit event shuld be blocked
 This should come before the event handler
-PROCESS_EXIT 0
-JOB_EXIT 0
 Now event handler should have run
 PROCESS_EXIT 0

From 0be79038590d3473b75252bf50ade2f62ea9c207 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 19:01:10 -0500
Subject: [PATCH 0189/1732] Drop realpath test built on assumption PWD cannot
 be a symlink

The final test in `realpath.in` was based on the no-longer-valid
assumption that $PWD cannot be a symlink. Since the recent changes in
fish 3.0 to allow `cd`ing into "virtual" directories preserving symlinks
as-is, when `make test` was  run from a path that contained a symlink
component, this test would fail the `pwd-resolved-to-itself` check.

As the test is not designed to initialize then cd into an absolute path
guaranteed to not be symbolic, so this final check is just wrong.
---
 tests/realpath.in | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/realpath.in b/tests/realpath.in
index fc39889fe..abaccf4cd 100644
--- a/tests/realpath.in
+++ b/tests/realpath.in
@@ -73,13 +73,4 @@ else
     echo "fish-symlink/symlink_file not handled correctly: $real_path != expected_real_path" >&2
 end
 
-# The $PWD should undergo no further transformations because it should already
-# be a "realpath".
-set -l real_path (builtin realpath $PWD)
-if test "$real_path" = "$PWD"
-    echo "pwd-resolved-to-itself"
-else
-    echo "unexpected pwd-resolved-to-itself failure: $real_path != $PWD" >&2
-end
-
 exit 0

From 4aea4c09b310e23ae5b06b9dd195ec8106dd6355 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 22:08:19 -0500
Subject: [PATCH 0190/1732] Optimize identification of deferred process

---
 src/exec.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index ddf612d9d..90bcd15d6 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -993,21 +993,21 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 // This should show the output as it comes, not buffer until the end.
 // Any such process (only one per job) will be called the "deferred" process.
 static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
-    process_t *last_internal = nullptr;
-    for (const auto &p : j->processes) {
+    // By enumerating in reverse order, we can avoid walking the entire list
+    for (auto i = j->processes.rbegin(); i != j->processes.rend(); ++i) {
+        const auto &p = *i;
         if (p->type == process_type_t::exec) {
             // No tail reordering for execs.
             return nullptr;
         } else if (p->type != process_type_t::external) {
-            last_internal = p.get();
+            if (p->is_last_in_job) {
+                return nullptr;
+            }
+            debug(1, "Deferring execution of %ls", p->argv0());
+            return p.get();
         }
     }
-    if (last_internal && !last_internal->is_last_in_job) {
-        // This is the last internal process, and it pipes to an external process.
-        return last_internal;
-    } else {
-        return nullptr;
-    }
+    return nullptr;
 }
 
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
@@ -1086,17 +1086,17 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
             }
             pipe_next_read = std::move(pipes->read);
             proc_pipes.write = std::move(pipes->write);
-        }
 
-        if (p.get() == deferred_process) {
-            deferred_pipes = std::move(proc_pipes);
-        } else {
-            if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios,
-                                     deferred_pipes, stdout_read_limit)) {
-                exec_error = true;
-                break;
+            // The deferred process can never be the last in the job
+            if (p.get() == deferred_process) {
+                deferred_pipes = std::move(proc_pipes);
             }
         }
+        if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios, deferred_pipes,
+                                 stdout_read_limit)) {
+            exec_error = true;
+            break;
+        }
     }
     pipe_next_read.close();
 

From 7231d86676ddea2c27ee3e6d2d04f98c23d01534 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 28 Mar 2019 20:16:57 -0700
Subject: [PATCH 0191/1732] Fix the tests

Remove 'pwd-resolved-to-itself' message
---
 tests/realpath.out | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/realpath.out b/tests/realpath.out
index 5a8ac9014..56102523a 100644
--- a/tests/realpath.out
+++ b/tests/realpath.out
@@ -8,4 +8,3 @@ nonexistent-file in PWD correctly converted
 fish-symlink handled correctly
 fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted
 fish-symlink/symlink_file handled correctly
-pwd-resolved-to-itself

From 0b11b8cffbcfc2c2512227904ba666f929775b1a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 28 Mar 2019 20:22:58 -0700
Subject: [PATCH 0192/1732] Revert "Optimize identification of deferred
 process"

This reverts commit 4aea4c09b310e23ae5b06b9dd195ec8106dd6355.

Said commit broke many tests
---
 src/exec.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 90bcd15d6..ddf612d9d 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -993,21 +993,21 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 // This should show the output as it comes, not buffer until the end.
 // Any such process (only one per job) will be called the "deferred" process.
 static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
-    // By enumerating in reverse order, we can avoid walking the entire list
-    for (auto i = j->processes.rbegin(); i != j->processes.rend(); ++i) {
-        const auto &p = *i;
+    process_t *last_internal = nullptr;
+    for (const auto &p : j->processes) {
         if (p->type == process_type_t::exec) {
             // No tail reordering for execs.
             return nullptr;
         } else if (p->type != process_type_t::external) {
-            if (p->is_last_in_job) {
-                return nullptr;
-            }
-            debug(1, "Deferring execution of %ls", p->argv0());
-            return p.get();
+            last_internal = p.get();
         }
     }
-    return nullptr;
+    if (last_internal && !last_internal->is_last_in_job) {
+        // This is the last internal process, and it pipes to an external process.
+        return last_internal;
+    } else {
+        return nullptr;
+    }
 }
 
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
@@ -1086,16 +1086,16 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
             }
             pipe_next_read = std::move(pipes->read);
             proc_pipes.write = std::move(pipes->write);
-
-            // The deferred process can never be the last in the job
-            if (p.get() == deferred_process) {
-                deferred_pipes = std::move(proc_pipes);
-            }
         }
-        if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios, deferred_pipes,
-                                 stdout_read_limit)) {
-            exec_error = true;
-            break;
+
+        if (p.get() == deferred_process) {
+            deferred_pipes = std::move(proc_pipes);
+        } else {
+            if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios,
+                                     deferred_pipes, stdout_read_limit)) {
+                exec_error = true;
+                break;
+            }
         }
     }
     pipe_next_read.close();

From a361d987f86f91bc56e1769969985d6b5a1568ef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 19:08:25 +0100
Subject: [PATCH 0193/1732] docs: Add toctree back

Apparently there must indeed be a toctree somewhere in the document to
get the links to the other docs to show up.

Even a ":hidden:" toctree doesn't help - that just leads to an empty
toc in the sidebar (no idea yet where that's defined!).

I've added it to the end so it's not that weird "Commands" section in
the middle.

[ci skip]
---
 sphinx_doc_src/index.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index bc62c5d7f..c0e6a501c 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1808,3 +1808,16 @@ If you have a question not answered by this documentation, there are several ave
 
 
 If you have an improvement for fish, you can submit it via the mailing list or the GitHub page.
+
+.. _other_pages:
+
+Other help pages
+================
+.. toctree::
+   :maxdepth: 1
+
+   commands
+   design
+   tutorial
+   faq
+   license

From ebc0bee40415a268cfc3b82a3f2109d1fa0d3307 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 19:09:57 +0100
Subject: [PATCH 0194/1732] docs: Correct link

We're gonna have a bunch of these, aren't we?

[ci skip]
---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index c0e6a501c..3065d1cd8 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1375,7 +1375,7 @@ Builtin commands
 
 Many other shells have a large library of builtin commands. Most of these commands are also available as standalone commands, but have been implemented in the shell anyway. To avoid code duplication, and to avoid the confusion of subtly differing versions of the same command, ``fish`` generally only implements builtins for actions which cannot be performed by a regular command.
 
-For a list of all builtins, functions and commands shipped with fish, see the `table of contents <#toc-commands>`_. The documentation is also available by using the ``--help`` switch of the command.
+For a list of all builtins, functions and commands shipped with fish, see the `list of commands <commands.html>`_. The documentation is also available by using the ``--help`` switch of the command.
 
 .. _editor:
 

From b8570a9e8a4665c1368b90467d9fac15b7d11918 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 20:05:42 +0100
Subject: [PATCH 0195/1732] docs/cmds/string: Improve synopsis

This both formats it as a code-block, and adds the synopsis of each
subcommand to the corresponding section again so you don't need to
scroll back-and-forth so much.

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 79 ++++++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 99e7970d8..3ed356a02 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -4,28 +4,33 @@ string - manipulate strings
 Synopsis
 --------
 
-string escape [(-n | --no-quoted)] [--style=xxx] [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 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 REPLACEMENT [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=xxx] [STRING...]
-string upper [(-q | --quiet)] [STRING...]
+``string escape [(-n | --no-quoted)] [--style=xxx] [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 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 REPLACEMENT [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=xxx] [STRING...]``
+
+``string upper [(-q | --quiet)] [STRING...]``
 
 
 Description
@@ -41,8 +46,10 @@ Most subcommands accept a ``-q`` or ``--quiet`` switch, which suppresses the usu
 
 The following subcommands are available.
 
-"escape" subcommand
--------------------
+"escape" and "unescape" subcommands
+-----------------------------------
+
+``string escape [(-n | --no-quoted)] [--style=xxx] [STRING...]``
 
 ``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.
 
@@ -52,31 +59,43 @@ The following subcommands are available.
 
 ``--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 [--style=xxx] [STRING...]``
+
 ``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``.
 
 "join" subcommand
 -----------------
 
+``string join [(-q | --quiet)] SEP [STRING...]``
+
 ``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.
 
 "join0" subcommand
 ------------------
 
+``string join0 [(-q | --quiet)] [STRING...]``
+
 ``string join`` 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.
 
 "length" subcommand
 -------------------
 
+``string length [(-q | --quiet)] [STRING...]``
+
 ``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.
 
 "lower" subcommand
 ------------------
 
+``string lower [(-q | --quiet)] [STRING...]``
+
 ``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.
 
 "match" subcommand
 ------------------
 
+``string match [(-a | --all)] [(-e | --entire)] [(-i | --ignore-case)] [(-r | --regex)] [(-n | --index)] [(-q | --quiet)] [(-v | --invert)] PATTERN [STRING...]``
+
 ``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.
@@ -94,11 +113,15 @@ Exit status: 0 if at least one match was found, or 1 otherwise.
 "repeat" subcommand
 -------------------
 
+``string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [(-N | --no-newline)] [(-q | --quiet)] [STRING...]``
+  
 ``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.
 
 "replace" subcommand
 --------------------
 
+``string replace [(-a | --all)] [(-f | --filter)] [(-i | --ignore-case)] [(-r | --regex)] [(-q | --quiet)] PATTERN REPLACEMENT [STRING...]``
+
 ``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}``.
@@ -110,6 +133,8 @@ Exit status: 0 if at least one replacement was performed, or 1 otherwise.
 "split" subcommand
 ------------------
 
+``string split [(-m | --max) MAX] [(-n | --no-empty)] [(-q | --quiet)] [(-r | --right)] SEP [STRING...]``
+
 ``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.
 
 See also ``read --delimiter``.
@@ -117,6 +142,8 @@ See also ``read --delimiter``.
 "split0" subcommand
 -------------------
 
+``string split0 [(-m | --max) MAX] [(-n | --no-empty)] [(-q | --quiet)] [(-r | --right)] [STRING...]``
+  
 ``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.
@@ -124,16 +151,22 @@ See also ``read --delimiter``.
 "sub" subcommand
 ----------------
 
+``string sub [(-s | --start) START] [(-l | --length) LENGTH] [(-q | --quiet)] [STRING...]``
+  
 ``string sub`` prints a substring of each string argument. The start of the substring can be specified with ``-s`` or ``--start`` 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 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.
 
 "trim" subcommand
 -----------------
 
+``string trim [(-l | --left)] [(-r | --right)] [(-c | --chars CHARS)] [(-q | --quiet)] [STRING...]``
+  
 ``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.
 
 "upper" subcommand
 ------------------
 
+``string upper [(-q | --quiet)] [STRING...]``
+
 ``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.
 
 Regular Expressions

From 21bac8428e805a9d8f2163f58709f8ee85824ac7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 20:12:28 +0100
Subject: [PATCH 0196/1732] docs/cmds/string: Fix lists

sphinx _really_ likes its empty lines before lists!

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 3ed356a02..4009588e3 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -177,6 +177,7 @@ Both the ``match`` and ``replace`` subcommand support regular expressions when u
 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.
 
 Some features include repetitions:
+
 - ``*`` refers to 0 or more repetitions of the previous expression
 - ``+`` 1 or more
 - ``?`` 0 or 1.
@@ -185,6 +186,7 @@ Some features include repetitions:
 - ``{n,}`` n or more
 
 Character classes, some of the more important:
+
 - ``.`` any character except newline
 - ``\d`` a decimal digit and ``\D``, not a decimal digit
 - ``\s`` whitespace and ``\S``, not whitespace
@@ -210,12 +212,14 @@ Character classes, some of the more important:
 - ``[[:xdigit:]]`` : "hexadecimal digit"
 
 Groups:
+
 - ``(...)`` is a capturing group
 - ``(?:...)`` is a non-capturing group
 - ``\n`` is a backreference (where n is the number of the group, starting with 1)
 - ``$n`` is a reference from the replacement expression to a group in the match expression.
 
 And some other things:
+
 - ``\b`` denotes a word boundary, ``\B`` is not a word boundary.
 - ``^`` is the start of the string or line, ``$`` the end.
 - ``|`` is "alternation", i.e. the "or".

From 408c555bd6825cb5d1839674374e5eda8c6e98ca Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 20:15:59 +0100
Subject: [PATCH 0197/1732] docs/cmds/alias: Fix emphasis

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

diff --git a/sphinx_doc_src/cmds/alias.rst b/sphinx_doc_src/cmds/alias.rst
index 487b35c5c..538ab3c67 100644
--- a/sphinx_doc_src/cmds/alias.rst
+++ b/sphinx_doc_src/cmds/alias.rst
@@ -19,7 +19,7 @@ Description
 - ``NAME`` is the name of the alias
 - ``DEFINITION`` is the actual command to execute. The string ``$argv`` will be appended.
 
-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_.
+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*.
 
 The following options are available:
 

From 3912d86ed8030f52f6a54b565409f077e49b25f7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 20:16:10 +0100
Subject: [PATCH 0198/1732] docs/cmds/bind: Fix synopsis

---
 sphinx_doc_src/cmds/bind.rst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 1d9c6ddc1..a7b028800 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -4,16 +4,17 @@ bind - handle fish key bindings
 Synopsis
 --------
 
-bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE]
-     [--preset | --user]
-     [(-s | --silent)] [(-k | --key)] SEQUENCE COMMAND [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 [SEQUENCE...])
+``bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [(-s | --silent)] [(-k | --key)] SEQUENCE COMMAND [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 [SEQUENCE...])``
 
 
 Description

From 191b74df6fa44c96dbf283b84859147249814b47 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 20:55:28 +0100
Subject: [PATCH 0199/1732] docs: Fix some sphinx errors

See #5696.

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst                  |  2 +-
 sphinx_doc_src/cmds/complete.rst              | 30 ++++++++++---------
 sphinx_doc_src/cmds/disown.rst                |  4 +--
 .../cmds/fish_breakpoint_prompt.rst           |  2 ++
 sphinx_doc_src/cmds/fish_git_prompt.rst       |  4 +--
 sphinx_doc_src/cmds/fish_opt.rst              |  7 +++--
 sphinx_doc_src/cmds/fish_prompt.rst           |  8 +++--
 sphinx_doc_src/cmds/fish_right_prompt.rst     |  8 +++--
 sphinx_doc_src/cmds/fish_svn_prompt.rst       |  1 -
 sphinx_doc_src/cmds/umask.rst                 |  2 +-
 sphinx_doc_src/index.rst                      |  3 +-
 11 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index a7b028800..5fb4d38b1 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -26,7 +26,7 @@ SEQUENCE is the character sequence to bind to. These should be written as <a hre
 
 The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``````bind '' self-insert``````) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
 
-If the ``-k`` switch is used, the name of the key (such as 'down', 'up' or 'backspace') is used instead of a sequence. The names used are the same as the corresponding curses variables, but without the 'key_' prefix. (See ``terminfo(5)`` for more information, or use ``bind --key-names`` for a list of all available named keys.) If used in conjunction with the ``-s`` switch, ``bind`` will silently ignore bindings to named keys that are not found in termcap for the current ``$TERMINAL``, otherwise a warning is emitted.
+If the ``-k`` switch is used, the name of the key (such as 'down', 'up' or 'backspace') is used instead of a sequence. The names used are the same as the corresponding curses variables, but without the 'key\_' prefix. (See ``terminfo(5)`` for more information, or use ``bind --key-names`` for a list of all available named keys.) If used in conjunction with the ``-s`` switch, ``bind`` will silently ignore bindings to named keys that are not found in termcap for the current ``$TERMINAL``, otherwise a warning is emitted.
 
 ``COMMAND`` can be any fish command, but it can also be one of a set of special input functions. These include functions for moving the cursor, operating on the kill-ring, performing tab completion, etc. Use ``bind --function-names`` for a complete list of these input functions.
 
diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index ab3ba1007..d1e3f1cec 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -4,20 +4,22 @@ complete - edit command specific tab-completions
 Synopsis
 --------
 
-complete ( -c | --command | -p | --path ) COMMAND
-        [( -c | --command | -p | --path ) COMMAND]...
-        [( -e | --erase )]
-        [( -s | --short-option ) SHORT_OPTION]...
-        [( -l | --long-option | -o | --old-option ) LONG_OPTION]...
-        [( -a | --arguments ) OPTION_ARGUMENTS]
-        [( -k | --keep-order )]
-        [( -f | --no-files )]
-        [( -r | --require-parameter )]
-        [( -x | --exclusive )]
-        [( -w | --wraps ) WRAPPED_COMMAND]...
-        [( -n | --condition ) CONDITION]
-        [( -d | --description ) DESCRIPTION]
-complete ( -C[STRING] | --do-complete[=STRING] )
+::
+
+  complete ( -c | --command | -p | --path ) COMMAND
+          [( -c | --command | -p | --path ) COMMAND]...
+          [( -e | --erase )]
+          [( -s | --short-option ) SHORT_OPTION]...
+          [( -l | --long-option | -o | --old-option ) LONG_OPTION]...
+          [( -a | --arguments ) OPTION_ARGUMENTS]
+          [( -k | --keep-order )]
+          [( -f | --no-files )]
+          [( -r | --require-parameter )]
+          [( -x | --exclusive )]
+          [( -w | --wraps ) WRAPPED_COMMAND]...
+          [( -n | --condition ) CONDITION]
+          [( -d | --description ) DESCRIPTION]
+  complete ( -C[STRING] | --do-complete[=STRING] )
 
 
 Description
diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index 65732b389..3d726f557 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -4,7 +4,7 @@ disown - remove a process from the list of jobs
 Synopsis
 --------
 
-disown [ PID ... ]
+``disown [ PID ... ]``
 
 
 Description
@@ -14,7 +14,7 @@ Description
 
 Jobs in the list of jobs are sent a hang-up signal when fish terminates, which usually causes the job to terminate; ``disown`` allows these processes to continue regardless.
 
-If no process is specified, the most recently-used job is removed (like ``bg`` and ``fg``).  If one or more ``PID``s are specified, jobs with the specified process IDs are removed from the job list. Invalid jobs are ignored and a warning is printed.
+If no process is specified, the most recently-used job is removed (like ``bg`` and ``fg``).  If one or more PIDs are specified, jobs with the specified process IDs are removed from the job list. Invalid jobs are ignored and a warning is printed.
 
 If a job is stopped, it is sent a signal to continue running, and a warning is printed. It is not possible to use the ``bg`` builtin to continue a job once it has been disowned.
 
diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
index b60eee2b2..e5c8f4d0f 100644
--- a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
@@ -4,6 +4,8 @@ fish_breakpoint_prompt - define the prompt when stopped at a breakpoint
 Synopsis
 --------
 
+::
+
     function fish_breakpoint_prompt
         ...
     end
diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index a3aeab276..221feefa8 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -40,7 +40,7 @@ There are numerous configuration options, either as fish variables or git config
 
 A number of variables set characters and color used to indicate things. Many of these have a different default if used with informative status enabled. The normal default is given first, then the informative default if it is different. If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
 
-- ``$__fish_git_prompt_char_stateseparator`` (' ', |)
+- ``$__fish_git_prompt_char_stateseparator`` (' ', `|`)
 - ``$__fish_git_prompt_color`` ('')
 - ``$__fish_git_prompt_color_prefix``
 - ``$__fish_git_prompt_color_suffix``
@@ -54,7 +54,7 @@ Some variables are only used in some modes, like when informative status is enab
 
 Variables used with showdirtystate:
 
-- ``$__fish_git_prompt_char_dirtystate`` (*, ✚)
+- ``$__fish_git_prompt_char_dirtystate`` (`*`, ✚)
 - ``$__fish_git_prompt_char_invalidstate`` (#, ✖)
 - ``$__fish_git_prompt_char_stagedstate`` (+, ●)
 - ``$__fish_git_prompt_color_dirtystate`` (red with showcolorhints, same as color_flags otherwise)
diff --git a/sphinx_doc_src/cmds/fish_opt.rst b/sphinx_doc_src/cmds/fish_opt.rst
index 0d3516500..e0032b58c 100644
--- a/sphinx_doc_src/cmds/fish_opt.rst
+++ b/sphinx_doc_src/cmds/fish_opt.rst
@@ -4,9 +4,10 @@ fish_opt - create an option spec for the argparse command
 Synopsis
 --------
 
-fish_opt [ -h | --help ]
-fish_opt ( -s X | --short=X ) [ -l LONG | --long=LONG ] [ --long-only ] \
-    [ -o | --optional-val ] [ -r | --required-val ] [ --multiple-vals ]
+::
+
+  fish_opt [ -h | --help ]
+  fish_opt ( -s X | --short=X ) [ -l LONG | --long=LONG ] [ --long-only ] [ -o | --optional-val ] [ -r | --required-val ] [ --multiple-vals ]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/fish_prompt.rst b/sphinx_doc_src/cmds/fish_prompt.rst
index 99a047a1c..db302d9e7 100644
--- a/sphinx_doc_src/cmds/fish_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_prompt.rst
@@ -4,9 +4,11 @@ fish_prompt - define the appearance of the command line prompt
 Synopsis
 --------
 
-function fish_prompt
-    ...
-end
+::
+
+  function fish_prompt
+      ...
+  end
 
 
 Description
diff --git a/sphinx_doc_src/cmds/fish_right_prompt.rst b/sphinx_doc_src/cmds/fish_right_prompt.rst
index 01e8cc263..55237d703 100644
--- a/sphinx_doc_src/cmds/fish_right_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_right_prompt.rst
@@ -4,9 +4,11 @@ fish_right_prompt - define the appearance of the right-side command line prompt
 Synopsis
 --------
 
-function fish_right_prompt
-    ...
-end
+::
+
+  function fish_right_prompt
+      ...
+  end
 
 
 Description
diff --git a/sphinx_doc_src/cmds/fish_svn_prompt.rst b/sphinx_doc_src/cmds/fish_svn_prompt.rst
index f467f31e2..5770585f8 100644
--- a/sphinx_doc_src/cmds/fish_svn_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_svn_prompt.rst
@@ -13,7 +13,6 @@ There are numerous configuration options:
 
 
 - $__fish_svn_prompt_color_revision, the colour of the revision number to display in the prompt
-# setting the prompt status separator character
 - $__fish_svn_prompt_char_separator, the separator between status characters
 
 And
diff --git a/sphinx_doc_src/cmds/umask.rst b/sphinx_doc_src/cmds/umask.rst
index 8775c8a5c..ff18bfac2 100644
--- a/sphinx_doc_src/cmds/umask.rst
+++ b/sphinx_doc_src/cmds/umask.rst
@@ -14,7 +14,7 @@ Description
 
 The umask may be expressed either as an octal number, which represents the rights that will be removed by default, or symbolically, which represents the only rights that will be granted by default.
 
-Access rights are explained in the manual page for the ``chmod``(1) program.
+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.
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 3065d1cd8..d8b060778 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -453,8 +453,7 @@ Fish automatically searches through any directories in the array variable ``$fis
 By default, Fish searches the following for functions, using the first available file that it finds:
 - A directory for end-users to keep their own functions, usually ``~/.config/fish/functions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable).
 - A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions`` (really ``$__fish_sysconfdir/functions``).
-- A directory for third-party software vendors to ship their own functions for their software, usually ``/usr/share/fish/vendor_functions.d``.
-  (set at compile time; by default, ``$__fish_data_dir/vendor_functions.d``)
+- A directory for third-party software vendors to ship their own functions for their software, usually ``/usr/share/fish/vendor_functions.d``. (set at compile time; by default, ``$__fish_data_dir/vendor_functions.d``)
 - The functions shipped with fish, usually installed in ``/usr/share/fish/functions`` (really ``$__fish_data_dir/functions``).
 
 These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.

From 82d55aeb8472fd8feb1865d01b4eb40cf1c30645 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 21:07:36 +0100
Subject: [PATCH 0200/1732] docs: Fix warnings

This was:

- Some `` mismatches - it's "``something``", not "``something`".

- Some "explicit targets", which IMHO are quite a misfeature - `word
  <link>`_ has to be unique, which I don't see a usecase for. Instead
  use `word <link>`__, with a double-underscore at the end.

- One case of `||` which I just removed

See #5696.

[ci skip]
---
 sphinx_doc_src/index.rst | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d8b060778..11d27c5be 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -92,7 +92,7 @@ Commands versus Programs
 
 **Programs** in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out: 
 
-Arguments → |Program| → Return Values
+Arguments → Program → Return Values
 
 **Shell commands** are different:
 
@@ -1185,13 +1185,13 @@ Special variables
 
 The user can change the settings of ``fish`` by changing the values of certain variables.
 
-- A large number of variable starting with the prefixes ``fish_color`` and ``fish_pager_color``. See `Variables for changing highlighting colors <#variables-color>`_ for more information.
+- A large number of variable starting with the prefixes ``fish_color`` and ``fish_pager_color``. See `Variables for changing highlighting colors <#variables-color>`__ for more information.
 
 - ``fish_emoji_width`` controls the computed width of certain characters, in particular emoji, whose rendered width varies across terminal emulators. This should be set to 1 if your terminal emulator renders emoji single-width, or 2 if double-width. Set this only if you see graphical glitching when printing emoji.
 
 - ``fish_ambiguous_width`` controls the computed width of ambiguous East Asian characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
 
-- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/special.html-case-escape>`_ builtin command. This delay facilitates using escape as a meta key.
+- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/bind.html#special-case-escape>`__ builtin command. This delay facilitates using escape as a meta key.
 
 - ``fish_greeting``, the greeting message printed on startup.
 
@@ -1416,15 +1416,15 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Control+D` delete one character to the right of the cursor. If the command line is empty, :kbd:`Control+D` will exit fish.
 
-- :kbd:`Control+U` moves contents from the beginning of line to the cursor to the `killring <#killring>`_.
+- :kbd:`Control+U` moves contents from the beginning of line to the cursor to the `killring <#killring>`__.
 
 - :kbd:`Control+L` clears and repaints the screen.
 
-- :kbd:`Control+W` moves the previous path component (everything up to the previous "/") to the `killring <#killring>`_.
+- :kbd:`Control+W` moves the previous path component (everything up to the previous "/") to the `killring <#killring>`__.
 
 - :kbd:`Control+X` copies the current buffer to the system's clipboard, :kbd:`Control+V` inserts the clipboard contents.
 
-- :kbd:`Alt+d` moves the next word to the `killring <#killring>`_.
+- :kbd:`Alt+d` moves the next word to the `killring <#killring>`__.
 
 - :kbd:`Alt+h` (or :kbd:`F1`) shows the manual page for the current command, if one exists.
 
@@ -1451,7 +1451,7 @@ Emacs mode commands
 
 - :kbd:`Delete` and :kbd:`Backspace` removes one character forwards or backwards respectively.
 
-- :kbd:`Control+K` moves contents from the cursor to the end of line to the `killring <#killring>`_.
+- :kbd:`Control+K` moves contents from the cursor to the end of line to the `killring <#killring>`__.
 
 - :kbd:`Alt+c` capitalizes the current word.
 
@@ -1462,7 +1462,7 @@ Emacs mode commands
 - :kbd:`Alt+t` transposes the last two words
 
 
-You can change these key bindings using the `bind <cmds/bind.html">`_ builtin.
+You can change these key bindings using the `bind <cmds/bind.html">`__ builtin.
 
 
 .. _vi-mode:
@@ -1508,11 +1508,11 @@ Command mode is also known as normal mode.
 
 - :kbd:`0` (zero) moves the cursor to beginning of line (remaining in command mode).
 
-- :kbd:`d`:kbd:`d` deletes the current line and moves it to the `killring <#killring>`_.
+- :kbd:`d`:kbd:`d` deletes the current line and moves it to the `killring <#killring>`__.
 
-- :kbd:`Shift,D` deletes text after the current cursor position and moves it to the `killring <#killring>`_.
+- :kbd:`Shift,D` deletes text after the current cursor position and moves it to the `killring <#killring>`__.
 
-- :kbd:`p` pastes text from the `killring <#killring>`_.
+- :kbd:`p` pastes text from the `killring <#killring>`__.
 
 - :kbd:`u` search history backwards.
 
@@ -1538,7 +1538,7 @@ Visual mode
 
 - :kbd:`b` and :kbd:`w` extend the selection backward/forward by one word.
 
-- :kbd:`d` and :kbd:`x` move the selection to the `killring <#killring>`_ and enter `command mode <#vi-mode-command>`_.
+- :kbd:`d` and :kbd:`x` move the selection to the `killring <#killring>`__ and enter `command mode <#vi-mode-command>`__.
 
 - :kbd:`Escape` and :kbd:`Control+C` enter `command mode <#vi-mode-command>`_.
 
@@ -1615,8 +1615,11 @@ Initialization files
 On startup, Fish evaluates a number of configuration files, which can be used to control the behavior of the shell. The location of these configuration variables is controlled by a number of environment variables, and their default or usual location is given below.
 
 Configuration files are evaluated in the following order:
-- Configuration shipped with fish, which should not be edited, in ``$__fish_data_dir/config.fish`` (usually ``/usr/share/fish/config.fish`).
+
+- Configuration shipped with fish, which should not be edited, in ``$__fish_data_dir/config.fish`` (usually ``/usr/share/fish/config.fish``).
+
 - Configuration snippets in files ending in ``.fish``, in the directories:
+
   - ``$__fish_config_dir/conf.d`` (by default, ``~/.config/fish/conf.d/``)
   - ``$__fish_sysconf_dir/conf.d`` (by default, ``/etc/fish/conf.d``)
   - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/vendor_conf.d``)
@@ -1709,7 +1712,7 @@ Detected errors include:
 
 When the cursor is over a parenthesis or a quote, ``fish`` also highlights its matching quote or parenthesis.
 
-To customize the syntax highlighting, you can set the environment variables listed in the `Variables for changing highlighting colors <index.html#variables-color>`_ section.
+To customize the syntax highlighting, you can set the environment variables listed in the `Variables for changing highlighting colors <#variables-color>`__ section.
 
 .. _title:
 
@@ -1738,7 +1741,7 @@ To show the last command in the title::
 Programmable prompt
 -------------------
 
-When fish waits for input, it will display a prompt by evaluating the ``fish_prompt`` and `fish_right_prompt` functions. The output of the former is displayed on the left and the latter's output on the right side of the terminal. The output of ``fish_mode_prompt`` will be prepended on the left, though the default function only does this when in `vi-mode <index.html#vi-mode>`_.
+When fish waits for input, it will display a prompt by evaluating the ``fish_prompt`` and `fish_right_prompt` functions. The output of the former is displayed on the left and the latter's output on the right side of the terminal. The output of ``fish_mode_prompt`` will be prepended on the left, though the default function only does this when in `vi-mode <#vi-mode>`__.
 
 .. _greeting:
 
@@ -1752,7 +1755,7 @@ If a function named ``fish_greeting`` exists, it will be run when entering inter
 Private mode
 -------------
 
-fish supports launching in private mode via ``fish --private`` (or ``fish -P`` for short). In private mode, old history is not available and any interactive commands you execute will not be appended to the global history file, making it useful both for avoiding inadvertently leaking personal information (e.g. for screencasts) and when dealing with sensitive information to prevent it being persisted to disk. You can query the global variable `fish_private_mode`` (``if set -q fish_private_mode ...`) if you would like to respect the user's wish for privacy and alter the behavior of your own fish scripts.
+fish supports launching in private mode via ``fish --private`` (or ``fish -P`` for short). In private mode, old history is not available and any interactive commands you execute will not be appended to the global history file, making it useful both for avoiding inadvertently leaking personal information (e.g. for screencasts) and when dealing with sensitive information to prevent it being persisted to disk. You can query the global variable `fish_private_mode`` (``if set -q fish_private_mode ...``) if you would like to respect the user's wish for privacy and alter the behavior of your own fish scripts.
 
 .. _event:
 

From 03a6fb4a69ea5192427ab436142f422566b24c19 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Mar 2019 21:13:10 +0100
Subject: [PATCH 0201/1732] docs/license: Fix "anonymous hyperlink" warning

Apparently an anonymous hyperlink looks like `__something__`.

I had to find this by deleting parts of the document and building to
narrow it down until I had the line, because sphinx wouldn't give a
line number.

See #5696.

[ci skip]
---
 sphinx_doc_src/license.rst | 268 +------------------------------------
 1 file changed, 1 insertion(+), 267 deletions(-)

diff --git a/sphinx_doc_src/license.rst b/sphinx_doc_src/license.rst
index 36153bd6b..91a378218 100644
--- a/sphinx_doc_src/license.rst
+++ b/sphinx_doc_src/license.rst
@@ -97,7 +97,7 @@ The precise terms and conditions for copying, distribution and modification foll
 
 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
 
- __NO WARRANTY__
+ **NO WARRANTY**
 
 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
@@ -120,269 +120,3 @@ Redistribution and use in source and binary forms, with or without modification,
  -# Neither the name of the University of Cambridge nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----
-
-**License for CMake**
-
-The ``fish`` source code contains files from [CMake](https://cmake.org) to support the build system.
-This code is distributed under the terms of a BSD-style license. Copyright 2000-2017 Kitware, Inc.
-and Contributors.
-
-The BSD license for CMake follows.
-
-CMake - Cross Platform Makefile Generator
-Copyright 2000-2017 Kitware, Inc. and Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of Kitware, Inc. nor the names of Contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----
-
-**License for wcslcpy and code derived from tmux**
-
-``fish`` also contains small amounts of code under the OpenBSD license, namely a version of the function strlcpy, modified for use with wide character strings. This code is copyrighted by Todd C. Miller (1998). It also contains code from [tmux](http://tmux.sourceforge.net), copyrighted by Nicholas Marriott <nicm@users.sourceforge.net> (2007), and made available under an identical license.
-
-The OpenBSD license is included below.
-
-Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----
-
-**License for glibc**
-
-Fish contains code from the glibc library, namely the wcstok function. This code is licensed under the LGPL, version 2 or later. Version 2 of the LPGL license agreement is included below.
-
-**GNU LESSER GENERAL PUBLIC LICENSE**
-
-Version 2.1, February 1999
-
-    Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-
-[This is the first released version of the Lesser GPL.  It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
-
-**Preamble**
-
-The licenses for most software are designed to take away your freedom to share and change it.  By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software - to make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially designated software packages - typically libraries - of the Free Software Foundation and other authors who decide to use it.  You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights.  These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you.  You must make sure that they, too, receive or can get the source code.  If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it.  And you must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library.  Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free program.  We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder.  Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License.  This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License.  We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library.  The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom.  The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License.  It also provides other free software developers Less of an advantage over competing non-free programs.  These disadvantages are the reason we use the ordinary General Public License for many libraries.  However, the Lesser license provides advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard.  To achieve this, non-free programs must be allowed to use the library.  A more frequent case is that a free library does the same job as widely used non-free libraries.  In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software.  For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users'freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and modification follow.  Pay close attention to the difference between a "work based on the library" and a "work that uses the library".  The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
-
-**TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION**
-
-- This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work which has been distributed under these terms.  A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
- "Source code for a work" means the preferred form of the work for making modifications to it.  For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
- Activities other than copying, distribution and modification are not covered by this License; they are outside its scope.  The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it).  Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
- You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- 1. The modified work must itself be a software library.
-
- 2. You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
-
- 3. You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
-
- 4. If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
-  (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application.  Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
- These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
- In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library.  To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.)  Do not make any other change in these notices.
-
- Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library".  Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library".  The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library.  The threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work.  (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License.  You must supply a copy of this License.  If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
- 1. Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine- readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library.  (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
-
- 2. Use a suitable shared library mechanism for linking with the Library.  A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
-
- 3. Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
-
- 4. If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
-
- 5. Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it.  However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
- It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system.  Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side- by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
-   1. Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities.  This must be distributed under the terms of the Sections above.
-
-   2. Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License.  Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License.  However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works.  These actions are prohibited by law if you do not accept this License.  Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions.  You may not impose any further restrictions on the recipients'exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
- If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
- It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices.  Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
- This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.  In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number.  If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
- **NO WARRANTY**
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-----
-
-**License for UTF8**
-
-``fish`` also contains small amounts of code under the ISC license, namely the UTF-8 conversion functions. This code is copyright © 2007 Alexey Vatchenko \<av@bsdua.org>.
-
-The ISC license agreement follows.
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-----
-
-**License for flock**
-
-``fish`` also contains small amounts of code from NetBSD, namely the ``flock`` fallback function. This code is copyright 2001 The NetBSD Foundation, Inc., and derived from software contributed to The NetBSD Foundation by Todd Vierling.
-
-The NetBSD license follows.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-----
-
-**MIT License**
-
-``fish`` includes a copy of AngularJS, which is copyright 2010-2012 Google, Inc. and licensed under the MIT License.
-
-The MIT license follows.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From fc7d11d7b8990e1d22d9eda49334452a3e23d765 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 17:11:44 +0100
Subject: [PATCH 0202/1732] Update zpool completions to use `string` instead of
 `grep`

---
 share/completions/zpool.fish | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 20d47f41c..933660100 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -37,20 +37,21 @@ function __fish_zpool_using_command # zpool command whose completions are looked
 end
 
 function __fish_zpool_list_used_vdevs -a pool
-    if test -z "$pool"
-        zpool list -H -v | grep -E "^\s" | cut -f2 | grep -x -E -v "(spare|log|cache|mirror|raidz.?)"
-    else
-        zpool list -H -v $pool | grep -E "^\s" | cut -f2 | grep -x -E -v "(spare|log|cache|mirror|raidz.?)"
-    end
+    # 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.?)'
 end
 
 function __fish_zpool_list_available_vdevs
     if test $OS = 'Linux'
-        find /dev -type b | cut -d'/' -f3
+        find /dev -type b | string replace '/dev/' ''
     else if test $OS = 'FreeBSD'
-        for i in (camcontrol devlist | cut -d "(" -f 2 | cut -d "," -f 1); ls /dev | grep "^$i"; end
+        for i in (camcontrol devlist | cut -d "(" -f 2 | cut -d "," -f 1)
+            set -l files /dev/*
+            string replace /dev/ '' -- $files | string match -r "^$i"
+        end
     else if test $OS = 'SunOS'
-        ls /dev/dsk
+        find /dev/dsk -type b | string replace '/dev/' ''
     end
 end
 
@@ -88,11 +89,10 @@ function __fish_zpool_complete_vdevs
                 return
             case "" # Au cas où
                 echo "" > /dev/null
-            case "*"
-                if echo "$i" | grep -q -E '^((-.*)|(.*(=|,).*))$' # 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
+            case "-*" "*=*" "*,*"
+                # 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
         set tokens (math $tokens+1)
     end
@@ -126,7 +126,7 @@ function __fish_zpool_list_ro_properties
         echo -e "bootsize\t"(_ "System boot partition size")
     end
     echo -e "capacity\t"(_ "Usage percentage of pool")
-    echo -e "dedupratio\t"(_ "Deduplication ratio") 
+    echo -e "dedupratio\t"(_ "Deduplication ratio")
     echo -e "expandsize\t"(_ "Amount of uninitialized space within the pool")
     echo -e "fragmentation\t"(_ "Fragmentation percentage of pool")
     echo -e "free\t"(_ "Free pool space")
@@ -136,7 +136,7 @@ function __fish_zpool_list_ro_properties
     echo -e "size\t"(_ "Total pool space")
     echo -e "used\t"(_ "Used pool space")
     # Unsupported features
-    for i in (zpool list -o all | head -n1 | tr -s "[:blank:]" | tr ' ' '\n' | tr "[:upper:]" "[:lower:]" | grep unsupported); echo $i; end
+    zpool list -o all | head -n1 | string replace -ra ' +' '\n' | string lower | string match -r unsupported
 end
 
 function __fish_zpool_list_device_properties
@@ -167,11 +167,7 @@ function __fish_zpool_list_rw_properties
     echo -e "listsnaps\t"(_ "Display snapshots even if 'zfs list' does not use '-t'")" (on, off)"
     echo -e "version\t"(_ "On-disk version of pool")" (VERSION)"
     # Feature properties
-    for featureLong in (zpool list -o all | tr -s "[:blank:]" | tr ' ' '\n' | tr "[:upper:]" "[:lower:]" | grep '^feature@')
-        set -l featureShort (echo $featureLong | sed -e 's/feature@\(.*\)/\1/g')
-        set featureLong (echo -e "$featureLong\t")
-        printf (_ "%sEnable the %s feature\n") $featureLong $featureShort
-    end
+    zpool list -o all | string replace -ra ' +' '\n' | string lower | string replace -rf '^feature@(.*)' '$1'
 end
 
 complete -c zpool -f -n '__fish_zpool_needs_command' -s '?' -d 'Display a help message'

From 93b02dcec4d55b406f1cdd127577e3ca1df58c28 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 29 Mar 2019 17:43:03 -0500
Subject: [PATCH 0203/1732] Don't use camcontrol in FreeBSD zpool completions

It requires root/su privileges to list devices, and we have a great
alternative that already produces the desired results.
---
 share/completions/zpool.fish | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 933660100..fc93826c6 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -46,10 +46,7 @@ function __fish_zpool_list_available_vdevs
     if test $OS = 'Linux'
         find /dev -type b | string replace '/dev/' ''
     else if test $OS = 'FreeBSD'
-        for i in (camcontrol devlist | cut -d "(" -f 2 | cut -d "," -f 1)
-            set -l files /dev/*
-            string replace /dev/ '' -- $files | string match -r "^$i"
-        end
+        sysctl -an kern.disks | string split ' '
     else if test $OS = 'SunOS'
         find /dev/dsk -type b | string replace '/dev/' ''
     end

From 1937e409f7e860c040047a3a06b8b7c7f65c4828 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Mar 2019 17:13:31 +0100
Subject: [PATCH 0204/1732] completions/find: Fix typo

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

diff --git a/share/completions/find.fish b/share/completions/find.fish
index fa120d57b..e7301ef00 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -20,7 +20,7 @@ complete -c find -o mindepth -d "Do not apply any tests or actions at levels les
 complete -c find -o mount -o xdev -d "Don't descend directories on other  filesystems"
 complete -c find -o noignore_readdir_race -d "Print error messages for files that are deleted while running find"
 complete -c find -o noleaf -d "Do not optimize by assuming that  directories  contain  2  fewer subdirectories  than  their  hard  link  count"
-complete -c find -o regextype -d "Specify regular expression type" -a "emacs posix-awk posix-basic posiz-egrep posix-extended"
+complete -c find -o regextype -d "Specify regular expression type" -a "emacs posix-awk posix-basic posix-egrep posix-extended"
 complete -c find -o version -l version -d "Display version and exit"
 complete -c find -o warn -d "Turn warnings on"
 complete -c find -o nowarn -d "Turn warnings off"

From 0aa0dceeb323b9248eda6401ab202c7457804801 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 29 Mar 2019 20:56:02 -0700
Subject: [PATCH 0205/1732] End coalescing repaints on check-exits

Hopeful fix for #5766
---
 src/reader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/reader.cpp b/src/reader.cpp
index 6ffd3da31..87d31f0ed 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3267,6 +3267,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         }
 
         if (!event_needing_handling || event_needing_handling->is_check_exit()) {
+            rls.coalescing_repaints = false;
             repaint_if_needed();
             continue;
         } else if (event_needing_handling->is_eof()) {

From 7aaa3b8553a6ab182672beed17f34a4da132307d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Mar 2019 19:25:09 +0100
Subject: [PATCH 0206/1732] Keep the order for $PATH and $MANPATH when reading
 /etc/paths (#5767)

* Keep the order for $PATH and $MANPATH when reading /etc/paths

Fixes #5456.
---
 share/config.fish | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index f6176361d..c5268fa6b 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -173,7 +173,9 @@ if status --is-login
         # executable for fish; see
         # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html .
         function __fish_macos_set_env -d "set an environment variable like path_helper does (macOS only)"
-            set -l result
+            # The first argument is the variable name, the others are the files.
+            # Keep the components already there so we don't change the order
+            set -l result $$argv[1]
 
             for path_file in $argv[2] $argv[3]/*
                 if [ -f $path_file ]
@@ -185,12 +187,6 @@ if status --is-login
                 end
             end
 
-            for entry in $$argv[1]
-                if not contains -- $entry $result
-                    set result $result $entry
-                end
-            end
-
             set -xg $argv[1] $result
         end
 

From 203927245d7422038814913bbfb676b6d2ebdf6f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Mar 2019 20:27:30 +0100
Subject: [PATCH 0207/1732] docs: Fix reference syntax

Fixes #5776.

[ci skip]
---
 sphinx_doc_src/faq.rst      | 14 +++++++-------
 sphinx_doc_src/index.rst    |  6 +++---
 sphinx_doc_src/tutorial.rst |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 35742d8b9..e08a58e55 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -3,7 +3,7 @@ Frequently asked questions
 
 How do I set or clear an environment variable?
 ----------------------------------------------
-Use the <a href="commands.html#set">``set``</a> command::
+Use the `set <cmds/set.html>`__ command::
 
     set -x key value
     set -e key
@@ -26,7 +26,7 @@ The prompt is the output of the ``fish_prompt`` function. Put it in ``~/.config/
     end
 
 
-You can also use the Web configuration tool, <a href="commands.html#fish_config">``fish_config``</a>, to preview and choose from a gallery of sample prompts.
+You can also use the Web configuration tool, `fish_config <cmds/fish_config.html>`__, to preview and choose from a gallery of sample prompts.
 
 
 How do I run a command from history?
@@ -93,7 +93,7 @@ If you are just interested in success or failure, you can run the command direct
     end
 
 
-See the documentation for <a href="commands.html#test">``test``</a> and <a href="commands.html#if">``if``</a> for more information.
+See the documentation for `test <cmds/test.html>`__ and `if <cmds/if.html>`__ for more information.
 
 ~~
 How do I set an environment variable for just one command?
@@ -154,7 +154,7 @@ variables.
 This means that the global value takes precedence over the universal value.
 
 To avoid this problem, consider changing the setting which fish inherits. If this is not possible,
-add a statement to your <a href="index.html#">user initialization file</a> (usually
+add a statement to your `user initialization file <index#initialization-files>`__ (usually
 ``~/.config/fish/config.fish``)::
 
     set -gx EDITOR vim
@@ -162,12 +162,12 @@ add a statement to your <a href="index.html#">user initialization file</a> (usua
 
 How do I customize my syntax highlighting colors?
 -------------------------------------------------
-Use the web configuration tool, <a href="commands.html#fish_config">``fish_config``</a>, or alter the <a href="index.html#variables-color">``fish_color`` family of environment variables</a>.
+Use the web configuration tool, `fish_config <cmds/fish_config.html>`__, or alter the `fish_color family of environment variables <index#variables-color>`__.
 
 ~~
 How do I update man page completions?
 -------------------------------------
-Use the <a href="commands.html#fish_update_completions">``fish_update_completions``</a> command.
+Use the `fish_update_completions <cmds/fish_update_completions.html>`__ command.
 
 ~~
 I accidentally entered a directory path and fish changed directory. What happened?
@@ -177,7 +177,7 @@ If fish is unable to locate a command with a given name, and it starts with '``.
 
 The open command doesn't work.
 ------------------------------
-The ``open`` command uses the MIME type database and the ``.desktop`` files used by Gnome and KDE to identify filetypes and default actions. If at least one of these environments is installed, but the open command is not working, this probably means that the relevant files are installed in a non-standard location. Consider <a href="index.html#more-help">asking for more help</a>.
+The ``open`` command uses the MIME type database and the ``.desktop`` files used by Gnome and KDE to identify filetypes and default actions. If at least one of these environments is installed, but the open command is not working, this probably means that the relevant files are installed in a non-standard location. Consider `asking for more help <index#more-help>`__.
 
 
 How do I make fish my default shell?
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 11d27c5be..96e5b4424 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -719,7 +719,7 @@ Examples:
 
 - ``**`` matches any files and directories in the current directory and all of its subdirectories.
 
-Note that for most commands, if any wildcard fails to expand, the command is not executed, ```$status`` <#variables-status>`_ is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 3 exceptions, namely `set <cmds/set.html>`_, `count <cmds/count.html>`_ and `for <cmds/for.html>`_. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
+Note that for most commands, if any wildcard fails to expand, the command is not executed, `$status <#variables-status>`_ is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 3 exceptions, namely `set <cmds/set.html>`_, `count <cmds/count.html>`_ and `for <cmds/for.html>`_. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
 
 Examples::
 
@@ -1191,7 +1191,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``fish_ambiguous_width`` controls the computed width of ambiguous East Asian characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
 
-- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/bind.html#special-case-escape>`__ builtin command. This delay facilitates using escape as a meta key.
+- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/bind.html#special-case-the-escape-character>`__ builtin command. This delay facilitates using escape as a meta key.
 
 - ``fish_greeting``, the greeting message printed on startup.
 
@@ -1627,7 +1627,7 @@ Configuration files are evaluated in the following order:
   If there are multiple files with the same name in these directories, only the first will be executed.
   They are executed in order of their filename, sorted (like globs) in a natural order (i.e. "01" sorts before "2").
 
-- System-wide configuration files, where administrators can include initialization that should be run for all users on the system - similar to ``/etc/profile`` for POSIX-style shells - in ``$__fish_sysconf_dir``` (usually ``/etc/fish/config.fish``);
+- System-wide configuration files, where administrators can include initialization that should be run for all users on the system - similar to ``/etc/profile`` for POSIX-style shells - in ``$__fish_sysconf_dir` (usually /etc/fish/config.fish``);
 - User initialization, usually in `~/.config/fish/config.fish` (controlled by the ``XDG_CONFIG_HOME`` environment variable, and accessible as ``$__fish_config_dir``).
 
 These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 01503482b..ef64c480f 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -338,7 +338,7 @@ You can iterate over a list (or a slice) with a for loop::
     <outp>entry: /usr/local/bin</outp>
 
 
-Lists adjacent to other lists or strings are expanded as <a href="index.html#cartesian-product">cartesian products</a> unless quoted (see <a href="index.html#expand-variable">Variable expansion</a>)::
+Lists adjacent to other lists or strings are expanded as `cartesian products <index#cartesian-product>`__ unless quoted (see `Variable expansion <index#expand-variable>`__)::
 
     >_ set a 1 2 3
     >_ set 1 a b c
@@ -350,7 +350,7 @@ Lists adjacent to other lists or strings are expanded as <a href="index.html#car
     <outp>1 2 3 banana</outp>
 
 
-This is similar to <a href="index.html#expand-brace">Brace expansion</a>.
+This is similar to `Brace expansion <index#expand-brace>`__.
 
 Command Substitutions
 ---------------------
@@ -445,7 +445,7 @@ Use ``if``, ``else if``, and ``else`` to conditionally execute code, based on th
     end
 
 
-To compare strings or numbers or check file properties (whether a file exists or is writeable and such), use <a href="commands.html#test">test</a>, like
+To compare strings or numbers or check file properties (whether a file exists or is writeable and such), use `test <cmds/test.html>`__, like
 
 
 
@@ -650,7 +650,7 @@ This is the preferred way to define your prompt as well::
     end
 
 
-See the documentation for <a href="commands.html#funced">funced</a> and <a href="commands.html#funcsave">funcsave</a> for ways to create these files automatically.
+See the documentation for `funced <cmds/funced.html>`__ and `funcsave <cmds/funcsave.html>`__ for ways to create these files automatically.
 
 Universal Variables
 -------------------

From 0c4580d8743e1745a14c4fda05ccb2c19d404331 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Mar 2019 20:44:07 +0100
Subject: [PATCH 0208/1732] docs: Fix moar reference syntax

---
 sphinx_doc_src/cmds/alias.rst                  |  4 ++--
 sphinx_doc_src/cmds/and.rst                    |  4 ++--
 sphinx_doc_src/cmds/argparse.rst               | 10 +++++-----
 sphinx_doc_src/cmds/bg.rst                     |  2 +-
 sphinx_doc_src/cmds/bind.rst                   |  6 +++---
 sphinx_doc_src/cmds/block.rst                  |  2 +-
 sphinx_doc_src/cmds/break.rst                  |  2 +-
 sphinx_doc_src/cmds/breakpoint.rst             |  2 +-
 sphinx_doc_src/cmds/cd.rst                     |  4 ++--
 sphinx_doc_src/cmds/disown.rst                 |  2 +-
 sphinx_doc_src/cmds/exit.rst                   |  2 +-
 sphinx_doc_src/cmds/fg.rst                     |  2 +-
 sphinx_doc_src/cmds/fish_breakpoint_prompt.rst |  2 +-
 sphinx_doc_src/cmds/fish_opt.rst               |  2 +-
 sphinx_doc_src/cmds/fish_prompt.rst            |  2 +-
 sphinx_doc_src/cmds/function.rst               |  6 +++---
 sphinx_doc_src/cmds/jobs.rst                   |  2 +-
 sphinx_doc_src/faq.rst                         |  4 ++--
 sphinx_doc_src/tutorial.rst                    |  4 ++--
 19 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/sphinx_doc_src/cmds/alias.rst b/sphinx_doc_src/cmds/alias.rst
index 538ab3c67..ff1e87757 100644
--- a/sphinx_doc_src/cmds/alias.rst
+++ b/sphinx_doc_src/cmds/alias.rst
@@ -12,7 +12,7 @@ alias [OPTIONS] NAME=DEFINITION
 Description
 -----------
 
-``alias`` is a simple wrapper for the ``function`` builtin, which creates a function wrapping a command. It has similar syntax to POSIX shell ``alias``. For other uses, it is recommended to define a <a href='#function'>function</a>.
+``alias`` is a simple wrapper for the ``function`` builtin, which creates a function wrapping a command. It has similar syntax to POSIX shell ``alias``. For other uses, it is recommended to define a `function <cmds/function.html>`__.
 
 ``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``.
 
@@ -25,7 +25,7 @@ The following options are available:
 
 - ``-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 <a href='#funcsave'>funcsave</a>.
+- ``-s`` or ``--save`` Automatically save the function created by the alias into your fish configuration directory using `funcsave <cmds/funcsave.html>`__.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/and.rst b/sphinx_doc_src/cmds/and.rst
index a5614c4ad..1b80978ad 100644
--- a/sphinx_doc_src/cmds/and.rst
+++ b/sphinx_doc_src/cmds/and.rst
@@ -12,9 +12,9 @@ Description
 
 ``and`` is used to execute a command if the previous command was successful (returned a status of 0).
 
-``and`` statements may be used as part of the condition in an <a href="#if">``if``</a> or <a href="#while">``while``</a> block. See the documentation for <a href="#if">``if``</a> and <a href="#while">``while``</a> for examples.
+``and`` statements may be used as part of the condition in an `while <cmds/while.html>`__ or `if <cmds/if.html>`__ block.
 
-``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 <a href="index.html#variables-status">$status</a> variable.
+``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 `$status <index.html#variables-status>`__ variable.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index c328e205b..d00afa6a7 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -10,9 +10,9 @@ argparse [OPTIONS] OPTION_SPEC... -- [ARG...]
 Description
 -----------
 
-This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the <a href="#argparse-usage">usage</a> section below.
+This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the `usage <#argparse-usage>`__ section below.
 
-Each OPTION_SPEC can be written in the domain specific language <a href="#argparse-option-specs">described below</a> or created using the companion <a href="#fish-opt">``fish_opt``</a> command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
+Each OPTION_SPEC can be written in the `domain specific language <#argparse-option-specs>`__ described below or created using the companion `fish_opt <cmds/fish-opt.html>`__ command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
 
 Each option that is seen in the ARG list will result in a var name of the form ``_flag_X``, where ``X`` is the short flag letter and the long flag name. The OPTION_SPEC always requires a short flag even if it can't be used. So there will always be ``_flag_X`` var set using the short flag letter if the corresponding short or long flag is seen. The long flag name var (e.g., ``_flag_help``) will only be defined, obviously, if the OPTION_SPEC includes a long flag name.
 
@@ -48,7 +48,7 @@ Using this command involves passing two sets of arguments separated by ``--``. T
     or return
 
 
-If ``$argv`` is empty then there is nothing to parse and ``argparse`` returns zero to indicate success. If ``$argv`` is not empty then it is checked for flags ``-h``, ``--help``, ``-n`` and ``--name``. If they are found they are removed from the arguments and local variables (more on this <a href="argparse-local-variables">below</a>) are set so the script can determine which options were seen. Assuming ``$argv`` doesn't have any errors, such as a missing mandatory value for an option, then ``argparse`` exits with status zero. Otherwise it writes appropriate error messages to stderr and exits with a status of one.
+If ``$argv`` is empty then there is nothing to parse and ``argparse`` returns zero to indicate success. If ``$argv`` is not empty then it is checked for flags ``-h``, ``--help``, ``-n`` and ``--name``. If they are found they are removed from the arguments and local variables (more on this `below <argparse-local-variables>`__) are set so the script can determine which options were seen. Assuming ``$argv`` doesn't have any errors, such as a missing mandatory value for an option, then ``argparse`` exits with status zero. Otherwise it writes appropriate error messages to stderr and exits with a status of one.
 
 The ``--`` argument is required. You do not have to include any arguments after the ``--`` but you must include the ``--``. For example, this is acceptable:
 
@@ -91,9 +91,9 @@ Each option specification is a string composed of
 
 - ``=+`` if it requires a value and each instance of the flag is saved.
 
-- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on <a href="#arparse-validation">Flag Value Validation</a> for more information.
+- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#arparse-validation>`__ for more information.
 
-See the <a href="#fish-opt">``fish_opt``</a> command for a friendlier but more verbose way to create option specifications.
+See the `fish_opt <cmds/fish-opt.html>`__ command for a friendlier but more verbose way to create option specifications.
 
 In the following examples if a flag is not seen when parsing the arguments then the corresponding _flag_X var(s) will not be set.
 
diff --git a/sphinx_doc_src/cmds/bg.rst b/sphinx_doc_src/cmds/bg.rst
index a90e8cfb9..fd4aead37 100644
--- a/sphinx_doc_src/cmds/bg.rst
+++ b/sphinx_doc_src/cmds/bg.rst
@@ -10,7 +10,7 @@ bg [PID...]
 Description
 -----------
 
-``bg`` sends <a href="index.html#syntax-job-control">jobs</a> to the background, resuming them if they are stopped.
+``bg`` sends `jobs <index.html#syntax-job-control>`__ to the background, resuming them if they are stopped.
 
 A background job is executed simultaneously with fish, and does not have access to the keyboard. If no job is specified, the last job to be used is put in the background. If PID is specified, the jobs with the specified process group IDs are put in the background.
 
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 5fb4d38b1..ff270cd83 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -22,7 +22,7 @@ Description
 
 ``bind`` adds a binding for the specified key sequence to the specified command.
 
-SEQUENCE is the character sequence to bind to. These should be written as <a href="index.html#escapes">fish escape sequences</a>. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
+SEQUENCE is the character sequence to bind to. These should be written as `fish escape sequences <index.html#escapes>`__. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
 
 The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``````bind '' self-insert``````) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
 
@@ -30,7 +30,7 @@ If the ``-k`` switch is used, the name of the key (such as 'down', 'up' or 'back
 
 ``COMMAND`` can be any fish command, but it can also be one of a set of special input functions. These include functions for moving the cursor, operating on the kill-ring, performing tab completion, etc. Use ``bind --function-names`` for a complete list of these input functions.
 
-When ``COMMAND`` is a shellscript command, it is a good practice to put the actual code into a <a href="#function">function</a> and simply bind to the function name. This way it becomes significantly easier to test the function while editing, and the result is usually more readable as well.
+When ``COMMAND`` is a shellscript command, it is a good practice to put the actual code into a `function <#function>`__ and simply bind to the function name. This way it becomes significantly easier to test the function while editing, and the result is usually more readable as well.
 
 If a script produces output, it should finish by calling ``commandline -f repaint`` to tell fish that a repaint is in order.
 
@@ -38,7 +38,7 @@ When multiple ``COMMAND``s are provided, they are all run in the specified order
 
 If no ``SEQUENCE`` is provided, all bindings (or just the bindings in the specified ``MODE``) are printed. If ``SEQUENCE`` is provided without ``COMMAND``, just the binding matching that sequence is printed.
 
-To save custom keybindings, put the ``bind`` statements into <a href="index.html#initialization">config.fish</a>. Alternatively, fish also automatically executes a function called ``fish_user_key_bindings`` if it exists.
+To save custom keybindings, put the ``bind`` statements into `config.fish <index.html#initialization>`__. Alternatively, fish also automatically executes a function called ``fish_user_key_bindings`` if it exists.
 
 Key bindings may use "modes", which mimics Vi's modal input behavior. The default mode is "default", and every bind applies to a single mode. The mode can be viewed/changed with the ``$fish_bind_mode`` variable.
 
diff --git a/sphinx_doc_src/cmds/block.rst b/sphinx_doc_src/cmds/block.rst
index db9914d0b..e825b6b32 100644
--- a/sphinx_doc_src/cmds/block.rst
+++ b/sphinx_doc_src/cmds/block.rst
@@ -10,7 +10,7 @@ block [OPTIONS...]
 Description
 -----------
 
-``block`` prevents events triggered by ``fish`` or the <a href="commands.html#emit">``emit``</a> command from being delivered and acted upon while the block is in place.
+``block`` prevents events triggered by ``fish`` or the `emit <cmds/emit.html>`__ command from being delivered and acted upon while the block is in place.
 
 In functions, ``block`` can be useful while performing work that should not be interrupted by the shell.
 
diff --git a/sphinx_doc_src/cmds/break.rst b/sphinx_doc_src/cmds/break.rst
index b4b55870e..ea921ac90 100644
--- a/sphinx_doc_src/cmds/break.rst
+++ b/sphinx_doc_src/cmds/break.rst
@@ -10,7 +10,7 @@ LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 Description
 -----------
 
-``break`` halts a currently running loop, such as a <a href="#for">for</a> loop or a <a href="#while">while</a> loop. It is usually added inside of a conditional block such as an <a href="#if">if</a> statement or a <a href="#switch">switch</a> statement.
+``break`` halts a currently running loop, such as a `switch <cmds/switch.html>`__, `for <cmds/for.html>`__ or `while <cmds/while.html>`__ loop. It is usually added inside of a conditional block such as an `if <cmds/if.html`__ block.
 
 There are no parameters for ``break``.
 
diff --git a/sphinx_doc_src/cmds/breakpoint.rst b/sphinx_doc_src/cmds/breakpoint.rst
index 6486fbf5a..e1bca933e 100644
--- a/sphinx_doc_src/cmds/breakpoint.rst
+++ b/sphinx_doc_src/cmds/breakpoint.rst
@@ -12,6 +12,6 @@ Description
 
 ``breakpoint`` is used to halt a running script and launch an interactive debugging prompt.
 
-For more details, see <a href="index.html#debugging">Debugging fish scripts</a> in the ``fish`` manual.
+For more details, see `Debugging fish scripts <index.html#debugging>`__ in the ``fish`` manual.
 
 There are no parameters for ``breakpoint``.
diff --git a/sphinx_doc_src/cmds/cd.rst b/sphinx_doc_src/cmds/cd.rst
index 623d853b8..5090449e1 100644
--- a/sphinx_doc_src/cmds/cd.rst
+++ b/sphinx_doc_src/cmds/cd.rst
@@ -17,7 +17,7 @@ If ``DIRECTORY`` is a relative path, the paths found in the ``CDPATH`` list will
 
 Note that the shell will attempt to change directory without requiring ``cd`` if the name of a directory is provided (starting with ``.``, ``/`` or ``~``, or ending with ``/``).
 
-Fish also ships a wrapper function around the builtin ``cd`` that understands ``cd -`` as changing to the previous directory. See also <a href="commands.html#prevd">``prevd``</a>. This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables. If you make those universal variables your ``cd`` history is shared among all fish instances.
+Fish also ships a wrapper function around the builtin ``cd`` that understands ``cd -`` as changing to the previous directory. See also `prevd <cmds/prevd.html>`__. This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables. If you make those universal variables your ``cd`` history is shared among all fish instances.
 
 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.
 
@@ -38,4 +38,4 @@ Examples
 See Also
 --------
 
-See also the <a href="commands.html#cdh">``cdh``</a> command for changing to a recently visited directory.
+See also the `cdh <cmds/cdh.html>`__ command for changing to a recently visited directory.
diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index 3d726f557..58d8d9ad3 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -10,7 +10,7 @@ Synopsis
 Description
 -----------
 
-``disown`` removes the specified <a href="index.html#syntax-job-control">job</a> from the list of jobs. The job itself continues to exist, but fish does not keep track of it any longer.
+``disown`` removes the specified `job <index.html#syntax-job-control>`__ from the list of jobs. The job itself continues to exist, but fish does not keep track of it any longer.
 
 Jobs in the list of jobs are sent a hang-up signal when fish terminates, which usually causes the job to terminate; ``disown`` allows these processes to continue regardless.
 
diff --git a/sphinx_doc_src/cmds/exit.rst b/sphinx_doc_src/cmds/exit.rst
index bc9fe2de1..2f3f75594 100644
--- a/sphinx_doc_src/cmds/exit.rst
+++ b/sphinx_doc_src/cmds/exit.rst
@@ -12,4 +12,4 @@ Description
 
 ``exit`` causes fish to exit. If ``STATUS`` is supplied, it will be converted to an integer and used as the exit code. Otherwise, the exit code will be that of the last command executed.
 
-If exit is called while sourcing a file (using the <a href="#source">source</a> builtin) the rest of the file will be skipped, but the shell itself will not exit.
+If exit is called while sourcing a file (using the `source <cmds/source.html>`__ builtin) the rest of the file will be skipped, but the shell itself will not exit.
diff --git a/sphinx_doc_src/cmds/fg.rst b/sphinx_doc_src/cmds/fg.rst
index 33831232b..f5c8a7d73 100644
--- a/sphinx_doc_src/cmds/fg.rst
+++ b/sphinx_doc_src/cmds/fg.rst
@@ -10,7 +10,7 @@ fg [PID]
 Description
 -----------
 
-``fg`` brings the specified <a href="index.html#syntax-job-control">job</a> to the foreground, resuming it if it is stopped. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group ID is put in the foreground.
+``fg`` brings the specified `job <index.html#syntax-job-control>`__ to the foreground, resuming it if it is stopped. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group ID is put in the foreground.
 
 
 Example
diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
index e5c8f4d0f..51cfc020c 100644
--- a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
@@ -16,7 +16,7 @@ Description
 
 By defining the ``fish_breakpoint_prompt`` function, the user can choose a custom prompt when asking for input in response to a ``breakpoint`` command. The ``fish_breakpoint_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
 
-The exit status of commands within ``fish_breakpoint_prompt`` will not modify the value of <a href="index.html#variables-status">$status</a> outside of the ``fish_breakpoint_prompt`` function.
+The exit status of commands within ``fish_breakpoint_prompt`` will not modify the value of `$status <index.html#variables-status>`__ outside of the ``fish_breakpoint_prompt`` function.
 
 ``fish`` ships with a default version of this function that displays the function name and line number of the current execution context.
 
diff --git a/sphinx_doc_src/cmds/fish_opt.rst b/sphinx_doc_src/cmds/fish_opt.rst
index e0032b58c..dc8639978 100644
--- a/sphinx_doc_src/cmds/fish_opt.rst
+++ b/sphinx_doc_src/cmds/fish_opt.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-This command provides a way to produce option specifications suitable for use with the <a href="#argparse">``argparse``</a> 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 `argparse <cmds/argparse.html>`__ 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.
 
 The following ``argparse`` options are available:
 
diff --git a/sphinx_doc_src/cmds/fish_prompt.rst b/sphinx_doc_src/cmds/fish_prompt.rst
index db302d9e7..f89edadcd 100644
--- a/sphinx_doc_src/cmds/fish_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_prompt.rst
@@ -16,7 +16,7 @@ Description
 
 By defining the ``fish_prompt`` function, the user can choose a custom prompt. The ``fish_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
 
-The exit status of commands within ``fish_prompt`` will not modify the value of <a href="index.html#variables-status">$status</a> outside of the ``fish_prompt`` function.
+The exit status of commands within ``fish_prompt`` will not modify the value of `$status <index.html#variables-status>`__ outside of the ``fish_prompt`` function.
 
 ``fish`` ships with a number of example prompts that can be chosen with the ``fish_config`` command.
 
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index bf6623d93..093f46ee0 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -20,7 +20,7 @@ The following options are available:
 
 - ``-d DESCRIPTION`` or ``--description=DESCRIPTION`` is 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 <a href="#complete">``complete``</a> for more information.
+- ``-w WRAPPED_COMMAND`` or ``--wraps=WRAPPED_COMMAND`` causes the function to inherit completions from the given wrapped command. See the documentation for `complete <cmds/complete.html>`__ 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.
 
@@ -39,9 +39,9 @@ The following options are available:
 
 - ``-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 <a href="index.html#variables-arrays">variable array</a> ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
+If the user enters any additional arguments after the function, they are inserted into the environment `variable array <index.html#variables-arrays>`__ ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
 
-By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the <a href="#emit">emit</a> builtin. Fish generates the following named events:
+By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the `emit <cmds/emit.html>`__ builtin. Fish generates the following named events:
 
 - ``fish_prompt``, which is emitted whenever a new fish prompt is about to be displayed.
 
diff --git a/sphinx_doc_src/cmds/jobs.rst b/sphinx_doc_src/cmds/jobs.rst
index 3874f2f8d..b2da7b6dc 100644
--- a/sphinx_doc_src/cmds/jobs.rst
+++ b/sphinx_doc_src/cmds/jobs.rst
@@ -10,7 +10,7 @@ jobs [OPTIONS] [PID]
 Description
 -----------
 
-``jobs`` prints a list of the currently running <a href="index.html#syntax-job-control">jobs</a> and their status.
+``jobs`` prints a list of the currently running `jobs <index.html#syntax-job-control>`__ and their status.
 
 jobs accepts the following switches:
 
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index e08a58e55..ebac28e2d 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -241,7 +241,7 @@ Fish history recall is very simple yet effective:
 
   - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (:kbd:`Alt+D` and :kbd:`Alt+Backspace` are your friends).
 
-See <a href='index.html#editor'>documentation</a> for more details about line editing in fish.
+See `documentation <index.html#editor>`__ for more details about line editing in fish.
 
 
 How can I use ``-`` as a shortcut for ``cd -``?
@@ -266,7 +266,7 @@ Next, do the following (assuming fish was installed to /usr/local)::
 
 Unicode private-use characters reserved by fish
 -----------------------------------------------
-Fish reserves the <a href="http://www.unicode.org/faq/private_use.html">Unicode private-use character range</a> from U+F600 thru U+F73F for internal use. Any attempt to feed characters in that range to fish will result in them being replaced by the Unicode "replacement character" U+FFFD. This includes both interactive input as well as any file read by fish (but not programs run by fish).
+Fish reserves the `Unicode private-use character range <http://www.unicode.org/faq/private_use.html>`__ from U+F600 thru U+F73F for internal use. Any attempt to feed characters in that range to fish will result in them being replaced by the Unicode "replacement character" U+FFFD. This includes both interactive input as well as any file read by fish (but not programs run by fish).
 
 
 Where can I find extra tools for fish?
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index ef64c480f..809164dbd 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -419,7 +419,7 @@ fish also supports ``and``, ``or``, and ``not``. The first two are job modifiers
     <outp>Backup failed</outp>
 
 
-As mentioned in <a href="#tut_semicolon">the section on the semicolon</a>, this can also be written in multiple lines, like so::
+As mentioned in `the section on the semicolon <#tut_semicolon>`__, this can also be written in multiple lines, like so::
 
     cp file1.txt file1_bak.txt && cp file2.txt file2_bak.txt
     and echo "Backup successful"
@@ -464,7 +464,7 @@ To compare strings or numbers or check file properties (whether a file exists or
     end
 
 
-<a href="#tut_combiners">Combiners</a> can also be used to make more complex conditions, like
+`Combiners <#tut_combiners>`__ can also be used to make more complex conditions, like
 
 
 

From 64ff3492a7a699018aa610f70a392d3fa46c5a95 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Mar 2019 21:13:32 +0100
Subject: [PATCH 0209/1732] srht: Remove NetBSD build

This isn't officially supported (yet?), and it's currently broken.

It doesn't include ssl certificates,
and I can't see a way to add them or disable verification before it attempts to clone the git repo.

Ironically:

[ci skip]
---
 .builds/netbsd.yml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .builds/netbsd.yml

diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml
deleted file mode 100644
index 5756e2745..000000000
--- a/.builds/netbsd.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-image: netbsd/latest
-packages:
-  - ncurses
-  - gettext
-  - tcl-expect
-  - cmake
-  - gmake
-  - pcre2
-tasks:
-  - build: |
-          git -c http.sslVerify=false clone  https://git.sr.ht/~faho/fish
-          cd fish
-          mkdir build || :
-          cd build
-          cmake .. \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_INSTALL_DATADIR=share \
-          -DCMAKE_INSTALL_DOCDIR=share/doc/fish \
-          -DCMAKE_INSTALL_SYSCONFDIR=/etc
-          gmake -j2
-  - test: |
-          cd fish/build
-          gmake test SHOW_INTERACTIVE_LOG=1

From 90958f24020e86b2e9eddd8b7900fcf34f6bbd9c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Mar 2019 21:25:27 +0100
Subject: [PATCH 0210/1732] CHANGELOG $PATH reordering

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 508e1bdc4..8a2a7f789 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - fish no longer requires buffering for the last function in a pipeline.
 - cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
+- $PATH is no longer reordered in child fishes (#5456).
 
 ### Syntax changes and new commands
 - None yet.

From c6936878120d56ac8a8b4dfc7f7201df9b428d8c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 10:55:17 +0200
Subject: [PATCH 0211/1732] docs: Add missing >

"Anonymous hyperlink" strikes again!

[ci skip]
---
 sphinx_doc_src/cmds/break.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/break.rst b/sphinx_doc_src/cmds/break.rst
index ea921ac90..3af73d731 100644
--- a/sphinx_doc_src/cmds/break.rst
+++ b/sphinx_doc_src/cmds/break.rst
@@ -10,7 +10,7 @@ LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 Description
 -----------
 
-``break`` halts a currently running loop, such as a `switch <cmds/switch.html>`__, `for <cmds/for.html>`__ or `while <cmds/while.html>`__ loop. It is usually added inside of a conditional block such as an `if <cmds/if.html`__ block.
+``break`` halts a currently running loop, such as a `switch <cmds/switch.html>`__, `for <cmds/for.html>`__ or `while <cmds/while.html>`__ loop. It is usually added inside of a conditional block such as an `if <cmds/if.html>`__ block.
 
 There are no parameters for ``break``.
 

From cf9b8fa3fa2a51627a4166534a0e34ce61207ddd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:05:09 +0200
Subject: [PATCH 0212/1732] docs: Add labels to all commands

This allows us to use :ref: references, which don't require hardcoding
it as html

[ci skip]
---
 sphinx_doc_src/cmds/abbr.rst                    |  2 ++
 sphinx_doc_src/cmds/alias.rst                   |  2 ++
 sphinx_doc_src/cmds/and.rst                     |  2 ++
 sphinx_doc_src/cmds/argparse.rst                |  2 ++
 sphinx_doc_src/cmds/begin.rst                   |  2 ++
 sphinx_doc_src/cmds/bg.rst                      |  2 ++
 sphinx_doc_src/cmds/bind.rst                    |  2 ++
 sphinx_doc_src/cmds/block.rst                   |  2 ++
 sphinx_doc_src/cmds/break.rst                   |  2 ++
 sphinx_doc_src/cmds/breakpoint.rst              |  2 ++
 sphinx_doc_src/cmds/builtin.rst                 |  2 ++
 sphinx_doc_src/cmds/case.rst                    |  2 ++
 sphinx_doc_src/cmds/cd.rst                      |  2 ++
 sphinx_doc_src/cmds/cdh.rst                     |  2 ++
 sphinx_doc_src/cmds/command.rst                 |  2 ++
 sphinx_doc_src/cmds/commandline.rst             |  2 ++
 sphinx_doc_src/cmds/complete.rst                |  2 ++
 sphinx_doc_src/cmds/contains.rst                |  2 ++
 sphinx_doc_src/cmds/continue.rst                |  2 ++
 sphinx_doc_src/cmds/count.rst                   |  2 ++
 sphinx_doc_src/cmds/dirh.rst                    |  2 ++
 sphinx_doc_src/cmds/dirs.rst                    |  2 ++
 sphinx_doc_src/cmds/disown.rst                  |  2 ++
 sphinx_doc_src/cmds/echo.rst                    |  2 ++
 sphinx_doc_src/cmds/else.rst                    |  2 ++
 sphinx_doc_src/cmds/emit.rst                    |  2 ++
 sphinx_doc_src/cmds/end.rst                     |  2 ++
 sphinx_doc_src/cmds/eval.rst                    |  2 ++
 sphinx_doc_src/cmds/exec.rst                    |  2 ++
 sphinx_doc_src/cmds/exit.rst                    |  2 ++
 sphinx_doc_src/cmds/false.rst                   |  2 ++
 sphinx_doc_src/cmds/fg.rst                      |  2 ++
 sphinx_doc_src/cmds/fish.rst                    |  2 ++
 sphinx_doc_src/cmds/fish_breakpoint_prompt.rst  |  2 ++
 sphinx_doc_src/cmds/fish_config.rst             |  2 ++
 sphinx_doc_src/cmds/fish_git_prompt.rst         |  2 ++
 sphinx_doc_src/cmds/fish_hg_prompt.rst          |  2 ++
 sphinx_doc_src/cmds/fish_indent.rst             |  2 ++
 sphinx_doc_src/cmds/fish_key_reader.rst         |  2 ++
 sphinx_doc_src/cmds/fish_mode_prompt.rst        |  2 ++
 sphinx_doc_src/cmds/fish_opt.rst                |  2 ++
 sphinx_doc_src/cmds/fish_prompt.rst             |  2 ++
 sphinx_doc_src/cmds/fish_right_prompt.rst       |  2 ++
 sphinx_doc_src/cmds/fish_svn_prompt.rst         |  2 ++
 sphinx_doc_src/cmds/fish_update_completions.rst |  2 ++
 sphinx_doc_src/cmds/fish_vcs_prompt.rst         |  2 ++
 sphinx_doc_src/cmds/fish_vi_mode.rst            |  2 ++
 sphinx_doc_src/cmds/for.rst                     |  2 ++
 sphinx_doc_src/cmds/funced.rst                  |  2 ++
 sphinx_doc_src/cmds/funcsave.rst                |  2 ++
 sphinx_doc_src/cmds/function.rst                |  2 ++
 sphinx_doc_src/cmds/functions.rst               |  2 ++
 sphinx_doc_src/cmds/help.rst                    |  2 ++
 sphinx_doc_src/cmds/history.rst                 |  2 ++
 sphinx_doc_src/cmds/if.rst                      |  2 ++
 sphinx_doc_src/cmds/isatty.rst                  |  2 ++
 sphinx_doc_src/cmds/jobs.rst                    |  2 ++
 sphinx_doc_src/cmds/math.rst                    |  2 ++
 sphinx_doc_src/cmds/nextd.rst                   |  2 ++
 sphinx_doc_src/cmds/not.rst                     |  2 ++
 sphinx_doc_src/cmds/open.rst                    |  2 ++
 sphinx_doc_src/cmds/or.rst                      |  2 ++
 sphinx_doc_src/cmds/popd.rst                    |  2 ++
 sphinx_doc_src/cmds/prevd.rst                   |  2 ++
 sphinx_doc_src/cmds/printf.rst                  |  2 ++
 sphinx_doc_src/cmds/prompt_pwd.rst              |  2 ++
 sphinx_doc_src/cmds/psub.rst                    |  2 ++
 sphinx_doc_src/cmds/pushd.rst                   |  2 ++
 sphinx_doc_src/cmds/pwd.rst                     |  2 ++
 sphinx_doc_src/cmds/random.rst                  |  2 ++
 sphinx_doc_src/cmds/read.rst                    |  2 ++
 sphinx_doc_src/cmds/realpath.rst                |  2 ++
 sphinx_doc_src/cmds/return.rst                  |  2 ++
 sphinx_doc_src/cmds/set.rst                     |  2 ++
 sphinx_doc_src/cmds/set_color.rst               |  2 ++
 sphinx_doc_src/cmds/source.rst                  |  2 ++
 sphinx_doc_src/cmds/status.rst                  |  2 ++
 sphinx_doc_src/cmds/string.rst                  |  2 ++
 sphinx_doc_src/cmds/suspend.rst                 |  2 ++
 sphinx_doc_src/cmds/switch.rst                  |  2 ++
 sphinx_doc_src/cmds/test.rst                    |  2 ++
 sphinx_doc_src/cmds/trap.rst                    |  2 ++
 sphinx_doc_src/cmds/true.rst                    |  2 ++
 sphinx_doc_src/cmds/type.rst                    |  2 ++
 sphinx_doc_src/cmds/ulimit.rst                  |  2 ++
 sphinx_doc_src/cmds/umask.rst                   |  2 ++
 sphinx_doc_src/cmds/vared.rst                   |  2 ++
 sphinx_doc_src/cmds/wait.rst                    |  2 ++
 sphinx_doc_src/cmds/while.rst                   |  2 ++
 sphinx_doc_src/conf.py                          | 17 +++++++++--------
 90 files changed, 187 insertions(+), 8 deletions(-)

diff --git a/sphinx_doc_src/cmds/abbr.rst b/sphinx_doc_src/cmds/abbr.rst
index 6b30925d2..638ad7b93 100644
--- a/sphinx_doc_src/cmds/abbr.rst
+++ b/sphinx_doc_src/cmds/abbr.rst
@@ -1,3 +1,5 @@
+.. _cmd-abbr:
+
 abbr - manage fish abbreviations
 ================================
 
diff --git a/sphinx_doc_src/cmds/alias.rst b/sphinx_doc_src/cmds/alias.rst
index ff1e87757..3fd043ed7 100644
--- a/sphinx_doc_src/cmds/alias.rst
+++ b/sphinx_doc_src/cmds/alias.rst
@@ -1,3 +1,5 @@
+.. _cmd-alias:
+
 alias - create a function
 =========================
 
diff --git a/sphinx_doc_src/cmds/and.rst b/sphinx_doc_src/cmds/and.rst
index 1b80978ad..4a6b211e3 100644
--- a/sphinx_doc_src/cmds/and.rst
+++ b/sphinx_doc_src/cmds/and.rst
@@ -1,3 +1,5 @@
+.. _cmd-and:
+
 and - conditionally execute a command
 =====================================
 
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index d00afa6a7..05a773336 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -1,3 +1,5 @@
+.. _cmd-argparse:
+
 argparse - parse options passed to a fish script or function
 ============================================================
 
diff --git a/sphinx_doc_src/cmds/begin.rst b/sphinx_doc_src/cmds/begin.rst
index 101d7e89b..b903b7408 100644
--- a/sphinx_doc_src/cmds/begin.rst
+++ b/sphinx_doc_src/cmds/begin.rst
@@ -1,3 +1,5 @@
+.. _cmd-begin:
+
 begin - start a new block of code
 =================================
 
diff --git a/sphinx_doc_src/cmds/bg.rst b/sphinx_doc_src/cmds/bg.rst
index fd4aead37..2c5da16fe 100644
--- a/sphinx_doc_src/cmds/bg.rst
+++ b/sphinx_doc_src/cmds/bg.rst
@@ -1,3 +1,5 @@
+.. _cmd-bg:
+
 bg - send jobs to background
 ============================
 
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index ff270cd83..e6a7b0656 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -1,3 +1,5 @@
+.. _cmd-bind:
+
 bind - handle fish key bindings
 ===============================
 
diff --git a/sphinx_doc_src/cmds/block.rst b/sphinx_doc_src/cmds/block.rst
index e825b6b32..61dee85df 100644
--- a/sphinx_doc_src/cmds/block.rst
+++ b/sphinx_doc_src/cmds/block.rst
@@ -1,3 +1,5 @@
+.. _cmd-block:
+
 block - temporarily block delivery of events
 ============================================
 
diff --git a/sphinx_doc_src/cmds/break.rst b/sphinx_doc_src/cmds/break.rst
index 3af73d731..2de9dc959 100644
--- a/sphinx_doc_src/cmds/break.rst
+++ b/sphinx_doc_src/cmds/break.rst
@@ -1,3 +1,5 @@
+.. _cmd-break:
+
 break - stop the current inner loop
 ===================================
 
diff --git a/sphinx_doc_src/cmds/breakpoint.rst b/sphinx_doc_src/cmds/breakpoint.rst
index e1bca933e..c51d2fa1c 100644
--- a/sphinx_doc_src/cmds/breakpoint.rst
+++ b/sphinx_doc_src/cmds/breakpoint.rst
@@ -1,3 +1,5 @@
+.. _cmd-breakpoint:
+
 breakpoint - Launch debug mode
 ==============================
 
diff --git a/sphinx_doc_src/cmds/builtin.rst b/sphinx_doc_src/cmds/builtin.rst
index ff6643724..8649961cb 100644
--- a/sphinx_doc_src/cmds/builtin.rst
+++ b/sphinx_doc_src/cmds/builtin.rst
@@ -1,3 +1,5 @@
+.. _cmd-builtin:
+
 builtin - run a builtin command
 ===============================
 
diff --git a/sphinx_doc_src/cmds/case.rst b/sphinx_doc_src/cmds/case.rst
index 2568f4fd0..a5f0c85ae 100644
--- a/sphinx_doc_src/cmds/case.rst
+++ b/sphinx_doc_src/cmds/case.rst
@@ -1,3 +1,5 @@
+.. _cmd-case:
+
 case - conditionally execute a block of commands
 ================================================
 
diff --git a/sphinx_doc_src/cmds/cd.rst b/sphinx_doc_src/cmds/cd.rst
index 5090449e1..8984d1794 100644
--- a/sphinx_doc_src/cmds/cd.rst
+++ b/sphinx_doc_src/cmds/cd.rst
@@ -1,3 +1,5 @@
+.. _cmd-cd:
+
 cd - change directory
 =====================
 
diff --git a/sphinx_doc_src/cmds/cdh.rst b/sphinx_doc_src/cmds/cdh.rst
index d013107f1..90ad1df5a 100644
--- a/sphinx_doc_src/cmds/cdh.rst
+++ b/sphinx_doc_src/cmds/cdh.rst
@@ -1,3 +1,5 @@
+.. _cmd-cdh:
+
 cdh - change to a recently visited directory
 ============================================
 
diff --git a/sphinx_doc_src/cmds/command.rst b/sphinx_doc_src/cmds/command.rst
index 8fc7c5dc5..69e25c8dd 100644
--- a/sphinx_doc_src/cmds/command.rst
+++ b/sphinx_doc_src/cmds/command.rst
@@ -1,3 +1,5 @@
+.. _cmd-command:
+
 command - run a program
 =======================
 
diff --git a/sphinx_doc_src/cmds/commandline.rst b/sphinx_doc_src/cmds/commandline.rst
index 7782c02d2..67e35cb7d 100644
--- a/sphinx_doc_src/cmds/commandline.rst
+++ b/sphinx_doc_src/cmds/commandline.rst
@@ -1,3 +1,5 @@
+.. _cmd-commandline:
+
 commandline - set or get the current command line buffer
 ========================================================
 
diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index d1e3f1cec..0f7bdeaa4 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -1,3 +1,5 @@
+.. _cmd-complete:
+
 complete - edit command specific tab-completions
 ================================================
 
diff --git a/sphinx_doc_src/cmds/contains.rst b/sphinx_doc_src/cmds/contains.rst
index 081e15fd3..32b0354f4 100644
--- a/sphinx_doc_src/cmds/contains.rst
+++ b/sphinx_doc_src/cmds/contains.rst
@@ -1,3 +1,5 @@
+.. _cmd-contains:
+
 contains - test if a word is present in a list
 ==============================================
 
diff --git a/sphinx_doc_src/cmds/continue.rst b/sphinx_doc_src/cmds/continue.rst
index b5cac1b57..d31c9e545 100644
--- a/sphinx_doc_src/cmds/continue.rst
+++ b/sphinx_doc_src/cmds/continue.rst
@@ -1,3 +1,5 @@
+.. _cmd-continue:
+
 continue - skip the remainder of the current iteration of the current inner loop
 ================================================================================
 
diff --git a/sphinx_doc_src/cmds/count.rst b/sphinx_doc_src/cmds/count.rst
index 981acc915..566c140b0 100644
--- a/sphinx_doc_src/cmds/count.rst
+++ b/sphinx_doc_src/cmds/count.rst
@@ -1,3 +1,5 @@
+.. _cmd-count:
+
 count - count the number of elements of an array
 ================================================
 
diff --git a/sphinx_doc_src/cmds/dirh.rst b/sphinx_doc_src/cmds/dirh.rst
index 2b9749521..7dd874b7b 100644
--- a/sphinx_doc_src/cmds/dirh.rst
+++ b/sphinx_doc_src/cmds/dirh.rst
@@ -1,3 +1,5 @@
+.. _cmd-dirh:
+
 dirh - print directory history
 ==============================
 
diff --git a/sphinx_doc_src/cmds/dirs.rst b/sphinx_doc_src/cmds/dirs.rst
index d888489e4..f5f9440dc 100644
--- a/sphinx_doc_src/cmds/dirs.rst
+++ b/sphinx_doc_src/cmds/dirs.rst
@@ -1,3 +1,5 @@
+.. _cmd-dirs:
+
 dirs - print directory stack
 ============================
 
diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index 58d8d9ad3..f423b4563 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -1,3 +1,5 @@
+.. _cmd-disown:
+
 disown - remove a process from the list of jobs
 ===============================================
 
diff --git a/sphinx_doc_src/cmds/echo.rst b/sphinx_doc_src/cmds/echo.rst
index 065023e3c..003761187 100644
--- a/sphinx_doc_src/cmds/echo.rst
+++ b/sphinx_doc_src/cmds/echo.rst
@@ -1,3 +1,5 @@
+.. _cmd-echo:
+
 echo - display a line of text
 =============================
 
diff --git a/sphinx_doc_src/cmds/else.rst b/sphinx_doc_src/cmds/else.rst
index 71523a694..bfda1527e 100644
--- a/sphinx_doc_src/cmds/else.rst
+++ b/sphinx_doc_src/cmds/else.rst
@@ -1,3 +1,5 @@
+.. _cmd-else:
+
 else - execute command if a condition is not met
 ================================================
 
diff --git a/sphinx_doc_src/cmds/emit.rst b/sphinx_doc_src/cmds/emit.rst
index 1a5cbc386..85dbc2a5e 100644
--- a/sphinx_doc_src/cmds/emit.rst
+++ b/sphinx_doc_src/cmds/emit.rst
@@ -1,3 +1,5 @@
+.. _cmd-emit:
+
 emit - Emit a generic event
 ===========================
 
diff --git a/sphinx_doc_src/cmds/end.rst b/sphinx_doc_src/cmds/end.rst
index e1e7b2182..9da25489f 100644
--- a/sphinx_doc_src/cmds/end.rst
+++ b/sphinx_doc_src/cmds/end.rst
@@ -1,3 +1,5 @@
+.. _cmd-end:
+
 end - end a block of commands.
 ==============================
 
diff --git a/sphinx_doc_src/cmds/eval.rst b/sphinx_doc_src/cmds/eval.rst
index f34dbd767..e3d7d8e5e 100644
--- a/sphinx_doc_src/cmds/eval.rst
+++ b/sphinx_doc_src/cmds/eval.rst
@@ -1,3 +1,5 @@
+.. _cmd-eval:
+
 eval - evaluate the specified commands
 ======================================
 
diff --git a/sphinx_doc_src/cmds/exec.rst b/sphinx_doc_src/cmds/exec.rst
index 8acc7d6be..7ad7b422d 100644
--- a/sphinx_doc_src/cmds/exec.rst
+++ b/sphinx_doc_src/cmds/exec.rst
@@ -1,3 +1,5 @@
+.. _cmd-exec:
+
 exec - execute command in current process
 =========================================
 
diff --git a/sphinx_doc_src/cmds/exit.rst b/sphinx_doc_src/cmds/exit.rst
index 2f3f75594..e5155c76d 100644
--- a/sphinx_doc_src/cmds/exit.rst
+++ b/sphinx_doc_src/cmds/exit.rst
@@ -1,3 +1,5 @@
+.. _cmd-exit:
+
 exit - exit the shell
 =====================
 
diff --git a/sphinx_doc_src/cmds/false.rst b/sphinx_doc_src/cmds/false.rst
index d972f5864..67fd17a22 100644
--- a/sphinx_doc_src/cmds/false.rst
+++ b/sphinx_doc_src/cmds/false.rst
@@ -1,3 +1,5 @@
+.. _cmd-false:
+
 false - return an unsuccessful result
 =====================================
 
diff --git a/sphinx_doc_src/cmds/fg.rst b/sphinx_doc_src/cmds/fg.rst
index f5c8a7d73..88a7b1aca 100644
--- a/sphinx_doc_src/cmds/fg.rst
+++ b/sphinx_doc_src/cmds/fg.rst
@@ -1,3 +1,5 @@
+.. _cmd-fg:
+
 fg - bring job to foreground
 ============================
 
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index b3b8a090b..572ed360f 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish:
+
 fish - the friendly interactive shell
 =====================================
 
diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
index 51cfc020c..1c2722e63 100644
--- a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_breakpoint_prompt:
+
 fish_breakpoint_prompt - define the prompt when stopped at a breakpoint
 =======================================================================
 
diff --git a/sphinx_doc_src/cmds/fish_config.rst b/sphinx_doc_src/cmds/fish_config.rst
index 386797299..7b2c57b76 100644
--- a/sphinx_doc_src/cmds/fish_config.rst
+++ b/sphinx_doc_src/cmds/fish_config.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_config:
+
 fish_config - start the web-based configuration interface
 =========================================================
 
diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 221feefa8..9a589aa1b 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_git_prompt:
+
 fish_git_prompt - output git information for use in a prompt
 ============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_hg_prompt.rst b/sphinx_doc_src/cmds/fish_hg_prompt.rst
index 5c8a1a0cb..f0d1d0caa 100644
--- a/sphinx_doc_src/cmds/fish_hg_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_hg_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_hg_prompt:
+
 fish_hg_prompt - output mercurial information for use in a prompt
 =================================================================
 
diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/sphinx_doc_src/cmds/fish_indent.rst
index 56dd7e798..081265f87 100644
--- a/sphinx_doc_src/cmds/fish_indent.rst
+++ b/sphinx_doc_src/cmds/fish_indent.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_indent:
+
 fish_indent - indenter and prettifier
 =====================================
 
diff --git a/sphinx_doc_src/cmds/fish_key_reader.rst b/sphinx_doc_src/cmds/fish_key_reader.rst
index ea8f4d4c3..265aa6ab3 100644
--- a/sphinx_doc_src/cmds/fish_key_reader.rst
+++ b/sphinx_doc_src/cmds/fish_key_reader.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_key_reader:
+
 fish_key_reader - explore what characters keyboard keys send
 ============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_mode_prompt.rst b/sphinx_doc_src/cmds/fish_mode_prompt.rst
index 88e1cb2e7..83588ec04 100644
--- a/sphinx_doc_src/cmds/fish_mode_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_mode_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_mode_prompt:
+
 fish_mode_prompt - define the appearance of the mode indicator
 ==============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_opt.rst b/sphinx_doc_src/cmds/fish_opt.rst
index dc8639978..35d3222a8 100644
--- a/sphinx_doc_src/cmds/fish_opt.rst
+++ b/sphinx_doc_src/cmds/fish_opt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_opt:
+
 fish_opt - create an option spec for the argparse command
 =========================================================
 
diff --git a/sphinx_doc_src/cmds/fish_prompt.rst b/sphinx_doc_src/cmds/fish_prompt.rst
index f89edadcd..f11c6036d 100644
--- a/sphinx_doc_src/cmds/fish_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_prompt:
+
 fish_prompt - define the appearance of the command line prompt
 ==============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_right_prompt.rst b/sphinx_doc_src/cmds/fish_right_prompt.rst
index 55237d703..c2c66b8a2 100644
--- a/sphinx_doc_src/cmds/fish_right_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_right_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_right_prompt:
+
 fish_right_prompt - define the appearance of the right-side command line prompt
 ===============================================================================
 
diff --git a/sphinx_doc_src/cmds/fish_svn_prompt.rst b/sphinx_doc_src/cmds/fish_svn_prompt.rst
index 5770585f8..f3d450590 100644
--- a/sphinx_doc_src/cmds/fish_svn_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_svn_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_svn_prompt:
+
 fish_svn_prompt - output svn information for use in a prompt
 ============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_update_completions.rst b/sphinx_doc_src/cmds/fish_update_completions.rst
index b269d56bf..b3f75b585 100644
--- a/sphinx_doc_src/cmds/fish_update_completions.rst
+++ b/sphinx_doc_src/cmds/fish_update_completions.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_update_completions:
+
 fish_update_completions - Update completions using manual pages
 ===============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_vcs_prompt.rst b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
index 92a7d72ab..8ab93d32f 100644
--- a/sphinx_doc_src/cmds/fish_vcs_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_vcs_prompt:
+
 fish_vcs_prompt - output vcs information for use in a prompt
 ============================================================
 
diff --git a/sphinx_doc_src/cmds/fish_vi_mode.rst b/sphinx_doc_src/cmds/fish_vi_mode.rst
index 590538b3b..61d8bb713 100644
--- a/sphinx_doc_src/cmds/fish_vi_mode.rst
+++ b/sphinx_doc_src/cmds/fish_vi_mode.rst
@@ -1,3 +1,5 @@
+.. _cmd-fish_vi_mode:
+
 fish_vi_mode - Enable vi mode
 =============================
 
diff --git a/sphinx_doc_src/cmds/for.rst b/sphinx_doc_src/cmds/for.rst
index cfb02bf01..4c06c5912 100644
--- a/sphinx_doc_src/cmds/for.rst
+++ b/sphinx_doc_src/cmds/for.rst
@@ -1,3 +1,5 @@
+.. _cmd-for:
+
 for - perform a set of commands multiple times.
 ===============================================
 
diff --git a/sphinx_doc_src/cmds/funced.rst b/sphinx_doc_src/cmds/funced.rst
index 2f33c6906..df205b015 100644
--- a/sphinx_doc_src/cmds/funced.rst
+++ b/sphinx_doc_src/cmds/funced.rst
@@ -1,3 +1,5 @@
+.. _cmd-funced:
+
 funced - edit a function interactively
 ======================================
 
diff --git a/sphinx_doc_src/cmds/funcsave.rst b/sphinx_doc_src/cmds/funcsave.rst
index fad1550b6..a93f23814 100644
--- a/sphinx_doc_src/cmds/funcsave.rst
+++ b/sphinx_doc_src/cmds/funcsave.rst
@@ -1,3 +1,5 @@
+.. _cmd-funcsave:
+
 funcsave - save the definition of a function to the user's autoload directory
 =============================================================================
 
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index 093f46ee0..d95e2b357 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -1,3 +1,5 @@
+.. _cmd-function:
+
 function - create a function
 ============================
 
diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index abb1d4398..44bad3035 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -1,3 +1,5 @@
+.. _cmd-functions:
+
 functions - print or erase functions
 ====================================
 
diff --git a/sphinx_doc_src/cmds/help.rst b/sphinx_doc_src/cmds/help.rst
index 314f3c0fc..24ea5b75d 100644
--- a/sphinx_doc_src/cmds/help.rst
+++ b/sphinx_doc_src/cmds/help.rst
@@ -1,3 +1,5 @@
+.. _cmd-help:
+
 help - display fish documentation
 =================================
 
diff --git a/sphinx_doc_src/cmds/history.rst b/sphinx_doc_src/cmds/history.rst
index 3056f262e..af239e7d1 100644
--- a/sphinx_doc_src/cmds/history.rst
+++ b/sphinx_doc_src/cmds/history.rst
@@ -1,3 +1,5 @@
+.. _cmd-history:
+
 history - Show and manipulate command history
 =============================================
 
diff --git a/sphinx_doc_src/cmds/if.rst b/sphinx_doc_src/cmds/if.rst
index ba90693ba..7e5c0fa4c 100644
--- a/sphinx_doc_src/cmds/if.rst
+++ b/sphinx_doc_src/cmds/if.rst
@@ -1,3 +1,5 @@
+.. _cmd-if:
+
 if - conditionally execute a command
 ====================================
 
diff --git a/sphinx_doc_src/cmds/isatty.rst b/sphinx_doc_src/cmds/isatty.rst
index 744003049..1d4711c36 100644
--- a/sphinx_doc_src/cmds/isatty.rst
+++ b/sphinx_doc_src/cmds/isatty.rst
@@ -1,3 +1,5 @@
+.. _cmd-isatty:
+
 isatty - test if a file descriptor is a tty.
 ============================================
 
diff --git a/sphinx_doc_src/cmds/jobs.rst b/sphinx_doc_src/cmds/jobs.rst
index b2da7b6dc..1c0f435cc 100644
--- a/sphinx_doc_src/cmds/jobs.rst
+++ b/sphinx_doc_src/cmds/jobs.rst
@@ -1,3 +1,5 @@
+.. _cmd-jobs:
+
 jobs - print currently running jobs
 ===================================
 
diff --git a/sphinx_doc_src/cmds/math.rst b/sphinx_doc_src/cmds/math.rst
index 254055047..b5107ead5 100644
--- a/sphinx_doc_src/cmds/math.rst
+++ b/sphinx_doc_src/cmds/math.rst
@@ -1,3 +1,5 @@
+.. _cmd-math:
+
 math - Perform mathematics calculations
 =======================================
 
diff --git a/sphinx_doc_src/cmds/nextd.rst b/sphinx_doc_src/cmds/nextd.rst
index df8e10a05..4bb862b5b 100644
--- a/sphinx_doc_src/cmds/nextd.rst
+++ b/sphinx_doc_src/cmds/nextd.rst
@@ -1,3 +1,5 @@
+.. _cmd-nextd:
+
 nextd - move forward through directory history
 ==============================================
 
diff --git a/sphinx_doc_src/cmds/not.rst b/sphinx_doc_src/cmds/not.rst
index 524f69605..55931a70b 100644
--- a/sphinx_doc_src/cmds/not.rst
+++ b/sphinx_doc_src/cmds/not.rst
@@ -1,3 +1,5 @@
+.. _cmd-not:
+
 not - negate the exit status of a job
 =====================================
 
diff --git a/sphinx_doc_src/cmds/open.rst b/sphinx_doc_src/cmds/open.rst
index b4e5ac63d..092a9f57d 100644
--- a/sphinx_doc_src/cmds/open.rst
+++ b/sphinx_doc_src/cmds/open.rst
@@ -1,3 +1,5 @@
+.. _cmd-open:
+
 open - open file in its default application
 ===========================================
 
diff --git a/sphinx_doc_src/cmds/or.rst b/sphinx_doc_src/cmds/or.rst
index 258d22158..9d5436139 100644
--- a/sphinx_doc_src/cmds/or.rst
+++ b/sphinx_doc_src/cmds/or.rst
@@ -1,3 +1,5 @@
+.. _cmd-or:
+
 or - conditionally execute a command
 ====================================
 
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 945912777..772dbb690 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -1,3 +1,5 @@
+.. _cmd-popd:
+
 popd - move through directory stack
 ===================================
 
diff --git a/sphinx_doc_src/cmds/prevd.rst b/sphinx_doc_src/cmds/prevd.rst
index 10a749803..b96338c51 100644
--- a/sphinx_doc_src/cmds/prevd.rst
+++ b/sphinx_doc_src/cmds/prevd.rst
@@ -1,3 +1,5 @@
+.. _cmd-prevd:
+
 prevd - move backward through directory history
 ===============================================
 
diff --git a/sphinx_doc_src/cmds/printf.rst b/sphinx_doc_src/cmds/printf.rst
index 6c1717be0..10a4b4821 100644
--- a/sphinx_doc_src/cmds/printf.rst
+++ b/sphinx_doc_src/cmds/printf.rst
@@ -1,3 +1,5 @@
+.. _cmd-printf:
+
 printf - display text according to a format string
 ==================================================
 
diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/sphinx_doc_src/cmds/prompt_pwd.rst
index 3d9ac5b37..5af850c94 100644
--- a/sphinx_doc_src/cmds/prompt_pwd.rst
+++ b/sphinx_doc_src/cmds/prompt_pwd.rst
@@ -1,3 +1,5 @@
+.. _cmd-prompt_pwd:
+
 prompt_pwd - Print pwd suitable for prompt
 ==========================================
 
diff --git a/sphinx_doc_src/cmds/psub.rst b/sphinx_doc_src/cmds/psub.rst
index f61a183f2..d63edb3d0 100644
--- a/sphinx_doc_src/cmds/psub.rst
+++ b/sphinx_doc_src/cmds/psub.rst
@@ -1,3 +1,5 @@
+.. _cmd-psub:
+
 psub - perform process substitution
 ===================================
 
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index a524ac93f..82cc1a0bc 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -1,3 +1,5 @@
+.. _cmd-pushd:
+
 pushd - push directory to directory stack
 =========================================
 
diff --git a/sphinx_doc_src/cmds/pwd.rst b/sphinx_doc_src/cmds/pwd.rst
index 0521514a5..1cf815a0f 100644
--- a/sphinx_doc_src/cmds/pwd.rst
+++ b/sphinx_doc_src/cmds/pwd.rst
@@ -1,3 +1,5 @@
+.. _cmd-pwd:
+
 pwd - output the current working directory
 ==========================================
 
diff --git a/sphinx_doc_src/cmds/random.rst b/sphinx_doc_src/cmds/random.rst
index 9b5a19ab2..916aae5d0 100644
--- a/sphinx_doc_src/cmds/random.rst
+++ b/sphinx_doc_src/cmds/random.rst
@@ -1,3 +1,5 @@
+.. _cmd-random:
+
 random - generate random number
 ===============================
 
diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index a420b5382..0aca5e884 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -1,3 +1,5 @@
+.. _cmd-read:
+
 read - read line of input into variables
 ========================================
 
diff --git a/sphinx_doc_src/cmds/realpath.rst b/sphinx_doc_src/cmds/realpath.rst
index 859c6458b..2fee264de 100644
--- a/sphinx_doc_src/cmds/realpath.rst
+++ b/sphinx_doc_src/cmds/realpath.rst
@@ -1,3 +1,5 @@
+.. _cmd-realpath:
+
 realpath - Convert a path to an absolute path without symlinks
 ==============================================================
 
diff --git a/sphinx_doc_src/cmds/return.rst b/sphinx_doc_src/cmds/return.rst
index 6de7c1dd7..3ad6cc315 100644
--- a/sphinx_doc_src/cmds/return.rst
+++ b/sphinx_doc_src/cmds/return.rst
@@ -1,3 +1,5 @@
+.. _cmd-return:
+
 return - stop the current inner function
 ========================================
 
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index dd588c1f8..4e4c2845c 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -1,3 +1,5 @@
+.. _cmd-set:
+
 set - display and change shell variables.
 =========================================
 
diff --git a/sphinx_doc_src/cmds/set_color.rst b/sphinx_doc_src/cmds/set_color.rst
index e616fb58e..b9dc44761 100644
--- a/sphinx_doc_src/cmds/set_color.rst
+++ b/sphinx_doc_src/cmds/set_color.rst
@@ -1,3 +1,5 @@
+.. _cmd-set_color:
+
 set_color - set the terminal color
 ==================================
 
diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 21fd13b2b..2d07e24ce 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -1,3 +1,5 @@
+.. _cmd-source:
+
 source - evaluate contents of file.
 ===================================
 
diff --git a/sphinx_doc_src/cmds/status.rst b/sphinx_doc_src/cmds/status.rst
index 397933939..c058e5986 100644
--- a/sphinx_doc_src/cmds/status.rst
+++ b/sphinx_doc_src/cmds/status.rst
@@ -1,3 +1,5 @@
+.. _cmd-status:
+
 status - query fish runtime information
 =======================================
 
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 4009588e3..b7fa6752c 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -1,3 +1,5 @@
+.. _cmd-string:
+
 string - manipulate strings
 ===========================
 
diff --git a/sphinx_doc_src/cmds/suspend.rst b/sphinx_doc_src/cmds/suspend.rst
index 7e1b92129..5c8c69a47 100644
--- a/sphinx_doc_src/cmds/suspend.rst
+++ b/sphinx_doc_src/cmds/suspend.rst
@@ -1,3 +1,5 @@
+.. _cmd-suspend:
+
 suspend - suspend the current shell
 ===================================
 
diff --git a/sphinx_doc_src/cmds/switch.rst b/sphinx_doc_src/cmds/switch.rst
index d0a106b2f..3613d68e8 100644
--- a/sphinx_doc_src/cmds/switch.rst
+++ b/sphinx_doc_src/cmds/switch.rst
@@ -1,3 +1,5 @@
+.. _cmd-switch:
+
 switch - conditionally execute a block of commands
 ==================================================
 
diff --git a/sphinx_doc_src/cmds/test.rst b/sphinx_doc_src/cmds/test.rst
index 834415e32..0c8914398 100644
--- a/sphinx_doc_src/cmds/test.rst
+++ b/sphinx_doc_src/cmds/test.rst
@@ -1,3 +1,5 @@
+.. _cmd-test:
+
 test - perform tests on files and text
 ======================================
 
diff --git a/sphinx_doc_src/cmds/trap.rst b/sphinx_doc_src/cmds/trap.rst
index 318fbd1b4..dbe8ce890 100644
--- a/sphinx_doc_src/cmds/trap.rst
+++ b/sphinx_doc_src/cmds/trap.rst
@@ -1,3 +1,5 @@
+.. _cmd-trap:
+
 trap - perform an action when the shell receives a signal
 =========================================================
 
diff --git a/sphinx_doc_src/cmds/true.rst b/sphinx_doc_src/cmds/true.rst
index c8607d6ff..c6aa4d889 100644
--- a/sphinx_doc_src/cmds/true.rst
+++ b/sphinx_doc_src/cmds/true.rst
@@ -1,3 +1,5 @@
+.. _cmd-true:
+
 true - return a successful result
 =================================
 
diff --git a/sphinx_doc_src/cmds/type.rst b/sphinx_doc_src/cmds/type.rst
index 5f2347084..31e5ccf70 100644
--- a/sphinx_doc_src/cmds/type.rst
+++ b/sphinx_doc_src/cmds/type.rst
@@ -1,3 +1,5 @@
+.. _cmd-type:
+
 type - indicate how a command would be interpreted
 ==================================================
 
diff --git a/sphinx_doc_src/cmds/ulimit.rst b/sphinx_doc_src/cmds/ulimit.rst
index 846e06993..ce03ba10e 100644
--- a/sphinx_doc_src/cmds/ulimit.rst
+++ b/sphinx_doc_src/cmds/ulimit.rst
@@ -1,3 +1,5 @@
+.. _cmd-ulimit:
+
 ulimit - set or get resource usage limits
 =========================================
 
diff --git a/sphinx_doc_src/cmds/umask.rst b/sphinx_doc_src/cmds/umask.rst
index ff18bfac2..bafbca7aa 100644
--- a/sphinx_doc_src/cmds/umask.rst
+++ b/sphinx_doc_src/cmds/umask.rst
@@ -1,3 +1,5 @@
+.. _cmd-umask:
+
 umask - set or get the file creation mode mask
 ==============================================
 
diff --git a/sphinx_doc_src/cmds/vared.rst b/sphinx_doc_src/cmds/vared.rst
index 2fb29bf98..aec694ab6 100644
--- a/sphinx_doc_src/cmds/vared.rst
+++ b/sphinx_doc_src/cmds/vared.rst
@@ -1,3 +1,5 @@
+.. _cmd-vared:
+
 vared - interactively edit the value of an environment variable
 ===============================================================
 
diff --git a/sphinx_doc_src/cmds/wait.rst b/sphinx_doc_src/cmds/wait.rst
index 763d42191..6268d616b 100644
--- a/sphinx_doc_src/cmds/wait.rst
+++ b/sphinx_doc_src/cmds/wait.rst
@@ -1,3 +1,5 @@
+.. _cmd-wait:
+
 wait - wait for jobs to complete
 ================================
 
diff --git a/sphinx_doc_src/cmds/while.rst b/sphinx_doc_src/cmds/while.rst
index ccc022857..0bc41f9d8 100644
--- a/sphinx_doc_src/cmds/while.rst
+++ b/sphinx_doc_src/cmds/while.rst
@@ -1,3 +1,5 @@
+.. _cmd-while:
+
 while - perform a command multiple times
 ========================================
 
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 52a49debb..edf1b4a29 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -144,14 +144,15 @@ latex_documents = [
 
 # -- Options for manual page output ------------------------------------------
 
-def get_command_description(path):
-    """ Return the description for a command, by parsing its first line """
+def get_command_description(path, name):
+    """ Return the description for a command, by parsing its synopsis line """
     with open(path) as fd:
-        title = fd.readline()
-    if ' - ' not in title:
-        raise SphinxWarning('No description in file %s' % os.path.basename(path))
-    _, desc = title.split(' - ', 1)
-    return desc.strip()
+        for line in fd:
+            if line.startswith(name + " - "):
+                _, desc = line.split(' - ', 1)
+                return desc.strip()
+    raise SphinxWarning('No description in file %s' % os.path.basename(path))
+
 
 
 # One entry per manual page. List of tuples
@@ -163,7 +164,7 @@ man_pages = [
 for path in sorted(glob.glob('cmds/*')):
     docname = strip_ext(path)
     cmd = os.path.basename(docname)
-    man_pages.append((docname, cmd, get_command_description(path), '', 1))
+    man_pages.append((docname, cmd, get_command_description(path, cmd), '', 1))
 
 
 # -- Options for Texinfo output ----------------------------------------------

From cb94dd4d304f32938618d82ee33d68da85e29784 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:07:59 +0200
Subject: [PATCH 0213/1732] docs: Use command labels

[ci skip]
---
 sphinx_doc_src/cmds/alias.rst    |  4 ++--
 sphinx_doc_src/cmds/and.rst      |  2 +-
 sphinx_doc_src/cmds/argparse.rst |  4 ++--
 sphinx_doc_src/cmds/block.rst    |  2 +-
 sphinx_doc_src/cmds/break.rst    |  2 +-
 sphinx_doc_src/cmds/cd.rst       |  4 ++--
 sphinx_doc_src/cmds/exit.rst     |  2 +-
 sphinx_doc_src/cmds/fish_opt.rst |  2 +-
 sphinx_doc_src/cmds/function.rst |  4 ++--
 sphinx_doc_src/faq.rst           | 10 +++++-----
 sphinx_doc_src/tutorial.rst      |  4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sphinx_doc_src/cmds/alias.rst b/sphinx_doc_src/cmds/alias.rst
index 3fd043ed7..0ed7988e9 100644
--- a/sphinx_doc_src/cmds/alias.rst
+++ b/sphinx_doc_src/cmds/alias.rst
@@ -14,7 +14,7 @@ alias [OPTIONS] NAME=DEFINITION
 Description
 -----------
 
-``alias`` is a simple wrapper for the ``function`` builtin, which creates a function wrapping a command. It has similar syntax to POSIX shell ``alias``. For other uses, it is recommended to define a `function <cmds/function.html>`__.
+``alias`` is a simple wrapper for the ``function`` builtin, which creates a function wrapping a command. It has similar syntax to POSIX shell ``alias``. For other uses, it is recommended to define a :ref:`function <cmd-function>`.
 
 ``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``.
 
@@ -27,7 +27,7 @@ The following options are available:
 
 - ``-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 `funcsave <cmds/funcsave.html>`__.
+- ``-s`` or ``--save`` Automatically save the function created by the alias into your fish configuration directory using :ref:`funcsave <cmd-funcsave>`.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/and.rst b/sphinx_doc_src/cmds/and.rst
index 4a6b211e3..a0c1070f2 100644
--- a/sphinx_doc_src/cmds/and.rst
+++ b/sphinx_doc_src/cmds/and.rst
@@ -14,7 +14,7 @@ Description
 
 ``and`` is used to execute a command if the previous command was successful (returned a status of 0).
 
-``and`` statements may be used as part of the condition in an `while <cmds/while.html>`__ or `if <cmds/if.html>`__ block.
+``and`` statements may be used as part of the condition in an :ref:`while <cmd-while>` or :ref:`if <cmd-if>` block.
 
 ``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 `$status <index.html#variables-status>`__ variable.
 
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index 05a773336..e714a3150 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -14,7 +14,7 @@ Description
 
 This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the `usage <#argparse-usage>`__ section below.
 
-Each OPTION_SPEC can be written in the `domain specific language <#argparse-option-specs>`__ described below or created using the companion `fish_opt <cmds/fish-opt.html>`__ command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
+Each OPTION_SPEC can be written in the `domain specific language <#argparse-option-specs>`__ described below or created using the companion :ref:`fish_opt <cmd-fish_opt>` command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
 
 Each option that is seen in the ARG list will result in a var name of the form ``_flag_X``, where ``X`` is the short flag letter and the long flag name. The OPTION_SPEC always requires a short flag even if it can't be used. So there will always be ``_flag_X`` var set using the short flag letter if the corresponding short or long flag is seen. The long flag name var (e.g., ``_flag_help``) will only be defined, obviously, if the OPTION_SPEC includes a long flag name.
 
@@ -95,7 +95,7 @@ Each option specification is a string composed of
 
 - Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#arparse-validation>`__ for more information.
 
-See the `fish_opt <cmds/fish-opt.html>`__ command for a friendlier but more verbose way to create option specifications.
+See the :ref:`fish_opt <cmd-fish_opt>` command for a friendlier but more verbose way to create option specifications.
 
 In the following examples if a flag is not seen when parsing the arguments then the corresponding _flag_X var(s) will not be set.
 
diff --git a/sphinx_doc_src/cmds/block.rst b/sphinx_doc_src/cmds/block.rst
index 61dee85df..dc786dd9a 100644
--- a/sphinx_doc_src/cmds/block.rst
+++ b/sphinx_doc_src/cmds/block.rst
@@ -12,7 +12,7 @@ block [OPTIONS...]
 Description
 -----------
 
-``block`` prevents events triggered by ``fish`` or the `emit <cmds/emit.html>`__ command from being delivered and acted upon while the block is in place.
+``block`` prevents events triggered by ``fish`` or the :ref:`emit <cmd-emit>` command from being delivered and acted upon while the block is in place.
 
 In functions, ``block`` can be useful while performing work that should not be interrupted by the shell.
 
diff --git a/sphinx_doc_src/cmds/break.rst b/sphinx_doc_src/cmds/break.rst
index 2de9dc959..82bc2797d 100644
--- a/sphinx_doc_src/cmds/break.rst
+++ b/sphinx_doc_src/cmds/break.rst
@@ -12,7 +12,7 @@ LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 Description
 -----------
 
-``break`` halts a currently running loop, such as a `switch <cmds/switch.html>`__, `for <cmds/for.html>`__ or `while <cmds/while.html>`__ loop. It is usually added inside of a conditional block such as an `if <cmds/if.html>`__ block.
+``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.
 
 There are no parameters for ``break``.
 
diff --git a/sphinx_doc_src/cmds/cd.rst b/sphinx_doc_src/cmds/cd.rst
index 8984d1794..404a5fce6 100644
--- a/sphinx_doc_src/cmds/cd.rst
+++ b/sphinx_doc_src/cmds/cd.rst
@@ -19,7 +19,7 @@ If ``DIRECTORY`` is a relative path, the paths found in the ``CDPATH`` list will
 
 Note that the shell will attempt to change directory without requiring ``cd`` if the name of a directory is provided (starting with ``.``, ``/`` or ``~``, or ending with ``/``).
 
-Fish also ships a wrapper function around the builtin ``cd`` that understands ``cd -`` as changing to the previous directory. See also `prevd <cmds/prevd.html>`__. This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables. If you make those universal variables your ``cd`` history is shared among all fish instances.
+Fish also ships a wrapper function around the builtin ``cd`` that understands ``cd -`` as changing to the previous directory. See also :ref:`prevd <cmd-prevd>`. This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables. If you make those universal variables your ``cd`` history is shared among all fish instances.
 
 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.
 
@@ -40,4 +40,4 @@ Examples
 See Also
 --------
 
-See also the `cdh <cmds/cdh.html>`__ command for changing to a recently visited directory.
+See also the :ref:`cdh <cmd-cdh>` command for changing to a recently visited directory.
diff --git a/sphinx_doc_src/cmds/exit.rst b/sphinx_doc_src/cmds/exit.rst
index e5155c76d..256a15589 100644
--- a/sphinx_doc_src/cmds/exit.rst
+++ b/sphinx_doc_src/cmds/exit.rst
@@ -14,4 +14,4 @@ Description
 
 ``exit`` causes fish to exit. If ``STATUS`` is supplied, it will be converted to an integer and used as the exit code. Otherwise, the exit code will be that of the last command executed.
 
-If exit is called while sourcing a file (using the `source <cmds/source.html>`__ builtin) the rest of the file will be skipped, but the shell itself will not exit.
+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/sphinx_doc_src/cmds/fish_opt.rst b/sphinx_doc_src/cmds/fish_opt.rst
index 35d3222a8..bf4c5a537 100644
--- a/sphinx_doc_src/cmds/fish_opt.rst
+++ b/sphinx_doc_src/cmds/fish_opt.rst
@@ -15,7 +15,7 @@ Synopsis
 Description
 -----------
 
-This command provides a way to produce option specifications suitable for use with the `argparse <cmds/argparse.html>`__ 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 specs by hand without using this command. But you might prefer to use this for the clarity it provides.
 
 The following ``argparse`` options are available:
 
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index d95e2b357..b7480331b 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -22,7 +22,7 @@ The following options are available:
 
 - ``-d DESCRIPTION`` or ``--description=DESCRIPTION`` is 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 `complete <cmds/complete.html>`__ for more information.
+- ``-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.
 
 - ``-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.
 
@@ -43,7 +43,7 @@ The following options are available:
 
 If the user enters any additional arguments after the function, they are inserted into the environment `variable array <index.html#variables-arrays>`__ ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
 
-By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the `emit <cmds/emit.html>`__ builtin. Fish generates the following named events:
+By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the :ref:`emit <cmd-emit>` builtin. Fish generates the following named events:
 
 - ``fish_prompt``, which is emitted whenever a new fish prompt is about to be displayed.
 
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index ebac28e2d..423e630e7 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -3,7 +3,7 @@ Frequently asked questions
 
 How do I set or clear an environment variable?
 ----------------------------------------------
-Use the `set <cmds/set.html>`__ command::
+Use the :ref:`set <cmd-set>` command::
 
     set -x key value
     set -e key
@@ -26,7 +26,7 @@ The prompt is the output of the ``fish_prompt`` function. Put it in ``~/.config/
     end
 
 
-You can also use the Web configuration tool, `fish_config <cmds/fish_config.html>`__, to preview and choose from a gallery of sample prompts.
+You can also use the Web configuration tool, :ref:`fish_config <cmd-fish_config>`, to preview and choose from a gallery of sample prompts.
 
 
 How do I run a command from history?
@@ -93,7 +93,7 @@ If you are just interested in success or failure, you can run the command direct
     end
 
 
-See the documentation for `test <cmds/test.html>`__ and `if <cmds/if.html>`__ for more information.
+See the documentation for :ref:`test <cmd-test>` and :ref:`if <cmd-if>` for more information.
 
 ~~
 How do I set an environment variable for just one command?
@@ -162,12 +162,12 @@ add a statement to your `user initialization file <index#initialization-files>`_
 
 How do I customize my syntax highlighting colors?
 -------------------------------------------------
-Use the web configuration tool, `fish_config <cmds/fish_config.html>`__, or alter the `fish_color family of environment variables <index#variables-color>`__.
+Use the web configuration tool, :ref:`fish_config <cmd-fish_config>`, or alter the `fish_color family of environment variables <index#variables-color>`__.
 
 ~~
 How do I update man page completions?
 -------------------------------------
-Use the `fish_update_completions <cmds/fish_update_completions.html>`__ command.
+Use the :ref:`fish_update_completions <cmd-fish_update_completions>` command.
 
 ~~
 I accidentally entered a directory path and fish changed directory. What happened?
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 809164dbd..e985c8c2d 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -445,7 +445,7 @@ Use ``if``, ``else if``, and ``else`` to conditionally execute code, based on th
     end
 
 
-To compare strings or numbers or check file properties (whether a file exists or is writeable and such), use `test <cmds/test.html>`__, like
+To compare strings or numbers or check file properties (whether a file exists or is writeable and such), use :ref:`test <cmd-test>`, like
 
 
 
@@ -650,7 +650,7 @@ This is the preferred way to define your prompt as well::
     end
 
 
-See the documentation for `funced <cmds/funced.html>`__ and `funcsave <cmds/funcsave.html>`__ for ways to create these files automatically.
+See the documentation for :ref:`funced <cmd-funced>` and :ref:`funcsave <cmd-funcsave>` for ways to create these files automatically.
 
 Universal Variables
 -------------------

From 86d457422282f0490d530b9080ce8bf17d622fdf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:24:04 +0200
Subject: [PATCH 0214/1732] docs: Use more command labels

---
 sphinx_doc_src/cmds/bind.rst     | 2 +-
 sphinx_doc_src/cmds/continue.rst | 2 +-
 sphinx_doc_src/cmds/dirs.rst     | 2 +-
 sphinx_doc_src/cmds/if.rst       | 2 +-
 sphinx_doc_src/cmds/or.rst       | 4 ++--
 sphinx_doc_src/cmds/popd.rst     | 2 +-
 sphinx_doc_src/cmds/pushd.rst    | 2 +-
 sphinx_doc_src/cmds/return.rst   | 2 +-
 sphinx_doc_src/cmds/while.rst    | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index e6a7b0656..8347040c6 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -26,7 +26,7 @@ Description
 
 SEQUENCE is the character sequence to bind to. These should be written as `fish escape sequences <index.html#escapes>`__. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
 
-The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``````bind '' self-insert``````) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
+The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``bind '' self-insert``) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
 
 If the ``-k`` switch is used, the name of the key (such as 'down', 'up' or 'backspace') is used instead of a sequence. The names used are the same as the corresponding curses variables, but without the 'key\_' prefix. (See ``terminfo(5)`` for more information, or use ``bind --key-names`` for a list of all available named keys.) If used in conjunction with the ``-s`` switch, ``bind`` will silently ignore bindings to named keys that are not found in termcap for the current ``$TERMINAL``, otherwise a warning is emitted.
 
diff --git a/sphinx_doc_src/cmds/continue.rst b/sphinx_doc_src/cmds/continue.rst
index d31c9e545..bef361bbc 100644
--- a/sphinx_doc_src/cmds/continue.rst
+++ b/sphinx_doc_src/cmds/continue.rst
@@ -12,7 +12,7 @@ LOOP_CONSTRUCT; [COMMANDS...;] continue; [COMMANDS...;] end
 Description
 -----------
 
-``continue`` skips the remainder of the current iteration of the current inner loop, such as a <a href="#for">for</a> loop or a <a href="#while">while</a> loop. It is usually added inside of a conditional block such as an <a href="#if">if</a> statement or a <a href="#switch">switch</a> statement.
+``continue`` skips the remainder of the current iteration of the current inner loop, such as a :ref:`for <cmd-for>` loop or a :ref:`while <cmd-while>` loop. It is usually added inside of a conditional block such as an :ref:`if <cmd-if>` statement or a :ref:`switch <cmd-switch>` statement.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/dirs.rst b/sphinx_doc_src/cmds/dirs.rst
index f5f9440dc..286f2f679 100644
--- a/sphinx_doc_src/cmds/dirs.rst
+++ b/sphinx_doc_src/cmds/dirs.rst
@@ -13,7 +13,7 @@ dirs -c
 Description
 -----------
 
-``dirs`` prints the current directory stack, as created by the <a href="#pushd">``pushd``</a> command.
+``dirs`` prints the current directory stack, as created by the :ref:`pushd <cmd-pushd>` command.
 
 With "-c", it clears the directory stack instead.
 
diff --git a/sphinx_doc_src/cmds/if.rst b/sphinx_doc_src/cmds/if.rst
index 7e5c0fa4c..cb44727fd 100644
--- a/sphinx_doc_src/cmds/if.rst
+++ b/sphinx_doc_src/cmds/if.rst
@@ -17,7 +17,7 @@ Description
 
 ``if`` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute.  If the exit status is not 0 and ``else`` is given, ``COMMANDS_FALSE`` will be executed.
 
-You can use <a href="#and">``and``</a> or <a href="#or">``or``</a> in the condition. See the second example below.
+You can use :ref:`and <cmd-and>` or :ref:`or <cmd-or>` in the condition. See the second example below.
 
 The exit status of the last foreground command to exit can always be accessed using the <a href="index.html#variables-status">$status</a> variable.
 
diff --git a/sphinx_doc_src/cmds/or.rst b/sphinx_doc_src/cmds/or.rst
index 9d5436139..f7037dfd0 100644
--- a/sphinx_doc_src/cmds/or.rst
+++ b/sphinx_doc_src/cmds/or.rst
@@ -14,8 +14,8 @@ Description
 
 ``or`` is used to execute a command if the previous command was not successful (returned a status of something other than 0).
 
-``or`` statements may be used as part of the condition in an <a href="#if">``and``</a> or <a href="#while">``while``</a> block. See the documentation
-for <a href="#if">``if``</a> and <a href="#while">``while``</a> for examples.
+``or`` statements may be used as part of the condition in an :ref:`and <cmd-if>` or :ref:`while <cmd-while>` block. See the documentation
+for :ref:`if <cmd-if>` and :ref:`while <cmd-while>` for examples.
 
 ``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 <a href="index.html#variables-status">$status</a> variable.
 
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 772dbb690..476ed8718 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -12,7 +12,7 @@ popd
 Description
 -----------
 
-``popd`` removes the top directory from the directory stack and changes the working directory to the new top directory. Use <a href="#pushd">``pushd``</a> to add directories to the stack.
+``popd`` removes the top directory from the directory stack and changes the working directory to the new top directory. Use :ref:`pushd <cmd-pushd>` to add directories to the stack.
 
 You may be interested in the <a href="commands.html#cdh">``cdh``</a> command which provides a more intuitive way to navigate to recently visited directories.
 
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index 82cc1a0bc..713bee2e5 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -12,7 +12,7 @@ pushd [DIRECTORY]
 Description
 -----------
 
-The ``pushd`` function adds ``DIRECTORY`` to the top of the directory stack and makes it the current working directory. <a href="#popd">``popd``</a> will pop it off and return to the original directory.
+The ``pushd`` function adds ``DIRECTORY`` to the top of the 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.
 
diff --git a/sphinx_doc_src/cmds/return.rst b/sphinx_doc_src/cmds/return.rst
index 3ad6cc315..86b1202de 100644
--- a/sphinx_doc_src/cmds/return.rst
+++ b/sphinx_doc_src/cmds/return.rst
@@ -14,7 +14,7 @@ Description
 
 ``return`` halts a currently running function. The exit status is set to ``STATUS`` if it is given.
 
-It is usually added inside of a conditional block such as an <a href="#if">if</a> statement or a <a href="#switch">switch</a> statement to conditionally stop the executing function and return to the caller, but it can also be used to specify the exit status of a function.
+It is usually 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, but it can also be used to specify the exit status of a function.
 
 
 Example
diff --git a/sphinx_doc_src/cmds/while.rst b/sphinx_doc_src/cmds/while.rst
index 0bc41f9d8..78d3c77d5 100644
--- a/sphinx_doc_src/cmds/while.rst
+++ b/sphinx_doc_src/cmds/while.rst
@@ -16,7 +16,7 @@ Description
 
 The exit status of the while loop is the exit status of the last iteration of the ``COMMANDS`` executed, or 0 if none were executed. (This matches other shells and is POSIX-compatible.)
 
-You can use <a href="#and">``and``</a> or <a href="#or">``or``</a> for complex conditions. Even more complex control can be achieved with ``while true`` containing a <a href="#break">break</a>.
+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>`.
 
 Example
 -------

From bda3fb774034c88c01544e47d8c83fa14ef627d5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:25:07 +0200
Subject: [PATCH 0215/1732] docs: Fix a few wrong verbatim blocks

Wrong number of backticks.

[ci skip]
---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 96e5b4424..c7dfa73c9 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -629,7 +629,7 @@ Useful functions for writing completions
 
 ``fish`` ships with several functions that are very useful when writing command specific completions. Most of these functions name begins with the string '``__fish_``'. Such functions are internal to ``fish`` and their name and interface may change in future fish versions. Still, some of them may be very useful when writing completions. A few of these functions are described here. Be aware that they may be removed or changed in future versions of fish.
 
-Functions beginning with the string ``__fish_print_`` print a newline separated list of strings. For example, ``__fish_print_filesystems` prints a list of all known file systems. Functions beginning with ``__fish_complete_``` print out a newline separated list of completions with descriptions. The description is separated from the completion by a tab character.
+Functions beginning with the string ``__fish_print_`` print a newline separated list of strings. For example, ``__fish_print_filesystems`` prints a list of all known file systems. Functions beginning with ``__fish_complete_`` print out a newline separated list of completions with descriptions. The description is separated from the completion by a tab character.
 
 - ``__fish_complete_directories STRING DESCRIPTION`` performs path completion on STRING, allowing only directories, and giving them the description DESCRIPTION.
 
@@ -645,7 +645,7 @@ Functions beginning with the string ``__fish_print_`` print a newline separated
 
 - ``__fish_print_filesystems`` prints a list of all known file systems. Currently, this is a static list, and not dependent on what file systems the host operating system actually understands.
 
-- ``__fish_print_hostnames` prints a list of all known hostnames. This functions searches the fstab for nfs servers, ssh for known hosts and checks the ``/etc/hosts``` file.
+- ``__fish_print_hostnames`` prints a list of all known hostnames. This functions searches the fstab for nfs servers, ssh for known hosts and checks the ``/etc/hosts`` file.
 
 - ``__fish_print_interfaces`` prints a list of all known network interfaces.
 

From e2cf10dd4fb2725f4d86f06ebd0e3962151bb5c0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:28:13 +0200
Subject: [PATCH 0216/1732] docs: More command labels

[ci skip]
---
 sphinx_doc_src/cmds/cdh.rst   | 2 +-
 sphinx_doc_src/cmds/fish.rst  | 2 +-
 sphinx_doc_src/cmds/nextd.rst | 2 +-
 sphinx_doc_src/cmds/popd.rst  | 2 +-
 sphinx_doc_src/cmds/prevd.rst | 2 +-
 sphinx_doc_src/cmds/pushd.rst | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sphinx_doc_src/cmds/cdh.rst b/sphinx_doc_src/cmds/cdh.rst
index 90ad1df5a..c1390a662 100644
--- a/sphinx_doc_src/cmds/cdh.rst
+++ b/sphinx_doc_src/cmds/cdh.rst
@@ -20,4 +20,4 @@ Note that the ``cd`` command limits directory history to the 25 most recently vi
 See Also
 --------
 
-See also the <a href="commands.html#prevd">``prevd``</a> and <a href="commands.html#pushd">``pushd``</a> commands which also work with the recent ``cd`` history and are provided for compatibility with other shells.
+See also the :ref:`prevd <cmd-prevd>` and :ref:`pushd <cmd-pushd>` commands which also work with the recent ``cd`` history and are provided for compatibility with other shells.
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 572ed360f..35cd9599b 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -12,7 +12,7 @@ fish [OPTIONS] [-c command] [FILE [ARGUMENTS...]]
 Description
 -----------
 
-``fish`` is a command-line shell written mainly with interactive use in mind. The full manual is available <a href='index.html'>in HTML</a> by using the <a href='#help'>help</a> command from inside fish.
+``fish`` is a command-line shell written mainly with interactive use in mind. The full manual is available <a href='index.html'>in HTML</a> by using the :ref:`help <cmd-help>` command from inside fish.
 
 The following options are available:
 
diff --git a/sphinx_doc_src/cmds/nextd.rst b/sphinx_doc_src/cmds/nextd.rst
index 4bb862b5b..05173e846 100644
--- a/sphinx_doc_src/cmds/nextd.rst
+++ b/sphinx_doc_src/cmds/nextd.rst
@@ -18,7 +18,7 @@ If the ``-l`` or ``--list`` flag is specified, the current directory history is
 
 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.
 
-You may be interested in the <a href="commands.html#cdh">``cdh``</a> command which provides a more intuitive way to navigate to recently visited directories.
+You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 476ed8718..96cd28eb5 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -14,7 +14,7 @@ Description
 
 ``popd`` removes the top directory from the directory stack and changes the working directory to the new top directory. Use :ref:`pushd <cmd-pushd>` to add directories to the stack.
 
-You may be interested in the <a href="commands.html#cdh">``cdh``</a> command which provides a more intuitive way to navigate to recently visited directories.
+You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/prevd.rst b/sphinx_doc_src/cmds/prevd.rst
index b96338c51..e5b444220 100644
--- a/sphinx_doc_src/cmds/prevd.rst
+++ b/sphinx_doc_src/cmds/prevd.rst
@@ -18,7 +18,7 @@ If the ``-l`` or ``--list`` flag is specified, the current history is also displ
 
 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.
 
-You may be interested in the <a href="commands.html#cdh">``cdh``</a> command which provides a more intuitive way to navigate to recently visited directories.
+You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index 713bee2e5..a4e97544d 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -22,7 +22,7 @@ Without arguments, it exchanges the top two directories in the stack.
 
 See also ``dirs`` and ``dirs -c``.
 
-You may be interested in the <a href="commands.html#cdh">``cdh``</a> command which provides a more intuitive way to navigate to recently visited directories.
+You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 
 Example
 -------

From 127c0e9764ec7ea2857b3c9a400985d443488b4e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:32:40 +0200
Subject: [PATCH 0217/1732] docs: Fix remaining references

Fixes #5775.
---
 sphinx_doc_src/cmds/fish.rst     | 2 +-
 sphinx_doc_src/cmds/funcsave.rst | 2 +-
 sphinx_doc_src/cmds/if.rst       | 2 +-
 sphinx_doc_src/cmds/or.rst       | 2 +-
 sphinx_doc_src/cmds/set.rst      | 2 +-
 sphinx_doc_src/cmds/test.rst     | 2 +-
 sphinx_doc_src/cmds/trap.rst     | 2 +-
 sphinx_doc_src/index.rst         | 1 +
 sphinx_doc_src/tutorial.rst      | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 35cd9599b..cb92df6ec 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -12,7 +12,7 @@ fish [OPTIONS] [-c command] [FILE [ARGUMENTS...]]
 Description
 -----------
 
-``fish`` is a command-line shell written mainly with interactive use in mind. The full manual is available <a href='index.html'>in HTML</a> by using the :ref:`help <cmd-help>` command from inside fish.
+``fish`` is a command-line shell written mainly with interactive use in mind. The :ref:`full manual <intro>` is available in HTML by using the :ref:`help <cmd-help>` command from inside fish.
 
 The following options are available:
 
diff --git a/sphinx_doc_src/cmds/funcsave.rst b/sphinx_doc_src/cmds/funcsave.rst
index a93f23814..34f9d63a8 100644
--- a/sphinx_doc_src/cmds/funcsave.rst
+++ b/sphinx_doc_src/cmds/funcsave.rst
@@ -14,4 +14,4 @@ Description
 
 ``funcsave`` saves the current definition of a function to a file in the fish configuration directory. This function will be automatically loaded by current and future fish sessions. This can be useful if you have interactively created a new function and wish to save it for later use.
 
-Note that because fish loads functions on-demand, saved functions will not function as <a href="index.html#event">event handlers</a> until they are run or sourced otherwise. To activate an event handler for every new shell, add the function to your <a href="index.html#initialization">shell initialization file</a> instead of using ``funcsave``.
+Note that because fish loads functions on-demand, saved functions will not function as :ref:`event handlers <event>` until they are run or sourced otherwise. To activate an event handler for every new shell, add the function to your :ref:`shell initialization file <initialization>` instead of using ``funcsave``.
diff --git a/sphinx_doc_src/cmds/if.rst b/sphinx_doc_src/cmds/if.rst
index cb44727fd..617f94f7d 100644
--- a/sphinx_doc_src/cmds/if.rst
+++ b/sphinx_doc_src/cmds/if.rst
@@ -19,7 +19,7 @@ Description
 
 You can use :ref:`and <cmd-and>` or :ref:`or <cmd-or>` in the condition. See the second example below.
 
-The exit status of the last foreground command to exit can always be accessed using the <a href="index.html#variables-status">$status</a> variable.
+The exit status of the last foreground command to exit can always be accessed using the :ref:`$status <variables-status>` variable.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/or.rst b/sphinx_doc_src/cmds/or.rst
index f7037dfd0..1cbdb8178 100644
--- a/sphinx_doc_src/cmds/or.rst
+++ b/sphinx_doc_src/cmds/or.rst
@@ -17,7 +17,7 @@ Description
 ``or`` statements may be used as part of the condition in an :ref:`and <cmd-if>` or :ref:`while <cmd-while>` block. See the documentation
 for :ref:`if <cmd-if>` and :ref:`while <cmd-while>` for examples.
 
-``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 <a href="index.html#variables-status">$status</a> variable.
+``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.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index 4e4c2845c..df051318c 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -18,7 +18,7 @@ set ( -S | --show ) [SCOPE_OPTIONS] [VARIABLE_NAME]...
 Description
 -----------
 
-``set`` manipulates <a href="index.html#variables">shell variables</a>.
+``set`` manipulates :ref:`shell variables <variables>`.
 
 If set is called with no arguments, the names and values of all shell variables are printed in sorted order. If some of the scope or export flags have been given, only the variables matching the specified scope are printed.
 
diff --git a/sphinx_doc_src/cmds/test.rst b/sphinx_doc_src/cmds/test.rst
index 0c8914398..cbdd6e65d 100644
--- a/sphinx_doc_src/cmds/test.rst
+++ b/sphinx_doc_src/cmds/test.rst
@@ -189,7 +189,7 @@ which is logically equivalent to the following:
 Standards
 ---------
 
-``test`` implements a subset of the <a href="http://www.unix.com/man-page/POSIX/1/test/">IEEE Std 1003.1-2008 (POSIX.1) standard</a>. The following exceptions apply:
+``test`` implements a subset of the `IEEE Std 1003.1-2008 (POSIX.1) standard <http://www.unix.com/man-page/POSIX/1/test/>`__. The following exceptions apply:
 
 - The ``<`` and ``>`` operators for comparing strings are not implemented.
 
diff --git a/sphinx_doc_src/cmds/trap.rst b/sphinx_doc_src/cmds/trap.rst
index dbe8ce890..770135cc5 100644
--- a/sphinx_doc_src/cmds/trap.rst
+++ b/sphinx_doc_src/cmds/trap.rst
@@ -12,7 +12,7 @@ trap [OPTIONS] [[ARG] REASON ... ]
 Description
 -----------
 
-``trap`` is a wrapper around the fish event delivery framework. It exists for backwards compatibility with POSIX shells. For other uses, it is recommended to define an <a href='index.html#event'>event handler</a>.
+``trap`` is a wrapper around the fish event delivery framework. It exists for backwards compatibility with POSIX shells. For other uses, it is recommended to define an :ref:`event handler <event>`.
 
 The following parameters are available:
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index c7dfa73c9..49aca598f 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1,4 +1,5 @@
 .. highlight:: fish
+.. _intro:
 
 Introduction
 ============
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index e985c8c2d..b98ef5061 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -696,4 +696,4 @@ with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps ab
 Ready for more?
 ---------------
 
-If you want to learn more about fish, there is <a href="index.html">lots of detailed documentation</a>, an <a href="https://lists.sourceforge.net/lists/listinfo/fish-users">official mailing list</a>, the IRC channel \#fish on ``irc.oftc.net``, and the <a href="https://github.com/fish-shell/fish-shell/">github page</a>.
+If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.

From ac61d3f34dd9b454f65f1b8b4e944348ca9ec6f2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:46:26 +0200
Subject: [PATCH 0218/1732] docs: More references

Including two more href.
---
 sphinx_doc_src/cmds/complete.rst | 3 +--
 sphinx_doc_src/faq.rst           | 5 ++---
 sphinx_doc_src/index.rst         | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index 0f7bdeaa4..fe6330a7f 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -27,8 +27,7 @@ Synopsis
 Description
 -----------
 
-For an introduction to specifying completions, see <a
-href='index.html#completion-own'>Writing your own completions</a> in
+For an introduction to specifying completions, see :ref:`Writing your own completions <completion-own>` in
 the fish manual.
 
 - ``COMMAND`` is the name of the command for which to add a completion.
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 423e630e7..7dd133fe3 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -146,15 +146,14 @@ A global variable of the same name already exists.
 
 Environment variables such as ``EDITOR`` or ``TZ`` can be set universally using ``set -Ux``.  However, if
 there is an environment variable already set before fish starts (such as by login scripts or system
-administrators), it is imported into fish as a global variable. The <a
-href="index.html#variables-scope">variable scopes</a> are searched from the "inside out", which
+administrators), it is imported into fish as a global variable. The :ref:`variable scopes <variables-scope>` are searched from the "inside out", which
 means that local variables are checked first, followed by global variables, and finally universal
 variables.
 
 This means that the global value takes precedence over the universal value.
 
 To avoid this problem, consider changing the setting which fish inherits. If this is not possible,
-add a statement to your `user initialization file <index#initialization-files>`__ (usually
+add a statement to your :ref:`user initialization file <initialization>` (usually
 ``~/.config/fish/config.fish``)::
 
     set -gx EDITOR vim
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 49aca598f..4df9dd268 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1055,7 +1055,7 @@ To see universal variables in action, start two fish sessions side by side, and
 
 `Universal variables <#variables-universal>`_ are stored in the file ``.config/fish/fish_variables``. Do not edit this file directly, as your edits may be overwritten. Edit the variables through fish scripts or by using fish interactively instead.
 
-Do not append to universal variables in `config.fish <#initialization>`_, because these variables will then get longer with each new shell instance. Instead, simply set them once at the command line.
+Do not append to universal variables in :ref:`config.fish <initialization>`, because these variables will then get longer with each new shell instance. Instead, simply set them once at the command line.
 
 
 .. _variables-functions:
@@ -1779,9 +1779,9 @@ To specify a signal handler for the WINCH signal, write::
         echo Got WINCH signal!
     end
 
-Please note that event handlers only become active when a function is loaded, which means you might need to otherwise `source <cmds/source.html>`_ or execute a function instead of relying on `autoloading <#syntax-function-autoloading>`_. One approach is to put it into your `initialization file <#initialization>`_.
+Please note that event handlers only become active when a function is loaded, which means you might need to otherwise :ref:`source <cmd-source>` or execute a function instead of relying on :ref:`autoloading <syntax-function-autoloading>`. One approach is to put it into your :ref:`initialization file <initialization>`.
 
-For more information on how to define new event handlers, see the documentation for the `function <cmds/function.html>`_ command.
+For more information on how to define new event handlers, see the documentation for the :ref:`function <cmd-function>` command.
 
 
 .. _debugging:

From eb3bbb13607d4b17153153f7b9723cebd387a789 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:50:28 +0200
Subject: [PATCH 0219/1732] docs: Fix example link

---
 sphinx_doc_src/tutorial.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index b98ef5061..fa40ac1ec 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -597,7 +597,7 @@ To remove /usr/local/bin from ``$PATH``, you can write::
     >_ set PATH (string match -v /usr/local/bin $PATH)
 
 
-You can do so directly in ``config.fish``, like you might do in other shells with ``.profile``. See [this example](#path_example).
+You can do so directly in ``config.fish``, like you might do in other shells with ``.profile``. See :ref:`this example <path_example>`.
 
 A faster way is to modify the ``$fish_user_paths`` [universal variable](#tut_universal), which is automatically prepended to ``$PATH``. For example, to permanently add ``/usr/local/bin`` to your ``$PATH``, you could write::
 
@@ -613,8 +613,7 @@ Startup (Where's .bashrc?)
 
 It is possible to directly create functions and variables in ``config.fish`` file, using the commands shown above. For example:
 
-<a name="path_example"></a>
-
+.. _path_example:
 
 ::
 

From 6c234a7385ea338d4fbccea4204e2153c05b26aa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 11:56:12 +0200
Subject: [PATCH 0220/1732] docs: Remove a table

This was html, and I don't think it helped all that much, so let's
remove it instead of translating to rst.

[ci skip]
---
 sphinx_doc_src/index.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 4df9dd268..f6b72f568 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -101,11 +101,6 @@ Arguments → Program → Return Values
 - the arguments become options or switches paired with data: the switches influence the behaviour of the command
 - the return value shrinks to an **exit code**: this exit code is 0 when the command executes normally and between 1 and 255 otherwise.
 
-<table with=100%>
-<tr><td>Input Stream &rArr;<td rowspan="2">|Shell Command|<td>&rArr; Output Stream
-<tr><td>switch and data as arguments →<td>→ exit code
-</table>
-
 This leads to another way of programming and especially of combining commands:
 
 There are two ways to combine shell commands:

From 95ab71c456510f4195753c24cc20b5a6cd11e637 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 31 Mar 2019 12:00:19 +0200
Subject: [PATCH 0221/1732] docs: Another bit of dehtml-izing

[ci skip]
---
 sphinx_doc_src/cmds/type.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/type.rst b/sphinx_doc_src/cmds/type.rst
index 31e5ccf70..18ddcefe0 100644
--- a/sphinx_doc_src/cmds/type.rst
+++ b/sphinx_doc_src/cmds/type.rst
@@ -22,7 +22,7 @@ The following options are available:
 
 - ``-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 <tt>$PATH</tt>, 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 :ref:`$PATH <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 ``$PATH``, or nothing otherwise. ``--force-path`` explicitly resolves only the path to executable files in ``$PATH``, regardless of whether ``$NAME`` is shadowed by a function or builtin with the same name.
 

From aafd706a34e3d2756aa887d114c37e60de24ddee Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sat, 30 Mar 2019 13:48:17 -0700
Subject: [PATCH 0222/1732] Replace Doxygen reference in README with Sphinx

Also update a comment in the `make_tarball.sh` script.
---
 README.md                   | 2 +-
 build_tools/make_tarball.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28c60704c..5ae048545 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ Compiling fish requires:
 * PCRE2 (headers and libraries) - a copy is included with fish
 * gettext (headers and libraries) - optional, for translation support
 
-Doxygen (1.8.7 or later) is also optionally required to build the documentation from a cloned git repository.
+Sphinx is also optionally required to build the documentation from a cloned git repository.
 
 ### Building from source (all platforms) - Makefile generator
 
diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh
index 89789a348..d0578e006 100755
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -2,7 +2,7 @@
 
 # Script to generate a tarball
 # We use git to output a tree. But we also want to build the user documentation
-# and put that in the tarball, so that nobody needs to have doxygen installed
+# and put that in the tarball, so that nobody needs to have sphinx installed
 # to build it.
 # Outputs to $FISH_ARTEFACT_PATH or ~/fish_built by default
 

From 3c537bfa656bbb119028f14b7ab770d34ca8fbaa Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 31 Mar 2019 13:20:49 -0500
Subject: [PATCH 0223/1732] Optimize get_deferred_process() traversal

---
 src/exec.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index ddf612d9d..7fc37af5e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -993,21 +993,20 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 // This should show the output as it comes, not buffer until the end.
 // Any such process (only one per job) will be called the "deferred" process.
 static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
-    process_t *last_internal = nullptr;
-    for (const auto &p : j->processes) {
+    // By enumerating in reverse order, we can avoid walking the entire list
+    for (auto i = j->processes.rbegin(); i != j->processes.rend(); ++i) {
+        const auto &p = *i;
         if (p->type == process_type_t::exec) {
             // No tail reordering for execs.
             return nullptr;
         } else if (p->type != process_type_t::external) {
-            last_internal = p.get();
+            if (p->is_last_in_job) {
+                return nullptr;
+            }
+            return p.get();
         }
     }
-    if (last_internal && !last_internal->is_last_in_job) {
-        // This is the last internal process, and it pipes to an external process.
-        return last_internal;
-    } else {
-        return nullptr;
-    }
+    return nullptr;
 }
 
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {

From b5b9406711fde15162a0bc3f52b4d656c2e18aa4 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 31 Mar 2019 18:09:59 -0500
Subject: [PATCH 0224/1732] Use explicit atomic/CAS to prevent race conditions

They are probably equivalent on x86/64 being single-byte reads/writes,
but it never hurts to be safe.
---
 src/proc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 24b266920..4d224b8f9 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -463,7 +463,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
 
     // This function may fire an event handler, we do not want to call ourselves recursively (to
     // avoid infinite recursion).
-    static bool locked = false;
+    static std::atomic<bool> locked { false };
     if (locked) {
         return false;
     }

From eb2d829bc5bb3ecd2004d3e6308a3af9d32b4222 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 31 Mar 2019 18:17:33 -0500
Subject: [PATCH 0225/1732] Use explicit lock.exchange()

There's really no point in using std::atomic if we're not going to
actually guarantee the entire read & write process is atomic.
---
 src/proc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 4d224b8f9..169116abd 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -464,10 +464,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // This function may fire an event handler, we do not want to call ourselves recursively (to
     // avoid infinite recursion).
     static std::atomic<bool> locked { false };
-    if (locked) {
+    if (locked.exchange(true, std::memory_order::memory_order_relaxed)) {
         return false;
     }
-    locked = true;
 
     // This may be invoked in an exit handler, after the TERM has been torn down
     // Don't try to print in that case (#3222)

From 469a8880aa20ea6c13ffa96f36f2b7b664892c7d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 31 Mar 2019 21:38:23 -0700
Subject: [PATCH 0226/1732] correct 'bind' completions

--new-mode isn't even an option `bind` takes, and it
-m for -M.
---
 share/completions/bind.fish | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/completions/bind.fish b/share/completions/bind.fish
index c6153cf8a..05375a1d8 100644
--- a/share/completions/bind.fish
+++ b/share/completions/bind.fish
@@ -43,14 +43,16 @@ function __fish_bind_test2
 
 end
 
+complete -c bind -f
 complete -c bind -s a -l all -d 'Show unavailable key bindings/erase all bindings'
 complete -c bind -s e -l erase -d 'Erase mode'
 complete -c bind -s f -l function-names -d 'Print names of available functions'
 complete -c bind -s h -l help -d "Display help and exit"
 complete -c bind -s k -l key -d 'Specify key name, not sequence'
 complete -c bind -s K -l key-names -d 'Print names of available keys'
-complete -c bind -s m -l mode -d 'Add to named bind mode'
-complete -c bind -s M -l new-mode -d 'Change current bind mode to named mode'
+complete -c bind -s M -l mode -d 'Specify the bind mode that the bind is used in'
+complete -c bind -s m -l sets-mode -d 'Change current mode after bind is executed'
+complete -c bind -s L -l list-modes -d 'Display a list of defined bind modes'
 
 complete -c bind -n __fish_bind_test1 -a '(bind --key-names)' -d 'Key name' -x
 complete -c bind -n __fish_bind_test2 -a '(bind --function-names)' -d 'Function name' -x

From 0d729126419e566c7be004c38c53896081ae27c9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 15:59:15 +0200
Subject: [PATCH 0227/1732] Expand abbr explicitly (#5762)

* Add "expand-abbr" bind function

This can be used to explictly allow expanding abbreviations.

* Make expanding abbr explicit

NOTE: This accepts them for space only, we currently also do it for \n
and \r.

* Remove now dead code

We no longer trigger an abbr implicitly, so we can remove the code
that does it.

* Fix comment

[ci skip]
---
 .../functions/fish_default_key_bindings.fish  |  3 +
 share/functions/fish_vi_key_bindings.fish     |  3 +
 sphinx_doc_src/cmds/bind.rst                  |  2 +
 src/input.cpp                                 |  1 +
 src/input_common.h                            |  1 +
 src/reader.cpp                                | 55 +++++++------------
 6 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index f3ac78349..5bf00b216 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -31,6 +31,9 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
     bind --preset $argv "" self-insert
     or exit # protect against invalid $argv
 
+    # Space expands abbrs _and_ inserts itself.
+    bind --preset $argv " " 'commandline -i " "; commandline -f expand-abbr'
+
     bind --preset $argv \n execute
     bind --preset $argv \r execute
 
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 5d39be4c9..40ed9432f 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -54,6 +54,9 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset -M insert \n execute
 
     bind -s --preset -M insert "" self-insert
+    # Space expands abbrs _and_ inserts itself.
+    bind -s --preset -M insert " " 'commandline -i " "; commandline -f expand-abbr'
+
 
     # Add way to kill current command line while in insert mode.
     bind -s --preset -M insert \cc __fish_cancel_commandline
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 8347040c6..eca0e4425 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -112,6 +112,8 @@ The following special input functions are available:
 
 - ``end-selection``, end selecting text
 
+- ``expand-abbr`` expands any abbreviation currently under the cursor
+
 - ``forward-bigword``, move one whitespace-delimited word to the right
 
 - ``forward-char``, move one character to the right
diff --git a/src/input.cpp b/src/input.cpp
index 256e0f62c..ba55f709d 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -129,6 +129,7 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::repeat_jump, L"repeat-jump"},
     {readline_cmd_t::reverse_repeat_jump, L"repeat-jump-reverse"},
     {readline_cmd_t::func_and, L"and"},
+    {readline_cmd_t::expand_abbr, L"expand-abbr"},
     {readline_cmd_t::cancel, L"cancel"}};
 
 static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0]) ==
diff --git a/src/input_common.h b/src/input_common.h
index 7489f0e96..3b2ffb6e1 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -65,6 +65,7 @@ enum class readline_cmd_t {
     forward_jump_till,
     backward_jump_till,
     func_and,
+    expand_abbr,
     cancel,
     repeat_jump,
     reverse_repeat_jump,
diff --git a/src/reader.cpp b/src/reader.cpp
index 87d31f0ed..53a4a2d33 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -430,13 +430,12 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     void update_buff_pos(editable_line_t *el, size_t buff_pos);
     void repaint();
     void kill(editable_line_t *el, size_t begin_idx, size_t length, int mode, int newv);
-    bool insert_string(editable_line_t *el, const wcstring &str,
-                       bool allow_expand_abbreviations = false);
+    bool insert_string(editable_line_t *el, const wcstring &str);
 
     /// Insert the character into the command line buffer and print it to the screen using syntax
     /// highlighting, etc.
-    bool insert_char(editable_line_t *el, wchar_t c, bool allow_expand_abbreviations = false) {
-        return insert_string(el, wcstring{c}, allow_expand_abbreviations);
+    bool insert_char(editable_line_t *el, wchar_t c) {
+        return insert_string(el, wcstring{c});
     }
 
     void move_word(editable_line_t *el, bool move_right, bool erase, enum move_word_style_t style,
@@ -1134,43 +1133,21 @@ void reader_data_t::remove_backward() {
 }
 
 /// Insert the characters of the string into the command line buffer and print them to the screen
-/// using syntax highlighting, etc. Optionally also expand abbreviations, after space characters.
+/// using syntax highlighting, etc.
 /// Returns true if the string changed.
-bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str,
-                                  bool allow_expand_abbreviations) {
+bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
     size_t len = str.size();
     if (len == 0) return false;
 
-    // Start inserting. If we are expanding abbreviations, we have to do this after every space (see
-    // #1434), so look for spaces. We try to do this efficiently (rather than the simpler character
-    // at a time) to avoid expensive work in command_line_changed().
+    // Start inserting.
     size_t cursor = 0;
     while (cursor < len) {
-        // Determine the position of the next expansion-triggering char (possibly none), and the end
-        // of the range we wish to insert.
-        const wchar_t *expansion_triggering_chars = L" ;|&^><";
-        size_t char_triggering_expansion_pos =
-            allow_expand_abbreviations ? str.find_first_of(expansion_triggering_chars, cursor)
-                                       : wcstring::npos;
-        bool has_expansion_triggering_char = (char_triggering_expansion_pos != wcstring::npos);
-        size_t range_end =
-            (has_expansion_triggering_char ? char_triggering_expansion_pos + 1 : len);
-
         // Insert from the cursor up to but not including the range end.
-        assert(range_end > cursor);
-        el->insert_string(str, cursor, range_end - cursor);
+        el->insert_string(str, cursor, len - cursor);
 
         update_buff_pos(el, el->position);
         command_line_changed(el);
-
-        // If we got an expansion trigger, then the last character we inserted was it (i.e. was a
-        // space). Expand abbreviations.
-        if (has_expansion_triggering_char && allow_expand_abbreviations) {
-            assert(range_end > 0);
-            assert(std::wcschr(expansion_triggering_chars, str.at(range_end - 1)));
-            expand_abbreviation_as_necessary(1);
-        }
-        cursor = range_end;
+        cursor = len;
     }
 
     if (el == &command_line) {
@@ -2471,7 +2448,7 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
     }
 
     editable_line_t *el = active_edit_line();
-    insert_string(el, arr, true);
+    insert_string(el, arr);
 
     // End paging upon inserting into the normal command line.
     if (el == &command_line) {
@@ -3193,6 +3170,17 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             break;
         }
 
+        case rl::expand_abbr: {
+            editable_line_t *el = active_edit_line();
+            if (expand_abbreviation_as_necessary(1)) {
+                super_highlight_me_plenty();
+                mark_repaint_needed();
+                input_function_set_status(true);
+            } else {
+                input_function_set_status(false);
+            }
+            break;
+        }
             // Some commands should have been handled internally by input_readch().
         case rl::self_insert: {
             DIE("self-insert should have been handled by input_readch");
@@ -3317,8 +3305,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
                        c != 0x7F) {
                 // Regular character.
                 editable_line_t *el = active_edit_line();
-                bool allow_expand_abbreviations = (el == &command_line);
-                insert_char(active_edit_line(), c, allow_expand_abbreviations);
+                insert_char(active_edit_line(), c);
 
                 // End paging upon inserting into the normal command line.
                 if (el == &command_line) {

From da1b32f0adb42a52a1ccef157532fd986f6238bb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 15:59:33 +0200
Subject: [PATCH 0228/1732] Remove option to use system wcwidth (#5777)

As it turns out it didn't work much better, and it fell behind in
support when it comes to things that wcwidth traditionally can't
express like variation selectors and hangul combining characters, but
also simply $fish_*_width.

I've had to tell a few people now to rebuild with widecharwidth after
sending them on a fool's errand to set X variable.

So keeping this option is doing our users a disservice.
---
 CMakeLists.txt   |  7 -------
 src/fallback.cpp | 11 -----------
 2 files changed, 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0b518aa5..443a6640b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,13 +127,6 @@ SET_SOURCE_FILES_PROPERTIES(src/fish_version.cpp
                             PROPERTIES OBJECT_DEPENDS
                             ${CMAKE_CURRENT_BINARY_DIR}/${FBVF})
 
-OPTION(INTERNAL_WCWIDTH "use fallback wcwidth" ON)
-IF(INTERNAL_WCWIDTH)
-    ADD_DEFINITIONS(-DHAVE_BROKEN_WCWIDTH=1)
-ELSE()
-    ADD_DEFINITIONS(-DHAVE_BROKEN_WCWIDTH=0)
-ENDIF()
-
 # Enable thread-safe errno on Solaris (#5611)
 ADD_DEFINITIONS(-D_REENTRANT)
 
diff --git a/src/fallback.cpp b/src/fallback.cpp
index 870f81787..fc9b478a9 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -267,15 +267,6 @@ int fish_get_emoji_width(wchar_t c) {
 
 // Big hack to use our versions of wcswidth where we know them to be broken, which is
 // EVERYWHERE (https://github.com/fish-shell/fish-shell/issues/2199)
-#ifndef HAVE_BROKEN_WCWIDTH
-#define HAVE_BROKEN_WCWIDTH 1
-#endif
-
-#if !HAVE_BROKEN_WCWIDTH
-int fish_wcwidth(wchar_t wc) { return wcwidth(wc); }
-int fish_wcswidth(const wchar_t *str, size_t n) { return wcswidth(str, n); }
-#else
-
 #include "widecharwidth/widechar_width.h"
 
 int fish_wcwidth(wchar_t wc) {
@@ -332,8 +323,6 @@ int fish_wcswidth(const wchar_t *str, size_t n) {
     return result;
 }
 
-#endif  // HAVE_BROKEN_WCWIDTH
-
 #ifndef HAVE_FLOCK
 /*	$NetBSD: flock.c,v 1.6 2008/04/28 20:24:12 martin Exp $	*/
 

From 8ff866b26b2f42bb8deeb2c2ec2b308c79daff75 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 15:52:21 +0200
Subject: [PATCH 0229/1732] Add repaint-mode bind function

If we switch the bind mode, we add a "force-repaint" there just to
redraw the mode indicator.

That's quite wasteful and annoying, considering that sometimes the prompt can take
half a second.

So we add a "repaint-mode" function that just reexecutes the
mode-prompt and uses the cached values for the others.

Fixes #5783.
---
 share/functions/fish_vi_key_bindings.fish | 76 +++++++++++------------
 sphinx_doc_src/cmds/bind.rst              |  4 ++
 src/input.cpp                             |  1 +
 src/input_common.h                        |  1 +
 src/reader.cpp                            | 41 ++++++++----
 5 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 40ed9432f..5ff75e4b9 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -63,7 +63,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # Add a way to switch from insert to normal (command) mode.
     # Note if we are paging, we want to stay in insert mode
     # See #2871
-    bind -s --preset -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end"
+    bind -s --preset -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char repaint-mode; end"
 
     # Default (command) mode
     bind -s --preset :q exit
@@ -72,14 +72,14 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset -M default l forward-char
     bind -s --preset -m insert \n execute
     bind -s --preset -m insert \r execute
-    bind -s --preset -m insert i force-repaint
-    bind -s --preset -m insert I beginning-of-line force-repaint
-    bind -s --preset -m insert a forward-char force-repaint
-    bind -s --preset -m insert A end-of-line force-repaint
-    bind -s --preset -m visual v begin-selection force-repaint
+    bind -s --preset -m insert i repaint-mode
+    bind -s --preset -m insert I beginning-of-line repaint-mode
+    bind -s --preset -m insert a forward-char repaint-mode
+    bind -s --preset -m insert A end-of-line repaint-mode
+    bind -s --preset -m visual v begin-selection repaint-mode
 
-    #bind -s --preset -m insert o "commandline -a \n" down-line force-repaint
-    #bind -s --preset -m insert O beginning-of-line "commandline -i \n" up-line force-repaint # doesn't work
+    #bind -s --preset -m insert o "commandline -a \n" down-line repaint-mode
+    #bind -s --preset -m insert O beginning-of-line "commandline -i \n" up-line repaint-mode # doesn't work
 
     bind -s --preset gg beginning-of-buffer
     bind -s --preset G end-of-buffer
@@ -154,24 +154,24 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset dF begin-selection backward-jump kill-selection end-selection
     bind -s --preset dT begin-selection backward-jump forward-char kill-selection end-selection
 
-    bind -s --preset -m insert s delete-char force-repaint
-    bind -s --preset -m insert S kill-whole-line force-repaint
-    bind -s --preset -m insert cc kill-whole-line force-repaint
-    bind -s --preset -m insert C kill-line force-repaint
-    bind -s --preset -m insert c\$ kill-line force-repaint
-    bind -s --preset -m insert c\^ backward-kill-line force-repaint
-    bind -s --preset -m insert cw kill-word force-repaint
-    bind -s --preset -m insert cW kill-bigword force-repaint
-    bind -s --preset -m insert ciw forward-char forward-char backward-word kill-word force-repaint
-    bind -s --preset -m insert ciW forward-char forward-char backward-bigword kill-bigword force-repaint
-    bind -s --preset -m insert caw forward-char forward-char backward-word kill-word force-repaint
-    bind -s --preset -m insert caW forward-char forward-char backward-bigword kill-bigword force-repaint
-    bind -s --preset -m insert ce kill-word force-repaint
-    bind -s --preset -m insert cE kill-bigword force-repaint
-    bind -s --preset -m insert cb backward-kill-word force-repaint
-    bind -s --preset -m insert cB backward-kill-bigword force-repaint
-    bind -s --preset -m insert cge backward-kill-word force-repaint
-    bind -s --preset -m insert cgE backward-kill-bigword force-repaint
+    bind -s --preset -m insert s delete-char repaint-mode
+    bind -s --preset -m insert S kill-whole-line repaint-mode
+    bind -s --preset -m insert cc kill-whole-line repaint-mode
+    bind -s --preset -m insert C kill-line repaint-mode
+    bind -s --preset -m insert c\$ kill-line repaint-mode
+    bind -s --preset -m insert c\^ backward-kill-line repaint-mode
+    bind -s --preset -m insert cw kill-word repaint-mode
+    bind -s --preset -m insert cW kill-bigword repaint-mode
+    bind -s --preset -m insert ciw forward-char forward-char backward-word kill-word repaint-mode
+    bind -s --preset -m insert ciW forward-char forward-char backward-bigword kill-bigword repaint-mode
+    bind -s --preset -m insert caw forward-char forward-char backward-word kill-word repaint-mode
+    bind -s --preset -m insert caW forward-char forward-char backward-bigword kill-bigword repaint-mode
+    bind -s --preset -m insert ce kill-word repaint-mode
+    bind -s --preset -m insert cE kill-bigword repaint-mode
+    bind -s --preset -m insert cb backward-kill-word repaint-mode
+    bind -s --preset -m insert cB backward-kill-bigword repaint-mode
+    bind -s --preset -m insert cge backward-kill-word repaint-mode
+    bind -s --preset -m insert cgE backward-kill-bigword repaint-mode
 
     bind -s --preset '~' capitalize-word
     bind -s --preset gu downcase-word
@@ -215,9 +215,9 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     #
     # Lowercase r, enters replace_one mode
     #
-    bind -s --preset -m replace_one r force-repaint
-    bind -s --preset -M replace_one -m default '' delete-char self-insert backward-char force-repaint
-    bind -s --preset -M replace_one -m default \e cancel force-repaint
+    bind -s --preset -m replace_one r repaint-mode
+    bind -s --preset -M replace_one -m default '' delete-char self-insert backward-char repaint-mode
+    bind -s --preset -M replace_one -m default \e cancel repaint-mode
 
     #
     # visual mode
@@ -236,7 +236,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset -M visual W forward-bigword
     bind -s --preset -M visual e forward-word
     bind -s --preset -M visual E forward-bigword
-    bind -s --preset -M visual o swap-selection-start-stop force-repaint
+    bind -s --preset -M visual o swap-selection-start-stop repaint-mode
 
     bind -s --preset -M visual f forward-jump
     bind -s --preset -M visual t forward-jump-till
@@ -250,15 +250,15 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
         bind -s --preset -M visual $key beginning-of-line
     end
 
-    bind -s --preset -M visual -m insert c kill-selection end-selection force-repaint
-    bind -s --preset -M visual -m default d kill-selection end-selection force-repaint
-    bind -s --preset -M visual -m default x kill-selection end-selection force-repaint
-    bind -s --preset -M visual -m default X kill-whole-line end-selection force-repaint
-    bind -s --preset -M visual -m default y kill-selection yank end-selection force-repaint
-    bind -s --preset -M visual -m default '"*y' "commandline -s | xsel -p; commandline -f end-selection force-repaint"
+    bind -s --preset -M visual -m insert c kill-selection end-selection repaint-mode
+    bind -s --preset -M visual -m default d kill-selection end-selection repaint-mode
+    bind -s --preset -M visual -m default x kill-selection end-selection repaint-mode
+    bind -s --preset -M visual -m default X kill-whole-line end-selection repaint-mode
+    bind -s --preset -M visual -m default y kill-selection yank end-selection repaint-mode
+    bind -s --preset -M visual -m default '"*y' "commandline -s | xsel -p; commandline -f end-selection repaint-mode"
 
-    bind -s --preset -M visual -m default \cc end-selection force-repaint
-    bind -s --preset -M visual -m default \e end-selection force-repaint
+    bind -s --preset -M visual -m default \cc end-selection repaint-mode
+    bind -s --preset -M visual -m default \e end-selection repaint-mode
 
     # Make it easy to turn an unexecuted command into a comment in the shell history. Also, remove
     # the commenting chars so the command can be further edited then executed.
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index eca0e4425..3455053d2 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -136,6 +136,10 @@ The following special input functions are available:
 
 - ``pager-toggle-search``, toggles the search field if the completions pager is visible.
 
+- ``repaint`` reexecutes the prompt functions and redraws the prompt. Multiple successive repaints are coalesced.
+
+- ``repaint-mode`` reexecutes the fish_mode_prompt function and redraws the prompt. This is useful for vi-mode.
+
 - ``suppress-autosuggestion``, remove the current autosuggestion
 
 - ``swap-selection-start-stop``, go to the other end of the highlighted text without changing the selection
diff --git a/src/input.cpp b/src/input.cpp
index ba55f709d..421782dc5 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -112,6 +112,7 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::execute, L"execute"},
     {readline_cmd_t::beginning_of_buffer, L"beginning-of-buffer"},
     {readline_cmd_t::end_of_buffer, L"end-of-buffer"},
+    {readline_cmd_t::repaint_mode, L"repaint-mode"},
     {readline_cmd_t::repaint, L"repaint"},
     {readline_cmd_t::force_repaint, L"force-repaint"},
     {readline_cmd_t::up_line, L"up-line"},
diff --git a/src/input_common.h b/src/input_common.h
index 3b2ffb6e1..d7b061fa4 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -50,6 +50,7 @@ enum class readline_cmd_t {
     execute,
     beginning_of_buffer,
     end_of_buffer,
+    repaint_mode,
     repaint,
     force_repaint,
     up_line,
diff --git a/src/reader.cpp b/src/reader.cpp
index 53a4a2d33..04f4c8668 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -357,6 +357,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     wcstring right_prompt;
     /// The output of the last evaluation of the prompt command.
     wcstring left_prompt_buff;
+    wcstring mode_prompt_buff;
     /// The output of the last evaluation of the right prompt command.
     wcstring right_prompt_buff;
     /// Completion support.
@@ -461,6 +462,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 
     void highlight_search();
     void highlight_complete(highlight_result_t result);
+    void exec_mode_prompt();
     void exec_prompt();
 
     bool jump(jump_direction_t dir, jump_precision_t precision, editable_line_t *el,
@@ -641,7 +643,8 @@ void reader_data_t::repaint() {
     bool focused_on_pager = active_edit_line() == &pager.search_field_line;
     size_t cursor_position = focused_on_pager ? pager.cursor_position() : cmd_line->position;
 
-    s_write(&screen, left_prompt_buff, right_prompt_buff, full_line, cmd_line->size(), colors,
+    // Prepend the mode prompt to the left prompt.
+    s_write(&screen, mode_prompt_buff + left_prompt_buff, right_prompt_buff, full_line, cmd_line->size(), colors,
             indents, cursor_position, current_page_rendering, focused_on_pager);
 
     repaint_needed = false;
@@ -904,6 +907,20 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
     }
 }
 
+void reader_data_t::exec_mode_prompt() {
+    mode_prompt_buff.clear();
+    if (function_exists(MODE_PROMPT_FUNCTION_NAME)) {
+        wcstring_list_t mode_indicator_list;
+        exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list,
+                      false);
+        // We do not support multiple lines in the mode indicator, so just concatenate all of
+        // them.
+        for (size_t i = 0; i < mode_indicator_list.size(); i++) {
+            mode_prompt_buff += mode_indicator_list.at(i);
+        }
+    }
+}
+
 /// Reexecute the prompt command. The output is inserted into prompt_buff.
 void reader_data_t::exec_prompt() {
     // Clear existing prompts.
@@ -921,17 +938,7 @@ void reader_data_t::exec_prompt() {
     if (left_prompt.size() || right_prompt.size()) {
         proc_push_interactive(0);
 
-        // Prepend any mode indicator to the left prompt (issue #1988).
-        if (function_exists(MODE_PROMPT_FUNCTION_NAME)) {
-            wcstring_list_t mode_indicator_list;
-            exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list,
-                          apply_exit_status);
-            // We do not support multiple lines in the mode indicator, so just concatenate all of
-            // them.
-            for (size_t i = 0; i < mode_indicator_list.size(); i++) {
-                left_prompt_buff += mode_indicator_list.at(i);
-            }
-        }
+        exec_mode_prompt();
 
         if (!left_prompt.empty()) {
             wcstring_list_t prompt_list;
@@ -2503,6 +2510,16 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // The only thing we can cancel right now is paging, which we handled up above.
             break;
         }
+        case rl::repaint_mode: {
+            // Repaint the mode-prompt only if it exists.
+            // This is an optimization basically exclusively for vi-mode, since the prompt
+            // may sometimes take a while but when switching the mode all we care about is the mode-prompt.
+            exec_mode_prompt();
+            s_reset(&screen, screen_reset_current_line_and_prompt);
+            screen_reset_needed = false;
+            repaint();
+            break;
+        }
         case rl::force_repaint:
         case rl::repaint: {
             if (!rls.coalescing_repaints) {

From bc958712e40f7a1a72787c17e3671eee321db423 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 16:02:09 +0200
Subject: [PATCH 0230/1732] CHANGELOG INTERNAL_WCWIDTH

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2a7f789..2824e1d67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
 - The doxygen-based documentation system has been removed and replaced with one based on sphinx. All distributors and developers must migrate to that.
+- The INTERNAL_WCWIDTH build option to use the system wcwidth has been removed. We believe our wcwidth is a better choice, as it has a number of configuration options that the other path never gained (#5777).
 
 ---
 

From 99dd6d7394576d1e6e9600efef8a8375d50ba6e1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 16:04:14 +0200
Subject: [PATCH 0231/1732] Let repaint-mode act like a repaint if no
 fish_mode_prompt exists

Otherwise I'm pretty sure we'd get complaints from people who use a
mode-indicator elsewhere in their prompts.
---
 sphinx_doc_src/cmds/bind.rst |  2 +-
 src/reader.cpp               | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 3455053d2..394bb42f1 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -138,7 +138,7 @@ The following special input functions are available:
 
 - ``repaint`` reexecutes the prompt functions and redraws the prompt. Multiple successive repaints are coalesced.
 
-- ``repaint-mode`` reexecutes the fish_mode_prompt function and redraws the prompt. This is useful for vi-mode.
+- ``repaint-mode`` reexecutes the fish_mode_prompt function and redraws the prompt. This is useful for vi-mode. If no fish_mode_prompt exists, it acts like a normal repaint.
 
 - ``suppress-autosuggestion``, remove the current autosuggestion
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 04f4c8668..acdd9ad3f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2514,11 +2514,15 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // Repaint the mode-prompt only if it exists.
             // This is an optimization basically exclusively for vi-mode, since the prompt
             // may sometimes take a while but when switching the mode all we care about is the mode-prompt.
-            exec_mode_prompt();
-            s_reset(&screen, screen_reset_current_line_and_prompt);
-            screen_reset_needed = false;
-            repaint();
-            break;
+            if (function_exists(MODE_PROMPT_FUNCTION_NAME)) {
+                exec_mode_prompt();
+                s_reset(&screen, screen_reset_current_line_and_prompt);
+                screen_reset_needed = false;
+                repaint();
+                break;
+            }
+            // If it doesn't exist, we repaint as normal.
+            /* fallthrough */
         }
         case rl::force_repaint:
         case rl::repaint: {

From ab92baf671cba7e4ac207725505b0c916b8ff198 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 1 Apr 2019 16:14:00 +0200
Subject: [PATCH 0232/1732] CHANGELOG repaint-mode

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2824e1d67..2b68a2692 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
   - `vagrant`
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
+- If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.

From dd007c29f4b9b94155b194fba3a140f5bd7a2e62 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 1 Apr 2019 20:19:28 -0700
Subject: [PATCH 0233/1732] Revert "parser: try to avoid some strings being
 copied"

This reverts commit 7a74198aa3cf88585eee879bd608df36fca12ced.

Believe it or not this commit actually increased copying. When accepting
a value you know you're going to take ownership of, just accept it by
value; then temporaries can invoke the move ctor and blah blah blah.

We really need a lightweight refcounted pass-by-value string to make this
less error prone.
---
 src/parse_tree.cpp | 2 +-
 src/parse_tree.h   | 2 +-
 src/parser.cpp     | 2 +-
 src/parser.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index d2e3774af..cd7b35568 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1135,7 +1135,7 @@ const parse_node_t *parse_node_tree_t::get_child(const parse_node_t &parent, nod
     return result;
 }
 
-parsed_source_ref_t parse_source(const wcstring &src, parse_tree_flags_t flags, parse_error_list_t *errors,
+parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_error_list_t *errors,
                                  parse_token_type_t goal) {
     parse_node_tree_t tree;
     if (!parse_tree_from_string(src, flags, &tree, errors, goal)) return {};
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 8fc536131..9e032f11d 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -233,7 +233,7 @@ struct parsed_source_t {
 };
 /// Return a shared pointer to parsed_source_t, or null on failure.
 using parsed_source_ref_t = std::shared_ptr<const parsed_source_t>;
-parsed_source_ref_t parse_source(const wcstring &src, parse_tree_flags_t flags, parse_error_list_t *errors,
+parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_error_list_t *errors,
                                  parse_token_type_t goal = symbol_job_list);
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 4b0a75082..a36faa4f4 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -618,7 +618,7 @@ profile_item_t *parser_t::create_profile_item() {
     return result;
 }
 
-int parser_t::eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type) {
+int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type) {
     // Parse the source into a tree, if we can.
     parse_error_list_t error_list;
     parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list);
diff --git a/src/parser.h b/src/parser.h
index e6409c283..6648b069b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -222,7 +222,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// \param block_type The type of block to push on the block stack
     ///
     /// \return 0 on success, 1 on a parse error.
-    int eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
+    int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluate the parsed source ps.
     void eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);

From aa3dff098c511492a958cb05013c37309477de84 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Apr 2019 12:46:23 +0200
Subject: [PATCH 0234/1732] docs/string: Add paragraph on comparison with unix
 tools

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index b7fa6752c..13e3608b6 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -226,6 +226,21 @@ And some other things:
 - ``^`` is the start of the string or line, ``$`` the end.
 - ``|`` is "alternation", i.e. the "or".
 
+Comparison to other tools
+-------------------------
+
+Most operations ``string`` supports can also be done by external tools. Some of these include ``grep``, ``sed`` and ``cut``.
+
+If you are familiar with these, it is useful to know how ``string`` differs from them.
+
+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` and `replace` default to glob-mode. 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/` 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``.
+
+``string split somedelimiter`` is a replacement for ``tr somedeliminter \n`.
+
 Examples
 --------
 

From 318fe3c04655756c55ec7268f87664cc568e4677 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 3 Apr 2019 19:49:38 +0200
Subject: [PATCH 0235/1732] docs/string: Replace doesn't do globs

As a bit of weirdness in string's design, replace does literal
matching (`*` aren't expanded) by default, not globs.

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 13e3608b6..220247026 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -235,7 +235,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` and `replace` default to glob-mode. 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, whie `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/` 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 e2ed6baf43c89ab4fe54dd8ea245c20b4fdb207f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 3 Apr 2019 16:47:05 -0700
Subject: [PATCH 0236/1732] Make the output/errput test more robust by sorting
 output

---
 tests/test1.in  | 2 +-
 tests/test1.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test1.in b/tests/test1.in
index 41fc71caa..51302c2a3 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -110,7 +110,7 @@ echo Test 5 $sta
 
 logmsg Verify that we can turn stderr into stdout and then pipe it
 # Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'.
-begin ; echo output ; echo errput 1>&2  ; end 2>&1 | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
+begin ; echo output ; echo errput 1>&2  ; end 2>&1 | sort | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
 
 logmsg "Test that trailing ^ doesn't trigger redirection, see #1873"
 echo caret_no_redirect 12345^
diff --git a/tests/test1.out b/tests/test1.out
index 8ac15efc6..6c141412d 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -44,10 +44,10 @@ Test 5 pass
 
 ####################
 # Verify that we can turn stderr into stdout and then pipe it
-output
 errput
 output
 errput
+output
 
 ####################
 # Test that trailing ^ doesn't trigger redirection, see #1873

From bc66921ac9c10bf6a36e2b9b9f9dd83347b1d3e6 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 3 Apr 2019 20:38:29 -0500
Subject: [PATCH 0237/1732] Optimize keyword detection

The data stored in these containers is small enough that it is worth
creating distinct sets for each lookup.

In a microbenchmark of these changes, the single-lookup version of the
function with lookups gated on the length of input (bypassed entirely if
the input is longer than the longest key in the container) provided a
1.5x-3.5x speedup over the previous implementation.

Additionally, as the collections are static and their contents are never
modified after startup, it makes no sense to continously calculate the
location of and allocate an iterator for the `!= foo.end()` comparison;
the end iterator is now statically cached.

I'm not expecting massive speed gains out of this change, but the parser
does perform enough of these to make it worth optimizing in this way.
---
 src/parser_keywords.cpp | 84 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 14 deletions(-)

diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 4711d178d..7f1bdecc7 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -8,26 +8,82 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "parser_keywords.h"
 
+typedef std::unordered_set<wcstring> string_set_t;
+
+static const wcstring skip_keywords[] {
+        L"else",
+        L"begin",
+};
+
+static const wcstring subcommand_keywords[] {
+        L"command", L"builtin", L"while", L"exec",
+        L"if",      L"and",     L"or",    L"not"
+};
+
+static const string_set_t block_keywords = {
+        L"for",      L"while",  L"if",
+        L"function", L"switch", L"begin"
+};
+
+static const wcstring reserved_keywords[] = {
+        L"end",      L"case",   L"else",     L"return",
+        L"continue", L"break",  L"argparse", L"read",
+        L"set",      L"status", L"test",     L"["
+};
+
+// The lists above are purposely implemented separately from the logic below, so that future
+// maintainers may assume the contents of the list based off their names, and not off what the
+// functions below require them to contain.
+
+static size_t list_max_length(const string_set_t &list) {
+    size_t result = 0;
+    for (const auto &w: list) {
+        if (w.length() > result) {
+            result = w.length();
+        }
+    }
+    return result;
+}
+
 bool parser_keywords_skip_arguments(const wcstring &cmd) {
-    static const wcstring el = L"else";
-    static const wcstring beg = L"begin";
-    return cmd == el || cmd == beg;
+    return cmd == skip_keywords[0] || cmd == skip_keywords[1];
 }
 
-static const std::unordered_set<wcstring> subcommand_keywords = {L"command", L"builtin", L"while", L"exec",
-                                                     L"if",      L"and",     L"or",    L"not"};
 bool parser_keywords_is_subcommand(const wcstring &cmd) {
-    return parser_keywords_skip_arguments(cmd) || contains(subcommand_keywords, cmd);
+    const static string_set_t search_list = ([](){
+        string_set_t results;
+        results.insert(std::begin(subcommand_keywords), std::end(subcommand_keywords));
+        results.insert(std::begin(skip_keywords), std::end(skip_keywords));
+        return results;
+    })();
+
+    const static auto max_len = list_max_length(search_list);
+    const static auto not_found = search_list.end();
+
+    // Everything above is executed only at startup, this is the actual optimized search routine:
+    return cmd.length() <= max_len && search_list.find(cmd) != not_found;
 }
 
-static const std::unordered_set<wcstring> block_keywords = {L"for",      L"while",  L"if",
-                                                L"function", L"switch", L"begin"};
-bool parser_keywords_is_block(const wcstring &word) { return contains(block_keywords, word); }
+bool parser_keywords_is_block(const wcstring &word) {
+    const static auto max_len = list_max_length(block_keywords);
+    const static auto not_found = block_keywords.end();
+
+    // Everything above is executed only at startup, this is the actual optimized search routine:
+    return word.length() <= max_len && block_keywords.find(word) != not_found;
+}
 
-static const std::unordered_set<wcstring> reserved_keywords = {L"end",      L"case",   L"else",     L"return",
-                                                   L"continue", L"break",  L"argparse", L"read",
-                                                   L"set",      L"status", L"test",     L"["};
 bool parser_keywords_is_reserved(const wcstring &word) {
-    return parser_keywords_is_block(word) || parser_keywords_is_subcommand(word) ||
-           contains(reserved_keywords, word);
+    const static string_set_t search_list = ([](){
+        string_set_t results;
+        results.insert(std::begin(subcommand_keywords), std::end(subcommand_keywords));
+        results.insert(std::begin(skip_keywords), std::end(skip_keywords));
+        results.insert(std::begin(block_keywords), std::end(block_keywords));
+        results.insert(std::begin(reserved_keywords), std::end(reserved_keywords));
+        return results;
+    })();
+    const static auto max_len = list_max_length(search_list);
+    const static auto not_found = search_list.end();
+
+    // Everything above is executed only at startup, this is the actual optimized search routine:
+    return word.length() <= max_len && search_list.find(word) != not_found;
 }

From 09e8f0fd7cef9fa59c7d9776577529b535569f57 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 4 Apr 2019 13:40:20 -0700
Subject: [PATCH 0238/1732] rearrange structure fields

Putting larger members before smaller ones will reduce structure
sizes. bools are 1 byte. on 64bit systems I think they reduced:

wgetopt.h:46: 64 to 56 bytes
builtin_history.cpp:30: 48 to 32 bytes
builtin_status.cpp:91: 32 to 24 bytes
tinyexpr.cpp:69: 40 to 32 bytes
---
 src/builtin_history.cpp |  6 +++---
 src/builtin_status.cpp  |  2 +-
 src/tinyexpr.cpp        |  3 +--
 src/wgetopt.h           | 19 +++++++++----------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 583657ae9..09610b3c7 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -28,12 +28,12 @@ static const enum_map<hist_cmd_t> hist_enum_map[] = {
     {HIST_SAVE, L"save"},   {HIST_SEARCH, L"search"}, {HIST_UNDEF, NULL}};
 
 struct history_cmd_opts_t {
-    bool print_help = false;
     hist_cmd_t hist_cmd = HIST_UNDEF;
     history_search_type_t search_type = (history_search_type_t)-1;
-    size_t max_items = SIZE_MAX;
-    bool history_search_type_defined = false;
     const wchar_t *show_time_format = NULL;
+    size_t max_items = SIZE_MAX;
+    bool print_help = false;
+    bool history_search_type_defined = false;
     bool case_sensitive = false;
     bool null_terminate = false;
     bool reverse = false;
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index c11aa4a5d..fe253ecfd 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -90,11 +90,11 @@ static maybe_t<job_control_t> job_control_str_to_mode(const wchar_t *mode, wchar
 }
 
 struct status_cmd_opts_t {
-    bool print_help{false};
     int level{1};
     maybe_t<job_control_t> new_job_control_mode{};
     const wchar_t *feature_name{};
     status_cmd_t status_cmd{STATUS_UNDEF};
+    bool print_help{false};
 };
 
 /// Note: Do not add new flags that represent subcommands. We're encouraging people to switch to
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index e4ae70a34..e4afe469b 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -67,11 +67,10 @@ typedef struct te_builtin {
 } te_builtin;
 
 typedef struct state {
+    union {double value; const void *function;};
     const char *start;
     const char *next;
     int type;
-    union {double value; const void *function;};
-
     te_error_type_t error;
 } state;
 
diff --git a/src/wgetopt.h b/src/wgetopt.h
index f5de1a57a..ae5ed0b21 100644
--- a/src/wgetopt.h
+++ b/src/wgetopt.h
@@ -45,9 +45,6 @@ Cambridge, MA 02139, USA.  */
 
 class wgetopter_t {
    private:
-    bool initialized = false;
-    bool missing_arg_return_colon = false;
-
     void exchange(wchar_t **argv);
     void _wgetopt_initialize(const wchar_t *optstring);
     int _wgetopt_internal(int argc, wchar_t **argv, const wchar_t *optstring,
@@ -60,6 +57,8 @@ class wgetopter_t {
                                                   int *exact, int *ambig, int *indfound);
     void _update_long_opt(int argc, wchar_t **argv, const struct woption *pfound, wchar_t *nameend,
                           int *longind, int option_index, int *retval);
+    bool initialized = false;
+    bool missing_arg_return_colon = false;
 
    public:
     // For communication from `getopt' to the caller. When `getopt' finds an option that takes an
@@ -69,6 +68,13 @@ class wgetopter_t {
 
     const wchar_t *shortopts = nullptr;
 
+    // The next char to be scanned in the option-element in which the last option character we
+    // returned was found. This allows us to pick up the scan where we left off.
+    //
+    // If this is zero, or a null string, it means resume the scan by advancing to the next
+    // ARGV-element.
+    wchar_t *nextchar = nullptr;
+
     // Index in ARGV of the next element to be scanned. This is used for communication to and from
     // the caller and for communication between successive calls to `getopt'.
     //
@@ -83,13 +89,6 @@ class wgetopter_t {
     // XXX 1003.2 says this must be 1 before any call.
     int woptind = 0;
 
-    // The next char to be scanned in the option-element in which the last option character we
-    // returned was found. This allows us to pick up the scan where we left off.
-    //
-    // If this is zero, or a null string, it means resume the scan by advancing to the next
-    // ARGV-element.
-    wchar_t *nextchar = nullptr;
-
     // Callers store zero here to inhibit the error message for unrecognized options.
     int wopterr = 0;
 

From b064eaa571d9ba9e7610f59ca93e78cff1a694fc Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 4 Apr 2019 14:16:34 -0700
Subject: [PATCH 0239/1732] use std::move in a couple spots where things were
 unsed after copy

---
 src/env.cpp  | 8 ++++----
 src/path.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 1a4080d7d..268234221 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -195,7 +195,7 @@ struct var_stack_t {
         }
 
         node->next = this->top;
-        this->top = node;
+        this->top = std::move(node);
         if (new_scope && local_scope_exports(this->top)) {
             this->mark_changed_exported();
         }
@@ -1160,7 +1160,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
         bool has_changed_new = false;
         env_node_ref_t preexisting_node = get_node(key);
         maybe_t<env_var_t::env_var_flags_t> preexisting_flags{};
-        if (preexisting_node != NULL) {
+        if (preexisting_node != nullptr) {
             var_table_t::const_iterator result = preexisting_node->env.find(key);
             assert(result != preexisting_node->env.end());
             preexisting_flags = result->second.get_flags();
@@ -1174,8 +1174,8 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
             node = vars_stack().global_env;
         } else if (var_mode & ENV_LOCAL) {
             node = vars_stack().top;
-        } else if (preexisting_node != NULL) {
-            node = preexisting_node;
+        } else if (preexisting_node != nullptr) {
+            node = std::move(preexisting_node);
             if ((var_mode & (ENV_EXPORT | ENV_UNEXPORT)) == 0) {
                 // Use existing entry's exportv status.
                 if (preexisting_flags && (*preexisting_flags & env_var_t::flag_export)) {
diff --git a/src/path.cpp b/src/path.cpp
index 937738664..0a47f11ee 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -185,7 +185,7 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
             expand_tilde(next_path, env_vars);
             if (next_path.empty()) continue;
 
-            wcstring whole_path = next_path;
+            wcstring whole_path = std::move(next_path);
             append_path_component(whole_path, dir);
             paths.push_back(whole_path);
         }

From b4ddd797e31bdf120dc6a2a08974d8ed8fb905e7 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 4 Apr 2019 14:24:36 -0700
Subject: [PATCH 0240/1732] remove unused wcstring

---
 src/complete.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 481cff7d5..d4091855d 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1124,7 +1124,6 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
     size_t varlen = str.length() - start_offset;
     bool res = false;
 
-    const wcstring_list_t names = vars.get_names(0);
     for (const wcstring &env_name : vars.get_names(0)) {
         string_fuzzy_match_t match =
             string_fuzzy_match_string(var, env_name, this->max_fuzzy_match_type());

From be80a56ad4a9bc834cd388e9d04a302e246bade4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 4 Apr 2019 17:31:54 -0700
Subject: [PATCH 0241/1732] expand.cpp: use wcspbrk for is_quotable

---
 src/expand.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 408176166..7d73ff3ca 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -124,24 +124,11 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
 
 /// Test if the specified string does not contain character which can not be used inside a quoted
 /// string.
-static int is_quotable(const wchar_t *str) {
-    switch (*str) {
-        case 0: {
-            return 1;
-        }
-        case L'\n':
-        case L'\t':
-        case L'\r':
-        case L'\b':
-        case L'\x1B': {
-            return 0;
-        }
-        default: { return is_quotable(str + 1); }
-    }
-    return 0;
+static bool is_quotable(const wchar_t *str) {
+    return !std::wcspbrk(str, L"\n\t\r\b\x1B");
 }
 
-static int is_quotable(const wcstring &str) { return is_quotable(str.c_str()); }
+static bool is_quotable(const wcstring &str) { return is_quotable(str.c_str()); }
 
 wcstring expand_escape_variable(const env_var_t &var) {
     wcstring buff;
@@ -1115,6 +1102,7 @@ expand_error_t expand_to_command_and_args(const wcstring &instr, const environme
                                           parse_error_list_t *errors) {
     // Fast path.
     if (expand_is_clean(instr)) {
+
         *out_cmd = instr;
         return EXPAND_OK;
     }

From 2e6264558c1d548b95c2cb6eb1491d139af3a9e2 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 4 Apr 2019 22:25:45 -0500
Subject: [PATCH 0242/1732] Fix remaining realpath test issue with symlinks

Pursuant to 0be79038590d3473b75252bf50ade2f62ea9c207, there still
remained one issue with the test when run from within a symlinked
directory after fish gained support for cding into symlinks.

This change should make the test function OK both when the tests are run
out of a PWD containing a symlink in its hierarchy and when run
otherwise.
---
 tests/realpath.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/realpath.in b/tests/realpath.in
index abaccf4cd..89397dd64 100644
--- a/tests/realpath.in
+++ b/tests/realpath.in
@@ -11,7 +11,7 @@ end
 
 # A non-existent file relative to $PWD succeeds.
 set -l real_path (builtin realpath nonexistent-file)
-if test "$real_path" = "$PWD/nonexistent-file"
+if test "$real_path" = (realpath $PWD)"/nonexistent-file"
     echo nonexistent-file in PWD correctly converted
 end
 

From 2a3677b38659835858c9d557e7d920630bfbcbb8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 5 Apr 2019 12:29:57 +0200
Subject: [PATCH 0243/1732] Stop setting term-modes early

This set the term modes to the shell-modes, including disabling
ICRNL (translating \cm to \cj) and echo.

The rationale given was that `reader_interactive_init()` would only be
called >= 250ms later, which I _highly_ doubt considering fish's total
startup time is 8ms for me.

The main idea was that this would stop programs like tmuxinator that
send shortcuts early from failing _iff_ the shortcut was \cj, which
also seems quite unusual.

This works both with `rm -i` and `read` in config.fish, because `read`
explicitly calls `reader_push`, which then initializes the shell modes.

The real fix would involve reordering our init so we set up the
modesetting first, but that's quite involved and the remaining issue
should barely happen, while it's fairly common to have issues with a
prompt in config.fish, and the workaround for the former is simpler, so let's leave it for now.

Partially reverts #2578.

Fixes #2980.
---
 src/fish_key_reader.cpp |  3 +++
 src/reader.cpp          | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index ba688b4e7..36fdd0fa8 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -286,6 +286,9 @@ static void setup_and_process_keys(bool continuous_mode) {
     proc_push_interactive(1);
     env_init();
     reader_init();
+    // We need to set the shell-modes for ICRNL,
+    // in fish-proper this is done once a command is run.
+    tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes);
     install_our_signal_handlers();
 
     if (continuous_mode) {
diff --git a/src/reader.cpp b/src/reader.cpp
index acdd9ad3f..aa800efe1 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1001,18 +1001,6 @@ void reader_init() {
     shell_modes.c_cc[VMIN] = 1;
     shell_modes.c_cc[VTIME] = 0;
 
-    // We don't use term_steal because this can fail if fd 0 isn't associated with a tty and this
-    // function is run regardless of whether stdin is tied to a tty. This is harmless in that case.
-    // We do it unconditionally because disabling ICRNL mode (see above) needs to be done at the
-    // earliest possible moment. Doing it here means it will be done within approximately 1 ms of
-    // the start of the shell rather than 250 ms (or more) when reader_interactive_init is
-    // eventually called.
-    //
-    // TODO: Remove this condition when issue #2315 and #1041 are addressed.
-    if (is_interactive_session) {
-        tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes);
-    }
-
     // We do this not because we actually need the window size but for its side-effect of correctly
     // setting the COLUMNS and LINES env vars.
     get_current_winsize();

From 357a572b43bcd908afcf294518a7587fa75a1223 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 5 Apr 2019 14:08:58 +0200
Subject: [PATCH 0244/1732] docs/index: Document repaint-mode

This was only mentioned in passing in the bind docs.

[ci skip]
---
 sphinx_doc_src/index.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index f6b72f568..3f27ebef0 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1483,6 +1483,8 @@ It is also possible to add all emacs-mode bindings to vi-mode by using something
 
 When in vi-mode, the `fish_mode_prompt <cmds/fish_mode_prompt.html>`_ function will display a mode indicator to the left of the prompt. The ``fish_vi_cursor`` function will be used to change the cursor's shape depending on the mode in supported terminals. To disable this feature, override it with an empty function. To display the mode elsewhere (like in your right prompt), use the output of the ``fish_default_mode_prompt`` function.
 
+When a binding switches the mode, it will repaint the mode-prompt if it exists, and the rest of the prompt only if it doesn't. So if you want a mode-indicator in your ``fish_prompt``, you need to erase ``fish_mode_prompt`` e.g. by adding an empty file at `~/.config/fish/functions/fish_mode_prompt.fish`. (Bindings that change the mode are supposed to call the `repaint-mode` bind function, see :ref:`bind <cmd-bind>`)
+
 .. _vi-mode-command:
 
 Command mode

From 21ef9f5150624c159e964161ad59b65192236084 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 5 Apr 2019 14:09:41 +0200
Subject: [PATCH 0245/1732] docs: Remove fish_vi_mode documentation

This has been deprecated for quite a while, no need to keep the docs around.

[ci skip]
---
 sphinx_doc_src/cmds/fish_vi_mode.rst | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 sphinx_doc_src/cmds/fish_vi_mode.rst

diff --git a/sphinx_doc_src/cmds/fish_vi_mode.rst b/sphinx_doc_src/cmds/fish_vi_mode.rst
deleted file mode 100644
index 61d8bb713..000000000
--- a/sphinx_doc_src/cmds/fish_vi_mode.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _cmd-fish_vi_mode:
-
-fish_vi_mode - Enable vi mode
-=============================
-
-Synopsis
---------
-
-fish_vi_mode
-
-
-Description
------------
-
-This function is deprecated. Please call ``fish_vi_key_bindings directly``
-
-``fish_vi_mode`` enters a vi-like command editing mode. To always start in vi mode, add ``fish_vi_mode`` to your ``config.fish`` file.

From 4e555aebec474412d0ce10ba6692cb5a2172c0c6 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 6 Apr 2019 02:06:13 -0700
Subject: [PATCH 0246/1732] Remove is_whitespace and whitespace character
 string declarations

I don't doubt such functions and character arrays could be useful,
to keep things consistent, but they are not actually being used.
---
 src/common.cpp | 19 -------------------
 src/common.h   |  8 --------
 2 files changed, 27 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index d097f5844..73e2f43ae 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -78,7 +78,6 @@ const wchar_t *program_name;
 int debug_level = 1;         // default maximum debug output level (errors and warnings)
 int debug_stack_frames = 0;  // default number of stack frames to show on debug() calls
 
-
 /// Be able to restore the term's foreground process group.
 /// This is set during startup and not modified after.
 static pid_t initial_fg_process_group = -1;
@@ -93,24 +92,6 @@ static volatile bool termsize_valid = false;
 static char *wcs2str_internal(const wchar_t *in, char *out);
 static void debug_shared(const wchar_t msg_level, const wcstring &msg);
 
-bool is_whitespace(wchar_t c) {
-    switch (c) {
-        case ' ':
-        case '\t':
-        case '\r':
-        case '\n':
-        case '\v':
-            return true;
-        default:
-            return false;
-    }
-}
-
-bool is_whitespace(const wcstring &input) {
-    bool (*pred)(wchar_t c) = is_whitespace;
-    return std::all_of(input.begin(), input.end(), pred);
-}
-
 #if defined(OS_IS_CYGWIN) || defined(WSL)
 // MS Windows tty devices do not currently have either a read or write timestamp. Those
 // respective fields of `struct stat` are always the current time. Which means we can't
diff --git a/src/common.h b/src/common.h
index cf6963349..98785ab24 100644
--- a/src/common.h
+++ b/src/common.h
@@ -217,14 +217,6 @@ extern const wchar_t *program_name;
 /// Set to false if it's been determined we can't trust the last modified timestamp on the tty.
 extern const bool has_working_tty_timestamps;
 
-/// A list of all whitespace characters
-extern const wcstring whitespace;
-extern const char *whitespace_narrow;
-
-bool is_whitespace(const wchar_t input);
-bool is_whitespace(const wcstring &input);
-inline bool is_whitespace(const wchar_t *input) { return is_whitespace(wcstring(input)); }
-
 /// This macro is used to check that an argument is true. It is a bit like a non-fatal form of
 /// assert. Instead of exiting on failure, the current function is ended at once. The second
 /// parameter is the return value of the current function on failure.

From f1614a995ab187df6de4025ae288f27fa4cd7768 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 20:37:14 +0200
Subject: [PATCH 0247/1732] docs: Reword `commandline -f`

We don't refer to "readline functions" anywhere else, and "injecting"
them "into the reader" is an overly jargony way of expressing it that
only makes sense to someone familiar with the internals. And even then
the term "readline" is already taken by the "readline" library, used
by bash et al, but not by us.

So we pick the term "input functions", like we did in bind.

See https://stackoverflow.com/questions/55542839/what-does-commandline-f-repaint-in-fish-shell/55543411#55543411.

[ci skip]
---
 sphinx_doc_src/cmds/commandline.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/commandline.rst b/sphinx_doc_src/cmds/commandline.rst
index 67e35cb7d..ee012beff 100644
--- a/sphinx_doc_src/cmds/commandline.rst
+++ b/sphinx_doc_src/cmds/commandline.rst
@@ -22,7 +22,7 @@ The following options are available:
 
 - ``-C`` or ``--cursor`` set or get the current cursor position, not the contents of the buffer. If no argument is given, the current cursor position is printed, otherwise the argument is interpreted as the new cursor position.
 
-- ``-f`` or ``--function`` inject readline functions into the reader. This option cannot be combined with any other option. It will cause any additional arguments to be interpreted as readline functions, and these functions will be injected into the reader, so that they will be returned to the reader before any additional actual key presses are read.
+- ``-f`` or ``--function`` causes any additional arguments to be interpreted as input functions, and puts them into the queue, so that they will be read before any additional actual key presses are. This option cannot be combined with any other option. See :ref:`bind <cmd-bind>` for a list of input functions.
 
 The following options change the way ``commandline`` updates the command line buffer:
 

From 6e3c87f4c3c4bbe3b3f8f4b26ed05564d3e27d3c Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 6 Apr 2019 10:04:45 -0700
Subject: [PATCH 0248/1732] Add completions for git-merge-base

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 6293142e7..8c66fdfaf 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1169,6 +1169,15 @@ complete -f -c git -n '__fish_git_using_command merge' -s no-rerere-autoupdate -
 complete -f -c git -n '__fish_git_using_command merge' -l abort -d 'Abort the current conflict resolution process'
 complete -f -c git -n '__fish_git_using_command merge' -l continue -d 'Conclude current conflict resolution process'
 
+### merge-base
+complete -f -c git -n '__fish_git_needs_command' -a merge-base -d 'Find as good common ancestors as possible for a merge'
+complete -f -c git -n '__fish_git_using_command merge-base' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command merge-base' -s a -l all -d 'Output all merge bases for the commits, instead of just one'
+complete -f -c git -n '__fish_git_using_command merge-base' -l octopus -d 'Compute the best common ancestors of all supplied commits'
+complete -f -c git -n '__fish_git_using_command merge-base' -l independent -d 'Print a minimal subset of the supplied commits with the same ancestors.'
+complete -f -c git -n '__fish_git_using_command merge-base' -l is-ancestor -d 'Check if the first commit is an ancestor of the second commit'
+complete -f -c git -n '__fish_git_using_command merge-base' -l fork-point -d 'Find the point at which a branch forked from another branch ref'
+
 ### mergetool
 
 complete -f -c git -n '__fish_git_needs_command' -a mergetool -d 'Run merge conflict resolution tools to resolve merge conflicts'

From 0bd8c61e7eb1778ccb70d758dc42ba3c3bb662ce Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 6 Apr 2019 10:38:52 -0700
Subject: [PATCH 0249/1732] Add completions for git-ls-files

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 8c66fdfaf..9392b79c7 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1135,6 +1135,35 @@ complete -c git -n '__fish_git_using_command log' -l no-prefix
 complete -x -c git -n '__fish_git_using_command log' -l line-prefix
 complete -c git -n '__fish_git_using_command log' -l ita-invisible-in-index
 
+### ls-files
+complete -c git -n '__fish_git_needs_command' -a ls-files -d 'Show information about files in the index and the working tree'
+complete -c git -n '__fish_git_using_command ls-files'
+complete -c git -n '__fish_git_using_command ls-files' -s c -l cached -d 'Show cached files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s d -l deleted -d 'Show deleted files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s m -l modified -d 'Show modified files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s o -l others -d 'Show other (i.e. untracked) files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s i -l ignored -d 'Show only ignored files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s s -l staged -d "Show staged contents' mode bits, object name and stage number in the output"
+complete -c git -n '__fish_git_using_command ls-files' -l directory -d 'If a whole directory is classified as "other", show just its name'
+complete -c git -n '__fish_git_using_command ls-files' -l no-empty-directory -d 'Do not list empty directories'
+complete -c git -n '__fish_git_using_command ls-files' -s u -l unmerged -d 'Show unmerged files in the output'
+complete -c git -n '__fish_git_using_command ls-files' -s k -l killed -d 'Show files on the filesystem that need to be removed for checkout-index to succeed'
+complete -c git -n '__fish_git_using_command ls-files' -s z -d '\0 line termination on output and do not quote filenames'
+complete -c git -n '__fish_git_using_command ls-files' -s x -l exclude -d 'Skip untracked files matching pattern'
+complete -c git -n '__fish_git_using_command ls-files' -s X -l exclude-from -d 'Read exclude patterns from <file>; 1 per line'
+complete -c git -n '__fish_git_using_command ls-files' -l exclude-per-directory -d 'Read additional exclude patterns that apply only to the directory and its subdirectories in <file>'
+complete -c git -n '__fish_git_using_command ls-files' -l exclude-standard -d 'Add the standard Git exclusions'
+complete -c git -n '__fish_git_using_command ls-files' -l error-unmatch -d 'If any <file> does not appear in the index, treat this as an error'
+complete -c git -n '__fish_git_using_command ls-files' -l with-tree
+complete -c git -n '__fish_git_using_command ls-files' -s t -d 'Identifies the file status'
+complete -c git -n '__fish_git_using_command ls-files' -s v -d 'Similar to -t but use lowercase letters for files that are marked as assume unchanged'
+complete -c git -n '__fish_git_using_command ls-files' -s f -d 'Similar to -t but use lowercase letters for files that are marked as fsmonitor valid'
+complete -c git -n '__fish_git_using_command ls-files' -l full-name -d 'Force paths to be output relative to the project top directory'
+complete -c git -n '__fish_git_using_command ls-files' -l recurse-submodules -d 'Recursively calls ls-files on each submodule in the repository'
+complete -c git -n '__fish_git_using_command ls-files' -l abbrev -d 'Show only a partial prefix'
+complete -c git -n '__fish_git_using_command ls-files' -l debug -d 'After each line that describes a file, add more data about its cache entry'
+complete -c git -n '__fish_git_using_command ls-files' -l eol -d 'Show <eolinfo> and <eolattr> of files'
+
 ### merge
 complete -f -c git -n '__fish_git_needs_command' -a merge -d 'Join two or more development histories together'
 complete -f -c git -n '__fish_git_using_command merge' -a '(__fish_git_branches)'

From 82596465b25eec7258cad6c350ca851043097a87 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 6 Apr 2019 11:00:37 -0700
Subject: [PATCH 0250/1732] Add completions for git-describe

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 9392b79c7..dd20fe9f2 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -900,6 +900,27 @@ complete -f -c git -n '__fish_git_using_command commit' -l fixup -d 'Fixup commi
 complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt fixup' -k -a '(__fish_git_recent_commits)'
 # TODO options
 
+### describe
+complete -c git -n '__fish_git_needs_command' -a describe -d 'Give an object a human readable name based on an available ref'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_branches)'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d 'Head'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree'
+complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree'
+complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use any ref found in refs/ namespace'
+complete -f -c git -n '__fish_git_using_command describe' -l tags -d 'Use any tag found in refs/tags namespace'
+complete -f -c git -n '__fish_git_using_command describe' -l contains -d 'Find the tag that comes after the commit'
+complete -f -c git -n '__fish_git_using_command describe' -l abbrev -d 'Use <n> digits, or as many digits as needed to form a unique object name'
+complete -f -c git -n '__fish_git_using_command describe' -l candidates -d 'Consider up to <n> candidates'
+complete -f -c git -n '__fish_git_using_command describe' -l exact-match -d 'Only output exact matches'
+complete -f -c git -n '__fish_git_using_command describe' -l debug -d 'Verbosely display information about the searching strategy'
+complete -f -c git -n '__fish_git_using_command describe' -l long -d 'Always output the long format'
+complete -f -c git -n '__fish_git_using_command describe' -l match -d 'Only consider tags matching the given glob pattern'
+complete -f -c git -n '__fish_git_using_command describe' -l exclude -d 'Do not consider tags matching the given glob pattern'
+complete -f -c git -n '__fish_git_using_command describe' -l always -d 'Show uniquely abbreviated commit object as fallback'
+complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Follow only the first parent commit upon seeing a merge commit'
+
 ### diff
 complete -c git -n '__fish_git_needs_command' -a diff -d 'Show changes between commits, commit and working tree, etc'
 complete -c git -n '__fish_git_using_command diff' -a '(__fish_git_ranges)'

From 2226a87b595a73ae07f94aabbf500fc905ad2b81 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 6 Apr 2019 12:18:45 -0700
Subject: [PATCH 0251/1732] Add completions for git-worktree

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index dd20fe9f2..e1372e288 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -512,6 +512,10 @@ function __fish_git_stash_not_using_subcommand
     return 0
 end
 
+function __fish_git_complete_worktrees
+    command git worktree list --porcelain | string match -er '^worktree' | string replace -r '^worktree\s*' ''
+end
+
 function __fish_git_complete_stashes
     command git stash list --format=%gd:%gs 2>/dev/null | string replace ":" \t
 end
@@ -1393,6 +1397,46 @@ complete -f -c git -n '__fish_git_using_command tag' -l contains -xka '(__fish_g
 complete -f -c git -n '__fish_git_using_command tag; and __fish_contains_opt -s d delete -s v verify' -a '(__fish_git_tags)' -d 'Tag'
 # TODO options
 
+### worktree
+set -l git_worktree_commands add list lock move prune remove unlock
+complete -c git -n '__fish_git_needs_command' -a worktree -d 'Manage multiple working trees'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a add -d 'Create a working tree'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a list -d 'List details of each worktree'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a lock -d 'Unlock a working tree'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a move -d 'Move a working tree to a new location'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a prune -d 'Prune working tree information in $GIT_DIR/worktrees'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a remove -d 'Remove a working tree'
+complete -f -c git -n "__fish_git_using_command worktree; and not __fish_seen_subcommand_from $git_worktree_commands" -a unlock -d 'Unlock a working tree'
+
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add move remove' -s f -l force -d 'Override safeguards'
+
+complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add'
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_branches)'
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_heads)' -d 'Head'
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s b -d 'Create a new branch'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s B -d 'Create a new branch even if it already exists'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l detach -d 'Detach HEAD in the new working tree'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l checkout -d 'Checkout <commit-ish> after creating working tree'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l no-checkout -d 'Suppress checkout'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l guess-remote
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l no-guess-remote
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l track -d 'Mark <commit-ish> as "upstream" from the new branch'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l no-track -d 'Don\'t mark <commit-ish> as "upstream" from the new branch'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l lock -d 'Lock working tree after creation'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s q -l quiet -d 'Suppress feedback messages'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from list' -l porcelain -d 'Output in an easy-to-parse format for scripts'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -a '(__fish_git_complete_worktrees)'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -l reason -d 'An explanation why the working tree is locked'
+complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move' -a '(__fish_git_complete_worktrees)'
+complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s n -l dry-run -d 'Do not remove anything'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s v -l verbose -d 'Report all removals'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -l expire -d 'Only expire unused working trees older than <time>'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from remove' -a '(__fish_git_complete_worktrees)'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from unlock' -a '(__fish_git_complete_worktrees)'
+
 ### stash
 complete -c git -n '__fish_git_needs_command' -a stash -d 'Stash away changes'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a list -d 'List stashes'

From 78931d78bd91e3175cf3e47ff81312a14139a883 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 21:45:17 +0200
Subject: [PATCH 0252/1732] completions/git: Handle diff --cached

Fixes #5785.

[ci skip]
---
 share/completions/git.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 6293142e7..7d2530276 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -911,7 +911,8 @@ complete -c git -n '__fish_git_using_command diff' -s 1 -l base -d 'Compare the
 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"'
 complete -c git -n '__fish_git_using_command diff' -s 0 -d 'Omit diff output for unmerged entries and just show "Unmerged"'
-complete -f -c git -n '__fish_git_using_command diff' -a '(__fish_git_files modified deleted)'
+complete -c git -n '__fish_git_using_command diff; and not __fish_contains_opt cached' -fa '(__fish_git_files modified deleted)'
+complete -c git -n '__fish_git_using_command diff; and __fish_contains_opt cached' -fa '(__fish_git_files modified-staged deleted-staged)'
 
 ### Function to list available tools for git difftool and mergetool
 

From 724dd06c625aff777b42d9898db7be229e713fac Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 6 Apr 2019 14:04:28 -0700
Subject: [PATCH 0253/1732] Add completions for git-help

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e1372e288..ea4ad712a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1571,6 +1571,7 @@ complete -f -c git -n '__fish_git_using_command help' -a clean -d 'Remove untrac
 complete -f -c git -n '__fish_git_using_command help' -a clone -d 'Clone a repository into a new directory'
 complete -f -c git -n '__fish_git_using_command help' -a commit -d 'Record changes to the repository'
 complete -f -c git -n '__fish_git_using_command help' -a config -d 'Set and read git configuration variables'
+complete -f -c git -n '__fish_git_using_command help' -a describe -d 'Give an object a human readable name based on an available ref'
 complete -f -c git -n '__fish_git_using_command help' -a diff -d 'Show changes between commits, commit and working tree, etc'
 complete -f -c git -n '__fish_git_using_command help' -a difftool -d 'Open diffs in a visual tool'
 complete -f -c git -n '__fish_git_using_command help' -a fetch -d 'Download objects and refs from another repository'
@@ -1579,7 +1580,9 @@ complete -f -c git -n '__fish_git_using_command help' -a format-patch -d 'Genera
 complete -f -c git -n '__fish_git_using_command help' -a grep -d 'Print lines matching a pattern'
 complete -f -c git -n '__fish_git_using_command help' -a init -d 'Create an empty git repository or reinitialize an existing one'
 complete -f -c git -n '__fish_git_using_command help' -a log -d 'Show commit logs'
+complete -f -c git -n '__fish_git_using_command help' -a ls-files -d 'Show information about files in the index and the working tree'
 complete -f -c git -n '__fish_git_using_command help' -a merge -d 'Join two or more development histories together'
+complete -f -c git -n '__fish_git_using_command help' -a merge-base -d 'Find as good common ancestors as possible for a merge'
 complete -f -c git -n '__fish_git_using_command help' -a mergetool -d 'Run merge conflict resolution tools to resolve merge conflicts'
 complete -f -c git -n '__fish_git_using_command help' -a mv -d 'Move or rename a file, a directory, or a symlink'
 complete -f -c git -n '__fish_git_using_command help' -a prune -d 'Prune all unreachable objects from the object database'
@@ -1597,6 +1600,7 @@ complete -f -c git -n '__fish_git_using_command help' -a status -d 'Show the wor
 complete -f -c git -n '__fish_git_using_command help' -a submodule -d 'Initialize, update or inspect submodules'
 complete -f -c git -n '__fish_git_using_command help' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
 complete -f -c git -n '__fish_git_using_command help' -a whatchanged -d 'Show logs with difference each commit introduces'
+complete -f -c git -n '__fish_git_using_command help' -a worktree -d 'Manage multiple working trees'
 
 # Complete both options and possible parameters to `git config`
 complete -f -c git -n '__fish_git_using_command config' -l global -d 'Get/set global configuration'

From 235266894b906edebbba7b7db22deffa29e7ada0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 23:23:48 +0200
Subject: [PATCH 0254/1732] docs: Fix reference to FAQ

This adds a reference to one specific FAQ, so it adds a label for that
one question. It does not add the rest, because they currently aren't
linked. If you add a reference to an FAQ, you should add the label as
well.

[ci skip]
---
 sphinx_doc_src/faq.rst   | 1 +
 sphinx_doc_src/index.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 7dd133fe3..11d822bb2 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -249,6 +249,7 @@ In fish versions prior to 2.5.0 it was possible to create a function named ``-``
 
     abbr -a -- - 'cd -'
 
+.. _faq-uninstalling:
 
 Uninstalling fish
 -----------------
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 3f27ebef0..bd2e6c23f 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -170,7 +170,7 @@ For for detailed instructions see `Switching to fish <tutorial.html#tut_switchin
 Uninstalling
 ------------
 
-For uninstalling *fish*: see `FAQ: Uninstalling fish <faq.html#faq-uninstalling>`_.
+For uninstalling *fish*: see :ref:`FAQ: Uninstalling fish <faq-uninstalling>`.
 
 Starting and Exiting
 --------------------

From c4d0177d8112acae4adfdba075b836beaf00006d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 23:29:05 +0200
Subject: [PATCH 0255/1732] docs: Put some more important variables first

This section was linked when talking about $PATH, and $PATH is much
more important than $fish_color_something and $fish_emoji_width.

[ci skip]
---
 sphinx_doc_src/index.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index bd2e6c23f..bf32d6a3f 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1181,6 +1181,12 @@ Special variables
 
 The user can change the settings of ``fish`` by changing the values of certain variables.
 
+- ``PATH``, an array of directories in which to search for commands
+
+- ``CDPATH``, an array of directories in which to search for the new directory for the ``cd`` builtin.
+
+- ``LANG``, ``LC_ALL``, ``LC_COLLATE``, ``LC_CTYPE``, ``LC_MESSAGES``, ``LC_MONETARY``, ``LC_NUMERIC`` and ``LC_TIME`` set the language option for the shell and subprograms. See the section `Locale variables <#variables-locale>`_ for more information.
+
 - A large number of variable starting with the prefixes ``fish_color`` and ``fish_pager_color``. See `Variables for changing highlighting colors <#variables-color>`__ for more information.
 
 - ``fish_emoji_width`` controls the computed width of certain characters, in particular emoji, whose rendered width varies across terminal emulators. This should be set to 1 if your terminal emulator renders emoji single-width, or 2 if double-width. Set this only if you see graphical glitching when printing emoji.
@@ -1203,12 +1209,6 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``BROWSER``, the user's preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
 
-- ``CDPATH``, an array of directories in which to search for the new directory for the ``cd`` builtin.
-
-- ``LANG``, ``LC_ALL``, ``LC_COLLATE``, ``LC_CTYPE``, ``LC_MESSAGES``, ``LC_MONETARY``, ``LC_NUMERIC`` and ``LC_TIME`` set the language option for the shell and subprograms. See the section `Locale variables <#variables-locale>`_ for more information.
-
-- ``PATH``, an array of directories in which to search for commands
-
 ``fish`` also sends additional information to the user through the values of certain environment variables. The user cannot change the values of most of these variables.
 
 - ``_``, the name of the currently running command (though this is deprecated, and the use of ``status current-command`` is preferred).

From a447878cd796b42336efee94fd57c2eaed6d49a2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 23:33:07 +0200
Subject: [PATCH 0256/1732] docs: Remove &foo; escapes

I always hated these.

[ci skip]
---
 sphinx_doc_src/index.rst    | 2 +-
 sphinx_doc_src/tutorial.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index bf32d6a3f..117cebd5d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -233,7 +233,7 @@ Here is a list of some useful commands:
 - ``open``, open files with the default application associated with each filetype
 - ``less``, list the contents of files
 
-Commands and parameters are separated by the space character '&nbsp;'. Every command ends with either a newline (i.e. by pressing the return key) or a semicolon '``;``'. More than one command can be written on the same line by separating them with semicolons.
+Commands and parameters are separated by the space character `' '`. Every command ends with either a newline (i.e. by pressing the return key) or a semicolon '``;``'. More than one command can be written on the same line by separating them with semicolons.
 
 A switch is a very common special type of argument. Switches almost always start with one or more hyphens '``-``' and alter the way a command operates. For example, the '``ls``' command usually lists all the files and directories in the current working directory, but by using the '``-l``' switch, the behavior of '``ls``' is changed to not only display the filename, but also the size, permissions, owner and modification time of each file.
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index fa40ac1ec..89009ddb5 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -135,7 +135,7 @@ You can pipe between commands with the usual vertical bar::
     <outp>       1       2      12</outp>
 
 
-stdin and stdout can be redirected via the familiar &lt; and &gt;. stderr is redirected with a 2&gt;.
+stdin and stdout can be redirected via the familiar `<` and `<`. stderr is redirected with a `2>`.
 
 
 
@@ -408,7 +408,7 @@ To write them on the same line, use the semicolon (";"). That means the followin
 Combiners (And, Or, Not)
 ------------------------
 
-fish supports the familiar ``&amp;&amp;`` and ``||`` to combine commands, and ``!`` to negate them::
+fish supports the familiar ``&&`` and ``||`` to combine commands, and ``!`` to negate them::
 
     >_ ./configure && make && sudo make install
 

From 4d66c7896f7b626845654f91cf8daa632c732bba Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 6 Apr 2019 23:38:07 +0200
Subject: [PATCH 0257/1732] docs: Fix some more formatting

One monster paragraph and two lists that weren't recognized as such.

RsT loves empty lines.

[ci skip]
---
 sphinx_doc_src/index.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 117cebd5d..a7d5db46d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -243,7 +243,9 @@ Switches differ between commands and are documented in the manual page for each
 Quotes
 ------
 
-Sometimes features such as `parameter expansion <#expand>`_ and `character escapes <#escapes>`_ get in the way. When that happens, the user can write a parameter within quotes, either ``'`` (single quote) or ``"`` (double quote). There is one important difference between single quoted and double quoted strings: When using double quoted string, `variable expansion <#expand-variable>`_ still takes place. Other than that, no other kind of expansion (including `brace expansion <#expand-brace>`_ and parameter expansion) will take place, the parameter may contain spaces, and escape sequences are ignored. The only backslash escape accepted within single quotes is ``\'``, which escapes a single quote and ``\\``, which escapes the backslash symbol. The only backslash escapes accepted within double quotes are ``\"``, which escapes a double quote, ``\$``, which escapes a dollar character, ``\`` followed by a newline, which deletes the backslash and the newline, and lastly ``\\``, which escapes the backslash symbol. Single quotes have no special meaning within double quotes and vice versa.
+Sometimes features such as `parameter expansion <#expand>`_ and `character escapes <#escapes>`_ get in the way. When that happens, the user can write a parameter within quotes, either ``'`` (single quote) or ``"`` (double quote). There is one important difference between single quoted and double quoted strings: When using double quoted string, `variable expansion <#expand-variable>`_ still takes place. Other than that, no other kind of expansion (including `brace expansion <#expand-brace>`_ and parameter expansion) will take place, the parameter may contain spaces, and escape sequences are ignored.
+
+The only backslash escape accepted within single quotes is ``\'``, which escapes a single quote and ``\\``, which escapes the backslash symbol. The only backslash escapes accepted within double quotes are ``\"``, which escapes a double quote, ``\$``, which escapes a dollar character, ``\`` followed by a newline, which deletes the backslash and the newline, and lastly ``\\``, which escapes the backslash symbol. Single quotes have no special meaning within double quotes and vice versa.
 
 Example::
 
@@ -447,6 +449,7 @@ Functions can be defined on the commandline or in a configuration file, but they
 Fish automatically searches through any directories in the array variable ``$fish_function_path``, and any functions defined are automatically loaded when needed. A function definition file must have a filename consisting of the name of the function plus the suffix '``.fish``'.
 
 By default, Fish searches the following for functions, using the first available file that it finds:
+
 - A directory for end-users to keep their own functions, usually ``~/.config/fish/functions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable).
 - A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions`` (really ``$__fish_sysconfdir/functions``).
 - A directory for third-party software vendors to ship their own functions for their software, usually ``/usr/share/fish/vendor_functions.d``. (set at compile time; by default, ``$__fish_data_dir/vendor_functions.d``)
@@ -655,6 +658,7 @@ Where to put completions
 Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the array variable ``$fish_complete_path``, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '``.fish``'.
 
 By default, Fish searches the following for completions, using the first available file that it finds:
+
 - A directory for end-users to keep their own completions, usually ``~/.config/fish/completions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable);
 - A directory for systems administrators to install completions for all users on the system, usually ``/etc/fish/completions``;
 - A directory for third-party software vendors to ship their own completions for their software, usually ``/usr/share/fish/vendor_completions.d``;

From 23d88e0e039ab4abbb001cb99f448693feecac56 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 6 Apr 2019 22:22:11 -0700
Subject: [PATCH 0258/1732] Add fish_test_helper executable

In tests we would like to arrange for an executable to invoke certain
system calls, e.g. to claim or relinquish control of the terminal. This is
annoying to do portably via e.g. perl. fish_test_helper is a little
program where we can add custom commands to make it act in certain ways.
---
 CMakeLists.txt           |  3 +++
 cmake/Tests.cmake        |  5 ++++-
 src/fish_test_helper.cpp | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/fish_test_helper.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 443a6640b..d7250acd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,6 +162,9 @@ ADD_EXECUTABLE(fish_key_reader
                src/fish_key_reader.cpp src/print_help.cpp)
 FISH_LINK_DEPS(fish_key_reader)
 
+# A helper for running tests.
+ADD_EXECUTABLE(fish_test_helper src/fish_test_helper.cpp)
+
 # Set up tests.
 INCLUDE(cmake/Tests.cmake)
 
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index cab0158e9..7b398744e 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -44,14 +44,17 @@ ADD_DEPENDENCIES(test test_low_level tests_dir)
 
 # Make the directory in which to run tests.
 # Also symlink fish to where the tests expect it to be.
+# Lastly put fish_test_helper there too.
 ADD_CUSTOM_TARGET(tests_buildroot_target
                   COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_INSTALL_DIR}
                   COMMAND DESTDIR=${TEST_INSTALL_DIR} ${CMAKE_COMMAND}
                           --build ${CMAKE_CURRENT_BINARY_DIR} --target install
+                  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/fish_test_helper
+                          ${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}/bin
                   COMMAND ${CMAKE_COMMAND} -E create_symlink
                           ${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}
                           ${TEST_ROOT_DIR}
-                  DEPENDS fish)
+                  DEPENDS fish fish_test_helper)
 
 IF(NOT FISH_IN_TREE_BUILD)
   # We need to symlink share/functions for the tests.
diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
new file mode 100644
index 000000000..50f3bca7a
--- /dev/null
+++ b/src/fish_test_helper.cpp
@@ -0,0 +1,32 @@
+// fish_test_helper is a little program with no fish dependencies that acts like certain other
+// programs, allowing fish to test its behavior.
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void become_foreground_then_print_stderr() {
+    if (tcsetpgrp(STDOUT_FILENO, getpgrp()) < 0) {
+        perror("tcsetgrp");
+        exit(EXIT_FAILURE);
+    }
+    usleep(1000000 / 4);  //.25 secs
+    fprintf(stderr, "become_foreground_then_print_stderr done\n");
+}
+
+int main(int argc, char *argv[]) {
+    if (argc <= 1) {
+        fprintf(stderr, "No commands given.");
+        return 0;
+    }
+    for (int i = 1; i < argc; i++) {
+        if (!strcmp(argv[i], "become_foreground_then_print_stderr")) {
+            become_foreground_then_print_stderr();
+        } else {
+            fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
+            return EXIT_FAILURE;
+        }
+    }
+    return 0;
+}

From 39a974099795f532536c4fc821fa18a5379e3db3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 6 Apr 2019 20:00:52 -0700
Subject: [PATCH 0259/1732] Be less aggressive about reclaiming the foreground
 pgrp

Prior to this fix, in every call to job_continue, fish would reclaim the
foreground pgrp. This would cause other jobs in the pipeline (which may
have another pgrp) to receive SIGTTIN / SIGTTOU.

Only reclaim the foreground pgrp if it was held at the point of job_continue.

This partially addresses #5765
---
 src/builtin_bg.cpp | 2 +-
 src/builtin_fg.cpp | 2 +-
 src/exec.cpp       | 5 ++++-
 src/proc.cpp       | 4 ++--
 src/proc.h         | 6 ++++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index e737edae4..f8ee41558 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -30,7 +30,7 @@ static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
                               j->command_wcstr());
     j->promote();
     j->set_flag(job_flag_t::FOREGROUND, false);
-    j->continue_job(j->is_stopped());
+    j->continue_job(true, j->is_stopped());
     return STATUS_CMD_OK;
 }
 
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 5bd9221b6..7ce712bd7 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -106,6 +106,6 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     job->promote();
     job->set_flag(job_flag_t::FOREGROUND, true);
 
-    job->continue_job(job->is_stopped());
+    job->continue_job(true, job->is_stopped());
     return STATUS_CMD_OK;
 }
diff --git a/src/exec.cpp b/src/exec.cpp
index 7fc37af5e..375f0e44f 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1021,6 +1021,9 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         return true;
     }
 
+    // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
+    const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == getpgrp());
+
     const std::shared_ptr<job_t> parent_job = j->get_parent();
 
     // Perhaps inherit our parent's pgid and job control flag.
@@ -1120,7 +1123,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         return false;
     }
 
-    j->continue_job(false);
+    j->continue_job(reclaim_foreground_pgrp, false);
     return true;
 }
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 169116abd..514459af0 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -827,7 +827,7 @@ return false;
     return true;
 }
 
-void job_t::continue_job(bool send_sigcont) {
+void job_t::continue_job(bool reclaim_foreground_pgrp, bool send_sigcont) {
     // Put job first in the job list.
     promote();
     set_flag(job_flag_t::NOTIFIED, false);
@@ -839,7 +839,7 @@ void job_t::continue_job(bool send_sigcont) {
     // Make sure we retake control of the terminal before leaving this function.
     bool term_transferred = false;
     cleanup_t take_term_back([&]() {
-        if (term_transferred) {
+        if (term_transferred && reclaim_foreground_pgrp) {
             terminal_return_from_job(this);
         }
     });
diff --git a/src/proc.h b/src/proc.h
index e7106dabe..351a30740 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -408,8 +408,10 @@ class job_t {
     /// saved terminal modes and send the process group a SIGCONT signal to wake it up before we
     /// block.
     ///
-    /// \param send_sigcont Whether SIGCONT should be sent to the job if it is in the foreground.
-    void continue_job(bool send_sigcont);
+    /// \param reclaim_foreground_pgrp whether, when the job finishes or stops, to reclaim the
+    /// foreground pgrp (via tcsetpgrp). \param send_sigcont Whether SIGCONT should be sent to the
+    /// job if it is in the foreground.
+    void continue_job(bool reclaim_foreground_pgrp, bool send_sigcont);
 
     /// Promotes the job to the front of the job list.
     void promote();

From 4d62af7d40313a4572eaef8b04977ef28ddfcf61 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 4 Apr 2019 08:41:25 -0700
Subject: [PATCH 0260/1732] Add pipeline tests

This adds a pipeline test covering the fix in the prior commit,
related to #5675. Note #5675 is NOT fully fixed by this.
---
 tests/interactive.expect.rc |  1 +
 tests/pipeline.expect       | 16 ++++++++++++++++
 tests/pipeline.expect.err   |  0
 tests/pipeline.expect.out   |  0
 4 files changed, 17 insertions(+)
 create mode 100644 tests/pipeline.expect
 create mode 100644 tests/pipeline.expect.err
 create mode 100644 tests/pipeline.expect.out

diff --git a/tests/interactive.expect.rc b/tests/interactive.expect.rc
index 5900f5379..1dbf1405d 100644
--- a/tests/interactive.expect.rc
+++ b/tests/interactive.expect.rc
@@ -5,6 +5,7 @@ log_file -noappend interactive.tmp.log
 
 set fish ../test/root/bin/fish
 set fish_key_reader ../test/root/bin/fish_key_reader
+set fish_test_helper ../test/root/bin/fish_test_helper
 
 set timeout 5
 
diff --git a/tests/pipeline.expect b/tests/pipeline.expect
new file mode 100644
index 000000000..586e78d98
--- /dev/null
+++ b/tests/pipeline.expect
@@ -0,0 +1,16 @@
+# vim: set filetype=expect:
+spawn $fish
+expect_prompt
+
+send_line "function echo_wrap ; /bin/echo $argv ; sleep 0.1;  ; end"
+expect_prompt
+
+set timeout 10
+for {set x 0} {$x<15} {incr x} {
+  send_line "echo_wrap 1 2 3 4 | $fish_test_helper become_foreground_then_print_stderr ; or exit 1"
+  expect_prompt "become_foreground_then_print_stderr done" {} unmatched { puts stderr "fish_test_helper become_foreground_then_print_stderr failed"}
+}
+
+# 'not' because we expect to have no jobs, in which case `jobs` will return false
+send_line "not jobs"
+expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr "Should be no jobs" }
diff --git a/tests/pipeline.expect.err b/tests/pipeline.expect.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/pipeline.expect.out b/tests/pipeline.expect.out
new file mode 100644
index 000000000..e69de29bb

From f5bb8639d61bebb34f6937cffe0b4bf3e399f867 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 7 Apr 2019 13:08:37 -0700
Subject: [PATCH 0261/1732] More aggressively inherit pgrps from parent jobs

Prior to this fix, a job would only inherit a pgrp from its parent if the
first command were external. There seems to be no reason for this
restriction and this causes tcsetgrp() churn, potentially cuasing SIGTTIN.
Switch to unconditionally inheriting a pgrp from parents.

This should fix most of #5765, the only remaining question is
tcsetpgrp from builtins.
---
 src/exec.cpp          |  8 +++-----
 tests/pipeline.expect | 10 ++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 375f0e44f..be1eec6b6 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1027,11 +1027,9 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     const std::shared_ptr<job_t> parent_job = j->get_parent();
 
     // Perhaps inherit our parent's pgid and job control flag.
-    if (parent_job && j->processes.front()->type == process_type_t::external) {
-        if (parent_job->pgid != INVALID_PID) {
-            j->pgid = parent_job->pgid;
-            j->set_flag(job_flag_t::JOB_CONTROL, true);
-        }
+    if (parent_job && parent_job->pgid != INVALID_PID) {
+        j->pgid = parent_job->pgid;
+        j->set_flag(job_flag_t::JOB_CONTROL, true);
     }
 
     size_t stdout_read_limit = 0;
diff --git a/tests/pipeline.expect b/tests/pipeline.expect
index 586e78d98..eff55e9e4 100644
--- a/tests/pipeline.expect
+++ b/tests/pipeline.expect
@@ -14,3 +14,13 @@ for {set x 0} {$x<15} {incr x} {
 # 'not' because we expect to have no jobs, in which case `jobs` will return false
 send_line "not jobs"
 expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr "Should be no jobs" }
+
+send_line "function inner ; command true ; end; function outer; inner; end"
+expect_prompt
+for {set x 0} {$x<15} {incr x} {
+  send_line "outer | $fish_test_helper become_foreground_then_print_stderr ; or exit 1"
+  expect_prompt "become_foreground_then_print_stderr done" {} unmatched { puts stderr "fish_test_helper become_foreground_then_print_stderr failed"}
+}
+
+send_line "not jobs"
+expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr "Should be no jobs" }

From 35b3f7fee83d7ea37741b079d6edf2b4c03071c1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 7 Apr 2019 15:00:13 -0700
Subject: [PATCH 0262/1732] Reduce loop count of pipeline test

Make the test run faster
---
 tests/pipeline.expect | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pipeline.expect b/tests/pipeline.expect
index eff55e9e4..ce6deec98 100644
--- a/tests/pipeline.expect
+++ b/tests/pipeline.expect
@@ -6,7 +6,7 @@ send_line "function echo_wrap ; /bin/echo $argv ; sleep 0.1;  ; end"
 expect_prompt
 
 set timeout 10
-for {set x 0} {$x<15} {incr x} {
+for {set x 0} {$x<5} {incr x} {
   send_line "echo_wrap 1 2 3 4 | $fish_test_helper become_foreground_then_print_stderr ; or exit 1"
   expect_prompt "become_foreground_then_print_stderr done" {} unmatched { puts stderr "fish_test_helper become_foreground_then_print_stderr failed"}
 }
@@ -17,7 +17,7 @@ expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr "Should be no
 
 send_line "function inner ; command true ; end; function outer; inner; end"
 expect_prompt
-for {set x 0} {$x<15} {incr x} {
+for {set x 0} {$x<5} {incr x} {
   send_line "outer | $fish_test_helper become_foreground_then_print_stderr ; or exit 1"
   expect_prompt "become_foreground_then_print_stderr done" {} unmatched { puts stderr "fish_test_helper become_foreground_then_print_stderr failed"}
 }

From bf40f84b0624e88f25690968c368e75fc0602a9d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 7 Apr 2019 15:07:36 -0700
Subject: [PATCH 0263/1732] Remove an unused variable

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

diff --git a/src/reader.cpp b/src/reader.cpp
index aa800efe1..90f2ad51e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3180,7 +3180,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
 
         case rl::expand_abbr: {
-            editable_line_t *el = active_edit_line();
             if (expand_abbreviation_as_necessary(1)) {
                 super_highlight_me_plenty();
                 mark_repaint_needed();

From dd9a26715dc212a02c8aa8637067f7585c3f12e4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 7 Apr 2019 13:54:33 -0700
Subject: [PATCH 0264/1732] fcntl a little less

Setting O_CLOEXEC on closed file descriptors and getting E_BADF
should be faster than actually checking if an fd is open first.
---
 src/fish.cpp  |  7 ++++---
 src/wutil.cpp | 11 +++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 21832b265..4b0f2c2c8 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -401,13 +401,14 @@ int main(int argc, char **argv) {
             res = reader_read(STDIN_FILENO, {});
         } else {
             char *file = *(argv + (my_optind++));
+#if defined(O_CLOEXEC)
+            int fd = open(file, O_RDONLY | O_CLOEXEC);
+#else
             int fd = open(file, O_RDONLY);
+#endif
             if (fd == -1) {
                 perror(file);
             } else {
-                // OK to not do this atomically since we cannot have gone multithreaded yet.
-                set_cloexec(fd);
-
                 wcstring_list_t list;
                 for (char **ptr = argv + my_optind; *ptr; ptr++) {
                     list.push_back(str2wcstring(*ptr));
diff --git a/src/wutil.cpp b/src/wutil.cpp
index fa250c59b..5813334e8 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -176,14 +176,9 @@ FILE *wfopen(const wcstring &path, const char *mode) {
 }
 
 bool set_cloexec(int fd) {
-    int flags = fcntl(fd, F_GETFD, 0);
-    if (flags < 0) {
-        return false;
-    }
-    if (flags & FD_CLOEXEC) {
-        return true;
-    }
-    return fcntl(fd, F_SETFD, flags | FD_CLOEXEC) >= 0;
+    int flags = fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+    if (flags == -1) return false;
+    return true;
 }
 
 static int wopen_internal(const wcstring &pathname, int flags, mode_t mode, bool cloexec) {

From 8eb05f8731a097ab7d8bbed16da3344744672055 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 8 Apr 2019 11:22:21 -0700
Subject: [PATCH 0265/1732] parse_execution.cpp: validate 'for' variable name

Fixes #5800
(that's a nice round number)
---
 src/parse_execution.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2af130d63..db0e620cb 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -396,6 +396,11 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         }
     }
 
+    if (!valid_var_name(for_var_name)) {
+        report_error(var_name_node, L"invalid var name: %ls", for_var_name.c_str());
+        return parse_execution_errored;
+    }
+
     for_block_t *fb = parser->push_block<for_block_t>();
 
     // Now drive the for loop.

From e5362a4ae57addc82e052dd8ff3040afd38dbe8a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 8 Apr 2019 16:02:00 -0700
Subject: [PATCH 0266/1732] wutil.cpp: fixup: don't involve the uninitialized
 parameter

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

diff --git a/src/wutil.cpp b/src/wutil.cpp
index 5813334e8..98a49251a 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -176,7 +176,7 @@ FILE *wfopen(const wcstring &path, const char *mode) {
 }
 
 bool set_cloexec(int fd) {
-    int flags = fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+    int flags = fcntl(fd, F_SETFD, FD_CLOEXEC);
     if (flags == -1) return false;
     return true;
 }

From b7fceddfc8e79e528620a4948e13d24c33629d63 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Mar 2019 20:18:00 -0700
Subject: [PATCH 0267/1732] Refactor some environment code into
 env_dispatch.cpp

This new file is supposed to encapsulate all of the logic around
reacting to variable changes, as opposed to the environment core.
This is to help break up the env.cpp monolith.
---
 CMakeLists.txt       |   2 +-
 src/env.cpp          | 286 ++++------------------------------------
 src/env.h            |   9 ++
 src/env_dispatch.cpp | 308 +++++++++++++++++++++++++++++++++++++++++++
 src/env_dispatch.h   |  24 ++++
 5 files changed, 364 insertions(+), 265 deletions(-)
 create mode 100644 src/env_dispatch.cpp
 create mode 100644 src/env_dispatch.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7250acd3..cfd6be904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,7 @@ SET(FISH_SRCS
     src/builtin_return.cpp src/builtin_set.cpp src/builtin_set_color.cpp
     src/builtin_source.cpp src/builtin_status.cpp src/builtin_string.cpp
     src/builtin_test.cpp src/builtin_ulimit.cpp src/builtin_wait.cpp
-    src/color.cpp src/common.cpp src/complete.cpp src/env.cpp
+    src/color.cpp src/common.cpp src/complete.cpp src/env.cpp src/env_dispatch.cpp
     src/env_universal_common.cpp src/event.cpp src/exec.cpp src/expand.cpp
     src/fallback.cpp src/fish_version.cpp src/function.cpp src/highlight.cpp
     src/history.cpp src/input.cpp src/input_common.cpp src/intern.cpp src/io.cpp
diff --git a/src/env.cpp b/src/env.cpp
index 268234221..7a81795c4 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
-#include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -40,8 +39,8 @@
 
 #include "builtin_bind.h"
 #include "common.h"
-#include "complete.h"
 #include "env.h"
+#include "env_dispatch.h"
 #include "env_universal_common.h"
 #include "event.h"
 #include "expand.h"
@@ -88,34 +87,6 @@ bool curses_initialized = false;
 /// Does the terminal have the "eat_newline_glitch".
 bool term_has_xn = false;
 
-/// This is used to ensure that we don't perform any callbacks from `react_to_variable_change()`
-/// when we're importing environment variables in `env_init()`. That's because we don't have any
-/// control over the order in which the vars are imported and some of them work in combination.
-/// For example, `TERMINFO_DIRS` and `TERM`. If the user has set `TERM` to a custom value that is
-/// found in `TERMINFO_DIRS` we don't to call `handle_curses()` before we've imported the latter.
-static bool env_initialized = false;
-
-/// List of all locale environment variable names that might trigger (re)initializing the locale
-/// subsystem.
-static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
-                                               L"LC_COLLATE", L"LC_CTYPE", L"LC_IDENTIFICATION",
-                                               L"LC_MEASUREMENT", L"LC_MESSAGES", L"LC_MONETARY",
-                                               L"LC_NAME", L"LC_NUMERIC", L"LC_PAPER",
-                                               L"LC_TELEPHONE", L"LC_TIME"});
-
-/// List of all curses environment variable names that might trigger (re)initializing the curses
-/// subsystem.
-static const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
-
-typedef std::unordered_map<wcstring, void (*)(const wcstring &, const wcstring &, env_stack_t &)>
-    var_dispatch_table_t;
-static var_dispatch_table_t create_var_dispatch_table();
-static const var_dispatch_table_t s_var_dispatch_table = create_var_dispatch_table();
-
-// Some forward declarations to make it easy to logically group the code.
-static void init_locale(const environment_t &vars);
-static void init_curses(const environment_t &vars);
-
 // Struct representing one level in the function variable stack.
 // Only our variable stack should create and destroy these
 class env_node_t {
@@ -317,6 +288,19 @@ static bool is_electric(const wcstring &key) { return contains(env_electric, key
 env_stack_t::env_stack_t() : vars_(make_unique<var_stack_t>()) {}
 env_stack_t::env_stack_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
 
+void env_stack_t::universal_barrier() {
+    ASSERT_IS_MAIN_THREAD();
+    if (!uvars()) return;
+
+    callback_data_list_t callbacks;
+    bool changed = uvars()->sync(callbacks);
+    if (changed) {
+        universal_notifier_t::default_notifier().post_notification();
+    }
+
+    env_universal_callbacks(this, callbacks);
+}
+
 // Get the variable stack
 var_stack_t &env_stack_t::vars_stack() { return *vars_; }
 
@@ -336,25 +320,11 @@ static mode_t get_umask() {
     return res;
 }
 
-/// Properly sets all timezone information.
-static void handle_timezone(const wchar_t *env_var_name, const environment_t &vars) {
-    const auto var = vars.get(env_var_name, ENV_DEFAULT);
-    debug(2, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
-          !var ? L"MISSING" : var->as_string().c_str());
-    const std::string &name = wcs2string(env_var_name);
-    if (var.missing_or_empty()) {
-        unsetenv(name.c_str());
-    } else {
-        const std::string value = wcs2string(var->as_string());
-        setenv(name.c_str(), value.c_str(), 1);
-    }
-    tzset();
-}
 
 /// Some env vars contain a list of paths where an empty path element is equivalent to ".".
 /// Unfortunately that convention causes problems for fish scripts. So this function replaces the
 /// empty path element with an explicit ".". See issue #3914.
-static void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
+void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
     const auto paths = vars.get(var_name);
     if (paths.missing_or_empty()) return;
 
@@ -373,7 +343,7 @@ static void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars)
 }
 
 /// Initialize the locale subsystem.
-static void init_locale(const environment_t &vars) {
+void init_locale(const environment_t &vars) {
     // We have to make a copy because the subsequent setlocale() call to change the locale will
     // invalidate the pointer from the this setlocale() call.
     char *old_msg_locale = strdup(setlocale(LC_MESSAGES, NULL));
@@ -450,7 +420,7 @@ static bool does_term_support_setting_title(const environment_t &vars) {
 }
 
 /// Updates our idea of whether we support term256 and term24bit (see issue #10222).
-static void update_fish_color_support(const environment_t &vars) {
+void update_fish_color_support(const environment_t &vars) {
     // Detect or infer term256 support. If fish_term256 is set, we respect it;
     // otherwise infer it from the TERM variable or use terminfo.
     wcstring term;
@@ -535,41 +505,8 @@ static void init_path_vars() {
     fix_colon_delimited_var(L"CDPATH", env_stack_t::globals());
 }
 
-/// Update the value of g_guessed_fish_emoji_width
-static void guess_emoji_width() {
-    wcstring term;
-    auto &vars = env_stack_t::globals();
-    if (auto term_var = vars.get(L"TERM_PROGRAM")) {
-        term = term_var->as_string();
-    }
-
-    double version = 0;
-    if (auto version_var = vars.get(L"TERM_PROGRAM_VERSION")) {
-        std::string narrow_version = wcs2string(version_var->as_string());
-        version = strtod(narrow_version.c_str(), NULL);
-    }
-
-
-    if (term == L"Apple_Terminal" && version >= 400) {
-        // Apple Terminal on High Sierra
-        g_guessed_fish_emoji_width = 2;
-        debug(2, "default emoji width: 2 for %ls", term.c_str());
-    } else if (term == L"iTerm.app") {
-        // iTerm2 defaults to Unicode 8 sizes.
-        // See https://gitlab.com/gnachman/iterm2/wikis/unicodeversionswitching
-        g_guessed_fish_emoji_width = 1;
-        debug(2, "default emoji width: 1");
-    } else {
-        // Default to whatever system wcwidth says to U+1F603,
-        // but only if it's at least 1.
-        int w = wcwidth(L'😃');
-        g_guessed_fish_emoji_width = w > 0 ? w : 1;
-        debug(2, "default emoji width: %d", g_guessed_fish_emoji_width);
-    }
-}
-
 /// Initialize the curses subsystem.
-static void init_curses(const environment_t &vars) {
+void init_curses(const environment_t &vars) {
     for (const auto &var_name : curses_variables) {
         std::string name = wcs2string(var_name);
         const auto var = vars.get(var_name, ENV_EXPORT);
@@ -609,33 +546,6 @@ static void init_curses(const environment_t &vars) {
     curses_initialized = true;
 }
 
-/// React to modifying the given variable.
-static void react_to_variable_change(const wchar_t *op, const wcstring &key, env_stack_t &vars) {
-    // Don't do any of this until `env_init()` has run. We only want to do this in response to
-    // variables set by the user; e.g., in a script like *config.fish* or interactively or as part
-    // of loading the universal variables for the first time. Variables we import from the
-    // environment or that are otherwise set by fish before this gets called have to explicitly
-    // call the appropriate functions to put the value of the var into effect.
-    if (!env_initialized) return;
-
-    auto dispatch = s_var_dispatch_table.find(key);
-    if (dispatch != s_var_dispatch_table.end()) {
-        (*dispatch->second)(op, key, vars);
-    } else if (string_prefixes_string(L"fish_color_", key)) {
-        reader_react_to_color_change();
-    }
-}
-
-/// Universal variable callback function. This function makes sure the proper events are triggered
-/// when an event occurs.
-static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
-    const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET";
-
-    react_to_variable_change(op, cb.key, *stack);
-    stack->mark_changed_exported();
-    event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
-}
-
 /// Make sure the PATH variable contains something.
 static void setup_path() {
     auto &vars = env_stack_t::globals();
@@ -733,155 +643,6 @@ void misc_init() {
     }
 }
 
-static void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks) {
-    for (const callback_data_t &cb : callbacks) {
-        universal_callback(stack, cb);
-    }
-}
-
-void env_stack_t::universal_barrier() {
-    ASSERT_IS_MAIN_THREAD();
-    if (!uvars()) return;
-
-    callback_data_list_t callbacks;
-    bool changed = uvars()->sync(callbacks);
-    if (changed) {
-        universal_notifier_t::default_notifier().post_notification();
-    }
-
-    env_universal_callbacks(this, callbacks);
-}
-
-static void handle_fish_term_change(const wcstring &op, const wcstring &var_name,
-                                    env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    update_fish_color_support(vars);
-    reader_react_to_color_change();
-}
-
-static void handle_escape_delay_change(const wcstring &op, const wcstring &var_name,
-                                       env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    update_wait_on_escape_ms(vars);
-}
-
-static void handle_change_emoji_width(const wcstring &op, const wcstring &var_name,
-                                      env_stack_t &vars) {
-    (void)op;
-    (void)var_name;
-    int new_width = 0;
-    if (auto width_str = vars.get(L"fish_emoji_width")) {
-        new_width = fish_wcstol(width_str->as_string().c_str());
-    }
-    g_fish_emoji_width = std::max(0, new_width);
-    debug(2, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
-}
-
-static void handle_change_ambiguous_width(const wcstring &op, const wcstring &var_name,
-                                          env_stack_t &vars) {
-    (void)op;
-    (void)var_name;
-    int new_width = 1;
-    if (auto width_str = vars.get(L"fish_ambiguous_width")) {
-        new_width = fish_wcstol(width_str->as_string().c_str());
-    }
-    g_fish_ambiguous_width = std::max(0, new_width);
-}
-
-static void handle_term_size_change(const wcstring &op, const wcstring &var_name,
-                                    env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    UNUSED(vars);
-    invalidate_termsize(true);  // force fish to update its idea of the terminal size plus vars
-}
-
-static void handle_read_limit_change(const wcstring &op, const wcstring &var_name,
-                                     env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    vars.set_read_limit();
-}
-
-static void handle_fish_history_change(const wcstring &op, const wcstring &var_name,
-                                       env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    reader_change_history(history_session_id(vars));
-}
-
-static void handle_function_path_change(const wcstring &op, const wcstring &var_name,
-                                        env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    UNUSED(vars);
-    function_invalidate_path();
-}
-
-static void handle_complete_path_change(const wcstring &op, const wcstring &var_name,
-                                        env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    UNUSED(vars);
-    complete_invalidate_path();
-}
-
-static void handle_tz_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
-    handle_timezone(var_name.c_str(), vars);
-}
-
-static void handle_magic_colon_var_change(const wcstring &op, const wcstring &var_name,
-                                          env_stack_t &vars) {
-    UNUSED(op);
-    fix_colon_delimited_var(var_name, vars);
-}
-
-static void handle_locale_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    init_locale(vars);
-    // We need to re-guess emoji width because the locale might have changed to a multibyte one.
-    guess_emoji_width();
-}
-
-static void handle_curses_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    guess_emoji_width();
-    init_curses(vars);
-}
-
-/// Populate the dispatch table used by `react_to_variable_change()` to efficiently call the
-/// appropriate function to handle a change to a variable.
-static var_dispatch_table_t create_var_dispatch_table() {
-    var_dispatch_table_t var_dispatch_table;
-    for (const auto &var_name : locale_variables) {
-        var_dispatch_table.emplace(var_name, handle_locale_change);
-    }
-
-    for (const auto &var_name : curses_variables) {
-        var_dispatch_table.emplace(var_name, handle_curses_change);
-    }
-
-    var_dispatch_table.emplace(L"PATH", handle_magic_colon_var_change);
-    var_dispatch_table.emplace(L"CDPATH", handle_magic_colon_var_change);
-    var_dispatch_table.emplace(L"fish_term256", handle_fish_term_change);
-    var_dispatch_table.emplace(L"fish_term24bit", handle_fish_term_change);
-    var_dispatch_table.emplace(L"fish_escape_delay_ms", handle_escape_delay_change);
-    var_dispatch_table.emplace(L"fish_emoji_width", handle_change_emoji_width);
-    var_dispatch_table.emplace(L"fish_ambiguous_width", handle_change_ambiguous_width);
-    var_dispatch_table.emplace(L"LINES", handle_term_size_change);
-    var_dispatch_table.emplace(L"COLUMNS", handle_term_size_change);
-    var_dispatch_table.emplace(L"fish_complete_path", handle_complete_path_change);
-    var_dispatch_table.emplace(L"fish_function_path", handle_function_path_change);
-    var_dispatch_table.emplace(L"fish_read_limit", handle_read_limit_change);
-    var_dispatch_table.emplace(L"fish_history", handle_fish_history_change);
-    var_dispatch_table.emplace(L"TZ", handle_tz_change);
-    return var_dispatch_table;
-}
 
 void env_init(const struct config_paths_t *paths /* or NULL */) {
     env_stack_t &vars = env_stack_t::globals();
@@ -1027,11 +788,8 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     // Set fish_bind_mode to "default".
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
 
-    // This is somewhat subtle. At this point we consider our environment to be sufficiently
-    // initialized that we can react to changes to variables. Prior to doing this we expect that the
-    // code for setting vars that might have side-effects will do whatever
-    // `react_to_variable_change()` would do for that var.
-    env_initialized = true;
+    // Allow changes to variables to produce events.
+    env_dispatch_mark_initialization_finished();
 
     // Set up universal variables. The empty string means to use the default path.
     assert(s_universal_variables == NULL);
@@ -1247,7 +1005,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
     }
 
     event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
-    react_to_variable_change(L"SET", key, *this);
+    env_dispatch_var_change(L"SET", key, *this);
     return ENV_OK;
 }
 
@@ -1333,7 +1091,7 @@ int env_stack_t::remove(const wcstring &key, int var_mode) {
         if (is_exported) vars_stack().mark_changed_exported();
     }
 
-    react_to_variable_change(L"ERASE", key, *this);
+    env_dispatch_var_change(L"ERASE", key, *this);
 
     return erased ? ENV_OK : ENV_NOT_FOUND;
 }
diff --git a/src/env.h b/src/env.h
index be26aefa2..8bb725ebf 100644
--- a/src/env.h
+++ b/src/env.h
@@ -316,4 +316,13 @@ bool term_supports_setting_title();
 
 /// Gets a path appropriate for runtime storage
 wcstring env_get_runtime_path();
+
+/// Replace empty path elements with "." - see #3914.
+void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars);
+
+// Temporararily exposed so that env_dispatch can call these.
+void init_locale(const environment_t &vars);
+void init_curses(const environment_t &vars);
+void update_fish_color_support(const environment_t &vars);
+
 #endif
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
new file mode 100644
index 000000000..04563a126
--- /dev/null
+++ b/src/env_dispatch.cpp
@@ -0,0 +1,308 @@
+// Support for dispatching on environment changes.
+#include "config.h"  // IWYU pragma: keep
+
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+#include <cstring>
+#include <cwchar>
+
+#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 <algorithm>
+#include <iterator>
+#include <set>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+#include "builtin_bind.h"
+#include "common.h"
+#include "complete.h"
+#include "env.h"
+#include "env_universal_common.h"
+#include "event.h"
+#include "expand.h"
+#include "fallback.h"  // IWYU pragma: keep
+#include "fish_version.h"
+#include "function.h"
+#include "history.h"
+#include "input.h"
+#include "input_common.h"
+#include "output.h"
+#include "path.h"
+#include "proc.h"
+#include "reader.h"
+#include "sanity.h"
+#include "screen.h"
+#include "wutil.h"  // IWYU pragma: keep
+
+#define DEFAULT_TERM1 "ansi"
+#define DEFAULT_TERM2 "dumb"
+
+/// Some configuration path environment variables.
+#define FISH_DATADIR_VAR L"__fish_data_dir"
+#define FISH_SYSCONFDIR_VAR L"__fish_sysconf_dir"
+#define FISH_HELPDIR_VAR L"__fish_help_dir"
+#define FISH_BIN_DIR L"__fish_bin_dir"
+#define FISH_CONFIG_DIR L"__fish_config_dir"
+#define FISH_USER_DATA_DIR L"__fish_user_data_dir"
+
+/// List of all locale environment variable names that might trigger (re)initializing the locale
+/// subsystem.
+extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
+                                               L"LC_COLLATE", L"LC_CTYPE", L"LC_IDENTIFICATION",
+                                               L"LC_MEASUREMENT", L"LC_MESSAGES", L"LC_MONETARY",
+                                               L"LC_NAME", L"LC_NUMERIC", L"LC_PAPER",
+                                               L"LC_TELEPHONE", L"LC_TIME"});
+
+/// List of all curses environment variable names that might trigger (re)initializing the curses
+/// subsystem.
+extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
+
+typedef std::unordered_map<wcstring, void (*)(const wcstring &, const wcstring &, env_stack_t &)>
+    var_dispatch_table_t;
+static var_dispatch_table_t create_var_dispatch_table();
+static const var_dispatch_table_t s_var_dispatch_table = create_var_dispatch_table();
+
+/// This is used to ensure that we don't perform any callbacks from `env_dispatch_var_change()`
+/// when we're importing environment variables in `env_init()`. That's because we don't have any
+/// control over the order in which the vars are imported and some of them work in combination.
+/// For example, `TERMINFO_DIRS` and `TERM`. If the user has set `TERM` to a custom value that is
+/// found in `TERMINFO_DIRS` we don't to call `handle_curses()` before we've imported the latter.
+static bool env_initialized = false;
+
+void env_dispatch_mark_initialization_finished() { env_initialized = true; }
+
+/// Properly sets all timezone information.
+static void handle_timezone(const wchar_t *env_var_name, const environment_t &vars) {
+    const auto var = vars.get(env_var_name, ENV_DEFAULT);
+    debug(2, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
+          !var ? L"MISSING" : var->as_string().c_str());
+    const std::string &name = wcs2string(env_var_name);
+    if (var.missing_or_empty()) {
+        unsetenv(name.c_str());
+    } else {
+        const std::string value = wcs2string(var->as_string());
+        setenv(name.c_str(), value.c_str(), 1);
+    }
+    tzset();
+}
+
+/// Update the value of g_guessed_fish_emoji_width
+void guess_emoji_width() {
+    wcstring term;
+    auto &vars = env_stack_t::globals();
+    if (auto term_var = vars.get(L"TERM_PROGRAM")) {
+        term = term_var->as_string();
+    }
+
+    double version = 0;
+    if (auto version_var = vars.get(L"TERM_PROGRAM_VERSION")) {
+        std::string narrow_version = wcs2string(version_var->as_string());
+        version = strtod(narrow_version.c_str(), NULL);
+    }
+
+    if (term == L"Apple_Terminal" && version >= 400) {
+        // Apple Terminal on High Sierra
+        g_guessed_fish_emoji_width = 2;
+        debug(2, "default emoji width: 2 for %ls", term.c_str());
+    } else if (term == L"iTerm.app") {
+        // iTerm2 defaults to Unicode 8 sizes.
+        // See https://gitlab.com/gnachman/iterm2/wikis/unicodeversionswitching
+        g_guessed_fish_emoji_width = 1;
+        debug(2, "default emoji width: 1");
+    } else {
+        // Default to whatever system wcwidth says to U+1F603,
+        // but only if it's at least 1.
+        int w = wcwidth(L'😃');
+        g_guessed_fish_emoji_width = w > 0 ? w : 1;
+        debug(2, "default emoji width: %d", g_guessed_fish_emoji_width);
+    }
+}
+
+/// React to modifying the given variable.
+void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars) {
+    // Don't do any of this until `env_init()` has run. We only want to do this in response to
+    // variables set by the user; e.g., in a script like *config.fish* or interactively or as part
+    // of loading the universal variables for the first time. Variables we import from the
+    // environment or that are otherwise set by fish before this gets called have to explicitly
+    // call the appropriate functions to put the value of the var into effect.
+    if (!env_initialized) return;
+
+    auto dispatch = s_var_dispatch_table.find(key);
+    if (dispatch != s_var_dispatch_table.end()) {
+        (*dispatch->second)(op, key, vars);
+    } else if (string_prefixes_string(L"fish_color_", key)) {
+        reader_react_to_color_change();
+    }
+}
+
+/// Universal variable callback function. This function makes sure the proper events are triggered
+/// when an event occurs.
+static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
+    const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET";
+
+    env_dispatch_var_change(op, cb.key, *stack);
+    stack->mark_changed_exported();
+    event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
+}
+
+void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks) {
+    for (const callback_data_t &cb : callbacks) {
+        universal_callback(stack, cb);
+    }
+}
+
+static void handle_fish_term_change(const wcstring &op, const wcstring &var_name,
+                                    env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    update_fish_color_support(vars);
+    reader_react_to_color_change();
+}
+
+static void handle_escape_delay_change(const wcstring &op, const wcstring &var_name,
+                                       env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    update_wait_on_escape_ms(vars);
+}
+
+static void handle_change_emoji_width(const wcstring &op, const wcstring &var_name,
+                                      env_stack_t &vars) {
+    (void)op;
+    (void)var_name;
+    int new_width = 0;
+    if (auto width_str = vars.get(L"fish_emoji_width")) {
+        new_width = fish_wcstol(width_str->as_string().c_str());
+    }
+    g_fish_emoji_width = std::max(0, new_width);
+    debug(2, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
+}
+
+static void handle_change_ambiguous_width(const wcstring &op, const wcstring &var_name,
+                                          env_stack_t &vars) {
+    (void)op;
+    (void)var_name;
+    int new_width = 1;
+    if (auto width_str = vars.get(L"fish_ambiguous_width")) {
+        new_width = fish_wcstol(width_str->as_string().c_str());
+    }
+    g_fish_ambiguous_width = std::max(0, new_width);
+}
+
+static void handle_term_size_change(const wcstring &op, const wcstring &var_name,
+                                    env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    UNUSED(vars);
+    invalidate_termsize(true);  // force fish to update its idea of the terminal size plus vars
+}
+
+static void handle_read_limit_change(const wcstring &op, const wcstring &var_name,
+                                     env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    vars.set_read_limit();
+}
+
+static void handle_fish_history_change(const wcstring &op, const wcstring &var_name,
+                                       env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    reader_change_history(history_session_id(vars));
+}
+
+static void handle_function_path_change(const wcstring &op, const wcstring &var_name,
+                                        env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    UNUSED(vars);
+    function_invalidate_path();
+}
+
+static void handle_complete_path_change(const wcstring &op, const wcstring &var_name,
+                                        env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    UNUSED(vars);
+    complete_invalidate_path();
+}
+
+static void handle_tz_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
+    UNUSED(op);
+    handle_timezone(var_name.c_str(), vars);
+}
+
+static void handle_magic_colon_var_change(const wcstring &op, const wcstring &var_name,
+                                          env_stack_t &vars) {
+    UNUSED(op);
+    fix_colon_delimited_var(var_name, vars);
+}
+
+static void handle_locale_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    init_locale(vars);
+    // We need to re-guess emoji width because the locale might have changed to a multibyte one.
+    guess_emoji_width();
+}
+
+static void handle_curses_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
+    UNUSED(op);
+    UNUSED(var_name);
+    guess_emoji_width();
+    init_curses(vars);
+}
+
+/// Populate the dispatch table used by `env_dispatch_var_change()` to efficiently call the
+/// appropriate function to handle a change to a variable.
+static var_dispatch_table_t create_var_dispatch_table() {
+    var_dispatch_table_t var_dispatch_table;
+    for (const auto &var_name : locale_variables) {
+        var_dispatch_table.emplace(var_name, handle_locale_change);
+    }
+
+    for (const auto &var_name : curses_variables) {
+        var_dispatch_table.emplace(var_name, handle_curses_change);
+    }
+
+    var_dispatch_table.emplace(L"PATH", handle_magic_colon_var_change);
+    var_dispatch_table.emplace(L"CDPATH", handle_magic_colon_var_change);
+    var_dispatch_table.emplace(L"fish_term256", handle_fish_term_change);
+    var_dispatch_table.emplace(L"fish_term24bit", handle_fish_term_change);
+    var_dispatch_table.emplace(L"fish_escape_delay_ms", handle_escape_delay_change);
+    var_dispatch_table.emplace(L"fish_emoji_width", handle_change_emoji_width);
+    var_dispatch_table.emplace(L"fish_ambiguous_width", handle_change_ambiguous_width);
+    var_dispatch_table.emplace(L"LINES", handle_term_size_change);
+    var_dispatch_table.emplace(L"COLUMNS", handle_term_size_change);
+    var_dispatch_table.emplace(L"fish_complete_path", handle_complete_path_change);
+    var_dispatch_table.emplace(L"fish_function_path", handle_function_path_change);
+    var_dispatch_table.emplace(L"fish_read_limit", handle_read_limit_change);
+    var_dispatch_table.emplace(L"fish_history", handle_fish_history_change);
+    var_dispatch_table.emplace(L"TZ", handle_tz_change);
+    return var_dispatch_table;
+}
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
new file mode 100644
index 000000000..9f10ff060
--- /dev/null
+++ b/src/env_dispatch.h
@@ -0,0 +1,24 @@
+// Prototypes for functions that react to environment variable changes
+#ifndef FISH_ENV_DISPATCH_H
+#define FISH_ENV_DISPATCH_H
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "common.h"
+#include "env_universal_common.h"
+
+#include <memory>
+
+/// Mark initialization as finished.
+void env_dispatch_mark_initialization_finished();
+
+class env_stack_t;
+void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars);
+void guess_emoji_width();
+
+void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks);
+
+extern const wcstring_list_t locale_variables;
+extern const wcstring_list_t curses_variables;
+
+#endif

From b67174b4a3ce61ab7f42fed673c4f06ec35d1afb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 31 Mar 2019 19:11:52 -0700
Subject: [PATCH 0268/1732] Clean up env_dispatch_table

---
 src/env.cpp          |   2 +-
 src/env_dispatch.cpp | 110 ++++++++++++++++++++++++++++---------------
 src/env_dispatch.h   |   4 +-
 3 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 7a81795c4..c0a00fec7 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -789,7 +789,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
 
     // Allow changes to variables to produce events.
-    env_dispatch_mark_initialization_finished();
+    env_dispatch_init();
 
     // Set up universal variables. The empty string means to use the default path.
     assert(s_universal_variables == NULL);
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 04563a126..74ca13788 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -82,19 +82,53 @@ extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
 /// subsystem.
 extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
 
-typedef std::unordered_map<wcstring, void (*)(const wcstring &, const wcstring &, env_stack_t &)>
-    var_dispatch_table_t;
-static var_dispatch_table_t create_var_dispatch_table();
-static const var_dispatch_table_t s_var_dispatch_table = create_var_dispatch_table();
+class var_dispatch_table_t {
+    using named_callback_t = std::function<void(const wcstring &, const wcstring &, env_stack_t &)>;
+    std::unordered_map<wcstring, named_callback_t> named_table_;
 
-/// This is used to ensure that we don't perform any callbacks from `env_dispatch_var_change()`
-/// when we're importing environment variables in `env_init()`. That's because we don't have any
-/// control over the order in which the vars are imported and some of them work in combination.
-/// For example, `TERMINFO_DIRS` and `TERM`. If the user has set `TERM` to a custom value that is
-/// found in `TERMINFO_DIRS` we don't to call `handle_curses()` before we've imported the latter.
-static bool env_initialized = false;
+    using anon_callback_t = std::function<void(env_stack_t &)>;
+    std::unordered_map<wcstring, anon_callback_t> anon_table_;
 
-void env_dispatch_mark_initialization_finished() { env_initialized = true; }
+    bool observes_var(const wcstring &name) {
+        return named_table_.count(name) || anon_table_.count(name);
+    }
+
+   public:
+    /// Add a callback for the given variable, which expects the name.
+    /// We must not already be observing this variable.
+    void add(wcstring name, named_callback_t cb) {
+        assert(!observes_var(name) && "Already observing that variable");
+        named_table_.emplace(std::move(name), std::move(cb));
+    }
+
+    /// Add a callback for the given variable, which ignores the name.
+    /// We must not already be observing this variable.
+    void add(wcstring name, anon_callback_t cb) {
+        assert(!observes_var(name) && "Already observing that variable");
+        anon_table_.emplace(std::move(name), std::move(cb));
+    }
+
+    void dispatch(const wchar_t *op, const wcstring &key, env_stack_t &vars) const {
+        auto named = named_table_.find(key);
+        if (named != named_table_.end()) {
+            named->second(op, key, vars);
+        }
+        auto anon = anon_table_.find(key);
+        if (anon != anon_table_.end()) {
+            anon->second(vars);
+        }
+    }
+};
+
+// return a new-ly allocated dispatch table, running those dispatch functions which should be
+// initialized.
+static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table();
+
+// A pointer to the variable dispatch table. This is allocated with new() and deliberately leaked to
+// avoid shutdown destructors. This is set during startup and should not be modified after.
+static const var_dispatch_table_t *s_var_dispatch_table;
+
+void env_dispatch_init() { s_var_dispatch_table = create_dispatch_table().release(); }
 
 /// Properly sets all timezone information.
 static void handle_timezone(const wchar_t *env_var_name, const environment_t &vars) {
@@ -145,17 +179,14 @@ void guess_emoji_width() {
 
 /// React to modifying the given variable.
 void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars) {
-    // Don't do any of this until `env_init()` has run. We only want to do this in response to
-    // variables set by the user; e.g., in a script like *config.fish* or interactively or as part
-    // of loading the universal variables for the first time. Variables we import from the
-    // environment or that are otherwise set by fish before this gets called have to explicitly
-    // call the appropriate functions to put the value of the var into effect.
-    if (!env_initialized) return;
+    ASSERT_IS_MAIN_THREAD();
+    // Do nothing if not yet fully initialized.
+    if (!s_var_dispatch_table) return;
 
-    auto dispatch = s_var_dispatch_table.find(key);
-    if (dispatch != s_var_dispatch_table.end()) {
-        (*dispatch->second)(op, key, vars);
-    } else if (string_prefixes_string(L"fish_color_", key)) {
+    s_var_dispatch_table->dispatch(op, key, vars);
+
+    // Eww.
+    if (string_prefixes_string(L"fish_color_", key)) {
         reader_react_to_color_change();
     }
 }
@@ -280,29 +311,30 @@ static void handle_curses_change(const wcstring &op, const wcstring &var_name, e
 
 /// Populate the dispatch table used by `env_dispatch_var_change()` to efficiently call the
 /// appropriate function to handle a change to a variable.
-static var_dispatch_table_t create_var_dispatch_table() {
-    var_dispatch_table_t var_dispatch_table;
+/// Note this returns a new-allocated value that we expect to leak.
+static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
+    auto var_dispatch_table = make_unique<var_dispatch_table_t>();
     for (const auto &var_name : locale_variables) {
-        var_dispatch_table.emplace(var_name, handle_locale_change);
+        var_dispatch_table->add(var_name, handle_locale_change);
     }
 
     for (const auto &var_name : curses_variables) {
-        var_dispatch_table.emplace(var_name, handle_curses_change);
+        var_dispatch_table->add(var_name, handle_curses_change);
     }
 
-    var_dispatch_table.emplace(L"PATH", handle_magic_colon_var_change);
-    var_dispatch_table.emplace(L"CDPATH", handle_magic_colon_var_change);
-    var_dispatch_table.emplace(L"fish_term256", handle_fish_term_change);
-    var_dispatch_table.emplace(L"fish_term24bit", handle_fish_term_change);
-    var_dispatch_table.emplace(L"fish_escape_delay_ms", handle_escape_delay_change);
-    var_dispatch_table.emplace(L"fish_emoji_width", handle_change_emoji_width);
-    var_dispatch_table.emplace(L"fish_ambiguous_width", handle_change_ambiguous_width);
-    var_dispatch_table.emplace(L"LINES", handle_term_size_change);
-    var_dispatch_table.emplace(L"COLUMNS", handle_term_size_change);
-    var_dispatch_table.emplace(L"fish_complete_path", handle_complete_path_change);
-    var_dispatch_table.emplace(L"fish_function_path", handle_function_path_change);
-    var_dispatch_table.emplace(L"fish_read_limit", handle_read_limit_change);
-    var_dispatch_table.emplace(L"fish_history", handle_fish_history_change);
-    var_dispatch_table.emplace(L"TZ", handle_tz_change);
+    var_dispatch_table->add(L"PATH", handle_magic_colon_var_change);
+    var_dispatch_table->add(L"CDPATH", handle_magic_colon_var_change);
+    var_dispatch_table->add(L"fish_term256", handle_fish_term_change);
+    var_dispatch_table->add(L"fish_term24bit", handle_fish_term_change);
+    var_dispatch_table->add(L"fish_escape_delay_ms", handle_escape_delay_change);
+    var_dispatch_table->add(L"fish_emoji_width", handle_change_emoji_width);
+    var_dispatch_table->add(L"fish_ambiguous_width", handle_change_ambiguous_width);
+    var_dispatch_table->add(L"LINES", handle_term_size_change);
+    var_dispatch_table->add(L"COLUMNS", handle_term_size_change);
+    var_dispatch_table->add(L"fish_complete_path", handle_complete_path_change);
+    var_dispatch_table->add(L"fish_function_path", handle_function_path_change);
+    var_dispatch_table->add(L"fish_read_limit", handle_read_limit_change);
+    var_dispatch_table->add(L"fish_history", handle_fish_history_change);
+    var_dispatch_table->add(L"TZ", handle_tz_change);
     return var_dispatch_table;
 }
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
index 9f10ff060..b862b7445 100644
--- a/src/env_dispatch.h
+++ b/src/env_dispatch.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-/// Mark initialization as finished.
-void env_dispatch_mark_initialization_finished();
+/// Initialize variable dispatch.
+void env_dispatch_init();
 
 class env_stack_t;
 void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars);

From e7de9cc37109c4cb05dcbaa79abbe39b96ecf282 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 31 Mar 2019 19:51:08 -0700
Subject: [PATCH 0269/1732] Migrate some env initialization into env_dispatch

---
 src/env.cpp          |  3 +--
 src/env_dispatch.cpp | 62 +++++++++++++++++++++-----------------------
 src/env_dispatch.h   |  3 ++-
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index c0a00fec7..a3aaf68d2 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -687,7 +687,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     init_curses(vars);
     init_input();
     init_path_vars();
-    guess_emoji_width();
 
     // Set up the USER and PATH variables
     setup_path();
@@ -789,7 +788,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
 
     // Allow changes to variables to produce events.
-    env_dispatch_init();
+    env_dispatch_init(vars);
 
     // Set up universal variables. The empty string means to use the default path.
     assert(s_universal_variables == NULL);
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 74ca13788..ddadc8427 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -120,6 +120,9 @@ class var_dispatch_table_t {
     }
 };
 
+// Run those dispatch functions which want to be run at startup.
+static void run_inits(const environment_t &vars);
+
 // return a new-ly allocated dispatch table, running those dispatch functions which should be
 // initialized.
 static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table();
@@ -128,7 +131,12 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table();
 // avoid shutdown destructors. This is set during startup and should not be modified after.
 static const var_dispatch_table_t *s_var_dispatch_table;
 
-void env_dispatch_init() { s_var_dispatch_table = create_dispatch_table().release(); }
+void env_dispatch_init(const environment_t &vars) {
+    run_inits(vars);
+    // Note this deliberately leaks; the dispatch table is immortal.
+    // Via this construct we can avoid invoking destructors at shutdown.
+    s_var_dispatch_table = create_dispatch_table().release();
+}
 
 /// Properly sets all timezone information.
 static void handle_timezone(const wchar_t *env_var_name, const environment_t &vars) {
@@ -146,9 +154,15 @@ static void handle_timezone(const wchar_t *env_var_name, const environment_t &va
 }
 
 /// Update the value of g_guessed_fish_emoji_width
-void guess_emoji_width() {
+static void guess_emoji_width(const environment_t &vars) {
+    if (auto width_str = vars.get(L"fish_emoji_width")) {
+        int new_width = fish_wcstol(width_str->as_string().c_str());
+        g_fish_emoji_width = std::max(0, new_width);
+        debug(2, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
+        return;
+    }
+
     wcstring term;
-    auto &vars = env_stack_t::globals();
     if (auto term_var = vars.get(L"TERM_PROGRAM")) {
         term = term_var->as_string();
     }
@@ -215,25 +229,6 @@ static void handle_fish_term_change(const wcstring &op, const wcstring &var_name
     reader_react_to_color_change();
 }
 
-static void handle_escape_delay_change(const wcstring &op, const wcstring &var_name,
-                                       env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    update_wait_on_escape_ms(vars);
-}
-
-static void handle_change_emoji_width(const wcstring &op, const wcstring &var_name,
-                                      env_stack_t &vars) {
-    (void)op;
-    (void)var_name;
-    int new_width = 0;
-    if (auto width_str = vars.get(L"fish_emoji_width")) {
-        new_width = fish_wcstol(width_str->as_string().c_str());
-    }
-    g_fish_emoji_width = std::max(0, new_width);
-    debug(2, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
-}
-
 static void handle_change_ambiguous_width(const wcstring &op, const wcstring &var_name,
                                           env_stack_t &vars) {
     (void)op;
@@ -294,18 +289,14 @@ static void handle_magic_colon_var_change(const wcstring &op, const wcstring &va
     fix_colon_delimited_var(var_name, vars);
 }
 
-static void handle_locale_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
+static void handle_locale_change(const environment_t &vars) {
     init_locale(vars);
     // We need to re-guess emoji width because the locale might have changed to a multibyte one.
-    guess_emoji_width();
+    guess_emoji_width(vars);
 }
 
-static void handle_curses_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
-    UNUSED(var_name);
-    guess_emoji_width();
+static void handle_curses_change(const environment_t &vars) {
+    guess_emoji_width(vars);
     init_curses(vars);
 }
 
@@ -326,8 +317,8 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
     var_dispatch_table->add(L"CDPATH", handle_magic_colon_var_change);
     var_dispatch_table->add(L"fish_term256", handle_fish_term_change);
     var_dispatch_table->add(L"fish_term24bit", handle_fish_term_change);
-    var_dispatch_table->add(L"fish_escape_delay_ms", handle_escape_delay_change);
-    var_dispatch_table->add(L"fish_emoji_width", handle_change_emoji_width);
+    var_dispatch_table->add(L"fish_escape_delay_ms", update_wait_on_escape_ms);
+    var_dispatch_table->add(L"fish_emoji_width", guess_emoji_width);
     var_dispatch_table->add(L"fish_ambiguous_width", handle_change_ambiguous_width);
     var_dispatch_table->add(L"LINES", handle_term_size_change);
     var_dispatch_table->add(L"COLUMNS", handle_term_size_change);
@@ -338,3 +329,10 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
     var_dispatch_table->add(L"TZ", handle_tz_change);
     return var_dispatch_table;
 }
+
+static void run_inits(const environment_t &vars) {
+    // This is the subset of those dispatch functions which want to be run at startup.
+    handle_locale_change(vars);
+    handle_curses_change(vars);
+    update_wait_on_escape_ms(vars);
+}
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
index b862b7445..ca12cf97f 100644
--- a/src/env_dispatch.h
+++ b/src/env_dispatch.h
@@ -10,7 +10,8 @@
 #include <memory>
 
 /// Initialize variable dispatch.
-void env_dispatch_init();
+class environment_t;
+void env_dispatch_init(const environment_t &vars);
 
 class env_stack_t;
 void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars);

From ab67354192113332be6a4e3d1baf95b9e25f2489 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:08:03 -0700
Subject: [PATCH 0270/1732] Migrate fish_use_posix_spawn into env_dispatch

---
 src/env.cpp          |  6 ------
 src/env_dispatch.cpp | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index a3aaf68d2..c05c13ecc 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -81,7 +81,6 @@ size_t read_byte_limit = READ_BYTE_LIMIT;
 static const wchar_t PATH_ARRAY_SEP = L':';
 static const wchar_t NONPATH_ARRAY_SEP = L' ';
 
-bool g_use_posix_spawn = false;  // will usually be set to true
 bool curses_initialized = false;
 
 /// Does the terminal have the "eat_newline_glitch".
@@ -779,11 +778,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     vars.set_termsize();    // initialize the terminal size variables
     vars.set_read_limit();  // initialize the read_byte_limit
 
-    // Set g_use_posix_spawn. Default to true.
-    auto use_posix_spawn = vars.get(L"fish_use_posix_spawn");
-    g_use_posix_spawn =
-        use_posix_spawn.missing_or_empty() ? true : bool_from_string(use_posix_spawn->as_string());
-
     // Set fish_bind_mode to "default".
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
 
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index ddadc8427..ed84ddc77 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -300,6 +300,13 @@ static void handle_curses_change(const environment_t &vars) {
     init_curses(vars);
 }
 
+static void handle_fish_use_posix_spawn_change(const environment_t &vars) {
+    // note this defaults to true
+    auto use_posix_spawn = vars.get(L"fish_use_posix_spawn");
+    g_use_posix_spawn =
+        use_posix_spawn.missing_or_empty() ? true : bool_from_string(use_posix_spawn->as_string());
+}
+
 /// Populate the dispatch table used by `env_dispatch_var_change()` to efficiently call the
 /// appropriate function to handle a change to a variable.
 /// Note this returns a new-allocated value that we expect to leak.
@@ -327,6 +334,7 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
     var_dispatch_table->add(L"fish_read_limit", handle_read_limit_change);
     var_dispatch_table->add(L"fish_history", handle_fish_history_change);
     var_dispatch_table->add(L"TZ", handle_tz_change);
+    var_dispatch_table->add(L"fish_use_posix_spawn", handle_fish_use_posix_spawn_change);
     return var_dispatch_table;
 }
 
@@ -336,3 +344,6 @@ static void run_inits(const environment_t &vars) {
     handle_curses_change(vars);
     update_wait_on_escape_ms(vars);
 }
+
+// Miscellaneous variables.
+bool g_use_posix_spawn = false;

From 0c5809a0883b8d133c298a8b8c9b963a39489b88 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:22:08 -0700
Subject: [PATCH 0271/1732] Minor cleanup of env_node_t

---
 src/env.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index c05c13ecc..12bd73ae3 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -95,7 +95,7 @@ class env_node_t {
     /// Does this node imply a new variable scope? If yes, all non-global variables below this one
     /// in the stack are invisible. If new_scope is set for the global variable node, the universe
     /// will explode.
-    bool new_scope;
+    const bool new_scope;
     /// Does this node contain any variables which are exported to subshells
     /// or does it redefine any variables to not be exported?
     bool exportv = false;
@@ -104,7 +104,11 @@ class env_node_t {
 
     env_node_t(bool is_new_scope) : new_scope(is_new_scope) {}
 
-    maybe_t<env_var_t> find_entry(const wcstring &key);
+    maybe_t<env_var_t> find_entry(const wcstring &key) {
+        auto it = env.find(key);
+        if (it != env.end()) return it->second;
+        return none();
+    }
 
     /// Return whether this node contains any of the entries in the vars list.
     bool contains_any_of(const wcstring_list_t &vars) const {
@@ -305,12 +309,6 @@ var_stack_t &env_stack_t::vars_stack() { return *vars_; }
 
 const var_stack_t &env_stack_t::vars_stack() const { return *vars_; }
 
-maybe_t<env_var_t> env_node_t::find_entry(const wcstring &key) {
-    var_table_t::const_iterator entry = env.find(key);
-    if (entry != env.end()) return entry->second;
-    return none();
-}
-
 /// Return the current umask value.
 static mode_t get_umask() {
     mode_t res;

From 59fb5b1849e953018f8d3d0f90fe990918e3f613 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:23:49 -0700
Subject: [PATCH 0272/1732] var_stack_t::pop() to return the popped node

---
 src/env.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 12bd73ae3..af7519dc7 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -175,14 +175,10 @@ struct var_stack_t {
         }
     }
 
-    // Pops the top node if it's not global
-    void pop() {
-        // Don't pop the top-most, global, level.
-        if (top == this->global_env) {
-            debug(0, _(L"Tried to pop empty environment stack."));
-            sanity_lose();
-            return;
-        }
+    // Pops the top node, asserting it's not global.
+    // \return the popped node.
+    env_node_ref_t pop() {
+        assert(top != this->global_env && "Cannot pop global node");
 
         bool locale_changed = top->contains_any_of(locale_variables);
         bool curses_changed = top->contains_any_of(curses_variables);
@@ -208,6 +204,7 @@ struct var_stack_t {
         const auto &vars = env_stack_t::principal();
         if (locale_changed) init_locale(vars);
         if (curses_changed) init_curses(vars);
+        return old_top;
     }
 
     // Returns the next scope to search for a given node, respecting the new_scope flag.

From dc729653beb7beb34ae40ff6d7fbbdb7cb71a9ce Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:32:14 -0700
Subject: [PATCH 0273/1732] Migrate pop complexity from vars_stack_t to
 env_stack_t

When popping a scope from the environment stack, we currently do a lot of
nonsense like looking for changed curses variables. We want to centralize
this in env_stack_t so that it can be migrated to the env_dispatch logic.
Move this logic up one level in preparation for doing that.
---
 src/env.cpp | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index af7519dc7..b0e75f4c3 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -179,31 +179,8 @@ struct var_stack_t {
     // \return the popped node.
     env_node_ref_t pop() {
         assert(top != this->global_env && "Cannot pop global node");
-
-        bool locale_changed = top->contains_any_of(locale_variables);
-        bool curses_changed = top->contains_any_of(curses_variables);
-
-        if (top->new_scope) {  //!OCLINT(collapsible if statements)
-            if (top->exportv || local_scope_exports(top->next)) {
-                this->mark_changed_exported();
-            }
-        }
-
-        // Actually do the pop!
         env_node_ref_t old_top = this->top;
         this->top = old_top->next;
-        for (const auto &entry_pair : old_top->env) {
-            const env_var_t &var = entry_pair.second;
-            if (var.exports()) {
-                this->mark_changed_exported();
-                break;
-            }
-        }
-
-        // TODO: instantize this locale and curses
-        const auto &vars = env_stack_t::principal();
-        if (locale_changed) init_locale(vars);
-        if (curses_changed) init_curses(vars);
         return old_top;
     }
 
@@ -232,11 +209,13 @@ struct var_stack_t {
         return var_stack_t(*this);
     }
 
+    /// return true if the topomst local scope exports a variable.
+    bool local_scope_exports(const env_node_ref_t &n) const;
+
    private:
     /// Copy constructor. This does not copy the export array; it just allows it to be regenerated.
     var_stack_t(const var_stack_t &rhs) : top(rhs.top), global_env(rhs.global_env) {}
 
-    bool local_scope_exports(const env_node_ref_t &n) const;
     void get_exported(const env_node_t *n, var_table_t &h) const;
 
     /// Returns the global variable set.
@@ -1209,7 +1188,29 @@ bool var_stack_t::local_scope_exports(const env_node_ref_t &n) const {
 
 void env_stack_t::push(bool new_scope) { vars_stack().push(new_scope); }
 
-void env_stack_t::pop() { vars_stack().pop(); }
+void env_stack_t::pop() {
+    auto &vars = vars_stack();
+    auto old_node = vars.pop();
+    if (old_node->contains_any_of(locale_variables)) {
+        init_locale(*this);
+    }
+
+    if (old_node->contains_any_of(curses_variables)) {
+        init_curses(*this);
+    }
+
+    if (old_node->new_scope && (old_node->exportv || vars.local_scope_exports(old_node->next))) {
+        vars.mark_changed_exported();
+    }
+
+    for (const auto &entry_pair : old_node->env) {
+        const env_var_t &var = entry_pair.second;
+        if (var.exports()) {
+            vars.mark_changed_exported();
+            break;
+        }
+    }
+}
 
 /// Function used with to insert keys of one table into a set::set<wcstring>.
 static void add_key_to_string_set(const var_table_t &envs, std::set<wcstring> *str_set,

From 987e41de12820d1c8b1902bb49cc25882e2c0b51 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:37:38 -0700
Subject: [PATCH 0274/1732] Remove the op from env_dispatch

Environment dispatch passes strings like "ERASE" and "SET" but nobody
ever looks at those. Just get rid of them.
---
 src/env.cpp          |  4 ++--
 src/env_dispatch.cpp | 49 +++++++++++++++-----------------------------
 src/env_dispatch.h   |  2 +-
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index b0e75f4c3..6b985ce19 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -972,7 +972,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
     }
 
     event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
-    env_dispatch_var_change(L"SET", key, *this);
+    env_dispatch_var_change(key, *this);
     return ENV_OK;
 }
 
@@ -1058,7 +1058,7 @@ int env_stack_t::remove(const wcstring &key, int var_mode) {
         if (is_exported) vars_stack().mark_changed_exported();
     }
 
-    env_dispatch_var_change(L"ERASE", key, *this);
+    env_dispatch_var_change(key, *this);
 
     return erased ? ENV_OK : ENV_NOT_FOUND;
 }
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index ed84ddc77..cb22dbfeb 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -83,7 +83,7 @@ extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
 extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
 
 class var_dispatch_table_t {
-    using named_callback_t = std::function<void(const wcstring &, const wcstring &, env_stack_t &)>;
+    using named_callback_t = std::function<void(const wcstring &, env_stack_t &)>;
     std::unordered_map<wcstring, named_callback_t> named_table_;
 
     using anon_callback_t = std::function<void(env_stack_t &)>;
@@ -108,10 +108,10 @@ class var_dispatch_table_t {
         anon_table_.emplace(std::move(name), std::move(cb));
     }
 
-    void dispatch(const wchar_t *op, const wcstring &key, env_stack_t &vars) const {
+    void dispatch(const wcstring &key, env_stack_t &vars) const {
         auto named = named_table_.find(key);
         if (named != named_table_.end()) {
-            named->second(op, key, vars);
+            named->second(key, vars);
         }
         auto anon = anon_table_.find(key);
         if (anon != anon_table_.end()) {
@@ -192,12 +192,12 @@ static void guess_emoji_width(const environment_t &vars) {
 }
 
 /// React to modifying the given variable.
-void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars) {
+void env_dispatch_var_change(const wcstring &key, env_stack_t &vars) {
     ASSERT_IS_MAIN_THREAD();
     // Do nothing if not yet fully initialized.
     if (!s_var_dispatch_table) return;
 
-    s_var_dispatch_table->dispatch(op, key, vars);
+    s_var_dispatch_table->dispatch(key, vars);
 
     // Eww.
     if (string_prefixes_string(L"fish_color_", key)) {
@@ -210,7 +210,7 @@ void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t
 static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
     const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET";
 
-    env_dispatch_var_change(op, cb.key, *stack);
+    env_dispatch_var_change(cb.key, *stack);
     stack->mark_changed_exported();
     event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
 }
@@ -221,18 +221,14 @@ void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &cal
     }
 }
 
-static void handle_fish_term_change(const wcstring &op, const wcstring &var_name,
-                                    env_stack_t &vars) {
-    UNUSED(op);
+static void handle_fish_term_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     update_fish_color_support(vars);
     reader_react_to_color_change();
 }
 
-static void handle_change_ambiguous_width(const wcstring &op, const wcstring &var_name,
-                                          env_stack_t &vars) {
-    (void)op;
-    (void)var_name;
+static void handle_change_ambiguous_width(const wcstring &var_name, env_stack_t &vars) {
+    UNUSED(var_name);
     int new_width = 1;
     if (auto width_str = vars.get(L"fish_ambiguous_width")) {
         new_width = fish_wcstol(width_str->as_string().c_str());
@@ -240,52 +236,39 @@ static void handle_change_ambiguous_width(const wcstring &op, const wcstring &va
     g_fish_ambiguous_width = std::max(0, new_width);
 }
 
-static void handle_term_size_change(const wcstring &op, const wcstring &var_name,
-                                    env_stack_t &vars) {
-    UNUSED(op);
+static void handle_term_size_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     UNUSED(vars);
     invalidate_termsize(true);  // force fish to update its idea of the terminal size plus vars
 }
 
-static void handle_read_limit_change(const wcstring &op, const wcstring &var_name,
-                                     env_stack_t &vars) {
-    UNUSED(op);
+static void handle_read_limit_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     vars.set_read_limit();
 }
 
-static void handle_fish_history_change(const wcstring &op, const wcstring &var_name,
-                                       env_stack_t &vars) {
-    UNUSED(op);
+static void handle_fish_history_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     reader_change_history(history_session_id(vars));
 }
 
-static void handle_function_path_change(const wcstring &op, const wcstring &var_name,
-                                        env_stack_t &vars) {
-    UNUSED(op);
+static void handle_function_path_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     UNUSED(vars);
     function_invalidate_path();
 }
 
-static void handle_complete_path_change(const wcstring &op, const wcstring &var_name,
-                                        env_stack_t &vars) {
-    UNUSED(op);
+static void handle_complete_path_change(const wcstring &var_name, env_stack_t &vars) {
     UNUSED(var_name);
     UNUSED(vars);
     complete_invalidate_path();
 }
 
-static void handle_tz_change(const wcstring &op, const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(op);
+static void handle_tz_change(const wcstring &var_name, env_stack_t &vars) {
     handle_timezone(var_name.c_str(), vars);
 }
 
-static void handle_magic_colon_var_change(const wcstring &op, const wcstring &var_name,
-                                          env_stack_t &vars) {
-    UNUSED(op);
+static void handle_magic_colon_var_change(const wcstring &var_name, env_stack_t &vars) {
     fix_colon_delimited_var(var_name, vars);
 }
 
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
index ca12cf97f..50ece1df7 100644
--- a/src/env_dispatch.h
+++ b/src/env_dispatch.h
@@ -14,7 +14,7 @@ class environment_t;
 void env_dispatch_init(const environment_t &vars);
 
 class env_stack_t;
-void env_dispatch_var_change(const wchar_t *op, const wcstring &key, env_stack_t &vars);
+void env_dispatch_var_change(const wcstring &key, env_stack_t &vars);
 void guess_emoji_width();
 
 void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks);

From a4fe3c87ae81193488049635c55caa7261df8eef Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 12:50:23 -0700
Subject: [PATCH 0275/1732] Switch certain environment callbacks from named to
 anonymous

---
 src/env_dispatch.cpp | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index cb22dbfeb..016aca3dc 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -221,14 +221,12 @@ void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &cal
     }
 }
 
-static void handle_fish_term_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_fish_term_change(env_stack_t &vars) {
     update_fish_color_support(vars);
     reader_react_to_color_change();
 }
 
-static void handle_change_ambiguous_width(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_change_ambiguous_width(env_stack_t &vars) {
     int new_width = 1;
     if (auto width_str = vars.get(L"fish_ambiguous_width")) {
         new_width = fish_wcstol(width_str->as_string().c_str());
@@ -236,30 +234,23 @@ static void handle_change_ambiguous_width(const wcstring &var_name, env_stack_t
     g_fish_ambiguous_width = std::max(0, new_width);
 }
 
-static void handle_term_size_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_term_size_change(env_stack_t &vars) {
     UNUSED(vars);
     invalidate_termsize(true);  // force fish to update its idea of the terminal size plus vars
 }
 
-static void handle_read_limit_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
-    vars.set_read_limit();
-}
+static void handle_read_limit_change(env_stack_t &vars) { vars.set_read_limit(); }
 
-static void handle_fish_history_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_fish_history_change(env_stack_t &vars) {
     reader_change_history(history_session_id(vars));
 }
 
-static void handle_function_path_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_function_path_change(env_stack_t &vars) {
     UNUSED(vars);
     function_invalidate_path();
 }
 
-static void handle_complete_path_change(const wcstring &var_name, env_stack_t &vars) {
-    UNUSED(var_name);
+static void handle_complete_path_change(env_stack_t &vars) {
     UNUSED(vars);
     complete_invalidate_path();
 }

From 11651dec7aff3f36f50a8d49af0242ed003747d3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 13:02:29 -0700
Subject: [PATCH 0276/1732] Clean up env_stack_t::pop

Use the new dispatch mechanism to reduce duplication
---
 src/env.cpp | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 6b985ce19..fb5b24399 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1191,24 +1191,19 @@ void env_stack_t::push(bool new_scope) { vars_stack().push(new_scope); }
 void env_stack_t::pop() {
     auto &vars = vars_stack();
     auto old_node = vars.pop();
-    if (old_node->contains_any_of(locale_variables)) {
-        init_locale(*this);
-    }
 
-    if (old_node->contains_any_of(curses_variables)) {
-        init_curses(*this);
-    }
-
-    if (old_node->new_scope && (old_node->exportv || vars.local_scope_exports(old_node->next))) {
+    // Maybe exported variables have changed.
+    if (old_node->exportv) {
+        // This node exported or unexported a variable.
+        vars.mark_changed_exported();
+    } else if (old_node->new_scope && vars.local_scope_exports(old_node->next)) {
+        // This node was a local scope, so it shadowed exports from its parent.
         vars.mark_changed_exported();
     }
 
-    for (const auto &entry_pair : old_node->env) {
-        const env_var_t &var = entry_pair.second;
-        if (var.exports()) {
-            vars.mark_changed_exported();
-            break;
-        }
+    // TODO: we would like to coalesce locale / curses changes, so that we only re-initialize once.
+    for (const auto &kv : old_node->env) {
+        env_dispatch_var_change(kv.first, *this);
     }
 }
 

From fa0a6ae0960177ba6e19e96ea0ad6e7585f3d30b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 13:32:25 -0700
Subject: [PATCH 0277/1732] Move locale and curses init from env to
 env_dispatch

---
 src/env.cpp          | 215 +------------------------------------------
 src/env.h            |   5 -
 src/env_dispatch.cpp | 213 +++++++++++++++++++++++++++++++++++++++++-
 src/env_dispatch.h   |   3 -
 4 files changed, 210 insertions(+), 226 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index fb5b24399..9fdc16cce 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -3,7 +3,6 @@
 
 #include <errno.h>
 #include <limits.h>
-#include <locale.h>
 #include <pwd.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -15,19 +14,6 @@
 #include <unistd.h>
 #include <cwchar>
 
-#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 <algorithm>
 #include <iterator>
 #include <set>
@@ -315,161 +301,6 @@ void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
     }
 }
 
-/// Initialize the locale subsystem.
-void init_locale(const environment_t &vars) {
-    // We have to make a copy because the subsequent setlocale() call to change the locale will
-    // invalidate the pointer from the this setlocale() call.
-    char *old_msg_locale = strdup(setlocale(LC_MESSAGES, NULL));
-
-    for (const auto &var_name : locale_variables) {
-        const auto var = vars.get(var_name, ENV_EXPORT);
-        const std::string &name = wcs2string(var_name);
-        if (var.missing_or_empty()) {
-            debug(5, L"locale var %s missing or empty", name.c_str());
-            unsetenv(name.c_str());
-        } else {
-            const std::string value = wcs2string(var->as_string());
-            debug(5, L"locale var %s='%s'", name.c_str(), value.c_str());
-            setenv(name.c_str(), value.c_str(), 1);
-        }
-    }
-
-    char *locale = setlocale(LC_ALL, "");
-    fish_setlocale();
-    debug(5, L"init_locale() setlocale(): '%s'", locale);
-
-    const char *new_msg_locale = setlocale(LC_MESSAGES, NULL);
-    debug(5, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
-    debug(5, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
-#ifdef HAVE__NL_MSG_CAT_CNTR
-    if (std::strcmp(old_msg_locale, new_msg_locale)) {
-        // Make change known to GNU gettext.
-        extern int _nl_msg_cat_cntr;
-        _nl_msg_cat_cntr++;
-    }
-#endif
-    free(old_msg_locale);
-}
-
-/// True if we think we can set the terminal title else false.
-static bool can_set_term_title = false;
-
-/// Returns true if we think the terminal supports setting its title.
-bool term_supports_setting_title() { return can_set_term_title; }
-
-/// This is a pretty lame heuristic for detecting terminals that do not support setting the
-/// title. If we recognise the terminal name as that of a virtual terminal, we assume it supports
-/// setting the title. If we recognise it as that of a console, we assume it does not support
-/// setting the title. Otherwise we check the ttyname and see if we believe it is a virtual
-/// terminal.
-///
-/// One situation in which this breaks down is with screen, since screen supports setting the
-/// terminal title if the underlying terminal does so, but will print garbage on terminals that
-/// don't. Since we can't see the underlying terminal below screen there is no way to fix this.
-static const wchar_t *const title_terms[] = {L"xterm", L"screen", L"tmux", L"nxterm", L"rxvt"};
-static bool does_term_support_setting_title(const environment_t &vars) {
-    const auto term_var = vars.get(L"TERM");
-    if (term_var.missing_or_empty()) return false;
-
-    const wcstring term_str = term_var->as_string();
-    const wchar_t *term = term_str.c_str();
-    bool recognized = contains(title_terms, term_var->as_string());
-    if (!recognized) recognized = !std::wcsncmp(term, L"xterm-", std::wcslen(L"xterm-"));
-    if (!recognized) recognized = !std::wcsncmp(term, L"screen-", std::wcslen(L"screen-"));
-    if (!recognized) recognized = !std::wcsncmp(term, L"tmux-", std::wcslen(L"tmux-"));
-    if (!recognized) {
-        if (std::wcscmp(term, L"linux") == 0) return false;
-        if (std::wcscmp(term, L"dumb") == 0) return false;
-        // NetBSD
-        if (std::wcscmp(term, L"vt100") == 0) return false;
-        if (std::wcscmp(term, L"wsvt25") == 0) return false;
-
-        char buf[PATH_MAX];
-        int retval = ttyname_r(STDIN_FILENO, buf, PATH_MAX);
-        if (retval != 0 || std::strstr(buf, "tty") || std::strstr(buf, "/vc/")) return false;
-    }
-
-    return true;
-}
-
-/// Updates our idea of whether we support term256 and term24bit (see issue #10222).
-void update_fish_color_support(const environment_t &vars) {
-    // Detect or infer term256 support. If fish_term256 is set, we respect it;
-    // otherwise infer it from the TERM variable or use terminfo.
-    wcstring term;
-    bool support_term256 = false;
-    bool support_term24bit = false;
-
-    if (auto term_var = vars.get(L"TERM")) term = term_var->as_string();
-
-    if (auto fish_term256 = vars.get(L"fish_term256")) {
-        // $fish_term256
-        support_term256 = bool_from_string(fish_term256->as_string());
-        debug(2, L"256 color support determined by '$fish_term256'");
-    } else if (term.find(L"256color") != wcstring::npos) {
-        // TERM is *256color*: 256 colors explicitly supported
-        support_term256 = true;
-        debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
-    } else if (term.find(L"xterm") != wcstring::npos) {
-        // Assume that all 'xterm's can handle 256, except for Terminal.app from Snow Leopard
-        wcstring term_program;
-        if (auto tp = vars.get(L"TERM_PROGRAM")) term_program = tp->as_string();
-        if (auto tpv = vars.get(L"TERM_PROGRAM_VERSION")) {
-            if (term_program == L"Apple_Terminal" &&
-                fish_wcstod(tpv->as_string().c_str(), NULL) > 299) {
-                // OS X Lion is version 299+, it has 256 color support (see github Wiki)
-                support_term256 = true;
-                debug(2, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
-            } else {
-                support_term256 = true;
-                debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
-            }
-        }
-    } else if (cur_term != NULL) {
-        // See if terminfo happens to identify 256 colors
-        support_term256 = (max_colors >= 256);
-        debug(2, L"256 color support: %d colors per terminfo entry for %ls", max_colors, term.c_str());
-    }
-
-    // Handle $fish_term24bit
-    if (auto fish_term24bit = vars.get(L"fish_term24bit")) {
-        support_term24bit = bool_from_string(fish_term24bit->as_string());
-        debug(2, L"'fish_term24bit' preference: 24-bit color %s",
-              support_term24bit ? L"enabled" : L"disabled");
-    } else {
-        // We don't attempt to infer term24 bit support yet.
-        // XXX: actually, we do, in config.fish.
-        // So we actually change the color mode shortly after startup
-    }
-    color_support_t support = (support_term256 ? color_support_term256 : 0) |
-                              (support_term24bit ? color_support_term24bit : 0);
-    output_set_color_support(support);
-}
-
-// Try to initialize the terminfo/curses subsystem using our fallback terminal name. Do not set
-// `TERM` to our fallback. We're only doing this in the hope of getting a minimally functional
-// shell. If we launch an external command that uses TERM it should get the same value we were
-// given, if any.
-static bool initialize_curses_using_fallback(const char *term) {
-    // If $TERM is already set to the fallback name we're about to use there isn't any point in
-    // seeing if the fallback name can be used.
-    auto &vars = env_stack_t::globals();
-    auto term_var = vars.get(L"TERM");
-    if (term_var.missing_or_empty()) return false;
-
-    auto term_env = wcs2string(term_var->as_string());
-    if (term_env == DEFAULT_TERM1 || term_env == DEFAULT_TERM2) return false;
-
-    if (is_interactive_session) debug(1, _(L"Using fallback terminal type '%s'."), term);
-
-    int err_ret;
-    if (setupterm((char *)term, STDOUT_FILENO, &err_ret) == OK) return true;
-    if (is_interactive_session) {
-        debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
-    }
-    return false;
-}
-
 /// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
 /// elements are converted to explicit "." to make the vars easier to use in fish scripts.
 static void init_path_vars() {
@@ -478,47 +309,6 @@ static void init_path_vars() {
     fix_colon_delimited_var(L"CDPATH", env_stack_t::globals());
 }
 
-/// Initialize the curses subsystem.
-void init_curses(const environment_t &vars) {
-    for (const auto &var_name : curses_variables) {
-        std::string name = wcs2string(var_name);
-        const auto var = vars.get(var_name, ENV_EXPORT);
-        if (var.missing_or_empty()) {
-            debug(2, L"curses var %s missing or empty", name.c_str());
-            unsetenv(name.c_str());
-        } else {
-            std::string value = wcs2string(var->as_string());
-            debug(2, L"curses var %s='%s'", name.c_str(), value.c_str());
-            setenv(name.c_str(), value.c_str(), 1);
-        }
-    }
-
-    int err_ret;
-    if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
-        auto term = vars.get(L"TERM");
-        if (is_interactive_session) {
-            debug(1, _(L"Could not set up terminal."));
-            if (term.missing_or_empty()) {
-                debug(1, _(L"TERM environment variable not set."));
-            } else {
-                debug(1, _(L"TERM environment variable set to '%ls'."), term->as_string().c_str());
-                debug(1, _(L"Check that this terminal type is supported on this system."));
-            }
-        }
-
-        if (!initialize_curses_using_fallback(DEFAULT_TERM1)) {
-            initialize_curses_using_fallback(DEFAULT_TERM2);
-        }
-    }
-
-    can_set_term_title = does_term_support_setting_title(vars);
-    term_has_xn = tigetflag((char *)"xenl") == 1;  // does terminal have the eat_newline_glitch
-    update_fish_color_support(vars);
-    // Invalidate the cached escape sequences since they may no longer be valid.
-    cached_layouts.clear();
-    curses_initialized = true;
-}
-
 /// Make sure the PATH variable contains something.
 static void setup_path() {
     auto &vars = env_stack_t::globals();
@@ -656,9 +446,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     path_get_data(user_data_dir);
     vars.set_one(FISH_USER_DATA_DIR, ENV_GLOBAL, user_data_dir);
 
-    init_locale(vars);
-    init_curses(vars);
-    init_input();
     init_path_vars();
 
     // Set up the USER and PATH variables
@@ -758,6 +545,8 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     // Allow changes to variables to produce events.
     env_dispatch_init(vars);
 
+    init_input();
+
     // Set up universal variables. The empty string means to use the default path.
     assert(s_universal_variables == NULL);
     s_universal_variables = new env_universal_t(L"");
diff --git a/src/env.h b/src/env.h
index 8bb725ebf..8de3e353c 100644
--- a/src/env.h
+++ b/src/env.h
@@ -320,9 +320,4 @@ wcstring env_get_runtime_path();
 /// Replace empty path elements with "." - see #3914.
 void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars);
 
-// Temporararily exposed so that env_dispatch can call these.
-void init_locale(const environment_t &vars);
-void init_curses(const environment_t &vars);
-void update_fish_color_support(const environment_t &vars);
-
 #endif
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 016aca3dc..ded6e76a4 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -72,7 +72,7 @@
 
 /// List of all locale environment variable names that might trigger (re)initializing the locale
 /// subsystem.
-extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
+static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
                                                L"LC_COLLATE", L"LC_CTYPE", L"LC_IDENTIFICATION",
                                                L"LC_MEASUREMENT", L"LC_MESSAGES", L"LC_MONETARY",
                                                L"LC_NAME", L"LC_NUMERIC", L"LC_PAPER",
@@ -80,7 +80,7 @@ extern const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
 
 /// List of all curses environment variable names that might trigger (re)initializing the curses
 /// subsystem.
-extern const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
+static const wcstring_list_t curses_variables({L"TERM", L"TERMINFO", L"TERMINFO_DIRS"});
 
 class var_dispatch_table_t {
     using named_callback_t = std::function<void(const wcstring &, env_stack_t &)>;
@@ -120,6 +120,14 @@ class var_dispatch_table_t {
     }
 };
 
+// Forward declarations.
+static void init_curses(const environment_t &vars);
+static void init_locale(const environment_t &vars);
+static void update_fish_color_support(const environment_t &vars);
+
+/// True if we think we can set the terminal title.
+static bool can_set_term_title = false;
+
 // Run those dispatch functions which want to be run at startup.
 static void run_inits(const environment_t &vars);
 
@@ -314,10 +322,205 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
 
 static void run_inits(const environment_t &vars) {
     // This is the subset of those dispatch functions which want to be run at startup.
-    handle_locale_change(vars);
-    handle_curses_change(vars);
+    init_locale(vars);
+    init_curses(vars);
+    guess_emoji_width(vars);
     update_wait_on_escape_ms(vars);
 }
 
-// Miscellaneous variables.
+/// Updates our idea of whether we support term256 and term24bit (see issue #10222).
+static void update_fish_color_support(const environment_t &vars) {
+    // Detect or infer term256 support. If fish_term256 is set, we respect it;
+    // otherwise infer it from the TERM variable or use terminfo.
+    wcstring term;
+    bool support_term256 = false;
+    bool support_term24bit = false;
+
+    if (auto term_var = vars.get(L"TERM")) term = term_var->as_string();
+
+    if (auto fish_term256 = vars.get(L"fish_term256")) {
+        // $fish_term256
+        support_term256 = bool_from_string(fish_term256->as_string());
+        debug(2, L"256 color support determined by '$fish_term256'");
+    } else if (term.find(L"256color") != wcstring::npos) {
+        // TERM is *256color*: 256 colors explicitly supported
+        support_term256 = true;
+        debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
+    } else if (term.find(L"xterm") != wcstring::npos) {
+        // Assume that all 'xterm's can handle 256, except for Terminal.app from Snow Leopard
+        wcstring term_program;
+        if (auto tp = vars.get(L"TERM_PROGRAM")) term_program = tp->as_string();
+        if (auto tpv = vars.get(L"TERM_PROGRAM_VERSION")) {
+            if (term_program == L"Apple_Terminal" &&
+                fish_wcstod(tpv->as_string().c_str(), NULL) > 299) {
+                // OS X Lion is version 299+, it has 256 color support (see github Wiki)
+                support_term256 = true;
+                debug(2, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
+            } else {
+                support_term256 = true;
+                debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
+            }
+        }
+    } else if (cur_term != NULL) {
+        // See if terminfo happens to identify 256 colors
+        support_term256 = (max_colors >= 256);
+        debug(2, L"256 color support: %d colors per terminfo entry for %ls", max_colors,
+              term.c_str());
+    }
+
+    // Handle $fish_term24bit
+    if (auto fish_term24bit = vars.get(L"fish_term24bit")) {
+        support_term24bit = bool_from_string(fish_term24bit->as_string());
+        debug(2, L"'fish_term24bit' preference: 24-bit color %s",
+              support_term24bit ? L"enabled" : L"disabled");
+    } else {
+        // We don't attempt to infer term24 bit support yet.
+        // XXX: actually, we do, in config.fish.
+        // So we actually change the color mode shortly after startup
+    }
+    color_support_t support = (support_term256 ? color_support_term256 : 0) |
+                              (support_term24bit ? color_support_term24bit : 0);
+    output_set_color_support(support);
+}
+
+// Try to initialize the terminfo/curses subsystem using our fallback terminal name. Do not set
+// `TERM` to our fallback. We're only doing this in the hope of getting a minimally functional
+// shell. If we launch an external command that uses TERM it should get the same value we were
+// given, if any.
+static bool initialize_curses_using_fallback(const char *term) {
+    // If $TERM is already set to the fallback name we're about to use there isn't any point in
+    // seeing if the fallback name can be used.
+    auto &vars = env_stack_t::globals();
+    auto term_var = vars.get(L"TERM");
+    if (term_var.missing_or_empty()) return false;
+
+    auto term_env = wcs2string(term_var->as_string());
+    if (term_env == DEFAULT_TERM1 || term_env == DEFAULT_TERM2) return false;
+
+    if (is_interactive_session) debug(1, _(L"Using fallback terminal type '%s'."), term);
+
+    int err_ret;
+    if (setupterm((char *)term, STDOUT_FILENO, &err_ret) == OK) return true;
+    if (is_interactive_session) {
+        debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
+    }
+    return false;
+}
+
+/// This is a pretty lame heuristic for detecting terminals that do not support setting the
+/// title. If we recognise the terminal name as that of a virtual terminal, we assume it supports
+/// setting the title. If we recognise it as that of a console, we assume it does not support
+/// setting the title. Otherwise we check the ttyname and see if we believe it is a virtual
+/// terminal.
+///
+/// One situation in which this breaks down is with screen, since screen supports setting the
+/// terminal title if the underlying terminal does so, but will print garbage on terminals that
+/// don't. Since we can't see the underlying terminal below screen there is no way to fix this.
+static const wchar_t *const title_terms[] = {L"xterm", L"screen", L"tmux", L"nxterm", L"rxvt"};
+static bool does_term_support_setting_title(const environment_t &vars) {
+    const auto term_var = vars.get(L"TERM");
+    if (term_var.missing_or_empty()) return false;
+
+    const wcstring term_str = term_var->as_string();
+    const wchar_t *term = term_str.c_str();
+    bool recognized = contains(title_terms, term_var->as_string());
+    if (!recognized) recognized = !std::wcsncmp(term, L"xterm-", std::wcslen(L"xterm-"));
+    if (!recognized) recognized = !std::wcsncmp(term, L"screen-", std::wcslen(L"screen-"));
+    if (!recognized) recognized = !std::wcsncmp(term, L"tmux-", std::wcslen(L"tmux-"));
+    if (!recognized) {
+        if (std::wcscmp(term, L"linux") == 0) return false;
+        if (std::wcscmp(term, L"dumb") == 0) return false;
+        // NetBSD
+        if (std::wcscmp(term, L"vt100") == 0) return false;
+        if (std::wcscmp(term, L"wsvt25") == 0) return false;
+
+        char buf[PATH_MAX];
+        int retval = ttyname_r(STDIN_FILENO, buf, PATH_MAX);
+        if (retval != 0 || std::strstr(buf, "tty") || std::strstr(buf, "/vc/")) return false;
+    }
+
+    return true;
+}
+
+/// Initialize the curses subsystem.
+static void init_curses(const environment_t &vars) {
+    for (const auto &var_name : curses_variables) {
+        std::string name = wcs2string(var_name);
+        const auto var = vars.get(var_name, ENV_EXPORT);
+        if (var.missing_or_empty()) {
+            debug(2, L"curses var %s missing or empty", name.c_str());
+            unsetenv(name.c_str());
+        } else {
+            std::string value = wcs2string(var->as_string());
+            debug(2, L"curses var %s='%s'", name.c_str(), value.c_str());
+            setenv(name.c_str(), value.c_str(), 1);
+        }
+    }
+
+    int err_ret;
+    if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
+        auto term = vars.get(L"TERM");
+        if (is_interactive_session) {
+            debug(1, _(L"Could not set up terminal."));
+            if (term.missing_or_empty()) {
+                debug(1, _(L"TERM environment variable not set."));
+            } else {
+                debug(1, _(L"TERM environment variable set to '%ls'."), term->as_string().c_str());
+                debug(1, _(L"Check that this terminal type is supported on this system."));
+            }
+        }
+
+        if (!initialize_curses_using_fallback(DEFAULT_TERM1)) {
+            initialize_curses_using_fallback(DEFAULT_TERM2);
+        }
+    }
+
+    can_set_term_title = does_term_support_setting_title(vars);
+    term_has_xn = tigetflag((char *)"xenl") == 1;  // does terminal have the eat_newline_glitch
+    update_fish_color_support(vars);
+    // Invalidate the cached escape sequences since they may no longer be valid.
+    cached_layouts.clear();
+    curses_initialized = true;
+}
+
+/// Initialize the locale subsystem.
+static void init_locale(const environment_t &vars) {
+    // We have to make a copy because the subsequent setlocale() call to change the locale will
+    // invalidate the pointer from the this setlocale() call.
+    char *old_msg_locale = strdup(setlocale(LC_MESSAGES, NULL));
+
+    for (const auto &var_name : locale_variables) {
+        const auto var = vars.get(var_name, ENV_EXPORT);
+        const std::string &name = wcs2string(var_name);
+        if (var.missing_or_empty()) {
+            debug(5, L"locale var %s missing or empty", name.c_str());
+            unsetenv(name.c_str());
+        } else {
+            const std::string value = wcs2string(var->as_string());
+            debug(5, L"locale var %s='%s'", name.c_str(), value.c_str());
+            setenv(name.c_str(), value.c_str(), 1);
+        }
+    }
+
+    char *locale = setlocale(LC_ALL, "");
+    fish_setlocale();
+    debug(5, L"init_locale() setlocale(): '%s'", locale);
+
+    const char *new_msg_locale = setlocale(LC_MESSAGES, NULL);
+    debug(5, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
+    debug(5, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
+#ifdef HAVE__NL_MSG_CAT_CNTR
+    if (std::strcmp(old_msg_locale, new_msg_locale)) {
+        // Make change known to GNU gettext.
+        extern int _nl_msg_cat_cntr;
+        _nl_msg_cat_cntr++;
+    }
+#endif
+    free(old_msg_locale);
+}
+
+/// Returns true if we think the terminal supports setting its title.
+bool term_supports_setting_title() { return can_set_term_title; }
+
+/// Miscellaneous variables.
 bool g_use_posix_spawn = false;
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
index 50ece1df7..6105d1a8e 100644
--- a/src/env_dispatch.h
+++ b/src/env_dispatch.h
@@ -19,7 +19,4 @@ void guess_emoji_width();
 
 void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks);
 
-extern const wcstring_list_t locale_variables;
-extern const wcstring_list_t curses_variables;
-
 #endif

From 1caf20f7c3fd3b0837b91e2e37e0d4e6e6370335 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 13:41:42 -0700
Subject: [PATCH 0278/1732] Migrate the read limit into env_dispatch

---
 src/env.cpp          | 20 --------------------
 src/env.h            |  3 ---
 src/env_dispatch.cpp | 21 +++++++++++++++++++--
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 9fdc16cce..ddcd25b89 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -58,11 +58,6 @@
 /// At init, we read all the environment variables from this array.
 extern char **environ;
 
-// Limit `read` to 10 MiB (bytes not wide chars) by default. This can be overridden by the
-// fish_read_limit variable.
-#define READ_BYTE_LIMIT 10 * 1024 * 1024
-size_t read_byte_limit = READ_BYTE_LIMIT;
-
 /// The character used to delimit path and non-path variables in exporting and in string expansion.
 static const wchar_t PATH_ARRAY_SEP = L':';
 static const wchar_t NONPATH_ARRAY_SEP = L' ';
@@ -349,20 +344,6 @@ void env_stack_t::set_pwd_from_getcwd() {
     set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, cwd);
 }
 
-/// Allow the user to override the limit on how much data the `read` command will process.
-/// This is primarily for testing but could be used by users in special situations.
-void env_stack_t::set_read_limit() {
-    auto read_byte_limit_var = this->get(L"fish_read_limit");
-    if (!read_byte_limit_var.missing_or_empty()) {
-        size_t limit = fish_wcstoull(read_byte_limit_var->as_string().c_str());
-        if (errno) {
-            debug(1, "Ignoring fish_read_limit since it is not valid");
-        } else {
-            read_byte_limit = limit;
-        }
-    }
-}
-
 void env_stack_t::mark_changed_exported() { vars_stack().mark_changed_exported(); }
 
 wcstring environment_t::get_pwd_slash() const {
@@ -537,7 +518,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
         vars.set_pwd_from_getcwd();
     }
     vars.set_termsize();    // initialize the terminal size variables
-    vars.set_read_limit();  // initialize the read_byte_limit
 
     // Set fish_bind_mode to "default".
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
diff --git a/src/env.h b/src/env.h
index 8de3e353c..d3fc98085 100644
--- a/src/env.h
+++ b/src/env.h
@@ -268,9 +268,6 @@ class env_stack_t final : public environment_t {
     /// Sets up argv as the given null terminated array of strings.
     void set_argv(const wchar_t *const *argv);
 
-    /// Update the read_byte_limit variable.
-    void set_read_limit();
-
     /// Mark that exported variables have changed.
     void mark_changed_exported();
 
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index ded6e76a4..88dfb57fc 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -247,8 +247,6 @@ static void handle_term_size_change(env_stack_t &vars) {
     invalidate_termsize(true);  // force fish to update its idea of the terminal size plus vars
 }
 
-static void handle_read_limit_change(env_stack_t &vars) { vars.set_read_limit(); }
-
 static void handle_fish_history_change(env_stack_t &vars) {
     reader_change_history(history_session_id(vars));
 }
@@ -289,6 +287,20 @@ static void handle_fish_use_posix_spawn_change(const environment_t &vars) {
         use_posix_spawn.missing_or_empty() ? true : bool_from_string(use_posix_spawn->as_string());
 }
 
+/// Allow the user to override the limit on how much data the `read` command will process.
+/// This is primarily for testing but could be used by users in special situations.
+static void handle_read_limit_change(const environment_t &vars) {
+    auto read_byte_limit_var = vars.get(L"fish_read_limit");
+    if (!read_byte_limit_var.missing_or_empty()) {
+        size_t limit = fish_wcstoull(read_byte_limit_var->as_string().c_str());
+        if (errno) {
+            debug(1, "Ignoring fish_read_limit since it is not valid");
+        } else {
+            read_byte_limit = limit;
+        }
+    }
+}
+
 /// Populate the dispatch table used by `env_dispatch_var_change()` to efficiently call the
 /// appropriate function to handle a change to a variable.
 /// Note this returns a new-allocated value that we expect to leak.
@@ -326,6 +338,7 @@ static void run_inits(const environment_t &vars) {
     init_curses(vars);
     guess_emoji_width(vars);
     update_wait_on_escape_ms(vars);
+    handle_read_limit_change(vars);
 }
 
 /// Updates our idea of whether we support term256 and term24bit (see issue #10222).
@@ -524,3 +537,7 @@ bool term_supports_setting_title() { return can_set_term_title; }
 
 /// Miscellaneous variables.
 bool g_use_posix_spawn = false;
+
+// Limit `read` to 10 MiB (bytes not wide chars) by default. This can be overridden by the
+// fish_read_limit variable.
+size_t read_byte_limit = 10 * 1024 * 1024;

From 3e14f96d40231fb8fe60723f1852a2bdfba38b8f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 8 Apr 2019 13:56:00 -0700
Subject: [PATCH 0279/1732] Eliminate string_set_contains

---
 src/env.cpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index ddcd25b89..65efd30fb 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -216,25 +216,14 @@ static env_universal_t *uvars() { return s_universal_variables; }
 // so we don't bother to sort them.
 using string_set_t = const wchar_t *const[];
 
-template <typename T>
-bool string_set_contains(const T &set, const wchar_t *val) {
-    for (const wchar_t *entry : set) {
-        if (!std::wcscmp(val, entry)) return true;
-    }
-    return false;
-}
-
 /// Check if a variable may not be set using the set command.
-static bool is_read_only(const wchar_t *val) {
-    const string_set_t env_read_only = {
-        L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status", L"version",
+static bool is_read_only(const wcstring &key) {
+    static const string_set_t env_read_only = {
+        L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status",           L"version",
         L"FISH_VERSION", L"fish_pid", L"hostname", L"_",          L"fish_private_mode"};
-    return string_set_contains(env_read_only, val) ||
-        (in_private_mode() && std::wcscmp(L"fish_history", val) == 0);
+    return contains(env_read_only, key) || (in_private_mode() && key == L"fish_history");
 }
 
-static bool is_read_only(const wcstring &val) { return is_read_only(val.c_str()); }
-
 /// Return true if a variable should become a path variable by default. See #436.
 static bool variable_should_auto_pathvar(const wcstring &name) {
     return string_suffixes_string(L"PATH", name);

From e44cb235a7fa333da934973149fe86d5deada04b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Mar 2019 18:05:56 -0700
Subject: [PATCH 0280/1732] Add pygments CSV output to fish_indent

This will allow pygments to highlight fish code using fish_indent.
---
 src/fish_indent.cpp | 96 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index c40c2fb24..be3781fd6 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -243,6 +243,86 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
     }
 }
 
+static const char *highlight_role_to_string(highlight_role_t role) {
+#define TEST_ROLE(x)          \
+    case highlight_role_t::x: \
+        return #x;
+    switch (role) {
+        TEST_ROLE(normal)
+        TEST_ROLE(error)
+        TEST_ROLE(command)
+        TEST_ROLE(statement_terminator)
+        TEST_ROLE(param)
+        TEST_ROLE(comment)
+        TEST_ROLE(match)
+        TEST_ROLE(search_match)
+        TEST_ROLE(operat)
+        TEST_ROLE(escape)
+        TEST_ROLE(quote)
+        TEST_ROLE(redirection)
+        TEST_ROLE(autosuggestion)
+        TEST_ROLE(selection)
+        TEST_ROLE(pager_progress)
+        TEST_ROLE(pager_background)
+        TEST_ROLE(pager_prefix)
+        TEST_ROLE(pager_completion)
+        TEST_ROLE(pager_description)
+        TEST_ROLE(pager_secondary_background)
+        TEST_ROLE(pager_secondary_prefix)
+        TEST_ROLE(pager_secondary_completion)
+        TEST_ROLE(pager_secondary_description)
+        TEST_ROLE(pager_selected_background)
+        TEST_ROLE(pager_selected_prefix)
+        TEST_ROLE(pager_selected_completion)
+        TEST_ROLE(pager_selected_description)
+    }
+#undef TEST_ROLE
+}
+
+// Entry point for Pygments CSV output.
+// Our output is a newline-separated string.
+// Each line is of the form `start,end,role`
+// start and end is the half-open token range, value is a string from highlight_role_t.
+// Example:
+// 3,7,command
+static std::string make_pygments_csv(const wcstring &src) {
+    const size_t len = src.size();
+    std::vector<highlight_spec_t> colors;
+    highlight_shell_no_io(src, colors, src.size(), nullptr, env_stack_t::globals());
+    assert(colors.size() == len && "Colors and src should have same size");
+
+    struct token_range_t {
+        unsigned long start;
+        unsigned long end;
+        highlight_role_t role;
+    };
+
+    std::vector<token_range_t> token_ranges;
+    for (size_t i = 0; i < len; i++) {
+        highlight_role_t role = colors.at(i).foreground;
+        // See if we can extend the last range.
+        if (!token_ranges.empty()) {
+            auto &last = token_ranges.back();
+            if (last.role == role && last.end == i) {
+                last.end = i + 1;
+                continue;
+            }
+        }
+        // We need a new range.
+        token_ranges.push_back(token_range_t{i, i + 1, role});
+    }
+
+    // Now render these to a string.
+    std::string result;
+    for (const auto &range : token_ranges) {
+        char buff[128];
+        snprintf(buff, sizeof buff, "%lu,%lu,%s\n", range.start, range.end,
+                 highlight_role_to_string(range.role));
+        result.append(buff);
+    }
+    return result;
+}
+
 // Entry point for prettification.
 static wcstring prettify(const wcstring &src, bool do_indent) {
     parse_node_tree_t parse_tree;
@@ -414,6 +494,7 @@ int main(int argc, char *argv[]) {
         output_type_plain_text,
         output_type_file,
         output_type_ansi,
+        output_type_pygments_csv,
         output_type_html
     } output_type = output_type_plain_text;
     const char *output_location = "";
@@ -429,6 +510,7 @@ int main(int argc, char *argv[]) {
                                        {"write", no_argument, NULL, 'w'},
                                        {"html", no_argument, NULL, 1},
                                        {"ansi", no_argument, NULL, 2},
+                                       {"pygments", no_argument, NULL, 3},
                                        {NULL, 0, NULL, 0}};
 
     int opt;
@@ -464,6 +546,10 @@ int main(int argc, char *argv[]) {
                 output_type = output_type_ansi;
                 break;
             }
+            case 3: {
+                output_type = output_type_pygments_csv;
+                break;
+            }
             case 'd': {
                 char *end;
                 long tmp;
@@ -528,6 +614,12 @@ int main(int argc, char *argv[]) {
         exit(1);
     }
 
+    if (output_type == output_type_pygments_csv) {
+        std::string output = make_pygments_csv(src);
+        fputs(output.c_str(), stdout);
+        return EXIT_SUCCESS;
+    }
+
     const wcstring output_wtext = prettify(src, do_indent);
 
     // Maybe colorize.
@@ -564,6 +656,10 @@ int main(int argc, char *argv[]) {
             colored_output = html_colorize(output_wtext, colors);
             break;
         }
+        case output_type_pygments_csv: {
+            DIE("pygments_csv should have been handled above");
+            break;
+        }
     }
 
     std::fputws(str2wcstring(colored_output).c_str(), stdout);

From 5b2c741f6cfd3d601594ceed31964aca4550c577 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Mar 2019 23:42:36 -0700
Subject: [PATCH 0281/1732] Add fish_indent_lexer.py

This is a pygments lexer that shells out to fish_indent
---
 cmake/Docs.cmake                    |   1 +
 sphinx_doc_src/fish_indent_lexer.py | 133 ++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 sphinx_doc_src/fish_indent_lexer.py

diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index 1f6c30ca8..35005e9d1 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -20,6 +20,7 @@ ADD_CUSTOM_TARGET(sphinx-docs
         -d "${SPHINX_CACHE_DIR}"
         "${SPHINX_SRC_DIR}"
         "${SPHINX_HTML_DIR}"
+    DEPENDS sphinx_doc_src/fish_indent_lexer.py
     COMMENT "Building HTML documentation with Sphinx")
 
 ADD_CUSTOM_TARGET(sphinx-manpages
diff --git a/sphinx_doc_src/fish_indent_lexer.py b/sphinx_doc_src/fish_indent_lexer.py
new file mode 100644
index 000000000..c3414f2c2
--- /dev/null
+++ b/sphinx_doc_src/fish_indent_lexer.py
@@ -0,0 +1,133 @@
+# This is a plugin for pygments that shells out to fish_indent.
+
+# Example of how to use this:
+# env PATH="/dir/containing/fish/indent/:$PATH" pygmentize -f terminal256 -l /path/to/fish_indent_lexer.py:FishIndentLexer -x ~/test.fish
+
+import os
+from pygments.lexer import Lexer
+from pygments.token import (
+    Keyword,
+    Name,
+    Comment,
+    String,
+    Error,
+    Number,
+    Operator,
+    Other,
+    Generic,
+    Whitespace,
+    String,
+    Text,
+    Punctuation,
+)
+import re
+import subprocess
+
+# The token type representing output to the console.
+OUTPUT_TOKEN = Text
+
+# A fallback token type.
+DEFAULT = Text
+
+# Mapping from fish token types to Pygments types.
+ROLE_TO_TOKEN = {
+    "normal": Name.Variable,
+    "error": Generic.Error,
+    "command": Name.Function,
+    "statement_terminator": Punctuation,
+    "param": Name.Constant,
+    "comment": Comment,
+    "match": DEFAULT,
+    "search_match": DEFAULT,
+    "operat": Operator,
+    "escape": String.Escape,
+    "quote": String.Single,  # note, may be changed to double dynamically
+    "redirection": Punctuation,  # ?
+    "autosuggestion": Other,  # in practice won't be generated
+    "selection": DEFAULT,
+    "pager_progress": DEFAULT,
+    "pager_background": DEFAULT,
+    "pager_prefix": DEFAULT,
+    "pager_completion": DEFAULT,
+    "pager_description": DEFAULT,
+    "pager_secondary_background": DEFAULT,
+    "pager_secondary_prefix": DEFAULT,
+    "pager_secondary_completion": DEFAULT,
+    "pager_secondary_description": DEFAULT,
+    "pager_selected_background": DEFAULT,
+    "pager_selected_prefix": DEFAULT,
+    "pager_selected_completion": DEFAULT,
+    "pager_selected_description": DEFAULT,
+}
+
+
+def token_for_text_and_role(text, role):
+    """ Return the pygments token for some input text and a fish role
+    
+        This applies any special cases of ROLE_TO_TOKEN.
+    """
+    if text.isspace():
+        # Here fish will return 'normal' or 'statement_terminator' for newline.
+        return Text.Whitespace
+    elif role == "quote":
+        # Check for single or double.
+        return String.Single if text.startswith("'") else String.Double
+    else:
+        return ROLE_TO_TOKEN[role]
+
+
+def tokenize_fish_command(code, offset):
+    """ Tokenize some fish code, offset in a parent string, by shelling
+        out to fish_indent.
+        
+        fish_indent will output a list of csv lines: start,end,type.
+
+        This function returns a list of (start, tok, value) tuples, as
+        Pygments expects.
+    """
+    proc = subprocess.Popen(
+        ["fish_indent", "--pygments"],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        universal_newlines=True,
+    )
+    stdout, _ = proc.communicate(code)
+    result = []
+    for line in stdout.splitlines():
+        start, end, role = line.split(",")
+        start, end = int(start), int(end)
+        value = code[start:end]
+        tok = token_for_text_and_role(value, role)
+        result.append((start + offset, tok, value))
+    return result
+
+
+class FishIndentLexer(Lexer):
+    name = "FishIndentLexer"
+    aliases = ["fish", "fish-docs-samples"]
+    filenames = ["*.fish"]
+
+    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
+        """
+        result = []
+        if not any(s.startswith(">") for s in input_text.splitlines()):
+            # No prompt, just tokenize everything.
+            result = tokenize_fish_command(input_text, 0)
+        else:
+            # We have a prompt line.
+            # Use a regexp because it will maintain string indexes for us.
+            regex = re.compile(r"^(>\s*)?(.*\n?)", re.MULTILINE)
+            for m in regex.finditer(input_text):
+                if m.group(1):
+                    # Prompt line; highlight via fish syntax.
+                    result.append((m.start(1), Generic.Prompt, m.group(1)))
+                    result.extend(tokenize_fish_command(m.group(2), m.start(2)))
+                else:
+                    # Non-prompt line representing output from a command.
+                    result.append((m.start(2), OUTPUT_TOKEN, m.group(2)))
+        return result

From 93cc99d6d0757aedaeb5b133270ee73eeebd3668 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 14 Mar 2019 13:50:35 -0700
Subject: [PATCH 0282/1732] Teach CMake to tell Sphinx where fish_indent is

---
 CMakeLists.txt   | 6 +++---
 cmake/Docs.cmake | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd6be904..e56dd2ada 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,9 +133,6 @@ ADD_DEFINITIONS(-D_REENTRANT)
 # Set up PCRE2
 INCLUDE(cmake/PCRE2.cmake)
 
-# Set up the docs.
-INCLUDE(cmake/Docs.cmake)
-
 # Define a function to link dependencies.
 FUNCTION(FISH_LINK_DEPS target)
   TARGET_LINK_LIBRARIES(${target} fishlib)
@@ -162,6 +159,9 @@ ADD_EXECUTABLE(fish_key_reader
                src/fish_key_reader.cpp src/print_help.cpp)
 FISH_LINK_DEPS(fish_key_reader)
 
+# Set up the docs.
+INCLUDE(cmake/Docs.cmake)
+
 # A helper for running tests.
 ADD_EXECUTABLE(fish_test_helper src/fish_test_helper.cpp)
 
diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index 35005e9d1..9e2758b16 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -13,14 +13,17 @@ SET(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees")
 SET(SPHINX_HTML_DIR "${SPHINX_ROOT_DIR}/html")
 SET(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man")
 
+# sphinx-docs uses fish_indent for highlighting.
+# Prepend the output dir of fish_indent to PATH.
 ADD_CUSTOM_TARGET(sphinx-docs
-    ${SPHINX_EXECUTABLE}
+    env PATH="$<TARGET_FILE_DIR:fish_indent>:$$PATH"
+        ${SPHINX_EXECUTABLE}
         -q -b html
         -c "${SPHINX_SRC_DIR}"
         -d "${SPHINX_CACHE_DIR}"
         "${SPHINX_SRC_DIR}"
         "${SPHINX_HTML_DIR}"
-    DEPENDS sphinx_doc_src/fish_indent_lexer.py
+    DEPENDS sphinx_doc_src/fish_indent_lexer.py fish_indent
     COMMENT "Building HTML documentation with Sphinx")
 
 ADD_CUSTOM_TARGET(sphinx-manpages

From e85cb258839569f0fec31a65c3991aca52490fa2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 14 Mar 2019 13:52:25 -0700
Subject: [PATCH 0283/1732] Switch to fish_indent based syntax highlighting in
 sphinx docs

---
 sphinx_doc_src/commands.rst |  2 +-
 sphinx_doc_src/conf.py      | 11 +++++++++++
 sphinx_doc_src/index.rst    |  2 +-
 sphinx_doc_src/tutorial.rst |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/commands.rst b/sphinx_doc_src/commands.rst
index f95eef343..f2cd1c283 100644
--- a/sphinx_doc_src/commands.rst
+++ b/sphinx_doc_src/commands.rst
@@ -1,4 +1,4 @@
-.. highlight:: fish
+.. highlight:: fish-docs-samples
 
 Commands
 ============
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index edf1b4a29..3c93e87f1 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -8,6 +8,7 @@
 
 import glob
 import os.path
+import pygments
 
 # -- Helper functions --------------------------------------------------------
 
@@ -15,6 +16,16 @@ def strip_ext(path):
     """ Remove the extension from a path. """
     return os.path.splitext(path)[0]
 
+# -- Load our Pygments lexer -------------------------------------------------
+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
+
+
 # -- Path setup --------------------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index a7d5db46d..42a959c7c 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1,4 +1,4 @@
-.. highlight:: fish
+.. highlight:: fish-docs-samples
 .. _intro:
 
 Introduction
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 89009ddb5..84697b03b 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -1,4 +1,4 @@
-.. highlight:: fish
+.. highlight:: fish-docs-samples
 
 Tutorial
 ========

From 1fb05d8fa0f82ef671471c1744811024ae8e9c66 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 5 Apr 2019 18:13:26 -0700
Subject: [PATCH 0284/1732] Add fish specific css to docs

---
 sphinx_doc_src/_static/pygments.css | 79 +++++++++++++++++++++++++++++
 sphinx_doc_src/conf.py              |  3 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 sphinx_doc_src/_static/pygments.css

diff --git a/sphinx_doc_src/_static/pygments.css b/sphinx_doc_src/_static/pygments.css
new file mode 100644
index 000000000..37985d1e0
--- /dev/null
+++ b/sphinx_doc_src/_static/pygments.css
@@ -0,0 +1,79 @@
+@import "nature.css";
+
+.highlight .hll { background-color: #ffffcc }
+.highlight  { background: #f8f8f8; }
+.highlight .c { color: #8f5902; } /* Comment */
+.highlight .err { color: #a40000; border: 1px solid #ef2929 } /* Error */
+.highlight .g { color: #000000 } /* Generic */
+.highlight .k { color: #204a87; font-weight: bold } /* Keyword */
+.highlight .l { color: #000000 } /* Literal */
+.highlight .n { color: #000000 } /* Name */
+.highlight .o { color: #00a6b2; } /* Operator */
+.highlight .x { color: #000000 } /* Other */
+.highlight .p { color: #00afff; } /* Punctuation */
+.highlight .ch { color: #8f5902; font-style: italic } /* Comment.Hashbang */
+.highlight .cm { color: #8f5902; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #8f5902; font-style: italic } /* Comment.Preproc */
+.highlight .cpf { color: #8f5902; font-style: italic } /* Comment.PreprocFile */
+.highlight .c1 { color: #8f5902; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #8f5902; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #a40000 } /* Generic.Deleted */
+.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #ef2929 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #000000; font-style: italic } /* Generic.Output */
+.highlight .gp { color: #8f5902 } /* Generic.Prompt */
+.highlight .gs { color: #000000; font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #a40000; font-weight: bold } /* Generic.Traceback */
+.highlight .kc { color: #204a87; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #204a87; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #204a87; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #204a87; font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { color: #204a87; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #204a87; font-weight: bold } /* Keyword.Type */
+.highlight .ld { color: #000000 } /* Literal.Date */
+.highlight .m { color: #0000cf; font-weight: bold } /* Literal.Number */
+.highlight .s { color: #4e9a06 } /* Literal.String */
+.highlight .na { color: #c4a000 } /* Name.Attribute */
+.highlight .nb { color: #204a87 } /* Name.Builtin */
+.highlight .nc { color: #000000 } /* Name.Class */
+.highlight .no { color: #00afff } /* Name.Constant */
+.highlight .nd { color: #5c35cc; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #ce5c00 } /* Name.Entity */
+.highlight .ne { color: #cc0000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #005fd7 } /* Name.Function */
+.highlight .nl { color: #f57900 } /* Name.Label */
+.highlight .nn { color: #000000 } /* Name.Namespace */
+.highlight .nx { color: #000000 } /* Name.Other */
+.highlight .py { color: #000000 } /* Name.Property */
+.highlight .nt { color: #204a87; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #000000 } /* Name.Variable */
+.highlight .ow { color: #204a87; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+.highlight .mb { color: #0000cf; font-weight: bold } /* Literal.Number.Bin */
+.highlight .mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
+.highlight .mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */
+.highlight .mi { color: #0000cf; font-weight: bold } /* Literal.Number.Integer */
+.highlight .mo { color: #0000cf; font-weight: bold } /* Literal.Number.Oct */
+.highlight .sa { color: #4e9a06 } /* Literal.String.Affix */
+.highlight .sb { color: #4e9a06 } /* Literal.String.Backtick */
+.highlight .sc { color: #4e9a06 } /* Literal.String.Char */
+.highlight .dl { color: #4e9a06 } /* Literal.String.Delimiter */
+.highlight .sd { color: #8f5902; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #999900 } /* Literal.String.Double */
+.highlight .se { color: #00a6b2 } /* Literal.String.Escape */
+.highlight .sh { color: #4e9a06 } /* Literal.String.Heredoc */
+.highlight .si { color: #4e9a06 } /* Literal.String.Interpol */
+.highlight .sx { color: #4e9a06 } /* Literal.String.Other */
+.highlight .sr { color: #4e9a06 } /* Literal.String.Regex */
+.highlight .s1 { color: #999900 } /* Literal.String.Single */
+.highlight .ss { color: #4e9a06 } /* Literal.String.Symbol */
+.highlight .bp { color: #3465a4 } /* Name.Builtin.Pseudo */
+.highlight .fm { color: #000000 } /* Name.Function.Magic */
+.highlight .vc { color: #000000 } /* Name.Variable.Class */
+.highlight .vg { color: #000000 } /* Name.Variable.Global */
+.highlight .vi { color: #000000 } /* Name.Variable.Instance */
+.highlight .vm { color: #000000 } /* Name.Variable.Magic */
+.highlight .il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 3c93e87f1..218b38fd9 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -93,7 +93,8 @@ pygments_style = None
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#
+# !!! If you change this you also need to update the @import at the top
+# of _static/fish-syntax-style.css
 html_theme = 'nature'
 
 # Theme options are theme-specific and customize the look and feel of a theme

From b002eb350cad09689af998af2cacf3099aaf68ad Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 9 Apr 2019 00:29:22 -0700
Subject: [PATCH 0285/1732] Get rid of __fish_repaint_root

it's identical to __fish_repaint - so just register that for both
variable change events.
---
 share/functions/__fish_config_interactive.fish | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index a204b31d8..7b63c69d3 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -135,17 +135,10 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     #
     # This event handler makes sure the prompt is repainted when
-    # fish_color_cwd changes value. Like all event handlers, it can't be
+    # fish_color_cwd{,_root} changes value. Like all event handlers, it can't be
     # autoloaded.
     #
-    function __fish_repaint --on-variable fish_color_cwd --description "Event handler, repaints the prompt when fish_color_cwd changes"
-        if status --is-interactive
-            set -e __fish_prompt_cwd
-            commandline -f repaint 2>/dev/null
-        end
-    end
-
-    function __fish_repaint_root --on-variable fish_color_cwd_root --description "Event handler, repaints the prompt when fish_color_cwd_root changes"
+    function __fish_repaint -v fish_color_cwd -v fish_color_cwd_root -d "Event handler, repaints the prompt when fish_color_cwd* changes"
         if status --is-interactive
             set -e __fish_prompt_cwd
             commandline -f repaint 2>/dev/null

From 5f7f4c638f737861e4ee7894513b9e6673a3fb58 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 9 Apr 2019 01:13:10 -0700
Subject: [PATCH 0286/1732] informative.fish: stop caching_set_color, use br*
 directly

No longer uses global vars to cache set_color output, this was
from before set_color was a builtin, it is pointless now.

This is also a prompt from before we had bright named colors,
and it appears it was relying on -o red to get bright red.
so use brred, etc.
---
 .../sample_prompts/informative.fish           | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 80a0cb3f0..61ffac113 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -1,47 +1,30 @@
 # name: Informative
 # http://michal.karzynski.pl/blog/2009/11/19/my-informative-shell-prompt/
 
-
-function fish_prompt --description 'Write out the prompt'
+function fish_prompt --description 'Informative prompt'
     #Save the return status of the previous command
     set -l last_pipestatus $pipestatus
-    set stat $status
-
-    if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
-    end
-
-    if not set -q __fish_color_blue
-        set -g __fish_color_blue (set_color -o blue)
-    end
+    set -l last_status $status
 
     #Set the color for the status depending on the value
-    set __fish_color_status (set_color -o green)
     if test $stat -gt 0
-        set __fish_color_status (set_color -o red)
+        set -l status_color (set_color brred)
+    else
+        set -l status_color (set_color brgreen)
     end
 
     switch "$USER"
-
         case root toor
-
-            if not set -q __fish_prompt_cwd
-                if set -q fish_color_cwd_root
-                    set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
-                else
-                    set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-                end
-            end
-
-            printf '%s@%s %s%s%s# ' $USER (prompt_hostname) "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal"
-
+            printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root && \
+                                                             set_color $fish_color_cwd_root || \
+                                                             set_color $fish_color_cwd) \
+                   (prompt_pwd) (set_color normal)
         case '*'
+            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) \
+                                      (set_color bryellow) $last_pipestatus)
 
-            if not set -q __fish_prompt_cwd
-                set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-            end
-            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
-            printf '[%s] %s%s@%s %s%s %s%s(%s)%s \f\r> ' (date "+%H:%M:%S") "$__fish_color_blue" $USER (prompt_hostname) "$__fish_prompt_cwd" "$PWD" "$pipestatus_string" "$__fish_color_status" "$stat" "$__fish_prompt_normal"
-
+            printf '[%s] %s%s@%s %s%s %s%s(%s)%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
+                   $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD "$pipestatus_string" \
+                   $status_color $last_status (set_color normal)
     end
 end

From 3b97e2d7ec62aaa7e3f64cb54ee833e145a34e17 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 9 Apr 2019 03:37:10 -0700
Subject: [PATCH 0287/1732] Stop caching set_color output in rest of prompts

No more __fish_prompt_* variables.
---
 .../sample_prompts/debian_chroot.fish         | 30 +++++--------------
 .../sample_prompts/informative.fish           |  6 ++--
 .../sample_prompts/informative_vcs.fish       |  9 ------
 .../web_config/sample_prompts/lonetwin.fish   | 10 +------
 4 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/debian_chroot.fish b/share/tools/web_config/sample_prompts/debian_chroot.fish
index b986746f6..aec17ff11 100644
--- a/share/tools/web_config/sample_prompts/debian_chroot.fish
+++ b/share/tools/web_config/sample_prompts/debian_chroot.fish
@@ -2,14 +2,6 @@
 # author: Maurizio De Santis
 
 function fish_prompt --description 'Write out the prompt, prepending the Debian chroot environment if present'
-    if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
-    end
-
-    if not set -q __fish_prompt_chroot_env
-        set -g __fish_prompt_chroot_env (set_color yellow)
-    end
-
     # Set variable identifying the chroot you work in (used in the prompt below)
     if not set -q debian_chroot
         and test -r /etc/debian_chroot
@@ -23,27 +15,19 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
 
     # Prepend the chroot environment if present
     if set -q __fish_debian_chroot_prompt
-        echo -n -s "$__fish_prompt_chroot_env" "$__fish_debian_chroot_prompt" "$__fish_prompt_normal" ' '
+        echo -n -s (set_color yellow) "$__fish_debian_chroot_prompt" (set_color normal) ' '
     end
 
     switch "$USER"
         case root toor
-            if not set -q __fish_prompt_cwd
-                if set -q fish_color_cwd_root
-                    set -g __fish_prompt_cwd (set_color $fish_color_cwd_root)
-                else
-                    set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-                end
-            end
-
-            echo -n -s "$USER" @ (prompt_hostname) ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '# '
+            echo -n -s "$USER" @ (prompt_hostname) ' ' (set -q fish_color_cwd_root
+                                                        and set_color $fish_color_cwd_root
+                                                        or set_color $fish_color_cwd) (prompt_pwd) \
+                 (set_color normal) '# '
 
         case '*'
-            if not set -q __fish_prompt_cwd
-                set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-            end
-
-            echo -n -s "$USER" @ (prompt_hostname) ' ' "$__fish_prompt_cwd" (prompt_pwd) "$__fish_prompt_normal" '> '
+            echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $fish_color_cwd) (prompt_pwd) \
+                 (set_color normal) '> '
 
     end
 end
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 61ffac113..072d409de 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -15,9 +15,9 @@ function fish_prompt --description 'Informative prompt'
 
     switch "$USER"
         case root toor
-            printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root && \
-                                                             set_color $fish_color_cwd_root || \
-                                                             set_color $fish_color_cwd) \
+            printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
+                                                             and set_color $fish_color_cwd_root
+                                                             or set_color $fish_color_cwd) \
                    (prompt_pwd) (set_color normal)
         case '*'
             set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) \
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index 99645fdaa..cf16a3ca8 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -1,8 +1,6 @@
 # name: Informative Vcs
 # author: Mariusz Smykula <mariuszs at gmail.com>
 
-
-
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
     set -l last_status $status
@@ -13,7 +11,6 @@ function fish_prompt --description 'Write out the prompt'
     if not set -q __fish_git_prompt_hide_untrackedfiles
         set -g __fish_git_prompt_hide_untrackedfiles 1
     end
-
     if not set -q __fish_git_prompt_color_branch
         set -g __fish_git_prompt_color_branch magenta --bold
     end
@@ -29,7 +26,6 @@ function fish_prompt --description 'Write out the prompt'
     if not set -q __fish_git_prompt_char_upstream_prefix
         set -g __fish_git_prompt_char_upstream_prefix ""
     end
-
     if not set -q __fish_git_prompt_char_stagedstate
         set -g __fish_git_prompt_char_stagedstate "●"
     end
@@ -45,7 +41,6 @@ function fish_prompt --description 'Write out the prompt'
     if not set -q __fish_git_prompt_char_cleanstate
         set -g __fish_git_prompt_char_cleanstate "✔"
     end
-
     if not set -q __fish_git_prompt_color_dirtystate
         set -g __fish_git_prompt_color_dirtystate blue
     end
@@ -62,10 +57,6 @@ function fish_prompt --description 'Write out the prompt'
         set -g __fish_git_prompt_color_cleanstate green --bold
     end
 
-    if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
-    end
-
     set -l color_cwd
     set -l prefix
     set -l suffix
diff --git a/share/tools/web_config/sample_prompts/lonetwin.fish b/share/tools/web_config/sample_prompts/lonetwin.fish
index d14ccbdf7..30adf9736 100644
--- a/share/tools/web_config/sample_prompts/lonetwin.fish
+++ b/share/tools/web_config/sample_prompts/lonetwin.fish
@@ -2,13 +2,5 @@
 # author: Steve
 
 function fish_prompt --description 'Write out the prompt'
-    if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
-    end
-
-    if not set -q __fish_prompt_cwd
-        set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-    end
-
-    echo -n -s "$USER" @ (prompt_hostname) ' ' "$__fish_prompt_cwd" (prompt_pwd) (fish_vcs_prompt) "$__fish_prompt_normal" '> '
+    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $fish_color_cwd) (prompt_pwd) (fish_vcs_prompt) (set_color normal) '> '
 end

From c2259cbb86d7978476583d9271b9f381c626f8b9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 9 Apr 2019 13:47:54 +0200
Subject: [PATCH 0288/1732] docs: Fix typo

Also removes a warning.

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 220247026..f8f649421 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -239,7 +239,7 @@ In contrast to ``grep``, ``string``\ s `match` defaults to glob-mode, whie `repl
 
 Like ``sed``\ s `s/` 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``.
 
-``string split somedelimiter`` is a replacement for ``tr somedeliminter \n`.
+``string split somedelimiter`` is a replacement for ``tr somedelimiter \\n``.
 
 Examples
 --------

From 5aed0bbf88a32d5fb3e5f0d97142ff82d94a497c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 9 Apr 2019 13:57:36 +0200
Subject: [PATCH 0289/1732] docs: Remove underline for whitespace

This made it look like code was `echo_Hello_World` instead of `echo
Hello World`.

See #5696.

[ci skip]
---
 sphinx_doc_src/_static/pygments.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/_static/pygments.css b/sphinx_doc_src/_static/pygments.css
index 37985d1e0..c23283024 100644
--- a/sphinx_doc_src/_static/pygments.css
+++ b/sphinx_doc_src/_static/pygments.css
@@ -51,7 +51,7 @@
 .highlight .nt { color: #204a87; font-weight: bold } /* Name.Tag */
 .highlight .nv { color: #000000 } /* Name.Variable */
 .highlight .ow { color: #204a87; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+.highlight .w { color: #f8f8f8; } /* Text.Whitespace */
 .highlight .mb { color: #0000cf; font-weight: bold } /* Literal.Number.Bin */
 .highlight .mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
 .highlight .mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */

From e9f2a2904bce897f25f5fe21df86fc5f781baae6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 9 Apr 2019 13:58:59 +0200
Subject: [PATCH 0290/1732] Update the year of the doc

Next I'm gonna join the Temple Of The Doc.

[ci skip]
---
 sphinx_doc_src/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 218b38fd9..22fe26665 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -40,7 +40,7 @@ def setup(app):
 # -- Project information -----------------------------------------------------
 
 project = 'fish-shell'
-copyright = '2018, fish-shell developers'
+copyright = '2019, fish-shell developers'
 author = 'fish-shell developers'
 
 # The short X.Y version

From add0bd053883d7b77d8cab0a46a0f39b81775a56 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 9 Apr 2019 14:06:54 +0200
Subject: [PATCH 0291/1732] docs: Fix refs to cartesian product

There's an explicit label for "cartesian-product", but the title is
"Cartesian Product*s*". So linking via with `thing <#link>`_ links the
title, so without the "s" it doesn't work.

From what I know, linking via :ref:`thing <label>` is preferred and
works better with other exports and across files?

I think I should take a doc holiday.

[ci skip]
---
 sphinx_doc_src/index.rst    | 6 +++---
 sphinx_doc_src/tutorial.rst | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 42a959c7c..8102a8ebf 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -780,7 +780,7 @@ A literal "{}" will not be used as a brace expansion::
     # Outputs foo-{}
 
     echo foo-{$undefinedvar}
-    # Output is an empty line - see `the cartesian product section <#cartesian-product>`_
+    # Output is an empty line - see :ref:`the cartesian product section <cartesian-product>`
 
 
 If there is nothing between a brace and a comma or two commas, it's interpreted as an empty element.
@@ -820,7 +820,7 @@ Note that without the quotes or braces, fish will try to expand a variable calle
 The latter syntax ``{$WORD}`` works by exploiting `brace expansion <#expand-brace>`_.
 
 
-In these cases, the expansion eliminates the string, as a result of the implicit `cartesian product <#cartesian-product>`_.
+In these cases, the expansion eliminates the string, as a result of the implicit :ref:`cartesian product <cartesian-product>`.
 
 If, in the example above, $WORD is undefined or an empty list, the "s" is not printed. However, it is printed, if $WORD is the empty string.
 
@@ -828,7 +828,7 @@ Unlike all other expanions, variable expansion also happens in double quoted str
 
 Outside of double quotes, variables will expand to as many arguments as they have elements. That means an empty list will expand to nothing, a variable with one element will expand to that element, and a variable with multiple elements will expand to each of those elements separately.
 
-When two unquoted expansions directly follow each other, you need to watch out for expansions that expand to nothing. This includes undefined variables and empty lists, but also command substitutions with no output. See the `cartesian product <#cartesian-product>`_ section for more information.
+When two unquoted expansions directly follow each other, you need to watch out for expansions that expand to nothing. This includes undefined variables and empty lists, but also command substitutions with no output. See the :ref:`cartesian product <cartesian-product>` section for more information.
 
 The ``$`` symbol can also be used multiple times, as a kind of "dereference" operator (the ``*`` in C or C++), like in the following code::
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 84697b03b..fe1137ebc 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -338,7 +338,7 @@ You can iterate over a list (or a slice) with a for loop::
     <outp>entry: /usr/local/bin</outp>
 
 
-Lists adjacent to other lists or strings are expanded as `cartesian products <index#cartesian-product>`__ unless quoted (see `Variable expansion <index#expand-variable>`__)::
+Lists adjacent to other lists or strings are expanded as :ref:`cartesian products <cartesian-product>` unless quoted (see :ref:`Variable expansion <expand-variable>`)::
 
     >_ set a 1 2 3
     >_ set 1 a b c

From c6c0c9bfdf45746a0b7ba7de0163142144b4bebc Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 9 Apr 2019 20:10:25 +0800
Subject: [PATCH 0292/1732] use standard warning for invalid variable in for
 loop

Work on #5800.
---
 src/parse_execution.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index db0e620cb..06ed5bf00 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -397,7 +397,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     }
 
     if (!valid_var_name(for_var_name)) {
-        report_error(var_name_node, L"invalid var name: %ls", for_var_name.c_str());
+        report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
         return parse_execution_errored;
     }
 

From d6a4694d9f94562f6e34d91c7088774a8ace5da2 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 9 Apr 2019 20:10:51 +0800
Subject: [PATCH 0293/1732] tests: add test for invalid variable name in for
 loop

Work on #5800.
---
 tests/test3.err | 7 +++++++
 tests/test3.in  | 4 ++++
 tests/test3.out | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/tests/test3.err b/tests/test3.err
index 30aa0088a..1d1eafdb3 100644
--- a/tests/test3.err
+++ b/tests/test3.err
@@ -1,3 +1,10 @@
 
 ####################
 # Path universal variables
+
+####################
+# Variable names in other commands
+fish: for: Variable name 'a,b' is not valid. See `help identifiers`.
+
+for a,b in y 1 z 3; echo $a,$b; end
+    ^
diff --git a/tests/test3.in b/tests/test3.in
index 12cfa41b0..53f637f76 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -326,4 +326,8 @@ echo "$__fish_test_PATH" $__fish_test_PATH
 set -U --path __fish_test_path2 a:b
 echo "$__fish_test_path2" $__fish_test_path2
 
+logmsg Variable names in other commands
+# Test invalid variable names in loops (#5800)
+for a,b in y 1 z 3; echo $a,$b; end
+
 true
diff --git a/tests/test3.out b/tests/test3.out
index ef5cf91cd..07c15bef4 100644
--- a/tests/test3.out
+++ b/tests/test3.out
@@ -55,3 +55,6 @@ a:b:c 1 2 3 a b c 1 2 3
 a:b:c 1:2:3 a b c 1 2 3
 1:2:3 1 2 3
 a:b a b
+
+####################
+# Variable names in other commands

From 20db22f0fe25e7daaac11111aea1a14481d8ac5c Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 19:58:48 -0500
Subject: [PATCH 0294/1732] Add basic `make` shim for CMake

This lets non-developers simply `cd` into the fish source directory and
execute `make` to build the project. The Makefile searches for CMake and
hands over the build to it if it is available, otherwise an error
message is emitted. All dependency checking is left to CMake.

Non-fish-devs shouldn't have to concern themselves with what build
system fish developers have chosen, and building a random C++ project
should not be a chore in familiarizing one's self with all the various
build platforms out there.

CMake is instructed to use `ninja` if it is available, otherwise the
standard Unix Makefiles generator option is used.

(This has already been the behavior on BSDs since CMake was adopted.)
---
 Makefile | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..7fac7d32e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,54 @@
+# This is a very basic `make` wrapper around the CMake build toolchain.
+#
+# Supported arguments:
+#   PREFIX: sets the installation prefix
+#   GENERATOR: explicitly specifies the CMake generator to use
+
+CMAKE ?= cmake
+
+GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
+			 echo 'Unix Makefiles')
+prefix ?= /usr/local
+PREFIX ?= $(prefix)
+
+ifeq ($(GENERATOR), Ninja)
+BUILDFILE = build.ninja
+else
+BUILDFILE = Makefile
+endif
+
+all: .begin build/fish
+
+PHONY: .begin
+.begin:
+	@which ninja > /dev/null 2> /dev/null || \
+		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
+
+build/fish: build/$(BUILDFILE)
+	cmake --build build
+
+build/$(BUILDFILE): build
+	cd build; cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+
+build:
+	mkdir -p build
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+.PHONY: test
+test: build/fish
+	$(CMAKE) --build build --target test
+
+.PHONY: install
+install: build/fish
+	$(CMAKE) --build build --target install
+
+.PHONY: run
+run: build/fish
+	./build/fish || true
+
+.PHONY: exec
+exec: build/fish
+	exec ./build/fish

From e296e3c5059f81deca6abc9a48f6f74c0623828f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 20:06:41 -0500
Subject: [PATCH 0295/1732] Makefile: Replace literal `cmake` usage with
 `$(CMAKE)`

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7fac7d32e..6fbae5f41 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,10 @@ PHONY: .begin
 		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
 
 build/fish: build/$(BUILDFILE)
-	cmake --build build
+	$(CMAKE) --build build
 
 build/$(BUILDFILE): build
-	cd build; cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+	cd build; $(CMAKE) .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
 
 build:
 	mkdir -p build

From 49935f13dfd764bc5cf27cb00ff11e9674b0c99a Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 20:36:38 -0500
Subject: [PATCH 0296/1732] Add completions for `git bisect`

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 7d2530276..eb94e886a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1530,6 +1530,8 @@ complete -f -c git -n '__fish_git_using_command config' -l includes -d 'Respect
 complete -f -c git -n '__fish_git_using_command config' -l show-origin -d 'Show origin of configuration'
 complete -f -c git -n '__fish_git_using_command config; and __fish_seen_argument --get' -l default -d 'Use default value when missing entry'
 
+complete -c git -n '__fish_prev_arg_in bisect' -xa "help start bad good new old terms skip next reset visualize view replay log run"
+complete -c git -n '__fish_git_using_command bisect; and __fish_seen_argument --' -xa "(__fish_complete_suffix)"
 
 
 ## Custom commands (git-* commands installed in the PATH)

From ab1519acef090010bc64189b2d3297d093832213 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 21:09:27 -0500
Subject: [PATCH 0297/1732] Fix high CPU usage in subsequent select(2) calls

The timeout was being reset to zero, so `select` was being called in a
very tight loop.

Closes #5761.
---
 src/io.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/io.cpp b/src/io.cpp
index 727796c96..535be1ea0 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -76,6 +76,9 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
         FD_ZERO(&fds);
         FD_SET(fd, &fds);
         int ret = select(fd + 1, &fds, NULL, NULL, &tv);
+        // select(2) is allowed to (and does) update `tv` to indicate how much time was left, so we
+        // need to restore the desired value each time.
+        tv.tv_usec = poll_timeout_usec;
         readable = ret > 0;
         if (ret < 0 && errno != EINTR) {
             // Surprising error.

From a21c65a5ac8579b7ad4ac701afad8ea85449ba67 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 22:32:29 -0500
Subject: [PATCH 0298/1732] Makefile: Correct search for `cmake`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6fbae5f41..dedfec76c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ all: .begin build/fish
 
 PHONY: .begin
 .begin:
-	@which ninja > /dev/null 2> /dev/null || \
+	@which $(CMAKE) > /dev/null 2> /dev/null || \
 		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
 
 build/fish: build/$(BUILDFILE)

From f1b261388a4d15c636dd82cc48f76fcdb40ce61e Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 22:42:16 -0500
Subject: [PATCH 0299/1732] Fix build error on old (buggy?) versions of
 libstdc++

Closes #5801.
---
 src/env_dispatch.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 88dfb57fc..ff0e6ff93 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -329,7 +329,9 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
     var_dispatch_table->add(L"fish_history", handle_fish_history_change);
     var_dispatch_table->add(L"TZ", handle_tz_change);
     var_dispatch_table->add(L"fish_use_posix_spawn", handle_fish_use_posix_spawn_change);
-    return var_dispatch_table;
+
+    // This std::move is required to avoid a build error on old versions of libc++ (#5801)
+    return std::move(var_dispatch_table);
 }
 
 static void run_inits(const environment_t &vars) {

From 3cfa5d422e01993db3709168b8e4406e3402707c Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Tue, 9 Apr 2019 20:59:48 -0700
Subject: [PATCH 0300/1732] Remove string match; use string replace's --filter
 option

---
 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 ea4ad712a..ced03d175 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -513,7 +513,7 @@ function __fish_git_stash_not_using_subcommand
 end
 
 function __fish_git_complete_worktrees
-    command git worktree list --porcelain | string match -er '^worktree' | string replace -r '^worktree\s*' ''
+    command git worktree list --porcelain | string replace --regex --filter '^worktree\s*' ''
 end
 
 function __fish_git_complete_stashes

From 394623bf081afbb4e02485f2e31365a8b8666ae8 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 9 Apr 2019 23:29:58 -0500
Subject: [PATCH 0301/1732] Prevent `disown` from directly removing jobs

This prevents the `disown` builtin from directly removing jobs out of
the jobs list to prevent sanity issues, as `disown` may be called within
the context of a subjob (e.g. in a function or block) in which case the
parent job might not yet be done with the reference to the child job.

Instead, a flag is set and the parser removes the job from the list only
after the entire execution chain has completed.

Closes #5720.
---
 src/builtin_disown.cpp  | 18 +++++++-----------
 src/builtin_jobs.cpp    |  4 ++--
 src/parse_execution.cpp |  5 +++++
 src/proc.h              |  6 ++++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index ad965b693..25654d138 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -17,7 +17,7 @@
 
 /// Helper for builtin_disown.
 static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &streams, job_t *j) {
-    if (j == 0) {
+    if (j == nullptr) {
         streams.err.append_format(_(L"%ls: Unknown job '%ls'\n"), L"bg");
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
@@ -31,17 +31,13 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
         streams.err.append_format(fmt, cmd, j->job_id, j->command_wcstr());
     }
 
-    for (auto itr = jobs().begin(); itr != jobs().end(); ++itr) {
-        auto job = itr->get();
-        if (job == j) {
-            pid_t pgid = j->pgid;
-            add_disowned_pgid(pgid);
-            jobs().erase(itr);
-            return STATUS_CMD_OK;
-        }
-    }
+    // We cannot directly remove the job from the jobs() list as `disown` might be called
+    // within the context of a subjob which will cause the parent job to crash in exec_job().
+    // Instead, we set a flag and the parser removes the job from the jobs list later.
+    j->set_flag(job_flag_t::PENDING_REMOVAL, true);
+    add_disowned_pgid(j->pgid);
 
-    return STATUS_CMD_ERROR;
+    return STATUS_CMD_OK;
 }
 
 /// Builtin for removing jobs from the job list.
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index f4dab2411..3d083531d 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -175,7 +175,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (print_last) {
         // Ignore unconstructed jobs, i.e. ourself.
         for (const auto &j : jobs()) {
-            if (j->is_constructed() && !j->is_completed()) {
+            if (j->is_visible()) {
                 builtin_jobs_print(j.get(), mode, !streams.out_is_redirected, streams);
                 return STATUS_CMD_ERROR;
             }
@@ -217,7 +217,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         } else {
             for (const auto &j : jobs()) {
                 // Ignore unconstructed jobs, i.e. ourself.
-                if (j->is_constructed() && !j->is_completed()) {
+                if (j->is_visible()) {
                     builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected, streams);
                     found = true;
                 }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 06ed5bf00..08ca4e658 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1269,6 +1269,11 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             remove_job(job.get());
         }
 
+        // This job was disowned during its own execution or the execution of its subjobs
+        if (job->get_flag(job_flag_t::PENDING_REMOVAL)) {
+            remove_job(job.get());
+        }
+
         // Only external commands require a new fishd barrier.
         if (job_contained_external_command) {
             set_proc_had_barrier(false);
diff --git a/src/proc.h b/src/proc.h
index 351a30740..3b6186799 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -257,6 +257,10 @@ enum class job_flag_t {
     JOB_CONTROL,
     /// Whether the job wants to own the terminal when in the foreground.
     TERMINAL,
+    /// This job needs to be removed from the list of jobs for one reason or another (killed,
+    /// completed, disowned, etc). This flag is set rather than directly manipulating the jobs
+    /// list.
+    PENDING_REMOVAL,
 
     JOB_FLAG_COUNT
 };
@@ -396,6 +400,8 @@ class job_t {
     bool is_completed() const;
     /// The job is in a stopped state
     bool is_stopped() const;
+    /// The job is OK to be externally visible, e.g. to the user via `jobs`
+    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL); };
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }

From cece4d81c11d4b4eb8bf265424fbeca88f277b29 Mon Sep 17 00:00:00 2001
From: Artur Juraszek <artur@juraszek.xyz>
Date: Wed, 10 Apr 2019 11:27:23 +0200
Subject: [PATCH 0302/1732] completions/pinky: Prompt with users list

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

diff --git a/share/completions/pinky.fish b/share/completions/pinky.fish
index f043e4304..7f2078e5f 100644
--- a/share/completions/pinky.fish
+++ b/share/completions/pinky.fish
@@ -1,3 +1,4 @@
+complete -c pinky -a "(__fish_complete_users)" -f
 complete -c pinky -s l              -d "produce long format output for the specified USERs"
 complete -c pinky -s b              -d "omit the user's home directory and shell in long format"
 complete -c pinky -s h              -d "omit the user's project file in long format"
@@ -9,4 +10,3 @@ complete -c pinky -s i              -d "omit the user's full name and remote hos
 complete -c pinky -s q              -d "omit the user's full name, remote host and idle time in short format"
 complete -c pinky -l help     -d "display this help and exit"
 complete -c pinky -l version  -d "output version information and exit"
-

From b0102a080900fba2a5c93f63c5848af348acac30 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 17:05:16 +0200
Subject: [PATCH 0303/1732] docs: Spruce up copy and paste section

[ci skip]
---
 sphinx_doc_src/index.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 8102a8ebf..76db41c6b 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1549,9 +1549,12 @@ Visual mode
 Copy and paste (Kill Ring)
 --------------------------
 
-``fish`` uses an Emacs style kill ring for copy and paste functionality. Use :kbd:`Control+K` to cut from the current cursor position to the end of the line. The string that is cut (a.k.a. killed) is inserted into a linked list of kills, called the kill ring. To paste the latest value from the kill ring use :kbd:`Control+Y`. After pasting, use :kbd:`Alt+Y` to rotate to the previous kill.
+``fish`` uses an Emacs-style kill ring for copy and paste functionality. For example, use :kbd:`Control+K` (`kill-line`) to cut from the current cursor position to the end of the line. The string that is cut (a.k.a. killed in emacs-ese) is inserted into a list of kills, called the kill ring. To paste the latest value from the kill ring (emacs calls this "yanking") use :kbd:`Control+Y` (the `yank` input function). After pasting, use :kbd:`Alt+Y` (`yank-pop`) to rotate to the previous kill.
 
-Copy and paste from outside are also supported, both via the :kbd:`Control+X` / :kbd:`Control+V` bindings and via the terminal's paste function, for which fish enables "Bracketed Paste Mode". When pasting inside single quotes, pasted single quotes and backslashes are automatically escaped so that the result can be used as a single token simply by closing the quote after.
+Copy and paste from outside are also supported, both via the :kbd:`Control+X` / :kbd:`Control+V` bindings (the `fish_clipboard_copy` and `fish_clipboard_paste` functions [#]_) and via the terminal's paste function, for which fish enables "Bracketed Paste Mode", so it can tell a paste from manually entered text.
+In addition, when pasting inside single quotes, pasted single quotes and backslashes are automatically escaped so that the result can be used as a single token simply by closing the quote after.
+
+.. [#] These rely on external tools. Currently xsel, xclip, wl-copy/wl-paste and pbcopy/pbpaste are supported.
 
 .. _history-search:
 

From 151170280ae472884441dada0eb71045b775aa4b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 17:10:40 +0200
Subject: [PATCH 0304/1732] docs: Explain `?`s status better

[ci skip]
---
 sphinx_doc_src/index.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 76db41c6b..28d610ff4 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -280,7 +280,7 @@ Some characters can not be written directly on the command line. For these chara
 - ``\$`` escapes the dollar character
 - ``\\`` escapes the backslash character
 - ``\*`` escapes the star character
-- ``\?`` escapes the question mark character
+- ``\?`` escapes the question mark character (this is not necessary if the `qmark-noglob` :ref:`feature flag<featureflags>` is enabled)
 - ``\~`` escapes the tilde character
 - ``\#`` escapes the hash character
 - ``\(`` escapes the left parenthesis character
@@ -535,7 +535,7 @@ These are the general purpose tab completions that ``fish`` provides:
 
 - Completion of usernames for tilde expansion.
 
-- Completion of filenames, even on strings with wildcards such as '``*``', '``**``' and '``?``'.
+- Completion of filenames, even on strings with wildcards such as '``*``' and '``**``'.
 
 ``fish`` provides a large number of program specific completions. Most of these completions are simple options like the ``-l`` option for ``ls``, but some are more advanced. The latter include:
 
@@ -688,12 +688,12 @@ Wildcards
 
 If a star (``*``) or a question mark (``?``) is present in the parameter, ``fish`` attempts to match the given parameter to any files in such a way that:
 
-- ``?`` can match any single character except '/'.
-
 - ``*`` can match any string of characters not containing '/'. This includes matching an empty string.
 
 - ``**`` matches any string of characters. This includes matching an empty string. The matched string may include the ``/`` character; that is, it recurses into subdirectories. Note that augmenting this wildcard with other strings will not match files in the current working directory (``$PWD``) if you separate the strings with a slash ("/"). This is unlike other shells such as zsh. For example, ``**\/*.fish`` in zsh will match ``.fish`` files in the PWD but in fish will only match such files in a subdirectory. In fish you should type ``**.fish`` to match files in the PWD as well as subdirectories.
 
+- ``?`` can match any single character except '/'. This is deprecated and can be disabled via the `qmark-noglob` :ref:`feature flag<featureflags>`, so `?` will just be an ordinary character.
+
 Other shells, such as zsh, provide a rich glob syntax for restricting the files matched by globs. For example, ``**(.)``, to only match regular files. Fish prefers to defer such features to programs, such as ``find``, rather than reinventing the wheel. Thus, if you want to limit the wildcard expansion to just regular files the fish approach is to define and use a function. For example,
 
 

From 774d46e180e043a29da6d541cfe1b21ac703f72e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 17:13:37 +0200
Subject: [PATCH 0305/1732] docs: :ref: more

[ci skip]
---
 sphinx_doc_src/index.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 28d610ff4..5713f8d23 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -396,11 +396,11 @@ will start the emacs text editor in the background.
 Job control
 -----------
 
-Most programs allow you to suspend the program's execution and return control to ``fish`` by pressing :kbd:`Control+Z` (also referred to as ``^Z``). Once back at the ``fish`` commandline, you can start other programs and do anything you want. If you then want you can go back to the suspended command by using the `fg <cmds/fg.html>`_ (foreground) command.
+Most programs allow you to suspend the program's execution and return control to ``fish`` by pressing :kbd:`Control+Z` (also referred to as ``^Z``). Once back at the ``fish`` commandline, you can start other programs and do anything you want. If you then want you can go back to the suspended command by using the :ref:`fg <cmd-fg>` (foreground) command.
 
-If you instead want to put a suspended job into the background, use the `bg <cmds/bg.html>`_ command.
+If you instead want to put a suspended job into the background, use the :ref:`bg <cmd-bg>` command.
 
-To get a listing of all currently started jobs, use the `jobs <cmds/jobs.html>`_ command.
+To get a listing of all currently started jobs, use the :ref:`jobs <cmd-jobs>` command.
 
 
 .. _syntax-function:
@@ -437,7 +437,7 @@ There are a few important things that need to be noted about aliases:
 
 - Autoloading isn't applicable to aliases. Since, by definition, the function is created at the time the alias command is executed. You cannot autoload aliases.
 
-To easily create a function of this form, you can use the `alias <cmds/alias.html>`_ command.
+To easily create a function of this form, you can use the :ref:`alias <cmd-alias>` command.
 
 .. _syntax-function-autoloading:
 
@@ -472,11 +472,11 @@ If you are developing another program, you may wish to install functions which a
 Conditional execution of code and flow control
 ----------------------------------------------
 
-There are four fish builtins that let you execute commands only if a specific criterion is met. These builtins are `if <cmds/if.html>`_, `switch <cmds/switch.html>`_, `and <cmds/and.html>`_ and `or <cmds/or.html>`_.
+There are four fish builtins that let you execute commands only if a specific criterion is met. These builtins are :ref:`if <cmd-if>`, :ref:`switch <cmd-switch>`, :ref:`and <cmd-and>` and :ref:`or <cmd-or>`.
 
-The ``switch`` command is used to execute one of possibly many blocks of commands depending on the value of a string. See the documentation for `switch <cmds/switch.html>`_ for more information.
+The ``switch`` command is used to execute one of possibly many blocks of commands depending on the value of a string. See the documentation for :ref:`switch <cmd-switch>` for more information.
 
-The other conditionals use the `exit status <#variables-status>`_ of a command to decide if a command or a block of commands should be executed. See the documentation for `if <cmds/if.html>`_, `and <cmds/and.html>`_ and `or <cmds/or.html>`_ for more information.
+The other conditionals use the `exit status <#variables-status>`_ of a command to decide if a command or a block of commands should be executed. See their documentation for more information.
 
 .. _syntax-words:
 
@@ -505,7 +505,7 @@ This is a short explanation of some of the commonly used words in fish.
 Help
 ====
 
-``fish`` has an extensive help system. Use the `help <cmds/help.html>`_ command to obtain help on a specific subject or command. For instance, writing ``help syntax`` displays the `syntax section <#syntax>`_ of this documentation.
+``fish`` has an extensive help system. Use the :ref:`help <cmd-help>` command to obtain help on a specific subject or command. For instance, writing ``help syntax`` displays the `syntax section <#syntax>`_ of this documentation.
 
 ``fish`` also has man pages for its commands. For example, ``man set`` will show the documentation for ``set`` as a man page.
 

From 83e72c912d90bd48fb421f983461daed98e820b9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 17:14:54 +0200
Subject: [PATCH 0306/1732] docs: Put "Some common words" first

Before all the sections that use these, it seems useful to explain the
common words _first_.

[ci skip]
---
 sphinx_doc_src/index.rst | 46 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 5713f8d23..f253fe045 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -239,6 +239,29 @@ A switch is a very common special type of argument. Switches almost always start
 
 Switches differ between commands and are documented in the manual page for each command. Some switches are common to most command though, for example '``--help``' will usually display a help text, '``-i``' will often turn on interactive prompting before taking action, while '``-f``' will turn it off.
 
+.. _syntax-words:
+
+Some common words
+-----------------
+
+This is a short explanation of some of the commonly used words in fish.
+
+- **argument** a parameter given to a command
+
+- **builtin** a command that is implemented in the shell. Builtins are commands that are so closely tied to the shell that it is impossible to implement them as external commands.
+
+- **command** a program that the shell can run.
+
+- **function** a block of commands that can be called as if they were a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
+
+- **job** a running pipeline or command
+
+- **pipeline** a set of commands stringed together so that the output of one command is the input of the next command
+
+- **redirection** an operation that changes one of the input/output streams associated with a job
+
+- **switch** a special flag sent as an argument to a command that will alter the behavior of the command. A switch almost always begins with one or two hyphens.
+
 
 Quotes
 ------
@@ -478,29 +501,6 @@ The ``switch`` command is used to execute one of possibly many blocks of command
 
 The other conditionals use the `exit status <#variables-status>`_ of a command to decide if a command or a block of commands should be executed. See their documentation for more information.
 
-.. _syntax-words:
-
-Some common words
------------------
-
-This is a short explanation of some of the commonly used words in fish.
-
-- **argument** a parameter given to a command
-
-- **builtin** a command that is implemented in the shell. Builtins are commands that are so closely tied to the shell that it is impossible to implement them as external commands.
-
-- **command** a program that the shell can run.
-
-- **function** a block of commands that can be called as if they were a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
-
-- **job** a running pipeline or command
-
-- **pipeline** a set of commands stringed together so that the output of one command is the input of the next command
-
-- **redirection** an operation that changes one of the input/output streams associated with a job
-
-- **switch** a special flag sent as an argument to a command that will alter the behavior of the command. A switch almost always begins with one or two hyphens.
-
 
 Help
 ====

From 04a96f6c6e1ec585dc24f30c6330468ae0190aa0 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 10 Apr 2019 10:56:33 -0500
Subject: [PATCH 0307/1732] Change when PENDING_REMOVAL jobs are removed

Followup to 394623b.

Doing it in the parser meant only top-level jobs would be reaped after
being `disown`ed, as subjobs aren't directly handled by the parser.

This is also much cleaner, as now job removal is centralized in
`process_clean_after_marking()`.

Closes #5803.
---
 src/parse_execution.cpp | 5 -----
 src/proc.cpp            | 8 +++++++-
 src/proc.h              | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 08ca4e658..06ed5bf00 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1269,11 +1269,6 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             remove_job(job.get());
         }
 
-        // This job was disowned during its own execution or the execution of its subjobs
-        if (job->get_flag(job_flag_t::PENDING_REMOVAL)) {
-            remove_job(job.get());
-        }
-
         // Only external commands require a new fishd barrier.
         if (job_contained_external_command) {
             set_proc_had_barrier(false);
diff --git a/src/proc.cpp b/src/proc.cpp
index 514459af0..c4777764b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -542,9 +542,15 @@ static bool process_clean_after_marking(bool allow_interactive) {
             p->status = proc_status_t::from_exit_code(0);
         }
 
+        // If the process has been previously flagged for removal, add it to the erase list without
+        // any further processing, but do not remove any jobs until their parent jobs have completed
+        // processing.
+        if (j->get_flag(job_flag_t::PENDING_REMOVAL) && j->job_chain_is_fully_constructed()) {
+            erase_list.push_back(j);
+        }
         // If all processes have completed, tell the user the job has completed and delete it from
         // the active job list.
-        if (j->is_completed()) {
+        else if (j->is_completed()) {
             if (!j->is_foreground() && !j->get_flag(job_flag_t::NOTIFIED) &&
                 !j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
                 print_job_status(j.get(), JOB_ENDED);
diff --git a/src/proc.h b/src/proc.h
index 3b6186799..c39e1a123 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -401,7 +401,7 @@ class job_t {
     /// The job is in a stopped state
     bool is_stopped() const;
     /// The job is OK to be externally visible, e.g. to the user via `jobs`
-    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL); };
+    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL) && !parent_job; };
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }

From 8f1b2402891e8c468911c551ce2a6bd842aef6bf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 17:29:10 +0200
Subject: [PATCH 0308/1732] docs: Slight touchup on brace expansion

Clarify the "literal {}" bit and fix formatting.

[ci skip]
---
 sphinx_doc_src/index.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index f253fe045..b3216be67 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -774,7 +774,7 @@ Examples::
   mv *.{c,h} src/
   # Moves all files with the suffix '.c' or '.h' to the subdirectory src.
 
-A literal "{}" will not be used as a brace expansion::
+A literal "{}" will not be used as a brace expansion, but if after expansion there is nothing between the braces, the argument will be removed::
 
     echo foo-{}
     # Outputs foo-{}
@@ -786,6 +786,7 @@ A literal "{}" will not be used as a brace expansion::
 If there is nothing between a brace and a comma or two commas, it's interpreted as an empty element.
 
 So::
+
     echo {,,/usr}/bin
     # Output /bin /bin /usr/bin
 

From 25dd22242d9ee3d47a45a7a5bcd31707639e888e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 10 Apr 2019 18:20:25 +0200
Subject: [PATCH 0309/1732] Adjust __fish_print_help for sphinx

This is beyond cheesy, but it seems to work.

Fixes #5782.
---
 share/functions/__fish_print_help.fish | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index a02ea8ae3..ad429a317 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -52,6 +52,7 @@ function __fish_print_help --description "Print help message for the specified f
     # blank line, to duplicate the default behavior of `man`, or more accurately,
     # the `-s` flag to `less` that `man` passes.
     set -l state blank
+    set -l have_name
     for line in $help
         # categorize the line
         set -l line_type
@@ -69,24 +70,32 @@ function __fish_print_help --description "Print help message for the specified f
             case ''
                 set line_type blank
             case '*'
+                # Remove man's bolding
+                set -l name (string replace -ra '(.)'\b'.' '$1' -- $line)
+                # We start after we have the name
+                contains -- $name NAME; and set have_name 1; and continue
+                # We ignore the SYNOPSIS header
+                contains -- $name SYNOPSIS; and continue
+                # Everything after COPYRIGHT is useless
+                contains -- $name COPYRIGHT; and break
+
                 # not leading space, and not empty, so must contain a non-space
                 # in the first column. That makes it a header/footer.
                 set line_type meta
         end
 
+        set -q have_name[1]; or continue
         switch $state
             case normal
                 switch $line_type
-                    case normal
+                    case normal meta
                         printf "%s\n" $line
                     case blank
                         set state blank
-                    case meta
-                        # skip it
                 end
             case blank
                 switch $line_type
-                    case normal
+                    case normal meta
                         echo # print the blank line
                         printf "%s\n" $line
                         set state normal

From b6555a0dc462f669e1b5a370c3efae0f5948a1ef Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 13:58:29 -0700
Subject: [PATCH 0310/1732] Add print-rusage-self to fish

This adds an option --print-rusage-self to the fish executable. When set,
this option prints some getrusage stats to the console in a human-readable
way. This will be used by upcoming benchmarking support.
---
 cmake/ConfigureChecks.cmake  |  1 +
 config_cmake.h.in            |  3 +++
 sphinx_doc_src/cmds/fish.rst |  2 ++
 src/fish.cpp                 | 43 ++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 2b8cd2a4a..b9e10d8b2 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -61,6 +61,7 @@ CHECK_CXX_SYMBOL_EXISTS(futimens sys/stat.h HAVE_FUTIMENS)
 CHECK_CXX_SYMBOL_EXISTS(futimes sys/time.h HAVE_FUTIMES)
 CHECK_CXX_SYMBOL_EXISTS(getifaddrs ifaddrs.h HAVE_GETIFADDRS)
 CHECK_CXX_SYMBOL_EXISTS(getpwent pwd.h HAVE_GETPWENT)
+CHECK_CXX_SYMBOL_EXISTS(getrusage sys/resource.h HAVE_GETRUSAGE)
 CHECK_CXX_SYMBOL_EXISTS(gettext libintl.h HAVE_GETTEXT)
 CHECK_CXX_SYMBOL_EXISTS(killpg "sys/types.h;signal.h" HAVE_KILLPG)
 CHECK_CXX_SYMBOL_EXISTS(lrand48_r stdlib.h HAVE_LRAND48_R)
diff --git a/config_cmake.h.in b/config_cmake.h.in
index 8071546fd..2078896b2 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -31,6 +31,9 @@
 /* Define to 1 if you have the `getpwent' function. */
 #cmakedefine HAVE_GETPWENT 1
 
+/* Define to 1 if you have the 'getrusage' function. */
+#cmakedefine HAVE_GETRUSAGE 1
+
 /* Define to 1 if you have the `gettext' function. */
 #cmakedefine HAVE_GETTEXT 1
 
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index cb92df6ec..0a11cd531 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -30,6 +30,8 @@ The following options are available:
 
 - ``-p`` or ``--profile=PROFILE_FILE`` when fish exits, output timing information on all executed commands to the specified file
 
+- ``--print-rusage-self`` when fish exits, output stats from getrusage
+
 - ``-v`` or ``--version`` display version and exit
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
diff --git a/src/fish.cpp b/src/fish.cpp
index 4b0f2c2c8..bf4b1006b 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <cwchar>
@@ -63,11 +64,45 @@ class fish_cmd_opts_t {
     std::vector<std::string> batch_cmds;
     // Commands to execute after the shell's config has been read.
     std::vector<std::string> postconfig_cmds;
+    /// Whether to print rusage-self stats after execution.
+    bool print_rusage_self{false};
 };
 
 /// If we are doing profiling, the filename to output to.
 static const char *s_profiling_output_filename = NULL;
 
+/// \return a timeval converted to milliseconds.
+long long tv_to_msec(const struct timeval &tv) {
+    long long msec = (long long)tv.tv_sec * 1000; // milliseconds per second
+    msec += tv.tv_usec / 1000; // microseconds per millisecond
+    return msec;
+}
+
+static void print_rusage_self(FILE *fp) {
+#ifndef HAVE_GETRUSAGE
+    fprintf(fp, "getrusage() not supported on this platform");
+    return;
+#else
+    struct rusage rs;
+    if (getrusage(RUSAGE_SELF, &rs)) {
+        perror("getrusage");
+        return;
+    }
+#if defined(__APPLE__) && defined(__MACH__)
+    // Macs use bytes.
+    long rss_kb = rs.ru_maxrss / 1024;
+#else
+    // Everyone else uses KB.
+    long rss_kb = rs.ru_maxrss;
+#endif
+    fprintf(fp, "  rusage self:\n");
+    fprintf(fp, "      user time: %llu ms\n", tv_to_msec(rs.ru_utime));
+    fprintf(fp, "       sys time: %llu ms\n", tv_to_msec(rs.ru_stime));
+    fprintf(fp, "        max rss: %ld kb\n", rss_kb);
+    fprintf(fp, "        signals: %ld\n", rs.ru_nsignals);
+#endif
+}
+
 static bool has_suffix(const std::string &path, const char *suffix, bool ignore_case) {
     size_t pathlen = path.size(), suffixlen = std::strlen(suffix);
     return pathlen >= suffixlen &&
@@ -223,6 +258,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                                               {"interactive", no_argument, NULL, 'i'},
                                               {"login", no_argument, NULL, 'l'},
                                               {"no-execute", no_argument, NULL, 'n'},
+                                              {"print-rusage-self", no_argument, NULL, 1},
                                               {"profile", required_argument, NULL, 'p'},
                                               {"private", no_argument, NULL, 'P'},
                                               {"help", no_argument, NULL, 'h'},
@@ -275,6 +311,10 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 no_exec = 1;
                 break;
             }
+            case 1: {
+                opts->print_rusage_self = true;
+                break;
+            }
             case 'p': {
                 s_profiling_output_filename = optarg;
                 g_profiling_active = true;
@@ -450,6 +490,9 @@ int main(int argc, char **argv) {
 
     history_save_all();
     proc_destroy();
+    if (opts.print_rusage_self) {
+        print_rusage_self(stderr);
+    }
     exit_without_destructors(exit_status);
     return EXIT_FAILURE;  // above line should always exit
 }

From 2d4872ba60e41185091357a1cb1aae3bd519854d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 14:02:21 -0700
Subject: [PATCH 0311/1732] Add a benchmark driver and a simple benchmark

This adds a simple script that drives benchmarks, and a simple sample
benchmark.
---
 benchmarks/benchmarks/seq_echo.fish |  3 +++
 benchmarks/driver.sh                | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 benchmarks/benchmarks/seq_echo.fish
 create mode 100755 benchmarks/driver.sh

diff --git a/benchmarks/benchmarks/seq_echo.fish b/benchmarks/benchmarks/seq_echo.fish
new file mode 100644
index 000000000..56e76da68
--- /dev/null
+++ b/benchmarks/benchmarks/seq_echo.fish
@@ -0,0 +1,3 @@
+for i in (seq 1000)
+   echo $i
+end
diff --git a/benchmarks/driver.sh b/benchmarks/driver.sh
new file mode 100755
index 000000000..877cd8fe4
--- /dev/null
+++ b/benchmarks/driver.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: driver.sh /path/to/fish"
+fi
+
+FISH_PATH=$1
+BENCHMARKS_DIR=$(dirname "$0")/benchmarks
+
+for benchmark in "$BENCHMARKS_DIR"/*; do
+    echo $(basename "$benchmark")
+    ${FISH_PATH} --print-rusage-self $benchmark > /dev/null
+done
+

From c39950e49a131f005f8ab8f6e43a6c3aba659d32 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 14:30:31 -0700
Subject: [PATCH 0312/1732] Add benchmark target to CMake

This adds a benchmark target to CMake to run the new benchmarks.

example: ninja benchmark
---
 CMakeLists.txt        | 3 +++
 cmake/Benchmark.cmake | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 cmake/Benchmark.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e56dd2ada..99c24f516 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,9 @@ ADD_EXECUTABLE(fish_test_helper src/fish_test_helper.cpp)
 # Set up tests.
 INCLUDE(cmake/Tests.cmake)
 
+# Benchmarking support.
+INCLUDE(cmake/Benchmark.cmake)
+
 # Set up install.
 INCLUDE(cmake/Install.cmake)
 
diff --git a/cmake/Benchmark.cmake b/cmake/Benchmark.cmake
new file mode 100644
index 000000000..8eab311ce
--- /dev/null
+++ b/cmake/Benchmark.cmake
@@ -0,0 +1,5 @@
+# Support for benchmarking fish.
+
+ADD_CUSTOM_TARGET(benchmark
+    COMMAND ${CMAKE_SOURCE_DIR}/benchmarks/driver.sh $<TARGET_FILE:fish>
+)

From f086064d728fbcb92dc8332eecf40ba5d949c3d5 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 10 Apr 2019 16:41:26 -0700
Subject: [PATCH 0313/1732] add --print-rusage-self to completions

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

diff --git a/share/completions/fish.fish b/share/completions/fish.fish
index ab3bfcdde..8f5680fee 100644
--- a/share/completions/fish.fish
+++ b/share/completions/fish.fish
@@ -21,4 +21,6 @@ function __fish_complete_features
     printf "%s\n" "$arg_comma"$features #TODO: remove existing args
 end
 complete -c fish -s f -l features -d "Run with comma-separated feature flags enabled" -a "(__fish_complete_features)" -x
+complete -c fish -l print-rusage-self -d "Print stats from getrusage at exit" -f
+
 complete -c fish -x -a "(__fish_complete_suffix .fish)"
\ No newline at end of file

From 502efb0f3eb9c7c27995873a94e5ca010d6d1d85 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Wed, 10 Apr 2019 19:11:52 -0700
Subject: [PATCH 0314/1732] Improve descriptions

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index ced03d175..fb44bd27e 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -910,20 +910,20 @@ complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_bra
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d 'Head'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d 'Tag'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
-complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree'
-complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree'
-complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use any ref found in refs/ namespace'
-complete -f -c git -n '__fish_git_using_command describe' -l tags -d 'Use any tag found in refs/tags namespace'
+complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree, append dirty if there are local changes'
+complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree, append -broken instead of erroring'
+complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use all tags, not just annotated'
+complete -f -c git -n '__fish_git_using_command describe' -l tags -d 'Use all commits/tags, not just annotated tags'
 complete -f -c git -n '__fish_git_using_command describe' -l contains -d 'Find the tag that comes after the commit'
 complete -f -c git -n '__fish_git_using_command describe' -l abbrev -d 'Use <n> digits, or as many digits as needed to form a unique object name'
 complete -f -c git -n '__fish_git_using_command describe' -l candidates -d 'Consider up to <n> candidates'
 complete -f -c git -n '__fish_git_using_command describe' -l exact-match -d 'Only output exact matches'
-complete -f -c git -n '__fish_git_using_command describe' -l debug -d 'Verbosely display information about the searching strategy'
+complete -f -c git -n '__fish_git_using_command describe' -l debug -d 'Display debug info'
 complete -f -c git -n '__fish_git_using_command describe' -l long -d 'Always output the long format'
 complete -f -c git -n '__fish_git_using_command describe' -l match -d 'Only consider tags matching the given glob pattern'
 complete -f -c git -n '__fish_git_using_command describe' -l exclude -d 'Do not consider tags matching the given glob pattern'
 complete -f -c git -n '__fish_git_using_command describe' -l always -d 'Show uniquely abbreviated commit object as fallback'
-complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Follow only the first parent commit upon seeing a merge commit'
+complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Follow only the first parent of a merge commit'
 
 ### diff
 complete -c git -n '__fish_git_needs_command' -a diff -d 'Show changes between commits, commit and working tree, etc'
@@ -1173,7 +1173,7 @@ complete -c git -n '__fish_git_using_command ls-files' -l directory -d 'If a who
 complete -c git -n '__fish_git_using_command ls-files' -l no-empty-directory -d 'Do not list empty directories'
 complete -c git -n '__fish_git_using_command ls-files' -s u -l unmerged -d 'Show unmerged files in the output'
 complete -c git -n '__fish_git_using_command ls-files' -s k -l killed -d 'Show files on the filesystem that need to be removed for checkout-index to succeed'
-complete -c git -n '__fish_git_using_command ls-files' -s z -d '\0 line termination on output and do not quote filenames'
+complete -c git -n '__fish_git_using_command ls-files' -s z -d 'Use \0 delimiter'
 complete -c git -n '__fish_git_using_command ls-files' -s x -l exclude -d 'Skip untracked files matching pattern'
 complete -c git -n '__fish_git_using_command ls-files' -s X -l exclude-from -d 'Read exclude patterns from <file>; 1 per line'
 complete -c git -n '__fish_git_using_command ls-files' -l exclude-per-directory -d 'Read additional exclude patterns that apply only to the directory and its subdirectories in <file>'
@@ -1181,8 +1181,8 @@ complete -c git -n '__fish_git_using_command ls-files' -l exclude-standard -d 'A
 complete -c git -n '__fish_git_using_command ls-files' -l error-unmatch -d 'If any <file> does not appear in the index, treat this as an error'
 complete -c git -n '__fish_git_using_command ls-files' -l with-tree
 complete -c git -n '__fish_git_using_command ls-files' -s t -d 'Identifies the file status'
-complete -c git -n '__fish_git_using_command ls-files' -s v -d 'Similar to -t but use lowercase letters for files that are marked as assume unchanged'
-complete -c git -n '__fish_git_using_command ls-files' -s f -d 'Similar to -t but use lowercase letters for files that are marked as fsmonitor valid'
+complete -c git -n '__fish_git_using_command ls-files' -s v -d 'Show file status, use lowercase letters for files assumed unchanged'
+complete -c git -n '__fish_git_using_command ls-files' -s f -d 'Show file status, use lowercase letters for files marked as fsmonitor valid'
 complete -c git -n '__fish_git_using_command ls-files' -l full-name -d 'Force paths to be output relative to the project top directory'
 complete -c git -n '__fish_git_using_command ls-files' -l recurse-submodules -d 'Recursively calls ls-files on each submodule in the repository'
 complete -c git -n '__fish_git_using_command ls-files' -l abbrev -d 'Show only a partial prefix'
@@ -1571,7 +1571,7 @@ complete -f -c git -n '__fish_git_using_command help' -a clean -d 'Remove untrac
 complete -f -c git -n '__fish_git_using_command help' -a clone -d 'Clone a repository into a new directory'
 complete -f -c git -n '__fish_git_using_command help' -a commit -d 'Record changes to the repository'
 complete -f -c git -n '__fish_git_using_command help' -a config -d 'Set and read git configuration variables'
-complete -f -c git -n '__fish_git_using_command help' -a describe -d 'Give an object a human readable name based on an available ref'
+complete -f -c git -n '__fish_git_using_command help' -a describe -d 'Give an object a human-readable name'
 complete -f -c git -n '__fish_git_using_command help' -a diff -d 'Show changes between commits, commit and working tree, etc'
 complete -f -c git -n '__fish_git_using_command help' -a difftool -d 'Open diffs in a visual tool'
 complete -f -c git -n '__fish_git_using_command help' -a fetch -d 'Download objects and refs from another repository'

From 0bda853dc73c937d0731180df747d3721da48b79 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 28 Mar 2019 19:55:23 -0500
Subject: [PATCH 0315/1732] Add detection of `eval` to the parser

While `eval` is still a function, this paves the way for changing that
in the future, and lets the proc/exec functions detect when an eval is
used to allow/disallow certain behaviors and optimizations.
---
 src/complete.cpp          | 8 ++++++++
 src/exec.cpp              | 1 +
 src/parse_constants.h     | 9 ++++++---
 src/parse_grammar.h       | 2 ++
 src/parse_productions.cpp | 4 ++++
 src/proc.h                | 2 ++
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index d4091855d..c892f4482 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1465,6 +1465,14 @@ void completer_t::perform() {
                 use_abbr = false;
                 break;
             }
+            case parse_statement_decoration_eval: {
+                use_command = true;
+                use_function = true;
+                use_builtin = true;
+                use_implicit_cd = false;
+                use_abbr = false;
+                break;
+            }
         }
 
         if (cmd_node.location_in_or_at_end_of_source_range(pos)) {
diff --git a/src/exec.cpp b/src/exec.cpp
index be1eec6b6..a6441798e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -944,6 +944,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
+        case process_type_t::eval: /* so long as `eval` is a function */
         case process_type_t::function:
         case process_type_t::block_node: {
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 53eda65c4..2f86f05fd 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -97,7 +97,6 @@ const enum_map<parse_token_type_t> token_enum_map[] = {
 //
 // IMPORTANT: These enums must start at zero.
 enum parse_keyword_t {
-    parse_keyword_none = 0,
     parse_keyword_and,
     parse_keyword_begin,
     parse_keyword_builtin,
@@ -105,13 +104,15 @@ enum parse_keyword_t {
     parse_keyword_command,
     parse_keyword_else,
     parse_keyword_end,
+    parse_keyword_eval,
+    parse_keyword_exclam,
     parse_keyword_exec,
     parse_keyword_for,
     parse_keyword_function,
     parse_keyword_if,
     parse_keyword_in,
+    parse_keyword_none,
     parse_keyword_not,
-    parse_keyword_exclam,
     parse_keyword_or,
     parse_keyword_switch,
     parse_keyword_while,
@@ -125,6 +126,7 @@ const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!
                                                       {parse_keyword_command, L"command"},
                                                       {parse_keyword_else, L"else"},
                                                       {parse_keyword_end, L"end"},
+                                                      {parse_keyword_eval, L"eval"},
                                                       {parse_keyword_exec, L"exec"},
                                                       {parse_keyword_for, L"for"},
                                                       {parse_keyword_function, L"function"},
@@ -144,7 +146,8 @@ enum parse_statement_decoration_t {
     parse_statement_decoration_none,
     parse_statement_decoration_command,
     parse_statement_decoration_builtin,
-    parse_statement_decoration_exec
+    parse_statement_decoration_exec,
+    parse_statement_decoration_eval,
 };
 
 // Boolean statement types, stored in node tag.
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index b6b1cb2ee..03e163ae1 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -334,6 +334,8 @@ DEF_ALT(decorated_statement) {
     using cmds = seq<keyword<parse_keyword_command>, plain_statement>;
     using builtins = seq<keyword<parse_keyword_builtin>, plain_statement>;
     using execs = seq<keyword<parse_keyword_exec>, plain_statement>;
+    // using evals = seq<keyword<parse_keyword_eval>, plain_statement>;
+    using evals = single<plain_statement>; /* so long as `eval` is a function */
     ALT_BODY(decorated_statement, plains, cmds, builtins, execs);
 };
 
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 4718d826a..2e60f3b46 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -314,6 +314,10 @@ RESOLVE(decorated_statement) {
             *out_tag = parse_statement_decoration_exec;
             return production_for<execs>();
         }
+        case parse_keyword_eval: {
+            *out_tag = parse_statement_decoration_eval;
+            return production_for<evals>();
+        }
         default: {
             *out_tag = parse_statement_decoration_none;
             return production_for<plains>();
diff --git a/src/proc.h b/src/proc.h
index c39e1a123..abca58465 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -36,6 +36,8 @@ enum class process_type_t {
     block_node,
     /// The exec builtin.
     exec,
+    /// A literal evaluation
+    eval,
 };
 
 enum class job_control_t {

From f7817a2586469e9c11324780901d01e3f88a6e7a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 23:15:17 -0700
Subject: [PATCH 0316/1732] Remove env_node_t::contains_any_of

Dead code...
---
 src/env.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 65efd30fb..a7b1a929c 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -90,14 +90,6 @@ class env_node_t {
         if (it != env.end()) return it->second;
         return none();
     }
-
-    /// Return whether this node contains any of the entries in the vars list.
-    bool contains_any_of(const wcstring_list_t &vars) const {
-        for (const auto &v : vars) {
-            if (env.count(v)) return true;
-        }
-        return false;
-    }
 };
 
 using env_node_ref_t = std::shared_ptr<env_node_t>;

From 90547a861a13806cdfcf479e279527b2cb18c922 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 11 Apr 2019 02:49:29 -0700
Subject: [PATCH 0317/1732] __fish_macos_set_env: don't create empty PATH
 components

It was creating empty entries for blank lines, which will actually
create '.' for colon-separated vars

Fixes #5809
---
 share/config.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/config.fish b/share/config.fish
index c5268fa6b..6934b74ea 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -181,7 +181,8 @@ if status --is-login
                 if [ -f $path_file ]
                     while read -l entry
                         if not contains -- $entry $result
-                            set -a result $entry
+                            test -n "$entry"
+                            and set -a result $entry
                         end
                     end <$path_file
                 end

From 2fe2169065c1146d495830bc4748ecca68094ba0 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 10 Apr 2019 22:38:19 -0500
Subject: [PATCH 0318/1732] Make `eval` a decorator

`eval` has always been implemented as a function, which was always a bit
of a hack that caused some issues such as triggering the creation of a
new scope. This turns `eval` into a decorator.

The scoping issues with eval prevented it from being usable to actually
implement other shell components in fish script, such as the problems
described in #4442, which should now no longer be the case.

Closes #4443.
---
 share/functions/eval.fish | 70 +--------------------------------------
 src/complete.cpp          |  4 +--
 src/exec.cpp              | 26 ++++++++++++++-
 src/parse_execution.cpp   | 38 ++++++++++++---------
 src/parse_grammar.h       | 13 ++++++--
 src/proc.cpp              |  3 ++
 6 files changed, 64 insertions(+), 90 deletions(-)

diff --git a/share/functions/eval.fish b/share/functions/eval.fish
index 20910e944..5798655fc 100644
--- a/share/functions/eval.fish
+++ b/share/functions/eval.fish
@@ -1,71 +1,3 @@
-function eval -S -d "Evaluate parameters as a command"
-    # keep a copy of the previous $status and use restore_status
-    # to preserve the status in case the block that is evaluated
-    # does not modify the status itself.
-    set -l status_copy $status
-    function __fish_restore_status
-        return $argv[1]
-    end
+function eval
 
-    if not set -q argv[2]
-        # like most builtins, we only check for -h/--help
-        # if we only have a single argument
-        switch "$argv[1]"
-            case -h --help
-                __fish_print_help eval
-                return 0
-        end
-    end
-
-    if not string length -q -- $argv
-        # If the argument is empty, eval should return 0 for compatibility with other shells.
-        # See #5692.
-        return 0
-    end
-
-    # If we are in an interactive shell, eval should enable full
-    # job control since it should behave like the real code was
-    # executed.  If we don't do this, commands that expect to be
-    # used interactively, like less, wont work using eval.
-
-    set -l mode
-    if status --is-interactive-job-control
-        set mode interactive
-    else
-        if status --is-full-job-control
-            set mode full
-        else
-            set mode none
-        end
-    end
-    if status --is-interactive
-        status --job-control full
-    end
-    __fish_restore_status $status_copy
-
-    # To eval 'foo', we construct a block "begin ; foo; end <&3 3<&-"
-    # Note the redirections are also within the quotes.
-    #
-    # We then pipe this to 'source 3<&0’.
-    #
-    # You might expect that the dup2(3, stdin) should overwrite stdin,
-    # and therefore prevent 'source' from reading the piped-in block. This doesn't happen
-    # because when you pipe to a builtin, we don't overwrite stdin with the read end
-    # of the block; instead we set a separate fd in a variable 'builtin_stdin', which is
-    # what it reads from. So builtins are magic in that, in pipes, their stdin
-    # is not fd 0.
-    #
-    # ‘source’ does not apply the redirections to itself. Instead it saves them and passes
-    # them as block-level redirections to parser.eval(). Ultimately the eval’d code sees
-    # the following redirections (in the following order):
-    #    dup2 0 -> 3
-    #    dup2 pipe -> 0
-    #    dup2 3 -> 0
-    # where the pipe is the pipe we get from piping ‘echo’ to ‘source’. Thus the redirection
-    # effectively makes stdin fd0, instead of the thing that was piped to ‘source’
-    echo "begin; $argv "\n" ;end <&3 3<&-" | source 3<&0
-    set -l res $status
-
-    status --job-control $mode
-    return $res
 end
diff --git a/src/complete.cpp b/src/complete.cpp
index c892f4482..ddec89ca2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1469,8 +1469,8 @@ void completer_t::perform() {
                 use_command = true;
                 use_function = true;
                 use_builtin = true;
-                use_implicit_cd = false;
-                use_abbr = false;
+                use_implicit_cd = true;
+                use_abbr = true;
                 break;
             }
         }
diff --git a/src/exec.cpp b/src/exec.cpp
index a6441798e..3ff9a5d74 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <numeric>
 #ifdef HAVE_SIGINFO_H
 #include <siginfo.h>
 #endif
@@ -903,6 +904,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     // The IO chain for this process.
     io_chain_t process_net_io_chain = j->block_io_chain();
+    auto cached_status = proc_get_last_status();
 
     if (pipes.write.valid()) {
         process_net_io_chain.push_back(std::make_shared<io_pipe_t>(
@@ -944,7 +946,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
-        case process_type_t::eval: /* so long as `eval` is a function */
         case process_type_t::function:
         case process_type_t::block_node: {
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
@@ -982,6 +983,29 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
                 "Aborting.");
             break;
         }
+
+        case process_type_t::eval: {
+            // int eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
+            bool has_args = false;
+            wcstring new_cmd;
+            for (const wchar_t * const* arg = p->get_argv() + 1; *arg != nullptr; ++arg) {
+                has_args = true;
+                new_cmd += L' ';
+                new_cmd += *arg;
+            }
+
+            // `eval` is not supposed to error or do anything at all if no arguments are provided,
+            // or if it is used to execute a function that wouldn't have changed the status code
+            // (e.g. an empty function) if it were executed normally.
+            j->processes[0]->completed = true;
+            p->status = proc_status_t::from_exit_code(cached_status);
+
+            if (has_args) {
+                parser.eval(new_cmd.c_str(), process_net_io_chain, block_type_t::TOP);
+                p->status = proc_status_t::from_exit_code(proc_get_last_status());
+            }
+            break;
+        }
     }
     return true;
 }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 06ed5bf00..51bf0f3cf 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -151,22 +151,30 @@ process_type_t parse_execution_context_t::process_type_for_command(
     // etc).
     enum parse_statement_decoration_t decoration = get_decoration(statement);
 
-    if (decoration == parse_statement_decoration_exec) {
-        // Always exec.
-        process_type = process_type_t::exec;
-    } else if (decoration == parse_statement_decoration_command) {
-        // Always a command.
-        process_type = process_type_t::external;
-    } else if (decoration == parse_statement_decoration_builtin) {
-        // What happens if this builtin is not valid?
-        process_type = process_type_t::builtin;
-    } else if (function_exists(cmd)) {
-        process_type = process_type_t::function;
-    } else if (builtin_exists(cmd)) {
-        process_type = process_type_t::builtin;
-    } else {
-        process_type = process_type_t::external;
+    switch (decoration) {
+        case parse_statement_decoration_exec:
+            process_type = process_type_t::exec;
+            break;
+        case parse_statement_decoration_command:
+            process_type = process_type_t::external;
+            break;
+        case parse_statement_decoration_builtin:
+            process_type = process_type_t::builtin;
+            break;
+        case parse_statement_decoration_eval:
+            process_type = process_type_t::eval;
+            break;
+        case parse_statement_decoration_none:
+            if (function_exists(cmd)) {
+                process_type = process_type_t::function;
+            } else if (builtin_exists(cmd)) {
+                process_type = process_type_t::builtin;
+            } else {
+                process_type = process_type_t::external;
+            }
+            break;
     }
+
     return process_type;
 }
 
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index 03e163ae1..5a3c5f0ce 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -334,9 +334,16 @@ DEF_ALT(decorated_statement) {
     using cmds = seq<keyword<parse_keyword_command>, plain_statement>;
     using builtins = seq<keyword<parse_keyword_builtin>, plain_statement>;
     using execs = seq<keyword<parse_keyword_exec>, plain_statement>;
-    // using evals = seq<keyword<parse_keyword_eval>, plain_statement>;
-    using evals = single<plain_statement>; /* so long as `eval` is a function */
-    ALT_BODY(decorated_statement, plains, cmds, builtins, execs);
+    // Ideally, `evals` should be defined as `seq<keyword<parse_keyword_eval>,
+    // arguments_or_redirections_list`, but other parts of the code have the logic hard coded to
+    // search for a process at the head of a statement, and bug out if we do that.
+    // We also can't define `evals` as a `seq<keyword<parse_keyword_eval>, plain_statement>` because
+    // `expand.cpp` hard-codes its "command substitution at the head of a statement is not allowed"
+    // check without any way of telling it to perform the substitution anyway. Our solution is to
+    // create an empty function called `eval` that never actually gets executed and convert a
+    // decorated statement `eval ...` into a plain statement `eval ...`
+    using evals = seq<plain_statement>;
+    ALT_BODY(decorated_statement, plains, cmds, builtins, execs, evals);
 };
 
 DEF(plain_statement)
diff --git a/src/proc.cpp b/src/proc.cpp
index c4777764b..4d64bbaa2 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -477,6 +477,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
     static std::vector<shared_ptr<job_t>> erase_list;
     const bool only_one_job = jobs().size() == 1;
     for (const auto &j : jobs()) {
+        if (!j->is_constructed()) {
+            continue;
+        }
         // If we are reaping only jobs who do not need status messages sent to the console, do not
         // consider reaping jobs that need status messages.
         if ((!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) && (!interactive) &&

From da20d197b4b6eacb3a47bf119c163887380d98c3 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 11 Apr 2019 00:37:22 -0500
Subject: [PATCH 0319/1732] Add regression test for eval scope (#4443)

---
 tests/eval_scope.err | 0
 tests/eval_scope.in  | 3 +++
 tests/eval_scope.out | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 tests/eval_scope.err
 create mode 100644 tests/eval_scope.in
 create mode 100644 tests/eval_scope.out

diff --git a/tests/eval_scope.err b/tests/eval_scope.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/eval_scope.in b/tests/eval_scope.in
new file mode 100644
index 000000000..b5b89b7c0
--- /dev/null
+++ b/tests/eval_scope.in
@@ -0,0 +1,3 @@
+# Regression test for issue #4443
+eval set -l previously_undefined foo
+echo $previously_undefined
diff --git a/tests/eval_scope.out b/tests/eval_scope.out
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/tests/eval_scope.out
@@ -0,0 +1 @@
+foo

From c50eb7c85f38d1fd0059741e687fc718bb036aed Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 2 Apr 2019 23:26:24 +0800
Subject: [PATCH 0320/1732] docs: import SphinxWarning in configuration

Fixes a NameError when reporting problems.

[ci skip]
---
 sphinx_doc_src/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 22fe26665..808241b93 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -9,6 +9,7 @@
 import glob
 import os.path
 import pygments
+from sphinx.errors import SphinxError, SphinxWarning
 
 # -- Helper functions --------------------------------------------------------
 

From 87518a524f23ba8cae4f3c7da2293a4bb64cb0c2 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 11 Apr 2019 23:51:00 +0800
Subject: [PATCH 0321/1732] docs: update the VCS prompt function documentation

Edited for clarity and formatting.

[ci skip]
---
 sphinx_doc_src/cmds/fish_git_prompt.rst |  62 ++++++++------
 sphinx_doc_src/cmds/fish_hg_prompt.rst  |  40 ++++-----
 sphinx_doc_src/cmds/fish_svn_prompt.rst | 107 ++++++++++--------------
 sphinx_doc_src/cmds/fish_vcs_prompt.rst |  20 ++---
 4 files changed, 111 insertions(+), 118 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 9a589aa1b..2bd1a914b 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -6,26 +6,32 @@ fish_git_prompt - output git information for use in a prompt
 Description
 -----------
 
-The fish_git_prompt function can be used to display information about the current git repository, if any.
+The ``fish_git_prompt`` function displays information about the current git repository, if any.
 
-For obvious reasons, it requires having git installed.
+`Git <https://git-scm.com>`_ must be installed.
 
-There are numerous configuration options, either as fish variables or git config variables. If a git config variable is supported, it will be used if set, and the fish variable will only be used if it isn't.
+There are numerous customization options, which can be controlled with git options or fish variables. git options, where available, take precedence over the fish variable with the same function. git options can be set on a per-repository or global basis. git options can be set with the `git config` command, while fish variables can be set as usual with the :ref:`set <cmd-set>` command.
 
-- ``$__fish_git_prompt_show_informative_status`` or the git config option "bash.showInformativeStatus" can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, etc... In large repositories, this can take a lot of time, so it is recommended to disable it there, via ``git config bash.showInformativeStatus false``.
+- ``$__fish_git_prompt_show_informative_status`` or the git option ``bash.showInformativeStatus`` can be set to enable the "informative" display, which will show a large amount of information - the number of untracked files, dirty files, unpushed/unpulled commits, and more. In large repositories, this can take a lot of time, so it you may wish to disable it in these repositories with  ``git config --local bash.showInformativeStatus false``.
 
-- ``$__fish_git_prompt_showdirtystate`` or the git config option "bash.showDirtyState" can be set to show if the repository is "dirty", i.e. has uncommitted changes.
+- ``$__fish_git_prompt_showdirtystate`` or the git option ``bash.showDirtyState`` can be set to show if the repository is "dirty", i.e. has uncommitted changes.
 
-- ``$__fish_git_prompt_showuntrackedfiles`` or the git config option "bash.showUntrackedFiles" can be set to show if the repository has untracked files (that aren't ignored).
+- ``$__fish_git_prompt_showuntrackedfiles`` or the git option ``bash.showUntrackedFiles`` can be set to show if the repository has untracked files (that aren't ignored).
 
 - ``$__fish_git_prompt_showupstream`` can be set to a number of values to determine how changes between HEAD and upstream are shown:
 
-     verbose        show number of commits ahead/behind (+/-) upstream
-     name           if verbose, then also show the upstream abbrev name
-     informative    similar to verbose, but shows nothing when equal - this is the default if show_informative_status is set.
-     git            always compare HEAD to @{upstream}
-     svn            always compare HEAD to your SVN upstream
-     none           disables (useful with show_informative_status)
+     ``verbose``
+          show number of commits ahead/behind (+/-) upstream
+     ``name``
+          if verbose, then also show the upstream abbrev name
+     ``informative``
+          similar to verbose, but shows nothing when equal - this is the default if informative status is enabled.
+     ``git``
+          always compare HEAD to @{upstream}
+     ``svn``
+          always compare HEAD to your SVN upstream
+     ``none``
+          disables (useful with informative status)
 
 - ``$__fish_git_prompt_showstashstate`` can be set to display the state of the stash.
 
@@ -33,14 +39,18 @@ There are numerous configuration options, either as fish variables or git config
 
 - ``$__fish_git_prompt_describe_style`` can be set to a number of styles that describe the current HEAD:
 
-     contains
-     branch
-     describe
-     default
+     ``contains``
+         relative to newer annotated tag, such as ``(v1.6.3.2~35)``
+     ``branch``
+         relative to newer tag or branch, such as ``(master~4)``
+     ``describe``
+         relative to older annotated tag, such as ``(v1.6.3.1-13-gdd42c2f)``
+     ``default``
+         exactly matching tag
 
-- ``$__fish_git_prompt_showcolorhints`` can be set to enable coloring for certain things.
+- ``$__fish_git_prompt_showcolorhints`` can be set to enable coloring for the branch name and status symbols.
 
-A number of variables set characters and color used to indicate things. Many of these have a different default if used with informative status enabled. The normal default is given first, then the informative default if it is different. If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
+A number of variables set characters and color used as indicators. Many of these have a different default if used with informative status enabled. The usual default is given first, then the informative default (if it is different). If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
 
 - ``$__fish_git_prompt_char_stateseparator`` (' ', `|`)
 - ``$__fish_git_prompt_color`` ('')
@@ -49,12 +59,12 @@ A number of variables set characters and color used to indicate things. Many of
 - ``$__fish_git_prompt_color_bare``
 - ``$__fish_git_prompt_color_merging``
 
-Some variables are only used in some modes, like when informative status is enabled (by setting ``$__fish_git_prompt_show_informative_status``):
+Some variables are only used in some modes, like when informative status is enabled:
 
 - ``$__fish_git_prompt_char_cleanstate`` (✔)
 - ``$__fish_git_prompt_color_cleanstate``
 
-Variables used with showdirtystate:
+Variables used with ``showdirtystate``:
 
 - ``$__fish_git_prompt_char_dirtystate`` (`*`, ✚)
 - ``$__fish_git_prompt_char_invalidstate`` (#, ✖)
@@ -63,17 +73,17 @@ Variables used with showdirtystate:
 - ``$__fish_git_prompt_color_invalidstate``
 - ``$__fish_git_prompt_color_stagedstate`` (green with showcolorhints, color_flags otherwise)
 
-Variables used with showstashstate:
+Variables used with ``showstashstate``:
 
 - ``$__fish_git_prompt_char_stashstate`` (``$``, ⚑)
 - ``$__fish_git_prompt_color_stashstate`` (same as color_flags)
 
-Variables used with showuntrackedfiles:
+Variables used with ``showuntrackedfiles``:
 
 - ``$__fish_git_prompt_char_untrackedfiles`` (%, …)
 - ``$__fish_git_prompt_color_untrackedfiles`` (same as color_flags)
 
-Variables used with showupstream (also implied by informative status):
+Variables used with ``showupstream`` (also implied by informative status):
 
 - ``$__fish_git_prompt_char_upstream_ahead`` (>, ↑)
 - ``$__fish_git_prompt_char_upstream_behind`` (<, ↓)
@@ -82,15 +92,15 @@ Variables used with showupstream (also implied by informative status):
 - ``$__fish_git_prompt_char_upstream_prefix`` ('')
 - ``$__fish_git_prompt_color_upstream``
 
-Colors used with showcolorhints:
+Colors used with ``showcolorhints``:
 
 - ``$__fish_git_prompt_color_branch`` (green)
 - ``$__fish_git_prompt_color_branch_detached`` (red)
 - ``$__fish_git_prompt_color_flags`` (--bold blue)
 
-Note that all colors can also have a corresponding "_done" color. E.g. ``$__fish_git_prompt_color_upstream_done``, used right _after_ the upstream.
+Note that all colors can also have a corresponding ``_done`` color. For example, the contents of ``$__fish_git_prompt_color_upstream_done`` is printed right _after_ the upstream.
 
-See also fish_vcs_prompt, which will call all supported vcs-prompt functions, including git, hg and svn.
+See also :ref:`fish_vcs_prompt <cmd-fish_vcs_prompt>`, which will call all supported version control prompt functions, including git, Mercurial and Subversion.
 
 Example
 --------
diff --git a/sphinx_doc_src/cmds/fish_hg_prompt.rst b/sphinx_doc_src/cmds/fish_hg_prompt.rst
index f0d1d0caa..c91582eac 100644
--- a/sphinx_doc_src/cmds/fish_hg_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_hg_prompt.rst
@@ -1,40 +1,40 @@
 .. _cmd-fish_hg_prompt:
 
-fish_hg_prompt - output mercurial information for use in a prompt
+fish_hg_prompt - output Mercurial information for use in a prompt
 =================================================================
 
 Description
 -----------
 
-The fish_hg_prompt function can be used to display information about the current mercurial repository, if any.
+The fish_hg_prompt function displays information about the current Mercurial repository, if any.
 
-For obvious reasons, it requires having hg installed.
+`Mercurial <https://www.mercurial-scm.org/>`_ (``hg``) must be installed.
 
-There are numerous configuration options:
+There are numerous customization options, which can be controlled with fish variables.
 
-- $fish_color_hg_clean, $fish_color_hg_modified and $fish_color_hg_dirty: The color to use when the repo has the respective status
+- ``$fish_color_hg_clean``, ``$fish_color_hg_modified`` and ``$fish_color_hg_dirty`` are colors used when the repository has the respective status.
 
 Some colors for status symbols:
 
-- $fish_color_hg_added
-- $fish_color_hg_renamed
-- $fish_color_hg_copied
-- $fish_color_hg_deleted
-- $fish_color_hg_untracked
-- $fish_color_hg_unmerged
+- ``$fish_color_hg_added``
+- ``$fish_color_hg_renamed``
+- ``$fish_color_hg_copied``
+- ``$fish_color_hg_deleted``
+- ``$fish_color_hg_untracked``
+- ``$fish_color_hg_unmerged``
 
-And the status symbols themselves:
+The status symbols themselves:
 
-- $fish_prompt_hg_status_added, default '✚'
-- $fish_prompt_hg_status_modified, default '*'
-- $fish_prompt_hg_status_copied, default '⇒'
-- $fish_prompt_hg_status_deleted, default '✖'
-- $fish_prompt_hg_status_untracked, default '?'
-- $fish_prompt_hg_status_unmerged, default '!'
+- ``$fish_prompt_hg_status_added``, default '✚'
+- ``$fish_prompt_hg_status_modified``, default '*'
+- ``$fish_prompt_hg_status_copied``, default '⇒'
+- ``$fish_prompt_hg_status_deleted``, default '✖'
+- ``$fish_prompt_hg_status_untracked``, default '?'
+- ``$fish_prompt_hg_status_unmerged``, default '!'
 
-And $fish_prompt_hg_status_order, which can be used to change the order the status symbols appear in. It defaults to ``added modified copied deleted untracked unmerged``.
+Finally, ``$fish_prompt_hg_status_order``, which can be used to change the order the status symbols appear in. It defaults to ``added modified copied deleted untracked unmerged``.
 
-See also fish_vcs_prompt, which will call all supported vcs-prompt functions, including git, hg and svn.
+See also :ref:`fish_vcs_prompt <cmd-fish_vcs_prompt>`, which will call all supported version control prompt functions, including git, Mercurial and Subversion.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/fish_svn_prompt.rst b/sphinx_doc_src/cmds/fish_svn_prompt.rst
index f3d450590..f955c0a58 100644
--- a/sphinx_doc_src/cmds/fish_svn_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_svn_prompt.rst
@@ -1,77 +1,60 @@
 .. _cmd-fish_svn_prompt:
 
-fish_svn_prompt - output svn information for use in a prompt
-============================================================
+fish_svn_prompt - output Subversion information for use in a prompt
+===================================================================
 
 Description
 -----------
 
+The fish_svn_prompt function displays information about the current Subversion repository, if any.
 
-The fish_svn_prompt function can be used to display information about the current svn repository, if any.
+`Subversion <https://subversion.apache.org/>`_ (``svn``) must be installed.
 
-For obvious reasons, it requires having svn installed.
+There are numerous customization options, which can be controlled with fish variables.
 
-There are numerous configuration options:
+- ``$__fish_svn_prompt_color_revision``
+    the colour of the revision number to display in the prompt
+- ``$__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_color_revision, the colour of the revision number to display in the prompt
-- $__fish_svn_prompt_char_separator, the separator between status characters
+- ``$__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``
 
-And
-- $__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
-
-to choose the color and symbol for different parts of the prompt.
-
-See also fish_vcs_prompt, which will call all supported vcs-prompt functions, including git, hg and svn.
+See also :ref:`fish_vcs_prompt <cmd-fish_vcs_prompt>`, which will call all supported version control prompt functions, including git, Mercurial and Subversion.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/fish_vcs_prompt.rst b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
index 8ab93d32f..3cca83b35 100644
--- a/sphinx_doc_src/cmds/fish_vcs_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
@@ -1,27 +1,27 @@
 .. _cmd-fish_vcs_prompt:
 
-fish_vcs_prompt - output vcs information for use in a prompt
-============================================================
+fish_vcs_prompt - output version control system information for use in a prompt
+===============================================================================
 
 Description
 -----------
 
-The fish_vcs_prompt function can be used to display information about the current vcs repository, if any.
+The ``fish_vcs_prompt`` function displays information about the current version control system (VCS) repository, if any.
 
-It calls out to vcs-specific functions. The currently supported ones are:
+It calls out to VCS-specific functions. The currently supported systems are:
 
-- fish_git_prompt
-- fish_hg_prompt
-- fish_svn_prompt
+- :ref:`fish_git_prompt <cmd-fish_git_prompt>`
+- :ref:`fish_hg_prompt <cmd-fish_hg_prompt>`
+- :ref:`fish_svn_prompt <cmd-fish_svn_prompt>`
 
-If a vcs isn't installed, the respective function does nothing.
+If a VCS isn't installed, the respective function does nothing.
 
-For more information, see their documentation.
+For more information, see the documentation for each of the functions above.
 
 Example
 -------
 
-A simple prompt that displays vcs info::
+A simple prompt that displays all known VCS info::
 
     function fish_prompt
         ...

From b82fa187eae3db0a6afc387ed7823b09d444fcd9 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 11 Apr 2019 11:55:12 -0500
Subject: [PATCH 0322/1732] Changelog: mention changes to `eval` scoping

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b68a2692..4c7b0f5ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 - cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 - $PATH is no longer reordered in child fishes (#5456).
+- `eval` is now implemented internally rather than being a function; as such, the evaluated code now
+shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
 
 ### Syntax changes and new commands
 - None yet.

From 0cf0829c5f03c88199b57b3832d42509e0ad4067 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 11 Apr 2019 12:57:14 -0500
Subject: [PATCH 0323/1732] Add comment clarifying presence of empty `eval`
 function

---
 share/functions/eval.fish | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/share/functions/eval.fish b/share/functions/eval.fish
index 5798655fc..42013f764 100644
--- a/share/functions/eval.fish
+++ b/share/functions/eval.fish
@@ -1,3 +1,12 @@
-function eval
+# This empty function is required as while `eval` is implemented internally as
+# a decorator, unlike other decorators such as `command` or `builtin`, it is
+# *not* stripped from the statement by the parser before execution to internal
+# quirks in how statements are handled; the presence of this function allows
+# constructs such as command substitution to be used in the head of an
+# evaluated statement.
+#
+# The function defined below is only executed if a bare `eval` is executed (with
+# no arguments), in all other cases it is bypassed entirely.
 
+function eval
 end

From 4539a9db150758ca73b126bbd7f23b22e54e16ef Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 11 Apr 2019 13:01:16 -0500
Subject: [PATCH 0324/1732] Drop unused include in `src/exec.cpp`

It was added in 2544c622841fd8b7317109f12fe4eb55c5ea1d0a,
and caught by @faho.
---
 src/exec.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 3ff9a5d74..6a99cf225 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -6,7 +6,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <numeric>
 #ifdef HAVE_SIGINFO_H
 #include <siginfo.h>
 #endif

From 75db3b4ff488fb14c4fbd5bfccddfd328cd192f1 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 11 Apr 2019 14:28:27 -0700
Subject: [PATCH 0325/1732] fix incorrectly aligned carat in command expansion
 errors and more

- fix the carat position expanding e.g. `command $,`
- improve the error reporting for not-allowed command subtitutions
  by figuring out where the expansion failed instead of using
  SOURCE_LOCATION_UNKNOWN
- allow nullptr for parse_util_licate_brackets_range() out_string
  argument if we don't need it to do any work.

Fixes #5812
---
 src/expand.cpp     | 17 ++++++++++-------
 src/parse_util.cpp |  7 +++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 7d73ff3ca..079f0199f 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -879,13 +879,16 @@ static expand_error_t expand_stage_cmdsubst(wcstring input, std::vector<completi
                                             parse_error_list_t *errors) {
     UNUSED(vars);
     if (EXPAND_SKIP_CMDSUBST & flags) {
-        wchar_t *begin, *end;
-        if (parse_util_locate_cmdsubst(input.c_str(), &begin, &end, true) == 0) {
-            append_completion(out, std::move(input));
-        } else {
-            append_cmdsub_error(errors, SOURCE_LOCATION_UNKNOWN,
-                                L"Command substitutions not allowed");
-            return EXPAND_ERROR;
+        size_t cur = 0, start = 0, end;
+        switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
+            case 0:
+                append_completion(out, std::move(input));
+                break;
+            case 1: /* fallthroughs intentional */
+               append_cmdsub_error(errors, start, L"Command substitutions not allowed");
+            case -1:
+            default:
+                return EXPAND_ERROR;
         }
     } else {
         bool cmdsubst_ok = expand_cmdsubst(std::move(input), out, errors);
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 5d8fe3cc8..2a0054513 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -185,7 +185,7 @@ static int parse_util_locate_brackets_range(const wcstring &str, size_t *inout_c
                                             size_t *out_end, bool accept_incomplete,
                                             wchar_t open_type, wchar_t close_type) {
     // Clear the return values.
-    out_contents->clear();
+    if (out_contents != nullptr) out_contents->clear();
     *out_start = 0;
     *out_end = str.size();
 
@@ -213,7 +213,9 @@ static int parse_util_locate_brackets_range(const wcstring &str, size_t *inout_c
 
     // Assign the substring to the out_contents.
     const wchar_t *interior_begin = bracket_range_begin + 1;
-    out_contents->assign(interior_begin, bracket_range_end - interior_begin);
+    if (out_contents != nullptr) {
+        out_contents->assign(interior_begin, bracket_range_end - interior_begin);
+    }
 
     // Return the start and end.
     *out_start = bracket_range_begin - buff;
@@ -1134,6 +1136,7 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
         if (expand_to_command_and_args(*unexp_command, null_environment_t{}, &command, nullptr,
                                        parse_errors) == EXPAND_ERROR) {
             errored = true;
+            parse_error_offset_source_start(parse_errors, source_start);
         }
 
         // Check that pipes are sound.

From 1834e962d2e6cc83cc9294562cbf0b29b907787f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 11 Apr 2019 17:18:53 -0700
Subject: [PATCH 0326/1732] Correct carat position for unexpected } in brace
 expansion

before:

$ echo {}}-
fish: Unexpected '}' for unopened brace expansion

$ ./fish -c 'echo {}}}}'
fish: Unexpected '}' for unopened brace expansion
echo {}}}}
^

now:
$ echo {}}}}}}1-
fish: Unexpected '}' for unopened brace expansion
echo {}}}}}}
       ^
---
 src/tokenizer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index ef55b7877..883a04afc 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -196,8 +196,8 @@ tok_t tokenizer_t::read_string() {
             }
             switch (brace_offsets.size()) {
                 case 0:
-                    return this->call_error(tokenizer_error_t::closing_unopened_brace, this->start,
-                                            this->buff);
+                    return this->call_error(tokenizer_error_t::closing_unopened_brace, this->buff,
+                                            this->start + wcslen(this->start));
                 case 1:
                     mode &= ~(tok_modes::curly_braces);
                 default:

From 014ab7935e9baac6fed17b03a9cb2f833646851b Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 11 Apr 2019 21:59:23 -0700
Subject: [PATCH 0327/1732] Test expansion syntax errors.

If there is a better way to do stuff that will stop execution than
fish -c for our tests, please let me know.
---
 tests/expansion.err | 14 ++++++++++++++
 tests/expansion.in  |  6 ++++++
 tests/expansion.out |  3 +++
 3 files changed, 23 insertions(+)

diff --git a/tests/expansion.err b/tests/expansion.err
index 753d83cf8..d898fab04 100644
--- a/tests/expansion.err
+++ b/tests/expansion.err
@@ -25,3 +25,17 @@ echo $$paren
 
 ####################
 # Test path variables
+
+####################
+# Test fatal syntax errors
+fish: $, is not a valid variable in fish.
+echo $,foo
+      ^
+fish: Unexpected end of string, incomplete parameter expansion
+echo {
+     ^
+
+fish: Unexpected '}' for unopened brace expansion
+echo {}}
+       ^
+
diff --git a/tests/expansion.in b/tests/expansion.in
index 830a1197e..dc7bf48ef 100644
--- a/tests/expansion.in
+++ b/tests/expansion.in
@@ -148,3 +148,9 @@ set testvar "$testvar:FOUR"
 echo "Appended path: $testvar" (count $testvar)
 set --unpath testvar $testvar
 echo "Back to normal variable: $testvar" (count $testvar)
+
+logmsg Test fatal syntax errors
+../test/root/bin/fish -c 'echo $,foo'
+../test/root/bin/fish -c 'echo {'
+../test/root/bin/fish -c 'echo {}}'
+true
\ No newline at end of file
diff --git a/tests/expansion.out b/tests/expansion.out
index d46187a22..6feca2540 100644
--- a/tests/expansion.out
+++ b/tests/expansion.out
@@ -87,3 +87,6 @@ Not a path: ONE:TWO:THREE 1
 As a path: ONE:TWO:THREE 3
 Appended path: ONE:TWO:THREE:FOUR 4
 Back to normal variable: ONE TWO THREE FOUR 4
+
+####################
+# Test fatal syntax errors

From b0388ed48862c188f5f712af8b6edc14d182f0eb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 12 Apr 2019 08:45:49 +0200
Subject: [PATCH 0328/1732] docs: Workaround bug with python2-sphinx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It can't handle a `→` literal inside code blocks. Since we only have
two of those, let's just replace them with `=>`.

Fixes #5808.
---
 sphinx_doc_src/tutorial.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index fe1137ebc..52d8282d4 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -172,7 +172,7 @@ Tab Completions
 
 Press :kbd:`Tab`, and ``fish`` will attempt to complete the command, argument, or path::
 
-    >_ <eror>/pri</eror> :kbd:`Tab` → /private/
+    >_ <eror>/pri</eror> :kbd:`Tab` => /private/
 
 
 If there's more than one possibility, it will list them::
@@ -185,7 +185,7 @@ Hit tab again to cycle through the possibilities.
 
 ``fish`` can also complete many commands, like git branches::
 
-    >_ git merge pr :kbd:`Tab` → git merge prompt_designer
+    >_ git merge pr :kbd:`Tab` => git merge prompt_designer
     >_ git checkout b :kbd:`Tab`
     <outp><mtch>b</outp>uiltin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
 

From e672b0399331197307b58dbe21da722a350a95fc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 12 Apr 2019 09:00:42 +0200
Subject: [PATCH 0329/1732] functions/fish_hg_prompt: Remove --color and
 --pager

These weren't added long enough ago, and I only added them
speculatively.

So it should make it work with old hg versions.

CC @zanchey.

[ci skip]
---
 share/functions/fish_hg_prompt.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_hg_prompt.fish b/share/functions/fish_hg_prompt.fish
index 93c4d102b..3ec08cf6e 100644
--- a/share/functions/fish_hg_prompt.fish
+++ b/share/functions/fish_hg_prompt.fish
@@ -39,7 +39,7 @@ function fish_hg_prompt --description 'Write out the hg prompt'
     echo -n '|'
 
     # Disabling color and pager is always a good idea.
-    set -l repo_status (hg status --color never --pager never | string sub -l 2 | sort -u)
+    set -l repo_status (hg status | string sub -l 2 | sort -u)
 
     # Show nice color for a clean repo
     if test -z "$repo_status"

From 9cf1b18b268db9c85bd52f9efb9615fb6d3fe4a7 Mon Sep 17 00:00:00 2001
From: Geographer <geographer@live.fr>
Date: Fri, 12 Apr 2019 09:43:34 +0200
Subject: [PATCH 0330/1732] Honor dirprev scope (#5796)

* Honour `dirprev` scope

Honour the scope of the `dirprev` variable if it is universal
and avoid to shadow it with a global. This enables to share
the `cd` history between sessions.

* Honor dirnext and __fish_cd_direction scope

If these variables exist in the universal scope, do not shadow them
---
 share/functions/cd.fish | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/share/functions/cd.fish b/share/functions/cd.fish
index eed8a9f94..74ef09d41 100644
--- a/share/functions/cd.fish
+++ b/share/functions/cd.fish
@@ -41,9 +41,21 @@ function cd --description "Change directory"
         or set -l dirprev
         set -q dirprev[$MAX_DIR_HIST]
         and set -e dirprev[1]
-        set -g -a dirprev $previous
-        set -e dirnext
-        set -g __fish_cd_direction prev
+
+        # If dirprev, dirnext, __fish_cd_direction
+        # are set as universal variables, honour their scope.
+
+        set -U -q dirprev
+        and set -U -a dirprev $previous
+        or set -g -a dirprev $previous
+
+        set -U -q dirnext
+        and set -U -e dirnext
+        or set -e dirnext
+
+        set -U -q __fish_cd_direction
+        and set -U __fish_cd_direction prev
+        or set -g __fish_cd_direction prev
     end
 
     return $cd_status

From e0e0fe9dd3603e5788ee6933c8569bd9f34d11be Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 12 Apr 2019 06:53:08 -0500
Subject: [PATCH 0331/1732] Re-implement `eval` as a regular builtin

I did not realize builtins could safely call into the parser and inject
jobs during execution. This is much cleaner than hacking around the
required shape of a plain_statement.
---
 CMakeLists.txt            |  2 +-
 share/functions/eval.fish | 12 -----------
 src/builtin.cpp           |  2 ++
 src/builtin_eval.cpp      | 45 +++++++++++++++++++++++++++++++++++++++
 src/builtin_eval.h        |  9 ++++++++
 src/complete.cpp          |  8 -------
 src/exec.cpp              | 23 --------------------
 src/parse_constants.h     |  3 ---
 src/parse_execution.cpp   |  3 ---
 src/parse_grammar.h       | 11 +---------
 src/parse_productions.cpp |  4 ----
 src/proc.h                |  2 --
 12 files changed, 58 insertions(+), 66 deletions(-)
 delete mode 100644 share/functions/eval.fish
 create mode 100644 src/builtin_eval.cpp
 create mode 100644 src/builtin_eval.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99c24f516..0179915f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ SET(FISH_SRCS
     src/builtin_random.cpp src/builtin_read.cpp src/builtin_realpath.cpp
     src/builtin_return.cpp src/builtin_set.cpp src/builtin_set_color.cpp
     src/builtin_source.cpp src/builtin_status.cpp src/builtin_string.cpp
-    src/builtin_test.cpp src/builtin_ulimit.cpp src/builtin_wait.cpp
+    src/builtin_test.cpp src/builtin_ulimit.cpp src/builtin_wait.cpp src/builtin_eval.cpp
     src/color.cpp src/common.cpp src/complete.cpp src/env.cpp src/env_dispatch.cpp
     src/env_universal_common.cpp src/event.cpp src/exec.cpp src/expand.cpp
     src/fallback.cpp src/fish_version.cpp src/function.cpp src/highlight.cpp
diff --git a/share/functions/eval.fish b/share/functions/eval.fish
deleted file mode 100644
index 42013f764..000000000
--- a/share/functions/eval.fish
+++ /dev/null
@@ -1,12 +0,0 @@
-# This empty function is required as while `eval` is implemented internally as
-# a decorator, unlike other decorators such as `command` or `builtin`, it is
-# *not* stripped from the statement by the parser before execution to internal
-# quirks in how statements are handled; the presence of this function allows
-# constructs such as command substitution to be used in the head of an
-# evaluated statement.
-#
-# The function defined below is only executed if a bare `eval` is executed (with
-# no arguments), in all other cases it is bypassed entirely.
-
-function eval
-end
diff --git a/src/builtin.cpp b/src/builtin.cpp
index d2b545536..4179e0f63 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -41,6 +41,7 @@
 #include "builtin_disown.h"
 #include "builtin_echo.h"
 #include "builtin_emit.h"
+#include "builtin_eval.h"
 #include "builtin_exit.h"
 #include "builtin_fg.h"
 #include "builtin_functions.h"
@@ -381,6 +382,7 @@ static const builtin_data_t builtin_datas[] = {
     {L"else", &builtin_generic, N_(L"Evaluate block if condition is false")},
     {L"emit", &builtin_emit, N_(L"Emit an event")},
     {L"end", &builtin_generic, N_(L"End a block of commands")},
+    {L"eval", &builtin_eval, N_(L"Evaluate a string as a statement")},
     {L"exec", &builtin_generic, N_(L"Run command in current process")},
     {L"exit", &builtin_exit, N_(L"Exit the shell")},
     {L"false", &builtin_false, N_(L"Return an unsuccessful result")},
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
new file mode 100644
index 000000000..7beb1e9a8
--- /dev/null
+++ b/src/builtin_eval.cpp
@@ -0,0 +1,45 @@
+// Functions for executing the jobs builtin.
+#include "config.h"  // IWYU pragma: keep
+
+#include <errno.h>
+#include <stddef.h>
+#ifdef HAVE__PROC_SELF_STAT
+#include <sys/time.h>
+#endif
+
+#include "builtin.h"
+#include "common.h"
+#include "fallback.h"  // IWYU pragma: keep
+#include "io.h"
+#include "parser.h"
+#include "proc.h"
+#include "wgetopt.h"
+#include "wutil.h"  // IWYU pragma: keep
+
+class parser_t;
+
+/// The jobs builtin. Used for printing running jobs. Defined in builtin_jobs.c.
+int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
+    wchar_t *cmd = argv[0];
+    int argc = builtin_count_args(argv);
+
+    wcstring new_cmd;
+    for (size_t i = 1; i < argc; ++i) {
+        new_cmd += L' ';
+        new_cmd += argv[i];
+    }
+
+    // debug(1, "new_cmd: %ls", new_cmd.c_str());
+
+    auto status = proc_get_last_status();
+    if (argc > 1) {
+        if (parser.eval(new_cmd.c_str(), *streams.io_chain, block_type_t::TOP) != 0) {
+            return STATUS_CMD_ERROR;
+        }
+        status = proc_get_last_status();
+    } else {
+        status = STATUS_CMD_OK;
+    }
+
+    return status;
+}
diff --git a/src/builtin_eval.h b/src/builtin_eval.h
new file mode 100644
index 000000000..6cceaacc3
--- /dev/null
+++ b/src/builtin_eval.h
@@ -0,0 +1,9 @@
+// Prototypes for executing builtin_eval function.
+#ifndef FISH_BUILTIN_EVAL_H
+#define FISH_BUILTIN_EVAL_H
+
+class parser_t;
+struct io_streams_t;
+
+int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv);
+#endif
diff --git a/src/complete.cpp b/src/complete.cpp
index ddec89ca2..d4091855d 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1465,14 +1465,6 @@ void completer_t::perform() {
                 use_abbr = false;
                 break;
             }
-            case parse_statement_decoration_eval: {
-                use_command = true;
-                use_function = true;
-                use_builtin = true;
-                use_implicit_cd = true;
-                use_abbr = true;
-                break;
-            }
         }
 
         if (cmd_node.location_in_or_at_end_of_source_range(pos)) {
diff --git a/src/exec.cpp b/src/exec.cpp
index 6a99cf225..4e01dbca3 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -982,29 +982,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
                 "Aborting.");
             break;
         }
-
-        case process_type_t::eval: {
-            // int eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
-            bool has_args = false;
-            wcstring new_cmd;
-            for (const wchar_t * const* arg = p->get_argv() + 1; *arg != nullptr; ++arg) {
-                has_args = true;
-                new_cmd += L' ';
-                new_cmd += *arg;
-            }
-
-            // `eval` is not supposed to error or do anything at all if no arguments are provided,
-            // or if it is used to execute a function that wouldn't have changed the status code
-            // (e.g. an empty function) if it were executed normally.
-            j->processes[0]->completed = true;
-            p->status = proc_status_t::from_exit_code(cached_status);
-
-            if (has_args) {
-                parser.eval(new_cmd.c_str(), process_net_io_chain, block_type_t::TOP);
-                p->status = proc_status_t::from_exit_code(proc_get_last_status());
-            }
-            break;
-        }
     }
     return true;
 }
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 2f86f05fd..2879bc251 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -104,7 +104,6 @@ enum parse_keyword_t {
     parse_keyword_command,
     parse_keyword_else,
     parse_keyword_end,
-    parse_keyword_eval,
     parse_keyword_exclam,
     parse_keyword_exec,
     parse_keyword_for,
@@ -126,7 +125,6 @@ const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!
                                                       {parse_keyword_command, L"command"},
                                                       {parse_keyword_else, L"else"},
                                                       {parse_keyword_end, L"end"},
-                                                      {parse_keyword_eval, L"eval"},
                                                       {parse_keyword_exec, L"exec"},
                                                       {parse_keyword_for, L"for"},
                                                       {parse_keyword_function, L"function"},
@@ -147,7 +145,6 @@ enum parse_statement_decoration_t {
     parse_statement_decoration_command,
     parse_statement_decoration_builtin,
     parse_statement_decoration_exec,
-    parse_statement_decoration_eval,
 };
 
 // Boolean statement types, stored in node tag.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 51bf0f3cf..694c50fb3 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -161,9 +161,6 @@ process_type_t parse_execution_context_t::process_type_for_command(
         case parse_statement_decoration_builtin:
             process_type = process_type_t::builtin;
             break;
-        case parse_statement_decoration_eval:
-            process_type = process_type_t::eval;
-            break;
         case parse_statement_decoration_none:
             if (function_exists(cmd)) {
                 process_type = process_type_t::function;
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index 5a3c5f0ce..b6b1cb2ee 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -334,16 +334,7 @@ DEF_ALT(decorated_statement) {
     using cmds = seq<keyword<parse_keyword_command>, plain_statement>;
     using builtins = seq<keyword<parse_keyword_builtin>, plain_statement>;
     using execs = seq<keyword<parse_keyword_exec>, plain_statement>;
-    // Ideally, `evals` should be defined as `seq<keyword<parse_keyword_eval>,
-    // arguments_or_redirections_list`, but other parts of the code have the logic hard coded to
-    // search for a process at the head of a statement, and bug out if we do that.
-    // We also can't define `evals` as a `seq<keyword<parse_keyword_eval>, plain_statement>` because
-    // `expand.cpp` hard-codes its "command substitution at the head of a statement is not allowed"
-    // check without any way of telling it to perform the substitution anyway. Our solution is to
-    // create an empty function called `eval` that never actually gets executed and convert a
-    // decorated statement `eval ...` into a plain statement `eval ...`
-    using evals = seq<plain_statement>;
-    ALT_BODY(decorated_statement, plains, cmds, builtins, execs, evals);
+    ALT_BODY(decorated_statement, plains, cmds, builtins, execs);
 };
 
 DEF(plain_statement)
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 2e60f3b46..4718d826a 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -314,10 +314,6 @@ RESOLVE(decorated_statement) {
             *out_tag = parse_statement_decoration_exec;
             return production_for<execs>();
         }
-        case parse_keyword_eval: {
-            *out_tag = parse_statement_decoration_eval;
-            return production_for<evals>();
-        }
         default: {
             *out_tag = parse_statement_decoration_none;
             return production_for<plains>();
diff --git a/src/proc.h b/src/proc.h
index abca58465..c39e1a123 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -36,8 +36,6 @@ enum class process_type_t {
     block_node,
     /// The exec builtin.
     exec,
-    /// A literal evaluation
-    eval,
 };
 
 enum class job_control_t {

From a8030c020bf4784034536bf3615396220f94f2bf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 12 Apr 2019 15:38:38 +0200
Subject: [PATCH 0332/1732] src/fish_indent.cpp: Fix return-value warning

---
 src/fish_indent.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index be3781fd6..4150a7b0c 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -275,6 +275,8 @@ static const char *highlight_role_to_string(highlight_role_t role) {
         TEST_ROLE(pager_selected_prefix)
         TEST_ROLE(pager_selected_completion)
         TEST_ROLE(pager_selected_description)
+        default:
+            DIE("UNKNOWN ROLE");
     }
 #undef TEST_ROLE
 }

From 2ca1bc433f4a8e5c922f2b0e5658fda7f738e746 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 12 Apr 2019 23:07:41 +0800
Subject: [PATCH 0333/1732] fish_indent_lexer: explicitly encode/decode bytes
 over pipe

Universal newlines behaves differently between Python 2.7 and 3.x,
leading to problems when running Sphinx with Python 2.7.

fish_indent always uses \n, so there's no need to use universal newline
detection.

This also allows full UTF-8 in documentation sources.

Closes #5808.
---
 sphinx_doc_src/fish_indent_lexer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/fish_indent_lexer.py b/sphinx_doc_src/fish_indent_lexer.py
index c3414f2c2..f704e5691 100644
--- a/sphinx_doc_src/fish_indent_lexer.py
+++ b/sphinx_doc_src/fish_indent_lexer.py
@@ -89,11 +89,11 @@ def tokenize_fish_command(code, offset):
         ["fish_indent", "--pygments"],
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
-        universal_newlines=True,
+        universal_newlines=False,
     )
-    stdout, _ = proc.communicate(code)
+    stdout, _ = proc.communicate(code.encode('utf-8'))
     result = []
-    for line in stdout.splitlines():
+    for line in stdout.decode('utf-8').splitlines():
         start, end, role = line.split(",")
         start, end = int(start), int(end)
         value = code[start:end]

From 5989a92dae3dcbed3f868345811ab178f04bf3c8 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 12 Apr 2019 15:15:08 -0500
Subject: [PATCH 0334/1732] Add completions for `rg` (ripgrep)

[ci skip]
---
 share/completions/rg.fish | 117 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 share/completions/rg.fish

diff --git a/share/completions/rg.fish b/share/completions/rg.fish
new file mode 100644
index 000000000..1077752e2
--- /dev/null
+++ b/share/completions/rg.fish
@@ -0,0 +1,117 @@
+# The following ripgrep (rg) completions were generated from the rg sources via
+# clap's completion file generator, from the MIT-licensed ripgrep 0.10.0 release.
+# To avoid licensing confusion, this file is released under the MIT license.
+
+complete -c rg -n "__fish_use_subcommand" -s A -l after-context -d 'Show NUM lines after each match.'
+complete -c rg -n "__fish_use_subcommand" -s B -l before-context -d 'Show NUM lines before each match.'
+complete -c rg -n "__fish_use_subcommand" -l color -d 'Controls when to use color.' -r -f -a "never auto always ansi"
+complete -c rg -n "__fish_use_subcommand" -l colors -d 'Configure color settings and styles.'
+complete -c rg -n "__fish_use_subcommand" -s C -l context -d 'Show NUM lines before and after each match.'
+complete -c rg -n "__fish_use_subcommand" -l context-separator -d 'Set the context separator string.'
+complete -c rg -n "__fish_use_subcommand" -l dfa-size-limit -d 'The upper size limit of the regex DFA.'
+complete -c rg -n "__fish_use_subcommand" -s E -l encoding -d 'Specify the text encoding of files to search.'
+complete -c rg -n "__fish_use_subcommand" -s f -l file -d 'Search for patterns from the given file.'
+complete -c rg -n "__fish_use_subcommand" -s g -l glob -d 'Include or exclude files.'
+complete -c rg -n "__fish_use_subcommand" -l iglob -d 'Include or exclude files case insensitively.'
+complete -c rg -n "__fish_use_subcommand" -l ignore-file -d 'Specify additional ignore files.'
+complete -c rg -n "__fish_use_subcommand" -s M -l max-columns -d 'Don\'t print lines longer than this limit.'
+complete -c rg -n "__fish_use_subcommand" -s m -l max-count -d 'Limit the number of matches.'
+complete -c rg -n "__fish_use_subcommand" -l max-depth -d 'Descend at most NUM directories.'
+complete -c rg -n "__fish_use_subcommand" -l max-filesize -d 'Ignore files larger than NUM in size.'
+complete -c rg -n "__fish_use_subcommand" -l path-separator -d 'Set the path separator.'
+complete -c rg -n "__fish_use_subcommand" -l pre -d 'search outputs of COMMAND FILE for each FILE'
+complete -c rg -n "__fish_use_subcommand" -l pre-glob -d 'Include or exclude files from a preprocessing command.'
+complete -c rg -n "__fish_use_subcommand" -l regex-size-limit -d 'The upper size limit of the compiled regex.'
+complete -c rg -n "__fish_use_subcommand" -s e -l regexp -d 'A pattern to search for.'
+complete -c rg -n "__fish_use_subcommand" -s r -l replace -d 'Replace matches with the given text.'
+complete -c rg -n "__fish_use_subcommand" -l sort -d 'Sort results in ascending order. Implies --threads=1.' -r -f -a "path modified accessed created none"
+complete -c rg -n "__fish_use_subcommand" -l sortr -d 'Sort results in descending order. Implies --threads=1.' -r -f -a "path modified accessed created none"
+complete -c rg -n "__fish_use_subcommand" -s j -l threads -d 'The approximate number of threads to use.'
+complete -c rg -n "__fish_use_subcommand" -s t -l type -d 'Only search files matching TYPE.'
+complete -c rg -n "__fish_use_subcommand" -l type-add -d 'Add a new glob for a file type.'
+complete -c rg -n "__fish_use_subcommand" -l type-clear -d 'Clear globs for a file type.'
+complete -c rg -n "__fish_use_subcommand" -s T -l type-not -d 'Do not search files matching TYPE.'
+complete -c rg -n "__fish_use_subcommand" -l block-buffered -d 'Force block buffering.'
+complete -c rg -n "__fish_use_subcommand" -l no-block-buffered
+complete -c rg -n "__fish_use_subcommand" -s b -l byte-offset -d 'Print the 0-based byte offset for each matching line.'
+complete -c rg -n "__fish_use_subcommand" -s s -l case-sensitive -d 'Search case sensitively (default).'
+complete -c rg -n "__fish_use_subcommand" -l column -d 'Show column numbers.'
+complete -c rg -n "__fish_use_subcommand" -l no-column
+complete -c rg -n "__fish_use_subcommand" -s c -l count -d 'Only show the count of matching lines for each file.'
+complete -c rg -n "__fish_use_subcommand" -l count-matches -d 'Only show the count of individual matches for each file.'
+complete -c rg -n "__fish_use_subcommand" -l crlf -d 'Support CRLF line terminators (useful on Windows).'
+complete -c rg -n "__fish_use_subcommand" -l no-crlf
+complete -c rg -n "__fish_use_subcommand" -l debug -d 'Show debug messages.'
+complete -c rg -n "__fish_use_subcommand" -l trace
+complete -c rg -n "__fish_use_subcommand" -l no-encoding
+complete -c rg -n "__fish_use_subcommand" -l files -d 'Print each file that would be searched.'
+complete -c rg -n "__fish_use_subcommand" -s l -l files-with-matches -d 'Only print the paths with at least one match.'
+complete -c rg -n "__fish_use_subcommand" -l files-without-match -d 'Only print the paths that contain zero matches.'
+complete -c rg -n "__fish_use_subcommand" -s F -l fixed-strings -d 'Treat the pattern as a literal string.'
+complete -c rg -n "__fish_use_subcommand" -l no-fixed-strings
+complete -c rg -n "__fish_use_subcommand" -s L -l follow -d 'Follow symbolic links.'
+complete -c rg -n "__fish_use_subcommand" -l no-follow
+complete -c rg -n "__fish_use_subcommand" -l heading -d 'Print matches grouped by each file.'
+complete -c rg -n "__fish_use_subcommand" -l no-heading -d 'Don\'t group matches by each file.'
+complete -c rg -n "__fish_use_subcommand" -l hidden -d 'Search hidden files and directories.'
+complete -c rg -n "__fish_use_subcommand" -l no-hidden
+complete -c rg -n "__fish_use_subcommand" -s i -l ignore-case -d 'Case insensitive search.'
+complete -c rg -n "__fish_use_subcommand" -s v -l invert-match -d 'Invert matching.'
+complete -c rg -n "__fish_use_subcommand" -l json -d 'Show search results in a JSON Lines format.'
+complete -c rg -n "__fish_use_subcommand" -l no-json
+complete -c rg -n "__fish_use_subcommand" -l line-buffered -d 'Force line buffering.'
+complete -c rg -n "__fish_use_subcommand" -l no-line-buffered
+complete -c rg -n "__fish_use_subcommand" -s n -l line-number -d 'Show line numbers.'
+complete -c rg -n "__fish_use_subcommand" -s N -l no-line-number -d 'Suppress line numbers.'
+complete -c rg -n "__fish_use_subcommand" -s x -l line-regexp -d 'Only show matches surrounded by line boundaries.'
+complete -c rg -n "__fish_use_subcommand" -l mmap -d 'Search using memory maps when possible.'
+complete -c rg -n "__fish_use_subcommand" -l no-mmap -d 'Never use memory maps.'
+complete -c rg -n "__fish_use_subcommand" -s U -l multiline -d 'Enable matching across multiple lines.'
+complete -c rg -n "__fish_use_subcommand" -l no-multiline
+complete -c rg -n "__fish_use_subcommand" -l multiline-dotall -d 'Make \'.\' match new lines when multiline is enabled.'
+complete -c rg -n "__fish_use_subcommand" -l no-multiline-dotall
+complete -c rg -n "__fish_use_subcommand" -l no-config -d 'Never read configuration files.'
+complete -c rg -n "__fish_use_subcommand" -l no-ignore -d 'Don\'t respect ignore files.'
+complete -c rg -n "__fish_use_subcommand" -l ignore
+complete -c rg -n "__fish_use_subcommand" -l no-ignore-global -d 'Don\'t respect global ignore files.'
+complete -c rg -n "__fish_use_subcommand" -l ignore-global
+complete -c rg -n "__fish_use_subcommand" -l no-ignore-messages -d 'Suppress gitignore parse error messages.'
+complete -c rg -n "__fish_use_subcommand" -l ignore-messages
+complete -c rg -n "__fish_use_subcommand" -l no-ignore-parent -d 'Don\'t respect ignore files in parent directories.'
+complete -c rg -n "__fish_use_subcommand" -l ignore-parent
+complete -c rg -n "__fish_use_subcommand" -l no-ignore-vcs -d 'Don\'t respect VCS ignore files.'
+complete -c rg -n "__fish_use_subcommand" -l ignore-vcs
+complete -c rg -n "__fish_use_subcommand" -l no-messages -d 'Suppress some error messages.'
+complete -c rg -n "__fish_use_subcommand" -l messages
+complete -c rg -n "__fish_use_subcommand" -l no-pcre2-unicode -d 'Disable Unicode mode for PCRE2 matching.'
+complete -c rg -n "__fish_use_subcommand" -l pcre2-unicode
+complete -c rg -n "__fish_use_subcommand" -s 0 -l null -d 'Print a NUL byte after file paths.'
+complete -c rg -n "__fish_use_subcommand" -l null-data -d 'Use NUL as a line terminator instead of \\n.'
+complete -c rg -n "__fish_use_subcommand" -l one-file-system -d 'Do not descend into directories on other file systems.'
+complete -c rg -n "__fish_use_subcommand" -l no-one-file-system
+complete -c rg -n "__fish_use_subcommand" -s o -l only-matching -d 'Print only matches parts of a line.'
+complete -c rg -n "__fish_use_subcommand" -l passthru -d 'Print both matching and non-matching lines.'
+complete -c rg -n "__fish_use_subcommand" -s P -l pcre2 -d 'Enable PCRE2 matching.'
+complete -c rg -n "__fish_use_subcommand" -l no-pcre2
+complete -c rg -n "__fish_use_subcommand" -l no-pre
+complete -c rg -n "__fish_use_subcommand" -s p -l pretty -d 'Alias for --color always --heading --line-number.'
+complete -c rg -n "__fish_use_subcommand" -s q -l quiet -d 'Do not print anything to stdout.'
+complete -c rg -n "__fish_use_subcommand" -s z -l search-zip -d 'Search in compressed files.'
+complete -c rg -n "__fish_use_subcommand" -l no-search-zip
+complete -c rg -n "__fish_use_subcommand" -s S -l smart-case -d 'Smart case search.'
+complete -c rg -n "__fish_use_subcommand" -l sort-files -d 'DEPRECATED'
+complete -c rg -n "__fish_use_subcommand" -l no-sort-files
+complete -c rg -n "__fish_use_subcommand" -l stats -d 'Print statistics about this ripgrep search.'
+complete -c rg -n "__fish_use_subcommand" -l no-stats
+complete -c rg -n "__fish_use_subcommand" -s a -l text -d 'Search binary files as if they were text.'
+complete -c rg -n "__fish_use_subcommand" -l no-text
+complete -c rg -n "__fish_use_subcommand" -l trim -d 'Trim prefixed whitespace from matches.'
+complete -c rg -n "__fish_use_subcommand" -l no-trim
+complete -c rg -n "__fish_use_subcommand" -l type-list -d 'Show all supported file types.'
+complete -c rg -n "__fish_use_subcommand" -s u -l unrestricted -d 'Reduce the level of "smart" searching.'
+complete -c rg -n "__fish_use_subcommand" -l vimgrep -d 'Show results in vim compatible format.'
+complete -c rg -n "__fish_use_subcommand" -s H -l with-filename -d 'Print the file path with the matched lines.'
+complete -c rg -n "__fish_use_subcommand" -l no-filename -d 'Never print the file path with the matched lines.'
+complete -c rg -n "__fish_use_subcommand" -s w -l word-regexp -d 'Only show matches surrounded by word boundaries.'
+complete -c rg -n "__fish_use_subcommand" -s h -l help -d 'Prints help information. Use --help for more details.'
+complete -c rg -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'

From c95e1b83c7ffcccc92a8a27502365aec7cfab951 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 12 Apr 2019 22:42:27 -0700
Subject: [PATCH 0335/1732] Minor cleanup of eval builtin

Fix some copy and paste errors, remove some dead variables and code,
make the return a bit more structured.
---
 src/builtin_eval.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 7beb1e9a8..b34516f5d 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -1,4 +1,4 @@
-// Functions for executing the jobs builtin.
+// Functions for executing the eval builtin.
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
@@ -18,28 +18,26 @@
 
 class parser_t;
 
-/// The jobs builtin. Used for printing running jobs. Defined in builtin_jobs.c.
+/// Implementation of eval builtin.
 int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
-    wchar_t *cmd = argv[0];
     int argc = builtin_count_args(argv);
 
     wcstring new_cmd;
     for (size_t i = 1; i < argc; ++i) {
-        new_cmd += L' ';
+        if (i > 1) new_cmd += L' ';
         new_cmd += argv[i];
     }
 
     // debug(1, "new_cmd: %ls", new_cmd.c_str());
 
-    auto status = proc_get_last_status();
+    int status = STATUS_CMD_OK;
     if (argc > 1) {
         if (parser.eval(new_cmd.c_str(), *streams.io_chain, block_type_t::TOP) != 0) {
-            return STATUS_CMD_ERROR;
+            // This indicates a parse error; nothing actually got executed.
+            status = STATUS_CMD_ERROR;
+        } else {
+            status = proc_get_last_status();
         }
-        status = proc_get_last_status();
-    } else {
-        status = STATUS_CMD_OK;
     }
-
     return status;
 }

From 4e1fdaf5a7688d6e617c990eccba88732b54a96f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 12 Apr 2019 23:02:45 -0700
Subject: [PATCH 0336/1732] Use move semantics in builtin_eval

Saves some allocations
---
 src/builtin_eval.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index b34516f5d..680edc83c 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -32,7 +32,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(new_cmd.c_str(), *streams.io_chain, block_type_t::TOP) != 0) {
+        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) != 0) {
             // This indicates a parse error; nothing actually got executed.
             status = STATUS_CMD_ERROR;
         } else {

From 47b99071133e35e05c163c7a24e6dcc27866ace5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 12 Apr 2019 23:03:28 -0700
Subject: [PATCH 0337/1732] Remove an unused variable

---
 src/exec.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 4e01dbca3..70f50c0f2 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -903,8 +903,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     // The IO chain for this process.
     io_chain_t process_net_io_chain = j->block_io_chain();
-    auto cached_status = proc_get_last_status();
-
     if (pipes.write.valid()) {
         process_net_io_chain.push_back(std::make_shared<io_pipe_t>(
             p->pipe_write_fd, false /* not input */, std::move(pipes.write)));

From 56125f73e4e53b2fe2f0f3b7754e6603076b2c93 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 13 Apr 2019 21:58:02 +0800
Subject: [PATCH 0338/1732] env: trigger locale updates if LOCPATH changes

Closes #5815.
---
 CHANGELOG.md         | 1 +
 src/env_dispatch.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c7b0f5ef..5db50f8f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ shares the same argument scope as `eval` rather than being executed in a new sco
 - The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
 - Fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), hopefully making setting $fish_emoji_width superfluous in most cases (#5722).
+- The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - Lots of improvements to completions.
 - Added completions for
   - `cf`
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index ff0e6ff93..bc1bd4576 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -76,7 +76,7 @@ static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL",
                                                L"LC_COLLATE", L"LC_CTYPE", L"LC_IDENTIFICATION",
                                                L"LC_MEASUREMENT", L"LC_MESSAGES", L"LC_MONETARY",
                                                L"LC_NAME", L"LC_NUMERIC", L"LC_PAPER",
-                                               L"LC_TELEPHONE", L"LC_TIME"});
+                                               L"LC_TELEPHONE", L"LC_TIME", L"LOCPATH"});
 
 /// List of all curses environment variable names that might trigger (re)initializing the curses
 /// subsystem.

From cdce8511a14e0a84f3796cce6889c3ce005d40b1 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 11:26:10 -0500
Subject: [PATCH 0339/1732] Optimize function calls by reducing inherit vars
 heap allocations and copies

* Convert `function_get_inherit_vars()` to return a reference to the
  (possibly) existing map, rather than a copy;
* Preallocate and reuse a static (read-only) map for the (very) common
  case of no inherited vars;
* Pass references to the inherit vars map around thereafter, never
  triggering the map copy (or even move) constructor.

NB: If it turns out the reference is unsafe, we can switch the inherit vars
to be a shared_ptr and return that instead.
---
 src/builtin_functions.cpp | 2 +-
 src/exec.cpp              | 2 +-
 src/function.cpp          | 6 ++++--
 src/function.h            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 91b334e6e..8ae6b8880 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -199,7 +199,7 @@ static wcstring functions_def(const wcstring &name) {
     }
 
     // Output any inherited variables as `set -l` lines.
-    std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(name);
+    const std::map<wcstring, env_var_t> &inherit_vars = function_get_inherit_vars(name);
     for (const auto &kv : inherit_vars) {
         wcstring_list_t lst;
         kv.second.to_list(lst);
diff --git a/src/exec.cpp b/src/exec.cpp
index 70f50c0f2..da1b5aa44 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -813,7 +813,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
             return false;
         }
 
-        const std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
+        const std::map<wcstring, env_var_t> &inherit_vars = function_get_inherit_vars(func_name);
 
         function_block_t *fb =
             parser.push_block<function_block_t>(p, func_name, props->shadow_scope);
diff --git a/src/function.cpp b/src/function.cpp
index 1f43efd54..6fb2041c5 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -257,10 +257,12 @@ bool function_get_definition(const wcstring &name, wcstring &out_definition) {
     return func != NULL;
 }
 
-std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name) {
+const std::map<wcstring, env_var_t> &function_get_inherit_vars(const wcstring &name) {
+    static const std::map<wcstring, env_var_t> empty_inherit_vars;
+
     scoped_rlock locker(functions_lock);
     const function_info_t *func = function_get(name);
-    return func ? func->inherit_vars : std::map<wcstring, env_var_t>();
+    return func ? func->inherit_vars : empty_inherit_vars;
 }
 
 bool function_get_desc(const wcstring &name, wcstring &out_desc) {
diff --git a/src/function.h b/src/function.h
index fc6529e72..5440a8bcf 100644
--- a/src/function.h
+++ b/src/function.h
@@ -102,7 +102,7 @@ int function_get_definition_lineno(const wcstring &name);
 
 /// Returns a mapping of all variables of the specified function that were inherited from the scope
 /// of the function definition to their values.
-std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name);
+const std::map<wcstring, env_var_t> &function_get_inherit_vars(const wcstring &name);
 
 /// Creates a new function using the same definition as the specified function. Returns true if copy
 /// is successful.

From 13c5f93d632052f17efc19d98a84c20b502edb27 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 11:58:18 -0700
Subject: [PATCH 0340/1732] Revert "Optimize function calls by reducing inherit
 vars heap allocations and copies"

This reverts commit cdce8511a14e0a84f3796cce6889c3ce005d40b1.

This change was unsafe. The prior version (now restored) took the lock and
then copied the data. By returning a reference, the caller holds a
reference to data outside of the lock.

This function isn't worth optimizing. Hardly any functions use this
facility, and for those that do, they typically just capture one or two
variables.
---
 src/builtin_functions.cpp | 2 +-
 src/exec.cpp              | 2 +-
 src/function.cpp          | 6 ++----
 src/function.h            | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 8ae6b8880..91b334e6e 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -199,7 +199,7 @@ static wcstring functions_def(const wcstring &name) {
     }
 
     // Output any inherited variables as `set -l` lines.
-    const std::map<wcstring, env_var_t> &inherit_vars = function_get_inherit_vars(name);
+    std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(name);
     for (const auto &kv : inherit_vars) {
         wcstring_list_t lst;
         kv.second.to_list(lst);
diff --git a/src/exec.cpp b/src/exec.cpp
index da1b5aa44..70f50c0f2 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -813,7 +813,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
             return false;
         }
 
-        const std::map<wcstring, env_var_t> &inherit_vars = function_get_inherit_vars(func_name);
+        const std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
 
         function_block_t *fb =
             parser.push_block<function_block_t>(p, func_name, props->shadow_scope);
diff --git a/src/function.cpp b/src/function.cpp
index 6fb2041c5..1f43efd54 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -257,12 +257,10 @@ bool function_get_definition(const wcstring &name, wcstring &out_definition) {
     return func != NULL;
 }
 
-const std::map<wcstring, env_var_t> &function_get_inherit_vars(const wcstring &name) {
-    static const std::map<wcstring, env_var_t> empty_inherit_vars;
-
+std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name) {
     scoped_rlock locker(functions_lock);
     const function_info_t *func = function_get(name);
-    return func ? func->inherit_vars : empty_inherit_vars;
+    return func ? func->inherit_vars : std::map<wcstring, env_var_t>();
 }
 
 bool function_get_desc(const wcstring &name, wcstring &out_desc) {
diff --git a/src/function.h b/src/function.h
index 5440a8bcf..fc6529e72 100644
--- a/src/function.h
+++ b/src/function.h
@@ -102,7 +102,7 @@ int function_get_definition_lineno(const wcstring &name);
 
 /// Returns a mapping of all variables of the specified function that were inherited from the scope
 /// of the function definition to their values.
-const std::map<wcstring, env_var_t> &function_get_inherit_vars(const wcstring &name);
+std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name);
 
 /// Creates a new function using the same definition as the specified function. Returns true if copy
 /// is successful.

From 2c7dc98337086ab3b17a8e0c96a2826f038e7b37 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 12:22:46 -0700
Subject: [PATCH 0341/1732] Revert "fcntl a little less"

This reverts commits:
e5362a4ae57addc82e052dd8ff3040afd38dbe8a.
dd9a26715dc212a02c8aa8637067f7585c3f12e4.

These commits were incorrect because they stomped other flags, such as
O_NONBLOCK.
---
 src/fish.cpp  |  7 +++----
 src/wutil.cpp | 13 ++++++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index bf4b1006b..3e25c5bd6 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -441,14 +441,13 @@ int main(int argc, char **argv) {
             res = reader_read(STDIN_FILENO, {});
         } else {
             char *file = *(argv + (my_optind++));
-#if defined(O_CLOEXEC)
-            int fd = open(file, O_RDONLY | O_CLOEXEC);
-#else
             int fd = open(file, O_RDONLY);
-#endif
             if (fd == -1) {
                 perror(file);
             } else {
+                // OK to not do this atomically since we cannot have gone multithreaded yet.
+                set_cloexec(fd);
+
                 wcstring_list_t list;
                 for (char **ptr = argv + my_optind; *ptr; ptr++) {
                     list.push_back(str2wcstring(*ptr));
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 98a49251a..8ccb9362e 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -176,9 +176,16 @@ FILE *wfopen(const wcstring &path, const char *mode) {
 }
 
 bool set_cloexec(int fd) {
-    int flags = fcntl(fd, F_SETFD, FD_CLOEXEC);
-    if (flags == -1) return false;
-    return true;
+    // Note we don't want to overwrite existing flags like O_NONBLOCK which may be set. So fetch the
+    // existing flags and OR in our new one.
+    int flags = fcntl(fd, F_GETFD, 0);
+    if (flags < 0) {
+        return false;
+    }
+    if (flags & FD_CLOEXEC) {
+        return true;
+    }
+    return fcntl(fd, F_SETFD, flags | FD_CLOEXEC) >= 0;
 }
 
 static int wopen_internal(const wcstring &pathname, int flags, mode_t mode, bool cloexec) {

From e634abc1c8a67f2e3477c7d892ebebb4fe43502f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 12:37:08 -0700
Subject: [PATCH 0342/1732] Add a benchmark for external commands

This just runs '/usr/bin/true' a lot.
---
 benchmarks/benchmarks/external_cmds.fish | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 benchmarks/benchmarks/external_cmds.fish

diff --git a/benchmarks/benchmarks/external_cmds.fish b/benchmarks/benchmarks/external_cmds.fish
new file mode 100644
index 000000000..9c79e6f2e
--- /dev/null
+++ b/benchmarks/benchmarks/external_cmds.fish
@@ -0,0 +1,4 @@
+for i in (seq 2000)
+   /usr/bin/true
+end
+

From f35f2fe110eccbfc90598f0fb1b6f37313370263 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 12:39:01 -0700
Subject: [PATCH 0343/1732] Mark the benchmark as using the terminal

Prevents buffering all output from the command.
---
 cmake/Benchmark.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/Benchmark.cmake b/cmake/Benchmark.cmake
index 8eab311ce..840d8e27a 100644
--- a/cmake/Benchmark.cmake
+++ b/cmake/Benchmark.cmake
@@ -2,4 +2,5 @@
 
 ADD_CUSTOM_TARGET(benchmark
     COMMAND ${CMAKE_SOURCE_DIR}/benchmarks/driver.sh $<TARGET_FILE:fish>
+    USES_TERMINAL
 )

From 341799194e58df9e8995bb907513fe243e54292a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 16:02:49 -0700
Subject: [PATCH 0344/1732] Factor out fetching electric variables into a
 separate function

This factors env_stack_t::get() a little better
---
 src/env.cpp | 63 +++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index a7b1a929c..0b6c22b99 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -836,6 +836,39 @@ std::shared_ptr<const wcstring_list_t> env_var_t::empty_list() {
     return result;
 }
 
+/// \return a the value of a variable for \p key, which must be electric (computed).
+static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t &vars) {
+    if (key == L"history") {
+        // Big hack. We only allow getting the history on the main thread. Note that history_t
+        // may ask for an environment variable, so don't take the lock here (we don't need it).
+        if (!is_main_thread()) {
+            return none();
+        }
+
+        history_t *history = reader_get_history();
+        if (!history) {
+            history = &history_t::history_with_name(history_session_id(vars));
+        }
+        wcstring_list_t result;
+        if (history) history->get_history(result);
+        return env_var_t(L"history", result);
+    } else if (key == L"pipestatus") {
+        const auto js = proc_get_last_statuses();
+        wcstring_list_t result;
+        result.reserve(js.pipestatus.size());
+        for (int i : js.pipestatus) {
+            result.push_back(to_string(i));
+        }
+        return env_var_t(L"pipestatus", std::move(result));
+    } else if (key == L"status") {
+        return env_var_t(L"status", to_string(proc_get_last_status()));
+    } else if (key == L"umask") {
+        return env_var_t(L"umask", format_string(L"0%0.3o", get_umask()));
+    }
+    // We should never get here unless the electric var list is out of sync with the above code.
+    DIE("unrecognized electric var name");
+}
+
 maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
     const bool search_local = !has_scope || (mode & ENV_LOCAL);
@@ -849,35 +882,7 @@ maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode)
     // that in env_stack_t::set().
     if (is_electric(key)) {
         if (!search_global) return none();
-        if (key == L"history") {
-            // Big hack. We only allow getting the history on the main thread. Note that history_t
-            // may ask for an environment variable, so don't take the lock here (we don't need it).
-            if (!is_main_thread()) {
-                return none();
-            }
-
-            history_t *history = reader_get_history();
-            if (!history) {
-                history = &history_t::history_with_name(history_session_id(*this));
-            }
-            wcstring_list_t result;
-            if (history) history->get_history(result);
-            return env_var_t(L"history", result);
-        } else if (key == L"pipestatus") {
-            const auto js = proc_get_last_statuses();
-            wcstring_list_t result;
-            result.reserve(js.pipestatus.size());
-            for (int i : js.pipestatus) {
-                result.push_back(to_string(i));
-            }
-            return env_var_t(L"pipestatus", std::move(result));
-        } else if (key == L"status") {
-            return env_var_t(L"status", to_string(proc_get_last_status()));
-        } else if (key == L"umask") {
-            return env_var_t(L"umask", format_string(L"0%0.3o", get_umask()));
-        }
-        // We should never get here unless the electric var list is out of sync with the above code.
-        DIE("unerecognized electric var name");
+        return get_electric(key, *this);
     }
 
     if (search_local || search_global) {

From a597b0e6e1f672ce4608db16566778fb8d0cc488 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 16:15:47 -0700
Subject: [PATCH 0345/1732] Remove get_proc_had_barrier

Prior to this change, fish used a global flag to decide if we should check
for changes to universal variables. This flag was then checked at arbitrary
locations, potentially triggering variable updates and event handlers for
those updates; this was very hard to reason about.

Switch to triggering a universal variable update at a fixed location,
after running an external command.  The common case is that the variable
file has not changed, which we can identify with just a stat() call, so
this is pretty cheap.
---
 src/env.cpp             | 13 +------------
 src/exec.cpp            | 14 --------------
 src/parse_execution.cpp |  5 +++--
 src/proc.cpp            | 12 ------------
 src/proc.h              |  9 ---------
 5 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 0b6c22b99..fa071cd42 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -658,10 +658,6 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
                 }
             }
         } else {
-            if (!get_proc_had_barrier()) {
-                set_proc_had_barrier(true);
-                env_universal_barrier();
-            }
             if (uvars() && uvars()->get(key)) {
                 // Modifying an existing universal variable.
                 env_set_internal_universal(key, std::move(val), var_mode, this);
@@ -907,13 +903,6 @@ maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode)
 
     if (!search_universal) return none();
 
-    // Another hack. Only do a universal barrier on the main thread (since it can change variable
-    // values). Make sure we do this outside the env_lock because it may itself call `get()`.
-    if (is_main_thread() && !get_proc_had_barrier()) {
-        set_proc_had_barrier(true);
-        env_universal_barrier();
-    }
-
     // Okay, we couldn't find a local or global var given the requirements. If there is a matching
     // universal var return that.
     if (uvars()) {
@@ -926,7 +915,7 @@ maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode)
     return none();
 }
 
-void env_universal_barrier() { env_stack_t::principal().universal_barrier(); }
+void env_universal_barrier() {env_stack_t::principal().universal_barrier(); }
 
 /// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
 /// variable.
diff --git a/src/exec.cpp b/src/exec.cpp
index 70f50c0f2..1f2827d38 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -926,20 +926,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
         }
     }
 
-    // This call is used so the global environment variable array is regenerated, if needed,
-    // before the fork. That way, we avoid a lot of duplicate work where EVERY child would need
-    // to generate it, since that result would not get written back to the parent. This call
-    // could be safely removed, but it would result in slightly lower performance - at least on
-    // uniprocessor systems.
-    if (p->type == process_type_t::external) {
-        // Apply universal barrier so we have the most recent uvar changes
-        if (!get_proc_had_barrier()) {
-            set_proc_had_barrier(true);
-            env_universal_barrier();
-        }
-        parser.vars().export_arr();
-    }
-
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 694c50fb3..e2eccca1e 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1274,9 +1274,10 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             remove_job(job.get());
         }
 
-        // Only external commands require a new fishd barrier.
+        // Update universal vaiables on external conmmands.
+        // TODO: justify this, why not on every command?
         if (job_contained_external_command) {
-            set_proc_had_barrier(false);
+            parser->vars().universal_barrier();
         }
     }
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 4d64bbaa2..1d1817583 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -75,8 +75,6 @@ int no_exec = 0;
 
 static int is_interactive = -1;
 
-static bool proc_had_barrier = false;
-
 bool shell_is_interactive() {
     ASSERT_IS_MAIN_THREAD();
     // is_interactive is statically initialized to -1. Ensure it has been dynamically set
@@ -85,16 +83,6 @@ bool shell_is_interactive() {
     return is_interactive > 0;
 }
 
-bool get_proc_had_barrier() {
-    ASSERT_IS_MAIN_THREAD();
-    return proc_had_barrier;
-}
-
-void set_proc_had_barrier(bool flag) {
-    ASSERT_IS_MAIN_THREAD();
-    proc_had_barrier = flag;
-}
-
 /// A stack containing the values of is_interactive. Used by proc_push_interactive and
 /// proc_pop_interactive.
 static std::vector<int> interactive_stack;
diff --git a/src/proc.h b/src/proc.h
index c39e1a123..c306a9817 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -467,15 +467,6 @@ bool job_list_is_empty(void);
 /// A helper function to more easily access the job list
 job_list_t &jobs();
 
-/// Whether a universal variable barrier roundtrip has already been made for the currently executing
-/// command. Such a roundtrip only needs to be done once on a given command, unless a universal
-/// variable value is changed. Once this has been done, this variable is set to 1, so that no more
-/// roundtrips need to be done.
-///
-/// Both setting it to one when it should be zero and the opposite may cause concurrency bugs.
-bool get_proc_had_barrier();
-void set_proc_had_barrier(bool flag);
-
 /// The current job control mode.
 ///
 /// Must be one of job_control_t::all, job_control_t::interactive and job_control_t::none.

From 372291ad02863f69f7f727bc89839251951db5b0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 16:32:37 -0700
Subject: [PATCH 0346/1732] Collapse a weirdly structured clause in env.cpp

---
 src/env.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index fa071cd42..2bd72e2cd 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -900,12 +900,9 @@ maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode)
             env = vars_stack().next_scope_to_search(env);
         }
     }
-
-    if (!search_universal) return none();
-
     // Okay, we couldn't find a local or global var given the requirements. If there is a matching
     // universal var return that.
-    if (uvars()) {
+    if (search_universal && uvars()) {
         auto var = uvars()->get(key);
         if (var && (var->exports() ? search_exported : search_unexported)) {
             return var;

From 2f1e5727561783041af5721dcb80824c5c03d806 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 10 Apr 2019 16:47:43 -0700
Subject: [PATCH 0347/1732] Minor cleanup of env_node_t

Mark some fields const that don't need to change. Trying to get ready to
improve locking here.
---
 src/env.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 2bd72e2cd..729f982bc 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -81,9 +81,10 @@ class env_node_t {
     /// or does it redefine any variables to not be exported?
     bool exportv = false;
     /// Pointer to next level.
-    std::shared_ptr<env_node_t> next;
+    const std::shared_ptr<env_node_t> next;
 
-    env_node_t(bool is_new_scope) : new_scope(is_new_scope) {}
+    env_node_t(bool is_new_scope, std::shared_ptr<env_node_t> next_scope)
+        : new_scope(is_new_scope), next(std::move(next_scope)) {}
 
     maybe_t<env_var_t> find_entry(const wcstring &key) {
         auto it = env.find(key);
@@ -107,7 +108,7 @@ struct var_stack_t {
     env_node_ref_t top;
 
     // Bottom node on the function stack.
-    env_node_ref_t global_env;
+    const env_node_ref_t global_env;
 
     // Exported variable array used by execv.
     maybe_t<null_terminated_array_t<char>> export_array;
@@ -129,7 +130,7 @@ struct var_stack_t {
     // Pushes a new node onto our stack
     // Optionally creates a new scope for the node
     void push(bool new_scope) {
-        auto node = std::make_shared<env_node_t>(new_scope);
+        auto node = std::make_shared<env_node_t>(new_scope, this->top);
 
         // Copy local-exported variables.
         auto top_node = top;
@@ -141,7 +142,6 @@ struct var_stack_t {
             }
         }
 
-        node->next = this->top;
         this->top = std::move(node);
         if (new_scope && local_scope_exports(this->top)) {
             this->mark_changed_exported();
@@ -193,7 +193,7 @@ struct var_stack_t {
 
     /// Returns the global variable set.
     static env_node_ref_t globals() {
-        static env_node_ref_t s_globals{std::make_shared<env_node_t>(false)};
+        static env_node_ref_t s_globals{std::make_shared<env_node_t>(false, nullptr)};
         return s_globals;
     }
 };

From 2537fe0f9e988c0390ef2afecaf69ab223b95ca6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 11:54:02 -0700
Subject: [PATCH 0348/1732] Put back a missing lock in
 env_stack_t::set_internal

Setting a variable could race with getting it.

The lockin^g here needs a serious overhaul.
---
 src/env.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/env.cpp b/src/env.cpp
index 729f982bc..918666fd5 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -95,6 +95,9 @@ class env_node_t {
 
 using env_node_ref_t = std::shared_ptr<env_node_t>;
 
+// This is a big dorky lock we take around everything that might modify an env_node_t. Fine grained
+// locking is annoying here because env_nodes may be shared between env_stacks, so each node would
+// need its own lock.
 static std::mutex env_lock;
 
 // A class wrapping up a variable stack
@@ -631,6 +634,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
             env_set_internal_universal(key, std::move(val), var_mode, this);
         }
     } else {
+        scoped_lock locker(env_lock);
         // Determine the node.
         bool has_changed_new = false;
         env_node_ref_t preexisting_node = get_node(key);

From cc9386fca9b6e874d99fb58a14175d8fbcf7a06e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 13 Apr 2019 14:27:03 -0700
Subject: [PATCH 0349/1732] Clean up some headers in env and env_dispatch.cpp

---
 src/env.cpp          | 15 +--------------
 src/env_dispatch.cpp | 21 +++++----------------
 src/wutil.h          |  1 +
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 918666fd5..5563d2ab4 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -2,24 +2,17 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
-#include <limits.h>
 #include <pwd.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
-#include <cwchar>
 
 #include <algorithm>
 #include <iterator>
+#include <mutex>
 #include <set>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -29,19 +22,13 @@
 #include "env_dispatch.h"
 #include "env_universal_common.h"
 #include "event.h"
-#include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "fish_version.h"
-#include "function.h"
 #include "history.h"
 #include "input.h"
-#include "input_common.h"
-#include "output.h"
 #include "path.h"
 #include "proc.h"
 #include "reader.h"
-#include "sanity.h"
-#include "screen.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 #define DEFAULT_TERM1 "ansi"
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index bc1bd4576..b8f85cb47 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -4,13 +4,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
-#include <pthread.h>
-#include <pwd.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 #include <cstring>
@@ -30,32 +25,26 @@
 #endif
 
 #include <algorithm>
-#include <iterator>
-#include <set>
-#include <type_traits>
+#include <assert.h>
+#include <functional>
+#include <memory>
+#include <string>
 #include <unordered_map>
-#include <unordered_set>
 #include <utility>
-#include <vector>
 
-#include "builtin_bind.h"
 #include "common.h"
 #include "complete.h"
 #include "env.h"
 #include "env_universal_common.h"
 #include "event.h"
-#include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
-#include "fish_version.h"
 #include "function.h"
 #include "history.h"
-#include "input.h"
 #include "input_common.h"
+#include "maybe.h"
 #include "output.h"
-#include "path.h"
 #include "proc.h"
 #include "reader.h"
-#include "sanity.h"
 #include "screen.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/wutil.h b/src/wutil.h
index 80eaf8005..4ec8e016e 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <locale.h>
 #include <string>
+#include <wctype.h>
 
 #ifdef HAVE_XLOCALE_H
 #include <xlocale.h>

From 4530a4100437276afef117c113bdedb1080a877c Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 12:03:25 -0500
Subject: [PATCH 0350/1732] Fix return code after execution of empty function

---
 src/exec.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index 1f2827d38..d9f83a506 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -926,6 +926,14 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
         }
     }
 
+    // The number of overall "command" executions, for whatever definition of "command". Its delta
+    // is used to determine the number of recursive `exec_process_in_job()` invocations.
+    static size_t exec_count = 0;
+    if (p->type != process_type_t::block_node) {
+        // An simple `begin ... end` should not be considered an execution of a command.
+        exec_count++;
+    }
+
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
@@ -934,10 +942,19 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
             // were already launched, so they are ready to receive (or reject) our output.
             bool allow_buffering = !is_deferred_run;
+            auto cached_exec_count = exec_count;
             if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain,
                                             allow_buffering)) {
                 return false;
             }
+
+            // Functions are basically treated as named blocks, and this is the only place we can
+            // distinguish between them. A block by default does not touch $status, on the other
+            // hand, calling an empty function should clear $status.
+            if (exec_count == cached_exec_count && p->type == process_type_t::function) {
+                p->status = proc_status_t::from_exit_code(0);
+            }
+
             break;
         }
 

From 87f68569546bb7ebbe317de2c5ee4ee7c11345b4 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 12:04:44 -0500
Subject: [PATCH 0351/1732] Fix tests expecting non-zero status after empty
 function call

---
 tests/test1.err | 2 +-
 tests/test1.in  | 5 +----
 tests/test1.out | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/test1.err b/tests/test1.err
index e5a978376..4dd8d5f05 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -12,7 +12,7 @@
 # Simple function tests
 
 ####################
-# Ensure eval doesn't unnecessarily mess with the exit status
+# Testing builtin status
 
 ####################
 # Verify that we can turn stderr into stdout and then pipe it
diff --git a/tests/test1.in b/tests/test1.in
index 51302c2a3..00a5b8b45 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -92,10 +92,7 @@ else
 end
 echo Test 4 $sta
 
-logmsg "Ensure eval doesn't unnecessarily mess with the exit status"
-function empty_func ; end
-false ; eval empty_func ; echo $status
-true ; eval empty_func ; echo $status
+logmsg "Testing builtin status"
 
 function test_builtin_status
 	return 1
diff --git a/tests/test1.out b/tests/test1.out
index 6c141412d..d2b47bf29 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -37,9 +37,7 @@ Test 3b pass
 Test 4 pass
 
 ####################
-# Ensure eval doesn't unnecessarily mess with the exit status
-1
-0
+# Testing builtin status
 Test 5 pass
 
 ####################

From ab37dfaf7832d0be6bf9d47e892baf4635c14412 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 12 Apr 2019 07:58:55 -0500
Subject: [PATCH 0352/1732] Add tests for evaluaton of empty blocks and
 functions

---
 tests/empty.err |  3 +++
 tests/empty.in  | 16 ++++++++++++++++
 tests/empty.out |  7 +++++++
 3 files changed, 26 insertions(+)
 create mode 100644 tests/empty.err
 create mode 100644 tests/empty.in
 create mode 100644 tests/empty.out

diff --git a/tests/empty.err b/tests/empty.err
new file mode 100644
index 000000000..793c955b5
--- /dev/null
+++ b/tests/empty.err
@@ -0,0 +1,3 @@
+
+####################
+# Testing `0` after empty functions and blocks
diff --git a/tests/empty.in b/tests/empty.in
new file mode 100644
index 000000000..f27c24850
--- /dev/null
+++ b/tests/empty.in
@@ -0,0 +1,16 @@
+# See issue 5692
+
+logmsg "Testing `$status` after empty functions and blocks"
+
+function empty
+end
+
+# functions shouldn't preserve $status
+
+false; empty; echo $status # 0
+true; empty; echo $status # 0
+
+# blocks should preserve $status
+
+false; begin; end; echo $status # 1
+true; begin; end; echo $status # 0
diff --git a/tests/empty.out b/tests/empty.out
new file mode 100644
index 000000000..0d0c1d513
--- /dev/null
+++ b/tests/empty.out
@@ -0,0 +1,7 @@
+
+####################
+# Testing `0` after empty functions and blocks
+0
+0
+1
+0

From 47a61a32029e558dc7c557a92995079da86ccf94 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 12:11:42 -0500
Subject: [PATCH 0353/1732] Test: validate $status is preserved on calling into
 a function

---
 tests/status.err | 3 +++
 tests/status.in  | 7 +++++++
 tests/status.out | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/tests/status.err b/tests/status.err
index 87e63a330..ad52d81c6 100644
--- a/tests/status.err
+++ b/tests/status.err
@@ -7,3 +7,6 @@ status: Invalid job control mode '1none'
 
 ####################
 # Future Feature Flags
+
+####################
+# Ensure $status isn't reset before a function is executed
diff --git a/tests/status.in b/tests/status.in
index 9f33badd6..ad68a9231 100644
--- a/tests/status.in
+++ b/tests/status.in
@@ -48,3 +48,10 @@ logmsg Future Feature Flags
 status features
 status test-feature stderr-nocaret ; echo $status
 status test-feature not-a-feature ; echo $status
+
+logmsg 'Ensure $status isn\'t reset before a function is executed'
+function echo_last
+	echo $status
+end
+
+false; echo_last; echo $status #1
diff --git a/tests/status.out b/tests/status.out
index 283b13030..b5cb078c0 100644
--- a/tests/status.out
+++ b/tests/status.out
@@ -9,3 +9,8 @@ qmark-noglob	off	3.0	? no longer globs
 string-replace-fewer-backslashes	off	3.1	string replace -r needs fewer backslashes in the replacement
 1
 2
+
+####################
+# Ensure $status isn't reset before a function is executed
+1
+0

From 8e4010b263ec53478a1b8898f9146e4e4bcefdc0 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 13:05:04 -0500
Subject: [PATCH 0354/1732] Make `eval` override previous status

Closes #5692 (again).
---
 src/builtin_eval.cpp | 11 +++++++----
 src/exec.cpp         | 11 ++++++++---
 src/exec.h           |  3 +++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 680edc83c..660559e0d 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -9,6 +9,7 @@
 
 #include "builtin.h"
 #include "common.h"
+#include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
 #include "parser.h"
@@ -16,8 +17,6 @@
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-class parser_t;
-
 /// Implementation of eval builtin.
 int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int argc = builtin_count_args(argv);
@@ -28,16 +27,20 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         new_cmd += argv[i];
     }
 
-    // debug(1, "new_cmd: %ls", new_cmd.c_str());
-
+    size_t cached_exec_count = exec_get_exec_count();
     int status = STATUS_CMD_OK;
     if (argc > 1) {
         if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) != 0) {
             // This indicates a parse error; nothing actually got executed.
             status = STATUS_CMD_ERROR;
+        } else if (cached_exec_count == exec_get_exec_count()) {
+            // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
+            // where we have an argument but nothing is executed.
+            status = STATUS_CMD_OK;
         } else {
             status = proc_get_last_status();
         }
     }
+
     return status;
 }
diff --git a/src/exec.cpp b/src/exec.cpp
index d9f83a506..a17291cda 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -864,6 +864,14 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     return true;
 }
 
+// The number of overall "command" executions, for whatever definition of "command". Its delta
+// is used to determine the number of recursive `exec_process_in_job()` invocations.
+static size_t exec_count = 0;
+
+size_t exec_get_exec_count() {
+    return exec_count;
+}
+
 /// Executes a process \p in job \j, using the pipes \p pipes (which may have invalid fds if this is
 /// the first or last process).
 /// \p deferred_pipes represents the pipes from our deferred process; if set ensure they get closed
@@ -926,9 +934,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
         }
     }
 
-    // The number of overall "command" executions, for whatever definition of "command". Its delta
-    // is used to determine the number of recursive `exec_process_in_job()` invocations.
-    static size_t exec_count = 0;
     if (p->type != process_type_t::block_node) {
         // An simple `begin ... end` should not be considered an execution of a command.
         exec_count++;
diff --git a/src/exec.h b/src/exec.h
index 12c5d9051..fe776db8a 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -31,6 +31,9 @@ int exec_subshell(const wcstring &cmd, parser_t &parser, bool preserve_exit_stat
 /// Loops over close until the syscall was run without being interrupted.
 void exec_close(int fd);
 
+/// Returns the number of executions. May roll over.
+size_t exec_get_exec_count();
+
 /// Gets the interpreter for a given command.
 char *get_interpreter(const char *command, char *interpreter, size_t buff_size);
 

From b2a1da602f79878f4b0adc4881216c928a542608 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 16:57:00 -0500
Subject: [PATCH 0355/1732] Fix error propagation in parser_t::eval

It was unconditionally returning `parse_execution_success`. This was
causing certain parser errors to incorrectly return after evaluation
with `$status` equal to `0`, as reported after `eval`, `source`, or
sub-`fish` execution.
---
 src/parse_execution.cpp | 2 +-
 src/parser.cpp          | 8 ++++----
 src/parser.h            | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index e2eccca1e..2afbc2155 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1291,7 +1291,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     job_reap(false);  // clean up jobs
-    return parse_execution_success;
+    return populated_job ? parse_execution_success : parse_execution_errored;
 }
 
 parse_execution_result_t parse_execution_context_t::run_job_conjunction(
diff --git a/src/parser.cpp b/src/parser.cpp
index a36faa4f4..1a7e9ef3e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -631,17 +631,17 @@ int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_t
         std::fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
         return 1;
     }
-    this->eval(ps, io, block_type);
-    return 0;
+    return this->eval(ps, io, block_type);
 }
 
-void parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) {
+int parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) {
     assert(block_type == TOP || block_type == SUBST);
     if (!ps->tree.empty()) {
         // Execute the first node.
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
-        this->eval_node(ps, start, io, block_type, nullptr /* parent */);
+        return this->eval_node(ps, start, io, block_type, nullptr /* parent */);
     }
+    return 0;
 }
 
 template <typename T>
diff --git a/src/parser.h b/src/parser.h
index 6648b069b..7cb075b3c 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -225,7 +225,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluate the parsed source ps.
-    void eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
+    /// \return 0 on success, 1 on a parse error.
+    int eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.

From 05f52924c170fabd9e228a5f8a799d417085fd5d Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 17:07:58 -0500
Subject: [PATCH 0356/1732] Fix bad tests

These tests used raw, unescaped parentheses to perform `test` logical
grouping, but the test failures weren't caught because the parser
evaluation errors were not being propagated (fixed in bdbd173e).
---
 src/fish_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index dfee85398..136a50680 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2330,8 +2330,8 @@ static void test_test() {
     //  it would be false.
     do_test(run_test_test(0, L"0 = 0 -o 0 = 1 -a 0 = 2"));
     do_test(run_test_test(0, L"-n 5 -o 0 = 1 -a 0 = 2"));
-    do_test(run_test_test(1, L"( 0 = 0 -o  0 = 1 ) -a 0 = 2"));
-    do_test(run_test_test(0, L"0 = 0 -o ( 0 = 1 -a 0 = 2 )"));
+    do_test(run_test_test(1, L"\\( 0 = 0 -o  0 = 1 \\) -a 0 = 2"));
+    do_test(run_test_test(0, L"0 = 0 -o \\( 0 = 1 -a 0 = 2 \\)"));
 
     // A few lame tests for permissions; these need to be a lot more complete.
     do_test(run_test_test(0, L"-e /bin/ls"));

From 2dfc85245f240d2ed32fa0c9694c185b8b8b4646 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 17:17:57 -0500
Subject: [PATCH 0357/1732] Add regression tests for `eval`

---
 tests/eval.err       | 13 +++++++++++++
 tests/eval.in        | 33 +++++++++++++++++++++++++++++++++
 tests/eval.out       | 15 +++++++++++++++
 tests/eval_scope.err |  0
 tests/eval_scope.in  |  3 ---
 tests/eval_scope.out |  1 -
 6 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 tests/eval.err
 create mode 100644 tests/eval.in
 create mode 100644 tests/eval.out
 delete mode 100644 tests/eval_scope.err
 delete mode 100644 tests/eval_scope.in
 delete mode 100644 tests/eval_scope.out

diff --git a/tests/eval.err b/tests/eval.err
new file mode 100644
index 000000000..3e02f001c
--- /dev/null
+++ b/tests/eval.err
@@ -0,0 +1,13 @@
+
+####################
+# Testing eval builtin
+fish: Unexpected end of string, expecting ')'
+(
+^
+
+fish: The expanded command was empty.
+""
+^
+
+####################
+# Testing eval with empty functions, blocks, and arguments
diff --git a/tests/eval.in b/tests/eval.in
new file mode 100644
index 000000000..3008803d4
--- /dev/null
+++ b/tests/eval.in
@@ -0,0 +1,33 @@
+logmsg "Testing eval builtin"
+
+# Regression test for issue #4443
+eval set -l previously_undefined foo
+echo $previously_undefined
+
+# Test redirection
+eval "echo you can\\'t see this 1>&2" 2>/dev/null
+
+# Test return statuses
+false; eval true; echo $status # 0
+false; eval false; echo $status # 1
+
+# Test return status in case of parsing error
+false; eval "("; echo $status # 1
+false; eval '""'; echo $status # 1
+
+function empty
+end
+
+# Regression tests for issue #5692
+logmsg "Testing eval with empty functions, blocks, and arguments"
+false; eval;
+echo blank eval: $status # 0
+
+false; eval "";
+echo empty arg eval: $status # 0
+
+false; eval empty;
+echo empty function eval $status # 0
+
+false; eval "begin; end;";
+echo empty block eval: $status # 0
diff --git a/tests/eval.out b/tests/eval.out
new file mode 100644
index 000000000..6cba274e2
--- /dev/null
+++ b/tests/eval.out
@@ -0,0 +1,15 @@
+
+####################
+# Testing eval builtin
+foo
+0
+1
+1
+1
+
+####################
+# Testing eval with empty functions, blocks, and arguments
+blank eval: 0
+empty arg eval: 0
+empty function eval 0
+empty block eval: 0
diff --git a/tests/eval_scope.err b/tests/eval_scope.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/eval_scope.in b/tests/eval_scope.in
deleted file mode 100644
index b5b89b7c0..000000000
--- a/tests/eval_scope.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# Regression test for issue #4443
-eval set -l previously_undefined foo
-echo $previously_undefined
diff --git a/tests/eval_scope.out b/tests/eval_scope.out
deleted file mode 100644
index 257cc5642..000000000
--- a/tests/eval_scope.out
+++ /dev/null
@@ -1 +0,0 @@
-foo

From a9e0990773c07818f24df08698c751bd3aa618af Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Apr 2019 17:24:40 -0500
Subject: [PATCH 0358/1732] Add changelog note about parser error propagation
 fix

..as this affects backwards compatibility (as witnessed by the tests
that failed after making this fix).
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5db50f8f5..bcc07582a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,8 @@
 - cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 - $PATH is no longer reordered in child fishes (#5456).
-- `eval` is now implemented internally rather than being a function; as such, the evaluated code now
-shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
+- `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
+- An issue resulting in a certain class of parser errors not resulting in a non-zero `$status` has been corrected (3e055f).
 
 ### Syntax changes and new commands
 - None yet.

From 46fd47a0da43f1b8cd77d43442569def90546b55 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 13:30:11 -0700
Subject: [PATCH 0359/1732] Organize some code slightly better in env.h

---
 src/env.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/env.h b/src/env.h
index d3fc98085..9812077b3 100644
--- a/src/env.h
+++ b/src/env.h
@@ -166,6 +166,7 @@ class env_var_t {
     }
     bool operator!=(const env_var_t &rhs) const { return ! (*this == rhs); }
 };
+typedef std::map<wcstring, env_var_t> var_table_t;
 
 /// An environment is read-only access to variable values.
 class environment_t {
@@ -192,9 +193,6 @@ class null_environment_t : public environment_t {
     wcstring_list_t get_names(int flags) const override;
 };
 
-/// Synchronizes all universal variable changes: writes everything out, reads stuff in.
-void env_universal_barrier();
-
 /// A environment stack of scopes. This is the main class that tracks fish variables.
 struct var_stack_t;
 class env_node_t;
@@ -304,10 +302,11 @@ class env_vars_snapshot_t : public environment_t {
 extern int g_fork_count;
 extern bool g_use_posix_spawn;
 
-typedef std::map<wcstring, env_var_t> var_table_t;
-
 extern bool term_has_xn;  // does the terminal have the "eat_newline_glitch"
 
+/// Synchronizes all universal variable changes: writes everything out, reads stuff in.
+void env_universal_barrier();
+
 /// Returns true if we think the terminal supports setting its title.
 bool term_supports_setting_title();
 

From 1d464da69805705642c6cc50142337ea7e4cfcfc Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 13:37:44 -0700
Subject: [PATCH 0360/1732] Introduce env_scoped_t

env_scoped_t lives between environment_t and env_stack_t.
It represents the read-only logic of env_stack_t and will be used to back
the new environment snapshot implementation.
---
 src/env.cpp | 14 ++++++++------
 src/env.h   | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 5563d2ab4..6ba77a6e6 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -216,8 +216,10 @@ static const string_set_t env_electric = {L"history", L"pipestatus", L"status",
 
 static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
 
-env_stack_t::env_stack_t() : vars_(make_unique<var_stack_t>()) {}
-env_stack_t::env_stack_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
+env_scoped_t::env_scoped_t() : env_scoped_t(make_unique<var_stack_t>()) {}
+env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
+env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
+env_scoped_t::~env_scoped_t() = default;
 
 void env_stack_t::universal_barrier() {
     ASSERT_IS_MAIN_THREAD();
@@ -233,9 +235,9 @@ void env_stack_t::universal_barrier() {
 }
 
 // Get the variable stack
-var_stack_t &env_stack_t::vars_stack() { return *vars_; }
+var_stack_t &env_scoped_t::vars_stack() { return *vars_; }
 
-const var_stack_t &env_stack_t::vars_stack() const { return *vars_; }
+const var_stack_t &env_scoped_t::vars_stack() const { return *vars_; }
 
 /// Return the current umask value.
 static mode_t get_umask() {
@@ -856,7 +858,7 @@ static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t
     DIE("unrecognized electric var name");
 }
 
-maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode) const {
+maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
     const bool search_local = !has_scope || (mode & ENV_LOCAL);
     const bool search_global = !has_scope || (mode & ENV_GLOBAL);
@@ -953,7 +955,7 @@ static void add_key_to_string_set(const var_table_t &envs, std::set<wcstring> *s
     }
 }
 
-wcstring_list_t env_stack_t::get_names(int flags) const {
+wcstring_list_t env_scoped_t::get_names(int flags) const {
     scoped_lock locker(env_lock);
 
     wcstring_list_t result;
diff --git a/src/env.h b/src/env.h
index 9812077b3..fa598f629 100644
--- a/src/env.h
+++ b/src/env.h
@@ -193,13 +193,36 @@ class null_environment_t : public environment_t {
     wcstring_list_t get_names(int flags) const override;
 };
 
-/// A environment stack of scopes. This is the main class that tracks fish variables.
+/// An environment stack of scopes.
+/// The base implementation provides read-only access.
 struct var_stack_t;
 class env_node_t;
-class env_stack_t final : public environment_t {
-    friend class parser_t;
+class env_scoped_t : public environment_t {
+   private:
     std::unique_ptr<var_stack_t> vars_;
 
+   protected:
+    var_stack_t &vars_stack();
+    const var_stack_t &vars_stack() const;
+
+    explicit env_scoped_t(std::unique_ptr<var_stack_t> vars_);
+    env_scoped_t();
+    env_scoped_t(env_scoped_t &&);
+
+   public:
+    /// Gets the variable with the specified name, or none() if it does not exist.
+    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
+
+    /// Returns all variable names.
+    wcstring_list_t get_names(int flags) const override;
+
+    ~env_scoped_t() override;
+};
+
+/// A mutable env_scoped_t, that allows scopes to be pushed and popped.
+class env_stack_t final : public env_scoped_t {
+    friend class parser_t;
+
     int set_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
 
     bool try_remove(std::shared_ptr<env_node_t> n, const wchar_t *key, int var_mode);
@@ -207,18 +230,11 @@ class env_stack_t final : public environment_t {
 
     static env_stack_t make_principal();
 
-    var_stack_t &vars_stack();
-    const var_stack_t &vars_stack() const;
-
-    explicit env_stack_t(std::unique_ptr<var_stack_t> vars_);
-    env_stack_t();
+    using env_scoped_t::env_scoped_t;
     ~env_stack_t() override;
-
     env_stack_t(env_stack_t &&);
 
    public:
-    /// Gets the variable with the specified name, or none() if it does not exist.
-    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
 
     /// Sets the variable with the specified name to the given values.
     int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
@@ -254,9 +270,6 @@ class env_stack_t final : public environment_t {
     /// Returns an array containing all exported variables in a format suitable for execv
     const char *const *export_arr();
 
-    /// Returns all variable names.
-    wcstring_list_t get_names(int flags) const override;
-
     /// Update the termsize variable.
     void set_termsize();
 

From 69655ef5c15810bafc7c4ed4c4449a173ee8372b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 14:01:23 -0700
Subject: [PATCH 0361/1732] Reorganize env.cpp

Group functions together more logically
---
 src/env.cpp | 622 +++++++++++++++++++++++++---------------------------
 1 file changed, 301 insertions(+), 321 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 6ba77a6e6..d5a25ccf7 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -54,6 +54,150 @@ bool curses_initialized = false;
 /// Does the terminal have the "eat_newline_glitch".
 bool term_has_xn = false;
 
+/// Universal variables global instance. Initialized in env_init.
+static env_universal_t *s_universal_variables = NULL;
+
+/// Getter for universal variables.
+static env_universal_t *uvars() { return s_universal_variables; }
+
+void env_universal_barrier() { env_stack_t::principal().universal_barrier(); }
+
+// A typedef for a set of constant strings. Note our sets are typically on the order of 6 elements,
+// so we don't bother to sort them.
+using string_set_t = const wchar_t *const[];
+
+/// Check if a variable may not be set using the set command.
+static bool is_read_only(const wcstring &key) {
+    static const string_set_t env_read_only = {
+        L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status",           L"version",
+        L"FISH_VERSION", L"fish_pid", L"hostname", L"_",          L"fish_private_mode"};
+    return contains(env_read_only, key) || (in_private_mode() && key == L"fish_history");
+}
+
+/// Return true if a variable should become a path variable by default. See #436.
+static bool variable_should_auto_pathvar(const wcstring &name) {
+    return string_suffixes_string(L"PATH", name);
+}
+
+/// Table of variables whose value is dynamically calculated, such as umask, status, etc.
+static const string_set_t env_electric = {L"history", L"pipestatus", L"status", L"umask"};
+
+static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
+
+/// \return a the value of a variable for \p key, which must be electric (computed).
+static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t &vars) {
+    if (key == L"history") {
+        // Big hack. We only allow getting the history on the main thread. Note that history_t
+        // may ask for an environment variable, so don't take the lock here (we don't need it).
+        if (!is_main_thread()) {
+            return none();
+        }
+
+        history_t *history = reader_get_history();
+        if (!history) {
+            history = &history_t::history_with_name(history_session_id(vars));
+        }
+        wcstring_list_t result;
+        if (history) history->get_history(result);
+        return env_var_t(L"history", result);
+    } else if (key == L"pipestatus") {
+        const auto js = proc_get_last_statuses();
+        wcstring_list_t result;
+        result.reserve(js.pipestatus.size());
+        for (int i : js.pipestatus) {
+            result.push_back(to_string(i));
+        }
+        return env_var_t(L"pipestatus", std::move(result));
+    } else if (key == L"status") {
+        return env_var_t(L"status", to_string(proc_get_last_status()));
+    } else if (key == L"umask") {
+        // note umask() is an absurd API: you call it to set the value and it returns the old value.
+        // Thus we have to call it twice, to reset the value. TODO: lock!
+        mode_t res = umask(0);
+        umask(res);
+        return env_var_t(L"umask", format_string(L"0%0.3o", res));
+    }
+    // We should never get here unless the electric var list is out of sync with the above code.
+    DIE("unrecognized electric var name");
+}
+
+/// Some env vars contain a list of paths where an empty path element is equivalent to ".".
+/// Unfortunately that convention causes problems for fish scripts. So this function replaces the
+/// empty path element with an explicit ".". See issue #3914.
+void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
+    const auto paths = vars.get(var_name);
+    if (paths.missing_or_empty()) return;
+
+    // See if there's any empties.
+    const wcstring empty = wcstring();
+    const wcstring_list_t &strs = paths->as_list();
+    if (contains(strs, empty)) {
+        // Copy the list and replace empties with L"."
+        wcstring_list_t newstrs = strs;
+        std::replace(newstrs.begin(), newstrs.end(), empty, wcstring(L"."));
+        int retval = vars.set(var_name, ENV_DEFAULT | ENV_USER, std::move(newstrs));
+        if (retval != ENV_OK) {
+            debug(0, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
+        }
+    }
+}
+
+const wcstring_list_t &env_var_t::as_list() const { return *vals_; }
+
+wchar_t env_var_t::get_delimiter() const {
+    return is_pathvar() ? PATH_ARRAY_SEP : NONPATH_ARRAY_SEP;
+}
+
+/// Return a string representation of the var.
+wcstring env_var_t::as_string() const { return join_strings(*vals_, get_delimiter()); }
+
+void env_var_t::to_list(wcstring_list_t &out) const { out = *vals_; }
+
+env_var_t::env_var_flags_t env_var_t::flags_for(const wchar_t *name) {
+    env_var_flags_t result = 0;
+    if (is_read_only(name)) result |= flag_read_only;
+    return result;
+}
+
+/// \return a singleton empty list, to avoid unnecessary allocations in env_var_t.
+std::shared_ptr<const wcstring_list_t> env_var_t::empty_list() {
+    static const auto result = std::make_shared<const wcstring_list_t>();
+    return result;
+}
+
+environment_t::~environment_t() = default;
+
+wcstring environment_t::get_pwd_slash() const {
+    // Return "/" if PWD is missing.
+    // See https://github.com/fish-shell/fish-shell/issues/5080
+    auto pwd_var = get(L"PWD");
+    wcstring pwd;
+    if (!pwd_var.missing_or_empty()) {
+        pwd = pwd_var->as_string();
+    }
+    if (!string_suffixes_string(L"/", pwd)) {
+        pwd.push_back(L'/');
+    }
+    return pwd;
+}
+
+null_environment_t::null_environment_t() = default;
+null_environment_t::~null_environment_t() = default;
+maybe_t<env_var_t> null_environment_t::get(const wcstring &key, env_mode_flags_t mode) const {
+    UNUSED(key);
+    UNUSED(mode);
+    return none();
+}
+wcstring_list_t null_environment_t::get_names(int flags) const {
+    UNUSED(flags);
+    return {};
+}
+
+// This is a big dorky lock we take around everything that might read from or modify an env_node_t.
+// Fine grained locking is annoying here because env_nodes may be shared between env_stacks, so each
+// node would need its own lock.
+static std::mutex env_lock;
+
 // Struct representing one level in the function variable stack.
 // Only our variable stack should create and destroy these
 class env_node_t {
@@ -79,18 +223,11 @@ class env_node_t {
         return none();
     }
 };
-
 using env_node_ref_t = std::shared_ptr<env_node_t>;
 
-// This is a big dorky lock we take around everything that might modify an env_node_t. Fine grained
-// locking is annoying here because env_nodes may be shared between env_stacks, so each node would
-// need its own lock.
-static std::mutex env_lock;
-
-// A class wrapping up a variable stack
-// Currently there is only one variable stack in fish,
-// but we can imagine having separate (linked) stacks
-// if we introduce multiple threads of execution
+// A class wrapping up a variable stack.
+// This forms a linekd list of env_node_t, and also maintains the export array for exported
+// environment variables.
 struct var_stack_t {
     var_stack_t(var_stack_t &&) = default;
 
@@ -188,33 +325,131 @@ struct var_stack_t {
     }
 };
 
-/// Universal variables global instance. Initialized in env_init.
-static env_universal_t *s_universal_variables = NULL;
+/// Get list of all exported variables.
+void var_stack_t::get_exported(const env_node_t *n, var_table_t &h) const {
+    if (!n) return;
 
-/// Getter for universal variables.
-static env_universal_t *uvars() { return s_universal_variables; }
+    if (n->new_scope) {
+        get_exported(global_env.get(), h);
+    } else {
+        get_exported(n->next.get(), h);
+    }
 
-// A typedef for a set of constant strings. Note our sets are typically on the order of 6 elements,
-// so we don't bother to sort them.
-using string_set_t = const wchar_t *const[];
+    var_table_t::const_iterator iter;
+    for (iter = n->env.begin(); iter != n->env.end(); ++iter) {
+        const wcstring &key = iter->first;
+        const env_var_t var = iter->second;
 
-/// Check if a variable may not be set using the set command.
-static bool is_read_only(const wcstring &key) {
-    static const string_set_t env_read_only = {
-        L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status",           L"version",
-        L"FISH_VERSION", L"fish_pid", L"hostname", L"_",          L"fish_private_mode"};
-    return contains(env_read_only, key) || (in_private_mode() && key == L"fish_history");
+        if (var.exports()) {
+            // Export the variable. Don't use std::map::insert here, since we need to overwrite
+            // existing values from previous scopes.
+            h[key] = var;
+        } else {
+            // We need to erase from the map if we are not exporting, since a lower scope may have
+            // exported. See #2132.
+            h.erase(key);
+        }
+    }
 }
 
-/// Return true if a variable should become a path variable by default. See #436.
-static bool variable_should_auto_pathvar(const wcstring &name) {
-    return string_suffixes_string(L"PATH", name);
+/// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
+/// variable.
+bool var_stack_t::local_scope_exports(const env_node_ref_t &n) const {
+    assert(n != nullptr);
+    if (n == global_env) return false;
+
+    if (n->exportv) return true;
+
+    if (n->new_scope) return false;
+
+    return local_scope_exports(n->next);
 }
 
-/// Table of variables whose value is dynamically calculated, such as umask, status, etc.
-static const string_set_t env_electric = {L"history", L"pipestatus", L"status", L"umask"};
+void var_stack_t::update_export_array_if_necessary() {
+    if (!this->has_changed_exported()) {
+        return;
+    }
 
-static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
+    debug(4, L"export_arr() recalc");
+    var_table_t vals;
+    get_exported(this->top.get(), vals);
+
+    if (uvars()) {
+        const wcstring_list_t uni = uvars()->get_names(true, false);
+        for (const wcstring &key : uni) {
+            auto var = uvars()->get(key);
+
+            if (!var.missing_or_empty()) {
+                // Note that std::map::insert does NOT overwrite a value already in the map,
+                // which we depend on here.
+                vals.insert(std::pair<wcstring, env_var_t>(key, *var));
+            }
+        }
+    }
+
+    // Construct the export list: a list of strings of the form key=value.
+    std::vector<std::string> export_list;
+    export_list.reserve(vals.size());
+    for (const auto &kv : vals) {
+        std::string str = wcs2string(kv.first);
+        str.push_back('=');
+        str.append(wcs2string(kv.second.as_string()));
+        export_list.push_back(std::move(str));
+    }
+    export_array.emplace(export_list);
+}
+
+// Get the variable stack
+var_stack_t &env_scoped_t::vars_stack() { return *vars_; }
+const var_stack_t &env_scoped_t::vars_stack() const { return *vars_; }
+
+// Read a variable respecting the given mode.
+maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode) const {
+    const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
+    const bool search_local = !has_scope || (mode & ENV_LOCAL);
+    const bool search_global = !has_scope || (mode & ENV_GLOBAL);
+    const bool search_universal = !has_scope || (mode & ENV_UNIVERSAL);
+
+    const bool search_exported = (mode & ENV_EXPORT) || !(mode & ENV_UNEXPORT);
+    const bool search_unexported = (mode & ENV_UNEXPORT) || !(mode & ENV_EXPORT);
+
+    // Make the assumption that electric keys can't be shadowed elsewhere, since we currently block
+    // that in env_stack_t::set().
+    if (is_electric(key)) {
+        if (!search_global) return none();
+        return get_electric(key, *this);
+    }
+
+    if (search_local || search_global) {
+        scoped_lock locker(env_lock);  // lock around a local region
+        env_node_ref_t env = search_local ? vars_stack().top : vars_stack().global_env;
+
+        while (env != NULL) {
+            if (env == vars_stack().global_env && !search_global) {
+                break;
+            }
+
+            var_table_t::const_iterator result = env->env.find(key);
+            if (result != env->env.end()) {
+                const env_var_t &var = result->second;
+                if (var.exports() ? search_exported : search_unexported) {
+                    return var;
+                }
+            }
+            env = vars_stack().next_scope_to_search(env);
+        }
+    }
+    // Okay, we couldn't find a local or global var given the requirements. If there is a matching
+    // universal var return that.
+    if (search_universal && uvars()) {
+        auto var = uvars()->get(key);
+        if (var && (var->exports() ? search_exported : search_unexported)) {
+            return var;
+        }
+    }
+
+    return none();
+}
 
 env_scoped_t::env_scoped_t() : env_scoped_t(make_unique<var_stack_t>()) {}
 env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
@@ -234,66 +469,6 @@ void env_stack_t::universal_barrier() {
     env_universal_callbacks(this, callbacks);
 }
 
-// Get the variable stack
-var_stack_t &env_scoped_t::vars_stack() { return *vars_; }
-
-const var_stack_t &env_scoped_t::vars_stack() const { return *vars_; }
-
-/// Return the current umask value.
-static mode_t get_umask() {
-    mode_t res;
-    res = umask(0);
-    umask(res);
-    return res;
-}
-
-
-/// Some env vars contain a list of paths where an empty path element is equivalent to ".".
-/// Unfortunately that convention causes problems for fish scripts. So this function replaces the
-/// empty path element with an explicit ".". See issue #3914.
-void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
-    const auto paths = vars.get(var_name);
-    if (paths.missing_or_empty()) return;
-
-    // See if there's any empties.
-    const wcstring empty = wcstring();
-    const wcstring_list_t &strs = paths->as_list();
-    if (contains(strs, empty)) {
-        // Copy the list and replace empties with L"."
-        wcstring_list_t newstrs = strs;
-        std::replace(newstrs.begin(), newstrs.end(), empty, wcstring(L"."));
-        int retval = vars.set(var_name, ENV_DEFAULT | ENV_USER, std::move(newstrs));
-        if (retval != ENV_OK) {
-            debug(0, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
-        }
-    }
-}
-
-/// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
-/// elements are converted to explicit "." to make the vars easier to use in fish scripts.
-static void init_path_vars() {
-    // Do not replace empties in MATHPATH - see #4158.
-    fix_colon_delimited_var(L"PATH", env_stack_t::globals());
-    fix_colon_delimited_var(L"CDPATH", env_stack_t::globals());
-}
-
-/// Make sure the PATH variable contains something.
-static void setup_path() {
-    auto &vars = env_stack_t::globals();
-    const auto path = vars.get(L"PATH");
-    if (path.missing_or_empty()) {
-#if defined(_CS_PATH)
-        // _CS_PATH: colon-separated paths to find POSIX utilities
-        std::string cspath;
-        cspath.resize(confstr(_CS_PATH, nullptr, 0));
-        confstr(_CS_PATH, &cspath[0], cspath.length());
-#else
-        std::string cspath = "/usr/bin:/bin"; // I doubt this is even necessary
-#endif
-        vars.set_one(L"PATH", ENV_GLOBAL | ENV_EXPORT, str2wcstring(cspath));
-    }
-}
-
 /// If they don't already exist initialize the `COLUMNS` and `LINES` env vars to reasonable
 /// defaults. They will be updated later by the `get_current_winsize()` function if they need to be
 /// adjusted.
@@ -319,20 +494,6 @@ void env_stack_t::set_pwd_from_getcwd() {
 
 void env_stack_t::mark_changed_exported() { vars_stack().mark_changed_exported(); }
 
-wcstring environment_t::get_pwd_slash() const {
-    // Return "/" if PWD is missing.
-    // See https://github.com/fish-shell/fish-shell/issues/5080
-    auto pwd_var = get(L"PWD");
-    wcstring pwd;
-    if (!pwd_var.missing_or_empty()) {
-        pwd = pwd_var->as_string();
-    }
-    if (!string_suffixes_string(L"/", pwd)) {
-        pwd.push_back(L'/');
-    }
-    return pwd;
-}
-
 /// Set up the USER variable.
 static void setup_user(bool force) {
     auto &vars = env_stack_t::globals();
@@ -360,6 +521,30 @@ void misc_init() {
     }
 }
 
+/// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
+/// elements are converted to explicit "." to make the vars easier to use in fish scripts.
+static void init_path_vars() {
+    // Do not replace empties in MATHPATH - see #4158.
+    fix_colon_delimited_var(L"PATH", env_stack_t::globals());
+    fix_colon_delimited_var(L"CDPATH", env_stack_t::globals());
+}
+
+/// Make sure the PATH variable contains something.
+static void setup_path() {
+    auto &vars = env_stack_t::globals();
+    const auto path = vars.get(L"PATH");
+    if (path.missing_or_empty()) {
+#if defined(_CS_PATH)
+        // _CS_PATH: colon-separated paths to find POSIX utilities
+        std::string cspath;
+        cspath.resize(confstr(_CS_PATH, nullptr, 0));
+        confstr(_CS_PATH, &cspath[0], cspath.length());
+#else
+        std::string cspath = "/usr/bin:/bin";  // I doubt this is even necessary
+#endif
+        vars.set_one(L"PATH", ENV_GLOBAL | ENV_EXPORT, str2wcstring(cspath));
+    }
+}
 
 void env_init(const struct config_paths_t *paths /* or NULL */) {
     env_stack_t &vars = env_stack_t::globals();
@@ -802,124 +987,6 @@ int env_stack_t::remove(const wcstring &key, int var_mode) {
     return erased ? ENV_OK : ENV_NOT_FOUND;
 }
 
-const wcstring_list_t &env_var_t::as_list() const { return *vals_; }
-
-wchar_t env_var_t::get_delimiter() const {
-    return is_pathvar() ? PATH_ARRAY_SEP : NONPATH_ARRAY_SEP;
-}
-
-/// Return a string representation of the var.
-wcstring env_var_t::as_string() const { return join_strings(*vals_, get_delimiter()); }
-
-void env_var_t::to_list(wcstring_list_t &out) const { out = *vals_; }
-
-env_var_t::env_var_flags_t env_var_t::flags_for(const wchar_t *name) {
-    env_var_flags_t result = 0;
-    if (is_read_only(name)) result |= flag_read_only;
-    return result;
-}
-
-/// \return a singleton empty list, to avoid unnecessary allocations in env_var_t.
-std::shared_ptr<const wcstring_list_t> env_var_t::empty_list() {
-    static const auto result = std::make_shared<const wcstring_list_t>();
-    return result;
-}
-
-/// \return a the value of a variable for \p key, which must be electric (computed).
-static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t &vars) {
-    if (key == L"history") {
-        // Big hack. We only allow getting the history on the main thread. Note that history_t
-        // may ask for an environment variable, so don't take the lock here (we don't need it).
-        if (!is_main_thread()) {
-            return none();
-        }
-
-        history_t *history = reader_get_history();
-        if (!history) {
-            history = &history_t::history_with_name(history_session_id(vars));
-        }
-        wcstring_list_t result;
-        if (history) history->get_history(result);
-        return env_var_t(L"history", result);
-    } else if (key == L"pipestatus") {
-        const auto js = proc_get_last_statuses();
-        wcstring_list_t result;
-        result.reserve(js.pipestatus.size());
-        for (int i : js.pipestatus) {
-            result.push_back(to_string(i));
-        }
-        return env_var_t(L"pipestatus", std::move(result));
-    } else if (key == L"status") {
-        return env_var_t(L"status", to_string(proc_get_last_status()));
-    } else if (key == L"umask") {
-        return env_var_t(L"umask", format_string(L"0%0.3o", get_umask()));
-    }
-    // We should never get here unless the electric var list is out of sync with the above code.
-    DIE("unrecognized electric var name");
-}
-
-maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode) const {
-    const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
-    const bool search_local = !has_scope || (mode & ENV_LOCAL);
-    const bool search_global = !has_scope || (mode & ENV_GLOBAL);
-    const bool search_universal = !has_scope || (mode & ENV_UNIVERSAL);
-
-    const bool search_exported = (mode & ENV_EXPORT) || !(mode & ENV_UNEXPORT);
-    const bool search_unexported = (mode & ENV_UNEXPORT) || !(mode & ENV_EXPORT);
-
-    // Make the assumption that electric keys can't be shadowed elsewhere, since we currently block
-    // that in env_stack_t::set().
-    if (is_electric(key)) {
-        if (!search_global) return none();
-        return get_electric(key, *this);
-    }
-
-    if (search_local || search_global) {
-        scoped_lock locker(env_lock);  // lock around a local region
-        env_node_ref_t env = search_local ? vars_stack().top : vars_stack().global_env;
-
-        while (env != NULL) {
-            if (env == vars_stack().global_env && !search_global) {
-                break;
-            }
-
-            var_table_t::const_iterator result = env->env.find(key);
-            if (result != env->env.end()) {
-                const env_var_t &var = result->second;
-                if (var.exports() ? search_exported : search_unexported) {
-                    return var;
-                }
-            }
-            env = vars_stack().next_scope_to_search(env);
-        }
-    }
-    // Okay, we couldn't find a local or global var given the requirements. If there is a matching
-    // universal var return that.
-    if (search_universal && uvars()) {
-        auto var = uvars()->get(key);
-        if (var && (var->exports() ? search_exported : search_unexported)) {
-            return var;
-        }
-    }
-
-    return none();
-}
-
-void env_universal_barrier() {env_stack_t::principal().universal_barrier(); }
-
-/// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
-/// variable.
-bool var_stack_t::local_scope_exports(const env_node_ref_t &n) const {
-    assert(n != nullptr);
-    if (n == global_env) return false;
-
-    if (n->exportv) return true;
-
-    if (n->new_scope) return false;
-
-    return local_scope_exports(n->next);
-}
-
 void env_stack_t::push(bool new_scope) { vars_stack().push(new_scope); }
 
 void env_stack_t::pop() {
@@ -941,20 +1008,6 @@ void env_stack_t::pop() {
     }
 }
 
-/// Function used with to insert keys of one table into a set::set<wcstring>.
-static void add_key_to_string_set(const var_table_t &envs, std::set<wcstring> *str_set,
-                                  bool show_exported, bool show_unexported) {
-    var_table_t::const_iterator iter;
-    for (iter = envs.begin(); iter != envs.end(); ++iter) {
-        const env_var_t &var = iter->second;
-
-        if ((var.exports() && show_exported) || (!var.exports() && show_unexported)) {
-            // Insert this key.
-            str_set->insert(iter->first);
-        }
-    }
-}
-
 wcstring_list_t env_scoped_t::get_names(int flags) const {
     scoped_lock locker(env_lock);
 
@@ -968,6 +1021,17 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
     const bool show_exported = (flags & ENV_EXPORT) || !(flags & ENV_UNEXPORT);
     const bool show_unexported = (flags & ENV_UNEXPORT) || !(flags & ENV_EXPORT);
 
+    // Helper to add the names of variables from \p envs to names, respecting show_exported and
+    // show_unexported.
+    auto add_keys = [&](const var_table_t &envs) {
+        for (const auto &kv : envs) {
+            const env_var_t &var = kv.second;
+            if (var.exports() ? show_exported : show_unexported) {
+                names.insert(kv.first);
+            }
+        }
+    };
+
     if (!show_local && !show_global && !show_universal) {
         show_local = show_universal = show_global = 1;
     }
@@ -975,8 +1039,7 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
     if (show_local) {
         while (n) {
             if (n == vars_stack().global_env) break;
-
-            add_key_to_string_set(n->env, &names, show_exported, show_unexported);
+            add_keys(n->env);
             if (n->new_scope)
                 break;
             else
@@ -985,7 +1048,7 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
     }
 
     if (show_global) {
-        add_key_to_string_set(vars_stack().global_env->env, &names, show_exported, show_unexported);
+        add_keys(vars_stack().global_env->env);
         if (show_unexported) {
             result.insert(result.end(), std::begin(env_electric), std::end(env_electric));
         }
@@ -1000,76 +1063,6 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
     return result;
 }
 
-/// Get list of all exported variables.
-void var_stack_t::get_exported(const env_node_t *n, var_table_t &h) const {
-    if (!n) return;
-
-    if (n->new_scope) {
-        get_exported(global_env.get(), h);
-    } else {
-        get_exported(n->next.get(), h);
-    }
-
-    var_table_t::const_iterator iter;
-    for (iter = n->env.begin(); iter != n->env.end(); ++iter) {
-        const wcstring &key = iter->first;
-        const env_var_t var = iter->second;
-
-        if (var.exports()) {
-            // Export the variable. Don't use std::map::insert here, since we need to overwrite
-            // existing values from previous scopes.
-            h[key] = var;
-        } else {
-            // We need to erase from the map if we are not exporting, since a lower scope may have
-            // exported. See #2132.
-            h.erase(key);
-        }
-    }
-}
-
-// Given a map from key to value, return a vector of strings of the form key=value
-static std::vector<std::string> get_export_list(const var_table_t &envs) {
-    std::vector<std::string> result;
-    result.reserve(envs.size());
-    for (const auto &kv : envs) {
-        std::string ks = wcs2string(kv.first);
-        std::string vs = wcs2string(kv.second.as_string());
-        // Create and append a string of the form ks=vs
-        std::string str;
-        str.reserve(ks.size() + 1 + vs.size());
-        str.append(ks);
-        str.append("=");
-        str.append(vs);
-        result.push_back(std::move(str));
-    }
-    return result;
-}
-
-void var_stack_t::update_export_array_if_necessary() {
-    if (!this->has_changed_exported()) {
-        return;
-    }
-
-    debug(4, L"export_arr() recalc");
-    var_table_t vals;
-    get_exported(this->top.get(), vals);
-
-    if (uvars()) {
-        const wcstring_list_t uni = uvars()->get_names(true, false);
-        for (const wcstring &key : uni) {
-            auto var = uvars()->get(key);
-
-            if (!var.missing_or_empty()) {
-                // Note that std::map::insert does NOT overwrite a value already in the map,
-                // which we depend on here.
-                vals.insert(std::pair<wcstring, env_var_t>(key, *var));
-            }
-        }
-    }
-
-    export_array.emplace(get_export_list(vals));
-}
-
 const char *const *env_stack_t::export_arr() {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
@@ -1090,22 +1083,9 @@ void env_stack_t::set_argv(const wchar_t *const *argv) {
     }
 }
 
-environment_t::~environment_t() = default;
 env_stack_t::~env_stack_t() = default;
 env_stack_t::env_stack_t(env_stack_t &&) = default;
 
-null_environment_t::null_environment_t() = default;
-null_environment_t::~null_environment_t() = default;
-maybe_t<env_var_t> null_environment_t::get(const wcstring &key, env_mode_flags_t mode) const {
-    UNUSED(key);
-    UNUSED(mode);
-    return none();
-}
-wcstring_list_t null_environment_t::get_names(int flags) const {
-    UNUSED(flags);
-    return {};
-}
-
 env_stack_t env_stack_t::make_principal() {
     const env_stack_t &gl = env_stack_t::globals();
     std::unique_ptr<var_stack_t> dup_stack = make_unique<var_stack_t>(gl.vars_stack().clone());

From 0ca3ae7c7e90c3339039f73f0940705011d6bbe7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 14:52:54 -0700
Subject: [PATCH 0362/1732] Rejigger var_stack_t's ctors

Prepare var_stack_t to support snapshotting.
---
 src/env.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index d5a25ccf7..1f3ef37e8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -247,12 +247,8 @@ struct var_stack_t {
 
     void update_export_array_if_necessary();
 
-    var_stack_t() : top(globals()), global_env(globals()) {
-        // Add a toplevel local scope on top of the global scope. This local scope will persist
-        // throughout the lifetime of the fish process, and it will ensure that `set -l` commands
-        // run at the command-line don't affect the global scope.
-        push(false);
-    }
+    var_stack_t(env_node_ref_t top, env_node_ref_t global_env)
+        : top(std::move(top)), global_env(std::move(global_env)) {}
 
     // Pushes a new node onto our stack
     // Optionally creates a new scope for the node
@@ -309,16 +305,27 @@ struct var_stack_t {
         return var_stack_t(*this);
     }
 
-    /// return true if the topomst local scope exports a variable.
+    /// \return true if the topomst local scope exports a variable.
     bool local_scope_exports(const env_node_ref_t &n) const;
 
+    /// \return a new stack with a single top level local scope.
+    // This local scope will persist throughout the lifetime of the fish process, and it will ensure
+    // that `set -l` commands run at the command-line don't affect the global scope.
+    static std::unique_ptr<var_stack_t> create() {
+        auto locals = std::make_shared<env_node_t>(false, globals());
+        return make_unique<var_stack_t>(std::move(locals), globals());
+    }
+
    private:
     /// Copy constructor. This does not copy the export array; it just allows it to be regenerated.
     var_stack_t(const var_stack_t &rhs) : top(rhs.top), global_env(rhs.global_env) {}
 
     void get_exported(const env_node_t *n, var_table_t &h) const;
 
-    /// Returns the global variable set.
+    /// \return the global variable set.
+    /// Note that this is the only place where we talk about a single global variable set; each
+    /// var_stack_t has its own reference to globals and could potentially have a different global
+    /// set.
     static env_node_ref_t globals() {
         static env_node_ref_t s_globals{std::make_shared<env_node_t>(false, nullptr)};
         return s_globals;
@@ -451,7 +458,7 @@ maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode)
     return none();
 }
 
-env_scoped_t::env_scoped_t() : env_scoped_t(make_unique<var_stack_t>()) {}
+env_scoped_t::env_scoped_t() : env_scoped_t(var_stack_t::create()) {}
 env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
 env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
 env_scoped_t::~env_scoped_t() = default;

From 64584a66245ad5e31def5098ef8e590f4a101fe9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 15:29:23 -0700
Subject: [PATCH 0363/1732] Add a snapshot function to env_scoped_t

Allow creating lightweight read-only copies of a scoped environment.
---
 src/env.cpp | 31 +++++++++++++++++++++++++++++++
 src/env.h   |  6 ++++++
 2 files changed, 37 insertions(+)

diff --git a/src/env.cpp b/src/env.cpp
index 1f3ef37e8..35034c80c 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -305,6 +305,15 @@ struct var_stack_t {
         return var_stack_t(*this);
     }
 
+    /// Snapshot this vars_stack. That is, return a new vars_stack that has copies of all local
+    /// variables. Note that this drops all shadowed nodes: only the currently executing function is
+    /// copied. Global variables are referenced, not copied; this is both because there are a lot of
+    /// global varibables so copying would be expensive, and some (electrics) are computed so cannot
+    /// be effectively copied.
+    std::unique_ptr<var_stack_t> snapshot() const {
+        return make_unique<var_stack_t>(snapshot_node(top), global_env);
+    }
+
     /// \return true if the topomst local scope exports a variable.
     bool local_scope_exports(const env_node_ref_t &n) const;
 
@@ -322,6 +331,24 @@ struct var_stack_t {
 
     void get_exported(const env_node_t *n, var_table_t &h) const;
 
+    /// Recursive helper for snapshot(). Snapshot a node and its unshadows parents, returning it.
+    env_node_ref_t snapshot_node(const env_node_ref_t &node) const {
+        assert(node && "null node in snapshot_node");
+        // If we are global, re-use the global node. If we reach a new scope, jump to globals; we
+        // don't snapshot shadowed scopes, because the snapshot is intended to be read-only and so
+        // there would be no way to access them.
+        if (node == global_env) {
+            return node;
+        }
+        auto next = snapshot_node(node->new_scope ? global_env : node->next);
+        auto result = std::make_shared<env_node_t>(node->new_scope, next);
+        // Copy over variables.
+        // Note assigning env is a potentially big copy.
+        result->exportv = node->exportv;
+        result->env = node->env;
+        return result;
+    }
+
     /// \return the global variable set.
     /// Note that this is the only place where we talk about a single global variable set; each
     /// var_stack_t has its own reference to globals and could potentially have a different global
@@ -458,6 +485,10 @@ maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode)
     return none();
 }
 
+std::shared_ptr<environment_t> env_scoped_t::snapshot() const {
+    return std::shared_ptr<env_scoped_t>(new env_scoped_t(vars_->snapshot()));
+}
+
 env_scoped_t::env_scoped_t() : env_scoped_t(var_stack_t::create()) {}
 env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
 env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
diff --git a/src/env.h b/src/env.h
index fa598f629..c43cd92b4 100644
--- a/src/env.h
+++ b/src/env.h
@@ -216,6 +216,12 @@ class env_scoped_t : public environment_t {
     /// Returns all variable names.
     wcstring_list_t get_names(int flags) const override;
 
+    /// Snapshot this environment. This means returning a read-only copy. Local variables are copied
+    /// but globals are shared (i.e. changes to global will be visible to this snapshot). This
+    /// returns a shared_ptr for convenience, since the most common reason to snapshot is because
+    /// you want to read from another thread.
+    std::shared_ptr<environment_t> snapshot() const;
+
     ~env_scoped_t() override;
 };
 

From 020d4a2848d6456d8c87195d6040fa44d24c728d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 15:38:58 -0700
Subject: [PATCH 0364/1732] Adopt env_scoped_t::snapshot() and remove
 env_var_snapshot_t

Remove the env_var_snapshot_t class and switch everything to the new snapshot
function of env_scoped_t.

Fixes #5658. Fixes #5571.
---
 src/env.cpp        | 34 ----------------------------------
 src/env.h          | 24 +-----------------------
 src/fish_tests.cpp |  2 +-
 src/reader.cpp     | 14 ++++++--------
 4 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 35034c80c..d40f98c75 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -181,7 +181,6 @@ wcstring environment_t::get_pwd_slash() const {
     return pwd;
 }
 
-null_environment_t::null_environment_t() = default;
 null_environment_t::~null_environment_t() = default;
 maybe_t<env_var_t> null_environment_t::get(const wcstring &key, env_mode_flags_t mode) const {
     UNUSED(key);
@@ -1140,39 +1139,6 @@ env_stack_t &env_stack_t::globals() {
     return s_global;
 }
 
-env_vars_snapshot_t::env_vars_snapshot_t(const environment_t &source, const wchar_t *const *keys) {
-    ASSERT_IS_MAIN_THREAD();
-    wcstring key;
-    for (size_t i = 0; keys[i]; i++) {
-        key.assign(keys[i]);
-        const auto var = source.get(key);
-        if (var) {
-            vars[key] = std::move(*var);
-        }
-    }
-    names = source.get_names(0);
-}
-
-env_vars_snapshot_t::~env_vars_snapshot_t() = default;
-
-maybe_t<env_var_t> env_vars_snapshot_t::get(const wcstring &key, env_mode_flags_t mode) const {
-    UNUSED(mode);
-    auto iter = vars.find(key);
-    if (iter == vars.end()) return none();
-    return iter->second;
-}
-
-wcstring_list_t env_vars_snapshot_t::get_names(int flags) const {
-    UNUSED(flags);
-    return names;
-}
-
-const wchar_t *const env_vars_snapshot_t::highlighting_keys[] = {
-    L"PATH", L"CDPATH", L"fish_function_path", L"PWD", L"HOME", NULL};
-
-const wchar_t *const env_vars_snapshot_t::completing_keys[] = {
-    L"PATH", L"CDPATH", L"fish_function_path", L"PWD", L"HOME", NULL};
-
 #if defined(__APPLE__) || defined(__CYGWIN__)
 static int check_runtime_path(const char *path) {
     UNUSED(path);
diff --git a/src/env.h b/src/env.h
index c43cd92b4..b61b03922 100644
--- a/src/env.h
+++ b/src/env.h
@@ -186,7 +186,7 @@ class environment_t {
 /// The null environment contains nothing.
 class null_environment_t : public environment_t {
    public:
-    null_environment_t();
+    null_environment_t() = default;
     ~null_environment_t() override;
 
     maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
@@ -296,28 +296,6 @@ class env_stack_t final : public env_scoped_t {
     static env_stack_t &globals();
 };
 
-class env_vars_snapshot_t : public environment_t {
-    std::map<wcstring, env_var_t> vars;
-    wcstring_list_t names;
-
-   public:
-    env_vars_snapshot_t() = default;
-    env_vars_snapshot_t(const env_vars_snapshot_t &) = default;
-    env_vars_snapshot_t &operator=(const env_vars_snapshot_t &) = default;
-    env_vars_snapshot_t(const environment_t &source, const wchar_t *const *keys);
-    ~env_vars_snapshot_t() override;
-
-    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
-
-    wcstring_list_t get_names(int flags) const override;
-
-    // Vars necessary for highlighting.
-    static const wchar_t *const highlighting_keys[];
-
-    // Vars necessary for completion.
-    static const wchar_t *const completing_keys[];
-};
-
 extern int g_fork_count;
 extern bool g_use_posix_spawn;
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 136a50680..5741b20b6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2914,7 +2914,7 @@ static void test_autosuggest_suggest_special() {
 
 static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {
     completion_list_t comps;
-    complete(command, &comps, COMPLETION_REQUEST_AUTOSUGGESTION, env_vars_snapshot_t{});
+    complete(command, &comps, COMPLETION_REQUEST_AUTOSUGGESTION, null_environment_t{});
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
diff --git a/src/reader.cpp b/src/reader.cpp
index 90f2ad51e..d7a43da5d 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1276,10 +1276,9 @@ void reader_data_t::completion_insert(const wchar_t *val, complete_flags_t flags
 // on a background thread) to determine the autosuggestion
 static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer(
     const wcstring &search_string, size_t cursor_pos, history_t *history) {
-    const auto &parser_vars = parser_t::principal_parser().vars();
     const unsigned int generation_count = read_generation_count();
-    const wcstring working_directory = parser_vars.get_pwd_slash();
-    env_vars_snapshot_t vars(parser_vars, env_vars_snapshot_t::completing_keys);
+    auto vars = parser_t::principal_parser().vars().snapshot();
+    const wcstring working_directory = vars->get_pwd_slash();
     // TODO: suspicious use of 'history' here
     // This is safe because histories are immortal, but perhaps
     // this should use shared_ptr
@@ -1306,7 +1305,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
             // Skip items with newlines because they make terrible autosuggestions.
             if (item.str().find('\n') != wcstring::npos) continue;
 
-            if (autosuggest_validate_from_history(item, working_directory, vars)) {
+            if (autosuggest_validate_from_history(item, working_directory, *vars)) {
                 // The command autosuggestion was handled specially, so we're done.
                 return {searcher.current_string(), search_string};
             }
@@ -1328,7 +1327,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         // Try normal completions.
         completion_request_flags_t complete_flags = COMPLETION_REQUEST_AUTOSUGGESTION;
         std::vector<completion_t> completions;
-        complete(search_string, &completions, complete_flags, vars);
+        complete(search_string, &completions, complete_flags, *vars);
         completions_sort_and_prioritize(&completions, complete_flags);
         if (!completions.empty()) {
             const completion_t &comp = completions.at(0);
@@ -2041,8 +2040,7 @@ void reader_data_t::highlight_complete(highlight_result_t result) {
 // return a function that performs highlighting. The function may be invoked on a background thread.
 static std::function<highlight_result_t(void)> get_highlight_performer(
     const wcstring &text, long match_highlight_pos, highlight_function_t highlight_func) {
-    env_vars_snapshot_t vars(parser_t::principal_parser().vars(),
-                             env_vars_snapshot_t::highlighting_keys);
+    auto vars = parser_t::principal_parser().vars().snapshot();
     unsigned int generation_count = read_generation_count();
     return [=]() -> highlight_result_t {
         if (text.empty()) return {};
@@ -2052,7 +2050,7 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
         }
         s_thread_generation = generation_count;
         std::vector<highlight_spec_t> colors(text.size(), highlight_spec_t{});
-        highlight_func(text, colors, match_highlight_pos, NULL /* error */, vars);
+        highlight_func(text, colors, match_highlight_pos, NULL /* error */, *vars);
         return {std::move(colors), text};
     };
 }

From 2fac0f0b395279eac63f34aa2d7a4ba988e18c50 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 16:08:29 -0700
Subject: [PATCH 0365/1732] Correctly lock around umask

umask can only be set, never just queried. Thus we need to lock around
calls to it.

Also guess the value; if we guess right we don't need to reset it.
---
 src/env.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index d40f98c75..a88a28c87 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -112,9 +112,14 @@ static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t
         return env_var_t(L"status", to_string(proc_get_last_status()));
     } else if (key == L"umask") {
         // note umask() is an absurd API: you call it to set the value and it returns the old value.
-        // Thus we have to call it twice, to reset the value. TODO: lock!
-        mode_t res = umask(0);
-        umask(res);
+        // Thus we have to call it twice, to reset the value.
+        // We need to lock since otherwise this races.
+        // Guess what the umask is; if we guess right we don't need to reset it.
+        static std::mutex umask_lock;
+        scoped_lock locker(umask_lock);
+        int guess = 022;
+        mode_t res = umask(guess);
+        if (res != guess) umask(res);
         return env_var_t(L"umask", format_string(L"0%0.3o", res));
     }
     // We should never get here unless the electric var list is out of sync with the above code.

From 6b52b0994c335859bae422d2eab004a5578dba9a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 14 Apr 2019 17:43:02 -0700
Subject: [PATCH 0366/1732] Attempt to fix the travis build

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

diff --git a/src/env.cpp b/src/env.cpp
index a88a28c87..ff639d294 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -493,7 +493,6 @@ std::shared_ptr<environment_t> env_scoped_t::snapshot() const {
     return std::shared_ptr<env_scoped_t>(new env_scoped_t(vars_->snapshot()));
 }
 
-env_scoped_t::env_scoped_t() : env_scoped_t(var_stack_t::create()) {}
 env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
 env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
 env_scoped_t::~env_scoped_t() = default;
@@ -1140,7 +1139,7 @@ env_stack_t &env_stack_t::principal() {
 }
 
 env_stack_t &env_stack_t::globals() {
-    static env_stack_t s_global;
+    static env_stack_t s_global(var_stack_t::create());
     return s_global;
 }
 

From f4e40f2f4b5d3639b3deea865533ed07d1e5cfc4 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 14 Apr 2019 20:35:02 -0700
Subject: [PATCH 0367/1732] set completions: complete __ variables

Now that __ stuff is sorted after a-z, we should not completely
omit them from completions.
---
 share/completions/set.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index 757fa6009..88fdc8939 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -72,9 +72,9 @@ complete -c set -n '__fish_is_first_token' -s S -l show -d "Show 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_first_token; 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_first_token; 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_first_token; 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_first_token; 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 replace ' ' \t'Local Variable: ')"
+complete -c set -n '__fish_is_first_token; 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 replace ' ' \t'Global Variable: ')"
+complete -c set -n '__fish_is_first_token; 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 replace ' ' \t'Universal Variable: ')"
 # Complete scope-specific variables
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s l -l local' -x -a "(set -l | string match -rv '^__' | string replace ' ' \t'Local Variable: ')"
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s g -l global' -x -a "(set -g | string match -rv '^__' | string replace ' ' \t'Global Variable: ')"

From 89b6b05f88d5d31c515eb060772ea686f7e2f4b6 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 15 Apr 2019 12:24:54 -0700
Subject: [PATCH 0368/1732] Fix `builtin` completions

Command substitution needs parenthesis
---
 share/completions/builtin.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/builtin.fish b/share/completions/builtin.fish
index 52f48d4f9..9a24eb3b5 100644
--- a/share/completions/builtin.fish
+++ b/share/completions/builtin.fish
@@ -2,4 +2,4 @@
 complete -c builtin -s h -l help -d 'Display help and exit'
 complete -c builtin -s n -l names -d 'Print names of all existing builtins'
 complete -c builtin -xa '(builtin -n)'
-complete -c builtin -n '__fish_use_subcommand' -xa '__fish_complete_subcommand'
+complete -c builtin -n '__fish_use_subcommand' -xa '(__fish_complete_subcommand)'

From 92f4a009b3411dfa294d63591c7af85770727569 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 15 Apr 2019 12:49:24 -0700
Subject: [PATCH 0369/1732] __fish_config_interactive: disable file completions
 for builtins

Calling `complete` once here is preferable to adding a bunch of
1 line files to be autoloaded.
---
 share/functions/__fish_config_interactive.fish | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 7b63c69d3..67384da82 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -164,6 +164,11 @@ function __fish_config_interactive -d "Initializations that should be performed
     #
     complete -c [ --wraps test
 
+    #
+    # Only a few builtins take filenames; initialize the rest with no file completions
+    #
+    complete -c(builtin -n | string match -rv 'source|cd|exec|realpath') --no-files
+
     # Reload key bindings when binding variable change
     function __fish_reload_key_bindings -d "Reload key bindings when binding variable change" --on-variable fish_key_bindings
         # Make sure some key bindings are set

From 65bc94c4932b8d24f793f8fbdc9cabd324e2861a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 15 Apr 2019 12:57:59 -0700
Subject: [PATCH 0370/1732] Revert "set completions: complete __ variables"

This reverts commit f4e40f2f4b5d3639b3deea865533ed07d1e5cfc4.
---
 share/completions/set.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index 88fdc8939..757fa6009 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -72,9 +72,9 @@ complete -c set -n '__fish_is_first_token' -s S -l show -d "Show 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_first_token; 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 replace ' ' \t'Local Variable: ')"
-complete -c set -n '__fish_is_first_token; 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 replace ' ' \t'Global Variable: ')"
-complete -c set -n '__fish_is_first_token; 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 replace ' ' \t'Universal Variable: ')"
+complete -c set -n '__fish_is_first_token; 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_first_token; 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_first_token; 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 scope-specific variables
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s l -l local' -x -a "(set -l | string match -rv '^__' | string replace ' ' \t'Local Variable: ')"
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s g -l global' -x -a "(set -g | string match -rv '^__' | string replace ' ' \t'Global Variable: ')"

From 7e514d2aa5579ef5b0386deb8d6296a87742934e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 16 Apr 2019 21:33:09 -0700
Subject: [PATCH 0371/1732] expand_abbreviation(): escape when looking up
 abbreviation vars

This was doing exactly the opposite: unescaping and not hitting
the encoded _fish_abbr_X variables when looking up.

Fixes #5573
---
 src/expand.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 079f0199f..4beb8ede8 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1180,11 +1180,11 @@ bool fish_xdm_login_hack_hack_hack_hack(std::vector<std::string> *cmds, int argc
 maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &vars) {
     if (src.empty()) return none();
 
-    wcstring unesc_src;
-    if (!unescape_string(src, &unesc_src, STRING_STYLE_VAR)) {
+    wcstring esc_src = escape_string(src, 0, STRING_STYLE_VAR);
+    if (esc_src.empty()) {
         return none();
     }
-    wcstring var_name = L"_fish_abbr_" + unesc_src;
+    wcstring var_name = L"_fish_abbr_" + esc_src;
     if (auto var_value = vars.get(var_name)) {
         return var_value->as_string();
     }

From 2e119813e11e99e8cb95d257198b9e5023f02701 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 16 Apr 2019 22:27:01 -0700
Subject: [PATCH 0372/1732] get_abbreviations to accept an environment_t

Now that we don't have dorky snapshotting, thread an dnvironment_t through
get_abbreviations. Removes a usage of env_stack_t::principal().
---
 src/complete.cpp | 2 +-
 src/expand.cpp   | 4 +---
 src/expand.h     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index d4091855d..37929e372 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -707,7 +707,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
 }
 
 void completer_t::complete_abbr(const wcstring &cmd) {
-    std::map<wcstring, wcstring> abbrs = get_abbreviations();
+    std::map<wcstring, wcstring> abbrs = get_abbreviations(vars);
     std::vector<completion_t> possible_comp;
     possible_comp.reserve(abbrs.size());
     for (const auto &kv : abbrs) {
diff --git a/src/expand.cpp b/src/expand.cpp
index 4beb8ede8..aa91f3d4b 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1197,9 +1197,8 @@ maybe_t<wcstring> expand_abbreviation(const wcstring &src) {
     return expand_abbreviation(src, env_stack_t::principal());
 }
 
-std::map<wcstring, wcstring> get_abbreviations() {
+std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars) {
     // TODO: try to make this cheaper
-    const auto &vars = env_stack_t::principal();
     const size_t fish_abbr_len = std::wcslen(L"_fish_abbr_");
     auto names = vars.get_names(0);
     std::map<wcstring, wcstring> result;
@@ -1210,4 +1209,3 @@ std::map<wcstring, wcstring> get_abbreviations() {
     }
     return result;
 }
-
diff --git a/src/expand.h b/src/expand.h
index 2386f45c4..84500c37e 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -165,7 +165,7 @@ maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &
 maybe_t<wcstring> expand_abbreviation(const wcstring &src);
 
 /// \return a snapshot of all abbreviations as a map abbreviation->expansion.
-std::map<wcstring, wcstring> get_abbreviations();
+std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars);
 
 // Terrible hacks
 bool fish_xdm_login_hack_hack_hack_hack(std::vector<std::string> *cmds, int argc,

From a173c079d5a9de8b956c6871e2fd9ccda04838ad Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 16 Apr 2019 22:36:11 -0700
Subject: [PATCH 0373/1732] expand_abbreviation to always accept an
 environment_t

Now that snapshotting is fixed, we don't need to get the principal
environment stack any more.
---
 src/expand.cpp    | 6 ------
 src/expand.h      | 1 -
 src/highlight.cpp | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index aa91f3d4b..55720c951 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1191,12 +1191,6 @@ maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &
     return none();
 }
 
-maybe_t<wcstring> expand_abbreviation(const wcstring &src) {
-    // FIXME: We use the principal environment stack because we don't know which variables need to
-    // be captured in a snapshot.
-    return expand_abbreviation(src, env_stack_t::principal());
-}
-
 std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars) {
     // TODO: try to make this cheaper
     const size_t fish_abbr_len = std::wcslen(L"_fish_abbr_");
diff --git a/src/expand.h b/src/expand.h
index 84500c37e..3970ae0b2 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -162,7 +162,6 @@ wcstring replace_home_directory_with_tilde(const wcstring &str, const environmen
 /// Abbreviation support. Expand src as an abbreviation, returning the expanded form if found,
 /// none() if not.
 maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &vars);
-maybe_t<wcstring> expand_abbreviation(const wcstring &src);
 
 /// \return a snapshot of all abbreviations as a map abbreviation->expansion.
 std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars);
diff --git a/src/highlight.cpp b/src/highlight.cpp
index bea5a6dc5..f9e9ea158 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1100,7 +1100,7 @@ static bool command_is_valid(const wcstring &cmd, enum parse_statement_decoratio
     if (!is_valid && function_ok) is_valid = function_exists_no_autoload(cmd, vars);
 
     // Abbreviations
-    if (!is_valid && abbreviation_ok) is_valid = expand_abbreviation(cmd).has_value();
+    if (!is_valid && abbreviation_ok) is_valid = expand_abbreviation(cmd, vars).has_value();
 
     // Regular commands
     if (!is_valid && command_ok) is_valid = path_get_path(cmd, NULL, vars);

From 4d8a82b68f2abc117dde52f616ed209d2fd2c9fb Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 17 Apr 2019 18:31:14 +0800
Subject: [PATCH 0374/1732] benchmarks: use true executable in path

true is /bin/true on some Linux and /usr/bin/true on macOS.

[ci skip]
---
 benchmarks/benchmarks/external_cmds.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/benchmarks/external_cmds.fish b/benchmarks/benchmarks/external_cmds.fish
index 9c79e6f2e..7fc39561d 100644
--- a/benchmarks/benchmarks/external_cmds.fish
+++ b/benchmarks/benchmarks/external_cmds.fish
@@ -1,4 +1,4 @@
 for i in (seq 2000)
-   /usr/bin/true
+   command true
 end
 

From d66ec08819f14b28d828c6e159f91a67a7342ebb Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 17 Apr 2019 22:37:19 -0500
Subject: [PATCH 0375/1732] Add partial `aws` and ~full `aws s3` completions

[ci skip]
---
 share/completions/aws.fish | 210 +++++++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 share/completions/aws.fish

diff --git a/share/completions/aws.fish b/share/completions/aws.fish
new file mode 100644
index 000000000..e9bca56b8
--- /dev/null
+++ b/share/completions/aws.fish
@@ -0,0 +1,210 @@
+# These are very much incomplete completions for the aws-cli suite.
+# In addition to a complete list of services, the `aws s3` completions are mostly complete
+# (and are the primary reason this file exists). The automatically generated completions
+# for `aws` via `fish_update_completions` are pretty useless due to non-standard formatting.
+
+function __s3_is_bucket
+	commandline -ct | string match -q -r -- '^s3://[^/]?$'
+end
+
+function __s3_is_remote_path
+	commandline -ct | string match -q -r -- "^s3://.*/.*"
+end
+
+function __s3_ls_buckets
+	aws s3 ls | string replace -rf '.* (\S+)$' 's3://$1/'
+end
+
+function __s3_ls_dir
+	set -l dir (commandline -ct | string replace -rf '(s3://.*/).*' '$1')
+	printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
+end
+
+# S3 remote completions
+complete -c 'aws' -n "__fish_prev_arg_in s3" -xa "cp mv rm help sync ls mb mv presign rb website"
+complete -c 'aws' -n "__s3_is_remote_path" -xa "(__s3_ls_dir)"
+complete -c 'aws' -n "__s3_is_bucket" -xa "(__s3_ls_buckets)"
+complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in ls" -xa "(__s3_ls_buckets)"
+complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in mv cp rm" -a "(__s3_ls_buckets)"
+
+# This list is extracted from the output of `aws help`, which can't be ingested directly,
+# as it emits considerable ANSI output and other terminal control characters.
+set -l aws_services \
+	acm \
+	acm-pca \
+	alexaforbusiness \
+	amplify \
+	apigateway \
+	apigatewaymanagementapi \
+	apigatewayv2 \
+	application-autoscaling \
+	appmesh \
+	appstream \
+	appsync \
+	athena \
+	autoscaling \
+	autoscaling-plans \
+	backup \
+	batch \
+	budgets \
+	ce \
+	chime \
+	cloud9 \
+	clouddirectory \
+	cloudformation \
+	cloudfront \
+	cloudhsm \
+	cloudhsmv2 \
+	cloudsearch \
+	cloudsearchdomain \
+	cloudtrail \
+	cloudwatch \
+	codebuild \
+	codecommit \
+	codepipeline \
+	codestar \
+	cognito-identity \
+	cognito-idp \
+	cognito-sync \
+	comprehend \
+	comprehendmedical \
+	configservice \
+	configure \
+	connect \
+	cur \
+	datapipeline \
+	datasync \
+	dax \
+	deploy \
+	devicefarm \
+	directconnect \
+	discovery \
+	dlm \
+	dms \
+	docdb \
+	ds \
+	dynamodb \
+	dynamodbstreams \
+	ec2 \
+	ecr \
+	ecs \
+	efs \
+	eks \
+	elasticache \
+	elasticbeanstalk \
+	elastictranscoder \
+	elb \
+	elbv2 \
+	emr \
+	es \
+	events \
+	firehose \
+	fms \
+	fsx \
+	gamelift \
+	glacier \
+	globalaccelerator \
+	glue \
+	greengrass \
+	guardduty \
+	health \
+	help \
+	history \
+	iam \
+	importexport \
+	inspector \
+	iot \
+	iot-data \
+	iot-jobs-data \
+	iot1click-devices \
+	iot1click-projects \
+	iotanalytics \
+	kafka \
+	kinesis \
+	kinesis-video-archived-media \
+	kinesis-video-media \
+	kinesisanalytics \
+	kinesisanalyticsv2 \
+	kinesisvideo \
+	kms \
+	lambda \
+	lex-models \
+	lex-runtime \
+	license-manager \
+	lightsail \
+	logs \
+	machinelearning \
+	macie \
+	marketplace-entitlement \
+	marketplacecommerceanalytics \
+	mediaconnect \
+	mediaconvert \
+	medialive \
+	mediapackage \
+	mediastore \
+	mediastore-data \
+	mediatailor \
+	meteringmarketplace \
+	mgh \
+	mobile \
+	mq \
+	mturk \
+	neptune \
+	opsworks \
+	opsworks-cm \
+	organizations \
+	pi \
+	pinpoint \
+	pinpoint-email \
+	pinpoint-sms-voice \
+	polly \
+	pricing \
+	quicksight \
+	ram \
+	rds \
+	rds-data \
+	redshift \
+	rekognition \
+	resource-groups \
+	resourcegroupstaggingapi \
+	robomaker \
+	route53 \
+	route53domains \
+	route53resolver \
+	s3 \
+	s3api \
+	s3control \
+	sagemaker \
+	sagemaker-runtime \
+	sdb \
+	secretsmanager \
+	securityhub \
+	serverlessrepo \
+	servicecatalog \
+	servicediscovery \
+	ses \
+	shield \
+	signer \
+	sms \
+	snowball \
+	sns \
+	sqs \
+	ssm \
+	stepfunctions \
+	storagegateway \
+	sts \
+	support \
+	swf \
+	textract \
+	transcribe \
+	transfer \
+	translate \
+	waf \
+	waf-regional \
+	workdocs \
+	worklink \
+	workmail \
+	workspaces \
+	xray
+
+complete -c aws -n '__fish_is_first_arg' -xa "$aws_services"

From 8ca264185745d3a92d7f504801b427bf48890e44 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 17 Apr 2019 22:47:41 -0500
Subject: [PATCH 0376/1732] Revert overzealous !parent_job `is_visible()`
 condition

This was added in 04a96f6 but not strictly required to fix #5803
(verified), with the intention of hiding invisible background jobs
(created by invoking a function within a pipeline) from the user, but
that also broke intentionally created jobs from displaying as well.

I'm thinking it can't be done without keeping track of caller context vs
job context.

Closes #5824.
---
 src/proc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/proc.h b/src/proc.h
index c306a9817..debff6ac9 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -401,7 +401,7 @@ class job_t {
     /// The job is in a stopped state
     bool is_stopped() const;
     /// The job is OK to be externally visible, e.g. to the user via `jobs`
-    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL) && !parent_job; };
+    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL); };
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }

From d0735882a335fb740dd00ca76332c801a2d85a4f Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 18 Apr 2019 21:12:25 +0800
Subject: [PATCH 0377/1732] add tests for the not-quite-fixed #5812

---
 tests/expansion.err | 3 +++
 tests/expansion.in  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/expansion.err b/tests/expansion.err
index d898fab04..678e91d37 100644
--- a/tests/expansion.err
+++ b/tests/expansion.err
@@ -39,3 +39,6 @@ fish: Unexpected '}' for unopened brace expansion
 echo {}}
        ^
 
+fish: Command substitutions not allowed
+command (asd)
+^
diff --git a/tests/expansion.in b/tests/expansion.in
index dc7bf48ef..e36c8ff0f 100644
--- a/tests/expansion.in
+++ b/tests/expansion.in
@@ -153,4 +153,6 @@ logmsg Test fatal syntax errors
 ../test/root/bin/fish -c 'echo $,foo'
 ../test/root/bin/fish -c 'echo {'
 ../test/root/bin/fish -c 'echo {}}'
-true
\ No newline at end of file
+# The output for this is wrong in non-interactive mode and will need fixing when #5812 is fixed
+../test/root/bin/fish -c 'command (asd)'
+true

From 4ddfd730793206c9dbfd7a0c653be86f45aa1246 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 19 Apr 2019 14:08:16 +0800
Subject: [PATCH 0378/1732] add tests for #5824

---
 tests/jobs.in  | 7 +++++++
 tests/jobs.out | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/tests/jobs.in b/tests/jobs.in
index 326f20e59..76192b1b4 100644
--- a/tests/jobs.in
+++ b/tests/jobs.in
@@ -13,3 +13,10 @@ jobs -c
 disown foo
 disown (jobs -p)
 or exit 0
+
+# https://github.com/fish-shell/fish-shell/issues/5824
+function foo
+    sleep 1 &
+	jobs -c
+end
+foo
diff --git a/tests/jobs.out b/tests/jobs.out
index c614464d0..53ff0b574 100644
--- a/tests/jobs.out
+++ b/tests/jobs.out
@@ -6,3 +6,5 @@ sleep
 Command
 sleep
 sleep
+Command
+sleep

From 2edfab685af76aec9a7c93fa8e3161242394cd21 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Fri, 19 Apr 2019 09:29:35 -0700
Subject: [PATCH 0379/1732] Some comment fixes and renaming of
 is_iterm2_escape_seq. (#5827)

* Some comment fixes and renaming of is_iterm2_escape_seq.

The comment for is_iterm2_escape_seq incorrectly says "CSI followed by ]".
This is wrong, because CSI is ESC followed by [ (or the seldom-used 0x9b).
The procedure  actually matches Operating System Command (OSC) escape codes.
Since there is nothing iterm2-specific about OSC, is_osc_escape_seq
would be a better name.

Also s_desired_append_char documents a non-existent parameter.

* Update broken iterm2 url in comment.
---
 src/screen.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 47d324d17..2dd1dc779 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -111,9 +111,11 @@ static bool is_screen_name_escape_seq(const wchar_t *code, size_t *resulting_len
     return true;
 }
 
-/// iTerm2 escape codes: CSI followed by ], terminated by either BEL or escape + backslash.
-/// See https://code.google.com/p/iterm2/wiki/ProprietaryEscapeCodes.
-static bool is_iterm2_escape_seq(const wchar_t *code, size_t *resulting_length) {
+/// Operating System Command (OSC) escape codes, used by iTerm2 and others:
+/// ESC followed by ], terminated by either BEL or escape + backslash.
+/// See https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+/// and https://iterm2.com/documentation-escape-codes.html .
+static bool is_osc_escape_seq(const wchar_t *code, size_t *resulting_length) {
     bool found = false;
     if (code[1] == ']') {
         // Start at 2 to skip over <esc>].
@@ -248,7 +250,7 @@ size_t escape_code_length(const wchar_t *code) {
     bool found = is_color_escape_seq(code, &esc_seq_len);
     if (!found) found = is_visual_escape_seq(code, &esc_seq_len);
     if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len);
-    if (!found) found = is_iterm2_escape_seq(code, &esc_seq_len);
+    if (!found) found = is_osc_escape_seq(code, &esc_seq_len);
     if (!found) found = is_single_byte_escape_seq(code, &esc_seq_len);
     if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len);
     if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len);
@@ -429,7 +431,6 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
 /// The actual_cursor field of the specified screen_t will be updated.
 ///
 /// \param s the screen to operate on
-/// \param b the buffer to send the output escape codes to
 /// \param new_x the new x position
 /// \param new_y the new y position
 static void s_move(screen_t *s, int new_x, int new_y) {

From 46911a5e7f04031150a11357360a01a66c26328e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 19 Apr 2019 20:57:45 +0200
Subject: [PATCH 0380/1732] Revert "__fish_describe_command: Remove awk"

Dealing with macOS output in a fast manner using `string` is surprisingly hard, given that it features lines like

    gls(1), ls(1)            - list directory contents

Printing the "gls" with the description and the "ls" with the description requires a `while read` loop, and that's too slow.

This reverts commit 7784a5f23c3a355445e76fce671e53c16e0ea5ed.

[ci skip]
---
 share/functions/__fish_describe_command.fish | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index e11d49b0c..7fb334d78 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -3,8 +3,20 @@
 #
 
 function __fish_describe_command -d "Command used to find descriptions for commands"
-    command -sq apropos; or return
-    # Some systems could use -s 1,8 here, but FreeBSD doesn't have that.
-    apropos $argv 2>/dev/null | string replace -rf '^(\S+) \(\S+\)\s+- (.*)' '$1\t$2' \
-    | string match (string replace -a '*' '\*' -- "$argv")"*"
+    # We're going to try to build a regex out of $argv inside awk.
+    # Make sure $argv has no special characters.
+    # TODO: stop interpolating argv into regex, and remove this hack.
+    string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
+    or return
+    type -q apropos; or return
+    apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
+		split($1, names, ", ");
+		for (name in names)
+			if (names[name] ~ /^'"$argv"'.* *\([18]\)/ ) {
+				sub( "( |\t)*\\\([18]\\\)", "", names[name] );
+				sub( " \\\[.*\\\]", "", names[name] );
+				print names[name] "\t" $2;
+			}
+	}'
 end
+

From 82ef2d19a575b3dd3ca576edb89835588e44aa8a Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 19 Apr 2019 02:20:55 -0500
Subject: [PATCH 0381/1732] Reduce timeout for jobs regression test

We've been moving away from full second timeouts, they were piling up.
---
 tests/jobs.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/jobs.in b/tests/jobs.in
index 76192b1b4..7be84be4b 100644
--- a/tests/jobs.in
+++ b/tests/jobs.in
@@ -14,9 +14,10 @@ disown foo
 disown (jobs -p)
 or exit 0
 
+# Verify `jobs` output within a function lists background jobs
 # https://github.com/fish-shell/fish-shell/issues/5824
 function foo
-    sleep 1 &
-	jobs -c
+    sleep 0.2 &
+    jobs -c
 end
 foo

From 76306c4582b81f8eec64996ad3bea03cdd743864 Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Fri, 19 Apr 2019 13:00:59 +0200
Subject: [PATCH 0382/1732] completions/usermod: various fixes

* -a does not take arguments
* -e more helpful description
* -g add arguments
* -G fix arguments
* add -r to various options
---
 share/completions/usermod.fish | 37 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/share/completions/usermod.fish b/share/completions/usermod.fish
index c28d01d7a..b3c09d25d 100644
--- a/share/completions/usermod.fish
+++ b/share/completions/usermod.fish
@@ -1,22 +1,23 @@
-complete -c usermod -a "(__fish_complete_users)" -f
-complete -c usermod -s a -l append -d 'Append groups (use with -G)' -f -a "(__fish_complete_groups)"
-complete -c usermod -s c -l comment -d "Change user's password file comment" -f
-complete -c usermod -s d -l home -d "Change user's login directory"
-complete -c usermod -s e -l expiredate -d "Date on which the user account will be disabled" -f
-complete -c usermod -s f -l inactive -d "Number of days after a password expires until the account is locked" -f
-complete -c usermod -s g -l gid -d "Group name or number of the user's new initial login group" -f
-complete -c usermod -s G -l groups -d "List of groups which the user is also a member of" -f -a "(__fish_complete_groups)"
-complete -c usermod -s l -l login -d "Change user's name" -f
+complete -c usermod -xa "(__fish_complete_users)"
+complete -c usermod -s a -l append -d "Append groups (use with -G)"
+complete -c usermod -s c -l comment -d "Change user's password file comment" -x
+complete -c usermod -s d -l home -d "Change user's login directory" -r
+complete -c usermod -s e -l expiredate -d "Date (YYYY-MM-DD) on which the user account will be disabled" -x
+complete -c usermod -s f -l inactive -d "Number of days after a password expires until the account is locked" -xa "(seq 0 365)"
+complete -c usermod -s g -l gid -d "Group name or number of the user's new initial login group" -xa "(__fish_complete_groups)"
+complete -c usermod -s G -l groups -d "List of groups which the user is also a member of" -xa "(__fish_complete_list , __fish_complete_groups)"
+complete -c usermod -s l -l login -d "Change user's name" -x
 complete -c usermod -s L -l lock -d "Lock user's password" -f
 complete -c usermod -s m -l move-home -d "Move the content of the user's home directory to the new location" -f
 complete -c usermod -s o -l non-unique -d "Allow non-unique UID" -f
-complete -c usermod -s p -l password -d "The encrypted password, as returned by crypt(3)" -f
-complete -c usermod -s R -l root -d "Apply changes in this directory" -f
-complete -c usermod -s s -l shell -d "The name of the user's new login shell" -f
-complete -c usermod -s u -l uid -d "The new numerical value of the user's ID" -f
+complete -c usermod -s p -l password -d "The encrypted password, as returned by crypt(3)" -x
+complete -c usermod -s R -l root -d "Apply changes in this directory" -x
+complete -c usermod -s P -l prefix -d "Apply changes in the PREFIX_DIR" -x
+complete -c usermod -s s -l shell -d "The name of the user's new login shell" -x
+complete -c usermod -s u -l uid -d "The new numerical value of the user's ID" -x
 complete -c usermod -s U -l unlock -d "Unlock a users password" -f
-complete -c usermod -s v -l add-sub-uids -d "Add a range of subordinate uids to the user's account" -f
-complete -c usermod -s V -l del-sub-uids -d "Remove a range of subordinate uids from the user's account" -f
-complete -c usermod -s w -l add-sub-gids -d "Add a range of subordinate gids to the user's account" -f
-complete -c usermod -s W -l del-sub-gids -d "Remove a range of subordinate gids from the user's account" -f
-complete -c usermod -s Z -l selinux-user -d "The new SELinux user for the user's login" -f
+complete -c usermod -s v -l add-sub-uids -d "Add a range of subordinate uids to the user's account" -x
+complete -c usermod -s V -l del-sub-uids -d "Remove a range of subordinate uids from the user's account" -x
+complete -c usermod -s w -l add-sub-gids -d "Add a range of subordinate gids to the user's account" -x
+complete -c usermod -s W -l del-sub-gids -d "Remove a range of subordinate gids from the user's account" -x
+complete -c usermod -s Z -l selinux-user -d "The new SELinux user for the user's login" -x

From 6dd2766a157fa950b7a06b48af1987c697562d7f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 19 Apr 2019 18:26:29 -0700
Subject: [PATCH 0383/1732] Remove file_access_attempt_t::stale

It was unused.
---
 src/autoload.cpp | 2 --
 src/autoload.h   | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 95827dc2c..02932183f 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -26,7 +26,6 @@
 static const int kAutoloadStalenessInterval = 15;
 
 file_access_attempt_t access_file(const wcstring &path, int mode) {
-    // std::fwprintf(stderr, L"Touch %ls\n", path.c_str());
     file_access_attempt_t result = {};
     struct stat statbuf;
     if (wstat(path, &statbuf)) {
@@ -42,7 +41,6 @@ file_access_attempt_t access_file(const wcstring &path, int mode) {
 
     // Note that we record the last checked time after the call, on the assumption that in a slow
     // filesystem, the lag comes before the kernel check, not after.
-    result.stale = false;
     result.last_checked = time(NULL);
     return result;
 }
diff --git a/src/autoload.h b/src/autoload.h
index 249b49c34..0ff887404 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -11,6 +11,7 @@
 #include "common.h"
 #include "env.h"
 #include "lru.h"
+#include "wutil.h"
 
 /// Record of an attempt to access a file.
 struct file_access_attempt_t {
@@ -20,8 +21,6 @@ struct file_access_attempt_t {
     time_t last_checked;
     /// Whether or not we believe we can access this file
     bool accessible;
-    /// The access attempt is stale
-    bool stale;
     /// If we cannot access the file, the error code encountered.
     int error;
 };

From fe75a3a6504e763dd74e48ce0a143603ad61fc6c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 19 Apr 2019 18:47:07 -0700
Subject: [PATCH 0384/1732] Migrate autoload file checks to file_id_t

---
 src/autoload.cpp | 22 ++++++----------------
 src/autoload.h   | 16 +++++++++-------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 02932183f..e551b0ee1 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -27,20 +27,10 @@ static const int kAutoloadStalenessInterval = 15;
 
 file_access_attempt_t access_file(const wcstring &path, int mode) {
     file_access_attempt_t result = {};
-    struct stat statbuf;
-    if (wstat(path, &statbuf)) {
-        result.error = errno;
-    } else {
-        result.mod_time = statbuf.st_mtime;
-        if (waccess(path, mode)) {
-            result.error = errno;
-        } else {
-            result.accessible = true;
-        }
+    file_id_t file_id = file_id_for_path(path);
+    if (file_id != kInvalidFileID && 0 == waccess(path, mode)) {
+        result.file_id = file_id;
     }
-
-    // Note that we record the last checked time after the call, on the assumption that in a slow
-    // filesystem, the lag comes before the kernel check, not after.
     result.last_checked = time(NULL);
     return result;
 }
@@ -178,7 +168,7 @@ bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_
 
         // If we can use this function, return whether we were able to access it.
         if (use_cached(func, really_load, allow_stale_functions)) {
-            return func->access.accessible;
+            return func->access.accessible();
         }
     }
 
@@ -194,7 +184,7 @@ bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_
         wcstring path = next + L"/" + cmd + L".fish";
 
         const file_access_attempt_t access = access_file(path, R_OK);
-        if (!access.accessible) {
+        if (!access.accessible()) {
             continue;
         }
 
@@ -205,7 +195,7 @@ bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_
         // Generate the source if we need to load it.
         bool need_to_load_function =
             really_load &&
-            (func == NULL || func->access.mod_time != access.mod_time || !func->is_loaded);
+            (func == NULL || func->access.file_id != access.file_id || !func->is_loaded);
         if (need_to_load_function) {
             // Generate the script source.
             script_source = L"source " + escape_string(path, ESCAPE_ALL);
diff --git a/src/autoload.h b/src/autoload.h
index 0ff887404..9421ee306 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -15,14 +15,16 @@
 
 /// Record of an attempt to access a file.
 struct file_access_attempt_t {
-    /// Modification time of the file
-    time_t mod_time;
-    /// When we last checked the file
+    /// If filled, the file ID of the checked file.
+    /// Otherwise the file did not exist or was otherwise inaccessible.
+    /// Note that this will never contain kInvalidFileID.
+    maybe_t<file_id_t> file_id;
+
+    /// When we last checked the file.
     time_t last_checked;
-    /// Whether or not we believe we can access this file
-    bool accessible;
-    /// If we cannot access the file, the error code encountered.
-    int error;
+
+    /// Whether or not we believe we can access this file.
+    bool accessible() const { return file_id.has_value(); }
 };
 file_access_attempt_t access_file(const wcstring &path, int mode);
 

From 32ad1a6e628b26b1c75bfee44706e1cd9637c9e2 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 19 Apr 2019 20:56:55 -0500
Subject: [PATCH 0385/1732] Add basic completions for FreeBSD's `camcontrol`

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

diff --git a/share/completions/camcontrol.fish b/share/completions/camcontrol.fish
new file mode 100644
index 000000000..bac58bcde
--- /dev/null
+++ b/share/completions/camcontrol.fish
@@ -0,0 +1,5 @@
+# The following lists are complete as of FreeBSD 12
+
+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_first_token' -xa "$commands"

From f309ae05b6036b063b688831964c82c5e2b27bed Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Fri, 19 Apr 2019 16:16:54 -0700
Subject: [PATCH 0386/1732] is_visual_escape_seq: whittle down the escape
 sequences attempted

Some of these we do not need to worry about actually being used
in a prompt.
---
 src/screen.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 2dd1dc779..e9dbc245b 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -214,13 +214,12 @@ static bool is_color_escape_seq(const wchar_t *code, size_t *resulting_length) {
 static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) {
     if (!cur_term) return false;
     const char *const esc2[] = {
-        enter_bold_mode,      exit_attribute_mode,    enter_underline_mode,  exit_underline_mode,
-        enter_standout_mode,  exit_standout_mode,     flash_screen,          enter_subscript_mode,
-        exit_subscript_mode,  enter_superscript_mode, exit_superscript_mode, enter_blink_mode,
-        enter_italics_mode,   exit_italics_mode,      enter_reverse_mode,    enter_shadow_mode,
-        exit_shadow_mode,     enter_standout_mode,    exit_standout_mode,    enter_secure_mode,
-        enter_dim_mode,       enter_blink_mode,       enter_protected_mode,  enter_alt_charset_mode,
-        exit_alt_charset_mode};
+        enter_bold_mode,      exit_attribute_mode,    enter_underline_mode,   exit_underline_mode,
+        enter_standout_mode,  exit_standout_mode,     enter_blink_mode,       enter_protected_mode,
+        enter_italics_mode,   exit_italics_mode,      enter_reverse_mode,     enter_shadow_mode,
+        exit_shadow_mode,     enter_standout_mode,    exit_standout_mode,     enter_secure_mode,
+        enter_dim_mode,       enter_blink_mode,       enter_alt_charset_mode, exit_alt_charset_mode
+    };
 
     for (size_t p = 0; p < sizeof esc2 / sizeof *esc2; p++) {
         if (!esc2[p]) continue;

From 9d84b452561c23ccbf6998b56fb15eb3263ea332 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 21 Apr 2019 02:04:45 -0700
Subject: [PATCH 0387/1732] __fish_print_help: remove indent

Do this lame replacement in order to make some_builtin --help
output less tacky.
---
 share/functions/__fish_print_help.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index ad429a317..fb1022195 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -103,6 +103,6 @@ function __fish_print_help --description "Print help message for the specified f
                         # skip it
                 end
         end
-    end | ul # post-process with `ul`, to interpret the old-style grotty escapes
-    echo # print a trailing blank line
+    end | string replace -ra '^       ' '' | ul # post-process with `ul`, to interpret the old-style grotty escapes
+    printf '%s'\n $manual[2..-1];
 end

From 51e963bf4430de520658ded03675178c6a76b4ea Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 21 Apr 2019 09:07:29 -0700
Subject: [PATCH 0388/1732] fixup last commit

---
 share/functions/__fish_print_help.fish | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index fb1022195..0d74aa084 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -104,5 +104,4 @@ function __fish_print_help --description "Print help message for the specified f
                 end
         end
     end | string replace -ra '^       ' '' | ul # post-process with `ul`, to interpret the old-style grotty escapes
-    printf '%s'\n $manual[2..-1];
 end

From b5351bce1bd84dde44eb5494eb75a56a611fed76 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 21 Apr 2019 19:48:46 +0200
Subject: [PATCH 0389/1732] Bind tmux focus reporting as --preset bindings

Purely cleanup, basically.

[ci skip]
---
 share/functions/__fish_shared_key_bindings.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index ad1d16b9b..68f6c38fe 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -114,9 +114,9 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     # Exclude paste mode because that should get _everything_ literally.
     for mode in (bind --list-modes | string match -v paste)
         # We only need the in-focus event currently (to redraw the vi-cursor).
-        bind -M $mode \e\[I 'emit fish_focus_in'
-        bind -M $mode \e\[O false
-        bind -M $mode \e\[\?1004h false
+        bind --preset -M $mode \e\[I 'emit fish_focus_in'
+        bind --preset -M $mode \e\[O false
+        bind --preset -M $mode \e\[\?1004h false
     end
 
     # Support for "bracketed paste"

From 82052a6cc9fa797070d8945130d45226d5cbc1c5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 21 Apr 2019 20:26:57 +0200
Subject: [PATCH 0390/1732] Don't start focus reporting until later

[ci skip]
---
 share/functions/__fish_config_interactive.fish | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 67384da82..073bb1271 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -252,7 +252,11 @@ function __fish_config_interactive -d "Initializations that should be performed
         function __fish_disable_focus --on-event fish_preexec
             echo -n \e\[\?1004l
         end
-        __fish_enable_focus
+        # Note: Don't call this initially because, even though we're in a fish_prompt event,
+        # tmux reacts sooo quickly that we'll still get a sequence before we're prepared for it.
+        # So this means that we won't get focus events until you've run at least one command, but that's preferable
+        # to always seeing `^[[I` when starting fish.
+        # __fish_enable_focus
     end
 
     function __fish_winch_handler --on-signal WINCH -d "Repaint screen when window changes size"

From 4bdab33a0059969d0e82fb4b02d0417dbb0bd84c Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 22 Apr 2019 15:17:09 -0500
Subject: [PATCH 0391/1732] Add dynamic cipher completion to `ssh -c ...`

[ci skip]
---
 share/completions/ssh.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index f200f5b0b..ef13b2f1a 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -41,6 +41,7 @@ complete -c ssh -s X -d "Enable X11 forwarding"
 complete -c ssh -s L -d "Locally forwarded ports"
 complete -c ssh -s R -d "Remotely forwarded ports"
 complete -c ssh -s D -d "Dynamic port forwarding"
+complete -c ssh -s c -d "Encryption cipher" -xa "(ssh -Q cipher)"
 
 # Also look up hosts from the history
 function __ssh_history_completions --argument limit

From ae11bf4dcbc42b2efd5377c94a3566832dc3e9ff Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 23 Apr 2019 21:49:51 -0500
Subject: [PATCH 0392/1732] Add completions for `git show $rev:$path`

This command can be used to "`cat`" the contents of `$path` as of `$rev`.

These are "silent" completions, e.g. while this adds a completion for
`git show master:foo`, the completions for `git show <TAB>` are not
affected; these "advanced" completions kick in only after at least
`git show master:<TAB>` to prevent completion pollution or slowing down
tab completions in the typical case (as this would cause each valid and
possibly unique $rev completion result to complete to `n*$rev`
completions for *n* files.

[ci skip]
---
 share/completions/git.fish | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 86011072c..61646333c 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -400,6 +400,39 @@ function __fish_git_files
     end
 end
 
+# Lists files included in the index of a commit, branch, or tag (not necessarily HEAD)
+function __fish_git_rev_files
+    set -l rev $argv[1]
+    set -l path $argv[2]
+
+    # Strip any partial files from the path before handing it to `git show`
+    set -l path (string replace -r -- '(.*/|).*' '$1' $path)
+
+    # List files in $rev's index, skipping the "tree ..." header, but appending
+    # the parent path, which git does not include in the output (and fish requires)
+    printf "$path%s\n" (git show $rev:$path | sed '1,2d')
+end
+
+# Provides __fish_git_rev_files completions for the current token
+function __fish_git_complete_rev_files
+    set -l split (string split -m 1 ":" (commandline -ot))
+    set -l rev $split[1]
+    set -l path $split[2]
+
+    printf "$rev:%s\n" (__fish_git_rev_files $rev $path)
+end
+
+# Determines whether we can/should complete with __fish_git_rev_files
+function __fish_git_needs_rev_files
+    # git (as of 2.20) accepts the rev:path syntax for a number of subcommands,
+    # but then doesn't emit the expected (or any?) output, e.g. `git log master:foo`
+    #
+    # This definitely works with `git show` to retrieve a copy of a file as it exists
+    # in the index of revision $rev, it should be updated to include others as they
+    # are identified.
+    __fish_git_using_command show; and string match -r ".+:" -- (commandline -ot)
+end
+
 function __fish_git_ranges
     set -l both (commandline -ot | string split "..")
     set -l from $both[1]
@@ -797,6 +830,7 @@ complete -f -c git -n '__fish_git_needs_command' -a show -d 'Shows the last comm
 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' -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 b54c44f2f6eb099b2aa1d597be4ab9c4a804934d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 22 Apr 2019 14:53:42 -0700
Subject: [PATCH 0393/1732] Migrate expansion stages to a new type expander_t

This avoids having to pass around so many parameters during expansion.
---
 src/expand.cpp | 98 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 55720c951..800cafc6a 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -865,19 +865,39 @@ static void remove_internal_separator(wcstring *str, bool conv) {
     }
 }
 
-/// A stage in string expansion is represented as a function that takes an input and returns a list
-/// of output (by reference). We get flags, vars and errors. It may return an error; if so expansion
-/// halts.
-typedef expand_error_t (*expand_stage_t)(wcstring input,                  //!OCLINT(unused param)
-                                         std::vector<completion_t> *out,  //!OCLINT(unused param)
-                                         expand_flags_t flags,            //!OCLINT(unused param)
-                                         const environment_t &vars,       //!OCLINT(unused param)
-                                         parse_error_list_t *errors);     //!OCLINT(unused param)
+namespace {
+/// A type that knows how to perform expansions.
+class expander_t {
+    /// Variables to use in expansion.
+    const environment_t &vars;
 
-static expand_error_t expand_stage_cmdsubst(wcstring input, std::vector<completion_t> *out,
-                                            expand_flags_t flags, const environment_t &vars,
-                                            parse_error_list_t *errors) {
-    UNUSED(vars);
+    /// Flags to use during expansion.
+    const expand_flags_t flags;
+
+    /// List to receive any errors generated during expansion, or null to ignore errors.
+    parse_error_list_t *const errors;
+
+    /// An expansion stage is a member function pointer.
+    /// It accepts the input string (transferring ownership) and returns the list of output
+    /// completions by reference. It may return an error, which halts expansion.
+    using stage_t = expand_error_t (expander_t::*)(wcstring, std::vector<completion_t> *);
+
+    expand_error_t stage_cmdsubst(wcstring input, std::vector<completion_t> *out);
+    expand_error_t stage_variables(wcstring input, std::vector<completion_t> *out);
+    expand_error_t stage_braces(wcstring input, std::vector<completion_t> *out);
+    expand_error_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
+    expand_error_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
+
+    expander_t(const environment_t &vars, expand_flags_t flags, parse_error_list_t *errors)
+        : vars(vars), flags(flags), errors(errors) {}
+
+   public:
+    static expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+                                        expand_flags_t flags, const environment_t &vars,
+                                        parse_error_list_t *errors);
+};
+
+expand_error_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
     if (EXPAND_SKIP_CMDSUBST & flags) {
         size_t cur = 0, start = 0, end;
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
@@ -898,9 +918,7 @@ static expand_error_t expand_stage_cmdsubst(wcstring input, std::vector<completi
     return EXPAND_OK;
 }
 
-static expand_error_t expand_stage_variables(wcstring input, std::vector<completion_t> *out,
-                                             expand_flags_t flags, const environment_t &vars,
-                                             parse_error_list_t *errors) {
+expand_error_t expander_t::stage_variables(wcstring input, std::vector<completion_t> *out) {
     // We accept incomplete strings here, since complete uses expand_string to expand incomplete
     // strings from the commandline.
     wcstring next;
@@ -922,17 +940,12 @@ static expand_error_t expand_stage_variables(wcstring input, std::vector<complet
     return EXPAND_OK;
 }
 
-static expand_error_t expand_stage_braces(wcstring input, std::vector<completion_t> *out,
-                                          expand_flags_t flags, const environment_t &vars,
-                                          parse_error_list_t *errors) {
+expand_error_t expander_t::stage_braces(wcstring input, std::vector<completion_t> *out) {
     UNUSED(vars);
     return expand_braces(input, flags, out, errors);
 }
 
-static expand_error_t expand_stage_home_and_self(wcstring input, std::vector<completion_t> *out,
-                                                 expand_flags_t flags, const environment_t &vars,
-                                                 parse_error_list_t *errors) {
-    (void)errors;
+expand_error_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
     if (!(EXPAND_SKIP_HOME_DIRECTORIES & flags)) {
         expand_home_directory(input, vars);
     }
@@ -941,10 +954,8 @@ static expand_error_t expand_stage_home_and_self(wcstring input, std::vector<com
     return EXPAND_OK;
 }
 
-static expand_error_t expand_stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out,
-                                             expand_flags_t flags, const environment_t &vars,
-                                             parse_error_list_t *errors) {
-    UNUSED(errors);
+expand_error_t expander_t::stage_wildcards(wcstring path_to_expand,
+                                           std::vector<completion_t> *out) {
     expand_error_t result = EXPAND_OK;
 
     remove_internal_separator(&path_to_expand, flags & EXPAND_SKIP_WILDCARDS);
@@ -1034,42 +1045,48 @@ static expand_error_t expand_stage_wildcards(wcstring path_to_expand, std::vecto
     return result;
 }
 
-expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
-                             expand_flags_t flags, const environment_t &vars,
-                             parse_error_list_t *errors) {
+expand_error_t expander_t::expand_string(wcstring input, std::vector<completion_t> *out_completions,
+                                         expand_flags_t flags, const environment_t &vars,
+                                         parse_error_list_t *errors) {
     // Early out. If we're not completing, and there's no magic in the input, we're done.
     if (!(flags & EXPAND_FOR_COMPLETIONS) && expand_is_clean(input)) {
         append_completion(out_completions, std::move(input));
         return EXPAND_OK;
     }
 
+    expander_t expand(vars, flags, errors);
+
     // Our expansion stages.
-    const expand_stage_t stages[] = {expand_stage_cmdsubst, expand_stage_variables,
-                                     expand_stage_braces, expand_stage_home_and_self,
-                                     expand_stage_wildcards};
+    const stage_t stages[] = {&expander_t::stage_cmdsubst, &expander_t::stage_variables,
+                              &expander_t::stage_braces, &expander_t::stage_home_and_self,
+                              &expander_t::stage_wildcards};
 
     // Load up our single initial completion.
     std::vector<completion_t> completions, output_storage;
     append_completion(&completions, input);
 
     expand_error_t total_result = EXPAND_OK;
-    for (size_t stage_idx = 0;
-         total_result != EXPAND_ERROR && stage_idx < sizeof stages / sizeof *stages; stage_idx++) {
-        for (size_t i = 0; total_result != EXPAND_ERROR && i < completions.size(); i++) {
-            wcstring &next = completions.at(i).completion;
+    for (stage_t stage : stages) {
+        for (completion_t &comp : completions) {
             expand_error_t this_result =
-                stages[stage_idx](std::move(next), &output_storage, flags, vars, errors);
+                (expand.*stage)(std::move(comp.completion), &output_storage);
             // If this_result was no match, but total_result is that we have a match, then don't
             // change it.
             if (!(this_result == EXPAND_WILDCARD_NO_MATCH &&
                   total_result == EXPAND_WILDCARD_MATCH)) {
                 total_result = this_result;
             }
+            if (total_result == EXPAND_ERROR) {
+                break;
+            }
         }
 
         // Output becomes our next stage's input.
         completions.swap(output_storage);
         output_storage.clear();
+        if (total_result == EXPAND_ERROR) {
+            break;
+        }
     }
 
     if (total_result != EXPAND_ERROR) {
@@ -1083,6 +1100,13 @@ expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_comp
     }
     return total_result;
 }
+}  // namespace
+
+expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+                             expand_flags_t flags, const environment_t &vars,
+                             parse_error_list_t *errors) {
+    return expander_t::expand_string(std::move(input), out_completions, flags, vars, errors);
+}
 
 bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
                 parse_error_list_t *errors) {

From dcaac58f45b3d97a4db0d323108a928bb8e58bc6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 22 Apr 2019 15:06:52 -0700
Subject: [PATCH 0394/1732] Rename expand_error_t to expand_result_t and make
 it class enum

Also lowercase it all.
---
 src/complete.cpp        |  17 +++----
 src/expand.cpp          | 104 ++++++++++++++++++++--------------------
 src/expand.h            |  26 +++++-----
 src/fish_tests.cpp      |   2 +-
 src/highlight.cpp       |   4 +-
 src/parse_execution.cpp |  30 ++++++------
 src/parse_util.cpp      |   2 +-
 src/parser.cpp          |   2 +-
 8 files changed, 95 insertions(+), 92 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 37929e372..cd2652cc6 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -665,11 +665,11 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
 
     if (use_command) {
         // Append all possible executables
-        expand_error_t result = expand_string(str_cmd, &this->completions,
-                                              EXPAND_SPECIAL_FOR_COMMAND | EXPAND_FOR_COMPLETIONS |
-                                                  EXECUTABLES_ONLY | this->expand_flags(),
-                                              vars, NULL);
-        if (result != EXPAND_ERROR && this->wants_descriptions()) {
+        expand_result_t result = expand_string(str_cmd, &this->completions,
+                                               EXPAND_SPECIAL_FOR_COMMAND | EXPAND_FOR_COMPLETIONS |
+                                                   EXECUTABLES_ONLY | this->expand_flags(),
+                                               vars, NULL);
+        if (result != expand_result_t::error && this->wants_descriptions()) {
             this->complete_cmd_desc(str_cmd);
         }
     }
@@ -677,7 +677,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
     if (use_implicit_cd) {
         // We don't really care if this succeeds or fails. If it succeeds this->completions will be
         // updated with choices for the user.
-        expand_error_t ignore =
+        expand_result_t ignore =
             // Append all matching directories
             expand_string(str_cmd, &this->completions,
                           EXPAND_FOR_COMPLETIONS | DIRECTORIES_ONLY | this->expand_flags(), vars,
@@ -1092,7 +1092,8 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         std::vector<completion_t> local_completions;
-        if (expand_string(sep_string, &local_completions, flags, vars, NULL) == EXPAND_ERROR) {
+        if (expand_string(sep_string, &local_completions, flags, vars, NULL) ==
+            expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
         }
 
@@ -1111,7 +1112,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // consider relaxing this if there was a preceding double-dash argument.
         if (string_prefixes_string(L"-", str)) flags &= ~EXPAND_FUZZY_MATCH;
 
-        if (expand_string(str, &this->completions, flags, vars, NULL) == EXPAND_ERROR) {
+        if (expand_string(str, &this->completions, flags, vars, NULL) == expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
         }
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index 800cafc6a..9e9f5c8cd 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -470,8 +470,8 @@ static bool expand_variables(wcstring instr, std::vector<completion_t> *out, siz
 }
 
 /// Perform brace expansion.
-static expand_error_t expand_braces(const wcstring &instr, expand_flags_t flags,
-                                    std::vector<completion_t> *out, parse_error_list_t *errors) {
+static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags,
+                                     std::vector<completion_t> *out, parse_error_list_t *errors) {
     bool syntax_error = false;
     int brace_count = 0;
 
@@ -542,12 +542,12 @@ static expand_error_t expand_braces(const wcstring &instr, expand_flags_t flags,
 
     if (syntax_error) {
         append_syntax_error(errors, SOURCE_LOCATION_UNKNOWN, _(L"Mismatched braces"));
-        return EXPAND_ERROR;
+        return expand_result_t::error;
     }
 
     if (brace_begin == NULL) {
         append_completion(out, instr);
-        return EXPAND_OK;
+        return expand_result_t::ok;
     }
 
     length_preceding_braces = (brace_begin - in);
@@ -585,7 +585,7 @@ static expand_error_t expand_braces(const wcstring &instr, expand_flags_t flags,
             brace_count--;
         }
     }
-    return EXPAND_OK;
+    return expand_result_t::ok;
 }
 
 /// Perform cmdsubst expansion.
@@ -880,24 +880,24 @@ class expander_t {
     /// An expansion stage is a member function pointer.
     /// It accepts the input string (transferring ownership) and returns the list of output
     /// completions by reference. It may return an error, which halts expansion.
-    using stage_t = expand_error_t (expander_t::*)(wcstring, std::vector<completion_t> *);
+    using stage_t = expand_result_t (expander_t::*)(wcstring, std::vector<completion_t> *);
 
-    expand_error_t stage_cmdsubst(wcstring input, std::vector<completion_t> *out);
-    expand_error_t stage_variables(wcstring input, std::vector<completion_t> *out);
-    expand_error_t stage_braces(wcstring input, std::vector<completion_t> *out);
-    expand_error_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
-    expand_error_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
+    expand_result_t stage_cmdsubst(wcstring input, std::vector<completion_t> *out);
+    expand_result_t stage_variables(wcstring input, std::vector<completion_t> *out);
+    expand_result_t stage_braces(wcstring input, std::vector<completion_t> *out);
+    expand_result_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
+    expand_result_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
 
     expander_t(const environment_t &vars, expand_flags_t flags, parse_error_list_t *errors)
         : vars(vars), flags(flags), errors(errors) {}
 
    public:
-    static expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
-                                        expand_flags_t flags, const environment_t &vars,
-                                        parse_error_list_t *errors);
+    static expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+                                         expand_flags_t flags, const environment_t &vars,
+                                         parse_error_list_t *errors);
 };
 
-expand_error_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
     if (EXPAND_SKIP_CMDSUBST & flags) {
         size_t cur = 0, start = 0, end;
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
@@ -908,17 +908,17 @@ expand_error_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion
                append_cmdsub_error(errors, start, L"Command substitutions not allowed");
             case -1:
             default:
-                return EXPAND_ERROR;
+                return expand_result_t::error;
         }
     } else {
         bool cmdsubst_ok = expand_cmdsubst(std::move(input), out, errors);
-        if (!cmdsubst_ok) return EXPAND_ERROR;
+        if (!cmdsubst_ok) return expand_result_t::error;
     }
 
-    return EXPAND_OK;
+    return expand_result_t::ok;
 }
 
-expand_error_t expander_t::stage_variables(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_variables(wcstring input, std::vector<completion_t> *out) {
     // We accept incomplete strings here, since complete uses expand_string to expand incomplete
     // strings from the commandline.
     wcstring next;
@@ -934,29 +934,29 @@ expand_error_t expander_t::stage_variables(wcstring input, std::vector<completio
     } else {
         size_t size = next.size();
         if (!expand_variables(std::move(next), out, size, vars, errors)) {
-            return EXPAND_ERROR;
+            return expand_result_t::error;
         }
     }
-    return EXPAND_OK;
+    return expand_result_t::ok;
 }
 
-expand_error_t expander_t::stage_braces(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_braces(wcstring input, std::vector<completion_t> *out) {
     UNUSED(vars);
     return expand_braces(input, flags, out, errors);
 }
 
-expand_error_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
     if (!(EXPAND_SKIP_HOME_DIRECTORIES & flags)) {
         expand_home_directory(input, vars);
     }
     expand_percent_self(input);
     append_completion(out, std::move(input));
-    return EXPAND_OK;
+    return expand_result_t::ok;
 }
 
-expand_error_t expander_t::stage_wildcards(wcstring path_to_expand,
-                                           std::vector<completion_t> *out) {
-    expand_error_t result = EXPAND_OK;
+expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
+                                            std::vector<completion_t> *out) {
+    expand_result_t result = expand_result_t::ok;
 
     remove_internal_separator(&path_to_expand, flags & EXPAND_SKIP_WILDCARDS);
     const bool has_wildcard = wildcard_has(path_to_expand, true /* internal, i.e. ANY_STRING */);
@@ -1017,17 +1017,17 @@ expand_error_t expander_t::stage_wildcards(wcstring path_to_expand,
             }
         }
 
-        result = EXPAND_WILDCARD_NO_MATCH;
+        result = expand_result_t::wildcard_no_match;
         std::vector<completion_t> expanded;
         for (size_t wd_idx = 0; wd_idx < effective_working_dirs.size(); wd_idx++) {
             int local_wc_res = wildcard_expand_string(
                 path_to_expand, effective_working_dirs.at(wd_idx), flags, &expanded);
             if (local_wc_res > 0) {
                 // Something matched,so overall we matched.
-                result = EXPAND_WILDCARD_MATCH;
+                result = expand_result_t::wildcard_match;
             } else if (local_wc_res < 0) {
                 // Cancellation
-                result = EXPAND_ERROR;
+                result = expand_result_t::error;
                 break;
             }
         }
@@ -1045,13 +1045,14 @@ expand_error_t expander_t::stage_wildcards(wcstring path_to_expand,
     return result;
 }
 
-expand_error_t expander_t::expand_string(wcstring input, std::vector<completion_t> *out_completions,
-                                         expand_flags_t flags, const environment_t &vars,
-                                         parse_error_list_t *errors) {
+expand_result_t expander_t::expand_string(wcstring input,
+                                          std::vector<completion_t> *out_completions,
+                                          expand_flags_t flags, const environment_t &vars,
+                                          parse_error_list_t *errors) {
     // Early out. If we're not completing, and there's no magic in the input, we're done.
     if (!(flags & EXPAND_FOR_COMPLETIONS) && expand_is_clean(input)) {
         append_completion(out_completions, std::move(input));
-        return EXPAND_OK;
+        return expand_result_t::ok;
     }
 
     expander_t expand(vars, flags, errors);
@@ -1065,18 +1066,18 @@ expand_error_t expander_t::expand_string(wcstring input, std::vector<completion_
     std::vector<completion_t> completions, output_storage;
     append_completion(&completions, input);
 
-    expand_error_t total_result = EXPAND_OK;
+    expand_result_t total_result = expand_result_t::ok;
     for (stage_t stage : stages) {
         for (completion_t &comp : completions) {
-            expand_error_t this_result =
+            expand_result_t this_result =
                 (expand.*stage)(std::move(comp.completion), &output_storage);
             // If this_result was no match, but total_result is that we have a match, then don't
             // change it.
-            if (!(this_result == EXPAND_WILDCARD_NO_MATCH &&
-                  total_result == EXPAND_WILDCARD_MATCH)) {
+            if (!(this_result == expand_result_t::wildcard_no_match &&
+                  total_result == expand_result_t::wildcard_match)) {
                 total_result = this_result;
             }
-            if (total_result == EXPAND_ERROR) {
+            if (total_result == expand_result_t::error) {
                 break;
             }
         }
@@ -1084,12 +1085,12 @@ expand_error_t expander_t::expand_string(wcstring input, std::vector<completion_
         // Output becomes our next stage's input.
         completions.swap(output_storage);
         output_storage.clear();
-        if (total_result == EXPAND_ERROR) {
+        if (total_result == expand_result_t::error) {
             break;
         }
     }
 
-    if (total_result != EXPAND_ERROR) {
+    if (total_result != expand_result_t::error) {
         // Hack to un-expand tildes (see #647).
         if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES)) {
             unexpand_tildes(input, vars, &completions);
@@ -1102,9 +1103,9 @@ expand_error_t expander_t::expand_string(wcstring input, std::vector<completion_
 }
 }  // namespace
 
-expand_error_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
-                             expand_flags_t flags, const environment_t &vars,
-                             parse_error_list_t *errors) {
+expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+                              expand_flags_t flags, const environment_t &vars,
+                              parse_error_list_t *errors) {
     return expander_t::expand_string(std::move(input), out_completions, flags, vars, errors);
 }
 
@@ -1116,7 +1117,8 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
         return true;
     }
 
-    if (expand_string(string, &completions, flags | EXPAND_NO_DESCRIPTIONS, vars, errors) &&
+    if (expand_string(string, &completions, flags | EXPAND_NO_DESCRIPTIONS, vars, errors) !=
+            expand_result_t::error &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
         return true;
@@ -1124,21 +1126,21 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
     return false;
 }
 
-expand_error_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
-                                          wcstring *out_cmd, wcstring_list_t *out_args,
-                                          parse_error_list_t *errors) {
+expand_result_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
+                                           wcstring *out_cmd, wcstring_list_t *out_args,
+                                           parse_error_list_t *errors) {
     // Fast path.
     if (expand_is_clean(instr)) {
 
         *out_cmd = instr;
-        return EXPAND_OK;
+        return expand_result_t::ok;
     }
 
     std::vector<completion_t> completions;
-    expand_error_t expand_err = expand_string(
+    expand_result_t expand_err = expand_string(
         instr, &completions, EXPAND_SKIP_CMDSUBST | EXPAND_NO_DESCRIPTIONS | EXPAND_SKIP_JOBS, vars,
         errors);
-    if (expand_err == EXPAND_OK || expand_err == EXPAND_WILDCARD_MATCH) {
+    if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
         for (auto &comp : completions) {
diff --git a/src/expand.h b/src/expand.h
index 3970ae0b2..46ac206fe 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -89,15 +89,15 @@ enum {
 };
 
 /// These are the possible return values for expand_string. Note how zero value is the only error.
-enum expand_error_t {
+enum class expand_result_t {
     /// Error
-    EXPAND_ERROR,
+    error,
     /// Ok
-    EXPAND_OK,
+    ok,
     /// Ok, a wildcard in the string matched no files.
-    EXPAND_WILDCARD_NO_MATCH,
+    wildcard_no_match,
     /// Ok, a wildcard in the string matched a file.
-    EXPAND_WILDCARD_MATCH
+    wildcard_match,
 };
 
 /// The string represented by PROCESS_EXPAND_SELF
@@ -118,12 +118,12 @@ enum expand_error_t {
 /// \param vars variables used during expansion.
 /// \param errors Resulting errors, or NULL to ignore
 ///
-/// \return One of EXPAND_OK, EXPAND_ERROR, EXPAND_WILDCARD_MATCH and EXPAND_WILDCARD_NO_MATCH.
-/// EXPAND_WILDCARD_NO_MATCH and EXPAND_WILDCARD_MATCH are normal exit conditions used only on
+/// \return An expand_result_t.
+/// wildcard_no_match and wildcard_match are normal exit conditions used only on
 /// strings containing wildcards to tell if the wildcard produced any matches.
-__warn_unused expand_error_t expand_string(wcstring input, std::vector<completion_t> *output,
-                                           expand_flags_t flags, const environment_t &vars,
-                                           parse_error_list_t *errors);
+__warn_unused expand_result_t expand_string(wcstring input, std::vector<completion_t> *output,
+                                            expand_flags_t flags, const environment_t &vars,
+                                            parse_error_list_t *errors);
 
 /// expand_one is identical to expand_string, except it will fail if in expands to more than one
 /// string. This is used for expanding command names.
@@ -143,9 +143,9 @@ bool expand_one(wcstring &inout_str, expand_flags_t flags, const environment_t &
 /// that API does not distinguish between expansion resulting in an empty command (''), and
 /// expansion resulting in no command (e.g. unset variable).
 // \return an expand error.
-expand_error_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
-                                          wcstring *out_cmd, wcstring_list_t *out_args,
-                                          parse_error_list_t *errors = NULL);
+expand_result_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
+                                           wcstring *out_cmd, wcstring_list_t *out_args,
+                                           parse_error_list_t *errors = NULL);
 
 /// Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc.
 /// Suitable for pretty-printing.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 5741b20b6..f0f69647c 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1592,7 +1592,7 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
     wchar_t *arg;
     parse_error_list_t errors;
 
-    if (expand_string(in, &output, flags, pwd_environment_t{}, &errors) == EXPAND_ERROR) {
+    if (expand_string(in, &output, flags, pwd_environment_t{}, &errors) == expand_result_t::error) {
         if (errors.empty()) {
             err(L"Bug: Parse error reported but no error text found.");
         } else {
diff --git a/src/highlight.cpp b/src/highlight.cpp
index f9e9ea158..fe993b121 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -344,8 +344,8 @@ static bool plain_statement_get_expanded_command(const wcstring &src,
     // Get the command. Try expanding it. If we cannot, it's an error.
     maybe_t<wcstring> cmd = command_for_plain_statement(stmt, src);
     if (!cmd) return false;
-    expand_error_t err = expand_to_command_and_args(*cmd, vars, out_cmd, nullptr);
-    return err == EXPAND_OK || err == EXPAND_WILDCARD_MATCH;
+    expand_result_t err = expand_to_command_and_args(*cmd, vars, out_cmd, nullptr);
+    return err == expand_result_t::ok || err == expand_result_t::wildcard_match;
 }
 
 rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_background) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2afbc2155..018a35481 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -449,21 +449,21 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     // Expand it. We need to offset any errors by the position of the string.
     std::vector<completion_t> switch_values_expanded;
     parse_error_list_t errors;
-    int expand_ret = expand_string(switch_value, &switch_values_expanded, EXPAND_NO_DESCRIPTIONS,
-                                   parser->vars(), &errors);
+    auto expand_ret = expand_string(switch_value, &switch_values_expanded, EXPAND_NO_DESCRIPTIONS,
+                                    parser->vars(), &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
-        case EXPAND_ERROR: {
+        case expand_result_t::error: {
             result = report_errors(errors);
             break;
         }
-        case EXPAND_WILDCARD_NO_MATCH: {
+        case expand_result_t::wildcard_no_match: {
             result = report_unmatched_wildcard_error(switch_value_n);
             break;
         }
-        case EXPAND_WILDCARD_MATCH:
-        case EXPAND_OK: {
+        case expand_result_t::wildcard_match:
+        case expand_result_t::ok: {
             break;
         }
         default: {
@@ -746,15 +746,15 @@ parse_execution_result_t parse_execution_context_t::expand_command(
     wcstring unexp_cmd = *command_for_plain_statement(statement, pstree->src);
 
     // Expand the string to produce completions, and report errors.
-    expand_error_t expand_err =
+    expand_result_t expand_err =
         expand_to_command_and_args(unexp_cmd, parser->vars(), out_cmd, out_args, &errors);
-    if (expand_err == EXPAND_ERROR) {
+    if (expand_err == expand_result_t::error) {
         proc_set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
         return report_errors(errors);
-    } else if (expand_err == EXPAND_WILDCARD_NO_MATCH) {
+    } else if (expand_err == expand_result_t::wildcard_no_match) {
         return report_unmatched_wildcard_error(statement);
     }
-    assert(expand_err == EXPAND_OK || expand_err == EXPAND_WILDCARD_MATCH);
+    assert(expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match);
 
     // Complain if the resulting expansion was empty, or expanded to an empty string.
     if (out_cmd->empty()) {
@@ -906,15 +906,15 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         // Expand this string.
         parse_error_list_t errors;
         arg_expanded.clear();
-        int expand_ret =
+        auto expand_ret =
             expand_string(arg_str, &arg_expanded, EXPAND_NO_DESCRIPTIONS, parser->vars(), &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
-            case EXPAND_ERROR: {
+            case expand_result_t::error: {
                 this->report_errors(errors);
                 return parse_execution_errored;
             }
-            case EXPAND_WILDCARD_NO_MATCH: {
+            case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
                     report_unmatched_wildcard_error(arg_node);
@@ -922,8 +922,8 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
                 }
                 break;
             }
-            case EXPAND_WILDCARD_MATCH:
-            case EXPAND_OK: {
+            case expand_result_t::wildcard_match:
+            case expand_result_t::ok: {
                 break;
             }
             default: {
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 2a0054513..a575cebd8 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1134,7 +1134,7 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
         wcstring command;
         // Check that we can expand the command.
         if (expand_to_command_and_args(*unexp_command, null_environment_t{}, &command, nullptr,
-                                       parse_errors) == EXPAND_ERROR) {
+                                       parse_errors) == expand_result_t::error) {
             errored = true;
             parse_error_offset_source_start(parse_errors, source_start);
         }
diff --git a/src/parser.cpp b/src/parser.cpp
index 1a7e9ef3e..364791bb1 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -332,7 +332,7 @@ void parser_t::expand_argument_list(const wcstring &arg_list_src, expand_flags_t
     while (auto arg = arg_list.next_in_list<grammar::argument>()) {
         const wcstring arg_src = arg.get_source(arg_list_src);
         if (expand_string(arg_src, output_arg_list, eflags, vars, NULL /* errors */) ==
-            EXPAND_ERROR) {
+            expand_result_t::error) {
             break;  // failed to expand a string
         }
     }

From d8ab6290e81152f8b1cca328fcb766b3914b7d41 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 25 Apr 2019 11:22:17 -0700
Subject: [PATCH 0395/1732] Switch expand_flags_t to enum_set

---
 src/complete.cpp        | 45 ++++++++++++--------
 src/enum_set.h          | 27 ++++++++++++
 src/expand.cpp          | 43 ++++++++++---------
 src/expand.h            | 41 +++++++++++-------
 src/fish_tests.cpp      | 93 +++++++++++++++++++++++------------------
 src/highlight.cpp       |  6 +--
 src/parse_execution.cpp | 18 ++++----
 src/parse_util.cpp      |  2 +-
 src/wildcard.cpp        | 45 ++++++++++----------
 9 files changed, 193 insertions(+), 127 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index cd2652cc6..40cbafdb1 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -359,11 +359,11 @@ class completer_t {
     expand_flags_t expand_flags() const {
         // Never do command substitution in autosuggestions. Sadly, we also can't yet do job
         // expansion because it's not thread safe.
-        expand_flags_t result = 0;
-        if (this->type() == COMPLETE_AUTOSUGGEST) result |= EXPAND_SKIP_CMDSUBST;
+        expand_flags_t result{};
+        if (this->type() == COMPLETE_AUTOSUGGEST) result |= expand_flag::EXPAND_SKIP_CMDSUBST;
 
         // Allow fuzzy matching.
-        if (this->fuzzy()) result |= EXPAND_FUZZY_MATCH;
+        if (this->fuzzy()) result |= expand_flag::EXPAND_FUZZY_MATCH;
 
         return result;
     }
@@ -545,7 +545,10 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
                                    const std::vector<completion_t> &possible_comp,
                                    complete_flags_t flags) {
     wcstring tmp = wc_escaped;
-    if (!expand_one(tmp, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_WILDCARDS | this->expand_flags(), vars))
+    if (!expand_one(tmp,
+                    this->expand_flags() | expand_flag::EXPAND_SKIP_CMDSUBST |
+                        expand_flag::EXPAND_SKIP_WILDCARDS,
+                    vars))
         return;
 
     const wcstring wc = parse_util_unescape_wildcards(tmp);
@@ -665,10 +668,11 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
 
     if (use_command) {
         // Append all possible executables
-        expand_result_t result = expand_string(str_cmd, &this->completions,
-                                               EXPAND_SPECIAL_FOR_COMMAND | EXPAND_FOR_COMPLETIONS |
-                                                   EXECUTABLES_ONLY | this->expand_flags(),
-                                               vars, NULL);
+        expand_result_t result =
+            expand_string(str_cmd, &this->completions,
+                          this->expand_flags() | expand_flag::EXPAND_SPECIAL_FOR_COMMAND |
+                              expand_flag::EXPAND_FOR_COMPLETIONS | expand_flag::EXECUTABLES_ONLY,
+                          vars, NULL);
         if (result != expand_result_t::error && this->wants_descriptions()) {
             this->complete_cmd_desc(str_cmd);
         }
@@ -680,8 +684,9 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
         expand_result_t ignore =
             // Append all matching directories
             expand_string(str_cmd, &this->completions,
-                          EXPAND_FOR_COMPLETIONS | DIRECTORIES_ONLY | this->expand_flags(), vars,
-                          NULL);
+                          this->expand_flags() | expand_flag::EXPAND_FOR_COMPLETIONS |
+                              expand_flag::DIRECTORIES_ONLY,
+                          vars, NULL);
         UNUSED(ignore);
     }
 
@@ -747,9 +752,10 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
         proc_push_interactive(0);
     }
 
-    expand_flags_t eflags = 0;
+    expand_flags_t eflags{};
     if (is_autosuggest) {
-        eflags |= EXPAND_NO_DESCRIPTIONS | EXPAND_SKIP_CMDSUBST;
+        eflags |= expand_flag::EXPAND_NO_DESCRIPTIONS;
+        eflags |= expand_flag::EXPAND_SKIP_CMDSUBST;
     }
 
     std::vector<completion_t> possible_comp;
@@ -1061,19 +1067,22 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
 /// Perform generic (not command-specific) expansions on the specified string.
 void completer_t::complete_param_expand(const wcstring &str, bool do_file,
                                         bool handle_as_special_cd) {
-    expand_flags_t flags = EXPAND_SKIP_CMDSUBST | EXPAND_FOR_COMPLETIONS | this->expand_flags();
+    expand_flags_t flags = this->expand_flags() | expand_flag::EXPAND_SKIP_CMDSUBST |
+                           expand_flag::EXPAND_FOR_COMPLETIONS;
 
-    if (!do_file) flags |= EXPAND_SKIP_WILDCARDS;
+    if (!do_file) flags |= expand_flag::EXPAND_SKIP_WILDCARDS;
 
     if (handle_as_special_cd && do_file) {
         if (this->type() == COMPLETE_AUTOSUGGEST) {
-            flags |= EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST;
+            flags |= expand_flag::EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST;
         }
-        flags |= DIRECTORIES_ONLY | EXPAND_SPECIAL_FOR_CD | EXPAND_NO_DESCRIPTIONS;
+        flags |= expand_flags_t{expand_flag::DIRECTORIES_ONLY, expand_flag::EXPAND_SPECIAL_FOR_CD,
+                                expand_flag::EXPAND_NO_DESCRIPTIONS};
     }
 
     // Squelch file descriptions per issue #254.
-    if (this->type() == COMPLETE_AUTOSUGGEST || do_file) flags |= EXPAND_NO_DESCRIPTIONS;
+    if (this->type() == COMPLETE_AUTOSUGGEST || do_file)
+        flags |= expand_flag::EXPAND_NO_DESCRIPTIONS;
 
     // We have the following cases:
     //
@@ -1110,7 +1119,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     if (complete_from_start) {
         // Don't do fuzzy matching for files if the string begins with a dash (issue #568). We could
         // consider relaxing this if there was a preceding double-dash argument.
-        if (string_prefixes_string(L"-", str)) flags &= ~EXPAND_FUZZY_MATCH;
+        if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::EXPAND_FUZZY_MATCH);
 
         if (expand_string(str, &this->completions, flags, vars, NULL) == expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
diff --git a/src/enum_set.h b/src/enum_set.h
index cbec399d0..a8b9b229b 100644
--- a/src/enum_set.h
+++ b/src/enum_set.h
@@ -25,6 +25,7 @@ class enum_set_t : private std::bitset<enum_count<T>()> {
     static size_t index_of(T t) { return static_cast<size_t>(t); }
 
     explicit enum_set_t(unsigned long raw) : super(raw) {}
+    explicit enum_set_t(super sup) : super(sup) {}
 
    public:
     enum_set_t() = default;
@@ -52,6 +53,32 @@ class enum_set_t : private std::bitset<enum_count<T>()> {
     bool operator==(const enum_set_t &rhs) const { return super::operator==(rhs); }
 
     bool operator!=(const enum_set_t &rhs) const { return super::operator!=(rhs); }
+
+    /// OR in a single flag, returning a new set.
+    enum_set_t operator|(T rhs) const {
+        enum_set_t result = *this;
+        result.set(rhs);
+        return result;
+    }
+
+    /// Compute the union of two sets.
+    enum_set_t operator|(enum_set_t rhs) const { return from_raw(to_raw() | rhs.to_raw()); }
+
+    /// OR in a single flag, modifying the set in place.
+    enum_set_t operator|=(T rhs) {
+        *this = *this | rhs;
+        return *this;
+    }
+
+    /// Set this to the union of two sets.
+    enum_set_t operator|=(enum_set_t rhs) {
+        *this = *this | rhs;
+        return *this;
+    }
+
+    /// Test a value of a single flag. Note this does not return an enum_set_t; there is no such
+    /// boolean conversion. This simply makes flags work more naturally as bit masks.
+    bool operator&(T rhs) const { return get(rhs); }
 };
 
 /// An array of Elem indexed by an enum class.
diff --git a/src/expand.cpp b/src/expand.cpp
index 9e9f5c8cd..c932465ce 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -511,7 +511,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     }
 
     if (brace_count > 0) {
-        if (!(flags & EXPAND_FOR_COMPLETIONS)) {
+        if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
             syntax_error = true;
         } else {
             // The user hasn't typed an end brace yet; make one up and append it, then expand
@@ -527,7 +527,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
             }
 
             // Note: this code looks very fishy, apparently it has never worked.
-            return expand_braces(mod, 1, out, errors);
+            return expand_braces(mod, expand_flag::EXPAND_SKIP_CMDSUBST, out, errors);
         }
     }
 
@@ -898,7 +898,7 @@ class expander_t {
 };
 
 expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
-    if (EXPAND_SKIP_CMDSUBST & flags) {
+    if (flags & expand_flag::EXPAND_SKIP_CMDSUBST) {
         size_t cur = 0, start = 0, end;
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
             case 0:
@@ -924,7 +924,7 @@ expand_result_t expander_t::stage_variables(wcstring input, std::vector<completi
     wcstring next;
     unescape_string(input, &next, UNESCAPE_SPECIAL | UNESCAPE_INCOMPLETE);
 
-    if (EXPAND_SKIP_VARIABLES & flags) {
+    if (flags & expand_flag::EXPAND_SKIP_VARIABLES) {
         for (size_t i = 0; i < next.size(); i++) {
             if (next.at(i) == VARIABLE_EXPAND) {
                 next[i] = L'$';
@@ -946,7 +946,7 @@ expand_result_t expander_t::stage_braces(wcstring input, std::vector<completion_
 }
 
 expand_result_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
-    if (!(EXPAND_SKIP_HOME_DIRECTORIES & flags)) {
+    if (!(flags & expand_flag::EXPAND_SKIP_HOME_DIRECTORIES)) {
         expand_home_directory(input, vars);
     }
     expand_percent_self(input);
@@ -958,13 +958,14 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
                                             std::vector<completion_t> *out) {
     expand_result_t result = expand_result_t::ok;
 
-    remove_internal_separator(&path_to_expand, flags & EXPAND_SKIP_WILDCARDS);
+    remove_internal_separator(&path_to_expand, flags & expand_flag::EXPAND_SKIP_WILDCARDS);
     const bool has_wildcard = wildcard_has(path_to_expand, true /* internal, i.e. ANY_STRING */);
+    const bool for_completions = flags & expand_flag::EXPAND_FOR_COMPLETIONS;
+    const bool skip_wildcards = flags & expand_flag::EXPAND_SKIP_WILDCARDS;
 
-    if (has_wildcard && (flags & EXECUTABLES_ONLY)) {
+    if (has_wildcard && (flags & expand_flag::EXECUTABLES_ONLY)) {
         ;  // don't do wildcard expansion for executables, see issue #785
-    } else if (((flags & EXPAND_FOR_COMPLETIONS) && (!(flags & EXPAND_SKIP_WILDCARDS))) ||
-               has_wildcard) {
+    } else if ((for_completions && !skip_wildcards) || has_wildcard) {
         // We either have a wildcard, or we don't have a wildcard but we're doing completion
         // expansion (so we want to get the completion of a file path). Note that if
         // EXPAND_SKIP_WILDCARDS is set, we stomped wildcards in remove_internal_separator above, so
@@ -974,8 +975,8 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
         // which may be CDPATH if the special flag is set.
         const wcstring working_dir = vars.get_pwd_slash();
         wcstring_list_t effective_working_dirs;
-        bool for_cd = static_cast<bool>(flags & EXPAND_SPECIAL_FOR_CD);
-        bool for_command = static_cast<bool>(flags & EXPAND_SPECIAL_FOR_COMMAND);
+        bool for_cd = flags & expand_flag::EXPAND_SPECIAL_FOR_CD;
+        bool for_command = flags & expand_flag::EXPAND_SPECIAL_FOR_COMMAND;
         if (!for_cd && !for_command) {
             // Common case.
             effective_working_dirs.push_back(working_dir);
@@ -1038,7 +1039,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
         // Can't fully justify this check. I think it's that SKIP_WILDCARDS is used when completing
         // to mean don't do file expansions, so if we're not doing file expansions, just drop this
         // completion on the floor.
-        if (!(flags & EXPAND_FOR_COMPLETIONS)) {
+        if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
             append_completion(out, std::move(path_to_expand));
         }
     }
@@ -1050,7 +1051,7 @@ expand_result_t expander_t::expand_string(wcstring input,
                                           expand_flags_t flags, const environment_t &vars,
                                           parse_error_list_t *errors) {
     // Early out. If we're not completing, and there's no magic in the input, we're done.
-    if (!(flags & EXPAND_FOR_COMPLETIONS) && expand_is_clean(input)) {
+    if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS) && expand_is_clean(input)) {
         append_completion(out_completions, std::move(input));
         return expand_result_t::ok;
     }
@@ -1092,7 +1093,7 @@ expand_result_t expander_t::expand_string(wcstring input,
 
     if (total_result != expand_result_t::error) {
         // Hack to un-expand tildes (see #647).
-        if (!(flags & EXPAND_SKIP_HOME_DIRECTORIES)) {
+        if (!(flags & expand_flag::EXPAND_SKIP_HOME_DIRECTORIES)) {
             unexpand_tildes(input, vars, &completions);
         }
         out_completions->insert(out_completions->end(),
@@ -1113,12 +1114,12 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
                 parse_error_list_t *errors) {
     std::vector<completion_t> completions;
 
-    if (!(flags & EXPAND_FOR_COMPLETIONS) && expand_is_clean(string)) {
+    if (!flags.get(expand_flag::EXPAND_FOR_COMPLETIONS) && expand_is_clean(string)) {
         return true;
     }
 
-    if (expand_string(string, &completions, flags | EXPAND_NO_DESCRIPTIONS, vars, errors) !=
-            expand_result_t::error &&
+    if (expand_string(string, &completions, flags | expand_flag::EXPAND_NO_DESCRIPTIONS, vars,
+                      errors) != expand_result_t::error &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
         return true;
@@ -1137,9 +1138,11 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
     }
 
     std::vector<completion_t> completions;
-    expand_result_t expand_err = expand_string(
-        instr, &completions, EXPAND_SKIP_CMDSUBST | EXPAND_NO_DESCRIPTIONS | EXPAND_SKIP_JOBS, vars,
-        errors);
+    expand_result_t expand_err =
+        expand_string(instr, &completions,
+                      {expand_flag::EXPAND_SKIP_CMDSUBST, expand_flag::EXPAND_NO_DESCRIPTIONS,
+                       expand_flag::EXPAND_SKIP_JOBS},
+                      vars, errors);
     if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
diff --git a/src/expand.h b/src/expand.h
index 46ac206fe..e733851e9 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include "common.h"
+#include "enum_set.h"
 #include "maybe.h"
 #include "parse_constants.h"
 
@@ -21,43 +22,51 @@ class environment_t;
 class env_var_t;
 class environment_t;
 
-enum {
+enum class expand_flag {
     /// Flag specifying that cmdsubst expansion should be skipped.
-    EXPAND_SKIP_CMDSUBST = 1 << 0,
+    EXPAND_SKIP_CMDSUBST,
     /// Flag specifying that variable expansion should be skipped.
-    EXPAND_SKIP_VARIABLES = 1 << 1,
+    EXPAND_SKIP_VARIABLES,
     /// Flag specifying that wildcard expansion should be skipped.
-    EXPAND_SKIP_WILDCARDS = 1 << 2,
+    EXPAND_SKIP_WILDCARDS,
     /// The expansion is being done for tab or auto completions. Returned completions may have the
     /// wildcard as a prefix instead of a match.
-    EXPAND_FOR_COMPLETIONS = 1 << 3,
+    EXPAND_FOR_COMPLETIONS,
     /// Only match files that are executable by the current user.
-    EXECUTABLES_ONLY = 1 << 4,
+    EXECUTABLES_ONLY,
     /// Only match directories.
-    DIRECTORIES_ONLY = 1 << 5,
+    DIRECTORIES_ONLY,
     /// Don't generate descriptions.
-    EXPAND_NO_DESCRIPTIONS = 1 << 6,
+    EXPAND_NO_DESCRIPTIONS,
     /// Don't expand jobs (but you can still expand processes). This is because
     /// job expansion is not thread safe.
-    EXPAND_SKIP_JOBS = 1 << 7,
+    EXPAND_SKIP_JOBS,
     /// Don't expand home directories.
-    EXPAND_SKIP_HOME_DIRECTORIES = 1 << 8,
+    EXPAND_SKIP_HOME_DIRECTORIES,
     /// Allow fuzzy matching.
-    EXPAND_FUZZY_MATCH = 1 << 9,
+    EXPAND_FUZZY_MATCH,
     /// Disallow directory abbreviations like /u/l/b for /usr/local/bin. Only applicable if
     /// EXPAND_FUZZY_MATCH is set.
-    EXPAND_NO_FUZZY_DIRECTORIES = 1 << 10,
+    EXPAND_NO_FUZZY_DIRECTORIES,
     /// Do expansions specifically to support cd. This means using CDPATH as a list of potential
     /// working directories, and to use logical instead of physical paths.
-    EXPAND_SPECIAL_FOR_CD = 1 << 11,
+    EXPAND_SPECIAL_FOR_CD,
     /// Do expansions specifically for cd autosuggestion. This is to differentiate between cd
     /// completions and cd autosuggestions.
-    EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST = 1 << 12,
+    EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST,
     /// Do expansions specifically to support external command completions. This means using PATH as
     /// a list of potential working directories.
-    EXPAND_SPECIAL_FOR_COMMAND = 1 << 13
+    EXPAND_SPECIAL_FOR_COMMAND,
+
+    COUNT,
 };
-typedef int expand_flags_t;
+
+template <>
+struct enum_info_t<expand_flag> {
+    static constexpr auto count = expand_flag::COUNT;
+};
+
+using expand_flags_t = enum_set_t<expand_flag>;
 
 class completion_t;
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index f0f69647c..37369b19f 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -305,6 +305,10 @@ static void test_enum_set() {
     do_test(es != enum_set_t<test_enum>::from_raw(1));
 
     es.set(test_enum::beta);
+    do_test(es.get(test_enum::beta));
+    do_test(!es.get(test_enum::alpha));
+    do_test(es & test_enum::beta);
+    do_test(!(es & test_enum::alpha));
     do_test(es.to_raw() == 2);
     do_test(es == enum_set_t<test_enum>::from_raw(2));
     do_test(es == enum_set_t<test_enum>{test_enum::beta});
@@ -312,6 +316,10 @@ static void test_enum_set() {
     do_test(es.any());
     do_test(!es.none());
 
+    do_test((enum_set_t<test_enum>{test_enum::beta} | test_enum::alpha).to_raw() == 3);
+    do_test((enum_set_t<test_enum>{test_enum::beta} | enum_set_t<test_enum>{test_enum::alpha})
+                .to_raw() == 3);
+
     unsigned idx = 0;
     for (auto v : enum_iter_t<test_enum>{}) {
         do_test(static_cast<unsigned>(v) == idx);
@@ -970,7 +978,8 @@ static void test_parser() {
 
     say(L"Testing eval_args");
     completion_list_t comps;
-    parser_t::expand_argument_list(L"alpha 'beta gamma' delta", 0, null_environment_t{}, &comps);
+    parser_t::expand_argument_list(L"alpha 'beta gamma' delta", expand_flags_t{},
+                                   null_environment_t{}, &comps);
     do_test(comps.size() == 3);
     do_test(comps.at(0).completion == L"alpha");
     do_test(comps.at(1).completion == L"beta gamma");
@@ -1656,13 +1665,15 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
 /// Test globbing and other parameter expansion.
 static void test_expand() {
     say(L"Testing parameter expansion");
+    const expand_flags_t noflags{};
 
-    expand_test(L"foo", 0, L"foo", 0, L"Strings do not expand to themselves");
-    expand_test(L"a{b,c,d}e", 0, L"abe", L"ace", L"ade", 0, L"Bracket expansion is broken");
-    expand_test(L"a*", EXPAND_SKIP_WILDCARDS, L"a*", 0, L"Cannot skip wildcard expansion");
-    expand_test(L"/bin/l\\0", EXPAND_FOR_COMPLETIONS, 0,
+    expand_test(L"foo", noflags, L"foo", 0, L"Strings do not expand to themselves");
+    expand_test(L"a{b,c,d}e", noflags, L"abe", L"ace", L"ade", 0, L"Bracket expansion is broken");
+    expand_test(L"a*", expand_flag::EXPAND_SKIP_WILDCARDS, L"a*", 0,
+                L"Cannot skip wildcard expansion");
+    expand_test(L"/bin/l\\0", expand_flag::EXPAND_FOR_COMPLETIONS, 0,
                 L"Failed to handle null escape in expansion");
-    expand_test(L"foo\\$bar", EXPAND_SKIP_VARIABLES, L"foo$bar", 0,
+    expand_test(L"foo\\$bar", expand_flag::EXPAND_SKIP_VARIABLES, L"foo$bar", 0,
                 L"Failed to handle dollar sign in variable-skipping expansion");
 
     // bb
@@ -1700,89 +1711,91 @@ static void test_expand() {
     // (https://github.com/fish-shell/fish-shell/issues/270). But it does have to match literal
     // components (e.g. "./*" has to match the same as "*".
     const wchar_t *const wnull = NULL;
-    expand_test(L"test/fish_expand_test/.*", 0, L"test/fish_expand_test/.foo", wnull,
+    expand_test(L"test/fish_expand_test/.*", noflags, L"test/fish_expand_test/.foo", wnull,
                 L"Expansion not correctly handling dotfiles");
 
-    expand_test(L"test/fish_expand_test/./.*", 0, L"test/fish_expand_test/./.foo", wnull,
+    expand_test(L"test/fish_expand_test/./.*", noflags, L"test/fish_expand_test/./.foo", wnull,
                 L"Expansion not correctly handling literal path components in dotfiles");
 
-    expand_test(L"test/fish_expand_test/*/xxx", 0, L"test/fish_expand_test/bax/xxx",
+    expand_test(L"test/fish_expand_test/*/xxx", noflags, L"test/fish_expand_test/bax/xxx",
                 L"test/fish_expand_test/baz/xxx", wnull, L"Glob did the wrong thing 1");
 
-    expand_test(L"test/fish_expand_test/*z/xxx", 0, L"test/fish_expand_test/baz/xxx", wnull,
+    expand_test(L"test/fish_expand_test/*z/xxx", noflags, L"test/fish_expand_test/baz/xxx", wnull,
                 L"Glob did the wrong thing 2");
 
-    expand_test(L"test/fish_expand_test/**z/xxx", 0, L"test/fish_expand_test/baz/xxx", wnull,
+    expand_test(L"test/fish_expand_test/**z/xxx", noflags, L"test/fish_expand_test/baz/xxx", wnull,
                 L"Glob did the wrong thing 3");
 
-    expand_test(L"test/fish_expand_test////baz/xxx", 0, L"test/fish_expand_test////baz/xxx", wnull,
-                L"Glob did the wrong thing 3");
+    expand_test(L"test/fish_expand_test////baz/xxx", noflags, L"test/fish_expand_test////baz/xxx",
+                wnull, L"Glob did the wrong thing 3");
 
-    expand_test(L"test/fish_expand_test/b**", 0, L"test/fish_expand_test/bb",
+    expand_test(L"test/fish_expand_test/b**", noflags, L"test/fish_expand_test/bb",
                 L"test/fish_expand_test/bb/x", L"test/fish_expand_test/bar",
                 L"test/fish_expand_test/bax", L"test/fish_expand_test/bax/xxx",
                 L"test/fish_expand_test/baz", L"test/fish_expand_test/baz/xxx",
                 L"test/fish_expand_test/baz/yyy", wnull, L"Glob did the wrong thing 4");
 
     // A trailing slash should only produce directories.
-    expand_test(L"test/fish_expand_test/b*/", 0, L"test/fish_expand_test/bb/",
+    expand_test(L"test/fish_expand_test/b*/", noflags, L"test/fish_expand_test/bb/",
                 L"test/fish_expand_test/baz/", L"test/fish_expand_test/bax/", wnull,
                 L"Glob did the wrong thing 5");
 
-    expand_test(L"test/fish_expand_test/b**/", 0, L"test/fish_expand_test/bb/",
+    expand_test(L"test/fish_expand_test/b**/", noflags, L"test/fish_expand_test/bb/",
                 L"test/fish_expand_test/baz/", L"test/fish_expand_test/bax/", wnull,
                 L"Glob did the wrong thing 6");
 
-    expand_test(L"test/fish_expand_test/**/q", 0, L"test/fish_expand_test/lol/nub/q", wnull,
+    expand_test(L"test/fish_expand_test/**/q", noflags, L"test/fish_expand_test/lol/nub/q", wnull,
                 L"Glob did the wrong thing 7");
 
-    expand_test(L"test/fish_expand_test/BA", EXPAND_FOR_COMPLETIONS, L"test/fish_expand_test/bar",
-                L"test/fish_expand_test/bax/", L"test/fish_expand_test/baz/", wnull,
-                L"Case insensitive test did the wrong thing");
+    expand_test(L"test/fish_expand_test/BA", expand_flag::EXPAND_FOR_COMPLETIONS,
+                L"test/fish_expand_test/bar", L"test/fish_expand_test/bax/",
+                L"test/fish_expand_test/baz/", wnull, L"Case insensitive test did the wrong thing");
 
-    expand_test(L"test/fish_expand_test/BA", EXPAND_FOR_COMPLETIONS, L"test/fish_expand_test/bar",
-                L"test/fish_expand_test/bax/", L"test/fish_expand_test/baz/", wnull,
-                L"Case insensitive test did the wrong thing");
+    expand_test(L"test/fish_expand_test/BA", expand_flag::EXPAND_FOR_COMPLETIONS,
+                L"test/fish_expand_test/bar", L"test/fish_expand_test/bax/",
+                L"test/fish_expand_test/baz/", wnull, L"Case insensitive test did the wrong thing");
 
-    expand_test(L"test/fish_expand_test/bb/yyy", EXPAND_FOR_COMPLETIONS,
+    expand_test(L"test/fish_expand_test/bb/yyy", expand_flag::EXPAND_FOR_COMPLETIONS,
                 /* nothing! */ wnull, L"Wrong fuzzy matching 1");
 
-    expand_test(L"test/fish_expand_test/bb/x", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH, L"",
-                wnull,  // we just expect the empty string since this is an exact match
-                L"Wrong fuzzy matching 2");
+    expand_test(
+        L"test/fish_expand_test/bb/x",
+        expand_flags_t{expand_flag::EXPAND_FOR_COMPLETIONS, expand_flag::EXPAND_FUZZY_MATCH}, L"",
+        wnull,  // we just expect the empty string since this is an exact match
+        L"Wrong fuzzy matching 2");
 
     // Some vswprintfs refuse to append ANY_STRING in a format specifiers, so don't use
     // format_string here.
+    const expand_flags_t fuzzy_comp{expand_flag::EXPAND_FOR_COMPLETIONS,
+                                    expand_flag::EXPAND_FUZZY_MATCH};
     const wcstring any_str_str(1, ANY_STRING);
-    expand_test(L"test/fish_expand_test/b/xx*", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH,
+    expand_test(L"test/fish_expand_test/b/xx*", fuzzy_comp,
                 (L"test/fish_expand_test/bax/xx" + any_str_str).c_str(),
                 (L"test/fish_expand_test/baz/xx" + any_str_str).c_str(), wnull,
                 L"Wrong fuzzy matching 3");
 
-    expand_test(L"test/fish_expand_test/b/yyy", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH,
-                L"test/fish_expand_test/baz/yyy", wnull, L"Wrong fuzzy matching 4");
+    expand_test(L"test/fish_expand_test/b/yyy", fuzzy_comp, L"test/fish_expand_test/baz/yyy", wnull,
+                L"Wrong fuzzy matching 4");
 
-    expand_test(L"test/fish_expand_test/aa/x", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH,
-                L"test/fish_expand_test/aaa2/x", wnull, L"Wrong fuzzy matching 5");
+    expand_test(L"test/fish_expand_test/aa/x", fuzzy_comp, L"test/fish_expand_test/aaa2/x", wnull,
+                L"Wrong fuzzy matching 5");
 
-    expand_test(L"test/fish_expand_test/aaa/x", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH, wnull,
+    expand_test(L"test/fish_expand_test/aaa/x", fuzzy_comp, wnull,
                 L"Wrong fuzzy matching 6 - shouldn't remove valid directory names (#3211)");
 
-    if (!expand_test(L"test/fish_expand_test/.*", 0, L"test/fish_expand_test/.foo", 0)) {
+    if (!expand_test(L"test/fish_expand_test/.*", noflags, L"test/fish_expand_test/.foo", 0)) {
         err(L"Expansion not correctly handling dotfiles");
     }
-    if (!expand_test(L"test/fish_expand_test/./.*", 0, L"test/fish_expand_test/./.foo", 0)) {
+    if (!expand_test(L"test/fish_expand_test/./.*", noflags, L"test/fish_expand_test/./.foo", 0)) {
         err(L"Expansion not correctly handling literal path components in dotfiles");
     }
 
     if (!pushd("test/fish_expand_test")) return;
 
-    expand_test(L"b/xx", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH, L"bax/xxx", L"baz/xxx", wnull,
-                L"Wrong fuzzy matching 5");
+    expand_test(L"b/xx", fuzzy_comp, L"bax/xxx", L"baz/xxx", wnull, L"Wrong fuzzy matching 5");
 
     // multiple slashes with fuzzy matching - #3185
-    expand_test(L"l///n", EXPAND_FOR_COMPLETIONS | EXPAND_FUZZY_MATCH, L"lol///nub/", wnull,
-                L"Wrong fuzzy matching 6");
+    expand_test(L"l///n", fuzzy_comp, L"lol///nub/", wnull, L"Wrong fuzzy matching 6");
 
     popd();
 }
@@ -2255,7 +2268,7 @@ static bool run_test_test(int expected, const wcstring &str) {
 
     // We need to tokenize the string in the same manner a normal shell would do. This is because we
     // need to test things like quoted strings that have leading and trailing whitespace.
-    parser_t::expand_argument_list(str, 0, null_environment_t{}, &comps);
+    parser_t::expand_argument_list(str, expand_flags_t{}, null_environment_t{}, &comps);
     for (completion_list_t::const_iterator it = comps.begin(), end = comps.end(); it != end; ++it) {
         argv.push_back(it->completion);
     }
diff --git a/src/highlight.cpp b/src/highlight.cpp
index fe993b121..e05539e76 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -432,7 +432,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
 
     if (parsed_command == L"cd" && !cd_dir.empty()) {
         // We can possibly handle this specially.
-        if (expand_one(cd_dir, EXPAND_SKIP_CMDSUBST, vars)) {
+        if (expand_one(cd_dir, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
             handled = true;
             bool is_help =
                 string_prefixes_string(cd_dir, L"--help") || string_prefixes_string(cd_dir, L"-h");
@@ -926,7 +926,7 @@ void highlighter_t::color_arguments(const std::vector<tnode_t<g::argument>> &arg
         if (cmd_is_cd) {
             // Mark this as an error if it's not 'help' and not a valid cd path.
             wcstring param = arg.get_source(this->buff);
-            if (expand_one(param, EXPAND_SKIP_CMDSUBST, vars)) {
+            if (expand_one(param, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
                 bool is_help = string_prefixes_string(param, L"--help") ||
                                string_prefixes_string(param, L"-h");
                 if (!is_help && this->io_ok &&
@@ -969,7 +969,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                 // I/O is disallowed, so we don't have much hope of catching anything but gross
                 // errors. Assume it's valid.
                 target_is_valid = true;
-            } else if (!expand_one(target, EXPAND_SKIP_CMDSUBST, vars)) {
+            } else if (!expand_one(target, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
                 // Could not be expanded.
                 target_is_valid = false;
             } else {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 018a35481..8146c20a7 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -127,7 +127,10 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
                 .try_get_child<g::plain_statement, 0>();
         if (plain_statement) {
             maybe_t<wcstring> cmd = command_for_plain_statement(plain_statement, pstree->src);
-            if (cmd && expand_one(*cmd, EXPAND_SKIP_CMDSUBST | EXPAND_SKIP_VARIABLES, nullenv) &&
+            if (cmd &&
+                expand_one(*cmd,
+                           {expand_flag::EXPAND_SKIP_CMDSUBST, expand_flag::EXPAND_SKIP_VARIABLES},
+                           nullenv) &&
                 cmd == forbidden_function_name) {
                 // This is it.
                 infinite_recursive_statement = plain_statement;
@@ -376,7 +379,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     // in just one.
     tnode_t<g::tok_string> var_name_node = header.child<1>();
     wcstring for_var_name = get_source(var_name_node);
-    if (!expand_one(for_var_name, 0, parser->vars())) {
+    if (!expand_one(for_var_name, expand_flags_t{}, parser->vars())) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
         return parse_execution_errored;
     }
@@ -449,8 +452,8 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     // Expand it. We need to offset any errors by the position of the string.
     std::vector<completion_t> switch_values_expanded;
     parse_error_list_t errors;
-    auto expand_ret = expand_string(switch_value, &switch_values_expanded, EXPAND_NO_DESCRIPTIONS,
-                                    parser->vars(), &errors);
+    auto expand_ret = expand_string(switch_value, &switch_values_expanded,
+                                    expand_flag::EXPAND_NO_DESCRIPTIONS, parser->vars(), &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
@@ -906,8 +909,8 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         // Expand this string.
         parse_error_list_t errors;
         arg_expanded.clear();
-        auto expand_ret =
-            expand_string(arg_str, &arg_expanded, EXPAND_NO_DESCRIPTIONS, parser->vars(), &errors);
+        auto expand_ret = expand_string(arg_str, &arg_expanded, expand_flag::EXPAND_NO_DESCRIPTIONS,
+                                        parser->vars(), &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
             case expand_result_t::error: {
@@ -956,7 +959,8 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
 
         // PCA: I can't justify this EXPAND_SKIP_VARIABLES flag. It was like this when I got here.
         bool target_expanded =
-            expand_one(target, no_exec ? EXPAND_SKIP_VARIABLES : 0, parser->vars());
+            expand_one(target, no_exec ? expand_flag::EXPAND_SKIP_VARIABLES : expand_flags_t{},
+                       parser->vars());
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
             errored =
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index a575cebd8..9a75507f8 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1197,7 +1197,7 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
 
         // Check that we don't do an invalid builtin (issue #1252).
         if (!errored && decoration == parse_statement_decoration_builtin &&
-            expand_one(*unexp_command, 0, null_environment_t{}, parse_errors) &&
+            expand_one(*unexp_command, expand_flags_t{}, null_environment_t{}, parse_errors) &&
             !builtin_exists(*unexp_command)) {
             errored = append_syntax_error(parse_errors, source_start, UNKNOWN_BUILTIN_ERR_MSG,
                                           unexp_command->c_str());
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 5e0b47b22..05a8e1204 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -167,7 +167,7 @@ static wcstring resolve_description(const wcstring &full_completion, wcstring *c
         completion->resize(complete_sep_loc);
         return description;
     }
-    if (expand_flags & EXPAND_NO_DESCRIPTIONS) return {};
+    if (expand_flags & expand_flag::EXPAND_NO_DESCRIPTIONS) return {};
     return desc_func ? desc_func(full_completion) : wcstring{};
 }
 
@@ -219,7 +219,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
 
         // If we're allowing fuzzy match, any match is OK. Otherwise we require a prefix match.
         bool match_acceptable;
-        if (params.expand_flags & EXPAND_FUZZY_MATCH) {
+        if (params.expand_flags & expand_flag::EXPAND_FUZZY_MATCH) {
             match_acceptable = match.type != fuzzy_match_none;
         } else {
             match_acceptable = match_type_shares_prefix(match.type);
@@ -415,12 +415,12 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
     const bool is_directory = stat_res == 0 && S_ISDIR(stat_buf.st_mode);
     const bool is_executable = stat_res == 0 && S_ISREG(stat_buf.st_mode);
 
-    const bool need_directory = expand_flags & DIRECTORIES_ONLY;
+    const bool need_directory = expand_flags & expand_flag::DIRECTORIES_ONLY;
     if (need_directory && !is_directory) {
         return false;
     }
 
-    const bool executables_only = expand_flags & EXECUTABLES_ONLY;
+    const bool executables_only = expand_flags & expand_flag::EXECUTABLES_ONLY;
     if (executables_only && (!is_executable || waccess(filepath, X_OK) != 0)) {
         return false;
     }
@@ -432,7 +432,7 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
 
     // Compute the description.
     wcstring desc;
-    if (!(expand_flags & EXPAND_NO_DESCRIPTIONS)) {
+    if (!(expand_flags & expand_flag::EXPAND_NO_DESCRIPTIONS)) {
         desc = file_get_desc(filepath, lstat_res, lstat_buf, stat_res, stat_buf, stat_errno);
 
         if (file_size >= 0) {
@@ -507,8 +507,7 @@ class wildcard_expander_t {
 
     void add_expansion_result(const wcstring &result) {
         // This function is only for the non-completions case.
-        assert(!static_cast<bool>(this->flags &
-                                  EXPAND_FOR_COMPLETIONS));  //!OCLINT(multiple unary operator)
+        assert(!(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS));
         if (this->completion_set.insert(result).second) {
             append_completion(this->resolved_completions, result);
             this->did_add = true;
@@ -569,13 +568,13 @@ class wildcard_expander_t {
     void try_add_completion_result(const wcstring &filepath, const wcstring &filename,
                                    const wcstring &wildcard, const wcstring &prefix) {
         // This function is only for the completions case.
-        assert(this->flags & EXPAND_FOR_COMPLETIONS);
+        assert(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS);
 
         wcstring abs_path = this->working_directory;
         append_path_component(abs_path, filepath);
 
         // We must normalize the path to allow 'cd ..' to operate on logical paths.
-        if (flags & EXPAND_SPECIAL_FOR_CD) abs_path = normalize_path(abs_path);
+        if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD) abs_path = normalize_path(abs_path);
 
         size_t before = this->resolved_completions->size();
         if (wildcard_test_flags_then_complete(abs_path, filename, wildcard.c_str(), this->flags,
@@ -597,7 +596,7 @@ class wildcard_expander_t {
             // hierarchy we can, and then appending any components to each new result.
             // Only descend deepest unique for cd autosuggest and not for cd tab completion
             // (issue #4402).
-            if (flags & EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST) {
+            if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST) {
                 wcstring unique_hierarchy = this->descend_unique_hierarchy(abs_path);
                 if (!unique_hierarchy.empty()) {
                     for (size_t i = before; i < after; i++) {
@@ -615,7 +614,7 @@ class wildcard_expander_t {
     DIR *open_dir(const wcstring &base_dir) const {
         wcstring path = this->working_directory;
         append_path_component(path, base_dir);
-        if (flags & EXPAND_SPECIAL_FOR_CD) {
+        if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD) {
             // cd operates on logical paths.
             // for example, cd ../<tab> should complete "without resolving symlinks".
             path = normalize_path(path);
@@ -661,7 +660,7 @@ void wildcard_expander_t::expand_trailing_slash(const wcstring &base_dir, const
         return;
     }
 
-    if (!(flags & EXPAND_FOR_COMPLETIONS)) {
+    if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
         // Trailing slash and not accepting incomplete, e.g. `echo /xyz/`. Insert this file if it
         // exists.
         if (waccess(base_dir, F_OK) == 0) {
@@ -784,7 +783,7 @@ void wildcard_expander_t::expand_last_segment(const wcstring &base_dir, DIR *bas
                                               const wcstring &wc, const wcstring &prefix) {
     wcstring name_str;
     while (wreaddir(base_dir_fp, name_str)) {
-        if (flags & EXPAND_FOR_COMPLETIONS) {
+        if (flags & expand_flag::EXPAND_FOR_COMPLETIONS) {
             this->try_add_completion_result(base_dir + name_str, name_str, wc, prefix);
         } else {
             // Normal wildcard expansion, not for completions.
@@ -855,11 +854,11 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
         // Maybe try a fuzzy match (#94) if nothing was found with the literal match. Respect
         // EXPAND_NO_DIRECTORY_ABBREVIATIONS (issue #2413).
         // Don't do fuzzy matches if the literal segment was valid (#3211)
-        bool allow_fuzzy = (this->flags & (EXPAND_FUZZY_MATCH | EXPAND_NO_FUZZY_DIRECTORIES)) ==
-                           EXPAND_FUZZY_MATCH;
+        bool allow_fuzzy = this->flags.get(expand_flag::EXPAND_FUZZY_MATCH) &&
+                           !this->flags.get(expand_flag::EXPAND_NO_FUZZY_DIRECTORIES);
         if (allow_fuzzy && this->resolved_completions->size() == before &&
             waccess(intermediate_dirpath, F_OK) != 0) {
-            assert(this->flags & EXPAND_FOR_COMPLETIONS);
+            assert(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS);
             DIR *base_dir_fd = open_dir(base_dir);
             if (base_dir_fd != NULL) {
                 this->expand_literal_intermediate_segment_with_fuzz(
@@ -905,13 +904,15 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory
                            expand_flags_t flags, std::vector<completion_t> *output) {
     assert(output != NULL);
     // Fuzzy matching only if we're doing completions.
-    assert((flags & (EXPAND_FUZZY_MATCH | EXPAND_FOR_COMPLETIONS)) != EXPAND_FUZZY_MATCH);
+    assert(flags.get(expand_flag::EXPAND_FOR_COMPLETIONS) ||
+           !flags.get(expand_flag::EXPAND_FUZZY_MATCH));
 
-    // EXPAND_SPECIAL_FOR_CD requires DIRECTORIES_ONLY and EXPAND_FOR_COMPLETIONS and
-    // EXPAND_NO_DESCRIPTIONS.
-    assert(!(flags & EXPAND_SPECIAL_FOR_CD) ||
-           ((flags & DIRECTORIES_ONLY) && (flags & EXPAND_FOR_COMPLETIONS) &&
-            (flags & EXPAND_NO_DESCRIPTIONS)));
+    // expand_flag::EXPAND_SPECIAL_FOR_CD requires expand_flag::DIRECTORIES_ONLY and
+    // expand_flag::EXPAND_FOR_COMPLETIONS and expand_flag::EXPAND_NO_DESCRIPTIONS.
+    assert(!(flags.get(expand_flag::EXPAND_SPECIAL_FOR_CD)) ||
+           ((flags.get(expand_flag::DIRECTORIES_ONLY)) &&
+            (flags.get(expand_flag::EXPAND_FOR_COMPLETIONS)) &&
+            (flags.get(expand_flag::EXPAND_NO_DESCRIPTIONS))));
 
     // Hackish fix for issue #1631. We are about to call c_str(), which will produce a string
     // truncated at any embedded nulls. We could fix this by passing around the size, etc. However

From 496529b20afeb345bb0ecbe64dab0a3bcb0c1848 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 25 Apr 2019 11:34:49 -0700
Subject: [PATCH 0396/1732] Remove EXPAND prefix from expand_flags and
 lowercase them

---
 src/complete.cpp        | 40 +++++++++++++++----------------
 src/expand.cpp          | 49 +++++++++++++++++++------------------
 src/expand.h            | 44 +++++++++++++++++-----------------
 src/fish_tests.cpp      | 25 +++++++++----------
 src/highlight.cpp       |  6 ++---
 src/parse_execution.cpp | 14 +++++------
 src/wildcard.cpp        | 53 ++++++++++++++++++++---------------------
 src/wildcard.h          |  4 ++--
 8 files changed, 113 insertions(+), 122 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 40cbafdb1..02c1e0983 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -360,10 +360,10 @@ class completer_t {
         // Never do command substitution in autosuggestions. Sadly, we also can't yet do job
         // expansion because it's not thread safe.
         expand_flags_t result{};
-        if (this->type() == COMPLETE_AUTOSUGGEST) result |= expand_flag::EXPAND_SKIP_CMDSUBST;
+        if (this->type() == COMPLETE_AUTOSUGGEST) result |= expand_flag::skip_cmdsubst;
 
         // Allow fuzzy matching.
-        if (this->fuzzy()) result |= expand_flag::EXPAND_FUZZY_MATCH;
+        if (this->fuzzy()) result |= expand_flag::fuzzy_match;
 
         return result;
     }
@@ -546,8 +546,7 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
                                    complete_flags_t flags) {
     wcstring tmp = wc_escaped;
     if (!expand_one(tmp,
-                    this->expand_flags() | expand_flag::EXPAND_SKIP_CMDSUBST |
-                        expand_flag::EXPAND_SKIP_WILDCARDS,
+                    this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::skip_wildcards,
                     vars))
         return;
 
@@ -670,8 +669,8 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
         // Append all possible executables
         expand_result_t result =
             expand_string(str_cmd, &this->completions,
-                          this->expand_flags() | expand_flag::EXPAND_SPECIAL_FOR_COMMAND |
-                              expand_flag::EXPAND_FOR_COMPLETIONS | expand_flag::EXECUTABLES_ONLY,
+                          this->expand_flags() | expand_flag::special_for_command |
+                              expand_flag::for_completions | expand_flag::executables_only,
                           vars, NULL);
         if (result != expand_result_t::error && this->wants_descriptions()) {
             this->complete_cmd_desc(str_cmd);
@@ -683,10 +682,10 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
         // updated with choices for the user.
         expand_result_t ignore =
             // Append all matching directories
-            expand_string(str_cmd, &this->completions,
-                          this->expand_flags() | expand_flag::EXPAND_FOR_COMPLETIONS |
-                              expand_flag::DIRECTORIES_ONLY,
-                          vars, NULL);
+            expand_string(
+                str_cmd, &this->completions,
+                this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
+                vars, NULL);
         UNUSED(ignore);
     }
 
@@ -754,8 +753,8 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
 
     expand_flags_t eflags{};
     if (is_autosuggest) {
-        eflags |= expand_flag::EXPAND_NO_DESCRIPTIONS;
-        eflags |= expand_flag::EXPAND_SKIP_CMDSUBST;
+        eflags |= expand_flag::no_descriptions;
+        eflags |= expand_flag::skip_cmdsubst;
     }
 
     std::vector<completion_t> possible_comp;
@@ -1067,22 +1066,21 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
 /// Perform generic (not command-specific) expansions on the specified string.
 void completer_t::complete_param_expand(const wcstring &str, bool do_file,
                                         bool handle_as_special_cd) {
-    expand_flags_t flags = this->expand_flags() | expand_flag::EXPAND_SKIP_CMDSUBST |
-                           expand_flag::EXPAND_FOR_COMPLETIONS;
+    expand_flags_t flags =
+        this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::for_completions;
 
-    if (!do_file) flags |= expand_flag::EXPAND_SKIP_WILDCARDS;
+    if (!do_file) flags |= expand_flag::skip_wildcards;
 
     if (handle_as_special_cd && do_file) {
         if (this->type() == COMPLETE_AUTOSUGGEST) {
-            flags |= expand_flag::EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST;
+            flags |= expand_flag::special_for_cd_autosuggestion;
         }
-        flags |= expand_flags_t{expand_flag::DIRECTORIES_ONLY, expand_flag::EXPAND_SPECIAL_FOR_CD,
-                                expand_flag::EXPAND_NO_DESCRIPTIONS};
+        flags |= expand_flags_t{expand_flag::directories_only, expand_flag::special_for_cd,
+                                expand_flag::no_descriptions};
     }
 
     // Squelch file descriptions per issue #254.
-    if (this->type() == COMPLETE_AUTOSUGGEST || do_file)
-        flags |= expand_flag::EXPAND_NO_DESCRIPTIONS;
+    if (this->type() == COMPLETE_AUTOSUGGEST || do_file) flags |= expand_flag::no_descriptions;
 
     // We have the following cases:
     //
@@ -1119,7 +1117,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     if (complete_from_start) {
         // Don't do fuzzy matching for files if the string begins with a dash (issue #568). We could
         // consider relaxing this if there was a preceding double-dash argument.
-        if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::EXPAND_FUZZY_MATCH);
+        if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::fuzzy_match);
 
         if (expand_string(str, &this->completions, flags, vars, NULL) == expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
diff --git a/src/expand.cpp b/src/expand.cpp
index c932465ce..fdb4e5a52 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -511,7 +511,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     }
 
     if (brace_count > 0) {
-        if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
+        if (!(flags & expand_flag::for_completions)) {
             syntax_error = true;
         } else {
             // The user hasn't typed an end brace yet; make one up and append it, then expand
@@ -527,7 +527,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
             }
 
             // Note: this code looks very fishy, apparently it has never worked.
-            return expand_braces(mod, expand_flag::EXPAND_SKIP_CMDSUBST, out, errors);
+            return expand_braces(mod, expand_flag::skip_cmdsubst, out, errors);
         }
     }
 
@@ -838,7 +838,7 @@ wcstring replace_home_directory_with_tilde(const wcstring &str, const environmen
 }
 
 /// Remove any internal separators. Also optionally convert wildcard characters to regular
-/// equivalents. This is done to support EXPAND_SKIP_WILDCARDS.
+/// equivalents. This is done to support skip_wildcards.
 static void remove_internal_separator(wcstring *str, bool conv) {
     // Remove all instances of INTERNAL_SEPARATOR.
     str->erase(std::remove(str->begin(), str->end(), (wchar_t)INTERNAL_SEPARATOR), str->end());
@@ -898,7 +898,7 @@ class expander_t {
 };
 
 expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
-    if (flags & expand_flag::EXPAND_SKIP_CMDSUBST) {
+    if (flags & expand_flag::skip_cmdsubst) {
         size_t cur = 0, start = 0, end;
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
             case 0:
@@ -924,7 +924,7 @@ expand_result_t expander_t::stage_variables(wcstring input, std::vector<completi
     wcstring next;
     unescape_string(input, &next, UNESCAPE_SPECIAL | UNESCAPE_INCOMPLETE);
 
-    if (flags & expand_flag::EXPAND_SKIP_VARIABLES) {
+    if (flags & expand_flag::skip_variables) {
         for (size_t i = 0; i < next.size(); i++) {
             if (next.at(i) == VARIABLE_EXPAND) {
                 next[i] = L'$';
@@ -946,7 +946,7 @@ expand_result_t expander_t::stage_braces(wcstring input, std::vector<completion_
 }
 
 expand_result_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
-    if (!(flags & expand_flag::EXPAND_SKIP_HOME_DIRECTORIES)) {
+    if (!(flags & expand_flag::skip_home_directories)) {
         expand_home_directory(input, vars);
     }
     expand_percent_self(input);
@@ -958,30 +958,30 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
                                             std::vector<completion_t> *out) {
     expand_result_t result = expand_result_t::ok;
 
-    remove_internal_separator(&path_to_expand, flags & expand_flag::EXPAND_SKIP_WILDCARDS);
+    remove_internal_separator(&path_to_expand, flags & expand_flag::skip_wildcards);
     const bool has_wildcard = wildcard_has(path_to_expand, true /* internal, i.e. ANY_STRING */);
-    const bool for_completions = flags & expand_flag::EXPAND_FOR_COMPLETIONS;
-    const bool skip_wildcards = flags & expand_flag::EXPAND_SKIP_WILDCARDS;
+    const bool for_completions = flags & expand_flag::for_completions;
+    const bool skip_wildcards = flags & expand_flag::skip_wildcards;
 
-    if (has_wildcard && (flags & expand_flag::EXECUTABLES_ONLY)) {
+    if (has_wildcard && (flags & expand_flag::executables_only)) {
         ;  // don't do wildcard expansion for executables, see issue #785
     } else if ((for_completions && !skip_wildcards) || has_wildcard) {
         // We either have a wildcard, or we don't have a wildcard but we're doing completion
         // expansion (so we want to get the completion of a file path). Note that if
-        // EXPAND_SKIP_WILDCARDS is set, we stomped wildcards in remove_internal_separator above, so
+        // skip_wildcards is set, we stomped wildcards in remove_internal_separator above, so
         // there actually aren't any.
         //
         // So we're going to treat this input as a file path. Compute the "working directories",
         // which may be CDPATH if the special flag is set.
         const wcstring working_dir = vars.get_pwd_slash();
         wcstring_list_t effective_working_dirs;
-        bool for_cd = flags & expand_flag::EXPAND_SPECIAL_FOR_CD;
-        bool for_command = flags & expand_flag::EXPAND_SPECIAL_FOR_COMMAND;
+        bool for_cd = flags & expand_flag::special_for_cd;
+        bool for_command = flags & expand_flag::special_for_command;
         if (!for_cd && !for_command) {
             // Common case.
             effective_working_dirs.push_back(working_dir);
         } else {
-            // Either EXPAND_SPECIAL_FOR_COMMAND or EXPAND_SPECIAL_FOR_CD. We can handle these
+            // Either special_for_command or special_for_cd. We can handle these
             // mostly the same. There's the following differences:
             //
             // 1. An empty CDPATH should be treated as '.', but an empty PATH should be left empty
@@ -1039,7 +1039,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
         // Can't fully justify this check. I think it's that SKIP_WILDCARDS is used when completing
         // to mean don't do file expansions, so if we're not doing file expansions, just drop this
         // completion on the floor.
-        if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
+        if (!(flags & expand_flag::for_completions)) {
             append_completion(out, std::move(path_to_expand));
         }
     }
@@ -1051,7 +1051,7 @@ expand_result_t expander_t::expand_string(wcstring input,
                                           expand_flags_t flags, const environment_t &vars,
                                           parse_error_list_t *errors) {
     // Early out. If we're not completing, and there's no magic in the input, we're done.
-    if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS) && expand_is_clean(input)) {
+    if (!(flags & expand_flag::for_completions) && expand_is_clean(input)) {
         append_completion(out_completions, std::move(input));
         return expand_result_t::ok;
     }
@@ -1093,7 +1093,7 @@ expand_result_t expander_t::expand_string(wcstring input,
 
     if (total_result != expand_result_t::error) {
         // Hack to un-expand tildes (see #647).
-        if (!(flags & expand_flag::EXPAND_SKIP_HOME_DIRECTORIES)) {
+        if (!(flags & expand_flag::skip_home_directories)) {
             unexpand_tildes(input, vars, &completions);
         }
         out_completions->insert(out_completions->end(),
@@ -1114,12 +1114,12 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
                 parse_error_list_t *errors) {
     std::vector<completion_t> completions;
 
-    if (!flags.get(expand_flag::EXPAND_FOR_COMPLETIONS) && expand_is_clean(string)) {
+    if (!flags.get(expand_flag::for_completions) && expand_is_clean(string)) {
         return true;
     }
 
-    if (expand_string(string, &completions, flags | expand_flag::EXPAND_NO_DESCRIPTIONS, vars,
-                      errors) != expand_result_t::error &&
+    if (expand_string(string, &completions, flags | expand_flag::no_descriptions, vars, errors) !=
+            expand_result_t::error &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
         return true;
@@ -1138,11 +1138,10 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
     }
 
     std::vector<completion_t> completions;
-    expand_result_t expand_err =
-        expand_string(instr, &completions,
-                      {expand_flag::EXPAND_SKIP_CMDSUBST, expand_flag::EXPAND_NO_DESCRIPTIONS,
-                       expand_flag::EXPAND_SKIP_JOBS},
-                      vars, errors);
+    expand_result_t expand_err = expand_string(
+        instr, &completions,
+        {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, vars,
+        errors);
     if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
diff --git a/src/expand.h b/src/expand.h
index e733851e9..07a05e17d 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -22,41 +22,41 @@ class environment_t;
 class env_var_t;
 class environment_t;
 
+/// Set of flags controlling expansions.
 enum class expand_flag {
-    /// Flag specifying that cmdsubst expansion should be skipped.
-    EXPAND_SKIP_CMDSUBST,
-    /// Flag specifying that variable expansion should be skipped.
-    EXPAND_SKIP_VARIABLES,
-    /// Flag specifying that wildcard expansion should be skipped.
-    EXPAND_SKIP_WILDCARDS,
+    /// Skip command substitutions.
+    skip_cmdsubst,
+    /// Skip variable expansion.
+    skip_variables,
+    /// Skip wildcard expansion.
+    skip_wildcards,
     /// The expansion is being done for tab or auto completions. Returned completions may have the
     /// wildcard as a prefix instead of a match.
-    EXPAND_FOR_COMPLETIONS,
+    for_completions,
     /// Only match files that are executable by the current user.
-    EXECUTABLES_ONLY,
+    executables_only,
     /// Only match directories.
-    DIRECTORIES_ONLY,
+    directories_only,
     /// Don't generate descriptions.
-    EXPAND_NO_DESCRIPTIONS,
-    /// Don't expand jobs (but you can still expand processes). This is because
-    /// job expansion is not thread safe.
-    EXPAND_SKIP_JOBS,
+    no_descriptions,
+    /// Don't expand jobs (but still expand processes).
+    skip_jobs,
     /// Don't expand home directories.
-    EXPAND_SKIP_HOME_DIRECTORIES,
+    skip_home_directories,
     /// Allow fuzzy matching.
-    EXPAND_FUZZY_MATCH,
+    fuzzy_match,
     /// Disallow directory abbreviations like /u/l/b for /usr/local/bin. Only applicable if
-    /// EXPAND_FUZZY_MATCH is set.
-    EXPAND_NO_FUZZY_DIRECTORIES,
+    /// fuzzy_match is set.
+    no_fuzzy_directories,
     /// Do expansions specifically to support cd. This means using CDPATH as a list of potential
     /// working directories, and to use logical instead of physical paths.
-    EXPAND_SPECIAL_FOR_CD,
+    special_for_cd,
     /// Do expansions specifically for cd autosuggestion. This is to differentiate between cd
     /// completions and cd autosuggestions.
-    EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST,
+    special_for_cd_autosuggestion,
     /// Do expansions specifically to support external command completions. This means using PATH as
     /// a list of potential working directories.
-    EXPAND_SPECIAL_FOR_COMMAND,
+    special_for_command,
 
     COUNT,
 };
@@ -123,7 +123,7 @@ enum class expand_result_t {
 /// \param input The parameter to expand
 /// \param output The list to which the result will be appended.
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
-/// of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+/// of skip_cmdsubst skip_variables and skip_wildcards
 /// \param vars variables used during expansion.
 /// \param errors Resulting errors, or NULL to ignore
 ///
@@ -139,7 +139,7 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 ///
 /// \param inout_str The parameter to expand in-place
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
-/// of EXPAND_SKIP_CMDSUBST EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
+/// of skip_cmdsubst skip_variables and skip_wildcards
 /// \param errors Resulting errors, or NULL to ignore
 ///
 /// \return Whether expansion succeded
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 37369b19f..e60a6712d 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1669,11 +1669,10 @@ static void test_expand() {
 
     expand_test(L"foo", noflags, L"foo", 0, L"Strings do not expand to themselves");
     expand_test(L"a{b,c,d}e", noflags, L"abe", L"ace", L"ade", 0, L"Bracket expansion is broken");
-    expand_test(L"a*", expand_flag::EXPAND_SKIP_WILDCARDS, L"a*", 0,
-                L"Cannot skip wildcard expansion");
-    expand_test(L"/bin/l\\0", expand_flag::EXPAND_FOR_COMPLETIONS, 0,
+    expand_test(L"a*", expand_flag::skip_wildcards, L"a*", 0, L"Cannot skip wildcard expansion");
+    expand_test(L"/bin/l\\0", expand_flag::for_completions, 0,
                 L"Failed to handle null escape in expansion");
-    expand_test(L"foo\\$bar", expand_flag::EXPAND_SKIP_VARIABLES, L"foo$bar", 0,
+    expand_test(L"foo\\$bar", expand_flag::skip_variables, L"foo$bar", 0,
                 L"Failed to handle dollar sign in variable-skipping expansion");
 
     // bb
@@ -1747,27 +1746,25 @@ static void test_expand() {
     expand_test(L"test/fish_expand_test/**/q", noflags, L"test/fish_expand_test/lol/nub/q", wnull,
                 L"Glob did the wrong thing 7");
 
-    expand_test(L"test/fish_expand_test/BA", expand_flag::EXPAND_FOR_COMPLETIONS,
+    expand_test(L"test/fish_expand_test/BA", expand_flag::for_completions,
                 L"test/fish_expand_test/bar", L"test/fish_expand_test/bax/",
                 L"test/fish_expand_test/baz/", wnull, L"Case insensitive test did the wrong thing");
 
-    expand_test(L"test/fish_expand_test/BA", expand_flag::EXPAND_FOR_COMPLETIONS,
+    expand_test(L"test/fish_expand_test/BA", expand_flag::for_completions,
                 L"test/fish_expand_test/bar", L"test/fish_expand_test/bax/",
                 L"test/fish_expand_test/baz/", wnull, L"Case insensitive test did the wrong thing");
 
-    expand_test(L"test/fish_expand_test/bb/yyy", expand_flag::EXPAND_FOR_COMPLETIONS,
+    expand_test(L"test/fish_expand_test/bb/yyy", expand_flag::for_completions,
                 /* nothing! */ wnull, L"Wrong fuzzy matching 1");
 
-    expand_test(
-        L"test/fish_expand_test/bb/x",
-        expand_flags_t{expand_flag::EXPAND_FOR_COMPLETIONS, expand_flag::EXPAND_FUZZY_MATCH}, L"",
-        wnull,  // we just expect the empty string since this is an exact match
-        L"Wrong fuzzy matching 2");
+    expand_test(L"test/fish_expand_test/bb/x",
+                expand_flags_t{expand_flag::for_completions, expand_flag::fuzzy_match}, L"",
+                wnull,  // we just expect the empty string since this is an exact match
+                L"Wrong fuzzy matching 2");
 
     // Some vswprintfs refuse to append ANY_STRING in a format specifiers, so don't use
     // format_string here.
-    const expand_flags_t fuzzy_comp{expand_flag::EXPAND_FOR_COMPLETIONS,
-                                    expand_flag::EXPAND_FUZZY_MATCH};
+    const expand_flags_t fuzzy_comp{expand_flag::for_completions, expand_flag::fuzzy_match};
     const wcstring any_str_str(1, ANY_STRING);
     expand_test(L"test/fish_expand_test/b/xx*", fuzzy_comp,
                 (L"test/fish_expand_test/bax/xx" + any_str_str).c_str(),
diff --git a/src/highlight.cpp b/src/highlight.cpp
index e05539e76..7d8f49bf3 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -432,7 +432,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
 
     if (parsed_command == L"cd" && !cd_dir.empty()) {
         // We can possibly handle this specially.
-        if (expand_one(cd_dir, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
+        if (expand_one(cd_dir, expand_flag::skip_cmdsubst, vars)) {
             handled = true;
             bool is_help =
                 string_prefixes_string(cd_dir, L"--help") || string_prefixes_string(cd_dir, L"-h");
@@ -926,7 +926,7 @@ void highlighter_t::color_arguments(const std::vector<tnode_t<g::argument>> &arg
         if (cmd_is_cd) {
             // Mark this as an error if it's not 'help' and not a valid cd path.
             wcstring param = arg.get_source(this->buff);
-            if (expand_one(param, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
+            if (expand_one(param, expand_flag::skip_cmdsubst, vars)) {
                 bool is_help = string_prefixes_string(param, L"--help") ||
                                string_prefixes_string(param, L"-h");
                 if (!is_help && this->io_ok &&
@@ -969,7 +969,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                 // I/O is disallowed, so we don't have much hope of catching anything but gross
                 // errors. Assume it's valid.
                 target_is_valid = true;
-            } else if (!expand_one(target, expand_flag::EXPAND_SKIP_CMDSUBST, vars)) {
+            } else if (!expand_one(target, expand_flag::skip_cmdsubst, vars)) {
                 // Could not be expanded.
                 target_is_valid = false;
             } else {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8146c20a7..cb79e9e5f 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -128,8 +128,7 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
         if (plain_statement) {
             maybe_t<wcstring> cmd = command_for_plain_statement(plain_statement, pstree->src);
             if (cmd &&
-                expand_one(*cmd,
-                           {expand_flag::EXPAND_SKIP_CMDSUBST, expand_flag::EXPAND_SKIP_VARIABLES},
+                expand_one(*cmd, {expand_flag::skip_cmdsubst, expand_flag::skip_variables},
                            nullenv) &&
                 cmd == forbidden_function_name) {
                 // This is it.
@@ -453,7 +452,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     std::vector<completion_t> switch_values_expanded;
     parse_error_list_t errors;
     auto expand_ret = expand_string(switch_value, &switch_values_expanded,
-                                    expand_flag::EXPAND_NO_DESCRIPTIONS, parser->vars(), &errors);
+                                    expand_flag::no_descriptions, parser->vars(), &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
@@ -909,7 +908,7 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         // Expand this string.
         parse_error_list_t errors;
         arg_expanded.clear();
-        auto expand_ret = expand_string(arg_str, &arg_expanded, expand_flag::EXPAND_NO_DESCRIPTIONS,
+        auto expand_ret = expand_string(arg_str, &arg_expanded, expand_flag::no_descriptions,
                                         parser->vars(), &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
@@ -957,10 +956,9 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
         wcstring target;     // file path or target fd
         auto redirect_type = redirection_type(redirect_node, pstree->src, &source_fd, &target);
 
-        // PCA: I can't justify this EXPAND_SKIP_VARIABLES flag. It was like this when I got here.
-        bool target_expanded =
-            expand_one(target, no_exec ? expand_flag::EXPAND_SKIP_VARIABLES : expand_flags_t{},
-                       parser->vars());
+        // PCA: I can't justify this skip_variables flag. It was like this when I got here.
+        bool target_expanded = expand_one(
+            target, no_exec ? expand_flag::skip_variables : expand_flags_t{}, parser->vars());
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
             errored =
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 05a8e1204..4d17bc4aa 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -167,7 +167,7 @@ static wcstring resolve_description(const wcstring &full_completion, wcstring *c
         completion->resize(complete_sep_loc);
         return description;
     }
-    if (expand_flags & expand_flag::EXPAND_NO_DESCRIPTIONS) return {};
+    if (expand_flags & expand_flag::no_descriptions) return {};
     return desc_func ? desc_func(full_completion) : wcstring{};
 }
 
@@ -219,7 +219,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
 
         // If we're allowing fuzzy match, any match is OK. Otherwise we require a prefix match.
         bool match_acceptable;
-        if (params.expand_flags & expand_flag::EXPAND_FUZZY_MATCH) {
+        if (params.expand_flags & expand_flag::fuzzy_match) {
             match_acceptable = match.type != fuzzy_match_none;
         } else {
             match_acceptable = match_type_shares_prefix(match.type);
@@ -381,8 +381,8 @@ static const wchar_t *file_get_desc(const wcstring &filename, int lstat_res, con
     return COMPLETE_FILE_DESC;
 }
 
-/// Test if the given file is an executable (if EXECUTABLES_ONLY) or directory (if
-/// DIRECTORIES_ONLY). If it matches, call wildcard_complete() with some description that we make
+/// Test if the given file is an executable (if executables_only) or directory (if
+/// directories_only). If it matches, call wildcard_complete() with some description that we make
 /// up. Note that the filename came from a readdir() call, so we know it exists.
 static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wcstring &filename,
                                               const wchar_t *wc, expand_flags_t expand_flags,
@@ -415,12 +415,12 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
     const bool is_directory = stat_res == 0 && S_ISDIR(stat_buf.st_mode);
     const bool is_executable = stat_res == 0 && S_ISREG(stat_buf.st_mode);
 
-    const bool need_directory = expand_flags & expand_flag::DIRECTORIES_ONLY;
+    const bool need_directory = expand_flags & expand_flag::directories_only;
     if (need_directory && !is_directory) {
         return false;
     }
 
-    const bool executables_only = expand_flags & expand_flag::EXECUTABLES_ONLY;
+    const bool executables_only = expand_flags & expand_flag::executables_only;
     if (executables_only && (!is_executable || waccess(filepath, X_OK) != 0)) {
         return false;
     }
@@ -432,7 +432,7 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
 
     // Compute the description.
     wcstring desc;
-    if (!(expand_flags & expand_flag::EXPAND_NO_DESCRIPTIONS)) {
+    if (!(expand_flags & expand_flag::no_descriptions)) {
         desc = file_get_desc(filepath, lstat_res, lstat_buf, stat_res, stat_buf, stat_errno);
 
         if (file_size >= 0) {
@@ -507,7 +507,7 @@ class wildcard_expander_t {
 
     void add_expansion_result(const wcstring &result) {
         // This function is only for the non-completions case.
-        assert(!(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS));
+        assert(!(this->flags & expand_flag::for_completions));
         if (this->completion_set.insert(result).second) {
             append_completion(this->resolved_completions, result);
             this->did_add = true;
@@ -568,13 +568,13 @@ class wildcard_expander_t {
     void try_add_completion_result(const wcstring &filepath, const wcstring &filename,
                                    const wcstring &wildcard, const wcstring &prefix) {
         // This function is only for the completions case.
-        assert(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS);
+        assert(this->flags & expand_flag::for_completions);
 
         wcstring abs_path = this->working_directory;
         append_path_component(abs_path, filepath);
 
         // We must normalize the path to allow 'cd ..' to operate on logical paths.
-        if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD) abs_path = normalize_path(abs_path);
+        if (flags & expand_flag::special_for_cd) abs_path = normalize_path(abs_path);
 
         size_t before = this->resolved_completions->size();
         if (wildcard_test_flags_then_complete(abs_path, filename, wildcard.c_str(), this->flags,
@@ -592,11 +592,11 @@ class wildcard_expander_t {
                 c->prepend_token_prefix(prefix);
             }
 
-            // Implement EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST by descending the deepest unique
+            // Implement special_for_cd_autosuggestion by descending the deepest unique
             // hierarchy we can, and then appending any components to each new result.
             // Only descend deepest unique for cd autosuggest and not for cd tab completion
             // (issue #4402).
-            if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD_AUTOSUGGEST) {
+            if (flags & expand_flag::special_for_cd_autosuggestion) {
                 wcstring unique_hierarchy = this->descend_unique_hierarchy(abs_path);
                 if (!unique_hierarchy.empty()) {
                     for (size_t i = before; i < after; i++) {
@@ -614,7 +614,7 @@ class wildcard_expander_t {
     DIR *open_dir(const wcstring &base_dir) const {
         wcstring path = this->working_directory;
         append_path_component(path, base_dir);
-        if (flags & expand_flag::EXPAND_SPECIAL_FOR_CD) {
+        if (flags & expand_flag::special_for_cd) {
             // cd operates on logical paths.
             // for example, cd ../<tab> should complete "without resolving symlinks".
             path = normalize_path(path);
@@ -660,7 +660,7 @@ void wildcard_expander_t::expand_trailing_slash(const wcstring &base_dir, const
         return;
     }
 
-    if (!(flags & expand_flag::EXPAND_FOR_COMPLETIONS)) {
+    if (!(flags & expand_flag::for_completions)) {
         // Trailing slash and not accepting incomplete, e.g. `echo /xyz/`. Insert this file if it
         // exists.
         if (waccess(base_dir, F_OK) == 0) {
@@ -783,7 +783,7 @@ void wildcard_expander_t::expand_last_segment(const wcstring &base_dir, DIR *bas
                                               const wcstring &wc, const wcstring &prefix) {
     wcstring name_str;
     while (wreaddir(base_dir_fp, name_str)) {
-        if (flags & expand_flag::EXPAND_FOR_COMPLETIONS) {
+        if (flags & expand_flag::for_completions) {
             this->try_add_completion_result(base_dir + name_str, name_str, wc, prefix);
         } else {
             // Normal wildcard expansion, not for completions.
@@ -810,7 +810,7 @@ void wildcard_expander_t::expand_last_segment(const wcstring &base_dir, DIR *bas
 /// prefix: the string that should be prepended for completions that replace their token.
 //    This is usually the same thing as the original wildcard, but for fuzzy matching, we
 //    expand intermediate segments. effective_prefix is always either empty, or ends with a slash
-//    Note: this is only used when doing completions (EXPAND_FOR_COMPLETIONS is true), not
+//    Note: this is only used when doing completions (for_completions is true), not
 //    expansions
 void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
                                  const wcstring &effective_prefix) {
@@ -854,11 +854,11 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
         // Maybe try a fuzzy match (#94) if nothing was found with the literal match. Respect
         // EXPAND_NO_DIRECTORY_ABBREVIATIONS (issue #2413).
         // Don't do fuzzy matches if the literal segment was valid (#3211)
-        bool allow_fuzzy = this->flags.get(expand_flag::EXPAND_FUZZY_MATCH) &&
-                           !this->flags.get(expand_flag::EXPAND_NO_FUZZY_DIRECTORIES);
+        bool allow_fuzzy = this->flags.get(expand_flag::fuzzy_match) &&
+                           !this->flags.get(expand_flag::no_fuzzy_directories);
         if (allow_fuzzy && this->resolved_completions->size() == before &&
             waccess(intermediate_dirpath, F_OK) != 0) {
-            assert(this->flags & expand_flag::EXPAND_FOR_COMPLETIONS);
+            assert(this->flags & expand_flag::for_completions);
             DIR *base_dir_fd = open_dir(base_dir);
             if (base_dir_fd != NULL) {
                 this->expand_literal_intermediate_segment_with_fuzz(
@@ -904,15 +904,14 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory
                            expand_flags_t flags, std::vector<completion_t> *output) {
     assert(output != NULL);
     // Fuzzy matching only if we're doing completions.
-    assert(flags.get(expand_flag::EXPAND_FOR_COMPLETIONS) ||
-           !flags.get(expand_flag::EXPAND_FUZZY_MATCH));
+    assert(flags.get(expand_flag::for_completions) || !flags.get(expand_flag::fuzzy_match));
 
-    // expand_flag::EXPAND_SPECIAL_FOR_CD requires expand_flag::DIRECTORIES_ONLY and
-    // expand_flag::EXPAND_FOR_COMPLETIONS and expand_flag::EXPAND_NO_DESCRIPTIONS.
-    assert(!(flags.get(expand_flag::EXPAND_SPECIAL_FOR_CD)) ||
-           ((flags.get(expand_flag::DIRECTORIES_ONLY)) &&
-            (flags.get(expand_flag::EXPAND_FOR_COMPLETIONS)) &&
-            (flags.get(expand_flag::EXPAND_NO_DESCRIPTIONS))));
+    // expand_flag::special_for_cd requires expand_flag::directories_only and
+    // expand_flag::for_completions and expand_flag::no_descriptions.
+    assert(!(flags.get(expand_flag::special_for_cd)) ||
+           ((flags.get(expand_flag::directories_only)) &&
+            (flags.get(expand_flag::for_completions)) &&
+            (flags.get(expand_flag::no_descriptions))));
 
     // Hackish fix for issue #1631. We are about to call c_str(), which will produce a string
     // truncated at any embedded nulls. We could fix this by passing around the size, etc. However
diff --git a/src/wildcard.h b/src/wildcard.h
index 77b58c67c..6f8a58df1 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -37,8 +37,8 @@ enum {
 ///
 /// \param wc The wildcard string
 /// \param working_directory The working directory
-/// \param flags flags for the search. Can be any combination of EXPAND_FOR_COMPLETIONS and
-/// EXECUTABLES_ONLY
+/// \param flags flags for the search. Can be any combination of for_completions and
+/// executables_only
 /// \param out The list in which to put the output
 ///
 /// \return 1 if matches where found, 0 otherwise. Return -1 on abort (I.e. ^C was pressed).

From d962668aa046c9db6ecdb21e6c77cb99d063d964 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 25 Apr 2019 13:25:36 -0700
Subject: [PATCH 0397/1732] Remove PATH and COMMAND defines

Also clean up a bit of builtin_complete
---
 src/builtin_complete.cpp | 68 +++++++++++++++++++---------------------
 src/complete.h           |  5 +--
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index c3b25cc75..107c79213 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -27,86 +27,82 @@
 // complete_add function only accepts one short switch and one long switch.
 
 /// Silly function.
-static void builtin_complete_add2(const wchar_t *cmd, int cmd_type, const wchar_t *short_opt,
-                                  const wcstring_list_t &gnu_opt, const wcstring_list_t &old_opt,
+static void builtin_complete_add2(const wchar_t *cmd, bool cmd_is_path, const wchar_t *short_opt,
+                                  const wcstring_list_t &gnu_opts, const wcstring_list_t &old_opts,
                                   int result_mode, const wchar_t *condition, const wchar_t *comp,
                                   const wchar_t *desc, int flags) {
-    size_t i;
-    const wchar_t *s;
-
-    for (s = short_opt; *s; s++) {
-        complete_add(cmd, cmd_type, wcstring(1, *s), option_type_short, result_mode, condition,
+    for (const wchar_t *s = short_opt; *s; s++) {
+        complete_add(cmd, cmd_is_path, wcstring{*s}, option_type_short, result_mode, condition,
                      comp, desc, flags);
     }
 
-    for (i = 0; i < gnu_opt.size(); i++) {
-        complete_add(cmd, cmd_type, gnu_opt.at(i), option_type_double_long, result_mode, condition,
+    for (const wcstring &gnu_opt : gnu_opts) {
+        complete_add(cmd, cmd_is_path, gnu_opt, option_type_double_long, result_mode, condition,
                      comp, desc, flags);
     }
 
-    for (i = 0; i < old_opt.size(); i++) {
-        complete_add(cmd, cmd_type, old_opt.at(i), option_type_single_long, result_mode, condition,
+    for (const wcstring &old_opt : old_opts) {
+        complete_add(cmd, cmd_is_path, old_opt, option_type_single_long, result_mode, condition,
                      comp, desc, flags);
     }
 
-    if (old_opt.empty() && gnu_opt.empty() && short_opt[0] == L'\0') {
-        complete_add(cmd, cmd_type, wcstring(), option_type_args_only, result_mode, condition, comp,
-                     desc, flags);
+    if (old_opts.empty() && gnu_opts.empty() && short_opt[0] == L'\0') {
+        complete_add(cmd, cmd_is_path, wcstring(), option_type_args_only, result_mode, condition,
+                     comp, desc, flags);
     }
 }
 
 /// Silly function.
-static void builtin_complete_add(const wcstring_list_t &cmd, const wcstring_list_t &path,
+static void builtin_complete_add(const wcstring_list_t &cmds, const wcstring_list_t &paths,
                                  const wchar_t *short_opt, wcstring_list_t &gnu_opt,
                                  wcstring_list_t &old_opt, int result_mode,
                                  const wchar_t *condition, const wchar_t *comp, const wchar_t *desc,
                                  int flags) {
-    for (size_t i = 0; i < cmd.size(); i++) {
-        builtin_complete_add2(cmd.at(i).c_str(), COMMAND, short_opt, gnu_opt, old_opt, result_mode,
-                              condition, comp, desc, flags);
+    for (const wcstring &cmd : cmds) {
+        builtin_complete_add2(cmd.c_str(), false /* not path */, short_opt, gnu_opt, old_opt,
+                              result_mode, condition, comp, desc, flags);
     }
 
-    for (size_t i = 0; i < path.size(); i++) {
-        builtin_complete_add2(path.at(i).c_str(), PATH, short_opt, gnu_opt, old_opt, result_mode,
-                              condition, comp, desc, flags);
+    for (const wcstring &path : paths) {
+        builtin_complete_add2(path.c_str(), true /* is path */, short_opt, gnu_opt, old_opt,
+                              result_mode, condition, comp, desc, flags);
     }
 }
 
-static void builtin_complete_remove_cmd(const wcstring &cmd, int cmd_type, const wchar_t *short_opt,
-                                        const wcstring_list_t &gnu_opt,
+static void builtin_complete_remove_cmd(const wcstring &cmd, bool cmd_is_path,
+                                        const wchar_t *short_opt, const wcstring_list_t &gnu_opt,
                                         const wcstring_list_t &old_opt) {
     bool removed = false;
-    size_t i;
-    for (i = 0; short_opt[i] != L'\0'; i++) {
-        complete_remove(cmd, cmd_type, wcstring(1, short_opt[i]), option_type_short);
+    for (const wchar_t *s = short_opt; *s; s++) {
+        complete_remove(cmd, cmd_is_path, wcstring{*s}, option_type_short);
         removed = true;
     }
 
-    for (i = 0; i < old_opt.size(); i++) {
-        complete_remove(cmd, cmd_type, old_opt.at(i), option_type_single_long);
+    for (const wcstring &opt : old_opt) {
+        complete_remove(cmd, cmd_is_path, opt, option_type_single_long);
         removed = true;
     }
 
-    for (i = 0; i < gnu_opt.size(); i++) {
-        complete_remove(cmd, cmd_type, gnu_opt.at(i), option_type_double_long);
+    for (const wcstring &opt : gnu_opt) {
+        complete_remove(cmd, cmd_is_path, opt, option_type_double_long);
         removed = true;
     }
 
     if (!removed) {
         // This means that all loops were empty.
-        complete_remove_all(cmd, cmd_type);
+        complete_remove_all(cmd, cmd_is_path);
     }
 }
 
-static void builtin_complete_remove(const wcstring_list_t &cmd, const wcstring_list_t &path,
+static void builtin_complete_remove(const wcstring_list_t &cmds, const wcstring_list_t &paths,
                                     const wchar_t *short_opt, const wcstring_list_t &gnu_opt,
                                     const wcstring_list_t &old_opt) {
-    for (size_t i = 0; i < cmd.size(); i++) {
-        builtin_complete_remove_cmd(cmd.at(i), COMMAND, short_opt, gnu_opt, old_opt);
+    for (const wcstring &cmd : cmds) {
+        builtin_complete_remove_cmd(cmd, false /* not path */, short_opt, gnu_opt, old_opt);
     }
 
-    for (size_t i = 0; i < path.size(); i++) {
-        builtin_complete_remove_cmd(path.at(i), PATH, short_opt, gnu_opt, old_opt);
+    for (const wcstring &path : paths) {
+        builtin_complete_remove_cmd(path, true /* is path */, short_opt, gnu_opt, old_opt);
     }
 }
 
diff --git a/src/complete.h b/src/complete.h
index 2563f34ca..fd33ba24e 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -21,10 +21,7 @@
 /// Only use the argument list specifies with completion after option. This is the same as (NO_FILES
 /// | NO_COMMON).
 #define EXCLUSIVE 3
-/// Command is a path.
-#define PATH 1
-/// Command is not a path.
-#define COMMAND 0
+
 /// Separator between completion and description.
 #define COMPLETE_SEP L'\004'
 /// Character that separates the completion and description on programmable completions.

From 96bc8a14ca911d1e30ba06f235cd417be8aee74b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 25 Apr 2019 14:21:06 -0700
Subject: [PATCH 0398/1732] Promote completion_mode_t to a real type

Eliminate big #defines like NO_COMMON.
---
 src/builtin_complete.cpp | 15 +++++++-------
 src/complete.cpp         | 43 ++++++++++++++++++++++------------------
 src/complete.h           | 27 ++++++++++---------------
 src/fish_tests.cpp       |  4 +++-
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 107c79213..990b20bee 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -29,8 +29,8 @@
 /// Silly function.
 static void builtin_complete_add2(const wchar_t *cmd, bool cmd_is_path, const wchar_t *short_opt,
                                   const wcstring_list_t &gnu_opts, const wcstring_list_t &old_opts,
-                                  int result_mode, const wchar_t *condition, const wchar_t *comp,
-                                  const wchar_t *desc, int flags) {
+                                  completion_mode_t result_mode, const wchar_t *condition,
+                                  const wchar_t *comp, const wchar_t *desc, int flags) {
     for (const wchar_t *s = short_opt; *s; s++) {
         complete_add(cmd, cmd_is_path, wcstring{*s}, option_type_short, result_mode, condition,
                      comp, desc, flags);
@@ -55,7 +55,7 @@ static void builtin_complete_add2(const wchar_t *cmd, bool cmd_is_path, const wc
 /// Silly function.
 static void builtin_complete_add(const wcstring_list_t &cmds, const wcstring_list_t &paths,
                                  const wchar_t *short_opt, wcstring_list_t &gnu_opt,
-                                 wcstring_list_t &old_opt, int result_mode,
+                                 wcstring_list_t &old_opt, completion_mode_t result_mode,
                                  const wchar_t *condition, const wchar_t *comp, const wchar_t *desc,
                                  int flags) {
     for (const wcstring &cmd : cmds) {
@@ -114,7 +114,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     wchar_t *cmd = argv[0];
     int argc = builtin_count_args(argv);
-    int result_mode = SHARED;
+    completion_mode_t result_mode{};
     int remove = 0;
     wcstring short_opt;
     wcstring_list_t gnu_opt, old_opt;
@@ -152,15 +152,16 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
         switch (opt) {
             case 'x': {
-                result_mode |= EXCLUSIVE;
+                result_mode.no_files = true;
+                result_mode.requires_param = true;
                 break;
             }
             case 'f': {
-                result_mode |= NO_FILES;
+                result_mode.no_files = true;
                 break;
             }
             case 'r': {
-                result_mode |= NO_COMMON;
+                result_mode.requires_param = true;
                 break;
             }
             case 'k': {
diff --git a/src/complete.cpp b/src/complete.cpp
index 02c1e0983..4cb981eb2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -97,9 +97,8 @@ typedef struct complete_entry_opt {
     wcstring desc;
     // Condition under which to use the option.
     wcstring condition;
-    // Must be one of the values SHARED, NO_FILES, NO_COMMON, EXCLUSIVE, and determines how
-    // completions should be performed on the argument after the switch.
-    int result_mode;
+    // Determines how completions should be performed on the argument after the switch.
+    completion_mode_t result_mode;
     // Completion flags.
     complete_flags_t flags;
 
@@ -440,8 +439,9 @@ static completion_entry_t &complete_get_exact_entry(completion_entry_set_t &comp
 }
 
 void complete_add(const wchar_t *cmd, bool cmd_is_path, const wcstring &option,
-                  complete_option_type_t option_type, int result_mode, const wchar_t *condition,
-                  const wchar_t *comp, const wchar_t *desc, complete_flags_t flags) {
+                  complete_option_type_t option_type, completion_mode_t result_mode,
+                  const wchar_t *condition, const wchar_t *comp, const wchar_t *desc,
+                  complete_flags_t flags) {
     CHECK(cmd, );
     // option should be empty iff the option type is arguments only.
     assert(option.empty() == (option_type == option_type_args_only));
@@ -852,7 +852,7 @@ static bool short_ok(const wcstring &arg, const complete_entry_opt_t *entry,
                 break;
             }
         }
-        if (match == NULL || (match->result_mode & NO_COMMON)) {
+        if (match == NULL || (match->result_mode.requires_param)) {
             result = false;
             break;
         }
@@ -946,8 +946,8 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                 for (const complete_entry_opt_t &o : options) {
                     const wchar_t *arg = param_match2(&o, str.c_str());
                     if (arg != NULL && this->condition_test(o.condition)) {
-                        if (o.result_mode & NO_COMMON) use_common = false;
-                        if (o.result_mode & NO_FILES) use_files = false;
+                        if (o.result_mode.requires_param) use_common = false;
+                        if (o.result_mode.no_files) use_files = false;
                         complete_from_args(arg, o.comp, o.localized_desc(), o.flags);
                     }
                 }
@@ -962,8 +962,8 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                     if (o.type == option_type_single_long && param_match(&o, popt.c_str()) &&
                         this->condition_test(o.condition)) {
                         old_style_match = true;
-                        if (o.result_mode & NO_COMMON) use_common = false;
-                        if (o.result_mode & NO_FILES) use_files = false;
+                        if (o.result_mode.requires_param) use_common = false;
+                        if (o.result_mode.no_files) use_files = false;
                         complete_from_args(str, o.comp, o.localized_desc(), o.flags);
                     }
                 }
@@ -976,12 +976,12 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                         // token, so that it can be differed from a regular argument.
                         // Here we are testing the previous argument for a GNU-style match,
                         // to see how we should complete the current argument
-                        if (o.type == option_type_double_long && !(o.result_mode & NO_COMMON))
+                        if (o.type == option_type_double_long && !o.result_mode.requires_param)
                             continue;
 
                         if (param_match(&o, popt.c_str()) && this->condition_test(o.condition)) {
-                            if (o.result_mode & NO_COMMON) use_common = false;
-                            if (o.result_mode & NO_FILES) use_files = false;
+                            if (o.result_mode.requires_param) use_common = false;
+                            if (o.result_mode.no_files) use_files = false;
                             complete_from_args(str, o.comp, o.localized_desc(), o.flags);
                         }
                     }
@@ -998,7 +998,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
             // If this entry is for the base command, check if any of the arguments match.
             if (!this->condition_test(o.condition)) continue;
             if (o.option.empty()) {
-                use_files = use_files && ((o.result_mode & NO_FILES) == 0);
+                use_files = use_files && ((o.result_mode.no_files) == 0);
                 complete_from_args(str, o.comp, o.localized_desc(), o.flags);
             }
 
@@ -1043,7 +1043,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
             }
 
             has_arg = !o.comp.empty();
-            req_arg = (o.result_mode & NO_COMMON);
+            req_arg = o.result_mode.requires_param;
 
             if (o.type == option_type_double_long && (has_arg && !req_arg)) {
                 // Optional arguments to a switch can only be handled using the '=', so we add it as
@@ -1616,10 +1616,15 @@ wcstring complete_print() {
     for (const completion_entry_t &e : all_completions) {
         const option_list_t &options = e.get_options();
         for (const complete_entry_opt_t &o : options) {
-            const wchar_t *modestr[] = {L"", L" --no-files", L" --require-parameter",
-                                        L" --exclusive"};
-
-            append_format(out, L"complete%ls", modestr[o.result_mode]);
+            const wchar_t *modestr = L"";
+            if (o.result_mode.no_files && o.result_mode.requires_param) {
+                modestr = L" --exclusive";
+            } else if (o.result_mode.no_files) {
+                modestr = L" --no-files";
+            } else if (o.result_mode.requires_param) {
+                modestr = L" --require-parameter";
+            }
+            append_format(out, L"complete%ls", modestr);
 
             append_switch(out, e.cmd_is_path ? L"path" : L"command",
                           escape_string(e.cmd, ESCAPE_ALL));
diff --git a/src/complete.h b/src/complete.h
index fd33ba24e..91806bd58 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -12,15 +12,13 @@
 
 #include "common.h"
 
-/// Use all completions.
-#define SHARED 0
-/// Do not use file completion.
-#define NO_FILES 1
-/// Require a parameter after completion.
-#define NO_COMMON 2
-/// Only use the argument list specifies with completion after option. This is the same as (NO_FILES
-/// | NO_COMMON).
-#define EXCLUSIVE 3
+struct completion_mode_t {
+    /// If set, skip file completions.
+    bool no_files{false};
+
+    /// If set, require a parameter after completion.
+    bool requires_param{false};
+};
 
 /// Separator between completion and description.
 #define COMPLETE_SEP L'\004'
@@ -148,19 +146,16 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
 /// \param option The name of an option.
 /// \param option_type The type of option: can be option_type_short (-x),
 ///        option_type_single_long (-foo), option_type_double_long (--bar).
-/// \param result_mode Whether to search further completions when this completion has been
-/// succesfully matched. If result_mode is SHARED, any other completions may also be used. If
-/// result_mode is NO_FILES, file completion should not be used, but other completions may be used.
-/// If result_mode is NO_COMMON, on option may follow it - only a parameter. If result_mode is
-/// EXCLUSIVE, no option may follow it, and file completion is not performed.
+/// \param result_mode Controls how to search further completions when this completion has been
+/// succesfully matched.
 /// \param comp A space separated list of completions which may contain subshells.
 /// \param desc A description of the completion.
 /// \param condition a command to be run to check it this completion should be used. If \c condition
 /// is empty, the completion is always used.
 /// \param flags A set of completion flags
 void complete_add(const wchar_t *cmd, bool cmd_is_path, const wcstring &option,
-                  complete_option_type_t option_type, int result_mode, const wchar_t *condition,
-                  const wchar_t *comp, const wchar_t *desc, int flags);
+                  complete_option_type_t option_type, completion_mode_t result_mode,
+                  const wchar_t *condition, const wchar_t *comp, const wchar_t *desc, int flags);
 
 /// Remove a previously defined completion.
 void complete_remove(const wcstring &cmd, bool cmd_is_path, const wcstring &option,
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e60a6712d..fa293f8dd 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2579,7 +2579,9 @@ static void test_complete() {
     do_test(completions.size() == 0);
 
     // Trailing spaces (#1261).
-    complete_add(L"foobarbaz", false, wcstring(), option_type_args_only, NO_FILES, NULL, L"qux",
+    completion_mode_t no_files{};
+    no_files.no_files = true;
+    complete_add(L"foobarbaz", false, wcstring(), option_type_args_only, no_files, NULL, L"qux",
                  NULL, COMPLETE_AUTO_SPACE);
     completions.clear();
     complete(L"foobarbaz ", &completions, COMPLETION_REQUEST_DEFAULT, vars);

From cd86c0ee886520d2710118447947054e28529764 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 25 Apr 2019 14:23:37 -0700
Subject: [PATCH 0399/1732] Remove the COMPLETE_SEP define

It was unused.
---
 src/complete.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/complete.h b/src/complete.h
index 91806bd58..3af4cafc1 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -20,8 +20,6 @@ struct completion_mode_t {
     bool requires_param{false};
 };
 
-/// Separator between completion and description.
-#define COMPLETE_SEP L'\004'
 /// Character that separates the completion and description on programmable completions.
 #define PROG_COMPLETE_SEP L'\t'
 

From 22ce8c23c62feeac13800dc805f91805450e3ee4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 14:54:51 +0200
Subject: [PATCH 0400/1732] builtin_complete: Allow `complete -C something`

This is a long-standing issue with how `complete --do-complete` does
its argument parsing: It takes an optional argument, so it has to be
attached to the token like `complete --do-complete=foo` or (worse)
`complete -Cfoo`.

But since `complete` doesn't take any bare arguments otherwise (it
would error with "too many arguments" if you did `complete -C foo`) we
can just take one free argument as the argument to `--do-complete`.

It's more of a command than an option anyway, since it entirely
changes what the `complete` call _does_.
---
 src/builtin_complete.cpp | 36 +++++++++++++++++++++++++-----------
 tests/complete.in        |  2 ++
 tests/complete.out       |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 990b20bee..f18abba74 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -120,6 +120,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wcstring_list_t gnu_opt, old_opt;
     const wchar_t *comp = L"", *desc = L"", *condition = L"";
     bool do_complete = false;
+    bool have_do_complete_param = false;
     wcstring do_complete_param;
     wcstring_list_t cmd_to_complete;
     wcstring_list_t path;
@@ -236,14 +237,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             }
             case 'C': {
                 do_complete = true;
-                const wchar_t *arg = w.woptarg ? w.woptarg : reader_get_buffer();
-                if (arg == NULL) {
-                    // This corresponds to using 'complete -C' in non-interactive mode.
-                    // See #2361.
-                    builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
-                    return STATUS_INVALID_ARGS;
-                }
-                do_complete_param = arg;
+                have_do_complete_param = w.woptarg != NULL;
+                if (have_do_complete_param) do_complete_param = w.woptarg;
                 break;
             }
             case 'h': {
@@ -266,9 +261,17 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (w.woptind != argc) {
-        streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
-        builtin_print_error_trailer(parser, streams.err, cmd);
-        return STATUS_INVALID_ARGS;
+        // Use one left-over arg as the do-complete argument
+        // to enable `complete -C "git check"`.
+        if (do_complete && !have_do_complete_param && argc == w.woptind + 1) {
+
+            do_complete_param = argv[argc - 1];
+            have_do_complete_param = true;
+        } else {
+            streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, cmd);
+            builtin_print_error_trailer(parser, streams.err, cmd);
+            return STATUS_INVALID_ARGS;
+        }
     }
 
     if (condition && std::wcslen(condition)) {
@@ -302,6 +305,17 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (do_complete) {
+        if (!have_do_complete_param) {
+            // No argument given, try to use the current commandline.
+            const wchar_t* cmd = reader_get_buffer();
+            if (cmd == NULL) {
+                // This corresponds to using 'complete -C' in non-interactive mode.
+                // See #2361    .
+                builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
+                return STATUS_INVALID_ARGS;
+            }
+            do_complete_param = cmd;
+        }
         const wchar_t *token;
 
         parse_util_token_extent(do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0,
diff --git a/tests/complete.in b/tests/complete.in
index 647e4b3f1..34bdc4ad9 100644
--- a/tests/complete.in
+++ b/tests/complete.in
@@ -9,6 +9,8 @@ complete -c complete_test_alpha3 --no-files -w 'complete_test_alpha2 extra2'
 complete -C'complete_test_alpha1 arg1 '
 complete -C'complete_test_alpha2 arg2 '
 complete -C'complete_test_alpha3 arg3 '
+# Works even with the argument as a separate token.
+complete -C 'complete_test_alpha3 arg3 '
 
 logmsg Alias Completions
 
diff --git a/tests/complete.out b/tests/complete.out
index d813b436e..c604f659e 100644
--- a/tests/complete.out
+++ b/tests/complete.out
@@ -4,6 +4,7 @@
 complete_test_alpha1 arg1 
 complete_test_alpha1 extra1 arg2 
 complete_test_alpha1 extra1 extra2 arg3 
+complete_test_alpha1 extra1 extra2 arg3 
 
 ####################
 # Alias Completions

From 38cadc9d4f9cd7466713d66729d78e7227c5dc07 Mon Sep 17 00:00:00 2001
From: David Gowers <finticemo@gmail.com>
Date: Fri, 26 Apr 2019 23:00:13 +0930
Subject: [PATCH 0401/1732] Variables as commands are in fact supported, eval
 docs should not claim otherwise. (#5819)

Provide an example that somewhat justifies eval's existence in light of this change.

Also correct similar misinformation found in a comment.
---
 sphinx_doc_src/cmds/eval.rst | 9 +++++----
 src/complete.cpp             | 4 +---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/sphinx_doc_src/cmds/eval.rst b/sphinx_doc_src/cmds/eval.rst
index e3d7d8e5e..b59fb5b14 100644
--- a/sphinx_doc_src/cmds/eval.rst
+++ b/sphinx_doc_src/cmds/eval.rst
@@ -15,16 +15,17 @@ Description
 
 If your command does not need access to stdin, consider using ``source`` instead.
 
+If no piping or other compound shell constructs are required, variable-expansion-as-command, as in  ``set cmd ls; $cmd``, is also an option.
+
+
 Example
 -------
 
-The following code will call the ls command. Note that ``fish`` does not support the use of shell variables as direct commands; ``eval`` can be used to work around this.
-
-
+The following code will call the ls command and truncate each filename to the first 12 characters.
 
 ::
 
-    set cmd ls
+    set cmd ls \| cut -c 1-12
     eval $cmd
 
 
diff --git a/src/complete.cpp b/src/complete.cpp
index 4cb981eb2..8ce6d3079 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1378,9 +1378,7 @@ void completer_t::perform() {
 
     // If we are completing a variable name or a tilde expansion user name, we do that and return.
     // No need for any other completions.
-    // Unconditionally complete variables and processes. This is a little weird since we will
-    // happily complete variables even in e.g. command position, despite the fact that they are
-    // invalid there. */
+    // Unconditionally complete variables and processes.
     const wcstring current_token = tok_begin;
     if (try_complete_variable(current_token) || try_complete_user(current_token)) {
         return;

From ebf1914a35b8dcdb5d1c7f0a06b9c639320a5e6b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 16:11:28 +0200
Subject: [PATCH 0402/1732] CHANGELOG complete -C change

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcc07582a..1e554f504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - `complete --do-complete` now also does fuzzy matches (#5467).
 - `count` now also counts lines fed on stdin (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
+- `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).

From 009ecfd7e6151d457056617004a691216d0f9851 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 19:07:33 +0200
Subject: [PATCH 0403/1732] src/tokenizer: Add ":@" to the list of
 non-path-component chars

This makes kill-path-component stop there.

Fixes #5841.
---
 src/tokenizer.cpp     |  2 +-
 tests/bind.expect     | 17 +++++++++++++++++
 tests/bind.expect.out |  2 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 883a04afc..d2fbe0fdb 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -638,7 +638,7 @@ bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
 bool move_word_state_machine_t::is_path_component_character(wchar_t c) {
     // Always treat separators as first. All this does is ensure that we treat ^ as a string
     // character instead of as stderr redirection, which I hypothesize is usually what is desired.
-    return tok_is_string_character(c, true) && !std::wcschr(L"/={,}'\"", c);
+    return tok_is_string_character(c, true) && !std::wcschr(L"/={,}'\":@", c);
 }
 
 bool move_word_state_machine_t::consume_char_path_components(wchar_t c) {
diff --git a/tests/bind.expect b/tests/bind.expect
index 6f9e97e52..ffe28ef8e 100644
--- a/tests/bind.expect
+++ b/tests/bind.expect
@@ -271,3 +271,20 @@ expect_prompt -re {ctrl-o seen} {
 } unmatched {
     puts stderr "ctrl-o not seen"
 }
+
+# \x17 is ctrl-w.
+send "echo git@github.com:fish-shell/fish-shell"
+send "\x17\x17\r"
+expect_prompt -re {git@github.com:} {
+    puts "ctrl-w stops at :"
+} unmatched {
+    puts stderr "ctrl-w does not stop at :"
+}
+
+send "echo git@github.com:fish-shell/fish-shell"
+send "\x17\x17\x17\r"
+expect_prompt -re {git@} {
+    puts "ctrl-w stops at @"
+} unmatched {
+    puts stderr "ctrl-w does not stop at @"
+}
diff --git a/tests/bind.expect.out b/tests/bind.expect.out
index 55667d0f6..3e8f30c2b 100644
--- a/tests/bind.expect.out
+++ b/tests/bind.expect.out
@@ -20,3 +20,5 @@ emacs transpose words, 100ms timeout: short delay
 emacs transpose words, 100ms timeout: long delay
 ctrl-v seen
 ctrl-o seen
+ctrl-w stops at :
+ctrl-w stops at @

From 94ece96bcea0ef5d51dfa434acc2999482d2164b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 19:17:27 +0200
Subject: [PATCH 0404/1732] CHANGELOG path-component

I should really add this immediately.

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e554f504..d7e4c2193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
 - If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
+- The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.

From ff62f2ae08f5763f7d0e2eb2b7081c5a8cf835f3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 19:23:08 +0200
Subject: [PATCH 0405/1732] docs/bind: Document path-component and word

Plus fix some formatting.

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 394bb42f1..cb90f406f 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -80,9 +80,9 @@ The following special input functions are available:
 
 - ``backward-kill-line``, move everything from the beginning of the line to the cursor to the killring
 
-- ``backward-kill-path-component``, move one path component to the left of the cursor (everything from the last "/" or whitespace exclusive) to the killring
+- ``backward-kill-path-component``, move one path component to the left of the cursor to the killring. A path component is everything likely to belong to a path component, i.e. not any of the following: `/={,}'\":@ |;<>&`, plus newlines and tabs.
 
-- ``backward-kill-word``, move the word to the left of the cursor to the killring
+- ``backward-kill-word``, move the word to the left of the cursor to the killring. The "word" here is everything up to punctuation or whitespace.
 
 - ``backward-word``, move one word to the left
 
@@ -162,7 +162,7 @@ Examples
 
 ::
 
-    bind <asis>\\cd</asis> 'exit'
+    bind \cd 'exit'
 
 Causes ``fish`` to exit when :kbd:`Control+D` is pressed.
 
@@ -179,7 +179,7 @@ Performs a history search when the :kbd:`Page Up` key is pressed.
 ::
 
     set -g fish_key_bindings fish_vi_key_bindings
-    bind -M insert \\cc kill-whole-line force-repaint
+    bind -M insert \cc kill-whole-line force-repaint
 
 Turns on Vi key bindings and rebinds :kbd:`Control+C` to clear the input line.
 

From e084d097d5e145edf1331e2efdc98050fe60a95d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 19:25:30 +0200
Subject: [PATCH 0406/1732] docs: Remove <asis> markup

This isn't needed anymore.

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 2 +-
 sphinx_doc_src/tutorial.rst    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index f8f649421..befe6df22 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -379,7 +379,7 @@ Match Regex Examples
     <outp>cat4</outp>
     <outp>dog4</outp>
     
-    >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' <asis>2:34:56</asis>
+    >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56
     <outp>2:34:56</outp>
     <outp>2</outp>
     <outp>34</outp>
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 52d8282d4..6beeb6b32 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -22,7 +22,7 @@ which means you are all set up and can start using fish::
     > fish
     <outp>Welcome to fish, the friendly interactive shell</outp>
     <outp>Type <span class="cwd">help</span> for instructions on how to use fish</outp>
-    <asis>you@hostname</asis> ~>____
+    you@hostname ~>____
 
 
 This prompt that you see above is the ``fish`` default prompt: it shows your username, hostname, and working directory.

From 9bc5d60eaf12284bdd30d1fd005a80bd4befc1a2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 26 Apr 2019 16:08:19 -0700
Subject: [PATCH 0407/1732] Clean up enum_set.h header

Include a missing array header, and switch to idiomatic include guards.
---
 src/enum_set.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/enum_set.h b/src/enum_set.h
index a8b9b229b..c0217479d 100644
--- a/src/enum_set.h
+++ b/src/enum_set.h
@@ -1,5 +1,7 @@
-#pragma once
+#ifndef FISH_ENUM_SET_H
+#define FISH_ENUM_SET_H
 
+#include <array>
 #include <bitset>
 #include <cassert>
 #include <iterator>
@@ -136,3 +138,5 @@ class enum_iter_t {
     iterator_t begin() const { return iterator_t{0}; }
     iterator_t end() const { return iterator_t{static_cast<base_type_t>(enum_count<T>())}; }
 };
+
+#endif

From 30f040ed367896a7d7e44a38211144ffc89a92ee Mon Sep 17 00:00:00 2001
From: puenka <puenka@users.noreply.github.com>
Date: Sat, 27 Apr 2019 09:34:28 +0200
Subject: [PATCH 0408/1732] Add speedtest-cli/speedtest completion (#5840)

* Add speedtest-cli/speedtest completion

Added a completion file for speedtest-cli utility (https://github.com/sivel/speedtest-cli) as shipped from various package repositories.

* added no-files parameter

* Remove inheritance to speedtest

* Create speedtest.fish
---
 share/completions/speedtest-cli.fish | 20 ++++++++++++++++++++
 share/completions/speedtest.fish     |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 share/completions/speedtest-cli.fish
 create mode 100644 share/completions/speedtest.fish

diff --git a/share/completions/speedtest-cli.fish b/share/completions/speedtest-cli.fish
new file mode 100644
index 000000000..3150ca4f8
--- /dev/null
+++ b/share/completions/speedtest-cli.fish
@@ -0,0 +1,20 @@
+complete -c speedtest-cli -s h -l help -d 'Display help and exit'
+complete -c speedtest-cli -l no-download -d 'Do not perform download test'
+complete -c speedtest-cli -l no-upload -d 'Do not perform upload test'
+complete -c speedtest-cli -l single -d 'Only use a single connection. Simulates typical file transfer'
+complete -c speedtest-cli -l bytes -d 'Display values in bytes. Ignored by JSON or CSV output'
+complete -c speedtest-cli -l share -d 'Generate a URL to the speedtest.net share results image'
+complete -c speedtest-cli -l simple -d 'Suppress verbose output'
+complete -c speedtest-cli -l csv -d 'Only show basic information in CSV format (bits/s)'
+complete -c speedtest-cli -l csv-delimiter -a "',' ';' ' '" -d 'Single character delimiter to use in CSV output' -rf
+complete -c speedtest-cli -l csv-header -d 'Print CSV headers'
+complete -c speedtest-cli -l json -d 'Only show basic information in JSON format (bits/s)'
+complete -c speedtest-cli -l list -d 'Display a list of speedtest.net servers sorted by distance'
+complete -c speedtest-cli -l server -d 'Specify a server ID to test against' -rf
+complete -c speedtest-cli -l exclude -d 'Exclude a server from selection' -rf
+complete -c speedtest-cli -l mini -d 'URL of the Speedtest Mini server' -rf
+complete -c speedtest-cli -l source -d 'Source IP address to bind to' -rf
+complete -c speedtest-cli -l timeout -d 'HTTP timeout in seconds' -rf
+complete -c speedtest-cli -l secure -d 'Use HTTPS instead of HTTP with speedtest.net operated servers'
+complete -c speedtest-cli -l no-pre-allocate -d 'Do not pre allocate upload data'
+complete -c speedtest-cli -l version -d 'Show the version number and exit'
diff --git a/share/completions/speedtest.fish b/share/completions/speedtest.fish
new file mode 100644
index 000000000..ea1d06886
--- /dev/null
+++ b/share/completions/speedtest.fish
@@ -0,0 +1 @@
+complete -c speedtest -w speedtest-cli

From eb0e0a4ab49850580d52e63240d6ceacf5151965 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 27 Apr 2019 12:16:53 +0200
Subject: [PATCH 0409/1732] docs/argparse: Fix links

Fixes #5847.

[ci skip]
---
 sphinx_doc_src/cmds/argparse.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index e714a3150..071757170 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -12,9 +12,9 @@ argparse [OPTIONS] OPTION_SPEC... -- [ARG...]
 Description
 -----------
 
-This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the `usage <#argparse-usage>`__ section below.
+This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the `usage <#usage>`__ section below.
 
-Each OPTION_SPEC can be written in the `domain specific language <#argparse-option-specs>`__ described below or created using the companion :ref:`fish_opt <cmd-fish_opt>` command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
+Each OPTION_SPEC can be written in the `domain specific language <#option-specifications>`__ described below or created using the companion :ref:`fish_opt <cmd-fish_opt>` command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
 
 Each option that is seen in the ARG list will result in a var name of the form ``_flag_X``, where ``X`` is the short flag letter and the long flag name. The OPTION_SPEC always requires a short flag even if it can't be used. So there will always be ``_flag_X`` var set using the short flag letter if the corresponding short or long flag is seen. The long flag name var (e.g., ``_flag_help``) will only be defined, obviously, if the OPTION_SPEC includes a long flag name.
 
@@ -50,7 +50,7 @@ Using this command involves passing two sets of arguments separated by ``--``. T
     or return
 
 
-If ``$argv`` is empty then there is nothing to parse and ``argparse`` returns zero to indicate success. If ``$argv`` is not empty then it is checked for flags ``-h``, ``--help``, ``-n`` and ``--name``. If they are found they are removed from the arguments and local variables (more on this `below <argparse-local-variables>`__) are set so the script can determine which options were seen. Assuming ``$argv`` doesn't have any errors, such as a missing mandatory value for an option, then ``argparse`` exits with status zero. Otherwise it writes appropriate error messages to stderr and exits with a status of one.
+If ``$argv`` is empty then there is nothing to parse and ``argparse`` returns zero to indicate success. If ``$argv`` is not empty then it is checked for flags ``-h``, ``--help``, ``-n`` and ``--name``. If they are found they are removed from the arguments and local variables are set so the script can determine which options were seen. Assuming ``$argv`` doesn't have any errors, such as a missing mandatory value for an option, then ``argparse`` exits with status zero. Otherwise it writes appropriate error messages to stderr and exits with a status of one.
 
 The ``--`` argument is required. You do not have to include any arguments after the ``--`` but you must include the ``--``. For example, this is acceptable:
 
@@ -93,7 +93,7 @@ Each option specification is a string composed of
 
 - ``=+`` if it requires a value and each instance of the flag is saved.
 
-- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#arparse-validation>`__ for more information.
+- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#flag-value-validation>`__ for more information.
 
 See the :ref:`fish_opt <cmd-fish_opt>` command for a friendlier but more verbose way to create option specifications.
 

From af0e08e9f1bfd0027764c714678c7cd624353c83 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 26 Apr 2019 18:37:24 +0200
Subject: [PATCH 0410/1732] argparse: Use the current function name by default

This makes the `--name` option usually unnecessary.

See #5835.
---
 CHANGELOG.md                     |  1 +
 sphinx_doc_src/cmds/argparse.rst |  4 ++--
 src/builtin_argparse.cpp         | 11 ++++++++++-
 tests/argparse.err               |  8 ++++++++
 tests/argparse.in                |  8 ++++++++
 tests/argparse.out               |  3 +++
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7e4c2193..53f154ff7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - `count` now also counts lines fed on stdin (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
+- `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index 071757170..d930a07cc 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -25,9 +25,9 @@ Options
 
 The following ``argparse`` options are available. They must appear before all OPTION_SPECs:
 
-- ``-n`` or ``--name`` is the command name to insert into any error messages. If you don't provide this value ``argparse`` will be used.
+- ``-n`` or ``--name`` is 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 of long options that are mutually exclusive. You can use this option more than once to define multiple sets of mutually exclusive options.
+- ``-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.
 
 - ``-N`` or ``--min-args`` is followed by an integer that defines the minimum number of acceptable non-option arguments. The default is zero.
 
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 4c70fd657..a8316a31c 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -49,7 +49,7 @@ struct argparse_cmd_opts_t {
     size_t min_args = 0;
     size_t max_args = SIZE_MAX;
     wchar_t implicit_int_flag = L'\0';
-    wcstring name = L"argparse";
+    wcstring name = L"";
     wcstring_list_t raw_exclusive_flags;
     wcstring_list_t argv;
     std::unordered_map<wchar_t, option_spec_ref_t> options;
@@ -405,6 +405,15 @@ static int parse_cmd_opts(argparse_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
         return STATUS_INVALID_ARGS;
     }
 
+    if (opts.name.empty()) {
+        // If no name has been given, we default to the function name.
+        // If any error happens, the backtrace will show which argparse it was.
+        const wchar_t *fn = parser.get_function_name(1);
+
+        if (!fn) fn = L"argparse";
+        opts.name = fn;
+    }
+
     *optind = w.woptind;
     return collect_option_specs(opts, optind, argc, argv, streams);
 }
diff --git a/tests/argparse.err b/tests/argparse.err
index 5c8457310..894d07d74 100644
--- a/tests/argparse.err
+++ b/tests/argparse.err
@@ -104,3 +104,11 @@ argparse: Value 'a1' for flag 'm' is not an integer
 # Explicit int flag validation
 argparse: Value '2' for flag 'm' greater than max allowed of '1'
 argparse: Value '-1' for flag 'max' less than min allowed of '0'
+
+####################
+# Errors use function name by default
+notargparse: Unknown option '--banana'
+Standard input (line 353): 
+    argparse a/alpha -- --banana
+    ^
+in function 'notargparse'
diff --git a/tests/argparse.in b/tests/argparse.in
index 2361605a5..ce33d1a9d 100644
--- a/tests/argparse.in
+++ b/tests/argparse.in
@@ -171,3 +171,11 @@ argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=0 bargle
 or echo unexpected argparse return status $status >&2
 argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=1 bargle
 or echo unexpected argparse return status $status >&2
+
+logmsg Errors use function name by default
+function notargparse
+    argparse a/alpha -- --banana
+end
+notargparse
+
+true
diff --git a/tests/argparse.out b/tests/argparse.out
index 1267efa51..b1565bb6c 100644
--- a/tests/argparse.out
+++ b/tests/argparse.out
@@ -129,3 +129,6 @@ expected argparse return status 57
 
 ####################
 # Explicit int flag validation
+
+####################
+# Errors use function name by default

From f297543ca12154725e424398a4138fac802009a3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 12:04:36 -0700
Subject: [PATCH 0411/1732] Make owning_lock's template parameter titlecase
 instead of uppercase

---
 src/common.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common.h b/src/common.h
index 98785ab24..8f970db6f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -648,7 +648,7 @@ class acquired_lock {
 
 // A lock that owns a piece of data
 // Access to the data is only provided by taking the lock
-template <typename DATA>
+template <typename Data>
 class owning_lock {
     // No copying
     owning_lock &operator=(const scoped_lock &) = delete;
@@ -657,13 +657,13 @@ class owning_lock {
     owning_lock &operator=(owning_lock &&) = default;
 
     std::mutex lock;
-    DATA data;
+    Data data;
 
    public:
-    owning_lock(DATA &&d) : data(std::move(d)) {}
+    owning_lock(Data &&d) : data(std::move(d)) {}
     owning_lock() : data() {}
 
-    acquired_lock<DATA> acquire() { return {lock, &data}; }
+    acquired_lock<Data> acquire() { return {lock, &data}; }
 };
 
 /// A scoped manager to save the current value of some variable, and optionally set it to a new

From 7b44b5ef15c50d3feb4025d912dd24f45cb45aa1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 19 Apr 2019 18:55:59 -0700
Subject: [PATCH 0412/1732] Titlecase LRU template parameters

---
 src/lru.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lru.h b/src/lru.h
index 0cf7b08c2..aa0237d68 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -10,7 +10,7 @@
 
 // Least-recently-used cache class.
 //
-// This a map from wcstring to CONTENTS, that will evict entries when the count exceeds the maximum.
+// This a map from wcstring to Contents, that will evict entries when the count exceeds the maximum.
 // It uses CRTP to inform clients when entries are evicted. This uses the classic LRU cache
 // structure: a dictionary mapping keys to nodes, where the nodes also form a linked list. Our
 // linked list is circular and has a sentinel node (the "mouth" - picture a snake swallowing its
@@ -19,7 +19,7 @@
 // having a "back pointer": they store an iterator to the entry in the map containing the node. This
 // allows us, given a node, to immediately locate the node and its key in the dictionary. This
 // allows us to avoid duplicating the key in the node.
-template <class DERIVED, class CONTENTS>
+template <class Derived, class Contents>
 class lru_cache_t {
     struct lru_node_t;
     struct lru_link_t {
@@ -40,9 +40,9 @@ class lru_cache_t {
         const wcstring *key = NULL;
 
         // The value from the client
-        CONTENTS value;
+        Contents value;
 
-        explicit lru_node_t(const CONTENTS &v) : value(std::move(v)) {}
+        explicit lru_node_t(const Contents &v) : value(std::move(v)) {}
     };
 
     typedef typename std::unordered_map<wcstring, lru_node_t>::iterator node_iter_t;
@@ -91,13 +91,13 @@ class lru_cache_t {
         // Pull out our key and value
         // Note we copy the key in case the map needs it to erase the node
         wcstring key = *node->key;
-        CONTENTS value(std::move(node->value));
+        Contents value(std::move(node->value));
 
         // Remove us from the map. This deallocates node!
         node_map.erase(iter);
 
         // Tell ourselves what we did
-        DERIVED *dthis = static_cast<DERIVED *>(this);
+        Derived *dthis = static_cast<Derived *>(this);
         dthis->entry_was_evicted(std::move(key), std::move(value));
     }
 
@@ -109,7 +109,7 @@ class lru_cache_t {
 
     // CRTP callback for when a node is evicted.
     // Clients can implement this
-    void entry_was_evicted(wcstring key, CONTENTS value) {
+    void entry_was_evicted(wcstring key, Contents value) {
         UNUSED(key);
         UNUSED(value);
     }
@@ -185,7 +185,7 @@ class lru_cache_t {
 
     // Returns the value for a given key, or NULL.
     // This counts as a "use" and so promotes the node
-    CONTENTS *get(const wcstring &key) {
+    Contents *get(const wcstring &key) {
         auto where = this->node_map.find(key);
         if (where == this->node_map.end()) {
             // not found
@@ -205,7 +205,7 @@ class lru_cache_t {
 
     // Adds a node under the given key. Returns true if the node was added, false if the node was
     // not because a node with that key is already in the set.
-    bool insert(wcstring key, CONTENTS value) {
+    bool insert(wcstring key, Contents value) {
         if (!this->insert_no_eviction(std::move(key), std::move(value))) {
             return false;
         }
@@ -218,7 +218,7 @@ class lru_cache_t {
 
     // Adds a node under the given key without triggering eviction. Returns true if the node was
     // added, false if the node was not because a node with that key is already in the set.
-    bool insert_no_eviction(wcstring key, CONTENTS value) {
+    bool insert_no_eviction(wcstring key, Contents value) {
         // Try inserting; return false if it was already in the set.
         auto iter_inserted = this->node_map.emplace(std::move(key), lru_node_t(std::move(value)));
         if (!iter_inserted.second) {
@@ -279,7 +279,7 @@ class lru_cache_t {
         const lru_link_t *node;
 
        public:
-        typedef std::pair<const wcstring &, const CONTENTS &> value_type;
+        typedef std::pair<const wcstring &, const Contents &> value_type;
 
         explicit iterator(const lru_link_t *val) : node(val) {}
         void operator++() { node = node->prev; }

From 6ec7c50ace7804d46aa428bd74a1f38f9a44ae3e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 21 Apr 2019 20:32:21 -0700
Subject: [PATCH 0413/1732] Stop removing functions and completions in autoload

autoloading has a "feature" where functions are removed in an LRU-fashion.
But there's hardly any benefit in removing autoloaded functions. Just stop
doing it.
---
 src/autoload.cpp         | 13 +++----------
 src/autoload.h           |  6 +-----
 src/builtin_complete.cpp |  3 ++-
 src/complete.cpp         |  7 +------
 src/function.cpp         | 15 ++++-----------
 5 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index e551b0ee1..807a44311 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -35,16 +35,11 @@ file_access_attempt_t access_file(const wcstring &path, int mode) {
     return result;
 }
 
-autoload_t::autoload_t(wcstring env_var_name_var,
-                       command_removed_function_t cmd_removed_callback)
-    : env_var_name(std::move(env_var_name_var)), command_removed(cmd_removed_callback) {}
+autoload_t::autoload_t(wcstring env_var_name_var) : env_var_name(std::move(env_var_name_var)) {}
 
 void autoload_t::entry_was_evicted(wcstring key, autoload_function_t node) {
     // This should only ever happen on the main thread.
     ASSERT_IS_MAIN_THREAD();
-
-    // Tell ourselves that the command was removed if it was loaded.
-    if (node.is_loaded) this->command_removed(std::move(key));
 }
 
 int autoload_t::unload(const wcstring &cmd) { return this->evict_node(cmd); }
@@ -200,10 +195,8 @@ bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_
             // Generate the script source.
             script_source = L"source " + escape_string(path, ESCAPE_ALL);
 
-            // Remove any loaded command because we are going to reload it. Note that this
-            // will deadlock if command_removed calls back into us.
-            if (func && func->is_loaded) {
-                command_removed(cmd);
+            // Mark that our function is no longer a placeholder, because we will load it.
+            if (func) {
                 func->is_placeholder = false;
             }
 
diff --git a/src/autoload.h b/src/autoload.h
index 9421ee306..9256bff76 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -55,9 +55,6 @@ class autoload_t : public lru_cache_t<autoload_t, autoload_function_t> {
     /// A table containing all the files that are currently being loaded.
     /// This is here to help prevent recursion.
     std::unordered_set<wcstring> is_loading_set;
-    // Function invoked when a command is removed
-    typedef void (*command_removed_function_t)(const wcstring &);
-    const command_removed_function_t command_removed;
 
     void remove_all_functions() { this->evict_all_nodes(); }
 
@@ -72,11 +69,10 @@ class autoload_t : public lru_cache_t<autoload_t, autoload_function_t> {
     void entry_was_evicted(wcstring key, autoload_function_t node);
 
     // Create an autoload_t for the given environment variable name.
-    autoload_t(wcstring env_var_name_var, command_removed_function_t callback);
+    explicit autoload_t(wcstring env_var_name_var);
 
     /// Autoload the specified file, if it exists in the specified path. Do not load it multiple
     /// times unless its timestamp changes or parse_util_unload is called.
-    /// Autoloading one file may unload another.
     /// @param cmd the filename to search for. The suffix '.fish' is always added to this name
     /// @param reload wheter to recheck file timestamps on already loaded files
     int load(const wcstring &cmd, bool reload);
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index f18abba74..9f4c75d00 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -329,7 +329,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             recursion_level++;
 
             std::vector<completion_t> comp;
-            complete(do_complete_param, &comp, COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_FUZZY_MATCH, parser.vars());
+            complete(do_complete_param, &comp,
+                     COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_FUZZY_MATCH, parser.vars());
 
             for (size_t i = 0; i < comp.size(); i++) {
                 const completion_t &next = comp.at(i);
diff --git a/src/complete.cpp b/src/complete.cpp
index 8ce6d3079..46d9f97d2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -380,13 +380,8 @@ class completer_t {
     std::vector<completion_t> acquire_completions() { return std::move(completions); }
 };
 
-// Callback when an autoloaded completion is removed.
-static void autoloaded_completion_removed(const wcstring &cmd) {
-    complete_remove_all(cmd, false /* not a path */);
-}
-
 // Autoloader for completions
-static autoload_t completion_autoloader(L"fish_complete_path", autoloaded_completion_removed);
+static autoload_t completion_autoloader(L"fish_complete_path");
 
 /// Create a new completion entry.
 void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
diff --git a/src/function.cpp b/src/function.cpp
index 1f43efd54..1ab1d6c1a 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -62,15 +62,8 @@ static std::unordered_set<wcstring> function_tombstones;
 /// Lock for functions.
 static std::recursive_mutex functions_lock;
 
-static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone = true);
-
-/// Callback when an autoloaded function is removed.
-void autoloaded_function_removed(const wcstring &cmd) {
-    function_remove_ignore_autoload(cmd, false);
-}
-
 // Function autoloader
-static autoload_t function_autoloader(L"fish_function_path", autoloaded_function_removed);
+static autoload_t function_autoloader(L"fish_function_path");
 
 /// Kludgy flag set by the load function in order to tell function_add that the function being
 /// defined is autoloaded. There should be a better way to do this...
@@ -211,7 +204,7 @@ int function_exists_no_autoload(const wcstring &cmd, const environment_t &vars)
            function_autoloader.can_load(cmd, vars);
 }
 
-static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone) {
+static bool function_remove_ignore_autoload(const wcstring &name) {
     // Note: the lock may be held at this point, but is recursive.
     scoped_rlock locker(functions_lock);
 
@@ -220,8 +213,8 @@ static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone
     // Not found.  Not erasing.
     if (iter == loaded_functions.end()) return false;
 
-    // Removing an auto-loaded function.  Prevent it from being auto-reloaded.
-    if (iter->second.is_autoload && tombstone) function_tombstones.insert(name);
+    // If we are removing an auto-loaded function, prevent it from being auto-reloaded.
+    if (iter->second.is_autoload) function_tombstones.insert(name);
 
     loaded_functions.erase(iter);
     event_remove_function_handlers(name);

From b7ad6b5bdc05cc85c403375bd03e6c036b64bd5c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 26 Apr 2019 13:25:41 -0700
Subject: [PATCH 0414/1732] Add autoload_file_cache_t

This will provide the "backing store" for autoloading.
---
 src/autoload.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 807a44311..dba7525cd 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -25,6 +25,126 @@
 /// The time before we'll recheck an autoloaded file.
 static const int kAutoloadStalenessInterval = 15;
 
+/// Represents a file that we might want to autoload.
+struct autoloadable_file_t {
+    /// The path to the file.
+    wcstring path;
+
+    /// The metadata for the file.
+    file_id_t file_id;
+};
+
+/// Class representing a cache of files that may be autoloaded.
+/// This is responsible for performing cached accesses to a set of paths.
+class autoload_file_cache_t {
+    /// A timestamp is a monotonic point in time.
+    using timestamp_t = std::chrono::time_point<std::chrono::steady_clock>;
+
+    /// The directories from which to load.
+    const wcstring_list_t dirs_;
+
+    /// Our LRU cache of checks that were misses.
+    /// The key is the command, the  value is the time of the check.
+    struct misses_lru_cache_t : public lru_cache_t<misses_lru_cache_t, timestamp_t> {};
+    misses_lru_cache_t misses_cache_;
+
+    /// The set of files that we have returned to the caller, along with the time of the check.
+    /// The key is the command (not the path).
+    struct known_file_t {
+        autoloadable_file_t file;
+        timestamp_t last_checked;
+    };
+    std::unordered_map<wcstring, known_file_t> known_files_;
+
+    /// \return the current timestamp.
+    static timestamp_t current_timestamp() { return std::chrono::steady_clock::now(); }
+
+    /// \return whether a timestamp is fresh enough to use.
+    static bool is_fresh(timestamp_t then, timestamp_t now);
+
+    /// Attempt to find an autoloadable file by searching our path list for a given comand.
+    /// \return the file, or none() if none.
+    maybe_t<autoloadable_file_t> locate_file(const wcstring &cmd) const;
+
+   public:
+    /// Initialize with a set of directories.
+    explicit autoload_file_cache_t(wcstring_list_t dirs) : dirs_(std::move(dirs)) {}
+
+    /// \return the directories.
+    const wcstring_list_t &dirs() const { return dirs_; }
+
+    /// Check if a command \p cmd can be loaded.
+    /// If \p allow_stale is true, allow stale entries; otherwise discard them.
+    /// This returns an autoloadable file, or none() if there is no such file.
+    maybe_t<autoloadable_file_t> check(const wcstring &cmd, bool allow_stale = false);
+};
+
+maybe_t<autoloadable_file_t> autoload_file_cache_t::locate_file(const wcstring &cmd) const {
+    // Re-use the storage for path.
+    wcstring path;
+    for (const wcstring &dir : dirs()) {
+        // Construct the path as dir/cmd.fish
+        path = dir;
+        path += L"/";
+        path += cmd;
+        path += L".fish";
+
+        file_id_t file_id = file_id_for_path(path);
+        if (file_id != kInvalidFileID) {
+            // Found it.
+            autoloadable_file_t result;
+            result.path = std::move(path);
+            result.file_id = file_id;
+            return result;
+        }
+    }
+    return none();
+}
+
+bool autoload_file_cache_t::is_fresh(timestamp_t then, timestamp_t now) {
+    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(now - then);
+    return seconds.count() < kAutoloadStalenessInterval;
+}
+
+maybe_t<autoloadable_file_t> autoload_file_cache_t::check(const wcstring &cmd, bool allow_stale) {
+    const auto now = current_timestamp();
+
+    // Check hits.
+    auto iter = known_files_.find(cmd);
+    if (iter != known_files_.end()) {
+        if (allow_stale || is_fresh(iter->second.last_checked, now)) {
+            // Re-use this cached hit.
+            return iter->second.file;
+        }
+        // The file is stale, remove it.
+        known_files_.erase(iter);
+    }
+
+    // Check misses.
+    if (timestamp_t *miss = misses_cache_.get(cmd)) {
+        if (allow_stale || is_fresh(*miss, now)) {
+            // Re-use this cached miss.
+            return none();
+        }
+        // The miss is stale, remove it.
+        misses_cache_.evict_node(cmd);
+    }
+
+    // We couldn't satisfy this request from the cache. Hit the disk.
+    // Don't re-use 'now', the disk access could have taken a long time.
+    maybe_t<autoloadable_file_t> file = locate_file(cmd);
+    if (file.has_value()) {
+        auto ins = known_files_.emplace(cmd, known_file_t{*file, current_timestamp()});
+        assert(ins.second && "Known files cache should not have contained this cmd");
+        (void)ins;
+    } else {
+        bool ins = misses_cache_.insert(cmd, current_timestamp());
+        assert(ins && "Misses cache should not have contained this cmd");
+        (void)ins;
+    }
+    return file;
+}
+
 file_access_attempt_t access_file(const wcstring &path, int mode) {
     file_access_attempt_t result = {};
     file_id_t file_id = file_id_for_path(path);

From 3950dab9ff77db1fb0f78cea6131096cf9684331 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 11:00:36 -0700
Subject: [PATCH 0415/1732] Add autoloader_t

autoloader_t will be the reimplementation of autoloading. Crucically it no
longer manages any locking or loading itself; instead all locking and loading
is performed by clients. This makes it easier to test and helps limit its
responsibilities.
---
 src/autoload.cpp | 43 +++++++++++++++++++++++++++++++
 src/autoload.h   | 67 ++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index dba7525cd..7dc660a73 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -70,6 +70,9 @@ class autoload_file_cache_t {
     /// Initialize with a set of directories.
     explicit autoload_file_cache_t(wcstring_list_t dirs) : dirs_(std::move(dirs)) {}
 
+    /// Initialize with empty directories.
+    autoload_file_cache_t() = default;
+
     /// \return the directories.
     const wcstring_list_t &dirs() const { return dirs_; }
 
@@ -145,6 +148,46 @@ maybe_t<autoloadable_file_t> autoload_file_cache_t::check(const wcstring &cmd, b
     return file;
 }
 
+autoloader_t::autoloader_t(wcstring env_var_name)
+    : env_var_name_(std::move(env_var_name)), cache_(make_unique<autoload_file_cache_t>()) {}
+
+autoloader_t::~autoloader_t() = default;
+
+bool autoloader_t::can_autoload(const wcstring &cmd) {
+    return cache_->check(cmd, true /* allow stale */).has_value();
+}
+
+maybe_t<wcstring> autoloader_t::resolve_command(const wcstring &cmd, const environment_t &env) {
+    // Are we currently in the process of autoloading this?
+    if (current_autoloading_.count(cmd) > 0) return none();
+
+    // Check to see if our paths have changed. If so, replace our cache.
+    // Note we don't have to modify autoloadable_files_. We'll naturally detect if those have
+    // changed when we query the cache.
+    maybe_t<env_var_t> mvar = env.get(env_var_name_);
+    const wcstring_list_t empty;
+    const wcstring_list_t &paths = mvar ? mvar->as_list() : empty;
+    if (paths != cache_->dirs()) {
+        cache_ = make_unique<autoload_file_cache_t>(paths);
+    }
+
+    // Do we have an entry to load?
+    auto mfile = cache_->check(cmd);
+    if (!mfile) return none();
+
+    // Is this file the same as what we previously autoloaded?
+    auto iter = autoloaded_files_.find(cmd);
+    if (iter != autoloaded_files_.end() && iter->second == mfile->file_id) {
+        // The file has been autoloaded and is unchanged.
+        return none();
+    }
+
+    // We're going to (tell our caller to) autoload this command.
+    current_autoloading_.insert(cmd);
+    autoloaded_files_[cmd] = mfile->file_id;
+    return std::move(mfile->path);
+}
+
 file_access_attempt_t access_file(const wcstring &path, int mode) {
     file_access_attempt_t result = {};
     file_id_t file_id = file_id_for_path(path);
diff --git a/src/autoload.h b/src/autoload.h
index 9256bff76..fd0a80875 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -13,6 +13,71 @@
 #include "lru.h"
 #include "wutil.h"
 
+class autoload_file_cache_t;
+class environment_t;
+
+/// autoloader_t is a class that knows how to autoload .fish files from a list of directories. This
+/// is used by autoloading functions and completions. It maintains a file cache, which is
+/// responsible for potentially cached accesses of files, and then a list of files that have
+/// actually been autoloaded. A client may request a file to autoload given a command name, and may
+/// be returned a path which it is expected to source.
+/// autoloader_t does not have any internal locks; it is the responsibility of the caller to lock
+/// it.
+class autoloader_t {
+    /// The environment variable whose paths we observe.
+    const wcstring env_var_name_;
+
+    /// A map from command to the files we have autoloaded.
+    std::unordered_map<wcstring, file_id_t> autoloaded_files_;
+
+    /// The list of commands that we are currently autoloading.
+    std::unordered_set<wcstring> current_autoloading_;
+
+    /// The autoload cache.
+    /// This is a unique_ptr because want to change it if the value of our environment variable
+    /// changes. This is never null (but it may be a cache with no paths).
+    std::unique_ptr<autoload_file_cache_t> cache_;
+
+   public:
+    /// Construct an autoloader that loads from the paths given by \p env_var_name.
+    explicit autoloader_t(wcstring env_var_name);
+
+    ~autoloader_t();
+
+    /// Given a command, get a path to autoload.
+    /// For example, if the environment variable is 'fish_function_path' and the command is 'foo',
+    /// this will look for a file 'foo.fish' in one of the directories given by fish_function_path.
+    /// If there is no such file, OR if the file has been previously resolved and is now unchanged,
+    /// this will return none. But if the file is either new or changed, this will return the path.
+    /// After returning a path, the command is marked in-progress until the caller calls
+    /// mark_autoload_finished() with the same command. Note this does not actually execute any
+    /// code; it is the caller's responsibility to load the file.
+    maybe_t<wcstring> resolve_command(const wcstring &cmd, const environment_t &env);
+
+    /// Mark that a command previously returned from path_to_autoload is finished autoloading.
+    void mark_autoload_finished(const wcstring &cmd) {
+        size_t amt = current_autoloading_.erase(cmd);
+        assert(amt > 0 && "cmd was not being autoloaded");
+        (void)amt;
+    }
+
+    /// \return whether a command is currently being autoloaded.
+    bool autoload_in_progress(const wcstring &cmd) const {
+        return current_autoloading_.count(cmd) > 0;
+    }
+
+    /// \return whether a command could potentially be autoloaded.
+    /// This does not actually mark the command as being autoloaded.
+    bool can_autoload(const wcstring &cmd);
+
+    /// Mark that all autoloaded files have been forgotten.
+    /// Future calls to path_to_autoload() will return previously-returned paths.
+    void clear() {
+        // Note there is no reason to invalidate the cache here.
+        autoloaded_files_.clear();
+    }
+};
+
 /// Record of an attempt to access a file.
 struct file_access_attempt_t {
     /// If filled, the file ID of the checked file.
@@ -41,8 +106,6 @@ struct autoload_function_t {
     bool is_placeholder;
 };
 
-class environment_t;
-
 /// Class representing a path from which we can autoload and the autoloaded contents.
 class autoload_t : public lru_cache_t<autoload_t, autoload_function_t> {
    private:

From 960266fe24974ac67c392174e4cdb94339292570 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 26 Apr 2019 15:03:41 -0700
Subject: [PATCH 0416/1732] Reimplement the function store and autoloading

This cleans up how functions are stored and autoloaded. It eliminates the
recursive lock. Instead there is a single normal owning_lock that protects
the entirety of the function data. Autoloading is re-implemented via the
new autoloader_t.
---
 src/autoload.cpp |   6 +
 src/autoload.h   |   5 +
 src/function.cpp | 285 ++++++++++++++++++++++++++---------------------
 3 files changed, 167 insertions(+), 129 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 7dc660a73..c91110db6 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -198,6 +198,12 @@ file_access_attempt_t access_file(const wcstring &path, int mode) {
     return result;
 }
 
+void autoloader_t::perform_autoload(const wcstring &path) {
+    wcstring script_source = L"source " + escape_string(path, ESCAPE_ALL);
+    exec_subshell(script_source, parser_t::principal_parser(),
+                  false /* do not apply exit status */);
+}
+
 autoload_t::autoload_t(wcstring env_var_name_var) : env_var_name(std::move(env_var_name_var)) {}
 
 void autoload_t::entry_was_evicted(wcstring key, autoload_function_t node) {
diff --git a/src/autoload.h b/src/autoload.h
index fd0a80875..df5ea1575 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -54,6 +54,11 @@ class autoloader_t {
     /// code; it is the caller's responsibility to load the file.
     maybe_t<wcstring> resolve_command(const wcstring &cmd, const environment_t &env);
 
+    /// Helper to actually perform an autoload.
+    /// This is a static function because it executes fish script, and so must be called without
+    /// holding any particular locks.
+    static void perform_autoload(const wcstring &path);
+
     /// Mark that a command previously returned from path_to_autoload is finished autoloading.
     void mark_autoload_finished(const wcstring &cmd) {
         size_t amt = current_autoloading_.erase(cmd);
diff --git a/src/function.cpp b/src/function.cpp
index 1ab1d6c1a..32346e6eb 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -22,6 +22,7 @@
 #include "common.h"
 #include "env.h"
 #include "event.h"
+#include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "function.h"
 #include "intern.h"
@@ -31,65 +32,89 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 class function_info_t {
-public:
- /// Immutable properties of the function.
- std::shared_ptr<const function_properties_t> props;
- /// Function description. This may be changed after the function is created.
- wcstring description;
- /// File where this function was defined (intern'd string).
- const wchar_t *const definition_file;
- /// Mapping of all variables that were inherited from the function definition scope to their
- /// values.
- const std::map<wcstring, env_var_t> inherit_vars;
- /// Flag for specifying that this function was automatically loaded.
- const bool is_autoload;
+   public:
+    /// Immutable properties of the function.
+    std::shared_ptr<const function_properties_t> props;
+    /// Function description. This may be changed after the function is created.
+    wcstring description;
+    /// File where this function was defined (intern'd string).
+    const wchar_t *const definition_file;
+    /// Mapping of all variables that were inherited from the function definition scope to their
+    /// values.
+    const std::map<wcstring, env_var_t> inherit_vars;
+    /// Flag for specifying that this function was automatically loaded.
+    const bool is_autoload;
 
- /// Constructs relevant information from the function_data.
- function_info_t(function_data_t data, const environment_t &vars, const wchar_t *filename,
-                 bool autoload);
+    /// Constructs relevant information from the function_data.
+    function_info_t(function_data_t data, const environment_t &vars, const wchar_t *filename,
+                    bool autoload);
 
- /// Used by function_copy.
- function_info_t(const function_info_t &data, const wchar_t *filename, bool autoload);
+    /// Used by function_copy.
+    function_info_t(const function_info_t &data, const wchar_t *filename, bool autoload);
 };
 
-/// Table containing all functions.
-typedef std::unordered_map<wcstring, function_info_t> function_map_t;
-static function_map_t loaded_functions;
+/// Type wrapping up the set of all functions.
+/// There's only one of these; it's managed by a lock.
+struct function_set_t {
+    /// The map of all functions by name.
+    std::unordered_map<wcstring, function_info_t> funcs;
 
-/// Functions that shouldn't be autoloaded (anymore).
-static std::unordered_set<wcstring> function_tombstones;
+    /// Tombstones for functions that should no longer be autoloaded.
+    std::unordered_set<wcstring> autoload_tombstones;
 
-/// Lock for functions.
-static std::recursive_mutex functions_lock;
+    /// The autoloader for our functions.
+    autoloader_t autoloader{L"fish_function_path"};
 
-// Function autoloader
-static autoload_t function_autoloader(L"fish_function_path");
+    /// Remove a function.
+    /// \return true if successful, false if it doesn't exist.
+    bool remove(const wcstring &name);
 
-/// Kludgy flag set by the load function in order to tell function_add that the function being
-/// defined is autoloaded. There should be a better way to do this...
-static bool is_autoload = false;
+    /// Get the info for a function, or nullptr if none.
+    const function_info_t *get_info(const wcstring &name) const {
+        auto iter = funcs.find(name);
+        return iter == funcs.end() ? nullptr : &iter->second;
+    }
+
+    /// \return true if we should allow autoloading a given function.
+    bool allow_autoload(const wcstring &name) const;
+
+    function_set_t() = default;
+};
+
+/// The big set of all functions.
+static owning_lock<function_set_t> function_set;
+
+bool function_set_t::allow_autoload(const wcstring &name) const {
+    // Prohibit autoloading if we have a non-autoload (explicit) function, or if the function is
+    // tombstoned.
+    const auto *info = get_info(name);
+    bool has_explicit_func = info && !info->is_autoload;
+    bool is_tombstoned = autoload_tombstones.count(name) > 0;
+    return !has_explicit_func && !is_tombstoned;
+}
 
 /// Make sure that if the specified function is a dynamically loaded function, it has been fully
 /// loaded.
-static int load(const wcstring &name) {
+/// Note this executes fish script code.
+static void try_autoload(const wcstring &name) {
     ASSERT_IS_MAIN_THREAD();
-    scoped_rlock locker(functions_lock);
-    bool was_autoload = is_autoload;
-    int res;
-
-    bool no_more_autoload = function_tombstones.count(name) > 0;
-    if (no_more_autoload) return 0;
-
-    function_map_t::iterator iter = loaded_functions.find(name);
-    if (iter != loaded_functions.end() && !iter->second.is_autoload) {
-        // We have a non-autoload version already.
-        return 0;
+    maybe_t<wcstring> path_to_autoload;
+    // Note we can't autoload while holding the funcset lock.
+    // Lock around a local region.
+    {
+        auto funcset = function_set.acquire();
+        if (funcset->allow_autoload(name)) {
+            const environment_t &vars = parser_t::principal_parser().vars();
+            path_to_autoload = funcset->autoloader.resolve_command(name, vars);
+        }
     }
 
-    is_autoload = true;
-    res = function_autoloader.load(name, true);
-    is_autoload = was_autoload;
-    return res;
+    // Release the lock and perform any autoload, then reacquire the lock and clean up.
+    if (path_to_autoload) {
+        // Crucially, the lock is acquired *after* do_autoload_file_at_path().
+        autoloader_t::perform_autoload(*path_to_autoload);
+        function_set.acquire()->autoloader.mark_autoload_finished(name);
+    }
 }
 
 /// Insert a list of all dynamically loaded functions into the specified list.
@@ -151,21 +176,26 @@ function_info_t::function_info_t(const function_info_t &data, const wchar_t *fil
       is_autoload(autoload) {}
 
 void function_add(const function_data_t &data, const parser_t &parser) {
-    UNUSED(parser);
     ASSERT_IS_MAIN_THREAD();
+    auto funcset = function_set.acquire();
 
-    CHECK(!data.name.empty(), );  //!OCLINT(multiple unary operator)
-    scoped_rlock locker(functions_lock);
+    // Historical check. TODO: rationalize this.
+    if (data.name.empty()) {
+        return;
+    }
 
     // Remove the old function.
-    function_remove(data.name);
+    funcset->remove(data.name);
+
+    // Check if this is a function that we are autoloading.
+    bool is_autoload = funcset->autoloader.autoload_in_progress(data.name);
 
     // Create and store a new function.
     const wchar_t *filename = reader_current_filename();
-
-    const function_map_t::value_type new_pair(
-        data.name, function_info_t(data, parser.vars(), filename, is_autoload));
-    loaded_functions.insert(new_pair);
+    auto ins = funcset->funcs.emplace(data.name,
+                                      function_info_t(data, parser.vars(), filename, is_autoload));
+    assert(ins.second && "Function should not already be present in the table");
+    (void)ins;
 
     // Add event handlers.
     for (const event_description_t &ed : data.events) {
@@ -175,129 +205,111 @@ void function_add(const function_data_t &data, const parser_t &parser) {
 
 std::shared_ptr<const function_properties_t> function_get_properties(const wcstring &name) {
     if (parser_keywords_is_reserved(name)) return nullptr;
-    scoped_rlock locker(functions_lock);
-    auto where = loaded_functions.find(name);
-    if (where != loaded_functions.end()) {
-        return where->second.props;
+    auto funcset = function_set.acquire();
+    if (const auto *info = funcset->get_info(name)) {
+        return info->props;
     }
     return nullptr;
 }
 
 int function_exists(const wcstring &cmd) {
+    ASSERT_IS_MAIN_THREAD();
     if (parser_keywords_is_reserved(cmd)) return 0;
-    scoped_rlock locker(functions_lock);
-    load(cmd);
-    return loaded_functions.find(cmd) != loaded_functions.end();
+    try_autoload(cmd);
+    auto funcset = function_set.acquire();
+    return funcset->funcs.find(cmd) != funcset->funcs.end();
 }
 
 void function_load(const wcstring &cmd) {
+    ASSERT_IS_MAIN_THREAD();
     if (!parser_keywords_is_reserved(cmd)) {
-        scoped_rlock locker(functions_lock);
-        load(cmd);
+        try_autoload(cmd);
     }
 }
 
 int function_exists_no_autoload(const wcstring &cmd, const environment_t &vars) {
     if (parser_keywords_is_reserved(cmd)) return 0;
-    scoped_rlock locker(functions_lock);
-    return loaded_functions.find(cmd) != loaded_functions.end() ||
-           function_autoloader.can_load(cmd, vars);
+    auto funcset = function_set.acquire();
+
+    // Check if we either have the function, or it could be autoloaded.
+    return funcset->get_info(cmd) || funcset->autoloader.can_autoload(cmd);
 }
 
-static bool function_remove_ignore_autoload(const wcstring &name) {
-    // Note: the lock may be held at this point, but is recursive.
-    scoped_rlock locker(functions_lock);
-
-    function_map_t::iterator iter = loaded_functions.find(name);
-
-    // Not found.  Not erasing.
-    if (iter == loaded_functions.end()) return false;
-
-    // If we are removing an auto-loaded function, prevent it from being auto-reloaded.
-    if (iter->second.is_autoload) function_tombstones.insert(name);
-
-    loaded_functions.erase(iter);
-    event_remove_function_handlers(name);
-    return true;
+bool function_set_t::remove(const wcstring &name) {
+    size_t amt = funcs.erase(name);
+    if (amt > 0) {
+        event_remove_function_handlers(name);
+    }
+    return amt > 0;
 }
 
 void function_remove(const wcstring &name) {
-    if (function_remove_ignore_autoload(name)) function_autoloader.unload(name);
-}
-
-/// Returns a function by name if it has been loaded, returns false otherwise. Does not autoload.
-static const function_info_t *function_get(const wcstring &name) {
-    // The caller must lock the functions_lock before calling this; however our mutex is currently
-    // recursive, so trylock will never fail. We need a way to correctly check if a lock is locked
-    // (or better yet, make our lock non-recursive).
-    // ASSERT_IS_LOCKED(functions_lock);
-    function_map_t::iterator iter = loaded_functions.find(name);
-    if (iter == loaded_functions.end()) {
-        return NULL;
+    auto funcset = function_set.acquire();
+    if (funcset->remove(name)) {
+        // Prevent re-autoloading this function.
+        funcset->autoload_tombstones.insert(name);
     }
-    return &iter->second;
 }
 
 bool function_get_definition(const wcstring &name, wcstring &out_definition) {
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
-    if (func) {
+    const auto funcset = function_set.acquire();
+    if (const function_info_t *func = funcset->get_info(name)) {
         auto props = func->props;
         if (props && props->parsed_source) {
             out_definition = props->body_node.get_source(props->parsed_source->src);
         }
+        return true;
     }
-    return func != NULL;
+    return false;
 }
 
 std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name) {
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
+    const auto funcset = function_set.acquire();
+    const function_info_t *func = funcset->get_info(name);
     return func ? func->inherit_vars : std::map<wcstring, env_var_t>();
 }
 
 bool function_get_desc(const wcstring &name, wcstring &out_desc) {
-    // Empty length string goes to NULL.
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
+    const auto funcset = function_set.acquire();
+    const function_info_t *func = funcset->get_info(name);
     if (func && !func->description.empty()) {
         out_desc = _(func->description.c_str());
         return true;
     }
-
     return false;
 }
 
 void function_set_desc(const wcstring &name, const wcstring &desc) {
-    load(name);
-    scoped_rlock locker(functions_lock);
-    function_map_t::iterator iter = loaded_functions.find(name);
-    if (iter != loaded_functions.end()) {
+    ASSERT_IS_MAIN_THREAD();
+    try_autoload(name);
+    auto funcset = function_set.acquire();
+    auto iter = funcset->funcs.find(name);
+    if (iter != funcset->funcs.end()) {
         iter->second.description = desc;
     }
 }
 
 bool function_copy(const wcstring &name, const wcstring &new_name) {
-    bool result = false;
-    scoped_rlock locker(functions_lock);
-    function_map_t::const_iterator iter = loaded_functions.find(name);
-    if (iter != loaded_functions.end()) {
-        // This new instance of the function shouldn't be tied to the definition file of the
-        // original, so pass NULL filename, etc.
-        const function_map_t::value_type new_pair(new_name,
-                                                  function_info_t(iter->second, NULL, false));
-        loaded_functions.insert(new_pair);
-        result = true;
+    auto funcset = function_set.acquire();
+    auto iter = funcset->funcs.find(name);
+    if (iter == funcset->funcs.end()) {
+        // No such function.
+        return false;
     }
-    return result;
+
+    // This new instance of the function shouldn't be tied to the definition file of the
+    // original, so pass NULL filename, etc.
+    // Note this will NOT overwrite an existing function with the new name.
+    // TODO: rationalize if this behavior is desired.
+    funcset->funcs.emplace(new_name, function_info_t(iter->second, nullptr, false));
+    return true;
 }
 
 wcstring_list_t function_get_names(int get_hidden) {
     std::unordered_set<wcstring> names;
-    scoped_rlock locker(functions_lock);
+    auto funcset = function_set.acquire();
     autoload_names(names, get_hidden);
-
-    for (const auto &func : loaded_functions) {
+    for (const auto &func : funcset->funcs) {
         const wcstring &name = func.first;
 
         // Maybe skip hidden.
@@ -310,20 +322,20 @@ wcstring_list_t function_get_names(int get_hidden) {
 }
 
 const wchar_t *function_get_definition_file(const wcstring &name) {
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
+    const auto funcset = function_set.acquire();
+    const function_info_t *func = funcset->get_info(name);
     return func ? func->definition_file : NULL;
 }
 
 bool function_is_autoloaded(const wcstring &name) {
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
-    return func->is_autoload;
+    const auto funcset = function_set.acquire();
+    const function_info_t *func = funcset->get_info(name);
+    return func ? func->is_autoload : false;
 }
 
 int function_get_definition_lineno(const wcstring &name) {
-    scoped_rlock locker(functions_lock);
-    const function_info_t *func = function_get(name);
+    const auto funcset = function_set.acquire();
+    const function_info_t *func = funcset->get_info(name);
     if (!func) return -1;
     // return one plus the number of newlines at offsets less than the start of our function's
     // statement (which includes the header).
@@ -338,7 +350,22 @@ int function_get_definition_lineno(const wcstring &name) {
     return 1 + std::count(source.begin(), source.begin() + func_start, L'\n');
 }
 
-void function_invalidate_path() { function_autoloader.invalidate(); }
+void function_invalidate_path() {
+    // Remove all autoloaded functions and update the autoload path.
+    // Note we don't want to risk removal during iteration; we expect this to be called
+    // infrequently.
+    auto funcset = function_set.acquire();
+    wcstring_list_t autoloadees;
+    for (const auto &kv : funcset->funcs) {
+        if (kv.second.is_autoload) {
+            autoloadees.push_back(kv.first);
+        }
+    }
+    for (const wcstring &name : autoloadees) {
+        funcset->remove(name);
+    }
+    funcset->autoloader.clear();
+}
 
 // Setup the environment for the function. There are three components of the environment:
 // 1. argv

From 68a28106b2dd4bb962e945340579f2d64d3a4066 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 13:05:12 -0700
Subject: [PATCH 0417/1732] Reimplement completion autoloading via autoloader_t

This switches the completion autoloading machinery to autoloader_t.
---
 src/autoload.cpp | 12 ++++++++++++
 src/autoload.h   |  4 ++++
 src/complete.cpp | 25 +++++++++++++++++++++----
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index c91110db6..46588334b 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -151,12 +151,24 @@ maybe_t<autoloadable_file_t> autoload_file_cache_t::check(const wcstring &cmd, b
 autoloader_t::autoloader_t(wcstring env_var_name)
     : env_var_name_(std::move(env_var_name)), cache_(make_unique<autoload_file_cache_t>()) {}
 
+autoloader_t::autoloader_t(autoloader_t &&) = default;
 autoloader_t::~autoloader_t() = default;
 
 bool autoloader_t::can_autoload(const wcstring &cmd) {
     return cache_->check(cmd, true /* allow stale */).has_value();
 }
 
+wcstring_list_t autoloader_t::get_autoloaded_commands() const {
+    wcstring_list_t result;
+    result.reserve(autoloaded_files_.size());
+    for (const auto &kv : autoloaded_files_) {
+        result.push_back(kv.first);
+    }
+    // Sort the output to make it easier to test.
+    std::sort(result.begin(), result.end());
+    return result;
+}
+
 maybe_t<wcstring> autoloader_t::resolve_command(const wcstring &cmd, const environment_t &env) {
     // Are we currently in the process of autoloading this?
     if (current_autoloading_.count(cmd) > 0) return none();
diff --git a/src/autoload.h b/src/autoload.h
index df5ea1575..0910923ee 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -42,6 +42,7 @@ class autoloader_t {
     /// Construct an autoloader that loads from the paths given by \p env_var_name.
     explicit autoloader_t(wcstring env_var_name);
 
+    autoloader_t(autoloader_t &&);
     ~autoloader_t();
 
     /// Given a command, get a path to autoload.
@@ -75,6 +76,9 @@ class autoloader_t {
     /// This does not actually mark the command as being autoloaded.
     bool can_autoload(const wcstring &cmd);
 
+    /// \return the names of all commands that have been autoloaded.
+    wcstring_list_t get_autoloaded_commands() const;
+
     /// Mark that all autoloaded files have been forgotten.
     /// Future calls to path_to_autoload() will return previously-returned paths.
     void clear() {
diff --git a/src/complete.cpp b/src/complete.cpp
index 46d9f97d2..430463fe3 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -380,8 +380,8 @@ class completer_t {
     std::vector<completion_t> acquire_completions() { return std::move(completions); }
 };
 
-// Autoloader for completions
-static autoload_t completion_autoloader(L"fish_complete_path");
+// Autoloader for completions.
+static owning_lock<autoloader_t> completion_autoloader{autoloader_t(L"fish_complete_path")};
 
 /// Create a new completion entry.
 void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
@@ -860,7 +860,16 @@ static void complete_load(const wcstring &name, bool reload) {
     // We have to load this as a function, since it may define a --wraps or signature.
     // See issue #2466.
     function_load(name);
-    completion_autoloader.load(name, reload);
+
+    // It's important to NOT hold the lock around completion loading.
+    // We need to take the lock to decide what to load, drop it to perform the load, then reacquire
+    // it.
+    const environment_t &vars = parser_t::principal_parser().vars();
+    maybe_t<wcstring> path_to_load = completion_autoloader.acquire()->resolve_command(name, vars);
+    if (path_to_load) {
+        autoloader_t::perform_autoload(*path_to_load);
+        completion_autoloader.acquire()->mark_autoload_finished(name);
+    }
 }
 
 /// complete_param: Given a command, find completions for the argument str of command cmd_orig with
@@ -1659,7 +1668,15 @@ wcstring complete_print() {
     return out;
 }
 
-void complete_invalidate_path() { completion_autoloader.invalidate(); }
+void complete_invalidate_path() {
+    // TODO: here we unload all completions for commands that are loaded by the autoloader. We also
+    // unload any completions that the user may specified on the command line. We should in
+    // principle track those completions loaded by the autoloader alone.
+    wcstring_list_t cmds = completion_autoloader.acquire()->get_autoloaded_commands();
+    for (const wcstring &cmd : cmds) {
+        complete_remove_all(cmd, false /* not a path */);
+    }
+}
 
 /// Add a new target that wraps a command. Example: __fish_XYZ (function) wraps XYZ (target).
 bool complete_add_wrapper(const wcstring &command, const wcstring &new_target) {

From 4ff50eba41766f62f49f6fda64a6f33af520d500 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 15:42:34 -0700
Subject: [PATCH 0418/1732] Remove autoload_t, rename autoloader_t to
 autoload_t

Now that there are no more clients of autoload_t, delete it and
rename autoloader_t to autoload_t. Also clean up the headers.
---
 src/autoload.cpp | 259 ++---------------------------------------------
 src/autoload.h   |  99 +++---------------
 src/complete.cpp |   4 +-
 src/function.cpp |   4 +-
 4 files changed, 27 insertions(+), 339 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 46588334b..bf6828232 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -1,24 +1,14 @@
 // The classes responsible for autoloading functions and completions.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <pthread.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <memory>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
 #include "autoload.h"
+
+#include <chrono>
+
 #include "common.h"
 #include "env.h"
 #include "exec.h"
+#include "lru.h"
 #include "parser.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -148,17 +138,17 @@ maybe_t<autoloadable_file_t> autoload_file_cache_t::check(const wcstring &cmd, b
     return file;
 }
 
-autoloader_t::autoloader_t(wcstring env_var_name)
+autoload_t::autoload_t(wcstring env_var_name)
     : env_var_name_(std::move(env_var_name)), cache_(make_unique<autoload_file_cache_t>()) {}
 
-autoloader_t::autoloader_t(autoloader_t &&) = default;
-autoloader_t::~autoloader_t() = default;
+autoload_t::autoload_t(autoload_t &&) = default;
+autoload_t::~autoload_t() = default;
 
-bool autoloader_t::can_autoload(const wcstring &cmd) {
+bool autoload_t::can_autoload(const wcstring &cmd) {
     return cache_->check(cmd, true /* allow stale */).has_value();
 }
 
-wcstring_list_t autoloader_t::get_autoloaded_commands() const {
+wcstring_list_t autoload_t::get_autoloaded_commands() const {
     wcstring_list_t result;
     result.reserve(autoloaded_files_.size());
     for (const auto &kv : autoloaded_files_) {
@@ -169,7 +159,7 @@ wcstring_list_t autoloader_t::get_autoloaded_commands() const {
     return result;
 }
 
-maybe_t<wcstring> autoloader_t::resolve_command(const wcstring &cmd, const environment_t &env) {
+maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const environment_t &env) {
     // Are we currently in the process of autoloading this?
     if (current_autoloading_.count(cmd) > 0) return none();
 
@@ -200,235 +190,8 @@ maybe_t<wcstring> autoloader_t::resolve_command(const wcstring &cmd, const envir
     return std::move(mfile->path);
 }
 
-file_access_attempt_t access_file(const wcstring &path, int mode) {
-    file_access_attempt_t result = {};
-    file_id_t file_id = file_id_for_path(path);
-    if (file_id != kInvalidFileID && 0 == waccess(path, mode)) {
-        result.file_id = file_id;
-    }
-    result.last_checked = time(NULL);
-    return result;
-}
-
-void autoloader_t::perform_autoload(const wcstring &path) {
+void autoload_t::perform_autoload(const wcstring &path) {
     wcstring script_source = L"source " + escape_string(path, ESCAPE_ALL);
     exec_subshell(script_source, parser_t::principal_parser(),
                   false /* do not apply exit status */);
 }
-
-autoload_t::autoload_t(wcstring env_var_name_var) : env_var_name(std::move(env_var_name_var)) {}
-
-void autoload_t::entry_was_evicted(wcstring key, autoload_function_t node) {
-    // This should only ever happen on the main thread.
-    ASSERT_IS_MAIN_THREAD();
-}
-
-int autoload_t::unload(const wcstring &cmd) { return this->evict_node(cmd); }
-
-int autoload_t::load(const wcstring &cmd, bool reload) {
-    int res;
-    ASSERT_IS_MAIN_THREAD();
-
-    // TODO: Justify this principal_parser.
-    auto &parser = parser_t::principal_parser();
-    auto &vars = parser.vars();
-
-    if (!this->paths) {
-        auto path_var = vars.get(env_var_name);
-        if (path_var.missing_or_empty()) return 0;
-        this->paths = path_var->as_list();
-    }
-
-    // Mark that we're loading this. Hang onto the iterator for fast erasing later. Note that
-    // std::set has guarantees about not invalidating iterators, so this is safe to do across the
-    // callouts below.
-    auto insert_result = is_loading_set.insert(cmd);
-    auto where = insert_result.first;
-    bool inserted = insert_result.second;
-
-    // Warn and fail on infinite recursion. It's OK to do this because this function is only called
-    // on the main thread.
-    if (!inserted) {
-        // We failed to insert.
-        const wchar_t *fmt =
-            _(L"Could not autoload item '%ls', it is already being autoloaded. "
-              L"This is a circular dependency in the autoloading scripts, please remove it.");
-        debug(0, fmt, cmd.c_str());
-        return 1;
-    }
-    // Try loading it.
-    assert(paths && "Should have paths");
-    res = this->locate_file_and_maybe_load_it(cmd, true, reload, *this->paths);
-    // Clean up.
-    is_loading_set.erase(where);
-    return res;
-}
-
-bool autoload_t::can_load(const wcstring &cmd, const environment_t &vars) {
-    auto path_var = vars.get(env_var_name);
-    if (path_var.missing_or_empty()) return false;
-
-    std::vector<wcstring> path_list;
-    path_var->to_list(path_list);
-    return this->locate_file_and_maybe_load_it(cmd, false, false, path_list);
-}
-
-void autoload_t::invalidate() {
-    ASSERT_IS_MAIN_THREAD();
-    scoped_lock locker(lock);
-    paths.reset();
-    this->evict_all_nodes();
-}
-
-/// Check whether the given command is loaded.
-bool autoload_t::has_tried_loading(const wcstring &cmd) {
-    scoped_lock locker(lock);
-    autoload_function_t *func = this->get(cmd);
-    return func != NULL;
-}
-
-/// @return Whether this function is stale.
-static bool is_stale(const autoload_function_t *func) {
-    return time(NULL) - func->access.last_checked > kAutoloadStalenessInterval;
-}
-
-autoload_function_t *autoload_t::get_autoloaded_function_with_creation(const wcstring &cmd,
-                                                                       bool allow_eviction) {
-    ASSERT_IS_LOCKED(lock);
-    autoload_function_t *func = this->get(cmd);
-    if (!func) {
-        if (allow_eviction) {
-            this->insert(cmd, autoload_function_t(false));
-        } else {
-            this->insert_no_eviction(cmd, autoload_function_t(false));
-        }
-        func = this->get(cmd);
-        assert(func);
-    }
-    return func;
-}
-
-static bool use_cached(autoload_function_t *func, bool really_load, bool allow_stale_functions) {
-    if (!func) {
-        return false;  // can't use a function that doesn't exist
-    }
-    if (really_load && !func->is_placeholder && !func->is_loaded) {
-        return false;  // can't use an unloaded function
-    }
-    if (!allow_stale_functions && is_stale(func)) {
-        return false;  // can't use a stale function
-    }
-    return true;  // I guess we can use it
-}
-
-/// This internal helper function does all the real work. By using two functions, the internal
-/// function can return on various places in the code, and the caller can take care of various
-/// cleanup work.
-/// @param cmd the command name ('grep')
-/// @param really_load Whether to actually parse it as a function, or just check it it exists
-/// @param reload Whether to reload it if it's already loaded
-/// @param path_list The set of paths to check
-/// @return If really_load is true, returns whether the function was loaded. Otherwise returns
-///         whether the function existed.
-bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_load, bool reload,
-                                               const wcstring_list_t &path_list) {
-    // Note that we are NOT locked in this function!
-    bool reloaded = false;
-
-    // Try using a cached function. If we really want the function to be loaded, require that it be
-    // really loaded. If we're not reloading, allow stale functions.
-    {
-        bool allow_stale_functions = !reload;
-        scoped_lock locker(lock);
-        autoload_function_t *func = this->get(cmd);  // get the function
-
-        // If we can use this function, return whether we were able to access it.
-        if (use_cached(func, really_load, allow_stale_functions)) {
-            return func->access.accessible();
-        }
-    }
-
-    // The source of the script will end up here.
-    wcstring script_source;
-
-    // Whether we found an accessible file.
-    bool found_file = false;
-
-    // Iterate over path searching for suitable completion files.
-    for (size_t i = 0; i < path_list.size() && !found_file; i++) {
-        wcstring next = path_list.at(i);
-        wcstring path = next + L"/" + cmd + L".fish";
-
-        const file_access_attempt_t access = access_file(path, R_OK);
-        if (!access.accessible()) {
-            continue;
-        }
-
-        // Now we're actually going to take the lock.
-        scoped_lock locker(lock);
-        autoload_function_t *func = this->get(cmd);
-
-        // Generate the source if we need to load it.
-        bool need_to_load_function =
-            really_load &&
-            (func == NULL || func->access.file_id != access.file_id || !func->is_loaded);
-        if (need_to_load_function) {
-            // Generate the script source.
-            script_source = L"source " + escape_string(path, ESCAPE_ALL);
-
-            // Mark that our function is no longer a placeholder, because we will load it.
-            if (func) {
-                func->is_placeholder = false;
-            }
-
-            // Mark that we're reloading it.
-            reloaded = true;
-        }
-
-        // Create the function if we haven't yet. This does not load it. Do not trigger
-        // eviction unless we are actually loading, because we don't want to evict off of
-        // the main thread.
-        if (!func) func = get_autoloaded_function_with_creation(cmd, really_load);
-
-        // It's a fiction to say the script is loaded at this point, but we're definitely
-        // going to load it down below.
-        if (need_to_load_function) func->is_loaded = true;
-
-        // Unconditionally record our access time.
-        func->access = access;
-        found_file = true;
-    }
-
-    // If no file or builtin script was found we insert a placeholder function. Later we only
-    // research if the current time is at least five seconds later. This way, the files won't be
-    // searched over and over again.
-    if (!found_file && script_source.empty()) {
-        scoped_lock locker(lock);
-        // Generate a placeholder.
-        autoload_function_t *func = this->get(cmd);
-        if (!func) {
-            if (really_load) {
-                this->insert(cmd, autoload_function_t(true));
-            } else {
-                this->insert_no_eviction(cmd, autoload_function_t(true));
-            }
-            func = this->get(cmd);
-            assert(func);
-        }
-        func->access.last_checked = time(NULL);
-    }
-
-    // If we have a script, either built-in or a file source, then run it.
-    if (really_load && !script_source.empty()) {
-        // Do nothing on failure.
-        // TODO: rationalize this use of principal_parser, or inject the loading from outside.
-        exec_subshell(script_source, parser_t::principal_parser(),
-                      false /* do not apply exit status */);
-    }
-
-    if (really_load) {
-        return reloaded;
-    }
-
-    return found_file || !script_source.empty();
-}
diff --git a/src/autoload.h b/src/autoload.h
index 0910923ee..2daed1a45 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -2,28 +2,28 @@
 #ifndef FISH_AUTOLOAD_H
 #define FISH_AUTOLOAD_H
 
-#include <pthread.h>
-#include <time.h>
-
-#include <set>
-#include <unordered_set>
+#include "config.h"  // IWYU pragma: keep
 
 #include "common.h"
 #include "env.h"
-#include "lru.h"
 #include "wutil.h"
 
+#include <cassert>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+
 class autoload_file_cache_t;
 class environment_t;
 
-/// autoloader_t is a class that knows how to autoload .fish files from a list of directories. This
+/// autoload_t is a class that knows how to autoload .fish files from a list of directories. This
 /// is used by autoloading functions and completions. It maintains a file cache, which is
 /// responsible for potentially cached accesses of files, and then a list of files that have
 /// actually been autoloaded. A client may request a file to autoload given a command name, and may
 /// be returned a path which it is expected to source.
-/// autoloader_t does not have any internal locks; it is the responsibility of the caller to lock
+/// autoload_t does not have any internal locks; it is the responsibility of the caller to lock
 /// it.
-class autoloader_t {
+class autoload_t {
     /// The environment variable whose paths we observe.
     const wcstring env_var_name_;
 
@@ -40,10 +40,10 @@ class autoloader_t {
 
    public:
     /// Construct an autoloader that loads from the paths given by \p env_var_name.
-    explicit autoloader_t(wcstring env_var_name);
+    explicit autoload_t(wcstring env_var_name);
 
-    autoloader_t(autoloader_t &&);
-    ~autoloader_t();
+    autoload_t(autoload_t &&);
+    ~autoload_t();
 
     /// Given a command, get a path to autoload.
     /// For example, if the environment variable is 'fish_function_path' and the command is 'foo',
@@ -87,79 +87,4 @@ class autoloader_t {
     }
 };
 
-/// Record of an attempt to access a file.
-struct file_access_attempt_t {
-    /// If filled, the file ID of the checked file.
-    /// Otherwise the file did not exist or was otherwise inaccessible.
-    /// Note that this will never contain kInvalidFileID.
-    maybe_t<file_id_t> file_id;
-
-    /// When we last checked the file.
-    time_t last_checked;
-
-    /// Whether or not we believe we can access this file.
-    bool accessible() const { return file_id.has_value(); }
-};
-file_access_attempt_t access_file(const wcstring &path, int mode);
-
-struct autoload_function_t {
-    explicit autoload_function_t(bool placeholder)
-        : access(), is_loaded(false), is_placeholder(placeholder) {}
-
-    /// The last access attempt recorded
-    file_access_attempt_t access;
-    /// Have we actually loaded this function?
-    bool is_loaded;
-    /// Whether we are a placeholder that stands in for "no such function". If this is true, then
-    /// is_loaded must be false.
-    bool is_placeholder;
-};
-
-/// Class representing a path from which we can autoload and the autoloaded contents.
-class autoload_t : public lru_cache_t<autoload_t, autoload_function_t> {
-   private:
-    /// Lock for thread safety.
-    std::mutex lock;
-    /// The environment variable name.
-    const wcstring env_var_name;
-    /// The paths from which to autoload, or missing if none.
-    maybe_t<wcstring_list_t> paths;
-    /// A table containing all the files that are currently being loaded.
-    /// This is here to help prevent recursion.
-    std::unordered_set<wcstring> is_loading_set;
-
-    void remove_all_functions() { this->evict_all_nodes(); }
-
-    bool locate_file_and_maybe_load_it(const wcstring &cmd, bool really_load, bool reload,
-                                       const wcstring_list_t &path_list);
-
-    autoload_function_t *get_autoloaded_function_with_creation(const wcstring &cmd,
-                                                               bool allow_eviction);
-
-   public:
-    // CRTP override
-    void entry_was_evicted(wcstring key, autoload_function_t node);
-
-    // Create an autoload_t for the given environment variable name.
-    explicit autoload_t(wcstring env_var_name_var);
-
-    /// Autoload the specified file, if it exists in the specified path. Do not load it multiple
-    /// times unless its timestamp changes or parse_util_unload is called.
-    /// @param cmd the filename to search for. The suffix '.fish' is always added to this name
-    /// @param reload wheter to recheck file timestamps on already loaded files
-    int load(const wcstring &cmd, bool reload);
-
-    /// Check whether we have tried loading the given command. Does not do any I/O.
-    bool has_tried_loading(const wcstring &cmd);
-
-    /// Tell the autoloader that the specified file, in the specified path, is no longer loaded.
-    /// Returns non-zero if the file was removed, zero if the file had not yet been loaded
-    int unload(const wcstring &cmd);
-
-    /// Check whether the given command could be loaded, but do not load it.
-    bool can_load(const wcstring &cmd, const environment_t &vars);
-
-    /// Invalidates all entries. Uesd when the underlying path variable changes.
-    void invalidate();
-};
 #endif
diff --git a/src/complete.cpp b/src/complete.cpp
index 430463fe3..4252fee87 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -381,7 +381,7 @@ class completer_t {
 };
 
 // Autoloader for completions.
-static owning_lock<autoloader_t> completion_autoloader{autoloader_t(L"fish_complete_path")};
+static owning_lock<autoload_t> completion_autoloader{autoload_t(L"fish_complete_path")};
 
 /// Create a new completion entry.
 void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
@@ -867,7 +867,7 @@ static void complete_load(const wcstring &name, bool reload) {
     const environment_t &vars = parser_t::principal_parser().vars();
     maybe_t<wcstring> path_to_load = completion_autoloader.acquire()->resolve_command(name, vars);
     if (path_to_load) {
-        autoloader_t::perform_autoload(*path_to_load);
+        autoload_t::perform_autoload(*path_to_load);
         completion_autoloader.acquire()->mark_autoload_finished(name);
     }
 }
diff --git a/src/function.cpp b/src/function.cpp
index 32346e6eb..75cd7b802 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -63,7 +63,7 @@ struct function_set_t {
     std::unordered_set<wcstring> autoload_tombstones;
 
     /// The autoloader for our functions.
-    autoloader_t autoloader{L"fish_function_path"};
+    autoload_t autoloader{L"fish_function_path"};
 
     /// Remove a function.
     /// \return true if successful, false if it doesn't exist.
@@ -112,7 +112,7 @@ static void try_autoload(const wcstring &name) {
     // Release the lock and perform any autoload, then reacquire the lock and clean up.
     if (path_to_autoload) {
         // Crucially, the lock is acquired *after* do_autoload_file_at_path().
-        autoloader_t::perform_autoload(*path_to_autoload);
+        autoload_t::perform_autoload(*path_to_autoload);
         function_set.acquire()->autoloader.mark_autoload_finished(name);
     }
 }

From 51c62d6cc66757c4b1ca620103935d75bd4aa1ed Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 14:26:41 -0700
Subject: [PATCH 0419/1732] Add a test for autoload_t

---
 src/autoload.cpp   | 13 +++++++--
 src/autoload.h     | 14 +++++++++-
 src/fish_tests.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index bf6828232..b53c0d827 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -144,6 +144,11 @@ autoload_t::autoload_t(wcstring env_var_name)
 autoload_t::autoload_t(autoload_t &&) = default;
 autoload_t::~autoload_t() = default;
 
+void autoload_t::invalidate_cache() {
+    auto cache = make_unique<autoload_file_cache_t>(cache_->dirs());
+    cache_ = std::move(cache);
+}
+
 bool autoload_t::can_autoload(const wcstring &cmd) {
     return cache_->check(cmd, true /* allow stale */).has_value();
 }
@@ -160,15 +165,17 @@ wcstring_list_t autoload_t::get_autoloaded_commands() const {
 }
 
 maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const environment_t &env) {
+    maybe_t<env_var_t> mvar = env.get(env_var_name_);
+    return resolve_command(cmd, mvar ? mvar->as_list() : wcstring_list_t{});
+}
+
+maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const wcstring_list_t &paths) {
     // Are we currently in the process of autoloading this?
     if (current_autoloading_.count(cmd) > 0) return none();
 
     // Check to see if our paths have changed. If so, replace our cache.
     // Note we don't have to modify autoloadable_files_. We'll naturally detect if those have
     // changed when we query the cache.
-    maybe_t<env_var_t> mvar = env.get(env_var_name_);
-    const wcstring_list_t empty;
-    const wcstring_list_t &paths = mvar ? mvar->as_list() : empty;
     if (paths != cache_->dirs()) {
         cache_ = make_unique<autoload_file_cache_t>(paths);
     }
diff --git a/src/autoload.h b/src/autoload.h
index 2daed1a45..13b8aa3f1 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -15,6 +15,7 @@
 
 class autoload_file_cache_t;
 class environment_t;
+struct autoload_tester_t;
 
 /// autoload_t is a class that knows how to autoload .fish files from a list of directories. This
 /// is used by autoloading functions and completions. It maintains a file cache, which is
@@ -38,6 +39,16 @@ class autoload_t {
     /// changes. This is never null (but it may be a cache with no paths).
     std::unique_ptr<autoload_file_cache_t> cache_;
 
+    /// Invalidate any underlying cache.
+    /// This is exposed for testing.
+    void invalidate_cache();
+
+    /// Like resolve_autoload(), but accepts the paths directly.
+    /// This is exposed for testing.
+    maybe_t<wcstring> resolve_command(const wcstring &cmd, const wcstring_list_t &paths);
+
+    friend autoload_tester_t;
+
    public:
     /// Construct an autoloader that loads from the paths given by \p env_var_name.
     explicit autoload_t(wcstring env_var_name);
@@ -76,7 +87,8 @@ class autoload_t {
     /// This does not actually mark the command as being autoloaded.
     bool can_autoload(const wcstring &cmd);
 
-    /// \return the names of all commands that have been autoloaded.
+    /// \return the names of all commands that have been autoloaded. Note this includes "in-flight"
+    /// commands.
     wcstring_list_t get_autoloaded_commands() const;
 
     /// Mark that all autoloaded files have been forgotten.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index fa293f8dd..e360eaaa2 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -38,6 +38,7 @@
 #include <utility>
 #include <vector>
 
+#include "autoload.h"
 #include "builtin.h"
 #include "color.h"
 #include "common.h"
@@ -2472,6 +2473,74 @@ static void test_colors() {
     do_test(rgb_color_t(L"mooganta").is_none());
 }
 
+// This class allows accessing private bits of autoload_t.
+struct autoload_tester_t {
+    static void run(const wchar_t *fmt, ...) {
+        va_list va;
+        va_start(va, fmt);
+        wcstring cmd = vformat_string(fmt, va);
+        va_end(va);
+
+        int status = system(wcs2string(cmd).c_str());
+        do_test(status == 0);
+    }
+
+    static void run_test() {
+        char t1[] = "/tmp/fish_test_autoload.XXXXXX";
+        wcstring p1 = str2wcstring(mkdtemp(t1));
+        char t2[] = "/tmp/fish_test_autoload.XXXXXX";
+        wcstring p2 = str2wcstring(mkdtemp(t2));
+
+        const wcstring_list_t paths = {p1, p2};
+
+        autoload_t autoload(L"test_var");
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.get_autoloaded_commands().empty());
+
+        run(L"touch %ls/file1.fish", p1.c_str());
+        run(L"touch %ls/file2.fish", p2.c_str());
+        autoload.invalidate_cache();
+
+        do_test(!autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
+        autoload.mark_autoload_finished(L"file1");
+        do_test(!autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
+
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.resolve_command(L"file2", paths));
+        do_test(!autoload.resolve_command(L"file2", paths));
+        autoload.mark_autoload_finished(L"file2");
+        do_test(!autoload.resolve_command(L"file2", paths));
+        do_test((autoload.get_autoloaded_commands() == wcstring_list_t{L"file1", L"file2"}));
+
+        autoload.clear();
+        do_test(autoload.resolve_command(L"file1", paths));
+        autoload.mark_autoload_finished(L"file1");
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.resolve_command(L"file2", paths));
+        do_test(!autoload.resolve_command(L"file2", paths));
+        autoload.mark_autoload_finished(L"file2");
+
+        do_test(!autoload.resolve_command(L"file1", paths));
+        run(L"touch %ls/file1.fish", p1.c_str());
+        autoload.invalidate_cache();
+        do_test(autoload.resolve_command(L"file1", paths));
+        autoload.mark_autoload_finished(L"file1");
+    }
+};
+
+static void test_autoload() {
+    say(L"Testing autoload");
+    autoload_tester_t::run_test();
+}
+
 static void test_complete() {
     say(L"Testing complete");
 
@@ -5289,6 +5358,7 @@ int main(int argc, char **argv) {
     if (should_test_function("is_potential_path")) test_is_potential_path();
     if (should_test_function("colors")) test_colors();
     if (should_test_function("complete")) test_complete();
+    if (should_test_function("autoload")) test_autoload();
     if (should_test_function("input")) test_input();
     if (should_test_function("line_iterator")) test_line_iterator();
     if (should_test_function("universal")) test_universal();

From 2507162f805db9f864b290e77efc34182b170c2c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 27 Apr 2019 20:14:06 -0700
Subject: [PATCH 0420/1732] Revert "Add a test for autoload_t"

This reverts commit 51c62d6cc66757c4b1ca620103935d75bd4aa1ed.

Back out the test while I attempt to fix it
---
 src/autoload.cpp   | 13 ++-------
 src/autoload.h     | 14 +---------
 src/fish_tests.cpp | 70 ----------------------------------------------
 3 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index b53c0d827..bf6828232 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -144,11 +144,6 @@ autoload_t::autoload_t(wcstring env_var_name)
 autoload_t::autoload_t(autoload_t &&) = default;
 autoload_t::~autoload_t() = default;
 
-void autoload_t::invalidate_cache() {
-    auto cache = make_unique<autoload_file_cache_t>(cache_->dirs());
-    cache_ = std::move(cache);
-}
-
 bool autoload_t::can_autoload(const wcstring &cmd) {
     return cache_->check(cmd, true /* allow stale */).has_value();
 }
@@ -165,17 +160,15 @@ wcstring_list_t autoload_t::get_autoloaded_commands() const {
 }
 
 maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const environment_t &env) {
-    maybe_t<env_var_t> mvar = env.get(env_var_name_);
-    return resolve_command(cmd, mvar ? mvar->as_list() : wcstring_list_t{});
-}
-
-maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const wcstring_list_t &paths) {
     // Are we currently in the process of autoloading this?
     if (current_autoloading_.count(cmd) > 0) return none();
 
     // Check to see if our paths have changed. If so, replace our cache.
     // Note we don't have to modify autoloadable_files_. We'll naturally detect if those have
     // changed when we query the cache.
+    maybe_t<env_var_t> mvar = env.get(env_var_name_);
+    const wcstring_list_t empty;
+    const wcstring_list_t &paths = mvar ? mvar->as_list() : empty;
     if (paths != cache_->dirs()) {
         cache_ = make_unique<autoload_file_cache_t>(paths);
     }
diff --git a/src/autoload.h b/src/autoload.h
index 13b8aa3f1..2daed1a45 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -15,7 +15,6 @@
 
 class autoload_file_cache_t;
 class environment_t;
-struct autoload_tester_t;
 
 /// autoload_t is a class that knows how to autoload .fish files from a list of directories. This
 /// is used by autoloading functions and completions. It maintains a file cache, which is
@@ -39,16 +38,6 @@ class autoload_t {
     /// changes. This is never null (but it may be a cache with no paths).
     std::unique_ptr<autoload_file_cache_t> cache_;
 
-    /// Invalidate any underlying cache.
-    /// This is exposed for testing.
-    void invalidate_cache();
-
-    /// Like resolve_autoload(), but accepts the paths directly.
-    /// This is exposed for testing.
-    maybe_t<wcstring> resolve_command(const wcstring &cmd, const wcstring_list_t &paths);
-
-    friend autoload_tester_t;
-
    public:
     /// Construct an autoloader that loads from the paths given by \p env_var_name.
     explicit autoload_t(wcstring env_var_name);
@@ -87,8 +76,7 @@ class autoload_t {
     /// This does not actually mark the command as being autoloaded.
     bool can_autoload(const wcstring &cmd);
 
-    /// \return the names of all commands that have been autoloaded. Note this includes "in-flight"
-    /// commands.
+    /// \return the names of all commands that have been autoloaded.
     wcstring_list_t get_autoloaded_commands() const;
 
     /// Mark that all autoloaded files have been forgotten.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e360eaaa2..fa293f8dd 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -38,7 +38,6 @@
 #include <utility>
 #include <vector>
 
-#include "autoload.h"
 #include "builtin.h"
 #include "color.h"
 #include "common.h"
@@ -2473,74 +2472,6 @@ static void test_colors() {
     do_test(rgb_color_t(L"mooganta").is_none());
 }
 
-// This class allows accessing private bits of autoload_t.
-struct autoload_tester_t {
-    static void run(const wchar_t *fmt, ...) {
-        va_list va;
-        va_start(va, fmt);
-        wcstring cmd = vformat_string(fmt, va);
-        va_end(va);
-
-        int status = system(wcs2string(cmd).c_str());
-        do_test(status == 0);
-    }
-
-    static void run_test() {
-        char t1[] = "/tmp/fish_test_autoload.XXXXXX";
-        wcstring p1 = str2wcstring(mkdtemp(t1));
-        char t2[] = "/tmp/fish_test_autoload.XXXXXX";
-        wcstring p2 = str2wcstring(mkdtemp(t2));
-
-        const wcstring_list_t paths = {p1, p2};
-
-        autoload_t autoload(L"test_var");
-        do_test(!autoload.resolve_command(L"file1", paths));
-        do_test(!autoload.resolve_command(L"nothing", paths));
-        do_test(autoload.get_autoloaded_commands().empty());
-
-        run(L"touch %ls/file1.fish", p1.c_str());
-        run(L"touch %ls/file2.fish", p2.c_str());
-        autoload.invalidate_cache();
-
-        do_test(!autoload.autoload_in_progress(L"file1"));
-        do_test(autoload.resolve_command(L"file1", paths));
-        do_test(!autoload.resolve_command(L"file1", paths));
-        do_test(autoload.autoload_in_progress(L"file1"));
-        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
-        autoload.mark_autoload_finished(L"file1");
-        do_test(!autoload.autoload_in_progress(L"file1"));
-        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
-
-        do_test(!autoload.resolve_command(L"file1", paths));
-        do_test(!autoload.resolve_command(L"nothing", paths));
-        do_test(autoload.resolve_command(L"file2", paths));
-        do_test(!autoload.resolve_command(L"file2", paths));
-        autoload.mark_autoload_finished(L"file2");
-        do_test(!autoload.resolve_command(L"file2", paths));
-        do_test((autoload.get_autoloaded_commands() == wcstring_list_t{L"file1", L"file2"}));
-
-        autoload.clear();
-        do_test(autoload.resolve_command(L"file1", paths));
-        autoload.mark_autoload_finished(L"file1");
-        do_test(!autoload.resolve_command(L"file1", paths));
-        do_test(!autoload.resolve_command(L"nothing", paths));
-        do_test(autoload.resolve_command(L"file2", paths));
-        do_test(!autoload.resolve_command(L"file2", paths));
-        autoload.mark_autoload_finished(L"file2");
-
-        do_test(!autoload.resolve_command(L"file1", paths));
-        run(L"touch %ls/file1.fish", p1.c_str());
-        autoload.invalidate_cache();
-        do_test(autoload.resolve_command(L"file1", paths));
-        autoload.mark_autoload_finished(L"file1");
-    }
-};
-
-static void test_autoload() {
-    say(L"Testing autoload");
-    autoload_tester_t::run_test();
-}
-
 static void test_complete() {
     say(L"Testing complete");
 
@@ -5358,7 +5289,6 @@ int main(int argc, char **argv) {
     if (should_test_function("is_potential_path")) test_is_potential_path();
     if (should_test_function("colors")) test_colors();
     if (should_test_function("complete")) test_complete();
-    if (should_test_function("autoload")) test_autoload();
     if (should_test_function("input")) test_input();
     if (should_test_function("line_iterator")) test_line_iterator();
     if (should_test_function("universal")) test_universal();

From 3c9f95594a606803ab2bff70243a3e959fc4ae13 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 11:41:37 -0700
Subject: [PATCH 0421/1732] Update Dockerfile for cmake3

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3a5ac8150..02728cb63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,8 @@ FROM centos:latest
 
 # Build dependency
 RUN yum update -y &&\
-  yum install -y clang cmake gcc-c++ make ncurses-devel &&\
+  yum install -y epel-release &&\
+  yum install -y clang cmake3 gcc-c++ make ncurses-devel &&\
   yum clean all
 
 # Test dependency
@@ -12,7 +13,7 @@ ADD . /src
 WORKDIR /src
 
 # Build fish
-RUN cmake . &&\
+RUN cmake3 . &&\
   make &&\
   make install
 

From d8ac051f892290f9ac1040b511dec502008dd79d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 14:06:03 -0700
Subject: [PATCH 0422/1732] Move selection_direction_t to pager.h and make it a
 class enum

---
 src/common.h       | 18 -------------
 src/fish_tests.cpp | 54 +++++++++++++++++++-------------------
 src/pager.cpp      | 64 +++++++++++++++++++++++-----------------------
 src/pager.h        | 19 +++++++++++++-
 src/reader.cpp     | 31 +++++++++++-----------
 5 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/src/common.h b/src/common.h
index 8f970db6f..6b4f33796 100644
--- a/src/common.h
+++ b/src/common.h
@@ -137,24 +137,6 @@ enum {
 };
 typedef unsigned int escape_flags_t;
 
-// Directions.
-enum selection_direction_t {
-    // Visual directions.
-    direction_north,
-    direction_east,
-    direction_south,
-    direction_west,
-    direction_page_north,
-    direction_page_south,
-
-    // Logical directions.
-    direction_next,
-    direction_prev,
-
-    // Special value that means deselect.
-    direction_deselect
-};
-
 /// Issue a debug message with printf-style string formating and automatic line breaking. The string
 /// will begin with the string \c program_name, followed by a colon and a whitespace.
 ///
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index fa293f8dd..f47e244d7 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1977,47 +1977,47 @@ static void test_pager_navigation() {
 
     // Here are navigation directions and where we expect the selection to be.
     const struct {
-        selection_direction_t dir;
+        selection_motion_t dir;
         size_t sel;
     } cmds[] = {
         // Tab completion to get into the list.
-        {direction_next, 0},
+        {selection_motion_t::next, 0},
 
         // Westward motion in upper left goes to the last filled column in the last row.
-        {direction_west, 15},
+        {selection_motion_t::west, 15},
         // East goes back.
-        {direction_east, 0},
+        {selection_motion_t::east, 0},
 
         // "Next" motion goes down the column.
-        {direction_next, 1},
-        {direction_next, 2},
+        {selection_motion_t::next, 1},
+        {selection_motion_t::next, 2},
 
-        {direction_west, 17},
-        {direction_east, 2},
-        {direction_east, 6},
-        {direction_east, 10},
-        {direction_east, 14},
-        {direction_east, 18},
+        {selection_motion_t::west, 17},
+        {selection_motion_t::east, 2},
+        {selection_motion_t::east, 6},
+        {selection_motion_t::east, 10},
+        {selection_motion_t::east, 14},
+        {selection_motion_t::east, 18},
 
-        {direction_west, 14},
-        {direction_east, 18},
+        {selection_motion_t::west, 14},
+        {selection_motion_t::east, 18},
 
         // Eastward motion wraps back to the upper left, westward goes to the prior column.
-        {direction_east, 3},
-        {direction_east, 7},
-        {direction_east, 11},
-        {direction_east, 15},
+        {selection_motion_t::east, 3},
+        {selection_motion_t::east, 7},
+        {selection_motion_t::east, 11},
+        {selection_motion_t::east, 15},
 
         // Pages.
-        {direction_page_north, 12},
-        {direction_page_south, 15},
-        {direction_page_north, 12},
-        {direction_east, 16},
-        {direction_page_south, 18},
-        {direction_east, 3},
-        {direction_north, 2},
-        {direction_page_north, 0},
-        {direction_page_south, 3},
+        {selection_motion_t::page_north, 12},
+        {selection_motion_t::page_south, 15},
+        {selection_motion_t::page_north, 12},
+        {selection_motion_t::east, 16},
+        {selection_motion_t::page_south, 18},
+        {selection_motion_t::east, 3},
+        {selection_motion_t::north, 2},
+        {selection_motion_t::page_north, 0},
+        {selection_motion_t::page_south, 3},
 
     };
     for (size_t i = 0; i < sizeof cmds / sizeof *cmds; i++) {
diff --git a/src/pager.cpp b/src/pager.cpp
index d8f8da40b..ddc357738 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -39,24 +39,24 @@ typedef std::vector<comp_t> comp_info_list_t;
 /// Text we use for the search field.
 #define SEARCH_FIELD_PROMPT _(L"search: ")
 
-inline bool selection_direction_is_cardinal(selection_direction_t dir) {
+inline bool selection_direction_is_cardinal(selection_motion_t dir) {
     switch (dir) {
-        case direction_north:
-        case direction_east:
-        case direction_south:
-        case direction_west:
-        case direction_page_north:
-        case direction_page_south: {
+        case selection_motion_t::north:
+        case selection_motion_t::east:
+        case selection_motion_t::south:
+        case selection_motion_t::west:
+        case selection_motion_t::page_north:
+        case selection_motion_t::page_south: {
             return true;
         }
-        case direction_next:
-        case direction_prev:
-        case direction_deselect: {
+        case selection_motion_t::next:
+        case selection_motion_t::prev:
+        case selection_motion_t::deselect: {
             return false;
         }
     }
 
-    DIE("should never reach this statement");
+    DIE("unreachable");
 }
 
 /// Returns numer / denom, rounding up. As a "courtesy" 0/0 is 0.
@@ -601,7 +601,7 @@ pager_t::pager_t()
 
 bool pager_t::empty() const { return unfiltered_completion_infos.empty(); }
 
-bool pager_t::select_next_completion_in_direction(selection_direction_t direction,
+bool pager_t::select_next_completion_in_direction(selection_motion_t direction,
                                                   const page_rendering_t &rendering) {
     // Must have something to select.
     if (this->completion_infos.empty()) {
@@ -611,24 +611,24 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
     // Handle the case of nothing selected yet.
     if (selected_completion_idx == PAGER_SELECTION_NONE) {
         switch (direction) {
-            case direction_south:
-            case direction_page_south:
-            case direction_next:
-            case direction_north:
-            case direction_prev: {
+            case selection_motion_t::south:
+            case selection_motion_t::page_south:
+            case selection_motion_t::next:
+            case selection_motion_t::north:
+            case selection_motion_t::prev: {
                 // These directions do something sane.
-                if (direction == direction_prev
-                    || direction == direction_north) {
+                if (direction == selection_motion_t::prev ||
+                    direction == selection_motion_t::north) {
                     selected_completion_idx = completion_infos.size() - 1;
                 } else {
                     selected_completion_idx = 0;
                 }
                 return true;
             }
-            case direction_page_north:
-            case direction_east:
-            case direction_west:
-            case direction_deselect: {
+            case selection_motion_t::page_north:
+            case selection_motion_t::east:
+            case selection_motion_t::west:
+            case selection_motion_t::deselect: {
                 // These do nothing.
                 return false;
             }
@@ -639,14 +639,14 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
     size_t new_selected_completion_idx;
     if (!selection_direction_is_cardinal(direction)) {
         // Next, previous, or deselect, all easy.
-        if (direction == direction_deselect) {
+        if (direction == selection_motion_t::deselect) {
             new_selected_completion_idx = PAGER_SELECTION_NONE;
-        } else if (direction == direction_next) {
+        } else if (direction == selection_motion_t::next) {
             new_selected_completion_idx = selected_completion_idx + 1;
             if (new_selected_completion_idx >= completion_infos.size()) {
                 new_selected_completion_idx = 0;
             }
-        } else if (direction == direction_prev) {
+        } else if (direction == selection_motion_t::prev) {
             if (selected_completion_idx == 0) {
                 new_selected_completion_idx = completion_infos.size() - 1;
             } else {
@@ -662,7 +662,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
         size_t page_height = std::max(rendering.term_height - 1, (size_t)1);
 
         switch (direction) {
-            case direction_page_north: {
+            case selection_motion_t::page_north: {
                 if (current_row > page_height) {
                     current_row = current_row - page_height;
                 } else {
@@ -670,7 +670,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
                 }
                 break;
             }
-            case direction_north: {
+            case selection_motion_t::north: {
                 // Go up a whole row. If we cycle, go to the previous column.
                 if (current_row > 0) {
                     current_row--;
@@ -684,7 +684,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
                 }
                 break;
             }
-            case direction_page_south: {
+            case selection_motion_t::page_south: {
                 if (current_row + page_height < rendering.rows) {
                     current_row += page_height;
                 } else {
@@ -695,7 +695,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
                 }
                 break;
             }
-            case direction_south: {
+            case selection_motion_t::south: {
                 // Go down, unless we are in the last row.
                 // If we go over the last element, wrap to the first.
                 if (current_row + 1 < rendering.rows &&
@@ -707,7 +707,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
                 }
                 break;
             }
-            case direction_east: {
+            case selection_motion_t::east: {
                 // Go east, wrapping to the next row. There is no "row memory," so if we run off the
                 // end, wrap.
                 if (current_col + 1 < rendering.cols &&
@@ -719,7 +719,7 @@ bool pager_t::select_next_completion_in_direction(selection_direction_t directio
                 }
                 break;
             }
-            case direction_west: {
+            case selection_motion_t::west: {
                 // Go west, wrapping to the previous row.
                 if (current_col > 0) {
                     current_col--;
diff --git a/src/pager.h b/src/pager.h
index 1d1571fb3..dcf0b186c 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -36,6 +36,23 @@ class page_rendering_t {
     page_rendering_t();
 };
 
+enum class selection_motion_t {
+    // Visual directions.
+    north,
+    east,
+    south,
+    west,
+    page_north,
+    page_south,
+
+    // Logical directions.
+    next,
+    prev,
+
+    // Special value that means deselect.
+    deselect
+};
+
 // The space between adjacent completions.
 #define PAGER_SPACER_STRING L"  "
 #define PAGER_SPACER_STRING_WIDTH 2
@@ -136,7 +153,7 @@ class pager_t {
 
     // Changes the selected completion in the given direction according to the layout of the given
     // rendering. Returns true if the selection changed.
-    bool select_next_completion_in_direction(selection_direction_t direction,
+    bool select_next_completion_in_direction(selection_motion_t direction,
                                              const page_rendering_t &rendering);
 
     // Returns the currently selected completion for the given rendering.
diff --git a/src/reader.cpp b/src/reader.cpp
index d7a43da5d..a780035c9 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -447,7 +447,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     void handle_readline_command(readline_cmd_t cmd, readline_loop_state_t &rls);
 
     void clear_pager();
-    void select_completion_in_direction(enum selection_direction_t dir);
+    void select_completion_in_direction(selection_motion_t dir);
     void flash();
 
     void mark_repaint_needed() { repaint_needed = true; }
@@ -1410,7 +1410,7 @@ void reader_data_t::clear_pager() {
     mark_repaint_needed();
 }
 
-void reader_data_t::select_completion_in_direction(enum selection_direction_t dir) {
+void reader_data_t::select_completion_in_direction(selection_motion_t dir) {
     bool selection_changed = pager.select_next_completion_in_direction(dir, current_page_rendering);
     if (selection_changed) {
         pager_selection_changed();
@@ -2535,8 +2535,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                     pager.set_fully_disclosed(true);
                     reader_repaint_needed();
                 } else {
-                    select_completion_in_direction(c == rl::complete ? direction_next
-                                                                       : direction_prev);
+                    select_completion_in_direction(c == rl::complete ? selection_motion_t::next
+                                                                     : selection_motion_t::prev);
                 }
             } else {
                 // Either the user hit tab only once, or we had no visible completion list.
@@ -2601,7 +2601,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Show the search field if requested and if we printed a list of completions.
                 if (c == rl::complete_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
                     pager.set_search_field_shown(true);
-                    select_completion_in_direction(direction_next);
+                    select_completion_in_direction(selection_motion_t::next);
                     reader_repaint_needed();
                 }
             }
@@ -2614,7 +2614,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 pager.set_search_field_shown(!sfs);
                 pager.set_fully_disclosed(true);
                 if (pager.is_search_field_shown() && !is_navigating_pager_contents()) {
-                    select_completion_in_direction(direction_south);
+                    select_completion_in_direction(selection_motion_t::south);
                 }
                 reader_repaint_needed();
             }
@@ -2848,7 +2848,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::backward_char: {
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
-                select_completion_in_direction(direction_west);
+                select_completion_in_direction(selection_motion_t::west);
             } else if (el->position > 0) {
                 update_buff_pos(el, el->position - 1);
                 reader_repaint_needed();
@@ -2858,7 +2858,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::forward_char: {
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
-                select_completion_in_direction(direction_east);
+                select_completion_in_direction(selection_motion_t::east);
             } else if (el->position < el->size()) {
                 update_buff_pos(el, el->position + 1);
                 reader_repaint_needed();
@@ -2916,7 +2916,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::end_of_history: {
             bool up = (c == rl::beginning_of_history);
             if (is_navigating_pager_contents()) {
-                select_completion_in_direction(up ? direction_page_north : direction_page_south);
+                select_completion_in_direction(up ? selection_motion_t::page_north
+                                                  : selection_motion_t::page_south);
             } else {
                 if (up) {
                     history_search.go_to_beginning();
@@ -2931,24 +2932,24 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::down_line: {
             if (is_navigating_pager_contents()) {
                 // We are already navigating pager contents.
-                selection_direction_t direction;
+                selection_motion_t direction;
                 if (c == rl::down_line) {
                     // Down arrow is always south.
-                    direction = direction_south;
+                    direction = selection_motion_t::south;
                 } else if (selection_is_at_top()) {
                     // Up arrow, but we are in the first column and first row. End navigation.
-                    direction = direction_deselect;
+                    direction = selection_motion_t::deselect;
                 } else {
                     // Up arrow, go north.
-                    direction = direction_north;
+                    direction = selection_motion_t::north;
                 }
 
                 // Now do the selection.
                 select_completion_in_direction(direction);
             } else if (!pager.empty()) {
                 // We pressed a direction with a non-empty pager, begin navigation.
-                select_completion_in_direction(c == rl::down_line ? direction_south
-                                                                    : direction_north);
+                select_completion_in_direction(c == rl::down_line ? selection_motion_t::south
+                                                                  : selection_motion_t::north);
             } else {
                 // Not navigating the pager contents.
                 editable_line_t *el = active_edit_line();

From 8c9359fdd4c9e318edb969690a3e3cc3c22460a9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 6 Mar 2019 19:51:59 +0100
Subject: [PATCH 0423/1732] src/builtin_argparse: Add --ignore-unknown flag

This keeps all unknown options in $argv, so

```fish
argparse -i a/alpha -- -a banana -o val -w
```

results in $_flag_a set to banana, and $argv set to `-o val -w`.

This allows users to use multiple argparse passes, or to simply avoid
specifying all options e.g. in completions - `systemctl` has 46 of
them, most not having any effect on the completions.

Fixes #5367.
---
 CHANGELOG.md                     |  1 +
 sphinx_doc_src/cmds/argparse.rst |  2 ++
 src/builtin_argparse.cpp         | 38 +++++++++++++++++++++++++-------
 tests/argparse.err               |  3 +++
 tests/argparse.in                |  7 ++++++
 tests/argparse.out               |  5 +++++
 6 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f154ff7..71f26eb6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
+- `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index d930a07cc..ec79b444f 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -33,6 +33,8 @@ The following ``argparse`` options are available. They must appear before all OP
 
 - ``-X`` or ``--max-args`` is followed by an integer that defines 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.
+
 - ``-s`` or ``--stop-nonopt`` causes scanning the arguments to stop as soon as the first non-option argument is seen. Using this arg is equivalent to calling the C function ``getopt_long()`` with the short options starting with a ``+`` symbol. This is sometimes known as "POSIXLY CORRECT". If this flag is not used then arguments are reordered (i.e., permuted) so that all non-option arguments are moved after option arguments. This mode has several uses but the main one is to implement a command that has subcommands.
 
 - ``-h`` or ``--help`` displays help about using this command.
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index a8316a31c..54e129c36 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -44,6 +44,7 @@ struct option_spec_t {
 using option_spec_ref_t = std::unique_ptr<option_spec_t>;
 
 struct argparse_cmd_opts_t {
+    bool ignore_unknown = false;
     bool print_help = false;
     bool stop_nonopt = false;
     size_t min_args = 0;
@@ -57,8 +58,9 @@ struct argparse_cmd_opts_t {
     std::vector<std::vector<wchar_t>> exclusive_flag_sets;
 };
 
-static const wchar_t *const short_options = L"+:hn:sx:N:X:";
+static const wchar_t *const short_options = L"+:hn:six:N:X:";
 static const struct woption long_options[] = {{L"stop-nonopt", no_argument, NULL, 's'},
+                                              {L"ignore-unknown", no_argument, NULL, 'i'},
                                               {L"name", required_argument, NULL, 'n'},
                                               {L"exclusive", required_argument, NULL, 'x'},
                                               {L"help", no_argument, NULL, 'h'},
@@ -352,6 +354,10 @@ static int parse_cmd_opts(argparse_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                 opts.stop_nonopt = true;
                 break;
             }
+            case 'i': {
+                opts.ignore_unknown = true;
+                break;
+            }
             case 'x': {
                 // Just save the raw string here. Later, when we have all the short and long flag
                 // definitions we'll parse these strings into a more useful data structure.
@@ -536,7 +542,7 @@ static int handle_flag(parser_t &parser, const argparse_cmd_opts_t &opts, option
     return STATUS_CMD_OK;
 }
 
-static int argparse_parse_flags(parser_t &parser, const argparse_cmd_opts_t &opts,
+static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
                                 const wchar_t *short_options, const woption *long_options,
                                 const wchar_t *cmd, int argc, wchar_t **argv, int *optind,
                                 io_streams_t &streams) {
@@ -547,16 +553,14 @@ static int argparse_parse_flags(parser_t &parser, const argparse_cmd_opts_t &opt
         if (opt == ':') {
             builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
             return STATUS_INVALID_ARGS;
-        }
-
-        if (opt == '?') {
+        } else if (opt == '?') {
             // It's not a recognized flag. See if it's an implicit int flag.
             const wchar_t *arg_contents = argv[w.woptind - 1] + 1;
             int retval = STATUS_CMD_OK;
             if (is_implicit_int(opts, arg_contents)) {
                 retval = validate_and_store_implicit_int(parser, opts, arg_contents, w, long_idx,
                                                          streams);
-            } else {
+            } else if (!opts.ignore_unknown) {
                 streams.err.append_format(BUILTIN_ERR_UNKNOWN, cmd, argv[w.woptind - 1]);
                 // We don't use builtin_print_error_trailer as that
                 // says to use the cmd help,
@@ -565,12 +569,25 @@ static int argparse_parse_flags(parser_t &parser, const argparse_cmd_opts_t &opt
                 // Plus this particular error is not an error in argparse usage.
                 streams.err.append(parser.current_line());
                 retval = STATUS_INVALID_ARGS;
+            } else {
+                // Any unrecognized option is put back if ignore_unknown is used.
+                // This allows reusing the same argv in multiple argparse calls,
+                // or just ignoring the error (e.g. in completions).
+                opts.argv.push_back(arg_contents - 1);
             }
             if (retval != STATUS_CMD_OK) return retval;
             long_idx = -1;
             continue;
+        } else if (opt == 1) {
+            // A non-option argument.
+            // We use `-` as the first option-string-char to disable GNU getopt's reordering,
+            // otherwise we'd get ignored options first and normal arguments later.
+            // E.g. `argparse -i -- -t tango -w` needs to keep `-t tango -w` in $argv, not `-t -w tango`.
+            opts.argv.push_back(argv[w.woptind - 1]);
+            continue;
         }
 
+
         // It's a recognized flag.
         auto found = opts.options.find(opt);
         assert(found != opts.options.end());
@@ -591,7 +608,8 @@ static int argparse_parse_args(argparse_cmd_opts_t &opts, const wcstring_list_t
                                parser_t &parser, io_streams_t &streams) {
     if (args.empty()) return STATUS_CMD_OK;
 
-    wcstring short_options = opts.stop_nonopt ? L"+:" : L":";
+    // "+" means stop at nonopt, "-" means give nonoptions the option character code `1`, and don't reorder.
+    wcstring short_options = opts.stop_nonopt ? L"+:" : L"-";
     std::vector<woption> long_options;
     populate_option_strings(opts, &short_options, &long_options);
 
@@ -614,7 +632,11 @@ static int argparse_parse_args(argparse_cmd_opts_t &opts, const wcstring_list_t
     retval = check_for_mutually_exclusive_flags(opts, streams);
     if (retval != STATUS_CMD_OK) return retval;
 
-    for (int i = optind; argv[i]; i++) opts.argv.push_back(argv[i]);
+    if (opts.stop_nonopt) {
+        for (int i = optind; argv[i]; i++) {
+            opts.argv.push_back(argv[i]);
+        }
+    }
 
     return STATUS_CMD_OK;
 }
diff --git a/tests/argparse.err b/tests/argparse.err
index 894d07d74..a2e81c6d6 100644
--- a/tests/argparse.err
+++ b/tests/argparse.err
@@ -112,3 +112,6 @@ Standard input (line 353):
     argparse a/alpha -- --banana
     ^
 in function 'notargparse'
+
+####################
+# Ignoring unknown options
diff --git a/tests/argparse.in b/tests/argparse.in
index ce33d1a9d..84e8ed378 100644
--- a/tests/argparse.in
+++ b/tests/argparse.in
@@ -179,3 +179,10 @@ end
 notargparse
 
 true
+
+logmsg Ignoring unknown options
+argparse -i a=+ b=+ -- -a alpha -b bravo -t tango -a aaaa --wurst
+or echo unexpected argparse return status $status >&2
+# The unknown options are removed _entirely_.
+echo $argv
+echo $_flag_a
diff --git a/tests/argparse.out b/tests/argparse.out
index b1565bb6c..68b155242 100644
--- a/tests/argparse.out
+++ b/tests/argparse.out
@@ -132,3 +132,8 @@ expected argparse return status 57
 
 ####################
 # Errors use function name by default
+
+####################
+# Ignoring unknown options
+-t tango --wurst
+alpha aaaa

From 43929ced90692cce25f080144b55e161328211e3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 29 Apr 2019 16:55:12 +0200
Subject: [PATCH 0424/1732] src/builtin_argparse: Work around wgetopt crash

If on the last argument, and it was an unrecognized option, we can't
call `wgetopt_long()` again, or it'll crash.
---
 src/builtin_argparse.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 54e129c36..3b38c0e0b 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -574,6 +574,8 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
                 // This allows reusing the same argv in multiple argparse calls,
                 // or just ignoring the error (e.g. in completions).
                 opts.argv.push_back(arg_contents - 1);
+                // Work around weirdness with wgetopt, which crashes if we `continue` here.
+                if (w.woptind == argc) break;
             }
             if (retval != STATUS_CMD_OK) return retval;
             long_idx = -1;

From 389f5074ad88861bd0b7584cbc8b21199fe0ff48 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 29 Apr 2019 17:03:16 +0200
Subject: [PATCH 0425/1732] Add test for argparse crash

43929ced9
---
 tests/argparse.err | 3 +++
 tests/argparse.in  | 3 +++
 tests/argparse.out | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/tests/argparse.err b/tests/argparse.err
index a2e81c6d6..14120e58e 100644
--- a/tests/argparse.err
+++ b/tests/argparse.err
@@ -115,3 +115,6 @@ in function 'notargparse'
 
 ####################
 # Ignoring unknown options
+
+####################
+# Check for crash when last option is unknown
diff --git a/tests/argparse.in b/tests/argparse.in
index 84e8ed378..3b9c0d811 100644
--- a/tests/argparse.in
+++ b/tests/argparse.in
@@ -186,3 +186,6 @@ or echo unexpected argparse return status $status >&2
 # The unknown options are removed _entirely_.
 echo $argv
 echo $_flag_a
+
+logmsg Check for crash when last option is unknown
+argparse -i b/break -- "-b kubectl get pods -l name=foo"
diff --git a/tests/argparse.out b/tests/argparse.out
index 68b155242..2a1f9b8c7 100644
--- a/tests/argparse.out
+++ b/tests/argparse.out
@@ -137,3 +137,6 @@ expected argparse return status 57
 # Ignoring unknown options
 -t tango --wurst
 alpha aaaa
+
+####################
+# Check for crash when last option is unknown

From 52450dc8645634119d3a86756d427fd372166c94 Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Fri, 15 Jun 2018 09:30:17 +0200
Subject: [PATCH 0426/1732] completions/emaint: fix logs command

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

diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index 94130e50d..129ffa465 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -18,11 +18,11 @@ complete -c emaint -n '__fish_use_subcommand' -xa 'sync'        -d 'Check repos.
 complete -c emaint -n '__fish_use_subcommand' -xa 'world'       -d 'Check and fix problems in the world file'
 
 ## Local opts
-# cleanlogs
-complete -c emaint -n '__fish_seen_subcommand_from cleanlogs' -s t -l time      -d "Delete logs older than NUM of days" \
+# logs
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time      -d "Delete logs older than NUM of days" \
 	-xa "(seq 0 365)"
-complete -c emaint -n '__fish_seen_subcommand_from cleanlogs' -s p -l pretend   -d "Output logs that would be deleted"
-complete -c emaint -n '__fish_seen_subcommand_from cleanlogs' -s C -l clean     -d "Cleans out logs more than 7 days old"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend   -d "Output logs that would be deleted"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean     -d "Cleans out logs more than 7 days old"
 # sync
 complete -c emaint -n '__fish_seen_subcommand_from sync' -s a -l auto          	-d "Sync auto-sync enabled repos only"
 complete -c emaint -n '__fish_seen_subcommand_from sync' -s A -l allrepos      	-d "Sync all repos that have a sync-url defined"

From 34f50883a456249e26234100d956ee40f7de443f Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Fri, 15 Jun 2018 09:30:56 +0200
Subject: [PATCH 0427/1732] completions/ebuild: add pretend command

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

diff --git a/share/completions/ebuild.fish b/share/completions/ebuild.fish
index 4ef230e8f..dd19665e7 100644
--- a/share/completions/ebuild.fish
+++ b/share/completions/ebuild.fish
@@ -12,6 +12,7 @@ complete -c ebuild -l skip-manifest	-d "Skip all manifest checks"
 
 ## Subcommands
 complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help'        -d "Show help"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend'     -d "Run pkg_pretend()"
 complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup'       -d "Run setup and system checks"
 complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean'       -d "Clean build dir"
 complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch'       -d "Fetches all files from SRC_URI"

From d0c3a4f33fa7877f78d7ba74b07e492f4ba9a152 Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Fri, 15 Jun 2018 09:31:37 +0200
Subject: [PATCH 0428/1732] completions/equery: shorten descriptions

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

diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index add3e4e49..4e07b1a7c 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -46,7 +46,7 @@ complete -c equery -n '__fish_seen_subcommand_from k check f files s size' \
 
 ## Local opts
 # belongs
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex        -d "Supplied query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex        -d "Query is a regex"
 complete -c equery -n '__fish_seen_subcommand_from b belongs' -s e -l early-out         -d "Stop after first match"
 complete -c equery -n '__fish_seen_subcommand_from b belongs' -s n -l name-only         -d "Omit version"
 
@@ -59,7 +59,7 @@ complete -c equery -n '__fish_seen_subcommand_from c changes'      -l limit
 #complete -c equery -n '__fish_seen_subcommand_from c changes'      -l to=VER            -d "Set which version to display to"
 
 # check
-complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex        -d "Query is a regular expression"
+complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex        -d "Query is a regex"
 complete -c equery -n '__fish_seen_subcommand_from k check' -s o -l only-failures     -d "Only display pkgs that do not pass"
 
 # depends
@@ -99,7 +99,7 @@ complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s p -l porta
 # list
 complete -c equery -n '__fish_seen_subcommand_from l list' -s d -l duplicates        -d "List only installed duplicate pkgs"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s b -l binpkgs-missing   -d "List only installed pkgs without a corresponding binary pkg"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex        -d "Query is a regular expression"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex        -d "Query is a regex"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s m -l mask-reason       -d "Include reason for pkg mask"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s I -l exclude-installed -d "Exclude installed pkgs from output"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s o -l overlay-tree      -d "List pkgs in overlays"
@@ -111,7 +111,7 @@ complete -c equery -n '__fish_seen_subcommand_from l list; and     __fish_contai
 	-xa "(__fish_portage_print_available_pkgs)"
 
 # meta
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description       -d "Show an extended pkg description"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description       -d "Show extended pkg description"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd              -d "Show pkg's herd(s)"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords          -d "Show keywords for all matching pkg versions"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license           -d "Show licenses for the best maching version"
@@ -123,12 +123,12 @@ complete -c equery -n '__fish_seen_subcommand_from m meta' -s x -l xml
 
 # size
 complete -c equery -n '__fish_seen_subcommand_from s size' -s b -l bytes             -d "Report size in bytes"
-complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex        -d "Query is a regular expression"
+complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex        -d "Query is a regex"
 
 # uses
 complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all               -d "Include all pkg versions"
 complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n       -d "Don't show l10n USE flags"
 
 # which
-complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked    -d "Return highest version ebuild available"
-complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild            -d "Print the ebuild"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked      -d "Return highest version ebuild available"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild              -d "Print the ebuild"

From 1b3643270dc3f86b4922d290940b50a4fc592bc8 Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Sun, 3 Mar 2019 10:17:12 +0100
Subject: [PATCH 0429/1732] completions/epkginfo: add completion

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

diff --git a/share/completions/epkginfo.fish b/share/completions/epkginfo.fish
new file mode 100644
index 000000000..4d766c555
--- /dev/null
+++ b/share/completions/epkginfo.fish
@@ -0,0 +1,12 @@
+complete -c epkginfo -xa "(__fish_portage_print_available_pkgs)"
+## Opts
+complete -c epkginfo -s h -l help               -d "display help"
+complete -c epkginfo -s d -l description        -d "extended pkg description"
+complete -c epkginfo -s H -l herd               -d "herd(s) for the pkg"
+complete -c epkginfo -s k -l keywords           -d "keywords for all matching pkg versions"
+complete -c epkginfo -s l -l license            -d "licenses for the best maching version"
+complete -c epkginfo -s m -l maintainer         -d "maintainer(s) for the pkg"
+complete -c epkginfo -s S -l stablreq           -d "STABLEREQ arches (cc's) for all matching pkg versio"
+complete -c epkginfo -s u -l useflags           -d "per-pkg USE flag descriptions"
+complete -c epkginfo -s U -l upstream           -d "pkg's upstream information"
+complete -c epkginfo -s x -l xml                -d "plain metadata.xml file"

From 05f79335ccad48a34e29e1c7ead0c8d2047a06d5 Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Sun, 3 Mar 2019 10:20:18 +0100
Subject: [PATCH 0430/1732] completions/emerge: add verbose-conflicts

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

diff --git a/share/completions/emerge.fish b/share/completions/emerge.fish
index 851df35be..182654654 100644
--- a/share/completions/emerge.fish
+++ b/share/completions/emerge.fish
@@ -168,7 +168,7 @@ complete -c emerge -s u -l update
 complete -c emerge -s k -l usepkg       -d "Use binary pkg if available"
 complete -c emerge -s K -l usepkgonly   -d "Only use binary pkgs"
 complete -c emerge -s v -l verbose      -d "Run in verbose mode"
-# verbose-conflicts
+complete -c emerge      -l verbose-conflicts -d "Verbose slot conflicts"
 # verbose-slot-rebuilds
 complete -c emerge      -l with-bdeps   -d "Pull in build time dependencies" \
 	-xa "y n"

From 78e6631e5364bd913731700b345081b97beb3c8e Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Fri, 19 Apr 2019 12:52:52 +0200
Subject: [PATCH 0431/1732] formatting

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

diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index 4e07b1a7c..bbedc0ce6 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -130,5 +130,5 @@ complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all
 complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n       -d "Don't show l10n USE flags"
 
 # which
-complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked      -d "Return highest version ebuild available"
-complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild              -d "Print the ebuild"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked   -d "Return highest version ebuild available"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild           -d "Print the ebuild"

From 95346770d3f9f932df75101cbbd0dac06f83d0ff Mon Sep 17 00:00:00 2001
From: Wilke Schwiedop <drwilly@drwilly.de>
Date: Sat, 27 Apr 2019 00:37:19 +0200
Subject: [PATCH 0432/1732] Update emaint.fish

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

diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index 129ffa465..8aecefc91 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -19,7 +19,7 @@ complete -c emaint -n '__fish_use_subcommand' -xa 'world'       -d 'Check and fi
 
 ## Local opts
 # logs
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time      -d "Delete logs older than NUM of days" \
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time      -d "Delete logs older than NUM days" \
 	-xa "(seq 0 365)"
 complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend   -d "Output logs that would be deleted"
 complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean     -d "Cleans out logs more than 7 days old"

From e8fd83ca25cf0cb9941ec3edd49fec7cdb9b163d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 29 Apr 2019 21:19:14 +0200
Subject: [PATCH 0433/1732] docs/index: Remove wrong "configuration variables"

Hat-tip to @enzotib on gitter.

[ci skip]
---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index b3216be67..76e606a27 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1618,7 +1618,7 @@ Note that functions cannot be started in the background. Functions that are stop
 Initialization files
 ====================
 
-On startup, Fish evaluates a number of configuration files, which can be used to control the behavior of the shell. The location of these configuration variables is controlled by a number of environment variables, and their default or usual location is given below.
+On startup, Fish evaluates a number of configuration files, which can be used to control the behavior of the shell. The location of these is controlled by a number of environment variables, and their default or usual location is given below.
 
 Configuration files are evaluated in the following order:
 

From 665ae3787a21b0caafb80ef2eccce3002304ca7a Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 29 Apr 2019 21:29:21 +0800
Subject: [PATCH 0434/1732] Switch to runtime check for /proc/self/stat

Removes a compile-time check that may have affected cross-compilation.

Work on #1067.
---
 cmake/ConfigureChecks.cmake |  3 ---
 config_cmake.h.in           |  3 ---
 src/builtin_eval.cpp        |  3 ---
 src/builtin_jobs.cpp        | 17 +++++++----------
 src/env.cpp                 |  4 ++++
 src/proc.cpp                |  6 ++----
 src/proc.h                  |  6 ++----
 src/reader.cpp              |  6 +++---
 8 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index b9e10d8b2..3bc0f41c3 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -128,9 +128,6 @@ IF(STRUCT_WINSIZE GREATER -1 AND HAVE_TIOCGWINSZ EQUAL 1)
 ENDIF()
 CMAKE_POP_CHECK_STATE()
 
-IF(EXISTS "/proc/self/stat")
-  SET(HAVE__PROC_SELF_STAT 1)
-ENDIF()
 CHECK_TYPE_SIZE("wchar_t[8]" WCHAR_T_BITS LANGUAGE CXX)
 
 # Solaris, NetBSD and X/Open-conforming systems have a fixed-args tparm
diff --git a/config_cmake.h.in b/config_cmake.h.in
index 2078896b2..76ae2a230 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -127,9 +127,6 @@
 /* Define to 1 if the _nl_msg_cat_cntr symbol is exported. */
 #cmakedefine HAVE__NL_MSG_CAT_CNTR 1
 
-/* Define to 1 if you have the file `/proc/self/stat'. */
-#cmakedefine HAVE__PROC_SELF_STAT 1
-
 /* Define to 1 if the _sys_errs array is available. */
 #cmakedefine HAVE__SYS__ERRS 1
 
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 660559e0d..32e6a81f3 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -3,9 +3,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#ifdef HAVE__PROC_SELF_STAT
-#include <sys/time.h>
-#endif
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 3d083531d..ec8bb0373 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -3,9 +3,7 @@
 
 #include <errno.h>
 #include <stddef.h>
-#ifdef HAVE__PROC_SELF_STAT
 #include <sys/time.h>
-#endif
 
 #include "builtin.h"
 #include "common.h"
@@ -26,7 +24,6 @@ enum {
     JOBS_PRINT_NOTHING,    // print nothing (exit status only)
 };
 
-#ifdef HAVE__PROC_SELF_STAT
 /// Calculates the cpu usage (in percent) of the specified job.
 static int cpu_use(const job_t *j) {
     double u = 0;
@@ -45,7 +42,6 @@ static int cpu_use(const job_t *j) {
     }
     return u * 1000000;
 }
-#endif
 
 /// Print information about the specified job.
 static void builtin_jobs_print(const job_t *j, int mode, int header, io_streams_t &streams) {
@@ -57,17 +53,18 @@ static void builtin_jobs_print(const job_t *j, int mode, int header, io_streams_
             if (header) {
                 // Print table header before first job.
                 streams.out.append(_(L"Job\tGroup\t"));
-#ifdef HAVE__PROC_SELF_STAT
-                streams.out.append(_(L"CPU\t"));
-#endif
+                if (have_proc_stat) {
+                    streams.out.append(_(L"CPU\t"));
+                }
                 streams.out.append(_(L"State\tCommand\n"));
             }
 
             streams.out.append_format(L"%d\t%d\t", j->job_id, j->pgid);
 
-#ifdef HAVE__PROC_SELF_STAT
-            streams.out.append_format(L"%d%%\t", cpu_use(j));
-#endif
+            if (have_proc_stat) {
+                streams.out.append_format(L"%d%%\t", cpu_use(j));
+            }
+
             streams.out.append(j->is_stopped() ? _(L"stopped") : _(L"running"));
             streams.out.append(L"\t");
             streams.out.append(j->command_wcstr());
diff --git a/src/env.cpp b/src/env.cpp
index ff639d294..8f8b12415 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -560,6 +560,10 @@ void misc_init() {
         fflush(stdout);
         setvbuf(stdout, NULL, _IONBF, 0);
     }
+    // Check for /proc/self/stat to see if we are running with Linux-style procfs
+    if (access("/proc/self/stat", R_OK) == 0) {
+        have_proc_stat = true;
+    }
 }
 
 /// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
diff --git a/src/proc.cpp b/src/proc.cpp
index 1d1817583..2d71faf7b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -72,6 +72,7 @@ bool is_login = false;
 int is_event = 0;
 job_control_t job_control_mode = job_control_t::interactive;
 int no_exec = 0;
+bool have_proc_stat = false;
 
 static int is_interactive = -1;
 
@@ -617,13 +618,12 @@ bool job_reap(bool allow_interactive) {
     return found;
 }
 
-#ifdef HAVE__PROC_SELF_STAT
-
 /// Maximum length of a /proc/[PID]/stat filename.
 #define FN_SIZE 256
 
 /// Get the CPU time for the specified process.
 unsigned long proc_get_jiffies(process_t *p) {
+    if (! have_proc_stat) return 0;
     if (p->pid <= 0) return 0;
 
     wchar_t fn[FN_SIZE];
@@ -666,8 +666,6 @@ void proc_update_jiffies() {
     }
 }
 
-#endif
-
 // Return control of the terminal to a job's process group. restore_attrs is true if we are restoring
 // a previously-stopped job, in which case we need to restore terminal attributes.
 bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
diff --git a/src/proc.h b/src/proc.h
index debff6ac9..340a39ddb 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -228,12 +228,10 @@ class process_t {
     bool stopped{false};
     /// Reported status value.
     proc_status_t status{};
-#ifdef HAVE__PROC_SELF_STAT
     /// Last time of cpu time check.
     struct timeval last_time {};
     /// Number of jiffies spent in process at last cpu time check.
     unsigned long last_jiffies{0};
-#endif
 };
 
 typedef std::unique_ptr<process_t> process_ptr_t;
@@ -492,7 +490,6 @@ bool job_reap(bool interactive);
 /// Mark a process as failed to execute (and therefore completed).
 void job_mark_process_as_failed(const std::shared_ptr<job_t> &job, const process_t *p);
 
-#ifdef HAVE__PROC_SELF_STAT
 /// Use the procfs filesystem to look up how many jiffies of cpu time was used by this process. This
 /// function is only available on systems with the procfs file entry 'stat', i.e. Linux.
 unsigned long proc_get_jiffies(process_t *p);
@@ -500,7 +497,6 @@ unsigned long proc_get_jiffies(process_t *p);
 /// Update process time usage for all processes by calling the proc_get_jiffies function for every
 /// process of every job.
 void proc_update_jiffies();
-#endif
 
 /// Perform a set of simple sanity checks on the job list. This includes making sure that only one
 /// job is in the foreground, that every process is in a valid state, etc.
@@ -555,4 +551,6 @@ void add_disowned_pgid(pid_t pgid);
 ///   function
 enum { INVALID_PID  = -2 };
 
+extern bool have_proc_stat;
+
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index a780035c9..c7c986c52 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1976,9 +1976,9 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     // For compatibility with fish 2.0's $_, now replaced with `status current-command`
     parser.vars().set_one(L"_", ENV_GLOBAL, program_name);
 
-#ifdef HAVE__PROC_SELF_STAT
-    proc_update_jiffies();
-#endif
+    if (have_proc_stat) {
+        proc_update_jiffies();
+    }
 }
 
 parser_test_error_bits_t reader_shell_test(const wcstring &b) {

From 3b532fc793bd66b8d2bd40165cd35a3bae733519 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 11:40:52 +0200
Subject: [PATCH 0435/1732] functions/fish_vi_key_bindings: Pass "-s" to shared
 bindings

Fixes #5853.

[ci skip]
---
 share/functions/fish_vi_key_bindings.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 5ff75e4b9..c829e8644 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -47,7 +47,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # Inherit shared key bindings.
     # Do this first so vi-bindings win over default.
     for mode in insert default visual
-        __fish_shared_key_bindings -M $mode
+        __fish_shared_key_bindings -s -M $mode
     end
 
     bind -s --preset -M insert \r execute

From 6f45b8d632cf7979254516de1a9e06b24e08a016 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 12:16:41 +0200
Subject: [PATCH 0436/1732] docs/fish_indent_lexer: Support `>_` as prompt
 indicator

This was widely used in the old docs, and currently it just allowed `>`.

See #5696.

[ci skip]
---
 sphinx_doc_src/fish_indent_lexer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/fish_indent_lexer.py b/sphinx_doc_src/fish_indent_lexer.py
index f704e5691..1bc978731 100644
--- a/sphinx_doc_src/fish_indent_lexer.py
+++ b/sphinx_doc_src/fish_indent_lexer.py
@@ -121,7 +121,7 @@ class FishIndentLexer(Lexer):
         else:
             # We have a prompt line.
             # Use a regexp because it will maintain string indexes for us.
-            regex = re.compile(r"^(>\s*)?(.*\n?)", re.MULTILINE)
+            regex = re.compile(r"^(>_?\s*)?(.*\n?)", re.MULTILINE)
             for m in regex.finditer(input_text):
                 if m.group(1):
                     # Prompt line; highlight via fish syntax.

From d8f922fd70a979aea4f6346fcc43601d2347c365 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 12:19:04 +0200
Subject: [PATCH 0437/1732] docs: Remove <outp> tags

fish_indent_lexer formats lines not starting with a prompt indicator
as output, as long as there is a prompt indicator elsewhere.

So these tags are useless and wrong.

See #5696.

[ci skip]
---
 sphinx_doc_src/cmds/prompt_pwd.rst |   8 +-
 sphinx_doc_src/cmds/string.rst     | 116 ++++++++++++++---------------
 sphinx_doc_src/cmds/type.rst       |   2 +-
 sphinx_doc_src/index.rst           |  24 +++---
 sphinx_doc_src/tutorial.rst        | 106 +++++++++++++-------------
 5 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/sphinx_doc_src/cmds/prompt_pwd.rst
index 5af850c94..fcd38f3f3 100644
--- a/sphinx_doc_src/cmds/prompt_pwd.rst
+++ b/sphinx_doc_src/cmds/prompt_pwd.rst
@@ -25,16 +25,16 @@ Examples
 
     >_ cd ~/
     >_ echo $PWD
-    <outp>/home/alfa</outp>
+    /home/alfa
     
     >_ prompt_pwd
-    <outp>~</outp>
+    ~
     
     >_ cd /tmp/banana/sausage/with/mustard
     >_ prompt_pwd
-    <outp>/t/b/s/w/mustard</outp>
+    /t/b/s/w/mustard
     
     >_ set -g fish_prompt_pwd_dir_length 3
     >_ prompt_pwd
-    <outp>/tmp/ban/sau/wit/mustard</outp>
+    /tmp/ban/sau/wit/mustard
 
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index befe6df22..e252ca07d 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -249,7 +249,7 @@ Examples
 ::
 
     >_ string length 'hello, world'
-    <outp>12</outp>
+    12
     
     >_ set str foo
     >_ string length -q $str; echo $status
@@ -262,13 +262,13 @@ Examples
 ::
 
     >_ string sub --length 2 abcde
-    <outp>ab</outp>
+    ab
     
     >_ string sub -s 2 -l 2 abcde
-    <outp>bc</outp>
+    bc
     
     >_ string sub --start=-2 abcde
-    <outp>de</outp>
+    de
 
 
 
@@ -276,17 +276,17 @@ Examples
 ::
 
     >_ string split . example.com
-    <outp>example</outp>
-    <outp>com</outp>
+    example
+    com
     
     >_ string split -r -m1 / /usr/local/bin/fish
-    <outp>/usr/local/bin</outp>
-    <outp>fish</outp>
+    /usr/local/bin
+    fish
     
     >_ string split '' abc
-    <outp>a</outp>
-    <outp>b</outp>
-    <outp>c</outp>
+    a
+    b
+    c
 
 
 
@@ -294,7 +294,7 @@ Examples
 ::
 
     >_ seq 3 | string join ...
-    <outp>1...2...3</outp>
+    1...2...3
 
 
 
@@ -302,11 +302,11 @@ Examples
 ::
 
     >_ string trim ' abc  '
-    <outp>abc</outp>
+    abc
     
     >_ string trim --right --chars=yz xyzzy zany
-    <outp>x</outp>
-    <outp>zan</outp>
+    x
+    zan
 
 
 
@@ -333,32 +333,32 @@ Match Glob Examples
 ::
 
     >_ string match '?' a
-    <outp>a</outp>
+    a
     
     >_ string match 'a*b' axxb
-    <outp>axxb</outp>
+    axxb
     
     >_ string match -i 'a??B' Axxb
-    <outp>Axxb</outp>
+    Axxb
     
     >_ echo 'ok?' | string match '*\\?'
-    <outp>ok?</outp>
+    ok?
     
     # Note that only the second STRING will match here.
     >_ string match 'foo' 'foo1' 'foo' 'foo2'
-    <outp>foo</outp>
+    foo
     
     >_ string match -e 'foo' 'foo1' 'foo' 'foo2'
-    <outp>foo1
+    foo1
     foo
     foo2
-    </outp>
+    
     
     >_ string match 'foo?' 'foo1' 'foo' 'foo2'
-    <outp>foo1
+    foo1
     foo
     foo2
-    </outp>
+    
 
 
 Match Regex Examples
@@ -369,35 +369,35 @@ Match Regex Examples
 ::
 
     >_ string match -r 'cat|dog|fish' 'nice dog'
-    <outp>dog</outp>
+    dog
     
     >_ string match -r -v "c.*[12]" {cat,dog}(seq 1 4)
-    <outp>dog1</outp>
-    <outp>dog2</outp>
-    <outp>cat3</outp>
-    <outp>dog3</outp>
-    <outp>cat4</outp>
-    <outp>dog4</outp>
+    dog1
+    dog2
+    cat3
+    dog3
+    cat4
+    dog4
     
     >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56
-    <outp>2:34:56</outp>
-    <outp>2</outp>
-    <outp>34</outp>
-    <outp>56</outp>
+    2:34:56
+    2
+    34
+    56
     
     >_ string match -r '^(\\w{{2,4}})\\g1$' papa mud murmur
-    <outp>papa</outp>
-    <outp>pa</outp>
-    <outp>murmur</outp>
-    <outp>mur</outp>
+    papa
+    pa
+    murmur
+    mur
     
     >_ string match -r -a -n at ratatat
-    <outp>2 2</outp>
-    <outp>4 2</outp>
-    <outp>6 2</outp>
+    2 2
+    4 2
+    6 2
     
     >_ string match -r -i '0x[0-9a-f]{{1,8}}' 'int magic = 0xBadC0de;'
-    <outp>0xBadC0de</outp>
+    0xBadC0de
 
 
 NUL Delimited Examples
@@ -409,13 +409,13 @@ NUL Delimited Examples
 
     >_ # Count files in a directory, without being confused by newlines.
     >_ count (find . -print0 | string split0)
-    <outp>42</outp>
+    42
     
     >_ # Sort a list of elements which may contain newlines
     >_ set foo beta alpha\\ngamma
     >_ set foo (string join0 $foo | sort -z | string split0)
     >_ string escape $foo[1]
-    <outp>alpha\\ngamma</outp>
+    alpha\\ngamma
 
 
 Replace Literal Examples
@@ -426,15 +426,15 @@ Replace Literal Examples
 ::
 
     >_ string replace is was 'blue is my favorite'
-    <outp>blue was my favorite</outp>
+    blue was my favorite
     
     >_ string replace 3rd last 1st 2nd 3rd
-    <outp>1st</outp>
-    <outp>2nd</outp>
-    <outp>last</outp>
+    1st
+    2nd
+    last
     
     >_ string replace -a ' ' _ 'spaces to underscores'
-    <outp>spaces_to_underscores</outp>
+    spaces_to_underscores
 
 
 Replace Regex Examples
@@ -445,14 +445,14 @@ Replace Regex Examples
 ::
 
     >_ string replace -r -a '[^\\d.]+' ' ' '0 one two 3.14 four 5x'
-    <outp>0 3.14 5</outp>
+    0 3.14 5
     
     >_ string replace -r '(\\w+)\\s+(\\w+)' '$2 $1 $$' 'left right'
-    <outp>right left $</outp>
+    right left $
     
     >_ string replace -r '\\s*newline\\s*' '\\n' 'put a newline here'
-    <outp>put a</outp>
-    <outp>here</outp>
+    put a
+    here
 
 
 Repeat Examples
@@ -463,14 +463,14 @@ Repeat Examples
 ::
 
     >_ string repeat -n 2 'foo '
-    <outp>foo foo</outp>
+    foo foo
     
     >_ echo foo | string repeat -n 2
-    <outp>foofoo</outp>
+    foofoo
     
     >_ string repeat -n 2 -m 5 'foo'
-    <outp>foofo</outp>
+    foofo
     
     >_ string repeat -m 5 'foo'
-    <outp>foofo</outp>
+    foofo
 
diff --git a/sphinx_doc_src/cmds/type.rst b/sphinx_doc_src/cmds/type.rst
index 18ddcefe0..7c6b1ae68 100644
--- a/sphinx_doc_src/cmds/type.rst
+++ b/sphinx_doc_src/cmds/type.rst
@@ -39,5 +39,5 @@ Example
 ::
 
     >_ type fg
-    <outp>fg is a builtin</outp>
+    fg is a builtin
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 76e606a27..3311792f5 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -857,25 +857,25 @@ Lists adjacent to other lists or strings are expanded as cartesian products:
 Examples::
 
     >_ echo {good,bad}" apples"
-    <outp>good apples bad apples</outp>
+    good apples bad apples
 
     >_ set -l a x y z
     >_ set -l b 1 2 3
 
     >_ echo $a$b
-    <outp>x1 y1 z1 x2 y2 z2 x3 y3 z3</outp>
+    x1 y1 z1 x2 y2 z2 x3 y3 z3
 
     >_ echo $a"-"$b
-    <outp>x-1 y-1 z-1 x-2 y-2 z-2 x-3 y-3 z-3</outp>
+    x-1 y-1 z-1 x-2 y-2 z-2 x-3 y-3 z-3
 
     >_ echo {x,y,z}$b
-    <outp>x1 y1 z1 x2 y2 z2 x3 y3 z3</outp>
+    x1 y1 z1 x2 y2 z2 x3 y3 z3
 
     >_ echo {$b}word
-    <outp>1word 2word 3word</outp>
+    1word 2word 3word
 
     >_ echo {$c}word
-    <outp># Output is an empty line</outp>
+    # Output is an empty line
 
 Be careful when you try to use braces to separate variable names from text. The problem shown above can be avoided by wrapping the variable in double quotes instead of braces (``echo "$c"word``).
 
@@ -887,7 +887,7 @@ E.g.
 
     >_ echo (printf '%s' '')banana # the printf prints literally nothing
     >_ echo (printf '%s\n' '')banana # the printf prints just a newline, so the command substitution expands to an empty string
-    <outp>banana</outp>
+    banana
     # After command substitution, the previous line looks like:
     >_ echo ""banana
 
@@ -895,7 +895,7 @@ Examples::
 
     >_ set b 1 2 3
     >_ echo (echo x)$b
-    <outp>x1 x2 x3</outp>
+    x1 x2 x3
 
 .. _expand-index-range:
 
@@ -1148,10 +1148,10 @@ When an array is exported as an environment variable, it is either space or colo
     set -x smurf blue small
     set -x smurf_PATH forest mushroom
     env | grep smurf
-    <outp>
+    
     # smurf=blue small
     # smurf_PATH=forest:mushroom
-    </outp>
+    
 
 
 ``fish`` automatically creates arrays from all environment variables whose name ends in PATH, by splitting them on colons. Other variables are not automatically split.
@@ -1169,12 +1169,12 @@ PATH variables act as normal arrays, except they are are implicitly joined and s
 
     set MYPATH 1 2 3
     echo "$MYPATH"
-    <outp># 1:2:3</outp>
+    # 1:2:3
     set MYPATH "$MYPATH:4:5"
     echo $MYPATH
     # 1 2 3 4 5
     echo "$MYPATH"
-    <outp># 1:2:3:4:5</outp>
+    # 1:2:3:4:5
 
 Variables can be marked or unmarked as PATH variables via the ``--path`` and ``--unpath`` options to ``set``.
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 6beeb6b32..36d1131de 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -20,8 +20,8 @@ You will be greeted by the standard fish prompt,
 which means you are all set up and can start using fish::
 
     > fish
-    <outp>Welcome to fish, the friendly interactive shell</outp>
-    <outp>Type <span class="cwd">help</span> for instructions on how to use fish</outp>
+    Welcome to fish, the friendly interactive shell
+    Type <span class="cwd">help</span> for instructions on how to use fish
     you@hostname ~>____
 
 
@@ -46,7 +46,7 @@ Running Commands
 ``fish`` runs commands like other shells: you type a command, followed by its arguments. Spaces are separators::
 
     >_ echo hello world
-    <outp>hello world</outp>
+    hello world
 
 
 You can include a literal space in an argument with a backslash, or by using single or double quotes::
@@ -54,7 +54,7 @@ You can include a literal space in an argument with a backslash, or by using sin
     >_ mkdir My\ Files
     >_ cp ~/Some\ File 'My Files'
     >_ ls "My Files"
-    <outp>Some File</outp>
+    Some File
 
 
 Commands can be chained with semicolons.
@@ -70,8 +70,8 @@ Getting Help
 ::
 
     >_ man set
-    <outp>set - handle shell variables</outp>
-    <outp>  Synopsis...</outp>
+    set - handle shell variables
+      Synopsis...
 
 
 
@@ -104,23 +104,23 @@ Wildcards
 ``fish`` supports the familiar wildcard ``*``. To list all JPEG files::
 
     >_ ls *.jpg
-    <outp>lena.jpg</outp>
-    <outp>meena.jpg</outp>
-    <outp>santa maria.jpg</outp>
+    lena.jpg
+    meena.jpg
+    santa maria.jpg
 
 
 You can include multiple wildcards::
 
     >_ ls l*.p*
-    <outp>lena.png</outp>
-    <outp>lesson.pdf</outp>
+    lena.png
+    lesson.pdf
 
 
 Especially powerful is the recursive wildcard ** which searches directories recursively::
 
     >_ ls /var/**.log
-    <outp>/var/log/system.log</outp>
-    <outp>/var/run/sntp.log</outp>
+    /var/log/system.log
+    /var/run/sntp.log
 
 
 If that directory traversal is taking a long time, you can :kbd:`Control+C` out of it.
@@ -132,7 +132,7 @@ Pipes and Redirections
 You can pipe between commands with the usual vertical bar::
 
     >_ echo hello world | wc
-    <outp>       1       2      12</outp>
+           1       2      12
 
 
 stdin and stdout can be redirected via the familiar `<` and `<`. stderr is redirected with a `2>`.
@@ -178,7 +178,7 @@ Press :kbd:`Tab`, and ``fish`` will attempt to complete the command, argument, o
 If there's more than one possibility, it will list them::
 
     >_ <eror>~/stuff/s</eror> :kbd:`Tab`
-    <outp><mtch>~/stuff/s</outp>cript.sh  <i>(Executable, 4.8kB)</i>  \mtch{~/stuff/s</mtch>ources/  <i>(Directory)</i>}
+    <mtch>~/stuff/script.sh  <i>(Executable, 4.8kB)</i>  \mtch{~/stuff/s</mtch>ources/  <i>(Directory)</i>}
 
 
 Hit tab again to cycle through the possibilities.
@@ -187,7 +187,7 @@ Hit tab again to cycle through the possibilities.
 
     >_ git merge pr :kbd:`Tab` => git merge prompt_designer
     >_ git checkout b :kbd:`Tab`
-    <outp><mtch>b</outp>uiltin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
+    <mtch>builtin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
 
 
 Try hitting tab and see what ``fish`` can do!
@@ -198,15 +198,15 @@ Variables
 Like other shells, a dollar sign performs variable substitution::
 
     >_ echo My home directory is $HOME
-    <outp>My home directory is /home/tutorial</outp>
+    My home directory is /home/tutorial
 
 
 Variable substitution also occurs in double quotes, but not single quotes::
 
     >_ echo "My current directory is $PWD"
-    <outp>My current directory is /home/tutorial</outp>
+    My current directory is /home/tutorial
     >_ echo 'My current directory is $PWD'
-    <outp>My current directory is $PWD</outp>
+    My current directory is $PWD
 
 
 Unlike other shells, ``fish`` has no dedicated syntax for setting variables. Instead it has an ordinary command: ``set``, which takes a variable name, and then its value.
@@ -217,7 +217,7 @@ Unlike other shells, ``fish`` has no dedicated syntax for setting variables. Ins
 
     >_ set name 'Mister Noodle'
     >_ echo $name
-    <outp>Mister Noodle</outp>
+    Mister Noodle
 
 
 (Notice the quotes: without them, ``Mister`` and ``Noodle`` would have been separate arguments, and ``$name`` would have been made into a list of two elements.)
@@ -226,7 +226,7 @@ Unlike other shells, variables are not further split after substitution::
 
     >_ mkdir $name
     >_ ls
-    <outp>Mister Noodle</outp>
+    Mister Noodle
 
 
 In bash, this would have created two directories "Mister" and "Noodle". In ``fish``, it created only one: the variable had the value "Mister Noodle", so that is the argument that was passed to ``mkdir``, spaces and all. Other shells use the term "arrays", rather than lists.
@@ -243,7 +243,7 @@ Unlike other shells, ``fish`` stores the exit status of the last command in ``$s
 
     >_ false
     >_ echo $status
-    <outp>1</outp>
+    1
 
 
 Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` array variable for the exit statues of processes in a pipe.
@@ -260,7 +260,7 @@ Unlike other shells, ``fish`` does not have an export command. Instead, a variab
 
     >_ set -x MyVariable SomeValue
     >_ env | grep MyVariable
-    <outp><m>MyVariable</outp>=SomeValue</m>
+    <m>MyVariable=SomeValue</m>
 
 
 You can erase a variable with ``-e`` or ``--erase``
@@ -271,7 +271,7 @@ You can erase a variable with ``-e`` or ``--erase``
 
     >_ set -e MyVariable
     >_ env | grep MyVariable
-    <outp>(no output)</outp>
+    (no output)
 
 
 
@@ -285,7 +285,7 @@ Some variables, like ``$PWD``, only have one value. By convention, we talk about
 Other variables, like ``$PATH``, really do have multiple values. During variable expansion, the variable expands to become multiple arguments::
 
     >_ echo $PATH
-    <outp>/usr/bin /bin /usr/sbin /sbin /usr/local/bin</outp>
+    /usr/bin /bin /usr/sbin /sbin /usr/local/bin
 
 
 Note that there are three environment variables that are automatically split on colons to become lists when fish starts running: ``PATH``, ``CDPATH``, ``MANPATH``. Conversely, they are joined on colons when exported to subcommands. All other environment variables (e.g., ``LD_LIBRARY_PATH``) which have similar semantics are treated as simple strings.
@@ -295,7 +295,7 @@ Lists cannot contain other lists: there is no recursion.  A variable is a list o
 Get the length of a list with ``count``::
 
     >_ count $PATH
-    <outp>5</outp>
+    5
 
 
 You can append (or prepend) to a list by setting the list to itself, with some additional arguments. Here we append /usr/local/bin to $PATH::
@@ -307,11 +307,11 @@ You can append (or prepend) to a list by setting the list to itself, with some a
 You can access individual elements with square brackets. Indexing starts at 1 from the beginning, and -1 from the end::
 
     >_ echo $PATH
-    <outp>/usr/bin /bin /usr/sbin /sbin /usr/local/bin</outp>
+    /usr/bin /bin /usr/sbin /sbin /usr/local/bin
     >_ echo $PATH[1]
-    <outp>/usr/bin</outp>
+    /usr/bin
     >_ echo $PATH[-1]
-    <outp>/usr/local/bin</outp>
+    /usr/local/bin
 
 
 You can also access ranges of elements, known as "slices:"
@@ -321,9 +321,9 @@ You can also access ranges of elements, known as "slices:"
 ::
 
     >_ echo $PATH[1..2]
-    <outp>/usr/bin /bin</outp>
+    /usr/bin /bin
     >_ echo $PATH[-1..2]
-    <outp>/usr/local/bin /sbin /usr/sbin /bin</outp>
+    /usr/local/bin /sbin /usr/sbin /bin
 
 
 You can iterate over a list (or a slice) with a for loop::
@@ -331,11 +331,11 @@ You can iterate over a list (or a slice) with a for loop::
     >_ for val in $PATH
         echo "entry: $val"
       end
-    <outp>entry: /usr/bin/</outp>
-    <outp>entry: /bin</outp>
-    <outp>entry: /usr/sbin</outp>
-    <outp>entry: /sbin</outp>
-    <outp>entry: /usr/local/bin</outp>
+    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>`)::
@@ -343,11 +343,11 @@ Lists adjacent to other lists or strings are expanded as :ref:`cartesian product
     >_ set a 1 2 3
     >_ set 1 a b c
     >_ echo $a$1
-    <outp>1a 2a 3a 1b 2b 3b 1c 2c 3c</outp>
+    1a 2a 3a 1b 2b 3b 1c 2c 3c
     >_ echo $a" banana"
-    <outp>1 banana 2 banana 3 banana</outp>
+    1 banana 2 banana 3 banana
     >_ echo "$a banana"
-    <outp>1 2 3 banana</outp>
+    1 2 3 banana
 
 
 This is similar to `Brace expansion <index#expand-brace>`__.
@@ -358,21 +358,21 @@ Command Substitutions
 Command substitutions use the output of one command as an argument to another. Unlike other shells, ``fish`` does not use backticks `` for command substitutions. Instead, it uses parentheses::
 
     >_ echo In (pwd), running (uname)
-    <outp>In /home/tutorial, running FreeBSD</outp>
+    In /home/tutorial, running FreeBSD
 
 
 A common idiom is to capture the output of a command in a variable::
 
     >_ set os (uname)
     >_ echo $os
-    <outp>Linux</outp>
+    Linux
 
 
 Command substitutions are not expanded within quotes. Instead, you can temporarily close the quotes, add the command substitution, and reopen them, all in the same argument::
 
     >_ touch <i class="quote">"testing_"</i>(date +%s)<i class="quote">".txt"</i>
     >_ ls *.txt
-    <outp>testing_1360099791.txt</outp>
+    testing_1360099791.txt
 
 
 Unlike other shells, fish does not split command substitutions on any whitespace (like spaces or tabs), only newlines. This can be an issue with commands like ``pkg-config`` that print what is meant to be multiple arguments on a single line. To split it on spaces too, use ``string split``.
@@ -382,11 +382,11 @@ Unlike other shells, fish does not split command substitutions on any whitespace
 ::
 
     >_ printf '%s\n' (pkg-config --libs gio-2.0)
-    <outp>-lgio-2.0 -lgobject-2.0 -lglib-2.0</outp>
+    -lgio-2.0 -lgobject-2.0 -lglib-2.0
     >_ printf '%s\n' (pkg-config --libs gio-2.0 | string split " ")
-    <outp>-lgio-2.0
+    -lgio-2.0
     -lgobject-2.0
-    -lglib-2.0</outp>
+    -lglib-2.0
 
 
 
@@ -416,7 +416,7 @@ fish supports the familiar ``&&`` and ``||`` to combine commands, and ``!`` to n
 fish also supports ``and``, ``or``, and ``not``. The first two are job modifiers and have lower precedence. Example usage::
 
     >_ cp file1.txt file1_bak.txt && cp file2.txt file2_bak.txt ; and echo "Backup successful"; or echo "Backup failed"
-    <outp>Backup failed</outp>
+    Backup failed
 
 
 As mentioned in `the section on the semicolon <#tut_semicolon>`__, this can also be written in multiple lines, like so::
@@ -503,9 +503,9 @@ A ``fish`` function is a list of commands, which may optionally take arguments.
          echo Hello $argv
       end
     >_ say_hello
-    <outp>Hello</outp>
+    Hello
     >_ say_hello everybody!
-    <outp>Hello everybody!</outp>
+    Hello everybody!
 
 
 Unlike other shells, ``fish`` does not have aliases or special prompt syntax. Functions take their place.
@@ -513,7 +513,7 @@ Unlike other shells, ``fish`` does not have aliases or special prompt syntax. Fu
 You can list the names of all functions with the ``functions`` keyword (note the plural!). ``fish`` starts out with a number of functions::
 
     >_ functions
-    <outp>alias, cd, delete-or-exit, dirh, dirs, down-or-search, eval, export, fish_command_not_found_setup, fish_config, fish_default_key_bindings, fish_prompt, fish_right_prompt, fish_sigtrap_handler, fish_update_completions, funced, funcsave, grep, help, history, isatty, ls, man, math, nextd, nextd-or-forward-word, open, popd, prevd, prevd-or-backward-word, prompt_pwd, psub, pushd, seq, setenv, trap, type, umask, up-or-search, vared</outp>
+    alias, cd, delete-or-exit, dirh, dirs, down-or-search, eval, export, fish_command_not_found_setup, fish_config, fish_default_key_bindings, fish_prompt, fish_right_prompt, fish_sigtrap_handler, fish_update_completions, funced, funcsave, grep, help, history, isatty, ls, man, math, nextd, nextd-or-forward-word, open, popd, prevd, prevd-or-backward-word, prompt_pwd, psub, pushd, seq, setenv, trap, type, umask, up-or-search, vared
 
 
 You can see the source for any function by passing its name to ``functions``::
@@ -533,10 +533,10 @@ While loops::
     >_ while true
         echo <i class="quote">"Loop forever"</i>
     end
-    <outp>Loop forever</outp>
-    <outp>Loop forever</outp>
-    <outp>Loop forever</outp>
-    <outp>...</outp>
+    Loop forever
+    Loop forever
+    Loop forever
+    ...
 
 
 For loops can be used to iterate over a list. For example, a list of files::

From 03431ae9a28e721429d5f4b069bf26752cb52dc1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 12:47:26 +0200
Subject: [PATCH 0438/1732] docs: Default to fish highlighting

This fixes highlighting in cmds/.

See #5696.

[ci skip]
---
 sphinx_doc_src/conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 808241b93..e2abca392 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -26,6 +26,8 @@ def setup(app):
         lexername='FishIndentLexer')
     lexers['fish-docs-samples'] = fish_indent_lexer
 
+# The default language to assume
+highlight_language = 'fish-docs-samples'
 
 # -- Path setup --------------------------------------------------------------
 

From 1377f7133108f5c249b60714deb303ec40cd052f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 12:53:15 +0200
Subject: [PATCH 0439/1732] docs: Remove some more html

See #5696.

[ci skip]
---
 sphinx_doc_src/cmds/read.rst   |  4 ++--
 sphinx_doc_src/cmds/string.rst |  4 ++--
 sphinx_doc_src/index.rst       |  4 ++--
 sphinx_doc_src/tutorial.rst    | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index 0aca5e884..8b8d0fee2 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -29,9 +29,9 @@ The following options are available:
 - ``-n NCHARS`` 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 <code>set_color green; echo read; set_color normal; echo "> "</code>.
+- ``-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 PROMPT_STR`` or ``--prompt-str=PROMPT_STR`` uses the string as the prompt for the interactive mode. It is equivalent to <code>echo PROMPT_STR</code> 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 <code>echo</code> command.
+- ``-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 `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.
 
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index e252ca07d..1adbdf4f0 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -314,7 +314,7 @@ Examples
 ::
 
     >_ echo \\x07 | string escape
-    <bs>cg</bs>
+    cg
 
 
 
@@ -322,7 +322,7 @@ Examples
 ::
 
     >_ string escape --style=var 'a1 b2'\\u6161
-    <bs>a1_20b2__c_E6_85_A1</bs>
+    a1_20b2__c_E6_85_A1
 
 
 Match Glob Examples
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 3311792f5..25f4cbd54 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -113,7 +113,7 @@ Example::
     >ls -l | grep "my topic"
 
 
-- Commands can pass on all their output as a chunk</b>: the output stream of one command is bundled and taken as data argument for the second command. This is called command substitution, see `Command Substitution`_.
+- Commands can pass on all their output as a chunk: the output stream of one command is bundled and taken as data argument for the second command. This is called command substitution, see `Command Substitution`_.
 
 Example::
 
@@ -1003,7 +1003,7 @@ Shell variables
 
 Shell variables are named pieces of data, which can be created, deleted and their values changed and used by the user.  Variables may optionally be "exported", so that a copy of the variable is available to any subprocesses the shell creates. An exported variable is referred to as an "environment variable".
 
-To set a variable value, use the `set <cmds/set.html>`_ command</a>. A variable name can not be empty and can contain only letters, digits, and underscores. It may begin and end with any of those characters.
+To set a variable value, use the :ref:`set <cmd-set>` command. A variable name can not be empty and can contain only letters, digits, and underscores. It may begin and end with any of those characters.
 
 Example:
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 36d1131de..7cdbf436c 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -21,7 +21,7 @@ which means you are all set up and can start using fish::
 
     > fish
     Welcome to fish, the friendly interactive shell
-    Type <span class="cwd">help</span> for instructions on how to use fish
+    Type help for instructions on how to use fish
     you@hostname ~>____
 
 
@@ -37,7 +37,7 @@ Learning fish
 
 This tutorial assumes a basic understanding of command line shells and Unix commands, and that you have a working copy of ``fish``.
 
-If you have a strong understanding of other shells, and want to know what ``fish`` does differently, search for the magic phrase <em>unlike other shells</em>, which is used to call out important differences.
+If you have a strong understanding of other shells, and want to know what ``fish`` does differently, search for the magic phrase *unlike other shells*, which is used to call out important differences.
 
 
 Running Commands
@@ -260,7 +260,7 @@ Unlike other shells, ``fish`` does not have an export command. Instead, a variab
 
     >_ set -x MyVariable SomeValue
     >_ env | grep MyVariable
-    <m>MyVariable=SomeValue</m>
+    MyVariable=SomeValue
 
 
 You can erase a variable with ``-e`` or ``--erase``
@@ -370,7 +370,7 @@ A common idiom is to capture the output of a command in a variable::
 
 Command substitutions are not expanded within quotes. Instead, you can temporarily close the quotes, add the command substitution, and reopen them, all in the same argument::
 
-    >_ touch <i class="quote">"testing_"</i>(date +%s)<i class="quote">".txt"</i>
+    >_ touch "testing_"(date +%s)".txt"
     >_ ls *.txt
     testing_1360099791.txt
 
@@ -531,7 +531,7 @@ Loops
 While loops::
 
     >_ while true
-        echo <i class="quote">"Loop forever"</i>
+        echo "Loop forever"
     end
     Loop forever
     Loop forever
@@ -564,7 +564,7 @@ You can define your own prompt::
     >_ function fish_prompt
         echo "New Prompt % "
     end
-    <asis>New Prompt % </asis>___
+    New Prompt % 
 
 
 Multiple lines are OK. Colors can be set via ``set_color``, passing it named ANSI colors, or hex RGB values::

From 17116366dc21151a0fadd359a358df748d012a72 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 13:10:19 +0200
Subject: [PATCH 0440/1732] docs: Remove explicit .html links

Instead, we link to rst labels, which could also work in non-html
output, or if the section ever moves elsewhere.

See #5696.

[ci skip]
---
 sphinx_doc_src/commands.rst |  2 +-
 sphinx_doc_src/design.rst   |  2 ++
 sphinx_doc_src/index.rst    | 18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sphinx_doc_src/commands.rst b/sphinx_doc_src/commands.rst
index f2cd1c283..a72192cb5 100644
--- a/sphinx_doc_src/commands.rst
+++ b/sphinx_doc_src/commands.rst
@@ -1,4 +1,4 @@
-.. highlight:: fish-docs-samples
+.. _commands:
 
 Commands
 ============
diff --git a/sphinx_doc_src/design.rst b/sphinx_doc_src/design.rst
index 757cc9158..362b8ffb8 100644
--- a/sphinx_doc_src/design.rst
+++ b/sphinx_doc_src/design.rst
@@ -1,3 +1,5 @@
+.. _design:
+
 Design
 ======
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 25f4cbd54..25d15b131 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -34,7 +34,7 @@ Shell Standards
 
 A shell is an interface to the operating system that reads from the commandline of a terminal. A shell's task is to identify and interpret commands. The commands can come from different applications and can be written in different programming languages.
 
-This can only work smoothly if shells adapt to some common standards. For shells there is the POSIX standard, see `Command-line interpreters  <https://en.wikipedia.org/wiki/Command-line_interface#Command-line_interpreter>`_. ``fish`` tries to satisfy the POSIX standard wherever it does not get into the way of its own design principles, see `Design <design.html>`_.
+This can only work smoothly if shells adapt to some common standards. For shells there is the POSIX standard, see `Command-line interpreters  <https://en.wikipedia.org/wiki/Command-line_interface#Command-line_interpreter>`_. ``fish`` tries to satisfy the POSIX standard wherever it does not get into the way of its own design principles, see :ref:`Design <Design>`.
 
 Manual Pages
 ------------
@@ -439,7 +439,7 @@ For example, the following is a function definition that calls the command ``ls`
       ls -l $argv
   end
 
-The first line tells fish that a function by the name of ``ll`` is to be defined. To use it, simply write ``ll`` on the commandline. The second line tells fish that the command ``ls -l $argv`` should be called when ``ll`` is invoked. '``$argv``' is an array variable, which always contains all arguments sent to the function. In the example above, these are simply passed on to the ``ls`` command. For more information on functions, see the documentation for the `function <cmds/function.html>`_ builtin.
+The first line tells fish that a function by the name of ``ll`` is to be defined. To use it, simply write ``ll`` on the commandline. The second line tells fish that the command ``ls -l $argv`` should be called when ``ll`` is invoked. '``$argv``' is an array variable, which always contains all arguments sent to the function. In the example above, these are simply passed on to the ``ls`` command. For more information on functions, see the documentation for the :ref:`function <cmd-function>` builtin.
 
 .. _syntax-function-wrappers:
 
@@ -566,7 +566,7 @@ To provide a list of possible completions for myprog, use the ``-a`` switch. If
   complete -c myprog -s o -l output -a "yes no"
 
 
-There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the `complete <cmds/complete.html>`_ builtin, or write ``complete --help`` inside the ``fish`` shell.
+There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the :ref:`complete <cmd-complete>` builtin, or write ``complete --help`` inside the ``fish`` shell.
 
 As a simple example, here's an excerpt of the completions for systemd's ``timedatectl``::
 
@@ -719,7 +719,7 @@ Examples:
 
 - ``**`` matches any files and directories in the current directory and all of its subdirectories.
 
-Note that for most commands, if any wildcard fails to expand, the command is not executed, `$status <#variables-status>`_ is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 3 exceptions, namely `set <cmds/set.html>`_, `count <cmds/count.html>`_ and `for <cmds/for.html>`_. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
+Note that for most commands, if any wildcard fails to expand, the command is not executed, :ref:`$status <variables-status>` is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 3 exceptions, namely :ref:`set <cmd-set>`, :ref:`count <cmd-count>` and :ref:`for <cmd-for>`. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
 
 Examples::
 
@@ -1210,7 +1210,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``fish_user_paths``, an array of directories that are prepended to ``PATH``. This can be a universal variable.
 
-- ``umask``, the current file creation mask. The preferred way to change the umask variable is through the `umask <cmds/umask.html>`_ function. An attempt to set umask to an invalid value will always fail.
+- ``umask``, the current file creation mask. The preferred way to change the umask variable is through the :ref:`umask <cmd-umask>` function. An attempt to set umask to an invalid value will always fail.
 
 - ``BROWSER``, the user's preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
 
@@ -1226,7 +1226,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``hostname``, the machine's hostname.
 
-- ``IFS``, the internal field separator that is used for word splitting with the `read <cmds/read.html>`_ builtin. Setting this to the empty string will also disable line splitting in `command substitution <#expand-command-substitution>`_. This variable can be changed by the user.
+- ``IFS``, the internal field separator that is used for word splitting with the :ref:`read <cmd-read>` builtin. Setting this to the empty string will also disable line splitting in `command substitution <#expand-command-substitution>`_. This variable can be changed by the user.
 
 - ``PWD``, the current working directory.
 
@@ -1375,7 +1375,7 @@ Builtin commands
 
 Many other shells have a large library of builtin commands. Most of these commands are also available as standalone commands, but have been implemented in the shell anyway. To avoid code duplication, and to avoid the confusion of subtly differing versions of the same command, ``fish`` generally only implements builtins for actions which cannot be performed by a regular command.
 
-For a list of all builtins, functions and commands shipped with fish, see the `list of commands <commands.html>`_. The documentation is also available by using the ``--help`` switch of the command.
+For a list of all builtins, functions and commands shipped with fish, see the :ref:`list of commands <Commands>`. The documentation is also available by using the ``--help`` switch of the command.
 
 .. _editor:
 
@@ -1486,7 +1486,7 @@ It is also possible to add all emacs-mode bindings to vi-mode by using something
     end
 
 
-When in vi-mode, the `fish_mode_prompt <cmds/fish_mode_prompt.html>`_ function will display a mode indicator to the left of the prompt. The ``fish_vi_cursor`` function will be used to change the cursor's shape depending on the mode in supported terminals. To disable this feature, override it with an empty function. To display the mode elsewhere (like in your right prompt), use the output of the ``fish_default_mode_prompt`` function.
+When in vi-mode, the :ref:`fish_mode_prompt <cmd-fish_mode_prompt>` function will display a mode indicator to the left of the prompt. The ``fish_vi_cursor`` function will be used to change the cursor's shape depending on the mode in supported terminals. To disable this feature, override it with an empty function. To display the mode elsewhere (like in your right prompt), use the output of the ``fish_default_mode_prompt`` function.
 
 When a binding switches the mode, it will repaint the mode-prompt if it exists, and the rest of the prompt only if it doesn't. So if you want a mode-indicator in your ``fish_prompt``, you need to erase ``fish_mode_prompt`` e.g. by adding an empty file at `~/.config/fish/functions/fish_mode_prompt.fish`. (Bindings that change the mode are supposed to call the `repaint-mode` bind function, see :ref:`bind <cmd-bind>`)
 
@@ -1608,7 +1608,7 @@ Normally when ``fish`` starts a program, this program will be put in the foregro
 
 -# By pressing :kbd:`Control+Z`, the user stops a currently running foreground  program and returns control to ``fish``. Some programs do not support this feature, or remap it to another key. GNU Emacs uses :kbd:`Control+X` :kbd:`z` to stop running.
 
--# By using the `bg <cmds/bg.html>`_ and `fg <cmds/fg.html>`_ builtin commands, the user can send any currently running job into the foreground or background.
+-# By using the :ref:`bg <cmd-bg>` and :ref:`fg <cmd-fg>` builtin commands, the user can send any currently running job into the foreground or background.
 
 Note that functions cannot be started in the background. Functions that are stopped and then restarted in the background using the ``bg`` command will not execute correctly.
 

From 05b2d4ee5491700e00fdf96e23edbb846c5f6c30 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 30 Apr 2019 13:18:56 +0200
Subject: [PATCH 0441/1732] Docs: Document path vars more

Fixes #5741.

[ci skip]
---
 sphinx_doc_src/cmds/set.rst | 3 +++
 sphinx_doc_src/tutorial.rst | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index df051318c..405485924 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -40,6 +40,9 @@ The following options control variable scope:
 
 - ``-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.
+
+- ``--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.
 
 The following options are available:
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 7cdbf436c..668e4b195 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -288,7 +288,7 @@ Other variables, like ``$PATH``, really do have multiple values. During variable
     /usr/bin /bin /usr/sbin /sbin /usr/local/bin
 
 
-Note that there are three environment variables that are automatically split on colons to become lists when fish starts running: ``PATH``, ``CDPATH``, ``MANPATH``. Conversely, they are joined on colons when exported to subcommands. All other environment variables (e.g., ``LD_LIBRARY_PATH``) which have similar semantics are treated as simple strings.
+Variables whose name ends in "PATH" are automatically split on colons to become lists. They are joined using colons when exported to subcommands. This is for compatibility with other tools, which expect $PATH to use colons. You can also explicitly add this quirk to a variable with `set --path`, or remove it with `set --unpath`.
 
 Lists cannot contain other lists: there is no recursion.  A variable is a list of strings, full stop.
 

From b5865d2cba30769d4efdc922c3d0b77b08cace0a Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 30 Apr 2019 14:08:11 -0700
Subject: [PATCH 0442/1732] Spruce up fish_config output, show transcript of
 commands run

run_fish_cmd() now prints every command we run in a subshell

Fixes #5584
---
 share/tools/web_config/webconfig.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index c6aa3a5ba..1fdd83218 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -72,6 +72,8 @@ def run_fish_cmd(text):
         # Fish makes the same assumption in config.fish
         env = os.environ.copy()
         env.update(LC_CTYPE="en_US.UTF-8", LANG="en_US.UTF-8")
+
+    print("$ " + text)
     p = subprocess.Popen([FISH_BIN_PATH], stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                          env=env)
@@ -234,7 +236,7 @@ def get_special_ansi_escapes():
         # Helper function to get a value for a tparm
         def get_tparm(key):
             val = None
-            key = curses.tigetstr("sgr0")
+            key = curses.tigetstr(key)
             if key:
                 val = curses.tparm(key)
             if val:
@@ -1096,7 +1098,7 @@ redirect_template_html = """
 fish_bin_dir = os.environ.get('__fish_bin_dir')
 fish_bin_path = None
 if not fish_bin_dir:
-    print('The __fish_bin_dir environment variable is not set. '
+    print('The $__fish_bin_dir environment variable is not set. '
           'Looking in $PATH...')
     # distutils.spawn is terribly broken, because it looks in wd before PATH,
     # and doesn't actually validate that the file is even executable
@@ -1194,7 +1196,11 @@ f.close()
 # Open temporary file as URL
 # Use open on macOS >= 10.12.5 to work around #4035.
 fileurl = 'file://' + filename
-print("Web config started at '%s'. Hit enter to stop." % fileurl)
+
+esc = get_special_ansi_escapes()
+print("Web config started at %s%s%s" % (esc['underline'], fileurl, esc['exit_attribute_mode']))
+print("%sHit ENTER to stop.%s" % (esc['bold'], esc['exit_attribute_mode']))
+
 if isMacOS10_12_5_OrLater():
     subprocess.check_call(['open', fileurl])
 elif is_wsl():

From c05e72749a7669bb187faf89b102d379b336e8c3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 22:33:29 -0700
Subject: [PATCH 0443/1732] Rename PENDING_REMOVAL to DISOWN_REQUESTED

A commend implied that PENDING_REMOVAL was broader than it was. In practice
only disown() sets this flag. Rename the flag for clarity.
---
 src/builtin_disown.cpp |  2 +-
 src/proc.cpp           |  2 +-
 src/proc.h             | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 25654d138..09906a94c 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -34,7 +34,7 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
     // We cannot directly remove the job from the jobs() list as `disown` might be called
     // within the context of a subjob which will cause the parent job to crash in exec_job().
     // Instead, we set a flag and the parser removes the job from the jobs list later.
-    j->set_flag(job_flag_t::PENDING_REMOVAL, true);
+    j->set_flag(job_flag_t::DISOWN_REQUESTED, true);
     add_disowned_pgid(j->pgid);
 
     return STATUS_CMD_OK;
diff --git a/src/proc.cpp b/src/proc.cpp
index 2d71faf7b..4a01974de 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -537,7 +537,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
         // If the process has been previously flagged for removal, add it to the erase list without
         // any further processing, but do not remove any jobs until their parent jobs have completed
         // processing.
-        if (j->get_flag(job_flag_t::PENDING_REMOVAL) && j->job_chain_is_fully_constructed()) {
+        if (j->get_flag(job_flag_t::DISOWN_REQUESTED) && j->job_chain_is_fully_constructed()) {
             erase_list.push_back(j);
         }
         // If all processes have completed, tell the user the job has completed and delete it from
diff --git a/src/proc.h b/src/proc.h
index 340a39ddb..a03dd8cff 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -255,10 +255,8 @@ enum class job_flag_t {
     JOB_CONTROL,
     /// Whether the job wants to own the terminal when in the foreground.
     TERMINAL,
-    /// This job needs to be removed from the list of jobs for one reason or another (killed,
-    /// completed, disowned, etc). This flag is set rather than directly manipulating the jobs
-    /// list.
-    PENDING_REMOVAL,
+    /// This job is disowned, and should be removed from the active jobs list.
+    DISOWN_REQUESTED,
 
     JOB_FLAG_COUNT
 };
@@ -399,7 +397,9 @@ class job_t {
     /// The job is in a stopped state
     bool is_stopped() const;
     /// The job is OK to be externally visible, e.g. to the user via `jobs`
-    bool is_visible() const { return !is_completed() && is_constructed() && !get_flag(job_flag_t::PENDING_REMOVAL); };
+    bool is_visible() const {
+        return !is_completed() && is_constructed() && !get_flag(job_flag_t::DISOWN_REQUESTED);
+    };
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }

From 9700800ecff52b5e87919e55fc77958e6647b88a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 23:11:02 -0700
Subject: [PATCH 0444/1732] Factor disowned job removal into its own function

This helps break up process_clean_after_marking.
---
 src/proc.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 4a01974de..3f6013ca5 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -446,6 +446,20 @@ void proc_fire_event(const wchar_t *msg, event_type_t type, pid_t pid, int statu
     event_fire(event);
 }
 
+/// Remove all disowned jobs whose job chain is fully constructed (that is, do not erase disowned
+/// jobs that still have an in-flight parent job). Note we never print statuses for such jobs.
+void remove_disowned_jobs(job_list_t &jobs) {
+    auto iter = jobs.begin();
+    while (iter != jobs.end()) {
+        const auto &j = *iter;
+        if (j->get_flag(job_flag_t::DISOWN_REQUESTED) && j->job_chain_is_fully_constructed()) {
+            iter = jobs.erase(iter);
+        } else {
+            ++iter;
+        }
+    }
+}
+
 static bool process_clean_after_marking(bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
     bool found = false;
@@ -461,6 +475,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // Don't try to print in that case (#3222)
     const bool interactive = allow_interactive && cur_term != NULL;
 
+    // Remove all disowned jobs.
+    remove_disowned_jobs(jobs());
+
     // If we ever drop the `static bool locked` above, this should be changed to a local or
     // thread-local vector instead of a static vector. It is only static to reduce heap allocations.
     static std::vector<shared_ptr<job_t>> erase_list;
@@ -534,15 +551,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
             p->status = proc_status_t::from_exit_code(0);
         }
 
-        // If the process has been previously flagged for removal, add it to the erase list without
-        // any further processing, but do not remove any jobs until their parent jobs have completed
-        // processing.
-        if (j->get_flag(job_flag_t::DISOWN_REQUESTED) && j->job_chain_is_fully_constructed()) {
-            erase_list.push_back(j);
-        }
         // If all processes have completed, tell the user the job has completed and delete it from
         // the active job list.
-        else if (j->is_completed()) {
+        if (j->is_completed()) {
             if (!j->is_foreground() && !j->get_flag(job_flag_t::NOTIFIED) &&
                 !j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
                 print_job_status(j.get(), JOB_ENDED);

From b8170ec1ce9df26ea31aa259c959dede7cae5aed Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 29 Apr 2019 09:05:00 -0700
Subject: [PATCH 0445/1732] Clarify return value of job_reap and
 process_clean_after_marking

---
 src/proc.cpp | 20 ++++++++++----------
 src/proc.h   |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 3f6013ca5..66953c801 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -460,9 +460,11 @@ void remove_disowned_jobs(job_list_t &jobs) {
     }
 }
 
+/// Remove completed jobs from the job list, printing status messages as appropriate.
+/// \return whether something was printed.
 static bool process_clean_after_marking(bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
-    bool found = false;
+    bool printed = false;
 
     // This function may fire an event handler, we do not want to call ourselves recursively (to
     // avoid infinite recursion).
@@ -545,8 +547,8 @@ static bool process_clean_after_marking(bool allow_interactive) {
 
                 if (clr_eol) outputter_t::stdoutput().term_puts(clr_eol, 1);
                 std::fwprintf(stdout, L"\n");
+                printed = true;
             }
-            found = false;
             // clear status so it is not reported more than once
             p->status = proc_status_t::from_exit_code(0);
         }
@@ -557,7 +559,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
             if (!j->is_foreground() && !j->get_flag(job_flag_t::NOTIFIED) &&
                 !j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
                 print_job_status(j.get(), JOB_ENDED);
-                found = true;
+                printed = true;
             }
 
             erase_list.push_back(j);
@@ -565,7 +567,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
             // Notify the user about newly stopped jobs.
             if (!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
                 print_job_status(j.get(), JOB_STOPPED);
-                found = true;
+                printed = true;
             }
             j->set_flag(job_flag_t::NOTIFIED, true);
         }
@@ -604,29 +606,27 @@ static bool process_clean_after_marking(bool allow_interactive) {
 
     erase_list.clear();
 
-    if (found) {
+    if (printed) {
         fflush(stdout);
     }
 
     locked = false;
-    return found;
+    return printed;
 }
 
 bool job_reap(bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
-    bool found = false;
-
     process_mark_finished_children(false);
 
     // Preserve the exit status.
     auto saved_statuses = proc_get_last_statuses();
 
-    found = process_clean_after_marking(allow_interactive);
+    bool printed = process_clean_after_marking(allow_interactive);
 
     // Restore the exit status.
     proc_set_last_statuses(std::move(saved_statuses));
 
-    return found;
+    return printed;
 }
 
 /// Maximum length of a /proc/[PID]/stat filename.
diff --git a/src/proc.h b/src/proc.h
index a03dd8cff..e62633d35 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -482,9 +482,9 @@ void proc_set_last_statuses(statuses_t s);
 int proc_get_last_status();
 statuses_t proc_get_last_statuses();
 
-/// Notify the user about stopped or terminated jobs. Delete terminated jobs from the job list.
-///
-/// \param interactive whether interactive jobs should be reaped as well
+/// Notify the user about stopped or terminated jobs, and delete completed jobs from the job list.
+/// If \p interactive is set, allow reaping interactive jobs; otherwise skip them.
+/// \return whether text was printed to stdout.
 bool job_reap(bool interactive);
 
 /// Mark a process as failed to execute (and therefore completed).

From b5d3fadf44c57eb0197fc08e5cbb61063159e75f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 29 Apr 2019 09:12:34 -0700
Subject: [PATCH 0446/1732] Factor out the individual process handling in
 process_clean_after_marking

Helps break up this monolith.
---
 src/proc.cpp | 120 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 66953c801..be93edd76 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -460,6 +460,70 @@ void remove_disowned_jobs(job_list_t &jobs) {
     }
 }
 
+/// Given a a process in a job, print the status message for the process as appropriate, and then
+/// mark the status code so we don't print again. \return true if we printed a status message, false
+/// if not.
+static bool try_clean_process_in_job(process_t *p, job_t *j, bool only_one_job) {
+    if (!p->completed || !p->pid) {
+        return false;
+    }
+
+    auto s = p->status;
+    // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
+    // dies.
+    if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
+        return false;
+    }
+
+    int proc_is_job = (p->is_first_in_job && p->is_last_in_job);
+    if (proc_is_job) j->set_flag(job_flag_t::NOTIFIED, true);
+
+    // Handle signals other than SIGPIPE.
+    // Always report crashes.
+    if (j->get_flag(job_flag_t::SKIP_NOTIFICATION) && !contains(crashsignals, s.signal_code())) {
+        return false;
+    }
+
+    // Print nothing if we get SIGINT in the foreground process group, to avoid spamming
+    // obvious stuff on the console (#1119). If we get SIGINT for the foreground
+    // process, assume the user typed ^C and can see it working. It's possible they
+    // didn't, and the signal was delivered via pkill, etc., but the SIGINT/SIGTERM
+    // distinction is precisely to allow INT to be from a UI
+    // and TERM to be programmatic, so this assumption is keeping with the design of
+    // signals. If echoctl is on, then the terminal will have written ^C to the console.
+    // If off, it won't have. We don't echo ^C either way, so as to respect the user's
+    // preference.
+    bool printed = false;
+    if (s.signal_code() != SIGINT || !j->is_foreground()) {
+        if (proc_is_job) {
+            // We want to report the job number, unless it's the only job, in which case
+            // we don't need to.
+            const wcstring job_number_desc =
+                only_one_job ? wcstring() : format_string(_(L"Job %d, "), j->job_id);
+            std::fwprintf(stdout, _(L"%ls: %ls\'%ls\' terminated by signal %ls (%ls)"),
+                          program_name, job_number_desc.c_str(),
+                          truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
+                          signal_get_desc(s.signal_code()));
+        } else {
+            const wcstring job_number_desc =
+                only_one_job ? wcstring() : format_string(L"from job %d, ", j->job_id);
+            const wchar_t *fmt =
+                _(L"%ls: Process %d, \'%ls\' %ls\'%ls\' terminated by signal %ls (%ls)");
+            std::fwprintf(stdout, fmt, program_name, p->pid, p->argv0(), job_number_desc.c_str(),
+                          truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
+                          signal_get_desc(s.signal_code()));
+        }
+
+        if (clr_eol) outputter_t::stdoutput().term_puts(clr_eol, 1);
+        std::fwprintf(stdout, L"\n");
+        printed = true;
+    }
+    // Clear status so it is not reported more than once.
+    // TODO: this seems like a clumsy way to ensure that.
+    p->status = proc_status_t::from_exit_code(0);
+    return printed;
+}
+
 /// Remove completed jobs from the job list, printing status messages as appropriate.
 /// \return whether something was printed.
 static bool process_clean_after_marking(bool allow_interactive) {
@@ -495,62 +559,10 @@ static bool process_clean_after_marking(bool allow_interactive) {
             continue;
         }
 
-        for (const process_ptr_t &p : j->processes) {
-            if (!p->completed || !p->pid) {
-                continue;
-            }
-
-            auto s = p->status;
-            // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
-            // dies.
-            if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
-                continue;
-            }
-
-            // Handle signals other than SIGPIPE.
-            int proc_is_job = (p->is_first_in_job && p->is_last_in_job);
-            if (proc_is_job) j->set_flag(job_flag_t::NOTIFIED, true);
-            // Always report crashes.
-            if (j->get_flag(job_flag_t::SKIP_NOTIFICATION) &&
-                !contains(crashsignals, s.signal_code())) {
-                continue;
-            }
-
-            // Print nothing if we get SIGINT in the foreground process group, to avoid spamming
-            // obvious stuff on the console (#1119). If we get SIGINT for the foreground
-            // process, assume the user typed ^C and can see it working. It's possible they
-            // didn't, and the signal was delivered via pkill, etc., but the SIGINT/SIGTERM
-            // distinction is precisely to allow INT to be from a UI
-            // and TERM to be programmatic, so this assumption is keeping with the design of
-            // signals. If echoctl is on, then the terminal will have written ^C to the console.
-            // If off, it won't have. We don't echo ^C either way, so as to respect the user's
-            // preference.
-            if (s.signal_code() != SIGINT || !j->is_foreground()) {
-                if (proc_is_job) {
-                    // We want to report the job number, unless it's the only job, in which case
-                    // we don't need to.
-                    const wcstring job_number_desc =
-                        only_one_job ? wcstring() : format_string(_(L"Job %d, "), j->job_id);
-                    std::fwprintf(stdout, _(L"%ls: %ls\'%ls\' terminated by signal %ls (%ls)"),
-                             program_name, job_number_desc.c_str(),
-                             truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
-                             signal_get_desc(s.signal_code()));
-                } else {
-                    const wcstring job_number_desc =
-                        only_one_job ? wcstring() : format_string(L"from job %d, ", j->job_id);
-                    const wchar_t *fmt =
-                        _(L"%ls: Process %d, \'%ls\' %ls\'%ls\' terminated by signal %ls (%ls)");
-                    std::fwprintf(stdout, fmt, program_name, p->pid, p->argv0(), job_number_desc.c_str(),
-                             truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
-                             signal_get_desc(s.signal_code()));
-                }
-
-                if (clr_eol) outputter_t::stdoutput().term_puts(clr_eol, 1);
-                std::fwprintf(stdout, L"\n");
+        for (process_ptr_t &p : j->processes) {
+            if (try_clean_process_in_job(p.get(), j.get(), only_one_job)) {
                 printed = true;
             }
-            // clear status so it is not reported more than once
-            p->status = proc_status_t::from_exit_code(0);
         }
 
         // If all processes have completed, tell the user the job has completed and delete it from

From 43d668bdc8832abac4dd3e72a7ed2f004415c427 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 May 2019 11:24:54 -0700
Subject: [PATCH 0447/1732] Continue to refactor internal loop of
 process_clean_after_marking

Factor our logic around when to print a message.
---
 src/proc.cpp | 55 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index be93edd76..fccfabb66 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -524,6 +524,25 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, bool only_one_job)
     return printed;
 }
 
+/// \return whether this job wants a status message printed when it stops or completes.
+/// If \p print_stopped_foregrounds is set, then treat stopped foreground jobs as wanting a message.
+/// This should conceptually always be true and we only sometimes leave it as false to allow job IDs
+/// to be more aggressively reclaimed. TODO: rationalize this!
+static bool job_wants_message(const shared_ptr<job_t> &j, bool print_for_foreground_stops = true) {
+    // Did we already print a status message?
+    if (j->get_flag(job_flag_t::NOTIFIED)) return false;
+
+    // Do we just skip notifications?
+    if (j->get_flag(job_flag_t::SKIP_NOTIFICATION)) return false;
+
+    // Are we foreground?
+    // The idea here is to not print status messages for jobs that execute in the foreground (i.e.
+    // without & and without being `bg`).
+    if (j->is_foreground()) return false;
+
+    return true;
+}
+
 /// Remove completed jobs from the job list, printing status messages as appropriate.
 /// \return whether something was printed.
 static bool process_clean_after_marking(bool allow_interactive) {
@@ -549,39 +568,35 @@ static bool process_clean_after_marking(bool allow_interactive) {
     static std::vector<shared_ptr<job_t>> erase_list;
     const bool only_one_job = jobs().size() == 1;
     for (const auto &j : jobs()) {
+        // Skip unconstructed jobs.
         if (!j->is_constructed()) {
             continue;
         }
-        // If we are reaping only jobs who do not need status messages sent to the console, do not
-        // consider reaping jobs that need status messages.
-        if ((!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) && (!interactive) &&
-            (!j->is_foreground())) {
+
+        // If we are not interactive, skip cleaning jobs that want to print an interactive message.
+        if (!interactive && job_wants_message(j, false)) {
             continue;
         }
 
+        // Clean processes within the job.
+        // Note this may print the message on behalf of the job, affecting the result of
+        // job_wants_message().
         for (process_ptr_t &p : j->processes) {
             if (try_clean_process_in_job(p.get(), j.get(), only_one_job)) {
                 printed = true;
             }
         }
 
-        // If all processes have completed, tell the user the job has completed and delete it from
-        // the active job list.
-        if (j->is_completed()) {
-            if (!j->is_foreground() && !j->get_flag(job_flag_t::NOTIFIED) &&
-                !j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
-                print_job_status(j.get(), JOB_ENDED);
-                printed = true;
-            }
-
-            erase_list.push_back(j);
-        } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {
-            // Notify the user about newly stopped jobs.
-            if (!j->get_flag(job_flag_t::SKIP_NOTIFICATION)) {
-                print_job_status(j.get(), JOB_STOPPED);
-                printed = true;
-            }
+        // Print the message if we need to.
+        if (job_wants_message(j) && (j->is_completed() || j->is_stopped())) {
+            print_job_status(j.get(), j->is_completed() ? JOB_ENDED : JOB_STOPPED);
             j->set_flag(job_flag_t::NOTIFIED, true);
+            printed = true;
+        }
+
+        // Remove us from the job list if we're complete.
+        if (j->is_completed()) {
+            erase_list.push_back(j);
         }
     }
 

From 3dfaa192da1647e3375b391286b303b5075ce1eb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 May 2019 16:17:23 -0700
Subject: [PATCH 0448/1732] Put back process and job exit events

These were removed in f8b2e818ed6606e4fd10bc416f2f6c9ad8b49f86 under a
belief that they were unused. But they are documented and supported.
---
 src/fish.cpp     |  2 +-
 src/proc.cpp     | 43 ++++++++++++++++++++++++++++++++-----------
 src/proc.h       |  5 ++---
 tests/jobs.in    |  9 +++++++++
 tests/jobs.out   |  1 +
 tests/signal.out |  9 +++++++++
 6 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 3e25c5bd6..3bd1742e6 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -474,7 +474,7 @@ int main(int argc, char **argv) {
 
     // TODO: The generic process-exit event is useless and unused.
     // Remove this in future.
-    proc_fire_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status);
+    event_fire(proc_create_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status));
 
     // Trigger any exit handlers.
     wcstring_list_t event_args = {to_string(exit_status)};
diff --git a/src/proc.cpp b/src/proc.cpp
index fccfabb66..072e948dd 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -436,14 +436,14 @@ static void print_job_status(const job_t *j, job_status_t status) {
     outp.flush_to(STDOUT_FILENO);
 }
 
-void proc_fire_event(const wchar_t *msg, event_type_t type, pid_t pid, int status) {
+event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int status) {
     event_t event{type};
     event.desc.param1.pid = pid;
 
     event.arguments.push_back(msg);
     event.arguments.push_back(to_string(pid));
     event.arguments.push_back(to_string(status));
-    event_fire(event);
+    return event;
 }
 
 /// Remove all disowned jobs whose job chain is fully constructed (that is, do not erase disowned
@@ -461,16 +461,21 @@ void remove_disowned_jobs(job_list_t &jobs) {
 }
 
 /// Given a a process in a job, print the status message for the process as appropriate, and then
-/// mark the status code so we don't print again. \return true if we printed a status message, false
-/// if not.
-static bool try_clean_process_in_job(process_t *p, job_t *j, bool only_one_job) {
+/// mark the status code so we don't print again. Populate any events into \p exit_events.
+/// \return true if we printed a status message, false if not.
+static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t> *exit_events,
+                                     bool only_one_job) {
     if (!p->completed || !p->pid) {
         return false;
     }
 
     auto s = p->status;
-    // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
-    // dies.
+
+    // Add an exit event.
+    exit_events->push_back(proc_create_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
+                                             s.normal_exited() ? s.exit_code() : -1));
+
+    // Ignore SIGPIPE. We issue it ourselves to the pipe writer when the pipe reader dies.
     if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
         return false;
     }
@@ -566,6 +571,12 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // If we ever drop the `static bool locked` above, this should be changed to a local or
     // thread-local vector instead of a static vector. It is only static to reduce heap allocations.
     static std::vector<shared_ptr<job_t>> erase_list;
+
+    // Accumulate exit events into a new list, which we fire after the list manipulation is
+    // complete.
+    std::vector<event_t> exit_events;
+
+    // Print status messages for completed or stopped jobs.
     const bool only_one_job = jobs().size() == 1;
     for (const auto &j : jobs()) {
         // Skip unconstructed jobs.
@@ -582,7 +593,7 @@ static bool process_clean_after_marking(bool allow_interactive) {
         // Note this may print the message on behalf of the job, affecting the result of
         // job_wants_message().
         for (process_ptr_t &p : j->processes) {
-            if (try_clean_process_in_job(p.get(), j.get(), only_one_job)) {
+            if (try_clean_process_in_job(p.get(), j.get(), &exit_events, only_one_job)) {
                 printed = true;
             }
         }
@@ -594,6 +605,16 @@ static bool process_clean_after_marking(bool allow_interactive) {
             printed = true;
         }
 
+        // Prepare events for completed jobs.
+        if (j->is_completed()) {
+            if (j->pgid != INVALID_PID) {
+                exit_events.push_back(
+                    proc_create_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0));
+            }
+            exit_events.push_back(
+                proc_create_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0));
+        }
+
         // Remove us from the job list if we're complete.
         if (j->is_completed()) {
             erase_list.push_back(j);
@@ -626,9 +647,9 @@ static bool process_clean_after_marking(bool allow_interactive) {
         }
     }
 
-    // Only now notify any listeners of the job exit, so that the contract isn't violated
-    for (const auto &j : erase_list) {
-        proc_fire_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0);
+    // Post pending exit events.
+    for (const auto &evt : exit_events) {
+        event_fire(evt);
     }
 
     erase_list.clear();
diff --git a/src/proc.h b/src/proc.h
index e62633d35..e74610e93 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -502,9 +502,8 @@ void proc_update_jiffies();
 /// job is in the foreground, that every process is in a valid state, etc.
 void proc_sanity_check();
 
-/// Send a process/job exit event notification. This function is a convenience wrapper around
-/// event_fire().
-void proc_fire_event(const wchar_t *msg, event_type_t type, pid_t pid, int status);
+/// Create a process/job exit event notification.
+event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int status);
 
 /// Initializations.
 void proc_init();
diff --git a/tests/jobs.in b/tests/jobs.in
index 7be84be4b..7132953e4 100644
--- a/tests/jobs.in
+++ b/tests/jobs.in
@@ -21,3 +21,12 @@ function foo
     jobs -c
 end
 foo
+
+# Verify we observe job exit events
+sleep 1 &
+set sleep_job $last_pid
+function sleep_done_$sleep_job --on-job-exit $sleep_job
+    /bin/echo "sleep is done"
+    functions --erase sleep_done_$sleep_job
+end
+sleep 2
diff --git a/tests/jobs.out b/tests/jobs.out
index 53ff0b574..62e4d97d5 100644
--- a/tests/jobs.out
+++ b/tests/jobs.out
@@ -8,3 +8,4 @@ sleep
 sleep
 Command
 sleep
+sleep is done
diff --git a/tests/signal.out b/tests/signal.out
index f2cd4188c..10aa9b5f3 100644
--- a/tests/signal.out
+++ b/tests/signal.out
@@ -1,8 +1,17 @@
 ALRM received
 command false:
+PROCESS_EXIT 1
+JOB_EXIT 0
 command true:
+PROCESS_EXIT 0
+JOB_EXIT 0
 command false | true:
+PROCESS_EXIT 1
+PROCESS_EXIT 0
+JOB_EXIT 0
 This is the process whose exit event shuld be blocked
 This should come before the event handler
+PROCESS_EXIT 0
+JOB_EXIT 0
 Now event handler should have run
 PROCESS_EXIT 0

From 55e3270ac4375421090b1e0c063e8f6730dbdd55 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 May 2019 16:25:30 -0700
Subject: [PATCH 0449/1732] Remove erase_list from process_clean_after_marking

We don't need to maintain an erase_list in this function any more.
Simply remove jobs that are completed.
---
 src/proc.cpp | 41 +++++------------------------------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 072e948dd..49a28f63b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -568,10 +568,6 @@ static bool process_clean_after_marking(bool allow_interactive) {
     // Remove all disowned jobs.
     remove_disowned_jobs(jobs());
 
-    // If we ever drop the `static bool locked` above, this should be changed to a local or
-    // thread-local vector instead of a static vector. It is only static to reduce heap allocations.
-    static std::vector<shared_ptr<job_t>> erase_list;
-
     // Accumulate exit events into a new list, which we fire after the list manipulation is
     // complete.
     std::vector<event_t> exit_events;
@@ -614,46 +610,19 @@ static bool process_clean_after_marking(bool allow_interactive) {
             exit_events.push_back(
                 proc_create_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0));
         }
-
-        // Remove us from the job list if we're complete.
-        if (j->is_completed()) {
-            erase_list.push_back(j);
-        }
     }
 
-    if (!erase_list.empty()) {
-        // The intersection of the two lists is typically O(m*n), but we know the order
-        // of the entries in erase_list is the same as their matches in jobs(), so we can
-        // use that to our advantage.
-        auto to_erase = erase_list.begin();
-        jobs().erase(std::remove_if(jobs().begin(), jobs().end(),
-                    [&to_erase](const shared_ptr<job_t> &j) {
-            if (to_erase != erase_list.end() && *to_erase == j) {
-                ++to_erase;
-                return true;
-            }
-            return false;
-        }), jobs().end());
-
-        if (should_debug(2)) {
-            // Assertions prevent the application from continuing in case of invalid state. If we
-            // did not remove all objects from the list, it's not bad enough to abort and die, but
-            // leave this check here so that we can be alerted to the situtaion if running at a
-            // higher debug level. Or just remove it. But I wouldn't want to be the person that has
-            // to debug this without even this soft assertion in place when some C++ standard
-            // library decides to make std::remove_if iterate backwards or in random order!
-            assert(to_erase == erase_list.end()
-                && "Not all jobs slated for erasure have been erased!");
-        }
-    }
+    // Remove completed jobs.
+    // Do this before calling out to user code in the event handler below, to ensure an event
+    // handler doesn't remove jobs on our behalf.
+    auto is_complete = [](const shared_ptr<job_t> &j) { return j->is_completed(); };
+    jobs().erase(std::remove_if(jobs().begin(), jobs().end(), is_complete), jobs().end());
 
     // Post pending exit events.
     for (const auto &evt : exit_events) {
         event_fire(evt);
     }
 
-    erase_list.clear();
-
     if (printed) {
         fflush(stdout);
     }

From 72e43a514b0c38903659f112c2ca183e2eb597fd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 May 2019 17:47:50 -0700
Subject: [PATCH 0450/1732] Correct the warning for invalid directories

This was inadvertently broken.
---
 src/path.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/path.cpp b/src/path.cpp
index 0a47f11ee..7037b568c 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -258,8 +258,9 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
                                      int saved_errno) {
     auto &vars = env_stack_t::globals();
     wcstring warning_var_name = L"_FISH_WARNED_" + which_dir;
-    auto var = vars.get(warning_var_name, ENV_GLOBAL | ENV_EXPORT);
-    if (!var) return;
+    if (vars.get(warning_var_name, ENV_GLOBAL | ENV_EXPORT)) {
+        return;
+    }
     vars.set_one(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
 
     debug(0, custom_error_msg.c_str());

From 649d3ac101235c8c4d059764de47cbc313f8c5a5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 May 2019 17:31:22 -0700
Subject: [PATCH 0451/1732] Simplify reporting of invalid config paths

Do this at a well defined point, instead of randomly the first time they're
queried.
---
 src/env.cpp  |   3 ++
 src/path.cpp | 104 ++++++++++++++++++++++++++-------------------------
 src/path.h   |   5 +++
 3 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 8f8b12415..06e13fe0d 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -730,6 +730,9 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
 
     init_input();
 
+    // Complain about invalid config paths.
+    path_emit_config_directory_errors(vars);
+
     // Set up universal variables. The empty string means to use the default path.
     assert(s_universal_variables == NULL);
     s_universal_variables = new env_universal_t(L"");
diff --git a/src/path.cpp b/src/path.cpp
index 7037b568c..c07a8fd61 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -255,8 +255,7 @@ wcstring path_apply_working_directory(const wcstring &path, const wcstring &work
 /// a function) we don't want that subshell to issue the same warnings.
 static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &custom_error_msg,
                                      bool using_xdg, const wcstring &xdg_var, const wcstring &path,
-                                     int saved_errno) {
-    auto &vars = env_stack_t::globals();
+                                     int saved_errno, env_stack_t &vars) {
     wcstring warning_var_name = L"_FISH_WARNED_" + which_dir;
     if (vars.get(warning_var_name, ENV_GLOBAL | ENV_EXPORT)) {
         return;
@@ -278,74 +277,77 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
     ignore_result(write(STDERR_FILENO, "\n", 1));
 }
 
-static void path_create(wcstring &path, const wcstring &xdg_var, const wcstring &which_dir,
-                        const wcstring &custom_error_msg) {
-    bool path_done = false;
-    bool using_xdg = false;
-    int saved_errno = 0;
+/// The following type wraps up a user's "base" directories, corresponding (conceptually if not
+/// actually) to XDG spec.
+struct base_directory_t {
+    wcstring path{};       /// the path where we attempted to create the directory.
+    bool success{false};   /// whether creating the directory succeeded.
+    int err{0};            /// the error code if creating the directory failed.
+    bool used_xdg{false};  /// whether an XDG variable was used in resolving the direcotry.
+};
 
+/// Attempt to get a base directory, creating it if necessary. If a variable named \p xdg_var is
+/// set, use that directory; otherwise use the path \p non_xdg_homepath rooted in $HOME. \return the
+/// result; see the base_directory_t fields.
+static base_directory_t make_base_directory(const wcstring &xdg_var,
+                                            const wchar_t *non_xdg_homepath) {
     // The vars we fetch must be exported. Allowing them to be universal doesn't make sense and
     // allowing that creates a lock inversion that deadlocks the shell since we're called before
     // uvars are available.
     const auto &vars = env_stack_t::globals();
+    base_directory_t result{};
     const auto xdg_dir = vars.get(xdg_var, ENV_GLOBAL | ENV_EXPORT);
     if (!xdg_dir.missing_or_empty()) {
-        using_xdg = true;
-        path = xdg_dir->as_string() + L"/fish";
-        if (create_directory(path) != -1) {
-            path_done = true;
-        } else {
-            saved_errno = errno;
-        }
+        result.path = xdg_dir->as_string() + L"/fish";
+        result.used_xdg = true;
     } else {
         const auto home = vars.get(L"HOME", ENV_GLOBAL | ENV_EXPORT);
         if (!home.missing_or_empty()) {
-            path = home->as_string() +
-                   (which_dir == L"config" ? L"/.config/fish" : L"/.local/share/fish");
-            if (create_directory(path) != -1) {
-                path_done = true;
-            } else {
-                saved_errno = errno;
-            }
+            result.path = home->as_string() + non_xdg_homepath;
         }
     }
 
-    if (!path_done) {
-        maybe_issue_path_warning(which_dir, custom_error_msg, using_xdg, xdg_var, path,
-                                 saved_errno);
-        path.clear();
-    }
-
-    return;
+    errno = 0;
+    result.success = !result.path.empty() && create_directory(result.path) != -1;
+    result.err = errno;
+    return result;
+}
+
+static const base_directory_t &get_data_directory() {
+    static base_directory_t s_dir = make_base_directory(L"XDG_DATA_HOME", L"/.local/share/fish");
+    return s_dir;
+}
+
+static const base_directory_t &get_config_directory() {
+    static base_directory_t s_dir = make_base_directory(L"XDG_CONFIG_HOME", L"/.config/fish");
+    return s_dir;
+}
+
+void path_emit_config_directory_errors(env_stack_t &vars) {
+    const auto &data = get_data_directory();
+    if (!data.success) {
+        maybe_issue_path_warning(L"data", _(L"Your history will not be saved."), data.used_xdg,
+                                 L"XDG_DATA_HOME", data.path, data.err, vars);
+    }
+
+    const auto &config = get_config_directory();
+    if (!config.success) {
+        maybe_issue_path_warning(L"config", _(L"Your personal settings will not be saved."),
+                                 config.used_xdg, L"XDG_CONFIG_HOME", config.path, config.err,
+                                 vars);
+    }
 }
 
-/// Cache the config path.
 bool path_get_config(wcstring &path) {
-    static bool config_path_done = false;
-    static wcstring config_path(L"");
-
-    if (!config_path_done) {
-        path_create(config_path, L"XDG_CONFIG_HOME", L"config",
-                    _(L"Your personal settings will not be saved."));
-        config_path_done = true;
-    }
-
-    path = config_path;
-    return !config_path.empty();
+    const auto &dir = get_config_directory();
+    path = dir.success ? dir.path : L"";
+    return dir.success;
 }
 
-/// Cache the data path.
 bool path_get_data(wcstring &path) {
-    static bool data_path_done = false;
-    static wcstring data_path(L"");
-
-    if (!data_path_done) {
-        data_path_done = true;
-        path_create(data_path, L"XDG_DATA_HOME", L"data", _(L"Your history will not be saved."));
-    }
-
-    path = data_path;
-    return !data_path.empty();
+    const auto &dir = get_data_directory();
+    path = dir.success ? dir.path : L"";
+    return dir.success;
 }
 
 void path_make_canonical(wcstring &path) {
diff --git a/src/path.h b/src/path.h
index ae0cc31c0..a6074df48 100644
--- a/src/path.h
+++ b/src/path.h
@@ -29,6 +29,11 @@ bool path_get_config(wcstring &path);
 /// \return whether the directory was returned successfully
 bool path_get_data(wcstring &path);
 
+/// Emit any errors if config directories are missing.
+/// Use the given environment stack to ensure this only occurs once.
+class env_stack_t;
+void path_emit_config_directory_errors(env_stack_t &vars);
+
 /// Finds the full path of an executable.
 ///
 /// Args:

From 411b4aea9dd2ea29c499e3593b847eab642478b2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 2 May 2019 16:28:12 +0200
Subject: [PATCH 0452/1732] share/completions/env: Fix

This completed the commandline with options removed, which looked like

    env VAR=VAL command option

Which didn't really actually work.

Fixes #5856.

[ci skip]
---
 share/completions/env.fish | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/share/completions/env.fish b/share/completions/env.fish
index 7d6fa16ad..cbe6a6b97 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -1,6 +1,20 @@
 function __fish_complete_env_subcommand
     argparse -s s/ignore-environment u/unset h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null
     or return
+
+    # argv[1] is `env` or an alias.
+    set -e argv[1]
+
+    # Remove all VAR=VAL arguments up to the first that isn't
+    while set -q argv[1]
+        if string match -q '*=*' -- $argv[1]
+            set -e argv[1]
+        else
+            break
+        end
+    end
+
+    # Then complete the rest as if it was given as a command.
     if set -q argv[1]
         complete -C"$argv"
         return 0

From e91eb85949e1271f2b7c6fa7fca5f8018820de75 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 3 May 2019 16:20:40 +0200
Subject: [PATCH 0453/1732] argparse: Fix `--` regression

I was a tad overzealous there with not appending the remaining
arguments.

Weird that we didn't test it, though.

Fixes #5857.
---
 src/builtin_argparse.cpp | 6 ++----
 tests/argparse.err       | 3 +++
 tests/argparse.in        | 6 ++++++
 tests/argparse.out       | 6 ++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 3b38c0e0b..d1a9ec576 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -634,10 +634,8 @@ static int argparse_parse_args(argparse_cmd_opts_t &opts, const wcstring_list_t
     retval = check_for_mutually_exclusive_flags(opts, streams);
     if (retval != STATUS_CMD_OK) return retval;
 
-    if (opts.stop_nonopt) {
-        for (int i = optind; argv[i]; i++) {
-            opts.argv.push_back(argv[i]);
-        }
+    for (int i = optind; argv[i]; i++) {
+        opts.argv.push_back(argv[i]);
     }
 
     return STATUS_CMD_OK;
diff --git a/tests/argparse.err b/tests/argparse.err
index 14120e58e..417c205a0 100644
--- a/tests/argparse.err
+++ b/tests/argparse.err
@@ -118,3 +118,6 @@ in function 'notargparse'
 
 ####################
 # Check for crash when last option is unknown
+
+####################
+# Checking arguments after --
diff --git a/tests/argparse.in b/tests/argparse.in
index 3b9c0d811..01d9aba3b 100644
--- a/tests/argparse.in
+++ b/tests/argparse.in
@@ -189,3 +189,9 @@ echo $_flag_a
 
 logmsg Check for crash when last option is unknown
 argparse -i b/break -- "-b kubectl get pods -l name=foo"
+
+begin
+    logmsg Checking arguments after "--"
+    argparse a/alpha -- a --alpha -- b -a
+    printf '%s\n' $argv
+end
diff --git a/tests/argparse.out b/tests/argparse.out
index 2a1f9b8c7..c70257994 100644
--- a/tests/argparse.out
+++ b/tests/argparse.out
@@ -140,3 +140,9 @@ alpha aaaa
 
 ####################
 # Check for crash when last option is unknown
+
+####################
+# Checking arguments after --
+a
+b
+-a

From 0784b765700da767e755bbbc06cbe4ac3d6d9471 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 3 May 2019 16:35:25 +0200
Subject: [PATCH 0454/1732] completions/env: Inhibit files

(Also remove annoying "commmand" description)

[ci skip]
---
 share/completions/env.fish | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/completions/env.fish b/share/completions/env.fish
index cbe6a6b97..2f939bd91 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -22,8 +22,10 @@ function __fish_complete_env_subcommand
     return 1
 end
 
+# Files aren't useful with env. They are correctly suggested with the command.
+complete -c env -f
 
-complete -c env -a "(__fish_complete_env_subcommand)" -d "Command"
+complete -c env -a "(__fish_complete_env_subcommand)" # -d "Command"
 
 complete -c env -n 'not __fish_complete_env_subcommand' -a "(set -n)=" -x -d "Redefine variable"
 complete -c env -n 'not __fish_complete_env_subcommand' -s i -l ignore-environment -d "Start with an empty environment"

From 0dd9f64bd9e3579e1786a52b9cd638b790bc4bf9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 12:41:15 -0700
Subject: [PATCH 0455/1732] Make topic monitor compatible with tsan

tsan does funny things to signals, preventing signals from being delivered
in a blocking read. Switch the topic monitor to non-blocking reads under
tsan.
---
 src/topic_monitor.cpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index 2c28a7517..7818f56bb 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -6,6 +6,17 @@
 
 #include <unistd.h>
 
+// Whoof. Thread Sanitizer swallows signals and replays them at its leisure, at the point where
+// instrumented code makes certain blocking calls. But tsan cannot interrupt a signal call, so
+// if we're blocked in read() (like the topic monitor wants to be!), we'll never receive SIGCHLD
+// and so deadlock. So if tsan is enabled, we mark our fd as non-blocking (so reads will never
+// block) and use use select() to poll it.
+#if defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+#define TOPIC_MONITOR_TSAN_WORKAROUND 1
+#endif
+#endif
+
 /// Implementation of the principal monitor. This uses new (and leaks) to avoid registering a
 /// pointless at-exit handler for the dtor.
 static topic_monitor_t *const s_principal = new topic_monitor_t();
@@ -25,6 +36,10 @@ topic_monitor_t::topic_monitor_t() {
     // Make sure that our write side doesn't block, else we risk hanging in a signal handler.
     // The read end must block to avoid spinning in await.
     DIE_ON_FAILURE(make_fd_nonblocking(pipes_.write.fd()));
+
+#if TOPIC_MONITOR_TSAN_WORKAROUND
+    DIE_ON_FAILURE(make_fd_nonblocking(pipes_.read.fd()));
+#endif
 }
 
 topic_monitor_t::~topic_monitor_t() = default;
@@ -74,8 +89,18 @@ void topic_monitor_t::await_metagen(generation_t mgen) {
     // Read until the metagen changes. It may already have changed.
     // Note because changes are coalesced, we can read a lot, potentially draining the pipe.
     while (mgen == current_metagen()) {
+        int fd = pipes_.read.fd();
+#if TOPIC_MONITOR_TSAN_WORKAROUND
+        // Under tsan our notifying pipe is non-blocking, so we would busy-loop on the read() call
+        // until data is available (that is, fish would use 100% cpu while waiting for processes).
+        // The select prevents that.
+        fd_set fds;
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+        (void)select(fd + 1, &fds, nullptr, nullptr, nullptr /* timeout */);
+#endif
         uint8_t ignored[PIPE_BUF];
-        (void)read(pipes_.read.fd(), ignored, sizeof ignored);
+        (void)read(fd, ignored, sizeof ignored);
     }
 
     // Release the lock and wake up the remaining waiters.

From ec45f31ad130e113a31c4f95451a343fe13643db Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 15:28:20 -0700
Subject: [PATCH 0456/1732] Make debug_level an atomic

Fixes a tsan warning
---
 src/common.cpp     | 2 +-
 src/common.h       | 5 +++--
 src/fish_tests.cpp | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 73e2f43ae..1ce118608 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -75,7 +75,7 @@ int omitted_newline_width;
 wchar_t obfuscation_read_char;
 bool g_profiling_active = false;
 const wchar_t *program_name;
-int debug_level = 1;         // default maximum debug output level (errors and warnings)
+std::atomic<int> debug_level{1};  // default maximum debug output level (errors and warnings)
 int debug_stack_frames = 0;  // default number of stack frames to show on debug() calls
 
 /// Be able to restore the term's foreground process group.
diff --git a/src/common.h b/src/common.h
index 6b4f33796..bc09cad32 100644
--- a/src/common.h
+++ b/src/common.h
@@ -12,6 +12,7 @@
 #endif
 
 #include <algorithm>
+#include <atomic>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -158,9 +159,9 @@ typedef unsigned int escape_flags_t;
 
 /// The verbosity level of fish. If a call to debug has a severity level higher than \c debug_level,
 /// it will not be printed.
-extern int debug_level;
+extern std::atomic<int> debug_level;
 
-inline bool should_debug(int level) { return level <= debug_level; }
+inline bool should_debug(int level) { return level <= debug_level.load(std::memory_order_relaxed); }
 
 #define debug(level, ...)                                            \
     do {                                                             \
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index f47e244d7..9cb125fef 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2426,10 +2426,12 @@ static void test_dup2s() {
 
     // Invalid files should fail to open.
     // Suppress the debug() message.
-    scoped_push<int> saved_debug_level(&debug_level, -1);
+    int saved_debug_level = debug_level;
+    debug_level = -1;
     chain.push_back(make_shared<io_file_t>(2, L"/definitely/not/a/valid/path/for/this/test", 0666));
     list = dup2_list_t::resolve_chain(chain);
     do_test(!list.has_value());
+    debug_level = saved_debug_level;
 }
 
 static void test_dup2s_fd_for_target_fd() {

From c0c7b0f86f9efb4667c87081c69fadcef83d0618 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 16:13:55 -0700
Subject: [PATCH 0457/1732] Make tsan detection gcc compatible

---
 src/topic_monitor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index 7818f56bb..a948f75bc 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -16,6 +16,9 @@
 #define TOPIC_MONITOR_TSAN_WORKAROUND 1
 #endif
 #endif
+#if __SANITIZE_THREAD__
+#define TOPIC_MONITOR_TSAN_WORKAROUND 1
+#endif
 
 /// Implementation of the principal monitor. This uses new (and leaks) to avoid registering a
 /// pointless at-exit handler for the dtor.

From fbd4ff027ad1fbb3f8f4be39951e240c9b430a91 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 16:47:27 -0700
Subject: [PATCH 0458/1732] Initialize a field that was previously
 uninitialized

Caught by UBSan
---
 src/function.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/function.h b/src/function.h
index fc6529e72..89179d46f 100644
--- a/src/function.h
+++ b/src/function.h
@@ -27,7 +27,7 @@ struct function_properties_t {
     wcstring_list_t named_arguments;
 
     /// Set to true if invoking this function shadows the variables of the underlying function.
-    bool shadow_scope;
+    bool shadow_scope{true};
 };
 
 /// Structure describing a function. This is used by the parser to store data on a function while

From acd33cbabbb2e2c053b7655b25f1f0d3e2b08014 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 16:56:38 -0700
Subject: [PATCH 0459/1732] Remove an unnecessary fetch of the principal parser

---
 src/exec.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index a17291cda..746769dbd 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1152,7 +1152,6 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     size_t read_limit = is_subcmd ? read_byte_limit : 0;
     std::shared_ptr<io_buffer_t> buffer;
     if (auto bufferfill = io_bufferfill_t::create(io_chain_t{}, read_limit)) {
-        parser_t &parser = parser_t::principal_parser();
         if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == 0) {
             subcommand_statuses = proc_get_last_statuses();
         }

From 63bdc949ab2d6d43fb7110e4b8dcd0b7ac37220e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 17:55:57 -0700
Subject: [PATCH 0460/1732] Make completion request flags an enum_set

---
 src/builtin_complete.cpp |  3 +-
 src/complete.cpp         | 21 ++++++------
 src/complete.h           | 23 ++++++++-----
 src/fish_tests.cpp       | 71 +++++++++++++++++++---------------------
 src/reader.cpp           |  7 ++--
 5 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 9f4c75d00..54df50511 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -329,8 +329,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             recursion_level++;
 
             std::vector<completion_t> comp;
-            complete(do_complete_param, &comp,
-                     COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_FUZZY_MATCH, parser.vars());
+            complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars());
 
             for (size_t i = 0; i < comp.size(); i++) {
                 const completion_t &next = comp.at(i);
diff --git a/src/complete.cpp b/src/complete.cpp
index 4252fee87..3f3d97828 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -287,7 +287,7 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
 
     // Lastly, if this is for an autosuggestion, prefer to avoid completions that duplicate
     // arguments.
-    if (flags & COMPLETION_REQUEST_AUTOSUGGESTION)
+    if (flags & completion_request_t::autosuggestion)
         stable_sort(comps->begin(), comps->end(), compare_completions_by_duplicate_arguments);
 }
 
@@ -313,18 +313,17 @@ class completer_t {
     enum complete_type_t { COMPLETE_DEFAULT, COMPLETE_AUTOSUGGEST };
 
     complete_type_t type() const {
-        return flags & COMPLETION_REQUEST_AUTOSUGGESTION ? COMPLETE_AUTOSUGGEST : COMPLETE_DEFAULT;
+        return (flags & completion_request_t::autosuggestion) ? COMPLETE_AUTOSUGGEST
+                                                              : COMPLETE_DEFAULT;
     }
 
-    bool wants_descriptions() const {
-        return static_cast<bool>(flags & COMPLETION_REQUEST_DESCRIPTIONS);
-    }
+    bool wants_descriptions() const { return flags & completion_request_t::descriptions; }
 
-    bool fuzzy() const { return static_cast<bool>(flags & COMPLETION_REQUEST_FUZZY_MATCH); }
+    bool fuzzy() const { return flags & completion_request_t::fuzzy_match; }
 
     fuzzy_match_type_t max_fuzzy_match_type() const {
         // If we are doing fuzzy matching, request all types; if not request only prefix matching.
-        if (flags & COMPLETION_REQUEST_FUZZY_MATCH) return fuzzy_match_none;
+        if (fuzzy()) return fuzzy_match_none;
         return fuzzy_match_prefix_case_insensitive;
     }
 
@@ -1226,7 +1225,7 @@ bool completer_t::try_complete_variable(const wcstring &str) {
 
     // Now complete if we have a variable start. Note the variable text may be empty; in that case
     // don't generate an autosuggestion, but do allow tab completion.
-    bool allow_empty = !(this->flags & COMPLETION_REQUEST_AUTOSUGGESTION);
+    bool allow_empty = !(this->flags & completion_request_t::autosuggestion);
     bool text_is_empty = (variable_start == len);
     bool result = false;
     if (variable_start != wcstring::npos && (allow_empty || !text_is_empty)) {
@@ -1414,7 +1413,7 @@ void completer_t::perform() {
         // first of the sequence of nodes without source locations at the very end of the parse
         // tree).
         bool do_file = true;
-        if (flags & COMPLETION_REQUEST_AUTOSUGGESTION) {
+        if (flags & completion_request_t::autosuggestion) {
             if (position_in_statement < pos) {
                 do_file = false;
             } else if (pos > 0) {
@@ -1551,7 +1550,7 @@ void completer_t::perform() {
                         // buitin_commandline will refer to the wrapped command. But not if
                         // we're doing autosuggestions.
                         std::unique_ptr<builtin_commandline_scoped_transient_t> bcst;
-                        if (depth > 0 && !(flags & COMPLETION_REQUEST_AUTOSUGGESTION)) {
+                        if (depth > 0 && !(flags & completion_request_t::autosuggestion)) {
                             bcst = make_unique<builtin_commandline_scoped_transient_t>(cmdline);
                         }
                         // Now invoke any custom completions for this command.
@@ -1567,7 +1566,7 @@ void completer_t::perform() {
                 handle_as_special_cd = (current_command_unescape == L"cd");
 
                 // And if we're autosuggesting, and the token is empty, don't do file suggestions.
-                if ((flags & COMPLETION_REQUEST_AUTOSUGGESTION) &&
+                if ((flags & completion_request_t::autosuggestion) &&
                     current_argument_unescape.empty()) {
                     do_file = false;
                 }
diff --git a/src/complete.h b/src/complete.h
index 3af4cafc1..c4532fc7e 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -12,6 +12,8 @@
 
 #include "common.h"
 
+#include "enum_set.h"
+
 struct completion_mode_t {
     /// If set, skip file completions.
     bool no_files{false};
@@ -99,14 +101,19 @@ class completion_t {
     void prepend_token_prefix(const wcstring &prefix);
 };
 
-enum {
-    COMPLETION_REQUEST_DEFAULT = 0,
-    COMPLETION_REQUEST_AUTOSUGGESTION = 1
-                                        << 0,  // indicates the completion is for an autosuggestion
-    COMPLETION_REQUEST_DESCRIPTIONS = 1 << 1,  // indicates that we want descriptions
-    COMPLETION_REQUEST_FUZZY_MATCH = 1 << 2    // indicates that we don't require a prefix match
+enum class completion_request_t {
+    autosuggestion,  // indicates the completion is for an autosuggestion
+    descriptions,    // indicates that we want descriptions
+    fuzzy_match,     // indicates that we don't require a prefix match
+    COUNT
 };
-typedef uint32_t completion_request_flags_t;
+
+template <>
+struct enum_info_t<completion_request_t> {
+    static constexpr auto count = completion_request_t::COUNT;
+};
+
+using completion_request_flags_t = enum_set_t<completion_request_t>;
 
 enum complete_option_type_t {
     option_type_args_only,    // no option
@@ -118,7 +125,7 @@ enum complete_option_type_t {
 /// Sorts and remove any duplicate completions in the completion list, then puts them in priority
 /// order.
 void completions_sort_and_prioritize(std::vector<completion_t> *comps,
-                                     completion_request_flags_t flags = COMPLETION_REQUEST_DEFAULT);
+                                     completion_request_flags_t flags = {});
 
 /// Add a completion.
 ///
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 9cb125fef..1df50f1df 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2493,7 +2493,7 @@ static void test_complete() {
     test_complete_vars_t vars;
 
     completion_list_t completions;
-    complete(L"$", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"$", &completions, {}, vars);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 6);
     do_test(completions.at(0).completion == L"Bar1");
@@ -2504,7 +2504,7 @@ static void test_complete() {
     do_test(completions.at(5).completion == L"Foo3");
 
     completions.clear();
-    complete(L"$F", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"$F", &completions, {}, vars);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 3);
     do_test(completions.at(0).completion == L"oo1");
@@ -2512,13 +2512,12 @@ static void test_complete() {
     do_test(completions.at(2).completion == L"oo3");
 
     completions.clear();
-    complete(L"$1", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"$1", &completions, {}, vars);
     completions_sort_and_prioritize(&completions);
     do_test(completions.empty());
 
     completions.clear();
-    complete(L"$1", &completions, COMPLETION_REQUEST_DEFAULT | COMPLETION_REQUEST_FUZZY_MATCH,
-             vars);
+    complete(L"$1", &completions, completion_request_t::fuzzy_match, vars);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"$Bar1");
@@ -2530,25 +2529,23 @@ static void test_complete() {
     if (system("chmod 700 'test/complete_test/testfile'")) err(L"chmod failed");
 
     completions.clear();
-    complete(L"echo (test/complete_test/testfil", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (test/complete_test/testfil", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     completions.clear();
-    complete(L"echo (ls test/complete_test/testfil", &completions, COMPLETION_REQUEST_DEFAULT,
-             vars);
+    complete(L"echo (ls test/complete_test/testfil", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     completions.clear();
-    complete(L"echo (command ls test/complete_test/testfil", &completions,
-             COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (command ls test/complete_test/testfil", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     // Completing after spaces - see #2447
     completions.clear();
-    complete(L"echo (ls test/complete_test/has\\ ", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (ls test/complete_test/has\\ ", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"space");
 
@@ -2561,23 +2558,23 @@ static void test_complete() {
 
     // Complete a function name.
     completions.clear();
-    complete(L"echo (scuttlebut", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (scuttlebut", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"t");
 
     // But not with the command prefix.
     completions.clear();
-    complete(L"echo (command scuttlebut", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (command scuttlebut", &completions, {}, vars);
     do_test(completions.size() == 0);
 
     // Not with the builtin prefix.
     completions.clear();
-    complete(L"echo (builtin scuttlebut", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo (builtin scuttlebut", &completions, {}, vars);
     do_test(completions.size() == 0);
 
     // Not after a redirection.
     completions.clear();
-    complete(L"echo hi > scuttlebut", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo hi > scuttlebut", &completions, {}, vars);
     do_test(completions.size() == 0);
 
     // Trailing spaces (#1261).
@@ -2586,81 +2583,81 @@ static void test_complete() {
     complete_add(L"foobarbaz", false, wcstring(), option_type_args_only, no_files, NULL, L"qux",
                  NULL, COMPLETE_AUTO_SPACE);
     completions.clear();
-    complete(L"foobarbaz ", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"foobarbaz ", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"qux");
 
     // Don't complete variable names in single quotes (#1023).
     completions.clear();
-    complete(L"echo '$Foo", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo '$Foo", &completions, {}, vars);
     do_test(completions.empty());
     completions.clear();
-    complete(L"echo \\$Foo", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo \\$Foo", &completions, {}, vars);
     do_test(completions.empty());
 
     // File completions.
     completions.clear();
-    complete(L"cat test/complete_test/te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat test/complete_test/te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo sup > test/complete_test/te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"echo sup > test/complete_test/te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
 
     if (!pushd("test/complete_test")) return;
-    complete(L"cat te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(!(completions.at(0).flags & COMPLETE_REPLACES_TOKEN));
     do_test(!(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT));
     completions.clear();
-    complete(L"cat testfile te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat testfile te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
     completions.clear();
-    complete(L"cat testfile TE", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat testfile TE", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"testfile");
     do_test(completions.at(0).flags & COMPLETE_REPLACES_TOKEN);
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
     completions.clear();
-    complete(L"something --abc=te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"something --abc=te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something -abc=te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"something -abc=te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something abc=te", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"something abc=te", &completions, {}, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something abc=stfile", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"something abc=stfile", &completions, {}, vars);
     do_test(completions.size() == 0);
     completions.clear();
-    complete(L"something abc=stfile", &completions, COMPLETION_REQUEST_FUZZY_MATCH, vars);
+    complete(L"something abc=stfile", &completions, completion_request_t::fuzzy_match, vars);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"abc=testfile");
 
     // Zero escapes can cause problems. See issue #1631.
     completions.clear();
-    complete(L"cat foo\\0", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat foo\\0", &completions, {}, vars);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat foo\\0bar", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat foo\\0bar", &completions, {}, vars);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat \\0", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat \\0", &completions, {}, vars);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat te\\0", &completions, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(L"cat te\\0", &completions, {}, vars);
     do_test(completions.empty());
 
     popd();
@@ -2672,7 +2669,7 @@ static void test_complete() {
     fd.name = L"testabbrsonetwothreefour";
     function_add(fd, parser_t::principal_parser());
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
-    complete(L"testabbrsonetwothree", &completions, COMPLETION_REQUEST_DEFAULT, pvars);
+    complete(L"testabbrsonetwothree", &completions, {}, pvars);
     do_test(ret == 0);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"four");
@@ -2752,7 +2749,7 @@ static void test_completion_insertions() {
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,
                                                const environment_t &vars, long line) {
     std::vector<completion_t> comps;
-    complete(command, &comps, COMPLETION_REQUEST_AUTOSUGGESTION, vars);
+    complete(command, &comps, completion_request_t::autosuggestion, vars);
 
     bool expects_error = (expected == L"<error>");
 
@@ -2788,7 +2785,7 @@ 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) {
     std::vector<completion_t> comps;
-    complete(command, &comps, COMPLETION_REQUEST_DEFAULT, vars);
+    complete(command, &comps, {}, vars);
 
     bool expects_error = (expected == L"<error>");
 
@@ -2928,7 +2925,7 @@ static void test_autosuggest_suggest_special() {
 
 static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {
     completion_list_t comps;
-    complete(command, &comps, COMPLETION_REQUEST_AUTOSUGGESTION, null_environment_t{});
+    complete(command, &comps, completion_request_t::autosuggestion, null_environment_t{});
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
diff --git a/src/reader.cpp b/src/reader.cpp
index c7c986c52..38ede99b8 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1325,7 +1325,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         if (std::wcschr(L"'\"", last_char) && cursor_at_end) return nothing;
 
         // Try normal completions.
-        completion_request_flags_t complete_flags = COMPLETION_REQUEST_AUTOSUGGESTION;
+        completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
         std::vector<completion_t> completions;
         complete(search_string, &completions, complete_flags, *vars);
         completions_sort_and_prioritize(&completions, complete_flags);
@@ -2583,9 +2583,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
 
                 // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
-                complete_flags_t complete_flags = COMPLETION_REQUEST_DEFAULT |
-                                                  COMPLETION_REQUEST_DESCRIPTIONS |
-                                                  COMPLETION_REQUEST_FUZZY_MATCH;
+                completion_request_flags_t complete_flags = {completion_request_t::descriptions,
+                                                             completion_request_t::fuzzy_match};
                 complete_func(buffcpy, &rls.comp, complete_flags, vars);
 
                 // Munge our completions.

From 923a7ca0f0c0e3cd0282032be59b2f10467afe99 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 18:17:18 -0700
Subject: [PATCH 0461/1732] Thread the parser into complete()

Eliminates uses of principal_parser
---
 src/builtin_complete.cpp |  3 +-
 src/complete.cpp         | 30 ++++++++---------
 src/complete.h           |  4 ++-
 src/fish_tests.cpp       | 71 +++++++++++++++++++++-------------------
 src/parser.cpp           |  2 ++
 src/parser.h             |  3 ++
 src/reader.cpp           |  6 ++--
 src/reader.h             |  3 +-
 8 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 54df50511..67365caff 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -329,7 +329,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             recursion_level++;
 
             std::vector<completion_t> comp;
-            complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars());
+            complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
+                     parser.shared());
 
             for (size_t i = 0; i < comp.size(); i++) {
                 const completion_t &next = comp.at(i);
diff --git a/src/complete.cpp b/src/complete.cpp
index 3f3d97828..48ce17ea2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -296,13 +296,17 @@ class completer_t {
     /// Environment inside which we are completing.
     const environment_t &vars;
 
+    /// The parser used for condition testing and subshell expansion.
+    /// If null, these features are disabled.
+    std::shared_ptr<parser_t> parser;
+
     /// The command to complete.
     const wcstring cmd;
 
     /// Flags associated with the completion request.
     const completion_request_flags_t flags;
 
-    /// The output cmopletions.
+    /// The output completions.
     std::vector<completion_t> completions;
 
     /// Table of completions conditions that have already been tested and the corresponding test
@@ -371,8 +375,9 @@ class completer_t {
     void mark_completions_duplicating_arguments(const wcstring &prefix, const arg_list_t &args);
 
    public:
-    completer_t(const environment_t &vars, wcstring c, completion_request_flags_t f)
-        : vars(vars), cmd(std::move(c)), flags(f) {}
+    completer_t(const environment_t &vars, const std::shared_ptr<parser_t> &parser, wcstring c,
+                completion_request_flags_t f)
+        : vars(vars), parser(parser), cmd(std::move(c)), flags(f) {}
 
     void perform();
 
@@ -398,21 +403,16 @@ bool completer_t::condition_test(const wcstring &condition) {
         // std::fwprintf( stderr, L"No condition specified\n" );
         return true;
     }
-
-    if (this->type() == COMPLETE_AUTOSUGGEST) {
-        // Autosuggestion can't support conditions.
+    if (!parser) {
         return false;
     }
 
     ASSERT_IS_MAIN_THREAD();
-
     bool test_res;
     condition_cache_t::iterator cached_entry = condition_cache.find(condition);
     if (cached_entry == condition_cache.end()) {
         // Compute new value and reinsert it.
-        // TODO: rationalize this principal_parser.
-        test_res = (0 == exec_subshell(condition, parser_t::principal_parser(),
-                                       false /* don't apply exit status */));
+        test_res = (0 == exec_subshell(condition, *parser, false /* don't apply exit status */));
         condition_cache[condition] = test_res;
     } else {
         // Use the old value.
@@ -559,6 +559,7 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
 /// for the executable.
 void completer_t::complete_cmd_desc(const wcstring &str) {
     ASSERT_IS_MAIN_THREAD();
+    if (!parser) return;
 
     wcstring cmd;
     size_t pos = str.find_last_of(L'/');
@@ -596,9 +597,7 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     // search if we know the location of the whatis database. This can take some time on slower
     // systems with a large set of manuals, but it should be ok since apropos is only called once.
     wcstring_list_t list;
-    // TODO: justify this use of parser_t::principal_parser.
-    if (exec_subshell(lookup_cmd, parser_t::principal_parser(), list,
-                      false /* don't apply exit status */) != -1) {
+    if (exec_subshell(lookup_cmd, *parser, list, false /* don't apply exit status */) != -1) {
         std::unordered_map<wcstring, wcstring> lookup;
         lookup.reserve(list.size());
 
@@ -1582,14 +1581,15 @@ void completer_t::perform() {
 }
 
 void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_comps,
-              completion_request_flags_t flags, const environment_t &vars) {
+              completion_request_flags_t flags, const environment_t &vars,
+              const std::shared_ptr<parser_t> &parser) {
     // Determine the innermost subcommand.
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(cmd_with_subcmds.c_str(), cmd_with_subcmds.size(), &cmdsubst_begin,
                                &cmdsubst_end);
     assert(cmdsubst_begin != NULL && cmdsubst_end != NULL && cmdsubst_end >= cmdsubst_begin);
     wcstring cmd = wcstring(cmdsubst_begin, cmdsubst_end - cmdsubst_begin);
-    completer_t completer(vars, std::move(cmd), flags);
+    completer_t completer(vars, parser, std::move(cmd), flags);
     completer.perform();
     *out_comps = completer.acquire_completions();
 }
diff --git a/src/complete.h b/src/complete.h
index c4532fc7e..397904f11 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -170,8 +170,10 @@ void complete_remove(const wcstring &cmd, bool cmd_is_path, const wcstring &opti
 void complete_remove_all(const wcstring &cmd, bool cmd_is_path);
 
 /// Find all completions of the command cmd, insert them into out.
+class parser_t;
 void complete(const wcstring &cmd, std::vector<completion_t> *out_comps,
-              completion_request_flags_t flags, const environment_t &vars);
+              completion_request_flags_t flags, const environment_t &vars,
+              const std::shared_ptr<parser_t> &parser);
 
 /// Return a list of all current completions.
 wcstring complete_print();
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 1df50f1df..3ac77c940 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2492,8 +2492,10 @@ static void test_complete() {
     };
     test_complete_vars_t vars;
 
+    auto parser = parser_t::principal_parser().shared();
+
     completion_list_t completions;
-    complete(L"$", &completions, {}, vars);
+    complete(L"$", &completions, {}, vars, parser);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 6);
     do_test(completions.at(0).completion == L"Bar1");
@@ -2504,7 +2506,7 @@ static void test_complete() {
     do_test(completions.at(5).completion == L"Foo3");
 
     completions.clear();
-    complete(L"$F", &completions, {}, vars);
+    complete(L"$F", &completions, {}, vars, parser);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 3);
     do_test(completions.at(0).completion == L"oo1");
@@ -2512,12 +2514,12 @@ static void test_complete() {
     do_test(completions.at(2).completion == L"oo3");
 
     completions.clear();
-    complete(L"$1", &completions, {}, vars);
+    complete(L"$1", &completions, {}, vars, parser);
     completions_sort_and_prioritize(&completions);
     do_test(completions.empty());
 
     completions.clear();
-    complete(L"$1", &completions, completion_request_t::fuzzy_match, vars);
+    complete(L"$1", &completions, completion_request_t::fuzzy_match, vars, parser);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"$Bar1");
@@ -2529,23 +2531,23 @@ static void test_complete() {
     if (system("chmod 700 'test/complete_test/testfile'")) err(L"chmod failed");
 
     completions.clear();
-    complete(L"echo (test/complete_test/testfil", &completions, {}, vars);
+    complete(L"echo (test/complete_test/testfil", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     completions.clear();
-    complete(L"echo (ls test/complete_test/testfil", &completions, {}, vars);
+    complete(L"echo (ls test/complete_test/testfil", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     completions.clear();
-    complete(L"echo (command ls test/complete_test/testfil", &completions, {}, vars);
+    complete(L"echo (command ls test/complete_test/testfil", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     // Completing after spaces - see #2447
     completions.clear();
-    complete(L"echo (ls test/complete_test/has\\ ", &completions, {}, vars);
+    complete(L"echo (ls test/complete_test/has\\ ", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"space");
 
@@ -2558,23 +2560,23 @@ static void test_complete() {
 
     // Complete a function name.
     completions.clear();
-    complete(L"echo (scuttlebut", &completions, {}, vars);
+    complete(L"echo (scuttlebut", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"t");
 
     // But not with the command prefix.
     completions.clear();
-    complete(L"echo (command scuttlebut", &completions, {}, vars);
+    complete(L"echo (command scuttlebut", &completions, {}, vars, parser);
     do_test(completions.size() == 0);
 
     // Not with the builtin prefix.
     completions.clear();
-    complete(L"echo (builtin scuttlebut", &completions, {}, vars);
+    complete(L"echo (builtin scuttlebut", &completions, {}, vars, parser);
     do_test(completions.size() == 0);
 
     // Not after a redirection.
     completions.clear();
-    complete(L"echo hi > scuttlebut", &completions, {}, vars);
+    complete(L"echo hi > scuttlebut", &completions, {}, vars, parser);
     do_test(completions.size() == 0);
 
     // Trailing spaces (#1261).
@@ -2583,81 +2585,82 @@ static void test_complete() {
     complete_add(L"foobarbaz", false, wcstring(), option_type_args_only, no_files, NULL, L"qux",
                  NULL, COMPLETE_AUTO_SPACE);
     completions.clear();
-    complete(L"foobarbaz ", &completions, {}, vars);
+    complete(L"foobarbaz ", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"qux");
 
     // Don't complete variable names in single quotes (#1023).
     completions.clear();
-    complete(L"echo '$Foo", &completions, {}, vars);
+    complete(L"echo '$Foo", &completions, {}, vars, parser);
     do_test(completions.empty());
     completions.clear();
-    complete(L"echo \\$Foo", &completions, {}, vars);
+    complete(L"echo \\$Foo", &completions, {}, vars, parser);
     do_test(completions.empty());
 
     // File completions.
     completions.clear();
-    complete(L"cat test/complete_test/te", &completions, {}, vars);
+    complete(L"cat test/complete_test/te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, {}, vars);
+    complete(L"echo sup > test/complete_test/te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, {}, vars);
+    complete(L"echo sup > test/complete_test/te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
 
     if (!pushd("test/complete_test")) return;
-    complete(L"cat te", &completions, {}, vars);
+    complete(L"cat te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(!(completions.at(0).flags & COMPLETE_REPLACES_TOKEN));
     do_test(!(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT));
     completions.clear();
-    complete(L"cat testfile te", &completions, {}, vars);
+    complete(L"cat testfile te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
     completions.clear();
-    complete(L"cat testfile TE", &completions, {}, vars);
+    complete(L"cat testfile TE", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"testfile");
     do_test(completions.at(0).flags & COMPLETE_REPLACES_TOKEN);
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
     completions.clear();
-    complete(L"something --abc=te", &completions, {}, vars);
+    complete(L"something --abc=te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something -abc=te", &completions, {}, vars);
+    complete(L"something -abc=te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something abc=te", &completions, {}, vars);
+    complete(L"something abc=te", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     completions.clear();
-    complete(L"something abc=stfile", &completions, {}, vars);
+    complete(L"something abc=stfile", &completions, {}, vars, parser);
     do_test(completions.size() == 0);
     completions.clear();
-    complete(L"something abc=stfile", &completions, completion_request_t::fuzzy_match, vars);
+    complete(L"something abc=stfile", &completions, completion_request_t::fuzzy_match, vars,
+             parser);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"abc=testfile");
 
     // Zero escapes can cause problems. See issue #1631.
     completions.clear();
-    complete(L"cat foo\\0", &completions, {}, vars);
+    complete(L"cat foo\\0", &completions, {}, vars, parser);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat foo\\0bar", &completions, {}, vars);
+    complete(L"cat foo\\0bar", &completions, {}, vars, parser);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat \\0", &completions, {}, vars);
+    complete(L"cat \\0", &completions, {}, vars, parser);
     do_test(completions.empty());
     completions.clear();
-    complete(L"cat te\\0", &completions, {}, vars);
+    complete(L"cat te\\0", &completions, {}, vars, parser);
     do_test(completions.empty());
 
     popd();
@@ -2669,7 +2672,7 @@ static void test_complete() {
     fd.name = L"testabbrsonetwothreefour";
     function_add(fd, parser_t::principal_parser());
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
-    complete(L"testabbrsonetwothree", &completions, {}, pvars);
+    complete(L"testabbrsonetwothree", &completions, {}, pvars, parser);
     do_test(ret == 0);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"four");
@@ -2749,7 +2752,7 @@ static void test_completion_insertions() {
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,
                                                const environment_t &vars, long line) {
     std::vector<completion_t> comps;
-    complete(command, &comps, completion_request_t::autosuggestion, vars);
+    complete(command, &comps, completion_request_t::autosuggestion, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
 
@@ -2785,7 +2788,7 @@ 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) {
     std::vector<completion_t> comps;
-    complete(command, &comps, {}, vars);
+    complete(command, &comps, {}, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
 
@@ -2925,7 +2928,7 @@ static void test_autosuggest_suggest_special() {
 
 static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {
     completion_list_t comps;
-    complete(command, &comps, completion_request_t::autosuggestion, null_environment_t{});
+    complete(command, &comps, completion_request_t::autosuggestion, null_environment_t{}, nullptr);
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
diff --git a/src/parser.cpp b/src/parser.cpp
index 364791bb1..c440b7828 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -344,6 +344,8 @@ wcstring parser_t::stack_trace() const {
     return trace;
 }
 
+std::shared_ptr<parser_t> parser_t::shared() { return shared_from_this(); }
+
 void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
     // Check if we should end the recursion.
     if (block_idx >= this->block_count()) return;
diff --git a/src/parser.h b/src/parser.h
index 7cb075b3c..858f5bf7d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -328,6 +328,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Return a string representing the current stack trace.
     wcstring stack_trace() const;
 
+    /// \return a shared pointer reference to this parser.
+    std::shared_ptr<parser_t> shared();
+
     ~parser_t();
 };
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 38ede99b8..473cbac54 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1327,7 +1327,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         // Try normal completions.
         completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
         std::vector<completion_t> completions;
-        complete(search_string, &completions, complete_flags, *vars);
+        complete(search_string, &completions, complete_flags, *vars, nullptr);
         completions_sort_and_prioritize(&completions, complete_flags);
         if (!completions.empty()) {
             const completion_t &comp = completions.at(0);
@@ -2585,7 +2585,9 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
                 completion_request_flags_t complete_flags = {completion_request_t::descriptions,
                                                              completion_request_t::fuzzy_match};
-                complete_func(buffcpy, &rls.comp, complete_flags, vars);
+                // TODO: eliminate this principal_parser.
+                complete_func(buffcpy, &rls.comp, complete_flags, vars,
+                              parser_t::principal_parser().shared());
 
                 // Munge our completions.
                 completions_sort_and_prioritize(&rls.comp);
diff --git a/src/reader.h b/src/reader.h
index a8faf08bf..a6c1bbffb 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -157,7 +157,8 @@ void reader_pop();
 
 /// Specify function to use for finding possible tab completions.
 typedef void (*complete_function_t)(const wcstring &, std::vector<completion_t> *,
-                                    completion_request_flags_t, const environment_t &);
+                                    completion_request_flags_t, const environment_t &,
+                                    const std::shared_ptr<parser_t> &parser);
 void reader_set_complete_function(complete_function_t);
 
 /// The type of a highlight function.

From 4ce485525e1e3beb9a9a69bfb4119b88101e9d51 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 18:35:22 -0700
Subject: [PATCH 0462/1732] Correct duplicate completion detection

Stop assuming that completions with the same hash are equal.
---
 src/complete.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 48ce17ea2..3cccc71af 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -247,12 +247,16 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
     return ad < bd;
 }
 
-template <class Iterator, class HashFunction>
-static Iterator unique_unsorted(Iterator begin, Iterator end, HashFunction hash) {
-    typedef typename std::iterator_traits<Iterator>::value_type T;
-
-    std::unordered_set<size_t> temp;
-    return std::remove_if(begin, end, [&](const T &val) { return !temp.insert(hash(val)).second; });
+/// Unique the list of completions, without perturbing their order.
+static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
+    std::unordered_set<wcstring> seen;
+    seen.reserve(comps->size());
+    auto pred = [&seen](const completion_t &c) {
+        // Remove (return true) if insertion fails.
+        bool inserted = seen.insert(c.completion).second;
+        return !inserted;
+    };
+    comps->erase(std::remove_if(comps->begin(), comps->end(), pred), comps->end());
 }
 
 void completions_sort_and_prioritize(std::vector<completion_t> *comps,
@@ -274,13 +278,11 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
                        [&](const completion_t &comp) { return comp.match.type > best_type; }),
         comps->end());
 
-    // Sort, provided COMPLETION_DONT_SORT isn't set
+    // Sort, provided COMPLETE_DONT_SORT isn't set.
     stable_sort(comps->begin(), comps->end(), completion_t::is_naturally_less_than);
-    // Deduplicate both sorted and unsorted results
-    comps->erase(
-        unique_unsorted(comps->begin(), comps->end(),
-                        [](const completion_t &c) { return std::hash<wcstring>{}(c.completion); }),
-        comps->end());
+
+    // Deduplicate both sorted and unsorted results.
+    unique_completions_retaining_order(comps);
 
     // Sort the remainder by match type. They're already sorted alphabetically.
     stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);

From bffacd2fbf8e111cea25c81252409c14a4fa6533 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 19:16:26 -0700
Subject: [PATCH 0463/1732] Thread a parser into expansion

Expansion may perform command substitution, which needs to know the parser
to use.
---
 src/complete.cpp        | 15 ++++++++-------
 src/expand.cpp          | 38 +++++++++++++++++++++++---------------
 src/expand.h            |  6 +++++-
 src/fish_tests.cpp      | 33 +++++++++++++++++----------------
 src/highlight.cpp       |  6 +++---
 src/parse_execution.cpp | 18 ++++++++++--------
 src/parse_util.cpp      |  3 ++-
 src/parser.cpp          | 17 +++++++++--------
 src/parser.h            | 13 ++++++-------
 9 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 3cccc71af..d7bb22017 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -543,7 +543,7 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
     wcstring tmp = wc_escaped;
     if (!expand_one(tmp,
                     this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::skip_wildcards,
-                    vars))
+                    vars, parser))
         return;
 
     const wcstring wc = parse_util_unescape_wildcards(tmp);
@@ -666,7 +666,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
             expand_string(str_cmd, &this->completions,
                           this->expand_flags() | expand_flag::special_for_command |
                               expand_flag::for_completions | expand_flag::executables_only,
-                          vars, NULL);
+                          vars, parser, NULL);
         if (result != expand_result_t::error && this->wants_descriptions()) {
             this->complete_cmd_desc(str_cmd);
         }
@@ -680,7 +680,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool
             expand_string(
                 str_cmd, &this->completions,
                 this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
-                vars, NULL);
+                vars, parser, NULL);
         UNUSED(ignore);
     }
 
@@ -752,8 +752,8 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
         eflags |= expand_flag::skip_cmdsubst;
     }
 
-    std::vector<completion_t> possible_comp;
-    parser_t::expand_argument_list(args, eflags, vars, &possible_comp);
+    std::vector<completion_t> possible_comp =
+        parser_t::expand_argument_list(args, eflags, vars, parser);
 
     if (!is_autosuggest) {
         proc_pop_interactive();
@@ -1103,7 +1103,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         std::vector<completion_t> local_completions;
-        if (expand_string(sep_string, &local_completions, flags, vars, NULL) ==
+        if (expand_string(sep_string, &local_completions, flags, vars, parser, NULL) ==
             expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
         }
@@ -1123,7 +1123,8 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // consider relaxing this if there was a preceding double-dash argument.
         if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::fuzzy_match);
 
-        if (expand_string(str, &this->completions, flags, vars, NULL) == expand_result_t::error) {
+        if (expand_string(str, &this->completions, flags, vars, parser, NULL) ==
+            expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
         }
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index fdb4e5a52..a163fce9c 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -589,7 +589,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
 }
 
 /// Perform cmdsubst expansion.
-static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *out_list,
+static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<completion_t> *out_list,
                             parse_error_list_t *errors) {
     wchar_t *paren_begin = nullptr, *paren_end = nullptr;
     wchar_t *tail_begin = nullptr;
@@ -603,7 +603,7 @@ static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *ou
             return false;
         }
         case 0: {
-            append_completion(out_list, input);
+            append_completion(out_list, std::move(input));
             return true;
         }
         case 1: {
@@ -617,8 +617,6 @@ static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *ou
 
     wcstring_list_t sub_res;
     const wcstring subcmd(paren_begin + 1, paren_end - paren_begin - 1);
-    // TODO: justify this parser_t::principal_parser
-    auto &parser = parser_t::principal_parser();
     if (exec_subshell(subcmd, parser, sub_res, true /* apply_exit_status */,
                       true /* is_subcmd */) == -1) {
         append_cmdsub_error(errors, SOURCE_LOCATION_UNKNOWN,
@@ -667,7 +665,7 @@ static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *ou
     // Recursively call ourselves to expand any remaining command substitutions. The result of this
     // recursive call using the tail of the string is inserted into the tail_expand array list
     std::vector<completion_t> tail_expand;
-    expand_cmdsubst(tail_begin, &tail_expand, errors);  // TODO: offset error locations
+    expand_cmdsubst(tail_begin, parser, &tail_expand, errors);  // TODO: offset error locations
 
     // Combine the result of the current command substitution with the result of the recursive tail
     // expansion.
@@ -871,6 +869,9 @@ class expander_t {
     /// Variables to use in expansion.
     const environment_t &vars;
 
+    /// The parser for expanding command substitutions, or nullptr if not enabled.
+    std::shared_ptr<parser_t> parser;
+
     /// Flags to use during expansion.
     const expand_flags_t flags;
 
@@ -888,12 +889,14 @@ class expander_t {
     expand_result_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
     expand_result_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
 
-    expander_t(const environment_t &vars, expand_flags_t flags, parse_error_list_t *errors)
-        : vars(vars), flags(flags), errors(errors) {}
+    expander_t(const environment_t &vars, const std::shared_ptr<parser_t> &parser,
+               expand_flags_t flags, parse_error_list_t *errors)
+        : vars(vars), parser(parser), flags(flags), errors(errors) {}
 
    public:
     static expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
                                          expand_flags_t flags, const environment_t &vars,
+                                         const std::shared_ptr<parser_t> &parser,
                                          parse_error_list_t *errors);
 };
 
@@ -911,7 +914,8 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completio
                 return expand_result_t::error;
         }
     } else {
-        bool cmdsubst_ok = expand_cmdsubst(std::move(input), out, errors);
+        assert(parser && "Must have a parser to expand command substitutions");
+        bool cmdsubst_ok = expand_cmdsubst(std::move(input), *parser, out, errors);
         if (!cmdsubst_ok) return expand_result_t::error;
     }
 
@@ -1049,14 +1053,17 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
 expand_result_t expander_t::expand_string(wcstring input,
                                           std::vector<completion_t> *out_completions,
                                           expand_flags_t flags, const environment_t &vars,
+                                          const std::shared_ptr<parser_t> &parser,
                                           parse_error_list_t *errors) {
+    assert(((flags & expand_flag::skip_cmdsubst) || parser) &&
+           "Must have a parser if not skipping command substitutions");
     // Early out. If we're not completing, and there's no magic in the input, we're done.
     if (!(flags & expand_flag::for_completions) && expand_is_clean(input)) {
         append_completion(out_completions, std::move(input));
         return expand_result_t::ok;
     }
 
-    expander_t expand(vars, flags, errors);
+    expander_t expand(vars, parser, flags, errors);
 
     // Our expansion stages.
     const stage_t stages[] = {&expander_t::stage_cmdsubst, &expander_t::stage_variables,
@@ -1106,20 +1113,21 @@ expand_result_t expander_t::expand_string(wcstring input,
 
 expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
                               expand_flags_t flags, const environment_t &vars,
-                              parse_error_list_t *errors) {
-    return expander_t::expand_string(std::move(input), out_completions, flags, vars, errors);
+                              const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
+    return expander_t::expand_string(std::move(input), out_completions, flags, vars, parser,
+                                     errors);
 }
 
 bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
-                parse_error_list_t *errors) {
+                const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
     std::vector<completion_t> completions;
 
     if (!flags.get(expand_flag::for_completions) && expand_is_clean(string)) {
         return true;
     }
 
-    if (expand_string(string, &completions, flags | expand_flag::no_descriptions, vars, errors) !=
-            expand_result_t::error &&
+    if (expand_string(string, &completions, flags | expand_flag::no_descriptions, vars, parser,
+                      errors) != expand_result_t::error &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
         return true;
@@ -1141,7 +1149,7 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
     expand_result_t expand_err = expand_string(
         instr, &completions,
         {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, vars,
-        errors);
+        nullptr, errors);
     if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
diff --git a/src/expand.h b/src/expand.h
index 07a05e17d..b492a2a18 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -125,13 +125,16 @@ enum class expand_result_t {
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
 /// of skip_cmdsubst skip_variables and skip_wildcards
 /// \param vars variables used during expansion.
+/// \param parser the parser to use for command substitutions, or nullptr to disable.
 /// \param errors Resulting errors, or NULL to ignore
 ///
 /// \return An expand_result_t.
 /// wildcard_no_match and wildcard_match are normal exit conditions used only on
 /// strings containing wildcards to tell if the wildcard produced any matches.
+class parser_t;
 __warn_unused expand_result_t expand_string(wcstring input, std::vector<completion_t> *output,
                                             expand_flags_t flags, const environment_t &vars,
+                                            const std::shared_ptr<parser_t> &parser,
                                             parse_error_list_t *errors);
 
 /// expand_one is identical to expand_string, except it will fail if in expands to more than one
@@ -140,11 +143,12 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 /// \param inout_str The parameter to expand in-place
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
 /// of skip_cmdsubst skip_variables and skip_wildcards
+/// \param parser the parser to use for command substitutions, or nullptr to disable.
 /// \param errors Resulting errors, or NULL to ignore
 ///
 /// \return Whether expansion succeded
 bool expand_one(wcstring &inout_str, expand_flags_t flags, const environment_t &vars,
-                parse_error_list_t *errors = NULL);
+                const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = NULL);
 
 /// Expand a command string like $HOME/bin/cmd into a command and list of arguments.
 /// Return the command and arguments by reference.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3ac77c940..2d24a2978 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -760,6 +760,8 @@ static parser_test_error_bits_t detect_argument_errors(const wcstring &src) {
 static void test_parser() {
     say(L"Testing parser");
 
+    auto parser = parser_t::principal_parser().shared();
+
     say(L"Testing block nesting");
     if (!parse_util_detect_errors(L"if; end")) {
         err(L"Incomplete if statement undetected");
@@ -963,23 +965,20 @@ static void test_parser() {
     // Ensure that we don't crash on infinite self recursion and mutual recursion. These must use
     // the principal parser because we cannot yet execute jobs on other parsers.
     say(L"Testing recursion detection");
-    parser_t::principal_parser().eval(L"function recursive ; recursive ; end ; recursive; ",
-                                      io_chain_t(), TOP);
+    parser->eval(L"function recursive ; recursive ; end ; recursive; ", io_chain_t(), TOP);
 #if 0
     // This is disabled since it produces a long backtrace. We should find a way to either visually
     // compress the backtrace, or disable error spewing.
-    parser_t::principal_parser().eval(L"function recursive1 ; recursive2 ; end ; "
+    parser->.eval(L"function recursive1 ; recursive2 ; end ; "
             L"function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t(), TOP);
 #endif
 
     say(L"Testing empty function name");
-    parser_t::principal_parser().eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(),
-                                      TOP);
+    parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(), TOP);
 
     say(L"Testing eval_args");
-    completion_list_t comps;
-    parser_t::expand_argument_list(L"alpha 'beta gamma' delta", expand_flags_t{},
-                                   null_environment_t{}, &comps);
+    completion_list_t comps = parser_t::expand_argument_list(
+        L"alpha 'beta gamma' delta", expand_flags_t{}, parser->vars(), parser);
     do_test(comps.size() == 3);
     do_test(comps.at(0).completion == L"alpha");
     do_test(comps.at(1).completion == L"beta gamma");
@@ -1600,8 +1599,10 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
     bool res = true;
     wchar_t *arg;
     parse_error_list_t errors;
+    auto parser = parser_t::principal_parser().shared();
 
-    if (expand_string(in, &output, flags, pwd_environment_t{}, &errors) == expand_result_t::error) {
+    if (expand_string(in, &output, flags, pwd_environment_t{}, parser, &errors) ==
+        expand_result_t::error) {
         if (errors.empty()) {
             err(L"Bug: Parse error reported but no error text found.");
         } else {
@@ -2259,15 +2260,15 @@ static bool run_one_test_test(int expected, wcstring_list_t &lst, bool bracket)
 }
 
 static bool run_test_test(int expected, const wcstring &str) {
-    using namespace std;
-    wcstring_list_t argv;
-    completion_list_t comps;
-
     // We need to tokenize the string in the same manner a normal shell would do. This is because we
     // need to test things like quoted strings that have leading and trailing whitespace.
-    parser_t::expand_argument_list(str, expand_flags_t{}, null_environment_t{}, &comps);
-    for (completion_list_t::const_iterator it = comps.begin(), end = comps.end(); it != end; ++it) {
-        argv.push_back(it->completion);
+    auto parser = parser_t::principal_parser().shared();
+    completion_list_t comps =
+        parser_t::expand_argument_list(str, expand_flags_t{}, null_environment_t{}, parser);
+
+    wcstring_list_t argv;
+    for (const auto &c : comps) {
+        argv.push_back(c.completion);
     }
 
     bool bracket = run_one_test_test(expected, argv, true);
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 7d8f49bf3..e79627afc 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -432,7 +432,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
 
     if (parsed_command == L"cd" && !cd_dir.empty()) {
         // We can possibly handle this specially.
-        if (expand_one(cd_dir, expand_flag::skip_cmdsubst, vars)) {
+        if (expand_one(cd_dir, expand_flag::skip_cmdsubst, vars, nullptr)) {
             handled = true;
             bool is_help =
                 string_prefixes_string(cd_dir, L"--help") || string_prefixes_string(cd_dir, L"-h");
@@ -926,7 +926,7 @@ void highlighter_t::color_arguments(const std::vector<tnode_t<g::argument>> &arg
         if (cmd_is_cd) {
             // Mark this as an error if it's not 'help' and not a valid cd path.
             wcstring param = arg.get_source(this->buff);
-            if (expand_one(param, expand_flag::skip_cmdsubst, vars)) {
+            if (expand_one(param, expand_flag::skip_cmdsubst, vars, nullptr)) {
                 bool is_help = string_prefixes_string(param, L"--help") ||
                                string_prefixes_string(param, L"-h");
                 if (!is_help && this->io_ok &&
@@ -969,7 +969,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                 // I/O is disallowed, so we don't have much hope of catching anything but gross
                 // errors. Assume it's valid.
                 target_is_valid = true;
-            } else if (!expand_one(target, expand_flag::skip_cmdsubst, vars)) {
+            } else if (!expand_one(target, expand_flag::skip_cmdsubst, vars, nullptr)) {
                 // Could not be expanded.
                 target_is_valid = false;
             } else {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index cb79e9e5f..5ec8152e1 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -128,8 +128,8 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
         if (plain_statement) {
             maybe_t<wcstring> cmd = command_for_plain_statement(plain_statement, pstree->src);
             if (cmd &&
-                expand_one(*cmd, {expand_flag::skip_cmdsubst, expand_flag::skip_variables},
-                           nullenv) &&
+                expand_one(*cmd, {expand_flag::skip_cmdsubst, expand_flag::skip_variables}, nullenv,
+                           nullptr) &&
                 cmd == forbidden_function_name) {
                 // This is it.
                 infinite_recursive_statement = plain_statement;
@@ -378,7 +378,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     // in just one.
     tnode_t<g::tok_string> var_name_node = header.child<1>();
     wcstring for_var_name = get_source(var_name_node);
-    if (!expand_one(for_var_name, expand_flags_t{}, parser->vars())) {
+    if (!expand_one(for_var_name, expand_flags_t{}, parser->vars(), parser->shared())) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
         return parse_execution_errored;
     }
@@ -451,8 +451,9 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     // Expand it. We need to offset any errors by the position of the string.
     std::vector<completion_t> switch_values_expanded;
     parse_error_list_t errors;
-    auto expand_ret = expand_string(switch_value, &switch_values_expanded,
-                                    expand_flag::no_descriptions, parser->vars(), &errors);
+    auto expand_ret =
+        expand_string(switch_value, &switch_values_expanded, expand_flag::no_descriptions,
+                      parser->vars(), parser->shared(), &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
@@ -909,7 +910,7 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         parse_error_list_t errors;
         arg_expanded.clear();
         auto expand_ret = expand_string(arg_str, &arg_expanded, expand_flag::no_descriptions,
-                                        parser->vars(), &errors);
+                                        parser->vars(), parser->shared(), &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
             case expand_result_t::error: {
@@ -957,8 +958,9 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
         auto redirect_type = redirection_type(redirect_node, pstree->src, &source_fd, &target);
 
         // PCA: I can't justify this skip_variables flag. It was like this when I got here.
-        bool target_expanded = expand_one(
-            target, no_exec ? expand_flag::skip_variables : expand_flags_t{}, parser->vars());
+        bool target_expanded =
+            expand_one(target, no_exec ? expand_flag::skip_variables : expand_flags_t{},
+                       parser->vars(), parser->shared());
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
             errored =
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 9a75507f8..00ad41d39 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1197,7 +1197,8 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
 
         // Check that we don't do an invalid builtin (issue #1252).
         if (!errored && decoration == parse_statement_decoration_builtin &&
-            expand_one(*unexp_command, expand_flags_t{}, null_environment_t{}, parse_errors) &&
+            expand_one(*unexp_command, expand_flag::skip_cmdsubst, null_environment_t{}, nullptr,
+                       parse_errors) &&
             !builtin_exists(*unexp_command)) {
             errored = append_syntax_error(parse_errors, source_start, UNKNOWN_BUILTIN_ERR_MSG,
                                           unexp_command->c_str());
diff --git a/src/parser.cpp b/src/parser.cpp
index c440b7828..1f59adc7c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -313,29 +313,30 @@ void parser_t::emit_profiling(const char *path) const {
     }
 }
 
-void parser_t::expand_argument_list(const wcstring &arg_list_src, expand_flags_t eflags,
-                                    const environment_t &vars,
-                                    std::vector<completion_t> *output_arg_list) {
-    assert(output_arg_list != NULL);
-
+std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_list_src,
+                                                         expand_flags_t eflags,
+                                                         const environment_t &vars,
+                                                         const std::shared_ptr<parser_t> &parser) {
     // Parse the string as an argument list.
     parse_node_tree_t tree;
     if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, NULL /* errors */,
                                 symbol_freestanding_argument_list)) {
         // Failed to parse. Here we expect to have reported any errors in test_args.
-        return;
+        return {};
     }
 
     // Get the root argument list and extract arguments from it.
-    assert(!tree.empty());  //!OCLINT(multiple unary operator)
+    std::vector<completion_t> result;
+    assert(!tree.empty());
     tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
     while (auto arg = arg_list.next_in_list<grammar::argument>()) {
         const wcstring arg_src = arg.get_source(arg_list_src);
-        if (expand_string(arg_src, output_arg_list, eflags, vars, NULL /* errors */) ==
+        if (expand_string(arg_src, &result, eflags, vars, parser, NULL /* errors */) ==
             expand_result_t::error) {
             break;  // failed to expand a string
         }
     }
+    return result;
 }
 
 wcstring parser_t::stack_trace() const {
diff --git a/src/parser.h b/src/parser.h
index 858f5bf7d..83cecab7b 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -235,13 +235,12 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
                   block_type_t block_type, std::shared_ptr<job_t> parent_job);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
-    /// cmdsubst execution on the tokens. The output is inserted into output. Errors are ignored.
-    ///
-    /// \param arg_src String to evaluate as an argument list
-    /// \param flags Some expand flags to use
-    /// \param output List to insert output into
-    static void expand_argument_list(const wcstring &arg_src, expand_flags_t flags,
-                                     const environment_t &vars, std::vector<completion_t> *output);
+    /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
+    /// for command substitution expansion.
+    static std::vector<completion_t> expand_argument_list(const wcstring &arg_list_src,
+                                                          expand_flags_t flags,
+                                                          const environment_t &vars,
+                                                          const std::shared_ptr<parser_t> &parser);
 
     /// Returns a string describing the current parser position in the format 'FILENAME (line
     /// LINE_NUMBER): LINE'. Example:

From 1e5742401141a0d47a5a4773838c791f144a8d9b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 20:20:52 -0700
Subject: [PATCH 0464/1732] Thread a parser into function_exists

Since this may autoload, it needs a parser with which to autoload.
---
 src/autoload.cpp          |  5 ++---
 src/autoload.h            |  3 ++-
 src/builtin_fg.cpp        |  2 +-
 src/builtin_functions.cpp | 18 +++++++++---------
 src/complete.cpp          |  5 +++--
 src/function.cpp          | 19 +++++++++----------
 src/function.h            |  6 +++---
 src/parse_execution.cpp   |  5 +++--
 src/reader.cpp            | 21 ++++++++++-----------
 src/reader.h              |  3 ++-
 10 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index bf6828232..6a750cfd3 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -190,8 +190,7 @@ maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const environ
     return std::move(mfile->path);
 }
 
-void autoload_t::perform_autoload(const wcstring &path) {
+void autoload_t::perform_autoload(const wcstring &path, parser_t &parser) {
     wcstring script_source = L"source " + escape_string(path, ESCAPE_ALL);
-    exec_subshell(script_source, parser_t::principal_parser(),
-                  false /* do not apply exit status */);
+    exec_subshell(script_source, parser, false /* do not apply exit status */);
 }
diff --git a/src/autoload.h b/src/autoload.h
index 2daed1a45..d59486364 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -15,6 +15,7 @@
 
 class autoload_file_cache_t;
 class environment_t;
+class parser_t;
 
 /// autoload_t is a class that knows how to autoload .fish files from a list of directories. This
 /// is used by autoloading functions and completions. It maintains a file cache, which is
@@ -58,7 +59,7 @@ class autoload_t {
     /// Helper to actually perform an autoload.
     /// This is a static function because it executes fish script, and so must be called without
     /// holding any particular locks.
-    static void perform_autoload(const wcstring &path);
+    static void perform_autoload(const wcstring &path, parser_t &parser);
 
     /// Mark that a command previously returned from path_to_autoload is finished autoloading.
     void mark_autoload_finished(const wcstring &cmd) {
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 7ce712bd7..7a27f254c 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -101,7 +101,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const wcstring ft = tok_first(job->command());
     //For compatibility with fish 2.0's $_, now replaced with `status current-command`
     if (!ft.empty()) parser.vars().set_one(L"_", ENV_EXPORT, ft);
-    reader_write_title(job->command());
+    reader_write_title(job->command(), parser);
 
     job->promote();
     job->set_flag(job_flag_t::FOREGROUND, true);
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 91b334e6e..16a22128d 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -225,14 +225,14 @@ static wcstring functions_def(const wcstring &name) {
 }
 
 static int report_function_metadata(const wchar_t *funcname, bool verbose, io_streams_t &streams,
-                                    bool metadata_as_comments) {
+                                    parser_t &parser, bool metadata_as_comments) {
     const wchar_t *path = L"n/a";
     const wchar_t *autoloaded = L"n/a";
     const wchar_t *shadows_scope = L"n/a";
     wcstring description = L"n/a";
     int line_number = 0;
 
-    if (function_exists(funcname)) {
+    if (function_exists(funcname, parser)) {
         auto props = function_get_properties(funcname);
         path = function_get_definition_file(funcname);
         if (path) {
@@ -301,13 +301,13 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         func = argv[optind];
-        if (!function_exists(func)) {
+        if (!function_exists(func, parser)) {
             streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"), cmd, func);
             builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_CMD_ERROR;
         }
 
-        function_set_desc(func, opts.description);
+        function_set_desc(func, opts.description, parser);
         return STATUS_CMD_OK;
     }
 
@@ -319,7 +319,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         const wchar_t *funcname = argv[optind];
-        return report_function_metadata(funcname, opts.verbose, streams, false);
+        return report_function_metadata(funcname, opts.verbose, streams, parser, false);
     }
 
     if (opts.handlers) {
@@ -376,7 +376,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         current_func = argv[optind];
         new_func = argv[optind + 1];
 
-        if (!function_exists(current_func)) {
+        if (!function_exists(current_func, parser)) {
             streams.err.append_format(_(L"%ls: Function '%ls' does not exist\n"), cmd,
                                       current_func.c_str());
             builtin_print_error_trailer(parser, streams.err, cmd);
@@ -391,7 +391,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         // Keep things simple: don't allow existing names to be copy targets.
-        if (function_exists(new_func)) {
+        if (function_exists(new_func, parser)) {
             streams.err.append_format(
                 _(L"%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"), cmd,
                 new_func.c_str(), current_func.c_str());
@@ -405,13 +405,13 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     int res = STATUS_CMD_OK;
     for (int i = optind; i < argc; i++) {
-        if (!function_exists(argv[i])) {
+        if (!function_exists(argv[i], parser)) {
             res++;
         } else {
             if (!opts.query) {
                 if (i != optind) streams.out.append(L"\n");
                 const wchar_t *funcname = argv[optind];
-                report_function_metadata(funcname, opts.verbose, streams, true);
+                report_function_metadata(funcname, opts.verbose, streams, parser, true);
                 streams.out.append(functions_def(funcname));
             }
         }
diff --git a/src/complete.cpp b/src/complete.cpp
index d7bb22017..95dffdc9d 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -859,7 +859,8 @@ static bool short_ok(const wcstring &arg, const complete_entry_opt_t *entry,
 static void complete_load(const wcstring &name, bool reload) {
     // We have to load this as a function, since it may define a --wraps or signature.
     // See issue #2466.
-    function_load(name);
+    auto &parser = parser_t::principal_parser();
+    function_load(name, parser);
 
     // It's important to NOT hold the lock around completion loading.
     // We need to take the lock to decide what to load, drop it to perform the load, then reacquire
@@ -867,7 +868,7 @@ static void complete_load(const wcstring &name, bool reload) {
     const environment_t &vars = parser_t::principal_parser().vars();
     maybe_t<wcstring> path_to_load = completion_autoloader.acquire()->resolve_command(name, vars);
     if (path_to_load) {
-        autoload_t::perform_autoload(*path_to_load);
+        autoload_t::perform_autoload(*path_to_load, parser);
         completion_autoloader.acquire()->mark_autoload_finished(name);
     }
 }
diff --git a/src/function.cpp b/src/function.cpp
index 75cd7b802..a158027af 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -96,7 +96,7 @@ bool function_set_t::allow_autoload(const wcstring &name) const {
 /// Make sure that if the specified function is a dynamically loaded function, it has been fully
 /// loaded.
 /// Note this executes fish script code.
-static void try_autoload(const wcstring &name) {
+static void try_autoload(const wcstring &name, parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
     maybe_t<wcstring> path_to_autoload;
     // Note we can't autoload while holding the funcset lock.
@@ -104,15 +104,14 @@ static void try_autoload(const wcstring &name) {
     {
         auto funcset = function_set.acquire();
         if (funcset->allow_autoload(name)) {
-            const environment_t &vars = parser_t::principal_parser().vars();
-            path_to_autoload = funcset->autoloader.resolve_command(name, vars);
+            path_to_autoload = funcset->autoloader.resolve_command(name, parser.vars());
         }
     }
 
     // Release the lock and perform any autoload, then reacquire the lock and clean up.
     if (path_to_autoload) {
         // Crucially, the lock is acquired *after* do_autoload_file_at_path().
-        autoload_t::perform_autoload(*path_to_autoload);
+        autoload_t::perform_autoload(*path_to_autoload, parser);
         function_set.acquire()->autoloader.mark_autoload_finished(name);
     }
 }
@@ -212,18 +211,18 @@ std::shared_ptr<const function_properties_t> function_get_properties(const wcstr
     return nullptr;
 }
 
-int function_exists(const wcstring &cmd) {
+int function_exists(const wcstring &cmd, parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
     if (parser_keywords_is_reserved(cmd)) return 0;
-    try_autoload(cmd);
+    try_autoload(cmd, parser);
     auto funcset = function_set.acquire();
     return funcset->funcs.find(cmd) != funcset->funcs.end();
 }
 
-void function_load(const wcstring &cmd) {
+void function_load(const wcstring &cmd, parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
     if (!parser_keywords_is_reserved(cmd)) {
-        try_autoload(cmd);
+        try_autoload(cmd, parser);
     }
 }
 
@@ -279,9 +278,9 @@ bool function_get_desc(const wcstring &name, wcstring &out_desc) {
     return false;
 }
 
-void function_set_desc(const wcstring &name, const wcstring &desc) {
+void function_set_desc(const wcstring &name, const wcstring &desc, parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
-    try_autoload(name);
+    try_autoload(name, parser);
     auto funcset = function_set.acquire();
     auto iter = funcset->funcs.find(name);
     if (iter != funcset->funcs.end()) {
diff --git a/src/function.h b/src/function.h
index 89179d46f..ad9aee778 100644
--- a/src/function.h
+++ b/src/function.h
@@ -67,14 +67,14 @@ bool function_get_definition(const wcstring &name, wcstring &out_definition);
 bool function_get_desc(const wcstring &name, wcstring &out_desc);
 
 /// Sets the description of the function with the name \c name.
-void function_set_desc(const wcstring &name, const wcstring &desc);
+void function_set_desc(const wcstring &name, const wcstring &desc, parser_t &parser);
 
 /// Returns true if the function with the name name exists.
 /// This may autoload.
-int function_exists(const wcstring &name);
+int function_exists(const wcstring &name, parser_t &parser);
 
 /// Attempts to load a function if not yet loaded. This is used by the completion machinery.
-void function_load(const wcstring &name);
+void function_load(const wcstring &name, parser_t &parser);
 
 /// Returns true if the function with the name name exists, without triggering autoload.
 int function_exists_no_autoload(const wcstring &name, const environment_t &vars);
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 5ec8152e1..5755a63cb 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -164,7 +164,7 @@ process_type_t parse_execution_context_t::process_type_for_command(
             process_type = process_type_t::builtin;
             break;
         case parse_statement_decoration_none:
-            if (function_exists(cmd)) {
+            if (function_exists(cmd, *parser)) {
                 process_type = process_type_t::function;
             } else if (builtin_exists(cmd)) {
                 process_type = process_type_t::builtin;
@@ -858,7 +858,8 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         path_to_external_command.clear();
 
         // If we have defined a wrapper around cd, use it, otherwise use the cd builtin.
-        process_type = function_exists(L"cd") ? process_type_t::function : process_type_t::builtin;
+        process_type =
+            function_exists(L"cd", *parser) ? process_type_t::function : process_type_t::builtin;
     } else {
         // Not implicit cd.
         const globspec_t glob_behavior = (cmd == L"set" || cmd == L"count") ? nullglob : failglob;
diff --git a/src/reader.cpp b/src/reader.cpp
index 473cbac54..3426171d6 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -874,11 +874,11 @@ bool reader_thread_job_is_stale() {
     return read_generation_count() != s_thread_generation;
 }
 
-void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
+void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor_position) {
     if (!term_supports_setting_title()) return;
 
     wcstring fish_title_command = DEFAULT_TITLE;
-    if (function_exists(L"fish_title")) {
+    if (function_exists(L"fish_title", parser)) {
         fish_title_command = L"fish_title";
         if (!cmd.empty()) {
             fish_title_command.append(L" ");
@@ -889,8 +889,7 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
 
     wcstring_list_t lst;
     proc_push_interactive(0);
-    if (exec_subshell(fish_title_command, parser_t::principal_parser(), lst,
-                      false /* ignore exit status */) != -1 &&
+    if (exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */) != -1 &&
         !lst.empty()) {
         std::fputws(L"\x1B]0;", stdout);
         for (size_t i = 0; i < lst.size(); i++) {
@@ -909,7 +908,7 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
 
 void reader_data_t::exec_mode_prompt() {
     mode_prompt_buff.clear();
-    if (function_exists(MODE_PROMPT_FUNCTION_NAME)) {
+    if (function_exists(MODE_PROMPT_FUNCTION_NAME, parser())) {
         wcstring_list_t mode_indicator_list;
         exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list,
                       false);
@@ -966,7 +965,7 @@ void reader_data_t::exec_prompt() {
     // Write the screen title. Do not reset the cursor position: exec_prompt is called when there
     // may still be output on the line from the previous command (#2499) and we need our PROMPT_SP
     // hack to work.
-    reader_write_title(L"", false);
+    reader_write_title(L"", parser(), false);
 }
 
 void reader_init() {
@@ -1957,7 +1956,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     if (!ft.empty()) parser.vars().set_one(L"_", ENV_GLOBAL, ft);
 
     outputter_t &outp = outputter_t::stdoutput();
-    reader_write_title(cmd);
+    reader_write_title(cmd, parser);
     term_donate(outp);
 
     gettimeofday(&time_before, NULL);
@@ -2278,15 +2277,15 @@ static int read_i() {
         event_fire_generic(L"fish_prompt");
         run_count++;
 
-        if (is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME)) {
+        if (is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
             reader_set_left_prompt(DEBUG_PROMPT_FUNCTION_NAME);
-        } else if (function_exists(LEFT_PROMPT_FUNCTION_NAME)) {
+        } else if (function_exists(LEFT_PROMPT_FUNCTION_NAME, parser)) {
             reader_set_left_prompt(LEFT_PROMPT_FUNCTION_NAME);
         } else {
             reader_set_left_prompt(DEFAULT_PROMPT);
         }
 
-        if (function_exists(RIGHT_PROMPT_FUNCTION_NAME)) {
+        if (function_exists(RIGHT_PROMPT_FUNCTION_NAME, parser)) {
             reader_set_right_prompt(RIGHT_PROMPT_FUNCTION_NAME);
         } else {
             reader_set_right_prompt(L"");
@@ -2500,7 +2499,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // Repaint the mode-prompt only if it exists.
             // This is an optimization basically exclusively for vi-mode, since the prompt
             // may sometimes take a while but when switching the mode all we care about is the mode-prompt.
-            if (function_exists(MODE_PROMPT_FUNCTION_NAME)) {
+            if (function_exists(MODE_PROMPT_FUNCTION_NAME, parser())) {
                 exec_mode_prompt();
                 s_reset(&screen, screen_reset_current_line_and_prompt);
                 screen_reset_needed = false;
diff --git a/src/reader.h b/src/reader.h
index a6c1bbffb..4be1328a0 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -82,8 +82,9 @@ void reader_pop_current_filename();
 /// executing and just after it finishes.
 ///
 /// \param cmd Command line string passed to \c fish_title if is defined.
+/// \param parser The parser to use for autoloading fish_title.
 /// \param reset_cursor_position If set, issue a \r so the line driver knows where we are
-void reader_write_title(const wcstring &cmd, bool reset_cursor_position = true);
+void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor_position = true);
 
 /// Call this function to tell the reader that a repaint is needed, and should be performed when
 /// possible.

From 18cecd3663a9206da72e11cc2f1451b7c38a5c3f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 11:52:56 -0700
Subject: [PATCH 0465/1732] Beef up find_globals

Allow it to find the source declarations for globals, and ignore const ones.
---
 build_tools/find_globals.fish | 103 ++++++++++++++++++++++++++++------
 1 file changed, 87 insertions(+), 16 deletions(-)

diff --git a/build_tools/find_globals.fish b/build_tools/find_globals.fish
index f7b819be1..5955c5f33 100755
--- a/build_tools/find_globals.fish
+++ b/build_tools/find_globals.fish
@@ -4,6 +4,22 @@
 # for object files in this directory.
 # This was written for macOS nm.
 
+set FISH_SOURCE_DIR $argv[1]
+if not test -d "$FISH_SOURCE_DIR"
+    echo "FISH_SOURCE_DIR not given"
+    exit 1
+end
+
+set -g whitelist \
+    # unclear what this is \
+    l_constinit \
+    # hacks to work around missing ncurses strings on mac \
+    sitm_esc ritm_esc dim_esc \
+
+
+# In our nm regex, we are interested in data (dD) and bss (bB) segments.
+set -g nm_regex '^([^ ]+) ([dDbB])'
+
 set total_globals 0
 set boring_files \
     fish_key_reader.cpp.o \
@@ -11,31 +27,86 @@ set boring_files \
     fish_indent.cpp.o \
 
 
-set whitelist \
-    termsize_lock termsize \
-    initial_pid initial_fg_process_group \
-    _debug_level \
-    sitm_esc ritm_esc dim_esc \
-    iothread_init()::inited \
-    s_result_queue s_main_thread_request_queue s_read_pipe s_write_pipe \
-    s_main_thread_performer_lock s_main_thread_performer_cond s_main_thread_request_q_lock \
-    locked_consumed_job_ids \
-    env_initialized \
+# return if we should ignore the given symbol name
+function should_ignore
+    set symname $argv[1]
+    string match -q '*guard variable for*' $symname
+    and return 0
+    contains $symname $whitelist
+    and return 0
+    return 1
+end
 
+# echo a cleaned-up symbol name, e.g. replacing template gunk
+function cleanup_syname
+    set symname $argv[1]
+    set symname (string replace --all 'std::__1::basic_string<wchar_t, std::__1::char_traits<wchar_t>, std::__1::allocator<wchar_t> >' 'wcstring' $symname)
+    set symname (string replace --all 'std::__1::vector<wcstring, std::__1::allocator<wcstring > >' 'wcstring_list_t' $symname)
+    echo $symname
+end
+
+# Output the declaration for a symbol name in a given file.
+function print_decl
+    set -l objfile $argv[1]
+    set -l symname $argv[2]
+    set -l varname (string split '::' $symname)[-1]
+    set -l srcfile (basename $objfile .o)
+    set -l srcpath $FISH_SOURCE_DIR/src/$srcfile
+
+    # A leading underscore indicates a global, strip it.
+    set varname (string replace --regex '^_' '' $varname)
+
+    if not test -f "$srcpath"
+        echo "Could not find $srcpath"
+    end
+    # Guess the variable as the first usage of the name.
+    # Strip everything after the first =.
+    set vardecl (egrep -m 1 " $varname\\b" $srcpath | cut -f -1 -d '=' | string trim)
+    if test -z "$vardecl"
+        echo "COULD_NOT_FIND_$varname"
+        return 1
+    end
+    echo $vardecl
+    return 0
+end
+
+# Return if a variable declaration is "thread safe".
+function decl_is_threadsafe
+    set -l vardecl $argv[1]
+    # decls starting with 'const ' or containing ' const ' are assumed safe.
+    string match -q --regex '(^| )const ' $vardecl
+    and return 0
+
+    # Ordinary types indicating a safe variable.
+    set safes relaxed_atomic_bool_t std::mutex std::condition_variable
+    for safe in $safes
+        string match -q "*$safe*" $vardecl
+        and return 0
+    end
+
+    # Template types indicate a safe variable.
+    set safes owning_lock mainthread_t std::atomic relaxed_atomic_t
+    for safe in $safes
+        string match -q "*$safe<*" $vardecl
+        and return 0
+    end
+end
 
 for file in ./**.o
     set filename (basename $file)
     # Skip boring files.
     contains $filename $boring_files
     and continue
-    for line in (nm -p -P -U $file)
-        # Look in data (dD) and bss (bB) segments.
-        set matches (string match --regex '^([^ ]+) ([dDbB])' -- $line)
+    for line in (nm -p -P -U $file | egrep $nm_regex)
+        set matches (string match --regex $nm_regex -- $line)
         or continue
-        set symname (echo $matches[2] | c++filt)
-        contains $symname $whitelist
+        set symname (cleanup_syname (echo $matches[2] | c++filt))
+        should_ignore $symname
         and continue
-        echo $filename $symname $matches[3]
+        set vardecl (print_decl $filename $symname)
+        decl_is_threadsafe $vardecl
+        and continue
+        echo $filename $symname $matches[3] ":" $vardecl
         set total_globals (math $total_globals + 1)
     end
 end

From ec522e5978d5fd35984d52f23d1692c119fcf741 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 12:59:21 -0700
Subject: [PATCH 0466/1732] Migrate s_main_thread_request_queue to owning_lock

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

diff --git a/src/iothread.cpp b/src/iothread.cpp
index d3f7220dc..5bb6ad665 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -76,8 +76,10 @@ static owning_lock<std::queue<spawn_request_t>> s_result_queue;
 // "Do on main thread" support.
 static std::mutex s_main_thread_performer_lock;               // protects the main thread requests
 static std::condition_variable s_main_thread_performer_cond;  // protects the main thread requests
-static std::mutex s_main_thread_request_q_lock;               // protects the queue
-static std::queue<main_thread_request_t *> s_main_thread_request_queue;
+
+/// The queue of main thread requests. This queue contains pointers to structs that are
+/// stack-allocated on the requesting thread.
+static owning_lock<std::queue<main_thread_request_t *>> s_main_thread_request_queue;
 
 // Notifying pipes.
 static int s_read_pipe, s_write_pipe;
@@ -257,10 +259,7 @@ static void iothread_service_main_thread_requests() {
 
     // Move the queue to a local variable.
     std::queue<main_thread_request_t *> request_queue;
-    {
-        scoped_lock queue_lock(s_main_thread_request_q_lock);
-        request_queue.swap(s_main_thread_request_queue);
-    }
+    s_main_thread_request_queue.acquire()->swap(request_queue);
 
     if (!request_queue.empty()) {
         // Perform each of the functions. Note we are NOT responsible for deleting these. They are
@@ -312,12 +311,8 @@ void iothread_perform_on_main(void_function_t &&func) {
     // Make a new request. Note we are synchronous, so this can be stack allocated!
     main_thread_request_t req(std::move(func));
 
-    // Append it. Do not delete the nested scope as it is crucial to the proper functioning of this
-    // code by virtue of the lock management.
-    {
-        scoped_lock queue_lock(s_main_thread_request_q_lock);
-        s_main_thread_request_queue.push(&req);
-    }
+    // Append it. Ensure we don't hold the lock after.
+    s_main_thread_request_queue.acquire()->push(&req);
 
     // Tell the pipe.
     const char wakeup_byte = IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE;

From 9dc1fd50c987a5b79b96879587aa0b941df1ab75 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 13:16:40 -0700
Subject: [PATCH 0467/1732] Introduce global_safety.h

This is a set of types that enable characterizing the proper way to access
global variables.
---
 src/global_safety.h | 73 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/global_safety.h

diff --git a/src/global_safety.h b/src/global_safety.h
new file mode 100644
index 000000000..2156e2c55
--- /dev/null
+++ b/src/global_safety.h
@@ -0,0 +1,73 @@
+// Support for enforcing correct access to globals.
+#ifndef FISH_GLOBAL_SAFETY_H
+#define FISH_GLOBAL_SAFETY_H
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "common.h"
+
+#include <cassert>
+
+// fish is multithreaded. Global (which includes function and file-level statics) when used naively
+// may therefore lead to data races. Use the following types to characterize and enforce correct
+// access patterns.
+
+namespace detail {
+// An empty value type that cannot be copied or moved.
+// Include this as an instance variable to prevent globals from being copied or moved.
+struct fixed_t {
+    fixed_t(const fixed_t &) = delete;
+    fixed_t(fixed_t &&) = delete;
+    fixed_t &operator=(fixed_t &&) = delete;
+    fixed_t &operator=(const fixed_t &) = delete;
+    fixed_t() = default;
+};
+}  // namespace detail
+
+/// A mainthread_t variable may only be accessed on the main thread.
+template <typename T>
+class mainthread_t : detail::fixed_t {
+    T value_{};
+
+   public:
+    mainthread_t(T value) : value_(std::move(value)) {}
+    mainthread_t() = default;
+
+    operator T &() {
+        ASSERT_IS_MAIN_THREAD();
+        return value_;
+    }
+
+    operator const T &() const {
+        ASSERT_IS_MAIN_THREAD();
+        return value_;
+    }
+
+    void operator=(T value) {
+        ASSERT_IS_MAIN_THREAD();
+        value_ = std::move(value);
+    }
+};
+
+/// A latch variable may only be set once, on the main thread.
+/// The value is a immortal.
+template <typename T>
+class latch_t : detail::fixed_t {
+    T *value_{};
+
+   public:
+    operator T *() { return value_; }
+    operator const T *() const { return value_; }
+
+    T *operator->() { return value_; }
+    const T *operator->() const { return value_; }
+
+    template <typename... Args>
+    void emplace(Args &&... args) {
+        ASSERT_IS_MAIN_THREAD();
+        assert(value_ == nullptr && "Latch variable initialized multiple times");
+        value_ = new T(std::forward<Args>(args)...);
+    }
+};
+
+#endif

From f66e0109491f9235623f5695cf700c123a1b6634 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 15:00:36 -0700
Subject: [PATCH 0468/1732] Turn a lot of common.h variables into getter
 functions

Improves thread safety.
---
 src/builtin_set.cpp     |  2 +-
 src/common.cpp          | 30 ++++++++++++++++++++++--------
 src/common.h            | 14 ++++++++------
 src/fish.cpp            |  2 +-
 src/fish_indent.cpp     |  2 +-
 src/fish_key_reader.cpp |  2 +-
 src/fish_tests.cpp      |  1 +
 src/global_safety.h     | 17 +++++++++++++++++
 src/pager.cpp           |  7 ++++---
 src/parse_execution.cpp |  2 +-
 src/parse_util.cpp      |  1 +
 src/proc.cpp            |  1 +
 src/reader.cpp          |  4 ++--
 src/screen.cpp          |  8 ++++----
 src/wcstringutil.cpp    |  3 ++-
 15 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index f435bbff7..b511b03f7 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -494,7 +494,7 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
                 streams.out.append(L" ");
                 streams.out.append(val);
 
-                if (shorten) streams.out.push_back(ellipsis_char);
+                if (shorten) streams.out.push_back(get_ellipsis_char());
             }
         }
 
diff --git a/src/common.cpp b/src/common.cpp
index 1ce118608..77332bab1 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -53,6 +53,7 @@
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
+#include "global_safety.h"
 #include "proc.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
@@ -64,19 +65,32 @@ struct termios shell_modes;
 /// This allows us to determine if we're running on the main thread
 static std::atomic<size_t> thread_id { 0 };
 /// This allows us to notice when we've forked.
-static bool is_forked_proc = false;
+static relaxed_atomic_bool_t is_forked_proc{false};
 /// This allows us to bypass the main thread checks
-static bool thread_asserts_cfg_for_testing = false;
+static relaxed_atomic_bool_t thread_asserts_cfg_for_testing{false};
+
+static relaxed_atomic_t<wchar_t> ellipsis_char;
+wchar_t get_ellipsis_char() { return ellipsis_char; }
+
+static relaxed_atomic_t<const wchar_t *> ellipsis_str;
+const wchar_t *get_ellipsis_str() { return ellipsis_str; }
+
+static relaxed_atomic_t<const wchar_t *> omitted_newline_str;
+const wchar_t *get_omitted_newline_str() { return omitted_newline_str; }
+
+static relaxed_atomic_t<int> omitted_newline_width;
+int get_omitted_newline_width() { return omitted_newline_width; }
+
+static relaxed_atomic_t<wchar_t> obfuscation_read_char;
+wchar_t get_obfuscation_read_char() { return obfuscation_read_char; }
 
-wchar_t ellipsis_char;
-const wchar_t *ellipsis_str = nullptr;
-const wchar_t *omitted_newline_str;
-int omitted_newline_width;
-wchar_t obfuscation_read_char;
 bool g_profiling_active = false;
 const wchar_t *program_name;
 std::atomic<int> debug_level{1};  // default maximum debug output level (errors and warnings)
-int debug_stack_frames = 0;  // default number of stack frames to show on debug() calls
+
+static relaxed_atomic_t<int> debug_stack_frames{0};
+void set_debug_stack_frames(int v) { debug_stack_frames = v; }
+int get_debug_stack_frames() { return debug_stack_frames; }
 
 /// Be able to restore the term's foreground process group.
 /// This is set during startup and not modified after.
diff --git a/src/common.h b/src/common.h
index bc09cad32..a10db8906 100644
--- a/src/common.h
+++ b/src/common.h
@@ -176,20 +176,22 @@ extern struct termios shell_modes;
 
 /// The character to use where the text has been truncated. Is an ellipsis on unicode system and a $
 /// on other systems.
-extern wchar_t ellipsis_char;
+wchar_t get_ellipsis_char();
+
 /// The character or string to use where text has been truncated (ellipsis if possible, otherwise
 /// ...)
-extern const wchar_t *ellipsis_str;
+const wchar_t *get_ellipsis_str();
 
 /// Character representing an omitted newline at the end of text.
-extern const wchar_t *omitted_newline_str;
-extern int omitted_newline_width;
+const wchar_t *get_omitted_newline_str();
+int get_omitted_newline_width();
 
 /// Character used for the silent mode of the read command
-extern wchar_t obfuscation_read_char;
+wchar_t get_obfuscation_read_char();
 
 /// How many stack frames to show when a debug() call is made.
-extern int debug_stack_frames;
+int get_debug_stack_frames();
+void set_debug_stack_frames(int);
 
 /// Profiling flag. True if commands should be profiled.
 extern bool g_profiling_active;
diff --git a/src/fish.cpp b/src/fish.cpp
index 3bd1742e6..92092fe0a 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -337,7 +337,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-                    debug_stack_frames = (int)tmp;
+                    set_debug_stack_frames((int)tmp);
                 } else {
                     std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
                     exit(1);
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 4150a7b0c..a29260a7e 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -575,7 +575,7 @@ int main(int argc, char *argv[]) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-                    debug_stack_frames = (int)tmp;
+                    set_debug_stack_frames((int)tmp);
                 } else {
                     std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
                     exit(1);
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 36fdd0fa8..4549d927a 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -324,7 +324,7 @@ static bool parse_debug_frames_flag() {
     char *end;
     long tmp = strtol(optarg, &end, 10);
     if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-        debug_stack_frames = (int)tmp;
+        set_debug_stack_frames((int)tmp);
     } else {
         std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag\n"), optarg);
         return false;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 2d24a2978..eca2a2060 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2047,6 +2047,7 @@ struct pager_layout_testcase_t {
             wcstring expected = this->expected;
 
             // hack: handle the case where ellipsis is not L'\x2026'
+            wchar_t ellipsis_char = get_ellipsis_char();
             if (ellipsis_char != L'\x2026') {
                 std::replace(expected.begin(), expected.end(), L'\x2026', ellipsis_char);
             }
diff --git a/src/global_safety.h b/src/global_safety.h
index 2156e2c55..b19dec31f 100644
--- a/src/global_safety.h
+++ b/src/global_safety.h
@@ -6,6 +6,7 @@
 
 #include "common.h"
 
+#include <atomic>
 #include <cassert>
 
 // fish is multithreaded. Global (which includes function and file-level statics) when used naively
@@ -70,4 +71,20 @@ class latch_t : detail::fixed_t {
     }
 };
 
+/// An atomic type that always use relaxed reads.
+template <typename T>
+class relaxed_atomic_t {
+    std::atomic<T> value_{};
+
+   public:
+    relaxed_atomic_t() = default;
+    relaxed_atomic_t(T value) : value_(value) {}
+
+    operator T() const { return value_.load(std::memory_order_relaxed); }
+
+    void operator=(T v) { return value_.store(v, std::memory_order_relaxed); }
+};
+
+using relaxed_atomic_bool_t = relaxed_atomic_t<bool>;
+
 #endif
diff --git a/src/pager.cpp b/src/pager.cpp
index ddc357738..7e00ff914 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -89,9 +89,10 @@ static size_t print_max(const wcstring &str, highlight_spec_t color, size_t max,
 
         if (width_c > remaining) break;
 
+        wchar_t ellipsis = get_ellipsis_char();
         if ((width_c == remaining) && (has_more || i + 1 < str.size())) {
-            line->append(ellipsis_char, color);
-            int ellipsis_width = fish_wcwidth(ellipsis_char);
+            line->append(ellipsis, color);
+            int ellipsis_width = fish_wcwidth(ellipsis);
             remaining -= std::min(remaining, size_t(ellipsis_width));
             break;
         }
@@ -493,7 +494,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
     wcstring progress_text;
     assert(rendering->remaining_to_disclose != 1);
     if (rendering->remaining_to_disclose > 1) {
-        progress_text = format_string(_(L"%lsand %lu more rows"), ellipsis_str,
+        progress_text = format_string(_(L"%lsand %lu more rows"), get_ellipsis_str(),
                                       (unsigned long)rendering->remaining_to_disclose);
     } else if (start_row > 0 || stop_row < row_count) {
         // We have a scrollable interface. The +1 here is because we are zero indexed, but want
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 5755a63cb..273a71afc 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -700,7 +700,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
             // Looks like a command.
             this->report_error(statement, ERROR_BAD_EQUALS_IN_COMMAND5, argument.c_str(),
                                name_str.c_str(), val_str.c_str(), argument.c_str(),
-                               ellipsis_str);
+                               get_ellipsis_str());
         } else {
             wcstring assigned_val = reconstruct_orig_str(val_str);
             this->report_error(statement, ERROR_BAD_COMMAND_ASSIGN_ERR_MSG, name_str.c_str(),
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 00ad41d39..7bace8694 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -794,6 +794,7 @@ static wcstring truncate_string(const wcstring &str) {
     wcstring result(str, 0, max_len);
     if (str.size() > max_len) {
         // Truncate!
+        wchar_t ellipsis_char = get_ellipsis_char();
         if (ellipsis_char == L'\x2026') {
             result.at(max_len - 1) = ellipsis_char;
         } else {
diff --git a/src/proc.cpp b/src/proc.cpp
index 49a28f63b..97dfd919a 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -410,6 +410,7 @@ static wcstring truncate_command(const wcstring &cmd) {
     }
 
     // Truncation required.
+    const wchar_t *ellipsis_str = get_ellipsis_str();
     const size_t ellipsis_length = std::wcslen(ellipsis_str);  // no need for wcwidth
     size_t trunc_length = max_len - ellipsis_length;
     // Eat trailing whitespace.
diff --git a/src/reader.cpp b/src/reader.cpp
index 3426171d6..31d401329 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -610,7 +610,7 @@ void reader_data_t::repaint() {
 
     wcstring full_line;
     if (silent) {
-        full_line = wcstring(cmd_line->text.length(), obfuscation_read_char);
+        full_line = wcstring(cmd_line->text.length(), get_obfuscation_read_char());
     } else {
         // Combine the command and autosuggestion into one string.
         full_line = combine_command_and_autosuggestion(cmd_line->text, autosuggestion);
@@ -1633,7 +1633,7 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
         prefix.append(el->text, prefix_start, len);
     } else {
         // Append just the end of the string.
-        prefix = wcstring(&ellipsis_char, 1);
+        prefix = wcstring{get_ellipsis_char()};
         prefix.append(el->text, prefix_start + len - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
     }
 
diff --git a/src/screen.cpp b/src/screen.cpp
index e9dbc245b..3414e806b 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -918,7 +918,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
                 size_t truncation_offset = truncation_offset_for_width(
                     autosuggest_truncated_widths, available_autosuggest_space - 2);
                 result.autosuggestion = wcstring(autosuggestion, truncation_offset);
-                result.autosuggestion.push_back(ellipsis_char);
+                result.autosuggestion.push_back(get_ellipsis_char());
             }
             done = true;
         }
@@ -1102,7 +1102,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
 
         // Don't need to check for fish_wcwidth errors; this is done when setting up
         // omitted_newline_char in common.cpp.
-        int non_space_width = omitted_newline_width;
+        int non_space_width = get_omitted_newline_width();
         // We do `>` rather than `>=` because the code below might require one extra space.
         if (screen_width > non_space_width) {
             bool justgrey = true;
@@ -1129,7 +1129,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
                 }
             }
 
-            abandon_line_string.append(omitted_newline_str);
+            abandon_line_string.append(get_omitted_newline_str());
 
             if (cur_term && exit_attribute_mode) {
                 abandon_line_string.append(
@@ -1141,7 +1141,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
         }
 
         abandon_line_string.push_back(L'\r');
-        abandon_line_string.append(omitted_newline_str);
+        abandon_line_string.append(get_omitted_newline_str());
         // Now we are certainly on a new line. But we may have dropped the omitted newline char on
         // it. So append enough spaces to overwrite the omitted newline char, and then clear all the
         // spaces from the new line.
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index c8e47b30c..d5708db30 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -39,10 +39,11 @@ wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
         return input.substr(0, max_len);
     }
     if (etype == ellipsis_type::Prettiest) {
+        const wchar_t *ellipsis_str = get_ellipsis_str();
         return input.substr(0, max_len - std::wcslen(ellipsis_str)).append(ellipsis_str);
     }
     wcstring output = input.substr(0, max_len - 1);
-    output.push_back(ellipsis_char);
+    output.push_back(get_ellipsis_char());
     return output;
 }
 

From 3d63a68dd065c6bed8dbebfb2e48d6b9db2888a8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 15:13:30 -0700
Subject: [PATCH 0469/1732] Make builtin_random thread safe

---
 src/builtin_random.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index 617082e51..e20f22718 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -15,6 +15,17 @@
 #include "io.h"
 #include "wutil.h"  // IWYU pragma: keep
 
+/// \return a random-seeded engine.
+static std::minstd_rand get_seeded_engine() {
+    std::minstd_rand engine;
+    // seed engine with 2*32 bits of random data
+    // for the 64 bits of internal state of minstd_rand
+    std::random_device rd;
+    std::seed_seq seed{rd(), rd()};
+    engine.seed(seed);
+    return engine;
+}
+
 /// The random builtin generates random numbers.
 int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wchar_t *cmd = argv[0];
@@ -30,16 +41,10 @@ int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     }
 
-    static bool seeded = false;
-    static std::minstd_rand engine;
-    if (!seeded) {
-        // seed engine with 2*32 bits of random data
-        // for the 64 bits of internal state of minstd_rand
-        std::random_device rd;
-        std::seed_seq seed{rd(), rd()};
-        engine.seed(seed);
-        seeded = true;
-    }
+    // We have a single engine which we lazily seed. Lock it here.
+    static owning_lock<std::minstd_rand> s_engine{get_seeded_engine()};
+    auto engine_lock = s_engine.acquire();
+    std::minstd_rand &engine = *engine_lock;
 
     int arg_count = argc - optind;
     long long start, end;

From 6e143bf50f1f6c1933c0f415f8c9318f2176184b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 15:33:39 -0700
Subject: [PATCH 0470/1732] Eliminate history_collection_t

This was a pretty useless type.
---
 src/history.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index dcc041c97..12ef8b14f 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -210,16 +210,6 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_lru_
     }
 };
 
-// The set of histories
-// Note that histories are currently immortal
-class history_collection_t {
-    owning_lock<std::map<wcstring, std::unique_ptr<history_t>>> histories;
-
-   public:
-    history_t &get_creating(const wcstring &name);
-    void save();
-};
-
 }  // anonymous namespace
 
 // history_file_contents_t holds the read-only contents of a file.
@@ -332,7 +322,8 @@ class history_file_contents_t {
     }
 };
 
-static history_collection_t histories;
+/// The set of all histories.
+static owning_lock<std::map<wcstring, std::unique_ptr<history_t>>> s_histories;
 
 static wcstring history_filename(const wcstring &name, const wcstring &suffix);
 
@@ -816,11 +807,11 @@ static size_t offset_of_next_item(const history_file_contents_t &contents, size_
     return size_t(-1);
 }
 
-history_t &history_collection_t::get_creating(const wcstring &name) {
+history_t &history_t::history_with_name(const wcstring &name) {
     // Return a history for the given name, creating it if necessary
     // Note that histories are currently never deleted, so we can return a reference to them without
     // using something like shared_ptr
-    auto hs = histories.acquire();
+    auto hs = s_histories.acquire();
     std::unique_ptr<history_t> &hist = (*hs)[name];
     if (!hist) {
         hist = make_unique<history_t>(name);
@@ -828,10 +819,6 @@ history_t &history_collection_t::get_creating(const wcstring &name) {
     return *hist;
 }
 
-history_t &history_t::history_with_name(const wcstring &name) {
-    return histories.get_creating(name);
-}
-
 history_t::history_t(wcstring pname)
     : name(std::move(pname)), history_file_id(kInvalidFileID), boundary_timestamp(time(NULL)) {}
 
@@ -1850,16 +1837,13 @@ void history_t::incorporate_external_changes() {
     }
 }
 
-void history_collection_t::save() {
-    // Save all histories
-    auto hists = histories.acquire();
-    for (auto &p : *hists) {
+void history_save_all() {
+    auto histories = s_histories.acquire();
+    for (auto &p : *histories) {
         p.second->save();
     }
 }
 
-void history_save_all() { histories.save(); }
-
 /// Return the prefix for the files to be used for command and read history.
 wcstring history_session_id(const environment_t &vars) {
     wcstring result = DFLT_FISH_HISTORY_SESSION_ID;

From fe68287cb089cbe198d9b83fe7f1d0ed9006c4d9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 15:56:49 -0700
Subject: [PATCH 0471/1732] Make miscellaneous variables thread-safe

---
 src/common.cpp   | 18 +++++-------------
 src/complete.cpp |  4 ++--
 src/iothread.cpp | 40 +++++++++++++++++++---------------------
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 77332bab1..2c7a3814c 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -94,7 +94,7 @@ int get_debug_stack_frames() { return debug_stack_frames; }
 
 /// Be able to restore the term's foreground process group.
 /// This is set during startup and not modified after.
-static pid_t initial_fg_process_group = -1;
+static relaxed_atomic_t<pid_t> initial_fg_process_group{-1};
 
 /// This struct maintains the current state of the terminal size. It is updated on demand after
 /// receiving a SIGWINCH. Do not touch this struct directly, it's managed with a rwlock. Use
@@ -2240,18 +2240,10 @@ bool is_forked_child() {
 }
 
 void setup_fork_guards() {
-    static bool already_initialized = false;
-
     is_forked_proc = false;
-    if (already_initialized) {
-        // Just mark this process as main and exit
-        return;
-    }
-
-    already_initialized = true;
-    pthread_atfork(nullptr, nullptr, []() {
-        is_forked_proc = true;
-    });
+    static std::once_flag fork_guard_flag;
+    std::call_once(fork_guard_flag,
+                   [] { pthread_atfork(nullptr, nullptr, [] { is_forked_proc = true; }); });
 }
 
 void save_term_foreground_process_group() {
@@ -2497,7 +2489,7 @@ std::string get_path_to_tmp_dir() {
 // session. We err on the side of assuming it's not a console session. This approach isn't
 // bullet-proof and that's OK.
 bool is_console_session() {
-    static bool console_session = []() {
+    static const bool console_session = []() {
         ASSERT_IS_MAIN_THREAD();
 
         const char *tty_name = ttyname(0);
diff --git a/src/complete.cpp b/src/complete.cpp
index 95dffdc9d..51e9ac33e 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1261,8 +1261,8 @@ bool completer_t::try_complete_user(const wcstring &str) {
     bool result = false;
     size_t name_len = str.length() - 1;
 
-    static std::mutex lock;
-    scoped_lock locker(lock);
+    static std::mutex s_setpwent_lock;
+    scoped_lock locker(s_setpwent_lock);
     setpwent();
     // cppcheck-suppress getpwentCalled
     while (struct passwd *pw = getpwent()) {
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 5bb6ad665..8034d3183 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -15,6 +15,7 @@
 #include <queue>
 
 #include "common.h"
+#include "global_safety.h"
 #include "iothread.h"
 #include "wutil.h"
 
@@ -81,23 +82,22 @@ static std::condition_variable s_main_thread_performer_cond;  // protects the ma
 /// stack-allocated on the requesting thread.
 static owning_lock<std::queue<main_thread_request_t *>> s_main_thread_request_queue;
 
-// Notifying pipes.
-static int s_read_pipe, s_write_pipe;
+// Pipes used for notifying.
+struct notify_pipes_t {
+    int read;
+    int write;
+};
 
-static void iothread_init() {
-    static bool inited = false;
-    if (!inited) {
-        inited = true;
-
-        // Initialize the completion pipes.
+/// \return the (immortal) set of pipes used for notifying of completions.
+static const notify_pipes_t &get_notify_pipes() {
+    static const notify_pipes_t s_notify_pipes = [] {
         int pipes[2] = {0, 0};
         assert_with_errno(pipe(pipes) != -1);
-        s_read_pipe = pipes[0];
-        s_write_pipe = pipes[1];
-
-        set_cloexec(s_read_pipe);
-        set_cloexec(s_write_pipe);
-    }
+        set_cloexec(pipes[0]);
+        set_cloexec(pipes[1]);
+        return notify_pipes_t{pipes[0], pipes[1]};
+    }();
+    return s_notify_pipes;
 }
 
 static bool dequeue_spawn_request(spawn_request_t *result) {
@@ -132,7 +132,8 @@ static void *iothread_worker(void *unused) {
             // Enqueue the result, and tell the main thread about it.
             enqueue_thread_result(std::move(req));
             const char wakeup_byte = IO_SERVICE_RESULT_QUEUE;
-            assert_with_errno(write_loop(s_write_pipe, &wakeup_byte, sizeof wakeup_byte) != -1);
+            int notify_fd = get_notify_pipes().write;
+            assert_with_errno(write_loop(notify_fd, &wakeup_byte, sizeof wakeup_byte) != -1);
         }
     }
 
@@ -166,7 +167,6 @@ static void iothread_spawn() {
 int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
-    iothread_init();
 
     struct spawn_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
@@ -189,10 +189,7 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
     return local_thread_count;
 }
 
-int iothread_port() {
-    iothread_init();
-    return s_read_pipe;
-}
+int iothread_port() { return get_notify_pipes().read; }
 
 void iothread_service_completion() {
     ASSERT_IS_MAIN_THREAD();
@@ -316,7 +313,8 @@ void iothread_perform_on_main(void_function_t &&func) {
 
     // Tell the pipe.
     const char wakeup_byte = IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE;
-    assert_with_errno(write_loop(s_write_pipe, &wakeup_byte, sizeof wakeup_byte) != -1);
+    int notify_fd = get_notify_pipes().write;
+    assert_with_errno(write_loop(notify_fd, &wakeup_byte, sizeof wakeup_byte) != -1);
 
     // Wait on the condition, until we're done.
     std::unique_lock<std::mutex> perform_lock(s_main_thread_performer_lock);

From b0a695e9facbeada7e76649e5a8acee3ebc91d78 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 16:11:49 -0700
Subject: [PATCH 0472/1732] Migrate the global exec_count into the parser

---
 src/builtin_eval.cpp |  4 ++--
 src/exec.cpp         | 15 ++++-----------
 src/exec.h           |  3 ---
 src/parser.h         | 17 ++++++++++++-----
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 32e6a81f3..7ed003e85 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -24,13 +24,13 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         new_cmd += argv[i];
     }
 
-    size_t cached_exec_count = exec_get_exec_count();
+    const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
         if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) != 0) {
             // This indicates a parse error; nothing actually got executed.
             status = STATUS_CMD_ERROR;
-        } else if (cached_exec_count == exec_get_exec_count()) {
+        } else if (cached_exec_count == parser.libdata().exec_count) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
             // where we have an argument but nothing is executed.
             status = STATUS_CMD_OK;
diff --git a/src/exec.cpp b/src/exec.cpp
index 746769dbd..d3d604c91 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -864,14 +864,6 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     return true;
 }
 
-// The number of overall "command" executions, for whatever definition of "command". Its delta
-// is used to determine the number of recursive `exec_process_in_job()` invocations.
-static size_t exec_count = 0;
-
-size_t exec_get_exec_count() {
-    return exec_count;
-}
-
 /// Executes a process \p in job \j, using the pipes \p pipes (which may have invalid fds if this is
 /// the first or last process).
 /// \p deferred_pipes represents the pipes from our deferred process; if set ensure they get closed
@@ -936,7 +928,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     if (p->type != process_type_t::block_node) {
         // An simple `begin ... end` should not be considered an execution of a command.
-        exec_count++;
+        parser.libdata().exec_count++;
     }
 
     // Execute the process.
@@ -947,7 +939,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
             // were already launched, so they are ready to receive (or reject) our output.
             bool allow_buffering = !is_deferred_run;
-            auto cached_exec_count = exec_count;
+            auto cached_exec_count = parser.libdata().exec_count;
             if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain,
                                             allow_buffering)) {
                 return false;
@@ -956,7 +948,8 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             // Functions are basically treated as named blocks, and this is the only place we can
             // distinguish between them. A block by default does not touch $status, on the other
             // hand, calling an empty function should clear $status.
-            if (exec_count == cached_exec_count && p->type == process_type_t::function) {
+            if (parser.libdata().exec_count == cached_exec_count &&
+                p->type == process_type_t::function) {
                 p->status = proc_status_t::from_exit_code(0);
             }
 
diff --git a/src/exec.h b/src/exec.h
index fe776db8a..12c5d9051 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -31,9 +31,6 @@ int exec_subshell(const wcstring &cmd, parser_t &parser, bool preserve_exit_stat
 /// Loops over close until the syscall was run without being interrupted.
 void exec_close(int fd);
 
-/// Returns the number of executions. May roll over.
-size_t exec_get_exec_count();
-
 /// Gets the interpreter for a given command.
 char *get_interpreter(const char *command, char *interpreter, size_t buff_size);
 
diff --git a/src/parser.h b/src/parser.h
index 83cecab7b..b00c54a6a 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -147,6 +147,12 @@ struct profile_item_t {
 class parse_execution_context_t;
 class completion_t;
 
+/// Miscelleneous data used to avoid recursion and others.
+struct library_data_t {
+    /// A counter incremented every time a command executes.
+    uint64_t exec_count{0};
+};
+
 class parser_t : public std::enable_shared_from_this<parser_t> {
     friend class parse_execution_context_t;
 
@@ -165,11 +171,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     int eval_level = -1;
     /// Set of variables for the parser.
     env_stack_t &variables;
-#if 0
-// TODO: Lint says this isn't used (which is true). Should this be removed?
-    /// Gets a description of the block stack, for debugging.
-    wcstring block_stack_description() const;
-#endif
+    /// Miscellaneous library data.
+    library_data_t library_data{};
 
     /// List of profile items
     /// These are pointers because we return pointers to them to callers,
@@ -269,6 +272,10 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     env_stack_t &vars() { return variables; }
     const env_stack_t &vars() const { return variables; }
 
+    /// Get the library data.
+    library_data_t &libdata() { return library_data; }
+    const library_data_t &libdata() const { return library_data; }
+
     /// Pushes a new block created with the given arguments
     /// Returns a pointer to the block. The pointer is valid
     /// until the call to pop_block()

From 2ce827343e81976bccb562353000c66da839b07a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 16:34:54 -0700
Subject: [PATCH 0473/1732] Universal variables to become a latch variable

---
 src/env.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 06e13fe0d..0a2806cf8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -24,6 +24,7 @@
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "fish_version.h"
+#include "global_safety.h"
 #include "history.h"
 #include "input.h"
 #include "path.h"
@@ -55,7 +56,7 @@ bool curses_initialized = false;
 bool term_has_xn = false;
 
 /// Universal variables global instance. Initialized in env_init.
-static env_universal_t *s_universal_variables = NULL;
+static latch_t<env_universal_t> s_universal_variables;
 
 /// Getter for universal variables.
 static env_universal_t *uvars() { return s_universal_variables; }
@@ -734,8 +735,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     path_emit_config_directory_errors(vars);
 
     // Set up universal variables. The empty string means to use the default path.
-    assert(s_universal_variables == NULL);
-    s_universal_variables = new env_universal_t(L"");
+    s_universal_variables.emplace(L"");
     callback_data_list_t callbacks;
     s_universal_variables->initialize(callbacks);
     env_universal_callbacks(&env_stack_t::principal(), callbacks);

From 0de1611bf10962ca634523326beb17b6998efc61 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 16:41:58 -0700
Subject: [PATCH 0474/1732] Migrate builtin_complete recursion_level into
 parser_t::libdata

---
 src/builtin_complete.cpp | 7 +++----
 src/parser.h             | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 67365caff..1f3dcb6d4 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -110,7 +110,6 @@ static void builtin_complete_remove(const wcstring_list_t &cmds, const wcstring_
 // complete.cpp for any heavy lifting.
 int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     ASSERT_IS_MAIN_THREAD();
-    static int recursion_level = 0;
 
     wchar_t *cmd = argv[0];
     int argc = builtin_count_args(argv);
@@ -325,8 +324,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // argument, not the reader buffer.
         builtin_commandline_scoped_transient_t temp_buffer(do_complete_param);
 
-        if (recursion_level < 1) {
-            recursion_level++;
+        if (parser.libdata().builtin_complete_recursion_level < 1) {
+            parser.libdata().builtin_complete_recursion_level++;
 
             std::vector<completion_t> comp;
             complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
@@ -364,7 +363,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 streams.out.push_back(L'\n');
             }
 
-            recursion_level--;
+            parser.libdata().builtin_complete_recursion_level--;
         }
     } else if (cmd_to_complete.empty() && path.empty()) {
         // No arguments specified, meaning we print the definitions of all specified completions
diff --git a/src/parser.h b/src/parser.h
index b00c54a6a..ec3fde14f 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -151,6 +151,9 @@ class completion_t;
 struct library_data_t {
     /// A counter incremented every time a command executes.
     uint64_t exec_count{0};
+
+    /// Number of recursive calls to builtin_complete().
+    uint32_t builtin_complete_recursion_level{0};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From e2c66a813116ede5bef76db7c0e53632cfdfdbb6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 16:56:48 -0700
Subject: [PATCH 0475/1732] Make termsize thread safe

---
 src/common.cpp | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 2c7a3814c..89f9725ec 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -97,11 +97,11 @@ int get_debug_stack_frames() { return debug_stack_frames; }
 static relaxed_atomic_t<pid_t> initial_fg_process_group{-1};
 
 /// This struct maintains the current state of the terminal size. It is updated on demand after
-/// receiving a SIGWINCH. Do not touch this struct directly, it's managed with a rwlock. Use
-/// common_get_width()/common_get_height().
-static std::mutex termsize_lock;
-static struct winsize termsize = {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX};
-static volatile bool termsize_valid = false;
+/// receiving a SIGWINCH. Use common_get_width()/common_get_height() to read it lazily.
+static constexpr struct winsize k_invalid_termsize = {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX};
+static relaxed_atomic_t<struct winsize> s_termsize(k_invalid_termsize);
+
+static relaxed_atomic_bool_t s_termsize_valid{false};
 
 static char *wcs2str_internal(const wchar_t *in, char *out);
 static void debug_shared(const wchar_t msg_level, const wcstring &msg);
@@ -1738,20 +1738,17 @@ bool unescape_string(const wcstring &input, wcstring *output, unescape_flags_t e
 /// COLUMNS or LINES variables are changed. This is also invoked when the shell regains control of
 /// the tty since it is possible the terminal size changed while an external command was running.
 void invalidate_termsize(bool invalidate_vars) {
-    termsize_valid = false;
+    s_termsize_valid = false;
     if (invalidate_vars) {
+        struct winsize termsize = s_termsize;
         termsize.ws_col = termsize.ws_row = USHRT_MAX;
+        termsize = s_termsize;
     }
 }
 
 /// Handle SIGWINCH. This is also invoked when the shell regains control of the tty since it is
 /// possible the terminal size changed while an external command was running.
-void common_handle_winch(int signal) {
-    // Don't run ioctl() here. Technically it's not safe to use in signals although in practice it
-    // is safe on every platform I've used. But we want to be conservative on such matters.
-    UNUSED(signal);
-    invalidate_termsize(false);
-}
+void common_handle_winch(int signal) { s_termsize_valid = false; }
 
 /// Validate the new terminal size. Fallback to the env vars if necessary. Ensure the values are
 /// sane and if not fallback to a default of 80x24.
@@ -1810,16 +1807,15 @@ static void export_new_termsize(struct winsize *new_termsize, env_stack_t &vars)
 
 /// Updates termsize as needed, and returns a copy of the winsize.
 struct winsize get_current_winsize() {
-    scoped_lock guard(termsize_lock);
-
-    if (termsize_valid) return termsize;
+    struct winsize termsize = s_termsize;
+    if (s_termsize_valid) return termsize;
 
     struct winsize new_termsize = {0, 0, 0, 0};
 #ifdef HAVE_WINSIZE
     errno = 0;
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &new_termsize) != -1 &&
         new_termsize.ws_col == termsize.ws_col && new_termsize.ws_row == termsize.ws_row) {
-        termsize_valid = true;
+        s_termsize_valid = true;
         return termsize;
     }
 #endif
@@ -1828,7 +1824,8 @@ struct winsize get_current_winsize() {
     export_new_termsize(&new_termsize, vars);
     termsize.ws_col = new_termsize.ws_col;
     termsize.ws_row = new_termsize.ws_row;
-    termsize_valid = true;
+    s_termsize = termsize;
+    s_termsize_valid = true;
     return termsize;
 }
 

From 36998eee55fb8bda6aa49af9ac795f9eb481636a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 18:13:55 -0700
Subject: [PATCH 0476/1732] Make more miscellaneous globals thread safe

---
 build_tools/find_globals.fish |  6 +++---
 src/env.cpp                   |  4 ++--
 src/env_dispatch.cpp          |  5 +++--
 src/global_safety.h           | 18 +++++++++++++++---
 src/history.cpp               |  9 +++++----
 src/history.h                 |  2 +-
 src/parse_execution.cpp       | 11 +++++------
 src/parser.h                  |  3 +++
 src/reader.cpp                | 29 ++++++++++++++---------------
 src/reader.h                  |  2 +-
 src/sanity.cpp                |  3 ++-
 src/wutil.cpp                 |  8 ++++----
 12 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/build_tools/find_globals.fish b/build_tools/find_globals.fish
index 5955c5f33..5aaa1f4e9 100755
--- a/build_tools/find_globals.fish
+++ b/build_tools/find_globals.fish
@@ -74,18 +74,18 @@ end
 function decl_is_threadsafe
     set -l vardecl $argv[1]
     # decls starting with 'const ' or containing ' const ' are assumed safe.
-    string match -q --regex '(^| )const ' $vardecl
+    string match -q --regex '(^|\\*| )const ' $vardecl
     and return 0
 
     # Ordinary types indicating a safe variable.
-    set safes relaxed_atomic_bool_t std::mutex std::condition_variable
+    set safes relaxed_atomic_bool_t std::mutex std::condition_variable std::once_flag sig_atomic_t
     for safe in $safes
         string match -q "*$safe*" $vardecl
         and return 0
     end
 
     # Template types indicate a safe variable.
-    set safes owning_lock mainthread_t std::atomic relaxed_atomic_t
+    set safes owning_lock mainthread_t std::atomic relaxed_atomic_t latch_t
     for safe in $safes
         string match -q "*$safe<*" $vardecl
         and return 0
diff --git a/src/env.cpp b/src/env.cpp
index 0a2806cf8..1d38966e9 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -167,8 +167,8 @@ env_var_t::env_var_flags_t env_var_t::flags_for(const wchar_t *name) {
 
 /// \return a singleton empty list, to avoid unnecessary allocations in env_var_t.
 std::shared_ptr<const wcstring_list_t> env_var_t::empty_list() {
-    static const auto result = std::make_shared<const wcstring_list_t>();
-    return result;
+    static const auto s_empty_result = std::make_shared<const wcstring_list_t>();
+    return s_empty_result;
 }
 
 environment_t::~environment_t() = default;
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index b8f85cb47..0778db918 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -39,6 +39,7 @@
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "function.h"
+#include "global_safety.h"
 #include "history.h"
 #include "input_common.h"
 #include "maybe.h"
@@ -115,7 +116,7 @@ static void init_locale(const environment_t &vars);
 static void update_fish_color_support(const environment_t &vars);
 
 /// True if we think we can set the terminal title.
-static bool can_set_term_title = false;
+static relaxed_atomic_bool_t can_set_term_title{false};
 
 // Run those dispatch functions which want to be run at startup.
 static void run_inits(const environment_t &vars);
@@ -126,7 +127,7 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table();
 
 // A pointer to the variable dispatch table. This is allocated with new() and deliberately leaked to
 // avoid shutdown destructors. This is set during startup and should not be modified after.
-static const var_dispatch_table_t *s_var_dispatch_table;
+static latch_t<const var_dispatch_table_t> s_var_dispatch_table;
 
 void env_dispatch_init(const environment_t &vars) {
     run_inits(vars);
diff --git a/src/global_safety.h b/src/global_safety.h
index b19dec31f..41b76016c 100644
--- a/src/global_safety.h
+++ b/src/global_safety.h
@@ -63,11 +63,17 @@ class latch_t : detail::fixed_t {
     T *operator->() { return value_; }
     const T *operator->() const { return value_; }
 
-    template <typename... Args>
-    void emplace(Args &&... args) {
+    void operator=(T *value) {
         ASSERT_IS_MAIN_THREAD();
         assert(value_ == nullptr && "Latch variable initialized multiple times");
-        value_ = new T(std::forward<Args>(args)...);
+        assert(value != nullptr && "Latch variable initialized with null");
+        value_ = value;
+    }
+
+    template <typename... Args>
+    void emplace(Args &&... args) {
+        // Note: deliberate leak.
+        *this = new T(std::forward<Args>(args)...);
     }
 };
 
@@ -83,6 +89,12 @@ class relaxed_atomic_t {
     operator T() const { return value_.load(std::memory_order_relaxed); }
 
     void operator=(T v) { return value_.store(v, std::memory_order_relaxed); }
+
+    // postincrement
+    T operator++(int) { return value_.fetch_add(1, std::memory_order_relaxed); }
+
+    // preincrement
+    T operator++() { return 1 + value_.fetch_add(1, std::memory_order_relaxed); }
 };
 
 using relaxed_atomic_bool_t = relaxed_atomic_t<bool>;
diff --git a/src/history.cpp b/src/history.cpp
index 12ef8b14f..02ba92aa1 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -31,13 +31,14 @@
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "global_safety.h"
 #include "history.h"
 #include "io.h"
 #include "iothread.h"
 #include "lru.h"
-#include "parser.h"
 #include "parse_constants.h"
 #include "parse_util.h"
+#include "parser.h"
 #include "path.h"
 #include "reader.h"
 #include "tnode.h"
@@ -858,7 +859,7 @@ void history_t::save_internal_unless_disabled() {
     // the counter.
     const int kVacuumFrequency = 25;
     if (countdown_to_vacuum < 0) {
-        static unsigned int seed = (unsigned int)time(NULL);
+        unsigned int seed = (unsigned int)time(NULL);
         // Generate a number in the range [0, kVacuumFrequency).
         countdown_to_vacuum = rand_r(&seed) / (RAND_MAX / kVacuumFrequency + 1);
     }
@@ -1939,8 +1940,8 @@ void history_t::add_pending_with_file_detection(const wcstring &str,
     history_identifier_t identifier = 0;
     if (!potential_paths.empty() && !impending_exit) {
         // Grab the next identifier.
-        static history_identifier_t sLastIdentifier = 0;
-        identifier = ++sLastIdentifier;
+        static relaxed_atomic_t<history_identifier_t> s_last_identifier{0};
+        identifier = ++s_last_identifier;
 
         // Prevent saving until we're done, so we have time to get the paths.
         this->disable_automatic_saving();
diff --git a/src/history.h b/src/history.h
index 033766060..d0738f4fe 100644
--- a/src/history.h
+++ b/src/history.h
@@ -57,7 +57,7 @@ enum history_search_type_t {
     HISTORY_SEARCH_TYPE_PREFIX_GLOB
 };
 
-typedef uint32_t history_identifier_t;
+typedef uint64_t history_identifier_t;
 
 class history_item_t {
     friend class history_t;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 273a71afc..bb334f238 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -795,7 +795,6 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     }
 
     // Protect against exec with background processes running
-    static uint32_t last_exec_run_counter =  -1;
     if (process_type == process_type_t::exec && shell_is_interactive()) {
         bool have_bg = false;
         for (const auto &bg : jobs()) {
@@ -809,13 +808,13 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         }
 
         if (have_bg) {
-            /* debug(1, "Background jobs remain! run_counter: %u, last_exec_run_count: %u", reader_run_count(), last_exec_run_counter); */
-            if (isatty(STDIN_FILENO) && reader_run_count() - 1 != last_exec_run_counter) {
+            uint64_t current_run_count = reader_run_count();
+            uint64_t &last_exec_run_count = parser->libdata().last_exec_run_counter;
+            if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
                 reader_bg_job_warning();
-                last_exec_run_counter = reader_run_count();
+                last_exec_run_count = current_run_count;
                 return parse_execution_errored;
-            }
-            else {
+            } else {
                 hup_background_jobs();
             }
         }
diff --git a/src/parser.h b/src/parser.h
index ec3fde14f..0796e388a 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -152,6 +152,9 @@ struct library_data_t {
     /// A counter incremented every time a command executes.
     uint64_t exec_count{0};
 
+    /// Last reader run count.
+    uint64_t last_exec_run_counter{UINT64_MAX};
+
     /// Number of recursive calls to builtin_complete().
     uint32_t builtin_complete_recursion_level{0};
 };
diff --git a/src/reader.cpp b/src/reader.cpp
index 31d401329..bec8579e8 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -53,6 +53,7 @@
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "function.h"
+#include "global_safety.h"
 #include "highlight.h"
 #include "history.h"
 #include "input.h"
@@ -500,17 +501,15 @@ static struct termios terminal_mode_on_startup;
 static struct termios tty_modes_for_external_cmds;
 
 /// Tracks a currently pending exit. This may be manipulated from a signal handler.
-struct {
-    /// Whether we should exit the current reader loop.
-    bool end_current_loop{false};
 
-    /// Whether we should exit all reader loops. This is set in response to a HUP signal and it
-    /// latches (once set it is never cleared). This should never be reset to false.
-    volatile bool force{false};
+/// Whether we should exit the current reader loop.
+static relaxed_atomic_bool_t s_end_current_loop{false};
 
-    bool should_exit() const { return end_current_loop || force; }
+/// Whether we should exit all reader loops. This is set in response to a HUP signal and it
+/// latches (once set it is never cleared). This should never be reset to false.
+static volatile sig_atomic_t s_exit_forced{false};
 
-} s_pending_exit;
+static bool should_exit() { return s_end_current_loop || s_exit_forced; }
 
 /// Give up control of terminal.
 static void term_donate(outputter_t &outp) {
@@ -546,7 +545,7 @@ static void term_steal() {
     invalidate_termsize();
 }
 
-bool reader_exit_forced() { return s_pending_exit.force; }
+bool reader_exit_forced() { return s_exit_forced; }
 
 /// Given a command line and an autosuggestion, return the string that gets shown to the user.
 wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
@@ -1016,11 +1015,11 @@ void restore_term_mode() {
 }
 
 /// Exit the current reader loop. This may be invoked from a signal handler.
-void reader_set_end_loop(bool flag) { s_pending_exit.end_current_loop = flag; }
+void reader_set_end_loop(bool flag) { s_end_current_loop = flag; }
 
 void reader_force_exit() {
     // Beware, we may be in a signal handler.
-    s_pending_exit.force = true;
+    s_exit_forced = true;
 }
 
 /// Indicates if the given command char ends paging.
@@ -2139,7 +2138,7 @@ void reader_pop() {
     if (new_reader == nullptr) {
         reader_interactive_destroy();
     } else {
-        s_pending_exit.end_current_loop = false;
+        s_end_current_loop = false;
         s_reset(&new_reader->screen, screen_reset_abandon_line);
     }
 }
@@ -2192,7 +2191,7 @@ void reader_import_history_if_necessary() {
     }
 }
 
-bool shell_is_exiting() { return s_pending_exit.should_exit(); }
+bool shell_is_exiting() { return should_exit(); }
 
 void reader_bg_job_warning() {
     std::fputws(_(L"There are still jobs active:\n"), stdout);
@@ -2254,10 +2253,10 @@ static bool selection_is_at_top() {
     return true;
 }
 
-static uint32_t run_count = 0;
+static relaxed_atomic_t<uint64_t> run_count{0};
 
 /// Returns the current interactive loop count
-uint32_t reader_run_count() { return run_count; }
+uint64_t reader_run_count() { return run_count; }
 
 /// Read interactively. Read input from stdin while providing editing facilities.
 static int read_i() {
diff --git a/src/reader.h b/src/reader.h
index 4be1328a0..59cbbbc68 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -236,6 +236,6 @@ void reader_bg_job_warning();
 
 /// Return the current interactive reads loop count. Useful for determining how many commands have
 /// been executed between invocations of code.
-uint32_t reader_run_count();
+uint64_t reader_run_count();
 
 #endif
diff --git a/src/sanity.cpp b/src/sanity.cpp
index 4019cafea..4b173539f 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -5,6 +5,7 @@
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "global_safety.h"
 #include "history.h"
 #include "kill.h"
 #include "proc.h"
@@ -12,7 +13,7 @@
 #include "sanity.h"
 
 /// Status from earlier sanity checks.
-static bool insane = false;
+static relaxed_atomic_bool_t insane{false};
 
 void sanity_lose() {
     debug(0, _(L"Errors detected, shutting down. Break on sanity_lose() to debug."));
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 8ccb9362e..1565725a2 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
@@ -22,6 +21,7 @@
 #include <cwchar>
 #include <wctype.h>
 
+#include <atomic>
 #include <string>
 #include <unordered_map>
 
@@ -534,8 +534,8 @@ static void wgettext_really_init() {
 /// For wgettext: Internal init function. Automatically called when a translation is first
 /// requested.
 static void wgettext_init_if_necessary() {
-    static pthread_once_t once = PTHREAD_ONCE_INIT;
-    pthread_once(&once, wgettext_really_init);
+    static std::once_flag s_wgettext_init{};
+    std::call_once(s_wgettext_init, wgettext_really_init);
 }
 
 const wcstring &wgettext(const wchar_t *in) {
@@ -614,7 +614,7 @@ int fish_wcswidth(const wchar_t *str) { return fish_wcswidth(str, std::wcslen(st
 int fish_wcswidth(const wcstring &str) { return fish_wcswidth(str.c_str(), str.size()); }
 
 locale_t fish_c_locale() {
-    static locale_t loc = newlocale(LC_ALL_MASK, "C", NULL);
+    static const locale_t loc = newlocale(LC_ALL_MASK, "C", NULL);
     return loc;
 }
 

From 56fd6f696bff6183d5d35118548866d30459025a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 19:16:55 -0700
Subject: [PATCH 0477/1732] Improve thread safety in input.cpp

---
 src/env_dispatch.cpp |  2 +-
 src/global_safety.h  | 10 +++++---
 src/input.cpp        | 60 +++++++++++++++++++++-----------------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 0778db918..3d7ef5263 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -133,7 +133,7 @@ void env_dispatch_init(const environment_t &vars) {
     run_inits(vars);
     // Note this deliberately leaks; the dispatch table is immortal.
     // Via this construct we can avoid invoking destructors at shutdown.
-    s_var_dispatch_table = create_dispatch_table().release();
+    s_var_dispatch_table = create_dispatch_table();
 }
 
 /// Properly sets all timezone information.
diff --git a/src/global_safety.h b/src/global_safety.h
index 41b76016c..cfd9e182b 100644
--- a/src/global_safety.h
+++ b/src/global_safety.h
@@ -63,17 +63,19 @@ class latch_t : detail::fixed_t {
     T *operator->() { return value_; }
     const T *operator->() const { return value_; }
 
-    void operator=(T *value) {
+    void operator=(std::unique_ptr<T> value) {
         ASSERT_IS_MAIN_THREAD();
         assert(value_ == nullptr && "Latch variable initialized multiple times");
         assert(value != nullptr && "Latch variable initialized with null");
-        value_ = value;
+        // Note: deliberate leak.
+        value_ = value.release();
     }
 
+    void operator=(T &&value) { *this = make_unique<T>(std::move(value)); }
+
     template <typename... Args>
     void emplace(Args &&... args) {
-        // Note: deliberate leak.
-        *this = new T(std::forward<Args>(args)...);
+        *this = make_unique<T>(std::forward<Args>(args)...);
     }
 };
 
diff --git a/src/input.cpp b/src/input.cpp
index 421782dc5..9a685d952 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -22,6 +22,7 @@
 #include "env.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "global_safety.h"
 #include "input.h"
 #include "input_common.h"
 #include "io.h"
@@ -147,20 +148,18 @@ wcstring describe_char(wint_t c) {
 }
 
 /// Mappings for the current input mode.
-static std::vector<input_mapping_t> mapping_list;
-static std::vector<input_mapping_t> preset_mapping_list;
+using mapping_list_t = std::vector<input_mapping_t>;
+static mainthread_t<mapping_list_t> s_mapping_list;
+static mainthread_t<mapping_list_t> s_preset_mapping_list;
 
 /// Terminfo map list.
-static std::vector<terminfo_mapping_t> terminfo_mappings;
+static latch_t<std::vector<terminfo_mapping_t>> s_terminfo_mappings;
 
 #define TERMINFO_ADD(key) \
     { (L## #key) + 4, key }
 
-/// List of all terminfo mappings.
-static std::vector<terminfo_mapping_t> mappings;
-
-/// Initialize terminfo.
-static void init_input_terminfo();
+/// \return the input terminfo.
+static std::vector<terminfo_mapping_t> create_input_terminfo();
 
 static wchar_t input_function_args[MAX_INPUT_FUNCTION_ARGS];
 static bool input_function_status;
@@ -212,10 +211,8 @@ static bool specification_order_is_less_than(const input_mapping_t &m1, const in
 /// Inserts an input mapping at the correct position. We sort them in descending order by length, so
 /// that we test longer sequences first.
 static void input_mapping_insert_sorted(const input_mapping_t &new_mapping, bool user = true) {
-    auto& ml = user ? mapping_list : preset_mapping_list;
-
-    std::vector<input_mapping_t>::iterator loc = std::lower_bound(
-        ml.begin(), ml.end(), new_mapping, length_is_greater_than);
+    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+    auto loc = std::lower_bound(ml.begin(), ml.end(), new_mapping, length_is_greater_than);
     ml.insert(loc, new_mapping);
 }
 
@@ -230,7 +227,7 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands,
     // Remove existing mappings with this sequence.
     const wcstring_list_t commands_vector(commands, commands + commands_len);
 
-    auto& ml = user ? mapping_list : preset_mapping_list;
+    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
 
     for (input_mapping_t& m : ml) {
         if (m.seq == sequence && m.mode == mode) {
@@ -279,9 +276,10 @@ void init_input() {
     input_initialized.store(true, std::memory_order_relaxed);
 
     input_common_init(&interrupt_handler);
-    init_input_terminfo();
+    s_terminfo_mappings = create_input_terminfo();
 
     // If we have no keybindings, add a few simple defaults.
+    mapping_list_t &preset_mapping_list = s_preset_mapping_list;
     if (preset_mapping_list.empty()) {
         input_mapping_add(L"", L"self-insert", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
         input_mapping_add(L"\n", L"execute", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
@@ -423,9 +421,10 @@ static const input_mapping_t *find_mapping() {
     const auto &vars = parser_t::principal_parser().vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
 
-    const auto lists = {&mapping_list, &preset_mapping_list};
+    const auto lists = {&s_mapping_list, &s_preset_mapping_list};
     for (const auto *listp : lists) {
-        for (const auto &m : *listp) {
+        const mapping_list_t &ml = *listp;
+        for (const auto &m : ml) {
             if (m.mode != bind_mode) {
                 continue;
             }
@@ -517,7 +516,7 @@ char_event_t input_readch(bool allow_commands) {
 std::vector<input_mapping_name_t> input_mapping_get_names(bool user) {
     // Sort the mappings by the user specification order, so we can return them in the same order
     // that the user specified them in.
-    std::vector<input_mapping_t> local_list = user ? mapping_list : preset_mapping_list;
+    std::vector<input_mapping_t> local_list = user ? s_mapping_list : s_preset_mapping_list;
     std::sort(local_list.begin(), local_list.end(), specification_order_is_less_than);
     std::vector<input_mapping_name_t> result;
     result.reserve(local_list.size());
@@ -531,7 +530,7 @@ std::vector<input_mapping_name_t> input_mapping_get_names(bool user) {
 
 void input_mapping_clear(const wchar_t *mode, bool user) {
     ASSERT_IS_MAIN_THREAD();
-    auto &ml = user ? mapping_list : preset_mapping_list;
+    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
     auto should_erase = [=](const input_mapping_t &m) { return mode == NULL || mode == m.mode; };
     ml.erase(std::remove_if(ml.begin(), ml.end(), should_erase), ml.end());
 }
@@ -539,7 +538,7 @@ void input_mapping_clear(const wchar_t *mode, bool user) {
 bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool user) {
     ASSERT_IS_MAIN_THREAD();
     bool result = false;
-    auto& ml = user ? mapping_list : preset_mapping_list;
+    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
     for (std::vector<input_mapping_t>::iterator it = ml.begin(), end = ml.end();
          it != end; ++it) {
         if (sequence == it->seq && mode == it->mode) {
@@ -554,7 +553,7 @@ bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool us
 bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds, bool user,
                        wcstring *out_sets_mode) {
     bool result = false;
-    auto& ml = user ? mapping_list : preset_mapping_list;
+    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
     for (const input_mapping_t &m : ml) {
         if (sequence == m.seq && mode == m.mode) {
             *out_cmds = m.commands;
@@ -566,11 +565,11 @@ bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_
     return result;
 }
 
-/// Add all terminfo mappings and cache other terminfo facts we care about.
-static void init_input_terminfo() {
+/// Create a list of terminfo mappings.
+static std::vector<terminfo_mapping_t> create_input_terminfo() {
     assert(curses_initialized);
-    if (!cur_term) return;  // setupterm() failed so we can't referency any key definitions
-    const terminfo_mapping_t tinfos[] = {
+    if (!cur_term) return {};  // setupterm() failed so we can't referency any key definitions
+    return {
         TERMINFO_ADD(key_a1),
         TERMINFO_ADD(key_a3),
         TERMINFO_ADD(key_b2),
@@ -726,9 +725,6 @@ static void init_input_terminfo() {
         TERMINFO_ADD(key_undo),
         TERMINFO_ADD(key_up)
     };
-    const size_t count = sizeof tinfos / sizeof *tinfos;
-    terminfo_mappings.reserve(terminfo_mappings.size() + count);
-    terminfo_mappings.insert(terminfo_mappings.end(), tinfos, tinfos + count);
 }
 
 bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
@@ -739,7 +735,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
     const char *res = 0;
     int err = ENOENT;
 
-    for (const terminfo_mapping_t &m : terminfo_mappings) {
+    for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
         if (!std::wcscmp(name, m.name)) {
             res = m.seq;
             err = EILSEQ;
@@ -759,7 +755,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
 bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
     assert(input_initialized);
 
-    for (const terminfo_mapping_t &m : terminfo_mappings) {
+    for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
         if (!m.seq) {
             continue;
         }
@@ -777,9 +773,9 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
 wcstring_list_t input_terminfo_get_names(bool skip_null) {
     assert(input_initialized);
     wcstring_list_t result;
-    result.reserve(terminfo_mappings.size());
-
-    for (const terminfo_mapping_t &m : terminfo_mappings) {
+    const auto &mappings = *s_terminfo_mappings;
+    result.reserve(mappings.size());
+    for (const terminfo_mapping_t &m : mappings) {
         if (skip_null && !m.seq) {
             continue;
         }

From edab366d3aa0653515731d2696ee2814c3acf62f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 22:05:03 -0700
Subject: [PATCH 0478/1732] Eliminate the "input callback queue"

This was a sort of side channel that was only used to propagate redraws
after universal variable changes. We can eliminate it and handle these
more directly.
---
 src/env.cpp          |  7 ++++---
 src/env.h            |  6 ++++--
 src/input_common.cpp | 31 ++++++-------------------------
 src/input_common.h   | 10 ++--------
 src/reader.cpp       |  2 +-
 5 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 1d38966e9..4a58201c8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -61,7 +61,7 @@ static latch_t<env_universal_t> s_universal_variables;
 /// Getter for universal variables.
 static env_universal_t *uvars() { return s_universal_variables; }
 
-void env_universal_barrier() { env_stack_t::principal().universal_barrier(); }
+bool env_universal_barrier() { return env_stack_t::principal().universal_barrier(); }
 
 // A typedef for a set of constant strings. Note our sets are typically on the order of 6 elements,
 // so we don't bother to sort them.
@@ -498,9 +498,9 @@ env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(
 env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
 env_scoped_t::~env_scoped_t() = default;
 
-void env_stack_t::universal_barrier() {
+bool env_stack_t::universal_barrier() {
     ASSERT_IS_MAIN_THREAD();
-    if (!uvars()) return;
+    if (!uvars()) return false;
 
     callback_data_list_t callbacks;
     bool changed = uvars()->sync(callbacks);
@@ -509,6 +509,7 @@ void env_stack_t::universal_barrier() {
     }
 
     env_universal_callbacks(this, callbacks);
+    return changed || !callbacks.empty();
 }
 
 /// If they don't already exist initialize the `COLUMNS` and `LINES` env vars to reasonable
diff --git a/src/env.h b/src/env.h
index b61b03922..6a1a60c85 100644
--- a/src/env.h
+++ b/src/env.h
@@ -271,7 +271,8 @@ class env_stack_t final : public env_scoped_t {
     void pop();
 
     /// Synchronizes all universal variable changes: writes everything out, reads stuff in.
-    void universal_barrier();
+    /// \return true if something changed, false otherwise.
+    bool universal_barrier();
 
     /// Returns an array containing all exported variables in a format suitable for execv
     const char *const *export_arr();
@@ -302,7 +303,8 @@ extern bool g_use_posix_spawn;
 extern bool term_has_xn;  // does the terminal have the "eat_newline_glitch"
 
 /// Synchronizes all universal variable changes: writes everything out, reads stuff in.
-void env_universal_barrier();
+/// \return true if any value changed.
+bool env_universal_barrier();
 
 /// Returns true if we think the terminal supports setting its title.
 bool term_supports_setting_title();
diff --git a/src/input_common.cpp b/src/input_common.cpp
index df3bbfcd1..d92d8a233 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -36,11 +36,6 @@ static int wait_on_escape_ms = WAIT_ON_ESCAPE_DEFAULT;
 /// Events which have been read and returned by the sequence matching code.
 static std::deque<char_event_t> lookahead_list;
 
-// Queue of pairs of (function pointer, argument) to be invoked. Expected to be mostly empty.
-typedef std::list<std::function<void(void)>> callback_queue_t;
-static callback_queue_t callback_queue;
-static void input_flush_callbacks();
-
 static bool has_lookahead() { return !lookahead_list.empty(); }
 
 static char_event_t lookahead_pop() {
@@ -78,9 +73,6 @@ static char_event_t readb() {
     bool do_loop;
 
     do {
-        // Flush callbacks.
-        input_flush_callbacks();
-
         fd_set fdset;
         int fd_max = 0;
         int ioport = iothread_port();
@@ -139,7 +131,12 @@ static char_event_t readb() {
                 barrier_from_readability = notifier.notification_fd_became_readable(notifier_fd);
             }
             if (barrier_from_poll || barrier_from_readability) {
-                env_universal_barrier();
+                if (env_universal_barrier()) {
+                    // A variable change may have triggered a repaint, etc.
+                    if (auto mc = lookahead_pop_evt()) {
+                        return *mc;
+                    }
+                }
             }
 
             if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
@@ -245,19 +242,3 @@ char_event_t input_common_readch_timed(bool dequeue_timeouts) {
 void input_common_queue_ch(char_event_t ch) { lookahead_push_back(ch); }
 
 void input_common_next_ch(char_event_t ch) { lookahead_push_front(ch); }
-
-void input_common_add_callback(std::function<void(void)> callback) {
-    ASSERT_IS_MAIN_THREAD();
-    callback_queue.push_back(std::move(callback));
-}
-
-static void input_flush_callbacks() {
-    // We move the queue into a local variable, so that events queued up during a callback don't get
-    // fired until next round.
-    ASSERT_IS_MAIN_THREAD();
-    callback_queue_t local_queue;
-    std::swap(local_queue, callback_queue);
-    for (auto &f : local_queue) {
-        f();
-    }
-}
diff --git a/src/input_common.h b/src/input_common.h
index d7b061fa4..62a31d72a 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -2,13 +2,11 @@
 #ifndef INPUT_COMMON_H
 #define INPUT_COMMON_H
 
-#include <stddef.h>
-
-#include <functional>
-
 #include "common.h"
 #include "maybe.h"
 
+#include <stddef.h>
+
 enum class readline_cmd_t {
     beginning_of_line,
     end_of_line,
@@ -172,8 +170,4 @@ void input_common_queue_ch(char_event_t ch);
 /// once).
 void input_common_next_ch(char_event_t ch);
 
-/// Adds a callback to be invoked at the next turn of the "event loop." The callback function will
-/// be invoked and passed arg.
-void input_common_add_callback(std::function<void(void)>);
-
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index bec8579e8..fbf784a4d 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3436,7 +3436,7 @@ void reader_react_to_color_change() {
     if (!data->repaint_needed || !data->screen_reset_needed) {
         data->repaint_needed = true;
         data->screen_reset_needed = true;
-        input_common_add_callback(reader_repaint_if_needed);
+        input_common_queue_ch(readline_cmd_t::repaint);
     }
 }
 

From 32d1b3d7cb0c1f478519c81da66462a363bacad4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 22:08:40 -0700
Subject: [PATCH 0479/1732] Simplify looping in readb

---
 src/input_common.cpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index d92d8a233..82e42cb68 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -67,12 +67,7 @@ void input_common_init(interrupt_func_t func) { interrupt_handler = func; }
 /// Internal function used by input_common_readch to read one byte from fd 0. This function should
 /// only be called by input_common_readch().
 static char_event_t readb() {
-    // do_loop must be set on every path through the loop; leaving it uninitialized allows the
-    // static analyzer to assist in catching mistakes.
-    unsigned char arr[1];
-    bool do_loop;
-
-    do {
+    for (;;) {
         fd_set fdset;
         int fd_max = 0;
         int ioport = iothread_port();
@@ -114,16 +109,11 @@ static char_event_t readb() {
                         return *mc;
                     }
                 }
-
-                do_loop = true;
             } else {
                 // The terminal has been closed.
                 return char_event_type_t::eof;
             }
         } else {
-            // Assume we loop unless we see a character in stdin.
-            do_loop = true;
-
             // Check to see if we want a universal variable barrier.
             bool barrier_from_poll = notifier.poll();
             bool barrier_from_readability = false;
@@ -147,18 +137,17 @@ static char_event_t readb() {
             }
 
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
+                unsigned char arr[1];
                 if (read_blocked(0, arr, 1) != 1) {
                     // The teminal has been closed.
                     return char_event_type_t::eof;
                 }
 
                 // We read from stdin, so don't loop.
-                do_loop = false;
+                return arr[0];
             }
         }
-    } while (do_loop);
-
-    return arr[0];
+    }
 }
 
 // Update the wait_on_escape_ms value in response to the fish_escape_delay_ms user variable being

From 9fb98baba68a31c0f6835c248dc6734c759fe2f8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 29 Apr 2019 20:58:58 -0700
Subject: [PATCH 0480/1732] Thread the parser into process_clean_after_marking

---
 src/builtin_wait.cpp    | 13 +++++++------
 src/exec.cpp            |  2 +-
 src/input.cpp           |  3 ++-
 src/parse_execution.cpp |  2 +-
 src/parser.cpp          |  4 ++--
 src/parser.h            |  3 +++
 src/proc.cpp            | 16 ++++++++--------
 src/proc.h              |  7 ++++---
 src/reader.cpp          |  2 +-
 9 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 6df0d3abf..5a2f9b291 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -64,14 +64,14 @@ static bool any_jobs_finished(size_t jobs_len) {
     return false;
 }
 
-static int wait_for_backgrounds(bool any_flag) {
+static int wait_for_backgrounds(parser_t &parser, bool any_flag) {
     size_t jobs_len = jobs().size();
 
     while ((!any_flag && !all_jobs_finished()) || (any_flag && !any_jobs_finished(jobs_len))) {
         if (reader_test_interrupted()) {
             return 128 + SIGINT;
         }
-        proc_wait_any();
+        proc_wait_any(parser);
     }
     return 0;
 }
@@ -104,13 +104,14 @@ static bool any_specified_jobs_finished(const std::vector<job_id_t> &ids) {
     return false;
 }
 
-static int wait_for_backgrounds_specified(const std::vector<job_id_t> &ids, bool any_flag) {
+static int wait_for_backgrounds_specified(parser_t &parser, const std::vector<job_id_t> &ids,
+                                          bool any_flag) {
     while ((!any_flag && !all_specified_jobs_finished(ids)) ||
            (any_flag && !any_specified_jobs_finished(ids))) {
         if (reader_test_interrupted()) {
             return 128 + SIGINT;
         }
-        proc_wait_any();
+        proc_wait_any(parser);
     }
     return 0;
 }
@@ -204,7 +205,7 @@ int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (w.woptind == argc) {
         // no jobs specified
-        retval = wait_for_backgrounds(any_flag);
+        retval = wait_for_backgrounds(parser, any_flag);
     } else {
         // jobs specified
         std::vector<job_id_t> waited_job_ids;
@@ -236,7 +237,7 @@ int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         if (waited_job_ids.empty()) return STATUS_INVALID_ARGS;
 
-        retval = wait_for_backgrounds_specified(waited_job_ids, any_flag);
+        retval = wait_for_backgrounds_specified(parser, waited_job_ids, any_flag);
     }
 
     return retval;
diff --git a/src/exec.cpp b/src/exec.cpp
index d3d604c91..414665927 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -286,7 +286,7 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
 
     morphed_chain.clear();
     io_cleanup_fds(opened_fds);
-    job_reap(false);
+    job_reap(parser, false);
 }
 
 // Returns whether we can use posix spawn for a given process in a given job.
diff --git a/src/input.cpp b/src/input.cpp
index 9a685d952..68d026e36 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -253,7 +253,8 @@ static maybe_t<char_event_t> interrupt_handler() {
     // Fire any pending events.
     event_fire_delayed();
     // Reap stray processes, including printing exit status messages.
-    if (job_reap(true)) reader_repaint_needed();
+    // TODO: shouldn't need this parser here.
+    if (job_reap(parser_t::principal_parser(), true)) reader_repaint_needed();
     // Tell the reader an event occured.
     if (reader_reading_interrupted()) {
         auto vintr = shell_modes.c_cc[VINTR];
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index bb334f238..abdb53497 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1294,7 +1294,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         profile_item->skipped = !populated_job;
     }
 
-    job_reap(false);  // clean up jobs
+    job_reap(*parser, false);  // clean up jobs
     return populated_job ? parse_execution_success : parse_execution_errored;
 }
 
diff --git a/src/parser.cpp b/src/parser.cpp
index 1f59adc7c..c07fcdc1c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -670,7 +670,7 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_
         return 1;
     }
 
-    job_reap(false);  // not sure why we reap jobs here
+    job_reap(*this, false);  // not sure why we reap jobs here
 
     // Start it up
     scope_block_t *scope_block = this->push_block<scope_block_t>(block_type);
@@ -683,7 +683,7 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_
     exc.restore();
     this->pop_block(scope_block);
 
-    job_reap(false);  // reap again
+    job_reap(*this, false);  // reap again
     return result;
 }
 
diff --git a/src/parser.h b/src/parser.h
index 0796e388a..dce8cb3d5 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -157,6 +157,9 @@ struct library_data_t {
 
     /// Number of recursive calls to builtin_complete().
     uint32_t builtin_complete_recursion_level{0};
+
+    /// Whether we are currently cleaning processes.
+    bool is_cleaning_procs{false};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {
diff --git a/src/proc.cpp b/src/proc.cpp
index 97dfd919a..c3f3b8492 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -551,16 +551,17 @@ static bool job_wants_message(const shared_ptr<job_t> &j, bool print_for_foregro
 
 /// Remove completed jobs from the job list, printing status messages as appropriate.
 /// \return whether something was printed.
-static bool process_clean_after_marking(bool allow_interactive) {
+static bool process_clean_after_marking(parser_t &parser, bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
     bool printed = false;
 
     // This function may fire an event handler, we do not want to call ourselves recursively (to
     // avoid infinite recursion).
-    static std::atomic<bool> locked { false };
-    if (locked.exchange(true, std::memory_order::memory_order_relaxed)) {
+    if (parser.libdata().is_cleaning_procs) {
         return false;
     }
+    parser.libdata().is_cleaning_procs = true;
+    const cleanup_t cleanup([&] { parser.libdata().is_cleaning_procs = false; });
 
     // This may be invoked in an exit handler, after the TERM has been torn down
     // Don't try to print in that case (#3222)
@@ -628,18 +629,17 @@ static bool process_clean_after_marking(bool allow_interactive) {
         fflush(stdout);
     }
 
-    locked = false;
     return printed;
 }
 
-bool job_reap(bool allow_interactive) {
+bool job_reap(parser_t &parser, bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
     process_mark_finished_children(false);
 
     // Preserve the exit status.
     auto saved_statuses = proc_get_last_statuses();
 
-    bool printed = process_clean_after_marking(allow_interactive);
+    bool printed = process_clean_after_marking(parser, allow_interactive);
 
     // Restore the exit status.
     proc_set_last_statuses(std::move(saved_statuses));
@@ -970,10 +970,10 @@ void proc_pop_interactive() {
     if (is_interactive != old) signal_set_handlers();
 }
 
-void proc_wait_any() {
+void proc_wait_any(parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
     process_mark_finished_children(true /* block_ok */);
-    process_clean_after_marking(is_interactive);
+    process_clean_after_marking(parser, is_interactive);
 }
 
 void hup_background_jobs() {
diff --git a/src/proc.h b/src/proc.h
index e74610e93..573fd8aab 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -483,9 +483,10 @@ int proc_get_last_status();
 statuses_t proc_get_last_statuses();
 
 /// Notify the user about stopped or terminated jobs, and delete completed jobs from the job list.
-/// If \p interactive is set, allow reaping interactive jobs; otherwise skip them.
+/// If \p interactive is set, allow removing interactive jobs; otherwise skip them.
 /// \return whether text was printed to stdout.
-bool job_reap(bool interactive);
+class parser_t;
+bool job_reap(parser_t &parser, bool interactive);
 
 /// Mark a process as failed to execute (and therefore completed).
 void job_mark_process_as_failed(const std::shared_ptr<job_t> &job, const process_t *p);
@@ -518,7 +519,7 @@ void proc_push_interactive(int value);
 void proc_pop_interactive();
 
 /// Wait for any process finishing, or receipt of a signal.
-void proc_wait_any();
+void proc_wait_any(parser_t &parser);
 
 /// Set and get whether we are in initialization.
 // Hackish. In order to correctly report the origin of code with no associated file, we need to
diff --git a/src/reader.cpp b/src/reader.cpp
index fbf784a4d..34090cab0 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1961,7 +1961,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     gettimeofday(&time_before, NULL);
 
     parser.eval(cmd, io_chain_t(), TOP);
-    job_reap(true);
+    job_reap(parser, true);
 
     gettimeofday(&time_after, NULL);
 

From e10838d5d61cc1b32d424b42b6e95e1410c0cba5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 29 Apr 2019 23:08:01 -0700
Subject: [PATCH 0481/1732] Make job_control_mode a static variable with
 accessors

---
 src/builtin_status.cpp  | 9 +++++----
 src/parse_execution.cpp | 1 +
 src/proc.cpp            | 8 +++++++-
 src/proc.h              | 3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index fe253ecfd..455df9fe5 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -309,6 +309,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 streams.out.append_format(_(L"This is not a login shell\n"));
             }
 
+            auto job_control_mode = get_job_control_mode();
             streams.out.append_format(
                 _(L"Job control: %ls\n"),
                 job_control_mode == job_control_t::interactive
@@ -335,7 +336,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 opts.new_job_control_mode = new_mode;
             }
             assert(opts.new_job_control_mode && "Should have a new mode");
-            job_control_mode = *opts.new_job_control_mode;
+            set_job_control_mode(*opts.new_job_control_mode);
             break;
         }
         case STATUS_FEATURES: {
@@ -407,17 +408,17 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_FULL_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != job_control_t::all;
+            retval = get_job_control_mode() != job_control_t::all;
             break;
         }
         case STATUS_IS_INTERACTIVE_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != job_control_t::interactive;
+            retval = get_job_control_mode() != job_control_t::interactive;
             break;
         }
         case STATUS_IS_NO_JOB_CTRL: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = job_control_mode != job_control_t::none;
+            retval = get_job_control_mode() != job_control_t::none;
             break;
         }
         case STATUS_STACK_TRACE: {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index abdb53497..2a5c4ad72 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1228,6 +1228,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), block_io, parent_job);
     job->tmodes = tmodes;
+    auto job_control_mode = get_job_control_mode();
     job->set_flag(job_flag_t::JOB_CONTROL,
                   (job_control_mode == job_control_t::all) ||
                       ((job_control_mode == job_control_t::interactive) && shell_is_interactive()));
diff --git a/src/proc.cpp b/src/proc.cpp
index c3f3b8492..238df7b76 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -38,6 +38,7 @@
 #include "common.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "global_safety.h"
 #include "io.h"
 #include "output.h"
 #include "parse_tree.h"
@@ -70,10 +71,15 @@ bool is_block = false;
 bool is_breakpoint = false;
 bool is_login = false;
 int is_event = 0;
-job_control_t job_control_mode = job_control_t::interactive;
 int no_exec = 0;
 bool have_proc_stat = false;
 
+static relaxed_atomic_t<job_control_t> job_control_mode{job_control_t::interactive};
+
+job_control_t get_job_control_mode() { return job_control_mode; }
+
+void set_job_control_mode(job_control_t mode) { job_control_mode = mode; }
+
 static int is_interactive = -1;
 
 bool shell_is_interactive() {
diff --git a/src/proc.h b/src/proc.h
index 573fd8aab..535f3db26 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -468,7 +468,8 @@ job_list_t &jobs();
 /// The current job control mode.
 ///
 /// Must be one of job_control_t::all, job_control_t::interactive and job_control_t::none.
-extern job_control_t job_control_mode;
+job_control_t get_job_control_mode();
+void set_job_control_mode(job_control_t mode);
 
 /// If this flag is set, fish will never fork or run execve. It is used to put fish into a syntax
 /// verifier mode where fish tries to validate the syntax of a file but doesn't actually do

From 9018a7d5ee32a1299910a7238c32b31af4c74362 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 17:18:27 -0700
Subject: [PATCH 0482/1732] Rename input_initialized to s_input_initialized and
 make it relaxed atomic

---
 src/input.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 68d026e36..e36a24593 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -267,14 +267,14 @@ static maybe_t<char_event_t> interrupt_handler() {
     return char_event_t{char_event_type_t::check_exit};
 }
 
-static std::atomic<bool> input_initialized{false};
+static relaxed_atomic_bool_t s_input_initialized{false};
 
 /// Set up arrays used by readch to detect escape sequences for special keys and perform related
 /// initializations for our input subsystem.
 void init_input() {
     ASSERT_IS_MAIN_THREAD();
-    if (input_initialized.load(std::memory_order_relaxed)) return;
-    input_initialized.store(true, std::memory_order_relaxed);
+    if (s_input_initialized) return;
+    s_input_initialized = true;
 
     input_common_init(&interrupt_handler);
     s_terminfo_mappings = create_input_terminfo();
@@ -730,7 +730,7 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
 
 bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
     ASSERT_IS_MAIN_THREAD();
-    assert(input_initialized);
+    assert(s_input_initialized);
     CHECK(name, 0);
 
     const char *res = 0;
@@ -754,7 +754,7 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
 }
 
 bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
-    assert(input_initialized);
+    assert(s_input_initialized);
 
     for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
         if (!m.seq) {
@@ -772,7 +772,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
 }
 
 wcstring_list_t input_terminfo_get_names(bool skip_null) {
-    assert(input_initialized);
+    assert(s_input_initialized);
     wcstring_list_t result;
     const auto &mappings = *s_terminfo_mappings;
     result.reserve(mappings.size());

From 1e171140d5d057b7000efd5cf8f8cf4fdbe5cf32 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 17:32:40 -0700
Subject: [PATCH 0483/1732] Make the input_common lookahead main-thread only

---
 src/global_safety.h  |  5 ++++
 src/input_common.cpp | 64 ++++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/global_safety.h b/src/global_safety.h
index cfd9e182b..4121d6190 100644
--- a/src/global_safety.h
+++ b/src/global_safety.h
@@ -34,6 +34,11 @@ class mainthread_t : detail::fixed_t {
     mainthread_t(T value) : value_(std::move(value)) {}
     mainthread_t() = default;
 
+    T *operator->() {
+        ASSERT_IS_MAIN_THREAD();
+        return &value_;
+    }
+
     operator T &() {
         ASSERT_IS_MAIN_THREAD();
         return value_;
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 82e42cb68..6301aac5e 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -23,6 +23,7 @@
 #include "env.h"
 #include "env_universal_common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "global_safety.h"
 #include "input_common.h"
 #include "iothread.h"
 #include "wutil.h"
@@ -33,31 +34,35 @@
 #define WAIT_ON_ESCAPE_DEFAULT 30
 static int wait_on_escape_ms = WAIT_ON_ESCAPE_DEFAULT;
 
-/// Events which have been read and returned by the sequence matching code.
-static std::deque<char_event_t> lookahead_list;
+struct input_lookahead_t {
+    /// Events which have been read and returned by the sequence matching code.
+    std::deque<char_event_t> lookahead_list;
 
-static bool has_lookahead() { return !lookahead_list.empty(); }
+    bool has_lookahead() const { return !lookahead_list.empty(); }
 
-static char_event_t lookahead_pop() {
-    auto result = lookahead_list.front();
-    lookahead_list.pop_front();
-    return result;
-}
-
-/// \return the next lookahead char, or none if none. Discards timeouts.
-static maybe_t<char_event_t> lookahead_pop_evt() {
-    while (has_lookahead()) {
-        auto evt = lookahead_pop();
-        if (! evt.is_timeout()) {
-            return evt;
-        }
+    char_event_t pop() {
+        auto result = lookahead_list.front();
+        lookahead_list.pop_front();
+        return result;
     }
-    return none();
-}
 
-static void lookahead_push_back(char_event_t c) { lookahead_list.push_back(c); }
+    /// \return the next lookahead char, or none if none. Discards timeouts.
+    maybe_t<char_event_t> pop_evt() {
+        while (has_lookahead()) {
+            auto evt = pop();
+            if (!evt.is_timeout()) {
+                return evt;
+            }
+        }
+        return none();
+    }
 
-static void lookahead_push_front(char_event_t c) { lookahead_list.push_front(c); }
+    void push_back(char_event_t c) { lookahead_list.push_back(c); }
+
+    void push_front(char_event_t c) { lookahead_list.push_front(c); }
+};
+
+static mainthread_t<input_lookahead_t> s_lookahead;
 
 /// Callback function for handling interrupts on reading.
 static interrupt_func_t interrupt_handler;
@@ -105,7 +110,7 @@ static char_event_t readb() {
                 if (interrupt_handler) {
                     if (auto interrupt_evt = interrupt_handler()) {
                         return *interrupt_evt;
-                    } else if (auto mc = lookahead_pop_evt()) {
+                    } else if (auto mc = s_lookahead->pop_evt()) {
                         return *mc;
                     }
                 }
@@ -123,7 +128,7 @@ static char_event_t readb() {
             if (barrier_from_poll || barrier_from_readability) {
                 if (env_universal_barrier()) {
                     // A variable change may have triggered a repaint, etc.
-                    if (auto mc = lookahead_pop_evt()) {
+                    if (auto mc = s_lookahead->pop_evt()) {
                         return *mc;
                     }
                 }
@@ -131,7 +136,7 @@ static char_event_t readb() {
 
             if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
                 iothread_service_completion();
-                if (auto mc = lookahead_pop_evt()) {
+                if (auto mc = s_lookahead->pop_evt()) {
                     return *mc;
                 }
             }
@@ -171,7 +176,8 @@ void update_wait_on_escape_ms(const environment_t &vars) {
 }
 
 char_event_t input_common_readch() {
-    if (auto mc = lookahead_pop_evt()) {
+    ASSERT_IS_MAIN_THREAD();
+    if (auto mc = s_lookahead->pop_evt()) {
         return *mc;
     }
     wchar_t res;
@@ -209,8 +215,8 @@ char_event_t input_common_readch() {
 
 char_event_t input_common_readch_timed(bool dequeue_timeouts) {
     char_event_t result{char_event_type_t::timeout};
-    if (has_lookahead()) {
-        result = lookahead_pop();
+    if (s_lookahead->has_lookahead()) {
+        result = s_lookahead->pop();
     } else {
         fd_set fds;
         FD_ZERO(&fds);
@@ -222,12 +228,12 @@ char_event_t input_common_readch_timed(bool dequeue_timeouts) {
     }
     // If we got a timeout, either through dequeuing or creating, ensure it stays on the queue.
     if (result.is_timeout()) {
-        if (!dequeue_timeouts) lookahead_push_front(char_event_type_t::timeout);
+        if (!dequeue_timeouts) s_lookahead->push_front(char_event_type_t::timeout);
         return char_event_type_t::timeout;
     }
     return result;
 }
 
-void input_common_queue_ch(char_event_t ch) { lookahead_push_back(ch); }
+void input_common_queue_ch(char_event_t ch) { s_lookahead->push_back(ch); }
 
-void input_common_next_ch(char_event_t ch) { lookahead_push_front(ch); }
+void input_common_next_ch(char_event_t ch) { s_lookahead->push_front(ch); }

From c7cbf6dad07272fa944bba242a50c368cbc437fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20K=C4=B1z=C4=B1l=C4=B1rmak?=
 <mdenizkizilirmak@gmail.com>
Date: Sun, 5 May 2019 12:17:51 +0300
Subject: [PATCH 0484/1732] Make 'git checkout' complete recent commits

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 61646333c..d536eaa97 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -869,6 +869,7 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 
 ### checkout
 complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_recent_commits)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_heads)' -d 'Head'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_tags)' -d 'Tag'

From 3bea947bb5e5c9572fa0f34c74363af8c1dc90fb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 3 May 2019 19:00:55 +0200
Subject: [PATCH 0485/1732] fish_indent: Ignore consecutive semicolons

This removes semicolons at the end of the line and collapses
consecutive ones, while replacing meaningful semicolons with newlines.

I.e.

```fish
echo;
```

becomes

```fish
echo
```

but

```fish
echo; echo
```

becomes

```fish
echo
echo
```

Fixes #5859.
---
 src/fish_indent.cpp | 18 +++++++++++++++++-
 tests/indent.in     |  3 +++
 tests/indent.out    |  3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index a29260a7e..7591dcc89 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -91,6 +91,9 @@ struct prettifier_t {
     // Whether we are at the beginning of a new line.
     bool has_new_line = true;
 
+    // Whether the last token was a semicolon.
+    bool last_was_semicolon = false;
+
     // Whether we need to append a continuation new line before continuing.
     bool needs_continuation_newline = false;
 
@@ -215,9 +218,22 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
         }
 
         if (node_type == parse_token_type_end) {
-            append_newline();
+            // For historical reasons, semicolon also get "TOK_END".
+            // We need to distinguish between them, because otherwise `a;;;;` gets extra lines
+            // instead of the semicolons. Semicolons are just ignored, unless they are followed by a
+            // command. So `echo;` removes the semicolon, but `echo; echo` removes it and adds a
+            // newline.
+            if (node.get_source(source) == L"\n") {
+                append_newline();
+            } else {
+                last_was_semicolon = true;
+            }
         } else if ((node_type >= FIRST_PARSE_TOKEN_TYPE && node_type <= LAST_PARSE_TOKEN_TYPE) ||
                    node_type == parse_special_type_parse_error) {
+            if (last_was_semicolon) {
+                append_newline();
+                last_was_semicolon = false;
+            }
             if (node.keyword != parse_keyword_none) {
                 append_whitespace(node_indent);
                 output.append(keyword_description(node.keyword));
diff --git a/tests/indent.in b/tests/indent.in
index 0bc64947f..73f5489a3 100644
--- a/tests/indent.in
+++ b/tests/indent.in
@@ -123,3 +123,6 @@ echo hi |
 
 echo bye
 ' | ../test/root/bin/fish_indent
+
+echo 'a;;;;;;' | ../test/root/bin/fish_indent
+echo 'echo; echo' | ../test/root/bin/fish_indent
diff --git a/tests/indent.out b/tests/indent.out
index 9819b89a0..811c58174 100644
--- a/tests/indent.out
+++ b/tests/indent.out
@@ -125,3 +125,6 @@ end
 echo hi |
 
 echo bye
+a
+echo
+echo

From 2b3f48d9ee2b5fefe3d4eac7ab3acebe96d4e4cd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 3 May 2019 19:15:25 +0200
Subject: [PATCH 0486/1732] build_tools/style.fish: Use black as python
 formatter

(Also renames the silly "$f_files" to "$fish_files")
---
 build_tools/style.fish | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/build_tools/style.fish b/build_tools/style.fish
index 71b113d6c..b3ae670ea 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -5,7 +5,8 @@
 #
 set git_clang_format no
 set c_files
-set f_files
+set fish_files
+set python_files
 set all no
 
 if test "$argv[1]" = "--all"
@@ -30,7 +31,8 @@ if test $all = yes
     # For now we don't restyle all fish scripts other than completion scripts. That's because people
     # really like to vertically align the elements of the `complete` command and fish_indent
     # currently does not honor that whitespace.
-    set f_files (printf '%s\n' share/***.fish | grep -v /completions/)
+    set fish_files (printf '%s\n' share/***.fish | grep -v /completions/)
+    set python_files **.py
 else
     # We haven't been asked to reformat all the source. If there are uncommitted changes reformat
     # those using `git clang-format`. Else reformat the files in the most recent commit.
@@ -49,7 +51,8 @@ else
         test -f $file; and set c_files $c_files $file
     end
     # Extract just the fish files.
-    set f_files (string match -r '^.*\.fish$' -- $files)
+    set fish_files (string match -r '^.*\.fish$' -- $files)
+    set python_files (string match -r '^.*\.py$' -- $files)
 end
 
 # Run the C++ reformatter if we have any C++ files.
@@ -90,7 +93,7 @@ if set -q c_files[1]
 end
 
 # Run the fish reformatter if we have any fish files.
-if set -q f_files[1]
+if set -q fish_files[1]
     if not type -q fish_indent
         make fish_indent
         set PATH . $PATH
@@ -99,7 +102,7 @@ if set -q f_files[1]
     echo ========================================
     echo Running fish_indent
     echo ========================================
-    for file in $f_files
+    for file in $fish_files
         cp $file $file.new # preserves mode bits
         fish_indent <$file >$file.new
         if cmp --quiet $file $file.new
@@ -110,3 +113,17 @@ if set -q f_files[1]
         end
     end
 end
+
+if set -q python_files[1]
+    if not type -q black
+        echo
+        echo Please install "`black`" to style python
+        echo
+    else
+        echo
+        echo ========================================
+        echo Running black
+        echo ========================================
+        black $python_files
+    end
+end

From df7cb66ff92ee669ad6d5c73dcd2f22448809a5c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 3 May 2019 19:20:45 +0200
Subject: [PATCH 0487/1732] build_tools/style: Make output a bit spicier.

COLORS! ALL THE COLORS! Well, three! No, wait, FOUR! But only if you
count "normal" as a color!

[ci skip]
---
 build_tools/style.fish | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/build_tools/style.fish b/build_tools/style.fish
index b3ae670ea..755da67bf 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -55,14 +55,16 @@ else
     set python_files (string match -r '^.*\.py$' -- $files)
 end
 
+set -l red (set_color red)
+set -l green (set_color green)
+set -l blue (set_color blue)
+set -l normal (set_color normal)
+
 # Run the C++ reformatter if we have any C++ files.
 if set -q c_files[1]
     if test $git_clang_format = yes
         if type -q git-clang-format
-            echo
-            echo ========================================
-            echo Running git-clang-format
-            echo ========================================
+            echo === Running "$red"git-clang-format"$normal"
             git add $c_files
             git-clang-format
         else
@@ -71,10 +73,7 @@ if set -q c_files[1]
             echo
         end
     else if type -q clang-format
-        echo
-        echo ========================================
-        echo Running clang-format
-        echo ========================================
+        echo === Running "$red"clang-format"$normal"
         for file in $c_files
             cp $file $file.new # preserves mode bits
             clang-format $file >$file.new
@@ -98,10 +97,7 @@ if set -q fish_files[1]
         make fish_indent
         set PATH . $PATH
     end
-    echo
-    echo ========================================
-    echo Running fish_indent
-    echo ========================================
+    echo === Running "$green"fish_indent"$normal"
     for file in $fish_files
         cp $file $file.new # preserves mode bits
         fish_indent <$file >$file.new
@@ -120,10 +116,7 @@ if set -q python_files[1]
         echo Please install "`black`" to style python
         echo
     else
-        echo
-        echo ========================================
-        echo Running black
-        echo ========================================
+        echo === Running "$blue"black"$normal"
         black $python_files
     end
 end

From 90d64194c5c7073f656f1d990d149b9006055762 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 4 May 2019 19:16:02 +0200
Subject: [PATCH 0488/1732] functions: Replace crummy forced tab with spaces

Still forced indentation, but at least the kind we recommend via
fish_indent.

Fixes #1472.
---
 src/builtin_functions.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 16a22128d..b7e66746b 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -204,8 +204,9 @@ static wcstring functions_def(const wcstring &name) {
         wcstring_list_t lst;
         kv.second.to_list(lst);
 
-        // This forced tab is crummy, but we don't know what indentation style the function uses.
-        append_format(out, L"\n\tset -l %ls", kv.first.c_str());
+        // We don't know what indentation style the function uses,
+        // so we do what fish_indent would.
+        append_format(out, L"\n    set -l %ls", kv.first.c_str());
         for (const auto &arg : lst) {
             wcstring earg = escape_string(arg, ESCAPE_ALL);
             out.push_back(L' ');
@@ -213,8 +214,8 @@ static wcstring functions_def(const wcstring &name) {
         }
     }
 
-    // This forced tab is sort of crummy - not all functions start with a tab.
-    append_format(out, L"\n\t%ls", def.c_str());
+    // More forced indentation.
+    append_format(out, L"\n    %ls", def.c_str());
 
     // Append a newline before the 'end', unless there already is one there.
     if (!string_suffixes_string(L"\n", def)) {

From c2970f96183bd0bb16f8431d5e1c86db04311b7d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 12:09:25 +0200
Subject: [PATCH 0489/1732] Reformat all files

This runs build_tools/style.fish, which runs clang-format on C++, fish_indent on fish and (new) black on python.

If anything is wrong with the formatting, we should fix the tools, but automated formatting is worth it.
---
 share/functions/__fish_anypython.fish         |    2 +-
 share/functions/__fish_clang_complete.fish    |   18 +-
 share/functions/__fish_complete_man.fish      |    6 +-
 share/functions/__fish_complete_suffix.fish   |    2 +-
 ...sh_complete_zfs_mountpoint_properties.fish |   30 +-
 .../functions/__fish_complete_zfs_pools.fish  |    2 +-
 .../__fish_complete_zfs_ro_properties.fish    |   64 +-
 .../__fish_complete_zfs_rw_properties.fish    |  148 +--
 ...sh_complete_zfs_write_once_properties.fish |   32 +-
 share/functions/__fish_describe_command.fish  |    3 +-
 share/functions/__fish_first_token.fish       |   12 +-
 share/functions/__fish_is_first_arg.fish      |    4 +-
 share/functions/__fish_is_switch.fish         |    2 +-
 .../functions/__fish_parent_directories.fish  |   32 +-
 share/functions/__fish_parse_configure.fish   |  112 +-
 .../__fish_pipestatus_with_signal.fish        |    2 +-
 .../__fish_portage_print_available_pkgs.fish  |    2 +-
 .../__fish_portage_print_installed_pkgs.fish  |    2 +-
 ...__fish_portage_print_repository_names.fish |    4 +-
 ...__fish_portage_print_repository_paths.fish |    4 +-
 share/functions/__fish_prev_arg_in.fish       |   24 +-
 share/functions/__fish_print_help.fish        |   13 +-
 share/functions/__fish_print_hostnames.fish   |    6 +-
 share/functions/__fish_print_packages.fish    |    3 +-
 share/functions/__fish_print_pipestatus.fish  |    4 +-
 share/functions/__fish_print_xwindows.fish    |    2 +-
 .../functions/__fish_print_zfs_bookmarks.fish |    6 +-
 .../__fish_print_zfs_filesystems.fish         |    2 +-
 .../functions/__fish_print_zfs_snapshots.fish |    2 +-
 share/functions/__fish_print_zfs_volumes.fish |    2 +-
 share/functions/__fish_seen_argument.fish     |   32 +-
 .../__fish_should_complete_switches.fish      |   18 +-
 share/functions/__fish_whatis.fish            |   30 +-
 share/functions/__terlar_git_prompt.fish      |    2 +-
 share/functions/_fish_systemctl.fish          |   36 +-
 share/functions/abbr.fish                     |    6 +-
 share/functions/fish_clipboard_copy.fish      |    3 +-
 share/functions/fish_config.fish              |   14 +-
 share/functions/fish_git_prompt.fish          |    6 +-
 share/functions/fish_hg_prompt.fish           |    2 +-
 share/functions/fish_npm_helper.fish          |    2 +-
 share/functions/fish_print_hg_root.fish       |    2 +-
 share/functions/fish_svn_prompt.fish          |    2 +-
 share/functions/help.fish                     |   11 +-
 share/functions/ls.fish                       |    2 +-
 share/functions/type.fish                     |    3 +-
 share/tools/create_manpage_completions.py     |  557 +++++----
 share/tools/deroff.py                         | 1076 +++++++++--------
 .../sample_prompts/debian_chroot.fish         |    4 +-
 .../sample_prompts/informative.fish           |    6 +-
 share/tools/web_config/webconfig.py           | 1013 ++++++++++------
 sphinx_doc_src/conf.py                        |   80 +-
 sphinx_doc_src/fish_indent_lexer.py           |    4 +-
 src/builtin.cpp                               |    2 +-
 src/builtin_argparse.cpp                      |   20 +-
 src/builtin_bind.cpp                          |   28 +-
 src/builtin_bind.h                            |   40 +-
 src/builtin_builtin.cpp                       |    8 +-
 src/builtin_command.cpp                       |    2 +-
 src/builtin_commandline.h                     |    2 +-
 src/builtin_complete.cpp                      |    3 +-
 src/builtin_echo.cpp                          |   10 +-
 src/builtin_fg.cpp                            |    2 +-
 src/builtin_functions.cpp                     |   26 +-
 src/builtin_history.cpp                       |    4 +-
 src/builtin_jobs.cpp                          |   29 +-
 src/builtin_math.cpp                          |   37 +-
 src/builtin_printf.cpp                        |   17 +-
 src/builtin_pwd.cpp                           |    2 +-
 src/builtin_read.cpp                          |   79 +-
 src/builtin_realpath.cpp                      |    2 +-
 src/builtin_set.cpp                           |   19 +-
 src/builtin_set_color.cpp                     |   12 +-
 src/builtin_status.cpp                        |   41 +-
 src/builtin_string.cpp                        |    2 +-
 src/builtin_test.cpp                          |   14 +-
 src/color.cpp                                 |    8 +-
 src/common.cpp                                |   51 +-
 src/common.h                                  |   35 +-
 src/complete.cpp                              |   13 +-
 src/complete.h                                |    1 -
 src/env.cpp                                   |   11 +-
 src/env.h                                     |    3 +-
 src/env_dispatch.cpp                          |    2 +-
 src/env_universal_common.cpp                  |   14 +-
 src/event.cpp                                 |   21 +-
 src/exec.cpp                                  |    9 +-
 src/expand.cpp                                |   22 +-
 src/fallback.cpp                              |   21 +-
 src/fallback.h                                |    6 +-
 src/fish.cpp                                  |   15 +-
 src/fish_indent.cpp                           |   50 +-
 src/fish_key_reader.cpp                       |   10 +-
 src/fish_tests.cpp                            |   87 +-
 src/fish_version.cpp                          |    2 +-
 src/future_feature_flags.cpp                  |    3 +-
 src/future_feature_flags.h                    |   30 +-
 src/highlight.cpp                             |    8 +-
 src/history.cpp                               |    8 +-
 src/input.cpp                                 |  159 +--
 src/input.h                                   |    7 +-
 src/input_common.cpp                          |   12 +-
 src/io.cpp                                    |   10 +-
 src/io.h                                      |   61 +-
 src/iothread.cpp                              |    4 +-
 src/maybe.h                                   |    4 +-
 src/pager.cpp                                 |    9 +-
 src/parse_execution.cpp                       |    4 +-
 src/parse_execution.h                         |    3 +-
 src/parse_grammar.h                           |   13 +-
 src/parse_productions.cpp                     |   34 +-
 src/parse_tree.cpp                            |   17 +-
 src/parse_tree.h                              |   14 +-
 src/parse_util.cpp                            |   16 +-
 src/parser.cpp                                |    3 +-
 src/parser.h                                  |    3 +-
 src/parser_keywords.cpp                       |   32 +-
 src/path.cpp                                  |   14 +-
 src/postfork.cpp                              |   38 +-
 src/proc.cpp                                  |   21 +-
 src/proc.h                                    |   10 +-
 src/reader.cpp                                |   30 +-
 src/redirection.h                             |    4 +-
 src/screen.cpp                                |   33 +-
 src/signal.cpp                                |    1 -
 src/tinyexpr.cpp                              |  278 +++--
 src/tnode.cpp                                 |    3 +-
 src/tnode.h                                   |    3 +-
 src/tokenizer.cpp                             |   20 +-
 src/utf8.cpp                                  |    4 +-
 src/util.cpp                                  |    2 +-
 src/wcstringutil.cpp                          |    8 +-
 src/wcstringutil.h                            |   11 +-
 src/wgetopt.cpp                               |   14 +-
 src/wildcard.cpp                              |    9 +-
 src/wutil.cpp                                 |   16 +-
 src/wutil.h                                   |   22 +-
 137 files changed, 2885 insertions(+), 2350 deletions(-)

diff --git a/share/functions/__fish_anypython.fish b/share/functions/__fish_anypython.fish
index 3a3819864..aec4ed659 100644
--- a/share/functions/__fish_anypython.fish
+++ b/share/functions/__fish_anypython.fish
@@ -1,6 +1,6 @@
 function __fish_anypython
     # Try python3 first, because that's usually faster and generally nicer.
-	for py in python3 python2 python
+    for py in python3 python2 python
         command -sq $py
         and echo $py
         and return 0
diff --git a/share/functions/__fish_clang_complete.fish b/share/functions/__fish_clang_complete.fish
index 188799919..de1bdb677 100644
--- a/share/functions/__fish_clang_complete.fish
+++ b/share/functions/__fish_clang_complete.fish
@@ -2,15 +2,15 @@
 # by clang.fish and clang++.fish.
 # We dynamically query the head at `(commandline -o)[1]` to get the correct completions.
 function __fish_clang_complete
-	# If the result is for a value, clang only prints the value, so completions
-	# for `-std=` print `c++11` and not `-std=c++11` like we need. See #4174.
-	set -l prefix (commandline -ct | string replace -fr -- '^(.*=)[^=]*' '$1')
+    # If the result is for a value, clang only prints the value, so completions
+    # for `-std=` print `c++11` and not `-std=c++11` like we need. See #4174.
+    set -l prefix (commandline -ct | string replace -fr -- '^(.*=)[^=]*' '$1')
 
-	# Don't hard-code the name of the clang binary
-	set -l clang (commandline -o)[1]
-	# first get the completions from clang, with the prefix separated from the value by a comma
-	$clang --autocomplete=(commandline -ct | string replace -- "$prefix" "$prefix,") 2>/dev/null |
-	# and put it in a format that fish understands
-	string replace -r -- '^([^ ]+)\s*(.*)' "$prefix\$1\t\$2"
+    # Don't hard-code the name of the clang binary
+    set -l clang (commandline -o)[1]
+    # first get the completions from clang, with the prefix separated from the value by a comma
+    $clang --autocomplete=(commandline -ct | string replace -- "$prefix" "$prefix,") 2>/dev/null |
+    # and put it in a format that fish understands
+    string replace -r -- '^([^ ]+)\s*(.*)' "$prefix\$1\t\$2"
 end
 
diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index a8d3daf97..5fbe87345 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -19,7 +19,7 @@ function __fish_complete_man
     set -l exclude_fish_commands
     # Only include fish commands when section is empty or 1
     if test -z "$section" -o "$section" = "1"
-      set -e exclude_fish_commands
+        set -e exclude_fish_commands
     end
 
     set section $section"[^)]*"
@@ -71,8 +71,8 @@ function __fish_complete_man
 
         # Fish commands are not given by apropos
         if not set -ql exclude_fish_commands
-          set -l files $__fish_data_dir/man/man1/*.1
-          string replace -r '.*/([^/]+)\.1$' '$1\t1: fish command' -- $files
+            set -l files $__fish_data_dir/man/man1/*.1
+            string replace -r '.*/([^/]+)\.1$' '$1\t1: fish command' -- $files
         end
     else
         return 1
diff --git a/share/functions/__fish_complete_suffix.fish b/share/functions/__fish_complete_suffix.fish
index 7397e252c..401461cf0 100644
--- a/share/functions/__fish_complete_suffix.fish
+++ b/share/functions/__fish_complete_suffix.fish
@@ -94,7 +94,7 @@ function __fish_complete_suffix -d "Complete using files"
 
     if set -q files[1]
         if string match -qr -- . "$desc"
-           set desc "\t$desc"
+            set desc "\t$desc"
         end
         if string match -qr -- . "$prefix"
             # Ideally, only replace in the beginning of the string, but we have no
diff --git a/share/functions/__fish_complete_zfs_mountpoint_properties.fish b/share/functions/__fish_complete_zfs_mountpoint_properties.fish
index 07b3a45da..e361b8206 100644
--- a/share/functions/__fish_complete_zfs_mountpoint_properties.fish
+++ b/share/functions/__fish_complete_zfs_mountpoint_properties.fish
@@ -1,5 +1,5 @@
 function __fish_complete_zfs_mountpoint_properties -d "Completes with ZFS mountpoint properties"
-	set -l OS ""
+    set -l OS ""
     switch (uname)
         case Linux
             set OS "Linux"
@@ -9,21 +9,21 @@ function __fish_complete_zfs_mountpoint_properties -d "Completes with ZFS mountp
             set OS "FreeBSD"
         case SunOS
             set OS "SunOS"
-        # Others?
+            # Others?
         case "*"
             set OS "unknown"
     end
-	echo -e "atime\t"(_ "Update access time on read")" (on, off)"
-	echo -e "devices\t"(_ "Are contained device nodes openable")" (on, off)"
-	echo -e "exec\t"(_ "Can contained executables be executed")" (on, off)"
-	echo -e "readonly\t"(_ "Read-only")" (on, off)"
-	echo -e "setuid\t"(_ "Respect set-UID bit")" (on, off)"
-	if test $OS = "SunOS"
-		echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
-		echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
-	else if test $OS = "Linux"
-		echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
-		echo -e "relatime\t"(_ "Sometimes update access time on read")" (on, off)"
-		echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
-	end		
+    echo -e "atime\t"(_ "Update access time on read")" (on, off)"
+    echo -e "devices\t"(_ "Are contained device nodes openable")" (on, off)"
+    echo -e "exec\t"(_ "Can contained executables be executed")" (on, off)"
+    echo -e "readonly\t"(_ "Read-only")" (on, off)"
+    echo -e "setuid\t"(_ "Respect set-UID bit")" (on, off)"
+    if test $OS = "SunOS"
+        echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
+        echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
+    else if test $OS = "Linux"
+        echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
+        echo -e "relatime\t"(_ "Sometimes update access time on read")" (on, off)"
+        echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
+    end
 end
diff --git a/share/functions/__fish_complete_zfs_pools.fish b/share/functions/__fish_complete_zfs_pools.fish
index c5ed4e3c3..fb2471567 100644
--- a/share/functions/__fish_complete_zfs_pools.fish
+++ b/share/functions/__fish_complete_zfs_pools.fish
@@ -1,3 +1,3 @@
 function __fish_complete_zfs_pools -d "Completes with available ZFS pools"
-	zpool list -o name,comment -H | string replace -a \t'-' ''
+    zpool list -o name,comment -H | string replace -a \t'-' ''
 end
diff --git a/share/functions/__fish_complete_zfs_ro_properties.fish b/share/functions/__fish_complete_zfs_ro_properties.fish
index c896b5c14..5013070cc 100644
--- a/share/functions/__fish_complete_zfs_ro_properties.fish
+++ b/share/functions/__fish_complete_zfs_ro_properties.fish
@@ -1,44 +1,44 @@
 function __fish_complete_zfs_ro_properties -d "Completes with ZFS read-only properties"
-	echo -e "available\t"(_ "Available space")
-	echo -e "avail\t"(_ "Available space")
-	echo -e "compressratio\t"(_ "Achieved compression ratio")
-	echo -e "creation\t"(_ "Dataset creation time")
-	echo -e "clones\t"(_ "Snapshot clones")
-	echo -e "defer_destroy\t"(_ "Marked for deferred destruction")
-	echo -e "filesystem_count\t"(_ "Total lower-level filesystems and volumes")
-	echo -e "logicalreferenced\t"(_ "Logical total space")
-	echo -e "lrefer\t"(_ "Logical total space")
-	echo -e "logicalused\t"(_ "Logical used space")
-	echo -e "lused\t"(_ "Logical used space")
-	echo -e "mounted\t"(_ "Is currently mounted?")
-	echo -e "origin\t"(_ "Source snapshot")
-	if __fish_is_zfs_feature_enabled "feature@extensible_dataset"
-		echo -e "receive_resume_token\t"(_ "Token for interrupted reception resumption")
-	end
-	echo -e "referenced\t"(_ "Total space")
-	echo -e "refer\t"(_ "Total space")
-	echo -e "refcompressratio\t"(_ "Achieved compression ratio of referenced space")
-	echo -e "snapshot_count\t"(_ "Total lower-level snapshots")
-	echo -e "type\t"(_ "Dataset type")
-	echo -e "used\t"(_ "Space used by dataset and children")
-	echo -e "usedbychildren\t"(_ "Space used by children datasets")
-	echo -e "usedbydataset\t"(_ "Space used by dataset itself")
-	echo -e "usedbyrefreservation\t"(_ "Space used by refreservation")
-	echo -e "usedbysnapshots\t"(_ "Space used by dataset snapshots")
-	echo -e "userrefs\t"(_ "Holds count") 
-	echo -e "volblocksize\t"(_ "Volume block size") 
-	echo -e "written\t"(_ "Referenced data written since previous snapshot")
-	# Autogenerate userused@$USER list; only usernames are supported by the completion, but the zfs command supports more formats
+    echo -e "available\t"(_ "Available space")
+    echo -e "avail\t"(_ "Available space")
+    echo -e "compressratio\t"(_ "Achieved compression ratio")
+    echo -e "creation\t"(_ "Dataset creation time")
+    echo -e "clones\t"(_ "Snapshot clones")
+    echo -e "defer_destroy\t"(_ "Marked for deferred destruction")
+    echo -e "filesystem_count\t"(_ "Total lower-level filesystems and volumes")
+    echo -e "logicalreferenced\t"(_ "Logical total space")
+    echo -e "lrefer\t"(_ "Logical total space")
+    echo -e "logicalused\t"(_ "Logical used space")
+    echo -e "lused\t"(_ "Logical used space")
+    echo -e "mounted\t"(_ "Is currently mounted?")
+    echo -e "origin\t"(_ "Source snapshot")
+    if __fish_is_zfs_feature_enabled "feature@extensible_dataset"
+        echo -e "receive_resume_token\t"(_ "Token for interrupted reception resumption")
+    end
+    echo -e "referenced\t"(_ "Total space")
+    echo -e "refer\t"(_ "Total space")
+    echo -e "refcompressratio\t"(_ "Achieved compression ratio of referenced space")
+    echo -e "snapshot_count\t"(_ "Total lower-level snapshots")
+    echo -e "type\t"(_ "Dataset type")
+    echo -e "used\t"(_ "Space used by dataset and children")
+    echo -e "usedbychildren\t"(_ "Space used by children datasets")
+    echo -e "usedbydataset\t"(_ "Space used by dataset itself")
+    echo -e "usedbyrefreservation\t"(_ "Space used by refreservation")
+    echo -e "usedbysnapshots\t"(_ "Space used by dataset snapshots")
+    echo -e "userrefs\t"(_ "Holds count")
+    echo -e "volblocksize\t"(_ "Volume block size")
+    echo -e "written\t"(_ "Referenced data written since previous snapshot")
+    # Autogenerate userused@$USER list; only usernames are supported by the completion, but the zfs command supports more formats
     for user in (__fish_print_users)
         set -l tabAndBefore (echo -e "userused@$user\t")
         printf (_ "%sDataset space use by user %s\n") $tabAndBefore $user
     end
-	# Autogenerate groupused@$USER list
+    # Autogenerate groupused@$USER list
     for group in (__fish_print_groups)
         set -l tabAndBefore (echo -e "groupused@$group\t")
         printf (_ "%sDataset space use by group %s\n") $tabAndBefore $group
     end
-	# Autogenerate written@$SNAPSHOT list
+    # Autogenerate written@$SNAPSHOT list
     for snapshot in (__fish_print_zfs_snapshots)
         set -l tabAndBefore (echo -e "written@$snapshot\t")
         printf (_ "%sReferenced data written since snapshot %s\n") $tabAndBefore $snapshot
diff --git a/share/functions/__fish_complete_zfs_rw_properties.fish b/share/functions/__fish_complete_zfs_rw_properties.fish
index ebc8572e9..5905490c2 100644
--- a/share/functions/__fish_complete_zfs_rw_properties.fish
+++ b/share/functions/__fish_complete_zfs_rw_properties.fish
@@ -1,5 +1,5 @@
 function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write properties"
-	set -l OS ""
+    set -l OS ""
     switch (uname)
         case Linux
             set OS "Linux"
@@ -9,89 +9,89 @@ function __fish_complete_zfs_rw_properties -d "Completes with ZFS read-write pro
             set OS "FreeBSD"
         case SunOS
             set OS "SunOS"
-        # Others?
+            # Others?
         case "*"
             set OS "unknown"
-	end
-	echo -e "aclinherit\t"(_ "Inheritance of ACL entries")" (discard, noallow, restricted, passthrough, passthrough-x)"
-	echo -e "atime\t"(_ "Update access time on read")" (on, off)"
-	echo -e "canmount\t"(_ "Is the dataset mountable")" (on, off, noauto)"
-	set -l additional_algs ''
-    if contains -- $OS FreeBSD SunOS
-		set additional_algs "$additional_algs, noparity"
     end
-	if __fish_is_zfs_feature_enabled "feature@sha512"
-		set additional_algs "$additional_algs, sha512"
-	end
-	if __fish_is_zfs_feature_enabled "feature@skein"
-		set additional_algs "$additional_algs, skein"
-	end
-	if __fish_is_zfs_feature_enabled "feature@edonr"
-		set additional_algs "$additional_algs, edonr"
-	end
-	echo -e "checksum\t"(_ "Data checksum")" (on, off, fletcher2, fletcher4, sha256$additional_algs)"
-	if __fish_is_zfs_feature_enabled "feature@lz4_compress"
-		set additional_algs ", lz4"
-	end
-	echo -e "compression\t"(_ "Compression algorithm")" (on, off, lzjb$additional_algs, gzip, gzip-[1-9], zle)"
-	set -e additional_algs
-	echo -e "copies\t"(_ "Number of copies of data")" (1, 2, 3)"
-	echo -e "dedup\t"(_ "Deduplication")" (on, off, verify, sha256[,verify])"
-	echo -e "devices\t"(_ "Are contained device nodes openable")" (on, off)"
-	echo -e "exec\t"(_ "Can contained executables be executed")" (on, off)"
-	echo -e "filesystem_limit\t"(_ "Max number of filesystems and volumes")" (COUNT, none)"
-	echo -e "mountpoint\t"(_ "Mountpoint")" (PATH, none, legacy)"
-	echo -e "primarycache\t"(_ "Which data to cache in ARC")" (all, none, metadata)"
-	echo -e "quota\t"(_ "Max size of dataset and children")" (SIZE, none)"
-	echo -e "snapshot_limit\t"(_ "Max number of snapshots")" (COUNT, none)"
-	echo -e "readonly\t"(_ "Read-only")" (on, off)"
-	echo -e "recordsize\t"(_ "Suggest block size")" (SIZE)"
-	echo -e "redundant_metadata\t"(_ "How redundant are the metadata")" (all, most)"
-	echo -e "refquota\t"(_ "Max space used by dataset itself")" (SIZE, none)"
-	echo -e "refreservation\t"(_ "Min space guaranteed to dataset itself")" (SIZE, none)"
-	echo -e "reservation\t"(_ "Min space guaranteed to dataset")" (SIZE, none)"
-	echo -e "secondarycache\t"(_ "Which data to cache in L2ARC")" (all, none, metadata)"
-	echo -e "setuid\t"(_ "Respect set-UID bit")" (on, off)"
-	echo -e "sharenfs\t"(_ "Share in NFS")" (on, off, OPTS)"
-	echo -e "logbias\t"(_ "Hint for handling of synchronous requests")" (latency, throughput)"
-	echo -e "snapdir\t"(_ "Hide .zfs directory")" (hidden, visible)"
-	echo -e "sync\t"(_ "Handle of synchronous requests")" (standard, always, disabled)"
-	echo -e "volsize\t"(_ "Volume logical size")" (SIZE)"
+    echo -e "aclinherit\t"(_ "Inheritance of ACL entries")" (discard, noallow, restricted, passthrough, passthrough-x)"
+    echo -e "atime\t"(_ "Update access time on read")" (on, off)"
+    echo -e "canmount\t"(_ "Is the dataset mountable")" (on, off, noauto)"
+    set -l additional_algs ''
+    if contains -- $OS FreeBSD SunOS
+        set additional_algs "$additional_algs, noparity"
+    end
+    if __fish_is_zfs_feature_enabled "feature@sha512"
+        set additional_algs "$additional_algs, sha512"
+    end
+    if __fish_is_zfs_feature_enabled "feature@skein"
+        set additional_algs "$additional_algs, skein"
+    end
+    if __fish_is_zfs_feature_enabled "feature@edonr"
+        set additional_algs "$additional_algs, edonr"
+    end
+    echo -e "checksum\t"(_ "Data checksum")" (on, off, fletcher2, fletcher4, sha256$additional_algs)"
+    if __fish_is_zfs_feature_enabled "feature@lz4_compress"
+        set additional_algs ", lz4"
+    end
+    echo -e "compression\t"(_ "Compression algorithm")" (on, off, lzjb$additional_algs, gzip, gzip-[1-9], zle)"
+    set -e additional_algs
+    echo -e "copies\t"(_ "Number of copies of data")" (1, 2, 3)"
+    echo -e "dedup\t"(_ "Deduplication")" (on, off, verify, sha256[,verify])"
+    echo -e "devices\t"(_ "Are contained device nodes openable")" (on, off)"
+    echo -e "exec\t"(_ "Can contained executables be executed")" (on, off)"
+    echo -e "filesystem_limit\t"(_ "Max number of filesystems and volumes")" (COUNT, none)"
+    echo -e "mountpoint\t"(_ "Mountpoint")" (PATH, none, legacy)"
+    echo -e "primarycache\t"(_ "Which data to cache in ARC")" (all, none, metadata)"
+    echo -e "quota\t"(_ "Max size of dataset and children")" (SIZE, none)"
+    echo -e "snapshot_limit\t"(_ "Max number of snapshots")" (COUNT, none)"
+    echo -e "readonly\t"(_ "Read-only")" (on, off)"
+    echo -e "recordsize\t"(_ "Suggest block size")" (SIZE)"
+    echo -e "redundant_metadata\t"(_ "How redundant are the metadata")" (all, most)"
+    echo -e "refquota\t"(_ "Max space used by dataset itself")" (SIZE, none)"
+    echo -e "refreservation\t"(_ "Min space guaranteed to dataset itself")" (SIZE, none)"
+    echo -e "reservation\t"(_ "Min space guaranteed to dataset")" (SIZE, none)"
+    echo -e "secondarycache\t"(_ "Which data to cache in L2ARC")" (all, none, metadata)"
+    echo -e "setuid\t"(_ "Respect set-UID bit")" (on, off)"
+    echo -e "sharenfs\t"(_ "Share in NFS")" (on, off, OPTS)"
+    echo -e "logbias\t"(_ "Hint for handling of synchronous requests")" (latency, throughput)"
+    echo -e "snapdir\t"(_ "Hide .zfs directory")" (hidden, visible)"
+    echo -e "sync\t"(_ "Handle of synchronous requests")" (standard, always, disabled)"
+    echo -e "volsize\t"(_ "Volume logical size")" (SIZE)"
 
-	# Autogenerate userquota@$USER list; only usernames are supported by the completion, but the zfs command supports more formats
+    # Autogenerate userquota@$USER list; only usernames are supported by the completion, but the zfs command supports more formats
     for user in (__fish_print_users)
         set -l tabAndBefore (echo -e "userquota@$user\t")
         printf (_ "%sMax usage by user %s\n") $tabAndBefore $user
     end
-	# Autogenerate groupquota@$USER list
+    # Autogenerate groupquota@$USER list
     for group in (__fish_print_groups)
         set -l tabAndBefore (echo -e "groupquota@$group\t")
         printf (_ "%sMax usage by group %s\n") $tabAndBefore $group
     end
-	if test $OS = "SunOS"
-		echo -e "aclmode\t"(_ "How is ACL modified by chmod")" (discard, groupmask, passthrough, restricted)"
-		echo -e "mlslabel\t"(_ "Can the dataset be mounted in a zone with Trusted Extensions enabled")" (LABEL, none)"
-		echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
-		echo -e "sharesmb\t"(_ "Share in Samba")" (on, off)"
-		echo -e "shareiscsi\t"(_ "Share as an iSCSI target")" (on, off)"
-		echo -e "version\t"(_ "On-disk version of filesystem")" (1, 2, current)"
-		echo -e "vscan\t"(_ "Scan regular files for viruses on opening and closing")" (on, off)"
-		echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
-		echo -e "zoned\t"(_ "Managed from a non-global zone")" (on, off)"
-	else if test $OS = "Linux"
-		echo -e "acltype\t"(_ "Use no ACL or POSIX ACL")" (noacl, posixacl)"
-		echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
-		echo -e "relatime\t"(_ "Sometimes update access time on read")" (on, off)"
-		echo -e "shareiscsi\t"(_ "Share as an iSCSI target")" (on, off)"
-		echo -e "sharesmb\t"(_ "Share in Samba")" (on, off)"
-		echo -e "snapdev\t"(_ "Hide volume snapshots")" (hidden, visible)"
-		echo -e "version\t"(_ "On-disk version of filesystem")" (1, 2, current)"
-		echo -e "vscan\t"(_ "Scan regular files for viruses on opening and closing")" (on, off)"
-		echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
-	else if test $OS = "FreeBSD"
-		echo -e "aclmode\t"(_ "How is ACL modified by chmod")" (discard, groupmask, passthrough, restricted)"
-		echo -e "volmode\t"(_ "How to expose volumes to OS")" (default, geom, dev, none)"
-	end		
-	# User properties; the /dev/null redirection masks the possible "no datasets available"
-	zfs list -o all 2>/dev/null | head -n 1 | string replace -a -r "\s+" "\n" | string match -e ":" | string lower
+    if test $OS = "SunOS"
+        echo -e "aclmode\t"(_ "How is ACL modified by chmod")" (discard, groupmask, passthrough, restricted)"
+        echo -e "mlslabel\t"(_ "Can the dataset be mounted in a zone with Trusted Extensions enabled")" (LABEL, none)"
+        echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
+        echo -e "sharesmb\t"(_ "Share in Samba")" (on, off)"
+        echo -e "shareiscsi\t"(_ "Share as an iSCSI target")" (on, off)"
+        echo -e "version\t"(_ "On-disk version of filesystem")" (1, 2, current)"
+        echo -e "vscan\t"(_ "Scan regular files for viruses on opening and closing")" (on, off)"
+        echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
+        echo -e "zoned\t"(_ "Managed from a non-global zone")" (on, off)"
+    else if test $OS = "Linux"
+        echo -e "acltype\t"(_ "Use no ACL or POSIX ACL")" (noacl, posixacl)"
+        echo -e "nbmand\t"(_ "Mount with Non Blocking mandatory locks")" (on, off)"
+        echo -e "relatime\t"(_ "Sometimes update access time on read")" (on, off)"
+        echo -e "shareiscsi\t"(_ "Share as an iSCSI target")" (on, off)"
+        echo -e "sharesmb\t"(_ "Share in Samba")" (on, off)"
+        echo -e "snapdev\t"(_ "Hide volume snapshots")" (hidden, visible)"
+        echo -e "version\t"(_ "On-disk version of filesystem")" (1, 2, current)"
+        echo -e "vscan\t"(_ "Scan regular files for viruses on opening and closing")" (on, off)"
+        echo -e "xattr\t"(_ "Extended attributes")" (on, off, sa)"
+    else if test $OS = "FreeBSD"
+        echo -e "aclmode\t"(_ "How is ACL modified by chmod")" (discard, groupmask, passthrough, restricted)"
+        echo -e "volmode\t"(_ "How to expose volumes to OS")" (default, geom, dev, none)"
+    end
+    # User properties; the /dev/null redirection masks the possible "no datasets available"
+    zfs list -o all 2>/dev/null | head -n 1 | string replace -a -r "\s+" "\n" | string match -e ":" | string lower
 end
diff --git a/share/functions/__fish_complete_zfs_write_once_properties.fish b/share/functions/__fish_complete_zfs_write_once_properties.fish
index cb99360d0..524a922b2 100644
--- a/share/functions/__fish_complete_zfs_write_once_properties.fish
+++ b/share/functions/__fish_complete_zfs_write_once_properties.fish
@@ -1,5 +1,5 @@
 function __fish_complete_zfs_write_once_properties -d "Completes with ZFS properties which can only be written at filesystem creation, and only be read thereafter"
-	set -l OS ""
+    set -l OS ""
     switch (uname)
         case Linux
             set OS "Linux"
@@ -9,22 +9,22 @@ function __fish_complete_zfs_write_once_properties -d "Completes with ZFS proper
             set OS "FreeBSD"
         case SunOS
             set OS "SunOS"
-        # Others?
+            # Others?
         case "*"
             set OS "unknown"
     end
-	echo -e "normalization\t"(_ "Unicode normalization")" (none, formC, formD, formKC, formKD)"
-	echo -e "utf8only\t"(_ "Reject non-UTF-8-compliant filenames")" (on, off)"
-	if test $OS = "Linux"
-		echo -e "overlay\t"(_ "Allow overlay mount")" (on, off)"
-		if command -sq sestatus # SELinux is enabled
-			echo -e "context\t"(_ "SELinux context for the child filesystem")
-			echo -e "fscontext\t"(_ "SELinux context for the filesystem being mounted")
-			echo -e "defcontext\t"(_ "SELinux context for unlabeled files")
-			echo -e "rootcontext\t"(_ "SELinux context for the root inode of the filesystem")
-		end
-		echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive)"
-	else
-		echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive, mixed)"
-	end
+    echo -e "normalization\t"(_ "Unicode normalization")" (none, formC, formD, formKC, formKD)"
+    echo -e "utf8only\t"(_ "Reject non-UTF-8-compliant filenames")" (on, off)"
+    if test $OS = "Linux"
+        echo -e "overlay\t"(_ "Allow overlay mount")" (on, off)"
+        if command -sq sestatus # SELinux is enabled
+            echo -e "context\t"(_ "SELinux context for the child filesystem")
+            echo -e "fscontext\t"(_ "SELinux context for the filesystem being mounted")
+            echo -e "defcontext\t"(_ "SELinux context for unlabeled files")
+            echo -e "rootcontext\t"(_ "SELinux context for the root inode of the filesystem")
+        end
+        echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive)"
+    else
+        echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive, mixed)"
+    end
 end
diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 7fb334d78..d850a6152 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -8,7 +8,8 @@ function __fish_describe_command -d "Command used to find descriptions for comma
     # TODO: stop interpolating argv into regex, and remove this hack.
     string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
     or return
-    type -q apropos; or return
+    type -q apropos
+    or return
     apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
 		split($1, names, ", ");
 		for (name in names)
diff --git a/share/functions/__fish_first_token.fish b/share/functions/__fish_first_token.fish
index 65b560899..a80dfcb8c 100644
--- a/share/functions/__fish_first_token.fish
+++ b/share/functions/__fish_first_token.fish
@@ -1,9 +1,9 @@
 # Retrieves the first non-switch argument from the command line buffer
 function __fish_first_token
-	set -l tokens (commandline -co)
-	set -e tokens[1]
-	set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
-	if set -q tokens[1]
-		echo $tokens[1]
-	end
+    set -l tokens (commandline -co)
+    set -e tokens[1]
+    set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
+    if set -q tokens[1]
+        echo $tokens[1]
+    end
 end
diff --git a/share/functions/__fish_is_first_arg.fish b/share/functions/__fish_is_first_arg.fish
index b026a11df..499b143ae 100644
--- a/share/functions/__fish_is_first_arg.fish
+++ b/share/functions/__fish_is_first_arg.fish
@@ -1,5 +1,5 @@
 # determine if this is the very first argument (regardless if switch or not)
 function __fish_is_first_arg
-	set -l tokens (commandline -co)
-	test (count $tokens) -eq 1
+    set -l tokens (commandline -co)
+    test (count $tokens) -eq 1
 end
diff --git a/share/functions/__fish_is_switch.fish b/share/functions/__fish_is_switch.fish
index c513f0e09..5981afa58 100644
--- a/share/functions/__fish_is_switch.fish
+++ b/share/functions/__fish_is_switch.fish
@@ -1,4 +1,4 @@
 # Whether or not the current token is a switch
 function __fish_is_switch
-	string match -qr -- '^-' ""(commandline -ct)
+    string match -qr -- '^-' ""(commandline -ct)
 end
diff --git a/share/functions/__fish_parent_directories.fish b/share/functions/__fish_parent_directories.fish
index 9cdacdcc7..8c101f97d 100644
--- a/share/functions/__fish_parent_directories.fish
+++ b/share/functions/__fish_parent_directories.fish
@@ -1,25 +1,25 @@
 # Generates a list of parent directories for a given path
 # i.e. /a/b/c/d -> [/a/b/c/, /a/b/, /a/, and /a]
 function __fish_parent_directories
-	if test (count $argv) -ne 1
-		# for use in completions, so don't spew error messages
-		return 1
-	end
+    if test (count $argv) -ne 1
+        # for use in completions, so don't spew error messages
+        return 1
+    end
 
-	set -l splits (string split '/' $argv[1])
-	set -l parents
+    set -l splits (string split '/' $argv[1])
+    set -l parents
 
-	for split in $splits
-		if test (string length "$split") -eq 0
-			continue
-		end
+    for split in $splits
+        if test (string length "$split") -eq 0
+            continue
+        end
 
-		set parents "$parents[1]/$split" $parents
-	end
+        set parents "$parents[1]/$split" $parents
+    end
 
-	for parent in $parents
-		echo $parent
-	end
+    for parent in $parents
+        echo $parent
+    end
 
-	return 0
+    return 0
 end
diff --git a/share/functions/__fish_parse_configure.fish b/share/functions/__fish_parse_configure.fish
index ccd4cb916..b99e93ed8 100644
--- a/share/functions/__fish_parse_configure.fish
+++ b/share/functions/__fish_parse_configure.fish
@@ -1,14 +1,14 @@
 function __fish_parse_configure
-	if test (count $argv) -ne 1
-		echo "Usage: parse_configure path/to/configure" 1>&2
-		return 1
-	end
+    if test (count $argv) -ne 1
+        echo "Usage: parse_configure path/to/configure" 1>&2
+        return 1
+    end
 
-	# `complete` parses `./configure` as `configure` so we have to handle all paths, not just ./
-	if not test -x $argv[1]
-		printf "Cannot find or execute '%s'\n" $argv[1] 1>&2
-		return 1
-	end
+    # `complete` parses `./configure` as `configure` so we have to handle all paths, not just ./
+    if not test -x $argv[1]
+        printf "Cannot find or execute '%s'\n" $argv[1] 1>&2
+        return 1
+    end
 
     # Must support output along the lines of
     #  -h, --help              display this help and exit
@@ -17,56 +17,56 @@ function __fish_parse_configure
     #  -V, --version           display version information and exit
     #  -q, --quiet, --silent   do not print `checking ...' messages
 
-	set -l next_line
-	set -l line
-	set -l buffer
-	# Just fish's `./configure --help` takes ~350ms to run, before parsing
-	# The following chain attempts to extract the help message:
-	cat $argv[1] | tr \n \u0e | sed -n 's/.*Report the --help message\(.*\?\)ac_status.*/\1/; s/ac_status.*//p' | tr \u0e \n |
-	while test "$next_line" != "" || read -lL next_line
-		# In autoconfigure scripts, the first column wraps at 26 chars
-		# echo next_line: $next_line
-		# echo old_line: $line
-		if test "$line" = ""
-			set line $next_line
-			set next_line "" # mark it as consumed
-			continue
-		else if string match -qr '^(   |\t){2,}[^-]\S*' -- $next_line
-			# echo "continuation line found. Old value of line: " \"$line\"
-			set line "$line "(string trim $next_line)
-			set next_line "" # mark it as consumed
-			continue
-		end
+    set -l next_line
+    set -l line
+    set -l buffer
+    # Just fish's `./configure --help` takes ~350ms to run, before parsing
+    # The following chain attempts to extract the help message:
+    cat $argv[1] | tr \n \u0e | sed -n 's/.*Report the --help message\(.*\?\)ac_status.*/\1/; s/ac_status.*//p' | tr \u0e \n |
+    while test "$next_line" != "" || read -lL next_line
+        # In autoconfigure scripts, the first column wraps at 26 chars
+        # echo next_line: $next_line
+        # echo old_line: $line
+        if test "$line" = ""
+            set line $next_line
+            set next_line "" # mark it as consumed
+            continue
+        else if string match -qr '^(   |\t){2,}[^-]\S*' -- $next_line
+            # echo "continuation line found. Old value of line: " \"$line\"
+            set line "$line "(string trim $next_line)
+            set next_line "" # mark it as consumed
+            continue
+        end
 
-		# echo line: $line
+        # echo line: $line
 
-		# Search for one or more strings starting with `-` separated by commas
-		if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description
-			for opt in (string split -n , -- $opts | string trim)
+        # Search for one or more strings starting with `-` separated by commas
+        if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description
+            for opt in (string split -n , -- $opts | string trim)
 
-				if string match -qr -- '--[a-z_0-9-]+=\[.*\]' $opt
-					# --option=[OPTIONAL_VALUE]
-					string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
-				else if string match -qr -- '--[a-z_0-9-]+\[=.*\]' $opt
-					# --option[=OPTIONAL_VALUE]
-					string replace -r -- '(--[a-z_0-9-]+)\[=.*' '$1' $opt | read opt
-				else if string match -qr -- '--[a-z_0-9-]+=[A-Z]+' $opt
-					# --option=CLASS_OF_VALUE (eg FILE or DIR)
-					string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
-				else if string match -qr -- '--[a-z_0-9-]+=\S+' $opt
-					# --option=literal_value, leave as-is
-				else if string match -qr -- '--[a-z_0-9-]+$' $opt
-					# long option, leave as-is
-				else if string match -qr -- '-[^-]$' $opt
-					# short option, leave as-is
-				else
-					continue
-				end
+                if string match -qr -- '--[a-z_0-9-]+=\[.*\]' $opt
+                    # --option=[OPTIONAL_VALUE]
+                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+\[=.*\]' $opt
+                    # --option[=OPTIONAL_VALUE]
+                    string replace -r -- '(--[a-z_0-9-]+)\[=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+=[A-Z]+' $opt
+                    # --option=CLASS_OF_VALUE (eg FILE or DIR)
+                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+=\S+' $opt
+                    # --option=literal_value, leave as-is
+                else if string match -qr -- '--[a-z_0-9-]+$' $opt
+                    # long option, leave as-is
+                else if string match -qr -- '-[^-]$' $opt
+                    # short option, leave as-is
+                else
+                    continue
+                end
 
-				echo "$opt"\t"$description" # parsed by `complete` as value and description
-			end
-		end
+                echo "$opt"\t"$description" # parsed by `complete` as value and description
+            end
+        end
 
-		set line ""
-	end
+        set line ""
+    end
 end
diff --git a/share/functions/__fish_pipestatus_with_signal.fish b/share/functions/__fish_pipestatus_with_signal.fish
index b8c0fa35d..116090fa3 100644
--- a/share/functions/__fish_pipestatus_with_signal.fish
+++ b/share/functions/__fish_pipestatus_with_signal.fish
@@ -1,5 +1,5 @@
 function __fish_pipestatus_with_signal --description "Print arguments from \$pipestatus replacing values with signal names where appropriate"
     for pstat in $argv
-         __fish_status_to_signal $pstat
+        __fish_status_to_signal $pstat
     end
 end
diff --git a/share/functions/__fish_portage_print_available_pkgs.fish b/share/functions/__fish_portage_print_available_pkgs.fish
index 65c4f6443..11ff2b6d7 100644
--- a/share/functions/__fish_portage_print_available_pkgs.fish
+++ b/share/functions/__fish_portage_print_available_pkgs.fish
@@ -1,3 +1,3 @@
 function __fish_portage_print_available_pkgs --description 'Print all available packages'
-	find (__fish_portage_print_repository_paths) -mindepth 2 -maxdepth 2 -type d ! '(' '(' -path '*/eclass/*' -o -path '*/metadata/*' -o -path '*/profiles/*' -o -path '*/.*/*' ')' -prune ')' -printf '%P\n'
+    find (__fish_portage_print_repository_paths) -mindepth 2 -maxdepth 2 -type d ! '(' '(' -path '*/eclass/*' -o -path '*/metadata/*' -o -path '*/profiles/*' -o -path '*/.*/*' ')' -prune ')' -printf '%P\n'
 end
diff --git a/share/functions/__fish_portage_print_installed_pkgs.fish b/share/functions/__fish_portage_print_installed_pkgs.fish
index 41c66530d..9dfbaed3a 100644
--- a/share/functions/__fish_portage_print_installed_pkgs.fish
+++ b/share/functions/__fish_portage_print_installed_pkgs.fish
@@ -1,3 +1,3 @@
 function __fish_portage_print_installed_pkgs --description 'Print all installed packages (non-deduplicated)'
-	find /var/db/pkg -mindepth 2 -maxdepth 2 -type d -printf '%P\n' | string replace -r -- '-[0-9][0-9.]*.*$' ''
+    find /var/db/pkg -mindepth 2 -maxdepth 2 -type d -printf '%P\n' | string replace -r -- '-[0-9][0-9.]*.*$' ''
 end
diff --git a/share/functions/__fish_portage_print_repository_names.fish b/share/functions/__fish_portage_print_repository_names.fish
index 336567ff4..d3a898ac1 100644
--- a/share/functions/__fish_portage_print_repository_names.fish
+++ b/share/functions/__fish_portage_print_repository_names.fish
@@ -1,4 +1,4 @@
 function __fish_portage_print_repository_names --description 'Print the names of all configured repositories'
-	# repos.conf may be a file or a directory
-	find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*\[([[:alnum:]_][[:alnum:]_-]*)\]' '$1' | string match -v -e DEFAULT
+    # repos.conf may be a file or a directory
+    find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*\[([[:alnum:]_][[:alnum:]_-]*)\]' '$1' | string match -v -e DEFAULT
 end
diff --git a/share/functions/__fish_portage_print_repository_paths.fish b/share/functions/__fish_portage_print_repository_paths.fish
index 48dd738a5..b290ec78b 100644
--- a/share/functions/__fish_portage_print_repository_paths.fish
+++ b/share/functions/__fish_portage_print_repository_paths.fish
@@ -1,4 +1,4 @@
 function __fish_portage_print_repository_paths --description 'Print the paths of all configured repositories'
-	# repos.conf may be a file or a directory
-	find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*location\s*=\s*(\S+)' '$1'
+    # repos.conf may be a file or a directory
+    find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*location\s*=\s*(\S+)' '$1'
 end
diff --git a/share/functions/__fish_prev_arg_in.fish b/share/functions/__fish_prev_arg_in.fish
index 1fd1662bd..cddc3ebfc 100644
--- a/share/functions/__fish_prev_arg_in.fish
+++ b/share/functions/__fish_prev_arg_in.fish
@@ -1,16 +1,16 @@
 # returns 0 only if previous argument is one of the supplied arguments
 function __fish_prev_arg_in
-	set -l tokens (commandline -co)
-	set -l tokenCount (count $tokens)
-	if test $tokenCount -lt 2
-		# need at least cmd and prev argument
-		return 1
-	end
-	for arg in $argv
-		if string match -q -- $tokens[-1] $arg
-			return 0
-		end
-	end
+    set -l tokens (commandline -co)
+    set -l tokenCount (count $tokens)
+    if test $tokenCount -lt 2
+        # need at least cmd and prev argument
+        return 1
+    end
+    for arg in $argv
+        if string match -q -- $tokens[-1] $arg
+            return 0
+        end
+    end
 
-	return 1
+    return 1
 end
diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index 0d74aa084..ef95b7470 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -73,18 +73,23 @@ function __fish_print_help --description "Print help message for the specified f
                 # Remove man's bolding
                 set -l name (string replace -ra '(.)'\b'.' '$1' -- $line)
                 # We start after we have the name
-                contains -- $name NAME; and set have_name 1; and continue
+                contains -- $name NAME
+                and set have_name 1
+                and continue
                 # We ignore the SYNOPSIS header
-                contains -- $name SYNOPSIS; and continue
+                contains -- $name SYNOPSIS
+                and continue
                 # Everything after COPYRIGHT is useless
-                contains -- $name COPYRIGHT; and break
+                contains -- $name COPYRIGHT
+                and break
 
                 # not leading space, and not empty, so must contain a non-space
                 # in the first column. That makes it a header/footer.
                 set line_type meta
         end
 
-        set -q have_name[1]; or continue
+        set -q have_name[1]
+        or continue
         switch $state
             case normal
                 switch $line_type
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 4545938fe..f18483b9a 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -100,10 +100,10 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
             set known_hosts $known_hosts (string replace -rfi '.*KnownHostsFile\s*' '' <$file)
         end
     end
-	for file in $known_hosts
+    for file in $known_hosts
         if test -r $file
-          # Ignore hosts that are hashed, commented or @-marked and strip the key.
-          awk '$1 !~ /[|#@]/ {
+            # Ignore hosts that are hashed, commented or @-marked and strip the key.
+            awk '$1 !~ /[|#@]/ {
             n=split($1, entries, ",")
             for (i=1; i<=n; i++) {
               # Ignore negated/wildcarded hosts.
diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index 09e162460..8ed0a9a2e 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -1,7 +1,8 @@
 # Use --installed to limit to installed packages only
 function __fish_print_packages
     argparse --name=__fish_print_packages 'i/installed' -- $argv
-    or return;
+    or return
+
 
     set -l only_installed 1
     if not set -q _flag_installed
diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 1cec49653..0fbf17ad6 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -11,7 +11,7 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
         printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
-               (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
-               $brace_sep_color $right_brace (set_color normal)
+            (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
+            $brace_sep_color $right_brace (set_color normal)
     end
 end
diff --git a/share/functions/__fish_print_xwindows.fish b/share/functions/__fish_print_xwindows.fish
index 7eef1a6b1..ab5a4140b 100644
--- a/share/functions/__fish_print_xwindows.fish
+++ b/share/functions/__fish_print_xwindows.fish
@@ -1,3 +1,3 @@
 function __fish_print_xwindows --description 'Print X windows'
-	xwininfo -root -children | sed '/^\s\+0x/!d; /(has no name)/d; s/^\s*\(\S\+\)\s\+"\(.\+\)":\s\+(\(.*\)).*$/\1\t\2 (\3)/'
+    xwininfo -root -children | sed '/^\s\+0x/!d; /(has no name)/d; s/^\s*\(\S\+\)\s\+"\(.\+\)":\s\+(\(.*\)).*$/\1\t\2 (\3)/'
 end
diff --git a/share/functions/__fish_print_zfs_bookmarks.fish b/share/functions/__fish_print_zfs_bookmarks.fish
index edc65d448..569e7a9a4 100644
--- a/share/functions/__fish_print_zfs_bookmarks.fish
+++ b/share/functions/__fish_print_zfs_bookmarks.fish
@@ -1,5 +1,5 @@
 function __fish_print_zfs_bookmarks -d "Lists ZFS bookmarks, if the feature is enabled"
-	if __fish_is_zfs_feature_enabled 'feature@bookmarks'
-		zfs list -t bookmark -o name -H
-	end
+    if __fish_is_zfs_feature_enabled 'feature@bookmarks'
+        zfs list -t bookmark -o name -H
+    end
 end
diff --git a/share/functions/__fish_print_zfs_filesystems.fish b/share/functions/__fish_print_zfs_filesystems.fish
index 5badea5ed..8b314669d 100644
--- a/share/functions/__fish_print_zfs_filesystems.fish
+++ b/share/functions/__fish_print_zfs_filesystems.fish
@@ -1,3 +1,3 @@
 function __fish_print_zfs_filesystems -d "Lists ZFS filesystems"
-	zfs list -t filesystem -o name -H
+    zfs list -t filesystem -o name -H
 end
diff --git a/share/functions/__fish_print_zfs_snapshots.fish b/share/functions/__fish_print_zfs_snapshots.fish
index f32e38869..6f10eb628 100644
--- a/share/functions/__fish_print_zfs_snapshots.fish
+++ b/share/functions/__fish_print_zfs_snapshots.fish
@@ -1,3 +1,3 @@
 function __fish_print_zfs_snapshots -d "Lists ZFS snapshots"
-	zfs list -t snapshot -o name -H
+    zfs list -t snapshot -o name -H
 end
diff --git a/share/functions/__fish_print_zfs_volumes.fish b/share/functions/__fish_print_zfs_volumes.fish
index 3f371b64a..ec1eb5842 100644
--- a/share/functions/__fish_print_zfs_volumes.fish
+++ b/share/functions/__fish_print_zfs_volumes.fish
@@ -1,3 +1,3 @@
 function __fish_print_zfs_volumes -d "Lists ZFS volumes"
-	zfs list -t volume -o name -H
+    zfs list -t volume -o name -H
 end
diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 20fed3279..877554dfd 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -1,22 +1,22 @@
 function __fish_seen_argument
-	argparse 's/short=+' 'l/long=+' -- $argv
+    argparse 's/short=+' 'l/long=+' -- $argv
 
-	set cmd (commandline -co)
-	set -e cmd[1]
-	for t in $cmd
-		for s in $_flag_s
-			if string match -qr "^-[A-z0-9]*"$s"[A-z0-9]*\$" -- $t
-				return 0
-			end
-		end
+    set cmd (commandline -co)
+    set -e cmd[1]
+    for t in $cmd
+        for s in $_flag_s
+            if string match -qr "^-[A-z0-9]*"$s"[A-z0-9]*\$" -- $t
+                return 0
+            end
+        end
 
-		for l in $_flag_l
-			if string match -q -- "--$l" $t
-				return 0
-			end
-		end
-	end
+        for l in $_flag_l
+            if string match -q -- "--$l" $t
+                return 0
+            end
+        end
+    end
 
-	return 1
+    return 1
 end
 
diff --git a/share/functions/__fish_should_complete_switches.fish b/share/functions/__fish_should_complete_switches.fish
index 2563190fb..81a71926a 100644
--- a/share/functions/__fish_should_complete_switches.fish
+++ b/share/functions/__fish_should_complete_switches.fish
@@ -1,14 +1,14 @@
 # Returns whether we *should* complete a -s or --long argument.
 # The preference is NOT to do so, i.e. prefer subcommands over switches.
 function __fish_should_complete_switches
-	for arg in (commandline -ct)[-1..1]
-		if not string match -qr -- "^-\S*\$" "$arg"
-			return 1
-		end
-	end
-	if string match -qr -- "^-" (commandline -ct)[-1]
-		return 0
-	end
+    for arg in (commandline -ct)[-1..1]
+        if not string match -qr -- "^-\S*\$" "$arg"
+            return 1
+        end
+    end
+    if string match -qr -- "^-" (commandline -ct)[-1]
+        return 0
+    end
 
-	return 1
+    return 1
 end
diff --git a/share/functions/__fish_whatis.fish b/share/functions/__fish_whatis.fish
index 4899d99f4..2a4eebc56 100644
--- a/share/functions/__fish_whatis.fish
+++ b/share/functions/__fish_whatis.fish
@@ -1,21 +1,21 @@
 # uses `whatis` if available to describe a command
 
 function __fish_whatis
-	set -l cmd $argv[1]
-	set -l fallback
-	if set -q argv[2]
-		set fallback $argv[2]
-	end
+    set -l cmd $argv[1]
+    set -l fallback
+    if set -q argv[2]
+        set fallback $argv[2]
+    end
 
-	set -l description (whatis $cmd 2>/dev/null | string replace -r '.*? - ' '')[1]
-	if not string match -qr -- "." "$description"
-		printf '%s\n' $description
-		return 0
-	else if not string match -q -- "$fallback" ""
-		printf '%s\n' $fallback
-		return 0
-	else
-		return 1
-	end
+    set -l description (whatis $cmd 2>/dev/null | string replace -r '.*? - ' '')[1]
+    if not string match -qr -- "." "$description"
+        printf '%s\n' $description
+        return 0
+    else if not string match -q -- "$fallback" ""
+        printf '%s\n' $fallback
+        return 0
+    else
+        return 1
+    end
 end
 
diff --git a/share/functions/__terlar_git_prompt.fish b/share/functions/__terlar_git_prompt.fish
index 617ef944f..46b4c241d 100644
--- a/share/functions/__terlar_git_prompt.fish
+++ b/share/functions/__terlar_git_prompt.fish
@@ -16,7 +16,7 @@ set -g fish_prompt_git_status_renamed '➜'
 set -g fish_prompt_git_status_copied '⇒'
 set -g fish_prompt_git_status_deleted '✖'
 set -g fish_prompt_git_status_untracked '?'
-set -g fish_prompt_git_status_unmerged '!'
+set -g fish_prompt_git_status_unmerged !
 
 set -g fish_prompt_git_status_order added modified renamed copied deleted untracked unmerged
 
diff --git a/share/functions/_fish_systemctl.fish b/share/functions/_fish_systemctl.fish
index 669bd41e5..2fea85e58 100644
--- a/share/functions/_fish_systemctl.fish
+++ b/share/functions/_fish_systemctl.fish
@@ -33,23 +33,30 @@ function _fish_systemctl --description 'Call systemctl with some options from th
             help reset-failed list-dependencies list-units revert add-{wants,requires} edit
         case enable
             # This will only work for "list-unit-files", but won't print an error for "list-units".
-            set -q _flag_state; or set _flag_state disabled
+            set -q _flag_state
+            or set _flag_state disabled
         case disable
-            set -q _flag_state; or set _flag_state enabled
+            set -q _flag_state
+            or set _flag_state enabled
         case start
             # Running `start` on an already started unit isn't an _error_, but useless.
-            set -q _flag_state; or set _flag_state dead,failed
+            set -q _flag_state
+            or set _flag_state dead,failed
         case mask
-            set -q _flag_state; or set _flag_state loaded
+            set -q _flag_state
+            or set _flag_state loaded
         case unmask
-            set -q _flag_state; or set _flag_state masked
+            set -q _flag_state
+            or set _flag_state masked
         case stop kill
             # TODO: Is "kill" useful on other unit types?
             # Running as the catch-all, "mounted" for .mount units, "active" for .target.
-            set -q _flag_state; or set _flag_state running,mounted,active
+            set -q _flag_state
+            or set _flag_state running,mounted,active
         case isolate set-default
             # These only take one unit.
-            set -q argv[1]; and return
+            set -q argv[1]
+            and return
         case list-sockets
             set _flag_type socket
         case list-timers
@@ -65,11 +72,16 @@ function _fish_systemctl --description 'Call systemctl with some options from th
     end
 
     # Add the flags back so we can pass them to our systemctl invocations.
-    set -q _flag_type; and set passflags $passflags --type=$_flag_type
-    set -q _flag_state; and set passflags $passflags --state=$_flag_state
-    set -q _flag_property; and set passflags $passflags --property=$_flag_property
-    set -q _flag_machine; and set passflags $passflags --machine=$_flag_machine
-    set -q _flag_host; and set passflags $passflags --host=$_flag_host
+    set -q _flag_type
+    and set passflags $passflags --type=$_flag_type
+    set -q _flag_state
+    and set passflags $passflags --state=$_flag_state
+    set -q _flag_property
+    and set passflags $passflags --property=$_flag_property
+    set -q _flag_machine
+    and set passflags $passflags --machine=$_flag_machine
+    set -q _flag_host
+    and set passflags $passflags --host=$_flag_host
 
     # Output looks like
     # systemd-tmpfiles-clean.timer      [more whitespace] loaded    active     waiting   Daily Cleanup[...]
diff --git a/share/functions/abbr.fish b/share/functions/abbr.fish
index b328c5120..e37c1557b 100644
--- a/share/functions/abbr.fish
+++ b/share/functions/abbr.fish
@@ -53,12 +53,14 @@ function abbr --description "Manage abbreviations"
     else if set -q _flag_query[1]
         # "--query": Check if abbrs exist.
         # If we don't have an argument, it's an automatic failure.
-        set -q argv[1]; or return 1
+        set -q argv[1]
+        or return 1
         set -l escaped _fish_abbr_(string escape --style=var -- $argv)
         # We return 0 if any arg exists, whereas `set -q` returns the number of undefined arguments.
         # But we should be consistent with `type -q` and `command -q`.
         for var in $escaped
-            set -q $escaped; and return 0
+            set -q $escaped
+            and return 0
         end
         return 1
     else
diff --git a/share/functions/fish_clipboard_copy.fish b/share/functions/fish_clipboard_copy.fish
index 0054198aa..088c9c921 100644
--- a/share/functions/fish_clipboard_copy.fish
+++ b/share/functions/fish_clipboard_copy.fish
@@ -1,7 +1,8 @@
 function fish_clipboard_copy
     # Copy the current selection, or the entire commandline if that is empty.
     set -l cmdline (commandline --current-selection)
-    test -n "$cmdline"; or set cmdline (commandline)
+    test -n "$cmdline"
+    or set cmdline (commandline)
     if type -q pbcopy
         printf '%s\n' $cmdline | pbcopy
     else if type -q xsel
diff --git a/share/functions/fish_config.fish b/share/functions/fish_config.fish
index aa05fa0f0..e09a4aa24 100644
--- a/share/functions/fish_config.fish
+++ b/share/functions/fish_config.fish
@@ -3,12 +3,12 @@ function fish_config --description "Launch fish's web based configuration"
     if set -l python (__fish_anypython)
         $python "$__fish_data_dir/tools/web_config/webconfig.py" $argv
     else
-    	echo (set_color $fish_color_error)Cannot launch the web configuration tool:(set_color normal)
-    	echo (set_color -o)fish_config(set_color normal) requires Python.
-    	echo Installing python2 or python3 will fix this, and also enable completions to be
-    	echo automatically generated from man pages.\n
-    	echo To change your prompt, create a (set_color -o)fish_prompt(set_color normal) function.
-    	echo There are examples in (set_color $fish_color_valid_path)$__fish_data_dir/tools/web_config/sample_prompts(set_color normal).\n
-    	echo You can tweak your colors by setting the (set_color $fish_color_search_match)\$fish_color_\*(set_color normal) variables.
+        echo (set_color $fish_color_error)Cannot launch the web configuration tool:(set_color normal)
+        echo (set_color -o)fish_config(set_color normal) requires Python.
+        echo Installing python2 or python3 will fix this, and also enable completions to be
+        echo automatically generated from man pages.\n
+        echo To change your prompt, create a (set_color -o)fish_prompt(set_color normal) function.
+        echo There are examples in (set_color $fish_color_valid_path)$__fish_data_dir/tools/web_config/sample_prompts(set_color normal).\n
+        echo You can tweak your colors by setting the (set_color $fish_color_search_match)\$fish_color_\*(set_color normal) variables.
     end
 end
diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index cf3623bfa..eef67866a 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -454,7 +454,8 @@ function fish_git_prompt --description "Prompt function for Git"
     set b (string replace refs/heads/ '' -- $b)
     set -q __fish_git_prompt_shorten_branch_char_suffix
     or set -l __fish_git_prompt_shorten_branch_char_suffix "…"
-    if string match -qr '^\d+$' "$__fish_git_prompt_shorten_branch_len"; and test (string length "$b") -gt $__fish_git_prompt_shorten_branch_len
+    if string match -qr '^\d+$' "$__fish_git_prompt_shorten_branch_len"
+        and test (string length "$b") -gt $__fish_git_prompt_shorten_branch_len
         set b (string sub -l "$__fish_git_prompt_shorten_branch_len" "$b")"$__fish_git_prompt_shorten_branch_char_suffix"
     end
     if test -n "$b"
@@ -548,7 +549,8 @@ function __fish_git_prompt_informative_status
     set -l untrackedfiles (command git ls-files --others --exclude-standard | count)
     set -l stashstate 0
     set -l stashfile "$argv[1]/logs/refs/stash"
-    if set -q __fish_git_prompt_showstashstate; and test -e "$stashfile"
+    if set -q __fish_git_prompt_showstashstate
+        and test -e "$stashfile"
         set stashstate (count < $stashfile)
     end
 
diff --git a/share/functions/fish_hg_prompt.fish b/share/functions/fish_hg_prompt.fish
index 3ec08cf6e..8911fbfdc 100644
--- a/share/functions/fish_hg_prompt.fish
+++ b/share/functions/fish_hg_prompt.fish
@@ -16,7 +16,7 @@ set -g fish_prompt_hg_status_modified '*'
 set -g fish_prompt_hg_status_copied '⇒'
 set -g fish_prompt_hg_status_deleted '✖'
 set -g fish_prompt_hg_status_untracked '?'
-set -g fish_prompt_hg_status_unmerged '!'
+set -g fish_prompt_hg_status_unmerged !
 
 set -g fish_prompt_hg_status_order added modified copied deleted untracked unmerged
 
diff --git a/share/functions/fish_npm_helper.fish b/share/functions/fish_npm_helper.fish
index 810154c01..4686b3475 100644
--- a/share/functions/fish_npm_helper.fish
+++ b/share/functions/fish_npm_helper.fish
@@ -59,7 +59,7 @@ function __yarn_installed_packages
 
     if set -l python (__fish_anypython)
         $python -c 'import json, sys; data = json.load(sys.stdin);
-print("\n".join(data["dependencies"])); print("\n".join(data["devDependencies"]))' < $package_json 2>/dev/null
+print("\n".join(data["dependencies"])); print("\n".join(data["devDependencies"]))' <$package_json 2>/dev/null
     else if type -q jq
         jq -r '.dependencies as $a1 | .devDependencies as $a2 | ($a1 + $a2) | to_entries[] | .key' $package_json
     else
diff --git a/share/functions/fish_print_hg_root.fish b/share/functions/fish_print_hg_root.fish
index 6b28f4416..3b64609d6 100644
--- a/share/functions/fish_print_hg_root.fish
+++ b/share/functions/fish_print_hg_root.fish
@@ -19,4 +19,4 @@ function fish_print_hg_root
 
     return 1
 end
-    
+
diff --git a/share/functions/fish_svn_prompt.fish b/share/functions/fish_svn_prompt.fish
index c010cda94..bfef4661a 100644
--- a/share/functions/fish_svn_prompt.fish
+++ b/share/functions/fish_svn_prompt.fish
@@ -37,7 +37,7 @@ set -g __fish_svn_prompt_char_unversioned_external_color --underline cyan
 set -g __fish_svn_prompt_char_unversioned_display '?'
 set -g __fish_svn_prompt_char_unversioned_color purple
 
-set -g __fish_svn_prompt_char_missing_display '!'
+set -g __fish_svn_prompt_char_missing_display !
 set -g __fish_svn_prompt_char_missing_color yellow
 
 set -g __fish_svn_prompt_char_versioned_obstructed_display '~'
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 0a6c94dfd..56210688f 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -67,9 +67,10 @@ function help --description 'Show help for the fish shell'
             # If the OS appears to be Windows (graphical), try to use cygstart
             if type -q cygstart
                 set fish_browser cygstart
-            # If xdg-open is available, just use that
-            # but only if an X session is running
-            else if type -q xdg-open; and set -q -x DISPLAY
+                # If xdg-open is available, just use that
+                # but only if an X session is running
+            else if type -q xdg-open
+                and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
 
@@ -158,7 +159,7 @@ function help --description 'Show help for the fish shell'
             or set -l TMPDIR /tmp
             set -l tmpdir (mktemp -d $TMPDIR/help.XXXXXX)
             set -l tmpname $tmpdir/help.html
-            echo '<meta http-equiv="refresh" content="0;URL=\''$clean_url'\'" />' > $tmpname
+            echo '<meta http-equiv="refresh" content="0;URL=\''$clean_url'\'" />' >$tmpname
             set page_url file://$tmpname
         end
     end
@@ -166,7 +167,7 @@ function help --description 'Show help for the fish shell'
     # cmd.exe needs more coaxing.
     if string match -qr 'cmd.exe$' -- $fish_browser[1]
         $fish_browser /c "start $page_url"
-    # If browser is known to be graphical, put into background
+        # If browser is known to be graphical, put into background
     else if contains -- $fish_browser[1] $graphical_browsers
         switch $fish_browser[1]
             case 'htmlview' 'x-www-browser'
diff --git a/share/functions/ls.fish b/share/functions/ls.fish
index aab2f0e49..368c67c69 100644
--- a/share/functions/ls.fish
+++ b/share/functions/ls.fish
@@ -16,7 +16,7 @@ for opt in --color=auto -G --color -F
             command ls $opt $argv
         end
 
-        if [ $opt = --color=auto ] &&! set -qx LS_COLORS && set -l cmd (command -s {g,}dircolors)[1]
+        if [ $opt = --color=auto ] && ! set -qx LS_COLORS && set -l cmd (command -s {g,}dircolors)[1]
             set -l colorfile
             for file in ~/.dir_colors ~/.dircolors /etc/DIR_COLORS
                 if test -f $file
diff --git a/share/functions/type.fish b/share/functions/type.fish
index e779739bc..ba2b81dd4 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -61,7 +61,8 @@ function type --description 'Print the type of a command'
                         switch $func_path
                             case "n/a"
                             case "stdin"
-                                break;
+                                break
+
                             case "*"
                                 echo $func_path
                         end
diff --git a/share/tools/create_manpage_completions.py b/share/tools/create_manpage_completions.py
index bbee8d102..d87fe93f6 100755
--- a/share/tools/create_manpage_completions.py
+++ b/share/tools/create_manpage_completions.py
@@ -51,45 +51,52 @@ VERY_VERBOSE, BRIEF_VERBOSE, NOT_VERBOSE = 2, 1, 0
 global VERBOSITY, WRITE_TO_STDOUT, DEROFF_ONLY
 VERBOSITY, WRITE_TO_STDOUT, DEROFF_ONLY = NOT_VERBOSE, False, False
 
-def add_diagnostic(dgn, msg_verbosity = VERY_VERBOSE):
+
+def add_diagnostic(dgn, msg_verbosity=VERY_VERBOSE):
     # Add a diagnostic message, if msg_verbosity <= VERBOSITY
     if msg_verbosity <= VERBOSITY:
-        diagnostic_output.append('   '*diagnostic_indent + dgn)
+        diagnostic_output.append("   " * diagnostic_indent + dgn)
+
 
 def flush_diagnostics(where):
     if diagnostic_output:
-        output_str = '\n'.join(diagnostic_output) + '\n'
+        output_str = "\n".join(diagnostic_output) + "\n"
         where.write(output_str)
         diagnostic_output[:] = []
 
+
 # Make sure we don't output the same completion multiple times, which can happen
 # For example, xsubpp.1.gz and xsubpp5.10.1.gz
 # This maps commands to lists of completions
 already_output_completions = {}
 
+
 def compile_and_search(regex, input):
-    options_section_regex = re.compile(regex , re.DOTALL)
-    options_section_matched = re.search( options_section_regex, input)
+    options_section_regex = re.compile(regex, re.DOTALL)
+    options_section_matched = re.search(options_section_regex, input)
     return options_section_matched
 
+
 def unquote_double_quotes(data):
-    if (len(data) < 2):
+    if len(data) < 2:
         return data
-    if data[0] == '"' and data[len(data)-1] == '"':
-        data = data[1:len(data)-1]
+    if data[0] == '"' and data[len(data) - 1] == '"':
+        data = data[1 : len(data) - 1]
     return data
 
+
 def unquote_single_quotes(data):
-    if (len(data) < 2):
+    if len(data) < 2:
         return data
-    if data[0] == '`' and data[len(data)-1] == '\'':
-        data = data[1:len(data)-1]
+    if data[0] == "`" and data[len(data) - 1] == "'":
+        data = data[1 : len(data) - 1]
     return data
 
 
 # Make a string of characters that are deemed safe in fish without needing to be escaped
 # Note that space is not included
-g_fish_safe_chars = frozenset(string.ascii_letters + string.digits + '_+-|/:=@~')
+g_fish_safe_chars = frozenset(string.ascii_letters + string.digits + "_+-|/:=@~")
+
 
 def fish_escape_single_quote(str):
     # Escape a string if necessary so that it can be put in single quotes
@@ -97,55 +104,61 @@ def fish_escape_single_quote(str):
     if g_fish_safe_chars.issuperset(str):
         return str
 
-    str = str.replace('\\', '\\\\') # Replace one backslash with two
-    str = str.replace("'", "\\'") # Replace one single quote with a backslash-single-quote
+    str = str.replace("\\", "\\\\")  # Replace one backslash with two
+    str = str.replace(
+        "'", "\\'"
+    )  # Replace one single quote with a backslash-single-quote
     return "'" + str + "'"
 
+
 # Make a string Unicode by attempting to decode it as latin-1, or UTF8. See #658
 def lossy_unicode(s):
     # All strings are unicode in Python 3
-    if IS_PY3 or isinstance(s, unicode): return s
+    if IS_PY3 or isinstance(s, unicode):
+        return s
     try:
-        return s.decode('latin-1')
+        return s.decode("latin-1")
     except UnicodeEncodeError:
         pass
     try:
-        return s.decode('utf-8')
+        return s.decode("utf-8")
     except UnicodeEncodeError:
         pass
-    return s.decode('latin-1', 'ignore')
+    return s.decode("latin-1", "ignore")
 
 
 def output_complete_command(cmdname, args, description, output_list):
-    comps = ['complete -c', cmdname]
+    comps = ["complete -c", cmdname]
     comps.extend(args)
     if description:
-        comps.append('--description')
+        comps.append("--description")
         comps.append(description)
-    output_list.append(lossy_unicode(' ').join([lossy_unicode(c) for c in comps]))
+    output_list.append(lossy_unicode(" ").join([lossy_unicode(c) for c in comps]))
+
 
 def built_command(options, description):
-#    print "Options are: ", options
-    man_optionlist = re.split(" |,|\"|=|[|]", options)
+    #    print "Options are: ", options
+    man_optionlist = re.split(' |,|"|=|[|]', options)
     fish_options = []
     for optionstr in man_optionlist:
         option = re.sub(r"(\[.*\])", "", optionstr)
         option = option.strip(" \t\r\n[](){}.,:!")
 
-
         # Skip some problematic cases
-        if option in ['-', '--']: continue
-        if any(c in "{}()" for c in option): continue
+        if option in ["-", "--"]:
+            continue
+        if any(c in "{}()" for c in option):
+            continue
 
-        if option.startswith('--'):
+        if option.startswith("--"):
             # New style long option (--recursive)
-            fish_options.append('-l ' + fish_escape_single_quote(option[2:]))
-        elif option.startswith('-') and len(option) == 2:
+            fish_options.append("-l " + fish_escape_single_quote(option[2:]))
+        elif option.startswith("-") and len(option) == 2:
             # New style short option (-r)
-            fish_options.append('-s ' + fish_escape_single_quote(option[1:]))
-        elif option.startswith('-') and len(option) > 2:
+            fish_options.append("-s " + fish_escape_single_quote(option[1:]))
+        elif option.startswith("-") and len(option) > 2:
             # Old style long option (-recursive)
-            fish_options.append('-o ' + fish_escape_single_quote(option[1:]))
+            fish_options.append("-o " + fish_escape_single_quote(option[1:]))
 
     # Determine which options are new (not already in existing_options)
     # Then add those to the existing options
@@ -154,12 +167,13 @@ def built_command(options, description):
     existing_options.update(fish_options)
 
     # Maybe it's all for naught
-    if not fish_options: return
+    if not fish_options:
+        return
 
     # Here's what we'll use to truncate if necessary
     max_description_width = 78
     if IS_PY3:
-        truncation_suffix = '…'
+        truncation_suffix = "…"
     else:
         ELLIPSIS_CODE_POINT = 0x2026
         truncation_suffix = unichr(ELLIPSIS_CODE_POINT)
@@ -167,20 +181,24 @@ def built_command(options, description):
     # Try to include as many whole sentences as will fit
     # Clean up some probably bogus escapes in the process
     clean_desc = description.replace("\\'", "'").replace("\\.", ".")
-    sentences = clean_desc.split('.')
+    sentences = clean_desc.split(".")
 
     # Clean up "sentences" that are just whitespace
     # But don't let it be empty
     sentences = [x for x in sentences if x.strip()]
-    if not sentences: sentences = ['']
+    if not sentences:
+        sentences = [""]
 
-    udot = lossy_unicode('.')
-    uspace = lossy_unicode(' ')
+    udot = lossy_unicode(".")
+    uspace = lossy_unicode(" ")
 
     truncated_description = lossy_unicode(sentences[0]) + udot
     for line in sentences[1:]:
-        if not line: continue
-        proposed_description = lossy_unicode(truncated_description) + uspace + lossy_unicode(line) + udot
+        if not line:
+            continue
+        proposed_description = (
+            lossy_unicode(truncated_description) + uspace + lossy_unicode(line) + udot
+        )
         if len(proposed_description) <= max_description_width:
             # It fits
             truncated_description = proposed_description
@@ -197,32 +215,36 @@ def built_command(options, description):
     truncated_description = fish_escape_single_quote(truncated_description)
     escaped_cmd = fish_escape_single_quote(CMDNAME)
 
-    output_complete_command(escaped_cmd, fish_options, truncated_description, built_command_output)
+    output_complete_command(
+        escaped_cmd, fish_options, truncated_description, built_command_output
+    )
+
 
 def remove_groff_formatting(data):
-    data = data.replace("\\fI","")
-    data = data.replace("\\fP","")
-    data = data.replace("\\f1","")
-    data = data.replace("\\fB","")
-    data = data.replace("\\fR","")
-    data = data.replace("\\e","")
-    data = re.sub(".PD( \d+)","",data)
-    data = data.replace(".BI","")
-    data = data.replace(".BR","")
-    data = data.replace("0.5i","")
-    data = data.replace(".rb","")
-    data = data.replace("\\^","")
-    data = data.replace("{ ","")
-    data = data.replace(" }","")
-    data = data.replace("\ ","")
-    data = data.replace("\-","-")
-    data = data.replace("\&","")
-    data = data.replace(".B","")
-    data = data.replace("\-","-")
-    data = data.replace(".I","")
-    data = data.replace("\f","")
+    data = data.replace("\\fI", "")
+    data = data.replace("\\fP", "")
+    data = data.replace("\\f1", "")
+    data = data.replace("\\fB", "")
+    data = data.replace("\\fR", "")
+    data = data.replace("\\e", "")
+    data = re.sub(".PD( \d+)", "", data)
+    data = data.replace(".BI", "")
+    data = data.replace(".BR", "")
+    data = data.replace("0.5i", "")
+    data = data.replace(".rb", "")
+    data = data.replace("\\^", "")
+    data = data.replace("{ ", "")
+    data = data.replace(" }", "")
+    data = data.replace("\ ", "")
+    data = data.replace("\-", "-")
+    data = data.replace("\&", "")
+    data = data.replace(".B", "")
+    data = data.replace("\-", "-")
+    data = data.replace(".I", "")
+    data = data.replace("\f", "")
     return data
 
+
 class ManParser(object):
     def is_my_type(self, manpage):
         return False
@@ -230,10 +252,11 @@ class ManParser(object):
     def parse_man_page(self, manpage):
         return False
 
+
 class Type1ManParser(ManParser):
     def is_my_type(self, manpage):
         #   print manpage
-        options_section_matched = compile_and_search("\.SH \"OPTIONS\"(.*?)", manpage)
+        options_section_matched = compile_and_search('\.SH "OPTIONS"(.*?)', manpage)
 
         if options_section_matched == None:
             return False
@@ -241,8 +264,8 @@ class Type1ManParser(ManParser):
             return True
 
     def parse_man_page(self, manpage):
-        options_section_regex = re.compile( "\.SH \"OPTIONS\"(.*?)(\.SH|\Z)", re.DOTALL)
-        options_section_matched = re.search( options_section_regex, manpage)
+        options_section_regex = re.compile('\.SH "OPTIONS"(.*?)(\.SH|\Z)', re.DOTALL)
+        options_section_matched = re.search(options_section_regex, manpage)
 
         options_section = options_section_matched.group(0)
         #   print options_section
@@ -252,104 +275,105 @@ class Type1ManParser(ManParser):
         add_diagnostic("Command is %r" % CMDNAME)
 
         if options_matched == None:
-            add_diagnostic('Unable to find options')
-            if( self.fallback(options_section) ):
+            add_diagnostic("Unable to find options")
+            if self.fallback(options_section):
                 return True
-            elif (self.fallback2(options_section) ):
+            elif self.fallback2(options_section):
                 return True
             return False
 
-        while (options_matched != None):
+        while options_matched != None:
             data = options_matched.group(1)
             last_dotpp_index = data.rfind(".PP")
-            if (last_dotpp_index != -1):
-                data = data[last_dotpp_index+3:]
+            if last_dotpp_index != -1:
+                data = data[last_dotpp_index + 3 :]
 
             data = remove_groff_formatting(data)
             data = data.split(".RS 4")
-            if (len (data) > 1): #and len(data[1]) <= 300):
+            if len(data) > 1:  # and len(data[1]) <= 300):
                 optionName = data[0].strip()
 
-                if ( optionName.find("-") == -1):
+                if optionName.find("-") == -1:
                     add_diagnostic("%r doesn't contain '-' " % optionName)
                 else:
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
 
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
                 return False
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
 
     def fallback(self, options_section):
-        add_diagnostic('Trying fallback')
+        add_diagnostic("Trying fallback")
         options_parts_regex = re.compile("\.TP( \d+)?(.*?)\.TP", re.DOTALL)
         options_matched = re.search(options_parts_regex, options_section)
         if options_matched == None:
-            add_diagnostic('Still not found')
+            add_diagnostic("Still not found")
             return False
         while options_matched != None:
             data = options_matched.group(2)
             data = remove_groff_formatting(data)
             data = data.strip()
-            data = data.split("\n",1)
-            if (len(data)>1 and len(data[1].strip())>0): # and len(data[1])<400):
+            data = data.split("\n", 1)
+            if len(data) > 1 and len(data[1].strip()) > 0:  # and len(data[1])<400):
                 optionName = data[0].strip()
-                if ( optionName.find("-") == -1):
+                if optionName.find("-") == -1:
                     add_diagnostic("%r doesn't contain '-'" % optionName)
                 else:
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
                 return False
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
         return True
 
     def fallback2(self, options_section):
-        add_diagnostic('Trying last chance fallback')
+        add_diagnostic("Trying last chance fallback")
         ix_remover_regex = re.compile("\.IX.*")
-        trailing_num_regex = re.compile('\\d+$')
+        trailing_num_regex = re.compile("\\d+$")
         options_parts_regex = re.compile("\.IP (.*?)\.IP", re.DOTALL)
 
         options_section = re.sub(ix_remover_regex, "", options_section)
         options_matched = re.search(options_parts_regex, options_section)
         if options_matched == None:
-            add_diagnostic('Still (still!) not found')
+            add_diagnostic("Still (still!) not found")
             return False
         while options_matched != None:
             data = options_matched.group(1)
 
             data = remove_groff_formatting(data)
             data = data.strip()
-            data = data.split("\n",1)
-            if (len(data)>1 and len(data[1].strip())>0): # and len(data[1])<400):
+            data = data.split("\n", 1)
+            if len(data) > 1 and len(data[1].strip()) > 0:  # and len(data[1])<400):
                 optionName = re.sub(trailing_num_regex, "", data[0].strip())
 
-                if ('-' not in optionName):
+                if "-" not in optionName:
                     add_diagnostic("%r doesn't contain '-'" % optionName)
                 else:
                     optionName = optionName.strip()
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
                 return False
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
         return True
 
+
 class Type2ManParser(ManParser):
     def is_my_type(self, manpage):
         options_section_matched = compile_and_search("\.SH OPTIONS(.*?)", manpage)
@@ -360,40 +384,42 @@ class Type2ManParser(ManParser):
             return True
 
     def parse_man_page(self, manpage):
-        options_section_regex = re.compile( "\.SH OPTIONS(.*?)(\.SH|\Z)", re.DOTALL)
-        options_section_matched = re.search( options_section_regex, manpage)
+        options_section_regex = re.compile("\.SH OPTIONS(.*?)(\.SH|\Z)", re.DOTALL)
+        options_section_matched = re.search(options_section_regex, manpage)
 
         options_section = options_section_matched.group(1)
 
-        options_parts_regex = re.compile("\.[I|T]P( \d+(\.\d)?i?)?(.*?)\.([I|T]P|UNINDENT)", re.DOTALL)
+        options_parts_regex = re.compile(
+            "\.[I|T]P( \d+(\.\d)?i?)?(.*?)\.([I|T]P|UNINDENT)", re.DOTALL
+        )
         options_matched = re.search(options_parts_regex, options_section)
-        add_diagnostic('Command is %r' % CMDNAME)
+        add_diagnostic("Command is %r" % CMDNAME)
 
         if options_matched == None:
             add_diagnostic("%r: Unable to find options" % self)
             return False
 
-        while (options_matched != None):
+        while options_matched != None:
             data = options_matched.group(3)
 
             data = remove_groff_formatting(data)
 
             data = data.strip()
 
-            data = data.split("\n",1)
-            if (len(data)>1 and len(data[1].strip())>0): # and len(data[1])<400):
+            data = data.split("\n", 1)
+            if len(data) > 1 and len(data[1].strip()) > 0:  # and len(data[1])<400):
                 optionName = data[0].strip()
-                if '-' not in optionName:
+                if "-" not in optionName:
                     add_diagnostic("%r doesn't contain '-'" % optionName)
                 else:
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
 
 
@@ -407,8 +433,8 @@ class Type3ManParser(ManParser):
             return True
 
     def parse_man_page(self, manpage):
-        options_section_regex = re.compile( "\.SH DESCRIPTION(.*?)(\.SH|\Z)", re.DOTALL)
-        options_section_matched = re.search( options_section_regex, manpage)
+        options_section_regex = re.compile("\.SH DESCRIPTION(.*?)(\.SH|\Z)", re.DOTALL)
+        options_section_matched = re.search(options_section_regex, manpage)
 
         options_section = options_section_matched.group(1)
         options_parts_regex = re.compile("\.TP(.*?)\.TP", re.DOTALL)
@@ -416,37 +442,39 @@ class Type3ManParser(ManParser):
         add_diagnostic("Command is %r" % CMDNAME)
 
         if options_matched == None:
-            add_diagnostic('Unable to find options section')
+            add_diagnostic("Unable to find options section")
             return False
 
-        while (options_matched != None):
+        while options_matched != None:
             data = options_matched.group(1)
 
             data = remove_groff_formatting(data)
             data = data.strip()
-            data = data.split("\n",1)
+            data = data.split("\n", 1)
 
-            if (len(data)>1): # and len(data[1])<400):
+            if len(data) > 1:  # and len(data[1])<400):
                 optionName = data[0].strip()
-                if ( optionName.find("-") == -1):
+                if optionName.find("-") == -1:
                     add_diagnostic("%r doesn't contain '-'" % optionName)
                 else:
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
 
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
                 return False
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
 
 
 class Type4ManParser(ManParser):
     def is_my_type(self, manpage):
-        options_section_matched = compile_and_search("\.SH FUNCTION LETTERS(.*?)", manpage)
+        options_section_matched = compile_and_search(
+            "\.SH FUNCTION LETTERS(.*?)", manpage
+        )
 
         if options_section_matched == None:
             return False
@@ -454,8 +482,10 @@ class Type4ManParser(ManParser):
             return True
 
     def parse_man_page(self, manpage):
-        options_section_regex = re.compile( "\.SH FUNCTION LETTERS(.*?)(\.SH|\Z)", re.DOTALL)
-        options_section_matched = re.search( options_section_regex, manpage)
+        options_section_regex = re.compile(
+            "\.SH FUNCTION LETTERS(.*?)(\.SH|\Z)", re.DOTALL
+        )
+        options_section_matched = re.search(options_section_regex, manpage)
 
         options_section = options_section_matched.group(1)
         options_parts_regex = re.compile("\.TP(.*?)\.TP", re.DOTALL)
@@ -463,35 +493,36 @@ class Type4ManParser(ManParser):
         add_diagnostic("Command is %r" % CMDNAME)
 
         if options_matched == None:
-            print >> sys.stderr, "Unable to find options section"
+            print >>sys.stderr, "Unable to find options section"
             return False
 
-        while (options_matched != None):
+        while options_matched != None:
             data = options_matched.group(1)
 
             data = remove_groff_formatting(data)
             data = data.strip()
-            data = data.split("\n",1)
+            data = data.split("\n", 1)
 
-            if (len(data)>1): # and len(data[1])<400):
+            if len(data) > 1:  # and len(data[1])<400):
                 optionName = data[0].strip()
-                if ( optionName.find("-") == -1):
+                if optionName.find("-") == -1:
                     add_diagnostic("%r doesn't contain '-' " % optionName)
                 else:
                     optionName = unquote_double_quotes(optionName)
                     optionName = unquote_single_quotes(optionName)
-                    optionDescription = data[1].strip().replace("\n"," ")
+                    optionDescription = data[1].strip().replace("\n", " ")
                     built_command(optionName, optionDescription)
 
             else:
-                add_diagnostic('Unable to split option from description')
+                add_diagnostic("Unable to split option from description")
                 return False
 
-            options_section = options_section[options_matched.end()-3:]
+            options_section = options_section[options_matched.end() - 3 :]
             options_matched = re.search(options_parts_regex, options_section)
 
         return True
 
+
 class TypeDarwinManParser(ManParser):
     def is_my_type(self, manpage):
         options_section_matched = compile_and_search("\.S[hH] DESCRIPTION", manpage)
@@ -499,15 +530,15 @@ class TypeDarwinManParser(ManParser):
 
     def trim_groff(self, line):
         # Remove initial period
-        if line.startswith('.'):
+        if line.startswith("."):
             line = line[1:]
         # Skip leading groff crud
-        while re.match('[A-Z][a-z]\s', line):
+        while re.match("[A-Z][a-z]\s", line):
             line = line[3:]
 
         # If the line ends with a space and then a period or comma, then erase the space
         # This hack handles lines of the form '.Ar projectname .'
-        if line.endswith(' ,') or line.endswith(' .'):
+        if line.endswith(" ,") or line.endswith(" ."):
             line = line[:-2] + line[-1]
         return line
 
@@ -516,28 +547,31 @@ class TypeDarwinManParser(ManParser):
         # Look for the start of a line, followed by a dot, then a sequence of
         # one or more dashes ('Fl')
         result = 0
-        if line.startswith('.'):
+        if line.startswith("."):
             line = line[4:]
-            while line.startswith('Fl '):
+            while line.startswith("Fl "):
                 result = result + 1
                 line = line[3:]
         return result
 
     # Replace some groff escapes. There's a lot we don't bother to handle.
     def groff_replace_escapes(self, line):
-        line = line.replace('.Nm', CMDNAME)
-        line = line.replace('\\ ', ' ')
-        line = line.replace('\& ', '')
+        line = line.replace(".Nm", CMDNAME)
+        line = line.replace("\\ ", " ")
+        line = line.replace("\& ", "")
         return line
 
     def is_option(self, line):
-        return line.startswith('.It Fl')
+        return line.startswith(".It Fl")
 
     def parse_man_page(self, manpage):
         got_something = False
-        lines =  manpage.splitlines()
+        lines = manpage.splitlines()
         # Discard lines until we get to ".sh Description"
-        while lines and not (lines[0].startswith('.Sh DESCRIPTION') or lines[0].startswith('.SH DESCRIPTION')):
+        while lines and not (
+            lines[0].startswith(".Sh DESCRIPTION")
+            or lines[0].startswith(".SH DESCRIPTION")
+        ):
             lines.pop(0)
 
         while lines:
@@ -557,7 +591,8 @@ class TypeDarwinManParser(ManParser):
             line = self.groff_replace_escapes(line)
             line = self.trim_groff(line)
             line = line.strip()
-            if not line: continue
+            if not line:
+                continue
 
             # Extract the name
             name = line.split(None, 2)[0]
@@ -567,24 +602,24 @@ class TypeDarwinManParser(ManParser):
             while lines and not self.is_option(lines[0]):
                 line = lossy_unicode(lines.pop(0).strip())
                 # Ignore comments
-                if line.startswith(r'.\"'):
+                if line.startswith(r".\""):
                     continue
-                if line.startswith('.'):
+                if line.startswith("."):
                     line = self.groff_replace_escapes(line)
                     line = self.trim_groff(line).strip()
                 if line:
                     desc_lines.append(line)
-            desc = ' '.join(desc_lines)
+            desc = " ".join(desc_lines)
 
-            if name == '-':
+            if name == "-":
                 # Skip double -- arguments
                 continue
             elif len(name) > 1:
                 # Output the command
-                built_command(('-' * dash_count) + name, desc)
+                built_command(("-" * dash_count) + name, desc)
                 got_something = True
             elif len(name) == 1:
-                built_command('-' + name, desc)
+                built_command("-" + name, desc)
                 got_something = True
 
         return got_something
@@ -592,30 +627,34 @@ class TypeDarwinManParser(ManParser):
 
 class TypeDeroffManParser(ManParser):
     def is_my_type(self, manpage):
-        return True # We're optimists
+        return True  # We're optimists
 
     def is_option(self, line):
-        return line.startswith('-')
+        return line.startswith("-")
 
     def could_be_description(self, line):
-        return len(line) > 0 and not line.startswith('-')
+        return len(line) > 0 and not line.startswith("-")
 
     def parse_man_page(self, manpage):
         d = Deroffer()
         d.deroff(manpage)
         output = d.get_output()
-        lines = output.split('\n')
+        lines = output.split("\n")
 
         got_something = False
 
         # Discard lines until we get to DESCRIPTION or OPTIONS
-        while lines and not (lines[0].startswith('DESCRIPTION') or lines[0].startswith('OPTIONS') or lines[0].startswith('COMMAND OPTIONS')):
+        while lines and not (
+            lines[0].startswith("DESCRIPTION")
+            or lines[0].startswith("OPTIONS")
+            or lines[0].startswith("COMMAND OPTIONS")
+        ):
             lines.pop(0)
 
         # Look for BUGS and stop there
         for idx in range(len(lines)):
             line = lines[idx]
-            if line.startswith('BUGS'):
+            if line.startswith("BUGS"):
                 # Drop remaining elements
                 lines[idx:] = []
                 break
@@ -631,9 +670,10 @@ class TypeDeroffManParser(ManParser):
             options = lines.pop(0)
 
             # Pop until we get to either an empty line or a line starting with -
-            description = ''
+            description = ""
             while lines and self.could_be_description(lines[0]):
-                if description: description += ' '
+                if description:
+                    description += " "
                 description += lines.pop(0)
 
             built_command(options, description)
@@ -641,6 +681,7 @@ class TypeDeroffManParser(ManParser):
 
         return got_something
 
+
 # Return whether the file at the given path is overwritable
 # Raises IOError if it cannot be opened
 def file_is_overwritable(path):
@@ -653,23 +694,25 @@ def file_is_overwritable(path):
             continue
 
         # We look in the initial run of lines that start with #
-        if not line.startswith('#'):
+        if not line.startswith("#"):
             break
 
         # See if this contains the magic word
-        if 'Autogenerated' in line:
+        if "Autogenerated" in line:
             result = True
             break
 
     file.close()
     return result
 
+
 # Remove any and all autogenerated completions in the given directory
 def cleanup_autogenerated_completions_in_directory(dir):
     try:
         for filename in os.listdir(dir):
             # Skip non .fish files
-            if not filename.endswith('.fish'): continue
+            if not filename.endswith(".fish"):
+                continue
             path = os.path.join(dir, filename)
             cleanup_autogenerated_file(path)
     except OSError as err:
@@ -684,6 +727,7 @@ def cleanup_autogenerated_file(path):
     except (OSError, IOError):
         pass
 
+
 def parse_manpage_at_path(manpage_path, output_directory):
     filename = os.path.basename(manpage_path)
 
@@ -693,28 +737,31 @@ def parse_manpage_at_path(manpage_path, output_directory):
     diagnostic_indent = 0
 
     # Set up some diagnostics
-    add_diagnostic('Considering ' + manpage_path)
+    add_diagnostic("Considering " + manpage_path)
     diagnostic_indent += 1
 
-    if manpage_path.endswith('.gz'):
-        fd = gzip.open(manpage_path, 'r')
+    if manpage_path.endswith(".gz"):
+        fd = gzip.open(manpage_path, "r")
         manpage = fd.read()
-        if IS_PY3: manpage = manpage.decode('latin-1')
-    elif manpage_path.endswith('.bz2'):
-        fd = bz2.BZ2File(manpage_path, 'r')
+        if IS_PY3:
+            manpage = manpage.decode("latin-1")
+    elif manpage_path.endswith(".bz2"):
+        fd = bz2.BZ2File(manpage_path, "r")
         manpage = fd.read()
-        if IS_PY3: manpage = manpage.decode('latin-1')
-    elif manpage_path.endswith('.xz') or manpage_path.endswith('.lzma'):
+        if IS_PY3:
+            manpage = manpage.decode("latin-1")
+    elif manpage_path.endswith(".xz") or manpage_path.endswith(".lzma"):
         if not lzma_available:
             return
-        fd = lzma.LZMAFile(str(manpage_path), 'r')
+        fd = lzma.LZMAFile(str(manpage_path), "r")
         manpage = fd.read()
-        if IS_PY3: manpage = manpage.decode('latin-1')
+        if IS_PY3:
+            manpage = manpage.decode("latin-1")
     elif manpage_path.endswith((".1", ".2", ".3", ".4", ".5", ".6", ".7", ".8", ".9")):
         if IS_PY3:
-            fd = open(manpage_path, 'r', encoding='latin-1')
+            fd = open(manpage_path, "r", encoding="latin-1")
         else:
-            fd = open(manpage_path, 'r')
+            fd = open(manpage_path, "r")
         manpage = fd.read()
     else:
         return
@@ -723,19 +770,30 @@ def parse_manpage_at_path(manpage_path, output_directory):
     manpage = str(manpage)
 
     # Get the "base" command, e.g. gcc.1.gz -> gcc
-    cmd_base = CMDNAME.split('.', 1)[0]
-    ignoredcommands = ["cc", "g++", "gcc", "c++", "cpp", "emacs", "gprof", "wget", "ld", "awk"]
+    cmd_base = CMDNAME.split(".", 1)[0]
+    ignoredcommands = [
+        "cc",
+        "g++",
+        "gcc",
+        "c++",
+        "cpp",
+        "emacs",
+        "gprof",
+        "wget",
+        "ld",
+        "awk",
+    ]
     if cmd_base in ignoredcommands:
         return
 
     # Ignore perl's gazillion man pages
-    ignored_prefixes = ['perl', 'zsh']
+    ignored_prefixes = ["perl", "zsh"]
     for prefix in ignored_prefixes:
         if cmd_base.startswith(prefix):
             return
 
     # Ignore the millions of links to BUILTIN(1)
-    if 'BUILTIN 1' in manpage or 'builtin.1' in manpage:
+    if "BUILTIN 1" in manpage or "builtin.1" in manpage:
         return
 
     # Clear the output list
@@ -744,7 +802,14 @@ def parse_manpage_at_path(manpage_path, output_directory):
     if DEROFF_ONLY:
         parsers = [TypeDeroffManParser()]
     else:
-        parsers = [Type1ManParser(), Type2ManParser(), Type4ManParser(), Type3ManParser(), TypeDarwinManParser(), TypeDeroffManParser()]
+        parsers = [
+            Type1ManParser(),
+            Type2ManParser(),
+            Type4ManParser(),
+            Type3ManParser(),
+            TypeDarwinManParser(),
+            TypeDeroffManParser(),
+        ]
     parsersToTry = [p for p in parsers if p.is_my_type(manpage)]
 
     success = False
@@ -752,7 +817,7 @@ def parse_manpage_at_path(manpage_path, output_directory):
         add_diagnostic(manpage_path + ": Not supported")
     else:
         for parser in parsersToTry:
-            add_diagnostic('Trying %s' % parser.__class__.__name__)
+            add_diagnostic("Trying %s" % parser.__class__.__name__)
             diagnostic_indent += 1
             success = parser.parse_man_page(manpage)
             diagnostic_indent -= 1
@@ -767,33 +832,43 @@ def parse_manpage_at_path(manpage_path, output_directory):
             if WRITE_TO_STDOUT:
                 output_file = sys.stdout
             else:
-                fullpath = os.path.join(output_directory, CMDNAME + '.fish')
+                fullpath = os.path.join(output_directory, CMDNAME + ".fish")
                 try:
                     output_file = codecs.open(fullpath, "w", encoding="utf-8")
                 except IOError as err:
-                    add_diagnostic("Unable to open file '%s': error(%d): %s" % (fullpath, err.errno, err.strerror))
+                    add_diagnostic(
+                        "Unable to open file '%s': error(%d): %s"
+                        % (fullpath, err.errno, err.strerror)
+                    )
                     return False
 
             built_command_output.insert(0, "# " + CMDNAME)
 
             # Output the magic word Autogenerated so we can tell if we can overwrite this
-            built_command_output.insert(1, "# Autogenerated from man page " + manpage_path)
+            built_command_output.insert(
+                1, "# Autogenerated from man page " + manpage_path
+            )
             # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
 
             for line in built_command_output:
                 output_file.write(line)
-                output_file.write('\n')
-            output_file.write('\n')
-            add_diagnostic(manpage_path + ' parsed successfully')
+                output_file.write("\n")
+            output_file.write("\n")
+            add_diagnostic(manpage_path + " parsed successfully")
             if output_file != sys.stdout:
                 output_file.close()
         else:
-            parser_names =  ', '.join(p.__class__.__name__ for p in parsersToTry)
-            #add_diagnostic('%s contains no options or is unparsable' % manpage_path, BRIEF_VERBOSE)
-            add_diagnostic('%s contains no options or is unparsable (tried parser %s)' % (manpage_path, parser_names), BRIEF_VERBOSE)
+            parser_names = ", ".join(p.__class__.__name__ for p in parsersToTry)
+            # add_diagnostic('%s contains no options or is unparsable' % manpage_path, BRIEF_VERBOSE)
+            add_diagnostic(
+                "%s contains no options or is unparsable (tried parser %s)"
+                % (manpage_path, parser_names),
+                BRIEF_VERBOSE,
+            )
 
     return success
 
+
 def parse_and_output_man_pages(paths, output_directory, show_progress):
     global diagnostic_indent, CMDNAME
     paths.sort()
@@ -802,14 +877,18 @@ def parse_and_output_man_pages(paths, output_directory, show_progress):
     padding_len = len(str(total_count))
     last_progress_string_length = 0
     if show_progress and not WRITE_TO_STDOUT:
-        print("Parsing man pages and writing completions to {0}".format(output_directory))
+        print(
+            "Parsing man pages and writing completions to {0}".format(output_directory)
+        )
 
     man_page_suffixes = set([os.path.splitext(m)[1][1:] for m in paths])
     lzma_xz_occurs = "xz" in man_page_suffixes or "lzma" in man_page_suffixes
     if lzma_xz_occurs and not lzma_available:
-        add_diagnostic('At least one man page is compressed with lzma or xz, but the "lzma" module is not available.'
-                       ' Any man page compressed with either will be skipped.',
-                       NOT_VERBOSE)
+        add_diagnostic(
+            'At least one man page is compressed with lzma or xz, but the "lzma" module is not available.'
+            " Any man page compressed with either will be skipped.",
+            NOT_VERBOSE,
+        )
         flush_diagnostics(sys.stderr)
 
     for manpage_path in paths:
@@ -817,12 +896,14 @@ def parse_and_output_man_pages(paths, output_directory, show_progress):
 
         # Get the "base" command, e.g. gcc.1.gz -> gcc
         man_file_name = os.path.basename(manpage_path)
-        CMDNAME = man_file_name.split('.', 1)[0]
-        output_file_name = CMDNAME + '.fish'
+        CMDNAME = man_file_name.split(".", 1)[0]
+        output_file_name = CMDNAME + ".fish"
 
         # Show progress if we're doing that
         if show_progress:
-            progress_str = '  {0} / {1} : {2}'.format((str(index).rjust(padding_len)), total_count, man_file_name)
+            progress_str = "  {0} / {1} : {2}".format(
+                (str(index).rjust(padding_len)), total_count, man_file_name
+            )
             # Pad on the right with spaces so we overwrite whatever we wrote last time
             padded_progress_str = progress_str.ljust(last_progress_string_length)
             last_progress_string_length = len(progress_str)
@@ -844,52 +925,64 @@ def parse_and_output_man_pages(paths, output_directory, show_progress):
                 successful_count += 1
         except IOError:
             diagnostic_indent = 0
-            add_diagnostic('Cannot open ' + manpage_path)
+            add_diagnostic("Cannot open " + manpage_path)
         except (KeyboardInterrupt, SystemExit):
             raise
         except:
-            add_diagnostic('Error parsing %s: %s' % (manpage_path, sys.exc_info()[0]), BRIEF_VERBOSE)
+            add_diagnostic(
+                "Error parsing %s: %s" % (manpage_path, sys.exc_info()[0]),
+                BRIEF_VERBOSE,
+            )
             flush_diagnostics(sys.stderr)
             traceback.print_exc(file=sys.stderr)
         flush_diagnostics(sys.stderr)
-    print("") #Newline after loop
-    add_diagnostic("Successfully parsed %d / %d pages" % (successful_count, total_count), BRIEF_VERBOSE)
+    print("")  # Newline after loop
+    add_diagnostic(
+        "Successfully parsed %d / %d pages" % (successful_count, total_count),
+        BRIEF_VERBOSE,
+    )
     flush_diagnostics(sys.stderr)
 
+
 def get_paths_from_man_locations():
     # Return all the paths to man(1) and man(8) files in the manpath
     import subprocess, os
+
     proc = None
     # $MANPATH takes precedence, just like with `man` on the CLI.
     if os.getenv("MANPATH"):
-        parent_paths = os.getenv("MANPATH").strip().split(':')
+        parent_paths = os.getenv("MANPATH").strip().split(":")
     else:
         # Some systems have manpath, others have `man --path` (like Haiku).
-        for prog in [['manpath'], ['man', '--path']]:
+        for prog in [["manpath"], ["man", "--path"]]:
             try:
-                proc = subprocess.Popen(prog, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            except OSError: # Command does not exist, keep trying
+                proc = subprocess.Popen(
+                    prog, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+                )
+            except OSError:  # Command does not exist, keep trying
                 continue
-            break # Command exists, use it.
+            break  # Command exists, use it.
         manpath, err_data = proc.communicate()
-        parent_paths = manpath.decode().strip().split(':')
+        parent_paths = manpath.decode().strip().split(":")
     if (not parent_paths) or (proc and proc.returncode > 0):
         # HACK: Use some fallbacks in case we can't get anything else.
         # `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set.
         # The alternative is reading its config file (/etc/man.conf)
-        if os.path.isfile('/etc/man.conf'):
-            data = open('/etc/man.conf', 'r')
+        if os.path.isfile("/etc/man.conf"):
+            data = open("/etc/man.conf", "r")
             for line in data:
-                if ('manpath' in line or 'MANPATH' in line):
-                    p = line.split(' ')[1]
+                if "manpath" in line or "MANPATH" in line:
+                    p = line.split(" ")[1]
                     p = p.split()[0]
                     parent_paths.append(p)
-        if (not parent_paths):
-            sys.stderr.write("Unable to get the manpath, falling back to /usr/share/man:/usr/local/share/man. Please set $MANPATH if that is not correct.\n")
+        if not parent_paths:
+            sys.stderr.write(
+                "Unable to get the manpath, falling back to /usr/share/man:/usr/local/share/man. Please set $MANPATH if that is not correct.\n"
+            )
         parent_paths = ["/usr/share/man", "/usr/local/share/man"]
     result = []
     for parent_path in parent_paths:
-        for section in ['man1', 'man6', 'man8']:
+        for section in ["man1", "man6", "man8"]:
             directory_path = os.path.join(parent_path, section)
             try:
                 names = os.listdir(directory_path)
@@ -900,23 +993,43 @@ def get_paths_from_man_locations():
                 result.append(os.path.join(directory_path, name))
     return result
 
+
 def usage(script_name):
-    print("Usage: {0} [-v, --verbose] [-s, --stdout] [-d, --directory] [-p, --progress] files...".format(script_name))
-    print("""Command options are:
+    print(
+        "Usage: {0} [-v, --verbose] [-s, --stdout] [-d, --directory] [-p, --progress] files...".format(
+            script_name
+        )
+    )
+    print(
+        """Command options are:
      -h, --help\t\tShow this help message
      -v, --verbose [0, 1, 2]\tShow debugging output to stderr. Larger is more verbose.
      -s, --stdout\tWrite all completions to stdout (trumps the --directory option)
      -d, --directory [dir]\tWrite all completions to the given directory, instead of to ~/.local/share/fish/generated_completions
      -m, --manpath\tProcess all man1 and man8 files available in the manpath (as determined by manpath)
      -p, --progress\tShow progress
-    """)
+    """
+    )
+
 
 if __name__ == "__main__":
     script_name = sys.argv[0]
     try:
-        opts, file_paths = getopt.gnu_getopt(sys.argv[1:], 'v:sd:hmpc:z', ['verbose=', 'stdout', 'directory=', 'cleanup-in=', 'help', 'manpath', 'progress'])
+        opts, file_paths = getopt.gnu_getopt(
+            sys.argv[1:],
+            "v:sd:hmpc:z",
+            [
+                "verbose=",
+                "stdout",
+                "directory=",
+                "cleanup-in=",
+                "help",
+                "manpath",
+                "progress",
+            ],
+        )
     except getopt.GetoptError as err:
-        print(err.msg) # will print something like "option -a not recognized"
+        print(err.msg)  # will print something like "option -a not recognized"
         usage(script_name)
         sys.exit(2)
 
@@ -926,24 +1039,24 @@ if __name__ == "__main__":
     cleanup_directories = []
 
     use_manpath, show_progress, custom_dir = False, False, False
-    output_directory = ''
+    output_directory = ""
     for opt, value in opts:
-        if opt in ('-v', '--verbose'):
+        if opt in ("-v", "--verbose"):
             VERBOSITY = int(value)
-        elif opt in ('-s', '--stdout'):
+        elif opt in ("-s", "--stdout"):
             WRITE_TO_STDOUT = True
-        elif opt in ('-d', '--directory'):
+        elif opt in ("-d", "--directory"):
             output_directory = value
-        elif opt in ('-h', '--help'):
+        elif opt in ("-h", "--help"):
             usage(script_name)
             sys.exit(0)
-        elif opt in ('-m', '--manpath'):
+        elif opt in ("-m", "--manpath"):
             use_manpath = True
-        elif opt in ('-p', '--progress'):
+        elif opt in ("-p", "--progress"):
             show_progress = True
-        elif opt in ('-c', '--cleanup-in'):
+        elif opt in ("-c", "--cleanup-in"):
             cleanup_directories.append(value)
-        elif opt in ('-z',):
+        elif opt in ("-z",):
             DEROFF_ONLY = True
         else:
             assert False, "unhandled option"
@@ -963,8 +1076,10 @@ if __name__ == "__main__":
     if not WRITE_TO_STDOUT and not output_directory:
         # Default to ~/.local/share/fish/generated_completions/
         # Create it if it doesn't exist
-        xdg_data_home = os.getenv('XDG_DATA_HOME', '~/.local/share')
-        output_directory = os.path.expanduser(xdg_data_home + '/fish/generated_completions/')
+        xdg_data_home = os.getenv("XDG_DATA_HOME", "~/.local/share")
+        output_directory = os.path.expanduser(
+            xdg_data_home + "/fish/generated_completions/"
+        )
         try:
             os.makedirs(output_directory)
         except OSError as e:
diff --git a/share/tools/deroff.py b/share/tools/deroff.py
index ac3d89650..84d20e544 100755
--- a/share/tools/deroff.py
+++ b/share/tools/deroff.py
@@ -6,291 +6,297 @@ import sys, re, string
 
 IS_PY3 = sys.version_info[0] >= 3
 
+
 class Deroffer:
 
     g_specs_specletter = {
         # Output composed latin1 letters
-        '-D': '\320',
-        'Sd': '\360',
-        'Tp': '\376',
-        'TP': '\336',
-        'AE': '\306',
-        'ae': '\346',
-        'OE': "OE",
-        'oe': "oe",
-        ':a': '\344',
-        ':A': '\304',
-        ':e': '\353',
-        ':E': '\313',
-        ':i': '\357',
-        ':I': '\317',
-        ':o': '\366',
-        ':O': '\326',
-        ':u': '\374',
-        ':U': '\334',
-        ':y': '\377',
-        'ss': '\337',
-        '\'A': '\301',
-        '\'E': '\311',
-        '\'I': '\315',
-        '\'O': '\323',
-        '\'U': '\332',
-        '\'Y': '\335',
-        '\'a': '\341',
-        '\'e': '\351',
-        '\'i': '\355',
-        '\'o': '\363',
-        '\'u': '\372',
-        '\'y': '\375',
-        '^A': '\302',
-        '^E': '\312',
-        '^I': '\316',
-        '^O': '\324',
-        '^U': '\333',
-        '^a': '\342',
-        '^e': '\352',
-        '^i': '\356',
-        '^o': '\364',
-        '^u': '\373',
-        '`A': '\300',
-        '`E': '\310',
-        '`I': '\314',
-        '`O': '\322',
-        '`U': '\331',
-        '`a': '\340',
-        '`e': '\350',
-        '`i': '\354',
-        '`o': '\362',
-        '`u': '\371',
-        '~A': '\303',
-        '~N': '\321',
-        '~O': '\325',
-        '~a': '\343',
-        '~n': '\361',
-        '~o': '\365',
-        ',C': '\307',
-        ',c': '\347',
-        '/l': "/l",
-        '/L': "/L",
-        '/o': '\370',
-        '/O': '\330',
-        'oA': '\305',
-        'oa': '\345',
-
+        "-D": "\320",
+        "Sd": "\360",
+        "Tp": "\376",
+        "TP": "\336",
+        "AE": "\306",
+        "ae": "\346",
+        "OE": "OE",
+        "oe": "oe",
+        ":a": "\344",
+        ":A": "\304",
+        ":e": "\353",
+        ":E": "\313",
+        ":i": "\357",
+        ":I": "\317",
+        ":o": "\366",
+        ":O": "\326",
+        ":u": "\374",
+        ":U": "\334",
+        ":y": "\377",
+        "ss": "\337",
+        "'A": "\301",
+        "'E": "\311",
+        "'I": "\315",
+        "'O": "\323",
+        "'U": "\332",
+        "'Y": "\335",
+        "'a": "\341",
+        "'e": "\351",
+        "'i": "\355",
+        "'o": "\363",
+        "'u": "\372",
+        "'y": "\375",
+        "^A": "\302",
+        "^E": "\312",
+        "^I": "\316",
+        "^O": "\324",
+        "^U": "\333",
+        "^a": "\342",
+        "^e": "\352",
+        "^i": "\356",
+        "^o": "\364",
+        "^u": "\373",
+        "`A": "\300",
+        "`E": "\310",
+        "`I": "\314",
+        "`O": "\322",
+        "`U": "\331",
+        "`a": "\340",
+        "`e": "\350",
+        "`i": "\354",
+        "`o": "\362",
+        "`u": "\371",
+        "~A": "\303",
+        "~N": "\321",
+        "~O": "\325",
+        "~a": "\343",
+        "~n": "\361",
+        "~o": "\365",
+        ",C": "\307",
+        ",c": "\347",
+        "/l": "/l",
+        "/L": "/L",
+        "/o": "\370",
+        "/O": "\330",
+        "oA": "\305",
+        "oa": "\345",
         # Ligatures
-        'fi': 'fi',
-        'ff': 'ff',
-        'fl': 'fl',
-
-        'Fi': 'ffi',
-        'Ff': 'fff',
-        'Fl': 'ffl'
+        "fi": "fi",
+        "ff": "ff",
+        "fl": "fl",
+        "Fi": "ffi",
+        "Ff": "fff",
+        "Fl": "ffl",
     }
 
     g_specs = {
-        'mi': '-',
-        'en': '-',
-        'hy': '-',
-        'em': "--",
-        'lq': '“',
-        'rq': '”',
-        'Bq': ",,",
-        'oq': '`',
-        'cq': '\'',
-        'aq': '\'',
-        'dq': '"',
-        'or': '|',
-        'at': '@',
-        'sh': '#',
-        'Eu': '\244',
-        'eu': '\244',
-        'Do': '$',
-        'ct': '\242',
-        'Fo': '\253',
-        'Fc': '\273',
-        'fo': '<',
-        'fc': '>',
-        'r!': '\241',
-        'r?': '\277',
-        'Of': '\252',
-        'Om': '\272',
-        'pc': '\267',
-        'S1': '\271',
-        'S2': '\262',
-        'S3': '\263',
-        '<-': "<-",
-        '->': "->",
-        '<>': "<->",
-        'ua': '^',
-        'da': 'v',
-        'lA': "<=",
-        'rA': "=>",
-        'hA': "<=>",
-        'uA': "^^",
-        'dA': "vv",
-        'ba': '|',
-        'bb': '|',
-        'br': '|',
-        'bv': '|',
-        'ru': '_',
-        'ul': '_',
-        'ci': 'O',
-        'bu': 'o',
-        'co': '\251',
-        'rg': '\256',
-        'tm': "(TM)",
-        'dd': "||",
-        'dg': '|',
-        'ps': '\266',
-        'sc': '\247',
-        'de': '\260',
-        '%0': "0/00",
-        '14': '\274',
-        '12': '\275',
-        '34': '\276',
-        'f/': '/',
-        'sl': '/',
-        'rs': '\\',
-        'sq': "[]",
-        'fm': '\'',
-        'ha': '^',
-        'ti': '~',
-        'lB': '[',
-        'rB': ']',
-        'lC': '{',
-        'rC': '}',
-        'la': '<',
-        'ra': '>',
-        'lh': "<=",
-        'rh': "=>",
-        'tf': "therefore",
-        '~~': "~~",
-        '~=': "~=",
-        '!=': "!=",
-        '**': '*',
-        '+-': '\261',
-        '<=': "<=",
-        '==': "==",
-        '=~': "=~",
-        '>=': ">=",
-        'AN': "\\/",
-        'OR': "/\\",
-        'no': '\254',
-        'te': "there exists",
-        'fa': "for all",
-        'Ah': "aleph",
-        'Im': "imaginary",
-        'Re': "real",
-        'if': "infinity",
-        'md': "\267",
-        'mo': "member of",
-        'mu': '\327',
-        'nm': "not member of",
-        'pl': '+',
-        'eq': '=',
-        'pt': "oc",
-        'pp': "perpendicular",
-        'sb': "(=",
-        'sp': "=)",
-        'ib': "(-",
-        'ip': "-)",
-        'ap': '~',
-        'is': 'I',
-        'sr': "root",
-        'pd': 'd',
-        'c*': "(x)",
-        'c+': "(+)",
-        'ca': "cap",
-        'cu': 'U',
-        'di': '\367',
-        'gr': 'V',
-        'es': "{}",
-        'CR': "_|",
-        'st': "such that",
-        '/_': "/_",
-        'lz': "<>",
-        'an': '-',
-
+        "mi": "-",
+        "en": "-",
+        "hy": "-",
+        "em": "--",
+        "lq": "“",
+        "rq": "”",
+        "Bq": ",,",
+        "oq": "`",
+        "cq": "'",
+        "aq": "'",
+        "dq": '"',
+        "or": "|",
+        "at": "@",
+        "sh": "#",
+        "Eu": "\244",
+        "eu": "\244",
+        "Do": "$",
+        "ct": "\242",
+        "Fo": "\253",
+        "Fc": "\273",
+        "fo": "<",
+        "fc": ">",
+        "r!": "\241",
+        "r?": "\277",
+        "Of": "\252",
+        "Om": "\272",
+        "pc": "\267",
+        "S1": "\271",
+        "S2": "\262",
+        "S3": "\263",
+        "<-": "<-",
+        "->": "->",
+        "<>": "<->",
+        "ua": "^",
+        "da": "v",
+        "lA": "<=",
+        "rA": "=>",
+        "hA": "<=>",
+        "uA": "^^",
+        "dA": "vv",
+        "ba": "|",
+        "bb": "|",
+        "br": "|",
+        "bv": "|",
+        "ru": "_",
+        "ul": "_",
+        "ci": "O",
+        "bu": "o",
+        "co": "\251",
+        "rg": "\256",
+        "tm": "(TM)",
+        "dd": "||",
+        "dg": "|",
+        "ps": "\266",
+        "sc": "\247",
+        "de": "\260",
+        "%0": "0/00",
+        "14": "\274",
+        "12": "\275",
+        "34": "\276",
+        "f/": "/",
+        "sl": "/",
+        "rs": "\\",
+        "sq": "[]",
+        "fm": "'",
+        "ha": "^",
+        "ti": "~",
+        "lB": "[",
+        "rB": "]",
+        "lC": "{",
+        "rC": "}",
+        "la": "<",
+        "ra": ">",
+        "lh": "<=",
+        "rh": "=>",
+        "tf": "therefore",
+        "~~": "~~",
+        "~=": "~=",
+        "!=": "!=",
+        "**": "*",
+        "+-": "\261",
+        "<=": "<=",
+        "==": "==",
+        "=~": "=~",
+        ">=": ">=",
+        "AN": "\\/",
+        "OR": "/\\",
+        "no": "\254",
+        "te": "there exists",
+        "fa": "for all",
+        "Ah": "aleph",
+        "Im": "imaginary",
+        "Re": "real",
+        "if": "infinity",
+        "md": "\267",
+        "mo": "member of",
+        "mu": "\327",
+        "nm": "not member of",
+        "pl": "+",
+        "eq": "=",
+        "pt": "oc",
+        "pp": "perpendicular",
+        "sb": "(=",
+        "sp": "=)",
+        "ib": "(-",
+        "ip": "-)",
+        "ap": "~",
+        "is": "I",
+        "sr": "root",
+        "pd": "d",
+        "c*": "(x)",
+        "c+": "(+)",
+        "ca": "cap",
+        "cu": "U",
+        "di": "\367",
+        "gr": "V",
+        "es": "{}",
+        "CR": "_|",
+        "st": "such that",
+        "/_": "/_",
+        "lz": "<>",
+        "an": "-",
         # Output Greek
-        '*A': "Alpha",
-        '*B': "Beta",
-        '*C': "Xi",
-        '*D': "Delta",
-        '*E': "Epsilon",
-        '*F': "Phi",
-        '*G': "Gamma",
-        '*H': "Theta",
-        '*I': "Iota",
-        '*K': "Kappa",
-        '*L': "Lambda",
-        '*M': "Mu",
-        '*N': "Nu",
-        '*O': "Omicron",
-        '*P': "Pi",
-        '*Q': "Psi",
-        '*R': "Rho",
-        '*S': "Sigma",
-        '*T': "Tau",
-        '*U': "Upsilon",
-        '*W': "Omega",
-        '*X': "Chi",
-        '*Y': "Eta",
-        '*Z': "Zeta",
-        '*a': "alpha",
-        '*b': "beta",
-        '*c': "xi",
-        '*d': "delta",
-        '*e': "epsilon",
-        '*f': "phi",
-        '+f': "phi",
-        '*g': "gamma",
-        '*h': "theta",
-        '+h': "theta",
-        '*i': "iota",
-        '*k': "kappa",
-        '*l': "lambda",
-        '*m': "\265",
-        '*n': "nu",
-        '*o': "omicron",
-        '*p': "pi",
-        '+p': "omega",
-        '*q': "psi",
-        '*r': "rho",
-        '*s': "sigma",
-        '*t': "tau",
-        '*u': "upsilon",
-        '*w': "omega",
-        '*x': "chi",
-        '*y': "eta",
-        '*z': "zeta",
-        'ts': "sigma",
+        "*A": "Alpha",
+        "*B": "Beta",
+        "*C": "Xi",
+        "*D": "Delta",
+        "*E": "Epsilon",
+        "*F": "Phi",
+        "*G": "Gamma",
+        "*H": "Theta",
+        "*I": "Iota",
+        "*K": "Kappa",
+        "*L": "Lambda",
+        "*M": "Mu",
+        "*N": "Nu",
+        "*O": "Omicron",
+        "*P": "Pi",
+        "*Q": "Psi",
+        "*R": "Rho",
+        "*S": "Sigma",
+        "*T": "Tau",
+        "*U": "Upsilon",
+        "*W": "Omega",
+        "*X": "Chi",
+        "*Y": "Eta",
+        "*Z": "Zeta",
+        "*a": "alpha",
+        "*b": "beta",
+        "*c": "xi",
+        "*d": "delta",
+        "*e": "epsilon",
+        "*f": "phi",
+        "+f": "phi",
+        "*g": "gamma",
+        "*h": "theta",
+        "+h": "theta",
+        "*i": "iota",
+        "*k": "kappa",
+        "*l": "lambda",
+        "*m": "\265",
+        "*n": "nu",
+        "*o": "omicron",
+        "*p": "pi",
+        "+p": "omega",
+        "*q": "psi",
+        "*r": "rho",
+        "*s": "sigma",
+        "*t": "tau",
+        "*u": "upsilon",
+        "*w": "omega",
+        "*x": "chi",
+        "*y": "eta",
+        "*z": "zeta",
+        "ts": "sigma",
     }
 
-    g_re_word = re.compile(r'[a-zA-Z_]+') # equivalent to the word() method
-    g_re_number = re.compile(r'[+-]?\d+') # equivalent to the number() method
-    g_re_esc_char = re.compile(r"""([a-zA-Z_]) |   # Word
+    g_re_word = re.compile(r"[a-zA-Z_]+")  # equivalent to the word() method
+    g_re_number = re.compile(r"[+-]?\d+")  # equivalent to the number() method
+    g_re_esc_char = re.compile(
+        r"""([a-zA-Z_]) |   # Word
                                    ([+-]?\d)   |   # Number
                                    \\              # Backslash (for escape seq)
-                               """, re.VERBOSE)
+                               """,
+        re.VERBOSE,
+    )
 
-    g_re_not_backslash_or_whitespace = re.compile(r'[^ \t\n\r\f\v\\]+') # Match a sequence of not backslash or whitespace
+    g_re_not_backslash_or_whitespace = re.compile(
+        r"[^ \t\n\r\f\v\\]+"
+    )  # Match a sequence of not backslash or whitespace
 
-    g_re_newline_collapse = re.compile(r'\n{3,}')
+    g_re_newline_collapse = re.compile(r"\n{3,}")
 
-    g_re_font = re.compile(r"""\\f(         # Starts with backslash f
+    g_re_font = re.compile(
+        r"""\\f(         # Starts with backslash f
                                (\(\S{2}) |  # Open paren, then two printable chars
                                (\[\S*?\]) |  # Open bracket, zero or more printable characters, then close bracket
                                \S)          # Any printable character
-                            """,  re.VERBOSE)
+                            """,
+        re.VERBOSE,
+    )
 
     # This gets filled in in __init__ below
     g_macro_dict = False
 
     def __init__(self):
         self.reg_table = {}
-        self.tr_from = ''
-        self.tr_to = ''
-        self.tr = ''
+        self.tr_from = ""
+        self.tr_to = ""
+        self.tr = ""
         self.nls = 2
         self.specletter = False
         self.refer = False
@@ -301,13 +307,13 @@ class Deroffer:
         self.pic = False
         self.tbl = False
         self.tblstate = 0
-        self.tblTab = ''
+        self.tblTab = ""
         self.eqn = False
         self.skipheaders = False
         self.skiplists = False
         self.ignore_sonx = False
         self.output = []
-        self.name = ''
+        self.name = ""
 
         self.OPTIONS = 0
         self.FORMAT = 1
@@ -317,49 +323,49 @@ class Deroffer:
 
         if not Deroffer.g_macro_dict:
             Deroffer.g_macro_dict = {
-                'SH': Deroffer.macro_sh,
-                'SS': Deroffer.macro_ss_ip,
-                'IP': Deroffer.macro_ss_ip,
-                'H ': Deroffer.macro_ss_ip,
-                'I ': Deroffer.macro_i_ir,
-                'IR': Deroffer.macro_i_ir,
-                'IB': Deroffer.macro_i_ir,
-                'B ': Deroffer.macro_i_ir,
-                'BR': Deroffer.macro_i_ir,
-                'BI': Deroffer.macro_i_ir,
-                'R ': Deroffer.macro_i_ir,
-                'RB': Deroffer.macro_i_ir,
-                'RI': Deroffer.macro_i_ir,
-                'AB': Deroffer.macro_i_ir,
-                'Nm': Deroffer.macro_Nm,
-                '] ': Deroffer.macro_close_bracket,
-                'PS': Deroffer.macro_ps,
-                'PE': Deroffer.macro_pe,
-                'TS': Deroffer.macro_ts,
-                'T&': Deroffer.macro_t_and,
-                'TE': Deroffer.macro_te,
-                'EQ': Deroffer.macro_eq,
-                'EN': Deroffer.macro_en,
-                'R1': Deroffer.macro_r1,
-                'R2': Deroffer.macro_r2,
-                'de': Deroffer.macro_de,
-                'BL': Deroffer.macro_bl_vl,
-                'VL': Deroffer.macro_bl_vl,
-                'AL': Deroffer.macro_bl_vl,
-                'LB': Deroffer.macro_bl_vl,
-                'RL': Deroffer.macro_bl_vl,
-                'ML': Deroffer.macro_bl_vl,
-                'DL': Deroffer.macro_bl_vl,
-                'BV': Deroffer.macro_bv,
-                'LE': Deroffer.macro_le,
-                'LP': Deroffer.macro_lp_pp,
-                'PP': Deroffer.macro_lp_pp,
-                'P\n': Deroffer.macro_lp_pp,
-                'ds': Deroffer.macro_ds,
-                'so': Deroffer.macro_so_nx,
-                'nx': Deroffer.macro_so_nx,
-                'tr': Deroffer.macro_tr,
-                'sp': Deroffer.macro_sp
+                "SH": Deroffer.macro_sh,
+                "SS": Deroffer.macro_ss_ip,
+                "IP": Deroffer.macro_ss_ip,
+                "H ": Deroffer.macro_ss_ip,
+                "I ": Deroffer.macro_i_ir,
+                "IR": Deroffer.macro_i_ir,
+                "IB": Deroffer.macro_i_ir,
+                "B ": Deroffer.macro_i_ir,
+                "BR": Deroffer.macro_i_ir,
+                "BI": Deroffer.macro_i_ir,
+                "R ": Deroffer.macro_i_ir,
+                "RB": Deroffer.macro_i_ir,
+                "RI": Deroffer.macro_i_ir,
+                "AB": Deroffer.macro_i_ir,
+                "Nm": Deroffer.macro_Nm,
+                "] ": Deroffer.macro_close_bracket,
+                "PS": Deroffer.macro_ps,
+                "PE": Deroffer.macro_pe,
+                "TS": Deroffer.macro_ts,
+                "T&": Deroffer.macro_t_and,
+                "TE": Deroffer.macro_te,
+                "EQ": Deroffer.macro_eq,
+                "EN": Deroffer.macro_en,
+                "R1": Deroffer.macro_r1,
+                "R2": Deroffer.macro_r2,
+                "de": Deroffer.macro_de,
+                "BL": Deroffer.macro_bl_vl,
+                "VL": Deroffer.macro_bl_vl,
+                "AL": Deroffer.macro_bl_vl,
+                "LB": Deroffer.macro_bl_vl,
+                "RL": Deroffer.macro_bl_vl,
+                "ML": Deroffer.macro_bl_vl,
+                "DL": Deroffer.macro_bl_vl,
+                "BV": Deroffer.macro_bv,
+                "LE": Deroffer.macro_le,
+                "LP": Deroffer.macro_lp_pp,
+                "PP": Deroffer.macro_lp_pp,
+                "P\n": Deroffer.macro_lp_pp,
+                "ds": Deroffer.macro_ds,
+                "so": Deroffer.macro_so_nx,
+                "nx": Deroffer.macro_so_nx,
+                "tr": Deroffer.macro_tr,
+                "sp": Deroffer.macro_sp,
             }
 
     def flush_output(self, where):
@@ -368,8 +374,8 @@ class Deroffer:
         self.output[:] = []
 
     def get_output(self):
-        res = ''.join(self.output)
-        clean_res = Deroffer.g_re_newline_collapse.sub('\n', res)
+        res = "".join(self.output)
+        clean_res = Deroffer.g_re_newline_collapse.sub("\n", res)
         return clean_res
 
     def putchar(self, c):
@@ -378,17 +384,31 @@ class Deroffer:
 
     # This gets swapped in in place of condputs the first time tr gets modified
     def condputs_tr(self, str):
-        special = self.pic or self.eqn or self.refer or self.macro or (self.skiplists and self.inlist) or (self.skipheaders and self.inheader)
+        special = (
+            self.pic
+            or self.eqn
+            or self.refer
+            or self.macro
+            or (self.skiplists and self.inlist)
+            or (self.skipheaders and self.inheader)
+        )
         if not special:
             self.output.append(str.translate(self.tr))
 
     def condputs(self, str):
-        special = self.pic or self.eqn or self.refer or self.macro or (self.skiplists and self.inlist) or (self.skipheaders and self.inheader)
+        special = (
+            self.pic
+            or self.eqn
+            or self.refer
+            or self.macro
+            or (self.skiplists and self.inlist)
+            or (self.skipheaders and self.inheader)
+        )
         if not special:
             self.output.append(str)
 
     def str_at(self, idx):
-        return self.s[idx:idx+1]
+        return self.s[idx : idx + 1]
 
     def skip_char(self, amt=1):
         self.s = self.s[amt:]
@@ -398,32 +418,35 @@ class Deroffer:
 
     def is_white(self, idx):
         # Note this returns false for empty strings (idx >= len(self.s))
-        return self.s[idx:idx+1].isspace()
+        return self.s[idx : idx + 1].isspace()
 
     def str_eq(offset, other, len):
-        return self.s[offset:offset+len] == other[:len]
+        return self.s[offset : offset + len] == other[:len]
 
     def prch(self, idx):
         # Note that this return False for the empty string (idx >= len(self.s))
-        ch = self.s[idx:idx+1]
-        return ch not in ' \t\n'
+        ch = self.s[idx : idx + 1]
+        return ch not in " \t\n"
 
     def font(self):
         match = Deroffer.g_re_font.match(self.s)
-        if not match: return False
+        if not match:
+            return False
         self.skip_char(match.end())
         return True
 
     def font2(self):
-        if self.s[0:2] == '\\f':
+        if self.s[0:2] == "\\f":
             c = self.str_at(2)
-            if c == '(' and self.prch(3) and self.prch(4):
+            if c == "(" and self.prch(3) and self.prch(4):
                 self.skip_char(5)
                 return True
-            elif c == '[':
+            elif c == "[":
                 self.skip_char(2)
-                while self.prch(0) and self.str_at(0) != ']': self.skip_char()
-                if self.str_at(0) == ']': self.skip_char()
+                while self.prch(0) and self.str_at(0) != "]":
+                    self.skip_char()
+                if self.str_at(0) == "]":
+                    self.skip_char()
             elif self.prch(2):
                 self.skip_char(3)
                 return True
@@ -431,50 +454,51 @@ class Deroffer:
 
     def comment(self):
         # Here we require that the string start with \"
-        while self.str_at(0) and self.str_at(0) != '\n': self.skip_char()
+        while self.str_at(0) and self.str_at(0) != "\n":
+            self.skip_char()
         return True
 
     def numreq(self):
         # We require that the string starts with backslash
-        if self.str_at(1) in 'hvwud' and self.str_at(2) == '\'':
+        if self.str_at(1) in "hvwud" and self.str_at(2) == "'":
             self.macro += 1
             self.skip_char(3)
-            while self.str_at(0) != '\'' and self.esc_char():
-                pass # Weird
-            if self.str_at(0) == '\'':
+            while self.str_at(0) != "'" and self.esc_char():
+                pass  # Weird
+            if self.str_at(0) == "'":
                 self.skip_char()
             self.macro -= 1
             return True
         return False
 
     def var(self):
-        reg = ''
+        reg = ""
         s0s1 = self.s[0:2]
-        if s0s1 == '\\n':
-            if self.s[3:5] == 'dy':
+        if s0s1 == "\\n":
+            if self.s[3:5] == "dy":
                 self.skip_char(5)
                 return True
-            elif self.str_at(2) == '(' and self.prch(3) and self.prch(4):
+            elif self.str_at(2) == "(" and self.prch(3) and self.prch(4):
                 self.skip_char(5)
                 return True
-            elif self.str_at(2) == '[' and self.prch(3):
+            elif self.str_at(2) == "[" and self.prch(3):
                 self.skip_char(3)
-                while self.str_at(0) and self.str_at(0) != ']':
+                while self.str_at(0) and self.str_at(0) != "]":
                     self.skip_char()
                 return True
             elif self.prch(2):
                 self.skip_char(3)
                 return True
-        elif s0s1 == '\\*':
-            if self.str_at(2) == '(' and self.prch(3) and self.prch(4):
+        elif s0s1 == "\\*":
+            if self.str_at(2) == "(" and self.prch(3) and self.prch(4):
                 reg = self.s[3:5]
                 self.skip_char(5)
-            elif self.str_at(2) == '[' and self.prch(3):
+            elif self.str_at(2) == "[" and self.prch(3):
                 self.skip_char(3)
-                while self.str_at(0) and self.str_at(0) != ']':
+                while self.str_at(0) and self.str_at(0) != "]":
                     reg = reg + self.str_at(0)
                     self.skip_char()
-                if self.s[0:1] == ']':
+                if self.s[0:1] == "]":
                     self.skip_char()
                 else:
                     return False
@@ -493,15 +517,16 @@ class Deroffer:
 
     def size(self):
         # We require that the string starts with \s
-        if self.digit(2) or (self.str_at(2) in '-+' and self.digit(3)):
+        if self.digit(2) or (self.str_at(2) in "-+" and self.digit(3)):
             self.skip_char(3)
-            while self.digit(0): self.skip_char()
+            while self.digit(0):
+                self.skip_char()
             return True
         return False
 
     def spec(self):
         self.specletter = False
-        if self.s[0:2] == '\\(' and self.prch(2) and self.prch(3):
+        if self.s[0:2] == "\\(" and self.prch(2) and self.prch(3):
             key = self.s[2:4]
             if key in Deroffer.g_specs_specletter:
                 self.condputs(Deroffer.g_specs_specletter[key])
@@ -510,7 +535,7 @@ class Deroffer:
                 self.condputs(Deroffer.g_specs[key])
             self.skip_char(4)
             return True
-        elif self.s.startswith('\\%'):
+        elif self.s.startswith("\\%"):
             self.specletter = True
             self.skip_char(2)
             return True
@@ -520,14 +545,15 @@ class Deroffer:
     def esc(self):
         # We require that the string start with backslash
         c = self.s[1:2]
-        if not c: return False
-        if c in 'eE':
-            self.condputs('\\')
-        elif c in 't':
-            self.condputs('\t')
-        elif c in '0~':
-            self.condputs(' ')
-        elif c in '|^&:':
+        if not c:
+            return False
+        if c in "eE":
+            self.condputs("\\")
+        elif c in "t":
+            self.condputs("\t")
+        elif c in "0~":
+            self.condputs(" ")
+        elif c in "|^&:":
             pass
         else:
             self.condputs(c)
@@ -538,24 +564,25 @@ class Deroffer:
         got_something = False
         while True:
             match = Deroffer.g_re_word.match(self.s)
-            if not match: break
+            if not match:
+                break
             got_something = True
             self.condputs(match.group(0))
             self.skip_char(match.end(0))
 
             # Consume all specials
             while self.spec():
-                if not self.specletter: break
+                if not self.specletter:
+                    break
 
         return got_something
 
-
     def text(self):
         while True:
-            idx = self.s.find('\\')
+            idx = self.s.find("\\")
             if idx == -1:
                 self.condputs(self.s)
-                self.s = ''
+                self.s = ""
                 break
             else:
                 self.condputs(self.s[:idx])
@@ -567,8 +594,7 @@ class Deroffer:
 
     def letter(self, idx):
         ch = self.str_at(idx)
-        return ch.isalpha() or ch == '_' # underscore is used in C identifiers
-
+        return ch.isalpha() or ch == "_"  # underscore is used in C identifiers
 
     def digit(self, idx):
         ch = self.str_at(idx)
@@ -588,22 +614,21 @@ class Deroffer:
         c = self.s[1:2]
         if c == '"':
             return self.comment()
-        elif c == 'f':
+        elif c == "f":
             return self.font()
-        elif c == 's':
+        elif c == "s":
             return self.size()
-        elif c in 'hvwud':
+        elif c in "hvwud":
             return self.numreq()
-        elif c in 'n*':
+        elif c in "n*":
             return self.var()
-        elif c == '(':
+        elif c == "(":
             return self.spec()
         else:
             return self.esc()
 
-
     def esc_char(self):
-        if self.s[0:1] == '\\':
+        if self.s[0:1] == "\\":
             return self.esc_char_backslash()
         return self.word() or self.number()
 
@@ -643,8 +668,6 @@ class Deroffer:
                 self.skip_char()
                 got_something = True
 
-
-
     def text_arg2(self):
         if not self.esc_char():
             if self.s and not self.is_white(0):
@@ -660,10 +683,9 @@ class Deroffer:
                 else:
                     return True
 
-
     # Macro functions
     def macro_sh(self):
-        for header_str in [' SYNOPSIS', ' "SYNOPSIS', ' ‹BERSICHT', ' "‹BERSICHT']:
+        for header_str in [" SYNOPSIS", ' "SYNOPSIS', " ‹BERSICHT", ' "‹BERSICHT']:
             if self.s[2:].startswith(header_str):
                 self.inheader = True
                 break
@@ -681,10 +703,10 @@ class Deroffer:
         return False
 
     def macro_Nm(self):
-        if self.s == 'Nm\n':
+        if self.s == "Nm\n":
             self.condputs(self.name)
         else:
-            self.name = self.s[3:].strip() + ' '
+            self.name = self.s[3:].strip() + " "
         return True
 
     def macro_close_bracket(self):
@@ -692,72 +714,84 @@ class Deroffer:
         return False
 
     def macro_ps(self):
-        if self.is_white(2): self.pic = True
-        self.condputs('\n')
+        if self.is_white(2):
+            self.pic = True
+        self.condputs("\n")
         return True
 
     def macro_pe(self):
-        if self.is_white(2): self.pic = False
-        self.condputs('\n')
+        if self.is_white(2):
+            self.pic = False
+        self.condputs("\n")
         return True
 
     def macro_ts(self):
-        if self.is_white(2): self.tbl, self.tblstate = True, self.OPTIONS
-        self.condputs('\n')
+        if self.is_white(2):
+            self.tbl, self.tblstate = True, self.OPTIONS
+        self.condputs("\n")
         return True
 
     def macro_t_and(self):
-        if self.is_white(2): self.tbl, self.tblstate = True, self.FORMAT
-        self.condputs('\n')
+        if self.is_white(2):
+            self.tbl, self.tblstate = True, self.FORMAT
+        self.condputs("\n")
         return True
 
     def macro_te(self):
-        if self.is_white(2): self.tbl = False
-        self.condputs('\n')
+        if self.is_white(2):
+            self.tbl = False
+        self.condputs("\n")
         return True
 
     def macro_eq(self):
-        if self.is_white(2): self.eqn = True
-        self.condputs('\n')
+        if self.is_white(2):
+            self.eqn = True
+        self.condputs("\n")
         return True
 
     def macro_en(self):
-        if self.is_white(2): self.eqn = False
-        self.condputs('\n')
+        if self.is_white(2):
+            self.eqn = False
+        self.condputs("\n")
         return True
 
     def macro_r1(self):
-        if self.is_white(2): self.refer2 = True
-        self.condputs('\n')
+        if self.is_white(2):
+            self.refer2 = True
+        self.condputs("\n")
         return True
 
     def macro_r2(self):
-        if self.is_white(2): self.refer2 = False
-        self.condputs('\n')
+        if self.is_white(2):
+            self.refer2 = False
+        self.condputs("\n")
         return True
 
     def macro_de(self):
-        macro=True
-        self.condputs('\n')
+        macro = True
+        self.condputs("\n")
         return True
 
     def macro_bl_vl(self):
-        if self.is_white(2): self.inlist = True
-        self.condputs('\n')
+        if self.is_white(2):
+            self.inlist = True
+        self.condputs("\n")
         return True
 
     def macro_bv(self):
-        if self.str_at(2) == 'L' and self.white(self.str_at(3)): self.inlist = True
-        self.condputs('\n')
+        if self.str_at(2) == "L" and self.white(self.str_at(3)):
+            self.inlist = True
+        self.condputs("\n")
         return True
 
     def macro_le(self):
-        if self.is_white(2): self.inlist = False
-        self.condputs('\n')
+        if self.is_white(2):
+            self.inlist = False
+        self.condputs("\n")
         return True
 
     def macro_lp_pp(self):
-        self.condputs('\n')
+        self.condputs("\n")
         return True
 
     def macro_ds(self):
@@ -770,7 +804,7 @@ class Deroffer:
                 name, value = comps
                 value = value.rstrip()
                 self.reg_table[name] = value
-        self.condputs('\n')
+        self.condputs("\n")
         return True
 
     def macro_so_nx(self):
@@ -782,51 +816,52 @@ class Deroffer:
     def macro_tr(self):
         self.skip_char(2)
         self.skip_leading_whitespace()
-        while self.s and self.str_at(0) != '\n':
+        while self.s and self.str_at(0) != "\n":
             c = self.str_at(0)
             ns = self.str_at(1)
             self.skip_char(2)
-            if not ns or ns == '\n': ns = ' '
+            if not ns or ns == "\n":
+                ns = " "
             self.tr_from += c
             self.tr_to += ns
 
         # Update our table, then swap in the slower tr-savvy condputs
-        try: #Python2
+        try:  # Python2
             self.tr = string.maketrans(self.tr_from, self.tr_to)
-        except AttributeError: #Python3
+        except AttributeError:  # Python3
             self.tr = "".maketrans(self.tr_from, self.tr_to)
         self.condputs = self.condputs_tr
         return True
 
     def macro_sp(self):
-        self.condputs('\n')
+        self.condputs("\n")
         return True
 
     def macro_other(self):
-        self.condputs('\n')
+        self.condputs("\n")
         return True
 
     def request_or_macro(self):
         # s[0] is period or open single quote
         self.skip_char()
         s0 = self.s[1:2]
-        if s0 == '\\':
+        if s0 == "\\":
             if self.str_at(1) == '"':
-                self.condputs('\n')
+                self.condputs("\n")
                 return True
             else:
                 pass
-        elif s0 == '[':
+        elif s0 == "[":
             self.refer = True
-            self.condputs('\n')
+            self.condputs("\n")
             return True
-        elif s0 == ']':
+        elif s0 == "]":
             self.refer = False
             self.skip_char()
             return self.text()
-        elif s0 == '.':
+        elif s0 == ".":
             self.macro = False
-            self.condputs('\n')
+            self.condputs("\n")
             return True
 
         self.nobody = False
@@ -836,10 +871,12 @@ class Deroffer:
         if macro_func(self):
             return True
 
-        if self.skipheaders and self.nobody: return True
+        if self.skipheaders and self.nobody:
+            return True
 
         self.skip_leading_whitespace()
-        while self.s and not self.is_white(0): self.skip_char()
+        while self.s and not self.is_white(0):
+            self.skip_char()
         self.skip_leading_whitespace()
         while True:
             if not self.quoted_arg() and not self.text_arg():
@@ -849,33 +886,32 @@ class Deroffer:
                 else:
                     return True
 
-
     def request_or_macro2(self):
         self.skip_char()
         s0 = self.s[0:1]
-        if s0 == '\\':
+        if s0 == "\\":
             if self.str_at(1) == '"':
-                self.condputs('\n')
+                self.condputs("\n")
                 return True
             else:
                 pass
-        elif s0 == '[':
+        elif s0 == "[":
             self.refer = True
-            self.condputs('\n')
+            self.condputs("\n")
             return True
-        elif s0 == ']':
+        elif s0 == "]":
             self.refer = False
             self.skip_char()
             return self.text()
-        elif s0 == '.':
+        elif s0 == ".":
             self.macro = False
-            self.condputs('\n')
+            self.condputs("\n")
             return True
 
         self.nobody = False
         s0s1 = self.s[0:2]
-        if s0s1 == 'SH':
-            for header_str in [' SYNOPSIS', ' "SYNOPSIS', ' ‹BERSICHT', ' "‹BERSICHT']:
+        if s0s1 == "SH":
+            for header_str in [" SYNOPSIS", ' "SYNOPSIS', " ‹BERSICHT", ' "‹BERSICHT']:
                 if self.s[2:].startswith(header_str):
                     self.inheader = True
                     break
@@ -883,68 +919,80 @@ class Deroffer:
                 # Did not find a header string
                 self.inheader = False
                 self.nobody = True
-        elif s0s1 in ['SS', 'IP', 'H ']:
+        elif s0s1 in ["SS", "IP", "H "]:
             self.nobody = True
-        elif s0s1 in ['I ', 'IR', 'IB', 'B ', 'BR', 'BI', 'R ', 'RB', 'RI', 'AB']:
+        elif s0s1 in ["I ", "IR", "IB", "B ", "BR", "BI", "R ", "RB", "RI", "AB"]:
             pass
-        elif s0s1 in ['] ']:
+        elif s0s1 in ["] "]:
             self.refer = False
-        elif s0s1 in ['PS']:
-            if self.is_white(2): self.pic = True
-            self.condputs('\n')
+        elif s0s1 in ["PS"]:
+            if self.is_white(2):
+                self.pic = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['PE']:
-            if self.is_white(2): self.pic = False
-            self.condputs('\n')
+        elif s0s1 in ["PE"]:
+            if self.is_white(2):
+                self.pic = False
+            self.condputs("\n")
             return True
-        elif s0s1 in ['TS']:
-            if self.is_white(2): self.tbl, self.tblstate = True, self.OPTIONS
-            self.condputs('\n')
+        elif s0s1 in ["TS"]:
+            if self.is_white(2):
+                self.tbl, self.tblstate = True, self.OPTIONS
+            self.condputs("\n")
             return True
-        elif s0s1 in ['T&']:
-            if self.is_white(2): self.tbl, self.tblstate = True, self.FORMAT
-            self.condputs('\n')
+        elif s0s1 in ["T&"]:
+            if self.is_white(2):
+                self.tbl, self.tblstate = True, self.FORMAT
+            self.condputs("\n")
             return True
-        elif s0s1 in ['TE']:
-            if self.is_white(2): self.tbl = False
-            self.condputs('\n')
+        elif s0s1 in ["TE"]:
+            if self.is_white(2):
+                self.tbl = False
+            self.condputs("\n")
             return True
-        elif s0s1 in ['EQ']:
-            if self.is_white(2): self.eqn = True
-            self.condputs('\n')
+        elif s0s1 in ["EQ"]:
+            if self.is_white(2):
+                self.eqn = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['EN']:
-            if self.is_white(2): self.eqn = False
-            self.condputs('\n')
+        elif s0s1 in ["EN"]:
+            if self.is_white(2):
+                self.eqn = False
+            self.condputs("\n")
             return True
-        elif s0s1 in ['R1']:
-            if self.is_white(2): self.refer2 = True
-            self.condputs('\n')
+        elif s0s1 in ["R1"]:
+            if self.is_white(2):
+                self.refer2 = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['R2']:
-            if self.is_white(2): self.refer2 = False
-            self.condputs('\n')
+        elif s0s1 in ["R2"]:
+            if self.is_white(2):
+                self.refer2 = False
+            self.condputs("\n")
             return True
-        elif s0s1 in ['de']:
-            macro=True
-            self.condputs('\n')
+        elif s0s1 in ["de"]:
+            macro = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['BL', 'VL', 'AL', 'LB', 'RL', 'ML', 'DL']:
-            if self.is_white(2): self.inlist = True
-            self.condputs('\n')
+        elif s0s1 in ["BL", "VL", "AL", "LB", "RL", "ML", "DL"]:
+            if self.is_white(2):
+                self.inlist = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['BV']:
-            if self.str_at(2) == 'L' and self.white(self.str_at(3)): self.inlist = True
-            self.condputs('\n')
+        elif s0s1 in ["BV"]:
+            if self.str_at(2) == "L" and self.white(self.str_at(3)):
+                self.inlist = True
+            self.condputs("\n")
             return True
-        elif s0s1 in ['LE']:
-            if self.is_white(2): self.inlist = False
-            self.condputs('\n')
+        elif s0s1 in ["LE"]:
+            if self.is_white(2):
+                self.inlist = False
+            self.condputs("\n")
             return True
-        elif s0s1 in ['LP', 'PP', 'P\n']:
-            self.condputs('\n')
+        elif s0s1 in ["LP", "PP", "P\n"]:
+            self.condputs("\n")
             return True
-        elif s0s1 in ['ds']:
+        elif s0s1 in ["ds"]:
             self.skip_char(2)
             self.skip_leading_whitespace()
             if self.str_at(0):
@@ -954,43 +1002,46 @@ class Deroffer:
                     name, value = comps
                     value = value.rstrip()
                     self.reg_table[name] = value
-            self.condputs('\n')
+            self.condputs("\n")
             return True
-        elif s0s1 in ['so', 'nx']:
+        elif s0s1 in ["so", "nx"]:
             # We always ignore include directives
             # deroff.c for some reason allowed this to fall through to the 'tr' case
             # I think that was just a bug so I won't replicate it
             return True
-        elif s0s1 in ['tr']:
+        elif s0s1 in ["tr"]:
             self.skip_char(2)
             self.skip_leading_whitespace()
-            while self.s and self.str_at(0) != '\n':
+            while self.s and self.str_at(0) != "\n":
                 c = self.str_at(0)
                 ns = self.str_at(1)
                 self.skip_char(2)
-                if not ns or ns == '\n': ns = ' '
+                if not ns or ns == "\n":
+                    ns = " "
                 self.tr_from += c
                 self.tr_to += ns
 
             # Update our table, then swap in the slower tr-savvy condputs
-            try: #Python2
+            try:  # Python2
                 self.tr = string.maketrans(self.tr_from, self.tr_to)
-            except AttributeError: #Python3
+            except AttributeError:  # Python3
                 self.tr = "".maketrans(self.tr_from, self.tr_to)
             self.condputs = self.condputs_tr
 
             return True
-        elif s0s1 in ['sp']:
-            self.condputs('\n')
+        elif s0s1 in ["sp"]:
+            self.condputs("\n")
             return True
         else:
-            self.condputs('\n')
+            self.condputs("\n")
             return True
 
-        if self.skipheaders and self.nobody: return True
+        if self.skipheaders and self.nobody:
+            return True
 
         self.skip_leading_whitespace()
-        while self.s and not self.is_white(0): self.skip_char()
+        while self.s and not self.is_white(0):
+            self.skip_char()
         self.skip_leading_whitespace()
         while True:
             if not self.quoted_arg() and not self.text_arg():
@@ -1000,61 +1051,63 @@ class Deroffer:
                 else:
                     return True
 
-
     def do_tbl(self):
         if self.tblstate == self.OPTIONS:
-            while self.s and self.str_at(0) != ';' and self.str_at(0) != '\n':
+            while self.s and self.str_at(0) != ";" and self.str_at(0) != "\n":
                 self.skip_leading_whitespace()
                 if not self.str_at(0).isalpha():
                     # deroff.c has a bug where it can loop forever here...we try to work around it
                     self.skip_char()
-                else: # Parse option
+                else:  # Parse option
 
                     option = self.s
-                    arg = ''
+                    arg = ""
 
                     idx = 0
-                    while option[idx:idx+1].isalpha():
+                    while option[idx : idx + 1].isalpha():
                         idx += 1
 
-                    if option[idx:idx+1] == '(':
+                    if option[idx : idx + 1] == "(":
                         option = option[:idx]
-                        self.s = self.s[idx+1:]
+                        self.s = self.s[idx + 1 :]
                         arg = self.s
                     else:
-                        self.s = ''
+                        self.s = ""
 
                     if arg:
-                        idx = arg.find(')')
+                        idx = arg.find(")")
                         if idx != -1:
                             arg = arg[:idx]
-                        self.s = self.s[idx+1:]
+                        self.s = self.s[idx + 1 :]
                     else:
-                        #self.skip_char()
+                        # self.skip_char()
                         pass
 
-                    if option.lower() == 'tab':
+                    if option.lower() == "tab":
                         self.tblTab = arg[0:1]
 
             self.tblstate = self.FORMAT
-            self.condputs('\n')
+            self.condputs("\n")
 
         elif self.tblstate == self.FORMAT:
-            while self.s and self.str_at(0) != '.' and self.str_at(0) != '\n':
+            while self.s and self.str_at(0) != "." and self.str_at(0) != "\n":
                 self.skip_leading_whitespace()
-                if self.str_at(0): self.skip_char()
+                if self.str_at(0):
+                    self.skip_char()
 
-            if self.str_at(0) == '.': self.tblstate = self.DATA
-            self.condputs('\n')
+            if self.str_at(0) == ".":
+                self.tblstate = self.DATA
+            self.condputs("\n")
         elif self.tblstate == self.DATA:
             if self.tblTab:
-                self.s = self.s.replace(self.tblTab, '\t')
+                self.s = self.s.replace(self.tblTab, "\t")
             self.text()
         return True
 
     def do_line(self):
         if self.s[0:1] in ".'":
-            if not self.request_or_macro(): return False
+            if not self.request_or_macro():
+                return False
         elif self.tbl:
             self.do_tbl()
         else:
@@ -1062,22 +1115,24 @@ class Deroffer:
         return True
 
     def deroff(self, str):
-        lines = str.split('\n')
+        lines = str.split("\n")
         for line in lines:
-            self.s = line + '\n'
+            self.s = line + "\n"
             if not self.do_line():
                 break
-            #self.putchar('\n')
+            # self.putchar('\n')
+
 
 def deroff_files(files):
     for arg in files:
-        sys.stderr.write(arg + '\n')
-        if arg.endswith('.gz'):
-            f = gzip.open(arg, 'r')
+        sys.stderr.write(arg + "\n")
+        if arg.endswith(".gz"):
+            f = gzip.open(arg, "r")
             str = f.read()
-            if IS_PY3: str = str.decode('latin-1')
+            if IS_PY3:
+                str = str.decode("latin-1")
         else:
-            f = open(arg, 'r')
+            f = open(arg, "r")
             str = f.read()
         d = Deroffer()
         d.deroff(str)
@@ -1085,15 +1140,16 @@ def deroff_files(files):
         f.close()
 
 
-
 if __name__ == "__main__":
     import gzip
+
     paths = sys.argv[1:]
     if True:
         deroff_files(paths)
     else:
         import cProfile, profile, pstats
-        profile.run('deroff_files(paths)', 'fooprof')
-        p = pstats.Stats('fooprof')
-        p.sort_stats('time').print_stats(100)
-        #p.sort_stats('calls').print_callers(.5, 'startswith')
+
+        profile.run("deroff_files(paths)", "fooprof")
+        p = pstats.Stats("fooprof")
+        p.sort_stats("time").print_stats(100)
+        # p.sort_stats('calls').print_callers(.5, 'startswith')
diff --git a/share/tools/web_config/sample_prompts/debian_chroot.fish b/share/tools/web_config/sample_prompts/debian_chroot.fish
index aec17ff11..6daa90f41 100644
--- a/share/tools/web_config/sample_prompts/debian_chroot.fish
+++ b/share/tools/web_config/sample_prompts/debian_chroot.fish
@@ -23,11 +23,11 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
             echo -n -s "$USER" @ (prompt_hostname) ' ' (set -q fish_color_cwd_root
                                                         and set_color $fish_color_cwd_root
                                                         or set_color $fish_color_cwd) (prompt_pwd) \
-                 (set_color normal) '# '
+                (set_color normal) '# '
 
         case '*'
             echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $fish_color_cwd) (prompt_pwd) \
-                 (set_color normal) '> '
+                (set_color normal) '> '
 
     end
 end
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 072d409de..fde4c3dfd 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -18,13 +18,13 @@ function fish_prompt --description 'Informative prompt'
             printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
                                                              and set_color $fish_color_cwd_root
                                                              or set_color $fish_color_cwd) \
-                   (prompt_pwd) (set_color normal)
+                (prompt_pwd) (set_color normal)
         case '*'
             set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) \
                                       (set_color bryellow) $last_pipestatus)
 
             printf '[%s] %s%s@%s %s%s %s%s(%s)%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
-                   $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD "$pipestatus_string" \
-                   $status_color $last_status (set_color normal)
+                $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD "$pipestatus_string" \
+                $status_color $last_status (set_color normal)
     end
 end
diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 1fdd83218..1832f19ac 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 from __future__ import print_function
 import binascii
 import cgi
+
 try:
     from html import escape as escape_html
 except ImportError:
@@ -33,27 +34,30 @@ else:
     import socketserver as SocketServer
     from urllib.parse import parse_qs
 
+
 def isMacOS10_12_5_OrLater():
     """ Return whether this system is macOS 10.12.5 or a later version. """
     version = platform.mac_ver()[0]
-    return version and LooseVersion(version) >= LooseVersion('10.12.5')
+    return version and LooseVersion(version) >= LooseVersion("10.12.5")
+
 
 def is_wsl():
     """ Return whether we are running under the Windows Subsystem for Linux """
-    if 'linux' in platform.system().lower():
-        with open('/proc/version', 'r') as f:
-            if 'Microsoft' in f.read():
+    if "linux" in platform.system().lower():
+        with open("/proc/version", "r") as f:
+            if "Microsoft" in f.read():
                 return True
     return False
 
 
 # Disable CLI web browsers
-term = os.environ.pop('TERM', None)
+term = os.environ.pop("TERM", None)
 # This import must be done with an empty $TERM, otherwise a command-line browser may be started
 # which will block the whole process - see https://docs.python.org/3/library/webbrowser.html
 import webbrowser
+
 if term:
-    os.environ['TERM'] = term
+    os.environ["TERM"] = term
 
 try:
     import json
@@ -63,8 +67,7 @@ except ImportError:
 
 def run_fish_cmd(text):
     # Ensure that fish is using UTF-8.
-    ctype = os.environ.get("LC_ALL", os.environ.get("LC_CTYPE",
-                                                    os.environ.get("LANG")))
+    ctype = os.environ.get("LC_ALL", os.environ.get("LC_CTYPE", os.environ.get("LANG")))
     env = None
     if ctype is None or re.search(r"\.utf-?8$", ctype, flags=re.I) is None:
         # override LC_CTYPE with en_US.UTF-8
@@ -74,28 +77,48 @@ def run_fish_cmd(text):
         env.update(LC_CTYPE="en_US.UTF-8", LANG="en_US.UTF-8")
 
     print("$ " + text)
-    p = subprocess.Popen([FISH_BIN_PATH], stdin=subprocess.PIPE,
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                         env=env)
-    out, err = p.communicate(text.encode('utf-8'))
-    out = out.decode('utf-8', 'replace')
-    err = err.decode('utf-8', 'replace')
+    p = subprocess.Popen(
+        [FISH_BIN_PATH],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        env=env,
+    )
+    out, err = p.communicate(text.encode("utf-8"))
+    out = out.decode("utf-8", "replace")
+    err = err.decode("utf-8", "replace")
     return out, err
 
 
 def escape_fish_cmd(text):
     # Replace one backslash with two, and single quotes with backslash-quote
-    escaped = text.replace('\\', '\\\\').replace("'", "\\'")
+    escaped = text.replace("\\", "\\\\").replace("'", "\\'")
     return "'" + escaped + "'"
 
+
 named_colors = {
-    'black': '000000', 'red': '800000', 'green': '008000', 'brown': '725000',
-    'yellow': '808000', 'blue': '000080', 'magenta': '800080',
-    'purple': '800080', 'cyan': '008080', 'grey': 'e5e5e5', 'brgrey': '555555',
-    'white': 'c0c0c0', 'brblack': '808080', 'brred': 'ff0000',
-    'brgreen': '00ff00', 'brbrown': 'ffff00', 'bryellow': 'ffff00',
-    'brblue': '0000ff', 'brmagenta': 'ff00ff', 'brpurple': 'ff00ff',
-    'brcyan': '00ffff', 'brwhite': 'ffffff'
+    "black": "000000",
+    "red": "800000",
+    "green": "008000",
+    "brown": "725000",
+    "yellow": "808000",
+    "blue": "000080",
+    "magenta": "800080",
+    "purple": "800080",
+    "cyan": "008080",
+    "grey": "e5e5e5",
+    "brgrey": "555555",
+    "white": "c0c0c0",
+    "brblack": "808080",
+    "brred": "ff0000",
+    "brgreen": "00ff00",
+    "brbrown": "ffff00",
+    "bryellow": "ffff00",
+    "brblue": "0000ff",
+    "brmagenta": "ff00ff",
+    "brpurple": "ff00ff",
+    "brcyan": "00ffff",
+    "brwhite": "ffffff",
 }
 
 bindings_blacklist = set(["self-insert", "'begin;end'"])
@@ -106,13 +129,15 @@ def parse_one_color(comp):
     if comp in named_colors:
         # Named color
         return named_colors[comp]
-    elif (re.match(r"[0-9a-fA-F]{3}", comp) is not None or
-          re.match(r"[0-9a-fA-F]{6}", comp) is not None):
+    elif (
+        re.match(r"[0-9a-fA-F]{3}", comp) is not None
+        or re.match(r"[0-9a-fA-F]{6}", comp) is not None
+    ):
         # Hex color
         return comp
     else:
         # Unknown
-        return ''
+        return ""
 
 
 def better_color(c1, c2):
@@ -121,9 +146,9 @@ def better_color(c1, c2):
         return c1
     if not c1:
         return c2
-    if c1 == 'normal':
+    if c1 == "normal":
         return c2
-    if c2 == 'normal':
+    if c2 == "normal":
         return c1
     if c2 in named_colors:
         return c1
@@ -135,93 +160,317 @@ def better_color(c1, c2):
 def parse_color(color_str):
     """ A basic function to parse a color string, for example, 'red' '--bold'.
     """
-    comps = color_str.split(' ')
-    color = 'normal'
-    background_color = ''
+    comps = color_str.split(" ")
+    color = "normal"
+    background_color = ""
     bold, underline, italics, dim, reverse = False, False, False, False, False
     for comp in comps:
         # Remove quotes
         comp = comp.strip("'\" ")
-        if comp == '--bold':
+        if comp == "--bold":
             bold = True
-        elif comp == '--underline':
+        elif comp == "--underline":
             underline = True
-        elif comp == '--italics':
+        elif comp == "--italics":
             italics = True
-        elif comp == '--dim':
+        elif comp == "--dim":
             dim = True
-        elif comp == '--reverse':
+        elif comp == "--reverse":
             reverse = True
-        elif comp.startswith('--background='):
+        elif comp.startswith("--background="):
             # Background color
             background_color = better_color(
-                background_color, parse_one_color(comp[len('--background='):]))
+                background_color, parse_one_color(comp[len("--background=") :])
+            )
         else:
             # Regular color
             color = better_color(color, parse_one_color(comp))
 
-    return {"color": color, "background": background_color, "bold": bold,
-            "underline": underline, "italics": italics, "dim": dim, "reverse": reverse}
+    return {
+        "color": color,
+        "background": background_color,
+        "bold": bold,
+        "underline": underline,
+        "italics": italics,
+        "dim": dim,
+        "reverse": reverse,
+    }
 
 
 def parse_bool(val):
     val = val.lower()
-    if val.startswith('f') or val.startswith('0'):
+    if val.startswith("f") or val.startswith("0"):
         return False
-    if val.startswith('t') or val.startswith('1'):
+    if val.startswith("t") or val.startswith("1"):
         return True
     return bool(val)
 
 
 def html_color_for_ansi_color_index(val):
-    arr = ['black', '#AA0000', '#00AA00', '#AA5500', '#0000AA', '#AA00AA',
-           '#00AAAA', '#AAAAAA', '#555555', '#FF5555', '#55FF55', '#FFFF55',
-           '#5555FF', '#FF55FF', '#55FFFF', 'white', '#000000', '#00005f',
-           '#000087', '#0000af', '#0000d7', '#0000ff', '#005f00', '#005f5f',
-           '#005f87', '#005faf', '#005fd7', '#005fff', '#008700', '#00875f',
-           '#008787', '#0087af', '#0087d7', '#0087ff', '#00af00', '#00af5f',
-           '#00af87', '#00afaf', '#00afd7', '#00afff', '#00d700', '#00d75f',
-           '#00d787', '#00d7af', '#00d7d7', '#00d7ff', '#00ff00', '#00ff5f',
-           '#00ff87', '#00ffaf', '#00ffd7', '#00ffff', '#5f0000', '#5f005f',
-           '#5f0087', '#5f00af', '#5f00d7', '#5f00ff', '#5f5f00', '#5f5f5f',
-           '#5f5f87', '#5f5faf', '#5f5fd7', '#5f5fff', '#5f8700', '#5f875f',
-           '#5f8787', '#5f87af', '#5f87d7', '#5f87ff', '#5faf00', '#5faf5f',
-           '#5faf87', '#5fafaf', '#5fafd7', '#5fafff', '#5fd700', '#5fd75f',
-           '#5fd787', '#5fd7af', '#5fd7d7', '#5fd7ff', '#5fff00', '#5fff5f',
-           '#5fff87', '#5fffaf', '#5fffd7', '#5fffff', '#870000', '#87005f',
-           '#870087', '#8700af', '#8700d7', '#8700ff', '#875f00', '#875f5f',
-           '#875f87', '#875faf', '#875fd7', '#875fff', '#878700', '#87875f',
-           '#878787', '#8787af', '#8787d7', '#8787ff', '#87af00', '#87af5f',
-           '#87af87', '#87afaf', '#87afd7', '#87afff', '#87d700', '#87d75f',
-           '#87d787', '#87d7af', '#87d7d7', '#87d7ff', '#87ff00', '#87ff5f',
-           '#87ff87', '#87ffaf', '#87ffd7', '#87ffff', '#af0000', '#af005f',
-           '#af0087', '#af00af', '#af00d7', '#af00ff', '#af5f00', '#af5f5f',
-           '#af5f87', '#af5faf', '#af5fd7', '#af5fff', '#af8700', '#af875f',
-           '#af8787', '#af87af', '#af87d7', '#af87ff', '#afaf00', '#afaf5f',
-           '#afaf87', '#afafaf', '#afafd7', '#afafff', '#afd700', '#afd75f',
-           '#afd787', '#afd7af', '#afd7d7', '#afd7ff', '#afff00', '#afff5f',
-           '#afff87', '#afffaf', '#afffd7', '#afffff', '#d70000', '#d7005f',
-           '#d70087', '#d700af', '#d700d7', '#d700ff', '#d75f00', '#d75f5f',
-           '#d75f87', '#d75faf', '#d75fd7', '#d75fff', '#d78700', '#d7875f',
-           '#d78787', '#d787af', '#d787d7', '#d787ff', '#d7af00', '#d7af5f',
-           '#d7af87', '#d7afaf', '#d7afd7', '#d7afff', '#d7d700', '#d7d75f',
-           '#d7d787', '#d7d7af', '#d7d7d7', '#d7d7ff', '#d7ff00', '#d7ff5f',
-           '#d7ff87', '#d7ffaf', '#d7ffd7', '#d7ffff', '#ff0000', '#ff005f',
-           '#ff0087', '#ff00af', '#ff00d7', '#ff00ff', '#ff5f00', '#ff5f5f',
-           '#ff5f87', '#ff5faf', '#ff5fd7', '#ff5fff', '#ff8700', '#ff875f',
-           '#ff8787', '#ff87af', '#ff87d7', '#ff87ff', '#ffaf00', '#ffaf5f',
-           '#ffaf87', '#ffafaf', '#ffafd7', '#ffafff', '#ffd700', '#ffd75f',
-           '#ffd787', '#ffd7af', '#ffd7d7', '#ffd7ff', '#ffff00', '#ffff5f',
-           '#ffff87', '#ffffaf', '#ffffd7', '#ffffff', '#080808', '#121212',
-           '#1c1c1c', '#262626', '#303030', '#3a3a3a', '#444444', '#4e4e4e',
-           '#585858', '#626262', '#6c6c6c', '#767676', '#808080', '#8a8a8a',
-           '#949494', '#9e9e9e', '#a8a8a8', '#b2b2b2', '#bcbcbc', '#c6c6c6',
-           '#d0d0d0', '#dadada', '#e4e4e4', '#eeeeee']
+    arr = [
+        "black",
+        "#AA0000",
+        "#00AA00",
+        "#AA5500",
+        "#0000AA",
+        "#AA00AA",
+        "#00AAAA",
+        "#AAAAAA",
+        "#555555",
+        "#FF5555",
+        "#55FF55",
+        "#FFFF55",
+        "#5555FF",
+        "#FF55FF",
+        "#55FFFF",
+        "white",
+        "#000000",
+        "#00005f",
+        "#000087",
+        "#0000af",
+        "#0000d7",
+        "#0000ff",
+        "#005f00",
+        "#005f5f",
+        "#005f87",
+        "#005faf",
+        "#005fd7",
+        "#005fff",
+        "#008700",
+        "#00875f",
+        "#008787",
+        "#0087af",
+        "#0087d7",
+        "#0087ff",
+        "#00af00",
+        "#00af5f",
+        "#00af87",
+        "#00afaf",
+        "#00afd7",
+        "#00afff",
+        "#00d700",
+        "#00d75f",
+        "#00d787",
+        "#00d7af",
+        "#00d7d7",
+        "#00d7ff",
+        "#00ff00",
+        "#00ff5f",
+        "#00ff87",
+        "#00ffaf",
+        "#00ffd7",
+        "#00ffff",
+        "#5f0000",
+        "#5f005f",
+        "#5f0087",
+        "#5f00af",
+        "#5f00d7",
+        "#5f00ff",
+        "#5f5f00",
+        "#5f5f5f",
+        "#5f5f87",
+        "#5f5faf",
+        "#5f5fd7",
+        "#5f5fff",
+        "#5f8700",
+        "#5f875f",
+        "#5f8787",
+        "#5f87af",
+        "#5f87d7",
+        "#5f87ff",
+        "#5faf00",
+        "#5faf5f",
+        "#5faf87",
+        "#5fafaf",
+        "#5fafd7",
+        "#5fafff",
+        "#5fd700",
+        "#5fd75f",
+        "#5fd787",
+        "#5fd7af",
+        "#5fd7d7",
+        "#5fd7ff",
+        "#5fff00",
+        "#5fff5f",
+        "#5fff87",
+        "#5fffaf",
+        "#5fffd7",
+        "#5fffff",
+        "#870000",
+        "#87005f",
+        "#870087",
+        "#8700af",
+        "#8700d7",
+        "#8700ff",
+        "#875f00",
+        "#875f5f",
+        "#875f87",
+        "#875faf",
+        "#875fd7",
+        "#875fff",
+        "#878700",
+        "#87875f",
+        "#878787",
+        "#8787af",
+        "#8787d7",
+        "#8787ff",
+        "#87af00",
+        "#87af5f",
+        "#87af87",
+        "#87afaf",
+        "#87afd7",
+        "#87afff",
+        "#87d700",
+        "#87d75f",
+        "#87d787",
+        "#87d7af",
+        "#87d7d7",
+        "#87d7ff",
+        "#87ff00",
+        "#87ff5f",
+        "#87ff87",
+        "#87ffaf",
+        "#87ffd7",
+        "#87ffff",
+        "#af0000",
+        "#af005f",
+        "#af0087",
+        "#af00af",
+        "#af00d7",
+        "#af00ff",
+        "#af5f00",
+        "#af5f5f",
+        "#af5f87",
+        "#af5faf",
+        "#af5fd7",
+        "#af5fff",
+        "#af8700",
+        "#af875f",
+        "#af8787",
+        "#af87af",
+        "#af87d7",
+        "#af87ff",
+        "#afaf00",
+        "#afaf5f",
+        "#afaf87",
+        "#afafaf",
+        "#afafd7",
+        "#afafff",
+        "#afd700",
+        "#afd75f",
+        "#afd787",
+        "#afd7af",
+        "#afd7d7",
+        "#afd7ff",
+        "#afff00",
+        "#afff5f",
+        "#afff87",
+        "#afffaf",
+        "#afffd7",
+        "#afffff",
+        "#d70000",
+        "#d7005f",
+        "#d70087",
+        "#d700af",
+        "#d700d7",
+        "#d700ff",
+        "#d75f00",
+        "#d75f5f",
+        "#d75f87",
+        "#d75faf",
+        "#d75fd7",
+        "#d75fff",
+        "#d78700",
+        "#d7875f",
+        "#d78787",
+        "#d787af",
+        "#d787d7",
+        "#d787ff",
+        "#d7af00",
+        "#d7af5f",
+        "#d7af87",
+        "#d7afaf",
+        "#d7afd7",
+        "#d7afff",
+        "#d7d700",
+        "#d7d75f",
+        "#d7d787",
+        "#d7d7af",
+        "#d7d7d7",
+        "#d7d7ff",
+        "#d7ff00",
+        "#d7ff5f",
+        "#d7ff87",
+        "#d7ffaf",
+        "#d7ffd7",
+        "#d7ffff",
+        "#ff0000",
+        "#ff005f",
+        "#ff0087",
+        "#ff00af",
+        "#ff00d7",
+        "#ff00ff",
+        "#ff5f00",
+        "#ff5f5f",
+        "#ff5f87",
+        "#ff5faf",
+        "#ff5fd7",
+        "#ff5fff",
+        "#ff8700",
+        "#ff875f",
+        "#ff8787",
+        "#ff87af",
+        "#ff87d7",
+        "#ff87ff",
+        "#ffaf00",
+        "#ffaf5f",
+        "#ffaf87",
+        "#ffafaf",
+        "#ffafd7",
+        "#ffafff",
+        "#ffd700",
+        "#ffd75f",
+        "#ffd787",
+        "#ffd7af",
+        "#ffd7d7",
+        "#ffd7ff",
+        "#ffff00",
+        "#ffff5f",
+        "#ffff87",
+        "#ffffaf",
+        "#ffffd7",
+        "#ffffff",
+        "#080808",
+        "#121212",
+        "#1c1c1c",
+        "#262626",
+        "#303030",
+        "#3a3a3a",
+        "#444444",
+        "#4e4e4e",
+        "#585858",
+        "#626262",
+        "#6c6c6c",
+        "#767676",
+        "#808080",
+        "#8a8a8a",
+        "#949494",
+        "#9e9e9e",
+        "#a8a8a8",
+        "#b2b2b2",
+        "#bcbcbc",
+        "#c6c6c6",
+        "#d0d0d0",
+        "#dadada",
+        "#e4e4e4",
+        "#eeeeee",
+    ]
     if val < 0 or val >= len(arr):
-        return ''
+        return ""
     else:
         return arr[val]
 
+
 # Function to return special ANSI escapes like exit_attribute_mode
 g_special_escapes_dict = None
 
@@ -230,6 +479,7 @@ def get_special_ansi_escapes():
     global g_special_escapes_dict
     if g_special_escapes_dict is None:
         import curses
+
         g_special_escapes_dict = {}
         curses.setupterm()
 
@@ -240,16 +490,17 @@ def get_special_ansi_escapes():
             if key:
                 val = curses.tparm(key)
             if val:
-                val = val.decode('utf-8')
+                val = val.decode("utf-8")
             return val
 
         # Just a few for now
-        g_special_escapes_dict['exit_attribute_mode'] = get_tparm('sgr0')
-        g_special_escapes_dict['bold'] = get_tparm('bold')
-        g_special_escapes_dict['underline'] = get_tparm('smul')
+        g_special_escapes_dict["exit_attribute_mode"] = get_tparm("sgr0")
+        g_special_escapes_dict["bold"] = get_tparm("bold")
+        g_special_escapes_dict["underline"] = get_tparm("smul")
 
     return g_special_escapes_dict
 
+
 # Given a known ANSI escape sequence, convert it to HTML and append to the list
 # Returns whether we have an open <span>
 
@@ -261,10 +512,10 @@ def append_html_for_ansi_escape(full_val, result, span_open):
     # Helper function to close a span if it's open
     def close_span():
         if span_open:
-            result.append('</span>')
+            result.append("</span>")
 
     # term256 foreground color
-    match = re.match('38;5;(\d+)', val)
+    match = re.match("38;5;(\d+)", val)
     if match is not None:
         close_span()
         html_color = html_color_for_ansi_color_index(int(match.group(1)))
@@ -274,13 +525,15 @@ def append_html_for_ansi_escape(full_val, result, span_open):
     # term16 foreground color
     if val in (str(x) for x in chain(range(90, 97), range(30, 38))):
         close_span()
-        html_color = html_color_for_ansi_color_index(int(val) - (30 if int(val) < 90 else 82))
+        html_color = html_color_for_ansi_color_index(
+            int(val) - (30 if int(val) < 90 else 82)
+        )
         result.append('<span style="color: ' + html_color + '">')
         return True  # span now open
 
     # Try special escapes
     special_escapes = get_special_ansi_escapes()
-    if full_val == special_escapes['exit_attribute_mode']:
+    if full_val == special_escapes["exit_attribute_mode"]:
         close_span()
         return False
 
@@ -294,7 +547,7 @@ def strip_ansi(val):
     # Make a half-assed effort to strip ANSI control sequences
     # We assume that all such sequences start with 0x1b and end with m or ctrl-o,
     # which catches most cases
-    return re.sub("\x1b[^m]*m\x0f?", '', val)
+    return re.sub("\x1b[^m]*m\x0f?", "", val)
 
 
 def ansi_prompt_line_width(val):
@@ -303,7 +556,7 @@ def ansi_prompt_line_width(val):
     stripped_val = strip_ansi(val)
 
     # Now count the longest line
-    return max([len(x) for x in stripped_val.split('\n')])
+    return max([len(x) for x in stripped_val.split("\n")])
 
 
 def ansi_to_html(val):
@@ -311,14 +564,17 @@ def ansi_to_html(val):
     # standard color codes, but also things like sgr0. Hence this lame check.
     # Note that Python 2.6 doesn't have a flag param to re.split, so we have to
     # compile it first.
-    reg = re.compile("""
+    reg = re.compile(
+        """
         (                        # Capture
          \x1b                    # Escape
          [^m]*                   # Zero or more non-'m's
          m                       # Literal m terminates the sequence
          \x0f?                   # HACK: A ctrl-o - this is how tmux' sgr0 ends
         )                        # End capture
-        """, re.VERBOSE)
+        """,
+        re.VERBOSE,
+    )
     separated = reg.split(val)
 
     # We have to HTML escape the text and convert ANSI escapes into HTML
@@ -336,12 +592,11 @@ def ansi_to_html(val):
             result.append(escape_html(strip_ansi(component)))
         else:
             # It's an escape sequence. Close the previous escape.
-            span_open = append_html_for_ansi_escape(component, result,
-                                                    span_open)
+            span_open = append_html_for_ansi_escape(component, result, span_open)
 
     # Close final escape
     if span_open:
-        result.append('</span>')
+        result.append("</span>")
 
     # Remove empty elements
     result = [x for x in result if x]
@@ -349,17 +604,18 @@ def ansi_to_html(val):
     # Clean up empty spans, the nasty way
     idx = len(result) - 1
     while idx >= 1:
-        if result[idx] == '</span>' and result[idx-1].startswith('<span'):
+        if result[idx] == "</span>" and result[idx - 1].startswith("<span"):
             # Empty span, delete these two
-            result[idx-1:idx+1] = []
+            result[idx - 1 : idx + 1] = []
             idx = idx - 1
         idx = idx - 1
 
-    return ''.join(result)
+    return "".join(result)
 
 
 class FishVar:
     """ A class that represents a variable """
+
     def __init__(self, name, value):
         self.name = name
         self.value = value
@@ -370,18 +626,16 @@ class FishVar:
         # Return an array(3): name, value, flags
         flags = []
         if self.universal:
-            flags.append('universal')
+            flags.append("universal")
         if self.exported:
-            flags.append('exported')
-        return {"name": self.name, "value": self.value,
-                "Flags": ', '.join(flags)}
+            flags.append("exported")
+        return {"name": self.name, "value": self.value, "Flags": ", ".join(flags)}
 
 
 class FishBinding:
     """A class that represents keyboard binding """
 
-    def __init__(self, command, raw_binding, readable_binding,
-                 description=None):
+    def __init__(self, command, raw_binding, readable_binding, description=None):
         self.command = command
         self.bindings = []
         self.description = description
@@ -389,39 +643,51 @@ class FishBinding:
 
     def add_binding(self, raw_binding, readable_binding):
         for i in self.bindings:
-            if i['readable_binding'] == readable_binding:
-                i['raw_bindings'].append(raw_binding)
+            if i["readable_binding"] == readable_binding:
+                i["raw_bindings"].append(raw_binding)
                 break
         else:
-            self.bindings.append({'readable_binding': readable_binding,
-                                  'raw_bindings': [raw_binding]})
+            self.bindings.append(
+                {"readable_binding": readable_binding, "raw_bindings": [raw_binding]}
+            )
 
     def get_json_obj(self):
-        return {"command": self.command, "bindings": self.bindings,
-                "description": self.description}
+        return {
+            "command": self.command,
+            "bindings": self.bindings,
+            "description": self.description,
+        }
 
 
 class BindingParser:
     """ Class to parse codes for bind command """
 
     # TODO: What does snext and sprevious mean ?
-    readable_keys = {"dc": "Delete", "npage": "Page Up", "ppage": "Page Down",
-                     "sdc": "Shift Delete", "shome": "Shift Home",
-                     "left": "Left Arrow", "right": "Right Arrow",
-                     "up": "Up Arrow", "down": "Down Arrow",
-                     "sleft": "Shift Left", "sright": "Shift Right",
-                     "btab": "Shift Tab"}
+    readable_keys = {
+        "dc": "Delete",
+        "npage": "Page Up",
+        "ppage": "Page Down",
+        "sdc": "Shift Delete",
+        "shome": "Shift Home",
+        "left": "Left Arrow",
+        "right": "Right Arrow",
+        "up": "Up Arrow",
+        "down": "Down Arrow",
+        "sleft": "Shift Left",
+        "sright": "Shift Right",
+        "btab": "Shift Tab",
+    }
 
     def set_buffer(self, buffer):
         """ Sets code to parse """
 
-        self.buffer = buffer or b''
+        self.buffer = buffer or b""
         self.index = 0
 
     def get_char(self):
         """ Gets next character from buffer """
         if self.index >= len(self.buffer):
-            return '\0'
+            return "\0"
         c = self.buffer[self.index]
         self.index += 1
         return c
@@ -439,55 +705,55 @@ class BindingParser:
     def parse_control_sequence(self):
         """ Parses terminal specifiec control sequences """
 
-        result = ''
+        result = ""
         c = self.get_char()
 
         # \e0 is used to denote start of control sequence
-        if c == 'O':
+        if c == "O":
             c = self.get_char()
 
         # \[1\; is start of control sequence
-        if c == '1':
+        if c == "1":
             b = self.get_char()
             c = self.get_char()
-            if b == '\\' and c == '~':
+            if b == "\\" and c == "~":
                 result += "Home"
             elif c == ";":
                 c = self.get_char()
 
         # 3 is Alt
-        if c == '3':
+        if c == "3":
             result += "ALT - "
             c = self.get_char()
 
         # \[4\~ is End
-        if c == '4':
+        if c == "4":
             b = self.get_char()
             c = self.get_char()
-            if b == '\\' and c == '~':
+            if b == "\\" and c == "~":
                 result += "End"
 
         # 5 is Ctrl
-        if c == '5':
+        if c == "5":
             result += "CTRL - "
             c = self.get_char()
 
         # 9 is Alt
-        if c == '9':
+        if c == "9":
             result += "ALT - "
             c = self.get_char()
 
-        if c == 'A':
-            result += 'Up Arrow'
-        elif c == 'B':
-            result += 'Down Arrow'
-        elif c == 'C':
-            result += 'Right Arrow'
-        elif c == 'D':
+        if c == "A":
+            result += "Up Arrow"
+        elif c == "B":
+            result += "Down Arrow"
+        elif c == "C":
+            result += "Right Arrow"
+        elif c == "D":
             result += "Left Arrow"
-        elif c == 'F':
+        elif c == "F":
             result += "End"
-        elif c == 'H':
+        elif c == "H":
             result += "Home"
 
         return result
@@ -503,62 +769,63 @@ class BindingParser:
         return result
 
     def parse_binding(self):
-        readable_command = ''
-        result = ''
+        readable_command = ""
+        result = ""
         alt = ctrl = False
 
         while not self.end():
             c = self.get_char()
 
-            if c == '\\':
+            if c == "\\":
                 c = self.get_char()
-                if c == 'e':
+                if c == "e":
                     d = self.get_char()
-                    if d == 'O':
+                    if d == "O":
                         self.unget_char()
                         result += self.parse_control_sequence()
-                    elif d == '\\':
-                        if self.get_char() == '[':
+                    elif d == "\\":
+                        if self.get_char() == "[":
                             result += self.parse_control_sequence()
                         else:
                             self.unget_char()
                             self.unget_char()
                             alt = True
-                    elif d == '\0':
-                        result += 'ESC'
+                    elif d == "\0":
+                        result += "ESC"
                     else:
                         alt = True
                         self.unget_char()
-                elif c == 'c':
+                elif c == "c":
                     ctrl = True
-                elif c == 'n':
-                    result += 'Enter'
-                elif c == 't':
-                    result += 'Tab'
-                elif c == 'b':
-                    result += 'Backspace'
+                elif c == "n":
+                    result += "Enter"
+                elif c == "t":
+                    result += "Tab"
+                elif c == "b":
+                    result += "Backspace"
                 elif c.isalpha():
-                    result += '\\' + c
+                    result += "\\" + c
                 else:
                     result += c
-            elif c == '\x7f':
-                result += 'Backspace'
+            elif c == "\x7f":
+                result += "Backspace"
             else:
                 result += c
         if ctrl:
-            readable_command += 'CTRL - '
+            readable_command += "CTRL - "
         if alt:
-            readable_command += 'ALT - '
+            readable_command += "ALT - "
 
-        if result == '':
-            return 'unknown-control-sequence'
+        if result == "":
+            return "unknown-control-sequence"
 
         return readable_command + result
 
 
 class FishConfigTCPServer(SocketServer.TCPServer):
     """TCPServer that only accepts connections from localhost (IPv4/IPv6)."""
-    WHITELIST = set(['::1', '::ffff:127.0.0.1', '127.0.0.1'])
+
+    WHITELIST = set(["::1", "::ffff:127.0.0.1", "127.0.0.1"])
 
     address_family = socket.AF_INET6 if socket.has_ipv6 else socket.AF_INET
 
@@ -567,9 +834,8 @@ class FishConfigTCPServer(SocketServer.TCPServer):
 
 
 class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-
     def write_to_wfile(self, txt):
-        self.wfile.write(txt.encode('utf-8'))
+        self.wfile.write(txt.encode("utf-8"))
 
     def do_get_colors(self):
         # Looks for fish_color_*.
@@ -577,132 +843,136 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         result = []
 
         # Make sure we return at least these
-        remaining = set(['normal',
-                         'error',
-                         'command',
-                         'end',
-                         'param',
-                         'comment',
-                         'match',
-                         'selection',
-                         'search_match',
-                         'operator',
-                         'escape',
-                         'quote',
-                         'redirection',
-                         'valid_path',
-                         'autosuggestion'
-                         'user',
-                         'host',
-                         'cancel'
-                         ])
+        remaining = set(
+            [
+                "normal",
+                "error",
+                "command",
+                "end",
+                "param",
+                "comment",
+                "match",
+                "selection",
+                "search_match",
+                "operator",
+                "escape",
+                "quote",
+                "redirection",
+                "valid_path",
+                "autosuggestion" "user",
+                "host",
+                "cancel",
+            ]
+        )
 
         # Here are our color descriptions
         descriptions = {
-            'normal': 'Default text',
-            'command': 'Ordinary commands',
-            'quote': 'Text within quotes',
-            'redirection': 'Like | and >',
-            'end': 'Like ; and &',
-            'error': 'Potential errors',
-            'param': 'Command parameters',
-            'comment': 'Comments start with #',
-            'match': 'Matching parenthesis',
-            'selection': 'Selected text',
-            'search_match': 'History searching',
-            'history_current': 'Directory history',
-            'operator': 'Like * and ~',
-            'escape': 'Escapes like \\n',
-            'cwd': 'Current directory',
-            'cwd_root': 'cwd for root user',
-            'valid_path': 'Valid paths',
-            'autosuggestion': 'Suggested completion',
-            'user': 'Username in the prompt',
-            'host': 'Hostname in the prompt',
-            'cancel': 'The ^C cancel indicator'
+            "normal": "Default text",
+            "command": "Ordinary commands",
+            "quote": "Text within quotes",
+            "redirection": "Like | and >",
+            "end": "Like ; and &",
+            "error": "Potential errors",
+            "param": "Command parameters",
+            "comment": "Comments start with #",
+            "match": "Matching parenthesis",
+            "selection": "Selected text",
+            "search_match": "History searching",
+            "history_current": "Directory history",
+            "operator": "Like * and ~",
+            "escape": "Escapes like \\n",
+            "cwd": "Current directory",
+            "cwd_root": "cwd for root user",
+            "valid_path": "Valid paths",
+            "autosuggestion": "Suggested completion",
+            "user": "Username in the prompt",
+            "host": "Hostname in the prompt",
+            "cancel": "The ^C cancel indicator",
         }
 
-        out, err = run_fish_cmd('set -L')
-        for line in out.split('\n'):
+        out, err = run_fish_cmd("set -L")
+        for line in out.split("\n"):
 
             for match in re.finditer(r"^fish_color_(\S+) ?(.*)", line):
                 color_name, color_value = [x.strip() for x in match.group(1, 2)]
-                color_desc = descriptions.get(color_name, '')
+                color_desc = descriptions.get(color_name, "")
                 data = {"name": color_name, "description": color_desc}
                 data.update(parse_color(color_value))
                 result.append(data)
                 remaining.discard(color_name)
 
         # Sort our result (by their keys)
-        result.sort(key=operator.itemgetter('name'))
+        result.sort(key=operator.itemgetter("name"))
 
         # Ensure that we have all the color names we know about, so that if the
         # user deletes one he can still set it again via the web interface
         for color_name in remaining:
-            color_desc = descriptions.get(color_name, '')
-            result.append([color_name, color_desc, parse_color('')])
+            color_desc = descriptions.get(color_name, "")
+            result.append([color_name, color_desc, parse_color("")])
 
         return result
 
     def do_get_functions(self):
-        out, err = run_fish_cmd('functions')
+        out, err = run_fish_cmd("functions")
         out = out.strip()
 
         # Not sure why fish sometimes returns this with newlines
         if "\n" in out:
-            return out.split('\n')
+            return out.split("\n")
         else:
-            return out.strip().split(', ')
+            return out.strip().split(", ")
 
     def do_get_variable_names(self, cmd):
         " Given a command like 'set -U' return all the variable names "
         out, err = run_fish_cmd(cmd)
-        return out.split('\n')
+        return out.split("\n")
 
     def do_get_variables(self):
-        out, err = run_fish_cmd('set -L')
+        out, err = run_fish_cmd("set -L")
 
         # Put all the variables into a dictionary
         vars = {}
-        for line in out.split('\n'):
-            comps = line.split(' ', 1)
+        for line in out.split("\n"):
+            comps = line.split(" ", 1)
             if len(comps) < 2:
                 continue
             fish_var = FishVar(comps[0], comps[1])
             vars[fish_var.name] = fish_var
 
         # Mark universal variables. L means don't abbreviate.
-        for name in self.do_get_variable_names('set -nUL'):
+        for name in self.do_get_variable_names("set -nUL"):
             if name in vars:
                 vars[name].universal = True
         # Mark exported variables. L means don't abbreviate.
-        for name in self.do_get_variable_names('set -nxL'):
+        for name in self.do_get_variable_names("set -nxL"):
             if name in vars:
                 vars[name].exported = True
 
-        return [vars[key].get_json_obj() for key
-                in sorted(vars.keys(), key=lambda x: x.lower())]
+        return [
+            vars[key].get_json_obj()
+            for key in sorted(vars.keys(), key=lambda x: x.lower())
+        ]
 
     def do_get_bindings(self):
         """ Get key bindings """
 
         # Running __fish_config_interactive print fish greeting and
         # loads key bindings
-        greeting, err = run_fish_cmd(' __fish_config_interactive')
+        greeting, err = run_fish_cmd(" __fish_config_interactive")
 
         # Load the key bindings and then list them with bind
-        out, err = run_fish_cmd('__fish_config_interactive; bind')
+        out, err = run_fish_cmd("__fish_config_interactive; bind")
 
         # Remove fish greeting from output
-        out = out[len(greeting):]
+        out = out[len(greeting) :]
 
         # Put all the bindings into a list
         bindings = []
         command_to_binding = {}
         binding_parser = BindingParser()
 
-        for line in out.split('\n'):
-            comps = line.split(' ', 2)
+        for line in out.split("\n"):
+            comps = line.split(" ", 2)
 
             # If we don't have "bind", a sequence and a mapping,
             # it's not a valid binding.
@@ -710,19 +980,19 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
                 continue
 
             # Store the "--preset" value for later
-            if comps[1] == '--preset':
+            if comps[1] == "--preset":
                 preset = True
                 # There's possibly a way to do this faster, but it's not important.
-                comps = line.split(' ', 3)[1:]
-            elif comps[1] == '--user':
+                comps = line.split(" ", 3)[1:]
+            elif comps[1] == "--user":
                 preset = False
-                comps = line.split(' ', 3)[1:]
+                comps = line.split(" ", 3)[1:]
             # Check again if we removed the level.
             if len(comps) < 3:
                 continue
 
-            if comps[1] == '-k':
-                key_name, command = comps[2].split(' ', 1)
+            if comps[1] == "-k":
+                key_name, command = comps[2].split(" ", 1)
                 binding_parser.set_buffer(key_name.capitalize())
             else:
                 key_name = None
@@ -745,8 +1015,8 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 
     def do_get_history(self):
         # Use NUL to distinguish between history items.
-        out, err = run_fish_cmd('builtin history -z')
-        result = out.split('\0')
+        out, err = run_fish_cmd("builtin history -z")
+        result = out.split("\0")
         if result:
             result.pop()  # trim off the trailing element
         return result
@@ -757,49 +1027,52 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         out, err = run_fish_cmd("echo -n $" + name)
         return out
 
-    def do_set_color_for_variable(self, name, color, background_color, bold,
-                                  underline, italics, dim, reverse):
+    def do_set_color_for_variable(
+        self, name, color, background_color, bold, underline, italics, dim, reverse
+    ):
         "Sets a color for a fish color name, like 'autosuggestion'"
         if not color:
-            color = 'normal'
-        varname = 'fish_color_' + name
+            color = "normal"
+        varname = "fish_color_" + name
         # If the name already starts with "fish_", use it as the varname
         # This is needed for 'fish_pager_color' vars.
-        if name.startswith('fish_'):
+        if name.startswith("fish_"):
             varname = name
         # TODO: Check if the varname is allowable.
-        command = 'set -U ' + varname
+        command = "set -U " + varname
         if color:
-            command += ' ' + color
+            command += " " + color
         if background_color:
-            command += ' --background=' + background_color
+            command += " --background=" + background_color
         if bold:
-            command += ' --bold'
+            command += " --bold"
         if underline:
-            command += ' --underline'
+            command += " --underline"
         if italics:
-            command += ' --italics'
+            command += " --italics"
         if dim:
-            command += ' --dim'
+            command += " --dim"
         if reverse:
-            command += ' --reverse'
+            command += " --reverse"
 
         out, err = run_fish_cmd(command)
         return out
 
     def do_get_function(self, func_name):
-        out, err = run_fish_cmd('functions ' + func_name + ' | fish_indent --html')
+        out, err = run_fish_cmd("functions " + func_name + " | fish_indent --html")
         return out
 
     def do_delete_history_item(self, history_item_text):
         # It's really lame that we always return success here
-        cmd = ('builtin history delete --case-sensitive --exact -- %s; builtin history save' %
-               escape_fish_cmd(history_item_text))
+        cmd = (
+            "builtin history delete --case-sensitive --exact -- %s; builtin history save"
+            % escape_fish_cmd(history_item_text)
+        )
         out, err = run_fish_cmd(cmd)
         return True
 
     def do_set_prompt_function(self, prompt_func):
-        cmd = prompt_func + '\n' + 'funcsave fish_prompt'
+        cmd = prompt_func + "\n" + "funcsave fish_prompt"
         out, err = run_fish_cmd(cmd)
         return len(err) == 0
 
@@ -808,8 +1081,11 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         prompt_demo_ansi, err = run_fish_cmd(command_to_run)
         prompt_demo_html = ansi_to_html(prompt_demo_ansi)
         prompt_demo_font_size = self.font_size_for_ansi_prompt(prompt_demo_ansi)
-        result = {'function': prompt_function_text, 'demo': prompt_demo_html,
-                  'font_size': prompt_demo_font_size}
+        result = {
+            "function": prompt_function_text,
+            "demo": prompt_demo_html,
+            "font_size": prompt_demo_font_size,
+        }
         if extras_dict:
             result.update(extras_dict)
         return result
@@ -817,18 +1093,19 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_get_current_prompt(self):
         # Return the current prompt. We run 'false' to demonstrate how the
         # prompt shows the command status (#1624).
-        prompt_func, err = run_fish_cmd('functions fish_prompt')
+        prompt_func, err = run_fish_cmd("functions fish_prompt")
         result = self.do_get_prompt(
             'builtin cd "' + initial_wd + '" ; false ; fish_prompt',
-            prompt_func.strip(), {'name': 'Current'})
+            prompt_func.strip(),
+            {"name": "Current"},
+        )
         return result
 
     def do_get_sample_prompt(self, text, extras_dict):
         # Return the prompt you get from the given text. Extras_dict is a
         # dictionary whose values get merged in. We run 'false' to demonstrate
         # how the prompt shows the command status (#1624)
-        cmd = (text + "\n builtin cd \"" + initial_wd +
-               "\" \n false \n fish_prompt\n")
+        cmd = text + '\n builtin cd "' + initial_wd + '" \n false \n fish_prompt\n'
         return self.do_get_prompt(cmd, text.strip(), extras_dict)
 
     def parse_one_sample_prompt_hash(self, line, result_dict):
@@ -846,27 +1123,28 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             result_dict[key] = value
             return True
         # Skip other hash comments
-        return line.startswith('#')
+        return line.startswith("#")
 
     def read_one_sample_prompt(self, path):
         try:
-            with open(path, 'rb') as fd:
+            with open(path, "rb") as fd:
                 extras_dict = {}
                 # Read one sample prompt from fd
                 function_lines = []
                 parsing_hashes = True
-                unicode_lines = (line.decode('utf-8') for line in fd)
+                unicode_lines = (line.decode("utf-8") for line in fd)
                 for line in unicode_lines:
                     # Parse hashes until parse_one_sample_prompt_hash return
                     # False.
                     if parsing_hashes:
                         parsing_hashes = self.parse_one_sample_prompt_hash(
-                            line, extras_dict)
+                            line, extras_dict
+                        )
                     # Maybe not we're not parsing hashes, or maybe we already
                     # were not.
                     if not parsing_hashes:
                         function_lines.append(line)
-                func = ''.join(function_lines).strip()
+                func = "".join(function_lines).strip()
                 result = self.do_get_sample_prompt(func, extras_dict)
                 return result
         except IOError:
@@ -880,7 +1158,7 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         current_metasample_async = pool.apply_async(self.do_get_current_prompt)
 
         # Read all of the prompts in sample_prompts
-        paths = glob.iglob('sample_prompts/*.fish')
+        paths = glob.iglob("sample_prompts/*.fish")
         sample_results = pool.map(self.read_one_sample_prompt, paths, 1)
 
         # Finish up
@@ -893,24 +1171,26 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         # Example abbreviation line:
         # abbr -a -U -- ls 'ls -a'
         result = []
-        out, err = run_fish_cmd('abbr --show')
-        for line in out.rstrip().split('\n'):
-            if not line: continue
-            _, abbr = line.split(' -- ', 1)
-            word, phrase = abbr.split(' ', 1)
-            result.append({'word':word, 'phrase':phrase})
+        out, err = run_fish_cmd("abbr --show")
+        for line in out.rstrip().split("\n"):
+            if not line:
+                continue
+            _, abbr = line.split(" -- ", 1)
+            word, phrase = abbr.split(" ", 1)
+            result.append({"word": word, "phrase": phrase})
         return result
 
     def do_remove_abbreviation(self, abbreviation):
-        out, err = run_fish_cmd('abbr --erase %s' % abbreviation['word'])
+        out, err = run_fish_cmd("abbr --erase %s" % abbreviation["word"])
         if err:
             return err
         else:
             return None
 
     def do_save_abbreviation(self, abbreviation):
-        out, err = run_fish_cmd('abbr --add \'%s\' \'%s\'' % (
-            abbreviation['word'], abbreviation['phrase']))
+        out, err = run_fish_cmd(
+            "abbr --add '%s' '%s'" % (abbreviation["word"], abbreviation["phrase"])
+        )
         if err:
             return err
         else:
@@ -928,61 +1208,61 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         width = ansi_prompt_line_width(prompt_demo_ansi)
         # Pick a font size
         if width >= 70:
-            font_size = '8pt'
+            font_size = "8pt"
         if width >= 60:
-            font_size = '10pt'
+            font_size = "10pt"
         elif width >= 50:
-            font_size = '11pt'
+            font_size = "11pt"
         elif width >= 40:
-            font_size = '13pt'
+            font_size = "13pt"
         elif width >= 30:
-            font_size = '15pt'
+            font_size = "15pt"
         elif width >= 25:
-            font_size = '16pt'
+            font_size = "16pt"
         elif width >= 20:
-            font_size = '17pt'
+            font_size = "17pt"
         else:
-            font_size = '18pt'
+            font_size = "18pt"
         return font_size
 
     def do_GET(self):
         p = self.path
 
-        authpath = '/' + authkey
+        authpath = "/" + authkey
         if self.secure_startswith(p, authpath):
-            p = p[len(authpath):]
+            p = p[len(authpath) :]
         else:
             return self.send_error(403)
         self.path = p
 
-        if p == '/colors/':
+        if p == "/colors/":
             output = self.do_get_colors()
-        elif p == '/functions/':
+        elif p == "/functions/":
             output = self.do_get_functions()
-        elif p == '/variables/':
+        elif p == "/variables/":
             output = self.do_get_variables()
-        elif p == '/history/':
+        elif p == "/history/":
             # start = time.time()
             output = self.do_get_history()
             # end = time.time()
             # print "History: ", end - start
-        elif p == '/sample_prompts/':
+        elif p == "/sample_prompts/":
             output = self.do_get_sample_prompts_list()
         elif re.match(r"/color/(\w+)/", p):
             name = re.match(r"/color/(\w+)/", p).group(1)
             output = self.do_get_color_for_variable(name)
-        elif p == '/bindings/':
+        elif p == "/bindings/":
             output = self.do_get_bindings()
-        elif p == '/abbreviations/':
+        elif p == "/abbreviations/":
             output = self.do_get_abbreviations()
         else:
             return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
 
         # Return valid output
         self.send_response(200)
-        self.send_header('Content-type', 'application/json')
+        self.send_header("Content-type", "application/json")
         self.end_headers()
-        self.write_to_wfile('\n')
+        self.write_to_wfile("\n")
 
         # Output JSON
         self.write_to_wfile(json.dumps(output))
@@ -990,68 +1270,74 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_POST(self):
         p = self.path
 
-        authpath = '/' + authkey
+        authpath = "/" + authkey
         if self.secure_startswith(p, authpath):
-            p = p[len(authpath):]
+            p = p[len(authpath) :]
         else:
             return self.send_error(403)
         self.path = p
 
-        ctype, pdict = cgi.parse_header(self.headers['content-type'])
+        ctype, pdict = cgi.parse_header(self.headers["content-type"])
 
-        if ctype == 'multipart/form-data':
+        if ctype == "multipart/form-data":
             postvars = cgi.parse_multipart(self.rfile, pdict)
-        elif ctype == 'application/x-www-form-urlencoded':
-            length = int(self.headers['content-length'])
-            url_str = self.rfile.read(length).decode('utf-8')
+        elif ctype == "application/x-www-form-urlencoded":
+            length = int(self.headers["content-length"])
+            url_str = self.rfile.read(length).decode("utf-8")
             postvars = parse_qs(url_str, keep_blank_values=1)
-        elif ctype == 'application/json':
-            length = int(self.headers['content-length'])
-            url_str = self.rfile.read(length).decode(pdict['charset'])
+        elif ctype == "application/json":
+            length = int(self.headers["content-length"])
+            url_str = self.rfile.read(length).decode(pdict["charset"])
             postvars = json.loads(url_str)
         else:
             postvars = {}
 
-        if p == '/set_color/':
-            what = postvars.get('what')
-            color = postvars.get('color')
-            background_color = postvars.get('background_color')
-            bold = postvars.get('bold')
-            italics = postvars.get('italics')
-            reverse = postvars.get('reverse')
-            dim = postvars.get('dim')
-            underline = postvars.get('underline')
+        if p == "/set_color/":
+            what = postvars.get("what")
+            color = postvars.get("color")
+            background_color = postvars.get("background_color")
+            bold = postvars.get("bold")
+            italics = postvars.get("italics")
+            reverse = postvars.get("reverse")
+            dim = postvars.get("dim")
+            underline = postvars.get("underline")
 
             if what:
                 # Not sure why we get lists here?
                 output = self.do_set_color_for_variable(
-                    what[0], color[0], background_color[0],
-                    parse_bool(bold[0]), parse_bool(underline[0]), parse_bool(italics[0]),
-                    parse_bool(dim[0]), parse_bool(reverse[0]))
+                    what[0],
+                    color[0],
+                    background_color[0],
+                    parse_bool(bold[0]),
+                    parse_bool(underline[0]),
+                    parse_bool(italics[0]),
+                    parse_bool(dim[0]),
+                    parse_bool(reverse[0]),
+                )
             else:
-                output = 'Bad request'
-        elif p == '/get_function/':
-            what = postvars.get('what')
+                output = "Bad request"
+        elif p == "/get_function/":
+            what = postvars.get("what")
             output = [self.do_get_function(what[0])]
-        elif p == '/delete_history_item/':
-            what = postvars.get('what')
+        elif p == "/delete_history_item/":
+            what = postvars.get("what")
             if self.do_delete_history_item(what[0]):
                 output = ["OK"]
             else:
                 output = ["Unable to delete history item"]
-        elif p == '/set_prompt/':
-            what = postvars.get('fish_prompt')
+        elif p == "/set_prompt/":
+            what = postvars.get("fish_prompt")
             if self.do_set_prompt_function(what):
                 output = ["OK"]
             else:
                 output = ["Unable to set prompt"]
-        elif p == '/save_abbreviation/':
+        elif p == "/save_abbreviation/":
             errmsg = self.do_save_abbreviation(postvars)
             if errmsg:
                 output = [errmsg]
             else:
                 output = ["OK"]
-        elif p == '/remove_abbreviation/':
+        elif p == "/remove_abbreviation/":
             errmsg = self.do_remove_abbreviation(postvars)
             if errmsg:
                 output = [errmsg]
@@ -1062,26 +1348,27 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 
         # Return valid output
         self.send_response(200)
-        self.send_header('Content-type', 'application/json')
+        self.send_header("Content-type", "application/json")
         self.end_headers()
-        self.write_to_wfile('\n')
+        self.write_to_wfile("\n")
 
         # Output JSON
         self.write_to_wfile(json.dumps(output))
 
-    def log_request(self, code='-', size='-'):
+    def log_request(self, code="-", size="-"):
         """ Disable request logging """
         pass
 
     def log_error(self, format, *args):
-        if format == 'code %d, message %s':
+        if format == "code %d, message %s":
             # This appears to be a send_error() message
             # We want to include the path
             (code, msg) = args
-            format = 'code %d, message %s, path %s'
+            format = "code %d, message %s, path %s"
             args = (code, msg, self.path)
         SimpleHTTPServer.SimpleHTTPRequestHandler.log_error(self, format, *args)
 
+
 redirect_template_html = """
 <!DOCTYPE html>
 <html>
@@ -1095,15 +1382,14 @@ redirect_template_html = """
 """
 
 # find fish
-fish_bin_dir = os.environ.get('__fish_bin_dir')
+fish_bin_dir = os.environ.get("__fish_bin_dir")
 fish_bin_path = None
 if not fish_bin_dir:
-    print('The $__fish_bin_dir environment variable is not set. '
-          'Looking in $PATH...')
+    print("The $__fish_bin_dir environment variable is not set. " "Looking in $PATH...")
     # distutils.spawn is terribly broken, because it looks in wd before PATH,
     # and doesn't actually validate that the file is even executable
-    for p in os.environ['PATH'].split(os.pathsep):
-        proposed_path = os.path.join(p, 'fish')
+    for p in os.environ["PATH"].split(os.pathsep):
+        proposed_path = os.path.join(p, "fish")
         if os.access(proposed_path, os.X_OK):
             fish_bin_path = proposed_path
             break
@@ -1114,11 +1400,13 @@ if not fish_bin_dir:
         print("fish found at '%s'" % fish_bin_path)
 
 else:
-    fish_bin_path = os.path.join(fish_bin_dir, 'fish')
+    fish_bin_path = os.path.join(fish_bin_dir, "fish")
 
 if not os.access(fish_bin_path, os.X_OK):
-    print("fish could not be executed at path '%s'. "
-          "Is fish installed correctly?" % fish_bin_path)
+    print(
+        "fish could not be executed at path '%s'. "
+        "Is fish installed correctly?" % fish_bin_path
+    )
     sys.exit(-1)
 FISH_BIN_PATH = fish_bin_path
 
@@ -1132,7 +1420,7 @@ where = os.path.dirname(sys.argv[0])
 os.chdir(where)
 
 # Generate a 16-byte random key as a hexadecimal string
-authkey = binascii.b2a_hex(os.urandom(16)).decode('ascii')
+authkey = binascii.b2a_hex(os.urandom(16)).decode("ascii")
 
 # Try to find a suitable port
 PORT = 8000
@@ -1146,7 +1434,7 @@ while PORT <= 9000:
     except socket.error:
         err_type, err_value = sys.exc_info()[:2]
         # str(err_value) handles Python3 correctly
-        if 'Address already in use' not in str(err_value):
+        if "Address already in use" not in str(err_value):
             print(str(err_value))
             break
     PORT += 1
@@ -1158,23 +1446,30 @@ if PORT > 9000:
 
 # Get any initial tab (functions, colors, etc)
 # Just look at the first letter
-initial_tab = ''
+initial_tab = ""
 if len(sys.argv) > 1:
-    for tab in ['functions', 'prompt', 'colors', 'variables', 'history',
-                'bindings', 'abbreviations']:
+    for tab in [
+        "functions",
+        "prompt",
+        "colors",
+        "variables",
+        "history",
+        "bindings",
+        "abbreviations",
+    ]:
         if tab.startswith(sys.argv[1]):
-            initial_tab = '#' + tab
+            initial_tab = "#" + tab
             break
 
-url = 'http://localhost:%d/%s/%s' % (PORT, authkey, initial_tab)
+url = "http://localhost:%d/%s/%s" % (PORT, authkey, initial_tab)
 
 # Create temporary file to hold redirect to real server. This prevents exposing
 # the URL containing the authentication key on the command line (see
 # CVE-2014-2914 or https://github.com/fish-shell/fish-shell/issues/1438).
-if 'XDG_CACHE_HOME' in os.environ:
-    dirname = os.path.expanduser(os.path.expandvars('$XDG_CACHE_HOME/fish/'))
+if "XDG_CACHE_HOME" in os.environ:
+    dirname = os.path.expanduser(os.path.expandvars("$XDG_CACHE_HOME/fish/"))
 else:
-    dirname = os.path.expanduser('~/.cache/fish/')
+    dirname = os.path.expanduser("~/.cache/fish/")
 
 os.umask(0o0077)
 try:
@@ -1185,26 +1480,30 @@ except OSError as e:
     else:
         raise e
 
-randtoken = ''.join(random.choice(string.ascii_uppercase + string.digits)
-                    for _ in range(6))
-filename = dirname + 'web_config-%s.html' % randtoken
+randtoken = "".join(
+    random.choice(string.ascii_uppercase + string.digits) for _ in range(6)
+)
+filename = dirname + "web_config-%s.html" % randtoken
 
-f = open(filename, 'w')
+f = open(filename, "w")
 f.write(redirect_template_html % (url, url))
 f.close()
 
 # Open temporary file as URL
 # Use open on macOS >= 10.12.5 to work around #4035.
-fileurl = 'file://' + filename
+fileurl = "file://" + filename
 
 esc = get_special_ansi_escapes()
-print("Web config started at %s%s%s" % (esc['underline'], fileurl, esc['exit_attribute_mode']))
-print("%sHit ENTER to stop.%s" % (esc['bold'], esc['exit_attribute_mode']))
+print(
+    "Web config started at %s%s%s"
+    % (esc["underline"], fileurl, esc["exit_attribute_mode"])
+)
+print("%sHit ENTER to stop.%s" % (esc["bold"], esc["exit_attribute_mode"]))
 
 if isMacOS10_12_5_OrLater():
-    subprocess.check_call(['open', fileurl])
+    subprocess.check_call(["open", fileurl])
 elif is_wsl():
-    subprocess.call(['cmd.exe', '/c', "start %s" % url])
+    subprocess.call(["cmd.exe", "/c", "start %s" % url])
 else:
     webbrowser.open(fileurl)
 
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index e2abca392..7689bf091 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -13,21 +13,25 @@ from sphinx.errors import SphinxError, SphinxWarning
 
 # -- Helper functions --------------------------------------------------------
 
+
 def strip_ext(path):
     """ Remove the extension from a path. """
     return os.path.splitext(path)[0]
 
+
 # -- Load our Pygments lexer -------------------------------------------------
 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
+        os.path.join(this_dir, "fish_indent_lexer.py"), lexername="FishIndentLexer"
+    )
+    lexers["fish-docs-samples"] = fish_indent_lexer
+
 
 # The default language to assume
-highlight_language = 'fish-docs-samples'
+highlight_language = "fish-docs-samples"
 
 # -- Path setup --------------------------------------------------------------
 
@@ -42,14 +46,14 @@ highlight_language = 'fish-docs-samples'
 
 # -- Project information -----------------------------------------------------
 
-project = 'fish-shell'
-copyright = '2019, fish-shell developers'
-author = 'fish-shell developers'
+project = "fish-shell"
+copyright = "2019, fish-shell developers"
+author = "fish-shell developers"
 
 # The short X.Y version
-version = '3.1'
+version = "3.1"
 # The full version, including alpha/beta/rc tags
-release = '3.1.0'
+release = "3.1.0"
 
 
 # -- General configuration ---------------------------------------------------
@@ -61,20 +65,19 @@ release = '3.1.0'
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-]
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -98,7 +101,7 @@ pygments_style = None
 # a list of builtin themes.
 # !!! If you change this you also need to update the @import at the top
 # of _static/fish-syntax-style.css
-html_theme = 'nature'
+html_theme = "nature"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -109,7 +112,7 @@ html_theme = 'nature'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -119,13 +122,13 @@ html_static_path = ['_static']
 # default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
 # 'searchbox.html']``.
 #
-html_sidebars = { '**': ['globaltoc.html', 'localtoc.html', 'searchbox.html'] }
+html_sidebars = {"**": ["globaltoc.html", "localtoc.html", "searchbox.html"]}
 
 
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'fish-shelldoc'
+htmlhelp_basename = "fish-shelldoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -134,15 +137,12 @@ latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -152,34 +152,36 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'fish-shell.tex', 'fish-shell Documentation',
-     'fish-shell developers', 'manual'),
+    (
+        master_doc,
+        "fish-shell.tex",
+        "fish-shell Documentation",
+        "fish-shell developers",
+        "manual",
+    )
 ]
 
 
 # -- Options for manual page output ------------------------------------------
 
+
 def get_command_description(path, name):
     """ Return the description for a command, by parsing its synopsis line """
     with open(path) as fd:
         for line in fd:
             if line.startswith(name + " - "):
-                _, desc = line.split(' - ', 1)
+                _, desc = line.split(" - ", 1)
                 return desc.strip()
-    raise SphinxWarning('No description in file %s' % os.path.basename(path))
-
+    raise SphinxWarning("No description in file %s" % os.path.basename(path))
 
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'fish', 'fish-shell Documentation',
-     [author], 1)
-]
-for path in sorted(glob.glob('cmds/*')):
+man_pages = [(master_doc, "fish", "fish-shell Documentation", [author], 1)]
+for path in sorted(glob.glob("cmds/*")):
     docname = strip_ext(path)
     cmd = os.path.basename(docname)
-    man_pages.append((docname, cmd, get_command_description(path, cmd), '', 1))
+    man_pages.append((docname, cmd, get_command_description(path, cmd), "", 1))
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -188,9 +190,15 @@ for path in sorted(glob.glob('cmds/*')):
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'fish-shell', 'fish-shell Documentation',
-     author, 'fish-shell', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "fish-shell",
+        "fish-shell Documentation",
+        author,
+        "fish-shell",
+        "One line description of project.",
+        "Miscellaneous",
+    )
 ]
 
 
@@ -209,7 +217,7 @@ epub_title = project
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 # Disable smart-quotes to prevent double dashes from becoming emdashes.
 smartquotes = False
diff --git a/sphinx_doc_src/fish_indent_lexer.py b/sphinx_doc_src/fish_indent_lexer.py
index 1bc978731..e904023df 100644
--- a/sphinx_doc_src/fish_indent_lexer.py
+++ b/sphinx_doc_src/fish_indent_lexer.py
@@ -91,9 +91,9 @@ def tokenize_fish_command(code, offset):
         stdout=subprocess.PIPE,
         universal_newlines=False,
     )
-    stdout, _ = proc.communicate(code.encode('utf-8'))
+    stdout, _ = proc.communicate(code.encode("utf-8"))
     result = []
-    for line in stdout.decode('utf-8').splitlines():
+    for line in stdout.decode("utf-8").splitlines():
         start, end, role = line.split(",")
         start, end = int(start), int(end)
         value = code[start:end]
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 4179e0f63..4db430b19 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -19,8 +19,8 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <cstring>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <algorithm>
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index d1a9ec576..1b75a40a4 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -59,14 +59,11 @@ struct argparse_cmd_opts_t {
 };
 
 static const wchar_t *const short_options = L"+:hn:six:N:X:";
-static const struct woption long_options[] = {{L"stop-nonopt", no_argument, NULL, 's'},
-                                              {L"ignore-unknown", no_argument, NULL, 'i'},
-                                              {L"name", required_argument, NULL, 'n'},
-                                              {L"exclusive", required_argument, NULL, 'x'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"min-args", required_argument, NULL, 'N'},
-                                              {L"max-args", required_argument, NULL, 'X'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {
+    {L"stop-nonopt", no_argument, NULL, 's'},    {L"ignore-unknown", no_argument, NULL, 'i'},
+    {L"name", required_argument, NULL, 'n'},     {L"exclusive", required_argument, NULL, 'x'},
+    {L"help", no_argument, NULL, 'h'},           {L"min-args", required_argument, NULL, 'N'},
+    {L"max-args", required_argument, NULL, 'X'}, {NULL, 0, NULL, 0}};
 
 // Check if any pair of mutually exclusive options was seen. Note that since every option must have
 // a short name we only need to check those.
@@ -584,12 +581,12 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
             // A non-option argument.
             // We use `-` as the first option-string-char to disable GNU getopt's reordering,
             // otherwise we'd get ignored options first and normal arguments later.
-            // E.g. `argparse -i -- -t tango -w` needs to keep `-t tango -w` in $argv, not `-t -w tango`.
+            // E.g. `argparse -i -- -t tango -w` needs to keep `-t tango -w` in $argv, not `-t -w
+            // tango`.
             opts.argv.push_back(argv[w.woptind - 1]);
             continue;
         }
 
-
         // It's a recognized flag.
         auto found = opts.options.find(opt);
         assert(found != opts.options.end());
@@ -610,7 +607,8 @@ static int argparse_parse_args(argparse_cmd_opts_t &opts, const wcstring_list_t
                                parser_t &parser, io_streams_t &streams) {
     if (args.empty()) return STATUS_CMD_OK;
 
-    // "+" means stop at nonopt, "-" means give nonoptions the option character code `1`, and don't reorder.
+    // "+" means stop at nonopt, "-" means give nonoptions the option character code `1`, and don't
+    // reorder.
     wcstring short_options = opts.stop_nonopt ? L"+:" : L"-";
     std::vector<woption> long_options;
     populate_option_strings(opts, &short_options, &long_options);
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index dbf717347..72d00be1a 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -52,7 +52,7 @@ struct bind_cmd_opts_t {
 /// List a single key binding.
 /// Returns false if no binding with that sequence and mode exists.
 bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bool user,
-                                  io_streams_t &streams) {
+                              io_streams_t &streams) {
     wcstring_list_t ecmds;
     wcstring sets_mode;
 
@@ -102,8 +102,8 @@ bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bo
 
 // Overload with both kinds of bindings.
 // Returns false only if neither exists.
-bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bool user, bool preset,
-                                  io_streams_t &streams) {
+bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bool user,
+                              bool preset, io_streams_t &streams) {
     bool retval = false;
     if (preset) {
         retval |= list_one(seq, bind_mode, false, streams);
@@ -151,7 +151,8 @@ void builtin_bind_t::function_names(io_streams_t &streams) {
 }
 
 /// Wraps input_terminfo_get_sequence(), appending the correct error messages as needed.
-bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq, io_streams_t &streams) {
+bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq,
+                                           io_streams_t &streams) {
     if (input_terminfo_get_sequence(seq, out_seq)) {
         return true;
     }
@@ -159,7 +160,8 @@ bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq
     wcstring eseq = escape_string(seq, 0);
     if (!opts->silent) {
         if (errno == ENOENT) {
-            streams.err.append_format(_(L"%ls: No key with name '%ls' found\n"), L"bind", eseq.c_str());
+            streams.err.append_format(_(L"%ls: No key with name '%ls' found\n"), L"bind",
+                                      eseq.c_str());
         } else if (errno == EILSEQ) {
             streams.err.append_format(_(L"%ls: Key with name '%ls' does not have any mapping\n"),
                                       L"bind", eseq.c_str());
@@ -174,7 +176,7 @@ bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq
 /// Add specified key binding.
 bool builtin_bind_t::add(const wchar_t *seq, const wchar_t *const *cmds, size_t cmds_len,
                          const wchar_t *mode, const wchar_t *sets_mode, bool terminfo, bool user,
-                             io_streams_t &streams) {
+                         io_streams_t &streams) {
     if (terminfo) {
         wcstring seq2;
         if (get_terminfo_sequence(seq, &seq2, streams)) {
@@ -202,8 +204,8 @@ bool builtin_bind_t::add(const wchar_t *seq, const wchar_t *const *cmds, size_t
 /// @param  use_terminfo
 ///    Whether to look use terminfo -k name
 ///
-bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo, bool user,
-                               io_streams_t &streams) {
+bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo,
+                           bool user, io_streams_t &streams) {
     if (all) {
         input_mapping_clear(mode, user);
         return false;
@@ -228,8 +230,7 @@ bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool us
     return res;
 }
 
-bool builtin_bind_t::insert(int optind, int argc, wchar_t **argv,
-                                io_streams_t &streams) {
+bool builtin_bind_t::insert(int optind, int argc, wchar_t **argv, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int arg_count = argc - optind;
 
@@ -242,8 +243,9 @@ bool builtin_bind_t::insert(int optind, int argc, wchar_t **argv,
     } else {
         // Inserting both on the other hand makes no sense.
         if (opts->have_preset && opts->have_user) {
-            streams.err.append_format(BUILTIN_ERR_COMBO2, cmd,
-                                      L"--preset and --user can not be used together when inserting bindings.");
+            streams.err.append_format(
+                BUILTIN_ERR_COMBO2, cmd,
+                L"--preset and --user can not be used together when inserting bindings.");
             return true;
         }
     }
@@ -314,7 +316,7 @@ void builtin_bind_t::list_modes(io_streams_t &streams) {
 }
 
 int parse_cmd_opts(bind_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
-                          int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
+                   int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     static const wchar_t *const short_options = L":aehkKfM:Lm:s";
     static const struct woption long_options[] = {{L"all", no_argument, NULL, 'a'},
diff --git a/src/builtin_bind.h b/src/builtin_bind.h
index 12ba7cf49..501d81724 100644
--- a/src/builtin_bind.h
+++ b/src/builtin_bind.h
@@ -11,30 +11,30 @@ struct io_streams_t;
 struct bind_cmd_opts_t;
 
 class builtin_bind_t {
-public:
-	int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv);
-private:
-	bind_cmd_opts_t *opts;
+   public:
+    int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv);
 
-	void list(const wchar_t *bind_mode, bool user, io_streams_t &streams);
-	void key_names(bool all, io_streams_t &streams);
-	void function_names(io_streams_t &streams);
-	bool add(const wchar_t *seq, const wchar_t *const *cmds, size_t cmds_len,
-             const wchar_t *mode, const wchar_t *sets_mode, bool terminfo, bool user,
-								 io_streams_t &streams);
-	bool erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo, bool user,
-								 io_streams_t &streams);
-	bool get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq, io_streams_t &streams);
-	bool insert(int optind, int argc, wchar_t **argv,
-								 io_streams_t &streams);
-	void list_modes(io_streams_t &streams);
-	bool list_one(const wcstring &seq, const wcstring &bind_mode, bool user, io_streams_t &streams);
-	bool list_one(const wcstring &seq, const wcstring &bind_mode, bool user, bool preset, io_streams_t &streams);
+   private:
+    bind_cmd_opts_t *opts;
+
+    void list(const wchar_t *bind_mode, bool user, io_streams_t &streams);
+    void key_names(bool all, io_streams_t &streams);
+    void function_names(io_streams_t &streams);
+    bool add(const wchar_t *seq, const wchar_t *const *cmds, size_t cmds_len, const wchar_t *mode,
+             const wchar_t *sets_mode, bool terminfo, bool user, io_streams_t &streams);
+    bool erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo, bool user,
+               io_streams_t &streams);
+    bool get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq, io_streams_t &streams);
+    bool insert(int optind, int argc, wchar_t **argv, io_streams_t &streams);
+    void list_modes(io_streams_t &streams);
+    bool list_one(const wcstring &seq, const wcstring &bind_mode, bool user, io_streams_t &streams);
+    bool list_one(const wcstring &seq, const wcstring &bind_mode, bool user, bool preset,
+                  io_streams_t &streams);
 };
 
 inline int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
-	builtin_bind_t bind;
-	return bind.builtin_bind(parser, streams, argv);
+    builtin_bind_t bind;
+    return bind.builtin_bind(parser, streams, argv);
 }
 
 #endif
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index 4ac852b60..c27eeae35 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -20,10 +20,10 @@ struct builtin_cmd_opts_t {
     bool query = false;
 };
 static const wchar_t *const short_options = L":hnq";
-static const struct woption long_options[] = {
-    {L"help", no_argument, NULL, 'h'}, {L"names", no_argument, NULL, 'n'},
-    {L"query", no_argument, NULL, 'q'},
-    {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
+                                              {L"names", no_argument, NULL, 'n'},
+                                              {L"query", no_argument, NULL, 'q'},
+                                              {NULL, 0, NULL, 0}};
 
 static int parse_cmd_opts(builtin_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
diff --git a/src/builtin_command.cpp b/src/builtin_command.cpp
index e8308bb76..28a98c1ad 100644
--- a/src/builtin_command.cpp
+++ b/src/builtin_command.cpp
@@ -102,7 +102,7 @@ int builtin_command(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 if (!opts.quiet) streams.out.append_format(L"%ls\n", path.c_str());
                 ++found;
             }
-        } else { // Either find_path explicitly or just quiet.
+        } else {  // Either find_path explicitly or just quiet.
             wcstring path;
             if (path_get_path(command_name, &path, parser.vars())) {
                 if (!opts.quiet) streams.out.append_format(L"%ls\n", path.c_str());
diff --git a/src/builtin_commandline.h b/src/builtin_commandline.h
index 4fa8ef083..5237d240f 100644
--- a/src/builtin_commandline.h
+++ b/src/builtin_commandline.h
@@ -2,8 +2,8 @@
 #ifndef FISH_BUILTIN_COMMANDLINE_H
 #define FISH_BUILTIN_COMMANDLINE_H
 
-#include <cwchar>
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 1f3dcb6d4..cf5b14df5 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -263,7 +263,6 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Use one left-over arg as the do-complete argument
         // to enable `complete -C "git check"`.
         if (do_complete && !have_do_complete_param && argc == w.woptind + 1) {
-
             do_complete_param = argv[argc - 1];
             have_do_complete_param = true;
         } else {
@@ -306,7 +305,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (do_complete) {
         if (!have_do_complete_param) {
             // No argument given, try to use the current commandline.
-            const wchar_t* cmd = reader_get_buffer();
+            const wchar_t *cmd = reader_get_buffer();
             if (cmd == NULL) {
                 // This corresponds to using 'complete -C' in non-interactive mode.
                 // See #2361    .
diff --git a/src/builtin_echo.cpp b/src/builtin_echo.cpp
index 74d6db059..cbd7949e0 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtin_echo.cpp
@@ -18,7 +18,7 @@ struct echo_cmd_opts_t {
     bool interpret_special_chars = false;
 };
 static const wchar_t *const short_options = L"+:Eens";
-static const struct woption * const long_options = NULL;
+static const struct woption *const long_options = NULL;
 
 static int parse_cmd_opts(echo_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
@@ -89,7 +89,9 @@ static unsigned int builtin_echo_digit(wchar_t wc, unsigned int base) {
             return 6;
         case L'7':
             return 7;
-        default: { break; }
+        default: {
+            break;
+        }
     }
 
     if (base != 16) return UINT_MAX;
@@ -117,7 +119,9 @@ static unsigned int builtin_echo_digit(wchar_t wc, unsigned int base) {
         case L'f':
         case L'F':
             return 15;
-        default: { break; }
+        default: {
+            break;
+        }
     }
 
     return UINT_MAX;
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 7a27f254c..ad37f9c67 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -99,7 +99,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     const wcstring ft = tok_first(job->command());
-    //For compatibility with fish 2.0's $_, now replaced with `status current-command`
+    // For compatibility with fish 2.0's $_, now replaced with `status current-command`
     if (!ft.empty()) parser.vars().set_one(L"_", ENV_EXPORT, ft);
     reader_write_title(job->command(), parser);
 
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index b7e66746b..6b53c2b3c 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -40,13 +40,18 @@ struct functions_cmd_opts_t {
     wchar_t *description = NULL;
 };
 static const wchar_t *const short_options = L":HDacd:ehnqv";
-static const struct woption long_options[] = {
-    {L"erase", no_argument, NULL, 'e'},   {L"description", required_argument, NULL, 'd'},
-    {L"names", no_argument, NULL, 'n'},   {L"all", no_argument, NULL, 'a'},
-    {L"help", no_argument, NULL, 'h'},    {L"query", no_argument, NULL, 'q'},
-    {L"copy", no_argument, NULL, 'c'},    {L"details", no_argument, NULL, 'D'},
-    {L"verbose", no_argument, NULL, 'v'}, {L"handlers", no_argument, NULL, 'H'},
-    {L"handlers-type", required_argument, NULL, 't'}, {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"erase", no_argument, NULL, 'e'},
+                                              {L"description", required_argument, NULL, 'd'},
+                                              {L"names", no_argument, NULL, 'n'},
+                                              {L"all", no_argument, NULL, 'a'},
+                                              {L"help", no_argument, NULL, 'h'},
+                                              {L"query", no_argument, NULL, 'q'},
+                                              {L"copy", no_argument, NULL, 'c'},
+                                              {L"details", no_argument, NULL, 'D'},
+                                              {L"verbose", no_argument, NULL, 'v'},
+                                              {L"handlers", no_argument, NULL, 'H'},
+                                              {L"handlers-type", required_argument, NULL, 't'},
+                                              {NULL, 0, NULL, 0}};
 
 static int parse_cmd_opts(functions_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
@@ -327,9 +332,10 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         maybe_t<event_type_t> type_filter;
         if (opts.handlers_type) {
             type_filter = event_type_for_name(opts.handlers_type);
-            if (! type_filter) {
-                streams.err.append_format(_(L"%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"),
-                        cmd);
+            if (!type_filter) {
+                streams.err.append_format(_(L"%ls: Expected generic | variable | signal | exit | "
+                                            L"job-id for --handlers-type\n"),
+                                          cmd);
                 return STATUS_INVALID_ARGS;
             }
         }
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 09610b3c7..877e88e1c 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -68,8 +68,8 @@ static bool set_hist_cmd(wchar_t *const cmd, hist_cmd_t *hist_cmd, hist_cmd_t su
         const wchar_t *subcmd_str1 = enum_to_str(*hist_cmd, hist_enum_map);
         const wchar_t *subcmd_str2 = enum_to_str(sub_cmd, hist_enum_map);
         std::swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
-                 _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
-                 subcmd_str2);
+                      _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
+                      subcmd_str2);
         streams.err.append_format(BUILTIN_ERR_COMBO2, cmd, err_text);
         return false;
     }
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index ec8bb0373..2f5c264a0 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -21,7 +21,7 @@ enum {
     JOBS_PRINT_PID,      // print pid of each process in job
     JOBS_PRINT_COMMAND,  // print command name of each process in job
     JOBS_PRINT_GROUP,    // print group id of job
-    JOBS_PRINT_NOTHING,    // print nothing (exit status only)
+    JOBS_PRINT_NOTHING,  // print nothing (exit status only)
 };
 
 /// Calculates the cpu usage (in percent) of the specified job.
@@ -117,14 +117,13 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int print_last = 0;
 
     static const wchar_t *const short_options = L":cghlpq";
-    static const struct woption long_options[] = {
-        {L"command", no_argument, NULL, 'c'},
-        {L"group", no_argument, NULL, 'g'},
-        {L"help", no_argument, NULL, 'h'},
-        {L"last", no_argument, NULL, 'l'},
-        {L"pid", no_argument, NULL, 'p'},
-        {L"quiet", no_argument, NULL, 'q'},
-        {nullptr, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"command", no_argument, NULL, 'c'},
+                                                  {L"group", no_argument, NULL, 'g'},
+                                                  {L"help", no_argument, NULL, 'h'},
+                                                  {L"last", no_argument, NULL, 'l'},
+                                                  {L"pid", no_argument, NULL, 'p'},
+                                                  {L"quiet", no_argument, NULL, 'q'},
+                                                  {nullptr, 0, NULL, 0}};
 
     int opt;
     wgetopter_t w;
@@ -189,15 +188,16 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                     int jobId = -1;
                     jobId = fish_wcstoi(argv[i] + 1);
                     if (errno || jobId < -1) {
-                        streams.err.append_format(_(L"%ls: '%ls' is not a valid job id"), cmd, argv[i]);
+                        streams.err.append_format(_(L"%ls: '%ls' is not a valid job id"), cmd,
+                                                  argv[i]);
                         return STATUS_INVALID_ARGS;
                     }
                     j = job_t::from_job_id(jobId);
-                }
-                else {
+                } else {
                     int pid = fish_wcstoi(argv[i]);
                     if (errno || pid < 0) {
-                        streams.err.append_format(_(L"%ls: '%ls' is not a valid process id\n"), cmd, argv[i]);
+                        streams.err.append_format(_(L"%ls: '%ls' is not a valid process id\n"), cmd,
+                                                  argv[i]);
                         return STATUS_INVALID_ARGS;
                     }
                     j = job_t::from_pid(pid);
@@ -215,7 +215,8 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             for (const auto &j : jobs()) {
                 // Ignore unconstructed jobs, i.e. ourself.
                 if (j->is_visible()) {
-                    builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected, streams);
+                    builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected,
+                                       streams);
                     found = true;
                 }
             }
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index fdbe0a980..ebe3918af 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -54,8 +54,8 @@ static int parse_cmd_opts(math_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                 } else {
                     opts.scale = fish_wcstoi(w.woptarg);
                     if (errno || opts.scale < 0 || opts.scale > 15) {
-                        streams.err.append_format(_(L"%ls: '%ls' is not a valid scale value\n"), cmd,
-                                                  w.woptarg);
+                        streams.err.append_format(_(L"%ls: '%ls' is not a valid scale value\n"),
+                                                  cmd, w.woptarg);
                         return STATUS_INVALID_ARGS;
                     }
                 }
@@ -129,19 +129,28 @@ static const wchar_t *math_get_arg(int *argidx, wchar_t **argv, wcstring *storag
     return math_get_arg_argv(argidx, argv);
 }
 
-static const wchar_t *math_describe_error(te_error_t& error) {
+static const wchar_t *math_describe_error(te_error_t &error) {
     if (error.position == 0) return L"NO ERROR?!?";
 
-    switch(error.type) {
-        case TE_ERROR_NONE: DIE("Error has no position");
-        case TE_ERROR_UNKNOWN_VARIABLE: return _(L"Unknown variable");
-        case TE_ERROR_MISSING_CLOSING_PAREN: return _(L"Missing closing parenthesis");
-        case TE_ERROR_MISSING_OPENING_PAREN: return _(L"Missing opening parenthesis");
-        case TE_ERROR_TOO_FEW_ARGS: return _(L"Too few arguments");
-        case TE_ERROR_TOO_MANY_ARGS: return _(L"Too many arguments");
-        case TE_ERROR_MISSING_OPERATOR: return _(L"Missing operator");
-        case TE_ERROR_UNKNOWN: return _(L"Expression is bogus");
-        default: return L"Unknown error";
+    switch (error.type) {
+        case TE_ERROR_NONE:
+            DIE("Error has no position");
+        case TE_ERROR_UNKNOWN_VARIABLE:
+            return _(L"Unknown variable");
+        case TE_ERROR_MISSING_CLOSING_PAREN:
+            return _(L"Missing closing parenthesis");
+        case TE_ERROR_MISSING_OPENING_PAREN:
+            return _(L"Missing opening parenthesis");
+        case TE_ERROR_TOO_FEW_ARGS:
+            return _(L"Too few arguments");
+        case TE_ERROR_TOO_MANY_ARGS:
+            return _(L"Too many arguments");
+        case TE_ERROR_MISSING_OPERATOR:
+            return _(L"Missing operator");
+        case TE_ERROR_UNKNOWN:
+            return _(L"Expression is bogus");
+        default:
+            return L"Unknown error";
     }
 }
 
@@ -212,7 +221,7 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
     } else {
         streams.err.append_format(L"%ls: Error: %ls\n", cmd, math_describe_error(error));
         streams.err.append_format(L"'%ls'\n", expression.c_str());
-        streams.err.append_format(L"%*ls%ls\n", error.position - 1, L" ",L"^");
+        streams.err.append_format(L"%*ls%ls\n", error.position - 1, L" ", L"^");
         retval = STATUS_CMD_ERROR;
     }
     setlocale(LC_NUMERIC, saved_locale);
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 09b3a9283..55c4be7b6 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -57,10 +57,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/types.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cstring>
+#include <cwchar>
 
 #include "builtin.h"
 #include "common.h"
@@ -93,7 +93,6 @@ struct builtin_printf_state_t {
     void nonfatal_error(const wchar_t *fmt, ...);
     void fatal_error(const wchar_t *format, ...);
 
-
     long print_esc(const wchar_t *escstart, bool octal_0);
     void print_esc_string(const wchar_t *str);
     void print_esc_char(wchar_t c);
@@ -161,7 +160,9 @@ static int hex_to_bin(const wchar_t &c) {
         case L'F': {
             return 15;
         }
-        default: { return -1; }
+        default: {
+            return -1;
+        }
     }
 }
 
@@ -191,7 +192,9 @@ static int octal_to_bin(wchar_t c) {
         case L'7': {
             return 7;
         }
-        default: { return -1; }
+        default: {
+            return -1;
+        }
     }
 }
 
@@ -472,7 +475,9 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc
             fmt.append(L"l");
             break;
         }
-        default: { break; }
+        default: {
+            break;
+        }
     }
 
     // Append the conversion itself.
diff --git a/src/builtin_pwd.cpp b/src/builtin_pwd.cpp
index 66fb64efc..143bc6e8c 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtin_pwd.cpp
@@ -13,7 +13,7 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 /// The pwd builtin. Respect -P to resolve symbolic links. Respect -L to not do that (the default).
-static const wchar_t * const short_options = L"LPh";
+static const wchar_t *const short_options = L"LPh";
 static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
                                               {NULL, 0, NULL, 0}};
 int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index ec8dc974a..7210a983e 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -6,8 +6,8 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <algorithm>
@@ -55,27 +55,25 @@ struct read_cmd_opts_t {
 };
 
 static const wchar_t *const short_options = L":ac:d:ghiLlm:n:p:sSuxzP:UR:LB";
-static const struct woption long_options[] = {
-    {L"array", no_argument, NULL, 'a'},
-    {L"command", required_argument, NULL, 'c'},
-    {L"delimiter", required_argument, NULL, 'd'},
-    {L"export", no_argument, NULL, 'x'},
-    {L"global", no_argument, NULL, 'g'},
-    {L"help", no_argument, NULL, 'h'},
-    {L"line", no_argument, NULL, 'L'},
-    {L"local", no_argument, NULL, 'l'},
-    {L"mode-name", required_argument, NULL, 'm'},
-    {L"nchars", required_argument, NULL, 'n'},
-    {L"null", no_argument, NULL, 'z'},
-    {L"prompt", required_argument, NULL, 'p'},
-    {L"prompt-str", required_argument, NULL, 'P'},
-    {L"right-prompt", required_argument, NULL, 'R'},
-    {L"shell", no_argument, NULL, 'S'},
-    {L"silent", no_argument, NULL, 's'},
-    {L"unexport", no_argument, NULL, 'u'},
-    {L"universal", no_argument, NULL, 'U'},
-    {NULL, 0, NULL, 0}
-};
+static const struct woption long_options[] = {{L"array", no_argument, NULL, 'a'},
+                                              {L"command", required_argument, NULL, 'c'},
+                                              {L"delimiter", required_argument, NULL, 'd'},
+                                              {L"export", no_argument, NULL, 'x'},
+                                              {L"global", no_argument, NULL, 'g'},
+                                              {L"help", no_argument, NULL, 'h'},
+                                              {L"line", no_argument, NULL, 'L'},
+                                              {L"local", no_argument, NULL, 'l'},
+                                              {L"mode-name", required_argument, NULL, 'm'},
+                                              {L"nchars", required_argument, NULL, 'n'},
+                                              {L"null", no_argument, NULL, 'z'},
+                                              {L"prompt", required_argument, NULL, 'p'},
+                                              {L"prompt-str", required_argument, NULL, 'P'},
+                                              {L"right-prompt", required_argument, NULL, 'R'},
+                                              {L"shell", no_argument, NULL, 'S'},
+                                              {L"silent", no_argument, NULL, 's'},
+                                              {L"unexport", no_argument, NULL, 'u'},
+                                              {L"universal", no_argument, NULL, 'U'},
+                                              {NULL, 0, NULL, 0}};
 
 static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
@@ -98,8 +96,9 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                 break;
             }
             case 'i': {
-                streams.err.append_format(_(L"%ls: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n"),
-                        cmd);
+                streams.err.append_format(_(L"%ls: usage of -i for --silent is deprecated. Please "
+                                            L"use -s or --silent instead.\n"),
+                                          cmd);
                 return STATUS_INVALID_ARGS;
             }
             case L'g': {
@@ -350,17 +349,20 @@ static int read_one_char_at_a_time(int fd, wcstring &buff, int nchars, bool spli
 static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int argc,
                               const wchar_t *const *argv, parser_t &parser, io_streams_t &streams) {
     if (opts.prompt && opts.prompt_str) {
-        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd, L"-p", L"-P");
+        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd,
+                                  L"-p", L"-P");
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
 
     if (opts.have_delimiter && opts.one_line) {
-        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd, L"--delimiter", L"--line");
+        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd,
+                                  L"--delimiter", L"--line");
         return STATUS_INVALID_ARGS;
     }
     if (opts.one_line && opts.split_null) {
-        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd, L"-z", L"--line");
+        streams.err.append_format(_(L"%ls: Options %ls and %ls cannot be used together\n"), cmd,
+                                  L"-z", L"--line");
         return STATUS_INVALID_ARGS;
     }
 
@@ -449,22 +451,23 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         opts.shell = false;
     }
 
-    wchar_t * const *var_ptr = argv;
-    auto vars_left = [&] () { return argv + argc - var_ptr; };
-    auto clear_remaining_vars = [&] () {
+    wchar_t *const *var_ptr = argv;
+    auto vars_left = [&]() { return argv + argc - var_ptr; };
+    auto clear_remaining_vars = [&]() {
         while (vars_left()) {
             parser.vars().set_empty(*var_ptr, opts.place);
             ++var_ptr;
         }
     };
 
-    // Normally, we either consume a line of input or all available input. But if we are reading a line at
-    // a time, we need a middle ground where we only consume as many lines as we need to fill the given vars.
+    // Normally, we either consume a line of input or all available input. But if we are reading a
+    // line at a time, we need a middle ground where we only consume as many lines as we need to
+    // fill the given vars.
     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) {
+        // 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.
@@ -474,7 +477,8 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                    lseek(streams.stdin_fd, 0, SEEK_CUR) != -1) {
             exit_res = read_in_chunks(streams.stdin_fd, buff, opts.split_null);
         } else {
-            exit_res = read_one_char_at_a_time(streams.stdin_fd, buff, opts.nchars, opts.split_null);
+            exit_res =
+                read_one_char_at_a_time(streams.stdin_fd, buff, opts.nchars, opts.split_null);
         }
 
         if (exit_res != STATUS_CMD_OK) {
@@ -496,7 +500,8 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             // Every character is a separate token with one wrinkle involving non-array mode where
             // the final var gets the remaining characters as a single string.
             size_t x = std::max(static_cast<size_t>(1), buff.size());
-            size_t n_splits = (opts.array || static_cast<size_t>(vars_left()) > x) ? x : vars_left();
+            size_t n_splits =
+                (opts.array || static_cast<size_t>(vars_left()) > x) ? x : vars_left();
             wcstring_list_t chars;
             chars.reserve(n_splits);
 
@@ -563,7 +568,7 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 // is set to the remaining string.
                 split_about(buff.begin(), buff.end(), opts.delimiter.begin(), opts.delimiter.end(),
                             &splits, argc - 1);
-                assert(splits.size() <= (size_t) vars_left());
+                assert(splits.size() <= (size_t)vars_left());
                 for (const auto &split : splits) {
                     vars.set_one(*var_ptr++, opts.place, split);
                 }
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 62edae85b..98f51234c 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -30,7 +30,7 @@ int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     }
 
-    if (optind + 1 != argc) { // TODO: allow arbitrary args. `realpath *` should print many paths
+    if (optind + 1 != argc) {  // TODO: allow arbitrary args. `realpath *` should print many paths
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, cmd, 1, argc - optind);
         builtin_print_help(parser, streams, cmd, streams.out);
         return STATUS_INVALID_ARGS;
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index b511b03f7..94554f2e5 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -4,9 +4,9 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <algorithm>
@@ -304,8 +304,7 @@ static bool validate_path_warning_on_colons(const wchar_t *cmd,
 }
 
 static void handle_env_return(int retval, const wchar_t *cmd, const wchar_t *key,
-        io_streams_t &streams) {
-
+                              io_streams_t &streams) {
     switch (retval) {
         case ENV_OK: {
             break;
@@ -317,19 +316,18 @@ static void handle_env_return(int retval, const wchar_t *cmd, const wchar_t *key
         }
         case ENV_SCOPE: {
             streams.err.append_format(
-                _(L"%ls: Tried to modify the special variable '%ls' with the wrong scope\n"),
-                cmd, key);
+                _(L"%ls: Tried to modify the special variable '%ls' with the wrong scope\n"), cmd,
+                key);
             break;
         }
         case ENV_INVALID: {
             streams.err.append_format(
-                _(L"%ls: Tried to modify the special variable '%ls' to an invalid value\n"),
-                cmd, key);
+                _(L"%ls: Tried to modify the special variable '%ls' to an invalid value\n"), cmd,
+                key);
             break;
         }
         case ENV_NOT_FOUND: {
-            streams.err.append_format(
-                _(L"%ls: The variable '%ls' does not exist\n"), cmd, key);
+            streams.err.append_format(_(L"%ls: The variable '%ls' does not exist\n"), cmd, key);
             break;
         }
         default: {
@@ -579,8 +577,7 @@ static void show_scope(const wchar_t *var_name, int scope, io_streams_t &streams
             if (i >= 50 && i < vals.size() - 50) continue;
         }
         const wcstring value = vals[i];
-        const wcstring escaped_val =
-            escape_string(value, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT);
+        const wcstring escaped_val = escape_string(value, ESCAPE_NO_QUOTED, STRING_STYLE_SCRIPT);
         streams.out.append_format(_(L"$%ls[%d]: length=%d value=|%ls|\n"), var_name, i + 1,
                                   value.size(), escaped_val.c_str());
     }
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index d48d61319..98a74db3e 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -65,12 +65,12 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // By the time this is called we should have initialized the curses subsystem.
     assert(curses_initialized);
 
-    // Hack in missing italics and dim capabilities omitted from MacOS xterm-256color terminfo
-    // Helps Terminal.app/iTerm
-    #if __APPLE__
+// Hack in missing italics and dim capabilities omitted from MacOS xterm-256color terminfo
+// Helps Terminal.app/iTerm
+#if __APPLE__
     const auto term_prog = parser.vars().get(L"TERM_PROGRAM");
-    if (!term_prog.missing_or_empty() && (term_prog->as_string() == L"Apple_Terminal"
-        || term_prog->as_string() == L"iTerm.app")) {
+    if (!term_prog.missing_or_empty() &&
+        (term_prog->as_string() == L"Apple_Terminal" || term_prog->as_string() == L"iTerm.app")) {
         const auto term = parser.vars().get(L"TERM");
         if (!term.missing_or_empty() && (term->as_string() == L"xterm-256color")) {
             enter_italics_mode = sitm_esc;
@@ -78,7 +78,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             enter_dim_mode = dim_esc;
         }
     }
-    #endif
+#endif
 
     // Variables used for parsing the argument list.
     wchar_t *cmd = argv[0];
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 455df9fe5..1230d6e5c 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -102,24 +102,25 @@ struct status_cmd_opts_t {
 /// least until fish 3.0 and possibly longer to avoid breaking everyones config.fish and other
 /// scripts.
 static const wchar_t *const short_options = L":L:cbilfnhj:t";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-          {L"current-filename", no_argument, NULL, 'f'},
-          {L"current-line-number", no_argument, NULL, 'n'},
-          {L"filename", no_argument, NULL, 'f'},
-          {L"fish-path", no_argument, NULL, STATUS_FISH_PATH},
-          {L"is-block", no_argument, NULL, 'b'},
-          {L"is-command-substitution", no_argument, NULL, 'c'},
-          {L"is-full-job-control", no_argument, NULL, STATUS_IS_FULL_JOB_CTRL},
-          {L"is-interactive", no_argument, NULL, 'i'},
-          {L"is-interactive-job-control", no_argument, NULL, STATUS_IS_INTERACTIVE_JOB_CTRL},
-          {L"is-login", no_argument, NULL, 'l'},
-          {L"is-no-job-control", no_argument, NULL, STATUS_IS_NO_JOB_CTRL},
-          {L"job-control", required_argument, NULL, 'j'},
-          {L"level", required_argument, NULL, 'L'},
-          {L"line", no_argument, NULL, 'n'},
-          {L"line-number", no_argument, NULL, 'n'},
-          {L"print-stack-trace", no_argument, NULL, 't'},
-          {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {
+    {L"help", no_argument, NULL, 'h'},
+    {L"current-filename", no_argument, NULL, 'f'},
+    {L"current-line-number", no_argument, NULL, 'n'},
+    {L"filename", no_argument, NULL, 'f'},
+    {L"fish-path", no_argument, NULL, STATUS_FISH_PATH},
+    {L"is-block", no_argument, NULL, 'b'},
+    {L"is-command-substitution", no_argument, NULL, 'c'},
+    {L"is-full-job-control", no_argument, NULL, STATUS_IS_FULL_JOB_CTRL},
+    {L"is-interactive", no_argument, NULL, 'i'},
+    {L"is-interactive-job-control", no_argument, NULL, STATUS_IS_INTERACTIVE_JOB_CTRL},
+    {L"is-login", no_argument, NULL, 'l'},
+    {L"is-no-job-control", no_argument, NULL, STATUS_IS_NO_JOB_CTRL},
+    {L"job-control", required_argument, NULL, 'j'},
+    {L"level", required_argument, NULL, 'L'},
+    {L"line", no_argument, NULL, 'n'},
+    {L"line-number", no_argument, NULL, 'n'},
+    {L"print-stack-trace", no_argument, NULL, 't'},
+    {NULL, 0, NULL, 0}};
 
 /// Remember the status subcommand and disallow selecting more than one status subcommand.
 static bool set_status_cmd(wchar_t *const cmd, status_cmd_opts_t &opts, status_cmd_t sub_cmd,
@@ -129,8 +130,8 @@ static bool set_status_cmd(wchar_t *const cmd, status_cmd_opts_t &opts, status_c
         const wchar_t *subcmd_str1 = enum_to_str(opts.status_cmd, status_enum_map);
         const wchar_t *subcmd_str2 = enum_to_str(sub_cmd, status_enum_map);
         std::swprintf(err_text, sizeof(err_text) / sizeof(wchar_t),
-                 _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
-                 subcmd_str2);
+                      _(L"you cannot do both '%ls' and '%ls' in the same invocation"), subcmd_str1,
+                      subcmd_str2);
         streams.err.append_format(BUILTIN_ERR_COMBO2, cmd, err_text);
         return false;
     }
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 201e7ab25..d35cb276c 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -11,8 +11,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <cwctype>
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index b36921297..928d797d8 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -5,12 +5,12 @@
 
 #include <errno.h>
 #include <stdarg.h>
-#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cstring>
+#include <cwchar>
 
 #include <cmath>
 #include <memory>
@@ -24,8 +24,8 @@
 #include "parser.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-using std::unique_ptr;
 using std::move;
+using std::unique_ptr;
 
 namespace {
 namespace test_expressions {
@@ -530,7 +530,9 @@ unique_ptr<expression> test_parser::parse_expression(unsigned int start, unsigne
         case 4: {
             return parse_4_arg_expression(start, end);
         }
-        default: { return parse_combining_expression(start, end); }
+        default: {
+            return parse_combining_expression(start, end);
+        }
     }
 }
 
@@ -673,8 +675,8 @@ static bool parse_number(const wcstring &arg, number_t *number, wcstring_list_t
         // We could not parse a float or an int.
         // Check for special fish_wcsto* value or show standard EINVAL/ERANGE error.
         if (errno == -1) {
-            errors.push_back(format_string(_(L"Integer %lld in '%ls' followed by non-digit"),
-                                           integral, argcs));
+            errors.push_back(
+                format_string(_(L"Integer %lld in '%ls' followed by non-digit"), integral, argcs));
         } else {
             errors.push_back(format_string(L"%s: '%ls'", std::strerror(errno), argcs));
         }
diff --git a/src/color.cpp b/src/color.cpp
index ceaec1ffd..e27545b92 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -79,7 +79,9 @@ static int parse_hex_digit(wchar_t x) {
         case L'F': {
             return 0xF;
         }
-        default: { return -1; }
+        default: {
+            return -1;
+        }
     }
 }
 
@@ -329,7 +331,9 @@ wcstring rgb_color_t::description() const {
         case type_normal: {
             return L"normal";
         }
-        default: { break; }
+        default: {
+            break;
+        }
     }
     DIE("unknown color type");
 }
diff --git a/src/common.cpp b/src/common.cpp
index 89f9725ec..29a6a17fc 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -14,13 +14,13 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <termios.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cstring>
+#include <cwchar>
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
 #endif
@@ -63,7 +63,7 @@ constexpr wint_t NOT_A_WCHAR = static_cast<wint_t>(WEOF);
 struct termios shell_modes;
 
 /// This allows us to determine if we're running on the main thread
-static std::atomic<size_t> thread_id { 0 };
+static std::atomic<size_t> thread_id{0};
 /// This allows us to notice when we've forked.
 static relaxed_atomic_bool_t is_forked_proc{false};
 /// This allows us to bypass the main thread checks
@@ -168,8 +168,10 @@ bool is_windows_subsystem_for_linux() {
         if (std::strstr(info.release, "Microsoft") != nullptr) {
             const char *dash = std::strchr(info.release, '-');
             if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
-                debug(1, "This version of WSL is not supported and fish will probably not work correctly!\n"
-                        "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
+                debug(1,
+                      "This version of WSL is not supported and fish will probably not work "
+                      "correctly!\n"
+                      "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
             }
 
             return true;
@@ -187,8 +189,8 @@ bool is_windows_subsystem_for_linux() {
 #ifdef HAVE_BACKTRACE_SYMBOLS
 // This function produces a stack backtrace with demangled function & method names. It is based on
 // https://gist.github.com/fmela/591333 but adapted to the style of the fish project.
-[[gnu::noinline]] static const wcstring_list_t
-demangled_backtrace(int max_frames, int skip_levels) {
+[[gnu::noinline]] static const wcstring_list_t demangled_backtrace(int max_frames,
+                                                                   int skip_levels) {
     void *callstack[128];
     const int n_max_frames = sizeof(callstack) / sizeof(callstack[0]);
     int n_frames = backtrace(callstack, n_max_frames);
@@ -576,9 +578,9 @@ void fish_setlocale() {
     if (is_windows_subsystem_for_linux()) {
         // neither of \u23CE and \u25CF can be displayed in the default fonts on Windows, though
         // they can be *encoded* just fine. Use alternative glyphs.
-        omitted_newline_str = L"\u00b6";   // "pilcrow"
+        omitted_newline_str = L"\u00b6";  // "pilcrow"
         omitted_newline_width = 1;
-        obfuscation_read_char = L'\u2022'; // "bullet"
+        obfuscation_read_char = L'\u2022';  // "bullet"
     } else if (is_console_session()) {
         omitted_newline_str = L"^J";
         omitted_newline_width = 2;
@@ -653,8 +655,8 @@ static void debug_shared(const wchar_t level, const wcstring &msg) {
         std::fwprintf(stderr, L"<%lc> %ls: %ls\n", (unsigned long)level, program_name, msg.c_str());
     } else {
         current_pid = getpid();
-        std::fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", (unsigned long)level, program_name, current_pid,
-                 msg.c_str());
+        std::fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", (unsigned long)level, program_name,
+                      current_pid, msg.c_str());
     }
 }
 
@@ -1139,7 +1141,7 @@ static void escape_string_script(const wchar_t *orig_in, size_t in_len, wcstring
 /// \param in is the raw string to be searched for literally when substituted in a PCRE2 expression.
 static wcstring escape_string_pcre2(const wcstring &in) {
     wcstring out;
-    out.reserve(in.size() * 1.3); // a wild guess
+    out.reserve(in.size() * 1.3);  // a wild guess
 
     for (auto c : in) {
         switch (c) {
@@ -1156,8 +1158,9 @@ static wcstring escape_string_pcre2(const wcstring &in) {
             case L'}':
             case L'\\':
             case L'|':
-            // these two only *need* to be escaped within a character class, and technically it makes
-            // no sense to ever use process substitution output to compose a character class, but...
+            // these two only *need* to be escaped within a character class, and technically it
+            // makes no sense to ever use process substitution output to compose a character class,
+            // but...
             case L'-':
             case L']':
                 out.push_back('\\');
@@ -1652,7 +1655,9 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     }
                     break;
                 }
-                default: { break; }
+                default: {
+                    break;
+                }
             }
         }
 
@@ -2232,9 +2237,7 @@ void set_main_thread() {
 
 void configure_thread_assertions_for_testing() { thread_asserts_cfg_for_testing = true; }
 
-bool is_forked_child() {
-    return is_forked_proc;
-}
+bool is_forked_child() { return is_forked_proc; }
 
 void setup_fork_guards() {
     is_forked_proc = false;
@@ -2426,12 +2429,11 @@ std::string get_executable_path(const char *argv0) {
     // Linux compatibility layer. Per sysctl(3), passing in a process ID of -1 returns
     // the value for the current process.
     size_t buff_size = sizeof buff;
-    int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+    int name[] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
     int result = sysctl(name, sizeof(name) / sizeof(int), buff, &buff_size, nullptr, 0);
     if (result != 0) {
         wperror(L"sysctl KERN_PROC_PATHNAME");
-    }
-    else {
+    } else {
         return std::string(buff);
     }
 #else
@@ -2494,9 +2496,10 @@ bool is_console_session() {
         const char *TERM = getenv("TERM");
         return
             // Test that the tty matches /dev/(console|dcons|tty[uv\d])
-            tty_name && ((strncmp(tty_name, "/dev/tty", len) == 0 &&
-            (tty_name[len] == 'u' || tty_name[len] == 'v' || isdigit(tty_name[len])))
-            || strcmp(tty_name, "/dev/dcons") == 0 || strcmp(tty_name, "/dev/console") == 0)
+            tty_name &&
+            ((strncmp(tty_name, "/dev/tty", len) == 0 &&
+              (tty_name[len] == 'u' || tty_name[len] == 'v' || isdigit(tty_name[len]))) ||
+             strcmp(tty_name, "/dev/dcons") == 0 || strcmp(tty_name, "/dev/console") == 0)
             // and that $TERM is simple, e.g. `xterm` or `vt100`, not `xterm-something`
             && (!TERM || !strchr(TERM, '-') || !strcmp(TERM, "sun-color"));
     }();
diff --git a/src/common.h b/src/common.h
index a10db8906..5c423a929 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <limits.h>
 // Needed for va_list et al.
-#include <stdarg.h> // IWYU pragma: keep
+#include <stdarg.h>  // IWYU pragma: keep
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>  // IWYU pragma: keep
 #endif
@@ -248,7 +248,8 @@ extern const bool has_working_tty_timestamps;
 
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error);
 
-/// Shorthand for wgettext call in situations where a C-style string is needed (e.g., std::fwprintf()).
+/// Shorthand for wgettext call in situations where a C-style string is needed (e.g.,
+/// std::fwprintf()).
 #define _(wstr) wgettext(wstr).c_str()
 
 /// Noop, used to tell xgettext that a string should be translated. Use this when a string cannot be
@@ -348,26 +349,22 @@ class line_iterator_t {
     // The current location in the iteration.
     typename Collection::const_iterator current;
 
-public:
+   public:
     /// Construct from a collection (presumably std::string or std::wcstring).
     line_iterator_t(const Collection &coll) : coll(coll), current(coll.cbegin()) {}
 
     /// Access the storage in which the last line was stored.
-    const Collection &line() const {
-        return storage;
-    }
+    const Collection &line() const { return storage; }
 
     /// Advances to the next line. \return true on success, false if we have exhausted the string.
     bool next() {
-        if (current == coll.end())
-            return false;
+        if (current == coll.end()) return false;
         auto newline_or_end = std::find(current, coll.cend(), '\n');
         storage.assign(current, newline_or_end);
         current = newline_or_end;
 
         // Skip the newline.
-        if (current != coll.cend())
-            ++current;
+        if (current != coll.cend()) ++current;
         return true;
     }
 };
@@ -531,7 +528,9 @@ inline bool bool_from_string(const std::string &x) {
     }
 }
 
-inline bool bool_from_string(const wcstring &x) { return !x.empty() && std::wcschr(L"YTyt1", x.at(0)); }
+inline bool bool_from_string(const wcstring &x) {
+    return !x.empty() && std::wcschr(L"YTyt1", x.at(0));
+}
 
 wchar_t **make_null_terminated_array(const wcstring_list_t &lst);
 char **make_null_terminated_array(const std::vector<std::string> &lst);
@@ -1014,16 +1013,14 @@ std::string get_executable_path(const char *fallback);
 /// A RAII wrapper for resources that don't recur, so we don't have to create a separate RAII
 /// wrapper for each function. Avoids needing to call "return cleanup()" or similar / everywhere.
 struct cleanup_t {
-private:
+   private:
     const std::function<void()> cleanup;
-public:
-    cleanup_t(std::function<void()> exit_actions)
-        : cleanup{std::move(exit_actions)} {}
-    ~cleanup_t() {
-        cleanup();
-    }
+
+   public:
+    cleanup_t(std::function<void()> exit_actions) : cleanup{std::move(exit_actions)} {}
+    ~cleanup_t() { cleanup(); }
 };
 
 bool is_console_session();
 
-#endif // FISH_COMMON_H
+#endif  // FISH_COMMON_H
diff --git a/src/complete.cpp b/src/complete.cpp
index 51e9ac33e..392425fe1 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -8,8 +8,8 @@
 #include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <atomic>
@@ -180,13 +180,9 @@ static bool compare_completions_by_order(const completion_entry_t &p1,
     return p1.order < p2.order;
 }
 
-void completion_entry_t::add_option(const complete_entry_opt_t &opt) {
-    options.push_front(opt);
-}
+void completion_entry_t::add_option(const complete_entry_opt_t &opt) { options.push_front(opt); }
 
-const option_list_t &completion_entry_t::get_options() const {
-    return options;
-}
+const option_list_t &completion_entry_t::get_options() const { return options; }
 
 description_func_t const_desc(const wcstring &s) {
     return [=](const wcstring &ignored) {
@@ -202,7 +198,8 @@ static complete_flags_t resolve_auto_space(const wcstring &comp, complete_flags_
     if (flags & COMPLETE_AUTO_SPACE) {
         new_flags &= ~COMPLETE_AUTO_SPACE;
         size_t len = comp.size();
-        if (len > 0 && (std::wcschr(L"/=@:", comp.at(len - 1)) != 0)) new_flags |= COMPLETE_NO_SPACE;
+        if (len > 0 && (std::wcschr(L"/=@:", comp.at(len - 1)) != 0))
+            new_flags |= COMPLETE_NO_SPACE;
     }
     return new_flags;
 }
diff --git a/src/complete.h b/src/complete.h
index 397904f11..f45888a25 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -195,7 +195,6 @@ void append_completion(std::vector<completion_t> *completions, wcstring comp,
                        wcstring desc = wcstring(), int flags = 0,
                        string_fuzzy_match_t match = string_fuzzy_match_t(fuzzy_match_exact));
 
-
 /// Support for "wrap targets." A wrap target is a command that completes like another command.
 bool complete_add_wrapper(const wcstring &command, const wcstring &wrap_target);
 bool complete_remove_wrapper(const wcstring &command, const wcstring &wrap_target);
diff --git a/src/env.cpp b/src/env.cpp
index 4a58201c8..cec2f59fe 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -306,9 +306,7 @@ struct var_stack_t {
     }
 
     /// Copy this vars_stack.
-    var_stack_t clone() const {
-        return var_stack_t(*this);
-    }
+    var_stack_t clone() const { return var_stack_t(*this); }
 
     /// Snapshot this vars_stack. That is, return a new vars_stack that has copies of all local
     /// variables. Note that this drops all shadowed nodes: only the currently executing function is
@@ -610,7 +608,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
             vars.set_empty(key_and_val, ENV_EXPORT | ENV_GLOBAL);
         } else {
             key.assign(key_and_val, 0, eql);
-            val.assign(key_and_val, eql+1, wcstring::npos);
+            val.assign(key_and_val, eql + 1, wcstring::npos);
             if (is_read_only(key) || is_electric(key)) continue;
             vars.set(key, ENV_EXPORT | ENV_GLOBAL, {val});
         }
@@ -722,7 +720,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     } else {
         vars.set_pwd_from_getcwd();
     }
-    vars.set_termsize();    // initialize the terminal size variables
+    vars.set_termsize();  // initialize the terminal size variables
 
     // Set fish_bind_mode to "default".
     vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
@@ -822,7 +820,8 @@ static void env_set_internal_universal(const wcstring &key, wcstring_list_t val,
 /// * ENV_SCOPE, the variable cannot be set in the given scope. This applies to readonly/electric
 /// variables set from the local or universal scopes, or set as exported.
 /// * ENV_INVALID, the variable value was invalid. This applies only to special variables.
-int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mode, wcstring_list_t val) {
+int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mode,
+                              wcstring_list_t val) {
     ASSERT_IS_MAIN_THREAD();
     env_mode_flags_t var_mode = input_var_mode;
     bool has_changed_old = vars_stack().has_changed_exported();
diff --git a/src/env.h b/src/env.h
index 6a1a60c85..a883a0098 100644
--- a/src/env.h
+++ b/src/env.h
@@ -164,7 +164,7 @@ class env_var_t {
     bool operator==(const env_var_t &rhs) const {
         return *vals_ == *rhs.vals_ && flags_ == rhs.flags_;
     }
-    bool operator!=(const env_var_t &rhs) const { return ! (*this == rhs); }
+    bool operator!=(const env_var_t &rhs) const { return !(*this == rhs); }
 };
 typedef std::map<wcstring, env_var_t> var_table_t;
 
@@ -241,7 +241,6 @@ class env_stack_t final : public env_scoped_t {
     env_stack_t(env_stack_t &&);
 
    public:
-
     /// Sets the variable with the specified name to the given values.
     int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
 
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 3d7ef5263..ce21444d8 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -24,8 +24,8 @@
 #include <ncurses/term.h>
 #endif
 
-#include <algorithm>
 #include <assert.h>
+#include <algorithm>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 5ab4ad7ad..39d7831d8 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -43,8 +43,8 @@
 #include "path.h"
 #include "utf8.h"
 #include "util.h"  // IWYU pragma: keep
-#include "wutil.h"
 #include "wcstringutil.h"
+#include "wutil.h"
 
 #if __APPLE__
 #define FISH_NOTIFYD_AVAILABLE 1
@@ -229,7 +229,7 @@ static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &
 }
 
 /// Encoding of a null string.
-static const wchar_t * const ENV_NULL = L"\x1d";
+static const wchar_t *const ENV_NULL = L"\x1d";
 
 /// Character used to separate arrays in universal variables file.
 /// This is 30, the ASCII record separator.
@@ -433,7 +433,8 @@ std::string env_universal_t::serialize_with_vars(const var_table_t &vars) {
         // variable; soldier on.
         const wcstring &key = kv.first;
         const env_var_t &var = kv.second;
-        append_file_entry(var.get_flags(), key, encode_serialized(var.as_list()), &contents, &storage);
+        append_file_entry(var.get_flags(), key, encode_serialized(var.as_list()), &contents,
+                          &storage);
     }
     return contents;
 }
@@ -902,7 +903,7 @@ void env_universal_t::parse_message_30_internal(const wcstring &msgstr, var_tabl
 
 /// Parse message msg per fish 2.x format.
 void env_universal_t::parse_message_2x_internal(const wcstring &msgstr, var_table_t *vars,
-                                             wcstring *storage) {
+                                                wcstring *storage) {
     namespace f2x = fish2x_uvars;
     const wchar_t *const msg = msgstr.c_str();
     const wchar_t *cursor = msg;
@@ -996,8 +997,9 @@ static bool get_mac_address(unsigned char macaddr[MAC_ADDRESS_MAX_LEN]) { return
 
 /// Function to get an identifier based on the hostname.
 bool get_hostname_identifier(wcstring &result) {
-    //The behavior of gethostname if the buffer size is insufficient differs by implementation and libc version
-    //Work around this by using a "guaranteed" sufficient buffer size then truncating the result.
+    // The behavior of gethostname if the buffer size is insufficient differs by implementation and
+    // libc version Work around this by using a "guaranteed" sufficient buffer size then truncating
+    // the result.
     bool success = false;
     char hostname[256] = {};
     if (gethostname(hostname, sizeof(hostname)) == 0) {
diff --git a/src/event.cpp b/src/event.cpp
index 9cab7d427..a1f63f5f1 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -35,7 +35,7 @@ class pending_signals_t {
     /// This is not accessed from a signal handler.
     owning_lock<uint32_t> last_counter_{0};
 
-public:
+   public:
     pending_signals_t() = default;
 
     /// No copying.
@@ -64,7 +64,8 @@ public:
             return {};
         }
 
-        // The signal count has changed. Store the new counter and fetch all the signals that are set.
+        // The signal count has changed. Store the new counter and fetch all the signals that are
+        // set.
         *current = count;
         std::bitset<SIGNAL_COUNT> result{};
         uint32_t bit = 0;
@@ -183,7 +184,9 @@ wcstring event_get_desc(const event_t &evt) {
         case event_type_t::generic: {
             return format_string(_(L"handler for generic event '%ls'"), ed.str_param1.c_str());
         }
-        case event_type_t::any: { DIE("Unreachable"); }
+        case event_type_t::any: {
+            DIE("Unreachable");
+        }
         default:
             DIE("Unknown event type");
     }
@@ -291,8 +294,7 @@ static void event_fire_internal(const event_t &event) {
 void event_fire_delayed() {
     ASSERT_IS_MAIN_THREAD();
     // Do not invoke new event handlers from within event handlers.
-    if (is_event)
-        return;
+    if (is_event) return;
 
     event_list_t to_send;
     to_send.swap(blocked);
@@ -301,7 +303,7 @@ void event_fire_delayed() {
     // Append all signal events to to_send.
     auto signals = s_pending_signals.acquire_pending();
     if (signals.any()) {
-        for (uint32_t sig=0; sig < signals.size(); sig++) {
+        for (uint32_t sig = 0; sig < signals.size(); sig++) {
             if (signals.test(sig)) {
                 auto e = std::make_shared<event_t>(event_type_t::signal);
                 e->desc.param1.signal = sig;
@@ -368,7 +370,6 @@ static const wchar_t *event_name_for_type(event_type_t type) {
     return L"";
 }
 
-
 void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
     event_handler_list_t tmp = s_event_handlers;
     std::sort(tmp.begin(), tmp.end(),
@@ -401,8 +402,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
         }
 
         if (!last_type || *last_type != evt->desc.type) {
-            if (last_type)
-                streams.out.append(L"\n");
+            if (last_type) streams.out.append(L"\n");
             last_type = static_cast<event_type_t>(evt->desc.type);
             streams.out.append_format(L"Event %ls\n", event_name_for_type(*last_type));
         }
@@ -421,7 +421,8 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                 streams.out.append_format(L"%ls %ls\n", evt->desc.str_param1.c_str(),
                                           evt->function_name.c_str());
                 break;
-            case event_type_t::any: DIE("Unreachable");
+            case event_type_t::any:
+                DIE("Unreachable");
             default:
                 streams.out.append_format(L"%ls\n", evt->function_name.c_str());
                 break;
diff --git a/src/exec.cpp b/src/exec.cpp
index 414665927..f5d2003a0 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -14,9 +14,9 @@
 #include <spawn.h>
 #endif
 #include <stdio.h>
-#include <cstring>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <cstring>
 #include <stack>
 
 #include <algorithm>
@@ -675,8 +675,8 @@ static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
 
 /// Executes an external command.
 /// \return true on success, false if there is an exec error.
-static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t> &j,
-                                  process_t *p, const io_chain_t &proc_io_chain) {
+static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t> &j, process_t *p,
+                                  const io_chain_t &proc_io_chain) {
     assert(p->type == process_type_t::external && "Process is not external");
     // Get argv and envv before we fork.
     null_terminated_array_t<char> argv_array;
@@ -684,8 +684,7 @@ static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t
 
     // Convert our IO chain to a dup2 sequence.
     auto dup2s = dup2_list_t::resolve_chain(proc_io_chain);
-    if (! dup2s)
-        return false;
+    if (!dup2s) return false;
 
     // Ensure that stdin is blocking before we hand it off (see issue #176). It's a
     // little strange that we only do this with stdin and not with stdout or stderr.
diff --git a/src/expand.cpp b/src/expand.cpp
index a163fce9c..23de0beb5 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -7,10 +7,10 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <cstring>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cstring>
+#include <cwchar>
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>  // IWYU pragma: keep
@@ -124,9 +124,7 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
 
 /// Test if the specified string does not contain character which can not be used inside a quoted
 /// string.
-static bool is_quotable(const wchar_t *str) {
-    return !std::wcspbrk(str, L"\n\t\r\b\x1B");
-}
+static bool is_quotable(const wchar_t *str) { return !std::wcspbrk(str, L"\n\t\r\b\x1B"); }
 
 static bool is_quotable(const wcstring &str) { return is_quotable(str.c_str()); }
 
@@ -168,7 +166,8 @@ wcstring expand_escape_variable(const env_var_t &var) {
 /// Parse an array slicing specification Returns 0 on success. If a parse error occurs, returns the
 /// index of the bad token. Note that 0 can never be a bad index because the string always starts
 /// with [.
-static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx, size_t array_size) {
+static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx,
+                          size_t array_size) {
     const long size = (long)array_size;
     size_t pos = 1;  // skip past the opening square brace
 
@@ -360,11 +359,12 @@ static bool expand_variables(wcstring instr, std::vector<completion_t> *out, siz
         } else if (history) {
             effective_val_count = history->size();
         }
-        size_t bad_pos = parse_slice(in + slice_start, &slice_end, var_idx_list, effective_val_count);
+        size_t bad_pos =
+            parse_slice(in + slice_start, &slice_end, var_idx_list, effective_val_count);
         if (bad_pos != 0) {
             if (in[slice_start + bad_pos] == L'0') {
                 append_syntax_error(errors, slice_start + bad_pos,
-                        L"array indices start at 1, not 0.");
+                                    L"array indices start at 1, not 0.");
             } else {
                 append_syntax_error(errors, slice_start + bad_pos, L"Invalid index value");
             }
@@ -638,8 +638,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
         wchar_t *slice_end;
         size_t bad_pos;
 
-        bad_pos =
-            parse_slice(slice_begin, &slice_end, slice_idx, sub_res.size());
+        bad_pos = parse_slice(slice_begin, &slice_end, slice_idx, sub_res.size());
         if (bad_pos != 0) {
             append_syntax_error(errors, slice_begin - in + bad_pos, L"Invalid index value");
             return false;
@@ -908,7 +907,7 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completio
                 append_completion(out, std::move(input));
                 break;
             case 1: /* fallthroughs intentional */
-               append_cmdsub_error(errors, start, L"Command substitutions not allowed");
+                append_cmdsub_error(errors, start, L"Command substitutions not allowed");
             case -1:
             default:
                 return expand_result_t::error;
@@ -1140,7 +1139,6 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
                                            parse_error_list_t *errors) {
     // Fast path.
     if (expand_is_clean(instr)) {
-
         *out_cmd = instr;
         return expand_result_t::ok;
     }
diff --git a/src/fallback.cpp b/src/fallback.cpp
index fc9b478a9..7eaaa90dd 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -14,13 +14,13 @@
 #include <stdarg.h>  // IWYU pragma: keep
 #include <stdio.h>   // IWYU pragma: keep
 #include <stdlib.h>
-#include <cstring>
 #include <sys/stat.h>   // IWYU pragma: keep
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
 #include <algorithm>
+#include <cstring>
+#include <cwchar>
 #if HAVE_GETTEXT
 #include <libintl.h>
 #endif
@@ -37,7 +37,7 @@
 #include <ncurses/term.h>
 #endif
 #include <signal.h>  // IWYU pragma: keep
-#include <cwchar>   // IWYU pragma: keep
+#include <cwchar>    // IWYU pragma: keep
 
 #include "common.h"    // IWYU pragma: keep
 #include "fallback.h"  // IWYU pragma: keep
@@ -45,8 +45,8 @@
 #if defined(TPARM_SOLARIS_KLUDGE)
 #undef tparm
 
-char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4,
-                           long p5, long p6, long p7, long p8, long p9) {
+char *tparm_solaris_kludge(char *str, long p1, long p2, long p3, long p4, long p5, long p6, long p7,
+                           long p8, long p9) {
     return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9);
 }
 
@@ -97,8 +97,7 @@ int fish_mkstemp_cloexec(char *name_template) {
     return wcscasecmp_fallback(a + 1, b + 1);
 }
 
-[[gnu::unused]] static int wcsncasecmp_fallback(const wchar_t *a, const wchar_t *b,
-                                                        size_t count) {
+[[gnu::unused]] static int wcsncasecmp_fallback(const wchar_t *a, const wchar_t *b, size_t count) {
     if (count == 0) return 0;
 
     if (*a == 0) {
@@ -281,8 +280,10 @@ int fish_wcwidth(wchar_t wc) {
     // (width 1) to an emoji (probably width 2). So treat it as width 1 so the sums work. See #2652.
     // VS15 selects text presentation.
     const wchar_t variation_selector_16 = L'\uFE0F', variation_selector_15 = L'\uFE0E';
-    if (wc == variation_selector_16) return 1;
-    else if (wc == variation_selector_15) return 0;
+    if (wc == variation_selector_16)
+        return 1;
+    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,
@@ -403,4 +404,4 @@ double fish_compat::wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t lo
     uselocale(prev_locale);
     return ret;
 }
-#endif // defined(wcstod_l)
+#endif  // defined(wcstod_l)
diff --git a/src/fallback.h b/src/fallback.h
index 50796cad6..0c5ddb237 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -196,8 +196,8 @@ int flock(int fd, int op);
 #endif
 
 // NetBSD _has_ wcstod_l, but it's doing some weak linking hullabaloo that I don't get.
-// Since it doesn't have uselocale (yes, the standard function isn't there, the non-standard extension is),
-// we can't try to use the fallback.
+// Since it doesn't have uselocale (yes, the standard function isn't there, the non-standard
+// extension is), we can't try to use the fallback.
 #if !defined(HAVE_WCSTOD_L) && !defined(__NetBSD__)
 // On some platforms if this is incorrectly detected and a system-defined
 // defined version of `wcstod_l` exists, calling `wcstod` from our own
@@ -207,7 +207,7 @@ int flock(int fd, int op);
 // duplication.
 #undef wcstod_l
 namespace fish_compat {
-    double wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t loc);
+double wcstod_l(const wchar_t *enptr, wchar_t **endptr, locale_t loc);
 }
 #define wcstod_l(x, y, z) fish_compat::wcstod_l(x, y, z)
 #endif
diff --git a/src/fish.cpp b/src/fish.cpp
index 92092fe0a..34d231cd0 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -27,10 +27,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <memory>
@@ -73,8 +73,8 @@ static const char *s_profiling_output_filename = NULL;
 
 /// \return a timeval converted to milliseconds.
 long long tv_to_msec(const struct timeval &tv) {
-    long long msec = (long long)tv.tv_sec * 1000; // milliseconds per second
-    msec += tv.tv_usec / 1000; // microseconds per millisecond
+    long long msec = (long long)tv.tv_sec * 1000;  // milliseconds per second
+    msec += tv.tv_usec / 1000;                     // microseconds per millisecond
     return msec;
 }
 
@@ -130,7 +130,9 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
 #ifdef CMAKE_BINARY_DIR
         // Detect if we're running right out of the CMAKE build directory
         if (string_prefixes_string(CMAKE_BINARY_DIR, exec_path.c_str())) {
-            debug(2, "Running out of build directory, using paths relative to CMAKE_SOURCE_DIR:\n %s", CMAKE_SOURCE_DIR);
+            debug(2,
+                  "Running out of build directory, using paths relative to CMAKE_SOURCE_DIR:\n %s",
+                  CMAKE_SOURCE_DIR);
 
             done = true;
             paths.data = wcstring{L"" CMAKE_SOURCE_DIR} + L"/share";
@@ -249,7 +251,7 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
 
 /// Parse the argument list, return the index of the first non-flag arguments.
 static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
-    static const char * const short_opts = "+hPilnvc:C:p:d:f:D:";
+    static const char *const short_opts = "+hPilnvc:C:p:d:f:D:";
     static const struct option long_opts[] = {{"command", required_argument, NULL, 'c'},
                                               {"init-command", required_argument, NULL, 'C'},
                                               {"features", required_argument, NULL, 'f'},
@@ -339,7 +341,8 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
                     set_debug_stack_frames((int)tmp);
                 } else {
-                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"),
+                                  optarg);
                     exit(1);
                 }
                 break;
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 7591dcc89..4c53484ae 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -23,15 +23,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <wctype.h>
+#include <cstring>
 
 #include <cwchar>
 #include <memory>
-#include <string>
-#include <vector>
 #include <stack>
+#include <string>
 #include <tuple>
+#include <vector>
 
 #include "color.h"
 #include "common.h"
@@ -62,7 +62,7 @@ static wcstring read_file(FILE *f) {
                 if (errno == EILSEQ) {
                     // Illegal byte sequence. Try to skip past it.
                     clearerr(f);
-                    int ch = fgetc(f); // for printing the warning, and seeks forward 1 byte.
+                    int ch = fgetc(f);  // for printing the warning, and seeks forward 1 byte.
                     debug(1, "%s (byte=%X)", std::strerror(errno), ch);
                     ret = 1;
                     continue;
@@ -119,8 +119,8 @@ struct prettifier_t {
         line_continuation_indent = is_continuation ? 1 : 0;
     }
 
-    // Append whitespace as necessary. If we have a newline, append the appropriate indent. Otherwise,
-    // append a space.
+    // Append whitespace as necessary. If we have a newline, append the appropriate indent.
+    // Otherwise, append a space.
     void append_whitespace(indent_t node_indent) {
         if (needs_continuation_newline) {
             append_newline(true);
@@ -131,7 +131,6 @@ struct prettifier_t {
             output.append((node_indent + line_continuation_indent) * SPACES_PER_INDENT, L' ');
         }
     }
-
 };
 
 // Dump a parse tree node in a form helpful to someone debugging the behavior of this program.
@@ -160,8 +159,9 @@ static void dump_node(indent_t node_indent, const parse_node_t &node, const wcst
         nextc_str[2] = nextc + '@';
     }
     std::fwprintf(stderr, L"{off %4u, len %4u, indent %2u, kw %ls, %ls} [%ls|%ls|%ls]\n",
-             node.source_start, node.source_length, node_indent, keyword_description(node.keyword),
-             token_type_description(node.type), prevc_str, source_txt.c_str(), nextc_str);
+                  node.source_start, node.source_length, node_indent,
+                  keyword_description(node.keyword), token_type_description(node.type), prevc_str,
+                  source_txt.c_str(), nextc_str);
 }
 
 void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t node_idx,
@@ -185,16 +185,17 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
         const parse_node_t &node = tree.at(node_idx);
         const parse_token_type_t node_type = node.type;
         const parse_token_type_t prev_node_type =
-                node_idx > 0 ? tree.at(node_idx - 1).type : token_type_invalid;
+            node_idx > 0 ? tree.at(node_idx - 1).type : token_type_invalid;
 
-        // Increment the indent if we are either a root job_list, or root case_item_list, or in an if or
-        // while header (#1665).
-        const bool is_root_job_list = node_type == symbol_job_list && parent_type != symbol_job_list;
+        // Increment the indent if we are either a root job_list, or root case_item_list, or in an
+        // if or while header (#1665).
+        const bool is_root_job_list =
+            node_type == symbol_job_list && parent_type != symbol_job_list;
         const bool is_root_case_list =
-                node_type == symbol_case_item_list && parent_type != symbol_case_item_list;
+            node_type == symbol_case_item_list && parent_type != symbol_case_item_list;
         const bool is_if_while_header =
-                (node_type == symbol_job_conjunction || node_type == symbol_andor_job_list) &&
-                (parent_type == symbol_if_clause || parent_type == symbol_while_header);
+            (node_type == symbol_job_conjunction || node_type == symbol_andor_job_list) &&
+            (parent_type == symbol_if_clause || parent_type == symbol_while_header);
 
         if (is_root_job_list || is_root_case_list || is_if_while_header) {
             node_indent += 1;
@@ -253,7 +254,8 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
         for (node_offset_t idx = node.child_count; idx > 0; idx--) {
             // Note: We pass our type to our child, which becomes its parent node type.
             // Note: While node.child_start could be -1 (NODE_OFFSET_INVALID) the addition is safe
-            // because we won't execute this call in that case since node.child_count should be zero.
+            // because we won't execute this call in that case since node.child_count should be
+            // zero.
             pending_node_stack.push({node.child_start + (idx - 1), node_indent, node_type});
         }
     }
@@ -435,7 +437,9 @@ static const wchar_t *html_class_name_for_color(highlight_spec_t spec) {
         case highlight_role_t::selection: {
             return P(selection);
         }
-        default: { return P(other); }
+        default: {
+            return P(other);
+        }
     }
 }
 
@@ -593,7 +597,8 @@ int main(int argc, char *argv[]) {
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
                     set_debug_stack_frames((int)tmp);
                 } else {
-                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"), optarg);
+                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"),
+                                  optarg);
                     exit(1);
                 }
                 break;
@@ -612,8 +617,9 @@ int main(int argc, char *argv[]) {
     wcstring src;
     if (argc == 0) {
         if (output_type == output_type_file) {
-            std::fwprintf(stderr, _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
-                     program_name);
+            std::fwprintf(stderr,
+                          _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
+                          program_name);
             exit(1);
         }
         src = read_file(stdin);
@@ -661,7 +667,7 @@ int main(int argc, char *argv[]) {
                 exit(0);
             } else {
                 std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
-                         std::strerror(errno));
+                              std::strerror(errno));
                 exit(1);
             }
             break;
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 4549d927a..0100d690d 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -14,9 +14,9 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <termios.h>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <memory>
@@ -191,7 +191,8 @@ static double output_elapsed_time(double prev_tstamp, bool first_char_seen) {
     if (delta_tstamp_us >= 1000000) {
         std::fwprintf(stderr, L"              ");
     } else {
-        std::fwprintf(stderr, L"(%3lld.%03lld ms)  ", delta_tstamp_us / 1000, delta_tstamp_us % 1000);
+        std::fwprintf(stderr, L"(%3lld.%03lld ms)  ", delta_tstamp_us / 1000,
+                      delta_tstamp_us % 1000);
     }
     return now;
 }
@@ -293,9 +294,10 @@ static void setup_and_process_keys(bool continuous_mode) {
 
     if (continuous_mode) {
         std::fwprintf(stderr, L"\n");
-        std::fwprintf(stderr, L"To terminate this program type \"exit\" or \"quit\" in this window,\n");
+        std::fwprintf(stderr,
+                      L"To terminate this program type \"exit\" or \"quit\" in this window,\n");
         std::fwprintf(stderr, L"or press [ctrl-%c] or [ctrl-%c] twice in a row.\n",
-                 shell_modes.c_cc[VINTR] + 0x40, shell_modes.c_cc[VEOF] + 0x40);
+                      shell_modes.c_cc[VINTR] + 0x40, shell_modes.c_cc[VEOF] + 0x40);
         std::fwprintf(stderr, L"\n");
     }
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index eca2a2060..9f995b990 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -14,7 +14,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -23,8 +22,9 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cstring>
+#include <cwchar>
 #include <thread>
 
 #include <algorithm>
@@ -494,7 +494,7 @@ static char *str2hex(const char *input) {
 /// comes back through double conversion.
 static void test_convert() {
     int i;
-    std::vector<char> sb {};
+    std::vector<char> sb{};
 
     say(L"Testing wide/narrow string conversion");
 
@@ -612,10 +612,11 @@ static void test_tokenizer() {
             }
             if (types[i] != token.type) {
                 err(L"Tokenization error:");
-                std::fwprintf(stdout,
-                         L"Token number %zu of string \n'%ls'\n, expected type %ld, got token type "
-                         L"%ld\n",
-                         i + 1, str, (long)types[i], (long)token.type);
+                std::fwprintf(
+                    stdout,
+                    L"Token number %zu of string \n'%ls'\n, expected type %ld, got token type "
+                    L"%ld\n",
+                    i + 1, str, (long)types[i], (long)token.type);
             }
             i++;
         }
@@ -734,9 +735,7 @@ static void test_pthread() {
     say(L"Testing pthreads");
     pthread_t result = {};
     int val = 3;
-    bool made = make_pthread(&result, [&val](){
-        val += 2;
-    });
+    bool made = make_pthread(&result, [&val]() { val += 2; });
     do_test(made);
     void *ignore = nullptr;
     int ret = pthread_join(result, &ignore);
@@ -1900,18 +1899,20 @@ static void test_abbreviations() {
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     // If commands should be expanded.
-    expanded = reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars, &result);
+    expanded =
+        reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars, &result);
     if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"if git checkout")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
 
     // Others should not be.
-    expanded = reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars, &result);
+    expanded =
+        reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars, &result);
     if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     // Others should not be.
-    expanded =
-        reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"), vars, &result);
+    expanded = reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"),
+                                                     vars, &result);
     if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     vars.pop();
@@ -2055,11 +2056,11 @@ struct pager_layout_testcase_t {
             wcstring text = sd.line(0).to_string();
             if (text != expected) {
                 std::fwprintf(stderr, L"width %zu got %zu<%ls>, expected %zu<%ls>\n", this->width,
-                         text.length(), text.c_str(), expected.length(), expected.c_str());
+                              text.length(), text.c_str(), expected.length(), expected.c_str());
                 for (size_t i = 0; i < std::max(text.length(), expected.length()); i++) {
                     std::fwprintf(stderr, L"i %zu got <%lx> expected <%lx>\n", i,
-                             i >= text.length() ? 0xffff : text[i],
-                             i >= expected.length() ? 0xffff : expected[i]);
+                                  i >= text.length() ? 0xffff : text[i],
+                                  i >= expected.length() ? 0xffff : expected[i]);
                 }
             }
             do_test(text == expected);
@@ -2252,8 +2253,7 @@ static bool run_one_test_test(int expected, wcstring_list_t &lst, bool bracket)
     io_streams_t streams(0);
     int result = builtin_test(parser, streams, argv);
 
-    if (expected != result)
-        err(L"expected builtin_test() to return %d, got %d", expected, result);
+    if (expected != result) err(L"expected builtin_test() to return %d, got %d", expected, result);
 
     delete[] argv;
 
@@ -2716,7 +2716,7 @@ static void test_1_completion(wcstring line, const wcstring &completion, complet
         completion_apply_to_command_line(completion, flags, line, &cursor_pos, append_only);
     if (result != expected) {
         std::fwprintf(stderr, L"line %ld: %ls + %ls -> [%ls], expected [%ls]\n", source_line,
-                 line.c_str(), completion.c_str(), result.c_str(), expected.c_str());
+                      line.c_str(), completion.c_str(), result.c_str(), expected.c_str());
     }
     do_test(result == expected);
     do_test(cursor_pos == out_cursor_pos);
@@ -2759,15 +2759,15 @@ static void perform_one_autosuggestion_cd_test(const wcstring &command, const wc
     bool expects_error = (expected == L"<error>");
 
     if (comps.empty() && !expects_error) {
-        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
-                 command.c_str());
+        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n",
+                      line, command.c_str());
         do_test_from(!comps.empty(), line);
         return;
     } else if (!comps.empty() && expects_error) {
         std::fwprintf(stderr,
-                 L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
-                 L"for command %ls\n",
-                 line, command.c_str());
+                      L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
+                      L"for command %ls\n",
+                      line, command.c_str());
         do_test_from(comps.empty(), line);
     }
 
@@ -2795,15 +2795,15 @@ static void perform_one_completion_cd_test(const wcstring &command, const wcstri
     bool expects_error = (expected == L"<error>");
 
     if (comps.empty() && !expects_error) {
-        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n", line,
-                 command.c_str());
+        std::fwprintf(stderr, L"line %ld: autosuggest_suggest_special() failed for command %ls\n",
+                      line, command.c_str());
         do_test_from(!comps.empty(), line);
         return;
     } else if (!comps.empty() && expects_error) {
         std::fwprintf(stderr,
-                 L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
-                 L"for command %ls\n",
-                 line, command.c_str());
+                      L"line %ld: autosuggest_suggest_special() was expected to fail but did not, "
+                      L"for command %ls\n",
+                      line, command.c_str());
         do_test_from(comps.empty(), line);
     }
 
@@ -2813,9 +2813,9 @@ static void perform_one_completion_cd_test(const wcstring &command, const wcstri
 
         if (suggestion.completion != expected) {
             std::fwprintf(stderr,
-                     L"line %ld: complete() for cd tab completion returned the wrong expected "
-                     L"string for command %ls\n",
-                     line, command.c_str());
+                          L"line %ld: complete() for cd tab completion returned the wrong expected "
+                          L"string for command %ls\n",
+                          line, command.c_str());
             std::fwprintf(stderr, L"  actual: %ls\n", suggestion.completion.c_str());
             std::fwprintf(stderr, L"expected: %ls\n", expected.c_str());
             do_test_from(suggestion.completion == expected, line);
@@ -2935,7 +2935,7 @@ static void perform_one_autosuggestion_should_ignore_test(const wcstring &comman
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
         std::fwprintf(stderr, L"line %ld: complete() expected to return nothing for %ls\n", line,
-                 command.c_str());
+                      command.c_str());
         std::fwprintf(stderr, L"  instead got: %ls\n", suggestion.c_str());
     }
 }
@@ -3194,8 +3194,8 @@ static void test_universal_callbacks() {
     // Change uvars1.
     uvars1.set(L"alpha", env_var_t{L"2", noflags});                // changes value
     uvars1.set(L"beta", env_var_t{L"1", env_var_t::flag_export});  // changes export
-    uvars1.remove(L"delta");                // erases value
-    uvars1.set(L"epsilon", env_var_t{L"1", noflags});  // changes nothing
+    uvars1.remove(L"delta");                                       // erases value
+    uvars1.set(L"epsilon", env_var_t{L"1", noflags});              // changes nothing
     uvars1.sync(callbacks);
 
     // Change uvars2. It should treat its value as correct and ignore changes from uvars1.
@@ -4547,7 +4547,7 @@ static void test_pcre2_escape() {
 
     // all the following are intended to be ultimately matched literally - even if they don't look
     // like that's the intent - so we escape them.
-    const wchar_t * const tests[][2] = {
+    const wchar_t *const tests[][2] = {
         {L".ext", L"\\.ext"},
         {L"{word}", L"\\{word\\}"},
         {L"hola-mundo", L"hola\\-mundo"},
@@ -4558,7 +4558,8 @@ static void test_pcre2_escape() {
     for (const auto &test : tests) {
         auto escaped = escape_string(test[0], 0, STRING_STYLE_REGEX);
         if (escaped != test[1]) {
-            err(L"pcre2_escape error: pcre2_escape(%ls) -> %ls, expected %ls", test[0], escaped.c_str(), test[1]);
+            err(L"pcre2_escape error: pcre2_escape(%ls) -> %ls, expected %ls", test[0],
+                escaped.c_str(), test[1]);
         }
     }
 }
@@ -4947,9 +4948,9 @@ static void test_env_vars() {
     env_var_t v2 = {wcstring_list_t{L"abc"}, env_var_t::flag_export};
     env_var_t v3 = {wcstring_list_t{L"abc"}, 0};
     env_var_t v4 = {wcstring_list_t{L"abc", L"def"}, env_var_t::flag_export};
-    do_test(v1 == v2 && ! (v1 != v2));
-    do_test(v1 != v3 && ! (v1 == v3));
-    do_test(v1 != v4 && ! (v1 == v4));
+    do_test(v1 == v2 && !(v1 != v2));
+    do_test(v1 != v3 && !(v1 == v3));
+    do_test(v1 != v4 && !(v1 == v4));
 }
 
 static void test_illegal_command_exit_code() {
@@ -5211,8 +5212,8 @@ int main(int argc, char **argv) {
             exit(-1);
         }
         if (!std::strcmp(wd, "/")) {
-            std::fwprintf(stderr,
-                     L"Unable to find 'tests' directory, which should contain file test.fish\n");
+            std::fwprintf(
+                stderr, L"Unable to find 'tests' directory, which should contain file test.fish\n");
             exit(EXIT_FAILURE);
         }
         if (chdir(dirname(wd)) < 0) {
diff --git a/src/fish_version.cpp b/src/fish_version.cpp
index d3095575b..da8bd4ea8 100644
--- a/src/fish_version.cpp
+++ b/src/fish_version.cpp
@@ -8,7 +8,7 @@
 // The contents of FISH-BUILD-VERSION-FILE looks like:
 // FISH_BUILD_VERSION="2.7.1-62-gc0480092-dirty"
 // Arrange for it to become a variable.
-static const char * const
+static const char *const
 #include "FISH-BUILD-VERSION-FILE"
     ;
 #endif
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index 2caf145f5..f8e430cb9 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -13,7 +13,8 @@ features_t &mutable_fish_features() { return global_features; }
 const features_t::metadata_t features_t::metadata[features_t::flag_count] = {
     {stderr_nocaret, L"stderr-nocaret", L"3.0", L"^ no longer redirects stderr"},
     {qmark_noglob, L"qmark-noglob", L"3.0", L"? no longer globs"},
-    {string_replace_backslash, L"string-replace-fewer-backslashes", L"3.1", L"string replace -r needs fewer backslashes in the replacement"},
+    {string_replace_backslash, L"string-replace-fewer-backslashes", L"3.1",
+     L"string replace -r needs fewer backslashes in the replacement"},
 };
 
 const struct features_t::metadata_t *features_t::metadata_for(const wchar_t *name) {
diff --git a/src/future_feature_flags.h b/src/future_feature_flags.h
index 1c42cb21a..822c127ee 100644
--- a/src/future_feature_flags.h
+++ b/src/future_feature_flags.h
@@ -8,26 +8,26 @@
 #include "common.h"
 
 class features_t {
-public:
+   public:
     /// The list of flags.
- enum flag_t {
-     /// Whether ^ is supported for stderr redirection.
-     stderr_nocaret,
+    enum flag_t {
+        /// Whether ^ is supported for stderr redirection.
+        stderr_nocaret,
 
-     /// Whether ? is supported as a glob.
-     qmark_noglob,
+        /// Whether ? is supported as a glob.
+        qmark_noglob,
 
-     /// Whether string replace -r double-unescapes the replacement.
-     string_replace_backslash,
+        /// Whether string replace -r double-unescapes the replacement.
+        string_replace_backslash,
 
-     /// The number of flags.
-     flag_count
- };
+        /// The number of flags.
+        flag_count
+    };
 
- /// Return whether a flag is set.
- bool test(flag_t f) const {
-     assert(f >= 0 && f < flag_count && "Invalid flag");
-     return values[f];
+    /// Return whether a flag is set.
+    bool test(flag_t f) const {
+        assert(f >= 0 && f < flag_count && "Invalid flag");
+        return values[f];
     }
 
     /// Set a flag.
diff --git a/src/highlight.cpp b/src/highlight.cpp
index e79627afc..f7075795a 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -696,7 +696,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                         if (escaped_char == L'\\' || escaped_char == L'\'') {
                             colors[in_pos] = highlight_role_t::escape;      // backslash
                             colors[in_pos + 1] = highlight_role_t::escape;  // escaped char
-                            in_pos += 1;                                 // skip over backslash
+                            in_pos += 1;                                    // skip over backslash
                         }
                     }
                 } else if (c == L'\'') {
@@ -723,7 +723,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                             if (std::wcschr(L"\\\"\n$", escaped_char)) {
                                 colors[in_pos] = highlight_role_t::escape;      // backslash
                                 colors[in_pos + 1] = highlight_role_t::escape;  // escaped char
-                                in_pos += 1;                                 // skip over backslash
+                                in_pos += 1;  // skip over backslash
                             }
                         }
                         break;
@@ -1247,7 +1247,9 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
                 this->color_node(node, highlight_role_t::comment);
                 break;
             }
-            default: { break; }
+            default: {
+                break;
+            }
         }
     }
 
diff --git a/src/history.cpp b/src/history.cpp
index 02ba92aa1..3805e59f0 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -8,8 +8,8 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <cstdint>
+#include <cstring>
 // We need the sys/file.h for the flock() declaration on Linux but not OS X.
 #include <sys/file.h>  // IWYU pragma: keep
 #include <sys/mman.h>
@@ -554,7 +554,6 @@ bool history_item_t::merge(const history_item_t &item) {
 
 history_item_t::history_item_t(const wcstring &str, time_t when, history_identifier_t ident)
     : creation_timestamp(when), identifier(ident) {
-
     contents = trim(str);
     contents_lower.reserve(contents.size());
     for (const auto &c : contents) {
@@ -1971,7 +1970,6 @@ void history_t::resolve_pending() {
     this->has_pending_item = false;
 }
 
-
 static std::atomic<bool> private_mode{false};
 
 void start_private_mode() {
@@ -1981,6 +1979,4 @@ void start_private_mode() {
     vars.set_one(L"fish_private_mode", ENV_GLOBAL, L"1");
 }
 
-bool in_private_mode() {
-    return private_mode.load();
-}
+bool in_private_mode() { return private_mode.load(); }
diff --git a/src/input.cpp b/src/input.cpp
index e36a24593..8332b0bf9 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -2,8 +2,8 @@
 #include "config.h"
 
 #include <errno.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 #if HAVE_TERM_H
 #include <curses.h>
 #include <term.h>
@@ -229,7 +229,7 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands,
 
     mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
 
-    for (input_mapping_t& m : ml) {
+    for (input_mapping_t &m : ml) {
         if (m.seq == sequence && m.mode == mode) {
             m.commands = commands_vector;
             m.sets_mode = sets_mode;
@@ -289,7 +289,8 @@ void init_input() {
         input_mapping_add(L"\x3", L"commandline ''", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
         input_mapping_add(L"\x4", L"exit", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
         input_mapping_add(L"\x5", L"bind", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x7f", L"backward-delete-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping_add(L"\x7f", L"backward-delete-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE,
+                          false);
         // Arrows - can't have functions, so *-or-search isn't available.
         input_mapping_add(L"\x1B[A", L"up-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
         input_mapping_add(L"\x1B[B", L"down-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
@@ -498,7 +499,9 @@ char_event_t input_readch(bool allow_commands) {
                     input_common_next_ch(evt);
                     return input_readch();
                 }
-                default: { return evt; }
+                default: {
+                    return evt;
+                }
             }
         } else if (evt.is_eof()) {
             // If we have EOF, we need to immediately quit.
@@ -540,8 +543,7 @@ bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool us
     ASSERT_IS_MAIN_THREAD();
     bool result = false;
     mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
-    for (std::vector<input_mapping_t>::iterator it = ml.begin(), end = ml.end();
-         it != end; ++it) {
+    for (std::vector<input_mapping_t>::iterator it = ml.begin(), end = ml.end(); it != end; ++it) {
         if (sequence == it->seq && mode == it->mode) {
             ml.erase(it);
             result = true;
@@ -551,8 +553,8 @@ bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool us
     return result;
 }
 
-bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds, bool user,
-                       wcstring *out_sets_mode) {
+bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds,
+                       bool user, wcstring *out_sets_mode) {
     bool result = false;
     mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
     for (const input_mapping_t &m : ml) {
@@ -571,52 +573,21 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
     assert(curses_initialized);
     if (!cur_term) return {};  // setupterm() failed so we can't referency any key definitions
     return {
-        TERMINFO_ADD(key_a1),
-        TERMINFO_ADD(key_a3),
-        TERMINFO_ADD(key_b2),
-        TERMINFO_ADD(key_backspace),
-        TERMINFO_ADD(key_beg),
-        TERMINFO_ADD(key_btab),
-        TERMINFO_ADD(key_c1),
-        TERMINFO_ADD(key_c3),
-        TERMINFO_ADD(key_cancel),
-        TERMINFO_ADD(key_catab),
-        TERMINFO_ADD(key_clear),
-        TERMINFO_ADD(key_close),
-        TERMINFO_ADD(key_command),
-        TERMINFO_ADD(key_copy),
-        TERMINFO_ADD(key_create),
-        TERMINFO_ADD(key_ctab),
-        TERMINFO_ADD(key_dc),
-        TERMINFO_ADD(key_dl),
-        TERMINFO_ADD(key_down),
-        TERMINFO_ADD(key_eic),
-        TERMINFO_ADD(key_end),
-        TERMINFO_ADD(key_enter),
-        TERMINFO_ADD(key_eol),
-        TERMINFO_ADD(key_eos),
-        TERMINFO_ADD(key_exit),
-        TERMINFO_ADD(key_f0),
-        TERMINFO_ADD(key_f1),
-        TERMINFO_ADD(key_f2),
-        TERMINFO_ADD(key_f3),
-        TERMINFO_ADD(key_f4),
-        TERMINFO_ADD(key_f5),
-        TERMINFO_ADD(key_f6),
-        TERMINFO_ADD(key_f7),
-        TERMINFO_ADD(key_f8),
-        TERMINFO_ADD(key_f9),
-        TERMINFO_ADD(key_f10),
-        TERMINFO_ADD(key_f11),
-        TERMINFO_ADD(key_f12),
-        TERMINFO_ADD(key_f13),
-        TERMINFO_ADD(key_f14),
-        TERMINFO_ADD(key_f15),
-        TERMINFO_ADD(key_f16),
-        TERMINFO_ADD(key_f17),
-        TERMINFO_ADD(key_f18),
-        TERMINFO_ADD(key_f19),
-        TERMINFO_ADD(key_f20),
+        TERMINFO_ADD(key_a1), TERMINFO_ADD(key_a3), TERMINFO_ADD(key_b2),
+            TERMINFO_ADD(key_backspace), TERMINFO_ADD(key_beg), TERMINFO_ADD(key_btab),
+            TERMINFO_ADD(key_c1), TERMINFO_ADD(key_c3), TERMINFO_ADD(key_cancel),
+            TERMINFO_ADD(key_catab), TERMINFO_ADD(key_clear), TERMINFO_ADD(key_close),
+            TERMINFO_ADD(key_command), TERMINFO_ADD(key_copy), TERMINFO_ADD(key_create),
+            TERMINFO_ADD(key_ctab), TERMINFO_ADD(key_dc), TERMINFO_ADD(key_dl),
+            TERMINFO_ADD(key_down), TERMINFO_ADD(key_eic), TERMINFO_ADD(key_end),
+            TERMINFO_ADD(key_enter), TERMINFO_ADD(key_eol), TERMINFO_ADD(key_eos),
+            TERMINFO_ADD(key_exit), TERMINFO_ADD(key_f0), TERMINFO_ADD(key_f1),
+            TERMINFO_ADD(key_f2), TERMINFO_ADD(key_f3), TERMINFO_ADD(key_f4), TERMINFO_ADD(key_f5),
+            TERMINFO_ADD(key_f6), TERMINFO_ADD(key_f7), TERMINFO_ADD(key_f8), TERMINFO_ADD(key_f9),
+            TERMINFO_ADD(key_f10), TERMINFO_ADD(key_f11), TERMINFO_ADD(key_f12),
+            TERMINFO_ADD(key_f13), TERMINFO_ADD(key_f14), TERMINFO_ADD(key_f15),
+            TERMINFO_ADD(key_f16), TERMINFO_ADD(key_f17), TERMINFO_ADD(key_f18),
+            TERMINFO_ADD(key_f19), TERMINFO_ADD(key_f20),
 #if 0
         // I know of no keyboard with more than 20 function keys, so adding the rest here makes very
         // little sense, since it will take up a lot of room in any listings (like tab completions),
@@ -665,66 +636,26 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
         TERMINFO_ADD(key_f62),
         TERMINFO_ADD(key_f63),
 #endif
-        TERMINFO_ADD(key_find),
-        TERMINFO_ADD(key_help),
-        TERMINFO_ADD(key_home),
-        TERMINFO_ADD(key_ic),
-        TERMINFO_ADD(key_il),
-        TERMINFO_ADD(key_left),
-        TERMINFO_ADD(key_ll),
-        TERMINFO_ADD(key_mark),
-        TERMINFO_ADD(key_message),
-        TERMINFO_ADD(key_move),
-        TERMINFO_ADD(key_next),
-        TERMINFO_ADD(key_npage),
-        TERMINFO_ADD(key_open),
-        TERMINFO_ADD(key_options),
-        TERMINFO_ADD(key_ppage),
-        TERMINFO_ADD(key_previous),
-        TERMINFO_ADD(key_print),
-        TERMINFO_ADD(key_redo),
-        TERMINFO_ADD(key_reference),
-        TERMINFO_ADD(key_refresh),
-        TERMINFO_ADD(key_replace),
-        TERMINFO_ADD(key_restart),
-        TERMINFO_ADD(key_resume),
-        TERMINFO_ADD(key_right),
-        TERMINFO_ADD(key_save),
-        TERMINFO_ADD(key_sbeg),
-        TERMINFO_ADD(key_scancel),
-        TERMINFO_ADD(key_scommand),
-        TERMINFO_ADD(key_scopy),
-        TERMINFO_ADD(key_screate),
-        TERMINFO_ADD(key_sdc),
-        TERMINFO_ADD(key_sdl),
-        TERMINFO_ADD(key_select),
-        TERMINFO_ADD(key_send),
-        TERMINFO_ADD(key_seol),
-        TERMINFO_ADD(key_sexit),
-        TERMINFO_ADD(key_sf),
-        TERMINFO_ADD(key_sfind),
-        TERMINFO_ADD(key_shelp),
-        TERMINFO_ADD(key_shome),
-        TERMINFO_ADD(key_sic),
-        TERMINFO_ADD(key_sleft),
-        TERMINFO_ADD(key_smessage),
-        TERMINFO_ADD(key_smove),
-        TERMINFO_ADD(key_snext),
-        TERMINFO_ADD(key_soptions),
-        TERMINFO_ADD(key_sprevious),
-        TERMINFO_ADD(key_sprint),
-        TERMINFO_ADD(key_sr),
-        TERMINFO_ADD(key_sredo),
-        TERMINFO_ADD(key_sreplace),
-        TERMINFO_ADD(key_sright),
-        TERMINFO_ADD(key_srsume),
-        TERMINFO_ADD(key_ssave),
-        TERMINFO_ADD(key_ssuspend),
-        TERMINFO_ADD(key_stab),
-        TERMINFO_ADD(key_sundo),
-        TERMINFO_ADD(key_suspend),
-        TERMINFO_ADD(key_undo),
-        TERMINFO_ADD(key_up)
+            TERMINFO_ADD(key_find), TERMINFO_ADD(key_help), TERMINFO_ADD(key_home),
+            TERMINFO_ADD(key_ic), TERMINFO_ADD(key_il), TERMINFO_ADD(key_left),
+            TERMINFO_ADD(key_ll), TERMINFO_ADD(key_mark), TERMINFO_ADD(key_message),
+            TERMINFO_ADD(key_move), TERMINFO_ADD(key_next), TERMINFO_ADD(key_npage),
+            TERMINFO_ADD(key_open), TERMINFO_ADD(key_options), TERMINFO_ADD(key_ppage),
+            TERMINFO_ADD(key_previous), TERMINFO_ADD(key_print), TERMINFO_ADD(key_redo),
+            TERMINFO_ADD(key_reference), TERMINFO_ADD(key_refresh), TERMINFO_ADD(key_replace),
+            TERMINFO_ADD(key_restart), TERMINFO_ADD(key_resume), TERMINFO_ADD(key_right),
+            TERMINFO_ADD(key_save), TERMINFO_ADD(key_sbeg), TERMINFO_ADD(key_scancel),
+            TERMINFO_ADD(key_scommand), TERMINFO_ADD(key_scopy), TERMINFO_ADD(key_screate),
+            TERMINFO_ADD(key_sdc), TERMINFO_ADD(key_sdl), TERMINFO_ADD(key_select),
+            TERMINFO_ADD(key_send), TERMINFO_ADD(key_seol), TERMINFO_ADD(key_sexit),
+            TERMINFO_ADD(key_sf), TERMINFO_ADD(key_sfind), TERMINFO_ADD(key_shelp),
+            TERMINFO_ADD(key_shome), TERMINFO_ADD(key_sic), TERMINFO_ADD(key_sleft),
+            TERMINFO_ADD(key_smessage), TERMINFO_ADD(key_smove), TERMINFO_ADD(key_snext),
+            TERMINFO_ADD(key_soptions), TERMINFO_ADD(key_sprevious), TERMINFO_ADD(key_sprint),
+            TERMINFO_ADD(key_sr), TERMINFO_ADD(key_sredo), TERMINFO_ADD(key_sreplace),
+            TERMINFO_ADD(key_sright), TERMINFO_ADD(key_srsume), TERMINFO_ADD(key_ssave),
+            TERMINFO_ADD(key_ssuspend), TERMINFO_ADD(key_stab), TERMINFO_ADD(key_sundo),
+            TERMINFO_ADD(key_suspend), TERMINFO_ADD(key_undo), TERMINFO_ADD(key_up)
     };
 }
 
diff --git a/src/input.h b/src/input.h
index f76cede6a..08b271ad4 100644
--- a/src/input.h
+++ b/src/input.h
@@ -63,12 +63,13 @@ std::vector<input_mapping_name_t> input_mapping_get_names(bool user = true);
 void input_mapping_clear(const wchar_t *mode = NULL, bool user = true);
 
 /// Erase binding for specified key sequence.
-bool input_mapping_erase(const wcstring &sequence, const wcstring &mode = DEFAULT_BIND_MODE, bool user = true);
+bool input_mapping_erase(const wcstring &sequence, const wcstring &mode = DEFAULT_BIND_MODE,
+                         bool user = true);
 
 /// Gets the command bound to the specified key sequence in the specified mode. Returns true if it
 /// exists, false if not.
-bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds, bool user,
-                       wcstring *out_new_mode);
+bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds,
+                       bool user, wcstring *out_new_mode);
 
 /// Return the current bind mode.
 wcstring input_get_bind_mode(const environment_t &vars);
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 6301aac5e..fb82b1842 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -2,8 +2,8 @@
 #include "config.h"
 
 #include <errno.h>
-#include <cstring>
 #include <unistd.h>
+#include <cstring>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -167,9 +167,9 @@ void update_wait_on_escape_ms(const environment_t &vars) {
     long tmp = fish_wcstol(escape_time_ms->as_string().c_str());
     if (errno || tmp < 10 || tmp >= 5000) {
         std::fwprintf(stderr,
-                 L"ignoring fish_escape_delay_ms: value '%ls' "
-                 L"is not an integer or is < 10 or >= 5000 ms\n",
-                 escape_time_ms->as_string().c_str());
+                      L"ignoring fish_escape_delay_ms: value '%ls' "
+                      L"is not an integer or is < 10 or >= 5000 ms\n",
+                      escape_time_ms->as_string().c_str());
     } else {
         wait_on_escape_ms = (int)tmp;
     }
@@ -208,7 +208,9 @@ char_event_t input_common_readch() {
             case 0: {
                 return 0;
             }
-            default: { return res; }
+            default: {
+                return res;
+            }
         }
     }
 }
diff --git a/src/io.cpp b/src/io.cpp
index 535be1ea0..d1a53ff97 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -4,8 +4,8 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <cstring>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include "common.h"
@@ -49,7 +49,8 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
     // 3. read until EAGAIN (would block), appending
     // 4. release the lock
     // The purpose of holding the lock around the read calls is to ensure that data from background
-    // processes isn't weirdly interspersed with data directly transferred (from a builtin to a buffer).
+    // processes isn't weirdly interspersed with data directly transferred (from a builtin to a
+    // buffer).
 
     const int fd = readfd.fd();
 
@@ -90,7 +91,7 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
         // It's important that if select() indicated we were readable, that we call select() again
         // allowing it to time out. Note the typical case is that the fd will be closed, in which
         // case select will return immediately.
-        if (! readable) {
+        if (!readable) {
             shutdown = this->shutdown_fillthread_.load(std::memory_order_relaxed);
         }
 
@@ -191,7 +192,7 @@ io_pipe_t::~io_pipe_t() = default;
 io_bufferfill_t::~io_bufferfill_t() = default;
 
 io_buffer_t::~io_buffer_t() {
-    assert(! fillthread_ && "io_buffer_t destroyed with outstanding fillthread");
+    assert(!fillthread_ && "io_buffer_t destroyed with outstanding fillthread");
 }
 
 void io_chain_t::remove(const shared_ptr<const io_data_t> &element) {
@@ -247,7 +248,6 @@ void io_print(const io_chain_t &chain)
 }
 #endif
 
-
 int move_fd_to_unused(int fd, const io_chain_t &io_chain, bool cloexec) {
     if (fd < 0 || io_chain.get_io_for_fd(fd).get() == NULL) {
         return fd;
diff --git a/src/io.h b/src/io.h
index e72a00291..042e8a9bf 100644
--- a/src/io.h
+++ b/src/io.h
@@ -76,42 +76,40 @@ class separated_buffer_t {
     separated_buffer_t(const separated_buffer_t &) = delete;
     void operator=(const separated_buffer_t &) = delete;
 
-public:
- /// Construct a separated_buffer_t with the given buffer limit \p limit, or 0 for no limit.
- separated_buffer_t(size_t limit) : buffer_limit_(limit) {}
+   public:
+    /// Construct a separated_buffer_t with the given buffer limit \p limit, or 0 for no limit.
+    separated_buffer_t(size_t limit) : buffer_limit_(limit) {}
 
- /// \return the buffer limit size, or 0 for no limit.
- size_t limit() const { return buffer_limit_; }
+    /// \return the buffer limit size, or 0 for no limit.
+    size_t limit() const { return buffer_limit_; }
 
- /// \return the contents size.
- size_t size() const { return contents_size_; }
+    /// \return the contents size.
+    size_t size() const { return contents_size_; }
 
- /// \return whether the output has been discarded.
- bool discarded() const { return discard; }
+    /// \return whether the output has been discarded.
+    bool discarded() const { return discard; }
 
- /// Mark the contents as discarded.
- void set_discard() {
-     elements_.clear();
-     contents_size_ = 0;
-     discard = true;
- }
+    /// Mark the contents as discarded.
+    void set_discard() {
+        elements_.clear();
+        contents_size_ = 0;
+        discard = true;
+    }
 
- void reset_discard() {
-     discard = false;
- }
+    void reset_discard() { discard = false; }
 
- /// Serialize the contents to a single string, where explicitly separated elements have a
- /// newline appended.
- StringType newline_serialized() const {
-     StringType result;
-     result.reserve(size());
-     for (const auto &elem : elements_) {
-         result.append(elem.contents);
-         if (elem.is_explicitly_separated()) {
-             result.push_back('\n');
-         }
-     }
-     return result;
+    /// Serialize the contents to a single string, where explicitly separated elements have a
+    /// newline appended.
+    StringType newline_serialized() const {
+        StringType result;
+        result.reserve(size());
+        for (const auto &elem : elements_) {
+            result.append(elem.contents);
+            if (elem.is_explicitly_separated()) {
+                result.push_back('\n');
+            }
+        }
+        return result;
     }
 
     /// \return the list of elements.
@@ -122,7 +120,8 @@ class separated_buffer_t {
     void append(Iterator begin, Iterator end, separation_type_t sep = separation_type_t::inferred) {
         if (!try_add_size(std::distance(begin, end))) return;
         // Try merging with the last element.
-        if (sep == separation_type_t::inferred && !elements_.empty() && !elements_.back().is_explicitly_separated()) {
+        if (sep == separation_type_t::inferred && !elements_.empty() &&
+            !elements_.back().is_explicitly_separated()) {
             elements_.back().contents.append(begin, end);
         } else {
             elements_.emplace_back(StringType(begin, end), sep);
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 8034d3183..eb07ac854 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -4,12 +4,12 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
-#include <cstring>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <atomic>
+#include <cstring>
 
 #include <condition_variable>
 #include <queue>
@@ -246,7 +246,7 @@ void iothread_drain_all() {
 #if TIME_DRAIN
     double after = timef();
     std::fwprintf(stdout, L"(Waited %.02f msec for %d thread(s) to drain)\n", 1000 * (after - now),
-             thread_count);
+                  thread_count);
 #endif
 }
 
diff --git a/src/maybe.h b/src/maybe.h
index b86b1c1ee..4f0a78800 100644
--- a/src/maybe.h
+++ b/src/maybe.h
@@ -191,9 +191,9 @@ class maybe_t : private maybe_detail::conditionally_copyable_t<T> {
 
     // Helper to replace missing_or_empty() on env_var_t.
     // Uses SFINAE to only introduce this function if T has an empty() type.
-    template<typename S = T>
+    template <typename S = T>
     decltype(S().empty(), bool()) missing_or_empty() const {
-        return ! has_value() || value().empty();
+        return !has_value() || value().empty();
     }
 
     // Compare values for equality.
diff --git a/src/pager.cpp b/src/pager.cpp
index 7e00ff914..c39a4a4a6 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -2,8 +2,8 @@
 
 // IWYU pragma: no_include <cstddef>
 #include <stddef.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <numeric>
@@ -163,12 +163,11 @@ line_t pager_t::completion_print_item(const wcstring &prefix, const comp_t *c, s
         const wcstring &comp = c->comp.at(i);
 
         if (i > 0) {
-            comp_remaining -= print_max(PAGER_SPACER_STRING, bg, comp_remaining,
-                                        true /* has_more */, &line_data);
+            comp_remaining -=
+                print_max(PAGER_SPACER_STRING, bg, comp_remaining, true /* has_more */, &line_data);
         }
 
-        comp_remaining -=
-            print_max(prefix, prefix_col, comp_remaining, !comp.empty(), &line_data);
+        comp_remaining -= print_max(prefix, prefix_col, comp_remaining, !comp.empty(), &line_data);
         comp_remaining -=
             print_max(comp, comp_col, comp_remaining, i + 1 < c->comp.size(), &line_data);
     }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2a5c4ad72..acd7579fd 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <memory>
@@ -1314,7 +1314,7 @@ parse_execution_result_t parse_execution_context_t::run_job_conjunction(
             assert((conj == parse_bool_and || conj == parse_bool_or) && "Unexpected conjunction");
             skip = should_skip(conj);
         }
-        if (! skip) {
+        if (!skip) {
             result = run_1_job(cursor.child<0>(), associated_block);
         }
         continuation = cursor.child<1>();
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 673d9cd9b..38abdbf67 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -127,7 +127,8 @@ class parse_execution_context_t {
                             io_chain_t *out_chain);
 
     parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_conj, const block_t *associated_block);
+    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_conj,
+                                                 const block_t *associated_block);
     template <typename Type>
     parse_execution_result_t run_job_list(tnode_t<Type> job_list_node,
                                           const block_t *associated_block);
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index b6b1cb2ee..be5c23512 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -214,9 +214,7 @@ DEF_ALT(job_decorator) {
 };
 
 // A job_conjunction is a job followed by a continuation.
-DEF(job_conjunction) produces_sequence<job, job_conjunction_continuation> {
-    BODY(job_conjunction)
-};
+DEF(job_conjunction) produces_sequence<job, job_conjunction_continuation>{BODY(job_conjunction)};
 
 DEF_ALT(job_conjunction_continuation) {
     using andands = seq<tok_andand, optional_newlines, job_conjunction>;
@@ -279,9 +277,8 @@ DEF_ALT(case_item_list) {
     ALT_BODY(case_item_list, empty, case_items, blank_line);
 };
 
-DEF(case_item) produces_sequence<keyword<parse_keyword_case>, argument_list, tok_end, job_list> {
-    BODY(case_item)
-};
+DEF(case_item)
+produces_sequence<keyword<parse_keyword_case>, argument_list, tok_end, job_list>{BODY(case_item)};
 
 DEF(block_statement)
 produces_sequence<block_header, job_list, end_command, arguments_or_redirections_list>{
@@ -297,9 +294,7 @@ DEF_ALT(block_header) {
 
 DEF(for_header)
 produces_sequence<keyword<parse_keyword_for>, tok_string, keyword<parse_keyword_in>, argument_list,
-                  tok_end> {
-    BODY(for_header)
-};
+                  tok_end>{BODY(for_header)};
 
 DEF(while_header)
 produces_sequence<keyword<parse_keyword_while>, job_conjunction, tok_end, andor_job_list>{
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 4718d826a..2d30fefc5 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -57,7 +57,9 @@ RESOLVE(job_list) {
         case parse_token_type_terminate: {
             return production_for<empty>();  // no more commands, just transition to empty
         }
-        default: { return NO_PRODUCTION; }
+        default: {
+            return NO_PRODUCTION;
+        }
     }
 }
 
@@ -166,7 +168,9 @@ RESOLVE(statement) {
                     return NO_PRODUCTION;
                 }
                 // All other keywords fall through to decorated statement.
-                default: { return production_for<decorated>(); }
+                default: {
+                    return production_for<decorated>();
+                }
             }
             break;
         }
@@ -176,7 +180,9 @@ RESOLVE(statement) {
         case parse_token_type_terminate: {
             return NO_PRODUCTION;
         }
-        default: { return NO_PRODUCTION; }
+        default: {
+            return NO_PRODUCTION;
+        }
     }
 }
 
@@ -188,7 +194,9 @@ RESOLVE(else_clause) {
         case parse_keyword_else: {
             return production_for<else_cont>();
         }
-        default: { return production_for<empty>(); }
+        default: {
+            return production_for<empty>();
+        }
     }
 }
 
@@ -200,7 +208,9 @@ RESOLVE(else_continuation) {
         case parse_keyword_if: {
             return production_for<else_if>();
         }
-        default: { return production_for<else_only>(); }
+        default: {
+            return production_for<else_only>();
+        }
     }
 }
 
@@ -252,7 +262,9 @@ RESOLVE(argument_list) {
         case parse_token_type_string: {
             return production_for<arg>();
         }
-        default: { return production_for<empty>(); }
+        default: {
+            return production_for<empty>();
+        }
     }
 }
 
@@ -267,7 +279,9 @@ RESOLVE(freestanding_argument_list) {
         case parse_token_type_end: {
             return production_for<semicolon>();
         }
-        default: { return production_for<empty>(); }
+        default: {
+            return production_for<empty>();
+        }
     }
 }
 
@@ -288,12 +302,13 @@ RESOLVE(block_header) {
         case parse_keyword_begin: {
             return production_for<beginh>();
         }
-        default: { return NO_PRODUCTION; }
+        default: {
+            return NO_PRODUCTION;
+        }
     }
 }
 
 RESOLVE(decorated_statement) {
-
     // If this is e.g. 'command --help' then the command is 'command' and not a decoration. If the
     // second token is not a string, then this is a naked 'command' and we should execute it as
     // undecorated.
@@ -357,7 +372,6 @@ RESOLVE(optional_background) {
     }
 }
 
-
 const production_element_t *parse_productions::production_for_token(parse_token_type_t node_type,
                                                                     const parse_token_t &input1,
                                                                     const parse_token_t &input2,
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index cd7b35568..3b8c374ce 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -178,7 +178,9 @@ static wcstring token_type_user_presentable_description(
             return L"end of the statement";
         case parse_token_type_terminate:
             return L"end of the input";
-        default: { return format_string(L"a %ls", token_type_description(type)); }
+        default: {
+            return format_string(L"a %ls", token_type_description(type));
+        }
     }
 }
 
@@ -202,7 +204,9 @@ static wcstring block_type_user_presentable_description(parse_token_type_t type)
         case symbol_switch_statement: {
             return L"switch statement";
         }
-        default: { return token_type_description(type); }
+        default: {
+            return token_type_description(type);
+        }
     }
 }
 
@@ -414,7 +418,7 @@ class parse_ll_t {
                 parse_token_type_t type = production_element_type(elem);
                 parse_keyword_t keyword = production_element_keyword(elem);
                 std::fwprintf(stderr, L"\t%ls <%ls>\n", token_type_description(type),
-                         keyword_description(keyword));
+                              keyword_description(keyword));
                 count++;
             }
             if (!count) std::fwprintf(stderr, L"\t<empty>\n");
@@ -690,8 +694,7 @@ void parse_ll_t::parse_error_failed_production(struct parse_stack_element_t &sta
 void parse_ll_t::report_tokenizer_error(const tok_t &tok) {
     parse_error_code_t parse_error_code = parse_error_from_tokenizer_error(tok.error);
     this->parse_error_at_location(tok.offset, tok.length, tok.offset + tok.error_offset,
-                                  parse_error_code, L"%ls",
-                                  tokenizer_get_error_message(tok.error));
+                                  parse_error_code, L"%ls", tokenizer_get_error_message(tok.error));
 }
 
 void parse_ll_t::parse_error_unexpected_token(const wchar_t *expected, parse_token_t token) {
@@ -730,7 +733,9 @@ static bool type_is_terminal_type(parse_token_type_t type) {
         case parse_token_type_terminate: {
             return true;
         }
-        default: { return false; }
+        default: {
+            return false;
+        }
     }
 }
 
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 9e032f11d..e0ddf63d2 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -28,11 +28,11 @@ constexpr source_offset_t SOURCE_OFFSET_INVALID = static_cast<source_offset_t>(-
 /// A struct representing the token type that we use internally.
 struct parse_token_t {
     enum parse_token_type_t type;  // The type of the token as represented by the parser
-    enum parse_keyword_t keyword{parse_keyword_none};  // Any keyword represented by this token
-    bool has_dash_prefix{false};          // Hackish: whether the source contains a dash prefix
-    bool is_help_argument{false};         // Hackish: whether the source looks like '-h' or '--help'
-    bool is_newline{false};               // Hackish: if TOK_END, whether the source is a newline.
-    bool preceding_escaped_nl{false};     // Whether there was an escaped newline preceding this token.
+    enum parse_keyword_t keyword { parse_keyword_none };  // Any keyword represented by this token
+    bool has_dash_prefix{false};       // Hackish: whether the source contains a dash prefix
+    bool is_help_argument{false};      // Hackish: whether the source looks like '-h' or '--help'
+    bool is_newline{false};            // Hackish: if TOK_END, whether the source is a newline.
+    bool preceding_escaped_nl{false};  // Whether there was an escaped newline preceding this token.
     source_offset_t source_start{SOURCE_OFFSET_INVALID};
     source_offset_t source_length{0};
 
@@ -130,9 +130,7 @@ class parse_node_t {
     }
 
     /// Indicate if the node has comment nodes.
-    bool has_comments() const {
-        return this->flags & parse_node_flag_has_comments;
-    }
+    bool has_comments() const { return this->flags & parse_node_flag_has_comments; }
 
     /// Indicates if we have a preceding escaped newline.
     bool has_preceding_escaped_newline() const {
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 7bace8694..8d3a987b7 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -328,7 +328,9 @@ static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const
                 }
                 break;
             }
-            default: { break; }
+            default: {
+                break;
+            }
         }
     }
 
@@ -510,7 +512,8 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
 
     if (offset != 0) {
         if (finished) {
-            while ((cmd_tmp[prev_pos] != 0) && (std::wcschr(L";|", cmd_tmp[prev_pos]) != 0)) prev_pos++;
+            while ((cmd_tmp[prev_pos] != 0) && (std::wcschr(L";|", cmd_tmp[prev_pos]) != 0))
+                prev_pos++;
             *offset = prev_pos;
         } else {
             *offset = pos;
@@ -674,8 +677,9 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
     // foo ; cas', we get an invalid parse tree (since 'cas' is not valid) but we indent it as if it
     // were a case item list.
     parse_node_tree_t tree;
-    parse_tree_from_string(src, parse_flag_continue_after_error | parse_flag_include_comments |
-                                    parse_flag_accept_incomplete_tokens,
+    parse_tree_from_string(src,
+                           parse_flag_continue_after_error | parse_flag_include_comments |
+                               parse_flag_accept_incomplete_tokens,
                            &tree, NULL /* errors */);
 
     // Start indenting at the first node. If we have a parse error, we'll have to start indenting
@@ -826,7 +830,9 @@ static const wchar_t *error_format_for_character(wchar_t wc) {
         case VARIABLE_EXPAND_EMPTY: {
             return ERROR_NOT_PID;
         }
-        default: { return ERROR_BAD_VAR_CHAR1; }
+        default: {
+            return ERROR_BAD_VAR_CHAR1;
+        }
     }
 }
 
diff --git a/src/parser.cpp b/src/parser.cpp
index c07fcdc1c..c0c62f03f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -393,7 +393,8 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
                         // We can't quote the arguments because we print this in quotes.
                         // As a special-case, add the empty argument as "".
                         if (process->argv(i)[0]) {
-                            tmp.append(escape_string(process->argv(i), ESCAPE_ALL | ESCAPE_NO_QUOTED));
+                            tmp.append(
+                                escape_string(process->argv(i), ESCAPE_ALL | ESCAPE_NO_QUOTED));
                         } else {
                             tmp.append(L"\"\"");
                         }
diff --git a/src/parser.h b/src/parser.h
index dce8cb3d5..6554d1aa5 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -21,8 +21,7 @@
 class io_chain_t;
 
 /// event_blockage_t represents a block on events.
-struct event_blockage_t {
-};
+struct event_blockage_t {};
 
 typedef std::list<event_blockage_t> event_blockage_list_t;
 
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 7f1bdecc7..15c232461 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -10,26 +10,20 @@
 
 typedef std::unordered_set<wcstring> string_set_t;
 
-static const wcstring skip_keywords[] {
-        L"else",
-        L"begin",
+static const wcstring skip_keywords[]{
+    L"else",
+    L"begin",
 };
 
-static const wcstring subcommand_keywords[] {
-        L"command", L"builtin", L"while", L"exec",
-        L"if",      L"and",     L"or",    L"not"
-};
+static const wcstring subcommand_keywords[]{L"command", L"builtin", L"while", L"exec",
+                                            L"if",      L"and",     L"or",    L"not"};
 
-static const string_set_t block_keywords = {
-        L"for",      L"while",  L"if",
-        L"function", L"switch", L"begin"
-};
+static const string_set_t block_keywords = {L"for",      L"while",  L"if",
+                                            L"function", L"switch", L"begin"};
 
-static const wcstring reserved_keywords[] = {
-        L"end",      L"case",   L"else",     L"return",
-        L"continue", L"break",  L"argparse", L"read",
-        L"set",      L"status", L"test",     L"["
-};
+static const wcstring reserved_keywords[] = {L"end",      L"case",   L"else",     L"return",
+                                             L"continue", L"break",  L"argparse", L"read",
+                                             L"set",      L"status", L"test",     L"["};
 
 // The lists above are purposely implemented separately from the logic below, so that future
 // maintainers may assume the contents of the list based off their names, and not off what the
@@ -37,7 +31,7 @@ static const wcstring reserved_keywords[] = {
 
 static size_t list_max_length(const string_set_t &list) {
     size_t result = 0;
-    for (const auto &w: list) {
+    for (const auto &w : list) {
         if (w.length() > result) {
             result = w.length();
         }
@@ -50,7 +44,7 @@ bool parser_keywords_skip_arguments(const wcstring &cmd) {
 }
 
 bool parser_keywords_is_subcommand(const wcstring &cmd) {
-    const static string_set_t search_list = ([](){
+    const static string_set_t search_list = ([]() {
         string_set_t results;
         results.insert(std::begin(subcommand_keywords), std::end(subcommand_keywords));
         results.insert(std::begin(skip_keywords), std::end(skip_keywords));
@@ -73,7 +67,7 @@ bool parser_keywords_is_block(const wcstring &word) {
 }
 
 bool parser_keywords_is_reserved(const wcstring &word) {
-    const static string_set_t search_list = ([](){
+    const static string_set_t search_list = ([]() {
         string_set_t results;
         results.insert(std::begin(subcommand_keywords), std::end(subcommand_keywords));
         results.insert(std::begin(skip_keywords), std::end(skip_keywords));
diff --git a/src/path.cpp b/src/path.cpp
index c07a8fd61..2cfcb80c6 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -4,9 +4,9 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
-#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #include <memory>
@@ -87,18 +87,18 @@ static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
                     break;
                 }
 #ifdef __sun
-                //Solaris 5.11 can return any of the following three if the path
-                //does not exist. Yes, even 0. No, none of this is documented.
+                // Solaris 5.11 can return any of the following three if the path
+                // does not exist. Yes, even 0. No, none of this is documented.
                 case 0:
                 case EAGAIN:
                 case EEXIST: {
                     break;
                 }
 #endif
-                //WSL has a bug where access(2) can return EINVAL
-                //See https://github.com/Microsoft/BashOnWindows/issues/2522
-                //The only other way EINVAL can happen is if the wrong
-                //mode was specified, but we have X_OK hard-coded above.
+                // WSL has a bug where access(2) can return EINVAL
+                // See https://github.com/Microsoft/BashOnWindows/issues/2522
+                // The only other way EINVAL can happen is if the wrong
+                // mode was specified, but we have X_OK hard-coded above.
                 case EINVAL: {
                     break;
                 }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index f4c14b6b6..b59e41883 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -5,8 +5,8 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
-#include <cstring>
 #include <time.h>
+#include <cstring>
 #include <memory>
 #if FISH_USE_POSIX_SPAWN
 #include <spawn.h>
@@ -49,18 +49,18 @@ bool child_set_group(job_t *j, process_t *p) {
             // Put a cap on how many times we retry so we are never stuck here
             if (i < 100) {
                 if (errno == EPERM) {
-                    // The setpgid(2) man page says that EPERM is returned only if attempts are made to
-                    // move processes into groups across session boundaries (which can never be the case
-                    // in fish, anywhere) or to change the process group ID of a session leader (again,
-                    // can never be the case). I'm pretty sure this is a WSL bug, as we see the same
-                    // with tcsetpgrp(2) in other places and it disappears on retry.
+                    // The setpgid(2) man page says that EPERM is returned only if attempts are made
+                    // to move processes into groups across session boundaries (which can never be
+                    // the case in fish, anywhere) or to change the process group ID of a session
+                    // leader (again, can never be the case). I'm pretty sure this is a WSL bug, as
+                    // we see the same with tcsetpgrp(2) in other places and it disappears on retry.
                     debug_safe(2, "setpgid(2) returned EPERM. Retrying");
                     continue;
                 } else if (errno == EINTR) {
-                    // I don't think signals are blocked here. The parent (fish) redirected the signal
-                    // handlers and `setup_child_process()` calls `signal_reset_handlers()` after we're
-                    // done here (and not `signal_unblock()`). We're already in a loop, so let's just
-                    // handle EINTR just in case.
+                    // I don't think signals are blocked here. The parent (fish) redirected the
+                    // signal handlers and `setup_child_process()` calls `signal_reset_handlers()`
+                    // after we're done here (and not `signal_unblock()`). We're already in a loop,
+                    // so let's just handle EINTR just in case.
                     continue;
                 }
             }
@@ -84,8 +84,10 @@ bool child_set_group(job_t *j, process_t *p) {
                 pid_buff, argv0, job_id_buff, command, getpgid_buff, job_pgid_buff);
 
             if (is_windows_subsystem_for_linux() && errno == EPERM) {
-                debug_safe(1, "Please update to Windows 10 1809/17763 or higher to address known issues "
-                        "with process groups and zombie processes.");
+                debug_safe(
+                    1,
+                    "Please update to Windows 10 1809/17763 or higher to address known issues "
+                    "with process groups and zombie processes.");
             }
 
             safe_perror("setpgid");
@@ -107,8 +109,8 @@ bool child_set_group(job_t *j, process_t *p) {
 /// if it's to run in the foreground.
 bool set_child_group(job_t *j, pid_t child_pid) {
     if (j->get_flag(job_flag_t::JOB_CONTROL)) {
-        assert (j->pgid != INVALID_PID
-                && "set_child_group called with JOB_CONTROL before job pgid determined!");
+        assert(j->pgid != INVALID_PID &&
+               "set_child_group called with JOB_CONTROL before job pgid determined!");
 
         // The parent sets the child's group. This incurs the well-known unavoidable race with the
         // child exiting, so ignore ESRCH and EPERM (in case the pid was recycled).
@@ -117,14 +119,13 @@ bool set_child_group(job_t *j, pid_t child_pid) {
             if (errno != ESRCH && errno != EPERM && errno != EACCES) {
                 safe_perror("setpgid");
                 return false;
-            }
-            else {
+            } else {
                 // Just in case it's ever not right to ignore the setpgid call, (i.e. if this
                 // ever leads to a terminal hang due if both this setpgid call AND posix_spawn's
                 // internal setpgid calls failed), write to the debug log so a future developer
                 // doesn't go crazy trying to track this down.
-                debug(2, "Error %d while calling setpgid for child %d (probably harmless)",
-                        errno, child_pid);
+                debug(2, "Error %d while calling setpgid for child %d (probably harmless)", errno,
+                      child_pid);
             }
         }
     } else {
@@ -169,7 +170,6 @@ int setup_child_process(process_t *p, const dup2_list_t &dup2s) {
     return 0;
 }
 
-
 int g_fork_count = 0;
 
 /// This function is a wrapper around fork. If the fork calls fails with EAGAIN, it is retried
diff --git a/src/proc.cpp b/src/proc.cpp
index 238df7b76..997217ef4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -6,13 +6,13 @@
 // IWYU pragma: no_include <__bit_reference>
 #include "config.h"
 
-#include <atomic>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <atomic>
+#include <cwchar>
 
 #if HAVE_TERM_H
 #include <curses.h>
@@ -60,7 +60,7 @@ bool job_list_is_empty() {
     return parser_t::principal_parser().job_list().empty();
 }
 
-job_list_t& jobs() {
+job_list_t &jobs() {
     ASSERT_IS_MAIN_THREAD();
     return parser_t::principal_parser().job_list();
 }
@@ -342,7 +342,7 @@ static void process_mark_finished_children(bool block_ok) {
     topic_set_t reaptopics{};
     generation_list_t gens{};
     gens.fill(invalid_generation);
-    for (const auto j: jobs()) {
+    for (const auto j : jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 topic_t topic = *mtopic;
@@ -402,9 +402,10 @@ static void process_mark_finished_children(bool block_ok) {
     // Poll disowned processes/process groups, but do nothing with the result. Only used to avoid
     // zombie processes. Entries have already been converted to negative for process groups.
     int status;
-    s_disowned_pids.erase(std::remove_if(s_disowned_pids.begin(), s_disowned_pids.end(),
-                [&status](pid_t pid) { return waitpid(pid, &status, WNOHANG) > 0; }),
-            s_disowned_pids.end());
+    s_disowned_pids.erase(
+        std::remove_if(s_disowned_pids.begin(), s_disowned_pids.end(),
+                       [&status](pid_t pid) { return waitpid(pid, &status, WNOHANG) > 0; }),
+        s_disowned_pids.end());
 }
 
 /// Given a command like "cat file", truncate it to a reasonable length.
@@ -658,7 +659,7 @@ bool job_reap(parser_t &parser, bool allow_interactive) {
 
 /// Get the CPU time for the specified process.
 unsigned long proc_get_jiffies(process_t *p) {
-    if (! have_proc_stat) return 0;
+    if (!have_proc_stat) return 0;
     if (p->pid <= 0) return 0;
 
     wchar_t fn[FN_SIZE];
@@ -701,8 +702,8 @@ void proc_update_jiffies() {
     }
 }
 
-// Return control of the terminal to a job's process group. restore_attrs is true if we are restoring
-// a previously-stopped job, in which case we need to restore terminal attributes.
+// Return control of the terminal to a job's process group. restore_attrs is true if we are
+// restoring a previously-stopped job, in which case we need to restore terminal attributes.
 bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
     if (j->pgid == 0) {
         debug(2, "terminal_give_to_job() returning early due to no process group");
diff --git a/src/proc.h b/src/proc.h
index 535f3db26..e17131cfe 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -352,8 +352,7 @@ class job_t {
     /// untruncated job string when we don't care what the job is, only which of the currently
     /// running jobs it is.
     wcstring preview() const {
-        if (processes.empty())
-            return L"";
+        if (processes.empty()) return L"";
         // Note argv0 may be empty in e.g. a block process.
         const wchar_t *argv0 = processes.front()->argv0();
         wcstring result = argv0 ? argv0 : L"null";
@@ -534,8 +533,9 @@ void hup_background_jobs();
 /// Give ownership of the terminal to the specified job.
 ///
 /// \param j The job to give the terminal to.
-/// \param restore_attrs If this variable is set, we are giving back control to a job that was previously
-/// stopped. In that case, we need to set the terminal attributes to those saved in the job.
+/// \param restore_attrs If this variable is set, we are giving back control to a job that was
+/// previously stopped. In that case, we need to set the terminal attributes to those saved in the
+/// job.
 bool terminal_give_to_job(const job_t *j, bool restore_attrs);
 
 /// Given that we are about to run a builtin, acquire the terminal if it is owned by the given job.
@@ -550,7 +550,7 @@ void add_disowned_pgid(pid_t pgid);
 ///   the Linux kernel will use it for kernel processes.
 /// -1 should not be used; it is a possible return value of the getpgid()
 ///   function
-enum { INVALID_PID  = -2 };
+enum { INVALID_PID = -2 };
 
 extern bool have_proc_stat;
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 34090cab0..f03da5e81 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -32,8 +32,8 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <algorithm>
 #include <atomic>
@@ -436,9 +436,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 
     /// Insert the character into the command line buffer and print it to the screen using syntax
     /// highlighting, etc.
-    bool insert_char(editable_line_t *el, wchar_t c) {
-        return insert_string(el, wcstring{c});
-    }
+    bool insert_char(editable_line_t *el, wchar_t c) { return insert_string(el, wcstring{c}); }
 
     void move_word(editable_line_t *el, bool move_right, bool erase, enum move_word_style_t style,
                    bool newv);
@@ -643,8 +641,9 @@ void reader_data_t::repaint() {
     size_t cursor_position = focused_on_pager ? pager.cursor_position() : cmd_line->position;
 
     // Prepend the mode prompt to the left prompt.
-    s_write(&screen, mode_prompt_buff + left_prompt_buff, right_prompt_buff, full_line, cmd_line->size(), colors,
-            indents, cursor_position, current_page_rendering, focused_on_pager);
+    s_write(&screen, mode_prompt_buff + left_prompt_buff, right_prompt_buff, full_line,
+            cmd_line->size(), colors, indents, cursor_position, current_page_rendering,
+            focused_on_pager);
 
     repaint_needed = false;
 }
@@ -909,8 +908,7 @@ void reader_data_t::exec_mode_prompt() {
     mode_prompt_buff.clear();
     if (function_exists(MODE_PROMPT_FUNCTION_NAME, parser())) {
         wcstring_list_t mode_indicator_list;
-        exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list,
-                      false);
+        exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list, false);
         // We do not support multiple lines in the mode indicator, so just concatenate all of
         // them.
         for (size_t i = 0; i < mode_indicator_list.size(); i++) {
@@ -980,7 +978,7 @@ void reader_init() {
 
     // Set the mode used for program execution, initialized to the current mode.
     std::memcpy(&tty_modes_for_external_cmds, &terminal_mode_on_startup,
-           sizeof tty_modes_for_external_cmds);
+                sizeof tty_modes_for_external_cmds);
     tty_modes_for_external_cmds.c_iflag &= ~IXON;   // disable flow control
     tty_modes_for_external_cmds.c_iflag &= ~IXOFF;  // disable flow control
 
@@ -1776,7 +1774,6 @@ static void reader_interactive_init() {
         signal_set_handlers();
     }
 
-
     // It shouldn't be necessary to place fish in its own process group and force control
     // of the terminal, but that works around fish being started with an invalid pgroup,
     // such as when launched via firejail (#5295)
@@ -2497,7 +2494,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::repaint_mode: {
             // Repaint the mode-prompt only if it exists.
             // This is an optimization basically exclusively for vi-mode, since the prompt
-            // may sometimes take a while but when switching the mode all we care about is the mode-prompt.
+            // may sometimes take a while but when switching the mode all we care about is the
+            // mode-prompt.
             if (function_exists(MODE_PROMPT_FUNCTION_NAME, parser())) {
                 exec_mode_prompt();
                 s_reset(&screen, screen_reset_current_line_and_prompt);
@@ -2873,7 +2871,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 (c == rl::backward_kill_bigword
                      ? move_word_style_whitespace
                      : c == rl::backward_kill_path_component ? move_word_style_path_components
-                                                               : move_word_style_punctuation);
+                                                             : move_word_style_punctuation);
             // Is this the same killring item as the last kill?
             bool newv = (rls.last_cmd != rl::backward_kill_word &&
                          rls.last_cmd != rl::backward_kill_path_component &&
@@ -2893,16 +2891,16 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::backward_word:
         case rl::backward_bigword: {
-            auto move_style = (c == rl::backward_word) ? move_word_style_punctuation
-                                                         : move_word_style_whitespace;
+            auto move_style =
+                (c == rl::backward_word) ? move_word_style_punctuation : move_word_style_whitespace;
             move_word(active_edit_line(), MOVE_DIR_LEFT, false /* do not erase */, move_style,
                       false);
             break;
         }
         case rl::forward_word:
         case rl::forward_bigword: {
-            auto move_style = (c == rl::forward_word) ? move_word_style_punctuation
-                                                        : move_word_style_whitespace;
+            auto move_style =
+                (c == rl::forward_word) ? move_word_style_punctuation : move_word_style_whitespace;
             editable_line_t *el = active_edit_line();
             if (el->position < el->size()) {
                 move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_style, false);
diff --git a/src/redirection.h b/src/redirection.h
index 16e8c155b..73748fc0a 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -62,8 +62,8 @@ class dup2_list_t {
     static maybe_t<dup2_list_t> resolve_chain(const io_chain_t &);
 
     /// \return the fd ultimately dup'd to a target fd, or -1 if the target is closed.
-    /// For example, if target fd is 1, and we have a dup2 chain 5->3 and 3->1, then we will return 5.
-    /// If the target is not referenced in the chain, returns target.
+    /// For example, if target fd is 1, and we have a dup2 chain 5->3 and 3->1, then we will
+    /// return 5. If the target is not referenced in the chain, returns target.
     int fd_for_target_fd(int target) const;
 };
 
diff --git a/src/screen.cpp b/src/screen.cpp
index 3414e806b..cdb24c299 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -10,9 +10,9 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <time.h>
 #include <unistd.h>
+#include <cstring>
 #include <cwchar>
 
 #if HAVE_CURSES_H
@@ -105,7 +105,8 @@ static bool is_screen_name_escape_seq(const wchar_t *code, size_t *resulting_len
         // Consider just <esc>k to be the code.
         *resulting_length = 2;
     } else {
-        const wchar_t *escape_sequence_end = screen_name_end + std::wcslen(screen_name_end_sentinel);
+        const wchar_t *escape_sequence_end =
+            screen_name_end + std::wcslen(screen_name_end_sentinel);
         *resulting_length = escape_sequence_end - code;
     }
     return true;
@@ -191,7 +192,10 @@ static bool is_color_escape_seq(const wchar_t *code, size_t *resulting_length) {
     // Detect these terminfo color escapes with parameter value up to max_colors, all of which
     // don't move the cursor.
     const char *const esc[] = {
-        set_a_foreground, set_a_background, set_foreground, set_background,
+        set_a_foreground,
+        set_a_background,
+        set_foreground,
+        set_background,
     };
 
     for (size_t p = 0; p < sizeof esc / sizeof *esc; p++) {
@@ -214,12 +218,11 @@ static bool is_color_escape_seq(const wchar_t *code, size_t *resulting_length) {
 static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) {
     if (!cur_term) return false;
     const char *const esc2[] = {
-        enter_bold_mode,      exit_attribute_mode,    enter_underline_mode,   exit_underline_mode,
-        enter_standout_mode,  exit_standout_mode,     enter_blink_mode,       enter_protected_mode,
-        enter_italics_mode,   exit_italics_mode,      enter_reverse_mode,     enter_shadow_mode,
-        exit_shadow_mode,     enter_standout_mode,    exit_standout_mode,     enter_secure_mode,
-        enter_dim_mode,       enter_blink_mode,       enter_alt_charset_mode, exit_alt_charset_mode
-    };
+        enter_bold_mode,     exit_attribute_mode, enter_underline_mode,   exit_underline_mode,
+        enter_standout_mode, exit_standout_mode,  enter_blink_mode,       enter_protected_mode,
+        enter_italics_mode,  exit_italics_mode,   enter_reverse_mode,     enter_shadow_mode,
+        exit_shadow_mode,    enter_standout_mode, exit_standout_mode,     enter_secure_mode,
+        enter_dim_mode,      enter_blink_mode,    enter_alt_charset_mode, exit_alt_charset_mode};
 
     for (size_t p = 0; p < sizeof esc2 / sizeof *esc2; p++) {
         if (!esc2[p]) continue;
@@ -237,8 +240,8 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
 }
 
 /// Returns the number of characters in the escape code starting at 'code'. We only handle sequences
-/// that begin with \x1B. If it doesn't we return zero. We also return zero if we don't recognize the
-/// escape sequence based on querying terminfo and other heuristics.
+/// that begin with \x1B. If it doesn't we return zero. We also return zero if we don't recognize
+/// the escape sequence based on querying terminfo and other heuristics.
 size_t escape_code_length(const wchar_t *code) {
     assert(code != NULL);
     if (*code != L'\x1B') return 0;
@@ -495,8 +498,8 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 
     // Use the bulk ('multi') output for cursor movement if it is supported and it would be shorter
     // Note that this is required to avoid some visual glitches in iTerm (issue #1448).
-    bool use_multi =
-        multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * std::strlen(str) > std::strlen(multi_str);
+    bool use_multi = multi_str != NULL && multi_str[0] != '\0' &&
+                     abs(x_steps) * std::strlen(str) > std::strlen(multi_str);
     if (use_multi && cur_term) {
         char *multi_param = tparm((char *)multi_str, abs(x_steps));
         writembs(outp, multi_param);
@@ -1132,8 +1135,8 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
             abandon_line_string.append(get_omitted_newline_str());
 
             if (cur_term && exit_attribute_mode) {
-                abandon_line_string.append(
-                        str2wcstring(tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
+                abandon_line_string.append(str2wcstring(
+                    tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
             }
 
             int newline_glitch_width = term_has_xn ? 0 : 1;
diff --git a/src/signal.cpp b/src/signal.cpp
index f8cb0483e..06d0ee6c9 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -416,4 +416,3 @@ void signal_unblock_all() {
     sigemptyset(&iset);
     sigprocmask(SIG_SETMASK, &iset, NULL);
 }
-
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index e4afe469b..f54b38d0f 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -24,26 +24,36 @@
 
 // This version has been altered and ported to C++ for inclusion in fish.
 #include "tinyexpr.h"
-#include <stdlib.h>
-#include <math.h>
-#include <cstring>
-#include <stdio.h>
 #include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstring>
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
-// TODO: It would be nice not to rely on a typedef for this, especially one that can only do functions with two args.
+// TODO: It would be nice not to rely on a typedef for this, especially one that can only do
+// functions with two args.
 typedef double (*te_fun2)(double, double);
 typedef double (*te_fun1)(double);
 typedef double (*te_fun0)();
 
 enum {
-      TE_CONSTANT = 0,
-      TE_FUNCTION0, TE_FUNCTION1, TE_FUNCTION2, TE_FUNCTION3,
-      TOK_NULL, TOK_ERROR, TOK_END, TOK_SEP,
-      TOK_OPEN, TOK_CLOSE, TOK_NUMBER, TOK_INFIX
+    TE_CONSTANT = 0,
+    TE_FUNCTION0,
+    TE_FUNCTION1,
+    TE_FUNCTION2,
+    TE_FUNCTION3,
+    TOK_NULL,
+    TOK_ERROR,
+    TOK_END,
+    TOK_SEP,
+    TOK_OPEN,
+    TOK_CLOSE,
+    TOK_NUMBER,
+    TOK_INFIX
 };
 
 int get_arity(const int type) {
@@ -55,7 +65,10 @@ int get_arity(const int type) {
 
 typedef struct te_expr {
     int type;
-    union {double value; const void *function;};
+    union {
+        double value;
+        const void *function;
+    };
     te_expr *parameters[];
 } te_expr;
 
@@ -67,7 +80,10 @@ typedef struct te_builtin {
 } te_builtin;
 
 typedef struct state {
-    union {double value; const void *function;};
+    union {
+        double value;
+        const void *function;
+    };
     const char *start;
     const char *next;
     int type;
@@ -86,11 +102,11 @@ double te_eval(const te_expr *n);
 void te_free(te_expr *n);
 
 // TODO: That move there? Ouch. Replace with a proper class with a constructor.
-#define NEW_EXPR(type, ...) new_expr((type), std::move((const te_expr*[]){__VA_ARGS__}))
+#define NEW_EXPR(type, ...) new_expr((type), std::move((const te_expr *[]){__VA_ARGS__}))
 
 static te_expr *new_expr(const int type, const te_expr *parameters[]) {
     const int arity = get_arity(type);
-    const int psize = sizeof(te_expr*) * arity;
+    const int psize = sizeof(te_expr *) * arity;
     const int size = sizeof(te_expr) + psize;
     te_expr *ret = (te_expr *)malloc(size);
     // This sets float to 0, which depends on the implementation.
@@ -103,7 +119,6 @@ static te_expr *new_expr(const int type, const te_expr *parameters[]) {
     return ret;
 }
 
-
 void te_free_parameters(te_expr *n) {
     if (!n) return;
     int arity = get_arity(n->type);
@@ -114,27 +129,22 @@ void te_free_parameters(te_expr *n) {
     }
 }
 
-
 void te_free(te_expr *n) {
     if (!n) return;
     te_free_parameters(n);
     free(n);
 }
 
-
 static constexpr double pi() { return M_PI; }
 static constexpr double e() { return M_E; }
 
 static double fac(double a) { /* simplest version of fac */
-    if (a < 0.0)
-        return NAN;
-    if (a > UINT_MAX)
-        return INFINITY;
+    if (a < 0.0) return NAN;
+    if (a > UINT_MAX) return INFINITY;
     unsigned int ua = (unsigned int)(a);
     unsigned long int result = 1, i;
     for (i = 1; i <= ua; i++) {
-        if (i > ULONG_MAX / result)
-            return INFINITY;
+        if (i > ULONG_MAX / result) return INFINITY;
         result *= i;
     }
     return (double)result;
@@ -147,131 +157,165 @@ static double ncr(double n, double r) {
     unsigned long int result = 1;
     if (ur > un / 2) ur = un - ur;
     for (i = 1; i <= ur; i++) {
-        if (result > ULONG_MAX / (un - ur + i))
-            return INFINITY;
+        if (result > ULONG_MAX / (un - ur + i)) return INFINITY;
         result *= un - ur + i;
         result /= i;
     }
     return result;
 }
 
-static double npr(double n, double r) {return ncr(n, r) * fac(r);}
+static double npr(double n, double r) { return ncr(n, r) * fac(r); }
 
 static const te_builtin functions[] = {
     /* must be in alphabetical order */
-    {"abs", (const void *)(te_fun1)fabs,     TE_FUNCTION1},
-    {"acos", (const void *)(te_fun1)acos,    TE_FUNCTION1},
-    {"asin", (const void *)(te_fun1)asin,    TE_FUNCTION1},
-    {"atan", (const void *)(te_fun1)atan,    TE_FUNCTION1},
-    {"atan2", (const void *)(te_fun2)atan2,  TE_FUNCTION2},
-    {"ceil", (const void *)(te_fun1)ceil,    TE_FUNCTION1},
-    {"cos", (const void *)(te_fun1)cos,      TE_FUNCTION1},
-    {"cosh", (const void *)(te_fun1)cosh,    TE_FUNCTION1},
-    {"e", (const void *)(te_fun0)e,          TE_FUNCTION0},
-    {"exp", (const void *)(te_fun1)exp,      TE_FUNCTION1},
-    {"fac", (const void *)(te_fun1)fac,      TE_FUNCTION1},
-    {"floor", (const void *)(te_fun1)floor,  TE_FUNCTION1},
-    {"ln", (const void *)(te_fun1)log,       TE_FUNCTION1},
-    {"log", (const void *)(te_fun1)log10,    TE_FUNCTION1},
-    {"log10", (const void *)(te_fun1)log10,  TE_FUNCTION1},
-    {"ncr", (const void *)(te_fun2)ncr,      TE_FUNCTION2},
-    {"npr", (const void *)(te_fun2)npr,      TE_FUNCTION2},
-    {"pi", (const void *)(te_fun1)pi,        TE_FUNCTION0},
-    {"pow", (const void *)(te_fun2)pow,      TE_FUNCTION2},
-    {"round", (const void *)(te_fun1)round,  TE_FUNCTION1},
-    {"sin", (const void *)(te_fun1)sin,      TE_FUNCTION1},
-    {"sinh", (const void *)(te_fun1)sinh,    TE_FUNCTION1},
-    {"sqrt", (const void *)(te_fun1)sqrt,    TE_FUNCTION1},
-    {"tan", (const void *)(te_fun1)tan,      TE_FUNCTION1},
-    {"tanh", (const void *)(te_fun1)tanh,    TE_FUNCTION1}
-};
+    {"abs", (const void *)(te_fun1)fabs, TE_FUNCTION1},
+    {"acos", (const void *)(te_fun1)acos, TE_FUNCTION1},
+    {"asin", (const void *)(te_fun1)asin, TE_FUNCTION1},
+    {"atan", (const void *)(te_fun1)atan, TE_FUNCTION1},
+    {"atan2", (const void *)(te_fun2)atan2, TE_FUNCTION2},
+    {"ceil", (const void *)(te_fun1)ceil, TE_FUNCTION1},
+    {"cos", (const void *)(te_fun1)cos, TE_FUNCTION1},
+    {"cosh", (const void *)(te_fun1)cosh, TE_FUNCTION1},
+    {"e", (const void *)(te_fun0)e, TE_FUNCTION0},
+    {"exp", (const void *)(te_fun1)exp, TE_FUNCTION1},
+    {"fac", (const void *)(te_fun1)fac, TE_FUNCTION1},
+    {"floor", (const void *)(te_fun1)floor, TE_FUNCTION1},
+    {"ln", (const void *)(te_fun1)log, TE_FUNCTION1},
+    {"log", (const void *)(te_fun1)log10, TE_FUNCTION1},
+    {"log10", (const void *)(te_fun1)log10, TE_FUNCTION1},
+    {"ncr", (const void *)(te_fun2)ncr, TE_FUNCTION2},
+    {"npr", (const void *)(te_fun2)npr, TE_FUNCTION2},
+    {"pi", (const void *)(te_fun1)pi, TE_FUNCTION0},
+    {"pow", (const void *)(te_fun2)pow, TE_FUNCTION2},
+    {"round", (const void *)(te_fun1)round, TE_FUNCTION1},
+    {"sin", (const void *)(te_fun1)sin, TE_FUNCTION1},
+    {"sinh", (const void *)(te_fun1)sinh, TE_FUNCTION1},
+    {"sqrt", (const void *)(te_fun1)sqrt, TE_FUNCTION1},
+    {"tan", (const void *)(te_fun1)tan, TE_FUNCTION1},
+    {"tanh", (const void *)(te_fun1)tanh, TE_FUNCTION1}};
 
 static const te_builtin *find_builtin(const char *name, int len) {
     const auto end = std::end(functions);
     const te_builtin *found = std::lower_bound(std::begin(functions), end, name,
-                                                [len](const te_builtin &lhs, const char *rhs) {
-                                                    // The length is important because that's where the parens start
-                                                    return std::strncmp(lhs.name, rhs, len) < 0;
-                                                });
+                                               [len](const te_builtin &lhs, const char *rhs) {
+                                                   // The length is important because that's where
+                                                   // the parens start
+                                                   return std::strncmp(lhs.name, rhs, len) < 0;
+                                               });
     // We need to compare again because we might have gotten the first "larger" element.
     if (found != end && std::strncmp(found->name, name, len) == 0) return found;
     return NULL;
 }
 
-static constexpr double add(double a, double b) {return a + b;}
-static constexpr double sub(double a, double b) {return a - b;}
-static constexpr double mul(double a, double b) {return a * b;}
+static constexpr double add(double a, double b) { return a + b; }
+static constexpr double sub(double a, double b) { return a - b; }
+static constexpr double mul(double a, double b) { return a * b; }
 static constexpr double divide(double a, double b) {
     // If b isn't zero, divide.
     // If a isn't zero, return signed INFINITY.
     // Else, return NAN.
-    return b ? a / b : a ? copysign(1, a) * copysign(1,b) * INFINITY : NAN;
+    return b ? a / b : a ? copysign(1, a) * copysign(1, b) * INFINITY : NAN;
 }
 
-static constexpr double negate(double a) {return -a;}
+static constexpr double negate(double a) { return -a; }
 
 void next_token(state *s) {
     s->type = TOK_NULL;
 
     do {
-        if (!*s->next){
+        if (!*s->next) {
             s->type = TOK_END;
             return;
         }
 
         /* Try reading a number. */
         if ((s->next[0] >= '0' && s->next[0] <= '9') || s->next[0] == '.') {
-            s->value = strtod(s->next, (char**)&s->next);
+            s->value = strtod(s->next, (char **)&s->next);
             s->type = TOK_NUMBER;
         } else {
             /* Look for a variable or builtin function call. */
             if (s->next[0] >= 'a' && s->next[0] <= 'z') {
                 const char *start;
                 start = s->next;
-                while ((s->next[0] >= 'a' && s->next[0] <= 'z') || (s->next[0] >= '0' && s->next[0] <= '9') || (s->next[0] == '_')) s->next++;
+                while ((s->next[0] >= 'a' && s->next[0] <= 'z') ||
+                       (s->next[0] >= '0' && s->next[0] <= '9') || (s->next[0] == '_'))
+                    s->next++;
 
                 const te_builtin *var = find_builtin(start, s->next - start);
 
                 if (var) {
-                    switch(var->type) {
-                        case TE_FUNCTION0: case TE_FUNCTION1: case TE_FUNCTION2: case TE_FUNCTION3:
+                    switch (var->type) {
+                        case TE_FUNCTION0:
+                        case TE_FUNCTION1:
+                        case TE_FUNCTION2:
+                        case TE_FUNCTION3:
                             s->type = var->type;
                             s->function = var->address;
                             break;
                     }
-                } else if (s->type != TOK_ERROR
-                           || s->error == TE_ERROR_UNKNOWN) {
+                } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                     // Our error is more specific, so it takes precedence.
                     s->type = TOK_ERROR;
                     s->error = TE_ERROR_UNKNOWN_VARIABLE;
                 }
             } else {
                 /* Look for an operator or special character. */
-                switch (s->next++[0]) {
+                switch (s->next++ [0]) {
                     // The "te_fun2" casts are necessary to pick the right overload.
-                    case '+': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) add; break;
-                    case '-': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) sub; break;
-                    case '*': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) mul; break;
-                    case '/': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) divide; break;
-                    case '^': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) pow; break;
-                    case '%': s->type = TOK_INFIX; s->function = (const void *)(te_fun2) fmod; break;
-                    case '(': s->type = TOK_OPEN; break;
-                    case ')': s->type = TOK_CLOSE; break;
-                    case ',': s->type = TOK_SEP; break;
-                    case ' ': case '\t': case '\n': case '\r': break;
-                    default: s->type = TOK_ERROR; s->error = TE_ERROR_MISSING_OPERATOR; break;
+                    case '+':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)add;
+                        break;
+                    case '-':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)sub;
+                        break;
+                    case '*':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)mul;
+                        break;
+                    case '/':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)divide;
+                        break;
+                    case '^':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)pow;
+                        break;
+                    case '%':
+                        s->type = TOK_INFIX;
+                        s->function = (const void *)(te_fun2)fmod;
+                        break;
+                    case '(':
+                        s->type = TOK_OPEN;
+                        break;
+                    case ')':
+                        s->type = TOK_CLOSE;
+                        break;
+                    case ',':
+                        s->type = TOK_SEP;
+                        break;
+                    case ' ':
+                    case '\t':
+                    case '\n':
+                    case '\r':
+                        break;
+                    default:
+                        s->type = TOK_ERROR;
+                        s->error = TE_ERROR_MISSING_OPERATOR;
+                        break;
                 }
             }
         }
     } while (s->type == TOK_NULL);
 }
 
-
 static te_expr *expr(state *s);
 static te_expr *power(state *s);
 
 static te_expr *base(state *s) {
-    /* <base>      =    <constant> | <variable> | <function-0> {"(" ")"} | <function-1> <power> | <function-X> "(" <expr> {"," <expr>} ")" | "(" <list> ")" */
+    /* <base>      =    <constant> | <variable> | <function-0> {"(" ")"} | <function-1> <power> |
+     * <function-X> "(" <expr> {"," <expr>} ")" | "(" <list> ")" */
     te_expr *ret;
     int arity;
 
@@ -290,8 +334,7 @@ static te_expr *base(state *s) {
                 next_token(s);
                 if (s->type == TOK_CLOSE) {
                     next_token(s);
-                } else if (s->type != TOK_ERROR
-                           || s->error == TE_ERROR_UNKNOWN) {
+                } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                     s->type = TOK_ERROR;
                     s->error = TE_ERROR_MISSING_CLOSING_PAREN;
                 }
@@ -299,7 +342,8 @@ static te_expr *base(state *s) {
             break;
 
         case TE_FUNCTION1:
-        case TE_FUNCTION2: case TE_FUNCTION3:
+        case TE_FUNCTION2:
+        case TE_FUNCTION3:
             arity = get_arity(s->type);
 
             ret = new_expr(s->type, 0);
@@ -308,23 +352,20 @@ static te_expr *base(state *s) {
 
             if (s->type == TOK_OPEN) {
                 int i;
-                for(i = 0; i < arity; i++) {
+                for (i = 0; i < arity; i++) {
                     next_token(s);
                     ret->parameters[i] = expr(s);
-                    if(s->type != TOK_SEP) {
+                    if (s->type != TOK_SEP) {
                         break;
                     }
                 }
-                if(s->type == TOK_CLOSE && i == arity - 1) {
+                if (s->type == TOK_CLOSE && i == arity - 1) {
                     next_token(s);
-                } else if (s->type != TOK_ERROR
-                           || s->error == TE_ERROR_UNKNOWN) {
+                } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                     s->type = TOK_ERROR;
-                    s->error = i < arity ? TE_ERROR_TOO_FEW_ARGS
-                        : TE_ERROR_TOO_MANY_ARGS;
+                    s->error = i < arity ? TE_ERROR_TOO_FEW_ARGS : TE_ERROR_TOO_MANY_ARGS;
                 }
-            } else if (s->type != TOK_ERROR
-                       || s->error == TE_ERROR_UNKNOWN) {
+            } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                 s->type = TOK_ERROR;
                 s->error = TE_ERROR_MISSING_OPENING_PAREN;
             }
@@ -336,8 +377,7 @@ static te_expr *base(state *s) {
             ret = expr(s);
             if (s->type == TOK_CLOSE) {
                 next_token(s);
-            } else if (s->type != TOK_ERROR
-                       || s->error == TE_ERROR_UNKNOWN) {
+            } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                 s->type = TOK_ERROR;
                 s->error = TE_ERROR_MISSING_CLOSING_PAREN;
             }
@@ -365,7 +405,6 @@ static te_expr *base(state *s) {
     return ret;
 }
 
-
 static te_expr *power(state *s) {
     /* <power>     =    {("-" | "+")} <base> */
     int sign = 1;
@@ -380,7 +419,7 @@ static te_expr *power(state *s) {
         ret = base(s);
     } else {
         ret = NEW_EXPR(TE_FUNCTION1, base(s));
-        ret->function = (const void *) negate;
+        ret->function = (const void *)negate;
     }
 
     return ret;
@@ -390,56 +429,55 @@ static te_expr *factor(state *s) {
     /* <factor>    =    <power> {"^" <power>} */
     te_expr *ret = power(s);
 
-    while (s->type == TOK_INFIX && (s->function == (const void*)(te_fun2)pow)) {
-        te_fun2 t = (te_fun2) s->function;
+    while (s->type == TOK_INFIX && (s->function == (const void *)(te_fun2)pow)) {
+        te_fun2 t = (te_fun2)s->function;
         next_token(s);
         ret = NEW_EXPR(TE_FUNCTION2, ret, power(s));
-        ret->function = (const void *) t;
+        ret->function = (const void *)t;
     }
 
     return ret;
 }
 
-
 static te_expr *term(state *s) {
     /* <term>      =    <factor> {("*" | "/" | "%") <factor>} */
     te_expr *ret = factor(s);
 
-    while (s->type == TOK_INFIX && (s->function == (const void*)(te_fun2)mul || s->function == (const void*)(te_fun2)divide || s->function == (const void*)(te_fun2)fmod)) {
-        te_fun2 t = (te_fun2) s->function;
+    while (s->type == TOK_INFIX && (s->function == (const void *)(te_fun2)mul ||
+                                    s->function == (const void *)(te_fun2)divide ||
+                                    s->function == (const void *)(te_fun2)fmod)) {
+        te_fun2 t = (te_fun2)s->function;
         next_token(s);
         ret = NEW_EXPR(TE_FUNCTION2, ret, factor(s));
-        ret->function = (const void *) t;
+        ret->function = (const void *)t;
     }
 
     return ret;
 }
 
-
 static te_expr *expr(state *s) {
     /* <expr>      =    <term> {("+" | "-") <term>} */
     te_expr *ret = term(s);
 
     while (s->type == TOK_INFIX && (s->function == add || s->function == sub)) {
-        te_fun2 t = (te_fun2) s->function;
+        te_fun2 t = (te_fun2)s->function;
         next_token(s);
         ret = NEW_EXPR(TE_FUNCTION2, ret, term(s));
-        ret->function = (const void *) t;
+        ret->function = (const void *)t;
     }
 
     return ret;
 }
 
-
-#define TE_FUN(...) ((double(*)(__VA_ARGS__))n->function)
+#define TE_FUN(...) ((double (*)(__VA_ARGS__))n->function)
 #define M(e) te_eval(n->parameters[e])
 
-
 double te_eval(const te_expr *n) {
     if (!n) return NAN;
 
-    switch(n->type) {
-        case TE_CONSTANT: return n->value;
+    switch (n->type) {
+        case TE_CONSTANT:
+            return n->value;
         case TE_FUNCTION0:
             return TE_FUN(void)();
         case TE_FUNCTION1:
@@ -448,9 +486,9 @@ double te_eval(const te_expr *n) {
             return TE_FUN(double, double)(M(0), M(1));
         case TE_FUNCTION3:
             return TE_FUN(double, double, double)(M(0), M(1), M(2));
-        default: return NAN;
+        default:
+            return NAN;
     }
-
 }
 
 #undef TE_FUN
@@ -476,7 +514,6 @@ static void optimize(te_expr *n) {
     }
 }
 
-
 te_expr *te_compile(const char *expression, te_error_t *error) {
     state s;
     s.start = s.next = expression;
@@ -492,12 +529,11 @@ te_expr *te_compile(const char *expression, te_error_t *error) {
             if (s.error != TE_ERROR_NONE) {
                 error->type = s.error;
             } else {
-                // If we're not at the end but there's no error, then that means we have a superfluous
-                // token that we have no idea what to do with.
-                // This occurs in e.g. `2 + 2 4` - the "4" is just not part of the expression.
-                // We can report either "too many arguments" or "expected operator", but the operator
-                // should be reported between the "2" and the "4".
-                // So we report TOO_MANY_ARGS on the "4".
+                // If we're not at the end but there's no error, then that means we have a
+                // superfluous token that we have no idea what to do with. This occurs in e.g. `2 +
+                // 2 4` - the "4" is just not part of the expression. We can report either "too many
+                // arguments" or "expected operator", but the operator should be reported between
+                // the "2" and the "4". So we report TOO_MANY_ARGS on the "4".
                 error->type = TE_ERROR_TOO_MANY_ARGS;
             }
         }
diff --git a/src/tnode.cpp b/src/tnode.cpp
index 8e4a447fb..5c2e62232 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -50,7 +50,8 @@ enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decora
     return static_cast<parse_bool_statement_type_t>(stmt.tag());
 }
 
-enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_conjunction_continuation> cont) {
+enum parse_bool_statement_type_t bool_statement_type(
+    tnode_t<grammar::job_conjunction_continuation> cont) {
     return static_cast<parse_bool_statement_type_t>(cont.tag());
 }
 
diff --git a/src/tnode.h b/src/tnode.h
index cf52d66e0..fc2d14cc8 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -239,7 +239,8 @@ parse_statement_decoration_t get_decoration(tnode_t<grammar::plain_statement> st
 /// Return the type for a boolean statement.
 enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decorator> stmt);
 
-enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_conjunction_continuation> stmt);
+enum parse_bool_statement_type_t bool_statement_type(
+    tnode_t<grammar::job_conjunction_continuation> stmt);
 
 /// Given a redirection, get the redirection type (or none) and target (file path, or fd).
 maybe_t<redirection_type_t> redirection_type(tnode_t<grammar::redirection> redirection,
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index d2fbe0fdb..d1f4f4a97 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -5,8 +5,8 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <string>
 #include <type_traits>
@@ -18,7 +18,7 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 // _(s) is already wgettext(s).c_str(), so let's not convert back to wcstring
-const wchar_t * tokenizer_get_error_message(tokenizer_error_t err) {
+const wchar_t *tokenizer_get_error_message(tokenizer_error_t err) {
     switch (err) {
         case tokenizer_error_t::none:
             return L"";
@@ -112,7 +112,9 @@ static bool tok_is_string_character(wchar_t c, bool is_first) {
             // Conditional separator.
             return !caret_redirs() || !is_first;
         }
-        default: { return true; }
+        default: {
+            return true;
+        }
     }
 }
 
@@ -629,7 +631,9 @@ bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
                 break;
             }
             case s_end:
-            default: { break; }
+            default: {
+                break;
+            }
         }
     }
     return consumed;
@@ -697,7 +701,9 @@ bool move_word_state_machine_t::consume_char_path_components(wchar_t c) {
                 break;
             }
             case s_end:
-            default: { break; }
+            default: {
+                break;
+            }
         }
     }
     return consumed;
@@ -731,7 +737,9 @@ bool move_word_state_machine_t::consume_char_whitespace(wchar_t c) {
                 break;
             }
             case s_end:
-            default: { break; }
+            default: {
+                break;
+            }
         }
     }
     return consumed;
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 738d82168..94fe6b1cd 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -139,7 +139,9 @@ static int __utf8_forbitten(unsigned char octet) {
         case 0xff: {
             return -1;
         }
-        default: { return 0; }
+        default: {
+            return 0;
+        }
     }
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 0ca0ac7b2..c3ce6b1a5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4,8 +4,8 @@
 #include <errno.h>
 #include <stddef.h>
 #include <sys/time.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index d5708db30..d20e2c4e3 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -6,7 +6,7 @@
 
 typedef wcstring::size_type size_type;
 
-wcstring_range wcstring_tok(wcstring& str, const wcstring& needle, wcstring_range last) {
+wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
     size_type pos = last.second == wcstring::npos ? wcstring::npos : last.first;
     if (pos != wcstring::npos && last.second != wcstring::npos) pos += last.second;
     if (pos != wcstring::npos && pos != 0) ++pos;
@@ -31,7 +31,7 @@ wcstring_range wcstring_tok(wcstring& str, const wcstring& needle, wcstring_rang
 }
 
 wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
-    if (input.size() <= (size_t) max_len) {
+    if (input.size() <= (size_t)max_len) {
         return input;
     }
 
@@ -47,9 +47,7 @@ wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
     return output;
 }
 
-wcstring trim(const wcstring &input) {
-    return trim(input, L"\t\v \r\n");
-}
+wcstring trim(const wcstring &input) { return trim(input, L"\t\v \r\n"); }
 
 wcstring trim(const wcstring &input, const wchar_t *any_of) {
     auto begin_offset = input.find_first_not_of(any_of);
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index 91800cdec..473b8f5f9 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -18,7 +18,7 @@ typedef std::pair<wcstring::size_type, wcstring::size_type> wcstring_range;
 ///         This will be (npos, npos) when it's done. In the form of (pos, npos)
 ///         when the token is already known to be the final token.
 /// @note The final token may not necessarily return (pos, npos).
-wcstring_range wcstring_tok(wcstring& str, const wcstring& needle,
+wcstring_range wcstring_tok(wcstring &str, const wcstring &needle,
                             wcstring_range last = wcstring_range(0, 0));
 
 /// Given iterators into a string (forward or reverse), splits the haystack iterators
@@ -29,7 +29,7 @@ wcstring_range wcstring_tok(wcstring& str, const wcstring& needle,
 /// Max output entries will be max + 1 (after max splits)
 template <typename ITER>
 void split_about(ITER haystack_start, ITER haystack_end, ITER needle_start, ITER needle_end,
-                 wcstring_list_t* output, long max = LONG_MAX, bool no_empty = false) {
+                 wcstring_list_t *output, long max = LONG_MAX, bool no_empty = false) {
     long remaining = max;
     ITER haystack_cursor = haystack_start;
     while (remaining > 0 && haystack_cursor != haystack_end) {
@@ -57,13 +57,14 @@ void split_about(ITER haystack_start, ITER haystack_end, ITER needle_start, ITER
 
 enum class ellipsis_type {
     None,
-    //Prefer niceness over minimalness
+    // Prefer niceness over minimalness
     Prettiest,
-    //Make every character count ($ instead of ...)
+    // Make every character count ($ instead of ...)
     Shortest,
 };
 
-wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype = ellipsis_type::Prettiest);
+wcstring truncate(const wcstring &input, int max_len,
+                  ellipsis_type etype = ellipsis_type::Prettiest);
 wcstring trim(const wcstring &input);
 wcstring trim(const wcstring &input, const wchar_t *any_of);
 
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index c39ccd730..332c210b1 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -39,8 +39,8 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stdio.h>
-#include <cwchar>
 #include <cstring>
+#include <cwchar>
 
 // This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves
 // differently for the user, since it allows the user to intersperse the options with the other
@@ -237,7 +237,7 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
             if (wopterr) {
                 // 1003.2 specifies the format of this message.
                 std::fwprintf(stderr, _(L"%ls: Option requires an argument -- %lc\n"), argv[0],
-                         (wint_t)c);
+                              (wint_t)c);
             }
             woptopt = c;
             c = missing_arg_return_colon ? ':' : '?';
@@ -263,12 +263,12 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
         else {
             if (wopterr) {
                 if (argv[woptind - 1][1] == '-')  // --option
-                    std::fwprintf(stderr, _(L"%ls: Option '--%ls' doesn't allow an argument\n"), argv[0],
-                             pfound->name);
+                    std::fwprintf(stderr, _(L"%ls: Option '--%ls' doesn't allow an argument\n"),
+                                  argv[0], pfound->name);
                 else
                     // +option or -option
                     std::fwprintf(stderr, _(L"%ls: Option '%lc%ls' doesn't allow an argument\n"),
-                             argv[0], argv[woptind - 1][0], pfound->name);
+                                  argv[0], argv[woptind - 1][0], pfound->name);
             }
             nextchar += std::wcslen(nextchar);
             *retval = '?';
@@ -280,7 +280,7 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
         else {
             if (wopterr)
                 std::fwprintf(stderr, _(L"%ls: Option '%ls' requires an argument\n"), argv[0],
-                         argv[woptind - 1]);
+                              argv[woptind - 1]);
             nextchar += std::wcslen(nextchar);
             *retval = missing_arg_return_colon ? ':' : '?';
             return;
@@ -365,7 +365,7 @@ bool wgetopter_t::_handle_long_opt(int argc, wchar_t **argv, const struct woptio
             else
                 // +option or -option
                 std::fwprintf(stderr, _(L"%ls: Unrecognized option '%lc%ls'\n"), argv[0],
-                         argv[woptind][0], nextchar);
+                              argv[woptind][0], nextchar);
         }
         nextchar = (wchar_t *)L"";
         woptind++;
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 4d17bc4aa..0c908f3da 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -173,8 +173,8 @@ static wcstring resolve_description(const wcstring &full_completion, wcstring *c
 
 // A transient parameter pack needed by wildcard_complete.
 struct wc_complete_pack_t {
-    const wcstring &orig;                     // the original string, transient
-    const description_func_t &desc_func;      // function for generating descriptions
+    const wcstring &orig;                 // the original string, transient
+    const description_func_t &desc_func;  // function for generating descriptions
     expand_flags_t expand_flags;
     wc_complete_pack_t(const wcstring &str, const description_func_t &df, expand_flags_t fl)
         : orig(str), desc_func(df), expand_flags(fl) {}
@@ -336,8 +336,9 @@ bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_f
 /// \param stat_res The result of calling stat on the file
 /// \param buf The struct buf output of calling stat on the file
 /// \param err The errno value after a failed stat call on the file.
-static const wchar_t *file_get_desc(const wcstring &filename, int lstat_res, const struct stat &lbuf,
-                              int stat_res, const struct stat &buf, int err) {
+static const wchar_t *file_get_desc(const wcstring &filename, int lstat_res,
+                                    const struct stat &lbuf, int stat_res, const struct stat &buf,
+                                    int err) {
     if (lstat_res) {
         return COMPLETE_FILE_DESC;
     }
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 1565725a2..b9998f6b6 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -9,8 +9,8 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 #include <sys/stat.h>
+#include <cstring>
 #if defined(__linux__)
 #include <sys/statfs.h>
 #endif
@@ -18,8 +18,8 @@
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cwchar>
 #include <wctype.h>
+#include <cwchar>
 
 #include <atomic>
 #include <string>
@@ -231,13 +231,9 @@ dir_t::~dir_t() {
     }
 }
 
-bool dir_t::valid() const {
-    return this->dir != nullptr;
-}
+bool dir_t::valid() const { return this->dir != nullptr; }
 
-bool dir_t::read(wcstring &name) {
-    return wreaddir(this->dir, name);
-}
+bool dir_t::read(wcstring &name) { return wreaddir(this->dir, name); }
 
 int wstat(const wcstring &file_name, struct stat *buf) {
     const cstring tmp = wcs2string(file_name);
@@ -289,7 +285,9 @@ int make_fd_blocking(int fd) {
 
 int fd_check_is_remote(int fd) {
 #if defined(__linux__)
-    struct statfs buf{0};
+    struct statfs buf {
+        0
+    };
     if (fstatfs(fd, &buf) < 0) {
         return -1;
     }
diff --git a/src/wutil.h b/src/wutil.h
index 4ec8e016e..5457074bb 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -3,13 +3,13 @@
 #define FISH_WUTIL_H
 
 #include <dirent.h>
+#include <locale.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
-#include <locale.h>
-#include <string>
 #include <wctype.h>
+#include <string>
 
 #ifdef HAVE_XLOCALE_H
 #include <xlocale.h>
@@ -181,16 +181,16 @@ struct dir_t {
 #ifndef HASH_FILE_ID
 #define HASH_FILE_ID 1
 namespace std {
-    template<>
-    struct hash<file_id_t> {
-        size_t operator()(const file_id_t &f) const {
-            std::hash<decltype(f.device)> hasher1;
-            std::hash<decltype(f.inode)> hasher2;
+template <>
+struct hash<file_id_t> {
+    size_t operator()(const file_id_t &f) const {
+        std::hash<decltype(f.device)> hasher1;
+        std::hash<decltype(f.inode)> hasher2;
 
-            return hasher1(f.device) ^ hasher2(f.inode);
-        }
-    };
-}
+        return hasher1(f.device) ^ hasher2(f.inode);
+    }
+};
+}  // namespace std
 #endif
 
 file_id_t file_id_for_fd(int fd);

From 15c50703ce446b131eb3154bfa3e9596d0bbd74f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 12:51:49 +0200
Subject: [PATCH 0490/1732] fish_indent: Allow semicolons for `and` and `or`

As mentioned in #2900, something like

```fish
test -n "$var"; and set -l foo $var
```

is sufficiently idiomatic that it should be allowable.

Also fixes some additional weirdness with semicolons.
---
 src/fish_indent.cpp | 14 ++++++++++++--
 tests/indent.in     | 30 +++++++++++++++++++-----------
 tests/indent.out    |  8 +++++++-
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 4c53484ae..d7279acc4 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -224,17 +224,27 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
             // instead of the semicolons. Semicolons are just ignored, unless they are followed by a
             // command. So `echo;` removes the semicolon, but `echo; echo` removes it and adds a
             // newline.
+            last_was_semicolon = false;
             if (node.get_source(source) == L"\n") {
                 append_newline();
-            } else {
+            } else if (!has_new_line) {
+                // The semicolon is only useful if we haven't just had a newline.
                 last_was_semicolon = true;
             }
         } else if ((node_type >= FIRST_PARSE_TOKEN_TYPE && node_type <= LAST_PARSE_TOKEN_TYPE) ||
                    node_type == parse_special_type_parse_error) {
             if (last_was_semicolon) {
-                append_newline();
+                // We keep the semicolon for `; and` and `; or`,
+                // others we turn into newlines.
+                if (node.keyword != parse_keyword_and
+                    && node.keyword != parse_keyword_or) {
+                    append_newline();
+                } else {
+                    output.push_back(L';');
+                }
                 last_was_semicolon = false;
             }
+
             if (node.keyword != parse_keyword_none) {
                 append_whitespace(node_indent);
                 output.append(keyword_description(node.keyword));
diff --git a/tests/indent.in b/tests/indent.in
index 73f5489a3..9d704afc6 100644
--- a/tests/indent.in
+++ b/tests/indent.in
@@ -1,3 +1,5 @@
+set -l indent ../test/root/bin/fish_indent
+
 echo Test1
 echo -n '
 begin
@@ -5,7 +7,7 @@ echo hi
 
 
 end | cat | cat | begin ; echo hi ; end | begin ; begin ; echo hi ; end ; end arg
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest2
 echo -n '
@@ -18,7 +20,7 @@ switch aloha
       echo hi
 
 end
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest3
 echo -n '
@@ -33,7 +35,7 @@ function hello_world
 
    echo hello
                   end
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest4
 echo -n '
@@ -53,7 +55,7 @@ switch foo #abc
 qqq
    case "*"
        echo sup
-end' | ../test/root/bin/fish_indent
+end' | $indent
 
 echo \nTest5
 echo -n '
@@ -65,7 +67,7 @@ switch beta
        echo delta
 end
 end
-' | ../test/root/bin/fish_indent -i
+' | $indent -i
 
 echo \nTest6
 # Test errors
@@ -75,20 +77,20 @@ echo hi
 else
 echo bye
 end; echo alpha "
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest7
 # issue 1665
 echo -n '
 if begin ; false; end; echo hi ; end
 while begin ; false; end; echo hi ; end
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest redir formatting
 # issue 2899
 echo -n '
 echo < stdin >>appended yes 2>&1 no > stdout maybe 2>&    4 | cat 2>| cat
-' | ../test/root/bin/fish_indent
+' | $indent
 
 echo \nTest normalization of keywords
 # issue 2921
@@ -122,7 +124,13 @@ echo abc;end
 echo hi |
 
 echo bye
-' | ../test/root/bin/fish_indent
+' | $indent
 
-echo 'a;;;;;;' | ../test/root/bin/fish_indent
-echo 'echo; echo' | ../test/root/bin/fish_indent
+echo 'a;;;;;;' | $indent
+echo 'echo; echo' | $indent
+
+# Check that we keep semicolons for and and or, but only on the same line.
+printf '%s\n' "a; and b" | $indent
+printf '%s\n' "a;" "and b" | $indent
+printf '%s\n' "a" "; and b" | $indent
+printf '%s\n' "a; b" | $indent
diff --git a/tests/indent.out b/tests/indent.out
index 811c58174..e9e7008c5 100644
--- a/tests/indent.out
+++ b/tests/indent.out
@@ -36,7 +36,6 @@ function hello_world
     echo sup
     echo hello
 
-
     echo hello
 end
 
@@ -128,3 +127,10 @@ echo bye
 a
 echo
 echo
+a; and b
+a
+and b
+a
+and b
+a
+b

From ce245704d70f32349c0fbd8946ae34c9dddb31b3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 12:53:09 +0200
Subject: [PATCH 0491/1732] Reformat completion scripts

These were excluded from style.fish
---
 share/completions/abook.fish            |  20 +-
 share/completions/ack.fish              |  10 +-
 share/completions/adb.fish              |  18 +-
 share/completions/amixer.fish           |  20 +-
 share/completions/animate.fish          | 130 ++---
 share/completions/apm.fish              |   2 +-
 share/completions/apropos.fish          |   8 +-
 share/completions/apt-cache.fish        |  12 +-
 share/completions/apt-get.fish          |  24 +-
 share/completions/apt-listbugs.fish     |   2 +-
 share/completions/apt-mark.fish         |  24 +-
 share/completions/apt.fish              |  46 +-
 share/completions/aptitude.fish         | 118 ++--
 share/completions/arc.fish              |   2 +-
 share/completions/asp.fish              |   2 +-
 share/completions/aws.fish              | 362 ++++++------
 share/completions/bd.fish               |   6 +-
 share/completions/bosh.fish             | 180 +++---
 share/completions/bower.fish            |  20 +-
 share/completions/brew.fish             | 100 ++--
 share/completions/bundle.fish           |  34 +-
 share/completions/busctl.fish           |  40 +-
 share/completions/cabal.fish            |  14 +-
 share/completions/caddy.fish            |  48 +-
 share/completions/canto.fish            |  22 +-
 share/completions/cargo.fish            |  60 +-
 share/completions/cat.fish              |  38 +-
 share/completions/cf.fish               | 408 +++++++-------
 share/completions/clang++.fish          |   2 +-
 share/completions/clang.fish            |   4 +-
 share/completions/commandline.fish      |   4 +-
 share/completions/compare.fish          |  90 +--
 share/completions/composer.fish         |  22 +-
 share/completions/composite.fish        | 170 +++---
 share/completions/conda.fish            |  90 +--
 share/completions/conjure.fish          |  16 +-
 share/completions/convert.fish          | 464 +++++++--------
 share/completions/cp.fish               | 144 ++---
 share/completions/cygport.fish          |  48 +-
 share/completions/darcs.fish            | 146 ++---
 share/completions/date.fish             |  68 +--
 share/completions/df.fish               |  26 +-
 share/completions/diskutil.fish         |   6 +-
 share/completions/display.fish          | 194 +++----
 share/completions/dlocate.fish          |   4 +-
 share/completions/dmesg.fish            |  86 +--
 share/completions/dpkg-reconfigure.fish |   2 +-
 share/completions/dpkg.fish             |  28 +-
 share/completions/duply.fish            |  30 +-
 share/completions/ebuild.fish           |  56 +-
 share/completions/eix.fish              |   2 +-
 share/completions/elixir.fish           |  28 +-
 share/completions/emaint.fish           |  46 +-
 share/completions/emerge.fish           | 152 ++---
 share/completions/entr.fish             |  10 +-
 share/completions/epkginfo.fish         |  20 +-
 share/completions/equery.fish           | 170 +++---
 share/completions/evince.fish           |   2 +-
 share/completions/exercism.fish         |  10 +-
 share/completions/expand.fish           |  10 +-
 share/completions/feh.fish              |   2 +-
 share/completions/find.fish             |   2 +-
 share/completions/flac.fish             | 110 ++--
 share/completions/flatpak.fish          |  52 +-
 share/completions/functions.fish        |  12 +-
 share/completions/fuser.fish            |   8 +-
 share/completions/gcc.fish              |   6 +-
 share/completions/git.fish              |  10 +-
 share/completions/gpasswd.fish          |   2 +-
 share/completions/gpg.fish              |  66 +--
 share/completions/gphoto2.fish          | 134 ++---
 share/completions/gradle.fish           |  24 +-
 share/completions/grunt.fish            |  32 +-
 share/completions/gsettings.fish        |  20 +-
 share/completions/gv.fish               |  88 +--
 share/completions/head.fish             |  16 +-
 share/completions/help.fish             |   2 +-
 share/completions/heroku.fish           |   2 +-
 share/completions/hg.fish               |   2 +-
 share/completions/highlight.fish        |  12 +-
 share/completions/hugo.fish             | 164 +++---
 share/completions/identify.fish         |  66 +--
 share/completions/iex.fish              |  30 +-
 share/completions/ifdata.fish           |  58 +-
 share/completions/ifup.fish             |   2 +-
 share/completions/import.fish           | 138 ++---
 share/completions/invoke-rc.d.fish      |  12 +-
 share/completions/ipset.fish            |  26 +-
 share/completions/j.fish                |  10 +-
 share/completions/jhipster.fish         |  42 +-
 share/completions/kill.fish             |  30 +-
 share/completions/kitchen.fish          |  24 +-
 share/completions/kldload.fish          |  42 +-
 share/completions/kldunload.fish        |  16 +-
 share/completions/latexmk.fish          | 118 ++--
 share/completions/lein.fish             |  10 +-
 share/completions/light.fish            |   2 +-
 share/completions/ln.fish               |  28 +-
 share/completions/localectl.fish        |  22 +-
 share/completions/locate.fish           |  32 +-
 share/completions/lpadmin.fish          |   4 +-
 share/completions/ls.fish               |  10 +-
 share/completions/lsblk.fish            |  30 +-
 share/completions/lunchy.fish           |  44 +-
 share/completions/lxpanel.fish          |   8 +-
 share/completions/machinectl.fish       |  52 +-
 share/completions/magento.fish          | 714 ++++++++++++------------
 share/completions/makepkg.fish          |  76 +--
 share/completions/mc.fish               |  46 +-
 share/completions/md5sum.fish           |  16 +-
 share/completions/mdadm.fish            | 178 +++---
 share/completions/meson.fish            |  54 +-
 share/completions/mix.fish              | 128 ++---
 share/completions/mkdir.fish            |   4 +-
 share/completions/mktemp.fish           |  22 +-
 share/completions/mkvextract.fish       |  62 +-
 share/completions/mocha.fish            |  90 +--
 share/completions/mocp.fish             |  70 +--
 share/completions/mogrify.fish          | 424 +++++++-------
 share/completions/montage.fish          | 214 +++----
 share/completions/mv.fish               |  16 +-
 share/completions/mvn.fish              |  90 +--
 share/completions/namei.fish            |  16 +-
 share/completions/netctl.fish           |   2 +-
 share/completions/ngrok.fish            |  46 +-
 share/completions/nl.fish               |  32 +-
 share/completions/nm.fish               |  44 +-
 share/completions/node.fish             | 312 +++++------
 share/completions/npm.fish              |  26 +-
 share/completions/obnam.fish            |  40 +-
 share/completions/oggenc.fish           |  16 +-
 share/completions/opam.fish             |   2 +-
 share/completions/open.fish             |  24 +-
 share/completions/openocd.fish          |   4 +-
 share/completions/opkg.fish             |   2 +-
 share/completions/optipng.fish          |   6 +-
 share/completions/pacaur.fish           |  40 +-
 share/completions/pacman-key.fish       |  42 +-
 share/completions/pacmd.fish            |   2 +-
 share/completions/pactl.fish            |  96 ++--
 share/completions/pactree.fish          |  20 +-
 share/completions/pandoc.fish           |  42 +-
 share/completions/passwd.fish           |  70 +--
 share/completions/pfctl.fish            |   6 +-
 share/completions/pgrep.fish            |   2 +-
 share/completions/pinky.fish            |  22 +-
 share/completions/pkg.fish              | 140 ++---
 share/completions/pkgfile.fish          |  24 +-
 share/completions/port.fish             | 136 ++---
 share/completions/psql.fish             |  48 +-
 share/completions/pushd.fish            |   8 +-
 share/completions/pydf.fish             |  30 +-
 share/completions/python.fish           |   2 +-
 share/completions/python3.fish          |   2 +-
 share/completions/quilt.fish            |   2 +-
 share/completions/rbenv.fish            |  44 +-
 share/completions/readlink.fish         |  14 +-
 share/completions/realpath.fish         |  22 +-
 share/completions/rm.fish               |  66 +--
 share/completions/rmmod.fish            |   6 +-
 share/completions/ruby-build.fish       |  12 +-
 share/completions/s3cmd.fish            |   4 +-
 share/completions/sbt.fish              |  44 +-
 share/completions/scanimage.fish        |  20 +-
 share/completions/screen.fish           |   4 +-
 share/completions/scss.fish             |   2 +-
 share/completions/sed.fish              |  26 +-
 share/completions/seq.fish              |  20 +-
 share/completions/service.fish          |  26 +-
 share/completions/set.fish              |  50 +-
 share/completions/setfacl.fish          |  52 +-
 share/completions/setxkbmap.fish        |  36 +-
 share/completions/snap.fish             | 239 ++++----
 share/completions/sort.fish             |   2 +-
 share/completions/ssh.fish              |   8 +-
 share/completions/stat.fish             |  36 +-
 share/completions/stream.fish           |  66 +--
 share/completions/subl.fish             |  18 +-
 share/completions/sysctl.fish           |  82 +--
 share/completions/systemctl.fish        |  10 +-
 share/completions/systemd-analyze.fish  |  18 +-
 share/completions/tail.fish             |   4 +-
 share/completions/tee.fish              |   8 +-
 share/completions/tex.fish              |  22 +-
 share/completions/tmuxinator.fish       |  12 +-
 share/completions/touch.fish            |  40 +-
 share/completions/tr.fish               |  84 +--
 share/completions/travis.fish           | 108 ++--
 share/completions/tree.fish             |  86 +--
 share/completions/uname.fish            |  36 +-
 share/completions/unexpand.fish         |  12 +-
 share/completions/uniq.fish             |  34 +-
 share/completions/unzip.fish            |  58 +-
 share/completions/vagrant.fish          |  14 +-
 share/completions/valgrind.fish         |  20 +-
 share/completions/vi.fish               |   2 +-
 share/completions/vim-addons.fish       |  28 +-
 share/completions/wajig.fish            |  24 +-
 share/completions/watch.fish            |  24 +-
 share/completions/wget.fish             |   4 +-
 share/completions/which.fish            |   2 +-
 share/completions/wicd-cli.fish         |  16 +-
 share/completions/wicd-client.fish      |   6 +-
 share/completions/wicd-gtk.fish         |   6 +-
 share/completions/xdg-mime.fish         |   8 +-
 share/completions/xinput.fish           |   6 +-
 share/completions/xrandr.fish           |  46 +-
 share/completions/xrdb.fish             |  36 +-
 share/completions/xsv.fish              |  38 +-
 share/completions/yaourt.fish           |  44 +-
 share/completions/yarn.fish             |   2 +-
 share/completions/yast2.fish            |  16 +-
 share/completions/yum.fish              |  12 +-
 share/completions/zfs.fish              |   8 +-
 share/completions/zpool.fish            |   6 +-
 share/completions/zypper.fish           | 586 +++++++++----------
 share/functions/fish_vi_cursor.fish     |   4 +-
 217 files changed, 5726 insertions(+), 5715 deletions(-)

diff --git a/share/completions/abook.fish b/share/completions/abook.fish
index 97b144b02..a2dc51b97 100644
--- a/share/completions/abook.fish
+++ b/share/completions/abook.fish
@@ -1,16 +1,16 @@
 
 complete -c abook -s h -d 'Show usage'
 complete -c abook -s C -l config -d 'Use an alternative configuration file' -r
-complete -c abook      -l datafile -d 'Use an alternative addressbook file' -r
-complete -c abook      -l mutt-query -d 'Make a query for mutt' -x
-complete -c abook      -l add-email  -d 'Read email message from stdin and add the sender'
-complete -c abook      -l add-email-quiet -d 'Same as --add-email. Without confirmation'
-complete -c abook      -l convert  -d 'Convert address book files'
+complete -c abook -l datafile -d 'Use an alternative addressbook file' -r
+complete -c abook -l mutt-query -d 'Make a query for mutt' -x
+complete -c abook -l add-email -d 'Read email message from stdin and add the sender'
+complete -c abook -l add-email-quiet -d 'Same as --add-email. Without confirmation'
+complete -c abook -l convert -d 'Convert address book files'
 
 set -l convert 'contains -- --convert (commandline -po)'
-complete -c abook      -l informat -d 'Input file format' -xa '(__fish_complete_abook_formats in)' -n $convert
-complete -c abook      -l outformat -d 'Output file format' -xa '(__fish_complete_abook_formats out)' -n $convert
-complete -c abook      -l infile    -d 'Input file (default: stdin)' -r -n $convert
-complete -c abook      -l outfile   -d 'Output file (default: stdout)' -r -n $convert
+complete -c abook -l informat -d 'Input file format' -xa '(__fish_complete_abook_formats in)' -n $convert
+complete -c abook -l outformat -d 'Output file format' -xa '(__fish_complete_abook_formats out)' -n $convert
+complete -c abook -l infile -d 'Input file (default: stdin)' -r -n $convert
+complete -c abook -l outfile -d 'Output file (default: stdout)' -r -n $convert
 
-complete -c abook      -l formats   -d 'Print available formats'
+complete -c abook -l formats -d 'Print available formats'
diff --git a/share/completions/ack.fish b/share/completions/ack.fish
index 60db3d4c8..e94fcf613 100644
--- a/share/completions/ack.fish
+++ b/share/completions/ack.fish
@@ -83,9 +83,9 @@ complete -c ack -l thpppt -d 'Bill the Cat'
 complete -c ack -l bar -d 'The warning admiral'
 
 # File types
-if type ack > /dev/null
-	for type in (ack --dump 2>/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
-		complete -c ack -l $type -d "Allow $type file type"
-		complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
-	end
+if type ack >/dev/null
+    for type in (ack --dump 2>/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
+        complete -c ack -l $type -d "Allow $type file type"
+        complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
+    end
 end
diff --git a/share/completions/adb.fish b/share/completions/adb.fish
index 559a3e3bc..b055347ee 100644
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -59,17 +59,17 @@ function __fish_adb_list_uninstallable_packages
 end
 
 function __fish_adb_list_files
-   set -l token (commandline -ct)
+    set -l token (commandline -ct)
 
-   # Have tab complete show initial / if nothing on current token
-   if test -z "$token"
-       set token "/"
-   end
+    # Have tab complete show initial / if nothing on current token
+    if test -z "$token"
+        set token "/"
+    end
 
-   # Return list of directories suffixed with '/'
-   __fish_adb_run_command find -H "$token*" -maxdepth 0 -type d 2>/dev/null | awk '{print $1"/"}'
-   # Return list of files
-   __fish_adb_run_command find -H "$token*" -maxdepth 0 -type f 2>/dev/null
+    # Return list of directories suffixed with '/'
+    __fish_adb_run_command find -H "$token*" -maxdepth 0 -type d 2>/dev/null | awk '{print $1"/"}'
+    # Return list of files
+    __fish_adb_run_command find -H "$token*" -maxdepth 0 -type f 2>/dev/null
 end
 
 
diff --git a/share/completions/amixer.fish b/share/completions/amixer.fish
index a901fe35d..724e3e87c 100644
--- a/share/completions/amixer.fish
+++ b/share/completions/amixer.fish
@@ -2,13 +2,13 @@ set -l cmds 'scontrols scontents controls contents sget sset cset cget set get'
 complete -c amixer -xa "$cmds" -n "not __fish_seen_subcommand_from $cmds"
 complete -c amixer -n '__fish_seen_subcommand_from sset sget get set' -xa "(amixer scontrols | cut --delimiter \' --fields 2)"
 
-complete -c amixer -s h -l help        -d 'this help'
-complete -c amixer -s c -l card -r     -d 'select the card'
-complete -c amixer -s D -l device -r   -d 'select the device, default \'default\''
-complete -c amixer -s d -l debug       -d 'debug mode'
-complete -c amixer -s n -l nocheck     -d 'do not perform range checking'
-complete -c amixer -s v -l version     -d 'print version of this program'
-complete -c amixer -s q -l quiet       -d 'be quiet'
-complete -c amixer -s i -l inactive    -d 'show also inactive controls'
-complete -c amixer -s a -l abstract    -d 'select abstraction level' -xa 'none basic'
-complete -c amixer -s s -l stdin       -d 'Read and execute commands from stdin sequentially'
+complete -c amixer -s h -l help -d 'this help'
+complete -c amixer -s c -l card -r -d 'select the card'
+complete -c amixer -s D -l device -r -d 'select the device, default \'default\''
+complete -c amixer -s d -l debug -d 'debug mode'
+complete -c amixer -s n -l nocheck -d 'do not perform range checking'
+complete -c amixer -s v -l version -d 'print version of this program'
+complete -c amixer -s q -l quiet -d 'be quiet'
+complete -c amixer -s i -l inactive -d 'show also inactive controls'
+complete -c amixer -s a -l abstract -d 'select abstraction level' -xa 'none basic'
+complete -c amixer -s s -l stdin -d 'Read and execute commands from stdin sequentially'
diff --git a/share/completions/animate.fish b/share/completions/animate.fish
index 70c9323db..fadc47945 100644
--- a/share/completions/animate.fish
+++ b/share/completions/animate.fish
@@ -1,65 +1,65 @@
-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 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)'
-complete -c animate -o colormap                    -d 'Shared or Private [type]' -x
-complete -c animate -o colorspace                  -d 'Alternate image colorspace [type]' -xa '(animate -list colorspace)'
-complete -c animate -o decipher                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c animate -o define                      -d 'Define one or more image format options [format:option]'
-complete -c animate -o delay                       -d 'Display the next image after pausing [value]'
-complete -c animate -o density                     -d 'Horizontal and vertical density of the image [geometry]'
-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 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]'
-complete -c animate -o gravity                     -d 'Horizontal and vertical backdrop placement [type]' -xa '(animate -list gravity)'
-complete -c animate -o identify                    -d 'Identify the format and characteristics of the image'
-complete -c animate -o immutable                   -d 'Displayed image cannot be modified'
-complete -c animate -o interlace                   -d 'Type of image interlacing scheme [type]' -xa '(animate -list interlace)'
-complete -c animate -o interpolate                 -d 'Pixel color interpolation method [method]' -xa '(animate -list interpolate)'
-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 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)'
-complete -c animate -o quiet                       -d 'Suppress all warning messages'
-complete -c animate -o regard-warnings             -d 'Pay attention to warning messages'
-complete -c animate -o remote                      -d 'Command execute a command in an remote display process'
-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 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]'
-complete -c animate -o verbose                     -d 'Print detailed information about the image'
-complete -c animate -o visual                      -d 'Display image using this visual type [type]' -x
-complete -c animate -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(animate -list virtual-pixel)'
-complete -c animate -o window                      -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
-complete -c animate -o colors                      -d 'Preferred number of colors in the image [value]'
-complete -c animate -o crop                        -d 'Preferred size and location of the cropped image [geometry]'
-complete -c animate -o extract                     -d 'Extract area from image [geometry]'
-complete -c animate -o monochrome                  -d 'Transform image to black and white'
-complete -c animate -o repage                      -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c animate -o resample                    -d 'Change the resolution of an image [geometry]'
-complete -c animate -o resize                      -d 'Resize the image [geometry]'
-complete -c animate -o rotate                      -d 'Apply Paeth rotation to the image [degrees]'
-complete -c animate -o strip                       -d 'Strip image of all profiles and comments'
-complete -c animate -o thumbnail                   -d 'Create a thumbnail of the image [geometry]'
-complete -c animate -o trim                        -d 'Trim image edges'
-complete -c animate -o coalesce                    -d 'Merge a sequence of images'
-complete -c animate -o flatten                     -d 'Flatten a sequence of images'
-complete -c animate -o debug                       -d 'Display copious debugging information [events]' -xa '(animate -list debug)'
-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 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]'
+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 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)'
+complete -c animate -o colormap -d 'Shared or Private [type]' -x
+complete -c animate -o colorspace -d 'Alternate image colorspace [type]' -xa '(animate -list colorspace)'
+complete -c animate -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c animate -o define -d 'Define one or more image format options [format:option]'
+complete -c animate -o delay -d 'Display the next image after pausing [value]'
+complete -c animate -o density -d 'Horizontal and vertical density of the image [geometry]'
+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 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]'
+complete -c animate -o gravity -d 'Horizontal and vertical backdrop placement [type]' -xa '(animate -list gravity)'
+complete -c animate -o identify -d 'Identify the format and characteristics of the image'
+complete -c animate -o immutable -d 'Displayed image cannot be modified'
+complete -c animate -o interlace -d 'Type of image interlacing scheme [type]' -xa '(animate -list interlace)'
+complete -c animate -o interpolate -d 'Pixel color interpolation method [method]' -xa '(animate -list interpolate)'
+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 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)'
+complete -c animate -o quiet -d 'Suppress all warning messages'
+complete -c animate -o regard-warnings -d 'Pay attention to warning messages'
+complete -c animate -o remote -d 'Command execute a command in an remote display process'
+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 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]'
+complete -c animate -o verbose -d 'Print detailed information about the image'
+complete -c animate -o visual -d 'Display image using this visual type [type]' -x
+complete -c animate -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(animate -list virtual-pixel)'
+complete -c animate -o window -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
+complete -c animate -o colors -d 'Preferred number of colors in the image [value]'
+complete -c animate -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c animate -o extract -d 'Extract area from image [geometry]'
+complete -c animate -o monochrome -d 'Transform image to black and white'
+complete -c animate -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c animate -o resample -d 'Change the resolution of an image [geometry]'
+complete -c animate -o resize -d 'Resize the image [geometry]'
+complete -c animate -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c animate -o strip -d 'Strip image of all profiles and comments'
+complete -c animate -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c animate -o trim -d 'Trim image edges'
+complete -c animate -o coalesce -d 'Merge a sequence of images'
+complete -c animate -o flatten -d 'Flatten a sequence of images'
+complete -c animate -o debug -d 'Display copious debugging information [events]' -xa '(animate -list debug)'
+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 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]'
diff --git a/share/completions/apm.fish b/share/completions/apm.fish
index 15622b417..da226eead 100644
--- a/share/completions/apm.fish
+++ b/share/completions/apm.fish
@@ -178,7 +178,7 @@ atom.io registry"
     complete -x -c apm -n "__fish_apm_using_command login" -l token -d "Specify API token"
 
     # outdated & upgrade & update
-    set  -l upgrade_commands "outdated upgrade update"
+    set -l upgrade_commands "outdated upgrade update"
     complete -f -c apm -n '__fish_apm_needs_command' -a $upgrade_commands -d "Upgrade out of date packages"
     complete -f -c apm -n "__fish_apm_using_command $upgrade_commands" -l json -d "Output outdated packages as JSON array"
     complete -x -c apm -n "__fish_apm_using_command $upgrade_commands" -l compatible -d "Only install packages/themes compatible with specified Atom version"
diff --git a/share/completions/apropos.fish b/share/completions/apropos.fish
index 309358255..8344a3e96 100644
--- a/share/completions/apropos.fish
+++ b/share/completions/apropos.fish
@@ -1,9 +1,9 @@
 
 function __fish_complete_apropos
-	if test (commandline -ct)
-		set str (commandline -ct)
-		apropos $str 2>/dev/null |sed -e "s/^\(.*$str\([^ ]*\).*\)\$/$str\2"\t"\1/"
-	end
+    if test (commandline -ct)
+        set str (commandline -ct)
+        apropos $str 2>/dev/null | sed -e "s/^\(.*$str\([^ ]*\).*\)\$/$str\2"\t"\1/"
+    end
 end
 
 complete -xc apropos -a '(__fish_complete_apropos)' -d "whatis entry"
diff --git a/share/completions/apt-cache.fish b/share/completions/apt-cache.fish
index ce6df53cb..4070a343b 100644
--- a/share/completions/apt-cache.fish
+++ b/share/completions/apt-cache.fish
@@ -30,12 +30,12 @@ complete -r -c apt-cache -s c -l config-file -d "Specify config file"
 complete -x -c apt-cache -s o -l option -d "Specify options"
 
 function __fish_apt-cache_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains show showpkg showsrc depends rdepends dotty policy
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains show showpkg showsrc depends rdepends dotty policy
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-cache -n '__fish_apt-cache_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt-get.fish b/share/completions/apt-get.fish
index 3aebaab77..f691ce87f 100644
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -1,21 +1,21 @@
 #completion for apt-get
 
 function __fish_apt_no_subcommand -d 'Test if apt has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge source build-dep check clean autoclean changelog
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge source build-dep check clean autoclean changelog
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains install remove purge build-dep changelog
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains install remove purge build-dep changelog
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt-listbugs.fish b/share/completions/apt-listbugs.fish
index 4e6341d47..87e8802c0 100644
--- a/share/completions/apt-listbugs.fish
+++ b/share/completions/apt-listbugs.fish
@@ -1,6 +1,6 @@
 #apt-listbugs
 complete -c apt-listbugs -s h -l help -d "Display help and exit"
-complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d "Set severity"
+complete -f -c apt-listbugs -s s -l severity -a "critical grave" -d "Set severity"
 complete -f -c apt-listbugs -s T -l tag -d "Tags you want to see"
 complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" -d "Bug-status you want to see"
 complete -f -c apt-listbugs -s l -l showless -d "Ignore bugs in your system"
diff --git a/share/completions/apt-mark.fish b/share/completions/apt-mark.fish
index e1caf2513..c118609b8 100644
--- a/share/completions/apt-mark.fish
+++ b/share/completions/apt-mark.fish
@@ -1,21 +1,21 @@
 #completion for apt-mark
 
 function __fish_apt_no_subcommand -d 'Test if apt has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i auto manual hold unhold showauto showmanual showhold
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i auto manual hold unhold showauto showmanual showhold
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains auto manual hold unhold
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains auto manual hold unhold
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-mark -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index 6bc06a84e..9b4d46895 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -20,58 +20,58 @@ complete -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_
 complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -re -- "(?:\\b|_)"(commandline -ct | string escape --style=regex) | head -n 250)' -d 'Package'
 
 # Support flags
-complete -x -f -c apt -s h -l help     -d 'Display help'
-complete -x -f -c apt -s v -l version  -d 'Display version and exit'
+complete -x -f -c apt -s h -l help -d 'Display help'
+complete -x -f -c apt -s v -l version -d 'Display version and exit'
 
 # General options
-complete -f -c apt -s o -l option       -d 'Set a configuration option'
-complete -f -c apt -s c -l config-file  -d 'Configuration file'
-complete -f -c apt -s t                 -d 'Target release'
+complete -f -c apt -s o -l option -d 'Set a configuration option'
+complete -f -c apt -s c -l config-file -d 'Configuration file'
+complete -f -c apt -s t -d 'Target release'
 
 # List
-__fish_apt_subcommand list                  -d 'List packages'
-__fish_apt_option     list -l installed     -d 'Installed packages'
-__fish_apt_option     list -l upgradable    -d 'Upgradable packages'
-__fish_apt_option     list -l all-versions  -d 'Show all versions of any package'
+__fish_apt_subcommand list -d 'List packages'
+__fish_apt_option list -l installed -d 'Installed packages'
+__fish_apt_option list -l upgradable -d 'Upgradable packages'
+__fish_apt_option list -l all-versions -d 'Show all versions of any package'
 
 # Search
-__fish_apt_subcommand search -r        -d 'Search for packages'
+__fish_apt_subcommand search -r -d 'Search for packages'
 
 # Search
-__fish_apt_subcommand show -r          -d 'Show package information'
+__fish_apt_subcommand show -r -d 'Show package information'
 
 # Install
-__fish_apt_subcommand install -r       -d 'Install packages'
+__fish_apt_subcommand install -r -d 'Install packages'
 
 # Remove
-__fish_apt_subcommand remove -r        -d 'Remove packages'
+__fish_apt_subcommand remove -r -d 'Remove packages'
 
 # Edit sources
-__fish_apt_subcommand edit-sources     -d 'Edit sources list'
+__fish_apt_subcommand edit-sources -d 'Edit sources list'
 
 # Update
-__fish_apt_subcommand update -x        -d 'Update package list'
+__fish_apt_subcommand update -x -d 'Update package list'
 
 # Upgrade
-__fish_apt_subcommand upgrade -r       -d 'Upgrade packages'
+__fish_apt_subcommand upgrade -r -d 'Upgrade packages'
 
 # Full Upgrade
-__fish_apt_subcommand full-upgrade -r  -d 'Upgrade packages, removing others when needed'
+__fish_apt_subcommand full-upgrade -r -d 'Upgrade packages, removing others when needed'
 
 # Purge
-__fish_apt_subcommand purge -x         -d 'Remove packages and delete their config files'
+__fish_apt_subcommand purge -x -d 'Remove packages and delete their config files'
 
 # Changelog
-__fish_apt_subcommand changelog -r     -d 'Download and display package changelog'
+__fish_apt_subcommand changelog -r -d 'Download and display package changelog'
 
 # Autoremove
-__fish_apt_subcommand autoremove       -d 'Remove packages no longer needed as dependencies'
+__fish_apt_subcommand autoremove -d 'Remove packages no longer needed as dependencies'
 
 # Policy
-__fish_apt_subcommand policy -x        -d 'Display source or package priorities'
+__fish_apt_subcommand policy -x -d 'Display source or package priorities'
 
 # Depends
-__fish_apt_subcommand depends -r       -d 'List package dependencies'
+__fish_apt_subcommand depends -r -d 'List package dependencies'
 
 # Rdepends
-__fish_apt_subcommand rdepends -r      -d 'List package reverse dependencies'
+__fish_apt_subcommand rdepends -r -d 'List package reverse dependencies'
diff --git a/share/completions/aptitude.fish b/share/completions/aptitude.fish
index 2267e0c78..089ffdd23 100644
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -1,68 +1,68 @@
 #completion for aptitude
 
-function __fish_apt_no_subcommand  -d 'Test if aptitude has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i autoclean clean forget-new keep-all update safe-upgrade changelog full-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
-			return 1
-		end
-	end
-	return 0
+function __fish_apt_no_subcommand -d 'Test if aptitude has yet to be given the subcommand'
+    for i in (commandline -opc)
+        if contains -- $i autoclean clean forget-new keep-all update safe-upgrade changelog full-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
+            return 1
+        end
+    end
+    return 0
 end
 
-function __fish_apt_use_package  -d 'Test if aptitude command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
-			return 0
-		end
-	end
-	return 1
+function __fish_apt_use_package -d 'Test if aptitude command should have packages as potential completion'
+    for i in (commandline -opc)
+        if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
+            return 0
+        end
+    end
+    return 1
 end
 
-complete -c aptitude -n '__fish_apt_use_package' -a '(__fish_print_packages)'  -d 'Package'
+complete -c aptitude -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
 
-complete -c aptitude -s h -l help  -d 'Display a brief help message. Identical to the help action'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'autoclean'  -d 'Remove any cached packages which can no longer be downloaded'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean'  -d 'Remove all downloaded .deb files from the package cache directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new'  -d 'Forget all internal information about what packages are \'new\''
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all'  -d 'Cancel all scheduled actions on all packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update'  -d 'Update the list of available packages from the apt sources'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade'  -d 'Upgrade installed packages to their most recent version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog'  -d 'Download and displays the Debian changelog for the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade'  -d 'Upgrade, removing or installing packages as necessary'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download'  -d 'Download the packages to the current directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version'  -d 'Forbid the upgrade to a particular version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold'  -d 'Ignore the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'install'  -d 'Install the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep'  -d 'Cancel any scheduled actions on the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'markauto'  -d 'Mark packages as automatically installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'purge'  -d 'Remove and delete all associated configuration and data files'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'reinstall'  -d 'Reinstall the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'remove'  -d 'Remove the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'show'  -d 'Display detailed information about the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unhold'  -d 'Consider the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unmarkauto'  -d 'Mark packages as manually installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'search'  -d 'Search for packages matching one of the patterns'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'help'  -d 'Display brief summary of the available commands and options'
+complete -c aptitude -s h -l help -d 'Display a brief help message. Identical to the help action'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'autoclean' -d 'Remove any cached packages which can no longer be downloaded'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean' -d 'Remove all downloaded .deb files from the package cache directory'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new' -d 'Forget all internal information about what packages are \'new\''
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all' -d 'Cancel all scheduled actions on all packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update' -d 'Update the list of available packages from the apt sources'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade' -d 'Upgrade installed packages to their most recent version'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog' -d 'Download and displays the Debian changelog for the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade' -d 'Upgrade, removing or installing packages as necessary'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download' -d 'Download the packages to the current directory'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version' -d 'Forbid the upgrade to a particular version'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold' -d 'Ignore the packages by future upgrade commands'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'install' -d 'Install the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep' -d 'Cancel any scheduled actions on the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'markauto' -d 'Mark packages as automatically installed'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'purge' -d 'Remove and delete all associated configuration and data files'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'reinstall' -d 'Reinstall the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'remove' -d 'Remove the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'show' -d 'Display detailed information about the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unhold' -d 'Consider the packages by future upgrade commands'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unmarkauto' -d 'Mark packages as manually installed'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'search' -d 'Search for packages matching one of the patterns'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'help' -d 'Display brief summary of the available commands and options'
 
-complete -c aptitude -s D -l show-deps  -d 'Show explanations of automatic installations and removals'
-complete -c aptitude -s d -l download-only  -d 'Download Only'
-complete -c aptitude -s f -l fix-broken  -d 'Correct broken dependencies'
-complete -c aptitude -l purge-unused  -d 'Purge packages that are not required by any installed package'
-complete -c aptitude -s P -l prompt  -d 'Always display a prompt'
-complete -c aptitude -s R -l without-recommends  -d 'Do not treat recommendations as dependencies'
-complete -c aptitude -s r -l with-recommends  -d 'Treat recommendations as dependencies'
-complete -c aptitude -s s -l simulate  -d 'Don\'t perform the actions. Just show them'
-complete -c aptitude -l schedule-only  -d 'Schedule operations to be performed in the future'
-complete -c aptitude -s q -l quiet  -d 'Suppress incremental progress indicators'
-complete -c aptitude -s V -l show-versions  -d 'Show which versions of packages will be installed'
-complete -c aptitude -s v -l verbose  -d 'Display extra information'
-complete -c aptitude -l version  -d 'Display the version of aptitude and compile information'
-complete -c aptitude -l visual-preview  -d 'Start up the visual interface and display its preview screen'
-complete -c aptitude -s y -l assume-yes  -d 'Assume the answer yes for all question prompts'
-complete -c aptitude -s Z  -d 'Show how much disk space will be used or freed'
-complete -r -c aptitude -s F -l display-format  -d 'Specify the format to be used by the search command'
-complete -r -c aptitude -s t -l target-release  -d 'Set the release from which packages should be installed'
-complete -r -c aptitude -s O -l sort  -d 'Specify the order for the output from the search command'
-complete -r -c aptitude -s o  -d 'Set a configuration file option directly'
-complete -r -c aptitude -s w -l width  -d 'Specify the display width for the output from the search command'
+complete -c aptitude -s D -l show-deps -d 'Show explanations of automatic installations and removals'
+complete -c aptitude -s d -l download-only -d 'Download Only'
+complete -c aptitude -s f -l fix-broken -d 'Correct broken dependencies'
+complete -c aptitude -l purge-unused -d 'Purge packages that are not required by any installed package'
+complete -c aptitude -s P -l prompt -d 'Always display a prompt'
+complete -c aptitude -s R -l without-recommends -d 'Do not treat recommendations as dependencies'
+complete -c aptitude -s r -l with-recommends -d 'Treat recommendations as dependencies'
+complete -c aptitude -s s -l simulate -d 'Don\'t perform the actions. Just show them'
+complete -c aptitude -l schedule-only -d 'Schedule operations to be performed in the future'
+complete -c aptitude -s q -l quiet -d 'Suppress incremental progress indicators'
+complete -c aptitude -s V -l show-versions -d 'Show which versions of packages will be installed'
+complete -c aptitude -s v -l verbose -d 'Display extra information'
+complete -c aptitude -l version -d 'Display the version of aptitude and compile information'
+complete -c aptitude -l visual-preview -d 'Start up the visual interface and display its preview screen'
+complete -c aptitude -s y -l assume-yes -d 'Assume the answer yes for all question prompts'
+complete -c aptitude -s Z -d 'Show how much disk space will be used or freed'
+complete -r -c aptitude -s F -l display-format -d 'Specify the format to be used by the search command'
+complete -r -c aptitude -s t -l target-release -d 'Set the release from which packages should be installed'
+complete -r -c aptitude -s O -l sort -d 'Specify the order for the output from the search command'
+complete -r -c aptitude -s o -d 'Set a configuration file option directly'
+complete -r -c aptitude -s w -l width -d 'Specify the display width for the output from the search command'
 
diff --git a/share/completions/arc.fish b/share/completions/arc.fish
index a4e157d8d..13757afa0 100644
--- a/share/completions/arc.fish
+++ b/share/completions/arc.fish
@@ -41,7 +41,7 @@ complete -f -c arc -n '__fish_arc_needs_command' -l conduit-token -d 'Specify th
 complete -f -c arc -n '__fish_arc_needs_command' -l conduit-version -d 'Force a version'
 complete -f -c arc -n '__fish_arc_needs_command' -l conduit-timeout -d 'Sets the timeout'
 complete -f -c arc -n '__fish_arc_needs_command' -l config -d 'Sets a config'
-complete -f -c arc -n '__fish_arc_needs_command'  -l skip-arcconfig -d 'Skip the working copy configuration file'
+complete -f -c arc -n '__fish_arc_needs_command' -l skip-arcconfig -d 'Skip the working copy configuration file'
 complete -c arc -n '__fish_arc_needs_command' -l arcrc-file -d 'Use provided file instead of ~/.arcrc'
 
 ### shell-complete
diff --git a/share/completions/asp.fish b/share/completions/asp.fish
index 8308f235f..8fdd0e735 100644
--- a/share/completions/asp.fish
+++ b/share/completions/asp.fish
@@ -22,5 +22,5 @@ complete -c asp -n "not __fish_seen_subcommand_from $commands" -a untrack -d "Re
 # This will run into the description race.
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update" -a "(asp list-all | string replace -r '.*/' '')" -f
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update untrack" -a "(asp list-local | string replace -r '.*/' '')" -f \
--d "Locally tracked package"
+    -d "Locally tracked package"
 
diff --git a/share/completions/aws.fish b/share/completions/aws.fish
index e9bca56b8..f307a0a92 100644
--- a/share/completions/aws.fish
+++ b/share/completions/aws.fish
@@ -4,20 +4,20 @@
 # for `aws` via `fish_update_completions` are pretty useless due to non-standard formatting.
 
 function __s3_is_bucket
-	commandline -ct | string match -q -r -- '^s3://[^/]?$'
+    commandline -ct | string match -q -r -- '^s3://[^/]?$'
 end
 
 function __s3_is_remote_path
-	commandline -ct | string match -q -r -- "^s3://.*/.*"
+    commandline -ct | string match -q -r -- "^s3://.*/.*"
 end
 
 function __s3_ls_buckets
-	aws s3 ls | string replace -rf '.* (\S+)$' 's3://$1/'
+    aws s3 ls | string replace -rf '.* (\S+)$' 's3://$1/'
 end
 
 function __s3_ls_dir
-	set -l dir (commandline -ct | string replace -rf '(s3://.*/).*' '$1')
-	printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
+    set -l dir (commandline -ct | string replace -rf '(s3://.*/).*' '$1')
+    printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
 end
 
 # S3 remote completions
@@ -30,181 +30,181 @@ complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in mv cp rm" -a
 # This list is extracted from the output of `aws help`, which can't be ingested directly,
 # as it emits considerable ANSI output and other terminal control characters.
 set -l aws_services \
-	acm \
-	acm-pca \
-	alexaforbusiness \
-	amplify \
-	apigateway \
-	apigatewaymanagementapi \
-	apigatewayv2 \
-	application-autoscaling \
-	appmesh \
-	appstream \
-	appsync \
-	athena \
-	autoscaling \
-	autoscaling-plans \
-	backup \
-	batch \
-	budgets \
-	ce \
-	chime \
-	cloud9 \
-	clouddirectory \
-	cloudformation \
-	cloudfront \
-	cloudhsm \
-	cloudhsmv2 \
-	cloudsearch \
-	cloudsearchdomain \
-	cloudtrail \
-	cloudwatch \
-	codebuild \
-	codecommit \
-	codepipeline \
-	codestar \
-	cognito-identity \
-	cognito-idp \
-	cognito-sync \
-	comprehend \
-	comprehendmedical \
-	configservice \
-	configure \
-	connect \
-	cur \
-	datapipeline \
-	datasync \
-	dax \
-	deploy \
-	devicefarm \
-	directconnect \
-	discovery \
-	dlm \
-	dms \
-	docdb \
-	ds \
-	dynamodb \
-	dynamodbstreams \
-	ec2 \
-	ecr \
-	ecs \
-	efs \
-	eks \
-	elasticache \
-	elasticbeanstalk \
-	elastictranscoder \
-	elb \
-	elbv2 \
-	emr \
-	es \
-	events \
-	firehose \
-	fms \
-	fsx \
-	gamelift \
-	glacier \
-	globalaccelerator \
-	glue \
-	greengrass \
-	guardduty \
-	health \
-	help \
-	history \
-	iam \
-	importexport \
-	inspector \
-	iot \
-	iot-data \
-	iot-jobs-data \
-	iot1click-devices \
-	iot1click-projects \
-	iotanalytics \
-	kafka \
-	kinesis \
-	kinesis-video-archived-media \
-	kinesis-video-media \
-	kinesisanalytics \
-	kinesisanalyticsv2 \
-	kinesisvideo \
-	kms \
-	lambda \
-	lex-models \
-	lex-runtime \
-	license-manager \
-	lightsail \
-	logs \
-	machinelearning \
-	macie \
-	marketplace-entitlement \
-	marketplacecommerceanalytics \
-	mediaconnect \
-	mediaconvert \
-	medialive \
-	mediapackage \
-	mediastore \
-	mediastore-data \
-	mediatailor \
-	meteringmarketplace \
-	mgh \
-	mobile \
-	mq \
-	mturk \
-	neptune \
-	opsworks \
-	opsworks-cm \
-	organizations \
-	pi \
-	pinpoint \
-	pinpoint-email \
-	pinpoint-sms-voice \
-	polly \
-	pricing \
-	quicksight \
-	ram \
-	rds \
-	rds-data \
-	redshift \
-	rekognition \
-	resource-groups \
-	resourcegroupstaggingapi \
-	robomaker \
-	route53 \
-	route53domains \
-	route53resolver \
-	s3 \
-	s3api \
-	s3control \
-	sagemaker \
-	sagemaker-runtime \
-	sdb \
-	secretsmanager \
-	securityhub \
-	serverlessrepo \
-	servicecatalog \
-	servicediscovery \
-	ses \
-	shield \
-	signer \
-	sms \
-	snowball \
-	sns \
-	sqs \
-	ssm \
-	stepfunctions \
-	storagegateway \
-	sts \
-	support \
-	swf \
-	textract \
-	transcribe \
-	transfer \
-	translate \
-	waf \
-	waf-regional \
-	workdocs \
-	worklink \
-	workmail \
-	workspaces \
-	xray
+    acm \
+    acm-pca \
+    alexaforbusiness \
+    amplify \
+    apigateway \
+    apigatewaymanagementapi \
+    apigatewayv2 \
+    application-autoscaling \
+    appmesh \
+    appstream \
+    appsync \
+    athena \
+    autoscaling \
+    autoscaling-plans \
+    backup \
+    batch \
+    budgets \
+    ce \
+    chime \
+    cloud9 \
+    clouddirectory \
+    cloudformation \
+    cloudfront \
+    cloudhsm \
+    cloudhsmv2 \
+    cloudsearch \
+    cloudsearchdomain \
+    cloudtrail \
+    cloudwatch \
+    codebuild \
+    codecommit \
+    codepipeline \
+    codestar \
+    cognito-identity \
+    cognito-idp \
+    cognito-sync \
+    comprehend \
+    comprehendmedical \
+    configservice \
+    configure \
+    connect \
+    cur \
+    datapipeline \
+    datasync \
+    dax \
+    deploy \
+    devicefarm \
+    directconnect \
+    discovery \
+    dlm \
+    dms \
+    docdb \
+    ds \
+    dynamodb \
+    dynamodbstreams \
+    ec2 \
+    ecr \
+    ecs \
+    efs \
+    eks \
+    elasticache \
+    elasticbeanstalk \
+    elastictranscoder \
+    elb \
+    elbv2 \
+    emr \
+    es \
+    events \
+    firehose \
+    fms \
+    fsx \
+    gamelift \
+    glacier \
+    globalaccelerator \
+    glue \
+    greengrass \
+    guardduty \
+    health \
+    help \
+    history \
+    iam \
+    importexport \
+    inspector \
+    iot \
+    iot-data \
+    iot-jobs-data \
+    iot1click-devices \
+    iot1click-projects \
+    iotanalytics \
+    kafka \
+    kinesis \
+    kinesis-video-archived-media \
+    kinesis-video-media \
+    kinesisanalytics \
+    kinesisanalyticsv2 \
+    kinesisvideo \
+    kms \
+    lambda \
+    lex-models \
+    lex-runtime \
+    license-manager \
+    lightsail \
+    logs \
+    machinelearning \
+    macie \
+    marketplace-entitlement \
+    marketplacecommerceanalytics \
+    mediaconnect \
+    mediaconvert \
+    medialive \
+    mediapackage \
+    mediastore \
+    mediastore-data \
+    mediatailor \
+    meteringmarketplace \
+    mgh \
+    mobile \
+    mq \
+    mturk \
+    neptune \
+    opsworks \
+    opsworks-cm \
+    organizations \
+    pi \
+    pinpoint \
+    pinpoint-email \
+    pinpoint-sms-voice \
+    polly \
+    pricing \
+    quicksight \
+    ram \
+    rds \
+    rds-data \
+    redshift \
+    rekognition \
+    resource-groups \
+    resourcegroupstaggingapi \
+    robomaker \
+    route53 \
+    route53domains \
+    route53resolver \
+    s3 \
+    s3api \
+    s3control \
+    sagemaker \
+    sagemaker-runtime \
+    sdb \
+    secretsmanager \
+    securityhub \
+    serverlessrepo \
+    servicecatalog \
+    servicediscovery \
+    ses \
+    shield \
+    signer \
+    sms \
+    snowball \
+    sns \
+    sqs \
+    ssm \
+    stepfunctions \
+    storagegateway \
+    sts \
+    support \
+    swf \
+    textract \
+    transcribe \
+    transfer \
+    translate \
+    waf \
+    waf-regional \
+    workdocs \
+    worklink \
+    workmail \
+    workspaces \
+    xray
 
 complete -c aws -n '__fish_is_first_arg' -xa "$aws_services"
diff --git a/share/completions/bd.fish b/share/completions/bd.fish
index 3e3805938..fb9444ab0 100644
--- a/share/completions/bd.fish
+++ b/share/completions/bd.fish
@@ -7,9 +7,9 @@
 
 complete -c bd -A -f
 
-complete -c bd -s c    -d "Classic mode: goes back to the first directory named as the string"
-complete -c bd -s s    -d "Seems mode: goes back to the first directory containing string"
-complete -c bd -s i    -d "Case insensitive move (implies seems mode)"
+complete -c bd -s c -d "Classic mode: goes back to the first directory named as the string"
+complete -c bd -s s -d "Seems mode: goes back to the first directory containing string"
+complete -c bd -s i -d "Case insensitive move (implies seems mode)"
 complete -c bd -s h -x -d "Display help and exit"
 
 function __fish_bd_complete_dirs
diff --git a/share/completions/bosh.fish b/share/completions/bosh.fish
index a2bda6b79..a3b771162 100644
--- a/share/completions/bosh.fish
+++ b/share/completions/bosh.fish
@@ -1,92 +1,92 @@
 set -l subcommands add-blob alias-env attach-disk blobs cancel-task clean-up \
-  cloud-check cloud-config config configs cpi-config create-env create-release \
-  delete-config delete-deployment delete-disk delete-env delete-release \
-  delete-snapshot delete-snapshots delete-stemcell delete-vm deploy deployment \
-  deployments diff-config disks environment environments errands event events \
-  export-release finalize-release generate-job generate-package help ignore \
-  init-release inspect-release instances interpolate locks log-in log-out logs \
-  manifest orphan-disk recreate releases remove-blob repack-stemcell \
-  reset-release restart run-errand runtime-config scp snapshots ssh start \
-  stemcells stop sync-blobs take-snapshot task tasks unignore \
-  update-cloud-config update-config update-cpi-config update-resurrection \
-  update-runtime-config upload-blobs upload-release upload-stemcell variables \
-  vendor-package vms
+    cloud-check cloud-config config configs cpi-config create-env create-release \
+    delete-config delete-deployment delete-disk delete-env delete-release \
+    delete-snapshot delete-snapshots delete-stemcell delete-vm deploy deployment \
+    deployments diff-config disks environment environments errands event events \
+    export-release finalize-release generate-job generate-package help ignore \
+    init-release inspect-release instances interpolate locks log-in log-out logs \
+    manifest orphan-disk recreate releases remove-blob repack-stemcell \
+    reset-release restart run-errand runtime-config scp snapshots ssh start \
+    stemcells stop sync-blobs take-snapshot task tasks unignore \
+    update-cloud-config update-config update-cpi-config update-resurrection \
+    update-runtime-config upload-blobs upload-release upload-stemcell variables \
+    vendor-package vms
 
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'add-blob'               --description "Add blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'alias-env'              --description "Alias environment to save URL and CA certificate"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'attach-disk'            --description "Attaches disk to an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'blobs'                  --description "List blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cancel-task'            --description "Cancel task at its next checkpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'clean-up'               --description "Clean up releases, stemcells, disks, etc."
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-check'            --description "Cloud consistency check and interactive repair"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-config'           --description "Show current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'config'                 --description "Show current config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'configs'                --description "List configs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cpi-config'             --description "Show current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-env'             --description "Create or update BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-release'         --description "Create release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-config'          --description "Delete config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-deployment'      --description "Delete deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-disk'            --description "Delete disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-env'             --description "Delete BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-release'         --description "Delete release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshot'        --description "Delete snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshots'       --description "Delete all snapshots in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-stemcell'        --description "Delete stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-vm'              --description "Delete VM"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deploy'                 --description "Update deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployment'             --description "Show deployment information"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployments'            --description "List deployments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'diff-config'            --description "Diff two configs by ID"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'disks'                  --description "List disks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environment'            --description "Show environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environments'           --description "List environments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'errands'                --description "List errands"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'event'                  --description "Show event details"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'events'                 --description "List events"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'export-release'         --description "Export the compiled release to a tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'finalize-release'       --description "Create final release from dev release tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-job'           --description "Generate job"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-package'       --description "Generate package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'help'                   --description "Show this help message"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ignore'                 --description "Ignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'init-release'           --description "Initialize release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'inspect-release'        --description "List release contents such as jobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'instances'              --description "List all instances in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'interpolate'            --description "Interpolates variables into a manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'locks'                  --description "List current locks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-in'                 --description "Log in"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-out'                --description "Log out"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'logs'                   --description "Fetch logs from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'manifest'               --description "Show deployment manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'orphan-disk'            --description "Orphan disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'recreate'               --description "Recreate instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'releases'               --description "List releases"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'remove-blob'            --description "Remove blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'repack-stemcell'        --description "Repack stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'reset-release'          --description "Reset release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'restart'                --description "Restart instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'run-errand'             --description "Run errand"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'runtime-config'         --description "Show current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'scp'                    --description "SCP to/from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'snapshots'              --description "List snapshots"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ssh'                    --description "SSH into instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'start'                  --description "Start instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stemcells'              --description "List stemcells"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stop'                   --description "Stop instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'sync-blobs'             --description "Sync blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'take-snapshot'          --description "Take snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'task'                   --description "Show task status and start tracking its output"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'tasks'                  --description "List running or recent tasks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'unignore'               --description "Unignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cloud-config'    --description "Update current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-config'          --description "Update config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cpi-config'      --description "Update current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-resurrection'    --description "Enable/disable resurrection"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-runtime-config'  --description "Update current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-blobs'           --description "Upload blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-release'         --description "Upload release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-stemcell'        --description "Upload stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'variables'              --description "List variables"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vendor-package'         --description "Vendor package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vms'                    --description "List all VMs in all deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'add-blob' --description "Add blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'alias-env' --description "Alias environment to save URL and CA certificate"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'attach-disk' --description "Attaches disk to an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'blobs' --description "List blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cancel-task' --description "Cancel task at its next checkpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'clean-up' --description "Clean up releases, stemcells, disks, etc."
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-check' --description "Cloud consistency check and interactive repair"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-config' --description "Show current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'config' --description "Show current config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'configs' --description "List configs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cpi-config' --description "Show current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-env' --description "Create or update BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-release' --description "Create release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-config' --description "Delete config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-deployment' --description "Delete deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-disk' --description "Delete disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-env' --description "Delete BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-release' --description "Delete release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshot' --description "Delete snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshots' --description "Delete all snapshots in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-stemcell' --description "Delete stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-vm' --description "Delete VM"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deploy' --description "Update deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployment' --description "Show deployment information"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployments' --description "List deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'diff-config' --description "Diff two configs by ID"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'disks' --description "List disks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environment' --description "Show environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environments' --description "List environments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'errands' --description "List errands"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'event' --description "Show event details"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'events' --description "List events"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'export-release' --description "Export the compiled release to a tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'finalize-release' --description "Create final release from dev release tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-job' --description "Generate job"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-package' --description "Generate package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'help' --description "Show this help message"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ignore' --description "Ignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'init-release' --description "Initialize release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'inspect-release' --description "List release contents such as jobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'instances' --description "List all instances in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'interpolate' --description "Interpolates variables into a manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'locks' --description "List current locks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-in' --description "Log in"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-out' --description "Log out"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'logs' --description "Fetch logs from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'manifest' --description "Show deployment manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'orphan-disk' --description "Orphan disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'recreate' --description "Recreate instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'releases' --description "List releases"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'remove-blob' --description "Remove blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'repack-stemcell' --description "Repack stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'reset-release' --description "Reset release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'restart' --description "Restart instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'run-errand' --description "Run errand"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'runtime-config' --description "Show current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'scp' --description "SCP to/from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'snapshots' --description "List snapshots"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ssh' --description "SSH into instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'start' --description "Start instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stemcells' --description "List stemcells"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stop' --description "Stop instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'sync-blobs' --description "Sync blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'take-snapshot' --description "Take snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'task' --description "Show task status and start tracking its output"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'tasks' --description "List running or recent tasks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'unignore' --description "Unignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cloud-config' --description "Update current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-config' --description "Update config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cpi-config' --description "Update current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-resurrection' --description "Enable/disable resurrection"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-runtime-config' --description "Update current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-blobs' --description "Upload blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-release' --description "Upload release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-stemcell' --description "Upload stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'variables' --description "List variables"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vendor-package' --description "Vendor package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vms' --description "List all VMs in all deployments"
diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index e459a5c23..d61f657e1 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -1,5 +1,5 @@
 function __bower_cmds
-	echo -en "cache\tManage bower cache
+    echo -en "cache\tManage bower cache
 help\tDisplay help information about Bower
 home\tOpens a package homepage into your favorite browser
 info\tInfo of a particular package
@@ -20,7 +20,7 @@ version\tBump a package version
 end
 
 function __bower_args
-	echo -en "-f\tMakes various commands more forceful
+    echo -en "-f\tMakes various commands more forceful
 --force\tMakes various commands more forceful
 -j\tOutput consumable JSON
 --json\tOutput consumable JSON
@@ -41,14 +41,14 @@ function __bower_args
 end
 
 function __bower_matching_pkgs
-	bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
+    bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
 end
 
 # Output of `bower list` is a) slow, b) convoluted. Use `python` or `jq` instead.
 function __bower_list_installed
-	if not test -e bower.json
-		return 1
-	end
+    if not test -e bower.json
+        return 1
+    end
 
     if set -l python (__fish_anypython)
         $python -c 'import json, sys; data = json.load(sys.stdin);
@@ -56,11 +56,11 @@ for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' bower.json 2>
         return
     end
 
-	if not type -q jq
-		return 1
-	end
+    if not type -q jq
+        return 1
+    end
 
-	jq -r '.dependencies | to_entries[] | .key' bower.json
+    jq -r '.dependencies | to_entries[] | .key' bower.json
 end
 
 complete -c bower -n "__fish_is_first_token" -x -a '(__bower_cmds)'
diff --git a/share/completions/brew.fish b/share/completions/brew.fish
index e3930c41b..ad07d93f8 100644
--- a/share/completions/brew.fish
+++ b/share/completions/brew.fish
@@ -1,34 +1,34 @@
 function __fish_brew_get_cmd
-  for c in (commandline -opc)
-    if not string match -q -- '-*' $c
-      echo $c
+    for c in (commandline -opc)
+        if not string match -q -- '-*' $c
+            echo $c
+        end
     end
-  end
 end
 
 function __fish_brew_needs_command
-  set cmd (__fish_brew_get_cmd)
-  if not set -q cmd[2]
-    return 0
-  end
-  return 1
+    set cmd (__fish_brew_get_cmd)
+    if not set -q cmd[2]
+        return 0
+    end
+    return 1
 end
 
 function __fish_brew_using_command
-  set index 2
+    set index 2
 
-  if set -q argv[2]
-    set index $argv[2]
-  end
-
-  set cmd (__fish_brew_get_cmd)
-
-  if set -q cmd[$index]
-    if [ $argv[1] = $cmd[$index] ]
-      return 0
+    if set -q argv[2]
+        set index $argv[2]
     end
-  end
-  return 1
+
+    set cmd (__fish_brew_get_cmd)
+
+    if set -q cmd[$index]
+        if [ $argv[1] = $cmd[$index] ]
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_brew_formulae
@@ -74,32 +74,32 @@ end
 ########
 
 function __fish_brew_is_subcommand_cask
-  if __fish_brew_using_command cask
-    for action in $argv
-      if __fish_brew_using_command $action 3
-        return 0
-      end
+    if __fish_brew_using_command cask
+        for action in $argv
+            if __fish_brew_using_command $action 3
+                return 0
+            end
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_needs_cask_action
-  if __fish_brew_using_command cask
-    set cmd (__fish_brew_get_cmd)
-    if not set -q cmd[3]
-      return 0
+    if __fish_brew_using_command cask
+        set cmd (__fish_brew_get_cmd)
+        if not set -q cmd[3]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_casks
-  brew search --casks
+    brew search --casks
 end
 
 function __fish_brew_casks_installed
-  brew cask list
+    brew cask list
 end
 
 
@@ -108,28 +108,28 @@ end
 ############
 
 function __fish_brew_is_subcommand_services
-  if __fish_brew_using_command services
-    for action in $argv
-      if __fish_brew_using_command $action 3
-        return 0
-      end
+    if __fish_brew_using_command services
+        for action in $argv
+            if __fish_brew_using_command $action 3
+                return 0
+            end
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_needs_services_action
-  if __fish_brew_using_command services
-    set cmd (__fish_brew_get_cmd)
-    if not set -q cmd[3]
-      return 0
+    if __fish_brew_using_command services
+        set cmd (__fish_brew_get_cmd)
+        if not set -q cmd[3]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_services
-  brew services list | awk '{if (NR>1) print $1}'
+    brew services list | awk '{if (NR>1) print $1}'
 end
 
 
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 7223a8127..5c3451cd6 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -1,25 +1,25 @@
 # Completion for bundler
 
 function __fish_bundle_no_command -d 'Test if bundle has been given no subcommand'
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_bundle_using_command -d 'Test if bundle has been given a specific subcommand'
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_bundled_gems
-  bundle list | sed '1 d' | sed -e 's/\*//g' -e 's/(.*)//g' -e 's/^ *//g' -e 's/ *$//g'
+    bundle list | sed '1 d' | sed -e 's/\*//g' -e 's/(.*)//g' -e 's/^ *//g' -e 's/ *$//g'
 end
 
 # Options for all commands
@@ -56,7 +56,7 @@ complete -f -n '__fish_bundle_using_command install' -c bundle -l no-prune -d 'D
 complete -f -n '__fish_bundle_using_command install' -c bundle -l frozen -d 'Do not allow the Gemfile.lock to be updated after this install'
 
 # Update
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'update'  -d 'Update dependencies to their latest versions'
+complete -f -n '__fish_bundle_no_command' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l source -d 'The name of a :git or :path source used in the Gemfile'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l local -d 'Do not attempt to fetch gems remotely and use the gem cache instead'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l quiet -d 'Only output warnings and errors'
@@ -75,7 +75,7 @@ complete -f -n '__fish_bundle_using_command binstubs' -c bundle -l force -d 'Ove
 complete -f -n '__fish_bundle_using_command binstubs' -c bundle -a '(__fish_bundled_gems)'
 
 # Exec
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'exec' -d 'Execute a script in the context of the current bundle'
+complete -f -n '__fish_bundle_no_command' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
 complete -f -n '__fish_bundle_using_command exec' -c bundle -l keep-file-descriptors -d 'Exec runs a command, providing it access to the gems in the bundle'
 
 # Help
@@ -83,7 +83,7 @@ complete -f -n '__fish_bundle_no_command' -c bundle -a 'help' -d 'Describe avail
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'install' -d 'Install the gems specified by the Gemfile or Gemfile.lock'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'package' -d 'Package .gem files into the vendor/cache directory'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'exec' -d 'Execute a script in the context of the current bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'config' -d 'Specify and read configuration options for bundler'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'check' -d 'Check bundler requirements for your application'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'list' -d 'Show all of the gems in the current bundle'
@@ -145,7 +145,7 @@ complete -f -n '__fish_bundle_using_command init' -c bundle -l gemspec -d 'Use a
 
 # Gem
 complete -f -n '__fish_bundle_no_command' -c bundle -a 'gem' -d 'Create a simple gem, suitable for development with bundler'
-complete -f -n '__fish_bundle_using_command gem' -c bundle -s b -l bin  -d 'Generate a binary for your library'
+complete -f -n '__fish_bundle_using_command gem' -c bundle -s b -l bin -d 'Generate a binary for your library'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s t -l test -d 'Generate a test directory for your library (rspec or minitest)'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s e -l edit -d 'Path to your editor'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -l ext -d 'Generate the boilerplate for C extension code'
@@ -155,7 +155,7 @@ complete -f -n '__fish_bundle_no_command' -c bundle -a 'platform' -d 'Displays p
 complete -f -n '__fish_bundle_using_command platform' -c bundle -l ruby -d 'Only display Ruby directive information'
 
 # Clean
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'clean'    -d 'Cleans up unused gems in your bundler directory'
+complete -f -n '__fish_bundle_no_command' -c bundle -a 'clean' -d 'Cleans up unused gems in your bundler directory'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l dry-run -d 'Only print out changes, do not actually clean gems'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l force -d 'Forces clean even if --path is not set'
 
diff --git a/share/completions/busctl.fish b/share/completions/busctl.fish
index 6358d37e5..29d3d2bc6 100644
--- a/share/completions/busctl.fish
+++ b/share/completions/busctl.fish
@@ -7,22 +7,22 @@
 
 # A simple wrapper to call busctl with the correct mode and output
 function __fish_busctl
-	# TODO: If there's a "--address" argument we need to pass that
-	# We also need to pass the _last_ of these (`busctl --user --system` operates on the system bus)
-	set -l mode
+    # TODO: If there's a "--address" argument we need to pass that
+    # We also need to pass the _last_ of these (`busctl --user --system` operates on the system bus)
+    set -l mode
     if __fish_contains_opt user
-		set mode "--user"
-	else
-		set mode "--system"
-	end
+        set mode "--user"
+    else
+        set mode "--system"
+    end
     command busctl $mode $argv --no-legend --no-pager 2>/dev/null
 end
 
 function _fish_busctl
     set -l args a-address= s-show-machine u-unique A-acquired ä-activatable \
-    m-match= S-size= l-list q-quiet v-verbose e-expect-reply= Ä-auto-start= \
-    1-allow-interactive-authorization= t-timeout= 2-augment-creds= U-user 3-system \
-    H/host= M/machine= n-no-pager N-no-legend h/help V-version
+        m-match= S-size= l-list q-quiet v-verbose e-expect-reply= Ä-auto-start= \
+        1-allow-interactive-authorization= t-timeout= 2-augment-creds= U-user 3-system \
+        H/host= M/machine= n-no-pager N-no-legend h/help V-version
     set -l cmdline (commandline -opc) (commandline -ct)
     set -e cmdline[1]
     argparse $args -- $cmdline 2>/dev/null
@@ -91,27 +91,29 @@ function _fish_busctl
 end
 
 function __fish_busctl_busnames
-	__fish_busctl list --acquired | string replace -r '\s+.*$' ''
-	# Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`)
-	__fish_busctl list --unique | string replace -r '\s+\S+\s+(\S+)\s+.*$' '\t$1'
+    __fish_busctl list --acquired | string replace -r '\s+.*$' ''
+    # Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`)
+    __fish_busctl list --unique | string replace -r '\s+\S+\s+(\S+)\s+.*$' '\t$1'
 end
 
 function __fish_busctl_objects -a busname
-	__fish_busctl tree --list $busname | string replace -r '\s+.*$' ''
+    __fish_busctl tree --list $busname | string replace -r '\s+.*$' ''
 end
 
 function __fish_busctl_interfaces -a busname -a object
-	__fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' ''
+    __fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' ''
 end
 
 function __fish_busctl_members -a type -a busname -a object -a interface
-	__fish_busctl introspect --list $busname $object $interface \
-	| string match -- "* $type *" | string replace -r '.(\S+) .*' '$1'
+    __fish_busctl introspect --list $busname $object $interface \
+        | string match -- "* $type *" | string replace -r '.(\S+) .*' '$1'
 end
 
 function __fish_busctl_signature -a busname -a object -a interface -a member
-	__fish_busctl introspect --list $busname $object $interface \
-	| string match ".$member *" | while read a b c d; echo $c; end
+    __fish_busctl introspect --list $busname $object $interface \
+        | string match ".$member *" | while read a b c d
+        echo $c
+    end
 end
 
 ### Commands
diff --git a/share/completions/cabal.fish b/share/completions/cabal.fish
index 02eecd5f8..ba3908841 100644
--- a/share/completions/cabal.fish
+++ b/share/completions/cabal.fish
@@ -1,12 +1,12 @@
 function __fish_complete_cabal
-        if type -q -f cabal
-                set cmd (commandline -poc)
-                if test (count $cmd) -gt 1
-                        cabal $cmd[2..-1] --list-options
-                else
-                        cabal --list-options
-                end
+    if type -q -f cabal
+        set cmd (commandline -poc)
+        if test (count $cmd) -gt 1
+            cabal $cmd[2..-1] --list-options
+        else
+            cabal --list-options
         end
+    end
 end
 
 complete -c cabal -a '(__fish_complete_cabal)'
diff --git a/share/completions/caddy.fish b/share/completions/caddy.fish
index 6281a67f5..da185b59b 100644
--- a/share/completions/caddy.fish
+++ b/share/completions/caddy.fish
@@ -1,27 +1,27 @@
 # Caddy is a general-purpose HTTP/2 web server that serves HTTPS by default.
 # https://caddyserver.com
 
-complete -c caddy    -o agree                     -d "Agree to the CA's Subscriber Agreement"
-complete -c caddy -x -o ca                        -d "URL to certificate authority's ACME server directory"
-complete -c caddy -x -o catimeout                 -d "Default ACME CA HTTP timeout"
-complete -c caddy -r -o conf -a stdin             -d "Caddyfile to load"
-complete -c caddy -x -o cpu                       -d "CPU cap"
-complete -c caddy    -o disable-http-challenge    -d "Disable the ACME HTTP challenge"
-complete -c caddy    -o disable-tls-sni-challenge -d "Disable the ACME TLS-SNI challenge"
-complete -c caddy -x -o email                     -d "Default ACME CA account email address"
-complete -c caddy -x -o grace                     -d "Maximum duration of graceful shutdown"
-complete -c caddy -x -o host                      -d "Default host"
-complete -c caddy -x -o http-port                 -d "Default port to use for HTTP"
-complete -c caddy    -o http2                     -d "Use HTTP/2"
-complete -c caddy -x -o https-port                -d "Default port to use for HTTPS"
-complete -c caddy -r -o log                       -d "Process log file"
-complete -c caddy -r -o pidfile                   -d "Path to write pid file"
-complete -c caddy    -o plugins                   -d "List installed plugins"
-complete -c caddy -x -o port                      -d "Default port"
-complete -c caddy    -o quic                      -d "Use experimental QUIC"
-complete -c caddy    -o quiet                     -d "Quiet mode (no initialization output)"
-complete -c caddy -x -o revoke                    -d "Hostname for which to revoke the certificate"
-complete -c caddy -r -o root                      -d "Root path of default site"
-complete -c caddy -x -o type                      -d "Type of server to run"
-complete -c caddy    -o validate                  -d "Parse the Caddyfile but do not start the server"
-complete -c caddy    -o version                   -d "Show version"
+complete -c caddy -o agree -d "Agree to the CA's Subscriber Agreement"
+complete -c caddy -x -o ca -d "URL to certificate authority's ACME server directory"
+complete -c caddy -x -o catimeout -d "Default ACME CA HTTP timeout"
+complete -c caddy -r -o conf -a stdin -d "Caddyfile to load"
+complete -c caddy -x -o cpu -d "CPU cap"
+complete -c caddy -o disable-http-challenge -d "Disable the ACME HTTP challenge"
+complete -c caddy -o disable-tls-sni-challenge -d "Disable the ACME TLS-SNI challenge"
+complete -c caddy -x -o email -d "Default ACME CA account email address"
+complete -c caddy -x -o grace -d "Maximum duration of graceful shutdown"
+complete -c caddy -x -o host -d "Default host"
+complete -c caddy -x -o http-port -d "Default port to use for HTTP"
+complete -c caddy -o http2 -d "Use HTTP/2"
+complete -c caddy -x -o https-port -d "Default port to use for HTTPS"
+complete -c caddy -r -o log -d "Process log file"
+complete -c caddy -r -o pidfile -d "Path to write pid file"
+complete -c caddy -o plugins -d "List installed plugins"
+complete -c caddy -x -o port -d "Default port"
+complete -c caddy -o quic -d "Use experimental QUIC"
+complete -c caddy -o quiet -d "Quiet mode (no initialization output)"
+complete -c caddy -x -o revoke -d "Hostname for which to revoke the certificate"
+complete -c caddy -r -o root -d "Root path of default site"
+complete -c caddy -x -o type -d "Type of server to run"
+complete -c caddy -o validate -d "Parse the Caddyfile but do not start the server"
+complete -c caddy -o version -d "Show version"
diff --git a/share/completions/canto.fish b/share/completions/canto.fish
index 7c487fb75..23f01f78f 100644
--- a/share/completions/canto.fish
+++ b/share/completions/canto.fish
@@ -1,17 +1,17 @@
 
 function __fish_canto_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
+        if [ count $argv -gt 2 ]
+            if [ $argv[2] = $cmd[2] ]
+                return 0
+            end
+        end
     end
-    if [ count $argv -gt 2 ]
-      if [ $argv[2] = $cmd[2] ]
-        return 0
-      end
-    end
-  end
-  return 1
+    return 1
 end
 
 
diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index fbea632be..fa224265d 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -13,43 +13,43 @@ complete -c cargo -f -c cargo -n '__fish_use_subcommand' -a '$__fish_cargo_subco
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a '$__fish_cargo_subcommands'
 
 for x in bench build clean doc fetch generate-lockfile \
-		locate-project package pkgid publish \
-		read-manifest run rustc test update \
-		verify-project;
-	complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l manifest-path -d 'path to the manifest to compile'
+    locate-project package pkgid publish \
+    read-manifest run rustc test update \
+    verify-project
+    complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l manifest-path -d 'path to the manifest to compile'
 end
 
-for x in bench build clean doc rustc test update;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s p -l spec -d 'Package to build'
+for x in bench build clean doc rustc test update
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s p -l spec -d 'Package to build'
 end
 
-for x in bench build clean doc run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l target -d 'Build for the target triple'
+for x in bench build clean doc run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l target -d 'Build for the target triple'
 end
 
-for x in bench build rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -d 'Only the specified benchmark'
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -d 'Only the specified test'
+for x in bench build rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -d 'Only the specified benchmark'
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -d 'Only the specified test'
 end
 
-for x in bench build run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -d 'Only the specified example'
+for x in bench build run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -d 'Only the specified example'
 end
 
-for x in build run rustc test;
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l release -d 'Build artifacts in release mode, with optimizations'
+for x in build run rustc test
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l release -d 'Build artifacts in release mode, with optimizations'
 end
 
-for x in bench test;
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-run -d 'Compile but do not run'
+for x in bench test
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-run -d 'Compile but do not run'
 end
 
-for x in bench build doc run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s j -l jobs -d  'Number of jobs to run in parallel'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l features -d 'Space-separated list of features to also build'
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-default-features -d 'Do not build the `default` feature'
+for x in bench build doc run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s j -l jobs -d 'Number of jobs to run in parallel'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l features -d 'Space-separated list of features to also build'
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-default-features -d 'Do not build the `default` feature'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from doc' -l no-deps -d 'Don\'t build documentation for dependencies'
@@ -63,21 +63,21 @@ complete -c cargo -n '__fish_seen_subcommand_from new' -l bin
 complete -c cargo -x -n '__fish_seen_subcommand_from git-checkout' -l url
 complete -c cargo -x -n '__fish_seen_subcommand_from git-checkout' -l reference
 
-for x in login publish search;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l host -d 'The host to submit the request to'
+for x in login publish search
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l host -d 'The host to submit the request to'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from doc' -l open -d 'Opens the docs in a browser after the operation'
 
 complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s a -l add -d 'Login of a user to add as an owner'
-complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s r -l remove  -d 'Login of a user to remove as an owner'
+complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s r -l remove -d 'Login of a user to remove as an owner'
 
-for x in owner yank;
-	complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l index -d 'Registry index to use'
+for x in owner yank
+    complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l index -d 'Registry index to use'
 end
 
-for x in owner publish yank;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l token -d 'API token to use when authenticating'
+for x in owner publish yank
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l token -d 'API token to use when authenticating'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from package' -l no-verify -d 'Don\'t verify the contents by building them'
diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index 8e9bf016d..b7cc526c5 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -1,21 +1,21 @@
-if cat --version 2>/dev/null > /dev/null # GNU
-	complete -c cat -s A -l show-all -d "Escape all unprintables"
-	complete -c cat -s b -l number-nonblank -d "Number non-blank lines"
-	complete -c cat -s e -d "Escape unprintables except \\t"
-	complete -c cat -s E -l show-ends -d "Display \$ at line end"
-	complete -c cat -s n -l number -d "Enumerate lines"
-	complete -c cat -s s -l squeeze-blank -d "Never >1 blank line"
-	complete -c cat -s t -d "Escape unprintables except \\n"
-	complete -c cat -s T -l show-tabs -d "Escape tab"
-	complete -c cat -s v -d "Escape unprintables except '\\n' and \\t"
-	complete -c cat -l help -d "Display help and exit"
-	complete -c cat -l version -d "Display version and exit"
+if cat --version 2>/dev/null >/dev/null # GNU
+    complete -c cat -s A -l show-all -d "Escape all unprintables"
+    complete -c cat -s b -l number-nonblank -d "Number non-blank lines"
+    complete -c cat -s e -d "Escape unprintables except \\t"
+    complete -c cat -s E -l show-ends -d "Display \$ at line end"
+    complete -c cat -s n -l number -d "Enumerate lines"
+    complete -c cat -s s -l squeeze-blank -d "Never >1 blank line"
+    complete -c cat -s t -d "Escape unprintables except \\n"
+    complete -c cat -s T -l show-tabs -d "Escape tab"
+    complete -c cat -s v -d "Escape unprintables except '\\n' and \\t"
+    complete -c cat -l help -d "Display help and exit"
+    complete -c cat -l version -d "Display version and exit"
 else # OS X
-	complete -c cat -s b -d "Specify # of non-blank lines"
-	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 u -d "Disable output buffering"
-	complete -c cat -s v -d "Escape non-printing chars"
+    complete -c cat -s b -d "Specify # of non-blank lines"
+    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 u -d "Disable output buffering"
+    complete -c cat -s v -d "Escape non-printing chars"
 end
\ No newline at end of file
diff --git a/share/completions/cf.fish b/share/completions/cf.fish
index ac1a7080c..5b1bebb23 100644
--- a/share/completions/cf.fish
+++ b/share/completions/cf.fish
@@ -1,208 +1,208 @@
 set -l subcommands help version login logout passwd target api auth apps app \
-  push scale delete rename start stop restart restage restart-app-instance \
-  run-task tasks terminate-task events files logs env set-env unset-env stacks \
-  stack copy-source create-app-manifest get-health-check set-health-check \
-  enable-ssh disable-ssh ssh-enabled ssh marketplace services service \
-  create-service update-service delete-service rename-service \
-  create-service-key service-keys service-key delete-service-key bind-service \
-  unbind-service bind-route-service unbind-route-service \
-  create-user-provided-service update-user-provided-service orgs org \
-  create-org delete-org rename-org spaces space create-space delete-space \
-  rename-space allow-space-ssh disallow-space-ssh space-ssh-allowed domains \
-  create-domain delete-domain create-shared-domain delete-shared-domain \
-  router-groups routes create-route check-route map-route unmap-route \
-  delete-route delete-orphaned-routes network-policies add-network-policy \
-  remove-network-policy buildpacks create-buildpack update-buildpack \
-  rename-buildpack delete-buildpack create-user delete-user org-users \
-  set-org-role unset-org-role space-users set-space-role unset-space-role \
-  quotas quota set-quota create-quota delete-quota update-quota \
-  share-private-domain unshare-private-domain space-quotas space-quota \
-  create-space-quota update-space-quota delete-space-quota set-space-quota \
-  unset-space-quota service-auth-tokens create-service-auth-token \
-  update-service-auth-token delete-service-auth-token service-brokers \
-  create-service-broker update-service-broker delete-service-broker \
-  rename-service-broker migrate-service-instances purge-service-offering \
-  purge-service-instance service-access enable-service-access \
-  disable-service-access security-group security-groups create-security-group \
-  update-security-group delete-security-group bind-security-group \
-  unbind-security-group bind-staging-security-group staging-security-groups \
-  unbind-staging-security-group bind-running-security-group \
-  running-security-groups unbind-running-security-group \
-  running-environment-variable-group staging-environment-variable-group \
-  set-staging-environment-variable-group set-running-environment-variable-group \
-  isolation-segments create-isolation-segment delete-isolation-segment \
-  enable-org-isolation disable-org-isolation set-org-default-isolation-segment \
-  reset-org-default-isolation-segment set-space-isolation-segment \
-  reset-space-isolation-segment feature-flags feature-flag enable-feature-flag \
-  disable-feature-flag curl config oauth-token ssh-code add-plugin-repo \
-  remove-plugin-repo list-plugin-repos repo-plugins plugins install-plugin \
-  uninstall-plugin
+    push scale delete rename start stop restart restage restart-app-instance \
+    run-task tasks terminate-task events files logs env set-env unset-env stacks \
+    stack copy-source create-app-manifest get-health-check set-health-check \
+    enable-ssh disable-ssh ssh-enabled ssh marketplace services service \
+    create-service update-service delete-service rename-service \
+    create-service-key service-keys service-key delete-service-key bind-service \
+    unbind-service bind-route-service unbind-route-service \
+    create-user-provided-service update-user-provided-service orgs org \
+    create-org delete-org rename-org spaces space create-space delete-space \
+    rename-space allow-space-ssh disallow-space-ssh space-ssh-allowed domains \
+    create-domain delete-domain create-shared-domain delete-shared-domain \
+    router-groups routes create-route check-route map-route unmap-route \
+    delete-route delete-orphaned-routes network-policies add-network-policy \
+    remove-network-policy buildpacks create-buildpack update-buildpack \
+    rename-buildpack delete-buildpack create-user delete-user org-users \
+    set-org-role unset-org-role space-users set-space-role unset-space-role \
+    quotas quota set-quota create-quota delete-quota update-quota \
+    share-private-domain unshare-private-domain space-quotas space-quota \
+    create-space-quota update-space-quota delete-space-quota set-space-quota \
+    unset-space-quota service-auth-tokens create-service-auth-token \
+    update-service-auth-token delete-service-auth-token service-brokers \
+    create-service-broker update-service-broker delete-service-broker \
+    rename-service-broker migrate-service-instances purge-service-offering \
+    purge-service-instance service-access enable-service-access \
+    disable-service-access security-group security-groups create-security-group \
+    update-security-group delete-security-group bind-security-group \
+    unbind-security-group bind-staging-security-group staging-security-groups \
+    unbind-staging-security-group bind-running-security-group \
+    running-security-groups unbind-running-security-group \
+    running-environment-variable-group staging-environment-variable-group \
+    set-staging-environment-variable-group set-running-environment-variable-group \
+    isolation-segments create-isolation-segment delete-isolation-segment \
+    enable-org-isolation disable-org-isolation set-org-default-isolation-segment \
+    reset-org-default-isolation-segment set-space-isolation-segment \
+    reset-space-isolation-segment feature-flags feature-flag enable-feature-flag \
+    disable-feature-flag curl config oauth-token ssh-code add-plugin-repo \
+    remove-plugin-repo list-plugin-repos repo-plugins plugins install-plugin \
+    uninstall-plugin
 
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'help'                                   --description "Show help"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'version'                                --description "Print the version"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'login'                                  --description "Log user in"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logout'                                 --description "Log user out"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'passwd'                                 --description "Change user password"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'target'                                 --description "Set or view the targeted org or space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'api'                                    --description "Set or view target api url"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'auth'                                   --description "Authenticate user non-interactively"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'apps'                                   --description "List all apps in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'app'                                    --description "Display health and status for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'push'                                   --description "Push a new app or sync changes to an existing app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'scale'                                  --description "Change or view the instance count, disk space limit, and memory limit for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete'                                 --description "Delete an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename'                                 --description "Rename an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'start'                                  --description "Start an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stop'                                   --description "Stop an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart'                                --description "Stop all instances of the app, then start them again. This causes downtime."
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restage'                                --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart-app-instance'                   --description "Terminate, then restart an app instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'run-task'                               --description "Run a one-off task on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'tasks'                                  --description "List tasks of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'terminate-task'                         --description "Terminate a running task of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'events'                                 --description "Show recent app events"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'files'                                  --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logs'                                   --description "Tail or show recent logs for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'env'                                    --description "Show all env variables for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-env'                                --description "Set an env variable for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-env'                              --description "Remove an env variable"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stacks'                                 --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stack'                                  --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'copy-source'                            --description "Copies the source code of an application to another existing application (and restarts that application)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-app-manifest'                    --description "Create an app manifest for an app that has been pushed successfully"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'get-health-check'                       --description "Show the type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-health-check'                       --description "Change type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-ssh'                             --description "Enable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-ssh'                            --description "Disable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-enabled'                            --description "Reports whether SSH is enabled on an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh'                                    --description "SSH to an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'marketplace'                            --description "List available offerings in the marketplace"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'services'                               --description "List all service instances in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service'                                --description "Show service instance info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service'                         --description "Create a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service'                         --description "Update a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service'                         --description "Delete a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service'                         --description "Rename a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-key'                     --description "Create key for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-keys'                           --description "List keys for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-key'                            --description "Show service key info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-key'                     --description "Delete a service key"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-service'                           --description "Bind a service instance to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-service'                         --description "Unbind a service instance from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-route-service'                     --description "Bind a service instance to an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-route-service'                   --description "Unbind a service instance from an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user-provided-service'           --description "Make a user-provided service instance available to CF apps"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-user-provided-service'           --description "Update user-provided service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'orgs'                                   --description "List all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org'                                    --description "Show org info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-org'                             --description "Create an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-org'                             --description "Delete an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-org'                             --description "Rename an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'spaces'                                 --description "List all spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space'                                  --description "Show space info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space'                           --description "Create a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space'                           --description "Delete a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-space'                           --description "Rename a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'allow-space-ssh'                        --description "Allow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disallow-space-ssh'                     --description "Disallow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-ssh-allowed'                      --description "Reports whether SSH is allowed in a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'domains'                                --description "List domains in the target org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-domain'                          --description "Create a domain in an org for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-domain'                          --description "Delete a domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-shared-domain'                   --description "Create a domain that can be used by all orgs (admin-only)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-shared-domain'                   --description "Delete a shared domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'router-groups'                          --description "List router groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'routes'                                 --description "List all routes in the current space or the current organization"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-route'                           --description "Create a url route in a space for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'check-route'                            --description "Perform a simple check to determine whether a route currently exists or not"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'map-route'                              --description "Add a url route to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unmap-route'                            --description "Remove a url route from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-route'                           --description "Delete a route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-orphaned-routes'                 --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'network-policies'                       --description "List direct network traffic policies"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-network-policy'                     --description "Create policy to allow direct network traffic from one app to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-network-policy'                  --description "Remove network traffic policy of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'buildpacks'                             --description "List all buildpacks"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-buildpack'                       --description "Create a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-buildpack'                       --description "Update a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-buildpack'                       --description "Rename a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-buildpack'                       --description "Delete a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user'                            --description "Create a new user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-user'                            --description "Delete a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org-users'                              --description "Show org users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-role'                           --description "Assign an org role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-org-role'                         --description "Remove an org role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-users'                            --description "Show space users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-role'                         --description "Assign a space role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-role'                       --description "Remove a space role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quotas'                                 --description "List available usage quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quota'                                  --description "Show quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-quota'                              --description "Assign a quota to an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-quota'                           --description "Define a new resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-quota'                           --description "Delete a quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-quota'                           --description "Update an existing resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'share-private-domain'                   --description "Share a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unshare-private-domain'                 --description "Unshare a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quotas'                           --description "List available space resource quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quota'                            --description "Show space quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space-quota'                     --description "Define a new space resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-space-quota'                     --description "Update an existing space quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space-quota'                     --description "Delete a space quota definition and unassign the space quota from all spaces"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-quota'                        --description "Assign a space quota definition to a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-quota'                      --description "Unassign a quota from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-auth-tokens'                    --description "List service auth tokens"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-auth-token'              --description "Create a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-auth-token'              --description "Update a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-auth-token'              --description "Delete a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-brokers'                        --description "List service brokers"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-broker'                  --description "Create a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-broker'                  --description "Update a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-broker'                  --description "Delete a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service-broker'                  --description "Rename a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'migrate-service-instances'              --description "Migrate service instances from one service plan to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-offering'                 --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-instance'                 --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-access'                         --description "List service access settings"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-service-access'                  --description "Enable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-service-access'                 --description "Disable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-group'                         --description "Show a single security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-groups'                        --description "List all security groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-security-group'                  --description "Create a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-security-group'                  --description "Update a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-security-group'                  --description "Deletes a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-security-group'                    --description "Bind a security group to a particular space, or all existing spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-security-group'                  --description "Unbind a security group from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-staging-security-group'            --description "Bind a security group to the list of security groups to be used for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-security-groups'                --description "List security groups in the staging set for applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-staging-security-group'          --description "Unbind a security group from the set of security groups for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-running-security-group'            --description "Bind a security group to the list of security groups to be used for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-security-groups'                --description "List security groups in the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-running-security-group'          --description "Unbind a security group from the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-environment-variable-group'     --description "Retrieve the contents of the running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-environment-variable-group'     --description "Retrieve the contents of the staging environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'help' --description "Show help"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'version' --description "Print the version"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'login' --description "Log user in"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logout' --description "Log user out"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'passwd' --description "Change user password"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'target' --description "Set or view the targeted org or space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'api' --description "Set or view target api url"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'auth' --description "Authenticate user non-interactively"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'apps' --description "List all apps in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'app' --description "Display health and status for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'push' --description "Push a new app or sync changes to an existing app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'scale' --description "Change or view the instance count, disk space limit, and memory limit for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete' --description "Delete an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename' --description "Rename an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'start' --description "Start an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stop' --description "Stop an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart' --description "Stop all instances of the app, then start them again. This causes downtime."
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restage' --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart-app-instance' --description "Terminate, then restart an app instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'run-task' --description "Run a one-off task on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'tasks' --description "List tasks of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'terminate-task' --description "Terminate a running task of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'events' --description "Show recent app events"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'files' --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logs' --description "Tail or show recent logs for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'env' --description "Show all env variables for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-env' --description "Set an env variable for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-env' --description "Remove an env variable"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stacks' --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stack' --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'copy-source' --description "Copies the source code of an application to another existing application (and restarts that application)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-app-manifest' --description "Create an app manifest for an app that has been pushed successfully"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'get-health-check' --description "Show the type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-health-check' --description "Change type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-ssh' --description "Enable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-ssh' --description "Disable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-enabled' --description "Reports whether SSH is enabled on an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh' --description "SSH to an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'marketplace' --description "List available offerings in the marketplace"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'services' --description "List all service instances in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service' --description "Show service instance info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service' --description "Create a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service' --description "Update a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service' --description "Delete a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service' --description "Rename a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-key' --description "Create key for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-keys' --description "List keys for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-key' --description "Show service key info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-key' --description "Delete a service key"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-service' --description "Bind a service instance to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-service' --description "Unbind a service instance from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-route-service' --description "Bind a service instance to an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-route-service' --description "Unbind a service instance from an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user-provided-service' --description "Make a user-provided service instance available to CF apps"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-user-provided-service' --description "Update user-provided service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'orgs' --description "List all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org' --description "Show org info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-org' --description "Create an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-org' --description "Delete an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-org' --description "Rename an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'spaces' --description "List all spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space' --description "Show space info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space' --description "Create a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space' --description "Delete a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-space' --description "Rename a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'allow-space-ssh' --description "Allow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disallow-space-ssh' --description "Disallow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-ssh-allowed' --description "Reports whether SSH is allowed in a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'domains' --description "List domains in the target org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-domain' --description "Create a domain in an org for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-domain' --description "Delete a domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-shared-domain' --description "Create a domain that can be used by all orgs (admin-only)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-shared-domain' --description "Delete a shared domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'router-groups' --description "List router groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'routes' --description "List all routes in the current space or the current organization"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-route' --description "Create a url route in a space for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'check-route' --description "Perform a simple check to determine whether a route currently exists or not"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'map-route' --description "Add a url route to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unmap-route' --description "Remove a url route from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-route' --description "Delete a route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-orphaned-routes' --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'network-policies' --description "List direct network traffic policies"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-network-policy' --description "Create policy to allow direct network traffic from one app to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-network-policy' --description "Remove network traffic policy of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'buildpacks' --description "List all buildpacks"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-buildpack' --description "Create a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-buildpack' --description "Update a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-buildpack' --description "Rename a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-buildpack' --description "Delete a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user' --description "Create a new user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-user' --description "Delete a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org-users' --description "Show org users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-role' --description "Assign an org role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-org-role' --description "Remove an org role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-users' --description "Show space users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-role' --description "Assign a space role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-role' --description "Remove a space role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quotas' --description "List available usage quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quota' --description "Show quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-quota' --description "Assign a quota to an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-quota' --description "Define a new resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-quota' --description "Delete a quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-quota' --description "Update an existing resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'share-private-domain' --description "Share a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unshare-private-domain' --description "Unshare a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quotas' --description "List available space resource quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quota' --description "Show space quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space-quota' --description "Define a new space resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-space-quota' --description "Update an existing space quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space-quota' --description "Delete a space quota definition and unassign the space quota from all spaces"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-quota' --description "Assign a space quota definition to a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-quota' --description "Unassign a quota from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-auth-tokens' --description "List service auth tokens"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-auth-token' --description "Create a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-auth-token' --description "Update a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-auth-token' --description "Delete a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-brokers' --description "List service brokers"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-broker' --description "Create a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-broker' --description "Update a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-broker' --description "Delete a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service-broker' --description "Rename a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'migrate-service-instances' --description "Migrate service instances from one service plan to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-offering' --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-instance' --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-access' --description "List service access settings"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-service-access' --description "Enable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-service-access' --description "Disable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-group' --description "Show a single security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-groups' --description "List all security groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-security-group' --description "Create a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-security-group' --description "Update a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-security-group' --description "Deletes a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-security-group' --description "Bind a security group to a particular space, or all existing spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-security-group' --description "Unbind a security group from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-staging-security-group' --description "Bind a security group to the list of security groups to be used for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-security-groups' --description "List security groups in the staging set for applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-staging-security-group' --description "Unbind a security group from the set of security groups for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-running-security-group' --description "Bind a security group to the list of security groups to be used for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-security-groups' --description "List security groups in the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-running-security-group' --description "Unbind a security group from the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-environment-variable-group' --description "Retrieve the contents of the running environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-environment-variable-group' --description "Retrieve the contents of the staging environment variable group"
 complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-staging-environment-variable-group' --description "Pass parameters as JSON to create a staging environment variable group"
 complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-running-environment-variable-group' --description "Pass parameters as JSON to create a running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'isolation-segments'                     --description "List all isolation segments"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-isolation-segment'               --description "Create an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-isolation-segment'               --description "Delete an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-org-isolation'                   --description "Entitle an organization to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-org-isolation'                  --description "Revoke an organization's entitlement to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-default-isolation-segment'      --description "Set the default isolation segment used for apps in spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-org-default-isolation-segment'    --description "Reset the default isolation segment used for apps in spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-isolation-segment'            --description "Assign the isolation segment for a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-space-isolation-segment'          --description "Reset the space's isolation segment to the org default"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flags'                          --description "Retrieve list of feature flags with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flag'                           --description "Retrieve an individual feature flag with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-feature-flag'                    --description "Allow use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-feature-flag'                   --description "Prevent use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'curl'                                   --description "Executes a request to the targeted API endpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'config'                                 --description "Write default values to the config"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'oauth-token'                            --description "Retrieve and display the OAuth token for the current session"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-code'                               --description "Get a one time password for ssh clients"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-plugin-repo'                        --description "Add a new plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-plugin-repo'                     --description "Remove a plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'list-plugin-repos'                      --description "List all the added plugin repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'repo-plugins'                           --description "List all available plugins in specified repository or in all added repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'plugins'                                --description "List commands of installed plugins"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'install-plugin'                         --description "Install CLI plugin"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'uninstall-plugin'                       --description "Uninstall CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'isolation-segments' --description "List all isolation segments"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-isolation-segment' --description "Create an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-isolation-segment' --description "Delete an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-org-isolation' --description "Entitle an organization to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-org-isolation' --description "Revoke an organization's entitlement to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-default-isolation-segment' --description "Set the default isolation segment used for apps in spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-org-default-isolation-segment' --description "Reset the default isolation segment used for apps in spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-isolation-segment' --description "Assign the isolation segment for a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-space-isolation-segment' --description "Reset the space's isolation segment to the org default"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flags' --description "Retrieve list of feature flags with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flag' --description "Retrieve an individual feature flag with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-feature-flag' --description "Allow use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-feature-flag' --description "Prevent use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'curl' --description "Executes a request to the targeted API endpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'config' --description "Write default values to the config"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'oauth-token' --description "Retrieve and display the OAuth token for the current session"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-code' --description "Get a one time password for ssh clients"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-plugin-repo' --description "Add a new plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-plugin-repo' --description "Remove a plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'list-plugin-repos' --description "List all the added plugin repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'repo-plugins' --description "List all available plugins in specified repository or in all added repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'plugins' --description "List commands of installed plugins"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'install-plugin' --description "Install CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'uninstall-plugin' --description "Uninstall CLI plugin"
diff --git a/share/completions/clang++.fish b/share/completions/clang++.fish
index 7b7087c3a..783ddf7a1 100644
--- a/share/completions/clang++.fish
+++ b/share/completions/clang++.fish
@@ -4,4 +4,4 @@
 
 complete -p '*clang++*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -p '*clang++*' -n 'not __fish_should_complete_switches' \
-	-xa '(__fish_complete_suffix \'{.o,.out,.c,.cpp,.so,.dylib}\')'
+    -xa '(__fish_complete_suffix \'{.o,.out,.c,.cpp,.so,.dylib}\')'
diff --git a/share/completions/clang.fish b/share/completions/clang.fish
index b7879550e..020454f3a 100644
--- a/share/completions/clang.fish
+++ b/share/completions/clang.fish
@@ -5,7 +5,7 @@
 # This pattern unfortunately matches clang-format, etc. as well.
 complete -p '*clang*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -c 'clang' -n 'not __fish_should_complete_switches' \
-	-xa "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -xa "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
 # again but without the -x this time for the pattern-matched completion
 complete -p '*clang*' -n 'not __fish_should_complete_switches' \
-	-a "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -a "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
diff --git a/share/completions/commandline.fish b/share/completions/commandline.fish
index f60f9b774..1a7e7953e 100644
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -4,8 +4,8 @@ complete -c commandline -s a -l append -d "Add text to the end of the selected a
 complete -c commandline -s i -l insert -d "Add text at cursor"
 complete -c commandline -s r -l replace -d "Replace selected part"
 
-complete -c commandline -s j -l current-job  -d "Select job under cursor"
-complete -c commandline -s p -l current-process  -d "Select process under cursor"
+complete -c commandline -s j -l current-job -d "Select job under cursor"
+complete -c commandline -s p -l current-process -d "Select process under cursor"
 complete -c commandline -s t -l current-token -d "Select token under cursor"
 complete -c commandline -s b -l current-buffer -d "Select entire command line (default)"
 
diff --git a/share/completions/compare.fish b/share/completions/compare.fish
index 117691143..4b87f43bd 100644
--- a/share/completions/compare.fish
+++ b/share/completions/compare.fish
@@ -1,45 +1,45 @@
-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 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)'
-complete -c compare -o compose                     -d 'Set image composite operator [operator]'
-complete -c compare -o compress                    -d 'Type of pixel compression when writing the image [type]' -xa '(compare -list compress)'
-complete -c compare -o decipher                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c compare -o define                      -d 'Define one or more image format options [format:option]'
-complete -c compare -o density                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c compare -o depth                       -d 'Image depth [value]'
-complete -c compare -o dissimilarity-threshold     -d 'Maximum distortion for (sub)image match [value]'
-complete -c compare -o encipher                    -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c compare -o extract                     -d 'Extract area from image [geometry]'
-complete -c compare -o format                      -d 'Output formatted image characteristics ["string"]'
-complete -c compare -o fuzz                        -d 'Colors within this distance are considered equal [distance]'
-complete -c compare -o highlight-color             -d 'Emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c compare -o identify                    -d 'Identify the format and characteristics of the image'
-complete -c compare -o interlace                   -d 'Type of image interlacing scheme [type]' -xa '(compare -list interlace)'
-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 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]'
-complete -c compare -o quiet                       -d 'Suppress all warning messages'
-complete -c compare -o quantize                    -d 'Reduce colors in this colorspace [colorspace]' -xa '(compare -list colorspace)'
-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 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)'
-complete -c compare -o type                        -d 'Image type [type]' -xa '(compare -list type)'
-complete -c compare -o verbose                     -d 'Print detailed information about the image'
-complete -c compare -o version                     -d 'Print version information'
-complete -c compare -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(compare -list virtual-pixel)'
-complete -c compare -o debug                       -d 'Display copious debugging information [events]' -xa '(compare -list debug)'
-complete -c compare -o help                        -d 'Print program options'
-complete -c compare -o list                        -d 'Print a list of supported option arguments [type]' -xa '(compare -list list)'
-complete -c compare -o log                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c compare -o synchronize                 -d 'Synchronize image to storage device'
-complete -c compare -o taint                       -d 'Declare the image as modified'
+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 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)'
+complete -c compare -o compose -d 'Set image composite operator [operator]'
+complete -c compare -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(compare -list compress)'
+complete -c compare -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c compare -o define -d 'Define one or more image format options [format:option]'
+complete -c compare -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c compare -o depth -d 'Image depth [value]'
+complete -c compare -o dissimilarity-threshold -d 'Maximum distortion for (sub)image match [value]'
+complete -c compare -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c compare -o extract -d 'Extract area from image [geometry]'
+complete -c compare -o format -d 'Output formatted image characteristics ["string"]'
+complete -c compare -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c compare -o highlight-color -d 'Emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c compare -o identify -d 'Identify the format and characteristics of the image'
+complete -c compare -o interlace -d 'Type of image interlacing scheme [type]' -xa '(compare -list interlace)'
+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 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]'
+complete -c compare -o quiet -d 'Suppress all warning messages'
+complete -c compare -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(compare -list colorspace)'
+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 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)'
+complete -c compare -o type -d 'Image type [type]' -xa '(compare -list type)'
+complete -c compare -o verbose -d 'Print detailed information about the image'
+complete -c compare -o version -d 'Print version information'
+complete -c compare -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(compare -list virtual-pixel)'
+complete -c compare -o debug -d 'Display copious debugging information [events]' -xa '(compare -list debug)'
+complete -c compare -o help -d 'Print program options'
+complete -c compare -o list -d 'Print a list of supported option arguments [type]' -xa '(compare -list list)'
+complete -c compare -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c compare -o synchronize -d 'Synchronize image to storage device'
+complete -c compare -o taint -d 'Declare the image as modified'
diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 4ae7cb064..93e420040 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -1,23 +1,23 @@
 function __fish_composer_needs_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_composer_using_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
 
-  return 1
+    return 1
 end
 
 function __fish_composer_required_packages
diff --git a/share/completions/composite.fish b/share/completions/composite.fish
index 28de77397..ce972cbae 100644
--- a/share/completions/composite.fish
+++ b/share/completions/composite.fish
@@ -1,85 +1,85 @@
-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 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)'
-complete -c composite -o colorspace                 -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
-complete -c composite -o comment                    -d 'Annotate image with comment [string]'
-complete -c composite -o compose                    -d 'Composite operator [operator]'
-complete -c composite -o compress                   -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
-complete -c composite -o define                     -d 'Define one or more image format options [format:option]'
-complete -c composite -o depth                      -d 'Image depth [value]'
-complete -c composite -o density                    -d 'Horizontal and vertical density of the image [geometry]'
-complete -c composite -o display                    -d 'Get image or font from this X server [server]'
-complete -c composite -o dispose                    -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
-complete -c composite -o dither                     -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
-complete -c composite -o encoding                   -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c composite -o endian                     -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
-complete -c composite -o filter                     -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
-complete -c composite -o font                       -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c composite -o format                     -d 'Output formatted image characteristics ["string"]'
-complete -c composite -o gravity                    -d 'Which direction to gravitate towards [type]' -xa '(convert -list gravity)'
-complete -c composite -o green-primary              -d 'Chromaticity green primary point [point]'
-complete -c composite -o interlace                  -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
-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 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]'
-complete -c composite -o quiet                      -d 'Suppress all warning messages'
-complete -c composite -o red-primary                -d 'Chromaticity red primary point [point]'
-complete -c composite -o regard-warnings            -d 'Pay attention to warning messages'
-complete -c composite -o respect-parentheses        -d 'Settings remain in effect until parenthesis boundary'
-complete -c composite -o sampling-factor            -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c composite -o scene                      -d 'Image scene number [value]'
-complete -c composite -o seed                       -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c composite -o size                       -d 'Width and height of image [geometry]'
-complete -c composite -o synchronize                -d 'Synchronize image to storage device'
-complete -c composite -o taint                      -d 'Declare the image as modified'
-complete -c composite -o transparent-color          -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c composite -o treedepth                  -d 'Color tree depth [value]'
-complete -c composite -o tile                       -d 'Repeat composite operation across and down image'
-complete -c composite -o units                      -d 'The units of image resolution [type]' -xa '(convert -list units)'
-complete -c composite -o verbose                    -d 'Print detailed information about the image'
-complete -c composite -o virtual-pixel              -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
-complete -c composite -o white-point                -d 'Chromaticity white point [point]'
-complete -c composite -o blend                      -d 'Blend images [geometry]'
-complete -c composite -o border                     -d 'Surround image with a border of color [geometry]'
-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 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 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]'
-complete -c composite -o identify                   -d 'Identify the format and characteristics of the image'
-complete -c composite -o monochrome                 -d 'Transform image to black and white'
-complete -c composite -o negate                     -d 'Replace every pixel with its complementary color '
-complete -c composite -o profile                    -d 'Add ICM or IPTC information profile to image [filename]' -r
-complete -c composite -o quantize                   -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
-complete -c composite -o repage                     -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c composite -o rotate                     -d 'Apply Paeth rotation to the image [degrees]'
-complete -c composite -o resize                     -d 'Resize the image [geometry]'
-complete -c composite -o sharpen                    -d 'Sharpen the image [geometry]'
-complete -c composite -o shave                      -d 'Shave pixels from the image edges [geometry]'
-complete -c composite -o stegano                    -d 'Offset hide watermark within an image'
-complete -c composite -o stereo                     -d 'Combine two image to create a stereo anaglyph [geometry]'
-complete -c composite -o strip                      -d 'Strip image of all profiles and comments'
-complete -c composite -o thumbnail                  -d 'Create a thumbnail of the image [geometry]'
-complete -c composite -o transform                  -d 'Affine transform image'
-complete -c composite -o type                       -d 'Image type [type]' -xa '(convert -list type)'
-complete -c composite -o unsharp                    -d 'Sharpen the image [geometry]'
-complete -c composite -o watermark                  -d 'Percent brightness and saturation of a watermark [geometry]'
-complete -c composite -o write                      -d 'Write images to this file [filename]' -r
-complete -c composite -o swap                       -d 'Swap two images in the image sequence [indexes]'
-complete -c composite -o debug                      -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c composite -o help                       -d 'Print program options'
-complete -c composite -o list                       -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
-complete -c composite -o log                        -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c composite -o version                    -d 'Print version information'
-complete -c composite -o matte                      -d 'Store matte channel if the image has one'
-complete -c composite -o support                    -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+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 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)'
+complete -c composite -o colorspace -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
+complete -c composite -o comment -d 'Annotate image with comment [string]'
+complete -c composite -o compose -d 'Composite operator [operator]'
+complete -c composite -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
+complete -c composite -o define -d 'Define one or more image format options [format:option]'
+complete -c composite -o depth -d 'Image depth [value]'
+complete -c composite -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c composite -o display -d 'Get image or font from this X server [server]'
+complete -c composite -o dispose -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
+complete -c composite -o dither -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
+complete -c composite -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c composite -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
+complete -c composite -o filter -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
+complete -c composite -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c composite -o format -d 'Output formatted image characteristics ["string"]'
+complete -c composite -o gravity -d 'Which direction to gravitate towards [type]' -xa '(convert -list gravity)'
+complete -c composite -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c composite -o interlace -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
+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 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]'
+complete -c composite -o quiet -d 'Suppress all warning messages'
+complete -c composite -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c composite -o regard-warnings -d 'Pay attention to warning messages'
+complete -c composite -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c composite -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c composite -o scene -d 'Image scene number [value]'
+complete -c composite -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c composite -o size -d 'Width and height of image [geometry]'
+complete -c composite -o synchronize -d 'Synchronize image to storage device'
+complete -c composite -o taint -d 'Declare the image as modified'
+complete -c composite -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c composite -o treedepth -d 'Color tree depth [value]'
+complete -c composite -o tile -d 'Repeat composite operation across and down image'
+complete -c composite -o units -d 'The units of image resolution [type]' -xa '(convert -list units)'
+complete -c composite -o verbose -d 'Print detailed information about the image'
+complete -c composite -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
+complete -c composite -o white-point -d 'Chromaticity white point [point]'
+complete -c composite -o blend -d 'Blend images [geometry]'
+complete -c composite -o border -d 'Surround image with a border of color [geometry]'
+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 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 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]'
+complete -c composite -o identify -d 'Identify the format and characteristics of the image'
+complete -c composite -o monochrome -d 'Transform image to black and white'
+complete -c composite -o negate -d 'Replace every pixel with its complementary color '
+complete -c composite -o profile -d 'Add ICM or IPTC information profile to image [filename]' -r
+complete -c composite -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
+complete -c composite -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c composite -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c composite -o resize -d 'Resize the image [geometry]'
+complete -c composite -o sharpen -d 'Sharpen the image [geometry]'
+complete -c composite -o shave -d 'Shave pixels from the image edges [geometry]'
+complete -c composite -o stegano -d 'Offset hide watermark within an image'
+complete -c composite -o stereo -d 'Combine two image to create a stereo anaglyph [geometry]'
+complete -c composite -o strip -d 'Strip image of all profiles and comments'
+complete -c composite -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c composite -o transform -d 'Affine transform image'
+complete -c composite -o type -d 'Image type [type]' -xa '(convert -list type)'
+complete -c composite -o unsharp -d 'Sharpen the image [geometry]'
+complete -c composite -o watermark -d 'Percent brightness and saturation of a watermark [geometry]'
+complete -c composite -o write -d 'Write images to this file [filename]' -r
+complete -c composite -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c composite -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c composite -o help -d 'Print program options'
+complete -c composite -o list -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
+complete -c composite -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c composite -o version -d 'Print version information'
+complete -c composite -o matte -d 'Store matte channel if the image has one'
+complete -c composite -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/conda.fish b/share/completions/conda.fish
index 6a15256ce..88a391485 100644
--- a/share/completions/conda.fish
+++ b/share/completions/conda.fish
@@ -42,23 +42,23 @@ complete -c conda -s h -l help -d "Show help and exit"
 __fish_conda_top -s V -l version -d "Show the conda version number and exit"
 
 # top-level commands
-__fish_conda_top -a clean     -d "Remove unused packages and caches"
-__fish_conda_top -a config    -d "Modify configuration values in .condarc"
-__fish_conda_top -a create    -d "Create a new conda environment from a list of specified packages"
-__fish_conda_top -a help      -d "Displays a list of available conda commands and their help strings"
-__fish_conda_top -a info      -d "Display information about current conda install"
-__fish_conda_top -a install   -d "Installs a list of packages into a specified conda environment"
-__fish_conda_top -a list      -d "List linked packages in a conda environment"
-__fish_conda_top -a package   -d "Low-level conda package utility (EXPERIMENTAL)"
-__fish_conda_top -a remove    -d "Remove a list of packages from a specified conda environment"
+__fish_conda_top -a clean -d "Remove unused packages and caches"
+__fish_conda_top -a config -d "Modify configuration values in .condarc"
+__fish_conda_top -a create -d "Create a new conda environment from a list of specified packages"
+__fish_conda_top -a help -d "Displays a list of available conda commands and their help strings"
+__fish_conda_top -a info -d "Display information about current conda install"
+__fish_conda_top -a install -d "Installs a list of packages into a specified conda environment"
+__fish_conda_top -a list -d "List linked packages in a conda environment"
+__fish_conda_top -a package -d "Low-level conda package utility (EXPERIMENTAL)"
+__fish_conda_top -a remove -d "Remove a list of packages from a specified conda environment"
 __fish_conda_top -a uninstall -d "Alias for conda remove"
-__fish_conda_top -a search    -d "Search for packages and display associated information"
-__fish_conda_top -a update    -d "Updates conda packages to the latest compatible version"
-__fish_conda_top -a upgrade   -d "Alias for conda update"
+__fish_conda_top -a search -d "Search for packages and display associated information"
+__fish_conda_top -a update -d "Updates conda packages to the latest compatible version"
+__fish_conda_top -a upgrade -d "Alias for conda update"
 
 # command added by sourcing ~/miniconda3/etc/fish/conf.d/conda.fish,
 # which is the recommended way to use conda with fish
-__fish_conda_top -a activate   -d "Activate the given environment"
+__fish_conda_top -a activate -d "Activate the given environment"
 __fish_conda activate -x -a "(__fish_conda_environments)"
 __fish_conda_top -a deactivate -d "Deactivate current environment, reactivating the previous one"
 
@@ -66,52 +66,52 @@ __fish_conda_top -a deactivate -d "Deactivate current environment, reactivating
 
 set -l __fish_conda_commands clean config create help info install list package remove uninstall search update upgrade
 for cmd in $__fish_conda_commands
-    __fish_conda $cmd -l json         -d "Report all output as json"
-    __fish_conda $cmd -l debug        -d "Show debug output"
+    __fish_conda $cmd -l json -d "Report all output as json"
+    __fish_conda $cmd -l debug -d "Show debug output"
     __fish_conda $cmd -l verbose -s v -d "Use once for info, twice for debug, three times for trace"
 end
 
 # 'clean' command
-__fish_conda clean -s y -l yes          -d "Do not ask for confirmation"
-__fish_conda clean -l dry-run           -d "Only display what would have been done"
-__fish_conda clean -s q -l quiet        -d "Do not display progress bar"
-__fish_conda clean -s a -l all          -d "Remove all: same as -iltps"
-__fish_conda clean -s i -l index-cache  -d "Remove index cache"
-__fish_conda clean -s l -l lock         -d "Remove all conda lock files"
-__fish_conda clean -s t -l tarballs     -d "Remove cached package tarballs"
-__fish_conda clean -s p -l packages     -d "Remove unused cached packages (no check for symlinks)"
+__fish_conda clean -s y -l yes -d "Do not ask for confirmation"
+__fish_conda clean -l dry-run -d "Only display what would have been done"
+__fish_conda clean -s q -l quiet -d "Do not display progress bar"
+__fish_conda clean -s a -l all -d "Remove all: same as -iltps"
+__fish_conda clean -s i -l index-cache -d "Remove index cache"
+__fish_conda clean -s l -l lock -d "Remove all conda lock files"
+__fish_conda clean -s t -l tarballs -d "Remove cached package tarballs"
+__fish_conda clean -s p -l packages -d "Remove unused cached packages (no check for symlinks)"
 __fish_conda clean -s s -l source-cache -d "Remove files from the source cache of conda build"
 
 # 'config' command
 
-__fish_conda config -l system                                        -d "Write to the system .condarc file"
-__fish_conda config -l env                                           -d "Write to the active conda environment .condarc file"
-__fish_conda config -l file                                          -d "Write to the given file"
-__fish_conda config -l show -x -a "(__fish_conda_config_keys)"       -d "Display configuration values"
-__fish_conda config -l show-sources                                  -d "Display all identified configuration sources"
-__fish_conda config -l validate                                      -d "Validate all configuration sources"
-__fish_conda config -l describe -x -a "(__fish_conda_config_keys)"   -d "Describe configuration parameters"
-__fish_conda config -l write-default                                 -d "Write the default configuration to a file"
-__fish_conda config -l get -x -a "(__fish_conda_config_keys)"        -d "Get a configuration value"
-__fish_conda config -l append                                        -d "Add one configuration value to the end of a list key"
-__fish_conda config -l prepend                                       -d "Add one configuration value to the beginning of a list key"
-__fish_conda config -l add                                           -d "Alias for --prepend"
-__fish_conda config -l set -x -a "(__fish_conda_config_keys)"        -d "Set a boolean or string key"
-__fish_conda config -l remove -x -a "(__fish_conda_config_keys)"     -d "Remove a configuration value from a list key"
+__fish_conda config -l system -d "Write to the system .condarc file"
+__fish_conda config -l env -d "Write to the active conda environment .condarc file"
+__fish_conda config -l file -d "Write to the given file"
+__fish_conda config -l show -x -a "(__fish_conda_config_keys)" -d "Display configuration values"
+__fish_conda config -l show-sources -d "Display all identified configuration sources"
+__fish_conda config -l validate -d "Validate all configuration sources"
+__fish_conda config -l describe -x -a "(__fish_conda_config_keys)" -d "Describe configuration parameters"
+__fish_conda config -l write-default -d "Write the default configuration to a file"
+__fish_conda config -l get -x -a "(__fish_conda_config_keys)" -d "Get a configuration value"
+__fish_conda config -l append -d "Add one configuration value to the end of a list key"
+__fish_conda config -l prepend -d "Add one configuration value to the beginning of a list key"
+__fish_conda config -l add -d "Alias for --prepend"
+__fish_conda config -l set -x -a "(__fish_conda_config_keys)" -d "Set a boolean or string key"
+__fish_conda config -l remove -x -a "(__fish_conda_config_keys)" -d "Remove a configuration value from a list key"
 __fish_conda config -l remove-key -x -a "(__fish_conda_config_keys)" -d "Remove a configuration key (and all its values)"
-__fish_conda config -l stdin                                         -d "Apply configuration given in yaml format from stdin"
+__fish_conda config -l stdin -d "Apply configuration given in yaml format from stdin"
 
 # 'help' command
-__fish_conda "help"         -d "Displays a list of available conda commands and their help strings"
+__fish_conda "help" -d "Displays a list of available conda commands and their help strings"
 __fish_conda "help" -x -a "$__fish_conda_commands"
 
 # 'info' command
-__fish_conda info -l offline         -d "Offline mode, don't connect to the Internet."
-__fish_conda info -s a -l all        -d "Show all information, (environments, license, and system information)"
-__fish_conda info -s e -l envs       -d "List all known conda environments"
-__fish_conda info -s l -l license    -d "Display information about the local conda licenses list"
-__fish_conda info -s s -l system     -d "List environment variables"
-__fish_conda info -l base            -d "Display base environment path"
+__fish_conda info -l offline -d "Offline mode, don't connect to the Internet."
+__fish_conda info -s a -l all -d "Show all information, (environments, license, and system information)"
+__fish_conda info -s e -l envs -d "List all known conda environments"
+__fish_conda info -s l -l license -d "Display information about the local conda licenses list"
+__fish_conda info -s s -l system -d "List environment variables"
+__fish_conda info -l base -d "Display base environment path"
 __fish_conda info -l unsafe-channels -d "Display list of channels with tokens exposed"
 
 # The remaining commands share many options, so the definitions are written the other way around:
diff --git a/share/completions/conjure.fish b/share/completions/conjure.fish
index 8907ad209..46954e08c 100644
--- a/share/completions/conjure.fish
+++ b/share/completions/conjure.fish
@@ -1,9 +1,9 @@
-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]'
-complete -c conjure -o verbose                      -d 'Print detailed information about the image'
-complete -c conjure -o debug                        -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c conjure -o help                         -d 'Print program options'
-complete -c conjure -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+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]'
+complete -c conjure -o verbose -d 'Print detailed information about the image'
+complete -c conjure -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c conjure -o help -d 'Print program options'
+complete -c conjure -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
 #complete -c conjure -o list                         -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
diff --git a/share/completions/convert.fish b/share/completions/convert.fish
index 95e7b5dd5..5e19772af 100644
--- a/share/completions/convert.fish
+++ b/share/completions/convert.fish
@@ -1,232 +1,232 @@
-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 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)'
-complete -c convert -o bias                                        -d 'Add bias when convolving an image [value]'
-complete -c convert -o black-point-compensation                    -d 'Use black point compensation'
-complete -c convert -o blue-primary                                -d 'Chromaticity blue primary point [point]'
-complete -c convert -o bordercolor                                 -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o caption                                     -d 'Assign a caption to an image [string]'
-complete -c convert -o channel                                     -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
-complete -c convert -o colors                                      -d 'Preferred number of colors in the image [value]'
-complete -c convert -o colorspace                                  -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
-complete -c convert -o comment                                     -d 'Annotate image with comment [string]'
-complete -c convert -o compose                                     -d 'Set image composite operator [operator]'
-complete -c convert -o compress                                    -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
-complete -c convert -o define                                      -d 'Define one or more image format options [format:option]'
-complete -c convert -o delay                                       -d 'Display the next image after pausing [value]'
-complete -c convert -o density                                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c convert -o depth                                       -d 'Image depth [value]'
-complete -c convert -o direction                                   -d 'Render text right-to-left or left-to-right [type]' -xa '(convert -list direction)'
-complete -c convert -o display                                     -d 'Get image or font from this X server [server]'
-complete -c convert -o dispose                                     -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
-complete -c convert -o dither                                      -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
-complete -c convert -o encoding                                    -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c convert -o endian                                      -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
-complete -c convert -o family                                      -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
-complete -c convert -o fill                                        -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o filter                                      -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
-complete -c convert -o font                                        -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c convert -o format                                      -d 'Output formatted image characteristics ["string"]'
-complete -c convert -o fuzz                                        -d 'Colors within this distance are considered equal [distance]'
-complete -c convert -o gravity                                     -d 'Horizontal and vertical text placement [type]' -xa '(convert -list gravity)'
-complete -c convert -o green-primary                               -d 'Chromaticity green primary point [point]'
-complete -c convert -o intent                                      -d 'Type of rendering intent when managing the image color [type]' -xa '(convert -list intent)'
-complete -c convert -o interlace                                   -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
-complete -c convert -o interline-spacing                           -d 'Set the space between two text lines [value]'
-complete -c convert -o interpolate                                 -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
-complete -c convert -o interword-spacing                           -d 'Set the space between two words [value]'
-complete -c convert -o kerning                                     -d 'Set the space between two letters [value]'
-complete -c convert -o label                                       -d 'Assign a label to an image [string]'
-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 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'
-complete -c convert -o pointsize                                   -d 'Font point size [value]'
-complete -c convert -o precision                                   -d 'Maximum number of significant digits to print [value]'
-complete -c convert -o preview                                     -d 'Image preview type [type]' -xa '(convert -list preview)'
-complete -c convert -o quality                                     -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c convert -o quiet                                       -d 'Suppress all warning messages'
-complete -c convert -o red-primary                                 -d 'Chromaticity red primary point [point]'
-complete -c convert -o regard-warnings                             -d 'Pay attention to warning messages'
-complete -c convert -o remap                                       -d 'Transform image colors to match this set of colors [filename]' -r
-complete -c convert -o respect-parentheses                         -d 'Settings remain in effect until parenthesis boundary'
-complete -c convert -o sampling-factor                             -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c convert -o scene                                       -d 'Image scene number [value]'
-complete -c convert -o seed                                        -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c convert -o size                                        -d 'Width and height of image [geometry]'
-complete -c convert -o stretch                                     -d 'Render text with this font stretch [type]' -xa '(convert -list stretch)'
-complete -c convert -o stroke                                      -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o strokewidth                                 -d 'Graphic primitive stroke width [value]'
-complete -c convert -o style                                       -d 'Render text with this font style [type]' -xa '(convert -list style)'
-complete -c convert -o synchronize                                 -d 'Synchronize image to storage device'
-complete -c convert -o taint                                       -d 'Declare the image as modified'
-complete -c convert -o texture                                     -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c convert -o tile-offset                                 -d 'Tile offset [geometry]'
-complete -c convert -o treedepth                                   -d 'Color tree depth [value]'
-complete -c convert -o transparent-color                           -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o undercolor                                  -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o units                                       -d 'The units of image resolution [type]' -xa '(convert -list units)'
-complete -c convert -o verbose                                     -d 'Print detailed information about the image'
-complete -c convert -o view                                        -d 'FlashPix viewing transforms'
-complete -c convert -o virtual-pixel                               -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
-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-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'
-complete -c convert -o auto-level                                  -d 'Automagically adjust color levels of image'
-complete -c convert -o auto-orient                                 -d 'Automagically orient (rotate) image'
-complete -c convert -o bench                                       -d 'Measure performance [iterations]'
-complete -c convert -o black-threshold                             -d 'Force all pixels below the threshold into black [value]'
-complete -c convert -o blue-shift                                  -d 'Simulate a scene at nighttime in the moonlight [factor]'
-complete -c convert -o blur                                        -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c convert -o border                                      -d 'Surround image with a border of color [geometry]'
-complete -c convert -o brightness-contrast                         -d 'Improve brightness / contrast of the image [geometry]'
-complete -c convert -o cdl                                         -d 'Color correct with a color decision list [filename]' -r
-complete -c convert -o charcoal                                    -d 'Simulate a charcoal drawing [radius]'
-complete -c convert -o chop                                        -d 'Remove pixels from the image interior [geometry]'
-complete -c convert -o clamp                                       -d 'Restrict pixel range from 0 to the quantum depth'
-complete -c convert -o clip                                        -d 'Clip along the first path from the 8BIM profile'
-complete -c convert -o clip-mask                                   -d 'Associate a clip mask with the image [filename]' -r
-complete -c convert -o clip-path                                   -d 'Clip along a named path from the 8BIM profile [id]'
-complete -c convert -o colorize                                    -d 'Colorize the image with the fill color [value]'
-complete -c convert -o color-matrix                                -d 'Apply color correction to the image [matrix]'
-complete -c convert -o contrast                                    -d 'Enhance or reduce the image contrast'
-complete -c convert -o contrast-stretch                            -d 'Improve contrast by `stretching\' the intensity range [geometry]'
-complete -c convert -o convolve                                    -d 'Apply a convolution kernel to the image [coefficients]'
-complete -c convert -o cycle                                       -d 'Cycle the image colormap [amount]'
-complete -c convert -o decipher                                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c convert -o deskew                                      -d 'Straighten an image [threshold]'
-complete -c convert -o despeckle                                   -d 'Reduce the speckles within an image'
-complete -c convert -o distort                                     -d 'Args distort images according to given method ad args [method]' -xa '(convert -list distort)'
-complete -c convert -o draw                                        -d 'Annotate the image with a graphic primitive [string]'
-complete -c convert -o edge                                        -d 'Apply a filter to detect edges in the image [radius]'
-complete -c convert -o encipher                                    -d 'Convert plain pixels to cipher pixels [filename]' -r
-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 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)'
-complete -c convert -o flip                                        -d 'Flip image vertically'
-complete -c convert -o floodfill                                   -d 'Color floodfill the image with color [geometry]'
-complete -c convert -o flop                                        -d 'Flop image horizontally'
-complete -c convert -o frame                                       -d 'Surround image with an ornamental border [geometry]'
-complete -c convert -o function                                    -d 'Apply function over image values [name parameters]' -xa '(convert -list function)'
-complete -c convert -o gamma                                       -d 'Level of gamma correction [value]'
-complete -c convert -o gaussian-blur                               -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c convert -o geometry                                    -d 'Preferred size or location of the image [geometry]'
-complete -c convert -o identify                                    -d 'Identify the format and characteristics of the image'
-complete -c convert -o ift                                         -d 'Implements the inverse discrete Fourier transform (DFT)'
-complete -c convert -o implode                                     -d 'Implode image pixels about the center [amount]'
-complete -c convert -o lat                                         -d 'Local adaptive thresholding [geometry]'
-complete -c convert -o layers                                      -d 'Optimize, merge,  or compare image layers [method]' -xa '(convert -list layers)'
-complete -c convert -o level                                       -d 'Adjust the level of image contrast [value]'
-complete -c convert -o level-colors                                -d 'Level image with the given colors [color,color]' -xa '(__fish_complete_list , "__fish_complete_convert_options color")'
-complete -c convert -o linear-stretch                              -d 'Improve contrast by `stretching with saturation\' [geometry]'
-complete -c convert -o liquid-rescale                              -d 'Rescale image with seam-carving [geometry]'
-complete -c convert -o median                                      -d 'Apply a median filter to the image [geometry]'
-complete -c convert -o mode                                        -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
-complete -c convert -o modulate                                    -d 'Vary the brightness, saturation, and hue [value]'
-complete -c convert -o monochrome                                  -d 'Transform image to black and white'
-complete -c convert -o morphology                                  -d 'Apply a morphology method to the image [method kernel]' -xa '(convert -list morphology)'
-complete -c convert -o motion-blur                                 -d 'Simulate motion blur [geometry]'
-complete -c convert -o negate                                      -d 'Replace every pixel with its complementary color '
-complete -c convert -o noise                                       -d 'Add or reduce noise in an image [geometry]'
-complete -c convert -o normalize                                   -d 'Transform image to span the full range of colors'
-complete -c convert -o opaque                                      -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o ordered-dither                              -d 'Add a noise pattern to the image with specific amplitudes  [NxN]'
-complete -c convert -o paint                                       -d 'Simulate an oil painting [radius]'
-complete -c convert -o polaroid                                    -d 'Simulate a Polaroid picture [angle]'
-complete -c convert -o posterize                                   -d 'Reduce the image to a limited number of color levels [levels]'
-complete -c convert -o profile                                     -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c convert -o quantize                                    -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
-complete -c convert -o radial-blur                                 -d 'Radial blur the image [angle]'
-complete -c convert -o raise                                       -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c convert -o random-threshold                            -d 'Random threshold the image [low,high]'
-complete -c convert -o region                                      -d 'Apply options to a portion of the image [geometry]'
-complete -c convert -o render                                      -d 'Render vector graphics'
-complete -c convert -o repage                                      -d 'Size and location of an image canvas [geometry]'
-complete -c convert -o resample                                    -d 'Change the resolution of an image [geometry]'
-complete -c convert -o resize                                      -d 'Resize the image [geometry]'
-complete -c convert -o roll                                        -d 'Roll an image vertically or horizontally [geometry]'
-complete -c convert -o rotate                                      -d 'Apply Paeth rotation to the image [degrees]'
-complete -c convert -o sample                                      -d 'Scale image with pixel sampling [geometry]'
-complete -c convert -o scale                                       -d 'Scale the image [geometry]'
-complete -c convert -o segment                                     -d 'Segment an image [values]'
-complete -c convert -o selective-blur                              -d 'Selectively blur pixels within a contrast threshold [geometry]'
-complete -c convert -o sepia-tone                                  -d 'Simulate a sepia-toned photo [threshold]'
-complete -c convert -o set                                         -d 'Set an image property [property value]'
-complete -c convert -o shade                                       -d 'Shade the image using a distant light source [degrees]'
-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 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 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]'
-complete -c convert -o thumbnail                                   -d 'Create a thumbnail of the image [geometry]'
-complete -c convert -o tile                                        -d 'Tile image when filling a graphic primitive [filename]' -r
-complete -c convert -o tint                                        -d 'Tint the image with the fill color [value]'
-complete -c convert -o transform                                   -d 'Affine transform image'
-complete -c convert -o transparent                                 -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o transpose                                   -d 'Flip image vertically and rotate 90 degrees'
-complete -c convert -o transverse                                  -d 'Flop image horizontally and rotate 270 degrees'
-complete -c convert -o trim                                        -d 'Trim image edges'
-complete -c convert -o type                                        -d 'Image type [type]' -xa '(convert -list type)'
-complete -c convert -o unique-colors                               -d 'Discard all but one of any pixel color'
-complete -c convert -o unsharp                                     -d 'Sharpen the image [geometry]'
-complete -c convert -o vignette                                    -d 'Soften the edges of the image in vignette style [geometry]'
-complete -c convert -o wave                                        -d 'Alter an image along a sine wave [geometry]'
-complete -c convert -o white-threshold                             -d 'Force all pixels above the threshold into white [value]'
-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 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 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'
-complete -c convert -o morph                                       -d 'Morph an image sequence [value]'
-complete -c convert -o mosaic                                      -d 'Create a mosaic from an image sequence'
-complete -c convert -o print                                       -d 'Interpret string and print to console [string]'
-complete -c convert -o process                                     -d 'Process the image with a custom image filter [arguments]' -xa '(convert -list filter)'
-complete -c convert -o separate                                    -d 'Separate an image channel into a grayscale image'
-complete -c convert -o smush                                       -d 'Smush an image sequence together [geometry]'
-complete -c convert -o write                                       -d 'Write images to this file [filename]' -r
-complete -c convert -o clone                                       -d 'Clone an image [indexes]'
-complete -c convert -o delete                                      -d 'Delete the image from the image sequence [indexes]'
-complete -c convert -o duplicate                                   -d 'Duplicate an image one or more times [count,indexes]'
-complete -c convert -o insert                                      -d 'Insert last image into the image sequence [index]'
-complete -c convert -o reverse                                     -d 'Reverse image sequence'
-complete -c convert -o swap                                        -d 'Swap two images in the image sequence [indexes]'
-complete -c convert -o debug                                       -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c convert -o help                                        -d 'Print program options'
-complete -c convert -o list                                        -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
-complete -c convert -o log                                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c convert -o version                                     -d 'Print version information'
-complete -c convert -o matte                                       -d 'Store matte channel if the image has one'
-complete -c convert -o origin                                      -d 'Image origin [geometry]'
-complete -c convert -o support                                     -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c convert -o affinity                                    -d 'Transform image colors to match this set of colors [filename]' -r
+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 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)'
+complete -c convert -o bias -d 'Add bias when convolving an image [value]'
+complete -c convert -o black-point-compensation -d 'Use black point compensation'
+complete -c convert -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c convert -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o caption -d 'Assign a caption to an image [string]'
+complete -c convert -o channel -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
+complete -c convert -o colors -d 'Preferred number of colors in the image [value]'
+complete -c convert -o colorspace -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
+complete -c convert -o comment -d 'Annotate image with comment [string]'
+complete -c convert -o compose -d 'Set image composite operator [operator]'
+complete -c convert -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
+complete -c convert -o define -d 'Define one or more image format options [format:option]'
+complete -c convert -o delay -d 'Display the next image after pausing [value]'
+complete -c convert -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c convert -o depth -d 'Image depth [value]'
+complete -c convert -o direction -d 'Render text right-to-left or left-to-right [type]' -xa '(convert -list direction)'
+complete -c convert -o display -d 'Get image or font from this X server [server]'
+complete -c convert -o dispose -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
+complete -c convert -o dither -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
+complete -c convert -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c convert -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
+complete -c convert -o family -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
+complete -c convert -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o filter -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
+complete -c convert -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c convert -o format -d 'Output formatted image characteristics ["string"]'
+complete -c convert -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c convert -o gravity -d 'Horizontal and vertical text placement [type]' -xa '(convert -list gravity)'
+complete -c convert -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c convert -o intent -d 'Type of rendering intent when managing the image color [type]' -xa '(convert -list intent)'
+complete -c convert -o interlace -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
+complete -c convert -o interline-spacing -d 'Set the space between two text lines [value]'
+complete -c convert -o interpolate -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
+complete -c convert -o interword-spacing -d 'Set the space between two words [value]'
+complete -c convert -o kerning -d 'Set the space between two letters [value]'
+complete -c convert -o label -d 'Assign a label to an image [string]'
+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 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'
+complete -c convert -o pointsize -d 'Font point size [value]'
+complete -c convert -o precision -d 'Maximum number of significant digits to print [value]'
+complete -c convert -o preview -d 'Image preview type [type]' -xa '(convert -list preview)'
+complete -c convert -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c convert -o quiet -d 'Suppress all warning messages'
+complete -c convert -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c convert -o regard-warnings -d 'Pay attention to warning messages'
+complete -c convert -o remap -d 'Transform image colors to match this set of colors [filename]' -r
+complete -c convert -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c convert -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c convert -o scene -d 'Image scene number [value]'
+complete -c convert -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c convert -o size -d 'Width and height of image [geometry]'
+complete -c convert -o stretch -d 'Render text with this font stretch [type]' -xa '(convert -list stretch)'
+complete -c convert -o stroke -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o strokewidth -d 'Graphic primitive stroke width [value]'
+complete -c convert -o style -d 'Render text with this font style [type]' -xa '(convert -list style)'
+complete -c convert -o synchronize -d 'Synchronize image to storage device'
+complete -c convert -o taint -d 'Declare the image as modified'
+complete -c convert -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c convert -o tile-offset -d 'Tile offset [geometry]'
+complete -c convert -o treedepth -d 'Color tree depth [value]'
+complete -c convert -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o undercolor -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o units -d 'The units of image resolution [type]' -xa '(convert -list units)'
+complete -c convert -o verbose -d 'Print detailed information about the image'
+complete -c convert -o view -d 'FlashPix viewing transforms'
+complete -c convert -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
+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-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'
+complete -c convert -o auto-level -d 'Automagically adjust color levels of image'
+complete -c convert -o auto-orient -d 'Automagically orient (rotate) image'
+complete -c convert -o bench -d 'Measure performance [iterations]'
+complete -c convert -o black-threshold -d 'Force all pixels below the threshold into black [value]'
+complete -c convert -o blue-shift -d 'Simulate a scene at nighttime in the moonlight [factor]'
+complete -c convert -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c convert -o border -d 'Surround image with a border of color [geometry]'
+complete -c convert -o brightness-contrast -d 'Improve brightness / contrast of the image [geometry]'
+complete -c convert -o cdl -d 'Color correct with a color decision list [filename]' -r
+complete -c convert -o charcoal -d 'Simulate a charcoal drawing [radius]'
+complete -c convert -o chop -d 'Remove pixels from the image interior [geometry]'
+complete -c convert -o clamp -d 'Restrict pixel range from 0 to the quantum depth'
+complete -c convert -o clip -d 'Clip along the first path from the 8BIM profile'
+complete -c convert -o clip-mask -d 'Associate a clip mask with the image [filename]' -r
+complete -c convert -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
+complete -c convert -o colorize -d 'Colorize the image with the fill color [value]'
+complete -c convert -o color-matrix -d 'Apply color correction to the image [matrix]'
+complete -c convert -o contrast -d 'Enhance or reduce the image contrast'
+complete -c convert -o contrast-stretch -d 'Improve contrast by `stretching\' the intensity range [geometry]'
+complete -c convert -o convolve -d 'Apply a convolution kernel to the image [coefficients]'
+complete -c convert -o cycle -d 'Cycle the image colormap [amount]'
+complete -c convert -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c convert -o deskew -d 'Straighten an image [threshold]'
+complete -c convert -o despeckle -d 'Reduce the speckles within an image'
+complete -c convert -o distort -d 'Args distort images according to given method ad args [method]' -xa '(convert -list distort)'
+complete -c convert -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c convert -o edge -d 'Apply a filter to detect edges in the image [radius]'
+complete -c convert -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+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 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)'
+complete -c convert -o flip -d 'Flip image vertically'
+complete -c convert -o floodfill -d 'Color floodfill the image with color [geometry]'
+complete -c convert -o flop -d 'Flop image horizontally'
+complete -c convert -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c convert -o function -d 'Apply function over image values [name parameters]' -xa '(convert -list function)'
+complete -c convert -o gamma -d 'Level of gamma correction [value]'
+complete -c convert -o gaussian-blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c convert -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c convert -o identify -d 'Identify the format and characteristics of the image'
+complete -c convert -o ift -d 'Implements the inverse discrete Fourier transform (DFT)'
+complete -c convert -o implode -d 'Implode image pixels about the center [amount]'
+complete -c convert -o lat -d 'Local adaptive thresholding [geometry]'
+complete -c convert -o layers -d 'Optimize, merge,  or compare image layers [method]' -xa '(convert -list layers)'
+complete -c convert -o level -d 'Adjust the level of image contrast [value]'
+complete -c convert -o level-colors -d 'Level image with the given colors [color,color]' -xa '(__fish_complete_list , "__fish_complete_convert_options color")'
+complete -c convert -o linear-stretch -d 'Improve contrast by `stretching with saturation\' [geometry]'
+complete -c convert -o liquid-rescale -d 'Rescale image with seam-carving [geometry]'
+complete -c convert -o median -d 'Apply a median filter to the image [geometry]'
+complete -c convert -o mode -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
+complete -c convert -o modulate -d 'Vary the brightness, saturation, and hue [value]'
+complete -c convert -o monochrome -d 'Transform image to black and white'
+complete -c convert -o morphology -d 'Apply a morphology method to the image [method kernel]' -xa '(convert -list morphology)'
+complete -c convert -o motion-blur -d 'Simulate motion blur [geometry]'
+complete -c convert -o negate -d 'Replace every pixel with its complementary color '
+complete -c convert -o noise -d 'Add or reduce noise in an image [geometry]'
+complete -c convert -o normalize -d 'Transform image to span the full range of colors'
+complete -c convert -o opaque -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o ordered-dither -d 'Add a noise pattern to the image with specific amplitudes  [NxN]'
+complete -c convert -o paint -d 'Simulate an oil painting [radius]'
+complete -c convert -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c convert -o posterize -d 'Reduce the image to a limited number of color levels [levels]'
+complete -c convert -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c convert -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
+complete -c convert -o radial-blur -d 'Radial blur the image [angle]'
+complete -c convert -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c convert -o random-threshold -d 'Random threshold the image [low,high]'
+complete -c convert -o region -d 'Apply options to a portion of the image [geometry]'
+complete -c convert -o render -d 'Render vector graphics'
+complete -c convert -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c convert -o resample -d 'Change the resolution of an image [geometry]'
+complete -c convert -o resize -d 'Resize the image [geometry]'
+complete -c convert -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c convert -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c convert -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c convert -o scale -d 'Scale the image [geometry]'
+complete -c convert -o segment -d 'Segment an image [values]'
+complete -c convert -o selective-blur -d 'Selectively blur pixels within a contrast threshold [geometry]'
+complete -c convert -o sepia-tone -d 'Simulate a sepia-toned photo [threshold]'
+complete -c convert -o set -d 'Set an image property [property value]'
+complete -c convert -o shade -d 'Shade the image using a distant light source [degrees]'
+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 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 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]'
+complete -c convert -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c convert -o tile -d 'Tile image when filling a graphic primitive [filename]' -r
+complete -c convert -o tint -d 'Tint the image with the fill color [value]'
+complete -c convert -o transform -d 'Affine transform image'
+complete -c convert -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c convert -o transverse -d 'Flop image horizontally and rotate 270 degrees'
+complete -c convert -o trim -d 'Trim image edges'
+complete -c convert -o type -d 'Image type [type]' -xa '(convert -list type)'
+complete -c convert -o unique-colors -d 'Discard all but one of any pixel color'
+complete -c convert -o unsharp -d 'Sharpen the image [geometry]'
+complete -c convert -o vignette -d 'Soften the edges of the image in vignette style [geometry]'
+complete -c convert -o wave -d 'Alter an image along a sine wave [geometry]'
+complete -c convert -o white-threshold -d 'Force all pixels above the threshold into white [value]'
+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 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 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'
+complete -c convert -o morph -d 'Morph an image sequence [value]'
+complete -c convert -o mosaic -d 'Create a mosaic from an image sequence'
+complete -c convert -o print -d 'Interpret string and print to console [string]'
+complete -c convert -o process -d 'Process the image with a custom image filter [arguments]' -xa '(convert -list filter)'
+complete -c convert -o separate -d 'Separate an image channel into a grayscale image'
+complete -c convert -o smush -d 'Smush an image sequence together [geometry]'
+complete -c convert -o write -d 'Write images to this file [filename]' -r
+complete -c convert -o clone -d 'Clone an image [indexes]'
+complete -c convert -o delete -d 'Delete the image from the image sequence [indexes]'
+complete -c convert -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
+complete -c convert -o insert -d 'Insert last image into the image sequence [index]'
+complete -c convert -o reverse -d 'Reverse image sequence'
+complete -c convert -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c convert -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c convert -o help -d 'Print program options'
+complete -c convert -o list -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
+complete -c convert -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c convert -o version -d 'Print version information'
+complete -c convert -o matte -d 'Store matte channel if the image has one'
+complete -c convert -o origin -d 'Image origin [geometry]'
+complete -c convert -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c convert -o affinity -d 'Transform image colors to match this set of colors [filename]' -r
diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 181b44bfc..d095c5ccb 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -1,76 +1,76 @@
-if cp --version 2>/dev/null > /dev/null # GNU cp
-	complete -c cp -s a -l archive -d "Same as -dpR"
-	complete -c cp -s b -l backup -d "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
-	complete -c cp -l copy-contents -d "Copy contents of special files when recursive"
-	complete -c cp -s d -d "Same as --no-dereference --preserve=link"
-	complete -c cp -s f -l force -d "Do not prompt before overwriting"
-	complete -c cp -s i -l interactive -d "Prompt before overwrite"
-	complete -c cp -s H -d "Follow command-line symbolic links"
-	complete -c cp -s l -l link -d "Link files instead of copying"
-	complete -c cp -l strip-trailing-slashes -d "Remove trailing slashes from source"
-	complete -c cp -s S -l suffix -r -d "Backup suffix"
-	complete -c cp -s t -l target-directory -d "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
-	complete -c cp -s u -l update -d "Do not overwrite newer files"
-	complete -c cp -s v -l verbose -d "Verbose mode"
-	complete -c cp -l help -d "Display help and exit"
-	complete -c cp -l version -d "Display version and exit"
-	complete -c cp -s L -l dereference -d "Always follow symbolic links"
-	complete -c cp -s P -l no-dereference -d "Never follow symbolic links"
-	complete -c cp -s p  -d "Same as --preserve=mode,ownership,timestamps"
-	complete -c cp -f -l preserve -d "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
-	complete -c cp -f -l no-preserve -r -d "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
-	complete -c cp -l parents -d "Use full source file name under DIRECTORY"
-	complete -c cp -s r -s R -l recursive -d "Copy directories recursively"
-	complete -c cp -l remove-destination -d "First remove existing destination files"
-	complete -c cp -f -l sparse -r -d "Control creation of sparse files" -xa "always auto never"
-	complete -c cp -s s -l symbolic-link -d "Make symbolic links instead of copying"
-	complete -c cp -s T -l no-target-directory -d "Treat DEST as a normal file"
-	complete -c cp -s x -l one-file-system -d "Stay on this file system"
-	complete -c cp -s X -l context -r -d "Set SELinux context of copy to CONTEXT"
+if cp --version 2>/dev/null >/dev/null # GNU cp
+    complete -c cp -s a -l archive -d "Same as -dpR"
+    complete -c cp -s b -l backup -d "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
+    complete -c cp -l copy-contents -d "Copy contents of special files when recursive"
+    complete -c cp -s d -d "Same as --no-dereference --preserve=link"
+    complete -c cp -s f -l force -d "Do not prompt before overwriting"
+    complete -c cp -s i -l interactive -d "Prompt before overwrite"
+    complete -c cp -s H -d "Follow command-line symbolic links"
+    complete -c cp -s l -l link -d "Link files instead of copying"
+    complete -c cp -l strip-trailing-slashes -d "Remove trailing slashes from source"
+    complete -c cp -s S -l suffix -r -d "Backup suffix"
+    complete -c cp -s t -l target-directory -d "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
+    complete -c cp -s u -l update -d "Do not overwrite newer files"
+    complete -c cp -s v -l verbose -d "Verbose mode"
+    complete -c cp -l help -d "Display help and exit"
+    complete -c cp -l version -d "Display version and exit"
+    complete -c cp -s L -l dereference -d "Always follow symbolic links"
+    complete -c cp -s P -l no-dereference -d "Never follow symbolic links"
+    complete -c cp -s p -d "Same as --preserve=mode,ownership,timestamps"
+    complete -c cp -f -l preserve -d "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
+    complete -c cp -f -l no-preserve -r -d "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
+    complete -c cp -l parents -d "Use full source file name under DIRECTORY"
+    complete -c cp -s r -s R -l recursive -d "Copy directories recursively"
+    complete -c cp -l remove-destination -d "First remove existing destination files"
+    complete -c cp -f -l sparse -r -d "Control creation of sparse files" -xa "always auto never"
+    complete -c cp -s s -l symbolic-link -d "Make symbolic links instead of copying"
+    complete -c cp -s T -l no-target-directory -d "Treat DEST as a normal file"
+    complete -c cp -s x -l one-file-system -d "Stay on this file system"
+    complete -c cp -s X -l context -r -d "Set SELinux context of copy to CONTEXT"
 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
-	# 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
-	if [ "$uname" = SunOS ] # annoying
-		complete -c cp -s r -d "Copy directories recursively"
-		complete -c cp -s R -d "Like -r, but replicating pipes instead of reading pipes"
-	else
-		complete -c cp -s R -d "Copy directories recursively"
-	end
-	complete -c cp -s H -d "-R: Follow symlink arguments"
-	complete -c cp -s L -d "-R: Follow all symlinks"
-	complete -c cp -s P -d "-R: Don't follow symlinks (default)"
+    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
+    # 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
+    if [ "$uname" = SunOS ] # annoying
+        complete -c cp -s r -d "Copy directories recursively"
+        complete -c cp -s R -d "Like -r, but replicating pipes instead of reading pipes"
+    else
+        complete -c cp -s R -d "Copy directories recursively"
+    end
+    complete -c cp -s H -d "-R: Follow symlink arguments"
+    complete -c cp -s L -d "-R: Follow all symlinks"
+    complete -c cp -s P -d "-R: Don't follow symlinks (default)"
 
-	complete -c cp -s f -d "Don't confirm to overwrite"
-	complete -c cp -s i -d "Prompt before overwrite"
-	not contains "$uname" SunOS OpenBSD NetBSD
-		and complete -c cp -s n -d "Don't overwrite existing"
+    complete -c cp -s f -d "Don't confirm to overwrite"
+    complete -c cp -s i -d "Prompt before overwrite"
+    not contains "$uname" SunOS OpenBSD NetBSD
+    and complete -c cp -s n -d "Don't overwrite existing"
 
-	complete -c cp -s p -d "Preserve attributes of source"
-	if [ "$uname" = SunOS ]
-		exit 0
-	end
-	complete -c cp -s v -d "Print filenames as they're copied"
-	if [ "$uname" = OpenBSD ]
-		exit 0
-	end
-	complete -c cp -s a -d "Archive mode (-pPR)"
-	if [ "$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 [ "$uname" = NetBSD ]
-		complete -c cp -s N -d "Don't copy file flags"
-		exit 0
-	end
-	complete -c cp -s x -d "Don't traverse mount points"
-	if [ "$uname" = FreeBSD ]
-		complete -c cp -s s -d "Symlink instead of copying"
-	end
+    complete -c cp -s p -d "Preserve attributes of source"
+    if [ "$uname" = SunOS ]
+        exit 0
+    end
+    complete -c cp -s v -d "Print filenames as they're copied"
+    if [ "$uname" = OpenBSD ]
+        exit 0
+    end
+    complete -c cp -s a -d "Archive mode (-pPR)"
+    if [ "$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 [ "$uname" = NetBSD ]
+        complete -c cp -s N -d "Don't copy file flags"
+        exit 0
+    end
+    complete -c cp -s x -d "Don't traverse mount points"
+    if [ "$uname" = FreeBSD ]
+        complete -c cp -s s -d "Symlink instead of copying"
+    end
 end
diff --git a/share/completions/cygport.fish b/share/completions/cygport.fish
index 92c5497d0..9c993f414 100644
--- a/share/completions/cygport.fish
+++ b/share/completions/cygport.fish
@@ -1,32 +1,32 @@
 
 # Options
-complete -c cygport -s 4 -l 32    -d "Build for 32-bit Cygwin"
-complete -c cygport -s 8 -l 64    -d "Build for 64-bit Cygwin"
-complete -c cygport      -l debug -d "Enable debugging messages"
+complete -c cygport -s 4 -l 32 -d "Build for 32-bit Cygwin"
+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_first_token' -f -a '*.cygport' -d "Cygport file"
 
 # Commands
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'downloadall fetchall wgetall getall' -d "Download all sources"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'download fetch wget get'             -d "Download missing sources"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'prep unpack'                         -d "Prepare source directory"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'compile build make'                  -d "Build software"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'check test'                          -d "Run test suite"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'inst install'                        -d "Install into DESTDIR and run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'postinst'                            -d "Run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'list'                                -d "List package files"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'listdebug listdbg'                   -d "List debug package files"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'dep'                                 -d "Show dependencies"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'info'                                -d "Show packaging info"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'homepage web www'                    -d "Show project homepage URL"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'package-test pkg-test'               -d "Create packages, marked as test"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'package pkg'                         -d "Create packages"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'diff mkdiff mkpatch'                 -d "Create source patches"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'upload up'                           -d "Upload finished packages"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'stage'                               -d "Upload packages without marking !ready"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'announce'                            -d "Send announcement email"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'clean finish'                        -d "Delete working directory"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'almostall all'                       -d "Same as prep build inst pkg"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'help'                                -d "Show help"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'version'                             -d "Show version"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'download fetch wget get' -d "Download missing sources"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'prep unpack' -d "Prepare source directory"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'compile build make' -d "Build software"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'check test' -d "Run test suite"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'inst install' -d "Install into DESTDIR and run post-installation steps"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'postinst' -d "Run post-installation steps"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'list' -d "List package files"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'listdebug listdbg' -d "List debug package files"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'dep' -d "Show dependencies"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'info' -d "Show packaging info"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'homepage web www' -d "Show project homepage URL"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'package-test pkg-test' -d "Create packages, marked as test"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'package pkg' -d "Create packages"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'diff mkdiff mkpatch' -d "Create source patches"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'upload up' -d "Upload finished packages"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'stage' -d "Upload packages without marking !ready"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'announce' -d "Send announcement email"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'clean finish' -d "Delete working directory"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'almostall all' -d "Same as prep build inst pkg"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'help' -d "Show help"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'version' -d "Show version"
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index 6638ca1ab..b5cabf362 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -41,35 +41,35 @@ complete -c darcs -n '__fish_use_subcommand' -x -a repair -d 'Repair a corrupted
 complete -c darcs -n '__fish_use_subcommand' -x -a convert -d 'Convert repositories between various formats'
 
 function __fish_darcs_use_show_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'show' $cmd
-    for i in $cmd
-      switch $i
-        case contents
-          return 1
-        case dependencies
-          return 1
-        case files
-          return 1
-        case index
-          return 1
-        case pristine
-          return 1
-        case repo
-          return 1
-        case authors
-          return 1
-        case tags
-          return 1
-        case patch-index
-          return 1
-      end
+    if contains 'show' $cmd
+        for i in $cmd
+            switch $i
+                case contents
+                    return 1
+                case dependencies
+                    return 1
+                case files
+                    return 1
+                case index
+                    return 1
+                case pristine
+                    return 1
+                case repo
+                    return 1
+                case authors
+                    return 1
+                case tags
+                    return 1
+                case patch-index
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -n '__fish_darcs_use_show_command' -x -a contents -d 'Outputs a specific version of a file'
@@ -83,39 +83,39 @@ complete -c darcs -n '__fish_darcs_use_show_command' -x -a tags -d 'Show all tag
 complete -c darcs -n '__fish_darcs_use_show_command' -x -a patch-index -d 'Check integrity of patch index'
 
 function __fish_darcs_use_optimize_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'optimize' $cmd
-    for i in $cmd
-      switch $i
-        case clean
-          return 1
-        case http
-          return 1
-        case reorder
-          return 1
-        case enable-patch-index
-          return 1
-        case disable-patch-index
-          return 1
-        case compress
-          return 1
-        case uncompress
-          return 1
-        case relink
-          return 1
-        case pristine
-          return 1
-        case upgrade
-          return 1
-        case cache
-          return 1
-      end
+    if contains 'optimize' $cmd
+        for i in $cmd
+            switch $i
+                case clean
+                    return 1
+                case http
+                    return 1
+                case reorder
+                    return 1
+                case enable-patch-index
+                    return 1
+                case disable-patch-index
+                    return 1
+                case compress
+                    return 1
+                case uncompress
+                    return 1
+                case relink
+                    return 1
+                case pristine
+                    return 1
+                case upgrade
+                    return 1
+                case cache
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a clean -d 'Garbage collect pristine, inventories and patches'
@@ -132,23 +132,23 @@ complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a cache -d 'Garbage
 
 
 function __fish_darcs_use_convert_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'convert' $cmd
-    for i in $cmd
-      switch $i
-        case darcs-2
-          return 1
-        case export
-          return 1
-        case import
-          return 1
-      end
+    if contains 'convert' $cmd
+        for i in $cmd
+            switch $i
+                case darcs-2
+                    return 1
+                case export
+                    return 1
+                case import
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -l 'help' -d 'Show a brief description of the command and its options'
diff --git a/share/completions/date.fish b/share/completions/date.fish
index ed1a0f043..63a89945f 100644
--- a/share/completions/date.fish
+++ b/share/completions/date.fish
@@ -1,41 +1,41 @@
 complete -c date -f -d "display or set date and time"
-if date --version > /dev/null 2>/dev/null
-	complete -c date -s d -l date -d "Display date described by string" -x
-	complete -c date -s f -l file -d "Display date for each line in file" -r
-	complete -c date -s I -l iso-8601 -d "Output in ISO-8601 format" -x -a "date hours minutes seconds"
-	complete -c date -s s -l set -d "Set time" -x
-	complete -c date -s R -l rfc-2822 -d "Output RFC-2822 date string"
-	complete -c date -s r -l reference -d "Display last modification time of file" -r
-	complete -c date -s u -l utc -d "Print/set UTC time" -f
-	complete -c date -l universal -d "Print/set UTC time" -f
-	complete -c date -s h -l help -d "Display help and exit" -f
-	complete -c date -s v -l version -d "Display version and exit" -f
+if date --version >/dev/null 2>/dev/null
+    complete -c date -s d -l date -d "Display date described by string" -x
+    complete -c date -s f -l file -d "Display date for each line in file" -r
+    complete -c date -s I -l iso-8601 -d "Output in ISO-8601 format" -x -a "date hours minutes seconds"
+    complete -c date -s s -l set -d "Set time" -x
+    complete -c date -s R -l rfc-2822 -d "Output RFC-2822 date string"
+    complete -c date -s r -l reference -d "Display last modification time of file" -r
+    complete -c date -s u -l utc -d "Print/set UTC time" -f
+    complete -c date -l universal -d "Print/set UTC time" -f
+    complete -c date -s h -l help -d "Display help and exit" -f
+    complete -c date -s v -l version -d "Display version and exit" -f
 else
-	complete -c date -s u -d 'Display or set UTC time' -f
-	complete -c date -s j -d "Don't actually set the clock" -f
-	complete -c date -s d -d "Set system's value for DST" -x
+    complete -c date -s u -d 'Display or set UTC time' -f
+    complete -c date -s j -d "Don't actually set the clock" -f
+    complete -c date -s d -d "Set system's value for DST" -x
 
-	set -l uname (uname -s)
+    set -l uname (uname -s)
 
-	test "$uname" != OpenBSD
-	and complete -c date -s n -d 'Set clock for local machine only' -f
+    test "$uname" != OpenBSD
+    and complete -c date -s n -d 'Set clock for local machine only' -f
 
-	switch $uname
-		case FreeBSD Darwin DragonFly
-			# only -u is actually POSIX. Rest are BSD extensions:
-			complete -c date -s r -d "Show file mtime, or format seconds" -r
-			complete -c date -s v -d 'Adjust clock +/- by time specified' -f
-		case NetBSD OpenBSD
-			complete -c date -s a -d "Change clock slowly with adjtime" -x
-			complete -c date -s r -d "Show date given seconds since epoch" -x
-			if test "$uname" = NetBSD
-				complete -c date -s d -d "Parse human-described date-time and show result" -x
-				exit
-			end
-			complete -c date -s z -d "Specify timezone for output" -x
-	end
-	
-	complete -c date -s t -d "Set system's minutes west of GMT" -x
-	complete -c date -s f -d 'Use format string to parse date' -f
+    switch $uname
+        case FreeBSD Darwin DragonFly
+            # only -u is actually POSIX. Rest are BSD extensions:
+            complete -c date -s r -d "Show file mtime, or format seconds" -r
+            complete -c date -s v -d 'Adjust clock +/- by time specified' -f
+        case NetBSD OpenBSD
+            complete -c date -s a -d "Change clock slowly with adjtime" -x
+            complete -c date -s r -d "Show date given seconds since epoch" -x
+            if test "$uname" = NetBSD
+                complete -c date -s d -d "Parse human-described date-time and show result" -x
+                exit
+            end
+            complete -c date -s z -d "Specify timezone for output" -x
+    end
+
+    complete -c date -s t -d "Set system's minutes west of GMT" -x
+    complete -c date -s f -d 'Use format string to parse date' -f
 end
 
diff --git a/share/completions/df.fish b/share/completions/df.fish
index 5809ae91d..833e87e21 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -18,21 +18,21 @@ __fish_gnu_complete -c df -s t -l type -r -d "Show file systems of specified typ
 
 if test -n "$is_gnu"
 
-        complete -c df -s a -l all -d "Include empty file systems"
-	complete -c df -s B -l block-size -r -d "Block size"
-	complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
-	complete -c df -l no-sync -d "Do not sync before getting usage info"
-	complete -c df -l sync -d "Sync before getting usage info"
-        complete -c df -s T -l print-type -d "Print file system type"
-        complete -c df -s x -l exclude-type -d "Excluded file system type" -r -x -a "(__fish_print_filesystems)"
-	complete -c df -l help -d "Display help and exit"
-	complete -c df -l version -d "Display version and exit"
+    complete -c df -s a -l all -d "Include empty file systems"
+    complete -c df -s B -l block-size -r -d "Block size"
+    complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
+    complete -c df -l no-sync -d "Do not sync before getting usage info"
+    complete -c df -l sync -d "Sync before getting usage info"
+    complete -c df -s T -l print-type -d "Print file system type"
+    complete -c df -s x -l exclude-type -d "Excluded file system type" -r -x -a "(__fish_print_filesystems)"
+    complete -c df -l help -d "Display help and exit"
+    complete -c df -l version -d "Display version and exit"
 
 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 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"
 
 end
diff --git a/share/completions/diskutil.fish b/share/completions/diskutil.fish
index a75b622d1..ca9265a8e 100644
--- a/share/completions/diskutil.fish
+++ b/share/completions/diskutil.fish
@@ -5,11 +5,13 @@
 #############
 
 function __fish_diskutil_devices
-    set -l mountpoints /dev/disk*; printf '%s\n' $mountpoints
+    set -l mountpoints /dev/disk*
+    printf '%s\n' $mountpoints
 end
 
 function __fish_diskutil_mounted_volumes
-    set -l mountpoints /Volumes/*; printf '%s\n' $mountpoints
+    set -l mountpoints /Volumes/*
+    printf '%s\n' $mountpoints
 end
 
 function __fish_diskutil_using_not_subcommand
diff --git a/share/completions/display.fish b/share/completions/display.fish
index b0750bd0d..8a764dd2b 100644
--- a/share/completions/display.fish
+++ b/share/completions/display.fish
@@ -1,97 +1,97 @@
-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 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)'
-complete -c display -o colormap                     -d 'Shared or Private [type]' -x
-complete -c display -o colorspace                   -d 'Alternate image colorspace [type]' -xa '(display -list colorspace)'
-complete -c display -o comment                      -d 'Annotate image with comment [string]'
-complete -c display -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(display -list compress)'
-complete -c display -o define                       -d 'Define one or more image format options [format:option]'
-complete -c display -o delay                        -d 'Display the next image after pausing [value]'
-complete -c display -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c display -o depth                        -d 'Image depth [value]'
-complete -c display -o display                      -d 'Display image to this X server [server]'
-complete -c display -o dispose                      -d 'Layer disposal method [method]' -xa '(display -list dispose)'
-complete -c display -o dither                       -d 'Apply error diffusion to image [method]' -xa '(display -list dither)'
-complete -c display -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(display -list endian)'
-complete -c display -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(display -list filter)'
-complete -c display -o format                       -d 'Output formatted image characteristics [string]'
-complete -c display -o geometry                     -d 'Preferred size and location of the Image window [geometry]'
-complete -c display -o gravity                      -d 'Horizontal and vertical backdrop placement [type]' -xa '(display -list gravity)'
-complete -c display -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c display -o immutable                    -d 'Displayed image cannot be modified'
-complete -c display -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(display -list interlace)'
-complete -c display -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(display -list interpolate)'
-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 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]'
-complete -c display -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(display -list colorspace)'
-complete -c display -o quiet                        -d 'Suppress all warning messages'
-complete -c display -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c display -o remote                       -d 'Command execute a command in an remote display process'
-complete -c display -o repage                       -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c display -o respect-parentheses          -d 'Settings remain in effect until parenthesis boundary'
-complete -c display -o sampling-factor              -d 'Horizontal and vertical sampling factor [geometry]'
-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 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'
-complete -c display -o verbose                      -d 'Print detailed information about the image'
-complete -c display -o visual                       -d 'Display image using this visual type [type]' -x
-complete -c display -o virtual-pixel                -d 'Virtual pixel access method [method]' -xa '(display -list virtual-pixel)'
-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 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]'
-complete -c display -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c display -o contrast                     -d 'Enhance or reduce the image contrast'
-complete -c display -o crop                         -d 'Preferred size and location of the cropped image [geometry]'
-complete -c display -o decipher                     -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c display -o deskew                       -d 'Straighten an image [threshold]'
-complete -c display -o despeckle                    -d 'Reduce the speckles within an image'
-complete -c display -o edge                         -d 'Apply a filter to detect edges in the image [factor]'
-complete -c display -o enhance                      -d 'Apply a digital filter to enhance a noisy image'
-complete -c display -o equalize                     -d 'Perform histogram equalization to an image'
-complete -c display -o extract                      -d 'Extract area from image [geometry]'
-complete -c display -o flip                         -d 'Flip image in the vertical direction'
-complete -c display -o flop                         -d 'Flop image in the horizontal direction'
-complete -c display -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c display -o fuzz                         -d 'Colors within this distance are considered equal [distance]'
-complete -c display -o gamma                        -d 'Level of gamma correction [value]'
-complete -c display -o monochrome                   -d 'Transform image to black and white'
-complete -c display -o negate                       -d 'Replace every pixel with its complementary color'
-complete -c display -o normalize                    -d 'Transform image to span the full range of colors'
-complete -c display -o raise                        -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c display -o resample                     -d 'Change the resolution of an image [geometry]'
-complete -c display -o resize                       -d 'Resize the image [geometry]'
-complete -c display -o roll                         -d 'Roll an image vertically or horizontally [geometry]'
-complete -c display -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c display -o sample                       -d 'Scale image with pixel sampling [geometry]'
-complete -c display -o segment                      -d 'Segment an image [value]'
-complete -c display -o sharpen                      -d 'Sharpen the image [geometry]'
-complete -c display -o strip                        -d 'Strip image of all profiles and comments'
-complete -c display -o threshold                    -d 'Threshold the image [value]'
-complete -c display -o thumbnail                    -d 'Create a thumbnail of the image [geometry]'
-complete -c display -o trim                         -d 'Trim image edges'
-complete -c display -o coalesce                     -d 'Merge a sequence of images'
-complete -c display -o flatten                      -d 'Flatten a sequence of images'
-complete -c display -o debug                        -d 'Display copious debugging information [events]' -xa '(display -list debug)'
-complete -c display -o help                         -d 'Print program options'
-complete -c display -o list                         -d 'Print a list of supported option arguments [type]' -xa '(display -list list)'
-complete -c display -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c display -o version                      -d 'Print version information'
-complete -c display -o matte                        -d 'Store matte channel if the image has one'
-complete -c display -o scenes                       -d 'Range image scene range'
-complete -c display -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+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 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)'
+complete -c display -o colormap -d 'Shared or Private [type]' -x
+complete -c display -o colorspace -d 'Alternate image colorspace [type]' -xa '(display -list colorspace)'
+complete -c display -o comment -d 'Annotate image with comment [string]'
+complete -c display -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(display -list compress)'
+complete -c display -o define -d 'Define one or more image format options [format:option]'
+complete -c display -o delay -d 'Display the next image after pausing [value]'
+complete -c display -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c display -o depth -d 'Image depth [value]'
+complete -c display -o display -d 'Display image to this X server [server]'
+complete -c display -o dispose -d 'Layer disposal method [method]' -xa '(display -list dispose)'
+complete -c display -o dither -d 'Apply error diffusion to image [method]' -xa '(display -list dither)'
+complete -c display -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(display -list endian)'
+complete -c display -o filter -d 'Use this filter when resizing an image [type]' -xa '(display -list filter)'
+complete -c display -o format -d 'Output formatted image characteristics [string]'
+complete -c display -o geometry -d 'Preferred size and location of the Image window [geometry]'
+complete -c display -o gravity -d 'Horizontal and vertical backdrop placement [type]' -xa '(display -list gravity)'
+complete -c display -o identify -d 'Identify the format and characteristics of the image'
+complete -c display -o immutable -d 'Displayed image cannot be modified'
+complete -c display -o interlace -d 'Type of image interlacing scheme [type]' -xa '(display -list interlace)'
+complete -c display -o interpolate -d 'Pixel color interpolation method [method]' -xa '(display -list interpolate)'
+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 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]'
+complete -c display -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(display -list colorspace)'
+complete -c display -o quiet -d 'Suppress all warning messages'
+complete -c display -o regard-warnings -d 'Pay attention to warning messages'
+complete -c display -o remote -d 'Command execute a command in an remote display process'
+complete -c display -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c display -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c display -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+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 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'
+complete -c display -o verbose -d 'Print detailed information about the image'
+complete -c display -o visual -d 'Display image using this visual type [type]' -x
+complete -c display -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(display -list virtual-pixel)'
+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 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]'
+complete -c display -o colors -d 'Preferred number of colors in the image [value]'
+complete -c display -o contrast -d 'Enhance or reduce the image contrast'
+complete -c display -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c display -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c display -o deskew -d 'Straighten an image [threshold]'
+complete -c display -o despeckle -d 'Reduce the speckles within an image'
+complete -c display -o edge -d 'Apply a filter to detect edges in the image [factor]'
+complete -c display -o enhance -d 'Apply a digital filter to enhance a noisy image'
+complete -c display -o equalize -d 'Perform histogram equalization to an image'
+complete -c display -o extract -d 'Extract area from image [geometry]'
+complete -c display -o flip -d 'Flip image in the vertical direction'
+complete -c display -o flop -d 'Flop image in the horizontal direction'
+complete -c display -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c display -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c display -o gamma -d 'Level of gamma correction [value]'
+complete -c display -o monochrome -d 'Transform image to black and white'
+complete -c display -o negate -d 'Replace every pixel with its complementary color'
+complete -c display -o normalize -d 'Transform image to span the full range of colors'
+complete -c display -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c display -o resample -d 'Change the resolution of an image [geometry]'
+complete -c display -o resize -d 'Resize the image [geometry]'
+complete -c display -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c display -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c display -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c display -o segment -d 'Segment an image [value]'
+complete -c display -o sharpen -d 'Sharpen the image [geometry]'
+complete -c display -o strip -d 'Strip image of all profiles and comments'
+complete -c display -o threshold -d 'Threshold the image [value]'
+complete -c display -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c display -o trim -d 'Trim image edges'
+complete -c display -o coalesce -d 'Merge a sequence of images'
+complete -c display -o flatten -d 'Flatten a sequence of images'
+complete -c display -o debug -d 'Display copious debugging information [events]' -xa '(display -list debug)'
+complete -c display -o help -d 'Print program options'
+complete -c display -o list -d 'Print a list of supported option arguments [type]' -xa '(display -list list)'
+complete -c display -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c display -o version -d 'Print version information'
+complete -c display -o matte -d 'Store matte channel if the image has one'
+complete -c display -o scenes -d 'Range image scene range'
+complete -c display -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/dlocate.fish b/share/completions/dlocate.fish
index 7289bf971..035f67939 100644
--- a/share/completions/dlocate.fish
+++ b/share/completions/dlocate.fish
@@ -1,6 +1,6 @@
 
-complete -c dlocate -s S -x -d  'List records that match filenames'
-complete -c dlocate -s L  -d  'List all files in the package' -xa '(__fish_print_packages)'
+complete -c dlocate -s S -x -d 'List records that match filenames'
+complete -c dlocate -s L -d 'List all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o ls -d 'ls -ldF all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o du -d 'du -sck all files in the package' -xa '(__fish_print_packages)'
 
diff --git a/share/completions/dmesg.fish b/share/completions/dmesg.fish
index aa71bbdc8..9e111507d 100644
--- a/share/completions/dmesg.fish
+++ b/share/completions/dmesg.fish
@@ -1,51 +1,51 @@
 complete -c dmesg -f -d 'Display system message buffer'
 
 switch (uname -s)
-	#
-	# Solaris
-	#
-	case SunOS
-		exit 1 # no options, we are done
-	#
-	# Loonix dmesg
-	#
-	case Linux
-		set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
-		complete -c dmesg -s C -l clear               -f -d'Clear kernel ring buffer'
-		complete -c dmesg -s c -l read-clear          -f -d'Read & clear all msgs'
-		complete -c dmesg -s D -l console-off         -f -d'Disable writing to console'
-		complete -c dmesg -s d -l show-delta          -f -d'Show timestamp deltas'
-		complete -c dmesg -s E -l console-on          -f -d'Enable writing to console'
-		complete -c dmesg -s F -l file             -r    -d'Use file instead of log buffer'
-		complete -c dmesg -s f -l facility      -x       -d'Only print for given facilities' -a '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
-		complete -c dmesg -s h -l help                -f -d'Display help'
-		complete -c dmesg -s k -l kernel              -f -d'Print kernel messages'
-		complete -c dmesg -s l -l level         -x       -d'Restrict output to given levels' -a $levels
-		complete -c dmesg -s n -l console-level -x       -d'Adjust threshold to print to console' -a $levels
-		complete -c dmesg -s r -l raw                 -f -d'Print raw message buffer'
-		complete -c dmesg -s s -l buffer-size   -x       -d'Buffer size to query kernel'
-		complete -c dmesg -s T -l ctime               -f -d'Human-readable timestamps'
-		complete -c dmesg -s t -l notime              -f -d'Don\'t print timestamps'
-		complete -c dmesg -s u -l userspace           -f -d'Print userspace messages'
-		complete -c dmesg -s V -l version             -f -d'Show dmesg version'
-		complete -c dmesg -s x -l decode              -f -d'Decode facility & level numbers'
-		exit 0 # done
-	#
-	# unique options specific BSDs have
-	#
-	case NetBSD
-		complete -c dmesg -s d                        -f -d'show timestamp deltas'
-		complete -c dmesg -s T                        -f -d'human-readable timestamps'
-		complete -c dmesg -s t                        -f -d'don\'t print timestamps'
-	case OpenBSD
-		complete -c dmesg -s S                        -f -d'display console message buffer-size'
-	case FreeBSD DragonFly
-		complete -c dmesg -s a                        -f -d'print all data in the message buffer'
-		complete -c dmesg -s c                        -f -d'clear kernel buffer after printing'
+    #
+    # Solaris
+    #
+    case SunOS
+        exit 1 # no options, we are done
+        #
+        # Loonix dmesg
+        #
+    case Linux
+        set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
+        complete -c dmesg -s C -l clear -f -d'Clear kernel ring buffer'
+        complete -c dmesg -s c -l read-clear -f -d'Read & clear all msgs'
+        complete -c dmesg -s D -l console-off -f -d'Disable writing to console'
+        complete -c dmesg -s d -l show-delta -f -d'Show timestamp deltas'
+        complete -c dmesg -s E -l console-on -f -d'Enable writing to console'
+        complete -c dmesg -s F -l file -r -d'Use file instead of log buffer'
+        complete -c dmesg -s f -l facility -x -d'Only print for given facilities' -a '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
+        complete -c dmesg -s h -l help -f -d'Display help'
+        complete -c dmesg -s k -l kernel -f -d'Print kernel messages'
+        complete -c dmesg -s l -l level -x -d'Restrict output to given levels' -a $levels
+        complete -c dmesg -s n -l console-level -x -d'Adjust threshold to print to console' -a $levels
+        complete -c dmesg -s r -l raw -f -d'Print raw message buffer'
+        complete -c dmesg -s s -l buffer-size -x -d'Buffer size to query kernel'
+        complete -c dmesg -s T -l ctime -f -d'Human-readable timestamps'
+        complete -c dmesg -s t -l notime -f -d'Don\'t print timestamps'
+        complete -c dmesg -s u -l userspace -f -d'Print userspace messages'
+        complete -c dmesg -s V -l version -f -d'Show dmesg version'
+        complete -c dmesg -s x -l decode -f -d'Decode facility & level numbers'
+        exit 0 # done
+        #
+        # unique options specific BSDs have
+        #
+    case NetBSD
+        complete -c dmesg -s d -f -d'show timestamp deltas'
+        complete -c dmesg -s T -f -d'human-readable timestamps'
+        complete -c dmesg -s t -f -d'don\'t print timestamps'
+    case OpenBSD
+        complete -c dmesg -s S -f -d'display console message buffer-size'
+    case FreeBSD DragonFly
+        complete -c dmesg -s a -f -d'print all data in the message buffer'
+        complete -c dmesg -s c -f -d'clear kernel buffer after printing'
 end
 
 #
 # common BSD dmesg options (macOS only does these two)
 #
-complete 		 -c dmesg -s M                      -r   -d'get namelist values from given core'
-complete 		 -c dmesg -s N                      -r   -d'get namelist from given kernel'
+complete -c dmesg -s M -r -d'get namelist values from given core'
+complete -c dmesg -s N -r -d'get namelist from given kernel'
diff --git a/share/completions/dpkg-reconfigure.fish b/share/completions/dpkg-reconfigure.fish
index 8b1459bf5..2ddbdb6ab 100644
--- a/share/completions/dpkg-reconfigure.fish
+++ b/share/completions/dpkg-reconfigure.fish
@@ -3,7 +3,7 @@
 complete -f -c dpkg-reconfigure -a '(__fish_print_packages)' -d 'Package'
 
 # Support flags
-complete -x -f -c dpkg-reconfigure -s h -l help     -d 'Display help'
+complete -x -f -c dpkg-reconfigure -s h -l help -d 'Display help'
 
 # General options
 complete -f -c dpkg-reconfigure -s f -l frontend -r -a "dialog readline noninteractive gnome kde editor web" -d 'Set configuration frontend'
diff --git a/share/completions/dpkg.fish b/share/completions/dpkg.fish
index d60b6dbad..857085d21 100644
--- a/share/completions/dpkg.fish
+++ b/share/completions/dpkg.fish
@@ -1,19 +1,19 @@
 
-complete -c dpkg -s i -l install -d 'Install .deb package'     -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg      -l unpack  -d 'Unpack .deb package'      -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg      -l configure -d 'Configure package'      -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s r -l remove  -d 'Remove package'           -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s P -l purge   -d 'Purge package'            -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s V -l verify  -d 'Verify contents of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -l force-all    -d 'Continue on all problems'
+complete -c dpkg -s i -l install -d 'Install .deb package' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -l unpack -d 'Unpack .deb package' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -l configure -d 'Configure package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s r -l remove -d 'Remove package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s P -l purge -d 'Purge package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s V -l verify -d 'Verify contents of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -l force-all -d 'Continue on all problems'
 
 # dpkg-deb options
-complete -c dpkg -s b -l build    -d 'Build package from directory' -xa '(__fish_complete_directories (commandline -ct))'
-complete -c dpkg -s c -l contents -d 'List contents of .deb'        -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg -s I -l info     -d 'Show .deb information'        -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -s b -l build -d 'Build package from directory' -xa '(__fish_complete_directories (commandline -ct))'
+complete -c dpkg -s c -l contents -d 'List contents of .deb' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -s I -l info -d 'Show .deb information' -xa '(__fish_complete_suffix .deb)'
 
 # dpkg-query options
-complete -c dpkg -s l -l list      -d 'List packages matching pattern' -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s L -l listfiles -d 'List contents of packages'      -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s s -l status    -d 'Print status of package'        -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s S -l search    -d 'Search for packages containing file'
+complete -c dpkg -s l -l list -d 'List packages matching pattern' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s L -l listfiles -d 'List contents of packages' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s s -l status -d 'Print status of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s S -l search -d 'Search for packages containing file'
diff --git a/share/completions/duply.fish b/share/completions/duply.fish
index 22eb046fc..c4884395a 100644
--- a/share/completions/duply.fish
+++ b/share/completions/duply.fish
@@ -4,24 +4,24 @@ complete --command duply --no-files --condition '__fish_is_first_token' --argume
 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_first_token' --arguments 'create'     -d 'Creates a configuration profile'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'backup'     -d 'Backup with pre/post script execution'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'bkp'        -d 'Backup without executing pre/post scripts'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'pre'        -d 'Execute <profile>/pre script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'post'       -d 'Execute <profile>/post script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'full'       -d 'Force full backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'incr'       -d 'Force incremental backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'list'       -d 'List all files in backup (as it was at <age>, default: now)'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'status'     -d 'Prints backup sets and chains currently in repository'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'verify'     -d 'List files changed since latest backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge'      -d 'Shows outdated backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'create' -d 'Creates a configuration profile'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'backup' -d 'Backup with pre/post script execution'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'bkp' -d 'Backup without executing pre/post scripts'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'pre' -d 'Execute <profile>/pre script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'post' -d 'Execute <profile>/post script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'full' -d 'Force full backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'incr' -d 'Force incremental backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'list' -d 'List all files in backup (as it was at <age>, default: now)'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'status' -d 'Prints backup sets and chains currently in repository'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'verify' -d 'List files changed since latest backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge' -d 'Shows outdated backup archives [--force, delete these files]'
 complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge-full' -d 'Shows outdated backups [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'cleanup'    -d 'Shows broken backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'restore'    -d 'Restore the backup to <target_path> [as it was at <age>]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'fetch'      -d 'Restore single file/folder from backup [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'cleanup' -d 'Shows broken backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'restore' -d 'Restore the backup to <target_path> [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --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'
+complete --command duply --no-files --long-option force -d 'Really execute the commands: purge, purge-full, cleanup'
 complete --command duply --no-files --long-option preview -d 'Do nothing but print out generated duplicity command lines'
 complete --command duply --no-files --long-option dry-run -d 'Calculate what would be done, but don''t perform any actions'
 complete --command duply --no-files --long-option allow-source-mismatch -d 'Don''t abort when backup different dirs to the same backend'
diff --git a/share/completions/ebuild.fish b/share/completions/ebuild.fish
index dd19665e7..b95f6b2fe 100644
--- a/share/completions/ebuild.fish
+++ b/share/completions/ebuild.fish
@@ -1,36 +1,36 @@
 function __fish_seen_ebuild_arg -d "Test if an ebuild-argument has been given in the current commandline"
-	commandline -opc | string match -q '*.ebuild'
+    commandline -opc | string match -q '*.ebuild'
 end
 
 ## Opts
-complete -c ebuild -l debug             -d "Run bash with the -x option"
-complete -c ebuild -l color             -d "Enable color" \
-	-xa "y n"
-complete -c ebuild -l force             -d "Force regeneration of digests"
+complete -c ebuild -l debug -d "Run bash with the -x option"
+complete -c ebuild -l color -d "Enable color" \
+    -xa "y n"
+complete -c ebuild -l force -d "Force regeneration of digests"
 complete -c ebuild -l ignore-default-opts -d "Ignore EBUILD_DEFAULT_OPTS"
-complete -c ebuild -l skip-manifest	-d "Skip all manifest checks"
+complete -c ebuild -l skip-manifest -d "Skip all manifest checks"
 
 ## Subcommands
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help'        -d "Show help"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend'     -d "Run pkg_pretend()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup'       -d "Run setup and system checks"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean'       -d "Clean build dir"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch'       -d "Fetches all files from SRC_URI"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help' -d "Show help"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend' -d "Run pkg_pretend()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup' -d "Run setup and system checks"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean' -d "Clean build dir"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch' -d "Fetches all files from SRC_URI"
 #complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'digest'      -d "Deprecared: see manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'manifest'    -d "Update pkg manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unpack'      -d "Extracts sources"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prepare'     -d "Run src_prepare()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'configure'   -d "Run src_configure()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'compile'     -d "Run src_compile()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'test'        -d "Run tests"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'preinst'     -d "Run pkg_preinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'install'     -d "Run src_install()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postinst'    -d "Run pkg_postinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'qmerge'      -d "Install files to live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'merge'       -d "Run fetch, unpack, compile, install and qmerge"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unmerge'     -d "Uninstall files from live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prerm'       -d "Run pkg_prerm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postrm'      -d "Run pkg_postrm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'config'      -d "Run post-install configuration"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'package'     -d "Create a binpkg in PKGDIR"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'rpm'         -d "Builds a RedHat RPM pkg"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'manifest' -d "Update pkg manifest"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unpack' -d "Extracts sources"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prepare' -d "Run src_prepare()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'configure' -d "Run src_configure()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'compile' -d "Run src_compile()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'test' -d "Run tests"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'preinst' -d "Run pkg_preinst()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'install' -d "Run src_install()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postinst' -d "Run pkg_postinst()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'qmerge' -d "Install files to live filesystem"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'merge' -d "Run fetch, unpack, compile, install and qmerge"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unmerge' -d "Uninstall files from live filesystem"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prerm' -d "Run pkg_prerm()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postrm' -d "Run pkg_postrm()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'config' -d "Run post-install configuration"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'package' -d "Create a binpkg in PKGDIR"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'rpm' -d "Builds a RedHat RPM pkg"
diff --git a/share/completions/eix.fish b/share/completions/eix.fish
index a18e53b65..3910902b2 100644
--- a/share/completions/eix.fish
+++ b/share/completions/eix.fish
@@ -43,7 +43,7 @@ complete -c eix -s 2 -l slots -d "Match packages with two different slots"
 complete -c eix -s u -l update -d "Match packages without best slotted version"
 complete -c eix -s o -l overlay -d "Match packages from overlays"
 complete -c eix -s T -l test-obsolete -d "Match packages with obsolete entries"
-complete -c eix -s '!' -l not -d "Invert the expression (toggle)"
+complete -c eix -s ! -l not -d "Invert the expression (toggle)"
 complete -c eix -s '|' -l pipe -d "Use input from pipe of emerge -pv"
 ###
 # Search Fields
diff --git a/share/completions/elixir.fish b/share/completions/elixir.fish
index f59045860..eedec7175 100644
--- a/share/completions/elixir.fish
+++ b/share/completions/elixir.fish
@@ -1,15 +1,15 @@
-complete -f -c elixir -s v        -d "Prints version and exit"
-complete -f -c elixir -s e        -d "Evaluates the given command"
-complete    -c elixir -s r        -d "Requires the given files/patterns"
-complete    -c elixir -s S        -d "Finds and executes the given script"
-complete    -c elixir -s pr       -d "Requires the given files/patterns in parallel"
-complete    -c elixir -s pa       -d "Prepends the given path to Erlang code path"
-complete    -c elixir -s pz       -d "Appends the given path to Erlang code path"
-complete    -c elixir -l app      -d "Start the given app and its dependencies"
-complete -f -c elixir -l erl      -d "Switches to be passed down to erlang"
-complete -f -c elixir -l name     -d "Makes and assigns a name to the distributed node"
-complete -f -c elixir -l sname    -d "Makes and assigns a short name to the distributed node"
-complete -f -c elixir -l cookie   -d "Sets a cookie for this distributed node"
-complete -f -c elixir -l hidden   -d "Makes a hidden node"
+complete -f -c elixir -s v -d "Prints version and exit"
+complete -f -c elixir -s e -d "Evaluates the given command"
+complete -c elixir -s r -d "Requires the given files/patterns"
+complete -c elixir -s S -d "Finds and executes the given script"
+complete -c elixir -s pr -d "Requires the given files/patterns in parallel"
+complete -c elixir -s pa -d "Prepends the given path to Erlang code path"
+complete -c elixir -s pz -d "Appends the given path to Erlang code path"
+complete -c elixir -l app -d "Start the given app and its dependencies"
+complete -f -c elixir -l erl -d "Switches to be passed down to erlang"
+complete -f -c elixir -l name -d "Makes and assigns a name to the distributed node"
+complete -f -c elixir -l sname -d "Makes and assigns a short name to the distributed node"
+complete -f -c elixir -l cookie -d "Sets a cookie for this distributed node"
+complete -f -c elixir -l hidden -d "Makes a hidden node"
 complete -f -c elixir -l detached -d "Starts the Erlang VM detached from console"
-complete -f -c elixir -l no-halt  -d "Does not halt the Erlang VM after execution"
+complete -f -c elixir -l no-halt -d "Does not halt the Erlang VM after execution"
diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index 8aecefc91..547fe0a48 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -1,32 +1,32 @@
 ## Global Opts
-complete -c emaint -s h -l help         -d "Show this help message and exit"
-complete -c emaint -s c -l check        -d "Check for problems"
-complete -c emaint      -l version      -d "Show program's version number and exit"
-complete -c emaint -s f -l fix          -d "Attempt to fix problems"
-complete -c emaint -s P -l purge        -d "Remove the list of failed merges"
+complete -c emaint -s h -l help -d "Show this help message and exit"
+complete -c emaint -s c -l check -d "Check for problems"
+complete -c emaint -l version -d "Show program's version number and exit"
+complete -c emaint -s f -l fix -d "Attempt to fix problems"
+complete -c emaint -s P -l purge -d "Remove the list of failed merges"
 
 ## Subcommands
-complete -c emaint -n '__fish_use_subcommand' -xa 'all'         -d 'Perform all supported commands'
-complete -c emaint -n '__fish_use_subcommand' -xa 'binhost'     -d 'Scan and generate metadata indexes for binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'all' -d 'Perform all supported commands'
+complete -c emaint -n '__fish_use_subcommand' -xa 'binhost' -d 'Scan and generate metadata indexes for binary pkgs'
 complete -c emaint -n '__fish_use_subcommand' -xa 'cleanconfmem' -d 'Check and clean the config tracker list for uninstalled pkgs'
 complete -c emaint -n '__fish_use_subcommand' -xa 'cleanresume' -d 'Discard emerge --resume merge lists'
-complete -c emaint -n '__fish_use_subcommand' -xa 'logs'        -d 'Check and clean old logs in the PORT_LOGDIR'
-complete -c emaint -n '__fish_use_subcommand' -xa 'merges'      -d 'Scan for failed merges and fix them'
-complete -c emaint -n '__fish_use_subcommand' -xa 'movebin'     -d 'Perform pkg move updates for binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'moveinst'    -d 'Perform pkg move updates for installed and binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'sync'        -d 'Check repos.conf settings and sync repositories'
-complete -c emaint -n '__fish_use_subcommand' -xa 'world'       -d 'Check and fix problems in the world file'
+complete -c emaint -n '__fish_use_subcommand' -xa 'logs' -d 'Check and clean old logs in the PORT_LOGDIR'
+complete -c emaint -n '__fish_use_subcommand' -xa 'merges' -d 'Scan for failed merges and fix them'
+complete -c emaint -n '__fish_use_subcommand' -xa 'movebin' -d 'Perform pkg move updates for binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'moveinst' -d 'Perform pkg move updates for installed and binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'sync' -d 'Check repos.conf settings and sync repositories'
+complete -c emaint -n '__fish_use_subcommand' -xa 'world' -d 'Check and fix problems in the world file'
 
 ## Local opts
 # logs
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time      -d "Delete logs older than NUM days" \
-	-xa "(seq 0 365)"
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend   -d "Output logs that would be deleted"
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean     -d "Cleans out logs more than 7 days old"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time -d "Delete logs older than NUM days" \
+    -xa "(seq 0 365)"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend -d "Output logs that would be deleted"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean -d "Cleans out logs more than 7 days old"
 # sync
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s a -l auto          	-d "Sync auto-sync enabled repos only"
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s A -l allrepos      	-d "Sync all repos that have a sync-url defined"
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s r -l repo          	-d "Sync the specified repo" \
-	-xa "(__fish_portage_print_repository_names)"
-complete -c emaint -n '__fish_seen_subcommand_from sync'      -l sync-submodule -d "Restrict sync to the specified submodule(s)" \
-	-xa "glsa news profiles"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s a -l auto -d "Sync auto-sync enabled repos only"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s A -l allrepos -d "Sync all repos that have a sync-url defined"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s r -l repo -d "Sync the specified repo" \
+    -xa "(__fish_portage_print_repository_names)"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -l sync-submodule -d "Restrict sync to the specified submodule(s)" \
+    -xa "glsa news profiles"
diff --git a/share/completions/emerge.fish b/share/completions/emerge.fish
index 182654654..e02dca4f0 100644
--- a/share/completions/emerge.fish
+++ b/share/completions/emerge.fish
@@ -13,40 +13,40 @@
 #end
 
 function __fish_emerge_print_sets
-	for s in '@'(emerge --list-sets)
-		switch $s
-		case @profile
-			printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
-		case @selected-packages
-			printf '%s\t%s\n' $s 'packages listed in /var/lib/portage/world'
-		case @selected-sets
-			printf '%s\t%s\n' $s 'sets listed in /var/lib/portage/world_sets'
-		case @selected
-			printf '%s\t%s\n' $s 'encompasses both the selected-packages and selected-sets sets'
-		case @system
-			printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
-		case @world
-			printf '%s\t%s\n' $s 'encompasses the selected, system and profile sets'
-		case '*'
-			echo $s
-		end
-	end
+    for s in '@'(emerge --list-sets)
+        switch $s
+            case @profile
+                printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
+            case @selected-packages
+                printf '%s\t%s\n' $s 'packages listed in /var/lib/portage/world'
+            case @selected-sets
+                printf '%s\t%s\n' $s 'sets listed in /var/lib/portage/world_sets'
+            case @selected
+                printf '%s\t%s\n' $s 'encompasses both the selected-packages and selected-sets sets'
+            case @system
+                printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
+            case @world
+                printf '%s\t%s\n' $s 'encompasses the selected, system and profile sets'
+            case '*'
+                echo $s
+        end
+    end
 end
 
 # TODO <ebuild|tbz2file|file|@set|atom>...
 function __fish_emerge_possible_args
-	if __fish_contains_opt check-news -s h help list-sets metadata regen -s r resume \
-			-s s search -s S searchdesc sync -s V version
-		return
-	# TODO deselect=y
-	else if __fish_contains_opt config -s c depclean info -s P prune -s C unmerge
-		__fish_emerge_print_sets
-		__fish_portage_print_installed_pkgs
-	# TODO deselect=n
-	else
-		__fish_emerge_print_sets
-		__fish_portage_print_available_pkgs
-	end
+    if __fish_contains_opt check-news -s h help list-sets metadata regen -s r resume \
+            -s s search -s S searchdesc sync -s V version
+        return
+        # TODO deselect=y
+    else if __fish_contains_opt config -s c depclean info -s P prune -s C unmerge
+        __fish_emerge_print_sets
+        __fish_portage_print_installed_pkgs
+        # TODO deselect=n
+    else
+        __fish_emerge_print_sets
+        __fish_portage_print_available_pkgs
+    end
 end
 
 complete -c emerge -xa "(__fish_emerge_possible_args)"
@@ -54,30 +54,30 @@ complete -c emerge -xa "(__fish_emerge_possible_args)"
 #########################
 # Actions               #
 #########################
-complete -c emerge      -l check-news
-complete -c emerge      -l clean
-complete -c emerge      -l config
+complete -c emerge -l check-news
+complete -c emerge -l clean
+complete -c emerge -l config
 complete -c emerge -s c -l depclean
-complete -c emerge      -l deselect
+complete -c emerge -l deselect
 complete -c emerge -s h -l help
-complete -c emerge      -l info
-complete -c emerge      -l list-sets
-complete -c emerge      -l metadata
+complete -c emerge -l info
+complete -c emerge -l list-sets
+complete -c emerge -l metadata
 complete -c emerge -s P -l prune
-complete -c emerge      -l regen
+complete -c emerge -l regen
 complete -c emerge -s r -l resume
 complete -c emerge -s s -l search
 complete -c emerge -s S -l searchdesc
-complete -c emerge      -l sync
+complete -c emerge -l sync
 complete -c emerge -s C -l unmerge
 complete -c emerge -s V -l version
 
 #########################
 # Options               #
 #########################
-complete -c emerge -s A -l alert        -d "Add a terminal bell character ('\a') to all interactive prompts"
+complete -c emerge -s A -l alert -d "Add a terminal bell character ('\a') to all interactive prompts"
 #complete -c emerge      -l alphabetical -d "Sort flag lists alphabetically"
-complete -c emerge -s a -l ask          -d "Prompt the user before peforming the merge"
+complete -c emerge -s a -l ask -d "Prompt the user before peforming the merge"
 # ask-enter-invalid
 # autounmask
 # autounmask-backtrack <yn>
@@ -87,58 +87,58 @@ complete -c emerge -s a -l ask          -d "Prompt the user before peforming the
 # autounmask-keep-keywords
 # autounmask-keep-masks
 # autounmask-write
-complete -c emerge      -l backtrack
-complete -c emerge -s b -l buildpkg     -d "Build a binary pkg additionally"
+complete -c emerge -l backtrack
+complete -c emerge -s b -l buildpkg -d "Build a binary pkg additionally"
 # buildpkg-exclude
 complete -c emerge -s B -l buildpkgonly -d "Only build a binary pkg"
 # changed-deps
 complete -c emerge -s U -l changed-use
-complete -c emerge -s l -l changelog    -d "Show changelog of pkg. Use with --pretend"
-complete -c emerge      -l color        -d "Colorized output" \
-	-xa "y n"
-complete -c emerge      -l columns      -d "Align output. Use with --pretend"
-complete -c emerge      -l complete-graph
+complete -c emerge -s l -l changelog -d "Show changelog of pkg. Use with --pretend"
+complete -c emerge -l color -d "Colorized output" \
+    -xa "y n"
+complete -c emerge -l columns -d "Align output. Use with --pretend"
+complete -c emerge -l complete-graph
 # complete-graph-if-new-use <yn>
 # complete-graph-if-new-ver <yn>
 # config-root DIR
-complete -c emerge -s d -l debug        -d "Run in debug mode"
-complete -c emerge -s D -l deep         -d "Consider the whole dependency tree"
+complete -c emerge -s d -l debug -d "Run in debug mode"
+complete -c emerge -s D -l deep -d "Consider the whole dependency tree"
 # depclean-lib-check
 # digest
 # dynamic-deps <yn>
-complete -c emerge -s e -l emptytree    -d "Reinstall all world pkgs"
+complete -c emerge -s e -l emptytree -d "Reinstall all world pkgs"
 # exclude ATOMS
-complete -c emerge      -l exclude
+complete -c emerge -l exclude
 # fail-clean
-complete -c emerge -s f -l fetchonly    -d "Only download the pkgs but don't install them"
-complete -c emerge -s F -l fetch-all-uri        -d "Same as --fetchonly and grab all potential files"
+complete -c emerge -s f -l fetchonly -d "Only download the pkgs but don't install them"
+complete -c emerge -s F -l fetch-all-uri -d "Same as --fetchonly and grab all potential files"
 # fuzzy-search
-complete -c emerge -s g -l getbinpkg    -d "Download infos from each binary pkg. Implies -k"
-complete -c emerge -s G -l getbinpkgonly        -d "As -g but don't use local infos"
-complete -c emerge      -l ignore-default-opts  -d "Ignore EMERGE_DEFAULT_OPTS"
+complete -c emerge -s g -l getbinpkg -d "Download infos from each binary pkg. Implies -k"
+complete -c emerge -s G -l getbinpkgonly -d "As -g but don't use local infos"
+complete -c emerge -l ignore-default-opts -d "Ignore EMERGE_DEFAULT_OPTS"
 # ignore-build-slot-operator-deps <yn>
 # ignore-soname-deps <yn>
-complete -c emerge      -l jobs
-complete -c emerge      -l keep-going
+complete -c emerge -l jobs
+complete -c emerge -l keep-going
 # load-average
 # misspell-suggestion
 # newrepo
-complete -c emerge -s N -l newuse       -d "Include installed pkgs with changed USE flags"
-complete -c emerge      -l noconfmem    -d "Disregard merge records"
-complete -c emerge -s O -l nodeps       -d "Don't merge dependencies"
-complete -c emerge -s n -l noreplace    -d "Skip already installed pkgs"
-complete -c emerge      -l nospinner    -d "Disable the spinner"
+complete -c emerge -s N -l newuse -d "Include installed pkgs with changed USE flags"
+complete -c emerge -l noconfmem -d "Disregard merge records"
+complete -c emerge -s O -l nodeps -d "Don't merge dependencies"
+complete -c emerge -s n -l noreplace -d "Skip already installed pkgs"
+complete -c emerge -l nospinner -d "Disable the spinner"
 # usepkg-exclude ATOMS
 # rebuild-exclude ATOMS
 # rebuild-ignore ATOMS
-complete -c emerge -s 1 -l oneshot      -d "Don't add pkgs to world"
-complete -c emerge -s o -l onlydeps     -d "Only merge dependencies"
+complete -c emerge -s 1 -l oneshot -d "Don't add pkgs to world"
+complete -c emerge -s o -l onlydeps -d "Only merge dependencies"
 # onlydeps-with-rdeps <yn>
 # package-moves
 # pkg-format
 # prefix DIR
-complete -c emerge -s p -l pretend      -d "Display what would be done without doing it"
-complete -c emerge -s q -l quiet        -d "Use a condensed output"
+complete -c emerge -s p -l pretend -d "Display what would be done without doing it"
+complete -c emerge -s q -l quiet -d "Use a condensed output"
 # quiet-build
 # quiet-fail
 # quiet-repo-display
@@ -158,19 +158,19 @@ complete -c emerge -s q -l quiet        -d "Use a condensed output"
 # search-similarity PERCENTAGE
 complete -c emerge -s w -l select
 # selective
-complete -c emerge      -l skipfirst    -d "Remove first pkg in resume list. Use with --resume"
+complete -c emerge -l skipfirst -d "Remove first pkg in resume list. Use with --resume"
 # sync-module <glsa|news|profiles>
-complete -c emerge -s t -l tree         -d "Show the dependency tree"
+complete -c emerge -s t -l tree -d "Show the dependency tree"
 # unordered-display
 complete -c emerge -s u -l update
 # use-ebuild-visibility
 # useoldpkg-atoms ATOMS
-complete -c emerge -s k -l usepkg       -d "Use binary pkg if available"
-complete -c emerge -s K -l usepkgonly   -d "Only use binary pkgs"
-complete -c emerge -s v -l verbose      -d "Run in verbose mode"
-complete -c emerge      -l verbose-conflicts -d "Verbose slot conflicts"
+complete -c emerge -s k -l usepkg -d "Use binary pkg if available"
+complete -c emerge -s K -l usepkgonly -d "Only use binary pkgs"
+complete -c emerge -s v -l verbose -d "Run in verbose mode"
+complete -c emerge -l verbose-conflicts -d "Verbose slot conflicts"
 # verbose-slot-rebuilds
-complete -c emerge      -l with-bdeps   -d "Pull in build time dependencies" \
-	-xa "y n"
+complete -c emerge -l with-bdeps -d "Pull in build time dependencies" \
+    -xa "y n"
 # with-bdeps-auto <yn>
 # with-test-bdeps
diff --git a/share/completions/entr.fish b/share/completions/entr.fish
index 88a672351..4d70b65a0 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 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 v -l version          -d 'Output version information'
-complete -c entr  -x -a '(__fish_complete_subcommand)'
+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 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 v -l version -d 'Output version information'
+complete -c entr -x -a '(__fish_complete_subcommand)'
diff --git a/share/completions/epkginfo.fish b/share/completions/epkginfo.fish
index 4d766c555..dfa0b596f 100644
--- a/share/completions/epkginfo.fish
+++ b/share/completions/epkginfo.fish
@@ -1,12 +1,12 @@
 complete -c epkginfo -xa "(__fish_portage_print_available_pkgs)"
 ## Opts
-complete -c epkginfo -s h -l help               -d "display help"
-complete -c epkginfo -s d -l description        -d "extended pkg description"
-complete -c epkginfo -s H -l herd               -d "herd(s) for the pkg"
-complete -c epkginfo -s k -l keywords           -d "keywords for all matching pkg versions"
-complete -c epkginfo -s l -l license            -d "licenses for the best maching version"
-complete -c epkginfo -s m -l maintainer         -d "maintainer(s) for the pkg"
-complete -c epkginfo -s S -l stablreq           -d "STABLEREQ arches (cc's) for all matching pkg versio"
-complete -c epkginfo -s u -l useflags           -d "per-pkg USE flag descriptions"
-complete -c epkginfo -s U -l upstream           -d "pkg's upstream information"
-complete -c epkginfo -s x -l xml                -d "plain metadata.xml file"
+complete -c epkginfo -s h -l help -d "display help"
+complete -c epkginfo -s d -l description -d "extended pkg description"
+complete -c epkginfo -s H -l herd -d "herd(s) for the pkg"
+complete -c epkginfo -s k -l keywords -d "keywords for all matching pkg versions"
+complete -c epkginfo -s l -l license -d "licenses for the best maching version"
+complete -c epkginfo -s m -l maintainer -d "maintainer(s) for the pkg"
+complete -c epkginfo -s S -l stablreq -d "STABLEREQ arches (cc's) for all matching pkg versio"
+complete -c epkginfo -s u -l useflags -d "per-pkg USE flag descriptions"
+complete -c epkginfo -s U -l upstream -d "pkg's upstream information"
+complete -c epkginfo -s x -l xml -d "plain metadata.xml file"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index bbedc0ce6..4c2878c36 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -1,134 +1,134 @@
 # TODO unused
 function __fish_equery_print_format
-	printf "%s\t%s\n" \
-		'$cp'           "Category and package name (e.g 'app-portage/gentoolkit')" \
-		'$cpv'          "Category, package name and version (e.g. 'app-portage/gentoolkit-0.3.0_rc10-r1')" \
-		'$category'     "Category (e.g. 'app-portage')" \
-		'$name'         "Package name (e.g. 'gentoolkit')" \
-		'$version'      "Version (without the revision) (e.g. '0.3.0_rc10')" \
-		'$revision'     "Revision (e.g. 'r1')" \
-		'$fullversion'  "Version including revision (e.g. '0.3.0_rc10-r1')" \
-		'$slot'         "Slot" \
-		'$repo'         "Repository (e.g. 'gentoo')" \
-		'$mask'         "Mask-status field (~M-??)" \
-		'$mask2'        "Verbose description of the masking status" \
-		'$location'     "Location field (IPO-)"
+    printf "%s\t%s\n" \
+        '$cp' "Category and package name (e.g 'app-portage/gentoolkit')" \
+        '$cpv' "Category, package name and version (e.g. 'app-portage/gentoolkit-0.3.0_rc10-r1')" \
+        '$category' "Category (e.g. 'app-portage')" \
+        '$name' "Package name (e.g. 'gentoolkit')" \
+        '$version' "Version (without the revision) (e.g. '0.3.0_rc10')" \
+        '$revision' "Revision (e.g. 'r1')" \
+        '$fullversion' "Version including revision (e.g. '0.3.0_rc10-r1')" \
+        '$slot' "Slot" \
+        '$repo' "Repository (e.g. 'gentoo')" \
+        '$mask' "Mask-status field (~M-??)" \
+        '$mask2' "Verbose description of the masking status" \
+        '$location' "Location field (IPO-)"
 end
 
 ## Global Opts
-complete -c equery -s h -l help         -d "Displays a help message"
-complete -c equery -s q -l quiet        -d "Minimal output"
-complete -c equery -s C -l no-color     -d "Turns off colors"
-complete -c equery -s N -l no-pipe      -d "Turns off pipe detection"
-complete -c equery -s V -l version      -d "Display version information"
+complete -c equery -s h -l help -d "Displays a help message"
+complete -c equery -s q -l quiet -d "Minimal output"
+complete -c equery -s C -l no-color -d "Turns off colors"
+complete -c equery -s N -l no-pipe -d "Turns off pipe detection"
+complete -c equery -s V -l version -d "Display version information"
 
 ## Subcommands
-complete -c equery -n '__fish_use_subcommand' -xa 'belongs'     -d "List all pkgs owning file(s)"
-complete -c equery -n '__fish_use_subcommand' -xa 'changes'     -d "List changelog entries for ATOM"
-complete -c equery -n '__fish_use_subcommand' -xa 'check'       -d "Check pkg's MD5sums and timestamps"
-complete -c equery -n '__fish_use_subcommand' -xa 'depends'     -d "List all pkgs depending on specified pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'depgraph'    -d "Display pkg's dependency tree"
-complete -c equery -n '__fish_use_subcommand' -xa 'files'       -d "List files owned by pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'has'         -d "List pkgs for matching ENVIRONMENT data"
-complete -c equery -n '__fish_use_subcommand' -xa 'hasuse'      -d "List pkgs with specified useflag"
-complete -c equery -n '__fish_use_subcommand' -xa 'keywords'    -d "Display pkg's keywords"
-complete -c equery -n '__fish_use_subcommand' -xa 'list'        -d "List all pkgs matching pattern"
-complete -c equery -n '__fish_use_subcommand' -xa 'meta'        -d "Display pkg's metadata"
-complete -c equery -n '__fish_use_subcommand' -xa 'size'        -d "Print size of files contained in pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'uses'        -d "Display pkg's USE flags"
-complete -c equery -n '__fish_use_subcommand' -xa 'which'       -d "Print full path to ebuild for pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'belongs' -d "List all pkgs owning file(s)"
+complete -c equery -n '__fish_use_subcommand' -xa 'changes' -d "List changelog entries for ATOM"
+complete -c equery -n '__fish_use_subcommand' -xa 'check' -d "Check pkg's MD5sums and timestamps"
+complete -c equery -n '__fish_use_subcommand' -xa 'depends' -d "List all pkgs depending on specified pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'depgraph' -d "Display pkg's dependency tree"
+complete -c equery -n '__fish_use_subcommand' -xa 'files' -d "List files owned by pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'has' -d "List pkgs for matching ENVIRONMENT data"
+complete -c equery -n '__fish_use_subcommand' -xa 'hasuse' -d "List pkgs with specified useflag"
+complete -c equery -n '__fish_use_subcommand' -xa 'keywords' -d "Display pkg's keywords"
+complete -c equery -n '__fish_use_subcommand' -xa 'list' -d "List all pkgs matching pattern"
+complete -c equery -n '__fish_use_subcommand' -xa 'meta' -d "Display pkg's metadata"
+complete -c equery -n '__fish_use_subcommand' -xa 'size' -d "Print size of files contained in pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'uses' -d "Display pkg's USE flags"
+complete -c equery -n '__fish_use_subcommand' -xa 'which' -d "Print full path to ebuild for pkg"
 
 ## Arguments
 complete -c equery -n '__fish_seen_subcommand_from c changes d depends g depgraph y keywords m meta u uses w which' \
-	-xa '(__fish_portage_print_available_pkgs)'
+    -xa '(__fish_portage_print_available_pkgs)'
 complete -c equery -n '__fish_seen_subcommand_from k check f files s size' \
-	-xa '(__fish_portage_print_installed_pkgs)'
+    -xa '(__fish_portage_print_installed_pkgs)'
 
 ## Local opts
 # belongs
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s e -l early-out         -d "Stop after first match"
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s n -l name-only         -d "Omit version"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s e -l early-out -d "Stop after first match"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s n -l name-only -d "Omit version"
 
 # changes
-complete -c equery -n '__fish_seen_subcommand_from c changes' -s l -l latest            -d "Display only latest ChangeLog entry"
-complete -c equery -n '__fish_seen_subcommand_from c changes' -s f -l full              -d "Display full ChangeLog"
-complete -c equery -n '__fish_seen_subcommand_from c changes'      -l limit             -d "Limit number of entries displayed (with --full)" \
-	-xa "(seq 99)"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -s l -l latest -d "Display only latest ChangeLog entry"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -s f -l full -d "Display full ChangeLog"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -l limit -d "Limit number of entries displayed (with --full)" \
+    -xa "(seq 99)"
 #complete -c equery -n '__fish_seen_subcommand_from c changes'      -l from=VER          -d "Set which version to display from"
 #complete -c equery -n '__fish_seen_subcommand_from c changes'      -l to=VER            -d "Set which version to display to"
 
 # check
-complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from k check' -s o -l only-failures     -d "Only display pkgs that do not pass"
+complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from k check' -s o -l only-failures -d "Only display pkgs that do not pass"
 
 # depends
-complete -c equery -n '__fish_seen_subcommand_from d depends' -s a -l all-packages      -d "Include dependencies that are not installed (slow)"
-complete -c equery -n '__fish_seen_subcommand_from d depends' -s D -l indirect          -d "Search both direct and indirect dependencies"
-complete -c equery -n '__fish_seen_subcommand_from d depends'      -l depth             -d "Limit indirect dependency tree to specified depth" \
-	-xa "(seq 9)"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -s a -l all-packages -d "Include dependencies that are not installed (slow)"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -s D -l indirect -d "Search both direct and indirect dependencies"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -l depth -d "Limit indirect dependency tree to specified depth" \
+    -xa "(seq 9)"
 
 # depgraph
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s A -l no-atom           -d "Don't show dependency atom"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s M -l no-mask           -d "Don't show masking status"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s U -l no-useflags       -d "Don't show USE flags"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s l -l linear            -d "Don't indent dependencies"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph'      -l depth             -d "Limit dependency graph to specified depth" \
-	-xa "(seq 9)"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s A -l no-atom -d "Don't show dependency atom"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s M -l no-mask -d "Don't show masking status"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s U -l no-useflags -d "Don't show USE flags"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s l -l linear -d "Don't indent dependencies"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -l depth -d "Limit dependency graph to specified depth" \
+    -xa "(seq 9)"
 
 # files
 function __fish_equery_files_filter_args
-	printf "%s\n" dir obj sym dev fifo path conf cmd doc man info
+    printf "%s\n" dir obj sym dev fifo path conf cmd doc man info
 end
-complete -c equery -n '__fish_seen_subcommand_from f files' -s m -l md5sum            -d "Include MD5 sum in output"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s s -l timestamp         -d "Include timestamp in output"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s t -l type              -d "Include file type in output"
-complete -c equery -n '__fish_seen_subcommand_from f files'      -l tree              -d "Display results in a tree"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s f -l filter            -d "Filter output by file type" \
-	-xa "(__fish_complete_list , __fish_equery_files_filter_args)"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s m -l md5sum -d "Include MD5 sum in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s s -l timestamp -d "Include timestamp in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s t -l type -d "Include file type in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -l tree -d "Display results in a tree"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s f -l filter -d "Filter output by file type" \
+    -xa "(__fish_complete_list , __fish_equery_files_filter_args)"
 
 # has + hasuse
 complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s I -l exclude-installed -d "Exclude installed pkgs from search path"
-complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s o -l overlay-tree      -d "Include overlays in search path"
-complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s p -l portage-tree      -d "Include entire portage tree in search path"
+complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s o -l overlay-tree -d "Include overlays in search path"
+complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s p -l portage-tree -d "Include entire portage tree in search path"
 #complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s F -l format=TMPL       -d "Specify a custom output format"
 
 # keywords
 # TODO
 
 # list
-complete -c equery -n '__fish_seen_subcommand_from l list' -s d -l duplicates        -d "List only installed duplicate pkgs"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s b -l binpkgs-missing   -d "List only installed pkgs without a corresponding binary pkg"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s m -l mask-reason       -d "Include reason for pkg mask"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s d -l duplicates -d "List only installed duplicate pkgs"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s b -l binpkgs-missing -d "List only installed pkgs without a corresponding binary pkg"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s m -l mask-reason -d "Include reason for pkg mask"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s I -l exclude-installed -d "Exclude installed pkgs from output"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s o -l overlay-tree      -d "List pkgs in overlays"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s p -l portage-tree      -d "List pkgs in the main portage tree"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s o -l overlay-tree -d "List pkgs in overlays"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s p -l portage-tree -d "List pkgs in the main portage tree"
 #complete -c equery -n '__fish_seen_subcommand_from l list' -s F -l format=TMPL       -d "Specify a custom output format"
 complete -c equery -n '__fish_seen_subcommand_from l list; and not __fish_contains_opt -s p portage-tree' \
-	-xa "(__fish_portage_print_installed_pkgs)"
+    -xa "(__fish_portage_print_installed_pkgs)"
 complete -c equery -n '__fish_seen_subcommand_from l list; and     __fish_contains_opt -s p portage-tree' \
-	-xa "(__fish_portage_print_available_pkgs)"
+    -xa "(__fish_portage_print_available_pkgs)"
 
 # meta
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description       -d "Show extended pkg description"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd              -d "Show pkg's herd(s)"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords          -d "Show keywords for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license           -d "Show licenses for the best maching version"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer        -d "Show the maintainer(s) for the pkg"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq          -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags          -d "Show per-pkg USE flag descriptions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s U -l upstream          -d "Show pkg's upstream information"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s x -l xml               -d "Show the plain metadata.xml file"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description -d "Show extended pkg description"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd -d "Show pkg's herd(s)"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords -d "Show keywords for all matching pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best maching version"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer -d "Show the maintainer(s) for the pkg"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags -d "Show per-pkg USE flag descriptions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s U -l upstream -d "Show pkg's upstream information"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s x -l xml -d "Show the plain metadata.xml file"
 
 # size
-complete -c equery -n '__fish_seen_subcommand_from s size' -s b -l bytes             -d "Report size in bytes"
-complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex        -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from s size' -s b -l bytes -d "Report size in bytes"
+complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex -d "Query is a regex"
 
 # uses
-complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all               -d "Include all pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n       -d "Don't show l10n USE flags"
+complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all -d "Include all pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n -d "Don't show l10n USE flags"
 
 # which
-complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked   -d "Return highest version ebuild available"
-complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild           -d "Print the ebuild"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked -d "Return highest version ebuild available"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild -d "Print the ebuild"
diff --git a/share/completions/evince.fish b/share/completions/evince.fish
index f63e921f1..cc1e048e6 100644
--- a/share/completions/evince.fish
+++ b/share/completions/evince.fish
@@ -4,5 +4,5 @@ complete -c evince -s p -l page-label -d "The page of the document to display" -
 complete -c evince -s f -l fullscreen -d "Run evince in fullscreen mode"
 complete -c evince -s s -l presentation -d "Run evince in presentation mode"
 complete -c evince -s w -l preview -d "Run evince as a previewer"
-complete -c evince      -l display -d "X display to use"
+complete -c evince -l display -d "X display to use"
 
diff --git a/share/completions/exercism.fish b/share/completions/exercism.fish
index b6b62d3a8..df88e0297 100644
--- a/share/completions/exercism.fish
+++ b/share/completions/exercism.fish
@@ -1,10 +1,10 @@
 function __fish_exercism_no_subcommand -d 'Test if exercism has yet to be given the subcommand'
-        for i in (commandline -opc)
-                if contains -- $i demo debug configure fetch restore submit unsubmit tracks download help
-                        return 1
-                end
+    for i in (commandline -opc)
+        if contains -- $i demo debug configure fetch restore submit unsubmit tracks download help
+            return 1
         end
-        return 0
+    end
+    return 0
 end
 
 complete -c exercism -s c -l config -d 'path to config file [$EXERCISM_CONFIG_FILE, $XDG_CONFIG_HOME]'
diff --git a/share/completions/expand.fish b/share/completions/expand.fish
index 93cd7eae9..28e2ea7c0 100644
--- a/share/completions/expand.fish
+++ b/share/completions/expand.fish
@@ -1,5 +1,5 @@
-complete -c expand -s i -l initial       -d 'do not convert tabs after non blanks'
-complete -c expand -s t -l tabs -x       -d 'have tabs NUMBER characters apart, not 8'
-complete -c expand -s t -l tabs -x       -d 'use comma separated list of explicit tab positions'
-complete -c expand -l help     -d 'display this help and exit'
-complete -c expand -l version  -d 'output version information and exit'
+complete -c expand -s i -l initial -d 'do not convert tabs after non blanks'
+complete -c expand -s t -l tabs -x -d 'have tabs NUMBER characters apart, not 8'
+complete -c expand -s t -l tabs -x -d 'use comma separated list of explicit tab positions'
+complete -c expand -l help -d 'display this help and exit'
+complete -c expand -l version -d 'output version information and exit'
diff --git a/share/completions/feh.fish b/share/completions/feh.fish
index 362f32275..26e32cf65 100644
--- a/share/completions/feh.fish
+++ b/share/completions/feh.fish
@@ -1,7 +1,7 @@
 complete -c feh -l action -s A -x -d "Specify a shell command as action to perform on the image"
 
 for i in (seq 1 9)
-	complete -c feh -l action$i -x -d "Extra action triggered with number key "$i
+    complete -c feh -l action$i -x -d "Extra action triggered with number key "$i
 end
 
 complete -c feh -l auto-zoom -s Z -d "Zoom pictures to screen size"
diff --git a/share/completions/find.fish b/share/completions/find.fish
index e7301ef00..ecc3d15ed 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -73,7 +73,7 @@ complete -c find -o true -d "Always true"
 
 set -l type_comp 'b\t"Block device" c\t"Character device" d\t"Directory" p\t"Named pipe" f\t"File" l\t"Symbolic link" s\t"Socket"'
 
-complete -c find -o type -d "File is of specified type" -x -a  $type_comp
+complete -c find -o type -d "File is of specified type" -x -a $type_comp
 
 complete -c find -o uid -d "File's owner has specified numeric user ID" -r
 complete -c find -o used -d "File was last accessed specified number of days after its status was last changed" -r
diff --git a/share/completions/flac.fish b/share/completions/flac.fish
index c7818bc7b..a7693b8f3 100644
--- a/share/completions/flac.fish
+++ b/share/completions/flac.fish
@@ -1,66 +1,66 @@
 #
 # Completions for flac
 #
-complete -c flac -s v -l version               -d "Show the flac version number"
-complete -c flac -s h -l help                  -d "Show this screen"
-complete -c flac -s H -l explain               -d "Show detailed explanation of usage and options"
-complete -c flac -s d -l decode                -d "Decode (the default behavior is to encode)"
-complete -c flac -s t -l test                  -d "Same as -d except no decoded file is written"
-complete -c flac -s a -l analyze               -d "Same as -d except an analysis file is written"
-complete -c flac -s c -l stdout                -d "Write output to stdout"
-complete -c flac -s s -l silent                -d "Do not write runtime encode/decode statistics"
-complete -c flac -l totally-silent           -d "Do not print anything including errors"
-complete -c flac -s f -l force                 -d "Force overwriting of output files"
-complete -c flac -r -s o -l output-name          -d "Force the output file name"
-complete -c flac -l output-prefix           -d "Prepend STRING to output names"
-complete -c flac -l delete-input-file        -d "Deletes after a successful encode/decode"
-complete -c flac -l skip                    -d "Skip the given initial samples for each input {#|mm:ss.ss}"
-complete -c flac -l until                   -d "Stop at the given sample for each input file {#|[+|-]mm:ss.ss}"
-complete -c flac -l ogg                      -d "Use Ogg as transport layer"
-complete -c flac -l serial-number            -d "Serial number to use for the FLAC stream"
-complete -c flac -l residual-text            -d "Include residual signal in text output"
-complete -c flac -l residual-gnuplot         -d "Generate gnuplot files of residual distribution"
-complete -c flac -s F -l decode-through-errors  -d "Continue decoding through stream errors"
-complete -c flac -l cue                      -d "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
-complete -c flac -s V -l verify                 -d "Verify a correct encoding"
-complete -c flac -l lax                   -d "Allow encoder to generate non-Subset files"
-complete -c flac -l sector-align          -d "Align multiple files on sector boundaries"
-complete -c flac -l replay-gain           -d "Calculate ReplayGain & store in Vorbis comments"
-complete -c flac -l cuesheet     -d "Import cuesheet and store in CUESHEET block"
-complete -c flac -x -s T -l tag        -d "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
-complete -c flac -x -s T -l tag-from-file   -d "Read tags from file"
-complete -c flac -x -s S -l seekpoint             -d "Add seek point(s) {#|X|#x|#s}"
-complete -c flac -x -s P -l padding               -d "Write a PADDING block of length #"
-complete -c flac -s 0 -l compression-level-0    -d "Synonymous with -l 0 -b 1152 -r 22"
-complete -c flac      -l fast                        -d "Synonymous with -l 0 -b 1152 -r 22"
-complete -c flac -s 1 -l compression-level-1         -d "Synonymous with -l 0 -b 1152 -M -r 2,2"
-complete -c flac -s 2 -l compression-level-2         -d "Synonymous with -l 0 -b 1152 -m -r 3"
-complete -c flac -s 3 -l compression-level-3         -d "Synonymous with -l 6 -b 4608 -r 3,3"
-complete -c flac -s 4 -l compression-level-4         -d "Synonymous with -l 8 -b 4608 -M -r 3,3"
-complete -c flac -s 5 -l compression-level-5         -d "Synonymous with -l 8 -b 4608 -m -r 3,3"
-complete -c flac -s 6 -l compression-level-6         -d "Synonymous with -l 8 -b 4608 -m -r 4"
-complete -c flac -s 7 -l compression-level-7         -d "Synonymous with -l 8 -b 4608 -m -e -r 6"
-complete -c flac -s 8 -l compression-level-8   -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
-complete -c flac      -l best                  -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
-complete -c flac -x -s b -l blocksize                 -d "Specify blocksize in samples"
-complete -c flac -s m -l mid-side                    -d "Try mid-side coding for each frame"
-complete -c flac -s M -l adaptive-mid-side           -d "Adaptive mid-side coding for all frames"
-complete -c flac -s e -l exhaustive-model-search     -d "Do exhaustive model search (expensive!)"
-complete -c flac -x -s l -l max-lpc-order              -d "Max LPC order; 0 => only fixed predictors"
-complete -c flac -s p -l qlp-coeff-precision-search  -d "Exhaustively search LP coeff quantization"
-complete -c flac -x -s q -l qlp-coeff-precision       -d "Specify precision in bits"
-complete -c flac -x -s r -l rice-partition-order   -d "Set [min,]max residual partition order"
+complete -c flac -s v -l version -d "Show the flac version number"
+complete -c flac -s h -l help -d "Show this screen"
+complete -c flac -s H -l explain -d "Show detailed explanation of usage and options"
+complete -c flac -s d -l decode -d "Decode (the default behavior is to encode)"
+complete -c flac -s t -l test -d "Same as -d except no decoded file is written"
+complete -c flac -s a -l analyze -d "Same as -d except an analysis file is written"
+complete -c flac -s c -l stdout -d "Write output to stdout"
+complete -c flac -s s -l silent -d "Do not write runtime encode/decode statistics"
+complete -c flac -l totally-silent -d "Do not print anything including errors"
+complete -c flac -s f -l force -d "Force overwriting of output files"
+complete -c flac -r -s o -l output-name -d "Force the output file name"
+complete -c flac -l output-prefix -d "Prepend STRING to output names"
+complete -c flac -l delete-input-file -d "Deletes after a successful encode/decode"
+complete -c flac -l skip -d "Skip the given initial samples for each input {#|mm:ss.ss}"
+complete -c flac -l until -d "Stop at the given sample for each input file {#|[+|-]mm:ss.ss}"
+complete -c flac -l ogg -d "Use Ogg as transport layer"
+complete -c flac -l serial-number -d "Serial number to use for the FLAC stream"
+complete -c flac -l residual-text -d "Include residual signal in text output"
+complete -c flac -l residual-gnuplot -d "Generate gnuplot files of residual distribution"
+complete -c flac -s F -l decode-through-errors -d "Continue decoding through stream errors"
+complete -c flac -l cue -d "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
+complete -c flac -s V -l verify -d "Verify a correct encoding"
+complete -c flac -l lax -d "Allow encoder to generate non-Subset files"
+complete -c flac -l sector-align -d "Align multiple files on sector boundaries"
+complete -c flac -l replay-gain -d "Calculate ReplayGain & store in Vorbis comments"
+complete -c flac -l cuesheet -d "Import cuesheet and store in CUESHEET block"
+complete -c flac -x -s T -l tag -d "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
+complete -c flac -x -s T -l tag-from-file -d "Read tags from file"
+complete -c flac -x -s S -l seekpoint -d "Add seek point(s) {#|X|#x|#s}"
+complete -c flac -x -s P -l padding -d "Write a PADDING block of length #"
+complete -c flac -s 0 -l compression-level-0 -d "Synonymous with -l 0 -b 1152 -r 22"
+complete -c flac -l fast -d "Synonymous with -l 0 -b 1152 -r 22"
+complete -c flac -s 1 -l compression-level-1 -d "Synonymous with -l 0 -b 1152 -M -r 2,2"
+complete -c flac -s 2 -l compression-level-2 -d "Synonymous with -l 0 -b 1152 -m -r 3"
+complete -c flac -s 3 -l compression-level-3 -d "Synonymous with -l 6 -b 4608 -r 3,3"
+complete -c flac -s 4 -l compression-level-4 -d "Synonymous with -l 8 -b 4608 -M -r 3,3"
+complete -c flac -s 5 -l compression-level-5 -d "Synonymous with -l 8 -b 4608 -m -r 3,3"
+complete -c flac -s 6 -l compression-level-6 -d "Synonymous with -l 8 -b 4608 -m -r 4"
+complete -c flac -s 7 -l compression-level-7 -d "Synonymous with -l 8 -b 4608 -m -e -r 6"
+complete -c flac -s 8 -l compression-level-8 -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
+complete -c flac -l best -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
+complete -c flac -x -s b -l blocksize -d "Specify blocksize in samples"
+complete -c flac -s m -l mid-side -d "Try mid-side coding for each frame"
+complete -c flac -s M -l adaptive-mid-side -d "Adaptive mid-side coding for all frames"
+complete -c flac -s e -l exhaustive-model-search -d "Do exhaustive model search (expensive!)"
+complete -c flac -x -s l -l max-lpc-order -d "Max LPC order; 0 => only fixed predictors"
+complete -c flac -s p -l qlp-coeff-precision-search -d "Exhaustively search LP coeff quantization"
+complete -c flac -x -s q -l qlp-coeff-precision -d "Specify precision in bits"
+complete -c flac -x -s r -l rice-partition-order -d "Set [min,]max residual partition order"
 
 complete -c flac -l endian=big -d "Set byte order for samples"
 complete -c flac -l endian=little -d "Set byte order for samples"
-complete -c flac -l channels            -d "Number of channels"
-complete -c flac -l bps                 -d "Number of bits per sample"
-complete -c flac -l sample-rate         -d "Sample rate in Hz"
+complete -c flac -l channels -d "Number of channels"
+complete -c flac -l bps -d "Number of bits per sample"
+complete -c flac -l sample-rate -d "Sample rate in Hz"
 complete -c flac -l sign=unsigned -d "Sign of samples"
 complete -c flac -l sign=signed -d "Sign of samples"
-complete -c flac -l input-size          -d "Size of the raw input in bytes"
-complete -c flac -l force-aiff-format     -d "Force decoding to AIFF format"
-complete -c flac -l force-raw-format      -d "Treat input or output as raw samples"
+complete -c flac -l input-size -d "Size of the raw input in bytes"
+complete -c flac -l force-aiff-format -d "Force decoding to AIFF format"
+complete -c flac -l force-raw-format -d "Treat input or output as raw samples"
 
 complete -c flac -l no-adaptive-mid-side -d "No adaptive mid-side coding for all frames"
 complete -c flac -l no-decode-through-errors -d "Don't continue decoding through stream errors"
diff --git a/share/completions/flatpak.fish b/share/completions/flatpak.fish
index 9f25836b7..5964fee54 100644
--- a/share/completions/flatpak.fish
+++ b/share/completions/flatpak.fish
@@ -1,34 +1,34 @@
 # Completions for flatpak, an "Application deployment framework for desktop apps"
 # (http://flatpak.org)
 set -l commands install update uninstall list info run override make-current enter document-{export,unexport,info,list} \
-remote-{add,modify,delete,list,ls} build build-{init,finish,export,bundle,import-bundle,sign,update-repo}
+    remote-{add,modify,delete,list,ls} build build-{init,finish,export,bundle,import-bundle,sign,update-repo}
 
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a install             -d 'Install an application or runtime from a remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a update              -d 'Update an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a uninstall           -d 'Uninstall an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a list                -d 'List installed apps and/or runtimes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a info                -d 'Show info for installed app or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a run                 -d 'Run an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a override            -d 'Override permissions for an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a make-current        -d 'Specify default version to run'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a enter               -d 'Enter the namespace of a running application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-export     -d 'Grant an application access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-unexport   -d 'Revoke access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-info       -d 'Show information about a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-list       -d 'List exported files'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-add          -d 'Add a new remote repository (by URL)'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-modify       -d 'Modify properties of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-delete       -d 'Delete a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-list         -d 'List all configured remotes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-ls           -d 'List contents of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-init          -d 'Initialize a directory for building'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build               -d 'Run a build command inside the build dir'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-finish        -d 'Finish a build dir for export'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-export        -d 'Export a build dir to a repository'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-bundle        -d 'Create a bundle file from a build directory'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a install -d 'Install an application or runtime from a remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a update -d 'Update an installed application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a uninstall -d 'Uninstall an installed application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a list -d 'List installed apps and/or runtimes'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a info -d 'Show info for installed app or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a run -d 'Run an application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a override -d 'Override permissions for an application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a make-current -d 'Specify default version to run'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a enter -d 'Enter the namespace of a running application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-export -d 'Grant an application access to a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-unexport -d 'Revoke access to a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-info -d 'Show information about a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-list -d 'List exported files'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-add -d 'Add a new remote repository (by URL)'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-modify -d 'Modify properties of a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-delete -d 'Delete a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-list -d 'List all configured remotes'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-ls -d 'List contents of a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-init -d 'Initialize a directory for building'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build -d 'Run a build command inside the build dir'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-finish -d 'Finish a build dir for export'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-export -d 'Export a build dir to a repository'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-bundle -d 'Create a bundle file from a build directory'
 complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-import-bundle -d 'Import a bundle file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-sign          -d 'Sign an application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-update-repo   -d 'Update the summary file in a repository'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-sign -d 'Sign an application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-update-repo -d 'Update the summary file in a repository'
 
 complete -f -c flatpak -n "__fish_seen_subcommand_from run" -a "(flatpak list --app | string match -r '\S+')"
 complete -f -c flatpak -n "__fish_seen_subcommand_from info uninstall" -a "(flatpak list | string match -r '\S+')"
diff --git a/share/completions/functions.fish b/share/completions/functions.fish
index 6010f583a..51a265b4e 100644
--- a/share/completions/functions.fish
+++ b/share/completions/functions.fish
@@ -1,10 +1,10 @@
 function __fish_maybe_list_all_functions
-	# if the current commandline token starts with an _, list all functions
-	if string match -qr -- '^_' (commandline -ct)
-		functions -an
-	else
-		functions -n
-	end
+    # if the current commandline token starts with an _, list all functions
+    if string match -qr -- '^_' (commandline -ct)
+        functions -an
+    else
+        functions -n
+    end
 end
 
 complete -c functions -s e -l erase -d "Erase function" -x -a "(__fish_maybe_list_all_functions)"
diff --git a/share/completions/fuser.fish b/share/completions/fuser.fish
index 2cbab2bdb..83463834a 100644
--- a/share/completions/fuser.fish
+++ b/share/completions/fuser.fish
@@ -1,9 +1,9 @@
 __fish_make_completion_signals
 for i in $__kill_signals
-	set number (echo $i | cut -d " " -f 1)
-	set name (echo $i | cut -d " " -f 2)
-	complete -c fuser -o $number -d $name
-	complete -c fuser -o $name -d $name
+    set number (echo $i | cut -d " " -f 1)
+    set name (echo $i | cut -d " " -f 2)
+    complete -c fuser -o $number -d $name
+    complete -c fuser -o $name -d $name
 end
 
 complete -c fuser -s a -l all -d 'Show all files specified on the command line'
diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index e46947b61..034e7e36f 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -21,9 +21,9 @@ complete -c gcc -o std -d "Standard mode" -x -a '
 	gnu++98\t"ISO C++98 plus GNU extentions"
 '
 
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;
-	complete -c gcc -o ftemplate-depth-$i -d "Set maximum template depth"
-end;
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
+    complete -c gcc -o ftemplate-depth-$i -d "Set maximum template depth"
+end
 
 complete -c gcc -s o -d 'Place output in file' -r
 complete -c gcc -o aux-info -d 'Output to the given filename prototyped declarations for all functions declared and/or defined in a translation unit, including those in header files' -r
diff --git a/share/completions/git.fish b/share/completions/git.fish
index d536eaa97..41c30f10b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -156,7 +156,7 @@ function __fish_git_files
     # Version >= 2.11.* has the v2 format.
     if test "$ver[1]" -gt 2 2>/dev/null; or test "$ver[1]" -eq 2 -a "$ver[2]" -ge 11 2>/dev/null
         command git $git_opt status --porcelain=2 $status_opt \
-        | while read -la -d ' ' line
+            | while read -la -d ' ' line
             set -l file
             set -l desc
             # The basic status format is "XY", where X is "our" state (meaning the staging area),
@@ -284,7 +284,7 @@ function __fish_git_files
         # Note that we can't use space as a delimiter between status and filename, because
         # the status can contain spaces - " M" is different from "M ".
         command git $git_opt status --porcelain -z $status_opt \
-        | while read -lz line
+            | while read -lz line
             set -l desc
             # The entire line is the "from" from a rename.
             if set -q use_next[1]
@@ -458,9 +458,9 @@ function __fish_git_needs_command
     # Git has tons of options, but fortunately only a few can appear before the command.
     # They are listed here.
     set -l opts h-help p P-paginate N-no-pager b-bare o-no-replace-objects \
-    l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs \
-    e-exec-path= G-git-dir= c= C= v-version H-html-path \
-    m-man-path I-info-path w-work-tree= a-namespace= s-super-prefix=
+        l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs \
+        e-exec-path= G-git-dir= c= C= v-version H-html-path \
+        m-man-path I-info-path w-work-tree= a-namespace= s-super-prefix=
     set cmd (commandline -opc)
     set -e cmd[1]
     argparse -s $opts -- $cmd 2>/dev/null
diff --git a/share/completions/gpasswd.fish b/share/completions/gpasswd.fish
index bd5a51621..f51489d4d 100644
--- a/share/completions/gpasswd.fish
+++ b/share/completions/gpasswd.fish
@@ -5,6 +5,6 @@ complete -c gpasswd -s d -l delete -d 'Remove user from group' -xa '(__fish_comp
 complete -c gpasswd -s h -l help -d 'Print help'
 complete -c gpasswd -s r -l remove-password -d 'Remove the GROUP\'s password'
 complete -c gpasswd -s R -l restrict -d 'Restrict access to GROUP to its members'
-complete -c gpasswd -s M -l members  -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
+complete -c gpasswd -s M -l members -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
 complete -c gpasswd -s A -l administrators -d 'set the list of administrators for GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
 
diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index af1f0f9de..e2dd8a50d 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -20,46 +20,46 @@
 #
 
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
-	# 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 a s a
-	# description.
-	# It also replaces colons with \x3a
-	gpg --list-keys --with-colon|cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
+    # 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 a s a
+    # description.
+    # It also replaces colons with \x3a
+    gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
 end
 
 function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
-	# Use user_id as the description
-	set -l lastid
-	gpg --list-keys --with-colons | while read garbage
-		switch $garbage
-			case "uid*"
-				echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
-			case "*"
-				echo $garbage | cut -d ":" -f 5 | read fingerprint
-		end
-		printf "%s\t%s\n" $fingerprint $lastid
-	end
+    # Use user_id as the description
+    set -l lastid
+    gpg --list-keys --with-colons | while read garbage
+        switch $garbage
+            case "uid*"
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
+            case "*"
+                echo $garbage | cut -d ":" -f 5 | read fingerprint
+        end
+        printf "%s\t%s\n" $fingerprint $lastid
+    end
 end
 
 function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
-	# Set a known locale, so that the output format of 'gpg --version'
-	# is at least somewhat predictable. The locale will automatically
-	# expire when the function goes out of scope, and the original locale
-	# will take effect again.
-	set -lx LC_ALL C
+    # Set a known locale, so that the output format of 'gpg --version'
+    # is at least somewhat predictable. The locale will automatically
+    # expire when the function goes out of scope, and the original locale
+    # will take effect again.
+    set -lx LC_ALL C
 
-	# sed script explained:
-	# in the line that matches "$argv:"
-	# 	define label 'loop'
-	# 	if the line ends with a ','
-	# 		add next line to buffer
-	#		transliterate '\n' with ' '
-	#		goto loop
-	# 	remove everything until the first ':' of the line
-	# 	remove all blanks
-	# 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
-	# 	print result
-	gpg --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
+    # sed script explained:
+    # in the line that matches "$argv:"
+    # 	define label 'loop'
+    # 	if the line ends with a ','
+    # 		add next line to buffer
+    #		transliterate '\n' with ' '
+    #		goto loop
+    # 	remove everything until the first ':' of the line
+    # 	remove all blanks
+    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    # 	print result
+    gpg --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
 end
 
 
diff --git a/share/completions/gphoto2.fish b/share/completions/gphoto2.fish
index add427764..71c805c69 100644
--- a/share/completions/gphoto2.fish
+++ b/share/completions/gphoto2.fish
@@ -1,81 +1,81 @@
 
 #Common options
-complete -c gphoto2   -s '?' -l 'help'                             -d 'Print complete help message on program usage'
-complete -c gphoto2          -l 'usage'                            -d 'Print short message on program usage'
-complete -c gphoto2          -l 'debug'                            -d 'Turn on debugging'
-complete -c gphoto2          -l 'debug-logfile' -r                 -d 'Name of file to write debug info to'
-complete -c gphoto2          -l 'quiet'                            -d 'Quiet output (default=verbose)'
-complete -c gphoto2          -l 'hook-script' -r                   -d 'Hook script to call after downloads, captures, etc.'
+complete -c gphoto2 -s '?' -l 'help' -d 'Print complete help message on program usage'
+complete -c gphoto2 -l 'usage' -d 'Print short message on program usage'
+complete -c gphoto2 -l 'debug' -d 'Turn on debugging'
+complete -c gphoto2 -l 'debug-logfile' -r -d 'Name of file to write debug info to'
+complete -c gphoto2 -l 'quiet' -d 'Quiet output (default=verbose)'
+complete -c gphoto2 -l 'hook-script' -r -d 'Hook script to call after downloads, captures, etc.'
 
 #Miscellaneous options (unsorted)
-complete -c gphoto2          -l 'stdout'                           -d 'Send file to stdout'
-complete -c gphoto2          -l 'stdout-size'                      -d 'Print filesize before data'
-complete -c gphoto2          -l 'auto-detect'                      -d 'List auto-detected cameras'
-complete -c gphoto2          -l 'show-exif' -r                     -d 'Show EXIF information'
-complete -c gphoto2          -l 'show-info' -r                     -d 'Show info'
-complete -c gphoto2          -l 'summary'                          -d 'Show summary'
-complete -c gphoto2          -l 'manual'                           -d 'Show camera driver manual'
-complete -c gphoto2          -l 'about'                            -d 'About the camera driver manual'
-complete -c gphoto2          -l 'storage-info'                     -d 'Show storage information'
-complete -c gphoto2          -l 'shell'                            -d 'gPhoto shell'
+complete -c gphoto2 -l 'stdout' -d 'Send file to stdout'
+complete -c gphoto2 -l 'stdout-size' -d 'Print filesize before data'
+complete -c gphoto2 -l 'auto-detect' -d 'List auto-detected cameras'
+complete -c gphoto2 -l 'show-exif' -r -d 'Show EXIF information'
+complete -c gphoto2 -l 'show-info' -r -d 'Show info'
+complete -c gphoto2 -l 'summary' -d 'Show summary'
+complete -c gphoto2 -l 'manual' -d 'Show camera driver manual'
+complete -c gphoto2 -l 'about' -d 'About the camera driver manual'
+complete -c gphoto2 -l 'storage-info' -d 'Show storage information'
+complete -c gphoto2 -l 'shell' -d 'gPhoto shell'
 
 #Get information on software and host system (not from the camera)
-complete -c gphoto2    -s v  -l 'version'                          -d 'Display version and exit'
-complete -c gphoto2          -l 'list-cameras'                     -d 'List supported camera models'
-complete -c gphoto2          -l 'list-ports'                       -d 'List supported port devices'
-complete -c gphoto2    -s a  -l 'abilities'                        -d 'Display camera/driver abilities'
+complete -c gphoto2 -s v -l 'version' -d 'Display version and exit'
+complete -c gphoto2 -l 'list-cameras' -d 'List supported camera models'
+complete -c gphoto2 -l 'list-ports' -d 'List supported port devices'
+complete -c gphoto2 -s a -l 'abilities' -d 'Display camera/driver abilities'
 
 #Specify the camera to use
-complete -c gphoto2          -l 'port' -r                          -d 'Specify device port'
-complete -c gphoto2          -l 'speed' -r                         -d 'Specify serial transfer speed'
-complete -c gphoto2          -l 'camera' -r                        -d 'Specify camera model'
-complete -c gphoto2          -l 'usbid' -r                         -d '(expert only) Override USB IDs'
+complete -c gphoto2 -l 'port' -r -d 'Specify device port'
+complete -c gphoto2 -l 'speed' -r -d 'Specify serial transfer speed'
+complete -c gphoto2 -l 'camera' -r -d 'Specify camera model'
+complete -c gphoto2 -l 'usbid' -r -d '(expert only) Override USB IDs'
 
 #Camera and software configuration
-complete -c gphoto2          -l 'list-config'                      -d 'List configuration tree'
-complete -c gphoto2          -l 'list-all-config'                  -d 'Dump full configuration tree'
-complete -c gphoto2          -l 'get-config' -r                    -d 'Get configuration value'
-complete -c gphoto2          -l 'set-config' -r                    -d 'Set configuration value or index in choices'
-complete -c gphoto2          -l 'set-config-index' -r              -d 'Set configuration value index in choices'
-complete -c gphoto2          -l 'set-config-value' -r              -d 'Set configuration value'
+complete -c gphoto2 -l 'list-config' -d 'List configuration tree'
+complete -c gphoto2 -l 'list-all-config' -d 'Dump full configuration tree'
+complete -c gphoto2 -l 'get-config' -r -d 'Get configuration value'
+complete -c gphoto2 -l 'set-config' -r -d 'Set configuration value or index in choices'
+complete -c gphoto2 -l 'set-config-index' -r -d 'Set configuration value index in choices'
+complete -c gphoto2 -l 'set-config-value' -r -d 'Set configuration value'
 
 #Capture an image from or on the camera
-complete -c gphoto2          -l 'wait-event'                       -d 'Wait for event(s) from camera'
-complete -c gphoto2          -l 'wait-event-and-download'          -d 'Wait for event(s) from the camera and download new images'
-complete -c gphoto2          -l 'capture-preview'                  -d 'Capture a quick preview'
-complete -c gphoto2    -s B  -l 'bulb' -r                          -d 'Set bulb exposure time in seconds'
-complete -c gphoto2    -s F  -l 'frames' -r                        -d 'Set number of frames to capture (default=infinite)'
-complete -c gphoto2    -s I  -l 'interval' -r                      -d 'Set capture interval in seconds'
-complete -c gphoto2          -l 'reset-interval'                   -d 'Reset capture interval on signal (default=no)'
-complete -c gphoto2          -l 'capture-image'                    -d 'Capture an image'
-complete -c gphoto2          -l 'capture-image-and-download'       -d 'Capture an image and download it'
-complete -c gphoto2          -l 'capture-movie'                    -d 'Capture a movie'
-complete -c gphoto2          -l 'capture-sound'                    -d 'Capture an audio clip'
-complete -c gphoto2          -l 'capture-tethered'                 -d 'Wait for shutter release on the camera and download'
+complete -c gphoto2 -l 'wait-event' -d 'Wait for event(s) from camera'
+complete -c gphoto2 -l 'wait-event-and-download' -d 'Wait for event(s) from the camera and download new images'
+complete -c gphoto2 -l 'capture-preview' -d 'Capture a quick preview'
+complete -c gphoto2 -s B -l 'bulb' -r -d 'Set bulb exposure time in seconds'
+complete -c gphoto2 -s F -l 'frames' -r -d 'Set number of frames to capture (default=infinite)'
+complete -c gphoto2 -s I -l 'interval' -r -d 'Set capture interval in seconds'
+complete -c gphoto2 -l 'reset-interval' -d 'Reset capture interval on signal (default=no)'
+complete -c gphoto2 -l 'capture-image' -d 'Capture an image'
+complete -c gphoto2 -l 'capture-image-and-download' -d 'Capture an image and download it'
+complete -c gphoto2 -l 'capture-movie' -d 'Capture a movie'
+complete -c gphoto2 -l 'capture-sound' -d 'Capture an audio clip'
+complete -c gphoto2 -l 'capture-tethered' -d 'Wait for shutter release on the camera and download'
 
 #Downloading, uploading and manipulating files
-complete -c gphoto2    -s l  -l 'list-folders'                     -d 'List folders in folder'
-complete -c gphoto2    -s L  -l 'list-files'                       -d 'List files in folder'
-complete -c gphoto2    -s m  -l 'mkdir' -r                         -d 'Create a directory'
-complete -c gphoto2    -s r  -l 'rmdir' -r                         -d 'Remove a directory'
-complete -c gphoto2    -s n  -l 'num-files'                        -d 'Display number of files'
-complete -c gphoto2    -s p  -l 'get-file' -r                      -d 'Get files given in range'
-complete -c gphoto2    -s P  -l 'get-all-files'                    -d 'Get all files from folder'
-complete -c gphoto2    -s t  -l 'get-thumbnail' -r                 -d 'Get thumbnails given in range'
-complete -c gphoto2    -s T  -l 'get-all-thumbnails'               -d 'Get all thumbnails from folder'
-complete -c gphoto2          -l 'get-metadata' -r                  -d 'Get metadata given in range'
-complete -c gphoto2          -l 'get-all-metadata'                 -d 'Get all metadata from folder'
-complete -c gphoto2          -l 'upload-metadata' -r               -d 'Upload metadata for file'
-complete -c gphoto2          -l 'get-raw-data' -r                  -d 'Get raw data given in range'
-complete -c gphoto2          -l 'get-all-raw-data'                 -d 'Get all raw data from folder'
-complete -c gphoto2          -l 'get-audio-data' -r                -d 'Get audio data given in range'
-complete -c gphoto2          -l 'get-all-audio-data'               -d 'Get all audio data from folder'
-complete -c gphoto2    -s d  -l 'delete-file' -r                   -d 'Delete files given in range'
-complete -c gphoto2    -s D  -l 'delete-all-files'                 -d 'Delete all files in folder (--no-recurse by default)'
-complete -c gphoto2    -s u  -l 'upload-file' -r                   -d 'Upload a file to camera'
-complete -c gphoto2          -l 'filename' -r                      -d 'Specify a filename or filename pattern'
-complete -c gphoto2    -s f  -l 'folder' -r                        -d 'Specify camera folder (default="/")'
-complete -c gphoto2    -s R  -l 'recurse'                          -d 'Recursion (default for download)'
-complete -c gphoto2          -l 'no-recurse'                       -d 'No recursion (default for deletion)'
-complete -c gphoto2          -l 'new'                              -d 'Process new files only'
-complete -c gphoto2          -l 'force-overwrite'                  -d 'Overwrite files without asking'
+complete -c gphoto2 -s l -l 'list-folders' -d 'List folders in folder'
+complete -c gphoto2 -s L -l 'list-files' -d 'List files in folder'
+complete -c gphoto2 -s m -l 'mkdir' -r -d 'Create a directory'
+complete -c gphoto2 -s r -l 'rmdir' -r -d 'Remove a directory'
+complete -c gphoto2 -s n -l 'num-files' -d 'Display number of files'
+complete -c gphoto2 -s p -l 'get-file' -r -d 'Get files given in range'
+complete -c gphoto2 -s P -l 'get-all-files' -d 'Get all files from folder'
+complete -c gphoto2 -s t -l 'get-thumbnail' -r -d 'Get thumbnails given in range'
+complete -c gphoto2 -s T -l 'get-all-thumbnails' -d 'Get all thumbnails from folder'
+complete -c gphoto2 -l 'get-metadata' -r -d 'Get metadata given in range'
+complete -c gphoto2 -l 'get-all-metadata' -d 'Get all metadata from folder'
+complete -c gphoto2 -l 'upload-metadata' -r -d 'Upload metadata for file'
+complete -c gphoto2 -l 'get-raw-data' -r -d 'Get raw data given in range'
+complete -c gphoto2 -l 'get-all-raw-data' -d 'Get all raw data from folder'
+complete -c gphoto2 -l 'get-audio-data' -r -d 'Get audio data given in range'
+complete -c gphoto2 -l 'get-all-audio-data' -d 'Get all audio data from folder'
+complete -c gphoto2 -s d -l 'delete-file' -r -d 'Delete files given in range'
+complete -c gphoto2 -s D -l 'delete-all-files' -d 'Delete all files in folder (--no-recurse by default)'
+complete -c gphoto2 -s u -l 'upload-file' -r -d 'Upload a file to camera'
+complete -c gphoto2 -l 'filename' -r -d 'Specify a filename or filename pattern'
+complete -c gphoto2 -s f -l 'folder' -r -d 'Specify camera folder (default="/")'
+complete -c gphoto2 -s R -l 'recurse' -d 'Recursion (default for download)'
+complete -c gphoto2 -l 'no-recurse' -d 'No recursion (default for deletion)'
+complete -c gphoto2 -l 'new' -d 'Process new files only'
+complete -c gphoto2 -l 'force-overwrite' -d 'Overwrite files without asking'
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index bf5343d1b..05e70fb84 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -39,22 +39,22 @@ complete -c gradle -l exclude-task -s x -x -d 'Specify task to be excluded from
 
 # https://github.com/hanny24/gradle-fish/blob/master/gradle.load
 function __cache_or_get_gradle_completion
-  # Set up cache directory
-  if test -z $XDG_CACHE_HOME
-    set XDG_CACHE_HOME $HOME/.cache/
-  end
-  mkdir -m 700 -p $XDG_CACHE_HOME/gradle-completions
+    # Set up cache directory
+    if test -z $XDG_CACHE_HOME
+        set XDG_CACHE_HOME $HOME/.cache/
+    end
+    mkdir -m 700 -p $XDG_CACHE_HOME/gradle-completions
 
-  set -l hashed_pwd (fish_md5 -s $PWD)
-  set -l gradle_cache_file $XDG_CACHE_HOME/gradle-completions/$hashed_pwd
-  if not test -f $gradle_cache_file; or command test build.gradle -nt $gradle_cache_file
-    command gradle -q tasks 2>/dev/null | string match -r '^[[:alnum:]]+ - .*' | string replace ' - ' \t > $gradle_cache_file
-  end
-  cat $gradle_cache_file
+    set -l hashed_pwd (fish_md5 -s $PWD)
+    set -l gradle_cache_file $XDG_CACHE_HOME/gradle-completions/$hashed_pwd
+    if not test -f $gradle_cache_file; or command test build.gradle -nt $gradle_cache_file
+        command gradle -q tasks 2>/dev/null | string match -r '^[[:alnum:]]+ - .*' | string replace ' - ' \t >$gradle_cache_file
+    end
+    cat $gradle_cache_file
 end
 
 function __contains_gradle_build
-  test -f build.gradle
+    test -f build.gradle
 end
 
 complete -x -c gradle -n '__contains_gradle_build' -a "(__cache_or_get_gradle_completion)"
diff --git a/share/completions/grunt.fish b/share/completions/grunt.fish
index 828e8841c..1e8b2882c 100644
--- a/share/completions/grunt.fish
+++ b/share/completions/grunt.fish
@@ -8,24 +8,24 @@
 # https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
 
 function __grunt_print_tasks
-	set -l tasks (grunt --version --verbose 2>/dev/null | awk '/Available tasks: / {$1=$2=""; print $0}' | awk '{$1=$1}1' | tr ' ' '\n')
-	for t in $tasks
-		echo $t
-	end
+    set -l tasks (grunt --version --verbose 2>/dev/null | awk '/Available tasks: / {$1=$2=""; print $0}' | awk '{$1=$1}1' | tr ' ' '\n')
+    for t in $tasks
+        echo $t
+    end
 end
 
 complete -c grunt -fa '(__grunt_print_tasks)'
-complete -c grunt -s h -l help		-d "Display help text"
-complete -c grunt -l base					-d "Specify an alternate base path"
-complete -c grunt -l no-color			-d "Disable colored output"
-complete -c grunt -l gruntfile	 -rd "Specify an alternate Gruntfile"
-complete -c grunt -s d -l debug		-d "Enable debugging mode for tasks that support it"
-complete -c grunt -l stack				-d "Print a stack trace when exiting with a warning or fatal error"
-complete -c grunt -s f -l force		-d "A way to force your way past warnings."
-complete -c grunt -l tasks			 -rd "Additional directory paths to scan for task and "extra" files"
-complete -c grunt -l npm	-x			-d "Npm-installed grunt plugins to scan for task and "extra" files"
-complete -c grunt -l no-write			-d "Disable writing files (dry run)"
-complete -c grunt -s v -l verbose	-d "Verbose mode. A lot more information output"
+complete -c grunt -s h -l help -d "Display help text"
+complete -c grunt -l base -d "Specify an alternate base path"
+complete -c grunt -l no-color -d "Disable colored output"
+complete -c grunt -l gruntfile -rd "Specify an alternate Gruntfile"
+complete -c grunt -s d -l debug -d "Enable debugging mode for tasks that support it"
+complete -c grunt -l stack -d "Print a stack trace when exiting with a warning or fatal error"
+complete -c grunt -s f -l force -d "A way to force your way past warnings."
+complete -c grunt -l tasks -rd "Additional directory paths to scan for task and "extra" files"
+complete -c grunt -l npm -x -d "Npm-installed grunt plugins to scan for task and "extra" files"
+complete -c grunt -l no-write -d "Disable writing files (dry run)"
+complete -c grunt -s v -l verbose -d "Verbose mode. A lot more information output"
 complete -c grunt -s V -l version -d "Print the grunt version. Combine with --verbose for more info"
-complete -c grunt -l completion		-d "Output shell auto-completion rules."
+complete -c grunt -l completion -d "Output shell auto-completion rules."
 
diff --git a/share/completions/gsettings.fish b/share/completions/gsettings.fish
index 67d7575ef..0c10aec0f 100644
--- a/share/completions/gsettings.fish
+++ b/share/completions/gsettings.fish
@@ -9,7 +9,7 @@ function __fish_complete_gsettings_args
     set -e cmd[1]
 
     if set -q cmd[2]
-    and string match -q -- '--schemadir' $cmd[1]
+        and string match -q -- '--schemadir' $cmd[1]
         # TODO: This needs to support proper expansion of paths (~, variables, etc.)
         set schemadir --schemadir $cmd[2]
         set -e cmd[1..2]
@@ -56,15 +56,15 @@ function __fish_complete_gsettings_args
         set -l key_type $range[1]
         set -e range[1]
         switch $key_type
-        case 'type b'
-            echo true
-            echo false
-        case 'enum'
-            string join \n $range
-        case '*'
-            # If no sensible suggestions can be made, just use the current value.
-            # It gives a good indication on the expected format and is likely already close to what the user wants.
-            gsettings $schemadir get $schema $key 2>/dev/null
+            case 'type b'
+                echo true
+                echo false
+            case 'enum'
+                string join \n $range
+            case '*'
+                # If no sensible suggestions can be made, just use the current value.
+                # It gives a good indication on the expected format and is likely already close to what the user wants.
+                gsettings $schemadir get $schema $key 2>/dev/null
         end
         return 0
     end
diff --git a/share/completions/gv.fish b/share/completions/gv.fish
index 4f662aba9..1afc24d94 100644
--- a/share/completions/gv.fish
+++ b/share/completions/gv.fish
@@ -2,49 +2,49 @@ complete -c gv -xa "(__fish_complete_suffix .ps)"
 complete -c gv -xa "(__fish_complete_suffix .ps.gz)"
 complete -c gv -xa "(__fish_complete_suffix .eps)"
 complete -c gv -xa "(__fish_complete_suffix .pdf)"
-complete -c gv -l monochrome   -d 'Display document using only black and white'
-complete -c gv -l grayscale    -d 'Display document without colors'
-complete -c gv -l color        -d 'Display document as usual'
-complete -c gv -l safer        -d 'Start ghostscript in safe mode'
-complete -c gv -l nosafer      -d 'Do not start ghostscript in safe mode'
-complete -c gv -l safedir      -d 'Start ghostscript from a safe diretory'
-complete -c gv -l nosafedir    -d 'Do not start ghostscript from a safe diretory'
-complete -c gv -l quiet        -d 'Start ghostscript with the -dQUIET option'
-complete -c gv -l noquiet      -d 'Do not start ghostscript with the -dQUIET option'
-complete -c gv -l infoSilent   -d 'Do not show any messages in the info popup window'
-complete -c gv -l infoErrors   -d 'Do not show warning messages in the info popup window'
-complete -c gv -l infoAll      -d 'Do show all messages in the info popup window'
-complete -c gv -l arguments    -d 'Start ghostscript with additional options as specified by the string ARGS' -x
-complete -c gv -l page         -d 'Display the page with label LABEL first' -x
-complete -c gv -l center       -d 'The page should be centered automatically'
-complete -c gv -l nocenter     -d 'The page should not be centered automatically'
-complete -c gv -l media        -d 'Selects the paper size to be used'
-complete -c gv -l orientation  -d 'Sets the orientation of the page' -xa 'automatic bbox letter legal statement tabloid ledger folio quatro 10x14 executive a3 a4 a5 b4 b5'
-complete -c gv -l scale        -d 'Selects the scale N, or arbitrary scale f.f' -x
-complete -c gv -l scalebase    -d 'Selects the scale base N' -x
-complete -c gv -l swap         -d 'Interchange the meaning of the orientations landscape and seascape'
-complete -c gv -l noswap       -d 'Do not interchange the meaning of the orientation landscape and seascape'
-complete -c gv -l antialias    -d 'Use antialiasing'
-complete -c gv -l noantialias  -d 'Do not use antialiasing'
-complete -c gv -l dsc          -d 'Dsc comments are respected'
-complete -c gv -l nodsc        -d 'Dsc comments are not respected'
-complete -c gv -l eof          -d 'Ignore the postscript EOF comment while scanning documents'
-complete -c gv -l noeof        -d 'Do not ignore the postscript EOF comment while scanning documents'
-complete -c gv -l pixmap       -d 'Use backing pixmap'
-complete -c gv -l nopixmap     -d 'Do not use backing pixmap'
-complete -c gv -l watch        -d 'Watch the document file for changes'
-complete -c gv -l nowatch      -d 'Do not watch the document file for changes'
-complete -c gv -l help         -d 'Print a help message and exit'
-complete -c gv -l usage        -d 'Print a usage message and exit'
-complete -c gv -l resize       -d 'Fit the size of the window to the size of the page'
-complete -c gv -l noresize     -d 'Do not fit the size of the window to the size of the page'
-complete -c gv -o geometry     -d 'Set geometry'
-complete -c gv -l ad           -d 'Read and use additional resources from FILE (higher priority)' -r
-complete -c gv -l style        -d 'Read and use additional resources from FILE (lower priority)' -r
-complete -c gv -l password     -d 'Sets the password for opening encrypted PDF files' -x
-complete -c gv -l spartan      -d 'Shortcut for --style=gv_spartan.dat'
-complete -c gv -l widgetless   -d 'Shortcut for --style=gv_widgetless.dat'
-complete -c gv -l fullscreen   -d 'Start in fullscreen mode (needs support from WM)'
+complete -c gv -l monochrome -d 'Display document using only black and white'
+complete -c gv -l grayscale -d 'Display document without colors'
+complete -c gv -l color -d 'Display document as usual'
+complete -c gv -l safer -d 'Start ghostscript in safe mode'
+complete -c gv -l nosafer -d 'Do not start ghostscript in safe mode'
+complete -c gv -l safedir -d 'Start ghostscript from a safe diretory'
+complete -c gv -l nosafedir -d 'Do not start ghostscript from a safe diretory'
+complete -c gv -l quiet -d 'Start ghostscript with the -dQUIET option'
+complete -c gv -l noquiet -d 'Do not start ghostscript with the -dQUIET option'
+complete -c gv -l infoSilent -d 'Do not show any messages in the info popup window'
+complete -c gv -l infoErrors -d 'Do not show warning messages in the info popup window'
+complete -c gv -l infoAll -d 'Do show all messages in the info popup window'
+complete -c gv -l arguments -d 'Start ghostscript with additional options as specified by the string ARGS' -x
+complete -c gv -l page -d 'Display the page with label LABEL first' -x
+complete -c gv -l center -d 'The page should be centered automatically'
+complete -c gv -l nocenter -d 'The page should not be centered automatically'
+complete -c gv -l media -d 'Selects the paper size to be used'
+complete -c gv -l orientation -d 'Sets the orientation of the page' -xa 'automatic bbox letter legal statement tabloid ledger folio quatro 10x14 executive a3 a4 a5 b4 b5'
+complete -c gv -l scale -d 'Selects the scale N, or arbitrary scale f.f' -x
+complete -c gv -l scalebase -d 'Selects the scale base N' -x
+complete -c gv -l swap -d 'Interchange the meaning of the orientations landscape and seascape'
+complete -c gv -l noswap -d 'Do not interchange the meaning of the orientation landscape and seascape'
+complete -c gv -l antialias -d 'Use antialiasing'
+complete -c gv -l noantialias -d 'Do not use antialiasing'
+complete -c gv -l dsc -d 'Dsc comments are respected'
+complete -c gv -l nodsc -d 'Dsc comments are not respected'
+complete -c gv -l eof -d 'Ignore the postscript EOF comment while scanning documents'
+complete -c gv -l noeof -d 'Do not ignore the postscript EOF comment while scanning documents'
+complete -c gv -l pixmap -d 'Use backing pixmap'
+complete -c gv -l nopixmap -d 'Do not use backing pixmap'
+complete -c gv -l watch -d 'Watch the document file for changes'
+complete -c gv -l nowatch -d 'Do not watch the document file for changes'
+complete -c gv -l help -d 'Print a help message and exit'
+complete -c gv -l usage -d 'Print a usage message and exit'
+complete -c gv -l resize -d 'Fit the size of the window to the size of the page'
+complete -c gv -l noresize -d 'Do not fit the size of the window to the size of the page'
+complete -c gv -o geometry -d 'Set geometry'
+complete -c gv -l ad -d 'Read and use additional resources from FILE (higher priority)' -r
+complete -c gv -l style -d 'Read and use additional resources from FILE (lower priority)' -r
+complete -c gv -l password -d 'Sets the password for opening encrypted PDF files' -x
+complete -c gv -l spartan -d 'Shortcut for --style=gv_spartan.dat'
+complete -c gv -l widgetless -d 'Shortcut for --style=gv_widgetless.dat'
+complete -c gv -l fullscreen -d 'Start in fullscreen mode (needs support from WM)'
 complete -c gv -l presentation -d 'Presentation mode '
-complete -c gv -l version      -d 'Show gv version and exit'
+complete -c gv -l version -d 'Show gv version and exit'
 
diff --git a/share/completions/head.fish b/share/completions/head.fish
index 9539a392c..ab304d01e 100644
--- a/share/completions/head.fish
+++ b/share/completions/head.fish
@@ -1,11 +1,11 @@
 if head --version >/dev/null 2>/dev/null
-	complete -c head -s c -l bytes -d 'Print the first N bytes; Leading '-', truncate the last N bytes' -r
-	complete -c head -s n -l lines -d 'Print the first N lines; Leading '-', truncate the last N lines' -r
-	complete -c head -s q -l quiet -l silent -d 'Never print file names'
-	complete -c head -s v -l verbose -d 'Always print file names'
-	complete -f -c head -l version -d 'Display version'
-	complete -f -c head -l help -d 'Display help'
+    complete -c head -s c -l bytes -d 'Print the first N bytes; Leading '-', truncate the last N bytes' -r
+    complete -c head -s n -l lines -d 'Print the first N lines; Leading '-', truncate the last N lines' -r
+    complete -c head -s q -l quiet -l silent -d 'Never print file names'
+    complete -c head -s v -l verbose -d 'Always print file names'
+    complete -f -c head -l version -d 'Display version'
+    complete -f -c head -l help -d 'Display help'
 else # OSX and similar - no longopts (and fewer shortopts)
-	complete -c head -s c -d 'Print the first N bytes' -r
-	complete -c head -s n -d 'Print the first N lines' -r
+    complete -c head -s c -d 'Print the first N bytes' -r
+    complete -c head -s n -d 'Print the first N lines' -r
 end
diff --git a/share/completions/help.fish b/share/completions/help.fish
index 2ff41eb76..a262eeeb1 100644
--- a/share/completions/help.fish
+++ b/share/completions/help.fish
@@ -1,5 +1,5 @@
 if test -d "$__fish_data_dir/man/man1/"
-	complete -c help -x -a '(__fish_print_commands)' -d 'Help for this command'
+    complete -c help -x -a '(__fish_print_commands)' -d 'Help for this command'
 end
 
 # Help topics
diff --git a/share/completions/heroku.fish b/share/completions/heroku.fish
index ae46b8ef5..fba361414 100644
--- a/share/completions/heroku.fish
+++ b/share/completions/heroku.fish
@@ -107,7 +107,7 @@ complete $heroku_looking -xa addons:upgrade -d 'upgrade an existing addon'
 complete -c heroku -n '__fish_heroku_using_command addons:upgrade' -fa '(__fish_list_installed_addons)'
 
 # Apps options and subcommands
-complete -c heroku -n '__fish_heroku_using_command apps' -s o -l org -l ORG    -d "the org to list the apps for"
+complete -c heroku -n '__fish_heroku_using_command apps' -s o -l org -l ORG -d "the org to list the apps for"
 complete -c heroku -n '__fish_heroku_using_command apps' -s A -l all -d "list all apps in the org. Not just joined apps"
 complete -c heroku -n '__fish_heroku_using_command apps' -s p -l personal -d "list apps in personal account when a default org is set"
 
diff --git a/share/completions/hg.fish b/share/completions/hg.fish
index de772ef26..3bafe3832 100644
--- a/share/completions/hg.fish
+++ b/share/completions/hg.fish
@@ -375,7 +375,7 @@ function __fish_hg_using_command --argument-names cmd
 end
 
 function __fish_hg_needs_command
-    not __fish_hg_get_command > /dev/null
+    not __fish_hg_get_command >/dev/null
 end
 
 # global options
diff --git a/share/completions/highlight.fish b/share/completions/highlight.fish
index 5c788cc47..5a34862b7 100644
--- a/share/completions/highlight.fish
+++ b/share/completions/highlight.fish
@@ -1,8 +1,8 @@
 
 complete -c highlight -s O -l out-format -d 'Output file in given format' -xa 'xterm256 latex tex rtf html xhtml ansi bbcode svg'
-complete -c highlight -s t -l tab        -d 'Specify tab length' -x
-complete -c highlight -s i -l input      -d 'Name of the input file' -r
-complete -c highlight -s o -l output     -d 'Name of the output file' -r
-complete -c highlight -s d -l outdir     -d 'Output directory' -r
-complete -c highlight -s S -l syntax     -d 'Set type of the source code' -xa "(highlight -p | sed -r 's/^(.*\S)\s+:\s*(\S+).*\$/\2\t\1/; /^\$/d')"
-complete -c highlight -s s -l style      -d 'Highlight style' -xa "(highlight --list-themes | sed '/^\$\| /d')"
+complete -c highlight -s t -l tab -d 'Specify tab length' -x
+complete -c highlight -s i -l input -d 'Name of the input file' -r
+complete -c highlight -s o -l output -d 'Name of the output file' -r
+complete -c highlight -s d -l outdir -d 'Output directory' -r
+complete -c highlight -s S -l syntax -d 'Set type of the source code' -xa "(highlight -p | sed -r 's/^(.*\S)\s+:\s*(\S+).*\$/\2\t\1/; /^\$/d')"
+complete -c highlight -s s -l style -d 'Highlight style' -xa "(highlight --list-themes | sed '/^\$\| /d')"
diff --git a/share/completions/hugo.fish b/share/completions/hugo.fish
index 565e40a5f..db993bd54 100644
--- a/share/completions/hugo.fish
+++ b/share/completions/hugo.fish
@@ -9,8 +9,8 @@ function __fish_hugo_command
     set -l skip 1
     for token in $tokens[2..-1]
         if test $skip -eq 0
-        	set skip 1
-		else
+            set skip 1
+        else
             switch $token
                 case "--config" "--logFile"
                     set skip 0
@@ -40,61 +40,61 @@ end
 
 # Global options
 
-complete -c hugo      -l config     -f -d "Configuration file"
-complete -c hugo      -l debug      -f -d "Debug output"
-complete -c hugo      -l log        -f -d "Enable logging"
-complete -c hugo      -l logFile    -r -d "Log file"
-complete -c hugo      -l quiet      -f -d "Quiet mode"
-complete -c hugo -s v -l verbose    -f -d "Verbose output"
-complete -c hugo      -l verboseLog -f -d "Verbose logging"
+complete -c hugo -l config -f -d "Configuration file"
+complete -c hugo -l debug -f -d "Debug output"
+complete -c hugo -l log -f -d "Enable logging"
+complete -c hugo -l logFile -r -d "Log file"
+complete -c hugo -l quiet -f -d "Quiet mode"
+complete -c hugo -s v -l verbose -f -d "Verbose output"
+complete -c hugo -l verboseLog -f -d "Verbose logging"
 
 # Main-like commands
 
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s b -l baseURL               -r -d "Hostname and path to the root"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s B -l buildDrafts           -f -d "Include content marked as draft"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s E -l buildExpired          -f -d "Include expired content"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s F -l buildFuture           -f -d "Include content with publishdate in the future"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l cacheDir              -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l canonifyURLs          -f -d "Canonicalize all relative URLs using baseurl"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l cleanDestinationDir   -f -d "Remove files from destination not found in static directories"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s c -l contentDir            -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s d -l destination           -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disable404            -f -d "Do not build 404 page"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableKinds          -r -d "Disable different kinds of pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableRSS            -f -d "Do not build RSS files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableSitemap        -f -d "Do not build sitemap files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l enableGitInfo         -f -d "Add Git revision, date and author info to the pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l forceSyncStatic       -f -d "Copy all files when static is changed"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s h -l help                  -f -d "Help for hugo"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l i18n-warnings         -f -d "Print missing translations"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l ignoreCache           -f -d "Ignore the cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s l -l layoutDir             -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l noChmod               -f -d "Do not sync permission mode of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l noTimes               -f -d "Do not sync modification time of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l pluralizeListTitles   -f -d "Pluralize titles in lists using inflect"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l renderToMemory        -f -d "Render to memory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s s -l source                -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l stepAnalysis          -f -d "Display memory and timing of different steps of the program"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l templateMetrics       -f -d "Display metrics about template executions"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l templateMetricsHints  -f -d "Calculate some improvement hints when combined with --templateMetrics"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s t -l theme                 -r -d "Theme to use"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l themesDir             -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l uglyURLs              -f -d "Use /filename.html instead of /filename/"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s w -l watch                 -f -d "Watch filesystem for changes and recreate as needed"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s b -l baseURL -r -d "Hostname and path to the root"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s B -l buildDrafts -f -d "Include content marked as draft"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s E -l buildExpired -f -d "Include expired content"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s F -l buildFuture -f -d "Include content with publishdate in the future"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l cacheDir -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l canonifyURLs -f -d "Canonicalize all relative URLs using baseurl"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l cleanDestinationDir -f -d "Remove files from destination not found in static directories"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s c -l contentDir -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s d -l destination -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disable404 -f -d "Do not build 404 page"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableKinds -r -d "Disable different kinds of pages"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableRSS -f -d "Do not build RSS files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableSitemap -f -d "Do not build sitemap files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l enableGitInfo -f -d "Add Git revision, date and author info to the pages"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l forceSyncStatic -f -d "Copy all files when static is changed"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s h -l help -f -d "Help for hugo"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l i18n-warnings -f -d "Print missing translations"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l ignoreCache -f -d "Ignore the cache directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s l -l layoutDir -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l noChmod -f -d "Do not sync permission mode of files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l noTimes -f -d "Do not sync modification time of files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l pluralizeListTitles -f -d "Pluralize titles in lists using inflect"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l renderToMemory -f -d "Render to memory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetrics -f -d "Display metrics about template executions"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s t -l theme -r -d "Theme to use"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l themesDir -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l uglyURLs -f -d "Use /filename.html instead of /filename/"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s w -l watch -f -d "Watch filesystem for changes and recreate as needed"
 
 # Commands
 
 # benchmark
 complete -c hugo -n "not __fish_hugo_command" -f -a benchmark -d "Benchmark Hugo by building the site a number of times"
-complete -c hugo -n "__fish_hugo_using_command benchmark" -s n -l count                -f -d "Number of times to build the site"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l cpuprofile           -r -d "CPU profile file"
-complete -c hugo -n "__fish_hugo_using_command benchmark" -s h -l help                 -f -d "Help for benchmark"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l memprofile           -r -d "Memory profile file"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l renderToMemory       -f -d "Render to memory"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l stepAnalysis         -f -d "Display memory and timing of different steps of the program"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l templateMetrics      -f -d "Display metrics about template executions"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -s n -l count -f -d "Number of times to build the site"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l cpuprofile -r -d "CPU profile file"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -s h -l help -f -d "Help for benchmark"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l memprofile -r -d "Memory profile file"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l renderToMemory -f -d "Render to memory"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l templateMetrics -f -d "Display metrics about template executions"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
 
 # check
 complete -c hugo -n "not __fish_hugo_command" -f -a check -d "Perform some verification checks"
@@ -110,10 +110,10 @@ complete -c hugo -n "__fish_hugo_using_command config" -s h -l help -f -d "Help
 
 # convert
 complete -c hugo -n "not __fish_hugo_command" -f -a convert -d "Convert the content to different formats"
-complete -c hugo -n "__fish_hugo_using_command convert" -s h -l help   -f -d "Help for convert"
+complete -c hugo -n "__fish_hugo_using_command convert" -s h -l help -f -d "Help for convert"
 complete -c hugo -n "__fish_hugo_using_command convert" -s o -l output -f -a "(__fish_complete_directories (commandline -ct) 'Output directory')" -d "Output directory"
 complete -c hugo -n "__fish_hugo_using_command convert" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
-complete -c hugo -n "__fish_hugo_using_command convert"      -l unsafe -f -d "Enable less safe operations"
+complete -c hugo -n "__fish_hugo_using_command convert" -l unsafe -f -d "Enable less safe operations"
 
 # convert toJSON
 complete -c hugo -n "__fish_hugo_using_command convert" -f -a toJSON -d "Convert front matter to JSON"
@@ -137,40 +137,40 @@ complete -c hugo -n "__fish_hugo_using_command gen" -s h -l help -f -d "Help for
 
 # gen autocomplete
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a autocomplete -d "Generate shell autocompletion script for Hugo"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete"      -l completionfile -r -d "Autocompletion file"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -s h -l help           -f -d "Help for autocomplete"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete"      -l type           -f -a bash -d "Autocompletion type"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -l completionfile -r -d "Autocompletion file"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -s h -l help -f -d "Help for autocomplete"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -l type -f -a bash -d "Autocompletion type"
 
 # gen chromastyles
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a chromastyles -d "Generate CSS stylesheet for the Chroma code highlighter"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -s h -l help           -f -d "Help for chromastyles"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l highlightStyle -r -d "Style used for highlighting lines"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l lineStyle      -r -d "Style used for line numbers"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l style          -r -d "Highlighter style"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -s h -l help -f -d "Help for chromastyles"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l highlightStyle -r -d "Style used for highlighting lines"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l lineStyle -r -d "Style used for line numbers"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l style -r -d "Highlighter style"
 
 # gen doc
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a doc -d "Generate Markdown documentation for the Hugo CLI"
-complete -c hugo -n "__fish_hugo_using_command gen doc"      -l dir  -f -a "(__fish_complete_directories (commandline -ct) 'Doc directory')" -d "Doc directory"
+complete -c hugo -n "__fish_hugo_using_command gen doc" -l dir -f -a "(__fish_complete_directories (commandline -ct) 'Doc directory')" -d "Doc directory"
 complete -c hugo -n "__fish_hugo_using_command gen doc" -s h -l help -f -d "Help for doc"
 
 # gen man
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a man -d "Generate man pages for the Hugo CLI"
-complete -c hugo -n "__fish_hugo_using_command gen man"      -l dir  -f -a "(__fish_complete_directories (commandline -ct) 'Man pages directory')" -d "Man pages directory"
+complete -c hugo -n "__fish_hugo_using_command gen man" -l dir -f -a "(__fish_complete_directories (commandline -ct) 'Man pages directory')" -d "Man pages directory"
 complete -c hugo -n "__fish_hugo_using_command gen man" -s h -l help -f -d "Help for man"
 
 # import
 complete -c hugo -n "not __fish_hugo_command" -f -a import -d "Import your site from others"
-complete -c hugo -n "__fish_hugo_using_command import" -s h -l help   -f -d "Help for import"
+complete -c hugo -n "__fish_hugo_using_command import" -s h -l help -f -d "Help for import"
 
 # import jekyll
 complete -c hugo -n "__fish_hugo_using_command import" -f -a jekyll -d "Import from Jekyll"
-complete -c hugo -n "__fish_hugo_using_command import jekyll"      -l force -f -d "Allow import into non-empty target directory"
-complete -c hugo -n "__fish_hugo_using_command import jekyll" -s h -l help  -f -d "Help for jekyll"
+complete -c hugo -n "__fish_hugo_using_command import jekyll" -l force -f -d "Allow import into non-empty target directory"
+complete -c hugo -n "__fish_hugo_using_command import jekyll" -s h -l help -f -d "Help for jekyll"
 
 # list
 complete -c hugo -n "not __fish_hugo_command" -f -a list -d "List various types of content"
-complete -c hugo -n "__fish_hugo_using_command list" -s h -l help    -f -d "Help for list"
-complete -c hugo -n "__fish_hugo_using_command list" -s s -l source  -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
+complete -c hugo -n "__fish_hugo_using_command list" -s h -l help -f -d "Help for list"
+complete -c hugo -n "__fish_hugo_using_command list" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
 
 # list drafts
 complete -c hugo -n "__fish_hugo_using_command list" -f -a drafts -d "List all drafts"
@@ -186,16 +186,16 @@ complete -c hugo -n "__fish_hugo_using_command list future" -s h -l help -f -d "
 
 # new
 complete -c hugo -n "not __fish_hugo_command" -f -a new -d "Create new content"
-complete -c hugo -n "__fish_hugo_using_command new"      -l editor -r -d "Editor to use"
-complete -c hugo -n "__fish_hugo_using_command new" -s h -l help   -f -d "Help for new"
-complete -c hugo -n "__fish_hugo_using_command new" -s k -l kind   -r -d "Content type to create"
+complete -c hugo -n "__fish_hugo_using_command new" -l editor -r -d "Editor to use"
+complete -c hugo -n "__fish_hugo_using_command new" -s h -l help -f -d "Help for new"
+complete -c hugo -n "__fish_hugo_using_command new" -s k -l kind -r -d "Content type to create"
 complete -c hugo -n "__fish_hugo_using_command new" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
 
 # new site
 complete -c hugo -n "__fish_hugo_using_command new" -f -a site -d "Create a new site"
-complete -c hugo -n "__fish_hugo_using_command new site"      -l force  -f -d "Create site inside non-empty directory"
+complete -c hugo -n "__fish_hugo_using_command new site" -l force -f -d "Create site inside non-empty directory"
 complete -c hugo -n "__fish_hugo_using_command new site" -s f -l format -r -d "Config and front matter format"
-complete -c hugo -n "__fish_hugo_using_command new site" -s h -l help   -f -d "Help for site"
+complete -c hugo -n "__fish_hugo_using_command new site" -s h -l help -f -d "Help for site"
 
 # new theme
 complete -c hugo -n "__fish_hugo_using_command new" -f -a theme -d "Create a new theme"
@@ -203,18 +203,18 @@ complete -c hugo -n "__fish_hugo_using_command new theme" -s h -l help -f -d "He
 
 # server
 complete -c hugo -n "not __fish_hugo_command" -f -a server -d "Start high performance web server"
-complete -c hugo -n "__fish_hugo_using_command server"      -l appendPort        -f -d "Append port to baseurl"
-complete -c hugo -n "__fish_hugo_using_command server"      -l bind              -r -d "Interface to which the server will bind"
-complete -c hugo -n "__fish_hugo_using_command server"      -l disableFastRender -f -d "Enable full re-renders on changes"
-complete -c hugo -n "__fish_hugo_using_command server"      -l disableLiveReload -f -d "Watch without enabling live browser reload on rebuild"
-complete -c hugo -n "__fish_hugo_using_command server" -s h -l help              -f -d "Help for server"
-complete -c hugo -n "__fish_hugo_using_command server"      -l liveReloadPort    -r -d "Port for live reloading"
-complete -c hugo -n "__fish_hugo_using_command server"      -l meminterval       -f -d "Interval to poll memory usage"
-complete -c hugo -n "__fish_hugo_using_command server"      -l memstats          -f -d "Memory usage log file"
-complete -c hugo -n "__fish_hugo_using_command server"      -l navigateToChanged -f -d "Navigate to changed content file on live browser reload"
-complete -c hugo -n "__fish_hugo_using_command server"      -l noHTTPCache       -f -d "Prevent HTTP caching"
-complete -c hugo -n "__fish_hugo_using_command server" -s p -l port              -r -d "Port on which the server will listen"
-complete -c hugo -n "__fish_hugo_using_command server"      -l renderToDisk      -r -d "Render to destination directory"
+complete -c hugo -n "__fish_hugo_using_command server" -l appendPort -f -d "Append port to baseurl"
+complete -c hugo -n "__fish_hugo_using_command server" -l bind -r -d "Interface to which the server will bind"
+complete -c hugo -n "__fish_hugo_using_command server" -l disableFastRender -f -d "Enable full re-renders on changes"
+complete -c hugo -n "__fish_hugo_using_command server" -l disableLiveReload -f -d "Watch without enabling live browser reload on rebuild"
+complete -c hugo -n "__fish_hugo_using_command server" -s h -l help -f -d "Help for server"
+complete -c hugo -n "__fish_hugo_using_command server" -l liveReloadPort -r -d "Port for live reloading"
+complete -c hugo -n "__fish_hugo_using_command server" -l meminterval -f -d "Interval to poll memory usage"
+complete -c hugo -n "__fish_hugo_using_command server" -l memstats -f -d "Memory usage log file"
+complete -c hugo -n "__fish_hugo_using_command server" -l navigateToChanged -f -d "Navigate to changed content file on live browser reload"
+complete -c hugo -n "__fish_hugo_using_command server" -l noHTTPCache -f -d "Prevent HTTP caching"
+complete -c hugo -n "__fish_hugo_using_command server" -s p -l port -r -d "Port on which the server will listen"
+complete -c hugo -n "__fish_hugo_using_command server" -l renderToDisk -r -d "Render to destination directory"
 
 # undraft
 complete -c hugo -n "not __fish_hugo_command" -f -a undraft -d "Reset the content draft status"
diff --git a/share/completions/identify.fish b/share/completions/identify.fish
index 0d56fe3d2..f4ae7c5e7 100644
--- a/share/completions/identify.fish
+++ b/share/completions/identify.fish
@@ -1,33 +1,33 @@
-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]'
-complete -c identify -o define                      -d 'Define one or more image format options [format:option]'
-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 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 matte                       -d 'Store matte channel if the image has one'
-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 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'
-complete -c identify -o units                       -d 'The units of image resolution [type]' -xa '(identify -list units)'
-complete -c identify -o verbose                     -d 'Print detailed information about the image'
-complete -c identify -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(identify -list virtual-pixel)'
-complete -c identify -o negate                      -d 'Replace each pixel with its complementary color'
-complete -c identify -o debug                       -d 'Display copious debugging information [events]' -xa '(identify -list debug)'
-complete -c identify -o help                        -d 'Print program options'
-complete -c identify -o log                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+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]'
+complete -c identify -o define -d 'Define one or more image format options [format:option]'
+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 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 matte -d 'Store matte channel if the image has one'
+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 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'
+complete -c identify -o units -d 'The units of image resolution [type]' -xa '(identify -list units)'
+complete -c identify -o verbose -d 'Print detailed information about the image'
+complete -c identify -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(identify -list virtual-pixel)'
+complete -c identify -o negate -d 'Replace each pixel with its complementary color'
+complete -c identify -o debug -d 'Display copious debugging information [events]' -xa '(identify -list debug)'
+complete -c identify -o help -d 'Print program options'
+complete -c identify -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
diff --git a/share/completions/iex.fish b/share/completions/iex.fish
index 199a53280..1396db79a 100644
--- a/share/completions/iex.fish
+++ b/share/completions/iex.fish
@@ -1,16 +1,16 @@
-complete -f -c iex -s v        -d "Prints version and exit"
-complete -f -c iex -s e        -d "Evaluates the given command"
-complete    -c iex -s r        -d "Requires the given files/patterns"
-complete    -c iex -s S        -d "Finds and executes the given script"
-complete    -c iex -s pr       -d "Requires the given files/patterns in parallel"
-complete    -c iex -s pa       -d "Prepends the given path to Erlang code path"
-complete    -c iex -s pz       -d "Appends the given path to Erlang code path"
-complete    -c iex -l app      -d "Start the given app and its dependencies"
-complete -f -c iex -l erl      -d "Switches to be passed down to erlang"
-complete -f -c iex -l name     -d "Makes and assigns a name to the distributed node"
-complete -f -c iex -l sname    -d "Makes and assigns a short name to the distributed node"
-complete -f -c iex -l cookie   -d "Sets a cookie for this distributed node"
-complete -f -c iex -l hidden   -d "Makes a hidden node"
+complete -f -c iex -s v -d "Prints version and exit"
+complete -f -c iex -s e -d "Evaluates the given command"
+complete -c iex -s r -d "Requires the given files/patterns"
+complete -c iex -s S -d "Finds and executes the given script"
+complete -c iex -s pr -d "Requires the given files/patterns in parallel"
+complete -c iex -s pa -d "Prepends the given path to Erlang code path"
+complete -c iex -s pz -d "Appends the given path to Erlang code path"
+complete -c iex -l app -d "Start the given app and its dependencies"
+complete -f -c iex -l erl -d "Switches to be passed down to erlang"
+complete -f -c iex -l name -d "Makes and assigns a name to the distributed node"
+complete -f -c iex -l sname -d "Makes and assigns a short name to the distributed node"
+complete -f -c iex -l cookie -d "Sets a cookie for this distributed node"
+complete -f -c iex -l hidden -d "Makes a hidden node"
 complete -f -c iex -l detached -d "Starts the Erlang VM detached from console"
-complete -f -c iex -l remsh    -d "Connects to a node using a remote shell"
-complete    -c iex -l dot-iex  -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
\ No newline at end of file
+complete -f -c iex -l remsh -d "Connects to a node using a remote shell"
+complete -c iex -l dot-iex -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
\ No newline at end of file
diff --git a/share/completions/ifdata.fish b/share/completions/ifdata.fish
index a1aa62955..af4a8a3e9 100644
--- a/share/completions/ifdata.fish
+++ b/share/completions/ifdata.fish
@@ -1,31 +1,31 @@
 complete -c ifdata -xa '(__fish_print_interfaces)'
-complete -c ifdata -o e   -d 'Reports interface existence via return code'
-complete -c ifdata -o p   -d 'Print out the whole config of iface'
-complete -c ifdata -o pe   -d 'Print out yes or no according to existence'
-complete -c ifdata -o pa   -d 'Print out the address'
-complete -c ifdata -o pn   -d 'Print netmask'
-complete -c ifdata -o pN   -d 'Print network address'
-complete -c ifdata -o pb   -d 'Print broadcast'
-complete -c ifdata -o pm   -d 'Print mtu'
-complete -c ifdata -o ph   -d 'Print out the hardware address'
-complete -c ifdata -o pf   -d 'Print flags'
-complete -c ifdata -o si   -d 'Print all statistics on input'
-complete -c ifdata -o sip   -d 'Print # of in packets'
-complete -c ifdata -o sib   -d 'Print # of in bytes'
-complete -c ifdata -o sie   -d 'Print # of in errors'
-complete -c ifdata -o sid   -d 'Print # of in drops'
-complete -c ifdata -o sif   -d 'Print # of in fifo overruns'
-complete -c ifdata -o sic   -d 'Print # of in compress'
-complete -c ifdata -o sim   -d 'Print # of in multicast'
-complete -c ifdata -o so   -d 'Print all statistics on output'
-complete -c ifdata -o sop   -d 'Print # of out packets'
-complete -c ifdata -o sob   -d 'Print # of out bytes'
-complete -c ifdata -o soe   -d 'Print # of out errors'
-complete -c ifdata -o sod   -d 'Print # of out drops'
-complete -c ifdata -o sof   -d 'Print # of out fifo overruns'
-complete -c ifdata -o sox   -d 'Print # of out collisions'
-complete -c ifdata -o soc   -d 'Print # of out carrier loss'
-complete -c ifdata -o som   -d 'Print # of out multicast'
-complete -c ifdata -o bips   -d 'Print # of incoming bytes per second'
-complete -c ifdata -o bops   -d 'Print # of outgoing bytes per second'
+complete -c ifdata -o e -d 'Reports interface existence via return code'
+complete -c ifdata -o p -d 'Print out the whole config of iface'
+complete -c ifdata -o pe -d 'Print out yes or no according to existence'
+complete -c ifdata -o pa -d 'Print out the address'
+complete -c ifdata -o pn -d 'Print netmask'
+complete -c ifdata -o pN -d 'Print network address'
+complete -c ifdata -o pb -d 'Print broadcast'
+complete -c ifdata -o pm -d 'Print mtu'
+complete -c ifdata -o ph -d 'Print out the hardware address'
+complete -c ifdata -o pf -d 'Print flags'
+complete -c ifdata -o si -d 'Print all statistics on input'
+complete -c ifdata -o sip -d 'Print # of in packets'
+complete -c ifdata -o sib -d 'Print # of in bytes'
+complete -c ifdata -o sie -d 'Print # of in errors'
+complete -c ifdata -o sid -d 'Print # of in drops'
+complete -c ifdata -o sif -d 'Print # of in fifo overruns'
+complete -c ifdata -o sic -d 'Print # of in compress'
+complete -c ifdata -o sim -d 'Print # of in multicast'
+complete -c ifdata -o so -d 'Print all statistics on output'
+complete -c ifdata -o sop -d 'Print # of out packets'
+complete -c ifdata -o sob -d 'Print # of out bytes'
+complete -c ifdata -o soe -d 'Print # of out errors'
+complete -c ifdata -o sod -d 'Print # of out drops'
+complete -c ifdata -o sof -d 'Print # of out fifo overruns'
+complete -c ifdata -o sox -d 'Print # of out collisions'
+complete -c ifdata -o soc -d 'Print # of out carrier loss'
+complete -c ifdata -o som -d 'Print # of out multicast'
+complete -c ifdata -o bips -d 'Print # of incoming bytes per second'
+complete -c ifdata -o bops -d 'Print # of outgoing bytes per second'
 
diff --git a/share/completions/ifup.fish b/share/completions/ifup.fish
index 8965a28ad..fb74d9218 100644
--- a/share/completions/ifup.fish
+++ b/share/completions/ifup.fish
@@ -1,2 +1,2 @@
 complete -x -c ifup -a "(__fish_print_interfaces)" -d "Network interface"
-complete -c ifup -l force  -d "force"
+complete -c ifup -l force -d "force"
diff --git a/share/completions/import.fish b/share/completions/import.fish
index 85fa2f144..bb12ab76c 100644
--- a/share/completions/import.fish
+++ b/share/completions/import.fish
@@ -1,69 +1,69 @@
-complete -c import -o adjoin                        -d 'Join images into a single multi-image file'
-complete -c import -o border                        -d 'Include window border in the output image'
-complete -c import -o channel                       -d 'Apply option to select image channels [type]' -xa '(import -list channel)'
-complete -c import -o colorspace                    -d 'Alternate image colorspace [type]' -xa '(import -list colorspace)'
-complete -c import -o comment                       -d 'Annotate image with comment [string]'
-complete -c import -o compress                      -d 'Type of pixel compression when writing the image [type]' -xa '(import -list compress)'
-complete -c import -o define                        -d 'Define one or more image format options [format:option]'
-complete -c import -o density                       -d 'Horizontal and vertical density of the image [geometry]'
-complete -c import -o depth                         -d 'Image depth [value]'
-complete -c import -o descend                       -d 'Obtain image by descending window hierarchy'
-complete -c import -o display                       -d 'X server to contact [server]'
-complete -c import -o dispose                       -d 'Layer disposal method [method]' -xa '(import -list dispose)'
-complete -c import -o dither                        -d 'Apply error diffusion to image [method]' -xa '(import -list dither)'
-complete -c import -o delay                         -d 'Display the next image after pausing [value]'
-complete -c import -o encipher                      -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c import -o endian                        -d 'Endianness (MSB or LSB) of the image [type]' -xa '(import -list endian)'
-complete -c import -o encoding                      -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c import -o filter                        -d 'Use this filter when resizing an image [type]' -xa '(import -list filter)'
-complete -c import -o format                        -d 'Output formatted image characteristics ["string"]'
-complete -c import -o frame                         -d 'Include window manager frame'
-complete -c import -o gravity                       -d 'Direction which direction to gravitate towards'
-complete -c import -o identify                      -d 'Identify the format and characteristics of the image'
-complete -c import -o interlace                     -d 'None, Line, Plane, or Partition [type]' -xa '(import -list interlace)'
-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 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]'
-complete -c import -o quality                       -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c import -o quiet                         -d 'Suppress all warning messages'
-complete -c import -o regard-warnings               -d 'Pay attention to warning messages'
-complete -c import -o respect-parentheses           -d 'Settings remain in effect until parenthesis boundary'
-complete -c import -o sampling-factor               -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c import -o scene                         -d 'Image scene number [value]'
-complete -c import -o screen                        -d 'Select image from root window'
-complete -c import -o seed                          -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c import -o set                           -d 'Set an image property [property value]'
-complete -c import -o silent                        -d 'Operate silently, i.e. don\'t ring any bells '
-complete -c import -o snaps                         -d 'Number of screen snapshots [value]'
-complete -c import -o synchronize                   -d 'Synchronize image to storage device'
-complete -c import -o taint                         -d 'Declare the image as modified'
-complete -c import -o transparent-color             -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c import -o treedepth                     -d 'Color tree depth [value]'
-complete -c import -o verbose                       -d 'Print detailed information about the image'
-complete -c import -o virtual-pixel                 -d 'Constant, Edge, Mirror, or Tile [method]' -xa '(import -list virtual-pixel)'
-complete -c import -o window                        -d 'Select window with this id or name [id]' -xa 'root (__fish_print_xwindows)'
-complete -c import -o annotate                      -d 'Annotate the image with text [geometry text]'
-complete -c import -o colors                        -d 'Preferred number of colors in the image [value]'
-complete -c import -o crop                          -d 'Preferred size and location of the cropped image [geometry]'
-complete -c import -o geometry                      -d 'Preferred size or location of the image [geometry]'
-complete -c import -o help                          -d 'Print program options'
-complete -c import -o monochrome                    -d 'Transform image to black and white'
-complete -c import -o negate                        -d 'Replace every pixel with its complementary color '
-complete -c import -o repage                        -d 'Size and location of an image canvas [geometry]'
-complete -c import -o quantize                      -d 'Reduce colors in this colorspace [colorspace]' -xa '(import -list colorspace)'
-complete -c import -o resize                        -d 'Resize the image [geometry]'
-complete -c import -o rotate                        -d 'Apply Paeth rotation to the image [degrees]'
-complete -c import -o strip                         -d 'Strip image of all profiles and comments'
-complete -c import -o thumbnail                     -d 'Create a thumbnail of the image [geometry]'
-complete -c import -o transparent                   -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c import -o trim                          -d 'Trim image edges'
-complete -c import -o type                          -d 'Image type [type]' -xa '(import -list type)'
-complete -c import -o debug                         -d 'Display copious debugging information [events]' -xa '(import -list debug)'
-complete -c import -o list                          -d 'Print a list of supported option arguments [type]' -xa '(import -list list)'
-complete -c import -o log                           -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c import -o version                       -d 'Print version information'
-complete -c import -o support                       -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c import -o adjoin -d 'Join images into a single multi-image file'
+complete -c import -o border -d 'Include window border in the output image'
+complete -c import -o channel -d 'Apply option to select image channels [type]' -xa '(import -list channel)'
+complete -c import -o colorspace -d 'Alternate image colorspace [type]' -xa '(import -list colorspace)'
+complete -c import -o comment -d 'Annotate image with comment [string]'
+complete -c import -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(import -list compress)'
+complete -c import -o define -d 'Define one or more image format options [format:option]'
+complete -c import -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c import -o depth -d 'Image depth [value]'
+complete -c import -o descend -d 'Obtain image by descending window hierarchy'
+complete -c import -o display -d 'X server to contact [server]'
+complete -c import -o dispose -d 'Layer disposal method [method]' -xa '(import -list dispose)'
+complete -c import -o dither -d 'Apply error diffusion to image [method]' -xa '(import -list dither)'
+complete -c import -o delay -d 'Display the next image after pausing [value]'
+complete -c import -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c import -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(import -list endian)'
+complete -c import -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c import -o filter -d 'Use this filter when resizing an image [type]' -xa '(import -list filter)'
+complete -c import -o format -d 'Output formatted image characteristics ["string"]'
+complete -c import -o frame -d 'Include window manager frame'
+complete -c import -o gravity -d 'Direction which direction to gravitate towards'
+complete -c import -o identify -d 'Identify the format and characteristics of the image'
+complete -c import -o interlace -d 'None, Line, Plane, or Partition [type]' -xa '(import -list interlace)'
+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 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]'
+complete -c import -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c import -o quiet -d 'Suppress all warning messages'
+complete -c import -o regard-warnings -d 'Pay attention to warning messages'
+complete -c import -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c import -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c import -o scene -d 'Image scene number [value]'
+complete -c import -o screen -d 'Select image from root window'
+complete -c import -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c import -o set -d 'Set an image property [property value]'
+complete -c import -o silent -d 'Operate silently, i.e. don\'t ring any bells '
+complete -c import -o snaps -d 'Number of screen snapshots [value]'
+complete -c import -o synchronize -d 'Synchronize image to storage device'
+complete -c import -o taint -d 'Declare the image as modified'
+complete -c import -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c import -o treedepth -d 'Color tree depth [value]'
+complete -c import -o verbose -d 'Print detailed information about the image'
+complete -c import -o virtual-pixel -d 'Constant, Edge, Mirror, or Tile [method]' -xa '(import -list virtual-pixel)'
+complete -c import -o window -d 'Select window with this id or name [id]' -xa 'root (__fish_print_xwindows)'
+complete -c import -o annotate -d 'Annotate the image with text [geometry text]'
+complete -c import -o colors -d 'Preferred number of colors in the image [value]'
+complete -c import -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c import -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c import -o help -d 'Print program options'
+complete -c import -o monochrome -d 'Transform image to black and white'
+complete -c import -o negate -d 'Replace every pixel with its complementary color '
+complete -c import -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c import -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(import -list colorspace)'
+complete -c import -o resize -d 'Resize the image [geometry]'
+complete -c import -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c import -o strip -d 'Strip image of all profiles and comments'
+complete -c import -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c import -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c import -o trim -d 'Trim image edges'
+complete -c import -o type -d 'Image type [type]' -xa '(import -list type)'
+complete -c import -o debug -d 'Display copious debugging information [events]' -xa '(import -list debug)'
+complete -c import -o list -d 'Print a list of supported option arguments [type]' -xa '(import -list list)'
+complete -c import -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c import -o version -d 'Print version information'
+complete -c import -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/invoke-rc.d.fish b/share/completions/invoke-rc.d.fish
index d3f50ded6..fcccafc36 100644
--- a/share/completions/invoke-rc.d.fish
+++ b/share/completions/invoke-rc.d.fish
@@ -1,11 +1,11 @@
 
 function __fish_invoke_rcd_has_service
-  set tokens (commandline -opc)
-  if [ (count $tokens) -eq 2 ]
-    return 0
-  else
-    return 1
-  end
+    set tokens (commandline -opc)
+    if [ (count $tokens) -eq 2 ]
+        return 0
+    else
+        return 1
+    end
 end
 
 complete -f -c invoke-rc.d -n 'not __fish_invoke_rcd_has_service' -a '(__fish_print_debian_services)'
diff --git a/share/completions/ipset.fish b/share/completions/ipset.fish
index b76948cbf..294665120 100644
--- a/share/completions/ipset.fish
+++ b/share/completions/ipset.fish
@@ -1,22 +1,22 @@
 function __fish_ipset_nosubcommand
-	if __fish_seen_subcommand_from create add del test destroy list save restore flush rename swap help version
-		return 1
-	end
-	return 0
+    if __fish_seen_subcommand_from create add del test destroy list save restore flush rename swap help version
+        return 1
+    end
+    return 0
 end
 
 function __fish_ipset_needs_setname
-	if __fish_seen_subcommand_from add del test destroy list save restore flush rename swap
-		return 0
-	end
-	return 1
+    if __fish_seen_subcommand_from add del test destroy list save restore flush rename swap
+        return 0
+    end
+    return 1
 end
 
 function __fish_ipset_list_sets
-	set -l ipset_list (ipset list --name 2>/dev/null)
-	if not __fish_seen_subcommand_from $ipset_list
-		echo $ipset_list
-	end
+    set -l ipset_list (ipset list --name 2>/dev/null)
+    if not __fish_seen_subcommand_from $ipset_list
+        echo $ipset_list
+    end
 end
 
 complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'create' -d 'Create a set identified with SETNAME'
@@ -29,7 +29,7 @@ complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'list' -d
 
 complete -c ipset --no-files --condition __fish_ipset_needs_setname -a '(__fish_ipset_list_sets)'
 
-complete -c ipset --no-files -s '!' -o 'exist' -d 'Ignore errors'
+complete -c ipset --no-files -s ! -o 'exist' -d 'Ignore errors'
 complete -c ipset --no-files -s 'o' -o 'output' -a 'plain save xml' -d 'Output format to the list command'
 complete -c ipset --no-files -s 'q' -o 'quiet' -d 'Suppress any output'
 complete -c ipset --no-files -s 'r' -o 'resolve' -d 'Enforce name lookup'
diff --git a/share/completions/j.fish b/share/completions/j.fish
index 689e338f8..a44f90987 100644
--- a/share/completions/j.fish
+++ b/share/completions/j.fish
@@ -1,10 +1,10 @@
 function __history_completions --argument limit
-	if echo $limit | string match -q ""
-	    set limit 25
-	end
+    if echo $limit | string match -q ""
+        set limit 25
+    end
 
-	set -l tokens (commandline --current-process --tokenize)
-	history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | head -n$limit
+    set -l tokens (commandline --current-process --tokenize)
+    history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | head -n$limit
 end
 
 # erase the stock autojump completions, which are no longer needed with this
diff --git a/share/completions/jhipster.fish b/share/completions/jhipster.fish
index 65633f417..2a09f47e9 100644
--- a/share/completions/jhipster.fish
+++ b/share/completions/jhipster.fish
@@ -11,27 +11,27 @@ function __fish_prog_needs_command
 end
 
 # Options
-complete -f -c jhipster -n '__fish_prog_needs_command' -s d -l debug   -d 'Enable debugger'
-complete -f -c jhipster -n '__fish_prog_needs_command' -s h -l help    -d 'Output usage information'
+complete -f -c jhipster -n '__fish_prog_needs_command' -s d -l debug -d 'Enable debugger'
+complete -f -c jhipster -n '__fish_prog_needs_command' -s h -l help -d 'Output usage information'
 complete -f -c jhipster -n '__fish_prog_needs_command' -s V -l version -d 'Output version number'
 
 # Commands
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a app             -d 'Create a new JHipster application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a aws             -d 'Deploy the current application to AWS'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a ci-cd           -d 'Create pipeline scripts for popular CI tools'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a client          -d 'Create a new JHipster client-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a cloudfoundry    -d 'Prepare Cloud Foundry deployment'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a docker-compose  -d 'Create all required Docker deployment configuration for the selected applications'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a entity          -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a export-jdl      -d 'Create a JDL file from the existing entities'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a heroku          -d 'Deploy the current application to Heroku'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a import-jdl      -d 'Create entities from the JDL file passed in argument'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a info            -d 'Display information about your current project and system'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a kubernetes      -d 'Deploy the current application to Kubernetes'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a languages       -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a openshift       -d 'Deploy the current application to OpenShift'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a rancher-compose -d 'Deploy the current application to Rancher'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a server          -d 'Create a new JHipster server-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a service         -d 'Create a new Spring service bean'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a upgrade         -d 'Upgrade the JHipster version and the generated application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a completion      -d 'Print command completion script'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a app -d 'Create a new JHipster application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a aws -d 'Deploy the current application to AWS'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a ci-cd -d 'Create pipeline scripts for popular CI tools'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a client -d 'Create a new JHipster client-side application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a cloudfoundry -d 'Prepare Cloud Foundry deployment'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a docker-compose -d 'Create all required Docker deployment configuration for the selected applications'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a entity -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a export-jdl -d 'Create a JDL file from the existing entities'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a heroku -d 'Deploy the current application to Heroku'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a import-jdl -d 'Create entities from the JDL file passed in argument'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a info -d 'Display information about your current project and system'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a kubernetes -d 'Deploy the current application to Kubernetes'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a languages -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a openshift -d 'Deploy the current application to OpenShift'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a rancher-compose -d 'Deploy the current application to Rancher'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a server -d 'Create a new JHipster server-side application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a service -d 'Create a new Spring service bean'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a upgrade -d 'Upgrade the JHipster version and the generated application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a completion -d 'Print command completion script'
diff --git a/share/completions/kill.fish b/share/completions/kill.fish
index c128aacd6..c38a6926f 100644
--- a/share/completions/kill.fish
+++ b/share/completions/kill.fish
@@ -1,24 +1,24 @@
 __fish_make_completion_signals
 
 for i in $__kill_signals
-	set number (echo $i | cut -d " " -f 1)
-	set name (echo $i | cut -d " " -f 2)
-	complete -c kill -o $number -d $name
-	complete -c kill -o $name
-	complete -c kill -s s -x -a "$number $name"
+    set number (echo $i | cut -d " " -f 1)
+    set name (echo $i | cut -d " " -f 2)
+    complete -c kill -o $number -d $name
+    complete -c kill -o $name
+    complete -c kill -s s -x -a "$number $name"
 end
 
 complete -c kill -xa '(__fish_complete_pids)'
 
-if kill -L > /dev/null 2>/dev/null
-	complete -c kill -s s -l signal -d "Signal to send"
-	complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
-	complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
-	complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
-	complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
-	complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2).  The value argument is an integer that is sent along with the signal."
-	complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
+if kill -L >/dev/null 2>/dev/null
+    complete -c kill -s s -l signal -d "Signal to send"
+    complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
+    complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
+    complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
+    complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
+    complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2).  The value argument is an integer that is sent along with the signal."
+    complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
 else # OS X
-	complete -c kill -s s -d "Signal to send"
-	complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
+    complete -c kill -s s -d "Signal to send"
+    complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
 end
\ No newline at end of file
diff --git a/share/completions/kitchen.fish b/share/completions/kitchen.fish
index ae7f78b3d..a42faec7e 100644
--- a/share/completions/kitchen.fish
+++ b/share/completions/kitchen.fish
@@ -1,18 +1,18 @@
 # Fish Shell command-line completions for Test Kitchen
 
 function __fish_kitchen_no_command -d 'Test if kitchen has yet to be given the main command'
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 1
+    set -l cmd (commandline -opc)
+    test (count $cmd) -eq 1
 end
 
 function __fish_kitchen_using_command
-  set -l cmd (commandline -opc)
-  set -q cmd[2]; and test "$argv[1]" = $cmd[2]
+    set -l cmd (commandline -opc)
+    set -q cmd[2]; and test "$argv[1]" = $cmd[2]
 end
 
 function __fish_kitchen_using_command_and_no_subcommand
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 2; and test "$argv[1]" = "$cmd[2]"
+    set -l cmd (commandline -opc)
+    test (count $cmd) -eq 2; and test "$argv[1]" = "$cmd[2]"
 end
 
 function __fish_kitchen_using_subcommand --argument-names cmd_main cmd_sub
@@ -46,9 +46,9 @@ complete -c kitchen -f -n '__fish_kitchen_using_command list' -a '(__fish_kitche
 # diagnose commands
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a diagnose -d "Show computed diagnostic configuration"
 complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "loader" -d "Include data loader diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "instances" -d "Include instances diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "all" -d "Include all diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "loader" -d "Include data loader diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "instances" -d "Include instances diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "all" -d "Include all diagnostics"
 
 # diagnose help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a diagnose -d "Show computed diagnostic configuration"
@@ -122,7 +122,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "c" -l "concurr
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a test against all matching instances concurrently. "
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "d" -l "destroy" -d "Destroy strategy to use after testing (passing, always, never)."
-complete -c kitchen -f -n '__fish_kitchen_using_command test'  -l "auto_init" -d "Invoke init command if .kitchen.yml is missing"
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -l "auto_init" -d "Invoke init command if .kitchen.yml is missing"
 
 # test help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a test -d "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
@@ -143,7 +143,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command login' -a '(__fish_kitch
 # exec commands
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a exec -d "Execute command on one or more instance"
 complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "c" -l "command" -d "execute via ssh"
+complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "c" -l command -d "execute via ssh"
 
 # exec help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a exec -d "Execute command on one or more instance"
@@ -173,7 +173,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a console -d "Kit
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
 complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "D" -l "driver" -d "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "P" -l "provisioner" -d "The default Kitchen Provisioner to use "
-complete -c kitchen -f -n '__fish_kitchen_using_command init'  -l "create_gemfile" -d "Whether or not to create a Gemfile if one does not exist. Default: false "
+complete -c kitchen -f -n '__fish_kitchen_using_command init' -l "create_gemfile" -d "Whether or not to create a Gemfile if one does not exist. Default: false "
 
 # init help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
diff --git a/share/completions/kldload.fish b/share/completions/kldload.fish
index 2eccf2027..d97fde5eb 100644
--- a/share/completions/kldload.fish
+++ b/share/completions/kldload.fish
@@ -1,27 +1,27 @@
 # Completions for the FreeBSD `kldload` kernel module load utility
 function __fish_list_kldload_options
-	set -l klds (__fish_complete_suffix /boot/kernel/(commandline -ct) ".ko" | string replace -r '.*/(.+)\\.ko' '$1');
-	# Completing available klds is fast, but completing it with a call to __fish_whatis
-	# is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following:
-	# 10671   11892698    > complete -C"kldload "
-	# A 12 second completion delay is obviously out of the question, so don't provide a description unless there are
-	# fewer than 50 results.
-	# Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module
-	# in question does not exist, since the paths are hardcoded.
-	set -l kld_count (count $klds)
-	if test $kld_count -le 50 -a $kld_count -gt 0
-		# print name and description
-		for kld in $klds
-			printf '%s\t%s\n' $kld (test -e /usr/share/man/man4/$kld.4.gz;
+    set -l klds (__fish_complete_suffix /boot/kernel/(commandline -ct) ".ko" | string replace -r '.*/(.+)\\.ko' '$1')
+    # Completing available klds is fast, but completing it with a call to __fish_whatis
+    # is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following:
+    # 10671   11892698    > complete -C"kldload "
+    # A 12 second completion delay is obviously out of the question, so don't provide a description unless there are
+    # fewer than 50 results.
+    # Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module
+    # in question does not exist, since the paths are hardcoded.
+    set -l kld_count (count $klds)
+    if test $kld_count -le 50 -a $kld_count -gt 0
+        # print name and description
+        for kld in $klds
+            printf '%s\t%s\n' $kld (test -e /usr/share/man/man4/$kld.4.gz;
 				and __fish_whatis $kld; or echo "kernel module")
-		end
-	else if test $kld_count -gt 0
-		# print name only
-		printf '%s\n' $klds
-	else
-		# print name only (description won't exist since the kernel module isn't installed)
-		__fish_complete_suffix .ko
-	end
+        end
+    else if test $kld_count -gt 0
+        # print name only
+        printf '%s\n' $klds
+    else
+        # print name only (description won't exist since the kernel module isn't installed)
+        __fish_complete_suffix .ko
+    end
 end
 
 
diff --git a/share/completions/kldunload.fish b/share/completions/kldunload.fish
index d2db86e12..318ed5994 100644
--- a/share/completions/kldunload.fish
+++ b/share/completions/kldunload.fish
@@ -1,12 +1,12 @@
 function __fish_list_loaded_klds
-	set -l klds (kldstat | string match -r '\b\S+.ko$')
-	for kld in $klds
-		if set -l description (__fish_whatis (string replace '.ko' '' -- $kld) "kernel module")
-			printf '%s\t%s\n' $kld $description
-		else
-			printf '%s\n' $kld
-		end
-	end
+    set -l klds (kldstat | string match -r '\b\S+.ko$')
+    for kld in $klds
+        if set -l description (__fish_whatis (string replace '.ko' '' -- $kld) "kernel module")
+            printf '%s\t%s\n' $kld $description
+        else
+            printf '%s\n' $kld
+        end
+    end
 end
 
 complete -c kldunload -xa '(__fish_list_loaded_klds)'
diff --git a/share/completions/latexmk.fish b/share/completions/latexmk.fish
index 07818dfe3..35e3b9493 100644
--- a/share/completions/latexmk.fish
+++ b/share/completions/latexmk.fish
@@ -1,72 +1,72 @@
 complete -c latexmk -x -a "(__fish_complete_suffix (commandline -ct) .tex '(La)TeX file')"
-complete -c latexmk -o bibtex      -d 'use bibtex when needed (default)'
-complete -c latexmk -o bibtex-     -d 'never use bibtex'
+complete -c latexmk -o bibtex -d 'use bibtex when needed (default)'
+complete -c latexmk -o bibtex- -d 'never use bibtex'
 complete -c latexmk -o bibtex-cond -d 'use bibtex when needed, but only if the bib files exist'
-complete -c latexmk -o bm -x       -d 'Print message across the page when converting to postscript'
-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 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 dependents  -o -deps -d 'Show list of dependent files after processing'
+complete -c latexmk -o bm -x -d 'Print message across the page when converting to postscript'
+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 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 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 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 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 deps-out= -r -d 'Set name of output file for dependency list, and turn on showing of 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 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 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)'
-complete -c latexmk -o new-viewer   -d 'in -pvc mode, always start a new viewer'
-complete -c latexmk -o new-viewer-  -d 'in -pvc mode, start a new viewer only if needed'
-complete -c latexmk -o nobibtex     -d 'never use bibtex'
+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)'
+complete -c latexmk -o new-viewer -d 'in -pvc mode, always start a new viewer'
+complete -c latexmk -o new-viewer- -d 'in -pvc mode, start a new viewer only if needed'
+complete -c latexmk -o nobibtex -d 'never use bibtex'
 complete -c latexmk -o nodependents -d 'Do not show list of dependent files after processing'
-complete -c latexmk -o norc         -d 'omit automatic reading of system, user and project rc files'
+complete -c latexmk -o norc -d 'omit automatic reading of system, user and project rc files'
 complete -c latexmk -o output-directory= -o outdir= -d 'set name of directory for output files' -xa '(__fish_complete_directories)'
-complete -c latexmk -o pdf          -d 'generate pdf by pdflatex'
-complete -c latexmk -o pdfdvi       -d 'generate pdf by dvipdf'
-complete -c latexmk -o pdflatex=    -d 'set program used for pdflatex' -xa '(__fish_complete_command)'
-complete -c latexmk -o pdfps        -d 'generate pdf by ps2pdf'
-complete -c latexmk -o pdf-         -d 'turn off pdf'
-complete -c latexmk -o ps           -d 'generate postscript'
-complete -c latexmk -o ps-          -d 'turn off postscript'
-complete -c latexmk -o pF -x        -d 'Filter to apply to postscript file'
-complete -c latexmk -o p            -d 'print document after generating postscript'
-complete -c latexmk -o print=dvi    -d 'when file is to be printed, print the dvi file'
-complete -c latexmk -o print=ps     -d 'when file is to be printed, print the ps file (default)'
-complete -c latexmk -o print=pdf    -d 'when file is to be printed, print the pdf file'
-complete -c latexmk -o pv   -d 'preview document'
-complete -c latexmk -o pv-  -d 'turn off preview mode'
-complete -c latexmk -o pvc  -d 'preview document and continuously update'
+complete -c latexmk -o pdf -d 'generate pdf by pdflatex'
+complete -c latexmk -o pdfdvi -d 'generate pdf by dvipdf'
+complete -c latexmk -o pdflatex= -d 'set program used for pdflatex' -xa '(__fish_complete_command)'
+complete -c latexmk -o pdfps -d 'generate pdf by ps2pdf'
+complete -c latexmk -o pdf- -d 'turn off pdf'
+complete -c latexmk -o ps -d 'generate postscript'
+complete -c latexmk -o ps- -d 'turn off postscript'
+complete -c latexmk -o pF -x -d 'Filter to apply to postscript file'
+complete -c latexmk -o p -d 'print document after generating postscript'
+complete -c latexmk -o print=dvi -d 'when file is to be printed, print the dvi file'
+complete -c latexmk -o print=ps -d 'when file is to be printed, print the ps file (default)'
+complete -c latexmk -o print=pdf -d 'when file is to be printed, print the pdf file'
+complete -c latexmk -o pv -d 'preview document'
+complete -c latexmk -o pv- -d 'turn off preview mode'
+complete -c latexmk -o pvc -d 'preview document and continuously update'
 complete -c latexmk -o pvc- -d 'turn off -pvc'
 complete -c latexmk -o quiet -d 'silence progress messages from called programs'
-complete -c latexmk -o r -r  -d 'Read custom RC file'
-complete -c latexmk -o recorder  -d 'Use -recorder option for (pdf)latex'
+complete -c latexmk -o r -r -d 'Read custom RC file'
+complete -c latexmk -o recorder -d 'Use -recorder option for (pdf)latex'
 complete -c latexmk -o recorder- -d 'Do not use -recorder option for (pdf)latex'
-complete -c latexmk -o rules   -d 'Show list of rules after processing'
-complete -c latexmk -o rules-  -d 'Do not show list of rules after processing'
-complete -c latexmk -o silent  -d 'silence progress messages from called programs'
-complete -c latexmk -o time    -d 'show CPU time used'
-complete -c latexmk -o time-   -d 'don\'t show CPU time used'
-complete -c latexmk -o use-make  -d 'use the make program to try to make missing files'
+complete -c latexmk -o rules -d 'Show list of rules after processing'
+complete -c latexmk -o rules- -d 'Do not show list of rules after processing'
+complete -c latexmk -o silent -d 'silence progress messages from called programs'
+complete -c latexmk -o time -d 'show CPU time used'
+complete -c latexmk -o time- -d 'don\'t show CPU time used'
+complete -c latexmk -o use-make -d 'use the make program to try to make missing files'
 complete -c latexmk -o use-make- -d 'don\'t use the make program to try to make missing files'
-complete -c latexmk -o v       -d 'display program version'
+complete -c latexmk -o v -d 'display program version'
 complete -c latexmk -o verbose -d 'display usual progress messages from called programs'
-complete -c latexmk -o version      -d 'display program version'
+complete -c latexmk -o version -d 'display program version'
 complete -c latexmk -o view=default -d 'viewer is default (dvi, ps, pdf)'
-complete -c latexmk -o view=dvi     -d 'viewer is for dvi'
-complete -c latexmk -o view=none    -d 'no viewer is used'
-complete -c latexmk -o view=ps      -d 'viewer is for ps'
-complete -c latexmk -o view=pdf     -d 'viewer is for pdf'
+complete -c latexmk -o view=dvi -d 'viewer is for dvi'
+complete -c latexmk -o view=none -d 'no viewer is used'
+complete -c latexmk -o view=ps -d 'viewer is for ps'
+complete -c latexmk -o view=pdf -d 'viewer is for pdf'
 
diff --git a/share/completions/lein.fish b/share/completions/lein.fish
index 1006b0ebd..90174050d 100644
--- a/share/completions/lein.fish
+++ b/share/completions/lein.fish
@@ -1,9 +1,9 @@
 function __fish_lein_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 complete -f -c lein -n '__fish_lein_needs_command' -a check -d "Check syntax and warn on reflection."
diff --git a/share/completions/light.fish b/share/completions/light.fish
index 5b33abba8..7839335fa 100644
--- a/share/completions/light.fish
+++ b/share/completions/light.fish
@@ -2,7 +2,7 @@
 # See: https://github.com/haikarainen/light
 
 function __fish_print_light_controllers
-  command light -L
+    command light -L
 end
 
 complete -c light -s h -d 'Print help and exit'
diff --git a/share/completions/ln.fish b/share/completions/ln.fish
index fbc0bf61c..a8c79e1dc 100644
--- a/share/completions/ln.fish
+++ b/share/completions/ln.fish
@@ -1,16 +1,16 @@
-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'
-complete -c ln -s f -l force               -d 'Remove existing destination files'
-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 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 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'
+complete -c ln -s f -l force -d 'Remove existing destination files'
+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 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 v -l verbose -d 'Print name of each linked file'
 
-complete -c ln -f   -l help                -d 'Display help and exit'
-complete -c ln -f   -l version             -d 'Output version information and exit'
+complete -c ln -f -l help -d 'Display help and exit'
+complete -c ln -f -l version -d 'Output version information and exit'
diff --git a/share/completions/localectl.fish b/share/completions/localectl.fish
index 16e99b69a..715ff86f7 100644
--- a/share/completions/localectl.fish
+++ b/share/completions/localectl.fish
@@ -3,22 +3,22 @@ set -l commands status set-locale list-locales set-keymap list-keymaps set-x11-k
 
 complete -c localectl -f
 for cmd in $commands
-	complete -c localectl -n "not __fish_seen_subcommand_from $commands" -a $cmd
+    complete -c localectl -n "not __fish_seen_subcommand_from $commands" -a $cmd
 end
 set -l localevars LANG LC_MESSAGES LC_{CTYPE,NUMERIC,TIME,COLLATE,MONETARY,MESSAGES,PAPER,NAME,ADDRESS,TELEPHONE,MEASUREMENT,IDENTIFICATION,ALL}
 set -l locales $localevars=(localectl list-locales)
 
 function __fish_localectl_layout
-	set -l cmd (commandline -poc)
-	set -e cmd[1]
-	set -e cmd[1]
-	for l in (localectl list-x11-keymap-layouts)
-		if contains -- $l $cmd
-			echo $l
-			return 0
-		end
-	end
-	return 1
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
+    set -e cmd[1]
+    for l in (localectl list-x11-keymap-layouts)
+        if contains -- $l $cmd
+            echo $l
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c localectl -n "__fish_seen_subcommand_from set-locale" -a "$locales"
diff --git a/share/completions/locate.fish b/share/completions/locate.fish
index 04aea4dd1..2a1c821ac 100644
--- a/share/completions/locate.fish
+++ b/share/completions/locate.fish
@@ -1,17 +1,17 @@
 
-complete -c locate -s A -l 'all'          -d 'Match all non-option arguments'
-complete -c locate -s b -l 'basename'     -d 'Match against the base name of the file'
-complete -c locate -s c -l 'count'        -d 'Print only the number of matches found'
-complete -c locate -s d -l 'database' -r  -d 'Use different DATABASE file[s]'
-complete -c locate -s e -l 'existing'     -d 'Match only existing files'
-complete -c locate -s L -l 'follow'       -d 'Consider broken symbolic links to be non-existing files'
-complete -c locate -s P -l 'nofollow'     -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s H -l 'nofollow'     -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s i -l 'ignore-case'  -d 'Ignore case distinctions'
-complete -c locate -s l -l 'limit' -r     -d 'Limit  the number of matches'
-complete -c locate -s 0 -l 'null'         -d 'Use ASCII NUL as a separator'
-complete -c locate -s S -l 'statistics'   -d 'Print statistics about databases and exit'
-complete -c locate -s w -l 'wholename'    -d 'Match against the whole name of the file'
-complete -c locate -s r -l 'regex'        -d 'The pattern is a regular expression'
-complete -c locate -s h -l 'help'         -d 'Print a summary of the options and exit'
-complete -c locate -s V -l 'version'      -d 'Print the version number and exit'
+complete -c locate -s A -l 'all' -d 'Match all non-option arguments'
+complete -c locate -s b -l 'basename' -d 'Match against the base name of the file'
+complete -c locate -s c -l 'count' -d 'Print only the number of matches found'
+complete -c locate -s d -l 'database' -r -d 'Use different DATABASE file[s]'
+complete -c locate -s e -l 'existing' -d 'Match only existing files'
+complete -c locate -s L -l 'follow' -d 'Consider broken symbolic links to be non-existing files'
+complete -c locate -s P -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s H -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s i -l 'ignore-case' -d 'Ignore case distinctions'
+complete -c locate -s l -l 'limit' -r -d 'Limit  the number of matches'
+complete -c locate -s 0 -l 'null' -d 'Use ASCII NUL as a separator'
+complete -c locate -s S -l 'statistics' -d 'Print statistics about databases and exit'
+complete -c locate -s w -l 'wholename' -d 'Match against the whole name of the file'
+complete -c locate -s r -l 'regex' -d 'The pattern is a regular expression'
+complete -c locate -s h -l 'help' -d 'Print a summary of the options and exit'
+complete -c locate -s V -l 'version' -d 'Print the version number and exit'
diff --git a/share/completions/lpadmin.fish b/share/completions/lpadmin.fish
index acfc57eeb..171d9c50e 100644
--- a/share/completions/lpadmin.fish
+++ b/share/completions/lpadmin.fish
@@ -9,12 +9,12 @@ complete -c lpadmin -s D -d 'Provides a textual description of the destination'
 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' -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=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 o -xa job-page-limit=  -d 'Sets the page limit for per-user quotas (int) '
+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)'
diff --git a/share/completions/ls.fish b/share/completions/ls.fish
index 786536f6b..a1dfe711d 100644
--- a/share/completions/ls.fish
+++ b/share/completions/ls.fish
@@ -6,7 +6,7 @@
 set -l uname (uname -s)
 complete -c ls -s C -d "Force multi-column output"
 test "$uname" != SunOS
-    and complete -c ls -s S -d "Sort by size"
+and complete -c ls -s S -d "Sort by size"
 complete -c ls -s m -d "Comma-separated format, fills across screen"
 complete -c ls -s x -d "Multi-column output, horizontally listed"
 complete -c ls -s 1 -d "List one entry per line"
@@ -107,7 +107,7 @@ else
 
     complete -c ls -s i -d "Show inode numbers for files"
     test "$uname" != SunOS
-        and complete -c ls -s k -d "for -s: Display sizes in kB, not blocks" # GNU sets block size with -k
+    and complete -c ls -s k -d "for -s: Display sizes in kB, not blocks" # GNU sets block size with -k
     complete -c ls -s q -d "Replace non-graphic characters with '?'"
     complete -c ls -s r -d "Reverse sort order"
     complete -c ls -s s -d "Show file sizes"
@@ -116,8 +116,8 @@ else
     complete -c ls -s l -d "Long listing format"
     complete -c ls -s n -d "Long format, numerical UIDs and GIDs"
     contains "$uname" FreeBSD NetBSD OpenBSD DragonFly
-        and complete -c ls -o o -d "Long format, show file flags" # annoying BSD
-        or complete -c ls -s o -d "Long format, omit group names" # annoying POSIX
+    and complete -c ls -o o -d "Long format, show file flags" # annoying BSD
+    or complete -c ls -s o -d "Long format, omit group names" # annoying POSIX
 
     complete -c ls -s A -d "Show hidden except . and .."
     complete -c ls -s a -d "Show hidden entries"
@@ -129,7 +129,7 @@ else
 
     complete -c ls -s L -d "Follow all symlinks Cancels -P option"
     test "$uname" != NetBSD
-        and complete -c ls -s H -d "Follow symlink given on commandline" # not present on netbsd
+    and complete -c ls -s H -d "Follow symlink given on commandline" # not present on netbsd
 
     complete -c ls -s R -d "Recursively list subdirectories"
     complete -c ls -s d -d "List directories, not their content"
diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish
index c3dce3efd..359d2d328 100644
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -1,16 +1,16 @@
-complete -c lsblk -s a -l all         -d "print all devices"
-complete -c lsblk -s b -l bytes       -d "print SIZE in bytes rather than in human readable format"
-complete -c lsblk -s d -l nodeps      -d "don't print slaves or holders"
-complete -c lsblk -s D -l discard     -d "print discard capabilities"
-complete -c lsblk -s e -l exclude     -d "exclude devices by major number (default: RAM disks)"
-complete -c lsblk -s f -l fs          -d "output info about filesystems"
-complete -c lsblk -s h -l help        -d "usage information (this)"
-complete -c lsblk -s i -l ascii       -d "use ascii characters only"
-complete -c lsblk -s m -l perms       -d "output info about permissions"
-complete -c lsblk -s n -l noheadings  -d "don't print headings"
-complete -c lsblk -s o -l output      -d "output columns" -xa '( __fish_complete_list , __fish_print_lsblk_columns )'
-complete -c lsblk -s P -l pairs       -d "use key='value' output format"
-complete -c lsblk -s r -l raw         -d "use raw output format"
-complete -c lsblk -s t -l topology    -d "output info about topology"
-complete -c lsblk -s l -l list        -d "use list format ouput"
+complete -c lsblk -s a -l all -d "print all devices"
+complete -c lsblk -s b -l bytes -d "print SIZE in bytes rather than in human readable format"
+complete -c lsblk -s d -l nodeps -d "don't print slaves or holders"
+complete -c lsblk -s D -l discard -d "print discard capabilities"
+complete -c lsblk -s e -l exclude -d "exclude devices by major number (default: RAM disks)"
+complete -c lsblk -s f -l fs -d "output info about filesystems"
+complete -c lsblk -s h -l help -d "usage information (this)"
+complete -c lsblk -s i -l ascii -d "use ascii characters only"
+complete -c lsblk -s m -l perms -d "output info about permissions"
+complete -c lsblk -s n -l noheadings -d "don't print headings"
+complete -c lsblk -s o -l output -d "output columns" -xa '( __fish_complete_list , __fish_print_lsblk_columns )'
+complete -c lsblk -s P -l pairs -d "use key='value' output format"
+complete -c lsblk -s r -l raw -d "use raw output format"
+complete -c lsblk -s t -l topology -d "output info about topology"
+complete -c lsblk -s l -l list -d "use list format ouput"
 
diff --git a/share/completions/lunchy.fish b/share/completions/lunchy.fish
index ea1538b6f..954cf9bf8 100644
--- a/share/completions/lunchy.fish
+++ b/share/completions/lunchy.fish
@@ -1,40 +1,40 @@
 function __fish_lunchy_needs_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if test (count $cmd) -eq 1
-    return 0
-  end
+    if test (count $cmd) -eq 1
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_lunchy_using_command
-  set cmd (commandline -opc)
-  set cmd_count (count $cmd)
+    set cmd (commandline -opc)
+    set cmd_count (count $cmd)
 
-  if test $cmd_count -lt 2
-    return 1
-  end
-
-  for arg in $argv
-    if test $arg = $cmd[2]
-      return 0
+    if test $cmd_count -lt 2
+        return 1
     end
-  end
 
-  return 1
+    for arg in $argv
+        if test $arg = $cmd[2]
+            return 0
+        end
+    end
+
+    return 1
 end
 
 complete -f -c lunchy -s v -l verbose -d 'Show command executions'
 
 # Commands
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a install   -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a install -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
 complete -f -c lunchy -n '__fish_lunchy_needs_command' -a 'ls list' -d 'Show the list of installed agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a start     -d 'Start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a stop      -d 'Stop the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a restart   -d 'Stop and start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a status    -d 'Show the PID and label for all agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a edit      -d 'Opens the launchctl daemon file in the default editor'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a start -d 'Start the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a stop -d 'Stop the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a restart -d 'Stop and start the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a status -d 'Show the PID and label for all agents'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a edit -d 'Opens the launchctl daemon file in the default editor'
 
 # Commands with service completion
 complete -f -c lunchy -n '__fish_lunchy_using_command ls list start stop restart status edit' -a '(lunchy ls)' -d 'Service'
diff --git a/share/completions/lxpanel.fish b/share/completions/lxpanel.fish
index 07b8bad20..fb97dada5 100644
--- a/share/completions/lxpanel.fish
+++ b/share/completions/lxpanel.fish
@@ -1,5 +1,5 @@
-complete -c lxpanel -s h -l help         -d 'print this help and exit'
-complete -c lxpanel -s v -l version      -d 'print version and exit'
-complete -c lxpanel -s p -l profile      -d 'use specified profile' -xa '(find ~/.config/lxpanel/ -maxdepth 1 -mindepth 1  -type d -printf "%f\n")'
-complete -c lxpanel -l log -r            -d 'set log level 0-5. 0 - none 5 - chatty'
+complete -c lxpanel -s h -l help -d 'print this help and exit'
+complete -c lxpanel -s v -l version -d 'print version and exit'
+complete -c lxpanel -s p -l profile -d 'use specified profile' -xa '(find ~/.config/lxpanel/ -maxdepth 1 -mindepth 1  -type d -printf "%f\n")'
+complete -c lxpanel -l log -r -d 'set log level 0-5. 0 - none 5 - chatty'
 
diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 277988c7b..847477b17 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -1,36 +1,36 @@
 complete -f -e -c machinectl
 
 set -l commands list status show start login enable disable poweroff reboot \
-terminate kill bind copy-{to,from} list-images image-status show-image clone rename read-only remove set-limit pull-{tar,raw,dkr} \
-{import,export}-{raw,tar} {list,cancel}-transfers shell
+    terminate kill bind copy-{to,from} list-images image-status show-image clone rename read-only remove set-limit pull-{tar,raw,dkr} \
+    {import,export}-{raw,tar} {list,cancel}-transfers shell
 
 function __fish_systemd_has_machine_image
-	set -l images (__fish_systemd_machine_images)
-	for i in $images ".host"
-		# Include ".host" here because it _is_ a valid machine
-		if contains -- $i (commandline -opc)
-			echo $i
-			return 0
-		end
-	end
-	return 1
+    set -l images (__fish_systemd_machine_images)
+    for i in $images ".host"
+        # Include ".host" here because it _is_ a valid machine
+        if contains -- $i (commandline -opc)
+            echo $i
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_systemd_has_machine
-	set -l cmd
-	if not count $argv >/dev/null
-		set cmd (commandline -opc)
-	else
-		set cmd $argv
-	end
-	set -l machines (__fish_systemd_machines)
-	for m in $machines
-		if contains -- $m $cmd
-			echo $m
-			return 0
-		end
-	end
-	return 1
+    set -l cmd
+    if not count $argv >/dev/null
+        set cmd (commandline -opc)
+    else
+        set cmd $argv
+    end
+    set -l machines (__fish_systemd_machines)
+    for m in $machines
+        if contains -- $m $cmd
+            echo $m
+            return 0
+        end
+    end
+    return 1
 end
 
 # General options
@@ -51,7 +51,7 @@ complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "sta
 complete -f -c machinectl -n "__fish_seen_subcommand_from status" -s l -l full -d "Do not ellipsize process tree entries"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s n -l lines -d "How many journal lines to show"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s o -l output -d "Formatting of journal output" -a \
-'short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
+    'short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
 
 complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "show" -d "Show properties of machines"
 complete -x -c machinectl -n "__fish_seen_subcommand_from show" -s p -l property -d "Limit to certain properties"
diff --git a/share/completions/magento.fish b/share/completions/magento.fish
index 5b65881f4..ee853377c 100644
--- a/share/completions/magento.fish
+++ b/share/completions/magento.fish
@@ -1,182 +1,182 @@
 function __fish_print_magento_url_protocols -d "Shows all available URL protocols"
-  echo http://
-  echo https://
+    echo http://
+    echo https://
 end
 
 function __fish_print_magento_mysql_engines
-  echo MyISAM\t"MyISAM storage engine"
-  echo InnoDB\t"Supports transactions, row-level locking, and foreign keys"
-  echo BLACKHOLE\t"/dev/null storage engine (anything you write to it disappears)"
-  echo MEMORY\t"Hash based, stored in memory, useful for temporary tables"
-  echo CSV\t"CSV storage engine"
-  echo ARCHIVE\t"Archive storage engine"
+    echo MyISAM\t"MyISAM storage engine"
+    echo InnoDB\t"Supports transactions, row-level locking, and foreign keys"
+    echo BLACKHOLE\t"/dev/null storage engine (anything you write to it disappears)"
+    echo MEMORY\t"Hash based, stored in memory, useful for temporary tables"
+    echo CSV\t"CSV storage engine"
+    echo ARCHIVE\t"Archive storage engine"
 end
 
 ###
 
 function __fish_print_magento_modules -d "Lists all Magento modules"
-  set -l modules (magento module:status)
+    set -l modules (magento module:status)
 
-  for i in $test
-    if test -n "$i" -a "$i" != "None"
-      echo $i 
+    for i in $test
+        if test -n "$i" -a "$i" != "None"
+            echo $i
+        end
     end
-  end
 end
 
 function __fish_magento_print_indexer_modes -d "Lists all indexer modes"
-  echo realtime\t"Index in realtime"
-  echo schedule\t"Index via cron jobs"
+    echo realtime\t"Index in realtime"
+    echo schedule\t"Index via cron jobs"
 end
 
 function __fish_print_magento_i18n_packing_modes -d "Shows all available packing modes"
-  echo replace\t"replace language pack by new one"
-  echo merge\t"merge language packages"
+    echo replace\t"replace language pack by new one"
+    echo merge\t"merge language packages"
 end
 
 function __fish_print_magento_available_ides -d "Shows all IDEs supported by magento"
-  echo phpstorm\t"JetBrains PhpStorm"
+    echo phpstorm\t"JetBrains PhpStorm"
 end
 
 function __fish_print_magento_available_tests -d "Shows all available magento tests"
-  echo all\t"all tests"
-  echo unit\t"unit tests only"
-  echo integration\t"integration tests only"
-  echo integration-all\t"all integration tests"
-  echo static\t"static file tests only"
-  echo static-all\t"all static file tests"
-  echo integrity\t"integrity tests only"
-  echo legacy\t"legacy tests only"
-  echo default\t"all tests"  
+    echo all\t"all tests"
+    echo unit\t"unit tests only"
+    echo integration\t"integration tests only"
+    echo integration-all\t"all integration tests"
+    echo static\t"static file tests only"
+    echo static-all\t"all static file tests"
+    echo integrity\t"integrity tests only"
+    echo legacy\t"legacy tests only"
+    echo default\t"all tests"
 end
 
 function __fish_print_magento_theme_areas -d "Shows all available magento theme areas"
-	echo frontend\t"Frontend"
-	echo adminhtml\t"Backend"
+    echo frontend\t"Frontend"
+    echo adminhtml\t"Backend"
 end
 
 function __fish_print_magento_languages -d "Shows all existing magento languages"
-	echo af_ZA\t"Afrikaans (South Africa)"
-	echo sq_AL\t"Albanian (Albania)"
-	echo ar_DZ\t"Arabic (Algeria)"
-	echo ar_EG\t"Arabic (Egypt)"
-	echo ar_KW\t"Arabic (Kuwait)"
-	echo ar_MA\t"Arabic (Morocco)"
-	echo ar_SA\t"Arabic (Saudi Arabia)"
-	echo az_Latn_AZ\t"Azerbaijani (Azerbaijan)"
-	echo eu_ES\t"Basque (Spain)"
-	echo be_BY\t"Belarusian (Belarus)"
-	echo bn_BD\t"Bengali (Bangladesh)"
-	echo bs_Latn_BA\t"Bosnian (Bosnia and Herzegovina)"
-	echo bg_BG\t"Bulgarian (Bulgaria)"
-	echo ca_ES\t"Catalan (Spain)"
-	echo zh_Hans_CN\t"Chinese (China)"
-	echo zh_Hant_HK\t"Chinese (Hong Kong SAR China)"
-	echo zh_Hant_TW\t"Chinese (Taiwan)"
-	echo hr_HR\t"Croatian (Croatia)"
-	echo cs_CZ\t"Czech (Czech Republic)"
-	echo da_DK\t"Danish (Denmark)"
-	echo nl_BE\t"Dutch (Belgium)"
-	echo nl_NL\t"Dutch (Netherlands)"
-	echo en_AU\t"English (Australia)"
-	echo en_CA\t"English (Canada)"
-	echo en_IE\t"English (Ireland)"
-	echo en_NZ\t"English (New Zealand)"
-	echo en_GB\t"English (United Kingdom)"
-	echo en_US\t"English (United States)"
-	echo et_EE\t"Estonian (Estonia)"
-	echo fil_PH\t"Filipino (Philippines)"
-	echo fi_FI\t"Finnish (Finland)"
-	echo fr_BE\t"French (Belgium)"
-	echo fr_CA\t"French (Canada)"
-	echo fr_FR\t"French (France)"
-	echo gl_ES\t"Galician (Spain)"
-	echo ka_GE\t"Georgian (Georgia)"
-	echo de_AT\t"German (Austria)"
-	echo de_DE\t"German (Germany)"
-	echo de_CH\t"German (Switzerland)"
-	echo el_GR\t"Greek (Greece)"
-	echo gu_IN\t"Gujarati (India)"
-	echo he_IL\t"Hebrew (Israel)"
-	echo hi_IN\t"Hindi (India)"
-	echo hu_HU\t"Hungarian (Hungary)"
-	echo is_IS\t"Icelandic (Iceland)"
-	echo id_ID\t"Indonesian (Indonesia)"
-	echo it_IT\t"Italian (Italy)"
-	echo it_CH\t"Italian (Switzerland)"
-	echo ja_JP\t"Japanese (Japan)"
-	echo km_KH\t"Khmer (Cambodia)"
-	echo ko_KR\t"Korean (South Korea)"
-	echo lo_LA\t"Lao (Laos)"
-	echo lv_LV\t"Latvian (Latvia)"
-	echo lt_LT\t"Lithuanian (Lithuania)"
-	echo mk_MK\t"Macedonian (Macedonia)"
-	echo ms_Latn_MY\t"Malay (Malaysia)"
-	echo mn_Cyrl_MN\t"Mongolian (Mongolia)"
-	echo nb_NO\t"Norwegian Bokmål (Norway)"
-	echo nn_NO\t"Norwegian Nynorsk (Norway)"
-	echo fa_IR\t"Persian (Iran)"
-	echo pl_PL\t"Polish (Poland)"
-	echo pt_BR\t"Portuguese (Brazil)"
-	echo pt_PT\t"Portuguese (Portugal)"
-	echo ro_RO\t"Romanian (Romania)"
-	echo ru_RU\t"Russian (Russia)"
-	echo sr_Cyrl_RS\t"Serbian (Serbia)"
-	echo sk_SK\t"Slovak (Slovakia)"
-	echo sl_SI\t"Slovenian (Slovenia)"
-	echo es_AR\t"Spanish (Argentina)"
-	echo es_CL\t"Spanish (Chile)"
-	echo es_CO\t"Spanish (Colombia)"
-	echo es_CR\t"Spanish (Costa Rica)"
-	echo es_MX\t"Spanish (Mexico)"
-	echo es_PA\t"Spanish (Panama)"
-	echo es_PE\t"Spanish (Peru)"
-	echo es_ES\t"Spanish (Spain)"
-	echo es_VE\t"Spanish (Venezuela)"
-	echo sw_KE\t"Swahili (Kenya)"
-	echo sv_SE\t"Swedish (Sweden)"
-	echo th_TH\t"Thai (Thailand)"
-	echo tr_TR\t"Turkish (Turkey)"
-	echo uk_UA\t"Ukrainian (Ukraine)"
-	echo vi_VN\t"Vietnamese (Vietnam)"
-	echo cy_GB\t"Welsh (United Kingdom)"
+    echo af_ZA\t"Afrikaans (South Africa)"
+    echo sq_AL\t"Albanian (Albania)"
+    echo ar_DZ\t"Arabic (Algeria)"
+    echo ar_EG\t"Arabic (Egypt)"
+    echo ar_KW\t"Arabic (Kuwait)"
+    echo ar_MA\t"Arabic (Morocco)"
+    echo ar_SA\t"Arabic (Saudi Arabia)"
+    echo az_Latn_AZ\t"Azerbaijani (Azerbaijan)"
+    echo eu_ES\t"Basque (Spain)"
+    echo be_BY\t"Belarusian (Belarus)"
+    echo bn_BD\t"Bengali (Bangladesh)"
+    echo bs_Latn_BA\t"Bosnian (Bosnia and Herzegovina)"
+    echo bg_BG\t"Bulgarian (Bulgaria)"
+    echo ca_ES\t"Catalan (Spain)"
+    echo zh_Hans_CN\t"Chinese (China)"
+    echo zh_Hant_HK\t"Chinese (Hong Kong SAR China)"
+    echo zh_Hant_TW\t"Chinese (Taiwan)"
+    echo hr_HR\t"Croatian (Croatia)"
+    echo cs_CZ\t"Czech (Czech Republic)"
+    echo da_DK\t"Danish (Denmark)"
+    echo nl_BE\t"Dutch (Belgium)"
+    echo nl_NL\t"Dutch (Netherlands)"
+    echo en_AU\t"English (Australia)"
+    echo en_CA\t"English (Canada)"
+    echo en_IE\t"English (Ireland)"
+    echo en_NZ\t"English (New Zealand)"
+    echo en_GB\t"English (United Kingdom)"
+    echo en_US\t"English (United States)"
+    echo et_EE\t"Estonian (Estonia)"
+    echo fil_PH\t"Filipino (Philippines)"
+    echo fi_FI\t"Finnish (Finland)"
+    echo fr_BE\t"French (Belgium)"
+    echo fr_CA\t"French (Canada)"
+    echo fr_FR\t"French (France)"
+    echo gl_ES\t"Galician (Spain)"
+    echo ka_GE\t"Georgian (Georgia)"
+    echo de_AT\t"German (Austria)"
+    echo de_DE\t"German (Germany)"
+    echo de_CH\t"German (Switzerland)"
+    echo el_GR\t"Greek (Greece)"
+    echo gu_IN\t"Gujarati (India)"
+    echo he_IL\t"Hebrew (Israel)"
+    echo hi_IN\t"Hindi (India)"
+    echo hu_HU\t"Hungarian (Hungary)"
+    echo is_IS\t"Icelandic (Iceland)"
+    echo id_ID\t"Indonesian (Indonesia)"
+    echo it_IT\t"Italian (Italy)"
+    echo it_CH\t"Italian (Switzerland)"
+    echo ja_JP\t"Japanese (Japan)"
+    echo km_KH\t"Khmer (Cambodia)"
+    echo ko_KR\t"Korean (South Korea)"
+    echo lo_LA\t"Lao (Laos)"
+    echo lv_LV\t"Latvian (Latvia)"
+    echo lt_LT\t"Lithuanian (Lithuania)"
+    echo mk_MK\t"Macedonian (Macedonia)"
+    echo ms_Latn_MY\t"Malay (Malaysia)"
+    echo mn_Cyrl_MN\t"Mongolian (Mongolia)"
+    echo nb_NO\t"Norwegian Bokmål (Norway)"
+    echo nn_NO\t"Norwegian Nynorsk (Norway)"
+    echo fa_IR\t"Persian (Iran)"
+    echo pl_PL\t"Polish (Poland)"
+    echo pt_BR\t"Portuguese (Brazil)"
+    echo pt_PT\t"Portuguese (Portugal)"
+    echo ro_RO\t"Romanian (Romania)"
+    echo ru_RU\t"Russian (Russia)"
+    echo sr_Cyrl_RS\t"Serbian (Serbia)"
+    echo sk_SK\t"Slovak (Slovakia)"
+    echo sl_SI\t"Slovenian (Slovenia)"
+    echo es_AR\t"Spanish (Argentina)"
+    echo es_CL\t"Spanish (Chile)"
+    echo es_CO\t"Spanish (Colombia)"
+    echo es_CR\t"Spanish (Costa Rica)"
+    echo es_MX\t"Spanish (Mexico)"
+    echo es_PA\t"Spanish (Panama)"
+    echo es_PE\t"Spanish (Peru)"
+    echo es_ES\t"Spanish (Spain)"
+    echo es_VE\t"Spanish (Venezuela)"
+    echo sw_KE\t"Swahili (Kenya)"
+    echo sv_SE\t"Swedish (Sweden)"
+    echo th_TH\t"Thai (Thailand)"
+    echo tr_TR\t"Turkish (Turkey)"
+    echo uk_UA\t"Ukrainian (Ukraine)"
+    echo vi_VN\t"Vietnamese (Vietnam)"
+    echo cy_GB\t"Welsh (United Kingdom)"
 end
 
 
 function __fish_print_magento_source_theme_file_types -d "Shows all available source theme file types"
-  echo less\t"Currently only LESS is supported"
+    echo less\t"Currently only LESS is supported"
 end
 
 function __fish_print_magento_deploy_modes -d "Shows all available deploy modes"
-  echo developer\t"Development mode"
-  echo production\t"Production mode"
+    echo developer\t"Development mode"
+    echo production\t"Production mode"
 end
 
 function __fish_print_magento_cache_types -d "Shows all available cache types"
-  echo config\t"Configuration"
-  echo layout\t"Layout"
-  echo block_html\t"Block HTML output"
-  echo collections\t"Collections data"
-  echo db_ddl\t"Database schema"
-  echo eav\t"Entity attribute value (EAV)"
-  echo full_page\t"Page cache"
-  echo reflection\t"Reflection"
-  echo translate\t"Translations"
-  echo config_integration\t"Integration configuration"
-  echo config_integration_api\t"Integration API configuration"
-  echo config_webservice\t"Web services configuration"
+    echo config\t"Configuration"
+    echo layout\t"Layout"
+    echo block_html\t"Block HTML output"
+    echo collections\t"Collections data"
+    echo db_ddl\t"Database schema"
+    echo eav\t"Entity attribute value (EAV)"
+    echo full_page\t"Page cache"
+    echo reflection\t"Reflection"
+    echo translate\t"Translations"
+    echo config_integration\t"Integration configuration"
+    echo config_integration_api\t"Integration API configuration"
+    echo config_webservice\t"Web services configuration"
 end
 
 function __fish_print_magento_verbosity_levels -d "Shows all available verbosity levels"
-  echo 1\t"normal output"
-  echo 2\t"more verbose output"
-  echo 3\t"debug"
+    echo 1\t"normal output"
+    echo 2\t"more verbose output"
+    echo 3\t"debug"
 end
 
 function __fish_print_magento_list_formats -d "Shows all available output formats"
-  echo txt\t"Print as plain text"
-  echo json\t"Print as JSON"
-  echo xml\t"Print as XML"
+    echo txt\t"Print as plain text"
+    echo json\t"Print as JSON"
+    echo xml\t"Print as XML"
 end
 
 function __fish_print_magento_commands_list -d "Lists magento commands"
@@ -189,7 +189,7 @@ end
 #########################################################
 
 function __fish_magento_not_in_command -d "Checks that prompt is not inside of magento command"
-    set -l cmd (commandline -opc) 
+    set -l cmd (commandline -opc)
     for i in $cmd
         if contains -- $i (__fish_print_magento_commands_list)
             return 1
@@ -227,395 +227,395 @@ end
 #########################################################
 
 function __fish_magento_parameter_missing -d "Checks if a parameter has been given already"
-  if __fish_contains_opt $argv
-    return 1
-  end
+    if __fish_contains_opt $argv
+        return 1
+    end
 
-  return 0
+    return 0
 end
 
 
 ##################
 # Global options #
 ##################
-complete -x -c magento -s h -l help -d "Show help for a command";
-complete -x -c magento -s q -l quiet -d "Do not output any message";
-complete -x -c magento -s v -l verbose -a "(__fish_print_magento_verbosity_levels)" -d "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug";
-complete -x -c magento -o -vv;
-complete -x -c magento -o vvv;
-complete -x -c magento -s V -l version -d "Show version";
-complete -x -c magento -l ansi -d "Force colored output";
-complete -x -c magento -l no-ansi -d "Disable colored output";
-complete -x -c magento -s n -l no-interaction -d "Don't ask any interactive question";
+complete -x -c magento -s h -l help -d "Show help for a command"
+complete -x -c magento -s q -l quiet -d "Do not output any message"
+complete -x -c magento -s v -l verbose -a "(__fish_print_magento_verbosity_levels)" -d "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug"
+complete -x -c magento -o -vv
+complete -x -c magento -o vvv
+complete -x -c magento -s V -l version -d "Show version"
+complete -x -c magento -l ansi -d "Force colored output"
+complete -x -c magento -l no-ansi -d "Disable colored output"
+complete -x -c magento -s n -l no-interaction -d "Don't ask any interactive question"
 
 ################
 # Sub-Commands #
 ################
-__fish_magento_register_command help -a "(__fish_print_magento_commands_list)" -d "Show help for a command";
-__fish_magento_register_command list -d "List commands";
+__fish_magento_register_command help -a "(__fish_print_magento_commands_list)" -d "Show help for a command"
+__fish_magento_register_command list -d "List commands"
 
-__fish_magento_register_command admin:user:create -x -d "Create admin account";
-__fish_magento_register_command admin:user:unlock -x -d "Unlock admin account";
+__fish_magento_register_command admin:user:create -x -d "Create admin account"
+__fish_magento_register_command admin:user:unlock -x -d "Unlock admin account"
 
-__fish_magento_register_command app:config:dump -d "Create application dump";
+__fish_magento_register_command app:config:dump -d "Create application dump"
 
-__fish_magento_register_command cache:clean -d "Clean cache types";
-__fish_magento_register_command cache:disable -d "Disable cache types";
-__fish_magento_register_command cache:enable -d "Enable cache types";
-__fish_magento_register_command cache:flush -d "Flush cache storage used by cache types";
-__fish_magento_register_command cache:status -d "Check cache status";
+__fish_magento_register_command cache:clean -d "Clean cache types"
+__fish_magento_register_command cache:disable -d "Disable cache types"
+__fish_magento_register_command cache:enable -d "Enable cache types"
+__fish_magento_register_command cache:flush -d "Flush cache storage used by cache types"
+__fish_magento_register_command cache:status -d "Check cache status"
 
-__fish_magento_register_command catalog:images:resize -d "Create resized product images";
-__fish_magento_register_command catalog:product:attributes:cleanup -d "Remove unused product attributes";
+__fish_magento_register_command catalog:images:resize -d "Create resized product images"
+__fish_magento_register_command catalog:product:attributes:cleanup -d "Remove unused product attributes"
 
-__fish_magento_register_command cron:run -d "Run jobs by schedule";
+__fish_magento_register_command cron:run -d "Run jobs by schedule"
 
-__fish_magento_register_command customer:hash:upgrade -d "Upgrade customer's hashes according to latest algorithm";
+__fish_magento_register_command customer:hash:upgrade -d "Upgrade customer's hashes according to latest algorithm"
 
-__fish_magento_register_command deploy:mode:set -d "Set application mode";
-__fish_magento_register_command deploy:mode:show -d "Show current application mode";
+__fish_magento_register_command deploy:mode:set -d "Set application mode"
+__fish_magento_register_command deploy:mode:show -d "Show current application mode"
 
-__fish_magento_register_command dev:source-theme:deploy -d "Collect and publish source files for theme";
-__fish_magento_register_command dev:tests:run -d "Run tests";
-__fish_magento_register_command dev:urn-catalog:generate -d "Generate catalog of URNs to *.xsd mappings for IDEs to highlight XML";
-__fish_magento_register_command dev:xml:convert -d "Convert XML file using XSL stylesheets";
+__fish_magento_register_command dev:source-theme:deploy -d "Collect and publish source files for theme"
+__fish_magento_register_command dev:tests:run -d "Run tests"
+__fish_magento_register_command dev:urn-catalog:generate -d "Generate catalog of URNs to *.xsd mappings for IDEs to highlight XML"
+__fish_magento_register_command dev:xml:convert -d "Convert XML file using XSL stylesheets"
 
-__fish_magento_register_command i18n:collect-phrases -d "Discover phrases in the codebase";
-__fish_magento_register_command i18n:pack -d "Save language package";
-__fish_magento_register_command i18n:uninstall -d "Uninstall language packages";
+__fish_magento_register_command i18n:collect-phrases -d "Discover phrases in the codebase"
+__fish_magento_register_command i18n:pack -d "Save language package"
+__fish_magento_register_command i18n:uninstall -d "Uninstall language packages"
 
-__fish_magento_register_command indexer:info -d "Show allowed indexers";
-__fish_magento_register_command indexer:reindex -d "Reindex data";
-__fish_magento_register_command indexer:reset -d "Reset indexer status to invalid";
-__fish_magento_register_command indexer:set-mode -d "Set index mode type";
-__fish_magento_register_command indexer:show-mode -d "Show index mode";
-__fish_magento_register_command indexer:status -d "Show status of indexer";
+__fish_magento_register_command indexer:info -d "Show allowed indexers"
+__fish_magento_register_command indexer:reindex -d "Reindex data"
+__fish_magento_register_command indexer:reset -d "Reset indexer status to invalid"
+__fish_magento_register_command indexer:set-mode -d "Set index mode type"
+__fish_magento_register_command indexer:show-mode -d "Show index mode"
+__fish_magento_register_command indexer:status -d "Show status of indexer"
 
-__fish_magento_register_command info:adminuri -d "Show Magento Admin URI";
-__fish_magento_register_command info:backups:list -d "Show available backup files";
-__fish_magento_register_command info:currency:list -d "Show available currencies";
-__fish_magento_register_command info:dependencies:show-framework -d "Show dependencies on Magento framework";
-__fish_magento_register_command info:dependencies:show-modules -d "Show dependencies between modules";
-__fish_magento_register_command info:dependencies:show-modules-circular -d "Show circular dependencies between modules";
-__fish_magento_register_command info:language:list -d "Show available languages";
-__fish_magento_register_command info:timezone:list -d "Show available timezones";
+__fish_magento_register_command info:adminuri -d "Show Magento Admin URI"
+__fish_magento_register_command info:backups:list -d "Show available backup files"
+__fish_magento_register_command info:currency:list -d "Show available currencies"
+__fish_magento_register_command info:dependencies:show-framework -d "Show dependencies on Magento framework"
+__fish_magento_register_command info:dependencies:show-modules -d "Show dependencies between modules"
+__fish_magento_register_command info:dependencies:show-modules-circular -d "Show circular dependencies between modules"
+__fish_magento_register_command info:language:list -d "Show available languages"
+__fish_magento_register_command info:timezone:list -d "Show available timezones"
 
-__fish_magento_register_command maintenance:allow-ips -d "Set maintenance mode exempt IPs";
-__fish_magento_register_command maintenance:disable -d "Disable maintenance mode";
-__fish_magento_register_command maintenance:enable -d "Enable maintenance mode";
-__fish_magento_register_command maintenance:status -d "Show maintenance mode status";
+__fish_magento_register_command maintenance:allow-ips -d "Set maintenance mode exempt IPs"
+__fish_magento_register_command maintenance:disable -d "Disable maintenance mode"
+__fish_magento_register_command maintenance:enable -d "Enable maintenance mode"
+__fish_magento_register_command maintenance:status -d "Show maintenance mode status"
 
-__fish_magento_register_command module:disable -d "Disable specified modules";
-__fish_magento_register_command module:enable -d "Enable specified modules";
-__fish_magento_register_command module:status -d "Show status of modules";
-__fish_magento_register_command module:uninstall -d "Uninstall modules installed by composer";
+__fish_magento_register_command module:disable -d "Disable specified modules"
+__fish_magento_register_command module:enable -d "Enable specified modules"
+__fish_magento_register_command module:status -d "Show status of modules"
+__fish_magento_register_command module:uninstall -d "Uninstall modules installed by composer"
 
-__fish_magento_register_command sampledata:deploy -d "Deploy sample data modules";
-__fish_magento_register_command sampledata:remove -d "Remove sample data packages";
-__fish_magento_register_command sampledata:reset -d "Reset sample data modules for re-installation";
+__fish_magento_register_command sampledata:deploy -d "Deploy sample data modules"
+__fish_magento_register_command sampledata:remove -d "Remove sample data packages"
+__fish_magento_register_command sampledata:reset -d "Reset sample data modules for re-installation"
 
-__fish_magento_register_command setup:backup -d "Take backup of application code base, media and database";
-__fish_magento_register_command setup:config:set -d "Create or modifies the deployment configuration";
-__fish_magento_register_command setup:cron:run -d "Run cron job scheduled for setup application";
-__fish_magento_register_command setup:db-data:upgrade -d "Install and upgrades data in the DB";
-__fish_magento_register_command setup:db-schema:upgrade -d "Install and upgrade the DB schema";
-__fish_magento_register_command setup:db:status -d "Check if DB schema or data requires upgrade";
-__fish_magento_register_command setup:di:compile -d "Generate DI configuration and all missing classes that can be auto-generated";
-__fish_magento_register_command setup:install -d "Install Magento application";
-__fish_magento_register_command setup:performance:generate-fixtures -d "Generate fixtures";
-__fish_magento_register_command setup:rollback -d "Roll back Magento Application codebase, media and database";
-__fish_magento_register_command setup:static-content:deploy -d "Deploy static view files";
-__fish_magento_register_command setup:store-config:set -d "Install store configuration";
-__fish_magento_register_command setup:uninstall -d "Uninstall Magento application";
-__fish_magento_register_command setup:upgrade -d "Upgrade Magento application, DB data, and schema";
+__fish_magento_register_command setup:backup -d "Take backup of application code base, media and database"
+__fish_magento_register_command setup:config:set -d "Create or modifies the deployment configuration"
+__fish_magento_register_command setup:cron:run -d "Run cron job scheduled for setup application"
+__fish_magento_register_command setup:db-data:upgrade -d "Install and upgrades data in the DB"
+__fish_magento_register_command setup:db-schema:upgrade -d "Install and upgrade the DB schema"
+__fish_magento_register_command setup:db:status -d "Check if DB schema or data requires upgrade"
+__fish_magento_register_command setup:di:compile -d "Generate DI configuration and all missing classes that can be auto-generated"
+__fish_magento_register_command setup:install -d "Install Magento application"
+__fish_magento_register_command setup:performance:generate-fixtures -d "Generate fixtures"
+__fish_magento_register_command setup:rollback -d "Roll back Magento Application codebase, media and database"
+__fish_magento_register_command setup:static-content:deploy -d "Deploy static view files"
+__fish_magento_register_command setup:store-config:set -d "Install store configuration"
+__fish_magento_register_command setup:uninstall -d "Uninstall Magento application"
+__fish_magento_register_command setup:upgrade -d "Upgrade Magento application, DB data, and schema"
 
-__fish_magento_register_command theme:uninstall -d "Uninstall theme";
+__fish_magento_register_command theme:uninstall -d "Uninstall theme"
 
 #
 # help
 #
-__fish_magento_register_command_option help -x -a "(__fish_print_magento_commands_list)" -d "Show help for a command";
+__fish_magento_register_command_option help -x -a "(__fish_print_magento_commands_list)" -d "Show help for a command"
 
 #
 # list
 #
-__fish_magento_register_command_option list -f -l xml -d "Output as XML";
-__fish_magento_register_command_option list -f -l raw -d "Output as plaintext";
-__fish_magento_register_command_option list -f -l format -a "(__fish_print_magento_list_formats)" -d "Output other formats (default: txt)";
+__fish_magento_register_command_option list -f -l xml -d "Output as XML"
+__fish_magento_register_command_option list -f -l raw -d "Output as plaintext"
+__fish_magento_register_command_option list -f -l format -a "(__fish_print_magento_list_formats)" -d "Output other formats (default: txt)"
 
 #
 # admin:user:create
 #
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-user -d "(Required) Admin user";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-password -d "(Required) Admin password";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-email -d "(Required) Admin email";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-firstname -d "(Required) Admin first name";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-lastname -d "(Required) Admin last name";
-__fish_magento_register_command_option admin:user:create -f -l magento-init-params -d "Add to any command to customize Magento initialization parameters";
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-lastname -d "(Required) Admin last name"
+__fish_magento_register_command_option admin:user:create -f -l magento-init-params -d "Add to any command to customize Magento initialization parameters"
 
 #
 # admin:user:unlock
 #
-__fish_magento_register_command_option admin:user:unlock -f -d "Admin user to unlock";
+__fish_magento_register_command_option admin:user:unlock -f -d "Admin user to unlock"
 
 #
 # cache:clean
 #
-__fish_magento_register_command_option cache:clean -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:clean -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:clean -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:clean -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:enable
 #
-__fish_magento_register_command_option cache:enable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:enable -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:enable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:enable -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:disable
 #
-__fish_magento_register_command_option cache:disable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:disable -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:disable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:disable -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:status
 #
-__fish_magento_register_command_option cache:status -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:status -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cron:run
 #
-__fish_magento_register_command_option cron:run -f -l group -d "Run jobs only from specified group";
-__fish_magento_register_command_option cron:run -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cron:run -f -l group -d "Run jobs only from specified group"
+__fish_magento_register_command_option cron:run -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # deploy:mode:set
 #
-__fish_magento_register_command_option deploy:mode:set -f -a "(__fish_print_magento_deploy_modes)" -d 'Application mode to set. Available are "developer" or "production"';
-__fish_magento_register_command_option deploy:mode:set -f -s s -l skip-compilation -d "Skip clearing and regeneration of static content (generated code, preprocessed CSS, and assets in pub/static/)";
+__fish_magento_register_command_option deploy:mode:set -f -a "(__fish_print_magento_deploy_modes)" -d 'Application mode to set. Available are "developer" or "production"'
+__fish_magento_register_command_option deploy:mode:set -f -s s -l skip-compilation -d "Skip clearing and regeneration of static content (generated code, preprocessed CSS, and assets in pub/static/)"
 
 #
 # dev:source-theme:deploy
 #
-__fish_magento_register_command_option dev:source-theme:deploy -d 'Files to pre-process (file should be specified without extension) (default: "css/styles-m","css/styles-l")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l type -a "(__fish_print_magento_source_theme_file_types)" -d 'Type of source files (default: "less")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l locale -a "(__fish_print_magento_languages)" -d 'Locale (default: "en_US")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l area -a "(__fish_print_magento_theme_areas)" -d 'Area (default: "frontend")';
-__fish_magento_register_command_option dev:source-theme:deploy -l theme -d 'Theme [Vendor/theme] (default: "Magento/luma")';
+__fish_magento_register_command_option dev:source-theme:deploy -d 'Files to pre-process (file should be specified without extension) (default: "css/styles-m","css/styles-l")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l type -a "(__fish_print_magento_source_theme_file_types)" -d 'Type of source files (default: "less")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l locale -a "(__fish_print_magento_languages)" -d 'Locale (default: "en_US")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l area -a "(__fish_print_magento_theme_areas)" -d 'Area (default: "frontend")'
+__fish_magento_register_command_option dev:source-theme:deploy -l theme -d 'Theme [Vendor/theme] (default: "Magento/luma")'
 
 #
 # dev:tests:run
 #
-__fish_magento_register_command_option dev:tests:run -f -a "(__fish_print_magento_available_tests)" -d 'Type of test to run (default: "default")';
+__fish_magento_register_command_option dev:tests:run -f -a "(__fish_print_magento_available_tests)" -d 'Type of test to run (default: "default")'
 
 #
 # dev:urn-catalog:generate
 #
-__fish_magento_register_command_option dev:urn-catalog:generate -f -l ide -a "(__fish_print_magento_available_ides)" -d 'Catalog generation format. Supported: [phpstorm] (default: "phpstorm")';
+__fish_magento_register_command_option dev:urn-catalog:generate -f -l ide -a "(__fish_print_magento_available_ides)" -d 'Catalog generation format. Supported: [phpstorm] (default: "phpstorm")'
 
 #
 # dev:xml:convert
 #
-__fish_magento_register_command_option dev:xml:convert -s o -l overwrite -d 'Overwrite XML file';
+__fish_magento_register_command_option dev:xml:convert -s o -l overwrite -d 'Overwrite XML file'
 
 #
 # i18n:collect-phrases
 #
-__fish_magento_register_command_option i18n:collect-phrases -s o -l output -d 'Path (including filename) to an output file. With no file specified, defaults to stdout';
-__fish_magento_register_command_option i18n:collect-phrases -f -s m -l magento -d 'Use --magento to parse current Magento codebase. Omit parameter if a directory is specified';
+__fish_magento_register_command_option i18n:collect-phrases -s o -l output -d 'Path (including filename) to an output file. With no file specified, defaults to stdout'
+__fish_magento_register_command_option i18n:collect-phrases -f -s m -l magento -d 'Use --magento to parse current Magento codebase. Omit parameter if a directory is specified'
 
 #
 # i18n:pack
 #
-__fish_magento_register_command_option i18n:pack -f -s m -l mode -a "(__fish_print_magento_i18n_packing_modes)" -d 'Save mode for dictionary (default: "replace")';
-__fish_magento_register_command_option i18n:pack -s d -l allow-duplicates -d 'Use --allow-duplicates to allow saving duplicates of translate. Otherwise omit parameter';
+__fish_magento_register_command_option i18n:pack -f -s m -l mode -a "(__fish_print_magento_i18n_packing_modes)" -d 'Save mode for dictionary (default: "replace")'
+__fish_magento_register_command_option i18n:pack -s d -l allow-duplicates -d 'Use --allow-duplicates to allow saving duplicates of translate. Otherwise omit parameter'
 
 #
 # i18n:uninstall
 #
-__fish_magento_register_command_option i18n:uninstall -f -s b -l backup-code -d 'Take code and configuration files backup (excluding temporary files)';
-__fish_magento_register_command_option i18n:uninstall -f -a "(__fish_print_magento_languages)" -d 'Language package name';
+__fish_magento_register_command_option i18n:uninstall -f -s b -l backup-code -d 'Take code and configuration files backup (excluding temporary files)'
+__fish_magento_register_command_option i18n:uninstall -f -a "(__fish_print_magento_languages)" -d 'Language package name'
 
 # 
 # info:dependencies:show-framework
 #
-__fish_magento_register_command_option info:dependencies:show-framework -f -s o -l output -d 'Report filename (default: "framework-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-framework -f -s o -l output -d 'Report filename (default: "framework-dependencies.csv")'
 
 #
 # info:dependencies:show-modules
 #
-__fish_magento_register_command_option info:dependencies:show-modules -f -s o -l output -d 'Report filename (default: "modules-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-modules -f -s o -l output -d 'Report filename (default: "modules-dependencies.csv")'
 
 #
 # info:dependencies:show-modules-circular
 #
-__fish_magento_register_command_option info:dependencies:show-modules-circular -f -s o -l output -d 'Report filename (default: "modules-circular-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-modules-circular -f -s o -l output -d 'Report filename (default: "modules-circular-dependencies.csv")'
 
 #
 # maintenance:allow-ips
 #
-__fish_magento_register_command_option maintenance:allow-ips -l none -d 'Clear allowed IP addresses';
+__fish_magento_register_command_option maintenance:allow-ips -l none -d 'Clear allowed IP addresses'
 
 #
 # maintenance:disable
 #
-__fish_magento_register_command_option maintenance:disable -l ip -d "Allowed IP addresses (use 'none' to clear list)";
+__fish_magento_register_command_option maintenance:disable -l ip -d "Allowed IP addresses (use 'none' to clear list)"
 
 #
 # maintenance:enable  
 # 
-__fish_magento_register_command_option maintenance:enable -l ip -d "Allowed IP addresses (use 'none' to clear list)";
+__fish_magento_register_command_option maintenance:enable -l ip -d "Allowed IP addresses (use 'none' to clear list)"
 
 #
 # module:disable
 #
-__fish_magento_register_command_option module:disable -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:disable -s f -l force -d "Bypass dependencies check";
-__fish_magento_register_command_option module:disable -l all -d "Disable all modules";
-__fish_magento_register_command_option module:disable -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:disable -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:disable -s f -l force -d "Bypass dependencies check"
+__fish_magento_register_command_option module:disable -l all -d "Disable all modules"
+__fish_magento_register_command_option module:disable -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # module:enable
 # 
-__fish_magento_register_command_option module:enable -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:enable -f -s f -l force -d "Bypass dependencies check";
-__fish_magento_register_command_option module:enable -f -l all -d "Enable all modules";
-__fish_magento_register_command_option module:enable -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:enable -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:enable -f -s f -l force -d "Bypass dependencies check"
+__fish_magento_register_command_option module:enable -f -l all -d "Enable all modules"
+__fish_magento_register_command_option module:enable -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # module:uninstall
 #
-__fish_magento_register_command_option module:uninstall -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:uninstall -f -s r -l remove-data -d "Remove data installed by module(s)";
-__fish_magento_register_command_option module:uninstall -f -l backup-code -d "Take code and configuration files backup (excluding temporary files)";
-__fish_magento_register_command_option module:uninstall -f -l backup-media -d "Take media backup";
-__fish_magento_register_command_option module:uninstall -f -l backup-db -d "Take complete database backup";
-__fish_magento_register_command_option module:uninstall -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:uninstall -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:uninstall -f -s r -l remove-data -d "Remove data installed by module(s)"
+__fish_magento_register_command_option module:uninstall -f -l backup-code -d "Take code and configuration files backup (excluding temporary files)"
+__fish_magento_register_command_option module:uninstall -f -l backup-media -d "Take media backup"
+__fish_magento_register_command_option module:uninstall -f -l backup-db -d "Take complete database backup"
+__fish_magento_register_command_option module:uninstall -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # setup:backup
 #
-__fish_magento_register_command_option setup:backup -f -l code -d "Take code and configuration files backup (excluding temporary files)";
-__fish_magento_register_command_option setup:backup -f -l media -d "Take media backup";
-__fish_magento_register_command_option setup:backup -f -l db -d "Take complete database backup";
+__fish_magento_register_command_option setup:backup -f -l code -d "Take code and configuration files backup (excluding temporary files)"
+__fish_magento_register_command_option setup:backup -f -l media -d "Take media backup"
+__fish_magento_register_command_option setup:backup -f -l db -d "Take complete database backup"
 
 #
 # setup:config:set
 #
-__fish_magento_register_command_option setup:config:set -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)";
-__fish_magento_register_command_option setup:config:set -f -l key -d "Encryption key";
-__fish_magento_register_command_option setup:config:set -f -l session-save -d "Session save handler";
+__fish_magento_register_command_option setup:config:set -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)"
+__fish_magento_register_command_option setup:config:set -f -l key -d "Encryption key"
+__fish_magento_register_command_option setup:config:set -f -l session-save -d "Session save handler"
 __fish_magento_register_command_option setup:config:set -f -l definition-format -d "Type of definitions used by Object Manager"
-__fish_magento_register_command_option setup:config:set -f -l db-host -d "Database server host";
-__fish_magento_register_command_option setup:config:set -f -l db-name -d "Database name";
-__fish_magento_register_command_option setup:config:set -f -l db-user -d "Database server username";
-__fish_magento_register_command_option setup:config:set -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)";
-__fish_magento_register_command_option setup:config:set -f -l db-password -d "Database server password";
-__fish_magento_register_command_option setup:config:set -f -l db-prefix -d "Database table prefix";
-__fish_magento_register_command_option setup:config:set -f -l db-model -d "Database type";
-__fish_magento_register_command_option setup:config:set -f -l db-init-statements -d "Database initial set of commands";
-__fish_magento_register_command_option setup:config:set -f -l skip-db-validation -s s -d "If specified, then db connection validation will be skipped";
-__fish_magento_register_command_option setup:config:set -f -l http-cache-hosts -d "HTTP cache hosts";
+__fish_magento_register_command_option setup:config:set -f -l db-host -d "Database server host"
+__fish_magento_register_command_option setup:config:set -f -l db-name -d "Database name"
+__fish_magento_register_command_option setup:config:set -f -l db-user -d "Database server username"
+__fish_magento_register_command_option setup:config:set -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)"
+__fish_magento_register_command_option setup:config:set -f -l db-password -d "Database server password"
+__fish_magento_register_command_option setup:config:set -f -l db-prefix -d "Database table prefix"
+__fish_magento_register_command_option setup:config:set -f -l db-model -d "Database type"
+__fish_magento_register_command_option setup:config:set -f -l db-init-statements -d "Database initial set of commands"
+__fish_magento_register_command_option setup:config:set -f -l skip-db-validation -s s -d "If specified, then db connection validation will be skipped"
+__fish_magento_register_command_option setup:config:set -f -l http-cache-hosts -d "HTTP cache hosts"
 
 #
 # setup:install
 #
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name";
-__fish_magento_register_command_option setup:install -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)";
-__fish_magento_register_command_option setup:install -f -l key -d "Encryption key";
-__fish_magento_register_command_option setup:install -f -l session-save -d "Session save handler";
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option setup:install -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)"
+__fish_magento_register_command_option setup:install -f -l key -d "Encryption key"
+__fish_magento_register_command_option setup:install -f -l session-save -d "Session save handler"
 __fish_magento_register_command_option setup:install -f -l definition-format -d "Type of definitions used by Object Manager"
-__fish_magento_register_command_option setup:install -f -l db-host -d "Database server host";
-__fish_magento_register_command_option setup:install -f -l db-name -d "Database name";
-__fish_magento_register_command_option setup:install -f -l db-user -d "Database server username";
-__fish_magento_register_command_option setup:install -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)";
-__fish_magento_register_command_option setup:install -f -l db-password -d "Database server password";
-__fish_magento_register_command_option setup:install -f -l db-prefix -d "Database table prefix";
-__fish_magento_register_command_option setup:install -f -l db-model -d "Database type";
-__fish_magento_register_command_option setup:install -f -l db-init-statements -d "Database initial set of commands";
-__fish_magento_register_command_option setup:install -f -l skip-db-validation -s s -d "Skip database connection validation";
-__fish_magento_register_command_option setup:install -f -l http-cache-hosts -d "HTTP cache hosts";
-__fish_magento_register_command_option setup:install -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at";
-__fish_magento_register_command_option setup:install -f -l language -a "(__fish_print_magento_languages)" -d "Default language code";
-__fish_magento_register_command_option setup:install -f -l timezone -d "Default time zone code";
-__fish_magento_register_command_option setup:install -f -l currency -d "Default currency code";
-__fish_magento_register_command_option setup:install -f -l use-rewrites -d "Use rewrites";
-__fish_magento_register_command_option setup:install -f -l use-secure -d "Use secure URLs. Enable only if SSL is available";
-__fish_magento_register_command_option setup:install -f -l base-url-secure -a "https://" -d "Base URL for SSL connection";
-__fish_magento_register_command_option setup:install -f -l use-secure-admin -d "Run admin interface with SSL";
-__fish_magento_register_command_option setup:install -f -l admin-use-security-key -d 'Use security key in admin urls/forms';
-__fish_magento_register_command_option setup:install -f -r -l admin-user -d "(Required) Admin user";
-__fish_magento_register_command_option setup:install -f -r -l admin-password -d "(Required) Admin password";
-__fish_magento_register_command_option setup:install -f -r -l admin-email -d "(Required) Admin email";
-__fish_magento_register_command_option setup:install -f -r -l admin-firstname -d "(Required) Admin first name";
-__fish_magento_register_command_option setup:install -f -r -l admin-lastname -d "(Required) Admin last name";
-__fish_magento_register_command_option setup:install -f -l cleanup-database -d "Cleanup database before installation";
-__fish_magento_register_command_option setup:install -f -l sales-order-increment-prefix -d "Sales order number prefix";
-__fish_magento_register_command_option setup:install -f -l use-sample-data -d "Use sample data";
+__fish_magento_register_command_option setup:install -f -l db-host -d "Database server host"
+__fish_magento_register_command_option setup:install -f -l db-name -d "Database name"
+__fish_magento_register_command_option setup:install -f -l db-user -d "Database server username"
+__fish_magento_register_command_option setup:install -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)"
+__fish_magento_register_command_option setup:install -f -l db-password -d "Database server password"
+__fish_magento_register_command_option setup:install -f -l db-prefix -d "Database table prefix"
+__fish_magento_register_command_option setup:install -f -l db-model -d "Database type"
+__fish_magento_register_command_option setup:install -f -l db-init-statements -d "Database initial set of commands"
+__fish_magento_register_command_option setup:install -f -l skip-db-validation -s s -d "Skip database connection validation"
+__fish_magento_register_command_option setup:install -f -l http-cache-hosts -d "HTTP cache hosts"
+__fish_magento_register_command_option setup:install -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at"
+__fish_magento_register_command_option setup:install -f -l language -a "(__fish_print_magento_languages)" -d "Default language code"
+__fish_magento_register_command_option setup:install -f -l timezone -d "Default time zone code"
+__fish_magento_register_command_option setup:install -f -l currency -d "Default currency code"
+__fish_magento_register_command_option setup:install -f -l use-rewrites -d "Use rewrites"
+__fish_magento_register_command_option setup:install -f -l use-secure -d "Use secure URLs. Enable only if SSL is available"
+__fish_magento_register_command_option setup:install -f -l base-url-secure -a "https://" -d "Base URL for SSL connection"
+__fish_magento_register_command_option setup:install -f -l use-secure-admin -d "Run admin interface with SSL"
+__fish_magento_register_command_option setup:install -f -l admin-use-security-key -d 'Use security key in admin urls/forms'
+__fish_magento_register_command_option setup:install -f -r -l admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option setup:install -f -r -l admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option setup:install -f -r -l admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option setup:install -f -r -l admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option setup:install -f -r -l admin-lastname -d "(Required) Admin last name"
+__fish_magento_register_command_option setup:install -f -l cleanup-database -d "Cleanup database before installation"
+__fish_magento_register_command_option setup:install -f -l sales-order-increment-prefix -d "Sales order number prefix"
+__fish_magento_register_command_option setup:install -f -l use-sample-data -d "Use sample data"
 
 #
 # setup:performance:generate-fixtures
 #
-__fish_magento_register_command_option setup:performance:generate-fixtures -f -s s -l skip-reindex -d "Skip reindex";
+__fish_magento_register_command_option setup:performance:generate-fixtures -f -s s -l skip-reindex -d "Skip reindex"
 
 #
 # setup:rollback
 #
-__fish_magento_register_command_option setup:rollback -s c -l code-file -d "Basename of the code backup file in var/backups";
-__fish_magento_register_command_option setup:rollback -s m -l media-file -d "Basename of the media backup file in var/backups";
-__fish_magento_register_command_option setup:rollback -s d -l db-file -d "Basename of the db backup file in var/backups";
+__fish_magento_register_command_option setup:rollback -s c -l code-file -d "Basename of the code backup file in var/backups"
+__fish_magento_register_command_option setup:rollback -s m -l media-file -d "Basename of the media backup file in var/backups"
+__fish_magento_register_command_option setup:rollback -s d -l db-file -d "Basename of the db backup file in var/backups"
 
 #
 # setup:static-content:deploy
 #
-__fish_magento_register_command_option setup:static-content:deploy -x -a "(__fish_print_magento_languages)" -d "Space-separated list of ISO-636 language codes to output static view files for";
-__fish_magento_register_command_option setup:static-content:deploy -f -s d -l dry-run -d "Simulate deployment only";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-javascript -d "Don't deploy JavaScript files"; 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-css -d "Don't deploy CSS files";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-less -d "Don't deploy LESS files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-images -d "Don't deploy images";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-fonts -d "Don't deploy font files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-html -d "Don't deploy HTML files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-misc -d "Don't deploy other types of files (.md, .jbf, .csv, etc...)";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-html-minify -d "Don't minify HTML files";
-__fish_magento_register_command_option setup:static-content:deploy -s t -l theme -d 'Generate static view files only for specified themes (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -l exclude-theme -d 'Do not generate files for specified themes (default: "none")';
-__fish_magento_register_command_option setup:static-content:deploy -f -s l -l language -a "(__fish_print_magento_languages)" -d 'Generate files only for specified languages (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-language -d 'Do not generate files for specified languages. (default: "none") (multiple values allowed)';
-__fish_magento_register_command_option setup:static-content:deploy -f -s a -l area -a "(__fish_print_magento_theme_areas)" -d 'Generate files only for specified areas (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-area -a "(__fish_print_magento_theme_areas)" -d 'Do not generate files for specified areas (default: "none")';
-__fish_magento_register_command_option setup:static-content:deploy -x -s j -l jobs -d "Enable parallel processing using specified number of jobs (default: 4)";
-__fish_magento_register_command_option setup:static-content:deploy -f -l symlink-locale -d "Create symlinks for files of locales which are passed for deployment but have no customizations";
+__fish_magento_register_command_option setup:static-content:deploy -x -a "(__fish_print_magento_languages)" -d "Space-separated list of ISO-636 language codes to output static view files for"
+__fish_magento_register_command_option setup:static-content:deploy -f -s d -l dry-run -d "Simulate deployment only"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-javascript -d "Don't deploy JavaScript files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-css -d "Don't deploy CSS files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-less -d "Don't deploy LESS files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-images -d "Don't deploy images"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-fonts -d "Don't deploy font files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-html -d "Don't deploy HTML files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-misc -d "Don't deploy other types of files (.md, .jbf, .csv, etc...)"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-html-minify -d "Don't minify HTML files"
+__fish_magento_register_command_option setup:static-content:deploy -s t -l theme -d 'Generate static view files only for specified themes (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -l exclude-theme -d 'Do not generate files for specified themes (default: "none")'
+__fish_magento_register_command_option setup:static-content:deploy -f -s l -l language -a "(__fish_print_magento_languages)" -d 'Generate files only for specified languages (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-language -d 'Do not generate files for specified languages. (default: "none") (multiple values allowed)'
+__fish_magento_register_command_option setup:static-content:deploy -f -s a -l area -a "(__fish_print_magento_theme_areas)" -d 'Generate files only for specified areas (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-area -a "(__fish_print_magento_theme_areas)" -d 'Do not generate files for specified areas (default: "none")'
+__fish_magento_register_command_option setup:static-content:deploy -x -s j -l jobs -d "Enable parallel processing using specified number of jobs (default: 4)"
+__fish_magento_register_command_option setup:static-content:deploy -f -l symlink-locale -d "Create symlinks for files of locales which are passed for deployment but have no customizations"
 
 
 #
 # setup:store-config:set
 #
-__fish_magento_register_command_option setup:store-config:set -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at";
-__fish_magento_register_command_option setup:store-config:set -f -l language -a "(__fish_print_magento_languages)" -d "Default language code";
-__fish_magento_register_command_option setup:store-config:set -f -l timezone -d "Default time zone code";
-__fish_magento_register_command_option setup:store-config:set -f -l currency -d "Default currency code";
-__fish_magento_register_command_option setup:store-config:set -f -l use-rewrites -d "Use rewrites";
-__fish_magento_register_command_option setup:store-config:set -f -l use-secure -d "Use secure URLs. Only enable if SSL is available";
-__fish_magento_register_command_option setup:store-config:set -f -l base-url-secure -a "https://" -d "Base URL for SSL connection";
-__fish_magento_register_command_option setup:store-config:set -f -l use-secure-admin -d "Run admin interface with SSL";
-__fish_magento_register_command_option setup:store-config:set -f -l admin-use-security-key -d 'Use security key in admin urls/forms';
+__fish_magento_register_command_option setup:store-config:set -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at"
+__fish_magento_register_command_option setup:store-config:set -f -l language -a "(__fish_print_magento_languages)" -d "Default language code"
+__fish_magento_register_command_option setup:store-config:set -f -l timezone -d "Default time zone code"
+__fish_magento_register_command_option setup:store-config:set -f -l currency -d "Default currency code"
+__fish_magento_register_command_option setup:store-config:set -f -l use-rewrites -d "Use rewrites"
+__fish_magento_register_command_option setup:store-config:set -f -l use-secure -d "Use secure URLs. Only enable if SSL is available"
+__fish_magento_register_command_option setup:store-config:set -f -l base-url-secure -a "https://" -d "Base URL for SSL connection"
+__fish_magento_register_command_option setup:store-config:set -f -l use-secure-admin -d "Run admin interface with SSL"
+__fish_magento_register_command_option setup:store-config:set -f -l admin-use-security-key -d 'Use security key in admin urls/forms'
 
 #
 # setup:upgrade
 #
-__fish_magento_register_command_option setup:upgrade -l keep-generated -d "Prevents generated files from being deleted";
+__fish_magento_register_command_option setup:upgrade -l keep-generated -d "Prevents generated files from being deleted"
 
 #
 # theme:uninstall
 #
-__fish_magento_register_command_option theme:uninstall -f -l backup-code -d "Take code backup (excluding temporary files)";
-__fish_magento_register_command_option theme:uninstall -f -s c -l clear-static-content -d "Clear generated static view files";
+__fish_magento_register_command_option theme:uninstall -f -l backup-code -d "Take code backup (excluding temporary files)"
+__fish_magento_register_command_option theme:uninstall -f -s c -l clear-static-content -d "Clear generated static view files"
diff --git a/share/completions/makepkg.fish b/share/completions/makepkg.fish
index 6fc9cfb97..11e8d548e 100644
--- a/share/completions/makepkg.fish
+++ b/share/completions/makepkg.fish
@@ -1,40 +1,40 @@
-complete -c makepkg -s A -l 'ignorearch'    -d 'Ignore missing or incomplete arch field'
-complete -c makepkg -s c -l 'clean'         -d 'Clean up work files after build'
-complete -c makepkg      -l 'config'        -d 'Use alternate config <file>'
-complete -c makepkg -s d -l 'nodeps'        -d 'Do not perform dependency checks'
-complete -c makepkg -s e -l 'noextract'     -d 'Do not extract source files'
-complete -c makepkg      -l 'verifysource'  -d 'Only perform integrity checks'
-complete -c makepkg -s f -l 'force'         -d 'Force rebuild of the package'
-complete -c makepkg -s g -l 'geninteg'      -d 'Generate integrity checks'
-complete -c makepkg      -l 'skipinteg'     -d 'Do not perform integrity checks'
-complete -c makepkg      -l 'skipchecksums' -d 'Do not verify checksums'
-complete -c makepkg      -l 'skippgpcheck'  -d 'Do not verify PGP signatures'
-complete -c makepkg -s h -l 'help'          -d 'Display syntax and command line options'
-complete -c makepkg      -l 'holdver'       -d 'No automatic bump of pkgver'
-complete -c makepkg -s i -l 'install'       -d 'Install the package after build'
-complete -c makepkg -s L -l 'log'           -d 'Enable makepkg build logging'
-complete -c makepkg -s m -l 'nocolor'       -d 'Disable color in output messages'
-complete -c makepkg -s o -l 'nobuild'       -d 'Only download and extract files'
-complete -c makepkg -s p                    -d 'Use alternative <buildscript>'
-complete -c makepkg -s r -l 'rmdeps'        -d 'Remove installed deps after build'
-complete -c makepkg -s R -l 'repackage'     -d 'Repackage without rebuilding'
-complete -c makepkg -s s -l 'syncdeps'      -d 'Install missing dependencies'
-complete -c makepkg -s S -l 'source'        -d 'Build a source-only tarball for AUR'
-complete -c makepkg -s V -l 'version'       -d 'Display the version and exit'
-complete -c makepkg -s C -l 'cleanbuild'    -d 'Remove the srcdir before building the package'
-complete -c makepkg      -l 'allsource'     -d 'Build a source-only GPL tarball for AUR'
-complete -c makepkg      -l 'pkg'           -d 'Only build <packages> from a split package'
-complete -c makepkg      -l 'check'         -d 'Run the check function in the PKGBUILD'
-complete -c makepkg      -l 'noarchive'     -d 'Do not create the archive'
-complete -c makepkg      -l 'nocheck'       -d 'Do not run the check function in the PKGBUILD'
-complete -c makepkg      -l 'sign'          -d 'Sign the resulting package with gpg'
-complete -c makepkg      -l 'nosign'        -d 'Do not create a signature for the package'
-complete -c makepkg      -l 'key'           -d 'Specify a <key> to use when signing'
-complete -c makepkg      -l 'noconfirm'     -d 'Passed to pacman: Do not ask for confirmation'
-complete -c makepkg      -l 'needed'        -d 'Passed to pacman: Only install what is needed'
-complete -c makepkg      -l 'asdeps'        -d 'Passed to pacman: Install as dependencies'
-complete -c makepkg      -l 'noprogressbar' -d 'Passed to pacman: Do not display a progress bar'
+complete -c makepkg -s A -l 'ignorearch' -d 'Ignore missing or incomplete arch field'
+complete -c makepkg -s c -l 'clean' -d 'Clean up work files after build'
+complete -c makepkg -l 'config' -d 'Use alternate config <file>'
+complete -c makepkg -s d -l 'nodeps' -d 'Do not perform dependency checks'
+complete -c makepkg -s e -l 'noextract' -d 'Do not extract source files'
+complete -c makepkg -l 'verifysource' -d 'Only perform integrity checks'
+complete -c makepkg -s f -l 'force' -d 'Force rebuild of the package'
+complete -c makepkg -s g -l 'geninteg' -d 'Generate integrity checks'
+complete -c makepkg -l 'skipinteg' -d 'Do not perform integrity checks'
+complete -c makepkg -l 'skipchecksums' -d 'Do not verify checksums'
+complete -c makepkg -l 'skippgpcheck' -d 'Do not verify PGP signatures'
+complete -c makepkg -s h -l 'help' -d 'Display syntax and command line options'
+complete -c makepkg -l 'holdver' -d 'No automatic bump of pkgver'
+complete -c makepkg -s i -l 'install' -d 'Install the package after build'
+complete -c makepkg -s L -l 'log' -d 'Enable makepkg build logging'
+complete -c makepkg -s m -l 'nocolor' -d 'Disable color in output messages'
+complete -c makepkg -s o -l 'nobuild' -d 'Only download and extract files'
+complete -c makepkg -s p -d 'Use alternative <buildscript>'
+complete -c makepkg -s r -l 'rmdeps' -d 'Remove installed deps after build'
+complete -c makepkg -s R -l 'repackage' -d 'Repackage without rebuilding'
+complete -c makepkg -s s -l 'syncdeps' -d 'Install missing dependencies'
+complete -c makepkg -s S -l 'source' -d 'Build a source-only tarball for AUR'
+complete -c makepkg -s V -l 'version' -d 'Display the version and exit'
+complete -c makepkg -s C -l 'cleanbuild' -d 'Remove the srcdir before building the package'
+complete -c makepkg -l 'allsource' -d 'Build a source-only GPL tarball for AUR'
+complete -c makepkg -l 'pkg' -d 'Only build <packages> from a split package'
+complete -c makepkg -l 'check' -d 'Run the check function in the PKGBUILD'
+complete -c makepkg -l 'noarchive' -d 'Do not create the archive'
+complete -c makepkg -l 'nocheck' -d 'Do not run the check function in the PKGBUILD'
+complete -c makepkg -l 'sign' -d 'Sign the resulting package with gpg'
+complete -c makepkg -l 'nosign' -d 'Do not create a signature for the package'
+complete -c makepkg -l 'key' -d 'Specify a <key> to use when signing'
+complete -c makepkg -l 'noconfirm' -d 'Passed to pacman: Do not ask for confirmation'
+complete -c makepkg -l 'needed' -d 'Passed to pacman: Only install what is needed'
+complete -c makepkg -l 'asdeps' -d 'Passed to pacman: Install as dependencies'
+complete -c makepkg -l 'noprogressbar' -d 'Passed to pacman: Do not display a progress bar'
 
 # Since pacman 5
-complete -c makepkg      -l 'packagelist' -d 'List all packages that would be built'
-complete -c makepkg      -l 'printsrcinfo' -d 'Print SRCINFO to stdout'
+complete -c makepkg -l 'packagelist' -d 'List all packages that would be built'
+complete -c makepkg -l 'printsrcinfo' -d 'Print SRCINFO to stdout'
diff --git a/share/completions/mc.fish b/share/completions/mc.fish
index 0905db283..218c680d6 100644
--- a/share/completions/mc.fish
+++ b/share/completions/mc.fish
@@ -1,24 +1,24 @@
 
-complete -c mc -s a -l stickchars        -d 'No graphic chars for line drawing'
-complete -c mc -s b -l nocolor           -d 'Force black and white display'
-complete -c mc -s c -l color             -d 'Force color mode'
-complete -c mc -s C -l colors            -d 'Specify a different color set'
-complete -c mc -s S                      -d 'Specify a name of skin'
-complete -c mc -s d -l nomouse           -d 'Disable mouse support'
-complete -c mc -s e -l edit              -d 'Start the internal editor with FILE'
-complete -c mc -s f -l datadir           -d 'Display the compiled-in search paths'
-complete -c mc -s F -l datadir-info      -d 'Display extended info about compiled-in paths'
-complete -c mc      -l configure-options -d 'Display configure options'
-complete -c mc -s k -l resetsoft         -d 'Reset softkeys to their default'
-complete -c mc -s K                      -d 'Specify a keymap FILE'
-complete -c mc      -l nokeymap          -d 'Use default hardcoded keys'
-complete -c mc -s l -l ftplog            -d 'Save the ftpfs dialog with the server in FILE'
-complete -c mc -s P -l printwd           -d 'Print the last working directory to FILE'
-complete -c mc -s s                      -d 'Set alternative mode drawing of frameworks'
-complete -c mc -s t -l termcap           -d 'Use the TERMCAP variable for terminal info'
-complete -c mc -s u -l nosubshell        -d 'Disable use of the concurrent shell'
-complete -c mc -s U -l subshell          -d 'Enable use of the concurrent shell'
-complete -c mc -s v -l view              -d 'Start the internal viewer with FILE'
-complete -c mc -s V -l version           -d 'Display the version of the program'
-complete -c mc -s x -l xterm             -d 'Force xterm mode'
-complete -c mc -s g -l oldmouse          -d 'Force a "normal tracking" mouse mode'
+complete -c mc -s a -l stickchars -d 'No graphic chars for line drawing'
+complete -c mc -s b -l nocolor -d 'Force black and white display'
+complete -c mc -s c -l color -d 'Force color mode'
+complete -c mc -s C -l colors -d 'Specify a different color set'
+complete -c mc -s S -d 'Specify a name of skin'
+complete -c mc -s d -l nomouse -d 'Disable mouse support'
+complete -c mc -s e -l edit -d 'Start the internal editor with FILE'
+complete -c mc -s f -l datadir -d 'Display the compiled-in search paths'
+complete -c mc -s F -l datadir-info -d 'Display extended info about compiled-in paths'
+complete -c mc -l configure-options -d 'Display configure options'
+complete -c mc -s k -l resetsoft -d 'Reset softkeys to their default'
+complete -c mc -s K -d 'Specify a keymap FILE'
+complete -c mc -l nokeymap -d 'Use default hardcoded keys'
+complete -c mc -s l -l ftplog -d 'Save the ftpfs dialog with the server in FILE'
+complete -c mc -s P -l printwd -d 'Print the last working directory to FILE'
+complete -c mc -s s -d 'Set alternative mode drawing of frameworks'
+complete -c mc -s t -l termcap -d 'Use the TERMCAP variable for terminal info'
+complete -c mc -s u -l nosubshell -d 'Disable use of the concurrent shell'
+complete -c mc -s U -l subshell -d 'Enable use of the concurrent shell'
+complete -c mc -s v -l view -d 'Start the internal viewer with FILE'
+complete -c mc -s V -l version -d 'Display the version of the program'
+complete -c mc -s x -l xterm -d 'Force xterm mode'
+complete -c mc -s g -l oldmouse -d 'Force a "normal tracking" mouse mode'
diff --git a/share/completions/md5sum.fish b/share/completions/md5sum.fish
index 3549e7c5a..a759dfc39 100644
--- a/share/completions/md5sum.fish
+++ b/share/completions/md5sum.fish
@@ -1,10 +1,10 @@
 complete -c md5sum -d "Compute and check message digest" -r
 complete -c md5sum -s b -l binary -d 'Read in binary mode'
-complete -c md5sum -s c -l check  -d "Read sums from files and check them"
-complete -c md5sum -s t -l text   -d 'Read in text mode'
-complete -c md5sum -l quiet       -d 'Don''t print OK for each successfully verified file'
-complete -c md5sum -l status      -d 'Don''t output anything, status code shows success'
-complete -c md5sum -s w -l warn   -d 'Warn about improperly formatted checksum lines'
-complete -c md5sum -l strict      -d 'With --check, exit non-zero for any invalid input'
-complete -c md5sum -l help        -d 'Display help text'
-complete -c md5sum -l version     -d 'Output version information and exit'
+complete -c md5sum -s c -l check -d "Read sums from files and check them"
+complete -c md5sum -s t -l text -d 'Read in text mode'
+complete -c md5sum -l quiet -d 'Don''t print OK for each successfully verified file'
+complete -c md5sum -l status -d 'Don''t output anything, status code shows success'
+complete -c md5sum -s w -l warn -d 'Warn about improperly formatted checksum lines'
+complete -c md5sum -l strict -d 'With --check, exit non-zero for any invalid input'
+complete -c md5sum -l help -d 'Display help text'
+complete -c md5sum -l version -d 'Output version information and exit'
diff --git a/share/completions/mdadm.fish b/share/completions/mdadm.fish
index 2f711eab8..320f3debd 100644
--- a/share/completions/mdadm.fish
+++ b/share/completions/mdadm.fish
@@ -10,110 +10,110 @@
 #     as their absence has already been checked, because this absence caused evaluation of __fish_not_contain_opt
 
 function __fish_mdadm_metadata_options
-	echo -e "0\t"(_ "Use original 0.90 format superblock")
-	echo -e "0.90\t"(_ "Use original 0.90 format superblock")
-	echo -e "1\t"(_ "Use last 1.x format superblock")
-	echo -e "default\t"(_ "Use last 1.x format superblock")
-	echo -e "1.0\t"(_ "Use 1.0 format superblock")
-	echo -e "1.1\t"(_ "Use 1.1 format superblock")
-	echo -e "1.2\t"(_ "Use 1.2 format superblock")
-	echo -e "ddf\t"(_ "Use DDF (Disk Data Format) format")
-	echo -e "imsm\t"(_ "Use Intel(R) Matrix Storage Manager format")
+    echo -e "0\t"(_ "Use original 0.90 format superblock")
+    echo -e "0.90\t"(_ "Use original 0.90 format superblock")
+    echo -e "1\t"(_ "Use last 1.x format superblock")
+    echo -e "default\t"(_ "Use last 1.x format superblock")
+    echo -e "1.0\t"(_ "Use 1.0 format superblock")
+    echo -e "1.1\t"(_ "Use 1.1 format superblock")
+    echo -e "1.2\t"(_ "Use 1.2 format superblock")
+    echo -e "ddf\t"(_ "Use DDF (Disk Data Format) format")
+    echo -e "imsm\t"(_ "Use Intel(R) Matrix Storage Manager format")
 end
 
 function __fish_mdadm_level_options
-	echo -e "linear\t"(_ "JBOD")
-	echo -e "raid0\t"(_ "Stripped volume (RAID 0)")
-	echo -e "0\t"(_ "Stripped volume (RAID 0)")
-	echo -e "stripe\t"(_ "Stripped volume (RAID 0)")
-	echo -e "raid1\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "1\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "mirror\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "raid4\t"(_ "Stripped volume with parity disk (RAID 4)")
-	echo -e "4\t"(_ "Stripped volume with parity disk (RAID 4)")
-	echo -e "raid5\t"(_ "Stripped volume with distributed parity (RAID 5)")
-	echo -e "5\t"(_ "Stripped volume with distributed parity (RAID 5)")
-	echo -e "raid6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
-	echo -e "6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
-	echo -e "raid10\t"(_ "Mirrored stripped volume (RAID 10)")
-	echo -e "10\t"(_ "Mirrored stripped volume (RAID 10)")
-	echo -e "multipath\t"(_ "Multiple access device, AKA multipath (deprecated)")
-	echo -e "mp\t"(_ "Multiple access device, AKA multipath (deprecated)")
-	echo -e "faulty\t"(_ "Pseudo RAID layer for single device (akin faulty RAID 1)")
-	echo -e "container\t"(_ "Container") # To be clarified
+    echo -e "linear\t"(_ "JBOD")
+    echo -e "raid0\t"(_ "Stripped volume (RAID 0)")
+    echo -e "0\t"(_ "Stripped volume (RAID 0)")
+    echo -e "stripe\t"(_ "Stripped volume (RAID 0)")
+    echo -e "raid1\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "1\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "mirror\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "raid4\t"(_ "Stripped volume with parity disk (RAID 4)")
+    echo -e "4\t"(_ "Stripped volume with parity disk (RAID 4)")
+    echo -e "raid5\t"(_ "Stripped volume with distributed parity (RAID 5)")
+    echo -e "5\t"(_ "Stripped volume with distributed parity (RAID 5)")
+    echo -e "raid6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
+    echo -e "6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
+    echo -e "raid10\t"(_ "Mirrored stripped volume (RAID 10)")
+    echo -e "10\t"(_ "Mirrored stripped volume (RAID 10)")
+    echo -e "multipath\t"(_ "Multiple access device, AKA multipath (deprecated)")
+    echo -e "mp\t"(_ "Multiple access device, AKA multipath (deprecated)")
+    echo -e "faulty\t"(_ "Pseudo RAID layer for single device (akin faulty RAID 1)")
+    echo -e "container\t"(_ "Container") # To be clarified
 end
 
 function __fish_mdadm_layout_options # To be clarified
-	echo -e "left-asymmetric"
-	echo -e "left-symmetric"
-	echo -e "right-asymmetric"
-	echo -e "right-symmetric"
-	echo -e "la\t"(_ "Alias of left-asymmetric")
-	echo -e "ra\t"(_ "Alias of right-asymmetric")
-	echo -e "ls\t"(_ "Alias of left-symmetric")
-	echo -e "rs\t"(_ "Alias of right-symmetric")
-	echo -e "parity-first"
-	echo -e "parity-last"
-	echo -e "ddf-zero-restart"
-	echo -e "ddf-N-restart"
-	echo -e "ddf-N-continue"
-	echo -e "left-symmetric-6"
-	echo -e "right-symmetric-6"
-	echo -e "left-asymmetric-6"
-	echo -e "right-asymmetric-6"
-	echo -e "parity-first-6"
-	echo -e "write-transient"
-	echo -e "wt\t"(_ "Alias of write-transient")
-	echo -e "read-transient"
-	echo -e "rt\t"(_ "Alias of read-transient")
-	echo -e "write-persistent"
-	echo -e "wp\t"(_ "Alias of write-persistent")
-	echo -e "read-persistent"
-	echo -e "rp\t"(_ "Alias of read-persistent")
-	echo -e "write-all"
-	echo -e "read-fixable"
-	echo -e "rf\t"(_ "Alias of read-fixable")
-	echo -e "clear"
-	echo -e "flush"
-	echo -e "none"
-	echo -e "n"
-	echo -e "o"
-	echo -e "f"
-	echo -e "normalise"
-	echo -e "preserve"
+    echo -e "left-asymmetric"
+    echo -e "left-symmetric"
+    echo -e "right-asymmetric"
+    echo -e "right-symmetric"
+    echo -e "la\t"(_ "Alias of left-asymmetric")
+    echo -e "ra\t"(_ "Alias of right-asymmetric")
+    echo -e "ls\t"(_ "Alias of left-symmetric")
+    echo -e "rs\t"(_ "Alias of right-symmetric")
+    echo -e "parity-first"
+    echo -e "parity-last"
+    echo -e "ddf-zero-restart"
+    echo -e "ddf-N-restart"
+    echo -e "ddf-N-continue"
+    echo -e "left-symmetric-6"
+    echo -e "right-symmetric-6"
+    echo -e "left-asymmetric-6"
+    echo -e "right-asymmetric-6"
+    echo -e "parity-first-6"
+    echo -e "write-transient"
+    echo -e "wt\t"(_ "Alias of write-transient")
+    echo -e "read-transient"
+    echo -e "rt\t"(_ "Alias of read-transient")
+    echo -e "write-persistent"
+    echo -e "wp\t"(_ "Alias of write-persistent")
+    echo -e "read-persistent"
+    echo -e "rp\t"(_ "Alias of read-persistent")
+    echo -e "write-all"
+    echo -e "read-fixable"
+    echo -e "rf\t"(_ "Alias of read-fixable")
+    echo -e "clear"
+    echo -e "flush"
+    echo -e "none"
+    echo -e "n"
+    echo -e "o"
+    echo -e "f"
+    echo -e "normalise"
+    echo -e "preserve"
 end
 
 function __fish_mdadm_level_options
-	echo -e "yes\t"(_ "Use standard format (default)")
-	echo -e "md\t"(_ "Use a non-partitionable array")
-	echo -e "mdp\t"(_ "Use a partitionable array")
-	echo -e "part\t"(_ "Use a partitionable array")
-	echo -e "p\t"(_ "Use a partitionable array")
+    echo -e "yes\t"(_ "Use standard format (default)")
+    echo -e "md\t"(_ "Use a non-partitionable array")
+    echo -e "mdp\t"(_ "Use a partitionable array")
+    echo -e "part\t"(_ "Use a partitionable array")
+    echo -e "p\t"(_ "Use a partitionable array")
 end
 
 function __fish_mdadm_update_options
-	echo -e "sparc2.2\t"(_ "Remove superblock misalignement from SPARC kernel 2.2")
-	echo -e "summaries\t"(_ "Correct superblock summaries")
-	echo -e "uuid\t"(_ "Update array UUID")
-	echo -e "name\t"(_ "Update array name")
-	echo -e "nodes\t"(_ "Update array nodes")
-	echo -e "homehost\t"(_ "Update array homehost")
-	echo -e "home-cluster\t"(_ "Update array cluster name")
-	echo -e "resync\t"(_ "Mark the array as dirty, thus forcing resync")
-	echo -e "byteorder\t"(_ "Reverse superblock endianness")
-	echo -e "devicesize\t"(_ "Refresh device size")
-	echo -e "no-bitmap\t"(_ "Assume bitmap absence")
-	echo -e "bbl\t"(_ "Reserve space for bad block list")
-	echo -e "no-bbl\t"(_ "Free reserved space for bad block list")
-	echo -e "metadata\t"(_ "Convert 0.90 metadata to 1.0")
-	echo -e "super-minor\t"(_ "Reset preferred minor to current one")
+    echo -e "sparc2.2\t"(_ "Remove superblock misalignement from SPARC kernel 2.2")
+    echo -e "summaries\t"(_ "Correct superblock summaries")
+    echo -e "uuid\t"(_ "Update array UUID")
+    echo -e "name\t"(_ "Update array name")
+    echo -e "nodes\t"(_ "Update array nodes")
+    echo -e "homehost\t"(_ "Update array homehost")
+    echo -e "home-cluster\t"(_ "Update array cluster name")
+    echo -e "resync\t"(_ "Mark the array as dirty, thus forcing resync")
+    echo -e "byteorder\t"(_ "Reverse superblock endianness")
+    echo -e "devicesize\t"(_ "Refresh device size")
+    echo -e "no-bitmap\t"(_ "Assume bitmap absence")
+    echo -e "bbl\t"(_ "Reserve space for bad block list")
+    echo -e "no-bbl\t"(_ "Free reserved space for bad block list")
+    echo -e "metadata\t"(_ "Convert 0.90 metadata to 1.0")
+    echo -e "super-minor\t"(_ "Reset preferred minor to current one")
 end
 
 function __fish_mdadm_action_options
-	echo -e "idle\t"(_ "Abort currently running actions")
-	echo -e "frozen\t"(_ "Abort currently running actions, prevent their restart")
-	echo -e "check\t"(_ "Scrub the array (i.e. check constistency)")
-	echo -e "repair\t"(_ "Check, then resync")
+    echo -e "idle\t"(_ "Abort currently running actions")
+    echo -e "frozen\t"(_ "Abort currently running actions, prevent their restart")
+    echo -e "check\t"(_ "Scrub the array (i.e. check constistency)")
+    echo -e "repair\t"(_ "Check, then resync")
 end
 
 # In the next 7 lines, the tested option is maintained into the search list to prevent suggesting it if it has already been used, as they cannot be used twice
diff --git a/share/completions/meson.fish b/share/completions/meson.fish
index 07ca928d5..9a3dc1222 100644
--- a/share/completions/meson.fish
+++ b/share/completions/meson.fish
@@ -1,40 +1,40 @@
 # Completions for the meson build system (http://mesonbuild.com/)
 
 set -l basic_arguments \
-	"h,help,show help message and exit" \
-	",stdsplit,Split stdout and stderr in test logs" \
-	",errorlogs,Print logs from failing test(s)" \
-	",werror,Treat warnings as errors" \
-	",strip,Strip targets on install" \
-	"v,version,Show version number and exit"
+    "h,help,show help message and exit" \
+    ",stdsplit,Split stdout and stderr in test logs" \
+    ",errorlogs,Print logs from failing test(s)" \
+    ",werror,Treat warnings as errors" \
+    ",strip,Strip targets on install" \
+    "v,version,Show version number and exit"
 
 set -l dir_arguments \
-	",localedir,Locale data directory [share/locale]" \
-	",sbindir,System executable directory [sbin]" \
-	",infodir,Info page directory [share/info]" \
-	",prefix,Installation prefix [/usr/local]" \
-	",mandir,Manual page directory [share/man]" \
-	",datadir,Data file directory [share]" \
-	",bindir,Executable directory [bin]" \
-	",sharedstatedir,Arch-agnostic data directory [com]" \
-	",libdir,Library directory [system default]" \
-	",localstatedir,Localstate data directory [var]" \
-	",libexecdir,Library executable directory [libexec]" \
-	",includedir,Header file directory [include]" \
-	",sysconfdir,Sysconf data directory [etc]"
+    ",localedir,Locale data directory [share/locale]" \
+    ",sbindir,System executable directory [sbin]" \
+    ",infodir,Info page directory [share/info]" \
+    ",prefix,Installation prefix [/usr/local]" \
+    ",mandir,Manual page directory [share/man]" \
+    ",datadir,Data file directory [share]" \
+    ",bindir,Executable directory [bin]" \
+    ",sharedstatedir,Arch-agnostic data directory [com]" \
+    ",libdir,Library directory [system default]" \
+    ",localstatedir,Localstate data directory [var]" \
+    ",libexecdir,Library executable directory [libexec]" \
+    ",includedir,Header file directory [include]" \
+    ",sysconfdir,Sysconf data directory [etc]"
 
 for arg in $basic_arguments
-	set -l parts (string split , -- $arg)
-	if not string match -q "" -- $parts[1]
-		complete -c meson -s "$parts[1]" -l "$parts[2]" -d "$parts[3]"
-	else
-		complete -c meson -l "$parts[2]" -d "$parts[3]"
-	end
+    set -l parts (string split , -- $arg)
+    if not string match -q "" -- $parts[1]
+        complete -c meson -s "$parts[1]" -l "$parts[2]" -d "$parts[3]"
+    else
+        complete -c meson -l "$parts[2]" -d "$parts[3]"
+    end
 end
 
 for arg in $dir_arguments
-	set -l parts (string split , -- $arg)
-	complete -c meson -l "$parts[2]" -d "$parts[3]" -xa '(__fish_complete_directories)'
+    set -l parts (string split , -- $arg)
+    complete -c meson -l "$parts[2]" -d "$parts[3]" -xa '(__fish_complete_directories)'
 end
 
 complete -c meson -s "D" -d "Set value of an option (-D foo=bar)"
diff --git a/share/completions/mix.fish b/share/completions/mix.fish
index 6fa365f9c..cce3fa542 100644
--- a/share/completions/mix.fish
+++ b/share/completions/mix.fish
@@ -1,53 +1,53 @@
 # Completions for the Elixir build tool mix
 
 function __fish_mix_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_mix_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 
-complete -f -c mix -n '__fish_mix_needs_command' -a app.start         -d "Starts all registered apps"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive           -d "Lists all archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive.build     -d "Archives this project into a .ez file"
-complete    -c mix -n '__fish_mix_needs_command' -a archive.install   -d "Installs an archive locally"
-complete    -c mix -n '__fish_mix_needs_command' -a archive.uninstall -d "Uninstalls archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a clean             -d "Deletes generated application files"
-complete -f -c mix -n '__fish_mix_needs_command' -a cmd               -d "Executes the given command"
-complete    -c mix -n '__fish_mix_needs_command' -a compile           -d "Compiles source files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps              -d "Lists dependencies and their status"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean        -d "Deletes the given dependencies' files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile      -d "Compiles dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.get          -d "Gets all out of date dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock       -d "Unlocks the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.update       -d "Updates the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a do                -d "Executes the tasks separated by comma"
-complete -f -c mix -n '__fish_mix_needs_command' -a escript.build     -d "Builds an escript for the project"
-complete -f -c mix -n '__fish_mix_needs_command' -a help              -d "Prints help information for tasks"
-complete    -c mix -n '__fish_mix_needs_command' -a loadconfig        -d "Loads and persists the given configuration"
-complete -f -c mix -n '__fish_mix_needs_command' -a local             -d "Lists local tasks"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.hex         -d "Installs Hex locally"
+complete -f -c mix -n '__fish_mix_needs_command' -a app.start -d "Starts all registered apps"
+complete -f -c mix -n '__fish_mix_needs_command' -a archive -d "Lists all archives"
+complete -f -c mix -n '__fish_mix_needs_command' -a archive.build -d "Archives this project into a .ez file"
+complete -c mix -n '__fish_mix_needs_command' -a archive.install -d "Installs an archive locally"
+complete -c mix -n '__fish_mix_needs_command' -a archive.uninstall -d "Uninstalls archives"
+complete -f -c mix -n '__fish_mix_needs_command' -a clean -d "Deletes generated application files"
+complete -f -c mix -n '__fish_mix_needs_command' -a cmd -d "Executes the given command"
+complete -c mix -n '__fish_mix_needs_command' -a compile -d "Compiles source files"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps -d "Lists dependencies and their status"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean -d "Deletes the given dependencies' files"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile -d "Compiles dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.get -d "Gets all out of date dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock -d "Unlocks the given dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.update -d "Updates the given dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a do -d "Executes the tasks separated by comma"
+complete -f -c mix -n '__fish_mix_needs_command' -a escript.build -d "Builds an escript for the project"
+complete -f -c mix -n '__fish_mix_needs_command' -a help -d "Prints help information for tasks"
+complete -c mix -n '__fish_mix_needs_command' -a loadconfig -d "Loads and persists the given configuration"
+complete -f -c mix -n '__fish_mix_needs_command' -a local -d "Lists local tasks"
+complete -f -c mix -n '__fish_mix_needs_command' -a local.hex -d "Installs Hex locally"
 complete -f -c mix -n '__fish_mix_needs_command' -a local.public_keys -d "Manages public keys"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.rebar       -d "Installs rebar locally"
-complete    -c mix -n '__fish_mix_needs_command' -a new               -d "Creates a new Elixir project"
-complete    -c mix -n '__fish_mix_needs_command' -a profile.fprof     -d "Profiles the given file or expression with fprof"
-complete -f -c mix -n '__fish_mix_needs_command' -a run               -d "Runs the given file or expression"
-complete -f -c mix -n '__fish_mix_needs_command' -a test              -d "Runs a project's tests"
+complete -f -c mix -n '__fish_mix_needs_command' -a local.rebar -d "Installs rebar locally"
+complete -c mix -n '__fish_mix_needs_command' -a new -d "Creates a new Elixir project"
+complete -c mix -n '__fish_mix_needs_command' -a profile.fprof -d "Profiles the given file or expression with fprof"
+complete -f -c mix -n '__fish_mix_needs_command' -a run -d "Runs the given file or expression"
+complete -f -c mix -n '__fish_mix_needs_command' -a test -d "Runs a project's tests"
 
 # archive.build subcommand
-complete    -c mix -n '__fish_mix_using_command archive.build' -s i -d "specify input directory"
+complete -c mix -n '__fish_mix_using_command archive.build' -s i -d "specify input directory"
 complete -f -c mix -n '__fish_mix_using_command archive.build' -s o -d "specify output file name"
 complete -f -c mix -n '__fish_mix_using_command archive.build' -l no-compile -d "skip compilation"
 
@@ -59,10 +59,10 @@ complete -f -c mix -n '__fish_mix_using_command escript.build' -l force -d "forc
 complete -f -c mix -n '__fish_mix_using_command escript.build' -l no-compile -d "skips compilation to .beam files"
 
 # new subcommand
-complete -f -c mix -n '__fish_mix_using_command new' -l sup      -d "can be given to generate an OTP application skeleton including a supervision tree"
+complete -f -c mix -n '__fish_mix_using_command new' -l sup -d "can be given to generate an OTP application skeleton including a supervision tree"
 complete -f -c mix -n '__fish_mix_using_command new' -l umbrella -d "can be given to generate an umbrella project"
-complete -f -c mix -n '__fish_mix_using_command new' -l app      -d "can be given in order to name the OTP application"
-complete -f -c mix -n '__fish_mix_using_command new' -l module   -d "can be given in order to name the modules in the generated code skeleton"
+complete -f -c mix -n '__fish_mix_using_command new' -l app -d "can be given in order to name the OTP application"
+complete -f -c mix -n '__fish_mix_using_command new' -l module -d "can be given in order to name the modules in the generated code skeleton"
 
 # run subcommand
 complete -c mix -n '__fish_mix_using_command run' -l config -s c -d "loads the given configuration file"
@@ -90,29 +90,29 @@ complete -c mix -n '__fish_mix_using_command test' -l seed -d "seeds the random
 complete -c mix -n '__fish_mix_using_command test' -l timeout -d "set the timeout for the tests"
 
 # help subcommand
-complete -f -c mix -n '__fish_mix_using_command help' -a app.start         -d "Starts all registered apps"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive           -d "Lists all archives"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive.build     -d "Archives this project into a .ez file"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive.install   -d "Installs an archive locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a app.start -d "Starts all registered apps"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive -d "Lists all archives"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive.build -d "Archives this project into a .ez file"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive.install -d "Installs an archive locally"
 complete -f -c mix -n '__fish_mix_using_command help' -a archive.uninstall -d "Uninstalls archives"
-complete -f -c mix -n '__fish_mix_using_command help' -a clean             -d "Deletes generated application files"
-complete -f -c mix -n '__fish_mix_using_command help' -a cmd               -d "Executes the given command"
-complete -f -c mix -n '__fish_mix_using_command help' -a compile           -d "Compiles source files"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps              -d "Lists dependencies and their status"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.clean        -d "Deletes the given dependencies' files"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.compile      -d "Compiles dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.get          -d "Gets all out of date dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.unlock       -d "Unlocks the given dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.update       -d "Updates the given dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a do                -d "Executes the tasks separated by comma"
-complete -f -c mix -n '__fish_mix_using_command help' -a escript.build     -d "Builds an escript for the project"
-complete -f -c mix -n '__fish_mix_using_command help' -a help              -d "Prints help information for tasks"
-complete -f -c mix -n '__fish_mix_using_command help' -a loadconfig        -d "Loads and persists the given configuration"
-complete -f -c mix -n '__fish_mix_using_command help' -a local             -d "Lists local tasks"
-complete -f -c mix -n '__fish_mix_using_command help' -a local.hex         -d "Installs Hex locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a clean -d "Deletes generated application files"
+complete -f -c mix -n '__fish_mix_using_command help' -a cmd -d "Executes the given command"
+complete -f -c mix -n '__fish_mix_using_command help' -a compile -d "Compiles source files"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps -d "Lists dependencies and their status"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.clean -d "Deletes the given dependencies' files"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.compile -d "Compiles dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.get -d "Gets all out of date dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.unlock -d "Unlocks the given dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.update -d "Updates the given dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a do -d "Executes the tasks separated by comma"
+complete -f -c mix -n '__fish_mix_using_command help' -a escript.build -d "Builds an escript for the project"
+complete -f -c mix -n '__fish_mix_using_command help' -a help -d "Prints help information for tasks"
+complete -f -c mix -n '__fish_mix_using_command help' -a loadconfig -d "Loads and persists the given configuration"
+complete -f -c mix -n '__fish_mix_using_command help' -a local -d "Lists local tasks"
+complete -f -c mix -n '__fish_mix_using_command help' -a local.hex -d "Installs Hex locally"
 complete -f -c mix -n '__fish_mix_using_command help' -a local.public_keys -d "Manages public keys"
-complete -f -c mix -n '__fish_mix_using_command help' -a local.rebar       -d "Installs rebar locally"
-complete -f -c mix -n '__fish_mix_using_command help' -a new               -d "Creates a new Elixir project"
-complete -f -c mix -n '__fish_mix_using_command help' -a profile.fprof     -d "Profiles the given file or expression with fprof"
-complete -f -c mix -n '__fish_mix_using_command help' -a run               -d "Runs the given file or expression"
-complete -f -c mix -n '__fish_mix_using_command help' -a test              -d "Runs a project's tests"
+complete -f -c mix -n '__fish_mix_using_command help' -a local.rebar -d "Installs rebar locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a new -d "Creates a new Elixir project"
+complete -f -c mix -n '__fish_mix_using_command help' -a profile.fprof -d "Profiles the given file or expression with fprof"
+complete -f -c mix -n '__fish_mix_using_command help' -a run -d "Runs the given file or expression"
+complete -f -c mix -n '__fish_mix_using_command help' -a test -d "Runs a project's tests"
diff --git a/share/completions/mkdir.fish b/share/completions/mkdir.fish
index 1e863244b..f33a69bca 100644
--- a/share/completions/mkdir.fish
+++ b/share/completions/mkdir.fish
@@ -1,6 +1,6 @@
 
 # Checks if we are using GNU tools
-if mkdir --version > /dev/null 2>/dev/null
+if mkdir --version >/dev/null 2>/dev/null
     complete -c mkdir -l version -d 'Output version'
     complete -c mkdir -s m -l mode -d 'Set file mode (as in chmod)' -x
     complete -c mkdir -s p -l parents -d 'Make parent directories as needed'
@@ -14,6 +14,6 @@ else
 end
 
 # Checks if SELinux is installed
-if command -s sestatus > /dev/null 2>/dev/null
+if command -s sestatus >/dev/null 2>/dev/null
     complete -c mkdir -l context -s Z -d 'Set SELinux security context of each created directory to the default type'
 end
diff --git a/share/completions/mktemp.fish b/share/completions/mktemp.fish
index 11dceb1a7..c7754f98f 100644
--- a/share/completions/mktemp.fish
+++ b/share/completions/mktemp.fish
@@ -1,14 +1,14 @@
 if mktemp --version >/dev/null 2>/dev/null # GNU
-	complete -c mktemp -s d -l directory    -d 'create a directory, not a file'
-	complete -c mktemp -s u -l dry-run      -d 'do not create anything; merely print a name (unsafe)'
-	complete -c mktemp -s q -l quiet        -d 'suppress diagnostics about file/dir-creation failure'
-	complete -c mktemp -l suffix -r         -d 'append SUFF to TEMPLATE'
-	complete -c mktemp -l tmpdir            -d 'interpret TEMPLATE relative to DIR'
-	complete -c mktemp -l help              -d 'display this help and exit'
-	complete -c mktemp -l version           -d 'output version information and exit'
+    complete -c mktemp -s d -l directory -d 'create a directory, not a file'
+    complete -c mktemp -s u -l dry-run -d 'do not create anything; merely print a name (unsafe)'
+    complete -c mktemp -s q -l quiet -d 'suppress diagnostics about file/dir-creation failure'
+    complete -c mktemp -l suffix -r -d 'append SUFF to TEMPLATE'
+    complete -c mktemp -l tmpdir -d 'interpret TEMPLATE relative to DIR'
+    complete -c mktemp -l help -d 'display this help and exit'
+    complete -c mktemp -l version -d 'output version information and exit'
 else # OS X
-	complete -c mktemp -s d                 -d 'create a directory, not a file'
-	complete -c mktemp -s q                 -d 'suppress diagnostics about file/dir-creation failure'
-	complete -c mktemp -s t -r              -d 'generate a template using PREFIX and TMPDIR (if set)'
-	complete -c mktemp -s u                 -d 'file will be unliked before mktemp exits (unsafe)'
+    complete -c mktemp -s d -d 'create a directory, not a file'
+    complete -c mktemp -s q -d 'suppress diagnostics about file/dir-creation failure'
+    complete -c mktemp -s t -r -d 'generate a template using PREFIX and TMPDIR (if set)'
+    complete -c mktemp -s u -d 'file will be unliked before mktemp exits (unsafe)'
 end
\ No newline at end of file
diff --git a/share/completions/mkvextract.fish b/share/completions/mkvextract.fish
index 89b0bb6fd..94a141420 100644
--- a/share/completions/mkvextract.fish
+++ b/share/completions/mkvextract.fish
@@ -17,10 +17,10 @@ function __fish_mkvextract_get_mode
             case tracks tags attachments chapters cuesheet timecodes_v2 cues
                 echo $c
                 return 0
-            # General flags that require an option - skip next argument
+                # General flags that require an option - skip next argument
             case --ui-language --command-line-charset --output-charset -r --redirect-output --ui-language --debug --engage
                 set skip_next 1
-            # If any of these flags are present, all other args are ignored
+                # If any of these flags are present, all other args are ignored
             case -h --help -V --version --check-for-updates
                 return 1
         end
@@ -46,10 +46,10 @@ function __fish_mkvextract_get_file
             # We've found the mode specifier, now look for the file
             case $mode
                 set mode_found 1
-            # Track-specific flags can appear between mode specifier and file
+                # Track-specific flags can appear between mode specifier and file
             case --ui-language --command-line-charset --output-charset -r --redirect-output --ui-language --debug --engage -c --blockadd --simple-language
                 set skip_next 1
-            # These flags now need to be explicitly skipped
+                # These flags now need to be explicitly skipped
             case -f --parse-fully -v --verbose -q --quiet '@*' --cuesheet --raw --fullraw -s --simple --gui-mode
                 continue
             case -h --help -V --version --check-for-updates
@@ -87,38 +87,38 @@ function __fish_mkvextract_print_tracks
 end
 
 # simple options
-complete -f -c mkvextract -s V -l 'version'           -d 'Show version information'
-complete -f -c mkvextract -s h -l 'help'              -d 'Show help'
-complete -f -c mkvextract      -l 'check-for-updates' -d 'Check online for updates'
+complete -f -c mkvextract -s V -l 'version' -d 'Show version information'
+complete -f -c mkvextract -s h -l 'help' -d 'Show help'
+complete -f -c mkvextract -l 'check-for-updates' -d 'Check online for updates'
 # extraction modes
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tracks'       -d 'Extract tracks to external files'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tags'         -d 'Extract tags as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'attachments'  -d 'Extract attachments'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'chapters'     -d 'Extract chapters as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cuesheet'     -d 'Extract chapters and tags as CUE sheet'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tracks' -d 'Extract tracks to external files'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tags' -d 'Extract tags as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'attachments' -d 'Extract attachments'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'chapters' -d 'Extract chapters as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cuesheet' -d 'Extract chapters and tags as CUE sheet'
 complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'timecodes_v2' -d 'Extract timecodes of a track as timecode v2 file'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cues'         -d 'Extract cue information as text file'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cues' -d 'Extract cue information as text file'
 # tracks/attachments when appropriate
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks timecodes_v2 cues' -a '(__fish_mkvextract_print_tracks)'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode attachments'              -a '(__fish_mkvextract_print_attachments)'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode attachments' -a '(__fish_mkvextract_print_attachments)'
 # these extraction modes have no parameters other than optional flags and the file
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tags chapters cuesheet'
 # general flags
-complete -c mkvextract    -s f -l 'parse-fully'          -d 'Parse the whole file instead of relying on the index'
-complete -c mkvextract    -s v -l 'verbose'              -d 'Increase verbosity'
-complete -c mkvextract    -s q -l 'quiet'                -d 'Suppress status output'
-complete -c mkvextract -r      -l 'ui-language'          -d 'Force a locale'
-complete -c mkvextract -r      -l 'command-line-charset' -d 'Charset for strings on the command line'
-complete -c mkvextract -r      -l 'output-charset'       -d 'Outputs messages in specified charset'
-complete -c mkvextract -r -s r -l 'redirect-output'      -d 'Redirect all messages into a file'
-complete -c mkvextract -r      -l 'debug'                -d 'Turn on debugging for a specific feature'
-complete -c mkvextract -r      -l 'engage'               -d 'Turn on an experimental feature'
-complete -c mkvextract         -l 'gui-mode'             -d 'Enable GUI mode'
+complete -c mkvextract -s f -l 'parse-fully' -d 'Parse the whole file instead of relying on the index'
+complete -c mkvextract -s v -l 'verbose' -d 'Increase verbosity'
+complete -c mkvextract -s q -l 'quiet' -d 'Suppress status output'
+complete -c mkvextract -r -l 'ui-language' -d 'Force a locale'
+complete -c mkvextract -r -l 'command-line-charset' -d 'Charset for strings on the command line'
+complete -c mkvextract -r -l 'output-charset' -d 'Outputs messages in specified charset'
+complete -c mkvextract -r -s r -l 'redirect-output' -d 'Redirect all messages into a file'
+complete -c mkvextract -r -l 'debug' -d 'Turn on debugging for a specific feature'
+complete -c mkvextract -r -l 'engage' -d 'Turn on an experimental feature'
+complete -c mkvextract -l 'gui-mode' -d 'Enable GUI mode'
 # mode-specific flags
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'   -r -s c                      -d 'Convert text subtitles to a charset'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'cuesheet'        -d 'Also try to extract the CUE sheet'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'   -r      -l 'blockadd'        -d 'Keep only the BlockAdditions up to the specified level'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'raw'             -d 'Extract the data to a raw file'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'fullraw'         -d 'Extract the data to a raw file including the CodecPrivate as header'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters'    -s s -l 'simple'          -d 'Exports the chapter information in a simple format'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r      -l 'simple-language' -d 'Uses the chapter names of the specified language'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -s c -d 'Convert text subtitles to a charset'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'cuesheet' -d 'Also try to extract the CUE sheet'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -l 'blockadd' -d 'Keep only the BlockAdditions up to the specified level'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'raw' -d 'Extract the data to a raw file'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'fullraw' -d 'Extract the data to a raw file including the CodecPrivate as header'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -s s -l 'simple' -d 'Exports the chapter information in a simple format'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r -l 'simple-language' -d 'Uses the chapter names of the specified language'
diff --git a/share/completions/mocha.fish b/share/completions/mocha.fish
index 72e91d077..221ac3483 100644
--- a/share/completions/mocha.fish
+++ b/share/completions/mocha.fish
@@ -1,47 +1,47 @@
 complete -c mocha -l help -o help -s h -d "Show help"
-complete -c mocha -s V -l version          -d "output the version number"
-complete -c mocha -s A -l async-only       -d "force all tests to take a callback (async) or return a promise"
-complete -c mocha -s c -l colors           -d "force enabling of colors"
-complete -c mocha -s C -l no-colors        -d "force disabling of colors"
-complete -c mocha -s G -l growl            -d "enable growl notification support"
+complete -c mocha -s V -l version -d "output the version number"
+complete -c mocha -s A -l async-only -d "force all tests to take a callback (async) or return a promise"
+complete -c mocha -s c -l colors -d "force enabling of colors"
+complete -c mocha -s C -l no-colors -d "force disabling of colors"
+complete -c mocha -s G -l growl -d "enable growl notification support"
 complete -c mocha -s O -l reporter-options -d "<k=v,k2=v2,...>  reporter-specific options"
-complete -c mocha -s R -l reporter -x      -d "specify the reporter to use"
-complete -c mocha -s S -l sort             -d "sort test files"
-complete -c mocha -s b -l bail             -d "bail after first test failure"
-complete -c mocha -s d -l debug            -d "enable node\'s debugger, synonym for node --debug"
-complete -c mocha -s g -l grep -x          -d "only run tests matching <pattern>"
-complete -c mocha -s f -l fgrep -x         -d "only run tests containing <string>"
-complete -c mocha -s g -l expose-gc        -d "expose gc extension"
-complete -c mocha -s i -l invert           -d "inverts --grep and --fgrep matches"
-complete -c mocha -s r -l require -r       -d "require the given module"
-complete -c mocha -s s -l slow -x          -d "\"slow\" test threshold in milliseconds [75]"
-complete -c mocha -s t -l timeout -x       -d "set test-case timeout in milliseconds [2000]"
-complete -c mocha -s u -l ui -x            -d "specify user-interface (bdd|tdd|qunit|exports)"
-complete -c mocha -s w -l watch            -d "watch files for changes"
-complete -c mocha -l check-leaks           -d "check for global variable leaks"
-complete -c mocha -l full-trace            -d "display the full stack trace"
-complete -c mocha -l compilers -x          -d "use the given module(s) to compile files"
-complete -c mocha -l debug-brk             -d "enable node\'s debugger breaking on thefirst line"
-complete -c mocha -l globals -x            -d "allow the given comma-delimited global[names]"
-complete -c mocha -l es_staging            -d "enable all staged features"
-complete -c mocha -l harmony               -d "all node --harmony* flags are available"
-complete -c mocha -l preserve-symlinks     -d "Instructs the module loader to preserve symbolic links when resolving and caching modules"
-complete -c mocha -l icu-data-dir          -d "include ICU data"
-complete -c mocha -l inline-diffs          -d "display actual/expected differences inline within each string"
-complete -c mocha -l interfaces            -d "display available interfaces"
-complete -c mocha -l no-deprecation        -d "silence deprecation warnings"
-complete -c mocha -l no-exit               -d "require a clean shutdown of the event loop: mocha will not call process.exit"
-complete -c mocha -l no-timeouts           -d "disables timeouts, given implicitly with --debug"
-complete -c mocha -l opts                  -d "specify opts path"
-complete -c mocha -l perf-basic-prof       -d "enable perf linux profiler (basic support)"
-complete -c mocha -l prof                  -d "log statistical profiling information"
-complete -c mocha -l log-timer-events      -d "Time events including external callbacks"
-complete -c mocha -l recursive             -d "include sub directories"
-complete -c mocha -l reporters             -d "display available reporters"
-complete -c mocha -l retries               -d "set numbers of time to retry a failed test case"
-complete -c mocha -l throw-deprecation     -d "throw an exception anytime a deprecated function is used"
-complete -c mocha -l trace                 -d "trace function calls"
-complete -c mocha -l trace-deprecation     -d "show stack traces on deprecations"
-complete -c mocha -l use_strict            -d "enforce strict mode"
-complete -c mocha -l watch-extensions      -d "additional extensions to monitor with --watch"
-complete -c mocha -l delay                 -d "wait for async suite definition"
+complete -c mocha -s R -l reporter -x -d "specify the reporter to use"
+complete -c mocha -s S -l sort -d "sort test files"
+complete -c mocha -s b -l bail -d "bail after first test failure"
+complete -c mocha -s d -l debug -d "enable node\'s debugger, synonym for node --debug"
+complete -c mocha -s g -l grep -x -d "only run tests matching <pattern>"
+complete -c mocha -s f -l fgrep -x -d "only run tests containing <string>"
+complete -c mocha -s g -l expose-gc -d "expose gc extension"
+complete -c mocha -s i -l invert -d "inverts --grep and --fgrep matches"
+complete -c mocha -s r -l require -r -d "require the given module"
+complete -c mocha -s s -l slow -x -d "\"slow\" test threshold in milliseconds [75]"
+complete -c mocha -s t -l timeout -x -d "set test-case timeout in milliseconds [2000]"
+complete -c mocha -s u -l ui -x -d "specify user-interface (bdd|tdd|qunit|exports)"
+complete -c mocha -s w -l watch -d "watch files for changes"
+complete -c mocha -l check-leaks -d "check for global variable leaks"
+complete -c mocha -l full-trace -d "display the full stack trace"
+complete -c mocha -l compilers -x -d "use the given module(s) to compile files"
+complete -c mocha -l debug-brk -d "enable node\'s debugger breaking on thefirst line"
+complete -c mocha -l globals -x -d "allow the given comma-delimited global[names]"
+complete -c mocha -l es_staging -d "enable all staged features"
+complete -c mocha -l harmony -d "all node --harmony* flags are available"
+complete -c mocha -l preserve-symlinks -d "Instructs the module loader to preserve symbolic links when resolving and caching modules"
+complete -c mocha -l icu-data-dir -d "include ICU data"
+complete -c mocha -l inline-diffs -d "display actual/expected differences inline within each string"
+complete -c mocha -l interfaces -d "display available interfaces"
+complete -c mocha -l no-deprecation -d "silence deprecation warnings"
+complete -c mocha -l no-exit -d "require a clean shutdown of the event loop: mocha will not call process.exit"
+complete -c mocha -l no-timeouts -d "disables timeouts, given implicitly with --debug"
+complete -c mocha -l opts -d "specify opts path"
+complete -c mocha -l perf-basic-prof -d "enable perf linux profiler (basic support)"
+complete -c mocha -l prof -d "log statistical profiling information"
+complete -c mocha -l log-timer-events -d "Time events including external callbacks"
+complete -c mocha -l recursive -d "include sub directories"
+complete -c mocha -l reporters -d "display available reporters"
+complete -c mocha -l retries -d "set numbers of time to retry a failed test case"
+complete -c mocha -l throw-deprecation -d "throw an exception anytime a deprecated function is used"
+complete -c mocha -l trace -d "trace function calls"
+complete -c mocha -l trace-deprecation -d "show stack traces on deprecations"
+complete -c mocha -l use_strict -d "enforce strict mode"
+complete -c mocha -l watch-extensions -d "additional extensions to monitor with --watch"
+complete -c mocha -l delay -d "wait for async suite definition"
diff --git a/share/completions/mocp.fish b/share/completions/mocp.fish
index 19020abf2..cfb3b45da 100644
--- a/share/completions/mocp.fish
+++ b/share/completions/mocp.fish
@@ -1,35 +1,35 @@
-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 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 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 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 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 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 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 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"
-complete -c mocp -s o -l on                 -d "Turn on a control" -xa 'shuffle autonext repeat'
-complete -c mocp -s u -l off                -d "Turn off a control" -xa 'shuffle autonext repeat'
-complete -c mocp -s t -l toggle             -d "Toggle a control" -xa '(__fish_complete_list , "echo shuffle\nautonext\nrepeat\ns\tshuffle\nr\trepeat\nn\tautonext")'
+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 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 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 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 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 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 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 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"
+complete -c mocp -s o -l on -d "Turn on a control" -xa 'shuffle autonext repeat'
+complete -c mocp -s u -l off -d "Turn off a control" -xa 'shuffle autonext repeat'
+complete -c mocp -s t -l toggle -d "Toggle a control" -xa '(__fish_complete_list , "echo shuffle\nautonext\nrepeat\ns\tshuffle\nr\trepeat\nn\tautonext")'
diff --git a/share/completions/mogrify.fish b/share/completions/mogrify.fish
index b9a5f0a20..aec69c942 100644
--- a/share/completions/mogrify.fish
+++ b/share/completions/mogrify.fish
@@ -1,212 +1,212 @@
-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 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]'
-complete -c mogrify -o black-point-compensation     -d 'Use black point compensation'
-complete -c mogrify -o blue-primary                 -d 'Chromaticity blue primary point [point]'
-complete -c mogrify -o bordercolor                  -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o caption                      -d 'Assign a caption to an image [string]'
-complete -c mogrify -o cdl                          -d 'Color correct with a color decision list [filename]' -r
-complete -c mogrify -o channel                      -d 'Apply option to select image channels [type]' -xa '(mogrify -list channel)'
-complete -c mogrify -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c mogrify -o colorspace                   -d 'Alternate image colorspace [type]' -xa '(mogrify -list colorspace)'
-complete -c mogrify -o comment                      -d 'Annotate image with comment [string]'
-complete -c mogrify -o compose                      -d 'Set image composite operator [operator]'
-complete -c mogrify -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(mogrify -list compress)'
-complete -c mogrify -o decipher                     -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c mogrify -o define                       -d 'Define one or more image format options [format:option]'
-complete -c mogrify -o delay                        -d 'Display the next image after pausing [value]'
-complete -c mogrify -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c mogrify -o depth                        -d 'Image depth [value]'
-complete -c mogrify -o direction                    -d 'Render text right-to-left or left-to-right [type]' -xa '(mogrify -list direction)'
-complete -c mogrify -o display                      -d 'Get image or font from this X server [server]'
-complete -c mogrify -o dispose                      -d 'Layer disposal method [method]' -xa '(mogrify -list dispose)'
-complete -c mogrify -o dither                       -d 'Apply error diffusion to image [method]' -xa '(mogrify -list dither)'
-complete -c mogrify -o encipher                     -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c mogrify -o encoding                     -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c mogrify -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(mogrify -list endian)'
-complete -c mogrify -o family                       -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
-complete -c mogrify -o fill                         -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(mogrify -list filter)'
-complete -c mogrify -o flatten                      -d 'Flatten a sequence of images'
-complete -c mogrify -o font                         -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c mogrify -o format                       -d 'Image format type [type]' -xa '(__fish_complete_convert_options type)'
-complete -c mogrify -o function                     -d 'Apply a function to the image [name]' -xa '(mogrify -list function)'
-complete -c mogrify -o fuzz                         -d 'Colors within this distance are considered equal [distance]'
-complete -c mogrify -o gravity                      -d 'Horizontal and vertical text placement [type]' -xa '(mogrify -list gravity)'
-complete -c mogrify -o green-primary                -d 'Chromaticity green primary point [point]'
-complete -c mogrify -o intent                       -d 'Type of rendering intent when managing the image color [type]' -xa '(mogrify -list intent)'
-complete -c mogrify -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(mogrify -list interlace)'
-complete -c mogrify -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(mogrify -list interpolate)'
-complete -c mogrify -o kerning                      -d 'Set the space between two letters [value]'
-complete -c mogrify -o label                        -d 'Assign a label to an image [string]'
-complete -c mogrify -o limit                        -d 'Pixel cache resource limit [type value]' -x
-complete -c mogrify -o loop                         -d 'Add Netscape loop extension to your GIF animation [iterations]'
-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 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]'
-complete -c mogrify -o page                         -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c mogrify -o path                         -d 'Path write images to this path on disk'
-complete -c mogrify -o ping                         -d 'Efficiently determine image attributes'
-complete -c mogrify -o pointsize                    -d 'Font point size [value]'
-complete -c mogrify -o preview                      -d 'Image preview type [type]' -xa '(mogrify -list preview)'
-complete -c mogrify -o quality                      -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c mogrify -o quiet                        -d 'Suppress all warning messages'
-complete -c mogrify -o red-primary                  -d 'Chromaticity red primary point [point]'
-complete -c mogrify -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c mogrify -o sampling-factor              -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c mogrify -o scene                        -d 'Image scene number [value]'
-complete -c mogrify -o seed                         -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c mogrify -o size                         -d 'Width and height of image [geometry]'
-complete -c mogrify -o stretch                      -d 'Render text with this font stretch [type]' -xa '(mogrify -list stretch)'
-complete -c mogrify -o stroke                       -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o strokewidth                  -d 'Graphic primitive stroke width [value]'
-complete -c mogrify -o style                        -d 'Render text with this font style [type]' -xa '(mogrify -list style)'
-complete -c mogrify -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c mogrify -o synchronize                  -d 'Synchronize image to storage device'
-complete -c mogrify -o taint                        -d 'Declare the image as modified'
-complete -c mogrify -o texture                      -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c mogrify -o tile-offset                  -d 'Tile offset [geometry]'
-complete -c mogrify -o treedepth                    -d 'Color tree depth [value]'
-complete -c mogrify -o transparent-color            -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o undercolor                   -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o units                        -d 'The units of image resolution [type]' -xa '(mogrify -list units)'
-complete -c mogrify -o verbose                      -d 'Print detailed information about the image'
-complete -c mogrify -o view                         -d 'FlashPix viewing transforms'
-complete -c mogrify -o virtual-pixel                -d 'Virtual pixel access method [method]' -xa '(mogrify -list virtual-pixel)'
-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-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 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]'
-complete -c mogrify -o charcoal                     -d 'Simulate a charcoal drawing [radius]'
-complete -c mogrify -o chop                         -d 'Remove pixels from the image interior [geometry]'
-complete -c mogrify -o clip                         -d 'Clip along the first path from the 8BIM profile'
-complete -c mogrify -o clip-mask                    -d 'Associate a clip mask with the image [filename]' -r
-complete -c mogrify -o clip-path                    -d 'Clip along a named path from the 8BIM profile [id]'
-complete -c mogrify -o colorize                     -d 'Colorize the image with the fill color [value]'
-complete -c mogrify -o color-matrix                 -d 'Apply color correction to the image [matrix]'
-complete -c mogrify -o contrast                     -d 'Enhance or reduce the image contrast'
-complete -c mogrify -o contrast-stretch             -d 'Improve contrast by `stretching\' the intensity range [geometry]'
-complete -c mogrify -o convolve                     -d 'Apply a convolution kernel to the image [coefficients]'
-complete -c mogrify -o cycle                        -d 'Cycle the image colormap [amount]'
-complete -c mogrify -o despeckle                    -d 'Reduce the speckles within an image'
-complete -c mogrify -o draw                         -d 'Annotate the image with a graphic primitive [string]'
-complete -c mogrify -o edge                         -d 'Apply a filter to detect edges in the image [radius]'
-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 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)'
-complete -c mogrify -o flip                         -d 'Flip image vertically'
-complete -c mogrify -o floodfill                    -d 'Color floodfill the image with color [geometry]'
-complete -c mogrify -o flop                         -d 'Flop image horizontally'
-complete -c mogrify -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c mogrify -o gamma                        -d 'Level of gamma correction [value]'
-complete -c mogrify -o gaussian-blur                -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c mogrify -o geometry                     -d 'Preferred size or location of the image [geometry]'
-complete -c mogrify -o ift                          -d 'Implements the inverse discrete Fourier transform (DFT)'
-complete -c mogrify -o help                         -d 'Print program options'
-complete -c mogrify -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c mogrify -o implode                      -d 'Implode image pixels about the center [amount]'
-complete -c mogrify -o lat                          -d 'Local adaptive thresholding [geometry]'
-complete -c mogrify -o layers                       -d 'Optimize or compare image layers [method]' -xa '(mogrify -list layers)'
-complete -c mogrify -o level                        -d 'Adjust the level of image contrast [value]'
-complete -c mogrify -o linear-stretch               -d 'Improve contrast by `stretching with saturation\' the intensity range [geometry]'
-complete -c mogrify -o median                       -d 'Apply a median filter to the image [geometry]'
-complete -c mogrify -o mode                         -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
-complete -c mogrify -o modulate                     -d 'Vary the brightness, saturation, and hue [value]'
-complete -c mogrify -o monochrome                   -d 'Transform image to black and white'
-complete -c mogrify -o motion-blur                  -d 'Simulate motion blur [geometry]'
-complete -c mogrify -o negate                       -d 'Replace each pixel with its complementary color'
-complete -c mogrify -o noise                        -d 'Add or reduce noise in an image [geometry]'
-complete -c mogrify -o normalize                    -d 'Transform image to span the full range of colors'
-complete -c mogrify -o opaque                       -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o ordered-dither               -d 'Add a noise pattern to the image with specific amplitudes [NxN]'
-complete -c mogrify -o paint                        -d 'Simulate an oil painting [radius]'
-complete -c mogrify -o polaroid                     -d 'Simulate a Polaroid picture [angle]'
-complete -c mogrify -o posterize                    -d 'Reduce the image to a limited number of color levels [levels]'
-complete -c mogrify -o print                        -d 'Interpret string and print to console [string]'
-complete -c mogrify -o profile                      -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c mogrify -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(mogrify -list colorspace)'
-complete -c mogrify -o radial-blur                  -d 'Radial blur the image [angle]'
-complete -c mogrify -o raise                        -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c mogrify -o random-threshold             -d 'Random threshold the image [low,high]'
-complete -c mogrify -o region                       -d 'Apply options to a portion of the image [geometry]'
-complete -c mogrify -o render                       -d 'Render vector graphics'
-complete -c mogrify -o repage                       -d 'Size and location of an image canvas [geometry]'
-complete -c mogrify -o resample                     -d 'Change the resolution of an image [geometry]'
-complete -c mogrify -o resize                       -d 'Resize the image [geometry]'
-complete -c mogrify -o roll                         -d 'Roll an image vertically or horizontally [geometry]'
-complete -c mogrify -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c mogrify -o sample                       -d 'Scale image with pixel sampling [geometry]'
-complete -c mogrify -o scale                        -d 'Scale the image [geometry]'
-complete -c mogrify -o segment                      -d 'Segment an image [values]'
-complete -c mogrify -o selective-blur               -d 'Selectively blur pixels within a contrast threshold [geometry]'
-complete -c mogrify -o sepia-tone                   -d 'Simulate a sepia-toned photo [threshold]'
-complete -c mogrify -o set                          -d 'Set an image property [property value]'
-complete -c mogrify -o shade                        -d 'Shade the image using a distant light source [degrees]'
-complete -c mogrify -o shadow                       -d 'Simulate an image shadow [geometry]'
-complete -c mogrify -o sharpen                      -d 'Sharpen the image [geometry]'
-complete -c mogrify -o shave                        -d 'Shave pixels from the image edges [geometry]'
-complete -c mogrify -o shear                        -d 'Slide one edge of the image along the X or Y axis [geometry]'
-complete -c mogrify -o sigmoidal-contrast           -d 'Lightness rescaling using sigmoidal contrast enhancement [geometry]'
-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 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]'
-complete -c mogrify -o thumbnail                    -d 'Create a thumbnail of the image [geometry]'
-complete -c mogrify -o tile                         -d 'Tile image when filling a graphic primitive [filename]' -r
-complete -c mogrify -o tint                         -d 'Tint the image with the fill color [value]'
-complete -c mogrify -o transform                    -d 'Affine transform image'
-complete -c mogrify -o transparent                  -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o transpose                    -d 'Flip image vertically and rotate 90 degrees'
-complete -c mogrify -o transverse                   -d 'Flop image horizontally and rotate 270 degrees'
-complete -c mogrify -o trim                         -d 'Trim image edges'
-complete -c mogrify -o type                         -d 'Image type [type]' -xa '(mogrify -list type)'
-complete -c mogrify -o unique-colors                -d 'Discard all but one of any pixel color'
-complete -c mogrify -o unsharp                      -d 'Sharpen the image [geometry]'
-complete -c mogrify -o vignette                     -d 'Soften the edges of the image in vignette style [geometry]'
-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 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 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 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]'
-complete -c mogrify -o mosaic                       -d 'Create a mosaic from an image sequence'
-complete -c mogrify -o process                      -d 'Process the image with a custom image filter [arguments]' -xa '(mogrify -list filter)'
-complete -c mogrify -o separate                     -d 'Separate an image channel into a grayscale image'
-complete -c mogrify -o smush                        -d 'Smush an image sequence together [geometry]'
-complete -c mogrify -o write                        -d 'Write images to this file [filename]' -r
-complete -c mogrify -o delete                       -d 'Delete the image from the image sequence [indexes]'
-complete -c mogrify -o duplicate                    -d 'Duplicate an image one or more times [count,indexes]'
-complete -c mogrify -o insert                       -d 'Insert last image into the image sequence [index]'
-complete -c mogrify -o swap                         -d 'Swap two images in the image sequence [indexes]'
-complete -c mogrify -o debug                        -d 'Display copious debugging information [events]' -xa '(mogrify -list debug)'
-complete -c mogrify -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c mogrify -o list                         -d 'Print a list of supported option arguments [type]' -xa '(mogrify -list list)'
+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 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]'
+complete -c mogrify -o black-point-compensation -d 'Use black point compensation'
+complete -c mogrify -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c mogrify -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o caption -d 'Assign a caption to an image [string]'
+complete -c mogrify -o cdl -d 'Color correct with a color decision list [filename]' -r
+complete -c mogrify -o channel -d 'Apply option to select image channels [type]' -xa '(mogrify -list channel)'
+complete -c mogrify -o colors -d 'Preferred number of colors in the image [value]'
+complete -c mogrify -o colorspace -d 'Alternate image colorspace [type]' -xa '(mogrify -list colorspace)'
+complete -c mogrify -o comment -d 'Annotate image with comment [string]'
+complete -c mogrify -o compose -d 'Set image composite operator [operator]'
+complete -c mogrify -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(mogrify -list compress)'
+complete -c mogrify -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c mogrify -o define -d 'Define one or more image format options [format:option]'
+complete -c mogrify -o delay -d 'Display the next image after pausing [value]'
+complete -c mogrify -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c mogrify -o depth -d 'Image depth [value]'
+complete -c mogrify -o direction -d 'Render text right-to-left or left-to-right [type]' -xa '(mogrify -list direction)'
+complete -c mogrify -o display -d 'Get image or font from this X server [server]'
+complete -c mogrify -o dispose -d 'Layer disposal method [method]' -xa '(mogrify -list dispose)'
+complete -c mogrify -o dither -d 'Apply error diffusion to image [method]' -xa '(mogrify -list dither)'
+complete -c mogrify -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c mogrify -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c mogrify -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(mogrify -list endian)'
+complete -c mogrify -o family -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
+complete -c mogrify -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o filter -d 'Use this filter when resizing an image [type]' -xa '(mogrify -list filter)'
+complete -c mogrify -o flatten -d 'Flatten a sequence of images'
+complete -c mogrify -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c mogrify -o format -d 'Image format type [type]' -xa '(__fish_complete_convert_options type)'
+complete -c mogrify -o function -d 'Apply a function to the image [name]' -xa '(mogrify -list function)'
+complete -c mogrify -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c mogrify -o gravity -d 'Horizontal and vertical text placement [type]' -xa '(mogrify -list gravity)'
+complete -c mogrify -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c mogrify -o intent -d 'Type of rendering intent when managing the image color [type]' -xa '(mogrify -list intent)'
+complete -c mogrify -o interlace -d 'Type of image interlacing scheme [type]' -xa '(mogrify -list interlace)'
+complete -c mogrify -o interpolate -d 'Pixel color interpolation method [method]' -xa '(mogrify -list interpolate)'
+complete -c mogrify -o kerning -d 'Set the space between two letters [value]'
+complete -c mogrify -o label -d 'Assign a label to an image [string]'
+complete -c mogrify -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c mogrify -o loop -d 'Add Netscape loop extension to your GIF animation [iterations]'
+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 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]'
+complete -c mogrify -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c mogrify -o path -d 'Path write images to this path on disk'
+complete -c mogrify -o ping -d 'Efficiently determine image attributes'
+complete -c mogrify -o pointsize -d 'Font point size [value]'
+complete -c mogrify -o preview -d 'Image preview type [type]' -xa '(mogrify -list preview)'
+complete -c mogrify -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c mogrify -o quiet -d 'Suppress all warning messages'
+complete -c mogrify -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c mogrify -o regard-warnings -d 'Pay attention to warning messages'
+complete -c mogrify -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c mogrify -o scene -d 'Image scene number [value]'
+complete -c mogrify -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c mogrify -o size -d 'Width and height of image [geometry]'
+complete -c mogrify -o stretch -d 'Render text with this font stretch [type]' -xa '(mogrify -list stretch)'
+complete -c mogrify -o stroke -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o strokewidth -d 'Graphic primitive stroke width [value]'
+complete -c mogrify -o style -d 'Render text with this font style [type]' -xa '(mogrify -list style)'
+complete -c mogrify -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c mogrify -o synchronize -d 'Synchronize image to storage device'
+complete -c mogrify -o taint -d 'Declare the image as modified'
+complete -c mogrify -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c mogrify -o tile-offset -d 'Tile offset [geometry]'
+complete -c mogrify -o treedepth -d 'Color tree depth [value]'
+complete -c mogrify -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o undercolor -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o units -d 'The units of image resolution [type]' -xa '(mogrify -list units)'
+complete -c mogrify -o verbose -d 'Print detailed information about the image'
+complete -c mogrify -o view -d 'FlashPix viewing transforms'
+complete -c mogrify -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(mogrify -list virtual-pixel)'
+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-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 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]'
+complete -c mogrify -o charcoal -d 'Simulate a charcoal drawing [radius]'
+complete -c mogrify -o chop -d 'Remove pixels from the image interior [geometry]'
+complete -c mogrify -o clip -d 'Clip along the first path from the 8BIM profile'
+complete -c mogrify -o clip-mask -d 'Associate a clip mask with the image [filename]' -r
+complete -c mogrify -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
+complete -c mogrify -o colorize -d 'Colorize the image with the fill color [value]'
+complete -c mogrify -o color-matrix -d 'Apply color correction to the image [matrix]'
+complete -c mogrify -o contrast -d 'Enhance or reduce the image contrast'
+complete -c mogrify -o contrast-stretch -d 'Improve contrast by `stretching\' the intensity range [geometry]'
+complete -c mogrify -o convolve -d 'Apply a convolution kernel to the image [coefficients]'
+complete -c mogrify -o cycle -d 'Cycle the image colormap [amount]'
+complete -c mogrify -o despeckle -d 'Reduce the speckles within an image'
+complete -c mogrify -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c mogrify -o edge -d 'Apply a filter to detect edges in the image [radius]'
+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 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)'
+complete -c mogrify -o flip -d 'Flip image vertically'
+complete -c mogrify -o floodfill -d 'Color floodfill the image with color [geometry]'
+complete -c mogrify -o flop -d 'Flop image horizontally'
+complete -c mogrify -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c mogrify -o gamma -d 'Level of gamma correction [value]'
+complete -c mogrify -o gaussian-blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c mogrify -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c mogrify -o ift -d 'Implements the inverse discrete Fourier transform (DFT)'
+complete -c mogrify -o help -d 'Print program options'
+complete -c mogrify -o identify -d 'Identify the format and characteristics of the image'
+complete -c mogrify -o implode -d 'Implode image pixels about the center [amount]'
+complete -c mogrify -o lat -d 'Local adaptive thresholding [geometry]'
+complete -c mogrify -o layers -d 'Optimize or compare image layers [method]' -xa '(mogrify -list layers)'
+complete -c mogrify -o level -d 'Adjust the level of image contrast [value]'
+complete -c mogrify -o linear-stretch -d 'Improve contrast by `stretching with saturation\' the intensity range [geometry]'
+complete -c mogrify -o median -d 'Apply a median filter to the image [geometry]'
+complete -c mogrify -o mode -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
+complete -c mogrify -o modulate -d 'Vary the brightness, saturation, and hue [value]'
+complete -c mogrify -o monochrome -d 'Transform image to black and white'
+complete -c mogrify -o motion-blur -d 'Simulate motion blur [geometry]'
+complete -c mogrify -o negate -d 'Replace each pixel with its complementary color'
+complete -c mogrify -o noise -d 'Add or reduce noise in an image [geometry]'
+complete -c mogrify -o normalize -d 'Transform image to span the full range of colors'
+complete -c mogrify -o opaque -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o ordered-dither -d 'Add a noise pattern to the image with specific amplitudes [NxN]'
+complete -c mogrify -o paint -d 'Simulate an oil painting [radius]'
+complete -c mogrify -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c mogrify -o posterize -d 'Reduce the image to a limited number of color levels [levels]'
+complete -c mogrify -o print -d 'Interpret string and print to console [string]'
+complete -c mogrify -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c mogrify -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(mogrify -list colorspace)'
+complete -c mogrify -o radial-blur -d 'Radial blur the image [angle]'
+complete -c mogrify -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c mogrify -o random-threshold -d 'Random threshold the image [low,high]'
+complete -c mogrify -o region -d 'Apply options to a portion of the image [geometry]'
+complete -c mogrify -o render -d 'Render vector graphics'
+complete -c mogrify -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c mogrify -o resample -d 'Change the resolution of an image [geometry]'
+complete -c mogrify -o resize -d 'Resize the image [geometry]'
+complete -c mogrify -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c mogrify -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c mogrify -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c mogrify -o scale -d 'Scale the image [geometry]'
+complete -c mogrify -o segment -d 'Segment an image [values]'
+complete -c mogrify -o selective-blur -d 'Selectively blur pixels within a contrast threshold [geometry]'
+complete -c mogrify -o sepia-tone -d 'Simulate a sepia-toned photo [threshold]'
+complete -c mogrify -o set -d 'Set an image property [property value]'
+complete -c mogrify -o shade -d 'Shade the image using a distant light source [degrees]'
+complete -c mogrify -o shadow -d 'Simulate an image shadow [geometry]'
+complete -c mogrify -o sharpen -d 'Sharpen the image [geometry]'
+complete -c mogrify -o shave -d 'Shave pixels from the image edges [geometry]'
+complete -c mogrify -o shear -d 'Slide one edge of the image along the X or Y axis [geometry]'
+complete -c mogrify -o sigmoidal-contrast -d 'Lightness rescaling using sigmoidal contrast enhancement [geometry]'
+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 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]'
+complete -c mogrify -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c mogrify -o tile -d 'Tile image when filling a graphic primitive [filename]' -r
+complete -c mogrify -o tint -d 'Tint the image with the fill color [value]'
+complete -c mogrify -o transform -d 'Affine transform image'
+complete -c mogrify -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c mogrify -o transverse -d 'Flop image horizontally and rotate 270 degrees'
+complete -c mogrify -o trim -d 'Trim image edges'
+complete -c mogrify -o type -d 'Image type [type]' -xa '(mogrify -list type)'
+complete -c mogrify -o unique-colors -d 'Discard all but one of any pixel color'
+complete -c mogrify -o unsharp -d 'Sharpen the image [geometry]'
+complete -c mogrify -o vignette -d 'Soften the edges of the image in vignette style [geometry]'
+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 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 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 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]'
+complete -c mogrify -o mosaic -d 'Create a mosaic from an image sequence'
+complete -c mogrify -o process -d 'Process the image with a custom image filter [arguments]' -xa '(mogrify -list filter)'
+complete -c mogrify -o separate -d 'Separate an image channel into a grayscale image'
+complete -c mogrify -o smush -d 'Smush an image sequence together [geometry]'
+complete -c mogrify -o write -d 'Write images to this file [filename]' -r
+complete -c mogrify -o delete -d 'Delete the image from the image sequence [indexes]'
+complete -c mogrify -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
+complete -c mogrify -o insert -d 'Insert last image into the image sequence [index]'
+complete -c mogrify -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c mogrify -o debug -d 'Display copious debugging information [events]' -xa '(mogrify -list debug)'
+complete -c mogrify -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c mogrify -o list -d 'Print a list of supported option arguments [type]' -xa '(mogrify -list list)'
diff --git a/share/completions/montage.fish b/share/completions/montage.fish
index 3211f39a5..7c4b59334 100644
--- a/share/completions/montage.fish
+++ b/share/completions/montage.fish
@@ -1,107 +1,107 @@
-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 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)'
-complete -c montage -o caption                      -d 'Assign a caption to an image [string]'
-complete -c montage -o channel                      -d 'Apply option to select image channels [type]' -xa '(montage -list channel)'
-complete -c montage -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c montage -o colorspace                   -d 'Alternate image colorsapce [type]' -xa '(montage -list colorspace)'
-complete -c montage -o comment                      -d 'Annotate image with comment [string]'
-complete -c montage -o compose                      -d 'Composite operator [operator]'
-complete -c montage -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(montage -list compress)'
-complete -c montage -o define                       -d 'Define one or more image format options [format:option]'
-complete -c montage -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c montage -o depth                        -d 'Image depth [value]'
-complete -c montage -o display                      -d 'Query font from this X server [server]'
-complete -c montage -o dispose                      -d 'Layer disposal method [method]' -xa '(montage -list dispose)'
-complete -c montage -o dither                       -d 'Apply error diffusion to image [method]' -xa '(montage -list dither)'
-complete -c montage -o draw                         -d 'Annotate the image with a graphic primitive [string]'
-complete -c montage -o encoding                     -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c montage -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(montage -list endian)'
-complete -c montage -o extract                      -d 'Extract area from image [geometry]'
-complete -c montage -o fill                         -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(montage -list filter)'
-complete -c montage -o font                         -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c montage -o format                       -d 'Output formatted image characteristics ["string"]'
-complete -c montage -o gamma                        -d 'Level of gamma correction [value]'
-complete -c montage -o geometry                     -d 'Preferred tile and border sizes [geometry]'
-complete -c montage -o gravity                      -d 'Direction which direction to gravitate towards'
-complete -c montage -o green-primary                -d 'Chromaticity green primary point [point]'
-complete -c montage -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c montage -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(montage -list interlace)'
-complete -c montage -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(montage -list interpolate)'
-complete -c montage -o kerning                      -d 'Set the space between two letters [value]'
-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 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]'
-complete -c montage -o profile                      -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c montage -o quality                      -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c montage -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(montage -list colorspace)'
-complete -c montage -o quiet                        -d 'Suppress all warning messages'
-complete -c montage -o red-primary                  -d 'Chromaticity red primary point [point]'
-complete -c montage -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c montage -o respect-parentheses          -d 'Settings remain in effect until parenthesis boundary'
-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 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 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]'
-complete -c montage -o transparent-color            -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o treedepth                    -d 'Color tree depth [value]'
-complete -c montage -o trim                         -d 'Trim image edges'
-complete -c montage -o units                        -d 'The units of image resolution [type]' -xa '(montage -list units)'
-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 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]'
-complete -c montage -o extent                       -d 'Set the image size [geometry]'
-complete -c montage -o flatten                      -d 'Flatten a sequence of images'
-complete -c montage -o flip                         -d 'Flip image in the vertical direction'
-complete -c montage -o flop                         -d 'Flop image in the horizontal direction'
-complete -c montage -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c montage -o monochrome                   -d 'Transform image to black and white'
-complete -c montage -o polaroid                     -d 'Simulate a Polaroid picture [angle]'
-complete -c montage -o repage                       -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c montage -o resize                       -d 'Resize the image [geometry]'
-complete -c montage -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c montage -o strip                        -d 'Strip image of all profiles and comments'
-complete -c montage -o transform                    -d 'Affine transform image'
-complete -c montage -o transpose                    -d 'Flip image vertically and rotate 90 degrees'
-complete -c montage -o transparent                  -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-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 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]'
-complete -c montage -o insert                       -d 'Insert last image into the image sequence [index]'
-complete -c montage -o reverse                      -d 'Reverse image sequence'
-complete -c montage -o swap                         -d 'Swap two images in the image sequence [indexes]'
-complete -c montage -o debug                        -d 'Display copious debugging information [events]' -xa '(montage -list debug)'
-complete -c montage -o help                         -d 'Print program options'
-complete -c montage -o list                         -d 'Print a list of supported option arguments [type]' -xa '(montage -list list)'
-complete -c montage -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c montage -o version                      -d 'Print version information'
-complete -c montage -o matte                        -d 'Store matte channel if the image has one'
-complete -c montage -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c montage -o annotate                     -d 'Annotate the image with text [geometry text]'
+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 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)'
+complete -c montage -o caption -d 'Assign a caption to an image [string]'
+complete -c montage -o channel -d 'Apply option to select image channels [type]' -xa '(montage -list channel)'
+complete -c montage -o colors -d 'Preferred number of colors in the image [value]'
+complete -c montage -o colorspace -d 'Alternate image colorsapce [type]' -xa '(montage -list colorspace)'
+complete -c montage -o comment -d 'Annotate image with comment [string]'
+complete -c montage -o compose -d 'Composite operator [operator]'
+complete -c montage -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(montage -list compress)'
+complete -c montage -o define -d 'Define one or more image format options [format:option]'
+complete -c montage -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c montage -o depth -d 'Image depth [value]'
+complete -c montage -o display -d 'Query font from this X server [server]'
+complete -c montage -o dispose -d 'Layer disposal method [method]' -xa '(montage -list dispose)'
+complete -c montage -o dither -d 'Apply error diffusion to image [method]' -xa '(montage -list dither)'
+complete -c montage -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c montage -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c montage -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(montage -list endian)'
+complete -c montage -o extract -d 'Extract area from image [geometry]'
+complete -c montage -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o filter -d 'Use this filter when resizing an image [type]' -xa '(montage -list filter)'
+complete -c montage -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c montage -o format -d 'Output formatted image characteristics ["string"]'
+complete -c montage -o gamma -d 'Level of gamma correction [value]'
+complete -c montage -o geometry -d 'Preferred tile and border sizes [geometry]'
+complete -c montage -o gravity -d 'Direction which direction to gravitate towards'
+complete -c montage -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c montage -o identify -d 'Identify the format and characteristics of the image'
+complete -c montage -o interlace -d 'Type of image interlacing scheme [type]' -xa '(montage -list interlace)'
+complete -c montage -o interpolate -d 'Pixel color interpolation method [method]' -xa '(montage -list interpolate)'
+complete -c montage -o kerning -d 'Set the space between two letters [value]'
+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 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]'
+complete -c montage -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c montage -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c montage -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(montage -list colorspace)'
+complete -c montage -o quiet -d 'Suppress all warning messages'
+complete -c montage -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c montage -o regard-warnings -d 'Pay attention to warning messages'
+complete -c montage -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+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 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 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]'
+complete -c montage -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o treedepth -d 'Color tree depth [value]'
+complete -c montage -o trim -d 'Trim image edges'
+complete -c montage -o units -d 'The units of image resolution [type]' -xa '(montage -list units)'
+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 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]'
+complete -c montage -o extent -d 'Set the image size [geometry]'
+complete -c montage -o flatten -d 'Flatten a sequence of images'
+complete -c montage -o flip -d 'Flip image in the vertical direction'
+complete -c montage -o flop -d 'Flop image in the horizontal direction'
+complete -c montage -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c montage -o monochrome -d 'Transform image to black and white'
+complete -c montage -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c montage -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c montage -o resize -d 'Resize the image [geometry]'
+complete -c montage -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c montage -o strip -d 'Strip image of all profiles and comments'
+complete -c montage -o transform -d 'Affine transform image'
+complete -c montage -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c montage -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+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 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]'
+complete -c montage -o insert -d 'Insert last image into the image sequence [index]'
+complete -c montage -o reverse -d 'Reverse image sequence'
+complete -c montage -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c montage -o debug -d 'Display copious debugging information [events]' -xa '(montage -list debug)'
+complete -c montage -o help -d 'Print program options'
+complete -c montage -o list -d 'Print a list of supported option arguments [type]' -xa '(montage -list list)'
+complete -c montage -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c montage -o version -d 'Print version information'
+complete -c montage -o matte -d 'Store matte channel if the image has one'
+complete -c montage -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c montage -o annotate -d 'Annotate the image with text [geometry text]'
diff --git a/share/completions/mv.fish b/share/completions/mv.fish
index e8eb6f40d..afa375f55 100644
--- a/share/completions/mv.fish
+++ b/share/completions/mv.fish
@@ -4,7 +4,7 @@ set -l uname (uname -s)
 if mv --version >/dev/null 2>/dev/null
     # --backup requires an argument, -b does not accept an argument
     complete -c mv -l backup -r -d "Backup each existing destination file" \
-             -x -ka "none\t'Never make backups'
+        -x -ka "none\t'Never make backups'
                      off\t'Never make backups'
                      numbered\t'Make numbered backups'
                      t\t'Make numbered backups'
@@ -22,17 +22,17 @@ if mv --version >/dev/null 2>/dev/null
     complete -c mv -l strip-trailing-slashes -d "Remove trailing '/' from source args"
     complete -c mv -s S -l suffix -x -d "Override default backup suffix"
     complete -c mv -s t -l target-directory -d "Move all source args into DIR" \
-             -x -a "(__fish_complete_directories (commandline -ct) 'Directory')"
+        -x -a "(__fish_complete_directories (commandline -ct) 'Directory')"
     complete -c mv -s T -l no-target-directory -d "Treat DEST as a normal file"
     complete -c mv -s u -l update -d "Don't overwrite newer"
     complete -c mv -s v -l verbose -d "Print filenames as it goes"
     test "$uname" = Linux
-        and complete -c mv -s Z -l context -d "Set SELinux context to default"
+    and complete -c mv -s Z -l context -d "Set SELinux context to default"
 
     complete -c mv -l help -d "Print help and exit"
     complete -c mv -l version -d "Print version and exit"
-## BSD-ish mv
-else             #[posix][ext]
+    ## BSD-ish mv
+else #[posix][ext]
     # freebsd:   mv [-fi][nvh] src dst
     # dragonfly: mv [-fi][nvh] src dst
     # macos:     mv [-fi][nv ] src dst
@@ -45,18 +45,18 @@ else             #[posix][ext]
     complete -c mv -s i -d "Prompt to overwrite existing"
 
     test uname = SunOS # -fi
-        and exit 0
+    and exit 0
 
     # Extensions
     complete -c mv -s v -d "Print filenames as it goes"
 
     contains "$uname" NetBSD OpenBSD # -fiv
-        and exit 0
+    and exit 0
 
     complete -c mv -s n -d "Don't overwrite existing"
 
     test "$uname" = Darwin # -fivn
-        and exit 0
+    and exit 0
 
     complete -c mv -s h -d "Don't follow target if it links to a dir"
 end
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index a3d50ffb1..153884f22 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -27,62 +27,62 @@
 complete -c mvn -f -a 'pre-clean clean post-clean validate initialize generate-sources process-sources generate-resources process-resources compile process-classes generate-test-sources process-test-sources generate-test-resources process-test-resources test-compile process-test-classes testprepare-package package pre-integration-test integration-test post-integration-test verify install deploy pre-site site post-site site-deploy'
 
 # All options form mvn --help
-complete -c mvn -f -o am -l also-make                        -d "If project list is specified, also build projects required by the list"
-complete -c mvn -f -o amd -l also-make-dependents            -d "If project list is specified, also build projects that depend on projects on the list"
-complete -c mvn -f -o B -l batch-mode                        -d "Run in non-interactive (batch) mode"
-complete -c mvn -r -f -o b -l builder                      -d "The id of the build strategy to use."
-complete -c mvn -f -o C -l strict-checksums                  -d "Fail the build if checksums don't match"
-complete -c mvn -f -o c -l lax-checksums                     -d "Warn if checksums don't match"
-complete -c mvn -f -o cpu -l check-plugin-updates            -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o D -l define                      -d "Define a system property"
-complete -c mvn -f -o e -l errors                            -d "Produce execution error messages"
-complete -c mvn -f -o emp -l encrypt-master-password   -d "Encrypt master security password"
-complete -c mvn -f -o ep -l encrypt-password           -d "Encrypt server password"
-complete -c mvn -r -o f -l file                        -d "Force the use of an alternate POM file (or directory with pom.xml)."
-complete -c mvn -f -o fae -l fail-at-end                     -d "Only fail the build afterwards; allow all non-impacted builds to continue"
-complete -c mvn -f -o ff -l fail-fast                        -d "Stop at first failure in reactorized builds"
-complete -c mvn -f -o fn -l fail-never                       -d "NEVER fail the build, regardless of project result"
-complete -c mvn -r -o gs -l global-settings            -d "Alternate path for the global settings file"
-complete -c mvn -f -o h -l help                              -d "Display help information"
-complete -c mvn -r -o l -l log-file                    -d "Log file to where all build output will go."
-complete -c mvn -f -o llr -l legacy-local-repository         -d "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true"
-complete -c mvn -f -o N -l non-recursive                     -d "Do not recurse into sub-projects"
-complete -c mvn -f -o npr -l no-plugin-registry              -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o npu -l no-plugin-updates               -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o nsu -l no-snapshot-updates             -d "Suppress SNAPSHOT updates"
-complete -c mvn -f -o o -l offline                           -d "Work offline"
-complete -c mvn -r -f -o pl -l projects                   -d "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path."
-complete -c mvn -f -o q -l quiet                             -d "Quiet output - only show errors"
-complete -c mvn -r -f -o rf -l resume-from                -d "Resume reactor from specified project"
-complete -c mvn -r -o s -l settings                    -d "Alternate path for the user settings file"
-complete -c mvn -r -f -o T -l threads                     -d "Thread count, for instance 2.0C where C is core multiplied"
-complete -c mvn -r -o t -l toolchains                  -d "Alternate path for the user toolchains file"
-complete -c mvn -f -o U -l update-snapshots                  -d "Forces a check for missing releases and updated snapshots on remote repositories"
-complete -c mvn -f -o up -l update-plugins                   -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o V -l show-version                      -d "Display version information WITHOUT stopping build"
-complete -c mvn -f -o v -l version                           -d "Display version information"
-complete -c mvn -f -o X -l debug                             -d "Produce execution debug output"
+complete -c mvn -f -o am -l also-make -d "If project list is specified, also build projects required by the list"
+complete -c mvn -f -o amd -l also-make-dependents -d "If project list is specified, also build projects that depend on projects on the list"
+complete -c mvn -f -o B -l batch-mode -d "Run in non-interactive (batch) mode"
+complete -c mvn -r -f -o b -l builder -d "The id of the build strategy to use."
+complete -c mvn -f -o C -l strict-checksums -d "Fail the build if checksums don't match"
+complete -c mvn -f -o c -l lax-checksums -d "Warn if checksums don't match"
+complete -c mvn -f -o cpu -l check-plugin-updates -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o D -l define -d "Define a system property"
+complete -c mvn -f -o e -l errors -d "Produce execution error messages"
+complete -c mvn -f -o emp -l encrypt-master-password -d "Encrypt master security password"
+complete -c mvn -f -o ep -l encrypt-password -d "Encrypt server password"
+complete -c mvn -r -o f -l file -d "Force the use of an alternate POM file (or directory with pom.xml)."
+complete -c mvn -f -o fae -l fail-at-end -d "Only fail the build afterwards; allow all non-impacted builds to continue"
+complete -c mvn -f -o ff -l fail-fast -d "Stop at first failure in reactorized builds"
+complete -c mvn -f -o fn -l fail-never -d "NEVER fail the build, regardless of project result"
+complete -c mvn -r -o gs -l global-settings -d "Alternate path for the global settings file"
+complete -c mvn -f -o h -l help -d "Display help information"
+complete -c mvn -r -o l -l log-file -d "Log file to where all build output will go."
+complete -c mvn -f -o llr -l legacy-local-repository -d "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true"
+complete -c mvn -f -o N -l non-recursive -d "Do not recurse into sub-projects"
+complete -c mvn -f -o npr -l no-plugin-registry -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o npu -l no-plugin-updates -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o nsu -l no-snapshot-updates -d "Suppress SNAPSHOT updates"
+complete -c mvn -f -o o -l offline -d "Work offline"
+complete -c mvn -r -f -o pl -l projects -d "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path."
+complete -c mvn -f -o q -l quiet -d "Quiet output - only show errors"
+complete -c mvn -r -f -o rf -l resume-from -d "Resume reactor from specified project"
+complete -c mvn -r -o s -l settings -d "Alternate path for the user settings file"
+complete -c mvn -r -f -o T -l threads -d "Thread count, for instance 2.0C where C is core multiplied"
+complete -c mvn -r -o t -l toolchains -d "Alternate path for the user toolchains file"
+complete -c mvn -f -o U -l update-snapshots -d "Forces a check for missing releases and updated snapshots on remote repositories"
+complete -c mvn -f -o up -l update-plugins -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o V -l show-version -d "Display version information WITHOUT stopping build"
+complete -c mvn -f -o v -l version -d "Display version information"
+complete -c mvn -f -o X -l debug -d "Produce execution debug output"
 
 #
 # Profiles
 #
 #TODO search pom.xml hierarchy
 function __fish_mvn_profiles
-	# find line opening the profile-tag
-	# read next line
-	# extract contents of id-tag
-	sed -n -e '/<profile>/{n; s!^.*<id>\([^<]*\)</id>.*$!\1!; p}' ~/.m2/settings.xml pom.xml ^/dev/null
+    # find line opening the profile-tag
+    # read next line
+    # extract contents of id-tag
+    sed -n -e '/<profile>/{n; s!^.*<id>\([^<]*\)</id>.*$!\1!; p}' ~/.m2/settings.xml pom.xml ^/dev/null
 end
 
-complete -c mvn -f -r -o P -l activate-profiles -a "(__fish_mvn_profiles)"    -d "Comma-delimited list of profiles to activate"
+complete -c mvn -f -r -o P -l activate-profiles -a "(__fish_mvn_profiles)" -d "Comma-delimited list of profiles to activate"
 
 
 #default properties for some plugins / profiles
-complete -c mvn -o DskipTests                             -d "Skipping JUnit Tests"
-complete -c mvn -o DbuildInstaller                        -d "Build installer (if profile is available in project)"
-complete -c mvn -o DperformRelease                        -d "Use release profile (create javadoc and attach sources)"
-complete -c mvn -o Dmaven.surefire.debug                  -d "Run surefire tests with debugging on port 5005"
-complete -c mvn -o Dmaven.javadoc.skip                  -d "Skip Javadoc generation"
+complete -c mvn -o DskipTests -d "Skipping JUnit Tests"
+complete -c mvn -o DbuildInstaller -d "Build installer (if profile is available in project)"
+complete -c mvn -o DperformRelease -d "Use release profile (create javadoc and attach sources)"
+complete -c mvn -o Dmaven.surefire.debug -d "Run surefire tests with debugging on port 5005"
+complete -c mvn -o Dmaven.javadoc.skip -d "Skip Javadoc generation"
 
 
 #
diff --git a/share/completions/namei.fish b/share/completions/namei.fish
index bc4a80bff..4e7650c43 100644
--- a/share/completions/namei.fish
+++ b/share/completions/namei.fish
@@ -1,8 +1,8 @@
-complete -c namei -s h -l help         -d 'displays this help text'
-complete -c namei -s V -l version      -d 'output version information and exit'
-complete -c namei -s x -l mountpoints  -d 'show mount point directories with a \'D\''
-complete -c namei -s m -l modes        -d 'show the mode bits of each file'
-complete -c namei -s o -l owners       -d 'show owner and group name of each file'
-complete -c namei -s l -l long         -d 'use a long listing format (-m -o -v)'
-complete -c namei -s n -l nosymlinks   -d 'don\'t follow symlinks'
-complete -c namei -s v -l vertical     -d 'vertical align of modes and owners'
+complete -c namei -s h -l help -d 'displays this help text'
+complete -c namei -s V -l version -d 'output version information and exit'
+complete -c namei -s x -l mountpoints -d 'show mount point directories with a \'D\''
+complete -c namei -s m -l modes -d 'show the mode bits of each file'
+complete -c namei -s o -l owners -d 'show owner and group name of each file'
+complete -c namei -s l -l long -d 'use a long listing format (-m -o -v)'
+complete -c namei -s n -l nosymlinks -d 'don\'t follow symlinks'
+complete -c namei -s v -l vertical -d 'vertical align of modes and owners'
diff --git a/share/completions/netctl.fish b/share/completions/netctl.fish
index 46d9d8435..46aafb9e9 100644
--- a/share/completions/netctl.fish
+++ b/share/completions/netctl.fish
@@ -1,7 +1,7 @@
 set -l cmds list store restore stop-all start stop restart switch-to status enable disable reenable is-enabled edit
 
 function __fish_netctl_get_profiles
-  command netctl list | sed -e 's/^[ \t*]*//'
+    command netctl list | sed -e 's/^[ \t*]*//'
 end
 
 complete -f -c netctl -l help -d 'Display help'
diff --git a/share/completions/ngrok.fish b/share/completions/ngrok.fish
index 5849f2dd6..b3c754478 100644
--- a/share/completions/ngrok.fish
+++ b/share/completions/ngrok.fish
@@ -1,40 +1,40 @@
 # Commands
 complete -c ngrok -f -a "authtoken" -d "Save authtoken to configuration file"
-complete -c ngrok -f -a "credits"   -d "Prints author and licensing information"
-complete -c ngrok -f -a "http"      -d "Start an HTTP tunnel"
-complete -c ngrok -f -a "start"     -d "Start tunnels by name from the configuration file"
-complete -c ngrok -f -a "tcp"       -d "Start a TCP tunnel"
-complete -c ngrok -f -a "tls"       -d "Start a TLS tunnel"
-complete -c ngrok -f -a "update"    -d "Update ngrok to the latest version"
-complete -c ngrok -f -a "version"   -d "Print the version string"
-complete -c ngrok -f -a "help"      -d "Shows a list of commands or help for one command"
+complete -c ngrok -f -a "credits" -d "Prints author and licensing information"
+complete -c ngrok -f -a "http" -d "Start an HTTP tunnel"
+complete -c ngrok -f -a "start" -d "Start tunnels by name from the configuration file"
+complete -c ngrok -f -a "tcp" -d "Start a TCP tunnel"
+complete -c ngrok -f -a "tls" -d "Start a TLS tunnel"
+complete -c ngrok -f -a "update" -d "Update ngrok to the latest version"
+complete -c ngrok -f -a "version" -d "Print the version string"
+complete -c ngrok -f -a "help" -d "Shows a list of commands or help for one command"
 
 # General Options
-complete -c ngrok -l "help"       -e -f
-complete -c ngrok -l "authtoken"  -r                          -d "ngrok.com authtoken identifying a user"
-complete -c ngrok -l "config"     -r                          -d "path to config files; they are merged if multiple"
-complete -c ngrok -l "log"        -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
-complete -c ngrok -l "log-format" -x -a "term logfmt json"    -d "log record format: 'term', 'logfmt', 'json'"
-complete -c ngrok -l "log-level"  -r -a "info"                -d "logging level"
-complete -c ngrok -l "region"     -x -a "us eu au ap"         -d "ngrok server region [us , eu, au, ap] (default: us)"
+complete -c ngrok -l "help" -e -f
+complete -c ngrok -l "authtoken" -r -d "ngrok.com authtoken identifying a user"
+complete -c ngrok -l "config" -r -d "path to config files; they are merged if multiple"
+complete -c ngrok -l "log" -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
+complete -c ngrok -l "log-format" -x -a "term logfmt json" -d "log record format: 'term', 'logfmt', 'json'"
+complete -c ngrok -l "log-level" -r -a "info" -d "logging level"
+complete -c ngrok -l "region" -x -a "us eu au ap" -d "ngrok server region [us , eu, au, ap] (default: us)"
 
 # http & tls's options
-complete -c ngrok -l "hostname"  -r -d "host tunnel on custom hostname (requires DNS CNAME)"
+complete -c ngrok -l "hostname" -r -d "host tunnel on custom hostname (requires DNS CNAME)"
 complete -c ngrok -l "subdomain" -r -d "host tunnel on a custom subdomain"
 
 # http's optons
-complete -c ngrok -l "auth"        -r                      -d "enforce basic auth on tunnel endpoint, 'user:password'"
-complete -c ngrok -l "bind-tls"    -x -a "both https http" -d "listen for http, https or both: true/false/both"
-complete -c ngrok -l "host-header" -r                      -d "set Host header; if 'rewrite' use local address hostname"
-complete -c ngrok -l "inspect"                             -d "enable/disable http introspection"
+complete -c ngrok -l "auth" -r -d "enforce basic auth on tunnel endpoint, 'user:password'"
+complete -c ngrok -l "bind-tls" -x -a "both https http" -d "listen for http, https or both: true/false/both"
+complete -c ngrok -l "host-header" -r -d "set Host header; if 'rewrite' use local address hostname"
+complete -c ngrok -l "inspect" -d "enable/disable http introspection"
 
 # tls's options
 complete -c ngrok -l "client-cas" -r -d "path to TLS certificate authority to verify client certs"
-complete -c ngrok -l "crt"        -r -d "path to a TLS certificate for TLS termination"
-complete -c ngrok -l "key"        -r -d "path to a TLS key for TLS termination"
+complete -c ngrok -l "crt" -r -d "path to a TLS certificate for TLS termination"
+complete -c ngrok -l "key" -r -d "path to a TLS key for TLS termination"
 
 # start's options
-complete -c ngrok -l "all"  -d "start all tunnels in the configuration file"
+complete -c ngrok -l "all" -d "start all tunnels in the configuration file"
 complete -c ngrok -l "none" -d "start running no tunnels"
 
 # tcp's options
diff --git a/share/completions/nl.fish b/share/completions/nl.fish
index f7955deaf..e403a2eae 100644
--- a/share/completions/nl.fish
+++ b/share/completions/nl.fish
@@ -3,19 +3,19 @@ t\t"number only nonempty lines"
 n\t"number no lines"
 p\t"number only lines that match regular expression"'
 
-complete -c nl -s b -l body-numbering            -d 'use STYLE for numbering body lines' -xa $style
-complete -c nl -s d -l section-delimiter -x      -d 'use for separating logical pages'
-complete -c nl -s f -l footer-numbering          -d 'use STYLE for numbering footer lines' -xa $style
-complete -c nl -s h -l header-numbering          -d 'use STYLE for numbering header lines' -xa $style
-complete -c nl -s i -l line-increment -x         -d 'line number increment at each line'
-complete -c nl -s l -l join-blank-lines -x       -d 'group of NUMBER empty lines counted as one'
-complete -c nl -s n -l number-format -x          -d 'insert line numbers according to FORMAT'
-complete -c nl -s n -l number-format -xa ln      -d 'left justified, no leading zeroes'
-complete -c nl -s n -l number-format -xa rn      -d 'right justified, no leading zeroes'
-complete -c nl -s n -l number-format -xa rz      -d 'right justified, leading zeroes'
-complete -c nl -s p -l no-renumber               -d 'do not reset line numbers at logical pages'
-complete -c nl -s s -l number-separator -x       -d 'add STRING after (possible) line number'
-complete -c nl -s v -l starting-line-number -x   -d 'first line number on each logical page'
-complete -c nl -s w -l number-width -x           -d 'use NUMBER columns for line numbers'
-complete -c nl -l help     -d 'display this help and exit'
-complete -c nl -l version  -d 'output version information and exit'
+complete -c nl -s b -l body-numbering -d 'use STYLE for numbering body lines' -xa $style
+complete -c nl -s d -l section-delimiter -x -d 'use for separating logical pages'
+complete -c nl -s f -l footer-numbering -d 'use STYLE for numbering footer lines' -xa $style
+complete -c nl -s h -l header-numbering -d 'use STYLE for numbering header lines' -xa $style
+complete -c nl -s i -l line-increment -x -d 'line number increment at each line'
+complete -c nl -s l -l join-blank-lines -x -d 'group of NUMBER empty lines counted as one'
+complete -c nl -s n -l number-format -x -d 'insert line numbers according to FORMAT'
+complete -c nl -s n -l number-format -xa ln -d 'left justified, no leading zeroes'
+complete -c nl -s n -l number-format -xa rn -d 'right justified, no leading zeroes'
+complete -c nl -s n -l number-format -xa rz -d 'right justified, leading zeroes'
+complete -c nl -s p -l no-renumber -d 'do not reset line numbers at logical pages'
+complete -c nl -s s -l number-separator -x -d 'add STRING after (possible) line number'
+complete -c nl -s v -l starting-line-number -x -d 'first line number on each logical page'
+complete -c nl -s w -l number-width -x -d 'use NUMBER columns for line numbers'
+complete -c nl -l help -d 'display this help and exit'
+complete -c nl -l version -d 'output version information and exit'
diff --git a/share/completions/nm.fish b/share/completions/nm.fish
index eb9909817..ca94b5e59 100644
--- a/share/completions/nm.fish
+++ b/share/completions/nm.fish
@@ -4,26 +4,26 @@ complete -c nm -s A -l print-file-name -d 'Print name of the input file before e
 #                     Same as --format=bsd
 #                     The STYLE, if specified, can be `auto' (the default),
 #                    `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java' or `gnat'
-complete -c nm      -l no-demangle       -d 'Do not demangle low-level symbol names'
-complete -c nm -s D -l dynamic           -d 'Display dynamic symbols instead of normal symbols'
-complete -c nm      -l defined-only      -d 'Display only defined symbols'
-complete -c nm -s f -l format            -d 'Use the output format FORMAT. The default is "bsd"' -a 'bsd sysv posix'
-complete -c nm -s g -l extern-only       -d 'Display only external symbols'
-complete -c nm -s l -l line-numbers      -d 'Use debugging information to find a filename and line number for each symbol'
-complete -c nm -s n -l numeric-sort      -d 'Sort symbols numerically by address'
-complete -c nm -s o                      -d 'Print name of the input file before every symbol'
-complete -c nm -s p -l no-sort           -d 'Do not sort the symbols'
-complete -c nm -s P -l portability       -d 'Same as --format=posix'
-complete -c nm -s r -l reverse-sort      -d 'Reverse the sense of the sort'
-complete -c nm      -l plugin            -d 'Load the specified plugin'
-complete -c nm -s S -l print-size        -d 'Print size of defined symbols'
-complete -c nm -s s -l print-armap       -d 'Include index for symbols from archive members'
-complete -c nm      -l size-sort         -d 'Sort symbols by size'
-complete -c nm      -l special-syms      -d 'Include special symbols in the output'
-complete -c nm      -l synthetic         -d 'Display synthetic symbols as well'
-complete -c nm -s t -l radix             -d 'Use RADIX for printing symbol values'
-complete -c nm      -l target            -d 'Specify the target object format as BFDNAME'
-complete -c nm -s u -l undefined-only    -d 'Display only undefined symbols'
-complete -c nm -s h -l help              -d 'Display this information'
-complete -c nm -s V -l version           -d "Display this program's version number"
+complete -c nm -l no-demangle -d 'Do not demangle low-level symbol names'
+complete -c nm -s D -l dynamic -d 'Display dynamic symbols instead of normal symbols'
+complete -c nm -l defined-only -d 'Display only defined symbols'
+complete -c nm -s f -l format -d 'Use the output format FORMAT. The default is "bsd"' -a 'bsd sysv posix'
+complete -c nm -s g -l extern-only -d 'Display only external symbols'
+complete -c nm -s l -l line-numbers -d 'Use debugging information to find a filename and line number for each symbol'
+complete -c nm -s n -l numeric-sort -d 'Sort symbols numerically by address'
+complete -c nm -s o -d 'Print name of the input file before every symbol'
+complete -c nm -s p -l no-sort -d 'Do not sort the symbols'
+complete -c nm -s P -l portability -d 'Same as --format=posix'
+complete -c nm -s r -l reverse-sort -d 'Reverse the sense of the sort'
+complete -c nm -l plugin -d 'Load the specified plugin'
+complete -c nm -s S -l print-size -d 'Print size of defined symbols'
+complete -c nm -s s -l print-armap -d 'Include index for symbols from archive members'
+complete -c nm -l size-sort -d 'Sort symbols by size'
+complete -c nm -l special-syms -d 'Include special symbols in the output'
+complete -c nm -l synthetic -d 'Display synthetic symbols as well'
+complete -c nm -s t -l radix -d 'Use RADIX for printing symbol values'
+complete -c nm -l target -d 'Specify the target object format as BFDNAME'
+complete -c nm -s u -l undefined-only -d 'Display only undefined symbols'
+complete -c nm -s h -l help -d 'Display this information'
+complete -c nm -s V -l version -d "Display this program's version number"
 
diff --git a/share/completions/node.fish b/share/completions/node.fish
index efc983f94..8acc35d45 100644
--- a/share/completions/node.fish
+++ b/share/completions/node.fish
@@ -18,170 +18,170 @@ complete -c node -l throw-deprecation -d 'Throw errors on deprecations'
 complete -c node -l v8-options -d 'Print v8 command line options'
 complete -c node -l max-stack-size -d 'Set max v8 stack size (bytes)'
 complete -c node -l use_strict -d 'enforce strict mode. type: bool default: false'
-complete -c node -l  es5_readonly -d 'activate correct semantics for inheriting readonliness. type: bool default: false'
-complete -c node -l  es52_globals -d 'activate new semantics for global var declarations. type: bool default: false'
-complete -c node -l  harmony_typeof -d 'enable harmony semantics for typeof. type: bool default: false'
-complete -c node -l  harmony_scoping -d 'enable harmony block scoping. type: bool default: false'
-complete -c node -l  harmony_modules -d 'enable harmony modules (implies block scoping). type: bool default: false'
-complete -c node -l  harmony_proxies -d 'enable harmony proxies. type: bool default: false'
-complete -c node -l  harmony_collections -d 'enable harmony collections (sets, maps, and weak maps). type: bool default: false'
-complete -c node -l  harmony -d 'enable all harmony features (except typeof). type: bool default: false'
-complete -c node -l  packed_arrays -d 'optimizes arrays that have no holes. type: bool default: false'
-complete -c node -l  smi_only_arrays -d 'tracks arrays with only smi values. type: bool default: true'
-complete -c node -l  clever_optimizations -d 'Optimize object size, Array shift, DOM strings and string +. type: bool default: true'
-complete -c node -l  unbox_double_arrays -d 'automatically unbox arrays of doubles. type: bool default: true'
-complete -c node -l  string_slices -d 'use string slices. type: bool default: true'
-complete -c node -l  crankshaft -d 'use crankshaft. type: bool default: true'
-complete -c node -l  hydrogen_filter -d 'optimization filter. type: string default:'
-complete -c node -l  use_range -d 'use hydrogen range analysis. type: bool default: true'
-complete -c node -l  eliminate_dead_phis -d 'eliminate dead phis. type: bool default: true'
-complete -c node -l  use_gvn -d 'use hydrogen global value numbering. type: bool default: true'
-complete -c node -l  use_canonicalizing -d 'use hydrogen instruction canonicalizing. type: bool default: true'
-complete -c node -l  use_inlining -d 'use function inlining. type: bool default: true'
-complete -c node -l  max_inlined_source_size -d 'maximum source size in bytes considered for a single inlining. type: int default: 600'
-complete -c node -l  max_inlined_nodes -d 'maximum number of AST nodes considered for a single inlining. type: int default: 196'
-complete -c node -l  max_inlined_nodes_cumulative -d 'maximum cumulative number of AST nodes considered for inlining. type: int default: 196'
-complete -c node -l  loop_invariant_code_motion -d 'loop invariant code motion. type: bool default: true'
-complete -c node -l  collect_megamorphic_maps_from_stub_cache -d 'crankshaft harvests type feedback from stub cache. type: bool default: true'
-complete -c node -l  hydrogen_stats -d 'print statistics for hydrogen. type: bool default: false'
-complete -c node -l  trace_hydrogen -d 'trace generated hydrogen to file. type: bool default: false'
-complete -c node -l  trace_phase -d 'trace generated IR for specified phases. type: string default: Z'
-complete -c node -l  trace_inlining -d 'trace inlining decisions. type: bool default: false'
-complete -c node -l  trace_alloc -d 'trace register allocator. type: bool default: false'
-complete -c node -l  trace_all_uses -d 'trace all use positions. type: bool default: false'
-complete -c node -l  trace_range -d 'trace range analysis. type: bool default: false'
-complete -c node -l  trace_gvn -d 'trace global value numbering. type: bool default: false'
-complete -c node -l  trace_representation -d 'trace representation types. type: bool default: false'
-complete -c node -l  stress_pointer_maps -d 'pointer map for every instruction. type: bool default: false'
-complete -c node -l  stress_environments -d 'environment for every instruction. type: bool default: false'
-complete -c node -l  deopt_every_n_times -d 'deoptimize every n times a deopt point is passed. type: int default: 0'
-complete -c node -l  trap_on_deopt -d 'put a break point before deoptimizing. type: bool default: false'
-complete -c node -l  deoptimize_uncommon_cases -d 'deoptimize uncommon cases. type: bool default: true'
-complete -c node -l  polymorphic_inlining -d 'polymorphic inlining. type: bool default: true'
-complete -c node -l  use_osr -d 'use on-stack replacement. type: bool default: true'
-complete -c node -l  array_bounds_checks_elimination -d 'perform array bounds checks elimination. type: bool default: false'
-complete -c node -l  array_index_dehoisting -d 'perform array index dehoisting. type: bool default: false'
-complete -c node -l  trace_osr -d 'trace on-stack replacement. type: bool default: false'
-complete -c node -l  stress_runs -d 'number of stress runs. type: int default: 0'
-complete -c node -l  optimize_closures -d 'optimize closures. type: bool default: true'
-complete -c node -l  inline_construct -d 'inline constructor calls. type: bool default: true'
-complete -c node -l  inline_arguments -d 'inline functions with arguments object. type: bool default: true'
-complete -c node -l  loop_weight -d 'loop weight for representation inference. type: int default: 1'
-complete -c node -l  optimize_for_in -d 'optimize functions containing for-in loops. type: bool default: true'
-complete -c node -l  experimental_profiler -d 'enable all profiler experiments. type: bool default: true'
-complete -c node -l  watch_ic_patching -d 'profiler considers IC stability. type: bool default: false'
-complete -c node -l  frame_count -d 'number of stack frames inspected by the profiler. type: int default: 1'
-complete -c node -l  self_optimization -d 'primitive functions trigger their own optimization. type: bool default: false'
-complete -c node -l  direct_self_opt -d 'call recompile stub directly when self-optimizing. type: bool default: false'
-complete -c node -l  retry_self_opt -d 're-try self-optimization if it failed. type: bool default: false'
-complete -c node -l  count_based_interrupts -d 'trigger profiler ticks based on counting instead of timing. type: bool default: false'
-complete -c node -l  interrupt_at_exit -d 'insert an interrupt check at function exit. type: bool default: false'
-complete -c node -l  weighted_back_edges -d 'weight back edges by jump distance for interrupt triggering. type: bool default: false'
-complete -c node -l  interrupt_budget -d 'execution budget before interrupt is triggered. type: int default: 5900'
-complete -c node -l  type_info_threshold -d 'percentage of ICs that must have type info to allow optimization. type: int default: 15'
-complete -c node -l  self_opt_count -d 'call count before self-optimization. type: int default: 130'
-complete -c node -l  trace_opt_verbose -d 'extra verbose compilation tracing. type: bool default: false'
-complete -c node -l  debug_code -d 'generate extra code (assertions) for debugging. type: bool default: false'
-complete -c node -l  code_comments -d 'emit comments in code disassembly. type: bool default: false'
-complete -c node -l  enable_sse2 -d 'enable use of SSE2 instructions if available. type: bool default: true'
-complete -c node -l  enable_sse3 -d 'enable use of SSE3 instructions if available. type: bool default: true'
-complete -c node -l  enable_sse4_1 -d 'enable use of SSE4'
+complete -c node -l es5_readonly -d 'activate correct semantics for inheriting readonliness. type: bool default: false'
+complete -c node -l es52_globals -d 'activate new semantics for global var declarations. type: bool default: false'
+complete -c node -l harmony_typeof -d 'enable harmony semantics for typeof. type: bool default: false'
+complete -c node -l harmony_scoping -d 'enable harmony block scoping. type: bool default: false'
+complete -c node -l harmony_modules -d 'enable harmony modules (implies block scoping). type: bool default: false'
+complete -c node -l harmony_proxies -d 'enable harmony proxies. type: bool default: false'
+complete -c node -l harmony_collections -d 'enable harmony collections (sets, maps, and weak maps). type: bool default: false'
+complete -c node -l harmony -d 'enable all harmony features (except typeof). type: bool default: false'
+complete -c node -l packed_arrays -d 'optimizes arrays that have no holes. type: bool default: false'
+complete -c node -l smi_only_arrays -d 'tracks arrays with only smi values. type: bool default: true'
+complete -c node -l clever_optimizations -d 'Optimize object size, Array shift, DOM strings and string +. type: bool default: true'
+complete -c node -l unbox_double_arrays -d 'automatically unbox arrays of doubles. type: bool default: true'
+complete -c node -l string_slices -d 'use string slices. type: bool default: true'
+complete -c node -l crankshaft -d 'use crankshaft. type: bool default: true'
+complete -c node -l hydrogen_filter -d 'optimization filter. type: string default:'
+complete -c node -l use_range -d 'use hydrogen range analysis. type: bool default: true'
+complete -c node -l eliminate_dead_phis -d 'eliminate dead phis. type: bool default: true'
+complete -c node -l use_gvn -d 'use hydrogen global value numbering. type: bool default: true'
+complete -c node -l use_canonicalizing -d 'use hydrogen instruction canonicalizing. type: bool default: true'
+complete -c node -l use_inlining -d 'use function inlining. type: bool default: true'
+complete -c node -l max_inlined_source_size -d 'maximum source size in bytes considered for a single inlining. type: int default: 600'
+complete -c node -l max_inlined_nodes -d 'maximum number of AST nodes considered for a single inlining. type: int default: 196'
+complete -c node -l max_inlined_nodes_cumulative -d 'maximum cumulative number of AST nodes considered for inlining. type: int default: 196'
+complete -c node -l loop_invariant_code_motion -d 'loop invariant code motion. type: bool default: true'
+complete -c node -l collect_megamorphic_maps_from_stub_cache -d 'crankshaft harvests type feedback from stub cache. type: bool default: true'
+complete -c node -l hydrogen_stats -d 'print statistics for hydrogen. type: bool default: false'
+complete -c node -l trace_hydrogen -d 'trace generated hydrogen to file. type: bool default: false'
+complete -c node -l trace_phase -d 'trace generated IR for specified phases. type: string default: Z'
+complete -c node -l trace_inlining -d 'trace inlining decisions. type: bool default: false'
+complete -c node -l trace_alloc -d 'trace register allocator. type: bool default: false'
+complete -c node -l trace_all_uses -d 'trace all use positions. type: bool default: false'
+complete -c node -l trace_range -d 'trace range analysis. type: bool default: false'
+complete -c node -l trace_gvn -d 'trace global value numbering. type: bool default: false'
+complete -c node -l trace_representation -d 'trace representation types. type: bool default: false'
+complete -c node -l stress_pointer_maps -d 'pointer map for every instruction. type: bool default: false'
+complete -c node -l stress_environments -d 'environment for every instruction. type: bool default: false'
+complete -c node -l deopt_every_n_times -d 'deoptimize every n times a deopt point is passed. type: int default: 0'
+complete -c node -l trap_on_deopt -d 'put a break point before deoptimizing. type: bool default: false'
+complete -c node -l deoptimize_uncommon_cases -d 'deoptimize uncommon cases. type: bool default: true'
+complete -c node -l polymorphic_inlining -d 'polymorphic inlining. type: bool default: true'
+complete -c node -l use_osr -d 'use on-stack replacement. type: bool default: true'
+complete -c node -l array_bounds_checks_elimination -d 'perform array bounds checks elimination. type: bool default: false'
+complete -c node -l array_index_dehoisting -d 'perform array index dehoisting. type: bool default: false'
+complete -c node -l trace_osr -d 'trace on-stack replacement. type: bool default: false'
+complete -c node -l stress_runs -d 'number of stress runs. type: int default: 0'
+complete -c node -l optimize_closures -d 'optimize closures. type: bool default: true'
+complete -c node -l inline_construct -d 'inline constructor calls. type: bool default: true'
+complete -c node -l inline_arguments -d 'inline functions with arguments object. type: bool default: true'
+complete -c node -l loop_weight -d 'loop weight for representation inference. type: int default: 1'
+complete -c node -l optimize_for_in -d 'optimize functions containing for-in loops. type: bool default: true'
+complete -c node -l experimental_profiler -d 'enable all profiler experiments. type: bool default: true'
+complete -c node -l watch_ic_patching -d 'profiler considers IC stability. type: bool default: false'
+complete -c node -l frame_count -d 'number of stack frames inspected by the profiler. type: int default: 1'
+complete -c node -l self_optimization -d 'primitive functions trigger their own optimization. type: bool default: false'
+complete -c node -l direct_self_opt -d 'call recompile stub directly when self-optimizing. type: bool default: false'
+complete -c node -l retry_self_opt -d 're-try self-optimization if it failed. type: bool default: false'
+complete -c node -l count_based_interrupts -d 'trigger profiler ticks based on counting instead of timing. type: bool default: false'
+complete -c node -l interrupt_at_exit -d 'insert an interrupt check at function exit. type: bool default: false'
+complete -c node -l weighted_back_edges -d 'weight back edges by jump distance for interrupt triggering. type: bool default: false'
+complete -c node -l interrupt_budget -d 'execution budget before interrupt is triggered. type: int default: 5900'
+complete -c node -l type_info_threshold -d 'percentage of ICs that must have type info to allow optimization. type: int default: 15'
+complete -c node -l self_opt_count -d 'call count before self-optimization. type: int default: 130'
+complete -c node -l trace_opt_verbose -d 'extra verbose compilation tracing. type: bool default: false'
+complete -c node -l debug_code -d 'generate extra code (assertions) for debugging. type: bool default: false'
+complete -c node -l code_comments -d 'emit comments in code disassembly. type: bool default: false'
+complete -c node -l enable_sse2 -d 'enable use of SSE2 instructions if available. type: bool default: true'
+complete -c node -l enable_sse3 -d 'enable use of SSE3 instructions if available. type: bool default: true'
+complete -c node -l enable_sse4_1 -d 'enable use of SSE4'
 complete -c node -l enable_cmov -d 'enable use of CMOV instruction if available. type: bool default: true'
-complete -c node -l  enable_rdtsc -d 'enable use of RDTSC instruction if available. type: bool default: true'
-complete -c node -l  enable_sahf -d 'enable use of SAHF instruction if available (X64 only). type: bool default: true'
-complete -c node -l  enable_vfp3 -d 'enable use of VFP3 instructions if available - this implies enabling ARMv7 instructions (ARM only). type: bool default: true'
-complete -c node -l  enable_armv7 -d 'enable use of ARMv7 instructions if available (ARM only). type: bool default: true'
-complete -c node -l  enable_fpu -d 'enable use of MIPS FPU instructions if available (MIPS only). type: bool default: true'
-complete -c node -l  expose_natives_as -d 'expose natives in global object. type: string default: NULL'
-complete -c node -l  expose_debug_as -d 'expose debug in global object. type: string default: NULL'
-complete -c node -l  expose_gc -d 'expose gc extension. type: bool default: false'
-complete -c node -l  expose_externalize_string -d 'expose externalize string extension. type: bool default: false'
-complete -c node -l  stack_trace_limit -d 'number of stack frames to capture. type: int default: 10'
-complete -c node -l  builtins_in_stack_traces -d 'show built-in functions in stack traces. type: bool default: false'
-complete -c node -l  disable_native_files -d 'disable builtin natives files. type: bool default: false'
-complete -c node -l  inline_new -d 'use fast inline allocation. type: bool default: true'
-complete -c node -l  stack_trace_on_abort -d 'print a stack trace if an assertion failure occurs. type: bool default: true'
-complete -c node -l  trace -d 'trace function calls. type: bool default: false'
-complete -c node -l  mask_constants_with_cookie -d 'use random jit cookie to mask large constants. type: bool default: true'
-complete -c node -l  lazy -d 'use lazy compilation. type: bool default: true'
-complete -c node -l  trace_opt -d 'trace lazy optimization. type: bool default: false'
-complete -c node -l  trace_opt_stats -d 'trace lazy optimization statistics. type: bool default: false'
-complete -c node -l  opt -d 'use adaptive optimizations. type: bool default: true'
-complete -c node -l  always_opt -d 'always try to optimize functions. type: bool default: false'
-complete -c node -l  prepare_always_opt -d 'prepare for turning on always opt. type: bool default: false'
-complete -c node -l  trace_deopt -d 'trace deoptimization. type: bool default: false'
-complete -c node -l  min_preparse_length -d 'minimum length for automatic enable preparsing. type: int default: 1024'
-complete -c node -l  always_full_compiler -d 'try to use the dedicated run-once backend for all code. type: bool default: false'
-complete -c node -l  trace_bailout -d 'print reasons for falling back to using the classic V8 backend. type: bool default: false'
-complete -c node -l  compilation_cache -d 'enable compilation cache. type: bool default: true'
-complete -c node -l  cache_prototype_transitions -d 'cache prototype transitions. type: bool default: true'
-complete -c node -l  trace_debug_json -d 'trace debugging JSON request/response. type: bool default: false'
-complete -c node -l  debugger_auto_break -d 'automatically set the debug break flag when debugger commands are in the queue. type: bool default: true'
-complete -c node -l  enable_liveedit -d 'enable liveedit experimental feature. type: bool default: true'
-complete -c node -l  break_on_abort -d 'always cause a debug break before aborting. type: bool default: true'
-complete -c node -l  stack_size -d 'default size of stack region v8 is allowed to use (in kBytes). type: int default: 984'
-complete -c node -l  max_stack_trace_source_length -d 'maximum length of function source code printed in a stack trace'
+complete -c node -l enable_rdtsc -d 'enable use of RDTSC instruction if available. type: bool default: true'
+complete -c node -l enable_sahf -d 'enable use of SAHF instruction if available (X64 only). type: bool default: true'
+complete -c node -l enable_vfp3 -d 'enable use of VFP3 instructions if available - this implies enabling ARMv7 instructions (ARM only). type: bool default: true'
+complete -c node -l enable_armv7 -d 'enable use of ARMv7 instructions if available (ARM only). type: bool default: true'
+complete -c node -l enable_fpu -d 'enable use of MIPS FPU instructions if available (MIPS only). type: bool default: true'
+complete -c node -l expose_natives_as -d 'expose natives in global object. type: string default: NULL'
+complete -c node -l expose_debug_as -d 'expose debug in global object. type: string default: NULL'
+complete -c node -l expose_gc -d 'expose gc extension. type: bool default: false'
+complete -c node -l expose_externalize_string -d 'expose externalize string extension. type: bool default: false'
+complete -c node -l stack_trace_limit -d 'number of stack frames to capture. type: int default: 10'
+complete -c node -l builtins_in_stack_traces -d 'show built-in functions in stack traces. type: bool default: false'
+complete -c node -l disable_native_files -d 'disable builtin natives files. type: bool default: false'
+complete -c node -l inline_new -d 'use fast inline allocation. type: bool default: true'
+complete -c node -l stack_trace_on_abort -d 'print a stack trace if an assertion failure occurs. type: bool default: true'
+complete -c node -l trace -d 'trace function calls. type: bool default: false'
+complete -c node -l mask_constants_with_cookie -d 'use random jit cookie to mask large constants. type: bool default: true'
+complete -c node -l lazy -d 'use lazy compilation. type: bool default: true'
+complete -c node -l trace_opt -d 'trace lazy optimization. type: bool default: false'
+complete -c node -l trace_opt_stats -d 'trace lazy optimization statistics. type: bool default: false'
+complete -c node -l opt -d 'use adaptive optimizations. type: bool default: true'
+complete -c node -l always_opt -d 'always try to optimize functions. type: bool default: false'
+complete -c node -l prepare_always_opt -d 'prepare for turning on always opt. type: bool default: false'
+complete -c node -l trace_deopt -d 'trace deoptimization. type: bool default: false'
+complete -c node -l min_preparse_length -d 'minimum length for automatic enable preparsing. type: int default: 1024'
+complete -c node -l always_full_compiler -d 'try to use the dedicated run-once backend for all code. type: bool default: false'
+complete -c node -l trace_bailout -d 'print reasons for falling back to using the classic V8 backend. type: bool default: false'
+complete -c node -l compilation_cache -d 'enable compilation cache. type: bool default: true'
+complete -c node -l cache_prototype_transitions -d 'cache prototype transitions. type: bool default: true'
+complete -c node -l trace_debug_json -d 'trace debugging JSON request/response. type: bool default: false'
+complete -c node -l debugger_auto_break -d 'automatically set the debug break flag when debugger commands are in the queue. type: bool default: true'
+complete -c node -l enable_liveedit -d 'enable liveedit experimental feature. type: bool default: true'
+complete -c node -l break_on_abort -d 'always cause a debug break before aborting. type: bool default: true'
+complete -c node -l stack_size -d 'default size of stack region v8 is allowed to use (in kBytes). type: int default: 984'
+complete -c node -l max_stack_trace_source_length -d 'maximum length of function source code printed in a stack trace'
 complete -c node -l always_inline_smi_code -d 'always inline smi code in non-opt code. type: bool default: false'
-complete -c node -l  max_new_space_size -d 'max size of the new generation (in kBytes). type: int default: 0'
-complete -c node -l  max_old_space_size -d 'max size of the old generation (in Mbytes). type: int default: 0'
-complete -c node -l  max_executable_size -d 'max size of executable memory (in Mbytes). type: int default: 0'
-complete -c node -l  gc_global -d 'always perform global GCs. type: bool default: false'
-complete -c node -l  gc_interval -d 'garbage collect after <n> allocations. type: int default: -1'
-complete -c node -l  trace_gc -d 'print one trace line following each garbage collection. type: bool default: false'
-complete -c node -l  trace_gc_nvp -d 'print one detailed trace line in name=value format after each garbage collection. type: bool default: false'
-complete -c node -l  print_cumulative_gc_stat -d 'print cumulative GC statistics in name=value format on exit. type: bool default: false'
-complete -c node -l  trace_gc_verbose -d 'print more details following each garbage collection. type: bool default: false'
-complete -c node -l  trace_fragmentation -d 'report fragmentation for old pointer and data pages. type: bool default: false'
-complete -c node -l  collect_maps -d 'garbage collect maps from which no objects can be reached. type: bool default: true'
-complete -c node -l  flush_code -d 'flush code that we expect not to use again before full gc. type: bool default: true'
-complete -c node -l  incremental_marking -d 'use incremental marking. type: bool default: true'
-complete -c node -l  incremental_marking_steps -d 'do incremental marking steps. type: bool default: true'
-complete -c node -l  trace_incremental_marking -d 'trace progress of the incremental marking. type: bool default: false'
-complete -c node -l  use_idle_notification -d 'Use idle notification to reduce memory footprint'
+complete -c node -l max_new_space_size -d 'max size of the new generation (in kBytes). type: int default: 0'
+complete -c node -l max_old_space_size -d 'max size of the old generation (in Mbytes). type: int default: 0'
+complete -c node -l max_executable_size -d 'max size of executable memory (in Mbytes). type: int default: 0'
+complete -c node -l gc_global -d 'always perform global GCs. type: bool default: false'
+complete -c node -l gc_interval -d 'garbage collect after <n> allocations. type: int default: -1'
+complete -c node -l trace_gc -d 'print one trace line following each garbage collection. type: bool default: false'
+complete -c node -l trace_gc_nvp -d 'print one detailed trace line in name=value format after each garbage collection. type: bool default: false'
+complete -c node -l print_cumulative_gc_stat -d 'print cumulative GC statistics in name=value format on exit. type: bool default: false'
+complete -c node -l trace_gc_verbose -d 'print more details following each garbage collection. type: bool default: false'
+complete -c node -l trace_fragmentation -d 'report fragmentation for old pointer and data pages. type: bool default: false'
+complete -c node -l collect_maps -d 'garbage collect maps from which no objects can be reached. type: bool default: true'
+complete -c node -l flush_code -d 'flush code that we expect not to use again before full gc. type: bool default: true'
+complete -c node -l incremental_marking -d 'use incremental marking. type: bool default: true'
+complete -c node -l incremental_marking_steps -d 'do incremental marking steps. type: bool default: true'
+complete -c node -l trace_incremental_marking -d 'trace progress of the incremental marking. type: bool default: false'
+complete -c node -l use_idle_notification -d 'Use idle notification to reduce memory footprint'
 complete -c node -l send_idle_notification -d 'Send idle notification between stress runs'
 complete -c node -l use_ic -d 'use inline caching. type: bool default: true'
-complete -c node -l  native_code_counters -d 'generate extra code for manipulating stats counters. type: bool default: false'
-complete -c node -l  always_compact -d 'Perform compaction on every full GC. type: bool default: false'
-complete -c node -l  lazy_sweeping -d 'Use lazy sweeping for old pointer and data spaces. type: bool default: true'
-complete -c node -l  never_compact -d 'Never perform compaction on full GC - testing only. type: bool default: false'
-complete -c node -l  compact_code_space -d 'Compact code space on full non-incremental collections. type: bool default: true'
-complete -c node -l  cleanup_code_caches_at_gc -d 'Flush inline caches prior to mark compact collection and flush code caches in maps during mark compact cycle'
+complete -c node -l native_code_counters -d 'generate extra code for manipulating stats counters. type: bool default: false'
+complete -c node -l always_compact -d 'Perform compaction on every full GC. type: bool default: false'
+complete -c node -l lazy_sweeping -d 'Use lazy sweeping for old pointer and data spaces. type: bool default: true'
+complete -c node -l never_compact -d 'Never perform compaction on full GC - testing only. type: bool default: false'
+complete -c node -l compact_code_space -d 'Compact code space on full non-incremental collections. type: bool default: true'
+complete -c node -l cleanup_code_caches_at_gc -d 'Flush inline caches prior to mark compact collection and flush code caches in maps during mark compact cycle'
 complete -c node -l random_seed -d 'Default seed for initializing random generator (0, the default, means to use system random)'
 complete -c node -l use_verbose_printer -d 'allows verbose printing. type: bool default: true'
-complete -c node -l  allow_natives_syntax -d 'allow natives syntax. type: bool default: false'
-complete -c node -l  trace_sim -d 'Trace simulator execution. type: bool default: false'
-complete -c node -l  check_icache -d 'Check icache flushes in ARM and MIPS simulator. type: bool default: false'
-complete -c node -l  stop_sim_at -d 'Simulator stop after x number of instructions. type: int default: 0'
-complete -c node -l  sim_stack_alignment -d 'Stack alignment in bytes in simulator (4 or 8, 8 is default). type: int default: 8'
-complete -c node -l  trace_exception -d 'print stack trace when throwing exceptions. type: bool default: false'
-complete -c node -l  preallocate_message_memory -d 'preallocate some memory to build stack traces'
+complete -c node -l allow_natives_syntax -d 'allow natives syntax. type: bool default: false'
+complete -c node -l trace_sim -d 'Trace simulator execution. type: bool default: false'
+complete -c node -l check_icache -d 'Check icache flushes in ARM and MIPS simulator. type: bool default: false'
+complete -c node -l stop_sim_at -d 'Simulator stop after x number of instructions. type: int default: 0'
+complete -c node -l sim_stack_alignment -d 'Stack alignment in bytes in simulator (4 or 8, 8 is default). type: int default: 8'
+complete -c node -l trace_exception -d 'print stack trace when throwing exceptions. type: bool default: false'
+complete -c node -l preallocate_message_memory -d 'preallocate some memory to build stack traces'
 complete -c node -l randomize_hashes -d 'randomize hashes to avoid predictable hash collisions (with snapshots this option cannot override the baked-in seed). type: bool default: true'
-complete -c node -l  hash_seed -d 'Fixed seed to use to hash property keys (0 means random) (with snapshots this option cannot override the baked-in seed). type: int default: 0'
-complete -c node -l  preemption -d 'activate a 100ms timer that switches between V8 threads. type: bool default: false'
-complete -c node -l  regexp_optimization -d 'generate optimized regexp code. type: bool default: true'
-complete -c node -l  testing_bool_flag -d 'testing_bool_flag. type: bool default: true'
-complete -c node -l  testing_int_flag -d 'testing_int_flag. type: int default: 13'
-complete -c node -l  testing_float_flag -d 'float-flag. type: float default: 2'
+complete -c node -l hash_seed -d 'Fixed seed to use to hash property keys (0 means random) (with snapshots this option cannot override the baked-in seed). type: int default: 0'
+complete -c node -l preemption -d 'activate a 100ms timer that switches between V8 threads. type: bool default: false'
+complete -c node -l regexp_optimization -d 'generate optimized regexp code. type: bool default: true'
+complete -c node -l testing_bool_flag -d 'testing_bool_flag. type: bool default: true'
+complete -c node -l testing_int_flag -d 'testing_int_flag. type: int default: 13'
+complete -c node -l testing_float_flag -d 'float-flag. type: float default: 2'
 complete -c node -l testing_string_flag -d 'string-flag. type: string default: Hello, world!'
-complete -c node -l  testing_prng_seed -d 'Seed used for threading test randomness. type: int default: 42'
-complete -c node -l  testing_serialization_file -d 'file in which to serialize heap. type: string default: /tmp/serdes'
-complete -c node -l  help -d 'Print usage message, including flags, on console. type: bool default: true'
-complete -c node -l  dump_counters -d 'Dump counters on exit. type: bool default: false'
-complete -c node -l  debugger -d 'Enable JavaScript debugger. type: bool default: false'
-complete -c node -l  remote_debugger -d 'Connect JavaScript debugger to the debugger agent in another process. type: bool default: false'
-complete -c node -l  debugger_agent -d 'Enable debugger agent. type: bool default: false'
-complete -c node -l  debugger_port -d 'Port to use for remote debugging. type: int default: 5858'
-complete -c node -l  map_counters -d 'Map counters to a file. type: string default:'
-complete -c node -l  js_arguments -d 'Pass all remaining arguments to the script'
+complete -c node -l testing_prng_seed -d 'Seed used for threading test randomness. type: int default: 42'
+complete -c node -l testing_serialization_file -d 'file in which to serialize heap. type: string default: /tmp/serdes'
+complete -c node -l help -d 'Print usage message, including flags, on console. type: bool default: true'
+complete -c node -l dump_counters -d 'Dump counters on exit. type: bool default: false'
+complete -c node -l debugger -d 'Enable JavaScript debugger. type: bool default: false'
+complete -c node -l remote_debugger -d 'Connect JavaScript debugger to the debugger agent in another process. type: bool default: false'
+complete -c node -l debugger_agent -d 'Enable debugger agent. type: bool default: false'
+complete -c node -l debugger_port -d 'Port to use for remote debugging. type: int default: 5858'
+complete -c node -l map_counters -d 'Map counters to a file. type: string default:'
+complete -c node -l js_arguments -d 'Pass all remaining arguments to the script'
 complete -c node -l debug_compile_events -d 'Enable debugger compile events. type: bool default: true'
-complete -c node -l  debug_script_collected_events -d 'Enable debugger script collected events. type: bool default: true'
-complete -c node -l  gdbjit -d 'enable GDBJIT interface (disables compacting GC). type: bool default: false'
-complete -c node -l  gdbjit_full -d 'enable GDBJIT interface for all code objects. type: bool default: false'
-complete -c node -l  gdbjit_dump -d 'dump elf objects with debug info to disk. type: bool default: false'
-complete -c node -l  gdbjit_dump_filter -d 'dump only objects containing this substring. type: string default:'
-complete -c node -l  force_marking_deque_overflows -d 'force overflows of marking deque by reducing its size to 64 words. type: bool default: false'
-complete -c node -l  stress_compaction -d 'stress the GC compactor to flush out bugs (implies --force_marking_deque_overflows). type: bool default: false'
-complete -c node -l  log -d 'Minimal logging (no API, code, GC, suspect, or handles samples)'
+complete -c node -l debug_script_collected_events -d 'Enable debugger script collected events. type: bool default: true'
+complete -c node -l gdbjit -d 'enable GDBJIT interface (disables compacting GC). type: bool default: false'
+complete -c node -l gdbjit_full -d 'enable GDBJIT interface for all code objects. type: bool default: false'
+complete -c node -l gdbjit_dump -d 'dump elf objects with debug info to disk. type: bool default: false'
+complete -c node -l gdbjit_dump_filter -d 'dump only objects containing this substring. type: string default:'
+complete -c node -l force_marking_deque_overflows -d 'force overflows of marking deque by reducing its size to 64 words. type: bool default: false'
+complete -c node -l stress_compaction -d 'stress the GC compactor to flush out bugs (implies --force_marking_deque_overflows). type: bool default: false'
+complete -c node -l log -d 'Minimal logging (no API, code, GC, suspect, or handles samples)'
 complete -c node -l log_all -d 'Log all events to the log file'
 complete -c node -l log_runtime -d 'Activate runtime system %Log call'
 complete -c node -l log_api -d 'Log API events to the log file'
@@ -192,7 +192,7 @@ complete -c node -l log_snapshot_positions -d 'log positions of (de)serialized o
 complete -c node -l log_suspect -d 'Log suspect operations'
 complete -c node -l prof -d 'Log statistical profiling information (implies --log-code)'
 complete -c node -l prof_auto -d 'Used with --prof, starts profiling automatically) type: bool default: true'
-complete -c node -l  prof_lazy -d 'Used with --prof, only does sampling and logging when profiler is active (implies --noprof_auto)'
+complete -c node -l prof_lazy -d 'Used with --prof, only does sampling and logging when profiler is active (implies --noprof_auto)'
 complete -c node -l prof_browser_mode -d 'Used with --prof, turns on browser-compatible mode for profiling'
 complete -c node -l log_regexp -d 'Log regular expression execution'
 complete -c node -l sliding_state_window -d 'Update sliding state window counters'
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 607215086..68e8b8f3d 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -114,13 +114,13 @@ complete -f -c npm -n '__fish_npm_using_command cache' -a 'ls' -d 'Show the data
 
 # config
 for c in 'c' 'config'
-  complete -f -c npm -n "__fish_npm_needs_command" -a "$c" -d 'Manage the npm configuration files'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'set' -d 'Sets the config key to the value'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'get' -d 'Echo the config value to stdout'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'delete' -d 'Deletes the key from all configuration files'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'list' -d 'Show all the config settings'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'ls' -d 'Show all the config settings'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'edit' -d 'Opens the config file in an editor'
+    complete -f -c npm -n "__fish_npm_needs_command" -a "$c" -d 'Manage the npm configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'set' -d 'Sets the config key to the value'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'get' -d 'Echo the config value to stdout'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'delete' -d 'Deletes the key from all configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'list' -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'ls' -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'edit' -d 'Opens the config file in an editor'
 end
 # get, set also exist as shorthands
 complete -f -c npm -n "__fish_npm_needs_command" -a 'get' -d 'Echo the config value to stdout'
@@ -136,12 +136,12 @@ end
 
 # list
 for c in 'la' 'list' 'll' 'ls'
-  complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'List installed packages'
-  complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'List packages in the global install prefix instead of in the current project'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l json -d 'Show information in JSON format'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l long -d 'Show extended information'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l parseable -d 'Show parseable output instead of tree view'
-  complete -x -c npm -n "__fish_npm_using_command $c" -l depth -d 'Max display depth of the dependency tree'
+    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'List installed packages'
+    complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'List packages in the global install prefix instead of in the current project'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l json -d 'Show information in JSON format'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l long -d 'Show extended information'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l parseable -d 'Show parseable output instead of tree view'
+    complete -x -c npm -n "__fish_npm_using_command $c" -l depth -d 'Max display depth of the dependency tree'
 end
 
 # owner
diff --git a/share/completions/obnam.fish b/share/completions/obnam.fish
index 67a5f0e40..788722dbf 100644
--- a/share/completions/obnam.fish
+++ b/share/completions/obnam.fish
@@ -1,11 +1,11 @@
 
 function __fish_obnam_nosubcommand
-	if __fish_seen_subcommand_from add-key backup client-keys clients diff dump-repo force-lock forget fsck \
-		generations genids help help-all kdirstat list-errors list-formats list-keys list-toplevels \
-		ls mount nagios-last-backup-age remove-client remove-key restore verify
-		return 1
-	end
-	return 0
+    if __fish_seen_subcommand_from add-key backup client-keys clients diff dump-repo force-lock forget fsck \
+            generations genids help help-all kdirstat list-errors list-formats list-keys list-toplevels \
+            ls mount nagios-last-backup-age remove-client remove-key restore verify
+        return 1
+    end
+    return 0
 end
 
 complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'add-key' -d 'Add a key to the repository'
@@ -47,38 +47,38 @@ complete -c obnam --no-files -l generation -d 'Which generation to restore'
 complete -c obnam --no-files -s h -l help -d 'Show this help message and exit'
 complete -c obnam --no-files -l keep -d 'Policy for what generations to keep when forgetting.'
 complete -c obnam --no-files -l lock-timeout -d 'Wait TIMEOUT seconds for an existing lock'
-complete -c obnam            -l output -d 'Write output to FILE instead of STDOUT'
+complete -c obnam -l output -d 'Write output to FILE instead of STDOUT'
 complete -c obnam --no-files -l pretend -l dry-run -l no-act -d 'Do not actually change anything'
 complete -c obnam --no-files -l no-pretend -l no-dry-run -l no-no-act -d 'Actually commit changes'
 complete -c obnam --no-files -l quiet -d 'Show only errors, no progress updates'
 complete -c obnam --no-files -l no-quiet -d 'Show errors and progress updates'
-complete -c obnam       -s r -l repository -d 'Name of backup repository'
+complete -c obnam -s r -l repository -d 'Name of backup repository'
 complete -c obnam --no-files -l repository-format -a '6 green-albatross-20160813' -d 'Use FORMAT for new repositories'
-complete -c obnam            -l to -d 'Where to restore / mount to'
+complete -c obnam -l to -d 'Where to restore / mount to'
 complete -c obnam --no-files -l verbose -d 'Be more verbose'
 complete -c obnam --no-files -l no-verbose -d 'Do not be verbose'
 complete -c obnam --no-files -l verify-randomly -d 'Verify N files randomly from the backup'
 complete -c obnam --no-files -l version -d 'Show version number and exit'
-complete -c obnam            -l warn-age -d 'For nagios-last-backup-age: maximum age'
+complete -c obnam -l warn-age -d 'For nagios-last-backup-age: maximum age'
 
 # Backing up
 complete -c obnam --no-files -l checkpoint -d 'Make a checkpoint after a given SIZE'
 complete -c obnam --no-files -l deduplicate -a 'fatalist never verify' -d 'Deduplicate mode'
-complete -c obnam            -l exclude -d 'REGEXP for pathnames to exclude'
+complete -c obnam -l exclude -d 'REGEXP for pathnames to exclude'
 complete -c obnam --no-files -l exclude-caches -d 'Exclude directories tagged as cache'
 complete -c obnam --no-files -l no-exclude-caches -d 'Include directories tagged as cache'
-complete -c obnam            -l exclude-from -d 'Read exclude patterns from FILE'
+complete -c obnam -l exclude-from -d 'Read exclude patterns from FILE'
 complete -c obnam --no-files -l include -d 'REGEXP for pathnames to include, even if matches --exclude'
 complete -c obnam --no-files -l leave-checkpoints -d 'Leave checkpoint generations at the end of backup'
 complete -c obnam --no-files -l no-leave-checkpoints -d 'Omit checkpoint generations at the end of backup'
 complete -c obnam --no-files -l one-file-system -d 'Do not follow mount points'
 complete -c obnam --no-files -l no-one-file-system -d 'Follow mount points'
-complete -c obnam            -l root -d 'What to backup'
+complete -c obnam -l root -d 'What to backup'
 complete -c obnam --no-files -l small-files-in-btree -d 'Put small files directly into the B-tree'
 complete -c obnam --no-files -l no-small-files-in-btree -d 'No not put small files into the B-tree'
 
 # Configuration files and settings
-complete -c obnam            -l config -d 'Add FILE to config files'
+complete -c obnam -l config -d 'Add FILE to config files'
 complete -c obnam --no-files -l dump-config -d 'Write out the current configuration'
 complete -c obnam --no-files -l dump-setting-names -d 'Write out setting names'
 complete -c obnam --no-files -l help-all -d 'Show all options'
@@ -89,11 +89,11 @@ complete -c obnam --no-files -l no-default-configs -d 'Clear list of configurati
 complete -c obnam --no-files -l crash-limit -d 'Artificially crash the program after COUNTER files'
 complete -c obnam --no-files -l pretend-time -d 'Pretend it is TIMESTAMP'
 complete -c obnam --no-files -l testing-fail-matching -d 'Simulate failures for files that match REGEXP'
-complete -c obnam            -l trace -d 'FILENAME pattern for trace debugging'
+complete -c obnam -l trace -d 'FILENAME pattern for trace debugging'
 
 # Encryption
 complete -c obnam --no-files -l encrypt-with -d 'PGP key with which to encrypt'
-complete -c obnam            -l gnupghome -d 'Home directory for GPG'
+complete -c obnam -l gnupghome -d 'Home directory for GPG'
 complete -c obnam --no-files -l key-details -d 'Show additional user IDs'
 complete -c obnam --no-files -l no-key-details -d 'Do not show additional user IDs'
 complete -c obnam --no-files -l keyid -d 'PGP key id'
@@ -125,7 +125,7 @@ complete -c obnam --no-files -l fsck-skip-shared-b-trees -d 'Do not check shared
 complete -c obnam --no-files -l no-fsck-skip-shared-b-trees -d 'Check shared B-trees'
 
 # Logging
-complete -c obnam            -l log -a 'syslog' -d 'Write log to FILE or syslog'
+complete -c obnam -l log -a 'syslog' -d 'Write log to FILE or syslog'
 complete -c obnam --no-files -l log-keep -d 'Keep last N logs (10)'
 complete -c obnam --no-files -l log-level -a 'debug info warning error critical fatal' -d 'Log at LEVEL'
 complete -c obnam --no-files -l log-max -d 'Rotate logs larger than SIZE'
@@ -157,7 +157,7 @@ complete -c obnam --no-files -l dir-cache-size -d 'In-memory cache SIZE for dir
 # SSH/SFTP
 complete -c obnam --no-files -l pure-paramiko -d 'Use only paramiko, no openssh'
 complete -c obnam --no-files -l no-pure-paramiko -d 'Use openssh if available'
-complete -c obnam            -l ssh-command -d 'Executable to be used instead of "ssh"'
+complete -c obnam -l ssh-command -d 'Executable to be used instead of "ssh"'
 complete -c obnam --no-files -l ssh-host-keys-check -a 'no yes ask ssh-config' -d 'ssh host key check'
-complete -c obnam            -l ssh-key -d 'Use FILENAME as the ssh RSA key'
-complete -c obnam            -l ssh-known-hosts -a '~/.ssh/known_hosts' -d 'FILENAME of the known_hosts file'
+complete -c obnam -l ssh-key -d 'Use FILENAME as the ssh RSA key'
+complete -c obnam -l ssh-known-hosts -a '~/.ssh/known_hosts' -d 'FILENAME of the known_hosts file'
diff --git a/share/completions/oggenc.fish b/share/completions/oggenc.fish
index 2c0a46465..6b816cb22 100644
--- a/share/completions/oggenc.fish
+++ b/share/completions/oggenc.fish
@@ -2,23 +2,23 @@
 # Completions for oggenc
 #
 complete -c oggenc -s Q -l quiet -f -d "Produce no output to stderr"
-complete -c oggenc -s h -l help  -f -d "Print this help text"
+complete -c oggenc -s h -l help -f -d "Print this help text"
 complete -c oggenc -s v -l version -f -d "Print the version number"
-complete -c oggenc -s r -l raw -f -d     "Raw mode. Input files are read directly as PCM data"
+complete -c oggenc -s r -l raw -f -d "Raw mode. Input files are read directly as PCM data"
 complete -c oggenc -s B -l raw-bits -x -d "Set bits/sample for raw input. Default is 16"
 complete -c oggenc -s C -l raw-chan -x -d "Set number of channels for raw input"
 complete -c oggenc -s R -l raw-rate -x -d "Set samples/sec for raw input"
-complete -c oggenc      -l raw-endianness -f -d "1 for bigendian, 0 for little (defaults to 0)"
+complete -c oggenc -l raw-endianness -f -d "1 for bigendian, 0 for little (defaults to 0)"
 complete -c oggenc -s b -l bitrate -x -d "Choose a nominal bitrate to encode at"
-complete -c oggenc      -l managed -f -d "Enable the bitrate management engine"
+complete -c oggenc -l managed -f -d "Enable the bitrate management engine"
 complete -c oggenc -s m -l min-bitrate -x -d "Specify a minimum bitrate (in kbps)"
 complete -c oggenc -s M -l max-bitrate -x -d "Specify a maximum bitrate in kbps"
-complete -c oggenc      -l advanced-encode-option -x -d "option=value Sets an advanced encoder option to the given value"
+complete -c oggenc -l advanced-encode-option -x -d "option=value Sets an advanced encoder option to the given value"
 complete -c oggenc -s q -l quality -x -d "Specify quality"
-complete -c oggenc      -l resample -x -d "Resample input data to sampling rate n (Hz)"
-complete -c oggenc      -l downmix -f -d  "Downmix stereo to mono"
+complete -c oggenc -l resample -x -d "Resample input data to sampling rate n (Hz)"
+complete -c oggenc -l downmix -f -d "Downmix stereo to mono"
 complete -c oggenc -s s -l serial -x -d "Specify a serial number for the stream"
-complete -c oggenc      -l discard-comments -f -d "Prevents comments in FLAC and Ogg FLAC files from being copied to the output Ogg Vorbis file"
+complete -c oggenc -l discard-comments -f -d "Prevents comments in FLAC and Ogg FLAC files from being copied to the output Ogg Vorbis file"
 complete -c oggenc -s o -l output -x -d "Write file to fn (only valid in single-file mode)"
 complete -c oggenc -s n -l names -x -d "Produce filenames as this string"
 complete -c oggenc -s X -l name-remove= -x -d "Remove the specified characters from parameters"
diff --git a/share/completions/opam.fish b/share/completions/opam.fish
index b01489c91..e15e27a59 100644
--- a/share/completions/opam.fish
+++ b/share/completions/opam.fish
@@ -91,7 +91,7 @@ complete -f -c opam -n '__fish_opam_needs_command' -a "remove uninstall" -d "Rem
 complete -f -c opam -n '__fish_opam_needs_command' -a "repository remote" -d "Manage OPAM repositories."
 complete -f -c opam -n '__fish_opam_needs_command' -a "search" -d "Search into the package list."
 complete -f -c opam -n '__fish_opam_needs_command' -a "show info" -d "Display information about specific packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "switch" -d "Manage multiple installation of compilers."
+complete -f -c opam -n '__fish_opam_needs_command' -a switch -d "Manage multiple installation of compilers."
 complete -f -c opam -n '__fish_opam_needs_command' -a "update" -d "Update the list of available packages."
 complete -f -c opam -n '__fish_opam_needs_command' -a "upgrade" -d "Upgrade the installed package to latest version."
 ## admin
diff --git a/share/completions/open.fish b/share/completions/open.fish
index 2b687763d..6e63ef381 100644
--- a/share/completions/open.fish
+++ b/share/completions/open.fish
@@ -1,14 +1,14 @@
 if test (uname) = 'Darwin' # OS X
-	complete -c open -s a -d 'Open APP, or open FILE(s), if supplied, with APP' -r -a "(mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*' | sed -E 's/.+\/(.+)\.app/\1/g')"
-	complete -c open -s b -d 'Bundle Identifier of APP to open, or to be used to open FILE' -x -a "(mdls (mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*') -name kMDItemCFBundleIdentifier | sed -E 's/kMDItemCFBundleIdentifier = \"(.+)\"/\1/g')"
-	complete -c open -s e -d 'Open FILE(s) with /Applications/TextEdit'
-	complete -c open -s t -d 'Open FILE(s) with default text editor from LaunchServices'
-	complete -c open -s f -d 'Open STDIN/PIPE with default text editor. End input with C-d.'
-	complete -c open -s F -d 'Don\'t restore previous application windows. Except Untitled documents.'
-	complete -c open -s W -d 'Wait until APP has exited'
-	complete -c open -s R -d 'Reveal FILE(s) in Finder'
-	complete -c open -s n -d 'Open new instace of APP'
-	complete -c open -s g -d 'Open in background'
-	complete -c open -s h -d 'Finds and opens for a header whose name matches the given string. Better performance with full names i.e. NSView.h' -r
-	complete -c open -l args -d 'Pass arguments to opened APP in the argv parameter to main()' -x
+    complete -c open -s a -d 'Open APP, or open FILE(s), if supplied, with APP' -r -a "(mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*' | sed -E 's/.+\/(.+)\.app/\1/g')"
+    complete -c open -s b -d 'Bundle Identifier of APP to open, or to be used to open FILE' -x -a "(mdls (mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*') -name kMDItemCFBundleIdentifier | sed -E 's/kMDItemCFBundleIdentifier = \"(.+)\"/\1/g')"
+    complete -c open -s e -d 'Open FILE(s) with /Applications/TextEdit'
+    complete -c open -s t -d 'Open FILE(s) with default text editor from LaunchServices'
+    complete -c open -s f -d 'Open STDIN/PIPE with default text editor. End input with C-d.'
+    complete -c open -s F -d 'Don\'t restore previous application windows. Except Untitled documents.'
+    complete -c open -s W -d 'Wait until APP has exited'
+    complete -c open -s R -d 'Reveal FILE(s) in Finder'
+    complete -c open -s n -d 'Open new instace of APP'
+    complete -c open -s g -d 'Open in background'
+    complete -c open -s h -d 'Finds and opens for a header whose name matches the given string. Better performance with full names i.e. NSView.h' -r
+    complete -c open -l args -d 'Pass arguments to opened APP in the argv parameter to main()' -x
 end
diff --git a/share/completions/openocd.fish b/share/completions/openocd.fish
index a7fc002e0..a2cacf03f 100644
--- a/share/completions/openocd.fish
+++ b/share/completions/openocd.fish
@@ -7,13 +7,13 @@
 # Retrieve the likely compile-time PREFIX for openocd based off of where the binary
 # is located. e.g. if openocd is /usr/local/bin/openocd return /usr/local
 function __fish_openocd_prefix
-	string replace "/bin/openocd" "" (which openocd)
+    string replace "/bin/openocd" "" (which openocd)
 end
 
 # The results of this function are as if __fish_complete_suffix were called
 # while cd'd into the openocd scripts directory
 function __fish_complete_openocd_path
-	__fish_complete_suffix (commandline -ct) "$argv[1]" "$argv[2]" (__fish_openocd_prefix)/share/openocd/scripts
+    __fish_complete_suffix (commandline -ct) "$argv[1]" "$argv[2]" (__fish_openocd_prefix)/share/openocd/scripts
 end
 
 complete -c openocd -f # at no point does openocd take arbitrary arguments
diff --git a/share/completions/opkg.fish b/share/completions/opkg.fish
index 9e11bb92d..0dc30f5a8 100644
--- a/share/completions/opkg.fish
+++ b/share/completions/opkg.fish
@@ -2,7 +2,7 @@
 
 function __fish_opkg_no_subcommand -d 'Test if opkg has yet to be given the subcommand'
     for i in (commandline -opc)
-        if contains -- $i update upgrade install configure remove flag list list-installed list-upgradable list-changed-conffiles files search find info status download compare-versions print-architecture depends whatdepends whatdependsrec whatrecommends whatsuggests whatprovides whatconflicts  whatreplaces
+        if contains -- $i update upgrade install configure remove flag list list-installed list-upgradable list-changed-conffiles files search find info status download compare-versions print-architecture depends whatdepends whatdependsrec whatrecommends whatsuggests whatprovides whatconflicts whatreplaces
             return 1
         end
     end
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index 475b2410b..7e76c5ca3 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -22,14 +22,14 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-snip\t"cut one
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-strip\t"strip specified metadata objects (e.g. "all")"'
 
 for n in (seq 0 9)
-	complete -x -c optipng -n '__fish_should_complete_switches' -a "-o$n\t\"PNG optimization level $n\""
+    complete -x -c optipng -n '__fish_should_complete_switches' -a "-o$n\t\"PNG optimization level $n\""
 end
 
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-i0\t"PNG interlace type 0"'
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-i1\t"PNG interlace type 1"'
 
 for n in (seq 0 5)
-	complete -x -c optipng -n '__fish_should_complete_switches' -a "-f$n\t'PNG delta filters $n'"
+    complete -x -c optipng -n '__fish_should_complete_switches' -a "-f$n\t'PNG delta filters $n'"
 end
 
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-out\t"write output file to <file>"'
@@ -37,5 +37,5 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-dir\t"write out
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-log\t"log messages to <file>"'
 
 complete -x -c optipng -n 'not __fish_prev_arg_in -out -dir -log' \
-					-a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
+    -a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
 complete -x -c optipng -n '__fish_prev_arg_in -dir' -a '(__fish_complete_suffix \'{}\')' # hack to list directories only
diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index e7fcd19d7..1b5870d8a 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -39,14 +39,14 @@ complete -c $progname -s F -f -l files -n $noopt -d 'Query the files database'
 complete -c $progname -s V -f -l version -d 'Display version and exit'
 complete -c $progname -s h -f -l help -d 'Display help'
 # pacaur operations
-complete -c $progname -n $noopt -s s    -l search      -d "(AUR) Search for packages"
-complete -c $progname -n $noopt -s i    -l info        -d "(AUR) Show info for packages"
-complete -c $progname -n $noopt -s m    -l makepkg     -d "(AUR) Clone the packages' build files and build them"
-complete -c $progname -n $noopt -s y    -l sync        -d "(AUR) Clone build files, build and install packages"
-complete -c $progname -n $noopt -s k    -l check       -d "(AUR) Check foreign packages for updates"
-complete -c $progname -n $noopt -s u    -l update      -d "(AUR) Update foreign packages"
+complete -c $progname -n $noopt -s s -l search -d "(AUR) Search for packages"
+complete -c $progname -n $noopt -s i -l info -d "(AUR) Show info for packages"
+complete -c $progname -n $noopt -s m -l makepkg -d "(AUR) Clone the packages' build files and build them"
+complete -c $progname -n $noopt -s y -l sync -d "(AUR) Clone build files, build and install packages"
+complete -c $progname -n $noopt -s k -l check -d "(AUR) Check foreign packages for updates"
+complete -c $progname -n $noopt -s u -l update -d "(AUR) Update foreign packages"
 complete -c $progname -n "$noopt; and not __fish_contains_opt -s d download" -s d -l download -d "(AUR) Clone the packages' build files"
-complete -c $progname -n "$noopt; and __fish_contains_opt -s d download"     -s d -l download -d "Download dependencies recursively"
+complete -c $progname -n "$noopt; and __fish_contains_opt -s d download" -s d -l download -d "Download dependencies recursively"
 
 
 # General options
@@ -63,19 +63,19 @@ complete -c $progname -n $hasopt -l hookdir -d 'Hook file directory'
 complete -c $progname -n $hasopt -l logfile -d 'Specify alternative log file'
 complete -c $progname -n $hasopt -l noconfirm -d 'Bypass any question' -f
 # General options (pacaur only)
-complete -c $progname -n $hasopt -s a -l aur            -d 'Apply only for AUR targets'
-complete -c $progname -n $hasopt -s r -l repo           -d 'Apply only for specified repo'
-complete -c $progname -n $hasopt -s r -l edit           -d 'Edit build files'
-complete -c $progname -n $hasopt      -l noedit         -d 'Do not edit build files'
-complete -c $progname -n $hasopt      -l rebuild        -d 'Always rebuild packages'
-complete -c $progname -n $hasopt      -l silent         -d 'Redirect output to the log in the clone directory'
-complete -c $progname -n $hasopt      -l domain      -x -d 'Point at a domain other than the default aur.archlinux.org'
-complete -c $progname -n $hasopt      -l devel          -d 'Use devel packages'
-complete -c $progname -n $hasopt      -l ignore-ood     -d 'Ignore all results marked as out of date'
-complete -c $progname -n $hasopt      -l no-ignore-ood  -d 'Do not ignore all results marked as out of date'
-complete -c $progname -n $hasopt      -l sort           -d 'Sort ascending by key'  -xa "name votes popularity"
-complete -c $progname -n $hasopt      -l rsort          -d 'Sort descending by key' -xa "name votes popularity"
-complete -c $progname -n $hasopt      -l by             -d 'Search by field'  -xa "name name-desc maintainer"
+complete -c $progname -n $hasopt -s a -l aur -d 'Apply only for AUR targets'
+complete -c $progname -n $hasopt -s r -l repo -d 'Apply only for specified repo'
+complete -c $progname -n $hasopt -s r -l edit -d 'Edit build files'
+complete -c $progname -n $hasopt -l noedit -d 'Do not edit build files'
+complete -c $progname -n $hasopt -l rebuild -d 'Always rebuild packages'
+complete -c $progname -n $hasopt -l silent -d 'Redirect output to the log in the clone directory'
+complete -c $progname -n $hasopt -l domain -x -d 'Point at a domain other than the default aur.archlinux.org'
+complete -c $progname -n $hasopt -l devel -d 'Use devel packages'
+complete -c $progname -n $hasopt -l ignore-ood -d 'Ignore all results marked as out of date'
+complete -c $progname -n $hasopt -l no-ignore-ood -d 'Do not ignore all results marked as out of date'
+complete -c $progname -n $hasopt -l sort -d 'Sort ascending by key' -xa "name votes popularity"
+complete -c $progname -n $hasopt -l rsort -d 'Sort descending by key' -xa "name votes popularity"
+complete -c $progname -n $hasopt -l by -d 'Search by field' -xa "name name-desc maintainer"
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
diff --git a/share/completions/pacman-key.fish b/share/completions/pacman-key.fish
index 2f2fbc4fa..53bdc6408 100644
--- a/share/completions/pacman-key.fish
+++ b/share/completions/pacman-key.fish
@@ -1,22 +1,22 @@
 
-complete -c pacman-key -s a -l 'add'            -d 'Add or update keys from <file>'
-complete -c pacman-key      -l 'config'         -d 'Use an alternate config <file>'
-complete -c pacman-key -s d -l 'delete'         -d 'Remove the <keys> from the keyring'
-complete -c pacman-key -s e -l 'export'         -d 'Export <keys> to stdout'
-complete -c pacman-key      -l 'edit-key'       -d 'Present a menu on specified <keys>'
-complete -c pacman-key -s f -l 'finger'         -d 'List a fingerprint for each specified <key>'
-complete -c pacman-key      -l 'gpgdir'         -d 'Alternate home <dir> for GnuPG'
-complete -c pacman-key -s h -l 'help'           -d 'Output syntax and command line options'
-complete -c pacman-key      -l 'import'         -d 'Imports keys from <dir>/pubring.gpg'
-complete -c pacman-key      -l 'import-trustdb' -d 'Imports ownertrust values from <dir>/trustdb.gpg'
-complete -c pacman-key      -l 'init'           -d 'Initialize the keyring'
-complete -c pacman-key      -l 'keyserver'      -d 'Use the specified <keyserver>'
-complete -c pacman-key -s l -l 'list-keys'      -d 'Lists all or specified <keys> from the keyring'
-complete -c pacman-key      -l 'list-sigs'      -d 'Same as --list-keys, but with signatures'
-complete -c pacman-key      -l 'lsign-key'      -d 'Locally sign the given <key>'
-complete -c pacman-key -s r -l 'recv-keys'      -d 'Equivalent to --recv-keys in GnuPG'
-complete -c pacman-key      -l 'refresh-keys'   -d 'Equivalent to --refresh-keys in GnuPG'
-complete -c pacman-key      -l 'populate'       -d 'Reload the default keys'
-complete -c pacman-key -s u -l 'updatedb'       -d 'Equivalent to --check-trustdb in GnuPG'
-complete -c pacman-key -s v -l 'verify'         -d 'Verify the given <signature> file'
-complete -c pacman-key -s V -l 'version'        -d 'Displays the program version'
+complete -c pacman-key -s a -l 'add' -d 'Add or update keys from <file>'
+complete -c pacman-key -l 'config' -d 'Use an alternate config <file>'
+complete -c pacman-key -s d -l 'delete' -d 'Remove the <keys> from the keyring'
+complete -c pacman-key -s e -l 'export' -d 'Export <keys> to stdout'
+complete -c pacman-key -l 'edit-key' -d 'Present a menu on specified <keys>'
+complete -c pacman-key -s f -l 'finger' -d 'List a fingerprint for each specified <key>'
+complete -c pacman-key -l 'gpgdir' -d 'Alternate home <dir> for GnuPG'
+complete -c pacman-key -s h -l 'help' -d 'Output syntax and command line options'
+complete -c pacman-key -l 'import' -d 'Imports keys from <dir>/pubring.gpg'
+complete -c pacman-key -l 'import-trustdb' -d 'Imports ownertrust values from <dir>/trustdb.gpg'
+complete -c pacman-key -l 'init' -d 'Initialize the keyring'
+complete -c pacman-key -l 'keyserver' -d 'Use the specified <keyserver>'
+complete -c pacman-key -s l -l 'list-keys' -d 'Lists all or specified <keys> from the keyring'
+complete -c pacman-key -l 'list-sigs' -d 'Same as --list-keys, but with signatures'
+complete -c pacman-key -l 'lsign-key' -d 'Locally sign the given <key>'
+complete -c pacman-key -s r -l 'recv-keys' -d 'Equivalent to --recv-keys in GnuPG'
+complete -c pacman-key -l 'refresh-keys' -d 'Equivalent to --refresh-keys in GnuPG'
+complete -c pacman-key -l 'populate' -d 'Reload the default keys'
+complete -c pacman-key -s u -l 'updatedb' -d 'Equivalent to --check-trustdb in GnuPG'
+complete -c pacman-key -s v -l 'verify' -d 'Verify the given <signature> file'
+complete -c pacman-key -s V -l 'version' -d 'Displays the program version'
diff --git a/share/completions/pacmd.fish b/share/completions/pacmd.fish
index f5da595f3..c3ad1ef25 100644
--- a/share/completions/pacmd.fish
+++ b/share/completions/pacmd.fish
@@ -14,7 +14,7 @@ complete -f -c pacmd -n "__fish_seen_subcommand_from describe-module" -a '(__fis
 complete -f -c pacmd -n "__fish_seen_subcommand_from kill-client" -a '(__fish_pa_complete_type clients | string match -r "^[0-9].*")' # match because this only takes an index
 
 for t in client sink-input source-output
-	complete -f -c pacmd -n "__fish_seen_subcommand_from kill-$t" -a '(__fish_pa_complete_type '$t's | string match -r "^[0-9].*")' # match because this only takes an index
+    complete -f -c pacmd -n "__fish_seen_subcommand_from kill-$t" -a '(__fish_pa_complete_type '$t's | string match -r "^[0-9].*")' # match because this only takes an index
 end
 
 complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '0 false off' -d "Resume"
diff --git a/share/completions/pactl.fish b/share/completions/pactl.fish
index 499c162e0..dce2a3b9f 100644
--- a/share/completions/pactl.fish
+++ b/share/completions/pactl.fish
@@ -10,41 +10,41 @@
 set -l commands (pacmd help | string match -r '^ +[-\w]+' | string trim)
 # These are the actual commands for pactl - we complete only these, and then the cmd commands in that completion
 set -l ctlcommands stat info list exit {upload,play,remove}-sample {load,unload}-module \
-move-{sink-input,source-output} suspend-{sink,source} set-{card-profile,default-sink,sink-port,source-port,port-latency-offset} \
-set-{sink,source,sink-input,source-output}-{volume,mute} set-sink-formats subscribe
+    move-{sink-input,source-output} suspend-{sink,source} set-{card-profile,default-sink,sink-port,source-port,port-latency-offset} \
+    set-{sink,source,sink-input,source-output}-{volume,mute} set-sink-formats subscribe
 
 function __fish_pa_complete_type
-	pactl list short $argv
-	# The default is to show the number, then the name and then some info - also show the name, then the number as it's a bit friendlier
-	pactl list short $argv | string replace -r  '(\w+)\t([-\w]+)' '$2\t$1'
+    pactl list short $argv
+    # The default is to show the number, then the name and then some info - also show the name, then the number as it's a bit friendlier
+    pactl list short $argv | string replace -r '(\w+)\t([-\w]+)' '$2\t$1'
 end
 
 function __fish_pa_print_type
-	pactl list short $argv
-	# Pa allows both a numerical index and a name
-	pactl list short $argv | string replace -r  '(\w+)\t.*' '$1'
+    pactl list short $argv
+    # Pa allows both a numerical index and a name
+    pactl list short $argv | string replace -r '(\w+)\t.*' '$1'
 end
 
 function __fish_pa_list_ports
-	# Yes, this is localized
-	env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Ports:/,$p' | string match -r '^\t\t\w.*$' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
+    # Yes, this is localized
+    env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Ports:/,$p' | string match -r '^\t\t\w.*$' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
 end
 
 function __fish_pa_list_profiles
-	env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Profiles:/,/Active Profile/p' | string match -r '\t\t.*' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
+    env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Profiles:/,/Active Profile/p' | string match -r '\t\t.*' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
 end
 
 # This is needed to filter out loaded modules
 function __fish_pa_complete_unloaded_modules
-	# We need to get just the module names
-	set -l loaded (__fish_pa_print_type modules | string replace -r '^\w*\t([-\w]+).*' '$1')
-	pulseaudio --dump-modules | while read name description
-		# This is a potential source of slowness, but on my system it's instantaneous
-		# with 73 modules
-		if not contains -- $name $loaded
-			printf "%s\t%s\n" $name $description
-		end
-	end
+    # We need to get just the module names
+    set -l loaded (__fish_pa_print_type modules | string replace -r '^\w*\t([-\w]+).*' '$1')
+    pulseaudio --dump-modules | while read name description
+        # This is a potential source of slowness, but on my system it's instantaneous
+        # with 73 modules
+        if not contains -- $name $loaded
+            printf "%s\t%s\n" $name $description
+        end
+    end
 end
 
 complete -f -e -c pactl
@@ -66,48 +66,48 @@ complete -f -c pactl -n "__fish_seen_subcommand_from unload-module" -a '(__fish_
 complete -f -c pactl -n "__fish_seen_subcommand_from load-module" -a '(__fish_pa_complete_unloaded_modules)'
 
 complete -f -c pactl -n "__fish_seen_subcommand_from move-sink-input; and not __fish_seen_subcommand_from (__fish_pa_print_type sink-inputs)" \
--a '(__fish_pa_complete_type sink-inputs)'
+    -a '(__fish_pa_complete_type sink-inputs)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-sink-input; and __fish_seen_subcommand_from (__fish_pa_print_type sink-inputs)" \
--a '(__fish_pa_complete_type sinks)'
+    -a '(__fish_pa_complete_type sinks)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-source-output; and not __fish_seen_subcommand_from (__fish_pa_print_type source-outputs)" \
--a '(__fish_pa_complete_type source-outputs)'
+    -a '(__fish_pa_complete_type source-outputs)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-source-output; and __fish_seen_subcommand_from (__fish_pa_print_type source-outputs)" \
--a '(__fish_pa_complete_type sources)'
+    -a '(__fish_pa_complete_type sources)'
 
 # Suspend
 for t in source sink
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a '0 false off' -d "Resume"
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a '1 true on' -d "Suspend"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_list_ports)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a '0 false off' -d "Resume"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a '1 true on' -d "Suspend"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_list_ports)"
 end
 
 # Volume and mute
 for t in source sink source-output sink-input
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(seq 0 100)%"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "1 true on" -d "Muted"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "0 false off" -d "Unmuted"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "toggle"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(seq 0 100)%"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "1 true on" -d "Muted"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "0 false off" -d "Unmuted"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "toggle"
 end
 
 complete -f -c pactl -n "__fish_seen_subcommand_from set-card-profile; and not __fish_seen_subcommand_from (__fish_pa_print_type cards)" \
--a "(__fish_pa_complete_type cards)"
+    -a "(__fish_pa_complete_type cards)"
 complete -f -c pactl -n "__fish_seen_subcommand_from set-card-profile; and __fish_seen_subcommand_from (__fish_pa_print_type cards)" \
--a "(__fish_pa_list_profiles)"
+    -a "(__fish_pa_list_profiles)"
 
 complete -f -c pactl -n "__fish_seen_subcommand_from set-default-sink" -a "(__fish_pa_complete_type sinks)"
 
diff --git a/share/completions/pactree.fish b/share/completions/pactree.fish
index 81c37d725..a20607002 100644
--- a/share/completions/pactree.fish
+++ b/share/completions/pactree.fish
@@ -1,11 +1,11 @@
 complete -c pactree -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
-complete -c pactree -s b -l dbpath       -d 'Set an alternate database location' -xa '(__fish_complete_directories)'
-complete -c pactree -s c -l color        -d 'Colorize output'
-complete -c pactree -s d -l depth        -d 'Limit the depth of recursion' -x
-complete -c pactree -s g -l graph        -d 'Generate output for graphviz\'s dot'
-complete -c pactree -s h -l help         -d 'Display this help message'
-complete -c pactree -s l -l linear       -d 'Enable linear output'
-complete -c pactree -s r -l reverse      -d 'Show reverse dependencies'
-complete -c pactree -s s -l sync         -d 'Search sync DBs instead of local'
-complete -c pactree -s u -l unique       -d 'Show dependencies with no duplicates (implies -l)'
-complete -c pactree -l config            -d 'Set an alternate configuration file' -r
+complete -c pactree -s b -l dbpath -d 'Set an alternate database location' -xa '(__fish_complete_directories)'
+complete -c pactree -s c -l color -d 'Colorize output'
+complete -c pactree -s d -l depth -d 'Limit the depth of recursion' -x
+complete -c pactree -s g -l graph -d 'Generate output for graphviz\'s dot'
+complete -c pactree -s h -l help -d 'Display this help message'
+complete -c pactree -s l -l linear -d 'Enable linear output'
+complete -c pactree -s r -l reverse -d 'Show reverse dependencies'
+complete -c pactree -s s -l sync -d 'Search sync DBs instead of local'
+complete -c pactree -s u -l unique -d 'Show dependencies with no duplicates (implies -l)'
+complete -c pactree -l config -d 'Set an alternate configuration file' -r
diff --git a/share/completions/pandoc.fish b/share/completions/pandoc.fish
index cb2927276..76f473402 100644
--- a/share/completions/pandoc.fish
+++ b/share/completions/pandoc.fish
@@ -53,14 +53,14 @@ complete -c pandoc -x -l asciimathml -l mimetex -l jsmath -l gladtex
 complete -c pandoc -x -s c -l css
 
 # options that use informats and outformats
-complete -c pandoc -x -s f -s r -l from -l read      -a "$informats"
-complete -c pandoc -x -s t -s w -l to -l write       -a "$outformats"
+complete -c pandoc -x -s f -s r -l from -l read -a "$informats"
+complete -c pandoc -x -s t -s w -l to -l write -a "$outformats"
 complete -c pandoc -x -s D -l print-default-template -a "$outformats"
 
 # TODO: add support for enabling and disabling extensions using the +/- switches
 
 # options that take directories
-complete -c pandoc -x -l data-dir      -a "(__fish_complete_directories (commandline -ct) "")"
+complete -c pandoc -x -l data-dir -a "(__fish_complete_directories (commandline -ct) "")"
 complete -c pandoc -x -l extract-media -a "(__fish_complete_directories (commandline -ct) "")"
 
 # options that take files
@@ -80,27 +80,27 @@ complete -c pandoc -r -l citation-abbreviations
 
 # options that take files filtered by extension
 
-complete -c pandoc -r -f -l print-highlight-style  -a "(__fish_complete_suffix 'theme' )"
-complete -c pandoc -r -f -l highlight_style        -a "(__fish_complete_suffix 'theme' )"
-complete -c pandoc -r -f -l csl                    -a "(__fish_complete_suffix 'csl'   )"
+complete -c pandoc -r -f -l print-highlight-style -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l highlight_style -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l csl -a "(__fish_complete_suffix 'csl'   )"
 complete -c pandoc -r -f -l reference-file -a "(__fish_complete_suffix 'odt') (__fish_complete_suffix 'docx')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'bib')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'bibtex')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'copac')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'json')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'yaml')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'enl')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'xml')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'wos')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'medline')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'mods')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'ria')"
-complete -c pandoc -r -f -l lua-filter     -a "(__fish_complete_suffix 'lua')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'bib')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'bibtex')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'copac')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'json')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'yaml')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'enl')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'xml')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'wos')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'medline')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'mods')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'ria')"
+complete -c pandoc -r -f -l lua-filter -a "(__fish_complete_suffix 'lua')"
 
 # options that take files in DATADIR
-complete -c pandoc -r -s F -l filter       -a "(find $datadir/filters/** | string replace -- '$datadir/filters/' '')"
-complete -c pandoc -r -l template          -a "(find $datadir/templates/** | string replace -- '$datadir/templates/' '')"
-complete -c pandoc -r -f -l lua-filter     -a "(find $datadir/** | string match -r '.lua\$' | string replace -- '$datadir/' '')"
+complete -c pandoc -r -s F -l filter -a "(find $datadir/filters/** | string replace -- '$datadir/filters/' '')"
+complete -c pandoc -r -l template -a "(find $datadir/templates/** | string replace -- '$datadir/templates/' '')"
+complete -c pandoc -r -f -l lua-filter -a "(find $datadir/** | string match -r '.lua\$' | string replace -- '$datadir/' '')"
 
 # options that require arguments which cannot be autocompleted
 complete -c pandoc -x -l indented-code-classes
diff --git a/share/completions/passwd.fish b/share/completions/passwd.fish
index 3d1052f07..915bc340d 100644
--- a/share/completions/passwd.fish
+++ b/share/completions/passwd.fish
@@ -1,43 +1,43 @@
 # Completions for passwd
 
 function __fish_passwd_darwin_infosystem
-	echo -e "PAM\tPluggable Authentication Module"
-	echo -e "opendirectory\tOpen Directory-compatible system"
-	echo -e "file\tLocal flat-file"
-	echo -e "nis\tRemote NIS server"
+    echo -e "PAM\tPluggable Authentication Module"
+    echo -e "opendirectory\tOpen Directory-compatible system"
+    echo -e "file\tLocal flat-file"
+    echo -e "nis\tRemote NIS server"
 end
 
 if passwd --help >/dev/null 2>&1
-	complete -c passwd -n '__fish_contains_opt -s S status' -s a -l all -f -d "Display password state for all users"
-	complete -c passwd -s d -l delete -f -d "Delete user password"
-	complete -c passwd -s e -l expire -f -d "Immediately obsolete user password"
-	complete -c passwd -s h -l help -f -d "Display help and exit"
-	complete -c passwd -s i -l inactive -x -d "Schedule account inactivation after password expiration"
-	complete -c passwd -s k -l keep-tokens -f -d "Wait tokens expiration before changing password"
-	complete -c passwd -s l -l lock -f -d "Lock password"
-	complete -c passwd -s n -l mindays -x -d "Define minimum delay between password changes"
-	complete -c passwd -s q -l quiet -f -d "Be quiet"
-	complete -c passwd -s r -l repository -r -d "Update given repository"
-	complete -c passwd -s R -l root -r -d "Use given directory as working directory"
-	complete -c passwd -s S -l status -f -d "Display account status"
-	complete -c passwd -s u -l unlock -f -d "Unlock password"
-	complete -c passwd -s w -l warndays -x -d "Define warning period before mandatory password change"
-	complete -c passwd -s w -l warndays -x -d "Define maximum period of password validity"
-	complete -c passwd -n '__fish_not_contain_opt -s A all' -f -a '(__fish_complete_users)' -d "Account to be altered"
+    complete -c passwd -n '__fish_contains_opt -s S status' -s a -l all -f -d "Display password state for all users"
+    complete -c passwd -s d -l delete -f -d "Delete user password"
+    complete -c passwd -s e -l expire -f -d "Immediately obsolete user password"
+    complete -c passwd -s h -l help -f -d "Display help and exit"
+    complete -c passwd -s i -l inactive -x -d "Schedule account inactivation after password expiration"
+    complete -c passwd -s k -l keep-tokens -f -d "Wait tokens expiration before changing password"
+    complete -c passwd -s l -l lock -f -d "Lock password"
+    complete -c passwd -s n -l mindays -x -d "Define minimum delay between password changes"
+    complete -c passwd -s q -l quiet -f -d "Be quiet"
+    complete -c passwd -s r -l repository -r -d "Update given repository"
+    complete -c passwd -s R -l root -r -d "Use given directory as working directory"
+    complete -c passwd -s S -l status -f -d "Display account status"
+    complete -c passwd -s u -l unlock -f -d "Unlock password"
+    complete -c passwd -s w -l warndays -x -d "Define warning period before mandatory password change"
+    complete -c passwd -s w -l warndays -x -d "Define maximum period of password validity"
+    complete -c passwd -n '__fish_not_contain_opt -s A all' -f -a '(__fish_complete_users)' -d "Account to be altered"
 else # Not Linux, so let's see what it is, with the ugly uname
-	set os_type (uname)
-	switch $os_type
-		case Darwin # macOS family
-			complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
-			complete -c passwd -x -s i -a '(__fish_passwd_darwin_infosystem)' -d "Directory system to apply the update to"
-			complete -c passwd -x -s l -d "Location to be updated on chosen directory system"
-			complete -c passwd -x -s u -d "User name to use on chosen directory system"
-		case FreeBSD
-			complete -c passwd -f -s l -d "Update locally, not in Kerberos"
-			complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
-	end
-	# This is common to Darwin, FreeBSD and OpenBSD, and is even the only possible completion under OpenBSD
-	# This is separated from Linux completions, because the Linux one is useless with -A / --all,
-	# whereas -A / --all does not exist under *BSD
-	complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+    set os_type (uname)
+    switch $os_type
+        case Darwin # macOS family
+            complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+            complete -c passwd -x -s i -a '(__fish_passwd_darwin_infosystem)' -d "Directory system to apply the update to"
+            complete -c passwd -x -s l -d "Location to be updated on chosen directory system"
+            complete -c passwd -x -s u -d "User name to use on chosen directory system"
+        case FreeBSD
+            complete -c passwd -f -s l -d "Update locally, not in Kerberos"
+            complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+    end
+    # This is common to Darwin, FreeBSD and OpenBSD, and is even the only possible completion under OpenBSD
+    # This is separated from Linux completions, because the Linux one is useless with -A / --all,
+    # whereas -A / --all does not exist under *BSD
+    complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
 end
diff --git a/share/completions/pfctl.fish b/share/completions/pfctl.fish
index 2c318d2a4..d28e8bdbe 100644
--- a/share/completions/pfctl.fish
+++ b/share/completions/pfctl.fish
@@ -1,5 +1,5 @@
 complete -c pfctl -s s --description 'Show a filter parameter by modifier' -xa \
-	'queue\t"Show loaded queue definitions" \
+    'queue\t"Show loaded queue definitions" \
 	rules\t"Show loaded filter rules" \
 	Anchors\t"Show anchors attached to main ruleset" \
 	states\t"Show state table"
@@ -13,7 +13,7 @@ complete -c pfctl -s s --description 'Show a filter parameter by modifier' -xa \
 	Interfaces\t"List PF interfaces/drivers" \
 	all\t"Everything."'
 complete -c pfctl -s F --description 'Flush filter params specified by mod' -xa \
-	'rules\t"Flush filter rules" \
+    'rules\t"Flush filter rules" \
 	states\t"Flush state table" \
 	Sources\t"Flush source tracking table" \
 	info\t"Flush filter information" \
@@ -21,7 +21,7 @@ complete -c pfctl -s F --description 'Flush filter params specified by mod' -xa
 	ospf\t"Flush the passive OS fingerprints" \
 	all\t"Flush everything"'
 complete -c pfctl -s T --description 'Table command' -xa \
-	'kill\t"Kill a table." \
+    'kill\t"Kill a table." \
 	flush\t"Flush addresses of a table" \
 	add\t"Add one or more addresses in table" \
 	delete\t"Delete one or more addresses from a table" \
diff --git a/share/completions/pgrep.fish b/share/completions/pgrep.fish
index 76a9cb234..0ff8793b0 100644
--- a/share/completions/pgrep.fish
+++ b/share/completions/pgrep.fish
@@ -1,4 +1,4 @@
 
 __fish_complete_pgrep pgrep
 complete -c pgrep -s d -r -d 'Output delimiter'
-complete -c pgrep -s l    -d 'List the process name as well as the process ID'
+complete -c pgrep -s l -d 'List the process name as well as the process ID'
diff --git a/share/completions/pinky.fish b/share/completions/pinky.fish
index 7f2078e5f..c35eaf223 100644
--- a/share/completions/pinky.fish
+++ b/share/completions/pinky.fish
@@ -1,12 +1,12 @@
 complete -c pinky -a "(__fish_complete_users)" -f
-complete -c pinky -s l              -d "produce long format output for the specified USERs"
-complete -c pinky -s b              -d "omit the user's home directory and shell in long format"
-complete -c pinky -s h              -d "omit the user's project file in long format"
-complete -c pinky -s p              -d "omit the user's plan file in long format"
-complete -c pinky -s s              -d "do short format output, this is the default"
-complete -c pinky -s f              -d "omit the line of column headings in short format"
-complete -c pinky -s w              -d "omit the user's full name in short format"
-complete -c pinky -s i              -d "omit the user's full name and remote host in short format"
-complete -c pinky -s q              -d "omit the user's full name, remote host and idle time in short format"
-complete -c pinky -l help     -d "display this help and exit"
-complete -c pinky -l version  -d "output version information and exit"
+complete -c pinky -s l -d "produce long format output for the specified USERs"
+complete -c pinky -s b -d "omit the user's home directory and shell in long format"
+complete -c pinky -s h -d "omit the user's project file in long format"
+complete -c pinky -s p -d "omit the user's plan file in long format"
+complete -c pinky -s s -d "do short format output, this is the default"
+complete -c pinky -s f -d "omit the line of column headings in short format"
+complete -c pinky -s w -d "omit the user's full name in short format"
+complete -c pinky -s i -d "omit the user's full name and remote host in short format"
+complete -c pinky -s q -d "omit the user's full name, remote host and idle time in short format"
+complete -c pinky -l help -d "display this help and exit"
+complete -c pinky -l version -d "output version information and exit"
diff --git a/share/completions/pkg.fish b/share/completions/pkg.fish
index 8a4b96737..e2e03d0a5 100644
--- a/share/completions/pkg.fish
+++ b/share/completions/pkg.fish
@@ -1,87 +1,87 @@
 # Completions for pkgng package manager
 
 if uname | not string match -q FreeBSD
-	exit
+    exit
 end
 
 function __fish_pkg_is
-	for option in $argv
-		if contains $option (commandline -poc)
-			return 0
-		end
-	end
-	return 1
+    for option in $argv
+        if contains $option (commandline -poc)
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_pkg_subcommand
-	set -l skip_next 1
-	for token in (commandline -opc)
-		if test $skip_next = 1
-			set skip_next 0
-			continue
-		end
-		switch $token
-			# Option parser allows shortened long options
-			case '--*=*'
-				continue
-			case -{o,j,c,r,C,R} --op\* --j\* --ch\* --ro\* --co\* --re\*
-				set skip_next 1
-				continue
-			case '-*'
-				continue
-		end
-		return 1
-	end
-	return 0
+    set -l skip_next 1
+    for token in (commandline -opc)
+        if test $skip_next = 1
+            set skip_next 0
+            continue
+        end
+        switch $token
+            # Option parser allows shortened long options
+            case '--*=*'
+                continue
+            case -{o,j,c,r,C,R} --op\* --j\* --ch\* --ro\* --co\* --re\*
+                set skip_next 1
+                continue
+            case '-*'
+                continue
+        end
+        return 1
+    end
+    return 0
 end
 
-complete -c pkg -n __fish_pkg_subcommand    -s v -l version       -d "Display version and exit"
-complete -c pkg -n __fish_pkg_subcommand    -s d -l debug         -d "Show debug information"
-complete -c pkg -n __fish_pkg_subcommand    -s l -l list          -d "List subcommands"
-complete -c pkg -n __fish_pkg_subcommand -x -s o -l option        -d "Set configuration option"
-complete -c pkg -n __fish_pkg_subcommand    -s N                  -d "Run sanity test"
-complete -c pkg -n __fish_pkg_subcommand -x -s j -l jail          -d "Run package manager within jail"
-complete -c pkg -n __fish_pkg_subcommand -r -s c -l chroot        -d "Run package manager within chroot"
-complete -c pkg -n __fish_pkg_subcommand -r -s r -l rootdir       -d "Install packages in specified root"
-complete -c pkg -n __fish_pkg_subcommand -r -s C -l config        -d "Use configuration file"
+complete -c pkg -n __fish_pkg_subcommand -s v -l version -d "Display version and exit"
+complete -c pkg -n __fish_pkg_subcommand -s d -l debug -d "Show debug information"
+complete -c pkg -n __fish_pkg_subcommand -s l -l list -d "List subcommands"
+complete -c pkg -n __fish_pkg_subcommand -x -s o -l option -d "Set configuration option"
+complete -c pkg -n __fish_pkg_subcommand -s N -d "Run sanity test"
+complete -c pkg -n __fish_pkg_subcommand -x -s j -l jail -d "Run package manager within jail"
+complete -c pkg -n __fish_pkg_subcommand -r -s c -l chroot -d "Run package manager within chroot"
+complete -c pkg -n __fish_pkg_subcommand -r -s r -l rootdir -d "Install packages in specified root"
+complete -c pkg -n __fish_pkg_subcommand -r -s C -l config -d "Use configuration file"
 complete -c pkg -n __fish_pkg_subcommand -r -s R -l repo-conf-dir -d "Set repository configuration directory"
-complete -c pkg -n __fish_pkg_subcommand    -s 4                  -d "Use IPv4"
-complete -c pkg -n __fish_pkg_subcommand    -s 6                  -d "Use IPv6"
+complete -c pkg -n __fish_pkg_subcommand -s 4 -d "Use IPv4"
+complete -c pkg -n __fish_pkg_subcommand -s 6 -d "Use IPv6"
 
-complete -c pkg -n __fish_pkg_subcommand -xa add        -d "Install package file"
-complete -c pkg -n __fish_pkg_subcommand -xa annotate   -d "Modify annotations on packages"
-complete -c pkg -n __fish_pkg_subcommand -xa audit      -d "Audit installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa add -d "Install package file"
+complete -c pkg -n __fish_pkg_subcommand -xa annotate -d "Modify annotations on packages"
+complete -c pkg -n __fish_pkg_subcommand -xa audit -d "Audit installed packages"
 complete -c pkg -n __fish_pkg_subcommand -xa autoremove -d "Delete unneeded packages"
-complete -c pkg -n __fish_pkg_subcommand -xa backup     -d "Dump package database"
-complete -c pkg -n __fish_pkg_subcommand -xa check      -d "Check installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa clean      -d "Clean local cache"
-complete -c pkg -n __fish_pkg_subcommand -xa convert    -d "Convert package from pkg_add format"
-complete -c pkg -n __fish_pkg_subcommand -xa create     -d "Create a package"
-complete -c pkg -n __fish_pkg_subcommand -xa delete     -d "Remove a package"
-complete -c pkg -n __fish_pkg_subcommand -xa fetch      -d "Download a remote package"
-complete -c pkg -n __fish_pkg_subcommand -xa help       -d "Display help for command"
-complete -c pkg -n __fish_pkg_subcommand -xa info       -d "List installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa install    -d "Install packages"
-complete -c pkg -n __fish_pkg_subcommand -xa list       -d "List files belonging to package(s)"
-complete -c pkg -n __fish_pkg_subcommand -xa lock       -d "Prevent package modification"
-complete -c pkg -n __fish_pkg_subcommand -xa plugins    -d "List package manager plugins"
-complete -c pkg -n __fish_pkg_subcommand -xa query      -d "Query installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa register   -d "Register a package in a database"
-complete -c pkg -n __fish_pkg_subcommand -xa remove     -d "Remove a package"
-complete -c pkg -n __fish_pkg_subcommand -xa repo       -d "Create package repository"
-complete -c pkg -n __fish_pkg_subcommand -xa rquery     -d "Query information for remote repositories"
-complete -c pkg -n __fish_pkg_subcommand -xa search     -d "Find packages"
-complete -c pkg -n __fish_pkg_subcommand -xa set        -d "Modify package information in database"
-complete -c pkg -n __fish_pkg_subcommand -xa shell      -d "Open a SQLite shell"
-complete -c pkg -n __fish_pkg_subcommand -xa shlib      -d "Display packages linking to shared library"
-complete -c pkg -n __fish_pkg_subcommand -xa show       -d "Show information about package(s)"
-complete -c pkg -n __fish_pkg_subcommand -xa stats      -d "Display package statistics"
-complete -c pkg -n __fish_pkg_subcommand -xa unlock     -d "Stop preventing package modification"
-complete -c pkg -n __fish_pkg_subcommand -xa update     -d "Update remote repositories"
-complete -c pkg -n __fish_pkg_subcommand -xa updating   -d "Display UPDATING entries"
-complete -c pkg -n __fish_pkg_subcommand -xa upgrade    -d "Upgrade packages"
-complete -c pkg -n __fish_pkg_subcommand -xa version    -d "Show package versions"
-complete -c pkg -n __fish_pkg_subcommand -xa which      -d "Check which package provides a file"
+complete -c pkg -n __fish_pkg_subcommand -xa backup -d "Dump package database"
+complete -c pkg -n __fish_pkg_subcommand -xa check -d "Check installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa clean -d "Clean local cache"
+complete -c pkg -n __fish_pkg_subcommand -xa convert -d "Convert package from pkg_add format"
+complete -c pkg -n __fish_pkg_subcommand -xa create -d "Create a package"
+complete -c pkg -n __fish_pkg_subcommand -xa delete -d "Remove a package"
+complete -c pkg -n __fish_pkg_subcommand -xa fetch -d "Download a remote package"
+complete -c pkg -n __fish_pkg_subcommand -xa help -d "Display help for command"
+complete -c pkg -n __fish_pkg_subcommand -xa info -d "List installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa install -d "Install packages"
+complete -c pkg -n __fish_pkg_subcommand -xa list -d "List files belonging to package(s)"
+complete -c pkg -n __fish_pkg_subcommand -xa lock -d "Prevent package modification"
+complete -c pkg -n __fish_pkg_subcommand -xa plugins -d "List package manager plugins"
+complete -c pkg -n __fish_pkg_subcommand -xa query -d "Query installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa register -d "Register a package in a database"
+complete -c pkg -n __fish_pkg_subcommand -xa remove -d "Remove a package"
+complete -c pkg -n __fish_pkg_subcommand -xa repo -d "Create package repository"
+complete -c pkg -n __fish_pkg_subcommand -xa rquery -d "Query information for remote repositories"
+complete -c pkg -n __fish_pkg_subcommand -xa search -d "Find packages"
+complete -c pkg -n __fish_pkg_subcommand -xa set -d "Modify package information in database"
+complete -c pkg -n __fish_pkg_subcommand -xa shell -d "Open a SQLite shell"
+complete -c pkg -n __fish_pkg_subcommand -xa shlib -d "Display packages linking to shared library"
+complete -c pkg -n __fish_pkg_subcommand -xa show -d "Show information about package(s)"
+complete -c pkg -n __fish_pkg_subcommand -xa stats -d "Display package statistics"
+complete -c pkg -n __fish_pkg_subcommand -xa unlock -d "Stop preventing package modification"
+complete -c pkg -n __fish_pkg_subcommand -xa update -d "Update remote repositories"
+complete -c pkg -n __fish_pkg_subcommand -xa updating -d "Display UPDATING entries"
+complete -c pkg -n __fish_pkg_subcommand -xa upgrade -d "Upgrade packages"
+complete -c pkg -n __fish_pkg_subcommand -xa version -d "Show package versions"
+complete -c pkg -n __fish_pkg_subcommand -xa which -d "Check which package provides a file"
 
 # add
 complete -c pkg -n '__fish_pkg_is add install' -s A -l automatic -d "Mark packages as automatic"
diff --git a/share/completions/pkgfile.fish b/share/completions/pkgfile.fish
index dae11771a..0f993e190 100644
--- a/share/completions/pkgfile.fish
+++ b/share/completions/pkgfile.fish
@@ -1,12 +1,12 @@
-complete -c pkgfile -l version         -d 'show program\'s version number and exit'
-complete -c pkgfile -s h -l help       -d 'show this help message and exit'
-complete -c pkgfile -s b -l binaries   -d 'only show files in a {s}bin/ directory. Works with -s, -l'
-complete -c pkgfile -s c -l case-sensitive  -d 'make searches case sensitive'
-complete -c pkgfile -s g -l glob       -d 'allow the use of * and ? as wildcards'
-complete -c pkgfile -s r -l regex      -d 'allow the use of regex in searches'
-complete -c pkgfile -s R -l repo       -d 'search only in the specified repository' -xa '(__fish_print_pacman_repos)'
-complete -c pkgfile -s v -l verbose    -d 'enable verbose output'
-complete -c pkgfile -s i -l info       -d 'provides information about the package owning a file' -r
-complete -c pkgfile -s l -l list       -d 'list files of a given package; similar to "pacman -Ql"' -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
-complete -c pkgfile -s s -l search     -d 'search which package owns a file' -r
-complete -c pkgfile -s u -l update     -d 'update to the latest filelist. This requires write permission to /var/cache/pkgtools/lists'
+complete -c pkgfile -l version -d 'show program\'s version number and exit'
+complete -c pkgfile -s h -l help -d 'show this help message and exit'
+complete -c pkgfile -s b -l binaries -d 'only show files in a {s}bin/ directory. Works with -s, -l'
+complete -c pkgfile -s c -l case-sensitive -d 'make searches case sensitive'
+complete -c pkgfile -s g -l glob -d 'allow the use of * and ? as wildcards'
+complete -c pkgfile -s r -l regex -d 'allow the use of regex in searches'
+complete -c pkgfile -s R -l repo -d 'search only in the specified repository' -xa '(__fish_print_pacman_repos)'
+complete -c pkgfile -s v -l verbose -d 'enable verbose output'
+complete -c pkgfile -s i -l info -d 'provides information about the package owning a file' -r
+complete -c pkgfile -s l -l list -d 'list files of a given package; similar to "pacman -Ql"' -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
+complete -c pkgfile -s s -l search -d 'search which package owns a file' -r
+complete -c pkgfile -s u -l update -d 'update to the latest filelist. This requires write permission to /var/cache/pkgtools/lists'
diff --git a/share/completions/port.fish b/share/completions/port.fish
index 344335b02..18f0f8ddc 100644
--- a/share/completions/port.fish
+++ b/share/completions/port.fish
@@ -1,77 +1,77 @@
 #completion for port
 
 set -l subcommands activate archive build cat cd checksum clean configure \
-		contents deactivate dependents deps destroot dir distcheck dmg echo \
-		edit extract fetch file gohome info install installed lint list \
-		livecheck location load log logfile mirror mdmg mpkg notes outdated \
-		patch pkg provides rdependents rdeps reload rev search select \
-		selfupdate setrequested setunrequested sync test unarchive uninstall \
-		unload unsetrequested upgrade url usage variants version work
+    contents deactivate dependents deps destroot dir distcheck dmg echo \
+    edit extract fetch file gohome info install installed lint list \
+    livecheck location load log logfile mirror mdmg mpkg notes outdated \
+    patch pkg provides rdependents rdeps reload rev search select \
+    selfupdate setrequested setunrequested sync test unarchive uninstall \
+    unload unsetrequested upgrade url usage variants version work
 
 complete -c port -n "__fish_seen_subcommand_from $subcommands" -a '(__fish_print_packages)' --description 'Package'
 
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'activate'  --description 'Set  version of a port to active'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'archive'  --description "Create image for port without installing"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'build'  --description 'Run build phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cat'  --description 'Print the Portfile of the given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cd'  --description 'Change directory to that containing portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'checksum'  --description 'Compute checksums of distribution files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'clean'  --description 'Remove temporary files used to build a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'configure'  --description 'Run configure phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'contents'  --description 'List the files installed by a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deactivate'  --description 'Set the status of a port to inactive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dependents'  --description 'List ports that depend on a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deps'  --description 'Display a dependency listing for given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'destroot'  --description 'Run destroot phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dir'  --description 'print directory with Portfile for port expression'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'distcheck'  --description 'Check if port can be fetched from all mirrors'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dmg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'echo'  --description 'Print the list of ports the argument expands to'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'edit'  --description 'Open the Portfile in an editor'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'extract'  --description 'Run extract phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'fetch'  --description 'Run fetch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'file'  --description 'Display the path to the Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'help'  --description 'Get help on MacPorts commands'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'gohome'  --description 'Load home page for given portname in web browser'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'info'  --description 'Return information about the given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'install'  --description 'Install a new port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'installed'  --description 'List installed versions (of port)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'lint'  --description 'Verifies Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'list'  --description 'List latest available version for given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'livecheck'  --description 'Check if new version of software is available'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'location'  --description 'Print location of archive used for (de)activation'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'load'  --description "load a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'log'  --description 'Parse and show log files for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'logfile'  --description 'Display the path to the log file for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mirror'  --description 'Create/update local mirror of distfiles'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mdmg'  --description 'Create disk image of portname and dependencies'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mpkg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'notes'  --description 'Displays notes for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'outdated'  --description 'List outdated ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'patch'  --description 'Run patch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'pkg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'provides'  --description 'Find the port that installed a file'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdependents'  --description 'Recursively list ports depending on given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdeps'  --description 'Display a recursive dependency listing of port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'reload'  --description "reload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rev-upgrade'  --description 'Rebuild ports containing broken binaries'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'search'  --description 'Search for a port using keywords'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'select'  --description 'Selects a version to be the default'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'selfupdate'  --description 'Upgrade MacPorts and update list of ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setrequested'  --description 'Mark portname as requested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setunrequested'  --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'sync'  --description 'Update the port definition files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'test'  --description 'Run test phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unarchive'  --description 'Extract destroot of given ports from archive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'uninstall'  --description 'Remove a previously installed port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unload'  --description "Unload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unsetrequested'  --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'upgrade'  --description 'Upgrade a port to the latest version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'url'  --description 'Display URL for path of given portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'usage'  --description 'Displays a condensed usage summary'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'variants'  --description 'Print list of variants with descriptions'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'version'  --description 'Print the MacPorts version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'work'  --description 'Displays path to work directory for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'activate' --description 'Set  version of a port to active'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'archive' --description "Create image for port without installing"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'build' --description 'Run build phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cat' --description 'Print the Portfile of the given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cd' --description 'Change directory to that containing portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'checksum' --description 'Compute checksums of distribution files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'clean' --description 'Remove temporary files used to build a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'configure' --description 'Run configure phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'contents' --description 'List the files installed by a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deactivate' --description 'Set the status of a port to inactive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dependents' --description 'List ports that depend on a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deps' --description 'Display a dependency listing for given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'destroot' --description 'Run destroot phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dir' --description 'print directory with Portfile for port expression'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'distcheck' --description 'Check if port can be fetched from all mirrors'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dmg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'echo' --description 'Print the list of ports the argument expands to'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'edit' --description 'Open the Portfile in an editor'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'extract' --description 'Run extract phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'fetch' --description 'Run fetch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'file' --description 'Display the path to the Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'help' --description 'Get help on MacPorts commands'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'gohome' --description 'Load home page for given portname in web browser'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'info' --description 'Return information about the given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'install' --description 'Install a new port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'installed' --description 'List installed versions (of port)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'lint' --description 'Verifies Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'list' --description 'List latest available version for given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'livecheck' --description 'Check if new version of software is available'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'location' --description 'Print location of archive used for (de)activation'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'load' --description "load a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'log' --description 'Parse and show log files for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'logfile' --description 'Display the path to the log file for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mirror' --description 'Create/update local mirror of distfiles'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mdmg' --description 'Create disk image of portname and dependencies'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mpkg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'notes' --description 'Displays notes for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'outdated' --description 'List outdated ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'patch' --description 'Run patch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'pkg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'provides' --description 'Find the port that installed a file'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdependents' --description 'Recursively list ports depending on given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdeps' --description 'Display a recursive dependency listing of port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'reload' --description "reload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rev-upgrade' --description 'Rebuild ports containing broken binaries'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'search' --description 'Search for a port using keywords'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'select' --description 'Selects a version to be the default'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'selfupdate' --description 'Upgrade MacPorts and update list of ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setrequested' --description 'Mark portname as requested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setunrequested' --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'sync' --description 'Update the port definition files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'test' --description 'Run test phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unarchive' --description 'Extract destroot of given ports from archive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'uninstall' --description 'Remove a previously installed port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unload' --description "Unload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unsetrequested' --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'upgrade' --description 'Upgrade a port to the latest version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'url' --description 'Display URL for path of given portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'usage' --description 'Displays a condensed usage summary'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'variants' --description 'Print list of variants with descriptions'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'version' --description 'Print the MacPorts version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'work' --description 'Displays path to work directory for portname'
 
 complete -c port -s v --description 'Verbose mode, generates verbose messages'
 complete -c port -s d --description 'Debug mode, implies -v'
diff --git a/share/completions/psql.fish b/share/completions/psql.fish
index e5b6b4656..734fc759b 100644
--- a/share/completions/psql.fish
+++ b/share/completions/psql.fish
@@ -14,45 +14,45 @@ complete -c psql --no-files -a '(__fish_complete_pg_database)'
 # General options:
 #
 
-complete -c psql -s d -l dbname -a '(__fish_complete_pg_database)'      -d "database name to connect to"
-complete -c psql -s c -l command        -d "run only single command (SQL or internal) and exit"
-complete -c psql -s f -l file -r        -d "execute commands from file, then exit"
-complete -c psql -s l -l list           -d "list available databases, then exit"
+complete -c psql -s d -l dbname -a '(__fish_complete_pg_database)' -d "database name to connect to"
+complete -c psql -s c -l command -d "run only single command (SQL or internal) and exit"
+complete -c psql -s f -l file -r -d "execute commands from file, then exit"
+complete -c psql -s l -l list -d "list available databases, then exit"
 
 # complete -c psql -s v -l set=, --variable=NAME=VALUE
 #                                           set psql variable NAME to VALUE
 
-complete -c psql -s X -l no-psqlrc          -d "do not read startup file (~/.psqlrc)"
+complete -c psql -s X -l no-psqlrc -d "do not read startup file (~/.psqlrc)"
 complete -c psql -s 1 -l single-transaction -d "execute command file as a single transaction"
-complete -c psql -l help                    -d "show this help, then exit"
-complete -c psql -l version                 -d "output version information, then exit"
+complete -c psql -l help -d "show this help, then exit"
+complete -c psql -l version -d "output version information, then exit"
 
 #
 #   Input and output options:
 #
 
-complete -c psql -s a, -l echo-all           -d "echo all input from script"
-complete -c psql -s e, -l echo-queries       -d "echo commands sent to server"
-complete -c psql -s E, -l echo-hidden        -d "display queries that internal commands generate"
-complete -c psql -s L, -l log-file           -d "send session log to file"
-complete -c psql -s n, -l no-readline        -d "disable enhanced command line editing (readline)"
-complete -c psql -s o, -l output             -d "send query results to file (or |pipe)"
-complete -c psql -s q, -l quiet              -d "run quietly (no messages, only query output)"
-complete -c psql -s s, -l single-step        -d "single-step mode (confirm each query)"
-complete -c psql -s S, -l single-line        -d "single-line mode (end of line terminates SQL command)"
+complete -c psql -s a, -l echo-all -d "echo all input from script"
+complete -c psql -s e, -l echo-queries -d "echo commands sent to server"
+complete -c psql -s E, -l echo-hidden -d "display queries that internal commands generate"
+complete -c psql -s L, -l log-file -d "send session log to file"
+complete -c psql -s n, -l no-readline -d "disable enhanced command line editing (readline)"
+complete -c psql -s o, -l output -d "send query results to file (or |pipe)"
+complete -c psql -s q, -l quiet -d "run quietly (no messages, only query output)"
+complete -c psql -s s, -l single-step -d "single-step mode (confirm each query)"
+complete -c psql -s S, -l single-line -d "single-line mode (end of line terminates SQL command)"
 
 #
 #   Output format options:
 #
 
-complete -c psql -s A, -l no-align          -d "unaligned table output mode"
-complete -c psql -s H, -l html              -d "HTML table output mode"
-complete -c psql -s P, -l pset              -d "set printing option VAR to ARG (see \pset command)"
-complete -c psql -s t, -l tuples-only       -d "print rows only"
-complete -c psql -s T, -l table-attr        -d "set HTML table tag attributes (e.g., width, border)"
-complete -c psql -s x, -l expanded          -d "turn on expanded table output"
-complete -c psql -s F, -l field-separator   -d "set field separator (default: '|')"
-complete -c psql -s R, -l record-separator  -d "set record separator (default: newline)"
+complete -c psql -s A, -l no-align -d "unaligned table output mode"
+complete -c psql -s H, -l html -d "HTML table output mode"
+complete -c psql -s P, -l pset -d "set printing option VAR to ARG (see \pset command)"
+complete -c psql -s t, -l tuples-only -d "print rows only"
+complete -c psql -s T, -l table-attr -d "set HTML table tag attributes (e.g., width, border)"
+complete -c psql -s x, -l expanded -d "turn on expanded table output"
+complete -c psql -s F, -l field-separator -d "set field separator (default: '|')"
+complete -c psql -s R, -l record-separator -d "set record separator (default: newline)"
 
 
 #
diff --git a/share/completions/pushd.fish b/share/completions/pushd.fish
index d38dc298c..8694f5df9 100644
--- a/share/completions/pushd.fish
+++ b/share/completions/pushd.fish
@@ -1,5 +1,5 @@
 function __fish_complete_pushd_plus
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # print each member of the stack, replace $HOME with ~
         for i in (seq (count $dirstack))
             printf "+%s\t%s\n" $i "Rotate to "(string replace -r "^$HOME" "~" -- $dirstack[$i])
@@ -8,9 +8,9 @@ function __fish_complete_pushd_plus
 end
 
 function __fish_complete_pushd_minus
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # print each member of the stack, replace $HOME with ~
-		# Negative arguments are expected to start at "-0"
+        # Negative arguments are expected to start at "-0"
         for i in (seq (count $dirstack) -1 1)
             printf "%s\t%s\n" -(math $i - 1) "Rotate to "(string replace -r "^$HOME" "~" -- $dirstack[(math -$i)])
         end
@@ -18,7 +18,7 @@ function __fish_complete_pushd_minus
 end
 
 function __fish_complete_pushd_swap
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # replace $HOME with ~
         printf "\t%s\n" "Swap with "(string replace -r "^$HOME" "~" -- $dirstack[1])
     end
diff --git a/share/completions/pydf.fish b/share/completions/pydf.fish
index 69d2a3157..2fd44331e 100644
--- a/share/completions/pydf.fish
+++ b/share/completions/pydf.fish
@@ -1,18 +1,18 @@
 
 complete -c pydf -r -d 'Report colourised filesystem disk space usage'
-complete -c pydf -l help               -d 'show this help message'
-complete -c pydf -s v -l version         -d 'show version'
-complete -c pydf -s a -l all             -d 'include filesystems having 0 blocks'
-complete -c pydf -s h -l human-readable  -d 'print sizes in human readable format (e.g., 1K 234M 2G)'
-complete -c pydf -s H -l si              -d 'likewise, but use powers of 1000 not 1024'
-complete -c pydf -s b -l block-size -x  -d 'use BLOCKSIZE-byte blocks'
-complete -c pydf -s l -l local           -d 'limit listing to local filesystems'
-complete -c pydf -s k -l kilobytes       -d 'like --block-size=1024'
-complete -c pydf -s m -l megabytes       -d 'like --block-size=1048576'
-complete -c pydf -s g -l gigabytes       -d 'like --block-size=1073741824'
-complete -c pydf -l blocks             -d 'use filesystem native block size'
-complete -c pydf -l bw                 -d 'do not use colours'
-complete -c pydf -l mounts -r          -d 'file to get mount information from. On normal Linux systems only /etc/mtab or /proc/mounts make sense. Some other Unices use /etc/mnttab. Use /proc/mounts when /etc/mtab is corrupted or inaccessible (the output looks a bit weird in this case).'
-complete -c pydf -s B -l show-binds      -d 'show \'mount --bind\' mounts'
-complete -c pydf -s i -l inodes          -d 'show inode instead of block usage'
+complete -c pydf -l help -d 'show this help message'
+complete -c pydf -s v -l version -d 'show version'
+complete -c pydf -s a -l all -d 'include filesystems having 0 blocks'
+complete -c pydf -s h -l human-readable -d 'print sizes in human readable format (e.g., 1K 234M 2G)'
+complete -c pydf -s H -l si -d 'likewise, but use powers of 1000 not 1024'
+complete -c pydf -s b -l block-size -x -d 'use BLOCKSIZE-byte blocks'
+complete -c pydf -s l -l local -d 'limit listing to local filesystems'
+complete -c pydf -s k -l kilobytes -d 'like --block-size=1024'
+complete -c pydf -s m -l megabytes -d 'like --block-size=1048576'
+complete -c pydf -s g -l gigabytes -d 'like --block-size=1073741824'
+complete -c pydf -l blocks -d 'use filesystem native block size'
+complete -c pydf -l bw -d 'do not use colours'
+complete -c pydf -l mounts -r -d 'file to get mount information from. On normal Linux systems only /etc/mtab or /proc/mounts make sense. Some other Unices use /etc/mnttab. Use /proc/mounts when /etc/mtab is corrupted or inaccessible (the output looks a bit weird in this case).'
+complete -c pydf -s B -l show-binds -d 'show \'mount --bind\' mounts'
+complete -c pydf -s i -l inodes -d 'show inode instead of block usage'
 
diff --git a/share/completions/python.fish b/share/completions/python.fish
index dfd127a2e..4a01a0cda 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -25,5 +25,5 @@ complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s2"' -s t -d "Warn
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s2"' -s Q -x -a "old new warn warnall" -d "Division control"
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s q -d 'Don\'t print version and copyright messages on interactive startup'
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s X -x -d 'Set implementation-specific option'
-complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
+complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -o bb -d 'Issue errors'
diff --git a/share/completions/python3.fish b/share/completions/python3.fish
index ea6cf259b..2113bd0dd 100644
--- a/share/completions/python3.fish
+++ b/share/completions/python3.fish
@@ -17,7 +17,7 @@ complete -c python3 -n '__fish_is_first_token' -fa "(__fish_complete_suffix .py)
 complete -c python3 -f -n '__fish_is_first_token' -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'
-complete -c python3 -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
+complete -c python3 -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
 complete -c python3 -o bb -d 'Issue errors'
 complete -c python3 -s m -d 'Run library module as a script (terminates option list)' -xa '(python3 -c "import pkgutil; print(\'\n\'.join([p[1] for p in pkgutil.iter_modules()]))")'
 
diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish
index 6bf353cca..7607d0da6 100644
--- a/share/completions/quilt.fish
+++ b/share/completions/quilt.fish
@@ -21,7 +21,7 @@ complete -c quilt -a mail -r -d "Create  mail  messages  from all patches in the
 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 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 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"
diff --git a/share/completions/rbenv.fish b/share/completions/rbenv.fish
index bfec90c41..dec9fd175 100644
--- a/share/completions/rbenv.fish
+++ b/share/completions/rbenv.fish
@@ -1,44 +1,44 @@
 # fish completion for rbenv
 
 function __fish_rbenv_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_rbenv_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_rbenv_executables
-  rbenv exec --complete
+    rbenv exec --complete
 end
 
 function __fish_rbenv_installed_rubies
-  rbenv versions --bare
+    rbenv versions --bare
 end
 
 function __fish_rbenv_official_rubies
-	if command -sq ruby-build
-		ruby-build --definitions
-	else
-		# Remove trailing spaces, otherwise completion options appear like
-		# "\ \ option"
-		rbenv install --list | sed "s/^[[:space:]]*//"
-	end
+    if command -sq ruby-build
+        ruby-build --definitions
+    else
+        # Remove trailing spaces, otherwise completion options appear like
+        # "\ \ option"
+        rbenv install --list | sed "s/^[[:space:]]*//"
+    end
 end
 
 function __fish_rbenv_prefixes
-  rbenv prefix --complete
+    rbenv prefix --complete
 end
 
 ### commands
@@ -92,7 +92,7 @@ complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shims
 complete -f -c rbenv -n '__fish_rbenv_using_command shims' -a '--short'
 
 ### version
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version  -d 'Show the current Ruby version'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version -d 'Show the current Ruby version'
 
 ### version-file
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file
diff --git a/share/completions/readlink.fish b/share/completions/readlink.fish
index c644e8f3c..68f4776d7 100644
--- a/share/completions/readlink.fish
+++ b/share/completions/readlink.fish
@@ -1,9 +1,9 @@
 
-complete -c readlink -s f -l canonicalize          -d 'Canonicalize, follow symlinks, last can be missing'
+complete -c readlink -s f -l canonicalize -d 'Canonicalize, follow symlinks, last can be missing'
 complete -c readlink -s e -l canonicalize-existing -d 'Canonicalize, follow symlinks, none can be missing'
-complete -c readlink -s m -l canonicalize-missing  -d 'Canonicalize, follow symlinks, all can be missing'
-complete -c readlink -s n -l no-newline            -d 'Do not output the trailing newline'
-complete -c readlink -s q -l quiet -s s -l silent  -d 'Suppress most error messages'
-complete -c readlink -s v -l verbose               -d 'Report error messages'
-complete -c readlink      -l help                  -d 'Display this help and exit'
-complete -c readlink      -l version               -d 'Output version information and exit'
+complete -c readlink -s m -l canonicalize-missing -d 'Canonicalize, follow symlinks, all can be missing'
+complete -c readlink -s n -l no-newline -d 'Do not output the trailing newline'
+complete -c readlink -s q -l quiet -s s -l silent -d 'Suppress most error messages'
+complete -c readlink -s v -l verbose -d 'Report error messages'
+complete -c readlink -l help -d 'Display this help and exit'
+complete -c readlink -l version -d 'Output version information and exit'
diff --git a/share/completions/realpath.fish b/share/completions/realpath.fish
index bad7d417d..944683886 100644
--- a/share/completions/realpath.fish
+++ b/share/completions/realpath.fish
@@ -1,11 +1,11 @@
-complete -c realpath -s e -l canonicalize-existing  -d 'all components of the path must exist'
-complete -c realpath -s m -l canonicalize-missing   -d 'no components of the path need exist'
-complete -c realpath -s L -l logical                -d 'resolve \'..\' components before symlinks'
-complete -c realpath -s P -l physical               -d 'resolve symlinks as encountered (default)'
-complete -c realpath -s q -l quiet                  -d 'suppress most error messages'
-complete -c realpath -l relative-to -r              -d 'print the resolved path relative to FILE'
-complete -c realpath -l relative-base -r            -d 'print absolute paths unless paths below FILE'
-complete -c realpath -s s -l strip -l no-symlinks   -d 'don\'t expand symlinks'
-complete -c realpath -s z -l zero                   -d 'separate output with NUL rather than newline'
-complete -c realpath -l help     -d 'display this help and exit'
-complete -c realpath -l version  -d 'output version information and exit'
+complete -c realpath -s e -l canonicalize-existing -d 'all components of the path must exist'
+complete -c realpath -s m -l canonicalize-missing -d 'no components of the path need exist'
+complete -c realpath -s L -l logical -d 'resolve \'..\' components before symlinks'
+complete -c realpath -s P -l physical -d 'resolve symlinks as encountered (default)'
+complete -c realpath -s q -l quiet -d 'suppress most error messages'
+complete -c realpath -l relative-to -r -d 'print the resolved path relative to FILE'
+complete -c realpath -l relative-base -r -d 'print absolute paths unless paths below FILE'
+complete -c realpath -s s -l strip -l no-symlinks -d 'don\'t expand symlinks'
+complete -c realpath -s z -l zero -d 'separate output with NUL rather than newline'
+complete -c realpath -l help -d 'display this help and exit'
+complete -c realpath -l version -d 'output version information and exit'
diff --git a/share/completions/rm.fish b/share/completions/rm.fish
index 5ca66833d..9a32bd434 100644
--- a/share/completions/rm.fish
+++ b/share/completions/rm.fish
@@ -1,38 +1,38 @@
 #Completions for rm
 if rm --version >/dev/null 2>/dev/null # GNU
-	complete -c rm -s d -l directory -d "Unlink directories"
-	complete -c rm -s f -l force -d "Never prompt for removal"
-	complete -c rm -s i -l interactive -d "Prompt for removal"
-	complete -c rm -s I -d "Prompt to remove >3 files"
-	complete -c rm -s r -l recursive -d "Recursively remove subdirs"
-	complete -c rm -s R -d "Recursively remove subdirs"
-	complete -c rm -s v -l verbose -d "Explain what is done"
-	complete -c rm -s h -l help -d "Display help"
-	complete -c rm -l version -d "Display rm version"
+    complete -c rm -s d -l directory -d "Unlink directories"
+    complete -c rm -s f -l force -d "Never prompt for removal"
+    complete -c rm -s i -l interactive -d "Prompt for removal"
+    complete -c rm -s I -d "Prompt to remove >3 files"
+    complete -c rm -s r -l recursive -d "Recursively remove subdirs"
+    complete -c rm -s R -d "Recursively remove subdirs"
+    complete -c rm -s v -l verbose -d "Explain what is done"
+    complete -c rm -s h -l help -d "Display help"
+    complete -c rm -l version -d "Display rm version"
 else
-	set -l uname (uname -s)
-	# solaris:   rm [-fi        ] file ...
-	# openbsd:   rm [-fidPRrv   ] file ...
-	# macos:     rm [-fidPRrvW  ] file ...
-	# netbsd:    rm [-fidPRrvWx ] file ...
-	# freebsd:   rm [-fidPRrvWxI] file ...
-	# dragonfly: rm [-fidPRrvWxI] file ... 
+    set -l uname (uname -s)
+    # solaris:   rm [-fi        ] file ...
+    # openbsd:   rm [-fidPRrv   ] file ...
+    # macos:     rm [-fidPRrvW  ] file ...
+    # netbsd:    rm [-fidPRrvWx ] file ...
+    # freebsd:   rm [-fidPRrvWxI] file ...
+    # dragonfly: rm [-fidPRrvWxI] file ... 
 
-	complete -c rm -s f -d "Never prompt for removal"
-	complete -c rm -s i -d "Prompt for removal"
-	test "$uname" = SunOS
-		and exit 0
-	complete -c rm -s d -d "Remove directories as well"
-	complete -c rm -s P -d "Overwrite before removal"
-	complete -c rm -s R -s r -d "Recursively remove subdirs"
-	complete -c rm -s v -d "Explain what is done"
-	test "$uname" = OpenBSD
-		and exit 0
-	complete -c rm -s W -d "Undelete given filenames"
-	test "$uname" = Darwin
-		and exit 0
-	complete -c rm -s x -d "Don't traverse mount points"
-	test "$uname" = NetBSD
-		and exit 0
-	complete -c rm -s I -d "Prompt to remove >=3 files"
+    complete -c rm -s f -d "Never prompt for removal"
+    complete -c rm -s i -d "Prompt for removal"
+    test "$uname" = SunOS
+    and exit 0
+    complete -c rm -s d -d "Remove directories as well"
+    complete -c rm -s P -d "Overwrite before removal"
+    complete -c rm -s R -s r -d "Recursively remove subdirs"
+    complete -c rm -s v -d "Explain what is done"
+    test "$uname" = OpenBSD
+    and exit 0
+    complete -c rm -s W -d "Undelete given filenames"
+    test "$uname" = Darwin
+    and exit 0
+    complete -c rm -s x -d "Don't traverse mount points"
+    test "$uname" = NetBSD
+    and exit 0
+    complete -c rm -s I -d "Prompt to remove >=3 files"
 end
diff --git a/share/completions/rmmod.fish b/share/completions/rmmod.fish
index 3f6dff165..4f03e9890 100644
--- a/share/completions/rmmod.fish
+++ b/share/completions/rmmod.fish
@@ -1,8 +1,8 @@
 # rmmod completion
 complete -c rmmod -x -a "(/sbin/lsmod | awk 'NR > 1 {print \$1}')"
 
-complete -c rmmod -s h -l help    -d "Prints the help text."
-complete -c rmmod -s s -l syslog  -d "Send errors to syslog instead of standard error."
+complete -c rmmod -s h -l help -d "Prints the help text."
+complete -c rmmod -s s -l syslog -d "Send errors to syslog instead of standard error."
 complete -c rmmod -s v -l verbose -d "Print messages about what the program is doing."
 complete -c rmmod -s V -l version -d "Show version of program and exit"
-complete -c rmmod -s f -l force   -d "With this option, you can remove modules which are being used, or which are not designed to be removed, or have been marked as unsafe"
+complete -c rmmod -s f -l force -d "With this option, you can remove modules which are being used, or which are not designed to be removed, or have been marked as unsafe"
diff --git a/share/completions/ruby-build.fish b/share/completions/ruby-build.fish
index 2489a09f1..f596dc693 100644
--- a/share/completions/ruby-build.fish
+++ b/share/completions/ruby-build.fish
@@ -1,13 +1,13 @@
 function __fish_ruby-build_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_ruby-build_definitions
-  ruby-build --definitions
+    ruby-build --definitions
 end
 
 complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -a '(__fish_ruby-build_definitions)' -d 'Definition'
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 7e8cd06ff..545576e0e 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -1,11 +1,11 @@
 # s3cmd
 
 function __s3cmd_is_remote_path
-	commandline -pct | string match -q -r -- "^s3://.*"
+    commandline -pct | string match -q -r -- "^s3://.*"
 end
 
 function __s3cmd_is_valid_remote_path
-	commandline -pct | string match -q -r -- "^s3://.*?/.*"
+    commandline -pct | string match -q -r -- "^s3://.*?/.*"
 end
 
 # Completions to allow for autocomplete of remote paths
diff --git a/share/completions/sbt.fish b/share/completions/sbt.fish
index 5332cfbd0..341700eea 100644
--- a/share/completions/sbt.fish
+++ b/share/completions/sbt.fish
@@ -33,7 +33,7 @@ complete -c sbt -f -a '(string split "\n" "
     and not contains -- "client" (commandline -cpo)'
 
 # These cannot be combined with any other commands and require an argument
-complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'new'    -d 'Create a new sbt project from the given template'
+complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'new' -d 'Create a new sbt project from the given template'
 complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'client' -d 'Connect to a server with an interactive sbt prompt'
 
 
@@ -44,31 +44,31 @@ complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'client' -d 'Conne
 # This is based on the output of `sbt -help`:
 
 # general options without arguments
-complete -c sbt -o help    -s h  -f -d "Print options help message"
-complete -c sbt -o verbose -s v  -f -d "Print more details"
-complete -c sbt -o debug   -s d  -f -d "Set log level to debug"
-complete -c sbt -o no-colors     -f -d "Disable ANSI color codes"
-complete -c sbt -o sbt-create    -f -d "Launch even if there's no sbt project"
-complete -c sbt -o no-share      -f -d "Use all local caches"
-complete -c sbt -o no-global     -f -d "Use global caches, but not global ~/.sbt directory"
-complete -c sbt -o batch         -f -d "Disable interactive mode"
+complete -c sbt -o help -s h -f -d "Print options help message"
+complete -c sbt -o verbose -s v -f -d "Print more details"
+complete -c sbt -o debug -s d -f -d "Set log level to debug"
+complete -c sbt -o no-colors -f -d "Disable ANSI color codes"
+complete -c sbt -o sbt-create -f -d "Launch even if there's no sbt project"
+complete -c sbt -o no-share -f -d "Use all local caches"
+complete -c sbt -o no-global -f -d "Use global caches, but not global ~/.sbt directory"
+complete -c sbt -o batch -f -d "Disable interactive mode"
 
 # general options with arguments
-complete -c sbt -o sbt-dir  -d "Specify path to global settings/plugins"       -r # path
-complete -c sbt -o sbt-boot -d "Specify path to shared boot directory"         -r # path
-complete -c sbt -o ivy      -d "Specify path to local Ivy repository"          -r # path
-complete -c sbt -o mem      -d "Set memory options"                            -x # integer? (default: -Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m)
-complete -c sbt -o port     -d "Turn on JVM debugging, open at the given port" -r # port
+complete -c sbt -o sbt-dir -d "Specify path to global settings/plugins" -r # path
+complete -c sbt -o sbt-boot -d "Specify path to shared boot directory" -r # path
+complete -c sbt -o ivy -d "Specify path to local Ivy repository" -r # path
+complete -c sbt -o mem -d "Set memory options" -x # integer? (default: -Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m)
+complete -c sbt -o port -d "Turn on JVM debugging, open at the given port" -r # port
 
 # sbt version
-complete -c sbt -o sbt-version  -d "Use specified version of sbt"          -x -a '0.13.(seq 0 6)\t"" 1.0.0\t""'
-complete -c sbt -o sbt-jar      -d "Use specified jar as the sbt launcher" -r # jar path
-complete -c sbt -o sbt-rc       -d "Use an RC version of sbt"              -f
-complete -c sbt -o sbt-snapshot -d "Use a snapshot version of sbt"         -f
+complete -c sbt -o sbt-version -d "Use specified version of sbt" -x -a '0.13.(seq 0 6)\t"" 1.0.0\t""'
+complete -c sbt -o sbt-jar -d "Use specified jar as the sbt launcher" -r # jar path
+complete -c sbt -o sbt-rc -d "Use an RC version of sbt" -f
+complete -c sbt -o sbt-snapshot -d "Use a snapshot version of sbt" -f
 
 # java-related
-complete -c sbt -o java-home -d "Alternate JAVA_HOME"                         -r # path
-complete -c sbt -o D         -d "Pass -D option directly to the Java runtime" -x # -Dkey=val
-complete -c sbt -o J-X       -d "Pass -X option directly to the Java runtime" -x # -X*
-complete -c sbt -o S-X       -d "Pass -X option to sbt's scalacOptions"       -x # -X*
+complete -c sbt -o java-home -d "Alternate JAVA_HOME" -r # path
+complete -c sbt -o D -d "Pass -D option directly to the Java runtime" -x # -Dkey=val
+complete -c sbt -o J-X -d "Pass -X option directly to the Java runtime" -x # -X*
+complete -c sbt -o S-X -d "Pass -X option to sbt's scalacOptions" -x # -X*
 # TODO: list available -X options if it's possible to do in an automatic way
diff --git a/share/completions/scanimage.fish b/share/completions/scanimage.fish
index cb65d650a..98f809ce9 100644
--- a/share/completions/scanimage.fish
+++ b/share/completions/scanimage.fish
@@ -25,16 +25,16 @@ complete -c scanimage -s b -l batch -d 'Working in batch mode, FORMAT is \'out%d
 complete -c scanimage -l batch-start -r -d 'Page number to start naming files with'
 complete -c scanimage -l batch-count -r -d 'How many pages to scan in batch mode'
 complete -c scanimage -l batch-increment -r -d 'Increase page number in filename by #'
-complete -c scanimage -l batch-double       -d 'Increment page number by two'
-complete -c scanimage -l batch-prompt       -d 'Ask for pressing a key before scanning a page'
+complete -c scanimage -l batch-double -d 'Increment page number by two'
+complete -c scanimage -l batch-prompt -d 'Ask for pressing a key before scanning a page'
 
-complete -c scanimage -l accept-md5-only    -d 'Only accept authorization requests using md5'
-complete -c scanimage -s p -l progress      -d 'Print progress messages'
-complete -c scanimage -s n -l dont-scan     -d 'Only set options, don\'t actually scan'
-complete -c scanimage -s T -l test          -d 'Test backend thoroughly'
-complete -c scanimage -s A -l all-options   -d 'List all available backend options'
-complete -c scanimage -s h -l help          -d 'Display this help message and exit'
-complete -c scanimage -s v -l verbose       -d 'Give even more status messages'
+complete -c scanimage -l accept-md5-only -d 'Only accept authorization requests using md5'
+complete -c scanimage -s p -l progress -d 'Print progress messages'
+complete -c scanimage -s n -l dont-scan -d 'Only set options, don\'t actually scan'
+complete -c scanimage -s T -l test -d 'Test backend thoroughly'
+complete -c scanimage -s A -l all-options -d 'List all available backend options'
+complete -c scanimage -s h -l help -d 'Display this help message and exit'
+complete -c scanimage -s v -l verbose -d 'Give even more status messages'
 complete -c scanimage -s B -l buffer-size -r -d 'Change input buffer size (in kB, default 32)'
-complete -c scanimage -s V -l version       -d 'Print version information'
+complete -c scanimage -s V -l version -d 'Print version information'
 
diff --git a/share/completions/screen.fish b/share/completions/screen.fish
index bf968b1bc..392ec44ea 100644
--- a/share/completions/screen.fish
+++ b/share/completions/screen.fish
@@ -6,7 +6,7 @@ function __fish_detect_screen_socket_dir -d "Detect which folder screen uses"
 end
 
 function __fish_complete_screen_general_list_mac -d "Get the socket list on mac"
-    pushd $__fish_screen_socket_dir > /dev/null
+    pushd $__fish_screen_socket_dir >/dev/null
     set -l sockets (ls)
     if test (count $sockets) -ne 0
         switch $argv
@@ -16,7 +16,7 @@ function __fish_complete_screen_general_list_mac -d "Get the socket list on mac"
                 stat -f "%Lp %SB %N" -t "%D %T" $sockets | string match -r '^7\d{2} .*$' | string replace -r '^7\d{2} (\S+ \S+) (\S+)' '$2\t$1 Attached'
         end
     end
-    popd > /dev/null
+    popd >/dev/null
 end
 
 function __fish_complete_screen_general_list -d "Get the socket list"
diff --git a/share/completions/scss.fish b/share/completions/scss.fish
index f0d8f9ed9..0b8765693 100644
--- a/share/completions/scss.fish
+++ b/share/completions/scss.fish
@@ -45,7 +45,7 @@ complete -c scss -l sass -d "Use the indented Sass syntax."
 #                                        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 \
-"auto\t'(default) relative paths where possible, file URIs elsewhere'
+    "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'"
diff --git a/share/completions/sed.fish b/share/completions/sed.fish
index e4dd44c9c..732d01b47 100644
--- a/share/completions/sed.fish
+++ b/share/completions/sed.fish
@@ -16,23 +16,23 @@ __fish_gnu_complete -c sed -s i -l in-place -d "Edit files in place" $is_gnu
 
 if test -n "$is_gnu"
 
-	# GNU specific features
+    # GNU specific features
 
-	complete -c sed -l silent -d "Silent mode"
-	complete -c sed -s l -l line-length -x -d "Specify line-length"
-	complete -c sed -l posix -d "Disable all GNU extensions"
-	complete -c sed -s r -l regexp-extended -d "Use extended regexp"
-	complete -c sed -s s -l separate -d "Consider files as separate"
-	complete -c sed -s u -l unbuffered -d "Use minimal IO buffers"
-	complete -c sed -l help -d "Display help and exit"
-	complete -c sed -s V -l version -d "Display version and exit"
+    complete -c sed -l silent -d "Silent mode"
+    complete -c sed -s l -l line-length -x -d "Specify line-length"
+    complete -c sed -l posix -d "Disable all GNU extensions"
+    complete -c sed -s r -l regexp-extended -d "Use extended regexp"
+    complete -c sed -s s -l separate -d "Consider files as separate"
+    complete -c sed -s u -l unbuffered -d "Use minimal IO buffers"
+    complete -c sed -l help -d "Display help and exit"
+    complete -c sed -s V -l version -d "Display version and exit"
 
 else
 
-	# If not a GNU system, assume we have standard BSD ls features instead
+    # If not a GNU system, assume we have standard BSD ls features instead
 
-	complete -c sed -s E -d "Use extended regexp"
-	complete -c sed -s a -d "Delay opening files until a command containing the related 'w' function is applied"
-	complete -c sed -s l -d "Use line buffering"
+    complete -c sed -s E -d "Use extended regexp"
+    complete -c sed -s a -d "Delay opening files until a command containing the related 'w' function is applied"
+    complete -c sed -s l -d "Use line buffering"
 
 end
diff --git a/share/completions/seq.fish b/share/completions/seq.fish
index e7fe74cae..6b8833db5 100644
--- a/share/completions/seq.fish
+++ b/share/completions/seq.fish
@@ -1,12 +1,12 @@
-if seq --version 2>/dev/null > /dev/null #GNU
-	complete -c seq -s f -l format -d 'Use printf style floating-point FORMAT'
-	complete -c seq -s s -l separator -d 'Use STRING to separate numbers'
-	complete -c seq -s w -l equal-width -d 'Equalize width with leading zeroes'
-	complete -c seq -l help -d 'Display this help'
-	complete -c seq -l version -d 'Output version information'
+if seq --version 2>/dev/null >/dev/null #GNU
+    complete -c seq -s f -l format -d 'Use printf style floating-point FORMAT'
+    complete -c seq -s s -l separator -d 'Use STRING to separate numbers'
+    complete -c seq -s w -l equal-width -d 'Equalize width with leading zeroes'
+    complete -c seq -l help -d 'Display this help'
+    complete -c seq -l version -d 'Output version information'
 else #OS X
-	complete -c seq -s f -d 'Use printf style floating-point FORMAT'
-	complete -c seq -s s -d 'Use STRING to separate numbers'
-	complete -c seq -s w -d 'Equalize width with leading zeroes'
-	complete -c seq -s t -d 'Use STRING to terminate sequence of numbers'
+    complete -c seq -s f -d 'Use printf style floating-point FORMAT'
+    complete -c seq -s s -d 'Use STRING to separate numbers'
+    complete -c seq -s w -d 'Equalize width with leading zeroes'
+    complete -c seq -s t -d 'Use STRING to terminate sequence of numbers'
 end
diff --git a/share/completions/service.fish b/share/completions/service.fish
index 06265c44f..fbf16dd22 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -3,23 +3,23 @@ complete -c service -n "__fish_is_first_token" -xa "(__fish_print_service_names)
 
 # as found in __fish_print_service_names.fish
 if test -d /run/systemd/system # Systemd systems
-	complete -c service -n "not __fish_is_first_token" -xa "start stop restart status enable disable"
+    complete -c service -n "not __fish_is_first_token" -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_first_token" -xa "start stop restart"
+    complete -c service -n "not __fish_is_first_token" -xa "start stop restart"
 else if test -d /etc/init.d # SysV on Debian and other linuxen
-	complete -c service -n "not __fish_is_first_token" -xa "start stop --full-restart"
+    complete -c service -n "not __fish_is_first_token" -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_first_token" -xa "(__fish_complete_freebsd_service_actions)"
+    # Use the output of `service -v foo` to retrieve the list of service-specific verbs
+    complete -c service -n "not __fish_is_first_token" -xa "(__fish_complete_freebsd_service_actions)"
 end
 
 function __fish_complete_freebsd_service_actions
-	# Use the output of `service -v foo` to retrieve the list of service-specific verbs
-	# Output takes the form "[prefix1 prefix2 ..](cmd1 cmd2 cmd3)" where any combination
-	# of zero or one prefixe(s) and any one command is a valid verb.
-	set -l service_name (commandline --tokenize --cut-at-cursor)[-1]
-	set -l results (service $service_name -v 2>| string match -r '\\[(.*)\\]\\((.*)\\)')
-	set -l prefixes "" (string split '|' -- $results[2])
-	set -l commands (string split '|' -- $results[3])
-	printf '%s\n' $prefixes$commands
+    # Use the output of `service -v foo` to retrieve the list of service-specific verbs
+    # Output takes the form "[prefix1 prefix2 ..](cmd1 cmd2 cmd3)" where any combination
+    # of zero or one prefixe(s) and any one command is a valid verb.
+    set -l service_name (commandline --tokenize --cut-at-cursor)[-1]
+    set -l results (service $service_name -v 2>| string match -r '\\[(.*)\\]\\((.*)\\)')
+    set -l prefixes "" (string split '|' -- $results[2])
+    set -l commands (string split '|' -- $results[3])
+    printf '%s\n' $prefixes$commands
 end
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 757fa6009..3966638e4 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -13,40 +13,40 @@ set -g __fish_locale_vars LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETAR
 #
 
 function __fish_set_is_color -d 'Test if We are specifying a color value for the prompt'
-	set cmd (commandline -poc)
-	set -e cmd[1]
-	for i in $cmd
-		switch $i
+    set cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
 
-			case 'fish_color_*' 'fish_pager_color_*'
-				return 0
+            case 'fish_color_*' 'fish_pager_color_*'
+                return 0
 
-			case '-*'
+            case '-*'
 
-			case '*'
-				 return 1
-		end
-	end
-	return 1
+            case '*'
+                return 1
+        end
+    end
+    return 1
 end
 
 function __fish_set_is_locale -d 'Test if We are specifying a locale value for the prompt'
-	set cmd (commandline -poc)
-	set -e cmd[1]
-	for i in $cmd
-		switch $i
+    set cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
 
-			case $__fish_locale_vars
-				return 0
+            case $__fish_locale_vars
+                return 0
 
-			case '-*'
-				continue
+            case '-*'
+                continue
 
-			case '*'
-				 return 1
-		end
-	end
-	return 1
+            case '*'
+                return 1
+        end
+    end
+    return 1
 end
 
 #
diff --git a/share/completions/setfacl.fish b/share/completions/setfacl.fish
index 456dce4ae..4352a5f12 100644
--- a/share/completions/setfacl.fish
+++ b/share/completions/setfacl.fish
@@ -1,42 +1,42 @@
 set __fish_facl_spec_keywords default user group mask other
 
 function __fish_facl_list_spec_keyword
-  for keyword in $__fish_facl_spec_keywords
-    echo $keyword:
-  end
+    for keyword in $__fish_facl_spec_keywords
+        echo $keyword:
+    end
 end
 
 function __fish_facl_starts_with_spec_user
-  commandline -ct | string match -r "u(ser)?:"
+    commandline -ct | string match -r "u(ser)?:"
 end
 
 function __fish_facl_starts_with_spec_group
-  commandline -ct | string match -r "g(roup)?:"
+    commandline -ct | string match -r "g(roup)?:"
 end
 
 function __fish_facl_extract_acl
-  commandline -ct | string replace -ar '.*(\w*:).*' '$1'
+    commandline -ct | string replace -ar '.*(\w*:).*' '$1'
 end
 
-complete -c setfacl    -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_user'  -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
-complete -c setfacl    -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_group' -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_user' -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_group' -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
 complete -c setfacl -f -s m -s x -l modify -l remove -l set -a '(__fish_facl_list_spec_keyword)'
 
-complete -c setfacl    -s b -l remove-all     -d 'Remove all extended ACL entries'
-complete -c setfacl    -s k -l remove-default -d 'Remove the Default ACL'
-complete -c setfacl    -s n -l no-mask        -d 'Do not recalculate the effective rights mask'
-complete -c setfacl         -l mask           -d 'Do recalculate the effective rights mask'
-complete -c setfacl    -s d -l default        -d 'All operations apply to the Default ACL'
-complete -c setfacl         -l restore        -d 'Restore a permission backup created by `getfacl -R\' or similar'
-complete -c setfacl         -l test           -d 'Test mode'
-complete -c setfacl    -s R -l recursive      -d 'Apply operations to all files and directories recursively'
-complete -c setfacl    -s L -l logical        -d 'Logical walk, follow symbolic links to directories'
-complete -c setfacl    -s P -l physical       -d 'Physical walk, do not follow symbolic links to directories'
-complete -c setfacl -f -s v -l version        -d 'Print the version of setfacl and exit'
-complete -c setfacl -f -s h -l help           -d 'Print help explaining the command line options'
-complete -c setfacl    -s m -l modify         -d 'Modify the current ACL(s) of file(s)'
-complete -c setfacl    -s x -l remove         -d 'Remove entries from the ACL(s) of file(s)'
-complete -c setfacl    -s M -l modify-file    -d 'Read ACL entries to modify from file'
-complete -c setfacl    -s X -l remove-file    -d 'Read ACL entries to remove from file'
-complete -c setfacl         -l set-file       -d 'Read ACL entries to set from file'
-complete -c setfacl         -l set            -d 'Set the ACL of file(s), replacing the current ACL'
+complete -c setfacl -s b -l remove-all -d 'Remove all extended ACL entries'
+complete -c setfacl -s k -l remove-default -d 'Remove the Default ACL'
+complete -c setfacl -s n -l no-mask -d 'Do not recalculate the effective rights mask'
+complete -c setfacl -l mask -d 'Do recalculate the effective rights mask'
+complete -c setfacl -s d -l default -d 'All operations apply to the Default ACL'
+complete -c setfacl -l restore -d 'Restore a permission backup created by `getfacl -R\' or similar'
+complete -c setfacl -l test -d 'Test mode'
+complete -c setfacl -s R -l recursive -d 'Apply operations to all files and directories recursively'
+complete -c setfacl -s L -l logical -d 'Logical walk, follow symbolic links to directories'
+complete -c setfacl -s P -l physical -d 'Physical walk, do not follow symbolic links to directories'
+complete -c setfacl -f -s v -l version -d 'Print the version of setfacl and exit'
+complete -c setfacl -f -s h -l help -d 'Print help explaining the command line options'
+complete -c setfacl -s m -l modify -d 'Modify the current ACL(s) of file(s)'
+complete -c setfacl -s x -l remove -d 'Remove entries from the ACL(s) of file(s)'
+complete -c setfacl -s M -l modify-file -d 'Read ACL entries to modify from file'
+complete -c setfacl -s X -l remove-file -d 'Read ACL entries to remove from file'
+complete -c setfacl -l set-file -d 'Read ACL entries to set from file'
+complete -c setfacl -l set -d 'Set the ACL of file(s), replacing the current ACL'
diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 6a557fb70..0d4592b3d 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -2,23 +2,23 @@
 set -l filter '"s/\S+\s\S+\s(.+)\((.+)\)/\1\t\2/;"'
 
 complete -c setxkbmap -o '?' -o help -d 'Print this message'
-complete -c setxkbmap -o compat    -d 'Specifies compatibility map component name' -xa "(sed -r $filter /usr/share/X11/xkb/compat.dir)"
-complete -c setxkbmap -o config    -d 'Specifies configuration file to use' -r
-complete -c setxkbmap -o device    -d 'Specifies the device ID to use' -x
-complete -c setxkbmap -o display   -d 'Specifies display to use' -x
-complete -c setxkbmap -o geometry  -d 'Specifies geometry component name' -xa "(sed -r $filter /usr/share/X11/xkb/geometry.dir)"
-complete -c setxkbmap -o I         -d 'Add <dir> to list of directories to be used' -xa '(__fish_complete_directories)'
-complete -c setxkbmap -o keycodes  -d 'Specifies keycodes component name' -xa "(sed -r $filter /usr/share/X11/xkb/keycodes.dir)"
-complete -c setxkbmap -o keymap    -d 'Specifies name of keymap to load' -xa "(sed -r $filter /usr/share/X11/xkb/keymap.dir)"
-complete -c setxkbmap -o layout    -d 'Specifies layout used to choose component names' -xa "(__fish_complete_setxkbmap layout)"
-complete -c setxkbmap -o model     -d 'Specifies model used to choose component names' -xa "(__fish_complete_setxkbmap model)"
-complete -c setxkbmap -o option    -d 'Adds an option used to choose component names' -xa "(__fish_complete_list , '__fish_complete_setxkbmap option')"
-complete -c setxkbmap -o print     -d 'Print a complete xkb_keymap description and exit'
-complete -c setxkbmap -o query     -d 'Print the current layout settings and exit'
-complete -c setxkbmap -o rules     -d 'Name of rules file to use' -x
-complete -c setxkbmap -o symbols   -d 'Specifies symbols component name' -xa "(sed -r $filter /usr/share/X11/xkb/symbols.dir)"
-complete -c setxkbmap -o synch     -d 'Synchronize request w/X server'
-complete -c setxkbmap -o types     -d 'Specifies types component name' -xa "(sed -r $filter /usr/share/X11/xkb/types.dir)"
+complete -c setxkbmap -o compat -d 'Specifies compatibility map component name' -xa "(sed -r $filter /usr/share/X11/xkb/compat.dir)"
+complete -c setxkbmap -o config -d 'Specifies configuration file to use' -r
+complete -c setxkbmap -o device -d 'Specifies the device ID to use' -x
+complete -c setxkbmap -o display -d 'Specifies display to use' -x
+complete -c setxkbmap -o geometry -d 'Specifies geometry component name' -xa "(sed -r $filter /usr/share/X11/xkb/geometry.dir)"
+complete -c setxkbmap -o I -d 'Add <dir> to list of directories to be used' -xa '(__fish_complete_directories)'
+complete -c setxkbmap -o keycodes -d 'Specifies keycodes component name' -xa "(sed -r $filter /usr/share/X11/xkb/keycodes.dir)"
+complete -c setxkbmap -o keymap -d 'Specifies name of keymap to load' -xa "(sed -r $filter /usr/share/X11/xkb/keymap.dir)"
+complete -c setxkbmap -o layout -d 'Specifies layout used to choose component names' -xa "(__fish_complete_setxkbmap layout)"
+complete -c setxkbmap -o model -d 'Specifies model used to choose component names' -xa "(__fish_complete_setxkbmap model)"
+complete -c setxkbmap -o option -d 'Adds an option used to choose component names' -xa "(__fish_complete_list , '__fish_complete_setxkbmap option')"
+complete -c setxkbmap -o print -d 'Print a complete xkb_keymap description and exit'
+complete -c setxkbmap -o query -d 'Print the current layout settings and exit'
+complete -c setxkbmap -o rules -d 'Name of rules file to use' -x
+complete -c setxkbmap -o symbols -d 'Specifies symbols component name' -xa "(sed -r $filter /usr/share/X11/xkb/symbols.dir)"
+complete -c setxkbmap -o synch -d 'Synchronize request w/X server'
+complete -c setxkbmap -o types -d 'Specifies types component name' -xa "(sed -r $filter /usr/share/X11/xkb/types.dir)"
 complete -c setxkbmap -o v -o verbose -d 'Sets verbosity (1..10).  Higher values yield more messages' -xa '(seq 1 10)'
-complete -c setxkbmap -o variant   -d 'Specifies layout variant used to choose component names' -xa "(__fish_complete_setxkbmap variant)"
+complete -c setxkbmap -o variant -d 'Specifies layout variant used to choose component names' -xa "(__fish_complete_setxkbmap variant)"
 
diff --git a/share/completions/snap.fish b/share/completions/snap.fish
index a62f9c2ba..9923a5c52 100644
--- a/share/completions/snap.fish
+++ b/share/completions/snap.fish
@@ -1,14 +1,14 @@
 # Completions for `snap` command
 
 function __fish_snap_no_subcommand -d 'Test if snap has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i abort ack alias aliases buy changes connect disable disconnect download\
-            enable find get help info install interfaces known list login logout prefer refresh remove\
-            revert run set tasks try unalias version watch
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i abort ack alias aliases buy changes connect disable disconnect download\
+ enable find get help info install interfaces known list login logout prefer refresh remove\
+ revert run set tasks try unalias version watch
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_snap_using_subcommand -d 'Test if given subcommand is used'
@@ -21,30 +21,32 @@ function __fish_snap_using_subcommand -d 'Test if given subcommand is used'
 end
 
 function __fish_snap_use_package -d 'Test if snap command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i alias buy disable download enable info install refresh remove revert run try
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i alias buy disable download enable info install refresh remove revert run try
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_snap_use_file -d 'Test if snap command should have files as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i ack try
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i ack try
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_snap_subcommand
-    set subcommand $argv[1]; set -e argv[1]
+    set subcommand $argv[1]
+    set -e argv[1]
     complete -f -c snap -n '__fish_snap_no_subcommand' -a $subcommand $argv
 end
 
 function __fish_snap_option
-    set subcommand $argv[1]; set -e argv[1]
+    set subcommand $argv[1]
+    set -e argv[1]
     complete -f -c snap -n "__fish_snap_using_subcommand $subcommand" $argv
 end
 
@@ -78,13 +80,13 @@ function __fish_snap_aliases -d 'List aliases'
 end
 
 function __fish_snap_no_assertion -d 'Check that no assertion type is used yet'
-	for i in (commandline -opc)
-		if contains -- $i account account-key model serial snap-declaration snap-build snap-revision\
-            system-user validation
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i account account-key model serial snap-declaration snap-build snap-revision\
+ system-user validation
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_snap_using_assertion -d 'Check if certain assertion type is used'
@@ -97,10 +99,11 @@ function __fish_snap_using_assertion -d 'Check if certain assertion type is used
 end
 
 function __fish_snap_assertion
-    set assertion $argv[1]; set -e argv[1]
+    set assertion $argv[1]
+    set -e argv[1]
     complete -f -c snap -n '__fish_snap_using_subcommand known; and __fish_snap_no_assertion' -a $assertion
     complete -f -c snap -n "__fish_snap_using_assertion $assertion" -a "(__fish_snap_filters $assertion)"\
-        -d "Filter"
+ -d "Filter"
 end
 
 function __fish_snap_filters -d 'List assertion filters'
@@ -114,173 +117,173 @@ end
 complete -c snap -n '__fish_snap_use_file' -a '(__fish_complete_path)'
 
 # Support flags
-complete -x -f -c snap -s h -l help     -d 'Show this help message'
-complete -x -f -c snap -s v -l version  -d 'Print the version and exit'
+complete -x -f -c snap -s h -l help -d 'Show this help message'
+complete -x -f -c snap -s v -l version -d 'Print the version and exit'
 
 # Abort
-__fish_snap_subcommand abort                    -d "Abort a pending change"
+__fish_snap_subcommand abort -d "Abort a pending change"
 
 # Ack
-__fish_snap_subcommand ack -r                   -d "Adds an assertion to the system"
+__fish_snap_subcommand ack -r -d "Adds an assertion to the system"
 
 # Alias
-__fish_snap_subcommand alias -r                 -d "Sets up a manual alias"
+__fish_snap_subcommand alias -r -d "Sets up a manual alias"
 __fish_snap_option alias -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Aliases
-__fish_snap_subcommand aliases                  -d "Lists aliases in the system"
+__fish_snap_subcommand aliases -d "Lists aliases in the system"
 
 # Buy
-__fish_snap_subcommand buy -r                   -d "Buys a snap"
+__fish_snap_subcommand buy -r -d "Buys a snap"
 
 # Changes
-__fish_snap_subcommand changes                  -d "List system changes"
+__fish_snap_subcommand changes -d "List system changes"
 
 # Connect
-__fish_snap_subcommand connect -r               -d "Connects a plug to a slot"
+__fish_snap_subcommand connect -r -d "Connects a plug to a slot"
 __fish_snap_option connect -a '(__fish_snap_interfaces)' -d "Snap:Plug or Slot"
 
 # Disable
-__fish_snap_subcommand disable -r               -d "Disables a snap in the system"
+__fish_snap_subcommand disable -r -d "Disables a snap in the system"
 __fish_snap_option disable -a '(__fish_snap_enabled_snaps)' -d "Enabled snap"
 
 # Disconnect
-__fish_snap_subcommand disconnect -r            -d "Disconnects a plug from a slot"
+__fish_snap_subcommand disconnect -r -d "Disconnects a plug from a slot"
 __fish_snap_option disconnect -a '(__fish_snap_interfaces)' -d "Snap:Plug or Slot"
 
 # Downloads
-__fish_snap_subcommand download -r              -d "Downloads the given snap"
-__fish_snap_option download -l channel          -d "Use this channel instead of stable"
-__fish_snap_option download -l edge             -d "Install from the edge channel"
-__fish_snap_option download -l beta             -d "Install from the beta channel"
-__fish_snap_option download -l candidate        -d "Install from the candidate channel"
-__fish_snap_option download -l stable           -d "Install from the stable channel"
-__fish_snap_option download -l revision         -d "Download the given revision of snap, to which you must have developer access"
+__fish_snap_subcommand download -r -d "Downloads the given snap"
+__fish_snap_option download -l channel -d "Use this channel instead of stable"
+__fish_snap_option download -l edge -d "Install from the edge channel"
+__fish_snap_option download -l beta -d "Install from the beta channel"
+__fish_snap_option download -l candidate -d "Install from the candidate channel"
+__fish_snap_option download -l stable -d "Install from the stable channel"
+__fish_snap_option download -l revision -d "Download the given revision of snap, to which you must have developer access"
 
 # Enable
-__fish_snap_subcommand enable -r                -d "Enables a snap in the system"
+__fish_snap_subcommand enable -r -d "Enables a snap in the system"
 __fish_snap_option enable -a '(__fish_snap_disabled_snaps)' -d "Disabled snap"
 
 # Find
-__fish_snap_subcommand find -r                  -d "Finds packages to install"
-__fish_snap_option find -l private              -d "Search private snaps"
-__fish_snap_option find -l section              -d "Restrict the search to a given section"
+__fish_snap_subcommand find -r -d "Finds packages to install"
+__fish_snap_option find -l private -d "Search private snaps"
+__fish_snap_option find -l section -d "Restrict the search to a given section"
 
 # There seems to be no programmatic way of getting configuration options
 # Get
-__fish_snap_subcommand get -r                   -d "Prints configuration options"
-__fish_snap_option get -s t                     -d "Strict typing with nulls and quoted strings"
-__fish_snap_option get -s d                     -d "Always return documents, even with single key"
+__fish_snap_subcommand get -r -d "Prints configuration options"
+__fish_snap_option get -s t -d "Strict typing with nulls and quoted strings"
+__fish_snap_option get -s d -d "Always return documents, even with single key"
 __fish_snap_option get -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Help
-__fish_snap_subcommand help                     -d "The help command shows useful information"
-__fish_snap_option help -l man                  -d "Generates the manpage"
+__fish_snap_subcommand help -d "The help command shows useful information"
+__fish_snap_option help -l man -d "Generates the manpage"
 
 # Info
-__fish_snap_subcommand info -r                  -d "Show detailed information about a snap"
-__fish_snap_option info -l verbose              -d "Include a verbose list of snap's notes"
+__fish_snap_subcommand info -r -d "Show detailed information about a snap"
+__fish_snap_option info -l verbose -d "Include a verbose list of snap's notes"
 __fish_snap_option info -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Install
-__fish_snap_subcommand install -r               -d "Installs a snap to the system"
-__fish_snap_option install -l channel           -d "Use this channel instead of stable"
-__fish_snap_option install -l edge              -d "Install from the edge channel"
-__fish_snap_option install -l beta              -d "Install from the beta channel"
-__fish_snap_option install -l candidate         -d "Install from the candidate channel"
-__fish_snap_option install -l stable            -d "Install from the stable channel"
-__fish_snap_option install -l revision          -d "Install the given revision of snap, to which you must have developer access"
-__fish_snap_option install -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option install -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option install -l classic           -d "Put snap in classic mode and disable security confinement"
-__fish_snap_option install -l dangerous         -d "Install the given snap file even if there are no pre-acknowledged signatures for it, meaning it was not  verified and could be dangerous"
+__fish_snap_subcommand install -r -d "Installs a snap to the system"
+__fish_snap_option install -l channel -d "Use this channel instead of stable"
+__fish_snap_option install -l edge -d "Install from the edge channel"
+__fish_snap_option install -l beta -d "Install from the beta channel"
+__fish_snap_option install -l candidate -d "Install from the candidate channel"
+__fish_snap_option install -l stable -d "Install from the stable channel"
+__fish_snap_option install -l revision -d "Install the given revision of snap, to which you must have developer access"
+__fish_snap_option install -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option install -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option install -l classic -d "Put snap in classic mode and disable security confinement"
+__fish_snap_option install -l dangerous -d "Install the given snap file even if there are no pre-acknowledged signatures for it, meaning it was not  verified and could be dangerous"
 
 # Interfaces
-__fish_snap_subcommand interfaces               -d "Lists interfaces in the system"
+__fish_snap_subcommand interfaces -d "Lists interfaces in the system"
 complete -f -c snap -n '__fish_snap_using_subcommand interfaces' -a '(__fish_snap_installed_snaps)' -d "Snap"
-__fish_snap_option interfaces -s i              -d "Constrain listing to specific interfaces"
+__fish_snap_option interfaces -s i -d "Constrain listing to specific interfaces"
 
 # Known
-__fish_snap_subcommand known -r                 -d "Shows known assertions of the provided type"
-__fish_snap_option known -l remote              -d "Shows known assertions of the provided type"
-__fish_snap_assertion account                   -d 'Assertion type'
-__fish_snap_assertion account-key               -d 'Assertion type'
-__fish_snap_assertion model                     -d 'Assertion type'
-__fish_snap_assertion serial                    -d 'Assertion type'
-__fish_snap_assertion snap-declaration          -d 'Assertion type'
-__fish_snap_assertion snap-build                -d 'Assertion type'
-__fish_snap_assertion snap-revision             -d 'Assertion type'
-__fish_snap_assertion system-user               -d 'Assertion type'
-__fish_snap_assertion validation                -d 'Assertion type'
+__fish_snap_subcommand known -r -d "Shows known assertions of the provided type"
+__fish_snap_option known -l remote -d "Shows known assertions of the provided type"
+__fish_snap_assertion account -d 'Assertion type'
+__fish_snap_assertion account-key -d 'Assertion type'
+__fish_snap_assertion model -d 'Assertion type'
+__fish_snap_assertion serial -d 'Assertion type'
+__fish_snap_assertion snap-declaration -d 'Assertion type'
+__fish_snap_assertion snap-build -d 'Assertion type'
+__fish_snap_assertion snap-revision -d 'Assertion type'
+__fish_snap_assertion system-user -d 'Assertion type'
+__fish_snap_assertion validation -d 'Assertion type'
 
 # List
-__fish_snap_subcommand list                     -d "List installed snaps"
-__fish_snap_option list -l all                  -d "Show all revisions"
+__fish_snap_subcommand list -d "List installed snaps"
+__fish_snap_option list -l all -d "Show all revisions"
 
 # Login
-__fish_snap_subcommand login                    -d "Authenticates on snapd and the store"
+__fish_snap_subcommand login -d "Authenticates on snapd and the store"
 
 # Logout
-__fish_snap_subcommand logout                   -d "Log out of the store"
+__fish_snap_subcommand logout -d "Log out of the store"
 
 # Prefer
-__fish_snap_subcommand prefer -r                -d "Prefes aliases from a snap and disable conflicts"
+__fish_snap_subcommand prefer -r -d "Prefes aliases from a snap and disable conflicts"
 __fish_snap_option prefer -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Refresh
-__fish_snap_subcommand refresh -r               -d "Refreshes a snap in the system"
-__fish_snap_option refresh -l channel           -d "Use this channel instead of stable"
-__fish_snap_option refresh -l edge              -d "Install from the edge channel"
-__fish_snap_option refresh -l beta              -d "Install from the beta channel"
-__fish_snap_option refresh -l candidate         -d "Install from the candidate channel"
-__fish_snap_option refresh -l stable            -d "Install from the stable channel"
-__fish_snap_option refresh -l revision          -d "Refresh to the given revision"
-__fish_snap_option refresh -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option refresh -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option refresh -l classic           -d "Put snap in classic mode and disable security confinement"
-__fish_snap_option refresh -l ignore-validation     -d "Ignore validation by other snaps blocking the refresh"
+__fish_snap_subcommand refresh -r -d "Refreshes a snap in the system"
+__fish_snap_option refresh -l channel -d "Use this channel instead of stable"
+__fish_snap_option refresh -l edge -d "Install from the edge channel"
+__fish_snap_option refresh -l beta -d "Install from the beta channel"
+__fish_snap_option refresh -l candidate -d "Install from the candidate channel"
+__fish_snap_option refresh -l stable -d "Install from the stable channel"
+__fish_snap_option refresh -l revision -d "Refresh to the given revision"
+__fish_snap_option refresh -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
+__fish_snap_option refresh -l ignore-validation -d "Ignore validation by other snaps blocking the refresh"
 __fish_snap_option refresh -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Remove
-__fish_snap_subcommand remove -r                -d "Removes a snap from the system"
-__fish_snap_option remove -l revision           -d "Removes only the given revision"
+__fish_snap_subcommand remove -r -d "Removes a snap from the system"
+__fish_snap_option remove -l revision -d "Removes only the given revision"
 __fish_snap_option remove -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Revert
-__fish_snap_subcommand revert -r                -d "Revert the given snap to the previous state"
-__fish_snap_option refresh -l revision          -d "Revert to the given revision"
-__fish_snap_option refresh -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option refresh -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option refresh -l classic           -d "Put snap in classic mode and disable security confinement"
+__fish_snap_subcommand revert -r -d "Revert the given snap to the previous state"
+__fish_snap_option refresh -l revision -d "Revert to the given revision"
+__fish_snap_option refresh -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
 __fish_snap_option revert -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Run
-__fish_snap_subcommand run -r                   -d "Run the given snap command"
-__fish_snap_option run -l shell                 -d "Run a shell instead of the command (useful for debugging)"
+__fish_snap_subcommand run -r -d "Run the given snap command"
+__fish_snap_option run -l shell -d "Run a shell instead of the command (useful for debugging)"
 __fish_snap_option run -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # There seems to be no programmatic way of getting configuration options
 # Set
-__fish_snap_subcommand set -r                   -d "Changes configuration options"
+__fish_snap_subcommand set -r -d "Changes configuration options"
 __fish_snap_option set -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Tasks
-__fish_snap_subcommand tasks                    -d "List a change's tasks"
+__fish_snap_subcommand tasks -d "List a change's tasks"
 __fish_snap_option tasks -a '(__fish_snap_change_id)' -d "ID"
 
 # Try
-__fish_snap_subcommand try -r                   -d "Tests a snap in the system"
-__fish_snap_option try -l devmode               -d "Put snap in development mode and disable security confinement"
-__fish_snap_option try -l jailmode              -d "Put snap in enforced confinement mode"
-__fish_snap_option try -l classic               -d "Put snap in classic mode and disable security confinement"
+__fish_snap_subcommand try -r -d "Tests a snap in the system"
+__fish_snap_option try -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option try -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option try -l classic -d "Put snap in classic mode and disable security confinement"
 
 # Unalias
-__fish_snap_subcommand unalias -r               -d "Unalias a manual alias or an entire snap"
+__fish_snap_subcommand unalias -r -d "Unalias a manual alias or an entire snap"
 __fish_snap_option unalias -a '(__fish_snap_aliases)' -d "Alias or snap"
 
 # Version
-__fish_snap_subcommand version                  -d "Shows version details"
+__fish_snap_subcommand version -d "Shows version details"
 
 # Watch
-__fish_snap_subcommand watch                    -d "Watch a change in progress"
+__fish_snap_subcommand watch -d "Watch a change in progress"
 __fish_snap_option watch -a '(__fish_snap_change_id)' -d "ID"
diff --git a/share/completions/sort.fish b/share/completions/sort.fish
index cb42ae1c4..967627703 100644
--- a/share/completions/sort.fish
+++ b/share/completions/sort.fish
@@ -8,7 +8,7 @@ complete -c sort -s h -l human-numeric-sort -d "Compare human readable numbers [
 complete -c sort -s M -l month-sort -d "Compare month names"
 complete -c sort -s n -l numeric-sort -d "Compare string numerical value"
 complete -c sort -s R -l random-sort -d "Sort by random hash of keys"
-complete -c sort      -l random-source -d "Get random bytes from FILE"
+complete -c sort -l random-source -d "Get random bytes from FILE"
 complete -c sort -s r -l reverse -d "Reverse results"
 complete -c sort -s c -l check -d "Only check if sorted"
 complete -c sort -s k -l key -d "Define key"
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index ef13b2f1a..f2becec78 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -45,11 +45,11 @@ complete -c ssh -s c -d "Encryption cipher" -xa "(ssh -Q cipher)"
 
 # Also look up hosts from the history
 function __ssh_history_completions --argument limit
-	if string match -q ""
-		set limit 100
-	end
+    if string match -q ""
+        set limit 100
+    end
 
-	history --prefix ssh | sed -n "s/.* \([A-Za-z0-9._:-]\+@[A-Za-z0-9._:-]\+\).*/\1/p" | head -n $limit
+    history --prefix ssh | sed -n "s/.* \([A-Za-z0-9._:-]\+@[A-Za-z0-9._:-]\+\).*/\1/p" | head -n $limit
 end
 
 complete -k -c ssh -a '(__ssh_history_completions 100)' -f -d "Remote"
diff --git a/share/completions/stat.fish b/share/completions/stat.fish
index 9a540feb1..804e72032 100644
--- a/share/completions/stat.fish
+++ b/share/completions/stat.fish
@@ -1,20 +1,20 @@
-if stat --version 2>/dev/null > /dev/null # GNU
-	complete -c stat -s L -l dereference     -d 'follow links'
-	complete -c stat -s f -l file-system     -d 'display file system status instead of file status'
-	complete -c stat -s c -l format -x       -d 'use the specified FORMAT instead of the default; output a newline after each use of FORMAT'
-	complete -c stat -l printf -x            -d 'like --format, but interpret backslash escapes, and do not output a mandatory trailing newline.  If you want a newline, include \n in FORMAT'
-	complete -c stat -s t -l terse           -d 'print the information in terse form'
-	complete -c stat -l help     -d 'display this help and exit'
-	complete -c stat -l version  -d 'output version information and exit'
+if stat --version 2>/dev/null >/dev/null # GNU
+    complete -c stat -s L -l dereference -d 'follow links'
+    complete -c stat -s f -l file-system -d 'display file system status instead of file status'
+    complete -c stat -s c -l format -x -d 'use the specified FORMAT instead of the default; output a newline after each use of FORMAT'
+    complete -c stat -l printf -x -d 'like --format, but interpret backslash escapes, and do not output a mandatory trailing newline.  If you want a newline, include \n in FORMAT'
+    complete -c stat -s t -l terse -d 'print the information in terse form'
+    complete -c stat -l help -d 'display this help and exit'
+    complete -c stat -l version -d 'output version information and exit'
 else # OS X
-	complete -c stat -s F -d "Display content type symbols similar to ls(1)"
-	complete -c stat -s f -d "Display information using specified FORMAT" -r
-	complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
-	complete -c stat -s l -d "Display output in ls -lT format"
-	complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
-	complete -c stat -s q -d "Supress failure messages"
-	complete -c stat -s r -d "Display raw information"
-	complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
-	complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
-	complete -c stat -s x -d "Verbose information, similar to some Linux distributions"
+    complete -c stat -s F -d "Display content type symbols similar to ls(1)"
+    complete -c stat -s f -d "Display information using specified FORMAT" -r
+    complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
+    complete -c stat -s l -d "Display output in ls -lT format"
+    complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
+    complete -c stat -s q -d "Supress failure messages"
+    complete -c stat -s r -d "Display raw information"
+    complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
+    complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
+    complete -c stat -s x -d "Verbose information, similar to some Linux distributions"
 end
\ No newline at end of file
diff --git a/share/completions/stream.fish b/share/completions/stream.fish
index 778f4c0fe..b50979943 100644
--- a/share/completions/stream.fish
+++ b/share/completions/stream.fish
@@ -1,33 +1,33 @@
-complete -c stream -o authenticate                  -d 'Decipher image with this password [password]'
-complete -c stream -o channel                       -d 'Apply option to select image channels [type]' -xa '(stream -list channel)'
-complete -c stream -o colorspace                    -d 'Alternate image colorspace [type]' -xa '(stream -list colorspace)'
-complete -c stream -o compress                      -d 'Type of pixel compression when writing the image [type]' -xa '(stream -list compress)'
-complete -c stream -o define                        -d 'Define one or more image format options [format:option]'
-complete -c stream -o density                       -d 'Horizontal and vertical density of the image [geometry]'
-complete -c stream -o depth                         -d 'Image depth [value]'
-complete -c stream -o extract                       -d 'Extract area from image [geometry]'
-complete -c stream -o identify                      -d 'Identify the format and characteristics of the image'
-complete -c stream -o interlace                     -d 'Type of image interlacing scheme [type]' -xa '(stream -list interlace)'
-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 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 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'
-complete -c stream -o taint                         -d 'Declare the image as modified'
-complete -c stream -o transparent-color             -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c stream -o verbose                       -d 'Print detailed information about the image'
-complete -c stream -o virtual-pixel                 -d 'Virtual pixel access method [method]' -xa '(stream -list virtual-pixel)'
-complete -c stream -o debug                         -d 'Display copious debugging information [events]' -xa '(stream -list debug)'
-complete -c stream -o help                          -d 'Print program options'
-complete -c stream -o list                          -d 'Print a list of supported option arguments [type]' -xa '(stream -list list)'
-complete -c stream -o log                           -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c stream -o version                       -d 'Print version information'
+complete -c stream -o authenticate -d 'Decipher image with this password [password]'
+complete -c stream -o channel -d 'Apply option to select image channels [type]' -xa '(stream -list channel)'
+complete -c stream -o colorspace -d 'Alternate image colorspace [type]' -xa '(stream -list colorspace)'
+complete -c stream -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(stream -list compress)'
+complete -c stream -o define -d 'Define one or more image format options [format:option]'
+complete -c stream -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c stream -o depth -d 'Image depth [value]'
+complete -c stream -o extract -d 'Extract area from image [geometry]'
+complete -c stream -o identify -d 'Identify the format and characteristics of the image'
+complete -c stream -o interlace -d 'Type of image interlacing scheme [type]' -xa '(stream -list interlace)'
+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 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 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'
+complete -c stream -o taint -d 'Declare the image as modified'
+complete -c stream -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c stream -o verbose -d 'Print detailed information about the image'
+complete -c stream -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(stream -list virtual-pixel)'
+complete -c stream -o debug -d 'Display copious debugging information [events]' -xa '(stream -list debug)'
+complete -c stream -o help -d 'Print program options'
+complete -c stream -o list -d 'Print a list of supported option arguments [type]' -xa '(stream -list list)'
+complete -c stream -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c stream -o version -d 'Print version information'
diff --git a/share/completions/subl.fish b/share/completions/subl.fish
index e444cbf73..08855c7e8 100644
--- a/share/completions/subl.fish
+++ b/share/completions/subl.fish
@@ -21,12 +21,12 @@
 # Filenames may be given a :line or :line:column suffix to open at a specific
 # location.
 
-complete -c subl                  --long-option project    --require-parameter -d "Load the given project"
-complete -c subl                  --long-option command    --require-parameter -d "Run the given command"
-complete -c subl --short-option n --long-option new-window                     -d "Open a new window"
-complete -c subl --short-option a --long-option add        --require-parameter -d "Add folders to the current window"
-complete -c subl --short-option w --long-option wait                           -d "Wait for the files to be closed before returning"
-complete -c subl --short-option b --long-option background                     -d "Don't activate the application"
-complete -c subl --short-option s --long-option stay                           -d "Keep the application activated after closing the file"
-complete -c subl --short-option h --long-option help       --exclusive         -d "Show help and exit"
-complete -c subl --short-option v --long-option version    --exclusive         -d "Show version and exit"
+complete -c subl --long-option project --require-parameter -d "Load the given project"
+complete -c subl --long-option command --require-parameter -d "Run the given command"
+complete -c subl --short-option n --long-option new-window -d "Open a new window"
+complete -c subl --short-option a --long-option add --require-parameter -d "Add folders to the current window"
+complete -c subl --short-option w --long-option wait -d "Wait for the files to be closed before returning"
+complete -c subl --short-option b --long-option background -d "Don't activate the application"
+complete -c subl --short-option s --long-option stay -d "Keep the application activated after closing the file"
+complete -c subl --short-option h --long-option help --exclusive -d "Show help and exit"
+complete -c subl --short-option v --long-option version --exclusive -d "Show version and exit"
diff --git a/share/completions/sysctl.fish b/share/completions/sysctl.fish
index 5736d93b6..d5cca7390 100644
--- a/share/completions/sysctl.fish
+++ b/share/completions/sysctl.fish
@@ -1,46 +1,46 @@
 if type -q -f sysctl
-	# Only GNU and BSD sysctl seem to know "-h", so others should exit non-zero
-	if sysctl -h >/dev/null 2>/dev/null
-		# Print sysctl keys and values, separated by a tab
-		function __fish_sysctl_values
-			sysctl -a 2>/dev/null | string replace -a " = " \t
-		end
+    # Only GNU and BSD sysctl seem to know "-h", so others should exit non-zero
+    if sysctl -h >/dev/null 2>/dev/null
+        # Print sysctl keys and values, separated by a tab
+        function __fish_sysctl_values
+            sysctl -a 2>/dev/null | string replace -a " = " \t
+        end
 
-		complete -c sysctl -a '(__fish_sysctl_values)' -f
+        complete -c sysctl -a '(__fish_sysctl_values)' -f
 
-		complete -c sysctl -s w -d 'parameter to use.'
-		complete -c sysctl -s n -l values -d 'Only print values'
-		complete -c sysctl -s e -l ignore -d 'Ignore errors about unknown keys'
-		complete -c sysctl -s N -l names -d 'Only print names'
-		complete -c sysctl -s q -l quiet -d 'Be quiet when setting values'
-		complete -c sysctl -l write -d 'Write value'
-		complete -c sysctl -o 'p[FILE]' -l 'load[' -d 'Load in sysctl settings from the file specified or /etc/sysctl'
-		complete -c sysctl -s a -l all -d 'Display all values currently available'
-		complete -c sysctl -l deprecated -d 'Include deprecated parameters too'
-		complete -c sysctl -s b -l binary -d 'Print value without new line'
-		complete -c sysctl -l system -d 'Load settings from all system configuration files'
-		complete -c sysctl -s r -l pattern -d 'Only apply settings that match pattern'
-		# Don't include these as they don't do anything
-		# complete -c sysctl -s A -d 'Alias of -a'
-		# complete -c sysctl -s d -d 'Alias of -h'
-		# complete -c sysctl -s f -d 'Alias of -p'
-		# complete -c sysctl -s X -d 'Alias of -a'
-		# complete -c sysctl -s o -d 'Does nothing, exists for BSD compatibility'
-		# complete -c sysctl -s x -d 'Does nothing, exists for BSD compatibility'
-		complete -c sysctl -s h -l help -d 'Display help text and exit.'
-		complete -c sysctl -s V -l version -d 'Display version information and exit.'
-	else
-		# OSX sysctl
-		function __fish_sysctl_values
-			sysctl -a 2>/dev/null | string replace -a ":" \t
-		end
+        complete -c sysctl -s w -d 'parameter to use.'
+        complete -c sysctl -s n -l values -d 'Only print values'
+        complete -c sysctl -s e -l ignore -d 'Ignore errors about unknown keys'
+        complete -c sysctl -s N -l names -d 'Only print names'
+        complete -c sysctl -s q -l quiet -d 'Be quiet when setting values'
+        complete -c sysctl -l write -d 'Write value'
+        complete -c sysctl -o 'p[FILE]' -l 'load[' -d 'Load in sysctl settings from the file specified or /etc/sysctl'
+        complete -c sysctl -s a -l all -d 'Display all values currently available'
+        complete -c sysctl -l deprecated -d 'Include deprecated parameters too'
+        complete -c sysctl -s b -l binary -d 'Print value without new line'
+        complete -c sysctl -l system -d 'Load settings from all system configuration files'
+        complete -c sysctl -s r -l pattern -d 'Only apply settings that match pattern'
+        # Don't include these as they don't do anything
+        # complete -c sysctl -s A -d 'Alias of -a'
+        # complete -c sysctl -s d -d 'Alias of -h'
+        # complete -c sysctl -s f -d 'Alias of -p'
+        # complete -c sysctl -s X -d 'Alias of -a'
+        # complete -c sysctl -s o -d 'Does nothing, exists for BSD compatibility'
+        # complete -c sysctl -s x -d 'Does nothing, exists for BSD compatibility'
+        complete -c sysctl -s h -l help -d 'Display help text and exit.'
+        complete -c sysctl -s V -l version -d 'Display version information and exit.'
+    else
+        # OSX sysctl
+        function __fish_sysctl_values
+            sysctl -a 2>/dev/null | string replace -a ":" \t
+        end
 
-		complete -c sysctl -a '(__fish_sysctl_values)' -f
-		complete -c sysctl -s a -d 'Display all non-opaque values currently available'
-		complete -c sysctl -s A -d 'Display all MIB variables'
-		complete -c sysctl -s b -d 'Output values in a binary format'
-		complete -c sysctl -s n -d 'Show only values, not names'
-		complete -c sysctl -s w -d 'Set values'
-		complete -c sysctl -s X -d 'Like -A, but prints a hex dump'
-	end
+        complete -c sysctl -a '(__fish_sysctl_values)' -f
+        complete -c sysctl -s a -d 'Display all non-opaque values currently available'
+        complete -c sysctl -s A -d 'Display all MIB variables'
+        complete -c sysctl -s b -d 'Output values in a binary format'
+        complete -c sysctl -s n -d 'Show only values, not names'
+        complete -c sysctl -s w -d 'Set values'
+        complete -c sysctl -s X -d 'Like -A, but prints a hex dump'
+    end
 end
diff --git a/share/completions/systemctl.fish b/share/completions/systemctl.fish
index eeeb58cf0..7cdaebfc9 100644
--- a/share/completions/systemctl.fish
+++ b/share/completions/systemctl.fish
@@ -1,10 +1,10 @@
 set -l systemd_version (systemctl --version | string match "systemd*" | string replace -r "\D*(\d+)\D.*"  '$1')
 set -l commands list-units list-sockets start stop reload restart try-restart reload-or-restart reload-or-try-restart \
-isolate kill is-active is-failed status show get-cgroup-attr set-cgroup-attr unset-cgroup-attr set-cgroup help \
-reset-failed list-unit-files enable disable is-enabled reenable preset mask unmask link load list-jobs cancel dump \
-list-dependencies snapshot delete daemon-reload daemon-reexec show-environment set-environment unset-environment \
-default rescue emergency halt poweroff reboot kexec exit suspend hibernate hybrid-sleep switch-root list-timers \
-set-property
+    isolate kill is-active is-failed status show get-cgroup-attr set-cgroup-attr unset-cgroup-attr set-cgroup help \
+    reset-failed list-unit-files enable disable is-enabled reenable preset mask unmask link load list-jobs cancel dump \
+    list-dependencies snapshot delete daemon-reload daemon-reexec show-environment set-environment unset-environment \
+    default rescue emergency halt poweroff reboot kexec exit suspend hibernate hybrid-sleep switch-root list-timers \
+    set-property
 if test $systemd_version -gt 208 2>/dev/null
     set commands $commands cat
     if test $systemd_version -gt 217 2>/dev/null
diff --git a/share/completions/systemd-analyze.fish b/share/completions/systemd-analyze.fish
index 268f6aa0c..50f04eb02 100644
--- a/share/completions/systemd-analyze.fish
+++ b/share/completions/systemd-analyze.fish
@@ -9,12 +9,12 @@ complete -f -c systemd-analzye -l system -d 'Talk to the service manager of the
 
 set -l commands time blame critical-chain plot dot set-log-level set-log-target dump verify
 
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a time -d  "Print time spent in the kernel" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a blame -d  "Print list of running units ordered by time to init" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a critical-chain -d  "Print a tree of the time critical chain of units" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a plot -d  "Output SVG graphic showing service initialization" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dot -d  "Output dependency graph in dot(1) format" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-level -d  "Set logging threshold for manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-target -d  "Set logging target for manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dump -d  "Output state serialization of service manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a verify -d  "Check unit files for correctness"
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a time -d "Print time spent in the kernel" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a blame -d "Print list of running units ordered by time to init" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a critical-chain -d "Print a tree of the time critical chain of units" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a plot -d "Output SVG graphic showing service initialization" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dot -d "Output dependency graph in dot(1) format" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-level -d "Set logging threshold for manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-target -d "Set logging target for manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dump -d "Output state serialization of service manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a verify -d "Check unit files for correctness"
diff --git a/share/completions/tail.fish b/share/completions/tail.fish
index b3daaae61..48ea9d9b0 100644
--- a/share/completions/tail.fish
+++ b/share/completions/tail.fish
@@ -1,4 +1,4 @@
-if tail --version > /dev/null 2>/dev/null
+if tail --version >/dev/null 2>/dev/null
     complete -c tail -s c -l bytes -x -d 'output the last K bytes; alternatively, use -c +K to output bytes starting with the Kth of each file'
     complete -c tail -s f -l follow -a 'name descriptor' -d 'output appended data as the file grows; -f -l follow, and --follow=descriptor are equivalent'
     complete -c tail -s F -d 'same as --follow=name --retry'
@@ -18,5 +18,5 @@ else # OSX and similar - no longopts (and fewer shortopts)
     complete -c tail -s F -d 'Like -f, but also follow renamed or rotated files'
     complete -c tail -s n -x -d 'output the last K lines, instead of the last 10 - or only K lines with -r'
     complete -c tail -s q -d 'never output headers giving file names'
-	complete -c tail -s r -d 'Display input in reverse order' # Only in OSX
+    complete -c tail -s r -d 'Display input in reverse order' # Only in OSX
 end
diff --git a/share/completions/tee.fish b/share/completions/tee.fish
index 5224a6d65..af0e88626 100644
--- a/share/completions/tee.fish
+++ b/share/completions/tee.fish
@@ -1,4 +1,4 @@
-complete -c tee -s a -l append              -d 'append to the given FILEs, do not overwrite'
-complete -c tee -s i -l ignore-interrupts   -d 'ignore interrupt signals'
-complete -c tee -l help     -d 'display this help and exit'
-complete -c tee -l version  -d 'output version information and exit'
+complete -c tee -s a -l append -d 'append to the given FILEs, do not overwrite'
+complete -c tee -s i -l ignore-interrupts -d 'ignore interrupt signals'
+complete -c tee -l help -d 'display this help and exit'
+complete -c tee -l version -d 'output version information and exit'
diff --git a/share/completions/tex.fish b/share/completions/tex.fish
index ea70405d5..c6c6b11a4 100644
--- a/share/completions/tex.fish
+++ b/share/completions/tex.fish
@@ -4,14 +4,14 @@ complete -c tex -x -a "(
 __fish_complete_suffix (commandline -ct) .tex '(La)TeX file'
 )"
 
-complete -c tex -o     file-line-error -d "Show errors in style file:line"
-complete -c tex -o  no-file-line-error -d "Show errors not in style file:line"
-complete -c tex -o  halt-on-error      -d "Stop processing at the first error"
-complete -c tex -o  interaction=batchmode   -d "Set interaction mode"
-complete -c tex -o  interaction=nonstopmode -d "Set interaction mode"
-complete -c tex -o  interaction=scrollmode -d "Set interaction mode"
-complete -c tex -o  interaction=errorstopmode -d "Set interaction mode"
-complete -c tex -o  output-directory=  -x -a "(__fish_complete_directories (commandline -ct))" -d "Output directory"
-complete -c tex -o     shell-escape    -d "Enable \write18{SHELL COMMAND}"
-complete -c tex -o  no-shell-escape    -d "Disable \write18{SHELL COMMAND}"
-complete -c tex -o  src-specials       -d "Insert source specials into the DVI file"
+complete -c tex -o file-line-error -d "Show errors in style file:line"
+complete -c tex -o no-file-line-error -d "Show errors not in style file:line"
+complete -c tex -o halt-on-error -d "Stop processing at the first error"
+complete -c tex -o interaction=batchmode -d "Set interaction mode"
+complete -c tex -o interaction=nonstopmode -d "Set interaction mode"
+complete -c tex -o interaction=scrollmode -d "Set interaction mode"
+complete -c tex -o interaction=errorstopmode -d "Set interaction mode"
+complete -c tex -o output-directory= -x -a "(__fish_complete_directories (commandline -ct))" -d "Output directory"
+complete -c tex -o shell-escape -d "Enable \write18{SHELL COMMAND}"
+complete -c tex -o no-shell-escape -d "Disable \write18{SHELL COMMAND}"
+complete -c tex -o src-specials -d "Insert source specials into the DVI file"
diff --git a/share/completions/tmuxinator.fish b/share/completions/tmuxinator.fish
index 4005bf077..cef33a69d 100644
--- a/share/completions/tmuxinator.fish
+++ b/share/completions/tmuxinator.fish
@@ -1,11 +1,11 @@
 function __fish_tmuxinator_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1  ]
-    if [ $argv[1] = $cmd[2]  ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 complete -f -c tmuxinator -a '(tmuxinator completions start)'
diff --git a/share/completions/touch.fish b/share/completions/touch.fish
index 8dc69477e..0e6015083 100644
--- a/share/completions/touch.fish
+++ b/share/completions/touch.fish
@@ -1,22 +1,22 @@
-if touch --version 2>/dev/null > /dev/null # GNU
-	complete -c touch -s a -d "Change access time"
-	complete -c touch -s B -l backward -x -d "Set date back"
-	complete -c touch -s c -l no-create -d "Do not create file"
-	complete -c touch -s d -l date -x -d "Set date"
-	complete -c touch -s f -l forward -x -d "Set date forward"
-	complete -c touch -s m -d "Change modification time"
-	complete -c touch -s r -l reference -d "Use this files times"
-	complete -c touch -s t -d "Set date"
-	complete -c touch -l time -x -d "Set time"
-	complete -c touch -l help -d "Display help and exit"
-	complete -c touch -l version -d "Display version and exit"
+if touch --version 2>/dev/null >/dev/null # GNU
+    complete -c touch -s a -d "Change access time"
+    complete -c touch -s B -l backward -x -d "Set date back"
+    complete -c touch -s c -l no-create -d "Do not create file"
+    complete -c touch -s d -l date -x -d "Set date"
+    complete -c touch -s f -l forward -x -d "Set date forward"
+    complete -c touch -s m -d "Change modification time"
+    complete -c touch -s r -l reference -d "Use this files times"
+    complete -c touch -s t -d "Set date"
+    complete -c touch -l time -x -d "Set time"
+    complete -c touch -l help -d "Display help and exit"
+    complete -c touch -l version -d "Display version and exit"
 else # OS X
-	complete -c touch -s A -d "Adjust access and modification time stamps by specified VALUE" -r
-	complete -c touch -s a -d "Change access time of file"
-	complete -c touch -s c -d "Don't create file if it doesn't exist"
-	complete -c touch -s f -d "Attempt to force the update, even when permission don't permit"
-	complete -c touch -s h -d "Change times of the symlink ranther than the file. Implies `-c'"
-	complete -c touch -s m -d "Change modification time of file"
-	complete -c touch -s r -d "Use access and modifications times from specified file rather than current time of day"
-	complete -c touch -s t -d "Change access and modifications times to specified file rather than current time of day"
+    complete -c touch -s A -d "Adjust access and modification time stamps by specified VALUE" -r
+    complete -c touch -s a -d "Change access time of file"
+    complete -c touch -s c -d "Don't create file if it doesn't exist"
+    complete -c touch -s f -d "Attempt to force the update, even when permission don't permit"
+    complete -c touch -s h -d "Change times of the symlink ranther than the file. Implies `-c'"
+    complete -c touch -s m -d "Change modification time of file"
+    complete -c touch -s r -d "Use access and modifications times from specified file rather than current time of day"
+    complete -c touch -s t -d "Change access and modifications times to specified file rather than current time of day"
 end
\ No newline at end of file
diff --git a/share/completions/tr.fish b/share/completions/tr.fish
index cc450897d..e2c455af5 100644
--- a/share/completions/tr.fish
+++ b/share/completions/tr.fish
@@ -4,49 +4,49 @@
 
 # Test if we are using GNU tr
 if command tr --version >/dev/null 2>/dev/null
-  complete -c tr -x
-  complete -c tr -s c -s C -l complement -d 'use the complement of SET1'
-  complete -c tr -s d -l delete          -d 'delete characters in SET1, do not translate'
-  complete -c tr -s s -l squeeze-repeats -d 'replace each input sequence of a repeated character that is listed in SET1 with a single occurrence of that character'
-  complete -c tr -s t -l truncate-set1   -d 'first truncate SET1 to length of SET2'
-  complete -c tr -l help                 -d 'display this help and exit'
-  complete -c tr -l version              -d 'output version information and exit'
+    complete -c tr -x
+    complete -c tr -s c -s C -l complement -d 'use the complement of SET1'
+    complete -c tr -s d -l delete -d 'delete characters in SET1, do not translate'
+    complete -c tr -s s -l squeeze-repeats -d 'replace each input sequence of a repeated character that is listed in SET1 with a single occurrence of that character'
+    complete -c tr -s t -l truncate-set1 -d 'first truncate SET1 to length of SET2'
+    complete -c tr -l help -d 'display this help and exit'
+    complete -c tr -l version -d 'output version information and exit'
 
-  complete -c tr -a '[:alnum:]'  -d 'all letters and digits'
-  complete -c tr -a '[:alpha:]'  -d 'all letters'
-  complete -c tr -a '[:blank:]'  -d 'all horizontal whitespace'
-  complete -c tr -a '[:cntrl:]'  -d 'all control characters'
-  complete -c tr -a '[:digit:]'  -d 'all digits'
-  complete -c tr -a '[:graph:]'  -d 'all printable characters, not including space'
-  complete -c tr -a '[:lower:]'  -d 'all lower case letters'
-  complete -c tr -a '[:print:]'  -d 'all printable characters, including space'
-  complete -c tr -a '[:punct:]'  -d 'all punctuation characters'
-  complete -c tr -a '[:space:]'  -d 'all horizontal or vertical whitespace'
-  complete -c tr -a '[:upper:]'  -d 'all upper case letters'
-  complete -c tr -a '[:xdigit:]' -d 'all hexadecimal digits'
+    complete -c tr -a '[:alnum:]' -d 'all letters and digits'
+    complete -c tr -a '[:alpha:]' -d 'all letters'
+    complete -c tr -a '[:blank:]' -d 'all horizontal whitespace'
+    complete -c tr -a '[:cntrl:]' -d 'all control characters'
+    complete -c tr -a '[:digit:]' -d 'all digits'
+    complete -c tr -a '[:graph:]' -d 'all printable characters, not including space'
+    complete -c tr -a '[:lower:]' -d 'all lower case letters'
+    complete -c tr -a '[:print:]' -d 'all printable characters, including space'
+    complete -c tr -a '[:punct:]' -d 'all punctuation characters'
+    complete -c tr -a '[:space:]' -d 'all horizontal or vertical whitespace'
+    complete -c tr -a '[:upper:]' -d 'all upper case letters'
+    complete -c tr -a '[:xdigit:]' -d 'all hexadecimal digits'
 else
-  # If not a GNU system, assume we have standard BSD tr features instead
-  complete -c tr -x
-  complete -c tr -s C -d 'Complement the set of characters in string1.'
-  complete -c tr -s c -d 'Same as -C but complement the set of values in string1.'
-  complete -c tr -s d -d 'Delete characters in string1 from the input.'
-  complete -c tr -s s -d 'Squeeze multiple occurrences of the characters listed in the last operand (either string1 or string2) in the input into a single instance of the character.'
-  complete -c tr -l u -d 'Guarantee that any output is unbuffered.'
+    # If not a GNU system, assume we have standard BSD tr features instead
+    complete -c tr -x
+    complete -c tr -s C -d 'Complement the set of characters in string1.'
+    complete -c tr -s c -d 'Same as -C but complement the set of values in string1.'
+    complete -c tr -s d -d 'Delete characters in string1 from the input.'
+    complete -c tr -s s -d 'Squeeze multiple occurrences of the characters listed in the last operand (either string1 or string2) in the input into a single instance of the character.'
+    complete -c tr -l u -d 'Guarantee that any output is unbuffered.'
 
-  complete -c tr -a '[:alnum:]'     -d 'alphanumeric characters'
-  complete -c tr -a '[:alpha:]'     -d 'alphabetic characters'
-  complete -c tr -a '[:blank:]'     -d 'whitespace characters'
-  complete -c tr -a '[:cntrl:]'     -d 'control characters'
-  complete -c tr -a '[:digit:]'     -d 'numeric characters'
-  complete -c tr -a '[:graph:]'     -d 'graphic characters'
-  complete -c tr -a '[:ideogram:]'  -d 'ideographic characters'
-  complete -c tr -a '[:lower:]'     -d 'lower-case alphabetic characters'
-  complete -c tr -a '[:phonogram:]' -d 'phonographic characters'
-  complete -c tr -a '[:print:]'     -d 'printable characters'
-  complete -c tr -a '[:punct:]'     -d 'punctuation characters'
-  complete -c tr -a '[:rune:]'      -d 'valid characters'
-  complete -c tr -a '[:space:]'     -d 'space characters'
-  complete -c tr -a '[:special:]'   -d 'special characters'
-  complete -c tr -a '[:upper:]'     -d 'upper-case characters'
-  complete -c tr -a '[:xdigit:]'    -d 'hexadecimal characters'
+    complete -c tr -a '[:alnum:]' -d 'alphanumeric characters'
+    complete -c tr -a '[:alpha:]' -d 'alphabetic characters'
+    complete -c tr -a '[:blank:]' -d 'whitespace characters'
+    complete -c tr -a '[:cntrl:]' -d 'control characters'
+    complete -c tr -a '[:digit:]' -d 'numeric characters'
+    complete -c tr -a '[:graph:]' -d 'graphic characters'
+    complete -c tr -a '[:ideogram:]' -d 'ideographic characters'
+    complete -c tr -a '[:lower:]' -d 'lower-case alphabetic characters'
+    complete -c tr -a '[:phonogram:]' -d 'phonographic characters'
+    complete -c tr -a '[:print:]' -d 'printable characters'
+    complete -c tr -a '[:punct:]' -d 'punctuation characters'
+    complete -c tr -a '[:rune:]' -d 'valid characters'
+    complete -c tr -a '[:space:]' -d 'space characters'
+    complete -c tr -a '[:special:]' -d 'special characters'
+    complete -c tr -a '[:upper:]' -d 'upper-case characters'
+    complete -c tr -a '[:xdigit:]' -d 'hexadecimal characters'
 end
diff --git a/share/completions/travis.fish b/share/completions/travis.fish
index 2811d8769..8ba924d25 100644
--- a/share/completions/travis.fish
+++ b/share/completions/travis.fish
@@ -1,64 +1,64 @@
 function __fish_travis_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_travis_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 # Commands
-complete -c travis -f -n '__fish_travis_needs_command' -a 'accounts'        -d "Displays accounts and their subscription status"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'branches'        -d "Displays the most recent build for each branch"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cache'           -d "Lists or deletes repository caches"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cancel'          -d "Cancels a job or build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'console'         -d "Interactive shell"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'disable'         -d "Disables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'enable'          -d "Enables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt'         -d "Encrypts values for the .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt-file'    -d "Encrypts a file and adds decryption steps to .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'endpoint'        -d "Displays or changes the API endpoint"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'env'             -d "Show or modify build environment variables"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'help'            -d "Helps you out when in dire need of information"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'history'         -d "Displays a projects build history"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'init'            -d "Generates a .travis.yml and enables the project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'lint'            -d "Display warnings for a .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'login'           -d "Authenticates against the API and stores the token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logout'          -d "Deletes the stored API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logs'            -d "Streams test logs"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'monitor'         -d "Live monitor for what's going on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'open'            -d "Opens a build or job in the browser"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'pubkey'          -d "Prints out a repository's public key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'raw'             -d "Makes an (authenticated) API call and prints out the result"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'report'          -d "Generates a report useful for filing issues"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'repos'           -d "Lists repositories the user has certain permissions on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'requests'        -d "Lists recent requests"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'restart'         -d "Restarts a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'settings'        -d "Access repository settings"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'setup'           -d "Sets up an addon or deploy target"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'show'            -d "Displays a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sshkey'          -d "Checks, updates or deletes an SSH key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'status'          -d "Checks status of the latest build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sync'            -d "Triggers a new sync with GitHub"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'token'           -d "Outputs the secret API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'version'         -d "Outputs the client version"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whatsup'         -d "Lists most recent builds"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whoami'          -d "Outputs the current user"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'accounts' -d "Displays accounts and their subscription status"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'branches' -d "Displays the most recent build for each branch"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'cache' -d "Lists or deletes repository caches"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'cancel' -d "Cancels a job or build"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'console' -d "Interactive shell"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'disable' -d "Disables a project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'enable' -d "Enables a project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt' -d "Encrypts values for the .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt-file' -d "Encrypts a file and adds decryption steps to .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'endpoint' -d "Displays or changes the API endpoint"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'env' -d "Show or modify build environment variables"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'help' -d "Helps you out when in dire need of information"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'history' -d "Displays a projects build history"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'init' -d "Generates a .travis.yml and enables the project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'lint' -d "Display warnings for a .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'login' -d "Authenticates against the API and stores the token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'logout' -d "Deletes the stored API token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'logs' -d "Streams test logs"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'monitor' -d "Live monitor for what's going on"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'open' -d "Opens a build or job in the browser"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'pubkey' -d "Prints out a repository's public key"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'raw' -d "Makes an (authenticated) API call and prints out the result"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'report' -d "Generates a report useful for filing issues"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'repos' -d "Lists repositories the user has certain permissions on"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'requests' -d "Lists recent requests"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'restart' -d "Restarts a build or job"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'settings' -d "Access repository settings"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'setup' -d "Sets up an addon or deploy target"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'show' -d "Displays a build or job"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'sshkey' -d "Checks, updates or deletes an SSH key"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'status' -d "Checks status of the latest build"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'sync' -d "Triggers a new sync with GitHub"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'token' -d "Outputs the secret API token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'version' -d "Outputs the client version"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'whatsup' -d "Lists most recent builds"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'whoami' -d "Outputs the current user"
 
 # General Options
-complete -c travis -f                                      -s h -l help                     -d "Display help"
-complete -c travis -f -n 'not __fish_travis_needs_command' -s i -l interactive              -d "Be interactive and colorful"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l no-interactive           -d "Don't be interactive and colorful"
-complete -c travis -f -n 'not __fish_travis_needs_command' -s E -l explode                  -d "Don't rescue exceptions"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l no-explode               -d "Rescue exceptions"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l skip-version-check       -d "Don't check if travis client is up to date"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l skip-completion-check    -d "Don't check if auto-completion is set up"
+complete -c travis -f -s h -l help -d "Display help"
+complete -c travis -f -n 'not __fish_travis_needs_command' -s i -l interactive -d "Be interactive and colorful"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l no-interactive -d "Don't be interactive and colorful"
+complete -c travis -f -n 'not __fish_travis_needs_command' -s E -l explode -d "Don't rescue exceptions"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l no-explode -d "Rescue exceptions"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l skip-version-check -d "Don't check if travis client is up to date"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l skip-completion-check -d "Don't check if auto-completion is set up"
diff --git a/share/completions/tree.fish b/share/completions/tree.fish
index b32fb3fc1..d44aaa318 100644
--- a/share/completions/tree.fish
+++ b/share/completions/tree.fish
@@ -1,58 +1,58 @@
 
 
 ## Listing options
-complete -c tree -s a            -d 'All files are listed'
-complete -c tree -s d            -d 'List directories only'
-complete -c tree -s l            -d 'Follow symbolic links like directories'
-complete -c tree -s f            -d 'Print the full path prefix for each file'
-complete -c tree -s x            -d 'Stay on current filesystem only'
-complete -c tree -s L -x         -d 'Descend only level directories deep'
-complete -c tree -s R            -d 'Rerun tree when max dir level reached'
-complete -c tree -s P -r         -d 'List only those files that match the pattern given'
-complete -c tree -s I -r         -d 'Do not list files that match the given pattern'
-complete -c tree -l noreport     -d 'Turn off file/directory count at end of tree listing'
-complete -c tree -l charset -x   -d 'Use charset X for terminal/HTML and indentation line output'
+complete -c tree -s a -d 'All files are listed'
+complete -c tree -s d -d 'List directories only'
+complete -c tree -s l -d 'Follow symbolic links like directories'
+complete -c tree -s f -d 'Print the full path prefix for each file'
+complete -c tree -s x -d 'Stay on current filesystem only'
+complete -c tree -s L -x -d 'Descend only level directories deep'
+complete -c tree -s R -d 'Rerun tree when max dir level reached'
+complete -c tree -s P -r -d 'List only those files that match the pattern given'
+complete -c tree -s I -r -d 'Do not list files that match the given pattern'
+complete -c tree -l noreport -d 'Turn off file/directory count at end of tree listing'
+complete -c tree -l charset -x -d 'Use charset X for terminal/HTML and indentation line output'
 complete -c tree -l filelimit -r -d 'Do not descend dirs with more than # files in them'
-complete -c tree -l timefmt -x   -d 'Print and format time according to the format <f>'
-complete -c tree -s o -r         -d 'Output to file instead of stdout'
+complete -c tree -l timefmt -x -d 'Print and format time according to the format <f>'
+complete -c tree -s o -r -d 'Output to file instead of stdout'
 
 ## File options
-complete -c tree -s q            -d 'Print non-printable characters as \'?\''
-complete -c tree -s N            -d 'Print non-printable characters as is'
-complete -c tree -s Q            -d 'Quote filenames with double quotes'
-complete -c tree -s p            -d 'Print the protections for each file'
-complete -c tree -s u            -d 'Displays file owner or UID number'
-complete -c tree -s g            -d 'Displays file group owner or GID number'
-complete -c tree -s s            -d 'Print the size in bytes of each file'
-complete -c tree -s h            -d 'Print the size in a more human readable way'
-complete -c tree -l si           -d 'Like -h, but use in SI units (powers of 1000)'
-complete -c tree -s D            -d 'Print the date of last modification or (-c) status change'
-complete -c tree -s F            -d 'Appends \'/\', \'=\', \'*\', \'@\', \'|\' or \'>\' as per ls -F'
-complete -c tree -l inodes       -d 'Print inode number of each file'
-complete -c tree -l device       -d 'Print device ID number to which each file belongs'
+complete -c tree -s q -d 'Print non-printable characters as \'?\''
+complete -c tree -s N -d 'Print non-printable characters as is'
+complete -c tree -s Q -d 'Quote filenames with double quotes'
+complete -c tree -s p -d 'Print the protections for each file'
+complete -c tree -s u -d 'Displays file owner or UID number'
+complete -c tree -s g -d 'Displays file group owner or GID number'
+complete -c tree -s s -d 'Print the size in bytes of each file'
+complete -c tree -s h -d 'Print the size in a more human readable way'
+complete -c tree -l si -d 'Like -h, but use in SI units (powers of 1000)'
+complete -c tree -s D -d 'Print the date of last modification or (-c) status change'
+complete -c tree -s F -d 'Appends \'/\', \'=\', \'*\', \'@\', \'|\' or \'>\' as per ls -F'
+complete -c tree -l inodes -d 'Print inode number of each file'
+complete -c tree -l device -d 'Print device ID number to which each file belongs'
 
 
 ## Sorting options
-complete -c tree -s v            -d 'Sort files alphanumerically by version'
-complete -c tree -s r            -d 'Sort files in reverse alphanumeric order'
-complete -c tree -s t            -d 'Sort files by last modification time'
-complete -c tree -s c            -d 'Sort files by last status change time'
-complete -c tree -s U            -d 'Leave files unsorted'
-complete -c tree -l dirsfirst    -d 'List directories before files (-U disables)'
+complete -c tree -s v -d 'Sort files alphanumerically by version'
+complete -c tree -s r -d 'Sort files in reverse alphanumeric order'
+complete -c tree -s t -d 'Sort files by last modification time'
+complete -c tree -s c -d 'Sort files by last status change time'
+complete -c tree -s U -d 'Leave files unsorted'
+complete -c tree -l dirsfirst -d 'List directories before files (-U disables)'
 
 ## Graphics options
-complete -c tree -s i            -d 'Don\'t print indentation lines'
-complete -c tree -s A            -d 'Print ANSI lines graphic indentation lines'
-complete -c tree -s S            -d 'Print with ASCII graphics indentation lines'
-complete -c tree -s n            -d 'Turn colorization off always (-C overrides)'
-complete -c tree -s C            -d 'Turn colorization on always'
+complete -c tree -s i -d 'Don\'t print indentation lines'
+complete -c tree -s A -d 'Print ANSI lines graphic indentation lines'
+complete -c tree -s S -d 'Print with ASCII graphics indentation lines'
+complete -c tree -s n -d 'Turn colorization off always (-C overrides)'
+complete -c tree -s C -d 'Turn colorization on always'
 
 ## XML/HTML options
-complete -c tree -s X            -d 'Prints out an XML representation of the tree'
-complete -c tree -s H -r         -d 'Prints out HTML format with baseHREF as top directory'
-complete -c tree -s T -r         -d 'Replace the default HTML title and H1 header with string'
-complete -c tree -l nolinks      -d 'Turn off hyperlinks in HTML output'
+complete -c tree -s X -d 'Prints out an XML representation of the tree'
+complete -c tree -s H -r -d 'Prints out HTML format with baseHREF as top directory'
+complete -c tree -s T -r -d 'Replace the default HTML title and H1 header with string'
+complete -c tree -l nolinks -d 'Turn off hyperlinks in HTML output'
 
 ## Miscellaneous options
-complete -c tree -l version      -d 'Print version and exit'
-complete -c tree -l help         -d 'Print usage and this help message and exit'
+complete -c tree -l version -d 'Print version and exit'
+complete -c tree -l help -d 'Print usage and this help message and exit'
diff --git a/share/completions/uname.fish b/share/completions/uname.fish
index 10d7acf50..a0b62b0b5 100644
--- a/share/completions/uname.fish
+++ b/share/completions/uname.fish
@@ -1,21 +1,21 @@
 if test (uname) = Darwin
-  complete -c uname -s a -d 'Behave as though all of the options mnrsv were specified.'
-  complete -c uname -s m -d 'print the machine hardware name.'
-  complete -c uname -s n -d 'print the nodename'
-  complete -c uname -s p -d 'print the machine processor architecture name.'
-  complete -c uname -s r -d 'print the operating system release.'
-  complete -c uname -s s -d 'print the operating system name.'
-  complete -c uname -s v -d 'print the operating system version.'
+    complete -c uname -s a -d 'Behave as though all of the options mnrsv were specified.'
+    complete -c uname -s m -d 'print the machine hardware name.'
+    complete -c uname -s n -d 'print the nodename'
+    complete -c uname -s p -d 'print the machine processor architecture name.'
+    complete -c uname -s r -d 'print the operating system release.'
+    complete -c uname -s s -d 'print the operating system name.'
+    complete -c uname -s v -d 'print the operating system version.'
 else
-  complete -c uname -s a -l all -d "Print all information"
-  complete -c uname -s s -l kernel-name -d "Print kernel name"
-  complete -c uname -s n -l nodename -d "Print network node hostname"
-  complete -c uname -s r -l kernel-release -d "Print kernel release"
-  complete -c uname -s v -l kernel-version -d "Print kernel version"
-  complete -c uname -s m -l machine -d "Print machine name"
-  complete -c uname -s p -l processor -d "Print processor"
-  complete -c uname -s i -l hardware-platform -d "Print hardware platform"
-  complete -c uname -s o -l operating-system -d "Print operating system"
-  complete -c uname -l help -d "Display help and exit"
-  complete -c uname -l version -d "Display version and exit"
+    complete -c uname -s a -l all -d "Print all information"
+    complete -c uname -s s -l kernel-name -d "Print kernel name"
+    complete -c uname -s n -l nodename -d "Print network node hostname"
+    complete -c uname -s r -l kernel-release -d "Print kernel release"
+    complete -c uname -s v -l kernel-version -d "Print kernel version"
+    complete -c uname -s m -l machine -d "Print machine name"
+    complete -c uname -s p -l processor -d "Print processor"
+    complete -c uname -s i -l hardware-platform -d "Print hardware platform"
+    complete -c uname -s o -l operating-system -d "Print operating system"
+    complete -c uname -l help -d "Display help and exit"
+    complete -c uname -l version -d "Display version and exit"
 end
diff --git a/share/completions/unexpand.fish b/share/completions/unexpand.fish
index 2b59db4e2..145baaa10 100644
--- a/share/completions/unexpand.fish
+++ b/share/completions/unexpand.fish
@@ -1,6 +1,6 @@
-complete -c unexpand -s a -l all        -d 'convert all blanks, instead of just initial blanks'
-complete -c unexpand -l first-only      -d 'convert only leading sequences of blanks (overrides -a)'
-complete -c unexpand -s t -l tabs -x    -d 'have tabs N characters apart instead of 8 (enables -a)'
-complete -c unexpand -s t -l tabs -x    -d 'use comma separated LIST of tab positions (enables -a)'
-complete -c unexpand -l help     -d 'display this help and exit'
-complete -c unexpand -l version  -d 'output version information and exit'
+complete -c unexpand -s a -l all -d 'convert all blanks, instead of just initial blanks'
+complete -c unexpand -l first-only -d 'convert only leading sequences of blanks (overrides -a)'
+complete -c unexpand -s t -l tabs -x -d 'have tabs N characters apart instead of 8 (enables -a)'
+complete -c unexpand -s t -l tabs -x -d 'use comma separated LIST of tab positions (enables -a)'
+complete -c unexpand -l help -d 'display this help and exit'
+complete -c unexpand -l version -d 'output version information and exit'
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index e02062571..6d966ffb4 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -1,23 +1,23 @@
-if uniq --version > /dev/null 2>/dev/null
-	complete -c uniq -s c -l count -d "Print number of occurences"
-	complete -c uniq -s d -l repeated -d "Only print duplicates"
-	complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
+if uniq --version >/dev/null 2>/dev/null
+    complete -c uniq -s c -l count -d "Print number of occurences"
+    complete -c uniq -s d -l repeated -d "Only print duplicates"
+    complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
 		none\t'Remove none-duplicate lines'
 		prepend\t'Remove non-duplicate lines and print an empty line before each non-duplicate'
 		separate\t'Remove non-duplicate lines and print an empty line between each non-duplicate'
 	"
-	complete -c uniq -s f -l skip-fields -d "Avoid comparing first N fields" -r
-	complete -c uniq -s i -l ignore-case -d "Case insensitive"
-	complete -c uniq -s s -l skip-chars -d "Avoid comparing first N characters" -r
-	complete -c uniq -s u -l unique -d "Only print unique lines"
-	complete -c uniq -s w -l check-chars -d "Compare only specified number of characters" -r
-	complete -c uniq -l help -d "Display help and exit"
-	complete -c uniq -l version -d "Display version and exit"
+    complete -c uniq -s f -l skip-fields -d "Avoid comparing first N fields" -r
+    complete -c uniq -s i -l ignore-case -d "Case insensitive"
+    complete -c uniq -s s -l skip-chars -d "Avoid comparing first N characters" -r
+    complete -c uniq -s u -l unique -d "Only print unique lines"
+    complete -c uniq -s w -l check-chars -d "Compare only specified number of characters" -r
+    complete -c uniq -l help -d "Display help and exit"
+    complete -c uniq -l version -d "Display version and exit"
 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 u -d 'Only print unique lines'
-	complete -c uniq -s i -d 'Case insensitive comparision'
+    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 u -d 'Only print unique lines'
+    complete -c uniq -s i -d 'Case insensitive comparision'
 end
diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish
index 1c87aceed..6fed9b7a6 100644
--- a/share/completions/unzip.fish
+++ b/share/completions/unzip.fish
@@ -1,42 +1,42 @@
-complete -c unzip -s p  -d "extract files to pipe, no messages"
-complete -c unzip -s f  -d "freshen existing files, create none"
-complete -c unzip -s u  -d "update files, create if necessary"
-complete -c unzip -s v  -d "list verbosely/show version info"
-complete -c unzip -s x  -d "exclude files that follow (in xlist)"
-complete -c unzip -s l  -d "list files (short format)"
-complete -c unzip -s t  -d "test compressed archive datamodifiers:"
-complete -c unzip -s z  -d "display archive comment only"
-complete -c unzip -s T  -d "timestamp archive to latest"
-complete -c unzip -s d  -d "extract files into dir" -xa '(__fish_complete_directories)'
-complete -c unzip -s n  -d "never overwrite existing files"
-complete -c unzip -s o  -d "overwrite files WITHOUT prompting"
-complete -c unzip -s q  -d "quiet mode"
+complete -c unzip -s p -d "extract files to pipe, no messages"
+complete -c unzip -s f -d "freshen existing files, create none"
+complete -c unzip -s u -d "update files, create if necessary"
+complete -c unzip -s v -d "list verbosely/show version info"
+complete -c unzip -s x -d "exclude files that follow (in xlist)"
+complete -c unzip -s l -d "list files (short format)"
+complete -c unzip -s t -d "test compressed archive datamodifiers:"
+complete -c unzip -s z -d "display archive comment only"
+complete -c unzip -s T -d "timestamp archive to latest"
+complete -c unzip -s d -d "extract files into dir" -xa '(__fish_complete_directories)'
+complete -c unzip -s n -d "never overwrite existing files"
+complete -c unzip -s o -d "overwrite files WITHOUT prompting"
+complete -c unzip -s q -d "quiet mode"
 complete -c unzip -o qq -d "quieter mode"
-complete -c unzip -s a  -d "auto-convert any text files"
-complete -c unzip -s U  -d "use escapes for all non-ASCII Unicode"
+complete -c unzip -s a -d "auto-convert any text files"
+complete -c unzip -s U -d "use escapes for all non-ASCII Unicode"
 complete -c unzip -o UU -d "ignore any Unicode fields"
-complete -c unzip -s j  -d "junk paths (do not make directories)"
+complete -c unzip -s j -d "junk paths (do not make directories)"
 complete -c unzip -s aa -d "treat ALL files as text"
-complete -c unzip -s C  -d "match filenames case-insensitively"
-complete -c unzip -s L  -d "make (some) names lowercase"
-complete -c unzip -s X  -d "restore UID/GID info"
-complete -c unzip -s V  -d "retain VMS version numbers"
-complete -c unzip -s K  -d "keep setuid/setgid/tacky permissions"
-complete -c unzip -s M  -d "pipe through `more` pager"
+complete -c unzip -s C -d "match filenames case-insensitively"
+complete -c unzip -s L -d "make (some) names lowercase"
+complete -c unzip -s X -d "restore UID/GID info"
+complete -c unzip -s V -d "retain VMS version numbers"
+complete -c unzip -s K -d "keep setuid/setgid/tacky permissions"
+complete -c unzip -s M -d "pipe through `more` pager"
 
 # Debian version of unzip
 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_first_token' -xa '(__fish_complete_suffix .zip)'
+    # the first non-switch argument should be the zipfile
+    complete -c unzip -n '__fish_is_first_token' -xa '(__fish_complete_suffix .zip)'
 
-	# Files thereafter are either files to include or exclude from the operation
-	set -l zipfile
-	complete -c unzip -n 'not __fish_is_first_token' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
+    # Files thereafter are either files to include or exclude from the operation
+    set -l zipfile
+    complete -c unzip -n 'not __fish_is_first_token' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
 
 else
 
-	# all tokens should be zip files
-	complete -c unzip -xa '(__fish_complete_suffix .zip)'
+    # all tokens should be zip files
+    complete -c unzip -xa '(__fish_complete_suffix .zip)'
 
 end
diff --git a/share/completions/vagrant.fish b/share/completions/vagrant.fish
index 25b7becbd..fed81c29b 100644
--- a/share/completions/vagrant.fish
+++ b/share/completions/vagrant.fish
@@ -3,12 +3,12 @@
 #
 # Apparently options can only come after commands, with the exception of "-v" and "-h", which are effectively commands.
 set -l commands box cloud connect destroy \
-docker-{exec,logs,run} \
-global-status halt help init list-commands login \
-package plugin provision push rdp reload resume \
-rsync rsync-auto share snapshot ssh ssh-config \
-status suspend up version \
-port powershell winrm{,-config}
+    docker-{exec,logs,run} \
+    global-status halt help init list-commands login \
+    package plugin provision push rdp reload resume \
+    rsync rsync-auto share snapshot ssh ssh-config \
+    status suspend up version \
+    port powershell winrm{,-config}
 
 set -l box_commands add help list outdated prune remove repackage update
 set -l cloud_commands auth box search provider publish version
@@ -48,7 +48,7 @@ function __fish_vagrant_running_machines
     if set -l state (__fish_print_vagrant_state)
         # TODO: stub
         if test -f "$state"
-            string replace -f '"active":' '' < $state | string split ,
+            string replace -f '"active":' '' <$state | string split ,
         else
         end
     end
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 4722f3a01..6e73f254a 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -2,11 +2,11 @@
 
 set -l skin tool
 if type -q valgrind; and valgrind --version 2>/dev/null | string match -qr -- '-2\.[012]\.'
-	# In older versions of Valgrind, the skin selection option was
+    # In older versions of Valgrind, the skin selection option was
     # '--skin'
-	# But someone decided that it would be fun to change this to
+    # But someone decided that it would be fun to change this to
     # '--tool' for no good reason
-	set skin skin
+    set skin skin
 end
 
 complete -xc valgrind -l $skin -d "Skin" -a "
@@ -18,14 +18,14 @@ complete -xc valgrind -l $skin -d "Skin" -a "
 "
 
 function __fish_valgrind_skin --argument tool -V skin
-	set -l cmd (commandline -cpo)
-	# Quote $cmd so the tokens are separated with a space
-	if string match -qr -- "--$skin(=| )$tool" "$cmd"
-		return 0
+    set -l cmd (commandline -cpo)
+    # Quote $cmd so the tokens are separated with a space
+    if string match -qr -- "--$skin(=| )$tool" "$cmd"
+        return 0
     end
-	# memcheck is the default tool/skin
-	test $tool = memcheck
-	and not string match -- $skin $cmd
+    # memcheck is the default tool/skin
+    test $tool = memcheck
+    and not string match -- $skin $cmd
 end
 
 complete -c valgrind -l help -d "Display help and exit"
diff --git a/share/completions/vi.fish b/share/completions/vi.fish
index 74efc1028..8042b11c0 100644
--- a/share/completions/vi.fish
+++ b/share/completions/vi.fish
@@ -6,7 +6,7 @@
 # Check if vi exists at all ( needed for vi --version )
 if type -q vi
     # Check if vi is really vim
-    if vi --version > /dev/null 2>/dev/null
+    if vi --version >/dev/null 2>/dev/null
         complete -c vi -w vim
     else
         complete -c vi -s s -d 'Suppress all interactive user feedback'
diff --git a/share/completions/vim-addons.fish b/share/completions/vim-addons.fish
index 3460b36e2..8cce2f737 100644
--- a/share/completions/vim-addons.fish
+++ b/share/completions/vim-addons.fish
@@ -5,13 +5,13 @@
 # Adrien Grellier <adrien.grellier@laposte.net>
 #
 
-function __fish_vim-addons_subcommand  -d 'Test if vim-addons has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i list status install remove disable amend files show
-			return 1
-		end
-	end
-	return 0
+function __fish_vim-addons_subcommand -d 'Test if vim-addons has yet to be given the subcommand'
+    for i in (commandline -opc)
+        if contains -- $i list status install remove disable amend files show
+            return 1
+        end
+    end
+    return 0
 end
 
 # Commands
@@ -43,12 +43,12 @@ complete -c vim-addons -n "contains show (commandline -poc)" -a "(vim-addons lis
 
 # Options
 # --------
-complete -c vim-addons -s h -l help         -d "show this usage message and exit"
-complete -c vim-addons -s q -l query        -d "be quiet and make the output more parseable"
+complete -c vim-addons -s h -l help -d "show this usage message and exit"
+complete -c vim-addons -s q -l query -d "be quiet and make the output more parseable"
 complete -c vim-addons -s r -l registry-dir -d "set the registry directory"
-complete -c vim-addons -s s -l source-dir   -d "set the addons source directory"
-complete -c vim-addons -s t -l target-dir   -d "set the addons target directory"
-complete -c vim-addons -s v -l verbose      -d "increase verbosity"
-complete -c vim-addons -s y -l system-dir   -d "set the system-wide target directory"
-complete -c vim-addons -s w -l system-wide  -d "set target directory to the system-wide one"
+complete -c vim-addons -s s -l source-dir -d "set the addons source directory"
+complete -c vim-addons -s t -l target-dir -d "set the addons target directory"
+complete -c vim-addons -s v -l verbose -d "increase verbosity"
+complete -c vim-addons -s y -l system-dir -d "set the system-wide target directory"
+complete -c vim-addons -s w -l system-wide -d "set target directory to the system-wide one"
 
diff --git a/share/completions/wajig.fish b/share/completions/wajig.fish
index 9306c2823..a7865de8e 100644
--- a/share/completions/wajig.fish
+++ b/share/completions/wajig.fish
@@ -1,19 +1,19 @@
 function __fish_wajig_no_subcommand -d 'Test if wajig has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i addcdrom auto-alts auto-clean auto-download auto-install available bug build build-depend changelog clean commands daily-upgrade dependents describe describe-new detail detail-new dist-upgrade docs download file-download file-install file-remove find-file find-pkg fix-configure fix-install fix-missing force help hold init install installr installrs installs integrity large last-update list list-all list-alts list-cache list-commands list-daemons list-files list-hold list-installed list-log list-names list-orphans list-scripts list-section list-section list-status list-wide local-dist-upgrade local-upgrade madison move new news new-upgrades non-free orphans package policy purge purge-depend purge-orphans readme recursive recommended reconfigure reinstall reload remove remove-depend remove-orphans repackage reset restart rpminstall rpmtodeb search search-apt setup show showdistupgrade showinstall showremove showupgrade size sizes snapshot source start status status-match status-search stop suggested tasksel toupgrade unhold unofficial update update-alts update-pci-ids update-usb-ids upgrade versions whatis whichpkg
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i addcdrom auto-alts auto-clean auto-download auto-install available bug build build-depend changelog clean commands daily-upgrade dependents describe describe-new detail detail-new dist-upgrade docs download file-download file-install file-remove find-file find-pkg fix-configure fix-install fix-missing force help hold init install installr installrs installs integrity large last-update list list-all list-alts list-cache list-commands list-daemons list-files list-hold list-installed list-log list-names list-orphans list-scripts list-section list-section list-status list-wide local-dist-upgrade local-upgrade madison move new news new-upgrades non-free orphans package policy purge purge-depend purge-orphans readme recursive recommended reconfigure reinstall reload remove remove-depend remove-orphans repackage reset restart rpminstall rpmtodeb search search-apt setup show showdistupgrade showinstall showremove showupgrade size sizes snapshot source start status status-match status-search stop suggested tasksel toupgrade unhold unofficial update update-alts update-pci-ids update-usb-ids upgrade versions whatis whichpkg
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_wajig_use_package -d 'Test if wajig command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' -d 'Package'h
diff --git a/share/completions/watch.fish b/share/completions/watch.fish
index 58445ea54..346b78b2c 100644
--- a/share/completions/watch.fish
+++ b/share/completions/watch.fish
@@ -1,14 +1,14 @@
-complete -c watch -s b -l beep             -d 'Beep if command has a non-zero exit'
-complete -c watch -s c -l color            -d 'Interpret ANSI color sequences'
-complete -c watch -s d -l differences      -d 'Highlight changes between updates'
-complete -c watch -s d -l differences=permanent  -d 'Highlight changes between updates'
-complete -c watch -s e -l errexit          -d 'Exit if command has a non-zero exit'
-complete -c watch -s g -l chgexit          -d 'Exit when output from command changes'
-complete -c watch -s n -l interval         -d 'Seconds to wait between updates' -x
-complete -c watch -s p -l precise          -d 'Attempt run command in precise intervals'
-complete -c watch -s t -l no-title         -d 'Turn off header'
-complete -c watch -s x -l exec             -d 'Pass command to exec instead of "sh -c"'
-complete -c watch -s h -l help             -d 'Display this help and exit'
-complete -c watch -s v -l version          -d 'Output version information and exit'
+complete -c watch -s b -l beep -d 'Beep if command has a non-zero exit'
+complete -c watch -s c -l color -d 'Interpret ANSI color sequences'
+complete -c watch -s d -l differences -d 'Highlight changes between updates'
+complete -c watch -s d -l differences=permanent -d 'Highlight changes between updates'
+complete -c watch -s e -l errexit -d 'Exit if command has a non-zero exit'
+complete -c watch -s g -l chgexit -d 'Exit when output from command changes'
+complete -c watch -s n -l interval -d 'Seconds to wait between updates' -x
+complete -c watch -s p -l precise -d 'Attempt run command in precise intervals'
+complete -c watch -s t -l no-title -d 'Turn off header'
+complete -c watch -s x -l exec -d 'Pass command to exec instead of "sh -c"'
+complete -c watch -s h -l help -d 'Display this help and exit'
+complete -c watch -s v -l version -d 'Output version information and exit'
 complete -c watch -xa '(__fish_complete_subcommand -- -n --interval)'
 
diff --git a/share/completions/wget.fish b/share/completions/wget.fish
index 6a7d9afa1..8d860bc48 100644
--- a/share/completions/wget.fish
+++ b/share/completions/wget.fish
@@ -20,7 +20,7 @@ complete -c wget -l bind-adress -d "Bind address on local machine" -xa "(__fish_
 complete -c wget -s t -l tries -d "Set number of retries to number" -xa "0 1 2 4 8 16 32 64 128"
 complete -c wget -s O -l output-document -d "Concatenate output to file" -r
 complete -c wget -l no-clobber -d "Never overwrite files with same name"
-complete -c wget -o nc  -d "Never overwrite files with same name"
+complete -c wget -o nc -d "Never overwrite files with same name"
 complete -c wget -s c -l continue -d "Continue getting a partially-downloaded file"
 complete -c wget -l progress -d "Select progress meter type" -a "
 	dot\t'Print one dot for every kB of data, 50 dots per line'
@@ -129,5 +129,5 @@ complete -c wget -s L -l relative -d "Follow relative links only"
 complete -c wget -s I -l include-directories -d "Specify a comma-separated list of directories you wish to follow" -x
 complete -c wget -s X -l exclude-directories -d "Specify a comma-separated list of directories you wish to exclude" -x
 complete -c wget -l no-parent -d "Do not ever ascend to the parent directory"
-complete -c wget -o np  -d "Do not ever ascend to the parent directory"
+complete -c wget -o np -d "Do not ever ascend to the parent directory"
 
diff --git a/share/completions/which.fish b/share/completions/which.fish
index aaca38272..d6c6decef 100644
--- a/share/completions/which.fish
+++ b/share/completions/which.fish
@@ -1,4 +1,4 @@
-if which -v > /dev/null 2>/dev/null # GNU
+if which -v >/dev/null 2>/dev/null # GNU
     complete -c which -s a -l all -d "Print all matching executables in PATH, not just the first"
     complete -c which -s i -l read-alias -d "Read aliases from stdin, reporting matching ones on stdout"
     complete -c which -l skip-alias -d "Ignore option '--read-alias'"
diff --git a/share/completions/wicd-cli.fish b/share/completions/wicd-cli.fish
index 78008fd0f..da42854c9 100644
--- a/share/completions/wicd-cli.fish
+++ b/share/completions/wicd-cli.fish
@@ -1,15 +1,15 @@
 complete -c wicd-cli -s h -l help -d 'Print help and exit'
 complete -c wicd-cli -s S -l scan -d 'Scan for networks'
-complete -c wicd-cli -s l -l list-networks   -d 'List networks'
+complete -c wicd-cli -s l -l list-networks -d 'List networks'
 complete -c wicd-cli -s d -l network-details -d 'Show network details'
-complete -c wicd-cli -s x -l disconnect      -d 'Disconnect'
-complete -c wicd-cli -s c -l connect         -d 'Connect'
+complete -c wicd-cli -s x -l disconnect -d 'Disconnect'
+complete -c wicd-cli -s c -l connect -d 'Connect'
 complete -c wicd-cli -s e -l list-encryption-types -d 'List encryption types'
-complete -c wicd-cli -s y -l wireless        -d 'Perform operation on wireless network'
-complete -c wicd-cli -s z -l wired           -d 'Perform operation on wired network'
-complete -c wicd-cli -s w -l save            -d 'Save profile'
-complete -c wicd-cli -s o -l load-profile    -d 'Load profile'
-complete -c wicd-cli -s m -l name            -d 'Set name for profile to save/load'
+complete -c wicd-cli -s y -l wireless -d 'Perform operation on wireless network'
+complete -c wicd-cli -s z -l wired -d 'Perform operation on wired network'
+complete -c wicd-cli -s w -l save -d 'Save profile'
+complete -c wicd-cli -s o -l load-profile -d 'Load profile'
+complete -c wicd-cli -s m -l name -d 'Set name for profile to save/load'
 complete -c wicd-cli -s p -l network-property -r -d 'Get or set network property'
 complete -c wicd-cli -s s -l set-to -r -d 'Set network property to'
 complete -c wicd-cli -s n -l network -d 'Set the network'
diff --git a/share/completions/wicd-client.fish b/share/completions/wicd-client.fish
index b439f360d..ddc39eb99 100644
--- a/share/completions/wicd-client.fish
+++ b/share/completions/wicd-client.fish
@@ -1,6 +1,6 @@
-complete -c wicd-client -s t -l tray	   -d 'Run the wicd tray icon only.'
-complete -c wicd-client -s n -l no-tray	   -d 'Run wicd without the tray icon.'
-complete -c wicd-client -s h -l help       -d 'Print this help information.'
+complete -c wicd-client -s t -l tray -d 'Run the wicd tray icon only.'
+complete -c wicd-client -s n -l no-tray -d 'Run wicd without the tray icon.'
+complete -c wicd-client -s h -l help -d 'Print this help information.'
 complete -c wicd-client -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-client -s o -l only-notifications -d 'Don\'t display anything except notifications.'
 
diff --git a/share/completions/wicd-gtk.fish b/share/completions/wicd-gtk.fish
index 488f84903..f204b60c6 100644
--- a/share/completions/wicd-gtk.fish
+++ b/share/completions/wicd-gtk.fish
@@ -1,6 +1,6 @@
-complete -c wicd-gtk -s t -l tray	   -d 'Run the wicd tray icon only.'
-complete -c wicd-gtk -s n -l no-tray	   -d 'Run wicd without the tray icon.'
-complete -c wicd-gtk -s h -l help       -d 'Print this help information.'
+complete -c wicd-gtk -s t -l tray -d 'Run the wicd tray icon only.'
+complete -c wicd-gtk -s n -l no-tray -d 'Run wicd without the tray icon.'
+complete -c wicd-gtk -s h -l help -d 'Print this help information.'
 complete -c wicd-gtk -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-gtk -s o -l only-notifications -d 'Don\'t display anything except notifications.'
 
diff --git a/share/completions/xdg-mime.fish b/share/completions/xdg-mime.fish
index ff8543d39..00153e26d 100644
--- a/share/completions/xdg-mime.fish
+++ b/share/completions/xdg-mime.fish
@@ -13,16 +13,16 @@ complete -c xdg-mime -d 'Query file\'s filetype' -n 'contains_seq query filetype
 
 # complete xdg-mime default
 complete -c xdg-mime -d 'Choose application' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 3' -xa '(__fish_print_xdg_desktop_file_ids)'
-complete -c xdg-mime -d 'Mimetype'           -n '__fish_seen_subcommand_from default; and __fish_is_token_n 4' -xa '(__fish_print_xdg_mimetypes)'
+complete -c xdg-mime -d 'Mimetype' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 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
-complete -c xdg-mime -d 'Set mode'                 -n 'contains_seq xdg-mime install -- (commandline -cop)' -l mode -xa 'user system'
-complete -c xdg-mime -d 'Disable vendor check'     -n 'contains_seq xdg-mime install -- (commandline -cop)' -l novendor
+complete -c xdg-mime -d 'Set mode' -n 'contains_seq xdg-mime install -- (commandline -cop)' -l mode -xa 'user system'
+complete -c xdg-mime -d 'Disable vendor check' -n 'contains_seq xdg-mime install -- (commandline -cop)' -l novendor
 
 # complete xdg-mime uninstall
 complete -c xdg-mime -d 'Remove filetype description' -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -r
-complete -c xdg-mime -d 'Set mode'                    -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -l mode -xa 'user system'
+complete -c xdg-mime -d 'Set mode' -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -l mode -xa 'user system'
 
 #complete -c xdg-mime install [--mode mode] [--novendor] mimetypes-file
 #complete -c xdg-mime uninstall [--mode mode] mimetypes-file
diff --git a/share/completions/xinput.fish b/share/completions/xinput.fish
index eadf40ae2..b27746ca1 100644
--- a/share/completions/xinput.fish
+++ b/share/completions/xinput.fish
@@ -2,9 +2,9 @@
 set -l cmds version 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 delete-prop test test-xi2 create-master remove-master reattach float set-cp map-to-output enable disable
 
 function __fish_xinput_devices
-	# Yeah, this includes a "↳" char
-	# There's either this or printing only name or id, not both
-	xinput list --short | string replace -r '^[\W↳]*([\w/ ]+)\s+id=([0-9]+).*$' '$2\t$1'
+    # Yeah, this includes a "↳" char
+    # There's either this or printing only name or id, not both
+    xinput list --short | string replace -r '^[\W↳]*([\w/ ]+)\s+id=([0-9]+).*$' '$2\t$1'
 end
 
 complete -c xinput -f -n "not __fish_seen_subcommand_from $cmds" -a "$cmds"
diff --git a/share/completions/xrandr.fish b/share/completions/xrandr.fish
index 2eed8e9f3..f1db5ce53 100644
--- a/share/completions/xrandr.fish
+++ b/share/completions/xrandr.fish
@@ -1,28 +1,28 @@
 function __fish_print_xrandr_outputs --description 'Print xrandr outputs'
-	xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
+    xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
 end
 
 function __fish_print_xrandr_modes --description 'Print xrandr modes'
-	set -l output
-	xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
-		switch $line
-		case '  *'
-			string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
-		case '*'
-			set output (string match -r '^\S+' $line)
-		end
-	end
+    set -l output
+    xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
+        switch $line
+            case '  *'
+                string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
+            case '*'
+                set output (string match -r '^\S+' $line)
+        end
+    end
 end
 complete -c xrandr -l verbose -d 'Be more verbose'
-complete -c xrandr -l dryrun  -d 'Make no changes'
-complete -c xrandr -l nograb  -d 'Apply modifications without grabbing the screen'
-complete -c xrandr -o help  -d 'Print out a summary of the usage and exit'
+complete -c xrandr -l dryrun -d 'Make no changes'
+complete -c xrandr -l nograb -d 'Apply modifications without grabbing the screen'
+complete -c xrandr -o help -d 'Print out a summary of the usage and exit'
 complete -c xrandr -s v -l version -d 'Print out the RandR version reported by the X server and exit'
-complete -c xrandr -s q -l query   -d 'Display the current state of the system'
+complete -c xrandr -s q -l query -d 'Display the current state of the system'
 complete -c xrandr -s d -o display -d 'Select X display to use' -x
 complete -c xrandr -l screen -d 'Select which screen to manipulate' -x
-complete -c xrandr -l q1    -d 'Use RandR version 1.1 protocol'
-complete -c xrandr -l q12   -d 'Use RandR version 1.2 protocol'
+complete -c xrandr -l q1 -d 'Use RandR version 1.1 protocol'
+complete -c xrandr -l q12 -d 'Use RandR version 1.2 protocol'
 
 set -l ver (xrandr -v | string replace -rf '.*RandR version ([0-9.]+)$' '$1' | string split ".")
 if not set -q ver[1]
@@ -36,8 +36,8 @@ end
 complete -c xrandr -s s -l size -d 'Set the screen size (index or width x height)' -x
 complete -c xrandr -s r -l rate -l refresh -d 'Set the refresh rate closest to the specified value' -x
 complete -c xrandr -s o -l orientation -d 'Specify the orientation of the screen' -xa 'normal inverted left right'
-complete -c xrandr -s x                -d 'Reflect across the X axis'
-complete -c xrandr -s y                -d 'Reflect across the Y axis'
+complete -c xrandr -s x -d 'Reflect across the X axis'
+complete -c xrandr -s y -d 'Reflect across the Y axis'
 
 # Version > 1.1
 if test $ver[1] -gt 1; or test "$ver[2]" -gt 1
@@ -57,11 +57,11 @@ if test $ver[1] -gt 1; or test "$ver[2]" -gt 1
     complete -c xrandr -l rate -d 'Set refresh rate' -x
     complete -c xrandr -l reflect -d 'Set reflection' -xa 'normal x y xy'
     complete -c xrandr -l rotate -d 'Set rotation' -xa 'normal left right inverted'
-    complete -c xrandr -l left-of  -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l left-of -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
     complete -c xrandr -l right-of -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l above    -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l below    -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l same-as  -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l above -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l below -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l same-as -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
     complete -c xrandr -l set -d 'Set the property value: --set <prop> <value>' -x
     complete -c xrandr -l off -d 'Disables the output'
     complete -c xrandr -l crtc -d 'Set the crtc' -x
@@ -72,7 +72,7 @@ end
 if test $ver[1] -gt 1; or test "$ver[2]" -gt 2
     complete -c xrandr -l noprimary -d "Don't define a primary output"
     complete -c xrandr -l current -d 'Print current screen configuration'
-    complete -c xrandr -l panning  -d 'Set panning: widthxheight[+x+y[/track_widthxtrack_height+track_x+track_y[/border_left/border_top/border_right/border_bottom]]]' -x
+    complete -c xrandr -l panning -d 'Set panning: widthxheight[+x+y[/track_widthxtrack_height+track_x+track_y[/border_left/border_top/border_right/border_bottom]]]' -x
     complete -c xrandr -l transform -d 'Set transformation matrix: a,b,c,d,e,f,g,h,i for [ [a,b,c], [d,e,f], [g,h,i] ]' -x
     complete -c xrandr -l scale -d 'Set scren scale' -x
     complete -c xrandr -l primary -d 'Set the output as primary'
diff --git a/share/completions/xrdb.fish b/share/completions/xrdb.fish
index edb5b2912..acad0a25a 100644
--- a/share/completions/xrdb.fish
+++ b/share/completions/xrdb.fish
@@ -1,21 +1,21 @@
-complete -c xrdb -o display          -d 'display to use'
-complete -c xrdb -o all              -d 'do all resources [default]'
-complete -c xrdb -o global           -d 'do screen-independent resources'
-complete -c xrdb -o screen           -d 'do screen-specific resources for one screen'
-complete -c xrdb -o screens          -d 'do screen-specific resources for all screens'
-complete -c xrdb -o n                -d 'show but don\'t do changes'
-complete -c xrdb -o cpp -r           -d 'preprocessor to use [/usr/bin/mcpp]'
-complete -c xrdb -o nocpp            -d 'do not use a preprocessor'
-complete -c xrdb -o query            -d 'query resources'
-complete -c xrdb -o load             -d 'load resources from file [default]'
-complete -c xrdb -o override         -d 'add in resources from file'
-complete -c xrdb -o merge            -d 'merge resources from file & sort'
-complete -c xrdb -o edit -r          -d 'edit resources into file'
-complete -c xrdb -o backup -x        -d 'backup suffix for -edit [.bak]'
-complete -c xrdb -o symbols          -d 'show preprocessor symbols'
-complete -c xrdb -o remove           -d 'remove resources'
-complete -c xrdb -o retain           -d 'avoid server reset (avoid using this)'
-complete -c xrdb -o quiet            -d 'don\'t warn about duplicates'
+complete -c xrdb -o display -d 'display to use'
+complete -c xrdb -o all -d 'do all resources [default]'
+complete -c xrdb -o global -d 'do screen-independent resources'
+complete -c xrdb -o screen -d 'do screen-specific resources for one screen'
+complete -c xrdb -o screens -d 'do screen-specific resources for all screens'
+complete -c xrdb -o n -d 'show but don\'t do changes'
+complete -c xrdb -o cpp -r -d 'preprocessor to use [/usr/bin/mcpp]'
+complete -c xrdb -o nocpp -d 'do not use a preprocessor'
+complete -c xrdb -o query -d 'query resources'
+complete -c xrdb -o load -d 'load resources from file [default]'
+complete -c xrdb -o override -d 'add in resources from file'
+complete -c xrdb -o merge -d 'merge resources from file & sort'
+complete -c xrdb -o edit -r -d 'edit resources into file'
+complete -c xrdb -o backup -x -d 'backup suffix for -edit [.bak]'
+complete -c xrdb -o symbols -d 'show preprocessor symbols'
+complete -c xrdb -o remove -d 'remove resources'
+complete -c xrdb -o retain -d 'avoid server reset (avoid using this)'
+complete -c xrdb -o quiet -d 'don\'t warn about duplicates'
 #complete -c xrdb -s Dname[=value],
 #complete -c xrdb -s Uname,
 #complete -c xrdb -s Idirectory  -d 'passed to preprocessor'
diff --git a/share/completions/xsv.fish b/share/completions/xsv.fish
index 508ca0ade..b793edf70 100644
--- a/share/completions/xsv.fish
+++ b/share/completions/xsv.fish
@@ -1,22 +1,22 @@
-complete -c xsv -n '__fish_is_first_token' -xa cat         -d 'Concatenate by row or column'
-complete -c xsv -n '__fish_is_first_token' -xa count       -d 'Count records'
-complete -c xsv -n '__fish_is_first_token' -xa fixlengths  -d 'Makes all records have same length'
-complete -c xsv -n '__fish_is_first_token' -xa flatten     -d 'Show one field per line'
-complete -c xsv -n '__fish_is_first_token' -xa fmt         -d 'Format CSV output (change field delimiter)'
-complete -c xsv -n '__fish_is_first_token' -xa frequency   -d 'Show frequency tables'
-complete -c xsv -n '__fish_is_first_token' -xa headers     -d 'Show header names'
-complete -c xsv -n '__fish_is_first_token' -xa help        -d 'Show this usage message.'
-complete -c xsv -n '__fish_is_first_token' -xa index       -d 'Create CSV index for faster access'
-complete -c xsv -n '__fish_is_first_token' -xa input       -d 'Read CSV data with special quoting rules'
-complete -c xsv -n '__fish_is_first_token' -xa join        -d 'Join CSV files'
-complete -c xsv -n '__fish_is_first_token' -xa sample      -d 'Randomly sample CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa search      -d 'Search CSV data with regexes'
-complete -c xsv -n '__fish_is_first_token' -xa select      -d 'Select columns from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa slice       -d 'Slice records from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa sort        -d 'Sort CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa split       -d 'Split CSV data into many files'
-complete -c xsv -n '__fish_is_first_token' -xa stats       -d 'Compute basic statistics'
-complete -c xsv -n '__fish_is_first_token' -xa table       -d 'Align CSV data into columns'
+complete -c xsv -n '__fish_is_first_token' -xa cat -d 'Concatenate by row or column'
+complete -c xsv -n '__fish_is_first_token' -xa count -d 'Count records'
+complete -c xsv -n '__fish_is_first_token' -xa fixlengths -d 'Makes all records have same length'
+complete -c xsv -n '__fish_is_first_token' -xa flatten -d 'Show one field per line'
+complete -c xsv -n '__fish_is_first_token' -xa fmt -d 'Format CSV output (change field delimiter)'
+complete -c xsv -n '__fish_is_first_token' -xa frequency -d 'Show frequency tables'
+complete -c xsv -n '__fish_is_first_token' -xa headers -d 'Show header names'
+complete -c xsv -n '__fish_is_first_token' -xa help -d 'Show this usage message.'
+complete -c xsv -n '__fish_is_first_token' -xa index -d 'Create CSV index for faster access'
+complete -c xsv -n '__fish_is_first_token' -xa input -d 'Read CSV data with special quoting rules'
+complete -c xsv -n '__fish_is_first_token' -xa join -d 'Join CSV files'
+complete -c xsv -n '__fish_is_first_token' -xa sample -d 'Randomly sample CSV data'
+complete -c xsv -n '__fish_is_first_token' -xa search -d 'Search CSV data with regexes'
+complete -c xsv -n '__fish_is_first_token' -xa select -d 'Select columns from CSV'
+complete -c xsv -n '__fish_is_first_token' -xa slice -d 'Slice records from CSV'
+complete -c xsv -n '__fish_is_first_token' -xa sort -d 'Sort CSV data'
+complete -c xsv -n '__fish_is_first_token' -xa split -d 'Split CSV data into many files'
+complete -c xsv -n '__fish_is_first_token' -xa stats -d 'Compute basic statistics'
+complete -c xsv -n '__fish_is_first_token' -xa table -d 'Align CSV data into columns'
 
 # with a subcommand
 complete -c xsv -n 'not __fish_is_first_token' -xa '(__fish_complete_suffix .csv)'
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index 9428df99a..e5a186cfb 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -39,11 +39,11 @@ complete -c $progname -s F -f -l files -n $noopt -d 'Query the files database'
 complete -c $progname -s V -f -l version -d 'Display version and exit'
 complete -c $progname -s h -f -l help -d 'Display help'
 # $progname operations
-complete -c $progname -n $noopt -s B    -l backup      -d "Backup or restore alpm local database"
-complete -c $progname -n $noopt -s C -f                -d "Manage .pac* files"
+complete -c $progname -n $noopt -s B -l backup -d "Backup or restore alpm local database"
+complete -c $progname -n $noopt -s C -f -d "Manage .pac* files"
 complete -c $progname -n $noopt -s G -f -l getpkgbuild -d "Get PKGBUILD from ABS or AUR"
-complete -c $progname -n $noopt -s P    -l pkgbuild    -d "Build package from PKGBUILD found in a local directory"
-complete -c $progname -n $noopt      -f -l stats       -d "Show some statistics about your packages"
+complete -c $progname -n $noopt -s P -l pkgbuild -d "Build package from PKGBUILD found in a local directory"
+complete -c $progname -n $noopt -f -l stats -d "Show some statistics about your packages"
 
 # General options
 # Only offer these once a command has been given so they get prominent display
@@ -59,14 +59,14 @@ complete -c $progname -n $hasopt -l hookdir -d 'Hook file directory'
 complete -c $progname -n $hasopt -l logfile -d 'Specify alternative log file'
 complete -c $progname -n $hasopt -l noconfirm -d 'Bypass any question' -f
 # General options (yaourt only)
-complete -c $progname -n $hasopt -l color     -d 'Force color'
-complete -c $progname -n $hasopt -l force     -d 'Force installation or updates'
-complete -c $progname -n $hasopt -l insecure  -d 'Allow to perform "insecure" SSL connections'
-complete -c $progname -n $hasopt -l nocolor   -d 'Disable color'
-complete -c $progname -n $hasopt -l confirm   -d 'Always ask for confirmation'
-complete -c $progname -n $hasopt -l pager     -d 'Use $PAGER to show search results'
+complete -c $progname -n $hasopt -l color -d 'Force color'
+complete -c $progname -n $hasopt -l force -d 'Force installation or updates'
+complete -c $progname -n $hasopt -l insecure -d 'Allow to perform "insecure" SSL connections'
+complete -c $progname -n $hasopt -l nocolor -d 'Disable color'
+complete -c $progname -n $hasopt -l confirm -d 'Always ask for confirmation'
+complete -c $progname -n $hasopt -l pager -d 'Use $PAGER to show search results'
 complete -c $progname -n $hasopt -l export -x -a '(__fish_complete_directories)' -d 'Export built packages and their sources to DIR'
-complete -c $progname -n $hasopt -l tmp    -x -a '(__fish_complete_directories)' -d 'Use DIR as temporary folder'
+complete -c $progname -n $hasopt -l tmp -x -a '(__fish_complete_directories)' -d 'Use DIR as temporary folder'
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
@@ -101,10 +101,10 @@ for condition in query sync
     complete -c $progname -n $$condition -s s -l search -r -d 'Search packages for regexp' -f
     # Yaourt only
     complete -c $progname -n $$condition -l conflicts -d 'Show packages that conflict with one of the targets'
-    complete -c $progname -n $$condition -l depends   -d 'Show packages that depend on one of the targets'
-    complete -c $progname -n $$condition -l provides  -d 'Show packages that provide one of the targets'
-    complete -c $progname -n $$condition -l replaces  -d 'Show packages that replace one of the targets'
-    complete -c $progname -n $$condition -l nameonly  -d 'Query the package names only'
+    complete -c $progname -n $$condition -l depends -d 'Show packages that depend on one of the targets'
+    complete -c $progname -n $$condition -l provides -d 'Show packages that provide one of the targets'
+    complete -c $progname -n $$condition -l replaces -d 'Show packages that replace one of the targets'
+    complete -c $progname -n $$condition -l nameonly -d 'Query the package names only'
 end
 
 # Query options
@@ -122,7 +122,7 @@ complete -c $progname -n "$query" -d 'Installed package' -xa $listinstalled -f
 # Yaourt only query options
 # Backup file is always saved as pacman-$date.tar.bz2
 complete -c $progname -n $query -r -l backupfile -a '(__fish_complete_suffix tar.bz2)' -d 'Query FILE instead of alpm/aur'
-complete -c $progname -n $query    -l date       -d 'List queries result sorted by installation date'
+complete -c $progname -n $query -l date -d 'List queries result sorted by installation date'
 
 # Remove options
 complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
@@ -140,15 +140,15 @@ complete -c $progname -n $sync -s w -l downloadonly -d 'Only download the target
 complete -c $progname -n $sync -s y -l refresh -d 'Download fresh copy of the package list'
 complete -c $progname -n "$sync" -xa "$listall $listgroups"
 # Additional sync options
-complete -c $progname -n $sync -s a -l aur           -d 'Also search in AUR database'
-complete -c $progname -n $sync -s A -l ignorearch    -d 'Pass -A or --ignorearch option to makepkg'
-complete -c $progname -n $sync      -l aur-url    -x -d 'Specify a custom AUR url'
+complete -c $progname -n $sync -s a -l aur -d 'Also search in AUR database'
+complete -c $progname -n $sync -s A -l ignorearch -d 'Pass -A or --ignorearch option to makepkg'
+complete -c $progname -n $sync -l aur-url -x -d 'Specify a custom AUR url'
 set -l has_build_opt '__fish_contains_opt -s b build'
 complete -c $progname -n "$sync; and not $has_build_opt" -s b -l build -d 'Build from sources(AUR or ABS)'
 complete -c $progname -n "$sync; and     $has_build_opt" -s b -l build -d 'Also build all dependencies'
-complete -c $progname -n $sync      -l devel         -d 'Search an update for devel packages'
-complete -c $progname -n $sync      -l maintainer    -d 'Search packages by maintainer instead of name (AUR only)'
-complete -c $progname -n $sync      -l m-arg         -d 'Pass additional options to makepkg'
+complete -c $progname -n $sync -l devel -d 'Search an update for devel packages'
+complete -c $progname -n $sync -l maintainer -d 'Search packages by maintainer instead of name (AUR only)'
+complete -c $progname -n $sync -l m-arg -d 'Pass additional options to makepkg'
 
 # Database options
 set -l has_db_opt '__fish_contains_opt asdeps asexplicit'
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index eed79e7fe..0829ede78 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -79,7 +79,7 @@ for k,v in data["scripts"].items(): print(k + "\t" + v[:18])' <package.json 2>/d
         jq -r '.scripts | to_entries | map("\(.key)\t\(.value | tostring | .[0:20])") | .[]' package.json
     else if type -q jq
         # Yarn is quite slow and still requires `jq` because the normal format is unusable.
-        command yarn run --json 2> /dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
+        command yarn run --json 2>/dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
     end
 end
 
diff --git a/share/completions/yast2.fish b/share/completions/yast2.fish
index 4b1c80125..251b23670 100644
--- a/share/completions/yast2.fish
+++ b/share/completions/yast2.fish
@@ -1,11 +1,11 @@
 complete -f -c yast2 -a '(yast2 -l)' -d 'Module'
 
-complete -f -c yast2 -s h -l help           -d 'Show help'
-complete -f -c yast2 -s l -l list           -d 'List all available modules'
-complete -f -c yast2      -l qt             -d 'Use the QT graphical user interface'
-complete -f -c yast2      -l gtk            -d 'Use the GTK graphical user interface'
-complete -f -c yast2      -l ncurses        -d 'Use the NCURSES text-mode user interface'
-complete -f -c yast2 -s g -l geometry       -d 'Default window size (qt only)'
-complete -f -c yast2      -l noborder       -d 'No window manager border for main window'
-complete -f -c yast2      -l fullscreen     -d 'Use full screen'
+complete -f -c yast2 -s h -l help -d 'Show help'
+complete -f -c yast2 -s l -l list -d 'List all available modules'
+complete -f -c yast2 -l qt -d 'Use the QT graphical user interface'
+complete -f -c yast2 -l gtk -d 'Use the GTK graphical user interface'
+complete -f -c yast2 -l ncurses -d 'Use the NCURSES text-mode user interface'
+complete -f -c yast2 -s g -l geometry -d 'Default window size (qt only)'
+complete -f -c yast2 -l noborder -d 'No window manager border for main window'
+complete -f -c yast2 -l fullscreen -d 'Use full screen'
 
diff --git a/share/completions/yum.fish b/share/completions/yum.fish
index c229bcd03..7ddc15c6b 100644
--- a/share/completions/yum.fish
+++ b/share/completions/yum.fish
@@ -6,12 +6,12 @@
 
 # Test if completing using package names is appropriate
 function __fish_yum_package_ok
-	for i in (commandline -poc)
-		if contains -- $i update upgrade remove erase install reinstall
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -poc)
+        if contains -- $i update upgrade remove erase install reinstall
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c yum -n '__fish_use_subcommand' -xa install -d "Install the latest version of a package"
diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 914d27d70..8dd63fa7b 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -20,7 +20,7 @@ switch (uname)
         set OS "FreeBSD"
     case SunOS
         set OS "SunOS"
-    # Others?
+        # Others?
     case "*"
         set OS "unknown"
 end
@@ -110,7 +110,7 @@ function __fish_zfs_list_permissions
     echo -e "userused"
     # The remaining code of the function is almost a duplicate of __fish_complete_zfs_rw_properties and __fish_complete_zfs_ro_properties, but almost only, hence the duplication
     # RO properties
-    echo -e "volblocksize\t"(_ "Volume block size") 
+    echo -e "volblocksize\t"(_ "Volume block size")
     # R/W properties
     echo -e "aclinherit\t"(_ "Inheritance of ACL entries")" (discard, noallow, restricted, passthrough, passthrough-x)"
     echo -e "atime\t"(_ "Update access time on read")" (on, off)"
@@ -195,7 +195,9 @@ function __fish_zfs_list_permissions
         echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive, mixed)"
     end
     # Permissions set; if none are found, or if permission sets are not supported, no output is expected, even an error
-    for i in (zpool list -o name -H); zfs allow $i; end | string match -r '@[[:alnum:]]*' | sort -u
+    for i in (zpool list -o name -H)
+        zfs allow $i
+    end | string match -r '@[[:alnum:]]*' | sort -u
 end
 
 complete -c zfs -f -n '__fish_zfs_needs_command' -s '?' -a '?' -d 'Display a help message'
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index fc93826c6..119294cfc 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -14,7 +14,7 @@ switch (uname)
         set OS "FreeBSD"
     case SunOS
         set OS "SunOS"
-    # Others?
+        # Others?
     case "*"
         set OS "unknown"
 end
@@ -80,12 +80,12 @@ 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 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
             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
+                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
                 __fish_zpool_list_vdev_types
diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index 7719f1e2c..c84d2fd2f 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -8,31 +8,31 @@ set -g __fish_zypper_package_types package patch pattern product srcpackage appl
 set -g __fish_zypper_download_modes only in-advance in-heaps as-needed
 
 function __fish_zypper_cmd_in_array
-        for i in (commandline -pco)
-                # -- is used to provide no options for contains
-                # (if $i is equal to --optname without -- will be error)
-                if contains -- $i $argv
-                        return 0
-                end
+    for i in (commandline -pco)
+        # -- is used to provide no options for contains
+        # (if $i is equal to --optname without -- will be error)
+        if contains -- $i $argv
+            return 0
         end
+    end
 
-        return 1
+    return 1
 end
 
 function __fish_zypper_no_subcommand
-        not __fish_zypper_cmd_in_array $__fish_zypper_all_commands
+    not __fish_zypper_cmd_in_array $__fish_zypper_all_commands
 end
 
 function __fish_zypper_use_pkg
-        __fish_zypper_cmd_in_array $__fish_zypper_pkg_commands
+    __fish_zypper_cmd_in_array $__fish_zypper_pkg_commands
 end
 
 function __fish_zypper_use_repo
-        __fish_zypper_cmd_in_array $__fish_zypper_repo_commands
+    __fish_zypper_cmd_in_array $__fish_zypper_repo_commands
 end
 
 function __fish_zypper_not_use_file
-        not __fish_zypper_cmd_in_array $__fish_zypper_file_commands
+    not __fish_zypper_cmd_in_array $__fish_zypper_file_commands
 end
 
 function __fish_zypper_print_repos
@@ -91,486 +91,486 @@ complete -f -n '__fish_zypper_not_use_file' -c zypper
 
 complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?'                     -d 'Print help'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh'                   -d 'Accept multiple commands at once'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr'                   -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar'                 -d 'Add a new repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr'              -d 'Remove specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr'              -d 'Rename specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr'              -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref'                -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc'                   -d 'Clean local caches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls'                -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as'              -d 'Add a new service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms'           -d 'Modify specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs'           -d 'Remove specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs'      -d 'Refresh all services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install in'                 -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm'                  -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve'                  -d 'Verify integrity of package dependencies'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si'          -d 'Install source packages and their build dependencies'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up'                  -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu'            -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch'                      -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp'            -d 'List needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup'           -d 'Perform a distribution upgrade'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk'           -d 'Check for patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se'                  -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if'                    -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info'                 -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info'               -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info'               -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch'                -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa'                -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt'                -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd'                -d 'List all available products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp'           -d 'List packages providing specified capability'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al'                 -d 'Add a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl'              -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll'                   -d 'List current package locks'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl'              -d 'Remove unused locks'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp'            -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos'               -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses'                   -d 'Print report about licenses and EULAs of installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download'            -d 'Download source rpms for all installed packages to a local directory'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h            -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V         -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config -s c -r       -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q           -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v         -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A       -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s     -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r  -d 'Turn on rug compatibility'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l config -s c -r -d 'Use specified config file instead of the default'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x          -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i  -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p       -d 'Use an additional repository'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r   -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r    -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r         -d 'Operate on a different root directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
 
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks                          -d 'Ignore GPG check failures and continue'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys                   -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories                   -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh                             -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                                  -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote                              -d 'Ignore remote repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables             -d 'Do not read installed packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids                              -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata                               -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r                       -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r                      -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r                       -d 'Use alternative package cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 function __fish_zypper_is_subcommand_lr
-        __fish_zypper_cmd_in_array repos lr
+    __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -s e -r         -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a             -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n              -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u               -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p          -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r           -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d           -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s           -d 'Show also alias of parent service'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -s e -r -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
 complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U       -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P  -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A     -d 'Sort the list by alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N      -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_ar
-        __fish_zypper_cmd_in_array addrepo ar
+    __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -s r                       -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c                      -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C                   -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -s n                       -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d                    -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f                    -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p                   -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k              -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K           -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g                   -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict                 -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned         -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo    -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G                -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
 
 function __fish_zypper_is_subcommand_rr
-        __fish_zypper_cmd_in_array removerepo rr
+    __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth  -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
 complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
 
 function __fish_zypper_is_subcommand_mr
-        __fish_zypper_cmd_in_array modifyrepo mr
+    __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -s n                       -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d                    -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e                     -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f                    -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F                 -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -s p                   -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k              -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K           -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g                   -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict                 -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned         -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo    -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G                -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a                        -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l                      -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t                     -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -s m                -d 'Apply changes to repositories of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
-        __fish_zypper_cmd_in_array refresh ref
+    __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f          -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b    -d 'Force rebuild of the database'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B     -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D  -d "Only download raw metadata, don't build the database"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"           -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s       -d 'Refresh also services before refreshing repos'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
-        __fish_zypper_cmd_in_array services ls
+    __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u               -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p          -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d           -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r        -d 'Show also repositories belonging to the services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
 complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P  -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U       -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N      -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
-        __fish_zypper_cmd_in_array addservice as
+    __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l type -s t    -d 'Type of the service (ris)'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l type -s t -d 'Type of the service (ris)'
 complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -s n    -d 'Specify descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -s n -d 'Specify descriptive name for the service'
 
 function __fish_zypper_is_subcommand_ms
-        __fish_zypper_cmd_in_array modifyservice ms
+    __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d       -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e        -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r       -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R    -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -s n          -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -s i  -d 'Add a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -s i -d 'Add a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -s j  -d 'Remove a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -s j -d 'Remove a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k  -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a           -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l         -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t        -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m   -d 'Apply changes to services of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
 
 function __fish_zypper_is_subcommand_rs
-        __fish_zypper_cmd_in_array removeservice rs
+    __fish_zypper_cmd_in_array removeservice rs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-auth  -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-auth -d 'Ignore user authentication data in the URI'
 complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-query -d 'Ignore query string in the URI'
 
 function __fish_zypper_is_subcommand_refs
-        __fish_zypper_cmd_in_array refresh-services refs
+    __fish_zypper_cmd_in_array refresh-services refs
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
 
 function __fish_zypper_is_subcommand_in
-        __fish_zypper_cmd_in_array install in
+    __fish_zypper_cmd_in_array install in
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -f -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n                     -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C               -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f                    -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-force-resolution -s R      -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D                  -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage                    -d 'Allow to replace a newer item with an older one.'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l recommends                    -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force-resolution              -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 
 function __fish_zypper_is_subcommand_rm
-        __fish_zypper_cmd_in_array remove rm
+    __fish_zypper_cmd_in_array remove rm
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n                -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C          -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u          -d 'Automatically remove unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U       -d 'No automatic removal of unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D             -d 'Test the removal, do not actually remove'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver             -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution         -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
 
 function __fish_zypper_is_subcommand_ve
-        __fish_zypper_cmd_in_array verify ve
+    __fish_zypper_cmd_in_array verify ve
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D       -d 'Test the repair, do not actually do anything to the system'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-recommends      -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-recommends -d 'Do not install recommended packages, only required'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l recommends         -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l recommends -d 'Install also recommended packages in addition to the required'
 
 function __fish_zypper_is_subcommand_si
-        __fish_zypper_cmd_in_array source-install si
+    __fish_zypper_cmd_in_array source-install si
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D   -d "Don't install build dependencies"
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
 
 function __fish_zypper_is_subcommand_inr
-        __fish_zypper_cmd_in_array install-new-recommends inr
+    __fish_zypper_cmd_in_array install-new-recommends inr
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D       -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D -d 'Test the installation, do not actually install'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l debug-solver       -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l debug-solver -d 'Create solver test case for debugging'
 
 function __fish_zypper_is_subcommand_up
-        __fish_zypper_cmd_in_array update up
+    __fish_zypper_cmd_in_array update up
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-force-resolution -s R      -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D                  -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive              -d 'Skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l force-resolution              -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort                   -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l recommends -d 'Install also recommended packages in addition to the required'
 
 function __fish_zypper_is_subcommand_lu
-        __fish_zypper_cmd_in_array list-updates lu
+    __fish_zypper_cmd_in_array list-updates lu
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'List only updates from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a    -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
 
 function __fish_zypper_is_subcommand_lp
-        __fish_zypper_cmd_in_array list-patches lp
+    __fish_zypper_cmd_in_array list-patches lp
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'List needed patches for Bugzilla issues'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -d 'List all patches in this category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a      -d 'List all patches, not only the needed ones'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"     -d 'List only patches from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date          -d 'List patches issued up to the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'List needed patches for CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issuesstring  -d 'Look for issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -d 'List patches issued up to the specified date <YYYY-MM-DD>'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'List needed patches for CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issuesstring -d 'Look for issues matching the specified string'
 
 function __fish_zypper_is_subcommand_dup
-        __fish_zypper_cmd_in_array dist-upgrade dup
+    __fish_zypper_cmd_in_array dist-upgrade dup
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D                  -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l recommends -d 'Install also recommended packages in addition to the required'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-downgrade            -d 'Do not allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-downgrade               -d 'Allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-name-change          -d 'Do not allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-name-change             -d 'Allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-arch-change          -d 'Do not allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-arch-change             -d 'Allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-vendor-change        -d 'Do not allow installed resolvables to switch vendors'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-vendor-change           -d 'Allow installed resolvables to switch vendors'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-downgrade -d 'Do not allow installed resolvables to be downgraded'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-downgrade -d 'Allow installed resolvables to be downgraded'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-name-change -d 'Do not allow installed resolvables to change name'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-name-change -d 'Allow installed resolvables to change name'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-arch-change -d 'Do not allow installed resolvables to change architectures'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-arch-change -d 'Allow installed resolvables to change architectures'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-vendor-change -d 'Do not allow installed resolvables to switch vendors'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-vendor-change -d 'Allow installed resolvables to switch vendors'
 
 function __fish_zypper_is_subcommand_pchk
-        __fish_zypper_cmd_in_array patch-check pchk
+    __fish_zypper_cmd_in_array patch-check pchk
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
 
 function __fish_zypper_is_subcommand_se
-        __fish_zypper_cmd_in_array search se
+    __fish_zypper_cmd_in_array search se
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C      -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i      -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l uninstalled-only -s u    -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l uninstalled-only -s u -d 'Show only packages that are not currently installed'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s             -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-all                -d 'Search for a match with all search strings (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-any                -d 'Search for a match with any of the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings         -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words              -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact              -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides                 -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends               -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires                 -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-all -d 'Search for a match with all search strings (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-any -d 'Search for a match with any of the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -d 'Searches for an exact package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
 
 function __fish_zypper_is_subcommand_if
-        __fish_zypper_cmd_in_array info if
+    __fish_zypper_cmd_in_array info if
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"  -d 'Work only with the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides   -d 'Show symbols the package provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires   -d 'Show symbols the package requires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts  -d 'Show symbols the package conflicts with'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes  -d 'Show symbols the package obsoletes'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show symbols the package provides'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show symbols the package requires'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show symbols the package conflicts with'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show symbols the package obsoletes'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show symbols the package recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests   -d 'Show symbols the package suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show symbols the package suggests'
 
 function __fish_zypper_is_subcommand_pch
-        __fish_zypper_cmd_in_array patches pch
+    __fish_zypper_cmd_in_array patches pch
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 
 function __fish_zypper_is_subcommand_pa
-        __fish_zypper_cmd_in_array packages pa
+    __fish_zypper_cmd_in_array packages pa
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i   -d 'Show only installed packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l uninstalled-only -s u -d 'Show only packages which are not installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned              -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested             -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended           -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded              -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N     -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R     -d 'Sort the list by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
 
 function __fish_zypper_is_subcommand_pt
-        __fish_zypper_cmd_in_array patterns pt
+    __fish_zypper_cmd_in_array patterns pt
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i   -d 'Show only installed patterns'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l uninstalled-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
-        __fish_zypper_cmd_in_array products pd
+    __fish_zypper_cmd_in_array products pd
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i   -d 'Show only installed products'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l uninstalled-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
-        __fish_zypper_cmd_in_array addlock al
+    __fish_zypper_cmd_in_array addlock al
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Restrict the lock to the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_al' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_rl
-        __fish_zypper_cmd_in_array removelock rl
+    __fish_zypper_cmd_in_array removelock rl
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Remove only locks with specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_cl
-        __fish_zypper_cmd_in_array cleanlocks cl
+    __fish_zypper_cmd_in_array cleanlocks cl
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e      -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_vcmp
-        __fish_zypper_cmd_in_array versioncmp vcmp
+    __fish_zypper_cmd_in_array versioncmp vcmp
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_vcmp' -l match -s m -d 'Takes missing release number as any release'
 
 function __fish_zypper_is_subcommand_tos
-        __fish_zypper_cmd_in_array targetos tos
+    __fish_zypper_cmd_in_array targetos tos
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_tos' -l label -s l -d 'Show the operating system label'
 
 function __fish_zypper_is_subcommand_clean
-        __fish_zypper_cmd_in_array clean
+    __fish_zypper_cmd_in_array clean
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -r -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m     -d 'Clean metadata cache'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a          -d 'Clean both metadata and package caches'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
-        __fish_zypper_cmd_in_array patch
+    __fish_zypper_cmd_in_array patch
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b                 -d 'Install patch fixing the specified bugzilla issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g                 -d 'Install all patches in this category'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Install patch fixing the specified bugzilla issue'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -d 'Install all patches in this category'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D                  -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                           -d 'Install patch fixing the specified CVE issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date                          -d 'Install patches issued until the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Install patch fixing the specified CVE issue'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -d 'Install patches issued until the specified date <YYYY-MM-DD>'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l recommends -d 'Install also recommended packages in addition to the required'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive              -d 'Skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive              -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
 
 function __fish_zypper_is_subcommand_sourcedownload
-        __fish_zypper_cmd_in_array source-download
+    __fish_zypper_cmd_in_array source-download
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -s d -d 'Download all source rpms to this directory. Default: /var/cache/zypper/source-download'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete         -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete      -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status         -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 27d2474f3..3c1d8b2ca 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -32,7 +32,9 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # We use the `tput` here just to see if terminfo thinks we can change the cursor.
     # We cannot use that sequence directly as it's not the correct one for konsole and iTerm,
     # and because we may want to change the cursor even though terminfo says we can't (tmux).
-    if begin; not command -sq tput; or not tput Ss >/dev/null 2>/dev/null; end
+    if begin
+            not command -sq tput; or not tput Ss >/dev/null 2>/dev/null
+        end
         # Whitelist tmux...
         and not begin
             set -q TMUX

From 4078a3df267b88c5196ade5c0ba4053ecae3132d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 12:53:48 +0200
Subject: [PATCH 0492/1732] build_tools/style.fish: Stop excluding completions

[ci skip]
---
 build_tools/style.fish | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build_tools/style.fish b/build_tools/style.fish
index 755da67bf..721a1fb98 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -28,10 +28,7 @@ if test $all = yes
         exit 1
     end
     set c_files src/*.h src/*.cpp src/*.c
-    # For now we don't restyle all fish scripts other than completion scripts. That's because people
-    # really like to vertically align the elements of the `complete` command and fish_indent
-    # currently does not honor that whitespace.
-    set fish_files (printf '%s\n' share/***.fish | grep -v /completions/)
+    set fish_files (printf '%s\n' share/***.fish)
     set python_files **.py
 else
     # We haven't been asked to reformat all the source. If there are uncommitted changes reformat

From 787ef3e5581290b5773fc51aede14ad6eb865837 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 28 Apr 2019 11:59:11 +0200
Subject: [PATCH 0493/1732] functions/fish_vi_cursor: Move $XTERM_VERSION check
 earlier

Saves us from having to do it again and again.
---
 share/functions/fish_vi_cursor.fish | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 3c1d8b2ca..5190739ef 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -29,6 +29,13 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         return
     end
 
+    # Similarly, XTerm can do it since v280.
+    # Other terminals that set TERM=xterm don't set XTERM_VERSION.
+    if set -q XTERM_VERSION
+        and not test (string replace -r "XTerm\((\d+)\)" '$1' -- "$XTERM_VERSION") -ge 280 2>/dev/null
+        return
+    end
+
     # We use the `tput` here just to see if terminfo thinks we can change the cursor.
     # We cannot use that sequence directly as it's not the correct one for konsole and iTerm,
     # and because we may want to change the cursor even though terminfo says we can't (tmux).
@@ -39,13 +46,11 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         and not begin
             set -q TMUX
             # ...in a supporting term...
-            and begin set -q KONSOLE_PROFILE_NAME
+            and begin
+                set -q KONSOLE_PROFILE_NAME
                 or set -q ITERM_PROFILE
                 or set -q VTE_VERSION # which version is already checked above
-                or begin
-                    set -q XTERM_VERSION
-                    and test (string replace -r "XTerm\((\d+)\)" '$1' -- $XTERM_VERSION) -ge 280
-                end
+                or set -q XTERM_VERSION
             end
             # .. unless an unsupporting terminal has been started in tmux inside a supporting one
             and begin string match -q "screen*" -- $TERM
@@ -63,8 +68,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
             and not begin set -q KONSOLE_PROFILE_NAME
                 or set -q ITERM_PROFILE
                 or set -q VTE_VERSION # which version is already checked above
-                # If $XTERM_VERSION is undefined, this will return 1 and print an error. Silence it.
-                or test (string replace -r "XTerm\((\d+)\)" '$1' -- $XTERM_VERSION) -ge 280 2>/dev/null
+                or set -q XTERM_VERSION
             end
         end
 

From c22af0d8c7368ff0853970ccc2f430f824bd86bc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 28 Apr 2019 12:07:38 +0200
Subject: [PATCH 0494/1732] functions/fish_vi_cursor: Simplify detection

This was quite famously rather complicated.

We drop a bunch of cases - we can't handle tmux-starting-terminals
100% accurately, so we just don't try. It should be quite rare that
somebody starts a different terminal from tmux.

We drop the `tput` since it is useless (like terminfo in general for
feature-detection, because everyone claims to be xterm).

So we just check if we are in konsole, iTerm, vte or genuine-xterm.

Fixes #3696.

See #3481.
---
 share/functions/fish_vi_cursor.fish | 66 +++++++----------------------
 1 file changed, 15 insertions(+), 51 deletions(-)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 5190739ef..fbfd66ee6 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -1,17 +1,5 @@
 function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # Check hard if we are in a supporting terminal.
-    #
-    # Challenges here are term-in-a-terms (emacs ansi-term does not support this, tmux does),
-    # that we can only figure out if we are in konsole/iterm/vte via exported variables,
-    # and ancient xterm versions.
-    #
-    # tmux defaults to $TERM = screen, but can do this if it is in a supporting terminal.
-    # Unfortunately, we can only detect this via the exported variables, so we miss some cases.
-    #
-    # We will also miss some cases of terminal-stacking,
-    # e.g. tmux started in suckless' st (no support) started in konsole.
-    # But since tmux in konsole seems rather common and that case so uncommon,
-    # we will just fail there (though it seems that tmux or st swallow it anyway).
 
     # If we're not interactive, there is effectively no bind mode.
     if not status is-interactive
@@ -22,56 +10,32 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         return
     end
 
-    # vte-based terms set $TERM = xterm*, but only gained support relatively recently.
+    # vte-based terms set $TERM = xterm*, but only gained support in 2015.
     # From https://bugzilla.gnome.org/show_bug.cgi?id=720821, it appears it was version 0.40.0
     if set -q VTE_VERSION
         and test "$VTE_VERSION" -lt 4000 2>/dev/null
         return
     end
 
-    # Similarly, XTerm can do it since v280.
-    # Other terminals that set TERM=xterm don't set XTERM_VERSION.
+    # Similarly, genuine XTerm can do it since v280.
     if set -q XTERM_VERSION
         and not test (string replace -r "XTerm\((\d+)\)" '$1' -- "$XTERM_VERSION") -ge 280 2>/dev/null
         return
     end
 
-    # We use the `tput` here just to see if terminfo thinks we can change the cursor.
-    # We cannot use that sequence directly as it's not the correct one for konsole and iTerm,
-    # and because we may want to change the cursor even though terminfo says we can't (tmux).
-    if begin
-            not command -sq tput; or not tput Ss >/dev/null 2>/dev/null
-        end
-        # Whitelist tmux...
-        and not begin
-            set -q TMUX
-            # ...in a supporting term...
-            and begin
-                set -q KONSOLE_PROFILE_NAME
-                or set -q ITERM_PROFILE
-                or set -q VTE_VERSION # which version is already checked above
-                or set -q XTERM_VERSION
-            end
-            # .. unless an unsupporting terminal has been started in tmux inside a supporting one
-            and begin string match -q "screen*" -- $TERM
-                or string match -q "tmux*" -- $TERM
-            end
-        end
-        and not string match -q "konsole*" -- $TERM
-        or begin
-            # TERM = xterm is special because plenty of things claim to be it, but aren't fully compatible
-            # This includes old vte-terms (without $VTE_VERSION), old xterms (without $XTERM_VERSION or < 280)
-            # and maybe other stuff.
-            # This needs to be kept _at least_ as long as Ubuntu 14.04 is still a thing
-            # because that ships a gnome-terminal without support and without $VTE_VERSION.
-            string match -q 'xterm*' -- $TERM
-            and not begin set -q KONSOLE_PROFILE_NAME
-                or set -q ITERM_PROFILE
-                or set -q VTE_VERSION # which version is already checked above
-                or set -q XTERM_VERSION
-            end
-        end
-
+    # We need one of these terms.
+    # It would be lovely if we could rely on terminfo, but:
+    # - The "Ss" entry isn't a thing in macOS' old and crusty terminfo
+    # - It is set for xterm, and everyone and their dog claims to be xterm
+    #
+    # So we just don't care about $TERM _at all_ - it is useless for our purposes.
+    #
+    # Note: Previous versions also checked $TMUX, and made sure that then $TERM was screen* or tmux*.
+    # We don't care, since we *cannot* handle term-in-a-terms 100% correctly.
+    if not set -q KONSOLE_PROFILE_NAME
+        and not set -q ITERM_PROFILE
+        and not set -q VTE_VERSION # which version is already checked above
+        and not set -q XTERM_VERSION
         return
     end
 

From 7d2eb9649cfe345aa9ed204aad0d6f8de85f9a9c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 28 Apr 2019 12:50:06 +0200
Subject: [PATCH 0495/1732] functions/fish_vi_cursor: Detect a few more terms

These have $TERM entries of their own, so detecting them is quite easy.
---
 share/functions/fish_vi_cursor.fish | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index fbfd66ee6..2d64d8713 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -28,7 +28,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # - The "Ss" entry isn't a thing in macOS' old and crusty terminfo
     # - It is set for xterm, and everyone and their dog claims to be xterm
     #
-    # So we just don't care about $TERM _at all_ - it is useless for our purposes.
+    # So we just don't care about $TERM, unless it is one of the few terminals that actually have their own entry.
     #
     # Note: Previous versions also checked $TMUX, and made sure that then $TERM was screen* or tmux*.
     # We don't care, since we *cannot* handle term-in-a-terms 100% correctly.
@@ -36,6 +36,9 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         and not set -q ITERM_PROFILE
         and not set -q VTE_VERSION # which version is already checked above
         and not set -q XTERM_VERSION
+        and not string match -rq '^st(-.*)$' -- $TERM
+        and not string match -q 'xterm-kitty*' -- $TERM
+        and not string match -q 'rxvt*' -- $TERM
         return
     end
 

From 74514430508e58b5f7147cac812a34140af1b856 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 28 Apr 2019 18:06:39 +0200
Subject: [PATCH 0496/1732] functions/fish_vi_cursor: Cleanup

Removes the unused "uses_echo" variable and adds some comments.

[ci skip]
---
 share/functions/fish_vi_cursor.fish | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 2d64d8713..a73a45ee3 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -1,11 +1,10 @@
 function fish_vi_cursor -d 'Set cursor shape for different vi modes'
-    # Check hard if we are in a supporting terminal.
-
     # If we're not interactive, there is effectively no bind mode.
     if not status is-interactive
         return
     end
 
+    # Emacs Makes All Cursors Suck
     if set -q INSIDE_EMACS
         return
     end
@@ -45,33 +44,31 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     set -l terminal $argv[1]
     set -q terminal[1]
     or set terminal auto
-    set -l uses_echo
 
     set -l function
     switch "$terminal"
         case auto
+            # TODO: Konsole as of 18.08 knows the xterm sequences,
+            # but there's still bugs with it (as of konsole 19.04.0).
+            #
+            # If it is fixed, we'd have to read $KONSOLE_VERSION for a while,
+            # though that was only introduced in 18.08 as well.
             if set -q KONSOLE_PROFILE_NAME
                 set function __fish_cursor_konsole
-                set uses_echo 1
             else if set -q ITERM_PROFILE
                 set function __fish_cursor_1337
-                set uses_echo 1
             else
                 set function __fish_cursor_xterm
-                set uses_echo 1
             end
         case konsole
             set function __fish_cursor_konsole
-            set uses_echo 1
         case xterm
             set function __fish_cursor_xterm
-            set uses_echo 1
     end
 
     set -l tmux_prefix
     set -l tmux_postfix
     if set -q TMUX
-        and set -q uses_echo[1]
         set tmux_prefix echo -ne "'\ePtmux;\e'"
         set tmux_postfix echo -ne "'\e\\\\'"
     end

From e952f60b02ef83cd1897c8051e27b2b8bf87f071 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 13:01:02 +0200
Subject: [PATCH 0497/1732] functions/fish_vi_cursor: Disable on iTerm, allow
 override

I still don't get #3696, so let's just offer an override for now.

[ci skip]
---
 share/functions/fish_vi_cursor.fish | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index a73a45ee3..4d2f6a1b1 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -41,6 +41,17 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         return
     end
 
+    # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
+    # We allow an explicit "--force-iterm" as first argument to skip this.
+    # It's recommended only if you don't use a multi-line prompt.
+    if set -q ITERM_PROFILE
+        if contains -- $argv[1] --force-iterm
+            set -e argv[1]
+        else
+            return
+        end
+    end
+
     set -l terminal $argv[1]
     set -q terminal[1]
     or set terminal auto

From 46b804cf19e9a03506810a91c57c092f227898eb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 13:04:50 +0200
Subject: [PATCH 0498/1732] fish_vi_cursor: Don't fail if `--force-iterm` is
 given in non-iterm

Otherwise this would have used it as the terminal.

Fixup!

[ci skip]
---
 share/functions/fish_vi_cursor.fish | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 4d2f6a1b1..9be608da7 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -44,12 +44,10 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
     # We allow an explicit "--force-iterm" as first argument to skip this.
     # It's recommended only if you don't use a multi-line prompt.
-    if set -q ITERM_PROFILE
-        if contains -- $argv[1] --force-iterm
-            set -e argv[1]
-        else
-            return
-        end
+    if contains -- $argv[1] --force-iterm
+        set -e argv[1]
+    else if set -q ITERM_PROFILE
+        return
     end
 
     set -l terminal $argv[1]

From bcce6d691f7d73a79e746d7f8b28097e4faea720 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 13:33:35 +0200
Subject: [PATCH 0499/1732] Keep "; and" and "; or" on fish files

This reformats *.fish files from before commit
c2970f96183bd0bb16f8431d5e1c86db04311b7d with the changes to fish_indent.

[ci skip]
---
 share/functions/__fish_describe_command.fish |  3 +-
 share/functions/__fish_print_help.fish       | 13 +++----
 share/functions/__fish_print_packages.fish   |  1 -
 share/functions/_fish_systemctl.fish         | 36 +++++++-------------
 share/functions/abbr.fish                    |  6 ++--
 share/functions/fish_clipboard_copy.fish     |  3 +-
 share/functions/fish_git_prompt.fish         |  6 ++--
 share/functions/help.fish                    |  3 +-
 share/functions/type.fish                    |  1 -
 9 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index d850a6152..7fb334d78 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -8,8 +8,7 @@ function __fish_describe_command -d "Command used to find descriptions for comma
     # TODO: stop interpolating argv into regex, and remove this hack.
     string match --quiet --regex '^[a-zA-Z0-9_ ]+$' -- "$argv"
     or return
-    type -q apropos
-    or return
+    type -q apropos; or return
     apropos $argv 2>/dev/null | awk -v FS=" +- +" '{
 		split($1, names, ", ");
 		for (name in names)
diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index ef95b7470..0d74aa084 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -73,23 +73,18 @@ function __fish_print_help --description "Print help message for the specified f
                 # Remove man's bolding
                 set -l name (string replace -ra '(.)'\b'.' '$1' -- $line)
                 # We start after we have the name
-                contains -- $name NAME
-                and set have_name 1
-                and continue
+                contains -- $name NAME; and set have_name 1; and continue
                 # We ignore the SYNOPSIS header
-                contains -- $name SYNOPSIS
-                and continue
+                contains -- $name SYNOPSIS; and continue
                 # Everything after COPYRIGHT is useless
-                contains -- $name COPYRIGHT
-                and break
+                contains -- $name COPYRIGHT; and break
 
                 # not leading space, and not empty, so must contain a non-space
                 # in the first column. That makes it a header/footer.
                 set line_type meta
         end
 
-        set -q have_name[1]
-        or continue
+        set -q have_name[1]; or continue
         switch $state
             case normal
                 switch $line_type
diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index 8ed0a9a2e..320192473 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -3,7 +3,6 @@ function __fish_print_packages
     argparse --name=__fish_print_packages 'i/installed' -- $argv
     or return
 
-
     set -l only_installed 1
     if not set -q _flag_installed
         set -e only_installed
diff --git a/share/functions/_fish_systemctl.fish b/share/functions/_fish_systemctl.fish
index 2fea85e58..669bd41e5 100644
--- a/share/functions/_fish_systemctl.fish
+++ b/share/functions/_fish_systemctl.fish
@@ -33,30 +33,23 @@ function _fish_systemctl --description 'Call systemctl with some options from th
             help reset-failed list-dependencies list-units revert add-{wants,requires} edit
         case enable
             # This will only work for "list-unit-files", but won't print an error for "list-units".
-            set -q _flag_state
-            or set _flag_state disabled
+            set -q _flag_state; or set _flag_state disabled
         case disable
-            set -q _flag_state
-            or set _flag_state enabled
+            set -q _flag_state; or set _flag_state enabled
         case start
             # Running `start` on an already started unit isn't an _error_, but useless.
-            set -q _flag_state
-            or set _flag_state dead,failed
+            set -q _flag_state; or set _flag_state dead,failed
         case mask
-            set -q _flag_state
-            or set _flag_state loaded
+            set -q _flag_state; or set _flag_state loaded
         case unmask
-            set -q _flag_state
-            or set _flag_state masked
+            set -q _flag_state; or set _flag_state masked
         case stop kill
             # TODO: Is "kill" useful on other unit types?
             # Running as the catch-all, "mounted" for .mount units, "active" for .target.
-            set -q _flag_state
-            or set _flag_state running,mounted,active
+            set -q _flag_state; or set _flag_state running,mounted,active
         case isolate set-default
             # These only take one unit.
-            set -q argv[1]
-            and return
+            set -q argv[1]; and return
         case list-sockets
             set _flag_type socket
         case list-timers
@@ -72,16 +65,11 @@ function _fish_systemctl --description 'Call systemctl with some options from th
     end
 
     # Add the flags back so we can pass them to our systemctl invocations.
-    set -q _flag_type
-    and set passflags $passflags --type=$_flag_type
-    set -q _flag_state
-    and set passflags $passflags --state=$_flag_state
-    set -q _flag_property
-    and set passflags $passflags --property=$_flag_property
-    set -q _flag_machine
-    and set passflags $passflags --machine=$_flag_machine
-    set -q _flag_host
-    and set passflags $passflags --host=$_flag_host
+    set -q _flag_type; and set passflags $passflags --type=$_flag_type
+    set -q _flag_state; and set passflags $passflags --state=$_flag_state
+    set -q _flag_property; and set passflags $passflags --property=$_flag_property
+    set -q _flag_machine; and set passflags $passflags --machine=$_flag_machine
+    set -q _flag_host; and set passflags $passflags --host=$_flag_host
 
     # Output looks like
     # systemd-tmpfiles-clean.timer      [more whitespace] loaded    active     waiting   Daily Cleanup[...]
diff --git a/share/functions/abbr.fish b/share/functions/abbr.fish
index e37c1557b..b328c5120 100644
--- a/share/functions/abbr.fish
+++ b/share/functions/abbr.fish
@@ -53,14 +53,12 @@ function abbr --description "Manage abbreviations"
     else if set -q _flag_query[1]
         # "--query": Check if abbrs exist.
         # If we don't have an argument, it's an automatic failure.
-        set -q argv[1]
-        or return 1
+        set -q argv[1]; or return 1
         set -l escaped _fish_abbr_(string escape --style=var -- $argv)
         # We return 0 if any arg exists, whereas `set -q` returns the number of undefined arguments.
         # But we should be consistent with `type -q` and `command -q`.
         for var in $escaped
-            set -q $escaped
-            and return 0
+            set -q $escaped; and return 0
         end
         return 1
     else
diff --git a/share/functions/fish_clipboard_copy.fish b/share/functions/fish_clipboard_copy.fish
index 088c9c921..0054198aa 100644
--- a/share/functions/fish_clipboard_copy.fish
+++ b/share/functions/fish_clipboard_copy.fish
@@ -1,8 +1,7 @@
 function fish_clipboard_copy
     # Copy the current selection, or the entire commandline if that is empty.
     set -l cmdline (commandline --current-selection)
-    test -n "$cmdline"
-    or set cmdline (commandline)
+    test -n "$cmdline"; or set cmdline (commandline)
     if type -q pbcopy
         printf '%s\n' $cmdline | pbcopy
     else if type -q xsel
diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index eef67866a..cf3623bfa 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -454,8 +454,7 @@ function fish_git_prompt --description "Prompt function for Git"
     set b (string replace refs/heads/ '' -- $b)
     set -q __fish_git_prompt_shorten_branch_char_suffix
     or set -l __fish_git_prompt_shorten_branch_char_suffix "…"
-    if string match -qr '^\d+$' "$__fish_git_prompt_shorten_branch_len"
-        and test (string length "$b") -gt $__fish_git_prompt_shorten_branch_len
+    if string match -qr '^\d+$' "$__fish_git_prompt_shorten_branch_len"; and test (string length "$b") -gt $__fish_git_prompt_shorten_branch_len
         set b (string sub -l "$__fish_git_prompt_shorten_branch_len" "$b")"$__fish_git_prompt_shorten_branch_char_suffix"
     end
     if test -n "$b"
@@ -549,8 +548,7 @@ function __fish_git_prompt_informative_status
     set -l untrackedfiles (command git ls-files --others --exclude-standard | count)
     set -l stashstate 0
     set -l stashfile "$argv[1]/logs/refs/stash"
-    if set -q __fish_git_prompt_showstashstate
-        and test -e "$stashfile"
+    if set -q __fish_git_prompt_showstashstate; and test -e "$stashfile"
         set stashstate (count < $stashfile)
     end
 
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 56210688f..bfbcc4443 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -69,8 +69,7 @@ function help --description 'Show help for the fish shell'
                 set fish_browser cygstart
                 # If xdg-open is available, just use that
                 # but only if an X session is running
-            else if type -q xdg-open
-                and set -q -x DISPLAY
+            else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
 
diff --git a/share/functions/type.fish b/share/functions/type.fish
index ba2b81dd4..66df5ee6b 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -62,7 +62,6 @@ function type --description 'Print the type of a command'
                             case "n/a"
                             case "stdin"
                                 break
-
                             case "*"
                                 echo $func_path
                         end

From d83636f70ef4e14b0788c92b0048e36deb048c09 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 13:49:11 +0200
Subject: [PATCH 0500/1732] completions/git: Handle AD files

Added files that were deleted after. These count as both added and
deleted.

Fixes #5861.

[ci skip]
---
 share/completions/git.fish | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 41c30f10b..eecc06e77 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -190,6 +190,15 @@ function __fish_git_files
                     set -ql added
                     and set file "$line[9..-1]"
                     and set desc $added_desc
+                case '1 AD*'
+                    # Added files that were since deleted
+                    if set -ql added
+                        set file "$line[9..-1]"
+                        set desc $added_desc
+                    else if set -ql deleted
+                        set file "$line[9..-1]"
+                        set desc $deleted_desc
+                    end
                 case "1 AM*"
                     # Added files with additional modifications
                     if set -ql added
@@ -321,7 +330,23 @@ function __fish_git_files
                 case 'C ' CM CD
                     set use_next copied
                     continue
-                case 'A ' AM AD
+                case AM
+                    if set -ql added
+                        set file "$line[9..-1]"
+                        set desc $added_desc
+                    else if set -ql modified
+                        set file "$line[9..-1]"
+                        set desc $modified_desc
+                    end
+                case AD
+                    if set -ql added
+                        set file "$line[9..-1]"
+                        set desc $added_desc
+                    else if set -ql deleted
+                        set file "$line[9..-1]"
+                        set desc $deleted_desc
+                    end
+                case 'A '
                     # Additions are only shown here if they are staged.
                     # Otherwise it's an untracked file.
                     set -ql added

From 8d9782301ef88a18394f7c6479d78d7c5760f0be Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 14:01:07 +0200
Subject: [PATCH 0501/1732] docs: Call "arrays" "lists"

We were flip-flopping between the two terms, so we now use one. We
still mention "array" in the chapter, and it's still `read --array`,
though.

Fixes #5846.

[ci skip]
---
 sphinx_doc_src/cmds/count.rst    |  4 +--
 sphinx_doc_src/cmds/function.rst |  2 +-
 sphinx_doc_src/cmds/help.rst     |  2 +-
 sphinx_doc_src/cmds/read.rst     |  4 +--
 sphinx_doc_src/cmds/set.rst      |  8 +++---
 sphinx_doc_src/cmds/vared.rst    |  4 +--
 sphinx_doc_src/index.rst         | 48 ++++++++++++++++----------------
 sphinx_doc_src/tutorial.rst      |  2 +-
 8 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/sphinx_doc_src/cmds/count.rst b/sphinx_doc_src/cmds/count.rst
index 566c140b0..150700313 100644
--- a/sphinx_doc_src/cmds/count.rst
+++ b/sphinx_doc_src/cmds/count.rst
@@ -1,6 +1,6 @@
 .. _cmd-count:
 
-count - count the number of elements of an array
+count - count the number of elements of a list
 ================================================
 
 Synopsis
@@ -14,7 +14,7 @@ count < FILE
 Description
 -----------
 
-``count`` prints the number of arguments that were passed to it, plus the number of newlines passed to it via stdin. This is usually used to find out how many elements an environment variable array contains, or how many lines there are in a text file.
+``count`` prints the number of arguments that were passed to it, plus the number of newlines passed to it via stdin. This is usually used to find out how many elements an environment variable list contains, or how many lines there are in a text file.
 
 ``count`` does not accept any options, not even ``-h`` or ``--help``.
 
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index b7480331b..2cf00e57c 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -41,7 +41,7 @@ The following options are available:
 
 - ``-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 `variable array <index.html#variables-arrays>`__ ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
+If the user enters any additional arguments after the function, they are inserted into the environment `variable list <index.html#variables-lists>`__ ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
 
 By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the :ref:`emit <cmd-emit>` builtin. Fish generates the following named events:
 
diff --git a/sphinx_doc_src/cmds/help.rst b/sphinx_doc_src/cmds/help.rst
index 24ea5b75d..c9f55ad06 100644
--- a/sphinx_doc_src/cmds/help.rst
+++ b/sphinx_doc_src/cmds/help.rst
@@ -18,7 +18,7 @@ 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.
 
-If you prefer to use a different browser (other than as described above) for fish help, you can set the fish_help_browser variable. This variable may be set as an array, where the first element is the browser command and the rest are browser options.
+If you prefer to use a different browser (other than as described above) for fish help, you can set the 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.
 
 Note that most builtin commands display their help in the terminal when given the ``--help`` option.
 
diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index 8b8d0fee2..d4f77b94d 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -43,7 +43,7 @@ The following options are available:
 
 - ``-x`` or ``--export`` exports the variables to child processes.
 
-- ``-a`` or ``--array`` stores the result as an array in a single variable.
+- ``-a`` or ``--array`` stores the result as a list in a single variable.
 
 - ``-z`` or ``--null`` marks the end of the line with the NUL character, instead of newline. This also
   disables interactive mode.
@@ -62,7 +62,7 @@ If no variable names are provided, ``read`` enters a special case that simply pr
 
 When running in this mode, ``read`` does not split the input in any way and text is redirected to standard output without any further processing or manipulation.
 
-If ``-a`` or ``--array`` is provided, only one variable name is allowed and the tokens are stored as an array in this variable.
+If ``-a`` or ``--array`` is provided, only one variable name is allowed and the tokens are stored as a list in this variable.
 
 See the documentation for ``set`` for more details on the scoping rules for variables.
 
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index 405485924..1687c9e07 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -57,9 +57,9 @@ The following options are available:
 - ``-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 an array with the specified elements. If a variable is set to zero elements, it will become an array with zero elements.
+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 array elements, such as ``PATH[1 3 7]``, only those array elements specified will be changed. If you specify a negative index when expanding or assigning to an array variable, the index will be calculated from the end of the array. For example, the index -1 means the last index of an array.
+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.
 
 The scoping rules when creating or updating a variable are:
 
@@ -81,7 +81,7 @@ The exporting rules when creating or updating a variable are identical to the sc
 
 In query mode, the scope to be examined can be specified.
 
-In erase mode, if variable indices are specified, only the specified slices of the array variable will be erased.
+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.
 
@@ -110,7 +110,7 @@ Examples
     # Removes the variable $smurf
     set -e smurf
     
-    # Changes the fourth element of the $PATH array to ~/bin
+    # Changes the fourth element of the $PATH list to ~/bin
     set PATH[4] ~/bin
     
     # Outputs the path to Python if ``type -p`` returns true.
diff --git a/sphinx_doc_src/cmds/vared.rst b/sphinx_doc_src/cmds/vared.rst
index aec694ab6..b5caca6d0 100644
--- a/sphinx_doc_src/cmds/vared.rst
+++ b/sphinx_doc_src/cmds/vared.rst
@@ -12,10 +12,10 @@ vared VARIABLE_NAME
 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 array elements can.
+``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.
 
 
 Example
 -------
 
-``vared PATH[3]`` edits the third element of the PATH array
+``vared PATH[3]`` edits the third element of the PATH list
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 25d15b131..9515825a0 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -439,7 +439,7 @@ For example, the following is a function definition that calls the command ``ls`
       ls -l $argv
   end
 
-The first line tells fish that a function by the name of ``ll`` is to be defined. To use it, simply write ``ll`` on the commandline. The second line tells fish that the command ``ls -l $argv`` should be called when ``ll`` is invoked. '``$argv``' is an array variable, which always contains all arguments sent to the function. In the example above, these are simply passed on to the ``ls`` command. For more information on functions, see the documentation for the :ref:`function <cmd-function>` builtin.
+The first line tells fish that a function by the name of ``ll`` is to be defined. To use it, simply write ``ll`` on the commandline. The second line tells fish that the command ``ls -l $argv`` should be called when ``ll`` is invoked. '``$argv``' is a list variable, which always contains all arguments sent to the function. In the example above, these are simply passed on to the ``ls`` command. For more information on functions, see the documentation for the :ref:`function <cmd-function>` builtin.
 
 .. _syntax-function-wrappers:
 
@@ -469,7 +469,7 @@ Autoloading functions
 
 Functions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. This method of defining functions has several advantages. An autoloaded function becomes available automatically to all running shells. If the function definition is changed, all running shells will automatically reload the altered version. Startup time and memory usage is improved, etc.
 
-Fish automatically searches through any directories in the array variable ``$fish_function_path``, and any functions defined are automatically loaded when needed. A function definition file must have a filename consisting of the name of the function plus the suffix '``.fish``'.
+Fish automatically searches through any directories in the list variable ``$fish_function_path``, and any functions defined are automatically loaded when needed. A function definition file must have a filename consisting of the name of the function plus the suffix '``.fish``'.
 
 By default, Fish searches the following for functions, using the first available file that it finds:
 
@@ -655,7 +655,7 @@ Functions beginning with the string ``__fish_print_`` print a newline separated
 Where to put completions
 ------------------------
 
-Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the array variable ``$fish_complete_path``, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '``.fish``'.
+Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the list variable ``$fish_complete_path``, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '``.fish``'.
 
 By default, Fish searches the following for completions, using the first available file that it finds:
 
@@ -756,7 +756,7 @@ Examples::
 
     begin; set -l IFS; set data (cat data.txt); end
     # Set the ``data`` variable to the contents of 'data.txt'
-    # without splitting it into an array.
+    # without splitting it into a list.
 
 
 .. _expand-brace:
@@ -844,7 +844,7 @@ The ``$`` symbol can also be used multiple times, as a kind of "dereference" ope
     # 20
     # 30
 
-When using this feature together with array brackets, the brackets will always match the innermost ``$`` dereference. Thus, ``$$foo[5]`` will always mean the fifth element of the ``foo`` variable should be dereferenced, not the fifth element of the doubly dereferenced variable ``foo``. The latter can instead be expressed as ``$$foo[1][5]``.
+When using this feature together with list brackets, the brackets will always match the innermost ``$`` dereference. Thus, ``$$foo[5]`` will always mean the fifth element of the ``foo`` variable should be dereferenced, not the fifth element of the doubly dereferenced variable ``foo``. The latter can instead be expressed as ``$$foo[1][5]``.
 
 
 .. _cartesian-product:
@@ -902,7 +902,7 @@ Examples::
 Index range expansion
 ---------------------
 
-Both command substitution and shell variable expansion support accessing only specific items by providing a set of indices in square brackets. It's often needed to access a sequence of elements. To do this, use the range operator '``..``' for this. A range '``a..b``', where range limits 'a' and 'b' are integer numbers, is expanded into a sequence of indices '``a a+1 a+2 ... b``' or '``a a-1 a-2 ... b``' depending on which of 'a' or 'b' is higher. The negative range limits are calculated from the end of the array or command substitution. Note that invalid indexes for either end are silently clamped to one or the size of the array as appropriate.
+Both command substitution and shell variable expansion support accessing only specific items by providing a set of indices in square brackets. It's often needed to access a sequence of elements. To do this, use the range operator '``..``' for this. A range '``a..b``', where range limits 'a' and 'b' are integer numbers, is expanded into a sequence of indices '``a a+1 a+2 ... b``' or '``a a-1 a-2 ... b``' depending on which of 'a' or 'b' is higher. The negative range limits are calculated from the end of the list or command substitution. Note that invalid indexes for either end are silently clamped to one or the size of the list as appropriate.
 
 Range expansion will go in reverse if the end element is earlier in the list than the start and forward if the end is later than the start, unless exactly one of the given indices is negative. This is to enable clamping without changing direction if the list has fewer elements than expected.
 
@@ -1103,18 +1103,18 @@ Variables can be explicitly set to be exported with the ``-x`` or ``--export`` s
 
 -# If a variable has global scope, it is accessible read-write to functions whether it is exported or not.
 
-.. _variables-arrays:
+.. _variables-lists:
 
-Arrays
+Lists
 -------
 
-``fish`` can store a list of multiple strings inside of a variable. To access one element of an array, use the index of the element inside of square brackets, like this:
+``fish`` can store a list (or an "array" if you wish) of multiple strings inside of a variable. To access one element of a list, use the index of the element inside of square brackets, like this:
 
 ``echo $PATH[3]``
 
-Note that array indices start at 1 in ``fish``, not 0, as is more common in other languages. This is because many common Unix tools like ``seq`` are more suited to such use. An invalid index is silently ignored resulting in no value being substituted (not an empty string).
+Note that list indices start at 1 in ``fish``, not 0, as is more common in other languages. This is because many common Unix tools like ``seq`` are more suited to such use. An invalid index is silently ignored resulting in no value being substituted (not an empty string).
 
-If you do not use any brackets, all the elements of the array will be written as separate items. This means you can easily iterate over an array using this syntax::
+If you do not use any brackets, all the elements of the list will be written as separate items. This means you can easily iterate over a list using this syntax::
 
     for i in $PATH; echo $i is in the path; end
 
@@ -1122,9 +1122,9 @@ To create a variable ``smurf``, containing the items ``blue`` and ``small``, sim
 
     set smurf blue small
 
-It is also possible to set or erase individual elements of an array::
+It is also possible to set or erase individual elements of a list::
 
-    # Set smurf to be an array with the elements 'blue' and 'small'
+    # Set smurf to be a list with the elements 'blue' and 'small'
     set smurf blue small
 
     # Change the second element of smurf to 'evil'
@@ -1137,13 +1137,13 @@ It is also possible to set or erase individual elements of an array::
     echo $smurf
 
 
-If you specify a negative index when expanding or assigning to an array variable, the index will be calculated from the end of the array. For example, the index -1 means the last index of an array.
+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.
 
 A range of indices can be specified, see `index range expansion <#expand-index-range>`_ for details.
 
-All arrays are one-dimensional and cannot contain other arrays, although it is possible to fake nested arrays using the dereferencing rules of `variable expansion <#expand-variable>`_.
+All lists are one-dimensional and cannot contain other lists, although it is possible to fake nested lists using the dereferencing rules of `variable expansion <#expand-variable>`_.
 
-When an array is exported as an environment variable, it is either space or colon delimited, depending on whether it is a path variable::
+When a list is exported as an environment variable, it is either space or colon delimited, depending on whether it is a path variable::
 
     set -x smurf blue small
     set -x smurf_PATH forest mushroom
@@ -1154,7 +1154,7 @@ When an array is exported as an environment variable, it is either space or colo
     
 
 
-``fish`` automatically creates arrays from all environment variables whose name ends in PATH, by splitting them on colons. Other variables are not automatically split.
+``fish`` automatically creates lists from all environment variables whose name ends in PATH, by splitting them on colons. Other variables are not automatically split.
 
 .. _variables-path:
 
@@ -1163,7 +1163,7 @@ PATH variables
 
 Path variables are a special kind of variable used to support colon-delimited path lists including PATH, CDPATH, MANPATH, PYTHONPATH, etc. All variables that end in ``PATH`` (case-sensitive) become PATH variables.
 
-PATH variables act as normal arrays, except they are are implicitly joined and split on colons.
+PATH variables act as normal lists, except they are are implicitly joined and split on colons.
 
 ::
 
@@ -1186,9 +1186,9 @@ Special variables
 
 The user can change the settings of ``fish`` by changing the values of certain variables.
 
-- ``PATH``, an array of directories in which to search for commands
+- ``PATH``, a list of directories in which to search for commands
 
-- ``CDPATH``, an array of directories in which to search for the new directory for the ``cd`` builtin.
+- ``CDPATH``, a list of directories in which to search for the new directory for the ``cd`` builtin.
 
 - ``LANG``, ``LC_ALL``, ``LC_COLLATE``, ``LC_CTYPE``, ``LC_MESSAGES``, ``LC_MONETARY``, ``LC_NUMERIC`` and ``LC_TIME`` set the language option for the shell and subprograms. See the section `Locale variables <#variables-locale>`_ for more information.
 
@@ -1208,7 +1208,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
   empty string, history is not saved to disk (but is still available within the interactive
   session).
 
-- ``fish_user_paths``, an array of directories that are prepended to ``PATH``. This can be a universal variable.
+- ``fish_user_paths``, a list of directories that are prepended to ``PATH``. This can be a universal variable.
 
 - ``umask``, the current file creation mask. The preferred way to change the umask variable is through the :ref:`umask <cmd-umask>` function. An attempt to set umask to an invalid value will always fail.
 
@@ -1218,9 +1218,9 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``_``, the name of the currently running command (though this is deprecated, and the use of ``status current-command`` is preferred).
 
-- ``argv``, an array of arguments to the shell or function. ``argv`` is only defined when inside a function call, or if fish was invoked with a list of arguments, like ``fish myscript.fish foo bar``. This variable can be changed by the user.
+- ``argv``, a list of arguments to the shell or function. ``argv`` is only defined when inside a function call, or if fish was invoked with a list of arguments, like ``fish myscript.fish foo bar``. This variable can be changed by the user.
 
-- ``history``, an array containing the last commands that were entered.
+- ``history``, a list containing the last commands that were entered.
 
 - ``HOME``, the user's home directory. This variable can be changed by the user.
 
@@ -1232,7 +1232,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``status``, the `exit status <#variables-status>`_ of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number.
 
-- ``pipestatus``, an array of exit statuses of all processes that made up the last executed pipe.
+- ``pipestatus``, a list of exit statuses of all processes that made up the last executed pipe.
 
 - ``USER``, the current username. This variable can be changed by the user.
 
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 668e4b195..8a2ea9fd3 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -246,7 +246,7 @@ Unlike other shells, ``fish`` stores the exit status of the last command in ``$s
     1
 
 
-Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` array variable for the exit statues of processes in a pipe.
+Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` list variable for the exit statues of processes in a pipe.
 
 
 Exports (Shell Variables)

From 8f3f4bbc9c9af3624050730dfa8f20d72f49c10a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 15:22:01 +0200
Subject: [PATCH 0502/1732] CHANGELOG fish_indent semicolons and test
 stacktrace

[ci skip]
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71f26eb6e..42295b9a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@
 - `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
+- `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
+- `test` (aka `[`) now prints a stacktrace on error, making the offending call easier to find (#5771).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).

From afff93bdb22c5a97928479fefc73f33a9020f31d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 May 2019 17:31:33 +0200
Subject: [PATCH 0503/1732] Disable vi-cursor in tests

Otherwise this breaks if run inside a terminal that could do the cursor.
---
 share/functions/fish_vi_cursor.fish | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 9be608da7..926a48a6b 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -4,6 +4,12 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
         return
     end
 
+    # This is hard to test in expect, since the exact sequences depend on the environment.
+    # Instead disable it.
+    if set -q FISH_UNIT_TESTS_RUNNING
+        return
+    end
+
     # Emacs Makes All Cursors Suck
     if set -q INSIDE_EMACS
         return

From 8a8b2513b5c4f917997a24ccce77c791783b94e6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 4 May 2019 22:12:31 -0700
Subject: [PATCH 0504/1732] Eliminate the global jobs() function

All job lists are attached to a parser now.
---
 src/builtin_bg.cpp      |  7 ++---
 src/builtin_disown.cpp  |  2 +-
 src/builtin_fg.cpp      |  6 ++---
 src/builtin_jobs.cpp    |  5 ++--
 src/builtin_wait.cpp    | 29 +++++++++++---------
 src/exec.cpp            |  2 +-
 src/fish.cpp            |  1 -
 src/fish_tests.cpp      |  2 --
 src/parse_execution.cpp | 14 +++++-----
 src/parser.cpp          | 10 +++----
 src/parser.h            |  5 ++--
 src/proc.cpp            | 60 ++++++++++++++---------------------------
 src/proc.h              | 21 ++++-----------
 src/reader.cpp          | 21 +++++++--------
 src/reader.h            |  2 +-
 src/sanity.cpp          |  6 -----
 src/sanity.h            |  3 ---
 17 files changed, 79 insertions(+), 117 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index f8ee41558..de5dce4b6 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -12,6 +12,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
+#include "parser.h"
 #include "proc.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -28,9 +29,9 @@ static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
 
     streams.err.append_format(_(L"Send job %d '%ls' to background\n"), j->job_id,
                               j->command_wcstr());
-    j->promote();
+    parser.job_promote(j);
     j->set_flag(job_flag_t::FOREGROUND, false);
-    j->continue_job(true, j->is_stopped());
+    j->continue_job(parser, true, j->is_stopped());
     return STATUS_CMD_OK;
 }
 
@@ -52,7 +53,7 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (optind == argc) {
         // No jobs were specified so use the most recent (i.e., last) job.
         job_t *job = nullptr;
-        for (const auto &j : jobs()) {
+        for (const auto &j : parser.jobs()) {
             if (j->is_stopped() && j->get_flag(job_flag_t::JOB_CONTROL) && (!j->is_completed())) {
                 job = j.get();
                 break;
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 09906a94c..622d1373f 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -61,7 +61,7 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Foreground jobs can be disowned.
         // Even jobs that aren't under job control can be disowned!
         job_t *job = nullptr;
-        for (const auto &j : jobs()) {
+        for (const auto &j : parser.jobs()) {
             if (j->is_constructed() && (!j->is_completed())) {
                 job = j.get();
                 break;
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index ad37f9c67..42c1bc4f1 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -38,7 +38,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Select last constructed job (i.e. first job in the job queue) that can be brought
         // to the foreground.
 
-        for (const auto &j : jobs()) {
+        for (const auto &j : parser.jobs()) {
             if (j->is_constructed() && (!j->is_completed()) &&
                 ((j->is_stopped() || (!j->is_foreground())) &&
                  j->get_flag(job_flag_t::JOB_CONTROL))) {
@@ -103,9 +103,9 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (!ft.empty()) parser.vars().set_one(L"_", ENV_EXPORT, ft);
     reader_write_title(job->command(), parser);
 
-    job->promote();
+    parser.job_promote(job);
     job->set_flag(job_flag_t::FOREGROUND, true);
 
-    job->continue_job(true, job->is_stopped());
+    job->continue_job(parser, true, job->is_stopped());
     return STATUS_CMD_OK;
 }
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 2f5c264a0..905a7db8d 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -9,6 +9,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
+#include "parser.h"
 #include "proc.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
@@ -170,7 +171,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (print_last) {
         // Ignore unconstructed jobs, i.e. ourself.
-        for (const auto &j : jobs()) {
+        for (const auto &j : parser.jobs()) {
             if (j->is_visible()) {
                 builtin_jobs_print(j.get(), mode, !streams.out_is_redirected, streams);
                 return STATUS_CMD_ERROR;
@@ -212,7 +213,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 }
             }
         } else {
-            for (const auto &j : jobs()) {
+            for (const auto &j : parser.jobs()) {
                 // Ignore unconstructed jobs, i.e. ourself.
                 if (j->is_visible()) {
                     builtin_jobs_print(j.get(), mode, !found && !streams.out_is_redirected,
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 5a2f9b291..74e1e08c2 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -5,6 +5,7 @@
 #include "builtin.h"
 #include "builtin_wait.h"
 #include "common.h"
+#include "parser.h"
 #include "proc.h"
 #include "reader.h"
 #include "wgetopt.h"
@@ -15,8 +16,8 @@
 /// Return the job id to which the process with pid belongs.
 /// If a specified process has already finished but the job hasn't, parser_t::job_get_from_pid()
 /// doesn't work properly, so use this function in wait command.
-static job_id_t get_job_id_from_pid(pid_t pid) {
-    for (const auto &j : jobs()) {
+static job_id_t get_job_id_from_pid(pid_t pid, const parser_t &parser) {
+    for (const auto &j : parser.jobs()) {
         if (j->pgid == pid) {
             return j->job_id;
         }
@@ -30,8 +31,8 @@ static job_id_t get_job_id_from_pid(pid_t pid) {
     return 0;
 }
 
-static bool all_jobs_finished() {
-    for (const auto &j : jobs()) {
+static bool all_jobs_finished(const parser_t &parser) {
+    for (const auto &j : parser.jobs()) {
         // If any job is not completed, return false.
         // If there are stopped jobs, they are ignored.
         if (j->is_constructed() && !j->is_completed() && !j->is_stopped()) {
@@ -41,14 +42,14 @@ static bool all_jobs_finished() {
     return true;
 }
 
-static bool any_jobs_finished(size_t jobs_len) {
+static bool any_jobs_finished(size_t jobs_len, const parser_t &parser) {
     bool no_jobs_running = true;
 
     // If any job is removed from list, return true.
-    if (jobs_len != jobs().size()) {
+    if (jobs_len != parser.jobs().size()) {
         return true;
     }
-    for (const auto &j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         // If any job is completed, return true.
         if (j->is_constructed() && (j->is_completed() || j->is_stopped())) {
             return true;
@@ -65,9 +66,10 @@ static bool any_jobs_finished(size_t jobs_len) {
 }
 
 static int wait_for_backgrounds(parser_t &parser, bool any_flag) {
-    size_t jobs_len = jobs().size();
+    size_t jobs_len = parser.jobs().size();
 
-    while ((!any_flag && !all_jobs_finished()) || (any_flag && !any_jobs_finished(jobs_len))) {
+    while ((!any_flag && !all_jobs_finished(parser)) ||
+           (any_flag && !any_jobs_finished(jobs_len, parser))) {
         if (reader_test_interrupted()) {
             return 128 + SIGINT;
         }
@@ -137,10 +139,11 @@ static bool match_pid(const wcstring &cmd, const wchar_t *proc) {
 }
 
 /// It should search the job list for something matching the given proc.
-static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids) {
+static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids,
+                             const parser_t &parser) {
     bool found = false;
 
-    for (const auto &j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         if (j->command_is_empty()) continue;
 
         if (match_pid(j->command(), proc)) {
@@ -219,7 +222,7 @@ int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                               argv[i]);
                     continue;
                 }
-                if (job_id_t id = get_job_id_from_pid(pid)) {
+                if (job_id_t id = get_job_id_from_pid(pid, parser)) {
                     waited_job_ids.push_back(id);
                 } else {
                     streams.err.append_format(
@@ -227,7 +230,7 @@ int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 }
             } else {
                 // argument is process name
-                if (!find_job_by_name(argv[i], waited_job_ids)) {
+                if (!find_job_by_name(argv[i], waited_job_ids, parser)) {
                     streams.err.append_format(
                         _(L"%ls: Could not find child processes with the name '%ls'\n"), cmd,
                         argv[i]);
diff --git a/src/exec.cpp b/src/exec.cpp
index f5d2003a0..3ab657338 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1120,7 +1120,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         return false;
     }
 
-    j->continue_job(reclaim_foreground_pgrp, false);
+    j->continue_job(parser, reclaim_foreground_pgrp, false);
     return true;
 }
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 34d231cd0..7de13d2ad 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -491,7 +491,6 @@ int main(int argc, char **argv) {
     }
 
     history_save_all();
-    proc_destroy();
     if (opts.print_rusage_self) {
         print_rusage_self(stderr);
     }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 9f995b990..88e51d328 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5327,8 +5327,6 @@ int main(int argc, char **argv) {
     say(L"Encountered %d errors in low-level tests", err_count);
     if (s_test_run_count == 0) say(L"*** No Tests Were Actually Run! ***");
 
-    proc_destroy();
-
     if (err_count != 0) {
         return 1;
     }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index acd7579fd..aed94c42f 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -797,7 +797,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     // Protect against exec with background processes running
     if (process_type == process_type_t::exec && shell_is_interactive()) {
         bool have_bg = false;
-        for (const auto &bg : jobs()) {
+        for (const auto &bg : parser->jobs()) {
             // The assumption here is that if it is a foreground job,
             // it's related to us.
             // This stops us from asking if we're doing `exec` inside a function.
@@ -811,11 +811,11 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
             uint64_t current_run_count = reader_run_count();
             uint64_t &last_exec_run_count = parser->libdata().last_exec_run_counter;
             if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
-                reader_bg_job_warning();
+                reader_bg_job_warning(*parser);
                 last_exec_run_count = current_run_count;
                 return parse_execution_errored;
             } else {
-                hup_background_jobs();
+                hup_background_jobs(*parser);
             }
         }
     }
@@ -1142,10 +1142,10 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     return result;
 }
 
-static bool remove_job(job_t *job) {
-    for (auto j = jobs().begin(); j != jobs().end(); ++j) {
+static bool remove_job(parser_t &parser, job_t *job) {
+    for (auto j = parser.jobs().begin(); j != parser.jobs().end(); ++j) {
         if (j->get() == job) {
-            jobs().erase(j);
+            parser.jobs().erase(j);
             return true;
         }
     }
@@ -1276,7 +1276,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
         // Actually execute the job.
         if (!exec_job(*this->parser, job)) {
-            remove_job(job.get());
+            remove_job(*this->parser, job.get());
         }
 
         // Update universal vaiables on external conmmands.
diff --git a/src/parser.cpp b/src/parser.cpp
index c0c62f03f..ec3a0665b 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -571,24 +571,24 @@ wcstring parser_t::current_line() {
 void parser_t::job_add(shared_ptr<job_t> job) {
     assert(job != NULL);
     assert(!job->processes.empty());
-    this->my_job_list.push_front(std::move(job));
+    job_list.push_front(std::move(job));
 }
 
 void parser_t::job_promote(job_t *job) {
     job_list_t::iterator loc;
-    for (loc = my_job_list.begin(); loc != my_job_list.end(); ++loc) {
+    for (loc = job_list.begin(); loc != job_list.end(); ++loc) {
         if (loc->get() == job) {
             break;
         }
     }
-    assert(loc != my_job_list.end());
+    assert(loc != job_list.end());
 
     // Move the job to the beginning.
-    std::rotate(my_job_list.begin(), loc, my_job_list.end());
+    std::rotate(job_list.begin(), loc, job_list.end());
 }
 
 job_t *parser_t::job_get(job_id_t id) {
-    for (const auto &job : my_job_list) {
+    for (const auto &job : job_list) {
         if (id <= 0 || job->job_id == id) return job.get();
     }
     return NULL;
diff --git a/src/parser.h b/src/parser.h
index 6554d1aa5..2fc425e34 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -172,7 +172,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// List of called functions, used to help prevent infinite recursion.
     wcstring_list_t forbidden_function;
     /// The jobs associated with this parser.
-    job_list_t my_job_list;
+    job_list_t job_list;
     /// The list of blocks
     std::vector<std::unique_ptr<block_t>> block_stack;
     /// The 'depth' of the fish call stack.
@@ -274,7 +274,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     size_t block_count() const { return block_stack.size(); }
 
     /// Get the list of jobs.
-    job_list_t &job_list() { return my_job_list; }
+    job_list_t &jobs() { return job_list; }
+    const job_list_t &jobs() const { return job_list; }
 
     /// Get the variables.
     env_stack_t &vars() { return variables; }
diff --git a/src/proc.cpp b/src/proc.cpp
index 997217ef4..7a615c5c4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -55,16 +55,6 @@ static owning_lock<statuses_t> last_statuses{statuses_t::just(0)};
 /// The signals that signify crashes to us.
 static const int crashsignals[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGSYS};
 
-bool job_list_is_empty() {
-    ASSERT_IS_MAIN_THREAD();
-    return parser_t::principal_parser().job_list().empty();
-}
-
-job_list_t &jobs() {
-    ASSERT_IS_MAIN_THREAD();
-    return parser_t::principal_parser().job_list();
-}
-
 bool is_interactive_session = false;
 bool is_subshell = false;
 bool is_block = false;
@@ -96,18 +86,6 @@ static std::vector<int> interactive_stack;
 
 void proc_init() { proc_push_interactive(0); }
 
-void job_t::promote() {
-    ASSERT_IS_MAIN_THREAD();
-    parser_t::principal_parser().job_promote(this);
-}
-
-void proc_destroy() {
-    for (const auto &job : jobs()) {
-        debug(2, L"freeing leaked job %ls", job->command_wcstr());
-    }
-    jobs().clear();
-}
-
 void proc_set_last_statuses(statuses_t s) {
     ASSERT_IS_MAIN_THREAD();
     *last_statuses.acquire() = std::move(s);
@@ -332,7 +310,7 @@ void add_disowned_pgid(pid_t pgid) {
 /// See if any reapable processes have exited, and mark them accordingly.
 /// \param block_ok if no reapable processes have exited, block until one is (or until we receive a
 /// signal).
-static void process_mark_finished_children(bool block_ok) {
+static void process_mark_finished_children(parser_t &parser, bool block_ok) {
     ASSERT_IS_MAIN_THREAD();
 
     // Get the exit and signal generations of all reapable processes.
@@ -342,7 +320,7 @@ static void process_mark_finished_children(bool block_ok) {
     topic_set_t reaptopics{};
     generation_list_t gens{};
     gens.fill(invalid_generation);
-    for (const auto j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 topic_t topic = *mtopic;
@@ -367,7 +345,7 @@ static void process_mark_finished_children(bool block_ok) {
 
     // We got some changes. Since we last checked we received SIGCHLD, and or HUP/INT.
     // Update the hup/int generations and reap any reapable processes.
-    for (const auto &j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         for (const auto &proc : j->processes) {
             if (auto mtopic = j->reap_topic_for_process(proc.get())) {
                 // Update the signal hup/int gen.
@@ -575,15 +553,15 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
     const bool interactive = allow_interactive && cur_term != NULL;
 
     // Remove all disowned jobs.
-    remove_disowned_jobs(jobs());
+    remove_disowned_jobs(parser.jobs());
 
     // Accumulate exit events into a new list, which we fire after the list manipulation is
     // complete.
     std::vector<event_t> exit_events;
 
     // Print status messages for completed or stopped jobs.
-    const bool only_one_job = jobs().size() == 1;
-    for (const auto &j : jobs()) {
+    const bool only_one_job = parser.jobs().size() == 1;
+    for (const auto &j : parser.jobs()) {
         // Skip unconstructed jobs.
         if (!j->is_constructed()) {
             continue;
@@ -625,7 +603,8 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
     // Do this before calling out to user code in the event handler below, to ensure an event
     // handler doesn't remove jobs on our behalf.
     auto is_complete = [](const shared_ptr<job_t> &j) { return j->is_completed(); };
-    jobs().erase(std::remove_if(jobs().begin(), jobs().end(), is_complete), jobs().end());
+    auto &jobs = parser.jobs();
+    jobs.erase(std::remove_if(jobs.begin(), jobs.end(), is_complete), jobs.end());
 
     // Post pending exit events.
     for (const auto &evt : exit_events) {
@@ -641,7 +620,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
 
 bool job_reap(parser_t &parser, bool allow_interactive) {
     ASSERT_IS_MAIN_THREAD();
-    process_mark_finished_children(false);
+    process_mark_finished_children(parser, false);
 
     // Preserve the exit status.
     auto saved_statuses = proc_get_last_statuses();
@@ -693,8 +672,8 @@ unsigned long proc_get_jiffies(process_t *p) {
 }
 
 /// Update the CPU time for all jobs.
-void proc_update_jiffies() {
-    for (const auto &job : jobs()) {
+void proc_update_jiffies(parser_t &parser) {
+    for (const auto &job : parser.jobs()) {
         for (process_ptr_t &p : job->processes) {
             gettimeofday(&p->last_time, 0);
             p->last_jiffies = proc_get_jiffies(p.get());
@@ -858,9 +837,9 @@ return false;
     return true;
 }
 
-void job_t::continue_job(bool reclaim_foreground_pgrp, bool send_sigcont) {
+void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool send_sigcont) {
     // Put job first in the job list.
-    promote();
+    parser.job_promote(this);
     set_flag(job_flag_t::NOTIFIED, false);
 
     debug(4, L"%ls job %d, gid %d (%ls), %ls, %ls", send_sigcont ? L"Continue" : L"Start", job_id,
@@ -909,7 +888,7 @@ void job_t::continue_job(bool reclaim_foreground_pgrp, bool send_sigcont) {
         if (is_foreground()) {
             // Wait for the status of our own job to change.
             while (!reader_exit_forced() && !is_stopped() && !is_completed()) {
-                process_mark_finished_children(true);
+                process_mark_finished_children(parser, true);
             }
         }
     }
@@ -924,10 +903,10 @@ void job_t::continue_job(bool reclaim_foreground_pgrp, bool send_sigcont) {
     }
 }
 
-void proc_sanity_check() {
+void proc_sanity_check(const parser_t &parser) {
     const job_t *fg_job = NULL;
 
-    for (const auto &j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         if (!j->is_constructed()) continue;
 
         // More than one foreground job?
@@ -979,12 +958,13 @@ void proc_pop_interactive() {
 
 void proc_wait_any(parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
-    process_mark_finished_children(true /* block_ok */);
+    process_mark_finished_children(parser, true /* block_ok */);
     process_clean_after_marking(parser, is_interactive);
 }
 
-void hup_background_jobs() {
-    for (const auto &j : jobs()) {
+void hup_background_jobs(const parser_t &parser) {
+    // TODO: we should probably hup all jobs across all parsers here.
+    for (const auto &j : parser.jobs()) {
         // Make sure we don't try to SIGHUP the calling builtin
         if (j->pgid == INVALID_PID || !j->get_flag(job_flag_t::JOB_CONTROL)) {
             continue;
diff --git a/src/proc.h b/src/proc.h
index e17131cfe..dd5275403 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -153,6 +153,7 @@ class internal_proc_t {
 ///
 /// If the process is of type process_type_t::function, argv is the argument vector, and argv[0] is
 /// the name of the shellscript function.
+class parser_t;
 class process_t {
    private:
     null_terminated_array_t<wchar_t> argv_array;
@@ -406,7 +407,6 @@ class job_t {
     /// \return whether this job and its parent chain are fully constructed.
     bool job_chain_is_fully_constructed() const;
 
-    // (This function would just be called `continue` but that's obviously a reserved keyword)
     /// Resume a (possibly) stopped job. Puts job in the foreground.  If cont is true, restore the
     /// saved terminal modes and send the process group a SIGCONT signal to wake it up before we
     /// block.
@@ -414,10 +414,7 @@ class job_t {
     /// \param reclaim_foreground_pgrp whether, when the job finishes or stops, to reclaim the
     /// foreground pgrp (via tcsetpgrp). \param send_sigcont Whether SIGCONT should be sent to the
     /// job if it is in the foreground.
-    void continue_job(bool reclaim_foreground_pgrp, bool send_sigcont);
-
-    /// Promotes the job to the front of the job list.
-    void promote();
+    void continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool send_sigcont);
 
     /// Send the specified signal to all processes in this job.
     /// \return true on success, false on failure.
@@ -459,11 +456,6 @@ extern int is_event;
 // List of jobs.
 typedef std::deque<shared_ptr<job_t>> job_list_t;
 
-bool job_list_is_empty(void);
-
-/// A helper function to more easily access the job list
-job_list_t &jobs();
-
 /// The current job control mode.
 ///
 /// Must be one of job_control_t::all, job_control_t::interactive and job_control_t::none.
@@ -497,11 +489,11 @@ unsigned long proc_get_jiffies(process_t *p);
 
 /// Update process time usage for all processes by calling the proc_get_jiffies function for every
 /// process of every job.
-void proc_update_jiffies();
+void proc_update_jiffies(parser_t &parser);
 
 /// Perform a set of simple sanity checks on the job list. This includes making sure that only one
 /// job is in the foreground, that every process is in a valid state, etc.
-void proc_sanity_check();
+void proc_sanity_check(const parser_t &parser);
 
 /// Create a process/job exit event notification.
 event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int status);
@@ -509,9 +501,6 @@ event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int
 /// Initializations.
 void proc_init();
 
-/// Clean up before exiting.
-void proc_destroy();
-
 /// Set new value for is_interactive flag, saving previous value. If needed, update signal handlers.
 void proc_push_interactive(int value);
 
@@ -528,7 +517,7 @@ void set_is_within_fish_initialization(bool flag);
 bool is_within_fish_initialization();
 
 /// Terminate all background jobs
-void hup_background_jobs();
+void hup_background_jobs(const parser_t &parser);
 
 /// Give ownership of the terminal to the specified job.
 ///
diff --git a/src/reader.cpp b/src/reader.cpp
index f03da5e81..21c1cc365 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1972,7 +1972,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     parser.vars().set_one(L"_", ENV_GLOBAL, program_name);
 
     if (have_proc_stat) {
-        proc_update_jiffies();
+        proc_update_jiffies(parser);
     }
 }
 
@@ -2190,11 +2190,11 @@ void reader_import_history_if_necessary() {
 
 bool shell_is_exiting() { return should_exit(); }
 
-void reader_bg_job_warning() {
+void reader_bg_job_warning(const parser_t &parser) {
     std::fputws(_(L"There are still jobs active:\n"), stdout);
     std::fputws(_(L"\n   PID  Command\n"), stdout);
 
-    for (const auto &j : jobs()) {
+    for (const auto &j : parser.jobs()) {
         if (!j->is_completed()) {
             std::fwprintf(stdout, L"%6d  %ls\n", j->processes[0]->pid, j->command_wcstr());
         }
@@ -2206,9 +2206,8 @@ void reader_bg_job_warning() {
 
 /// This function is called when the main loop notices that end_loop has been set while in
 /// interactive mode. It checks if it is ok to exit.
-static void handle_end_loop() {
+static void handle_end_loop(const parser_t &parser) {
     if (!reader_exit_forced()) {
-        const parser_t &parser = parser_t::principal_parser();
         for (size_t i = 0; i < parser.block_count(); i++) {
             if (parser.block_at_index(i)->type() == BREAKPOINT) {
                 // We're executing within a breakpoint so we do not want to terminate the shell and
@@ -2218,7 +2217,7 @@ static void handle_end_loop() {
         }
 
         bool bg_jobs = false;
-        for (const auto &j : jobs()) {
+        for (const auto &j : parser.jobs()) {
             if (!j->is_completed()) {
                 bg_jobs = true;
                 break;
@@ -2227,7 +2226,7 @@ static void handle_end_loop() {
 
         reader_data_t *data = current_data();
         if (!data->prev_end_loop && bg_jobs) {
-            reader_bg_job_warning();
+            reader_bg_job_warning(parser);
             reader_set_end_loop(false);
             data->prev_end_loop = 1;
             return;
@@ -2235,7 +2234,7 @@ static void handle_end_loop() {
     }
 
     // Kill remaining jobs before exiting.
-    hup_background_jobs();
+    hup_background_jobs(parser);
 }
 
 static bool selection_is_at_top() {
@@ -2269,7 +2268,7 @@ static int read_i() {
     reader_data_t *data = current_data();
     data->prev_end_loop = 0;
 
-    while (!shell_is_exiting() && (!sanity_check())) {
+    while (!shell_is_exiting()) {
         event_fire_generic(L"fish_prompt");
         run_count++;
 
@@ -2292,7 +2291,7 @@ static int read_i() {
         maybe_t<wcstring> tmp = reader_readline(0);
 
         if (shell_is_exiting()) {
-            handle_end_loop();
+            handle_end_loop(parser);
         } else if (tmp) {
             const wcstring command = tmp.acquire();
             data->update_buff_pos(&data->command_line, 0);
@@ -2307,7 +2306,7 @@ static int read_i() {
                 data->history->resolve_pending();
             }
             if (shell_is_exiting()) {
-                handle_end_loop();
+                handle_end_loop(parser);
             } else {
                 data->prev_end_loop = 0;
             }
diff --git a/src/reader.h b/src/reader.h
index 59cbbbc68..445dc8880 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -232,7 +232,7 @@ wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flag
                                           bool append_only);
 
 /// Print warning with list of backgrounded jobs
-void reader_bg_job_warning();
+void reader_bg_job_warning(const parser_t &parser);
 
 /// Return the current interactive reads loop count. Useful for determining how many commands have
 /// been executed between invocations of code.
diff --git a/src/sanity.cpp b/src/sanity.cpp
index 4b173539f..804665151 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -20,12 +20,6 @@ void sanity_lose() {
     insane = true;
 }
 
-bool sanity_check() {
-    if (!insane) reader_sanity_check();
-    if (!insane) proc_sanity_check();
-    return insane;
-}
-
 void validate_pointer(const void *ptr, const wchar_t *err, int null_ok) {
     // Test if the pointer data crosses a segment boundary.
     if ((0x00000003l & (intptr_t)ptr) != 0) {
diff --git a/src/sanity.h b/src/sanity.h
index 4c8c27b4e..202f0d9e2 100644
--- a/src/sanity.h
+++ b/src/sanity.h
@@ -5,9 +5,6 @@
 /// Call this function to tell the program it is not in a sane state.
 void sanity_lose();
 
-/// Perform sanity checks, return 1 if program is in a sane state 0 otherwise.
-bool sanity_check();
-
 /// Try and determine if ptr is a valid pointer. If not, loose sanity.
 ///
 /// \param ptr The pointer to validate

From cc205a134b7eb9858503cbffd8f110c67a83e2f3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 6 May 2019 17:06:40 +0200
Subject: [PATCH 0505/1732] Disable fish_title in emacs

---
 share/functions/fish_title.fish | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/share/functions/fish_title.fish b/share/functions/fish_title.fish
index 87abe894b..675269605 100644
--- a/share/functions/fish_title.fish
+++ b/share/functions/fish_title.fish
@@ -1,3 +1,6 @@
 function fish_title
-    echo (status current-command) (__fish_pwd)
+    # emacs is basically the only term that can't handle it.
+    if not set -q INSIDE_EMACS
+        echo (status current-command) (__fish_pwd)
+    end
 end

From 5bf21f29283feb363ab23be2e6d101ca7832ae33 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 6 May 2019 17:07:29 +0200
Subject: [PATCH 0506/1732] Penalize files ending in ~ in suggestions

Fixes #985.
---
 src/complete.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 392425fe1..e6b9e20fe 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -244,6 +244,9 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
     return ad < bd;
 }
 
+static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
+    return a.completion.back() == L'~' < b.completion.back() == L'~';
+}
 /// Unique the list of completions, without perturbing their order.
 static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
     std::unordered_set<wcstring> seen;
@@ -285,9 +288,11 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
     stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);
 
     // Lastly, if this is for an autosuggestion, prefer to avoid completions that duplicate
-    // arguments.
-    if (flags & completion_request_t::autosuggestion)
+    // arguments, and penalize files that end in tilde - they're frequently autosave files from e.g. emacs.
+    if (flags & completion_request_t::autosuggestion) {
         stable_sort(comps->begin(), comps->end(), compare_completions_by_duplicate_arguments);
+        stable_sort(comps->begin(), comps->end(), compare_completions_by_tilde);
+    }
 }
 
 /// Class representing an attempt to compute completions.

From e20c08d04e0dc7bc088bb20b651d6779404e015e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 6 May 2019 17:24:42 +0200
Subject: [PATCH 0507/1732] argparse: Fix validation for short-only-flags

This read something like `o=!_validate_int`, and the flag modifier
reading kept the pointer after the `!`, so it created a long flag
called `_validate_int`, which meant it would not only error out form

```fish
argparse 'i=!_validate_int' 'o=!_validate_int' -- $argv
```

with "Long flag '_validate_int' already defined", but also set
$_flag_validate_int.

Fixes #5864.
---
 src/builtin_argparse.cpp |  2 ++
 tests/argparse.err       |  5 +++++
 tests/argparse.in        |  9 +++++++++
 tests/argparse.out       | 12 ++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 1b75a40a4..b6c4405c6 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -181,6 +181,8 @@ static bool parse_flag_modifiers(const argparse_cmd_opts_t &opts, const option_s
     if (*s == L'!') {
         s++;
         opt_spec->validation_command = wcstring(s);
+        // Move cursor to the end so we don't expect a long flag.
+        while (*s) s++;
     } else if (*s) {
         streams.err.append_format(BUILTIN_ERR_INVALID_OPT_SPEC, opts.name.c_str(),
                                   option_spec.c_str(), *s);
diff --git a/tests/argparse.err b/tests/argparse.err
index 417c205a0..291e53221 100644
--- a/tests/argparse.err
+++ b/tests/argparse.err
@@ -121,3 +121,8 @@ in function 'notargparse'
 
 ####################
 # Checking arguments after --
+
+####################
+# Checking validation for short flags only
+argparse: Value 'banana' for flag 'o' is not an integer
+argparse: Value '-o' for flag 'i' is not an integer
diff --git a/tests/argparse.in b/tests/argparse.in
index 01d9aba3b..444501d7c 100644
--- a/tests/argparse.in
+++ b/tests/argparse.in
@@ -195,3 +195,12 @@ begin
     argparse a/alpha -- a --alpha -- b -a
     printf '%s\n' $argv
 end
+
+# #5864 - short flag only with same validation function.
+logmsg Checking validation for short flags only
+argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o banana
+argparse 'i=!_validate_int' 'o=!_validate_int' -- -i -o banana
+begin
+    argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o 3
+    set -l
+end
diff --git a/tests/argparse.out b/tests/argparse.out
index c70257994..130ae04aa 100644
--- a/tests/argparse.out
+++ b/tests/argparse.out
@@ -146,3 +146,15 @@ alpha aaaa
 a
 b
 -a
+
+####################
+# Checking validation for short flags only
+_flag_a 'alpha'  'aaaa'
+_flag_b -b
+_flag_break -b
+_flag_i 2
+_flag_m 1
+_flag_max 1
+_flag_o 3
+argv
+saved_status 57

From 50db10a422565e0da63399f7053c5e493a2eff01 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 18 Apr 2019 19:42:18 -0700
Subject: [PATCH 0508/1732] Alternate fix for cursor_down bound to "\n" and
 ONLCR set.

See GitHub issue #4505 "Terminal mode confusion"
and commit #3f820f0 "Disable ONLCR mapping of NL output to CR-NL".
---
 src/screen.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index cdb24c299..2daee7b4a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -463,17 +463,20 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 
     y_steps = new_y - s->actual.cursor.y;
 
-    if (y_steps > 0 && (std::strcmp(cursor_down, "\n") == 0)) {
-        // This is very strange - it seems some (all?) consoles use a simple newline as the cursor
-        // down escape. This will of course move the cursor to the beginning of the line as well as
-        // moving it down one step. The cursor_up does not have this behavior...
-        s->actual.cursor.x = 0;
-    }
-
     if (y_steps < 0) {
         str = cursor_up;
     } else {
         str = cursor_down;
+        if ((shell_modes.c_iflag & ONLCR) != 0
+            && std::strcmp(str, "\n") == 0) { // See GitHub issue #4505.
+            // Most consoles use a simple newline as the cursor down escape.
+            // If ONLCR is enabled (which it normally is) this will of course
+            // also move the cursor to the beginning of the line.
+            if (std::strcmp(cursor_up, "\x1B[A") == 0) // If VT-style terminal
+                str = "\x1B[B"; // ... use real cursor-down
+            else
+                s->actual.cursor.x = 0;
+        }
     }
 
     for (i = 0; i < abs(y_steps); i++) {

From 4c0a119557181a5e882679e659bb387d69ef650f Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Fri, 19 Apr 2019 09:40:30 -0700
Subject: [PATCH 0509/1732] Disable cursor_down optimization, but fix to check
 c_oflag, but c_iflag.

The old commit #3f820f0 "Disable ONLCR mapping of NL output to CR-NL"
incorrectly used c_iflag instead of c_oflag, and I copied that error
in my patch.  Fixed that. However, there seems to be other problems
trying to use "\x1B[A", which I have not tried to debug, so comment that out.

(However, #3f820f0 seems to mostly work if we fix it to use c_oflag.)
---
 src/screen.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 2daee7b4a..341752eae 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -465,17 +465,17 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 
     if (y_steps < 0) {
         str = cursor_up;
-    } else {
+    } else if (y_steps > 0) {
         str = cursor_down;
-        if ((shell_modes.c_iflag & ONLCR) != 0
+        if ((shell_modes.c_oflag & ONLCR) != 0
             && std::strcmp(str, "\n") == 0) { // See GitHub issue #4505.
             // Most consoles use a simple newline as the cursor down escape.
             // If ONLCR is enabled (which it normally is) this will of course
             // also move the cursor to the beginning of the line.
-            if (std::strcmp(cursor_up, "\x1B[A") == 0) // If VT-style terminal
-                str = "\x1B[B"; // ... use real cursor-down
-            else
-                s->actual.cursor.x = 0;
+            // We could do:
+            // if (std::strcmp(cursor_up, "\x1B[A") == 0) str = "\x1B[B";
+            // else ... but that doesn't work for unknown reasons.
+            s->actual.cursor.x = 0;
         }
     }
 

From 097d6c3c5b910e03c934fd7db6ed384ac771912a Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 9 May 2019 01:22:23 -0500
Subject: [PATCH 0510/1732] Fix order of operations in tilde comparison

The previous form of the statement evaluated to a constant comparison
and couldn't have been what was actually intended.
---
 src/complete.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index e6b9e20fe..fc9ecb11d 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -245,7 +245,7 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
 }
 
 static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
-    return a.completion.back() == L'~' < b.completion.back() == L'~';
+    return (a.completion.back() == L'~') < (b.completion.back() == L'~');
 }
 /// Unique the list of completions, without perturbing their order.
 static void unique_completions_retaining_order(std::vector<completion_t> *comps) {

From 50ed5126f1185e317b91bf265d0d1282dcd35af4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 10 May 2019 15:36:41 +0200
Subject: [PATCH 0511/1732] completions/git: Reorder some completions with
 --keep-order

They are displayed in LIFO-order, so it makes sense to e.g. put the
recent commits close to last (only before files) for `checkout`.

Fixes #5868.
---
 share/completions/git.fish | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index eecc06e77..436e7fa4d 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -894,11 +894,11 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 
 ### checkout
 complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_recent_commits)'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_heads)' -d 'Head'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_heads)' -d 'Head'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_recent_commits)'
 complete -k -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_files modified deleted)'
 complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'
 complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch'
@@ -966,10 +966,10 @@ complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt
 
 ### describe
 complete -c git -n '__fish_git_needs_command' -a describe -d 'Give an object a human readable name based on an available ref'
-complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_branches)'
-complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d 'Head'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_heads)' -d 'Head'
 complete -f -c git -n '__fish_git_using_command describe' -l dirty -d 'Describe the state of the working tree, append dirty if there are local changes'
 complete -f -c git -n '__fish_git_using_command describe' -l broken -d 'Describe the state of the working tree, append -broken instead of erroring'
 complete -f -c git -n '__fish_git_using_command describe' -l all -d 'Use all tags, not just annotated'

From 3262c5ff4486e4cbf416ca6de1df564accb4737a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 10 May 2019 15:38:54 +0200
Subject: [PATCH 0512/1732] docs: Document that `complete -k` does last calls
 first

Fixes #5868.

[ci skip]
---
 sphinx_doc_src/cmds/complete.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index fe6330a7f..ebfda2d07 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -54,7 +54,7 @@ the fish manual.
 
 - ``-a OPTION_ARGUMENTS`` or ``--arguments=OPTION_ARGUMENTS`` adds the specified option arguments to the completions list.
 
-- ``-k`` or ``--keep-order`` preserves the order of the ``OPTION_ARGUMENTS`` specified via ``-a`` or ``--arguments`` instead of sorting alphabetically.
+- ``-k`` or ``--keep-order`` preserves the order of the ``OPTION_ARGUMENTS`` specified via ``-a`` or ``--arguments`` instead of sorting alphabetically. Multiple ``complete`` calls with ``-k`` result in arguments of the later ones displayed first.
 
 - ``-f`` or ``--no-files`` specifies that the options specified by this completion may not be followed by a filename.
 

From eb41965ac33ef4c18cfbca5df6278ea1c7d6a8d8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 9 May 2019 21:37:58 +0200
Subject: [PATCH 0513/1732] reader: Remove superfluous while-loop

It's possible this was useful at some point, but now it just always
inserts the string the first time.
---
 src/reader.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 21c1cc365..e0112c113 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1127,19 +1127,11 @@ void reader_data_t::remove_backward() {
 /// using syntax highlighting, etc.
 /// Returns true if the string changed.
 bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
-    size_t len = str.size();
-    if (len == 0) return false;
+    if (str.empty()) return false;
 
-    // Start inserting.
-    size_t cursor = 0;
-    while (cursor < len) {
-        // Insert from the cursor up to but not including the range end.
-        el->insert_string(str, cursor, len - cursor);
-
-        update_buff_pos(el, el->position);
-        command_line_changed(el);
-        cursor = len;
-    }
+    el->insert_string(str, 0, str.size());
+    update_buff_pos(el, el->position);
+    command_line_changed(el);
 
     if (el == &command_line) {
         suppress_autosuggestion = false;

From d2b02a8a61bce815f9c21a7de9ac9ae1efe526dc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 10 May 2019 17:21:06 +0200
Subject: [PATCH 0514/1732] src/screen: Only check for combining marks if
 necessary

line_shared_prefix explains in its comment that

> If the prefix ends on a combining character, do not include the
  previous character in the prefix.

But that's not what it does.

Instead, what it appears to do is to return idx for *every* combining
mark. This seems wrong to begin with, and it also requires checking
wcwidth for *every* character.

So instead we don't do that. If we find the mismatch, we check if it's
a combining mark, and then go back to the previous character (i.e. the
one before the one that the combining mark is for).

My tests found no issues with this, other than a 20% reduction in
pasting time.
---
 src/screen.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 341752eae..8c40a80fc 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -552,14 +552,25 @@ static size_t line_shared_prefix(const line_t &a, const line_t &b) {
     size_t idx, max = std::min(a.size(), b.size());
     for (idx = 0; idx < max; idx++) {
         wchar_t ac = a.char_at(idx), bc = b.char_at(idx);
-        if (fish_wcwidth(ac) < 1 || fish_wcwidth(bc) < 1) {
-            // Possible combining mark, return one index prior.
-            if (idx > 0) idx--;
-            break;
-        }
 
         // We're done if the text or colors are different.
-        if (ac != bc || a.color_at(idx) != b.color_at(idx)) break;
+        if (ac != bc || a.color_at(idx) != b.color_at(idx)) {
+            if (idx > 0) {
+                const line_t *c = nullptr;
+                // Possible combining mark, go back until we hit _two_ printable characters or idx of 0.
+                if (fish_wcwidth(a.char_at(idx)) < 1) {
+                    c = &a;
+                } else if (fish_wcwidth(b.char_at(idx)) < 1) {
+                    c = &b;
+                }
+
+                if (c) {
+                    while (idx > 1 && (fish_wcwidth(c->char_at(idx - 1)) < 1 || fish_wcwidth(c->char_at(idx)) < 1)) idx--;
+                    if (idx == 1 && fish_wcwidth(c->char_at(idx)) < 1) idx = 0;
+                }
+            }
+            break;
+        }
     }
     return idx;
 }

From 567b6ed2b5fb94a3c6f9dce242f51bbab242af67 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 10 May 2019 17:38:56 +0200
Subject: [PATCH 0515/1732] src/screen: Stop doing a bunch of unnecessary work

This measured *all* the characters on the commandline, and saved all
of them in another wcstring_list_t, just to then do... nothing with
that info.

Also, it did wcslen for something that we already have as wcstring,
reserved a vector and did a bunch of work for autosuggestions that
isn't necessary if we have more than one line.

Instead, we do what we need, which is to figure out if we are
multiline and how wide the first line is.

Fixes #5866.
---
 src/screen.cpp | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 8c40a80fc..c8e87691b 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -857,34 +857,31 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     // Now we should definitely fit.
     assert(left_prompt_width + right_prompt_width < screen_width);
 
-    // Convert commandline to a list of lines and their widths.
-    wcstring_list_t command_lines(1);
-    std::vector<size_t> line_widths(1);
+    // Get the width of the first line, and if there is more than one line.
+    bool multiline = false;
+    size_t first_line_width = 0;
     for (size_t i = 0; i < commandline.size(); i++) {
         wchar_t c = commandline.at(i);
         if (c == L'\n') {
-            // Make a new line.
-            command_lines.push_back(wcstring());
-            line_widths.push_back(indent.at(i) * INDENT_STEP);
+            multiline = true;
+            break;
         } else {
-            command_lines.back() += c;
-            line_widths.back() += fish_wcwidth_min_0(c);
+            first_line_width += fish_wcwidth_min_0(c);
         }
     }
-    const size_t first_command_line_width = line_widths.at(0);
+    const size_t first_command_line_width = first_line_width;
 
     // If we have more than one line, ensure we have no autosuggestion.
-    if (command_lines.size() > 1) {
-        autosuggestion = L"";
-    }
-
-    // Compute the width of the autosuggestion at all possible truncation offsets.
-    std::vector<size_t> autosuggest_truncated_widths;
-    autosuggest_truncated_widths.reserve(1 + std::wcslen(autosuggestion));
     size_t autosuggest_total_width = 0;
-    for (size_t i = 0; autosuggestion[i] != L'\0'; i++) {
-        autosuggest_truncated_widths.push_back(autosuggest_total_width);
-        autosuggest_total_width += fish_wcwidth_min_0(autosuggestion[i]);
+    std::vector<size_t> autosuggest_truncated_widths;
+    if (multiline) {
+        autosuggestion = L"";
+    } else {
+        autosuggest_truncated_widths.reserve(1 + autosuggestion_str.size());
+        for (size_t i = 0; autosuggestion[i] != L'\0'; i++) {
+            autosuggest_truncated_widths.push_back(autosuggest_total_width);
+            autosuggest_total_width += fish_wcwidth_min_0(autosuggestion[i]);
+        }
     }
 
     // Here are the layouts we try in turn:

From ac983f6c4b6adb12aa995e351d66b244d05ac3ef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 11 May 2019 10:16:22 +0200
Subject: [PATCH 0516/1732] src/screen: Stop recomputing wcwidth

This passes character width as an argument for a few functions.

In particular, it hardcodes a width of "1" for a space literal.
There's no reason to compute wcwidth for the length of the prompt.
---
 src/screen.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index c8e87691b..2f9aac807 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -381,7 +381,7 @@ static void s_check_status(screen_t *s) {
 /// Appends a character to the end of the line that the output cursor is on. This function
 /// automatically handles linebreaks and lines longer than the screen width.
 static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, int indent,
-                                  size_t prompt_width) {
+                                  size_t prompt_width, size_t bwidth) {
     int line_no = s->desired.cursor.y;
 
     if (b == L'\n') {
@@ -391,7 +391,7 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
         s->desired.cursor.y++;
         s->desired.cursor.x = 0;
         for (size_t i = 0; i < prompt_width + indent * INDENT_STEP; i++) {
-            s_desired_append_char(s, L' ', highlight_spec_t{}, indent, prompt_width);
+            s_desired_append_char(s, L' ', highlight_spec_t{}, indent, prompt_width, 1);
         }
     } else if (b == L'\r') {
         line_t &current = s->desired.line(line_no);
@@ -399,7 +399,7 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
         s->desired.cursor.x = 0;
     } else {
         int screen_width = common_get_width();
-        int cw = fish_wcwidth_min_0(b);
+        int cw = bwidth;
 
         s->desired.create_line(line_no);
 
@@ -523,9 +523,9 @@ static void s_set_color(screen_t *s, const environment_t &vars, highlight_spec_t
 }
 
 /// Convert a wide character to a multibyte string and append it to the buffer.
-static void s_write_char(screen_t *s, wchar_t c) {
+static void s_write_char(screen_t *s, wchar_t c, size_t width) {
     scoped_buffer_t outp(*s);
-    s->actual.cursor.x += fish_wcwidth_min_0(c);
+    s->actual.cursor.x += width;
     s->outp().writech(c);
     if (s->actual.cursor.x == s->actual_width && allow_soft_wrap()) {
         s->soft_wrap_location.x = 0;
@@ -710,8 +710,9 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             perform_any_impending_soft_wrap(scr, current_width, (int)i);
             s_move(scr, current_width, (int)i);
             s_set_color(scr, vars, o_line.color_at(j));
-            s_write_char(scr, o_line.char_at(j));
-            current_width += fish_wcwidth_min_0(o_line.char_at(j));
+            auto width = fish_wcwidth_min_0(o_line.char_at(j));
+            s_write_char(scr, o_line.char_at(j), width);
+            current_width += width;
         }
 
         // Clear the screen if we have not done so yet.
@@ -1010,13 +1011,13 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
 
     // Append spaces for the left prompt.
     for (size_t i = 0; i < layout.left_prompt_space; i++) {
-        s_desired_append_char(s, L' ', highlight_spec_t{}, 0, layout.left_prompt_space);
+        s_desired_append_char(s, L' ', highlight_spec_t{}, 0, layout.left_prompt_space, 1);
     }
 
     // If overflowing, give the prompt its own line to improve the situation.
     size_t first_line_prompt_space = layout.left_prompt_space;
     if (layout.prompts_get_own_line) {
-        s_desired_append_char(s, L'\n', highlight_spec_t{}, 0, 0);
+        s_desired_append_char(s, L'\n', highlight_spec_t{}, 0, 0, 0);
         first_line_prompt_space = 0;
     }
 
@@ -1031,7 +1032,7 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
             cursor_arr = s->desired.cursor;
         }
         s_desired_append_char(s, effective_commandline.at(i), colors[i], indent[i],
-                              first_line_prompt_space);
+                              first_line_prompt_space, fish_wcwidth_min_0(effective_commandline.at(i)));
     }
 
     // Cursor may have been at the end too.

From 4462f6d600cb8c1cf38a13db6be25ec36ea47037 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 11 May 2019 10:25:27 +0200
Subject: [PATCH 0517/1732] src/screen: Skip a wcswidth

This stops trying to see if the previous line is wider if it is a
prefix of the current one.

Which turns out to be true often enough that it's a net benefit.
---
 src/screen.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 2f9aac807..91ef3ed89 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -654,11 +654,11 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         // Note that skip_remaining is a width, not a character count.
         size_t skip_remaining = start_pos;
 
+        const size_t shared_prefix = line_shared_prefix(o_line, s_line);
         if (!should_clear_screen_this_line) {
             // Compute how much we should skip. At a minimum we skip over the prompt. But also skip
             // over the shared prefix of what we want to output now, and what we output before, to
             // avoid repeatedly outputting it.
-            const size_t shared_prefix = line_shared_prefix(o_line, s_line);
             if (shared_prefix > 0) {
                 size_t prefix_width = fish_wcswidth(&o_line.text.at(0), shared_prefix);
                 if (prefix_width > skip_remaining) skip_remaining = prefix_width;
@@ -734,9 +734,13 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         } else if (right_prompt_width < scr->last_right_prompt_width) {
             clear_remainder = true;
         } else {
-            int prev_width =
-                s_line.text.empty() ? 0 : fish_wcswidth(&s_line.text.at(0), s_line.text.size());
-            clear_remainder = prev_width > current_width;
+            // This wcswidth shows up strong in the profile.
+            // Only do it if the previous line could conceivably be wider.
+            // That means if it is a prefix of the current one we can skip it.
+            if (s_line.text.size() != shared_prefix) {
+                int prev_width = fish_wcswidth(&s_line.text.at(0), s_line.text.size());
+                clear_remainder = prev_width > current_width;
+            }
         }
         if (clear_remainder && clr_eol) {
             s_set_color(scr, vars, highlight_spec_t{});

From 816df47c1021996bfa2b5f0762aae6f67852fa23 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 11 May 2019 11:19:21 +0200
Subject: [PATCH 0518/1732] fish_clipboard_paste: Only trim leading whitespace
 on first line

We remove leading spaces so a paste isn't histignored, but we did so
on all lines, which removed indentation.

[ci skip]
---
 share/functions/fish_clipboard_paste.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index f9ab3dabe..7398bf140 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -35,7 +35,7 @@ function fish_clipboard_paste
     if not string length -q -- (commandline -c)
         # If we're at the beginning of the first line, trim whitespace from the start,
         # so we don't trigger ignoring history.
-        set data (string trim -l -- $data)
+        set data[1] (string trim -l -- $data[1])
     end
     if test -n "$data"
         commandline -i -- $data

From c27c8801af0b418bb5afc61693a43c595dac0305 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 11 May 2019 12:43:05 +0200
Subject: [PATCH 0519/1732] completions/git: Put local branches before unique
 remotes

With a few remotes, unique remote branches can get quite large, and
you probably mostly work on your own.

[ci skip]
---
 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 436e7fa4d..d43a09a7a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -896,8 +896,8 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_tags)' -d 'Tag'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_heads)' -d 'Head'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_recent_commits)'
 complete -k -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_files modified deleted)'
 complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'

From adcc70d0b30c306ba7843b585cdb8ac99dd664ff Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 11 May 2019 21:32:15 +0200
Subject: [PATCH 0520/1732] wcwidth: Return early for simple ASCII

Characters from space to before DEL are width 1, and they
appear *often*.

So it's quite a good idea to return early for them.

Fixes #5866.
---
 src/fallback.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index 7eaaa90dd..8fb78ce9c 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -269,6 +269,10 @@ int fish_get_emoji_width(wchar_t c) {
 #include "widecharwidth/widechar_width.h"
 
 int fish_wcwidth(wchar_t wc) {
+    // Normal ASCII characters.
+    // These are the most common case, so it's worth checking them first.
+    if (wc < 0x7f && wc >= 0x20) return 1;
+
     // The system version of wcwidth should accurately reflect the ability to represent characters
     // in the console session, but knows nothing about the capabilities of other terminal emulators
     // or ttys. Use it from the start only if we are logged in to the physical console.

From 15a52d0f0de14dcaba5d4a6a4bfb43b7750618c5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 5 May 2019 16:19:36 -0700
Subject: [PATCH 0521/1732] Centralize some of the logic for walking the
 environment stack

Prepare to introduce a new node for per-process variables.
---
 src/env.cpp | 137 ++++++++++++++++++++++------------------------------
 src/env.h   |   2 +-
 2 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index cec2f59fe..8c4ab503a 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -240,7 +240,7 @@ struct var_stack_t {
     env_node_ref_t top;
 
     // Bottom node on the function stack.
-    const env_node_ref_t global_env;
+    const env_node_ref_t global;
 
     // Exported variable array used by execv.
     maybe_t<null_terminated_array_t<char>> export_array;
@@ -252,8 +252,8 @@ struct var_stack_t {
 
     void update_export_array_if_necessary();
 
-    var_stack_t(env_node_ref_t top, env_node_ref_t global_env)
-        : top(std::move(top)), global_env(std::move(global_env)) {}
+    var_stack_t(env_node_ref_t top, env_node_ref_t global)
+        : top(std::move(top)), global(std::move(global)) {}
 
     // Pushes a new node onto our stack
     // Optionally creates a new scope for the node
@@ -264,14 +264,14 @@ struct var_stack_t {
         auto top_node = top;
         // Only if we introduce a new shadowing scope; i.e. not if it's just `begin; end` or
         // "--no-scope-shadowing".
-        if (new_scope && top_node != this->global_env) {
+        if (new_scope && top_node != this->global) {
             for (const auto &var : top_node->env) {
                 if (var.second.exports()) node->env.insert(var);
             }
         }
 
         this->top = std::move(node);
-        if (new_scope && local_scope_exports(this->top)) {
+        if (new_scope && local_scope_exports()) {
             this->mark_changed_exported();
         }
     }
@@ -279,7 +279,7 @@ struct var_stack_t {
     // Pops the top node, asserting it's not global.
     // \return the popped node.
     env_node_ref_t pop() {
-        assert(top != this->global_env && "Cannot pop global node");
+        assert(top != this->global && "Cannot pop global node");
         env_node_ref_t old_top = this->top;
         this->top = old_top->next;
         return old_top;
@@ -289,10 +289,10 @@ struct var_stack_t {
     // Returns an empty pointer if we're done.
     env_node_ref_t next_scope_to_search(const env_node_ref_t &node) const {
         assert(node != NULL);
-        if (node == this->global_env) {
+        if (node == this->global) {
             return nullptr;
         }
-        return node->new_scope ? this->global_env : node->next;
+        return node->new_scope ? this->global : node->next;
     }
 
     // Returns the scope used for unspecified scopes. An unspecified scope is either the topmost
@@ -302,7 +302,7 @@ struct var_stack_t {
         while (node && !node->new_scope) {
             node = node->next;
         }
-        return node ? node : this->global_env;
+        return node ? node : this->global;
     }
 
     /// Copy this vars_stack.
@@ -314,11 +314,11 @@ struct var_stack_t {
     /// global varibables so copying would be expensive, and some (electrics) are computed so cannot
     /// be effectively copied.
     std::unique_ptr<var_stack_t> snapshot() const {
-        return make_unique<var_stack_t>(snapshot_node(top), global_env);
+        return make_unique<var_stack_t>(snapshot_node(top), global);
     }
 
-    /// \return true if the topomst local scope exports a variable.
-    bool local_scope_exports(const env_node_ref_t &n) const;
+    /// \return true if the topmost local scope exports a variable.
+    bool local_scope_exports() const;
 
     /// \return a new stack with a single top level local scope.
     // This local scope will persist throughout the lifetime of the fish process, and it will ensure
@@ -330,9 +330,11 @@ struct var_stack_t {
 
    private:
     /// Copy constructor. This does not copy the export array; it just allows it to be regenerated.
-    var_stack_t(const var_stack_t &rhs) : top(rhs.top), global_env(rhs.global_env) {}
+    var_stack_t(const var_stack_t &rhs) : top(rhs.top), global(rhs.global) {}
 
-    void get_exported(const env_node_t *n, var_table_t &h) const;
+    /// Populate the table \p h with exported variables. This is recursive because it must start
+    /// with globals.
+    void get_exported(const shared_ptr<env_node_t> &n, var_table_t &h) const;
 
     /// Recursive helper for snapshot(). Snapshot a node and its unshadows parents, returning it.
     env_node_ref_t snapshot_node(const env_node_ref_t &node) const {
@@ -340,10 +342,10 @@ struct var_stack_t {
         // If we are global, re-use the global node. If we reach a new scope, jump to globals; we
         // don't snapshot shadowed scopes, because the snapshot is intended to be read-only and so
         // there would be no way to access them.
-        if (node == global_env) {
+        if (node == global) {
             return node;
         }
-        auto next = snapshot_node(node->new_scope ? global_env : node->next);
+        auto next = snapshot_node(next_scope_to_search(node));
         auto result = std::make_shared<env_node_t>(node->new_scope, next);
         // Copy over variables.
         // Note assigning env is a potentially big copy.
@@ -362,21 +364,15 @@ struct var_stack_t {
     }
 };
 
-/// Get list of all exported variables.
-void var_stack_t::get_exported(const env_node_t *n, var_table_t &h) const {
+void var_stack_t::get_exported(const std::shared_ptr<env_node_t> &n, var_table_t &h) const {
     if (!n) return;
 
-    if (n->new_scope) {
-        get_exported(global_env.get(), h);
-    } else {
-        get_exported(n->next.get(), h);
-    }
-
-    var_table_t::const_iterator iter;
-    for (iter = n->env.begin(); iter != n->env.end(); ++iter) {
-        const wcstring &key = iter->first;
-        const env_var_t var = iter->second;
+    // Allow parent scopes to populate first, since we may want to overwrite those results.
+    get_exported(next_scope_to_search(n), h);
 
+    for (const auto &kv : n->env) {
+        const wcstring &key = kv.first;
+        const env_var_t &var = kv.second;
         if (var.exports()) {
             // Export the variable. Don't use std::map::insert here, since we need to overwrite
             // existing values from previous scopes.
@@ -391,15 +387,11 @@ void var_stack_t::get_exported(const env_node_t *n, var_table_t &h) const {
 
 /// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
 /// variable.
-bool var_stack_t::local_scope_exports(const env_node_ref_t &n) const {
-    assert(n != nullptr);
-    if (n == global_env) return false;
-
-    if (n->exportv) return true;
-
-    if (n->new_scope) return false;
-
-    return local_scope_exports(n->next);
+bool var_stack_t::local_scope_exports() const {
+    for (auto n = top; n != global; n = next_scope_to_search(n)) {
+        if (n->exportv) return true;
+    }
+    return false;
 }
 
 void var_stack_t::update_export_array_if_necessary() {
@@ -409,7 +401,7 @@ void var_stack_t::update_export_array_if_necessary() {
 
     debug(4, L"export_arr() recalc");
     var_table_t vals;
-    get_exported(this->top.get(), vals);
+    get_exported(this->top, vals);
 
     if (uvars()) {
         const wcstring_list_t uni = uvars()->get_names(true, false);
@@ -459,10 +451,10 @@ maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode)
 
     if (search_local || search_global) {
         scoped_lock locker(env_lock);  // lock around a local region
-        env_node_ref_t env = search_local ? vars_stack().top : vars_stack().global_env;
+        env_node_ref_t env = search_local ? vars_stack().top : vars_stack().global;
 
         while (env != NULL) {
-            if (env == vars_stack().global_env && !search_global) {
+            if (env == vars_stack().global && !search_global) {
                 break;
             }
 
@@ -872,7 +864,7 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
 
         env_node_ref_t node = nullptr;
         if (var_mode & ENV_GLOBAL) {
-            node = vars_stack().global_env;
+            node = vars_stack().global;
         } else if (var_mode & ENV_LOCAL) {
             node = vars_stack().top;
         } else if (preexisting_node != nullptr) {
@@ -967,48 +959,36 @@ int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode) {
 
 /// Attempt to remove/free the specified key/value pair from the specified map.
 ///
-/// \return zero if the variable was not found, non-zero otherwise
-bool env_stack_t::try_remove(env_node_ref_t n, const wchar_t *key, int var_mode) {
-    if (n == nullptr) {
-        return false;
-    }
-
-    var_table_t::iterator result = n->env.find(key);
-    if (result != n->env.end()) {
-        if (result->second.exports()) {
-            mark_changed_exported();
+/// \return whether the variable was erased.
+bool env_stack_t::try_remove(const env_node_ref_t &start, const wcstring &key, int var_mode) {
+    auto &vars = vars_stack();
+    for (auto n = start; n != nullptr; n = vars.next_scope_to_search(n)) {
+        if ((var_mode & ENV_LOCAL) && n == vars.global) {
+            return false;
+        }
+        auto result = n->env.find(key);
+        if (result != n->env.end()) {
+            if (result->second.exports()) {
+                mark_changed_exported();
+            }
+            n->env.erase(result);
+            return true;
         }
-        n->env.erase(result);
-        return true;
     }
-
-    if (var_mode & ENV_LOCAL) {
-        return false;
-    }
-
-    if (n->new_scope) {
-        return try_remove(vars_stack().global_env, key, var_mode);
-    }
-    return try_remove(n->next, key, var_mode);
+    return false;
 }
 
 int env_stack_t::remove(const wcstring &key, int var_mode) {
     ASSERT_IS_MAIN_THREAD();
-    env_node_ref_t first_node{};
     int erased = 0;
 
     if ((var_mode & ENV_USER) && is_read_only(key)) {
         return ENV_SCOPE;
     }
 
-    first_node = vars_stack().top;
-
     if (!(var_mode & ENV_UNIVERSAL)) {
-        if (var_mode & ENV_GLOBAL) {
-            first_node = vars_stack().global_env;
-        }
-
-        if (try_remove(first_node, key.c_str(), var_mode)) {
+        auto first_node = (var_mode & ENV_GLOBAL) ? vars_stack().global : vars_stack().top;
+        if (try_remove(first_node, key, var_mode)) {
             event_fire(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
             erased = 1;
         }
@@ -1045,7 +1025,7 @@ void env_stack_t::pop() {
     if (old_node->exportv) {
         // This node exported or unexported a variable.
         vars.mark_changed_exported();
-    } else if (old_node->new_scope && vars.local_scope_exports(old_node->next)) {
+    } else if (old_node->new_scope && vars.local_scope_exports()) {
         // This node was a local scope, so it shadowed exports from its parent.
         vars.mark_changed_exported();
     }
@@ -1065,7 +1045,6 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
     int show_global = flags & ENV_GLOBAL;
     int show_universal = flags & ENV_UNIVERSAL;
 
-    env_node_ref_t n = vars_stack().top;
     const bool show_exported = (flags & ENV_EXPORT) || !(flags & ENV_UNEXPORT);
     const bool show_unexported = (flags & ENV_UNEXPORT) || !(flags & ENV_EXPORT);
 
@@ -1084,19 +1063,17 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
         show_local = show_universal = show_global = 1;
     }
 
+    const auto &vars = vars_stack();
     if (show_local) {
-        while (n) {
-            if (n == vars_stack().global_env) break;
-            add_keys(n->env);
-            if (n->new_scope)
-                break;
-            else
-                n = n->next;
+        auto cursor = vars.top;
+        while (cursor && cursor != vars.global) {
+            add_keys(cursor->env);
+            cursor = vars.next_scope_to_search(cursor);
         }
     }
 
     if (show_global) {
-        add_keys(vars_stack().global_env->env);
+        add_keys(vars.global->env);
         if (show_unexported) {
             result.insert(result.end(), std::begin(env_electric), std::end(env_electric));
         }
diff --git a/src/env.h b/src/env.h
index a883a0098..254fc66e9 100644
--- a/src/env.h
+++ b/src/env.h
@@ -231,7 +231,7 @@ class env_stack_t final : public env_scoped_t {
 
     int set_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
 
-    bool try_remove(std::shared_ptr<env_node_t> n, const wchar_t *key, int var_mode);
+    bool try_remove(const std::shared_ptr<env_node_t> &n, const wcstring &key, int var_mode);
     std::shared_ptr<env_node_t> get_node(const wcstring &key);
 
     static env_stack_t make_principal();

From ee250aba82376b1d92664a3b69c06fce4ca21e71 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 9 May 2019 18:04:30 -0700
Subject: [PATCH 0522/1732] Factor some environment setting into
 set_scoped_internal

Breaks up a monolith function.
---
 src/env.cpp  | 187 +++++++++++++++++++++++++++------------------------
 src/env.h    |   7 +-
 src/fish.cpp |   3 +-
 3 files changed, 104 insertions(+), 93 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 8c4ab503a..d365e2471 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -796,6 +796,98 @@ static void env_set_internal_universal(const wcstring &key, wcstring_list_t val,
     }
 }
 
+void env_stack_t::set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode,
+                                      wcstring_list_t val) {
+    scoped_lock locker(env_lock);
+    bool has_changed_old = vars_stack().has_changed_exported();
+    bool done = false;
+
+    // Determine the node.
+    bool has_changed_new = false;
+    env_node_ref_t preexisting_node = get_node(key);
+    maybe_t<env_var_t::env_var_flags_t> preexisting_flags{};
+    if (preexisting_node != nullptr) {
+        var_table_t::const_iterator result = preexisting_node->env.find(key);
+        assert(result != preexisting_node->env.end());
+        preexisting_flags = result->second.get_flags();
+        if (*preexisting_flags & env_var_t::flag_export) {
+            has_changed_new = true;
+        }
+    }
+
+    env_node_ref_t node = nullptr;
+    if (var_mode & ENV_GLOBAL) {
+        node = vars_stack().global;
+    } else if (var_mode & ENV_LOCAL) {
+        node = vars_stack().top;
+    } else if (preexisting_node != nullptr) {
+        node = std::move(preexisting_node);
+        if ((var_mode & (ENV_EXPORT | ENV_UNEXPORT)) == 0) {
+            // Use existing entry's exportv status.
+            if (preexisting_flags && (*preexisting_flags & env_var_t::flag_export)) {
+                var_mode |= ENV_EXPORT;
+            }
+        }
+    } else {
+        if (uvars() && uvars()->get(key)) {
+            // Modifying an existing universal variable.
+            env_set_internal_universal(key, std::move(val), var_mode, this);
+            done = true;
+        } else {
+            // New variable with unspecified scope
+            node = vars_stack().resolve_unspecified_scope();
+        }
+    }
+
+    if (!done) {
+        // Resolve if we should mark ourselves as a path variable or not.
+        // If there's an existing variable, use its path flag; otherwise infer it.
+        if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) {
+            bool should_pathvar = false;
+            if (preexisting_flags) {
+                should_pathvar = *preexisting_flags & env_var_t::flag_pathvar;
+            } else {
+                should_pathvar = variable_should_auto_pathvar(key);
+            }
+            var_mode |= should_pathvar ? ENV_PATHVAR : ENV_UNPATHVAR;
+        }
+
+        // Split about ':' if it's a path variable.
+        if (var_mode & ENV_PATHVAR) {
+            wcstring_list_t split_val;
+            for (const wcstring &str : val) {
+                vec_append(split_val, split_string(str, PATH_ARRAY_SEP));
+            }
+            val = std::move(split_val);
+        }
+
+        // Set the entry in the node. Note that operator[] accesses the existing entry, or
+        // creates a new one.
+        env_var_t &var = node->env[key];
+        if (var.exports()) {
+            // This variable already existed, and was exported.
+            has_changed_new = true;
+        }
+
+        var = var.setting_vals(std::move(val))
+                  .setting_exports(var_mode & ENV_EXPORT)
+                  .setting_pathvar(var_mode & ENV_PATHVAR)
+                  .setting_read_only(is_read_only(key));
+
+        if (var_mode & ENV_EXPORT) {
+            // The new variable is exported.
+            node->exportv = true;
+            has_changed_new = true;
+        } else {
+            // Set the node's exported when it changes something about exports
+            // (also when it redefines a variable to not be exported).
+            node->exportv = has_changed_old != has_changed_new;
+        }
+
+        if (has_changed_old || has_changed_new) vars_stack().mark_changed_exported();
+    }
+}
+
 /// Set the value of the environment variable whose name matches key to val.
 ///
 /// \param key The key
@@ -816,8 +908,6 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
                               wcstring_list_t val) {
     ASSERT_IS_MAIN_THREAD();
     env_mode_flags_t var_mode = input_var_mode;
-    bool has_changed_old = vars_stack().has_changed_exported();
-    int done = 0;
 
     if (val.size() == 1 && (key == L"PWD" || key == L"HOME")) {
         // Canonicalize our path; if it changes, recurse and try again.
@@ -828,111 +918,32 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
         }
     }
 
+    // Yucky set of random checks.
     if ((var_mode & ENV_LOCAL || var_mode & ENV_UNIVERSAL) &&
         (is_read_only(key) || is_electric(key))) {
         return ENV_SCOPE;
     }
-    if ((var_mode & ENV_EXPORT) && is_electric(key)) {
+    if ((var_mode & ENV_EXPORT) && is_electric(key) && key != L"PWD") {
         return ENV_SCOPE;
     }
     if ((var_mode & ENV_USER) && is_read_only(key)) {
         return ENV_PERM;
     }
 
+    // Handle special case electric variables.
     if (key == L"umask") {  // set new umask
+        scoped_lock locker(env_lock);
         return set_umask(val);
     }
 
     if (var_mode & ENV_UNIVERSAL) {
+        // Set this as a universal variable.
         if (uvars()) {
             env_set_internal_universal(key, std::move(val), var_mode, this);
         }
     } else {
-        scoped_lock locker(env_lock);
-        // Determine the node.
-        bool has_changed_new = false;
-        env_node_ref_t preexisting_node = get_node(key);
-        maybe_t<env_var_t::env_var_flags_t> preexisting_flags{};
-        if (preexisting_node != nullptr) {
-            var_table_t::const_iterator result = preexisting_node->env.find(key);
-            assert(result != preexisting_node->env.end());
-            preexisting_flags = result->second.get_flags();
-            if (*preexisting_flags & env_var_t::flag_export) {
-                has_changed_new = true;
-            }
-        }
-
-        env_node_ref_t node = nullptr;
-        if (var_mode & ENV_GLOBAL) {
-            node = vars_stack().global;
-        } else if (var_mode & ENV_LOCAL) {
-            node = vars_stack().top;
-        } else if (preexisting_node != nullptr) {
-            node = std::move(preexisting_node);
-            if ((var_mode & (ENV_EXPORT | ENV_UNEXPORT)) == 0) {
-                // Use existing entry's exportv status.
-                if (preexisting_flags && (*preexisting_flags & env_var_t::flag_export)) {
-                    var_mode |= ENV_EXPORT;
-                }
-            }
-        } else {
-            if (uvars() && uvars()->get(key)) {
-                // Modifying an existing universal variable.
-                env_set_internal_universal(key, std::move(val), var_mode, this);
-                done = true;
-            } else {
-                // New variable with unspecified scope
-                node = vars_stack().resolve_unspecified_scope();
-            }
-        }
-
-        if (!done) {
-            // Resolve if we should mark ourselves as a path variable or not.
-            // If there's an existing variable, use its path flag; otherwise infer it.
-            if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) {
-                bool should_pathvar = false;
-                if (preexisting_flags) {
-                    should_pathvar = *preexisting_flags & env_var_t::flag_pathvar;
-                } else {
-                    should_pathvar = variable_should_auto_pathvar(key);
-                }
-                var_mode |= should_pathvar ? ENV_PATHVAR : ENV_UNPATHVAR;
-            }
-
-            // Split about ':' if it's a path variable.
-            if (var_mode & ENV_PATHVAR) {
-                wcstring_list_t split_val;
-                for (const wcstring &str : val) {
-                    vec_append(split_val, split_string(str, PATH_ARRAY_SEP));
-                }
-                val = std::move(split_val);
-            }
-
-            // Set the entry in the node. Note that operator[] accesses the existing entry, or
-            // creates a new one.
-            env_var_t &var = node->env[key];
-            if (var.exports()) {
-                // This variable already existed, and was exported.
-                has_changed_new = true;
-            }
-
-            var = var.setting_vals(std::move(val))
-                      .setting_exports(var_mode & ENV_EXPORT)
-                      .setting_pathvar(var_mode & ENV_PATHVAR)
-                      .setting_read_only(is_read_only(key));
-
-            if (var_mode & ENV_EXPORT) {
-                // The new variable is exported.
-                node->exportv = true;
-                has_changed_new = true;
-            } else {
-                // Set the node's exported when it changes something about exports
-                // (also when it redefines a variable to not be exported).
-                node->exportv = has_changed_old != has_changed_new;
-            }
-
-            if (has_changed_old || has_changed_new) vars_stack().mark_changed_exported();
-        }
+        // Unspecial variable, set it in the right scope.
+        set_scoped_internal(key, var_mode, std::move(val));
     }
 
     event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
diff --git a/src/env.h b/src/env.h
index 254fc66e9..5e4f577a4 100644
--- a/src/env.h
+++ b/src/env.h
@@ -240,6 +240,10 @@ class env_stack_t final : public env_scoped_t {
     ~env_stack_t() override;
     env_stack_t(env_stack_t &&);
 
+    /// Given that we have determined that \p key is an unspecial key, set the variable in the right
+    /// scope in the variable stack.
+    void set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
+
    public:
     /// Sets the variable with the specified name to the given values.
     int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
@@ -279,9 +283,6 @@ class env_stack_t final : public env_scoped_t {
     /// Update the termsize variable.
     void set_termsize();
 
-    /// Update the PWD variable directory.
-    bool set_pwd();
-
     /// Sets up argv as the given null terminated array of strings.
     void set_argv(const wchar_t *const *argv);
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 7de13d2ad..209aa999f 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -402,13 +402,12 @@ int main(int argc, char **argv) {
         save_term_foreground_process_group();
     }
 
-    auto &globals = env_stack_t::globals();
     const struct config_paths_t paths = determine_config_directory_paths(argv[0]);
     env_init(&paths);
     // Set features early in case other initialization depends on them.
     // Start with the ones set in the environment, then those set on the command line (so the
     // command line takes precedence).
-    if (auto features_var = globals.get(L"fish_features")) {
+    if (auto features_var = env_stack_t::globals().get(L"fish_features")) {
         for (const wcstring &s : features_var->as_list()) {
             mutable_fish_features().set_from_string(s);
         }

From cfddd881efac7c069a84c18c1087f53cdf7d4b7a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 9 May 2019 18:38:18 -0700
Subject: [PATCH 0523/1732] Make PWD a per-processor variable

Handle this variable specially.
---
 src/env.cpp        | 73 ++++++++++++++++++++++++++++++++++------------
 src/env.h          | 20 +++++++++++++
 src/fish_tests.cpp | 33 +++++++++++++++++++++
 3 files changed, 107 insertions(+), 19 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index d365e2471..01e917319 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -81,13 +81,21 @@ static bool variable_should_auto_pathvar(const wcstring &name) {
 }
 
 /// Table of variables whose value is dynamically calculated, such as umask, status, etc.
-static const string_set_t env_electric = {L"history", L"pipestatus", L"status", L"umask"};
+static const string_set_t env_electric = {L"history", L"pipestatus", L"status", L"umask", L"PWD"};
 
 static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
 
+// This is a big dorky lock we take around everything that might read from or modify an env_node_t.
+// Fine grained locking is annoying here because env_nodes may be shared between env_stacks, so each
+// node would need its own lock.
+static std::mutex env_lock;
+
 /// \return a the value of a variable for \p key, which must be electric (computed).
-static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t &vars) {
-    if (key == L"history") {
+static maybe_t<env_var_t> get_electric(const wcstring &key, const env_scoped_t &vars) {
+    scoped_lock locker(env_lock);
+    if (key == L"PWD") {
+        return env_var_t(vars.perproc_data().pwd, env_var_t::flag_export);
+    } else if (key == L"history") {
         // Big hack. We only allow getting the history on the main thread. Note that history_t
         // may ask for an environment variable, so don't take the lock here (we don't need it).
         if (!is_main_thread()) {
@@ -114,10 +122,8 @@ static maybe_t<env_var_t> get_electric(const wcstring &key, const environment_t
     } else if (key == L"umask") {
         // note umask() is an absurd API: you call it to set the value and it returns the old value.
         // Thus we have to call it twice, to reset the value.
-        // We need to lock since otherwise this races.
+        // The env_lock protects against races.
         // Guess what the umask is; if we guess right we don't need to reset it.
-        static std::mutex umask_lock;
-        scoped_lock locker(umask_lock);
         int guess = 022;
         mode_t res = umask(guess);
         if (res != guess) umask(res);
@@ -198,11 +204,6 @@ wcstring_list_t null_environment_t::get_names(int flags) const {
     return {};
 }
 
-// This is a big dorky lock we take around everything that might read from or modify an env_node_t.
-// Fine grained locking is annoying here because env_nodes may be shared between env_stacks, so each
-// node would need its own lock.
-static std::mutex env_lock;
-
 // Struct representing one level in the function variable stack.
 // Only our variable stack should create and destroy these
 class env_node_t {
@@ -250,7 +251,7 @@ struct var_stack_t {
 
     bool has_changed_exported() const { return !export_array; }
 
-    void update_export_array_if_necessary();
+    void update_export_array_if_necessary(const wcstring &pwd);
 
     var_stack_t(env_node_ref_t top, env_node_ref_t global)
         : top(std::move(top)), global(std::move(global)) {}
@@ -394,7 +395,7 @@ bool var_stack_t::local_scope_exports() const {
     return false;
 }
 
-void var_stack_t::update_export_array_if_necessary() {
+void var_stack_t::update_export_array_if_necessary(const wcstring &pwd) {
     if (!this->has_changed_exported()) {
         return;
     }
@@ -416,6 +417,9 @@ void var_stack_t::update_export_array_if_necessary() {
         }
     }
 
+    // Dorky way to add the single exported electric variable.
+    vals[L"PWD"] = env_var_t(L"PWD", pwd);
+
     // Construct the export list: a list of strings of the form key=value.
     std::vector<std::string> export_list;
     export_list.reserve(vals.size());
@@ -432,6 +436,21 @@ void var_stack_t::update_export_array_if_necessary() {
 var_stack_t &env_scoped_t::vars_stack() { return *vars_; }
 const var_stack_t &env_scoped_t::vars_stack() const { return *vars_; }
 
+/// Add the names of electric variables, respecting show_exported and show_unexported.
+static void add_electric_names(wcstring_list_t *result, bool show_exported, bool show_unexported) {
+    // As of now PWD is the only exported electric variable.
+    if (show_exported) {
+        result->push_back(L"PWD");
+    }
+    if (show_unexported) {
+        for (const wchar_t *var : env_electric) {
+            if (!wcscmp(var, L"PWD")) {
+                result->push_back(var);
+            }
+        }
+    }
+}
+
 // Read a variable respecting the given mode.
 maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
@@ -481,7 +500,9 @@ maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode)
 }
 
 std::shared_ptr<environment_t> env_scoped_t::snapshot() const {
-    return std::shared_ptr<env_scoped_t>(new env_scoped_t(vars_->snapshot()));
+    auto ret = std::shared_ptr<env_scoped_t>(new env_scoped_t(vars_->snapshot()));
+    ret->perproc_data_ = this->perproc_data_;
+    return ret;
 }
 
 env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
@@ -584,7 +605,7 @@ static void setup_path() {
 }
 
 void env_init(const struct config_paths_t *paths /* or NULL */) {
-    env_stack_t &vars = env_stack_t::globals();
+    env_stack_t &vars = env_stack_t::principal();
     // Import environment variables. Walk backwards so that the first one out of any duplicates wins
     // (See issue #2784).
     wcstring key, val;
@@ -796,6 +817,18 @@ static void env_set_internal_universal(const wcstring &key, wcstring_list_t val,
     }
 }
 
+int env_stack_t::set_pwd(wcstring_list_t pwds) {
+    // PWD cannot be set by the user, only by builtin_cd.
+    // So we require that we have exactly one element.
+    assert(pwds.size() == 1 && "Should have exactly one element in PWD");
+    wcstring &pwd = pwds.front();
+    if (pwd != perproc_data().pwd) {
+        perproc_data().pwd = std::move(pwd);
+        vars_stack().mark_changed_exported();
+    }
+    return ENV_OK;
+}
+
 void env_stack_t::set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode,
                                       wcstring_list_t val) {
     scoped_lock locker(env_lock);
@@ -934,6 +967,9 @@ int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mo
     if (key == L"umask") {  // set new umask
         scoped_lock locker(env_lock);
         return set_umask(val);
+    } else if (key == L"PWD") {
+        scoped_lock locker(env_lock);
+        return this->set_pwd(std::move(val));
     }
 
     if (var_mode & ENV_UNIVERSAL) {
@@ -1085,9 +1121,7 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
 
     if (show_global) {
         add_keys(vars.global->env);
-        if (show_unexported) {
-            result.insert(result.end(), std::begin(env_electric), std::end(env_electric));
-        }
+        add_electric_names(&result, show_exported, show_unexported);
     }
 
     if (show_universal && uvars()) {
@@ -1102,7 +1136,8 @@ wcstring_list_t env_scoped_t::get_names(int flags) const {
 const char *const *env_stack_t::export_arr() {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
-    vars_stack().update_export_array_if_necessary();
+    const wcstring &pwd = perproc_data().pwd;
+    vars_stack().update_export_array_if_necessary(pwd);
     assert(vars_stack().export_array && "Should have export array");
     return vars_stack().export_array->get();
 }
diff --git a/src/env.h b/src/env.h
index 5e4f577a4..9ea5a30ff 100644
--- a/src/env.h
+++ b/src/env.h
@@ -201,6 +201,15 @@ class env_scoped_t : public environment_t {
    private:
     std::unique_ptr<var_stack_t> vars_;
 
+    /// A struct wrapping up parser-local variables. These are conceptually variables that differ in
+    /// different fish internal processes.
+    struct perproc_data_t {
+        wcstring pwd;
+    };
+
+    /// The per-process data.
+    perproc_data_t perproc_data_{};
+
    protected:
     var_stack_t &vars_stack();
     const var_stack_t &vars_stack() const;
@@ -209,7 +218,13 @@ class env_scoped_t : public environment_t {
     env_scoped_t();
     env_scoped_t(env_scoped_t &&);
 
+    /// Read-write access to the perproc data.
+    perproc_data_t &perproc_data() { return perproc_data_; }
+
    public:
+    /// Read-only access to the perproc data.
+    const perproc_data_t &perproc_data() const { return perproc_data_; }
+
     /// Gets the variable with the specified name, or none() if it does not exist.
     maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
 
@@ -234,6 +249,8 @@ class env_stack_t final : public env_scoped_t {
     bool try_remove(const std::shared_ptr<env_node_t> &n, const wcstring &key, int var_mode);
     std::shared_ptr<env_node_t> get_node(const wcstring &key);
 
+    maybe_t<env_var_t> get_perproc(const wcstring &key) const;
+
     static env_stack_t make_principal();
 
     using env_scoped_t::env_scoped_t;
@@ -244,6 +261,9 @@ class env_stack_t final : public env_scoped_t {
     /// scope in the variable stack.
     void set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
 
+    /// Set the pwd.
+    int set_pwd(wcstring_list_t pwds);
+
    public:
     /// Sets the variable with the specified name to the given values.
     int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 88e51d328..e4aa29fc0 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4953,6 +4953,38 @@ static void test_env_vars() {
     do_test(v1 != v4 && !(v1 == v4));
 }
 
+static void test_env_snapshot() {
+    if (system("mkdir -p test/fish_env_snapshot_test/")) err(L"mkdir failed");
+    bool pushed = pushd("test/fish_env_snapshot_test");
+    do_test(pushed);
+    auto &vars = parser_t::principal_parser().vars();
+    vars.push(true);
+    wcstring before_pwd = vars.get(L"PWD")->as_string();
+    vars.set(L"test_env_snapshot_var", 0, {L"before"});
+    const auto snapshot = vars.snapshot();
+    vars.set(L"PWD", 0, {L"/newdir"});
+    vars.set(L"test_env_snapshot_var", 0, {L"after"});
+    vars.set(L"test_env_snapshot_var_2", 0, {L"after"});
+
+    // vars should be unaffected by the snapshot
+    do_test(vars.get(L"PWD")->as_string() == L"/newdir");
+    do_test(vars.get(L"test_env_snapshot_var")->as_string() == L"after");
+    do_test(vars.get(L"test_env_snapshot_var_2")->as_string() == L"after");
+
+    // snapshot should have old values of vars
+    do_test(snapshot->get(L"PWD")->as_string() == before_pwd);
+    do_test(snapshot->get(L"test_env_snapshot_var")->as_string() == L"before");
+    do_test(snapshot->get(L"test_env_snapshot_var_2") == none());
+
+    // snapshots see global var changes except for perproc like PWD
+    vars.set(L"test_env_snapshot_var_3", ENV_GLOBAL, {L"reallyglobal"});
+    do_test(vars.get(L"test_env_snapshot_var_3")->as_string() == L"reallyglobal");
+    do_test(snapshot->get(L"test_env_snapshot_var_3")->as_string() == L"reallyglobal");
+
+    vars.pop();
+    popd();
+}
+
 static void test_illegal_command_exit_code() {
     say(L"Testing illegal command exit code");
 
@@ -5250,6 +5282,7 @@ int main(int argc, char **argv) {
     if (should_test_function("utility_functions")) test_utility_functions();
     if (should_test_function("wcstring_tok")) test_wcstring_tok();
     if (should_test_function("env_vars")) test_env_vars();
+    if (should_test_function("env")) test_env_snapshot();
     if (should_test_function("str_to_num")) test_str_to_num();
     if (should_test_function("enum")) test_enum_set();
     if (should_test_function("enum")) test_enum_array();

From 16fd7804846c0aeca926f207eb0e2ae86f819931 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 10 May 2019 09:10:43 -0700
Subject: [PATCH 0524/1732] Reimplement the whole variable stack

The variable stack is a mess - confused locking, surprising callouts, and
unclear division of labor. Just reimplement the whole thing.
---
 src/common.h |   18 +-
 src/env.cpp  | 1518 ++++++++++++++++++++++++++------------------------
 src/env.h    |   86 +--
 src/exec.cpp |    7 +-
 4 files changed, 843 insertions(+), 786 deletions(-)

diff --git a/src/common.h b/src/common.h
index 5c423a929..db12471ea 100644
--- a/src/common.h
+++ b/src/common.h
@@ -607,15 +607,15 @@ typedef std::lock_guard<std::recursive_mutex> scoped_rlock;
 // Or for simple cases:
 //   name.acquire().value = "derp"
 //
-template <typename DATA>
+template <typename Data>
 class acquired_lock {
     std::unique_lock<std::mutex> lock;
-    acquired_lock(std::mutex &lk, DATA *v) : lock(lk), value(v) {}
+    acquired_lock(std::mutex &lk, Data *v) : lock(lk), value(v) {}
 
     template <typename T>
     friend class owning_lock;
 
-    DATA *value;
+    Data *value;
 
    public:
     // No copying, move construction only
@@ -624,10 +624,14 @@ class acquired_lock {
     acquired_lock(acquired_lock &&) = default;
     acquired_lock &operator=(acquired_lock &&) = default;
 
-    DATA *operator->() { return value; }
-    const DATA *operator->() const { return value; }
-    DATA &operator*() { return *value; }
-    const DATA &operator*() const { return *value; }
+    Data *operator->() { return value; }
+    const Data *operator->() const { return value; }
+    Data &operator*() { return *value; }
+    const Data &operator*() const { return *value; }
+
+    /// Create from a global lock.
+    /// This is used in weird cases where a global lock protects more than one piece of data.
+    static acquired_lock from_global(std::mutex &lk, Data *v) { return acquired_lock{lk, v}; }
 };
 
 // A lock that owns a piece of data
diff --git a/src/env.cpp b/src/env.cpp
index 01e917319..12861a32f 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -90,49 +90,6 @@ static bool is_electric(const wcstring &key) { return contains(env_electric, key
 // node would need its own lock.
 static std::mutex env_lock;
 
-/// \return a the value of a variable for \p key, which must be electric (computed).
-static maybe_t<env_var_t> get_electric(const wcstring &key, const env_scoped_t &vars) {
-    scoped_lock locker(env_lock);
-    if (key == L"PWD") {
-        return env_var_t(vars.perproc_data().pwd, env_var_t::flag_export);
-    } else if (key == L"history") {
-        // Big hack. We only allow getting the history on the main thread. Note that history_t
-        // may ask for an environment variable, so don't take the lock here (we don't need it).
-        if (!is_main_thread()) {
-            return none();
-        }
-
-        history_t *history = reader_get_history();
-        if (!history) {
-            history = &history_t::history_with_name(history_session_id(vars));
-        }
-        wcstring_list_t result;
-        if (history) history->get_history(result);
-        return env_var_t(L"history", result);
-    } else if (key == L"pipestatus") {
-        const auto js = proc_get_last_statuses();
-        wcstring_list_t result;
-        result.reserve(js.pipestatus.size());
-        for (int i : js.pipestatus) {
-            result.push_back(to_string(i));
-        }
-        return env_var_t(L"pipestatus", std::move(result));
-    } else if (key == L"status") {
-        return env_var_t(L"status", to_string(proc_get_last_status()));
-    } else if (key == L"umask") {
-        // note umask() is an absurd API: you call it to set the value and it returns the old value.
-        // Thus we have to call it twice, to reset the value.
-        // The env_lock protects against races.
-        // Guess what the umask is; if we guess right we don't need to reset it.
-        int guess = 022;
-        mode_t res = umask(guess);
-        if (res != guess) umask(res);
-        return env_var_t(L"umask", format_string(L"0%0.3o", res));
-    }
-    // We should never get here unless the electric var list is out of sync with the above code.
-    DIE("unrecognized electric var name");
-}
-
 /// Some env vars contain a list of paths where an empty path element is equivalent to ".".
 /// Unfortunately that convention causes problems for fish scripts. So this function replaces the
 /// empty path element with an explicit ".". See issue #3914.
@@ -204,350 +161,6 @@ wcstring_list_t null_environment_t::get_names(int flags) const {
     return {};
 }
 
-// Struct representing one level in the function variable stack.
-// Only our variable stack should create and destroy these
-class env_node_t {
-   public:
-    /// Variable table.
-    var_table_t env;
-    /// Does this node imply a new variable scope? If yes, all non-global variables below this one
-    /// in the stack are invisible. If new_scope is set for the global variable node, the universe
-    /// will explode.
-    const bool new_scope;
-    /// Does this node contain any variables which are exported to subshells
-    /// or does it redefine any variables to not be exported?
-    bool exportv = false;
-    /// Pointer to next level.
-    const std::shared_ptr<env_node_t> next;
-
-    env_node_t(bool is_new_scope, std::shared_ptr<env_node_t> next_scope)
-        : new_scope(is_new_scope), next(std::move(next_scope)) {}
-
-    maybe_t<env_var_t> find_entry(const wcstring &key) {
-        auto it = env.find(key);
-        if (it != env.end()) return it->second;
-        return none();
-    }
-};
-using env_node_ref_t = std::shared_ptr<env_node_t>;
-
-// A class wrapping up a variable stack.
-// This forms a linekd list of env_node_t, and also maintains the export array for exported
-// environment variables.
-struct var_stack_t {
-    var_stack_t(var_stack_t &&) = default;
-
-    // Top node on the function stack.
-    env_node_ref_t top;
-
-    // Bottom node on the function stack.
-    const env_node_ref_t global;
-
-    // Exported variable array used by execv.
-    maybe_t<null_terminated_array_t<char>> export_array;
-
-    /// Flag for checking if we need to regenerate the exported variable array.
-    void mark_changed_exported() { export_array.reset(); }
-
-    bool has_changed_exported() const { return !export_array; }
-
-    void update_export_array_if_necessary(const wcstring &pwd);
-
-    var_stack_t(env_node_ref_t top, env_node_ref_t global)
-        : top(std::move(top)), global(std::move(global)) {}
-
-    // Pushes a new node onto our stack
-    // Optionally creates a new scope for the node
-    void push(bool new_scope) {
-        auto node = std::make_shared<env_node_t>(new_scope, this->top);
-
-        // Copy local-exported variables.
-        auto top_node = top;
-        // Only if we introduce a new shadowing scope; i.e. not if it's just `begin; end` or
-        // "--no-scope-shadowing".
-        if (new_scope && top_node != this->global) {
-            for (const auto &var : top_node->env) {
-                if (var.second.exports()) node->env.insert(var);
-            }
-        }
-
-        this->top = std::move(node);
-        if (new_scope && local_scope_exports()) {
-            this->mark_changed_exported();
-        }
-    }
-
-    // Pops the top node, asserting it's not global.
-    // \return the popped node.
-    env_node_ref_t pop() {
-        assert(top != this->global && "Cannot pop global node");
-        env_node_ref_t old_top = this->top;
-        this->top = old_top->next;
-        return old_top;
-    }
-
-    // Returns the next scope to search for a given node, respecting the new_scope flag.
-    // Returns an empty pointer if we're done.
-    env_node_ref_t next_scope_to_search(const env_node_ref_t &node) const {
-        assert(node != NULL);
-        if (node == this->global) {
-            return nullptr;
-        }
-        return node->new_scope ? this->global : node->next;
-    }
-
-    // Returns the scope used for unspecified scopes. An unspecified scope is either the topmost
-    // shadowing scope, or the global scope if none. This implements the default behavior of `set`.
-    env_node_ref_t resolve_unspecified_scope() {
-        env_node_ref_t node = this->top;
-        while (node && !node->new_scope) {
-            node = node->next;
-        }
-        return node ? node : this->global;
-    }
-
-    /// Copy this vars_stack.
-    var_stack_t clone() const { return var_stack_t(*this); }
-
-    /// Snapshot this vars_stack. That is, return a new vars_stack that has copies of all local
-    /// variables. Note that this drops all shadowed nodes: only the currently executing function is
-    /// copied. Global variables are referenced, not copied; this is both because there are a lot of
-    /// global varibables so copying would be expensive, and some (electrics) are computed so cannot
-    /// be effectively copied.
-    std::unique_ptr<var_stack_t> snapshot() const {
-        return make_unique<var_stack_t>(snapshot_node(top), global);
-    }
-
-    /// \return true if the topmost local scope exports a variable.
-    bool local_scope_exports() const;
-
-    /// \return a new stack with a single top level local scope.
-    // This local scope will persist throughout the lifetime of the fish process, and it will ensure
-    // that `set -l` commands run at the command-line don't affect the global scope.
-    static std::unique_ptr<var_stack_t> create() {
-        auto locals = std::make_shared<env_node_t>(false, globals());
-        return make_unique<var_stack_t>(std::move(locals), globals());
-    }
-
-   private:
-    /// Copy constructor. This does not copy the export array; it just allows it to be regenerated.
-    var_stack_t(const var_stack_t &rhs) : top(rhs.top), global(rhs.global) {}
-
-    /// Populate the table \p h with exported variables. This is recursive because it must start
-    /// with globals.
-    void get_exported(const shared_ptr<env_node_t> &n, var_table_t &h) const;
-
-    /// Recursive helper for snapshot(). Snapshot a node and its unshadows parents, returning it.
-    env_node_ref_t snapshot_node(const env_node_ref_t &node) const {
-        assert(node && "null node in snapshot_node");
-        // If we are global, re-use the global node. If we reach a new scope, jump to globals; we
-        // don't snapshot shadowed scopes, because the snapshot is intended to be read-only and so
-        // there would be no way to access them.
-        if (node == global) {
-            return node;
-        }
-        auto next = snapshot_node(next_scope_to_search(node));
-        auto result = std::make_shared<env_node_t>(node->new_scope, next);
-        // Copy over variables.
-        // Note assigning env is a potentially big copy.
-        result->exportv = node->exportv;
-        result->env = node->env;
-        return result;
-    }
-
-    /// \return the global variable set.
-    /// Note that this is the only place where we talk about a single global variable set; each
-    /// var_stack_t has its own reference to globals and could potentially have a different global
-    /// set.
-    static env_node_ref_t globals() {
-        static env_node_ref_t s_globals{std::make_shared<env_node_t>(false, nullptr)};
-        return s_globals;
-    }
-};
-
-void var_stack_t::get_exported(const std::shared_ptr<env_node_t> &n, var_table_t &h) const {
-    if (!n) return;
-
-    // Allow parent scopes to populate first, since we may want to overwrite those results.
-    get_exported(next_scope_to_search(n), h);
-
-    for (const auto &kv : n->env) {
-        const wcstring &key = kv.first;
-        const env_var_t &var = kv.second;
-        if (var.exports()) {
-            // Export the variable. Don't use std::map::insert here, since we need to overwrite
-            // existing values from previous scopes.
-            h[key] = var;
-        } else {
-            // We need to erase from the map if we are not exporting, since a lower scope may have
-            // exported. See #2132.
-            h.erase(key);
-        }
-    }
-}
-
-/// Returns true if the specified scope or any non-shadowed non-global subscopes contain an exported
-/// variable.
-bool var_stack_t::local_scope_exports() const {
-    for (auto n = top; n != global; n = next_scope_to_search(n)) {
-        if (n->exportv) return true;
-    }
-    return false;
-}
-
-void var_stack_t::update_export_array_if_necessary(const wcstring &pwd) {
-    if (!this->has_changed_exported()) {
-        return;
-    }
-
-    debug(4, L"export_arr() recalc");
-    var_table_t vals;
-    get_exported(this->top, vals);
-
-    if (uvars()) {
-        const wcstring_list_t uni = uvars()->get_names(true, false);
-        for (const wcstring &key : uni) {
-            auto var = uvars()->get(key);
-
-            if (!var.missing_or_empty()) {
-                // Note that std::map::insert does NOT overwrite a value already in the map,
-                // which we depend on here.
-                vals.insert(std::pair<wcstring, env_var_t>(key, *var));
-            }
-        }
-    }
-
-    // Dorky way to add the single exported electric variable.
-    vals[L"PWD"] = env_var_t(L"PWD", pwd);
-
-    // Construct the export list: a list of strings of the form key=value.
-    std::vector<std::string> export_list;
-    export_list.reserve(vals.size());
-    for (const auto &kv : vals) {
-        std::string str = wcs2string(kv.first);
-        str.push_back('=');
-        str.append(wcs2string(kv.second.as_string()));
-        export_list.push_back(std::move(str));
-    }
-    export_array.emplace(export_list);
-}
-
-// Get the variable stack
-var_stack_t &env_scoped_t::vars_stack() { return *vars_; }
-const var_stack_t &env_scoped_t::vars_stack() const { return *vars_; }
-
-/// Add the names of electric variables, respecting show_exported and show_unexported.
-static void add_electric_names(wcstring_list_t *result, bool show_exported, bool show_unexported) {
-    // As of now PWD is the only exported electric variable.
-    if (show_exported) {
-        result->push_back(L"PWD");
-    }
-    if (show_unexported) {
-        for (const wchar_t *var : env_electric) {
-            if (!wcscmp(var, L"PWD")) {
-                result->push_back(var);
-            }
-        }
-    }
-}
-
-// Read a variable respecting the given mode.
-maybe_t<env_var_t> env_scoped_t::get(const wcstring &key, env_mode_flags_t mode) const {
-    const bool has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
-    const bool search_local = !has_scope || (mode & ENV_LOCAL);
-    const bool search_global = !has_scope || (mode & ENV_GLOBAL);
-    const bool search_universal = !has_scope || (mode & ENV_UNIVERSAL);
-
-    const bool search_exported = (mode & ENV_EXPORT) || !(mode & ENV_UNEXPORT);
-    const bool search_unexported = (mode & ENV_UNEXPORT) || !(mode & ENV_EXPORT);
-
-    // Make the assumption that electric keys can't be shadowed elsewhere, since we currently block
-    // that in env_stack_t::set().
-    if (is_electric(key)) {
-        if (!search_global) return none();
-        return get_electric(key, *this);
-    }
-
-    if (search_local || search_global) {
-        scoped_lock locker(env_lock);  // lock around a local region
-        env_node_ref_t env = search_local ? vars_stack().top : vars_stack().global;
-
-        while (env != NULL) {
-            if (env == vars_stack().global && !search_global) {
-                break;
-            }
-
-            var_table_t::const_iterator result = env->env.find(key);
-            if (result != env->env.end()) {
-                const env_var_t &var = result->second;
-                if (var.exports() ? search_exported : search_unexported) {
-                    return var;
-                }
-            }
-            env = vars_stack().next_scope_to_search(env);
-        }
-    }
-    // Okay, we couldn't find a local or global var given the requirements. If there is a matching
-    // universal var return that.
-    if (search_universal && uvars()) {
-        auto var = uvars()->get(key);
-        if (var && (var->exports() ? search_exported : search_unexported)) {
-            return var;
-        }
-    }
-
-    return none();
-}
-
-std::shared_ptr<environment_t> env_scoped_t::snapshot() const {
-    auto ret = std::shared_ptr<env_scoped_t>(new env_scoped_t(vars_->snapshot()));
-    ret->perproc_data_ = this->perproc_data_;
-    return ret;
-}
-
-env_scoped_t::env_scoped_t(std::unique_ptr<var_stack_t> vars) : vars_(std::move(vars)) {}
-env_scoped_t::env_scoped_t(env_scoped_t &&) = default;
-env_scoped_t::~env_scoped_t() = default;
-
-bool env_stack_t::universal_barrier() {
-    ASSERT_IS_MAIN_THREAD();
-    if (!uvars()) return false;
-
-    callback_data_list_t callbacks;
-    bool changed = uvars()->sync(callbacks);
-    if (changed) {
-        universal_notifier_t::default_notifier().post_notification();
-    }
-
-    env_universal_callbacks(this, callbacks);
-    return changed || !callbacks.empty();
-}
-
-/// If they don't already exist initialize the `COLUMNS` and `LINES` env vars to reasonable
-/// defaults. They will be updated later by the `get_current_winsize()` function if they need to be
-/// adjusted.
-void env_stack_t::set_termsize() {
-    auto &vars = env_stack_t::globals();
-    auto cols = get(L"COLUMNS");
-    if (cols.missing_or_empty()) vars.set_one(L"COLUMNS", ENV_GLOBAL, DFLT_TERM_COL_STR);
-
-    auto rows = get(L"LINES");
-    if (rows.missing_or_empty()) vars.set_one(L"LINES", ENV_GLOBAL, DFLT_TERM_ROW_STR);
-}
-
-/// Update the PWD variable directory from the result of getcwd().
-void env_stack_t::set_pwd_from_getcwd() {
-    wcstring cwd = wgetcwd();
-    if (cwd.empty()) {
-        debug(0,
-              _(L"Could not determine current working directory. Is your locale set correctly?"));
-        return;
-    }
-    set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, cwd);
-}
-
-void env_stack_t::mark_changed_exported() { vars_stack().mark_changed_exported(); }
-
 /// Set up the USER variable.
 static void setup_user(bool force) {
     auto &vars = env_stack_t::globals();
@@ -753,17 +366,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     env_universal_callbacks(&env_stack_t::principal(), callbacks);
 }
 
-/// Search all visible scopes in order for the specified key. Return the first scope in which it was
-/// found.
-env_node_ref_t env_stack_t::get_node(const wcstring &key) {
-    env_node_ref_t env = vars_stack().top;
-    while (env) {
-        if (env->find_entry(key)) break;
-        env = vars_stack().next_scope_to_search(env);
-    }
-    return env;
-}
-
 static int set_umask(const wcstring_list_t &list_val) {
     long mask = -1;
     if (list_val.size() == 1 && !list_val.front().empty()) {
@@ -776,27 +378,634 @@ static int set_umask(const wcstring_list_t &list_val) {
     return ENV_OK;
 }
 
+namespace {
+struct query_t {
+    // Whether any scopes were specified.
+    bool has_scope;
+
+    // Whether to search local, global, universal scopes.
+    bool local;
+    bool global;
+    bool universal;
+
+    // Whether export or unexport was specified.
+    bool has_export_unexport;
+
+    // Whether to search exported and unexported variables.
+    bool exports;
+    bool unexports;
+
+    // Whether pathvar or unpathvar was set.
+    bool has_pathvar_unpathvar;
+    bool pathvar;
+    bool unpathvar;
+
+    // Whether this is a "user" set.
+    bool user;
+
+    explicit query_t(env_mode_flags_t mode) {
+        has_scope = mode & (ENV_LOCAL | ENV_GLOBAL | ENV_UNIVERSAL);
+        local = !has_scope || (mode & ENV_LOCAL);
+        global = !has_scope || (mode & ENV_GLOBAL);
+        universal = !has_scope || (mode & ENV_UNIVERSAL);
+
+        has_export_unexport = mode & (ENV_EXPORT | ENV_UNEXPORT);
+        exports = !has_export_unexport || (mode & ENV_EXPORT);
+        unexports = !has_export_unexport || (mode & ENV_UNEXPORT);
+
+        // note we don't use pathvar for searches, so these don't default to true if unspecified.
+        has_pathvar_unpathvar = mode & (ENV_PATHVAR | ENV_UNPATHVAR);
+        pathvar = mode & ENV_PATHVAR;
+        unpathvar = mode & ENV_UNPATHVAR;
+
+        user = mode & ENV_USER;
+    }
+
+    bool export_matches(const env_var_t &var) const {
+        if (has_export_unexport) {
+            return var.exports() ? exports : unexports;
+        } else {
+            return true;
+        }
+    }
+};
+
+// Struct representing one level in the function variable stack.
+class env_node_t {
+   public:
+    /// Variable table.
+    var_table_t env;
+    /// Does this node imply a new variable scope? If yes, all non-global variables below this one
+    /// in the stack are invisible. If new_scope is set for the global variable node, the universe
+    /// will explode.
+    const bool new_scope;
+    /// Does this node contain any variables which are exported to subshells
+    /// or does it redefine any variables to not be exported?
+    bool exportv = false;
+    /// Pointer to next level.
+    const std::shared_ptr<env_node_t> next;
+
+    env_node_t(bool is_new_scope, std::shared_ptr<env_node_t> next_scope)
+        : new_scope(is_new_scope), next(std::move(next_scope)) {}
+
+    maybe_t<env_var_t> find_entry(const wcstring &key) {
+        auto it = env.find(key);
+        if (it != env.end()) return it->second;
+        return none();
+    }
+};
+}  // namespace
+
+using env_node_ref_t = std::shared_ptr<env_node_t>;
+class env_scoped_impl_t : public environment_t {
+    /// A struct wrapping up parser-local variables. These are conceptually variables that differ in
+    /// different fish internal processes.
+    struct perproc_data_t {
+        wcstring pwd;
+    };
+
+   public:
+    env_scoped_impl_t(env_node_ref_t locals, env_node_ref_t globals)
+        : locals_(std::move(locals)), globals_(std::move(globals)) {
+        assert(locals_ && globals_ && "Nodes cannot be null");
+    }
+
+    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
+    wcstring_list_t get_names(int flags) const override;
+
+    perproc_data_t &perproc_data() { return perproc_data_; }
+    const perproc_data_t &perproc_data() const { return perproc_data_; }
+
+    std::shared_ptr<environment_t> snapshot() const;
+
+    virtual ~env_scoped_impl_t() = default;
+
+    std::shared_ptr<const null_terminated_array_t<char>> export_array();
+
+    env_scoped_impl_t(env_scoped_impl_t &&) = delete;
+    env_scoped_impl_t(const env_scoped_impl_t &) = delete;
+    void operator=(env_scoped_impl_t &&) = delete;
+    void operator=(const env_scoped_impl_t &) = delete;
+
+   protected:
+    // A linked list of scopes.
+    env_node_ref_t locals_{};
+
+    // Global scopes. There is no parent here.
+    env_node_ref_t globals_{};
+
+    // Per process data.
+    perproc_data_t perproc_data_{};
+
+    // Exported variable array used by execv.
+    std::shared_ptr<const null_terminated_array_t<char>> export_array_{};
+
+    /// \return true if the local scope exports.
+    bool local_scope_exports() const {
+        for (auto cursor = locals_; cursor; cursor = cursor->next) {
+            if (cursor->exportv) return true;
+        }
+        return false;
+    }
+
+   private:
+    // These "try" methods return true on success, false on failure. On a true return, \p result is
+    // populated. A maybe_t<maybe_t<...>> is a bridge too far.
+    // These may populate result with none() if a variable is present which does not match the
+    // query.
+    maybe_t<env_var_t> try_get_electric(const wcstring &key, const query_t &query) const;
+    maybe_t<env_var_t> try_get_local(const wcstring &key, const query_t &query) const;
+    maybe_t<env_var_t> try_get_global(const wcstring &key, const query_t &query) const;
+    maybe_t<env_var_t> try_get_universal(const wcstring &key, const query_t &query) const;
+
+    /// \return a newly allocated export array.
+    std::shared_ptr<const null_terminated_array_t<char>> create_export_array() const;
+};
+
+/// Get the exported variables into a variable table.
+static void get_exported(const env_node_ref_t &n, var_table_t &table) {
+    if (!n) return;
+
+    // Allow parent scopes to populate first, since we may want to overwrite those results.
+    get_exported(n->next, table);
+
+    for (const auto &kv : n->env) {
+        const wcstring &key = kv.first;
+        const env_var_t &var = kv.second;
+        if (var.exports()) {
+            // Export the variable. Don't use std::map::insert here, since we need to overwrite
+            // existing values from previous scopes.
+            table[key] = var;
+        } else {
+            // We need to erase from the map if we are not exporting, since a lower scope may have
+            // exported. See #2132.
+            table.erase(key);
+        }
+    }
+}
+
+std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_export_array()
+    const {
+    var_table_t table;
+
+    debug(4, L"create_export_array() recalc");
+    var_table_t vals;
+    get_exported(this->globals_, vals);
+    get_exported(this->locals_, vals);
+
+    if (uvars()) {
+        const wcstring_list_t uni = uvars()->get_names(true, false);
+        for (const wcstring &key : uni) {
+            auto var = uvars()->get(key);
+
+            if (!var.missing_or_empty()) {
+                // Note that std::map::insert does NOT overwrite a value already in the map,
+                // which we depend on here.
+                vals.insert(std::pair<wcstring, env_var_t>(key, *var));
+            }
+        }
+    }
+
+    // Dorky way to add the single exported electric variable.
+    vals[L"PWD"] = env_var_t(L"PWD", perproc_data().pwd);
+
+    // Construct the export list: a list of strings of the form key=value.
+    std::vector<std::string> export_list;
+    export_list.reserve(vals.size());
+    for (const auto &kv : vals) {
+        std::string str = wcs2string(kv.first);
+        str.push_back('=');
+        str.append(wcs2string(kv.second.as_string()));
+        export_list.push_back(std::move(str));
+    }
+    return std::make_shared<null_terminated_array_t<char>>(export_list);
+}
+
+std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::export_array() {
+    ASSERT_IS_NOT_FORKED_CHILD();
+    if (!export_array_) {
+        export_array_ = create_export_array();
+    }
+    return export_array_;
+}
+
+maybe_t<env_var_t> env_scoped_impl_t::try_get_electric(const wcstring &key,
+                                                       const query_t &query) const {
+    // Electric variables are read only and only global.
+    if (!is_electric(key)) {
+        return none();
+    }
+    if (key == L"PWD") {
+        return env_var_t(perproc_data().pwd, env_var_t::flag_export);
+    } else if (key == L"history") {
+        // Big hack. We only allow getting the history on the main thread. Note that history_t
+        // may ask for an environment variable, so don't take the lock here (we don't need it).
+        if (!is_main_thread()) {
+            return none();
+        }
+
+        history_t *history = reader_get_history();
+        if (!history) {
+            history = &history_t::history_with_name(history_session_id(*this));
+        }
+        wcstring_list_t result;
+        if (history) history->get_history(result);
+        return env_var_t(L"history", std::move(result));
+    } else if (key == L"pipestatus") {
+        const auto js = proc_get_last_statuses();
+        wcstring_list_t result;
+        result.reserve(js.pipestatus.size());
+        for (int i : js.pipestatus) {
+            result.push_back(to_string(i));
+        }
+        return env_var_t(L"pipestatus", std::move(result));
+    } else if (key == L"status") {
+        return env_var_t(L"status", to_string(proc_get_last_status()));
+    } else if (key == L"umask") {
+        // note umask() is an absurd API: you call it to set the value and it returns the old
+        // value. Thus we have to call it twice, to reset the value. The env_lock protects
+        // against races. Guess what the umask is; if we guess right we don't need to reset it.
+        int guess = 022;
+        mode_t res = umask(guess);
+        if (res != guess) umask(res);
+        return env_var_t(L"umask", format_string(L"0%0.3o", res));
+    }
+    // We should never get here unless the electric var list is out of sync with the above code.
+    DIE("unrecognized electric var name");
+}
+
+maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key,
+                                                    const query_t &query) const {
+    auto cursor = locals_;
+    while (cursor) {
+        auto where = cursor->env.find(key);
+        if (where != cursor->env.end()) {
+            return where->second;
+        }
+        cursor = cursor->next;
+    }
+    return none();
+}
+
+maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key,
+                                                     const query_t &query) const {
+    auto where = globals_->env.find(key);
+    if (where != globals_->env.end()) {
+        return where->second;
+    }
+    return none();
+}
+
+maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key,
+                                                        const query_t &query) const {
+    if (!uvars()) return none();
+    auto var = uvars()->get(key);
+    if (var) {
+        return var;
+    }
+    return none();
+}
+
+maybe_t<env_var_t> env_scoped_impl_t::get(const wcstring &key, env_mode_flags_t mode) const {
+    const query_t query(mode);
+
+    maybe_t<env_var_t> result = try_get_electric(key, query);
+    if (!result && query.local) {
+        result = try_get_local(key, query);
+    }
+    if (!result && query.global) {
+        result = try_get_global(key, query);
+    }
+    if (!result && query.universal) {
+        result = try_get_universal(key, query);
+    }
+    // If the user requested only exported or unexported variables, enforce that here.
+    if (result && !query.export_matches(*result)) {
+        result = none();
+    }
+    return result;
+}
+
+wcstring_list_t env_scoped_impl_t::get_names(int flags) const {
+    const query_t query(flags);
+    std::set<wcstring> names;
+
+    // Helper to add the names of variables from \p envs to names, respecting show_exported and
+    // show_unexported.
+    auto add_keys = [&](const var_table_t &envs) {
+        for (const auto &kv : envs) {
+            if (query.export_matches(kv.second)) {
+                names.insert(kv.first);
+            }
+        }
+    };
+
+    if (query.local) {
+        for (auto cursor = locals_; cursor != nullptr; cursor = cursor->next) {
+            add_keys(cursor->env);
+        }
+    }
+
+    if (query.global) {
+        add_keys(globals_->env);
+        // Add electrics.
+        for (const wchar_t *var : env_electric) {
+            bool is_pwd = !wcscmp(var, L"PWD");
+            if (is_pwd ? query.exports : query.unexports) {
+                names.insert(var);
+            }
+        }
+    }
+
+    if (query.universal && uvars()) {
+        const wcstring_list_t uni_list = uvars()->get_names(query.exports, query.unexports);
+        names.insert(uni_list.begin(), uni_list.end());
+    }
+
+    return wcstring_list_t(names.begin(), names.end());
+}
+
+/// Recursive helper to snapshot a series of nodes.
+static env_node_ref_t copy_node_chain(const env_node_ref_t &node) {
+    if (node == nullptr) {
+        return nullptr;
+    }
+
+    auto next = copy_node_chain(node->next);
+    auto result = std::make_shared<env_node_t>(node->new_scope, next);
+    // Copy over variables.
+    // Note assigning env is a potentially big copy.
+    result->exportv = node->exportv;
+    result->env = node->env;
+    return result;
+}
+
+std::shared_ptr<environment_t> env_scoped_impl_t::snapshot() const {
+    auto ret = std::make_shared<env_scoped_impl_t>(copy_node_chain(locals_), globals_);
+    ret->perproc_data_ = this->perproc_data_;
+    return ret;
+}
+
+/// A mutable subclass of env_scoped_impl_t.
+class env_stack_impl_t final : public env_scoped_impl_t {
+   public:
+    using env_scoped_impl_t::env_scoped_impl_t;
+
+    /// Set a variable under the name \p key, using the given \p mode, setting its value to \p val.
+    int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val,
+            bool *out_needs_uvar_sync);
+
+    /// Remove a variable under the name \p key.
+    int remove(const wcstring &key, int var_mode, bool *out_needs_uvar_sync);
+
+    /// Push a new shadowing local scope.
+    void push_shadowing();
+
+    /// Push a new non-shadowing (inner) local scope.
+    void push_nonshadowing();
+
+    /// Pop the variable stack.
+    /// \return the popped node.
+    env_node_ref_t pop();
+
+    /// Mark that our export list needs to be regenerated.
+    void mark_changed_exported() { export_array_.reset(); }
+
+    /// \return a new impl representing global variables, with a single local scope.
+    static std::unique_ptr<env_stack_impl_t> create() {
+        static const auto s_global_node = std::make_shared<env_node_t>(false, nullptr);
+        auto local = std::make_shared<env_node_t>(false, nullptr);
+        return make_unique<env_stack_impl_t>(std::move(local), s_global_node);
+    }
+
+    virtual ~env_stack_impl_t() = default;
+
+   private:
+    // The scopes of caller functions, which are currently shadowed.
+    std::vector<env_node_ref_t> shadowed_locals_;
+
+    /// A restricted set of variable flags.
+    struct var_flags_t {
+        // if set, whether we should become a path variable; otherwise guess based on the name.
+        maybe_t<bool> pathvar{};
+
+        // if set, the new export value; otherwise inherit any existing export value.
+        maybe_t<bool> exports{};
+
+        // whether the variable is exported by some parent.
+        bool parent_exports{};
+    };
+
+    /// Find the first node in the chain starting at \p node which contains the given key \p key.
+    static env_node_ref_t find_in_chain(const env_node_ref_t &node, const wcstring &key) {
+        for (auto cursor = node; cursor; cursor = cursor->next) {
+            if (cursor->env.count(key)) {
+                return cursor;
+            }
+        }
+        return nullptr;
+    }
+
+    /// Remove a variable from the chain \p node, updating the export bit as necessary.
+    /// \return true if the variable was found and removed.
+    bool remove_from_chain(env_node_ref_t node, const wcstring &key) {
+        for (auto cursor = node; cursor; cursor = cursor->next) {
+            auto iter = cursor->env.find(key);
+            if (iter != cursor->env.end()) {
+                if (iter->second.exports()) {
+                    mark_changed_exported();
+                }
+                cursor->env.erase(iter);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// Try setting\p key as an electric or readonly variable.
+    /// \return an error code, or none() if not an electric or readonly variable.
+    /// \p val will not be modified upon a none() return.
+    maybe_t<int> try_set_electric(const wcstring &key, const query_t &query, wcstring_list_t &val);
+
+    /// Set a universal value.
+    void set_universal(const wcstring &key, wcstring_list_t val, const query_t &query);
+
+    /// Set a variable in a given node \p node.
+    void set_in_node(env_node_ref_t node, const wcstring &key, wcstring_list_t &&val,
+                     const var_flags_t &flags);
+
+    // Implement the default behavior of 'set' by finding the node for an unspecified scope.
+    env_node_ref_t resolve_unspecified_scope() {
+        for (auto cursor = locals_; cursor; cursor = cursor->next) {
+            if (cursor->new_scope) return cursor;
+        }
+        return globals_;
+    }
+
+    /// Get a pointer to an existing variable, or nullptr.
+    /// This is used for inheriting pathvar and export status.
+    const env_var_t *find_variable(const wcstring &key) const {
+        env_node_ref_t node = find_in_chain(locals_, key);
+        if (!node) node = find_in_chain(globals_, key);
+        if (node) {
+            auto iter = node->env.find(key);
+            assert(iter != node->env.end() && "Node should contain key");
+            return &iter->second;
+        }
+        return nullptr;
+    }
+};
+
+void env_stack_impl_t::push_nonshadowing() {
+    locals_ = std::make_shared<env_node_t>(false, locals_);
+}
+
+void env_stack_impl_t::push_shadowing() {
+    // Propagate local exported variables.
+    // TODO: this should take all local exported variables, not just those in the top scope.
+    auto node = std::make_shared<env_node_t>(true, nullptr);
+    for (const auto &var : locals_->env) {
+        if (var.second.exports()) {
+            node->env.insert(var);
+            node->exportv = true;
+        }
+    }
+    this->shadowed_locals_.push_back(std::move(locals_));
+    this->locals_ = std::move(node);
+}
+
+env_node_ref_t env_stack_impl_t::pop() {
+    bool changed_exports = locals_->exportv;
+    auto popped = std::move(locals_);
+    if (popped->next) {
+        // Pop the inner scope.
+        locals_ = popped->next;
+        changed_exports = changed_exports || local_scope_exports();
+    } else {
+        // Exhausted the inner scopes, put back a shadowing scope.
+        assert(!shadowed_locals_.empty() && "Attempt to pop last local scope");
+        locals_ = std::move(shadowed_locals_.back());
+        shadowed_locals_.pop_back();
+        changed_exports = changed_exports || local_scope_exports();
+    }
+    if (changed_exports) mark_changed_exported();
+    assert(locals_ && "Attempt to pop first local scope");
+    return popped;
+}
+
+/// Apply the pathvar behavior, splitting about colons.
+static wcstring_list_t colon_split(const wcstring_list_t &val) {
+    wcstring_list_t split_val;
+    split_val.reserve(val.size());
+    for (const wcstring &str : val) {
+        vec_append(split_val, split_string(str, PATH_ARRAY_SEP));
+    }
+    return split_val;
+}
+
+void env_stack_impl_t::set_in_node(env_node_ref_t node, const wcstring &key, wcstring_list_t &&val,
+                                   const var_flags_t &flags) {
+    env_var_t &var = node->env[key];
+
+    // Use an explicit exports, or inherit from the existing variable.
+    bool res_exports = flags.exports.has_value() ? *flags.exports : var.exports();
+
+    // Pathvar is inferred from the name. If set, split our entry about colons.
+    bool res_pathvar =
+        flags.pathvar.has_value() ? *flags.pathvar : variable_should_auto_pathvar(key);
+    if (res_pathvar) {
+        val = colon_split(val);
+    }
+
+    var = var.setting_vals(std::move(val))
+              .setting_exports(res_exports)
+              .setting_pathvar(res_pathvar)
+              .setting_read_only(is_read_only(key));
+
+    // Perhaps mark that this node contains an exported variable, or shadows an exported variable.
+    // If so regenerate the export list.
+    if (res_exports || flags.parent_exports) {
+        node->exportv = true;
+        mark_changed_exported();
+    }
+}
+
+maybe_t<int> env_stack_impl_t::try_set_electric(const wcstring &key, const query_t &query,
+                                                wcstring_list_t &val) {
+    bool readonly = is_read_only(key);
+    bool electric = is_electric(key);
+
+    if (!readonly && !electric) return none();
+
+    // If a variable is readonly or electric, it may only be set in the global scope.
+    if (query.has_scope && (readonly || electric)) {
+        if (query.local || query.universal) {
+            return ENV_SCOPE;
+        }
+    }
+
+    // If the variable is read-only, the user may not set it.
+    if (query.user && readonly) {
+        return ENV_PERM;
+    }
+
+    // Be picky about exporting. For now only PWD and SHLVL may be exported.
+    bool wants_export = (key == L"PWD" || key == L"SHLVL");
+    if (electric && query.has_export_unexport) {
+        if (wants_export ? query.unexports : query.exports) {
+            return ENV_SCOPE;
+        }
+    }
+
+    // Handle special electric variables.
+    if (key == L"umask") {
+        return set_umask(val);
+    } else if (key == L"PWD") {
+        assert(val.size() == 1 && "Should have exactly one element in PWD");
+        wcstring &pwd = val.front();
+        if (pwd != perproc_data().pwd) {
+            perproc_data().pwd = std::move(pwd);
+            mark_changed_exported();
+        }
+        return ENV_OK;
+    }
+
+    // Decide on the mode and set it in the global scope.
+    var_flags_t flags{};
+    flags.exports = wants_export;
+    flags.parent_exports = wants_export;
+    flags.pathvar = false;
+    set_in_node(globals_, key, std::move(val), flags);
+    return ENV_OK;
+}
+
 /// Set a universal variable, inheriting as applicable from the given old variable.
-static void env_set_internal_universal(const wcstring &key, wcstring_list_t val,
-                                       env_mode_flags_t input_var_mode, env_stack_t *stack) {
+void env_stack_impl_t::set_universal(const wcstring &key, wcstring_list_t val,
+                                     const query_t &query) {
     ASSERT_IS_MAIN_THREAD();
     if (!uvars()) return;
-    env_mode_flags_t var_mode = input_var_mode;
     auto oldvar = uvars()->get(key);
     // Resolve whether or not to export.
-    if ((var_mode & (ENV_EXPORT | ENV_UNEXPORT)) == 0) {
-        bool doexport = oldvar ? oldvar->exports() : false;
-        var_mode |= (doexport ? ENV_EXPORT : ENV_UNEXPORT);
+    bool exports = false;
+    if (query.has_export_unexport) {
+        exports = query.exports;
+    } else if (oldvar) {
+        exports = oldvar->exports();
     }
+
     // Resolve whether to be a path variable.
     // Here we fall back to the auto-pathvar behavior.
-    if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) {
-        bool dopathvar = oldvar ? oldvar->is_pathvar() : variable_should_auto_pathvar(key);
-        var_mode |= (dopathvar ? ENV_PATHVAR : ENV_UNPATHVAR);
+    bool pathvar = false;
+    if (query.has_pathvar_unpathvar) {
+        pathvar = query.pathvar;
+    } else if (oldvar) {
+        pathvar = oldvar->is_pathvar();
+    } else {
+        pathvar = variable_should_auto_pathvar(key);
     }
 
     // Split about ':' if it's a path variable.
-    if (var_mode & ENV_PATHVAR) {
+    if (pathvar) {
         wcstring_list_t split_val;
         for (const wcstring &str : val) {
             vec_append(split_val, split_string(str, PATH_ARRAY_SEP));
@@ -806,341 +1015,212 @@ static void env_set_internal_universal(const wcstring &key, wcstring_list_t val,
 
     // Construct and set the new variable.
     env_var_t::env_var_flags_t varflags = 0;
-    if (var_mode & ENV_EXPORT) varflags |= env_var_t::flag_export;
-    if (var_mode & ENV_PATHVAR) varflags |= env_var_t::flag_pathvar;
+    if (exports) varflags |= env_var_t::flag_export;
+    if (pathvar) varflags |= env_var_t::flag_pathvar;
     env_var_t new_var{val, varflags};
 
     uvars()->set(key, new_var);
-    env_universal_barrier();
     if (new_var.exports() || (oldvar && oldvar->exports())) {
-        stack->mark_changed_exported();
+        mark_changed_exported();
     }
 }
 
-int env_stack_t::set_pwd(wcstring_list_t pwds) {
-    // PWD cannot be set by the user, only by builtin_cd.
-    // So we require that we have exactly one element.
-    assert(pwds.size() == 1 && "Should have exactly one element in PWD");
-    wcstring &pwd = pwds.front();
-    if (pwd != perproc_data().pwd) {
-        perproc_data().pwd = std::move(pwd);
-        vars_stack().mark_changed_exported();
+int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val,
+                          bool *out_needs_uvar_sync) {
+    const query_t query(mode);
+    // Handle electric and read-only variables.
+    if (auto ret = try_set_electric(key, query, val)) {
+        return *ret;
+    }
+
+    // Resolve as much of our flags as we can. Note these contain maybes, and we may defer the final
+    // decision until the set_in_node call. Also note that we only inherit pathvar, not export. For
+    // example, if you have a global exported variable, a local variable with the same name will not
+    // automatically be exported. But if you have a global pathvar, a local variable with the same
+    // name will be a pathvar. This is historical.
+    var_flags_t flags{};
+    if (const env_var_t *existing = find_variable(key)) {
+        flags.pathvar = existing->is_pathvar();
+        flags.parent_exports = existing->exports();
+    }
+    if (query.has_export_unexport) {
+        flags.exports = query.exports;
+    }
+    if (query.has_pathvar_unpathvar) {
+        flags.pathvar = query.pathvar;
+    }
+
+    if (query.has_scope) {
+        // The user requested a particular scope.
+        if (query.universal) {
+            set_universal(key, std::move(val), query);
+            *out_needs_uvar_sync = true;
+        } else if (query.global) {
+            set_in_node(globals_, key, std::move(val), flags);
+        } else if (query.local) {
+            set_in_node(locals_, key, std::move(val), flags);
+        } else {
+            DIE("Unknown scope");
+        }
+    } else if (uvars() && uvars()->get(key)) {
+        // Modifying an existing universal variable.
+        set_universal(key, std::move(val), query);
+        *out_needs_uvar_sync = true;
+    } else {
+        // The user did not request any scope.
+        // Find the scope.
+        env_node_ref_t node = find_in_chain(locals_, key);
+        if (!node) node = find_in_chain(globals_, key);
+        if (!node) node = resolve_unspecified_scope();
+        assert(node && "Should always resolve some scope");
+        set_in_node(node, key, std::move(val), flags);
     }
     return ENV_OK;
 }
 
-void env_stack_t::set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode,
-                                      wcstring_list_t val) {
-    scoped_lock locker(env_lock);
-    bool has_changed_old = vars_stack().has_changed_exported();
-    bool done = false;
+int env_stack_impl_t::remove(const wcstring &key, int mode, bool *out_needs_uvar_sync) {
+    const query_t query(mode);
 
-    // Determine the node.
-    bool has_changed_new = false;
-    env_node_ref_t preexisting_node = get_node(key);
-    maybe_t<env_var_t::env_var_flags_t> preexisting_flags{};
-    if (preexisting_node != nullptr) {
-        var_table_t::const_iterator result = preexisting_node->env.find(key);
-        assert(result != preexisting_node->env.end());
-        preexisting_flags = result->second.get_flags();
-        if (*preexisting_flags & env_var_t::flag_export) {
-            has_changed_new = true;
-        }
+    // Users can't remove read-only keys.
+    if (query.user && is_read_only(key)) {
+        return ENV_SCOPE;
     }
 
-    env_node_ref_t node = nullptr;
-    if (var_mode & ENV_GLOBAL) {
-        node = vars_stack().global;
-    } else if (var_mode & ENV_LOCAL) {
-        node = vars_stack().top;
-    } else if (preexisting_node != nullptr) {
-        node = std::move(preexisting_node);
-        if ((var_mode & (ENV_EXPORT | ENV_UNEXPORT)) == 0) {
-            // Use existing entry's exportv status.
-            if (preexisting_flags && (*preexisting_flags & env_var_t::flag_export)) {
-                var_mode |= ENV_EXPORT;
-            }
+    // Helper to remove from uvars.
+    auto remove_from_uvars = [&] {
+        if (!uvars()) return false;
+        auto flags = uvars()->get_flags(key);
+        if (!flags) return false;
+        if (*flags & env_var_t::flag_export) {
+            this->mark_changed_exported();
         }
+        *out_needs_uvar_sync = true;
+        return uvars()->remove(key);
+    };
+
+    if (query.has_scope) {
+        // The user requested erasing from a particular scope.
+        if (query.universal) {
+            return remove_from_uvars() ? ENV_OK : ENV_NOT_FOUND;
+        } else if (query.global) {
+            return remove_from_chain(globals_, key) ? ENV_OK : ENV_NOT_FOUND;
+        } else if (query.local) {
+            return remove_from_chain(locals_, key) ? ENV_OK : ENV_NOT_FOUND;
+        } else {
+            DIE("Unknown scope");
+        }
+    } else if (remove_from_chain(locals_, key)) {
+        return ENV_OK;
+    } else if (remove_from_chain(globals_, key)) {
+        return ENV_OK;
+    } else if (remove_from_uvars()) {
+        return ENV_OK;
     } else {
-        if (uvars() && uvars()->get(key)) {
-            // Modifying an existing universal variable.
-            env_set_internal_universal(key, std::move(val), var_mode, this);
-            done = true;
-        } else {
-            // New variable with unspecified scope
-            node = vars_stack().resolve_unspecified_scope();
-        }
-    }
-
-    if (!done) {
-        // Resolve if we should mark ourselves as a path variable or not.
-        // If there's an existing variable, use its path flag; otherwise infer it.
-        if ((var_mode & (ENV_PATHVAR | ENV_UNPATHVAR)) == 0) {
-            bool should_pathvar = false;
-            if (preexisting_flags) {
-                should_pathvar = *preexisting_flags & env_var_t::flag_pathvar;
-            } else {
-                should_pathvar = variable_should_auto_pathvar(key);
-            }
-            var_mode |= should_pathvar ? ENV_PATHVAR : ENV_UNPATHVAR;
-        }
-
-        // Split about ':' if it's a path variable.
-        if (var_mode & ENV_PATHVAR) {
-            wcstring_list_t split_val;
-            for (const wcstring &str : val) {
-                vec_append(split_val, split_string(str, PATH_ARRAY_SEP));
-            }
-            val = std::move(split_val);
-        }
-
-        // Set the entry in the node. Note that operator[] accesses the existing entry, or
-        // creates a new one.
-        env_var_t &var = node->env[key];
-        if (var.exports()) {
-            // This variable already existed, and was exported.
-            has_changed_new = true;
-        }
-
-        var = var.setting_vals(std::move(val))
-                  .setting_exports(var_mode & ENV_EXPORT)
-                  .setting_pathvar(var_mode & ENV_PATHVAR)
-                  .setting_read_only(is_read_only(key));
-
-        if (var_mode & ENV_EXPORT) {
-            // The new variable is exported.
-            node->exportv = true;
-            has_changed_new = true;
-        } else {
-            // Set the node's exported when it changes something about exports
-            // (also when it redefines a variable to not be exported).
-            node->exportv = has_changed_old != has_changed_new;
-        }
-
-        if (has_changed_old || has_changed_new) vars_stack().mark_changed_exported();
+        return ENV_NOT_FOUND;
     }
 }
 
-/// Set the value of the environment variable whose name matches key to val.
-///
-/// \param key The key
-/// \param val The value to set.
-/// \param var_mode The type of the variable. Can be any combination of ENV_GLOBAL, ENV_LOCAL,
-/// ENV_EXPORT and ENV_USER. If mode is ENV_DEFAULT, the current variable space is searched and the
-/// current mode is used. If no current variable with the same name is found, ENV_LOCAL is assumed.
-///
-/// Returns:
-///
-/// * ENV_OK on success.
-/// * ENV_PERM, can only be returned when setting as a user, e.g. ENV_USER is set. This means that
-/// the user tried to change a read-only variable.
-/// * ENV_SCOPE, the variable cannot be set in the given scope. This applies to readonly/electric
-/// variables set from the local or universal scopes, or set as exported.
-/// * ENV_INVALID, the variable value was invalid. This applies only to special variables.
-int env_stack_t::set_internal(const wcstring &key, env_mode_flags_t input_var_mode,
-                              wcstring_list_t val) {
+bool env_stack_t::universal_barrier() {
     ASSERT_IS_MAIN_THREAD();
-    env_mode_flags_t var_mode = input_var_mode;
+    if (!uvars()) return false;
 
-    if (val.size() == 1 && (key == L"PWD" || key == L"HOME")) {
-        // Canonicalize our path; if it changes, recurse and try again.
-        wcstring val_canonical = val.front();
-        path_make_canonical(val_canonical);
-        if (val.front() != val_canonical) {
-            return set_internal(key, var_mode, {val_canonical});
-        }
+    callback_data_list_t callbacks;
+    bool changed = uvars()->sync(callbacks);
+    if (changed) {
+        universal_notifier_t::default_notifier().post_notification();
     }
 
-    // Yucky set of random checks.
-    if ((var_mode & ENV_LOCAL || var_mode & ENV_UNIVERSAL) &&
-        (is_read_only(key) || is_electric(key))) {
-        return ENV_SCOPE;
-    }
-    if ((var_mode & ENV_EXPORT) && is_electric(key) && key != L"PWD") {
-        return ENV_SCOPE;
-    }
-    if ((var_mode & ENV_USER) && is_read_only(key)) {
-        return ENV_PERM;
-    }
-
-    // Handle special case electric variables.
-    if (key == L"umask") {  // set new umask
-        scoped_lock locker(env_lock);
-        return set_umask(val);
-    } else if (key == L"PWD") {
-        scoped_lock locker(env_lock);
-        return this->set_pwd(std::move(val));
-    }
-
-    if (var_mode & ENV_UNIVERSAL) {
-        // Set this as a universal variable.
-        if (uvars()) {
-            env_set_internal_universal(key, std::move(val), var_mode, this);
-        }
-    } else {
-        // Unspecial variable, set it in the right scope.
-        set_scoped_internal(key, var_mode, std::move(val));
-    }
-
-    event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
-    env_dispatch_var_change(key, *this);
-    return ENV_OK;
+    env_universal_callbacks(this, callbacks);
+    return changed || !callbacks.empty();
 }
 
-/// Sets the variable with the specified name to the given values.
+/// If they don't already exist initialize the `COLUMNS` and `LINES` env vars to reasonable
+/// defaults. They will be updated later by the `get_current_winsize()` function if they need to be
+/// adjusted.
+void env_stack_t::set_termsize() {
+    auto &vars = env_stack_t::globals();
+    auto cols = get(L"COLUMNS");
+    if (cols.missing_or_empty()) vars.set_one(L"COLUMNS", ENV_GLOBAL, DFLT_TERM_COL_STR);
+
+    auto rows = get(L"LINES");
+    if (rows.missing_or_empty()) vars.set_one(L"LINES", ENV_GLOBAL, DFLT_TERM_ROW_STR);
+}
+
+/// Update the PWD variable directory from the result of getcwd().
+void env_stack_t::set_pwd_from_getcwd() {
+    wcstring cwd = wgetcwd();
+    if (cwd.empty()) {
+        debug(0,
+              _(L"Could not determine current working directory. Is your locale set correctly?"));
+        return;
+    }
+    set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, cwd);
+}
+
+env_stack_t::env_stack_t(std::unique_ptr<env_stack_impl_t> impl) : impl_(std::move(impl)) {}
+
+acquired_lock<env_stack_impl_t> env_stack_t::acquire_impl() {
+    return acquired_lock<env_stack_impl_t>::from_global(env_lock, impl_.get());
+}
+
+acquired_lock<const env_stack_impl_t> env_stack_t::acquire_impl() const {
+    return acquired_lock<const env_stack_impl_t>::from_global(env_lock, impl_.get());
+}
+
+maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode) const {
+    return acquire_impl()->get(key, mode);
+}
+
+wcstring_list_t env_stack_t::get_names(int flags) const { return acquire_impl()->get_names(flags); }
+
 int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals) {
-    return set_internal(key, mode, std::move(vals));
+    // Historical behavior.
+    if (vals.size() == 1 && (key == L"PWD" || key == L"HOME")) {
+        path_make_canonical(vals.front());
+    }
+
+    bool needs_uvar_sync = false;
+    auto ret = acquire_impl()->set(key, mode, std::move(vals), &needs_uvar_sync);
+    if (ret == ENV_OK) {
+        // Important to not hold the lock here.
+        env_dispatch_var_change(key, *this);
+        event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
+    }
+    if (needs_uvar_sync) {
+        universal_barrier();
+    }
+    return ret;
 }
 
-/// Sets the variable with the specified name to a single value.
 int env_stack_t::set_one(const wcstring &key, env_mode_flags_t mode, wcstring val) {
     wcstring_list_t vals;
     vals.push_back(std::move(val));
-    return set_internal(key, mode, std::move(vals));
+    return set(key, mode, std::move(vals));
 }
 
-/// Sets the variable with the specified name without any (i.e., zero) values.
 int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode) {
-    return set_internal(key, mode, {});
+    return set(key, mode, {});
 }
 
-/// Attempt to remove/free the specified key/value pair from the specified map.
-///
-/// \return whether the variable was erased.
-bool env_stack_t::try_remove(const env_node_ref_t &start, const wcstring &key, int var_mode) {
-    auto &vars = vars_stack();
-    for (auto n = start; n != nullptr; n = vars.next_scope_to_search(n)) {
-        if ((var_mode & ENV_LOCAL) && n == vars.global) {
-            return false;
-        }
-        auto result = n->env.find(key);
-        if (result != n->env.end()) {
-            if (result->second.exports()) {
-                mark_changed_exported();
-            }
-            n->env.erase(result);
-            return true;
-        }
+int env_stack_t::remove(const wcstring &key, int mode) {
+    bool needs_uvar_sync = false;
+    int ret = acquire_impl()->remove(key, mode, &needs_uvar_sync);
+    if (ret == ENV_OK) {
+        // Important to not hold the lock here.
+        env_dispatch_var_change(key, *this);
+        event_fire(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
     }
-    return false;
+    if (needs_uvar_sync) {
+        universal_barrier();
+    }
+    return ret;
 }
 
-int env_stack_t::remove(const wcstring &key, int var_mode) {
-    ASSERT_IS_MAIN_THREAD();
-    int erased = 0;
-
-    if ((var_mode & ENV_USER) && is_read_only(key)) {
-        return ENV_SCOPE;
-    }
-
-    if (!(var_mode & ENV_UNIVERSAL)) {
-        auto first_node = (var_mode & ENV_GLOBAL) ? vars_stack().global : vars_stack().top;
-        if (try_remove(first_node, key, var_mode)) {
-            event_fire(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
-            erased = 1;
-        }
-    }
-
-    if (!erased && !(var_mode & ENV_GLOBAL) && !(var_mode & ENV_LOCAL)) {
-        bool is_exported = false;
-        if (uvars()) {
-            if (auto old_flags = uvars()->get_flags(key)) {
-                is_exported = *old_flags & env_var_t::flag_export;
-            }
-            erased = uvars()->remove(key);
-        }
-        if (erased) {
-            env_universal_barrier();
-            event_fire(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
-        }
-
-        if (is_exported) vars_stack().mark_changed_exported();
-    }
-
-    env_dispatch_var_change(key, *this);
-
-    return erased ? ENV_OK : ENV_NOT_FOUND;
+std::shared_ptr<const null_terminated_array_t<char>> env_stack_t::export_arr() {
+    return acquire_impl()->export_array();
 }
 
-void env_stack_t::push(bool new_scope) { vars_stack().push(new_scope); }
-
-void env_stack_t::pop() {
-    auto &vars = vars_stack();
-    auto old_node = vars.pop();
-
-    // Maybe exported variables have changed.
-    if (old_node->exportv) {
-        // This node exported or unexported a variable.
-        vars.mark_changed_exported();
-    } else if (old_node->new_scope && vars.local_scope_exports()) {
-        // This node was a local scope, so it shadowed exports from its parent.
-        vars.mark_changed_exported();
-    }
-
-    // TODO: we would like to coalesce locale / curses changes, so that we only re-initialize once.
-    for (const auto &kv : old_node->env) {
-        env_dispatch_var_change(kv.first, *this);
-    }
-}
-
-wcstring_list_t env_scoped_t::get_names(int flags) const {
-    scoped_lock locker(env_lock);
-
-    wcstring_list_t result;
-    std::set<wcstring> names;
-    int show_local = flags & ENV_LOCAL;
-    int show_global = flags & ENV_GLOBAL;
-    int show_universal = flags & ENV_UNIVERSAL;
-
-    const bool show_exported = (flags & ENV_EXPORT) || !(flags & ENV_UNEXPORT);
-    const bool show_unexported = (flags & ENV_UNEXPORT) || !(flags & ENV_EXPORT);
-
-    // Helper to add the names of variables from \p envs to names, respecting show_exported and
-    // show_unexported.
-    auto add_keys = [&](const var_table_t &envs) {
-        for (const auto &kv : envs) {
-            const env_var_t &var = kv.second;
-            if (var.exports() ? show_exported : show_unexported) {
-                names.insert(kv.first);
-            }
-        }
-    };
-
-    if (!show_local && !show_global && !show_universal) {
-        show_local = show_universal = show_global = 1;
-    }
-
-    const auto &vars = vars_stack();
-    if (show_local) {
-        auto cursor = vars.top;
-        while (cursor && cursor != vars.global) {
-            add_keys(cursor->env);
-            cursor = vars.next_scope_to_search(cursor);
-        }
-    }
-
-    if (show_global) {
-        add_keys(vars.global->env);
-        add_electric_names(&result, show_exported, show_unexported);
-    }
-
-    if (show_universal && uvars()) {
-        const wcstring_list_t uni_list = uvars()->get_names(show_exported, show_unexported);
-        names.insert(uni_list.begin(), uni_list.end());
-    }
-
-    result.insert(result.end(), names.begin(), names.end());
-    return result;
-}
-
-const char *const *env_stack_t::export_arr() {
-    ASSERT_IS_MAIN_THREAD();
-    ASSERT_IS_NOT_FORKED_CHILD();
-    const wcstring &pwd = perproc_data().pwd;
-    vars_stack().update_export_array_if_necessary(pwd);
-    assert(vars_stack().export_array && "Should have export array");
-    return vars_stack().export_array->get();
-}
+std::shared_ptr<environment_t> env_stack_t::snapshot() const { return acquire_impl()->snapshot(); }
 
 void env_stack_t::set_argv(const wchar_t *const *argv) {
     if (argv && *argv) {
@@ -1154,24 +1234,36 @@ void env_stack_t::set_argv(const wchar_t *const *argv) {
     }
 }
 
-env_stack_t::~env_stack_t() = default;
-env_stack_t::env_stack_t(env_stack_t &&) = default;
+void env_stack_t::push(bool new_scope) {
+    auto impl = acquire_impl();
+    if (new_scope) {
+        impl->push_shadowing();
+    } else {
+        impl->push_nonshadowing();
+    }
+}
 
-env_stack_t env_stack_t::make_principal() {
-    const env_stack_t &gl = env_stack_t::globals();
-    std::unique_ptr<var_stack_t> dup_stack = make_unique<var_stack_t>(gl.vars_stack().clone());
-    return env_stack_t{std::move(dup_stack)};
+void env_stack_t::pop() {
+    auto popped = acquire_impl()->pop();
+    // TODO: we would like to coalesce locale / curses changes, so that we only re-initialize once.
+    for (const auto &kv : popped->env) {
+        env_dispatch_var_change(kv.first, *this);
+    }
+}
+
+void env_stack_t::mark_changed_exported() { acquire_impl()->mark_changed_exported(); }
+
+env_stack_t &env_stack_t::globals() {
+    static env_stack_t s_globals(env_stack_impl_t::create());
+    return s_globals;
 }
 
 env_stack_t &env_stack_t::principal() {
-    static env_stack_t s_principal = make_principal();
+    static env_stack_t s_principal(env_stack_impl_t::create());
     return s_principal;
 }
 
-env_stack_t &env_stack_t::globals() {
-    static env_stack_t s_global(var_stack_t::create());
-    return s_global;
-}
+env_stack_t::~env_stack_t() = default;
 
 #if defined(__APPLE__) || defined(__CYGWIN__)
 static int check_runtime_path(const char *path) {
diff --git a/src/env.h b/src/env.h
index 9ea5a30ff..1e973b244 100644
--- a/src/env.h
+++ b/src/env.h
@@ -193,78 +193,30 @@ class null_environment_t : public environment_t {
     wcstring_list_t get_names(int flags) const override;
 };
 
-/// An environment stack of scopes.
-/// The base implementation provides read-only access.
-struct var_stack_t;
-class env_node_t;
-class env_scoped_t : public environment_t {
-   private:
-    std::unique_ptr<var_stack_t> vars_;
-
-    /// A struct wrapping up parser-local variables. These are conceptually variables that differ in
-    /// different fish internal processes.
-    struct perproc_data_t {
-        wcstring pwd;
-    };
-
-    /// The per-process data.
-    perproc_data_t perproc_data_{};
-
-   protected:
-    var_stack_t &vars_stack();
-    const var_stack_t &vars_stack() const;
-
-    explicit env_scoped_t(std::unique_ptr<var_stack_t> vars_);
-    env_scoped_t();
-    env_scoped_t(env_scoped_t &&);
-
-    /// Read-write access to the perproc data.
-    perproc_data_t &perproc_data() { return perproc_data_; }
-
-   public:
-    /// Read-only access to the perproc data.
-    const perproc_data_t &perproc_data() const { return perproc_data_; }
-
-    /// Gets the variable with the specified name, or none() if it does not exist.
-    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
-
-    /// Returns all variable names.
-    wcstring_list_t get_names(int flags) const override;
-
-    /// Snapshot this environment. This means returning a read-only copy. Local variables are copied
-    /// but globals are shared (i.e. changes to global will be visible to this snapshot). This
-    /// returns a shared_ptr for convenience, since the most common reason to snapshot is because
-    /// you want to read from another thread.
-    std::shared_ptr<environment_t> snapshot() const;
-
-    ~env_scoped_t() override;
-};
-
-/// A mutable env_scoped_t, that allows scopes to be pushed and popped.
-class env_stack_t final : public env_scoped_t {
+/// A mutable environment which allows scopes to be pushed and popped.
+class env_stack_impl_t;
+class env_stack_t final : public environment_t {
     friend class parser_t;
 
-    int set_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
+    /// The implementation. Do not access this directly.
+    const std::unique_ptr<env_stack_impl_t> impl_;
 
-    bool try_remove(const std::shared_ptr<env_node_t> &n, const wcstring &key, int var_mode);
-    std::shared_ptr<env_node_t> get_node(const wcstring &key);
+    /// All environment stacks are guarded by a global lock.
+    acquired_lock<env_stack_impl_t> acquire_impl();
+    acquired_lock<const env_stack_impl_t> acquire_impl() const;
 
-    maybe_t<env_var_t> get_perproc(const wcstring &key) const;
+    explicit env_stack_t(std::unique_ptr<env_stack_impl_t> impl);
 
-    static env_stack_t make_principal();
-
-    using env_scoped_t::env_scoped_t;
+   public:
     ~env_stack_t() override;
     env_stack_t(env_stack_t &&);
 
-    /// Given that we have determined that \p key is an unspecial key, set the variable in the right
-    /// scope in the variable stack.
-    void set_scoped_internal(const wcstring &key, env_mode_flags_t var_mode, wcstring_list_t val);
+    /// Implementation of environment_t.
+    maybe_t<env_var_t> get(const wcstring &key, env_mode_flags_t mode = ENV_DEFAULT) const override;
 
-    /// Set the pwd.
-    int set_pwd(wcstring_list_t pwds);
+    /// Implementation of environment_t.
+    wcstring_list_t get_names(int flags) const override;
 
-   public:
     /// Sets the variable with the specified name to the given values.
     int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
 
@@ -297,8 +249,14 @@ class env_stack_t final : public env_scoped_t {
     /// \return true if something changed, false otherwise.
     bool universal_barrier();
 
-    /// Returns an array containing all exported variables in a format suitable for execv
-    const char *const *export_arr();
+    /// Returns an array containing all exported variables in a format suitable for execv.
+    std::shared_ptr<const null_terminated_array_t<char>> export_arr();
+
+    /// Snapshot this environment. This means returning a read-only copy. Local variables are copied
+    /// but globals are shared (i.e. changes to global will be visible to this snapshot). This
+    /// returns a shared_ptr for convenience, since the most common reason to snapshot is because
+    /// you want to read from another thread.
+    std::shared_ptr<environment_t> snapshot() const;
 
     /// Update the termsize variable.
     void set_termsize();
diff --git a/src/exec.cpp b/src/exec.cpp
index 3ab657338..25d3ed8d4 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -169,7 +169,8 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
     null_terminated_array_t<char> argv_array;
     convert_wide_array_to_narrow(p->get_argv_array(), &argv_array);
 
-    const char *const *envv = vars.export_arr();
+    auto export_vars = vars.export_arr();
+    const char *const *envv = export_vars->get();
     char *actual_cmd = wcs2str(p->actual_cmd);
 
     // Ensure the terminal modes are what they were before we changed them.
@@ -693,8 +694,10 @@ static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t
     // (/dev/tty?).
     make_fd_blocking(STDIN_FILENO);
 
+    auto export_arr = vars.export_arr();
+    ;
     const char *const *argv = argv_array.get();
-    const char *const *envv = vars.export_arr();
+    const char *const *envv = export_arr->get();
 
     std::string actual_cmd_str = wcs2string(p->actual_cmd);
     const char *actual_cmd = actual_cmd_str.c_str();

From 1e4ebfa470abb0eefefa708c932ba30130650562 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 11 May 2019 19:09:22 -0700
Subject: [PATCH 0525/1732] Make electric variables a real thing

Use an actual struct to describe electric variables and what is special
about each one.
---
 src/env.cpp | 121 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 76 insertions(+), 45 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 12861a32f..da3af3b35 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -63,28 +63,61 @@ static env_universal_t *uvars() { return s_universal_variables; }
 
 bool env_universal_barrier() { return env_stack_t::principal().universal_barrier(); }
 
-// A typedef for a set of constant strings. Note our sets are typically on the order of 6 elements,
-// so we don't bother to sort them.
-using string_set_t = const wchar_t *const[];
+struct electric_var_t {
+    enum {
+        freadonly = 1 << 0,  // May not be modified by the user.
+        fcomputed = 1 << 1,  // Value is dynamically computed.
+        fexports = 1 << 2,   // Exported to child processes.
+    };
+    const wchar_t *name;
+    uint32_t flags;
+
+    bool readonly() const { return flags & freadonly; }
+
+    bool computed() const { return flags & fcomputed; }
+
+    bool exports() const { return flags & fexports; }
+
+    static const electric_var_t *for_name(const wcstring &name);
+};
+
+static const electric_var_t electric_variables[] = {
+    {L"PWD", electric_var_t::freadonly | electric_var_t::fcomputed | electric_var_t::fexports},
+    {L"SHLVL", electric_var_t::freadonly | electric_var_t::fexports},
+    {L"history", electric_var_t::freadonly | electric_var_t::fcomputed},
+    {L"pipestatus", electric_var_t::freadonly | electric_var_t::fcomputed},
+    {L"status", electric_var_t::freadonly | electric_var_t::fcomputed},
+    {L"version", electric_var_t::freadonly},
+    {L"FISH_VERSION", electric_var_t::freadonly},
+    {L"fish_pid", electric_var_t::freadonly},
+    {L"hostname", electric_var_t::freadonly},
+    {L"_", electric_var_t::freadonly},
+    {L"fish_private_mode", electric_var_t::freadonly},
+    {L"umask", electric_var_t::fcomputed},
+};
+
+const electric_var_t *electric_var_t::for_name(const wcstring &name) {
+    for (const auto &var : electric_variables) {
+        if (name == var.name) {
+            return &var;
+        }
+    }
+    return nullptr;
+}
 
 /// Check if a variable may not be set using the set command.
 static bool is_read_only(const wcstring &key) {
-    static const string_set_t env_read_only = {
-        L"PWD",          L"SHLVL",    L"history",  L"pipestatus", L"status",           L"version",
-        L"FISH_VERSION", L"fish_pid", L"hostname", L"_",          L"fish_private_mode"};
-    return contains(env_read_only, key) || (in_private_mode() && key == L"fish_history");
+    if (const auto *ev = electric_var_t::for_name(key)) {
+        return ev->readonly();
+    }
+    // Hack.
+    return in_private_mode() && key == L"fish_history";
 }
 
 /// Return true if a variable should become a path variable by default. See #436.
 static bool variable_should_auto_pathvar(const wcstring &name) {
     return string_suffixes_string(L"PATH", name);
 }
-
-/// Table of variables whose value is dynamically calculated, such as umask, status, etc.
-static const string_set_t env_electric = {L"history", L"pipestatus", L"status", L"umask", L"PWD"};
-
-static bool is_electric(const wcstring &key) { return contains(env_electric, key); }
-
 // This is a big dorky lock we take around everything that might read from or modify an env_node_t.
 // Fine grained locking is annoying here because env_nodes may be shared between env_stacks, so each
 // node would need its own lock.
@@ -230,13 +263,15 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
         size_t eql = key_and_val.find(L'=');
         if (eql == wcstring::npos) {
             // No equal-sign found so treat it as a defined var that has no value(s).
-            if (is_read_only(key_and_val) || is_electric(key_and_val)) continue;
-            vars.set_empty(key_and_val, ENV_EXPORT | ENV_GLOBAL);
+            if (!electric_var_t::for_name(key_and_val)) {
+                vars.set_empty(key_and_val, ENV_EXPORT | ENV_GLOBAL);
+            }
         } else {
             key.assign(key_and_val, 0, eql);
             val.assign(key_and_val, eql + 1, wcstring::npos);
-            if (is_read_only(key) || is_electric(key)) continue;
-            vars.set(key, ENV_EXPORT | ENV_GLOBAL, {val});
+            if (!electric_var_t::for_name(key)) {
+                vars.set(key, ENV_EXPORT | ENV_GLOBAL, {val});
+            }
         }
     }
 
@@ -513,7 +548,7 @@ class env_scoped_impl_t : public environment_t {
     // populated. A maybe_t<maybe_t<...>> is a bridge too far.
     // These may populate result with none() if a variable is present which does not match the
     // query.
-    maybe_t<env_var_t> try_get_electric(const wcstring &key, const query_t &query) const;
+    maybe_t<env_var_t> try_get_computed(const wcstring &key, const query_t &query) const;
     maybe_t<env_var_t> try_get_local(const wcstring &key, const query_t &query) const;
     maybe_t<env_var_t> try_get_global(const wcstring &key, const query_t &query) const;
     maybe_t<env_var_t> try_get_universal(const wcstring &key, const query_t &query) const;
@@ -566,7 +601,7 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_e
         }
     }
 
-    // Dorky way to add the single exported electric variable.
+    // Dorky way to add our single exported computed variable.
     vals[L"PWD"] = env_var_t(L"PWD", perproc_data().pwd);
 
     // Construct the export list: a list of strings of the form key=value.
@@ -589,10 +624,10 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::export_a
     return export_array_;
 }
 
-maybe_t<env_var_t> env_scoped_impl_t::try_get_electric(const wcstring &key,
+maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key,
                                                        const query_t &query) const {
-    // Electric variables are read only and only global.
-    if (!is_electric(key)) {
+    const electric_var_t *ev = electric_var_t::for_name(key);
+    if (!(ev && ev->computed())) {
         return none();
     }
     if (key == L"PWD") {
@@ -631,7 +666,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_electric(const wcstring &key,
         return env_var_t(L"umask", format_string(L"0%0.3o", res));
     }
     // We should never get here unless the electric var list is out of sync with the above code.
-    DIE("unrecognized electric var name");
+    DIE("unrecognized computed var name");
 }
 
 maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key,
@@ -669,7 +704,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key,
 maybe_t<env_var_t> env_scoped_impl_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const query_t query(mode);
 
-    maybe_t<env_var_t> result = try_get_electric(key, query);
+    maybe_t<env_var_t> result = try_get_computed(key, query);
     if (!result && query.local) {
         result = try_get_local(key, query);
     }
@@ -709,10 +744,9 @@ wcstring_list_t env_scoped_impl_t::get_names(int flags) const {
     if (query.global) {
         add_keys(globals_->env);
         // Add electrics.
-        for (const wchar_t *var : env_electric) {
-            bool is_pwd = !wcscmp(var, L"PWD");
-            if (is_pwd ? query.exports : query.unexports) {
-                names.insert(var);
+        for (const auto &ev : electric_variables) {
+            if (ev.exports() ? query.exports : query.unexports) {
+                names.insert(ev.name);
             }
         }
     }
@@ -932,32 +966,29 @@ void env_stack_impl_t::set_in_node(env_node_ref_t node, const wcstring &key, wcs
 
 maybe_t<int> env_stack_impl_t::try_set_electric(const wcstring &key, const query_t &query,
                                                 wcstring_list_t &val) {
-    bool readonly = is_read_only(key);
-    bool electric = is_electric(key);
+    const electric_var_t *ev = electric_var_t::for_name(key);
+    if (!ev) {
+        return none();
+    }
 
-    if (!readonly && !electric) return none();
-
-    // If a variable is readonly or electric, it may only be set in the global scope.
-    if (query.has_scope && (readonly || electric)) {
-        if (query.local || query.universal) {
-            return ENV_SCOPE;
-        }
+    // If a variable is electric, it may only be set in the global scope.
+    if (query.has_scope && !query.global) {
+        return ENV_SCOPE;
     }
 
     // If the variable is read-only, the user may not set it.
-    if (query.user && readonly) {
+    if (query.user && ev->readonly()) {
         return ENV_PERM;
     }
 
-    // Be picky about exporting. For now only PWD and SHLVL may be exported.
-    bool wants_export = (key == L"PWD" || key == L"SHLVL");
-    if (electric && query.has_export_unexport) {
-        if (wants_export ? query.unexports : query.exports) {
+    // Be picky about exporting.
+    if (query.has_export_unexport) {
+        if (ev->exports() ? query.unexports : query.exports) {
             return ENV_SCOPE;
         }
     }
 
-    // Handle special electric variables.
+    // Handle computed mutable electric variables.
     if (key == L"umask") {
         return set_umask(val);
     } else if (key == L"PWD") {
@@ -972,8 +1003,8 @@ maybe_t<int> env_stack_impl_t::try_set_electric(const wcstring &key, const query
 
     // Decide on the mode and set it in the global scope.
     var_flags_t flags{};
-    flags.exports = wants_export;
-    flags.parent_exports = wants_export;
+    flags.exports = ev->exports();
+    flags.parent_exports = ev->exports();
     flags.pathvar = false;
     set_in_node(globals_, key, std::move(val), flags);
     return ENV_OK;

From 8031fa3bdb8a856ff1f90996386f285099f743c1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 12:33:13 -0700
Subject: [PATCH 0526/1732] Stop using atomic types for non-primitives

atomic<winsize> requires linking libatomic on some platforms which is
annoying. Remove the one use.

Fixes #5865
---
 src/common.cpp | 40 +++++++++++++++++++++++++---------------
 src/common.h   |  1 +
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 29a6a17fc..d1f8662c1 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -99,7 +99,7 @@ static relaxed_atomic_t<pid_t> initial_fg_process_group{-1};
 /// This struct maintains the current state of the terminal size. It is updated on demand after
 /// receiving a SIGWINCH. Use common_get_width()/common_get_height() to read it lazily.
 static constexpr struct winsize k_invalid_termsize = {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX};
-static relaxed_atomic_t<struct winsize> s_termsize(k_invalid_termsize);
+static owning_lock<struct winsize> s_termsize{k_invalid_termsize};
 
 static relaxed_atomic_bool_t s_termsize_valid{false};
 
@@ -1745,9 +1745,8 @@ bool unescape_string(const wcstring &input, wcstring *output, unescape_flags_t e
 void invalidate_termsize(bool invalidate_vars) {
     s_termsize_valid = false;
     if (invalidate_vars) {
-        struct winsize termsize = s_termsize;
-        termsize.ws_col = termsize.ws_row = USHRT_MAX;
-        termsize = s_termsize;
+        auto termsize = s_termsize.acquire();
+        termsize->ws_col = termsize->ws_row = USHRT_MAX;
     }
 }
 
@@ -1810,27 +1809,38 @@ static void export_new_termsize(struct winsize *new_termsize, env_stack_t &vars)
 #endif
 }
 
-/// Updates termsize as needed, and returns a copy of the winsize.
-struct winsize get_current_winsize() {
-    struct winsize termsize = s_termsize;
-    if (s_termsize_valid) return termsize;
+/// Get the current termsize, lazily computing it. Return by reference if it changed.
+static struct winsize get_current_winsize_prim(bool *changed, const environment_t &vars) {
+    auto termsize = s_termsize.acquire();
+    if (s_termsize_valid) return *termsize;
 
     struct winsize new_termsize = {0, 0, 0, 0};
 #ifdef HAVE_WINSIZE
     errno = 0;
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &new_termsize) != -1 &&
-        new_termsize.ws_col == termsize.ws_col && new_termsize.ws_row == termsize.ws_row) {
+        new_termsize.ws_col == termsize->ws_col && new_termsize.ws_row == termsize->ws_row) {
         s_termsize_valid = true;
-        return termsize;
+        return *termsize;
     }
 #endif
-    auto &vars = env_stack_t::globals();
     validate_new_termsize(&new_termsize, vars);
-    export_new_termsize(&new_termsize, vars);
-    termsize.ws_col = new_termsize.ws_col;
-    termsize.ws_row = new_termsize.ws_row;
-    s_termsize = termsize;
+    termsize->ws_col = new_termsize.ws_col;
+    termsize->ws_row = new_termsize.ws_row;
+    *changed = true;
     s_termsize_valid = true;
+    return *termsize;
+}
+
+/// Updates termsize as needed, and returns a copy of the winsize.
+struct winsize get_current_winsize() {
+    bool changed = false;
+    auto &vars = env_stack_t::globals();
+    struct winsize termsize = get_current_winsize_prim(&changed, vars);
+    if (changed) {
+        // TODO: this may call us reentrantly through the environment dispatch mechanism. We need to
+        // rationalize this.
+        export_new_termsize(&termsize, vars);
+    }
     return termsize;
 }
 
diff --git a/src/common.h b/src/common.h
index db12471ea..4ca30c9db 100644
--- a/src/common.h
+++ b/src/common.h
@@ -649,6 +649,7 @@ class owning_lock {
 
    public:
     owning_lock(Data &&d) : data(std::move(d)) {}
+    owning_lock(const Data &d) : data(d) {}
     owning_lock() : data() {}
 
     acquired_lock<Data> acquire() { return {lock, &data}; }

From 1719d6f136e8ac7040a1d6604d7117051ec0eb0b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 14:00:44 -0700
Subject: [PATCH 0527/1732] Make $status and $pipestatus per-parser

Another step towards allowing multiple parsers to execute in parallel.
---
 src/builtin.cpp         |  2 +-
 src/builtin_eval.cpp    |  2 +-
 src/builtin_exit.cpp    |  3 ++-
 src/builtin_return.cpp  |  2 +-
 src/builtin_set.cpp     |  2 +-
 src/builtin_source.cpp  |  2 +-
 src/env.cpp             | 18 +++++++++++++++---
 src/env.h               | 23 +++++++++++++++++++++++
 src/event.cpp           |  4 ++--
 src/exec.cpp            | 24 ++++++++++++------------
 src/expand.cpp          |  4 ++--
 src/fish.cpp            |  4 ++--
 src/fish_tests.cpp      |  2 +-
 src/input.cpp           |  7 ++++---
 src/parse_execution.cpp | 24 ++++++++++++------------
 src/parser.h            |  5 +++++
 src/proc.cpp            | 18 +++---------------
 src/proc.h              | 24 ------------------------
 18 files changed, 88 insertions(+), 82 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 4db430b19..43419df69 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -326,7 +326,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
     const breakpoint_block_t *bpb = parser.push_block<breakpoint_block_t>();
     reader_read(STDIN_FILENO, streams.io_chain ? *streams.io_chain : io_chain_t());
     parser.pop_block(bpb);
-    return proc_get_last_status();
+    return parser.get_last_status();
 }
 
 int builtin_true(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 7ed003e85..6b0ad0f49 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -35,7 +35,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             // where we have an argument but nothing is executed.
             status = STATUS_CMD_OK;
         } else {
-            status = proc_get_last_status();
+            status = parser.get_last_status();
         }
     }
 
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 9337f7e23..7b375f59d 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -9,6 +9,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
+#include "parser.h"
 #include "proc.h"
 #include "reader.h"
 #include "wgetopt.h"
@@ -78,7 +79,7 @@ int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (optind == argc) {
-        retval = proc_get_last_status();
+        retval = parser.get_last_status();
     } else {
         retval = fish_wcstoi(argv[optind]);
         if (errno) {
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 32a201af8..b157c04fd 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -78,7 +78,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (optind == argc) {
-        retval = proc_get_last_status();
+        retval = parser.get_last_status();
     } else {
         retval = fish_wcstoi(argv[1]);
         if (errno) {
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 94554f2e5..2fd45a3d3 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -778,7 +778,7 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
 
 /// The set builtin creates, updates, and erases (removes, deletes) variables.
 int builtin_set(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
-    const int incoming_exit_status = proc_get_last_status();
+    const int incoming_exit_status = parser.get_last_status();
     wchar_t *cmd = argv[0];
     int argc = builtin_count_args(argv);
     set_cmd_opts_t opts;
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 442e81784..7dadc8528 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -88,7 +88,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         streams.err.append_format(_(L"%ls: Error while reading file '%ls'\n"), cmd,
                                   fn_intern == intern_static(L"-") ? L"<stdin>" : fn_intern);
     } else {
-        retval = proc_get_last_status();
+        retval = parser.get_last_status();
     }
 
     // Do not close fd after calling reader_read. reader_read automatically closes it before calling
diff --git a/src/env.cpp b/src/env.cpp
index da3af3b35..1f1602de4 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -496,7 +496,8 @@ class env_scoped_impl_t : public environment_t {
     /// A struct wrapping up parser-local variables. These are conceptually variables that differ in
     /// different fish internal processes.
     struct perproc_data_t {
-        wcstring pwd;
+        wcstring pwd{};
+        statuses_t statuses{statuses_t::just(0)};
     };
 
    public:
@@ -647,7 +648,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key,
         if (history) history->get_history(result);
         return env_var_t(L"history", std::move(result));
     } else if (key == L"pipestatus") {
-        const auto js = proc_get_last_statuses();
+        const auto &js = perproc_data().statuses;
         wcstring_list_t result;
         result.reserve(js.pipestatus.size());
         for (int i : js.pipestatus) {
@@ -655,7 +656,8 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key,
         }
         return env_var_t(L"pipestatus", std::move(result));
     } else if (key == L"status") {
-        return env_var_t(L"status", to_string(proc_get_last_status()));
+        const auto &js = perproc_data().statuses;
+        return env_var_t(L"status", to_string(js.status));
     } else if (key == L"umask") {
         // note umask() is an absurd API: you call it to set the value and it returns the old
         // value. Thus we have to call it twice, to reset the value. The env_lock protects
@@ -1165,6 +1167,16 @@ bool env_stack_t::universal_barrier() {
     return changed || !callbacks.empty();
 }
 
+statuses_t env_stack_t::get_last_statuses() const {
+    return acquire_impl()->perproc_data().statuses;
+}
+
+int env_stack_t::get_last_status() const { return acquire_impl()->perproc_data().statuses.status; }
+
+void env_stack_t::set_last_statuses(statuses_t s) {
+    acquire_impl()->perproc_data().statuses = std::move(s);
+}
+
 /// If they don't already exist initialize the `COLUMNS` and `LINES` env vars to reasonable
 /// defaults. They will be updated later by the `get_current_winsize()` function if they need to be
 /// adjusted.
diff --git a/src/env.h b/src/env.h
index 1e973b244..e310d856f 100644
--- a/src/env.h
+++ b/src/env.h
@@ -59,6 +59,23 @@ struct config_paths_t {
     wcstring bin;      // e.g., /usr/local/bin
 };
 
+/// A collection of status and pipestatus.
+struct statuses_t {
+    /// Status of the last job to exit.
+    int status{0};
+
+    /// Pipestatus value.
+    std::vector<int> pipestatus{};
+
+    /// Return a statuses for a single process status.
+    static statuses_t just(int s) {
+        statuses_t result{};
+        result.status = s;
+        result.pipestatus.push_back(s);
+        return result;
+    }
+};
+
 /// Initialize environment variable data.
 void env_init(const struct config_paths_t *paths = NULL);
 
@@ -258,6 +275,12 @@ class env_stack_t final : public environment_t {
     /// you want to read from another thread.
     std::shared_ptr<environment_t> snapshot() const;
 
+    /// Helpers to get and set the proc statuses.
+    /// These correspond to $status and $pipestatus.
+    statuses_t get_last_statuses() const;
+    int get_last_status() const;
+    void set_last_statuses(statuses_t s);
+
     /// Update the termsize variable.
     void set_termsize();
 
diff --git a/src/event.cpp b/src/event.cpp
index a1f63f5f1..125ba9c2b 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -279,14 +279,14 @@ static void event_fire_internal(const event_t &event) {
         // Event handlers are not part of the main flow of code, so they are marked as
         // non-interactive.
         proc_push_interactive(0);
-        auto prev_statuses = proc_get_last_statuses();
         parser_t &parser = parser_t::principal_parser();
+        auto prev_statuses = parser.get_last_statuses();
 
         event_block_t *b = parser.push_block<event_block_t>(event);
         parser.eval(buffer, io_chain_t(), TOP);
         parser.pop_block(b);
         proc_pop_interactive();
-        proc_set_last_statuses(std::move(prev_statuses));
+        parser.set_last_statuses(std::move(prev_statuses));
     }
 }
 
diff --git a/src/exec.cpp b/src/exec.cpp
index 25d3ed8d4..8b6d884e6 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -279,7 +279,7 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
 
     // Did the transmogrification fail - if so, set error status and return.
     if (!transmorgrified) {
-        proc_set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
+        parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
         return;
     }
 
@@ -589,7 +589,7 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
 
 /// Handle output from a builtin, by printing the contents of builtin_io_streams to the redirections
 /// given in io_chain.
-static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
+static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t> &j, process_t *p,
                                   io_chain_t *io_chain, const io_streams_t &builtin_io_streams) {
     assert(p->type == process_type_t::builtin && "Process is not a builtin");
 
@@ -663,7 +663,7 @@ static bool handle_builtin_output(const std::shared_ptr<job_t> &j, process_t *p,
         if (p->is_last_in_job) {
             debug(4, L"Set status of job %d (%ls) to %d using short circuit", j->job_id,
                   j->preview().c_str(), p->status);
-            proc_set_last_statuses(j->get_statuses());
+            parser.set_last_statuses(j->get_statuses());
         }
         return true;
     } else {
@@ -832,7 +832,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         internal_exec_helper(parser, p->block_node_source, p->internal_block_node, io_chain, j);
     }
 
-    int status = proc_get_last_status();
+    int status = parser.get_last_status();
     // FIXME: setting the status this way is dangerous nonsense, we need to decode the status
     // properly if it was a signal.
     p->status = proc_status_t::from_exit_code(status);
@@ -843,7 +843,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         // status.
         p->completed = 1;
         if (p->is_last_in_job) {
-            proc_set_last_statuses(j->get_statuses());
+            parser.set_last_statuses(j->get_statuses());
         }
         return true;
     }
@@ -859,7 +859,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         return run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
     } else {
         if (p->is_last_in_job) {
-            proc_set_last_statuses(j->get_statuses());
+            parser.set_last_statuses(j->get_statuses());
         }
         p->completed = 1;
     }
@@ -964,7 +964,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
                                             builtin_io_streams)) {
                 return false;
             }
-            if (!handle_builtin_output(j, p, &process_net_io_chain, builtin_io_streams)) {
+            if (!handle_builtin_output(parser, j, p, &process_net_io_chain, builtin_io_streams)) {
                 return false;
             }
             break;
@@ -1051,7 +1051,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
         bool status = j->get_flag(job_flag_t::NEGATE) ? 0 : 1;
-        proc_set_last_statuses(statuses_t::just(status));
+        parser.set_last_statuses(statuses_t::just(status));
         return false;
     }
 
@@ -1131,7 +1131,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
                                   bool apply_exit_status, bool is_subcmd) {
     ASSERT_IS_MAIN_THREAD();
     bool prev_subshell = is_subshell;
-    auto prev_statuses = proc_get_last_statuses();
+    auto prev_statuses = parser.get_last_statuses();
     bool split_output = false;
 
     const auto ifs = parser.vars().get(L"IFS");
@@ -1148,7 +1148,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     std::shared_ptr<io_buffer_t> buffer;
     if (auto bufferfill = io_bufferfill_t::create(io_chain_t{}, read_limit)) {
         if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == 0) {
-            subcommand_statuses = proc_get_last_statuses();
+            subcommand_statuses = parser.get_last_statuses();
         }
         buffer = io_bufferfill_t::finish(std::move(bufferfill));
     }
@@ -1160,9 +1160,9 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // If the caller asked us to preserve the exit status, restore the old status. Otherwise set the
     // status of the subcommand.
     if (apply_exit_status) {
-        proc_set_last_statuses(subcommand_statuses);
+        parser.set_last_statuses(subcommand_statuses);
     } else {
-        proc_set_last_statuses(std::move(prev_statuses));
+        parser.set_last_statuses(std::move(prev_statuses));
     }
 
     is_subshell = prev_subshell;
diff --git a/src/expand.cpp b/src/expand.cpp
index 23de0beb5..457b113ae 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -624,7 +624,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
         return false;
     }
 
-    if (proc_get_last_status() == STATUS_READ_TOO_MUCH) {
+    if (parser.get_last_status() == STATUS_READ_TOO_MUCH) {
         append_cmdsub_error(
             errors, in - paren_begin,
             _(L"Too much data emitted by command substitution so it was discarded\n"));
@@ -698,7 +698,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
         }
     }
 
-    if (proc_get_last_status() == STATUS_READ_TOO_MUCH) return false;
+    if (parser.get_last_status() == STATUS_READ_TOO_MUCH) return false;
     return true;
 }
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 209aa999f..6788009f7 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -422,7 +422,7 @@ int main(int argc, char **argv) {
 
     if (read_init(paths)) {
         // Stomp the exit status of any initialization commands (issue #635).
-        proc_set_last_statuses(statuses_t::just(STATUS_CMD_OK));
+        parser.set_last_statuses(statuses_t::just(STATUS_CMD_OK));
 
         // Run post-config commands specified as arguments, if any.
         if (!opts.postconfig_cmds.empty()) {
@@ -472,7 +472,7 @@ int main(int argc, char **argv) {
         }
     }
 
-    int exit_status = res ? STATUS_CMD_UNKNOWN : proc_get_last_status();
+    int exit_status = res ? STATUS_CMD_UNKNOWN : parser.get_last_status();
 
     // TODO: The generic process-exit event is useless and unused.
     // Remove this in future.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e4aa29fc0..c74dc0974 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5014,7 +5014,7 @@ static void test_illegal_command_exit_code() {
     for (const auto &test : tests) {
         res = parser.eval(test.txt, empty_ios, TOP);
 
-        int exit_status = proc_get_last_status();
+        int exit_status = parser.get_last_status();
         if (exit_status != test.result) {
             err(L"command '%ls': expected exit code %d, got %d", test.txt, test.result,
                 exit_status);
diff --git a/src/input.cpp b/src/input.cpp
index 8332b0bf9..bbf990d4c 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -372,11 +372,12 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
         //
         // FIXME(snnw): if commands add stuff to input queue (e.g. commandline -f execute), we won't
         // see that until all other commands have also been run.
-        auto last_statuses = proc_get_last_statuses();
+        auto &parser = parser_t::principal_parser();
+        auto last_statuses = parser.get_last_statuses();
         for (const wcstring &cmd : m.commands) {
-            parser_t::principal_parser().eval(cmd, io_chain_t(), TOP);
+            parser.eval(cmd, io_chain_t(), TOP);
         }
-        proc_set_last_statuses(std::move(last_statuses));
+        parser.set_last_statuses(std::move(last_statuses));
         input_common_next_ch(char_event_type_t::check_exit);
     } else {
         // Invalid binding, mixed commands and functions.  We would need to execute these one by
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index aed94c42f..b03b49525 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -258,7 +258,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
         const bool take_branch =
-            (cond_ret == parse_execution_success) && proc_get_last_status() == EXIT_SUCCESS;
+            (cond_ret == parse_execution_success) && parser->get_last_status() == EXIT_SUCCESS;
 
         if (take_branch) {
             // Condition succeeded.
@@ -268,7 +268,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         auto else_cont = else_clause.try_get_child<g::else_continuation, 1>();
         if (!else_cont) {
             // 'if' condition failed, no else clause, return 0, we're done.
-            proc_set_last_statuses(statuses_t::just(STATUS_CMD_OK));
+            parser->set_last_statuses(statuses_t::just(STATUS_CMD_OK));
             break;
         } else {
             // We have an 'else continuation' (either else-if or else).
@@ -296,7 +296,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         parser->pop_block(ib);
     } else {
         // No job list means no sucessful conditions, so return 0 (issue #1443).
-        proc_set_last_statuses(statuses_t::just(STATUS_CMD_OK));
+        parser->set_last_statuses(statuses_t::just(STATUS_CMD_OK));
     }
 
     // It's possible there's a last-minute cancellation (issue #1297).
@@ -332,7 +332,7 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
     }
     io_streams_t streams(0);  // no limit on the amount of output from builtin_function()
     int err = builtin_function(*parser, streams, arguments, pstree, body);
-    proc_set_last_statuses(statuses_t::just(err));
+    parser->set_last_statuses(statuses_t::just(err));
 
     if (!streams.err.empty()) {
         this->report_error(header, L"%ls", streams.err.contents().c_str());
@@ -557,7 +557,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         // Save off the exit status if it came from the loop body. We'll restore it if the condition
         // is false.
         auto cond_saved_status =
-            first_cond_check ? statuses_t::just(EXIT_SUCCESS) : proc_get_last_statuses();
+            first_cond_check ? statuses_t::just(EXIT_SUCCESS) : parser->get_last_statuses();
         first_cond_check = false;
 
         // Check the condition.
@@ -572,8 +572,8 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         // exit the loop.
         if (cond_ret != parse_execution_success) {
             break;
-        } else if (proc_get_last_status() != EXIT_SUCCESS) {
-            proc_set_last_statuses(cond_saved_status);
+        } else if (parser->get_last_status() != EXIT_SUCCESS) {
+            parser->set_last_statuses(cond_saved_status);
             break;
         }
 
@@ -650,7 +650,7 @@ parse_execution_result_t parse_execution_context_t::report_errors(
 /// Reports an unmatched wildcard error and returns parse_execution_errored.
 parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_error(
     const parse_node_t &unmatched_wildcard) const {
-    proc_set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
+    parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
     report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
     return parse_execution_errored;
 }
@@ -732,7 +732,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
 
     // Set the last proc status appropriately.
     int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
-    proc_set_last_statuses(statuses_t::just(status));
+    parser->set_last_statuses(statuses_t::just(status));
 
     return parse_execution_errored;
 }
@@ -752,7 +752,7 @@ parse_execution_result_t parse_execution_context_t::expand_command(
     expand_result_t expand_err =
         expand_to_command_and_args(unexp_cmd, parser->vars(), out_cmd, out_args, &errors);
     if (expand_err == expand_result_t::error) {
-        proc_set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
+        parser->set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
         return report_errors(errors);
     } else if (expand_err == expand_result_t::wildcard_no_match) {
         return report_unmatched_wildcard_error(statement);
@@ -1327,10 +1327,10 @@ bool parse_execution_context_t::should_skip(parse_bool_statement_type_t type) co
     switch (type) {
         case parse_bool_and:
             // AND. Skip if the last job failed.
-            return proc_get_last_status() != 0;
+            return parser->get_last_status() != 0;
         case parse_bool_or:
             // OR. Skip if the last job succeeded.
-            return proc_get_last_status() == 0;
+            return parser->get_last_status() == 0;
         default:
             return false;
     }
diff --git a/src/parser.h b/src/parser.h
index 2fc425e34..4917eef64 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -285,6 +285,11 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     library_data_t &libdata() { return library_data; }
     const library_data_t &libdata() const { return library_data; }
 
+    /// Get and set the last proc statuses.
+    int get_last_status() const { return vars().get_last_status(); }
+    statuses_t get_last_statuses() const { return vars().get_last_statuses(); }
+    void set_last_statuses(statuses_t s) { vars().set_last_statuses(std::move(s)); }
+
     /// Pushes a new block created with the given arguments
     /// Returns a pointer to the block. The pointer is valid
     /// until the call to pop_block()
diff --git a/src/proc.cpp b/src/proc.cpp
index 7a615c5c4..4ffdc518b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -49,9 +49,6 @@
 #include "signal.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-/// Statuses of last job's processes to exit - ensure we start off with one entry of 0.
-static owning_lock<statuses_t> last_statuses{statuses_t::just(0)};
-
 /// The signals that signify crashes to us.
 static const int crashsignals[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGSYS};
 
@@ -86,15 +83,6 @@ static std::vector<int> interactive_stack;
 
 void proc_init() { proc_push_interactive(0); }
 
-void proc_set_last_statuses(statuses_t s) {
-    ASSERT_IS_MAIN_THREAD();
-    *last_statuses.acquire() = std::move(s);
-}
-
-int proc_get_last_status() { return last_statuses.acquire()->status; }
-
-statuses_t proc_get_last_statuses() { return *last_statuses.acquire(); }
-
 // Basic thread safe job IDs. The vector consumed_job_ids has a true value wherever the job ID
 // corresponding to that slot is in use. The job ID corresponding to slot 0 is 1.
 static owning_lock<std::vector<bool>> locked_consumed_job_ids;
@@ -623,12 +611,12 @@ bool job_reap(parser_t &parser, bool allow_interactive) {
     process_mark_finished_children(parser, false);
 
     // Preserve the exit status.
-    auto saved_statuses = proc_get_last_statuses();
+    auto saved_statuses = parser.get_last_statuses();
 
     bool printed = process_clean_after_marking(parser, allow_interactive);
 
     // Restore the exit status.
-    proc_set_last_statuses(std::move(saved_statuses));
+    parser.set_last_statuses(std::move(saved_statuses));
 
     return printed;
 }
@@ -898,7 +886,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
         // finished and is not a short-circuited builtin.
         auto &p = processes.back();
         if (p->status.normal_exited() || p->status.signal_exited()) {
-            proc_set_last_statuses(get_statuses());
+            parser.set_last_statuses(get_statuses());
         }
     }
 }
diff --git a/src/proc.h b/src/proc.h
index dd5275403..7126e6ee4 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -262,23 +262,6 @@ enum class job_flag_t {
     JOB_FLAG_COUNT
 };
 
-/// A collection of status and pipestatus.
-struct statuses_t {
-    /// Status of the last job to exit.
-    int status{0};
-
-    /// Pipestatus value.
-    std::vector<int> pipestatus{};
-
-    /// Return a statuses for a single process status.
-    static statuses_t just(int s) {
-        statuses_t result{};
-        result.status = s;
-        result.pipestatus.push_back(s);
-        return result;
-    }
-};
-
 template <>
 struct enum_info_t<job_flag_t> {
     static constexpr auto count = job_flag_t::JOB_FLAG_COUNT;
@@ -467,13 +450,6 @@ void set_job_control_mode(job_control_t mode);
 /// anything.
 extern int no_exec;
 
-/// Sets the status of the last process to exit.
-void proc_set_last_statuses(statuses_t s);
-
-/// Returns the status of the last process to exit.
-int proc_get_last_status();
-statuses_t proc_get_last_statuses();
-
 /// Notify the user about stopped or terminated jobs, and delete completed jobs from the job list.
 /// If \p interactive is set, allow removing interactive jobs; otherwise skip them.
 /// \return whether text was printed to stdout.

From 234c97e6d2cc3bad3ae73c4460fde2555ba96ace Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 18:23:00 -0700
Subject: [PATCH 0528/1732] Remove some unused variables

---
 src/builtin_eval.cpp |  2 +-
 src/common.cpp       |  5 ++++-
 src/complete.cpp     |  6 ++----
 src/env.cpp          | 28 ++++++++++++----------------
 src/event.cpp        |  1 +
 src/function.cpp     |  1 +
 src/proc.cpp         |  7 ++-----
 src/screen.cpp       |  6 +++---
 8 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 6b0ad0f49..26621e321 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -19,7 +19,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int argc = builtin_count_args(argv);
 
     wcstring new_cmd;
-    for (size_t i = 1; i < argc; ++i) {
+    for (int i = 1; i < argc; ++i) {
         if (i > 1) new_cmd += L' ';
         new_cmd += argv[i];
     }
diff --git a/src/common.cpp b/src/common.cpp
index d1f8662c1..71d546c60 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1752,7 +1752,10 @@ void invalidate_termsize(bool invalidate_vars) {
 
 /// Handle SIGWINCH. This is also invoked when the shell regains control of the tty since it is
 /// possible the terminal size changed while an external command was running.
-void common_handle_winch(int signal) { s_termsize_valid = false; }
+void common_handle_winch(int signal) {
+    (void)signal;
+    s_termsize_valid = false;
+}
 
 /// Validate the new terminal size. Fallback to the env vars if necessary. Ensure the values are
 /// sane and if not fallback to a default of 80x24.
diff --git a/src/complete.cpp b/src/complete.cpp
index fc9ecb11d..82256a123 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -72,8 +72,6 @@ static const wchar_t *C_(const wcstring &s) {
 static const wcstring &C_(const wcstring &s) { return s; }
 #endif
 
-static void complete_load(const wcstring &name, bool reload);
-
 /// Struct describing a completion option entry.
 ///
 /// If option is empty, the comp field must not be empty and contains a list of arguments to the
@@ -858,7 +856,7 @@ static bool short_ok(const wcstring &arg, const complete_entry_opt_t *entry,
 }
 
 /// Load command-specific completions for the specified command.
-static void complete_load(const wcstring &name, bool reload) {
+static void complete_load(const wcstring &name) {
     // We have to load this as a function, since it may define a --wraps or signature.
     // See issue #2466.
     auto &parser = parser_t::principal_parser();
@@ -926,7 +924,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         // and automatic completions ("gi" autosuggestion provider -> git)
         debug(4, "Skipping completions for non-existent head\n");
     } else {
-        run_on_main_thread([&]() { complete_load(cmd, true); });
+        run_on_main_thread([&]() { complete_load(cmd); });
     }
 
     // Make a list of lists of all options that we care about.
diff --git a/src/env.cpp b/src/env.cpp
index 1f1602de4..bee66a820 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -549,10 +549,10 @@ class env_scoped_impl_t : public environment_t {
     // populated. A maybe_t<maybe_t<...>> is a bridge too far.
     // These may populate result with none() if a variable is present which does not match the
     // query.
-    maybe_t<env_var_t> try_get_computed(const wcstring &key, const query_t &query) const;
-    maybe_t<env_var_t> try_get_local(const wcstring &key, const query_t &query) const;
-    maybe_t<env_var_t> try_get_global(const wcstring &key, const query_t &query) const;
-    maybe_t<env_var_t> try_get_universal(const wcstring &key, const query_t &query) const;
+    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_global(const wcstring &key) const;
+    maybe_t<env_var_t> try_get_universal(const wcstring &key) const;
 
     /// \return a newly allocated export array.
     std::shared_ptr<const null_terminated_array_t<char>> create_export_array() const;
@@ -625,8 +625,7 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::export_a
     return export_array_;
 }
 
-maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key,
-                                                       const query_t &query) const {
+maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key) const {
     const electric_var_t *ev = electric_var_t::for_name(key);
     if (!(ev && ev->computed())) {
         return none();
@@ -671,8 +670,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key,
     DIE("unrecognized computed var name");
 }
 
-maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key,
-                                                    const query_t &query) const {
+maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key) const {
     auto cursor = locals_;
     while (cursor) {
         auto where = cursor->env.find(key);
@@ -684,8 +682,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_local(const wcstring &key,
     return none();
 }
 
-maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key,
-                                                     const query_t &query) const {
+maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key) const {
     auto where = globals_->env.find(key);
     if (where != globals_->env.end()) {
         return where->second;
@@ -693,8 +690,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_global(const wcstring &key,
     return none();
 }
 
-maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key,
-                                                        const query_t &query) const {
+maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key) const {
     if (!uvars()) return none();
     auto var = uvars()->get(key);
     if (var) {
@@ -706,15 +702,15 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_universal(const wcstring &key,
 maybe_t<env_var_t> env_scoped_impl_t::get(const wcstring &key, env_mode_flags_t mode) const {
     const query_t query(mode);
 
-    maybe_t<env_var_t> result = try_get_computed(key, query);
+    maybe_t<env_var_t> result = try_get_computed(key);
     if (!result && query.local) {
-        result = try_get_local(key, query);
+        result = try_get_local(key);
     }
     if (!result && query.global) {
-        result = try_get_global(key, query);
+        result = try_get_global(key);
     }
     if (!result && query.universal) {
-        result = try_get_universal(key, query);
+        result = try_get_universal(key);
     }
     // If the user requested only exported or unexported variables, enforce that here.
     if (result && !query.export_matches(*result)) {
diff --git a/src/event.cpp b/src/event.cpp
index 125ba9c2b..57975bb7f 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -131,6 +131,7 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
 
 /// Test if specified event is blocked.
 static int event_is_blocked(const event_t &e) {
+    (void)e;
     const block_t *block;
     parser_t &parser = parser_t::principal_parser();
 
diff --git a/src/function.cpp b/src/function.cpp
index a158027af..85c24ac0a 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -227,6 +227,7 @@ void function_load(const wcstring &cmd, parser_t &parser) {
 }
 
 int function_exists_no_autoload(const wcstring &cmd, const environment_t &vars) {
+    (void)vars;
     if (parser_keywords_is_reserved(cmd)) return 0;
     auto funcset = function_set.acquire();
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 4ffdc518b..c38f06898 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -504,10 +504,7 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
 }
 
 /// \return whether this job wants a status message printed when it stops or completes.
-/// If \p print_stopped_foregrounds is set, then treat stopped foreground jobs as wanting a message.
-/// This should conceptually always be true and we only sometimes leave it as false to allow job IDs
-/// to be more aggressively reclaimed. TODO: rationalize this!
-static bool job_wants_message(const shared_ptr<job_t> &j, bool print_for_foreground_stops = true) {
+static bool job_wants_message(const shared_ptr<job_t> &j) {
     // Did we already print a status message?
     if (j->get_flag(job_flag_t::NOTIFIED)) return false;
 
@@ -556,7 +553,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
         }
 
         // If we are not interactive, skip cleaning jobs that want to print an interactive message.
-        if (!interactive && job_wants_message(j, false)) {
+        if (!interactive && job_wants_message(j)) {
             continue;
         }
 
diff --git a/src/screen.cpp b/src/screen.cpp
index 91ef3ed89..f653be3f8 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -519,6 +519,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 /// Set the pen color for the terminal.
 static void s_set_color(screen_t *s, const environment_t &vars, highlight_spec_t c) {
     UNUSED(s);
+    UNUSED(vars);
     s->outp().set_color(highlight_get_color(c, false), highlight_get_color(c, true));
 }
 
@@ -824,8 +825,7 @@ static size_t truncation_offset_for_width(const std::vector<size_t> &width_by_of
 static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
                                       const wcstring &left_prompt_str,
                                       const wcstring &right_prompt_str, const wcstring &commandline,
-                                      const wcstring &autosuggestion_str,
-                                      const std::vector<int> &indent) {
+                                      const wcstring &autosuggestion_str) {
     UNUSED(s);
     screen_layout_t result = {};
 
@@ -1003,7 +1003,7 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
 
     // Compute a layout.
     const screen_layout_t layout = compute_layout(s, screen_width, left_prompt, right_prompt,
-                                                  explicit_command_line, autosuggestion, indent);
+                                                  explicit_command_line, autosuggestion);
 
     // Determine whether, if we have an autosuggestion, it was truncated.
     s->autosuggestion_is_truncated =

From e22422c073636ac70e0b8b2c938f4da3e5e3b024 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 12 May 2019 11:18:55 +0200
Subject: [PATCH 0529/1732] Don't do fish_setlocale that early

This just sets some special characters that we use in the reader, so
it only needs to be done before the reader is set up.

Which, as it stands, is in env_init().
---
 src/fish.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 6788009f7..2ce6f0828 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -377,7 +377,6 @@ int main(int argc, char **argv) {
     setup_fork_guards();
     signal_unblock_all();
     setlocale(LC_ALL, "");
-    fish_setlocale();
 
     // struct stat tmp;
     // stat("----------FISH_HIT_MAIN----------", &tmp);

From 277db648049845f19847e62c2a128b970913bbc6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 May 2019 14:05:42 -0700
Subject: [PATCH 0530/1732] Force termsize back to valid in
 get_current_winsize()

get_current_winsize() is intended to be lazy. It does the following:

1. Gets the termsize from the kernel
2. Compares it against the current value
3. If changed, sets COLUMNS and LINES variables

Upon setting these variables, we notice that the termsize has changed
and invalidate the termsize. Thus we were doing this work multiple times
on every screen repaint.

Put back an old hack that just marked the termsize as valid at the end
of get_current_winsize().
---
 src/common.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/common.cpp b/src/common.cpp
index 71d546c60..f92e31b38 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1843,6 +1843,10 @@ struct winsize get_current_winsize() {
         // TODO: this may call us reentrantly through the environment dispatch mechanism. We need to
         // rationalize this.
         export_new_termsize(&termsize, vars);
+        // Hack: due to the dispatch the termsize may have just become invalid. Stomp it back to
+        // valid. What a mess.
+        *s_termsize.acquire() = termsize;
+        s_termsize_valid = true;
     }
     return termsize;
 }

From 0453023f7b67717eb66bc8923ba74a0adb90bb66 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 May 2019 14:16:43 -0700
Subject: [PATCH 0531/1732] Don't service ioport completions if data is
 available on stdin

This defers certain autosuggestions and syntax highlighting until after
large pastes are complete.
---
 src/input_common.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index fb82b1842..dc89f2b75 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -134,13 +134,6 @@ static char_event_t readb() {
                 }
             }
 
-            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
-                iothread_service_completion();
-                if (auto mc = s_lookahead->pop_evt()) {
-                    return *mc;
-                }
-            }
-
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
                 unsigned char arr[1];
                 if (read_blocked(0, arr, 1) != 1) {
@@ -151,6 +144,15 @@ static char_event_t readb() {
                 // We read from stdin, so don't loop.
                 return arr[0];
             }
+
+            // Check for iothread completions only if there is no data to be read from the stdin.
+            // This gives priority to the foreground.
+            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
+                iothread_service_completion();
+                if (auto mc = s_lookahead->pop_evt()) {
+                    return *mc;
+                }
+            }
         }
     }
 }

From b0f320481c1665fefa89b46bdcbfce98208aef8a Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 14 May 2019 13:18:18 +0800
Subject: [PATCH 0532/1732] document kill-path-component stopping at @ or :

Changes from 009ecfd7e6151d4 / #5841.

[ci skip]
---
 sphinx_doc_src/index.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 9515825a0..d582302db 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -52,7 +52,7 @@ This convention helps to make sure help can be found on commands no matter where
 Command Syntax
 --------------
 
-Shells also support some common syntax for executing commands. That way a command can be started in the same way, regardless of the application, where it comes from, and the shell, where it is executed in. 
+Shells also support some common syntax for executing commands. That way a command can be started in the same way, regardless of the application, where it comes from, and the shell, where it is executed in.
 
 The pattern below is a basic pattern:
 
@@ -91,7 +91,7 @@ Example:
 Commands versus Programs
 ------------------------
 
-**Programs** in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out: 
+**Programs** in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out:
 
 Arguments → Program → Return Values
 
@@ -126,7 +126,7 @@ Shebang Line
 
 Since script for shell commands can be written in many different languages, they need to carry information about what interpreter is needed to execute them: For this they are expected to have a first line, the shebang line, which names an executable for this purpose:
 
-Example: 
+Example:
 
 A scripts written in ``bash`` it would need a first line like this::
 
@@ -154,7 +154,7 @@ This section is on how to install, uninstall, start and exit a *fish* shell and
 Installation
 ------------
 
-Instructions for installing fish are on the `fish homepage <https://fishshell.com/>`_. Search that page for "Go fish". 
+Instructions for installing fish are on the `fish homepage <https://fishshell.com/>`_. Search that page for "Go fish".
 
 To install the development version of *fish* see the instructions at the `project's GitHub page <https://github.com/fish-shell/fish-shell>`_.
 
@@ -199,7 +199,7 @@ Consider, that ``bash`` is also a command. With ``man bash`` you can see that th
     > bash -c SomeBashCommand
 
 
-or ``bash`` without a switch, opens a *bash* shell that you can use and ``exit`` afterwards. 
+or ``bash`` without a switch, opens a *bash* shell that you can use and ``exit`` afterwards.
 
 
 .. _syntax:
@@ -951,7 +951,7 @@ Variables can be used as indices for expansion of variables, like so::
 However using variables as indices for command substitution is currently not supported, so::
 
     echo (seq 5)[$index] # This won't work
-    
+
     set sequence (seq 5) # It needs to be written on two lines like this.
     echo $sequence[$index] # returns '2'
 
@@ -1148,10 +1148,10 @@ When a list is exported as an environment variable, it is either space or colon
     set -x smurf blue small
     set -x smurf_PATH forest mushroom
     env | grep smurf
-    
+
     # smurf=blue small
     # smurf_PATH=forest:mushroom
-    
+
 
 
 ``fish`` automatically creates lists from all environment variables whose name ends in PATH, by splitting them on colons. Other variables are not automatically split.
@@ -1421,7 +1421,7 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Control+L` clears and repaints the screen.
 
-- :kbd:`Control+W` moves the previous path component (everything up to the previous "/") to the `killring <#killring>`__.
+- :kbd:`Control+W` moves the previous path component (everything up to the previous "/", ":" or "@") to the `killring <#killring>`__.
 
 - :kbd:`Control+X` copies the current buffer to the system's clipboard, :kbd:`Control+V` inserts the clipboard contents.
 

From 2aaf7fda2742ce186fa0797e71fa1d1f690232fa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 May 2019 21:10:48 +0200
Subject: [PATCH 0533/1732] src/history: Stop renarrowing a string in a
 for-loop

Classic case of doing stuff in a loop that doesn't change. No idea if
the compiler caught it, but I sleep easier now.
---
 src/history.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 3805e59f0..30982d0a0 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1285,14 +1285,16 @@ bool history_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
 // Returns the fd of an opened temporary file, or -1 on failure
 static int create_temporary_file(const wcstring &name_template, wcstring *out_path) {
     int out_fd = -1;
+    char *narrow_str = nullptr;
     for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) {
-        char *narrow_str = wcs2str(name_template);
+        narrow_str = wcs2str(name_template);
         out_fd = fish_mkstemp_cloexec(narrow_str);
-        if (out_fd >= 0) {
-            *out_path = str2wcstring(narrow_str);
-        }
-        free(narrow_str);
     }
+
+    if (out_fd >= 0) {
+        *out_path = str2wcstring(narrow_str);
+    }
+    free(narrow_str);
     return out_fd;
 }
 

From 87b93cd4caa1425328330962ad4b9b0d896aa6c3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 May 2019 21:12:49 +0200
Subject: [PATCH 0534/1732] src/history: Only widen bash history lines once

This did str2wcs when checking, then again when adding.
---
 src/history.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 30982d0a0..87b2bba6d 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1749,16 +1749,15 @@ void history_t::populate_from_config_path() {
 }
 
 /// Decide whether we ought to import a bash history line into fish. This is a very crude heuristic.
-static bool should_import_bash_history_line(const std::string &line) {
+static bool should_import_bash_history_line(const wcstring &line) {
     if (line.empty()) return false;
 
     parse_node_tree_t parse_tree;
-    wcstring wide_line = str2wcstring(line);
-    if (!parse_tree_from_string(wide_line, parse_flag_none, &parse_tree, NULL)) return false;
+    if (!parse_tree_from_string(line, parse_flag_none, &parse_tree, NULL)) return false;
 
     // In doing this test do not allow incomplete strings. Hence the "false" argument.
     parse_error_list_t errors;
-    parse_util_detect_errors(wide_line, &errors, false);
+    parse_util_detect_errors(line, &errors, false);
     if (!errors.empty()) return false;
 
     // The following are Very naive tests!
@@ -1770,17 +1769,17 @@ static bool should_import_bash_history_line(const std::string &line) {
     if (line.find('`') != std::string::npos) return false;
 
     // Skip lines with [[...]] and ((...)) since we don't handle those constructs.
-    if (line.find("[[") != std::string::npos) return false;
-    if (line.find("]]") != std::string::npos) return false;
-    if (line.find("((") != std::string::npos) return false;
-    if (line.find("))") != std::string::npos) return false;
+    if (line.find(L"[[") != std::string::npos) return false;
+    if (line.find(L"]]") != std::string::npos) return false;
+    if (line.find(L"((") != std::string::npos) return false;
+    if (line.find(L"))") != std::string::npos) return false;
 
     // Temporarily skip lines with && and ||
-    if (line.find("&&") != std::string::npos) return false;
-    if (line.find("||") != std::string::npos) return false;
+    if (line.find(L"&&") != std::string::npos) return false;
+    if (line.find(L"||") != std::string::npos) return false;
 
     // Skip lines that end with a backslash. We do not handle multiline commands from bash history.
-    if (line.back() == '\\') return false;
+    if (line.back() == L'\\') return false;
 
     return true;
 }
@@ -1810,8 +1809,9 @@ void history_t::populate_from_bash(FILE *stream) {
             if (a_newline) break;
         }
 
+        wcstring wide_line = str2wcstring(line);
         // Add this line if it doesn't contain anything we know we can't handle.
-        if (should_import_bash_history_line(line)) this->add(str2wcstring(line));
+        if (should_import_bash_history_line(wide_line)) this->add(wide_line);
     }
 }
 

From 752b5362eef966e6b6973afd18668ae47a7ee67f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 May 2019 21:15:58 +0200
Subject: [PATCH 0535/1732] Only widen string if necessary

This tried a bunch of times, but only the final one is important.
---
 src/env_universal_common.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 39d7831d8..ad8867384 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -511,16 +511,18 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
     int saved_errno;
     const wcstring tmp_name_template = directory + L"/fishd.tmp.XXXXXX";
 
+    char *narrow_str = nullptr;
     for (size_t attempt = 0; attempt < 10 && !success; attempt++) {
-        char *narrow_str = wcs2str(tmp_name_template);
+        narrow_str = wcs2str(tmp_name_template);
         int result_fd = fish_mkstemp_cloexec(narrow_str);
         saved_errno = errno;
         success = result_fd != -1;
         *out_fd = result_fd;
-        *out_path = str2wcstring(narrow_str);
-        free(narrow_str);
     }
 
+    *out_path = str2wcstring(narrow_str);
+    free(narrow_str);
+
     if (!success) {
         const char *error = std::strerror(saved_errno);
         debug(0, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);

From 2d37bc9bd11077e356419ba503ae099f7adad748 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 May 2019 09:45:56 +0200
Subject: [PATCH 0536/1732] Update widechar_width

This includes the change to check ASCII chars first, so we can now
drop our workaround.
---
 src/widecharwidth/widechar_width.h | 403 +++++++++++++++--------------
 1 file changed, 208 insertions(+), 195 deletions(-)

diff --git a/src/widecharwidth/widechar_width.h b/src/widecharwidth/widechar_width.h
index b61cc9e99..62caaf09e 100644
--- a/src/widecharwidth/widechar_width.h
+++ b/src/widecharwidth/widechar_width.h
@@ -1,10 +1,10 @@
 /**
- * widechar_width.h, generated on 2018-07-09.
+ * widechar_width.h, generated on 2019-05-14.
  * See https://github.com/ridiculousfish/widecharwidth/
  *
  * SHA1 file hashes:
- *  UnicodeData.txt:     0e060fafb08d6722fbec56d9f9ebe8509f01d0ee
- *  EastAsianWidth.txt:  240b5b2c235671d330860742615f798e3d334c4c
+ *  UnicodeData.txt:     dc973c0fc93d6f09d9ab9f70d1c9f89c447f0526
+ *  EastAsianWidth.txt:  0a02c7d91d0af68b7608a5bccc71ee6a81d19277
  *  emoji-data.txt:      11fd60a01e17df80035c459728350073cd9ed37b
  */
 
@@ -34,6 +34,11 @@ struct widechar_range {
   int32_t hi;
 };
 
+/* Simple ASCII characters - used a lot, so we check them first. */
+static const struct widechar_range widechar_ascii_table[] = {
+    {0x00020, 0x0007E}
+};
+
 /* Private usage range. */
 static const struct widechar_range widechar_private_table[] = {
     {0x0E000, 0x0F8FF}, {0xF0000, 0xFFFFD}, {0x100000, 0x10FFFD}
@@ -47,8 +52,8 @@ static const struct widechar_range widechar_nonprint_table[] = {
     {0x0200B, 0x0200F}, {0x02028, 0x0202E}, {0x02060, 0x02064},
     {0x02066, 0x0206F}, {0x0D800, 0x0DFFF}, {0x0FEFF, 0x0FEFF},
     {0x0FFF9, 0x0FFFB}, {0x110BD, 0x110BD}, {0x110CD, 0x110CD},
-    {0x1BCA0, 0x1BCA3}, {0x1D173, 0x1D17A}, {0xE0001, 0xE0001},
-    {0xE0020, 0xE007F}
+    {0x13430, 0x13438}, {0x1BCA0, 0x1BCA3}, {0x1D173, 0x1D17A},
+    {0xE0001, 0xE0001}, {0xE0020, 0xE007F}
 };
 
 /* Width 0 combining marks. */
@@ -84,67 +89,69 @@ static const struct widechar_range widechar_combining_table[] = {
     {0x00D62, 0x00D63}, {0x00D82, 0x00D83}, {0x00DCA, 0x00DCA},
     {0x00DCF, 0x00DD4}, {0x00DD6, 0x00DD6}, {0x00DD8, 0x00DDF},
     {0x00DF2, 0x00DF3}, {0x00E31, 0x00E31}, {0x00E34, 0x00E3A},
-    {0x00E47, 0x00E4E}, {0x00EB1, 0x00EB1}, {0x00EB4, 0x00EB9},
-    {0x00EBB, 0x00EBC}, {0x00EC8, 0x00ECD}, {0x00F18, 0x00F19},
-    {0x00F35, 0x00F35}, {0x00F37, 0x00F37}, {0x00F39, 0x00F39},
-    {0x00F3E, 0x00F3F}, {0x00F71, 0x00F84}, {0x00F86, 0x00F87},
-    {0x00F8D, 0x00F97}, {0x00F99, 0x00FBC}, {0x00FC6, 0x00FC6},
-    {0x0102B, 0x0103E}, {0x01056, 0x01059}, {0x0105E, 0x01060},
-    {0x01062, 0x01064}, {0x01067, 0x0106D}, {0x01071, 0x01074},
-    {0x01082, 0x0108D}, {0x0108F, 0x0108F}, {0x0109A, 0x0109D},
-    {0x0135D, 0x0135F}, {0x01712, 0x01714}, {0x01732, 0x01734},
-    {0x01752, 0x01753}, {0x01772, 0x01773}, {0x017B4, 0x017D3},
-    {0x017DD, 0x017DD}, {0x0180B, 0x0180D}, {0x01885, 0x01886},
-    {0x018A9, 0x018A9}, {0x01920, 0x0192B}, {0x01930, 0x0193B},
-    {0x01A17, 0x01A1B}, {0x01A55, 0x01A5E}, {0x01A60, 0x01A7C},
-    {0x01A7F, 0x01A7F}, {0x01AB0, 0x01ABE}, {0x01B00, 0x01B04},
-    {0x01B34, 0x01B44}, {0x01B6B, 0x01B73}, {0x01B80, 0x01B82},
-    {0x01BA1, 0x01BAD}, {0x01BE6, 0x01BF3}, {0x01C24, 0x01C37},
-    {0x01CD0, 0x01CD2}, {0x01CD4, 0x01CE8}, {0x01CED, 0x01CED},
-    {0x01CF2, 0x01CF4}, {0x01CF7, 0x01CF9}, {0x01DC0, 0x01DF9},
-    {0x01DFB, 0x01DFF}, {0x020D0, 0x020F0}, {0x02CEF, 0x02CF1},
-    {0x02D7F, 0x02D7F}, {0x02DE0, 0x02DFF}, {0x0302A, 0x0302F},
-    {0x03099, 0x0309A}, {0x0A66F, 0x0A672}, {0x0A674, 0x0A67D},
-    {0x0A69E, 0x0A69F}, {0x0A6F0, 0x0A6F1}, {0x0A802, 0x0A802},
-    {0x0A806, 0x0A806}, {0x0A80B, 0x0A80B}, {0x0A823, 0x0A827},
-    {0x0A880, 0x0A881}, {0x0A8B4, 0x0A8C5}, {0x0A8E0, 0x0A8F1},
-    {0x0A8FF, 0x0A8FF}, {0x0A926, 0x0A92D}, {0x0A947, 0x0A953},
-    {0x0A980, 0x0A983}, {0x0A9B3, 0x0A9C0}, {0x0A9E5, 0x0A9E5},
-    {0x0AA29, 0x0AA36}, {0x0AA43, 0x0AA43}, {0x0AA4C, 0x0AA4D},
-    {0x0AA7B, 0x0AA7D}, {0x0AAB0, 0x0AAB0}, {0x0AAB2, 0x0AAB4},
-    {0x0AAB7, 0x0AAB8}, {0x0AABE, 0x0AABF}, {0x0AAC1, 0x0AAC1},
-    {0x0AAEB, 0x0AAEF}, {0x0AAF5, 0x0AAF6}, {0x0ABE3, 0x0ABEA},
-    {0x0ABEC, 0x0ABED}, {0x0FB1E, 0x0FB1E}, {0x0FE00, 0x0FE0F},
-    {0x0FE20, 0x0FE2F}, {0x101FD, 0x101FD}, {0x102E0, 0x102E0},
-    {0x10376, 0x1037A}, {0x10A01, 0x10A03}, {0x10A05, 0x10A06},
-    {0x10A0C, 0x10A0F}, {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F},
-    {0x10AE5, 0x10AE6}, {0x10D24, 0x10D27}, {0x10F46, 0x10F50},
-    {0x11000, 0x11002}, {0x11038, 0x11046}, {0x1107F, 0x11082},
-    {0x110B0, 0x110BA}, {0x11100, 0x11102}, {0x11127, 0x11134},
-    {0x11145, 0x11146}, {0x11173, 0x11173}, {0x11180, 0x11182},
-    {0x111B3, 0x111C0}, {0x111C9, 0x111CC}, {0x1122C, 0x11237},
-    {0x1123E, 0x1123E}, {0x112DF, 0x112EA}, {0x11300, 0x11303},
-    {0x1133B, 0x1133C}, {0x1133E, 0x11344}, {0x11347, 0x11348},
-    {0x1134B, 0x1134D}, {0x11357, 0x11357}, {0x11362, 0x11363},
-    {0x11366, 0x1136C}, {0x11370, 0x11374}, {0x11435, 0x11446},
-    {0x1145E, 0x1145E}, {0x114B0, 0x114C3}, {0x115AF, 0x115B5},
-    {0x115B8, 0x115C0}, {0x115DC, 0x115DD}, {0x11630, 0x11640},
-    {0x116AB, 0x116B7}, {0x1171D, 0x1172B}, {0x1182C, 0x1183A},
-    {0x11A01, 0x11A0A}, {0x11A33, 0x11A39}, {0x11A3B, 0x11A3E},
-    {0x11A47, 0x11A47}, {0x11A51, 0x11A5B}, {0x11A8A, 0x11A99},
-    {0x11C2F, 0x11C36}, {0x11C38, 0x11C3F}, {0x11C92, 0x11CA7},
-    {0x11CA9, 0x11CB6}, {0x11D31, 0x11D36}, {0x11D3A, 0x11D3A},
-    {0x11D3C, 0x11D3D}, {0x11D3F, 0x11D45}, {0x11D47, 0x11D47},
-    {0x11D8A, 0x11D8E}, {0x11D90, 0x11D91}, {0x11D93, 0x11D97},
-    {0x11EF3, 0x11EF6}, {0x16AF0, 0x16AF4}, {0x16B30, 0x16B36},
-    {0x16F51, 0x16F7E}, {0x16F8F, 0x16F92}, {0x1BC9D, 0x1BC9E},
+    {0x00E47, 0x00E4E}, {0x00EB1, 0x00EB1}, {0x00EB4, 0x00EBC},
+    {0x00EC8, 0x00ECD}, {0x00F18, 0x00F19}, {0x00F35, 0x00F35},
+    {0x00F37, 0x00F37}, {0x00F39, 0x00F39}, {0x00F3E, 0x00F3F},
+    {0x00F71, 0x00F84}, {0x00F86, 0x00F87}, {0x00F8D, 0x00F97},
+    {0x00F99, 0x00FBC}, {0x00FC6, 0x00FC6}, {0x0102B, 0x0103E},
+    {0x01056, 0x01059}, {0x0105E, 0x01060}, {0x01062, 0x01064},
+    {0x01067, 0x0106D}, {0x01071, 0x01074}, {0x01082, 0x0108D},
+    {0x0108F, 0x0108F}, {0x0109A, 0x0109D}, {0x0135D, 0x0135F},
+    {0x01712, 0x01714}, {0x01732, 0x01734}, {0x01752, 0x01753},
+    {0x01772, 0x01773}, {0x017B4, 0x017D3}, {0x017DD, 0x017DD},
+    {0x0180B, 0x0180D}, {0x01885, 0x01886}, {0x018A9, 0x018A9},
+    {0x01920, 0x0192B}, {0x01930, 0x0193B}, {0x01A17, 0x01A1B},
+    {0x01A55, 0x01A5E}, {0x01A60, 0x01A7C}, {0x01A7F, 0x01A7F},
+    {0x01AB0, 0x01ABE}, {0x01B00, 0x01B04}, {0x01B34, 0x01B44},
+    {0x01B6B, 0x01B73}, {0x01B80, 0x01B82}, {0x01BA1, 0x01BAD},
+    {0x01BE6, 0x01BF3}, {0x01C24, 0x01C37}, {0x01CD0, 0x01CD2},
+    {0x01CD4, 0x01CE8}, {0x01CED, 0x01CED}, {0x01CF4, 0x01CF4},
+    {0x01CF7, 0x01CF9}, {0x01DC0, 0x01DF9}, {0x01DFB, 0x01DFF},
+    {0x020D0, 0x020F0}, {0x02CEF, 0x02CF1}, {0x02D7F, 0x02D7F},
+    {0x02DE0, 0x02DFF}, {0x0302A, 0x0302F}, {0x03099, 0x0309A},
+    {0x0A66F, 0x0A672}, {0x0A674, 0x0A67D}, {0x0A69E, 0x0A69F},
+    {0x0A6F0, 0x0A6F1}, {0x0A802, 0x0A802}, {0x0A806, 0x0A806},
+    {0x0A80B, 0x0A80B}, {0x0A823, 0x0A827}, {0x0A880, 0x0A881},
+    {0x0A8B4, 0x0A8C5}, {0x0A8E0, 0x0A8F1}, {0x0A8FF, 0x0A8FF},
+    {0x0A926, 0x0A92D}, {0x0A947, 0x0A953}, {0x0A980, 0x0A983},
+    {0x0A9B3, 0x0A9C0}, {0x0A9E5, 0x0A9E5}, {0x0AA29, 0x0AA36},
+    {0x0AA43, 0x0AA43}, {0x0AA4C, 0x0AA4D}, {0x0AA7B, 0x0AA7D},
+    {0x0AAB0, 0x0AAB0}, {0x0AAB2, 0x0AAB4}, {0x0AAB7, 0x0AAB8},
+    {0x0AABE, 0x0AABF}, {0x0AAC1, 0x0AAC1}, {0x0AAEB, 0x0AAEF},
+    {0x0AAF5, 0x0AAF6}, {0x0ABE3, 0x0ABEA}, {0x0ABEC, 0x0ABED},
+    {0x0FB1E, 0x0FB1E}, {0x0FE00, 0x0FE0F}, {0x0FE20, 0x0FE2F},
+    {0x101FD, 0x101FD}, {0x102E0, 0x102E0}, {0x10376, 0x1037A},
+    {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
+    {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x10AE5, 0x10AE6},
+    {0x10D24, 0x10D27}, {0x10F46, 0x10F50}, {0x11000, 0x11002},
+    {0x11038, 0x11046}, {0x1107F, 0x11082}, {0x110B0, 0x110BA},
+    {0x11100, 0x11102}, {0x11127, 0x11134}, {0x11145, 0x11146},
+    {0x11173, 0x11173}, {0x11180, 0x11182}, {0x111B3, 0x111C0},
+    {0x111C9, 0x111CC}, {0x1122C, 0x11237}, {0x1123E, 0x1123E},
+    {0x112DF, 0x112EA}, {0x11300, 0x11303}, {0x1133B, 0x1133C},
+    {0x1133E, 0x11344}, {0x11347, 0x11348}, {0x1134B, 0x1134D},
+    {0x11357, 0x11357}, {0x11362, 0x11363}, {0x11366, 0x1136C},
+    {0x11370, 0x11374}, {0x11435, 0x11446}, {0x1145E, 0x1145E},
+    {0x114B0, 0x114C3}, {0x115AF, 0x115B5}, {0x115B8, 0x115C0},
+    {0x115DC, 0x115DD}, {0x11630, 0x11640}, {0x116AB, 0x116B7},
+    {0x1171D, 0x1172B}, {0x1182C, 0x1183A}, {0x119D1, 0x119D7},
+    {0x119DA, 0x119E0}, {0x119E4, 0x119E4}, {0x11A01, 0x11A0A},
+    {0x11A33, 0x11A39}, {0x11A3B, 0x11A3E}, {0x11A47, 0x11A47},
+    {0x11A51, 0x11A5B}, {0x11A8A, 0x11A99}, {0x11C2F, 0x11C36},
+    {0x11C38, 0x11C3F}, {0x11C92, 0x11CA7}, {0x11CA9, 0x11CB6},
+    {0x11D31, 0x11D36}, {0x11D3A, 0x11D3A}, {0x11D3C, 0x11D3D},
+    {0x11D3F, 0x11D45}, {0x11D47, 0x11D47}, {0x11D8A, 0x11D8E},
+    {0x11D90, 0x11D91}, {0x11D93, 0x11D97}, {0x11EF3, 0x11EF6},
+    {0x16AF0, 0x16AF4}, {0x16B30, 0x16B36}, {0x16F4F, 0x16F4F},
+    {0x16F51, 0x16F87}, {0x16F8F, 0x16F92}, {0x1BC9D, 0x1BC9E},
     {0x1D165, 0x1D169}, {0x1D16D, 0x1D172}, {0x1D17B, 0x1D182},
     {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD}, {0x1D242, 0x1D244},
     {0x1DA00, 0x1DA36}, {0x1DA3B, 0x1DA6C}, {0x1DA75, 0x1DA75},
     {0x1DA84, 0x1DA84}, {0x1DA9B, 0x1DA9F}, {0x1DAA1, 0x1DAAF},
     {0x1E000, 0x1E006}, {0x1E008, 0x1E018}, {0x1E01B, 0x1E021},
-    {0x1E023, 0x1E024}, {0x1E026, 0x1E02A}, {0x1E8D0, 0x1E8D6},
-    {0x1E944, 0x1E94A}, {0xE0100, 0xE01EF}
+    {0x1E023, 0x1E024}, {0x1E026, 0x1E02A}, {0x1E130, 0x1E136},
+    {0x1E2EC, 0x1E2EF}, {0x1E8D0, 0x1E8D6}, {0x1E944, 0x1E94A},
+    {0xE0100, 0xE01EF}
 };
 
 /* Width.2 characters. */
@@ -165,20 +172,22 @@ static const struct widechar_range widechar_doublewide_table[] = {
     {0x03000, 0x0303E}, {0x03041, 0x03096}, {0x03099, 0x030FF},
     {0x03105, 0x0312F}, {0x03131, 0x0318E}, {0x03190, 0x031BA},
     {0x031C0, 0x031E3}, {0x031F0, 0x0321E}, {0x03220, 0x03247},
-    {0x03250, 0x032FE}, {0x03300, 0x04DBF}, {0x04E00, 0x0A48C},
-    {0x0A490, 0x0A4C6}, {0x0A960, 0x0A97C}, {0x0AC00, 0x0D7A3},
-    {0x0F900, 0x0FAFF}, {0x0FE10, 0x0FE19}, {0x0FE30, 0x0FE52},
-    {0x0FE54, 0x0FE66}, {0x0FE68, 0x0FE6B}, {0x0FF01, 0x0FF60},
-    {0x0FFE0, 0x0FFE6}, {0x16FE0, 0x16FE1}, {0x17000, 0x187F1},
-    {0x18800, 0x18AF2}, {0x1B000, 0x1B11E}, {0x1B170, 0x1B2FB},
-    {0x1F200, 0x1F200}, {0x1F210, 0x1F219}, {0x1F21B, 0x1F22E},
-    {0x1F230, 0x1F231}, {0x1F23B, 0x1F23B}, {0x1F240, 0x1F248},
-    {0x1F260, 0x1F265}, {0x1F57A, 0x1F57A}, {0x1F5A4, 0x1F5A4},
-    {0x1F6D1, 0x1F6D2}, {0x1F6F4, 0x1F6F9}, {0x1F919, 0x1F93E},
-    {0x1F940, 0x1F970}, {0x1F973, 0x1F976}, {0x1F97A, 0x1F97A},
-    {0x1F97C, 0x1F97F}, {0x1F985, 0x1F9A2}, {0x1F9B0, 0x1F9B9},
-    {0x1F9C1, 0x1F9C2}, {0x1F9D0, 0x1F9FF}, {0x20000, 0x2FFFD},
-    {0x30000, 0x3FFFD}
+    {0x03250, 0x04DBF}, {0x04E00, 0x0A48C}, {0x0A490, 0x0A4C6},
+    {0x0A960, 0x0A97C}, {0x0AC00, 0x0D7A3}, {0x0F900, 0x0FAFF},
+    {0x0FE10, 0x0FE19}, {0x0FE30, 0x0FE52}, {0x0FE54, 0x0FE66},
+    {0x0FE68, 0x0FE6B}, {0x0FF01, 0x0FF60}, {0x0FFE0, 0x0FFE6},
+    {0x16FE0, 0x16FE3}, {0x17000, 0x187F7}, {0x18800, 0x18AF2},
+    {0x1B000, 0x1B11E}, {0x1B150, 0x1B152}, {0x1B164, 0x1B167},
+    {0x1B170, 0x1B2FB}, {0x1F200, 0x1F200}, {0x1F210, 0x1F219},
+    {0x1F21B, 0x1F22E}, {0x1F230, 0x1F231}, {0x1F23B, 0x1F23B},
+    {0x1F240, 0x1F248}, {0x1F260, 0x1F265}, {0x1F57A, 0x1F57A},
+    {0x1F5A4, 0x1F5A4}, {0x1F6D1, 0x1F6D2}, {0x1F6D5, 0x1F6D5},
+    {0x1F6F4, 0x1F6FA}, {0x1F7E0, 0x1F7EB}, {0x1F90D, 0x1F90F},
+    {0x1F919, 0x1F971}, {0x1F973, 0x1F976}, {0x1F97A, 0x1F97F},
+    {0x1F985, 0x1F9A2}, {0x1F9A5, 0x1F9AA}, {0x1F9AE, 0x1F9BF},
+    {0x1F9C1, 0x1F9CA}, {0x1F9CD, 0x1F9FF}, {0x1FA70, 0x1FA73},
+    {0x1FA78, 0x1FA7A}, {0x1FA80, 0x1FA82}, {0x1FA90, 0x1FA95},
+    {0x20000, 0x2FFFD}, {0x30000, 0x3FFFD}
 };
 
 /* Ambiguous-width characters. */
@@ -284,7 +293,7 @@ static const struct widechar_range widechar_unassigned_table[] = {
     {0x00C11, 0x00C11}, {0x00C29, 0x00C29}, {0x00C3A, 0x00C3C},
     {0x00C45, 0x00C45}, {0x00C49, 0x00C49}, {0x00C4E, 0x00C54},
     {0x00C57, 0x00C57}, {0x00C5B, 0x00C5F}, {0x00C64, 0x00C65},
-    {0x00C70, 0x00C77}, {0x00C8D, 0x00C8D}, {0x00C91, 0x00C91},
+    {0x00C70, 0x00C76}, {0x00C8D, 0x00C8D}, {0x00C91, 0x00C91},
     {0x00CA9, 0x00CA9}, {0x00CB4, 0x00CB4}, {0x00CBA, 0x00CBB},
     {0x00CC5, 0x00CC5}, {0x00CC9, 0x00CC9}, {0x00CCE, 0x00CD4},
     {0x00CD7, 0x00CDD}, {0x00CDF, 0x00CDF}, {0x00CE4, 0x00CE5},
@@ -296,66 +305,63 @@ static const struct widechar_range widechar_unassigned_table[] = {
     {0x00DC7, 0x00DC9}, {0x00DCB, 0x00DCE}, {0x00DD5, 0x00DD5},
     {0x00DD7, 0x00DD7}, {0x00DE0, 0x00DE5}, {0x00DF0, 0x00DF1},
     {0x00DF5, 0x00E00}, {0x00E3B, 0x00E3E}, {0x00E5C, 0x00E80},
-    {0x00E83, 0x00E83}, {0x00E85, 0x00E86}, {0x00E89, 0x00E89},
-    {0x00E8B, 0x00E8C}, {0x00E8E, 0x00E93}, {0x00E98, 0x00E98},
-    {0x00EA0, 0x00EA0}, {0x00EA4, 0x00EA4}, {0x00EA6, 0x00EA6},
-    {0x00EA8, 0x00EA9}, {0x00EAC, 0x00EAC}, {0x00EBA, 0x00EBA},
-    {0x00EBE, 0x00EBF}, {0x00EC5, 0x00EC5}, {0x00EC7, 0x00EC7},
-    {0x00ECE, 0x00ECF}, {0x00EDA, 0x00EDB}, {0x00EE0, 0x00EFF},
-    {0x00F48, 0x00F48}, {0x00F6D, 0x00F70}, {0x00F98, 0x00F98},
-    {0x00FBD, 0x00FBD}, {0x00FCD, 0x00FCD}, {0x00FDB, 0x00FFF},
-    {0x010C6, 0x010C6}, {0x010C8, 0x010CC}, {0x010CE, 0x010CF},
-    {0x01249, 0x01249}, {0x0124E, 0x0124F}, {0x01257, 0x01257},
-    {0x01259, 0x01259}, {0x0125E, 0x0125F}, {0x01289, 0x01289},
-    {0x0128E, 0x0128F}, {0x012B1, 0x012B1}, {0x012B6, 0x012B7},
-    {0x012BF, 0x012BF}, {0x012C1, 0x012C1}, {0x012C6, 0x012C7},
-    {0x012D7, 0x012D7}, {0x01311, 0x01311}, {0x01316, 0x01317},
-    {0x0135B, 0x0135C}, {0x0137D, 0x0137F}, {0x0139A, 0x0139F},
-    {0x013F6, 0x013F7}, {0x013FE, 0x013FF}, {0x0169D, 0x0169F},
-    {0x016F9, 0x016FF}, {0x0170D, 0x0170D}, {0x01715, 0x0171F},
-    {0x01737, 0x0173F}, {0x01754, 0x0175F}, {0x0176D, 0x0176D},
-    {0x01771, 0x01771}, {0x01774, 0x0177F}, {0x017DE, 0x017DF},
-    {0x017EA, 0x017EF}, {0x017FA, 0x017FF}, {0x0180F, 0x0180F},
-    {0x0181A, 0x0181F}, {0x01879, 0x0187F}, {0x018AB, 0x018AF},
-    {0x018F6, 0x018FF}, {0x0191F, 0x0191F}, {0x0192C, 0x0192F},
-    {0x0193C, 0x0193F}, {0x01941, 0x01943}, {0x0196E, 0x0196F},
-    {0x01975, 0x0197F}, {0x019AC, 0x019AF}, {0x019CA, 0x019CF},
-    {0x019DB, 0x019DD}, {0x01A1C, 0x01A1D}, {0x01A5F, 0x01A5F},
-    {0x01A7D, 0x01A7E}, {0x01A8A, 0x01A8F}, {0x01A9A, 0x01A9F},
-    {0x01AAE, 0x01AAF}, {0x01ABF, 0x01AFF}, {0x01B4C, 0x01B4F},
-    {0x01B7D, 0x01B7F}, {0x01BF4, 0x01BFB}, {0x01C38, 0x01C3A},
-    {0x01C4A, 0x01C4C}, {0x01C89, 0x01C8F}, {0x01CBB, 0x01CBC},
-    {0x01CC8, 0x01CCF}, {0x01CFA, 0x01CFF}, {0x01DFA, 0x01DFA},
-    {0x01F16, 0x01F17}, {0x01F1E, 0x01F1F}, {0x01F46, 0x01F47},
-    {0x01F4E, 0x01F4F}, {0x01F58, 0x01F58}, {0x01F5A, 0x01F5A},
-    {0x01F5C, 0x01F5C}, {0x01F5E, 0x01F5E}, {0x01F7E, 0x01F7F},
-    {0x01FB5, 0x01FB5}, {0x01FC5, 0x01FC5}, {0x01FD4, 0x01FD5},
-    {0x01FDC, 0x01FDC}, {0x01FF0, 0x01FF1}, {0x01FF5, 0x01FF5},
-    {0x01FFF, 0x01FFF}, {0x02065, 0x02065}, {0x02072, 0x02073},
-    {0x0208F, 0x0208F}, {0x0209D, 0x0209F}, {0x020C0, 0x020CF},
-    {0x020F1, 0x020FF}, {0x0218C, 0x0218F}, {0x02427, 0x0243F},
-    {0x0244B, 0x0245F}, {0x02B74, 0x02B75}, {0x02B96, 0x02B97},
-    {0x02BC9, 0x02BC9}, {0x02BFF, 0x02BFF}, {0x02C2F, 0x02C2F},
+    {0x00E83, 0x00E83}, {0x00E85, 0x00E85}, {0x00E8B, 0x00E8B},
+    {0x00EA4, 0x00EA4}, {0x00EA6, 0x00EA6}, {0x00EBE, 0x00EBF},
+    {0x00EC5, 0x00EC5}, {0x00EC7, 0x00EC7}, {0x00ECE, 0x00ECF},
+    {0x00EDA, 0x00EDB}, {0x00EE0, 0x00EFF}, {0x00F48, 0x00F48},
+    {0x00F6D, 0x00F70}, {0x00F98, 0x00F98}, {0x00FBD, 0x00FBD},
+    {0x00FCD, 0x00FCD}, {0x00FDB, 0x00FFF}, {0x010C6, 0x010C6},
+    {0x010C8, 0x010CC}, {0x010CE, 0x010CF}, {0x01249, 0x01249},
+    {0x0124E, 0x0124F}, {0x01257, 0x01257}, {0x01259, 0x01259},
+    {0x0125E, 0x0125F}, {0x01289, 0x01289}, {0x0128E, 0x0128F},
+    {0x012B1, 0x012B1}, {0x012B6, 0x012B7}, {0x012BF, 0x012BF},
+    {0x012C1, 0x012C1}, {0x012C6, 0x012C7}, {0x012D7, 0x012D7},
+    {0x01311, 0x01311}, {0x01316, 0x01317}, {0x0135B, 0x0135C},
+    {0x0137D, 0x0137F}, {0x0139A, 0x0139F}, {0x013F6, 0x013F7},
+    {0x013FE, 0x013FF}, {0x0169D, 0x0169F}, {0x016F9, 0x016FF},
+    {0x0170D, 0x0170D}, {0x01715, 0x0171F}, {0x01737, 0x0173F},
+    {0x01754, 0x0175F}, {0x0176D, 0x0176D}, {0x01771, 0x01771},
+    {0x01774, 0x0177F}, {0x017DE, 0x017DF}, {0x017EA, 0x017EF},
+    {0x017FA, 0x017FF}, {0x0180F, 0x0180F}, {0x0181A, 0x0181F},
+    {0x01879, 0x0187F}, {0x018AB, 0x018AF}, {0x018F6, 0x018FF},
+    {0x0191F, 0x0191F}, {0x0192C, 0x0192F}, {0x0193C, 0x0193F},
+    {0x01941, 0x01943}, {0x0196E, 0x0196F}, {0x01975, 0x0197F},
+    {0x019AC, 0x019AF}, {0x019CA, 0x019CF}, {0x019DB, 0x019DD},
+    {0x01A1C, 0x01A1D}, {0x01A5F, 0x01A5F}, {0x01A7D, 0x01A7E},
+    {0x01A8A, 0x01A8F}, {0x01A9A, 0x01A9F}, {0x01AAE, 0x01AAF},
+    {0x01ABF, 0x01AFF}, {0x01B4C, 0x01B4F}, {0x01B7D, 0x01B7F},
+    {0x01BF4, 0x01BFB}, {0x01C38, 0x01C3A}, {0x01C4A, 0x01C4C},
+    {0x01C89, 0x01C8F}, {0x01CBB, 0x01CBC}, {0x01CC8, 0x01CCF},
+    {0x01CFB, 0x01CFF}, {0x01DFA, 0x01DFA}, {0x01F16, 0x01F17},
+    {0x01F1E, 0x01F1F}, {0x01F46, 0x01F47}, {0x01F4E, 0x01F4F},
+    {0x01F58, 0x01F58}, {0x01F5A, 0x01F5A}, {0x01F5C, 0x01F5C},
+    {0x01F5E, 0x01F5E}, {0x01F7E, 0x01F7F}, {0x01FB5, 0x01FB5},
+    {0x01FC5, 0x01FC5}, {0x01FD4, 0x01FD5}, {0x01FDC, 0x01FDC},
+    {0x01FF0, 0x01FF1}, {0x01FF5, 0x01FF5}, {0x01FFF, 0x01FFF},
+    {0x02065, 0x02065}, {0x02072, 0x02073}, {0x0208F, 0x0208F},
+    {0x0209D, 0x0209F}, {0x020C0, 0x020CF}, {0x020F1, 0x020FF},
+    {0x0218C, 0x0218F}, {0x02427, 0x0243F}, {0x0244B, 0x0245F},
+    {0x02B74, 0x02B75}, {0x02B96, 0x02B97}, {0x02C2F, 0x02C2F},
     {0x02C5F, 0x02C5F}, {0x02CF4, 0x02CF8}, {0x02D26, 0x02D26},
     {0x02D28, 0x02D2C}, {0x02D2E, 0x02D2F}, {0x02D68, 0x02D6E},
     {0x02D71, 0x02D7E}, {0x02D97, 0x02D9F}, {0x02DA7, 0x02DA7},
     {0x02DAF, 0x02DAF}, {0x02DB7, 0x02DB7}, {0x02DBF, 0x02DBF},
     {0x02DC7, 0x02DC7}, {0x02DCF, 0x02DCF}, {0x02DD7, 0x02DD7},
-    {0x02DDF, 0x02DDF}, {0x02E4F, 0x02E7F}, {0x02E9A, 0x02E9A},
+    {0x02DDF, 0x02DDF}, {0x02E50, 0x02E7F}, {0x02E9A, 0x02E9A},
     {0x02EF4, 0x02EFF}, {0x02FD6, 0x02FEF}, {0x02FFC, 0x02FFF},
     {0x03040, 0x03040}, {0x03097, 0x03098}, {0x03100, 0x03104},
     {0x03130, 0x03130}, {0x0318F, 0x0318F}, {0x031BB, 0x031BF},
-    {0x031E4, 0x031EF}, {0x0321F, 0x0321F}, {0x032FF, 0x032FF},
-    {0x03401, 0x04DB4}, {0x04DB6, 0x04DBF}, {0x04E01, 0x09FEE},
-    {0x09FF0, 0x09FFF}, {0x0A48D, 0x0A48F}, {0x0A4C7, 0x0A4CF},
-    {0x0A62C, 0x0A63F}, {0x0A6F8, 0x0A6FF}, {0x0A7BA, 0x0A7F6},
+    {0x031E4, 0x031EF}, {0x0321F, 0x0321F}, {0x03401, 0x04DB4},
+    {0x04DB6, 0x04DBF}, {0x04E01, 0x09FEE}, {0x09FF0, 0x09FFF},
+    {0x0A48D, 0x0A48F}, {0x0A4C7, 0x0A4CF}, {0x0A62C, 0x0A63F},
+    {0x0A6F8, 0x0A6FF}, {0x0A7C0, 0x0A7C1}, {0x0A7C7, 0x0A7F6},
     {0x0A82C, 0x0A82F}, {0x0A83A, 0x0A83F}, {0x0A878, 0x0A87F},
     {0x0A8C6, 0x0A8CD}, {0x0A8DA, 0x0A8DF}, {0x0A954, 0x0A95E},
     {0x0A97D, 0x0A97F}, {0x0A9CE, 0x0A9CE}, {0x0A9DA, 0x0A9DD},
     {0x0A9FF, 0x0A9FF}, {0x0AA37, 0x0AA3F}, {0x0AA4E, 0x0AA4F},
     {0x0AA5A, 0x0AA5B}, {0x0AAC3, 0x0AADA}, {0x0AAF7, 0x0AB00},
     {0x0AB07, 0x0AB08}, {0x0AB0F, 0x0AB10}, {0x0AB17, 0x0AB1F},
-    {0x0AB27, 0x0AB27}, {0x0AB2F, 0x0AB2F}, {0x0AB66, 0x0AB6F},
+    {0x0AB27, 0x0AB27}, {0x0AB2F, 0x0AB2F}, {0x0AB68, 0x0AB6F},
     {0x0ABEE, 0x0ABEF}, {0x0ABFA, 0x0ABFF}, {0x0AC01, 0x0D7A2},
     {0x0D7A4, 0x0D7AF}, {0x0D7C7, 0x0D7CA}, {0x0D7FC, 0x0D7FF},
     {0x0FA6E, 0x0FA6F}, {0x0FADA, 0x0FAFF}, {0x0FB07, 0x0FB12},
@@ -391,86 +397,91 @@ static const struct widechar_range widechar_unassigned_table[] = {
     {0x10B92, 0x10B98}, {0x10B9D, 0x10BA8}, {0x10BB0, 0x10BFF},
     {0x10C49, 0x10C7F}, {0x10CB3, 0x10CBF}, {0x10CF3, 0x10CF9},
     {0x10D28, 0x10D2F}, {0x10D3A, 0x10E5F}, {0x10E7F, 0x10EFF},
-    {0x10F28, 0x10F2F}, {0x10F5A, 0x10FFF}, {0x1104E, 0x11051},
-    {0x11070, 0x1107E}, {0x110C2, 0x110CC}, {0x110CE, 0x110CF},
-    {0x110E9, 0x110EF}, {0x110FA, 0x110FF}, {0x11135, 0x11135},
-    {0x11147, 0x1114F}, {0x11177, 0x1117F}, {0x111CE, 0x111CF},
-    {0x111E0, 0x111E0}, {0x111F5, 0x111FF}, {0x11212, 0x11212},
-    {0x1123F, 0x1127F}, {0x11287, 0x11287}, {0x11289, 0x11289},
-    {0x1128E, 0x1128E}, {0x1129E, 0x1129E}, {0x112AA, 0x112AF},
-    {0x112EB, 0x112EF}, {0x112FA, 0x112FF}, {0x11304, 0x11304},
-    {0x1130D, 0x1130E}, {0x11311, 0x11312}, {0x11329, 0x11329},
-    {0x11331, 0x11331}, {0x11334, 0x11334}, {0x1133A, 0x1133A},
-    {0x11345, 0x11346}, {0x11349, 0x1134A}, {0x1134E, 0x1134F},
-    {0x11351, 0x11356}, {0x11358, 0x1135C}, {0x11364, 0x11365},
-    {0x1136D, 0x1136F}, {0x11375, 0x113FF}, {0x1145A, 0x1145A},
-    {0x1145C, 0x1145C}, {0x1145F, 0x1147F}, {0x114C8, 0x114CF},
-    {0x114DA, 0x1157F}, {0x115B6, 0x115B7}, {0x115DE, 0x115FF},
-    {0x11645, 0x1164F}, {0x1165A, 0x1165F}, {0x1166D, 0x1167F},
-    {0x116B8, 0x116BF}, {0x116CA, 0x116FF}, {0x1171B, 0x1171C},
-    {0x1172C, 0x1172F}, {0x11740, 0x117FF}, {0x1183C, 0x1189F},
-    {0x118F3, 0x118FE}, {0x11900, 0x119FF}, {0x11A48, 0x11A4F},
-    {0x11A84, 0x11A85}, {0x11AA3, 0x11ABF}, {0x11AF9, 0x11BFF},
+    {0x10F28, 0x10F2F}, {0x10F5A, 0x10FDF}, {0x10FF7, 0x10FFF},
+    {0x1104E, 0x11051}, {0x11070, 0x1107E}, {0x110C2, 0x110CC},
+    {0x110CE, 0x110CF}, {0x110E9, 0x110EF}, {0x110FA, 0x110FF},
+    {0x11135, 0x11135}, {0x11147, 0x1114F}, {0x11177, 0x1117F},
+    {0x111CE, 0x111CF}, {0x111E0, 0x111E0}, {0x111F5, 0x111FF},
+    {0x11212, 0x11212}, {0x1123F, 0x1127F}, {0x11287, 0x11287},
+    {0x11289, 0x11289}, {0x1128E, 0x1128E}, {0x1129E, 0x1129E},
+    {0x112AA, 0x112AF}, {0x112EB, 0x112EF}, {0x112FA, 0x112FF},
+    {0x11304, 0x11304}, {0x1130D, 0x1130E}, {0x11311, 0x11312},
+    {0x11329, 0x11329}, {0x11331, 0x11331}, {0x11334, 0x11334},
+    {0x1133A, 0x1133A}, {0x11345, 0x11346}, {0x11349, 0x1134A},
+    {0x1134E, 0x1134F}, {0x11351, 0x11356}, {0x11358, 0x1135C},
+    {0x11364, 0x11365}, {0x1136D, 0x1136F}, {0x11375, 0x113FF},
+    {0x1145A, 0x1145A}, {0x1145C, 0x1145C}, {0x11460, 0x1147F},
+    {0x114C8, 0x114CF}, {0x114DA, 0x1157F}, {0x115B6, 0x115B7},
+    {0x115DE, 0x115FF}, {0x11645, 0x1164F}, {0x1165A, 0x1165F},
+    {0x1166D, 0x1167F}, {0x116B9, 0x116BF}, {0x116CA, 0x116FF},
+    {0x1171B, 0x1171C}, {0x1172C, 0x1172F}, {0x11740, 0x117FF},
+    {0x1183C, 0x1189F}, {0x118F3, 0x118FE}, {0x11900, 0x1199F},
+    {0x119A8, 0x119A9}, {0x119D8, 0x119D9}, {0x119E5, 0x119FF},
+    {0x11A48, 0x11A4F}, {0x11AA3, 0x11ABF}, {0x11AF9, 0x11BFF},
     {0x11C09, 0x11C09}, {0x11C37, 0x11C37}, {0x11C46, 0x11C4F},
     {0x11C6D, 0x11C6F}, {0x11C90, 0x11C91}, {0x11CA8, 0x11CA8},
     {0x11CB7, 0x11CFF}, {0x11D07, 0x11D07}, {0x11D0A, 0x11D0A},
     {0x11D37, 0x11D39}, {0x11D3B, 0x11D3B}, {0x11D3E, 0x11D3E},
     {0x11D48, 0x11D4F}, {0x11D5A, 0x11D5F}, {0x11D66, 0x11D66},
     {0x11D69, 0x11D69}, {0x11D8F, 0x11D8F}, {0x11D92, 0x11D92},
-    {0x11D99, 0x11D9F}, {0x11DAA, 0x11EDF}, {0x11EF9, 0x11FFF},
-    {0x1239A, 0x123FF}, {0x1246F, 0x1246F}, {0x12475, 0x1247F},
-    {0x12544, 0x12FFF}, {0x1342F, 0x143FF}, {0x14647, 0x167FF},
-    {0x16A39, 0x16A3F}, {0x16A5F, 0x16A5F}, {0x16A6A, 0x16A6D},
-    {0x16A70, 0x16ACF}, {0x16AEE, 0x16AEF}, {0x16AF6, 0x16AFF},
-    {0x16B46, 0x16B4F}, {0x16B5A, 0x16B5A}, {0x16B62, 0x16B62},
-    {0x16B78, 0x16B7C}, {0x16B90, 0x16E3F}, {0x16E9B, 0x16EFF},
-    {0x16F45, 0x16F4F}, {0x16F7F, 0x16F8E}, {0x16FA0, 0x16FDF},
-    {0x16FE2, 0x16FFF}, {0x17001, 0x187F0}, {0x187F2, 0x187FF},
-    {0x18AF3, 0x1AFFF}, {0x1B11F, 0x1B16F}, {0x1B2FC, 0x1BBFF},
-    {0x1BC6B, 0x1BC6F}, {0x1BC7D, 0x1BC7F}, {0x1BC89, 0x1BC8F},
-    {0x1BC9A, 0x1BC9B}, {0x1BCA4, 0x1CFFF}, {0x1D0F6, 0x1D0FF},
-    {0x1D127, 0x1D128}, {0x1D1E9, 0x1D1FF}, {0x1D246, 0x1D2DF},
-    {0x1D2F4, 0x1D2FF}, {0x1D357, 0x1D35F}, {0x1D379, 0x1D3FF},
-    {0x1D455, 0x1D455}, {0x1D49D, 0x1D49D}, {0x1D4A0, 0x1D4A1},
-    {0x1D4A3, 0x1D4A4}, {0x1D4A7, 0x1D4A8}, {0x1D4AD, 0x1D4AD},
-    {0x1D4BA, 0x1D4BA}, {0x1D4BC, 0x1D4BC}, {0x1D4C4, 0x1D4C4},
-    {0x1D506, 0x1D506}, {0x1D50B, 0x1D50C}, {0x1D515, 0x1D515},
-    {0x1D51D, 0x1D51D}, {0x1D53A, 0x1D53A}, {0x1D53F, 0x1D53F},
-    {0x1D545, 0x1D545}, {0x1D547, 0x1D549}, {0x1D551, 0x1D551},
-    {0x1D6A6, 0x1D6A7}, {0x1D7CC, 0x1D7CD}, {0x1DA8C, 0x1DA9A},
-    {0x1DAA0, 0x1DAA0}, {0x1DAB0, 0x1DFFF}, {0x1E007, 0x1E007},
-    {0x1E019, 0x1E01A}, {0x1E022, 0x1E022}, {0x1E025, 0x1E025},
-    {0x1E02B, 0x1E7FF}, {0x1E8C5, 0x1E8C6}, {0x1E8D7, 0x1E8FF},
-    {0x1E94B, 0x1E94F}, {0x1E95A, 0x1E95D}, {0x1E960, 0x1EC70},
-    {0x1ECB5, 0x1EDFF}, {0x1EE04, 0x1EE04}, {0x1EE20, 0x1EE20},
-    {0x1EE23, 0x1EE23}, {0x1EE25, 0x1EE26}, {0x1EE28, 0x1EE28},
-    {0x1EE33, 0x1EE33}, {0x1EE38, 0x1EE38}, {0x1EE3A, 0x1EE3A},
-    {0x1EE3C, 0x1EE41}, {0x1EE43, 0x1EE46}, {0x1EE48, 0x1EE48},
-    {0x1EE4A, 0x1EE4A}, {0x1EE4C, 0x1EE4C}, {0x1EE50, 0x1EE50},
-    {0x1EE53, 0x1EE53}, {0x1EE55, 0x1EE56}, {0x1EE58, 0x1EE58},
-    {0x1EE5A, 0x1EE5A}, {0x1EE5C, 0x1EE5C}, {0x1EE5E, 0x1EE5E},
-    {0x1EE60, 0x1EE60}, {0x1EE63, 0x1EE63}, {0x1EE65, 0x1EE66},
-    {0x1EE6B, 0x1EE6B}, {0x1EE73, 0x1EE73}, {0x1EE78, 0x1EE78},
-    {0x1EE7D, 0x1EE7D}, {0x1EE7F, 0x1EE7F}, {0x1EE8A, 0x1EE8A},
-    {0x1EE9C, 0x1EEA0}, {0x1EEA4, 0x1EEA4}, {0x1EEAA, 0x1EEAA},
-    {0x1EEBC, 0x1EEEF}, {0x1EEF2, 0x1EFFF}, {0x1F02C, 0x1F02F},
-    {0x1F094, 0x1F09F}, {0x1F0AF, 0x1F0B0}, {0x1F0C0, 0x1F0C0},
-    {0x1F0D0, 0x1F0D0}, {0x1F0F6, 0x1F0FF}, {0x1F10D, 0x1F10F},
-    {0x1F16C, 0x1F16F}, {0x1F1AD, 0x1F1E5}, {0x1F203, 0x1F20F},
-    {0x1F23C, 0x1F23F}, {0x1F249, 0x1F24F}, {0x1F252, 0x1F25F},
-    {0x1F266, 0x1F2FF}, {0x1F6D5, 0x1F6DF}, {0x1F6ED, 0x1F6EF},
-    {0x1F6FA, 0x1F6FF}, {0x1F774, 0x1F77F}, {0x1F7D9, 0x1F7FF},
+    {0x11D99, 0x11D9F}, {0x11DAA, 0x11EDF}, {0x11EF9, 0x11FBF},
+    {0x11FF2, 0x11FFE}, {0x1239A, 0x123FF}, {0x1246F, 0x1246F},
+    {0x12475, 0x1247F}, {0x12544, 0x12FFF}, {0x1342F, 0x1342F},
+    {0x13439, 0x143FF}, {0x14647, 0x167FF}, {0x16A39, 0x16A3F},
+    {0x16A5F, 0x16A5F}, {0x16A6A, 0x16A6D}, {0x16A70, 0x16ACF},
+    {0x16AEE, 0x16AEF}, {0x16AF6, 0x16AFF}, {0x16B46, 0x16B4F},
+    {0x16B5A, 0x16B5A}, {0x16B62, 0x16B62}, {0x16B78, 0x16B7C},
+    {0x16B90, 0x16E3F}, {0x16E9B, 0x16EFF}, {0x16F4B, 0x16F4E},
+    {0x16F88, 0x16F8E}, {0x16FA0, 0x16FDF}, {0x16FE4, 0x16FFF},
+    {0x17001, 0x187F6}, {0x187F8, 0x187FF}, {0x18AF3, 0x1AFFF},
+    {0x1B11F, 0x1B14F}, {0x1B153, 0x1B163}, {0x1B168, 0x1B16F},
+    {0x1B2FC, 0x1BBFF}, {0x1BC6B, 0x1BC6F}, {0x1BC7D, 0x1BC7F},
+    {0x1BC89, 0x1BC8F}, {0x1BC9A, 0x1BC9B}, {0x1BCA4, 0x1CFFF},
+    {0x1D0F6, 0x1D0FF}, {0x1D127, 0x1D128}, {0x1D1E9, 0x1D1FF},
+    {0x1D246, 0x1D2DF}, {0x1D2F4, 0x1D2FF}, {0x1D357, 0x1D35F},
+    {0x1D379, 0x1D3FF}, {0x1D455, 0x1D455}, {0x1D49D, 0x1D49D},
+    {0x1D4A0, 0x1D4A1}, {0x1D4A3, 0x1D4A4}, {0x1D4A7, 0x1D4A8},
+    {0x1D4AD, 0x1D4AD}, {0x1D4BA, 0x1D4BA}, {0x1D4BC, 0x1D4BC},
+    {0x1D4C4, 0x1D4C4}, {0x1D506, 0x1D506}, {0x1D50B, 0x1D50C},
+    {0x1D515, 0x1D515}, {0x1D51D, 0x1D51D}, {0x1D53A, 0x1D53A},
+    {0x1D53F, 0x1D53F}, {0x1D545, 0x1D545}, {0x1D547, 0x1D549},
+    {0x1D551, 0x1D551}, {0x1D6A6, 0x1D6A7}, {0x1D7CC, 0x1D7CD},
+    {0x1DA8C, 0x1DA9A}, {0x1DAA0, 0x1DAA0}, {0x1DAB0, 0x1DFFF},
+    {0x1E007, 0x1E007}, {0x1E019, 0x1E01A}, {0x1E022, 0x1E022},
+    {0x1E025, 0x1E025}, {0x1E02B, 0x1E0FF}, {0x1E12D, 0x1E12F},
+    {0x1E13E, 0x1E13F}, {0x1E14A, 0x1E14D}, {0x1E150, 0x1E2BF},
+    {0x1E2FA, 0x1E2FE}, {0x1E300, 0x1E7FF}, {0x1E8C5, 0x1E8C6},
+    {0x1E8D7, 0x1E8FF}, {0x1E94C, 0x1E94F}, {0x1E95A, 0x1E95D},
+    {0x1E960, 0x1EC70}, {0x1ECB5, 0x1ED00}, {0x1ED3E, 0x1EDFF},
+    {0x1EE04, 0x1EE04}, {0x1EE20, 0x1EE20}, {0x1EE23, 0x1EE23},
+    {0x1EE25, 0x1EE26}, {0x1EE28, 0x1EE28}, {0x1EE33, 0x1EE33},
+    {0x1EE38, 0x1EE38}, {0x1EE3A, 0x1EE3A}, {0x1EE3C, 0x1EE41},
+    {0x1EE43, 0x1EE46}, {0x1EE48, 0x1EE48}, {0x1EE4A, 0x1EE4A},
+    {0x1EE4C, 0x1EE4C}, {0x1EE50, 0x1EE50}, {0x1EE53, 0x1EE53},
+    {0x1EE55, 0x1EE56}, {0x1EE58, 0x1EE58}, {0x1EE5A, 0x1EE5A},
+    {0x1EE5C, 0x1EE5C}, {0x1EE5E, 0x1EE5E}, {0x1EE60, 0x1EE60},
+    {0x1EE63, 0x1EE63}, {0x1EE65, 0x1EE66}, {0x1EE6B, 0x1EE6B},
+    {0x1EE73, 0x1EE73}, {0x1EE78, 0x1EE78}, {0x1EE7D, 0x1EE7D},
+    {0x1EE7F, 0x1EE7F}, {0x1EE8A, 0x1EE8A}, {0x1EE9C, 0x1EEA0},
+    {0x1EEA4, 0x1EEA4}, {0x1EEAA, 0x1EEAA}, {0x1EEBC, 0x1EEEF},
+    {0x1EEF2, 0x1EFFF}, {0x1F02C, 0x1F02F}, {0x1F094, 0x1F09F},
+    {0x1F0AF, 0x1F0B0}, {0x1F0C0, 0x1F0C0}, {0x1F0D0, 0x1F0D0},
+    {0x1F0F6, 0x1F0FF}, {0x1F10D, 0x1F10F}, {0x1F16D, 0x1F16F},
+    {0x1F1AD, 0x1F1E5}, {0x1F203, 0x1F20F}, {0x1F23C, 0x1F23F},
+    {0x1F249, 0x1F24F}, {0x1F252, 0x1F25F}, {0x1F266, 0x1F2FF},
+    {0x1F6D6, 0x1F6DF}, {0x1F6ED, 0x1F6EF}, {0x1F6FB, 0x1F6FF},
+    {0x1F774, 0x1F77F}, {0x1F7D9, 0x1F7DF}, {0x1F7EC, 0x1F7FF},
     {0x1F80C, 0x1F80F}, {0x1F848, 0x1F84F}, {0x1F85A, 0x1F85F},
-    {0x1F888, 0x1F88F}, {0x1F8AE, 0x1F8FF}, {0x1F90C, 0x1F90F},
-    {0x1F93F, 0x1F93F}, {0x1F971, 0x1F972}, {0x1F977, 0x1F979},
-    {0x1F97B, 0x1F97B}, {0x1F9A3, 0x1F9AF}, {0x1F9BA, 0x1F9BF},
-    {0x1F9C3, 0x1F9CF}, {0x1FA00, 0x1FA5F}, {0x1FA6E, 0x1FFFF},
-    {0x20001, 0x2A6D5}, {0x2A6D7, 0x2A6FF}, {0x2A701, 0x2B733},
-    {0x2B735, 0x2B73F}, {0x2B741, 0x2B81C}, {0x2B81E, 0x2B81F},
-    {0x2B821, 0x2CEA0}, {0x2CEA2, 0x2CEAF}, {0x2CEB1, 0x2EBDF},
-    {0x2EBE1, 0x2F7FF}, {0x2FA1E, 0xE0000}, {0xE0002, 0xE001F},
-    {0xE0080, 0xE00FF}, {0xE01F0, 0xEFFFF}, {0xFFFFE, 0xFFFFF},
-    {0x10FFFE, 0x110000}
+    {0x1F888, 0x1F88F}, {0x1F8AE, 0x1F8FF}, {0x1F90C, 0x1F90C},
+    {0x1F972, 0x1F972}, {0x1F977, 0x1F979}, {0x1F9A3, 0x1F9A4},
+    {0x1F9AB, 0x1F9AD}, {0x1F9CB, 0x1F9CC}, {0x1FA54, 0x1FA5F},
+    {0x1FA6E, 0x1FA6F}, {0x1FA74, 0x1FA77}, {0x1FA7B, 0x1FA7F},
+    {0x1FA83, 0x1FA8F}, {0x1FA96, 0x1FFFF}, {0x20001, 0x2A6D5},
+    {0x2A6D7, 0x2A6FF}, {0x2A701, 0x2B733}, {0x2B735, 0x2B73F},
+    {0x2B741, 0x2B81C}, {0x2B81E, 0x2B81F}, {0x2B821, 0x2CEA0},
+    {0x2CEA2, 0x2CEAF}, {0x2CEB1, 0x2EBDF}, {0x2EBE1, 0x2F7FF},
+    {0x2FA1E, 0xE0000}, {0xE0002, 0xE001F}, {0xE0080, 0xE00FF},
+    {0xE01F0, 0xEFFFF}, {0xFFFFE, 0xFFFFF}, {0x10FFFE, 0x110000}
 };
 
 /* Characters that were widened from with 1 to 2 in Unicode 9. */
@@ -503,6 +514,8 @@ bool widechar_in_table(const Collection &arr, int32_t c) {
 
 /* Return the width of character c, or a special negative value. */
 int widechar_wcwidth(wchar_t c) {
+    if (widechar_in_table(widechar_ascii_table, c))
+        return 1;
     if (widechar_in_table(widechar_private_table, c))
         return widechar_private_use;
     if (widechar_in_table(widechar_nonprint_table, c))

From a7b1c2f76a779f7f242522905ad227d18dfe579d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 May 2019 09:46:45 +0200
Subject: [PATCH 0537/1732] Drop wcwidth ASCII check

Updated widechar_width takes care of it.

Technically, this does ~3 comparisons more per-character (because it
checks variation selectors and such), but that shouldn't really matter.
---
 src/fallback.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/fallback.cpp b/src/fallback.cpp
index 8fb78ce9c..7eaaa90dd 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -269,10 +269,6 @@ int fish_get_emoji_width(wchar_t c) {
 #include "widecharwidth/widechar_width.h"
 
 int fish_wcwidth(wchar_t wc) {
-    // Normal ASCII characters.
-    // These are the most common case, so it's worth checking them first.
-    if (wc < 0x7f && wc >= 0x20) return 1;
-
     // The system version of wcwidth should accurately reflect the ability to represent characters
     // in the console session, but knows nothing about the capabilities of other terminal emulators
     // or ttys. Use it from the start only if we are logged in to the physical console.

From 005e6f2ab8cf2dd9a2c7801d0bd02729a1535233 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 14 May 2019 09:52:49 -0700
Subject: [PATCH 0538/1732] Revert "Don't service ioport completions if data is
 available on stdin"

This reverts commit 0453023f7b67717eb66bc8923ba74a0adb90bb66.

This broke the history tests. Reverting this while I sort it out.
---
 src/input_common.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index dc89f2b75..fb82b1842 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -134,6 +134,13 @@ static char_event_t readb() {
                 }
             }
 
+            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
+                iothread_service_completion();
+                if (auto mc = s_lookahead->pop_evt()) {
+                    return *mc;
+                }
+            }
+
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
                 unsigned char arr[1];
                 if (read_blocked(0, arr, 1) != 1) {
@@ -144,15 +151,6 @@ static char_event_t readb() {
                 // We read from stdin, so don't loop.
                 return arr[0];
             }
-
-            // Check for iothread completions only if there is no data to be read from the stdin.
-            // This gives priority to the foreground.
-            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
-                iothread_service_completion();
-                if (auto mc = s_lookahead->pop_evt()) {
-                    return *mc;
-                }
-            }
         }
     }
 }

From 0aead5caf8103c17050691df4fb46480cf75a7e1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 May 2019 13:07:04 +0200
Subject: [PATCH 0539/1732] Repaint-mode to reexecute the rest if mode-prompt
 output is empty

We previously checked if fish_mode_prompt existed as a function, but
that's a bad change for those who already set it to an empty function
to have a mode display elsewhere.
---
 sphinx_doc_src/cmds/fish_mode_prompt.rst |  2 ++
 src/reader.cpp                           | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_mode_prompt.rst b/sphinx_doc_src/cmds/fish_mode_prompt.rst
index 83588ec04..965ff2e77 100644
--- a/sphinx_doc_src/cmds/fish_mode_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_mode_prompt.rst
@@ -13,6 +13,8 @@ Description
 The default ``fish_mode_prompt`` function will output indicators about the current Vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. You can also define an empty ``fish_mode_prompt`` function to remove the Vi mode indicators. The ``$fish_bind_mode variable`` can be used to determine the current mode. It
 will be one of ``default``, ``insert``, ``replace_one``, or ``visual``.
 
+fish_mode_prompt will be executed when the vi mode changes. If it produces any output, it is displayed and used. If it does not, the other prompt functions (:ref:`fish_prompt <cmd-fish_prompt>` and :ref:`fish_right_prompt <cmd-fish_right_prompt>`) will be executed as well in case they contain a mode display.
+
 Example
 -------
 
diff --git a/src/reader.cpp b/src/reader.cpp
index e0112c113..222b17c32 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2483,18 +2483,21 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             break;
         }
         case rl::repaint_mode: {
-            // Repaint the mode-prompt only if it exists.
+            // Repaint the mode-prompt only if possible.
             // This is an optimization basically exclusively for vi-mode, since the prompt
             // may sometimes take a while but when switching the mode all we care about is the
             // mode-prompt.
-            if (function_exists(MODE_PROMPT_FUNCTION_NAME, parser())) {
-                exec_mode_prompt();
+            //
+            // Because some users set `fish_mode_prompt` to an empty function and display the mode elsewhere,
+            // we detect if the mode output is empty.
+            exec_mode_prompt();
+            if(!mode_prompt_buff.empty()) {
                 s_reset(&screen, screen_reset_current_line_and_prompt);
                 screen_reset_needed = false;
                 repaint();
                 break;
             }
-            // If it doesn't exist, we repaint as normal.
+            // Else we repaint as normal.
             /* fallthrough */
         }
         case rl::force_repaint:

From 6e0cf5db6fdfb7d35fe71cc3a6aadd1ffbc67fb0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 May 2019 19:23:00 +0200
Subject: [PATCH 0540/1732] docs/status: Fix synopsis

[ci skip]
---
 sphinx_doc_src/cmds/status.rst | 53 ++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/sphinx_doc_src/cmds/status.rst b/sphinx_doc_src/cmds/status.rst
index c058e5986..e503babdf 100644
--- a/sphinx_doc_src/cmds/status.rst
+++ b/sphinx_doc_src/cmds/status.rst
@@ -6,24 +6,41 @@ 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 fish-path
-status function
-status line-number
-status stack-trace
-status job-control CONTROL-TYPE
-status features
-status test-feature FEATURE
+``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 fish-path``
+
+``status function``
+
+``status line-number``
+
+``status stack-trace``
+
+``status job-control CONTROL-TYPE``
+
+``status features``
+
+``status test-feature FEATURE``
 
 
 Description

From 5158ee812b360869c347f8a15ffed604ee0edb4d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 14:42:18 -0700
Subject: [PATCH 0541/1732] Eliminate the job from block_t

This exists only to support the '--on-job-exit caller' feature.
Just store the calling job ID directly in the parser's libdata.
---
 src/builtin_function.cpp | 14 +-------------
 src/parse_execution.cpp  | 19 ++++++++++---------
 src/parser.cpp           |  1 -
 src/parser.h             |  6 ++++--
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index db9777f32..9bc3a2f5f 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -93,19 +93,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                     job_id_t job_id = -1;
 
                     if (is_subshell) {
-                        size_t block_idx = 0;
-
-                        // Find the outermost substitution block.
-                        for (block_idx = 0;; block_idx++) {
-                            const block_t *b = parser.block_at_index(block_idx);
-                            if (b == NULL || b->type() == SUBST) break;
-                        }
-
-                        // Go one step beyond that, to get to the caller.
-                        const block_t *caller_block = parser.block_at_index(block_idx + 1);
-                        if (caller_block != NULL && caller_block->job != NULL) {
-                            job_id = caller_block->job->job_id;
-                        }
+                        job_id = parser.libdata().caller_job_id;
                     }
 
                     if (job_id == -1) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index b03b49525..185012d3b 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1240,27 +1240,28 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     job->set_flag(job_flag_t::SKIP_NOTIFICATION,
                   is_subshell || is_block || is_event || !shell_is_interactive());
 
-    // Tell the current block what its job is. This has to happen before we populate it (#1394).
-    parser->current_block()->job = job;
+    // We are about to populate a job. One possible argument to the job is a command substitution
+    // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
+    // the job ID here.
+    auto &libdata = parser->libdata();
+    const auto saved_caller_jid = libdata.caller_job_id;
+    libdata.caller_job_id = job->job_id;
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
     parse_execution_result_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
-    // Clean up the job on failure or cancellation.
-    bool populated_job = (pop_result == parse_execution_success);
-    if (!populated_job || this->should_cancel_execution(associated_block)) {
-        assert(parser->current_block()->job == job);
-        parser->current_block()->job = NULL;
-        populated_job = false;
-    }
+    assert(libdata.caller_job_id == job->job_id && "Caller job ID unexpectedly changed");
+    parser->libdata().caller_job_id = saved_caller_jid;
 
     // Store time it took to 'parse' the command.
     if (profile_item != NULL) {
         parse_time = get_time();
     }
 
+    // Clean up the job on failure or cancellation.
+    bool populated_job = (pop_result == parse_execution_success);
     if (populated_job) {
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
diff --git a/src/parser.cpp b/src/parser.cpp
index ec3a0665b..c3fe487ff 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -138,7 +138,6 @@ void parser_t::push_block_int(block_t *new_current) {
         new_current->skip = false;
     }
 
-    new_current->job = nullptr;
     new_current->loop_status = LOOP_NORMAL;
 
     // Push it onto our stack. This acquires ownership because of unique_ptr.
diff --git a/src/parser.h b/src/parser.h
index 4917eef64..ee1e1d79e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -67,8 +67,6 @@ struct block_t {
     bool skip{false};
     /// Status for the current loop block. Can be any of the values from the loop_status enum.
     enum loop_status_t loop_status { LOOP_NORMAL };
-    /// The job that is currently evaluated in the specified block.
-    shared_ptr<job_t> job{};
     /// Name of file that created this block. This string is intern'd.
     const wchar_t *src_filename{nullptr};
     /// Line number where this block was created.
@@ -159,6 +157,10 @@ struct library_data_t {
 
     /// Whether we are currently cleaning processes.
     bool is_cleaning_procs{false};
+
+    /// The job id of the job being populated.
+    /// This supports the '--on-job-exit caller' feature.
+    job_id_t caller_job_id{-1};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From be41407610c622f4a00a39123126e656c69c72ec Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 14:59:30 -0700
Subject: [PATCH 0542/1732] Make have_proc_stat an ordinary function

Removes a mutable global variable.
---
 src/builtin_jobs.cpp | 4 ++--
 src/env.cpp          | 4 ----
 src/proc.cpp         | 9 +++++++--
 src/proc.h           | 2 +-
 src/reader.cpp       | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 905a7db8d..e3be3f63d 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -54,7 +54,7 @@ static void builtin_jobs_print(const job_t *j, int mode, int header, io_streams_
             if (header) {
                 // Print table header before first job.
                 streams.out.append(_(L"Job\tGroup\t"));
-                if (have_proc_stat) {
+                if (have_proc_stat()) {
                     streams.out.append(_(L"CPU\t"));
                 }
                 streams.out.append(_(L"State\tCommand\n"));
@@ -62,7 +62,7 @@ static void builtin_jobs_print(const job_t *j, int mode, int header, io_streams_
 
             streams.out.append_format(L"%d\t%d\t", j->job_id, j->pgid);
 
-            if (have_proc_stat) {
+            if (have_proc_stat()) {
                 streams.out.append_format(L"%d%%\t", cpu_use(j));
             }
 
diff --git a/src/env.cpp b/src/env.cpp
index bee66a820..9deefb77b 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -219,10 +219,6 @@ void misc_init() {
         fflush(stdout);
         setvbuf(stdout, NULL, _IONBF, 0);
     }
-    // Check for /proc/self/stat to see if we are running with Linux-style procfs
-    if (access("/proc/self/stat", R_OK) == 0) {
-        have_proc_stat = true;
-    }
 }
 
 /// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
diff --git a/src/proc.cpp b/src/proc.cpp
index c38f06898..8dc66a0e1 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -59,7 +59,12 @@ bool is_breakpoint = false;
 bool is_login = false;
 int is_event = 0;
 int no_exec = 0;
-bool have_proc_stat = false;
+
+bool have_proc_stat() {
+    // Check for /proc/self/stat to see if we are running with Linux-style procfs.
+    static const bool s_result = (access("/proc/self/stat", R_OK) == 0);
+    return s_result;
+}
 
 static relaxed_atomic_t<job_control_t> job_control_mode{job_control_t::interactive};
 
@@ -623,7 +628,7 @@ bool job_reap(parser_t &parser, bool allow_interactive) {
 
 /// Get the CPU time for the specified process.
 unsigned long proc_get_jiffies(process_t *p) {
-    if (!have_proc_stat) return 0;
+    if (!have_proc_stat()) return 0;
     if (p->pid <= 0) return 0;
 
     wchar_t fn[FN_SIZE];
diff --git a/src/proc.h b/src/proc.h
index 7126e6ee4..8097f96e9 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -517,6 +517,6 @@ void add_disowned_pgid(pid_t pgid);
 ///   function
 enum { INVALID_PID = -2 };
 
-extern bool have_proc_stat;
+bool have_proc_stat();
 
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index 222b17c32..e6998bc25 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1963,7 +1963,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     // For compatibility with fish 2.0's $_, now replaced with `status current-command`
     parser.vars().set_one(L"_", ENV_GLOBAL, program_name);
 
-    if (have_proc_stat) {
+    if (have_proc_stat()) {
         proc_update_jiffies(parser);
     }
 }

From 4fcb9d1fed5fe1076c853199a086e26e73456994 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 15:04:18 -0700
Subject: [PATCH 0543/1732] Hide no_exec behind a function

---
 src/builtin.cpp         | 2 +-
 src/exec.cpp            | 2 +-
 src/fish.cpp            | 6 +++---
 src/parse_execution.cpp | 4 ++--
 src/proc.cpp            | 5 ++++-
 src/proc.h              | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 43419df69..a87b7ef5e 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -156,7 +156,7 @@ wcstring builtin_help_get(parser_t &parser, io_streams_t &streams, const wchar_t
     UNUSED(parser);
     UNUSED(streams);
     // This won't ever work if no_exec is set.
-    if (no_exec) return wcstring();
+    if (no_exec()) return wcstring();
 
     wcstring_list_t lst;
     wcstring out;
diff --git a/src/exec.cpp b/src/exec.cpp
index 8b6d884e6..2dcca1198 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1019,7 +1019,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     bool exec_error = false;
 
     // If fish was invoked with -n or --no-execute, then no_exec will be set and we do nothing.
-    if (no_exec) {
+    if (no_exec()) {
         return true;
     }
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 2ce6f0828..afc58c4bd 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -310,7 +310,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 break;
             }
             case 'n': {
-                no_exec = 1;
+                set_no_exec(true);
                 break;
             }
             case 1: {
@@ -390,9 +390,9 @@ int main(int argc, char **argv) {
     my_optind = fish_parse_opt(argc, argv, &opts);
 
     // No-exec is prohibited when in interactive mode.
-    if (is_interactive_session && no_exec) {
+    if (is_interactive_session && no_exec()) {
         debug(1, _(L"Can not use the no-execute mode when running an interactive session"));
-        no_exec = 0;
+        set_no_exec(false);
     }
 
     // Only save (and therefore restore) the fg process group if we are interactive. See issues
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 185012d3b..8ac906ab8 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -601,7 +601,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
 
         // no_exec means that fish was invoked with -n or --no-execute. If set, we allow the loop to
         // not-execute once so its contents can be checked, and then break.
-        if (no_exec) {
+        if (no_exec()) {
             break;
         }
     }
@@ -959,7 +959,7 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
 
         // PCA: I can't justify this skip_variables flag. It was like this when I got here.
         bool target_expanded =
-            expand_one(target, no_exec ? expand_flag::skip_variables : expand_flags_t{},
+            expand_one(target, no_exec() ? expand_flag::skip_variables : expand_flags_t{},
                        parser->vars(), parser->shared());
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
diff --git a/src/proc.cpp b/src/proc.cpp
index 8dc66a0e1..b6f284e3e 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -58,7 +58,10 @@ bool is_block = false;
 bool is_breakpoint = false;
 bool is_login = false;
 int is_event = 0;
-int no_exec = 0;
+
+static relaxed_atomic_bool_t s_no_exec;
+bool no_exec() { return s_no_exec; }
+void set_no_exec(bool flag) { s_no_exec = flag; }
 
 bool have_proc_stat() {
     // Check for /proc/self/stat to see if we are running with Linux-style procfs.
diff --git a/src/proc.h b/src/proc.h
index 8097f96e9..d07a5ecb4 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -448,7 +448,8 @@ void set_job_control_mode(job_control_t mode);
 /// If this flag is set, fish will never fork or run execve. It is used to put fish into a syntax
 /// verifier mode where fish tries to validate the syntax of a file but doesn't actually do
 /// anything.
-extern int no_exec;
+bool no_exec();
+void set_no_exec(bool flag);
 
 /// Notify the user about stopped or terminated jobs, and delete completed jobs from the job list.
 /// If \p interactive is set, allow removing interactive jobs; otherwise skip them.

From c44dae2d73a9131e5fe7b82e11eedb8358dada03 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 15:48:00 -0700
Subject: [PATCH 0544/1732] Migrate certain runtime flags to atomics hidden
 behind functions

---
 src/builtin.cpp             |  2 +-
 src/builtin_commandline.cpp |  2 +-
 src/builtin_status.cpp      |  6 +++---
 src/env_dispatch.cpp        |  6 +++---
 src/fish.cpp                | 31 +++++++++++++++++++++----------
 src/fish_key_reader.cpp     |  2 +-
 src/fish_tests.cpp          |  5 +++--
 src/proc.cpp                | 16 +++++++++++-----
 src/proc.h                  | 20 +++++++++++---------
 src/reader.cpp              |  6 +++---
 10 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index a87b7ef5e..ffc2be4d9 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -468,7 +468,7 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
     if (const builtin_data_t *data = builtin_lookup(argv[0])) {
         // If we are interactive, save the foreground pgroup and restore it after in case the
         // builtin needs to read from the terminal. See #4540.
-        bool grab_tty = is_interactive_session && isatty(streams.stdin_fd);
+        bool grab_tty = is_interactive_session() && isatty(streams.stdin_fd);
         pid_t pgroup_to_restore = grab_tty ? terminal_acquire_before_builtin(job_pgid) : -1;
         int ret = data->func(parser, streams, argv);
         if (pgroup_to_restore >= 0) {
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index d37e87384..b8ab7e82b 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -188,7 +188,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     }
 
     if (!current_buffer) {
-        if (is_interactive_session) {
+        if (is_interactive_session()) {
             // Prompt change requested while we don't have a prompt, most probably while reading the
             // init files. Just ignore it.
             return STATUS_CMD_ERROR;
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 1230d6e5c..e800ac1d2 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -304,7 +304,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     switch (opts.status_cmd) {
         case STATUS_UNDEF: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            if (is_login) {
+            if (get_login()) {
                 streams.out.append_format(_(L"This is a login shell\n"));
             } else {
                 streams.out.append_format(_(L"This is not a login shell\n"));
@@ -384,7 +384,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_INTERACTIVE: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_interactive_session;
+            retval = !is_interactive_session();
             break;
         }
         case STATUS_IS_COMMAND_SUB: {
@@ -404,7 +404,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_LOGIN: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_login;
+            retval = !get_login();
             break;
         }
         case STATUS_IS_FULL_JOB_CTRL: {
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index ce21444d8..cae845b6a 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -402,11 +402,11 @@ static bool initialize_curses_using_fallback(const char *term) {
     auto term_env = wcs2string(term_var->as_string());
     if (term_env == DEFAULT_TERM1 || term_env == DEFAULT_TERM2) return false;
 
-    if (is_interactive_session) debug(1, _(L"Using fallback terminal type '%s'."), term);
+    if (is_interactive_session()) debug(1, _(L"Using fallback terminal type '%s'."), term);
 
     int err_ret;
     if (setupterm((char *)term, STDOUT_FILENO, &err_ret) == OK) return true;
-    if (is_interactive_session) {
+    if (is_interactive_session()) {
         debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
     }
     return false;
@@ -465,7 +465,7 @@ static void init_curses(const environment_t &vars) {
     int err_ret;
     if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
         auto term = vars.get(L"TERM");
-        if (is_interactive_session) {
+        if (is_interactive_session()) {
             debug(1, _(L"Could not set up terminal."));
             if (term.missing_or_empty()) {
                 debug(1, _(L"TERM environment variable not set."));
diff --git a/src/fish.cpp b/src/fish.cpp
index afc58c4bd..e79b96811 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -66,6 +66,12 @@ class fish_cmd_opts_t {
     std::vector<std::string> postconfig_cmds;
     /// Whether to print rusage-self stats after execution.
     bool print_rusage_self{false};
+    /// Whether no-exec is set.
+    bool no_exec{false};
+    /// Whether this is a login shell.
+    bool is_login{false};
+    /// Whether this is an interactive session.
+    bool is_interactive_session{false};
 };
 
 /// If we are doing profiling, the filename to output to.
@@ -302,15 +308,15 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 break;
             }
             case 'i': {
-                is_interactive_session = true;
+                opts->is_interactive_session = true;
                 break;
             }
             case 'l': {
-                is_login = true;
+                opts->is_login = true;
                 break;
             }
             case 'n': {
-                set_no_exec(true);
+                opts->no_exec = true;
                 break;
             }
             case 1: {
@@ -356,13 +362,13 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
     }
 
     // If our command name begins with a dash that implies we're a login shell.
-    is_login |= argv[0][0] == '-';
+    opts->is_login |= argv[0][0] == '-';
 
     // We are an interactive session if we have not been given an explicit
     // command or file to execute and stdin is a tty. Note that the -i or
     // --interactive options also force interactive mode.
     if (opts->batch_cmds.size() == 0 && optind == argc && isatty(STDIN_FILENO)) {
-        is_interactive_session = 1;
+        set_interactive_session(true);
     }
 
     return optind;
@@ -386,18 +392,23 @@ int main(int argc, char **argv) {
         argv = (char **)dummy_argv;  //!OCLINT(parameter reassignment)
         argc = 1;                    //!OCLINT(parameter reassignment)
     }
-    fish_cmd_opts_t opts;
+    fish_cmd_opts_t opts{};
     my_optind = fish_parse_opt(argc, argv, &opts);
 
     // No-exec is prohibited when in interactive mode.
-    if (is_interactive_session && no_exec()) {
+    if (opts.is_interactive_session && opts.no_exec) {
         debug(1, _(L"Can not use the no-execute mode when running an interactive session"));
-        set_no_exec(false);
+        opts.no_exec = false;
     }
 
+    // Apply our options.
+    if (opts.is_login) mark_login();
+    if (opts.no_exec) mark_no_exec();
+    if (opts.is_interactive_session) set_interactive_session(true);
+
     // Only save (and therefore restore) the fg process group if we are interactive. See issues
     // #197 and #1002.
-    if (is_interactive_session) {
+    if (is_interactive_session()) {
         save_term_foreground_process_group();
     }
 
@@ -430,7 +441,7 @@ int main(int argc, char **argv) {
 
         if (!opts.batch_cmds.empty()) {
             // Run the commands specified as arguments, if any.
-            if (is_login) {
+            if (get_login()) {
                 // Do something nasty to support OpenSUSE assuming we're bash. This may modify cmds.
                 fish_xdm_login_hack_hack_hack_hack(&opts.batch_cmds, argc - my_optind,
                                                    argv + my_optind);
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 0100d690d..4f802eb69 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -281,7 +281,7 @@ static void install_our_signal_handlers() {
 
 /// Setup our environment (e.g., tty modes), process key strokes, then reset the environment.
 static void setup_and_process_keys(bool continuous_mode) {
-    is_interactive_session = 1;  // by definition this program is interactive
+    set_interactive_session(true);  // by definition this program is interactive
     set_main_thread();
     setup_fork_guards();
     proc_push_interactive(1);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index c74dc0974..77c26b494 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1031,10 +1031,11 @@ static void test_cancellation() {
     // Test for #3780
     // Ugly hack - temporarily set is_interactive_session
     // else we will SIGINT ourselves in response to our child death
-    scoped_push<bool> iis(&is_interactive_session, true);
+    bool iis = is_interactive_session();
+    set_interactive_session(true);
     const wchar_t *child_self_destructor = L"while true ; sh -c 'sleep .25; kill -s INT $$' ; end";
     parser_t::principal_parser().eval(child_self_destructor, io_chain_t(), TOP);
-    iis.restore();
+    set_interactive_session(iis);
 
     // Restore signal handling.
     proc_pop_interactive();
diff --git a/src/proc.cpp b/src/proc.cpp
index b6f284e3e..cb0284eaa 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -52,16 +52,22 @@
 /// The signals that signify crashes to us.
 static const int crashsignals[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGSYS};
 
-bool is_interactive_session = false;
 bool is_subshell = false;
 bool is_block = false;
 bool is_breakpoint = false;
-bool is_login = false;
 int is_event = 0;
 
-static relaxed_atomic_bool_t s_no_exec;
+static relaxed_atomic_bool_t s_is_interactive_session{false};
+bool is_interactive_session() { return s_is_interactive_session; }
+void set_interactive_session(bool flag) { s_is_interactive_session = flag; }
+
+static relaxed_atomic_bool_t s_is_login{false};
+bool get_login() { return s_is_login; }
+void mark_login() { s_is_login = true; }
+
+static relaxed_atomic_bool_t s_no_exec{false};
 bool no_exec() { return s_no_exec; }
-void set_no_exec(bool flag) { s_no_exec = flag; }
+void mark_no_exec() { s_no_exec = true; }
 
 bool have_proc_stat() {
     // Check for /proc/self/stat to see if we are running with Linux-style procfs.
@@ -245,7 +251,7 @@ static void handle_child_status(process_t *proc, proc_status_t status) {
     if (status.signal_exited()) {
         int sig = status.signal_code();
         if (sig == SIGINT || sig == SIGQUIT) {
-            if (is_interactive_session) {
+            if (is_interactive_session()) {
                 // In an interactive session, tell the principal parser to skip all blocks we're
                 // executing so control-C returns control to the user.
                 parser_t::skip_all_blocks();
diff --git a/src/proc.h b/src/proc.h
index d07a5ecb4..24f1336d3 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -415,7 +415,7 @@ class job_t {
 };
 
 /// Whether we are reading from the keyboard right now.
-bool shell_is_interactive(void);
+bool shell_is_interactive();
 
 /// Whether we are running a subshell command.
 extern bool is_subshell;
@@ -427,10 +427,18 @@ extern bool is_block;
 extern bool is_breakpoint;
 
 /// Whether this shell is attached to the keyboard at all.
-extern bool is_interactive_session;
+bool is_interactive_session();
+void set_interactive_session(bool flag);
 
 /// Whether we are a login shell.
-extern bool is_login;
+bool get_login();
+void mark_login();
+
+/// If this flag is set, fish will never fork or run execve. It is used to put fish into a syntax
+/// verifier mode where fish tries to validate the syntax of a file but doesn't actually do
+/// anything.
+bool no_exec();
+void mark_no_exec();
 
 /// Whether we are running an event handler. This is not a bool because we keep count of the event
 /// nesting level.
@@ -445,12 +453,6 @@ typedef std::deque<shared_ptr<job_t>> job_list_t;
 job_control_t get_job_control_mode();
 void set_job_control_mode(job_control_t mode);
 
-/// If this flag is set, fish will never fork or run execve. It is used to put fish into a syntax
-/// verifier mode where fish tries to validate the syntax of a file but doesn't actually do
-/// anything.
-bool no_exec();
-void set_no_exec(bool flag);
-
 /// Notify the user about stopped or terminated jobs, and delete completed jobs from the job list.
 /// If \p interactive is set, allow removing interactive jobs; otherwise skip them.
 /// \return whether text was printed to stdout.
diff --git a/src/reader.cpp b/src/reader.cpp
index e6998bc25..203bfd2e9 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1731,7 +1731,7 @@ static void reader_interactive_init() {
                 owner = tcgetpgrp(STDIN_FILENO);
             }
             if (owner == -1 && errno == ENOTTY) {
-                if (!is_interactive_session) {
+                if (!is_interactive_session()) {
                     // It's OK if we're not able to take control of the terminal. We handle
                     // the fallout from this in a few other places.
                     break;
@@ -3229,7 +3229,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         // This check is required to work around certain issues with fish's approach to
         // terminal control when launching interactive processes while in non-interactive
         // mode. See #4178 for one such example.
-        if (err != ENOTTY || is_interactive_session) {
+        if (err != ENOTTY || is_interactive_session()) {
             wperror(L"tcsetattr");
         }
     }
@@ -3333,7 +3333,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     if (!reader_exit_forced()) {
         // The order of the two conditions below is important. Try to restore the mode
         // in all cases, but only complain if interactive.
-        if (tcsetattr(0, TCSANOW, &old_modes) == -1 && is_interactive_session) {
+        if (tcsetattr(0, TCSANOW, &old_modes) == -1 && is_interactive_session()) {
             if (errno == EIO) redirect_tty_output();
             wperror(L"tcsetattr");  // return to previous mode
         }

From 508c3a800570ea91976af80f9b79150ec2e0239f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 12 May 2019 18:02:57 -0700
Subject: [PATCH 0545/1732] Make is_event and other globals part of parser_t
 libdata

---
 src/builtin_function.cpp |  2 +-
 src/builtin_status.cpp   |  6 +++---
 src/event.cpp            | 17 +++++++++++++----
 src/exec.cpp             |  6 +++---
 src/parse_execution.cpp  |  5 +++--
 src/parser.cpp           |  8 ++++----
 src/parser.h             | 13 +++++++++++++
 src/proc.cpp             |  5 -----
 src/proc.h               | 13 -------------
 src/reader.cpp           |  2 +-
 10 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 9bc3a2f5f..94df2c21d 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -92,7 +92,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                 if ((opt == 'j') && (wcscasecmp(w.woptarg, L"caller") == 0)) {
                     job_id_t job_id = -1;
 
-                    if (is_subshell) {
+                    if (parser.libdata().is_subshell) {
                         job_id = parser.libdata().caller_job_id;
                     }
 
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index e800ac1d2..25fe787cf 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -389,17 +389,17 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_COMMAND_SUB: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_subshell;
+            retval = parser.libdata().is_subshell ? 0 : 1;
             break;
         }
         case STATUS_IS_BLOCK: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_block;
+            retval = parser.libdata().is_block ? 0 : 1;
             break;
         }
         case STATUS_IS_BREAKPOINT: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_breakpoint;
+            retval = parser.libdata().is_breakpoint ? 0 : 1;
             break;
         }
         case STATUS_IS_LOGIN: {
diff --git a/src/event.cpp b/src/event.cpp
index 57975bb7f..e42a85921 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -248,8 +248,9 @@ bool event_is_signal_observed(int sig) {
 /// allocated/initialized unless needed.
 static void event_fire_internal(const event_t &event) {
     ASSERT_IS_MAIN_THREAD();
-    assert(is_event >= 0 && "is_event should not be negative");
-    scoped_push<decltype(is_event)> inc_event{&is_event, is_event + 1};
+    auto &ld = parser_t::principal_parser().libdata();
+    assert(ld.is_event >= 0 && "is_event should not be negative");
+    scoped_push<decltype(ld.is_event)> inc_event{&ld.is_event, ld.is_event + 1};
 
     // Capture the event handlers that match this event.
     event_handler_list_t fire;
@@ -293,9 +294,13 @@ static void event_fire_internal(const event_t &event) {
 
 /// Handle all pending signal events.
 void event_fire_delayed() {
-    ASSERT_IS_MAIN_THREAD();
+    // Hack: only allow events on the main thread.
+    // TODO: rationalize how events work with multiple threads.
+    if (!is_main_thread()) return;
+
+    auto &parser = parser_t::principal_parser();
     // Do not invoke new event handlers from within event handlers.
-    if (is_event) return;
+    if (parser.libdata().is_event) return;
 
     event_list_t to_send;
     to_send.swap(blocked);
@@ -330,6 +335,10 @@ void event_enqueue_signal(int signal) {
 }
 
 void event_fire(const event_t &event) {
+    // Hack: only allow events on the main thread.
+    // TODO: rationalize how events work with multiple threads.
+    if (!is_main_thread()) return;
+
     // Fire events triggered by signals.
     event_fire_delayed();
 
diff --git a/src/exec.cpp b/src/exec.cpp
index 2dcca1198..067f9eb03 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1130,7 +1130,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
 static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstring_list_t *lst,
                                   bool apply_exit_status, bool is_subcmd) {
     ASSERT_IS_MAIN_THREAD();
-    bool prev_subshell = is_subshell;
+    bool prev_subshell = parser.libdata().is_subshell;
     auto prev_statuses = parser.get_last_statuses();
     bool split_output = false;
 
@@ -1139,7 +1139,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
         split_output = true;
     }
 
-    is_subshell = true;
+    parser.libdata().is_subshell = true;
     auto subcommand_statuses = statuses_t::just(-1);  // assume the worst
 
     // IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
@@ -1165,7 +1165,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
         parser.set_last_statuses(std::move(prev_statuses));
     }
 
-    is_subshell = prev_subshell;
+    parser.libdata().is_subshell = prev_subshell;
 
     if (lst == NULL || !buffer) {
         return subcommand_statuses.status;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8ac906ab8..fc6ab1b71 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1227,6 +1227,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), block_io, parent_job);
+    auto &ld = parser_t::principal_parser().libdata();
     job->tmodes = tmodes;
     auto job_control_mode = get_job_control_mode();
     job->set_flag(job_flag_t::JOB_CONTROL,
@@ -1235,10 +1236,10 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
     job->set_flag(job_flag_t::FOREGROUND, !job_node_is_background(job_node));
 
-    job->set_flag(job_flag_t::TERMINAL, job->get_flag(job_flag_t::JOB_CONTROL) && !is_event);
+    job->set_flag(job_flag_t::TERMINAL, job->get_flag(job_flag_t::JOB_CONTROL) && !ld.is_event);
 
     job->set_flag(job_flag_t::SKIP_NOTIFICATION,
-                  is_subshell || is_block || is_event || !shell_is_interactive());
+                  ld.is_subshell || ld.is_block || ld.is_event || !shell_is_interactive());
 
     // We are about to populate a job. One possible argument to the job is a command substitution
     // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
diff --git a/src/parser.cpp b/src/parser.cpp
index c3fe487ff..d38c8f301 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -145,11 +145,11 @@ void parser_t::push_block_int(block_t *new_current) {
 
     // Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
     if (type != TOP && type != SUBST) {
-        is_block = true;
+        libdata().is_block = true;
     }
 
     if (type == BREAKPOINT) {
-        is_breakpoint = true;
+        libdata().is_breakpoint = true;
     }
 
     if (new_current->type() != TOP) {
@@ -182,7 +182,7 @@ void parser_t::pop_block(const block_t *expected) {
             break;
         }
     }
-    is_block = new_is_block;
+    libdata().is_block = new_is_block;
 
     // Are we still in a breakpoint?
     bool new_is_breakpoint = false;
@@ -193,7 +193,7 @@ void parser_t::pop_block(const block_t *expected) {
             break;
         }
     }
-    is_breakpoint = new_is_breakpoint;
+    libdata().is_breakpoint = new_is_breakpoint;
 }
 
 const wchar_t *parser_t::get_block_desc(int block) const {
diff --git a/src/parser.h b/src/parser.h
index ee1e1d79e..e1f1af04e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -161,6 +161,19 @@ struct library_data_t {
     /// The job id of the job being populated.
     /// This supports the '--on-job-exit caller' feature.
     job_id_t caller_job_id{-1};
+
+    /// Whether we are running a subshell command.
+    bool is_subshell{false};
+
+    /// Whether we are running a block of commands.
+    bool is_block{false};
+
+    /// Whether we are running due to a `breakpoint` command.
+    bool is_breakpoint{false};
+
+    /// Whether we are running an event handler. This is not a bool because we keep count of the
+    /// event nesting level.
+    int is_event{0};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {
diff --git a/src/proc.cpp b/src/proc.cpp
index cb0284eaa..a20174bf0 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -52,11 +52,6 @@
 /// The signals that signify crashes to us.
 static const int crashsignals[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGSYS};
 
-bool is_subshell = false;
-bool is_block = false;
-bool is_breakpoint = false;
-int is_event = 0;
-
 static relaxed_atomic_bool_t s_is_interactive_session{false};
 bool is_interactive_session() { return s_is_interactive_session; }
 void set_interactive_session(bool flag) { s_is_interactive_session = flag; }
diff --git a/src/proc.h b/src/proc.h
index 24f1336d3..eb12e5b92 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -417,15 +417,6 @@ class job_t {
 /// Whether we are reading from the keyboard right now.
 bool shell_is_interactive();
 
-/// Whether we are running a subshell command.
-extern bool is_subshell;
-
-/// Whether we are running a block of commands.
-extern bool is_block;
-
-/// Whether we are running due to a `breakpoint` command.
-extern bool is_breakpoint;
-
 /// Whether this shell is attached to the keyboard at all.
 bool is_interactive_session();
 void set_interactive_session(bool flag);
@@ -440,10 +431,6 @@ void mark_login();
 bool no_exec();
 void mark_no_exec();
 
-/// Whether we are running an event handler. This is not a bool because we keep count of the event
-/// nesting level.
-extern int is_event;
-
 // List of jobs.
 typedef std::deque<shared_ptr<job_t>> job_list_t;
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 203bfd2e9..02836ec8d 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2264,7 +2264,7 @@ static int read_i() {
         event_fire_generic(L"fish_prompt");
         run_count++;
 
-        if (is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
+        if (parser.libdata().is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
             reader_set_left_prompt(DEBUG_PROMPT_FUNCTION_NAME);
         } else if (function_exists(LEFT_PROMPT_FUNCTION_NAME, parser)) {
             reader_set_left_prompt(LEFT_PROMPT_FUNCTION_NAME);

From c42eb0eb4fffb84252feda8c908a50502cb45bba Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 20:58:45 -0700
Subject: [PATCH 0546/1732] Remove the process from function_block_t

Prior to this fix, a function_block stored a process_t, which was only used
when printing backtraces. Switch this to an array of arguments, and make
various other cleanups around null terminated argument arrays.
---
 src/builtin_source.cpp |  4 +++-
 src/common.h           | 12 ++++++++++++
 src/env.cpp            | 12 +-----------
 src/env.h              |  4 ++--
 src/exec.cpp           |  9 +++++++--
 src/function.cpp       | 11 +++++------
 src/function.h         |  3 +--
 src/parser.cpp         | 40 ++++++++++++++++++----------------------
 src/parser.h           |  4 ++--
 9 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 7dadc8528..6abb467f0 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -78,7 +78,9 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     // This is slightly subtle. If this is a bare `source` with no args then `argv + optind` already
     // points to the end of argv. Otherwise we want to skip the file name to get to the args if any.
-    parser.vars().set_argv(argv + optind + (argc == optind ? 0 : 1));
+    wcstring_list_t argv_list =
+        null_terminated_array_t<wchar_t>::to_list(argv + optind + (argc == optind ? 0 : 1));
+    parser.vars().set_argv(std::move(argv_list));
 
     retval = reader_read(fd, streams.io_chain ? *streams.io_chain : io_chain_t());
 
diff --git a/src/common.h b/src/common.h
index 4ca30c9db..4a94a4aef 100644
--- a/src/common.h
+++ b/src/common.h
@@ -584,6 +584,18 @@ class null_terminated_array_t {
         this->array = make_null_terminated_array(argv);
     }
 
+    /// Convert from a null terminated list to a vector of strings.
+    static string_list_t to_list(const CharType_t *const *arr) {
+        string_list_t result;
+        for (const auto *cursor = arr; cursor && *cursor; cursor++) {
+            result.push_back(*cursor);
+        }
+        return result;
+    }
+
+    /// Instance method.
+    string_list_t to_list() const { return to_list(array); }
+
     const CharType_t *const *get() const { return array; }
     CharType_t **get() { return array; }
 
diff --git a/src/env.cpp b/src/env.cpp
index 9deefb77b..bc36d4921 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1257,17 +1257,7 @@ std::shared_ptr<const null_terminated_array_t<char>> env_stack_t::export_arr() {
 
 std::shared_ptr<environment_t> env_stack_t::snapshot() const { return acquire_impl()->snapshot(); }
 
-void env_stack_t::set_argv(const wchar_t *const *argv) {
-    if (argv && *argv) {
-        wcstring_list_t list;
-        for (auto arg = argv; *arg; arg++) {
-            list.emplace_back(*arg);
-        }
-        set(L"argv", ENV_LOCAL, std::move(list));
-    } else {
-        set_empty(L"argv", ENV_LOCAL);
-    }
-}
+void env_stack_t::set_argv(wcstring_list_t argv) { set(L"argv", ENV_LOCAL, std::move(argv)); }
 
 void env_stack_t::push(bool new_scope) {
     auto impl = acquire_impl();
diff --git a/src/env.h b/src/env.h
index e310d856f..e51cee02b 100644
--- a/src/env.h
+++ b/src/env.h
@@ -284,8 +284,8 @@ class env_stack_t final : public environment_t {
     /// Update the termsize variable.
     void set_termsize();
 
-    /// Sets up argv as the given null terminated array of strings.
-    void set_argv(const wchar_t *const *argv);
+    /// Sets up argv as the given list of strings.
+    void set_argv(wcstring_list_t argv);
 
     /// Mark that exported variables have changed.
     void mark_changed_exported();
diff --git a/src/exec.cpp b/src/exec.cpp
index 067f9eb03..f5937e546 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -817,9 +817,14 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 
         const std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
 
+        // TODO: we want to store the args in both the function block and the environment.
+        // Find a way to share memory here?
+        wcstring_list_t argv = p->get_argv_array().to_list();
+        // Remove the function name from argv.
+        if (!argv.empty()) argv.erase(argv.begin());
         function_block_t *fb =
-            parser.push_block<function_block_t>(p, func_name, props->shadow_scope);
-        function_prepare_environment(parser.vars(), func_name, p->get_argv() + 1, inherit_vars);
+            parser.push_block<function_block_t>(func_name, argv, props->shadow_scope);
+        function_prepare_environment(parser.vars(), func_name, std::move(argv), inherit_vars);
         parser.forbid_function(func_name);
 
         internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
diff --git a/src/function.cpp b/src/function.cpp
index 85c24ac0a..cc2f1f0f9 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -371,17 +371,16 @@ void function_invalidate_path() {
 // 1. argv
 // 2. named arguments
 // 3. inherited variables
-void function_prepare_environment(env_stack_t &vars, const wcstring &name,
-                                  const wchar_t *const *argv,
+void function_prepare_environment(env_stack_t &vars, const wcstring &name, wcstring_list_t argv,
                                   const std::map<wcstring, env_var_t> &inherited_vars) {
     vars.set_argv(argv);
     auto props = function_get_properties(name);
     if (props && !props->named_arguments.empty()) {
-        const wchar_t *const *arg = argv;
+        auto argv_iter = argv.cbegin();
         for (const wcstring &named_arg : props->named_arguments) {
-            if (*arg) {
-                vars.set_one(named_arg, ENV_LOCAL | ENV_USER, *arg);
-                arg++;
+            if (argv_iter != argv.cend()) {
+                vars.set_one(named_arg, ENV_LOCAL | ENV_USER, std::move(*argv_iter));
+                ++argv_iter;
             } else {
                 vars.set_empty(named_arg, ENV_LOCAL | ENV_USER);
             }
diff --git a/src/function.h b/src/function.h
index ad9aee778..dcfb14cb8 100644
--- a/src/function.h
+++ b/src/function.h
@@ -109,8 +109,7 @@ std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name);
 bool function_copy(const wcstring &name, const wcstring &new_name);
 
 /// Prepares the environment for executing a function.
-void function_prepare_environment(env_stack_t &vars, const wcstring &name,
-                                  const wchar_t *const *argv,
+void function_prepare_environment(env_stack_t &vars, const wcstring &name, wcstring_list_t argv,
                                   const std::map<wcstring, env_var_t> &inherited_vars);
 
 /// Observes that fish_function_path has changed.
diff --git a/src/parser.cpp b/src/parser.cpp
index d38c8f301..84e58a8b2 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -368,8 +368,6 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
     if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW || b->type() == SOURCE ||
         b->type() == SUBST) {
         // These types of blocks should be printed.
-        int i;
-
         switch (b->type()) {
             case SOURCE: {
                 const source_block_t *sb = static_cast<const source_block_t *>(b);
@@ -382,27 +380,23 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
             case FUNCTION_CALL_NO_SHADOW: {
                 const function_block_t *fb = static_cast<const function_block_t *>(b);
                 append_format(*buff, _(L"in function '%ls'"), fb->name.c_str());
-                const process_t *const process = fb->process;
                 // Print arguments on the same line.
-                if (process->argv(1)) {
-                    wcstring tmp;
-
-                    for (i = 1; process->argv(i); i++) {
-                        if (i > 1) tmp.push_back(L' ');
-                        // We can't quote the arguments because we print this in quotes.
-                        // As a special-case, add the empty argument as "".
-                        if (process->argv(i)[0]) {
-                            tmp.append(
-                                escape_string(process->argv(i), ESCAPE_ALL | ESCAPE_NO_QUOTED));
-                        } else {
-                            tmp.append(L"\"\"");
-                        }
+                wcstring args_str;
+                for (const wcstring &arg : fb->args) {
+                    if (!args_str.empty()) args_str.push_back(L' ');
+                    // We can't quote the arguments because we print this in quotes.
+                    // As a special-case, add the empty argument as "".
+                    if (!arg.empty()) {
+                        args_str.append(escape_string(arg, ESCAPE_ALL | ESCAPE_NO_QUOTED));
+                    } else {
+                        args_str.append(L"\"\"");
                     }
-                    // TODO: Escape these.
-                    append_format(*buff, _(L" with arguments '%ls'\n"), tmp.c_str());
-                } else {
-                    buff->append(L"\n");
                 }
+                if (!args_str.empty()) {
+                    // TODO: Escape these.
+                    append_format(*buff, _(L" with arguments '%ls'"), args_str.c_str());
+                }
+                buff->push_back('\n');
                 break;
             }
             case SUBST: {
@@ -846,8 +840,10 @@ if_block_t::if_block_t() : block_t(IF) {}
 
 event_block_t::event_block_t(const event_t &evt) : block_t(EVENT), event(evt) {}
 
-function_block_t::function_block_t(const process_t *p, wcstring n, bool shadows)
-    : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW), process(p), name(std::move(n)) {}
+function_block_t::function_block_t(wcstring name, wcstring_list_t args, bool shadows)
+    : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW),
+      name(std::move(name)),
+      args(std::move(args)) {}
 
 source_block_t::source_block_t(const wchar_t *src) : block_t(SOURCE), source_file(src) {}
 
diff --git a/src/parser.h b/src/parser.h
index e1f1af04e..6e5bad8f3 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -96,9 +96,9 @@ struct event_block_t : public block_t {
 };
 
 struct function_block_t : public block_t {
-    const process_t *process;
     wcstring name;
-    function_block_t(const process_t *p, wcstring n, bool shadows);
+    wcstring_list_t args;
+    function_block_t(wcstring name, wcstring_list_t args, bool shadows);
 };
 
 struct source_block_t : public block_t {

From 0b3bb0e7c1a24ef04ad3be8c2abffa21d02ce584 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Sun, 19 May 2019 10:03:56 +0200
Subject: [PATCH 0547/1732] Underline every valid entered path (#5872)

* src/highlight: Underline every valid entered path

* update CHANGELOG

* fix highlight test
---
 CHANGELOG.md       | 1 +
 src/fish_tests.cpp | 2 +-
 src/highlight.cpp  | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42295b9a4..4b1a2a33b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - $PATH is no longer reordered in child fishes (#5456).
 - `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
 - An issue resulting in a certain class of parser errors not resulting in a non-zero `$status` has been corrected (3e055f).
+- fish now underlines every valid entered path instead of just the last one.
 
 ### Syntax changes and new commands
 - None yet.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 77c26b494..b993e2386 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4418,7 +4418,7 @@ static void test_highlighting() {
 
     highlight_tests.push_back({
         {L"cat", highlight_role_t::command},
-        {L"/dev/null", highlight_role_t::param},
+        {L"/dev/null", param_valid_path},
         {L"|", highlight_role_t::statement_terminator},
         // This is bogus, but we used to use "less" here and that doesn't have to be installed.
         {L"cat", highlight_role_t::command},
diff --git a/src/highlight.cpp b/src/highlight.cpp
index f7075795a..0924407d4 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1265,11 +1265,8 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
         // Must be an argument with source.
         if (node.type != symbol_argument || !node.has_source()) continue;
 
-        // See if this node contains the cursor. We check <= source_length so that, when backspacing
-        // (and the cursor is just beyond the last token), we may still underline it.
-        if (this->cursor_pos >= node.source_start &&
-            this->cursor_pos - node.source_start <= node.source_length &&
-            node_is_potential_path(buff, node, vars, working_directory)) {
+        // Underline every valid path.
+        if (node_is_potential_path(buff, node, vars, working_directory)) {
             // It is, underline it.
             for (size_t i = node.source_start; i < node.source_start + node.source_length; i++) {
                 // Don't color highlight_role_t::error because it looks dorky. For example,

From 15a5c0ed5f1a384387f359396e99fc763d57ecc1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 14 May 2019 19:45:26 +0200
Subject: [PATCH 0548/1732] src/screen: Stop falling back to wchar_t

wcstring is perfectly capable of doing this.
---
 src/screen.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index f653be3f8..9aa890cf9 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -823,19 +823,15 @@ static size_t truncation_offset_for_width(const std::vector<size_t> &width_by_of
 }
 
 static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
-                                      const wcstring &left_prompt_str,
-                                      const wcstring &right_prompt_str, const wcstring &commandline,
-                                      const wcstring &autosuggestion_str) {
+                                      wcstring left_prompt,
+                                      wcstring right_prompt, const wcstring &commandline,
+                                      wcstring autosuggestion) {
     UNUSED(s);
     screen_layout_t result = {};
 
     // Start by ensuring that the prompts themselves can fit.
-    const wchar_t *left_prompt = left_prompt_str.c_str();
-    const wchar_t *right_prompt = right_prompt_str.c_str();
-    const wchar_t *autosuggestion = autosuggestion_str.c_str();
-
-    prompt_layout_t left_prompt_layout = calc_prompt_layout(left_prompt_str, cached_layouts);
-    prompt_layout_t right_prompt_layout = calc_prompt_layout(right_prompt_str, cached_layouts);
+    prompt_layout_t left_prompt_layout = calc_prompt_layout(left_prompt, cached_layouts);
+    prompt_layout_t right_prompt_layout = calc_prompt_layout(right_prompt, cached_layouts);
 
     size_t left_prompt_width = left_prompt_layout.last_line_width;
     size_t right_prompt_width = right_prompt_layout.last_line_width;
@@ -882,7 +878,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (multiline) {
         autosuggestion = L"";
     } else {
-        autosuggest_truncated_widths.reserve(1 + autosuggestion_str.size());
+        autosuggest_truncated_widths.reserve(1 + autosuggestion.size());
         for (size_t i = 0; autosuggestion[i] != L'\0'; i++) {
             autosuggest_truncated_widths.push_back(autosuggest_total_width);
             autosuggest_total_width += fish_wcwidth_min_0(autosuggestion[i]);
@@ -913,10 +909,10 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
         calculated_width = left_prompt_width + right_prompt_width + first_command_line_width +
                            autosuggest_total_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = left_prompt;
+            result.left_prompt = std::move(left_prompt);
             result.left_prompt_space = left_prompt_width;
-            result.right_prompt = right_prompt;
-            result.autosuggestion = autosuggestion;
+            result.right_prompt = std::move(right_prompt);
+            result.autosuggestion = std::move(autosuggestion);
             done = true;
         }
     }
@@ -926,9 +922,9 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (!done) {
         calculated_width = left_prompt_width + right_prompt_width + first_command_line_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = left_prompt;
+            result.left_prompt = std::move(left_prompt);
             result.left_prompt_space = left_prompt_width;
-            result.right_prompt = right_prompt;
+            result.right_prompt = std::move(right_prompt);
 
             // Need at least two characters to show an autosuggestion.
             size_t available_autosuggest_space =
@@ -947,7 +943,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (!done) {
         calculated_width = left_prompt_width + first_command_line_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = left_prompt;
+            result.left_prompt = std::move(left_prompt);
             result.left_prompt_space = left_prompt_width;
             done = true;
         }
@@ -955,7 +951,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
 
     // Case 4
     if (!done) {
-        result.left_prompt = left_prompt;
+        result.left_prompt = std::move(left_prompt);
         result.left_prompt_space = left_prompt_width;
         // See remark about for why we can't use the right prompt here result.right_prompt =
         // right_prompt. If the command wraps, and the prompt is not short, place the command on its

From 967c1d51eec0f840273c20a326152ea72f920d3d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 May 2019 20:31:41 +0200
Subject: [PATCH 0549/1732] Only do brace expansion if they contain a variable
 or ","

Brace expansion with single words in it is quite useless - `HEAD@{0}`
expanding to `HEAD@0` breaks git.

So we complicate the rule slightly - if there is no variable expansion
or "," inside of braces, they are just treated as literal braces.

Note that this is technically backwards-incompatible, because

    echo foo{0}

will now print `foo{0}` instead of `foo0`. However that's a
technicality because the braces were literally useless in that case.

Our tests needed to be adjusted, but that's because they are meant to
exercise this in weird ways.

I don't believe this will break any code in practice.

Fixes #5869.
---
 CHANGELOG.md                  |  2 +-
 sphinx_doc_src/index.rst      | 36 ++++++++++++++++++++++-------------
 src/common.cpp                | 30 ++++++++++++++++++++++++++++-
 tests/parameter_expansion.in  |  3 ++-
 tests/parameter_expansion.out |  4 +++-
 tests/test1.err               |  2 +-
 tests/test1.in                |  6 ++++--
 tests/test1.out               |  8 +++++---
 8 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1a2a33b..1c3c4a870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 - fish now underlines every valid entered path instead of just the last one.
 
 ### Syntax changes and new commands
-- None yet.
+- Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d582302db..0bf266180 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -764,31 +764,41 @@ Examples::
 Brace expansion
 ---------------
 
-A comma separated list of characters enclosed in curly braces will be expanded so each element of the list becomes a new parameter.
+A comma separated list of characters enclosed in curly braces will be expanded so each element of the list becomes a new parameter. This is useful to save on typing, and to separate a variable name from surrounding text.
 
 Examples::
 
-  echo input.{c,h,txt}
-  # Outputs 'input.c input.h input.txt'
+  > echo input.{c,h,txt}
+  input.c input.h input.txt
 
-  mv *.{c,h} src/
+  > mv *.{c,h} src/
   # Moves all files with the suffix '.c' or '.h' to the subdirectory src.
 
-A literal "{}" will not be used as a brace expansion, but if after expansion there is nothing between the braces, the argument will be removed::
+  > cp file{,.bak}
+  # Make a copy of `file` at `file.bak`.
 
-    echo foo-{}
-    # Outputs foo-{}
+  > set -l dogs hot cool cute
+  > echo {$dogs}dog
+  hotdog cooldog cutedog
 
-    echo foo-{$undefinedvar}
-    # Output is an empty line - see :ref:`the cartesian product section <cartesian-product>`
+If two braces do not contain a "," or a variable expansion, they will not be expanded in this manner::
 
+    > echo foo-{}
+    foo-{}
+    > git reset --hard HEAD@{2}
+    # passes "HEAD@{2}" to git
+    > echo {{a,b}}
+    {a} {b} # because the inner brace pair is expanded, but the outer isn't.
 
-If there is nothing between a brace and a comma or two commas, it's interpreted as an empty element.
+If after expansion there is nothing between the braces, the argument will be removed (see :ref:`the cartesian product section <cartesian-product>`)::
 
-So::
+    > echo foo-{$undefinedvar}
+    # Output is an empty line, just like a bare `echo`.
 
-    echo {,,/usr}/bin
-    # Output /bin /bin /usr/bin
+If there is nothing between a brace and a comma or two commas, it's interpreted as an empty element::
+
+    > echo {,,/usr}/bin
+    /bin /bin /usr/bin
 
 To use a "," as an element, `quote <#quotes>`_ or `escape <#escapes>`_ it.
 
diff --git a/src/common.cpp b/src/common.cpp
index f92e31b38..7b42630af 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1448,6 +1448,11 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
     const bool unescape_special = static_cast<bool>(flags & UNESCAPE_SPECIAL);
     const bool allow_incomplete = static_cast<bool>(flags & UNESCAPE_INCOMPLETE);
 
+    // The positions of open braces.
+    std::vector<size_t> braces;
+    // The positions of variable expansions or brace ","s.
+    // We only read braces as expanders if there's a variable expansion or "," in them.
+    std::vector<size_t> vars_or_seps;
     bool brace_text_start = false;
     int brace_count = 0;
 
@@ -1456,7 +1461,6 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
         mode_unquoted,
         mode_single_quotes,
         mode_double_quotes,
-        mode_braces
     } mode = mode_unquoted;
 
     for (size_t input_position = 0; input_position < input_len && !errored; input_position++) {
@@ -1523,6 +1527,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                 case L'$': {
                     if (unescape_special) {
                         to_append_or_none = VARIABLE_EXPAND;
+                        vars_or_seps.push_back(input_position);
                     }
                     break;
                 }
@@ -1530,6 +1535,8 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     if (unescape_special) {
                         brace_count++;
                         to_append_or_none = BRACE_BEGIN;
+                        // We need to store where the brace *ends up* in the output because of NOT_A_WCHAR.
+                        braces.push_back(result.size());
                     }
                     break;
                 }
@@ -1544,6 +1551,25 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         brace_count--;
                         brace_text_start = brace_text_start && brace_count > 0;
                         to_append_or_none = BRACE_END;
+                        if (braces.size()) {
+                            // If we didn't have a var or separator since the last '{',
+                            // put the literal back.
+                            if (!vars_or_seps.size() || vars_or_seps.back() < braces.back()) {
+                                result[braces.back()] = L'{';
+                                // We also need to turn all spaces back.
+                                for (size_t i = braces.back() + 1; i < result.size(); i++) {
+                                    if (result[i] == BRACE_SPACE) result[i] = L' ';
+                                }
+                                to_append_or_none = L'}';
+                            }
+
+                            // Remove all seps inside the current brace pair, so if we have a surrounding pair
+                            // we only get seps inside *that*.
+                            if (vars_or_seps.size()) {
+                                while(vars_or_seps.size() && vars_or_seps.back() > braces.back()) vars_or_seps.pop_back();
+                            }
+                            braces.pop_back();
+                        }
                     }
                     break;
                 }
@@ -1551,6 +1577,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     if (unescape_special && brace_count > 0) {
                         to_append_or_none = BRACE_SEP;
                         brace_text_start = false;
+                        vars_or_seps.push_back(input_position);
                     }
                     break;
                 }
@@ -1652,6 +1679,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                 case '$': {
                     if (unescape_special) {
                         to_append_or_none = VARIABLE_EXPAND_SINGLE;
+                        vars_or_seps.push_back(input_position);
                     }
                     break;
                 }
diff --git a/tests/parameter_expansion.in b/tests/parameter_expansion.in
index cc922fefa..7804adf5d 100644
--- a/tests/parameter_expansion.in
+++ b/tests/parameter_expansion.in
@@ -15,7 +15,7 @@ for phrase in {good\,,   beautiful ,morning}; echo -n "$phrase "; end | string t
 for phrase in {goodbye\,,\ cruel\ ,world\n}; echo -n $phrase; end;
 
 # whitespace within entries converted to spaces in a single entry
-for foo in { hello
+for foo in {a, hello
 world }
 	echo \'$foo\'
 end
@@ -31,4 +31,5 @@ end
 # subshells with expansion
 for name in (for name in {Beth, Amy}; printf "$name\n"; end); printf "$name\n"; end
 
+echo {{a,b}}
 # vim: set ft=fish:
diff --git a/tests/parameter_expansion.out b/tests/parameter_expansion.out
index d89373285..d541621e0 100644
--- a/tests/parameter_expansion.out
+++ b/tests/parameter_expansion.out
@@ -1,14 +1,16 @@
 {}
-apple
+{apple}
 apple orange
 apple orange
 apple orange banana
 'hello' 'world'
 good, beautiful morning
 goodbye, cruel world
+'a'
 'hello world'
 alpha lambda, beta lambda, alpha gamma, beta gamma
 Meg
 Jo
 Beth
 Amy
+{a} {b}
diff --git a/tests/test1.err b/tests/test1.err
index 4dd8d5f05..c425878af 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -3,7 +3,7 @@
 # Comments in odd places don't cause problems
 
 ####################
-# Bracket expansion
+# Brace expansion
 
 ####################
 # Escaped newlines
diff --git a/tests/test1.in b/tests/test1.in
index 00a5b8b45..6657a19eb 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -11,14 +11,16 @@ for i in 1 2 # Comment on same line as command
 	end;
 end
 
-logmsg Bracket expansion
+logmsg Brace expansion
 echo x-{1}
 echo x-{1,2}
 echo foo-{1,2{3,4}}
 
 echo foo-{} # literal "{}" expands to itself
 echo foo-{{},{}} # the inner "{}" expand to themselves, the outer pair expands normally.
-echo foo-{""} # still expands to foo-
+echo foo-{{a},{}} # also works with something in the braces.
+echo foo-{""} # still expands to foo-{}
+echo banana # just as a marker
 echo foo-{$undefinedvar} # still expands to nothing
 
 echo foo-{,,,} # four empty items in the braces.
diff --git a/tests/test1.out b/tests/test1.out
index d2b47bf29..5868a7a02 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -7,13 +7,15 @@
 2b
 
 ####################
-# Bracket expansion
-x-1
+# Brace expansion
+x-{1}
 x-1 x-2
 foo-1 foo-23 foo-24
 foo-{}
 foo-{} foo-{}
-foo-
+foo-{a} foo-{}
+foo-{}
+banana
 
 foo- foo- foo- foo-
 foo- foo-, foo-

From 1e9d41f2c1ffc2d94a6cbb9fa026467b9f238117 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 May 2019 20:40:35 +0200
Subject: [PATCH 0550/1732] Remove now-useless code for detecting `{}`

This can't happen anymore.
---
 src/expand.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 457b113ae..a8b3daefc 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -531,15 +531,6 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
         }
     }
 
-    // Expand a literal "{}" to itself because it is useless otherwise,
-    // and this eases e.g. `find -exec {}`. See #1109.
-    if (brace_begin + 1 == brace_end) {
-        wcstring newstr = instr;
-        newstr.at(brace_begin - in) = L'{';
-        newstr.at(brace_end - in) = L'}';
-        return expand_braces(newstr, flags, out, errors);
-    }
-
     if (syntax_error) {
         append_syntax_error(errors, SOURCE_LOCATION_UNKNOWN, _(L"Mismatched braces"));
         return expand_result_t::error;

From 3efa2ad93b7f44079d77974543dd31f9b842f038 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 May 2019 20:54:08 +0200
Subject: [PATCH 0551/1732] Replace wcslen with math

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

diff --git a/src/expand.cpp b/src/expand.cpp
index a8b3daefc..1cc38b00d 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -542,7 +542,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     }
 
     length_preceding_braces = (brace_begin - in);
-    length_following_braces = std::wcslen(brace_end) - 1;
+    length_following_braces = instr.size() - (brace_end - in) - 1;
     tot_len = length_preceding_braces + length_following_braces;
     item_begin = brace_begin + 1;
     for (const wchar_t *pos = (brace_begin + 1); true; pos++) {

From 257c72d8beb0109a222e67534848ac98607d2e47 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 May 2019 19:40:48 +0200
Subject: [PATCH 0552/1732] Document string split superpowers more

[ci skip]
---
 sphinx_doc_src/cmds/string.rst | 4 ++++
 sphinx_doc_src/index.rst       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 1adbdf4f0..1761673d1 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -132,6 +132,8 @@ If you specify the ``-f`` or ``--filter`` flag then each input string is printed
 
 Exit status: 0 if at least one replacement was performed, or 1 otherwise.
 
+.. _cmd-string-split:
+
 "split" subcommand
 ------------------
 
@@ -141,6 +143,8 @@ Exit status: 0 if at least one replacement was performed, or 1 otherwise.
 
 See also ``read --delimiter``.
 
+.. _cmd-string-split0:
+
 "split0" subcommand
 -------------------
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 0bf266180..a68edaa78 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -739,6 +739,8 @@ Command substitution
 
 The output of a series of commands can be used as the parameters to another command. If a parameter contains a set of parenthesis, the text enclosed by the parenthesis will be interpreted as a list of commands. On expansion, this list is executed, and substituted by the output. If the output is more than one line long, each line will be expanded to a new parameter. Setting ``IFS`` to the empty string will disable line splitting.
 
+If the output is piped to :ref:`string split <cmd-string-split>` or `string split0 <cmd-string-split0>` as the last step, those splits are used as they appear and no additional splitting on newlines takes place.
+
 The exit status of the last run command substitution is available in the `status <#variables-status>`_ variable if the substitution occurs in the context of a ``set`` command.
 
 Only part of the output can be used, see `index range expansion <#expand-index-range>`_ for details.
@@ -758,6 +760,8 @@ Examples::
     # Set the ``data`` variable to the contents of 'data.txt'
     # without splitting it into a list.
 
+    set data (cat data | string split0)
+    # Set ``$data`` to the contents of data, splitting on NUL-bytes.
 
 .. _expand-brace:
 

From ff3fe961f4aa8d997ea2f65e309162161fc7df71 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 May 2019 20:59:03 +0200
Subject: [PATCH 0553/1732] Add pipeline.expect to flakey tests

This one fails on Travis sometimes, but I've not been able to
reproduce on a real machine.
---
 tests/interactive.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/interactive.fish b/tests/interactive.fish
index f6a05a12b..3f151ab07 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -10,7 +10,7 @@ if test "$TRAVIS_OS_NAME" = osx
 end
 
 # This is a list of flakey tests that often succeed when rerun.
-set -l TESTS_TO_RETRY bind.expect
+set -l TESTS_TO_RETRY bind.expect pipeline.expect
 
 # Set this var to modify behavior of the code being tests. Such as avoiding running
 # `fish_update_completions` when running tests.

From cd7e8f41033ea76c68b7f03cad466fd04ca9a03e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 23:12:34 -0700
Subject: [PATCH 0554/1732] Migrate loop status from blocks into libdata

Blocks will soon need to be shared across parsers. Migrate the loop status
(like break or continue) from the block into the libdata. It turns out we
only ever need one, we don't need to track this per-block.

Make it an enum class.
---
 src/builtin.cpp         | 24 ++++++++----------------
 src/parse_execution.cpp | 20 ++++++++++----------
 src/parser.cpp          |  2 --
 src/parser.h            | 13 +++++++------
 4 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index ffc2be4d9..92a1e5b15 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -276,29 +276,21 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
         return STATUS_INVALID_ARGS;
     }
 
-    // Find the index of the enclosing for or while loop. Recall that incrementing loop_idx goes
-    // 'up' to outer blocks.
-    size_t loop_idx;
-    for (loop_idx = 0; loop_idx < parser.block_count(); loop_idx++) {
+    // Paranoia: ensure we have a real loop.
+    bool has_loop = false;
+    for (size_t loop_idx = 0; loop_idx < parser.block_count() && !has_loop; loop_idx++) {
         const block_t *b = parser.block_at_index(loop_idx);
-        if (b->type() == WHILE || b->type() == FOR) break;
+        if (b->type() == WHILE || b->type() == FOR) has_loop = true;
+        if (b->type() == FUNCTION_CALL) break;
     }
-
-    if (loop_idx >= parser.block_count()) {
+    if (!has_loop) {
         streams.err.append_format(_(L"%ls: Not inside of loop\n"), argv[0]);
         builtin_print_help(parser, streams, argv[0], streams.err);
         return STATUS_CMD_ERROR;
     }
 
-    // Skip blocks interior to the loop (but not the loop itself)
-    size_t block_idx = loop_idx;
-    while (block_idx--) {
-        parser.block_at_index(block_idx)->skip = true;
-    }
-
-    // Mark the loop's status
-    block_t *loop_block = parser.block_at_index(loop_idx);
-    loop_block->loop_status = is_break ? LOOP_BREAK : LOOP_CONTINUE;
+    // Mark the status in the libdata.
+    parser.libdata().loop_status = is_break ? loop_status_t::breaks : loop_status_t::continues;
     return STATUS_CMD_OK;
 }
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index fc6ab1b71..20d240772 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -192,7 +192,7 @@ parse_execution_context_t::cancellation_reason(const block_t *block) const {
     if (block && block->skip) {
         return execution_cancellation_skip;
     }
-    if (block && block->loop_status != LOOP_NORMAL) {
+    if (parser->libdata().loop_status != loop_status_t::normals) {
         return execution_cancellation_loop_control;
     }
     return execution_cancellation_none;
@@ -421,16 +421,15 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         assert(retval == ENV_OK && "for loop variable should have been successfully set");
         (void)retval;
 
-        fb->loop_status = LOOP_NORMAL;
+        auto &ld = parser->libdata();
+        ld.loop_status = loop_status_t::normals;
         this->run_job_list(block_contents, fb);
 
         if (this->cancellation_reason(fb) == execution_cancellation_loop_control) {
             // Handle break or continue.
-            if (fb->loop_status == LOOP_CONTINUE) {
-                // Reset the loop state.
-                fb->loop_status = LOOP_NORMAL;
-                continue;
-            } else if (fb->loop_status == LOOP_BREAK) {
+            bool do_break = (ld.loop_status == loop_status_t::breaks);
+            ld.loop_status = loop_status_t::normals;
+            if (do_break) {
                 break;
             }
         }
@@ -584,17 +583,18 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         }
 
         // Push a while block and then check its cancellation reason.
+        auto &ld = parser->libdata();
+        ld.loop_status = loop_status_t::normals;
         while_block_t *wb = parser->push_block<while_block_t>();
         this->run_job_list(contents, wb);
-        auto loop_status = wb->loop_status;
         auto cancel_reason = this->cancellation_reason(wb);
         parser->pop_block(wb);
 
         if (cancel_reason == execution_cancellation_loop_control) {
             // Handle break or continue.
-            if (loop_status == LOOP_CONTINUE) {
+            if (ld.loop_status == loop_status_t::continues) {
                 continue;
-            } else if (loop_status == LOOP_BREAK) {
+            } else if (ld.loop_status == loop_status_t::breaks) {
                 break;
             }
         }
diff --git a/src/parser.cpp b/src/parser.cpp
index 84e58a8b2..871e8f789 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -138,8 +138,6 @@ void parser_t::push_block_int(block_t *new_current) {
         new_current->skip = false;
     }
 
-    new_current->loop_status = LOOP_NORMAL;
-
     // Push it onto our stack. This acquires ownership because of unique_ptr.
     this->block_stack.emplace_back(new_current);
 
diff --git a/src/parser.h b/src/parser.h
index 6e5bad8f3..8c4b34048 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -46,10 +46,10 @@ enum block_type_t {
 };
 
 /// Possible states for a loop.
-enum loop_status_t {
-    LOOP_NORMAL,    /// current loop block executed as normal
-    LOOP_BREAK,     /// current loop block should be removed
-    LOOP_CONTINUE,  /// current loop block should be skipped
+enum class loop_status_t {
+    normals,    /// current loop block executed as normal
+    breaks,     /// current loop block should be removed
+    continues,  /// current loop block should be skipped
 };
 
 /// block_t represents a block of commands.
@@ -65,8 +65,6 @@ struct block_t {
    public:
     /// Whether execution of the commands in this block should be skipped.
     bool skip{false};
-    /// Status for the current loop block. Can be any of the values from the loop_status enum.
-    enum loop_status_t loop_status { LOOP_NORMAL };
     /// Name of file that created this block. This string is intern'd.
     const wchar_t *src_filename{nullptr};
     /// Line number where this block was created.
@@ -174,6 +172,9 @@ struct library_data_t {
     /// Whether we are running an event handler. This is not a bool because we keep count of the
     /// event nesting level.
     int is_event{0};
+
+    /// Whether we should break or continue the current loop.
+    enum loop_status_t loop_status { loop_status_t::normals };
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From fec0e40b5e8f0f1944a3808cb8b625d4e6d36c0f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 12:55:16 -0700
Subject: [PATCH 0555/1732] Migrate function_block name and args into block_t

The goal is to eliminate this block hierarchy.
---
 src/parser.cpp | 15 ++++++++-------
 src/parser.h   |  7 +++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 871e8f789..f73ef4693 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -377,10 +377,10 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
             case FUNCTION_CALL:
             case FUNCTION_CALL_NO_SHADOW: {
                 const function_block_t *fb = static_cast<const function_block_t *>(b);
-                append_format(*buff, _(L"in function '%ls'"), fb->name.c_str());
+                append_format(*buff, _(L"in function '%ls'"), fb->function_name.c_str());
                 // Print arguments on the same line.
                 wcstring args_str;
-                for (const wcstring &arg : fb->args) {
+                for (const wcstring &arg : fb->function_args) {
                     if (!args_str.empty()) args_str.push_back(L' ');
                     // We can't quote the arguments because we print this in quotes.
                     // As a special-case, add the empty argument as "".
@@ -437,7 +437,7 @@ const wchar_t *parser_t::is_function(size_t idx) const {
         const block_t *b = this->block_at_index(block_idx);
         if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
             const function_block_t *fb = static_cast<const function_block_t *>(b);
-            result = fb->name.c_str();
+            result = fb->function_name.c_str();
             break;
         } else if (b->type() == SOURCE) {
             // If a function sources a file, obviously that function's offset doesn't contribute.
@@ -500,7 +500,7 @@ const wchar_t *parser_t::current_filename() const {
         const block_t *b = this->block_at_index(i);
         if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
             const function_block_t *fb = static_cast<const function_block_t *>(b);
-            return function_get_definition_file(fb->name);
+            return function_get_definition_file(fb->function_name);
         } else if (b->type() == SOURCE) {
             const source_block_t *sb = static_cast<const source_block_t *>(b);
             return sb->source_file;
@@ -839,9 +839,10 @@ if_block_t::if_block_t() : block_t(IF) {}
 event_block_t::event_block_t(const event_t &evt) : block_t(EVENT), event(evt) {}
 
 function_block_t::function_block_t(wcstring name, wcstring_list_t args, bool shadows)
-    : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW),
-      name(std::move(name)),
-      args(std::move(args)) {}
+    : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW) {
+    this->function_name = std::move(name);
+    this->function_args = std::move(args);
+}
 
 source_block_t::source_block_t(const wchar_t *src) : block_t(SOURCE), source_file(src) {}
 
diff --git a/src/parser.h b/src/parser.h
index 8c4b34048..76b627e3e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -75,6 +75,11 @@ struct block_t {
     /// List of event blocks.
     event_blockage_list_t event_blocks{};
 
+    // If this is a function block, the function name and arguments.
+    // Otherwise empty.
+    wcstring function_name{};
+    wcstring_list_t function_args{};
+
     block_type_t type() const { return this->block_type; }
 
     /// Description of the block, for debugging.
@@ -94,8 +99,6 @@ struct event_block_t : public block_t {
 };
 
 struct function_block_t : public block_t {
-    wcstring name;
-    wcstring_list_t args;
     function_block_t(wcstring name, wcstring_list_t args, bool shadows);
 };
 

From 8697fa063b64782bea8e22cb4d3dc8cf9818ba1a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 13:01:59 -0700
Subject: [PATCH 0556/1732] Migrate source_block's source_file into block_t

Continue to work towards flattening this hierarchy.
---
 src/parser.cpp | 6 +++---
 src/parser.h   | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index f73ef4693..8bd8a694f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -369,7 +369,7 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
         switch (b->type()) {
             case SOURCE: {
                 const source_block_t *sb = static_cast<const source_block_t *>(b);
-                const wchar_t *source_dest = sb->source_file;
+                const wchar_t *source_dest = sb->sourced_file;
                 append_format(*buff, _(L"from sourcing file %ls\n"),
                               user_presentable_path(source_dest).c_str());
                 break;
@@ -503,7 +503,7 @@ const wchar_t *parser_t::current_filename() const {
             return function_get_definition_file(fb->function_name);
         } else if (b->type() == SOURCE) {
             const source_block_t *sb = static_cast<const source_block_t *>(b);
-            return sb->source_file;
+            return sb->sourced_file;
         }
     }
 
@@ -844,7 +844,7 @@ function_block_t::function_block_t(wcstring name, wcstring_list_t args, bool sha
     this->function_args = std::move(args);
 }
 
-source_block_t::source_block_t(const wchar_t *src) : block_t(SOURCE), source_file(src) {}
+source_block_t::source_block_t(const wchar_t *src) : block_t(SOURCE) { this->sourced_file = src; }
 
 for_block_t::for_block_t() : block_t(FOR) {}
 
diff --git a/src/parser.h b/src/parser.h
index 76b627e3e..0911701d6 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -80,6 +80,10 @@ struct block_t {
     wcstring function_name{};
     wcstring_list_t function_args{};
 
+    // If this is a source block, the source'd file, interned.
+    // Otherwise nothing.
+    const wchar_t *sourced_file{};
+
     block_type_t type() const { return this->block_type; }
 
     /// Description of the block, for debugging.
@@ -103,7 +107,6 @@ struct function_block_t : public block_t {
 };
 
 struct source_block_t : public block_t {
-    const wchar_t *const source_file;
     explicit source_block_t(const wchar_t *src);
 };
 

From cf92b7626c2a0db3308602fbf02637d889526020 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 13:07:06 -0700
Subject: [PATCH 0557/1732] Migrate event_block's event into block_t

---
 src/parser.cpp | 5 +++--
 src/parser.h   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 8bd8a694f..872b34ce1 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -353,7 +353,8 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
     if (b->type() == EVENT) {
         // This is an event handler.
         const event_block_t *eb = static_cast<const event_block_t *>(b);
-        wcstring description = event_get_desc(eb->event);
+        assert(eb->event && "Should have an event");
+        wcstring description = event_get_desc(*eb->event);
         append_format(*buff, _(L"in event handler: %ls\n"), description.c_str());
 
         // Stop recursing at event handler. No reason to believe that any other code is relevant.
@@ -836,7 +837,7 @@ wcstring block_t::description() const {
 
 if_block_t::if_block_t() : block_t(IF) {}
 
-event_block_t::event_block_t(const event_t &evt) : block_t(EVENT), event(evt) {}
+event_block_t::event_block_t(const event_t &evt) : block_t(EVENT) { this->event = evt; }
 
 function_block_t::function_block_t(wcstring name, wcstring_list_t args, bool shadows)
     : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW) {
diff --git a/src/parser.h b/src/parser.h
index 0911701d6..ca29302a9 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -84,6 +84,9 @@ struct block_t {
     // Otherwise nothing.
     const wchar_t *sourced_file{};
 
+    // If this is an event block, the event. Otherwise ignored.
+    maybe_t<event_t> event;
+
     block_type_t type() const { return this->block_type; }
 
     /// Description of the block, for debugging.
@@ -98,7 +101,6 @@ struct if_block_t : public block_t {
 };
 
 struct event_block_t : public block_t {
-    event_t const event;
     explicit event_block_t(const event_t &evt);
 };
 

From eff4873eca5b64295cbbb774e1ee5bdcf9a73e34 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 14:40:06 -0700
Subject: [PATCH 0558/1732] Stop creating subclasses of block_t

Move all block_t creation methods to static methods, and stop creating
subclasses (all of which are now empty).
---
 src/builtin.cpp         |  2 +-
 src/builtin_source.cpp  |  2 +-
 src/event.cpp           |  2 +-
 src/exec.cpp            |  4 ++--
 src/parse_execution.cpp | 10 +++++-----
 src/parser.cpp          | 42 ++++++++++++++++++++++++++++++++++++-----
 src/parser.h            | 26 +++++++++++++------------
 7 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 92a1e5b15..a017ed264 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -315,7 +315,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
         return STATUS_ILLEGAL_CMD;
     }
 
-    const breakpoint_block_t *bpb = parser.push_block<breakpoint_block_t>();
+    const block_t *bpb = parser.push_block(block_t::breakpoint_block());
     reader_read(STDIN_FILENO, streams.io_chain ? *streams.io_chain : io_chain_t());
     parser.pop_block(bpb);
     return parser.get_last_status();
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 6abb467f0..9198992e7 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -73,7 +73,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         fn_intern = intern(argv[optind]);
     }
 
-    const source_block_t *sb = parser.push_block<source_block_t>(fn_intern);
+    const block_t *sb = parser.push_block(block_t::source_block(fn_intern));
     reader_push_current_filename(fn_intern);
 
     // This is slightly subtle. If this is a bare `source` with no args then `argv + optind` already
diff --git a/src/event.cpp b/src/event.cpp
index e42a85921..5d5d1e9fb 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -284,7 +284,7 @@ static void event_fire_internal(const event_t &event) {
         parser_t &parser = parser_t::principal_parser();
         auto prev_statuses = parser.get_last_statuses();
 
-        event_block_t *b = parser.push_block<event_block_t>(event);
+        block_t *b = parser.push_block(block_t::event_block(event));
         parser.eval(buffer, io_chain_t(), TOP);
         parser.pop_block(b);
         proc_pop_interactive();
diff --git a/src/exec.cpp b/src/exec.cpp
index f5937e546..894a83250 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -822,8 +822,8 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         wcstring_list_t argv = p->get_argv_array().to_list();
         // Remove the function name from argv.
         if (!argv.empty()) argv.erase(argv.begin());
-        function_block_t *fb =
-            parser.push_block<function_block_t>(func_name, argv, props->shadow_scope);
+        block_t *fb =
+            parser.push_block(block_t::function_block(func_name, argv, props->shadow_scope));
         function_prepare_environment(parser.vars(), func_name, std::move(argv), inherit_vars);
         parser.forbid_function(func_name);
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 20d240772..c46cf2471 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -288,7 +288,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
 
     // Execute any job list we got.
     if (job_list_to_execute) {
-        if_block_t *ib = parser->push_block<if_block_t>();
+        block_t *ib = parser->push_block(block_t::if_block());
         run_job_list(job_list_to_execute, ib);
         if (should_cancel_execution(ib)) {
             result = parse_execution_cancelled;
@@ -311,7 +311,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
 parse_execution_result_t parse_execution_context_t::run_begin_statement(
     tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
-    scope_block_t *sb = parser->push_block<scope_block_t>(BEGIN);
+    block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
     parse_execution_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
 
@@ -408,7 +408,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         return parse_execution_errored;
     }
 
-    for_block_t *fb = parser->push_block<for_block_t>();
+    block_t *fb = parser->push_block(block_t::for_block());
 
     // Now drive the for loop.
     for (const wcstring &val : arguments) {
@@ -486,7 +486,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
 
     const wcstring &switch_value_expanded = switch_values_expanded.at(0).completion;
 
-    switch_block_t *sb = parser->push_block<switch_block_t>();
+    block_t *sb = parser->push_block(block_t::switch_block());
 
     // Expand case statements.
     tnode_t<g::case_item_list> case_item_list = statement.child<3>();
@@ -585,7 +585,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         // Push a while block and then check its cancellation reason.
         auto &ld = parser->libdata();
         ld.loop_status = loop_status_t::normals;
-        while_block_t *wb = parser->push_block<while_block_t>();
+        block_t *wb = parser->push_block(block_t::while_block());
         this->run_job_list(contents, wb);
         auto cancel_reason = this->cancellation_reason(wb);
         parser->pop_block(wb);
diff --git a/src/parser.cpp b/src/parser.cpp
index 872b34ce1..99c3188df 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -119,7 +119,8 @@ void parser_t::skip_all_blocks() {
 }
 
 // Given a new-allocated block, push it onto our block stack, acquiring ownership
-void parser_t::push_block_int(block_t *new_current) {
+block_t *parser_t::push_block(block_t &&block) {
+    std::unique_ptr<block_t> new_current = make_unique<block_t>(std::move(block));
     const enum block_type_t type = new_current->type();
     new_current->src_lineno = parser_t::get_lineno();
 
@@ -138,9 +139,6 @@ void parser_t::push_block_int(block_t *new_current) {
         new_current->skip = false;
     }
 
-    // Push it onto our stack. This acquires ownership because of unique_ptr.
-    this->block_stack.emplace_back(new_current);
-
     // Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
     if (type != TOP && type != SUBST) {
         libdata().is_block = true;
@@ -154,6 +152,10 @@ void parser_t::push_block_int(block_t *new_current) {
         vars().push(type == FUNCTION_CALL);
         new_current->wants_pop_env = true;
     }
+
+    // Push it onto our stack and return it.
+    this->block_stack.push_back(std::move(new_current));
+    return this->block_stack.back().get();
 }
 
 void parser_t::pop_block(const block_t *expected) {
@@ -666,7 +668,7 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_
     job_reap(*this, false);  // not sure why we reap jobs here
 
     // Start it up
-    scope_block_t *scope_block = this->push_block<scope_block_t>(block_type);
+    block_t *scope_block = this->push_block(block_t::scope_block(block_type));
 
     // Create and set a new execution context.
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
@@ -835,6 +837,36 @@ wcstring block_t::description() const {
 
 // Various block constructors.
 
+block_t block_t::if_block() { return block_t(IF); }
+
+block_t block_t::event_block(event_t evt) {
+    block_t b{EVENT};
+    b.event = std::move(evt);
+    return b;
+}
+
+block_t block_t::function_block(wcstring name, wcstring_list_t args, bool shadows) {
+    block_t b{shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW};
+    b.function_name = std::move(name);
+    b.function_args = std::move(args);
+    return b;
+}
+
+block_t block_t::source_block(const wchar_t *src) {
+    block_t b{SOURCE};
+    b.sourced_file = src;
+    return b;
+}
+
+block_t block_t::for_block() { return block_t{FOR}; }
+block_t block_t::while_block() { return block_t{WHILE}; }
+block_t block_t::switch_block() { return block_t{SWITCH}; }
+block_t block_t::scope_block(block_type_t type) {
+    assert((type == BEGIN || type == TOP || type == SUBST) && "Invalid scope type");
+    return block_t(type);
+}
+block_t block_t::breakpoint_block() { return block_t(BREAKPOINT); }
+
 if_block_t::if_block_t() : block_t(IF) {}
 
 event_block_t::event_block_t(const event_t &evt) : block_t(EVENT) { this->event = evt; }
diff --git a/src/parser.h b/src/parser.h
index ca29302a9..1998abf2d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -92,6 +92,17 @@ struct block_t {
     /// Description of the block, for debugging.
     wcstring description() const;
 
+    /// Entry points for creating blocks.
+    static block_t if_block();
+    static block_t event_block(event_t evt);
+    static block_t function_block(wcstring name, wcstring_list_t args, bool shadows);
+    static block_t source_block(const wchar_t *src);
+    static block_t for_block();
+    static block_t while_block();
+    static block_t switch_block();
+    static block_t scope_block(block_type_t type);
+    static block_t breakpoint_block();
+
     /// Destructor
     virtual ~block_t();
 };
@@ -230,9 +241,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Helper for stack_trace().
     void stack_trace_internal(size_t block_idx, wcstring *out) const;
 
-    /// Helper for push_block()
-    void push_block_int(block_t *b);
-
     /// Create a parser.
     parser_t();
 
@@ -314,15 +322,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     statuses_t get_last_statuses() const { return vars().get_last_statuses(); }
     void set_last_statuses(statuses_t s) { vars().set_last_statuses(std::move(s)); }
 
-    /// Pushes a new block created with the given arguments
-    /// Returns a pointer to the block. The pointer is valid
-    /// until the call to pop_block()
-    template <typename BLOCKTYPE, typename... Args>
-    BLOCKTYPE *push_block(Args &&... args) {
-        BLOCKTYPE *ret = new BLOCKTYPE(std::forward<Args>(args)...);
-        this->push_block_int(ret);
-        return ret;
-    }
+    /// Pushes a new block. Returns a pointer to the block, stored in the parser. The pointer is
+    /// valid until the call to pop_block()
+    block_t *push_block(block_t &&b);
 
     /// Remove the outermost block, asserting it's the given one.
     void pop_block(const block_t *b);

From 159d6d669a857bb03cd699f1cae843dc0b08e3f1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 14:44:17 -0700
Subject: [PATCH 0559/1732] Remove all block_t subclasses

---
 src/parse_execution.h |  2 +-
 src/parser.cpp        | 46 ++++++++-----------------------------------
 src/parser.h          | 45 +++---------------------------------------
 3 files changed, 12 insertions(+), 81 deletions(-)

diff --git a/src/parse_execution.h b/src/parse_execution.h
index 38abdbf67..4d4b8f725 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -10,8 +10,8 @@
 #include "parse_tree.h"
 #include "proc.h"
 
+class block_t;
 class parser_t;
-struct block_t;
 
 enum parse_execution_result_t {
     /// The job was successfully executed (though it have failed on its own).
diff --git a/src/parser.cpp b/src/parser.cpp
index 99c3188df..5b65f64b4 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -354,9 +354,8 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
 
     if (b->type() == EVENT) {
         // This is an event handler.
-        const event_block_t *eb = static_cast<const event_block_t *>(b);
-        assert(eb->event && "Should have an event");
-        wcstring description = event_get_desc(*eb->event);
+        assert(b->event && "Should have an event");
+        wcstring description = event_get_desc(*b->event);
         append_format(*buff, _(L"in event handler: %ls\n"), description.c_str());
 
         // Stop recursing at event handler. No reason to believe that any other code is relevant.
@@ -371,19 +370,17 @@ void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
         // These types of blocks should be printed.
         switch (b->type()) {
             case SOURCE: {
-                const source_block_t *sb = static_cast<const source_block_t *>(b);
-                const wchar_t *source_dest = sb->sourced_file;
+                const wchar_t *source_dest = b->sourced_file;
                 append_format(*buff, _(L"from sourcing file %ls\n"),
                               user_presentable_path(source_dest).c_str());
                 break;
             }
             case FUNCTION_CALL:
             case FUNCTION_CALL_NO_SHADOW: {
-                const function_block_t *fb = static_cast<const function_block_t *>(b);
-                append_format(*buff, _(L"in function '%ls'"), fb->function_name.c_str());
+                append_format(*buff, _(L"in function '%ls'"), b->function_name.c_str());
                 // Print arguments on the same line.
                 wcstring args_str;
-                for (const wcstring &arg : fb->function_args) {
+                for (const wcstring &arg : b->function_args) {
                     if (!args_str.empty()) args_str.push_back(L' ');
                     // We can't quote the arguments because we print this in quotes.
                     // As a special-case, add the empty argument as "".
@@ -439,8 +436,7 @@ const wchar_t *parser_t::is_function(size_t idx) const {
     for (size_t block_idx = idx; block_idx < this->block_count(); block_idx++) {
         const block_t *b = this->block_at_index(block_idx);
         if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
-            const function_block_t *fb = static_cast<const function_block_t *>(b);
-            result = fb->function_name.c_str();
+            result = b->function_name.c_str();
             break;
         } else if (b->type() == SOURCE) {
             // If a function sources a file, obviously that function's offset doesn't contribute.
@@ -502,11 +498,9 @@ const wchar_t *parser_t::current_filename() const {
     for (size_t i = 0; i < this->block_count(); i++) {
         const block_t *b = this->block_at_index(i);
         if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
-            const function_block_t *fb = static_cast<const function_block_t *>(b);
-            return function_get_definition_file(fb->function_name);
+            return function_get_definition_file(b->function_name);
         } else if (b->type() == SOURCE) {
-            const source_block_t *sb = static_cast<const source_block_t *>(b);
-            return sb->sourced_file;
+            return b->sourced_file;
         }
     }
 
@@ -866,27 +860,3 @@ block_t block_t::scope_block(block_type_t type) {
     return block_t(type);
 }
 block_t block_t::breakpoint_block() { return block_t(BREAKPOINT); }
-
-if_block_t::if_block_t() : block_t(IF) {}
-
-event_block_t::event_block_t(const event_t &evt) : block_t(EVENT) { this->event = evt; }
-
-function_block_t::function_block_t(wcstring name, wcstring_list_t args, bool shadows)
-    : block_t(shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW) {
-    this->function_name = std::move(name);
-    this->function_args = std::move(args);
-}
-
-source_block_t::source_block_t(const wchar_t *src) : block_t(SOURCE) { this->sourced_file = src; }
-
-for_block_t::for_block_t() : block_t(FOR) {}
-
-while_block_t::while_block_t() : block_t(WHILE) {}
-
-switch_block_t::switch_block_t() : block_t(SWITCH) {}
-
-scope_block_t::scope_block_t(block_type_t type) : block_t(type) {
-    assert(type == BEGIN || type == TOP || type == SUBST);
-}
-
-breakpoint_block_t::breakpoint_block_t() : block_t(BREAKPOINT) {}
diff --git a/src/parser.h b/src/parser.h
index 1998abf2d..d4ed98631 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -53,12 +53,10 @@ enum class loop_status_t {
 };
 
 /// block_t represents a block of commands.
-struct block_t {
-   protected:
-    /// Protected constructor. Use one of the subclasses below.
+class block_t {
+    /// Construct from a block type.
     explicit block_t(block_type_t t);
 
-   private:
     /// Type of block.
     const block_type_t block_type;
 
@@ -103,44 +101,7 @@ struct block_t {
     static block_t scope_block(block_type_t type);
     static block_t breakpoint_block();
 
-    /// Destructor
-    virtual ~block_t();
-};
-
-struct if_block_t : public block_t {
-    if_block_t();
-};
-
-struct event_block_t : public block_t {
-    explicit event_block_t(const event_t &evt);
-};
-
-struct function_block_t : public block_t {
-    function_block_t(wcstring name, wcstring_list_t args, bool shadows);
-};
-
-struct source_block_t : public block_t {
-    explicit source_block_t(const wchar_t *src);
-};
-
-struct for_block_t : public block_t {
-    for_block_t();
-};
-
-struct while_block_t : public block_t {
-    while_block_t();
-};
-
-struct switch_block_t : public block_t {
-    switch_block_t();
-};
-
-struct scope_block_t : public block_t {
-    explicit scope_block_t(block_type_t type);  // must be BEGIN, TOP or SUBST
-};
-
-struct breakpoint_block_t : public block_t {
-    breakpoint_block_t();
+    ~block_t();
 };
 
 struct profile_item_t {

From 8e640cdcc549bd6a14a7a04f5354d75356303992 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 20:56:28 -0700
Subject: [PATCH 0560/1732] fish_indent to stop stripping quotes from keywords

---
 src/fish_indent.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index d7279acc4..df3ac1e14 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -245,11 +245,7 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
                 last_was_semicolon = false;
             }
 
-            if (node.keyword != parse_keyword_none) {
-                append_whitespace(node_indent);
-                output.append(keyword_description(node.keyword));
-                has_new_line = false;
-            } else if (node.has_source()) {
+            if (node.has_source()) {
                 // Some type representing a particular token.
                 if (prev_node_type != parse_token_type_redirection) {
                     append_whitespace(node_indent);

From c2b7e9b2e6abab0912665ba4a09d8da08f39640d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 20 May 2019 21:04:51 +0200
Subject: [PATCH 0561/1732] fish_indent: Allow multiple file arguments

Allows `fish_indent -w **.fish` to restyle all fish files under the
current directory.

(This also has the sideeffect of reducing style.fish time by ~10s, as
we only need to invoke `fish_indent` once, instead of once per-file)
---
 build_tools/style.fish              |  11 +--
 sphinx_doc_src/cmds/fish_indent.rst |   4 +-
 src/fish_indent.cpp                 | 112 ++++++++++++++--------------
 3 files changed, 58 insertions(+), 69 deletions(-)

diff --git a/build_tools/style.fish b/build_tools/style.fish
index 721a1fb98..e3da235ae 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -95,16 +95,7 @@ if set -q fish_files[1]
         set PATH . $PATH
     end
     echo === Running "$green"fish_indent"$normal"
-    for file in $fish_files
-        cp $file $file.new # preserves mode bits
-        fish_indent <$file >$file.new
-        if cmp --quiet $file $file.new
-            rm $file.new
-        else
-            echo $file was NOT correctly formatted
-            mv $file.new $file
-        end
-    end
+    fish_indent -w -- $fish_files
 end
 
 if set -q python_files[1]
diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/sphinx_doc_src/cmds/fish_indent.rst
index 081265f87..f5f7cdc0e 100644
--- a/sphinx_doc_src/cmds/fish_indent.rst
+++ b/sphinx_doc_src/cmds/fish_indent.rst
@@ -6,13 +6,13 @@ fish_indent - indenter and prettifier
 Synopsis
 --------
 
-fish_indent [OPTIONS]
+fish_indent [OPTIONS] [FILE...]
 
 
 Description
 -----------
 
-``fish_indent`` is used to indent a piece of fish code. ``fish_indent`` reads commands from standard input and outputs them to standard output or a specified file.
+``fish_indent`` is used to indent a piece of fish code. ``fish_indent`` reads commands from standard input or the given filenames and outputs them to standard output or a specified file (if `-w` is given).
 
 The following options are available:
 
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index df3ac1e14..29f3334ef 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -629,69 +629,67 @@ int main(int argc, char *argv[]) {
             exit(1);
         }
         src = read_file(stdin);
-    } else if (argc == 1) {
-        FILE *fh = fopen(*argv, "r");
-        if (fh) {
-            src = read_file(fh);
-            fclose(fh);
-            output_location = *argv;
-        } else {
-            std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, std::strerror(errno));
-            exit(1);
-        }
     } else {
-        std::fwprintf(stderr, _(L"Too many arguments\n"));
-        exit(1);
-    }
-
-    if (output_type == output_type_pygments_csv) {
-        std::string output = make_pygments_csv(src);
-        fputs(output.c_str(), stdout);
-        return EXIT_SUCCESS;
-    }
-
-    const wcstring output_wtext = prettify(src, do_indent);
-
-    // Maybe colorize.
-    std::vector<highlight_spec_t> colors;
-    if (output_type != output_type_plain_text) {
-        highlight_shell_no_io(output_wtext, colors, output_wtext.size(), NULL,
-                              env_stack_t::globals());
-    }
-
-    std::string colored_output;
-    switch (output_type) {
-        case output_type_plain_text: {
-            colored_output = no_colorize(output_wtext);
-            break;
-        }
-        case output_type_file: {
-            FILE *fh = fopen(output_location, "w");
+        ret = EXIT_SUCCESS;
+        for (int i; i < argc; i++) {
+            FILE *fh = fopen(argv[i], "r");
             if (fh) {
-                std::fputws(output_wtext.c_str(), fh);
+                src = read_file(fh);
                 fclose(fh);
-                exit(0);
+                output_location = argv[i];
             } else {
-                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
-                              std::strerror(errno));
+                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, std::strerror(errno));
                 exit(1);
             }
-            break;
-        }
-        case output_type_ansi: {
-            colored_output = ansi_colorize(output_wtext, colors);
-            break;
-        }
-        case output_type_html: {
-            colored_output = html_colorize(output_wtext, colors);
-            break;
-        }
-        case output_type_pygments_csv: {
-            DIE("pygments_csv should have been handled above");
-            break;
+
+            if (output_type == output_type_pygments_csv) {
+                std::string output = make_pygments_csv(src);
+                fputs(output.c_str(), stdout);
+            }
+
+            const wcstring output_wtext = prettify(src, do_indent);
+
+            // Maybe colorize.
+            std::vector<highlight_spec_t> colors;
+            if (output_type != output_type_plain_text) {
+                highlight_shell_no_io(output_wtext, colors, output_wtext.size(), NULL,
+                                      env_stack_t::globals());
+            }
+
+            std::string colored_output;
+            switch (output_type) {
+            case output_type_plain_text: {
+                colored_output = no_colorize(output_wtext);
+                break;
+            }
+            case output_type_file: {
+                FILE *fh = fopen(output_location, "w");
+                if (fh) {
+                    std::fputws(output_wtext.c_str(), fh);
+                    fclose(fh);
+                } else {
+                    std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
+                                  std::strerror(errno));
+                    exit(1);
+                }
+                break;
+            }
+            case output_type_ansi: {
+                colored_output = ansi_colorize(output_wtext, colors);
+                break;
+            }
+            case output_type_html: {
+                colored_output = html_colorize(output_wtext, colors);
+                break;
+            }
+            case output_type_pygments_csv: {
+                DIE("pygments_csv should have been handled above");
+                break;
+            }
+            }
+
+            std::fputws(str2wcstring(colored_output).c_str(), stdout);
         }
     }
-
-    std::fputws(str2wcstring(colored_output).c_str(), stdout);
-    return ret;
+    return 0;
 }

From 7ddae68645ca8a81a12e7fe7cf5609d2f35d8c42 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 20 May 2019 21:07:37 +0200
Subject: [PATCH 0562/1732] Restyle a few stragglers

THERE WERE TABS! TABS!

TABS!

[ci skip]
---
 benchmarks/benchmarks/external_cmds.fish         |  2 +-
 benchmarks/benchmarks/seq_echo.fish              |  2 +-
 build_tools/list_committers_since.fish           |  4 ++--
 share/functions/__fish_complete_ant_targets.fish |  2 +-
 tests/test_util.fish                             | 16 +++++++++-------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/benchmarks/benchmarks/external_cmds.fish b/benchmarks/benchmarks/external_cmds.fish
index 7fc39561d..34b3cab40 100644
--- a/benchmarks/benchmarks/external_cmds.fish
+++ b/benchmarks/benchmarks/external_cmds.fish
@@ -1,4 +1,4 @@
 for i in (seq 2000)
-   command true
+    command true
 end
 
diff --git a/benchmarks/benchmarks/seq_echo.fish b/benchmarks/benchmarks/seq_echo.fish
index 56e76da68..a309bfbea 100644
--- a/benchmarks/benchmarks/seq_echo.fish
+++ b/benchmarks/benchmarks/seq_echo.fish
@@ -1,3 +1,3 @@
 for i in (seq 1000)
-   echo $i
+    echo $i
 end
diff --git a/build_tools/list_committers_since.fish b/build_tools/list_committers_since.fish
index e5c51c423..83d57bbb9 100755
--- a/build_tools/list_committers_since.fish
+++ b/build_tools/list_committers_since.fish
@@ -20,8 +20,8 @@ set committers_from_tag (mktemp)
 # Unicode collation tables mean that this is fraught with danger; for example, the
 # "“" character will not case-fold in UTF-8 locales. sort suggests using the C locale!
 
-git log "$TAG"   --format="%aN" --reverse | sort -u > $committers_to_tag
-git log "$TAG".. --format="%aN" --reverse | sort -u > $committers_from_tag
+git log "$TAG" --format="%aN" --reverse | sort -u >$committers_to_tag
+git log "$TAG".. --format="%aN" --reverse | sort -u >$committers_from_tag
 
 echo New committers:
 echo (comm -13 $committers_to_tag $committers_from_tag)','
diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
index 3c216b044..14745c79a 100755
--- a/share/functions/__fish_complete_ant_targets.fish
+++ b/share/functions/__fish_complete_ant_targets.fish
@@ -39,7 +39,7 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
         set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
         if [ ! -s "$cache_file" ]
             # generate cache file if empty
-            __parse_ant_targets_from_projecthelp $buildfile > $cache_file
+            __parse_ant_targets_from_projecthelp $buildfile >$cache_file
         end
 
         cat $cache_file
diff --git a/tests/test_util.fish b/tests/test_util.fish
index a4ad356bc..a23d46ca5 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -27,11 +27,11 @@ if not set -q __fish_is_running_tests
     # Set up our test environment and re-run the original script.
     set -l script $argv[1]
     switch $script
-    case '/*'
-        # path is absolute
-    case '*'
-        # path is relative, make it absolute
-        set script $PWD/$script
+        case '/*'
+            # path is absolute
+        case '*'
+            # path is relative, make it absolute
+            set script $PWD/$script
     end
 
     begin
@@ -51,7 +51,7 @@ if not set -q __fish_is_running_tests
 
     set -l escaped_parent (dirname $PWD | sed -e 's/[\'\\\\]/\\\\&/g'); or die
     set -l escaped_config (printf '%s/fish' $XDG_CONFIG_HOME | sed -e 's/[\'\\\\]/\\\\&/g'); or die
-    printf 'set fish_function_path \'%s/functions\' \'%s/share/functions\'\n' $escaped_config $escaped_parent > $XDG_CONFIG_HOME/fish/config.fish; or die
+    printf 'set fish_function_path \'%s/functions\' \'%s/share/functions\'\n' $escaped_config $escaped_parent >$XDG_CONFIG_HOME/fish/config.fish; or die
     set -xl __fish_is_running_tests $XDG_CONFIG_HOME
 
     # Set locale information for consistent tests. Fish should work with a lot of locales but the
@@ -108,7 +108,9 @@ function say -V suppress_color
         return 1
     end
 
-    if begin; test -n "$suppress_color"; or set_color $color_flags $argv[1]; end
+    if begin
+            test -n "$suppress_color"; or set_color $color_flags $argv[1]
+        end
         printf '%s' $argv[2..-1]
         test -z "$suppress_color"; and set_color normal
         if test -z "$suppress_newline"

From 714b8420a9021bef9e382cfaa43a3c7bb19831ef Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 20 May 2019 13:44:08 -0700
Subject: [PATCH 0563/1732] %s -> %ls for wchar_t

I noticed my debug output for 24bit color mode was garbled due to
this being wrong. I spent a little time trying to get the compiler
to tell us about these, but -Wformat doesn't do anything for wchar
printf functions, and __attribute__((format(printf, n, m))) will
cause an error with wchar_t's, so I gave up and decided to manually
check out every '%s' in the entire project. I found (only) one
more.

debug(0, "%s", wchars) will report warnings for incorrect
specifiers but debug(0, L"%s", wchars) is unable. Thus there may
be reason to prefer not using L"..." as an argument if all else
is equal and it's not necessary.
---
 src/builtin_complete.cpp | 2 +-
 src/env_dispatch.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index cf5b14df5..5b2fd4d8b 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -280,7 +280,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(L"%ls: Condition '%ls' contained a syntax error", cmd,
                                       condition);
             for (size_t i = 0; i < errors.size(); i++) {
-                streams.err.append_format(L"\n%s: ", cmd);
+                streams.err.append_format(L"\n%ls: ", cmd);
                 streams.err.append(errors.at(i).describe(condition_string));
             }
             return STATUS_CMD_ERROR;
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index cae845b6a..6f98b4121 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -376,7 +376,7 @@ static void update_fish_color_support(const environment_t &vars) {
     // Handle $fish_term24bit
     if (auto fish_term24bit = vars.get(L"fish_term24bit")) {
         support_term24bit = bool_from_string(fish_term24bit->as_string());
-        debug(2, L"'fish_term24bit' preference: 24-bit color %s",
+        debug(2, L"'fish_term24bit' preference: 24-bit color %ls",
               support_term24bit ? L"enabled" : L"disabled");
     } else {
         // We don't attempt to infer term24 bit support yet.

From 261198aa3ee21ed03972528301268a5de4660abd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 21 May 2019 17:00:32 +0200
Subject: [PATCH 0564/1732] completions/set: Complete some config vars even if
 they aren't set

Fixes #5884.

[ci skip]
---
 share/completions/set.fish | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/share/completions/set.fish b/share/completions/set.fish
index 3966638e4..3128fa67d 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -49,6 +49,17 @@ function __fish_set_is_locale -d 'Test if We are specifying a locale value for t
     return 1
 end
 
+function __fish_set_special_vars
+    printf %s\t%s\n CDPATH "A list of dirs that cd uses"
+    printf %s\t%s\n fish_emoji_width "How wide your terminal displays emoji (2 since Unicode 9, 1 previously)"
+    printf %s\t%s\n fish_ambiguous_width "How wide your terminal displays ambiguous chars (1 or 2)"
+    printf %s\t%s\n fish_escape_delay_ms "How long fish waits to distinguish escape and alt"
+    printf %s\t%s\n fish_greeting "The message to display at start (also a function)"
+    printf %s\t%s\n fish_history "The session id to store history under"
+    printf %s\t%s\n fish_user_paths "A list of dirs to prepend to PATH"
+    printf %s\t%s\n BROWSER "The browser to use"
+end
+
 #
 # Completions
 #
@@ -75,6 +86,8 @@ complete -c set -n '__fish_is_first_token' -s S -l show -d "Show variable"
 complete -c set -n '__fish_is_first_token; 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_first_token; 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_first_token; 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_first_token; and not __fish_seen_argument -s e -l erase' -x -a "(__fish_set_special_vars)"
 # Complete scope-specific variables
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s l -l local' -x -a "(set -l | string match -rv '^__' | string replace ' ' \t'Local Variable: ')"
 complete -c set -n '__fish_is_first_token; and __fish_seen_argument -s g -l global' -x -a "(set -g | string match -rv '^__' | string replace ' ' \t'Global Variable: ')"

From ad57133c7f9086a83ead323dc25ca472d00a3d08 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 20 May 2019 09:27:46 -0700
Subject: [PATCH 0565/1732] Switch parser_t to hold its variables via
 shared_ptr

Preparation for variable stacks with finite lifetimes.
---
 src/env.cpp    | 5 +++--
 src/env.h      | 3 ++-
 src/parser.cpp | 6 +++++-
 src/parser.h   | 7 ++++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index bc36d4921..e58cbd79e 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1283,8 +1283,9 @@ env_stack_t &env_stack_t::globals() {
     return s_globals;
 }
 
-env_stack_t &env_stack_t::principal() {
-    static env_stack_t s_principal(env_stack_impl_t::create());
+const std::shared_ptr<env_stack_t> &env_stack_t::principal_ref() {
+    static const std::shared_ptr<env_stack_t> s_principal{
+        new env_stack_t(env_stack_impl_t::create())};
     return s_principal;
 }
 
diff --git a/src/env.h b/src/env.h
index e51cee02b..6577badc5 100644
--- a/src/env.h
+++ b/src/env.h
@@ -291,7 +291,8 @@ class env_stack_t final : public environment_t {
     void mark_changed_exported();
 
     // Compatibility hack; access the "environment stack" from back when there was just one.
-    static env_stack_t &principal();
+    static const std::shared_ptr<env_stack_t> &principal_ref();
+    static env_stack_t &principal() { return *principal_ref(); }
 
     // Access a variable stack that only represents globals.
     // Do not push or pop from this.
diff --git a/src/parser.cpp b/src/parser.cpp
index 5b65f64b4..b44b5bac1 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -100,7 +100,11 @@ wcstring parser_t::user_presentable_path(const wcstring &path) const {
     return replace_home_directory_with_tilde(path, vars());
 }
 
-parser_t::parser_t() : variables(env_stack_t::principal()) {}
+parser_t::parser_t(std::shared_ptr<env_stack_t> vars) : variables(std::move(vars)) {
+    assert(variables.get() && "Null variables in parser initializer");
+}
+
+parser_t::parser_t() : parser_t(env_stack_t::principal_ref()) {}
 
 // Out of line destructor to enable forward declaration of parse_execution_context_t
 parser_t::~parser_t() = default;
diff --git a/src/parser.h b/src/parser.h
index d4ed98631..ae27c9467 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -174,7 +174,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// The 'depth' of the fish call stack.
     int eval_level = -1;
     /// Set of variables for the parser.
-    env_stack_t &variables;
+    const std::shared_ptr<env_stack_t> variables;
     /// Miscellaneous library data.
     library_data_t library_data{};
 
@@ -204,6 +204,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
 
     /// Create a parser.
     parser_t();
+    parser_t(std::shared_ptr<env_stack_t> vars);
 
     /// The main parser.
     static std::shared_ptr<parser_t> principal;
@@ -271,8 +272,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     const job_list_t &jobs() const { return job_list; }
 
     /// Get the variables.
-    env_stack_t &vars() { return variables; }
-    const env_stack_t &vars() const { return variables; }
+    env_stack_t &vars() { return *variables; }
+    const env_stack_t &vars() const { return *variables; }
 
     /// Get the library data.
     library_data_t &libdata() { return library_data; }

From 11209b7553cc979f84775fc0fd0ed6b820b67b34 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 20 May 2019 09:42:18 -0700
Subject: [PATCH 0566/1732] Switch the block stack to a deque instead of vector
 of shared pointers

That makes the block stack easier to copy.
---
 src/parser.cpp | 42 +++++++++++++++++++++---------------------
 src/parser.h   |  5 +++--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index b44b5bac1..afbc3700c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -124,23 +124,23 @@ void parser_t::skip_all_blocks() {
 
 // Given a new-allocated block, push it onto our block stack, acquiring ownership
 block_t *parser_t::push_block(block_t &&block) {
-    std::unique_ptr<block_t> new_current = make_unique<block_t>(std::move(block));
-    const enum block_type_t type = new_current->type();
-    new_current->src_lineno = parser_t::get_lineno();
+    block_t new_current{std::move(block)};
+    const enum block_type_t type = new_current.type();
+    new_current.src_lineno = parser_t::get_lineno();
 
     const wchar_t *filename = parser_t::current_filename();
     if (filename != NULL) {
-        new_current->src_filename = intern(filename);
+        new_current.src_filename = intern(filename);
     }
 
     // New blocks should be skipped if the outer block is skipped, except TOP and SUBST block, which
     // open up new environments.
     const block_t *old_current = this->current_block();
-    new_current->skip = old_current && old_current->skip;
+    new_current.skip = old_current && old_current->skip;
 
     // Type TOP and SUBST are never skipped.
     if (type == TOP || type == SUBST) {
-        new_current->skip = false;
+        new_current.skip = false;
     }
 
     // Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
@@ -152,14 +152,15 @@ block_t *parser_t::push_block(block_t &&block) {
         libdata().is_breakpoint = true;
     }
 
-    if (new_current->type() != TOP) {
+    if (new_current.type() != TOP) {
         vars().push(type == FUNCTION_CALL);
-        new_current->wants_pop_env = true;
+        new_current.wants_pop_env = true;
     }
 
-    // Push it onto our stack and return it.
+    // Push it onto our stack and return a pointer to it.
+    // Note that deques do not move their contents so this is safe.
     this->block_stack.push_back(std::move(new_current));
-    return this->block_stack.back().get();
+    return &this->block_stack.back();
 }
 
 void parser_t::pop_block(const block_t *expected) {
@@ -170,17 +171,16 @@ void parser_t::pop_block(const block_t *expected) {
         return;
     }
 
-    // acquire ownership out of the block stack
-    // this will trigger deletion when it goes out of scope
-    std::unique_ptr<block_t> old = std::move(block_stack.back());
+    // Acquire ownership out of the block stack.
+    block_t old = std::move(block_stack.back());
     block_stack.pop_back();
 
-    if (old->wants_pop_env) vars().pop();
+    if (old.wants_pop_env) vars().pop();
 
     // Figure out if `status is-block` should consider us to be in a block now.
     bool new_is_block = false;
     for (const auto &b : block_stack) {
-        const enum block_type_t type = b->type();
+        const enum block_type_t type = b.type();
         if (type != TOP && type != SUBST) {
             new_is_block = true;
             break;
@@ -191,7 +191,7 @@ void parser_t::pop_block(const block_t *expected) {
     // Are we still in a breakpoint?
     bool new_is_breakpoint = false;
     for (const auto &b : block_stack) {
-        const enum block_type_t type = b->type();
+        const enum block_type_t type = b.type();
         if (type == BREAKPOINT) {
             new_is_breakpoint = true;
             break;
@@ -232,15 +232,15 @@ wcstring parser_t::block_stack_description() const {
 const block_t *parser_t::block_at_index(size_t idx) const {
     // Zero corresponds to the last element in our vector.
     size_t count = block_stack.size();
-    return idx < count ? block_stack.at(count - idx - 1).get() : NULL;
+    return idx < count ? &block_stack.at(count - idx - 1) : NULL;
 }
 
 block_t *parser_t::block_at_index(size_t idx) {
     size_t count = block_stack.size();
-    return idx < count ? block_stack.at(count - idx - 1).get() : NULL;
+    return idx < count ? &block_stack.at(count - idx - 1) : NULL;
 }
 
-block_t *parser_t::current_block() { return block_stack.empty() ? NULL : block_stack.back().get(); }
+block_t *parser_t::current_block() { return block_stack.empty() ? NULL : &block_stack.back(); }
 
 void parser_t::forbid_function(const wcstring &function) { forbidden_function.push_back(function); }
 
@@ -458,7 +458,7 @@ const wchar_t *parser_t::get_function_name(int level) {
         // isn't one return the function name for the current level.
         int idx = 0;
         for (const auto &b : block_stack) {
-            const enum block_type_t type = b->type();
+            const enum block_type_t type = b.type();
             if (type == BREAKPOINT) {
                 return this->is_function(idx);
             }
@@ -473,7 +473,7 @@ const wchar_t *parser_t::get_function_name(int level) {
     // Return the function name for the specific function stack frame.
     int idx = 0;
     for (const auto &b : block_stack) {
-        const enum block_type_t type = b->type();
+        const enum block_type_t type = b.type();
         if (type == FUNCTION_CALL || type == FUNCTION_CALL_NO_SHADOW) {
             if (--level == 0) return this->is_function(idx);
         }
diff --git a/src/parser.h b/src/parser.h
index ae27c9467..0874b6ffb 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -169,8 +169,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     wcstring_list_t forbidden_function;
     /// The jobs associated with this parser.
     job_list_t job_list;
-    /// The list of blocks
-    std::vector<std::unique_ptr<block_t>> block_stack;
+    /// The list of blocks. This is a deque because we give out raw pointers to callers, who hold
+    /// them across manipulating this stack.
+    std::deque<block_t> block_stack;
     /// The 'depth' of the fish call stack.
     int eval_level = -1;
     /// Set of variables for the parser.

From 6d20b3984a91700ef33cf7485f9068d8293a4b76 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 21 May 2019 23:34:05 +0200
Subject: [PATCH 0567/1732] Revert "src/screen: Stop falling back to wchar_t"

This was, under some circumstances, apparently off by one.

If a suggestion was really long, like

```fish
infocmp | string split , | string trim | string match -re . | while read -d = -l key val; test -z "$val"; and continue; string match -q '*%*' -- $val; and continue; test (string replace -ra '\e([\[\]]|\(B).*[\comJKsu]' '' -- a(tput $key)b) = ab; or echo $key $val; end > xterm
```

(I'm assuming longer than $COLUMNS), it would staircase like with a wrong wcwidth.

This reverts commit 15a5c0ed5f1a384387f359396e99fc763d57ecc1.
---
 src/screen.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 9aa890cf9..f653be3f8 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -823,15 +823,19 @@ static size_t truncation_offset_for_width(const std::vector<size_t> &width_by_of
 }
 
 static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
-                                      wcstring left_prompt,
-                                      wcstring right_prompt, const wcstring &commandline,
-                                      wcstring autosuggestion) {
+                                      const wcstring &left_prompt_str,
+                                      const wcstring &right_prompt_str, const wcstring &commandline,
+                                      const wcstring &autosuggestion_str) {
     UNUSED(s);
     screen_layout_t result = {};
 
     // Start by ensuring that the prompts themselves can fit.
-    prompt_layout_t left_prompt_layout = calc_prompt_layout(left_prompt, cached_layouts);
-    prompt_layout_t right_prompt_layout = calc_prompt_layout(right_prompt, cached_layouts);
+    const wchar_t *left_prompt = left_prompt_str.c_str();
+    const wchar_t *right_prompt = right_prompt_str.c_str();
+    const wchar_t *autosuggestion = autosuggestion_str.c_str();
+
+    prompt_layout_t left_prompt_layout = calc_prompt_layout(left_prompt_str, cached_layouts);
+    prompt_layout_t right_prompt_layout = calc_prompt_layout(right_prompt_str, cached_layouts);
 
     size_t left_prompt_width = left_prompt_layout.last_line_width;
     size_t right_prompt_width = right_prompt_layout.last_line_width;
@@ -878,7 +882,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (multiline) {
         autosuggestion = L"";
     } else {
-        autosuggest_truncated_widths.reserve(1 + autosuggestion.size());
+        autosuggest_truncated_widths.reserve(1 + autosuggestion_str.size());
         for (size_t i = 0; autosuggestion[i] != L'\0'; i++) {
             autosuggest_truncated_widths.push_back(autosuggest_total_width);
             autosuggest_total_width += fish_wcwidth_min_0(autosuggestion[i]);
@@ -909,10 +913,10 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
         calculated_width = left_prompt_width + right_prompt_width + first_command_line_width +
                            autosuggest_total_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = std::move(left_prompt);
+            result.left_prompt = left_prompt;
             result.left_prompt_space = left_prompt_width;
-            result.right_prompt = std::move(right_prompt);
-            result.autosuggestion = std::move(autosuggestion);
+            result.right_prompt = right_prompt;
+            result.autosuggestion = autosuggestion;
             done = true;
         }
     }
@@ -922,9 +926,9 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (!done) {
         calculated_width = left_prompt_width + right_prompt_width + first_command_line_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = std::move(left_prompt);
+            result.left_prompt = left_prompt;
             result.left_prompt_space = left_prompt_width;
-            result.right_prompt = std::move(right_prompt);
+            result.right_prompt = right_prompt;
 
             // Need at least two characters to show an autosuggestion.
             size_t available_autosuggest_space =
@@ -943,7 +947,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     if (!done) {
         calculated_width = left_prompt_width + first_command_line_width;
         if (calculated_width < screen_width) {
-            result.left_prompt = std::move(left_prompt);
+            result.left_prompt = left_prompt;
             result.left_prompt_space = left_prompt_width;
             done = true;
         }
@@ -951,7 +955,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
 
     // Case 4
     if (!done) {
-        result.left_prompt = std::move(left_prompt);
+        result.left_prompt = left_prompt;
         result.left_prompt_space = left_prompt_width;
         // See remark about for why we can't use the right prompt here result.right_prompt =
         // right_prompt. If the command wraps, and the prompt is not short, place the command on its

From 363652ad76025ddb08cb8f0ef0fed37402913790 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 21 May 2019 18:39:01 -0700
Subject: [PATCH 0568/1732] debug_thread_error to wait for a signal instead of
 sleep

Allows for control-C out of it
---
 src/common.cpp | 6 +++++-
 src/signal.cpp | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common.cpp b/src/common.cpp
index 7b42630af..5f59edee3 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2269,7 +2269,11 @@ void append_path_component(wcstring &path, const wcstring &component) {
 
 extern "C" {
 [[gnu::noinline]] void debug_thread_error(void) {
-    while (1) sleep(9999999);
+    // Wait for a SIGINT. We can't use sigsuspend() because the signal may be delivered on another
+    // thread.
+    auto &tm = topic_monitor_t::principal();
+    auto gens = tm.current_generations();
+    tm.check(&gens, {topic_t::sighupint}, true /* wait */);
 }
 }
 
diff --git a/src/signal.cpp b/src/signal.cpp
index 06d0ee6c9..24e4e8726 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -255,6 +255,7 @@ static void handle_int_notinteractive(int sig, siginfo_t *info, void *context) {
     if (reraise_if_forked_child(sig)) return;
     parser_t::skip_all_blocks();
     default_handler(sig, info, context);
+    topic_monitor_t::principal().post(topic_t::sighupint);
 }
 
 /// sigchld handler. Does notification and calls the handler in proc.c.

From 1faffa515e3f25ba2f1c2929fa4e06d422fb5fea Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 22 May 2019 21:46:53 +0200
Subject: [PATCH 0569/1732] Don't crash if CDPATH is "./"

Fixes #5887.
---
 src/path.cpp | 7 ++++++-
 tests/cd.in  | 3 +++
 tests/cd.out | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/path.cpp b/src/path.cpp
index 2cfcb80c6..d5ab52c66 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -179,9 +179,14 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
             if (next_path.empty()) next_path = L".";
             if (next_path == L"." && !wd.empty()) {
                 // next_path is just '.', and we have a working directory, so use the wd instead.
-                // TODO: if next_path starts with ./ we need to replace the . with the wd.
                 next_path = wd;
             }
+
+            // If next_path starts with ./ we need to replace the . with the wd.
+            if (string_prefixes_string(L"./", next_path) && !wd.empty()) {
+                next_path = next_path.replace(0, 2, wd);
+            }
+
             expand_tilde(next_path, env_vars);
             if (next_path.empty()) continue;
 
diff --git a/tests/cd.in b/tests/cd.in
index e70a7f902..88718c16a 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -72,6 +72,9 @@ cd $base
 test $PWD = $base; and echo Gone to base
 cd linkhome
 test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
+set -g CDPATH ./
+cd $base
+test $PWD = $base; and echo No crash with ./ CDPATH
 
 # cd back before removing the test directory again.
 cd $oldpwd
diff --git a/tests/cd.out b/tests/cd.out
index d3801a10a..8c786556a 100644
--- a/tests/cd.out
+++ b/tests/cd.out
@@ -29,3 +29,4 @@ BogusPWD test 2 succeeded
 Gone to linkhome via CDPATH
 Gone to base
 Gone to linkhome via implicit . in CDPATH
+No crash with ./ CDPATH

From 212246ecaa5f748a38805eee3ce472a40b610a5a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 22 May 2019 22:20:56 +0200
Subject: [PATCH 0570/1732] fish_indent: Fix reading from stdin for 0 args

I have no idea why this passes the tests, we *have* tests reading from
stdin!
---
 src/fish_indent.cpp | 117 ++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 29f3334ef..3da943520 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -621,17 +621,16 @@ int main(int argc, char *argv[]) {
     argv += optind;
 
     wcstring src;
-    if (argc == 0) {
-        if (output_type == output_type_file) {
-            std::fwprintf(stderr,
-                          _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
-                          program_name);
-            exit(1);
-        }
-        src = read_file(stdin);
-    } else {
-        ret = EXIT_SUCCESS;
-        for (int i; i < argc; i++) {
+    for (int i = 0; i < argc || (argc == 0 && i == 0) ; i++) {
+        if (argc == 0 && i == 0) {
+            if (output_type == output_type_file) {
+                std::fwprintf(stderr,
+                              _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
+                              program_name);
+                exit(1);
+            }
+            src = read_file(stdin);
+        } else {
             FILE *fh = fopen(argv[i], "r");
             if (fh) {
                 src = read_file(fh);
@@ -641,55 +640,55 @@ int main(int argc, char *argv[]) {
                 std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, std::strerror(errno));
                 exit(1);
             }
-
-            if (output_type == output_type_pygments_csv) {
-                std::string output = make_pygments_csv(src);
-                fputs(output.c_str(), stdout);
-            }
-
-            const wcstring output_wtext = prettify(src, do_indent);
-
-            // Maybe colorize.
-            std::vector<highlight_spec_t> colors;
-            if (output_type != output_type_plain_text) {
-                highlight_shell_no_io(output_wtext, colors, output_wtext.size(), NULL,
-                                      env_stack_t::globals());
-            }
-
-            std::string colored_output;
-            switch (output_type) {
-            case output_type_plain_text: {
-                colored_output = no_colorize(output_wtext);
-                break;
-            }
-            case output_type_file: {
-                FILE *fh = fopen(output_location, "w");
-                if (fh) {
-                    std::fputws(output_wtext.c_str(), fh);
-                    fclose(fh);
-                } else {
-                    std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
-                                  std::strerror(errno));
-                    exit(1);
-                }
-                break;
-            }
-            case output_type_ansi: {
-                colored_output = ansi_colorize(output_wtext, colors);
-                break;
-            }
-            case output_type_html: {
-                colored_output = html_colorize(output_wtext, colors);
-                break;
-            }
-            case output_type_pygments_csv: {
-                DIE("pygments_csv should have been handled above");
-                break;
-            }
-            }
-
-            std::fputws(str2wcstring(colored_output).c_str(), stdout);
         }
+
+        if (output_type == output_type_pygments_csv) {
+            std::string output = make_pygments_csv(src);
+            fputs(output.c_str(), stdout);
+        }
+
+        const wcstring output_wtext = prettify(src, do_indent);
+
+        // Maybe colorize.
+        std::vector<highlight_spec_t> colors;
+        if (output_type != output_type_plain_text) {
+            highlight_shell_no_io(output_wtext, colors, output_wtext.size(), NULL,
+                                  env_stack_t::globals());
+        }
+
+        std::string colored_output;
+        switch (output_type) {
+        case output_type_plain_text: {
+            colored_output = no_colorize(output_wtext);
+            break;
+        }
+        case output_type_file: {
+            FILE *fh = fopen(output_location, "w");
+            if (fh) {
+                std::fputws(output_wtext.c_str(), fh);
+                fclose(fh);
+            } else {
+                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
+                              std::strerror(errno));
+                exit(1);
+            }
+            break;
+        }
+        case output_type_ansi: {
+            colored_output = ansi_colorize(output_wtext, colors);
+            break;
+        }
+        case output_type_html: {
+            colored_output = html_colorize(output_wtext, colors);
+            break;
+        }
+        case output_type_pygments_csv: {
+            DIE("pygments_csv should have been handled above");
+            break;
+        }
+        }
+
+        std::fputws(str2wcstring(colored_output).c_str(), stdout);
     }
     return 0;
 }

From 9a541d9ed468ddb2314443ac721b25d8cc7ebf12 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 22 May 2019 22:31:45 +0200
Subject: [PATCH 0571/1732] expand: Use wcstring for the abbr prefix

This mainly is conceptually a bit simpler. The comment about making it
cheaper is entirely misplaced since this is quite far away from being
important.

Even expanding 1000 abbrs, it doesn't show up in the profile.
---
 src/expand.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 1cc38b00d..eb3982dc8 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1217,13 +1217,12 @@ maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &
 }
 
 std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars) {
-    // TODO: try to make this cheaper
-    const size_t fish_abbr_len = std::wcslen(L"_fish_abbr_");
+    const wcstring prefix = L"_fish_abbr_";
     auto names = vars.get_names(0);
     std::map<wcstring, wcstring> result;
     for (const wcstring &name : names) {
-        if (string_prefixes_string(L"_fish_abbr_", name)) {
-            result[name.substr(fish_abbr_len)] = vars.get(name)->as_string();
+        if (string_prefixes_string(prefix, name)) {
+            result[name.substr(prefix.size())] = vars.get(name)->as_string();
         }
     }
     return result;

From 686b84396ca50514b64f7bcb26eab73618c9f913 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 19 May 2019 19:29:25 -0700
Subject: [PATCH 0572/1732] Migrate the return bool outside of block_t

This is a flag that gets set by the return function. But we only need one,
not per-block. Move it into libdata.
---
 src/builtin_return.cpp  |  7 ++-----
 src/exec.cpp            |  3 +++
 src/parse_execution.cpp |  5 +++--
 src/parser.cpp          | 10 ----------
 src/parser.h            |  5 +++--
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index b157c04fd..c8873e2bc 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -102,11 +102,8 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_ERROR;
     }
 
-    // Skip everything up to and including the function block.
-    for (size_t i = 0; i <= function_block_idx; i++) {
-        block_t *b = parser.block_at_index(i);
-        b->skip = true;
-    }
+    // Mark a return in the libdata.
+    parser.libdata().returning = true;
 
     return retval;
 }
diff --git a/src/exec.cpp b/src/exec.cpp
index 894a83250..68d9fb949 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -831,6 +831,9 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 
         parser.allow_function();
         parser.pop_block(fb);
+
+        // If we returned due to a return statement, then stop returning now.
+        parser.libdata().returning = false;
     } else {
         assert(p->type == process_type_t::block_node);
         assert(p->block_node_source && p->internal_block_node && "Process is missing node info");
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c46cf2471..2ca3cb585 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -189,10 +189,11 @@ parse_execution_context_t::cancellation_reason(const block_t *block) const {
     if (parser && parser->cancellation_requested) {
         return execution_cancellation_skip;
     }
-    if (block && block->skip) {
+    const auto &ld = parser->libdata();
+    if (ld.returning) {
         return execution_cancellation_skip;
     }
-    if (parser->libdata().loop_status != loop_status_t::normals) {
+    if (ld.loop_status != loop_status_t::normals) {
         return execution_cancellation_loop_control;
     }
     return execution_cancellation_none;
diff --git a/src/parser.cpp b/src/parser.cpp
index afbc3700c..e3def49ed 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -133,16 +133,6 @@ block_t *parser_t::push_block(block_t &&block) {
         new_current.src_filename = intern(filename);
     }
 
-    // New blocks should be skipped if the outer block is skipped, except TOP and SUBST block, which
-    // open up new environments.
-    const block_t *old_current = this->current_block();
-    new_current.skip = old_current && old_current->skip;
-
-    // Type TOP and SUBST are never skipped.
-    if (type == TOP || type == SUBST) {
-        new_current.skip = false;
-    }
-
     // Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
     if (type != TOP && type != SUBST) {
         libdata().is_block = true;
diff --git a/src/parser.h b/src/parser.h
index 0874b6ffb..e2661df47 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -61,8 +61,6 @@ class block_t {
     const block_type_t block_type;
 
    public:
-    /// Whether execution of the commands in this block should be skipped.
-    bool skip{false};
     /// Name of file that created this block. This string is intern'd.
     const wchar_t *src_filename{nullptr};
     /// Line number where this block was created.
@@ -155,6 +153,9 @@ struct library_data_t {
 
     /// Whether we should break or continue the current loop.
     enum loop_status_t loop_status { loop_status_t::normals };
+
+    /// Whether we should return from the current function.
+    bool returning{false};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From e91d68266c12769129658754d6ef27499254da29 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 May 2019 13:34:03 -0700
Subject: [PATCH 0573/1732] Eliminate reader_current_filename

Store this in the parser libdata instead.
---
 src/builtin_source.cpp |  4 ++--
 src/exec.cpp           |  9 ++++-----
 src/fish.cpp           | 14 ++++++--------
 src/function.cpp       |  2 +-
 src/parser.cpp         |  8 ++------
 src/parser.h           |  4 ++++
 src/reader.cpp         | 18 ------------------
 src/reader.h           | 11 -----------
 8 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 9198992e7..5bdc7c4b2 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -74,7 +74,8 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     const block_t *sb = parser.push_block(block_t::source_block(fn_intern));
-    reader_push_current_filename(fn_intern);
+    auto &ld = parser.libdata();
+    scoped_push<const wchar_t *> filename_push{&ld.current_filename, fn_intern};
 
     // This is slightly subtle. If this is a bare `source` with no args then `argv + optind` already
     // points to the end of argv. Otherwise we want to skip the file name to get to the args if any.
@@ -95,6 +96,5 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     // Do not close fd after calling reader_read. reader_read automatically closes it before calling
     // eval.
-    reader_pop_current_filename();
     return retval;
 }
diff --git a/src/exec.cpp b/src/exec.cpp
index 68d9fb949..e4b0a402c 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -676,7 +676,7 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
 
 /// Executes an external command.
 /// \return true on success, false if there is an exec error.
-static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t> &j, process_t *p,
+static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t> &j, process_t *p,
                                   const io_chain_t &proc_io_chain) {
     assert(p->type == process_type_t::external && "Process is not external");
     // Get argv and envv before we fork.
@@ -694,14 +694,13 @@ static bool exec_external_command(env_stack_t &vars, const std::shared_ptr<job_t
     // (/dev/tty?).
     make_fd_blocking(STDIN_FILENO);
 
-    auto export_arr = vars.export_arr();
-    ;
+    auto export_arr = parser.vars().export_arr();
     const char *const *argv = argv_array.get();
     const char *const *envv = export_arr->get();
 
     std::string actual_cmd_str = wcs2string(p->actual_cmd);
     const char *actual_cmd = actual_cmd_str.c_str();
-    const wchar_t *file = reader_current_filename();
+    const wchar_t *file = parser.libdata().current_filename;
 
 #if FISH_USE_POSIX_SPAWN
     // Prefer to use posix_spawn, since it's faster on some systems like OS X.
@@ -979,7 +978,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
         }
 
         case process_type_t::external: {
-            if (!exec_external_command(parser.vars(), j, p, process_net_io_chain)) {
+            if (!exec_external_command(parser, j, p, process_net_io_chain)) {
                 return false;
             }
             break;
diff --git a/src/fish.cpp b/src/fish.cpp
index e79b96811..389dfc4d2 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include "function.h"
 #include "future_feature_flags.h"
 #include "history.h"
+#include "intern.h"
 #include "io.h"
 #include "parser.h"
 #include "path.h"
@@ -466,18 +467,15 @@ int main(int argc, char **argv) {
                 }
                 parser.vars().set(L"argv", ENV_DEFAULT, list);
 
-                const wcstring rel_filename = str2wcstring(file);
-
-                reader_push_current_filename(rel_filename.c_str());
-
+                auto &ld = parser.libdata();
+                wcstring rel_filename = str2wcstring(file);
+                scoped_push<const wchar_t *> filename_push{&ld.current_filename,
+                                                           intern(rel_filename.c_str())};
                 res = reader_read(fd, {});
-
                 if (res) {
                     debug(1, _(L"Error while reading file %ls\n"),
-                          reader_current_filename() ? reader_current_filename()
-                                                    : _(L"Standard input"));
+                          ld.current_filename ? ld.current_filename : _(L"Standard input"));
                 }
-                reader_pop_current_filename();
             }
         }
     }
diff --git a/src/function.cpp b/src/function.cpp
index cc2f1f0f9..37e889e9d 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -190,7 +190,7 @@ void function_add(const function_data_t &data, const parser_t &parser) {
     bool is_autoload = funcset->autoloader.autoload_in_progress(data.name);
 
     // Create and store a new function.
-    const wchar_t *filename = reader_current_filename();
+    const wchar_t *filename = parser.libdata().current_filename;
     auto ins = funcset->funcs.emplace(data.name,
                                       function_info_t(data, parser.vars(), filename, is_autoload));
     assert(ins.second && "Function should not already be present in the table");
diff --git a/src/parser.cpp b/src/parser.cpp
index e3def49ed..100aa13ac 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -498,12 +498,8 @@ const wchar_t *parser_t::current_filename() const {
         }
     }
 
-    // We query a global array for the current file name, but only do that if we are the principal
-    // parser.
-    if (this == &principal_parser()) {
-        return reader_current_filename();
-    }
-    return NULL;
+    // Fall back to the file being sourced.
+    return libdata().current_filename;
 }
 
 wcstring parser_t::current_line() {
diff --git a/src/parser.h b/src/parser.h
index e2661df47..3fa3c1d93 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -156,6 +156,10 @@ struct library_data_t {
 
     /// Whether we should return from the current function.
     bool returning{false};
+
+    /// The current filename we are evaluating, either from builtin source or on the command line.
+    /// This is an intern'd string.
+    const wchar_t *current_filename{};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {
diff --git a/src/reader.cpp b/src/reader.cpp
index 02836ec8d..58e811099 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -482,9 +482,6 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 /// handled by the fish interrupt handler.
 static volatile sig_atomic_t is_interactive_read;
 
-/// The stack containing names of files that are being parsed.
-static std::stack<const wchar_t *, std::vector<const wchar_t *>> current_filename;
-
 /// This variable is set to true by the signal handler when ^C is pressed.
 static volatile sig_atomic_t interrupted = 0;
 
@@ -689,21 +686,6 @@ void reader_handle_sigint() {
     interrupted = 1;
 }
 
-const wchar_t *reader_current_filename() {
-    ASSERT_IS_MAIN_THREAD();
-    return current_filename.empty() ? NULL : current_filename.top();
-}
-
-void reader_push_current_filename(const wchar_t *fn) {
-    ASSERT_IS_MAIN_THREAD();
-    current_filename.push(intern(fn));
-}
-
-void reader_pop_current_filename() {
-    ASSERT_IS_MAIN_THREAD();
-    current_filename.pop();
-}
-
 /// Make sure buffers are large enough to hold the current string length.
 void reader_data_t::command_line_changed(const editable_line_t *el) {
     ASSERT_IS_MAIN_THREAD();
diff --git a/src/reader.h b/src/reader.h
index 445dc8880..45c3431ea 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -64,20 +64,9 @@ void reader_init();
 /// Restore the term mode at startup.
 void restore_term_mode();
 
-/// Returns the filename of the file currently read.
-const wchar_t *reader_current_filename();
-
-/// Push a new filename on the stack of read files.
-///
-/// \param fn The fileanme to push
-void reader_push_current_filename(const wchar_t *fn);
-
 /// Change the history file for the current command reading context.
 void reader_change_history(const wcstring &name);
 
-/// Pop the current filename from the stack of read files.
-void reader_pop_current_filename();
-
 /// Write the title to the titlebar. This function is called just before a new application starts
 /// executing and just after it finishes.
 ///

From 79158319391489fee365c06724dfca49b38ad220 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 May 2019 16:09:59 -0700
Subject: [PATCH 0574/1732] Wrap setenv() and unsetenv() calls in a lock

---
 src/env.cpp          | 12 ++++++++++++
 src/env.h            |  6 ++++++
 src/env_dispatch.cpp | 12 ++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index e58cbd79e..4eccc060f 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1357,3 +1357,15 @@ wcstring env_get_runtime_path() {
     }
     return result;
 }
+
+static std::mutex s_setenv_lock{};
+
+void setenv_lock(const char *name, const char *value, int overwrite) {
+    scoped_lock locker(s_setenv_lock);
+    setenv(name, value, overwrite);
+}
+
+void unsetenv_lock(const char *name) {
+    scoped_lock locker(s_setenv_lock);
+    unsetenv(name);
+}
diff --git a/src/env.h b/src/env.h
index 6577badc5..f026da57a 100644
--- a/src/env.h
+++ b/src/env.h
@@ -317,4 +317,10 @@ wcstring env_get_runtime_path();
 /// Replace empty path elements with "." - see #3914.
 void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars);
 
+/// A wrapper around setenv() and unsetenv() which use a lock.
+/// In general setenv() and getenv() are highly incompatible with threads. This makes it only
+/// slightly safer.
+void setenv_lock(const char *name, const char *value, int overwrite);
+void unsetenv_lock(const char *name);
+
 #endif
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 6f98b4121..c45034a86 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -143,10 +143,10 @@ static void handle_timezone(const wchar_t *env_var_name, const environment_t &va
           !var ? L"MISSING" : var->as_string().c_str());
     const std::string &name = wcs2string(env_var_name);
     if (var.missing_or_empty()) {
-        unsetenv(name.c_str());
+        unsetenv_lock(name.c_str());
     } else {
         const std::string value = wcs2string(var->as_string());
-        setenv(name.c_str(), value.c_str(), 1);
+        setenv_lock(name.c_str(), value.c_str(), 1);
     }
     tzset();
 }
@@ -454,11 +454,11 @@ static void init_curses(const environment_t &vars) {
         const auto var = vars.get(var_name, ENV_EXPORT);
         if (var.missing_or_empty()) {
             debug(2, L"curses var %s missing or empty", name.c_str());
-            unsetenv(name.c_str());
+            unsetenv_lock(name.c_str());
         } else {
             std::string value = wcs2string(var->as_string());
             debug(2, L"curses var %s='%s'", name.c_str(), value.c_str());
-            setenv(name.c_str(), value.c_str(), 1);
+            setenv_lock(name.c_str(), value.c_str(), 1);
         }
     }
 
@@ -499,11 +499,11 @@ static void init_locale(const environment_t &vars) {
         const std::string &name = wcs2string(var_name);
         if (var.missing_or_empty()) {
             debug(5, L"locale var %s missing or empty", name.c_str());
-            unsetenv(name.c_str());
+            unsetenv_lock(name.c_str());
         } else {
             const std::string value = wcs2string(var->as_string());
             debug(5, L"locale var %s='%s'", name.c_str(), value.c_str());
-            setenv(name.c_str(), value.c_str(), 1);
+            setenv_lock(name.c_str(), value.c_str(), 1);
         }
     }
 

From 4d929720ce40451a3e805f33d2c73ee72649ed55 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 May 2019 16:36:22 -0700
Subject: [PATCH 0575/1732] Clean up and rename io_transmorgrify

---
 src/exec.cpp | 50 ++++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index e4b0a402c..9ccac5cb8 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -182,19 +182,14 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
 /// Check if the IO redirection chains contains redirections for the specified file descriptor.
 static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get() != NULL; }
 
-/// Close a list of fds.
-static void io_cleanup_fds(const std::vector<int> &opened_fds) {
-    std::for_each(opened_fds.begin(), opened_fds.end(), close);
-}
-
 /// Make a copy of the specified io redirection chain, but change file redirection into fd
 /// redirection. This makes the redirection chain suitable for use as block-level io, since the file
 /// won't be repeatedly reopened for every command in the block, which would reset the cursor
 /// position.
 ///
 /// \return true on success, false on failure. Returns the output chain and opened_fds by reference.
-static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
-                            std::vector<int> *out_opened_fds) {
+static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chain_t *out_chain,
+                                             std::vector<autoclose_fd_t> *out_opened_fds) {
     ASSERT_IS_MAIN_THREAD();
     assert(out_chain != NULL && out_opened_fds != NULL);
     assert(out_chain->empty());
@@ -206,58 +201,45 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain,
 
     bool success = true;
 
+    // All of the FDs that we create.
+    std::vector<autoclose_fd_t> opened_fds{};
+
     // Make our chain of redirections.
     io_chain_t result_chain;
 
-    // In the event we can't finish transmorgrifying, we'll have to close all the files we opened.
-    std::vector<int> opened_fds;
-
-    for (size_t idx = 0; idx < in_chain.size(); idx++) {
-        const shared_ptr<io_data_t> &in = in_chain.at(idx);
-        shared_ptr<io_data_t> out;  // gets allocated via new
-
+    for (const shared_ptr<io_data_t> &in : in_chain) {
         switch (in->io_mode) {
             case io_mode_t::pipe:
             case io_mode_t::bufferfill:
             case io_mode_t::fd:
             case io_mode_t::close: {
-                // These redirections don't need transmogrification. They can be passed through.
-                out = in;
+                result_chain.push_back(in);
                 break;
             }
             case io_mode_t::file: {
-                // Transmogrify file redirections.
-                int fd;
+                // We have a path-based redireciton. Resolve it to a file.
                 io_file_t *in_file = static_cast<io_file_t *>(in.get());
-                if ((fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK)) == -1) {
+                int fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK);
+                if (fd < 0) {
                     debug(1, FILE_ERROR, in_file->filename_cstr);
-
                     wperror(L"open");
                     success = false;
                     break;
                 }
 
-                opened_fds.push_back(fd);
-                out.reset(new io_fd_t(in->fd, fd, false));
+                opened_fds.push_back(autoclose_fd_t(fd));
+                result_chain.push_back(std::make_shared<io_fd_t>(in->fd, fd, false));
                 break;
             }
         }
-
-        if (out.get() != NULL) result_chain.push_back(out);
-
-        // Don't go any further if we failed.
         if (!success) {
             break;
         }
     }
 
-    // Now either return success, or clean up.
     if (success) {
         *out_chain = std::move(result_chain);
         *out_opened_fds = std::move(opened_fds);
-    } else {
-        result_chain.clear();
-        io_cleanup_fds(opened_fds);
     }
     return success;
 }
@@ -274,11 +256,8 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
     assert(parsed_source && node && "exec_helper missing source or without node");
 
     io_chain_t morphed_chain;
-    std::vector<int> opened_fds;
-    bool transmorgrified = io_transmogrify(ios, &morphed_chain, &opened_fds);
-
-    // Did the transmogrification fail - if so, set error status and return.
-    if (!transmorgrified) {
+    std::vector<autoclose_fd_t> opened_fds;
+    if (!resolve_file_redirections_to_fds(ios, &morphed_chain, &opened_fds)) {
         parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
         return;
     }
@@ -286,7 +265,6 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
     parser.eval_node(parsed_source, node, morphed_chain, TOP, parent_job);
 
     morphed_chain.clear();
-    io_cleanup_fds(opened_fds);
     job_reap(parser, false);
 }
 

From 84febe8f2eacca6380f2d01dbf3ee08b6eaba676 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 May 2019 17:10:33 -0700
Subject: [PATCH 0576/1732] Make disowned pid reaping thread-safe

---
 src/proc.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index a20174bf0..302d33520 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -292,7 +292,7 @@ typedef unsigned int process_generation_count_t;
 
 /// A list of pids/pgids that have been disowned. They are kept around until either they exit or
 /// we exit. Poll these from time-to-time to prevent zombie processes from happening (#5342).
-static std::vector<pid_t> s_disowned_pids;
+static owning_lock<std::vector<pid_t>> s_disowned_pids;
 
 void add_disowned_pgid(pid_t pgid) {
     // NEVER add our own (or an invalid) pgid as they are not unique to only
@@ -300,10 +300,21 @@ void add_disowned_pgid(pid_t pgid) {
     if (pgid != getpgrp() && pgid > 0) {
         // waitpid(2) is signalled to wait on a process group rather than a
         // process id by using the negative of its value.
-        s_disowned_pids.push_back(pgid * -1);
+        s_disowned_pids.acquire()->push_back(pgid * -1);
     }
 }
 
+// Reap any pids in our disowned list that have exited. This is used to avoid zombies.
+static void reap_disowned_pids() {
+    auto disowned_pids = s_disowned_pids.acquire();
+    auto try_reap1 = [](pid_t pid) {
+        int status;
+        return waitpid(pid, &status, WNOHANG) > 0;
+    };
+    disowned_pids->erase(std::remove_if(disowned_pids->begin(), disowned_pids->end(), try_reap1),
+                         disowned_pids->end());
+}
+
 /// See if any reapable processes have exited, and mark them accordingly.
 /// \param block_ok if no reapable processes have exited, block until one is (or until we receive a
 /// signal).
@@ -374,13 +385,8 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
         }
     }
 
-    // Poll disowned processes/process groups, but do nothing with the result. Only used to avoid
-    // zombie processes. Entries have already been converted to negative for process groups.
-    int status;
-    s_disowned_pids.erase(
-        std::remove_if(s_disowned_pids.begin(), s_disowned_pids.end(),
-                       [&status](pid_t pid) { return waitpid(pid, &status, WNOHANG) > 0; }),
-        s_disowned_pids.end());
+    // Remove any zombies.
+    reap_disowned_pids();
 }
 
 /// Given a command like "cat file", truncate it to a reasonable length.

From f2bb1c8c1f6c8e21ebc50ca16202b39bc812ab16 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 17:03:43 +0200
Subject: [PATCH 0577/1732] expand: Simplify expand_escape_variable

---
 src/expand.cpp | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index eb3982dc8..fade270cd 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -124,40 +124,24 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
 
 /// Test if the specified string does not contain character which can not be used inside a quoted
 /// string.
-static bool is_quotable(const wchar_t *str) { return !std::wcspbrk(str, L"\n\t\r\b\x1B"); }
-
-static bool is_quotable(const wcstring &str) { return is_quotable(str.c_str()); }
+static bool is_quotable(const wcstring &str) { return str.find_first_of(L"\n\t\r\b\x1B") == wcstring::npos; }
 
 wcstring expand_escape_variable(const env_var_t &var) {
     wcstring buff;
     wcstring_list_t lst;
 
     var.to_list(lst);
-    if (lst.size() == 0) {
-        ;  // empty list expands to nothing
-    } else if (lst.size() == 1) {
-        const wcstring &el = lst.at(0);
+    for (size_t j = 0; j < lst.size(); j++) {
+        const wcstring &el = lst.at(j);
+        if (j) buff.append(L"  ");
 
-        if (el.find(L' ') != wcstring::npos && is_quotable(el)) {
+        if (is_quotable(el)) {
             buff.append(L"'");
             buff.append(el);
             buff.append(L"'");
         } else {
             buff.append(escape_string(el, 1));
         }
-    } else {
-        for (size_t j = 0; j < lst.size(); j++) {
-            const wcstring &el = lst.at(j);
-            if (j) buff.append(L"  ");
-
-            if (is_quotable(el)) {
-                buff.append(L"'");
-                buff.append(el);
-                buff.append(L"'");
-            } else {
-                buff.append(escape_string(el, 1));
-            }
-        }
     }
 
     return buff;

From 711260593cff402d4ddac8703cce17b103d387d1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 18:04:20 +0200
Subject: [PATCH 0578/1732] exec: If a job includes a builtin, it stays in our
 pgroup

Fixes #5855.
---
 src/exec.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index 9ccac5cb8..06e699c83 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1019,6 +1019,19 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         j->set_flag(job_flag_t::JOB_CONTROL, true);
     }
 
+    // If there's a builtin in the pipeline,
+    // we let the whole job stay in our pgroup.
+    // This fixes `builtin history | less`, and still lets `read | cat` and `cat | read` work.
+    // (Note that bash forks for the builtin in these cases, but that's also why its `read` often can't communicate variables back)
+    if (j->pgid == INVALID_PID) {
+        for (const auto& proc : j->processes) {
+            if (proc->type == process_type_t::builtin) {
+                j->pgid = getpgrp();
+                break;
+            }
+        }
+    }
+
     size_t stdout_read_limit = 0;
     io_chain_t all_ios = j->all_io_redirections();
 

From d0bd238657e4179155a71a44f3a4d8eb04ef8937 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 18:17:48 +0200
Subject: [PATCH 0579/1732] Don't hardcode enum numbers

"1" in the context of `escape_string(..., 1)` is referring to
`ESCAPE_ALL`, so we should use that.
---
 src/complete.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 82256a123..d880bb46b 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -593,7 +593,7 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     }
 
     wcstring lookup_cmd(L"__fish_describe_command ");
-    lookup_cmd.append(escape_string(cmd, 1));
+    lookup_cmd.append(escape_string(cmd, ESCAPE_ALL));
 
     // First locate a list of possible descriptions using a single call to apropos or a direct
     // search if we know the location of the whatis database. This can take some time on slower
@@ -1603,7 +1603,7 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
 static void append_switch(wcstring &out, const wcstring &opt, const wcstring &argument) {
     if (argument.empty()) return;
 
-    wcstring esc = escape_string(argument, 1);
+    wcstring esc = escape_string(argument, ESCAPE_ALL);
     append_format(out, L" --%ls %ls", opt.c_str(), esc.c_str());
 }
 

From dd4e0a3b6d4d5d5117c45c44319518ef4cb1c7e4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 19:01:24 +0200
Subject: [PATCH 0580/1732] Actually end history search

Fixes #5818.
---
 src/reader.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 58e811099..eff0bcd6b 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3267,8 +3267,13 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             handle_readline_command(readline_cmd, rls);
 
             if (command_ends_history_search(readline_cmd)) {
-                history_search.reset();
+                if (history_search.active()) {
+                    history_search.go_to_end();
+                    update_command_line_from_history_search();
+                    history_search.reset();
+                }
             }
+
             rls.last_cmd = readline_cmd;
         } else {
             // Ordinary char.

From 1fd627ebd358f3c19d5e5b44d461e38180c9dffb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 19:02:53 +0200
Subject: [PATCH 0581/1732] reader: Don't handle escape specially

Escape is just another ordinary character that you can bind, or not.
---
 src/reader.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index eff0bcd6b..4d663b5ac 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3278,16 +3278,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         } else {
             // Ordinary char.
             wchar_t c = event_needing_handling->get_char();
-            if (c == L'\x1B') {
-                // Escape was pressed.
-                if (history_search.active()) {
-                    history_search.go_to_end();
-                    update_command_line_from_history_search();
-                    history_search.reset();
-                }
-                assert(!history_search.active());
-            } else if (!fish_reserved_codepoint(c) && (c >= L' ' || c == L'\n' || c == L'\r') &&
-                       c != 0x7F) {
+            if (!fish_reserved_codepoint(c) && (c >= L' ' || c == L'\n' || c == L'\r') &&
+                c != 0x7F) {
                 // Regular character.
                 editable_line_t *el = active_edit_line();
                 insert_char(active_edit_line(), c);

From fae15535db49fbcc596860d7a589eb6ab3df6023 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 24 May 2019 20:57:07 +0200
Subject: [PATCH 0582/1732] docs/tutorial: Don't accidentally make a multiline
 prompt

Fixes #5890.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 8a2ea9fd3..a96cb0916 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -573,8 +573,7 @@ Multiple lines are OK. Colors can be set via ``set_color``, passing it named ANS
           set_color purple
           date "+%m/%d/%y"
           set_color FF0
-          echo (pwd) '>'
-          set_color normal
+          echo (pwd) '>' (set_color normal)
       end
     <span style="color: purple">02/06/13</span>
     <span style="color: #FF0">/home/tutorial ></span>___

From a379e9ffebaec9f4902eccdfc24dc418d1548f6f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 May 2019 16:09:10 -0700
Subject: [PATCH 0583/1732] Make the expect tests run again

These were inadvertently disabled by a bug which was introduced in
cd7e8f41033ea76c68b7f03cad466fd04ca9a03e . Fix the bug so the tests run
again.

They don't all pass yet; they regressed during the period they were
disabled.
---
 src/parse_execution.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2ca3cb585..235235dfb 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -593,10 +593,12 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
 
         if (cancel_reason == execution_cancellation_loop_control) {
             // Handle break or continue.
-            if (ld.loop_status == loop_status_t::continues) {
-                continue;
-            } else if (ld.loop_status == loop_status_t::breaks) {
+            bool do_break = (ld.loop_status == loop_status_t::breaks);
+            ld.loop_status = loop_status_t::normals;
+            if (do_break) {
                 break;
+            } else {
+                continue;
             }
         }
 

From 43e3d3bcf2bfae89a379160091fdf206d0aa841d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 May 2019 16:51:40 -0700
Subject: [PATCH 0584/1732] Fix the argparse tests

---
 src/expand.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index fade270cd..a2bae217c 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -135,7 +135,9 @@ wcstring expand_escape_variable(const env_var_t &var) {
         const wcstring &el = lst.at(j);
         if (j) buff.append(L"  ");
 
-        if (is_quotable(el)) {
+        // We want to use quotes if we have more than one string, or the string contains a space.
+        bool prefer_quotes = lst.size() > 1 || el.find(L' ') != wcstring::npos;
+        if (prefer_quotes && is_quotable(el)) {
             buff.append(L"'");
             buff.append(el);
             buff.append(L"'");

From c79c92eb475d51666b8ba903331f08d678904b3d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 May 2019 17:00:56 -0700
Subject: [PATCH 0585/1732] Fix fish_indent tests

---
 tests/indent.in  |  1 -
 tests/indent.out | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/indent.in b/tests/indent.in
index 9d704afc6..a52035742 100644
--- a/tests/indent.in
+++ b/tests/indent.in
@@ -93,7 +93,6 @@ echo < stdin >>appended yes 2>&1 no > stdout maybe 2>&    4 | cat 2>| cat
 ' | $indent
 
 echo \nTest normalization of keywords
-# issue 2921
 echo -n '
 i\
 f true
diff --git a/tests/indent.out b/tests/indent.out
index e9e7008c5..8003da678 100644
--- a/tests/indent.out
+++ b/tests/indent.out
@@ -97,13 +97,16 @@ echo <stdin >>appended yes 2>&1 no >stdout maybe 2>&4 | cat 2>| cat
 
 Test normalization of keywords
 
-if true
+i\
+f true
     echo yes
-end
+en\
+d
 
-while true
-    builtin yes
-end
+"whil\
+e" true
+    "builtin" yes
+en"d"
 
 alpha | \
     beta

From a5a5ccb73db7884e0f0a084a134dc12c30336ec7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 May 2019 17:27:20 -0700
Subject: [PATCH 0586/1732] Revert "exec: If a job includes a builtin, it stays
 in our pgroup"

This reverts commit 711260593cff402d4ddac8703cce17b103d387d1.

This ended up breaking the tests; moreover it may have other problems
like preventing backgrounding.

Reopens #5855
---
 src/exec.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 06e699c83..9ccac5cb8 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1019,19 +1019,6 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         j->set_flag(job_flag_t::JOB_CONTROL, true);
     }
 
-    // If there's a builtin in the pipeline,
-    // we let the whole job stay in our pgroup.
-    // This fixes `builtin history | less`, and still lets `read | cat` and `cat | read` work.
-    // (Note that bash forks for the builtin in these cases, but that's also why its `read` often can't communicate variables back)
-    if (j->pgid == INVALID_PID) {
-        for (const auto& proc : j->processes) {
-            if (proc->type == process_type_t::builtin) {
-                j->pgid = getpgrp();
-                break;
-            }
-        }
-    }
-
     size_t stdout_read_limit = 0;
     io_chain_t all_ios = j->all_io_redirections();
 

From 6c0ae7477e4836525fce6adb9cd6877277a0f72f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 May 2019 08:31:36 +0200
Subject: [PATCH 0587/1732] reader: Only abort history search on cancel

Otherwise we'd undo the history search when you press e.g. execute,
which means you'd execute the search term.

Only `cancel` should walk it back, like it previously did hardcoded to
escape.

Fixes #5891.
---
 src/reader.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 4d663b5ac..66e889400 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3267,11 +3267,12 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             handle_readline_command(readline_cmd, rls);
 
             if (command_ends_history_search(readline_cmd)) {
-                if (history_search.active()) {
+                // "cancel" means to abort the whole thing, other ending commands mean to finish the search.
+                if (history_search.active() && readline_cmd == rl::cancel) {
                     history_search.go_to_end();
                     update_command_line_from_history_search();
-                    history_search.reset();
                 }
+                history_search.reset();
             }
 
             rls.last_cmd = readline_cmd;

From e339e0f389f54f18fd9361c7dc3a7ad6467729d8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 May 2019 11:38:05 +0200
Subject: [PATCH 0588/1732] fish_indent: Fix pygments

---
 src/fish_indent.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 3da943520..ef2fc6168 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -645,6 +645,7 @@ int main(int argc, char *argv[]) {
         if (output_type == output_type_pygments_csv) {
             std::string output = make_pygments_csv(src);
             fputs(output.c_str(), stdout);
+            continue;
         }
 
         const wcstring output_wtext = prettify(src, do_indent);

From cf9b2ff1e51b4f0c8b0f9f1ea16bbb6601e4321d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 May 2019 11:47:44 +0200
Subject: [PATCH 0589/1732] docs/tutorial: Fix prompt display

This displays a colored prompt, which we emulate by adding explicit
roles that are translated to css classes.

For other things, like "eror" this might not be enough because those
often need the rest of the line to still be styled, and I've not found
a way to add some explicit styling to a code block.

See #5696.

[ci skip]
---
 sphinx_doc_src/_static/pygments.css | 2 ++
 sphinx_doc_src/tutorial.rst         | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/_static/pygments.css b/sphinx_doc_src/_static/pygments.css
index c23283024..02625b7e8 100644
--- a/sphinx_doc_src/_static/pygments.css
+++ b/sphinx_doc_src/_static/pygments.css
@@ -77,3 +77,5 @@
 .highlight .vi { color: #000000 } /* Name.Variable.Instance */
 .highlight .vm { color: #000000 } /* Name.Variable.Magic */
 .highlight .il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */
+.purple { color: #551a8b }
+.yellow { color: #FFFF00 }
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index a96cb0916..9cc482bbb 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -567,6 +567,9 @@ You can define your own prompt::
     New Prompt % 
 
 
+.. role:: purple
+.. role:: yellow
+
 Multiple lines are OK. Colors can be set via ``set_color``, passing it named ANSI colors, or hex RGB values::
 
     >_ function fish_prompt
@@ -575,9 +578,11 @@ Multiple lines are OK. Colors can be set via ``set_color``, passing it named ANS
           set_color FF0
           echo (pwd) '>' (set_color normal)
       end
-    <span style="color: purple">02/06/13</span>
-    <span style="color: #FF0">/home/tutorial ></span>___
 
+will look like
+
+| :purple:`02/06/13`
+| :yellow:`/home/tutorial >`
 
 You can choose among some sample prompts by running ``fish_config prompt``. ``fish`` also supports RPROMPT through ``fish_right_prompt``.
 

From 292475148850512fd0649b7e83862348ff11b448 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 May 2019 17:15:50 -0700
Subject: [PATCH 0590/1732] Correct priority of universal and global variable
 setting

When setting a variable without a specified scope, we should give priority
to an existing local or global above an existing universal variable with
the same name.

In 16fd7804846c0aeca926f207eb0e2ae86f819931 there was a regression that
made universal variables have priority.

Fixes #5883
---
 src/env.cpp     | 15 +++++++++------
 tests/test3.err |  3 +++
 tests/test3.in  | 16 ++++++++++++++++
 tests/test3.out |  8 ++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 4eccc060f..6aa1fcd5d 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1087,16 +1087,19 @@ int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_l
         } else {
             DIE("Unknown scope");
         }
+    } else if (env_node_ref_t node = find_in_chain(locals_, key)) {
+        // Existing local variable.
+        set_in_node(node, key, std::move(val), flags);
+    } else if (env_node_ref_t node = find_in_chain(globals_, key)) {
+        // Existing global variable.
+        set_in_node(node, key, std::move(val), flags);
     } else if (uvars() && uvars()->get(key)) {
-        // Modifying an existing universal variable.
+        // Existing universal variable.
         set_universal(key, std::move(val), query);
         *out_needs_uvar_sync = true;
     } else {
-        // The user did not request any scope.
-        // Find the scope.
-        env_node_ref_t node = find_in_chain(locals_, key);
-        if (!node) node = find_in_chain(globals_, key);
-        if (!node) node = resolve_unspecified_scope();
+        // Unspecified scope with no existing variables.
+        auto node = resolve_unspecified_scope();
         assert(node && "Should always resolve some scope");
         set_in_node(node, key, std::move(val), flags);
     }
diff --git a/tests/test3.err b/tests/test3.err
index 1d1eafdb3..5fc2c0e09 100644
--- a/tests/test3.err
+++ b/tests/test3.err
@@ -8,3 +8,6 @@ fish: for: Variable name 'a,b' is not valid. See `help identifiers`.
 
 for a,b in y 1 z 3; echo $a,$b; end
     ^
+
+####################
+# Global vs Universal Unspecified Scopes
diff --git a/tests/test3.in b/tests/test3.in
index 53f637f76..6ee7f5365 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -330,4 +330,20 @@ logmsg Variable names in other commands
 # Test invalid variable names in loops (#5800)
 for a,b in y 1 z 3; echo $a,$b; end
 
+logmsg Global vs Universal Unspecified Scopes
+set -U __fish_test_global_vs_universal universal
+echo "global-vs-universal 1: $__fish_test_global_vs_universal"
+
+set -g __fish_test_global_vs_universal global
+echo "global-vs-universal 2: $__fish_test_global_vs_universal"
+
+set __fish_test_global_vs_universal global2
+echo "global-vs-universal 3: $__fish_test_global_vs_universal"
+
+set -e -g __fish_test_global_vs_universal
+echo "global-vs-universal 4: $__fish_test_global_vs_universal"
+
+set -e -U __fish_test_global_vs_universal
+echo "global-vs-universal 5: $__fish_test_global_vs_universal"
+
 true
diff --git a/tests/test3.out b/tests/test3.out
index 07c15bef4..b8c6b861a 100644
--- a/tests/test3.out
+++ b/tests/test3.out
@@ -58,3 +58,11 @@ a:b a b
 
 ####################
 # Variable names in other commands
+
+####################
+# Global vs Universal Unspecified Scopes
+global-vs-universal 1: universal
+global-vs-universal 2: global
+global-vs-universal 3: global2
+global-vs-universal 4: universal
+global-vs-universal 5: 

From f8ba0ac5bf4b5f27ff69ce016d072b564530a7fc Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 May 2019 18:46:03 -0700
Subject: [PATCH 0591/1732] Remove is_interactive_read

is_interactive_read is a suspicious flag which prevents a call to
parser_t::skip_all_blocks from a ^C signal handler. However we end
up skipping the blocks later when we exit the read loop.

This flag seems unnecessary. Bravely remove it.
---
 src/reader.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 66e889400..10f9ee04e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -478,10 +478,6 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     void remove_backward();
 };
 
-/// This flag is set to true when fish is interactively reading from stdin. It changes how a ^C is
-/// handled by the fish interrupt handler.
-static volatile sig_atomic_t is_interactive_read;
-
 /// This variable is set to true by the signal handler when ^C is pressed.
 static volatile sig_atomic_t interrupted = 0;
 
@@ -679,10 +675,7 @@ void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, i
 
 // This is called from a signal handler!
 void reader_handle_sigint() {
-    if (!is_interactive_read) {
-        parser_t::skip_all_blocks();
-    }
-
+    parser_t::skip_all_blocks();
     interrupted = 1;
 }
 
@@ -2374,10 +2367,7 @@ struct readline_loop_state_t {
 /// Read normal characters, inserting them into the command line.
 /// \return the next unhandled event.
 maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rls) {
-    int was_interactive_read = is_interactive_read;
-    is_interactive_read = 1;
     maybe_t<char_event_t> event_needing_handling = input_readch();
-    is_interactive_read = was_interactive_read;
 
     if (!event_is_normal_char(*event_needing_handling) || !can_read(STDIN_FILENO))
         return event_needing_handling;

From ea3ad0c099d049e06a9296347910114f55a1425c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 May 2019 19:05:24 -0700
Subject: [PATCH 0592/1732] Introduce sigint_checker_t and use it in wait

Allow a simpler way to check for sigint via sigint_checker_t.
Adopt it in builtin_wait, instead of hooking into the reader.
---
 src/builtin_wait.cpp |  9 +++++----
 src/signal.cpp       | 14 ++++++++++++++
 src/signal.h         | 12 ++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 74e1e08c2..f4cf2fa3b 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -7,7 +7,7 @@
 #include "common.h"
 #include "parser.h"
 #include "proc.h"
-#include "reader.h"
+#include "signal.h"
 #include "wgetopt.h"
 #include "wutil.h"
 
@@ -66,11 +66,11 @@ static bool any_jobs_finished(size_t jobs_len, const parser_t &parser) {
 }
 
 static int wait_for_backgrounds(parser_t &parser, bool any_flag) {
+    sigint_checker_t sigint;
     size_t jobs_len = parser.jobs().size();
-
     while ((!any_flag && !all_jobs_finished(parser)) ||
            (any_flag && !any_jobs_finished(jobs_len, parser))) {
-        if (reader_test_interrupted()) {
+        if (sigint.check()) {
             return 128 + SIGINT;
         }
         proc_wait_any(parser);
@@ -108,9 +108,10 @@ static bool any_specified_jobs_finished(const std::vector<job_id_t> &ids) {
 
 static int wait_for_backgrounds_specified(parser_t &parser, const std::vector<job_id_t> &ids,
                                           bool any_flag) {
+    sigint_checker_t sigint;
     while ((!any_flag && !all_specified_jobs_finished(ids)) ||
            (any_flag && !any_specified_jobs_finished(ids))) {
-        if (reader_test_interrupted()) {
+        if (sigint.check()) {
             return 128 + SIGINT;
         }
         proc_wait_any(parser);
diff --git a/src/signal.cpp b/src/signal.cpp
index 24e4e8726..52c643473 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -15,6 +15,7 @@
 #include "parser.h"
 #include "proc.h"
 #include "reader.h"
+#include "signal.h"
 #include "topic_monitor.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -417,3 +418,16 @@ void signal_unblock_all() {
     sigemptyset(&iset);
     sigprocmask(SIG_SETMASK, &iset, NULL);
 }
+
+sigint_checker_t::sigint_checker_t() {
+    // Call check() to update our generation.
+    check();
+}
+
+bool sigint_checker_t::check() {
+    auto &tm = topic_monitor_t::principal();
+    generation_t gen = tm.generation_for_topic(topic_t::sighupint);
+    bool changed = this->gen_ != gen;
+    this->gen_ = gen;
+    return changed;
+}
diff --git a/src/signal.h b/src/signal.h
index 8980c8dd6..44aaa4e85 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -32,4 +32,16 @@ void signal_unblock_all();
 /// Returns signals with non-default handlers.
 void get_signals_with_handlers(sigset_t *set);
 
+/// A sigint_detector_t can be used to check if a SIGINT (or SIGHUP) has been delivered.
+class sigint_checker_t {
+    uint64_t gen_{0};
+
+   public:
+    sigint_checker_t();
+
+    /// Check if a sigint has been delivered since the last call to check(), or since the detector
+    /// was created.
+    bool check();
+};
+
 #endif

From 5a4df9dd3a71dfd841506bf9953a32cc7a047421 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 May 2019 19:19:03 -0700
Subject: [PATCH 0593/1732] Use sigint_checker_t in debug_thread_error

---
 src/common.cpp | 6 +++---
 src/signal.cpp | 7 +++++++
 src/signal.h   | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 5f59edee3..efd2c19d0 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -55,6 +55,7 @@
 #include "future_feature_flags.h"
 #include "global_safety.h"
 #include "proc.h"
+#include "signal.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -2271,9 +2272,8 @@ extern "C" {
 [[gnu::noinline]] void debug_thread_error(void) {
     // Wait for a SIGINT. We can't use sigsuspend() because the signal may be delivered on another
     // thread.
-    auto &tm = topic_monitor_t::principal();
-    auto gens = tm.current_generations();
-    tm.check(&gens, {topic_t::sighupint}, true /* wait */);
+    sigint_checker_t sigint;
+    sigint.wait();
 }
 }
 
diff --git a/src/signal.cpp b/src/signal.cpp
index 52c643473..8e2be099f 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -431,3 +431,10 @@ bool sigint_checker_t::check() {
     this->gen_ = gen;
     return changed;
 }
+
+void sigint_checker_t::wait() {
+    auto &tm = topic_monitor_t::principal();
+    generation_list_t gens{};
+    gens[topic_t::sighupint] = this->gen_;
+    tm.check(&gens, {topic_t::sighupint}, true /* wait */);
+}
diff --git a/src/signal.h b/src/signal.h
index 44aaa4e85..be0011203 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -42,6 +42,9 @@ class sigint_checker_t {
     /// Check if a sigint has been delivered since the last call to check(), or since the detector
     /// was created.
     bool check();
+
+    /// Wait until a sigint is delivered.
+    void wait();
 };
 
 #endif

From d729d57d94565fff9777ccbc56dc3ecfad1fbc85 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 May 2019 00:32:11 -0700
Subject: [PATCH 0594/1732] Unify the interactive and non-interactive signal
 handlers

The signal handlers for interactive and non-interactive SIGINT were distinct
and talked to the reader. This wasn't really justified and will complicate
having multiple threads. Unify these into a single signal handler.
---
 src/signal.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/signal.cpp b/src/signal.cpp
index 8e2be099f..9405ce887 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -251,14 +251,6 @@ static void handle_int(int sig, siginfo_t *info, void *context) {
     topic_monitor_t::principal().post(topic_t::sighupint);
 }
 
-/// Non-interactive ^C handler.
-static void handle_int_notinteractive(int sig, siginfo_t *info, void *context) {
-    if (reraise_if_forked_child(sig)) return;
-    parser_t::skip_all_blocks();
-    default_handler(sig, info, context);
-    topic_monitor_t::principal().post(topic_t::sighupint);
-}
-
 /// sigchld handler. Does notification and calls the handler in proc.c.
 static void handle_chld(int sig, siginfo_t *info, void *context) {
     if (reraise_if_forked_child(sig)) return;
@@ -300,7 +292,6 @@ static void set_interactive_handlers() {
     // Interactive mode. Ignore interactive signals.  We are a shell, we know what is best for
     // the user.
     act.sa_handler = SIG_IGN;
-    sigaction(SIGINT, &act, NULL);
     sigaction(SIGQUIT, &act, NULL);
     sigaction(SIGTSTP, &act, NULL);
     sigaction(SIGTTOU, &act, NULL);
@@ -310,10 +301,6 @@ static void set_interactive_handlers() {
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGTTIN, &act, NULL);
 
-    act.sa_sigaction = &handle_int;
-    act.sa_flags = SA_SIGINFO;
-    sigaction(SIGINT, &act, NULL);
-
     // SIGTERM restores the terminal controlling process before dying.
     act.sa_sigaction = &handle_sigterm;
     act.sa_flags = SA_SIGINFO;
@@ -345,10 +332,6 @@ static void set_non_interactive_handlers() {
 
     act.sa_handler = SIG_IGN;
     sigaction(SIGQUIT, &act, 0);
-
-    act.sa_sigaction = &handle_int_notinteractive;
-    act.sa_flags = SA_SIGINFO;
-    sigaction(SIGINT, &act, NULL);
 }
 
 /// Sets up appropriate signal handlers.
@@ -359,9 +342,15 @@ void signal_set_handlers() {
 
     // Ignore SIGPIPE. We'll detect failed writes and deal with them appropriately. We don't want
     // this signal interrupting other syscalls or terminating us.
+    act.sa_sigaction = nullptr;
     act.sa_handler = SIG_IGN;
     sigaction(SIGPIPE, &act, 0);
 
+    // Apply our SIGINT handler.
+    act.sa_sigaction = &handle_int;
+    act.sa_flags = SA_SIGINFO;
+    sigaction(SIGINT, &act, NULL);
+
     // Whether or not we're interactive we want SIGCHLD to not interrupt restartable syscalls.
     act.sa_flags = SA_SIGINFO;
     act.sa_sigaction = &handle_chld;

From ead7f280268d52e3de48325eed2d4dfe71885a60 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 May 2019 13:18:06 -0700
Subject: [PATCH 0595/1732] Unify the SIGQUIT handlers and remove
 set_non_interactive_handlers

Interactive signal handlers are now a strict superset of non-interactive
ones. Remove set_non_interactive_handlers()
---
 src/signal.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/signal.cpp b/src/signal.cpp
index 9405ce887..946961454 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -292,7 +292,6 @@ static void set_interactive_handlers() {
     // Interactive mode. Ignore interactive signals.  We are a shell, we know what is best for
     // the user.
     act.sa_handler = SIG_IGN;
-    sigaction(SIGQUIT, &act, NULL);
     sigaction(SIGTSTP, &act, NULL);
     sigaction(SIGTTOU, &act, NULL);
 
@@ -325,15 +324,6 @@ static void set_interactive_handlers() {
 #endif
 }
 
-static void set_non_interactive_handlers() {
-    struct sigaction act;
-    act.sa_flags = 0;
-    sigemptyset(&act.sa_mask);
-
-    act.sa_handler = SIG_IGN;
-    sigaction(SIGQUIT, &act, 0);
-}
-
 /// Sets up appropriate signal handlers.
 void signal_set_handlers() {
     struct sigaction act;
@@ -346,6 +336,10 @@ void signal_set_handlers() {
     act.sa_handler = SIG_IGN;
     sigaction(SIGPIPE, &act, 0);
 
+    // Ignore SIGQUIT.
+    act.sa_handler = SIG_IGN;
+    sigaction(SIGQUIT, &act, 0);
+
     // Apply our SIGINT handler.
     act.sa_sigaction = &handle_int;
     act.sa_flags = SA_SIGINFO;
@@ -362,8 +356,6 @@ void signal_set_handlers() {
 
     if (shell_is_interactive()) {
         set_interactive_handlers();
-    } else {
-        set_non_interactive_handlers();
     }
 }
 

From 7ed1022cf41cd1b0111a7c280528324527fc8570 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 May 2019 18:04:03 -0700
Subject: [PATCH 0596/1732] Latch signal handlers

Now that our interactive signal handlers are a strict superset of
non-interactive ones, there is no reason to "reset" signals or take action
when becoming non-interactive. Clean up how signal handlers get installed.
---
 src/fish_tests.cpp |  2 +-
 src/proc.cpp       |  5 +----
 src/reader.cpp     |  2 +-
 src/signal.cpp     | 12 ++++++++++--
 src/signal.h       |  8 +++++++-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index b993e2386..3c99e2c56 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1012,7 +1012,7 @@ static void test_cancellation() {
     // Enable fish's signal handling here. We need to make this interactive for fish to install its
     // signal handlers.
     proc_push_interactive(1);
-    signal_set_handlers();
+    signal_set_handlers(true);
 
     // This tests that we can correctly ctrl-C out of certain loop constructs, and that nothing gets
     // printed if we do.
diff --git a/src/proc.cpp b/src/proc.cpp
index 302d33520..9df9fa3fa 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -942,18 +942,15 @@ void proc_sanity_check(const parser_t &parser) {
 
 void proc_push_interactive(int value) {
     ASSERT_IS_MAIN_THREAD();
-    int old = is_interactive;
     interactive_stack.push_back(is_interactive);
     is_interactive = value;
-    if (old != value) signal_set_handlers();
+    signal_set_handlers_once(is_interactive);
 }
 
 void proc_pop_interactive() {
     ASSERT_IS_MAIN_THREAD();
-    int old = is_interactive;
     is_interactive = interactive_stack.back();
     interactive_stack.pop_back();
-    if (is_interactive != old) signal_set_handlers();
 }
 
 void proc_wait_any(parser_t &parser) {
diff --git a/src/reader.cpp b/src/reader.cpp
index 10f9ee04e..bdefa3e6e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1738,7 +1738,7 @@ static void reader_interactive_init() {
             }
         }
 
-        signal_set_handlers();
+        signal_set_handlers(shell_is_interactive());
     }
 
     // It shouldn't be necessary to place fish in its own process group and force control
diff --git a/src/signal.cpp b/src/signal.cpp
index 946961454..117cf1343 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -325,7 +325,7 @@ static void set_interactive_handlers() {
 }
 
 /// Sets up appropriate signal handlers.
-void signal_set_handlers() {
+void signal_set_handlers(bool interactive) {
     struct sigaction act;
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
@@ -354,11 +354,19 @@ void signal_set_handlers() {
         FATAL_EXIT();
     }
 
-    if (shell_is_interactive()) {
+    if (interactive) {
         set_interactive_handlers();
     }
 }
 
+void signal_set_handlers_once(bool interactive) {
+    static std::once_flag s_noninter_once;
+    std::call_once(s_noninter_once, signal_set_handlers, false);
+
+    static std::once_flag s_inter_once;
+    if (interactive) std::call_once(s_inter_once, set_interactive_handlers);
+}
+
 void signal_handle(int sig, int do_handle) {
     struct sigaction act;
 
diff --git a/src/signal.h b/src/signal.h
index be0011203..3aa8316f6 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -17,7 +17,13 @@ const wchar_t *signal_get_desc(int sig);
 void signal_reset_handlers();
 
 /// Set signal handlers to fish default handlers.
-void signal_set_handlers();
+/// If \p interactive is set, apply interactive handlers as well.
+/// Note interactive handlers, once applied, are not cleared; they are a strict superset of
+/// non-interactive handlers.
+void signal_set_handlers(bool interactive);
+
+/// Latch function. This sets signal handlers, but only the first time it is called.
+void signal_set_handlers_once(bool interactive);
 
 /// Tell fish what to do on the specified signal.
 ///

From d5f2d472d0e5b119d0e9366c758e019901e5007b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 May 2019 18:51:26 -0700
Subject: [PATCH 0597/1732] Thread a parser into reader

Eliminates uses of principal_parser
---
 src/builtin.cpp        |  2 +-
 src/builtin_read.cpp   |  2 +-
 src/builtin_source.cpp |  2 +-
 src/fish.cpp           |  4 +--
 src/reader.cpp         | 68 +++++++++++++++++++++---------------------
 src/reader.h           | 12 ++++----
 6 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index a017ed264..9aef6e344 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -316,7 +316,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
     }
 
     const block_t *bpb = parser.push_block(block_t::breakpoint_block());
-    reader_read(STDIN_FILENO, streams.io_chain ? *streams.io_chain : io_chain_t());
+    reader_read(parser, STDIN_FILENO, streams.io_chain ? *streams.io_chain : io_chain_t());
     parser.pop_block(bpb);
     return parser.get_last_status();
 }
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 7210a983e..913293a15 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -205,7 +205,7 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
     const auto &vars = parser.vars();
     wcstring read_history_ID = history_session_id(vars);
     if (!read_history_ID.empty()) read_history_ID += L"_read";
-    reader_push(read_history_ID);
+    reader_push(parser, read_history_ID);
 
     reader_set_left_prompt(prompt);
     reader_set_right_prompt(right_prompt);
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 5bdc7c4b2..8f4b4f14b 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -83,7 +83,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         null_terminated_array_t<wchar_t>::to_list(argv + optind + (argc == optind ? 0 : 1));
     parser.vars().set_argv(std::move(argv_list));
 
-    retval = reader_read(fd, streams.io_chain ? *streams.io_chain : io_chain_t());
+    retval = reader_read(parser, fd, streams.io_chain ? *streams.io_chain : io_chain_t());
 
     parser.pop_block(sb);
 
diff --git a/src/fish.cpp b/src/fish.cpp
index 389dfc4d2..2ea6db5ac 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -451,7 +451,7 @@ int main(int argc, char **argv) {
             reader_set_end_loop(false);
         } else if (my_optind == argc) {
             // Implicitly interactive mode.
-            res = reader_read(STDIN_FILENO, {});
+            res = reader_read(parser, STDIN_FILENO, {});
         } else {
             char *file = *(argv + (my_optind++));
             int fd = open(file, O_RDONLY);
@@ -471,7 +471,7 @@ int main(int argc, char **argv) {
                 wcstring rel_filename = str2wcstring(file);
                 scoped_push<const wchar_t *> filename_push{&ld.current_filename,
                                                            intern(rel_filename.c_str())};
-                res = reader_read(fd, {});
+                res = reader_read(parser, fd, {});
                 if (res) {
                     debug(1, _(L"Error while reading file %ls\n"),
                           ld.current_filename ? ld.current_filename : _(L"Standard input"));
diff --git a/src/reader.cpp b/src/reader.cpp
index bdefa3e6e..0a94bc8d0 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -148,7 +148,7 @@ namespace {
 
 /// Test if the given string contains error. Since this is the error detection for general purpose,
 /// there are no invalid strings, so this function always returns false.
-parser_test_error_bits_t default_test(const wcstring &b) {
+parser_test_error_bits_t default_test(parser_t &parser, const wcstring &b) {
     UNUSED(b);
     return 0;
 }
@@ -323,6 +323,8 @@ struct readline_loop_state_t;
 /// reader_readline() calls are nested. This happens when the 'read' builtin is used.
 class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
    public:
+    /// The parser being used.
+    std::shared_ptr<parser_t> parser_ref;
     /// String containing the whole current commandline.
     editable_line_t command_line;
     /// String containing the autosuggestion.
@@ -420,14 +422,14 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     void repaint_if_needed();
 
     /// Return the variable set used for e.g. command duration.
-    env_stack_t &vars() { return parser_t::principal_parser().vars(); }
+    env_stack_t &vars() { return parser_ref->vars(); }
+    const env_stack_t &vars() const { return parser_ref->vars(); }
 
-    /// Hackish access to the parser. TODO: rationalize this.
-    parser_t &parser() { return parser_t::principal_parser(); }
+    /// Access the parser.
+    parser_t &parser() { return *parser_ref; }
 
-    const env_stack_t &vars() const { return parser_t::principal_parser().vars(); }
-
-    reader_data_t(history_t *hist) : history(hist) {}
+    reader_data_t(std::shared_ptr<parser_t> parser, history_t *hist)
+        : parser_ref(std::move(parser)), history(hist) {}
 
     void update_buff_pos(editable_line_t *el, size_t buff_pos);
     void repaint();
@@ -1238,9 +1240,9 @@ void reader_data_t::completion_insert(const wchar_t *val, complete_flags_t flags
 // Returns a function that can be invoked (potentially
 // on a background thread) to determine the autosuggestion
 static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer(
-    const wcstring &search_string, size_t cursor_pos, history_t *history) {
+    parser_t &parser, const wcstring &search_string, size_t cursor_pos, history_t *history) {
     const unsigned int generation_count = read_generation_count();
-    auto vars = parser_t::principal_parser().vars().snapshot();
+    auto vars = parser.vars().snapshot();
     const wcstring working_directory = vars->get_pwd_slash();
     // TODO: suspicious use of 'history' here
     // This is safe because histories are immortal, but perhaps
@@ -1331,7 +1333,7 @@ void reader_data_t::update_autosuggestion() {
     autosuggestion.clear();
     if (can_autosuggest()) {
         const editable_line_t *el = active_edit_line();
-        auto performer = get_autosuggestion_performer(el->text, el->position, history);
+        auto performer = get_autosuggestion_performer(parser(), el->text, el->position, history);
         auto shared_this = this->shared_from_this();
         iothread_perform(performer, [shared_this](autosuggestion_result_t result) {
             shared_this->autosuggest_completed(std::move(result));
@@ -1943,7 +1945,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     }
 }
 
-parser_test_error_bits_t reader_shell_test(const wcstring &b) {
+parser_test_error_bits_t reader_shell_test(parser_t &parser, const wcstring &b) {
     wcstring bstr = b;
 
     // Append a newline, to act as a statement terminator.
@@ -1955,7 +1957,7 @@ parser_test_error_bits_t reader_shell_test(const wcstring &b) {
 
     if (res & PARSER_TEST_ERROR) {
         wcstring error_desc;
-        parser_t::principal_parser().get_backtrace(bstr, errors, error_desc);
+        parser.get_backtrace(bstr, errors, error_desc);
 
         // Ensure we end with a newline. Also add an initial newline, because it's likely the user
         // just hit enter and so there's junk on the current line.
@@ -2001,8 +2003,9 @@ void reader_data_t::highlight_complete(highlight_result_t result) {
 // Given text, bracket matching position, and whether IO is allowed,
 // return a function that performs highlighting. The function may be invoked on a background thread.
 static std::function<highlight_result_t(void)> get_highlight_performer(
-    const wcstring &text, long match_highlight_pos, highlight_function_t highlight_func) {
-    auto vars = parser_t::principal_parser().vars().snapshot();
+    parser_t &parser, const wcstring &text, long match_highlight_pos,
+    highlight_function_t highlight_func) {
+    auto vars = parser.vars().snapshot();
     unsigned int generation_count = read_generation_count();
     return [=]() -> highlight_result_t {
         if (text.empty()) return {};
@@ -2034,7 +2037,7 @@ void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bo
     sanity_check();
 
     auto highlight_performer = get_highlight_performer(
-        el->text, match_highlight_pos, no_io ? highlight_shell_no_io : highlight_func);
+        parser(), el->text, match_highlight_pos, no_io ? highlight_shell_no_io : highlight_func);
     if (no_io) {
         // Highlighting without IO, we just do it.
         highlight_complete(highlight_performer());
@@ -2083,9 +2086,9 @@ void reader_change_history(const wcstring &name) {
     }
 }
 
-void reader_push(const wcstring &name) {
+void reader_push(parser_t &parser, const wcstring &name) {
     history_t *hist = &history_t::history_with_name(name);
-    reader_data_stack.push_back(std::make_shared<reader_data_t>(hist));
+    reader_data_stack.push_back(std::make_shared<reader_data_t>(parser.shared(), hist));
     reader_data_t *data = current_data();
     data->command_line_changed(&data->command_line);
     if (reader_data_stack.size() == 1) {
@@ -2222,9 +2225,8 @@ static relaxed_atomic_t<uint64_t> run_count{0};
 uint64_t reader_run_count() { return run_count; }
 
 /// Read interactively. Read input from stdin while providing editing facilities.
-static int read_i() {
-    parser_t &parser = parser_t::principal_parser();
-    reader_push(history_session_id(parser.vars()));
+static int read_i(parser_t &parser) {
+    reader_push(parser, history_session_id(parser.vars()));
     reader_set_complete_function(&complete);
     reader_set_highlight_function(&highlight_shell);
     reader_set_test_function(&reader_shell_test);
@@ -2413,7 +2415,7 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
 
 /// Handle a readline command \p c, updating the state \p rls.
 void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_state_t &rls) {
-    const auto &vars = parser_t::principal_parser().vars();
+    const auto &vars = this->vars();
     using rl = readline_cmd_t;
     switch (c) {
         // Go to beginning of line.
@@ -2460,10 +2462,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // may sometimes take a while but when switching the mode all we care about is the
             // mode-prompt.
             //
-            // Because some users set `fish_mode_prompt` to an empty function and display the mode elsewhere,
-            // we detect if the mode output is empty.
+            // Because some users set `fish_mode_prompt` to an empty function and display the mode
+            // elsewhere, we detect if the mode output is empty.
             exec_mode_prompt();
-            if(!mode_prompt_buff.empty()) {
+            if (!mode_prompt_buff.empty()) {
                 s_reset(&screen, screen_reset_current_line_and_prompt);
                 screen_reset_needed = false;
                 repaint();
@@ -2547,9 +2549,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
                 completion_request_flags_t complete_flags = {completion_request_t::descriptions,
                                                              completion_request_t::fuzzy_match};
-                // TODO: eliminate this principal_parser.
-                complete_func(buffcpy, &rls.comp, complete_flags, vars,
-                              parser_t::principal_parser().shared());
+                complete_func(buffcpy, &rls.comp, complete_flags, vars, parser_ref);
 
                 // Munge our completions.
                 completions_sort_and_prioritize(&rls.comp);
@@ -2725,7 +2725,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
 
             // See if this command is valid.
-            int command_test_result = test_func(el->text);
+            int command_test_result = test_func(parser(), el->text);
             if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) {
                 // This command is valid, but an abbreviation may make it invalid. If so, we
                 // will have to test again.
@@ -2733,7 +2733,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 if (abbreviation_expanded) {
                     // It's our reponsibility to rehighlight and repaint. But everything we do
                     // below triggers a repaint.
-                    command_test_result = test_func(el->text.c_str());
+                    command_test_result = test_func(parser(), el->text.c_str());
 
                     // If the command is OK, then we're going to execute it. We still want to do
                     // syntax highlighting, but a synchronous variant that performs no I/O, so
@@ -3257,7 +3257,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             handle_readline_command(readline_cmd, rls);
 
             if (command_ends_history_search(readline_cmd)) {
-                // "cancel" means to abort the whole thing, other ending commands mean to finish the search.
+                // "cancel" means to abort the whole thing, other ending commands mean to finish the
+                // search.
                 if (history_search.active() && readline_cmd == rl::cancel) {
                     history_search.go_to_end();
                     update_command_line_from_history_search();
@@ -3449,8 +3450,7 @@ bool reader_get_selection(size_t *start, size_t *len) {
 
 /// Read non-interactively.  Read input from stdin without displaying the prompt, using syntax
 /// highlighting. This is used for reading scripts and init files.
-static int read_ni(int fd, const io_chain_t &io) {
-    parser_t &parser = parser_t::principal_parser();
+static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
     FILE *in_stream;
     wchar_t *buff = 0;
     std::vector<char> acc;
@@ -3524,7 +3524,7 @@ static int read_ni(int fd, const io_chain_t &io) {
     return res;
 }
 
-int reader_read(int fd, const io_chain_t &io) {
+int reader_read(parser_t &parser, int fd, const io_chain_t &io) {
     int res;
 
     // If reader_read is called recursively through the '.' builtin, we need to preserve
@@ -3546,7 +3546,7 @@ int reader_read(int fd, const io_chain_t &io) {
     }
     proc_push_interactive(inter);
 
-    res = shell_is_interactive() ? read_i() : read_ni(fd, io);
+    res = shell_is_interactive() ? read_i(parser) : read_ni(parser, fd, io);
 
     // If the exit command was called in a script, only exit the script, not the program.
     reader_set_end_loop(false);
diff --git a/src/reader.h b/src/reader.h
index 45c3431ea..21a0f216d 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -47,7 +47,7 @@ class editable_line_t {
 };
 
 /// Read commands from \c fd until encountering EOF.
-int reader_read(int fd, const io_chain_t &io);
+int reader_read(parser_t &parser, int fd, const io_chain_t &io);
 
 /// Tell the shell whether it should exit after the currently running command finishes.
 void reader_set_end_loop(bool flag);
@@ -140,7 +140,7 @@ bool reader_thread_job_is_stale();
 maybe_t<wcstring> reader_readline(int nchars);
 
 /// Push a new reader environment.
-void reader_push(const wcstring &name);
+void reader_push(parser_t &parser, const wcstring &name);
 
 /// Return to previous reader environment.
 void reader_pop();
@@ -152,11 +152,11 @@ typedef void (*complete_function_t)(const wcstring &, std::vector<completion_t>
 void reader_set_complete_function(complete_function_t);
 
 /// The type of a highlight function.
-typedef void (*highlight_function_t)(const wcstring &, std::vector<highlight_spec_t> &, size_t,
-                                     wcstring_list_t *, const environment_t &vars);
+using highlight_function_t = void (*)(const wcstring &, std::vector<highlight_spec_t> &, size_t,
+                                      wcstring_list_t *, const environment_t &vars);
 
 /// Function type for testing if a string is valid for the reader to return.
-using test_function_t = parser_test_error_bits_t (*)(const wcstring &);
+using test_function_t = parser_test_error_bits_t (*)(parser_t &, const wcstring &);
 
 /// Specify function for syntax highlighting. The function must take these arguments:
 ///
@@ -198,7 +198,7 @@ bool reader_exit_forced();
 
 /// Test if the given shell command contains errors. Uses parser_test for testing. Suitable for
 /// reader_set_test_function().
-parser_test_error_bits_t reader_shell_test(const wcstring &);
+parser_test_error_bits_t reader_shell_test(parser_t &parser, const wcstring &);
 
 /// Test whether the interactive reader is in search mode.
 bool reader_is_in_search_mode();

From 9ae3b345c881157d15d24a493d18c421dbde70fe Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 27 May 2019 08:15:08 +0200
Subject: [PATCH 0598/1732] Handle empty strings in
 compare_completions_by_tilde

Fixes #5895.
---
 src/complete.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index d880bb46b..e45d0f4e9 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -243,7 +243,7 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
 }
 
 static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
-    return (a.completion.back() == L'~') < (b.completion.back() == L'~');
+    return (a.completion.empty() < b.completion.empty()) || (a.completion.back() == L'~') < (b.completion.back() == L'~');
 }
 /// Unique the list of completions, without perturbing their order.
 static void unique_completions_retaining_order(std::vector<completion_t> *comps) {

From dcf017ff57910e7e2f8109c956d6553ecb9c6d48 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 27 May 2019 19:33:52 +0200
Subject: [PATCH 0599/1732] fish_complete_directories: Use `complete -C`

This way we use our core file completion code, which is much more
flexible than we can easily achieve directly in script (which would
require e.g. an `expand` builtin, and case-insensitive globs).

Fixes #5896.
---
 share/functions/__fish_complete_directories.fish | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_complete_directories.fish b/share/functions/__fish_complete_directories.fish
index 1d691ee1c..1807f06f6 100644
--- a/share/functions/__fish_complete_directories.fish
+++ b/share/functions/__fish_complete_directories.fish
@@ -12,9 +12,10 @@ function __fish_complete_directories -d "Complete directory prefixes" --argument
         set comp (commandline -ct)
     end
 
-    # Inherit support for completing expansions from __fish_complete_suffix
-    # Supports completing expressions like ~/foo or x$bar, etc.
-    set -l dirs (__fish_complete_suffix $comp /)
+    # HACK: We call into the file completions by using a non-existent command.
+    # If we used e.g. `ls`, we'd run the risk of completing its options or another kind of argument.
+    # But since we default to file completions, if something doesn't have another completion...
+    set -l dirs (complete -C"nonexistentcommandooheehoohaahaahdingdongwallawallabingbang $comp" | string match -r '.*/$')
 
     if set -q dirs[1]
         printf "%s\t$desc\n" $dirs

From d46dacdfee497c5fedb738acab56c0c1be407455 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 27 May 2019 19:37:28 +0200
Subject: [PATCH 0600/1732] Stop abusing __fish_complete_suffix to complete
 dirs

[ci skip]
---
 share/completions/meson.fish   | 2 +-
 share/completions/optipng.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/meson.fish b/share/completions/meson.fish
index 9a3dc1222..c05fa4e36 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_first_token' -xa '(__fish_complete_suffix {})'
+complete -c meson -n '__fish_is_first_token' -xa '(__fish_complete_directories)'
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index 7e76c5ca3..406d6117a 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -38,4 +38,4 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-log\t"log messa
 
 complete -x -c optipng -n 'not __fish_prev_arg_in -out -dir -log' \
     -a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
-complete -x -c optipng -n '__fish_prev_arg_in -dir' -a '(__fish_complete_suffix \'{}\')' # hack to list directories only
+complete -x -c optipng -n '__fish_prev_arg_in -dir' -a '(__fish_complete_directories)'

From 4710df37d1e7c87691fe11e167e1a9ae27b9328d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 27 May 2019 23:20:00 +0200
Subject: [PATCH 0601/1732] tests: Add two new directories

These are now matched because we now use fuzzy matching.
---
 tests/__fish_complete_directories.out | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
index 6d72a4d55..b65028c14 100644
--- a/tests/__fish_complete_directories.out
+++ b/tests/__fish_complete_directories.out
@@ -3,6 +3,8 @@
 test/data/	Directory
 # __fish_complete_directories test/data
 test/data/	Directory
+test/buildroot/	Directory
+test/fish_expand_test/	Directory
 # __fish_complete_directories test/data/
 test/data/abc/	Directory
 test/data/abcd/	Directory

From 8c76bb49a4ab81c5657a8e2135fb7f01f971d9af Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 27 May 2019 23:22:28 +0200
Subject: [PATCH 0602/1732] Turns out order in the tests matters

This is a bit embarassing, sorry!
---
 tests/__fish_complete_directories.out | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
index b65028c14..03027825c 100644
--- a/tests/__fish_complete_directories.out
+++ b/tests/__fish_complete_directories.out
@@ -1,10 +1,10 @@
 # __fish_complete_directories test/z
 # __fish_complete_directories test/d
 test/data/	Directory
-# __fish_complete_directories test/data
-test/data/	Directory
 test/buildroot/	Directory
 test/fish_expand_test/	Directory
+# __fish_complete_directories test/data
+test/data/	Directory
 # __fish_complete_directories test/data/
 test/data/abc/	Directory
 test/data/abcd/	Directory

From b405b979ecba8197e5b5cb107cff212bea7ec984 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 17:24:19 -0700
Subject: [PATCH 0603/1732] Eliminate the CHECK() macro

This thing was pretty useless.
---
 src/builtin_functions.cpp |  2 +-
 src/builtin_read.cpp      |  5 ++++-
 src/common.cpp            |  4 +---
 src/common.h              | 11 -----------
 src/complete.cpp          |  2 +-
 src/event.cpp             |  2 +-
 src/input.cpp             |  8 ++------
 src/parse_util.cpp        | 11 ++++-------
 src/screen.cpp            |  2 +-
 src/util.cpp              |  3 +--
 10 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 6b53c2b3c..1edd67c3b 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -126,7 +126,7 @@ static int parse_cmd_opts(functions_cmd_opts_t &opts, int *optind,  //!OCLINT(hi
 
 /// Return a definition of the specified function. Used by the functions builtin.
 static wcstring functions_def(const wcstring &name) {
-    CHECK(!name.empty(), L"");  //!OCLINT(multiple unary operator)
+    assert(!name.empty() && "Empty name");
     wcstring out;
     wcstring desc, def;
     function_get_desc(name, desc);
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 913293a15..1240b675c 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -274,7 +274,10 @@ 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.
-            CHECK(lseek(fd, bytes_consumed - bytes_read + 1, SEEK_CUR) != -1, STATUS_CMD_ERROR)
+            if (lseek(fd, bytes_consumed - bytes_read + 1, SEEK_CUR) == -1) {
+                wperror(L"lseek");
+                return STATUS_CMD_ERROR;
+            }
             finished = true;
         } else if (str.size() > read_byte_limit) {
             exit_res = STATUS_READ_TOO_MUCH;
diff --git a/src/common.cpp b/src/common.cpp
index efd2c19d0..8e1ad13ab 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -431,9 +431,7 @@ std::string wcs2string(const wcstring &input) {
 /// This function decodes illegal character sequences in a reversible way using the private use
 /// area.
 static char *wcs2str_internal(const wchar_t *in, char *out) {
-    CHECK(in, 0);
-    CHECK(out, 0);
-
+    assert(in && out && "in and out must not be null");
     size_t in_pos = 0;
     size_t out_pos = 0;
     mbstate_t state = {};
diff --git a/src/common.h b/src/common.h
index 4a94a4aef..eadf02372 100644
--- a/src/common.h
+++ b/src/common.h
@@ -202,17 +202,6 @@ extern const wchar_t *program_name;
 /// Set to false if it's been determined we can't trust the last modified timestamp on the tty.
 extern const bool has_working_tty_timestamps;
 
-/// This macro is used to check that an argument is true. It is a bit like a non-fatal form of
-/// assert. Instead of exiting on failure, the current function is ended at once. The second
-/// parameter is the return value of the current function on failure.
-#define CHECK(arg, retval)                                                               \
-    if (!(arg)) {                                                                        \
-        debug(0, "function %s called with false value for argument %s", __func__, #arg); \
-        bugreport();                                                                     \
-        show_stackframe(L'E');                                                           \
-        return retval;                                                                   \
-    }
-
 // Pause for input, then exit the program. If supported, print a backtrace first.
 // The `return` will never be run  but silences oclint warnings. Especially when this is called
 // from within a `switch` block. As of the time I'm writing this oclint doesn't recognize the
diff --git a/src/complete.cpp b/src/complete.cpp
index e45d0f4e9..bd0b4073f 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -438,7 +438,7 @@ void complete_add(const wchar_t *cmd, bool cmd_is_path, const wcstring &option,
                   complete_option_type_t option_type, completion_mode_t result_mode,
                   const wchar_t *condition, const wchar_t *comp, const wchar_t *desc,
                   complete_flags_t flags) {
-    CHECK(cmd, );
+    assert(cmd && "Null command");
     // option should be empty iff the option type is arguments only.
     assert(option.empty() == (option_type == option_type_args_only));
 
diff --git a/src/event.cpp b/src/event.cpp
index 5d5d1e9fb..96e78d9ad 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -441,7 +441,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
 }
 
 void event_fire_generic(const wchar_t *name, const wcstring_list_t *args) {
-    CHECK(name, );
+    assert(name && "Null name");
 
     event_t ev(event_type_t::generic);
     ev.desc.str_param1 = name;
diff --git a/src/input.cpp b/src/input.cpp
index bbf990d4c..e9fb2b5cd 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -219,11 +219,7 @@ static void input_mapping_insert_sorted(const input_mapping_t &new_mapping, bool
 /// Adds an input mapping.
 void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands, size_t commands_len,
                        const wchar_t *mode, const wchar_t *sets_mode, bool user) {
-    CHECK(sequence, );
-    CHECK(commands, );
-    CHECK(mode, );
-    CHECK(sets_mode, );
-
+    assert(sequence && commands && mode && sets_mode && "Null parameter");
     // Remove existing mappings with this sequence.
     const wcstring_list_t commands_vector(commands, commands + commands_len);
 
@@ -663,7 +659,7 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
 bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
     ASSERT_IS_MAIN_THREAD();
     assert(s_input_initialized);
-    CHECK(name, 0);
+    assert(name && "null name");
 
     const char *res = 0;
     int err = ENOENT;
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 8d3a987b7..7f5c14f05 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -112,7 +112,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
 
     wchar_t *paran_begin = 0, *paran_end = 0;
 
-    CHECK(in, 0);
+    assert(in && "null parameter");
 
     for (pos = const_cast<wchar_t *>(in); *pos; pos++) {
         if (prev != '\\') {
@@ -236,10 +236,9 @@ int parse_util_locate_cmdsubst_range(const wcstring &str, size_t *inout_cursor_o
 
 void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **a,
                                 const wchar_t **b) {
+    assert(buff && "Null buffer");
     const wchar_t *const cursor = buff + cursor_pos;
 
-    CHECK(buff, );
-
     const size_t bufflen = std::wcslen(buff);
     assert(cursor_pos <= bufflen);
 
@@ -285,12 +284,11 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
 /// Get the beginning and end of the job or process definition under the cursor.
 static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **a,
                                   const wchar_t **b, int process) {
+    assert(buff && "Null buffer");
     const wchar_t *begin, *end;
     wchar_t *buffcpy;
     int finished = 0;
 
-    CHECK(buff, );
-
     if (a) *a = 0;
     if (b) *b = 0;
     parse_util_cmdsubst_extent(buff, cursor_pos, &begin, &end);
@@ -349,10 +347,9 @@ void parse_util_job_extent(const wchar_t *buff, size_t pos, const wchar_t **a, c
 void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **tok_begin,
                              const wchar_t **tok_end, const wchar_t **prev_begin,
                              const wchar_t **prev_end) {
+    assert(buff && "Null buffer");
     const wchar_t *a = NULL, *b = NULL, *pa = NULL, *pb = NULL;
 
-    CHECK(buff, );
-
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(buff, cursor_pos, &cmdsubst_begin, &cmdsubst_end);
 
diff --git a/src/screen.cpp b/src/screen.cpp
index f653be3f8..cda851cad 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1060,7 +1060,7 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
     s_save_status(s);
 }
 void s_reset(screen_t *s, screen_reset_mode_t mode) {
-    CHECK(s, );
+    assert(s && "Null screen");
 
     bool abandon_line = false, repaint_prompt = false, clear_to_eos = false;
     switch (mode) {
diff --git a/src/util.cpp b/src/util.cpp
index c3ce6b1a5..0b1080cbb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -47,8 +47,7 @@ static int wcsfilecmp_leading_digits(const wchar_t **a, const wchar_t **b) {
 ///
 /// Returns: -1 if a < b, 0 if a == b, 1 if a > b.
 int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
-    CHECK(a, 0);
-    CHECK(b, 0);
+    assert(a && b && "Null parameter");
     const wchar_t *orig_a = a;
     const wchar_t *orig_b = b;
     int retval = 0;  // assume the strings will be equal

From 63a16befd45f33bcaa10dcc53b64abd000cde48f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 20 Apr 2019 00:15:51 -0700
Subject: [PATCH 0604/1732] Introduce the fish log, a replacement for debug()

This adds a new mechanism for logging, intended to replace debug().

The entry points are FLOG and FLOGF. FLOG can be used to log a sequence of
arguments, FLOGF is for printf-style formatted strings.

Each call to FLOG and FLOGF requires a category. If logging for a category
is not enabled, there is no effect (and arguments are not evaluated).

Categories may be enabled on the command line via the -d option.
---
 CHANGELOG.md                 |   1 +
 CMakeLists.txt               |   1 +
 sphinx_doc_src/cmds/fish.rst |   4 ++
 src/fish.cpp                 |  45 +++++++++++-
 src/flog.cpp                 |  94 +++++++++++++++++++++++++
 src/flog.h                   | 133 +++++++++++++++++++++++++++++++++++
 6 files changed, 276 insertions(+), 2 deletions(-)
 create mode 100644 src/flog.cpp
 create mode 100644 src/flog.h

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c3c4a870..351b5ab3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
 - An issue resulting in a certain class of parser errors not resulting in a non-zero `$status` has been corrected (3e055f).
 - fish now underlines every valid entered path instead of just the last one.
+- The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0179915f9..238046952 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ SET(FISH_SRCS
     src/signal.cpp src/tinyexpr.cpp src/tnode.cpp src/tokenizer.cpp src/utf8.cpp src/util.cpp
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
+    src/flog.cpp
 )
 
 # Header files are just globbed.
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 0a11cd531..f3a2dbaca 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -22,6 +22,8 @@ The following options are available:
 
 - ``-d`` or ``--debug-level=DEBUG_LEVEL`` specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
 
+- ``-o`` or ``--debug-output=path`` Specify a file path to receive the debug output. The default is stderr.
+
 - ``-i`` or ``--interactive`` specify that fish is to run in interactive mode
 
 - ``-l`` or ``--login`` specify that fish is to run as a login shell
@@ -32,6 +34,8 @@ The following options are available:
 
 - ``--print-rusage-self`` when fish exits, output stats from getrusage
 
+- ``--print-debug-categories`` outputs the list of debug categories, and then exits.
+
 - ``-v`` or ``--version`` display version and exit
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
diff --git a/src/fish.cpp b/src/fish.cpp
index 2ea6db5ac..7afe73ed9 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "fish_version.h"
+#include "flog.h"
 #include "function.h"
 #include "future_feature_flags.h"
 #include "history.h"
@@ -61,6 +62,8 @@ class fish_cmd_opts_t {
    public:
     // Future feature flags values string
     wcstring features;
+    // File path for debug output.
+    std::string debug_output;
     // Commands to be executed in place of interactive shell.
     std::vector<std::string> batch_cmds;
     // Commands to execute after the shell's config has been read.
@@ -263,11 +266,13 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                                               {"init-command", required_argument, NULL, 'C'},
                                               {"features", required_argument, NULL, 'f'},
                                               {"debug-level", required_argument, NULL, 'd'},
+                                              {"debug-output", required_argument, NULL, 'o'},
                                               {"debug-stack-frames", required_argument, NULL, 'D'},
                                               {"interactive", no_argument, NULL, 'i'},
                                               {"login", no_argument, NULL, 'l'},
                                               {"no-execute", no_argument, NULL, 'n'},
                                               {"print-rusage-self", no_argument, NULL, 1},
+                                              {"print-debug-categories", no_argument, NULL, 2},
                                               {"profile", required_argument, NULL, 'p'},
                                               {"private", no_argument, NULL, 'P'},
                                               {"help", no_argument, NULL, 'h'},
@@ -295,11 +300,14 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
                     debug_level = (int)tmp;
                 } else {
-                    std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
-                    exit(1);
+                    activate_flog_categories_by_pattern(str2wcstring(optarg));
                 }
                 break;
             }
+            case 'o': {
+                opts->debug_output = optarg;
+                break;
+            }
             case 'f': {
                 opts->features = str2wcstring(optarg);
                 break;
@@ -324,6 +332,22 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 opts->print_rusage_self = true;
                 break;
             }
+            case 2: {
+                auto cats = get_flog_categories();
+                // Compute width of longest name.
+                int name_width = 0;
+                for (const auto *cat : cats) {
+                    name_width = std::max(name_width, (int)wcslen(cat->name));
+                }
+                // A little extra space.
+                name_width += 2;
+                for (const auto *cat : cats) {
+                    // Negating the name width left-justifies.
+                    printf("%*ls %ls\n", -name_width, cat->name, _(cat->description));
+                }
+                exit(0);
+                break;
+            }
             case 'p': {
                 s_profiling_output_filename = optarg;
                 g_profiling_active = true;
@@ -396,6 +420,20 @@ int main(int argc, char **argv) {
     fish_cmd_opts_t opts{};
     my_optind = fish_parse_opt(argc, argv, &opts);
 
+    // Direct any debug output right away.
+    FILE *debug_output = nullptr;
+    if (!opts.debug_output.empty()) {
+        debug_output = fopen(opts.debug_output.c_str(), "w");
+        if (!debug_output) {
+            fprintf(stderr, "Could not open file %s\n", opts.debug_output.c_str());
+            perror("fopen");
+            exit(-1);
+        }
+        set_cloexec(fileno(debug_output));
+        setlinebuf(debug_output);
+        set_flog_output_file(debug_output);
+    }
+
     // No-exec is prohibited when in interactive mode.
     if (opts.is_interactive_session && opts.no_exec) {
         debug(1, _(L"Can not use the no-execute mode when running an interactive session"));
@@ -501,6 +539,9 @@ int main(int argc, char **argv) {
     if (opts.print_rusage_self) {
         print_rusage_self(stderr);
     }
+    if (debug_output) {
+        fclose(debug_output);
+    }
     exit_without_destructors(exit_status);
     return EXIT_FAILURE;  // above line should always exit
 }
diff --git a/src/flog.cpp b/src/flog.cpp
new file mode 100644
index 000000000..490b78ee5
--- /dev/null
+++ b/src/flog.cpp
@@ -0,0 +1,94 @@
+// fish logging
+#include "config.h"
+
+#include "flog.h"
+#include "global_safety.h"
+
+#include "common.h"
+#include "enum_set.h"
+#include "parse_util.h"
+#include "wildcard.h"
+
+#include <vector>
+
+namespace flog_details {
+
+// Note we are relying on the order of global initialization within this file.
+// It is important that 'all' be initialized before 'g_categories', because g_categories wants to
+// append to all in the ctor.
+/// This is not modified after initialization.
+static std::vector<category_t *> s_all_categories;
+
+/// When a category is instantiated it adds itself to the 'all' list.
+category_t::category_t(const wchar_t *name, const wchar_t *desc, bool enabled)
+    : name(name), description(desc), enabled(enabled) {
+    s_all_categories.push_back(this);
+}
+
+/// Instantiate all categories.
+/// This is deliberately leaked to avoid pointless destructor registration.
+category_list_t *const category_list_t::g_instance = new category_list_t();
+
+logger_t::logger_t() : file_(stderr) {}
+
+owning_lock<logger_t> g_logger;
+
+void logger_t::log1(const wchar_t *s) { std::fputws(s, file_); }
+void logger_t::log1(const char *s) { std::fputs(s, file_); }
+
+void logger_t::log1(wchar_t c) { std::fputwc(c, file_); }
+void logger_t::log1(char c) { std::fputc(c, file_); }
+
+void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) {
+    va_list va;
+    va_start(va, fmt);
+    log1(cat.name);
+    log1(": ");
+    std::vfwprintf(file_, fmt, va);
+    log1('\n');
+    va_end(va);
+}
+
+void logger_t::log_fmt(const category_t &cat, const char *fmt, ...) {
+    va_list va;
+    va_start(va, fmt);
+    log1(cat.name);
+    log1(": ");
+    std::vfprintf(file_, fmt, va);
+    log1('\n');
+    va_end(va);
+}
+
+}  // namespace flog_details
+
+using namespace flog_details;
+
+/// For each category, if its name matches the wildcard, set its enabled to the given sense.
+static void apply_one_wildcard(const wcstring &wc_esc, bool sense) {
+    wcstring wc = parse_util_unescape_wildcards(wc_esc);
+    for (category_t *cat : s_all_categories) {
+        if (wildcard_match(cat->name, wc)) {
+            cat->enabled = sense;
+        }
+    }
+}
+
+void activate_flog_categories_by_pattern(const wcstring &wc) {
+    for (const wcstring &s : split_string(wc, L',')) {
+        if (string_prefixes_string(s, L"-")) {
+            apply_one_wildcard(s.substr(1), false);
+        } else {
+            apply_one_wildcard(s, true);
+        }
+    }
+}
+
+void set_flog_output_file(FILE *f) { g_logger.acquire()->set_file(f); }
+
+std::vector<const category_t *> get_flog_categories() {
+    std::vector<const category_t *> result(s_all_categories.begin(), s_all_categories.end());
+    std::sort(result.begin(), result.end(), [](const category_t *a, const category_t *b) {
+        return wcscmp(a->name, b->name) < 0;
+    });
+    return result;
+}
diff --git a/src/flog.h b/src/flog.h
new file mode 100644
index 000000000..255db39fb
--- /dev/null
+++ b/src/flog.h
@@ -0,0 +1,133 @@
+/// The flogger: debug logging support for fish.
+#ifndef FISH_FLOG_H
+#define FISH_FLOG_H
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "global_safety.h"
+
+#include <stdio.h>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+using wcstring = std::wstring;
+using wcstring_list_t = std::vector<wcstring>;
+
+template <typename T>
+class owning_lock;
+
+namespace flog_details {
+
+class category_list_t;
+class category_t {
+    friend category_list_t;
+    category_t(const wchar_t *name, const wchar_t *desc, bool enabled = false);
+
+   public:
+    /// The name of this category.
+    const wchar_t *const name;
+
+    /// A (non-localized) description of the category.
+    const wchar_t *const description;
+
+    /// Whether the category is enabled.
+    relaxed_atomic_bool_t enabled;
+};
+
+class category_list_t {
+    category_list_t() = default;
+
+   public:
+    /// The singleton global category list instance.
+    static category_list_t *const g_instance;
+
+    /// What follows are the actual logging categories.
+    /// To add a new category simply define a new field, following the pattern.
+
+    category_t error{L"error", L"Serious unexpected errors (on by default)", true};
+
+    category_t debug{L"debug", L"Debugging aid (on by default)", true};
+};
+
+/// The class responsible for logging.
+/// This is protected by a lock.
+class logger_t {
+    FILE *file_;
+
+    void log1(const wchar_t *);
+    void log1(const char *);
+    void log1(wchar_t);
+    void log1(char);
+
+    void log1(const wcstring &s) { log1(s.c_str()); }
+    void log1(const std::string &s) { log1(s.c_str()); }
+
+    template <typename T,
+              typename Enabler = typename std::enable_if<std::is_integral<T>::value>::type>
+    void log1(const T &v) {
+        log1(to_string(v));
+    }
+
+    template <typename T>
+    void log_args_impl(const T &arg) {
+        log1(arg);
+    }
+
+    template <typename T, typename... Ts>
+    void log_args_impl(const T &arg, const Ts &... rest) {
+        log1(arg);
+        log1(' ');
+        log_args_impl<Ts...>(rest...);
+    }
+
+   public:
+    void set_file(FILE *f) { file_ = f; }
+
+    logger_t();
+
+    template <typename... Args>
+    void log_args(const category_t &cat, const Args &... args) {
+        log1(cat.name);
+        log1(": ");
+        log_args_impl(args...);
+        log1('\n');
+    }
+
+    void log_fmt(const category_t &cat, const wchar_t *fmt, ...);
+    void log_fmt(const category_t &cat, const char *fmt, ...);
+};
+
+extern owning_lock<logger_t> g_logger;
+
+}  // namespace flog_details
+
+/// Set the active flog categories according to the given wildcard \p wc.
+void activate_flog_categories_by_pattern(const wcstring &wc);
+
+/// Set the file that flog should output to.
+/// flog does not close this file.
+void set_flog_output_file(FILE *f);
+
+/// \return a list of all categories, sorted by name.
+std::vector<const flog_details::category_t *> get_flog_categories();
+
+/// Output to the fish log a sequence of arguments, separated by spaces, and ending with a newline.
+#define FLOG(wht, ...)                                                        \
+    do {                                                                      \
+        if (flog_details::category_list_t::g_instance->wht.enabled) {         \
+            flog_details::g_logger.acquire()->log_args(                       \
+                flog_details::category_list_t::g_instance->wht, __VA_ARGS__); \
+        }                                                                     \
+    } while (0)
+
+/// Output to the fish log a printf-style formatted string.
+#define FLOGF(wht, ...)                                                       \
+    do {                                                                      \
+        if (flog_details::category_list_t::g_instance->wht.enabled) {         \
+            flog_details::g_logger.acquire()->log_fmt(                        \
+                flog_details::category_list_t::g_instance->wht, __VA_ARGS__); \
+        }                                                                     \
+    } while (0)
+
+#endif

From 8774860468a2257129dcd7179896fcc689f3fb5c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 13:47:27 -0700
Subject: [PATCH 0605/1732] Convert job logging from debug to FLOG

---
 src/exec.cpp | 9 +++++----
 src/flog.h   | 6 ++++++
 src/proc.cpp | 6 ++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 9ccac5cb8..34e4ed438 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -32,6 +32,7 @@
 #include "env.h"
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "function.h"
 #include "io.h"
 #include "iothread.h"
@@ -639,8 +640,8 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         // TODO: factor this job-status-setting stuff into a single place.
         p->completed = 1;
         if (p->is_last_in_job) {
-            debug(4, L"Set status of job %d (%ls) to %d using short circuit", j->job_id,
-                  j->preview().c_str(), p->status);
+            FLOGF(exec_job_status, L"Set status of job %d (%ls) to %d using short circuit",
+                  j->job_id, j->preview().c_str(), p->status);
             parser.set_last_statuses(j->get_statuses());
         }
         return true;
@@ -1096,8 +1097,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         }
     }
 
-    debug(3, L"Created job %d from command '%ls' with pgrp %d", j->job_id, j->command_wcstr(),
-          j->pgid);
+    FLOG(exec_job_exec, "Executed job", j->job_id, "from command", j->command_wcstr(), "with pgrp",
+         j->pgid);
 
     j->set_flag(job_flag_t::CONSTRUCTED, true);
     if (!j->is_foreground()) {
diff --git a/src/flog.h b/src/flog.h
index 255db39fb..6044eafb0 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -48,6 +48,12 @@ class category_list_t {
     category_t error{L"error", L"Serious unexpected errors (on by default)", true};
 
     category_t debug{L"debug", L"Debugging aid (on by default)", true};
+
+    category_t exec_job_status{L"exec-job-status", L"Jobs changing status"};
+
+    category_t exec_job_exec{L"exec-job-exec", L"Jobs being executed"};
+
+    category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
 };
 
 /// The class responsible for logging.
diff --git a/src/proc.cpp b/src/proc.cpp
index 9df9fa3fa..a2dae6f32 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -38,6 +38,7 @@
 #include "common.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "global_safety.h"
 #include "io.h"
 #include "output.h"
@@ -842,8 +843,9 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     parser.job_promote(this);
     set_flag(job_flag_t::NOTIFIED, false);
 
-    debug(4, L"%ls job %d, gid %d (%ls), %ls, %ls", send_sigcont ? L"Continue" : L"Start", job_id,
-          pgid, command_wcstr(), is_completed() ? L"COMPLETED" : L"UNCOMPLETED",
+    FLOGF(proc_job_run, L"%ls job %d, gid %d (%ls), %ls, %ls",
+          send_sigcont ? L"Continue" : L"Start", job_id, pgid, command_wcstr(),
+          is_completed() ? L"COMPLETED" : L"UNCOMPLETED",
           is_interactive ? L"INTERACTIVE" : L"NON-INTERACTIVE");
 
     // Make sure we retake control of the terminal before leaving this function.

From d9676bb2a82938e2b5e84d4a208ea7dee7ab7c1f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 13:49:59 -0700
Subject: [PATCH 0606/1732] Convert fork events from debug to flog

---
 src/exec.cpp | 4 ++--
 src/flog.h   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 34e4ed438..ce9b6568a 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -452,7 +452,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
 
     // This is the parent process. Store away information on the child, and
     // possibly give it control over the terminal.
-    debug(4, L"Fork #%d, pid %d: %s for '%ls'", g_fork_count, pid, fork_type, p->argv0());
+    FLOGF(exec_fork, L"Fork #%d, pid %d: %s for '%ls'", g_fork_count, pid, fork_type, p->argv0());
 
     p->pid = pid;
     on_process_created(job, p->pid);
@@ -715,7 +715,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
         // A 0 pid means we failed to posix_spawn. Since we have no pid, we'll never get
         // told when it's exited, so we have to mark the process as failed.
-        debug(4, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count, pid,
+        FLOGF(exec_fork, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count, pid,
               actual_cmd, file ? file : L"<no file>");
         if (pid == 0) {
             job_mark_process_as_failed(j, p);
diff --git a/src/flog.h b/src/flog.h
index 6044eafb0..d2efdde8a 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -53,7 +53,10 @@ class category_list_t {
 
     category_t exec_job_exec{L"exec-job-exec", L"Jobs being executed"};
 
+    category_t exec_fork{L"exec-fork", L"Calls to fork()"};
+
     category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
+
 };
 
 /// The class responsible for logging.

From 46a9da83e89e39a6f71f355c9d277a3103779982 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 14:51:16 -0700
Subject: [PATCH 0607/1732] Convert terminal ownership logging from debug to
 flog

---
 src/flog.h       |  1 +
 src/postfork.cpp |  3 ++-
 src/proc.cpp     | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index d2efdde8a..4c0d9ad21 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -57,6 +57,7 @@ class category_list_t {
 
     category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
 
+    category_t proc_termowner{L"proc-termowner", L"Terminal ownership events"};
 };
 
 /// The class responsible for logging.
diff --git a/src/postfork.cpp b/src/postfork.cpp
index b59e41883..0fbd442cb 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -15,6 +15,7 @@
 
 #include "common.h"
 #include "exec.h"
+#include "flog.h"
 #include "io.h"
 #include "iothread.h"
 #include "postfork.h"
@@ -143,7 +144,7 @@ bool maybe_assign_terminal(const job_t *j) {
             // this can cause an EPERM error. In addition, if we've given control of the terminal to
             // a process group, attempting to call tcsetpgrp from the background will cause SIGTTOU
             // to be sent to everything in our process group (unless we handle it).
-            debug(4, L"Process group %d already has control of terminal\n", j->pgid);
+            FLOGF(proc_termowner, L"Process group %d already has control of terminal", j->pgid);
         } else {
             // No need to duplicate the code here, a function already exists that does just this.
             return terminal_give_to_job(j, false /*new job, so not continuing*/);
diff --git a/src/proc.cpp b/src/proc.cpp
index a2dae6f32..7ccda9b4d 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -686,7 +686,7 @@ void proc_update_jiffies(parser_t &parser) {
 // restoring a previously-stopped job, in which case we need to restore terminal attributes.
 bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
     if (j->pgid == 0) {
-        debug(2, "terminal_give_to_job() returning early due to no process group");
+        FLOG(proc_termowner, "terminal_give_to_job() returning early due to no process group");
         return true;
     }
 
@@ -701,10 +701,10 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
     // to hand over control of the terminal to this process group, which is a no-op if it's already
     // been done.
     if (j->pgid == INVALID_PID || tcgetpgrp(STDIN_FILENO) == j->pgid) {
-        debug(4, L"Process group %d already has control of terminal\n", j->pgid);
+        FLOGF(proc_termowner, L"Process group %d already has control of terminal", j->pgid);
     } else {
-        debug(4,
-              L"Attempting to bring process group to foreground via tcsetpgrp for job->pgid %d\n",
+        FLOGF(proc_termowner,
+              L"Attempting to bring process group to foreground via tcsetpgrp for job->pgid %d",
               j->pgid);
 
         // The tcsetpgrp(2) man page says that EPERM is thrown if "pgrp has a supported value, but
@@ -717,7 +717,7 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
         // guarantee the process isn't going to exit while we wait (which would cause us to possibly
         // block indefinitely).
         while (tcsetpgrp(STDIN_FILENO, j->pgid) != 0) {
-            debug(3, "tcsetpgrp failed: %d", errno);
+            FLOGF(proc_termowner, "tcsetpgrp failed: %d", errno);
 
             bool pgroup_terminated = false;
             // No need to test for EINTR as we are blocking signals

From 6282ac5713ff2351abab0f217340c6c189ff709e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 May 2019 15:16:42 -0700
Subject: [PATCH 0608/1732] Convert locale variable changes from debug to flog

---
 src/env_dispatch.cpp | 11 ++++++-----
 src/flog.h           |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index c45034a86..c472ae2ad 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -38,6 +38,7 @@
 #include "env_universal_common.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "function.h"
 #include "global_safety.h"
 #include "history.h"
@@ -498,22 +499,22 @@ static void init_locale(const environment_t &vars) {
         const auto var = vars.get(var_name, ENV_EXPORT);
         const std::string &name = wcs2string(var_name);
         if (var.missing_or_empty()) {
-            debug(5, L"locale var %s missing or empty", name.c_str());
+            FLOGF(env_locale, L"locale var %s missing or empty", name.c_str());
             unsetenv_lock(name.c_str());
         } else {
             const std::string value = wcs2string(var->as_string());
-            debug(5, L"locale var %s='%s'", name.c_str(), value.c_str());
+            FLOGF(env_locale, L"locale var %s='%s'", name.c_str(), value.c_str());
             setenv_lock(name.c_str(), value.c_str(), 1);
         }
     }
 
     char *locale = setlocale(LC_ALL, "");
     fish_setlocale();
-    debug(5, L"init_locale() setlocale(): '%s'", locale);
+    FLOGF(env_locale, L"init_locale() setlocale(): '%s'", locale);
 
     const char *new_msg_locale = setlocale(LC_MESSAGES, NULL);
-    debug(5, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
-    debug(5, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
+    FLOGF(env_locale, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
+    FLOGF(env_locale, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
 #ifdef HAVE__NL_MSG_CAT_CNTR
     if (std::strcmp(old_msg_locale, new_msg_locale)) {
         // Make change known to GNU gettext.
diff --git a/src/flog.h b/src/flog.h
index 4c0d9ad21..48b5728ba 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -58,6 +58,8 @@ class category_list_t {
     category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
 
     category_t proc_termowner{L"proc-termowner", L"Terminal ownership events"};
+
+    category_t env_locale{L"env-locale", L"Changes to locale variables"};
 };
 
 /// The class responsible for logging.

From ea9d1ad82faf4c60d5d544f4090cc185a2749f06 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 15:56:53 -0700
Subject: [PATCH 0609/1732] Convert debug(0) calls to FLOG

---
 src/builtin.cpp              |  3 ++-
 src/common.cpp               | 27 ++++++++++++++-------------
 src/complete.cpp             |  2 +-
 src/env.cpp                  |  7 ++++---
 src/env_universal_common.cpp | 36 ++++++++++++++++++++----------------
 src/exec.cpp                 | 10 +++++-----
 src/expand.cpp               |  2 +-
 src/history.cpp              |  2 +-
 src/iothread.cpp             |  3 ++-
 src/output.cpp               |  5 +++--
 src/parse_constants.h        |  2 +-
 src/parse_execution.cpp      | 13 +++++++------
 src/parse_productions.cpp    | 11 ++++++-----
 src/parse_tree.cpp           |  3 ++-
 src/path.cpp                 | 17 +++++++++--------
 src/postfork.cpp             |  2 +-
 src/proc.cpp                 | 12 ++++++------
 src/reader.cpp               |  5 +++--
 src/sanity.cpp               |  7 ++++---
 src/tokenizer.cpp            |  2 +-
 src/wutil.cpp                |  3 ++-
 21 files changed, 95 insertions(+), 79 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 9aef6e344..9b91f2f12 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -66,6 +66,7 @@
 #include "complete.h"
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "intern.h"
 #include "io.h"
 #include "parse_constants.h"
@@ -469,7 +470,7 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
         return proc_status_t::from_exit_code(ret);
     }
 
-    debug(0, UNKNOWN_BUILTIN_ERR_MSG, argv[0]);
+    FLOGF(error, UNKNOWN_BUILTIN_ERR_MSG, argv[0]);
     return proc_status_t::from_exit_code(STATUS_CMD_ERROR);
 }
 
diff --git a/src/common.cpp b/src/common.cpp
index 8e1ad13ab..44091d56a 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -52,6 +52,7 @@
 #include "env.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "future_feature_flags.h"
 #include "global_safety.h"
 #include "proc.h"
@@ -2121,8 +2122,8 @@ int create_directory(const wcstring &d) {
 }
 
 [[gnu::noinline]] void bugreport() {
-    debug(0, _(L"This is a bug. Break on 'bugreport' to debug."));
-    debug(0, _(L"If you can reproduce it, please report: %s."), PACKAGE_BUGREPORT);
+    FLOG(error, _(L"This is a bug. Break on 'bugreport' to debug."));
+    FLOG(error, _(L"If you can reproduce it, please report: "), PACKAGE_BUGREPORT, '.');
 }
 
 wcstring format_size(long long sz) {
@@ -2314,24 +2315,24 @@ bool is_main_thread() {
 
 void assert_is_main_thread(const char *who) {
     if (!is_main_thread() && !thread_asserts_cfg_for_testing) {
-        debug(0, "%s called off of main thread.", who);
-        debug(0, "Break on debug_thread_error to debug.");
+        FLOGF(error, "%s called off of main thread.", who);
+        FLOGF(error, "Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
 
 void assert_is_not_forked_child(const char *who) {
     if (is_forked_child()) {
-        debug(0, "%s called in a forked child.", who);
-        debug(0, "Break on debug_thread_error to debug.");
+        FLOGF(error, "%s called in a forked child.", who);
+        FLOGF(error, "Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
 
 void assert_is_background_thread(const char *who) {
     if (is_main_thread() && !thread_asserts_cfg_for_testing) {
-        debug(0, "%s called on the main thread (may block!).", who);
-        debug(0, "Break on debug_thread_error to debug.");
+        FLOGF(error, "%s called on the main thread (may block!).", who);
+        FLOGF(error, "Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
@@ -2342,8 +2343,8 @@ void assert_is_locked(void *vmutex, const char *who, const char *caller) {
     // Note that std::mutex.try_lock() is allowed to return false when the mutex isn't
     // actually locked; fortunately we are checking the opposite so we're safe.
     if (mutex->try_lock()) {
-        debug(0, "%s is not locked when it should be in '%s'", who, caller);
-        debug(0, "Break on debug_thread_error to debug.");
+        FLOGF(error, "%s is not locked when it should be in '%s'", who, caller);
+        FLOGF(error, "Break on debug_thread_error to debug.");
         debug_thread_error();
         mutex->unlock();
     }
@@ -2436,10 +2437,10 @@ void redirect_tty_output() {
 /// Display a failed assertion message, dump a stack trace if possible, then die.
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
     if (error) {
-        debug(0, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
-              std::strerror(error));
+        FLOG(error, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
+             std::strerror(error));
     } else {
-        debug(0, L"%s:%zu: failed assertion: %s", file, line, msg);
+        FLOG(error, L"%s:%zu: failed assertion: %s", file, line, msg);
     }
     show_stackframe(L'E', 99, 1);
     abort();
diff --git a/src/complete.cpp b/src/complete.cpp
index bd0b4073f..5fb2fb987 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -904,7 +904,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         }
     };
 
-    // debug(0, L"\nThinking about looking up completions for %ls\n", cmd.c_str());
+    // FLOG(error, L"\nThinking about looking up completions for %ls\n", cmd.c_str());
     bool head_exists = builtin_exists(cmd);
     // Only reload environment variables if builtin_exists returned false, as an optimization
     if (head_exists == false) {
diff --git a/src/env.cpp b/src/env.cpp
index 6aa1fcd5d..51a372838 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -24,6 +24,7 @@
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "fish_version.h"
+#include "flog.h"
 #include "global_safety.h"
 #include "history.h"
 #include "input.h"
@@ -139,7 +140,7 @@ void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
         std::replace(newstrs.begin(), newstrs.end(), empty, wcstring(L"."));
         int retval = vars.set(var_name, ENV_DEFAULT | ENV_USER, std::move(newstrs));
         if (retval != ENV_OK) {
-            debug(0, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
+            FLOG(error, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
         }
     }
 }
@@ -1351,8 +1352,8 @@ wcstring env_get_runtime_path() {
         }
 
         if (!uname || check_runtime_path(tmpdir.c_str()) != 0) {
-            debug(0, L"Runtime path not available.");
-            debug(0, L"Try deleting the directory %s and restarting fish.", tmpdir.c_str());
+            FLOG(error, L"Runtime path not available.");
+            FLOG(error, L"Try deleting the directory %s and restarting fish.", tmpdir.c_str());
             return result;
         }
 
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index ad8867384..94d140caf 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -40,6 +40,7 @@
 #include "env.h"
 #include "env_universal_common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "path.h"
 #include "utf8.h"
 #include "util.h"  // IWYU pragma: keep
@@ -195,11 +196,11 @@ static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &
 
     // Append variable name like "fish_color_cwd".
     if (!valid_var_name(key_in)) {
-        debug(0, L"Illegal variable name: '%ls'", key_in.c_str());
+        FLOG(error, L"Illegal variable name: '%ls'", key_in.c_str());
         success = false;
     }
     if (success && !append_utf8(key_in, result, storage)) {
-        debug(0, L"Could not convert %ls to narrow character string", key_in.c_str());
+        FLOG(error, L"Could not convert %ls to narrow character string", key_in.c_str());
         success = false;
     }
 
@@ -210,7 +211,7 @@ static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &
 
     // Append value.
     if (success && !append_utf8(full_escape(val_in), result, storage)) {
-        debug(0, L"Could not convert %ls to narrow character string", val_in.c_str());
+        FLOG(error, L"Could not convert %ls to narrow character string", val_in.c_str());
         success = false;
     }
 
@@ -447,7 +448,8 @@ bool env_universal_t::write_to_fd(int fd, const wcstring &path) {
     std::string contents = serialize_with_vars(vars);
     if (write_loop(fd, contents.data(), contents.size()) < 0) {
         const char *error = std::strerror(errno);
-        debug(0, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(), error);
+        FLOG(error, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(),
+             error);
         success = false;
     }
 
@@ -462,8 +464,8 @@ bool env_universal_t::move_new_vars_file_into_place(const wcstring &src, const w
     int ret = wrename(src, dst);
     if (ret != 0) {
         const char *error = std::strerror(errno);
-        debug(0, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
-              error);
+        FLOG(error, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
+             error);
     }
     return ret == 0;
 }
@@ -525,7 +527,7 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
 
     if (!success) {
         const char *error = std::strerror(saved_errno);
-        debug(0, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
+        FLOG(error, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
     }
     return success;
 }
@@ -587,7 +589,8 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) {
             }
 #endif
             const char *error = std::strerror(errno);
-            debug(0, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(), error);
+            FLOG(error, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(),
+                 error);
             break;
         }
 
@@ -1058,7 +1061,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         int fd = shm_open(path, O_RDWR | O_CREAT, 0600);
         if (fd < 0) {
             const char *error = std::strerror(errno);
-            debug(0, _(L"Unable to open shared memory with path '%s': %s"), path, error);
+            FLOG(error, _(L"Unable to open shared memory with path '%s': %s"), path, error);
             errored = true;
         }
 
@@ -1068,8 +1071,8 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
             struct stat buf = {};
             if (fstat(fd, &buf) < 0) {
                 const char *error = std::strerror(errno);
-                debug(0, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
-                      error);
+                FLOG(error, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
+                     error);
                 errored = true;
             }
             size = buf.st_size;
@@ -1079,7 +1082,8 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         bool set_size = !errored && size < (off_t)sizeof(universal_notifier_shmem_t);
         if (set_size && ftruncate(fd, sizeof(universal_notifier_shmem_t)) < 0) {
             const char *error = std::strerror(errno);
-            debug(0, _(L"Unable to truncate shared memory object with path '%s': %s"), path, error);
+            FLOG(error, _(L"Unable to truncate shared memory object with path '%s': %s"), path,
+                 error);
             errored = true;
         }
 
@@ -1089,8 +1093,8 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
                               MAP_SHARED, fd, 0);
             if (addr == MAP_FAILED) {
                 const char *error = std::strerror(errno);
-                debug(0, _(L"Unable to memory map shared memory object with path '%s': %s"), path,
-                      error);
+                FLOG(error, _(L"Unable to memory map shared memory object with path '%s': %s"),
+                     path, error);
                 this->region = NULL;
             } else {
                 this->region = static_cast<universal_notifier_shmem_t *>(addr);
@@ -1495,7 +1499,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
     if (mkfifo_status == -1 && errno != EEXIST) {
         const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to make a pipe for universal variables using '%ls': %s");
-        debug(0, errmsg, vars_path.c_str(), error);
+        FLOG(error, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
         return;
     }
@@ -1504,7 +1508,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
     if (fd < 0) {
         const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to open a pipe for universal variables using '%ls': %s");
-        debug(0, errmsg, vars_path.c_str(), error);
+        FLOG(error, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
         return;
     }
diff --git a/src/exec.cpp b/src/exec.cpp
index ce9b6568a..eb2f163ed 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -62,7 +62,7 @@ void exec_close(int fd) {
 
     // This may be called in a child of fork(), so don't allocate memory.
     if (fd < 0) {
-        debug(0, L"Called close on invalid file descriptor ");
+        FLOG(error, L"Called close on invalid file descriptor ");
         return;
     }
 
@@ -614,20 +614,20 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         if (write_loop(STDOUT_FILENO, outbuff.data(), outbuff.size()) < 0) {
             if (errno != EPIPE) {
                 did_err = true;
-                debug(0, "Error while writing to stdout");
+                FLOG(error, "Error while writing to stdout");
                 wperror(L"write_loop");
             }
         }
         if (write_loop(STDERR_FILENO, errbuff.data(), errbuff.size()) < 0) {
             if (errno != EPIPE && !did_err) {
                 did_err = true;
-                debug(0, "Error while writing to stderr");
+                FLOG(error, "Error while writing to stderr");
                 wperror(L"write_loop");
             }
         }
         if (did_err) {
             redirect_tty_output();  // workaround glibc bug
-            debug(0, "!builtin_io_done and errno != EPIPE");
+            FLOG(error, "!builtin_io_done and errno != EPIPE");
             show_stackframe(L'E');
         }
         // Clear the buffers to indicate we finished.
@@ -789,7 +789,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         const wcstring func_name = p->argv0();
         auto props = function_get_properties(func_name);
         if (!props) {
-            debug(0, _(L"Unknown function '%ls'"), p->argv0());
+            FLOG(error, _(L"Unknown function '%ls'"), p->argv0());
             return false;
         }
 
diff --git a/src/expand.cpp b/src/expand.cpp
index a2bae217c..d6c55c1b0 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -222,7 +222,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             }
             // debug( 0, L"Push range idx %d %d", i1, i2 );
             for (long jjj = i1; jjj * direction <= i2 * direction; jjj += direction) {
-                // debug(0, L"Expand range [subst]: %i\n", jjj);
+                // FLOG(error, L"Expand range [subst]: %i\n", jjj);
                 idx.push_back(jjj);
             }
             continue;
diff --git a/src/history.cpp b/src/history.cpp
index 87b2bba6d..8f61f010b 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1237,7 +1237,7 @@ bool history_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
             const history_item_t old_item = decode_item(*local_file, offset);
 
             if (old_item.empty() || deleted_items.count(old_item.str()) > 0) {
-                // debug(0, L"Item is deleted : %s\n", old_item.str().c_str());
+                // FLOG(error, L"Item is deleted : %s\n", old_item.str().c_str());
                 continue;
             }
             // Add this old item.
diff --git a/src/iothread.cpp b/src/iothread.cpp
index eb07ac854..f206e776a 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -15,6 +15,7 @@
 #include <queue>
 
 #include "common.h"
+#include "flog.h"
 #include "global_safety.h"
 #include "iothread.h"
 #include "wutil.h"
@@ -201,7 +202,7 @@ void iothread_service_completion() {
     } else if (wakeup_byte == IO_SERVICE_RESULT_QUEUE) {
         iothread_service_result_queue();
     } else {
-        debug(0, "Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
+        FLOG(error, "Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
     }
 }
 
diff --git a/src/output.cpp b/src/output.cpp
index 80f0f51d8..5ce29e547 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -27,6 +27,7 @@
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "output.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -528,7 +529,7 @@ void writembs_check(outputter_t &outp, const char *mbs, const char *mbs_name, bo
         const wchar_t *fmt =
             _(L"Tried to use terminfo string %s on line %ld of %s, which is "
               L"undefined in terminal of type \"%ls\". Please report this error to %s");
-        debug(0, fmt, mbs_name, line, file, term ? term->as_string().c_str() : L"",
-              PACKAGE_BUGREPORT);
+        FLOG(error, fmt, mbs_name, line, file, term ? term->as_string().c_str() : L"",
+             PACKAGE_BUGREPORT);
     }
 }
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 2879bc251..897c6fabf 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -8,7 +8,7 @@
 #define PARSE_ASSERT(a) assert(a)
 #define PARSER_DIE()                  \
     do {                              \
-        debug(0, "Parser dying!");    \
+        FLOG(error, "Parser dying!"); \
         exit_without_destructors(-1); \
     } while (0)
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 235235dfb..1f9d7d13c 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -31,6 +31,7 @@
 #include "event.h"
 #include "exec.h"
 #include "expand.h"
+#include "flog.h"
 #include "function.h"
 #include "io.h"
 #include "maybe.h"
@@ -358,7 +359,7 @@ parse_execution_result_t parse_execution_context_t::run_block_statement(
     } else if (auto header = bheader.try_get_child<g::begin_header, 0>()) {
         ret = run_begin_statement(contents);
     } else {
-        debug(0, L"Unexpected block header: %ls\n", bheader.node()->describe().c_str());
+        FLOG(error, L"Unexpected block header: %ls\n", bheader.node()->describe().c_str());
         PARSER_DIE();
     }
     return ret;
@@ -635,7 +636,7 @@ parse_execution_result_t parse_execution_context_t::report_errors(
     const parse_error_list_t &error_list) const {
     if (!parser->cancellation_requested) {
         if (error_list.empty()) {
-            debug(0, "Error reported but no error text found.");
+            FLOG(error, "Error reported but no error text found.");
         }
 
         // Get a backtrace.
@@ -1076,8 +1077,8 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
             break;
         }
         default: {
-            debug(0, L"'%ls' not handled by new parser yet.",
-                  specific_statement.describe().c_str());
+            FLOG(error, L"'%ls' not handled by new parser yet.",
+                 specific_statement.describe().c_str());
             PARSER_DIE();
             break;
         }
@@ -1380,8 +1381,8 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
     } else if (auto switchstat = statement.try_get_child<g::switch_statement, 0>()) {
         status = this->run_switch_statement(switchstat);
     } else {
-        debug(0, "Unexpected node %ls found in %s", statement.node()->describe().c_str(),
-              __FUNCTION__);
+        FLOG(error, "Unexpected node %ls found in %s", statement.node()->describe().c_str(),
+             __FUNCTION__);
         abort();
     }
     return status;
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 2d30fefc5..5dc43aea1 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -3,6 +3,7 @@
 #include <stdio.h>
 
 #include "common.h"
+#include "flog.h"
 #include "parse_constants.h"
 #include "parse_grammar.h"
 #include "parse_productions.h"
@@ -402,21 +403,21 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_token_type_oror:
         case parse_token_type_end:
         case parse_token_type_terminate: {
-            debug(0, "Terminal token type %ls passed to %s", token_type_description(node_type),
-                  __FUNCTION__);
+            FLOG(error, "Terminal token type %ls passed to %s", token_type_description(node_type),
+                 __FUNCTION__);
             PARSER_DIE();
             break;
         }
         case parse_special_type_parse_error:
         case parse_special_type_tokenizer_error:
         case parse_special_type_comment: {
-            debug(0, "Special type %ls passed to %s\n", token_type_description(node_type),
-                  __FUNCTION__);
+            FLOG(error, "Special type %ls passed to %s\n", token_type_description(node_type),
+                 __FUNCTION__);
             PARSER_DIE();
             break;
         }
         case token_type_invalid: {
-            debug(0, "token_type_invalid passed to %s", __FUNCTION__);
+            FLOG(error, "token_type_invalid passed to %s", __FUNCTION__);
             PARSER_DIE();
             break;
         }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 3b8c374ce..08aedba62 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -13,6 +13,7 @@
 
 #include "common.h"
 #include "fallback.h"
+#include "flog.h"
 #include "parse_constants.h"
 #include "parse_productions.h"
 #include "parse_tree.h"
@@ -256,7 +257,7 @@ static inline parse_token_type_t parse_token_type_from_tokenizer_token(
         case TOK_COMMENT:
             return parse_special_type_comment;
     }
-    debug(0, "Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
+    FLOG(error, "Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
     DIE("bad token type");
     return token_type_invalid;
 }
diff --git a/src/path.cpp b/src/path.cpp
index d5ab52c66..7e1f9ff16 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -18,6 +18,7 @@
 #include "env.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "path.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -267,17 +268,17 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
     }
     vars.set_one(warning_var_name, ENV_GLOBAL | ENV_EXPORT, L"1");
 
-    debug(0, custom_error_msg.c_str());
+    FLOG(error, custom_error_msg.c_str());
     if (path.empty()) {
-        debug(0, _(L"Unable to locate the %ls directory."), which_dir.c_str());
-        debug(0, _(L"Please set the %ls or HOME environment variable before starting fish."),
-              xdg_var.c_str());
+        FLOG(error, _(L"Unable to locate the %ls directory."), which_dir.c_str());
+        FLOG(error, _(L"Please set the %ls or HOME environment variable before starting fish."),
+             xdg_var.c_str());
     } else {
         const wchar_t *env_var = using_xdg ? xdg_var.c_str() : L"HOME";
-        debug(0, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."), which_dir.c_str(),
-              env_var, path.c_str());
-        debug(0, _(L"The error was '%s'."), std::strerror(saved_errno));
-        debug(0, _(L"Please set $%ls to a directory where you have write access."), env_var);
+        FLOG(error, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."),
+             which_dir.c_str(), env_var, path.c_str());
+        FLOG(error, _(L"The error was '%s'."), std::strerror(saved_errno));
+        FLOG(error, _(L"Please set $%ls to a directory where you have write access."), env_var);
     }
     ignore_result(write(STDERR_FILENO, "\n", 1));
 }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 0fbd442cb..c8a4b2add 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -374,7 +374,7 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
             const char *err = safe_strerror(errno);
             debug_safe(0, "exec: %s", err);
 
-            // debug(0, L"The file '%ls' is marked as an executable but could not be run by the
+            // FLOG(error, L"The file '%ls' is marked as an executable but could not be run by the
             // operating system.", p->actual_cmd);
             break;
         }
diff --git a/src/proc.cpp b/src/proc.cpp
index 7ccda9b4d..b5165cba4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -914,8 +914,8 @@ void proc_sanity_check(const parser_t &parser) {
         // More than one foreground job?
         if (j->is_foreground() && !(j->is_stopped() || j->is_completed())) {
             if (fg_job) {
-                debug(0, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
-                      fg_job->command_wcstr(), j->command_wcstr());
+                FLOG(error, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
+                     fg_job->command_wcstr(), j->command_wcstr());
                 sanity_lose();
             }
             fg_job = j.get();
@@ -928,14 +928,14 @@ void proc_sanity_check(const parser_t &parser) {
             validate_pointer(p->argv0(), _(L"Process name"), null_ok);
 
             if ((p->stopped & (~0x00000001)) != 0) {
-                debug(0, _(L"Job '%ls', process '%ls' has inconsistent state \'stopped\'=%d"),
-                      j->command_wcstr(), p->argv0(), p->stopped);
+                FLOG(error, _(L"Job '%ls', process '%ls' has inconsistent state \'stopped\'=%d"),
+                     j->command_wcstr(), p->argv0(), p->stopped);
                 sanity_lose();
             }
 
             if ((p->completed & (~0x00000001)) != 0) {
-                debug(0, _(L"Job '%ls', process '%ls' has inconsistent state \'completed\'=%d"),
-                      j->command_wcstr(), p->argv0(), p->completed);
+                FLOG(error, _(L"Job '%ls', process '%ls' has inconsistent state \'completed\'=%d"),
+                     j->command_wcstr(), p->argv0(), p->completed);
                 sanity_lose();
             }
         }
diff --git a/src/reader.cpp b/src/reader.cpp
index 0a94bc8d0..4a18a7220 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -52,6 +52,7 @@
 #include "exec.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "function.h"
 #include "global_safety.h"
 #include "highlight.h"
@@ -1749,7 +1750,7 @@ static void reader_interactive_init() {
     if (shell_pgid == 0) {
         shell_pgid = getpid();
         if (setpgid(shell_pgid, shell_pgid) < 0) {
-            debug(0, _(L"Failed to assign shell to its own process group"));
+            FLOG(error, _(L"Failed to assign shell to its own process group"));
             wperror(L"setpgid");
             exit_without_destructors(1);
         }
@@ -1759,7 +1760,7 @@ static void reader_interactive_init() {
             if (errno == ENOTTY) {
                 redirect_tty_output();
             }
-            debug(0, _(L"Failed to take control of the terminal"));
+            FLOG(error, _(L"Failed to take control of the terminal"));
             wperror(L"tcsetpgrp");
             exit_without_destructors(1);
         }
diff --git a/src/sanity.cpp b/src/sanity.cpp
index 804665151..4bc6b540c 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -5,6 +5,7 @@
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "global_safety.h"
 #include "history.h"
 #include "kill.h"
@@ -16,19 +17,19 @@
 static relaxed_atomic_bool_t insane{false};
 
 void sanity_lose() {
-    debug(0, _(L"Errors detected, shutting down. Break on sanity_lose() to debug."));
+    FLOG(error, _(L"Errors detected, shutting down. Break on sanity_lose() to debug."));
     insane = true;
 }
 
 void validate_pointer(const void *ptr, const wchar_t *err, int null_ok) {
     // Test if the pointer data crosses a segment boundary.
     if ((0x00000003l & (intptr_t)ptr) != 0) {
-        debug(0, _(L"The pointer '%ls' is invalid"), err);
+        FLOG(error, _(L"The pointer '%ls' is invalid"), err);
         sanity_lose();
     }
 
     if ((!null_ok) && (ptr == 0)) {
-        debug(0, _(L"The pointer '%ls' is null"), err);
+        FLOG(error, _(L"The pointer '%ls' is null"), err);
         sanity_lose();
     }
 }
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index d1f4f4a97..0308d8f53 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -243,7 +243,7 @@ tok_t tokenizer_t::read_string() {
         } else {
             msg.push_back(L'\n');
         }
-        debug(0, msg.c_str(), c, c, int(mode_begin), int(mode));
+        FLOG(error, msg.c_str(), c, c, int(mode_begin), int(mode));
 #endif
 
         this->buff++;
diff --git a/src/wutil.cpp b/src/wutil.cpp
index b9998f6b6..f5e245239 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -27,6 +27,7 @@
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "wutil.h"     // IWYU pragma: keep
 
 typedef std::string cstring;
@@ -130,7 +131,7 @@ const wcstring wgetcwd() {
         return str2wcstring(res);
     }
 
-    debug(0, _(L"getcwd() failed with errno %d/%s"), errno, std::strerror(errno));
+    FLOG(error, _(L"getcwd() failed with errno %d/%s"), errno, std::strerror(errno));
     return wcstring();
 }
 

From 0150d505debd95e8786b138972ecc4aba33a4a37 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 17:38:09 -0700
Subject: [PATCH 0610/1732] Allow underscores to be treated as dashes in debug
 categories

---
 src/flog.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/flog.cpp b/src/flog.cpp
index 490b78ee5..9a9bfa3e1 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -73,7 +73,10 @@ static void apply_one_wildcard(const wcstring &wc_esc, bool sense) {
     }
 }
 
-void activate_flog_categories_by_pattern(const wcstring &wc) {
+void activate_flog_categories_by_pattern(const wcstring &inwc) {
+    // Normalize underscores to dashes, allowing the user to be sloppy.
+    wcstring wc = inwc;
+    std::replace(wc.begin(), wc.end(), L'_', L'-');
     for (const wcstring &s : split_string(wc, L',')) {
         if (string_prefixes_string(s, L"-")) {
             apply_one_wildcard(s.substr(1), false);

From 835c6ffa673c6ef7f46986438aa12aa1819ebf7f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 19:47:13 -0700
Subject: [PATCH 0611/1732] clang-format all files

---
 src/common.cpp      | 10 ++++---
 src/complete.cpp    |  6 ++--
 src/exec.cpp        |  4 +--
 src/expand.cpp      |  4 ++-
 src/fish_indent.cpp | 68 ++++++++++++++++++++++-----------------------
 src/screen.cpp      | 14 ++++++----
 src/wutil.cpp       |  2 +-
 7 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 44091d56a..ccfc0764f 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1535,7 +1535,8 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     if (unescape_special) {
                         brace_count++;
                         to_append_or_none = BRACE_BEGIN;
-                        // We need to store where the brace *ends up* in the output because of NOT_A_WCHAR.
+                        // We need to store where the brace *ends up* in the output because of
+                        // NOT_A_WCHAR.
                         braces.push_back(result.size());
                     }
                     break;
@@ -1563,10 +1564,11 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                                 to_append_or_none = L'}';
                             }
 
-                            // Remove all seps inside the current brace pair, so if we have a surrounding pair
-                            // we only get seps inside *that*.
+                            // Remove all seps inside the current brace pair, so if we have a
+                            // surrounding pair we only get seps inside *that*.
                             if (vars_or_seps.size()) {
-                                while(vars_or_seps.size() && vars_or_seps.back() > braces.back()) vars_or_seps.pop_back();
+                                while (vars_or_seps.size() && vars_or_seps.back() > braces.back())
+                                    vars_or_seps.pop_back();
                             }
                             braces.pop_back();
                         }
diff --git a/src/complete.cpp b/src/complete.cpp
index 5fb2fb987..750d9dbc6 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -243,7 +243,8 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
 }
 
 static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
-    return (a.completion.empty() < b.completion.empty()) || (a.completion.back() == L'~') < (b.completion.back() == L'~');
+    return (a.completion.empty() < b.completion.empty()) ||
+           (a.completion.back() == L'~') < (b.completion.back() == L'~');
 }
 /// Unique the list of completions, without perturbing their order.
 static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
@@ -286,7 +287,8 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
     stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);
 
     // Lastly, if this is for an autosuggestion, prefer to avoid completions that duplicate
-    // arguments, and penalize files that end in tilde - they're frequently autosave files from e.g. emacs.
+    // arguments, and penalize files that end in tilde - they're frequently autosave files from e.g.
+    // emacs.
     if (flags & completion_request_t::autosuggestion) {
         stable_sort(comps->begin(), comps->end(), compare_completions_by_duplicate_arguments);
         stable_sort(comps->begin(), comps->end(), compare_completions_by_tilde);
diff --git a/src/exec.cpp b/src/exec.cpp
index eb2f163ed..a9dbc1d43 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -715,8 +715,8 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
         // A 0 pid means we failed to posix_spawn. Since we have no pid, we'll never get
         // told when it's exited, so we have to mark the process as failed.
-        FLOGF(exec_fork, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count, pid,
-              actual_cmd, file ? file : L"<no file>");
+        FLOGF(exec_fork, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count,
+              pid, actual_cmd, file ? file : L"<no file>");
         if (pid == 0) {
             job_mark_process_as_failed(j, p);
             return false;
diff --git a/src/expand.cpp b/src/expand.cpp
index d6c55c1b0..a9d155260 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -124,7 +124,9 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
 
 /// Test if the specified string does not contain character which can not be used inside a quoted
 /// string.
-static bool is_quotable(const wcstring &str) { return str.find_first_of(L"\n\t\r\b\x1B") == wcstring::npos; }
+static bool is_quotable(const wcstring &str) {
+    return str.find_first_of(L"\n\t\r\b\x1B") == wcstring::npos;
+}
 
 wcstring expand_escape_variable(const env_var_t &var) {
     wcstring buff;
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index ef2fc6168..4d78166fc 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -236,8 +236,7 @@ void prettifier_t::prettify_node(const parse_node_tree_t &tree, node_offset_t no
             if (last_was_semicolon) {
                 // We keep the semicolon for `; and` and `; or`,
                 // others we turn into newlines.
-                if (node.keyword != parse_keyword_and
-                    && node.keyword != parse_keyword_or) {
+                if (node.keyword != parse_keyword_and && node.keyword != parse_keyword_or) {
                     append_newline();
                 } else {
                     output.push_back(L';');
@@ -621,12 +620,12 @@ int main(int argc, char *argv[]) {
     argv += optind;
 
     wcstring src;
-    for (int i = 0; i < argc || (argc == 0 && i == 0) ; i++) {
+    for (int i = 0; i < argc || (argc == 0 && i == 0); i++) {
         if (argc == 0 && i == 0) {
             if (output_type == output_type_file) {
-                std::fwprintf(stderr,
-                              _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
-                              program_name);
+                std::fwprintf(
+                    stderr, _(L"Expected file path to read/write for -w:\n\n $ %ls -w foo.fish\n"),
+                    program_name);
                 exit(1);
             }
             src = read_file(stdin);
@@ -637,7 +636,8 @@ int main(int argc, char *argv[]) {
                 fclose(fh);
                 output_location = argv[i];
             } else {
-                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv, std::strerror(errno));
+                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), *argv,
+                              std::strerror(errno));
                 exit(1);
             }
         }
@@ -659,34 +659,34 @@ int main(int argc, char *argv[]) {
 
         std::string colored_output;
         switch (output_type) {
-        case output_type_plain_text: {
-            colored_output = no_colorize(output_wtext);
-            break;
-        }
-        case output_type_file: {
-            FILE *fh = fopen(output_location, "w");
-            if (fh) {
-                std::fputws(output_wtext.c_str(), fh);
-                fclose(fh);
-            } else {
-                std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
-                              std::strerror(errno));
-                exit(1);
+            case output_type_plain_text: {
+                colored_output = no_colorize(output_wtext);
+                break;
+            }
+            case output_type_file: {
+                FILE *fh = fopen(output_location, "w");
+                if (fh) {
+                    std::fputws(output_wtext.c_str(), fh);
+                    fclose(fh);
+                } else {
+                    std::fwprintf(stderr, _(L"Opening \"%s\" failed: %s\n"), output_location,
+                                  std::strerror(errno));
+                    exit(1);
+                }
+                break;
+            }
+            case output_type_ansi: {
+                colored_output = ansi_colorize(output_wtext, colors);
+                break;
+            }
+            case output_type_html: {
+                colored_output = html_colorize(output_wtext, colors);
+                break;
+            }
+            case output_type_pygments_csv: {
+                DIE("pygments_csv should have been handled above");
+                break;
             }
-            break;
-        }
-        case output_type_ansi: {
-            colored_output = ansi_colorize(output_wtext, colors);
-            break;
-        }
-        case output_type_html: {
-            colored_output = html_colorize(output_wtext, colors);
-            break;
-        }
-        case output_type_pygments_csv: {
-            DIE("pygments_csv should have been handled above");
-            break;
-        }
         }
 
         std::fputws(str2wcstring(colored_output).c_str(), stdout);
diff --git a/src/screen.cpp b/src/screen.cpp
index cda851cad..180e2f228 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -467,8 +467,8 @@ static void s_move(screen_t *s, int new_x, int new_y) {
         str = cursor_up;
     } else if (y_steps > 0) {
         str = cursor_down;
-        if ((shell_modes.c_oflag & ONLCR) != 0
-            && std::strcmp(str, "\n") == 0) { // See GitHub issue #4505.
+        if ((shell_modes.c_oflag & ONLCR) != 0 &&
+            std::strcmp(str, "\n") == 0) {  // See GitHub issue #4505.
             // Most consoles use a simple newline as the cursor down escape.
             // If ONLCR is enabled (which it normally is) this will of course
             // also move the cursor to the beginning of the line.
@@ -558,7 +558,8 @@ static size_t line_shared_prefix(const line_t &a, const line_t &b) {
         if (ac != bc || a.color_at(idx) != b.color_at(idx)) {
             if (idx > 0) {
                 const line_t *c = nullptr;
-                // Possible combining mark, go back until we hit _two_ printable characters or idx of 0.
+                // Possible combining mark, go back until we hit _two_ printable characters or idx
+                // of 0.
                 if (fish_wcwidth(a.char_at(idx)) < 1) {
                     c = &a;
                 } else if (fish_wcwidth(b.char_at(idx)) < 1) {
@@ -566,7 +567,9 @@ static size_t line_shared_prefix(const line_t &a, const line_t &b) {
                 }
 
                 if (c) {
-                    while (idx > 1 && (fish_wcwidth(c->char_at(idx - 1)) < 1 || fish_wcwidth(c->char_at(idx)) < 1)) idx--;
+                    while (idx > 1 && (fish_wcwidth(c->char_at(idx - 1)) < 1 ||
+                                       fish_wcwidth(c->char_at(idx)) < 1))
+                        idx--;
                     if (idx == 1 && fish_wcwidth(c->char_at(idx)) < 1) idx = 0;
                 }
             }
@@ -1036,7 +1039,8 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
             cursor_arr = s->desired.cursor;
         }
         s_desired_append_char(s, effective_commandline.at(i), colors[i], indent[i],
-                              first_line_prompt_space, fish_wcwidth_min_0(effective_commandline.at(i)));
+                              first_line_prompt_space,
+                              fish_wcwidth_min_0(effective_commandline.at(i)));
     }
 
     // Cursor may have been at the end too.
diff --git a/src/wutil.cpp b/src/wutil.cpp
index f5e245239..df8a1e447 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -28,7 +28,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "flog.h"
-#include "wutil.h"     // IWYU pragma: keep
+#include "wutil.h"  // IWYU pragma: keep
 
 typedef std::string cstring;
 

From 29c627d020d19965b4084209ae6871f7fff83f87 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 19:56:35 -0700
Subject: [PATCH 0612/1732] Stop calling principal_parser() inside
 parse_execution.cpp

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

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 1f9d7d13c..54997eca1 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1231,7 +1231,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), block_io, parent_job);
-    auto &ld = parser_t::principal_parser().libdata();
+    auto &ld = parser->libdata();
     job->tmodes = tmodes;
     auto job_control_mode = get_job_control_mode();
     job->set_flag(job_flag_t::JOB_CONTROL,

From ba4f4bfce2f5332c1dd18c677b8ee27356c80688 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 May 2019 21:06:42 +0800
Subject: [PATCH 0613/1732] Convert further debug(0) calls to FLOG

Follow on from ea9d1ad82faf4c.
---
 src/env.cpp     | 2 +-
 src/history.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 51a372838..9ea544d6a 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1189,7 +1189,7 @@ void env_stack_t::set_termsize() {
 void env_stack_t::set_pwd_from_getcwd() {
     wcstring cwd = wgetcwd();
     if (cwd.empty()) {
-        debug(0,
+        FLOG(error,
               _(L"Could not determine current working directory. Is your locale set correctly?"));
         return;
     }
diff --git a/src/history.cpp b/src/history.cpp
index 8f61f010b..b385790ba 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -31,6 +31,7 @@
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "global_safety.h"
 #include "history.h"
 #include "io.h"
@@ -1860,7 +1861,7 @@ wcstring history_session_id(const environment_t &vars) {
         } else if (valid_var_name(session_id)) {
             result = session_id;
         } else {
-            debug(0,
+            FLOGF(error,
                   _(L"History session ID '%ls' is not a valid variable name. "
                     L"Falling back to `%ls`."),
                   session_id.c_str(), result.c_str());

From c8487871072625bc5e62424c2862401c307fdc5d Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 May 2019 22:03:03 +0800
Subject: [PATCH 0614/1732] add extra test for wcsfilecmp

Test changes added for #5634 in 6e525cc5d94.
---
 src/fish_tests.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3c99e2c56..39fdfe4d0 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1208,6 +1208,7 @@ static struct wcsfilecmp_test {
                         {L"a0", L"a00", -1},
                         {L"a00b", L"a0b", -1},
                         {L"a0b", L"a00b", 1},
+                        {L"a-b", L"azb", 1},
                         {NULL, NULL, 0}};
 
 /// Verify the behavior of the `wcsfilecmp()` function.

From b5cf9e52ca437f8203bca59359383c9270821131 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 May 2019 22:04:31 +0800
Subject: [PATCH 0615/1732] wcsfilecmp: be clearer about sorting "-" after
 letters

---
 src/util.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index 0b1080cbb..3503d7bab 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -62,8 +62,9 @@ int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
 
         wint_t al = towupper(*a);
         wint_t bl = towupper(*b);
-        if (al == L'-') al += 48;
-        if (bl == L'-') bl += 48;
+        // Sort dashes after Z - see #5634
+        if (al == L'-') al = L'[';
+        if (bl == L'-') bl = L'[';
 
         if (al < bl) {
             retval = -1;

From 7fe93c75186826a932954a9bf208f0aed5dc545b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 May 2019 23:20:20 +0800
Subject: [PATCH 0616/1732] src/expand: update comment for fallthrough to GCC
 standard

As suggested in https://github.com/fish-shell/fish-shell/commit/75db3b4ff488fb14c4fbd5bfccddfd328cd192f1#r33153119
---
 src/expand.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index a9d155260..34cd63edf 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -885,8 +885,9 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completio
             case 0:
                 append_completion(out, std::move(input));
                 break;
-            case 1: /* fallthroughs intentional */
+            case 1:
                 append_cmdsub_error(errors, start, L"Command substitutions not allowed");
+               /* intentionally falls through */
             case -1:
             default:
                 return expand_result_t::error;

From 1e9ec8739b81519243ca9826f078c02a2a5c8a26 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 28 May 2019 22:23:42 +0200
Subject: [PATCH 0617/1732] CHANGELOG: Clarify message about parser errors, fix
 commit

3e055f does not exist. I'm assuming it's
b2a1da602f79878f4b0adc4881216c928a542608.

Unfortunately, I'm not entirely sure what kind of parser errors
weren't propagated, so this note isn't all that useful.

[ci skip]
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 351b5ab3a..704bc5eda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 - $PATH is no longer reordered in child fishes (#5456).
 - `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
-- An issue resulting in a certain class of parser errors not resulting in a non-zero `$status` has been corrected (3e055f).
+- Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
 - fish now underlines every valid entered path instead of just the last one.
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
 

From 7086ba43c8c2ce43cbe00df231c7f5814cab9997 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 28 May 2019 22:27:37 +0200
Subject: [PATCH 0618/1732] CHANGELOG: Arbitrarily reorder notable fixes

This is roughly in order of importance.

Buffering is really quite nice, $pipestatus is a new thing, $PATH was
a big hubhub, people seem to like eval...

[ci skip]
---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 704bc5eda..da6de45f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,17 +4,17 @@
 - The vcs-prompt functions have been renamed to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
 
 ## Notable Fixes and improvements
-- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
-- Add `$pipestatus` support
-- macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 - fish no longer requires buffering for the last function in a pipeline.
-- cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
-- Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
+- Add `$pipestatus` support
 - $PATH is no longer reordered in child fishes (#5456).
 - `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
-- Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
+- macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
+- cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
+- Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 - fish now underlines every valid entered path instead of just the last one.
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
+- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
+- Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).

From 7c1a40fe8660d32ef9d21d5d4b6b915a445be272 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 28 May 2019 22:39:47 +0200
Subject: [PATCH 0619/1732] flog: Use wide literals with wide chars

This solves the main part of (careful linebreak)
issue #5900.

I'm betting all the errors that do use narrow IO are broken, including
a bunch of asserts.
---
 src/flog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/flog.cpp b/src/flog.cpp
index 9a9bfa3e1..b033ac0a5 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -43,9 +43,9 @@ void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) {
     va_list va;
     va_start(va, fmt);
     log1(cat.name);
-    log1(": ");
+    log1(L": ");
     std::vfwprintf(file_, fmt, va);
-    log1('\n');
+    log1(L'\n');
     va_end(va);
 }
 

From 6d66c47f70ccf66e5604a65b5be3df3a8ef0474f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 28 May 2019 22:43:37 +0200
Subject: [PATCH 0620/1732] completions/fish: Add FLOG additions

[ci skip]
---
 share/completions/fish.fish | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/completions/fish.fish b/share/completions/fish.fish
index 8f5680fee..603aadfe2 100644
--- a/share/completions/fish.fish
+++ b/share/completions/fish.fish
@@ -11,7 +11,8 @@ complete -c fish -s d -l debug-level -d "Specify verbosity level" -x -a "0\t'War
 2\t'Basic debug output'
 3\t'More debug output'
 4\t'Much more debug output'
-5\t'Too much debug output'"
+5\t'Too much debug output'
+(fish --print-debug-categories | string replace ' ' \t)"
 complete -c fish -s D -l debug-stack-frames -d "Show specified # of frames with debug output" -x -a "(seq 128)\t\n"
 complete -c fish -s P -l private -d "Do not persist history"
 
@@ -22,5 +23,6 @@ function __fish_complete_features
 end
 complete -c fish -s f -l features -d "Run with comma-separated feature flags enabled" -a "(__fish_complete_features)" -x
 complete -c fish -l print-rusage-self -d "Print stats from getrusage at exit" -f
+complete -c fish -l print-debug-categories -d "Print the debug categories fish knows" -f
 
-complete -c fish -x -a "(__fish_complete_suffix .fish)"
\ No newline at end of file
+complete -c fish -x -a "(__fish_complete_suffix .fish)"

From 32949eefbe54d145ae6ef063cdf0f053051ec754 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 28 May 2019 23:08:35 +0200
Subject: [PATCH 0621/1732] src/exec: Use wide IO for FLOG

Another step towards #5900.
---
 src/exec.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index a9dbc1d43..c988ea52c 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -614,20 +614,20 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         if (write_loop(STDOUT_FILENO, outbuff.data(), outbuff.size()) < 0) {
             if (errno != EPIPE) {
                 did_err = true;
-                FLOG(error, "Error while writing to stdout");
+                FLOG(error, L"Error while writing to stdout");
                 wperror(L"write_loop");
             }
         }
         if (write_loop(STDERR_FILENO, errbuff.data(), errbuff.size()) < 0) {
             if (errno != EPIPE && !did_err) {
                 did_err = true;
-                FLOG(error, "Error while writing to stderr");
+                FLOG(error, L"Error while writing to stderr");
                 wperror(L"write_loop");
             }
         }
         if (did_err) {
             redirect_tty_output();  // workaround glibc bug
-            FLOG(error, "!builtin_io_done and errno != EPIPE");
+            FLOG(error, L"!builtin_io_done and errno != EPIPE");
             show_stackframe(L'E');
         }
         // Clear the buffers to indicate we finished.
@@ -1097,7 +1097,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         }
     }
 
-    FLOG(exec_job_exec, "Executed job", j->job_id, "from command", j->command_wcstr(), "with pgrp",
+    FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id, j->command_wcstr(),
          j->pgid);
 
     j->set_flag(job_flag_t::CONSTRUCTED, true);

From 66e238fad09a41899be7aee1f0b99421acbc8259 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 08:07:04 +0200
Subject: [PATCH 0622/1732] More wide IO for FLOG

This widens the remaining ones that don't take a char
anywhere.

The rest either use a char _variable_ or __FUNCTION__, which from my
reading is narrow and needs to be widened manually. I've been unable
to test it, though.

See #5900.
---
 src/parse_execution.cpp | 2 +-
 src/proc.cpp            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 54997eca1..8d338b66f 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -636,7 +636,7 @@ parse_execution_result_t parse_execution_context_t::report_errors(
     const parse_error_list_t &error_list) const {
     if (!parser->cancellation_requested) {
         if (error_list.empty()) {
-            FLOG(error, "Error reported but no error text found.");
+            FLOG(error, L"Error reported but no error text found.");
         }
 
         // Get a backtrace.
diff --git a/src/proc.cpp b/src/proc.cpp
index b5165cba4..a9615f93a 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -686,7 +686,7 @@ void proc_update_jiffies(parser_t &parser) {
 // restoring a previously-stopped job, in which case we need to restore terminal attributes.
 bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
     if (j->pgid == 0) {
-        FLOG(proc_termowner, "terminal_give_to_job() returning early due to no process group");
+        FLOG(proc_termowner, L"terminal_give_to_job() returning early due to no process group");
         return true;
     }
 
@@ -717,7 +717,7 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
         // guarantee the process isn't going to exit while we wait (which would cause us to possibly
         // block indefinitely).
         while (tcsetpgrp(STDIN_FILENO, j->pgid) != 0) {
-            FLOGF(proc_termowner, "tcsetpgrp failed: %d", errno);
+            FLOGF(proc_termowner, L"tcsetpgrp failed: %d", errno);
 
             bool pgroup_terminated = false;
             // No need to test for EINTR as we are blocking signals

From d0921489ee755ccb1bd4fa906c6d39b3db5c9bc6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 10:36:14 +0200
Subject: [PATCH 0623/1732] fish_git_prompt: Fix changing
 show_informative_status

If you changed $__fish_git_prompt_show_informative_status, it
triggered a variable handler, which erased the chars, but neglected to
unset $___fish_git_prompt_init, so we just kept chugging along with
empty characters.

What's the hardest thing in CS again? Cache something something?

[ci skip]
---
 share/functions/fish_git_prompt.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index cf3623bfa..16b4e4a48 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -802,6 +802,8 @@ function __fish_git_prompt_repaint $varargs --description "Event handler, repain
             for name in cleanstate dirtystate invalidstate stagedstate stashstate stateseparator untrackedfiles upstream_ahead upstream_behind
                 set -e ___fish_git_prompt_char_$name
             end
+            # Clear init so we reset the chars next time.
+            set -e ___fish_git_prompt_init
         end
 
         commandline -f repaint 2>/dev/null

From 97507a24a232ed7b35b8c962bdbba89259c01ed0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 11:01:45 +0200
Subject: [PATCH 0624/1732] Increase default read limit to 100MiB

Someone has hit the 10MiB limit (and of course it's the number of
javascript packages), and we don't handle it fantastically currently.

And even though you can't pass a variable of that size in one go, it's
plausible that someone might do it in multiple passes.

See #5267.
---
 CHANGELOG.md                 | 1 +
 sphinx_doc_src/cmds/read.rst | 2 +-
 sphinx_doc_src/index.rst     | 2 +-
 src/env_dispatch.cpp         | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da6de45f8..9ff27e18d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
 - `test` (aka `[`) now prints a stacktrace on error, making the offending call easier to find (#5771).
+- The default read limit has been increased to 100MiB (#5267).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index d4f77b94d..f1edeaf2d 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -70,7 +70,7 @@ 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 10 MiB (1048576 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.
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index a68edaa78..b33f3846b 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -745,7 +745,7 @@ The exit status of the last run command substitution is available in the `status
 
 Only part of the output can be used, see `index range expansion <#expand-index-range>`_ for details.
 
-Fish has a default limit of 10 MiB on the amount of data a command substitution can output. If the limit is exceeded the entire command, not just the substitution, is failed and ``$status`` is set to 122. You can modify the limit by setting the ``fish_read_limit`` variable at any time including in the environment before fish starts running. If you set it to zero then no limit is imposed. This is a safety mechanism to keep the shell from consuming too much memory if a command outputs an unreasonable amount of data. Note that this limit also affects how much data the ``read`` command will process.
+Fish has a default limit of 100 MiB on the amount of data a command substitution can output. If the limit is exceeded the entire command, not just the substitution, is failed and ``$status`` is set to 122. You can modify the limit by setting the ``fish_read_limit`` variable at any time including in the environment before fish starts running. If you set it to zero then no limit is imposed. This is a safety mechanism to keep the shell from consuming too much memory if a command outputs an unreasonable amount of data, typically your operating system also has a limit, and it's often much lower. Note that this limit also affects how much data the ``read`` command will process.
 
 Examples::
 
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index c472ae2ad..aba29700e 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -531,6 +531,6 @@ bool term_supports_setting_title() { return can_set_term_title; }
 /// Miscellaneous variables.
 bool g_use_posix_spawn = false;
 
-// Limit `read` to 10 MiB (bytes not wide chars) by default. This can be overridden by the
+// Limit `read` to 100 MiB (bytes not wide chars) by default. This can be overridden by the
 // fish_read_limit variable.
-size_t read_byte_limit = 10 * 1024 * 1024;
+size_t read_byte_limit = 100 * 1024 * 1024;

From 78d015bd61724e942493aa2e1a40897482696d0d Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 29 May 2019 23:14:19 +0800
Subject: [PATCH 0625/1732] string: add tests for empty capture groups

As seen in #5201.
---
 tests/string.err | 3 +++
 tests/string.in  | 4 ++++
 tests/string.out | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/tests/string.err b/tests/string.err
index d291768ce..478007e2d 100644
--- a/tests/string.err
+++ b/tests/string.err
@@ -176,6 +176,9 @@
 ####################
 # string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
 
+####################
+# string match -r with empty capture groups
+
 ####################
 # string match -r "[" "a[sd"
 string match: Regular expression compile error: missing terminating ] for character class
diff --git a/tests/string.in b/tests/string.in
index e15f33ee5..7bb386d0e 100644
--- a/tests/string.in
+++ b/tests/string.in
@@ -203,6 +203,10 @@ or echo Unexpected exit status at line (status --current-line-number)
 string replace --regex -f "Z" X 1bc axc 2 d3f jk4 xyz
 and echo Unexpected exit status at line (status --current-line-number)
 
+# From https://github.com/fish-shell/fish-shell/issues/5201
+logmsg 'string match -r with empty capture groups'
+string match -r '^([ugoa]*)([=+-]?)([rwx]*)$' '=r'
+
 # test some failure cases
 logmsg 'string match -r "[" "a[sd"'
 string match -r "[" "a[sd"; and echo "unexpected exit 0"
diff --git a/tests/string.out b/tests/string.out
index 2fdec3025..bdd0cb568 100644
--- a/tests/string.out
+++ b/tests/string.out
@@ -274,6 +274,13 @@ X
 dXf
 jkX
 
+####################
+# string match -r with empty capture groups
+=r
+
+=
+r
+
 ####################
 # string match -r "[" "a[sd"
 

From e895cef2451318534ce156131d4d8fe169d51345 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:23:56 +0200
Subject: [PATCH 0626/1732] tinyexpr: Correct pi type

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

diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index f54b38d0f..c0a492c68 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -72,7 +72,6 @@ typedef struct te_expr {
     te_expr *parameters[];
 } te_expr;
 
-// TODO: Rename since variables have been removed.
 typedef struct te_builtin {
     const char *name;
     const void *address;
@@ -185,7 +184,7 @@ static const te_builtin functions[] = {
     {"log10", (const void *)(te_fun1)log10, TE_FUNCTION1},
     {"ncr", (const void *)(te_fun2)ncr, TE_FUNCTION2},
     {"npr", (const void *)(te_fun2)npr, TE_FUNCTION2},
-    {"pi", (const void *)(te_fun1)pi, TE_FUNCTION0},
+    {"pi", (const void *)(te_fun0)pi, TE_FUNCTION0},
     {"pow", (const void *)(te_fun2)pow, TE_FUNCTION2},
     {"round", (const void *)(te_fun1)round, TE_FUNCTION1},
     {"sin", (const void *)(te_fun1)sin, TE_FUNCTION1},

From a5b633d3a5ec69fef38098518045e958a051215c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:24:40 +0200
Subject: [PATCH 0627/1732] env: Correct type

We'd be comparing "int" and "mode_t", and "mode_t" might be unsigned.

Found via GCC warning.
---
 src/env.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/env.cpp b/src/env.cpp
index 9ea544d6a..12ab94fb8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -658,7 +658,7 @@ maybe_t<env_var_t> env_scoped_impl_t::try_get_computed(const wcstring &key) cons
         // note umask() is an absurd API: you call it to set the value and it returns the old
         // value. Thus we have to call it twice, to reset the value. The env_lock protects
         // against races. Guess what the umask is; if we guess right we don't need to reset it.
-        int guess = 022;
+        mode_t guess = 022;
         mode_t res = umask(guess);
         if (res != guess) umask(res);
         return env_var_t(L"umask", format_string(L"0%0.3o", res));

From 364bc3fd630721f1d2fb4670b869fb06b114a5d3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:26:02 +0200
Subject: [PATCH 0628/1732] test: Fix return type

This just returns a success signifier, not an error code.
---
 src/builtin_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 928d797d8..1e0245f8b 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -626,7 +626,7 @@ bool combining_expression::evaluate(wcstring_list_t &errors) {
     }
 
     errors.push_back(format_string(L"Unknown token type in %s", __func__));
-    return STATUS_INVALID_ARGS;
+    return false;
 }
 
 bool parenthetical_expression::evaluate(wcstring_list_t &errors) {

From 4a6a354675ea0165a890c04a8f74e969bbb26598 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:27:03 +0200
Subject: [PATCH 0629/1732] Placate compiler warnings

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

diff --git a/src/expand.cpp b/src/expand.cpp
index 34cd63edf..7b4e63076 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -214,7 +214,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             // If only the beginning is negative, always go reverse.
             // If only the end, always go forward.
             // Prevents `[x..-1]` from going reverse if less than x elements are there.
-            if (tmp1 > -1 != tmp > -1) {
+            if ((tmp1 > -1) != (tmp > -1)) {
                 direction = tmp1 > -1 ? -1 : 1;
             } else {
                 // Clamp to array size when not forcing direction

From 39099ceb10834dd0646f09f93f33322bbd8e16ed Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:36:01 +0200
Subject: [PATCH 0630/1732] Remove R_BEGIN_INPUT_FUNCTIONS

The enum starts at 0 (defined to be!), so we can eliminate this one.

That allows us to remove a reliance on the position of
beginning_of_line, and it would trigger a "type-limits" warning.

Also leave a comment because I actually hit that.
---
 src/input.cpp      | 7 +++----
 src/input_common.h | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index e9fb2b5cd..cb151ce7b 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -63,7 +63,7 @@ struct terminfo_mapping_t {
     const char *seq;      // character sequence generated on keypress
 };
 
-static constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS - R_BEGIN_INPUT_FUNCTIONS;
+static constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS;
 
 /// Input function metadata. This list should be kept in sync with the key code list in
 /// input_common.h.
@@ -140,9 +140,8 @@ static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0
               "input_function_metadata?");
 
 wcstring describe_char(wint_t c) {
-    if (c >= R_BEGIN_INPUT_FUNCTIONS && c < R_END_INPUT_FUNCTIONS) {
-        size_t idx = c - R_BEGIN_INPUT_FUNCTIONS;
-        return format_string(L"%02x (%ls)", c, input_function_metadata[idx].name);
+    if (c < R_END_INPUT_FUNCTIONS) {
+        return format_string(L"%02x (%ls)", c, input_function_metadata[c].name);
     }
     return format_string(L"%02x", c);
 }
diff --git a/src/input_common.h b/src/input_common.h
index 62a31d72a..2f00c7148 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -67,12 +67,12 @@ enum class readline_cmd_t {
     expand_abbr,
     cancel,
     repeat_jump,
-    reverse_repeat_jump,
+    // NOTE: This one has to be last.
+    reverse_repeat_jump
 };
 
 // The range of key codes for inputrc-style keyboard functions.
 enum {
-    R_BEGIN_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::beginning_of_line),
     R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::reverse_repeat_jump) + 1
 };
 

From 1259b32ecc275540e747bb92c4265c7b5c3c4890 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:39:09 +0200
Subject: [PATCH 0631/1732] Mark some variables as unused

These triggered warnings.
---
 src/parse_execution.cpp | 1 +
 src/reader.cpp          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8d338b66f..e4e4921b7 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -184,6 +184,7 @@ bool parse_execution_context_t::should_cancel_execution(const block_t *block) co
 
 parse_execution_context_t::execution_cancellation_reason_t
 parse_execution_context_t::cancellation_reason(const block_t *block) const {
+    UNUSED(block);
     if (shell_is_exiting()) {
         return execution_cancellation_exit;
     }
diff --git a/src/reader.cpp b/src/reader.cpp
index 4a18a7220..8e870590c 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -150,6 +150,7 @@ namespace {
 /// Test if the given string contains error. Since this is the error detection for general purpose,
 /// there are no invalid strings, so this function always returns false.
 parser_test_error_bits_t default_test(parser_t &parser, const wcstring &b) {
+    UNUSED(parser);
     UNUSED(b);
     return 0;
 }

From 6617c4d79ed54c6f23c317623ef1ad39f4cc7ffa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:46:30 +0200
Subject: [PATCH 0632/1732] Use C++11 value-initialization instead of { 0 }

Removes a warning in GCC.
---
 src/wutil.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/wutil.cpp b/src/wutil.cpp
index df8a1e447..4e8d2762f 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -286,9 +286,7 @@ int make_fd_blocking(int fd) {
 
 int fd_check_is_remote(int fd) {
 #if defined(__linux__)
-    struct statfs buf {
-        0
-    };
+    struct statfs buf {};
     if (fstatfs(fd, &buf) < 0) {
         return -1;
     }

From 80afda08d5ff6eba3e18520266617c1a108964f4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:47:18 +0200
Subject: [PATCH 0633/1732] cmake: Enable -Wall -Wextra

Not -Werror, just the warnings themselves.

Let's just see what happens. It's warning-free on my system.

Worst case we disable it again, better case we refine the set.
---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 238046952..7ac5d16f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,11 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
 endif()
+# Enable a whole bunch of warnings, but turn off:
+# - implicit fallthrough because that does not recognize some cases where it's desired (and I *really* want this one!)
+# - comment because we use a bunch of those, and they're not really all that harmful.
+# - address, because that occurs for our mkostemp check (weak-linking requires us to compare `&mkostemp == nullptr`).
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wimplicit-fallthrough=0 -Wno-comment -Wno-address")
 
 # Disable exception handling.
 ADD_COMPILE_OPTIONS(-fno-exceptions)

From b574f3fb8f547daea634174ca3950c709bbd8043 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 20:53:50 +0200
Subject: [PATCH 0634/1732] Turn off implicit fallthrough harder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On Travis:

>g++: error: unrecognized command line option ‘-Wimplicit-fallthrough=0’
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ac5d16f6..78d4846e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 # - implicit fallthrough because that does not recognize some cases where it's desired (and I *really* want this one!)
 # - comment because we use a bunch of those, and they're not really all that harmful.
 # - address, because that occurs for our mkostemp check (weak-linking requires us to compare `&mkostemp == nullptr`).
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wimplicit-fallthrough=0 -Wno-comment -Wno-address")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-implicit-fallthrough -Wno-comment -Wno-address")
 
 # Disable exception handling.
 ADD_COMPILE_OPTIONS(-fno-exceptions)

From a75155fd71e831c814820737c77c0807bc8c2fea Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 21:09:55 +0200
Subject: [PATCH 0635/1732] Disable strict-aliasing warning

This blows up the output on travis, so it's *worse than useless*.
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78d4846e6..19b098b0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,8 @@ endif()
 # - implicit fallthrough because that does not recognize some cases where it's desired (and I *really* want this one!)
 # - comment because we use a bunch of those, and they're not really all that harmful.
 # - address, because that occurs for our mkostemp check (weak-linking requires us to compare `&mkostemp == nullptr`).
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-implicit-fallthrough -Wno-comment -Wno-address")
+# - strict-aliasing, because on old GCCs (*Travis*) those are triggered by maybe.h, so you get it every time it is included.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-implicit-fallthrough -Wno-comment -Wno-address -Wno-strict-aliasing")
 
 # Disable exception handling.
 ADD_COMPILE_OPTIONS(-fno-exceptions)

From 61292b0c6c464145f9c536d9699f6e15e0ad7836 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 21:11:08 +0200
Subject: [PATCH 0636/1732] fish_tests: Fix warnings

---
 src/fish_tests.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 39fdfe4d0..546772f8b 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1573,6 +1573,7 @@ struct pwd_environment_t : public environment_t {
 
     virtual maybe_t<env_var_t> get(const wcstring &key,
                                    env_mode_flags_t mode = ENV_DEFAULT) const override {
+        UNUSED(mode);
         if (key == L"PWD") {
             return env_var_t{wgetcwd(), 0};
         }
@@ -1583,7 +1584,7 @@ struct pwd_environment_t : public environment_t {
         return {};
     }
 
-    wcstring_list_t get_names(int flags) const override { return {L"PWD"}; }
+    wcstring_list_t get_names(int flags) const override { UNUSED(flags); return {L"PWD"}; }
 };
 
 /// Perform parameter expansion and test if the output equals the zero-terminated parameter list
@@ -2483,11 +2484,13 @@ static void test_complete() {
 
     struct test_complete_vars_t : environment_t {
         wcstring_list_t get_names(int flags) const override {
+            UNUSED(flags);
             return {L"Foo1", L"Foo2", L"Foo3", L"Bar1", L"Bar2", L"Bar3"};
         }
 
         maybe_t<env_var_t> get(const wcstring &key,
                                env_mode_flags_t mode = ENV_DEFAULT) const override {
+            UNUSED(mode);
             if (key == L"PWD") {
                 return env_var_t{wgetcwd(), 0};
             }
@@ -5010,6 +5013,7 @@ static void test_illegal_command_exit_code() {
     };
 
     int res = 0;
+    UNUSED(res);
     const io_chain_t empty_ios;
     parser_t &parser = parser_t::principal_parser();
 
@@ -5115,7 +5119,7 @@ void test_layout_cache() {
     for (size_t i = 0; i < layout_cache_t::prompt_cache_max_size; i++) {
         wcstring input = std::to_wstring(i);
         do_test(!seqs.find_prompt_layout(input));
-        seqs.add_prompt_layout(input, {i});
+        seqs.add_prompt_layout(input, {i, 0, 0});
         do_test(seqs.find_prompt_layout(input)->line_count == i);
     }
 
@@ -5125,7 +5129,7 @@ void test_layout_cache() {
             do_test(seqs.find_prompt_layout(std::to_wstring(i))->line_count == i);
     }
 
-    seqs.add_prompt_layout(L"whatever", {100});
+    seqs.add_prompt_layout(L"whatever", {100, 0, 0});
     do_test(!seqs.find_prompt_layout(std::to_wstring(expected_evictee)));
     do_test(seqs.find_prompt_layout(L"whatever")->line_count == 100);
 }

From f3ee6a99c394eff8ec16c11415b9b0e941b6f25b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 May 2019 09:38:45 -0700
Subject: [PATCH 0637/1732] Add some FLOG logging around internal processes

---
 src/common.h | 8 +++++---
 src/exec.cpp | 3 +++
 src/flog.h   | 2 ++
 src/proc.cpp | 9 +++++++++
 src/proc.h   | 8 ++++++++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/common.h b/src/common.h
index eadf02372..ae9950ac6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -495,14 +495,16 @@ inline wcstring to_string(long x) {
     return wcstring(buff);
 }
 
-inline wcstring to_string(int x) { return to_string(static_cast<long>(x)); }
-
-inline wcstring to_string(size_t x) {
+inline wcstring to_string(unsigned long long x) {
     wchar_t buff[64];
     format_ullong_safe(buff, x);
     return wcstring(buff);
 }
 
+inline wcstring to_string(int x) { return to_string(static_cast<long>(x)); }
+
+inline wcstring to_string(size_t x) { return to_string(static_cast<unsigned long long>(x)); }
+
 inline bool bool_from_string(const std::string &x) {
     if (x.empty()) return false;
     switch (x.front()) {
diff --git a/src/exec.cpp b/src/exec.cpp
index c988ea52c..a43b24829 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -369,6 +369,9 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
     p->internal_proc_ = std::make_shared<internal_proc_t>();
     f->internal_proc = p->internal_proc_;
 
+    FLOGF(proc_internal_proc, "Created internal proc %llu to write output for proc '%ls'",
+          p->internal_proc_->get_id(), p->argv0());
+
     // Resolve the IO chain.
     // Note it's important we do this even if we have no out or err data, because we may have been
     // asked to truncate a file (e.g. `echo -n '' > /tmp/truncateme.txt'). The open() in the dup2
diff --git a/src/flog.h b/src/flog.h
index 48b5728ba..3e7838d65 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -59,6 +59,8 @@ class category_list_t {
 
     category_t proc_termowner{L"proc-termowner", L"Terminal ownership events"};
 
+    category_t proc_internal_proc{L"proc-internal-proc", L"Internal (non-forked) process events"};
+
     category_t env_locale{L"env-locale", L"Changes to locale variables"};
 };
 
diff --git a/src/proc.cpp b/src/proc.cpp
index a9615f93a..b41c3247f 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -214,8 +214,17 @@ void internal_proc_t::mark_exited(proc_status_t status) {
     status_.store(status, std::memory_order_relaxed);
     exited_.store(true, std::memory_order_release);
     topic_monitor_t::principal().post(topic_t::internal_exit);
+    FLOG(proc_internal_proc, "Internal proc", internal_proc_id_, "exited with status",
+         status.status_value());
 }
 
+static int64_t next_proc_id() {
+    static std::atomic<uint64_t> s_next{};
+    return ++s_next;
+}
+
+internal_proc_t::internal_proc_t() : internal_proc_id_(next_proc_id()) {}
+
 static void mark_job_complete(const job_t *j) {
     for (auto &p : j->processes) {
         p->completed = 1;
diff --git a/src/proc.h b/src/proc.h
index eb12e5b92..cc52fc845 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -113,6 +113,10 @@ class proc_status_t {
 /// A structure representing a "process" internal to fish. This is backed by a pthread instead of a
 /// separate process.
 class internal_proc_t {
+    /// An identifier for internal processes.
+    /// This is used for logging purposes only.
+    const uint64_t internal_proc_id_;
+
     /// Whether the process has exited.
     std::atomic<bool> exited_{};
 
@@ -130,6 +134,10 @@ class internal_proc_t {
         assert(exited() && "Process is not exited");
         return status_.load(std::memory_order_relaxed);
     }
+
+    uint64_t get_id() const { return internal_proc_id_; }
+
+    internal_proc_t();
 };
 
 /// A structure representing a single fish process. Contains variables for tracking process state

From 0863c237b06b33b6d28b21303fd0221af58e786b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 May 2019 12:33:44 -0700
Subject: [PATCH 0638/1732] Make thread_id a visible thing

Every thread now has a non-recyclable thread id. This will be an aid in
debugging.
---
 src/common.cpp   | 16 ++++++----------
 src/iothread.cpp | 14 ++++++++++++++
 src/iothread.h   |  4 ++++
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index ccfc0764f..bd4fa8e3c 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -55,6 +55,7 @@
 #include "flog.h"
 #include "future_feature_flags.h"
 #include "global_safety.h"
+#include "iothread.h"
 #include "proc.h"
 #include "signal.h"
 #include "wildcard.h"
@@ -64,8 +65,6 @@ constexpr wint_t NOT_A_WCHAR = static_cast<wint_t>(WEOF);
 
 struct termios shell_modes;
 
-/// This allows us to determine if we're running on the main thread
-static std::atomic<size_t> thread_id{0};
 /// This allows us to notice when we've forked.
 static relaxed_atomic_bool_t is_forked_proc{false};
 /// This allows us to bypass the main thread checks
@@ -2279,10 +2278,10 @@ extern "C" {
 }
 
 void set_main_thread() {
-    // Just call is_main_thread() once to force increment of thread_id.
-    bool x = is_main_thread();
-    assert(x && "set_main_thread should be main thread");
-    (void)x;
+    // Just call thread_id() once to force increment of thread_id.
+    uint64_t tid = thread_id();
+    assert(tid == 1 && "main thread should have thread ID 1");
+    (void)tid;
 }
 
 void configure_thread_assertions_for_testing() { thread_asserts_cfg_for_testing = true; }
@@ -2310,10 +2309,7 @@ void restore_term_foreground_process_group() {
     }
 }
 
-bool is_main_thread() {
-    static thread_local int local_thread_id = thread_id++;
-    return local_thread_id == 0;
-}
+bool is_main_thread() { return thread_id() == 1; }
 
 void assert_is_main_thread(const char *who) {
     if (!is_main_thread() && !thread_asserts_cfg_for_testing) {
diff --git a/src/iothread.cpp b/src/iothread.cpp
index f206e776a..43854dcc8 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -357,6 +357,8 @@ bool make_pthread(pthread_t *result, void *(*func)(void *), void *param) {
 using void_func_t = std::function<void(void)>;
 
 static void *func_invoker(void *param) {
+    // Acquire a thread id for this thread.
+    (void)thread_id();
     void_func_t *vf = static_cast<void_func_t *>(param);
     (*vf)();
     delete vf;
@@ -373,3 +375,15 @@ bool make_pthread(pthread_t *result, void_func_t &&func) {
     delete vf;
     return false;
 }
+
+static uint64_t next_thread_id() {
+    // Note 0 is an invalid thread id.
+    static owning_lock<uint64_t> s_last_thread_id{};
+    auto tid = s_last_thread_id.acquire();
+    return ++*tid;
+}
+
+uint64_t thread_id() {
+    static thread_local uint64_t tl_tid = next_thread_id();
+    return tl_tid;
+}
diff --git a/src/iothread.h b/src/iothread.h
index 39d99e539..70a5a2c58 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -82,4 +82,8 @@ void iothread_perform_on_main(std::function<void(void)> &&func);
 bool make_pthread(pthread_t *result, void *(*func)(void *), void *param);
 bool make_pthread(pthread_t *result, std::function<void(void)> &&func);
 
+/// \returns a thread ID for this thread.
+/// Thread IDs are never repeated.
+uint64_t thread_id();
+
 #endif

From ee9e5d49966b20e827f5396fa18c52457611da1d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 May 2019 14:21:50 -0700
Subject: [PATCH 0639/1732] Allow disabling debug categories with leading -

This was always supposed to work but the string_prefixes_string call
had the wrong order.
---
 src/flog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flog.cpp b/src/flog.cpp
index b033ac0a5..4bf94aca8 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -78,7 +78,7 @@ void activate_flog_categories_by_pattern(const wcstring &inwc) {
     wcstring wc = inwc;
     std::replace(wc.begin(), wc.end(), L'_', L'-');
     for (const wcstring &s : split_string(wc, L',')) {
-        if (string_prefixes_string(s, L"-")) {
+        if (string_prefixes_string(L"-", s)) {
             apply_one_wildcard(s.substr(1), false);
         } else {
             apply_one_wildcard(s, true);

From 9d62d8e3fdd0d31abc3f88c7734ddab83ffc16c3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 11:48:11 +0200
Subject: [PATCH 0640/1732] Use FLOGF when formatting is needed

This passed a format string in a variable which is why it was
presumably overlooked.

[ci skip]
---
 src/env_universal_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 94d140caf..81b6185d8 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -1499,7 +1499,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
     if (mkfifo_status == -1 && errno != EEXIST) {
         const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to make a pipe for universal variables using '%ls': %s");
-        FLOG(error, errmsg, vars_path.c_str(), error);
+        FLOGF(error, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
         return;
     }
@@ -1508,7 +1508,7 @@ void universal_notifier_named_pipe_t::make_pipe(const wchar_t *test_path) {
     if (fd < 0) {
         const char *error = std::strerror(errno);
         const wchar_t *errmsg = _(L"Unable to open a pipe for universal variables using '%ls': %s");
-        FLOG(error, errmsg, vars_path.c_str(), error);
+        FLOGF(error, errmsg, vars_path.c_str(), error);
         pipe_fd = -1;
         return;
     }

From d73ee4d54b121dd9004cc4d42c3593801a81cafb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 11:54:09 +0200
Subject: [PATCH 0641/1732] More using FLOGF when formatting is needed

sed-patched, every time a "%" is used in a call to `FLOG`, we use
`FLOGF` instead.
---
 src/common.cpp               |  4 ++--
 src/complete.cpp             |  2 +-
 src/env.cpp                  |  4 ++--
 src/env_universal_common.cpp | 22 +++++++++++-----------
 src/exec.cpp                 |  2 +-
 src/expand.cpp               |  2 +-
 src/history.cpp              |  2 +-
 src/iothread.cpp             |  2 +-
 src/parse_execution.cpp      |  6 +++---
 src/parse_productions.cpp    |  6 +++---
 src/parse_tree.cpp           |  2 +-
 src/path.cpp                 | 10 +++++-----
 src/postfork.cpp             |  2 +-
 src/proc.cpp                 |  6 +++---
 src/sanity.cpp               |  4 ++--
 src/tokenizer.cpp            |  2 +-
 src/wutil.cpp                |  2 +-
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index bd4fa8e3c..825f84bfc 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2435,10 +2435,10 @@ void redirect_tty_output() {
 /// Display a failed assertion message, dump a stack trace if possible, then die.
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
     if (error) {
-        FLOG(error, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
+        FLOGF(error, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
              std::strerror(error));
     } else {
-        FLOG(error, L"%s:%zu: failed assertion: %s", file, line, msg);
+        FLOGF(error, L"%s:%zu: failed assertion: %s", file, line, msg);
     }
     show_stackframe(L'E', 99, 1);
     abort();
diff --git a/src/complete.cpp b/src/complete.cpp
index 750d9dbc6..78b2e88bf 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -906,7 +906,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         }
     };
 
-    // FLOG(error, L"\nThinking about looking up completions for %ls\n", cmd.c_str());
+    // FLOGF(error, L"\nThinking about looking up completions for %ls\n", cmd.c_str());
     bool head_exists = builtin_exists(cmd);
     // Only reload environment variables if builtin_exists returned false, as an optimization
     if (head_exists == false) {
diff --git a/src/env.cpp b/src/env.cpp
index 12ab94fb8..5ab4fdb4b 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -140,7 +140,7 @@ void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
         std::replace(newstrs.begin(), newstrs.end(), empty, wcstring(L"."));
         int retval = vars.set(var_name, ENV_DEFAULT | ENV_USER, std::move(newstrs));
         if (retval != ENV_OK) {
-            FLOG(error, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
+            FLOGF(error, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
         }
     }
 }
@@ -1353,7 +1353,7 @@ wcstring env_get_runtime_path() {
 
         if (!uname || check_runtime_path(tmpdir.c_str()) != 0) {
             FLOG(error, L"Runtime path not available.");
-            FLOG(error, L"Try deleting the directory %s and restarting fish.", tmpdir.c_str());
+            FLOGF(error, L"Try deleting the directory %s and restarting fish.", tmpdir.c_str());
             return result;
         }
 
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 81b6185d8..1790a990b 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -196,11 +196,11 @@ static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &
 
     // Append variable name like "fish_color_cwd".
     if (!valid_var_name(key_in)) {
-        FLOG(error, L"Illegal variable name: '%ls'", key_in.c_str());
+        FLOGF(error, L"Illegal variable name: '%ls'", key_in.c_str());
         success = false;
     }
     if (success && !append_utf8(key_in, result, storage)) {
-        FLOG(error, L"Could not convert %ls to narrow character string", key_in.c_str());
+        FLOGF(error, L"Could not convert %ls to narrow character string", key_in.c_str());
         success = false;
     }
 
@@ -211,7 +211,7 @@ static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &
 
     // Append value.
     if (success && !append_utf8(full_escape(val_in), result, storage)) {
-        FLOG(error, L"Could not convert %ls to narrow character string", val_in.c_str());
+        FLOGF(error, L"Could not convert %ls to narrow character string", val_in.c_str());
         success = false;
     }
 
@@ -448,7 +448,7 @@ bool env_universal_t::write_to_fd(int fd, const wcstring &path) {
     std::string contents = serialize_with_vars(vars);
     if (write_loop(fd, contents.data(), contents.size()) < 0) {
         const char *error = std::strerror(errno);
-        FLOG(error, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(),
+        FLOGF(error, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(),
              error);
         success = false;
     }
@@ -464,7 +464,7 @@ bool env_universal_t::move_new_vars_file_into_place(const wcstring &src, const w
     int ret = wrename(src, dst);
     if (ret != 0) {
         const char *error = std::strerror(errno);
-        FLOG(error, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
+        FLOGF(error, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
              error);
     }
     return ret == 0;
@@ -527,7 +527,7 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
 
     if (!success) {
         const char *error = std::strerror(saved_errno);
-        FLOG(error, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
+        FLOGF(error, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
     }
     return success;
 }
@@ -589,7 +589,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) {
             }
 #endif
             const char *error = std::strerror(errno);
-            FLOG(error, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(),
+            FLOGF(error, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(),
                  error);
             break;
         }
@@ -1061,7 +1061,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         int fd = shm_open(path, O_RDWR | O_CREAT, 0600);
         if (fd < 0) {
             const char *error = std::strerror(errno);
-            FLOG(error, _(L"Unable to open shared memory with path '%s': %s"), path, error);
+            FLOGF(error, _(L"Unable to open shared memory with path '%s': %s"), path, error);
             errored = true;
         }
 
@@ -1071,7 +1071,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
             struct stat buf = {};
             if (fstat(fd, &buf) < 0) {
                 const char *error = std::strerror(errno);
-                FLOG(error, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
+                FLOGF(error, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
                      error);
                 errored = true;
             }
@@ -1082,7 +1082,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         bool set_size = !errored && size < (off_t)sizeof(universal_notifier_shmem_t);
         if (set_size && ftruncate(fd, sizeof(universal_notifier_shmem_t)) < 0) {
             const char *error = std::strerror(errno);
-            FLOG(error, _(L"Unable to truncate shared memory object with path '%s': %s"), path,
+            FLOGF(error, _(L"Unable to truncate shared memory object with path '%s': %s"), path,
                  error);
             errored = true;
         }
@@ -1093,7 +1093,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
                               MAP_SHARED, fd, 0);
             if (addr == MAP_FAILED) {
                 const char *error = std::strerror(errno);
-                FLOG(error, _(L"Unable to memory map shared memory object with path '%s': %s"),
+                FLOGF(error, _(L"Unable to memory map shared memory object with path '%s': %s"),
                      path, error);
                 this->region = NULL;
             } else {
diff --git a/src/exec.cpp b/src/exec.cpp
index a43b24829..614850745 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -792,7 +792,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         const wcstring func_name = p->argv0();
         auto props = function_get_properties(func_name);
         if (!props) {
-            FLOG(error, _(L"Unknown function '%ls'"), p->argv0());
+            FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
             return false;
         }
 
diff --git a/src/expand.cpp b/src/expand.cpp
index 7b4e63076..cf206abbd 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -224,7 +224,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             }
             // debug( 0, L"Push range idx %d %d", i1, i2 );
             for (long jjj = i1; jjj * direction <= i2 * direction; jjj += direction) {
-                // FLOG(error, L"Expand range [subst]: %i\n", jjj);
+                // FLOGF(error, L"Expand range [subst]: %i\n", jjj);
                 idx.push_back(jjj);
             }
             continue;
diff --git a/src/history.cpp b/src/history.cpp
index b385790ba..a4b6cd84b 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1238,7 +1238,7 @@ bool history_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
             const history_item_t old_item = decode_item(*local_file, offset);
 
             if (old_item.empty() || deleted_items.count(old_item.str()) > 0) {
-                // FLOG(error, L"Item is deleted : %s\n", old_item.str().c_str());
+                // FLOGF(error, L"Item is deleted : %s\n", old_item.str().c_str());
                 continue;
             }
             // Add this old item.
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 43854dcc8..960e04a20 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -202,7 +202,7 @@ void iothread_service_completion() {
     } else if (wakeup_byte == IO_SERVICE_RESULT_QUEUE) {
         iothread_service_result_queue();
     } else {
-        FLOG(error, "Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
+        FLOGF(error, "Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
     }
 }
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index e4e4921b7..c35ae9006 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -360,7 +360,7 @@ parse_execution_result_t parse_execution_context_t::run_block_statement(
     } else if (auto header = bheader.try_get_child<g::begin_header, 0>()) {
         ret = run_begin_statement(contents);
     } else {
-        FLOG(error, L"Unexpected block header: %ls\n", bheader.node()->describe().c_str());
+        FLOGF(error, L"Unexpected block header: %ls\n", bheader.node()->describe().c_str());
         PARSER_DIE();
     }
     return ret;
@@ -1078,7 +1078,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
             break;
         }
         default: {
-            FLOG(error, L"'%ls' not handled by new parser yet.",
+            FLOGF(error, L"'%ls' not handled by new parser yet.",
                  specific_statement.describe().c_str());
             PARSER_DIE();
             break;
@@ -1382,7 +1382,7 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
     } else if (auto switchstat = statement.try_get_child<g::switch_statement, 0>()) {
         status = this->run_switch_statement(switchstat);
     } else {
-        FLOG(error, "Unexpected node %ls found in %s", statement.node()->describe().c_str(),
+        FLOGF(error, "Unexpected node %ls found in %s", statement.node()->describe().c_str(),
              __FUNCTION__);
         abort();
     }
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 5dc43aea1..91f3a9001 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -403,7 +403,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_token_type_oror:
         case parse_token_type_end:
         case parse_token_type_terminate: {
-            FLOG(error, "Terminal token type %ls passed to %s", token_type_description(node_type),
+            FLOGF(error, "Terminal token type %ls passed to %s", token_type_description(node_type),
                  __FUNCTION__);
             PARSER_DIE();
             break;
@@ -411,13 +411,13 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_special_type_parse_error:
         case parse_special_type_tokenizer_error:
         case parse_special_type_comment: {
-            FLOG(error, "Special type %ls passed to %s\n", token_type_description(node_type),
+            FLOGF(error, "Special type %ls passed to %s\n", token_type_description(node_type),
                  __FUNCTION__);
             PARSER_DIE();
             break;
         }
         case token_type_invalid: {
-            FLOG(error, "token_type_invalid passed to %s", __FUNCTION__);
+            FLOGF(error, "token_type_invalid passed to %s", __FUNCTION__);
             PARSER_DIE();
             break;
         }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 08aedba62..e05a9b9c2 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -257,7 +257,7 @@ static inline parse_token_type_t parse_token_type_from_tokenizer_token(
         case TOK_COMMENT:
             return parse_special_type_comment;
     }
-    FLOG(error, "Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
+    FLOGF(error, "Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
     DIE("bad token type");
     return token_type_invalid;
 }
diff --git a/src/path.cpp b/src/path.cpp
index 7e1f9ff16..6aa81b8b8 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -270,15 +270,15 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
 
     FLOG(error, custom_error_msg.c_str());
     if (path.empty()) {
-        FLOG(error, _(L"Unable to locate the %ls directory."), which_dir.c_str());
-        FLOG(error, _(L"Please set the %ls or HOME environment variable before starting fish."),
+        FLOGF(error, _(L"Unable to locate the %ls directory."), which_dir.c_str());
+        FLOGF(error, _(L"Please set the %ls or HOME environment variable before starting fish."),
              xdg_var.c_str());
     } else {
         const wchar_t *env_var = using_xdg ? xdg_var.c_str() : L"HOME";
-        FLOG(error, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."),
+        FLOGF(error, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."),
              which_dir.c_str(), env_var, path.c_str());
-        FLOG(error, _(L"The error was '%s'."), std::strerror(saved_errno));
-        FLOG(error, _(L"Please set $%ls to a directory where you have write access."), env_var);
+        FLOGF(error, _(L"The error was '%s'."), std::strerror(saved_errno));
+        FLOGF(error, _(L"Please set $%ls to a directory where you have write access."), env_var);
     }
     ignore_result(write(STDERR_FILENO, "\n", 1));
 }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index c8a4b2add..fd7205950 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -374,7 +374,7 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
             const char *err = safe_strerror(errno);
             debug_safe(0, "exec: %s", err);
 
-            // FLOG(error, L"The file '%ls' is marked as an executable but could not be run by the
+            // FLOGF(error, L"The file '%ls' is marked as an executable but could not be run by the
             // operating system.", p->actual_cmd);
             break;
         }
diff --git a/src/proc.cpp b/src/proc.cpp
index b41c3247f..80ca11705 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -923,7 +923,7 @@ void proc_sanity_check(const parser_t &parser) {
         // More than one foreground job?
         if (j->is_foreground() && !(j->is_stopped() || j->is_completed())) {
             if (fg_job) {
-                FLOG(error, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
+                FLOGF(error, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
                      fg_job->command_wcstr(), j->command_wcstr());
                 sanity_lose();
             }
@@ -937,13 +937,13 @@ void proc_sanity_check(const parser_t &parser) {
             validate_pointer(p->argv0(), _(L"Process name"), null_ok);
 
             if ((p->stopped & (~0x00000001)) != 0) {
-                FLOG(error, _(L"Job '%ls', process '%ls' has inconsistent state \'stopped\'=%d"),
+                FLOGF(error, _(L"Job '%ls', process '%ls' has inconsistent state \'stopped\'=%d"),
                      j->command_wcstr(), p->argv0(), p->stopped);
                 sanity_lose();
             }
 
             if ((p->completed & (~0x00000001)) != 0) {
-                FLOG(error, _(L"Job '%ls', process '%ls' has inconsistent state \'completed\'=%d"),
+                FLOGF(error, _(L"Job '%ls', process '%ls' has inconsistent state \'completed\'=%d"),
                      j->command_wcstr(), p->argv0(), p->completed);
                 sanity_lose();
             }
diff --git a/src/sanity.cpp b/src/sanity.cpp
index 4bc6b540c..f00dd143e 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -24,12 +24,12 @@ void sanity_lose() {
 void validate_pointer(const void *ptr, const wchar_t *err, int null_ok) {
     // Test if the pointer data crosses a segment boundary.
     if ((0x00000003l & (intptr_t)ptr) != 0) {
-        FLOG(error, _(L"The pointer '%ls' is invalid"), err);
+        FLOGF(error, _(L"The pointer '%ls' is invalid"), err);
         sanity_lose();
     }
 
     if ((!null_ok) && (ptr == 0)) {
-        FLOG(error, _(L"The pointer '%ls' is null"), err);
+        FLOGF(error, _(L"The pointer '%ls' is null"), err);
         sanity_lose();
     }
 }
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 0308d8f53..b33f0ba3d 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -243,7 +243,7 @@ tok_t tokenizer_t::read_string() {
         } else {
             msg.push_back(L'\n');
         }
-        FLOG(error, msg.c_str(), c, c, int(mode_begin), int(mode));
+        FLOGF(error, msg.c_str(), c, c, int(mode_begin), int(mode));
 #endif
 
         this->buff++;
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 4e8d2762f..90a731e65 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -131,7 +131,7 @@ const wcstring wgetcwd() {
         return str2wcstring(res);
     }
 
-    FLOG(error, _(L"getcwd() failed with errno %d/%s"), errno, std::strerror(errno));
+    FLOGF(error, _(L"getcwd() failed with errno %d/%s"), errno, std::strerror(errno));
     return wcstring();
 }
 

From 87971e1f2e595a945d835c271990c267e39ab182 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 13:04:40 +0200
Subject: [PATCH 0642/1732] Widen the rest of the FLOGs

Fixes #5900.
---
 src/common.cpp            | 18 +++++++++---------
 src/exec.cpp              |  2 +-
 src/iothread.cpp          |  2 +-
 src/parse_constants.h     |  2 +-
 src/parse_execution.cpp   |  2 +-
 src/parse_productions.cpp | 10 +++++-----
 src/parse_tree.cpp        |  2 +-
 src/proc.cpp              |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 825f84bfc..69cfb9638 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2124,7 +2124,7 @@ int create_directory(const wcstring &d) {
 
 [[gnu::noinline]] void bugreport() {
     FLOG(error, _(L"This is a bug. Break on 'bugreport' to debug."));
-    FLOG(error, _(L"If you can reproduce it, please report: "), PACKAGE_BUGREPORT, '.');
+    FLOG(error, _(L"If you can reproduce it, please report: "), PACKAGE_BUGREPORT, L'.');
 }
 
 wcstring format_size(long long sz) {
@@ -2313,24 +2313,24 @@ bool is_main_thread() { return thread_id() == 1; }
 
 void assert_is_main_thread(const char *who) {
     if (!is_main_thread() && !thread_asserts_cfg_for_testing) {
-        FLOGF(error, "%s called off of main thread.", who);
-        FLOGF(error, "Break on debug_thread_error to debug.");
+        FLOGF(error, L"%s called off of main thread.", who);
+        FLOGF(error, L"Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
 
 void assert_is_not_forked_child(const char *who) {
     if (is_forked_child()) {
-        FLOGF(error, "%s called in a forked child.", who);
-        FLOGF(error, "Break on debug_thread_error to debug.");
+        FLOGF(error, L"%s called in a forked child.", who);
+        FLOG(error, L"Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
 
 void assert_is_background_thread(const char *who) {
     if (is_main_thread() && !thread_asserts_cfg_for_testing) {
-        FLOGF(error, "%s called on the main thread (may block!).", who);
-        FLOGF(error, "Break on debug_thread_error to debug.");
+        FLOGF(error, L"%s called on the main thread (may block!).", who);
+        FLOG(error, L"Break on debug_thread_error to debug.");
         debug_thread_error();
     }
 }
@@ -2341,8 +2341,8 @@ void assert_is_locked(void *vmutex, const char *who, const char *caller) {
     // Note that std::mutex.try_lock() is allowed to return false when the mutex isn't
     // actually locked; fortunately we are checking the opposite so we're safe.
     if (mutex->try_lock()) {
-        FLOGF(error, "%s is not locked when it should be in '%s'", who, caller);
-        FLOGF(error, "Break on debug_thread_error to debug.");
+        FLOGF(error, L"%s is not locked when it should be in '%s'", who, caller);
+        FLOG(error, L"Break on debug_thread_error to debug.");
         debug_thread_error();
         mutex->unlock();
     }
diff --git a/src/exec.cpp b/src/exec.cpp
index 614850745..1eb57d4cf 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -369,7 +369,7 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
     p->internal_proc_ = std::make_shared<internal_proc_t>();
     f->internal_proc = p->internal_proc_;
 
-    FLOGF(proc_internal_proc, "Created internal proc %llu to write output for proc '%ls'",
+    FLOGF(proc_internal_proc, L"Created internal proc %llu to write output for proc '%ls'",
           p->internal_proc_->get_id(), p->argv0());
 
     // Resolve the IO chain.
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 960e04a20..fe0c05049 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -202,7 +202,7 @@ void iothread_service_completion() {
     } else if (wakeup_byte == IO_SERVICE_RESULT_QUEUE) {
         iothread_service_result_queue();
     } else {
-        FLOGF(error, "Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
+        FLOGF(error, L"Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
     }
 }
 
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 897c6fabf..724e69f77 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -8,7 +8,7 @@
 #define PARSE_ASSERT(a) assert(a)
 #define PARSER_DIE()                  \
     do {                              \
-        FLOG(error, "Parser dying!"); \
+        FLOG(error, L"Parser dying!"); \
         exit_without_destructors(-1); \
     } while (0)
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c35ae9006..f15c4048d 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1382,7 +1382,7 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
     } else if (auto switchstat = statement.try_get_child<g::switch_statement, 0>()) {
         status = this->run_switch_statement(switchstat);
     } else {
-        FLOGF(error, "Unexpected node %ls found in %s", statement.node()->describe().c_str(),
+        FLOGF(error, L"Unexpected node %ls found in %s", statement.node()->describe().c_str(),
              __FUNCTION__);
         abort();
     }
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 91f3a9001..962ddc4a6 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -378,7 +378,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
                                                                     const parse_token_t &input2,
                                                                     parse_node_tag_t *out_tag) {
     // this is **extremely** chatty
-    debug(6, "Resolving production for %ls with input token <%ls>",
+    debug(6, L"Resolving production for %ls with input token <%ls>",
           token_type_description(node_type), input1.describe().c_str());
 
     // Fetch the function to resolve the list of productions.
@@ -403,7 +403,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_token_type_oror:
         case parse_token_type_end:
         case parse_token_type_terminate: {
-            FLOGF(error, "Terminal token type %ls passed to %s", token_type_description(node_type),
+            FLOGF(error, L"Terminal token type %ls passed to %s", token_type_description(node_type),
                  __FUNCTION__);
             PARSER_DIE();
             break;
@@ -411,13 +411,13 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_special_type_parse_error:
         case parse_special_type_tokenizer_error:
         case parse_special_type_comment: {
-            FLOGF(error, "Special type %ls passed to %s\n", token_type_description(node_type),
+            FLOGF(error, L"Special type %ls passed to %s\n", token_type_description(node_type),
                  __FUNCTION__);
             PARSER_DIE();
             break;
         }
         case token_type_invalid: {
-            FLOGF(error, "token_type_invalid passed to %s", __FUNCTION__);
+            FLOGF(error, L"token_type_invalid passed to %s", __FUNCTION__);
             PARSER_DIE();
             break;
         }
@@ -426,7 +426,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
 
     const production_element_t *result = resolver(input1, input2, out_tag);
     if (result == NULL) {
-        debug(5, "Node type '%ls' has no production for input '%ls' (in %s)",
+        debug(5, L"Node type '%ls' has no production for input '%ls' (in %s)",
               token_type_description(node_type), input1.describe().c_str(), __FUNCTION__);
     }
 
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index e05a9b9c2..743a80509 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -257,7 +257,7 @@ static inline parse_token_type_t parse_token_type_from_tokenizer_token(
         case TOK_COMMENT:
             return parse_special_type_comment;
     }
-    FLOGF(error, "Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
+    FLOGF(error, L"Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
     DIE("bad token type");
     return token_type_invalid;
 }
diff --git a/src/proc.cpp b/src/proc.cpp
index 80ca11705..dd827d7a8 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -214,7 +214,7 @@ void internal_proc_t::mark_exited(proc_status_t status) {
     status_.store(status, std::memory_order_relaxed);
     exited_.store(true, std::memory_order_release);
     topic_monitor_t::principal().post(topic_t::internal_exit);
-    FLOG(proc_internal_proc, "Internal proc", internal_proc_id_, "exited with status",
+    FLOG(proc_internal_proc, L"Internal proc", internal_proc_id_, L"exited with status",
          status.status_value());
 }
 

From d28e8fb7def49f5d91a8c236654384892e01f268 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 18:47:50 +0200
Subject: [PATCH 0643/1732] ISSUE_TEMPLATE: Remove regression question

3.x has changed enough that knowing whether it's working in 2.7.x
doesn't help all that much anymore.

There've been 3222 commits since 2.7.1, which is about a third of the
commits to fish *total*.

[ci skip]
---
 .github/ISSUE_TEMPLATE.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6b42e39e1..03b2b48a7 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -11,7 +11,4 @@ Please tell us if you tried fish without third-party customizations by executing
   sh -c 'env HOME=$(mktemp -d) fish'
 
 Tell us how to reproduce the problem. Including an asciinema.org recording is useful for problems that involve the visual display of fish output such as its prompt.
-
-If you are reporting a bug in fish 3.0, please make sure to indicate whether or not this is a
-regression from fish 2.7.1.
 -->

From 4ebb6cf39eefbf4eedda7a12927c17fb1f2aef43 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 19:12:49 +0200
Subject: [PATCH 0644/1732] complete: Add "--force-files"

This allows a completion to specify that *it* takes files.

Useful for things like `sudo -e`, because sudo usually doesn't take
any files.
---
 sphinx_doc_src/cmds/complete.rst |  7 +++++--
 src/builtin_complete.cpp         | 11 ++++++++++-
 src/complete.cpp                 | 11 ++++++++---
 src/complete.h                   |  1 +
 tests/complete.in                |  5 +++++
 tests/complete.out               |  1 +
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index ebfda2d07..09a402987 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -16,6 +16,7 @@ Synopsis
           [( -a | --arguments ) OPTION_ARGUMENTS]
           [( -k | --keep-order )]
           [( -f | --no-files )]
+          [( -F | --force-files )]
           [( -r | --require-parameter )]
           [( -x | --exclusive )]
           [( -w | --wraps ) WRAPPED_COMMAND]...
@@ -56,9 +57,11 @@ the fish manual.
 
 - ``-k`` or ``--keep-order`` preserves the order of the ``OPTION_ARGUMENTS`` specified via ``-a`` or ``--arguments`` instead of sorting alphabetically. Multiple ``complete`` calls with ``-k`` result in arguments of the later ones displayed first.
 
-- ``-f`` or ``--no-files`` specifies that the options specified by this completion may not be followed by a filename.
+- ``-f`` or ``--no-files`` says that the options specified by this completion may not be followed by a filename.
 
-- ``-r`` or ``--require-parameter`` specifies that the options specified by this completion always must have an option argument, i.e. may not be followed by another option.
+- ``-F`` or ``--force-files`` says that the options specified by this completion may be followed by a filename, even if another applicable ``complete`` specified ``--no-files``.
+
+- ``-r`` or ``--require-parameter`` says that the options specified by this completion must have an option argument, i.e. may not be followed by another option.
 
 - ``-x`` or ``--exclusive`` implies both ``-r`` and ``-f``.
 
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 5b2fd4d8b..e17f1e34e 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -126,9 +126,10 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wcstring_list_t wrap_targets;
     bool preserve_order = false;
 
-    static const wchar_t *const short_options = L":a:c:p:s:l:o:d:frxeuAn:C::w:hk";
+    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[] = {{L"exclusive", no_argument, NULL, 'x'},
                                                   {L"no-files", no_argument, NULL, 'f'},
+                                                  {L"force-files", no_argument, NULL, 'F'},
                                                   {L"require-parameter", no_argument, NULL, 'r'},
                                                   {L"path", required_argument, NULL, 'p'},
                                                   {L"command", required_argument, NULL, 'c'},
@@ -160,6 +161,9 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 result_mode.no_files = true;
                 break;
             }
+            case 'F': {
+                result_mode.force_files = true;
+            }
             case 'r': {
                 result_mode.requires_param = true;
                 break;
@@ -259,6 +263,11 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
     }
 
+    if (result_mode.no_files && result_mode.force_files) {
+        streams.err.append_format(BUILTIN_ERR_COMBO2, L"complete", L"'--no-files' and '--force-files'");
+        return STATUS_INVALID_ARGS;
+    }
+
     if (w.woptind != argc) {
         // Use one left-over arg as the do-complete argument
         // to enable `complete -C "git check"`.
diff --git a/src/complete.cpp b/src/complete.cpp
index 78b2e88bf..5af617fee 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -886,7 +886,7 @@ static void complete_load(const wcstring &name) {
 /// Insert results into comp_out. Return true to perform file completion, false to disable it.
 bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                                  const wcstring &str, bool use_switches) {
-    bool use_common = 1, use_files = 1;
+    bool use_common = true, use_files = true, has_force = false;
 
     wcstring cmd, path;
     parse_cmd_string(cmd_orig, &path, &cmd, vars);
@@ -955,6 +955,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                     if (arg != NULL && this->condition_test(o.condition)) {
                         if (o.result_mode.requires_param) use_common = false;
                         if (o.result_mode.no_files) use_files = false;
+                        if (o.result_mode.force_files) has_force = true;
                         complete_from_args(arg, o.comp, o.localized_desc(), o.flags);
                     }
                 }
@@ -971,6 +972,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                         old_style_match = true;
                         if (o.result_mode.requires_param) use_common = false;
                         if (o.result_mode.no_files) use_files = false;
+                        if (o.result_mode.force_files) has_force = true;
                         complete_from_args(str, o.comp, o.localized_desc(), o.flags);
                     }
                 }
@@ -989,6 +991,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                         if (param_match(&o, popt.c_str()) && this->condition_test(o.condition)) {
                             if (o.result_mode.requires_param) use_common = false;
                             if (o.result_mode.no_files) use_files = false;
+                            if (o.result_mode.force_files) has_force = true;
                             complete_from_args(str, o.comp, o.localized_desc(), o.flags);
                         }
                     }
@@ -1005,7 +1008,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
             // If this entry is for the base command, check if any of the arguments match.
             if (!this->condition_test(o.condition)) continue;
             if (o.option.empty()) {
-                use_files = use_files && ((o.result_mode.no_files) == 0);
+                use_files = use_files && (!(o.result_mode.no_files));
                 complete_from_args(str, o.comp, o.localized_desc(), o.flags);
             }
 
@@ -1067,7 +1070,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         }
     }
 
-    return use_files;
+    return has_force || use_files;
 }
 
 /// Perform generic (not command-specific) expansions on the specified string.
@@ -1628,6 +1631,8 @@ wcstring complete_print() {
                 modestr = L" --exclusive";
             } else if (o.result_mode.no_files) {
                 modestr = L" --no-files";
+            } else if (o.result_mode.force_files) {
+                modestr = L" --force-files";
             } else if (o.result_mode.requires_param) {
                 modestr = L" --require-parameter";
             }
diff --git a/src/complete.h b/src/complete.h
index f45888a25..90ad580d4 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -17,6 +17,7 @@
 struct completion_mode_t {
     /// If set, skip file completions.
     bool no_files{false};
+    bool force_files{false};
 
     /// If set, require a parameter after completion.
     bool requires_param{false};
diff --git a/tests/complete.in b/tests/complete.in
index 34bdc4ad9..9ebd88cbe 100644
--- a/tests/complete.in
+++ b/tests/complete.in
@@ -27,3 +27,8 @@ complete -C'myalias2 call3 '
 function t --wraps t; echo t; end
 complete -c t -fa '(t)'
 complete -C't '
+
+# Ensure file completion happens even though it was disabled above.
+complete -c t -l fileoption -rF
+# Only match this file because I don't want to touch this any time we add a test file.
+complete -C't --fileoption ' | string match complete.in
diff --git a/tests/complete.out b/tests/complete.out
index c604f659e..264fb6a71 100644
--- a/tests/complete.out
+++ b/tests/complete.out
@@ -13,3 +13,4 @@ arg2 call2
 complete_test_alpha1 arg1 call3 
 complete_test_alpha1 arg2 call3 
 t
+complete.in

From 430b2a48a92fc5611bf05cc350698d027a818687 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 19:14:33 +0200
Subject: [PATCH 0645/1732] completions/sudo: Fix `sudo -e`

This uses the new "--force-files" flag.

Fixes #5646.

[ci skip]
---
 share/completions/sudo.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index 710d557e2..fdbe253fc 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -47,7 +47,7 @@ complete -c sudo -n "__fish_sudo_no_subcommand" -s K -d "Remove the credential t
 complete -c sudo -n "__fish_sudo_no_subcommand" -s P -d "Preserve group vector"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s S -d "Read password from stdin"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s b -d "Run command in the background"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s e -r -d "Edit"
+complete -c sudo -n "__fish_sudo_no_subcommand" -s e -rF -d "Edit"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s g -a "(__fish_complete_groups)" -x -d "Run command as group"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s i -d "Run a login shell"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s k -d "Reset or ignore the credential timestamp"

From df6f3fdcf4bf43e46f4abbcc0291c0eb4d841972 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 19:16:28 +0200
Subject: [PATCH 0646/1732] completions/pacman: Fix `pacman -Qo`

(also yaourt)

[ci skip]
---
 share/completions/pacman.fish | 2 +-
 share/completions/yaourt.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 77cea0d00..fa0b08189 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -88,7 +88,7 @@ complete -c $progname -n $query -s e -l explicit -d 'List only explicitly instal
 complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present' -f
 complete -c $progname -n $query -s l -l list -d 'List all files owned by PACKAGE' -f
 complete -c $progname -n $query -s m -l foreign -d 'List all packages not in the database' -f
-complete -c $progname -n $query -s o -l owns -r -d 'Search for the package that owns FILE'
+complete -c $progname -n $query -s o -l owns -rF -d 'Search for the package that owns FILE'
 complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file, not package'
 complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages' -f
 complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' -f
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index e5a186cfb..b76de0e99 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -114,7 +114,7 @@ complete -c $progname -n $query -s e -l explicit -d 'List only explicitly instal
 complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present' -f
 complete -c $progname -n $query -s l -l list -d 'List all files owned by PACKAGE' -f
 complete -c $progname -n $query -s m -l foreign -d 'List all packages not in the database' -f
-complete -c $progname -n $query -s o -l owns -r -d 'Search for the package that owns FILE'
+complete -c $progname -n $query -s o -l owns -rF -d 'Search for the package that owns FILE'
 complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file, not package'
 complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages' -f
 complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' -f

From 77be5b05c6e9953911df4efb5383369283524ff8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 19:18:23 +0200
Subject: [PATCH 0647/1732] CHANGELOG `complete -F`

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ff27e18d..7a36efb66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - `count` now also counts lines fed on stdin (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
+- `complete` gained a new `--force-files` (short `-F`) switch to reenable file completions. This allows `sudo -E` and `pacman -Qo` to complete correctly (#5646).
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.

From cd2b1b99e8c0e9377ed4136fefdade86a11d3f83 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 19:27:41 +0200
Subject: [PATCH 0648/1732] completions/rpm: Complete files for `-qf`

Fixes #5127.

[ci skip]
---
 share/completions/rpm.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/rpm.fish b/share/completions/rpm.fish
index b7297b565..f4c6fe6a0 100644
--- a/share/completions/rpm.fish
+++ b/share/completions/rpm.fish
@@ -76,7 +76,7 @@ set rpm_select -c rpm -n "__fish_contains_opt -s q -s V query verify"
 
 complete $rpm_select -a "(__fish_print_packages)"
 complete $rpm_select -s a -l all -d 'Query all installed packages'
-complete $rpm_select -s f -l file -d 'Query package owning specified file' -r
+complete $rpm_select -s f -l file -d 'Query package owning specified file' -rF
 complete $rpm_select -l fileid -d 'Query package that contains a given file identifier, i.e. the MD5 digest of the file contents' -x
 complete $rpm_select -s g -l group -d 'Query packages with the specified group' -x
 complete $rpm_select -l hdrid -d 'Query package that contains a given header identifier, i.e. the SHA1 digest of the immutable header region' -x

From f9f30e6a8e1950317521cff5c782f88e9be1b7c8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 21:41:58 +0200
Subject: [PATCH 0649/1732] completions/rsync: Fix "=THING"

This included stuff like `--max-size=SIZE`. Weird that nobody noticed?

[ci skip]
---
 share/completions/rsync.fish | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/share/completions/rsync.fish b/share/completions/rsync.fish
index df6bc8b57..d270c0dfb 100644
--- a/share/completions/rsync.fish
+++ b/share/completions/rsync.fish
@@ -11,7 +11,7 @@ complete -c rsync -s r -l recursive -d "Recurse into directories"
 complete -c rsync -s R -l relative -d "Use relative path names"
 complete -c rsync -l no-implied-dirs -d "Don’t send implied dirs with --relative"
 complete -c rsync -s b -l backup -d "Make backups (see --suffix & --backup-dir)"
-complete -c rsync -l backup-dir -d "Make backups into hierarchy based in DIR"
+complete -c rsync -l backup-dir -xa '(__fish_complete_directories)' -d "Make backups into hierarchy based in DIR"
 complete -c rsync -l suffix -d "Backup suffix (default ~ w/o --backup-dir)"
 complete -c rsync -s u -l update -d "Skip files that are newer on the receiver"
 complete -c rsync -l inplace -d "Update destination files in-place"
@@ -56,33 +56,33 @@ complete -c rsync -l delete-after -d "Receiver deletes after transfer, not befor
 complete -c rsync -l delete-excluded -d "Also delete excluded files on receiver"
 complete -c rsync -l ignore-errors -d "Delete even if there are I/O errors"
 complete -c rsync -l force -d "Force deletion of dirs even if not empty"
-complete -c rsync -l max-delete=NUM -d "Don’t delete more than NUM files"
-complete -c rsync -l max-size=SIZE -d "Don’t transfer any file larger than SIZE"
-complete -c rsync -l min-size=SIZE -d "Don’t transfer any file smaller than SIZE"
+complete -c rsync -l max-delete -xa '(seq 0 10)' -d "Don’t delete more than NUM files"
+complete -c rsync -l max-size -xa '(seq 0 10){K,M,G}' -d "Don’t transfer any file larger than SIZE"
+complete -c rsync -l min-size -xa '(seq 0 10){K,M,G}' -d "Don’t transfer any file smaller than SIZE"
 complete -c rsync -l partial -d "Keep partially transferred files"
-complete -c rsync -l partial-dir=DIR -d "Put a partially transferred file into DIR"
+complete -c rsync -l partial-dir -xa '(__fish_complete_directories)' -d "Put a partially transferred file into DIR"
 complete -c rsync -l delay-updates -d "Put all updated files into place at end"
 complete -c rsync -s m -l prune-empty-dirs -d "Prune empty directory chains from file-list"
 complete -c rsync -l numeric-ids -d "Don’t map uid/gid values by user/group name"
 complete -c rsync -l timeout -d "Set I/O timeout in seconds"
 complete -c rsync -s I -l ignore-times -d "Don’t skip files that match size and time"
 complete -c rsync -l size-only -d "Skip files that match in size"
-complete -c rsync -l modify-window=NUM -d "Compare mod-times with reduced accuracy"
-complete -c rsync -s T -l temp-dir=DIR -d "Create temporary files in directory DIR"
+complete -c rsync -l modify-window -xa '(seq 0 10)' -d "Compare NUM mod-times with reduced accuracy"
+complete -c rsync -s T -l temp-dir -xa '(__fish_complete_directories)' -d "Create temporary files in directory DIR"
 complete -c rsync -s y -l fuzzy -d "Find similar file for basis if no dest file"
-complete -c rsync -l compare-dest -x -d "Also compare received files relative to DIR"
-complete -c rsync -l copy-dest -x -d "Also compare received files relative to DIR and include copies of unchanged files"
-complete -c rsync -l link-dest=DIR -d "Hardlink to files in DIR when unchanged"
+complete -c rsync -l compare-dest -xa '(__fish_complete_directories)' -d "Also compare received files relative to DIR"
+complete -c rsync -l copy-dest -xa '(__fish_complete_directories)' -d "Also compare received files relative to DIR and include copies of unchanged files"
+complete -c rsync -l link-dest -xa '(__fish_complete_directories)' -d "Hardlink to files in DIR when unchanged"
 complete -c rsync -s z -l compress -d "Compress file data during the transfer"
 complete -c rsync -l compress-level -d "Explicitly set compression level"
 complete -c rsync -s C -l cvs-exclude -d "Auto-ignore files in the same way CVS does"
 complete -c rsync -s f -l filter -d "Add a file-filtering RULE"
 complete -c rsync -s F -d "Same as --filter=’dir-merge /.rsync-filter’ repeated: --filter='- .rsync-filter'"
 complete -c rsync -l exclude -d "Exclude files matching PATTERN"
-complete -c rsync -l exclude-from -d "Read exclude patterns from FILE"
+complete -c rsync -l exclude-from -d "Read exclude patterns from FILE" -r
 complete -c rsync -l include -d "Don’t exclude files matching PATTERN"
-complete -c rsync -l include-from=FILE -d "Read include patterns from FILE"
-complete -c rsync -l files-from=FILE -d "Read list of source-file names from FILE"
+complete -c rsync -l include-from -r -d "Read include patterns from FILE"
+complete -c rsync -l files-from -r -d "Read list of source-file names from FILE"
 complete -c rsync -s 0 -l from0 -d "All *from/filter files are delimited by 0s"
 complete -c rsync -l address -d "Bind address for outgoing socket to daemon"
 complete -c rsync -l port -d "Specify double-colon alternate port number"

From b20bdcebfa7c9ffaec6ba36cdb57482228e0fbd9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 31 May 2019 09:31:11 -0700
Subject: [PATCH 0650/1732] FLOG narrow-string output to use fwprintf

This avoids mixing narrow and wide I/O on the same stream.
Extends the fix in #5900 by allowing narrow string literals again.
---
 src/flog.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/flog.cpp b/src/flog.cpp
index 4bf94aca8..89ef71bc0 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -34,10 +34,16 @@ logger_t::logger_t() : file_(stderr) {}
 owning_lock<logger_t> g_logger;
 
 void logger_t::log1(const wchar_t *s) { std::fputws(s, file_); }
-void logger_t::log1(const char *s) { std::fputs(s, file_); }
+
+void logger_t::log1(const char *s) {
+    // Note glibc prohibits mixing narrow and wide I/O, so always use wide-printing functions.
+    // See #5900.
+    std::fwprintf(file_, L"%s", s);
+}
 
 void logger_t::log1(wchar_t c) { std::fputwc(c, file_); }
-void logger_t::log1(char c) { std::fputc(c, file_); }
+
+void logger_t::log1(char c) { std::fwprintf(file_, L"%c", c); }
 
 void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) {
     va_list va;

From d920a618dead2f2ff8de3e759946436297fc121a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 May 2019 14:20:07 -0700
Subject: [PATCH 0651/1732] Add FLOG logging to the topic monitor

---
 src/flog.h            |  2 ++
 src/topic_monitor.cpp | 50 +++++++++++++++++++++++++++++++++++++++----
 src/topic_monitor.h   | 23 +-------------------
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index 3e7838d65..94c2a236c 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -62,6 +62,8 @@ class category_list_t {
     category_t proc_internal_proc{L"proc-internal-proc", L"Internal (non-forked) process events"};
 
     category_t env_locale{L"env-locale", L"Changes to locale variables"};
+
+    category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
 };
 
 /// The class responsible for logging.
diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index a948f75bc..70d05b6a7 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -1,9 +1,11 @@
 #include "config.h"  // IWYU pragma: keep
 
-#include "limits.h"
+#include "flog.h"
+#include "iothread.h"
 #include "topic_monitor.h"
 #include "wutil.h"
 
+#include <limits.h>
 #include <unistd.h>
 
 // Whoof. Thread Sanitizer swallows signals and replays them at its leisure, at the point where
@@ -69,13 +71,44 @@ void topic_monitor_t::post(topic_t topic) {
     // Ignore EAGAIN and other errors (which conceivably could occur during shutdown).
 }
 
+generation_list_t topic_monitor_t::updated_gens() {
+    auto current_gens = current_gen_.acquire();
+
+    // Atomically acquire the pending updates, swapping in 0.
+    // If there are no pending updates (likely), just return.
+    // Otherwise CAS in 0 and update our topics.
+    const auto relaxed = std::memory_order_relaxed;
+    topic_set_raw_t raw;
+    bool cas_success;
+    do {
+        raw = pending_updates_.load(relaxed);
+        if (raw == 0) return *current_gens;
+        cas_success = pending_updates_.compare_exchange_weak(raw, 0, relaxed, relaxed);
+    } while (!cas_success);
+
+    // Update the current generation with our topics and return it.
+    auto topics = topic_set_t::from_raw(raw);
+    for (topic_t topic : topic_iter_t{}) {
+        if (topics.get(topic)) {
+            current_gens->at(topic) += 1;
+            FLOG(topic_monitor, "Updating topic", (int)topic, "to", current_gens->at(topic));
+        }
+    }
+    return *current_gens;
+}
+
 void topic_monitor_t::await_metagen(generation_t mgen) {
     // Fast check of the metagen before taking the lock. If it's changed we're done.
-    if (mgen != current_metagen()) return;
+    generation_t current = current_metagen();
+    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, ": current", current);
+    if (mgen != current) return;
 
     // Take the lock (which may take a long time) and then check again.
     std::unique_lock<std::mutex> locker{wait_queue_lock_};
-    if (mgen != current_metagen()) return;
+    current = current_metagen();
+    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, ": current", current,
+         "acquired lock");
+    if (mgen != current) return;
 
     // Our metagen hasn't changed. Push our metagen onto the queue, then wait until we're the
     // lowest. If multiple waiters are the lowest, then anyone can be the observer.
@@ -84,6 +117,8 @@ void topic_monitor_t::await_metagen(generation_t mgen) {
     // (who has already seen the changes).
     wait_queue_.push(mgen);
     while (wait_queue_.top() != mgen) {
+        FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "releasing lock for",
+             wait_queue_.top());
         wait_queue_notifier_.wait(locker);
     }
     wait_queue_.pop();
@@ -91,7 +126,10 @@ void topic_monitor_t::await_metagen(generation_t mgen) {
     // We now have the lowest metagen in the wait queue. Notice we still hold the lock.
     // Read until the metagen changes. It may already have changed.
     // Note because changes are coalesced, we can read a lot, potentially draining the pipe.
-    while (mgen == current_metagen()) {
+    current = current_metagen();
+    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "considering waiting for mgen",
+         current);
+    while (mgen == current) {
         int fd = pipes_.read.fd();
 #if TOPIC_MONITOR_TSAN_WORKAROUND
         // Under tsan our notifying pipe is non-blocking, so we would busy-loop on the read() call
@@ -104,9 +142,13 @@ void topic_monitor_t::await_metagen(generation_t mgen) {
 #endif
         uint8_t ignored[PIPE_BUF];
         (void)read(fd, ignored, sizeof ignored);
+        current = current_metagen();
+        FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen,
+             "read() complete, current mgen is", current);
     }
 
     // Release the lock and wake up the remaining waiters.
+    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "awakening all waiters");
     locker.unlock();
     wait_queue_notifier_.notify_all();
 }
diff --git a/src/topic_monitor.h b/src/topic_monitor.h
index 78498c4cc..574e72c21 100644
--- a/src/topic_monitor.h
+++ b/src/topic_monitor.h
@@ -109,28 +109,7 @@ class topic_monitor_t {
     void await_metagen(generation_t gen);
 
     /// Return the current generation list, opportunistically applying any pending updates.
-    generation_list_t updated_gens() {
-        auto current_gens = current_gen_.acquire();
-
-        // Atomically acquire the pending updates, swapping in 0.
-        // If there are no pending updates (likely), just return.
-        // Otherwise CAS in 0 and update our topics.
-        const auto relaxed = std::memory_order_relaxed;
-        topic_set_raw_t raw;
-        bool cas_success;
-        do {
-            raw = pending_updates_.load(relaxed);
-            if (raw == 0) return *current_gens;
-            cas_success = pending_updates_.compare_exchange_weak(raw, 0, relaxed, relaxed);
-        } while (!cas_success);
-
-        // Update the current generation with our topics and return it.
-        auto topics = topic_set_t::from_raw(raw);
-        for (topic_t topic : topic_iter_t{}) {
-            current_gens->at(topic) += topics.get(topic) ? 1 : 0;
-        }
-        return *current_gens;
-    }
+    generation_list_t updated_gens();
 
     /// \return the metagen for the current topic generation list.
     inline generation_t current_metagen() { return metagen_for(updated_gens()); }

From 4e03d3c2642b8e42fab3ef4297d5027b7b36f7a9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 31 May 2019 09:13:21 -0700
Subject: [PATCH 0652/1732] Correct a race in topic monitor

This fixes a race condition in the topic monitor. A thread may decide to
enter the wait queue, but before it does the generation list changes, and
so our thread will wait forever, resulting in a hang.

It also simplifies the implementation of the topic monitor considerably;
on reflection the whole "metagen" thing isn't providing any value and we
should just compare generations directly.

In the new design, we have a lock-protected list of current generations,
along with a boolean as to whether someone is reading from the pipe. The
reader (only one at a time) is responsible for broadcasting notifications
via a condition variable.
---
 src/common.h          |   3 +
 src/topic_monitor.cpp | 131 +++++++++++++++++++++++-------------------
 src/topic_monitor.h   |  66 +++++++++++----------
 3 files changed, 111 insertions(+), 89 deletions(-)

diff --git a/src/common.h b/src/common.h
index ae9950ac6..b32487d21 100644
--- a/src/common.h
+++ b/src/common.h
@@ -635,6 +635,9 @@ class acquired_lock {
     /// Create from a global lock.
     /// This is used in weird cases where a global lock protects more than one piece of data.
     static acquired_lock from_global(std::mutex &lk, Data *v) { return acquired_lock{lk, v}; }
+
+    /// \return a reference to the lock, for use with a condition variable.
+    std::unique_lock<std::mutex> &get_lock() { return lock; }
 };
 
 // A lock that owns a piece of data
diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index 70d05b6a7..f1fe05a6c 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -26,6 +26,12 @@
 /// pointless at-exit handler for the dtor.
 static topic_monitor_t *const s_principal = new topic_monitor_t();
 
+/// \return the metagen for a topic generation list.
+/// The metagen is simply the sum of topic generations. Note it is monotone.
+static generation_t metagen_for(const generation_list_t &lst) {
+    return std::accumulate(lst.begin(), lst.end(), generation_t{0});
+}
+
 topic_monitor_t &topic_monitor_t::principal() {
     // Do not attempt to move s_principal to a function-level static, it needs to be accessed from a
     // signal handler so it must not be lazily created.
@@ -71,9 +77,7 @@ void topic_monitor_t::post(topic_t topic) {
     // Ignore EAGAIN and other errors (which conceivably could occur during shutdown).
 }
 
-generation_list_t topic_monitor_t::updated_gens() {
-    auto current_gens = current_gen_.acquire();
-
+generation_list_t topic_monitor_t::updated_gens_in_data(acquired_lock<data_t> &data) {
     // Atomically acquire the pending updates, swapping in 0.
     // If there are no pending updates (likely), just return.
     // Otherwise CAS in 0 and update our topics.
@@ -82,7 +86,7 @@ generation_list_t topic_monitor_t::updated_gens() {
     bool cas_success;
     do {
         raw = pending_updates_.load(relaxed);
-        if (raw == 0) return *current_gens;
+        if (raw == 0) return data->current_gens;
         cas_success = pending_updates_.compare_exchange_weak(raw, 0, relaxed, relaxed);
     } while (!cas_success);
 
@@ -90,76 +94,88 @@ generation_list_t topic_monitor_t::updated_gens() {
     auto topics = topic_set_t::from_raw(raw);
     for (topic_t topic : topic_iter_t{}) {
         if (topics.get(topic)) {
-            current_gens->at(topic) += 1;
-            FLOG(topic_monitor, "Updating topic", (int)topic, "to", current_gens->at(topic));
+            data->current_gens.at(topic) += 1;
+            FLOG(topic_monitor, "Updating topic", (int)topic, "to", data->current_gens.at(topic));
         }
     }
-    return *current_gens;
+    // Report our change.
+    data_notifier_.notify_all();
+    return data->current_gens;
 }
 
-void topic_monitor_t::await_metagen(generation_t mgen) {
-    // Fast check of the metagen before taking the lock. If it's changed we're done.
-    generation_t current = current_metagen();
-    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, ": current", current);
-    if (mgen != current) return;
+generation_list_t topic_monitor_t::updated_gens() {
+    auto data = data_.acquire();
+    return updated_gens_in_data(data);
+}
 
-    // Take the lock (which may take a long time) and then check again.
-    std::unique_lock<std::mutex> locker{wait_queue_lock_};
-    current = current_metagen();
-    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, ": current", current,
-         "acquired lock");
-    if (mgen != current) return;
+bool topic_monitor_t::try_update_gens_maybe_becoming_reader(generation_list_t *gens) {
+    bool become_reader = false;
+    auto data = data_.acquire();
+    for (;;) {
+        // See if the updated gen list has changed. If so we don't need to become the reader.
+        auto current = updated_gens_in_data(data);
+        FLOG(topic_monitor, "TID", thread_id(), "local mgen", metagen_for(*gens), ": current",
+             metagen_for(current));
+        if (*gens != current) {
+            *gens = current;
+            break;
+        }
 
-    // Our metagen hasn't changed. Push our metagen onto the queue, then wait until we're the
-    // lowest. If multiple waiters are the lowest, then anyone can be the observer.
-    // Note the reason for picking the lowest metagen is to avoid a priority inversion where a lower
-    // metagen (therefore someone who should see changes) is blocked waiting for a higher metagen
-    // (who has already seen the changes).
-    wait_queue_.push(mgen);
-    while (wait_queue_.top() != mgen) {
-        FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "releasing lock for",
-             wait_queue_.top());
-        wait_queue_notifier_.wait(locker);
+        // The generations haven't changed. Perhaps we become the reader.
+        if (!data->has_reader) {
+            become_reader = true;
+            data->has_reader = true;
+            break;
+        }
+        // Not the reader, wait until the reader notifies us and loop again.
+        data_notifier_.wait(data.get_lock());
     }
-    wait_queue_.pop();
+    return become_reader;
+}
 
-    // We now have the lowest metagen in the wait queue. Notice we still hold the lock.
-    // Read until the metagen changes. It may already have changed.
-    // Note because changes are coalesced, we can read a lot, potentially draining the pipe.
-    current = current_metagen();
-    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "considering waiting for mgen",
-         current);
-    while (mgen == current) {
-        int fd = pipes_.read.fd();
+generation_list_t topic_monitor_t::await_gens(const generation_list_t &input_gens) {
+    generation_list_t gens = input_gens;
+    while (gens == input_gens) {
+        bool become_reader = try_update_gens_maybe_becoming_reader(&gens);
+        if (become_reader) {
+            // Now we are the reader. Read from the pipe, and then update with any changes.
+            // Note we no longer hold the lock.
+            assert(gens == input_gens &&
+                   "Generations should not have changed if we are the reader.");
+            int fd = pipes_.read.fd();
 #if TOPIC_MONITOR_TSAN_WORKAROUND
-        // Under tsan our notifying pipe is non-blocking, so we would busy-loop on the read() call
-        // until data is available (that is, fish would use 100% cpu while waiting for processes).
-        // The select prevents that.
-        fd_set fds;
-        FD_ZERO(&fds);
-        FD_SET(fd, &fds);
-        (void)select(fd + 1, &fds, nullptr, nullptr, nullptr /* timeout */);
+            // Under tsan our notifying pipe is non-blocking, so we would busy-loop on the read()
+            // call until data is available (that is, fish would use 100% cpu while waiting for
+            // processes). The select prevents that.
+            fd_set fds;
+            FD_ZERO(&fds);
+            FD_SET(fd, &fds);
+            (void)select(fd + 1, &fds, nullptr, nullptr, nullptr /* timeout */);
 #endif
-        uint8_t ignored[PIPE_BUF];
-        (void)read(fd, ignored, sizeof ignored);
-        current = current_metagen();
-        FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen,
-             "read() complete, current mgen is", current);
-    }
+            uint8_t ignored[PIPE_BUF];
+            (void)read(fd, ignored, sizeof ignored);
 
-    // Release the lock and wake up the remaining waiters.
-    FLOG(topic_monitor, "TID", thread_id(), "local mgen", mgen, "awakening all waiters");
-    locker.unlock();
-    wait_queue_notifier_.notify_all();
+            // We are finished reading. We must stop being the reader, and post on the condition
+            // variable to wake up any other threads waiting for us to finish reading.
+            auto data = data_.acquire();
+            gens = data->current_gens;
+            FLOG(topic_monitor, "TID", thread_id(), "local mgen", metagen_for(input_gens),
+                 "read() complete, current mgen is", metagen_for(gens));
+            assert(data->has_reader && "We should be the reader");
+            data->has_reader = false;
+            data_notifier_.notify_all();
+        }
+    }
+    return gens;
 }
 
 topic_set_t topic_monitor_t::check(generation_list_t *gens, topic_set_t topics, bool wait) {
     if (topics.none()) return topics;
 
+    generation_list_t current = updated_gens();
     topic_set_t changed{};
     for (;;) {
         // Load the topic list and see if anything has changed.
-        generation_list_t current = updated_gens();
         for (topic_t topic : topic_iter_t{}) {
             if (topics.get(topic)) {
                 assert(gens->at(topic) <= current.at(topic) &&
@@ -176,9 +192,8 @@ topic_set_t topic_monitor_t::check(generation_list_t *gens, topic_set_t topics,
             break;
         }
 
-        // Try again. Note that we use the metagen corresponding to the topic list we just
-        // inspected, not the current one (which may have updates since we checked).
-        await_metagen(metagen_for(current));
+        // Wait until our gens change.
+        current = await_gens(current);
     }
     return changed;
 }
diff --git a/src/topic_monitor.h b/src/topic_monitor.h
index 574e72c21..4bd86f7f0 100644
--- a/src/topic_monitor.h
+++ b/src/topic_monitor.h
@@ -11,7 +11,6 @@
 #include <condition_variable>
 #include <limits>
 #include <numeric>
-#include <queue>
 
 /** Topic monitoring support. Topics are conceptually "a thing that can happen." For example,
  delivery of a SIGINT, a child process exits, etc. It is possible to post to a topic, which means
@@ -73,47 +72,52 @@ class topic_monitor_t {
     static_assert(sizeof(topic_set_raw_t) * CHAR_BIT >= enum_count<topic_t>(),
                   "topic_set_raw is too small");
 
-    /// The current topic generation list, protected by a mutex. Note this may be opportunistically
-    /// updated at the point it is queried.
-    owning_lock<generation_list_t> current_gen_{{}};
+    // Some stuff that needs to be protected by the same lock.
+    struct data_t {
+        /// The current generation list.
+        generation_list_t current_gens{};
+
+        /// Whether there is a thread currently reading from the notifier pipe.
+        bool has_reader{false};
+    };
+    owning_lock<data_t> data_{};
+
+    /// Condition variable for broadcasting notifications.
+    /// This is associated with data_'s mutex.
+    std::condition_variable data_notifier_{};
 
     /// The set of topics which have pending increments.
     /// This is managed via atomics.
     std::atomic<topic_set_raw_t> pending_updates_{};
 
-    /// When a topic set is queried in a blocking way, the waiters are put into a queue. The waiter
-    /// with the smallest metagen is responsible for announcing the change to the rest of the
-    /// waiters. (The metagen is just the sum of the current generations.) Note that this is a
-    /// max-heap that defaults to std::less; by using std::greater it becomes a min heap. This is
-    /// protected by wait_queue_lock_.
-    std::priority_queue<generation_t, std::vector<generation_t>, std::greater<generation_t>>
-        wait_queue_;
-
-    /// Mutex guarding the wait queue.
-    std::mutex wait_queue_lock_{};
-
-    /// Condition variable for broadcasting notifications.
-    std::condition_variable wait_queue_notifier_{};
-
-    /// Pipes used to communicate changes from the signal handler.
+    /// Self-pipes used to communicate changes.
+    /// The writer is a signal handler.
+    /// "The reader" refers to a thread that wants to wait for changes. Only one thread can be the
+    /// reader at a given time.
     autoclose_pipes_t pipes_;
 
-    /// \return the metagen for a topic generation list.
-    /// The metagen is simply the sum of topic generations. Note it is monotone.
-    static inline generation_t metagen_for(const generation_list_t &lst) {
-        return std::accumulate(lst.begin(), lst.end(), generation_t{0});
-    }
+    /// Apply any pending updates to the data.
+    /// This accepts data because it must be locked.
+    /// \return the updated generation list.
+    generation_list_t updated_gens_in_data(acquired_lock<data_t> &data);
 
-    /// Wait for the current metagen to become different from \p gen.
-    /// If it is already different, return immediately.
-    void await_metagen(generation_t gen);
+    /// Given a list of input generations, attempt to update them to something newer.
+    /// If \p gens is older, then just return those by reference, and directly return false (not
+    /// becoming the reader).
+    /// If \p gens is current and there is not a reader, then do not update \p gens and return true,
+    /// indicating we should become the reader. Now it is our responsibility to read from the pipes
+    /// and notify on a change via the condition variable.
+    /// If \p gens is current, and there is already a reader, then wait until the reader notifies us
+    /// and try again.
+    bool try_update_gens_maybe_becoming_reader(generation_list_t *gens);
 
-    /// Return the current generation list, opportunistically applying any pending updates.
+    /// Wait for some entry in the list of generations to change.
+    /// \return the new gens.
+    generation_list_t await_gens(const generation_list_t &input_gens);
+
+    /// \return the current generation list, opportunistically applying any pending updates.
     generation_list_t updated_gens();
 
-    /// \return the metagen for the current topic generation list.
-    inline generation_t current_metagen() { return metagen_for(updated_gens()); }
-
    public:
     topic_monitor_t();
     ~topic_monitor_t();

From bc19647be26808c98c301362dcb5abfe0fbe7232 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 31 May 2019 09:33:50 +0200
Subject: [PATCH 0653/1732] wutil: Give narrow versions of a few functions

Note that this isn't technically *w*util, but the differences between
the functions are basically just whether they do the wcs2string
themselves or not.
---
 src/wutil.cpp | 21 +++++++++++++++------
 src/wutil.h   |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/wutil.cpp b/src/wutil.cpp
index 90a731e65..74b91013a 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -189,20 +189,19 @@ bool set_cloexec(int fd) {
     return fcntl(fd, F_SETFD, flags | FD_CLOEXEC) >= 0;
 }
 
-static int wopen_internal(const wcstring &pathname, int flags, mode_t mode, bool cloexec) {
+int open_cloexec(const std::string &cstring, int flags, mode_t mode, bool cloexec) {
     ASSERT_IS_NOT_FORKED_CHILD();
-    cstring tmp = wcs2string(pathname);
     int fd;
 
 #ifdef O_CLOEXEC
     // Prefer to use O_CLOEXEC. It has to both be defined and nonzero.
     if (cloexec) {
-        fd = open(tmp.c_str(), flags | O_CLOEXEC, mode);
+        fd = open(cstring.c_str(), flags | O_CLOEXEC, mode);
     } else {
-        fd = open(tmp.c_str(), flags, mode);
+        fd = open(cstring.c_str(), flags, mode);
     }
 #else
-    fd = open(tmp.c_str(), flags, mode);
+    fd = open(cstring.c_str(), flags, mode);
     if (fd >= 0 && !set_cloexec(fd)) {
         close(fd);
         fd = -1;
@@ -212,7 +211,8 @@ static int wopen_internal(const wcstring &pathname, int flags, mode_t mode, bool
 }
 
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode) {
-    return wopen_internal(pathname, flags, mode, true);
+    cstring tmp = wcs2string(pathname);
+    return open_cloexec(tmp, flags, mode, true);
 }
 
 DIR *wopendir(const wcstring &name) {
@@ -815,6 +815,15 @@ file_id_t file_id_for_path(const wcstring &path) {
     return result;
 }
 
+file_id_t file_id_for_path(const std::string &path) {
+    file_id_t result = kInvalidFileID;
+    struct stat buf = {};
+    if (0 == stat(path.c_str(), &buf)) {
+        result = file_id_t::from_stat(buf);
+    }
+    return result;
+}
+
 bool file_id_t::operator==(const file_id_t &rhs) const { return this->compare_file_id(rhs) == 0; }
 
 bool file_id_t::operator!=(const file_id_t &rhs) const { return !(*this == rhs); }
diff --git a/src/wutil.h b/src/wutil.h
index 5457074bb..955ea5e21 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -28,6 +28,9 @@ bool set_cloexec(int fd);
 /// possible).
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode = 0);
 
+/// Narrow version of wopen_cloexec.
+int open_cloexec(const std::string &cstring, int flags, mode_t mode = 0, bool cloexec = true);
+
 /// Mark an fd as nonblocking; returns errno or 0 on success.
 int make_fd_nonblocking(int fd);
 
@@ -195,6 +198,7 @@ struct hash<file_id_t> {
 
 file_id_t file_id_for_fd(int fd);
 file_id_t file_id_for_path(const wcstring &path);
+file_id_t file_id_for_path(const std::string &path);
 
 extern const file_id_t kInvalidFileID;
 

From 5ca14904d0f8280607eac1a97ff518afc1213dbc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 31 May 2019 09:42:27 +0200
Subject: [PATCH 0654/1732] Store narrow version of uvar path

This sets the explicit path to the default one, which should be okay,
since the default path never changes (not even if $XDG_CONFIG_HOME
does).

Then it saves a narrow version of that, which saves most of the time
needed to `sync` in most cases.

Fixes #5905.
---
 src/env_universal_common.cpp | 46 +++++++++++++++++++++++-------------
 src/env_universal_common.h   |  7 ++++--
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 1790a990b..c8c51e918 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -248,7 +248,7 @@ static wcstring encode_serialized(const wcstring_list_t &vals) {
     return join_strings(vals, UVAR_ARRAY_SEP);
 }
 
-env_universal_t::env_universal_t(wcstring path) : explicit_vars_path(std::move(path)) {}
+env_universal_t::env_universal_t(wcstring path) : narrow_vars_path(wcs2string(path)), explicit_vars_path(std::move(path)) {}
 
 maybe_t<env_var_t> env_universal_t::get(const wcstring &name) const {
     var_table_t::const_iterator where = vars.find(name);
@@ -401,7 +401,7 @@ void env_universal_t::load_from_fd(int fd, callback_data_list_t &callbacks) {
     }
 }
 
-bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t &callbacks) {
+bool env_universal_t::load_from_path(const std::string &path, callback_data_list_t &callbacks) {
     ASSERT_IS_LOCKED(lock);
 
     // Check to see if the file is unchanged. We do this again in load_from_fd, but this avoids
@@ -412,7 +412,7 @@ bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t
     }
 
     bool result = false;
-    int fd = wopen_cloexec(path, O_RDONLY);
+    int fd = open_cloexec(path, O_RDONLY);
     if (fd >= 0) {
         debug(5, L"universal log reading from file");
         this->load_from_fd(fd, callbacks);
@@ -422,6 +422,10 @@ bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t
     return result;
 }
 
+bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t &callbacks) {
+    std::string tmp = wcs2string(path);
+    return load_from_path(tmp, callbacks);
+}
 /// Serialize the contents to a string.
 std::string env_universal_t::serialize_with_vars(const var_table_t &vars) {
     std::string storage;
@@ -473,7 +477,7 @@ bool env_universal_t::move_new_vars_file_into_place(const wcstring &src, const w
 bool env_universal_t::initialize(callback_data_list_t &callbacks) {
     scoped_lock locker(lock);
     if (!explicit_vars_path.empty()) {
-        return load_from_path(explicit_vars_path, callbacks);
+        return load_from_path(narrow_vars_path, callbacks);
     }
 
     // Get the variables path; if there is none (e.g. HOME is bogus) it's hopeless.
@@ -499,6 +503,11 @@ bool env_universal_t::initialize(callback_data_list_t &callbacks) {
             }
         }
     }
+    // If we succeeded, we store the *default path*, not the legacy one.
+    if (success) {
+        explicit_vars_path = *vars_path;
+        narrow_vars_path = wcs2string(*vars_path);
+    }
     return success;
 }
 
@@ -554,7 +563,7 @@ static bool lock_uvar_file(int fd) {
     return check_duration(start_time);
 }
 
-bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) {
+bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd) {
     // Attempt to open the file for reading at the given path, atomically acquiring a lock. On BSD,
     // we can use O_EXLOCK. On Linux, we open the file, take a lock, and then compare fstat() to
     // stat(); if they match, it means that the file was not replaced before we acquired the lock.
@@ -575,7 +584,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd) {
     int fd = -1;
     while (fd == -1) {
         double start_time = timef();
-        fd = wopen_cloexec(path, flags, 0644);
+        fd = open_cloexec(path, flags, 0644);
         if (fd == -1) {
             if (errno == EINTR) continue;  // signaled; try again
 #ifdef O_EXLOCK
@@ -652,25 +661,28 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
     // instances of fish will not be able to obtain it. This seems to be a greater risk than that of
     // data loss on lockless NFS. Users who put their home directory on lockless NFS are playing
     // with fire anyways.
-    wcstring vars_path = explicit_vars_path;
-    if (vars_path.empty()) {
-        if (auto default_path = default_vars_path()) {
-            vars_path = default_path.acquire();
+    if (explicit_vars_path.empty()) {
+        // Initialize the vars path from the default one.
+        // In some cases we don't "initialize()" before, so we're doing that now.
+        // This should only happen once.
+        // FIXME: Why don't we initialize()?
+        auto def_vars_path = default_vars_path();
+        if (!def_vars_path) {
+            debug(2, L"No universal variable path available");
+            return false;
         }
-    }
-    if (vars_path.empty()) {
-        debug(2, L"No universal variable path available");
-        return false;
+        explicit_vars_path = *def_vars_path;
+        narrow_vars_path = wcs2string(explicit_vars_path);
     }
 
     // If we have no changes, just load.
     if (modified.empty()) {
-        this->load_from_path(vars_path, callbacks);
+        this->load_from_path(narrow_path, callbacks);
         debug(5, L"universal log no modifications");
         return false;
     }
 
-    const wcstring directory = wdirname(vars_path);
+    const wcstring directory = wdirname(explicit_vars_path);
     bool success = true;
     int vars_fd = -1;
 
@@ -678,7 +690,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
 
     // Open the file.
     if (success) {
-        success = this->open_and_acquire_lock(vars_path, &vars_fd);
+        success = this->open_and_acquire_lock(narrow_vars_path, &vars_fd);
         if (!success) debug(5, L"universal log open_and_acquire_lock() failed");
     }
 
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 3a8daf6c9..61d85aa7e 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -45,14 +45,17 @@ class env_universal_t {
     // vars indicates a deleted value.
     std::unordered_set<wcstring> modified;
 
+    std::string narrow_vars_path;
     // Path that we save to. If empty, use the default.
-    const wcstring explicit_vars_path;
+    wcstring explicit_vars_path;
+
 
     // Whether it's OK to save. This may be set to false if we discover that a future version of
     // fish wrote the uvars contents.
     bool ok_to_save{true};
 
     mutable std::mutex lock;
+    bool load_from_path(const std::string &path, callback_data_list_t &callbacks);
     bool load_from_path(const wcstring &path, callback_data_list_t &callbacks);
     void load_from_fd(int fd, callback_data_list_t &callbacks);
 
@@ -60,7 +63,7 @@ class env_universal_t {
     bool remove_internal(const wcstring &name);
 
     // Functions concerned with saving.
-    bool open_and_acquire_lock(const wcstring &path, int *out_fd);
+    bool open_and_acquire_lock(const std::string &path, int *out_fd);
     bool open_temporary_file(const wcstring &directory, wcstring *out_path, int *out_fd);
     bool write_to_fd(int fd, const wcstring &path);
     bool move_new_vars_file_into_place(const wcstring &src, const wcstring &dst);

From 7525befadbcef3f5ffece8a936991306c72a320a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 31 May 2019 10:09:10 +0200
Subject: [PATCH 0655/1732] path_get_path: Narrow string before

This cuts down on the wcs2string here by ~25%.

The better solution would be to cache narrow versions of $PATH, since
we compute that over and over and over and over again, while it rarely changes.

Or we could add a full path-cache (where which command is), but that's
much harder to invalidate.

See #5905.
---
 src/path.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/path.cpp b/src/path.cpp
index 6aa81b8b8..51b3ae7d7 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -39,12 +39,13 @@ static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
     // If the command has a slash, it must be an absolute or relative path and thus we don't bother
     // looking for a matching command.
     if (cmd.find(L'/') != wcstring::npos) {
-        if (waccess(cmd, X_OK) != 0) {
+        std::string narrow = wcs2string(cmd);
+        if (access(narrow.c_str(), X_OK) != 0) {
             return false;
         }
 
         struct stat buff;
-        if (wstat(cmd, &buff)) {
+        if (stat(narrow.c_str(), &buff)) {
             return false;
         }
         if (S_ISREG(buff.st_mode)) {
@@ -66,9 +67,10 @@ static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
     for (auto next_path : *pathsv) {
         if (next_path.empty()) continue;
         append_path_component(next_path, cmd);
-        if (waccess(next_path, X_OK) == 0) {
+        std::string narrow = wcs2string(next_path);
+        if (access(narrow.c_str(), X_OK) == 0) {
             struct stat buff;
-            if (wstat(next_path, &buff) == -1) {
+            if (stat(narrow.c_str(), &buff) == -1) {
                 if (errno != EACCES) {
                     wperror(L"stat");
                 }

From 6c1d29e14d7aeb5d0e6b659b06ad066a87aba113 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 1 Jun 2019 10:32:30 +0200
Subject: [PATCH 0656/1732] fixup! Fix build

I deleted the lines that defined "narrow_path" and
"explicit_vars_path", but didn't see the two remaining uses.

Sorry!
---
 src/env_universal_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index c8c51e918..0d4788bd4 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -677,7 +677,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
 
     // If we have no changes, just load.
     if (modified.empty()) {
-        this->load_from_path(narrow_path, callbacks);
+        this->load_from_path(narrow_vars_path, callbacks);
         debug(5, L"universal log no modifications");
         return false;
     }
@@ -701,7 +701,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
     }
 
     if (success && ok_to_save) {
-        success = this->save(directory, vars_path);
+        success = this->save(directory, explicit_vars_path);
     }
 
     // Clean up.

From a48dbf23b8c4e2a579e871784857fad461e882bd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Jun 2019 15:41:23 -0700
Subject: [PATCH 0657/1732] Instantize the character event queue

Wrap this stuff up in structs so it's no longer global.
---
 src/builtin_commandline.cpp |  5 +--
 src/fish_key_reader.cpp     |  3 +-
 src/fish_tests.cpp          |  5 ++-
 src/input.cpp               | 90 ++++++++++++++++++-------------------
 src/input.h                 | 61 +++++++++++++++++--------
 src/input_common.cpp        | 72 ++++++++++++-----------------
 src/input_common.h          | 49 +++++++++++++-------
 src/reader.cpp              | 26 +++++++----
 src/reader.h                |  4 ++
 9 files changed, 177 insertions(+), 138 deletions(-)

diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index b8ab7e82b..a84c53be1 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -326,9 +326,8 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
 
         for (i = w.woptind; i < argc; i++) {
             if (auto mc = input_function_get_code(argv[i])) {
-                // input_unreadch inserts the specified keypress or readline function at the back of
-                // the queue of unused keypresses.
-                input_queue_ch(*mc);
+                // Inserts the readline function at the back of the queue.
+                reader_queue_ch(*mc);
             } else {
                 streams.err.append_format(_(L"%ls: Unknown input function '%ls'"), cmd, argv[i]);
                 builtin_print_error_trailer(parser, streams.err, cmd);
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 4f802eb69..d949bc8af 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -201,6 +201,7 @@ static double output_elapsed_time(double prev_tstamp, bool first_char_seen) {
 static void process_input(bool continuous_mode) {
     bool first_char_seen = false;
     double prev_tstamp = 0.0;
+    input_event_queue_t queue;
     std::vector<wchar_t> bind_chars;
 
     std::fwprintf(stderr, L"Press a key\n\n");
@@ -209,7 +210,7 @@ static void process_input(bool continuous_mode) {
         if (reader_test_and_clear_interrupted()) {
             evt = char_event_t{shell_modes.c_cc[VINTR]};
         } else {
-            evt = input_common_readch_timed(true);
+            evt = queue.readch_timed(true);
         }
         if (!evt.is_char()) {
             output_bind_command(bind_chars);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 546772f8b..5153a0fa6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3003,6 +3003,7 @@ static bool history_contains(const std::unique_ptr<history_t> &history, const wc
 
 static void test_input() {
     say(L"Testing input");
+    inputter_t input{};
     // Ensure sequences are order independent. Here we add two bindings where the first is a prefix
     // of the second, and then emit the second key list. The second binding should be invoked, not
     // the first!
@@ -3013,11 +3014,11 @@ static void test_input() {
 
     // Push the desired binding to the queue.
     for (size_t idx = 0; idx < desired_binding.size(); idx++) {
-        input_queue_ch(desired_binding.at(idx));
+        input.queue_ch(desired_binding.at(idx));
     }
 
     // Now test.
-    auto evt = input_readch();
+    auto evt = input.readch();
     if (!evt.is_readline()) {
         err(L"Event is not a readline");
     } else if (evt.get_readline() != readline_cmd_t::down_line) {
diff --git a/src/input.cpp b/src/input.cpp
index cb151ce7b..878ae2c4e 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -160,10 +160,6 @@ static latch_t<std::vector<terminfo_mapping_t>> s_terminfo_mappings;
 /// \return the input terminfo.
 static std::vector<terminfo_mapping_t> create_input_terminfo();
 
-static wchar_t input_function_args[MAX_INPUT_FUNCTION_ARGS];
-static bool input_function_status;
-static int input_function_args_index = 0;
-
 /// Return the current bind mode.
 wcstring input_get_bind_mode(const environment_t &vars) {
     auto mode = vars.get(FISH_BIND_MODE_VAR);
@@ -195,9 +191,6 @@ static int input_function_arity(readline_cmd_t function) {
     }
 }
 
-/// Sets the return status of the most recently executed input function.
-void input_function_set_status(bool status) { input_function_status = status; }
-
 /// Helper function to compare the lengths of sequences.
 static bool length_is_greater_than(const input_mapping_t &m1, const input_mapping_t &m2) {
     return m1.seq.size() > m2.seq.size();
@@ -294,13 +287,16 @@ void init_input() {
     }
 }
 
-void input_function_push_arg(wchar_t arg) {
-    input_function_args[input_function_args_index++] = arg;
+void inputter_t::function_push_arg(wchar_t arg) { input_function_args_.push_back(arg); }
+
+wchar_t inputter_t::function_pop_arg() {
+    assert(!input_function_args_.empty() && "function_pop_arg underflow");
+    auto result = input_function_args_.back();
+    input_function_args_.pop_back();
+    return result;
 }
 
-wchar_t input_function_pop_arg() { return input_function_args[--input_function_args_index]; }
-
-void input_function_push_args(readline_cmd_t code) {
+void inputter_t::function_push_args(readline_cmd_t code) {
     int arity = input_function_arity(code);
     std::vector<char_event_t> skipped;
 
@@ -308,26 +304,26 @@ void input_function_push_args(readline_cmd_t code) {
         // Skip and queue up any function codes. See issue #2357.
         wchar_t arg{};
         for (;;) {
-            auto evt = input_common_readch();
+            auto evt = event_queue_.readch();
             if (evt.is_char()) {
                 arg = evt.get_char();
                 break;
             }
             skipped.push_back(evt);
         }
-        input_function_push_arg(arg);
+        function_push_arg(arg);
     }
 
     // Push the function codes back into the input stream.
     size_t idx = skipped.size();
     while (idx--) {
-        input_common_next_ch(skipped.at(idx));
+        event_queue_.push_front(skipped.at(idx));
     }
 }
 
 /// Perform the action of the specified binding. allow_commands controls whether fish commands
 /// should be executed, or should be deferred until later.
-static void input_mapping_execute(const input_mapping_t &m, bool allow_commands) {
+void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands) {
     // has_functions: there are functions that need to be put on the input queue
     // has_commands: there are shell commands that need to be evaluated
     bool has_commands = false, has_functions = false;
@@ -349,9 +345,9 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
         // We don't want to run commands yet. Put the characters back and return check_exit.
         for (wcstring::const_reverse_iterator it = m.seq.rbegin(), end = m.seq.rend(); it != end;
              ++it) {
-            input_common_next_ch(*it);
+            event_queue_.push_front(*it);
         }
-        input_common_next_ch(char_event_type_t::check_exit);
+        event_queue_.push_front(char_event_type_t::check_exit);
         return;  // skip the input_set_bind_mode
     } else if (has_functions && !has_commands) {
         // Functions are added at the head of the input queue.
@@ -359,8 +355,8 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
                                                      end = m.commands.rend();
              it != end; ++it) {
             readline_cmd_t code = input_function_get_code(*it).value();
-            input_function_push_args(code);
-            input_common_next_ch(code);
+            function_push_args(code);
+            event_queue_.push_front(code);
         }
     } else if (has_commands && !has_functions) {
         // Execute all commands.
@@ -373,11 +369,11 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
             parser.eval(cmd, io_chain_t(), TOP);
         }
         parser.set_last_statuses(std::move(last_statuses));
-        input_common_next_ch(char_event_type_t::check_exit);
+        event_queue_.push_front(char_event_type_t::check_exit);
     } else {
         // Invalid binding, mixed commands and functions.  We would need to execute these one by
         // one.
-        input_common_next_ch(char_event_type_t::check_exit);
+        event_queue_.push_front(char_event_type_t::check_exit);
     }
 
     // Empty bind mode indicates to not reset the mode (#2871)
@@ -385,20 +381,20 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
 }
 
 /// Try reading the specified function mapping.
-static bool input_mapping_is_match(const input_mapping_t &m) {
+bool inputter_t::mapping_is_match(const input_mapping_t &m) {
     const wcstring &str = m.seq;
 
     assert(str.size() > 0 && "zero-length input string passed to input_mapping_is_match!");
 
     bool timed = false;
     for (size_t i = 0; i < str.size(); ++i) {
-        auto evt = timed ? input_common_readch_timed() : input_common_readch();
+        auto evt = timed ? event_queue_.readch_timed() : event_queue_.readch();
         if (!evt.is_char() || evt.get_char() != str[i]) {
             // We didn't match the bind sequence/input mapping, (it timed out or they entered
             // something else) Undo consumption of the read characters since we didn't match the
             // bind sequence and abort.
-            input_common_next_ch(evt);
-            while (i--) input_common_next_ch(str[i]);
+            event_queue_.push_front(evt);
+            while (i--) event_queue_.push_front(str[i]);
             return false;
         }
 
@@ -410,11 +406,13 @@ static bool input_mapping_is_match(const input_mapping_t &m) {
     return true;
 }
 
-void input_queue_ch(char_event_t ch) { input_common_queue_ch(ch); }
+void inputter_t::queue_ch(char_event_t ch) { event_queue_.push_back(ch); }
+
+void inputter_t::push_front(char_event_t ch) { event_queue_.push_front(ch); }
 
 /// \return the first mapping that matches, walking first over the user's mapping list, then the
 /// preset list. \return null if nothing matches.
-static const input_mapping_t *find_mapping() {
+const input_mapping_t *inputter_t::find_mapping() {
     const input_mapping_t *generic = NULL;
     const auto &vars = parser_t::principal_parser().vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
@@ -429,7 +427,7 @@ static const input_mapping_t *find_mapping() {
 
             if (m.is_generic()) {
                 if (!generic) generic = &m;
-            } else if (input_mapping_is_match(m)) {
+            } else if (mapping_is_match(m)) {
                 return &m;
             }
         }
@@ -437,26 +435,26 @@ static const input_mapping_t *find_mapping() {
     return generic;
 }
 
-static void input_mapping_execute_matching_or_generic(bool allow_commands) {
+void inputter_t::mapping_execute_matching_or_generic(bool allow_commands) {
     const input_mapping_t *mapping = find_mapping();
     if (mapping) {
-        input_mapping_execute(*mapping, allow_commands);
+        mapping_execute(*mapping, allow_commands);
     } else {
         debug(2, L"no generic found, ignoring char...");
-        auto evt = input_common_readch();
+        auto evt = event_queue_.readch();
         if (evt.is_eof()) {
-            input_common_next_ch(evt);
+            event_queue_.push_front(evt);
         }
     }
 }
 
 /// Helper function. Picks through the queue of incoming characters until we get to one that's not a
 /// readline function.
-static char_event_t input_read_characters_no_readline() {
+char_event_t inputter_t::read_characters_no_readline() {
     std::vector<char_event_t> saved_events;
     char_event_t evt_to_return{0};
     for (;;) {
-        auto evt = input_common_readch();
+        auto evt = event_queue_.readch();
         if (evt.is_readline()) {
             saved_events.push_back(evt);
         } else {
@@ -466,34 +464,34 @@ static char_event_t input_read_characters_no_readline() {
     }
     // Restore any readline functions, in reverse to preserve their original order.
     for (auto iter = saved_events.rbegin(); iter != saved_events.rend(); ++iter) {
-        input_common_next_ch(*iter);
+        event_queue_.push_front(*iter);
     }
     return evt_to_return;
 }
 
-char_event_t input_readch(bool allow_commands) {
+char_event_t inputter_t::readch(bool allow_commands) {
     // Clear the interrupted flag.
     reader_reset_interrupted();
     // Search for sequence in mapping tables.
     while (true) {
-        auto evt = input_common_readch();
+        auto evt = event_queue_.readch();
 
         if (evt.is_readline()) {
             switch (evt.get_readline()) {
                 case readline_cmd_t::self_insert: {
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
-                    return input_read_characters_no_readline();
+                    return read_characters_no_readline();
                 }
                 case readline_cmd_t::func_and: {
-                    if (input_function_status) {
-                        return input_readch();
+                    if (function_status_) {
+                        return readch();
                     }
                     do {
-                        evt = input_common_readch();
+                        evt = event_queue_.readch();
                     } while (evt.is_readline());
-                    input_common_next_ch(evt);
-                    return input_readch();
+                    event_queue_.push_front(evt);
+                    return readch();
                 }
                 default: {
                     return evt;
@@ -504,8 +502,8 @@ char_event_t input_readch(bool allow_commands) {
             // There's no need to go through the input functions.
             return evt;
         } else {
-            input_common_next_ch(evt);
-            input_mapping_execute_matching_or_generic(allow_commands);
+            event_queue_.push_front(evt);
+            mapping_execute_matching_or_generic(allow_commands);
             // Regarding allow_commands, we're in a loop, but if a fish command is executed,
             // check_exit is unread, so the next pass through the loop we'll break out and return
             // it.
diff --git a/src/input.h b/src/input.h
index 08b271ad4..7168e2771 100644
--- a/src/input.h
+++ b/src/input.h
@@ -21,23 +21,50 @@ wcstring describe_char(wint_t c);
 /// initializations for our input subsystem.
 void init_input();
 
-/// Read a character from fd 0. Try to convert some escape sequences into character constants, but
-/// do not permanently block the escape character.
-///
-/// This is performed in the same way vim does it, i.e. if an escape character is read, wait for
-/// more input for a short time (a few milliseconds). If more input is avaialable, it is assumed to
-/// be an escape sequence for a special character (such as an arrow key), and readch attempts to
-/// parse it. If no more input follows after the escape key, it is assumed to be an actual escape
-/// key press, and is returned as such.
-///
-/// The argument determines whether fish commands are allowed to be run as bindings. If false, when
-/// a character is encountered that would invoke a fish command, it is unread and
-/// char_event_type_t::check_exit is returned.
-char_event_t input_readch(bool allow_commands = true);
+struct input_mapping_t;
+class inputter_t {
+    input_event_queue_t event_queue_{};
+    std::vector<wchar_t> input_function_args_{};
+    bool function_status_{false};
 
-/// Enqueue a character or a readline function to the queue of unread characters that input_readch
-/// will return before actually reading from fd 0.
-void input_queue_ch(char_event_t ch);
+    void function_push_arg(wchar_t arg);
+    void function_push_args(readline_cmd_t code);
+    void mapping_execute(const input_mapping_t &m, bool allow_commands);
+    void mapping_execute_matching_or_generic(bool allow_commands);
+    bool mapping_is_match(const input_mapping_t &m);
+    const input_mapping_t *find_mapping();
+    char_event_t read_characters_no_readline();
+
+   public:
+    inputter_t() = default;
+
+    /// Read a character from fd 0. Try to convert some escape sequences into character constants,
+    /// but do not permanently block the escape character.
+    ///
+    /// This is performed in the same way vim does it, i.e. if an escape character is read, wait for
+    /// more input for a short time (a few milliseconds). If more input is avaialable, it is assumed
+    /// to be an escape sequence for a special character (such as an arrow key), and readch attempts
+    /// to parse it. If no more input follows after the escape key, it is assumed to be an actual
+    /// escape key press, and is returned as such.
+    ///
+    /// The argument determines whether fish commands are allowed to be run as bindings. If false,
+    /// when a character is encountered that would invoke a fish command, it is unread and
+    /// char_event_type_t::check_exit is returned.
+    char_event_t readch(bool allow_commands = true);
+
+    /// Enqueue a char event to the queue of unread characters that input_readch will return before
+    /// actually reading from fd 0.
+    void queue_ch(char_event_t ch);
+
+    /// Enqueue a char event to the front of the queue; this will be the next event returned.
+    void push_front(char_event_t ch);
+
+    /// Sets the return status of the most recently executed input function.
+    void function_set_status(bool status) { function_status_ = status; }
+
+    /// Pop an argument from the function argument stack.
+    wchar_t function_pop_arg();
+};
 
 /// Add a key mapping from the specified sequence to the specified command.
 ///
@@ -77,8 +104,6 @@ wcstring input_get_bind_mode(const environment_t &vars);
 /// Set the current bind mode.
 void input_set_bind_mode(const wcstring &bind_mode);
 
-wchar_t input_function_pop_arg();
-
 /// Sets the return status of the most recently executed input function.
 void input_function_set_status(bool status);
 
diff --git a/src/input_common.cpp b/src/input_common.cpp
index fb82b1842..c9457fe9a 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -34,36 +34,6 @@
 #define WAIT_ON_ESCAPE_DEFAULT 30
 static int wait_on_escape_ms = WAIT_ON_ESCAPE_DEFAULT;
 
-struct input_lookahead_t {
-    /// Events which have been read and returned by the sequence matching code.
-    std::deque<char_event_t> lookahead_list;
-
-    bool has_lookahead() const { return !lookahead_list.empty(); }
-
-    char_event_t pop() {
-        auto result = lookahead_list.front();
-        lookahead_list.pop_front();
-        return result;
-    }
-
-    /// \return the next lookahead char, or none if none. Discards timeouts.
-    maybe_t<char_event_t> pop_evt() {
-        while (has_lookahead()) {
-            auto evt = pop();
-            if (!evt.is_timeout()) {
-                return evt;
-            }
-        }
-        return none();
-    }
-
-    void push_back(char_event_t c) { lookahead_list.push_back(c); }
-
-    void push_front(char_event_t c) { lookahead_list.push_front(c); }
-};
-
-static mainthread_t<input_lookahead_t> s_lookahead;
-
 /// Callback function for handling interrupts on reading.
 static interrupt_func_t interrupt_handler;
 
@@ -71,7 +41,7 @@ void input_common_init(interrupt_func_t func) { interrupt_handler = func; }
 
 /// Internal function used by input_common_readch to read one byte from fd 0. This function should
 /// only be called by input_common_readch().
-static char_event_t readb() {
+char_event_t input_event_queue_t::readb() {
     for (;;) {
         fd_set fdset;
         int fd_max = 0;
@@ -110,7 +80,7 @@ static char_event_t readb() {
                 if (interrupt_handler) {
                     if (auto interrupt_evt = interrupt_handler()) {
                         return *interrupt_evt;
-                    } else if (auto mc = s_lookahead->pop_evt()) {
+                    } else if (auto mc = pop_discard_timeouts()) {
                         return *mc;
                     }
                 }
@@ -128,7 +98,7 @@ static char_event_t readb() {
             if (barrier_from_poll || barrier_from_readability) {
                 if (env_universal_barrier()) {
                     // A variable change may have triggered a repaint, etc.
-                    if (auto mc = s_lookahead->pop_evt()) {
+                    if (auto mc = pop_discard_timeouts()) {
                         return *mc;
                     }
                 }
@@ -136,7 +106,7 @@ static char_event_t readb() {
 
             if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
                 iothread_service_completion();
-                if (auto mc = s_lookahead->pop_evt()) {
+                if (auto mc = pop_discard_timeouts()) {
                     return *mc;
                 }
             }
@@ -175,9 +145,25 @@ void update_wait_on_escape_ms(const environment_t &vars) {
     }
 }
 
-char_event_t input_common_readch() {
+char_event_t input_event_queue_t::pop() {
+    auto result = queue_.front();
+    queue_.pop_front();
+    return result;
+}
+
+maybe_t<char_event_t> input_event_queue_t::pop_discard_timeouts() {
+    while (has_lookahead()) {
+        auto evt = pop();
+        if (!evt.is_timeout()) {
+            return evt;
+        }
+    }
+    return none();
+}
+
+char_event_t input_event_queue_t::readch() {
     ASSERT_IS_MAIN_THREAD();
-    if (auto mc = s_lookahead->pop_evt()) {
+    if (auto mc = pop_discard_timeouts()) {
         return *mc;
     }
     wchar_t res;
@@ -215,27 +201,27 @@ char_event_t input_common_readch() {
     }
 }
 
-char_event_t input_common_readch_timed(bool dequeue_timeouts) {
+char_event_t input_event_queue_t::readch_timed(bool dequeue_timeouts) {
     char_event_t result{char_event_type_t::timeout};
-    if (s_lookahead->has_lookahead()) {
-        result = s_lookahead->pop();
+    if (has_lookahead()) {
+        result = pop();
     } else {
         fd_set fds;
         FD_ZERO(&fds);
         FD_SET(STDIN_FILENO, &fds);
         struct timeval tm = {wait_on_escape_ms / 1000, 1000 * (wait_on_escape_ms % 1000)};
         if (select(1, &fds, 0, 0, &tm) > 0) {
-            result = input_common_readch();
+            result = readch();
         }
     }
     // If we got a timeout, either through dequeuing or creating, ensure it stays on the queue.
     if (result.is_timeout()) {
-        if (!dequeue_timeouts) s_lookahead->push_front(char_event_type_t::timeout);
+        if (!dequeue_timeouts) queue_.push_front(char_event_type_t::timeout);
         return char_event_type_t::timeout;
     }
     return result;
 }
 
-void input_common_queue_ch(char_event_t ch) { s_lookahead->push_back(ch); }
+void input_event_queue_t::push_back(char_event_t ch) { queue_.push_back(ch); }
 
-void input_common_next_ch(char_event_t ch) { s_lookahead->push_front(ch); }
+void input_event_queue_t::push_front(char_event_t ch) { queue_.push_front(ch); }
diff --git a/src/input_common.h b/src/input_common.h
index 2f00c7148..d27ecf165 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -6,6 +6,7 @@
 #include "maybe.h"
 
 #include <stddef.h>
+#include <queue>
 
 enum class readline_cmd_t {
     beginning_of_line,
@@ -150,24 +151,40 @@ void input_common_init(interrupt_func_t func);
 class environment_t;
 void update_wait_on_escape_ms(const environment_t &vars);
 
-/// Function used by input_readch to read bytes from stdin until enough bytes have been read to
-/// convert them to a wchar_t. Conversion is done using mbrtowc. If a character has previously been
-/// read and then 'unread' using \c input_common_unreadch, that character is returned.
-/// This function never returns a timeout.
-char_event_t input_common_readch();
+/// A class which knows how to produce a stream of input events.
+class input_event_queue_t {
+    std::deque<char_event_t> queue_;
 
-/// Like input_common_readch(), except it will wait at most WAIT_ON_ESCAPE milliseconds for a
-/// character to be available for reading.
-/// If \p dequeue_timeouts is set, remove any timeout from the queue; otherwise retain them.
-char_event_t input_common_readch_timed(bool dequeue_timeouts = false);
+    /// \return if we have any lookahead.
+    bool has_lookahead() { return !queue_.empty(); }
 
-/// Enqueue a character or a readline function to the queue of unread characters that input_readch
-/// will return before actually reading from fd 0.
-void input_common_queue_ch(char_event_t ch);
+    /// \return the next event in the queue.
+    char_event_t pop();
 
-/// Add a character or a readline function to the front of the queue of unread characters.  This
-/// will be the first character returned by input_readch (unless this function is called more than
-/// once).
-void input_common_next_ch(char_event_t ch);
+    /// \return the next event in the queue, discarding timeouts.
+    maybe_t<char_event_t> pop_discard_timeouts();
+
+    char_event_t readb();
+
+   public:
+    /// Function used by input_readch to read bytes from stdin until enough bytes have been read to
+    /// convert them to a wchar_t. Conversion is done using mbrtowc. If a character has previously
+    /// been read and then 'unread' using \c input_common_unreadch, that character is returned. This
+    /// function never returns a timeout.
+    char_event_t readch();
+
+    /// Like readch(), except it will wait at most WAIT_ON_ESCAPE milliseconds for a
+    /// character to be available for reading.
+    /// If \p dequeue_timeouts is set, remove any timeout from the queue; otherwise retain them.
+    char_event_t readch_timed(bool dequeue_timeouts = false);
+
+    /// Enqueue a character or a readline function to the queue of unread characters that
+    /// readch will return before actually reading from fd 0.
+    void push_back(char_event_t ch);
+
+    /// Add a character or a readline function to the front of the queue of unread characters.  This
+    /// will be the next character returned by readch.
+    void push_front(char_event_t ch);
+};
 
 #endif
diff --git a/src/reader.cpp b/src/reader.cpp
index 8e870590c..4884b5bda 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -345,6 +345,8 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     bool silent{false};
     /// The representation of the current screen contents.
     screen_t screen;
+    /// The source of input events.
+    inputter_t inputter;
     /// The history.
     history_t *history{nullptr};
     /// The history search.
@@ -2371,7 +2373,7 @@ struct readline_loop_state_t {
 /// Read normal characters, inserting them into the command line.
 /// \return the next unhandled event.
 maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rls) {
-    maybe_t<char_event_t> event_needing_handling = input_readch();
+    maybe_t<char_event_t> event_needing_handling = inputter.readch();
 
     if (!event_is_normal_char(*event_needing_handling) || !can_read(STDIN_FILENO))
         return event_needing_handling;
@@ -2391,7 +2393,7 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
         // Only allow commands on the first key; otherwise, we might have data we
         // need to insert on the commandline that the commmand might need to be able
         // to see.
-        auto next_event = input_readch(false);
+        auto next_event = inputter.readch(false);
         if (event_is_normal_char(next_event)) {
             arr[i] = next_event.get_char();
         } else {
@@ -3101,10 +3103,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                                  ? jump_precision_t::to
                                  : jump_precision_t::till;
             editable_line_t *el = active_edit_line();
-            wchar_t target = input_function_pop_arg();
+            wchar_t target = inputter.function_pop_arg();
             bool success = jump(direction, precision, el, target);
 
-            input_function_set_status(success);
+            inputter.function_set_status(success);
             reader_repaint_needed();
             break;
         }
@@ -3116,7 +3118,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 success = jump(last_jump_direction, last_jump_precision, el, last_jump_target);
             }
 
-            input_function_set_status(success);
+            inputter.function_set_status(success);
             reader_repaint_needed();
             break;
         }
@@ -3138,7 +3140,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
             last_jump_direction = original_dir;
 
-            input_function_set_status(success);
+            inputter.function_set_status(success);
             reader_repaint_needed();
             break;
         }
@@ -3147,9 +3149,9 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             if (expand_abbreviation_as_necessary(1)) {
                 super_highlight_me_plenty();
                 mark_repaint_needed();
-                input_function_set_status(true);
+                inputter.function_set_status(true);
             } else {
-                input_function_set_status(false);
+                inputter.function_set_status(false);
             }
             break;
         }
@@ -3394,6 +3396,12 @@ void reader_repaint_if_needed() {
     }
 }
 
+void reader_queue_ch(const char_event_t &ch) {
+    if (reader_data_t *data = current_data_or_null()) {
+        data->inputter.queue_ch(ch);
+    }
+}
+
 void reader_react_to_color_change() {
     reader_data_t *data = current_data_or_null();
     if (!data) return;
@@ -3401,7 +3409,7 @@ void reader_react_to_color_change() {
     if (!data->repaint_needed || !data->screen_reset_needed) {
         data->repaint_needed = true;
         data->screen_reset_needed = true;
-        input_common_queue_ch(readline_cmd_t::repaint);
+        data->inputter.queue_ch(readline_cmd_t::repaint);
     }
 }
 
diff --git a/src/reader.h b/src/reader.h
index 21a0f216d..efd768304 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -85,6 +85,10 @@ void reader_react_to_color_change();
 /// Repaint immediately if needed.
 void reader_repaint_if_needed();
 
+/// Enqueue an event to the back of the reader's input queue.
+class char_event_t;
+void reader_queue_ch(const char_event_t &ch);
+
 /// Run the specified command with the correct terminal modes, and while taking care to perform job
 /// notification, set the title, etc.
 void reader_run_command(const wcstring &buff);

From 671df141789fe645c1571a023fb373a8a51ae143 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Jun 2019 16:41:13 -0700
Subject: [PATCH 0658/1732] Thread a parser into inputter_t

---
 src/fish_tests.cpp |  2 +-
 src/input.cpp      | 11 ++++++-----
 src/input.h        |  5 ++++-
 src/reader.cpp     |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 5153a0fa6..e96db44f3 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3003,7 +3003,7 @@ static bool history_contains(const std::unique_ptr<history_t> &history, const wc
 
 static void test_input() {
     say(L"Testing input");
-    inputter_t input{};
+    inputter_t input{parser_t::principal_parser()};
     // Ensure sequences are order independent. Here we add two bindings where the first is a prefix
     // of the second, and then emit the second key list. The second binding should be invoked, not
     // the first!
diff --git a/src/input.cpp b/src/input.cpp
index 878ae2c4e..530cbe450 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -287,6 +287,8 @@ void init_input() {
     }
 }
 
+inputter_t::inputter_t(parser_t &parser) : parser_(parser.shared()) {}
+
 void inputter_t::function_push_arg(wchar_t arg) { input_function_args_.push_back(arg); }
 
 wchar_t inputter_t::function_pop_arg() {
@@ -363,12 +365,11 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
         //
         // FIXME(snnw): if commands add stuff to input queue (e.g. commandline -f execute), we won't
         // see that until all other commands have also been run.
-        auto &parser = parser_t::principal_parser();
-        auto last_statuses = parser.get_last_statuses();
+        auto last_statuses = parser_->get_last_statuses();
         for (const wcstring &cmd : m.commands) {
-            parser.eval(cmd, io_chain_t(), TOP);
+            parser_->eval(cmd, io_chain_t(), TOP);
         }
-        parser.set_last_statuses(std::move(last_statuses));
+        parser_->set_last_statuses(std::move(last_statuses));
         event_queue_.push_front(char_event_type_t::check_exit);
     } else {
         // Invalid binding, mixed commands and functions.  We would need to execute these one by
@@ -414,7 +415,7 @@ void inputter_t::push_front(char_event_t ch) { event_queue_.push_front(ch); }
 /// preset list. \return null if nothing matches.
 const input_mapping_t *inputter_t::find_mapping() {
     const input_mapping_t *generic = NULL;
-    const auto &vars = parser_t::principal_parser().vars();
+    const auto &vars = parser_->vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
 
     const auto lists = {&s_mapping_list, &s_preset_mapping_list};
diff --git a/src/input.h b/src/input.h
index 7168e2771..b5fb40ca1 100644
--- a/src/input.h
+++ b/src/input.h
@@ -27,6 +27,9 @@ class inputter_t {
     std::vector<wchar_t> input_function_args_{};
     bool function_status_{false};
 
+    // We need a parser to evaluate bindings.
+    const std::shared_ptr<parser_t> parser_;
+
     void function_push_arg(wchar_t arg);
     void function_push_args(readline_cmd_t code);
     void mapping_execute(const input_mapping_t &m, bool allow_commands);
@@ -36,7 +39,7 @@ class inputter_t {
     char_event_t read_characters_no_readline();
 
    public:
-    inputter_t() = default;
+    inputter_t(parser_t &parser);
 
     /// Read a character from fd 0. Try to convert some escape sequences into character constants,
     /// but do not permanently block the escape character.
diff --git a/src/reader.cpp b/src/reader.cpp
index 4884b5bda..197702719 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -433,7 +433,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     parser_t &parser() { return *parser_ref; }
 
     reader_data_t(std::shared_ptr<parser_t> parser, history_t *hist)
-        : parser_ref(std::move(parser)), history(hist) {}
+        : parser_ref(std::move(parser)), inputter(*parser_ref), history(hist) {}
 
     void update_buff_pos(editable_line_t *el, size_t buff_pos);
     void repaint();

From ad35fb7457a97555714168925d1f14397a271d6d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Jun 2019 16:57:52 -0700
Subject: [PATCH 0659/1732] Make the bind mode per-parser

Eliminates a use of principal_parser
---
 src/input.cpp | 10 ++++------
 src/input.h   |  6 ------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 530cbe450..fad6d9c77 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -161,17 +161,15 @@ static latch_t<std::vector<terminfo_mapping_t>> s_terminfo_mappings;
 static std::vector<terminfo_mapping_t> create_input_terminfo();
 
 /// Return the current bind mode.
-wcstring input_get_bind_mode(const environment_t &vars) {
+static wcstring input_get_bind_mode(const environment_t &vars) {
     auto mode = vars.get(FISH_BIND_MODE_VAR);
     return mode ? mode->as_string() : DEFAULT_BIND_MODE;
 }
 
 /// Set the current bind mode.
-void input_set_bind_mode(const wcstring &bm) {
+static void input_set_bind_mode(env_stack_t &vars, const wcstring &bm) {
     // Only set this if it differs to not execute variable handlers all the time.
     // modes may not be empty - empty is a sentinel value meaning to not change the mode
-    ASSERT_IS_MAIN_THREAD();
-    auto &vars = parser_t::principal_parser().vars();
     assert(!bm.empty());
     if (input_get_bind_mode(vars) != bm) {
         vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, bm);
@@ -339,7 +337,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
 
     // !has_functions && !has_commands: only set bind mode
     if (!has_commands && !has_functions) {
-        if (!m.sets_mode.empty()) input_set_bind_mode(m.sets_mode);
+        if (!m.sets_mode.empty()) input_set_bind_mode(parser_->vars(), m.sets_mode);
         return;
     }
 
@@ -378,7 +376,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
     }
 
     // Empty bind mode indicates to not reset the mode (#2871)
-    if (!m.sets_mode.empty()) input_set_bind_mode(m.sets_mode);
+    if (!m.sets_mode.empty()) input_set_bind_mode(parser_->vars(), m.sets_mode);
 }
 
 /// Try reading the specified function mapping.
diff --git a/src/input.h b/src/input.h
index b5fb40ca1..d3a4c2160 100644
--- a/src/input.h
+++ b/src/input.h
@@ -101,12 +101,6 @@ bool input_mapping_erase(const wcstring &sequence, const wcstring &mode = DEFAUL
 bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds,
                        bool user, wcstring *out_new_mode);
 
-/// Return the current bind mode.
-wcstring input_get_bind_mode(const environment_t &vars);
-
-/// Set the current bind mode.
-void input_set_bind_mode(const wcstring &bind_mode);
-
 /// Sets the return status of the most recently executed input function.
 void input_function_set_status(bool status);
 

From 2ef4d982dff60eeb92d3719d8b8f414f40eeee43 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Jun 2019 17:49:52 -0700
Subject: [PATCH 0660/1732] Clean up some dependencies in input.h

---
 src/builtin_bind.h | 2 --
 src/input.h        | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/builtin_bind.h b/src/builtin_bind.h
index 501d81724..2e33fc678 100644
--- a/src/builtin_bind.h
+++ b/src/builtin_bind.h
@@ -4,8 +4,6 @@
 
 #include "common.h"
 
-#define DEFAULT_BIND_MODE L"default"
-
 class parser_t;
 struct io_streams_t;
 struct bind_cmd_opts_t;
diff --git a/src/input.h b/src/input.h
index d3a4c2160..71561ee95 100644
--- a/src/input.h
+++ b/src/input.h
@@ -7,13 +7,13 @@
 
 #include <vector>
 
-#include "builtin_bind.h"
 #include "common.h"
 #include "input_common.h"
 
 #define FISH_BIND_MODE_VAR L"fish_bind_mode"
+#define DEFAULT_BIND_MODE L"default"
 
-class environment_t;
+class parser_t;
 
 wcstring describe_char(wint_t c);
 

From 890c1188ab5e44b1127e85d2f5d222f57769ab34 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Jun 2019 22:36:11 -0700
Subject: [PATCH 0661/1732] Instantize and rationalize locking around the input
 mapping set

Hypothetically a background thread could invoke builtin_bind, etc.
Protect the set of input bindings with a lock.
---
 src/builtin_bind.cpp |  18 +++---
 src/builtin_bind.h   |   8 +++
 src/fish_tests.cpp   |   8 ++-
 src/input.cpp        | 129 +++++++++++++++++++++++++------------------
 src/input.h          |  72 +++++++++++++++---------
 5 files changed, 143 insertions(+), 92 deletions(-)

diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 72d00be1a..0bd60682a 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -56,7 +56,7 @@ bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bo
     wcstring_list_t ecmds;
     wcstring sets_mode;
 
-    if (!input_mapping_get(seq, bind_mode, &ecmds, user, &sets_mode)) {
+    if (!input_mappings_->get(seq, bind_mode, &ecmds, user, &sets_mode)) {
         return false;
     }
 
@@ -116,7 +116,7 @@ bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bo
 
 /// List all current key bindings.
 void builtin_bind_t::list(const wchar_t *bind_mode, bool user, io_streams_t &streams) {
-    const std::vector<input_mapping_name_t> lst = input_mapping_get_names(user);
+    const std::vector<input_mapping_name_t> lst = input_mappings_->get_names(user);
 
     for (const input_mapping_name_t &binding : lst) {
         if (bind_mode && bind_mode != binding.mode) {
@@ -180,13 +180,13 @@ bool builtin_bind_t::add(const wchar_t *seq, const wchar_t *const *cmds, size_t
     if (terminfo) {
         wcstring seq2;
         if (get_terminfo_sequence(seq, &seq2, streams)) {
-            input_mapping_add(seq2.c_str(), cmds, cmds_len, mode, sets_mode, user);
+            input_mappings_->add(seq2.c_str(), cmds, cmds_len, mode, sets_mode, user);
         } else {
             return true;
         }
 
     } else {
-        input_mapping_add(seq, cmds, cmds_len, mode, sets_mode, user);
+        input_mappings_->add(seq, cmds, cmds_len, mode, sets_mode, user);
     }
 
     return false;
@@ -207,7 +207,7 @@ bool builtin_bind_t::add(const wchar_t *seq, const wchar_t *const *cmds, size_t
 bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo,
                            bool user, io_streams_t &streams) {
     if (all) {
-        input_mapping_clear(mode, user);
+        input_mappings_->clear(mode, user);
         return false;
     }
 
@@ -218,12 +218,12 @@ bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool us
         if (use_terminfo) {
             wcstring seq2;
             if (get_terminfo_sequence(*seq++, &seq2, streams)) {
-                input_mapping_erase(seq2, mode, user);
+                input_mappings_->erase(seq2, mode, user);
             } else {
                 res = true;
             }
         } else {
-            input_mapping_erase(*seq++, mode, user);
+            input_mappings_->erase(*seq++, mode, user);
         }
     }
 
@@ -297,8 +297,8 @@ bool builtin_bind_t::insert(int optind, int argc, wchar_t **argv, io_streams_t &
 /// List all current bind modes.
 void builtin_bind_t::list_modes(io_streams_t &streams) {
     // List all known modes, even if they are only in preset bindings.
-    const std::vector<input_mapping_name_t> lst = input_mapping_get_names(true);
-    const std::vector<input_mapping_name_t> preset_lst = input_mapping_get_names(false);
+    const std::vector<input_mapping_name_t> lst = input_mappings_->get_names(true);
+    const std::vector<input_mapping_name_t> preset_lst = input_mappings_->get_names(false);
     // A set accomplishes two things for us here:
     // - It removes duplicates (no twenty "default" entries).
     // - It sorts it, which makes it nicer on the user.
diff --git a/src/builtin_bind.h b/src/builtin_bind.h
index 2e33fc678..83dcfde1b 100644
--- a/src/builtin_bind.h
+++ b/src/builtin_bind.h
@@ -3,6 +3,7 @@
 #define FISH_BUILTIN_BIND_H
 
 #include "common.h"
+#include "input.h"
 
 class parser_t;
 struct io_streams_t;
@@ -12,9 +13,16 @@ class builtin_bind_t {
    public:
     int builtin_bind(parser_t &parser, io_streams_t &streams, wchar_t **argv);
 
+    builtin_bind_t() : input_mappings_(input_mappings()) {}
+
    private:
     bind_cmd_opts_t *opts;
 
+    /// Note that builtin_bind_t holds the singleton lock.
+    /// It must not call out to anything which can execute fish shell code or attempt to acquire the
+    /// lock again.
+    acquired_lock<input_mapping_set_t> input_mappings_;
+
     void list(const wchar_t *bind_mode, bool user, io_streams_t &streams);
     void key_names(bool all, io_streams_t &streams);
     void function_names(io_streams_t &streams);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e96db44f3..c5b3cb094 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3009,8 +3009,12 @@ static void test_input() {
     // the first!
     wcstring prefix_binding = L"qqqqqqqa";
     wcstring desired_binding = prefix_binding + L'a';
-    input_mapping_add(prefix_binding.c_str(), L"up-line");
-    input_mapping_add(desired_binding.c_str(), L"down-line");
+
+    {
+        auto input_mapping = input_mappings();
+        input_mapping->add(prefix_binding.c_str(), L"up-line");
+        input_mapping->add(desired_binding.c_str(), L"down-line");
+    }
 
     // Push the desired binding to the queue.
     for (size_t idx = 0; idx < desired_binding.size(); idx++) {
diff --git a/src/input.cpp b/src/input.cpp
index fad6d9c77..e2de13451 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -146,10 +146,14 @@ wcstring describe_char(wint_t c) {
     return format_string(L"%02x", c);
 }
 
-/// Mappings for the current input mode.
 using mapping_list_t = std::vector<input_mapping_t>;
-static mainthread_t<mapping_list_t> s_mapping_list;
-static mainthread_t<mapping_list_t> s_preset_mapping_list;
+input_mapping_set_t::input_mapping_set_t() = default;
+input_mapping_set_t::~input_mapping_set_t() = default;
+
+acquired_lock<input_mapping_set_t> input_mappings() {
+    static owning_lock<input_mapping_set_t> s_mappings{input_mapping_set_t()};
+    return s_mappings.acquire();
+}
 
 /// Terminfo map list.
 static latch_t<std::vector<terminfo_mapping_t>> s_terminfo_mappings;
@@ -200,20 +204,24 @@ static bool specification_order_is_less_than(const input_mapping_t &m1, const in
 
 /// Inserts an input mapping at the correct position. We sort them in descending order by length, so
 /// that we test longer sequences first.
-static void input_mapping_insert_sorted(const input_mapping_t &new_mapping, bool user = true) {
-    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+static void input_mapping_insert_sorted(mapping_list_t &ml, input_mapping_t new_mapping) {
     auto loc = std::lower_bound(ml.begin(), ml.end(), new_mapping, length_is_greater_than);
-    ml.insert(loc, new_mapping);
+    ml.insert(loc, std::move(new_mapping));
 }
 
 /// Adds an input mapping.
-void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands, size_t commands_len,
-                       const wchar_t *mode, const wchar_t *sets_mode, bool user) {
+void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *const *commands,
+                              size_t commands_len, const wchar_t *mode, const wchar_t *sets_mode,
+                              bool user) {
     assert(sequence && commands && mode && sets_mode && "Null parameter");
+
+    // Clear cached mappings.
+    all_mappings_cache_.reset();
+
     // Remove existing mappings with this sequence.
     const wcstring_list_t commands_vector(commands, commands + commands_len);
 
-    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+    mapping_list_t &ml = user ? mapping_list_ : preset_mapping_list_;
 
     for (input_mapping_t &m : ml) {
         if (m.seq == sequence && m.mode == mode) {
@@ -225,12 +233,12 @@ void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands,
 
     // Add a new mapping, using the next order.
     const input_mapping_t new_mapping = input_mapping_t(sequence, commands_vector, mode, sets_mode);
-    input_mapping_insert_sorted(new_mapping, user);
+    input_mapping_insert_sorted(ml, std::move(new_mapping));
 }
 
-void input_mapping_add(const wchar_t *sequence, const wchar_t *command, const wchar_t *mode,
-                       const wchar_t *sets_mode, bool user) {
-    input_mapping_add(sequence, &command, 1, mode, sets_mode, user);
+void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *command, const wchar_t *mode,
+                              const wchar_t *sets_mode, bool user) {
+    input_mapping_set_t::add(sequence, &command, 1, mode, sets_mode, user);
 }
 
 /// Handle interruptions to key reading by reaping finshed jobs and propagating the interrupt to the
@@ -265,23 +273,25 @@ void init_input() {
     input_common_init(&interrupt_handler);
     s_terminfo_mappings = create_input_terminfo();
 
+    auto input_mapping = input_mappings();
+
     // If we have no keybindings, add a few simple defaults.
-    mapping_list_t &preset_mapping_list = s_preset_mapping_list;
-    if (preset_mapping_list.empty()) {
-        input_mapping_add(L"", L"self-insert", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\n", L"execute", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\r", L"execute", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\t", L"complete", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x3", L"commandline ''", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x4", L"exit", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x5", L"bind", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x7f", L"backward-delete-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE,
-                          false);
+    if (input_mapping->preset_mapping_list_.empty()) {
+        input_mapping->add(L"", L"self-insert", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\n", L"execute", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\r", L"execute", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\t", L"complete", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x3", L"commandline ''", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x4", L"exit", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x5", L"bind", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x7f", L"backward-delete-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE,
+                           false);
         // Arrows - can't have functions, so *-or-search isn't available.
-        input_mapping_add(L"\x1B[A", L"up-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x1B[B", L"down-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x1B[C", L"forward-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
-        input_mapping_add(L"\x1B[D", L"backward-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x1B[A", L"up-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x1B[B", L"down-line", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x1B[C", L"forward-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE, false);
+        input_mapping->add(L"\x1B[D", L"backward-char", DEFAULT_BIND_MODE, DEFAULT_BIND_MODE,
+                           false);
     }
 }
 
@@ -411,32 +421,28 @@ void inputter_t::push_front(char_event_t ch) { event_queue_.push_front(ch); }
 
 /// \return the first mapping that matches, walking first over the user's mapping list, then the
 /// preset list. \return null if nothing matches.
-const input_mapping_t *inputter_t::find_mapping() {
+maybe_t<input_mapping_t> inputter_t::find_mapping() {
     const input_mapping_t *generic = NULL;
     const auto &vars = parser_->vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
 
-    const auto lists = {&s_mapping_list, &s_preset_mapping_list};
-    for (const auto *listp : lists) {
-        const mapping_list_t &ml = *listp;
-        for (const auto &m : ml) {
-            if (m.mode != bind_mode) {
-                continue;
-            }
+    auto ml = input_mappings()->all_mappings();
+    for (const auto &m : *ml) {
+        if (m.mode != bind_mode) {
+            continue;
+        }
 
-            if (m.is_generic()) {
-                if (!generic) generic = &m;
-            } else if (mapping_is_match(m)) {
-                return &m;
-            }
+        if (m.is_generic()) {
+            if (!generic) generic = &m;
+        } else if (mapping_is_match(m)) {
+            return m;
         }
     }
-    return generic;
+    return generic ? maybe_t<input_mapping_t>(*generic) : none();
 }
 
 void inputter_t::mapping_execute_matching_or_generic(bool allow_commands) {
-    const input_mapping_t *mapping = find_mapping();
-    if (mapping) {
+    if (auto mapping = find_mapping()) {
         mapping_execute(*mapping, allow_commands);
     } else {
         debug(2, L"no generic found, ignoring char...");
@@ -510,10 +516,10 @@ char_event_t inputter_t::readch(bool allow_commands) {
     }
 }
 
-std::vector<input_mapping_name_t> input_mapping_get_names(bool user) {
+std::vector<input_mapping_name_t> input_mapping_set_t::get_names(bool user) const {
     // Sort the mappings by the user specification order, so we can return them in the same order
     // that the user specified them in.
-    std::vector<input_mapping_t> local_list = user ? s_mapping_list : s_preset_mapping_list;
+    std::vector<input_mapping_t> local_list = user ? mapping_list_ : preset_mapping_list_;
     std::sort(local_list.begin(), local_list.end(), specification_order_is_less_than);
     std::vector<input_mapping_name_t> result;
     result.reserve(local_list.size());
@@ -525,17 +531,19 @@ std::vector<input_mapping_name_t> input_mapping_get_names(bool user) {
     return result;
 }
 
-void input_mapping_clear(const wchar_t *mode, bool user) {
-    ASSERT_IS_MAIN_THREAD();
-    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+void input_mapping_set_t::clear(const wchar_t *mode, bool user) {
+    all_mappings_cache_.reset();
+    mapping_list_t &ml = user ? mapping_list_ : preset_mapping_list_;
     auto should_erase = [=](const input_mapping_t &m) { return mode == NULL || mode == m.mode; };
     ml.erase(std::remove_if(ml.begin(), ml.end(), should_erase), ml.end());
 }
 
-bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool user) {
-    ASSERT_IS_MAIN_THREAD();
+bool input_mapping_set_t::erase(const wcstring &sequence, const wcstring &mode, bool user) {
+    // Clear cached mappings.
+    all_mappings_cache_.reset();
+
     bool result = false;
-    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+    mapping_list_t &ml = user ? mapping_list_ : preset_mapping_list_;
     for (std::vector<input_mapping_t>::iterator it = ml.begin(), end = ml.end(); it != end; ++it) {
         if (sequence == it->seq && mode == it->mode) {
             ml.erase(it);
@@ -546,10 +554,10 @@ bool input_mapping_erase(const wcstring &sequence, const wcstring &mode, bool us
     return result;
 }
 
-bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds,
-                       bool user, wcstring *out_sets_mode) {
+bool input_mapping_set_t::get(const wcstring &sequence, const wcstring &mode,
+                              wcstring_list_t *out_cmds, bool user, wcstring *out_sets_mode) {
     bool result = false;
-    mapping_list_t &ml = user ? s_mapping_list : s_preset_mapping_list;
+    mapping_list_t &ml = user ? mapping_list_ : preset_mapping_list_;
     for (const input_mapping_t &m : ml) {
         if (sequence == m.seq && mode == m.mode) {
             *out_cmds = m.commands;
@@ -561,6 +569,17 @@ bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_
     return result;
 }
 
+std::shared_ptr<const mapping_list_t> input_mapping_set_t::all_mappings() {
+    // Populate the cache if needed.
+    if (!all_mappings_cache_) {
+        mapping_list_t all_mappings = mapping_list_;
+        all_mappings.insert(all_mappings.end(), preset_mapping_list_.begin(),
+                            preset_mapping_list_.end());
+        all_mappings_cache_ = std::make_shared<const mapping_list_t>(std::move(all_mappings));
+    }
+    return all_mappings_cache_;
+}
+
 /// Create a list of terminfo mappings.
 static std::vector<terminfo_mapping_t> create_input_terminfo() {
     assert(curses_initialized);
diff --git a/src/input.h b/src/input.h
index 71561ee95..b6369b899 100644
--- a/src/input.h
+++ b/src/input.h
@@ -35,7 +35,7 @@ class inputter_t {
     void mapping_execute(const input_mapping_t &m, bool allow_commands);
     void mapping_execute_matching_or_generic(bool allow_commands);
     bool mapping_is_match(const input_mapping_t &m);
-    const input_mapping_t *find_mapping();
+    maybe_t<input_mapping_t> find_mapping();
     char_event_t read_characters_no_readline();
 
    public:
@@ -69,40 +69,60 @@ class inputter_t {
     wchar_t function_pop_arg();
 };
 
-/// Add a key mapping from the specified sequence to the specified command.
-///
-/// \param sequence the sequence to bind
-/// \param command an input function that will be run whenever the key sequence occurs
-void input_mapping_add(const wchar_t *sequence, const wchar_t *command,
-                       const wchar_t *mode = DEFAULT_BIND_MODE,
-                       const wchar_t *new_mode = DEFAULT_BIND_MODE, bool user = true);
-
-void input_mapping_add(const wchar_t *sequence, const wchar_t *const *commands, size_t commands_len,
-                       const wchar_t *mode = DEFAULT_BIND_MODE,
-                       const wchar_t *new_mode = DEFAULT_BIND_MODE, bool user = true);
-
 struct input_mapping_name_t {
     wcstring seq;
     wcstring mode;
 };
 
-/// Returns all mapping names and modes.
-std::vector<input_mapping_name_t> input_mapping_get_names(bool user = true);
+/// The input mapping set is the set of mappings from character sequences to commands.
+class input_mapping_set_t {
+    friend acquired_lock<input_mapping_set_t> input_mappings();
+    friend void init_input();
 
-/// Erase all bindings
-void input_mapping_clear(const wchar_t *mode = NULL, bool user = true);
+    using mapping_list_t = std::vector<input_mapping_t>;
 
-/// Erase binding for specified key sequence.
-bool input_mapping_erase(const wcstring &sequence, const wcstring &mode = DEFAULT_BIND_MODE,
-                         bool user = true);
+    mapping_list_t mapping_list_;
+    mapping_list_t preset_mapping_list_;
+    std::shared_ptr<const mapping_list_t> all_mappings_cache_;
 
-/// Gets the command bound to the specified key sequence in the specified mode. Returns true if it
-/// exists, false if not.
-bool input_mapping_get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds,
-                       bool user, wcstring *out_new_mode);
+    input_mapping_set_t();
 
-/// Sets the return status of the most recently executed input function.
-void input_function_set_status(bool status);
+   public:
+    ~input_mapping_set_t();
+
+    /// Erase all bindings.
+    void clear(const wchar_t *mode = NULL, bool user = true);
+
+    /// Erase binding for specified key sequence.
+    bool erase(const wcstring &sequence, const wcstring &mode = DEFAULT_BIND_MODE,
+               bool user = true);
+
+    /// Gets the command bound to the specified key sequence in the specified mode. Returns true if
+    /// it exists, false if not.
+    bool get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds, bool user,
+             wcstring *out_new_mode);
+
+    /// Returns all mapping names and modes.
+    std::vector<input_mapping_name_t> get_names(bool user = true) const;
+
+    /// Add a key mapping from the specified sequence to the specified command.
+    ///
+    /// \param sequence the sequence to bind
+    /// \param command an input function that will be run whenever the key sequence occurs
+    void add(const wchar_t *sequence, const wchar_t *command,
+             const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *new_mode = DEFAULT_BIND_MODE,
+             bool user = true);
+
+    void add(const wchar_t *sequence, const wchar_t *const *commands, size_t commands_len,
+             const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *new_mode = DEFAULT_BIND_MODE,
+             bool user = true);
+
+    /// \return a snapshot of the list of input mappings.
+    std::shared_ptr<const mapping_list_t> all_mappings();
+};
+
+/// Access the singleton input mapping set.
+acquired_lock<input_mapping_set_t> input_mappings();
 
 /// Return the sequence for the terminfo variable of the specified name.
 ///

From ff5524944778965e935de4b9b1bf64da535118e1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 02:31:13 -0700
Subject: [PATCH 0662/1732] Make events per-parser

This makes the following changes:

1. Events in background threads are executed in those threads, instead of
being silently dropped

2. Blocked events are now per-parser instead of global

3. Events are posted in builtin_set instead of within the environment stack

The last one means that we no longer support event handlers for implicit
sets like (example) argv. Instead only the `set` builtin (and also `cd`)
post variable-change events.

Events from universal variable changes are still not fully rationalized.
---
 src/builtin_cd.cpp      |  6 ++++-
 src/builtin_emit.cpp    |  2 +-
 src/builtin_read.cpp    |  2 +-
 src/builtin_set.cpp     | 24 ++++++++++++++-----
 src/env.cpp             | 23 +++++++++++-------
 src/env.h               | 17 +++++++++----
 src/env_dispatch.cpp    |  5 +++-
 src/event.cpp           | 53 +++++++++++++++--------------------------
 src/event.h             | 12 ++++++----
 src/fish.cpp            |  5 ++--
 src/input.cpp           | 10 ++++----
 src/parse_execution.cpp |  2 +-
 src/parser.h            |  4 ++++
 src/proc.cpp            |  2 +-
 src/reader.cpp          |  6 ++---
 tests/cd.err            |  3 +++
 tests/cd.in             |  7 ++++++
 tests/cd.out            |  4 ++++
 18 files changed, 115 insertions(+), 72 deletions(-)

diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index 92f7d9ce4..e347bf0d9 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -87,6 +87,10 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_ERROR;
     }
 
-    parser.vars().set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, std::move(norm_dir));
+    std::vector<event_t> evts;
+    parser.vars().set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, std::move(norm_dir), &evts);
+    for (const auto &evt : evts) {
+        event_fire(parser, evt);
+    }
     return STATUS_CMD_OK;
 }
diff --git a/src/builtin_emit.cpp b/src/builtin_emit.cpp
index 805984816..46045ef5c 100644
--- a/src/builtin_emit.cpp
+++ b/src/builtin_emit.cpp
@@ -31,6 +31,6 @@ int builtin_emit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     const wchar_t *eventname = argv[optind];
     wcstring_list_t args(argv + optind + 1, argv + argc);
-    event_fire_generic(eventname, &args);
+    event_fire_generic(parser, eventname, &args);
     return STATUS_CMD_OK;
 }
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 1240b675c..1e32d62c3 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -223,7 +223,7 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
     reader_set_buffer(commandline, std::wcslen(commandline));
     proc_push_interactive(1);
 
-    event_fire_generic(L"fish_prompt");
+    event_fire_generic(parser, L"fish_prompt");
     auto mline = reader_readline(nchars);
     proc_pop_interactive();
     if (mline) {
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 2fd45a3d3..3e6d913cc 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -341,12 +341,12 @@ static void handle_env_return(int retval, const wchar_t *cmd, const wchar_t *key
 /// description of the problem to stderr.
 static int env_set_reporting_errors(const wchar_t *cmd, const wchar_t *key, int scope,
                                     const wcstring_list_t &list, io_streams_t &streams,
-                                    env_stack_t &vars) {
+                                    env_stack_t &vars, std::vector<event_t> *evts) {
     if (is_path_variable(key) && !validate_path_warning_on_colons(cmd, key, list, streams, vars)) {
         return STATUS_CMD_ERROR;
     }
 
-    int retval = vars.set(key, scope | ENV_USER, list);
+    int retval = vars.set(key, scope | ENV_USER, list, evts);
     handle_env_return(retval, cmd, key, streams);
 
     return retval;
@@ -649,8 +649,9 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
         return STATUS_INVALID_ARGS;
     }
 
+    std::vector<event_t> evts;
     if (idx_count == 0) {  // unset the var
-        retval = parser.vars().remove(dest, scope);
+        retval = parser.vars().remove(dest, scope, &evts);
         // When a non-existent-variable is unset, return ENV_NOT_FOUND as $status
         // but do not emit any errors at the console as a compromise between user
         // friendliness and correctness.
@@ -663,7 +664,12 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
         wcstring_list_t result;
         dest_var->to_list(result);
         erase_values(result, indexes);
-        retval = env_set_reporting_errors(cmd, dest, scope, result, streams, parser.vars());
+        retval = env_set_reporting_errors(cmd, dest, scope, result, streams, parser.vars(), &evts);
+    }
+
+    // Fire any events.
+    for (const auto &evt : evts) {
+        event_fire(parser, evt);
     }
 
     if (retval != STATUS_CMD_OK) return retval;
@@ -675,7 +681,6 @@ static int set_var_array(const wchar_t *cmd, set_cmd_opts_t &opts, const wchar_t
                          wcstring_list_t &new_values, int argc, wchar_t **argv, parser_t &parser,
                          io_streams_t &streams) {
     UNUSED(cmd);
-    UNUSED(parser);
     UNUSED(streams);
 
     if (opts.prepend || opts.append) {
@@ -771,7 +776,14 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
     }
     if (retval != STATUS_CMD_OK) return retval;
 
-    retval = env_set_reporting_errors(cmd, varname, scope, new_values, streams, parser.vars());
+    std::vector<event_t> evts;
+    retval =
+        env_set_reporting_errors(cmd, varname, scope, new_values, streams, parser.vars(), &evts);
+    // Fire any events.
+    for (const auto &evt : evts) {
+        event_fire(parser, evt);
+    }
+
     if (retval != STATUS_CMD_OK) return retval;
     return check_global_scope_exists(cmd, opts, varname, streams, parser.vars());
 }
diff --git a/src/env.cpp b/src/env.cpp
index 5ab4fdb4b..5ffbac829 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1212,7 +1212,8 @@ maybe_t<env_var_t> env_stack_t::get(const wcstring &key, env_mode_flags_t mode)
 
 wcstring_list_t env_stack_t::get_names(int flags) const { return acquire_impl()->get_names(flags); }
 
-int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals) {
+int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals,
+                     std::vector<event_t> *out_events) {
     // Historical behavior.
     if (vals.size() == 1 && (key == L"PWD" || key == L"HOME")) {
         path_make_canonical(vals.front());
@@ -1223,7 +1224,9 @@ int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t
     if (ret == ENV_OK) {
         // Important to not hold the lock here.
         env_dispatch_var_change(key, *this);
-        event_fire(event_t::variable(key, {L"VARIABLE", L"SET", key}));
+        if (out_events) {
+            out_events->push_back(event_t::variable(key, {L"VARIABLE", L"SET", key}));
+        }
     }
     if (needs_uvar_sync) {
         universal_barrier();
@@ -1231,23 +1234,27 @@ int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t
     return ret;
 }
 
-int env_stack_t::set_one(const wcstring &key, env_mode_flags_t mode, wcstring val) {
+int env_stack_t::set_one(const wcstring &key, env_mode_flags_t mode, wcstring val,
+                         std::vector<event_t> *out_events) {
     wcstring_list_t vals;
     vals.push_back(std::move(val));
-    return set(key, mode, std::move(vals));
+    return set(key, mode, std::move(vals), out_events);
 }
 
-int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode) {
-    return set(key, mode, {});
+int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode,
+                           std::vector<event_t> *out_events) {
+    return set(key, mode, {}, out_events);
 }
 
-int env_stack_t::remove(const wcstring &key, int mode) {
+int env_stack_t::remove(const wcstring &key, int mode, std::vector<event_t> *out_events) {
     bool needs_uvar_sync = false;
     int ret = acquire_impl()->remove(key, mode, &needs_uvar_sync);
     if (ret == ENV_OK) {
         // Important to not hold the lock here.
         env_dispatch_var_change(key, *this);
-        event_fire(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
+        if (out_events) {
+            out_events->push_back(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
+        }
     }
     if (needs_uvar_sync) {
         universal_barrier();
diff --git a/src/env.h b/src/env.h
index f026da57a..66756a6ba 100644
--- a/src/env.h
+++ b/src/env.h
@@ -16,6 +16,8 @@
 extern size_t read_byte_limit;
 extern bool curses_initialized;
 
+struct event_t;
+
 /// Character for separating two array elements. We use 30, i.e. the ascii record separator since
 /// that seems logical.
 #define ARRAY_SEP (wchar_t)0x1e
@@ -235,13 +237,18 @@ class env_stack_t final : public environment_t {
     wcstring_list_t get_names(int flags) const override;
 
     /// Sets the variable with the specified name to the given values.
-    int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals);
+    /// If \p out_events is supplied, populate it with any events generated through setting the
+    /// variable.
+    int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t vals,
+            std::vector<event_t> *out_events = nullptr);
 
     /// Sets the variable with the specified name to a single value.
-    int set_one(const wcstring &key, env_mode_flags_t mode, wcstring val);
+    int set_one(const wcstring &key, env_mode_flags_t mode, wcstring val,
+                std::vector<event_t> *out_events = nullptr);
 
     /// Sets the variable with the specified name to no values.
-    int set_empty(const wcstring &key, env_mode_flags_t mode);
+    int set_empty(const wcstring &key, env_mode_flags_t mode,
+                  std::vector<event_t> *out_events = nullptr);
 
     /// Update the PWD variable based on the result of getcwd.
     void set_pwd_from_getcwd();
@@ -252,9 +259,11 @@ class env_stack_t final : public environment_t {
     /// \param mode should be ENV_USER if this is a remove request from the user, 0 otherwise. If
     /// this is a user request, read-only variables can not be removed. The mode may also specify
     /// the scope of the variable that should be erased.
+    /// \param out_events if non-null, populate it with any events generated from removing this
+    /// variable.
     ///
     /// \return zero if the variable existed, and non-zero if the variable did not exist
-    int remove(const wcstring &key, int mode);
+    int remove(const wcstring &key, int mode, std::vector<event_t> *out_events = nullptr);
 
     /// Push the variable stack. Used for implementing local variables for functions and for-loops.
     void push(bool new_scope);
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index aba29700e..c69d85850 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -45,6 +45,7 @@
 #include "input_common.h"
 #include "maybe.h"
 #include "output.h"
+#include "parser.h"
 #include "proc.h"
 #include "reader.h"
 #include "screen.h"
@@ -211,7 +212,9 @@ static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
 
     env_dispatch_var_change(cb.key, *stack);
     stack->mark_changed_exported();
-    event_fire(event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
+
+    // TODO: eliminate this principal_parser. Need to rationalize how multiple threads work here.
+    event_fire(parser_t::principal_parser(), event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));
 }
 
 void env_universal_callbacks(env_stack_t *stack, const callback_data_list_t &callbacks) {
diff --git a/src/event.cpp b/src/event.cpp
index 96e78d9ad..bf7c17f5c 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -86,10 +86,6 @@ static pending_signals_t s_pending_signals;
 /// List of event handlers.
 static event_handler_list_t s_event_handlers;
 
-/// List of events that have been sent but have not yet been delivered because they are blocked.
-using event_list_t = std::vector<shared_ptr<event_t>>;
-static event_list_t blocked;
-
 /// Variables (one per signal) set when a signal is observed. This is inspected by a signal handler.
 static volatile bool s_observed_signals[NSIG] = {};
 static void set_signal_observed(int sig, bool val) {
@@ -130,11 +126,9 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
 }
 
 /// Test if specified event is blocked.
-static int event_is_blocked(const event_t &e) {
+static int event_is_blocked(parser_t &parser, const event_t &e) {
     (void)e;
     const block_t *block;
-    parser_t &parser = parser_t::principal_parser();
-
     size_t idx = 0;
     while ((block = parser.block_at_index(idx++))) {
         if (event_block_list_blocks_type(block->event_blocks)) return true;
@@ -246,9 +240,8 @@ bool event_is_signal_observed(int sig) {
 /// Perform the specified event. Since almost all event firings will not be matched by even a single
 /// event handler, we make sure to optimize the 'no matches' path. This means that nothing is
 /// allocated/initialized unless needed.
-static void event_fire_internal(const event_t &event) {
-    ASSERT_IS_MAIN_THREAD();
-    auto &ld = parser_t::principal_parser().libdata();
+static void event_fire_internal(parser_t &parser, const event_t &event) {
+    auto &ld = parser.libdata();
     assert(ld.is_event >= 0 && "is_event should not be negative");
     scoped_push<decltype(ld.is_event)> inc_event{&ld.is_event, ld.is_event + 1};
 
@@ -293,18 +286,14 @@ static void event_fire_internal(const event_t &event) {
 }
 
 /// Handle all pending signal events.
-void event_fire_delayed() {
-    // Hack: only allow events on the main thread.
-    // TODO: rationalize how events work with multiple threads.
-    if (!is_main_thread()) return;
-
-    auto &parser = parser_t::principal_parser();
+void event_fire_delayed(parser_t &parser) {
+    auto &ld = parser.libdata();
     // Do not invoke new event handlers from within event handlers.
-    if (parser.libdata().is_event) return;
+    if (ld.is_event) return;
 
-    event_list_t to_send;
-    to_send.swap(blocked);
-    assert(blocked.empty());
+    std::vector<shared_ptr<event_t>> to_send;
+    to_send.swap(ld.blocked_events);
+    assert(ld.blocked_events.empty());
 
     // Append all signal events to to_send.
     auto signals = s_pending_signals.acquire_pending();
@@ -321,10 +310,10 @@ void event_fire_delayed() {
 
     // Fire or re-block all events.
     for (const auto &evt : to_send) {
-        if (event_is_blocked(*evt)) {
-            blocked.push_back(evt);
+        if (event_is_blocked(parser, *evt)) {
+            ld.blocked_events.push_back(evt);
         } else {
-            event_fire_internal(*evt);
+            event_fire_internal(parser, *evt);
         }
     }
 }
@@ -334,18 +323,14 @@ void event_enqueue_signal(int signal) {
     s_pending_signals.mark(signal);
 }
 
-void event_fire(const event_t &event) {
-    // Hack: only allow events on the main thread.
-    // TODO: rationalize how events work with multiple threads.
-    if (!is_main_thread()) return;
-
+void event_fire(parser_t &parser, const event_t &event) {
     // Fire events triggered by signals.
-    event_fire_delayed();
+    event_fire_delayed(parser);
 
-    if (event_is_blocked(event)) {
-        blocked.push_back(std::make_shared<event_t>(event));
+    if (event_is_blocked(parser, event)) {
+        parser.libdata().blocked_events.push_back(std::make_shared<event_t>(event));
     } else {
-        event_fire_internal(event);
+        event_fire_internal(parser, event);
     }
 }
 
@@ -440,13 +425,13 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
     }
 }
 
-void event_fire_generic(const wchar_t *name, const wcstring_list_t *args) {
+void event_fire_generic(parser_t &parser, const wchar_t *name, const wcstring_list_t *args) {
     assert(name && "Null name");
 
     event_t ev(event_type_t::generic);
     ev.desc.str_param1 = name;
     if (args) ev.arguments = *args;
-    event_fire(ev);
+    event_fire(parser, ev);
 }
 
 event_description_t event_description_t::signal(int sig) {
diff --git a/src/event.h b/src/event.h
index 7fa7baf8f..1913d2e8b 100644
--- a/src/event.h
+++ b/src/event.h
@@ -90,6 +90,8 @@ struct event_t {
     static event_t variable(wcstring name, wcstring_list_t args);
 };
 
+class parser_t;
+
 /// Add an event handler.
 void event_add_handler(std::shared_ptr<event_handler_t> eh);
 
@@ -103,11 +105,11 @@ event_handler_list_t event_get_function_handlers(const wcstring &name);
 /// a signal handler.
 bool event_is_signal_observed(int signal);
 
-/// Fire the specified event \p event.
-void event_fire(const event_t &event);
+/// Fire the specified event \p event, executing it on \p parser.
+void event_fire(parser_t &parser, const event_t &event);
 
-/// Fire all delayed eents.
-void event_fire_delayed();
+/// Fire all delayed events attached to the given parser.
+void event_fire_delayed(parser_t &parser);
 
 /// Enqueue a signal event. Invoked from a signal handler.
 void event_enqueue_signal(int signal);
@@ -119,7 +121,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter);
 wcstring event_get_desc(const event_t &e);
 
 /// Fire a generic event with the specified name.
-void event_fire_generic(const wchar_t *name, const wcstring_list_t *args = NULL);
+void event_fire_generic(parser_t &parser, const wchar_t *name, const wcstring_list_t *args = NULL);
 
 /// Return the event type for a given name, or none.
 maybe_t<event_type_t> event_type_for_name(const wcstring &name);
diff --git a/src/fish.cpp b/src/fish.cpp
index 7afe73ed9..07288b9f7 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -522,11 +522,12 @@ int main(int argc, char **argv) {
 
     // TODO: The generic process-exit event is useless and unused.
     // Remove this in future.
-    event_fire(proc_create_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status));
+    event_fire(parser,
+               proc_create_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status));
 
     // Trigger any exit handlers.
     wcstring_list_t event_args = {to_string(exit_status)};
-    event_fire_generic(L"fish_exit", &event_args);
+    event_fire_generic(parser, L"fish_exit", &event_args);
 
     restore_term_mode();
     restore_term_foreground_process_group();
diff --git a/src/input.cpp b/src/input.cpp
index e2de13451..d490fd07e 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -241,14 +241,16 @@ void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *command, c
     input_mapping_set_t::add(sequence, &command, 1, mode, sets_mode, user);
 }
 
-/// Handle interruptions to key reading by reaping finshed jobs and propagating the interrupt to the
-/// reader.
+/// Handle interruptions to key reading by reaping finished jobs and propagating the interrupt to
+/// the reader.
 static maybe_t<char_event_t> interrupt_handler() {
     // Fire any pending events.
-    event_fire_delayed();
+    // TODO: eliminate this principal_parser().
+    auto &parser = parser_t::principal_parser();
+    event_fire_delayed(parser);
     // Reap stray processes, including printing exit status messages.
     // TODO: shouldn't need this parser here.
-    if (job_reap(parser_t::principal_parser(), true)) reader_repaint_needed();
+    if (job_reap(parser, true)) reader_repaint_needed();
     // Tell the reader an event occured.
     if (reader_reading_interrupted()) {
         auto vintr = shell_modes.c_cc[VINTR];
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index f15c4048d..46bb1d104 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -729,7 +729,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
             event_args.insert(event_args.begin(), cmd_str);
         }
 
-        event_fire_generic(L"fish_command_not_found", &event_args);
+        event_fire_generic(*parser, L"fish_command_not_found", &event_args);
 
         // Here we want to report an error (so it shows a backtrace), but with no text.
         this->report_error(statement, L"");
diff --git a/src/parser.h b/src/parser.h
index 3fa3c1d93..d74833547 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -119,6 +119,7 @@ struct profile_item_t {
 
 class parse_execution_context_t;
 class completion_t;
+struct event_t;
 
 /// Miscelleneous data used to avoid recursion and others.
 struct library_data_t {
@@ -160,6 +161,9 @@ struct library_data_t {
     /// The current filename we are evaluating, either from builtin source or on the command line.
     /// This is an intern'd string.
     const wchar_t *current_filename{};
+
+    /// List of events that have been sent but have not yet been delivered because they are blocked.
+    std::vector<shared_ptr<event_t>> blocked_events;
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {
diff --git a/src/proc.cpp b/src/proc.cpp
index dd827d7a8..3e316aba4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -618,7 +618,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
 
     // Post pending exit events.
     for (const auto &evt : exit_events) {
-        event_fire(evt);
+        event_fire(parser, evt);
     }
 
     if (printed) {
diff --git a/src/reader.cpp b/src/reader.cpp
index 197702719..b7869ce90 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2242,7 +2242,7 @@ static int read_i(parser_t &parser) {
     data->prev_end_loop = 0;
 
     while (!shell_is_exiting()) {
-        event_fire_generic(L"fish_prompt");
+        event_fire_generic(parser, L"fish_prompt");
         run_count++;
 
         if (parser.libdata().is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
@@ -2271,9 +2271,9 @@ static int read_i(parser_t &parser) {
             data->command_line.text.clear();
             data->command_line_changed(&data->command_line);
             wcstring_list_t argv(1, command);
-            event_fire_generic(L"fish_preexec", &argv);
+            event_fire_generic(parser, L"fish_preexec", &argv);
             reader_run_command(parser, command);
-            event_fire_generic(L"fish_postexec", &argv);
+            event_fire_generic(parser, L"fish_postexec", &argv);
             // Allow any pending history items to be returned in the history array.
             if (data->history) {
                 data->history->resolve_pending();
diff --git a/tests/cd.err b/tests/cd.err
index fae7b99e0..331132ff0 100644
--- a/tests/cd.err
+++ b/tests/cd.err
@@ -10,3 +10,6 @@
 
 ####################
 # CDPATH
+
+####################
+# on-variable PWD
diff --git a/tests/cd.in b/tests/cd.in
index 88718c16a..3ac2c9d02 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -79,3 +79,10 @@ test $PWD = $base; and echo No crash with ./ CDPATH
 # cd back before removing the test directory again.
 cd $oldpwd
 rm -Rf $base
+
+logmsg on-variable PWD
+# Verify that PWD on-variable events are sent
+function __fish_test_changed_pwd --on-variable PWD
+   echo "Changed to $PWD"
+end
+cd /
diff --git a/tests/cd.out b/tests/cd.out
index 8c786556a..b47e701f4 100644
--- a/tests/cd.out
+++ b/tests/cd.out
@@ -30,3 +30,7 @@ Gone to linkhome via CDPATH
 Gone to base
 Gone to linkhome via implicit . in CDPATH
 No crash with ./ CDPATH
+
+####################
+# on-variable PWD
+Changed to /

From ad301ab3a0ba1a48e67d661c531c339c7149732d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 02:55:36 -0700
Subject: [PATCH 0663/1732] Remove an incorrect shadowing use of
 principal_parser

---
 src/event.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/event.cpp b/src/event.cpp
index bf7c17f5c..53d6d652e 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -274,7 +274,6 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
         // Event handlers are not part of the main flow of code, so they are marked as
         // non-interactive.
         proc_push_interactive(0);
-        parser_t &parser = parser_t::principal_parser();
         auto prev_statuses = parser.get_last_statuses();
 
         block_t *b = parser.push_block(block_t::event_block(event));

From c566756f3b79d0068e2b3e4561a8e1eaae35075f Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 3 Jun 2019 22:31:15 +0900
Subject: [PATCH 0664/1732] Fix long option name of zypper

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

diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index c84d2fd2f..82e331bd4 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -438,7 +438,7 @@ end
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l uninstalled-only -s u -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only -s u -d 'Show only packages that are not currently installed'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
@@ -481,7 +481,7 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l uninstalled-only -s u -d 'Show only packages which are not installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
@@ -495,7 +495,7 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l uninstalled-only -s u -d 'Show only patterns which are not installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
     __fish_zypper_cmd_in_array products pd
@@ -503,7 +503,7 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l uninstalled-only -s u -d 'Show only products which are not installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
     __fish_zypper_cmd_in_array addlock al

From ead16958b2322e1da541b4a5688dc5cba7fdeac7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 00:02:22 -0700
Subject: [PATCH 0665/1732] Make set_signal_observed thread-safe

---
 src/event.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/event.cpp b/src/event.cpp
index 53d6d652e..7fb174ab2 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -87,9 +87,9 @@ static pending_signals_t s_pending_signals;
 static event_handler_list_t s_event_handlers;
 
 /// Variables (one per signal) set when a signal is observed. This is inspected by a signal handler.
-static volatile bool s_observed_signals[NSIG] = {};
+static volatile sig_atomic_t s_observed_signals[NSIG] = {};
+
 static void set_signal_observed(int sig, bool val) {
-    ASSERT_IS_MAIN_THREAD();
     if (sig >= 0 && (size_t)sig < sizeof s_observed_signals / sizeof *s_observed_signals) {
         s_observed_signals[sig] = val;
     }

From bc103c2ea68b42ba56c8befa5947a2f1a0eb5d90 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 12:33:10 -0700
Subject: [PATCH 0666/1732] Make the list of event handlers thread safe

---
 src/event.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/event.cpp b/src/event.cpp
index 7fb174ab2..d09ce860e 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -84,7 +84,7 @@ class pending_signals_t {
 static pending_signals_t s_pending_signals;
 
 /// List of event handlers.
-static event_handler_list_t s_event_handlers;
+static owning_lock<event_handler_list_t> s_event_handlers;
 
 /// Variables (one per signal) set when a signal is observed. This is inspected by a signal handler.
 static volatile sig_atomic_t s_observed_signals[NSIG] = {};
@@ -204,23 +204,23 @@ void event_add_handler(std::shared_ptr<event_handler_t> eh) {
         set_signal_observed(eh->desc.param1.signal, true);
     }
 
-    s_event_handlers.push_back(std::move(eh));
+    s_event_handlers.acquire()->push_back(std::move(eh));
 }
 
 void event_remove_function_handlers(const wcstring &name) {
-    ASSERT_IS_MAIN_THREAD();
-    auto begin = s_event_handlers.begin(), end = s_event_handlers.end();
-    s_event_handlers.erase(std::remove_if(begin, end,
-                                          [&](const shared_ptr<event_handler_t> &eh) {
-                                              return eh->function_name == name;
-                                          }),
-                           end);
+    auto handlers = s_event_handlers.acquire();
+    auto begin = handlers->begin(), end = handlers->end();
+    handlers->erase(std::remove_if(begin, end,
+                                   [&](const shared_ptr<event_handler_t> &eh) {
+                                       return eh->function_name == name;
+                                   }),
+                    end);
 }
 
 event_handler_list_t event_get_function_handlers(const wcstring &name) {
-    ASSERT_IS_MAIN_THREAD();
+    auto handlers = s_event_handlers.acquire();
     event_handler_list_t result;
-    for (const shared_ptr<event_handler_t> &eh : s_event_handlers) {
+    for (const shared_ptr<event_handler_t> &eh : *handlers) {
         if (eh->function_name == name) {
             result.push_back(eh);
         }
@@ -247,7 +247,7 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
 
     // Capture the event handlers that match this event.
     event_handler_list_t fire;
-    for (const auto &handler : s_event_handlers) {
+    for (const auto &handler : *s_event_handlers.acquire()) {
         // Check if this event is a match.
         if (handler_matches(*handler, event)) {
             fire.push_back(handler);
@@ -256,8 +256,11 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
 
     // Iterate over our list of matching events. Fire the ones that are still present.
     for (const shared_ptr<event_handler_t> &handler : fire) {
-        // Only fire if this event is still present
-        if (!contains(s_event_handlers, handler)) {
+        // Only fire if this event is still present.
+        // TODO: this is kind of crazy. We want to support removing (and thereby suppressing) an
+        // event handler from another, but we also don't want to hold the lock across callouts. How
+        // can we make this less silly?
+        if (!contains(*s_event_handlers.acquire(), handler)) {
             continue;
         }
 
@@ -365,7 +368,7 @@ static const wchar_t *event_name_for_type(event_type_t type) {
 }
 
 void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
-    event_handler_list_t tmp = s_event_handlers;
+    event_handler_list_t tmp = *s_event_handlers.acquire();
     std::sort(tmp.begin(), tmp.end(),
               [](const shared_ptr<event_handler_t> &e1, const shared_ptr<event_handler_t> &e2) {
                   const event_description_t &d1 = e1->desc;

From b478f877ee9a16e5c691978b60108473d8871b62 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 12:58:35 -0700
Subject: [PATCH 0667/1732] Clean up g_fork_count

Make it static and atomic
---
 src/env.h        |  1 -
 src/exec.cpp     | 17 +++++++++++------
 src/postfork.cpp |  4 ----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/env.h b/src/env.h
index 66756a6ba..f99b69303 100644
--- a/src/env.h
+++ b/src/env.h
@@ -308,7 +308,6 @@ class env_stack_t final : public environment_t {
     static env_stack_t &globals();
 };
 
-extern int g_fork_count;
 extern bool g_use_posix_spawn;
 
 extern bool term_has_xn;  // does the terminal have the "eat_newline_glitch"
diff --git a/src/exec.cpp b/src/exec.cpp
index 1eb57d4cf..dd98fac23 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -57,6 +57,9 @@
 /// Base open mode to pass to calls to open.
 #define OPEN_MASK 0666
 
+/// Number of calls to fork() or posix_spawn().
+static relaxed_atomic_t<int> s_fork_count{0};
+
 void exec_close(int fd) {
     ASSERT_IS_MAIN_THREAD();
 
@@ -455,7 +458,9 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
 
     // This is the parent process. Store away information on the child, and
     // possibly give it control over the terminal.
-    FLOGF(exec_fork, L"Fork #%d, pid %d: %s for '%ls'", g_fork_count, pid, fork_type, p->argv0());
+    s_fork_count++;
+    FLOGF(exec_fork, L"Fork #%d, pid %d: %s for '%ls'", int(s_fork_count), pid, fork_type,
+          p->argv0());
 
     p->pid = pid;
     on_process_created(job, p->pid);
@@ -688,7 +693,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
     // Prefer to use posix_spawn, since it's faster on some systems like OS X.
     bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j);
     if (use_posix_spawn) {
-        g_fork_count++;  // spawn counts as a fork+exec
+        s_fork_count++;  // spawn counts as a fork+exec
         // Create posix spawn attributes and actions.
         pid_t pid = 0;
         posix_spawnattr_t attr = posix_spawnattr_t();
@@ -718,8 +723,8 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
         // A 0 pid means we failed to posix_spawn. Since we have no pid, we'll never get
         // told when it's exited, so we have to mark the process as failed.
-        FLOGF(exec_fork, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'", g_fork_count,
-              pid, actual_cmd, file ? file : L"<no file>");
+        FLOGF(exec_fork, L"Fork #%d, pid %d: spawn external command '%s' from '%ls'",
+              int(s_fork_count), pid, actual_cmd, file ? file : L"<no file>");
         if (pid == 0) {
             job_mark_process_as_failed(j, p);
             return false;
@@ -1100,8 +1105,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         }
     }
 
-    FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id, j->command_wcstr(),
-         j->pgid);
+    FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id,
+          j->command_wcstr(), j->pgid);
 
     j->set_flag(job_flag_t::CONSTRUCTED, true);
     if (!j->is_foreground()) {
diff --git a/src/postfork.cpp b/src/postfork.cpp
index fd7205950..0e57d0c7a 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -171,8 +171,6 @@ int setup_child_process(process_t *p, const dup2_list_t &dup2s) {
     return 0;
 }
 
-int g_fork_count = 0;
-
 /// This function is a wrapper around fork. If the fork calls fails with EAGAIN, it is retried
 /// FORK_LAPS times, with a very slight delay between each lap. If fork fails even then, the process
 /// will exit with an error message.
@@ -191,8 +189,6 @@ pid_t execute_fork(bool wait_for_threads_to_die) {
     struct timespec pollint;
     int i;
 
-    g_fork_count++;
-
     for (i = 0; i < FORK_LAPS; i++) {
         pid = fork();
         if (pid >= 0) {

From d1fc8d5f7108a46f21eb09562af97ec774c6ee3a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 16:42:51 -0700
Subject: [PATCH 0668/1732] Improve the iothread port structure

Mark both fds in the ioport as non-blocking, and allow bulk reads.
---
 src/iothread.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index fe0c05049..f2ed12d52 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -96,6 +96,12 @@ static const notify_pipes_t &get_notify_pipes() {
         assert_with_errno(pipe(pipes) != -1);
         set_cloexec(pipes[0]);
         set_cloexec(pipes[1]);
+        // Mark both ends as non-blocking.
+        for (int fd : pipes) {
+            if (make_fd_nonblocking(fd)) {
+                wperror(L"fcntl");
+            }
+        }
         return notify_pipes_t{pipes[0], pipes[1]};
     }();
     return s_notify_pipes;
@@ -194,16 +200,16 @@ int iothread_port() { return get_notify_pipes().read; }
 
 void iothread_service_completion() {
     ASSERT_IS_MAIN_THREAD();
-    char wakeup_byte;
-
-    assert_with_errno(read_loop(iothread_port(), &wakeup_byte, sizeof wakeup_byte) == 1);
-    if (wakeup_byte == IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE) {
-        iothread_service_main_thread_requests();
-    } else if (wakeup_byte == IO_SERVICE_RESULT_QUEUE) {
-        iothread_service_result_queue();
-    } else {
-        FLOGF(error, L"Unknown wakeup byte %02x in %s", wakeup_byte, __FUNCTION__);
+    // Drain the read buffer, and then service completions.
+    // The order is important.
+    int port = iothread_port();
+    char buff[256];
+    while (read(port, buff, sizeof buff) > 0) {
+        // pass
     }
+
+    iothread_service_main_thread_requests();
+    iothread_service_result_queue();
 }
 
 static bool iothread_wait_for_pending_completions(long timeout_usec) {
@@ -278,6 +284,7 @@ static void iothread_service_main_thread_requests() {
         //
         // Because the waiting thread performs step 1 under the lock, if we take the lock, we avoid
         // posting before the waiting thread is waiting.
+        // TODO: revisit this logic, this feels sketchy.
         scoped_lock broadcast_lock(s_main_thread_performer_lock);
         s_main_thread_performer_cond.notify_all();
     }
@@ -287,7 +294,7 @@ static void iothread_service_main_thread_requests() {
 static void iothread_service_result_queue() {
     // Move the queue to a local variable.
     std::queue<spawn_request_t> result_queue;
-    (*s_result_queue.acquire()).swap(result_queue);
+    s_result_queue.acquire()->swap(result_queue);
 
     // Perform each completion in order
     while (!result_queue.empty()) {

From fc99d6c7afc65b429c418108a4111ee276d09ffb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 3 Jun 2019 20:30:48 -0700
Subject: [PATCH 0669/1732] clang-format all files

---
 src/builtin_complete.cpp     |  3 ++-
 src/common.cpp               |  2 +-
 src/env.cpp                  |  2 +-
 src/env_universal_common.cpp | 15 ++++++++-------
 src/env_universal_common.h   |  1 -
 src/expand.cpp               |  2 +-
 src/fish_tests.cpp           |  5 ++++-
 src/input_common.h           |  4 +---
 src/parse_constants.h        |  6 +++---
 src/parse_execution.cpp      |  4 ++--
 src/parse_productions.cpp    |  4 ++--
 src/path.cpp                 |  4 ++--
 src/proc.cpp                 |  6 +++---
 13 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index e17f1e34e..1ea9b06ae 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -264,7 +264,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (result_mode.no_files && result_mode.force_files) {
-        streams.err.append_format(BUILTIN_ERR_COMBO2, L"complete", L"'--no-files' and '--force-files'");
+        streams.err.append_format(BUILTIN_ERR_COMBO2, L"complete",
+                                  L"'--no-files' and '--force-files'");
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/common.cpp b/src/common.cpp
index 69cfb9638..1a7c7aa89 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2436,7 +2436,7 @@ void redirect_tty_output() {
 [[noreturn]] void __fish_assert(const char *msg, const char *file, size_t line, int error) {
     if (error) {
         FLOGF(error, L"%s:%zu: failed assertion: %s: errno %d (%s)", file, line, msg, error,
-             std::strerror(error));
+              std::strerror(error));
     } else {
         FLOGF(error, L"%s:%zu: failed assertion: %s", file, line, msg);
     }
diff --git a/src/env.cpp b/src/env.cpp
index 5ffbac829..90d0a5839 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1190,7 +1190,7 @@ void env_stack_t::set_pwd_from_getcwd() {
     wcstring cwd = wgetcwd();
     if (cwd.empty()) {
         FLOG(error,
-              _(L"Could not determine current working directory. Is your locale set correctly?"));
+             _(L"Could not determine current working directory. Is your locale set correctly?"));
         return;
     }
     set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, cwd);
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 0d4788bd4..15721e327 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -248,7 +248,8 @@ static wcstring encode_serialized(const wcstring_list_t &vals) {
     return join_strings(vals, UVAR_ARRAY_SEP);
 }
 
-env_universal_t::env_universal_t(wcstring path) : narrow_vars_path(wcs2string(path)), explicit_vars_path(std::move(path)) {}
+env_universal_t::env_universal_t(wcstring path)
+    : narrow_vars_path(wcs2string(path)), explicit_vars_path(std::move(path)) {}
 
 maybe_t<env_var_t> env_universal_t::get(const wcstring &name) const {
     var_table_t::const_iterator where = vars.find(name);
@@ -453,7 +454,7 @@ bool env_universal_t::write_to_fd(int fd, const wcstring &path) {
     if (write_loop(fd, contents.data(), contents.size()) < 0) {
         const char *error = std::strerror(errno);
         FLOGF(error, _(L"Unable to write to universal variables file '%ls': %s"), path.c_str(),
-             error);
+              error);
         success = false;
     }
 
@@ -469,7 +470,7 @@ bool env_universal_t::move_new_vars_file_into_place(const wcstring &src, const w
     if (ret != 0) {
         const char *error = std::strerror(errno);
         FLOGF(error, _(L"Unable to rename file from '%ls' to '%ls': %s"), src.c_str(), dst.c_str(),
-             error);
+              error);
     }
     return ret == 0;
 }
@@ -599,7 +600,7 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
 #endif
             const char *error = std::strerror(errno);
             FLOGF(error, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(),
-                 error);
+                  error);
             break;
         }
 
@@ -1084,7 +1085,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
             if (fstat(fd, &buf) < 0) {
                 const char *error = std::strerror(errno);
                 FLOGF(error, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
-                     error);
+                      error);
                 errored = true;
             }
             size = buf.st_size;
@@ -1095,7 +1096,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         if (set_size && ftruncate(fd, sizeof(universal_notifier_shmem_t)) < 0) {
             const char *error = std::strerror(errno);
             FLOGF(error, _(L"Unable to truncate shared memory object with path '%s': %s"), path,
-                 error);
+                  error);
             errored = true;
         }
 
@@ -1106,7 +1107,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
             if (addr == MAP_FAILED) {
                 const char *error = std::strerror(errno);
                 FLOGF(error, _(L"Unable to memory map shared memory object with path '%s': %s"),
-                     path, error);
+                      path, error);
                 this->region = NULL;
             } else {
                 this->region = static_cast<universal_notifier_shmem_t *>(addr);
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 61d85aa7e..471c7dbba 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -49,7 +49,6 @@ class env_universal_t {
     // Path that we save to. If empty, use the default.
     wcstring explicit_vars_path;
 
-
     // Whether it's OK to save. This may be set to false if we discover that a future version of
     // fish wrote the uvars contents.
     bool ok_to_save{true};
diff --git a/src/expand.cpp b/src/expand.cpp
index cf206abbd..fbdc8c8d0 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -887,7 +887,7 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completio
                 break;
             case 1:
                 append_cmdsub_error(errors, start, L"Command substitutions not allowed");
-               /* intentionally falls through */
+                /* intentionally falls through */
             case -1:
             default:
                 return expand_result_t::error;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index c5b3cb094..c843ee3e2 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1584,7 +1584,10 @@ struct pwd_environment_t : public environment_t {
         return {};
     }
 
-    wcstring_list_t get_names(int flags) const override { UNUSED(flags); return {L"PWD"}; }
+    wcstring_list_t get_names(int flags) const override {
+        UNUSED(flags);
+        return {L"PWD"};
+    }
 };
 
 /// Perform parameter expansion and test if the output equals the zero-terminated parameter list
diff --git a/src/input_common.h b/src/input_common.h
index d27ecf165..2169ffe62 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -73,9 +73,7 @@ enum class readline_cmd_t {
 };
 
 // The range of key codes for inputrc-style keyboard functions.
-enum {
-    R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::reverse_repeat_jump) + 1
-};
+enum { R_END_INPUT_FUNCTIONS = static_cast<int>(readline_cmd_t::reverse_repeat_jump) + 1 };
 
 /// Represents an event on the character input stream.
 enum class char_event_type_t : uint8_t {
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 724e69f77..5c234c505 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -6,10 +6,10 @@
 #include "config.h"
 
 #define PARSE_ASSERT(a) assert(a)
-#define PARSER_DIE()                  \
-    do {                              \
+#define PARSER_DIE()                   \
+    do {                               \
         FLOG(error, L"Parser dying!"); \
-        exit_without_destructors(-1); \
+        exit_without_destructors(-1);  \
     } while (0)
 
 // IMPORTANT: If the following enum table is modified you must also update token_enum_map below.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 46bb1d104..8a34895ef 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1079,7 +1079,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
         }
         default: {
             FLOGF(error, L"'%ls' not handled by new parser yet.",
-                 specific_statement.describe().c_str());
+                  specific_statement.describe().c_str());
             PARSER_DIE();
             break;
         }
@@ -1383,7 +1383,7 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
         status = this->run_switch_statement(switchstat);
     } else {
         FLOGF(error, L"Unexpected node %ls found in %s", statement.node()->describe().c_str(),
-             __FUNCTION__);
+              __FUNCTION__);
         abort();
     }
     return status;
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 962ddc4a6..4163d74a9 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -404,7 +404,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_token_type_end:
         case parse_token_type_terminate: {
             FLOGF(error, L"Terminal token type %ls passed to %s", token_type_description(node_type),
-                 __FUNCTION__);
+                  __FUNCTION__);
             PARSER_DIE();
             break;
         }
@@ -412,7 +412,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
         case parse_special_type_tokenizer_error:
         case parse_special_type_comment: {
             FLOGF(error, L"Special type %ls passed to %s\n", token_type_description(node_type),
-                 __FUNCTION__);
+                  __FUNCTION__);
             PARSER_DIE();
             break;
         }
diff --git a/src/path.cpp b/src/path.cpp
index 51b3ae7d7..7634fd246 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -274,11 +274,11 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
     if (path.empty()) {
         FLOGF(error, _(L"Unable to locate the %ls directory."), which_dir.c_str());
         FLOGF(error, _(L"Please set the %ls or HOME environment variable before starting fish."),
-             xdg_var.c_str());
+              xdg_var.c_str());
     } else {
         const wchar_t *env_var = using_xdg ? xdg_var.c_str() : L"HOME";
         FLOGF(error, _(L"Unable to locate %ls directory derived from $%ls: '%ls'."),
-             which_dir.c_str(), env_var, path.c_str());
+              which_dir.c_str(), env_var, path.c_str());
         FLOGF(error, _(L"The error was '%s'."), std::strerror(saved_errno));
         FLOGF(error, _(L"Please set $%ls to a directory where you have write access."), env_var);
     }
diff --git a/src/proc.cpp b/src/proc.cpp
index 3e316aba4..16f50910b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -924,7 +924,7 @@ void proc_sanity_check(const parser_t &parser) {
         if (j->is_foreground() && !(j->is_stopped() || j->is_completed())) {
             if (fg_job) {
                 FLOGF(error, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
-                     fg_job->command_wcstr(), j->command_wcstr());
+                      fg_job->command_wcstr(), j->command_wcstr());
                 sanity_lose();
             }
             fg_job = j.get();
@@ -938,13 +938,13 @@ void proc_sanity_check(const parser_t &parser) {
 
             if ((p->stopped & (~0x00000001)) != 0) {
                 FLOGF(error, _(L"Job '%ls', process '%ls' has inconsistent state \'stopped\'=%d"),
-                     j->command_wcstr(), p->argv0(), p->stopped);
+                      j->command_wcstr(), p->argv0(), p->stopped);
                 sanity_lose();
             }
 
             if ((p->completed & (~0x00000001)) != 0) {
                 FLOGF(error, _(L"Job '%ls', process '%ls' has inconsistent state \'completed\'=%d"),
-                     j->command_wcstr(), p->argv0(), p->completed);
+                      j->command_wcstr(), p->argv0(), p->completed);
                 sanity_lose();
             }
         }

From 51fcb79d96b05fdfb5627eb1199fa17850d7acca Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 12:05:33 +0200
Subject: [PATCH 0670/1732] Remove read history

This was undocumented, not all that useful and potentially unwanted.

In particular it means that things like

   mysql -p(read)

will still keep the password in history.

Also it allows us to simply implement asking for the history deletion
term.

See #5791.
---
 src/builtin_read.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 1e32d62c3..81205d661 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -202,10 +202,8 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
                             const wchar_t *commandline) {
     int exit_res = STATUS_CMD_OK;
 
-    const auto &vars = parser.vars();
-    wcstring read_history_ID = history_session_id(vars);
-    if (!read_history_ID.empty()) read_history_ID += L"_read";
-    reader_push(parser, read_history_ID);
+    // Don't keep history
+    reader_push(parser, L"");
 
     reader_set_left_prompt(prompt);
     reader_set_right_prompt(right_prompt);

From c0ca4d3236df86eaa52282c70ee4f3a69c4e58ba Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 21:47:10 +0200
Subject: [PATCH 0671/1732] functions/history: Read the search term if none is
 given

Fixes #5791.
---
 share/functions/history.fish | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index 26ab6b0f9..1e3110dff 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -103,25 +103,23 @@ function history --description "display or manipulate interactive command histor
 
         case delete # interactively delete history
             # TODO: Fix this to deal with history entries that have multiple lines.
+            set -l searchterm $argv
             if not set -q argv[1]
-                printf (_ "You must specify at least one search term when deleting entries\n") >&2
-                return 1
+                read -P"Search term: " searchterm
             end
 
             test -z "$search_mode"
             and set search_mode "--contains"
 
             if test $search_mode = "--exact"
-                builtin history delete $search_mode $_flag_case_sensitive $argv
+                builtin history delete $search_mode $_flag_case_sensitive $searchterm
                 return
             end
 
             # TODO: Fix this so that requesting history entries with a timestamp works:
             #   set -l found_items (builtin history search $search_mode $show_time -- $argv)
             set -l found_items
-            builtin history search $search_mode $_flag_case_sensitive --null -- $argv | while read -lz x
-                set found_items $found_items $x
-            end
+            set found_items (builtin history search $search_mode $_flag_case_sensitive --null -- $searchterm | string split0)
             if set -q found_items[1]
                 set -l found_items_count (count $found_items)
                 for i in (seq $found_items_count)

From ae59fdeda5027fef20b17f7134d695c56ab0ecc2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 May 2019 21:50:25 +0200
Subject: [PATCH 0672/1732] src/builtin_read: Remove more references to
 fish_history

---
 src/builtin_read.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 81205d661..92e525cb1 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -63,7 +63,6 @@ static const struct woption long_options[] = {{L"array", no_argument, NULL, 'a'}
                                               {L"help", no_argument, NULL, 'h'},
                                               {L"line", no_argument, NULL, 'L'},
                                               {L"local", no_argument, NULL, 'l'},
-                                              {L"mode-name", required_argument, NULL, 'm'},
                                               {L"nchars", required_argument, NULL, 'n'},
                                               {L"null", no_argument, NULL, 'z'},
                                               {L"prompt", required_argument, NULL, 'p'},
@@ -117,12 +116,6 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                 opts.place |= ENV_LOCAL;
                 break;
             }
-            case L'm': {
-                streams.err.append_format(_(L"%ls: flags '--mode-name' / '-m' are now ignored. "
-                                            L"Set fish_history instead.\n"),
-                                          cmd);
-                break;
-            }
             case L'n': {
                 opts.nchars = fish_wcstoi(w.woptarg);
                 if (errno) {

From 84171e0c2532e7f674282f6e242e6fa1b6d464cb Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 6 Jun 2019 21:06:12 +0800
Subject: [PATCH 0673/1732] travis: turn on errors for some serious compiler
 warnings

See
https://github.com/fish-shell/fish-shell/commit/2e38cf2a4b004108a4d93f5b2d2069c655b762c4#commitcomment-20563617
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd2a13510..f4c368f7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
             - gettext
             - libncurses5-dev
             - libpcre2-dev
+      env:
+          - CXXFLAGS="-g -O2 -Werror=address"
     - os: linux
       compiler: gcc
       addons:
@@ -23,7 +25,7 @@ matrix:
             - lib32ncurses5-dev
             - g++-multilib
       env:
-          - CXXFLAGS="-g -O2 -m32" CFLAGS="-g -m32"
+          - CXXFLAGS="-g -O2 -m32 -Werror=address" CFLAGS="-g -m32"
     - os: linux
       compiler: clang
       env:

From d1d5716ae184a540f53a7519bf08ce8b2d3dc7a5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 15:08:46 +0200
Subject: [PATCH 0674/1732] CHANGELOG read history

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a36efb66..2cb082580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
 - If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
+- `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.

From c89883b6ab03cceec7206a461fa02155c9bd8d28 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 4 Jun 2019 21:58:39 +0200
Subject: [PATCH 0675/1732] docs/faq: Fix header formatting

[ci skip]
---
 sphinx_doc_src/faq.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 11d822bb2..b01783db3 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -95,7 +95,6 @@ If you are just interested in success or failure, you can run the command direct
 
 See the documentation for :ref:`test <cmd-test>` and :ref:`if <cmd-if>` for more information.
 
-~~
 How do I set an environment variable for just one command?
 ----------------------------------------------------------
 ``SOME_VAR=1 command`` produces an error: ``Unknown command "SOME_VAR=1"``.
@@ -163,12 +162,10 @@ How do I customize my syntax highlighting colors?
 -------------------------------------------------
 Use the web configuration tool, :ref:`fish_config <cmd-fish_config>`, or alter the `fish_color family of environment variables <index#variables-color>`__.
 
-~~
 How do I update man page completions?
 -------------------------------------
 Use the :ref:`fish_update_completions <cmd-fish_update_completions>` command.
 
-~~
 I accidentally entered a directory path and fish changed directory. What happened?
 ----------------------------------------------------------------------------------
 If fish is unable to locate a command with a given name, and it starts with '``.``', '``/``' or '``~``', fish will test if a directory of that name exists. If it does, it is implicitly assumed that you want to change working directory. For example, the fastest way to switch to your home directory is to simply press ``~`` and enter.

From b6eddc75bc6151bb51d8e117dc682bee760d4381 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 4 Jun 2019 22:07:06 +0200
Subject: [PATCH 0676/1732] docs: Remove `-#` formatting

That was supposed to be displayed like a list item, but it's displayed
verbatim in the html output at least, so it looks weird.

[ci skip]
---
 sphinx_doc_src/cmds/functions.rst | 10 +++++-----
 sphinx_doc_src/cmds/set.rst       | 12 ++++++------
 sphinx_doc_src/index.rst          |  6 +++---
 sphinx_doc_src/license.rst        | 18 +++++++++---------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index 44bad3035..d4589e71c 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -30,11 +30,11 @@ The following options are available:
 
 - ``-D`` or ``--details`` reports the path name where each function is defined or could be autoloaded, ``stdin`` if the function was defined interactively or on the command line or by reading stdin, and ``n/a`` if the function isn't available. 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,
-    -# the function description minimally escaped so it is a single line or ``n/a`` if the function isn't defined.
+    - 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,
+    - the function description minimally escaped so it is a single line or ``n/a`` if the function isn't defined.
 
 You should not assume that only five lines will be written since we may add additional information to the output in the future.
 
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index 1687c9e07..b141c7570 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -63,20 +63,20 @@ If the variable name is one or more list elements, such as ``PATH[1 3 7]``, only
 
 The scoping rules when creating or updating a variable are:
 
--# Variables may be explicitly set to universal, global or local. Variables with the same name in different scopes will not be changed.
+- Variables may be explicitly set to universal, global or local. Variables with the same name in different scopes will not be changed.
 
--# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previous variable scope is used.
+- If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previous variable scope is used.
 
--# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
+- If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
 
 
 The exporting rules when creating or updating a variable are identical to the scoping rules for variables:
 
--# Variables may be explicitly set to either exported or not exported. When an exported variable goes out of scope, it is unexported.
+- Variables may be explicitly set to either exported or not exported. When an exported variable goes out of scope, it is unexported.
 
--# If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
+- If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
 
--# If a variable is not explicitly set to be either exported or unexported and has never before been defined, the variable will not be exported.
+- If a variable is not explicitly set to be either exported or unexported and has never before been defined, the variable will not be exported.
 
 
 In query mode, the scope to be examined can be specified.
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index b33f3846b..c9a49fc12 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1038,11 +1038,11 @@ There are three kinds of variables in fish: universal, global and local variable
 
 Variables can be explicitly set to be universal with the ``-U`` or ``--universal`` switch, global with the ``-g`` or ``--global`` switch, or local with the ``-l`` or ``--local`` switch.  The scoping rules when creating or updating a variable are:
 
--# If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
+- If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
 
--# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the variable scope is not changed.
+- If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the variable scope is not changed.
 
--# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
+- If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
 
 There may be many variables with the same name, but different scopes. When using a variable, the variable scope will be searched from the inside out, i.e. a local variable will be used rather than a global variable with the same name, a global variable will be used rather than a universal variable with the same name.
 
diff --git a/sphinx_doc_src/license.rst b/sphinx_doc_src/license.rst
index 91a378218..a406b3564 100644
--- a/sphinx_doc_src/license.rst
+++ b/sphinx_doc_src/license.rst
@@ -51,11 +51,11 @@ The precise terms and conditions for copying, distribution and modification foll
 
 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
 
- -# You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+ - You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
 
- -# You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+ - You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
 
- -# If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+ - If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
 
  These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
 
@@ -65,11 +65,11 @@ The precise terms and conditions for copying, distribution and modification foll
 
 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
 
- -# Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+ - Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
 
- -# Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+ - Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
 
- -# Accompany it with the information you received as to the offer to distribute corresponding source code.  (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+ - Accompany it with the information you received as to the offer to distribute corresponding source code.  (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
 
  The source code for a work means the preferred form of the work for making modifications to it.  For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable.  However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
 
@@ -113,10 +113,10 @@ The BSD license follows.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
- -# Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
- -# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
- -# Neither the name of the University of Cambridge nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ - Neither the name of the University of Cambridge nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 23671f696e90d94154a4295f89dc2f05ce757c27 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 4 Jun 2019 22:09:24 +0200
Subject: [PATCH 0677/1732] docs: Simplify variable scope/exporting a bit

[ci skip]
---
 sphinx_doc_src/index.rst | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index c9a49fc12..bc5273461 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1038,11 +1038,11 @@ There are three kinds of variables in fish: universal, global and local variable
 
 Variables can be explicitly set to be universal with the ``-U`` or ``--universal`` switch, global with the ``-g`` or ``--global`` switch, or local with the ``-l`` or ``--local`` switch.  The scoping rules when creating or updating a variable are:
 
-- If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
+- If a variable is explicitly set to a scope (universal, global or local), that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
 
-- If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the variable scope is not changed.
+- If a variable is not explicitly set to a scope, but has been previously defined, the variable scope is not changed.
 
-- If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
+- If a variable is not explicitly set to a scope and has not been defined, the variable will be local to the currently executing function. Note that this is different from using the ``-l`` or ``--local`` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
 
 There may be many variables with the same name, but different scopes. When using a variable, the variable scope will be searched from the inside out, i.e. a local variable will be used rather than a global variable with the same name, a global variable will be used rather than a universal variable with the same name.
 
@@ -1103,19 +1103,21 @@ For example::
 Exporting variables
 -------------------
 
-Variables in fish can be exported. This means the variable will be inherited by any commands started by fish. It is convention that exported variables are in uppercase and unexported variables are in lowercase.
+Variables in fish can be "exported", so they will be inherited by any commands started by fish.
 
-Variables can be explicitly set to be exported with the ``-x`` or ``--export`` switch, or not exported with the ``-u`` or ``--unexport`` switch.  The exporting rules when creating or updating a variable are identical to the scoping rules for variables:
+Variables can be explicitly set to be exported with the ``-x`` or ``--export`` switch, or not exported with the ``-u`` or ``--unexport`` switch.  The exporting rules when setting a variable are identical to the scoping rules for variables:
 
--# If a variable is explicitly set to either be exported or not exported, that setting will be honored.
+- If a variable is explicitly set to either be exported or not exported, that setting will be honored.
 
--# If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
+- If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
 
--# If a variable is not explicitly set to be either exported or not exported and has never before been defined, the variable will not be exported.
+- Otherwise, the variable will not be exported.
 
--# If a variable has local scope and is exported, any function called receives a _copy_ of it, so any changes it makes to the variable disappear once the function returns.
+- If a variable has local scope and is exported, any function called receives a _copy_ of it, so any changes it makes to the variable disappear once the function returns.
 
--# If a variable has global scope, it is accessible read-write to functions whether it is exported or not.
+- Global variables are accessible to functions whether they are exported or not.
+
+As a naming convention, exported variables are in uppercase and unexported variables are in lowercase.
 
 .. _variables-lists:
 
@@ -1618,11 +1620,11 @@ Running multiple programs
 
 Normally when ``fish`` starts a program, this program will be put in the foreground, meaning it will take control of the terminal and ``fish`` will be stopped until the program finishes. Sometimes this is not desirable. For example, you may wish to start an application with a graphical user interface from the terminal, and then be able to continue using the shell. In such cases, there are several ways in which the user can change fish's behavior.
 
--# By ending a command with the ``&`` (ampersand) symbol, the user tells ``fish`` to put the specified command into the background. A background process will be run simultaneous with ``fish``. ``fish`` will retain control of the terminal, so the program will not be able to read from the keyboard.
+- By ending a command with the ``&`` (ampersand) symbol, the user tells ``fish`` to put the specified command into the background. A background process will be run simultaneous with ``fish``. ``fish`` will retain control of the terminal, so the program will not be able to read from the keyboard.
 
--# By pressing :kbd:`Control+Z`, the user stops a currently running foreground  program and returns control to ``fish``. Some programs do not support this feature, or remap it to another key. GNU Emacs uses :kbd:`Control+X` :kbd:`z` to stop running.
+- By pressing :kbd:`Control+Z`, the user stops a currently running foreground  program and returns control to ``fish``. Some programs do not support this feature, or remap it to another key. GNU Emacs uses :kbd:`Control+X` :kbd:`z` to stop running.
 
--# By using the :ref:`bg <cmd-bg>` and :ref:`fg <cmd-fg>` builtin commands, the user can send any currently running job into the foreground or background.
+- By using the :ref:`bg <cmd-bg>` and :ref:`fg <cmd-fg>` builtin commands, the user can send any currently running job into the foreground or background.
 
 Note that functions cannot be started in the background. Functions that are stopped and then restarted in the background using the ``bg`` command will not execute correctly.
 

From 53216940c483abce8979bf4b99c2aa5cd97a42d6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 4 Jun 2019 22:12:11 +0200
Subject: [PATCH 0678/1732] docs: Clarify when exporting is necessary

See #5920.

[ci skip]
---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index bc5273461..b9d80d7a5 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1103,7 +1103,7 @@ For example::
 Exporting variables
 -------------------
 
-Variables in fish can be "exported", so they will be inherited by any commands started by fish.
+Variables in fish can be "exported", so they will be inherited by any commands started by fish. In particular, this is necessary for variables used to configure external commands like $LESS or $GOPATH, but also for variables that contain general system settings like $PATH or $LANGUAGE. If an external command needs to know a variable, it needs to be exported.
 
 Variables can be explicitly set to be exported with the ``-x`` or ``--export`` switch, or not exported with the ``-u`` or ``--unexport`` switch.  The exporting rules when setting a variable are identical to the scoping rules for variables:
 
@@ -1111,7 +1111,7 @@ Variables can be explicitly set to be exported with the ``-x`` or ``--export`` s
 
 - If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept.
 
-- Otherwise, the variable will not be exported.
+- Otherwise, by default, the variable will not be exported.
 
 - If a variable has local scope and is exported, any function called receives a _copy_ of it, so any changes it makes to the variable disappear once the function returns.
 

From d338f74e6d0091dbbfced26247d29d91cb969f37 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:17:09 +0200
Subject: [PATCH 0679/1732] docs/tutorial: Put exit status with combiners and
 conditionals

It was awkwardly sandwhiched inbetween variables and exports.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 9cc482bbb..27ad60deb 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -232,23 +232,6 @@ Unlike other shells, variables are not further split after substitution::
 In bash, this would have created two directories "Mister" and "Noodle". In ``fish``, it created only one: the variable had the value "Mister Noodle", so that is the argument that was passed to ``mkdir``, spaces and all. Other shells use the term "arrays", rather than lists.
 
 
-Exit Status
------------
-
-Unlike other shells, ``fish`` stores the exit status of the last command in ``$status`` instead of ``$?``.
-
-
-
-::
-
-    >_ false
-    >_ echo $status
-    1
-
-
-Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` list variable for the exit statues of processes in a pipe.
-
-
 Exports (Shell Variables)
 -------------------------
 
@@ -405,6 +388,23 @@ To write them on the same line, use the semicolon (";"). That means the followin
 
 
 
+Exit Status
+-----------
+
+Unlike other shells, ``fish`` stores the exit status of the last command in ``$status`` instead of ``$?``.
+
+
+
+::
+
+    >_ false
+    >_ echo $status
+    1
+
+
+Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` list variable for the exit statues of processes in a pipe.
+
+
 Combiners (And, Or, Not)
 ------------------------
 

From 223b515ba12a1605662ae5fd572782c12360680e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:17:49 +0200
Subject: [PATCH 0680/1732] docs/tutorial: Mention VAR=VAL syntax

That's the thing we're replacing, so we should mention it.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 27ad60deb..89b6227dc 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -209,7 +209,7 @@ Variable substitution also occurs in double quotes, but not single quotes::
     My current directory is $PWD
 
 
-Unlike other shells, ``fish`` has no dedicated syntax for setting variables. Instead it has an ordinary command: ``set``, which takes a variable name, and then its value.
+Unlike other shells, ``fish`` has no dedicated `VARIABLE=VALUE` syntax for setting variables. Instead it has an ordinary command: ``set``, which takes a variable name, and then its value.
 
 
 

From de3f862731fce06c9adfab6829d8e74ac83f5d08 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:26:54 +0200
Subject: [PATCH 0681/1732] docs/tutorial: Rewrite exports section

See #5920.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 89b6227dc..c5ac3eddf 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -231,24 +231,7 @@ Unlike other shells, variables are not further split after substitution::
 
 In bash, this would have created two directories "Mister" and "Noodle". In ``fish``, it created only one: the variable had the value "Mister Noodle", so that is the argument that was passed to ``mkdir``, spaces and all. Other shells use the term "arrays", rather than lists.
 
-
-Exports (Shell Variables)
--------------------------
-
-Unlike other shells, ``fish`` does not have an export command. Instead, a variable is exported via an option to ``set``, either ``--export`` or just ``-x``.
-
-
-
-::
-
-    >_ set -x MyVariable SomeValue
-    >_ env | grep MyVariable
-    MyVariable=SomeValue
-
-
-You can erase a variable with ``-e`` or ``--erase``
-
-
+You can erase (or "delete") a variable with ``-e`` or ``--erase``
 
 ::
 
@@ -256,6 +239,20 @@ You can erase a variable with ``-e`` or ``--erase``
     >_ env | grep MyVariable
     (no output)
 
+Exports (Shell Variables)
+-------------------------
+
+Sometimes you need to have a variable available to an external command, often as a setting. For example many programs like `git` or `man` read the `$PAGER` variable to figure out your preferred pager (the program that lets you scroll text). Other variables used like this include `$BROWSER`, `$LANG` (to configure your language) and `$PATH`. You'll note these are written in ALLCAPS, but that's just a convention.
+
+To give a variable to an external command, it needs to be "exported". Unlike other shells, ``fish`` does not have an export command. Instead, a variable is exported via an option to ``set``, either ``--export`` or just ``-x``.
+
+::
+
+    >_ set -x MyVariable SomeValue
+    >_ env | grep MyVariable
+    MyVariable=SomeValue
+
+It can also be unexported with ``--unexport`` or ``-u``.
 
 
 Lists

From a154384ff46338bb1546abf27f2bbcd76a3ed7e7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:28:21 +0200
Subject: [PATCH 0682/1732] docs/tutorial: Remove some empty lines

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index c5ac3eddf..6e4c25c8b 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -211,8 +211,6 @@ Variable substitution also occurs in double quotes, but not single quotes::
 
 Unlike other shells, ``fish`` has no dedicated `VARIABLE=VALUE` syntax for setting variables. Instead it has an ordinary command: ``set``, which takes a variable name, and then its value.
 
-
-
 ::
 
     >_ set name 'Mister Noodle'
@@ -358,7 +356,6 @@ Command substitutions are not expanded within quotes. Instead, you can temporari
 Unlike other shells, fish does not split command substitutions on any whitespace (like spaces or tabs), only newlines. This can be an issue with commands like ``pkg-config`` that print what is meant to be multiple arguments on a single line. To split it on spaces too, use ``string split``.
 
 
-
 ::
 
     >_ printf '%s\n' (pkg-config --libs gio-2.0)
@@ -369,7 +366,6 @@ Unlike other shells, fish does not split command substitutions on any whitespace
     -lglib-2.0
 
 
-
 Separating Commands (Semicolon)
 -------------------------------
 
@@ -384,14 +380,12 @@ To write them on the same line, use the semicolon (";"). That means the followin
     echo chips
 
 
-
 Exit Status
 -----------
 
 Unlike other shells, ``fish`` stores the exit status of the last command in ``$status`` instead of ``$?``.
 
 
-
 ::
 
     >_ false
@@ -423,14 +417,12 @@ As mentioned in `the section on the semicolon <#tut_semicolon>`__, this can also
     or echo "Backup failed"
 
 
-
 Conditionals (If, Else, Switch)
 -------------------------------
 
 Use ``if``, ``else if``, and ``else`` to conditionally execute code, based on the exit status of a command.
 
 
-
 ::
 
     if grep fish /etc/shells
@@ -445,7 +437,6 @@ Use ``if``, ``else if``, and ``else`` to conditionally execute code, based on th
 To compare strings or numbers or check file properties (whether a file exists or is writeable and such), use :ref:`test <cmd-test>`, like
 
 
-
 ::
 
     if test "$fish" = "flounder"
@@ -464,7 +455,6 @@ To compare strings or numbers or check file properties (whether a file exists or
 `Combiners <#tut_combiners>`__ can also be used to make more complex conditions, like
 
 
-
 ::
 
     if grep fish /etc/shells; and command -sq fish
@@ -521,7 +511,6 @@ You can see the source for any function by passing its name to ``functions``::
     end
 
 
-
 Loops
 -----
 
@@ -550,7 +539,6 @@ Iterating over a list of numbers can be done with ``seq``::
     end
 
 
-
 Prompt
 ------
 

From 8eb076999664679dd235e902c1b6b99aef23f57a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:38:19 +0200
Subject: [PATCH 0683/1732] docs/tutorial: Rewrite exit status section

We've kinda forgotten the "tutorial" part of this.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 6e4c25c8b..8550a5063 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -383,6 +383,8 @@ To write them on the same line, use the semicolon (";"). That means the followin
 Exit Status
 -----------
 
+When a command exits, it returns a status code as a natural number. This indicates how the command fared - 0 usually means success, while the others signify kinds of failure. For instance fish's ``set --query`` returns the number of variables it queried that weren't set - ``set --query PATH`` usually returns 0, ``set --query arglbargl boogagoogoo`` usually returns 2.
+
 Unlike other shells, ``fish`` stores the exit status of the last command in ``$status`` instead of ``$?``.
 
 
@@ -393,8 +395,11 @@ Unlike other shells, ``fish`` stores the exit status of the last command in ``$s
     1
 
 
-Zero is considered success, and non-zero is failure. There is also a ``$pipestatus`` list variable for the exit statues of processes in a pipe.
+This indicates how the command fared - 0 usually means success, while the others signify kinds of failure. For instance fish's ``set --query`` returns the number of variables it queried that weren't set - ``set --query PATH`` usually returns 0, ``set --query arglbargl boogagoogoo`` usually returns 2.
 
+There is also a ``$pipestatus`` list variable for the exit statuses [#]_ of processes in a pipe.
+
+.. [#] or "stati" if you prefer, or "statūs" if you've time-travelled from ancient Rome or work as a latin teacher
 
 Combiners (And, Or, Not)
 ------------------------

From 3641410a062078e46409a1194a194fe3455a957b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 19:38:41 +0200
Subject: [PATCH 0684/1732] docs/tutorial: Misc

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 8550a5063..cfb6c991b 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -49,6 +49,8 @@ Running Commands
     hello world
 
 
+This runs the command `echo` with the arguments `hello` and `world`.
+
 You can include a literal space in an argument with a backslash, or by using single or double quotes::
 
     >_ mkdir My\ Files
@@ -201,7 +203,7 @@ Like other shells, a dollar sign performs variable substitution::
     My home directory is /home/tutorial
 
 
-Variable substitution also occurs in double quotes, but not single quotes::
+Variable substitution also happens in double quotes, but not single quotes::
 
     >_ echo "My current directory is $PWD"
     My current directory is /home/tutorial

From 6d05d93275d1f895bf1425207fb76383870cfaf0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 20:00:11 +0200
Subject: [PATCH 0685/1732] docs/tutorial: Expand

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index cfb6c991b..95cfffdce 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -410,6 +410,7 @@ fish supports the familiar ``&&`` and ``||`` to combine commands, and ``!`` to n
 
     >_ ./configure && make && sudo make install
 
+Here, `make` is only executed if `./configure` succeeds (returns 0), and `sudo make install` is only executed if both `./configure` and `make` succeed.
 
 fish also supports ``and``, ``or``, and ``not``. The first two are job modifiers and have lower precedence. Example usage::
 
@@ -458,6 +459,13 @@ To compare strings or numbers or check file properties (whether a file exists or
         echo $number is five or less
     end
 
+    # or
+
+    if test -e /etc/hosts # is true if the path /etc/hosts exists - it could be a file or directory or symlink (or possibly something else).
+        echo We most likely have a hosts file
+    else
+        echo We do not have a hosts file
+    end
 
 `Combiners <#tut_combiners>`__ can also be used to make more complex conditions, like
 
@@ -529,7 +537,7 @@ While loops::
     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::
@@ -581,7 +589,7 @@ You can choose among some sample prompts by running ``fish_config prompt``. ``fi
 $PATH
 -----
 
-``$PATH`` is an environment variable containing the directories in which ``fish`` searches for commands. Unlike other shells, $PATH is a [list](#tut_lists), not a colon-delimited string.
+``$PATH`` is an environment variable containing the directories that ``fish`` searches for commands. Unlike other shells, $PATH is a [list](#tut_lists), not a colon-delimited string.
 
 To prepend /usr/local/bin and /usr/sbin to ``$PATH``, you can write::
 
@@ -592,6 +600,12 @@ To remove /usr/local/bin from ``$PATH``, you can write::
 
     >_ set PATH (string match -v /usr/local/bin $PATH)
 
+For compatibility with other shells and external commands, $PATH is a :ref:`path variable<variables-path>`, and so will be joined with colons (not spaces) when you quote it:
+
+    >_ echo "$PATH"
+    /usr/local/sbin:/usr/local/bin:/usr/bin
+
+and it will be exported like that, and when fish starts it splits the $PATH it receives into a list on colon.
 
 You can do so directly in ``config.fish``, like you might do in other shells with ``.profile``. See :ref:`this example <path_example>`.
 
@@ -624,6 +638,8 @@ It is possible to directly create functions and variables in ``config.fish`` fil
 
 However, it is more common and efficient to use  autoloading functions and universal variables.
 
+If you want to organize your configuration, fish also reads commands in .fish files in ``~/.config/fish/conf.d/``. See :ref:`initialization <initialization>` for the details.
+
 Autoloading Functions
 ---------------------
 

From a12c377f0c73cc4f697c351694f54c5c7c3ceb66 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 20:01:26 +0200
Subject: [PATCH 0686/1732] docs/tutorial: Mention gitter channel

We also might want to remove the mailing list and/or IRC channel as I
think most devs aren't on them anymore, but let's just add the channel
that I prefer first.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 95cfffdce..145762467 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -707,4 +707,4 @@ with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps ab
 Ready for more?
 ---------------
 
-If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.
+If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, the `official gitter channel <https://gitter.im/fish-shell/fish-shell`_, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.

From 13ed29aca863527f24c92e086d973dc626793dcf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 22:50:32 +0200
Subject: [PATCH 0687/1732] docs/tutorial: Fix gitter link

Urgh.

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 145762467..fcfe9a53c 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -707,4 +707,4 @@ with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps ab
 Ready for more?
 ---------------
 
-If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, the `official gitter channel <https://gitter.im/fish-shell/fish-shell`_, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.
+If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, the `official gitter channel <https://gitter.im/fish-shell/fish-shell>`__, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.

From a3bdc6a23346872c3a988201e63bc6f4647ec26d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 6 Jun 2019 22:52:14 +0200
Subject: [PATCH 0688/1732] docs/tutorial: Fix list link

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index fcfe9a53c..bf43086b1 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -255,6 +255,8 @@ To give a variable to an external command, it needs to be "exported". Unlike oth
 It can also be unexported with ``--unexport`` or ``-u``.
 
 
+.. _tut_lists:
+
 Lists
 -----
 
@@ -589,7 +591,7 @@ You can choose among some sample prompts by running ``fish_config prompt``. ``fi
 $PATH
 -----
 
-``$PATH`` is an environment variable containing the directories that ``fish`` searches for commands. Unlike other shells, $PATH is a [list](#tut_lists), not a colon-delimited string.
+``$PATH`` is an environment variable containing the directories that ``fish`` searches for commands. Unlike other shells, $PATH is a :ref:`list <tut_lists>`, not a colon-delimited string.
 
 To prepend /usr/local/bin and /usr/sbin to ``$PATH``, you can write::
 

From 060a068a3c86b79aa662e916396ee71cfec99781 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 6 Jun 2019 19:42:34 -0700
Subject: [PATCH 0689/1732] Fix comment for is_single_byte_escape_seq.

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

diff --git a/src/screen.cpp b/src/screen.cpp
index 180e2f228..5c783c52a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -135,7 +135,7 @@ static bool is_osc_escape_seq(const wchar_t *code, size_t *resulting_length) {
     return found;
 }
 
-/// Generic VT100 one byte sequence: CSI followed by something in the range @ through _.
+/// Generic VT100 three byte sequence: CSI followed by something in the range @ through _.
 static bool is_single_byte_escape_seq(const wchar_t *code, size_t *resulting_length) {
     bool found = false;
     if (code[1] == L'[' && (code[2] >= L'@' && code[2] <= L'_')) {

From 18cf2b85094bda011da89d6395d48f8f7c90b1cc Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 6 Jun 2019 21:45:40 -0700
Subject: [PATCH 0690/1732] Rename incorrect is_single_byte_escape_seq to
 is_three_byte_escape_seq.

---
 src/screen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 5c783c52a..e42968f7c 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -136,7 +136,7 @@ static bool is_osc_escape_seq(const wchar_t *code, size_t *resulting_length) {
 }
 
 /// Generic VT100 three byte sequence: CSI followed by something in the range @ through _.
-static bool is_single_byte_escape_seq(const wchar_t *code, size_t *resulting_length) {
+static bool is_three_byte_escape_seq(const wchar_t *code, size_t *resulting_length) {
     bool found = false;
     if (code[1] == L'[' && (code[2] >= L'@' && code[2] <= L'_')) {
         *resulting_length = 3;
@@ -253,7 +253,7 @@ size_t escape_code_length(const wchar_t *code) {
     if (!found) found = is_visual_escape_seq(code, &esc_seq_len);
     if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len);
     if (!found) found = is_osc_escape_seq(code, &esc_seq_len);
-    if (!found) found = is_single_byte_escape_seq(code, &esc_seq_len);
+    if (!found) found = is_three_byte_escape_seq(code, &esc_seq_len);
     if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len);
     if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len);
     if (found) cached_layouts.add_escape_code(wcstring(code, esc_seq_len));

From be974991063bb6af5f860adab350901cf7ed71f1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Apr 2019 11:08:18 -0700
Subject: [PATCH 0691/1732] Revert "Revert "Add a test for autoload_t""

This reverts commit 2507162f805db9f864b290e77efc34182b170c2c.

Put back the autoload test.
---
 src/autoload.cpp   | 13 ++++++--
 src/autoload.h     | 14 +++++++-
 src/fish_tests.cpp | 82 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 6a750cfd3..4cdbc6cf8 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -144,6 +144,11 @@ autoload_t::autoload_t(wcstring env_var_name)
 autoload_t::autoload_t(autoload_t &&) = default;
 autoload_t::~autoload_t() = default;
 
+void autoload_t::invalidate_cache() {
+    auto cache = make_unique<autoload_file_cache_t>(cache_->dirs());
+    cache_ = std::move(cache);
+}
+
 bool autoload_t::can_autoload(const wcstring &cmd) {
     return cache_->check(cmd, true /* allow stale */).has_value();
 }
@@ -160,15 +165,17 @@ wcstring_list_t autoload_t::get_autoloaded_commands() const {
 }
 
 maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const environment_t &env) {
+    maybe_t<env_var_t> mvar = env.get(env_var_name_);
+    return resolve_command(cmd, mvar ? mvar->as_list() : wcstring_list_t{});
+}
+
+maybe_t<wcstring> autoload_t::resolve_command(const wcstring &cmd, const wcstring_list_t &paths) {
     // Are we currently in the process of autoloading this?
     if (current_autoloading_.count(cmd) > 0) return none();
 
     // Check to see if our paths have changed. If so, replace our cache.
     // Note we don't have to modify autoloadable_files_. We'll naturally detect if those have
     // changed when we query the cache.
-    maybe_t<env_var_t> mvar = env.get(env_var_name_);
-    const wcstring_list_t empty;
-    const wcstring_list_t &paths = mvar ? mvar->as_list() : empty;
     if (paths != cache_->dirs()) {
         cache_ = make_unique<autoload_file_cache_t>(paths);
     }
diff --git a/src/autoload.h b/src/autoload.h
index d59486364..3a17538fd 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -16,6 +16,7 @@
 class autoload_file_cache_t;
 class environment_t;
 class parser_t;
+struct autoload_tester_t;
 
 /// autoload_t is a class that knows how to autoload .fish files from a list of directories. This
 /// is used by autoloading functions and completions. It maintains a file cache, which is
@@ -39,6 +40,16 @@ class autoload_t {
     /// changes. This is never null (but it may be a cache with no paths).
     std::unique_ptr<autoload_file_cache_t> cache_;
 
+    /// Invalidate any underlying cache.
+    /// This is exposed for testing.
+    void invalidate_cache();
+
+    /// Like resolve_autoload(), but accepts the paths directly.
+    /// This is exposed for testing.
+    maybe_t<wcstring> resolve_command(const wcstring &cmd, const wcstring_list_t &paths);
+
+    friend autoload_tester_t;
+
    public:
     /// Construct an autoloader that loads from the paths given by \p env_var_name.
     explicit autoload_t(wcstring env_var_name);
@@ -77,7 +88,8 @@ class autoload_t {
     /// This does not actually mark the command as being autoloaded.
     bool can_autoload(const wcstring &cmd);
 
-    /// \return the names of all commands that have been autoloaded.
+    /// \return the names of all commands that have been autoloaded. Note this includes "in-flight"
+    /// commands.
     wcstring_list_t get_autoloaded_commands() const;
 
     /// Mark that all autoloaded files have been forgotten.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index c843ee3e2..32bec017f 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4,6 +4,7 @@
 // IWYU pragma: no_include <cstring>
 // IWYU pragma: no_include <cstddef>
 #include <errno.h>
+#include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
 #include <math.h>
@@ -38,6 +39,7 @@
 #include <utility>
 #include <vector>
 
+#include "autoload.h"
 #include "builtin.h"
 #include "color.h"
 #include "common.h"
@@ -2482,6 +2484,85 @@ static void test_colors() {
     do_test(rgb_color_t(L"mooganta").is_none());
 }
 
+// This class allows accessing private bits of autoload_t.
+struct autoload_tester_t {
+    static void run(const wchar_t *fmt, ...) {
+        va_list va;
+        va_start(va, fmt);
+        wcstring cmd = vformat_string(fmt, va);
+        va_end(va);
+
+        int status = system(wcs2string(cmd).c_str());
+        do_test(status == 0);
+    }
+
+    static void touch_file(const wcstring &path) {
+        int fd = wopen_cloexec(path, O_RDWR | O_CREAT, 0666);
+        do_test(fd >= 0);
+        write_loop(fd, "Hello", 5);
+        close(fd);
+    }
+
+    static void run_test() {
+        char t1[] = "/tmp/fish_test_autoload.XXXXXX";
+        wcstring p1 = str2wcstring(mkdtemp(t1));
+        char t2[] = "/tmp/fish_test_autoload.XXXXXX";
+        wcstring p2 = str2wcstring(mkdtemp(t2));
+
+        const wcstring_list_t paths = {p1, p2};
+
+        autoload_t autoload(L"test_var");
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.get_autoloaded_commands().empty());
+
+        run(L"touch %ls/file1.fish", p1.c_str());
+        run(L"touch %ls/file2.fish", p2.c_str());
+        autoload.invalidate_cache();
+
+        do_test(!autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
+        autoload.mark_autoload_finished(L"file1");
+        do_test(!autoload.autoload_in_progress(L"file1"));
+        do_test(autoload.get_autoloaded_commands() == wcstring_list_t{L"file1"});
+
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.resolve_command(L"file2", paths));
+        do_test(!autoload.resolve_command(L"file2", paths));
+        autoload.mark_autoload_finished(L"file2");
+        do_test(!autoload.resolve_command(L"file2", paths));
+        do_test((autoload.get_autoloaded_commands() == wcstring_list_t{L"file1", L"file2"}));
+
+        autoload.clear();
+        do_test(autoload.resolve_command(L"file1", paths));
+        autoload.mark_autoload_finished(L"file1");
+        do_test(!autoload.resolve_command(L"file1", paths));
+        do_test(!autoload.resolve_command(L"nothing", paths));
+        do_test(autoload.resolve_command(L"file2", paths));
+        do_test(!autoload.resolve_command(L"file2", paths));
+        autoload.mark_autoload_finished(L"file2");
+
+        do_test(!autoload.resolve_command(L"file1", paths));
+        touch_file(format_string(L"%ls/file1.fish", p1.c_str()));
+        autoload.invalidate_cache();
+        do_test(autoload.resolve_command(L"file1", paths));
+        autoload.mark_autoload_finished(L"file1");
+
+        run(L"rm -Rf %ls", p1.c_str());
+        run(L"rm -Rf %ls", p2.c_str());
+
+    }
+};
+
+static void test_autoload() {
+    say(L"Testing autoload");
+    autoload_tester_t::run_test();
+}
+
 static void test_complete() {
     say(L"Testing complete");
 
@@ -5341,6 +5422,7 @@ int main(int argc, char **argv) {
     if (should_test_function("is_potential_path")) test_is_potential_path();
     if (should_test_function("colors")) test_colors();
     if (should_test_function("complete")) test_complete();
+    if (should_test_function("autoload")) test_autoload();
     if (should_test_function("input")) test_input();
     if (should_test_function("line_iterator")) test_line_iterator();
     if (should_test_function("universal")) test_universal();

From c9a77bb4743f2a1a30659d5d22b7ebef43e3404a Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 8 Jun 2019 21:06:15 -0500
Subject: [PATCH 0692/1732] Optimize history search reset checking

`history_search.active()` is an atomic read, whereas
`command_ends_history_search(..)` is a little bit heavier.
---
 src/reader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index b7869ce90..ba4e5c4bd 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3260,10 +3260,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
 
             handle_readline_command(readline_cmd, rls);
 
-            if (command_ends_history_search(readline_cmd)) {
+            if (history_search.active() && command_ends_history_search(readline_cmd)) {
                 // "cancel" means to abort the whole thing, other ending commands mean to finish the
                 // search.
-                if (history_search.active() && readline_cmd == rl::cancel) {
+                if (readline_cmd == rl::cancel) {
                     history_search.go_to_end();
                     update_command_line_from_history_search();
                 }

From 7448e7825f5602b35ec0d6a11cb3195a939608b2 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 6 Jun 2019 21:18:09 -0700
Subject: [PATCH 0693/1732] Avoid code duplication relating to screen clearning
 in s_update.

---
 src/screen.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index e42968f7c..62a863c5d 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -699,17 +699,21 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         }
 
         // Now actually output stuff.
-        for (; j < o_line.size(); j++) {
+        for (; ; j++) {
+            bool done = j >= o_line.size();
+            // Clear the screen if we have not done so yet.
             // If we are about to output into the last column, clear the screen first. If we clear
             // the screen after we output into the last column, it can erase the last character due
             // to the sticky right cursor. If we clear the screen too early, we can defeat soft
             // wrapping.
-            if (j + 1 == (size_t)screen_width && should_clear_screen_this_line &&
-                !has_cleared_screen) {
+            if (should_clear_screen_this_line && !has_cleared_screen
+                && (done || j + 1 == (size_t)screen_width)) {
                 s_move(scr, current_width, (int)i);
                 s_write_mbs(scr, clr_eos);
                 has_cleared_screen = true;
             }
+            if (done)
+                break;
 
             perform_any_impending_soft_wrap(scr, current_width, (int)i);
             s_move(scr, current_width, (int)i);
@@ -719,13 +723,6 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             current_width += width;
         }
 
-        // Clear the screen if we have not done so yet.
-        if (should_clear_screen_this_line && !has_cleared_screen) {
-            s_move(scr, current_width, (int)i);
-            s_write_mbs(scr, clr_eos);
-            has_cleared_screen = true;
-        }
-
         bool clear_remainder = false;
         // Clear the remainder of the line if we need to clear and if we didn't write to the end of
         // the line. If we did write to the end of the line, the "sticky right edge" (as part of

From e05a0716e51d55a1afa4ac728e3ba72b1f3f3768 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 6 Jun 2019 21:27:13 -0700
Subject: [PATCH 0694/1732] Make sure initial indentation is done using cursor
 move, not spaces.

The goal to allow a terminal to reliably distinguish user input
from indentation and prompts, in the context of shell integration.
---
 src/screen.cpp | 31 +++++++++++++++++++++++++------
 src/screen.h   |  3 ++-
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 62a863c5d..70d258da1 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -388,9 +388,12 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
         // Current line is definitely hard wrapped.
         s->desired.create_line(s->desired.line_count());
         s->desired.line(s->desired.cursor.y).is_soft_wrapped = false;
-        s->desired.cursor.y++;
+        int line_no = ++s->desired.cursor.y;
         s->desired.cursor.x = 0;
-        for (size_t i = 0; i < prompt_width + indent * INDENT_STEP; i++) {
+        size_t indentation = prompt_width + indent * INDENT_STEP;
+        line_t &line = s->desired.line(line_no);
+        line.indentation = indentation;
+        for (size_t i = 0; i < indentation; i++) {
             s_desired_append_char(s, L' ', highlight_spec_t{}, indent, prompt_width, 1);
         }
     } else if (b == L'\r') {
@@ -650,6 +653,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         line_t &s_line = scr->actual.create_line(i);
         size_t start_pos = i == 0 ? left_prompt_width : 0;
         int current_width = 0;
+        bool has_cleared_line = false;
 
         // If this is the last line, maybe we should clear the screen.
         const bool should_clear_screen_this_line =
@@ -659,13 +663,28 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         size_t skip_remaining = start_pos;
 
         const size_t shared_prefix = line_shared_prefix(o_line, s_line);
+        size_t skip_prefix = shared_prefix;
+        if (shared_prefix < o_line.indentation) {
+            if (o_line.indentation > s_line.indentation
+                && s_line.indentation != s_line.size()
+                && !has_cleared_screen && clr_eol && clr_eos) {
+                s_set_color(scr, vars, highlight_spec_t{});
+                s_move(scr, 0, (int)i);
+                s_write_mbs(scr,
+                            should_clear_screen_this_line ? clr_eos : clr_eol);
+                has_cleared_screen = should_clear_screen_this_line;
+                has_cleared_line = true;
+            }
+            skip_prefix = o_line.indentation;
+        }
         if (!should_clear_screen_this_line) {
             // Compute how much we should skip. At a minimum we skip over the prompt. But also skip
             // over the shared prefix of what we want to output now, and what we output before, to
             // avoid repeatedly outputting it.
-            if (shared_prefix > 0) {
-                size_t prefix_width = fish_wcswidth(&o_line.text.at(0), shared_prefix);
-                if (prefix_width > skip_remaining) skip_remaining = prefix_width;
+            if (skip_prefix > 0) {
+                size_t skip_width = shared_prefix < skip_prefix ? skip_prefix
+                    : fish_wcswidth(&o_line.text.at(0), shared_prefix);
+                if (skip_width > skip_remaining) skip_remaining = skip_width;
             }
 
             // If we're soft wrapped, and if we're going to change the first character of the next
@@ -727,7 +746,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         // Clear the remainder of the line if we need to clear and if we didn't write to the end of
         // the line. If we did write to the end of the line, the "sticky right edge" (as part of
         // auto_right_margin) means that we'll be clearing the last character we wrote!
-        if (has_cleared_screen) {
+        if (has_cleared_screen || has_cleared_line) {
             // Already cleared everything.
             clear_remainder = false;
         } else if (need_clear_lines && current_width < screen_width) {
diff --git a/src/screen.h b/src/screen.h
index a88d9d4ef..907bc7924 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -32,8 +32,9 @@ struct line_t {
     std::vector<wchar_t> text;
     std::vector<highlight_spec_t> colors;
     bool is_soft_wrapped;
+    size_t indentation;
 
-    line_t() : text(), colors(), is_soft_wrapped(false) {}
+    line_t() : text(), colors(), is_soft_wrapped(false), indentation(0) {}
 
     void clear(void) {
         text.clear();

From 79ee59adc01dc823c1e10dd0c5b323042a7accab Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 13:21:58 -0700
Subject: [PATCH 0695/1732] Convert the create_export_array message to flog

---
 src/env.cpp | 2 +-
 src/flog.h  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/env.cpp b/src/env.cpp
index 90d0a5839..9a9197bd8 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -581,7 +581,7 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_e
     const {
     var_table_t table;
 
-    debug(4, L"create_export_array() recalc");
+    FLOG(env_export, L"create_export_array() recalc");
     var_table_t vals;
     get_exported(this->globals_, vals);
     get_exported(this->locals_, vals);
diff --git a/src/flog.h b/src/flog.h
index 94c2a236c..7a6e0e775 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -63,6 +63,8 @@ class category_list_t {
 
     category_t env_locale{L"env-locale", L"Changes to locale variables"};
 
+    category_t env_export{L"env-export", L"Changes to exported variables"};
+
     category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
 };
 

From 7dffaf1a02a1e9c071ef7b19a1eacecc66f73310 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 13:25:30 -0700
Subject: [PATCH 0696/1732] Reimplement exported variable change detection

Prior to this fix, fish would invalidate the exported variable list
whenever an exported variable changes. However we soon will not have a
single "exported variable list." If a global variable changes, it is
infeasible to find all exported variable lists and invalidate them.

Switch to a new model where we store a list of generation counts. Every
time an exported variable changes, the node gets a new generation. If the
current generation list does not match the cached one, then we know that
our exported variable list is stale.
---
 src/env.cpp          | 103 +++++++++++++++++++++++++++++--------------
 src/env.h            |   3 --
 src/env_dispatch.cpp |   1 -
 3 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 9a9197bd8..0a6479aa0 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -124,6 +124,17 @@ static bool variable_should_auto_pathvar(const wcstring &name) {
 // node would need its own lock.
 static std::mutex env_lock;
 
+/// We cache our null-terminated export list. However an exported variable may change for lots of
+/// reasons: popping a scope, a modified universal variable, etc. We thus have a monotone counter.
+/// Every time an exported variable changes in a node, it acquires the next generation. 0 is a
+/// sentinel that indicates that the node contains no exported variables.
+using export_generation_t = uint64_t;
+static export_generation_t next_export_generation() {
+    static owning_lock<export_generation_t> s_gen;
+    auto val = s_gen.acquire();
+    return ++*val;
+}
+
 /// Some env vars contain a list of paths where an empty path element is equivalent to ".".
 /// Unfortunately that convention causes problems for fish scripts. So this function replaces the
 /// empty path element with an explicit ".". See issue #3914.
@@ -471,9 +482,9 @@ class env_node_t {
     /// in the stack are invisible. If new_scope is set for the global variable node, the universe
     /// will explode.
     const bool new_scope;
-    /// Does this node contain any variables which are exported to subshells
-    /// or does it redefine any variables to not be exported?
-    bool exportv = false;
+    /// The export generation. If this is nonzero, then we contain a variable that is exported to
+    /// subshells, or redefines a variable to not be exported.
+    export_generation_t export_gen = 0;
     /// Pointer to next level.
     const std::shared_ptr<env_node_t> next;
 
@@ -485,6 +496,10 @@ class env_node_t {
         if (it != env.end()) return it->second;
         return none();
     }
+
+    bool exports() const { return export_gen > 0; }
+
+    void changed_exported() { export_gen = next_export_generation(); }
 };
 }  // namespace
 
@@ -533,13 +548,9 @@ class env_scoped_impl_t : public environment_t {
     // Exported variable array used by execv.
     std::shared_ptr<const null_terminated_array_t<char>> export_array_{};
 
-    /// \return true if the local scope exports.
-    bool local_scope_exports() const {
-        for (auto cursor = locals_; cursor; cursor = cursor->next) {
-            if (cursor->exportv) return true;
-        }
-        return false;
-    }
+    // Cached list of export generations corresponding to the above export_array_.
+    // If this differs from the current export generations then we need to regenerate the array.
+    std::vector<export_generation_t> export_array_generations_{};
 
    private:
     // These "try" methods return true on success, false on failure. On a true return, \p result is
@@ -551,6 +562,18 @@ class env_scoped_impl_t : public environment_t {
     maybe_t<env_var_t> try_get_global(const wcstring &key) const;
     maybe_t<env_var_t> try_get_universal(const wcstring &key) const;
 
+    /// Invoke a function on the current (nonzero) export generations, in order.
+    template <typename Func>
+    void enumerate_generations(const Func &func) const {
+        if (globals_->exports()) func(globals_->export_gen);
+        for (auto node = locals_; node; node = node->next) {
+            if (node->exports()) func(node->export_gen);
+        }
+    }
+
+    /// \return whether the current export array is empty or out-of-date.
+    bool export_array_needs_regeneration() const;
+
     /// \return a newly allocated export array.
     std::shared_ptr<const null_terminated_array_t<char>> create_export_array() const;
 };
@@ -577,6 +600,28 @@ static void get_exported(const env_node_ref_t &n, var_table_t &table) {
     }
 }
 
+bool env_scoped_impl_t::export_array_needs_regeneration() const {
+    // Check if our export array is stale. If we don't have one, it's obviously stale. Otherwise,
+    // compare our cached generations with the current generations. If they don't match exactly then
+    // our generation list is stale.
+    if (!export_array_) return true;
+
+    bool mismatch = false;
+    auto cursor = export_array_generations_.begin();
+    auto end = export_array_generations_.end();
+    enumerate_generations([&](export_generation_t gen) {
+        if (cursor != end && *cursor == gen) {
+            ++cursor;
+        } else {
+            mismatch = true;
+        }
+    });
+    if (cursor != end) {
+        mismatch = true;
+    }
+    return mismatch;
+}
+
 std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_export_array()
     const {
     var_table_t table;
@@ -616,8 +661,13 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_e
 
 std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::export_array() {
     ASSERT_IS_NOT_FORKED_CHILD();
-    if (!export_array_) {
+    if (export_array_needs_regeneration()) {
         export_array_ = create_export_array();
+
+        // Update our export array generations.
+        export_array_generations_.clear();
+        enumerate_generations(
+            [this](export_generation_t gen) { export_array_generations_.push_back(gen); });
     }
     return export_array_;
 }
@@ -764,7 +814,7 @@ static env_node_ref_t copy_node_chain(const env_node_ref_t &node) {
     auto result = std::make_shared<env_node_t>(node->new_scope, next);
     // Copy over variables.
     // Note assigning env is a potentially big copy.
-    result->exportv = node->exportv;
+    result->export_gen = node->export_gen;
     result->env = node->env;
     return result;
 }
@@ -797,9 +847,6 @@ class env_stack_impl_t final : public env_scoped_impl_t {
     /// \return the popped node.
     env_node_ref_t pop();
 
-    /// Mark that our export list needs to be regenerated.
-    void mark_changed_exported() { export_array_.reset(); }
-
     /// \return a new impl representing global variables, with a single local scope.
     static std::unique_ptr<env_stack_impl_t> create() {
         static const auto s_global_node = std::make_shared<env_node_t>(false, nullptr);
@@ -835,15 +882,12 @@ class env_stack_impl_t final : public env_scoped_impl_t {
         return nullptr;
     }
 
-    /// Remove a variable from the chain \p node, updating the export bit as necessary.
+    /// Remove a variable from the chain \p node.
     /// \return true if the variable was found and removed.
-    bool remove_from_chain(env_node_ref_t node, const wcstring &key) {
+    bool remove_from_chain(env_node_ref_t node, const wcstring &key) const {
         for (auto cursor = node; cursor; cursor = cursor->next) {
             auto iter = cursor->env.find(key);
             if (iter != cursor->env.end()) {
-                if (iter->second.exports()) {
-                    mark_changed_exported();
-                }
                 cursor->env.erase(iter);
                 return true;
             }
@@ -896,7 +940,7 @@ void env_stack_impl_t::push_shadowing() {
     for (const auto &var : locals_->env) {
         if (var.second.exports()) {
             node->env.insert(var);
-            node->exportv = true;
+            node->changed_exported();
         }
     }
     this->shadowed_locals_.push_back(std::move(locals_));
@@ -904,20 +948,16 @@ void env_stack_impl_t::push_shadowing() {
 }
 
 env_node_ref_t env_stack_impl_t::pop() {
-    bool changed_exports = locals_->exportv;
     auto popped = std::move(locals_);
     if (popped->next) {
         // Pop the inner scope.
         locals_ = popped->next;
-        changed_exports = changed_exports || local_scope_exports();
     } else {
         // Exhausted the inner scopes, put back a shadowing scope.
         assert(!shadowed_locals_.empty() && "Attempt to pop last local scope");
         locals_ = std::move(shadowed_locals_.back());
         shadowed_locals_.pop_back();
-        changed_exports = changed_exports || local_scope_exports();
     }
-    if (changed_exports) mark_changed_exported();
     assert(locals_ && "Attempt to pop first local scope");
     return popped;
 }
@@ -954,8 +994,7 @@ void env_stack_impl_t::set_in_node(env_node_ref_t node, const wcstring &key, wcs
     // Perhaps mark that this node contains an exported variable, or shadows an exported variable.
     // If so regenerate the export list.
     if (res_exports || flags.parent_exports) {
-        node->exportv = true;
-        mark_changed_exported();
+        node->changed_exported();
     }
 }
 
@@ -991,7 +1030,7 @@ maybe_t<int> env_stack_impl_t::try_set_electric(const wcstring &key, const query
         wcstring &pwd = val.front();
         if (pwd != perproc_data().pwd) {
             perproc_data().pwd = std::move(pwd);
-            mark_changed_exported();
+            globals_->changed_exported();
         }
         return ENV_OK;
     }
@@ -1047,7 +1086,8 @@ void env_stack_impl_t::set_universal(const wcstring &key, wcstring_list_t val,
 
     uvars()->set(key, new_var);
     if (new_var.exports() || (oldvar && oldvar->exports())) {
-        mark_changed_exported();
+        // TODO: we need to use a generation count here, other parsers care about this.
+        export_array_.reset();
     }
 }
 
@@ -1121,7 +1161,8 @@ int env_stack_impl_t::remove(const wcstring &key, int mode, bool *out_needs_uvar
         auto flags = uvars()->get_flags(key);
         if (!flags) return false;
         if (*flags & env_var_t::flag_export) {
-            this->mark_changed_exported();
+            // TODO: need to use a generation count here.
+            export_array_.reset();
         }
         *out_needs_uvar_sync = true;
         return uvars()->remove(key);
@@ -1287,8 +1328,6 @@ void env_stack_t::pop() {
     }
 }
 
-void env_stack_t::mark_changed_exported() { acquire_impl()->mark_changed_exported(); }
-
 env_stack_t &env_stack_t::globals() {
     static env_stack_t s_globals(env_stack_impl_t::create());
     return s_globals;
diff --git a/src/env.h b/src/env.h
index f99b69303..d65f66c98 100644
--- a/src/env.h
+++ b/src/env.h
@@ -296,9 +296,6 @@ class env_stack_t final : public environment_t {
     /// Sets up argv as the given list of strings.
     void set_argv(wcstring_list_t argv);
 
-    /// Mark that exported variables have changed.
-    void mark_changed_exported();
-
     // Compatibility hack; access the "environment stack" from back when there was just one.
     static const std::shared_ptr<env_stack_t> &principal_ref();
     static env_stack_t &principal() { return *principal_ref(); }
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index c69d85850..731d0c222 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -211,7 +211,6 @@ static void universal_callback(env_stack_t *stack, const callback_data_t &cb) {
     const wchar_t *op = cb.is_erase() ? L"ERASE" : L"SET";
 
     env_dispatch_var_change(cb.key, *stack);
-    stack->mark_changed_exported();
 
     // TODO: eliminate this principal_parser. Need to rationalize how multiple threads work here.
     event_fire(parser_t::principal_parser(), event_t::variable(cb.key, {L"VARIABLE", op, cb.key}));

From 421cf9238073b1e1aee0b048dc36a759ee3161be Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 13:48:07 -0700
Subject: [PATCH 0697/1732] Use a generation count for uvars exports

Because an exported universal variable must be exported in all variable
stacks, explicit invalidation is infeasible. Switch the universal variables
to a generation count.
---
 src/env.cpp                  | 11 ++----
 src/env_universal_common.cpp | 66 ++++++++++++++++++++----------------
 src/env_universal_common.h   | 15 +++++---
 3 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 0a6479aa0..d5798f4b9 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -565,6 +565,9 @@ class env_scoped_impl_t : public environment_t {
     /// Invoke a function on the current (nonzero) export generations, in order.
     template <typename Func>
     void enumerate_generations(const Func &func) const {
+        // Our uvars generation count doesn't come from next_export_generation(), so always supply
+        // it even if it's 0.
+        func(uvars() ? uvars()->get_export_generation() : 0);
         if (globals_->exports()) func(globals_->export_gen);
         for (auto node = locals_; node; node = node->next) {
             if (node->exports()) func(node->export_gen);
@@ -1085,10 +1088,6 @@ void env_stack_impl_t::set_universal(const wcstring &key, wcstring_list_t val,
     env_var_t new_var{val, varflags};
 
     uvars()->set(key, new_var);
-    if (new_var.exports() || (oldvar && oldvar->exports())) {
-        // TODO: we need to use a generation count here, other parsers care about this.
-        export_array_.reset();
-    }
 }
 
 int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val,
@@ -1160,10 +1159,6 @@ int env_stack_impl_t::remove(const wcstring &key, int mode, bool *out_needs_uvar
         if (!uvars()) return false;
         auto flags = uvars()->get_flags(key);
         if (!flags) return false;
-        if (*flags & env_var_t::flag_export) {
-            // TODO: need to use a generation count here.
-            export_array_.reset();
-        }
         *out_needs_uvar_sync = true;
         return uvars()->remove(key);
     };
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 15721e327..4bad356ed 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -265,36 +265,31 @@ maybe_t<env_var_t::env_var_flags_t> env_universal_t::get_flags(const wcstring &n
     return none();
 }
 
-void env_universal_t::set_internal(const wcstring &key, const env_var_t &var, bool overwrite) {
+void env_universal_t::set_internal(const wcstring &key, const env_var_t &var) {
     ASSERT_IS_LOCKED(lock);
-    if (!overwrite && this->modified.find(key) != this->modified.end()) {
-        // This value has been modified and we're not overwriting it. Skip it.
-        return;
-    }
-
     env_var_t &entry = vars[key];
     if (entry != var) {
         entry = var;
-
-        // If we are overwriting, then this is now modified.
-        if (overwrite) {
-            this->modified.insert(key);
-        }
+        this->modified.insert(key);
+        if (entry.exports()) export_generation += 1;
     }
 }
 
 void env_universal_t::set(const wcstring &key, env_var_t var) {
     scoped_lock locker(lock);
-    this->set_internal(key, std::move(var), true /* overwrite */);
+    this->set_internal(key, std::move(var));
 }
 
 bool env_universal_t::remove_internal(const wcstring &key) {
     ASSERT_IS_LOCKED(lock);
-    size_t erased = this->vars.erase(key);
-    if (erased > 0) {
+    auto iter = this->vars.find(key);
+    if (iter != this->vars.end()) {
+        if (iter->second.exports()) export_generation += 1;
+        this->vars.erase(iter);
         this->modified.insert(key);
+        return true;
     }
-    return erased > 0;
+    return false;
 }
 
 bool env_universal_t::remove(const wcstring &key) {
@@ -317,27 +312,27 @@ wcstring_list_t env_universal_t::get_names(bool show_exported, bool show_unexpor
 }
 
 // Given a variable table, generate callbacks representing the difference between our vars and the
-// new vars.
-void env_universal_t::generate_callbacks(const var_table_t &new_vars,
-                                         callback_data_list_t &callbacks) const {
+// new vars. Update our exports generation.
+void env_universal_t::generate_callbacks_and_update_exports(const var_table_t &new_vars,
+                                                            callback_data_list_t &callbacks) {
     // Construct callbacks for erased values.
-    for (var_table_t::const_iterator iter = this->vars.begin(); iter != this->vars.end(); ++iter) {
-        const wcstring &key = iter->first;
-
+    for (const auto &kv : this->vars) {
+        const wcstring &key = kv.first;
         // Skip modified values.
-        if (this->modified.find(key) != this->modified.end()) {
+        if (this->modified.count(key)) {
             continue;
         }
 
         // If the value is not present in new_vars, it has been erased.
-        if (new_vars.find(key) == new_vars.end()) {
+        if (new_vars.count(key) == 0) {
             callbacks.push_back(callback_data_t(key, none()));
+            if (kv.second.exports()) export_generation += 1;
         }
     }
 
     // Construct callbacks for newly inserted or changed values.
-    for (var_table_t::const_iterator iter = new_vars.begin(); iter != new_vars.end(); ++iter) {
-        const wcstring &key = iter->first;
+    for (const auto &kv : new_vars) {
+        const wcstring &key = kv.first;
 
         // Skip modified values.
         if (this->modified.find(key) != this->modified.end()) {
@@ -345,10 +340,15 @@ void env_universal_t::generate_callbacks(const var_table_t &new_vars,
         }
 
         // See if the value has changed.
-        const env_var_t &new_entry = iter->second;
+        const env_var_t &new_entry = kv.second;
         var_table_t::const_iterator existing = this->vars.find(key);
-        if (existing == this->vars.end() || existing->second.exports() != new_entry.exports() ||
-            existing->second != new_entry) {
+
+        bool old_exports = (existing != this->vars.end() && existing->second.exports());
+        bool export_changed = (old_exports != new_entry.exports());
+        if (export_changed) {
+            export_generation += 1;
+        }
+        if (existing == this->vars.end() || export_changed || existing->second != new_entry) {
             // Value has changed.
             callbacks.push_back(callback_data_t(key, new_entry.as_string()));
         }
@@ -393,8 +393,8 @@ void env_universal_t::load_from_fd(int fd, callback_data_list_t &callbacks) {
             ok_to_save = false;
         }
 
-        // Announce changes.
-        this->generate_callbacks(new_vars, callbacks);
+        // Announce changes and update our exports generation.
+        this->generate_callbacks_and_update_exports(new_vars, callbacks);
 
         // Acquire the new variables.
         this->acquire_variables(new_vars);
@@ -427,6 +427,12 @@ bool env_universal_t::load_from_path(const wcstring &path, callback_data_list_t
     std::string tmp = wcs2string(path);
     return load_from_path(tmp, callbacks);
 }
+
+uint64_t env_universal_t::get_export_generation() const {
+    scoped_lock locker(lock);
+    return export_generation;
+}
+
 /// Serialize the contents to a string.
 std::string env_universal_t::serialize_with_vars(const var_table_t &vars) {
     std::string storage;
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 471c7dbba..c9553edfc 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -28,7 +28,7 @@ struct callback_data_t {
     bool is_erase() const { return !val.has_value(); }
 };
 
-typedef std::vector<struct callback_data_t> callback_data_list_t;
+typedef std::vector<callback_data_t> callback_data_list_t;
 
 // List of fish universal variable formats.
 // This is exposed for testing.
@@ -49,6 +49,9 @@ class env_universal_t {
     // Path that we save to. If empty, use the default.
     wcstring explicit_vars_path;
 
+    // A generation count which is incremented every time an exported variable is modified.
+    uint64_t export_generation{1};
+
     // Whether it's OK to save. This may be set to false if we discover that a future version of
     // fish wrote the uvars contents.
     bool ok_to_save{true};
@@ -58,7 +61,7 @@ class env_universal_t {
     bool load_from_path(const wcstring &path, callback_data_list_t &callbacks);
     void load_from_fd(int fd, callback_data_list_t &callbacks);
 
-    void set_internal(const wcstring &key, const env_var_t &var, bool overwrite);
+    void set_internal(const wcstring &key, const env_var_t &var);
     bool remove_internal(const wcstring &name);
 
     // Functions concerned with saving.
@@ -71,8 +74,9 @@ class env_universal_t {
     file_id_t last_read_file = kInvalidFileID;
 
     // Given a variable table, generate callbacks representing the difference between our vars and
-    // the new vars.
-    void generate_callbacks(const var_table_t &new_vars, callback_data_list_t &callbacks) const;
+    // the new vars. Also update our exports generation count as necessary.
+    void generate_callbacks_and_update_exports(const var_table_t &new_vars,
+                                               callback_data_list_t &callbacks);
 
     // Given a variable table, copy unmodified values into self. May destructively modify
     // vars_to_acquire.
@@ -127,6 +131,9 @@ class env_universal_t {
 
     /// Exposed for testing only.
     bool is_ok_to_save() const { return ok_to_save; }
+
+    /// Access the export generation.
+    uint64_t get_export_generation() const;
 };
 
 /// The "universal notifier" is an object responsible for broadcasting and receiving universal

From 1baa479bbfc3a78243074b66695de7d0e5f65565 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 14:11:25 -0700
Subject: [PATCH 0698/1732] Eliminate the global list of scoped transient
 commandlines

Store this in a parser's libdata instead.
---
 src/builtin.h               | 18 ------------------
 src/builtin_commandline.cpp | 35 ++++-------------------------------
 src/builtin_complete.cpp    |  5 +++--
 src/complete.cpp            | 10 +++++++---
 src/parser.h                |  7 ++++++-
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/src/builtin.h b/src/builtin.h
index 6185267bf..e5edfc2d4 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -85,24 +85,6 @@ wcstring_list_t builtin_get_names();
 void builtin_get_names(std::vector<completion_t> *list);
 const wchar_t *builtin_get_desc(const wcstring &b);
 
-/// Support for setting and removing transient command lines. This is used by
-/// 'complete -C' in order to make the commandline builtin operate on the string
-/// to complete instead of operating on whatever is to be completed. It's also
-/// used by completion wrappers, to allow a command to appear as the command
-/// being wrapped for the purposes of completion.
-///
-/// Instantiating an instance of builtin_commandline_scoped_transient_t pushes
-/// the command as the new transient commandline. The destructor removes it. It
-/// will assert if construction/destruction does not happen in a stack-like
-/// (LIFO) order.
-class builtin_commandline_scoped_transient_t {
-    size_t token;
-
-   public:
-    explicit builtin_commandline_scoped_transient_t(const wcstring &cmd);
-    ~builtin_commandline_scoped_transient_t();
-};
-
 wcstring builtin_help_get(parser_t &parser, const wchar_t *cmd);
 
 void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index a84c53be1..7b623e451 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -12,6 +12,7 @@
 #include "input.h"
 #include "io.h"
 #include "parse_util.h"
+#include "parser.h"
 #include "proc.h"
 #include "reader.h"
 #include "tokenizer.h"
@@ -35,36 +36,6 @@ enum {
     APPEND_MODE        // insert at end of current token/command/buffer
 };
 
-static owning_lock<wcstring_list_t> &get_transient_stack() {
-    ASSERT_IS_MAIN_THREAD();
-    static owning_lock<wcstring_list_t> s_transient_stack;
-    return s_transient_stack;
-}
-
-static bool get_top_transient(wcstring *out_result) {
-    auto stack = get_transient_stack().acquire();
-    if (stack->empty()) {
-        return false;
-    }
-    out_result->assign(stack->back());
-    return true;
-}
-
-builtin_commandline_scoped_transient_t::builtin_commandline_scoped_transient_t(
-    const wcstring &cmd) {
-    ASSERT_IS_MAIN_THREAD();
-    auto stack = get_transient_stack().acquire();
-    stack->push_back(cmd);
-    this->token = stack->size();
-}
-
-builtin_commandline_scoped_transient_t::~builtin_commandline_scoped_transient_t() {
-    ASSERT_IS_MAIN_THREAD();
-    auto stack = get_transient_stack().acquire();
-    assert(this->token == stack->size());
-    stack->pop_back();
-}
-
 /// Replace/append/insert the selection with/at/after the specified string.
 ///
 /// \param begin beginning of selection
@@ -178,8 +149,10 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     int paging_mode = 0;
     const wchar_t *begin = NULL, *end = NULL;
 
+    const auto &ld = parser.libdata();
     wcstring transient_commandline;
-    if (get_top_transient(&transient_commandline)) {
+    if (!ld.transient_commandlines.empty()) {
+        transient_commandline = ld.transient_commandlines.back();
         current_buffer = transient_commandline.c_str();
         current_cursor_pos = transient_commandline.size();
     } else {
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 1ea9b06ae..add0948cc 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -329,9 +329,10 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         parse_util_token_extent(do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0,
                                 0);
 
-        // Create a scoped transient command line, so that bulitin_commandline will see our
+        // Create a scoped transient command line, so that builtin_commandline will see our
         // argument, not the reader buffer.
-        builtin_commandline_scoped_transient_t temp_buffer(do_complete_param);
+        parser.libdata().transient_commandlines.push_back(do_complete_param);
+        cleanup_t remove_transient([&] { parser.libdata().transient_commandlines.pop_back(); });
 
         if (parser.libdata().builtin_complete_recursion_level < 1) {
             parser.libdata().builtin_complete_recursion_level++;
diff --git a/src/complete.cpp b/src/complete.cpp
index 5af617fee..281a5a9db 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1557,15 +1557,19 @@ void completer_t::perform() {
                         // Perhaps set a transient commandline so that custom completions
                         // buitin_commandline will refer to the wrapped command. But not if
                         // we're doing autosuggestions.
-                        std::unique_ptr<builtin_commandline_scoped_transient_t> bcst;
-                        if (depth > 0 && !(flags & completion_request_t::autosuggestion)) {
-                            bcst = make_unique<builtin_commandline_scoped_transient_t>(cmdline);
+                        bool wants_transient =
+                            depth > 0 && !(flags & completion_request_t::autosuggestion);
+                        if (wants_transient) {
+                            parser->libdata().transient_commandlines.push_back(cmdline);
                         }
                         // Now invoke any custom completions for this command.
                         if (!complete_param(cmd, previous_argument_unescape,
                                             current_argument_unescape, !had_ddash)) {
                             do_file = false;
                         }
+                        if (wants_transient) {
+                            parser->libdata().transient_commandlines.pop_back();
+                        }
                     };
                     walk_wrap_chain(cmd, *cmd_node.source_range(), receiver);
                 }
diff --git a/src/parser.h b/src/parser.h
index d74833547..bcd39214d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -163,7 +163,12 @@ struct library_data_t {
     const wchar_t *current_filename{};
 
     /// List of events that have been sent but have not yet been delivered because they are blocked.
-    std::vector<shared_ptr<event_t>> blocked_events;
+    std::vector<shared_ptr<event_t>> blocked_events{};
+
+    /// A stack of fake values to be returned by builtin_commandline. This is used by the completion
+    /// machinery when wrapping: e.g. if `tig` wraps `git` then git completions need to see git on
+    /// the command line.
+    wcstring_list_t transient_commandlines{};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From 0f9f00b54bc9ad6462d32be6be389f263d89b72f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 16:08:00 -0700
Subject: [PATCH 0699/1732] Add a test that verifies cd handling in pipes

---
 tests/cd.err |  3 +++
 tests/cd.in  | 19 +++++++++++++++++++
 tests/cd.out |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/tests/cd.err b/tests/cd.err
index 331132ff0..ebc6ea138 100644
--- a/tests/cd.err
+++ b/tests/cd.err
@@ -13,3 +13,6 @@
 
 ####################
 # on-variable PWD
+
+####################
+# cd concurrency
diff --git a/tests/cd.in b/tests/cd.in
index 3ac2c9d02..d52c2e46d 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -86,3 +86,22 @@ function __fish_test_changed_pwd --on-variable PWD
    echo "Changed to $PWD"
 end
 cd /
+functions --erase __fish_test_changed_pwd
+
+logmsg cd concurrency
+# Verify that cds don't stomp on each other.
+function __fish_test_thrash_cd
+   set -l dir (mktemp -d)
+   cd $dir
+   for i in (seq 50)
+       test (/bin/pwd) = $dir
+       and test $PWD = $dir
+       or echo "cd test failed" 1>&2
+       sleep .002
+   end
+end
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd
diff --git a/tests/cd.out b/tests/cd.out
index b47e701f4..d6098ed9d 100644
--- a/tests/cd.out
+++ b/tests/cd.out
@@ -34,3 +34,6 @@ No crash with ./ CDPATH
 ####################
 # on-variable PWD
 Changed to /
+
+####################
+# cd concurrency

From 6ce85aebc65459210fb5dab63c190f64cf0a3dc0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 17:43:25 -0700
Subject: [PATCH 0700/1732] Switch file_io_t to store a wcstring

We no longer use file_io_t after fork(). We don't need to use a malloc'd
string any more. Use a wcstring.
---
 src/exec.cpp        | 14 +++++++-------
 src/io.cpp          |  2 +-
 src/io.h            | 10 +++++-----
 src/redirection.cpp | 12 ++++++------
 src/wutil.cpp       |  5 +++++
 src/wutil.h         |  3 +++
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index dd98fac23..0cda24b00 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -52,7 +52,7 @@
 #define WRITE_ERROR _(L"An error occurred while writing output")
 
 /// File redirection error message.
-#define FILE_ERROR _(L"An error occurred while redirecting file '%s'")
+#define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
 
 /// Base open mode to pass to calls to open.
 #define OPEN_MASK 0666
@@ -81,8 +81,8 @@ static bool redirection_is_to_real_file(const shared_ptr<io_data_t> &io) {
     bool result = false;
     if (io && io->io_mode == io_mode_t::file) {
         // It's a file redirection. Compare the path to /dev/null.
-        const char *path = static_cast<const io_file_t *>(io.get())->filename_cstr;
-        if (std::strcmp(path, "/dev/null") != 0) {
+        const wcstring &path = static_cast<const io_file_t *>(io.get())->filename;
+        if (path != L"/dev/null") {
             // It's not /dev/null.
             result = true;
         }
@@ -223,9 +223,9 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chai
             case io_mode_t::file: {
                 // We have a path-based redireciton. Resolve it to a file.
                 io_file_t *in_file = static_cast<io_file_t *>(in.get());
-                int fd = open(in_file->filename_cstr, in_file->flags, OPEN_MASK);
+                int fd = wopen(in_file->filename, in_file->flags, OPEN_MASK);
                 if (fd < 0) {
-                    debug(1, FILE_ERROR, in_file->filename_cstr);
+                    debug(1, FILE_ERROR, in_file->filename.c_str());
                     wperror(L"open");
                     success = false;
                     break;
@@ -510,9 +510,9 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
             case io_mode_t::file: {
                 const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
                 locally_opened_stdin =
-                    autoclose_fd_t{open(in_file->filename_cstr, in_file->flags, OPEN_MASK)};
+                    autoclose_fd_t{wopen(in_file->filename, in_file->flags, OPEN_MASK)};
                 if (!locally_opened_stdin.valid()) {
-                    debug(1, FILE_ERROR, in_file->filename_cstr);
+                    debug(1, FILE_ERROR, in_file->filename.c_str());
                     wperror(L"open");
                 }
                 local_builtin_stdin = locally_opened_stdin.fd();
diff --git a/src/io.cpp b/src/io.cpp
index d1a53ff97..edbf06e9b 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -22,7 +22,7 @@ void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
 
 void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
 
-void io_file_t::print() const { std::fwprintf(stderr, L"file (%s)\n", filename_cstr); }
+void io_file_t::print() const { std::fwprintf(stderr, L"file (%ls)\n", filename.c_str()); }
 
 void io_pipe_t::print() const {
     std::fwprintf(stderr, L"pipe {%d} (input: %s)\n", pipe_fd(), is_input_ ? "yes" : "no");
diff --git a/src/io.h b/src/io.h
index 042e8a9bf..89fcdc810 100644
--- a/src/io.h
+++ b/src/io.h
@@ -191,17 +191,17 @@ class io_fd_t : public io_data_t {
 
 class io_file_t : public io_data_t {
    public:
-    /// Filename, malloc'd. This needs to be used after fork, so don't use wcstring here.
-    const char *const filename_cstr;
+    /// The filename.
+    wcstring filename;
     /// file creation flags to send to open.
     const int flags;
 
     void print() const override;
 
-    io_file_t(int f, const wcstring &fname, int fl = 0)
-        : io_data_t(io_mode_t::file, f), filename_cstr(wcs2str(fname)), flags(fl) {}
+    io_file_t(int f, wcstring fname, int fl = 0)
+        : io_data_t(io_mode_t::file, f), filename(std::move(fname)), flags(fl) {}
 
-    ~io_file_t() override { free((void *)filename_cstr); }
+    ~io_file_t() override = default;
 };
 
 /// Represents (one end) of a pipe.
diff --git a/src/redirection.cpp b/src/redirection.cpp
index c0c1b6985..5a30ea740 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -8,9 +8,9 @@
 /// File descriptor redirection error message.
 #define FD_ERROR "An error occurred while redirecting file descriptor %s"
 
-#define NOCLOB_ERROR _(L"The file '%s' already exists")
+#define NOCLOB_ERROR _(L"The file '%ls' already exists")
 
-#define FILE_ERROR _(L"An error occurred while redirecting file '%s'")
+#define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
 
 /// Base open mode to pass to calls to open.
 #define OPEN_MASK 0666
@@ -26,12 +26,12 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
                 // Here we definitely do not want to set CLO_EXEC because our child needs access.
                 // Open the file.
                 const io_file_t *io_file = static_cast<const io_file_t *>(io_ref.get());
-                int file_fd = open(io_file->filename_cstr, io_file->flags, OPEN_MASK);
+                int file_fd = wopen(io_file->filename, io_file->flags, OPEN_MASK);
                 if (file_fd < 0) {
                     if ((io_file->flags & O_EXCL) && (errno == EEXIST)) {
-                        debug(1, NOCLOB_ERROR, io_file->filename_cstr);
+                        debug(1, NOCLOB_ERROR, io_file->filename.c_str());
                     } else {
-                        debug(1, FILE_ERROR, io_file->filename_cstr);
+                        debug(1, FILE_ERROR, io_file->filename.c_str());
                         if (should_debug(1)) wperror(L"open");
                     }
                     return none();
@@ -43,7 +43,7 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
                 if (file_fd != io_file->fd) {
                     file_fd = move_fd_to_unused(file_fd, io_chain, false /* cloexec */);
                     if (file_fd < 0) {
-                        debug(1, FILE_ERROR, io_file->filename_cstr);
+                        debug(1, FILE_ERROR, io_file->filename.c_str());
                         if (should_debug(1)) wperror(L"dup");
                         return none();
                     }
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 74b91013a..3ebcf87d1 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -210,6 +210,11 @@ int open_cloexec(const std::string &cstring, int flags, mode_t mode, bool cloexe
     return fd;
 }
 
+int wopen(const wcstring &pathname, int flags, mode_t mode) {
+    cstring tmp = wcs2string(pathname);
+    return open(tmp.c_str(), flags, mode);
+}
+
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode) {
     cstring tmp = wcs2string(pathname);
     return open_cloexec(tmp, flags, mode, true);
diff --git a/src/wutil.h b/src/wutil.h
index 955ea5e21..52c20c653 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -24,6 +24,9 @@ FILE *wfopen(const wcstring &path, const char *mode);
 /// Sets CLO_EXEC on a given fd.
 bool set_cloexec(int fd);
 
+/// Wide character version of open().
+int wopen(const wcstring &pathname, int flags, mode_t mode = 0);
+
 /// Wide character version of open() that also sets the close-on-exec flag (atomically when
 /// possible).
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode = 0);

From 6637ccd3a256569df9d89d0811efef2bfedf2a60 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 10 Jun 2019 09:27:51 -0700
Subject: [PATCH 0701/1732] Keep an fd for the cwd in the parser

To support distinct parsers having different working directories, we need
to keep the working directory alive, and also retain a non-path reference
to it.
---
 src/builtin_cd.cpp | 9 +++++++--
 src/parser.cpp     | 7 +++++++
 src/parser.h       | 4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index e347bf0d9..57adc84b4 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -2,6 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <errno.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #include "builtin.h"
@@ -68,14 +69,17 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     wcstring norm_dir = normalize_path(dir);
 
-    if (wchdir(norm_dir) != 0) {
+    // We need to keep around the fd for this directory, in the parser.
+    autoclose_fd_t dir_fd(wopen_cloexec(norm_dir, O_RDONLY));
+    bool success = dir_fd.valid() && fchdir(dir_fd.fd()) == 0;
+
+    if (!success) {
         struct stat buffer;
         int status;
 
         status = wstat(dir, &buffer);
         if (!status && S_ISDIR(buffer.st_mode)) {
             streams.err.append_format(_(L"%ls: Permission denied: '%ls'\n"), cmd, dir_in.c_str());
-
         } else {
             streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), cmd, dir_in.c_str());
         }
@@ -87,6 +91,7 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_ERROR;
     }
 
+    parser.libdata().cwd_fd = std::make_shared<const autoclose_fd_t>(std::move(dir_fd));
     std::vector<event_t> evts;
     parser.vars().set_one(L"PWD", ENV_EXPORT | ENV_GLOBAL, std::move(norm_dir), &evts);
     for (const auto &evt : evts) {
diff --git a/src/parser.cpp b/src/parser.cpp
index 100aa13ac..72b58612e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1,6 +1,7 @@
 // The fish parser. Contains functions for parsing and evaluating code.
 #include "config.h"  // IWYU pragma: keep
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <cwchar>
 
@@ -102,6 +103,12 @@ wcstring parser_t::user_presentable_path(const wcstring &path) const {
 
 parser_t::parser_t(std::shared_ptr<env_stack_t> vars) : variables(std::move(vars)) {
     assert(variables.get() && "Null variables in parser initializer");
+    int cwd = open_cloexec(".", O_RDONLY);
+    if (cwd < 0) {
+        perror("Unable to open the current working directory");
+        abort();
+    }
+    libdata().cwd_fd = std::make_shared<const autoclose_fd_t>(cwd);
 }
 
 parser_t::parser_t() : parser_t(env_stack_t::principal_ref()) {}
diff --git a/src/parser.h b/src/parser.h
index bcd39214d..77d73cc10 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -169,6 +169,10 @@ struct library_data_t {
     /// machinery when wrapping: e.g. if `tig` wraps `git` then git completions need to see git on
     /// the command line.
     wcstring_list_t transient_commandlines{};
+
+    /// A file descriptor holding the current working directory, for use in openat().
+    /// This is never null and never invalid.
+    std::shared_ptr<const autoclose_fd_t> cwd_fd{};
 };
 
 class parser_t : public std::enable_shared_from_this<parser_t> {

From 42138f00c671ccb07d2a8ca2fb821863ebcb0efb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 10 Jun 2019 09:37:08 -0700
Subject: [PATCH 0702/1732] Remove wchdir()

It's unused, and will soon be dangerous as the process-wide cwd will
lose meaning.
---
 src/wutil.cpp | 5 -----
 src/wutil.h   | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/src/wutil.cpp b/src/wutil.cpp
index 3ebcf87d1..1f448ba14 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -135,11 +135,6 @@ const wcstring wgetcwd() {
     return wcstring();
 }
 
-int wchdir(const wcstring &dir) {
-    cstring tmp = wcs2string(dir);
-    return chdir(tmp.c_str());
-}
-
 FILE *wfopen(const wcstring &path, const char *mode) {
     int permissions = 0, options = 0;
     size_t idx = 0;
diff --git a/src/wutil.h b/src/wutil.h
index 52c20c653..e3c1837ca 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -72,9 +72,6 @@ const char *safe_strerror(int err);
 /// Wide character version of getcwd().
 const wcstring wgetcwd();
 
-/// Wide character version of chdir().
-int wchdir(const wcstring &dir);
-
 /// Wide character version of realpath function.
 /// \returns the canonicalized path, or none if the path is invalid.
 maybe_t<wcstring> wrealpath(const wcstring &pathname);

From d1ca392393a0ac86565db18b883b6272d285224e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 May 2019 16:00:45 +0200
Subject: [PATCH 0703/1732] math: Allow "x" for multiplication

It's always a bit annoying that `*` requires quoting.

So we allow "x" as an alternative, only it needs to be followed by
whitespace to distinguish it from "0x" hexadecimal notation.
---
 sphinx_doc_src/cmds/math.rst | 6 ++++--
 src/tinyexpr.cpp             | 7 ++++++-
 tests/math.err               | 6 ++++++
 tests/math.in                | 7 +++++++
 tests/math.out               | 7 +++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/cmds/math.rst b/sphinx_doc_src/cmds/math.rst
index b5107ead5..93d5ea8e5 100644
--- a/sphinx_doc_src/cmds/math.rst
+++ b/sphinx_doc_src/cmds/math.rst
@@ -16,7 +16,7 @@ Description
 
 By default, the output is as a float with trailing zeroes trimmed. To get a fixed representation, the ``--scale`` option can be used, including ``--scale=0`` for integer output.
 
-Keep in mind that parameter expansion takes before expressions are evaluated. This can be very useful in order to perform calculations involving shell variables or the output of command substitutions, but it also means that parenthesis (``()``) and the asterisk (``*``) glob character have to be escaped or quoted.
+Keep in mind that parameter expansion takes before expressions are evaluated. This can be very useful in order to perform calculations involving shell variables or the output of command substitutions, but it also means that parenthesis (``()``) and the asterisk (``*``) glob character have to be escaped or quoted. ``x`` can also be used to denote multiplication, but it needs to be followed by whitespace to distinguish it from hexadecimal numbers.
 
 ``math`` ignores whitespace between arguments and takes its input as multiple arguments (internally joined with a space), so ``math 2 +2`` and ``math "2 +    2"`` work the same. ``math 2 2`` is an error.
 
@@ -43,7 +43,7 @@ Operators
 
 - ``+`` for addition and ``-`` for subtraction.
 
-- ``*`` for multiplication, ``/`` for division. (Note that ``*`` is the glob character and needs to be quoted or escaped.)
+- ``*`` or ``x`` for multiplication, ``/`` for division. (Note that ``*`` is the glob character and needs to be quoted or escaped, ``x`` needs to be followed by whitespace or it looks like ``0x`` hexadecimal notation.)
 
 - ``^`` for exponentiation.
 
@@ -110,6 +110,8 @@ Examples
 
 ``math 5 \* 2`` or ``math "5 * 2"`` or ``math 5 "*" 2`` all output ``10``.
 
+``math 0xFF`` outputs 255, ``math 0 x 3`` outputs 0 (because it computes 0 multiplied by 3).
+
 Compatibility notes
 -------------------
 
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index c0a492c68..73ed61b77 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -233,7 +233,10 @@ void next_token(state *s) {
             s->type = TOK_NUMBER;
         } else {
             /* Look for a variable or builtin function call. */
-            if (s->next[0] >= 'a' && s->next[0] <= 'z') {
+            // But not when it's an "x" followed by whitespace
+            // - that's the alternative multiplication operator.
+            if (s->next[0] >= 'a' && s->next[0] <= 'z' &&
+                !(s->next[0] == 'x' && isspace(s->next[1]))) {
                 const char *start;
                 start = s->next;
                 while ((s->next[0] >= 'a' && s->next[0] <= 'z') ||
@@ -269,7 +272,9 @@ void next_token(state *s) {
                         s->type = TOK_INFIX;
                         s->function = (const void *)(te_fun2)sub;
                         break;
+                    case 'x':
                     case '*':
+                        // We've already checked for whitespace above.
                         s->type = TOK_INFIX;
                         s->function = (const void *)(te_fun2)mul;
                         break;
diff --git a/tests/math.err b/tests/math.err
index 6d4dcc1ca..dad9f7ca4 100644
--- a/tests/math.err
+++ b/tests/math.err
@@ -34,3 +34,9 @@ math: Error: Result is infinite
 '2^999999'
 math: Error: Result is infinite
 '1 / 0'
+
+####################
+# Validate x as multiplier
+math: Error: Unknown variable
+'2 x4'
+    ^
diff --git a/tests/math.in b/tests/math.in
index 2c92ee052..9bcac3b93 100644
--- a/tests/math.in
+++ b/tests/math.in
@@ -52,3 +52,10 @@ not math
 not math -s 12
 not math 2^999999
 not math 1 / 0
+
+logmsg Validate "x" as multiplier
+math 0x2 # Hex
+math 5 x 4
+math 2x 4
+math 2 x4 # ERROR
+math 0x 3
diff --git a/tests/math.out b/tests/math.out
index 05aadc40a..ffe7b8604 100644
--- a/tests/math.out
+++ b/tests/math.out
@@ -49,3 +49,10 @@
 
 ####################
 # Validate math error reporting
+
+####################
+# Validate x as multiplier
+2
+20
+8
+0

From 5e78d6dcc9a7d1d07b6182f54f30b5e6b5fdda75 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 10 Jun 2019 18:46:06 +0200
Subject: [PATCH 0704/1732] CHANGELOG math "x"

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cb082580..02a86507d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
 - `test` (aka `[`) now prints a stacktrace on error, making the offending call easier to find (#5771).
 - The default read limit has been increased to 100MiB (#5267).
+- `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).

From 38a7c77e4b932822fbbe54825de64882e88dd569 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 10 Jun 2019 18:50:40 +0200
Subject: [PATCH 0705/1732] Re-double-super-fix tilde completion crash

Yeah, I was too clever with the operators here.

Fixes #5929.
---
 src/complete.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 281a5a9db..c712b6b2c 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -243,9 +243,15 @@ static bool compare_completions_by_duplicate_arguments(const completion_t &a,
 }
 
 static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
-    return (a.completion.empty() < b.completion.empty()) ||
-           (a.completion.back() == L'~') < (b.completion.back() == L'~');
+    if (a.completion.empty()) {
+        return false;
+    }
+    if (b.completion.empty()) {
+        return true;
+    }
+    return ((a.completion.back() == L'~') < (b.completion.back() == L'~'));
 }
+
 /// Unique the list of completions, without perturbing their order.
 static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
     std::unordered_set<wcstring> seen;

From aa950e5c136bd52bae43603d6d8cadd154dd8096 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 10 Jun 2019 10:26:21 -0700
Subject: [PATCH 0706/1732] Provide an optimized override of get_pwd_slash()

---
 src/env.cpp | 8 ++++++++
 src/env.h   | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/env.cpp b/src/env.cpp
index d5798f4b9..2819d78ed 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1306,6 +1306,14 @@ std::shared_ptr<environment_t> env_stack_t::snapshot() const { return acquire_im
 
 void env_stack_t::set_argv(wcstring_list_t argv) { set(L"argv", ENV_LOCAL, std::move(argv)); }
 
+wcstring env_stack_t::get_pwd_slash() const {
+    wcstring pwd = acquire_impl()->perproc_data().pwd;
+    if (!string_suffixes_string(L"/", pwd)) {
+        pwd.push_back(L'/');
+    }
+    return pwd;
+}
+
 void env_stack_t::push(bool new_scope) {
     auto impl = acquire_impl();
     if (new_scope) {
diff --git a/src/env.h b/src/env.h
index d65f66c98..873bfeaa6 100644
--- a/src/env.h
+++ b/src/env.h
@@ -199,7 +199,7 @@ class environment_t {
     virtual ~environment_t();
 
     /// Returns the PWD with a terminating slash.
-    wcstring get_pwd_slash() const;
+    virtual wcstring get_pwd_slash() const;
 };
 
 /// The null environment contains nothing.
@@ -296,6 +296,9 @@ class env_stack_t final : public environment_t {
     /// Sets up argv as the given list of strings.
     void set_argv(wcstring_list_t argv);
 
+    /// Slightly optimized implementation.
+    wcstring get_pwd_slash() const override;
+
     // Compatibility hack; access the "environment stack" from back when there was just one.
     static const std::shared_ptr<env_stack_t> &principal_ref();
     static env_stack_t &principal() { return *principal_ref(); }

From cfe1f1db9eb272bae411761782eff22e67802109 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 10 Jun 2019 16:50:58 -0500
Subject: [PATCH 0707/1732] Fix build on FreeBSD 12.0 with stock Clang

`isspace()` is in `ctype.h`.
---
 src/tinyexpr.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 73ed61b77..884c30f6e 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -24,6 +24,7 @@
 
 // This version has been altered and ported to C++ for inclusion in fish.
 #include "tinyexpr.h"
+#include <ctype.h>
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>

From e363552ef0221e7355520e48d8382f9000954f29 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 11 Jun 2019 11:34:14 +0200
Subject: [PATCH 0708/1732] screen: Include termios for NetBSD

Otherwise it won't build.
---
 src/screen.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/screen.cpp b/src/screen.cpp
index 70d258da1..81dc4977a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -10,6 +10,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 #include <cstring>

From 4db7efb569c01d84acc2450e1af44f704936b50a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 11 Jun 2019 14:10:39 +0200
Subject: [PATCH 0709/1732] docs: Fix fish_opt options

This said "--required" when the option is called "--required-val".

Fixes #5931.

[ci skip]
---
 sphinx_doc_src/cmds/fish_opt.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_opt.rst b/sphinx_doc_src/cmds/fish_opt.rst
index bf4c5a537..ea1d93456 100644
--- a/sphinx_doc_src/cmds/fish_opt.rst
+++ b/sphinx_doc_src/cmds/fish_opt.rst
@@ -25,9 +25,9 @@ The following ``argparse`` options are available:
 
 - ``--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.
 
-- ``-o`` or ``--optional`` 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`` 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.
 
-- ``-r`` or ``--required`` 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`` 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.
 
 - ``--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.
 

From 77103ddbab33f56243d3fe3d23d82b1440eca67a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 12 Jun 2019 10:22:46 +0200
Subject: [PATCH 0710/1732] Dishonour

[ci skip]
---
 share/functions/cd.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/cd.fish b/share/functions/cd.fish
index 74ef09d41..e04b227a0 100644
--- a/share/functions/cd.fish
+++ b/share/functions/cd.fish
@@ -43,7 +43,7 @@ function cd --description "Change directory"
         and set -e dirprev[1]
 
         # If dirprev, dirnext, __fish_cd_direction
-        # are set as universal variables, honour their scope.
+        # are set as universal variables, honor their scope.
 
         set -U -q dirprev
         and set -U -a dirprev $previous

From b4792bde19598b999997eab0acd07f97e4208a53 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 12 Jun 2019 20:42:20 +0200
Subject: [PATCH 0711/1732] Remove brew completions

Leave a note in place

Fixes #5892.

[ci skip]
---
 share/completions/brew.fish | 510 +-----------------------------------
 1 file changed, 3 insertions(+), 507 deletions(-)

diff --git a/share/completions/brew.fish b/share/completions/brew.fish
index ad07d93f8..8d9cc6c99 100644
--- a/share/completions/brew.fish
+++ b/share/completions/brew.fish
@@ -1,507 +1,3 @@
-function __fish_brew_get_cmd
-    for c in (commandline -opc)
-        if not string match -q -- '-*' $c
-            echo $c
-        end
-    end
-end
-
-function __fish_brew_needs_command
-    set cmd (__fish_brew_get_cmd)
-    if not set -q cmd[2]
-        return 0
-    end
-    return 1
-end
-
-function __fish_brew_using_command
-    set index 2
-
-    if set -q argv[2]
-        set index $argv[2]
-    end
-
-    set cmd (__fish_brew_get_cmd)
-
-    if set -q cmd[$index]
-        if [ $argv[1] = $cmd[$index] ]
-            return 0
-        end
-    end
-    return 1
-end
-
-function __fish_brew_formulae
-    # list all local formula, do not use `brew search some_text` against searching online
-    # TODO fix the problem with `tap-pin`, tap-pin will modify the priority
-    # If you pin your custom tap for VIM, you should
-    # `brew install homebrew/core/vim` to install VIM from `core` repo
-    # `brew install vim` to install VIM from more prior repo
-    # but `brew search` won't change display for custom VIM and core VIM
-    # 'vim' for core VIM
-    # 'custUser/custRepo/vim' for more prior VIM
-    # more info: https://github.com/Homebrew/brew/blob/master/share/doc/homebrew/brew-tap.md#formula-duplicate-names
-    brew search
-end
-
-function __fish_brew_installed_formulas
-    brew list
-end
-
-function __fish_brew_leaves
-    brew leaves
-end
-
-function __fish_brew_outdated_formulas
-    brew outdated
-end
-
-function __fish_brew_pinned_formulas
-    brew list --pinned
-end
-
-function __fish_brew_taps
-    brew tap
-end
-
-
-###########################
-# subcommand initializing #
-###########################
-
-########
-# cask #
-########
-
-function __fish_brew_is_subcommand_cask
-    if __fish_brew_using_command cask
-        for action in $argv
-            if __fish_brew_using_command $action 3
-                return 0
-            end
-        end
-    end
-    return 1
-end
-
-function __fish_brew_needs_cask_action
-    if __fish_brew_using_command cask
-        set cmd (__fish_brew_get_cmd)
-        if not set -q cmd[3]
-            return 0
-        end
-    end
-    return 1
-end
-
-function __fish_brew_casks
-    brew search --casks
-end
-
-function __fish_brew_casks_installed
-    brew cask list
-end
-
-
-############
-# services #
-############
-
-function __fish_brew_is_subcommand_services
-    if __fish_brew_using_command services
-        for action in $argv
-            if __fish_brew_using_command $action 3
-                return 0
-            end
-        end
-    end
-    return 1
-end
-
-function __fish_brew_needs_services_action
-    if __fish_brew_using_command services
-        set cmd (__fish_brew_get_cmd)
-        if not set -q cmd[3]
-            return 0
-        end
-    end
-    return 1
-end
-
-function __fish_brew_services
-    brew services list | awk '{if (NR>1) print $1}'
-end
-
-
-#####################
-# brew commands     #
-# (brew cask below) #
-#####################
-
-# audit
-complete -f -c brew -n '__fish_brew_needs_command' -a audit -d 'Check formula'
-complete -f -c brew -n '__fish_brew_using_command audit' -a '(__fish_brew_formulae)'
-
-# bottle
-complete -f -c brew -n '__fish_brew_needs_command' -a bottle -d 'Create a binary package'
-complete -f -c brew -n '__fish_brew_using_command bottle' -l 'homebrew-developer' -d 'Output developer debug information'
-complete -f -c brew -n '__fish_brew_using_command bottle' -l 'no-revision' -d 'Do not bump the bottle revision number'
-complete -f -c brew -n '__fish_brew_using_command bottle' -l 'rb' -d 'Write bottle block to a Ruby source file'
-complete -f -c brew -n '__fish_brew_using_command bottle' -l 'write' -d 'Write bottle block to formula file'
-complete -f -c brew -n '__fish_brew_using_command bottle' -l 'merge' -d 'Merge multiple bottle outputs'
-
-# cask
-complete -f -c brew -n '__fish_brew_needs_command' -a cask -d 'Manage installed casks'
-
-# cat
-complete -f -c brew -n '__fish_brew_needs_command' -a cat -d 'Display formula'
-complete -f -c brew -n '__fish_brew_using_command cat' -a '(__fish_brew_formulae)'
-
-# cleanup
-complete -f -c brew -n '__fish_brew_needs_command' -a cleanup -d 'Remove old installed versions'
-complete -f -c brew -n '__fish_brew_using_command cleanup' -l force -d 'Remove out-of-date keg-only brews as well'
-complete -f -c brew -n '__fish_brew_using_command cleanup' -l dry-run -d 'Show what files would be removed'
-complete -f -c brew -n '__fish_brew_using_command cleanup' -s n -d 'Show what files would be removed'
-complete -f -c brew -n '__fish_brew_using_command cleanup' -s s -d 'Scrub the cache'
-complete -f -c brew -n '__fish_brew_using_command cleanup' -a '(__fish_brew_installed_formulas)'
-
-# create
-complete -f -c brew -n '__fish_brew_needs_command' -a create -d 'Create new formula from URL'
-complete -f -c brew -n '__fish_brew_using_command create' -l cmake -d 'Use template for CMake-style build'
-complete -f -c brew -n '__fish_brew_using_command create' -l autotools -d 'Use template for Autotools-style build'
-complete -f -c brew -n '__fish_brew_using_command create' -l no-fetch -d 'Don\'t download URL'
-complete -f -c brew -n '__fish_brew_using_command create' -l set-name -d 'Override name autodetection'
-complete -f -c brew -n '__fish_brew_using_command create' -l set-version -d 'Override version autodetection'
-
-# desc
-complete -f -c brew -n '__fish_brew_needs_command' -a desc -d "Summarize specified formulae in one line"
-complete -f -c brew -n '__fish_brew_using_command desc' -l search -d 'Search names and descriptions'
-complete -f -c brew -n '__fish_brew_using_command desc' -l name -d 'Search only names'
-complete -f -c brew -n '__fish_brew_using_command desc' -l description -d 'Search only descriptions'
-complete -f -c brew -n '__fish_brew_using_command desc' -a '(__fish_brew_formulae)'
-
-# deps
-complete -f -c brew -n '__fish_brew_needs_command' -a deps -d 'Show a formula\'s dependencies'
-complete -f -c brew -n '__fish_brew_using_command deps' -l 1 -d 'Show only 1 level down'
-complete -f -c brew -n '__fish_brew_using_command deps' -s n -d 'Show in topological order'
-complete -f -c brew -n '__fish_brew_using_command deps' -l tree -d 'Show dependencies as tree'
-complete -f -c brew -n '__fish_brew_using_command deps' -l all -d 'Show dependencies for all formulae'
-complete -f -c brew -n '__fish_brew_using_command deps' -l installed -d 'Show dependencies for installed formulae'
-complete -f -c brew -n '__fish_brew_using_command deps' -a '(__fish_brew_formulae)'
-
-# diy
-complete -f -c brew -n '__fish_brew_needs_command' -a 'diy configure' -d 'Determine installation prefix for non-brew software'
-complete -f -c brew -n '__fish_brew_using_command diy' -l set-name -d 'Set name of package'
-complete -f -c brew -n '__fish_brew_using_command diy' -l set-version -d 'Set version of package'
-
-complete -f -c brew -n '__fish_brew_needs_command' -a 'doctor' -d 'Check your system for problems'
-
-# edit
-complete -f -c brew -n '__fish_brew_needs_command' -a 'edit' -d 'Open brew/formula for editing'
-complete -f -c brew -n '__fish_brew_using_command edit' -a '(__fish_brew_formulae)'
-
-# fetch
-complete -f -c brew -n '__fish_brew_needs_command' -a fetch -d 'Download source for formula'
-complete -f -c brew -n '__fish_brew_using_command fetch' -l force -d 'Remove a previously cached version and re-fetch'
-complete -f -c brew -n '__fish_brew_using_command fetch' -l HEAD -d 'Download the HEAD version from a VCS'
-complete -f -c brew -n '__fish_brew_using_command fetch' -l deps -d 'Also download dependencies'
-complete -f -c brew -n '__fish_brew_using_command fetch' -s v -d 'Make HEAD checkout verbose'
-complete -f -c brew -n '__fish_brew_using_command fetch' -l build-from-source -d 'Fetch source package instead of bottle'
-complete -f -c brew -n '__fish_brew_using_command fetch' -a '(__fish_brew_formulae)'
-
-complete -f -c brew -n '__fish_brew_needs_command' -a 'help' -d 'Display help'
-
-# home
-complete -f -c brew -n '__fish_brew_needs_command' -a home -d 'Open brew/formula\'s homepage'
-complete -c brew -n '__fish_brew_using_command home' -a '(__fish_brew_formulae)'
-
-# info
-complete -f -c brew -n '__fish_brew_needs_command' -a 'info abv' -d 'Display information about formula'
-complete -f -c brew -n '__fish_brew_using_command info' -l all -d 'Display info for all formulae'
-complete -f -c brew -n '__fish_brew_using_command info' -l github -d 'Open the GitHub History page for formula'
-complete -c brew -n '__fish_brew_using_command info' -a '(__fish_brew_formulae)'
-
-# install
-complete -f -c brew -n '__fish_brew_needs_command' -a 'install' -d 'Install formula'
-complete -f -c brew -n '__fish_brew_using_command install' -l force -d 'Force install'
-complete -f -c brew -n '__fish_brew_using_command install' -l debug -d 'If install fails, open shell in temp directory'
-complete -f -c brew -n '__fish_brew_using_command install' -l ignore-dependencies -d 'skip installing any dependencies of any kind'
-complete -f -c brew -n '__fish_brew_using_command install' -l cc -a "clang gcc-4.0 gcc-4.2 gcc-4.3 gcc-4.4 gcc-4.5 gcc-4.6 gcc-4.7 gcc-4.8 gcc-4.9 llvm-gcc" -d 'Attempt to compile using the specified compiler'
-complete -f -c brew -n '__fish_brew_using_command install' -l build-from-source -d 'Compile from source even if a bottle is provided'
-complete -f -c brew -n '__fish_brew_using_command install' -l devel -d 'Install the development version of formula'
-complete -f -c brew -n '__fish_brew_using_command install' -l HEAD -d 'Install the HEAD version from VCS'
-complete -f -c brew -n '__fish_brew_using_command install' -l interactive -d 'Download and patch formula, then open a shell'
-complete -f -c brew -n '__fish_brew_using_command install' -l env -a "std super" -d 'Force the specified build environment'
-complete -f -c brew -n '__fish_brew_using_command install' -l build-bottle -d 'Optimize for a generic CPU architecture'
-complete -f -c brew -n '__fish_brew_using_command install' -l bottle-arch -a 'core core2 penryn g3 g4 g4e g5' -d 'Optimize for the specified CPU architecture'
-complete -c brew -n '__fish_brew_using_command install' -a '(__fish_brew_formulae)'
-
-# leaves
-complete -f -c brew -n '__fish_brew_needs_command' -a 'leaves' -d 'List installed top level formulae'
-complete -f -c brew -n '__fish_brew_using_command leaves' -a '(__fish_brew_leaves)'
-
-# link
-complete -f -c brew -n '__fish_brew_needs_command' -a 'link ln' -d 'Symlink installed formula'
-complete -f -c brew -n '__fish_brew_using_command link' -l overwrite -d 'Overwrite existing files'
-complete -f -c brew -n '__fish_brew_using_command ln' -l overwrite -d 'Overwrite existing files'
-complete -f -c brew -n '__fish_brew_using_command link' -l dry-run -d 'Show what files would be linked or overwritten'
-complete -f -c brew -n '__fish_brew_using_command ln' -l dry-run -d 'Show what files would be linked or overwritten'
-complete -f -c brew -n '__fish_brew_using_command link' -l force -d 'Allow keg-only formulae to be linked'
-complete -f -c brew -n '__fish_brew_using_command ln' -l force -d 'Allow keg-only formulae to be linked'
-complete -f -c brew -n '__fish_brew_using_command link' -a '(__fish_brew_installed_formulas)'
-complete -f -c brew -n '__fish_brew_using_command ln' -a '(__fish_brew_installed_formulas)'
-
-# linkapps
-complete -f -c brew -n '__fish_brew_needs_command' -a linkapps -d 'Symlink .app bundles into /Applications'
-complete -f -c brew -n '__fish_brew_using_command linkapps' -l local -d 'Link .app bundles into ~/Applications instead'
-
-# list
-complete -f -c brew -n '__fish_brew_needs_command' -a 'list ls' -d 'List all installed formula'
-complete -f -c brew -n '__fish_brew_using_command list' -l unbrewed -d 'List all files in the Homebrew prefix not installed by brew'
-complete -f -c brew -n '__fish_brew_using_command list' -l versions -d 'Show the version number'
-complete -f -c brew -n '__fish_brew_using_command list' -l pinned -d 'Show the versions of pinned formulae'
-complete -c brew -n '__fish_brew_using_command list' -a '(__fish_brew_formulae)'
-
-# ls
-complete -f -c brew -n '__fish_brew_using_command ls' -l unbrewed -d 'List all files in the Homebrew prefix not installed by brew'
-complete -f -c brew -n '__fish_brew_using_command ls' -l versions -d 'Show the version number'
-complete -f -c brew -n '__fish_brew_using_command ls' -l pinned -d 'Show the versions of pinned formulae'
-complete -c brew -n '__fish_brew_using_command ls' -a '(__fish_brew_formulae)'
-
-# log
-complete -f -c brew -n '__fish_brew_needs_command' -a log -d 'Show log for formula'
-complete -c brew -n '__fish_brew_using_command log' -a '(__fish_brew_formulae)' -d 'formula'
-
-# missing
-complete -f -c brew -n '__fish_brew_needs_command' -a missing -d 'Check formula for missing dependencies'
-complete -c brew -n '__fish_brew_using_command missing' -a '(__fish_brew_formulae)' -d 'formula'
-
-# options
-complete -f -c brew -n '__fish_brew_needs_command' -a options -d 'Display install options for formula'
-complete -f -c brew -n '__fish_brew_using_command options' -l compact -d 'Show all options as a space-delimited list'
-complete -f -c brew -n '__fish_brew_using_command options' -l all -d 'Show options for all formulae'
-complete -f -c brew -n '__fish_brew_using_command options' -l installed -d 'Show options for all installed formulae'
-complete -c brew -n '__fish_brew_using_command options' -a '(__fish_brew_formulae)' -d 'formula'
-
-# outdated
-complete -f -c brew -n '__fish_brew_needs_command' -a outdated -d 'Show formula that have updated versions'
-complete -f -c brew -n '__fish_brew_using_command outdated' -l quiet -d 'Display only names'
-
-# pin
-complete -f -c brew -n '__fish_brew_needs_command' -a pin -d 'Pin the specified formulae to their current versions'
-complete -f -c brew -n '__fish_brew_using_command pin' -a '(__fish_brew_installed_formulas)' -d 'formula'
-
-# prune
-complete -f -c brew -n '__fish_brew_needs_command' -a prune -d 'Remove dead symlinks'
-
-# search
-complete -f -c brew -n '__fish_brew_needs_command' -a 'search -S' -d 'Search for formula by name'
-complete -f -c brew -n '__fish_brew_using_command search' -l macports -d 'Search on MacPorts'
-complete -f -c brew -n '__fish_brew_using_command search' -l fink -d 'Search on Fink'
-complete -f -c brew -n '__fish_brew_using_command -S' -l macports -d 'Search on MacPorts'
-complete -f -c brew -n '__fish_brew_using_command -S' -l fink -d 'Search on Fink'
-
-# services
-complete -f -c brew -n '__fish_brew_needs_command' -a services -d 'Manage Homebrew services'
-complete -f -c brew -n '__fish_brew_needs_services_action' -a cleanup -d 'Get rid of stale services and unused plist'
-complete -f -c brew -n '__fish_brew_needs_services_action' -a list -d 'List all services managed by Homebrew'
-complete -f -c brew -n '__fish_brew_needs_services_action' -a restart -d 'Gracefully restart a service'
-complete -f -c brew -n '__fish_brew_needs_services_action' -a start -d 'Start a service'
-complete -f -c brew -n '__fish_brew_needs_services_action' -a stop -d 'Stop a service'
-complete -f -c brew -n '__fish_brew_is_subcommand_services restart start stop' -a '(__fish_brew_services)' -d 'formula'
-complete -f -c brew -n '__fish_brew_is_subcommand_services restart start stop' -l all -d 'All Services'
-
-# sh
-complete -f -c brew -n '__fish_brew_needs_command' -a sh -d 'Instantiate a Homebrew build enviornment'
-complete -f -c brew -n '__fish_brew_using_command sh' -l env=std -d 'Use stdenv instead of superenv'
-
-# tap
-complete -f -c brew -n '__fish_brew_needs_command' -a tap -d 'Tap a new formula repository on GitHub'
-complete -f -c brew -n '__fish_brew_using_command tap' -l repair -d 'Create and prune tap symlinks as appropriate'
-
-# test
-complete -f -c brew -n '__fish_brew_needs_command' -a test -d 'Run tests for formula'
-complete -f -c brew -n '__fish_brew_using_command test' -a '(__fish_brew_installed_formulas)' -d 'formula'
-
-# uninstall
-complete -f -c brew -n '__fish_brew_needs_command' -a 'uninstall remove rm' -d 'Uninstall formula'
-complete -f -c brew -n '__fish_brew_using_command uninstall' -a '(__fish_brew_installed_formulas)'
-complete -f -c brew -n '__fish_brew_using_command remove' -a '(__fish_brew_installed_formulas)'
-complete -f -c brew -n '__fish_brew_using_command rm' -a '(__fish_brew_installed_formulas)'
-complete -f -c brew -n '__fish_brew_using_command uninstall' -l force -d 'Delete all installed versions'
-complete -f -c brew -n '__fish_brew_using_command remove' -l force -d 'Delete all installed versions'
-complete -f -c brew -n '__fish_brew_using_command rm' -l force -d 'Delete all installed versions'
-
-# unlink
-complete -f -c brew -n '__fish_brew_needs_command' -a unlink -d 'Unlink formula'
-complete -f -c brew -n '__fish_brew_using_command unlink' -a '(__fish_brew_installed_formulas)'
-
-# unlinkapps
-complete -f -c brew -n '__fish_brew_needs_command' -a unlinkapps -d 'Remove links created by brew linkapps'
-complete -f -c brew -n '__fish_brew_using_command unlinkapps' -l local -d 'Remove links from ~/Applications created by brew linkapps'
-
-# unpack
-complete -f -c brew -n '__fish_brew_needs_command' -a unpack -d 'Extract source code'
-complete -c brew -n '__fish_brew_using_command unpack' -a '(__fish_brew_formulae)'
-
-# unpin
-complete -f -c brew -n '__fish_brew_needs_command' -a unpin -d 'Unpin specified formulae'
-complete -f -c brew -n '__fish_brew_using_command unpin' -a '(__fish_brew_pinned_formulas)'
-
-# untap
-complete -f -c brew -n '__fish_brew_needs_command' -a untap -d 'Remove a tapped repository'
-complete -f -c brew -n '__fish_brew_using_command untap' -a '(__fish_brew_taps)'
-
-# update
-complete -f -c brew -n '__fish_brew_needs_command' -a update -d 'Fetch newest version of Homebrew and formulas'
-complete -f -c brew -n '__fish_brew_using_command update' -l rebase -d 'Use git pull --rebase'
-
-# update-reset
-complete -f -c brew -n '__fish_brew_needs_command' -a update-reset -d 'Reset all Homebrew taps to upstream state'
-
-# upgrade
-complete -f -c brew -n '__fish_brew_needs_command' -a upgrade -d 'Upgrade outdated brews'
-complete -f -c brew -n '__fish_brew_using_command upgrade' -a '(__fish_brew_outdated_formulas)'
-
-# uses
-complete -f -c brew -n '__fish_brew_needs_command' -a uses -d 'Show formulas that depend on specified formula'
-complete -f -c brew -n '__fish_brew_using_command uses' -l installed -d 'List only installed formulae'
-complete -f -c brew -n '__fish_brew_using_command uses' -l recursive -d 'Resolve more than one level of dependencies'
-complete -c brew -n '__fish_brew_using_command uses' -a '(__fish_brew_formulae)'
-
-
-#################
-# brew switches #
-#################
-
-complete -f -c brew -n '__fish_brew_needs_command' -a '-v --version' -d 'Print version number of brew'
-complete -f -c brew -n '__fish_brew_needs_command' -l env -x -d 'Show Homebrew a summary of the build environment'
-complete -f -c brew -n '__fish_brew_needs_command' -l repository -x -d 'Display where Homebrew\'s .git directory is located'
-complete -f -c brew -n '__fish_brew_needs_command' -l config -x -d 'Show Homebrew and system configuration'
-
-# --prefix
-complete -f -c brew -n '__fish_brew_needs_command' -l prefix -d 'Display Homebrew\'s install path'
-complete -f -c brew -n '__fish_brew_using_command --prefix' -a '(__fish_brew_formulae)' -d 'Display formula\'s install path'
-
-# --cache
-complete -f -c brew -n '__fish_brew_needs_command' -l cache -d 'Display Homebrew\'s download cache'
-complete -f -c brew -n '__fish_brew_needs_command' -n '__fish_brew_using_command --cache' -a '(__fish_brew_formulae)' -d 'Display the file or directory used to cache formula'
-
-# --cellar
-complete -f -c brew -n '__fish_brew_needs_command' -l cellar -d 'Display Homebrew\'s Cellar path'
-complete -f -c brew -n '__fish_brew_using_command --cellar' -a '(__fish_brew_formulae)' -d 'Display formula\'s install path in Cellar'
-
-
-######################
-# brew cask commands #
-#####################
-
-# audit
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a audit -d 'Audit casks, add token to audit specific cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask audit' -a '(__fish_brew_casks)'
-
-# cat
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a cat -d 'Display cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask cat' -a '(__fish_brew_casks)'
-
-
-# cleanup
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a cleanup -d 'Cleans up cached downloads and tracker symlinks'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask cleanup' -l outdated -d 'Only clean cached downloads older than 10 days'
-
-# create
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a create -d 'Create a new cask'
-
-# doctor/dr
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'doctor dr' -d 'Checks for configuration issues'
-
-# edit
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a edit -d 'Edit cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask edit' -a '(__fish_brew_casks)'
-
-# fetch
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a fetch -d 'Fetch cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask fetch' -l force -d 'Force a redownload of cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask fetch' -a '(__fish_brew_casks)'
-
-# home
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'home homepage' -d 'Open cask/cask\'s homepage'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask home' -a '(__fish_brew_casks)'
-
-# homepage
-complete -f -c brew -n '__fish_brew_is_subcommand_cask homepage' -a '(__fish_brew_casks_installed)'
-
-# info
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'info abv' -d 'Dislay info about cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask info' -a '(__fish_brew_casks)'
-
-# adv
-complete -f -c brew -n '__fish_brew_is_subcommand_cask abv' -a '(__fish_brew_casks)'
-
-# install
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a install -d 'Install cask indentified by token'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask install' -l force -d 'Force install of cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask install' -l require-sha -d 'Require SHA, fails otherwise'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask install' -l skip-cask-deps -d 'Skip any cask dependencies'
-complete -c brew -n '__fish_brew_is_subcommand_cask install' -a '(__fish_brew_casks)'
-
-# list
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'list ls' -d 'List installed casks'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask list' -s 1 -d 'Format output as a single column'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask list' -l versions -d 'Show all installed versions'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask list' -a '(__fish_brew_casks_installed)' -d 'List staged files'
-
-# ls
-complete -f -c brew -n '__fish_brew_is_subcommand_cask ls' -s 1 -d 'Format output as a single column'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask ls' -l versions -d 'Show all installed versions'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask ls' -a '(__fish_brew_casks_installed)' -d 'List staged files'
-
-# outdated
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a outdated -d 'List outdated casks'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask outdated' -l greedy -d 'Include casks having auto_updates true or version :latest'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask outdated' -l quiet -d 'Suppresses the display of versions'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask outdated' -l verbose -d 'Forces the display of the outdated and latest version'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask outdated' -a '(__fish_brew_casks_installed)'
-
-# reinstall
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a reinstall -d 'Reinstall cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask reinstall' -a '(__fish_brew_casks_installed)'
-
-# search
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'search -S' -d 'Search all known casks. RexEx by delimiting using /regex/'
-
-# style
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a style -d 'Check all or the given casks for correct style using RuboCop'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask style' -l fix -d 'Auto-correct any style errors if possible'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask style' -a '(__fish_brew_casks)'
-
-# uninstall
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a 'remove rm uninstall' -d 'Uninstall cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask uninstall' -l force -d 'Force the uninstall'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask uninstall' -a '(__fish_brew_casks_installed)'
-
-# remove
-complete -f -c brew -n '__fish_brew_is_subcommand_cask remove' -l force -d 'Force the uninstall'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask remove' -a '(__fish_brew_casks_installed)'
-
-# rm
-complete -f -c brew -n '__fish_brew_is_subcommand_cask rm' -l force -d 'Force the uninstall'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask rm' -a '(__fish_brew_casks_installed)'
-
-# upgrade
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a upgrade -d 'Upgrade all or given cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask upgrade' -l force -d 'Force upgrade'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask upgrade' -l greedy -d 'Include casks having auto_updates true or version :latest'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask upgrade' -a '(__fish_brew_casks_installed)'
-
-# zap
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a zap -d 'Unconditionally remove all files associated with the given Cask'
-complete -f -c brew -n '__fish_brew_is_subcommand_cask zap' -a '(__fish_brew_casks_installed)'
-
-
-######################
-# brew cask switches #
-######################
-
-# version
-complete -f -c brew -n '__fish_brew_needs_cask_action' -a --version -d 'Print version number of Caskroom'
+# Completions for brew are maintained upstream.
+# They should be installed with brew,
+# and PRs should be directed to https://github.com/Homebrew/brew/blob/master/completions/fish/brew.fish.

From 1c66d56d3a1d20a6e5cb627b52e2b079f4382669 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 13 Jun 2019 14:29:13 -0700
Subject: [PATCH 0712/1732] Add debug categories for reaping processes

---
 src/flog.h   | 5 +++++
 src/proc.cpp | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/flog.h b/src/flog.h
index 7a6e0e775..56d70038a 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -61,6 +61,11 @@ class category_list_t {
 
     category_t proc_internal_proc{L"proc-internal-proc", L"Internal (non-forked) process events"};
 
+    category_t proc_reap_internal{L"proc-reap-internal",
+                                  L"Reaping internal (non-forked) processes"};
+
+    category_t proc_reap_external{L"proc-reap-external", L"Reaping external (forked) processes"};
+
     category_t env_locale{L"env-locale", L"Changes to locale variables"};
 
     category_t env_export{L"env-export", L"Changes to exported variables"};
diff --git a/src/proc.cpp b/src/proc.cpp
index 16f50910b..682ddfcf2 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -377,6 +377,10 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
                         if (proc->internal_proc_->exited()) {
                             proc->status = proc->internal_proc_->get_status();
                             proc->completed = true;
+                            FLOGF(proc_reap_internal,
+                                  "Reaped internal process '%ls' (id %llu, status %d)",
+                                  proc->argv0(), proc->internal_proc_->get_id(),
+                                  proc->status.status_value());
                         }
                     } else if (proc->pid > 0) {
                         // Try reaping an external process.
@@ -384,8 +388,10 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
                         auto pid = waitpid(proc->pid, &status, WNOHANG | WUNTRACED);
                         if (pid > 0) {
                             assert(pid == proc->pid && "Unexpcted waitpid() return");
-                            debug(4, "Reaped PID %d", pid);
                             handle_child_status(proc.get(), proc_status_t::from_waitpid(status));
+                            FLOGF(proc_reap_external,
+                                  "Reaped external process '%ls' (pid %d, status %d)",
+                                  proc->argv0(), pid, proc->status.status_value());
                         }
                     } else {
                         assert(0 && "Don't know how to reap this process");

From 6bed255a52fe1265dda231901162b529306c8775 Mon Sep 17 00:00:00 2001
From: yogendra <yogendra.sharma@intelizign.com>
Date: Fri, 14 Jun 2019 13:09:25 +0530
Subject: [PATCH 0713/1732] Fix Issue 5910

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

diff --git a/src/fish.cpp b/src/fish.cpp
index 07288b9f7..68d81b60b 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -265,7 +265,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
     static const struct option long_opts[] = {{"command", required_argument, NULL, 'c'},
                                               {"init-command", required_argument, NULL, 'C'},
                                               {"features", required_argument, NULL, 'f'},
-                                              {"debug-level", required_argument, NULL, 'd'},
+                                              {"debug", required_argument, NULL, 'd'},
                                               {"debug-output", required_argument, NULL, 'o'},
                                               {"debug-stack-frames", required_argument, NULL, 'D'},
                                               {"interactive", no_argument, NULL, 'i'},

From 360116221a6828330dbde4015591274e6456cfe9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 14 Jun 2019 17:18:43 -0700
Subject: [PATCH 0714/1732] Switch history_t to use owning_lock internally

This removes a lot of tricky manual locking. It also removes the "main
thread" dependency.
---
 src/common.h    |  18 +-
 src/history.cpp | 528 ++++++++++++++++++++++++++++++------------------
 src/history.h   |  99 +--------
 3 files changed, 356 insertions(+), 289 deletions(-)

diff --git a/src/common.h b/src/common.h
index b32487d21..1065ac2db 100644
--- a/src/common.h
+++ b/src/common.h
@@ -612,12 +612,16 @@ typedef std::lock_guard<std::recursive_mutex> scoped_rlock;
 //
 template <typename Data>
 class acquired_lock {
-    std::unique_lock<std::mutex> lock;
-    acquired_lock(std::mutex &lk, Data *v) : lock(lk), value(v) {}
-
     template <typename T>
     friend class owning_lock;
 
+    template <typename T>
+    friend class acquired_lock;
+
+    acquired_lock(std::mutex &lk, Data *v) : lock(lk), value(v) {}
+    acquired_lock(std::unique_lock<std::mutex> &&lk, Data *v) : lock(std::move(lk)), value(v) {}
+
+    std::unique_lock<std::mutex> lock;
     Data *value;
 
    public:
@@ -632,6 +636,14 @@ class acquired_lock {
     Data &operator*() { return *value; }
     const Data &operator*() const { return *value; }
 
+    /// Implicit conversion to const version.
+    operator acquired_lock<const Data>() {
+        // We're about to give up our lock, don't hold onto the data.
+        const Data *cvalue = value;
+        value = nullptr;
+        return acquired_lock<const Data>(std::move(lock), cvalue);
+    }
+
     /// Create from a global lock.
     /// This is used in weird cases where a global lock protects more than one piece of data.
     static acquired_lock from_global(std::mutex &lk, Data *v) { return acquired_lock{lk, v}; }
diff --git a/src/history.cpp b/src/history.cpp
index a4b6cd84b..ca14aecdc 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -324,9 +324,6 @@ class history_file_contents_t {
     }
 };
 
-/// The set of all histories.
-static owning_lock<std::map<wcstring, std::unique_ptr<history_t>>> s_histories;
-
 static wcstring history_filename(const wcstring &name, const wcstring &suffix);
 
 /// Replaces newlines with a literal backslash followed by an n, and replaces backslashes with two
@@ -808,29 +805,148 @@ static size_t offset_of_next_item(const history_file_contents_t &contents, size_
     return size_t(-1);
 }
 
-history_t &history_t::history_with_name(const wcstring &name) {
-    // Return a history for the given name, creating it if necessary
-    // Note that histories are currently never deleted, so we can return a reference to them without
-    // using something like shared_ptr
-    auto hs = s_histories.acquire();
-    std::unique_ptr<history_t> &hist = (*hs)[name];
-    if (!hist) {
-        hist = make_unique<history_t>(name);
-    }
-    return *hist;
-}
+struct history_impl_t {
+    // Privately add an item. If pending, the item will not be returned by history searches until a
+    // call to resolve_pending.
+    void add(const history_item_t &item, bool pending = false);
 
-history_t::history_t(wcstring pname)
-    : name(std::move(pname)), history_file_id(kInvalidFileID), boundary_timestamp(time(NULL)) {}
+    // Internal function.
+    void clear_file_state();
 
-history_t::~history_t() = default;
+    // The name of this list. Used for picking a suitable filename and for switching modes.
+    const wcstring name;
 
-bool history_t::chaos_mode = false;
-bool history_t::never_mmap = false;
+    // New items. Note that these are NOT discarded on save. We need to keep these around so we can
+    // distinguish between items in our history and items in the history of other shells that were
+    // started after we were started.
+    history_item_list_t new_items;
 
-void history_t::add(const history_item_t &item, bool pending) {
-    scoped_lock locker(lock);
+    // The index of the first new item that we have not yet written.
+    size_t first_unwritten_new_item_index{0};
 
+    // Whether we have a pending item. If so, the most recently added item is ignored by
+    // item_at_index.
+    bool has_pending_item{false};
+
+    // Whether we should disable saving to the file for a time.
+    uint32_t disable_automatic_save_counter{0};
+
+    // Deleted item contents.
+    std::unordered_set<wcstring> deleted_items{};
+
+    // The buffer containing the history file contents.
+    std::unique_ptr<history_file_contents_t> file_contents{};
+
+    // The file ID of the history file.
+    file_id_t history_file_id{kInvalidFileID};
+
+    // The boundary timestamp distinguishes old items from new items. Items whose timestamps are <=
+    // the boundary are considered "old". Items whose timestemps are > the boundary are new, and are
+    // ignored by this instance (unless they came from this instance). The timestamp may be adjusted
+    // by incorporate_external_changes().
+    time_t boundary_timestamp{time(NULL)};
+
+    // How many items we add until the next vacuum. Initially a random value.
+    int countdown_to_vacuum{-1};
+
+    // Whether we've loaded old items.
+    bool loaded_old{false};
+
+    // List of old items, as offsets into out mmap data.
+    std::deque<size_t> old_item_offsets{};
+
+    // Figure out the offsets of our file contents.
+    void populate_from_file_contents();
+
+    // Loads old items if necessary.
+    void load_old_if_needed();
+
+    // Reads the history file if necessary.
+    bool mmap_if_needed();
+
+    // Deletes duplicates in new_items.
+    void compact_new_items();
+
+    // Attempts to rewrite the existing file to a target temporary file
+    // Returns false on error, true on success
+    bool rewrite_to_temporary_file(int existing_fd, int dst_fd) const;
+
+    // Saves history by rewriting the file.
+    bool save_internal_via_rewrite();
+
+    // Saves history by appending to the file.
+    bool save_internal_via_appending();
+
+    // Saves history.
+    void save(bool vacuum = false);
+
+    // Saves history unless doing so is disabled.
+    void save_unless_disabled();
+
+    explicit history_impl_t(wcstring name) : name(std::move(name)) {}
+    history_impl_t(history_impl_t &&) = default;
+    ~history_impl_t() = default;
+
+    /// Returns whether this is using the default name.
+    bool is_default() const;
+
+    // Determines whether the history is empty. Unfortunately this cannot be const, since it may
+    // require populating the history.
+    bool is_empty();
+
+    // Add a new history item to the end. If pending is set, the item will not be returned by
+    // item_at_index until a call to resolve_pending(). Pending items are tracked with an offset
+    // into the array of new items, so adding a non-pending item has the effect of resolving all
+    // pending items.
+    void add(const wcstring &str, history_identifier_t ident = 0, bool pending = false);
+
+    // Remove a history item.
+    void remove(const wcstring &str);
+
+    // Add a new pending history item to the end, and then begin file detection on the items to
+    // determine which arguments are paths
+    void add_pending_with_file_detection(const wcstring &str, const wcstring &working_dir_slash);
+
+    // Resolves any pending history items, so that they may be returned in history searches.
+    void resolve_pending();
+
+    // Enable / disable automatic saving. Main thread only!
+    void disable_automatic_saving();
+    void enable_automatic_saving();
+
+    // Irreversibly clears history.
+    void clear();
+
+    // Populates from older location ()in config path, rather than data path).
+    void populate_from_config_path();
+
+    // Populates from a bash history file.
+    void populate_from_bash(FILE *f);
+
+    // Incorporates the history of other shells into this history.
+    void incorporate_external_changes();
+
+    // Gets all the history into a list. This is intended for the $history environment variable.
+    // This may be long!
+    void get_history(wcstring_list_t &result);
+
+    // Let indexes be a list of one-based indexes into the history, matching the interpretation of
+    // $history. That is, $history[1] is the most recently executed command. Values less than one
+    // are skipped. Return a mapping from index to history item text.
+    std::unordered_map<long, wcstring> items_at_indexes(const std::vector<long> &idxs);
+
+    // Sets the valid file paths for the history item with the given identifier.
+    void set_valid_file_paths(const wcstring_list_t &valid_file_paths, history_identifier_t ident);
+
+    // Return the specified history at the specified index. 0 is the index of the current
+    // commandline. (So the most recent item is at index 1.)
+    history_item_t item_at_index(size_t idx);
+
+    // Return the number of history entries.
+    size_t size();
+};
+
+void history_impl_t::add(const history_item_t &item, bool pending) {
     // Try merging with the last item.
     if (!new_items.empty() && new_items.back().merge(item)) {
         // We merged, so we don't have to add anything. Maybe this item was pending, but it just got
@@ -840,14 +956,11 @@ void history_t::add(const history_item_t &item, bool pending) {
         // We have to add a new item.
         new_items.push_back(item);
         this->has_pending_item = pending;
-        save_internal_unless_disabled();
+        save_unless_disabled();
     }
 }
 
-void history_t::save_internal_unless_disabled() {
-    // This must be called while locked.
-    ASSERT_IS_LOCKED(lock);
-
+void history_impl_t::save_unless_disabled() {
     // Respect disable_automatic_save_counter.
     if (disable_automatic_save_counter > 0) {
         return;
@@ -872,16 +985,16 @@ void history_t::save_internal_unless_disabled() {
     }
 
     // This might be a good candidate for moving to a background thread.
-    time_profiler_t profiler(vacuum ? "save_internal vacuum"       //!OCLINT(unused var)
-                                    : "save_internal no vacuum");  //!OCLINT(side-effect)
-    this->save_internal(vacuum);
+    time_profiler_t profiler(vacuum ? "save vacuum"       //!OCLINT(unused var)
+                                    : "save no vacuum");  //!OCLINT(side-effect)
+    this->save(vacuum);
 
     // Update our countdown.
     assert(countdown_to_vacuum > 0);
     countdown_to_vacuum--;
 }
 
-void history_t::add(const wcstring &str, history_identifier_t ident, bool pending) {
+void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending) {
     time_t when = time(NULL);
     // Big hack: do not allow timestamps equal to our boundary date. This is because we include
     // items whose timestamps are equal to our boundary when reading old history, so we can catch
@@ -896,7 +1009,7 @@ void history_t::add(const wcstring &str, history_identifier_t ident, bool pendin
 
 // Remove matching history entries from our list of new items. This only supports literal,
 // case-sensitive, matches.
-void history_t::remove(const wcstring &str_to_remove) {
+void history_impl_t::remove(const wcstring &str_to_remove) {
     // Add to our list of deleted items.
     deleted_items.insert(str_to_remove);
 
@@ -916,15 +1029,13 @@ void history_t::remove(const wcstring &str_to_remove) {
     assert(first_unwritten_new_item_index <= new_items.size());
 }
 
-void history_t::set_valid_file_paths(const wcstring_list_t &valid_file_paths,
-                                     history_identifier_t ident) {
+void history_impl_t::set_valid_file_paths(const wcstring_list_t &valid_file_paths,
+                                          history_identifier_t ident) {
     // 0 identifier is used to mean "not necessary".
     if (ident == 0) {
         return;
     }
 
-    scoped_lock locker(lock);
-
     // Look for an item with the given identifier. It is likely to be at the end of new_items.
     for (history_item_list_t::reverse_iterator iter = new_items.rbegin(); iter != new_items.rend();
          ++iter) {
@@ -935,9 +1046,7 @@ void history_t::set_valid_file_paths(const wcstring_list_t &valid_file_paths,
     }
 }
 
-void history_t::get_history(wcstring_list_t &result) {
-    scoped_lock locker(lock);
-
+void history_impl_t::get_history(wcstring_list_t &result) {
     // If we have a pending item, we skip the first encountered (i.e. last) new item.
     bool next_is_pending = this->has_pending_item;
     std::unordered_set<wcstring> seen;
@@ -962,8 +1071,7 @@ void history_t::get_history(wcstring_list_t &result) {
     }
 }
 
-size_t history_t::size() {
-    scoped_lock locker(lock);
+size_t history_impl_t::size() {
     size_t new_item_count = new_items.size();
     if (this->has_pending_item && new_item_count > 0) new_item_count -= 1;
     load_old_if_needed();
@@ -971,9 +1079,7 @@ size_t history_t::size() {
     return new_item_count + old_item_count;
 }
 
-history_item_t history_t::item_at_index_assume_locked(size_t idx) {
-    ASSERT_IS_LOCKED(lock);
-
+history_item_t history_impl_t::item_at_index(size_t idx) {
     // 0 is considered an invalid index.
     assert(idx > 0);
     idx--;
@@ -1004,13 +1110,7 @@ history_item_t history_t::item_at_index_assume_locked(size_t idx) {
     return history_item_t(wcstring(), 0);
 }
 
-history_item_t history_t::item_at_index(size_t idx) {
-    scoped_lock locker(lock);
-    return item_at_index_assume_locked(idx);
-}
-
-std::unordered_map<long, wcstring> history_t::items_at_indexes(const std::vector<long> &idxs) {
-    scoped_lock locker(lock);
+std::unordered_map<long, wcstring> history_impl_t::items_at_indexes(const std::vector<long> &idxs) {
     std::unordered_map<long, wcstring> result;
     for (long idx : idxs) {
         if (idx <= 0) {
@@ -1022,14 +1122,14 @@ std::unordered_map<long, wcstring> history_t::items_at_indexes(const std::vector
         auto iter_inserted = result.emplace(idx, wcstring{});
         if (iter_inserted.second) {
             // New key.
-            auto item = item_at_index_assume_locked(size_t(idx));
+            auto item = item_at_index(size_t(idx));
             iter_inserted.first->second = std::move(item.contents);
         }
     }
     return result;
 }
 
-void history_t::populate_from_file_contents() {
+void history_impl_t::populate_from_file_contents() {
     old_item_offsets.clear();
     if (file_contents) {
         size_t cursor = 0;
@@ -1044,7 +1144,7 @@ void history_t::populate_from_file_contents() {
     }
 }
 
-void history_t::load_old_if_needed() {
+void history_impl_t::load_old_if_needed() {
     if (loaded_old) return;
     loaded_old = true;
 
@@ -1063,10 +1163,10 @@ void history_t::load_old_if_needed() {
             // is unlikely because we only treat an item as valid if it has a terminating newline.
             //
             // Simulate a failing lock in chaos_mode.
-            if (!chaos_mode) history_file_lock(fd, LOCK_SH);
+            if (!history_t::chaos_mode) history_file_lock(fd, LOCK_SH);
             file_contents = history_file_contents_t::create(fd);
             this->history_file_id = file_contents ? file_id_for_fd(fd) : kInvalidFileID;
-            if (!chaos_mode) history_file_lock(fd, LOCK_UN);
+            if (!history_t::chaos_mode) history_file_lock(fd, LOCK_UN);
             close(fd);
 
             time_profiler_t profiler("populate_from_file_contents");  //!OCLINT(side-effect)
@@ -1182,15 +1282,14 @@ static wcstring history_filename(const wcstring &session_id, const wcstring &suf
     return result;
 }
 
-void history_t::clear_file_state() {
-    ASSERT_IS_LOCKED(lock);
+void history_impl_t::clear_file_state() {
     // Erase everything we know about our file.
     file_contents.reset();
     loaded_old = false;
     old_item_offsets.clear();
 }
 
-void history_t::compact_new_items() {
+void history_impl_t::compact_new_items() {
     // Keep only the most recent items with the given contents. This algorithm could be made more
     // efficient, but likely would consume more memory too.
     std::unordered_set<wcstring> seen;
@@ -1214,10 +1313,7 @@ void history_t::compact_new_items() {
 // Given the fd of an existing history file, or -1 if none, write
 // a new history file to temp_fd. Returns true on success, false
 // on error
-bool history_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
-    // This must be called while locked.
-    ASSERT_IS_LOCKED(lock);
-
+bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) const {
     // We are reading FROM existing_fd and writing TO dst_fd
     // dst_fd must be valid; existing_fd does not need to be
     assert(dst_fd >= 0);
@@ -1299,9 +1395,7 @@ static int create_temporary_file(const wcstring &name_template, wcstring *out_pa
     return out_fd;
 }
 
-bool history_t::save_internal_via_rewrite() {
-    // This must be called while locked.
-    ASSERT_IS_LOCKED(lock);
+bool history_impl_t::save_internal_via_rewrite() {
     bool ok = false;
 
     // We want to rewrite the file, while holding the lock for as briefly as possible
@@ -1409,10 +1503,7 @@ bool history_t::save_internal_via_rewrite() {
 
 // Function called to save our unwritten history file by appending to the existing history file
 // Returns true on success, false on failure.
-bool history_t::save_internal_via_appending() {
-    // This must be called while locked.
-    ASSERT_IS_LOCKED(lock);
-
+bool history_impl_t::save_internal_via_appending() {
     // No deleting allowed.
     assert(deleted_items.empty());
 
@@ -1445,7 +1536,7 @@ bool history_t::save_internal_via_appending() {
         // by writing with O_APPEND.
         //
         // Simulate a failing lock in chaos_mode
-        if (!chaos_mode) history_file_lock(fd, LOCK_EX);
+        if (!history_t::chaos_mode) history_file_lock(fd, LOCK_EX);
         const file_id_t file_id = file_id_for_fd(fd);
         if (file_id_for_path(history_path) != file_id) {
             // The file has changed, we're going to retry
@@ -1521,9 +1612,7 @@ bool history_t::save_internal_via_appending() {
 }
 
 /// Save the specified mode to file; optionally also vacuums.
-void history_t::save_internal(bool vacuum) {
-    ASSERT_IS_LOCKED(lock);
-
+void history_impl_t::save(bool vacuum) {
     // Nothing to do if there's no new items.
     if (first_unwritten_new_item_index >= new_items.size() && deleted_items.empty()) return;
 
@@ -1550,11 +1639,6 @@ void history_t::save_internal(bool vacuum) {
     }
 }
 
-void history_t::save() {
-    scoped_lock locker(lock);
-    this->save_internal(false);
-}
-
 // Formats a single history record, including a trailing newline.
 //
 // Returns nothing. The only possible failure involves formatting the timestamp. If that happens we
@@ -1582,94 +1666,18 @@ static void format_history_record(const history_item_t &item, const wchar_t *sho
     }
 }
 
-/// This handles the slightly unusual case of someone searching history for
-/// specific terms/patterns.
-bool history_t::search_with_args(history_search_type_t search_type, wcstring_list_t search_args,
-                                 const wchar_t *show_time_format, size_t max_items,
-                                 bool case_sensitive, bool null_terminate, bool reverse,
-                                 io_streams_t &streams) {
-    wcstring_list_t results;
-    size_t hist_size = this->size();
-    if (max_items > hist_size) max_items = hist_size;
-
-    for (const wcstring &search_string : search_args) {
-        if (search_string.empty()) {
-            streams.err.append_format(L"Searching for the empty string isn't allowed");
-            return false;
-        }
-        history_search_t searcher = history_search_t(
-            *this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case);
-        while (searcher.go_backwards()) {
-            wcstring result;
-            auto cur_item = searcher.current_item();
-            format_history_record(cur_item, show_time_format, null_terminate, result);
-            if (reverse) {
-                results.push_back(result);
-            } else {
-                streams.out.append(result);
-            }
-            if (--max_items == 0) break;
-        }
-    }
-
-    if (reverse) {
-        for (auto it = results.rbegin(); it != results.rend(); it++) {
-            streams.out.append(*it);
-        }
-    }
-
-    return true;
-}
-
-bool history_t::search(history_search_type_t search_type, wcstring_list_t search_args,
-                       const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
-                       bool null_terminate, bool reverse, io_streams_t &streams) {
-    if (!search_args.empty()) {
-        // User wants the results filtered. This is not the common case so we do it separate
-        // from the code below for unfiltered output which is much cheaper.
-        return search_with_args(search_type, search_args, show_time_format, max_items,
-                                case_sensitive, null_terminate, reverse, streams);
-    }
-
-    // scoped_lock locker(lock);
-    size_t hist_size = this->size();
-    if (max_items > hist_size) max_items = hist_size;
-
-    if (reverse) {
-        for (size_t i = max_items; i != 0; --i) {
-            auto cur_item = this->item_at_index(i);
-            wcstring result;
-            format_history_record(cur_item, show_time_format, null_terminate, result);
-            streams.out.append(result);
-        }
-    } else {
-        // Start at one because zero is the current command.
-        for (size_t i = 1; i < max_items + 1; ++i) {
-            auto cur_item = this->item_at_index(i);
-            wcstring result;
-            format_history_record(cur_item, show_time_format, null_terminate, result);
-            streams.out.append(result);
-        }
-    }
-
-    return true;
-}
-
-void history_t::disable_automatic_saving() {
-    scoped_lock locker(lock);
+void history_impl_t::disable_automatic_saving() {
     disable_automatic_save_counter++;
     assert(disable_automatic_save_counter != 0);  // overflow!
 }
 
-void history_t::enable_automatic_saving() {
-    scoped_lock locker(lock);
+void history_impl_t::enable_automatic_saving() {
     assert(disable_automatic_save_counter > 0);  // underflow
     disable_automatic_save_counter--;
-    save_internal_unless_disabled();
+    save_unless_disabled();
 }
 
-void history_t::clear() {
-    scoped_lock locker(lock);
+void history_impl_t::clear() {
     new_items.clear();
     deleted_items.clear();
     first_unwritten_new_item_index = 0;
@@ -1679,11 +1687,9 @@ void history_t::clear() {
     this->clear_file_state();
 }
 
-bool history_t::is_default() const { return name == DFLT_FISH_HISTORY_SESSION_ID; }
-
-bool history_t::is_empty() {
-    scoped_lock locker(lock);
+bool history_impl_t::is_default() const { return name == DFLT_FISH_HISTORY_SESSION_ID; }
 
+bool history_impl_t::is_empty() {
     // If we have new items, we're not empty.
     if (!new_items.empty()) return false;
 
@@ -1714,7 +1720,7 @@ bool history_t::is_empty() {
 /// Populates from older location (in config path, rather than data path) This is accomplished by
 /// clearing ourselves, and copying the contents of the old history file to the new history file.
 /// The new contents will automatically be re-mapped later.
-void history_t::populate_from_config_path() {
+void history_impl_t::populate_from_config_path() {
     wcstring new_file = history_filename(name, wcstring());
     if (new_file.empty()) {
         return;
@@ -1789,7 +1795,7 @@ static bool should_import_bash_history_line(const wcstring &line) {
 /// comments. Ignore a few commands that are bash-specific. It makes no attempt to handle multiline
 /// commands. We can't actually parse bash syntax and the bash history file does not unambiguously
 /// encode multiline commands.
-void history_t::populate_from_bash(FILE *stream) {
+void history_impl_t::populate_from_bash(FILE *stream) {
     // Process the entire history file until EOF is observed.
     bool eof = false;
     while (!eof) {
@@ -1816,14 +1822,13 @@ void history_t::populate_from_bash(FILE *stream) {
     }
 }
 
-void history_t::incorporate_external_changes() {
+void history_impl_t::incorporate_external_changes() {
     // To incorporate new items, we simply update our timestamp to now, so that items from previous
     // instances get added. We then clear the file state so that we remap the file. Note that this
     // is somehwhat expensive because we will be going back over old items. An optimization would be
     // to preserve old_item_offsets so that they don't have to be recomputed. (However, then items
     // *deleted* in other instances would not show up here).
     time_t new_timestamp = time(NULL);
-    scoped_lock locker(lock);
 
     // If for some reason the clock went backwards, we don't want to start dropping items; therefore
     // we only do work if time has progressed. This also makes multiple calls cheap.
@@ -1834,19 +1839,12 @@ void history_t::incorporate_external_changes() {
         // We also need to erase new_items, since we go through those first, and that means we
         // will not properly interleave them with items from other instances.
         // We'll pick them up from the file (#2312)
-        this->save_internal(false);
+        this->save(false);
         this->new_items.clear();
         this->first_unwritten_new_item_index = 0;
     }
 }
 
-void history_save_all() {
-    auto histories = s_histories.acquire();
-    for (auto &p : *histories) {
-        p.second->save();
-    }
-}
-
 /// Return the prefix for the files to be used for command and read history.
 wcstring history_session_id(const environment_t &vars) {
     wcstring result = DFLT_FISH_HISTORY_SESSION_ID;
@@ -1900,10 +1898,35 @@ static bool string_could_be_path(const wcstring &potential_path) {
     return true;
 }
 
+/// Very simple, just mark that we have no more pending items.
+void history_impl_t::resolve_pending() { this->has_pending_item = false; }
+
+bool history_t::chaos_mode = false;
+bool history_t::never_mmap = false;
+
+history_t::history_t(wcstring name)
+    : impl_(make_unique<owning_lock<history_impl_t>>(history_impl_t(std::move(name)))) {}
+
+history_t::~history_t() = default;
+
+acquired_lock<history_impl_t> history_t::impl() { return impl_->acquire(); }
+
+acquired_lock<const history_impl_t> history_t::impl() const { return impl_->acquire(); }
+
+bool history_t::is_default() const { return impl()->is_default(); }
+
+bool history_t::is_empty() { return impl()->is_empty(); }
+
+void history_t::add(const history_item_t &item, bool pending) { impl()->add(item, pending); }
+
+void history_t::add(const wcstring &str, history_identifier_t ident, bool pending) {
+    impl()->add(str, ident, pending);
+}
+
+void history_t::remove(const wcstring &str) { impl()->remove(str); }
+
 void history_t::add_pending_with_file_detection(const wcstring &str,
                                                 const wcstring &working_dir_slash) {
-    ASSERT_IS_MAIN_THREAD();
-
     // Find all arguments that look like they could be file paths.
     bool impending_exit = false;
     parse_node_tree_t tree;
@@ -1939,38 +1962,151 @@ void history_t::add_pending_with_file_detection(const wcstring &str,
     }
 
     // If we got a path, we'll perform file detection for autosuggestion hinting.
+    bool wants_file_detection = !potential_paths.empty() && !impending_exit;
+    auto imp = this->impl();
+
     history_identifier_t identifier = 0;
-    if (!potential_paths.empty() && !impending_exit) {
+    if (wants_file_detection) {
         // Grab the next identifier.
         static relaxed_atomic_t<history_identifier_t> s_last_identifier{0};
         identifier = ++s_last_identifier;
+        imp->disable_automatic_saving();
 
-        // Prevent saving until we're done, so we have time to get the paths.
-        this->disable_automatic_saving();
+        // Add the item. Then check for which paths are valid on a background thread,
+        // and unblock the item.
+        // Don't hold the lock while we perform this file detection.
+        imp->add(str, identifier, true /* pending */);
+        iothread_perform([=]() {
+            auto validated_paths = valid_paths(potential_paths, working_dir_slash);
+            auto imp = this->impl();
+            imp->set_valid_file_paths(validated_paths, identifier);
+            imp->enable_automatic_saving();
+        });
+    } else {
+        // Add the item.
+        // If we think we're about to exit, save immediately, regardless of any disabling. This may
+        // cause us to lose file hinting for some commands, but it beats losing history items.
+        imp->add(str, identifier, true /* pending */);
+        if (impending_exit) {
+            imp->save();
+        }
+    }
+}
+void history_t::resolve_pending() { impl()->resolve_pending(); }
 
-        // Check for which paths are valid on a background thread,
-        // then on the main thread update our history item
-        iothread_perform([=]() { return valid_paths(potential_paths, working_dir_slash); },
-                         [=](path_list_t validated_paths) {
-                             this->set_valid_file_paths(validated_paths, identifier);
-                             this->enable_automatic_saving();
-                         });
+void history_t::save() { impl()->save(); }
+
+// Searches history.
+bool history_t::search(history_search_type_t search_type, const wcstring_list_t &search_args,
+                       const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
+                       bool null_terminate, bool reverse, io_streams_t &streams) {
+    if (!search_args.empty()) {
+        // User wants the results filtered. This is not the common case so we do it separate
+        // from the code below for unfiltered output which is much cheaper.
+        return search_with_args(search_type, search_args, show_time_format, max_items,
+                                case_sensitive, null_terminate, reverse, streams);
     }
 
-    // Actually add the item to the history.
-    this->add(str, identifier, true /* pending */);
+    // scoped_lock locker(lock);
+    size_t hist_size = this->size();
+    if (max_items > hist_size) max_items = hist_size;
 
-    // If we think we're about to exit, save immediately, regardless of any disabling. This may
-    // cause us to lose file hinting for some commands, but it beats losing history items.
-    if (impending_exit) {
-        this->save();
+    if (reverse) {
+        for (size_t i = max_items; i != 0; --i) {
+            auto cur_item = this->item_at_index(i);
+            wcstring result;
+            format_history_record(cur_item, show_time_format, null_terminate, result);
+            streams.out.append(result);
+        }
+    } else {
+        // Start at one because zero is the current command.
+        for (size_t i = 1; i < max_items + 1; ++i) {
+            auto cur_item = this->item_at_index(i);
+            wcstring result;
+            format_history_record(cur_item, show_time_format, null_terminate, result);
+            streams.out.append(result);
+        }
+    }
+
+    return true;
+}
+
+bool history_t::search_with_args(history_search_type_t search_type,
+                                 const wcstring_list_t &search_args,
+                                 const wchar_t *show_time_format, size_t max_items,
+                                 bool case_sensitive, bool null_terminate, bool reverse,
+                                 io_streams_t &streams) {
+    wcstring_list_t results;
+    size_t hist_size = this->size();
+    if (max_items > hist_size) max_items = hist_size;
+
+    for (const wcstring &search_string : search_args) {
+        if (search_string.empty()) {
+            streams.err.append_format(L"Searching for the empty string isn't allowed");
+            return false;
+        }
+        history_search_t searcher = history_search_t(
+            *this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case);
+        while (searcher.go_backwards()) {
+            wcstring result;
+            auto cur_item = searcher.current_item();
+            format_history_record(cur_item, show_time_format, null_terminate, result);
+            if (reverse) {
+                results.push_back(result);
+            } else {
+                streams.out.append(result);
+            }
+            if (--max_items == 0) break;
+        }
+    }
+
+    if (reverse) {
+        for (auto it = results.rbegin(); it != results.rend(); it++) {
+            streams.out.append(*it);
+        }
+    }
+
+    return true;
+}
+
+void history_t::clear() { impl()->clear(); }
+
+void history_t::populate_from_config_path() { impl()->populate_from_config_path(); }
+
+void history_t::populate_from_bash(FILE *f) { impl()->populate_from_bash(f); }
+
+void history_t::incorporate_external_changes() { impl()->incorporate_external_changes(); }
+
+void history_t::get_history(wcstring_list_t &result) { impl()->get_history(result); }
+
+std::unordered_map<long, wcstring> history_t::items_at_indexes(const std::vector<long> &idxs) {
+    return impl()->items_at_indexes(idxs);
+}
+
+history_item_t history_t::item_at_index(size_t idx) { return impl()->item_at_index(idx); }
+
+size_t history_t::size() { return impl()->size(); }
+
+/// The set of all histories.
+static owning_lock<std::map<wcstring, std::unique_ptr<history_t>>> s_histories;
+
+void history_save_all() {
+    auto histories = s_histories.acquire();
+    for (auto &p : *histories) {
+        p.second->save();
     }
 }
 
-/// Very simple, just mark that we have no more pending items.
-void history_t::resolve_pending() {
-    scoped_lock locker(lock);
-    this->has_pending_item = false;
+history_t &history_t::history_with_name(const wcstring &name) {
+    // Return a history for the given name, creating it if necessary
+    // Note that histories are currently never deleted, so we can return a reference to them without
+    // using something like shared_ptr
+    auto hs = s_histories.acquire();
+    std::unique_ptr<history_t> &hist = (*hs)[name];
+    if (!hist) {
+        hist = make_unique<history_t>(name);
+    }
+    return *hist;
 }
 
 static std::atomic<bool> private_mode{false};
diff --git a/src/history.h b/src/history.h
index d0738f4fe..48d823efb 100644
--- a/src/history.h
+++ b/src/history.h
@@ -61,6 +61,7 @@ typedef uint64_t history_identifier_t;
 
 class history_item_t {
     friend class history_t;
+    friend struct history_impl_t;
     friend class history_tests_t;
 
    private:
@@ -106,11 +107,12 @@ class history_item_t {
 typedef std::deque<history_item_t> history_item_list_t;
 
 class history_file_contents_t;
+struct history_impl_t;
 
 class history_t {
     friend class history_tests_t;
+    const std::unique_ptr<owning_lock<history_impl_t>> impl_;
 
-   private:
     // No copying or moving.
     history_t() = delete;
     history_t(const history_t &) = delete;
@@ -118,89 +120,13 @@ class history_t {
     history_t &operator=(const history_t &) = delete;
     history_t &operator=(history_t &&) = delete;
 
+    acquired_lock<history_impl_t> impl();
+    acquired_lock<const history_impl_t> impl() const;
+
     // Privately add an item. If pending, the item will not be returned by history searches until a
     // call to resolve_pending.
     void add(const history_item_t &item, bool pending = false);
 
-    // Lock for thread safety.
-    std::mutex lock;
-
-    // Internal function.
-    void clear_file_state();
-
-    // The name of this list. Used for picking a suitable filename and for switching modes.
-    const wcstring name;
-
-    // New items. Note that these are NOT discarded on save. We need to keep these around so we can
-    // distinguish between items in our history and items in the history of other shells that were
-    // started after we were started.
-    history_item_list_t new_items;
-
-    // The index of the first new item that we have not yet written.
-    size_t first_unwritten_new_item_index{0};
-
-    // Whether we have a pending item. If so, the most recently added item is ignored by
-    // item_at_index.
-    bool has_pending_item{false};
-
-    // Whether we should disable saving to the file for a time.
-    uint32_t disable_automatic_save_counter{0};
-
-    // Deleted item contents.
-    std::unordered_set<wcstring> deleted_items;
-
-    // The buffer containing the history file contents.
-    std::unique_ptr<history_file_contents_t> file_contents;
-
-    // The file ID of the history file.
-    file_id_t history_file_id;
-
-    // The boundary timestamp distinguishes old items from new items. Items whose timestamps are <=
-    // the boundary are considered "old". Items whose timestemps are > the boundary are new, and are
-    // ignored by this instance (unless they came from this instance). The timestamp may be adjusted
-    // by incorporate_external_changes().
-    time_t boundary_timestamp;
-
-    // How many items we add until the next vacuum. Initially a random value.
-    int countdown_to_vacuum{-1};
-
-    // Whether we've loaded old items.
-    bool loaded_old{false};
-
-    // List of old items, as offsets into out mmap data.
-    std::deque<size_t> old_item_offsets;
-
-    // Figure out the offsets of our file contents.
-    void populate_from_file_contents();
-
-    // Loads old items if necessary.
-    void load_old_if_needed();
-
-    // Reads the history file if necessary.
-    bool mmap_if_needed();
-
-    // Deletes duplicates in new_items.
-    void compact_new_items();
-
-    // Attempts to rewrite the existing file to a target temporary file
-    // Returns false on error, true on success
-    bool rewrite_to_temporary_file(int existing_fd, int dst_fd) const;
-
-    // Saves history by rewriting the file.
-    bool save_internal_via_rewrite();
-
-    // Saves history by appending to the file.
-    bool save_internal_via_appending();
-
-    // Saves history.
-    void save_internal(bool vacuum);
-
-    // Saves history unless doing so is disabled.
-    void save_internal_unless_disabled();
-
-    // Implementation of item_at_index and items_at_indexes
-    history_item_t item_at_index_assume_locked(size_t idx);
-
    public:
     explicit history_t(wcstring name);
     ~history_t();
@@ -242,22 +168,18 @@ class history_t {
     void save();
 
     // Searches history.
-    bool search(history_search_type_t search_type, wcstring_list_t search_args,
+    bool search(history_search_type_t search_type, const wcstring_list_t &search_args,
                 const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
                 bool null_terminate, bool reverse, io_streams_t &streams);
 
-    bool search_with_args(history_search_type_t search_type, wcstring_list_t search_args,
+    bool search_with_args(history_search_type_t search_type, const wcstring_list_t &search_args,
                           const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
                           bool null_terminate, bool reverse, io_streams_t &streams);
 
-    // Enable / disable automatic saving. Main thread only!
-    void disable_automatic_saving();
-    void enable_automatic_saving();
-
     // Irreversibly clears history.
     void clear();
 
-    // Populates from older location ()in config path, rather than data path).
+    // Populates from older location (in config path, rather than data path).
     void populate_from_config_path();
 
     // Populates from a bash history file.
@@ -275,9 +197,6 @@ class history_t {
     // are skipped. Return a mapping from index to history item text.
     std::unordered_map<long, wcstring> items_at_indexes(const std::vector<long> &idxs);
 
-    // Sets the valid file paths for the history item with the given identifier.
-    void set_valid_file_paths(const wcstring_list_t &valid_file_paths, history_identifier_t ident);
-
     // Return the specified history at the specified index. 0 is the index of the current
     // commandline. (So the most recent item is at index 1.)
     history_item_t item_at_index(size_t idx);

From 5fd3bf79f5ed2ac0447f19ef0dec2012bd658e10 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sat, 15 Jun 2019 22:36:03 -0700
Subject: [PATCH 0715/1732] Don't trim trailing whitespace on .rst files

Our existing .rst files have lines with trailing whitespace in them,
which I can only assume is deliberate, so update the editorconfig to
stop trimming trailing whitespace for these files.
---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index a99eceb75..bed92f3e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,7 +12,7 @@ max_line_length = 100
 [{Makefile,*.in}]
 indent_style = tab
 
-[*.md]
+[*.{md,rst}]
 trim_trailing_whitespace = false
 
 [*.{sh,ac}]

From 476185748fbc37f83e76bdf4f3704ebbcaf39374 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Jun 2019 13:43:50 -0700
Subject: [PATCH 0716/1732] Add littlecheck.py

This will be the new testing tool replacing the diff-based tests.

Imported from https://github.com/ridiculousfish/littlecheck
Version e28281273e54745c7d7aabeeb4b085af477d584b
---
 build_tools/littlecheck.py | 426 +++++++++++++++++++++++++++++++++++++
 1 file changed, 426 insertions(+)
 create mode 100755 build_tools/littlecheck.py

diff --git a/build_tools/littlecheck.py b/build_tools/littlecheck.py
new file mode 100755
index 000000000..f6ea365e8
--- /dev/null
+++ b/build_tools/littlecheck.py
@@ -0,0 +1,426 @@
+#!/usr/bin/env python
+
+""" Command line test driver. """
+
+from __future__ import unicode_literals
+
+import argparse
+import io
+import re
+import shlex
+import subprocess
+import sys
+
+# A regex showing how to run the file.
+RUN_RE = re.compile(r"#\s*RUN:\s+(.*)\n")
+
+# A regex capturing lines that should be checked against stdout.
+CHECK_STDOUT_RE = re.compile(r"#\s*CHECK:\s+(.*)\n")
+
+# A regex capturing lines that should be checked against stderr.
+CHECK_STDERR_RE = re.compile(r"#\s*CHECKERR:\s+(.*)\n")
+
+
+class Config(object):
+    def __init__(self):
+        # Whether to have verbose output.
+        self.verbose = False
+        # Whether output gets ANSI colorization.
+        self.colorize = False
+
+    def colors(self):
+        """ Return a dictionary mapping color names to ANSI escapes """
+
+        def ansic(n):
+            return "\033[%dm" % n if self.colorize else ""
+
+        return {
+            "RESET": ansic(0),
+            "BOLD": ansic(1),
+            "NORMAL": ansic(39),
+            "BLACK": ansic(30),
+            "RED": ansic(31),
+            "GREEN": ansic(32),
+            "YELLOW": ansic(33),
+            "BLUE": ansic(34),
+            "MAGENTA": ansic(35),
+            "CYAN": ansic(36),
+            "LIGHTGRAY": ansic(37),
+            "DARKGRAY": ansic(90),
+            "LIGHTRED": ansic(91),
+            "LIGHTGREEN": ansic(92),
+            "LIGHTYELLOW": ansic(93),
+            "LIGHTBLUE": ansic(94),
+            "LIGHTMAGENTA": ansic(95),
+            "LIGHTCYAN": ansic(96),
+            "WHITE": ansic(97),
+        }
+
+
+def output(*args):
+    print("".join(args) + "\n")
+
+
+class CheckerError(Exception):
+    """Exception subclass for check line parsing.
+
+    Attributes:
+      line: the Line object on which the exception occurred.
+    """
+
+    def __init__(self, message, line=None):
+        super(CheckerError, self).__init__(message)
+        self.line = line
+
+
+class Line(object):
+    """ A line that remembers where it came from. """
+
+    def __init__(self, text, number, file):
+        self.text = text
+        self.number = number
+        self.file = file
+
+    def subline(self, text):
+        """ Return a substring of our line with the given text, preserving number and file. """
+        return Line(text, self.number, self.file)
+
+    @staticmethod
+    def readfile(file, name):
+        return [Line(text, idx + 1, name) for idx, text in enumerate(file)]
+
+    def is_empty_space(self):
+        return not self.text or self.text.isspace()
+
+
+class RunCmd(object):
+    """ A command to run on a given Checker.
+    
+    Attributes:
+        args: Unexpanded shell command as a string.
+    """
+
+    def __init__(self, args, line):
+        self.args = args
+        self.line = line
+
+    @staticmethod
+    def parse(line):
+        if not shlex.split(line.text):
+            raise CheckerError("Invalid RUN command", line)
+        return RunCmd(line.text, line)
+
+
+class TestFailure(object):
+    def __init__(self, line, check, testrun):
+        self.line = line
+        self.check = check
+        self.testrun = testrun
+        self.error_annotation_line = None
+
+    def message(self):
+        fields = self.testrun.config.colors()
+        fields["name"] = self.testrun.name
+        fields["subbed_command"] = self.testrun.subbed_command
+        if self.line:
+            fields.update(
+                {
+                    "output_file": self.line.file,
+                    "output_lineno": self.line.number,
+                    "output_line": self.line.text.rstrip("\n"),
+                }
+            )
+        if self.check:
+            fields.update(
+                {
+                    "input_file": self.check.line.file,
+                    "input_lineno": self.check.line.number,
+                    "input_line": self.check.line.text,
+                    "check_type": self.check.type,
+                }
+            )
+        fmtstrs = ["{RED}Failure{RESET} in {name}:", ""]
+        if self.line and self.check:
+            fmtstrs += [
+                "  The {check_type} on line {input_lineno} wants:",
+                "    {BOLD}{input_line}{RESET}",
+                "",
+                "  which failed to match line {output_file}:{output_lineno}:",
+                "    {BOLD}{output_line}{RESET}",
+                "",
+            ]
+
+        elif self.check:
+            fmtstrs += [
+                "  The {check_type} on line {input_lineno} wants:",
+                "    {BOLD}{input_line}{RESET}",
+                "",
+                "  but there was no remaining output to match.",
+                "",
+            ]
+        else:
+            fmtstrs += [
+                "  There were no remaining checks left to match {output_file}:{output_lineno}:",
+                "    {BOLD}{output_line}{RESET}",
+                "",
+            ]
+        if self.error_annotation_line:
+            fields["error_annotation"] = self.error_annotation_line.text
+            fields["error_annotation_lineno"] = self.error_annotation_line.number
+            fmtstrs += [
+                "  additional output on stderr:{error_annotation_lineno}:",
+                "    {BOLD}{error_annotation}{RESET}",
+            ]
+        fmtstrs += ["  when running command:", "    {subbed_command}"]
+        return "\n".join(fmtstrs).format(**fields)
+
+    def print_message(self):
+        """ Print our message to stdout. """
+        print(self.message())
+
+
+def perform_substitution(input_str, subs):
+    """ Perform the substitutions described by subs to str
+        Return the substituted string.
+    """
+    # Sort our substitutions into a list of tuples (key, value), descending by length.
+    # It needs to be descending because we need to try longer substitutions first.
+    subs_ordered = sorted(subs.items(), key=lambda s: len(s[0]), reverse=True)
+
+    def subber(m):
+        # We get the entire sequence of characters.
+        # Replace just the prefix and return it.
+        text = m.group(1)
+        for key, replacement in subs_ordered:
+            if text.startswith(key):
+                return replacement + text[len(key) :]
+        raise CheckerError("Unknown substitution: " + m.group(0))
+
+    return re.sub(r"%(%|[a-zA-Z0-9_-]+)", subber, input_str)
+
+
+class TestRun(object):
+    def __init__(self, name, runcmd, checker, subs, config):
+        self.name = name
+        self.runcmd = runcmd
+        self.subbed_command = perform_substitution(runcmd.args, subs)
+        self.checker = checker
+        self.subs = subs
+        self.config = config
+
+    def check(self, lines, checks):
+        # Reverse our lines and checks so we can pop off the end.
+        lineq = lines[::-1]
+        checkq = checks[::-1]
+        while lineq and checkq:
+            line = lineq[-1]
+            check = checkq[-1]
+            if check.regex.match(line.text):
+                # This line matched this checker, continue on.
+                lineq.pop()
+                checkq.pop()
+            elif line.is_empty_space():
+                # Skip all whitespace input lines.
+                lineq.pop()
+            else:
+                # Failed to match.
+                return TestFailure(line, check, self)
+        # Drain empties.
+        while lineq and lineq[-1].is_empty_space():
+            lineq.pop()
+        # If there's still lines or checkers, we have a failure.
+        # Otherwise it's success.
+        if lineq:
+            return TestFailure(lineq[-1], None, self)
+        elif checkq:
+            return TestFailure(None, checkq[-1], self)
+        else:
+            return None
+
+    def run(self):
+        """ Run the command. Return a TestFailure, or None. """
+
+        def split_by_newlines(s):
+            """ Decode a string and split it by newlines only,
+                retaining the newlines.
+            """
+            return [s + "\n" for s in s.decode("utf-8").split("\n")]
+
+        PIPE = subprocess.PIPE
+        if self.config.verbose:
+            print(self.subbed_command)
+        proc = subprocess.Popen(
+            self.subbed_command, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True
+        )
+        stdout, stderr = proc.communicate()
+        outlines = [
+            Line(text, idx + 1, "stdout")
+            for idx, text in enumerate(split_by_newlines(stdout))
+        ]
+        errlines = [
+            Line(text, idx + 1, "stderr")
+            for idx, text in enumerate(split_by_newlines(stderr))
+        ]
+        outfail = self.check(outlines, self.checker.outchecks)
+        errfail = self.check(errlines, self.checker.errchecks)
+        # It's possible that something going wrong on stdout resulted in new
+        # text being printed on stderr. If we have an outfailure, and either
+        # non-matching or unmatched stderr text, then annotate the outfail
+        # with it.
+        if outfail and errfail and errfail.line:
+            outfail.error_annotation_line = errfail.line
+        return outfail if outfail else errfail
+
+
+class CheckCmd(object):
+    def __init__(self, line, checktype, regex):
+        self.line = line
+        self.type = checktype
+        self.regex = regex
+
+    @staticmethod
+    def parse(line, checktype):
+        # type: (Line) -> CheckCmd
+        # Everything inside {{}} is a regular expression.
+        # Everything outside of it is a literal string.
+        # Split around {{...}}. Then every odd index will be a regex, and
+        # evens will be literals.
+        # Note that if {{...}} appears first we will get an empty string in
+        # the split array, so the {{...}} matches are always at odd indexes.
+        bracket_re = re.compile(
+            r"""
+                \{\{   # Two open brackets
+                (.*?)  # Nongreedy capture
+                \}\}   # Two close brackets
+            """,
+            re.VERBOSE,
+        )
+        pieces = bracket_re.split(line.text)
+        even = True
+        re_strings = []
+        for piece in pieces:
+            if even:
+                # piece is a literal string.
+                re_strings.append(re.escape(piece))
+            else:
+                # piece is a regex (found inside {{...}}).
+                # Verify the regex can be compiled.
+                try:
+                    re.compile(piece)
+                except re.error:
+                    raise CheckerError("Invalid regular expression: '%s'" % piece, line)
+                re_strings.append(piece)
+            even = not even
+        # Enclose each piece in a non-capturing group.
+        # This ensures that lower-precedence operators don't trip up catenation.
+        # For example: {{b|c}}d would result in /b|cd/ which is different.
+        # Backreferences are assumed to match across the entire string.
+        re_strings = ["(?:%s)" % s for s in re_strings]
+        # Anchor at beginning and end (allowing arbitrary whitespace), and maybe
+        # a terminating newline.
+        # We need the anchors because Python's match() matches an arbitrary prefix,
+        # not the entire string.
+        re_strings = [r"^\s*"] + re_strings + [r"\s*\n?$"]
+        full_re = re.compile("".join(re_strings))
+        return CheckCmd(line, checktype, full_re)
+
+
+class Checker(object):
+    def __init__(self, name, lines):
+        self.name = name
+        # Helper to yield subline containing group1 from all matching lines.
+        def group1s(regex):
+            for line in lines:
+                m = regex.match(line.text)
+                if m:
+                    yield line.subline(m.group(1))
+
+        # Find run commands.
+        self.runcmds = [RunCmd.parse(sl) for sl in group1s(RUN_RE)]
+        if not self.runcmds:
+            raise CheckerError("No runlines ('# RUN') found")
+
+        # Find check cmds.
+        self.outchecks = [
+            CheckCmd.parse(sl, "CHECK") for sl in group1s(CHECK_STDOUT_RE)
+        ]
+        self.errchecks = [
+            CheckCmd.parse(sl, "CHECKERR") for sl in group1s(CHECK_STDERR_RE)
+        ]
+
+
+def check_file(input_file, name, subs, config, failure_handler):
+    """ Check a single file. Return a True on success, False on error. """
+    success = True
+    lines = Line.readfile(input_file, name)
+    checker = Checker(name, lines)
+    for runcmd in checker.runcmds:
+        failure = TestRun(name, runcmd, checker, subs, config).run()
+        if failure:
+            failure_handler(failure)
+            success = False
+    return success
+
+
+def check_path(path, subs, config, failure_handler):
+    with io.open(path, encoding="utf-8") as fd:
+        return check_file(fd, path, subs, config, failure_handler)
+
+
+def parse_subs(subs):
+    """ Given a list of input substitutions like 'foo=bar',
+       return a dictionary like {foo:bar}, or exit if invalid.
+    """
+    result = {}
+    for sub in subs:
+        try:
+            key, val = sub.split("=", 1)
+            if not key:
+                print("Invalid substitution %s: empty key" % sub)
+                sys.exit(1)
+            if not val:
+                print("Invalid substitution %s: empty value" % sub)
+                sys.exit(1)
+            result[key] = val
+        except ValueError:
+            print("Invalid substitution %s: equal sign not found" % sub)
+            sys.exit(1)
+    return result
+
+
+def get_argparse():
+    """ Return a littlecheck argument parser. """
+    parser = argparse.ArgumentParser(
+        description="littlecheck: command line tool tester."
+    )
+    parser.add_argument(
+        "-s",
+        "--substitute",
+        type=str,
+        help="Add a new substitution for RUN lines. Example: bash=/bin/bash",
+        action="append",
+        default=[],
+    )
+    parser.add_argument("file", nargs="+", help="File to check")
+    return parser
+
+
+def main():
+    args = get_argparse().parse_args()
+    # Default substitution is %% -> %
+    def_subs = {"%": "%"}
+    def_subs.update(parse_subs(args.substitute))
+
+    success = True
+    config = Config()
+    config.colorize = sys.stdout.isatty()
+    for path in args.file:
+        subs = def_subs.copy()
+        subs["s"] = path
+        if not check_path(path, subs, config, TestFailure.print_message):
+            success = False
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()

From fcf0593dfb54b63598cc6c5ca9fa4b525e191e3b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 9 Jun 2019 11:13:31 -0700
Subject: [PATCH 0717/1732] Port printf tests to littlecheck and teach the
 tester how to run it

This adds support for .check files inside the tests directory. .check
files are tests designed to be run with littlecheck.

Port printf test to littlecheck and remove the printf.in test.
---
 cmake/Tests.cmake                       |  3 ++
 tests/{printf.in => checks/printf.fish} | 50 ++++++++++++++++++++++---
 tests/printf.err                        |  3 --
 tests/printf.out                        | 29 --------------
 tests/test.fish                         | 22 +++++++++--
 5 files changed, 66 insertions(+), 41 deletions(-)
 rename tests/{printf.in => checks/printf.fish} (72%)
 delete mode 100644 tests/printf.err
 delete mode 100644 tests/printf.out

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 7b398744e..7c78ab6f4 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -26,6 +26,9 @@ IF(NOT FISH_IN_TREE_BUILD)
     ADD_DEPENDENCIES(fish_tests tests_dir)
 ENDIF()
 
+# Copy littlecheck.py
+CONFIGURE_FILE(build_tools/littlecheck.py littlecheck.py COPYONLY)
+
 # Create the 'test' target.
 # Set a policy so CMake stops complaining about the name 'test'.
 CMAKE_POLICY(PUSH)
diff --git a/tests/printf.in b/tests/checks/printf.fish
similarity index 72%
rename from tests/printf.in
rename to tests/checks/printf.fish
index d7174253e..16677f5ce 100644
--- a/tests/printf.in
+++ b/tests/checks/printf.fish
@@ -1,31 +1,53 @@
+# RUN: %fish %s
+
 printf "Hello %d %i %f %F %g %G\n" 1 2 3 4 5 6
+# CHECK: Hello 1 2 3.000000 4.000000 5 6
 
 printf "%x %X %o %llu\n" 10 11 8 -1
+# CHECK: a B 10 18446744073709551615
+
 # %a has OS-dependent output - see #1139
 #printf "%a %A\n" 14 15
 
 printf "%c %s\n" a hello
+# CHECK: a hello
+
 printf "%c%c%c\n" hello … o
+# CHECK: h…o
+
 printf "%e %E\n" 5 6
+# CHECK: 5.000000e+00 6.000000E+00
 
 printf "%20d\n" 50
+# CHECK:                   50
+
 printf "%-20d%d\n" 5 10
+# CHECK: 5                   10
 
 printf "%*d\n" 10 100
+# CHECK:       100
 
 printf "%%\"\\\n"
 printf "%s\b%s\n" x y
-printf "abc\rdef\n"
-printf "Msg1\fMsg2\n"
-printf "foo\vbar\vbaz\n"
-printf "\111 \x50 \u0051 \U00000052"
+# CHECK: %"\nxy
 
+printf "abc\rdef\n"
+# CHECK: abc{{\r}}def
+
+printf "Msg1\fMsg2\n"
+# CHECK: Msg1{{\f}}Msg2
+
+printf "foo\vbar\vbaz\n"
+# CHECK: foobarbaz
+
+printf "\111 \x50 \u0051 \U00000052"
 echo
-echo "Test escapes"
+# CHECK: I P Q R
 
 # \c escape means "stop printing"
 printf 'a\cb'
 echo
+# CHECK: a
 
 # Bogus printf specifier, should produce no stdout
 printf "%5" 10 2>/dev/null
@@ -33,12 +55,18 @@ printf "%5" 10 2>/dev/null
 # Octal escapes produce literal bytes, not characters
 # \376 is 0xFE
 printf '\376' | display_bytes
+# CHECK: 0000000 376
+# CHECK: 0000001
 
 # Verify that floating point conversions and output work correctly with
 # different combinations of locales and floating point strings. See issue
 # #3334. This starts by assuming an locale using english conventions.
 printf '%e\n' "1.23"  # should succeed, output should be 1.230000e+00
+# CHECK: 1.230000e+00
+
 printf '%e\n' "2,34"  # should fail
+# CHECK: 2.000000e+00
+# CHECKERR: 2,34: value not completely converted
 
 # Try to use one of several locales that use a comma as the decimal mark
 # rather than the period used in english speaking locales. If we don't find
@@ -63,16 +91,28 @@ else
     echo '3,450000e+00'
     echo '4,560000e+00'
 end
+# CHECK: 3,450000e+00
+# CHECK: 4,560000e+00
 
 # Verify long long ints are handled correctly. See issue #3352.
 printf 'long hex1 %x\n' 498216206234
+# CHECK: long hex1 73ffffff9a
 printf 'long hex2 %X\n' 498216206234
+# CHECK: long hex2 73FFFFFF9A
 printf 'long hex3 %X\n' 0xABCDEF1234567890
+# CHECK: long hex3 ABCDEF1234567890
 printf 'long hex4 %X\n' 0xABCDEF12345678901
+# CHECKERR: 0xABCDEF12345678901: Number out of range
 printf 'long decimal %d\n' 498216206594
+# CHECK: long hex4 long decimal 498216206594
 printf 'long signed %d\n' -498216206595
+# CHECK: long signed -498216206595
 printf 'long signed to unsigned %u\n' -498216206596
+# CHECK: long signed to unsigned 18446743575493345020
 
 # Verify numeric conversion still happens even if it couldn't be fully converted
 printf '%d\n' 15.1
+# CHECK: 15
+# CHECKERR: 15.1: value not completely converted
 echo $status
+# CHECK: 1
diff --git a/tests/printf.err b/tests/printf.err
deleted file mode 100644
index d8d4de233..000000000
--- a/tests/printf.err
+++ /dev/null
@@ -1,3 +0,0 @@
-2,34: value not completely converted
-0xABCDEF12345678901: Number out of range
-15.1: value not completely converted
diff --git a/tests/printf.out b/tests/printf.out
deleted file mode 100644
index 40f19f791..000000000
--- a/tests/printf.out
+++ /dev/null
@@ -1,29 +0,0 @@
-Hello 1 2 3.000000 4.000000 5 6
-a B 10 18446744073709551615
-a hello
-h…o
-5.000000e+00 6.000000E+00
-                  50
-5                   10
-       100
-%"\nxy
-abc
def
-Msg1Msg2
-foobarbaz
-I P Q R
-Test escapes
-a
-0000000 376
-0000001
-1.230000e+00
-2.000000e+00
-3,450000e+00
-4,560000e+00
-long hex1 73ffffff9a
-long hex2 73FFFFFF9A
-long hex3 ABCDEF1234567890
-long hex4 long decimal 498216206594
-long signed -498216206595
-long signed to unsigned 18446743575493345020
-15
-1
diff --git a/tests/test.fish b/tests/test.fish
index 62025fe0d..62e929794 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -15,7 +15,7 @@ cd (dirname (status -f))
 if set -q argv[1]
     set files_to_test $argv.in
 else
-    set files_to_test *.in
+    set files_to_test *.in checks/*.fish
 end
 
 # These env vars should not be inherited from the user environment because they can affect the
@@ -29,7 +29,7 @@ or exit
 
 say -o cyan "Testing high level script functionality"
 
-function test_file
+function test_in_file
     set -l file $argv[1]
     set -l base (basename $file .in)
 
@@ -69,10 +69,24 @@ function test_file
     end
 end
 
+function test_littlecheck_file
+    set -l file $argv[1]
+    echo "Testing file $file"
+    ../littlecheck.py -s fish=../test/root/bin/fish $file
+end
+
 set -l failed
 for i in $files_to_test
-    if not test_file $i
-        set failed $failed $i
+    if string match --quiet '*.fish' $i
+        if not test_littlecheck_file $i
+            # littlecheck test
+            set failed $failed $i
+        end
+    else
+        # .in test
+        if not test_in_file $i
+            set failed $failed $i
+        end
     end
 end
 

From 5b5887ea99b7c7d574e2d11d8436516920f6f2b2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 16 Jun 2019 14:38:27 -0700
Subject: [PATCH 0718/1732] Correct capitalization of complete_and_search

---
 src/input.cpp      | 2 +-
 src/input_common.h | 2 +-
 src/reader.cpp     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index d490fd07e..3ee10e3dc 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -89,7 +89,7 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::yank, L"yank"},
     {readline_cmd_t::yank_POP, L"yank-pop"},
     {readline_cmd_t::complete, L"complete"},
-    {readline_cmd_t::complete_AND_SEARCH, L"complete-and-search"},
+    {readline_cmd_t::complete_and_search, L"complete-and-search"},
     {readline_cmd_t::pager_toggle_search, L"pager-toggle-search"},
     {readline_cmd_t::beginning_of_history, L"beginning-of-history"},
     {readline_cmd_t::end_of_history, L"end-of-history"},
diff --git a/src/input_common.h b/src/input_common.h
index 2169ffe62..6f261242d 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -25,7 +25,7 @@ enum class readline_cmd_t {
     yank,
     yank_POP,
     complete,
-    complete_AND_SEARCH,
+    complete_and_search,
     pager_toggle_search,
     beginning_of_history,
     end_of_history,
diff --git a/src/reader.cpp b/src/reader.cpp
index ba4e5c4bd..43ee6f0a2 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1015,7 +1015,7 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
             return true;
         }
         case rl::complete:
-        case rl::complete_AND_SEARCH:
+        case rl::complete_and_search:
         case rl::backward_char:
         case rl::forward_char:
         case rl::up_line:
@@ -2490,7 +2490,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             break;
         }
         case rl::complete:
-        case rl::complete_AND_SEARCH: {
+        case rl::complete_and_search: {
             if (!complete_func) break;
 
             // Use the command line only; it doesn't make sense to complete in any other line.
@@ -2562,11 +2562,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 cycle_command_line = el->text;
                 cycle_cursor_pos = el->position;
 
-                bool cont_after_prefix_insertion = (c == rl::complete_AND_SEARCH);
+                bool cont_after_prefix_insertion = (c == rl::complete_and_search);
                 rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
 
                 // Show the search field if requested and if we printed a list of completions.
-                if (c == rl::complete_AND_SEARCH && !rls.comp_empty && !pager.empty()) {
+                if (c == rl::complete_and_search && !rls.comp_empty && !pager.empty()) {
                     pager.set_search_field_shown(true);
                     select_completion_in_direction(selection_motion_t::next);
                     reader_repaint_needed();

From b41e5cbbb7bb5918e3735dec629c86be6ed49e8a Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sat, 15 Jun 2019 22:30:31 -0700
Subject: [PATCH 0719/1732] Add string collect

The `string collect` subcommand behaves quite similarly in practice to
`string split0 -m 0` in that it doesn't split its output, but it also
takes an optional `--trim-newline` flag to trim a single trailing
newline off of the output.

See issue #159.
---
 CHANGELOG.md                   |  1 +
 share/completions/string.fish  |  4 +++-
 sphinx_doc_src/cmds/string.rst | 29 ++++++++++++++++++++++++++++
 src/builtin_string.cpp         | 35 +++++++++++++++++++++++++++++++---
 tests/string.err               |  6 ++++++
 tests/string.in                | 27 ++++++++++++++++++++++++++
 tests/string.out               | 34 +++++++++++++++++++++++++++++++++
 7 files changed, 132 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02a86507d..0fc752dd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
 - `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
+- `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing newlines, such as `set contents (cat filename | string collect)`. It also supports a `--trim-newline` flag to trim a single trailing newline from the output (#159).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/share/completions/string.fish b/share/completions/string.fish
index 890abf870..016c39d9a 100644
--- a/share/completions/string.fish
+++ b/share/completions/string.fish
@@ -1,7 +1,7 @@
 # Completion for builtin string
 # This follows a strict command-then-options approach, so we can just test the number of tokens
 complete -f -c string
-complete -f -c string -n "test (count (commandline -opc)) -ge 2; and not contains -- (commandline -opc)[2] escape" -s q -l quiet -d "Do not print output"
+complete -f -c string -n "test (count (commandline -opc)) -ge 2; and not contains -- (commandline -opc)[2] escape collect" -s q -l quiet -d "Do not print output"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "lower"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "upper"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "length"
@@ -13,6 +13,8 @@ complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "split0"
 complete -x -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s m -l max -a "(seq 1 10)" -d "Specify maximum number of splits"
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s r -l right -d "Split right-to-left"
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s n -l no-empty -d "Empty results excluded"
+complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "collect"
+complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr collect\$ -- (commandline -opc)[2]' -s n -l trim-newline -d "Remove trailing newline"
 
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join0"
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 1761673d1..5b68ce84e 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -6,6 +6,8 @@ string - manipulate strings
 Synopsis
 --------
 
+``string collect [(-n | --trim-newline)] [STRING...]``
+
 ``string escape [(-n | --no-quoted)] [--style=xxx] [STRING...]``
 
 ``string join [(-q | --quiet)] SEP [STRING...]``
@@ -48,6 +50,17 @@ Most subcommands accept a ``-q`` or ``--quiet`` switch, which suppresses the usu
 
 The following subcommands are available.
 
+"collect" subcommand
+--------------------
+
+``string collect [(-n | --trim-newline)] [STRING...]``
+
+``string collect`` collects its input into a single output argument, without splitting the output when used in a command substitution. This is useful when trying to collect multiline output from another command into a variable. Exit status: 0 if any output argument is non-empty, or 1 otherwise.
+
+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``.
+
+``--trim-newline`` trims a single trailing newline off of each output argument. This is useful when collecting the output from another command as the trailing newline is frequently not desired.
+
 "escape" and "unescape" subcommands
 -----------------------------------
 
@@ -329,6 +342,22 @@ Examples
     a1_20b2__c_E6_85_A1
 
 
+
+
+::
+
+    >_ echo \"(echo one\ntwo\nthree | string collect)\"
+    "one
+    two
+    three
+    "
+    
+    >_ echo \"(ech one\ntwo\nthree | string collect -n)\"
+    "one
+    two
+    three"
+
+
 Match Glob Examples
 -------------------
 
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index d35cb276c..7a581c8a7 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -157,6 +157,7 @@ typedef struct {  //!OCLINT(too many fields)
     bool start_valid = false;
     bool style_valid = false;
     bool no_empty_valid = false;
+    bool trim_newline_valid = false;
 
     bool all = false;
     bool entire = false;
@@ -171,6 +172,7 @@ typedef struct {  //!OCLINT(too many fields)
     bool regex = false;
     bool right = false;
     bool no_empty = false;
+    bool trim_newline = false;
 
     long count = 0;
     long length = 0;
@@ -330,6 +332,9 @@ static int handle_flag_n(wchar_t **argv, parser_t &parser, io_streams_t &streams
     } else if (opts->no_empty_valid) {
         opts->no_empty = true;
         return STATUS_CMD_OK;
+    } else if (opts->trim_newline_valid) {
+        opts->trim_newline = true;
+        return STATUS_CMD_OK;
     }
     string_unknown_option(parser, streams, argv[0], argv[w.woptind - 1]);
     return STATUS_INVALID_ARGS;
@@ -408,12 +413,13 @@ static wcstring construct_short_opts(options_t *opts) {  //!OCLINT(high npath co
     if (opts->right_valid) short_opts.append(L"r");
     if (opts->start_valid) short_opts.append(L"s:");
     if (opts->no_empty_valid) short_opts.append(L"n");
+    if (opts->trim_newline_valid) short_opts.append(L"n");
     return short_opts;
 }
 
 // Note that several long flags share the same short flag. That is okay. The caller is expected
 // to indicate that a max of one of the long flags sharing a short flag is valid.
-// Remember: adjust share/functions/string.fish when `string` options change
+// Remember: adjust share/completions/string.fish when `string` options change
 static const struct woption long_options[] = {
     {L"all", no_argument, NULL, 'a'},         {L"chars", required_argument, NULL, 'c'},
     {L"count", required_argument, NULL, 'n'}, {L"entire", no_argument, NULL, 'e'},
@@ -424,7 +430,8 @@ static const struct woption long_options[] = {
     {L"no-newline", no_argument, NULL, 'N'},  {L"no-quoted", no_argument, NULL, 'n'},
     {L"quiet", no_argument, NULL, 'q'},       {L"regex", no_argument, NULL, 'r'},
     {L"right", no_argument, NULL, 'r'},       {L"start", required_argument, NULL, 's'},
-    {L"style", required_argument, NULL, 1},   {NULL, 0, NULL, 0}};
+    {L"style", required_argument, NULL, 1},   {L"trim-newline", no_argument, NULL, 'n'},
+    {NULL, 0, NULL, 0}};
 
 static const std::unordered_map<char, decltype(*handle_flag_N)> flag_to_function = {
     {'N', handle_flag_N}, {'a', handle_flag_a}, {'c', handle_flag_c}, {'e', handle_flag_e},
@@ -1125,6 +1132,27 @@ static int string_split0(parser_t &parser, io_streams_t &streams, int argc, wcha
     return string_split_maybe0(parser, streams, argc, argv, true /* is_split0 */);
 }
 
+static int string_collect(parser_t &parser, io_streams_t &streams, int argc, wchar_t **argv) {
+    options_t opts;
+    opts.trim_newline_valid = true;
+    int optind;
+    int retval = parse_opts(&opts, &optind, 0, argc, argv, parser, streams);
+    if (retval != STATUS_CMD_OK) return retval;
+
+    auto &buff = streams.out.buffer();
+    arg_iterator_t aiter(argv, optind, streams, /* don't split */ false);
+    while (const wcstring *arg = aiter.nextstr()) {
+        auto end = arg->cend();
+        if (opts.trim_newline && !arg->empty() && arg->back() == L'\n') {
+            --end;
+        }
+
+        buff.append(arg->cbegin(), end, separation_type_t::explicitly);
+    }
+
+    return buff.size() > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR;
+}
+
 // Helper function to abstract the repeat logic from string_repeat
 // returns the to_repeat string, repeated count times.
 static wcstring wcsrepeat(const wcstring &to_repeat, size_t count) {
@@ -1305,7 +1333,8 @@ string_subcommands[] = {
     {L"length", &string_length}, {L"match", &string_match},       {L"replace", &string_replace},
     {L"split", &string_split},   {L"split0", &string_split0},     {L"sub", &string_sub},
     {L"trim", &string_trim},     {L"lower", &string_lower},       {L"upper", &string_upper},
-    {L"repeat", &string_repeat}, {L"unescape", &string_unescape}, {NULL, NULL}};
+    {L"repeat", &string_repeat}, {L"unescape", &string_unescape}, {L"collect", &string_collect},
+    {NULL, NULL}};
 
 /// The string builtin, for manipulating strings.
 int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
diff --git a/tests/string.err b/tests/string.err
index 478007e2d..9718fd86c 100644
--- a/tests/string.err
+++ b/tests/string.err
@@ -309,3 +309,9 @@ string repeat: Unknown option '-l'
 
 ####################
 # string split0 in functions
+
+####################
+# string collect
+
+####################
+# string collect in functions
diff --git a/tests/string.in b/tests/string.in
index 7bb386d0e..b4f324023 100644
--- a/tests/string.in
+++ b/tests/string.in
@@ -392,4 +392,31 @@ function dualsplit
 end
 count (dualsplit)
 
+logmsg string collect
+count (echo one\ntwo\nthree\nfour | string collect)
+count (echo one | string collect)
+echo [(echo one\ntwo\nthree | string collect)]
+echo [(echo one\ntwo\nthree | string collect -n)]
+printf '[%s]\n' (string collect one\n\n two\n)
+printf '[%s]\n' (string collect -n one\n\n two\n)
+printf '[%s]\n' (string collect --trim-newline one\n\n two\n)
+# string collect returns 0 when it has any output, otherwise 1
+string collect >/dev/null; and echo unexpected success; or echo expected failure
+echo -n | string collect >/dev/null; and echo unexpected success; or echo expected failure
+echo | string collect >/dev/null; and echo expected success; or echo unexpected failure
+echo | string collect -n >/dev/null; and echo unexpected success; or echo expected failure
+string collect a >/dev/null; and echo expected success; or echo unexpected failure
+string collect '' >/dev/null; and echo unexpected success; or echo expected failure
+string collect -n \n >/dev/null; and echo unexpected success; or echo expected failure
+
+logmsg string collect in functions
+# This function outputs some newline-separated content, and some
+# explicitly un-separated content.
+function dualcollect
+  echo alpha
+  echo beta
+  echo gamma\ndelta\nomega | string collect
+end
+count (dualcollect)
+
 exit 0
diff --git a/tests/string.out b/tests/string.out
index bdd0cb568..ecbe5ef1d 100644
--- a/tests/string.out
+++ b/tests/string.out
@@ -483,3 +483,37 @@ Split something
 ####################
 # string split0 in functions
 4
+
+####################
+# string collect
+1
+1
+[one
+two
+three
+]
+[one
+two
+three]
+[one
+
+]
+[two
+]
+[one
+]
+[two]
+[one
+]
+[two]
+expected failure
+expected failure
+expected success
+expected failure
+expected success
+expected failure
+expected failure
+
+####################
+# string collect in functions
+3

From 181e44d331a73b6c653810aec5802dcac199dfc5 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sun, 16 Jun 2019 16:40:14 -0700
Subject: [PATCH 0720/1732] Invert the flag for `string collect`

Instead of requiring a flag to enable newline trimming, invert it so the
flag (now `--no-trim-newlines`) disables newline trimming. This way our
default behavior matches that of sh's `"$(cmd)"`.

Also change newline trimming to trim all newlines instead of just one,
again to match sh's behavior.
---
 CHANGELOG.md                   |  2 +-
 share/completions/string.fish  |  2 +-
 sphinx_doc_src/cmds/string.rst |  8 ++++----
 src/builtin_string.cpp         | 26 ++++++++++++++------------
 tests/string.in                | 14 +++++++-------
 tests/string.out               | 13 +++++++------
 6 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc752dd8..376957df6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
 - `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
-- `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing newlines, such as `set contents (cat filename | string collect)`. It also supports a `--trim-newline` flag to trim a single trailing newline from the output (#159).
+- `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/share/completions/string.fish b/share/completions/string.fish
index 016c39d9a..ffe2ff4b2 100644
--- a/share/completions/string.fish
+++ b/share/completions/string.fish
@@ -14,7 +14,7 @@ complete -x -c string -n 'test (count (commandline -opc)) -ge 2; and string matc
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s r -l right -d "Split right-to-left"
 complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s n -l no-empty -d "Empty results excluded"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "collect"
-complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr collect\$ -- (commandline -opc)[2]' -s n -l trim-newline -d "Remove trailing newline"
+complete -f -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr collect\$ -- (commandline -opc)[2]' -s N -l no-trim-newlines -d "Don't trim trailing newlines"
 
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join0"
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 5b68ce84e..16478d5a8 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -6,7 +6,7 @@ string - manipulate strings
 Synopsis
 --------
 
-``string collect [(-n | --trim-newline)] [STRING...]``
+``string collect [(-N | --no-trim-newlines)] [STRING...]``
 
 ``string escape [(-n | --no-quoted)] [--style=xxx] [STRING...]``
 
@@ -53,13 +53,13 @@ The following subcommands are available.
 "collect" subcommand
 --------------------
 
-``string collect [(-n | --trim-newline)] [STRING...]``
+``string collect [(-N | --no-trim-newlines)] [STRING...]``
 
 ``string collect`` collects its input into a single output argument, without splitting the output when used in a command substitution. This is useful when trying to collect multiline output from another command into a variable. Exit status: 0 if any output argument is non-empty, or 1 otherwise.
 
 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``.
 
-``--trim-newline`` trims a single trailing newline off of each output argument. This is useful when collecting the output from another command as the trailing newline is frequently not desired.
+Any trailing newlines on the input are trimmed, just as with ``"$(cmd)"`` substitution in sh. ``--no-trim-newlines`` can be used to disable this behavior, which may be useful when running a command such as ``set contents (cat filename | string collect -N)``.
 
 "escape" and "unescape" subcommands
 -----------------------------------
@@ -352,7 +352,7 @@ Examples
     three
     "
     
-    >_ echo \"(ech one\ntwo\nthree | string collect -n)\"
+    >_ echo \"(echo one\ntwo\nthree | string collect -N)\"
     "one
     two
     three"
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 7a581c8a7..84f64a23f 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -157,7 +157,7 @@ typedef struct {  //!OCLINT(too many fields)
     bool start_valid = false;
     bool style_valid = false;
     bool no_empty_valid = false;
-    bool trim_newline_valid = false;
+    bool no_trim_newlines_valid = false;
 
     bool all = false;
     bool entire = false;
@@ -172,7 +172,7 @@ typedef struct {  //!OCLINT(too many fields)
     bool regex = false;
     bool right = false;
     bool no_empty = false;
-    bool trim_newline = false;
+    bool no_trim_newlines = false;
 
     long count = 0;
     long length = 0;
@@ -216,6 +216,9 @@ static int handle_flag_N(wchar_t **argv, parser_t &parser, io_streams_t &streams
     if (opts->no_newline_valid) {
         opts->no_newline = true;
         return STATUS_CMD_OK;
+    } else if (opts->no_trim_newlines_valid) {
+        opts->no_trim_newlines = true;
+        return STATUS_CMD_OK;
     }
     string_unknown_option(parser, streams, argv[0], argv[w.woptind - 1]);
     return STATUS_INVALID_ARGS;
@@ -332,9 +335,6 @@ static int handle_flag_n(wchar_t **argv, parser_t &parser, io_streams_t &streams
     } else if (opts->no_empty_valid) {
         opts->no_empty = true;
         return STATUS_CMD_OK;
-    } else if (opts->trim_newline_valid) {
-        opts->trim_newline = true;
-        return STATUS_CMD_OK;
     }
     string_unknown_option(parser, streams, argv[0], argv[w.woptind - 1]);
     return STATUS_INVALID_ARGS;
@@ -413,7 +413,7 @@ static wcstring construct_short_opts(options_t *opts) {  //!OCLINT(high npath co
     if (opts->right_valid) short_opts.append(L"r");
     if (opts->start_valid) short_opts.append(L"s:");
     if (opts->no_empty_valid) short_opts.append(L"n");
-    if (opts->trim_newline_valid) short_opts.append(L"n");
+    if (opts->no_trim_newlines_valid) short_opts.append(L"N");
     return short_opts;
 }
 
@@ -430,7 +430,7 @@ static const struct woption long_options[] = {
     {L"no-newline", no_argument, NULL, 'N'},  {L"no-quoted", no_argument, NULL, 'n'},
     {L"quiet", no_argument, NULL, 'q'},       {L"regex", no_argument, NULL, 'r'},
     {L"right", no_argument, NULL, 'r'},       {L"start", required_argument, NULL, 's'},
-    {L"style", required_argument, NULL, 1},   {L"trim-newline", no_argument, NULL, 'n'},
+    {L"style", required_argument, NULL, 1},   {L"no-trim-newlines", no_argument, NULL, 'N'},
     {NULL, 0, NULL, 0}};
 
 static const std::unordered_map<char, decltype(*handle_flag_N)> flag_to_function = {
@@ -1134,7 +1134,7 @@ static int string_split0(parser_t &parser, io_streams_t &streams, int argc, wcha
 
 static int string_collect(parser_t &parser, io_streams_t &streams, int argc, wchar_t **argv) {
     options_t opts;
-    opts.trim_newline_valid = true;
+    opts.no_trim_newlines_valid = true;
     int optind;
     int retval = parse_opts(&opts, &optind, 0, argc, argv, parser, streams);
     if (retval != STATUS_CMD_OK) return retval;
@@ -1142,12 +1142,14 @@ static int string_collect(parser_t &parser, io_streams_t &streams, int argc, wch
     auto &buff = streams.out.buffer();
     arg_iterator_t aiter(argv, optind, streams, /* don't split */ false);
     while (const wcstring *arg = aiter.nextstr()) {
-        auto end = arg->cend();
-        if (opts.trim_newline && !arg->empty() && arg->back() == L'\n') {
-            --end;
+        auto begin = arg->cbegin(), end = arg->cend();
+        if (!opts.no_trim_newlines) {
+            while (end > begin && *(end-1) == L'\n') {
+                --end;
+            }
         }
 
-        buff.append(arg->cbegin(), end, separation_type_t::explicitly);
+        buff.append(begin, end, separation_type_t::explicitly);
     }
 
     return buff.size() > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR;
diff --git a/tests/string.in b/tests/string.in
index b4f324023..dc07edbff 100644
--- a/tests/string.in
+++ b/tests/string.in
@@ -396,18 +396,18 @@ logmsg string collect
 count (echo one\ntwo\nthree\nfour | string collect)
 count (echo one | string collect)
 echo [(echo one\ntwo\nthree | string collect)]
-echo [(echo one\ntwo\nthree | string collect -n)]
+echo [(echo one\ntwo\nthree | string collect -N)]
 printf '[%s]\n' (string collect one\n\n two\n)
-printf '[%s]\n' (string collect -n one\n\n two\n)
-printf '[%s]\n' (string collect --trim-newline one\n\n two\n)
+printf '[%s]\n' (string collect -N one\n\n two\n)
+printf '[%s]\n' (string collect --no-trim-newlines one\n\n two\n)
 # string collect returns 0 when it has any output, otherwise 1
 string collect >/dev/null; and echo unexpected success; or echo expected failure
 echo -n | string collect >/dev/null; and echo unexpected success; or echo expected failure
-echo | string collect >/dev/null; and echo expected success; or echo unexpected failure
-echo | string collect -n >/dev/null; and echo unexpected success; or echo expected failure
+echo | string collect -N >/dev/null; and echo expected success; or echo unexpected failure
+echo | string collect >/dev/null; and echo unexpected success; or echo expected failure
 string collect a >/dev/null; and echo expected success; or echo unexpected failure
-string collect '' >/dev/null; and echo unexpected success; or echo expected failure
-string collect -n \n >/dev/null; and echo unexpected success; or echo expected failure
+string collect -N '' >/dev/null; and echo unexpected success; or echo expected failure
+string collect \n\n >/dev/null; and echo unexpected success; or echo expected failure
 
 logmsg string collect in functions
 # This function outputs some newline-separated content, and some
diff --git a/tests/string.out b/tests/string.out
index ecbe5ef1d..e758c67bf 100644
--- a/tests/string.out
+++ b/tests/string.out
@@ -490,22 +490,23 @@ Split something
 1
 [one
 two
-three
-]
+three]
 [one
 two
-three]
+three
+]
+[one]
+[two]
 [one
 
 ]
 [two
 ]
 [one
+
 ]
-[two]
-[one
+[two
 ]
-[two]
 expected failure
 expected failure
 expected success

From ad1d81a090113e94e354ff5ecc65d9f9c849e908 Mon Sep 17 00:00:00 2001
From: yogendra <yogendra.sharma@intelizign.com>
Date: Mon, 17 Jun 2019 17:25:59 +0530
Subject: [PATCH 0721/1732] Fix5910 documentation update

---
 sphinx_doc_src/cmds/fish.rst            | 2 +-
 sphinx_doc_src/cmds/fish_indent.rst     | 2 +-
 sphinx_doc_src/cmds/fish_key_reader.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index f3a2dbaca..db2dd60db 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -20,7 +20,7 @@ The following options are available:
 
 - ``-C`` or ``--init-command=COMMANDS`` evaluate the specified commands after reading the configuration, before running the command specified by ``-c`` or reading interactive input
 
-- ``-d`` or ``--debug-level=DEBUG_LEVEL`` specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
+- ``-d`` or ``--debug=DEBUG_LEVEL`` specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
 
 - ``-o`` or ``--debug-output=path`` Specify a file path to receive the debug output. The default is stderr.
 
diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/sphinx_doc_src/cmds/fish_indent.rst
index f5f7cdc0e..0049f84f3 100644
--- a/sphinx_doc_src/cmds/fish_indent.rst
+++ b/sphinx_doc_src/cmds/fish_indent.rst
@@ -26,7 +26,7 @@ The following options are available:
 
 - ``--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-level=DEBUG_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
+- ``-d`` or ``--debug=DEBUG_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
 
diff --git a/sphinx_doc_src/cmds/fish_key_reader.rst b/sphinx_doc_src/cmds/fish_key_reader.rst
index 265aa6ab3..83869cf68 100644
--- a/sphinx_doc_src/cmds/fish_key_reader.rst
+++ b/sphinx_doc_src/cmds/fish_key_reader.rst
@@ -20,7 +20,7 @@ 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.
 
-- ``-d`` or ``--debug-level=DEBUG_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
+- ``-d`` or ``--debug=DEBUG_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
 

From 9b9c6e312c4f8790fabef09e065232b33df5229a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 17 Jun 2019 09:07:43 -0700
Subject: [PATCH 0722/1732] Improve the docs from DEBUG_LEVEL to CATEGORY_GLOB

This stuff still isn't documented properly.
---
 sphinx_doc_src/cmds/fish.rst            | 2 +-
 sphinx_doc_src/cmds/fish_indent.rst     | 2 +-
 sphinx_doc_src/cmds/fish_key_reader.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index db2dd60db..177e781b9 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -20,7 +20,7 @@ The following options are available:
 
 - ``-C`` or ``--init-command=COMMANDS`` evaluate the specified commands after reading the configuration, before running the command specified by ``-c`` or reading interactive input
 
-- ``-d`` or ``--debug=DEBUG_LEVEL`` specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
+- ``-d`` or ``--debug=CATEGORY_GLOB`` enables debug output and specifies a glob for matching debug categories (like ``fish -d``). Defaults to empty.
 
 - ``-o`` or ``--debug-output=path`` Specify a file path to receive the debug output. The default is stderr.
 
diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/sphinx_doc_src/cmds/fish_indent.rst
index 0049f84f3..73919a5b6 100644
--- a/sphinx_doc_src/cmds/fish_indent.rst
+++ b/sphinx_doc_src/cmds/fish_indent.rst
@@ -26,7 +26,7 @@ The following options are available:
 
 - ``--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_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
+- ``-d`` or ``--debug=CATEGORY_GLOB`` enables debug output and specifies a glob for matching debug categories (like ``fish -d``). Defaults to empty.
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
 
diff --git a/sphinx_doc_src/cmds/fish_key_reader.rst b/sphinx_doc_src/cmds/fish_key_reader.rst
index 83869cf68..7d5e4d3d1 100644
--- a/sphinx_doc_src/cmds/fish_key_reader.rst
+++ b/sphinx_doc_src/cmds/fish_key_reader.rst
@@ -20,7 +20,7 @@ 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.
 
-- ``-d`` or ``--debug=DEBUG_LEVEL`` enables debug output and specifies a verbosity level (like ``fish -d``). Defaults to 0.
+- ``-d`` or ``--debug=CATEGORY_GLOB`` enables debug output and specifies a glob for matching debug categories (like ``fish -d``). Defaults to empty.
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
 

From 370f5356a1103d84fff194c6192912bb42fa985d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 19 Jun 2019 12:34:16 +0200
Subject: [PATCH 0723/1732] Move "character has no narrow representation" to
 flog

This was a warning, which is kind of ridiculous, as it's inactionable
error spew.

Fixes #2815.
---
 src/common.cpp | 4 ++--
 src/flog.h     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 1a7c7aa89..3d418657d 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -414,7 +414,7 @@ std::string wcs2string(const wcstring &input) {
             std::memset(converted, 0, sizeof converted);
             size_t len = std::wcrtomb(converted, wc, &state);
             if (len == (size_t)-1) {
-                debug(1, L"Wide character U+%4X has no narrow representation", wc);
+                FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation", wc);
                 std::memset(&state, 0, sizeof(state));
             } else {
                 result.append(converted, len);
@@ -452,7 +452,7 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
         } else {
             size_t len = std::wcrtomb(&out[out_pos], in[in_pos], &state);
             if (len == (size_t)-1) {
-                debug(1, L"Wide character U+%4X has no narrow representation", in[in_pos]);
+                FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation", in[in_pos]);
                 std::memset(&state, 0, sizeof(state));
             } else {
                 out_pos += len;
diff --git a/src/flog.h b/src/flog.h
index 56d70038a..0a97e55fb 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -71,6 +71,7 @@ class category_list_t {
     category_t env_export{L"env-export", L"Changes to exported variables"};
 
     category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
+    category_t char_encoding{L"char-encoding", L"Character encoding issues"};
 };
 
 /// The class responsible for logging.

From 6c05005f0f9acc75e7fe4df77a7fd09c0706eed6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 19 Jun 2019 12:56:01 +0200
Subject: [PATCH 0724/1732] docs: Document indexing double-variable-expansion

Fixes #5886.

[ci skip]
---
 sphinx_doc_src/index.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index b9d80d7a5..63831cd16 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -969,6 +969,15 @@ However using variables as indices for command substitution is currently not sup
     set sequence (seq 5) # It needs to be written on two lines like this.
     echo $sequence[$index] # returns '2'
 
+When using indirect variable expansion with multiple `$` (``$$name``), you have to give all indices up to the variable you want to slice::
+
+    > set -l list 1 2 3 4 5
+    > set -l name list
+    > echo $$name[1]
+    1 2 3 4 5
+    > echo $$name[1..-1][1..3] # or $$name[1][1..3], since $name only has one element.
+    1 2 3
+
 .. _expand-home:
 
 Home directory expansion

From ae2c40ebdb15e3321687e95a14a11b15e214c651 Mon Sep 17 00:00:00 2001
From: infix <infix@github.com>
Date: Thu, 20 Jun 2019 13:54:30 +0200
Subject: [PATCH 0725/1732] Updated DNF auto completion

---
 share/completions/dnf.fish | 305 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 304 insertions(+), 1 deletion(-)

diff --git a/share/completions/dnf.fish b/share/completions/dnf.fish
index 63a427093..99c43b7e1 100644
--- a/share/completions/dnf.fish
+++ b/share/completions/dnf.fish
@@ -2,4 +2,307 @@
 # Completions for the dnf command
 #
 
-complete -c dnf -w yum
+function __dnf_list_installed_packages
+    dnf repoquery --cacheonly "$cur*" --qf "%{NAME}" --installed
+end
+
+function __dnf_list_available_packages
+    if type -q sqlite3
+        sqlite3 /var/cache/dnf/packages.db "SELECT pkg FROM available WHERE pkg LIKE \"$cur%\"" 2>/dev/null
+    end
+end
+
+function __dnf_list_transactions
+    if type -q sqlite3
+        sqlite3 /var/lib/dnf/history.sqlite "SELECT id, cmdline FROM trans" 2>/dev/null | string replace "|" \t
+    end
+end
+
+# Alias
+complete -c dnf -n "__fish_use_subcommand" -xa alias -d "Manage aliases"
+complete -c dnf -n "__fish_seen_subcommand_from alias" -xa add -d "Add a new alias"
+complete -c dnf -n "__fish_seen_subcommand_from alias" -xa list -d "Lists all defined aliases"
+complete -c dnf -n "__fish_seen_subcommand_from alias" -xa delete -d "Delete an alias"
+
+# Autoremove
+complete -c dnf -n "__fish_use_subcommand" -xa autoremove -d "Removes unneeded packages"
+complete -c dnf -n "__fish_seen_subcommand_from autoremove" -xa "(__dnf_list_installed_packages)"
+
+# Check
+complete -c dnf -n "__fish_use_subcommand" -xa check -d "Check for problems in packagedb"
+complete -c dnf -n "__fish_seen_subcommand_from check" -l dependencies -d "Checks dependencies"
+complete -c dnf -n "__fish_seen_subcommand_from check" -l duplicates -d "Checks duplicates"
+complete -c dnf -n "__fish_seen_subcommand_from check" -l obsoleted -d "Checks obsoleted"
+complete -c dnf -n "__fish_seen_subcommand_from check" -l provides -d "Checks provides"
+
+# Check-Update
+complete -c dnf -n "__fish_use_subcommand" -xa check-update -d "Checks for updates"
+complete -c dnf -n "__fish_seen_subcommand_from check-update" -l changelogs
+
+# Clean
+complete -c dnf -n "__fish_use_subcommand" -xa clean -d "Clean up cache directory"
+complete -c dnf -n "__fish_seen_subcommand_from clean" -xa dbcache -d "Removes the database cache"
+complete -c dnf -n "__fish_seen_subcommand_from clean" -xa expire-cache -d "Marks the repository metadata expired"
+complete -c dnf -n "__fish_seen_subcommand_from clean" -xa metadata -d "Removes repository metadata"
+complete -c dnf -n "__fish_seen_subcommand_from clean" -xa packages -d "Removes any cached packages"
+complete -c dnf -n "__fish_seen_subcommand_from clean" -xa all -d "Removes all cache"
+
+# Distro-sync
+complete -c dnf -n "__fish_use_subcommand" -xa distro-sync -d "Synchronizes packages to match the latest"
+
+# Downgrade
+complete -c dnf -n "__fish_use_subcommand" -xa downgrade -d "Downgrades the specified package"
+complete -c dnf -n "__fish_seen_subcommand_from downgrade" -xa "(__dnf_list_installed_packages)"
+
+# Group
+complete -c dnf -n "__fish_use_subcommand" -xa group -d "Manage groups"
+
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa summary -d "Display overview of installed and available groups"
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa info -d "Display package list of a group"
+# Group install
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa install -d "Install group"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from install" -l with-optional -d "Include optional packages"
+# Group list
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa list -d "List groups"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from list" -l installed -d "List installed groups"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from list" -l available -d "List available groups"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from list" -l hidden -d "List hidden groups"
+# Group remove
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa remove -d "Remove group"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from remove" -l with-optional -d "Include optional packages"
+
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa upgrade -d "Upgrade group"
+# Group mark
+complete -c dnf -n "__fish_seen_subcommand_from group; and not __fish_seen_subcommand_from mark" -xa mark -d "Marks group without manipulating packages"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from mark" -xa install -d "Mark group installed without installing packages"
+complete -c dnf -n "__fish_seen_subcommand_from group; and __fish_seen_subcommand_from mark" -xa remove -d "Mark group removed without removing packages"
+
+# Help
+complete -c dnf -n "__fish_use_subcommand" -xa help -d "Display help and exit"
+
+# History
+complete -c dnf -n "__fish_use_subcommand" -xa history -d "View and manage past transactions"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa list -d "Lists all transactions"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa info -d "Describe the given transactions"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa redo -d "Redoes the specified transaction"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa rollback -d "Undo all transactions performed after the specified transaction"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa undo -d "Undoes the specified transaction"
+complete -c dnf -n "__fish_seen_subcommand_from history" -xa userinstalled -d "Lists all user installed packages"
+
+for i in info redo rollback undo
+    complete -c dnf -n "__fish_seen_subcommand_from history; and  __fish_seen_subcommand_from $i" -xa "(__dnf_list_transactions)"
+end
+
+# Info
+complete -c dnf -n "__fish_use_subcommand" -xa info -d "Describes the given package"
+complete -c dnf -n "__fish_seen_subcommand_from info; and not __fish_seen_subcommand_from history" -xa "(__dnf_list_available_packages)"
+
+# Install
+complete -c dnf -n "__fish_use_subcommand" -xa install -d "Install package"
+complete -c dnf -n "__fish_seen_subcommand_from install" -xa "(__dnf_list_available_packages)"
+
+# List
+complete -c dnf -n "__fish_use_subcommand" -xa list -d "Lists all packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l all -d "Lists all packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l installed -d "Lists installed packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l available -d "Lists available packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l extras -d "Lists installed packages that are not in any known repository"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l obsoletes -d "List installed obsoleted packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l recent -d "List recently added packages"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l upgrades -d "List available upgrades"
+complete -c dnf -n "__fish_seen_subcommand_from list" -l autoremove -d "List packages which will be removed by autoremove"
+
+# Makecache
+complete -c dnf -n "__fish_use_subcommand" -xa makecache -d "Downloads and caches metadata for all known repos"
+complete -c dnf -n "__fish_seen_subcommand_from makecache" -l timer -d "Instructs DNF to be more resource-aware"
+
+# Mark
+complete -c dnf -n "__fish_use_subcommand" -xa mark -d "Mark packages"
+complete -c dnf -n "__fish_seen_subcommand_from mark" -xa install -d "Mark package installed"
+complete -c dnf -n "__fish_seen_subcommand_from mark" -xa remove -d "Unmarks installed package"
+complete -c dnf -n "__fish_seen_subcommand_from mark" -xa group -d "Mark installed by group"
+
+# Module
+complete -c dnf -n "__fish_use_subcommand" -xa module -d "Manage modules"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa install -d "Install module"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa update -d "Update modules"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa remove -d "Remove module"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa enable -d "Enable a module"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa disable -d "Disable a module"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa reset -d "Reset module state"
+complete -c dnf -n "__fish_seen_subcommand_from module" -xa list -d "List modules"
+complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from list" -l all -d "Lists all module "
+complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from list" -l enabled -d "Lists enabled module"
+complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from list" -l disabled -d "Lists disabled module"
+complete -c dnf -n "__fish_seen_subcommand_from module; and __fish_seen_subcommand_from list" -l installed -d "List  installed modules"
+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"
+
+# Provides
+complete -c dnf -n "__fish_use_subcommand" -xa provides -d "Finds packages providing the given command"
+
+# Reinstall
+complete -c dnf -n "__fish_use_subcommand" -xa reinstall -d "Reinstalls a package"
+complete -c dnf -n "__fish_seen_subcommand_from reinstall" -xa "(__dnf_list_installed_packages)"
+
+# Remove
+complete -c dnf -n "__fish_use_subcommand" -xa remove -d "Remove packages"
+complete -c dnf -n "__fish_seen_subcommand_from remove" -xa "(__dnf_list_installed_packages)" -d "Removes the specified packages"
+complete -c dnf -n "__fish_seen_subcommand_from remove" -l duplicates -d "Removes older version of duplicated packages"
+complete -c dnf -n "__fish_seen_subcommand_from remove" -l oldinstallonly -d "Removes old installonly packages"
+
+# Repolist and Repoinfo
+complete -c dnf -n "__fish_use_subcommand" -xa repoinfo -d "Verbose repolist"
+complete -c dnf -n "__fish_use_subcommand" -xa repolist -d "Lists all enabled repositories"
+
+for i in repolist repoinfo
+    complete -c dnf -n "__fish_seen_subcommand_from $i" -l enabled -d "Lists all enabled repositories"
+    complete -c dnf -n "__fish_seen_subcommand_from $i" -l disabled -d "Lists all disabled repositories"
+    complete -c dnf -n "__fish_seen_subcommand_from $i" -l all -d "Lists all repositories"
+end
+
+# Repoquery
+complete -c dnf -n "__fish_use_subcommand" -xa repoquery -d "Queries DNF repositories"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l querytags -d "Provides the list of tags"
+
+# repoquery select options
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -s a -l all
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l enabled
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l arch -l archlist
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l duplicates
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l unneeded
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l available
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l extras
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -s f -l file
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l installed
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l installonly
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l latest-limit
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l recent
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l repo
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l unsatisfied
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l upgrades
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l userinstalled
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatdepends
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatconflicts
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatenhances
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatobsoletes
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatprovides
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatrecommends
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatrequires
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatsuggests
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l whatsupplements
+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
+
+# 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"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -s s -l source -d "Show the package source RPM name"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l changelogs -d "Print the package changelogs"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l conflicts -d "Display capabilities that the package conflicts with"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l depends -d "Display capabilities that the package depends on"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l enhances -d "Display capabilities enhanced by the package"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l location -d "Show a location where the package could be downloaded from"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l obsoletes -d "Display capabilities that the package obsoletes"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l provides -d "Display capabilities provided by the package"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l recommends -d "Display capabilities recommended by the package"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l requires -d "Display capabilities that the package depends on"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l requires-pre -d "Display capabilities that the package depends on"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l suggests -d "Display capabilities suggested by the package"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l supplements -d "Display capabilities supplemented by the package"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l tree -d "Display a recursive tree of packages"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l deplist -d "Produce a list of all dependencies"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l nvr -d "Format like name-version-release"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l nevra -d "Format like name-epoch:version-release.architecture"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l envra -d "Format like epoch:name-version-release.architecture"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l qf -l queryformat -d "Custom display format"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l recursive -d "Query packages recursively"
+complete -c dnf -n "__fish_seen_subcommand_from repoquery" -l resolve -d "Resolve capabilities to originating packages"
+
+# Repository-Packages
+complete -c dnf -n "__fish_use_subcommand" -xa repository-packages -d "Run commands on all packages in the repository"
+
+# Search
+complete -c dnf -n "__fish_use_subcommand" -xa search -d "Search package metadata for keywords"
+complete -c dnf -n "__fish_seen_subcommand_from search" -l all -d "Lists packages that match at least one of the keys"
+
+# Shell
+complete -c dnf -n "__fish_use_subcommand" -xa shell -d "Opens an interactive shell"
+
+# Swap
+complete -c dnf -n "__fish_use_subcommand" -xa swap -d "Remove spec and install spec in one transaction"
+
+# Updateinfo
+complete -c dnf -n "__fish_use_subcommand" -xa updateinfo -d "Display information about update advisories"
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l summary -d "Displays the summary"
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l list -d "List of advisories"
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l info -d "Detailed information"
+
+# updateinfo <availability> options
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l all
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l available
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l installed
+complete -c dnf -n "__fish_seen_subcommand_from updateinfo" -l updates
+
+# Upgrade
+complete -c dnf -n "__fish_use_subcommand" -xa upgrade -d "Updates packages"
+complete -c dnf -n "__fish_seen_subcommand_from upgrade" -xa "(__dnf_list_installed_packages)"
+
+# Upgrade-Minimal
+complete -c dnf -n "__fish_use_subcommand" -xa upgrade-minimal -d "Updates packages"
+complete -c dnf -n "__fish_seen_subcommand_from upgrade-minimal" -xa "(__dnf_list_installed_packages)"
+
+# Options:
+# Using __fish_no_arguments here so that users are not completely overloaded with
+#   available options when using subcommands (e.g. repoquery) (40 vs 100ish)
+complete -c dnf -n "__fish_no_arguments" -s 4 -d "Use IPv4 only"
+complete -c dnf -n "__fish_no_arguments" -s 6 -d "Use IPv6 only"
+complete -c dnf -n "__fish_no_arguments" -l advisory -l advisories -d "Include packages corresponding to the advisory ID"
+complete -c dnf -n "__fish_no_arguments" -l allowerasing -d "Allow erasing of installed packages to resolve dependencies"
+complete -c dnf -n "__fish_no_arguments" -l assumeno -d "Answer no for all questions"
+complete -c dnf -n "__fish_no_arguments" -s b -l best -d "Try the best available package versions in transactions"
+complete -c dnf -n "__fish_no_arguments" -l bugfix -d "Include packages that fix a bugfix issue"
+complete -c dnf -n "__fish_no_arguments" -l bz -l bzs -d "Include packages that fix a Bugzilla ID"
+complete -c dnf -n "__fish_no_arguments" -s C -l cacheonly -d "Run entirely from system cache"
+complete -c dnf -n "__fish_no_arguments" -l color -xa "always never auto" -d "Control whether color is used"
+complete -c dnf -n "__fish_no_arguments" -s c -l config -d "Configuration file location"
+complete -c dnf -n "__fish_no_arguments" -l cve -l cves -d "Include packages that fix a CVE"
+complete -c dnf -n "__fish_no_arguments" -s d -l debuglevel -d "Debugging output level"
+complete -c dnf -n "__fish_no_arguments" -l debugsolver -d "Dump dependency solver debugging info"
+complete -c dnf -n "__fish_no_arguments" -l disableexcludes -l disableexcludepkgs -d "Disable excludes"
+complete -c dnf -n "__fish_no_arguments" -l disable -l set-disabled -d "Disable specified repositories"
+complete -c dnf -n "__fish_no_arguments" -l disableplugin -d "Disable the listed plugins specified"
+complete -c dnf -n "__fish_no_arguments" -l disablerepo -d "Disable specified repositories"
+complete -c dnf -n "__fish_no_arguments" -l downloaddir -l destdir -d "Change downloaded packages to provided directory"
+complete -c dnf -n "__fish_no_arguments" -l downloadonly -d "Download packages without performing any transaction"
+complete -c dnf -n "__fish_no_arguments" -l enable -l set-enabled -d "Enable specified repositories"
+complete -c dnf -n "__fish_no_arguments" -l enableplugin -d "Enable the listed plugins"
+complete -c dnf -n "__fish_no_arguments" -l enablerepo -d "Enable additional repositories"
+complete -c dnf -n "__fish_no_arguments" -l enhancement -d "Include enhancement relevant packages"
+complete -c dnf -n "__fish_no_arguments" -s x -l exclude -d "Exclude packages specified"
+complete -c dnf -n "__fish_no_arguments" -l forcearch -d "Force the use of the specified architecture"
+complete -c dnf -n "__fish_no_arguments" -s h -l help -l help-i -d "Show the help"
+complete -c dnf -n "__fish_no_arguments" -l installroot -d "Specifies an alternative installroot"
+complete -c dnf -n "__fish_no_arguments" -l newpackage -d "Include newpackage relevant packages"
+complete -c dnf -n "__fish_no_arguments" -l noautoremove -d "Disable autoremove"
+complete -c dnf -n "__fish_no_arguments" -l nobest -d "Set best option to False"
+complete -c dnf -n "__fish_no_arguments" -l nodocs -d "Do not install documentation"
+complete -c dnf -n "__fish_no_arguments" -l nogpgcheck -d "Skip checking GPG signatures on packages"
+complete -c dnf -n "__fish_no_arguments" -l noplugins -d "Disable all plugins"
+complete -c dnf -n "__fish_no_arguments" -l obsoletes -d "Enables obsoletes processing logic"
+complete -c dnf -n "__fish_no_arguments" -s q -l quiet -d "Quiet mode"
+complete -c dnf -n "__fish_no_arguments" -s R -l randomwait -d "Maximum command wait time"
+complete -c dnf -n "__fish_no_arguments" -l refresh -d "Set metadata as expired before running the command"
+complete -c dnf -n "__fish_no_arguments" -l releasever -d "Configure the distribution release"
+complete -c dnf -n "__fish_no_arguments" -l repofrompath -d "Specify repository to add to the repositories for this query"
+complete -c dnf -n "__fish_no_arguments" -l repo -l repoid -d "Enable just specific repositories by an id or a glob"
+complete -c dnf -n "__fish_no_arguments" -l rpmverbosity -d "RPM debug scriptlet output level"
+complete -c dnf -n "__fish_no_arguments" -l sec-severity -l secseverity -d "Includes packages that provide a fix for an issue of the specified severity"
+complete -c dnf -n "__fish_no_arguments" -l security -d "Includes packages that provide a fix for a security issue"
+complete -c dnf -n "__fish_no_arguments" -l setopt -d "Override a configuration option"
+complete -c dnf -n "__fish_no_arguments" -l skip-broken -d "Skips broken packages"
+complete -c dnf -n "__fish_no_arguments" -l showduplicates -d "Shows duplicate packages"
+complete -c dnf -n "__fish_no_arguments" -s v -l verbose -d "Verbose mode"
+complete -c dnf -n "__fish_no_arguments" -l version -d "Shows DNF version and exit"
+complete -c dnf -n "__fish_no_arguments" -s y -l assumeyes -d "Answer yes for all questions"
\ No newline at end of file

From 9b54a537589622c1e648752b4da426a051565979 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 22 Jun 2019 11:08:36 +0200
Subject: [PATCH 0726/1732] Prevent not-yet-loaded functions from loaded when
 erased (#5951)

* Prevent not-yet-loaded functions from loaded when erased

Today, `functions --erase $function` does nothing if the function
hasn't been autoloaded yet.

E.g. run, in an interactive session

    > functions --erase ls
    > type ls

and be amazed that it still shows our default `ls --color=auto`
wrapper function.

This seems counter-intuitive - removing a function ought to remove it,
whether it had been executed before or not.

* doc/changelog
---
 CHANGELOG.md                      | 1 +
 sphinx_doc_src/cmds/functions.rst | 2 +-
 src/function.cpp                  | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 376957df6..8890b3eee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - `test` (aka `[`) now prints a stacktrace on error, making the offending call easier to find (#5771).
 - The default read limit has been increased to 100MiB (#5267).
 - `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
+- `functions --erase` now also prevents fish from autoloading a function for the first time (#5951).
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index d4589e71c..5a47852ac 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -26,7 +26,7 @@ The following options are available:
 
 - ``-d DESCRIPTION`` or ``--description=DESCRIPTION`` changes the description of this function.
 
-- ``-e`` or ``--erase`` causes the specified functions to be erased.
+- ``-e`` or ``--erase`` causes the specified functions to be erased. This also means that it is prevented from autoloading.
 
 - ``-D`` or ``--details`` reports the path name where each function is defined or could be autoloaded, ``stdin`` if the function was defined interactively or on the command line or by reading stdin, and ``n/a`` if the function isn't available. If the ``--verbose`` option is also specified then five lines are written:
 
diff --git a/src/function.cpp b/src/function.cpp
index 37e889e9d..a5f608548 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -245,10 +245,9 @@ bool function_set_t::remove(const wcstring &name) {
 
 void function_remove(const wcstring &name) {
     auto funcset = function_set.acquire();
-    if (funcset->remove(name)) {
-        // Prevent re-autoloading this function.
-        funcset->autoload_tombstones.insert(name);
-    }
+    funcset->remove(name);
+    // Prevent (re-)autoloading this function.
+    funcset->autoload_tombstones.insert(name);
 }
 
 bool function_get_definition(const wcstring &name, wcstring &out_definition) {

From 8bfaf9e7ef0dbe6ec516fb8c38d1939123cb9705 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 22 Jun 2019 18:20:54 +0200
Subject: [PATCH 0727/1732] Add test for erasing unloaded functions

Not perfect, but better than nothing.
---
 tests/functions.in  | 8 ++++++++
 tests/functions.out | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tests/functions.in b/tests/functions.in
index 79ab2e773..1e63ba59d 100644
--- a/tests/functions.in
+++ b/tests/functions.in
@@ -74,3 +74,11 @@ or echo "Failed to find description 1" >&2
 functions -d description2 test_func_desc
 functions test_func_desc | string match --quiet '*description2*'
 or echo "Failed to find description 2" >&2
+
+# Note: This test isn't ideal - if ls was loaded before,
+# or doesn't exist, it'll succeed anyway.
+#
+# But we can't *confirm* that an ls function exists,
+# so this is the best we can do.
+functions --erase ls
+type -t ls
diff --git a/tests/functions.out b/tests/functions.out
index e69de29bb..f73f3093f 100644
--- a/tests/functions.out
+++ b/tests/functions.out
@@ -0,0 +1 @@
+file

From db703c273d0f5b6bfd35cea8ebfc0e016aaeaf82 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 22 Jun 2019 13:12:49 -0700
Subject: [PATCH 0728/1732] Remove some stale comments from Tests.cmake

These comments were used to refer back to the autotools build, but the
autotools build is no more and CMake is now the source of truth.
---
 cmake/Tests.cmake | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 7c78ab6f4..2dd2917fa 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -71,16 +71,7 @@ ELSE()
   ADD_CUSTOM_TARGET(symlink_functions)
 ENDIF()
 
-#
 # Prep the environment for running the unit tests.
-# test-prep: show-DESTDIR show-LN_S show-FISH_VERSION
-#   $v rm -rf test
-#   $v $(MKDIR_P) test/data test/home test/temp
-# ifdef DESTDIR
-#   $v $(LN_S) $(DESTDIR) test/root
-# else
-#   $v $(MKDIR_P) test/root
-# endif
 ADD_CUSTOM_TARGET(test_prep
                   COMMAND ${CMAKE_COMMAND} -E remove_directory ${TEST_DIR}/data
                   COMMAND ${CMAKE_COMMAND} -E remove_directory ${TEST_DIR}/home
@@ -91,34 +82,16 @@ ADD_CUSTOM_TARGET(test_prep
                   USES_TERMINAL)
 
 
-# test_high_level_test_deps = test_fishscript test_interactive test_invocation
-# test_high_level: DESTDIR = $(PWD)/test/root/
-# test_high_level: prefix = .
-# test_high_level: test-prep install-force test_fishscript test_interactive test_invocation
-# .PHONY: test_high_level
-#
-# test_invocation: $(call filter_up_to,test_invocation,$(active_test_goals))
-#   cd tests; ./invocation.sh
-# .PHONY: test_invocation
 ADD_CUSTOM_TARGET(test_invocation
                   COMMAND ./invocation.sh
                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests/
                   DEPENDS test_prep test_low_level
                   USES_TERMINAL)
 
-#
-# test_fishscript: $(call filter_up_to,test_fishscript,$(active_test_goals))
-#   cd tests; ../test/root/bin/fish test.fish
-# .PHONY: test_fishscript
-
 ADD_CUSTOM_TARGET(test_fishscript
                   COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish test.fish
                   DEPENDS test_prep test_invocation
                   USES_TERMINAL)
-#
-# test_interactive: $(call filter_up_to,test_interactive,$(active_test_goals))
-#   cd tests; ../test/root/bin/fish interactive.fish
-# .PHONY: test_interactive
 
 ADD_CUSTOM_TARGET(test_interactive
     COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish interactive.fish

From 40d91b7e77efe3a790331acdb7cc49e0fc5f3a98 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 22 Jun 2019 14:17:10 -0700
Subject: [PATCH 0729/1732] Allow running test suites independently

This makes test_low_level, test_interactive, test_invocation, and
test_fishscript independent. This allows running a smaller subset of tests.

To prevent all tests running in parallel, we also have new targets
serial_test_low_level, serial_test_interactive, etc. which have the
dependency chain that enforces serial execution.
---
 cmake/Tests.cmake | 90 +++++++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 2dd2917fa..d192d7758 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -29,22 +29,6 @@ ENDIF()
 # Copy littlecheck.py
 CONFIGURE_FILE(build_tools/littlecheck.py littlecheck.py COPYONLY)
 
-# Create the 'test' target.
-# Set a policy so CMake stops complaining about the name 'test'.
-CMAKE_POLICY(PUSH)
-IF(POLICY CMP0037)
-  CMAKE_POLICY(SET CMP0037 OLD)
-ENDIF()
-ADD_CUSTOM_TARGET(test)
-CMAKE_POLICY(POP)
-
-ADD_CUSTOM_TARGET(test_low_level
-  COMMAND env XDG_DATA_HOME=test/data XDG_CONFIG_HOME=test/home ./fish_tests
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  DEPENDS fish_tests
-  USES_TERMINAL)
-ADD_DEPENDENCIES(test test_low_level tests_dir)
-
 # Make the directory in which to run tests.
 # Also symlink fish to where the tests expect it to be.
 # Lastly put fish_test_helper there too.
@@ -81,30 +65,66 @@ ADD_CUSTOM_TARGET(test_prep
                   DEPENDS tests_buildroot_target
                   USES_TERMINAL)
 
-
-ADD_CUSTOM_TARGET(test_invocation
-                  COMMAND ./invocation.sh
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests/
-                  DEPENDS test_prep test_low_level
-                  USES_TERMINAL)
-
-ADD_CUSTOM_TARGET(test_fishscript
-                  COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish test.fish
-                  DEPENDS test_prep test_invocation
-                  USES_TERMINAL)
-
-ADD_CUSTOM_TARGET(test_interactive
-    COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish interactive.fish
-    DEPENDS test_prep test_invocation test_fishscript
+# Define our individual tests.
+# Each test is conceptually independent.
+# However when running all tests, we want to run them serially for sanity's sake.
+# So define both a normal target, and a serial variant which enforces ordering.
+FOREACH(TESTTYPE test serial_test)
+  ADD_CUSTOM_TARGET(${TESTTYPE}_low_level
+    COMMAND env XDG_DATA_HOME=test/data XDG_CONFIG_HOME=test/home ./fish_tests
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS fish_tests
     USES_TERMINAL)
 
-ADD_CUSTOM_TARGET(test_high_level
-                  DEPENDS test_invocation test_fishscript test_interactive)
-ADD_DEPENDENCIES(test test_high_level)
+  ADD_CUSTOM_TARGET(${TESTTYPE}_invocation
+                    COMMAND ./invocation.sh
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests/
+                    DEPENDS test_prep
+                    USES_TERMINAL)
+
+  ADD_CUSTOM_TARGET(${TESTTYPE}_fishscript
+                    COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish test.fish
+                    DEPENDS test_prep
+                    USES_TERMINAL)
+
+  ADD_CUSTOM_TARGET(${TESTTYPE}_interactive
+      COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish interactive.fish
+      DEPENDS test_prep
+      USES_TERMINAL)
+ENDFOREACH(testtype)
+
+# Now add a dependency chain between the serial versions.
+# This ensures they run in order.
+ADD_DEPENDENCIES(serial_test_fishscript serial_test_low_level)
+ADD_DEPENDENCIES(serial_test_invocation serial_test_fishscript)
+ADD_DEPENDENCIES(serial_test_interactive serial_test_invocation)
+
+
+ADD_CUSTOM_TARGET(serial_test_high_level
+                  DEPENDS serial_test_invocation serial_test_interactive serial_test_fishscript)
+
+# Create the 'test' target.
+# Set a policy so CMake stops complaining about the name 'test'.
+CMAKE_POLICY(PUSH)
+IF(POLICY CMP0037)
+  CMAKE_POLICY(SET CMP0037 OLD)
+ENDIF()
+ADD_CUSTOM_TARGET(test)
+CMAKE_POLICY(POP)
+ADD_DEPENDENCIES(test serial_test_high_level)
 
 # Group test targets into a TestTargets folder
-SET_PROPERTY(TARGET test test_low_level test_high_level tests_dir
+SET_PROPERTY(TARGET test tests_dir
+                    test_low_level
+                    test_fishscript
+                    test_interactive
+                    test_invocation
                     test_invocation test_fishscript test_prep
                     tests_buildroot_target
+                    serial_test_high_level
+                    serial_test_low_level
+                    serial_test_fishscript
+                    serial_test_interactive
+                    serial_test_invocation
                     symlink_functions
              PROPERTY FOLDER cmake/TestTargets)

From 8f3a0dcc8b65ed0c95eea6a1c522ca6a5a40766e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 23 Jun 2019 16:00:39 +0800
Subject: [PATCH 0730/1732] cmake: harmonise argument to foreach/endforeach

Fixes a warning introduced in 40d91b7e77efe3a790331acdb7cc49e0fc5f3a98.
---
 cmake/Tests.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index d192d7758..425c05c64 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -91,7 +91,7 @@ FOREACH(TESTTYPE test serial_test)
       COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish interactive.fish
       DEPENDS test_prep
       USES_TERMINAL)
-ENDFOREACH(testtype)
+ENDFOREACH(TESTTYPE)
 
 # Now add a dependency chain between the serial versions.
 # This ensures they run in order.

From e921bd60c34de28c446abe4d7fecea1548a4a419 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 23 Jun 2019 16:13:47 +0200
Subject: [PATCH 0731/1732] docs: Build index, tutorial and faq as man pages

This was clearly intended for index, but because it was called "fish"
it was overwritten by the "fish" command man page.

I also added the tutorial and faq. Both of those might not be *ideal*
as man pages (the tutorial makes references to colors that won't show
up), but it's better to provide them than not.

Hat-tip to @wwared

See #5521.

[ci skip]
---
 CHANGELOG.md           | 1 +
 sphinx_doc_src/conf.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8890b3eee..03103e527 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
 - `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
+- More of the documentation, including the tutorial, is now available as man pages as well.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 7689bf091..f09c32c48 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -177,7 +177,11 @@ def get_command_description(path, name):
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "fish", "fish-shell Documentation", [author], 1)]
+man_pages = [
+    (master_doc, "fish-doc", "fish-shell Documentation", [author], 1),
+    ("tutorial", "fish-tutorial", "fish-shell tutorial", [author], 1),
+    ("faq", "fish-faq", "fish-shell faq", [author], 1),
+]
 for path in sorted(glob.glob("cmds/*")):
     docname = strip_ext(path)
     cmd = os.path.basename(docname)

From e7b42615c898221ebe88c02acbc69397d4492a5a Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Sun, 23 Jun 2019 23:40:26 +0900
Subject: [PATCH 0732/1732] Add FFmpeg completions (#5922)

* Add FFmpeg completions

* Fix to use builtin command
---
 share/completions/ffmpeg.fish  | 130 +++++++++++++++++++++++++++++++++
 share/completions/ffplay.fish  |  66 +++++++++++++++++
 share/completions/ffprobe.fish |  78 ++++++++++++++++++++
 3 files changed, 274 insertions(+)
 create mode 100644 share/completions/ffmpeg.fish
 create mode 100644 share/completions/ffplay.fish
 create mode 100644 share/completions/ffprobe.fish

diff --git a/share/completions/ffmpeg.fish b/share/completions/ffmpeg.fish
new file mode 100644
index 000000000..484444600
--- /dev/null
+++ b/share/completions/ffmpeg.fish
@@ -0,0 +1,130 @@
+function __fish_ffmpeg_help_type
+    printf '%s\t%s\n' long "Print more options"
+    printf '%s\t%s\n' full "Print all options"
+
+    for help_type in decoder encoder demuxer muxer filter
+        set -l regex
+
+        if test $help_type = "filter"
+            set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
+        else
+            set regex '\S+\s+(\S+)\s+(\S+)'
+        end
+
+        printf '%s\n' $help_type=(ffmpeg -loglevel quiet -"$help_type"s | string trim | string match -rv '=|:$|^-' | string replace -rf "$regex" '$1\t$2')
+    end
+end
+
+function __fish_ffmpeg_codec_list
+    printf '%s\t%s\n' copy "Stream copy"
+
+    set -l identifier
+
+    switch $argv[1]
+        case video
+            set identifier '^V.*'
+        case audio
+            set identifier '^A.*'
+        case subtitle
+            set identifier '^S.*'
+        case '*'
+            return 1
+    end
+
+    printf '%s\n' (ffmpeg -loglevel quiet -decoders | string trim | string match -rv '=|:$|^-' | string match -r "$identifier" | string replace -rf '\S+\s+(\S+)\s+(\S+)' '$1\t$2')
+end
+
+complete -c ffmpeg -s i -d "Specify input file"
+
+# Print help / information / capabilities
+complete -c ffmpeg -s L -d "Show license"
+complete -x -c ffmpeg -s h -s "?" -o help -l help -a "(__fish_ffmpeg_help_type)" -d "Show help"
+complete -c ffmpeg -o version -d "Show version"
+complete -c ffmpeg -o buildconf -d "Show build configuration"
+complete -c ffmpeg -o formats -d "Show available formats"
+complete -c ffmpeg -o muxers -d "Show available muxers"
+complete -c ffmpeg -o demuxers -d "Show available demuxers"
+complete -c ffmpeg -o devices -d "Show available devices"
+complete -c ffmpeg -o codecs -d "Show available codecs"
+complete -c ffmpeg -o decoders -d "Show available decoders"
+complete -c ffmpeg -o encoders -d "Show available encoders"
+complete -c ffmpeg -o bsfs -d "Show available bit stream filters"
+complete -c ffmpeg -o protocols -d "Show available protocols"
+complete -c ffmpeg -o filters -d "Show available filters"
+complete -c ffmpeg -o pix_fmts -d "Show available pixel formats"
+complete -c ffmpeg -o layouts -d "Show standard channel layouts"
+complete -c ffmpeg -o sample_fmts -d "Show available audio sample formats"
+complete -c ffmpeg -o colors -d "Show available color names"
+complete -c ffmpeg -o sources -d "List sources of the input device"
+complete -c ffmpeg -o sinks -d "List sinks of the output device"
+complete -c ffmpeg -o hwaccels -d "Show available HW acceleration methods"
+
+# Global options
+complete -x -c ffmpeg -o loglevel -s v -a "quiet panic fatal error warning info verbose debug trace" -d "Set logging level"
+complete -c ffmpeg -o report -d "Generate a report"
+complete -c ffmpeg -o max_alloc -d "Set maximum size of a single allocated block"
+complete -c ffmpeg -s y -d "Overwrite output files"
+complete -c ffmpeg -s n -d "Never overwrite output files"
+complete -c ffmpeg -o ignore_unknown -d "Ignore unknown stream types"
+complete -c ffmpeg -o filter_threads -d "Number of non-complex filter threads"
+complete -c ffmpeg -o filter_complex_threads -d "Number of threads for -filter_complex"
+complete -c ffmpeg -o stats -d "Print progress report during encoding"
+complete -c ffmpeg -o max_error_rate -d "Ratio of errors"
+complete -c ffmpeg -o bits_per_raw_sample -d "Set the number of bits per raw sample"
+complete -c ffmpeg -o vol -d "Change audio volume"
+
+# Per-file main options
+complete -c ffmpeg -s f -d "Force format"
+complete -c ffmpeg -s c -o codec -d "Codec name"
+complete -c ffmpeg -o pre -d "Preset name"
+complete -c ffmpeg -o map_metadata -d "Set metadata information of outfile from infile"
+complete -c ffmpeg -s t -d "Record or transcode \"duration\" seconds of audio/video"
+complete -c ffmpeg -o to -d "Record or transcode stop time"
+complete -c ffmpeg -o fs -d "Set the limit file size in bytes"
+complete -c ffmpeg -o ss -d "Set the start time offset"
+complete -c ffmpeg -o seek_timestamp -d "Enable/disable seeking by timestamp with -ss"
+complete -c ffmpeg -o timestamp -d "Set the recording timestamp"
+complete -c ffmpeg -o metadata -d "Add metadata"
+complete -c ffmpeg -o program -d "Add program with specified streams"
+complete -x -c ffmpeg -o target -a '(for target in vcd svcd dvd dv dv50 ; echo "$target" ; echo pal-"$target" ; echo ntsc-"$target" ; echo film-"$target" ; end)' -d "Specify target file type"
+complete -c ffmpeg -o apad -d "Audio pad"
+complete -c ffmpeg -o frames -d "Set the number of frames to output"
+complete -c ffmpeg -o filter -d "Set stream filtergraph"
+complete -c ffmpeg -o filter_script -d "Read stream filtergraph description from a file"
+complete -c ffmpeg -o reinit_filter -d "Reinit filtergraph on input parameter changes"
+complete -c ffmpeg -o discard -d "Discard"
+complete -c ffmpeg -o disposition -d "Disposition"
+
+# Video options
+complete -c ffmpeg -o vframes -d "Set the number of video frames to output"
+complete -c ffmpeg -s r -d "Set frame rate"
+complete -c ffmpeg -s s -d "Set frame size"
+complete -c ffmpeg -o aspect -d "Set aspect ratio"
+complete -c ffmpeg -o bits_per_raw_sample -d "Set the number of bits per raw sample"
+complete -c ffmpeg -o vn -d "Disable video"
+complete -x -c ffmpeg -o vcodec -o "codec:v" -o "c:v" -a "(__fish_ffmpeg_codec_list video)" -d "Set video codec"
+complete -c ffmpeg -o timecode -d "Set initial TimeCode value"
+complete -x -c ffmpeg -o pass -a "1 2 3" -d "Select the pass number"
+complete -c ffmpeg -o vf -d "Set video filters"
+complete -c ffmpeg -o ab -o "b:a" -d "Audio bitrate"
+complete -c ffmpeg -s b -o "b:v" -d "Video bitrate"
+complete -c ffmpeg -o dn -d "Disable data"
+
+# Audio options
+complete -c ffmpeg -o aframes -d "Set the number of audio frames to output"
+complete -c ffmpeg -o aq -d "Set audio quality"
+complete -c ffmpeg -o ar -d "Set audio sampling rate"
+complete -c ffmpeg -o ac -d "Set number of audio channels"
+complete -c ffmpeg -o an -d "Disable audio"
+complete -x -c ffmpeg -o acodec -o "codec:a" -o "c:a" -a "(__fish_ffmpeg_codec_list audio)" -d "Set audio codec"
+complete -c ffmpeg -o vol -d "Change audio volume"
+complete -c ffmpeg -o af -d "Set audio filters"
+
+# Subtitle options
+complete -c ffmpeg -s s -d "Set frame size"
+complete -c ffmpeg -o sn -d "Disable subtitle"
+complete -x -c ffmpeg -o scodec -o "codec:s" -o "c:s" -a "(__fish_ffmpeg_codec_list subtitle)" -d "Set subtitle codec"
+complete -c ffmpeg -o stag -d "Force subtitle tag/fourcc"
+complete -c ffmpeg -o fix_sub_duration -d "Fix subtitles duration"
+complete -c ffmpeg -o canvas_size -d "Set canvas size"
+complete -c ffmpeg -o spre -d "Set the subtitle options to the indicated preset"
diff --git a/share/completions/ffplay.fish b/share/completions/ffplay.fish
new file mode 100644
index 000000000..d8abe059b
--- /dev/null
+++ b/share/completions/ffplay.fish
@@ -0,0 +1,66 @@
+function __fish_ffplay_help_type
+    printf '%s\t%s\n' long "Print more options"
+    printf '%s\t%s\n' full "Print all options"
+
+    for help_type in decoder encoder demuxer muxer filter
+        set -l regex
+
+        if test $help_type = "filter"
+            set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
+        else
+            set regex '\S+\s+(\S+)\s+(\S+)'
+        end
+
+        printf '%s\n' $help_type=(ffplay -loglevel quiet -"$help_type"s | string trim | string match -rv '=|:$|^-' | string replace -rf "$regex" '$1\t$2')
+    end
+end
+
+function __fish_ffplay_codec_list
+    printf '%s\t%s\n' copy "Stream copy"
+    printf '%s\n' (ffplay -loglevel quiet -decoders | string trim | string match -rv '=|:$|^-' | string replace -rf '\S+\s+(\S+)\s+(\S+)' '$1\t$2')
+end
+
+# Main options
+complete -c ffplay -s L -d "Show license"
+complete -x -c ffplay -s h -s "?" -o help -l help -a "(__fish_ffplay_help_type)" -d "Show help"
+complete -c ffplay -o version -d "Show version"
+complete -c ffplay -o buildconf -d "Show build configuration"
+complete -c ffplay -o formats -d "Show available formats"
+complete -c ffplay -o muxers -d "Show available muxers"
+complete -c ffplay -o demuxers -d "Show available demuxers"
+complete -c ffplay -o devices -d "Show available devices"
+complete -c ffplay -o codecs -d "Show available codecs"
+complete -c ffplay -o decoders -d "Show available decoders"
+complete -c ffplay -o encoders -d "Show available encoders"
+complete -c ffplay -o bsfs -d "Show available bit stream filters"
+complete -c ffplay -o protocols -d "Show available protocols"
+complete -c ffplay -o filters -d "Show available filters"
+complete -c ffplay -o pix_fmts -d "Show available pixel formats"
+complete -c ffplay -o layouts -d "Show standard channel layouts"
+complete -c ffplay -o sample_fmts -d "Show available audio sample formats"
+complete -c ffplay -o colors -d "Show available color names"
+complete -x -c ffplay -o loglevel -s v -a "quiet panic fatal error warning info verbose debug trace" -d "Set logging level"
+complete -c ffplay -o report -d "Generate a report"
+complete -c ffplay -o max_alloc -d "Set maximum size of a single allocated block"
+complete -c ffplay -o sources -d "List sources of the input device"
+complete -c ffplay -o sinks -d "List sinks of the output device"
+complete -c ffplay -s x -d "Force displayed width"
+complete -c ffplay -s y -d "Force displayed height"
+complete -c ffplay -s s -d "Set frame size"
+complete -c ffplay -o fs -d "Force full screen"
+complete -c ffplay -o an -d "Disable audio"
+complete -c ffplay -o vn -d "Disable video"
+complete -c ffplay -o sn -d "Disable subtitle"
+complete -c ffplay -o ss -d "Seek to a given position in seconds"
+complete -c ffplay -s t -d "Play "duration" seconds of audio/video"
+complete -x -c ffplay -o bytes -a "(printf '%s\t%s\n' 0 off ; printf '%s\t%s\n' 1 on ; printf '%s\t%s\n' -1 auto)" -d "Seek by bytes"
+complete -c ffplay -o nodisp -d "Disable graphical display"
+complete -c ffplay -o noborder -d "Borderless window"
+complete -c ffplay -o volume -d "Set startup volume"
+complete -c ffplay -s f -d "Force format"
+complete -c ffplay -o window_title -d "Set window title"
+complete -c ffplay -o af -d "Set audio filters"
+complete -x -c ffplay -o showmode -a "(printf '%s\t%s\n' 0 video ; printf '%s\t%s\n' 1 waves ; printf '%s\t%s\n' 2 RDFT)" -d "Select show mode"
+complete -c ffplay -s i -d "Read specified file"
+complete -x -c ffplay -o codec -a "(__fish_ffplay_codec_list)" -d "Force decoder"
+complete -c ffplay -o autorotate -d "Automatically rotate video"
diff --git a/share/completions/ffprobe.fish b/share/completions/ffprobe.fish
new file mode 100644
index 000000000..ff912423c
--- /dev/null
+++ b/share/completions/ffprobe.fish
@@ -0,0 +1,78 @@
+function __fish_ffprobe_help_type
+    printf '%s\t%s\n' long "Print more options"
+    printf '%s\t%s\n' full "Print all options"
+
+    for help_type in decoder encoder demuxer muxer filter
+        set -l regex
+
+        if test $help_type = "filter"
+            set regex '\S+\s+(\S+)\s+\S+\s+(\S+)'
+        else
+            set regex '\S+\s+(\S+)\s+(\S+)'
+        end
+
+        printf '%s\n' $help_type=(ffprobe -loglevel quiet -"$help_type"s | string trim | string match -rv '=|:$|^-' | string replace -rf "$regex" '$1\t$2')
+    end
+end
+
+# Main options
+complete -c ffprobe -s L -d "Show license"
+complete -x -c ffprobe -s h -s "?" -o help -l help -a "(__fish_ffprobe_help_type)" -d "Show help"
+complete -c ffprobe -o version -d "Show version"
+complete -c ffprobe -o buildconf -d "Show build configuration"
+complete -c ffprobe -o formats -d "Show available formats"
+complete -c ffprobe -o muxers -d "Show available muxers"
+complete -c ffprobe -o demuxers -d "Show available demuxers"
+complete -c ffprobe -o devices -d "Show available devices"
+complete -c ffprobe -o codecs -d "Show available codecs"
+complete -c ffprobe -o decoders -d "Show available decoders"
+complete -c ffprobe -o encoders -d "Show available encoders"
+complete -c ffprobe -o bsfs -d "Show available bit stream filters"
+complete -c ffprobe -o protocols -d "Show available protocols"
+complete -c ffprobe -o filters -d "Show available filters"
+complete -c ffprobe -o pix_fmts -d "Show available pixel formats"
+complete -c ffprobe -o layouts -d "Show standard channel layouts"
+complete -c ffprobe -o sample_fmts -d "Show available audio sample formats"
+complete -c ffprobe -o colors -d "Show available color names"
+complete -x -c ffprobe -o loglevel -s v -a "quiet panic fatal error warning info verbose debug trace" -d "Set logging level"
+complete -c ffprobe -o report -d "Generate a report"
+complete -c ffprobe -o max_alloc -d "Set maximum size of a single allocated block"
+complete -c ffprobe -o cpuflags -d "Force specific cpu flags"
+complete -c ffprobe -o hide_banner -d "Do not show program banner"
+complete -c ffprobe -o sources -d "List sources of the input device"
+complete -c ffprobe -o sinks -d "List sinks of the output device"
+complete -c ffprobe -s f -d "Force format"
+complete -c ffprobe -o unit -d "Show unit of the displayed values"
+complete -c ffprobe -o prefix -d "Use SI prefixes for the displayed values"
+complete -c ffprobe -o byte_binary_prefix -d "Use binary prefixes for byte units"
+complete -c ffprobe -o sexagesimal -d "Use sexagesimal format HOURS:MM:SS.MICROSECONDS for time units"
+complete -c ffprobe -o pretty -d "Prettify the format of displayed values, make it more human readable"
+complete -x -c ffprobe -o print_format -a "default compact csv flat ini json xml" -d "Set the output printing format"
+complete -x -c ffprobe -o of -a "default compact csv flat ini json xml" -d "Alias for -print_format"
+complete -c ffprobe -o select_streams -d "Select the specified streams"
+complete -c ffprobe -o sections -d "Print sections structure and section information, and exit"
+complete -c ffprobe -o show_data -d "Show packets data"
+complete -c ffprobe -o show_data_hash -d "Show packets data hash"
+complete -c ffprobe -o show_error -d "Show probing error"
+complete -c ffprobe -o show_format -d "Show format/container info"
+complete -c ffprobe -o show_frames -d "Show frames info"
+complete -c ffprobe -o show_format_entry -d "Show a particular entry from the format/container info"
+complete -c ffprobe -o show_entries -d "Show a set of specified entries"
+complete -c ffprobe -o show_log -d "Show log"
+complete -c ffprobe -o show_packets -d "Show packets info"
+complete -c ffprobe -o show_programs -d "Show programs info"
+complete -c ffprobe -o show_stream -d "Show streams info"
+complete -c ffprobe -o show_chapters -d "Show chapters info"
+complete -c ffprobe -o count_frames -d "Count the number of frames per stream"
+complete -c ffprobe -o count_packets -d "Count the number of packets per stream"
+complete -c ffprobe -o show_program_version -d "Show ffprobe version"
+complete -c ffprobe -o show_library_versions -d "Show library versions"
+complete -c ffprobe -o show_versions -d "Show program and library versions"
+complete -c ffprobe -o show_pixel_formats -d "Show pixel format descriptions"
+complete -c ffprobe -o show_private_data -d "Show private data"
+complete -c ffprobe -o private -d "Same as show_private_data"
+complete -c ffprobe -o bitexact -d "Force bitexact output"
+complete -c ffprobe -o read_intervals -d "Set read intervals"
+complete -c ffprobe -o default -d "Generic catch all option"
+complete -c ffprobe -s i -d "Read specified file"
+complete -c ffprobe -o find_stream_info -d "Read and decode the streams to fill missing information with heuristics"

From 8255c01edb11af4672d3b612ee91d1b8461d3ce5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 22 Jun 2019 15:10:54 -0700
Subject: [PATCH 0733/1732] Rename setup_child_process to child_setup_process

Try to name all functions called after fork with "child" prefix.
---
 src/exec.cpp     | 8 ++++----
 src/postfork.cpp | 7 ++++---
 src/postfork.h   | 5 +----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0cda24b00..2e5a9760e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -118,7 +118,7 @@ char *get_interpreter(const char *command, char *interpreter, size_t buff_size)
 }
 
 /// This function is executed by the child process created by a call to fork(). It should be called
-/// after \c setup_child_process. It calls execve to replace the fish process image with the command
+/// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
 static void safe_launch_process(process_t *p, const char *actual_cmd, const char *const *cargv,
                                 const char *const *cenvv) {
@@ -293,14 +293,14 @@ static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job) {
 void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
     // Do a regular launch -  but without forking first...
 
-    // setup_child_process makes sure signals are properly set up.
+    // child_setup_process makes sure signals are properly set up.
 
     // PCA This is for handling exec. Passing all_ios here matches what fish 2.0.0 and 1.x did.
     // It's known to be wrong - for example, it means that redirections bound for subsequent
     // commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
     // really make sense, so I'm not trying to fix it here.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
-    if (redirs && !setup_child_process(0, *redirs)) {
+    if (redirs && !child_setup_process(0, *redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -445,7 +445,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
         // stdout and stderr, and then exit.
         p->pid = getpid();
         child_set_group(job.get(), p);
-        setup_child_process(p, dup2s);
+        child_setup_process(p, dup2s);
         child_action();
         DIE("Child process returned control to fork_child lambda!");
     }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 0e57d0c7a..9550bc7c1 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -59,7 +59,7 @@ bool child_set_group(job_t *j, process_t *p) {
                     continue;
                 } else if (errno == EINTR) {
                     // I don't think signals are blocked here. The parent (fish) redirected the
-                    // signal handlers and `setup_child_process()` calls `signal_reset_handlers()`
+                    // signal handlers and `child_setup_process()` calls `signal_reset_handlers()`
                     // after we're done here (and not `signal_unblock()`). We're already in a loop,
                     // so let's just handle EINTR just in case.
                     continue;
@@ -154,13 +154,14 @@ bool maybe_assign_terminal(const job_t *j) {
     return true;
 }
 
-int setup_child_process(process_t *p, const dup2_list_t &dup2s) {
+int child_setup_process(process_t *p, const dup2_list_t &dup2s) {
+    // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
         int err = act.target < 0 ? close(act.src) : dup2(act.src, act.target);
         if (err < 0) {
             // We have a null p if this is for the exec (non-fork) path.
             if (p != nullptr) {
-                debug_safe(4, "redirect_in_child_after_fork failed in setup_child_process");
+                debug_safe(4, "redirect_in_child_after_fork failed in child_setup_process");
                 exit_without_destructors(1);
             }
             return err;
diff --git a/src/postfork.h b/src/postfork.h
index f09efd8af..51bc1afca 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -28,12 +28,9 @@ bool maybe_assign_terminal(const job_t *j);
 /// inside the exec function, which blocks all signals), and all IO redirections and other file
 /// descriptor actions are performed.
 ///
-/// \param p the child process to set up
-/// \param dup2 the dup2 list to apply
-///
 /// \return 0 on sucess, -1 on failiure. When this function returns, signals are always unblocked.
 /// On failiure, signal handlers, io redirections and process group of the process is undefined.
-int setup_child_process(process_t *p, const dup2_list_t &dup2s);
+int child_setup_process(process_t *p, const dup2_list_t &dup2s);
 
 /// Call fork(), optionally waiting until we are no longer multithreaded. If the forked child
 /// doesn't do anything that could allocate memory, take a lock, etc. (like call exec), then it's

From 536216134371696222b60dc2d29d50cc03fa56b3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 22 Jun 2019 12:33:06 -0700
Subject: [PATCH 0734/1732] Call tcsetgrp() in child processes again

25afc9b377de5255673276314bf9d26a3b43cbab made this unnecessary by
having child processes wait for a signal after fork(), but this change
was later reverted. If we artificially slow down fish (e.g. with a sleep)
after the fork call, we see commands getting backgrounded by mistake.

Put back the tcsetgrp() call.
---
 src/exec.cpp     |  4 ++--
 src/postfork.cpp | 15 ++++++++++++---
 src/postfork.h   |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 2e5a9760e..234f656c2 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -300,7 +300,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
     // commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
     // really make sense, so I'm not trying to fix it here.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
-    if (redirs && !child_setup_process(0, *redirs)) {
+    if (redirs && !child_setup_process(nullptr, nullptr, *redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -445,7 +445,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
         // stdout and stderr, and then exit.
         p->pid = getpid();
         child_set_group(job.get(), p);
-        child_setup_process(p, dup2s);
+        child_setup_process(job.get(), p, dup2s);
         child_action();
         DIE("Child process returned control to fork_child lambda!");
     }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 9550bc7c1..4643fad3e 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -96,10 +96,8 @@ bool child_set_group(job_t *j, process_t *p) {
             return false;
         }
     } else {
-        // The child does not actually use this field.
         j->pgid = getpgrp();
     }
-
     return true;
 }
 
@@ -154,7 +152,7 @@ bool maybe_assign_terminal(const job_t *j) {
     return true;
 }
 
-int child_setup_process(process_t *p, const dup2_list_t &dup2s) {
+int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s) {
     // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
         int err = act.target < 0 ? close(act.src) : dup2(act.src, act.target);
@@ -169,6 +167,17 @@ int child_setup_process(process_t *p, const dup2_list_t &dup2s) {
     }
     // Set the handling for job control signals back to the default.
     signal_reset_handlers();
+
+    if (job != nullptr && job->get_flag(job_flag_t::TERMINAL) && job->is_foreground()) {
+        // Assign the terminal within the child to avoid the well-known race between tcsetgrp() in
+        // the parent and the child executing. We are not interested in error handling here, except
+        // we try to avoid this for non-terminals; in particular pipelines often make non-terminal
+        // stdin.
+        if (isatty(STDIN_FILENO)) {
+            (void)tcsetpgrp(STDIN_FILENO, job->pgid);
+        }
+    }
+
     return 0;
 }
 
diff --git a/src/postfork.h b/src/postfork.h
index 51bc1afca..af845f7f9 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -30,7 +30,7 @@ bool maybe_assign_terminal(const job_t *j);
 ///
 /// \return 0 on sucess, -1 on failiure. When this function returns, signals are always unblocked.
 /// On failiure, signal handlers, io redirections and process group of the process is undefined.
-int child_setup_process(process_t *p, const dup2_list_t &dup2s);
+int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s);
 
 /// Call fork(), optionally waiting until we are no longer multithreaded. If the forked child
 /// doesn't do anything that could allocate memory, take a lock, etc. (like call exec), then it's

From 89fb408eb6caf7ae5ba1d6111245065d15b45aed Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 23 Jun 2019 12:39:29 -0700
Subject: [PATCH 0735/1732] Migrate some job flags into const properties struct

This helps clarify which parts of a job are mutable, and which are constant.
---
 src/builtin_bg.cpp      |  4 +--
 src/builtin_fg.cpp      |  5 ++--
 src/exec.cpp            |  8 +++---
 src/parse_execution.cpp | 23 ++++++++-------
 src/postfork.cpp        | 10 +++----
 src/proc.cpp            | 18 +++++-------
 src/proc.h              | 62 ++++++++++++++++++++++++++++-------------
 7 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index de5dce4b6..b2d8f3aae 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -19,7 +19,7 @@
 /// Helper function for builtin_bg().
 static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
     assert(j != NULL);
-    if (!j->get_flag(job_flag_t::JOB_CONTROL)) {
+    if (!j->wants_job_control()) {
         streams.err.append_format(
             _(L"%ls: Can't put job %d, '%ls' to background because it is not under job control\n"),
             L"bg", j->job_id, j->command_wcstr());
@@ -54,7 +54,7 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // No jobs were specified so use the most recent (i.e., last) job.
         job_t *job = nullptr;
         for (const auto &j : parser.jobs()) {
-            if (j->is_stopped() && j->get_flag(job_flag_t::JOB_CONTROL) && (!j->is_completed())) {
+            if (j->is_stopped() && j->wants_job_control() && (!j->is_completed())) {
                 job = j.get();
                 break;
             }
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 42c1bc4f1..7e24477a0 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -40,8 +40,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         for (const auto &j : parser.jobs()) {
             if (j->is_constructed() && (!j->is_completed()) &&
-                ((j->is_stopped() || (!j->is_foreground())) &&
-                 j->get_flag(job_flag_t::JOB_CONTROL))) {
+                ((j->is_stopped() || (!j->is_foreground())) && j->wants_job_control())) {
                 job = j.get();
                 break;
             }
@@ -77,7 +76,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             if (!job || !job->is_constructed() || job->is_completed()) {
                 streams.err.append_format(_(L"%ls: No suitable job: %d\n"), cmd, pid);
                 job = nullptr;
-            } else if (!job->get_flag(job_flag_t::JOB_CONTROL)) {
+            } else if (!job->wants_job_control()) {
                 streams.err.append_format(_(L"%ls: Can't put job %d, '%ls' to foreground because "
                                             L"it is not under job control\n"),
                                           cmd, pid, job->command_wcstr());
diff --git a/src/exec.cpp b/src/exec.cpp
index 234f656c2..04a2cd2ee 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -278,10 +278,10 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
 // foreground process group, we don't use posix_spawn if we're going to foreground the process. (If
 // we use fork(), we can call tcsetpgrp after the fork, before the exec, and avoid the race).
 static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job) {
-    if (job->get_flag(job_flag_t::JOB_CONTROL)) {  //!OCLINT(collapsible if statements)
+    if (job->wants_job_control()) {  //!OCLINT(collapsible if statements)
         // We are going to use job control; therefore when we launch this job it will get its own
         // process group ID. But will it be foregrounded?
-        if (job->get_flag(job_flag_t::TERMINAL) && job->is_foreground()) {
+        if (job->wants_terminal() && job->is_foreground()) {
             // It will be foregrounded, so we will call tcsetpgrp(), therefore do not use
             // posix_spawn.
             return false;
@@ -327,7 +327,7 @@ static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid)
         return;
     }
 
-    if (j->get_flag(job_flag_t::JOB_CONTROL)) {
+    if (j->wants_job_control()) {
         j->pgid = child_pid;
     } else {
         j->pgid = getpgrp();
@@ -744,7 +744,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
         // child group has been set. See discussion here:
         // https://github.com/Microsoft/WSL/issues/2997 And confirmation that this persists
         // past glibc 2.24+ here: https://github.com/fish-shell/fish-shell/issues/4715
-        if (j->get_flag(job_flag_t::JOB_CONTROL) && getpgid(p->pid) != j->pgid) {
+        if (j->wants_job_control() && getpgid(p->pid) != j->pgid) {
             set_child_group(j.get(), p->pid);
         }
 #else
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8a34895ef..94d3becc4 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1231,20 +1231,23 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         return result;
     }
 
-    shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), block_io, parent_job);
-    auto &ld = parser->libdata();
-    job->tmodes = tmodes;
+    const auto &ld = parser->libdata();
+
     auto job_control_mode = get_job_control_mode();
-    job->set_flag(job_flag_t::JOB_CONTROL,
-                  (job_control_mode == job_control_t::all) ||
-                      ((job_control_mode == job_control_t::interactive) && shell_is_interactive()));
+    bool wants_job_control =
+        (job_control_mode == job_control_t::all) ||
+        ((job_control_mode == job_control_t::interactive) && shell_is_interactive());
 
-    job->set_flag(job_flag_t::FOREGROUND, !job_node_is_background(job_node));
+    job_t::properties_t props{};
+    props.foreground = !job_node_is_background(job_node);
+    props.wants_terminal = wants_job_control && !ld.is_event;
+    props.skip_notification =
+        ld.is_subshell || ld.is_block || ld.is_event || !shell_is_interactive();
 
-    job->set_flag(job_flag_t::TERMINAL, job->get_flag(job_flag_t::JOB_CONTROL) && !ld.is_event);
+    shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
+    job->tmodes = tmodes;
 
-    job->set_flag(job_flag_t::SKIP_NOTIFICATION,
-                  ld.is_subshell || ld.is_block || ld.is_event || !shell_is_interactive());
+    job->set_flag(job_flag_t::JOB_CONTROL, wants_job_control);
 
     // We are about to populate a job. One possible argument to the job is a command substitution
     // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 4643fad3e..e0e18acd0 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -41,7 +41,7 @@
 /// process if it is the first in a JOB_CONTROL job.
 /// Returns true on sucess, false on failiure.
 bool child_set_group(job_t *j, process_t *p) {
-    if (j->get_flag(job_flag_t::JOB_CONTROL)) {
+    if (j->wants_job_control()) {
         if (j->pgid == INVALID_PID) {
             j->pgid = p->pid;
         }
@@ -107,7 +107,7 @@ bool child_set_group(job_t *j, process_t *p) {
 /// group in the case of JOB_CONTROL, and we can give the new process group control of the terminal
 /// if it's to run in the foreground.
 bool set_child_group(job_t *j, pid_t child_pid) {
-    if (j->get_flag(job_flag_t::JOB_CONTROL)) {
+    if (j->wants_job_control()) {
         assert(j->pgid != INVALID_PID &&
                "set_child_group called with JOB_CONTROL before job pgid determined!");
 
@@ -135,7 +135,7 @@ bool set_child_group(job_t *j, pid_t child_pid) {
 }
 
 bool maybe_assign_terminal(const job_t *j) {
-    if (j->get_flag(job_flag_t::TERMINAL) && j->is_foreground()) {  //!OCLINT(early exit)
+    if (j->wants_terminal() && j->is_foreground()) {  //!OCLINT(early exit)
         if (tcgetpgrp(STDIN_FILENO) == j->pgid) {
             // We've already assigned the process group control of the terminal when the first
             // process in the job was started. There's no need to do so again, and on some platforms
@@ -168,7 +168,7 @@ int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s
     // Set the handling for job control signals back to the default.
     signal_reset_handlers();
 
-    if (job != nullptr && job->get_flag(job_flag_t::TERMINAL) && job->is_foreground()) {
+    if (job != nullptr && job->wants_terminal() && job->is_foreground()) {
         // Assign the terminal within the child to avoid the well-known race between tcsetgrp() in
         // the parent and the child executing. We are not interested in error handling here, except
         // we try to avoid this for non-terminals; in particular pipelines often make non-terminal
@@ -241,7 +241,7 @@ bool fork_actions_make_spawn_properties(posix_spawnattr_t *attr,
 
     bool should_set_process_group_id = false;
     int desired_process_group_id = 0;
-    if (j->get_flag(job_flag_t::JOB_CONTROL)) {
+    if (j->wants_job_control()) {
         should_set_process_group_id = true;
 
         // set_child_group puts each job into its own process group
diff --git a/src/proc.cpp b/src/proc.cpp
index 682ddfcf2..50bfd3fd5 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -279,13 +279,9 @@ void process_t::check_generations_before_launch() {
     gens_ = topic_monitor_t::principal().current_generations();
 }
 
-job_t::job_t(job_id_t jobid, io_chain_t bio, std::shared_ptr<job_t> parent)
-    : block_io(std::move(bio)),
-      parent_job(std::move(parent)),
-      pgid(INVALID_PID),
-      tmodes(),
-      job_id(jobid),
-      flags{} {}
+job_t::job_t(job_id_t job_id, const properties_t &props, io_chain_t bio,
+             std::shared_ptr<job_t> parent)
+    : properties(props), block_io(std::move(bio)), parent_job(std::move(parent)), job_id(job_id) {}
 
 job_t::~job_t() { release_job_id(job_id); }
 
@@ -490,7 +486,7 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
 
     // Handle signals other than SIGPIPE.
     // Always report crashes.
-    if (j->get_flag(job_flag_t::SKIP_NOTIFICATION) && !contains(crashsignals, s.signal_code())) {
+    if (j->skip_notification() && !contains(crashsignals, s.signal_code())) {
         return false;
     }
 
@@ -540,7 +536,7 @@ static bool job_wants_message(const shared_ptr<job_t> &j) {
     if (j->get_flag(job_flag_t::NOTIFIED)) return false;
 
     // Do we just skip notifications?
-    if (j->get_flag(job_flag_t::SKIP_NOTIFICATION)) return false;
+    if (j->skip_notification()) return false;
 
     // Are we foreground?
     // The idea here is to not print status messages for jobs that execute in the foreground (i.e.
@@ -872,7 +868,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     });
 
     if (!is_completed()) {
-        if (get_flag(job_flag_t::TERMINAL) && is_foreground()) {
+        if (wants_terminal() && is_foreground()) {
             // Put the job into the foreground and give it control of the terminal.
             // Hack: ensure that stdin is marked as blocking first (issue #176).
             make_fd_blocking(STDIN_FILENO);
@@ -980,7 +976,7 @@ void hup_background_jobs(const parser_t &parser) {
     // TODO: we should probably hup all jobs across all parsers here.
     for (const auto &j : parser.jobs()) {
         // Make sure we don't try to SIGHUP the calling builtin
-        if (j->pgid == INVALID_PID || !j->get_flag(job_flag_t::JOB_CONTROL)) {
+        if (j->pgid == INVALID_PID || !j->wants_job_control()) {
             continue;
         }
 
diff --git a/src/proc.h b/src/proc.h
index cc52fc845..ad1290491 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -140,6 +140,12 @@ class internal_proc_t {
     internal_proc_t();
 };
 
+/// 0 should not be used; although it is not a valid PGID in userspace,
+///   the Linux kernel will use it for kernel processes.
+/// -1 should not be used; it is a possible return value of the getpgid()
+///   function
+enum { INVALID_PID = -2 };
+
 /// A structure representing a single fish process. Contains variables for tracking process state
 /// and the process argument list. Actually, a fish process can be either a regular external
 /// process, an internal builtin which may or may not spawn a fake IO process during execution, a
@@ -255,15 +261,10 @@ enum class job_flag_t {
     /// Whether the specified job is completely constructed, i.e. completely parsed, and every
     /// process in the job has been forked, etc.
     CONSTRUCTED,
-    /// Whether the specified job is a part of a subshell, event handler or some other form of
-    /// special job that should not be reported.
-    SKIP_NOTIFICATION,
     /// Whether the exit status should be negated. This flag can only be set by the not builtin.
     NEGATE,
     /// Whether the job is under job control, i.e. has its own pgrp.
     JOB_CONTROL,
-    /// Whether the job wants to own the terminal when in the foreground.
-    TERMINAL,
     /// This job is disowned, and should be removed from the active jobs list.
     DISOWN_REQUESTED,
 
@@ -282,6 +283,25 @@ void release_job_id(job_id_t jobid);
 /// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
 /// of flags.
 class job_t {
+   public:
+    /// A set of jobs properties. These are immutable: they do not change for the lifetime of the
+    /// job.
+    struct properties_t {
+        /// Whether this job is in the foreground, i.e. whether it did NOT have a & at the end.
+        bool foreground{};
+
+        /// Whether the specified job is a part of a subshell, event handler or some other form of
+        /// special job that should not be reported.
+        bool skip_notification{};
+
+        /// Whether the job wants to own the terminal when in the foreground.
+        bool wants_terminal{};
+    };
+
+   private:
+    /// Set of immutable job properties.
+    const properties_t properties;
+
     /// The original command which led to the creation of this job. It is used for displaying
     /// messages about job status on the terminal.
     wcstring command_str;
@@ -298,7 +318,8 @@ class job_t {
     void operator=(const job_t &) = delete;
 
    public:
-    job_t(job_id_t jobid, io_chain_t bio, std::shared_ptr<job_t> parent);
+    job_t(job_id_t job_id, const properties_t &props, io_chain_t bio,
+          std::shared_ptr<job_t> parent);
     ~job_t();
 
     /// Returns whether the command is empty.
@@ -356,21 +377,29 @@ class job_t {
 
     /// Process group ID for the process group that this job is running in.
     /// Set to a nonexistent, non-return-value of getpgid() integer by the constructor
-    pid_t pgid;
+    pid_t pgid{INVALID_PID};
+
+    /// The id of this job.
+    const job_id_t job_id;
+
     /// The saved terminal modes of this job. This needs to be saved so that we can restore the
     /// terminal to the same state after temporarily taking control over the terminal when a job
     /// stops.
-    struct termios tmodes;
-    /// The job id of the job. This is a small integer that is a unique identifier of the job within
-    /// this shell, and is used e.g. in process expansion.
-    const job_id_t job_id;
+    struct termios tmodes {};
+
     /// Bitset containing information about the job. A combination of the JOB_* constants.
-    enum_set_t<job_flag_t> flags;
+    enum_set_t<job_flag_t> flags{};
 
     // Get and set flags
     bool get_flag(job_flag_t flag) const;
     void set_flag(job_flag_t flag, bool set);
 
+    /// \return if we want job control.
+    bool wants_job_control() const { return get_flag(job_flag_t::JOB_CONTROL); }
+
+    /// \return if this job wants to own the terminal in the foreground.
+    bool wants_terminal() const { return properties.wants_terminal; }
+
     /// Returns the block IO redirections associated with the job. These are things like the IO
     /// redirections associated with the begin...end statement.
     const io_chain_t &block_io_chain() const { return this->block_io; }
@@ -382,7 +411,7 @@ class job_t {
     /// The job has been fully constructed, i.e. all its member processes have been launched
     bool is_constructed() const { return get_flag(job_flag_t::CONSTRUCTED); }
     /// The job was launched in the foreground and has control of the terminal
-    bool is_foreground() const { return get_flag(job_flag_t::FOREGROUND); }
+    bool is_foreground() const { return properties.foreground; }
     /// The job is complete, i.e. all its member processes have been reaped
     bool is_completed() const;
     /// The job is in a stopped state
@@ -391,6 +420,7 @@ class job_t {
     bool is_visible() const {
         return !is_completed() && is_constructed() && !get_flag(job_flag_t::DISOWN_REQUESTED);
     };
+    bool skip_notification() const { return properties.skip_notification; }
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }
@@ -509,12 +539,6 @@ pid_t terminal_acquire_before_builtin(int job_pgid);
 /// Used to avoid zombie processes after disown.
 void add_disowned_pgid(pid_t pgid);
 
-/// 0 should not be used; although it is not a valid PGID in userspace,
-///   the Linux kernel will use it for kernel processes.
-/// -1 should not be used; it is a possible return value of the getpgid()
-///   function
-enum { INVALID_PID = -2 };
-
 bool have_proc_stat();
 
 #endif

From 27e4d1d62d4d91b3fb96d2cc7b3c9b8fde4dc3c3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 23 Jun 2019 16:19:13 -0700
Subject: [PATCH 0736/1732] Revert "Revert "Don't service ioport completions if
 data is available on stdin""

This reverts commit 005e6f2ab8cf2dd9a2c7801d0bd02729a1535233.

This allows new text entry to take priority over highlighting, improving the
performance of pasting.
---
 src/input_common.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/input_common.cpp b/src/input_common.cpp
index c9457fe9a..b7bd37f10 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -104,13 +104,6 @@ char_event_t input_event_queue_t::readb() {
                 }
             }
 
-            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
-                iothread_service_completion();
-                if (auto mc = pop_discard_timeouts()) {
-                    return *mc;
-                }
-            }
-
             if (FD_ISSET(STDIN_FILENO, &fdset)) {
                 unsigned char arr[1];
                 if (read_blocked(0, arr, 1) != 1) {
@@ -121,6 +114,15 @@ char_event_t input_event_queue_t::readb() {
                 // We read from stdin, so don't loop.
                 return arr[0];
             }
+
+            // Check for iothread completions only if there is no data to be read from the stdin.
+            // This gives priority to the foreground.
+            if (ioport > 0 && FD_ISSET(ioport, &fdset)) {
+                iothread_service_completion();
+                if (auto mc = pop_discard_timeouts()) {
+                    return *mc;
+                }
+            }
         }
     }
 }

From 8f7a47547e0f8e3055f51dddd59e1cce7bd49618 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 24 Jun 2019 19:12:20 +0200
Subject: [PATCH 0737/1732] functions/__fish_print_hostnames: Don't run `getent
 hosts` twice

`getent hosts` is expensive-ish - ~50ms, so we don't want to run it
twice just to figure out it works.

Apparently this works everywhere but CYGWIN and possibly older
OpenBSD, but we don't want to explicitly blacklist those.

[ci skip]
---
 share/functions/__fish_print_hostnames.fish | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index f18483b9a..0d32cb9cf 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -1,13 +1,14 @@
 function __fish_print_hostnames -d "Print a list of known hostnames"
     # Print all hosts from /etc/hosts. Use 'getent hosts' on OSes that support it
-    # (OpenBSD and Cygwin do not).
+    # (apparently just Cygwin does not).
     #
     # Test if 'getent hosts' works and redirect output so errors don't print.
-    if type -q getent
-        and getent hosts >/dev/null 2>&1
-        # Ignore zero IPs.
-        getent hosts | string match -r -v '^0.0.0.0' | string replace -r '^\s*\S+\s+' '' | string split ' '
-    else if test -r /etc/hosts
+    #
+    # This is all done under the assumption that `getent` *might* print more hosts than the static /etc/hosts.
+    type -q getent
+    # Ignore zero IPs.
+    and getent hosts 2>/dev/null | string match -r -v '^0.0.0.0' | string replace -r '^\s*\S+\s+' '' | string split ' '
+    or if test -r /etc/hosts
         # Ignore commented lines and functionally empty lines.
         string match -r -v '^\s*0.0.0.0|^\s*#|^\s*$' </etc/hosts | string replace -r -a '#.*$' '' | string replace -r '^\s*\S+\s+' '' | string trim | string replace -r -a '\s+' ' ' | string split ' '
     end

From 9cd29e5166d4cdf35bf66ac016d5b0cfae7620a9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 24 Jun 2019 22:11:49 +0200
Subject: [PATCH 0738/1732] cmake: Add -Wno-redundant-mode

This warns about one bit in env_dispatch, where a comment explains
that the move *is* necessary, on a different libc++.
---
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19b098b0c..03ec972d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,14 @@ endif()
 # - comment because we use a bunch of those, and they're not really all that harmful.
 # - address, because that occurs for our mkostemp check (weak-linking requires us to compare `&mkostemp == nullptr`).
 # - strict-aliasing, because on old GCCs (*Travis*) those are triggered by maybe.h, so you get it every time it is included.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-implicit-fallthrough -Wno-comment -Wno-address -Wno-strict-aliasing")
+# - redundant-move, because we have one that is required on old libc
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
+-Wno-implicit-fallthrough \
+-Wno-comment \
+-Wno-address \
+-Wno-strict-aliasing \
+-Wno-redundant-move \
+")
 
 # Disable exception handling.
 ADD_COMPILE_OPTIONS(-fno-exceptions)

From 3bc392a6b3de409b8c055ee4f599cc66c9a28bf9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 08:38:12 +0200
Subject: [PATCH 0739/1732] functions/__fish_print_hostnames: Check getent's
 status

This previously effectively checked `string split ' '`s return status,
which was false if it didn't split anything. And while that should be
true if getent fails (because it should produce no output), it's also
true if it doesn't print a line with multiple aliases. Which should be
fairly typical.

Instead we use our new-found $pipestatus to check what getent returns,
in the assumption that it'll fail if it doesn't support hosts.

Follow up to 8f7a47547e0f8e3055f51dddd59e1cce7bd49618.

[ci skip]
---
 share/functions/__fish_print_hostnames.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 0d32cb9cf..f4f07690f 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -8,7 +8,8 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
     type -q getent
     # Ignore zero IPs.
     and getent hosts 2>/dev/null | string match -r -v '^0.0.0.0' | string replace -r '^\s*\S+\s+' '' | string split ' '
-    or if test -r /etc/hosts
+    # We care about _getent_s status, not `string split`s.
+    if test $pipestatus[1] -ne 0; and test -r /etc/hosts
         # Ignore commented lines and functionally empty lines.
         string match -r -v '^\s*0.0.0.0|^\s*#|^\s*$' </etc/hosts | string replace -r -a '#.*$' '' | string replace -r '^\s*\S+\s+' '' | string trim | string replace -r -a '\s+' ' ' | string split ' '
     end

From caedf01c00b73c6c766bd0b00220f12d8f878e5c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 11:16:48 +0200
Subject: [PATCH 0740/1732] Revert "Latch signal handlers"

This reverts commit 7ed1022cf41cd1b0111a7c280528324527fc8570.

Fixes #5962.
---
 src/fish_tests.cpp |  2 +-
 src/proc.cpp       |  5 ++++-
 src/reader.cpp     |  2 +-
 src/signal.cpp     | 12 ++----------
 src/signal.h       |  8 +-------
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 32bec017f..74dbd22b6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1014,7 +1014,7 @@ static void test_cancellation() {
     // Enable fish's signal handling here. We need to make this interactive for fish to install its
     // signal handlers.
     proc_push_interactive(1);
-    signal_set_handlers(true);
+    signal_set_handlers();
 
     // This tests that we can correctly ctrl-C out of certain loop constructs, and that nothing gets
     // printed if we do.
diff --git a/src/proc.cpp b/src/proc.cpp
index 50bfd3fd5..c28f357b4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -955,15 +955,18 @@ void proc_sanity_check(const parser_t &parser) {
 
 void proc_push_interactive(int value) {
     ASSERT_IS_MAIN_THREAD();
+    int old = is_interactive;
     interactive_stack.push_back(is_interactive);
     is_interactive = value;
-    signal_set_handlers_once(is_interactive);
+    if (old != value) signal_set_handlers();
 }
 
 void proc_pop_interactive() {
     ASSERT_IS_MAIN_THREAD();
+    int old = is_interactive;
     is_interactive = interactive_stack.back();
     interactive_stack.pop_back();
+    if (is_interactive != old) signal_set_handlers();
 }
 
 void proc_wait_any(parser_t &parser) {
diff --git a/src/reader.cpp b/src/reader.cpp
index 43ee6f0a2..cf23e944c 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1744,7 +1744,7 @@ static void reader_interactive_init() {
             }
         }
 
-        signal_set_handlers(shell_is_interactive());
+        signal_set_handlers();
     }
 
     // It shouldn't be necessary to place fish in its own process group and force control
diff --git a/src/signal.cpp b/src/signal.cpp
index 117cf1343..946961454 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -325,7 +325,7 @@ static void set_interactive_handlers() {
 }
 
 /// Sets up appropriate signal handlers.
-void signal_set_handlers(bool interactive) {
+void signal_set_handlers() {
     struct sigaction act;
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
@@ -354,19 +354,11 @@ void signal_set_handlers(bool interactive) {
         FATAL_EXIT();
     }
 
-    if (interactive) {
+    if (shell_is_interactive()) {
         set_interactive_handlers();
     }
 }
 
-void signal_set_handlers_once(bool interactive) {
-    static std::once_flag s_noninter_once;
-    std::call_once(s_noninter_once, signal_set_handlers, false);
-
-    static std::once_flag s_inter_once;
-    if (interactive) std::call_once(s_inter_once, set_interactive_handlers);
-}
-
 void signal_handle(int sig, int do_handle) {
     struct sigaction act;
 
diff --git a/src/signal.h b/src/signal.h
index 3aa8316f6..be0011203 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -17,13 +17,7 @@ const wchar_t *signal_get_desc(int sig);
 void signal_reset_handlers();
 
 /// Set signal handlers to fish default handlers.
-/// If \p interactive is set, apply interactive handlers as well.
-/// Note interactive handlers, once applied, are not cleared; they are a strict superset of
-/// non-interactive handlers.
-void signal_set_handlers(bool interactive);
-
-/// Latch function. This sets signal handlers, but only the first time it is called.
-void signal_set_handlers_once(bool interactive);
+void signal_set_handlers();
 
 /// Tell fish what to do on the specified signal.
 ///

From 427a18c1ea35fd8b0ec06707b68ffca579ae50cf Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 15:06:26 +0200
Subject: [PATCH 0741/1732] fish_git_prompt: Add a way to use the informative
 chars

$__fish_git_prompt_use_informative_chars will use the informative
chars without requiring informative mode (which is really frickin'
slow!).

See #5726.

[ci skip]
---
 CHANGELOG.md                            | 1 +
 share/functions/fish_git_prompt.fish    | 6 ++++--
 sphinx_doc_src/cmds/fish_git_prompt.rst | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03103e527..220409049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
   - `bosh`
   - `vagrant`
 - The git prompt in informative mode now shows the number of stashes if enabled.
+- The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
 - If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index 16b4e4a48..d3820bc67 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -689,7 +689,9 @@ function __fish_git_prompt_set_char
     end
 
     if set -q argv[3]
-        and set -q __fish_git_prompt_show_informative_status
+        and begin set -q __fish_git_prompt_show_informative_status
+            or set -q __fish_git_prompt_use_informative_chars
+        end
         set char $argv[3]
     end
 
@@ -792,7 +794,7 @@ function __fish_git_prompt_validate_colors --description "fish_git_prompt helper
 end
 
 set -l varargs
-for var in repaint describe_style show_informative_status showdirtystate showstashstate showuntrackedfiles showupstream
+for var in repaint describe_style show_informative_status use_informative_chars showdirtystate showstashstate showuntrackedfiles showupstream
     set -a varargs --on-variable __fish_git_prompt_$var
 end
 function __fish_git_prompt_repaint $varargs --description "Event handler, repaints prompt when functionality changes"
diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 2bd1a914b..a89dd7bae 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -50,7 +50,7 @@ There are numerous customization options, which can be controlled with git optio
 
 - ``$__fish_git_prompt_showcolorhints`` can be set to enable coloring for the branch name and status symbols.
 
-A number of variables set characters and color used as indicators. Many of these have a different default if used with informative status enabled. The usual default is given first, then the informative default (if it is different). If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
+A number of variables set characters and color used as indicators. Many of these have a different default if used with informative status enabled, or ``$__fish_git_prompt_use_informative_chars`` set. The usual default is given first, then the informative default (if it is different). If no default for the colors is given, they default to ``$__fish_git_prompt_color``.
 
 - ``$__fish_git_prompt_char_stateseparator`` (' ', `|`)
 - ``$__fish_git_prompt_color`` ('')

From cc1388a78ab36bf579029bf05df552c2ff346709 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 16:06:13 +0200
Subject: [PATCH 0742/1732] Upgrade littlecheck to allow whitespace before
 comments

Necessary for test files that pass fish_indent.
---
 build_tools/littlecheck.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_tools/littlecheck.py b/build_tools/littlecheck.py
index f6ea365e8..8fe5841dd 100755
--- a/build_tools/littlecheck.py
+++ b/build_tools/littlecheck.py
@@ -12,13 +12,13 @@ import subprocess
 import sys
 
 # A regex showing how to run the file.
-RUN_RE = re.compile(r"#\s*RUN:\s+(.*)\n")
+RUN_RE = re.compile(r"\s*#\s*RUN:\s+(.*)\n")
 
 # A regex capturing lines that should be checked against stdout.
-CHECK_STDOUT_RE = re.compile(r"#\s*CHECK:\s+(.*)\n")
+CHECK_STDOUT_RE = re.compile(r"\s*#\s*CHECK:\s+(.*)\n")
 
 # A regex capturing lines that should be checked against stderr.
-CHECK_STDERR_RE = re.compile(r"#\s*CHECKERR:\s+(.*)\n")
+CHECK_STDERR_RE = re.compile(r"\s*#\s*CHECKERR:\s+(.*)\n")
 
 
 class Config(object):

From 60edc9a45d5e6f402cee98c793991c2a73b9c62c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 16:07:26 +0200
Subject: [PATCH 0743/1732] Port argparse tests to littlecheck

This is a nice test (ha!) for how this works and what littlecheck can
do for us.

1. Input is now the actual file, not "Standard Input" anymore. So
any errors mentioning that now include the filename.
2. Regex are really nice for filenames, but especially for line
numbers
3. It's much nicer to have the output where it's created, instead of
needing to follow three files at the same time.
---
 tests/checks/argparse.fish | 302 +++++++++++++++++++++++++++++++++++++
 1 file changed, 302 insertions(+)
 create mode 100644 tests/checks/argparse.fish

diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
new file mode 100644
index 000000000..4c25a3fbc
--- /dev/null
+++ b/tests/checks/argparse.fish
@@ -0,0 +1,302 @@
+#RUN: %fish %s
+##########
+# Start by verifying a bunch of error conditions.
+
+# No args is an error
+argparse
+#CHECKERR: argparse: No option specs were provided
+
+# Missing -- is an error
+argparse h/help
+#CHECKERR: argparse: Missing -- separator
+
+# Flags but no option specs is an error
+argparse -s -- hello
+#CHECKERR: argparse: No option specs were provided
+
+# Invalid option specs
+argparse h-
+argparse +help
+argparse h/help:
+argparse h-help::
+argparse h-help=x
+#CHECKERR: argparse: Invalid option spec 'h-' at char '-'
+#CHECKERR: argparse: Short flag '+' invalid, must be alphanum or '#'
+#CHECKERR: argparse: Invalid option spec 'h/help:' at char ':'
+#CHECKERR: argparse: Invalid option spec 'h-help::' at char ':'
+#CHECKERR: argparse: Invalid option spec 'h-help=x' at char 'x'
+
+# --max-args and --min-args work
+begin
+    argparse --name min-max --min-args 1 h/help --
+    #CHECKERR: min-max: Expected at least 1 args, got only 0
+    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1
+    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1 arg2
+    argparse --name min-max --min-args 1 --max-args 3 h/help -- --help arg1 arg2 arg3
+    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1 arg2 -h arg3 arg4
+    #CHECKERR: min-max: Expected at most 3 args, got 4
+    argparse --name min-max --max-args 1 h/help --
+    argparse --name min-max --max-args 1 h/help -- arg1
+    argparse --name min-max --max-args 1 h/help -- arg1 arg2
+    #CHECKERR: min-max: Expected at most 1 args, got 2
+end
+
+# Invalid \"#-val\" spec
+begin
+    argparse '#-val=' -- abc -x def
+    # CHECKERR: argparse: Implicit int short flag '#' does not allow modifiers like '='
+end
+
+# Invalid arg in the face of a \"#-val\" spec
+begin
+    argparse '#-val' -- abc -x def
+    # CHECKERR: argparse: Unknown option '-x'
+    # CHECKERR: {{.*}}argparse.fish (line {{\d+}}):
+    # CHECKERR: argparse '#-val' -- abc -x def
+    # CHECKERR: {{\s*\^\s*}}
+end
+
+# Defining a short flag more than once
+begin
+    argparse 's/short' 'x/xray' 's/long' -- -s -x --long
+    # CHECKERR: argparse: Short flag 's' already defined
+end
+
+# Defining a long flag more than once
+begin
+    argparse 's/short' 'x/xray' 'l/short' -- -s -x --long
+    # CHECKERR: argparse: Long flag 'short' already defined
+end
+
+# Defining an implicit int flag more than once
+begin
+    argparse '#-val' 'x/xray' 'v#val' -- -s -x --long
+    # CHECKERR: argparse: Implicit int flag '#' already defined
+end
+
+# Defining an implicit int flag with modifiers
+begin
+    argparse 'v#val=' --
+    # CHECKERR: argparse: Implicit int short flag 'v' does not allow modifiers like '='
+end
+
+##########
+# Now verify that validly formed invocations work as expected.
+
+# No args
+begin
+    argparse h/help --
+end
+
+# One arg and no matching flags
+begin
+    argparse h/help -- help
+    set -l
+    # CHECK: argv help
+end
+
+# Five args with two matching a flag
+begin
+    argparse h/help -- help --help me -h 'a lot more'
+    set -l
+    # CHECK: _flag_h '--help'  '-h'
+    # CHECK: _flag_help '--help'  '-h'
+    # CHECK: argv 'help'  'me'  'a lot more'
+end
+
+# Required, optional, and multiple flags
+begin
+    argparse 'h/help' 'a/abc=' 'd/def=?' 'g/ghk=+' -- help --help me --ghk=g1 --abc=ABC --ghk g2 --d -g g3
+    set -l
+    # CHECK: _flag_a ABC
+    # CHECK: _flag_abc ABC
+    # CHECK: _flag_d
+    # CHECK: _flag_def
+    # CHECK: _flag_g 'g1'  'g2'  'g3'
+    # CHECK: _flag_ghk 'g1'  'g2'  'g3'
+    # CHECK: _flag_h --help
+    # CHECK: _flag_help --help
+    # CHECK: argv 'help'  'me'
+end
+
+# --stop-nonopt works
+begin
+    argparse --stop-nonopt 'h/help' 'a/abc=' -- -a A1 -h --abc A2 non-opt 'second non-opt' --help
+    set -l
+    # CHECK: _flag_a A2
+    # CHECK: _flag_abc A2
+    # CHECK: _flag_h -h
+    # CHECK: _flag_help -h
+    # CHECK: argv 'non-opt'  'second non-opt'  '--help'
+end
+
+# Implicit int flags work
+begin
+    argparse '#-val' -- abc -123 def
+    set -l
+    # CHECK: _flag_val 123
+    # CHECK: argv 'abc'  'def'
+end
+begin
+    argparse 'v/verbose' '#-val' 't/token=' -- -123 a1 --token woohoo --234 -v a2 --verbose
+    set -l
+    # CHECK: _flag_t woohoo
+    # CHECK: _flag_token woohoo
+    # CHECK: _flag_v '-v'  '--verbose'
+    # CHECK: _flag_val -234
+    # CHECK: _flag_verbose '-v'  '--verbose'
+    # CHECK: argv 'a1'  'a2'
+end
+
+# Should be set to 987
+begin
+    argparse 'm#max' -- argle -987 bargle
+    set -l
+    # CHECK: _flag_m 987
+    # CHECK: _flag_max 987
+    # CHECK: argv 'argle'  'bargle'
+end
+
+# Should be set to 765
+begin
+    argparse 'm#max' -- argle -987 bargle --max 765
+    set -l
+    # CHECK: _flag_m 765
+    # CHECK: _flag_max 765
+    # CHECK: argv 'argle'  'bargle'
+end
+
+# Bool short flag only
+begin
+    argparse 'C' 'v' -- -C -v arg1 -v arg2
+    set -l
+    # CHECK: _flag_C -C
+    # CHECK: _flag_v '-v'  '-v'
+    # CHECK: argv 'arg1'  'arg2'
+end
+
+# Value taking short flag only
+begin
+    argparse 'x=' 'v/verbose' -- --verbose arg1 -v -x arg2
+    set -l
+    # CHECK: _flag_v '--verbose'  '-v'
+    # CHECK: _flag_verbose '--verbose'  '-v'
+    # CHECK: _flag_x arg2
+    # CHECK: argv arg1
+end
+
+# Implicit int short flag only
+begin
+    argparse 'x#' 'v/verbose' -- -v -v argle -v -x 321 bargle
+    set -l
+    # CHECK: _flag_v '-v'  '-v'  '-v'
+    # CHECK: _flag_verbose '-v'  '-v'  '-v'
+    # CHECK: _flag_x 321
+    # CHECK: argv 'argle'  'bargle'
+end
+
+# Implicit int short flag only with custom validation passes
+begin
+    argparse 'x#!_validate_int --max 500' 'v/verbose' -- -v -v -x 499 -v
+    set -l
+    # CHECK: _flag_v '-v'  '-v'  '-v'
+    # CHECK: _flag_verbose '-v'  '-v'  '-v'
+    # CHECK: _flag_x 499
+    # CHECK: argv
+end
+
+# Implicit int short flag only with custom validation fails
+begin
+    argparse 'x#!_validate_int --min 500' 'v/verbose' -- -v -v -x 499 -v
+    set -l
+    # CHECKERR: argparse: Value '499' for flag 'x' less than min allowed of '500'
+end
+
+##########
+# Verify that flag value validation works.
+
+# Implicit int flag validation fails
+argparse 'm#max' -- argle --max 765x bargle
+and echo unxpected argparse return status >&2
+argparse 'm#max' -- argle -ma1 bargle
+and echo unxpected argparse return status >&2
+# CHECKERR: argparse: Value '765x' for flag 'max' is not an integer
+# CHECKERR: argparse: Value 'a1' for flag 'm' is not an integer
+
+# Check the exit status from argparse validation
+argparse 'm#max!set | grep _flag_; function x; return 57; end; x' -- argle --max=83 bargle 2>&1
+set -l saved_status $status
+test $saved_status -eq 57
+and echo expected argparse return status $saved_status
+# CHECK: _flag_name max
+# CHECK: _flag_value 83
+# CHECK: expected argparse return status 57
+
+# Explicit int flag validation
+# These should fail
+argparse 'm#max!_validate_int --min 1 --max 1' -- argle -m2 bargle
+and echo unexpected argparse return status $status >&2
+argparse 'm#max!_validate_int --min 0 --max 1' -- argle --max=-1 bargle
+and echo unexpected argparse return status $status >&2
+# CHECKERR: argparse: Value '2' for flag 'm' greater than max allowed of '1'
+# CHECKERR: argparse: Value '-1' for flag 'max' less than min allowed of '0'
+# These should succeed
+argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=0 bargle
+or echo unexpected argparse return status $status >&2
+argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=1 bargle
+or echo unexpected argparse return status $status >&2
+
+# Errors use function name by default
+function notargparse
+    argparse a/alpha -- --banana
+end
+notargparse
+# CHECKERR: notargparse: Unknown option '--banana'
+# CHECKERR: {{.*}}argparse.fish (line {{\d+}}):
+# CHECKERR:     argparse a/alpha -- --banana
+# CHECKERR:     ^
+# CHECKERR: in function 'notargparse'
+# CHECKERR: called on line {{\d+}} of file {{.*}}argparse.fish
+
+true
+
+# Ignoring unknown options
+argparse -i a=+ b=+ -- -a alpha -b bravo -t tango -a aaaa --wurst
+or echo unexpected argparse return status $status >&2
+# The unknown options are removed _entirely_.
+echo $argv
+echo $_flag_a
+# CHECK: -t tango --wurst
+# CHECK: alpha aaaa
+
+# Check for crash when last option is unknown
+argparse -i b/break -- "-b kubectl get pods -l name=foo"
+
+begin
+    # Checking arguments after "--"
+    argparse a/alpha -- a --alpha -- b -a
+    printf '%s\n' $argv
+    # CHECK: a
+    # CHECK: b
+    # CHECK: -a
+end
+
+# #5864 - short flag only with same validation function.
+# Checking validation for short flags only
+argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o banana
+argparse 'i=!_validate_int' 'o=!_validate_int' -- -i -o banana
+# CHECKERR: argparse: Value 'banana' for flag 'o' is not an integer
+# CHECKERR: argparse: Value '-o' for flag 'i' is not an integer
+begin
+    argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o 3
+    set -l
+    # CHECK: _flag_a 'alpha'  'aaaa'
+    # CHECK: _flag_b -b
+    # CHECK: _flag_break -b
+    # CHECK: _flag_i 2
+    # CHECK: _flag_m 1
+    # CHECK: _flag_max 1
+    # CHECK: _flag_o 3
+    # CHECK: argv
+    # CHECK: saved_status 57
+end

From 77d84870786915bdf0141438930259531470a837 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 17:15:48 +0200
Subject: [PATCH 0744/1732] string: Also stop printing documentation

Especially as, in this case, the documentation is quite massive.

Caught by porting string's test to littlecheck.

See #3404 - this was already supposed to be included.
---
 src/builtin_string.cpp |  6 +++---
 tests/string.err       | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 84f64a23f..ed07be5dc 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -55,7 +55,7 @@ static void string_error(io_streams_t &streams, const wchar_t *fmt, ...) {
 static void string_unknown_option(parser_t &parser, io_streams_t &streams, const wchar_t *subcmd,
                                   const wchar_t *opt) {
     string_error(streams, BUILTIN_ERR_UNKNOWN, subcmd, opt);
-    builtin_print_help(parser, streams, L"string", streams.err);
+    builtin_print_error_trailer(parser, streams.err, L"string");
 }
 
 // We read from stdin if we are the second or later process in a pipeline.
@@ -1344,7 +1344,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int argc = builtin_count_args(argv);
     if (argc <= 1) {
         streams.err.append_format(BUILTIN_ERR_MISSING_SUBCMD, cmd);
-        builtin_print_help(parser, streams, L"string", streams.err);
+        builtin_print_error_trailer(parser, streams.err, L"string");
         return STATUS_INVALID_ARGS;
     }
 
@@ -1359,7 +1359,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
     if (!subcmd->handler) {
         streams.err.append_format(BUILTIN_ERR_INVALID_SUBCMD, cmd, argv[1]);
-        builtin_print_help(parser, streams, L"string", streams.err);
+        builtin_print_error_trailer(parser, streams.err, L"string");
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/tests/string.err b/tests/string.err
index 9718fd86c..f5f3ad2f8 100644
--- a/tests/string.err
+++ b/tests/string.err
@@ -189,6 +189,12 @@ string match: ^
 # string invalidarg
 string: Subcommand 'invalidarg' is not valid
 
+Standard input (line 215): 
+string invalidarg; and echo "unexpected exit 0"
+^
+
+(Type 'help string' for related documentation)
+
 ####################
 # string length
 
@@ -271,6 +277,12 @@ string repeat: Expected argument
 # string repeat -l fakearg 2>&1
 string repeat: Unknown option '-l'
 
+Standard input (line 291): 
+string repeat -l fakearg
+^
+
+(Type 'help string' for related documentation)
+
 ####################
 # string repeat ""
 

From 1bba77e4853d9b90718ace40f40a6d5e08479e90 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 17:21:11 +0200
Subject: [PATCH 0745/1732] Port string tests to littlecheck

`wc -l tests/string.*`
  329 tests/string.err
  422 tests/string.in
  520 tests/string.out
 1271 total

`wc -l tests/checks/string.fish`
 555 tests/checks/string.fish

and it looks nicer. 'nuff said.
---
 tests/checks/string.fish | 555 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 555 insertions(+)
 create mode 100644 tests/checks/string.fish

diff --git a/tests/checks/string.fish b/tests/checks/string.fish
new file mode 100644
index 000000000..c27b6b6c1
--- /dev/null
+++ b/tests/checks/string.fish
@@ -0,0 +1,555 @@
+#RUN: %fish %s
+# Tests for string builtin. Mostly taken from man page examples.
+
+string match -r -v "c.*" dog can cat diz; and echo "exit 0"
+# CHECK: dog
+# CHECK: diz
+# CHECK: exit 0
+
+string match -q -r -v "c.*" dog can cat diz; and echo "exit 0"
+# CHECK: exit 0
+
+string match -v "c*" dog can cat diz; and echo "exit 0"
+# CHECK: dog
+# CHECK: diz
+# CHECK: exit 0
+
+string match -q -v "c*" dog can cat diz; and echo "exit 0"
+# CHECK: exit 0
+
+string match -v "d*" dog dan dat diz; or echo "exit 1"
+# CHECK: exit 1
+
+string match -q -v "d*" dog dan dat diz; or echo "exit 1"
+# CHECK: exit 1
+
+string match -r -v x y; and echo "exit 0"
+# CHECK: y
+# CHECK: exit 0
+
+string match -r -v x x; or echo "exit 1"
+# CHECK: exit 1
+
+string match -q -r -v x y; and echo "exit 0"
+# CHECK: exit 0
+
+string match -q -r -v x x; or echo "exit 1"
+# CHECK: exit 1
+
+string length "hello, world"
+# CHECK: 12
+
+string length -q ""; and echo not zero length; or echo zero length
+# CHECK: zero length
+
+string sub --length 2 abcde
+# CHECK: ab
+
+string sub -s 2 -l 2 abcde
+# CHECK: bc
+
+string sub --start=-2 abcde
+# CHECK: de
+
+string split . example.com
+# CHECK: example
+# CHECK: com
+
+string split -r -m1 / /usr/local/bin/fish
+# CHECK: /usr/local/bin
+# CHECK: fish
+
+string split "" abc
+# CHECK: a
+# CHECK: b
+# CHECK: c
+
+seq 3 | string join ...
+# CHECK: 1...2...3
+
+string trim " abc  "
+# CHECK: abc
+
+string trim --right --chars=yz xyzzy zany
+# CHECK: x
+# CHECK: zan
+
+echo \x07 | string escape
+# CHECK: \cg
+
+string escape --style=script 'a b#c"\'d'
+# CHECK: a\ b\#c\"\'d
+
+string escape --style=url 'a b#c"\'d'
+# CHECK: a%20b%23c%22%27d
+
+string escape --style=url \na\nb%c~d\n
+# CHECK: %0Aa%0Ab%25c~d%0A
+
+string escape --style=var 'a b#c"\'d'
+# CHECK: a_20_b_23_c_22_27_d
+
+string escape --style=var a\nghi_
+# CHECK: a_0A_ghi__
+
+string escape --style=var 'abc'
+# CHECK: abc
+
+string escape --style=var '_a_b_c_'
+# CHECK: __a__b__c__
+
+string escape --style=var -- -
+# CHECK: _2D_
+
+# string escape with multibyte chars
+string escape --style=url aöb
+string escape --style=url 中
+string escape --style=url aöb | string unescape --style=url
+string escape --style=url 中 | string unescape --style=url
+
+string escape --style=var aöb
+string escape --style=var 中
+string escape --style=var aöb | string unescape --style=var
+string escape --style=var 中 | string unescape --style=var
+# CHECK: a%C3%B6b
+# CHECK: %E4%B8%AD
+# CHECK: aöb
+# CHECK: 中
+# CHECK: a_C3_B6_b
+# CHECK: _E4_B8_AD_
+# CHECK: aöb
+# CHECK: 中
+
+# test regex escaping
+string escape --style=regex ".ext"
+string escape --style=regex "bonjour, amigo"
+string escape --style=regex "^this is a literal string"
+# CHECK: \.ext
+# CHECK: bonjour, amigo
+# CHECK: \^this is a literal string
+
+### Verify that we can correctly unescape the same strings
+#   we tested escaping above.
+set x (string unescape (echo \x07 | string escape))
+test $x = \x07
+and echo success
+# CHECK: success
+
+string unescape --style=script (string escape --style=script 'a b#c"\'d')
+# CHECK: a b#c"'d
+
+string unescape --style=url (string escape --style=url 'a b#c"\'d')
+# CHECK: a b#c"'d
+
+string unescape --style=url (string escape --style=url \na\nb%c~d\n)
+# CHECK: 
+# CHECK: a
+# CHECK: b%c~d
+
+string unescape --style=var (string escape --style=var 'a b#c"\'d')
+# CHECK: a b#c"'d
+
+string unescape --style=var (string escape --style=var a\nghi_)
+# CHECK: a
+# CHECK: ghi_
+
+string unescape --style=var (string escape --style=var 'abc')
+# CHECK: abc
+
+string unescape --style=var (string escape --style=var '_a_b_c_')
+# CHECK: _a_b_c_
+
+string unescape --style=var -- (string escape --style=var -- -)
+# CHECK: -
+
+### Verify that we can correctly match strings.
+string match "*" a
+# CHECK: a
+
+string match "a*b" axxb
+# CHECK: axxb
+
+string match -i "a**B" Axxb
+# CHECK: Axxb
+
+echo "ok?" | string match "*?"
+# CHECK: ok?
+
+string match -r "cat|dog|fish" "nice dog"
+# CHECK: dog
+
+string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56
+# CHECK: 2:34:56
+# CHECK: 2
+# CHECK: 34
+# CHECK: 56
+
+string match -r "^(\w{2,4})\g1\$" papa mud murmur
+# CHECK: papa
+# CHECK: pa
+# CHECK: murmur
+# CHECK: mur
+
+string match -r -a -n at ratatat
+# CHECK: 2 2
+# CHECK: 4 2
+# CHECK: 6 2
+
+string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"
+# CHECK: 0xBadC0de
+
+string replace is was "blue is my favorite"
+# CHECK: blue was my favorite
+
+string replace 3rd last 1st 2nd 3rd
+# CHECK: 1st
+# CHECK: 2nd
+# CHECK: last
+
+string replace -a " " _ "spaces to underscores"
+# CHECK: spaces_to_underscores
+
+string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"
+# CHECK: 0 3.14 5 
+
+string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"
+# CHECK: right left $
+
+string replace -r "\s*newline\s*" "\n" "put a newline here"
+# CHECK: put a
+# CHECK: here
+
+string replace -r -a "(\w)" "\$1\$1" ab
+# CHECK: aabb
+
+string replace --filter x X abc axc x def jkx
+or echo Unexpected exit status at line (status --current-line-number)
+# CHECK: aXc
+# CHECK: X
+# CHECK: jkX
+
+string replace --filter y Y abc axc x def jkx
+and echo Unexpected exit status at line (status --current-line-number)
+
+string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
+or echo Unexpected exit status at line (status --current-line-number)
+# CHECK: Xbc
+# CHECK: X
+# CHECK: dXf
+# CHECK: jkX
+
+string replace --regex -f "Z" X 1bc axc 2 d3f jk4 xyz
+and echo Unexpected exit status at line (status --current-line-number)
+
+# From https://github.com/fish-shell/fish-shell/issues/5201
+# 'string match -r with empty capture groups'
+string match -r '^([ugoa]*)([=+-]?)([rwx]*)$' '=r'
+#CHECK: =r
+#CHECK: 
+#CHECK: =
+#CHECK: r
+
+### Test some failure cases
+string match -r "[" "a[sd"; and echo "unexpected exit 0"
+# CHECKERR: string match: Regular expression compile error: missing terminating ] for character class
+# CHECKERR: string match: [
+# CHECKERR: string match: ^
+
+# FIXME: This prints usage summary?
+#string invalidarg; and echo "unexpected exit 0"
+# DONTCHECKERR: string: Subcommand 'invalidarg' is not valid
+
+string length; or echo "missing argument returns 1"
+# CHECK: missing argument returns 1
+
+string match -r -v "[dcantg].*" dog can cat diz; or echo "no regexp invert match"
+# CHECK: no regexp invert match
+
+string match -v "*" dog can cat diz; or echo "no glob invert match"
+# CHECK: no glob invert match
+
+string match -rvn a bbb; or echo "exit 1"
+# CHECK: 1 3
+
+### Test repeat subcommand
+string repeat -n 2 "foo"
+# CHECK: foofoo
+
+string repeat --count 2 "foo"
+# CHECK: foofoo
+
+echo foo | string repeat -n 2
+# CHECK: foofoo
+
+string repeat -n2 -q "foo"; and echo "exit 0"
+# CHECK: exit 0
+
+string repeat -n2 --quiet "foo"; and echo "exit 0"
+# CHECK: exit 0
+
+string repeat -n0 "foo"; or echo "exit 1"
+# CHECK: exit 1
+
+string repeat -n0; or echo "exit 1"
+# CHECK: exit 1
+
+string repeat -m0; or echo "exit 1"
+# CHECK: exit 1
+
+string repeat -n1 -N "there is "; echo "no newline"
+# CHECK: there is no newline
+
+string repeat -n1 --no-newline "there is "; echo "no newline"
+# CHECK: there is no newline
+
+string repeat -n10 -m4 "foo"
+# CHECK: foof
+
+string repeat -n10 --max 5 "foo"
+# CHECK: foofo
+
+string repeat -n3 -m20 "foo"
+# CHECK: foofoofoo
+
+string repeat -m4 "foo"
+# CHECK: foof
+
+string repeat -n-1 "foo"; and echo "exit 0"
+# CHECKERR: string repeat: Invalid count value '-1'
+
+string repeat -m-1 "foo"; and echo "exit 0"
+# CHECKERR: string repeat: Invalid max value '-1'
+
+string repeat -n notanumber "foo"; and echo "exit 0"
+# CHECKERR: string repeat: Argument 'notanumber' is not a number
+
+string repeat -m notanumber "foo"; and echo "exit 0"
+# CHECKERR: string repeat: Argument 'notanumber' is not a number
+
+echo "stdin" | string repeat -n1 "and arg"; and echo "exit 0"
+# CHECKERR: string repeat: Too many arguments
+
+string repeat -n; and echo "exit 0"
+# CHECKERR: string repeat: Expected argument
+
+# FIXME: Also triggers usage
+# string repeat -l fakearg
+# DONTCHECKERR: string repeat: Unknown option '-l'
+
+string repeat ""
+or echo string repeat empty string failed
+# CHECK: string repeat empty string failed
+
+string repeat -n3 ""
+or echo string repeat empty string failed
+# CHECK: string repeat empty string failed
+
+# Test equivalent matches with/without the --entire, --regex, and --invert flags.
+string match -e x abc dxf xyz jkx x z
+or echo exit 1
+# CHECK: dxf
+# CHECK: xyz
+# CHECK: jkx
+# CHECK: x
+
+string match x abc dxf xyz jkx x z
+# CHECK: x
+
+string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
+or echo exit 1
+# CHECK: abxc
+# CHECK: bye
+# CHECK: aaabyz
+# CHECK: kaabxz
+# CHECK: abbxy
+# CHECK: caabxyxz
+
+# 'string match --entire "" -- banana'
+string match --entire "" -- banana
+or echo exit 1
+# CHECK: banana
+
+# 'string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
+string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
+or echo exit 1
+# CHECK: abx
+# CHECK: by
+# CHECK: aaaby
+# CHECK: aabx
+# CHECK: bxy
+# CHECK: aabxyx
+
+# Make sure that groups are handled correct with/without --entire.
+# 'string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
+string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
+or echo exit 1
+# CHECK: abxc
+# CHECK: x
+# CHECK: bye
+# CHECK: y
+# CHECK: aaabyz
+# CHECK: y
+# CHECK: kaabxz
+# CHECK: x
+# CHECK: abbxy
+# CHECK: xy
+# CHECK: caabxyxz
+# CHECK: xyx
+
+# 'string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
+string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
+or echo exit 1
+# CHECK: abx
+# CHECK: x
+# CHECK: by
+# CHECK: y
+# CHECK: aaaby
+# CHECK: y
+# CHECK: aabx
+# CHECK: x
+# CHECK: bxy
+# CHECK: xy
+# CHECK: aabxyx
+# CHECK: xyx
+
+# Test `string lower` and `string upper`.
+set x (string lower abc DEF gHi)
+or echo string lower exit 1
+test $x[1] = 'abc' -a $x[2] = 'def' -a $x[3] = 'ghi'
+or echo strings not converted to lowercase
+
+set x (echo abc DEF gHi | string lower)
+or echo string lower exit 1
+test $x[1] = 'abc def ghi'
+or echo strings not converted to lowercase
+
+string lower -q abc
+and echo lowercasing a lowercase string did not fail as expected
+
+set x (string upper abc DEF gHi)
+or echo string upper exit 1
+test $x[1] = 'ABC' -a $x[2] = 'DEF' -a $x[3] = 'GHI'
+or echo strings not converted to uppercase
+
+set x (echo abc DEF gHi | string upper)
+or echo string upper exit 1
+test $x[1] = 'ABC DEF GHI'
+or echo strings not converted to uppercase
+
+string upper -q ABC DEF
+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
+# TODO: These do not yet work!
+# printf 'a\0b' | string match '*b' | string escape
+# CHECK: a\x00b
+# CHECK: a\x00c
+# CHECK: a
+# CHECK: \x00
+# CHECK: d
+# CHECK: a\x00b
+# CHECK: a\x00g
+# CHECK: a\x00g
+
+# string split0
+count (echo -ne 'abcdefghi' | string split0)
+# CHECK: 1
+count (echo -ne 'abc\x00def\x00ghi\x00' | string split0)
+# CHECK: 3
+count (echo -ne 'abc\x00def\x00ghi\x00\x00' | string split0)
+# CHECK: 4
+count (echo -ne 'abc\x00def\x00ghi' | string split0)
+# CHECK: 3
+count (echo -ne 'abc\ndef\x00ghi\x00' | string split0)
+# CHECK: 2
+count (echo -ne 'abc\ndef\nghi' | string split0)
+# CHECK: 1
+# #5701 - split0 always returned 1
+echo -ne 'a\x00b' | string split0
+and echo Split something
+# CHECK: a
+# CHECK: b
+# CHECK: Split something
+
+# string join0
+set tmp beta alpha\ngamma
+count (string join \n $tmp)
+# CHECK: 3
+count (string join0 $tmp)
+# CHECK: 2
+count (string join0 $tmp | string split0)
+# CHECK: 2
+
+# string split0 in functions
+# This function outputs some newline-separated content, and some
+# explicitly separated content.
+function dualsplit
+  echo alpha
+  echo beta
+  echo -ne 'gamma\x00delta' | string split0
+end
+count (dualsplit)
+# CHECK: 4
+
+# string collect
+count (echo one\ntwo\nthree\nfour | string collect)
+count (echo one | string collect)
+# CHECK: 1
+# CHECK: 1
+echo [(echo one\ntwo\nthree | string collect)]
+# CHECK: [one
+# CHECK: two
+# CHECK: three]
+echo [(echo one\ntwo\nthree | string collect -N)]
+# CHECK: [one
+# CHECK: two
+# CHECK: three
+# CHECK: ]
+printf '[%s]\n' (string collect one\n\n two\n)
+# CHECK: [one]
+# CHECK: [two]
+printf '[%s]\n' (string collect -N one\n\n two\n)
+# CHECK: [one
+# CHECK: 
+# CHECK: ]
+# CHECK: [two
+# CHECK: ]
+printf '[%s]\n' (string collect --no-trim-newlines one\n\n two\n)
+# CHECK: [one
+# CHECK: 
+# CHECK: ]
+# CHECK: [two
+# CHECK: ]
+# string collect returns 0 when it has any output, otherwise 1
+string collect >/dev/null; and echo unexpected success; or echo expected failure
+# CHECK: expected failure
+echo -n | string collect >/dev/null; and echo unexpected success; or echo expected failure
+# CHECK: expected failure
+echo | string collect -N >/dev/null; and echo expected success; or echo unexpected failure
+# CHECK: expected success
+echo | string collect >/dev/null; and echo unexpected success; or echo expected failure
+# CHECK: expected failure
+string collect a >/dev/null; and echo expected success; or echo unexpected failure
+# CHECK: expected success
+string collect -N '' >/dev/null; and echo unexpected success; or echo expected failure
+# CHECK: expected failure
+string collect \n\n >/dev/null; and echo unexpected success; or echo expected failure
+# CHECK: expected failure
+
+# string collect in functions
+# This function outputs some newline-separated content, and some
+# explicitly un-separated content.
+function dualcollect
+  echo alpha
+  echo beta
+  echo gamma\ndelta\nomega | string collect
+end
+count (dualcollect)
+# CHECK: 3

From 7778e62bd76bada3aaa2181c41b4506c83889e1c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 19:17:53 +0200
Subject: [PATCH 0746/1732] CI: Add python dependencies

Littlecheck needs it.
---
 .builds/alpine.yml  | 1 +
 .builds/arch.yml    | 1 +
 .builds/freebsd.yml | 1 +
 .travis.yml         | 3 +++
 4 files changed, 6 insertions(+)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 31ebbb364..d9c98e5ee 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -5,6 +5,7 @@ packages:
   - ncurses-dev
   - pcre2-dev
   - expect
+  - python
 sources:
   - https://git.sr.ht/~faho/fish
 tasks:
diff --git a/.builds/arch.yml b/.builds/arch.yml
index 45fc2500f..31c55db6c 100644
--- a/.builds/arch.yml
+++ b/.builds/arch.yml
@@ -3,6 +3,7 @@ packages:
   - cmake
   - ninja
   - expect
+  - python
 sources:
   - https://git.sr.ht/~faho/fish
 tasks:
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index c340a364c..e3d4eafbc 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -7,6 +7,7 @@ packages:
   - cmake
   - gmake
   - pcre2
+  - python
 sources:
   - https://git.sr.ht/~faho/fish
 tasks:
diff --git a/.travis.yml b/.travis.yml
index f4c368f7e..41a7540ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
             - gettext
             - libncurses5-dev
             - libpcre2-dev
+            - python
       env:
           - CXXFLAGS="-g -O2 -Werror=address"
     - os: linux
@@ -24,6 +25,7 @@ matrix:
             - gettext
             - lib32ncurses5-dev
             - g++-multilib
+            - python
       env:
           - CXXFLAGS="-g -O2 -m32 -Werror=address" CFLAGS="-g -m32"
     - os: linux
@@ -39,6 +41,7 @@ matrix:
             - gettext
             - libncurses5-dev
             - libpcre2-dev
+            - python
     - os: osx
       before_install:
         - brew update

From 93d9fa45513907397a938f52b3889bc24c8a1429 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 19:25:36 +0200
Subject: [PATCH 0747/1732] tests/test.fish: Run littlecheck with any python

Some operating systems don't have a "python" symlink, so we just run
it with the first python we find.
---
 tests/test.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test.fish b/tests/test.fish
index 62e929794..bc458bd76 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -72,7 +72,8 @@ end
 function test_littlecheck_file
     set -l file $argv[1]
     echo "Testing file $file"
-    ../littlecheck.py -s fish=../test/root/bin/fish $file
+    set -l python (__fish_anypython)
+    $python ../littlecheck.py -s fish=../test/root/bin/fish $file
 end
 
 set -l failed

From c392a05db03ad95f4f411f678a4cd01f6900f7b9 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 19:40:22 +0200
Subject: [PATCH 0748/1732] functions/__fish_anypython: Also try python{3,2}.7

NetBSD!!!!! *shakes fist*
---
 share/functions/__fish_anypython.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_anypython.fish b/share/functions/__fish_anypython.fish
index aec4ed659..01d9c48c2 100644
--- a/share/functions/__fish_anypython.fish
+++ b/share/functions/__fish_anypython.fish
@@ -1,6 +1,6 @@
 function __fish_anypython
     # Try python3 first, because that's usually faster and generally nicer.
-    for py in python3 python2 python
+    for py in python3 python3.7 python2 python2.7 python
         command -sq $py
         and echo $py
         and return 0

From d415350aaf050104d1a8c1d4f4b1179f202aa105 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 5 Jun 2019 19:02:32 +0200
Subject: [PATCH 0749/1732] reader: Add delete-or-exit bind function

This is an important binding and should therefore be in C++.
---
 src/input.cpp      |  1 +
 src/input_common.h |  1 +
 src/reader.cpp     | 12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/src/input.cpp b/src/input.cpp
index 3ee10e3dc..94c9f90b8 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -132,6 +132,7 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::reverse_repeat_jump, L"repeat-jump-reverse"},
     {readline_cmd_t::func_and, L"and"},
     {readline_cmd_t::expand_abbr, L"expand-abbr"},
+    {readline_cmd_t::delete_or_exit, L"delete-or-exit"},
     {readline_cmd_t::cancel, L"cancel"}};
 
 static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0]) ==
diff --git a/src/input_common.h b/src/input_common.h
index 6f261242d..4f616d116 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -66,6 +66,7 @@ enum class readline_cmd_t {
     backward_jump_till,
     func_and,
     expand_abbr,
+    delete_or_exit,
     cancel,
     repeat_jump,
     // NOTE: This one has to be last.
diff --git a/src/reader.cpp b/src/reader.cpp
index cf23e944c..0baa5d1a9 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1010,6 +1010,7 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
         case rl::history_token_search_backward:
         case rl::history_token_search_forward:
         case rl::accept_autosuggestion:
+        case rl::delete_or_exit:
         case rl::cancel: {
             // These commands always end paging.
             return true;
@@ -2456,6 +2457,17 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
+        case rl::delete_or_exit: {
+            if (!command_line.text.empty()) {
+                command_line.position = 0;
+                command_line.text = L"";
+                update_buff_pos(&command_line, 0);
+                reader_repaint_needed();
+            } else {
+                reader_set_end_loop(true);
+            }
+            break;
+        }
         case rl::cancel: {
             // The only thing we can cancel right now is paging, which we handled up above.
             break;

From 9d5620c17058b2761a89084430277725295b611e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 20:47:28 +0200
Subject: [PATCH 0750/1732] Port most of the invocation tests to littlecheck

This is a bit weird sometimes, e.g. to test the return status (that
fish actually *returns $status*), we use a #RUN line with %fish
invoking %fish, so we can use the substitution.

Still much nicer.

The missing scripts are those that rely on config.
---
 tests/checks/command-1.fish                       | 2 ++
 tests/checks/command-2.fish                       | 3 +++
 tests/checks/command-vars-persist.fish            | 2 ++
 tests/checks/features-nocaret1.fish               | 2 ++
 tests/checks/features-nocaret2.fish               | 2 ++
 tests/checks/features-nocaret3.fish               | 2 ++
 tests/checks/features-nocaret4.fish               | 2 ++
 tests/checks/features-qmark2.fish                 | 2 ++
 tests/checks/features-string-backslashes-off.fish | 2 ++
 tests/checks/features-string-backslashes.fish     | 2 ++
 tests/checks/init-command-2.fish                  | 3 +++
 tests/checks/init-command-mix-ordering.fish       | 3 +++
 tests/checks/init-command-mix.fish                | 3 +++
 tests/checks/init-command.fish                    | 2 ++
 tests/checks/interactive.fish                     | 3 +++
 tests/checks/invocation.fish                      | 2 ++
 tests/checks/login-interactive.fish               | 3 +++
 tests/checks/login.fish                           | 3 +++
 tests/checks/no-login-no-interactive.fish         | 4 ++++
 tests/checks/rc-returned.fish                     | 2 ++
 tests/checks/version.fish                         | 2 ++
 21 files changed, 51 insertions(+)
 create mode 100644 tests/checks/command-1.fish
 create mode 100644 tests/checks/command-2.fish
 create mode 100644 tests/checks/command-vars-persist.fish
 create mode 100644 tests/checks/features-nocaret1.fish
 create mode 100644 tests/checks/features-nocaret2.fish
 create mode 100644 tests/checks/features-nocaret3.fish
 create mode 100644 tests/checks/features-nocaret4.fish
 create mode 100644 tests/checks/features-qmark2.fish
 create mode 100644 tests/checks/features-string-backslashes-off.fish
 create mode 100644 tests/checks/features-string-backslashes.fish
 create mode 100644 tests/checks/init-command-2.fish
 create mode 100644 tests/checks/init-command-mix-ordering.fish
 create mode 100644 tests/checks/init-command-mix.fish
 create mode 100644 tests/checks/init-command.fish
 create mode 100644 tests/checks/interactive.fish
 create mode 100644 tests/checks/invocation.fish
 create mode 100644 tests/checks/login-interactive.fish
 create mode 100644 tests/checks/login.fish
 create mode 100644 tests/checks/no-login-no-interactive.fish
 create mode 100644 tests/checks/rc-returned.fish
 create mode 100644 tests/checks/version.fish

diff --git a/tests/checks/command-1.fish b/tests/checks/command-1.fish
new file mode 100644
index 000000000..d8ca460e5
--- /dev/null
+++ b/tests/checks/command-1.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -c "echo 1.2.3.4."
+# CHECK: 1.2.3.4.
diff --git a/tests/checks/command-2.fish b/tests/checks/command-2.fish
new file mode 100644
index 000000000..c0b4ef83d
--- /dev/null
+++ b/tests/checks/command-2.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -c "echo 1.2.3.4." -c "echo 5.6.7.8."
+# CHECK: 1.2.3.4.
+# CHECK: 5.6.7.8.
diff --git a/tests/checks/command-vars-persist.fish b/tests/checks/command-vars-persist.fish
new file mode 100644
index 000000000..c3670dd84
--- /dev/null
+++ b/tests/checks/command-vars-persist.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -c 'set foo bar' -c 'echo $foo'
+# CHECK: bar
diff --git a/tests/checks/features-nocaret1.fish b/tests/checks/features-nocaret1.fish
new file mode 100644
index 000000000..a7230e594
--- /dev/null
+++ b/tests/checks/features-nocaret1.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features 'no-stderr-nocaret' -c 'status test-feature stderr-nocaret; echo nocaret: $status'
+# CHECK: nocaret: 1
diff --git a/tests/checks/features-nocaret2.fish b/tests/checks/features-nocaret2.fish
new file mode 100644
index 000000000..7aa21462b
--- /dev/null
+++ b/tests/checks/features-nocaret2.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features    'stderr-nocaret' -c 'status test-feature stderr-nocaret; echo nocaret: $status'
+# CHECK: nocaret: 0
diff --git a/tests/checks/features-nocaret3.fish b/tests/checks/features-nocaret3.fish
new file mode 100644
index 000000000..4f353d2b6
--- /dev/null
+++ b/tests/checks/features-nocaret3.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features 'no-stderr-nocaret' -c 'echo -n careton:; echo ^/dev/null'
+# CHECK: careton:
diff --git a/tests/checks/features-nocaret4.fish b/tests/checks/features-nocaret4.fish
new file mode 100644
index 000000000..1f538cdb5
--- /dev/null
+++ b/tests/checks/features-nocaret4.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features '   stderr-nocaret' -c 'echo -n "caretoff: "; echo ^/dev/null'
+# CHECK: caretoff: ^/dev/null
diff --git a/tests/checks/features-qmark2.fish b/tests/checks/features-qmark2.fish
new file mode 100644
index 000000000..36dd56528
--- /dev/null
+++ b/tests/checks/features-qmark2.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features 'qmark-noglob' -C 'string match --quiet "??" ab ; echo "qmarkoff: $status"'
+# CHECK: qmarkoff: 1
diff --git a/tests/checks/features-string-backslashes-off.fish b/tests/checks/features-string-backslashes-off.fish
new file mode 100644
index 000000000..06593c9da
--- /dev/null
+++ b/tests/checks/features-string-backslashes-off.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features 'no-string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
+# CHECK: a\b\c
diff --git a/tests/checks/features-string-backslashes.fish b/tests/checks/features-string-backslashes.fish
new file mode 100644
index 000000000..c73e1c0e6
--- /dev/null
+++ b/tests/checks/features-string-backslashes.fish
@@ -0,0 +1,2 @@
+#RUN: %fish --features 'string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
+# CHECK: a\\b\\c
diff --git a/tests/checks/init-command-2.fish b/tests/checks/init-command-2.fish
new file mode 100644
index 000000000..0e603deb2
--- /dev/null
+++ b/tests/checks/init-command-2.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -C 'echo init-command' -C 'echo 2nd init-command'
+# CHECK: init-command
+# CHECK: 2nd init-command
diff --git a/tests/checks/init-command-mix-ordering.fish b/tests/checks/init-command-mix-ordering.fish
new file mode 100644
index 000000000..8c54be6e6
--- /dev/null
+++ b/tests/checks/init-command-mix-ordering.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -c 'echo command' -C 'echo init-command'
+# CHECK: init-command
+# CHECK: command
diff --git a/tests/checks/init-command-mix.fish b/tests/checks/init-command-mix.fish
new file mode 100644
index 000000000..a8cd076bf
--- /dev/null
+++ b/tests/checks/init-command-mix.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -C 'echo init-command' -c 'echo command'
+# CHECK: init-command
+# CHECK: command
diff --git a/tests/checks/init-command.fish b/tests/checks/init-command.fish
new file mode 100644
index 000000000..0a7875e1a
--- /dev/null
+++ b/tests/checks/init-command.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -C 'echo init-command'
+# CHECK: init-command
diff --git a/tests/checks/interactive.fish b/tests/checks/interactive.fish
new file mode 100644
index 000000000..27bef3c20
--- /dev/null
+++ b/tests/checks/interactive.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end; if status --is-interactive ; echo interactive ; else ; echo not interactive ; end' -i
+# CHECK: not login shell
+# CHECK: interactive
diff --git a/tests/checks/invocation.fish b/tests/checks/invocation.fish
new file mode 100644
index 000000000..d8ca460e5
--- /dev/null
+++ b/tests/checks/invocation.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -c "echo 1.2.3.4."
+# CHECK: 1.2.3.4.
diff --git a/tests/checks/login-interactive.fish b/tests/checks/login-interactive.fish
new file mode 100644
index 000000000..055725a3c
--- /dev/null
+++ b/tests/checks/login-interactive.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end; if status --is-interactive ; echo interactive ; else ; echo not interactive ; end' -l -i
+# CHECK: login shell
+# CHECK: interactive
diff --git a/tests/checks/login.fish b/tests/checks/login.fish
new file mode 100644
index 000000000..b9965d866
--- /dev/null
+++ b/tests/checks/login.fish
@@ -0,0 +1,3 @@
+#RUN: %fish -c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end; if status --is-interactive ; echo interactive ; else ; echo not interactive ; end' -l
+# CHECK: login shell
+# CHECK: not interactive
diff --git a/tests/checks/no-login-no-interactive.fish b/tests/checks/no-login-no-interactive.fish
new file mode 100644
index 000000000..dd369e599
--- /dev/null
+++ b/tests/checks/no-login-no-interactive.fish
@@ -0,0 +1,4 @@
+#RUN: %fish -c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end; if status --is-interactive ; echo interactive ; else ; echo not interactive ; end'
+
+# CHECK: not login shell
+# CHECK: not interactive
diff --git a/tests/checks/rc-returned.fish b/tests/checks/rc-returned.fish
new file mode 100644
index 000000000..240e28ea1
--- /dev/null
+++ b/tests/checks/rc-returned.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -c '%fish -c false; echo RC: $status'
+# CHECK: RC: 1
diff --git a/tests/checks/version.fish b/tests/checks/version.fish
new file mode 100644
index 000000000..2c9424dec
--- /dev/null
+++ b/tests/checks/version.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -v
+# CHECK: fish, version {{[-.ga-f0-9]*(irty)?}}

From 21667850b36e0512ddcc0b4cfc5c5fc923605c94 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 20:57:37 +0200
Subject: [PATCH 0751/1732] tests/test.fish: Normalize littlecheck output

This prints a green "ok" with the duration, just like the rest of the
tests.

Note that this clashes a bit with
https://github.com/ridiculousfish/littlecheck/pull/3.

(also don't check for python again and again and again)
---
 tests/test.fish | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/test.fish b/tests/test.fish
index bc458bd76..82d3739a5 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -69,11 +69,19 @@ function test_in_file
     end
 end
 
+set -g python (__fish_anypython)
+
 function test_littlecheck_file
     set -l file $argv[1]
-    echo "Testing file $file"
-    set -l python (__fish_anypython)
+    echo -n "Testing file $file ... "
+    set starttime (date +%s)
     $python ../littlecheck.py -s fish=../test/root/bin/fish $file
+    set -l exit_status $status
+    set -l res ok
+    set test_duration (math (date +%s) - $starttime)
+    if test $exit_status -eq 0
+        say green "ok ($test_duration sec)"
+    end
 end
 
 set -l failed

From b9c1f4b1226679d6d1ae35560eeccdf671c712d3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 21:00:13 +0200
Subject: [PATCH 0752/1732] Remove ported tests

---
 tests/argparse.err                            | 128 -----
 tests/argparse.in                             | 206 -------
 tests/argparse.out                            | 160 ------
 tests/invocation/command-1.invoke             |   1 -
 tests/invocation/command-1.out                |   1 -
 tests/invocation/command-2.invoke             |   1 -
 tests/invocation/command-2.out                |   2 -
 tests/invocation/command-vars-persist.invoke  |   1 -
 tests/invocation/command-vars-persist.out     |   1 -
 tests/invocation/features-nocaret1.invoke     |   1 -
 tests/invocation/features-nocaret1.out        |   1 -
 tests/invocation/features-nocaret2.invoke     |   1 -
 tests/invocation/features-nocaret2.out        |   1 -
 tests/invocation/features-nocaret3.invoke     |   1 -
 tests/invocation/features-nocaret3.out        |   1 -
 tests/invocation/features-nocaret4.invoke     |   1 -
 tests/invocation/features-nocaret4.out        |   1 -
 tests/invocation/features-qmark2.invoke       |   1 -
 tests/invocation/features-qmark2.out          |   1 -
 .../features-string-backslashes-off.invoke    |   1 -
 .../features-string-backslashes-off.out       |   1 -
 .../features-string-backslashes.invoke        |   1 -
 .../features-string-backslashes.out           |   1 -
 tests/invocation/init-command-2.invoke        |   1 -
 tests/invocation/init-command-2.out           |   2 -
 .../init-command-mix-ordering.invoke          |   1 -
 .../invocation/init-command-mix-ordering.out  |   2 -
 tests/invocation/init-command-mix.invoke      |   1 -
 tests/invocation/init-command-mix.out         |   2 -
 tests/invocation/init-command.invoke          |   1 -
 tests/invocation/init-command.out             |   1 -
 tests/invocation/interactive.invoke           |   3 -
 tests/invocation/interactive.out              |   2 -
 tests/invocation/login-interactive.invoke     |   4 -
 tests/invocation/login-interactive.out        |   2 -
 tests/invocation/login.invoke                 |   3 -
 tests/invocation/login.out                    |   2 -
 .../invocation/no-login-no-interactive.invoke |   2 -
 tests/invocation/no-login-no-interactive.out  |   2 -
 tests/invocation/rc-returned.err              |   1 -
 tests/invocation/rc-returned.invoke           |   1 -
 tests/invocation/version.grep                 |   1 -
 tests/invocation/version.invoke               |   1 -
 tests/invocation/version.out                  |   1 -
 tests/string.err                              | 329 -----------
 tests/string.in                               | 422 --------------
 tests/string.out                              | 520 ------------------
 47 files changed, 1822 deletions(-)
 delete mode 100644 tests/argparse.err
 delete mode 100644 tests/argparse.in
 delete mode 100644 tests/argparse.out
 delete mode 100644 tests/invocation/command-1.invoke
 delete mode 100644 tests/invocation/command-1.out
 delete mode 100644 tests/invocation/command-2.invoke
 delete mode 100644 tests/invocation/command-2.out
 delete mode 100644 tests/invocation/command-vars-persist.invoke
 delete mode 100644 tests/invocation/command-vars-persist.out
 delete mode 100644 tests/invocation/features-nocaret1.invoke
 delete mode 100644 tests/invocation/features-nocaret1.out
 delete mode 100644 tests/invocation/features-nocaret2.invoke
 delete mode 100644 tests/invocation/features-nocaret2.out
 delete mode 100644 tests/invocation/features-nocaret3.invoke
 delete mode 100644 tests/invocation/features-nocaret3.out
 delete mode 100644 tests/invocation/features-nocaret4.invoke
 delete mode 100644 tests/invocation/features-nocaret4.out
 delete mode 100644 tests/invocation/features-qmark2.invoke
 delete mode 100644 tests/invocation/features-qmark2.out
 delete mode 100644 tests/invocation/features-string-backslashes-off.invoke
 delete mode 100644 tests/invocation/features-string-backslashes-off.out
 delete mode 100644 tests/invocation/features-string-backslashes.invoke
 delete mode 100644 tests/invocation/features-string-backslashes.out
 delete mode 100644 tests/invocation/init-command-2.invoke
 delete mode 100644 tests/invocation/init-command-2.out
 delete mode 100644 tests/invocation/init-command-mix-ordering.invoke
 delete mode 100644 tests/invocation/init-command-mix-ordering.out
 delete mode 100644 tests/invocation/init-command-mix.invoke
 delete mode 100644 tests/invocation/init-command-mix.out
 delete mode 100644 tests/invocation/init-command.invoke
 delete mode 100644 tests/invocation/init-command.out
 delete mode 100644 tests/invocation/interactive.invoke
 delete mode 100644 tests/invocation/interactive.out
 delete mode 100644 tests/invocation/login-interactive.invoke
 delete mode 100644 tests/invocation/login-interactive.out
 delete mode 100644 tests/invocation/login.invoke
 delete mode 100644 tests/invocation/login.out
 delete mode 100644 tests/invocation/no-login-no-interactive.invoke
 delete mode 100644 tests/invocation/no-login-no-interactive.out
 delete mode 100644 tests/invocation/rc-returned.err
 delete mode 100644 tests/invocation/rc-returned.invoke
 delete mode 100644 tests/invocation/version.grep
 delete mode 100644 tests/invocation/version.invoke
 delete mode 100644 tests/invocation/version.out
 delete mode 100644 tests/string.err
 delete mode 100644 tests/string.in
 delete mode 100644 tests/string.out

diff --git a/tests/argparse.err b/tests/argparse.err
deleted file mode 100644
index 291e53221..000000000
--- a/tests/argparse.err
+++ /dev/null
@@ -1,128 +0,0 @@
-
-####################
-# No args is an error
-argparse: No option specs were provided
-
-####################
-# Missing -- is an error
-argparse: Missing -- separator
-
-####################
-# Flags but no option specs is an error
-argparse: No option specs were provided
-
-####################
-# Invalid option specs
-argparse: Invalid option spec 'h-' at char '-'
-argparse: Short flag '+' invalid, must be alphanum or '#'
-argparse: Invalid option spec 'h/help:' at char ':'
-argparse: Invalid option spec 'h-help::' at char ':'
-argparse: Invalid option spec 'h-help=x' at char 'x'
-
-####################
-# --max-args and --min-args work
-min-max: Expected at least 1 args, got only 0
-min-max: Expected at most 3 args, got 4
-min-max: Expected at most 1 args, got 2
-
-####################
-# Invalid "#-val" spec
-argparse: Implicit int short flag '#' does not allow modifiers like '='
-
-####################
-# Invalid arg in the face of a "#-val" spec
-argparse: Unknown option '-x'
-Standard input (line 41): 
-    argparse '#-val' -- abc -x def
-    ^
-
-####################
-# Defining a short flag more than once
-argparse: Short flag 's' already defined
-
-####################
-# Defining a long flag more than once
-argparse: Long flag 'short' already defined
-
-####################
-# Defining an implicit int flag more than once
-argparse: Implicit int flag '#' already defined
-
-####################
-# Defining an implicit int flag with modifiers
-argparse: Implicit int short flag 'v' does not allow modifiers like '='
-
-####################
-# No args
-
-####################
-# One arg and no matching flags
-
-####################
-# Five args with two matching a flag
-
-####################
-# Required, optional, and multiple flags
-
-####################
-# --stop-nonopt works
-
-####################
-# Implicit int flags work
-
-####################
-# Should be set to 987
-
-####################
-# Should be set to 765
-
-####################
-# Bool short flag only
-
-####################
-# Value taking short flag only
-
-####################
-# Implicit int short flag only
-
-####################
-# Implicit int short flag only with custom validation passes
-
-####################
-# Implicit int short flag only with custom validation fails
-argparse: Value '499' for flag 'x' less than min allowed of '500'
-
-####################
-# Implicit int flag validation fails
-argparse: Value '765x' for flag 'max' is not an integer
-argparse: Value 'a1' for flag 'm' is not an integer
-
-####################
-# Check the exit status from argparse validation
-
-####################
-# Explicit int flag validation
-argparse: Value '2' for flag 'm' greater than max allowed of '1'
-argparse: Value '-1' for flag 'max' less than min allowed of '0'
-
-####################
-# Errors use function name by default
-notargparse: Unknown option '--banana'
-Standard input (line 353): 
-    argparse a/alpha -- --banana
-    ^
-in function 'notargparse'
-
-####################
-# Ignoring unknown options
-
-####################
-# Check for crash when last option is unknown
-
-####################
-# Checking arguments after --
-
-####################
-# Checking validation for short flags only
-argparse: Value 'banana' for flag 'o' is not an integer
-argparse: Value '-o' for flag 'i' is not an integer
diff --git a/tests/argparse.in b/tests/argparse.in
deleted file mode 100644
index 444501d7c..000000000
--- a/tests/argparse.in
+++ /dev/null
@@ -1,206 +0,0 @@
-# Test the `argparse` builtin.
-
-##########
-# Start by verifying a bunch of error conditions.
-
-logmsg No args is an error
-argparse
-
-logmsg Missing -- is an error
-argparse h/help
-
-logmsg Flags but no option specs is an error
-argparse -s -- hello
-
-logmsg Invalid option specs
-argparse h-
-argparse +help
-argparse h/help:
-argparse h-help::
-argparse h-help=x
-
-logmsg --max-args and --min-args work
-begin
-    argparse --name min-max --min-args 1 h/help --
-    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1
-    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1 arg2
-    argparse --name min-max --min-args 1 --max-args 3 h/help -- --help arg1 arg2 arg3
-    argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1 arg2 -h arg3 arg4
-    argparse --name min-max --max-args 1 h/help --
-    argparse --name min-max --max-args 1 h/help -- arg1
-    argparse --name min-max --max-args 1 h/help -- arg1 arg2
-end
-
-logmsg Invalid \"#-val\" spec
-begin
-    argparse '#-val=' -- abc -x def
-end
-
-logmsg Invalid arg in the face of a \"#-val\" spec
-begin
-    argparse '#-val' -- abc -x def
-end
-
-logmsg Defining a short flag more than once
-begin
-    argparse 's/short' 'x/xray' 's/long' -- -s -x --long
-end
-
-logmsg Defining a long flag more than once
-begin
-    argparse 's/short' 'x/xray' 'l/short' -- -s -x --long
-end
-
-logmsg Defining an implicit int flag more than once
-begin
-    argparse '#-val' 'x/xray' 'v#val' -- -s -x --long
-end
-
-logmsg Defining an implicit int flag with modifiers
-begin
-    argparse 'v#val=' --
-end
-
-##########
-# Now verify that validly formed invocations work as expected.
-
-logmsg No args
-begin
-    argparse h/help --
-end
-
-logmsg One arg and no matching flags
-begin
-    argparse h/help -- help
-    set -l
-end
-
-logmsg Five args with two matching a flag
-begin
-    argparse h/help -- help --help me -h 'a lot more'
-    set -l
-end
-
-logmsg Required, optional, and multiple flags
-begin
-    argparse 'h/help' 'a/abc=' 'd/def=?' 'g/ghk=+' -- help --help me --ghk=g1 --abc=ABC --ghk g2 --d -g g3
-    set -l
-end
-
-logmsg --stop-nonopt works
-begin
-    argparse --stop-nonopt 'h/help' 'a/abc=' -- -a A1 -h --abc A2 non-opt 'second non-opt' --help
-    set -l
-end
-
-logmsg Implicit int flags work
-begin
-    argparse '#-val' -- abc -123 def
-    set -l
-end
-begin
-    argparse 'v/verbose' '#-val' 't/token=' -- -123 a1 --token woohoo --234 -v a2 --verbose
-    set -l
-end
-
-logmsg Should be set to 987
-begin
-    argparse 'm#max' -- argle -987 bargle
-    set -l
-end
-
-logmsg Should be set to 765
-begin
-    argparse 'm#max' -- argle -987 bargle --max 765
-    set -l
-end
-
-logmsg Bool short flag only
-begin
-    argparse 'C' 'v' -- -C -v arg1 -v arg2
-    set -l
-end
-
-logmsg Value taking short flag only
-begin
-    argparse 'x=' 'v/verbose' -- --verbose arg1 -v -x arg2
-    set -l
-end
-
-logmsg Implicit int short flag only
-begin
-    argparse 'x#' 'v/verbose' -- -v -v argle -v -x 321 bargle
-    set -l
-end
-
-logmsg Implicit int short flag only with custom validation passes
-begin
-    argparse 'x#!_validate_int --max 500' 'v/verbose' -- -v -v -x 499 -v
-    set -l
-end
-
-logmsg Implicit int short flag only with custom validation fails
-begin
-    argparse 'x#!_validate_int --min 500' 'v/verbose' -- -v -v -x 499 -v
-    set -l
-end
-
-##########
-# Verify that flag value validation works.
-
-logmsg Implicit int flag validation fails
-argparse 'm#max' -- argle --max 765x bargle
-and echo unxpected argparse return status >&2
-argparse 'm#max' -- argle -ma1 bargle
-and echo unxpected argparse return status >&2
-
-logmsg Check the exit status from argparse validation
-argparse 'm#max!set | grep _flag_; function x; return 57; end; x' -- argle --max=83 bargle 2>&1
-set -l saved_status $status
-test $saved_status -eq 57
-and echo expected argparse return status $saved_status
-
-logmsg Explicit int flag validation
-# These should fail
-argparse 'm#max!_validate_int --min 1 --max 1' -- argle -m2 bargle
-and echo unexpected argparse return status $status >&2
-argparse 'm#max!_validate_int --min 0 --max 1' -- argle --max=-1 bargle
-and echo unexpected argparse return status $status >&2
-# These should succeed
-argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=0 bargle
-or echo unexpected argparse return status $status >&2
-argparse 'm/max=!_validate_int --min 0 --max 1' -- argle --max=1 bargle
-or echo unexpected argparse return status $status >&2
-
-logmsg Errors use function name by default
-function notargparse
-    argparse a/alpha -- --banana
-end
-notargparse
-
-true
-
-logmsg Ignoring unknown options
-argparse -i a=+ b=+ -- -a alpha -b bravo -t tango -a aaaa --wurst
-or echo unexpected argparse return status $status >&2
-# The unknown options are removed _entirely_.
-echo $argv
-echo $_flag_a
-
-logmsg Check for crash when last option is unknown
-argparse -i b/break -- "-b kubectl get pods -l name=foo"
-
-begin
-    logmsg Checking arguments after "--"
-    argparse a/alpha -- a --alpha -- b -a
-    printf '%s\n' $argv
-end
-
-# #5864 - short flag only with same validation function.
-logmsg Checking validation for short flags only
-argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o banana
-argparse 'i=!_validate_int' 'o=!_validate_int' -- -i -o banana
-begin
-    argparse 'i=!_validate_int' 'o=!_validate_int' -- -i 2 -o 3
-    set -l
-end
diff --git a/tests/argparse.out b/tests/argparse.out
deleted file mode 100644
index 130ae04aa..000000000
--- a/tests/argparse.out
+++ /dev/null
@@ -1,160 +0,0 @@
-
-####################
-# No args is an error
-
-####################
-# Missing -- is an error
-
-####################
-# Flags but no option specs is an error
-
-####################
-# Invalid option specs
-
-####################
-# --max-args and --min-args work
-
-####################
-# Invalid "#-val" spec
-
-####################
-# Invalid arg in the face of a "#-val" spec
-
-####################
-# Defining a short flag more than once
-
-####################
-# Defining a long flag more than once
-
-####################
-# Defining an implicit int flag more than once
-
-####################
-# Defining an implicit int flag with modifiers
-
-####################
-# No args
-
-####################
-# One arg and no matching flags
-argv help
-
-####################
-# Five args with two matching a flag
-_flag_h '--help'  '-h'
-_flag_help '--help'  '-h'
-argv 'help'  'me'  'a lot more'
-
-####################
-# Required, optional, and multiple flags
-_flag_a ABC
-_flag_abc ABC
-_flag_d
-_flag_def
-_flag_g 'g1'  'g2'  'g3'
-_flag_ghk 'g1'  'g2'  'g3'
-_flag_h --help
-_flag_help --help
-argv 'help'  'me'
-
-####################
-# --stop-nonopt works
-_flag_a A2
-_flag_abc A2
-_flag_h -h
-_flag_help -h
-argv 'non-opt'  'second non-opt'  '--help'
-
-####################
-# Implicit int flags work
-_flag_val 123
-argv 'abc'  'def'
-_flag_t woohoo
-_flag_token woohoo
-_flag_v '-v'  '--verbose'
-_flag_val -234
-_flag_verbose '-v'  '--verbose'
-argv 'a1'  'a2'
-
-####################
-# Should be set to 987
-_flag_m 987
-_flag_max 987
-argv 'argle'  'bargle'
-
-####################
-# Should be set to 765
-_flag_m 765
-_flag_max 765
-argv 'argle'  'bargle'
-
-####################
-# Bool short flag only
-_flag_C -C
-_flag_v '-v'  '-v'
-argv 'arg1'  'arg2'
-
-####################
-# Value taking short flag only
-_flag_v '--verbose'  '-v'
-_flag_verbose '--verbose'  '-v'
-_flag_x arg2
-argv arg1
-
-####################
-# Implicit int short flag only
-_flag_v '-v'  '-v'  '-v'
-_flag_verbose '-v'  '-v'  '-v'
-_flag_x 321
-argv 'argle'  'bargle'
-
-####################
-# Implicit int short flag only with custom validation passes
-_flag_v '-v'  '-v'  '-v'
-_flag_verbose '-v'  '-v'  '-v'
-_flag_x 499
-argv
-
-####################
-# Implicit int short flag only with custom validation fails
-
-####################
-# Implicit int flag validation fails
-
-####################
-# Check the exit status from argparse validation
-_flag_name max
-_flag_value 83
-expected argparse return status 57
-
-####################
-# Explicit int flag validation
-
-####################
-# Errors use function name by default
-
-####################
-# Ignoring unknown options
--t tango --wurst
-alpha aaaa
-
-####################
-# Check for crash when last option is unknown
-
-####################
-# Checking arguments after --
-a
-b
--a
-
-####################
-# Checking validation for short flags only
-_flag_a 'alpha'  'aaaa'
-_flag_b -b
-_flag_break -b
-_flag_i 2
-_flag_m 1
-_flag_max 1
-_flag_o 3
-argv
-saved_status 57
diff --git a/tests/invocation/command-1.invoke b/tests/invocation/command-1.invoke
deleted file mode 100644
index c6017229a..000000000
--- a/tests/invocation/command-1.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c "echo 1.2.3.4."
diff --git a/tests/invocation/command-1.out b/tests/invocation/command-1.out
deleted file mode 100644
index a99e7ac76..000000000
--- a/tests/invocation/command-1.out
+++ /dev/null
@@ -1 +0,0 @@
-1.2.3.4.
diff --git a/tests/invocation/command-2.invoke b/tests/invocation/command-2.invoke
deleted file mode 100644
index 8f8357a0b..000000000
--- a/tests/invocation/command-2.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c "echo 1.2.3.4." -c "echo 5.6.7.8."
diff --git a/tests/invocation/command-2.out b/tests/invocation/command-2.out
deleted file mode 100644
index c54ab6812..000000000
--- a/tests/invocation/command-2.out
+++ /dev/null
@@ -1,2 +0,0 @@
-1.2.3.4.
-5.6.7.8.
diff --git a/tests/invocation/command-vars-persist.invoke b/tests/invocation/command-vars-persist.invoke
deleted file mode 100644
index 0d5653c70..000000000
--- a/tests/invocation/command-vars-persist.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c 'set foo bar' -c 'echo $foo'
diff --git a/tests/invocation/command-vars-persist.out b/tests/invocation/command-vars-persist.out
deleted file mode 100644
index 5716ca598..000000000
--- a/tests/invocation/command-vars-persist.out
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/tests/invocation/features-nocaret1.invoke b/tests/invocation/features-nocaret1.invoke
deleted file mode 100644
index 91243cd8e..000000000
--- a/tests/invocation/features-nocaret1.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features 'no-stderr-nocaret' -c 'status test-feature stderr-nocaret; echo nocaret: $status'
diff --git a/tests/invocation/features-nocaret1.out b/tests/invocation/features-nocaret1.out
deleted file mode 100644
index 057e3967b..000000000
--- a/tests/invocation/features-nocaret1.out
+++ /dev/null
@@ -1 +0,0 @@
-nocaret: 1
diff --git a/tests/invocation/features-nocaret2.invoke b/tests/invocation/features-nocaret2.invoke
deleted file mode 100644
index 4a20f5f95..000000000
--- a/tests/invocation/features-nocaret2.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features    'stderr-nocaret' -c 'status test-feature stderr-nocaret; echo nocaret: $status'
diff --git a/tests/invocation/features-nocaret2.out b/tests/invocation/features-nocaret2.out
deleted file mode 100644
index 2b8a87b31..000000000
--- a/tests/invocation/features-nocaret2.out
+++ /dev/null
@@ -1 +0,0 @@
-nocaret: 0
diff --git a/tests/invocation/features-nocaret3.invoke b/tests/invocation/features-nocaret3.invoke
deleted file mode 100644
index ede2fb3d4..000000000
--- a/tests/invocation/features-nocaret3.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features 'no-stderr-nocaret' -c 'echo -n careton:; echo ^/dev/null'
diff --git a/tests/invocation/features-nocaret3.out b/tests/invocation/features-nocaret3.out
deleted file mode 100644
index 7a1fba14c..000000000
--- a/tests/invocation/features-nocaret3.out
+++ /dev/null
@@ -1 +0,0 @@
-careton:
diff --git a/tests/invocation/features-nocaret4.invoke b/tests/invocation/features-nocaret4.invoke
deleted file mode 100644
index bf38ca7ee..000000000
--- a/tests/invocation/features-nocaret4.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features '   stderr-nocaret' -c 'echo -n "caretoff: "; echo ^/dev/null'
diff --git a/tests/invocation/features-nocaret4.out b/tests/invocation/features-nocaret4.out
deleted file mode 100644
index dfd96bbf7..000000000
--- a/tests/invocation/features-nocaret4.out
+++ /dev/null
@@ -1 +0,0 @@
-caretoff: ^/dev/null
diff --git a/tests/invocation/features-qmark2.invoke b/tests/invocation/features-qmark2.invoke
deleted file mode 100644
index 5db93ac03..000000000
--- a/tests/invocation/features-qmark2.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features 'qmark-noglob' -C 'string match --quiet "??" ab ; echo "qmarkoff: $status"'
diff --git a/tests/invocation/features-qmark2.out b/tests/invocation/features-qmark2.out
deleted file mode 100644
index 57cedbb0b..000000000
--- a/tests/invocation/features-qmark2.out
+++ /dev/null
@@ -1 +0,0 @@
-qmarkoff: 1
diff --git a/tests/invocation/features-string-backslashes-off.invoke b/tests/invocation/features-string-backslashes-off.invoke
deleted file mode 100644
index 600bde64f..000000000
--- a/tests/invocation/features-string-backslashes-off.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features 'no-string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
diff --git a/tests/invocation/features-string-backslashes-off.out b/tests/invocation/features-string-backslashes-off.out
deleted file mode 100644
index 2eba0a277..000000000
--- a/tests/invocation/features-string-backslashes-off.out
+++ /dev/null
@@ -1 +0,0 @@
-a\b\c
diff --git a/tests/invocation/features-string-backslashes.invoke b/tests/invocation/features-string-backslashes.invoke
deleted file mode 100644
index e7923c0dc..000000000
--- a/tests/invocation/features-string-backslashes.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features 'string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
diff --git a/tests/invocation/features-string-backslashes.out b/tests/invocation/features-string-backslashes.out
deleted file mode 100644
index e67f30541..000000000
--- a/tests/invocation/features-string-backslashes.out
+++ /dev/null
@@ -1 +0,0 @@
-a\\b\\c
diff --git a/tests/invocation/init-command-2.invoke b/tests/invocation/init-command-2.invoke
deleted file mode 100644
index 667c6273f..000000000
--- a/tests/invocation/init-command-2.invoke
+++ /dev/null
@@ -1 +0,0 @@
--C 'echo init-command' -C 'echo 2nd init-command'
diff --git a/tests/invocation/init-command-2.out b/tests/invocation/init-command-2.out
deleted file mode 100644
index 00962a99b..000000000
--- a/tests/invocation/init-command-2.out
+++ /dev/null
@@ -1,2 +0,0 @@
-init-command
-2nd init-command
diff --git a/tests/invocation/init-command-mix-ordering.invoke b/tests/invocation/init-command-mix-ordering.invoke
deleted file mode 100644
index 1718e5c03..000000000
--- a/tests/invocation/init-command-mix-ordering.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c 'echo command' -C 'echo init-command'
diff --git a/tests/invocation/init-command-mix-ordering.out b/tests/invocation/init-command-mix-ordering.out
deleted file mode 100644
index 8ca70f9a2..000000000
--- a/tests/invocation/init-command-mix-ordering.out
+++ /dev/null
@@ -1,2 +0,0 @@
-init-command
-command
diff --git a/tests/invocation/init-command-mix.invoke b/tests/invocation/init-command-mix.invoke
deleted file mode 100644
index e40eb4088..000000000
--- a/tests/invocation/init-command-mix.invoke
+++ /dev/null
@@ -1 +0,0 @@
--C 'echo init-command' -c 'echo command'
diff --git a/tests/invocation/init-command-mix.out b/tests/invocation/init-command-mix.out
deleted file mode 100644
index 8ca70f9a2..000000000
--- a/tests/invocation/init-command-mix.out
+++ /dev/null
@@ -1,2 +0,0 @@
-init-command
-command
diff --git a/tests/invocation/init-command.invoke b/tests/invocation/init-command.invoke
deleted file mode 100644
index deb1f1061..000000000
--- a/tests/invocation/init-command.invoke
+++ /dev/null
@@ -1 +0,0 @@
--C 'echo init-command'
diff --git a/tests/invocation/init-command.out b/tests/invocation/init-command.out
deleted file mode 100644
index 35db3ef38..000000000
--- a/tests/invocation/init-command.out
+++ /dev/null
@@ -1 +0,0 @@
-init-command
diff --git a/tests/invocation/interactive.invoke b/tests/invocation/interactive.invoke
deleted file mode 100644
index 06c3e83c0..000000000
--- a/tests/invocation/interactive.invoke
+++ /dev/null
@@ -1,3 +0,0 @@
--c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end'
--c 'if status --is-interactive ; echo interactive ; else ; echo not interactive ; end'
--i
diff --git a/tests/invocation/interactive.out b/tests/invocation/interactive.out
deleted file mode 100644
index c48a43d55..000000000
--- a/tests/invocation/interactive.out
+++ /dev/null
@@ -1,2 +0,0 @@
-not login shell
-interactive
diff --git a/tests/invocation/login-interactive.invoke b/tests/invocation/login-interactive.invoke
deleted file mode 100644
index ee76e7744..000000000
--- a/tests/invocation/login-interactive.invoke
+++ /dev/null
@@ -1,4 +0,0 @@
--c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end'
--c 'if status --is-interactive ; echo interactive ; else ; echo not interactive ; end'
--l
--i
diff --git a/tests/invocation/login-interactive.out b/tests/invocation/login-interactive.out
deleted file mode 100644
index c42db9392..000000000
--- a/tests/invocation/login-interactive.out
+++ /dev/null
@@ -1,2 +0,0 @@
-login shell
-interactive
diff --git a/tests/invocation/login.invoke b/tests/invocation/login.invoke
deleted file mode 100644
index 243a5febf..000000000
--- a/tests/invocation/login.invoke
+++ /dev/null
@@ -1,3 +0,0 @@
--c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end'
--c 'if status --is-interactive ; echo interactive ; else ; echo not interactive ; end'
--l
diff --git a/tests/invocation/login.out b/tests/invocation/login.out
deleted file mode 100644
index 7eae8bbf8..000000000
--- a/tests/invocation/login.out
+++ /dev/null
@@ -1,2 +0,0 @@
-login shell
-not interactive
diff --git a/tests/invocation/no-login-no-interactive.invoke b/tests/invocation/no-login-no-interactive.invoke
deleted file mode 100644
index 36c8e494b..000000000
--- a/tests/invocation/no-login-no-interactive.invoke
+++ /dev/null
@@ -1,2 +0,0 @@
--c 'if status --is-login ; echo login shell ; else ; echo not login shell ; end'
--c 'if status --is-interactive ; echo interactive ; else ; echo not interactive ; end'
diff --git a/tests/invocation/no-login-no-interactive.out b/tests/invocation/no-login-no-interactive.out
deleted file mode 100644
index fba174c40..000000000
--- a/tests/invocation/no-login-no-interactive.out
+++ /dev/null
@@ -1,2 +0,0 @@
-not login shell
-not interactive
diff --git a/tests/invocation/rc-returned.err b/tests/invocation/rc-returned.err
deleted file mode 100644
index 1b7fe42bb..000000000
--- a/tests/invocation/rc-returned.err
+++ /dev/null
@@ -1 +0,0 @@
-RC: 1
diff --git a/tests/invocation/rc-returned.invoke b/tests/invocation/rc-returned.invoke
deleted file mode 100644
index b7d0e4523..000000000
--- a/tests/invocation/rc-returned.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c 'false'
diff --git a/tests/invocation/version.grep b/tests/invocation/version.grep
deleted file mode 100644
index 7b52bc211..000000000
--- a/tests/invocation/version.grep
+++ /dev/null
@@ -1 +0,0 @@
-^fish, version
diff --git a/tests/invocation/version.invoke b/tests/invocation/version.invoke
deleted file mode 100644
index 2631539be..000000000
--- a/tests/invocation/version.invoke
+++ /dev/null
@@ -1 +0,0 @@
--v
diff --git a/tests/invocation/version.out b/tests/invocation/version.out
deleted file mode 100644
index 77d513348..000000000
--- a/tests/invocation/version.out
+++ /dev/null
@@ -1 +0,0 @@
-fish, version
diff --git a/tests/string.err b/tests/string.err
deleted file mode 100644
index f5f3ad2f8..000000000
--- a/tests/string.err
+++ /dev/null
@@ -1,329 +0,0 @@
-
-####################
-# string match -r -v "c.*" dog can cat diz
-
-####################
-# string match -q -r -v "c.*" dog can cat diz
-
-####################
-# string match -v "c*" dog can cat diz
-
-####################
-# string match -q -v "c*" dog can cat diz
-
-####################
-# string match -v "d*" dog dan dat diz
-
-####################
-# string match -q -v "d*" dog dan dat diz
-
-####################
-# string match -r -v x y
-
-####################
-# string match -r -v x x
-
-####################
-# string match -q -r -v x y
-
-####################
-# string match -q -r -v x x
-
-####################
-# string length "hello, world"
-
-####################
-# string length -q ""
-
-####################
-# string sub --length 2 abcde
-
-####################
-# string sub -s 2 -l 2 abcde
-
-####################
-# string sub --start=-2 abcde
-
-####################
-# string split . example.com
-
-####################
-# string split -r -m1 / /usr/local/bin/fish
-
-####################
-# string split "" abc
-
-####################
-# seq 3 | string join ...
-
-####################
-# string trim " abc  "
-
-####################
-# string trim --right --chars=yz xyzzy zany
-
-####################
-# echo \x07 | string escape
-
-####################
-# string escape --style=script 'a b#c"\'d'
-
-####################
-# string escape --style=url 'a b#c"\'d'
-
-####################
-# string escape --style=url \na\nb%c~d\n
-
-####################
-# string escape --style=var 'a b#c"\'d'
-
-####################
-# string escape --style=script a\nghi_
-
-####################
-# string escape --style=var 'abc'
-
-####################
-# string escape --style=var '_a_b_c_'
-
-####################
-# string escape --style=var -- -
-
-####################
-# string escape with multibyte chars
-
-####################
-# string escape for literal pcre2 searching
-
-####################
-# set x (string unescape (echo \x07 | string escape))
-
-####################
-# string unescape --style=script (string escape --style=script 'a b#c"\'d')
-
-####################
-# string unescape --style=url (string escape --style=url 'a b#c"\'d')
-
-####################
-# string unescape --style=url (string escape --style=url \na\nb%c~d\n)
-
-####################
-# string unescape --style=var (string escape --style=var 'a b#c"\'d')
-
-####################
-# string unescape --style=var (string escape --style=var a\nghi_)
-
-####################
-# string unescape --style=var (string escape --style=var 'abc')
-
-####################
-# string unescape --style=var (string escape --style=var '_a_b_c_')
-
-####################
-# string unescape --style=var (string escape --style=var -- -)
-
-####################
-# string match "*" a
-
-####################
-# string match "a*b" axxb
-
-####################
-# string match -i "a**B" Axxb
-
-####################
-# echo "ok?" | string match "*?"
-
-####################
-# string match -r "cat|dog|fish" "nice dog"
-
-####################
-# string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56
-
-####################
-# string match -r "^(\w{2,4})\g1\$" papa mud murmur
-
-####################
-# string match -r -a -n at ratatat
-
-####################
-# string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"
-
-####################
-# string replace is was "blue is my favorite"
-
-####################
-# string replace 3rd last 1st 2nd 3rd
-
-####################
-# string replace -a " " _ "spaces to underscores"
-
-####################
-# string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"
-
-####################
-# string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"
-
-####################
-# string replace -r "\s*newline\s*" "\n" "put a newline here"
-
-####################
-# string replace -r -a "(\w)" "\$1\$1" ab
-
-####################
-# string replace --filter x X abc axc x def jkx
-
-####################
-# string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
-
-####################
-# string match -r with empty capture groups
-
-####################
-# string match -r "[" "a[sd"
-string match: Regular expression compile error: missing terminating ] for character class
-string match: [
-string match: ^
-
-####################
-# string invalidarg
-string: Subcommand 'invalidarg' is not valid
-
-Standard input (line 215): 
-string invalidarg; and echo "unexpected exit 0"
-^
-
-(Type 'help string' for related documentation)
-
-####################
-# string length
-
-####################
-# string match -r -v "[dcantg].*" dog can cat diz
-
-####################
-# string match -v "*" dog can cat diz
-
-####################
-# string match -rvn a bbb
-
-####################
-# string repeat -n 2 "foo"
-
-####################
-# string repeat --count 2 "foo"
-
-####################
-# echo foo | string repeat -n 2
-
-####################
-# string repeat -n2 -q "foo"
-
-####################
-# string repeat -n2 --quiet "foo"
-
-####################
-# string repeat -n0 "foo"
-
-####################
-# string repeat -n0
-
-####################
-# string repeat -m0
-
-####################
-# string repeat -n1 -N "there is "
-
-####################
-# string repeat -n1 --no-newline "there is "
-
-####################
-# string repeat -n10 -m4 "foo"
-
-####################
-# string repeat -n10 --max 5 "foo"
-
-####################
-# string repeat -n3 -m20 "foo"
-
-####################
-# string repeat -m4 "foo"
-
-####################
-# string repeat -n-1 "foo"
-string repeat: Invalid count value '-1'
-
-####################
-# string repeat -m-1 "foo"
-string repeat: Invalid max value '-1'
-
-####################
-# string repeat -n notanumber "foo"
-string repeat: Argument 'notanumber' is not a number
-
-####################
-# string repeat -m notanumber "foo"
-string repeat: Argument 'notanumber' is not a number
-
-####################
-# echo "stdin" | string repeat -n1 "and arg"
-string repeat: Too many arguments
-
-####################
-# string repeat -n
-string repeat: Expected argument
-
-####################
-# string repeat -l fakearg 2>&1
-string repeat: Unknown option '-l'
-
-Standard input (line 291): 
-string repeat -l fakearg
-^
-
-(Type 'help string' for related documentation)
-
-####################
-# string repeat ""
-
-####################
-# string repeat -n3 ""
-
-####################
-# string match -e x abc dxf xyz jkx x z
-
-####################
-# string match x abc dxf xyz jkx x z
-
-####################
-# string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-
-####################
-# string match --entire "" -- banana
-
-####################
-# string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-
-####################
-# string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-
-####################
-# string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-
-####################
-# Check NUL
-
-####################
-# string split0
-
-####################
-# string join0
-
-####################
-# string split0 in functions
-
-####################
-# string collect
-
-####################
-# string collect in functions
diff --git a/tests/string.in b/tests/string.in
deleted file mode 100644
index dc07edbff..000000000
--- a/tests/string.in
+++ /dev/null
@@ -1,422 +0,0 @@
-# Tests for string builtin. Mostly taken from man page examples.
-
-logmsg 'string match -r -v "c.*" dog can cat diz'
-string match -r -v "c.*" dog can cat diz; and echo "exit 0"
-
-logmsg 'string match -q -r -v "c.*" dog can cat diz'
-string match -q -r -v "c.*" dog can cat diz; and echo "exit 0"
-
-logmsg 'string match -v "c*" dog can cat diz'
-string match -v "c*" dog can cat diz; and echo "exit 0"
-
-logmsg 'string match -q -v "c*" dog can cat diz'
-string match -q -v "c*" dog can cat diz; and echo "exit 0"
-
-logmsg 'string match -v "d*" dog dan dat diz'
-string match -v "d*" dog dan dat diz; or echo "exit 1"
-
-logmsg 'string match -q -v "d*" dog dan dat diz'
-string match -q -v "d*" dog dan dat diz; or echo "exit 1"
-
-logmsg 'string match -r -v x y'
-string match -r -v x y; and echo "exit 0"
-
-logmsg 'string match -r -v x x'
-string match -r -v x x; or echo "exit 1"
-
-logmsg 'string match -q -r -v x y'
-string match -q -r -v x y; and echo "exit 0"
-
-logmsg 'string match -q -r -v x x'
-string match -q -r -v x x; or echo "exit 1"
-
-logmsg 'string length "hello, world"'
-string length "hello, world"
-
-logmsg 'string length -q ""'
-string length -q ""; and echo not zero length; or echo zero length
-
-logmsg 'string sub --length 2 abcde'
-string sub --length 2 abcde
-
-logmsg 'string sub -s 2 -l 2 abcde'
-string sub -s 2 -l 2 abcde
-
-logmsg 'string sub --start=-2 abcde'
-string sub --start=-2 abcde
-
-logmsg 'string split . example.com'
-string split . example.com
-
-logmsg 'string split -r -m1 / /usr/local/bin/fish'
-string split -r -m1 / /usr/local/bin/fish
-
-logmsg 'string split "" abc'
-string split "" abc
-
-logmsg 'seq 3 | string join ...'
-seq 3 | string join ...
-
-logmsg 'string trim " abc  "'
-string trim " abc  "
-
-logmsg 'string trim --right --chars=yz xyzzy zany'
-string trim --right --chars=yz xyzzy zany
-
-logmsg 'echo \x07 | string escape'
-echo \x07 | string escape
-
-logmsg 'string escape --style=script \'a b#c"\\\'d\''
-string escape --style=script 'a b#c"\'d'
-
-logmsg 'string escape --style=url \'a b#c"\\\'d\''
-string escape --style=url 'a b#c"\'d'
-
-logmsg 'string escape --style=url \\na\\nb%c~d\\n'
-string escape --style=url \na\nb%c~d\n
-
-logmsg 'string escape --style=var \'a b#c"\\\'d\''
-string escape --style=var 'a b#c"\'d'
-
-logmsg 'string escape --style=script a\nghi_'
-string escape --style=var a\nghi_
-
-logmsg 'string escape --style=var \'abc\''
-string escape --style=var 'abc'
-
-logmsg 'string escape --style=var \'_a_b_c_\''
-string escape --style=var '_a_b_c_'
-
-logmsg 'string escape --style=var -- -'
-string escape --style=var -- -
-
-logmsg 'string escape with multibyte chars'
-string escape --style=url aöb
-string escape --style=url 中
-string escape --style=url aöb | string unescape --style=url
-string escape --style=url 中 | string unescape --style=url
-
-string escape --style=var aöb
-string escape --style=var 中
-string escape --style=var aöb | string unescape --style=var
-string escape --style=var 中 | string unescape --style=var
-
-# test regex escaping
-logmsg 'string escape for literal pcre2 searching'
-string escape --style=regex ".ext"
-string escape --style=regex "bonjour, amigo"
-string escape --style=regex "^this is a literal string"
-
-# The following tests verify that we can correctly unescape the same strings
-# we tested escaping above.
-
-logmsg 'set x (string unescape (echo \x07 | string escape))'
-set x (string unescape (echo \x07 | string escape))
-test $x = \x07
-and echo success
-
-logmsg 'string unescape --style=script (string escape --style=script \'a b#c"\\\'d\')'
-string unescape --style=script (string escape --style=script 'a b#c"\'d')
-
-logmsg 'string unescape --style=url (string escape --style=url \'a b#c"\\\'d\')'
-string unescape --style=url (string escape --style=url 'a b#c"\'d')
-
-logmsg 'string unescape --style=url (string escape --style=url \na\nb%c~d\n)'
-string unescape --style=url (string escape --style=url \na\nb%c~d\n)
-
-logmsg 'string unescape --style=var (string escape --style=var \'a b#c"\\\'d\')'
-string unescape --style=var (string escape --style=var 'a b#c"\'d')
-
-logmsg 'string unescape --style=var (string escape --style=var a\nghi_)'
-string unescape --style=var (string escape --style=var a\nghi_)
-
-logmsg 'string unescape --style=var (string escape --style=var \'abc\')'
-string unescape --style=var (string escape --style=var 'abc')
-
-logmsg 'string unescape --style=var (string escape --style=var \'_a_b_c_\')'
-string unescape --style=var (string escape --style=var '_a_b_c_')
-
-logmsg 'string unescape --style=var (string escape --style=var -- -)'
-string unescape --style=var -- (string escape --style=var -- -)
-
-# The following tests verify that we can correctly match strings.
-
-logmsg 'string match "*" a'
-string match "*" a
-
-logmsg 'string match "a*b" axxb'
-string match "a*b" axxb
-
-logmsg 'string match -i "a**B" Axxb'
-string match -i "a**B" Axxb
-
-logmsg 'echo "ok?" | string match "*?"'
-echo "ok?" | string match "*?"
-
-logmsg 'string match -r "cat|dog|fish" "nice dog"'
-string match -r "cat|dog|fish" "nice dog"
-
-logmsg 'string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56'
-string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56
-
-logmsg 'string match -r "^(\w{2,4})\g1\$" papa mud murmur'
-string match -r "^(\w{2,4})\g1\$" papa mud murmur
-
-logmsg 'string match -r -a -n at ratatat'
-string match -r -a -n at ratatat
-
-logmsg 'string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"'
-string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"
-
-logmsg 'string replace is was "blue is my favorite"'
-string replace is was "blue is my favorite"
-
-logmsg 'string replace 3rd last 1st 2nd 3rd'
-string replace 3rd last 1st 2nd 3rd
-
-logmsg 'string replace -a " " _ "spaces to underscores"'
-string replace -a " " _ "spaces to underscores"
-
-logmsg 'string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"'
-string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"
-
-logmsg 'string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"'
-string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"
-
-logmsg 'string replace -r "\s*newline\s*" "\n" "put a newline here"'
-string replace -r "\s*newline\s*" "\n" "put a newline here"
-
-logmsg 'string replace -r -a "(\w)" "\$1\$1" ab'
-string replace -r -a "(\w)" "\$1\$1" ab
-
-logmsg 'string replace --filter x X abc axc x def jkx'
-string replace --filter x X abc axc x def jkx
-or echo Unexpected exit status at line (status --current-line-number)
-
-string replace --filter y Y abc axc x def jkx
-and echo Unexpected exit status at line (status --current-line-number)
-
-logmsg 'string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz'
-string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
-or echo Unexpected exit status at line (status --current-line-number)
-
-string replace --regex -f "Z" X 1bc axc 2 d3f jk4 xyz
-and echo Unexpected exit status at line (status --current-line-number)
-
-# From https://github.com/fish-shell/fish-shell/issues/5201
-logmsg 'string match -r with empty capture groups'
-string match -r '^([ugoa]*)([=+-]?)([rwx]*)$' '=r'
-
-# test some failure cases
-logmsg 'string match -r "[" "a[sd"'
-string match -r "[" "a[sd"; and echo "unexpected exit 0"
-
-logmsg 'string invalidarg'
-string invalidarg; and echo "unexpected exit 0"
-
-logmsg 'string length'
-string length; or echo "missing argument returns 1"
-
-logmsg 'string match -r -v "[dcantg].*" dog can cat diz'
-string match -r -v "[dcantg].*" dog can cat diz; or echo "no regexp invert match"
-
-logmsg 'string match -v "*" dog can cat diz'
-string match -v "*" dog can cat diz; or echo "no glob invert match"
-
-logmsg 'string match -rvn a bbb'
-string match -rvn a bbb; or echo "exit 1"
-
-# test repeat subcommand
-logmsg 'string repeat -n 2 "foo"'
-string repeat -n 2 "foo"
-
-logmsg 'string repeat --count 2 "foo"'
-string repeat --count 2 "foo"
-
-logmsg 'echo foo | string repeat -n 2'
-echo foo | string repeat -n 2
-
-logmsg 'string repeat -n2 -q "foo"'
-string repeat -n2 -q "foo"; and echo "exit 0"
-
-logmsg 'string repeat -n2 --quiet "foo"'
-string repeat -n2 --quiet "foo"; and echo "exit 0"
-
-logmsg 'string repeat -n0 "foo"'
-string repeat -n0 "foo"; or echo "exit 1"
-
-logmsg 'string repeat -n0'
-string repeat -n0; or echo "exit 1"
-
-logmsg 'string repeat -m0'
-string repeat -m0; or echo "exit 1"
-
-logmsg 'string repeat -n1 -N "there is "'
-string repeat -n1 -N "there is "; echo "no newline"
-
-logmsg 'string repeat -n1 --no-newline "there is "'
-string repeat -n1 --no-newline "there is "; echo "no newline"
-
-logmsg 'string repeat -n10 -m4 "foo"'
-string repeat -n10 -m4 "foo"
-
-logmsg 'string repeat -n10 --max 5 "foo"'
-string repeat -n10 --max 5 "foo"
-
-logmsg 'string repeat -n3 -m20 "foo"'
-string repeat -n3 -m20 "foo"
-
-logmsg 'string repeat -m4 "foo"'
-string repeat -m4 "foo"
-
-logmsg 'string repeat -n-1 "foo"'
-string repeat -n-1 "foo"; and echo "exit 0"
-
-logmsg 'string repeat -m-1 "foo"'
-string repeat -m-1 "foo"; and echo "exit 0"
-
-logmsg 'string repeat -n notanumber "foo"'
-string repeat -n notanumber "foo"; and echo "exit 0"
-
-logmsg 'string repeat -m notanumber "foo"'
-string repeat -m notanumber "foo"; and echo "exit 0"
-
-logmsg 'echo "stdin" | string repeat -n1 "and arg"'
-echo "stdin" | string repeat -n1 "and arg"; and echo "exit 0"
-
-logmsg 'string repeat -n'
-string repeat -n; and echo "exit 0"
-
-logmsg 'string repeat -l fakearg 2>&1'
-string repeat -l fakearg
-
-logmsg 'string repeat ""'
-string repeat ""
-or echo string repeat empty string failed
-
-logmsg 'string repeat -n3 ""'
-string repeat -n3 ""
-or echo string repeat empty string failed
-
-# Test equivalent matches with/without the --entire, --regex, and --invert flags.
-logmsg 'string match -e x abc dxf xyz jkx x z'
-string match -e x abc dxf xyz jkx x z
-or echo exit 1
-
-logmsg 'string match x abc dxf xyz jkx x z'
-string match x abc dxf xyz jkx x z
-
-logmsg 'string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
-string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-or echo exit 1
-
-logmsg 'string match --entire "" -- banana'
-string match --entire "" -- banana
-or echo exit 1
-
-logmsg 'string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
-string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-or echo exit 1
-
-# Make sure that groups are handled correct with/without --entire.
-logmsg 'string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
-string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-or echo exit 1
-
-logmsg 'string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz'
-string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-or echo exit 1
-
-# Test `string lower` and `string upper`.
-set x (string lower abc DEF gHi)
-or echo string lower exit 1
-test $x[1] = 'abc' -a $x[2] = 'def' -a $x[3] = 'ghi'
-or echo strings not converted to lowercase
-
-set x (echo abc DEF gHi | string lower)
-or echo string lower exit 1
-test $x[1] = 'abc def ghi'
-or echo strings not converted to lowercase
-
-string lower -q abc
-and echo lowercasing a lowercase string did not fail as expected
-
-set x (string upper abc DEF gHi)
-or echo string upper exit 1
-test $x[1] = 'ABC' -a $x[2] = 'DEF' -a $x[3] = 'GHI'
-or echo strings not converted to uppercase
-
-set x (echo abc DEF gHi | string upper)
-or echo string upper exit 1
-test $x[1] = 'ABC DEF GHI'
-or echo strings not converted to uppercase
-
-string upper -q ABC DEF
-and echo uppercasing a uppercase string did not fail as expected
-
-logmsg '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
-# TODO: These do not yet work!
-# printf 'a\0b' | string match '*b' | string escape
-
-logmsg string split0
-count (echo -ne 'abcdefghi' | string split0)
-count (echo -ne 'abc\x00def\x00ghi\x00' | string split0)
-count (echo -ne 'abc\x00def\x00ghi\x00\x00' | string split0)
-count (echo -ne 'abc\x00def\x00ghi' | string split0)
-count (echo -ne 'abc\ndef\x00ghi\x00' | string split0)
-count (echo -ne 'abc\ndef\nghi' | string split0)
-# #5701 - split0 always returned 1
-echo -ne 'a\x00b' | string split0
-and echo Split something
-
-logmsg string join0
-set tmp beta alpha\ngamma
-count (string join \n $tmp)
-count (string join0 $tmp)
-count (string join0 $tmp | string split0)
-
-logmsg string split0 in functions
-# This function outputs some newline-separated content, and some
-# explicitly separated content.
-function dualsplit
-  echo alpha
-  echo beta
-  echo -ne 'gamma\x00delta' | string split0
-end
-count (dualsplit)
-
-logmsg string collect
-count (echo one\ntwo\nthree\nfour | string collect)
-count (echo one | string collect)
-echo [(echo one\ntwo\nthree | string collect)]
-echo [(echo one\ntwo\nthree | string collect -N)]
-printf '[%s]\n' (string collect one\n\n two\n)
-printf '[%s]\n' (string collect -N one\n\n two\n)
-printf '[%s]\n' (string collect --no-trim-newlines one\n\n two\n)
-# string collect returns 0 when it has any output, otherwise 1
-string collect >/dev/null; and echo unexpected success; or echo expected failure
-echo -n | string collect >/dev/null; and echo unexpected success; or echo expected failure
-echo | string collect -N >/dev/null; and echo expected success; or echo unexpected failure
-echo | string collect >/dev/null; and echo unexpected success; or echo expected failure
-string collect a >/dev/null; and echo expected success; or echo unexpected failure
-string collect -N '' >/dev/null; and echo unexpected success; or echo expected failure
-string collect \n\n >/dev/null; and echo unexpected success; or echo expected failure
-
-logmsg string collect in functions
-# This function outputs some newline-separated content, and some
-# explicitly un-separated content.
-function dualcollect
-  echo alpha
-  echo beta
-  echo gamma\ndelta\nomega | string collect
-end
-count (dualcollect)
-
-exit 0
diff --git a/tests/string.out b/tests/string.out
deleted file mode 100644
index e758c67bf..000000000
--- a/tests/string.out
+++ /dev/null
@@ -1,520 +0,0 @@
-
-####################
-# string match -r -v "c.*" dog can cat diz
-dog
-diz
-exit 0
-
-####################
-# string match -q -r -v "c.*" dog can cat diz
-exit 0
-
-####################
-# string match -v "c*" dog can cat diz
-dog
-diz
-exit 0
-
-####################
-# string match -q -v "c*" dog can cat diz
-exit 0
-
-####################
-# string match -v "d*" dog dan dat diz
-exit 1
-
-####################
-# string match -q -v "d*" dog dan dat diz
-exit 1
-
-####################
-# string match -r -v x y
-y
-exit 0
-
-####################
-# string match -r -v x x
-exit 1
-
-####################
-# string match -q -r -v x y
-exit 0
-
-####################
-# string match -q -r -v x x
-exit 1
-
-####################
-# string length "hello, world"
-12
-
-####################
-# string length -q ""
-zero length
-
-####################
-# string sub --length 2 abcde
-ab
-
-####################
-# string sub -s 2 -l 2 abcde
-bc
-
-####################
-# string sub --start=-2 abcde
-de
-
-####################
-# string split . example.com
-example
-com
-
-####################
-# string split -r -m1 / /usr/local/bin/fish
-/usr/local/bin
-fish
-
-####################
-# string split "" abc
-a
-b
-c
-
-####################
-# seq 3 | string join ...
-1...2...3
-
-####################
-# string trim " abc  "
-abc
-
-####################
-# string trim --right --chars=yz xyzzy zany
-x
-zan
-
-####################
-# echo \x07 | string escape
-\cg
-
-####################
-# string escape --style=script 'a b#c"\'d'
-a\ b\#c\"\'d
-
-####################
-# string escape --style=url 'a b#c"\'d'
-a%20b%23c%22%27d
-
-####################
-# string escape --style=url \na\nb%c~d\n
-%0Aa%0Ab%25c~d%0A
-
-####################
-# string escape --style=var 'a b#c"\'d'
-a_20_b_23_c_22_27_d
-
-####################
-# string escape --style=script a\nghi_
-a_0A_ghi__
-
-####################
-# string escape --style=var 'abc'
-abc
-
-####################
-# string escape --style=var '_a_b_c_'
-__a__b__c__
-
-####################
-# string escape --style=var -- -
-_2D_
-
-####################
-# string escape with multibyte chars
-a%C3%B6b
-%E4%B8%AD
-aöb
-中
-a_C3_B6_b
-_E4_B8_AD_
-aöb
-中
-
-####################
-# string escape for literal pcre2 searching
-\.ext
-bonjour, amigo
-\^this is a literal string
-
-####################
-# set x (string unescape (echo \x07 | string escape))
-success
-
-####################
-# string unescape --style=script (string escape --style=script 'a b#c"\'d')
-a b#c"'d
-
-####################
-# string unescape --style=url (string escape --style=url 'a b#c"\'d')
-a b#c"'d
-
-####################
-# string unescape --style=url (string escape --style=url \na\nb%c~d\n)
-
-a
-b%c~d
-
-
-####################
-# string unescape --style=var (string escape --style=var 'a b#c"\'d')
-a b#c"'d
-
-####################
-# string unescape --style=var (string escape --style=var a\nghi_)
-a
-ghi_
-
-####################
-# string unescape --style=var (string escape --style=var 'abc')
-abc
-
-####################
-# string unescape --style=var (string escape --style=var '_a_b_c_')
-_a_b_c_
-
-####################
-# string unescape --style=var (string escape --style=var -- -)
--
-
-####################
-# string match "*" a
-a
-
-####################
-# string match "a*b" axxb
-axxb
-
-####################
-# string match -i "a**B" Axxb
-Axxb
-
-####################
-# echo "ok?" | string match "*?"
-ok?
-
-####################
-# string match -r "cat|dog|fish" "nice dog"
-dog
-
-####################
-# string match -r "(\d\d?):(\d\d):(\d\d)" 2:34:56
-2:34:56
-2
-34
-56
-
-####################
-# string match -r "^(\w{2,4})\g1\$" papa mud murmur
-papa
-pa
-murmur
-mur
-
-####################
-# string match -r -a -n at ratatat
-2 2
-4 2
-6 2
-
-####################
-# string match -r -i "0x[0-9a-f]{1,8}" "int magic = 0xBadC0de;"
-0xBadC0de
-
-####################
-# string replace is was "blue is my favorite"
-blue was my favorite
-
-####################
-# string replace 3rd last 1st 2nd 3rd
-1st
-2nd
-last
-
-####################
-# string replace -a " " _ "spaces to underscores"
-spaces_to_underscores
-
-####################
-# string replace -r -a "[^\d.]+" " " "0 one two 3.14 four 5x"
-0 3.14 5 
-
-####################
-# string replace -r "(\w+)\s+(\w+)" "\$2 \$1 \$\$" "left right"
-right left $
-
-####################
-# string replace -r "\s*newline\s*" "\n" "put a newline here"
-put a
-here
-
-####################
-# string replace -r -a "(\w)" "\$1\$1" ab
-aabb
-
-####################
-# string replace --filter x X abc axc x def jkx
-aXc
-X
-jkX
-
-####################
-# string replace --regex -f "\d" X 1bc axc 2 d3f jk4 xyz
-Xbc
-X
-dXf
-jkX
-
-####################
-# string match -r with empty capture groups
-=r
-
-=
-r
-
-####################
-# string match -r "[" "a[sd"
-
-####################
-# string invalidarg
-
-####################
-# string length
-missing argument returns 1
-
-####################
-# string match -r -v "[dcantg].*" dog can cat diz
-no regexp invert match
-
-####################
-# string match -v "*" dog can cat diz
-no glob invert match
-
-####################
-# string match -rvn a bbb
-1 3
-
-####################
-# string repeat -n 2 "foo"
-foofoo
-
-####################
-# string repeat --count 2 "foo"
-foofoo
-
-####################
-# echo foo | string repeat -n 2
-foofoo
-
-####################
-# string repeat -n2 -q "foo"
-exit 0
-
-####################
-# string repeat -n2 --quiet "foo"
-exit 0
-
-####################
-# string repeat -n0 "foo"
-exit 1
-
-####################
-# string repeat -n0
-exit 1
-
-####################
-# string repeat -m0
-exit 1
-
-####################
-# string repeat -n1 -N "there is "
-there is no newline
-
-####################
-# string repeat -n1 --no-newline "there is "
-there is no newline
-
-####################
-# string repeat -n10 -m4 "foo"
-foof
-
-####################
-# string repeat -n10 --max 5 "foo"
-foofo
-
-####################
-# string repeat -n3 -m20 "foo"
-foofoofoo
-
-####################
-# string repeat -m4 "foo"
-foof
-
-####################
-# string repeat -n-1 "foo"
-
-####################
-# string repeat -m-1 "foo"
-
-####################
-# string repeat -n notanumber "foo"
-
-####################
-# string repeat -m notanumber "foo"
-
-####################
-# echo "stdin" | string repeat -n1 "and arg"
-
-####################
-# string repeat -n
-
-####################
-# string repeat -l fakearg 2>&1
-
-####################
-# string repeat ""
-string repeat empty string failed
-
-####################
-# string repeat -n3 ""
-string repeat empty string failed
-
-####################
-# string match -e x abc dxf xyz jkx x z
-dxf
-xyz
-jkx
-x
-
-####################
-# string match x abc dxf xyz jkx x z
-x
-
-####################
-# string match --entire -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-abxc
-bye
-aaabyz
-kaabxz
-abbxy
-caabxyxz
-
-####################
-# string match --entire "" -- banana
-banana
-
-####################
-# string match -r "a*b[xy]+" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-abx
-by
-aaaby
-aabx
-bxy
-aabxyx
-
-####################
-# string match --entire -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-abxc
-x
-bye
-y
-aaabyz
-y
-kaabxz
-x
-abbxy
-xy
-caabxyxz
-xyx
-
-####################
-# string match -r "a*b([xy]+)" abc abxc bye aaabyz kaabxz abbxy abcx caabxyxz
-abx
-x
-by
-y
-aaaby
-y
-aabx
-x
-bxy
-xy
-aabxyx
-xyx
-
-####################
-# Check NUL
-a\x00b
-a\x00c
-a
-\x00
-d
-a\x00b
-a\x00g
-a\x00g
-
-####################
-# string split0
-1
-3
-4
-3
-2
-1
-a
-b
-Split something
-
-####################
-# string join0
-3
-2
-2
-
-####################
-# string split0 in functions
-4
-
-####################
-# string collect
-1
-1
-[one
-two
-three]
-[one
-two
-three
-]
-[one]
-[two]
-[one
-
-]
-[two
-]
-[one
-
-]
-[two
-]
-expected failure
-expected failure
-expected success
-expected failure
-expected success
-expected failure
-expected failure
-
-####################
-# string collect in functions
-3

From 5c7b7fd609c5c71609534f693a9cbdf17a23936d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 21:12:49 +0200
Subject: [PATCH 0753/1732] Readd bad-switch and directory-redirection tests

Made possible by the power of regex.
---
 tests/checks/bad-option.fish                        | 2 ++
 tests/checks/directory-redirect.fish                | 5 +++++
 tests/invocation/bad-switch.err                     | 2 --
 tests/invocation/bad-switch.err.Darwin              | 2 --
 tests/invocation/bad-switch.invoke.disabled         | 1 -
 tests/invocation/directory-redirect.err             | 3 ---
 tests/invocation/directory-redirect.err.SunOS       | 3 ---
 tests/invocation/directory-redirect.invoke.disabled | 1 -
 8 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 tests/checks/bad-option.fish
 create mode 100644 tests/checks/directory-redirect.fish
 delete mode 100644 tests/invocation/bad-switch.err
 delete mode 100644 tests/invocation/bad-switch.err.Darwin
 delete mode 100644 tests/invocation/bad-switch.invoke.disabled
 delete mode 100644 tests/invocation/directory-redirect.err
 delete mode 100644 tests/invocation/directory-redirect.err.SunOS
 delete mode 100644 tests/invocation/directory-redirect.invoke.disabled

diff --git a/tests/checks/bad-option.fish b/tests/checks/bad-option.fish
new file mode 100644
index 000000000..f3c0af42e
--- /dev/null
+++ b/tests/checks/bad-option.fish
@@ -0,0 +1,2 @@
+#RUN: %fish -Z
+#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?}}
diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish
new file mode 100644
index 000000000..544661cd8
--- /dev/null
+++ b/tests/checks/directory-redirect.fish
@@ -0,0 +1,5 @@
+#RUN: %fish -c 'begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"; echo $status'
+# Note that we sometimes get fancy quotation marks here, so let's match three characters
+#CHECKERR: <W> fish: An error occurred while redirecting file {{...}}
+#CHECKERR: {{open: Is a directory|open: Invalid argument}}
+#CHECK: 1
diff --git a/tests/invocation/bad-switch.err b/tests/invocation/bad-switch.err
deleted file mode 100644
index 93124dfa5..000000000
--- a/tests/invocation/bad-switch.err
+++ /dev/null
@@ -1,2 +0,0 @@
-./fish: invalid option -- 'Z'
-RC: 1
diff --git a/tests/invocation/bad-switch.err.Darwin b/tests/invocation/bad-switch.err.Darwin
deleted file mode 100644
index 2d2f2fa68..000000000
--- a/tests/invocation/bad-switch.err.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-fish: invalid option -- Z
-RC: 1
diff --git a/tests/invocation/bad-switch.invoke.disabled b/tests/invocation/bad-switch.invoke.disabled
deleted file mode 100644
index 2e52e40e7..000000000
--- a/tests/invocation/bad-switch.invoke.disabled
+++ /dev/null
@@ -1 +0,0 @@
--Z
diff --git a/tests/invocation/directory-redirect.err b/tests/invocation/directory-redirect.err
deleted file mode 100644
index ed2330550..000000000
--- a/tests/invocation/directory-redirect.err
+++ /dev/null
@@ -1,3 +0,0 @@
-<W> fish: An error occurred while redirecting file '.'
-open: Is a directory
-RC: 1
diff --git a/tests/invocation/directory-redirect.err.SunOS b/tests/invocation/directory-redirect.err.SunOS
deleted file mode 100644
index e3e6b2534..000000000
--- a/tests/invocation/directory-redirect.err.SunOS
+++ /dev/null
@@ -1,3 +0,0 @@
-<W> fish: An error occurred while redirecting file '.'
-open: Invalid argument
-RC: 1
diff --git a/tests/invocation/directory-redirect.invoke.disabled b/tests/invocation/directory-redirect.invoke.disabled
deleted file mode 100644
index 84a002bea..000000000
--- a/tests/invocation/directory-redirect.invoke.disabled
+++ /dev/null
@@ -1 +0,0 @@
--c 'begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"'

From 10949648e7445e5ccd23b6b5d525c7eb8adaf652 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 21:30:17 +0200
Subject: [PATCH 0754/1732] Port qmark1 test to littlecheck

This one just needs a random home.
---
 tests/checks/features-qmark1.fish       | 2 ++
 tests/invocation/features-qmark1.invoke | 1 -
 tests/invocation/features-qmark1.out    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tests/checks/features-qmark1.fish
 delete mode 100644 tests/invocation/features-qmark1.invoke
 delete mode 100644 tests/invocation/features-qmark1.out

diff --git a/tests/checks/features-qmark1.fish b/tests/checks/features-qmark1.fish
new file mode 100644
index 000000000..89ad81575
--- /dev/null
+++ b/tests/checks/features-qmark1.fish
@@ -0,0 +1,2 @@
+#RUN: env HOME="$(mktemp -d)" XDG_CONFIG_HOME="$(mktemp -d)" %fish --features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
+#CHECK: qmarkon: 0
diff --git a/tests/invocation/features-qmark1.invoke b/tests/invocation/features-qmark1.invoke
deleted file mode 100644
index 25b7db2d0..000000000
--- a/tests/invocation/features-qmark1.invoke
+++ /dev/null
@@ -1 +0,0 @@
---features '' -c 'string match --quiet "??" ab ; echo "qmarkon: $status"'
diff --git a/tests/invocation/features-qmark1.out b/tests/invocation/features-qmark1.out
deleted file mode 100644
index 5a27d467d..000000000
--- a/tests/invocation/features-qmark1.out
+++ /dev/null
@@ -1 +0,0 @@
-qmarkon: 0

From a33c2f0bcef3a1b49e9a32adff57f3f6d8e4faef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 22:01:53 +0200
Subject: [PATCH 0755/1732] Port config tests to littlecheck

This required a bit of thinking.

What we do is we have one test that fakes $HOME, and then we do the
various config tests there.

The fake config we have is reused and we exercise all of the same codepaths.
---
 tests/checks/broken-config.fish             | 20 ++++++++++++++++++++
 tests/checks/broken-config/fish/config.fish |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/checks/broken-config.fish
 create mode 100644 tests/checks/broken-config/fish/config.fish

diff --git a/tests/checks/broken-config.fish b/tests/checks/broken-config.fish
new file mode 100644
index 000000000..377b23929
--- /dev/null
+++ b/tests/checks/broken-config.fish
@@ -0,0 +1,20 @@
+#RUN: %fish -C 'set -g fish %fish' %s
+begin
+    set -l dir $PWD/(dirname (status -f))
+    set -gx XDG_CONFIG_HOME $dir/broken-config/
+    set -gx HOME $dir/broken-config/
+    $fish -l -c 'echo but still going'
+    # CHECK: broken
+    # CHECK: but still going
+    # CHECKERR: fish: Unknown command: syntax-error
+    # CHECKERR: ~//fish/config.fish (line {{\d+}}):
+    # CHECKERR: syntax-error
+    # CHECKERR: ^
+    # CHECKERR: from sourcing file ~//fish/config.fish
+    # CHECKERR: called during startup
+
+    $fish -c "echo normal command" -C "echo init"
+    # CHECK: broken
+    # CHECK: init
+    # CHECK: normal command
+end
diff --git a/tests/checks/broken-config/fish/config.fish b/tests/checks/broken-config/fish/config.fish
new file mode 100644
index 000000000..2dc3d886d
--- /dev/null
+++ b/tests/checks/broken-config/fish/config.fish
@@ -0,0 +1,4 @@
+echo broken
+if status is-login
+    syntax-error
+end

From cdbd0891f7c6817e424664904e9f8387fd05fa94 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 22:03:49 +0200
Subject: [PATCH 0756/1732] Remove invocation tests

These are now all performed by littlecheck, so there's no need for the
entire target anymore.
---
 cmake/Install.cmake                           |   2 +-
 cmake/Tests.cmake                             |  15 +-
 tests/invocation.sh                           | 328 ------------------
 .../invocation/broken-config-continues.config |   2 -
 tests/invocation/broken-config-continues.err  |   6 -
 .../invocation/broken-config-continues.invoke |   1 -
 tests/invocation/broken-config-continues.out  |   2 -
 .../invocation/config-command-ordering.config |   1 -
 .../invocation/config-command-ordering.invoke |   1 -
 tests/invocation/config-command-ordering.out  |   3 -
 tests/invocation/config.config                |   1 -
 tests/invocation/config.invoke                |   1 -
 tests/invocation/config.out                   |   1 -
 13 files changed, 4 insertions(+), 360 deletions(-)
 delete mode 100755 tests/invocation.sh
 delete mode 100644 tests/invocation/broken-config-continues.config
 delete mode 100644 tests/invocation/broken-config-continues.err
 delete mode 100644 tests/invocation/broken-config-continues.invoke
 delete mode 100644 tests/invocation/broken-config-continues.out
 delete mode 100644 tests/invocation/config-command-ordering.config
 delete mode 100644 tests/invocation/config-command-ordering.invoke
 delete mode 100644 tests/invocation/config-command-ordering.out
 delete mode 100644 tests/invocation/config.config
 delete mode 100644 tests/invocation/config.invoke
 delete mode 100644 tests/invocation/config.out

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index f1537344a..1bc71a923 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -216,7 +216,7 @@ ENDIF()
 
 # Group install targets into a InstallTargets folder
 SET_PROPERTY(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE
-                    test_invocation test_fishscript
+                    test_fishscript
                     test_prep tests_buildroot_target
              PROPERTY FOLDER cmake/InstallTargets)
 
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 425c05c64..90d18ce9a 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -76,12 +76,6 @@ FOREACH(TESTTYPE test serial_test)
     DEPENDS fish_tests
     USES_TERMINAL)
 
-  ADD_CUSTOM_TARGET(${TESTTYPE}_invocation
-                    COMMAND ./invocation.sh
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests/
-                    DEPENDS test_prep
-                    USES_TERMINAL)
-
   ADD_CUSTOM_TARGET(${TESTTYPE}_fishscript
                     COMMAND cd tests && ${TEST_ROOT_DIR}/bin/fish test.fish
                     DEPENDS test_prep
@@ -96,12 +90,11 @@ ENDFOREACH(TESTTYPE)
 # Now add a dependency chain between the serial versions.
 # This ensures they run in order.
 ADD_DEPENDENCIES(serial_test_fishscript serial_test_low_level)
-ADD_DEPENDENCIES(serial_test_invocation serial_test_fishscript)
-ADD_DEPENDENCIES(serial_test_interactive serial_test_invocation)
+ADD_DEPENDENCIES(serial_test_interactive serial_test_fishscript)
 
 
 ADD_CUSTOM_TARGET(serial_test_high_level
-                  DEPENDS serial_test_invocation serial_test_interactive serial_test_fishscript)
+                  DEPENDS serial_test_interactive serial_test_fishscript)
 
 # Create the 'test' target.
 # Set a policy so CMake stops complaining about the name 'test'.
@@ -118,13 +111,11 @@ SET_PROPERTY(TARGET test tests_dir
                     test_low_level
                     test_fishscript
                     test_interactive
-                    test_invocation
-                    test_invocation test_fishscript test_prep
+                    test_fishscript test_prep
                     tests_buildroot_target
                     serial_test_high_level
                     serial_test_low_level
                     serial_test_fishscript
                     serial_test_interactive
-                    serial_test_invocation
                     symlink_functions
              PROPERTY FOLDER cmake/TestTargets)
diff --git a/tests/invocation.sh b/tests/invocation.sh
deleted file mode 100755
index 728636ca4..000000000
--- a/tests/invocation.sh
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/bin/sh
-##
-# Test that the invocation of the fish executable works as we hope.
-#
-# We try to run the 'fish' binary with different command line switches.
-# Each time we check against an output that we expect.
-#
-# We are testing fish's invocation itself, so this is not written in
-# fish itself - if the invocation wasn't working, we'd never even
-# be able to use this test to check that the invocation wasn't working.
-#
-# What we test...
-#
-# * The environment is cleaned so that (hopefully) differences in
-#   the host terminal, language or user settings do not affect the
-#   tests.
-#
-# * The files 'tests/invocation/*.invoke' contain the arguments that
-#   will be passed to the 'fish' command under test. The arguments
-#   may be split over multiple lines for clarity.
-#
-# * Before execution, if the file 'tests/invocation/<name>.config'
-#   exists, it will be copied as the 'config.fish' file in the
-#   configuration directory.
-#
-# * The stdout and stderr are captured into files and will be
-#   processed before comparison with the
-#   'tests/invocation/<name>.(out|err)' files. A missing file is
-#   considered to be no output.
-#   Either file may be given a further suffix of '.<system name>'
-#   which will be used in preference to the default. This allows
-#   the expected output to change depending on the system being
-#   used - to allow for differences in behaviour.
-#   The '<system name>' can be found with 'uname -s'.
-#   This facility should be used sparingly as system differences
-#   will confuse users.
-#
-# * The file 'tests/invocation/<name>.grep' is used to select the
-#   sections of the file we are interested in within the stdout.
-#   Only the parts that match will be compared to the '*.out' file.
-#   This can be used to filter out changeable parts of the output
-#   leaving just the parts we are interested in.
-#
-# * The stderr output will have the 'RC: <return code>' appended
-#   if the command returned a non-zero value.
-#   The stderr output will have the 'XDG_CONFIG_HOME' location
-#   substituted, to allow error reports to be compared consistently.
-#
-# * If the processed output differs from the supplied output,
-#   the test will fail, and the differences will be shown on the
-#   console.
-#
-# * If anything fails, the return code for this script will be
-#   non-zero.
-#
-
-# With this, errors would be fatal.
-# However, a return value of non-zero doesn't signal something that necessarily should be fatal.
-# For instance, `tput` returns 1 if an attribute isn't defined.
-# But we don't want it to kill our script, especially not without any indication.
-#
-# set -e
-
-# The directory this script is in (as everything is relative to here)
-here="$(cd "$(dirname "$0")" && pwd -P)"
-cd "$here"
-
-# The temporary directory to use
-temp_dir="$here/../test"
-
-# The fish binary we are testing - for manual testing, may be overridden
-fish_exe="${fish_exe:-../test/root/bin/fish}"
-fish_dir="$(dirname "${fish_exe}")"
-fish_leaf="$(basename "${fish_exe}")"
-
-
-# Which system are we on.
-# fish has slightly different behaviour depending on the system it is
-# running on (and the libraries that it is linked with), so for special
-# cases, we'll use a suffixed file.
-system_name="$(uname -s)"
-
-
-# Check whether we have the 'colordiff' tool - if not, we'll revert to
-# boring regular 'diff'.
-if command -v colordiff >/dev/null 2>&1; then
-    difftool='colordiff'
-else
-    difftool='diff'
-fi
-
-
-##
-# Set variables to known values so that they will not affect the
-# execution of the test.
-clean_environment() {
-
-    # Reset the terminal variables to a known type.
-    export TERM=xterm
-    unset ITERM_PROFILE
-
-    # And the language as well, so that we do not see differences in
-    # output dur to the user's locale
-    export LANGUAGE=en_US:en
-
-    # Ensure that the fish environment we use is in a clean state
-    rm -rf "${temp_dir}/data" "${temp_dir}/home"
-    mkdir -p "${temp_dir}/data" "${temp_dir}/home" "${temp_dir}/home/fish"
-    export XDG_DATA_HOME="${temp_dir}/data"
-    export XDG_CONFIG_HOME="${temp_dir}/home"
-}
-
-
-##
-# Fail completely :-(
-fail() {
-    say "$term_red" "FAIL: $*" >&2
-    exit 1
-}
-
-
-##
-# Coloured output
-#
-# Use like `say "$term_green" "message".
-say() {
-    echo "$1$2$term_reset"
-}
-
-run_rc() {
-    # Write the return code on to the end of the stderr, so that it can be
-    # checked like anything else.
-    eval "$*" || echo "RC: $?" >&2
-}
-
-filter() {
-    # In some cases we want to check only a part of the output.
-    # For those we filter the output through grep'd matches.
-    if [ -f "$1" ] ; then
-        # grep '-o', '-E' and '-f' are supported by the tools in modern GNU
-        # environments, and on OS X.
-        #
-        # But not on OpenIndiana/Illumos, so we use ggrep if available.
-        if command -v ggrep >/dev/null 2>&1; then
-            ggrep -oE -f "$1"
-        else
-            grep -oE -f "$1"
-        fi
-    else
-        cat
-    fi
-}
-
-##
-# Actual testing of a .invoke file.
-test_file() (
-    file="$1"
-    dir="$(dirname "$file")"
-    base="$(basename "$file" .invoke)"
-    test_config="${dir}/${base}.config"
-    test_stdout="${dir}/${base}.tmp.out"
-    test_stderr="${dir}/${base}.tmp.err"
-    want_stdout="${dir}/${base}.out"
-    grep_stdout="${dir}/${base}.grep"
-    want_stderr="${dir}/${base}.err"
-    empty="${dir}/${base}.empty"
-    rc=0
-    test_args_literal=
-    test_args=
-    out_status=0
-    err_status=0
-
-    # Literal arguments, for printing
-    test_args_literal="$(cat "$file")"
-    # Read the test arguments, escaping things that might be processed by us
-    test_args="$(sed 's/\$/\$/' "$file" | tr '\n' ' ')"
-
-    # Select system-specific files if they are present.
-    system_specific=
-    if [ -f "${test_config}.${system_name}" ] ; then
-        test_config="${test_config}.${system_name}"
-        system_specific=true
-    fi
-    if [ -f "${want_stdout}.${system_name}" ] ; then
-        want_stdout="${want_stdout}.${system_name}"
-        system_specific=true
-    fi
-    if [ -f "${want_stderr}.${system_name}" ] ; then
-        want_stderr="${want_stderr}.${system_name}"
-        system_specific=true
-    fi
-    if [ -f "${grep_stdout}.${system_name}" ] ; then
-        grep_stdout="${grep_stdout}.${system_name}"
-        system_specific=true
-    fi
-
-    # Create an empty file so that we can compare against it if needed
-    touch "${empty}"
-
-    # If they supplied a configuration file, we create it here
-    if [ -f "$test_config" ] ; then
-        cat "$test_config" > "${temp_dir}/home/fish/config.fish"
-    else
-        rm -f "${temp_dir}/home/fish/config.fish"
-    fi
-
-    printf '%s' "Testing file $file ${system_specific:+($system_name specific) }... "
-
-    # The hoops we are jumping through here, with changing directory are
-    # so that we always execute fish as './fish', which means that any
-    # error messages will appear the same, even if the tested binary
-    # is not one that we built here.
-    # We disable the exit-on-error here, so that we can catch the return
-    # code.
-    set +e
-    run_rc "cd \"$fish_dir\" && \"./$fish_leaf\" $test_args" \
-           2> "$test_stderr" \
-           < /dev/null       \
-           | filter "$grep_stdout" \
-           > "$test_stdout"
-    set -e
-
-    # If the wanted output files are not present, they are assumed empty.
-    if [ ! -f "$want_stdout" ] ; then
-        want_stdout="$empty"
-    fi
-    if [ ! -f "$want_stderr" ] ; then
-        want_stderr="$empty"
-    fi
-
-    # The standard error that we get will report errors using non-relative
-    # filenames, so we try to replace these with the variable names.
-    #
-    # However, fish will also have helpfully translated the home directory
-    # into '~/' in the error report. Consequently, we need to perform a
-    # small fix-up so that we can replace the string sanely.
-    xdg_config_in_home="${XDG_CONFIG_HOME#$HOME}"
-    if [ "${#xdg_config_in_home}" -lt "${#XDG_CONFIG_HOME}" ]; then
-        xdg_config_in_home="~$xdg_config_in_home"
-    fi
-    # 'sed -i' (inplace) has different syntax on BSD and GNU versions of
-    # the tool, so cannot be used here, hence we write to a separate file,
-    # and then move back.
-    sed "s,$xdg_config_in_home,\$XDG_CONFIG_HOME,g" "${test_stderr}" > "${test_stderr}.new"
-    mv -f "${test_stderr}.new" "${test_stderr}"
-
-    # Check the results
-    if ! diff "${want_stdout}" "${test_stdout}" >/dev/null 2>/dev/null ; then
-        out_status=1
-    fi
-    if ! diff "${want_stderr}" "${test_stderr}" >/dev/null 2>/dev/null ; then
-        err_status=1
-    fi
-
-    if [ "$out_status" = '0' ] && \
-       [ "$err_status" = '0' ] ; then
-        say "$term_green" "ok"
-        # clean up tmp files
-        rm -f "${test_stdout}" "${test_stderr}" "${empty}"
-        rc=0
-    else
-        say "$term_red" "fail"
-        say "$term_blue" "$test_args_literal" | sed 's/^/    /'
-
-        if [ "$out_status" != '0' ] ; then
-            say "$term_yellow" "Output differs for file $file. Diff follows:"
-            "$difftool" -u "${want_stdout}" "${test_stdout}"
-        fi
-        if [ "$err_status" != '0' ] ; then
-            say "$term_yellow" "Error output differs for file $file. Diff follows:"
-            "$difftool" -u  "${want_stderr}" "${test_stderr}"
-        fi
-        rc=1
-    fi
-
-    return $rc
-)
-
-
-########################################################################
-# Main harness
-
-if [ ! -x "${fish_exe}" ] ; then
-    fail "Fish executable not found at '${fish_exe}'"
-fi
-
-clean_environment
-
-# Terminal colouring
-# Only do this after setting up $TERM.
-term_red=""
-term_green=""
-term_yellow=""
-term_blue=""
-term_magenta=""
-term_cyan=""
-term_white=""
-term_reset=""
-# Some systems don't have tput. Disable coloring.
-if command -v tput >/dev/null 2>&1; then
-    term_red="$(tput setaf 1)"
-    term_green="$(tput setaf 2)"
-    term_yellow="$(tput setaf 3)"
-    term_blue="$(tput setaf 4)"
-    term_magenta="$(tput setaf 5)"
-    term_cyan="$(tput setaf 6)"
-    term_white="$(tput setaf 7)"
-    term_reset="$(tput sgr0)"
-fi
-
-say "$term_cyan" "Testing shell invocation functionality"
-
-passed=0
-failed=0
-for file in invocation/*.invoke; do
-   if ! test_file "$file" ; then
-       failed=$(( failed + 1 ))
-   else
-       passed=$(( passed + 1 ))
-   fi
-done
-
-echo "Encountered $failed errors in the invocation tests (out of $(( failed + passed )))."
-
-if [ "$failed" != 0 ] ; then
-    exit 1
-fi
-exit 0
diff --git a/tests/invocation/broken-config-continues.config b/tests/invocation/broken-config-continues.config
deleted file mode 100644
index 9884fb83a..000000000
--- a/tests/invocation/broken-config-continues.config
+++ /dev/null
@@ -1,2 +0,0 @@
-echo broken
-syntax-error
diff --git a/tests/invocation/broken-config-continues.err b/tests/invocation/broken-config-continues.err
deleted file mode 100644
index d15aebbd8..000000000
--- a/tests/invocation/broken-config-continues.err
+++ /dev/null
@@ -1,6 +0,0 @@
-fish: Unknown command: syntax-error
-$XDG_CONFIG_HOME/fish/config.fish (line 2): 
-syntax-error
-^
-from sourcing file $XDG_CONFIG_HOME/fish/config.fish
-	called during startup
diff --git a/tests/invocation/broken-config-continues.invoke b/tests/invocation/broken-config-continues.invoke
deleted file mode 100644
index 56d0c77d6..000000000
--- a/tests/invocation/broken-config-continues.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c 'echo but still going'
diff --git a/tests/invocation/broken-config-continues.out b/tests/invocation/broken-config-continues.out
deleted file mode 100644
index 2b7a3d4fa..000000000
--- a/tests/invocation/broken-config-continues.out
+++ /dev/null
@@ -1,2 +0,0 @@
-broken
-but still going
diff --git a/tests/invocation/config-command-ordering.config b/tests/invocation/config-command-ordering.config
deleted file mode 100644
index 426d81082..000000000
--- a/tests/invocation/config-command-ordering.config
+++ /dev/null
@@ -1 +0,0 @@
-echo in config.fish
diff --git a/tests/invocation/config-command-ordering.invoke b/tests/invocation/config-command-ordering.invoke
deleted file mode 100644
index 07cb6dbb8..000000000
--- a/tests/invocation/config-command-ordering.invoke
+++ /dev/null
@@ -1 +0,0 @@
--c "echo command" -C "echo init-command"
diff --git a/tests/invocation/config-command-ordering.out b/tests/invocation/config-command-ordering.out
deleted file mode 100644
index 52cf61ca2..000000000
--- a/tests/invocation/config-command-ordering.out
+++ /dev/null
@@ -1,3 +0,0 @@
-in config.fish
-init-command
-command
diff --git a/tests/invocation/config.config b/tests/invocation/config.config
deleted file mode 100644
index 426d81082..000000000
--- a/tests/invocation/config.config
+++ /dev/null
@@ -1 +0,0 @@
-echo in config.fish
diff --git a/tests/invocation/config.invoke b/tests/invocation/config.invoke
deleted file mode 100644
index 8b1378917..000000000
--- a/tests/invocation/config.invoke
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/invocation/config.out b/tests/invocation/config.out
deleted file mode 100644
index 5d7216610..000000000
--- a/tests/invocation/config.out
+++ /dev/null
@@ -1 +0,0 @@
-in config.fish

From b672e1891ef5a31986c54569b3a0186487b1e5c8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 26 Jun 2019 11:07:46 -0700
Subject: [PATCH 0757/1732] Port signal tests to littlecheck

---
 tests/{signal.in => checks/signal.fish} | 22 ++++++++++++++++++++++
 tests/signal.err                        |  0
 tests/signal.out                        | 17 -----------------
 3 files changed, 22 insertions(+), 17 deletions(-)
 rename tests/{signal.in => checks/signal.fish} (50%)
 delete mode 100644 tests/signal.err
 delete mode 100644 tests/signal.out

diff --git a/tests/signal.in b/tests/checks/signal.fish
similarity index 50%
rename from tests/signal.in
rename to tests/checks/signal.fish
index 118c1d2e5..00bd45ac7 100644
--- a/tests/signal.in
+++ b/tests/checks/signal.fish
@@ -1,8 +1,11 @@
+# RUN: %fish %s
+
 function alarm --on-signal ALRM
   echo ALRM received
 end
 
 kill -s ALRM $fish_pid
+# CHECK: ALRM received
 
 function anychild --on-process-exit 0
   # Type and exit status
@@ -11,10 +14,22 @@ end
 
 echo "command false:"
 command false
+# CHECK: command false:
+# CHECK: PROCESS_EXIT 1
+# CHECK: JOB_EXIT 0
+
 echo "command true:"
 command true
+# CHECK: command true:
+# CHECK: PROCESS_EXIT 0
+# CHECK: JOB_EXIT 0
+
 echo "command false | true:"
 command false | command true
+# CHECK: command false | true:
+# CHECK: PROCESS_EXIT 1
+# CHECK: PROCESS_EXIT 0
+# CHECK: JOB_EXIT 0
 
 function test_blocks
   block -l
@@ -22,4 +37,11 @@ function test_blocks
   echo "This should come before the event handler"
 end
 test_blocks
+# CHECK: This is the process whose exit event shuld be blocked
+# CHECK: This should come before the event handler
+
 echo "Now event handler should have run"
+# CHECK: PROCESS_EXIT 0
+# CHECK: JOB_EXIT 0
+# CHECK: Now event handler should have run
+# CHECK: PROCESS_EXIT 0
diff --git a/tests/signal.err b/tests/signal.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/signal.out b/tests/signal.out
deleted file mode 100644
index 10aa9b5f3..000000000
--- a/tests/signal.out
+++ /dev/null
@@ -1,17 +0,0 @@
-ALRM received
-command false:
-PROCESS_EXIT 1
-JOB_EXIT 0
-command true:
-PROCESS_EXIT 0
-JOB_EXIT 0
-command false | true:
-PROCESS_EXIT 1
-PROCESS_EXIT 0
-JOB_EXIT 0
-This is the process whose exit event shuld be blocked
-This should come before the event handler
-PROCESS_EXIT 0
-JOB_EXIT 0
-Now event handler should have run
-PROCESS_EXIT 0

From 2f19ec1c34da30a9b33c34843ebd17f3e83e7f5f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 18:57:10 +0200
Subject: [PATCH 0758/1732] Port count test to littlecheck

---
 tests/{count.in => checks/count.fish} | 24 ++++++++++++++++------
 tests/count.err                       | 18 -----------------
 tests/count.out                       | 29 ---------------------------
 3 files changed, 18 insertions(+), 53 deletions(-)
 rename tests/{count.in => checks/count.fish} (66%)
 delete mode 100644 tests/count.err
 delete mode 100644 tests/count.out

diff --git a/tests/count.in b/tests/checks/count.fish
similarity index 66%
rename from tests/count.in
rename to tests/checks/count.fish
index e0a1480ed..c66afbfcd 100644
--- a/tests/count.in
+++ b/tests/checks/count.fish
@@ -1,22 +1,31 @@
+#RUN: %fish %s
 # Validate the behavior of the `count` command.
 
-logmsg no args
+# no args
 count
+# CHECK: 0
 
-logmsg one args
+# one args
 count x
+# CHECK: 1
 
-logmsg two args
+# two args
 count x y
+# CHECK: 2
 
-logmsg args that look like flags or are otherwise special
+# args that look like flags or are otherwise special
 count -h
+# CHECK: 1
 count --help
+# CHECK: 1
 count --
+# CHECK: 1
 count -- abc
+# CHECK: 2
 count def -- abc
+# CHECK: 3
 
-logmsg big counts
+# big counts
 
 # See #5611
 for i in seq 500
@@ -28,11 +37,14 @@ for i in seq 500
     end
 end
 
-logmsg stdin
+# stdin
 # Reading from stdin still counts the arguments
 printf '%s\n' 1 2 3 4 5 | count 6 7 8 9 10
+# CHECK: 10
 
 # Reading from stdin counts newlines - like `wc -l`.
 echo -n 0 | count
+# CHECK: 0
 
 echo 1 | count
+# CHECK: 1
diff --git a/tests/count.err b/tests/count.err
deleted file mode 100644
index 333edb967..000000000
--- a/tests/count.err
+++ /dev/null
@@ -1,18 +0,0 @@
-
-####################
-# no args
-
-####################
-# one args
-
-####################
-# two args
-
-####################
-# args that look like flags or are otherwise special
-
-####################
-# big counts
-
-####################
-# stdin
diff --git a/tests/count.out b/tests/count.out
deleted file mode 100644
index c53b726d4..000000000
--- a/tests/count.out
+++ /dev/null
@@ -1,29 +0,0 @@
-
-####################
-# no args
-0
-
-####################
-# one args
-1
-
-####################
-# two args
-2
-
-####################
-# args that look like flags or are otherwise special
-1
-1
-1
-2
-3
-
-####################
-# big counts
-
-####################
-# stdin
-10
-0
-1

From 21805759a384b7caaee1e601a6e9a8acf383609a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 19:03:04 +0200
Subject: [PATCH 0759/1732] Port math test to littlecheck

This shows one bit where not trimming whitespace would make sense.
---
 tests/checks/math.fish | 128 +++++++++++++++++++++++++++++++++++++++++
 tests/math.err         |  42 --------------
 tests/math.in          |  61 --------------------
 tests/math.out         |  58 -------------------
 4 files changed, 128 insertions(+), 161 deletions(-)
 create mode 100644 tests/checks/math.fish
 delete mode 100644 tests/math.err
 delete mode 100644 tests/math.in
 delete mode 100644 tests/math.out

diff --git a/tests/checks/math.fish b/tests/checks/math.fish
new file mode 100644
index 000000000..5a278baf4
--- /dev/null
+++ b/tests/checks/math.fish
@@ -0,0 +1,128 @@
+#RUN: %fish %s
+# Validate basic expressions
+math 3 / 2
+# CHECK: 1.5
+math 10/6
+# CHECK: 1.666667
+math -s0 10 / 6
+# CHECK: 1
+math 'floor(10 / 6)'
+# CHECK: 1
+math -s3 10/6
+# CHECK: 1.667
+math '10 % 6'
+# CHECK: 4
+math -s0 '10 % 6'
+# CHECK: 4
+math '23 % 7'
+# CHECK: 2
+math --scale=6 '5 / 3 * 0.3'
+# CHECK: 0.5
+math --scale=max '5 / 3'
+# CHECK: 1.666666666666667
+math "7^2"
+# CHECK: 49
+math -1 + 1
+# CHECK: 0
+math '-2 * -2'
+# CHECK: 4
+math 5 \* -2
+# CHECK: -10
+math -- -4 / 2
+# CHECK: -2
+math -- '-4 * 2'
+# CHECK: -8
+
+# Validate some rounding functions
+math 'round(3/2)' ; math 'floor(3/2)' ; math 'ceil(3/2)'
+# CHECK: 2
+# CHECK: 1
+# CHECK: 2
+math 'round(-3/2)' ; math 'floor(-3/2)' ; math 'ceil(-3/2)'
+# CHECK: -2
+# CHECK: -2
+# CHECK: -1
+
+# Validate some integral computations
+math 1
+math 10
+math 100
+math 1000
+# CHECK: 1
+# CHECK: 10
+# CHECK: 100
+# CHECK: 1000
+math '10^15'
+math '-10^14'
+math '-10^15'
+# CHECK: 1000000000000000
+# CHECK: 100000000000000
+# CHECK: -1000000000000000
+
+math -s0 '1.0 / 2.0'
+math -s0 '3.0 / 2.0'
+math -s0 '10^15 / 2.0'
+# CHECK: 0
+# CHECK: 1
+# CHECK: 500000000000000
+
+# Validate how variables in an expression are handled
+math $x + 1
+set x 1
+math $x + 1
+set x 3
+set y 1.5
+math "-$x * $y"
+math -s0 "-$x * $y"
+# CHECK: 1
+# CHECK: 2
+# CHECK: -4.5
+# CHECK: -4
+
+# Validate math error reporting
+# NOTE: The leading whitespace for the carets here is ignored
+# by littlecheck.
+not math '2 - '
+# CHECKERR: math: Error: Too few arguments
+# CHECKERR: '2 - '
+# CHECKERR:     ^
+not math 'ncr(1)'
+# CHECKERR: math: Error: Too few arguments
+# CHECKERR: 'ncr(1)'
+# CHECKERR:       ^
+not math 'max()'
+# CHECKERR: math: Error: Expression is bogus
+# CHECKERR: 'max()'
+# CHECKERR:    ^
+not math 'sin()'
+# CHECKERR: math: Error: Too few arguments
+# CHECKERR: 'sin()'
+# CHECKERR:      ^
+not math '2 + 2 4'
+# CHECKERR: math: Error: Too many arguments
+# CHECKERR: '2 + 2 4'
+# CHECKERR:        ^
+not math
+# CHECKERR: math: Expected at least 1 args, got only 0
+not math -s 12
+# CHECKERR: math: Expected at least 1 args, got only 0
+not math 2^999999
+# CHECKERR: math: Error: Result is infinite
+# CHECKERR: '2^999999'
+not math 1 / 0
+# CHECKERR: math: Error: Result is infinite
+# CHECKERR: '1 / 0'
+
+# Validate "x" as multiplier
+math 0x2 # Hex
+math 5 x 4
+math 2x 4
+math 2 x4 # ERROR
+# CHECKERR: math: Error: Unknown variable
+# CHECKERR: '2 x4'
+# CHECKERR:     ^
+math 0x 3
+# CHECK: 2
+# CHECK: 20
+# CHECK: 8
+# CHECK: 0
diff --git a/tests/math.err b/tests/math.err
deleted file mode 100644
index dad9f7ca4..000000000
--- a/tests/math.err
+++ /dev/null
@@ -1,42 +0,0 @@
-
-####################
-# Validate basic expressions
-
-####################
-# Validate some rounding functions
-
-####################
-# Validate some integral computations
-
-####################
-# Validate how variables in an expression are handled
-
-####################
-# Validate math error reporting
-math: Error: Too few arguments
-'2 - '
-    ^
-math: Error: Too few arguments
-'ncr(1)'
-      ^
-math: Error: Expression is bogus
-'max()'
-   ^
-math: Error: Too few arguments
-'sin()'
-     ^
-math: Error: Too many arguments
-'2 + 2 4'
-       ^
-math: Expected at least 1 args, got only 0
-math: Expected at least 1 args, got only 0
-math: Error: Result is infinite
-'2^999999'
-math: Error: Result is infinite
-'1 / 0'
-
-####################
-# Validate x as multiplier
-math: Error: Unknown variable
-'2 x4'
-    ^
diff --git a/tests/math.in b/tests/math.in
deleted file mode 100644
index 9bcac3b93..000000000
--- a/tests/math.in
+++ /dev/null
@@ -1,61 +0,0 @@
-logmsg Validate basic expressions
-math 3 / 2
-math 10/6
-math -s0 10 / 6
-math 'floor(10 / 6)'
-math -s3 10/6
-math '10 % 6'
-math -s0 '10 % 6'
-math '23 % 7'
-math --scale=6 '5 / 3 * 0.3'
-math --scale=max '5 / 3'
-math "7^2"
-math -1 + 1
-math '-2 * -2'
-math 5 \* -2
-math -- -4 / 2
-math -- '-4 * 2'
-
-logmsg Validate some rounding functions
-math 'round(3/2)' ; math 'floor(3/2)' ; math 'ceil(3/2)'
-math 'round(-3/2)' ; math 'floor(-3/2)' ; math 'ceil(-3/2)'
-
-logmsg Validate some integral computations
-math 1
-math 10
-math 100
-math 1000
-math '10^15'
-math '-10^14'
-math '-10^15'
-
-math -s0 '1.0 / 2.0'
-math -s0 '3.0 / 2.0'
-math -s0 '10^15 / 2.0'
-
-logmsg Validate how variables in an expression are handled
-math $x + 1
-set x 1
-math $x + 1
-set x 3
-set y 1.5
-math "-$x * $y"
-math -s0 "-$x * $y"
-
-logmsg Validate math error reporting
-not math '2 - '
-not math 'ncr(1)'
-not math 'max()'
-not math 'sin()'
-not math '2 + 2 4'
-not math
-not math -s 12
-not math 2^999999
-not math 1 / 0
-
-logmsg Validate "x" as multiplier
-math 0x2 # Hex
-math 5 x 4
-math 2x 4
-math 2 x4 # ERROR
-math 0x 3
diff --git a/tests/math.out b/tests/math.out
deleted file mode 100644
index ffe7b8604..000000000
--- a/tests/math.out
+++ /dev/null
@@ -1,58 +0,0 @@
-
-####################
-# Validate basic expressions
-1.5
-1.666667
-1
-1
-1.667
-4
-4
-2
-0.5
-1.666666666666667
-49
-0
-4
--10
--2
--8
-
-####################
-# Validate some rounding functions
-2
-1
-2
--2
--2
--1
-
-####################
-# Validate some integral computations
-1
-10
-100
-1000
-1000000000000000
-100000000000000
--1000000000000000
-0
-1
-500000000000000
-
-####################
-# Validate how variables in an expression are handled
-1
-2
--4.5
--4
-
-####################
-# Validate math error reporting
-
-####################
-# Validate x as multiplier
-2
-20
-8
-0

From 9462aacc5cf04efff7a34b1e440df064690f7f84 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 21:00:54 +0200
Subject: [PATCH 0760/1732] Port abbr test to littlecheck

---
 tests/abbr.err         | 52 -------------------------
 tests/abbr.in          | 71 ----------------------------------
 tests/abbr.out         | 55 --------------------------
 tests/checks/abbr.fish | 87 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 178 deletions(-)
 delete mode 100644 tests/abbr.err
 delete mode 100644 tests/abbr.in
 delete mode 100644 tests/abbr.out
 create mode 100644 tests/checks/abbr.fish

diff --git a/tests/abbr.err b/tests/abbr.err
deleted file mode 100644
index 9b8a4b9d1..000000000
--- a/tests/abbr.err
+++ /dev/null
@@ -1,52 +0,0 @@
-
-####################
-# Test basic add and list of __abbr1
-
-####################
-# Erasing one that doesn't exist should do nothing
-abbr --erase: No abbreviation named NOT_AN_ABBR
-
-####################
-# Adding existing __abbr1 should be idempotent
-
-####################
-# Replacing __abbr1 definition
-
-####################
-# __abbr1 -s and --show tests
-
-####################
-# Test erasing __abbr1
-
-####################
-# Ensure we escape special characters on output
-
-####################
-# Ensure we handle leading dashes in abbreviation names properly
-
-####################
-# Test that an abbr word containing spaces is rejected
-abbr --add: Abbreviation 'a b c' cannot have spaces in the word
-
-####################
-# Test renaming
-
-####################
-# Test renaming a nonexistent abbreviation
-abbr --rename: No abbreviation named __abbr6
-
-####################
-# Test renaming to a abbreviation with spaces
-abbr --rename: Abbreviation 'g h i' cannot have spaces in the word
-
-####################
-# Test renaming without arguments
-abbr --rename: Requires exactly two arguments
-
-####################
-# Test renaming with too many arguments
-abbr --rename: Requires exactly two arguments
-
-####################
-# Test renaming to existing abbreviation
-abbr --rename: Abbreviation __abbr12 already exists, cannot rename __abbr11
diff --git a/tests/abbr.in b/tests/abbr.in
deleted file mode 100644
index 42fb83c94..000000000
--- a/tests/abbr.in
+++ /dev/null
@@ -1,71 +0,0 @@
-logmsg Test basic add and list of __abbr1
-abbr __abbr1 alpha beta gamma
-abbr | grep __abbr1
-
-logmsg Erasing one that doesn\'t exist should do nothing
-abbr --erase NOT_AN_ABBR
-abbr | grep __abbr1
-
-logmsg Adding existing __abbr1 should be idempotent
-abbr __abbr1 alpha beta gamma
-abbr | grep __abbr1
-
-logmsg Replacing __abbr1 definition
-abbr __abbr1 delta
-abbr | grep __abbr1
-
-logmsg __abbr1 -s and --show tests
-abbr -s | grep __abbr1
-abbr --show | grep __abbr1
-
-logmsg Test erasing __abbr1
-abbr -e __abbr1
-abbr | grep __abbr1
-
-logmsg Ensure we escape special characters on output
-abbr '~__abbr2' '$xyz'
-abbr | grep __abbr2
-abbr -e '~__abbr2'
-
-logmsg Ensure we handle leading dashes in abbreviation names properly
-abbr -- '--__abbr3' 'xyz'
-abbr | grep __abbr3
-abbr -e -- '--__abbr3'
-
-logmsg Test that an abbr word containing spaces is rejected
-abbr "a b c" "d e f"
-abbr | grep 'a b c'
-
-logmsg Test renaming
-abbr __abbr4 omega
-abbr | grep __abbr5
-abbr -r __abbr4 __abbr5
-abbr | grep __abbr5
-abbr -e __abbr5
-abbr | grep __abbr4
-
-logmsg Test renaming a nonexistent abbreviation
-abbr -r __abbr6 __abbr
-
-logmsg Test renaming to a abbreviation with spaces
-abbr __abbr4 omega
-abbr -r __abbr4 "g h i"
-abbr -e __abbr4
-
-logmsg Test renaming without arguments
-abbr __abbr7 omega
-abbr -r __abbr7
-
-logmsg Test renaming with too many arguments
-abbr __abbr8 omega
-abbr -r __abbr8 __abbr9 __abbr10
-abbr | grep __abbr8
-abbr | grep __abbr9
-abbr | grep __abbr10
-
-logmsg Test renaming to existing abbreviation
-abbr __abbr11 omega11
-abbr __abbr12 omega12
-abbr -r __abbr11 __abbr12
-
-exit 0  # the last `abbr` command is expected to fail -- don't let that cause a test failure
diff --git a/tests/abbr.out b/tests/abbr.out
deleted file mode 100644
index c468b15f6..000000000
--- a/tests/abbr.out
+++ /dev/null
@@ -1,55 +0,0 @@
-
-####################
-# Test basic add and list of __abbr1
-abbr -a -U -- __abbr1 'alpha beta gamma'
-
-####################
-# Erasing one that doesn't exist should do nothing
-abbr -a -U -- __abbr1 'alpha beta gamma'
-
-####################
-# Adding existing __abbr1 should be idempotent
-abbr -a -U -- __abbr1 'alpha beta gamma'
-
-####################
-# Replacing __abbr1 definition
-abbr -a -U -- __abbr1 delta
-
-####################
-# __abbr1 -s and --show tests
-abbr -a -U -- __abbr1 delta
-abbr -a -U -- __abbr1 delta
-
-####################
-# Test erasing __abbr1
-
-####################
-# Ensure we escape special characters on output
-abbr -a -U -- '~__abbr2' '$xyz'
-
-####################
-# Ensure we handle leading dashes in abbreviation names properly
-abbr -a -U -- --__abbr3 xyz
-
-####################
-# Test that an abbr word containing spaces is rejected
-
-####################
-# Test renaming
-abbr -a -U -- __abbr5 omega
-
-####################
-# Test renaming a nonexistent abbreviation
-
-####################
-# Test renaming to a abbreviation with spaces
-
-####################
-# Test renaming without arguments
-
-####################
-# Test renaming with too many arguments
-abbr -a -U -- __abbr8 omega
-
-####################
-# Test renaming to existing abbreviation
diff --git a/tests/checks/abbr.fish b/tests/checks/abbr.fish
new file mode 100644
index 000000000..dd8eaddd3
--- /dev/null
+++ b/tests/checks/abbr.fish
@@ -0,0 +1,87 @@
+#RUN: %fish %s
+# Test basic add and list of __abbr1
+abbr __abbr1 alpha beta gamma
+abbr | grep __abbr1
+# CHECK: abbr -a -U -- __abbr1 'alpha beta gamma'
+
+# Erasing one that doesn\'t exist should do nothing
+abbr --erase NOT_AN_ABBR
+abbr | grep __abbr1
+# CHECK: abbr -a -U -- __abbr1 'alpha beta gamma'
+# CHECKERR: abbr --erase: No abbreviation named NOT_AN_ABBR
+
+# Adding existing __abbr1 should be idempotent
+abbr __abbr1 alpha beta gamma
+abbr | grep __abbr1
+# CHECK: abbr -a -U -- __abbr1 'alpha beta gamma'
+
+# Replacing __abbr1 definition
+abbr __abbr1 delta
+abbr | grep __abbr1
+# CHECK: abbr -a -U -- __abbr1 delta
+
+# __abbr1 -s and --show tests
+abbr -s | grep __abbr1
+abbr --show | grep __abbr1
+# CHECK: abbr -a -U -- __abbr1 delta
+# CHECK: abbr -a -U -- __abbr1 delta
+
+# Test erasing __abbr1
+abbr -e __abbr1
+abbr | grep __abbr1
+
+# Ensure we escape special characters on output
+abbr '~__abbr2' '$xyz'
+abbr | grep __abbr2
+# CHECK: abbr -a -U -- '~__abbr2' '$xyz'
+abbr -e '~__abbr2'
+
+# Ensure we handle leading dashes in abbreviation names properly
+abbr -- '--__abbr3' 'xyz'
+abbr | grep __abbr3
+# CHECK: abbr -a -U -- --__abbr3 xyz
+abbr -e -- '--__abbr3'
+
+# Test that an abbr word containing spaces is rejected
+abbr "a b c" "d e f"
+abbr | grep 'a b c'
+# CHECKERR: abbr --add: Abbreviation 'a b c' cannot have spaces in the word
+
+# Test renaming
+abbr __abbr4 omega
+abbr | grep __abbr5
+abbr -r __abbr4 __abbr5
+abbr | grep __abbr5
+# CHECK: abbr -a -U -- __abbr5 omega
+abbr -e __abbr5
+abbr | grep __abbr4
+
+# Test renaming a nonexistent abbreviation
+abbr -r __abbr6 __abbr
+# CHECKERR: abbr --rename: No abbreviation named __abbr6
+
+# Test renaming to a abbreviation with spaces
+abbr __abbr4 omega
+abbr -r __abbr4 "g h i"
+# CHECKERR: abbr --rename: Abbreviation 'g h i' cannot have spaces in the word
+abbr -e __abbr4
+
+# Test renaming without arguments
+abbr __abbr7 omega
+abbr -r __abbr7
+# CHECKERR: abbr --rename: Requires exactly two arguments
+
+# Test renaming with too many arguments
+abbr __abbr8 omega
+abbr -r __abbr8 __abbr9 __abbr10
+# CHECKERR: abbr --rename: Requires exactly two arguments
+abbr | grep __abbr8
+abbr | grep __abbr9
+abbr | grep __abbr10
+# CHECK: abbr -a -U -- __abbr8 omega
+
+# Test renaming to existing abbreviation
+abbr __abbr11 omega11
+abbr __abbr12 omega12
+abbr -r __abbr11 __abbr12
+# CHECKERR: abbr --rename: Abbreviation __abbr12 already exists, cannot rename __abbr11

From 8e11f802b4e8c022abf1f8d68b1078be6dcaf41c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 21:02:14 +0200
Subject: [PATCH 0761/1732] Port alias test to littlecheck

---
 tests/alias.err         |  6 ------
 tests/alias.in          | 13 -------------
 tests/alias.out         | 10 ----------
 tests/checks/alias.fish | 18 ++++++++++++++++++
 4 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 tests/alias.err
 delete mode 100644 tests/alias.in
 delete mode 100644 tests/alias.out
 create mode 100644 tests/checks/alias.fish

diff --git a/tests/alias.err b/tests/alias.err
deleted file mode 100644
index 7defa80dc..000000000
--- a/tests/alias.err
+++ /dev/null
@@ -1,6 +0,0 @@
-
-####################
-# Avoid regressions of issue #3860 wherein the first word of the alias ends with a semicolon
-
-####################
-# Bare `alias` should list the aliases we have created and nothing else
diff --git a/tests/alias.in b/tests/alias.in
deleted file mode 100644
index 308667811..000000000
--- a/tests/alias.in
+++ /dev/null
@@ -1,13 +0,0 @@
-logmsg Avoid regressions of issue \#3860 wherein the first word of the alias ends with a semicolon
-function foo
-    echo ran foo
-end
-alias my_alias "foo; and echo foo ran"
-my_alias
-
-alias a-2='echo "hello there"'
-
-logmsg Bare `alias` should list the aliases we have created and nothing else
-# We have to exclude two aliases because they're an artifact of the unit test
-# framework and we can't predict the definition.
-alias | grep -Ev '^alias (fish_indent|fish_key_reader) '
diff --git a/tests/alias.out b/tests/alias.out
deleted file mode 100644
index d91105385..000000000
--- a/tests/alias.out
+++ /dev/null
@@ -1,10 +0,0 @@
-
-####################
-# Avoid regressions of issue #3860 wherein the first word of the alias ends with a semicolon
-ran foo
-foo ran
-
-####################
-# Bare `alias` should list the aliases we have created and nothing else
-alias a-2 'echo "hello there"'
-alias my_alias 'foo; and echo foo ran'
diff --git a/tests/checks/alias.fish b/tests/checks/alias.fish
new file mode 100644
index 000000000..fb3bb3f7c
--- /dev/null
+++ b/tests/checks/alias.fish
@@ -0,0 +1,18 @@
+#RUN: %fish %s
+# Avoid regressions of issue \#3860 wherein the first word of the alias ends with a semicolon
+function foo
+    echo ran foo
+end
+alias my_alias "foo; and echo foo ran"
+my_alias
+# CHECK: ran foo
+# CHECK: foo ran
+
+alias a-2='echo "hello there"'
+
+# Bare `alias` should list the aliases we have created and nothing else
+# We have to exclude two aliases because they're an artifact of the unit test
+# framework and we can't predict the definition.
+alias | grep -Ev '^alias (fish_indent|fish_key_reader) '
+# CHECK: alias a-2 'echo "hello there"'
+# CHECK: alias my_alias 'foo; and echo foo ran'

From fdf0a661cf4fcaed31cd34e0e35dcf33a7364733 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 21:06:07 +0200
Subject: [PATCH 0762/1732] Port andandoror test to littlecheck

---
 tests/andandoror.err                          | 15 -------
 tests/andandoror.out                          | 40 -------------------
 .../{andandoror.in => checks/andandoror.fish} | 36 ++++++++++++++---
 3 files changed, 31 insertions(+), 60 deletions(-)
 delete mode 100644 tests/andandoror.err
 delete mode 100644 tests/andandoror.out
 rename tests/{andandoror.in => checks/andandoror.fish} (64%)

diff --git a/tests/andandoror.err b/tests/andandoror.err
deleted file mode 100644
index 60f61565c..000000000
--- a/tests/andandoror.err
+++ /dev/null
@@ -1,15 +0,0 @@
-
-####################
-# Basic && and || support
-
-####################
-# && and || in if statements
-
-####################
-# && and || in while statements
-
-####################
-# Nots
-
-####################
-# Complex scenarios
diff --git a/tests/andandoror.out b/tests/andandoror.out
deleted file mode 100644
index 649267ebd..000000000
--- a/tests/andandoror.out
+++ /dev/null
@@ -1,40 +0,0 @@
-
-####################
-# Basic && and || support
-first
-second
-third
-true && false: 1
-true || false: 0
-true && false || true: 0
-
-####################
-# && and || in if statements
-if test 1 ok
-if test 2 ok
-if test 3 ok
-if test 4 ok
-
-####################
-# && and || in while statements
-0 0 0
-1 1 1
-2 2 2
-3 3 3
-4 4 4
-
-####################
-# Nots
-0
-1
-1
-0
-not !
-0
-
-####################
-# Complex scenarios
-1
-2
-3
-4
diff --git a/tests/andandoror.in b/tests/checks/andandoror.fish
similarity index 64%
rename from tests/andandoror.in
rename to tests/checks/andandoror.fish
index fff23d3b9..f4adb7a72 100644
--- a/tests/andandoror.in
+++ b/tests/checks/andandoror.fish
@@ -1,19 +1,30 @@
-logmsg "Basic && and || support"
+#RUN: %fish %s
+# "Basic && and || support"
 
 echo first && echo second
 echo third || echo fourth
 true && false ; echo "true && false: $status"
 true || false ; echo "true || false: $status"
 true && false || true ; echo "true && false || true: $status"
+# CHECK: first
+# CHECK: second
+# CHECK: third
+# CHECK: true && false: 1
+# CHECK: true || false: 0
+# CHECK: true && false || true: 0
 
-logmsg "&& and || in if statements"
+# "&& and || in if statements"
 
 if true || false ; echo "if test 1 ok" ; end
 if true && false ; else; echo "if test 2 ok" ; end
 if true && false ; or true ; echo "if test 3 ok" ; end
 if [ 0 = 1 ] || [ 5 -ge 3 ] ; echo "if test 4 ok"; end
+# CHECK: if test 1 ok
+# CHECK: if test 2 ok
+# CHECK: if test 3 ok
+# CHECK: if test 4 ok
 
-logmsg "&& and || in while statements"
+# "&& and || in while statements"
 
 set alpha 0
 set beta 0
@@ -27,16 +38,27 @@ while [ $alpha -lt 2 ] && [ $beta -lt 3 ]
     set gamma ( math $gamma + 1 )
     set delta ( math $delta + 1 )
 end
+# CHECK: 0 0 0
+# CHECK: 1 1 1
+# CHECK: 2 2 2
+# CHECK: 3 3 3
+# CHECK: 4 4 4
 
-logmsg "Nots"
+# "Nots"
 
 true && ! false ; echo $status
 not true && ! false ; echo $status
 not not not true ; echo $status
 not ! ! not true ; echo $status
 not ! echo not ! ; echo $status
+# CHECK: 0
+# CHECK: 1
+# CHECK: 1
+# CHECK: 0
+# CHECK: not !
+# CHECK: 0
 
-logmsg "Complex scenarios"
+# "Complex scenarios"
 
 begin; echo 1 ; false ; end || begin ; echo 2 && echo 3 ; end
 
@@ -44,3 +66,7 @@ if false && true
    or not false
    echo 4
 end
+# CHECK: 1
+# CHECK: 2
+# CHECK: 3
+# CHECK: 4

From 4d035cbd10d4cdb2fc90c500ea68e4297114e412 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 21:10:01 +0200
Subject: [PATCH 0763/1732] Port bind tests to littlecheck

---
 tests/bind.err         |  5 ---
 tests/bind.in          | 33 ----------------
 tests/bind.out         | 55 --------------------------
 tests/checks/bind.fish | 90 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 93 deletions(-)
 delete mode 100644 tests/bind.err
 delete mode 100644 tests/bind.in
 delete mode 100644 tests/bind.out
 create mode 100644 tests/checks/bind.fish

diff --git a/tests/bind.err b/tests/bind.err
deleted file mode 100644
index 8b777ec7b..000000000
--- a/tests/bind.err
+++ /dev/null
@@ -1,5 +0,0 @@
-# Verify that an invalid bind mode is rejected.
-bind: mode name 'bad bind mode' is not valid. See `help identifiers`.
-# Verify that an invalid bind mode target is rejected.
-bind: mode name 'bind-mode' is not valid. See `help identifiers`.
-bind: No binding found for sequence '\t'
diff --git a/tests/bind.in b/tests/bind.in
deleted file mode 100644
index 17c7e7bb8..000000000
--- a/tests/bind.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# Test various `bind` command invocations. This is meant to verify that
-# invalid flags, mode names, etc. are caught as well as to verify that valid
-# ones are allowed.
-
-echo \# Verify that an invalid bind mode is rejected. >&2
-bind -m 'bad bind mode' \cX true
-echo \# Verify that an invalid bind mode target is rejected. >&2
-bind -M bind-mode \cX true
-
-# This should succeed and result in a success, zero, status.
-bind -M bind_mode \cX true
-
-### HACK: All full bind listings need to have the \x7f -> backward-delete-char
-# binding explicitly removed, because on some systems that's backspace, on others not.
-echo \# Listing bindings
-bind | string match -v '*backward-delete-char'
-bind --user --preset | string match -v '*backward-delete-char'
-echo \# Preset only
-bind --preset | string match -v '*backward-delete-char'
-echo \# User only
-bind --user | string match -v '*backward-delete-char'
-
-echo \# Adding bindings
-bind \t 'echo banana'
-bind | string match -v '*backward-delete-char'
-echo \# Erasing bindings
-bind --erase \t
-bind \t
-bind \t 'echo wurst'
-bind --erase --user --preset \t
-bind \t
-
-exit 0
diff --git a/tests/bind.out b/tests/bind.out
deleted file mode 100644
index 39053cc6c..000000000
--- a/tests/bind.out
+++ /dev/null
@@ -1,55 +0,0 @@
-# Listing bindings
-bind --preset '' self-insert
-bind --preset \n execute
-bind --preset \r execute
-bind --preset \t complete
-bind --preset \cc commandline\ \'\'
-bind --preset \cd exit
-bind --preset \ce bind
-bind --preset \e\[A up-line
-bind --preset \e\[B down-line
-bind --preset \e\[C forward-char
-bind --preset \e\[D backward-char
-bind -M bind_mode \cx true
-bind --preset '' self-insert
-bind --preset \n execute
-bind --preset \r execute
-bind --preset \t complete
-bind --preset \cc commandline\ \'\'
-bind --preset \cd exit
-bind --preset \ce bind
-bind --preset \e\[A up-line
-bind --preset \e\[B down-line
-bind --preset \e\[C forward-char
-bind --preset \e\[D backward-char
-bind -M bind_mode \cx true
-# Preset only
-bind --preset '' self-insert
-bind --preset \n execute
-bind --preset \r execute
-bind --preset \t complete
-bind --preset \cc commandline\ \'\'
-bind --preset \cd exit
-bind --preset \ce bind
-bind --preset \e\[A up-line
-bind --preset \e\[B down-line
-bind --preset \e\[C forward-char
-bind --preset \e\[D backward-char
-# User only
-bind -M bind_mode \cx true
-# Adding bindings
-bind --preset '' self-insert
-bind --preset \n execute
-bind --preset \r execute
-bind --preset \t complete
-bind --preset \cc commandline\ \'\'
-bind --preset \cd exit
-bind --preset \ce bind
-bind --preset \e\[A up-line
-bind --preset \e\[B down-line
-bind --preset \e\[C forward-char
-bind --preset \e\[D backward-char
-bind -M bind_mode \cx true
-bind \t 'echo banana'
-# Erasing bindings
-bind --preset \t complete
diff --git a/tests/checks/bind.fish b/tests/checks/bind.fish
new file mode 100644
index 000000000..9b483689f
--- /dev/null
+++ b/tests/checks/bind.fish
@@ -0,0 +1,90 @@
+#RUN: %fish %s
+# Test various `bind` command invocations. This is meant to verify that
+# invalid flags, mode names, etc. are caught as well as to verify that valid
+# ones are allowed.
+
+# Verify that an invalid bind mode is rejected. >&2
+bind -m 'bad bind mode' \cX true
+# CHECKERR: bind: mode name 'bad bind mode' is not valid. See `help identifiers`.
+# Verify that an invalid bind mode target is rejected. >&2
+bind -M bind-mode \cX true
+# CHECKERR: bind: mode name 'bind-mode' is not valid. See `help identifiers`.
+# CHECKERR: bind: No binding found for sequence '\t'
+
+# This should succeed and result in a success, zero, status.
+bind -M bind_mode \cX true
+
+### HACK: All full bind listings need to have the \x7f -> backward-delete-char
+# binding explicitly removed, because on some systems that's backspace, on others not.
+# Listing bindings
+bind | string match -v '*backward-delete-char'
+bind --user --preset | string match -v '*backward-delete-char'
+# CHECK: bind --preset '' self-insert
+# CHECK: bind --preset \n execute
+# CHECK: bind --preset \r execute
+# CHECK: bind --preset \t complete
+# CHECK: bind --preset \cc commandline\ \'\'
+# CHECK: bind --preset \cd exit
+# CHECK: bind --preset \ce bind
+# CHECK: bind --preset \e\[A up-line
+# CHECK: bind --preset \e\[B down-line
+# CHECK: bind --preset \e\[C forward-char
+# CHECK: bind --preset \e\[D backward-char
+# CHECK: bind -M bind_mode \cx true
+# CHECK: bind --preset '' self-insert
+# CHECK: bind --preset \n execute
+# CHECK: bind --preset \r execute
+# CHECK: bind --preset \t complete
+# CHECK: bind --preset \cc commandline\ \'\'
+# CHECK: bind --preset \cd exit
+# CHECK: bind --preset \ce bind
+# CHECK: bind --preset \e\[A up-line
+# CHECK: bind --preset \e\[B down-line
+# CHECK: bind --preset \e\[C forward-char
+# CHECK: bind --preset \e\[D backward-char
+# CHECK: bind -M bind_mode \cx true
+
+# Preset only
+bind --preset | string match -v '*backward-delete-char'
+# CHECK: bind --preset '' self-insert
+# CHECK: bind --preset \n execute
+# CHECK: bind --preset \r execute
+# CHECK: bind --preset \t complete
+# CHECK: bind --preset \cc commandline\ \'\'
+# CHECK: bind --preset \cd exit
+# CHECK: bind --preset \ce bind
+# CHECK: bind --preset \e\[A up-line
+# CHECK: bind --preset \e\[B down-line
+# CHECK: bind --preset \e\[C forward-char
+# CHECK: bind --preset \e\[D backward-char
+
+# User only
+bind --user | string match -v '*backward-delete-char'
+# CHECK: bind -M bind_mode \cx true
+
+# Adding bindings
+bind \t 'echo banana'
+bind | string match -v '*backward-delete-char'
+# CHECK: bind --preset '' self-insert
+# CHECK: bind --preset \n execute
+# CHECK: bind --preset \r execute
+# CHECK: bind --preset \t complete
+# CHECK: bind --preset \cc commandline\ \'\'
+# CHECK: bind --preset \cd exit
+# CHECK: bind --preset \ce bind
+# CHECK: bind --preset \e\[A up-line
+# CHECK: bind --preset \e\[B down-line
+# CHECK: bind --preset \e\[C forward-char
+# CHECK: bind --preset \e\[D backward-char
+# CHECK: bind -M bind_mode \cx true
+# CHECK: bind \t 'echo banana'
+
+# Erasing bindings
+bind --erase \t
+bind \t
+bind \t 'echo wurst'
+bind --erase --user --preset \t
+bind \t
+# CHECK: bind --preset \t complete
+
+exit 0

From 22d26207169d7cdac1467930d454356f3797be94 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 21:26:05 +0200
Subject: [PATCH 0764/1732] Rerun all interactive tests once

They are *all* flakey enough that we regularly see them fail, at least
on Travis.
---
 tests/interactive.fish | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/tests/interactive.fish b/tests/interactive.fish
index 3f151ab07..63af32f41 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -9,9 +9,6 @@ if test "$TRAVIS_OS_NAME" = osx
     exit 0
 end
 
-# This is a list of flakey tests that often succeed when rerun.
-set -l TESTS_TO_RETRY bind.expect pipeline.expect
-
 # Set this var to modify behavior of the code being tests. Such as avoiding running
 # `fish_update_completions` when running tests.
 set -gx FISH_UNIT_TESTS_RUNNING 1
@@ -92,14 +89,9 @@ end
 set failed
 for i in $files_to_test
     if not test_file $i
-        # Retry flakey tests once.
-        if contains $i $TESTS_TO_RETRY
-            say -o cyan "Rerunning test $i since it is known to be flakey"
-            rm -f $i.tmp.*
-            if not test_file $i
-                set failed $failed $i
-            end
-        else
+        say -o cyan "Rerunning test $i"
+        rm -f $i.tmp.*
+        if not test_file $i
             set failed $failed $i
         end
     end

From d7a9bdf5c3e4eb7ffd431faf2fe3190468bd8176 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 26 Jun 2019 22:53:19 +0200
Subject: [PATCH 0765/1732] reader: Do the "delete" part for delete-or-exit

For some reason this is supposed to do a delete-*char*.

I was assuming the function was broken and it should delete the entire
line.

Fixes #5967.
---
 src/reader.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 0baa5d1a9..df2fc0b63 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2457,17 +2457,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             reader_repaint_needed();
             break;
         }
-        case rl::delete_or_exit: {
-            if (!command_line.text.empty()) {
-                command_line.position = 0;
-                command_line.text = L"";
-                update_buff_pos(&command_line, 0);
-                reader_repaint_needed();
-            } else {
-                reader_set_end_loop(true);
-            }
-            break;
-        }
         case rl::cancel: {
             // The only thing we can cancel right now is paging, which we handled up above.
             break;
@@ -2687,6 +2676,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             remove_backward();
             break;
         }
+        case rl::delete_or_exit:
         case rl::delete_char: {
             // Remove the current character in the character buffer and on the screen using
             // syntax highlighting, etc.
@@ -2694,6 +2684,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             if (el->position < el->size()) {
                 update_buff_pos(el, el->position + 1);
                 remove_backward();
+            } else if (c == rl::delete_or_exit) {
+                reader_set_end_loop(true);
             }
             break;
         }

From f7e2e7d26be2253f14551a023a339fca136593d2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 26 Jun 2019 11:28:27 -0700
Subject: [PATCH 0766/1732] Don't generate exit events for jobs created from
 within event handlers

Add a new job property from_event_handler, and do not create exit events for
such jobs. This prevents easy accidental infinite recursion.
---
 src/fish.cpp            |  2 --
 src/parse_execution.cpp |  1 +
 src/proc.cpp            | 13 ++++++++-----
 src/proc.h              |  4 ++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 68d81b60b..3db9d58f2 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -520,8 +520,6 @@ int main(int argc, char **argv) {
 
     int exit_status = res ? STATUS_CMD_UNKNOWN : parser.get_last_status();
 
-    // TODO: The generic process-exit event is useless and unused.
-    // Remove this in future.
     event_fire(parser,
                proc_create_event(L"PROCESS_EXIT", event_type_t::exit, getpid(), exit_status));
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 94d3becc4..ce7e8bad5 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1243,6 +1243,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     props.wants_terminal = wants_job_control && !ld.is_event;
     props.skip_notification =
         ld.is_subshell || ld.is_block || ld.is_event || !shell_is_interactive();
+    props.from_event_handler = ld.is_event;
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
     job->tmodes = tmodes;
diff --git a/src/proc.cpp b/src/proc.cpp
index c28f357b4..87eb0bf72 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -472,9 +472,11 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
 
     auto s = p->status;
 
-    // Add an exit event.
-    exit_events->push_back(proc_create_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
-                                             s.normal_exited() ? s.exit_code() : -1));
+    // Add an exit event if the process did not come from a job handler.
+    if (!j->from_event_handler()) {
+        exit_events->push_back(proc_create_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
+                                                 s.normal_exited() ? s.exit_code() : -1));
+    }
 
     // Ignore SIGPIPE. We issue it ourselves to the pipe writer when the pipe reader dies.
     if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
@@ -600,8 +602,9 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
             printed = true;
         }
 
-        // Prepare events for completed jobs.
-        if (j->is_completed()) {
+        // Prepare events for completed jobs, except for jobs that themselves came from event
+        // handlers.
+        if (!j->from_event_handler() && j->is_completed()) {
             if (j->pgid != INVALID_PID) {
                 exit_events.push_back(
                     proc_create_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0));
diff --git a/src/proc.h b/src/proc.h
index ad1290491..4b59440e2 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -296,6 +296,9 @@ class job_t {
 
         /// Whether the job wants to own the terminal when in the foreground.
         bool wants_terminal{};
+
+        /// Whether this job was created as part of an event handler.
+        bool from_event_handler{};
     };
 
    private:
@@ -421,6 +424,7 @@ class job_t {
         return !is_completed() && is_constructed() && !get_flag(job_flag_t::DISOWN_REQUESTED);
     };
     bool skip_notification() const { return properties.skip_notification; }
+    bool from_event_handler() const { return properties.from_event_handler; }
 
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }

From f3736e8fdf77652231527383ebbd9d96e71cec4d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 26 Jun 2019 17:20:37 -0700
Subject: [PATCH 0767/1732] fish to claim a job's pgroup if the first process
 is fish internal

When executing a job, if the first process is fish internal, then have
fish claim the job's pgroup.

The idea here is that the terminal must be owned by a pgroup containing
the process reading from the terminal. If the first process is fish
internal (a function or builtin) then the pgroup must contain the fish
process.

This is a bit of a workaround of the behavior where the first process that
executes in a job becomes the process group leader. If there's a deferred
process, then we will execute processes out of order so the pgroup can be
wrong. Fix this by setting the process group leader explicitly as fish
when necessary.

Fixes #5855
---
 src/exec.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index 04a2cd2ee..01c926ad9 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1005,6 +1005,41 @@ static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
     return nullptr;
 }
 
+/// \return true if fish should claim the process group for this job.
+/// This is true if there is at least one external process and if the first process is fish code.
+static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
+    // Check if there's an external process.
+    // This is because historically fish has not reported job exits for internal-only processes,
+    // which is determined by comparing the pgrp against INVALID_PID.
+    bool has_external = false;
+    for (const auto &p : j->processes) {
+        if (p->type == process_type_t::external) {
+            has_external = true;
+            break;
+        }
+    }
+    if (!has_external) {
+        return false;
+    }
+
+    // Check the first process.
+    // The terminal owner has to be the process which is permitted to read from stdin.
+    // This is the first process in the pipeline. When executing, a process in the job will
+    // claim the pgrp if it's not set; therefore set it according to the first process.
+    switch (j->processes.front()->type) {
+        case process_type_t::builtin:
+        case process_type_t::function:
+        case process_type_t::block_node:
+            // These are run internal to fish.
+            return true;
+        case process_type_t::external:
+        case process_type_t::exec:
+            // External will get its own pgroup after fork.
+            // exec will retain the pgroup.
+            return false;
+    }
+}
+
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     assert(j && "null job_t passed to exec_job!");
 
@@ -1028,6 +1063,10 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         j->set_flag(job_flag_t::JOB_CONTROL, true);
     }
 
+    if (j->pgid == INVALID_PID && should_claim_process_group_for_job(j)) {
+        j->pgid = getpgrp();
+    }
+
     size_t stdout_read_limit = 0;
     io_chain_t all_ios = j->all_io_redirections();
 

From 82543423397b08092fa5373ab579b0ca7db5c15d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 28 Jun 2019 10:33:03 -0700
Subject: [PATCH 0768/1732] Remove the useless second parameter from
 signal_handle

It was always set to 1.
---
 src/event.cpp  |  2 +-
 src/signal.cpp | 14 ++++----------
 src/signal.h   |  4 +---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/event.cpp b/src/event.cpp
index d09ce860e..19d9778e8 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -200,7 +200,7 @@ static void show_all_handlers(void) {
 
 void event_add_handler(std::shared_ptr<event_handler_t> eh) {
     if (eh->desc.type == event_type_t::signal) {
-        signal_handle(eh->desc.param1.signal, 1);
+        signal_handle(eh->desc.param1.signal);
         set_signal_observed(eh->desc.param1.signal, true);
     }
 
diff --git a/src/signal.cpp b/src/signal.cpp
index 946961454..08a1b167c 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -359,7 +359,7 @@ void signal_set_handlers() {
     }
 }
 
-void signal_handle(int sig, int do_handle) {
+void signal_handle(int sig) {
     struct sigaction act;
 
     // These should always be handled.
@@ -369,15 +369,9 @@ void signal_handle(int sig, int do_handle) {
 
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
-    if (do_handle) {
-        act.sa_flags = SA_SIGINFO;
-        act.sa_sigaction = &default_handler;
-    } else {
-        act.sa_flags = 0;
-        act.sa_handler = SIG_DFL;
-    }
-
-    sigaction(sig, &act, 0);
+    act.sa_flags = SA_SIGINFO;
+    act.sa_sigaction = &default_handler;
+    sigaction(sig, &act, nullptr);
 }
 
 void get_signals_with_handlers(sigset_t *set) {
diff --git a/src/signal.h b/src/signal.h
index be0011203..2b94e4023 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -22,9 +22,7 @@ void signal_set_handlers();
 /// Tell fish what to do on the specified signal.
 ///
 /// \param sig The signal to specify the action of
-/// \param do_handle If true fish will catch the specified signal and fire an event, otherwise the
-/// default action (SIG_DFL) will be set
-void signal_handle(int sig, int do_handle);
+void signal_handle(int sig);
 
 /// Ensure we did not inherit any blocked signals. See issue #3964.
 void signal_unblock_all();

From e3f94f4b72d478927308702433382b523116ec47 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 28 Jun 2019 10:47:36 -0700
Subject: [PATCH 0769/1732] Centralize signal handling into a single function

Prior to this diff, fish had different signal handling functions for
different signals. However it was hard to coordinate when a signal needed
to be the default handler, and when it was custom. In #5962 we overwrote
fish's custom WINCH handler with the default_handler when fish script asked
for WINCH to be handled.

Just have a single big signal handler function. That way it can never be
set to the wrong thing.

Fixes #5969
---
 src/signal.cpp | 128 +++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 68 deletions(-)

diff --git a/src/signal.cpp b/src/signal.cpp
index 08a1b167c..9142fc5bd 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -198,73 +198,65 @@ static bool reraise_if_forked_child(int sig) {
     return true;
 }
 
-/// Standard signal handler.
-static void default_handler(int signal, siginfo_t *info, void *context) {
+/// The single signal handler. By centralizing signal handling we ensure that we can never install
+/// the "wrong" signal handler (see #5969).
+static void fish_signal_handler(int sig, siginfo_t *info, void *context) {
     UNUSED(info);
     UNUSED(context);
-    if (event_is_signal_observed(signal)) {
-        event_enqueue_signal(signal);
-    }
-}
 
+    // Check if we are a forked child.
+    if (reraise_if_forked_child(sig)) {
+        return;
+    }
+
+    // Check if fish script cares about this.
+    const bool observed = event_is_signal_observed(sig);
+    if (observed) {
+        event_enqueue_signal(sig);
+    }
+
+    // Do some signal-specific stuff.
+    switch (sig) {
 #ifdef SIGWINCH
-/// Respond to a winch signal by checking the terminal size.
-static void handle_winch(int sig, siginfo_t *info, void *context) {
-    UNUSED(info);
-    UNUSED(context);
-    if (reraise_if_forked_child(sig)) return;
-    common_handle_winch(sig);
-    default_handler(sig, 0, 0);
-}
+        case SIGWINCH:
+            /// Respond to a winch signal by checking the terminal size.
+            common_handle_winch(sig);
+            break;
 #endif
 
-/// Respond to a hup signal by exiting, unless it is caught by a shellscript function, in which case
-/// we do nothing.
-static void handle_hup(int sig, siginfo_t *info, void *context) {
-    UNUSED(info);
-    UNUSED(context);
-    if (reraise_if_forked_child(sig)) return;
-    if (event_is_signal_observed(SIGHUP)) {
-        default_handler(sig, 0, 0);
-    } else {
-        reader_force_exit();
+        case SIGHUP:
+            /// Respond to a hup signal by exiting, unless it is caught by a shellscript function,
+            /// in which case we do nothing.
+            if (!observed) {
+                reader_force_exit();
+            }
+            topic_monitor_t::principal().post(topic_t::sighupint);
+            break;
+
+        case SIGTERM:
+            /// Handle sigterm. The only thing we do is restore the front process ID, then die.
+            restore_term_foreground_process_group();
+            signal(SIGTERM, SIG_DFL);
+            raise(SIGTERM);
+            break;
+
+        case SIGINT:
+            /// Interactive mode ^C handler. Respond to int signal by setting interrupted-flag and
+            /// stopping all loops and conditionals.
+            reader_handle_sigint();
+            topic_monitor_t::principal().post(topic_t::sighupint);
+            break;
+
+        case SIGCHLD:
+            // A child process stopped or exited.
+            topic_monitor_t::principal().post(topic_t::sigchld);
+            break;
+
+        case SIGALRM:
+            // We have a sigalarm handler that does nothing. This is used in the signal torture
+            // test, to verify that we behave correctly when receiving lots of irrelevant signals.
+            break;
     }
-    topic_monitor_t::principal().post(topic_t::sighupint);
-}
-
-/// Handle sigterm. The only thing we do is restore the front process ID, then die.
-static void handle_sigterm(int sig, siginfo_t *info, void *context) {
-    UNUSED(info);
-    UNUSED(context);
-    if (reraise_if_forked_child(sig)) return;
-    restore_term_foreground_process_group();
-    signal(SIGTERM, SIG_DFL);
-    raise(SIGTERM);
-}
-
-/// Interactive mode ^C handler. Respond to int signal by setting interrupted-flag and stopping all
-/// loops and conditionals.
-static void handle_int(int sig, siginfo_t *info, void *context) {
-    if (reraise_if_forked_child(sig)) return;
-    reader_handle_sigint();
-    default_handler(sig, info, context);
-    topic_monitor_t::principal().post(topic_t::sighupint);
-}
-
-/// sigchld handler. Does notification and calls the handler in proc.c.
-static void handle_chld(int sig, siginfo_t *info, void *context) {
-    if (reraise_if_forked_child(sig)) return;
-    default_handler(sig, info, context);
-    topic_monitor_t::principal().post(topic_t::sigchld);
-}
-
-// We have a sigalarm handler that does nothing. This is used in the signal torture test, to verify
-// that we behave correctly when receiving lots of irrelevant signals.
-static void handle_sigalarm(int sig, siginfo_t *info, void *context) {
-    UNUSED(info);
-    UNUSED(context);
-    if (reraise_if_forked_child(sig)) return;
-    default_handler(sig, info, context);
 }
 
 void signal_reset_handlers() {
@@ -296,29 +288,29 @@ static void set_interactive_handlers() {
     sigaction(SIGTTOU, &act, NULL);
 
     // We don't ignore SIGTTIN because we might send it to ourself.
-    act.sa_sigaction = &default_handler;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGTTIN, &act, NULL);
 
     // SIGTERM restores the terminal controlling process before dying.
-    act.sa_sigaction = &handle_sigterm;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGTERM, &act, NULL);
 
     sigaction(SIGHUP, NULL, &oact);
     if (oact.sa_handler == SIG_DFL) {
-        act.sa_sigaction = &handle_hup;
+        act.sa_sigaction = &fish_signal_handler;
         act.sa_flags = SA_SIGINFO;
         sigaction(SIGHUP, &act, NULL);
     }
 
     // SIGALARM as part of our signal torture test
-    act.sa_sigaction = &handle_sigalarm;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGALRM, &act, NULL);
 
 #ifdef SIGWINCH
-    act.sa_sigaction = &handle_winch;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGWINCH, &act, NULL);
 #endif
@@ -341,13 +333,13 @@ void signal_set_handlers() {
     sigaction(SIGQUIT, &act, 0);
 
     // Apply our SIGINT handler.
-    act.sa_sigaction = &handle_int;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
     sigaction(SIGINT, &act, NULL);
 
     // Whether or not we're interactive we want SIGCHLD to not interrupt restartable syscalls.
     act.sa_flags = SA_SIGINFO;
-    act.sa_sigaction = &handle_chld;
+    act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO | SA_RESTART;
     if (sigaction(SIGCHLD, &act, 0)) {
         wperror(L"sigaction");
@@ -370,7 +362,7 @@ void signal_handle(int sig) {
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
     act.sa_flags = SA_SIGINFO;
-    act.sa_sigaction = &default_handler;
+    act.sa_sigaction = &fish_signal_handler;
     sigaction(sig, &act, nullptr);
 }
 

From 3c800e0608782a110a88cb74c448bc5d64ddfeec Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 28 Jun 2019 11:16:27 -0700
Subject: [PATCH 0770/1732] Make history tests more robust

history now often writes to the history file asynchronously, but the history
test expects to find the text in the file immediately after running the
command. Hack a bit in history to make this test more reliable.
---
 src/history.cpp       | 16 ++++++++++------
 tests/histfile.expect |  5 -----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index ca14aecdc..3c5e12287 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1928,7 +1928,7 @@ void history_t::remove(const wcstring &str) { impl()->remove(str); }
 void history_t::add_pending_with_file_detection(const wcstring &str,
                                                 const wcstring &working_dir_slash) {
     // Find all arguments that look like they could be file paths.
-    bool impending_exit = false;
+    bool needs_sync_write = false;
     parse_node_tree_t tree;
     parse_tree_from_string(str, parse_flag_none, &tree, NULL);
 
@@ -1948,21 +1948,25 @@ void history_t::add_pending_with_file_detection(const wcstring &str,
             // Hack hack hack - if the command is likely to trigger an exit, then don't do
             // background file detection, because we won't be able to write it to our history file
             // before we exit.
+            // Also skip it for 'echo'. This is because echo doesn't take file paths, but also
+            // because the history file test wants to find the commands in the history file
+            // immediately after running them, so it can't tolerate the asynchronous file detection.
             if (get_decoration({&tree, &node}) == parse_statement_decoration_exec) {
-                impending_exit = true;
+                needs_sync_write = true;
             }
 
             if (maybe_t<wcstring> command = command_for_plain_statement({&tree, &node}, str)) {
                 unescape_string_in_place(&*command, UNESCAPE_DEFAULT);
-                if (*command == L"exit" || *command == L"reboot") {
-                    impending_exit = true;
+                if (*command == L"exit" || *command == L"reboot" || *command == L"restart" ||
+                    *command == L"echo") {
+                    needs_sync_write = true;
                 }
             }
         }
     }
 
     // If we got a path, we'll perform file detection for autosuggestion hinting.
-    bool wants_file_detection = !potential_paths.empty() && !impending_exit;
+    bool wants_file_detection = !potential_paths.empty() && !needs_sync_write;
     auto imp = this->impl();
 
     history_identifier_t identifier = 0;
@@ -1987,7 +1991,7 @@ void history_t::add_pending_with_file_detection(const wcstring &str,
         // If we think we're about to exit, save immediately, regardless of any disabling. This may
         // cause us to lose file hinting for some commands, but it beats losing history items.
         imp->add(str, identifier, true /* pending */);
-        if (impending_exit) {
+        if (needs_sync_write) {
             imp->save();
         }
     }
diff --git a/tests/histfile.expect b/tests/histfile.expect
index 7ac056235..cdd4901c8 100644
--- a/tests/histfile.expect
+++ b/tests/histfile.expect
@@ -39,11 +39,6 @@ expect_prompt
 send "$cmd2\r"
 expect_prompt
 
-# TODO: Figure out why this `history --save` is only needed in one of the
-# three Travis CI build environments and neither of my OS X or Ubuntu servers.
-send "history --save\r"
-expect_prompt
-
 send "grep '^$hist_line' $my_histfile\r"
 expect_prompt -re "\r\n$hist_line\r\n" {
     puts "cmd2 found in my histfile"

From 262fe6512186537280f4ab6b0b34254547cdf7b6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 28 Jun 2019 11:21:59 -0700
Subject: [PATCH 0771/1732] Correctly mark a node when erasing an exported
 variable

Fixes #5965
---
 src/env.cpp           |  3 +++
 tests/checks/env.fish | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 tests/checks/env.fish

diff --git a/src/env.cpp b/src/env.cpp
index 2819d78ed..8d7645ecf 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -891,6 +891,9 @@ class env_stack_impl_t final : public env_scoped_impl_t {
         for (auto cursor = node; cursor; cursor = cursor->next) {
             auto iter = cursor->env.find(key);
             if (iter != cursor->env.end()) {
+                if (iter->second.exports()) {
+                    node->changed_exported();
+                }
                 cursor->env.erase(iter);
                 return true;
             }
diff --git a/tests/checks/env.fish b/tests/checks/env.fish
new file mode 100644
index 000000000..4741a45f6
--- /dev/null
+++ b/tests/checks/env.fish
@@ -0,0 +1,16 @@
+# RUN: %fish %s
+
+function getenvs
+    env | string match FISH_ENV_TEST_\*
+end
+
+getenvs
+# No output
+
+set -x FISH_ENV_TEST_1 abc
+getenvs
+# CHECK: FISH_ENV_TEST_1=abc
+
+set -e FISH_ENV_TEST_1
+getenvs
+# No output

From 4c022a708f7671112ecb3c846e687558a6bcdecd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 27 Jun 2019 21:59:51 +0200
Subject: [PATCH 0772/1732] tests: Simplify directory-redirect test

This doesn't need the indirection, since it was only an invocation
test because we couldn't express it in the old runner.
---
 tests/checks/directory-redirect.fish | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish
index 544661cd8..ead426055 100644
--- a/tests/checks/directory-redirect.fish
+++ b/tests/checks/directory-redirect.fish
@@ -1,5 +1,7 @@
-#RUN: %fish -c 'begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"; echo $status'
+#RUN: %fish %s
+begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"
 # Note that we sometimes get fancy quotation marks here, so let's match three characters
 #CHECKERR: <W> fish: An error occurred while redirecting file {{...}}
 #CHECKERR: {{open: Is a directory|open: Invalid argument}}
+echo $status
 #CHECK: 1

From 3f1d7bbdc5e300bd1b6cbd93901ec4aa5578bc0b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 28 Jun 2019 11:48:33 -0700
Subject: [PATCH 0773/1732] Call tcsetpgrp in child processes before resetting
 signal handlers

Also ignore SIGTTIN and SIGTTOU across the tcsetpgrp call.

Hopeful fix for #5963
---
 src/postfork.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/postfork.cpp b/src/postfork.cpp
index e0e18acd0..5508ae215 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -165,19 +165,21 @@ int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s
             return err;
         }
     }
-    // Set the handling for job control signals back to the default.
-    signal_reset_handlers();
-
     if (job != nullptr && job->wants_terminal() && job->is_foreground()) {
         // Assign the terminal within the child to avoid the well-known race between tcsetgrp() in
         // the parent and the child executing. We are not interested in error handling here, except
         // we try to avoid this for non-terminals; in particular pipelines often make non-terminal
         // stdin.
         if (isatty(STDIN_FILENO)) {
+            // Ensure this doesn't send us to the background (see #5963)
+            signal(SIGTTIN, SIG_IGN);
+            signal(SIGTTOU, SIG_IGN);
             (void)tcsetpgrp(STDIN_FILENO, job->pgid);
         }
     }
-
+    // Set the handling for job control signals back to the default.
+    // Do this after any tcsetpgrp call so that we swallow SIGTTIN.
+    signal_reset_handlers();
     return 0;
 }
 

From 4a2c709fb18f4fe6c175b5d025295b1d8d05698a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 May 2019 14:52:48 -0700
Subject: [PATCH 0774/1732] Eliminate shell_is_interactive

We used to have a global notion of "is the shell interactive" but soon we
will want to have multiple independent execution threads, only some of
which may be interactive. Start tracking this data per-parser.
---
 src/builtin.cpp          |  2 +-
 src/builtin_cd.cpp       |  4 ++--
 src/builtin_complete.cpp |  3 ++-
 src/builtin_read.cpp     |  4 ++--
 src/builtin_set.cpp      | 10 +++++-----
 src/common.cpp           |  7 +++++--
 src/complete.cpp         | 12 ++++++------
 src/event.cpp            |  3 +--
 src/fish_key_reader.cpp  |  4 +++-
 src/fish_tests.cpp       | 11 ++++++-----
 src/parse_constants.h    |  6 +++---
 src/parse_execution.cpp  |  8 ++++----
 src/parse_tree.cpp       |  4 ++--
 src/parser.cpp           | 13 +++++--------
 src/parser.h             |  7 +++++++
 src/proc.cpp             | 36 +++---------------------------------
 src/proc.h               |  9 ---------
 src/reader.cpp           | 29 ++++++++++++++---------------
 src/signal.cpp           | 12 ++++++++++--
 src/signal.h             |  5 ++++-
 20 files changed, 85 insertions(+), 104 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 9b91f2f12..fd6b51331 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -304,7 +304,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
     }
 
     // If we're not interactive then we can't enter the debugger. So treat this command as a no-op.
-    if (!shell_is_interactive()) {
+    if (!parser.is_interactive()) {
         return STATUS_CMD_ERROR;
     }
 
diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index 57adc84b4..ae34ceb12 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -61,7 +61,7 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                       cmd, dir_in.c_str());
         }
 
-        if (!shell_is_interactive()) streams.err.append(parser.current_line());
+        if (!parser.is_interactive()) streams.err.append(parser.current_line());
 
         return STATUS_CMD_ERROR;
     }
@@ -84,7 +84,7 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), cmd, dir_in.c_str());
         }
 
-        if (!shell_is_interactive()) {
+        if (!parser.is_interactive()) {
             streams.err.append(parser.current_line());
         }
 
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index add0948cc..8f33632bb 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -291,7 +291,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                       condition);
             for (size_t i = 0; i < errors.size(); i++) {
                 streams.err.append_format(L"\n%ls: ", cmd);
-                streams.err.append(errors.at(i).describe(condition_string));
+                streams.err.append(
+                    errors.at(i).describe(condition_string, parser.is_interactive()));
             }
             return STATUS_CMD_ERROR;
         }
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 92e525cb1..12258a705 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -212,11 +212,11 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
     reader_set_silent_status(silent);
 
     reader_set_buffer(commandline, std::wcslen(commandline));
-    proc_push_interactive(1);
+    scoped_push<bool> interactive{&parser.libdata().is_interactive, true};
 
     event_fire_generic(parser, L"fish_prompt");
     auto mline = reader_readline(nchars);
-    proc_pop_interactive();
+    interactive.restore();
     if (mline) {
         buff = mline.acquire();
         if (nchars > 0 && (size_t)nchars < buff.size()) {
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 3e6d913cc..303f089d8 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -234,10 +234,10 @@ static int validate_cmd_opts(const wchar_t *cmd, set_cmd_opts_t &opts,  //!OCLIN
 // Check if we are setting a uvar and a global of the same name exists. See
 // https://github.com/fish-shell/fish-shell/issues/806
 static int check_global_scope_exists(const wchar_t *cmd, set_cmd_opts_t &opts, const wchar_t *dest,
-                                     io_streams_t &streams, const environment_t &vars) {
+                                     io_streams_t &streams, const parser_t &parser) {
     if (opts.universal) {
-        auto global_dest = vars.get(dest, ENV_GLOBAL);
-        if (global_dest && shell_is_interactive()) {
+        auto global_dest = parser.vars().get(dest, ENV_GLOBAL);
+        if (global_dest && parser.is_interactive()) {
             streams.err.append_format(BUILTIN_SET_UVAR_ERR, cmd, dest);
         }
     }
@@ -673,7 +673,7 @@ static int builtin_set_erase(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
     }
 
     if (retval != STATUS_CMD_OK) return retval;
-    return check_global_scope_exists(cmd, opts, dest, streams, parser.vars());
+    return check_global_scope_exists(cmd, opts, dest, streams, parser);
 }
 
 /// This handles the common case of setting the entire var to a set of values.
@@ -785,7 +785,7 @@ static int builtin_set_set(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, w
     }
 
     if (retval != STATUS_CMD_OK) return retval;
-    return check_global_scope_exists(cmd, opts, varname, streams, parser.vars());
+    return check_global_scope_exists(cmd, opts, varname, streams, parser);
 }
 
 /// The set builtin creates, updates, and erases (removes, deletes) variables.
diff --git a/src/common.cpp b/src/common.cpp
index 3d418657d..54856d3af 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -56,6 +56,7 @@
 #include "future_feature_flags.h"
 #include "global_safety.h"
 #include "iothread.h"
+#include "parser.h"
 #include "proc.h"
 #include "signal.h"
 #include "wildcard.h"
@@ -1791,7 +1792,8 @@ void common_handle_winch(int signal) {
 static void validate_new_termsize(struct winsize *new_termsize, const environment_t &vars) {
     if (new_termsize->ws_col == 0 || new_termsize->ws_row == 0) {
 #ifdef HAVE_WINSIZE
-        if (shell_is_interactive()) {
+        // Highly hackish. This seems like it should be moved.
+        if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
             debug(1, _(L"Current terminal parameters have rows and/or columns set to zero."));
             debug(1, _(L"The stty command can be used to correct this "
                        L"(e.g., stty rows 80 columns 24)."));
@@ -1814,7 +1816,8 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
     }
 
     if (new_termsize->ws_col < MIN_TERM_COL || new_termsize->ws_row < MIN_TERM_ROW) {
-        if (shell_is_interactive()) {
+        // Also highly hackisk.
+        if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
             debug(1, _(L"Current terminal parameters set terminal size to unreasonable value."));
             debug(1, _(L"Defaulting terminal size to 80x24."));
         }
diff --git a/src/complete.cpp b/src/complete.cpp
index c712b6b2c..e106d5245 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -748,10 +748,10 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
                                      const wcstring &desc, complete_flags_t flags) {
     bool is_autosuggest = (this->type() == COMPLETE_AUTOSUGGEST);
 
-    // If type is COMPLETE_AUTOSUGGEST, it means we're on a background thread, so don't call
-    // proc_push_interactive.
-    if (!is_autosuggest) {
-        proc_push_interactive(0);
+    bool saved_interactive = false;
+    if (parser) {
+        saved_interactive = parser->libdata().is_interactive;
+        parser->libdata().is_interactive = false;
     }
 
     expand_flags_t eflags{};
@@ -763,8 +763,8 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
     std::vector<completion_t> possible_comp =
         parser_t::expand_argument_list(args, eflags, vars, parser);
 
-    if (!is_autosuggest) {
-        proc_pop_interactive();
+    if (parser) {
+        parser->libdata().is_interactive = saved_interactive;
     }
 
     this->complete_strings(escape_string(str, ESCAPE_ALL), const_desc(desc), possible_comp, flags);
diff --git a/src/event.cpp b/src/event.cpp
index 19d9778e8..cda927517 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -276,13 +276,12 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
 
         // Event handlers are not part of the main flow of code, so they are marked as
         // non-interactive.
-        proc_push_interactive(0);
+        scoped_push<bool> interactive{&ld.is_interactive, false};
         auto prev_statuses = parser.get_last_statuses();
 
         block_t *b = parser.push_block(block_t::event_block(event));
         parser.eval(buffer, io_chain_t(), TOP);
         parser.pop_block(b);
-        proc_pop_interactive();
         parser.set_last_statuses(std::move(prev_statuses));
     }
 }
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index d949bc8af..7dd58e5ab 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -29,6 +29,7 @@
 #include "fish_version.h"
 #include "input.h"
 #include "input_common.h"
+#include "parser.h"
 #include "print_help.h"
 #include "proc.h"
 #include "reader.h"
@@ -285,9 +286,10 @@ static void setup_and_process_keys(bool continuous_mode) {
     set_interactive_session(true);  // by definition this program is interactive
     set_main_thread();
     setup_fork_guards();
-    proc_push_interactive(1);
     env_init();
     reader_init();
+    parser_t &parser = parser_t::principal_parser();
+    scoped_push<bool> interactive{&parser.libdata().is_interactive, true};
     // We need to set the shell-modes for ICRNL,
     // in fish-proper this is done once a command is run.
     tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 74dbd22b6..e60b03e8f 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1013,8 +1013,9 @@ static void test_cancellation() {
 
     // Enable fish's signal handling here. We need to make this interactive for fish to install its
     // signal handlers.
-    proc_push_interactive(1);
-    signal_set_handlers();
+    parser_t &parser = parser_t::principal_parser();
+    scoped_push<bool> interactive{&parser.libdata().is_interactive, true};
+    signal_set_handlers(true);
 
     // This tests that we can correctly ctrl-C out of certain loop constructs, and that nothing gets
     // printed if we do.
@@ -1040,7 +1041,7 @@ static void test_cancellation() {
     set_interactive_session(iis);
 
     // Restore signal handling.
-    proc_pop_interactive();
+    interactive.restore();
     signal_reset_handlers();
 
     // Ensure that we don't think we should cancel.
@@ -1613,7 +1614,7 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
         if (errors.empty()) {
             err(L"Bug: Parse error reported but no error text found.");
         } else {
-            err(L"%ls", errors.at(0).describe(wcstring(in)).c_str());
+            err(L"%ls", errors.at(0).describe(in, parser->is_interactive()).c_str());
         }
         return false;
     }
@@ -4237,7 +4238,7 @@ static void test_new_parser_errors() {
                 L"code %lu",
                 src.c_str(), expected_code, (unsigned long)errors.at(0).code);
             for (size_t i = 0; i < errors.size(); i++) {
-                err(L"\t\t%ls", errors.at(i).describe(src).c_str());
+                err(L"\t\t%ls", errors.at(i).describe(src, true).c_str());
             }
         }
     }
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 5c234c505..2c916ac5e 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -187,9 +187,9 @@ struct parse_error_t {
     /// Offset and length of the token in the source code that triggered this error.
     size_t source_start;
     size_t source_length;
-    /// Return a string describing the error, suitable for presentation to the user. If skip_caret
-    /// is false, the offending line with a caret is printed as well.
-    wcstring describe(const wcstring &src) const;
+    /// Return a string describing the error, suitable for presentation to the user. If
+    /// is_interactive is true, the offending line with a caret is printed as well.
+    wcstring describe(const wcstring &src, bool is_interactive) const;
     /// Return a string describing the error, suitable for presentation to the user, with the given
     /// prefix. If skip_caret is false, the offending line with a caret is printed as well.
     wcstring describe_with_prefix(const wcstring &src, const wcstring &prefix, bool is_interactive,
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index ce7e8bad5..1f82c768b 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -800,7 +800,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     }
 
     // Protect against exec with background processes running
-    if (process_type == process_type_t::exec && shell_is_interactive()) {
+    if (process_type == process_type_t::exec && parser->is_interactive()) {
         bool have_bg = false;
         for (const auto &bg : parser->jobs()) {
             // The assumption here is that if it is a foreground job,
@@ -1165,7 +1165,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
     // Get terminal modes.
     struct termios tmodes = {};
-    if (shell_is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
+    if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
         return parse_execution_errored;
@@ -1236,13 +1236,13 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     auto job_control_mode = get_job_control_mode();
     bool wants_job_control =
         (job_control_mode == job_control_t::all) ||
-        ((job_control_mode == job_control_t::interactive) && shell_is_interactive());
+        ((job_control_mode == job_control_t::interactive) && parser->is_interactive());
 
     job_t::properties_t props{};
     props.foreground = !job_node_is_background(job_node);
     props.wants_terminal = wants_job_control && !ld.is_event;
     props.skip_notification =
-        ld.is_subshell || ld.is_block || ld.is_event || !shell_is_interactive();
+        ld.is_subshell || ld.is_block || ld.is_event || !parser->is_interactive();
     props.from_event_handler = ld.is_event;
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 743a80509..c840f29ed 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -117,8 +117,8 @@ wcstring parse_error_t::describe_with_prefix(const wcstring &src, const wcstring
     return result;
 }
 
-wcstring parse_error_t::describe(const wcstring &src) const {
-    return this->describe_with_prefix(src, wcstring(), shell_is_interactive(), false);
+wcstring parse_error_t::describe(const wcstring &src, bool is_interactive) const {
+    return this->describe_with_prefix(src, wcstring(), is_interactive, false);
 }
 
 void parse_error_offset_source_start(parse_error_list_t *errors, size_t amt) {
diff --git a/src/parser.cpp b/src/parser.cpp
index 72b58612e..73d7e10b7 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -524,7 +524,7 @@ wcstring parser_t::current_line() {
     wcstring prefix;
 
     // If we are not going to print a stack trace, at least print the line number and filename.
-    if (!shell_is_interactive() || is_function()) {
+    if (!is_interactive() || is_function()) {
         if (file) {
             append_format(prefix, _(L"%ls (line %d): "), user_presentable_path(file).c_str(),
                           lineno);
@@ -535,8 +535,7 @@ wcstring parser_t::current_line() {
         }
     }
 
-    bool is_interactive = shell_is_interactive();
-    bool skip_caret = is_interactive && !is_function();
+    bool skip_caret = is_interactive() && !is_function();
 
     // Use an error with empty text.
     assert(source_offset >= 0);
@@ -544,7 +543,7 @@ wcstring parser_t::current_line() {
     empty_error.source_start = source_offset;
 
     wcstring line_info = empty_error.describe_with_prefix(execution_context->get_source(), prefix,
-                                                          is_interactive, skip_caret);
+                                                          is_interactive(), skip_caret);
     if (!line_info.empty()) {
         line_info.push_back(L'\n');
     }
@@ -721,8 +720,6 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
     if (!errors.empty()) {
         const parse_error_t &err = errors.at(0);
 
-        const bool is_interactive = shell_is_interactive();
-
         // Determine if we want to try to print a caret to point at the source error. The
         // err.source_start <= src.size() check is due to the nasty way that slices work, which is
         // by rewriting the source.
@@ -734,7 +731,7 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
 
             // Don't include the caret if we're interactive, this is the first line of text, and our
             // source is at its beginning, because then it's obvious.
-            skip_caret = (is_interactive && which_line == 1 && err.source_start == 0);
+            skip_caret = (is_interactive() && which_line == 1 && err.source_start == 0);
         }
 
         wcstring prefix;
@@ -751,7 +748,7 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
         }
 
         const wcstring description =
-            err.describe_with_prefix(src, prefix, is_interactive, skip_caret);
+            err.describe_with_prefix(src, prefix, is_interactive(), skip_caret);
         if (!description.empty()) {
             output.append(description);
             output.push_back(L'\n');
diff --git a/src/parser.h b/src/parser.h
index 77d73cc10..c522be72d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -152,6 +152,9 @@ struct library_data_t {
     /// event nesting level.
     int is_event{0};
 
+    /// Whether we are currently interactive.
+    bool is_interactive{false};
+
     /// Whether we should break or continue the current loop.
     enum loop_status_t loop_status { loop_status_t::normals };
 
@@ -352,6 +355,10 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// than the one curently read.
     const wchar_t *current_filename() const;
 
+    /// Return if we are interactive, which means we are executing a command that the user typed in
+    /// (and not, say, a prompt).
+    bool is_interactive() const { return libdata().is_interactive; }
+
     /// Return a string representing the current stack trace.
     wcstring stack_trace() const;
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 87eb0bf72..c3e055864 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -77,21 +77,7 @@ job_control_t get_job_control_mode() { return job_control_mode; }
 
 void set_job_control_mode(job_control_t mode) { job_control_mode = mode; }
 
-static int is_interactive = -1;
-
-bool shell_is_interactive() {
-    ASSERT_IS_MAIN_THREAD();
-    // is_interactive is statically initialized to -1. Ensure it has been dynamically set
-    // before we're called.
-    assert(is_interactive != -1);
-    return is_interactive > 0;
-}
-
-/// A stack containing the values of is_interactive. Used by proc_push_interactive and
-/// proc_pop_interactive.
-static std::vector<int> interactive_stack;
-
-void proc_init() { proc_push_interactive(0); }
+void proc_init() { signal_set_handlers_once(false); }
 
 // Basic thread safe job IDs. The vector consumed_job_ids has a true value wherever the job ID
 // corresponding to that slot is in use. The job ID corresponding to slot 0 is 1.
@@ -860,7 +846,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     FLOGF(proc_job_run, L"%ls job %d, gid %d (%ls), %ls, %ls",
           send_sigcont ? L"Continue" : L"Start", job_id, pgid, command_wcstr(),
           is_completed() ? L"COMPLETED" : L"UNCOMPLETED",
-          is_interactive ? L"INTERACTIVE" : L"NON-INTERACTIVE");
+          parser.libdata().is_interactive ? L"INTERACTIVE" : L"NON-INTERACTIVE");
 
     // Make sure we retake control of the terminal before leaving this function.
     bool term_transferred = false;
@@ -956,26 +942,10 @@ void proc_sanity_check(const parser_t &parser) {
     }
 }
 
-void proc_push_interactive(int value) {
-    ASSERT_IS_MAIN_THREAD();
-    int old = is_interactive;
-    interactive_stack.push_back(is_interactive);
-    is_interactive = value;
-    if (old != value) signal_set_handlers();
-}
-
-void proc_pop_interactive() {
-    ASSERT_IS_MAIN_THREAD();
-    int old = is_interactive;
-    is_interactive = interactive_stack.back();
-    interactive_stack.pop_back();
-    if (is_interactive != old) signal_set_handlers();
-}
-
 void proc_wait_any(parser_t &parser) {
     ASSERT_IS_MAIN_THREAD();
     process_mark_finished_children(parser, true /* block_ok */);
-    process_clean_after_marking(parser, is_interactive);
+    process_clean_after_marking(parser, parser.libdata().is_interactive);
 }
 
 void hup_background_jobs(const parser_t &parser) {
diff --git a/src/proc.h b/src/proc.h
index 4b59440e2..414314649 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -456,9 +456,6 @@ class job_t {
     static job_t *from_pid(pid_t pid);
 };
 
-/// Whether we are reading from the keyboard right now.
-bool shell_is_interactive();
-
 /// Whether this shell is attached to the keyboard at all.
 bool is_interactive_session();
 void set_interactive_session(bool flag);
@@ -509,12 +506,6 @@ event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int
 /// Initializations.
 void proc_init();
 
-/// Set new value for is_interactive flag, saving previous value. If needed, update signal handlers.
-void proc_push_interactive(int value);
-
-/// Set is_interactive flag to the previous value. If needed, update signal handlers.
-void proc_pop_interactive();
-
 /// Wait for any process finishing, or receipt of a signal.
 void proc_wait_any(parser_t &parser);
 
diff --git a/src/reader.cpp b/src/reader.cpp
index df2fc0b63..88baa3e60 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -856,6 +856,8 @@ bool reader_thread_job_is_stale() {
 void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor_position) {
     if (!term_supports_setting_title()) return;
 
+    scoped_push<bool> noninteractive{&parser.libdata().is_interactive, false};
+
     wcstring fish_title_command = DEFAULT_TITLE;
     if (function_exists(L"fish_title", parser)) {
         fish_title_command = L"fish_title";
@@ -867,7 +869,6 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
     }
 
     wcstring_list_t lst;
-    proc_push_interactive(0);
     if (exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */) != -1 &&
         !lst.empty()) {
         std::fputws(L"\x1B]0;", stdout);
@@ -877,7 +878,6 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
         ignore_result(write(STDOUT_FILENO, "\a", 1));
     }
 
-    proc_pop_interactive();
     outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset());
     if (reset_cursor_position && !lst.empty()) {
         // Put the cursor back at the beginning of the line (issue #2453).
@@ -913,7 +913,7 @@ void reader_data_t::exec_prompt() {
 
     // If we have any prompts, they must be run non-interactively.
     if (left_prompt.size() || right_prompt.size()) {
-        proc_push_interactive(0);
+        scoped_push<bool> noninteractive{&parser().libdata().is_interactive, false};
 
         exec_mode_prompt();
 
@@ -936,8 +936,6 @@ void reader_data_t::exec_prompt() {
                 right_prompt_buff += prompt_list.at(i);
             }
         }
-
-        proc_pop_interactive();
     }
 
     // Write the screen title. Do not reset the cursor position: exec_prompt is called when there
@@ -1670,7 +1668,7 @@ static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgi
 }
 
 /// Initialize data for interactive use.
-static void reader_interactive_init() {
+static void reader_interactive_init(parser_t &parser) {
     // See if we are running interactively.
     pid_t shell_pgid;
 
@@ -1745,7 +1743,7 @@ static void reader_interactive_init() {
             }
         }
 
-        signal_set_handlers();
+        signal_set_handlers(parser.is_interactive());
     }
 
     // It shouldn't be necessary to place fish in its own process group and force control
@@ -1782,7 +1780,7 @@ static void reader_interactive_init() {
     invalidate_termsize();
 
     // For compatibility with fish 2.0's $_, now replaced with `status current-command`
-    parser_t::principal_parser().vars().set_one(L"_", ENV_GLOBAL, L"fish");
+    parser.vars().set_one(L"_", ENV_GLOBAL, L"fish");
 }
 
 /// Destroy data for interactive use.
@@ -2097,7 +2095,7 @@ void reader_push(parser_t &parser, const wcstring &name) {
     reader_data_t *data = current_data();
     data->command_line_changed(&data->command_line);
     if (reader_data_stack.size() == 1) {
-        reader_interactive_init();
+        reader_interactive_init(parser);
     }
 
     data->exec_prompt();
@@ -3544,7 +3542,7 @@ int reader_read(parser_t &parser, int fd, const io_chain_t &io) {
     // If reader_read is called recursively through the '.' builtin, we need to preserve
     // is_interactive. This, and signal handler setup is handled by
     // proc_push_interactive/proc_pop_interactive.
-    int inter = 0;
+    bool interactive = false;
     // This block is a hack to work around https://sourceware.org/bugzilla/show_bug.cgi?id=20632.
     // See also, commit 396bf12. Without the need for this workaround we would just write:
     // int inter = ((fd == STDIN_FILENO) && isatty(STDIN_FILENO));
@@ -3552,19 +3550,20 @@ int reader_read(parser_t &parser, int fd, const io_chain_t &io) {
         struct termios t;
         int a_tty = isatty(STDIN_FILENO);
         if (a_tty) {
-            inter = 1;
+            interactive = true;
         } else if (tcgetattr(STDIN_FILENO, &t) == -1 && errno == EIO) {
             redirect_tty_output();
-            inter = 1;
+            interactive = true;
         }
     }
-    proc_push_interactive(inter);
 
-    res = shell_is_interactive() ? read_i(parser) : read_ni(parser, fd, io);
+    scoped_push<bool> interactive_push{&parser.libdata().is_interactive, interactive};
+    signal_set_handlers_once(interactive);
+
+    res = parser.is_interactive() ? read_i(parser) : read_ni(parser, fd, io);
 
     // If the exit command was called in a script, only exit the script, not the program.
     reader_set_end_loop(false);
 
-    proc_pop_interactive();
     return res;
 }
diff --git a/src/signal.cpp b/src/signal.cpp
index 9142fc5bd..a9837d863 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -317,7 +317,7 @@ static void set_interactive_handlers() {
 }
 
 /// Sets up appropriate signal handlers.
-void signal_set_handlers() {
+void signal_set_handlers(bool interactive) {
     struct sigaction act;
     act.sa_flags = 0;
     sigemptyset(&act.sa_mask);
@@ -346,11 +346,19 @@ void signal_set_handlers() {
         FATAL_EXIT();
     }
 
-    if (shell_is_interactive()) {
+    if (interactive) {
         set_interactive_handlers();
     }
 }
 
+void signal_set_handlers_once(bool interactive) {
+    static std::once_flag s_noninter_once;
+    std::call_once(s_noninter_once, signal_set_handlers, false);
+
+    static std::once_flag s_inter_once;
+    if (interactive) std::call_once(s_inter_once, set_interactive_handlers);
+}
+
 void signal_handle(int sig) {
     struct sigaction act;
 
diff --git a/src/signal.h b/src/signal.h
index 2b94e4023..af284f36c 100644
--- a/src/signal.h
+++ b/src/signal.h
@@ -17,7 +17,10 @@ const wchar_t *signal_get_desc(int sig);
 void signal_reset_handlers();
 
 /// Set signal handlers to fish default handlers.
-void signal_set_handlers();
+void signal_set_handlers(bool interactive);
+
+/// Latch function. This sets signal handlers, but only the first time it is called.
+void signal_set_handlers_once(bool interactive);
 
 /// Tell fish what to do on the specified signal.
 ///

From f58960ba011391ef15dca469c7e6b6313dd6a52a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 29 Jun 2019 11:40:52 -0700
Subject: [PATCH 0775/1732] Add a DIE("unreachable") in
 should_claim_process_group_for_job

Fixes a gcc warning.
---
 src/exec.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index 01c926ad9..7e51b7ad1 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1038,6 +1038,7 @@ static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
             // exec will retain the pgroup.
             return false;
     }
+    DIE("unreachable");
 }
 
 bool exec_job(parser_t &parser, shared_ptr<job_t> j) {

From 98ba7d77901df0d9145acb77de28e84df09b6d13 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 29 Jun 2019 14:30:43 -0700
Subject: [PATCH 0776/1732] Simplify maybe_assign_terminal()

Move this out of postfork, it is not called after fork.
---
 src/exec.cpp     |  7 +++++++
 src/postfork.cpp | 18 ------------------
 src/postfork.h   |  1 -
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 7e51b7ad1..b15398c86 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -117,6 +117,13 @@ char *get_interpreter(const char *command, char *interpreter, size_t buff_size)
     return NULL;
 }
 
+/// Assign the terminal to a job.
+static void maybe_assign_terminal(const job_t *j) {
+    if (j->wants_terminal() && j->is_foreground()) {
+        terminal_give_to_job(j, false /*new job, so not continuing*/);
+    }
+}
+
 /// This function is executed by the child process created by a call to fork(). It should be called
 /// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 5508ae215..0008f9b98 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -134,24 +134,6 @@ bool set_child_group(job_t *j, pid_t child_pid) {
     return true;
 }
 
-bool maybe_assign_terminal(const job_t *j) {
-    if (j->wants_terminal() && j->is_foreground()) {  //!OCLINT(early exit)
-        if (tcgetpgrp(STDIN_FILENO) == j->pgid) {
-            // We've already assigned the process group control of the terminal when the first
-            // process in the job was started. There's no need to do so again, and on some platforms
-            // this can cause an EPERM error. In addition, if we've given control of the terminal to
-            // a process group, attempting to call tcsetpgrp from the background will cause SIGTTOU
-            // to be sent to everything in our process group (unless we handle it).
-            FLOGF(proc_termowner, L"Process group %d already has control of terminal", j->pgid);
-        } else {
-            // No need to duplicate the code here, a function already exists that does just this.
-            return terminal_give_to_job(j, false /*new job, so not continuing*/);
-        }
-    }
-
-    return true;
-}
-
 int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s) {
     // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
diff --git a/src/postfork.h b/src/postfork.h
index af845f7f9..f813ee268 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -20,7 +20,6 @@ class process_t;
 
 bool set_child_group(job_t *j, pid_t child_pid);  // called by parent
 bool child_set_group(job_t *j, process_t *p);     // called by child
-bool maybe_assign_terminal(const job_t *j);
 
 /// Initialize a new child process. This should be called right away after forking in the child
 /// process. If job control is enabled for this job, the process is put in the process group of the

From 2931d869d5c8f91740b27dac74466c305533b906 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 29 Jun 2019 15:38:00 -0700
Subject: [PATCH 0777/1732] Remove the foreground job property

This was not used consistently and was confused with the foreground job
flag. Whether a job is foreground is mutable, so it should remain a flag.
---
 src/parse_execution.cpp | 2 +-
 src/proc.h              | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 1f82c768b..eff62a4e6 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1239,7 +1239,6 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         ((job_control_mode == job_control_t::interactive) && parser->is_interactive());
 
     job_t::properties_t props{};
-    props.foreground = !job_node_is_background(job_node);
     props.wants_terminal = wants_job_control && !ld.is_event;
     props.skip_notification =
         ld.is_subshell || ld.is_block || ld.is_event || !parser->is_interactive();
@@ -1248,6 +1247,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
     job->tmodes = tmodes;
 
+    job->set_flag(job_flag_t::FOREGROUND, !job_node_is_background(job_node));
     job->set_flag(job_flag_t::JOB_CONTROL, wants_job_control);
 
     // We are about to populate a job. One possible argument to the job is a command substitution
diff --git a/src/proc.h b/src/proc.h
index 414314649..faa906f84 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -287,9 +287,6 @@ class job_t {
     /// A set of jobs properties. These are immutable: they do not change for the lifetime of the
     /// job.
     struct properties_t {
-        /// Whether this job is in the foreground, i.e. whether it did NOT have a & at the end.
-        bool foreground{};
-
         /// Whether the specified job is a part of a subshell, event handler or some other form of
         /// special job that should not be reported.
         bool skip_notification{};
@@ -414,7 +411,7 @@ class job_t {
     /// The job has been fully constructed, i.e. all its member processes have been launched
     bool is_constructed() const { return get_flag(job_flag_t::CONSTRUCTED); }
     /// The job was launched in the foreground and has control of the terminal
-    bool is_foreground() const { return properties.foreground; }
+    bool is_foreground() const { return get_flag(job_flag_t::FOREGROUND); }
     /// The job is complete, i.e. all its member processes have been reaped
     bool is_completed() const;
     /// The job is in a stopped state

From 09e4f8ff4214b951579e05101371c1641649d168 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 29 Jun 2019 15:58:36 -0700
Subject: [PATCH 0778/1732] Refactor how the terminal is transferred to jobs

Centralize the logic around when a job acquires the terminal.
---
 src/exec.cpp | 11 ++---------
 src/proc.cpp | 48 ++++++++++++++++++++++++------------------------
 src/proc.h   | 11 ++++++-----
 3 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index b15398c86..c6ac1b634 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -117,13 +117,6 @@ char *get_interpreter(const char *command, char *interpreter, size_t buff_size)
     return NULL;
 }
 
-/// Assign the terminal to a job.
-static void maybe_assign_terminal(const job_t *j) {
-    if (j->wants_terminal() && j->is_foreground()) {
-        terminal_give_to_job(j, false /*new job, so not continuing*/);
-    }
-}
-
 /// This function is executed by the child process created by a call to fork(). It should be called
 /// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
@@ -472,7 +465,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
     p->pid = pid;
     on_process_created(job, p->pid);
     set_child_group(job.get(), p->pid);
-    maybe_assign_terminal(job.get());
+    terminal_maybe_give_to_job(job.get(), false);
     return true;
 }
 
@@ -763,7 +756,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
         }
 #endif
 
-        maybe_assign_terminal(j.get());
+        terminal_maybe_give_to_job(j.get(), false);
     } else
 #endif
     {
diff --git a/src/proc.cpp b/src/proc.cpp
index c3e055864..2c780abc3 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -211,12 +211,6 @@ static int64_t next_proc_id() {
 
 internal_proc_t::internal_proc_t() : internal_proc_id_(next_proc_id()) {}
 
-static void mark_job_complete(const job_t *j) {
-    for (auto &p : j->processes) {
-        p->completed = 1;
-    }
-}
-
 void job_mark_process_as_failed(const std::shared_ptr<job_t> &job, const process_t *failed_proc) {
     // The given process failed to even lift off (e.g. posix_spawn failed) and so doesn't have a
     // valid pid. Mark it and everything after it as dead.
@@ -684,10 +678,22 @@ void proc_update_jiffies(parser_t &parser) {
 
 // Return control of the terminal to a job's process group. restore_attrs is true if we are
 // restoring a previously-stopped job, in which case we need to restore terminal attributes.
-bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
+int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
+    enum { notneeded = 0, success = 1, error = -1 };
+
+    if (!j->wants_terminal() || !j->is_foreground()) {
+        // We don't want the job.
+        return notneeded;
+    }
+
     if (j->pgid == 0) {
         FLOG(proc_termowner, L"terminal_give_to_job() returning early due to no process group");
-        return true;
+        return notneeded;
+    }
+
+    // If we are continuing, ensure that stdin is marked as blocking first (issue #176).
+    if (continuing_from_stopped) {
+        make_fd_blocking(STDIN_FILENO);
     }
 
     // It may not be safe to call tcsetpgrp if we've already done so, as at that point we are no
@@ -749,7 +755,7 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
                 debug(1, _(L"Could not send job %d ('%ls') with pgid %d to foreground"), j->job_id,
                       j->command_wcstr(), j->pgid);
                 wperror(L"tcsetpgrp");
-                return false;
+                return error;
             }
 
             if (pgroup_terminated) {
@@ -759,15 +765,14 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
                 // process in the group terminated and didn't need to access the terminal, otherwise
                 // it would have hung waiting for terminal IO (SIGTTIN). We can safely ignore this.
                 debug(3, L"tcsetpgrp called but process group %d has terminated.\n", j->pgid);
-                mark_job_complete(j);
-                return true;
+                return notneeded;
             }
 
             break;
         }
     }
 
-    if (restore_attrs) {
+    if (continuing_from_stopped) {
         auto result = tcsetattr(STDIN_FILENO, TCSADRAIN, &j->tmodes);
         if (result == -1) {
             // No need to test for EINTR and retry since we have blocked all signals
@@ -778,11 +783,11 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) {
             debug(1, _(L"Could not send job %d ('%ls') to foreground"), j->job_id,
                   j->preview().c_str());
             wperror(L"tcsetattr");
-            return false;
+            return error;
         }
     }
 
-    return true;
+    return success;
 }
 
 pid_t terminal_acquire_before_builtin(int job_pgid) {
@@ -857,17 +862,12 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     });
 
     if (!is_completed()) {
-        if (wants_terminal() && is_foreground()) {
-            // Put the job into the foreground and give it control of the terminal.
-            // Hack: ensure that stdin is marked as blocking first (issue #176).
-            make_fd_blocking(STDIN_FILENO);
-            if (!terminal_give_to_job(this, send_sigcont)) {
-                // This scenario has always returned without any error handling. Presumably that is
-                // OK.
-                return;
-            }
-            term_transferred = true;
+        int transfer = terminal_maybe_give_to_job(this, send_sigcont);
+        if (transfer < 0) {
+            // terminal_maybe_give_to_job prints an error.
+            return;
         }
+        term_transferred = (transfer > 0);
 
         // If both requested and necessary, send the job a continue signal.
         if (send_sigcont) {
diff --git a/src/proc.h b/src/proc.h
index faa906f84..2133fe160 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -515,13 +515,14 @@ bool is_within_fish_initialization();
 /// Terminate all background jobs
 void hup_background_jobs(const parser_t &parser);
 
-/// Give ownership of the terminal to the specified job.
+/// Give ownership of the terminal to the specified job, if it wants it.
 ///
 /// \param j The job to give the terminal to.
-/// \param restore_attrs If this variable is set, we are giving back control to a job that was
-/// previously stopped. In that case, we need to set the terminal attributes to those saved in the
-/// job.
-bool terminal_give_to_job(const job_t *j, bool restore_attrs);
+/// \param continuing_from_stopped If this variable is set, we are giving back control to a job that
+/// was previously stopped. In that case, we need to set the terminal attributes to those saved in
+/// the job.
+/// \return 1 if transferred, 0 if no transfer was necessary, -1 on error.
+int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped);
 
 /// Given that we are about to run a builtin, acquire the terminal if it is owned by the given job.
 /// Returns the pid to restore after running the builtin, or -1 if there is no pid to restore.

From d263093a5a6a6afe750812e9db409a946adbb8f6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 30 Jun 2019 13:54:03 +0200
Subject: [PATCH 0779/1732] docs/cmds/fish: Document private mode there as well

Oversight, see #2376.

[ci skip]
---
 sphinx_doc_src/cmds/fish.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 177e781b9..b33aa4696 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -32,6 +32,8 @@ The following options are available:
 
 - ``-p`` or ``--profile=PROFILE_FILE`` when fish exits, output timing information on all executed commands to the specified file
 
+- ``-P`` or ``--private`` enables :ref:`private mode <private-mode>`, so fish will not access old or store new history.
+
 - ``--print-rusage-self`` when fish exits, output stats from getrusage
 
 - ``--print-debug-categories`` outputs the list of debug categories, and then exits.

From d1be300ac70f2cc2f8af164b61070d526ccaea11 Mon Sep 17 00:00:00 2001
From: Tim Riley <tim@openmonkey.com>
Date: Mon, 24 Jun 2019 09:09:10 +1000
Subject: [PATCH 0780/1732] Emulate path_helper more faithfully when
 constructing paths on macOS

Previously, elements already existing in the path variable would keep their position when the path was being constructed from the config files. This caused issues given that $PATH typically already contains "/usr/bin:/bin" when fish initializes within a macOS terminal app. In this case, these would keep their position at the front of the $PATH, even though the system path_helper configs explicitly place them _after_ other paths, like "/usr/local/bin". This would render binaries in "/usr/local/bin" as effectively "invisible" if they also happen to live in "/usr/bin" as well. This is not the intended

This change makes the __fish_macos_set_env config function emulate the macOS standard path_helper behavior more faithfully, with:

1. The path list being constructed *from scratch* based on the paths specified in the config files
2. Any distinct entries in the exist path environment variable being appended to this list
3. And then this list being used to *replace* the existing path environment variable

The result, for a vanilla fish shell on macOS, is that the $PATH is now set to:

    /usr/local/bin /usr/local/sbin /usr/bin /bin /usr/sbin /sbin

Where previously it was set to:

    /usr/bin /bin /usr/local/bin /usr/sbin /sbin

This new $PATH exactly matches the order of paths specified in `/etc/paths`.
---
 share/config.fish | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index 6934b74ea..d1e50e55e 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -173,10 +173,9 @@ if status --is-login
         # executable for fish; see
         # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html .
         function __fish_macos_set_env -d "set an environment variable like path_helper does (macOS only)"
-            # The first argument is the variable name, the others are the files.
-            # Keep the components already there so we don't change the order
-            set -l result $$argv[1]
+            set -l result
 
+            # Populate path according to config files
             for path_file in $argv[2] $argv[3]/*
                 if [ -f $path_file ]
                     while read -l entry
@@ -188,6 +187,13 @@ if status --is-login
                 end
             end
 
+            # Merge in any existing path elements
+            for existing_entry in $$argv[1]
+                if not contains -- $existing_entry $result
+                    set -a result $existing_entry
+                end
+            end
+
             set -xg $argv[1] $result
         end
 

From 51332878739280825dc39a8884397e4770b2876c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Jul 2019 22:18:40 +0200
Subject: [PATCH 0781/1732] CHANGELOG: List path_helper changes

Just replace the issue number because this is effectively a
replacement of the previous.

[ci skip]
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220409049..46f101de8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 ## Notable Fixes and improvements
 - fish no longer requires buffering for the last function in a pipeline.
 - Add `$pipestatus` support
-- $PATH is no longer reordered in child fishes (#5456).
+- $PATH is no longer reordered in child fishes (#5956).
 - `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
 - macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
 - cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).

From 7d3bec12973e9e1839337a05d3088b22cbadd5f1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Jul 2019 22:50:16 +0200
Subject: [PATCH 0782/1732] test.fish: Notice littlecheck failures

This failed to propagate the exit status. Sorry!
---
 tests/test.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test.fish b/tests/test.fish
index 82d3739a5..40a145172 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -82,6 +82,7 @@ function test_littlecheck_file
     if test $exit_status -eq 0
         say green "ok ($test_duration sec)"
     end
+    return $exit_status
 end
 
 set -l failed

From d775c584a56333c6ac744ec139d9df9860de32f7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Jul 2019 22:59:38 +0200
Subject: [PATCH 0783/1732] Port realpath tests to littlecheck

I'm gonna add more tests to this and I don't want to touch the old stuff.

Notice that this needs to have the output of the complete_directories
test adjusted because this one now runs later.

That's something we should take into account in future.
---
 tests/__fish_complete_directories.out       |  2 --
 tests/{realpath.in => checks/realpath.fish} | 13 +++++++++++++
 tests/realpath.err                          |  2 --
 tests/realpath.out                          | 10 ----------
 4 files changed, 13 insertions(+), 14 deletions(-)
 rename tests/{realpath.in => checks/realpath.fish} (85%)
 delete mode 100644 tests/realpath.err
 delete mode 100644 tests/realpath.out

diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
index 03027825c..b668030c4 100644
--- a/tests/__fish_complete_directories.out
+++ b/tests/__fish_complete_directories.out
@@ -9,8 +9,6 @@ test/data/	Directory
 test/data/abc/	Directory
 test/data/abcd/	Directory
 test/data/fish/	Directory
-test/data/fish-symlink/	Directory
-test/data/fish-symlink2/	Directory
 test/data/xy/	Directory
 test/data/xyz/	Directory
 # __fish_complete_directories test/data/abc
diff --git a/tests/realpath.in b/tests/checks/realpath.fish
similarity index 85%
rename from tests/realpath.in
rename to tests/checks/realpath.fish
index 89397dd64..6add05cf2 100644
--- a/tests/realpath.in
+++ b/tests/checks/realpath.fish
@@ -1,3 +1,4 @@
+# RUN: %fish %s
 # $XDG_DATA_HOME can itself be a relative path. So force it to an absolute
 # path so we can remove it from any resolved paths below. This is needed
 # because the contents of the builtin realpath.out file can't include any $PWD
@@ -7,30 +8,38 @@ set -l data_home_realpath (builtin realpath $XDG_DATA_HOME)
 # A bogus absolute path is handled correctly and sets a failure status.
 if not builtin realpath /this/better/be/an/invalid/path
     echo first invalid path handled okay
+    # CHECK: first invalid path handled okay
+    # CHECKERR: builtin realpath: /this/better/be/an/invalid/path: No such file or directory
 end
 
 # A non-existent file relative to $PWD succeeds.
 set -l real_path (builtin realpath nonexistent-file)
 if test "$real_path" = (realpath $PWD)"/nonexistent-file"
     echo nonexistent-file in PWD correctly converted
+    # CHECK: nonexistent-file in PWD correctly converted
 end
 
 # The simplest absolute path should undergo no transformation.
 builtin realpath /
+# CHECK: /
 
 # The second simplest absolute path should undergo no transformation.
 builtin realpath /this-better-not-exist
+# CHECK: /this-better-not-exist
 
 # Check that a pathological case is handled correctly (i.e., there is only one
 # leading slash).
 builtin realpath /../../x
+# CHECK: /x
 
 # Another pathological corner case. GNU realpath first strips trailing slashes
 # so that "/a//" is converted to "/a" before performing the real path
 # conversion. So, despite appearances, it considers "a" to be the last
 # component in that case.
 builtin realpath /abc/
+# CHECK: /abc
 builtin realpath /def///
+# CHECK: /def
 
 # Verify `realpath .` when cwd is a deleted directory gives a no such file or dir error.
 set -l tmpdir (mktemp -d)
@@ -39,6 +48,7 @@ pushd $tmpdir
 # But that's what we want to test, so we weasel around it.
 sh -c "cd ..; rmdir $tmpdir"
 builtin realpath .
+# CHECKERR: builtin realpath: .: No such file or directory
 popd
 
 # A single symlink to a directory is correctly resolved.
@@ -47,6 +57,7 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink)
 set -l expected_real_path "$data_home_realpath/fish"
 if test "$real_path" = "$expected_real_path"
     echo "fish-symlink handled correctly"
+    # CHECK: fish-symlink handled correctly
 else
     echo "fish-symlink not handled correctly: $real_path != $expected_real_path" >&2
 end
@@ -57,6 +68,7 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink/nonexistent-file-
 set -l expected_real_path "$data_home_realpath/fish/nonexistent-file-relative-to-a-symlink"
 if test "$real_path" = "$expected_real_path"
     echo "fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted"
+    # CHECK: fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted
 else
     echo "failure nonexistent-file-relative-to-a-symlink: $real_path != $expected_real_path" >&2
 end
@@ -69,6 +81,7 @@ set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink/symlink_file)
 set -l expected_real_path "$data_home_realpath/fish/real_file"
 if test "$real_path" = "$expected_real_path"
     echo "fish-symlink/symlink_file handled correctly"
+    # CHECK: fish-symlink/symlink_file handled correctly
 else
     echo "fish-symlink/symlink_file not handled correctly: $real_path != expected_real_path" >&2
 end
diff --git a/tests/realpath.err b/tests/realpath.err
deleted file mode 100644
index 65dd8672e..000000000
--- a/tests/realpath.err
+++ /dev/null
@@ -1,2 +0,0 @@
-builtin realpath: /this/better/be/an/invalid/path: No such file or directory
-builtin realpath: .: No such file or directory
diff --git a/tests/realpath.out b/tests/realpath.out
deleted file mode 100644
index 56102523a..000000000
--- a/tests/realpath.out
+++ /dev/null
@@ -1,10 +0,0 @@
-first invalid path handled okay
-nonexistent-file in PWD correctly converted
-/
-/this-better-not-exist
-/x
-/abc
-/def
-fish-symlink handled correctly
-fish-symlink/nonexistent-file-relative-to-a-symlink correctly converted
-fish-symlink/symlink_file handled correctly

From 4ae18951ee5e5a0a645b8f9521a0d9c4548d6e1d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Jul 2019 23:28:04 +0200
Subject: [PATCH 0784/1732] Add NetBSD's error to the bad-option test

I'm kinda close to just checking `.*fish: .*option.*Z.*`
---
 tests/checks/bad-option.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/bad-option.fish b/tests/checks/bad-option.fish
index f3c0af42e..8d7509c4b 100644
--- a/tests/checks/bad-option.fish
+++ b/tests/checks/bad-option.fish
@@ -1,2 +1,2 @@
 #RUN: %fish -Z
-#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?}}
+#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?|unknown option -- Z}}

From 8013686d17c13d9e3363ffa1ccd55f96cc39b2cb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 3 Jul 2019 11:44:08 +0200
Subject: [PATCH 0785/1732] delete-or-exit: Only exit if the commandline is
 empty

This exitted if the cursor was at the end of the line as well (i.e. if
delete-char failed). That's a bit too eager.

Also documentation, which should have already been included.
---
 sphinx_doc_src/cmds/bind.rst | 2 ++
 src/reader.cpp               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index cb90f406f..4bb0aa821 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -102,6 +102,8 @@ The following special input functions are available:
 
 - ``delete-char``, delete one character to the right of the cursor
 
+- ``delete-or-exit``, deletes one character to the right of the cursor or exits the shell if the commandline is empty.
+
 - ``downcase-word``, make the current word lowercase
 
 - ``end-of-buffer``, moves to the end of the buffer, i.e. the end of the first line
diff --git a/src/reader.cpp b/src/reader.cpp
index 88baa3e60..6249a7a08 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2682,7 +2682,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             if (el->position < el->size()) {
                 update_buff_pos(el, el->position + 1);
                 remove_backward();
-            } else if (c == rl::delete_or_exit) {
+            } else if (c == rl::delete_or_exit && el->empty()) {
                 reader_set_end_loop(true);
             }
             break;

From 87b05d3111c726f19c975e5efca5c90ecc201021 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 3 Jul 2019 12:54:42 +0200
Subject: [PATCH 0786/1732] Port eval tests to littlecheck

---
 tests/checks/eval.fish | 46 ++++++++++++++++++++++++++++++++++++++++++
 tests/eval.err         | 13 ------------
 tests/eval.in          | 33 ------------------------------
 tests/eval.out         | 15 --------------
 4 files changed, 46 insertions(+), 61 deletions(-)
 create mode 100644 tests/checks/eval.fish
 delete mode 100644 tests/eval.err
 delete mode 100644 tests/eval.in
 delete mode 100644 tests/eval.out

diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
new file mode 100644
index 000000000..1ee6b4c1f
--- /dev/null
+++ b/tests/checks/eval.fish
@@ -0,0 +1,46 @@
+# RUN: %fish %s
+# Regression test for issue #4443
+eval set -l previously_undefined foo
+echo $previously_undefined
+# CHECK: foo
+
+# Test redirection
+eval "echo you can\\'t see this 1>&2" 2>/dev/null
+
+# Test return statuses
+false; eval true; echo $status
+# CHECK: 0
+false; eval false; echo $status
+# CHECK: 1
+
+# Test return status in case of parsing error
+false; eval "("; echo $status
+# CHECK: 1
+# CHECKERR: tests/checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
+# CHECKERR: (
+# CHECKERR: ^
+false; eval '""'; echo $status
+# CHECK: 1
+# CHECKERR: tests/checks/eval.fish (line {{\d+}}): The expanded command was empty.
+# CHECKERR: ""
+# CHECKERR: ^
+
+function empty
+end
+
+# Regression tests for issue #5692
+false; eval;
+echo blank eval: $status # 0
+# CHECK: blank eval: 0
+
+false; eval "";
+echo empty arg eval: $status # 0
+# CHECK: empty arg eval: 0
+
+false; eval empty;
+echo empty function eval $status # 0
+# CHECK: empty function eval 0
+
+false; eval "begin; end;";
+echo empty block eval: $status # 0
+# CHECK: empty block eval: 0
diff --git a/tests/eval.err b/tests/eval.err
deleted file mode 100644
index 3e02f001c..000000000
--- a/tests/eval.err
+++ /dev/null
@@ -1,13 +0,0 @@
-
-####################
-# Testing eval builtin
-fish: Unexpected end of string, expecting ')'
-(
-^
-
-fish: The expanded command was empty.
-""
-^
-
-####################
-# Testing eval with empty functions, blocks, and arguments
diff --git a/tests/eval.in b/tests/eval.in
deleted file mode 100644
index 3008803d4..000000000
--- a/tests/eval.in
+++ /dev/null
@@ -1,33 +0,0 @@
-logmsg "Testing eval builtin"
-
-# Regression test for issue #4443
-eval set -l previously_undefined foo
-echo $previously_undefined
-
-# Test redirection
-eval "echo you can\\'t see this 1>&2" 2>/dev/null
-
-# Test return statuses
-false; eval true; echo $status # 0
-false; eval false; echo $status # 1
-
-# Test return status in case of parsing error
-false; eval "("; echo $status # 1
-false; eval '""'; echo $status # 1
-
-function empty
-end
-
-# Regression tests for issue #5692
-logmsg "Testing eval with empty functions, blocks, and arguments"
-false; eval;
-echo blank eval: $status # 0
-
-false; eval "";
-echo empty arg eval: $status # 0
-
-false; eval empty;
-echo empty function eval $status # 0
-
-false; eval "begin; end;";
-echo empty block eval: $status # 0
diff --git a/tests/eval.out b/tests/eval.out
deleted file mode 100644
index 6cba274e2..000000000
--- a/tests/eval.out
+++ /dev/null
@@ -1,15 +0,0 @@
-
-####################
-# Testing eval builtin
-foo
-0
-1
-1
-1
-
-####################
-# Testing eval with empty functions, blocks, and arguments
-blank eval: 0
-empty arg eval: 0
-empty function eval 0
-empty block eval: 0

From f1fa8d5f5b3f997deda944f09f7a1efa40ae07aa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 3 Jul 2019 12:57:23 +0200
Subject: [PATCH 0787/1732] Port complete tests to littlecheck

---
 tests/{complete.in => checks/complete.fish} | 19 +++++++++++++------
 tests/complete.err                          |  6 ------
 tests/complete.out                          | 16 ----------------
 3 files changed, 13 insertions(+), 28 deletions(-)
 rename tests/{complete.in => checks/complete.fish} (65%)
 delete mode 100644 tests/complete.err
 delete mode 100644 tests/complete.out

diff --git a/tests/complete.in b/tests/checks/complete.fish
similarity index 65%
rename from tests/complete.in
rename to tests/checks/complete.fish
index 9ebd88cbe..4eec49851 100644
--- a/tests/complete.in
+++ b/tests/checks/complete.fish
@@ -1,5 +1,4 @@
-logmsg Completion Wrappers
-
+# RUN: %fish %s
 function complete_test_alpha1; echo $argv; end
 
 complete -c complete_test_alpha1 --no-files -a '(commandline)'
@@ -7,28 +6,36 @@ complete -c complete_test_alpha2 --no-files -w 'complete_test_alpha1 extra1'
 complete -c complete_test_alpha3 --no-files -w 'complete_test_alpha2 extra2'
 
 complete -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 '
+# CHECK: complete_test_alpha1 extra1 extra2 arg3 
 # Works even with the argument as a separate token.
 complete -C 'complete_test_alpha3 arg3 '
-
-logmsg Alias Completions
+# CHECK: complete_test_alpha1 extra1 extra2 arg3 
 
 alias myalias1 'complete_test_alpha1 arg1'
 alias myalias2='complete_test_alpha1 arg2'
 
 myalias1 call1
 myalias2 call2
+# CHECK: arg1 call1
+# CHECK: arg2 call2
 complete -C'myalias1 call3 '
 complete -C'myalias2 call3 '
+# CHECK: complete_test_alpha1 arg1 call3 
+# CHECK: complete_test_alpha1 arg2 call3 
 
 # Ensure that commands can't wrap themselves - if this did,
 # the completion would be executed a bunch of times.
 function t --wraps t; echo t; end
 complete -c t -fa '(t)'
 complete -C't '
+# CHECK: t
 
 # Ensure file completion happens even though it was disabled above.
 complete -c t -l fileoption -rF
-# Only match this file because I don't want to touch this any time we add a test file.
-complete -C't --fileoption ' | string match complete.in
+# Only match one file because I don't want to touch this any time we add a test file.
+complete -C't --fileoption ' | string match bind.expect
+# CHECK: bind.expect
diff --git a/tests/complete.err b/tests/complete.err
deleted file mode 100644
index b50147861..000000000
--- a/tests/complete.err
+++ /dev/null
@@ -1,6 +0,0 @@
-
-####################
-# Completion Wrappers
-
-####################
-# Alias Completions
diff --git a/tests/complete.out b/tests/complete.out
deleted file mode 100644
index 264fb6a71..000000000
--- a/tests/complete.out
+++ /dev/null
@@ -1,16 +0,0 @@
-
-####################
-# Completion Wrappers
-complete_test_alpha1 arg1 
-complete_test_alpha1 extra1 arg2 
-complete_test_alpha1 extra1 extra2 arg3 
-complete_test_alpha1 extra1 extra2 arg3 
-
-####################
-# Alias Completions
-arg1 call1
-arg2 call2
-complete_test_alpha1 arg1 call3 
-complete_test_alpha1 arg2 call3 
-t
-complete.in

From 65eb4cd9d340f40e054997464907ce80959e2224 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 3 Jul 2019 15:14:49 +0200
Subject: [PATCH 0788/1732] eval tests: Fix path

I tested this manually (`littlecheck.py -s fish=fish tests/checks/eval.fish`) from the base directory, which means I got
"tests/checks/eval", while the real test gets "checks/eval".

I then reran `make test_fishscript`, but that didn't pull in the
updated test - we should really handle that better.
---
 tests/checks/eval.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
index 1ee6b4c1f..3017be4c7 100644
--- a/tests/checks/eval.fish
+++ b/tests/checks/eval.fish
@@ -16,12 +16,12 @@ false; eval false; echo $status
 # Test return status in case of parsing error
 false; eval "("; echo $status
 # CHECK: 1
-# CHECKERR: tests/checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
+# CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
 # CHECKERR: (
 # CHECKERR: ^
 false; eval '""'; echo $status
 # CHECK: 1
-# CHECKERR: tests/checks/eval.fish (line {{\d+}}): The expanded command was empty.
+# CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): The expanded command was empty.
 # CHECKERR: ""
 # CHECKERR: ^
 

From ca5427865d0ad7be5564d41a16173d177a51bb02 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <leonard@hecker.io>
Date: Wed, 3 Jul 2019 17:22:23 +0200
Subject: [PATCH 0789/1732] Fixed invalid assignments in fish_print_git_action

---
 share/functions/fish_print_git_action.fish | 2 --
 1 file changed, 2 deletions(-)

diff --git a/share/functions/fish_print_git_action.fish b/share/functions/fish_print_git_action.fish
index 4810dc59d..4d61a4aed 100644
--- a/share/functions/fish_print_git_action.fish
+++ b/share/functions/fish_print_git_action.fish
@@ -44,10 +44,8 @@ function fish_print_git_action --argument-names git_dir
 
     if test -f "$git_dir/CHERRY_PICK_HEAD"
         if test -d "$git_dir/sequencer"
-            cherry_pick_sequence_formatted='cherry-pick-sequence'
             echo -n 'cherry-pick-sequence'
         else
-            cherry_pick_formatted='cherry-pick'
             echo -n 'cherry-pick'
         end
         return 0

From 8282369f45c92f01ed49107d159657a2f0b4fbec Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 1 Jul 2019 00:47:10 -0700
Subject: [PATCH 0790/1732] child_setup_process to stop passing the process

child_setup_process only cares about whether we are in a forked child, not
the entire process structure. Narrow the parameter.
---
 src/exec.cpp     | 4 ++--
 src/postfork.cpp | 5 ++---
 src/postfork.h   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index c6ac1b634..bd66ff308 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -300,7 +300,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
     // commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
     // really make sense, so I'm not trying to fix it here.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
-    if (redirs && !child_setup_process(nullptr, nullptr, *redirs)) {
+    if (redirs && !child_setup_process(nullptr, false, *redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -445,7 +445,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
         // stdout and stderr, and then exit.
         p->pid = getpid();
         child_set_group(job.get(), p);
-        child_setup_process(job.get(), p, dup2s);
+        child_setup_process(job.get(), true, dup2s);
         child_action();
         DIE("Child process returned control to fork_child lambda!");
     }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 0008f9b98..566c1ed63 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -134,13 +134,12 @@ bool set_child_group(job_t *j, pid_t child_pid) {
     return true;
 }
 
-int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s) {
+int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup2s) {
     // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
         int err = act.target < 0 ? close(act.src) : dup2(act.src, act.target);
         if (err < 0) {
-            // We have a null p if this is for the exec (non-fork) path.
-            if (p != nullptr) {
+            if (is_forked) {
                 debug_safe(4, "redirect_in_child_after_fork failed in child_setup_process");
                 exit_without_destructors(1);
             }
diff --git a/src/postfork.h b/src/postfork.h
index f813ee268..997c5f07b 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -29,7 +29,7 @@ bool child_set_group(job_t *j, process_t *p);     // called by child
 ///
 /// \return 0 on sucess, -1 on failiure. When this function returns, signals are always unblocked.
 /// On failiure, signal handlers, io redirections and process group of the process is undefined.
-int child_setup_process(const job_t *job, process_t *p, const dup2_list_t &dup2s);
+int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup2s);
 
 /// Call fork(), optionally waiting until we are no longer multithreaded. If the forked child
 /// doesn't do anything that could allocate memory, take a lock, etc. (like call exec), then it's

From b1a1b617f15655168709c8a69df663320af5fc75 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 1 Jul 2019 10:57:09 -0700
Subject: [PATCH 0791/1732] child_setup_process to accept new termowner
 directly

Soon we will have more complicated logic around whether to call tcsetpgrp.
Prepare to centralize the logic by passing in the new term owner pgrp,
instead of having child_setup_process perform the decision.
---
 src/exec.cpp     | 6 ++++--
 src/postfork.cpp | 6 +++---
 src/postfork.h   | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index bd66ff308..dc6ce6089 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -300,7 +300,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
     // commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
     // really make sense, so I'm not trying to fix it here.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
-    if (redirs && !child_setup_process(nullptr, false, *redirs)) {
+    if (redirs && !child_setup_process(INVALID_PID, false, *redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -443,9 +443,11 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
     if (pid == 0) {
         // This is the child process. Setup redirections, print correct output to
         // stdout and stderr, and then exit.
+        maybe_t<pid_t> new_termowner{};
         p->pid = getpid();
         child_set_group(job.get(), p);
-        child_setup_process(job.get(), true, dup2s);
+        child_setup_process(job->wants_terminal() && job->is_foreground() ? job->pgid : INVALID_PID,
+                            true, dup2s);
         child_action();
         DIE("Child process returned control to fork_child lambda!");
     }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 566c1ed63..0d85275bc 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -134,7 +134,7 @@ bool set_child_group(job_t *j, pid_t child_pid) {
     return true;
 }
 
-int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup2s) {
+int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &dup2s) {
     // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
         int err = act.target < 0 ? close(act.src) : dup2(act.src, act.target);
@@ -146,7 +146,7 @@ int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup
             return err;
         }
     }
-    if (job != nullptr && job->wants_terminal() && job->is_foreground()) {
+    if (new_termowner != INVALID_PID) {
         // Assign the terminal within the child to avoid the well-known race between tcsetgrp() in
         // the parent and the child executing. We are not interested in error handling here, except
         // we try to avoid this for non-terminals; in particular pipelines often make non-terminal
@@ -155,7 +155,7 @@ int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup
             // Ensure this doesn't send us to the background (see #5963)
             signal(SIGTTIN, SIG_IGN);
             signal(SIGTTOU, SIG_IGN);
-            (void)tcsetpgrp(STDIN_FILENO, job->pgid);
+            (void)tcsetpgrp(STDIN_FILENO, new_termowner);
         }
     }
     // Set the handling for job control signals back to the default.
diff --git a/src/postfork.h b/src/postfork.h
index 997c5f07b..3085fe0ef 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -27,9 +27,11 @@ bool child_set_group(job_t *j, process_t *p);     // called by child
 /// inside the exec function, which blocks all signals), and all IO redirections and other file
 /// descriptor actions are performed.
 ///
+/// Assign the terminal to new_termowner unless it is INVALID_PID.
+///
 /// \return 0 on sucess, -1 on failiure. When this function returns, signals are always unblocked.
-/// On failiure, signal handlers, io redirections and process group of the process is undefined.
-int child_setup_process(const job_t *job, bool is_forked, const dup2_list_t &dup2s);
+/// On failure, signal handlers, io redirections and process group of the process is undefined.
+int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &dup2s);
 
 /// Call fork(), optionally waiting until we are no longer multithreaded. If the forked child
 /// doesn't do anything that could allocate memory, take a lock, etc. (like call exec), then it's

From bc0329f77588988d2a852f6ccbe9c154349cc303 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 6 Jul 2019 12:19:34 -0700
Subject: [PATCH 0792/1732] Add wcstolower

Converts a string to lowercase. Eliminates some loops that did this
explicitly.
---
 src/builtin_string.cpp | 10 ++--------
 src/fish_tests.cpp     | 13 ++-----------
 src/history.cpp        |  5 +----
 src/wcstringutil.cpp   |  8 ++++++++
 src/wcstringutil.h     |  3 +++
 5 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index ed07be5dc..0523ebe2d 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -625,9 +625,7 @@ class wildcard_matcher_t : public string_matcher_t {
                        io_streams_t &streams)
         : string_matcher_t(opts, streams), wcpattern(parse_util_unescape_wildcards(pattern)) {
         if (opts.ignore_case) {
-            for (size_t i = 0; i < wcpattern.length(); i++) {
-                wcpattern[i] = towlower(wcpattern[i]);
-            }
+            wcpattern = wcstolower(std::move(wcpattern));
         }
         if (opts.entire) {
             if (!wcpattern.empty()) {
@@ -648,11 +646,7 @@ class wildcard_matcher_t : public string_matcher_t {
         bool match;
 
         if (opts.ignore_case) {
-            wcstring s = arg;
-            for (size_t i = 0; i < s.length(); i++) {
-                s[i] = towlower(s[i]);
-            }
-            match = wildcard_match(s, wcpattern, false);
+            match = wildcard_match(wcstolower(arg), wcpattern, false);
         } else {
             match = wildcard_match(arg, wcpattern, false);
         }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e60b03e8f..564441c21 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3490,15 +3490,6 @@ static wcstring random_string() {
     return result;
 }
 
-// Helper to lowercase a string.
-static wcstring lower(const wcstring &s) {
-    wcstring result;
-    for (wchar_t c : s) {
-        result.push_back(towlower(c));
-    }
-    return result;
-}
-
 void history_tests_t::test_history() {
     history_search_t searcher;
     say(L"Testing history");
@@ -3531,7 +3522,7 @@ void history_tests_t::test_history() {
 
     // Items matching "alpha", case-insensitive.
     searcher = history_search_t(history, L"AlPhA", HISTORY_SEARCH_TYPE_CONTAINS, nocase);
-    set_expected([](const wcstring &s) { return lower(s).find(L"alpha") != wcstring::npos; });
+    set_expected([](const wcstring &s) { return wcstolower(s).find(L"alpha") != wcstring::npos; });
     test_history_matches(searcher, expected, __LINE__);
 
     // Items matching "et", case-sensitive.
@@ -3557,7 +3548,7 @@ void history_tests_t::test_history() {
 
     // Items exactly matching "alph", case-insensitive.
     searcher = history_search_t(history, L"alph", HISTORY_SEARCH_TYPE_EXACT, nocase);
-    set_expected([](const wcstring &s) { return lower(s) == L"alph"; });
+    set_expected([](const wcstring &s) { return wcstolower(s) == L"alph"; });
     test_history_matches(searcher, expected, __LINE__);
 
     // Test item removal case-sensitive.
diff --git a/src/history.cpp b/src/history.cpp
index 3c5e12287..ea1f7ae59 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -553,10 +553,7 @@ bool history_item_t::merge(const history_item_t &item) {
 history_item_t::history_item_t(const wcstring &str, time_t when, history_identifier_t ident)
     : creation_timestamp(when), identifier(ident) {
     contents = trim(str);
-    contents_lower.reserve(contents.size());
-    for (const auto &c : contents) {
-        contents_lower.push_back(towlower(c));
-    }
+    contents_lower = wcstolower(contents);
 }
 
 bool history_item_t::matches_search(const wcstring &term, enum history_search_type_t type,
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index d20e2c4e3..b0fac9809 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -4,6 +4,8 @@
 #include "common.h"
 #include "wcstringutil.h"
 
+#include <wctype.h>
+
 typedef wcstring::size_type size_type;
 
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
@@ -59,3 +61,9 @@ wcstring trim(const wcstring &input, const wchar_t *any_of) {
     wcstring result(input.begin() + begin_offset, end + 1);
     return result;
 }
+
+wcstring wcstolower(wcstring input) {
+    wcstring result = std::move(input);
+    std::transform(result.begin(), result.end(), result.begin(), towlower);
+    return result;
+}
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index 473b8f5f9..4fbfe0608 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -68,4 +68,7 @@ wcstring truncate(const wcstring &input, int max_len,
 wcstring trim(const wcstring &input);
 wcstring trim(const wcstring &input, const wchar_t *any_of);
 
+/// Converts a string to lowercase.
+wcstring wcstolower(wcstring input);
+
 #endif

From 0e4fe53718a2396c6ebf4c1d2858a4b18700ccac Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 6 Jul 2019 13:10:03 -0700
Subject: [PATCH 0793/1732] clang-format some files

---
 src/builtin_string.cpp | 50 +++++++++++++++++++++++++-----------------
 src/fish_tests.cpp     |  1 -
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 0523ebe2d..697b288ef 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -420,18 +420,27 @@ static wcstring construct_short_opts(options_t *opts) {  //!OCLINT(high npath co
 // Note that several long flags share the same short flag. That is okay. The caller is expected
 // to indicate that a max of one of the long flags sharing a short flag is valid.
 // Remember: adjust share/completions/string.fish when `string` options change
-static const struct woption long_options[] = {
-    {L"all", no_argument, NULL, 'a'},         {L"chars", required_argument, NULL, 'c'},
-    {L"count", required_argument, NULL, 'n'}, {L"entire", no_argument, NULL, 'e'},
-    {L"filter", no_argument, NULL, 'f'},      {L"ignore-case", no_argument, NULL, 'i'},
-    {L"index", no_argument, NULL, 'n'},       {L"invert", no_argument, NULL, 'v'},
-    {L"left", no_argument, NULL, 'l'},        {L"length", required_argument, NULL, 'l'},
-    {L"max", required_argument, NULL, 'm'},   {L"no-empty", no_argument, NULL, 'n'},
-    {L"no-newline", no_argument, NULL, 'N'},  {L"no-quoted", no_argument, NULL, 'n'},
-    {L"quiet", no_argument, NULL, 'q'},       {L"regex", no_argument, NULL, 'r'},
-    {L"right", no_argument, NULL, 'r'},       {L"start", required_argument, NULL, 's'},
-    {L"style", required_argument, NULL, 1},   {L"no-trim-newlines", no_argument, NULL, 'N'},
-    {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"all", no_argument, NULL, 'a'},
+                                              {L"chars", required_argument, NULL, 'c'},
+                                              {L"count", required_argument, NULL, 'n'},
+                                              {L"entire", no_argument, NULL, 'e'},
+                                              {L"filter", no_argument, NULL, 'f'},
+                                              {L"ignore-case", no_argument, NULL, 'i'},
+                                              {L"index", no_argument, NULL, 'n'},
+                                              {L"invert", no_argument, NULL, 'v'},
+                                              {L"left", no_argument, NULL, 'l'},
+                                              {L"length", required_argument, NULL, 'l'},
+                                              {L"max", required_argument, NULL, 'm'},
+                                              {L"no-empty", no_argument, NULL, 'n'},
+                                              {L"no-newline", no_argument, NULL, 'N'},
+                                              {L"no-quoted", no_argument, NULL, 'n'},
+                                              {L"quiet", no_argument, NULL, 'q'},
+                                              {L"regex", no_argument, NULL, 'r'},
+                                              {L"right", no_argument, NULL, 'r'},
+                                              {L"start", required_argument, NULL, 's'},
+                                              {L"style", required_argument, NULL, 1},
+                                              {L"no-trim-newlines", no_argument, NULL, 'N'},
+                                              {NULL, 0, NULL, 0}};
 
 static const std::unordered_map<char, decltype(*handle_flag_N)> flag_to_function = {
     {'N', handle_flag_N}, {'a', handle_flag_a}, {'c', handle_flag_c}, {'e', handle_flag_e},
@@ -1138,7 +1147,7 @@ static int string_collect(parser_t &parser, io_streams_t &streams, int argc, wch
     while (const wcstring *arg = aiter.nextstr()) {
         auto begin = arg->cbegin(), end = arg->cend();
         if (!opts.no_trim_newlines) {
-            while (end > begin && *(end-1) == L'\n') {
+            while (end > begin && *(end - 1) == L'\n') {
                 --end;
             }
         }
@@ -1324,13 +1333,14 @@ static const struct string_subcommand {
                    wchar_t **argv);                       //!OCLINT(unused param)
 }
 
-string_subcommands[] = {
-    {L"escape", &string_escape}, {L"join", &string_join},         {L"join0", &string_join0},
-    {L"length", &string_length}, {L"match", &string_match},       {L"replace", &string_replace},
-    {L"split", &string_split},   {L"split0", &string_split0},     {L"sub", &string_sub},
-    {L"trim", &string_trim},     {L"lower", &string_lower},       {L"upper", &string_upper},
-    {L"repeat", &string_repeat}, {L"unescape", &string_unescape}, {L"collect", &string_collect},
-    {NULL, NULL}};
+string_subcommands[] = {{L"escape", &string_escape},   {L"join", &string_join},
+                        {L"join0", &string_join0},     {L"length", &string_length},
+                        {L"match", &string_match},     {L"replace", &string_replace},
+                        {L"split", &string_split},     {L"split0", &string_split0},
+                        {L"sub", &string_sub},         {L"trim", &string_trim},
+                        {L"lower", &string_lower},     {L"upper", &string_upper},
+                        {L"repeat", &string_repeat},   {L"unescape", &string_unescape},
+                        {L"collect", &string_collect}, {NULL, NULL}};
 
 /// The string builtin, for manipulating strings.
 int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 564441c21..019e6f11c 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2555,7 +2555,6 @@ struct autoload_tester_t {
 
         run(L"rm -Rf %ls", p1.c_str());
         run(L"rm -Rf %ls", p2.c_str());
-
     }
 };
 

From 42f38bb806e2f278cf28b36412e1ff5d8ae91f65 Mon Sep 17 00:00:00 2001
From: tomKPZ <tomKPZ@gmail.com>
Date: Sat, 6 Jul 2019 21:28:48 -0700
Subject: [PATCH 0794/1732] Fix status code coloring for nim prompt

---
 share/tools/web_config/sample_prompts/nim.fish | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/nim.fish b/share/tools/web_config/sample_prompts/nim.fish
index a6a886580..95aaab56e 100644
--- a/share/tools/web_config/sample_prompts/nim.fish
+++ b/share/tools/web_config/sample_prompts/nim.fish
@@ -24,6 +24,9 @@ function fish_prompt
     # │ 1	15048	0%	arrêtée	sleep 100000
     # ╰─>$ echo there
 
+    set -l retc red
+    test $status = 0; and set retc green
+
     set -q __fish_git_prompt_showupstream
     or set -g __fish_git_prompt_showupstream auto
 
@@ -45,8 +48,6 @@ function fish_prompt
         set_color -o green
         echo -n ']'
     end
-    and set retc green
-    or set retc red
 
     set_color $retc
     echo -n '┬─'

From 9d47c46a7a6950331b4adf31bdfc488d0f625361 Mon Sep 17 00:00:00 2001
From: Peter Lithammer <peter.lithammer@gmail.com>
Date: Mon, 8 Jul 2019 21:52:24 +0200
Subject: [PATCH 0795/1732] Suppress shell function lookup for ssh during scp
 completion

This prevents functions or aliases to run during tab completion of
remote files for the `scp` command.
---
 share/completions/scp.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index 75548ff54..feae1a8c6 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -54,7 +54,7 @@ complete -c scp -d "Local Path" -n "not string match @ -- (commandline -ct)"
 # Get the list of remote files from the scp target.
 complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -eq ':'" -a "
 (__scp_remote_target):( \
-        ssh (__scp2ssh_port_number) -o 'BatchMode yes' (__scp_remote_target) /bin/ls\ -dp\ (__scp_remote_path_prefix)\* 2>/dev/null
+        command ssh (__scp2ssh_port_number) -o 'BatchMode yes' (__scp_remote_target) /bin/ls\ -dp\ (__scp_remote_path_prefix)\* 2>/dev/null
 )
 "
 complete -c scp -s B -d "Batch mode"

From cdcea0f00dfc286f8397eac8018ba526bd0f01a5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 9 Jul 2019 10:02:50 -0700
Subject: [PATCH 0796/1732] Port setenv tests to littlecheck

---
 tests/{setenv.in => checks/setenv.fish} | 8 ++++++++
 tests/setenv.err                        | 2 --
 tests/setenv.out                        | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename tests/{setenv.in => checks/setenv.fish} (79%)
 delete mode 100644 tests/setenv.err
 delete mode 100644 tests/setenv.out

diff --git a/tests/setenv.in b/tests/checks/setenv.fish
similarity index 79%
rename from tests/setenv.in
rename to tests/checks/setenv.fish
index 603900780..f65fa74c1 100644
--- a/tests/setenv.in
+++ b/tests/checks/setenv.fish
@@ -1,3 +1,5 @@
+# RUN: %fish %s
+
 # Verify the correct behavior of the `setenv` compatibility shim.
 
 # No args to `setenv` should emit the current set of env vars. The first two
@@ -6,15 +8,21 @@ set -g setenv1 abc
 setenv | grep '^setenv1=$'
 set -gx setenv1 xyz
 setenv | grep '^setenv1=xyz$'
+# CHECK: setenv1=xyz
 
 # A single arg should set and export the named var to nothing.
 setenv setenv2
 env | grep '^setenv2=$'
+# CHECK: setenv2=
 
 # Three or more args should be an error.
 echo too many arguments test >&2
 setenv var hello you
+# CHECKERR: too many arguments test
+# CHECKERR: setenv: Too many arguments
+
 
 # Two args should set the named var to the second arg
 setenv setenv3 'hello you'
 setenv | grep '^setenv3=hello you'
+# CHECK: setenv3=hello you
diff --git a/tests/setenv.err b/tests/setenv.err
deleted file mode 100644
index 53fe47f07..000000000
--- a/tests/setenv.err
+++ /dev/null
@@ -1,2 +0,0 @@
-too many arguments test
-setenv: Too many arguments
diff --git a/tests/setenv.out b/tests/setenv.out
deleted file mode 100644
index 251debd14..000000000
--- a/tests/setenv.out
+++ /dev/null
@@ -1,3 +0,0 @@
-setenv1=xyz
-setenv2=
-setenv3=hello you

From 7ee675afcf486609caf03018b54d1ccd20efec07 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 11 Jul 2019 21:22:25 -0500
Subject: [PATCH 0797/1732] Update `aws` and `aws s3` completions

Improve handling of switches interjected between the commands, and
support for completing buckets automatically for secondary+ parameters
to `aws s3`.
---
 share/completions/aws.fish | 75 +++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 6 deletions(-)

diff --git a/share/completions/aws.fish b/share/completions/aws.fish
index f307a0a92..5bee05b19 100644
--- a/share/completions/aws.fish
+++ b/share/completions/aws.fish
@@ -3,12 +3,16 @@
 # (and are the primary reason this file exists). The automatically generated completions
 # for `aws` via `fish_update_completions` are pretty useless due to non-standard formatting.
 
+function __s3_is_maybe_bucket
+    commandline -ct | string match -qr -- '^(|s|s3|s3:?/?/?[^/]*)$'
+end
+
 function __s3_is_bucket
-    commandline -ct | string match -q -r -- '^s3://[^/]?$'
+    commandline -ct | string match -q -r -- '^s3:/?/?[^/]*$'
 end
 
 function __s3_is_remote_path
-    commandline -ct | string match -q -r -- "^s3://.*/.*"
+    commandline -ct | string match -q -r -- "^s3://.+/.*"
 end
 
 function __s3_ls_buckets
@@ -20,12 +24,71 @@ function __s3_ls_dir
     printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
 end
 
-# S3 remote completions
+# Determines whether the first non-switch argument to `aws s3` was in $argv
+# This accounts for things like `aws --debug s3 foo ... s3://...`
+function __s3_cmd_in
+    set -l is_s3 0
+    set -l tokens (commandline -co)
+    for token in $tokens[2..-1]
+        # Ignore switches everywhere
+        if string match -qr -- "^--" $token
+            continue
+        end
+
+        # Check if `aws` command is `s3`
+        if test $is_s3 -eq 0
+            if string match -q -- "s3" $token
+                set is_s3 1
+                continue
+            else
+                return 1
+            end
+        end
+
+        # Check if `aws s3` sub-sub-command is in $argv
+        if contains $token $argv
+            return 0
+        else
+            return 1
+        end
+    end
+
+    return 1
+end
+
+# Determines whether the first non-switch argument to `aws` was in $argv
+function __aws_cmd_in
+    set -l tokens (commandline -co)
+    for token in $tokens[2..-1]
+        if string match -qr "^--" -- $token
+            # Ignore switches everywhere
+            continue
+        else if contains $token $argv
+            return 0
+        else
+            return 1
+        end
+    end
+
+    return 1
+end
+
+# S3 completions
 complete -c 'aws' -n "__fish_prev_arg_in s3" -xa "cp mv rm help sync ls mb mv presign rb website"
+
+# When completing a remote path, complete the bucket name first, then based off
+# the bucket name, we can complete the path itself.
+
+# Commands that take only remote parameters (cannot operate on local files).
+complete -c 'aws' -n "__s3_is_maybe_bucket && __s3_cmd_in ls rb rm" -xa "(__s3_ls_buckets)"
+# Commands that can operate on local or remote files. To prevent the shell
+# locking up unnecessarily, only complete if no argument was specified or if the
+# argument being specified could be an S3 path.
+complete -c 'aws' -n "__s3_is_maybe_bucket && __s3_cmd_in mv cp presign mb sync" -a "(__s3_ls_buckets)"
+
+# Complete the paths themselves
 complete -c 'aws' -n "__s3_is_remote_path" -xa "(__s3_ls_dir)"
 complete -c 'aws' -n "__s3_is_bucket" -xa "(__s3_ls_buckets)"
-complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in ls" -xa "(__s3_ls_buckets)"
-complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in mv cp rm" -a "(__s3_ls_buckets)"
 
 # This list is extracted from the output of `aws help`, which can't be ingested directly,
 # as it emits considerable ANSI output and other terminal control characters.
@@ -207,4 +270,4 @@ set -l aws_services \
     workspaces \
     xray
 
-complete -c aws -n '__fish_is_first_arg' -xa "$aws_services"
+complete -c aws -n '__fish_is_first_token' -xa "$aws_services"

From d577eb4aaa3d25bb46984287e352ecffb7ac6fe7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 12 Jul 2019 12:19:00 -0700
Subject: [PATCH 0798/1732] Only use the global fish_complete_path and
 fish_function_path

Prior to this fix, fish would attempt to react if a local fish_complete_path
or fish_function_path were set. However this has never been very well tested
and will become impossible with concurrent execution. Always use the global
values.
---
 CHANGELOG.md     | 1 +
 src/complete.cpp | 5 +++--
 src/function.cpp | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46f101de8..06aca0e4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
 - `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
 - More of the documentation, including the tutorial, is now available as man pages as well.
+- Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/complete.cpp b/src/complete.cpp
index e106d5245..e875976e0 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -873,8 +873,9 @@ static void complete_load(const wcstring &name) {
     // It's important to NOT hold the lock around completion loading.
     // We need to take the lock to decide what to load, drop it to perform the load, then reacquire
     // it.
-    const environment_t &vars = parser_t::principal_parser().vars();
-    maybe_t<wcstring> path_to_load = completion_autoloader.acquire()->resolve_command(name, vars);
+    // Note we only look at the global fish_function_path and fish_completion_path.
+    maybe_t<wcstring> path_to_load =
+        completion_autoloader.acquire()->resolve_command(name, env_stack_t::globals());
     if (path_to_load) {
         autoload_t::perform_autoload(*path_to_load, parser);
         completion_autoloader.acquire()->mark_autoload_finished(name);
diff --git a/src/function.cpp b/src/function.cpp
index a5f608548..60bb58e1f 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -104,7 +104,7 @@ static void try_autoload(const wcstring &name, parser_t &parser) {
     {
         auto funcset = function_set.acquire();
         if (funcset->allow_autoload(name)) {
-            path_to_autoload = funcset->autoloader.resolve_command(name, parser.vars());
+            path_to_autoload = funcset->autoloader.resolve_command(name, env_stack_t::globals());
         }
     }
 

From 8181883111f17aa053b1668efcd9f1b1aa1dd1eb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 12 Jul 2019 13:31:56 -0700
Subject: [PATCH 0799/1732] Minor refactoring of logic around when a job wants
 to claim the terminal

Introduce should_claim_terminal() which encapsulates an && exprsesion which
was previously repeated a lot.
---
 src/exec.cpp | 5 ++---
 src/proc.cpp | 4 ++--
 src/proc.h   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index dc6ce6089..110856ff1 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -281,7 +281,7 @@ static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job) {
     if (job->wants_job_control()) {  //!OCLINT(collapsible if statements)
         // We are going to use job control; therefore when we launch this job it will get its own
         // process group ID. But will it be foregrounded?
-        if (job->wants_terminal() && job->is_foreground()) {
+        if (job->should_claim_terminal()) {
             // It will be foregrounded, so we will call tcsetpgrp(), therefore do not use
             // posix_spawn.
             return false;
@@ -446,8 +446,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
         maybe_t<pid_t> new_termowner{};
         p->pid = getpid();
         child_set_group(job.get(), p);
-        child_setup_process(job->wants_terminal() && job->is_foreground() ? job->pgid : INVALID_PID,
-                            true, dup2s);
+        child_setup_process(job->should_claim_terminal() ? job->pgid : INVALID_PID, true, dup2s);
         child_action();
         DIE("Child process returned control to fork_child lambda!");
     }
diff --git a/src/proc.cpp b/src/proc.cpp
index 2c780abc3..d945bac0d 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -681,8 +681,8 @@ void proc_update_jiffies(parser_t &parser) {
 int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
     enum { notneeded = 0, success = 1, error = -1 };
 
-    if (!j->wants_terminal() || !j->is_foreground()) {
-        // We don't want the job.
+    if (!j->should_claim_terminal()) {
+        // The job doesn't want the terminal.
         return notneeded;
     }
 
diff --git a/src/proc.h b/src/proc.h
index 2133fe160..934d7b48e 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -397,8 +397,8 @@ class job_t {
     /// \return if we want job control.
     bool wants_job_control() const { return get_flag(job_flag_t::JOB_CONTROL); }
 
-    /// \return if this job wants to own the terminal in the foreground.
-    bool wants_terminal() const { return properties.wants_terminal; }
+    /// \return if this job should own the terminal when it runs.
+    bool should_claim_terminal() const { return properties.wants_terminal && is_foreground(); }
 
     /// Returns the block IO redirections associated with the job. These are things like the IO
     /// redirections associated with the begin...end statement.

From 57508b46d2ddc994e8a9fe9f17df9956155f7ba1 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Jul 2019 22:33:55 -0500
Subject: [PATCH 0800/1732] [docs] Fix build warning plus the rendering of the
 escaped space

Use a `:code:` role for the escaped space, it avoids the nastiness of
the whitespace mangling in inline literals.
---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 63831cd16..8c50bbf68 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -299,7 +299,7 @@ Some characters can not be written directly on the command line. For these chara
 - ``\r`` represents the carriage return character
 - ``\t`` represents the tab character
 - ``\v`` represents the vertical tab character
-- ``\\ `` escapes the space character
+- :code:`\ `  escapes the space character
 - ``\$`` escapes the dollar character
 - ``\\`` escapes the backslash character
 - ``\*`` escapes the star character

From 90882ca9eeddcf740be2ec99e70e65eb9f2d1a4f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sat, 13 Jul 2019 22:47:04 -0500
Subject: [PATCH 0801/1732] [docs] Clarify behavior of `--no-scope-shadowing`
 and variable lifetimes

---
 sphinx_doc_src/cmds/function.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index 2cf00e57c..8259a65ba 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -38,6 +38,7 @@ The following options are available:
 - ``-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).
 
 - ``-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 is 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.
 
 - ``-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.
 

From 47e9e8ab8ab7bbe8855cc3b7dda926bd84922beb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 15 Jul 2019 17:31:35 +0200
Subject: [PATCH 0802/1732] fish_vcs_prompt: Stop at first success

Closes #5980.
---
 share/functions/fish_vcs_prompt.fish | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_vcs_prompt.fish b/share/functions/fish_vcs_prompt.fish
index 6d94e6e06..5c1ca3d43 100644
--- a/share/functions/fish_vcs_prompt.fish
+++ b/share/functions/fish_vcs_prompt.fish
@@ -1,5 +1,7 @@
 function fish_vcs_prompt --description "Print the prompts for all available vcsen"
+    # 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
-    fish_hg_prompt
-    fish_svn_prompt
+    or fish_hg_prompt
+    or fish_svn_prompt
 end

From 2dcaf4f5c05859033bf43973173857d79f7e50cf Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Sun, 14 Jul 2019 09:33:20 -0700
Subject: [PATCH 0803/1732] Emit 'fish_cancel' at end of
 __fish_cancel_commandline.

This helps with shell integration - see issue #5973
"shell-integration - how distringuish winch repaint from ctrl-c cancel".
---
 share/functions/__fish_cancel_commandline.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/functions/__fish_cancel_commandline.fish b/share/functions/__fish_cancel_commandline.fish
index f2708a637..f3bd68513 100644
--- a/share/functions/__fish_cancel_commandline.fish
+++ b/share/functions/__fish_cancel_commandline.fish
@@ -20,5 +20,6 @@ function __fish_cancel_commandline
         end
         commandline ""
         commandline -f repaint
+        emit fish_cancel
     end
 end

From 56e122866cfa12e48d590aecc003fc79710a4104 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 15 Jul 2019 17:46:41 +0200
Subject: [PATCH 0804/1732] fish_svn_prompt: Shorten a return

---
 share/functions/fish_svn_prompt.fish | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/share/functions/fish_svn_prompt.fish b/share/functions/fish_svn_prompt.fish
index bfef4661a..58690a8f0 100644
--- a/share/functions/fish_svn_prompt.fish
+++ b/share/functions/fish_svn_prompt.fish
@@ -97,10 +97,7 @@ function fish_svn_prompt --description "Prompt function for svn"
 
     # make sure that this is a svn repo
     set -l checkout_info (command svn info 2>/dev/null)
-    if [ $status -ne 0 ]
-
-        return
-    end
+    or return
 
     # get the current revision number
     printf '(%s%s%s' (set_color $__fish_svn_prompt_color_revision) (__fish_print_svn_rev) (set_color normal)

From 33dbd982007210a4cc4c011cbb63a5d147bebb5d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 15 Jul 2019 17:47:41 +0200
Subject: [PATCH 0805/1732] Remove x-bit from function

---
 share/functions/__fish_complete_ant_targets.fish | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 share/functions/__fish_complete_ant_targets.fish

diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
old mode 100755
new mode 100644

From ef403129e4a9f2d65b2ddc66b8a4c17b00579106 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 15 Jul 2019 21:04:23 +0200
Subject: [PATCH 0806/1732] fish_vi_key_bindings: Remove duplicate \cc binding

Already done in the shared bindings.

[ci skip]
---
 share/functions/fish_vi_key_bindings.fish | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index c829e8644..4a7366ed8 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -57,9 +57,6 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # Space expands abbrs _and_ inserts itself.
     bind -s --preset -M insert " " 'commandline -i " "; commandline -f expand-abbr'
 
-
-    # Add way to kill current command line while in insert mode.
-    bind -s --preset -M insert \cc __fish_cancel_commandline
     # Add a way to switch from insert to normal (command) mode.
     # Note if we are paging, we want to stay in insert mode
     # See #2871

From 8ec568d21f80f212173a1e1547abb3d1ca7c43c8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 15 Jul 2019 17:56:06 -0700
Subject: [PATCH 0807/1732] Add some tests to path_apply_working_directory

---
 src/fish_tests.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 019e6f11c..0d531aad1 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1951,6 +1951,13 @@ static void test_path() {
         err(L"Bug in canonical PATH code on line %ld", (long)__LINE__);
     if (!paths_are_equivalent(L"/", L"/"))
         err(L"Bug in canonical PATH code on line %ld", (long)__LINE__);
+
+    do_test(path_apply_working_directory(L"abc", L"/def/") == L"/def/abc");
+    do_test(path_apply_working_directory(L"abc/", L"/def/") == L"/def/abc/");
+    do_test(path_apply_working_directory(L"/abc/", L"/def/") == L"/abc/");
+    do_test(path_apply_working_directory(L"/abc", L"/def/") == L"/abc");
+    do_test(path_apply_working_directory(L"", L"/def/") == L"");
+    do_test(path_apply_working_directory(L"abc", L"") == L"abc");
 }
 
 static void test_pager_navigation() {

From 6ca56fe0cb043fe8468199cfe66494c05d89c4b1 Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Tue, 16 Jul 2019 23:40:15 -0700
Subject: [PATCH 0808/1732] tmutil.fish: Add completions for local-snapshots
 subcommands (#5995)

* tmutil.fish: Add local-snapshot subcommands

* tmutil.fish: Add completion for thinlocalsnapshots

* tmutil.fish: Run fish_indent

* tmutil.fish: Remove duplicate destinationinfo
---
 share/completions/tmutil.fish | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/completions/tmutil.fish b/share/completions/tmutil.fish
index 5d4bcb64c..37cfd350e 100644
--- a/share/completions/tmutil.fish
+++ b/share/completions/tmutil.fish
@@ -23,6 +23,7 @@ complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s E -d 'Dont tak
 complete -r -c tmutil -n '__fish_seen_subcommand_from compare' -s I -d 'Ignore path'
 complete -f -c tmutil -n '__fish_seen_subcommand_from compare' -s U -d 'Ignore logical volume identity'
 complete -r -c tmutil -n '__fish_use_subcommand' -a delete -d 'Delete one or more snapshots'
+complete -r -c tmutil -n '__fish_use_subcommand' -a deletelocalsnapshots -d 'Delete all local Time Machine snapshots for the specified date (formatted YYYY-MM-DD-HHMMSS)'
 complete -f -c tmutil -n '__fish_use_subcommand' -a destinationinfo -d 'Print information about destinations'
 complete -f -c tmutil -n '__fish_use_subcommand' -a disable -d 'Turn off automatic backups'
 complete -f -c tmutil -n '__fish_use_subcommand' -a disablelocal -d 'Turn off local Time Machine snapshots'
@@ -31,7 +32,10 @@ complete -f -c tmutil -n '__fish_use_subcommand' -a enablelocal -d 'Turn on loca
 complete -r -c tmutil -n '__fish_use_subcommand' -a inheritbackup -d 'Claim a machine directory or sparsebundle for use by the current machine'
 complete -f -c tmutil -n '__fish_use_subcommand' -a isexcluded -d 'Determine if a file, directory, or volume are excluded from backups'
 complete -f -c tmutil -n '__fish_use_subcommand' -a latestbackup -d 'Print the path to the latest snapshot'
+complete -c tmutil -n '__fish_use_subcommand' -a listlocalsnapshotdates -d 'List the creation dates of all local Time Machine snapshots'
+complete -r -c tmutil -n '__fish_use_subcommand' -a listlocalsnapshots -d 'List local Time Machine snapshots of the specified volume'
 complete -f -c tmutil -n '__fish_use_subcommand' -a listbackups -d 'Print paths for all snapshots'
+complete -f -c tmutil -n '__fish_use_subcommand' -a localsnapshot -d 'Create new local Time Machine snapshots of all APFS volumes included in TM backup'
 complete -f -c tmutil -n '__fish_use_subcommand' -a machinedirectory -d 'Print the path to the current machine directory'
 complete -f -c tmutil -n '__fish_use_subcommand' -a removedestination -d 'Removes a backup destination'
 complete -f -c tmutil -n '__fish_use_subcommand' -a removeexclusion -d 'Remove an exclusion'
@@ -49,6 +53,7 @@ complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s b -l block
 complete -f -c tmutil -n '__fish_seen_subcommand_from startbackup' -s r -l rotation -d 'Automatic rotation'
 complete -r -c tmutil -n '__fish_seen_subcommand_from startbackup' -s d -l destination -d 'Backup destination'
 complete -f -c tmutil -n '__fish_use_subcommand' -a stopbackup -d 'Cancel a backup currently in progress'
+complete -r -c tmutil -n '__fish_use_subcommand' -a thinlocalsnapshots -d 'Thin local Time Machine snapshots for the specified volume'
 complete -r -c tmutil -n '__fish_use_subcommand' -a uniquesize -d 'Analyze the specified path and determine its unique size'
 complete -r -c tmutil -n '__fish_use_subcommand' -a verifychecksums -d 'Verify snapshot'
 complete -f -c tmutil -n '__fish_use_subcommand' -a version -d 'Print version'

From 2f86c3d4470a36ff1ec457b04e006683904c592a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 19 Jul 2019 15:29:56 +0200
Subject: [PATCH 0809/1732] docs: Mention unicode for fish_emoji_width

[ci skip]
---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 8c50bbf68..5b3dd5da8 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1219,9 +1219,9 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - A large number of variable starting with the prefixes ``fish_color`` and ``fish_pager_color``. See `Variables for changing highlighting colors <#variables-color>`__ for more information.
 
-- ``fish_emoji_width`` controls the computed width of certain characters, in particular emoji, whose rendered width varies across terminal emulators. This should be set to 1 if your terminal emulator renders emoji single-width, or 2 if double-width. Set this only if you see graphical glitching when printing emoji.
+- ``fish_emoji_width`` controls the computed width of certain characters, in particular emoji, whose rendered width changed in Unicode 9 and hence varies across terminal emulators. This should be set to 2 if your terminal emulator supports Unicode >= 9 and renders them double-width, and 1 otherwise. Set this only if you see graphical glitching when printing emoji, typically it will be automatically detected.
 
-- ``fish_ambiguous_width`` controls the computed width of ambiguous East Asian characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
+- ``fish_ambiguous_width`` controls the computed width of ambiguous-width characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
 
 - ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/bind.html#special-case-the-escape-character>`__ builtin command. This delay facilitates using escape as a meta key.
 

From 9e6ae1cbefdedf0b799c1f5abb51dc45e9977dcb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 20 Jul 2019 14:25:45 +0200
Subject: [PATCH 0810/1732] completions/git: Fix error with `git config`

This passed "--get" when it should have been "get".

Fixes #6000.

[ci skip]
---
 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 d43a09a7a..b78675332 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1695,7 +1695,7 @@ complete -f -c git -n '__fish_git_using_command config' -s z -l null -d 'Termina
 complete -f -c git -n '__fish_git_using_command config' -l name-only -d 'Show variable names only'
 complete -f -c git -n '__fish_git_using_command config' -l includes -d 'Respect include directives'
 complete -f -c git -n '__fish_git_using_command config' -l show-origin -d 'Show origin of configuration'
-complete -f -c git -n '__fish_git_using_command config; and __fish_seen_argument --get' -l default -d 'Use default value when missing entry'
+complete -f -c git -n '__fish_git_using_command config; and __fish_seen_argument get' -l default -d 'Use default value when missing entry'
 
 complete -c git -n '__fish_prev_arg_in bisect' -xa "help start bad good new old terms skip next reset visualize view replay log run"
 complete -c git -n '__fish_git_using_command bisect; and __fish_seen_argument --' -xa "(__fish_complete_suffix)"

From 1f854ec284c52978028ce8b07d1d34275a33a623 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 15 Jul 2019 18:03:50 -0700
Subject: [PATCH 0811/1732] Accept a pwd in resolve_file_redirections_to_fds

Conceptually allow multiple of these to run in parallel
---
 src/exec.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 110856ff1..dd10c5ec3 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -38,6 +38,7 @@
 #include "iothread.h"
 #include "parse_tree.h"
 #include "parser.h"
+#include "path.h"
 #include "postfork.h"
 #include "proc.h"
 #include "reader.h"
@@ -192,7 +193,8 @@ static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get(
 /// position.
 ///
 /// \return true on success, false on failure. Returns the output chain and opened_fds by reference.
-static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chain_t *out_chain,
+static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const wcstring &pwd,
+                                             io_chain_t *out_chain,
                                              std::vector<autoclose_fd_t> *out_opened_fds) {
     ASSERT_IS_MAIN_THREAD();
     assert(out_chain != NULL && out_opened_fds != NULL);
@@ -223,7 +225,8 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, io_chai
             case io_mode_t::file: {
                 // We have a path-based redireciton. Resolve it to a file.
                 io_file_t *in_file = static_cast<io_file_t *>(in.get());
-                int fd = wopen(in_file->filename, in_file->flags, OPEN_MASK);
+                int fd = wopen(path_apply_working_directory(in_file->filename, pwd), in_file->flags,
+                               OPEN_MASK);
                 if (fd < 0) {
                     debug(1, FILE_ERROR, in_file->filename.c_str());
                     wperror(L"open");
@@ -261,7 +264,8 @@ void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, t
 
     io_chain_t morphed_chain;
     std::vector<autoclose_fd_t> opened_fds;
-    if (!resolve_file_redirections_to_fds(ios, &morphed_chain, &opened_fds)) {
+    if (!resolve_file_redirections_to_fds(ios, parser.vars().get_pwd_slash(), &morphed_chain,
+                                          &opened_fds)) {
         parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
         return;
     }

From 97c47944242904b81b72322cf3c3595091eb03f9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 21 Jul 2019 11:21:50 -0700
Subject: [PATCH 0812/1732] Properly mark tests_dir as a dependency of
 test_prep

Allows for running a subset of tests immediately after build system config.
---
 cmake/Tests.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 90d18ce9a..6845a1204 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -62,7 +62,7 @@ ADD_CUSTOM_TARGET(test_prep
                   COMMAND ${CMAKE_COMMAND} -E remove_directory ${TEST_DIR}/temp
                   COMMAND ${CMAKE_COMMAND} -E make_directory
                           ${TEST_DIR}/data ${TEST_DIR}/home ${TEST_DIR}/temp
-                  DEPENDS tests_buildroot_target
+                  DEPENDS tests_buildroot_target tests_dir
                   USES_TERMINAL)
 
 # Define our individual tests.

From 07d1607e5848858567f7898af08eb19a1d5eb549 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 20 Jul 2019 20:17:10 -0700
Subject: [PATCH 0813/1732] Port tests/test3.in to littlecheck

This just tests 'set'
---
 tests/checks/set.fish | 441 ++++++++++++++++++++++++++++++++++++++++++
 tests/test3.in        |   3 +
 2 files changed, 444 insertions(+)
 create mode 100644 tests/checks/set.fish

diff --git a/tests/checks/set.fish b/tests/checks/set.fish
new file mode 100644
index 000000000..27ec702f1
--- /dev/null
+++ b/tests/checks/set.fish
@@ -0,0 +1,441 @@
+# RUN: env FISH=%fish %fish %s
+
+# Environment variable tests
+
+# Test if variables can be properly set
+
+set smurf blue
+
+if test $smurf = blue
+    echo Test 1 pass
+else
+    echo Test 1 fail
+end
+# CHECK: Test 1 pass
+
+# Test if variables can be erased
+
+set -e smurf
+if set -q smurf
+    echo Test 2 fail
+else
+    echo Test 2 pass
+end
+# CHECK: Test 2 pass
+
+# Test if local variables go out of scope
+
+set -e t3
+if true
+    set -l t3 bar
+end
+
+if set -q t3
+    echo Test 3 fail
+else
+    echo Test 3 pass
+end
+# CHECK: Test 3 pass
+
+# Test if globals can be set in block scope
+
+if true
+    set -g baz qux
+end
+
+if test $baz = qux
+    echo Test 4 pass
+else
+    echo Test 4 fail
+end
+# CHECK: Test 4 pass
+
+
+#Test that scope is preserved when setting a new value
+
+set t5 a
+
+if true
+    set t5 b
+end
+
+if test $t5 = b
+    echo Test 5 pass
+else
+    echo Test 5 fail
+end
+# CHECK: Test 5 pass
+
+# Test that scope is preserved in double blocks
+
+for i in 1
+    set t6 $i
+    for j in a
+        if test $t6$j = 1a
+            echo Test 6 pass
+        else
+            echo Test 6 fail
+        end
+    end
+end
+# CHECK: Test 6 pass
+
+
+# Test if variables in for loop blocks do not go out of scope on new laps
+
+set res fail
+
+set -e t7
+for i in 1 2
+    if test $i = 1
+        set t7 lala
+    else
+        if test $t7
+            set res pass
+        end
+    end
+end
+
+echo Test 7 $res
+# CHECK: Test 7 pass
+
+# Test if variables are properly exported
+
+set -e t8
+if true
+    set -lx t8 foo
+    if test ($FISH -c "echo $t8") = foo
+        echo Test 8 pass
+    else
+        echo Test 8 fail
+    end
+end
+# CHECK: Test 8 pass
+
+# Test if exported variables go out of scope
+
+if $FISH -c "set -q t8; and exit 0; or exit 1"
+    echo Test 9 fail
+else
+    echo Test 9 pass
+end
+# CHECK: Test 9 pass
+
+# Test erasing variables in specific scope
+
+set -eU __fish_test_universal_variables_variable_foo
+set -g __fish_test_universal_variables_variable_foo bar
+begin
+    set -l __fish_test_universal_variables_variable_foo baz
+    set -eg __fish_test_universal_variables_variable_foo
+end
+
+if set -q __fish_test_universal_variables_variable_foo
+    echo Test 10 fail
+else
+    echo Test 10 pass
+end
+# CHECK: Test 10 pass
+
+set __fish_test_universal_variables_variable_foo abc def
+set -e __fish_test_universal_variables_variable_foo[1]
+if test $__fish_test_universal_variables_variable_foo '=' def
+    echo Test 11 pass
+else
+    echo Test 11 fail
+end
+# CHECK: Test 11 pass
+
+# Test combinations of export and scope
+
+set -ge __fish_test_universal_variables_variable_foo
+set -Ue __fish_test_universal_variables_variable_foo
+set -Ux __fish_test_universal_variables_variable_foo bar
+set __fish_test_universal_variables_variable_foo baz
+if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = baz -a ($FISH -c 'echo $__fish_test_universal_variables_variable_foo') = baz
+    echo Test 12 pass
+else
+    echo Test 12 fail
+end
+# CHECK: Test 12 pass
+
+set -Ue __fish_test_universal_variables_variable_foo
+
+# Should no longer be in environment (#2046)
+env | string match '__fish_test_universal_variables_variable_foo=*'
+
+set -Ux __fish_test_universal_variables_variable_foo bar
+set -U __fish_test_universal_variables_variable_foo baz
+if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = baz -a ($FISH -c 'echo $__fish_test_universal_variables_variable_foo') = baz
+    echo Test 13 pass
+else
+    echo Test 13 fail
+end
+# CHECK: Test 13 pass
+
+set -Ux __fish_test_universal_variables_variable_foo bar
+set -u __fish_test_universal_variables_variable_foo bar
+if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = '' -a ($FISH -c 'echo $__fish_test_universal_variables_variable_foo') = bar
+    echo Test 14 pass
+else
+    echo Test 14 fail
+end
+# CHECK: Test 14 pass
+
+set -Ux __fish_test_universal_variables_variable_foo bar
+set -Uu __fish_test_universal_variables_variable_foo baz
+if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = '' -a ($FISH -c 'echo $__fish_test_universal_variables_variable_foo') = baz
+    echo Test 15 pass
+else
+    echo Test 15 fail
+end
+# CHECK: Test 15 pass
+
+set -eU __fish_test_universal_variables_variable_foo
+function watch_foo --on-variable __fish_test_universal_variables_variable_foo
+    echo Foo change detected
+end
+
+set -U __fish_test_universal_variables_variable_foo 1234
+# CHECK: Foo change detected
+set -eU __fish_test_universal_variables_variable_foo
+# CHECK: Foo change detected
+# WTF set -eg __fish_test_universal_variables_variable_foo
+
+functions -e watch_foo
+
+# test erasing variables without a specified scope
+
+set -g test16res
+set -U __fish_test_universal_variables_variable_foo universal
+set -g __fish_test_universal_variables_variable_foo global
+
+begin
+    set -l __fish_test_universal_variables_variable_foo blocklocal
+
+    function test16
+        set -l __fish_test_universal_variables_variable_foo function
+        begin
+            set -l __fish_test_universal_variables_variable_foo functionblock
+            set test16res $test16res $__fish_test_universal_variables_variable_foo
+
+            # This sequence seems pointless but it's really verifying that we
+            # succesfully expose higher scopes as we erase the closest scope.
+            set -e __fish_test_universal_variables_variable_foo
+            set test16res $test16res $__fish_test_universal_variables_variable_foo
+
+            set -e __fish_test_universal_variables_variable_foo
+            set test16res $test16res $__fish_test_universal_variables_variable_foo
+
+            set -e __fish_test_universal_variables_variable_foo
+            set test16res $test16res $__fish_test_universal_variables_variable_foo
+
+            set -e __fish_test_universal_variables_variable_foo
+            set -q __fish_test_universal_variables_variable_foo
+            and set test16res $test16res $__fish_test_universal_variables_variable_foo
+        end
+
+        set -q __fish_test_universal_variables_variable_foo
+        and echo __fish_test_universal_variables_variable_foo should set after test16 inner begin..end
+    end
+
+    test16
+    set test16res $test16res $__fish_test_universal_variables_variable_foo
+end
+# CHECK: count:5 content:[functionblock function global universal blocklocal]
+
+set -q __fish_test_universal_variables_variable_foo
+and echo __fish_test_universal_variables_variable_foo should set after test16 outer begin..end
+
+echo count:(count $test16res) "content:[$test16res]"
+if test (count $test16res) = 5 -a "$test16res" = "functionblock function global universal blocklocal"
+    echo Test 16 pass
+else
+    echo Test 16 fail
+end
+# CHECK: Test 16 pass
+
+# Test that shadowing with a non-exported variable works
+set -gx __fish_test_env17 UNSHADOWED
+env | string match '__fish_test_env17=*'
+# CHECK: __fish_test_env17=UNSHADOWED
+
+function __fish_test_shadow
+    set -l __fish_test_env17
+    env | string match -q '__fish_test_env17=*'; or echo SHADOWED
+end
+__fish_test_shadow
+# CHECK: SHADOWED
+
+# Test that the variable is still exported (#2611)
+env | string match '__fish_test_env17=*'
+# CHECK: __fish_test_env17=UNSHADOWED
+
+# Test that local exported variables are copied to functions (#1091)
+function __fish_test_local_export
+    echo $var
+    set var boo
+    echo $var
+end
+set -lx var wuwuwu
+__fish_test_local_export
+# CHECK: wuwuwu
+# CHECK: boo
+echo $var
+# CHECK: wuwuwu
+
+# Test that we don't copy local-exports to blocks.
+set -lx var foo
+begin
+    echo $var
+    # CHECK: foo
+    set var bar
+    echo $var
+    # CHECK: bar
+end
+echo $var # should be "bar"
+# CHECK: bar
+
+# clear for other shells
+set -eU __fish_test_universal_variables_variable_foo
+
+# Test behavior of universals on startup (#1526)
+echo Testing Universal Startup
+# CHECK: Testing Universal Startup
+set -U testu 0
+$FISH -c 'set -U testu 1'
+echo $testu
+# CHECK: 1
+$FISH -c 'set -q testu; and echo $testu'
+# CHECK: 1
+
+$FISH -c 'set -U testu 2'
+echo $testu
+# CHECK: 2
+$FISH -c 'set -q testu; and echo $testu'
+# CHECK: 2
+
+$FISH -c 'set -e testu'
+set -q testu
+or echo testu undef in top level shell
+# CHECK: testu undef in top level shell
+$FISH -c 'set -q testu; or echo testu undef in sub shell'
+# CHECK: testu undef in sub shell
+
+# test SHLVL
+# use a subshell to ensure a clean slate
+env SHLVL= $FISH -c 'echo SHLVL: $SHLVL; $FISH -c \'echo SHLVL: $SHLVL\''
+# CHECK: SHLVL: 1
+# CHECK: SHLVL: 2
+
+# exec should decrement SHLVL
+env SHLVL= $FISH -c 'echo SHLVL: $SHLVL; exec $FISH -c \'echo SHLVL: $SHLVL\''
+# CHECK: SHLVL: 1
+# CHECK: SHLVL: 1
+
+# garbage SHLVLs should be treated as garbage
+env SHLVL=3foo $FISH -c 'echo SHLVL: $SHLVL'
+# CHECK: SHLVL: 1
+
+# whitespace is allowed though (for bash compatibility)
+env SHLVL="3  " $FISH -c 'echo SHLVL: $SHLVL'
+env SHLVL="  3" $FISH -c 'echo SHLVL: $SHLVL'
+# CHECK: SHLVL: 4
+# CHECK: SHLVL: 4
+
+# Test transformation of inherited variables
+env DISPLAY="localhost:0.0" $FISH -c 'echo Elements in DISPLAY: (count $DISPLAY)'
+# CHECK: Elements in DISPLAY: 1
+
+# We can't use PATH for this because the global configuration will modify PATH
+# based on /etc/paths and /etc/paths.d.
+# Exported arrays are colon delimited; they are automatically split on colons if they end in PATH.
+set -gx FOO one two three four
+set -gx FOOPATH one two three four
+$FISH -c 'echo Elements in FOO and FOOPATH: (count $FOO) (count $FOOPATH)'
+# CHECK: Elements in FOO and FOOPATH: 1 4
+
+# some must use colon separators!
+set -lx MANPATH man1 man2 man3
+env | grep '^MANPATH='
+# CHECK: MANPATH=man1:man2:man3
+
+# ensure we don't escape space and colon values
+set -x DONT_ESCAPE_COLONS 1: 2: :3:
+env | grep '^DONT_ESCAPE_COLONS='
+# CHECK: DONT_ESCAPE_COLONS=1: 2: :3:
+
+set -x DONT_ESCAPE_SPACES '1 ' '2 ' ' 3 ' 4
+env | grep '^DONT_ESCAPE_SPACES='
+# CHECK: DONT_ESCAPE_SPACES=1  2   3  4
+
+set -x DONT_ESCAPE_COLONS_PATH 1: 2: :3:
+env | grep '^DONT_ESCAPE_COLONS_PATH='
+# CHECK: DONT_ESCAPE_COLONS_PATH=1::2:::3:
+
+
+# Path universal variables
+set -U __fish_test_path_not a b c
+set -U __fish_test_PATH 1 2 3
+echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
+# CHECK: a b c 1:2:3 a b c 1 2 3
+
+set --unpath __fish_test_PATH $__fish_test_PATH
+echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
+# CHECK: a b c 1 2 3 a b c 1 2 3
+
+set --path __fish_test_path_not $__fish_test_path_not
+echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
+# CHECK: a:b:c 1 2 3 a b c 1 2 3
+
+set --path __fish_test_PATH $__fish_test_PATH
+echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
+# CHECK: a:b:c 1:2:3 a b c 1 2 3
+
+set -U __fish_test_PATH 1:2:3
+echo "$__fish_test_PATH" $__fish_test_PATH
+# CHECK: 1:2:3 1 2 3
+
+set -e __fish_test_PATH
+set -e __fish_test_path_not
+
+set -U --path __fish_test_path2 a:b
+echo "$__fish_test_path2" $__fish_test_path2
+# CHECK: a:b a b
+
+set -e __fish_test_path2
+
+# Variable names in other commands
+# Test invalid variable names in loops (#5800)
+for a,b in y 1 z 3
+    echo $a,$b
+end
+# CHECKERR: {{.*}} for: Variable name 'a,b' is not valid. See `help identifiers`.
+# CHECKERR:
+# CHECKERR: for a,b in y 1 z 3
+# CHECKERR:     ^
+
+
+# Global vs Universal Unspecified Scopes
+set -U __fish_test_global_vs_universal universal
+echo "global-vs-universal 1: $__fish_test_global_vs_universal"
+# CHECK: global-vs-universal 1: universal
+
+set -g __fish_test_global_vs_universal global
+echo "global-vs-universal 2: $__fish_test_global_vs_universal"
+# CHECK: global-vs-universal 2: global
+
+
+set __fish_test_global_vs_universal global2
+echo "global-vs-universal 3: $__fish_test_global_vs_universal"
+# CHECK: global-vs-universal 3: global2
+
+set -e -g __fish_test_global_vs_universal
+echo "global-vs-universal 4: $__fish_test_global_vs_universal"
+# CHECK: global-vs-universal 4: universal
+
+set -e -U __fish_test_global_vs_universal
+echo "global-vs-universal 5: $__fish_test_global_vs_universal"
+# CHECK: global-vs-universal 5: 
+
+true
diff --git a/tests/test3.in b/tests/test3.in
index 6ee7f5365..cb85fe59c 100644
--- a/tests/test3.in
+++ b/tests/test3.in
@@ -325,6 +325,9 @@ set -U __fish_test_PATH 1:2:3
 echo "$__fish_test_PATH" $__fish_test_PATH
 set -U --path __fish_test_path2 a:b
 echo "$__fish_test_path2" $__fish_test_path2
+set -e __fish_test_path_not
+set -e __fish_test_PATH
+
 
 logmsg Variable names in other commands
 # Test invalid variable names in loops (#5800)

From 01dff25f6214a91094aac9d240831ca091a7827b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 21 Jul 2019 12:16:43 -0700
Subject: [PATCH 0814/1732] Remove test3

This is now handled by littlecheck
---
 tests/test3.err |  13 --
 tests/test3.in  | 352 ------------------------------------------------
 tests/test3.out |  68 ----------
 3 files changed, 433 deletions(-)
 delete mode 100644 tests/test3.err
 delete mode 100644 tests/test3.in
 delete mode 100644 tests/test3.out

diff --git a/tests/test3.err b/tests/test3.err
deleted file mode 100644
index 5fc2c0e09..000000000
--- a/tests/test3.err
+++ /dev/null
@@ -1,13 +0,0 @@
-
-####################
-# Path universal variables
-
-####################
-# Variable names in other commands
-fish: for: Variable name 'a,b' is not valid. See `help identifiers`.
-
-for a,b in y 1 z 3; echo $a,$b; end
-    ^
-
-####################
-# Global vs Universal Unspecified Scopes
diff --git a/tests/test3.in b/tests/test3.in
deleted file mode 100644
index cb85fe59c..000000000
--- a/tests/test3.in
+++ /dev/null
@@ -1,352 +0,0 @@
-# Environment variable tests
-
-#Test if variables can be properly set
-
-set smurf blue
-
-if test $smurf = blue
-	echo Test 1 pass
-else
-	echo Test 1 fail
-end
-
-# Test if variables can be erased
-
-set -e smurf
-if set -q smurf
-	echo Test 2 fail
-else
-	echo Test 2 pass
-end
-
-# Test if local variables go out of scope
-
-set -e t3
-if true
-	set -l t3 bar
-end
-
-if set -q t3
-	echo Test 3 fail
-else
-	echo Test 3 pass
-end
-
-# Test if globals can be set in block scope
-
-if true
-	set -g baz qux
-end
-
-if test $baz = qux
-	echo Test 4 pass
-else
-	echo Test 4 fail
-end
-
-
-#Test that scope is preserved when setting a new value
-
-set t5 a
-
-if true
-	set t5 b
-end
-
-if test $t5 = b
-	echo Test 5 pass
-else
-	echo Test 5 fail
-end
-
-# Test that scope is preserved in double blocks
-
-for i in 1
-  set t6 $i
-  for j in a
-	if test $t6$j = 1a
-		echo Test 6 pass
-	else
-		echo Test 6 fail
-	end
-  end
-end
-
-
-# Test if variables in for loop blocks do not go out of scope on new laps
-
-set res fail
-
-set -e t7
-for i in 1 2
-	if test $i = 1
-		set t7 lala
-	else
-		if test $t7
-			set res pass
-		end
-	end
-end
-
-echo Test 7 $res
-
-# Test if variables are properly exported
-
-set -e t8
-if true
-	set -lx t8 foo
-	if test (../test/root/bin/fish -c "echo $t8") = foo
-		echo Test 8 pass
-	else
-		echo Test 8 fail
-	end
-end
-
-# Test if exported variables go out of scope
-
-if ../test/root/bin/fish -c "set -q t8; and exit 0; or exit 1"
-	echo Test 9 fail
-else
-	echo Test 9 pass
-end
-
-# Test erasing variables in specific scope
-
-set -eU __fish_test_universal_variables_variable_foo
-set -g __fish_test_universal_variables_variable_foo bar
-begin
-	set -l __fish_test_universal_variables_variable_foo baz
-	set -eg __fish_test_universal_variables_variable_foo
-end
-
-if set -q __fish_test_universal_variables_variable_foo
-	echo Test 10 fail
-else
-	echo Test 10 pass
-end
-
-
-set __fish_test_universal_variables_variable_foo abc def
-set -e __fish_test_universal_variables_variable_foo[1]
-if test $__fish_test_universal_variables_variable_foo '=' def
-	echo Test 11 pass
-else
-	echo Test 11 fail
-end
-
-# Test combinations of export and scope
-
-set -ge __fish_test_universal_variables_variable_foo
-set -Ue __fish_test_universal_variables_variable_foo
-set -Ux __fish_test_universal_variables_variable_foo bar
-set __fish_test_universal_variables_variable_foo baz
-if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = baz -a (../test/root/bin/fish -c 'echo $__fish_test_universal_variables_variable_foo') = baz
-  echo Test 12 pass
-else
-  echo Test 12 fail
-end
-
-set -Ue __fish_test_universal_variables_variable_foo
-
-# Should no longer be in environment (#2046)
-env | string match '__fish_test_universal_variables_variable_foo=*'
-
-set -Ux __fish_test_universal_variables_variable_foo bar
-set -U __fish_test_universal_variables_variable_foo baz
-if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = baz -a (../test/root/bin/fish -c 'echo $__fish_test_universal_variables_variable_foo') = baz
-  echo Test 13 pass
-else
-  echo Test 13 fail
-end
-
-set -Ux __fish_test_universal_variables_variable_foo bar
-set -u __fish_test_universal_variables_variable_foo bar
-if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = '' -a (../test/root/bin/fish -c 'echo $__fish_test_universal_variables_variable_foo') = bar
-  echo Test 14 pass
-else
-  echo Test 14 fail
-end
-
-set -Ux __fish_test_universal_variables_variable_foo bar
-set -Uu __fish_test_universal_variables_variable_foo baz
-if test (/bin/sh -c 'echo $__fish_test_universal_variables_variable_foo') = '' -a (../test/root/bin/fish -c 'echo $__fish_test_universal_variables_variable_foo') = baz
-  echo Test 15 pass
-else
-  echo Test 15 fail
-end
-
-set -eU __fish_test_universal_variables_variable_foo
-function watch_foo --on-variable __fish_test_universal_variables_variable_foo
-    echo Foo change detected
-end
-
-set -U __fish_test_universal_variables_variable_foo 1234
-set -eU __fish_test_universal_variables_variable_foo
-# WTF set -eg __fish_test_universal_variables_variable_foo
-
-functions -e watch_foo
-
-
-# test erasing variables without a specified scope
-
-set -g test16res
-set -U __fish_test_universal_variables_variable_foo universal
-set -g __fish_test_universal_variables_variable_foo global
-
-begin
-  set -l __fish_test_universal_variables_variable_foo blocklocal
-
-  function test16
-    set -l __fish_test_universal_variables_variable_foo function
-    begin
-      set -l __fish_test_universal_variables_variable_foo functionblock
-      set test16res $test16res $__fish_test_universal_variables_variable_foo
-
-      # This sequence seems pointless but it's really verifying that we
-      # succesfully expose higher scopes as we erase the closest scope.
-      set -e __fish_test_universal_variables_variable_foo
-      set test16res $test16res $__fish_test_universal_variables_variable_foo
-
-      set -e __fish_test_universal_variables_variable_foo
-      set test16res $test16res $__fish_test_universal_variables_variable_foo
-
-      set -e __fish_test_universal_variables_variable_foo
-      set test16res $test16res $__fish_test_universal_variables_variable_foo
-
-      set -e __fish_test_universal_variables_variable_foo
-      set -q __fish_test_universal_variables_variable_foo
-      and set test16res $test16res $__fish_test_universal_variables_variable_foo
-    end
-
-    set -q __fish_test_universal_variables_variable_foo
-    and echo __fish_test_universal_variables_variable_foo should set after test16 inner begin..end
-  end
-
-  test16
-  set test16res $test16res $__fish_test_universal_variables_variable_foo
-end
-
-set -q __fish_test_universal_variables_variable_foo
-and echo __fish_test_universal_variables_variable_foo should set after test16 outer begin..end
-
-echo count:(count $test16res) "content:[$test16res]"
-if test (count $test16res) = 5 -a "$test16res" = "functionblock function global universal blocklocal"
-  echo Test 16 pass
-else
-  echo Test 16 fail
-end
-
-# Test that shadowing with a non-exported variable works
-set -gx __fish_test_env17 UNSHADOWED
-env | string match '__fish_test_env17=*'
-function __fish_test_shadow
-  set -l __fish_test_env17
-  env | string match -q '__fish_test_env17=*' ; or echo SHADOWED
-end
-__fish_test_shadow
-# Test that the variable is still exported (#2611)
-env | string match '__fish_test_env17=*'
-
-# Test that local exported variables are copied to functions (#1091)
-function __fish_test_local_export
-         echo $var
-         set var boo
-         echo $var
-end
-set -lx var wuwuwu
-__fish_test_local_export
-echo $var
-
-# Test that we don't copy local-exports to blocks.
-set -lx var foo
-begin
-    echo $var
-    set var bar
-    echo $var
-end
-echo $var # should be "bar"
-
-# clear for other shells
-set -eU __fish_test_universal_variables_variable_foo
-
-# Test behavior of universals on startup (#1526)
-echo Testing Universal Startup
-set -U testu 0
-../test/root/bin/fish -c 'set -U testu 1'
-echo $testu
-../test/root/bin/fish -c 'set -q testu; and echo $testu'
-
-../test/root/bin/fish -c 'set -U testu 2'
-echo $testu
-../test/root/bin/fish -c 'set -q testu; and echo $testu'
-
-../test/root/bin/fish -c 'set -e testu';
-set -q testu
-or echo testu undef in top level shell
-../test/root/bin/fish -c 'set -q testu; or echo testu undef in sub shell'
-
-# test SHLVL
-# use a subshell to ensure a clean slate
-env SHLVL= ../test/root/bin/fish -c 'echo SHLVL: $SHLVL; ../test/root/bin/fish -c \'echo SHLVL: $SHLVL\''
-# exec should decrement SHLVL
-env SHLVL= ../test/root/bin/fish -c 'echo SHLVL: $SHLVL; exec ../test/root/bin/fish -c \'echo SHLVL: $SHLVL\''
-# garbage SHLVLs should be treated as garbage
-env SHLVL=3foo ../test/root/bin/fish -c 'echo SHLVL: $SHLVL'
-# whitespace is allowed though (for bash compatibility)
-env SHLVL="3  " ../test/root/bin/fish -c 'echo SHLVL: $SHLVL'
-env SHLVL="  3" ../test/root/bin/fish -c 'echo SHLVL: $SHLVL'
-
-# Test transformation of inherited variables
-env DISPLAY="localhost:0.0" ../test/root/bin/fish -c 'echo Elements in DISPLAY: (count $DISPLAY)'
-# We can't use PATH for this because the global configuration will modify PATH
-# based on /etc/paths and /etc/paths.d.
-# Exported arrays are colon delimited; they are automatically split on colons if they end in PATH.
-set -gx FOO one two three four
-set -gx FOOPATH one two three four
-../test/root/bin/fish -c 'echo Elements in FOO and FOOPATH: (count $FOO) (count $FOOPATH)'
-# some must use colon separators!
-set -lx MANPATH man1 man2 man3 ; env | grep '^MANPATH='
-# ensure we don't escape space and colon values
-set -x DONT_ESCAPE_COLONS 1: 2: :3: ; env | grep '^DONT_ESCAPE_COLONS='
-set -x DONT_ESCAPE_SPACES '1 ' '2 ' ' 3 ' 4 ; env | grep '^DONT_ESCAPE_SPACES='
-set -x DONT_ESCAPE_COLONS_PATH 1: 2: :3: ; env | grep '^DONT_ESCAPE_COLONS_PATH='
-
-logmsg Path universal variables
-set -U __fish_test_path_not a b c
-set -U __fish_test_PATH 1 2 3
-echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
-set --unpath __fish_test_PATH $__fish_test_PATH
-echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
-set --path __fish_test_path_not $__fish_test_path_not
-echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
-set --path __fish_test_PATH $__fish_test_PATH
-echo "$__fish_test_path_not $__fish_test_PATH" $__fish_test_path_not $__fish_test_PATH
-set -U __fish_test_PATH 1:2:3
-echo "$__fish_test_PATH" $__fish_test_PATH
-set -U --path __fish_test_path2 a:b
-echo "$__fish_test_path2" $__fish_test_path2
-set -e __fish_test_path_not
-set -e __fish_test_PATH
-
-
-logmsg Variable names in other commands
-# Test invalid variable names in loops (#5800)
-for a,b in y 1 z 3; echo $a,$b; end
-
-logmsg Global vs Universal Unspecified Scopes
-set -U __fish_test_global_vs_universal universal
-echo "global-vs-universal 1: $__fish_test_global_vs_universal"
-
-set -g __fish_test_global_vs_universal global
-echo "global-vs-universal 2: $__fish_test_global_vs_universal"
-
-set __fish_test_global_vs_universal global2
-echo "global-vs-universal 3: $__fish_test_global_vs_universal"
-
-set -e -g __fish_test_global_vs_universal
-echo "global-vs-universal 4: $__fish_test_global_vs_universal"
-
-set -e -U __fish_test_global_vs_universal
-echo "global-vs-universal 5: $__fish_test_global_vs_universal"
-
-true
diff --git a/tests/test3.out b/tests/test3.out
deleted file mode 100644
index b8c6b861a..000000000
--- a/tests/test3.out
+++ /dev/null
@@ -1,68 +0,0 @@
-Test 1 pass
-Test 2 pass
-Test 3 pass
-Test 4 pass
-Test 5 pass
-Test 6 pass
-Test 7 pass
-Test 8 pass
-Test 9 pass
-Test 10 pass
-Test 11 pass
-Test 12 pass
-Test 13 pass
-Test 14 pass
-Test 15 pass
-Foo change detected
-Foo change detected
-count:5 content:[functionblock function global universal blocklocal]
-Test 16 pass
-__fish_test_env17=UNSHADOWED
-SHADOWED
-__fish_test_env17=UNSHADOWED
-wuwuwu
-boo
-wuwuwu
-foo
-bar
-bar
-Testing Universal Startup
-1
-1
-2
-2
-testu undef in top level shell
-testu undef in sub shell
-SHLVL: 1
-SHLVL: 2
-SHLVL: 1
-SHLVL: 1
-SHLVL: 1
-SHLVL: 4
-SHLVL: 4
-Elements in DISPLAY: 1
-Elements in FOO and FOOPATH: 1 4
-MANPATH=man1:man2:man3
-DONT_ESCAPE_COLONS=1: 2: :3:
-DONT_ESCAPE_SPACES=1  2   3  4
-DONT_ESCAPE_COLONS_PATH=1::2:::3:
-
-####################
-# Path universal variables
-a b c 1:2:3 a b c 1 2 3
-a b c 1 2 3 a b c 1 2 3
-a:b:c 1 2 3 a b c 1 2 3
-a:b:c 1:2:3 a b c 1 2 3
-1:2:3 1 2 3
-a:b a b
-
-####################
-# Variable names in other commands
-
-####################
-# Global vs Universal Unspecified Scopes
-global-vs-universal 1: universal
-global-vs-universal 2: global
-global-vs-universal 3: global2
-global-vs-universal 4: universal
-global-vs-universal 5: 

From e8c6de8055ca8c8061c19d648ddb6ccfc80fb0b5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 21 Jul 2019 12:44:07 -0700
Subject: [PATCH 0815/1732] Correctly export empty universal variables

Fixes #5992
---
 CHANGELOG.md                 |  1 +
 src/env.cpp                  | 10 ++++------
 src/env_universal_common.cpp |  7 +++----
 tests/checks/set.fish        | 10 ++++++++++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06aca0e4c..5e884a7d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
 - More of the documentation, including the tutorial, is now available as man pages as well.
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
+- Empty universal variables may now be exported (#5992).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/env.cpp b/src/env.cpp
index 8d7645ecf..c55a20ffa 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -638,12 +638,10 @@ std::shared_ptr<const null_terminated_array_t<char>> env_scoped_impl_t::create_e
         const wcstring_list_t uni = uvars()->get_names(true, false);
         for (const wcstring &key : uni) {
             auto var = uvars()->get(key);
-
-            if (!var.missing_or_empty()) {
-                // Note that std::map::insert does NOT overwrite a value already in the map,
-                // which we depend on here.
-                vals.insert(std::pair<wcstring, env_var_t>(key, *var));
-            }
+            assert(var && "Variable should be present in uvars");
+            // Note that std::map::insert does NOT overwrite a value already in the map,
+            // which we depend on here.
+            vals.insert(std::make_pair(key, *var));
         }
     }
 
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 4bad356ed..b9bdb20bf 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -300,10 +300,9 @@ bool env_universal_t::remove(const wcstring &key) {
 wcstring_list_t env_universal_t::get_names(bool show_exported, bool show_unexported) const {
     wcstring_list_t result;
     scoped_lock locker(lock);
-    var_table_t::const_iterator iter;
-    for (iter = vars.begin(); iter != vars.end(); ++iter) {
-        const wcstring &key = iter->first;
-        const env_var_t &var = iter->second;
+    for (const auto &kv : vars) {
+        const wcstring &key = kv.first;
+        const env_var_t &var = kv.second;
         if ((var.exports() && show_exported) || (!var.exports() && show_unexported)) {
             result.push_back(key);
         }
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 27ec702f1..da8ac8108 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -405,6 +405,16 @@ echo "$__fish_test_path2" $__fish_test_path2
 
 set -e __fish_test_path2
 
+# Test empty uvars (#5992)
+set -Ux __fish_empty_uvar
+set -Uq __fish_empty_uvar
+echo $status
+# CHECK: 0
+$FISH -c 'set -Uq __fish_empty_uvar; echo $status'
+# CHECK: 0
+env | grep __fish_empty_uvar
+# CHECK: __fish_empty_uvar=
+
 # Variable names in other commands
 # Test invalid variable names in loops (#5800)
 for a,b in y 1 z 3

From 554ee240b31cebb2e170a89f15c7059209065dc9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 21 Jul 2019 13:53:05 -0700
Subject: [PATCH 0816/1732] Correct handling of explicitly separated output
 when all elements are empty

Previously when propagating explicitly separated output, we would early-out
if the buffer was empty, where empty meant contains no characters. However
it may contain one or more empty strings, in which case we should propagate
those strings.

Remove this footgun "empty" function and handle this properly.

Fixes #5987
---
 CHANGELOG.md             | 1 +
 src/io.cpp               | 7 ++++---
 src/io.h                 | 2 --
 src/parse_execution.cpp  | 5 +++--
 tests/checks/string.fish | 6 ++++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e884a7d2..35a86ae93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - More of the documentation, including the tutorial, is now available as man pages as well.
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
+- `string split` had a bug where empty strings would be dropped if the output was only empty strings; this has been fixed (#5987).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/io.cpp b/src/io.cpp
index edbf06e9b..54ead1392 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -31,14 +31,15 @@ void io_pipe_t::print() const {
 void io_bufferfill_t::print() const { std::fwprintf(stderr, L"bufferfill {%d}\n", write_fd_.fd()); }
 
 void io_buffer_t::append_from_stream(const output_stream_t &stream) {
-    if (stream.empty()) return;
+    const separated_buffer_t<wcstring> &input = stream.buffer();
+    if (input.elements().empty()) return;
     scoped_lock locker(append_lock_);
     if (buffer_.discarded()) return;
-    if (stream.buffer().discarded()) {
+    if (input.discarded()) {
         buffer_.set_discard();
         return;
     }
-    buffer_.append_wide_buffer(stream.buffer());
+    buffer_.append_wide_buffer(input);
 }
 
 void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
diff --git a/src/io.h b/src/io.h
index 89fcdc810..79ea595de 100644
--- a/src/io.h
+++ b/src/io.h
@@ -403,8 +403,6 @@ class output_stream_t {
 
     void append_formatv(const wchar_t *format, va_list va) { append(vformat_string(format, va)); }
 
-    bool empty() const { return buffer_.size() == 0; }
-
     wcstring contents() const { return buffer_.newline_serialized(); }
 };
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index eff62a4e6..75d7cc7d0 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -337,8 +337,9 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
     int err = builtin_function(*parser, streams, arguments, pstree, body);
     parser->set_last_statuses(statuses_t::just(err));
 
-    if (!streams.err.empty()) {
-        this->report_error(header, L"%ls", streams.err.contents().c_str());
+    wcstring errtext = streams.err.contents();
+    if (!errtext.empty()) {
+        this->report_error(header, L"%ls", errtext.c_str());
         result = parse_execution_errored;
     }
 
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index c27b6b6c1..6e2ee8ba9 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -498,6 +498,12 @@ end
 count (dualsplit)
 # CHECK: 4
 
+# Ensure we handle empty outputs correctly (#5987)
+count (string split / /)
+# CHECK: 2
+count (echo -ne '\x00\x00\x00' | string split0)
+# CHECK: 3
+
 # string collect
 count (echo one\ntwo\nthree\nfour | string collect)
 count (echo one | string collect)

From ffcf5a5e036d94377dd02de5c19d541bcd4b0cec Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Wed, 24 Jul 2019 13:47:46 +0200
Subject: [PATCH 0817/1732] completions/git: Add `git cherry`

See for example: https://git-scm.com/docs/git-cherry
git cherry is quite helpful when trying to findout if merges between
branches are complete, when there were cherry-picks in addition to
merges.
---
 share/completions/git.fish | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index b78675332..6b5ab3d8b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -932,6 +932,11 @@ complete -f -c git -n '__fish_git_using_command branch' -l set-upstream-to -d 'S
 complete -f -c git -n '__fish_git_using_command branch' -l merged -d 'List branches that have been merged'
 complete -f -c git -n '__fish_git_using_command branch' -l no-merged -d 'List branches that have not been merged'
 
+### cherry
+complete -f -c git -n '__fish_git_needs_command' -a cherry -d 'Find commits yet to be applied to upstream [upstream [head]]'
+complete -f -c git -n '__fish_git_using_command cherry' -s v -d 'Show the commit subjects next to the SHA1s'
+complete -f -c git -n '__fish_git_using_command cherry' -a '(__fish_git_refs)' -d 'Upstream'
+
 ### cherry-pick
 complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit'
 complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches --no-merged)'

From c0053ceef55a2b0e325d0340baa47185ad4774b0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 23 Jul 2019 17:51:02 -0700
Subject: [PATCH 0818/1732] highlighter_t to return color array directly

Saves some copying and allocations.
---
 src/highlight.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/highlight.cpp b/src/highlight.cpp
index 0924407d4..a79a17b4c 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -798,7 +798,7 @@ class highlighter_t {
     }
 
     // Perform highlighting, returning an array of colors.
-    const color_array_t &highlight();
+    color_array_t highlight();
 };
 
 void highlighter_t::color_node(const parse_node_t &node, highlight_spec_t color) {
@@ -1114,7 +1114,7 @@ static bool command_is_valid(const wcstring &cmd, enum parse_statement_decoratio
     return is_valid;
 }
 
-const highlighter_t::color_array_t &highlighter_t::highlight() {
+highlighter_t::color_array_t highlighter_t::highlight() {
     // If we are doing I/O, we must be in a background thread.
     if (io_ok) {
         ASSERT_IS_BACKGROUND_THREAD();
@@ -1254,7 +1254,7 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
     }
 
     if (!this->io_ok || this->cursor_pos > this->buff.size()) {
-        return color_array;
+        return std::move(color_array);
     }
 
     // If the cursor is over an argument, and that argument is a valid path, underline it.
@@ -1278,7 +1278,7 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
         }
     }
 
-    return color_array;
+    return std::move(color_array);
 }
 
 void highlight_shell(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,

From 822b53c67a70ff923ba0370d763e44532e2c4c44 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 24 Jul 2019 12:28:05 -0700
Subject: [PATCH 0819/1732] Don't color a whole string invalid because of an
 unclosed quote

When syntax highlighting a quoted string, if the string is not closed,
only show the opening quote as an error, not the whole string.
---
 CHANGELOG.md       |  1 +
 src/fish_tests.cpp | 11 ++++++++++-
 src/highlight.cpp  | 14 +++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35a86ae93..0382ad6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
 - If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
+- When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 0d531aad1..ebaa42f2c 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4474,7 +4474,16 @@ static void test_highlighting() {
 
     highlight_tests.push_back({
         {L"echo", highlight_role_t::command},
-        {L"'single_quote", highlight_role_t::error},
+        {L"'", highlight_role_t::error},
+        {L"single_quote", highlight_role_t::quote},
+        {L"$stuff", highlight_role_t::quote},
+    });
+
+    highlight_tests.push_back({
+        {L"echo", highlight_role_t::command},
+        {L"\"", highlight_role_t::error},
+        {L"double_quote", highlight_role_t::quote},
+        {L"$stuff", highlight_role_t::operat},
     });
 
     highlight_tests.push_back({
diff --git a/src/highlight.cpp b/src/highlight.cpp
index a79a17b4c..3149f97aa 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -537,6 +537,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
     }
 
     enum { e_unquoted, e_single_quoted, e_double_quoted } mode = e_unquoted;
+    maybe_t<size_t> unclosed_quote_offset;
     int bracket_count = 0;
     for (size_t in_pos = 0; in_pos < buff_len; in_pos++) {
         const wchar_t c = buffstr.at(in_pos);
@@ -671,11 +672,13 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                         }
                         case L'\'': {
                             colors[in_pos] = highlight_role_t::quote;
+                            unclosed_quote_offset = in_pos;
                             mode = e_single_quoted;
                             break;
                         }
                         case L'\"': {
                             colors[in_pos] = highlight_role_t::quote;
+                            unclosed_quote_offset = in_pos;
                             mode = e_double_quoted;
                             break;
                         }
@@ -700,6 +703,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                         }
                     }
                 } else if (c == L'\'') {
+                    unclosed_quote_offset = none();
                     mode = e_unquoted;
                 }
                 break;
@@ -713,6 +717,7 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
                 }
                 switch (c) {
                     case L'"': {
+                        unclosed_quote_offset = none();
                         mode = e_unquoted;
                         break;
                     }
@@ -743,6 +748,11 @@ static void color_string_internal(const wcstring &buffstr, highlight_spec_t base
             }
         }
     }
+
+    // Error on unclosed quotes.
+    if (unclosed_quote_offset) {
+        colors[*unclosed_quote_offset] = highlight_role_t::error;
+    }
 }
 
 /// Syntax highlighter helper.
@@ -793,7 +803,9 @@ class highlighter_t {
           working_directory(std::move(wd)),
           color_array(str.size()) {
         // Parse the tree.
-        parse_tree_from_string(buff, parse_flag_continue_after_error | parse_flag_include_comments,
+        parse_tree_from_string(buff,
+                               parse_flag_continue_after_error | parse_flag_include_comments |
+                                   parse_flag_accept_incomplete_tokens,
                                &this->parse_tree, NULL);
     }
 

From 8bb343879eb5d7a611ae64f0305f3018cb5dff36 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 25 Jul 2019 20:22:40 +0800
Subject: [PATCH 0820/1732] docs: update set --show synopsis

As reported on the mailing list in Message-ID:
<CAK72cnbc7qW=Meuvr=vBRyok0syFSC5nitsTKUpbs89XpFCoDg@mail.gmail.com>
---
 sphinx_doc_src/cmds/set.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index b141c7570..fe5aab282 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -12,7 +12,7 @@ set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
 set ( -q | --query ) [SCOPE_OPTIONS] VARIABLE_NAMES...
 set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME
 set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
-set ( -S | --show ) [SCOPE_OPTIONS] [VARIABLE_NAME]...
+set ( -S | --show ) [VARIABLE_NAME]...
 
 
 Description

From a40a4c0c54384a0c44f4db9b0a4996ef2055b2b3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 15 Jul 2019 21:30:58 -0700
Subject: [PATCH 0821/1732] Add some new tricks to fish_test_helper

Allow fish_test_helper to report if it is in the foreground, and to SIGINT
its parent.
---
 src/fish_test_helper.cpp | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index 50f3bca7a..5ee10407e 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -1,6 +1,7 @@
 // fish_test_helper is a little program with no fish dependencies that acts like certain other
 // programs, allowing fish to test its behavior.
 
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,14 +16,41 @@ static void become_foreground_then_print_stderr() {
     fprintf(stderr, "become_foreground_then_print_stderr done\n");
 }
 
+static void report_foreground() {
+    int was_fg = -1;
+    const auto grp = getpgrp();
+    for (;;) {
+        int is_fg = (tcgetpgrp(STDIN_FILENO) == grp);
+        if (is_fg != was_fg) {
+            was_fg = is_fg;
+            if (fputs(is_fg ? "foreground\n" : "background\n", stderr) < 0) {
+                return;
+            }
+        }
+        usleep(1000000 / 2);
+    }
+}
+
+static void sigint_parent() {
+    // SIGINT the parent after 1 second, then exit
+    int parent = getppid();
+    usleep(1000000 / 4);  //.25 secs
+    kill(parent, SIGINT);
+    fprintf(stderr, "Sent SIGINT to %d\n", parent);
+}
+
 int main(int argc, char *argv[]) {
     if (argc <= 1) {
-        fprintf(stderr, "No commands given.");
+        fprintf(stderr, "No commands given.\n");
         return 0;
     }
     for (int i = 1; i < argc; i++) {
         if (!strcmp(argv[i], "become_foreground_then_print_stderr")) {
             become_foreground_then_print_stderr();
+        } else if (!strcmp(argv[i], "report_foreground")) {
+            report_foreground();
+        } else if (!strcmp(argv[i], "sigint_parent")) {
+            sigint_parent();
         } else {
             fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
             return EXIT_FAILURE;

From a33f0eb636b28731d8db9758c94b9b948db5c62b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Jul 2019 14:05:51 -0700
Subject: [PATCH 0822/1732] Clean up some logic around when process exit events
 are sent

---
 src/exec.cpp | 14 --------------
 src/proc.cpp | 21 ++++++++++++++++++++-
 src/proc.h   |  4 ++++
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index dd10c5ec3..1b246bd8a 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1013,20 +1013,6 @@ static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
 /// \return true if fish should claim the process group for this job.
 /// This is true if there is at least one external process and if the first process is fish code.
 static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
-    // Check if there's an external process.
-    // This is because historically fish has not reported job exits for internal-only processes,
-    // which is determined by comparing the pgrp against INVALID_PID.
-    bool has_external = false;
-    for (const auto &p : j->processes) {
-        if (p->type == process_type_t::external) {
-            has_external = true;
-            break;
-        }
-    }
-    if (!has_external) {
-        return false;
-    }
-
     // Check the first process.
     // The terminal owner has to be the process which is permitted to read from stdin.
     // This is the first process in the pipeline. When executing, a process in the job will
diff --git a/src/proc.cpp b/src/proc.cpp
index d945bac0d..70c0adb6d 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -148,6 +148,25 @@ bool job_t::is_completed() const {
     return true;
 }
 
+bool job_t::should_report_process_exits() const {
+    // This implements the behavior of process exit events only being sent for jobs containing an
+    // external process. Bizarrely the process exit event is for the pgroup leader which may be fish
+    // itself.
+    // TODO: rationalize this.
+    // If we never got a pgid then we never launched the external process, so don't report it.
+    if (this->pgid == INVALID_PID) {
+        return false;
+    }
+
+    // Return whether we have an external process.
+    for (const auto &p : this->processes) {
+        if (p->type == process_type_t::external) {
+            return true;
+        }
+    }
+    return false;
+}
+
 bool job_t::job_chain_is_fully_constructed() const {
     const job_t *cursor = this;
     while (cursor) {
@@ -585,7 +604,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
         // Prepare events for completed jobs, except for jobs that themselves came from event
         // handlers.
         if (!j->from_event_handler() && j->is_completed()) {
-            if (j->pgid != INVALID_PID) {
+            if (j->should_report_process_exits()) {
                 exit_events.push_back(
                     proc_create_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0));
             }
diff --git a/src/proc.h b/src/proc.h
index 934d7b48e..d3d3e6455 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -423,6 +423,10 @@ class job_t {
     bool skip_notification() const { return properties.skip_notification; }
     bool from_event_handler() const { return properties.from_event_handler; }
 
+    /// \return whether we should report process exit events.
+    /// This implements some historical behavior which has not been justified.
+    bool should_report_process_exits() const;
+
     /// \return the parent job, or nullptr.
     const std::shared_ptr<job_t> get_parent() const { return parent_job; }
 

From ec2ff8de241ada8fee169f1ef70189d3bb75f646 Mon Sep 17 00:00:00 2001
From: Miha Filej <miha@filej.net>
Date: Sun, 28 Jul 2019 10:33:54 +0200
Subject: [PATCH 0823/1732] docs/bind: Mention history-token-search-*

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 4bb0aa821..62fa5cd9b 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -126,6 +126,10 @@ The following special input functions are available:
 
 - ``history-search-forward``, search the history for the next match
 
+- ``history-token-search-backward``, search the history for the previous matching argument
+
+- ``history-token-search-forward``, search the history for the next matching argument
+
 - ``kill-bigword``, move the next whitespace-delimited word to the killring
 
 - ``kill-line``, move everything from the cursor to the end of the line to the killring

From 5b90fa0bda81aa278aff23d745a92d0a772be991 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 28 Jul 2019 15:37:31 -0700
Subject: [PATCH 0824/1732] Add a missing reference to a range-based for loop

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

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 75d7cc7d0..8fb9d6f91 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -907,7 +907,7 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
     // may have more or fewer, if there are wildcards involved).
     out_arguments->reserve(out_arguments->size() + argument_nodes.size());
     std::vector<completion_t> arg_expanded;
-    for (const auto arg_node : argument_nodes) {
+    for (const auto &arg_node : argument_nodes) {
         // Expect all arguments to have source.
         assert(arg_node.has_source());
         const wcstring arg_str = arg_node.get_source(pstree->src);

From 38f6296fdc8ef98ffba6fdc39c3e870a3d5cff5e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 31 Jul 2019 09:15:23 +0800
Subject: [PATCH 0825/1732] README: add Xcode install instructions

Closes #5961.

[ci skip]
---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5ae048545..8fea01a69 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,8 @@ Sphinx is also optionally required to build the documentation from a cloned git
 
 ### Building from source (all platforms) - Makefile generator
 
+To install into `/usr/local`, run:
+
 ```bash
 mkdir build; cd build
 cmake ..
@@ -116,6 +118,8 @@ make
 sudo make install
 ```
 
+The install directory can be changed using the `-DCMAKE_INSTALL_PREFIX` parameter for `cmake`.
+
 ### Building from source (macOS) - Xcode
 
 ```bash
@@ -123,7 +127,15 @@ mkdir build; cd build
 cmake .. -G Xcode
 ```
 
-An Xcode project will now be available in the `build` subdirectory.
+An Xcode project will now be available in the `build` subdirectory. You can open it with Xcode,
+or run the following to build and install in `/usr/local`:
+
+```bash
+xcodebuild
+xcodebuild -scheme install
+```
+
+The install directory can be changed using the `-DCMAKE_INSTALL_PREFIX` parameter for `cmake`.
 
 ### Help, it didn't build!
 

From 57ffd1878774fd25aab42aa6fa1d4e97db519ead Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 31 Jul 2019 13:52:36 +0200
Subject: [PATCH 0826/1732] tests/checks/set: Make a temporary XDG_CONFIG_HOME

This test uses universal variables, and so it can fail when run
multiple times.

It might be a good idea to do this in general, but for now let's just
try it here.
---
 tests/checks/set.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index da8ac8108..4865ec916 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -1,4 +1,4 @@
-# RUN: env FISH=%fish %fish %s
+# RUN: env XDG_CONFIG_HOME="$(mktemp -d)" FISH=%fish %fish %s
 
 # Environment variable tests
 

From 65007652569773b3656d34d2c4da1fe772df062a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 31 Jul 2019 14:04:24 +0200
Subject: [PATCH 0827/1732] Allow `switch` with something that expands to
 nothing

Meaning empty variables, command substitutions that don't print
anything.

A switch without an argument

```fish
switch
   case ...
end
```

is still a syntax error, and more than one argument is still a runtime
error.

The none-argument matches either an empty-string `case ''` or a
catch-all `case '*'`.

Fixes #5677.

Fixes #4943.
---
 CHANGELOG.md             |  1 +
 src/parse_execution.cpp  |  6 ++--
 tests/checks/switch.fish | 71 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 tests/checks/switch.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0382ad6e0..14d7d18fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
 - `string split` had a bug where empty strings would be dropped if the output was only empty strings; this has been fixed (#5987).
+- `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 8fb9d6f91..847396187 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -478,9 +478,9 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         }
     }
 
-    if (result == parse_execution_success && switch_values_expanded.size() != 1) {
+    if (result == parse_execution_success && switch_values_expanded.size() > 1) {
         result =
-            report_error(switch_value_n, _(L"switch: Expected exactly one argument, got %lu\n"),
+            report_error(switch_value_n, _(L"switch: Expected at most one argument, got %lu\n"),
                          switch_values_expanded.size());
     }
 
@@ -488,7 +488,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         return result;
     }
 
-    const wcstring &switch_value_expanded = switch_values_expanded.at(0).completion;
+    const wcstring &switch_value_expanded = switch_values_expanded.size() == 1 ? switch_values_expanded.at(0).completion : L"";
 
     block_t *sb = parser->push_block(block_t::switch_block());
 
diff --git a/tests/checks/switch.fish b/tests/checks/switch.fish
new file mode 100644
index 000000000..6c6eb445a
--- /dev/null
+++ b/tests/checks/switch.fish
@@ -0,0 +1,71 @@
+#RUN: %fish -C "set fish %fish" %s
+# Check that switch with an argument expanding to nothing still works.
+switch $foo
+    case a
+        echo a
+    case ''
+        echo very little
+    case '*'
+        echo Nothin
+    case ''
+        echo banana
+end
+#CHECK: very little
+
+switch (true)
+    case a
+        echo a
+    case ''
+        echo very little
+    case '*'
+        echo Nothin
+    case ''
+        echo banana
+end
+#CHECK: very little
+
+switch (echo)
+    case a
+        echo a
+    case ''
+        echo very little
+    case '*'
+        echo Nothin
+    case ''
+        echo banana
+end
+#CHECK: very little
+
+# Multiple arguments is still an error, we've not decided on good behavior for this.
+switch (echo; echo; echo)
+    case a
+        echo a
+    case ""
+        echo very little
+    case "*"
+        echo Nothin
+    case ""
+        echo banana
+end
+#CHECKERR: {{.*/?}}switch.fish (line {{\d+}}): switch: Expected at most one argument, got 3
+#CHECKERR:
+#CHECKERR: switch (echo; echo; echo)
+#CHECKERR:       ^
+
+# As is no argument at all.
+# Because this is a syntax error, we need to start a sub-fish or we wouldn't execute anything else.
+$fish -c '
+switch
+    case a
+        echo a
+    case ""
+        echo very little
+    case "*"
+        echo Nothin
+    case ""
+        echo banana
+end
+'
+#CHECKERR: fish: 'case' builtin not inside of switch block
+#CHECKERR:      case a
+#CHECKERR:           ^

From d2455bdd5a1e2065b83dfe7d5504fedbb47cef30 Mon Sep 17 00:00:00 2001
From: Mark Stosberg <mark@rideamigos.com>
Date: Tue, 30 Jul 2019 23:05:26 -0400
Subject: [PATCH 0828/1732] Document alternates for common arrow key usage.

Arrow keys are often not conveniently located on keyboards, so the use of arrow keys for common keyboard shortcuts can be a turn-off for some.

I found that fish supports alternate keybindings for these cases but I didn't seem them documented in these places where the arrow keys versions are highlighted.
---
 sphinx_doc_src/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index b01783db3..eafb53c44 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -31,7 +31,7 @@ You can also use the Web configuration tool, :ref:`fish_config <cmd-fish_config>
 
 How do I run a command from history?
 ------------------------------------
-Type some part of the command, and then hit the :kbd:`↑` (up) or :kbd:`↓` (down) arrow keys to navigate through history matches.
+Type some part of the command, and then hit the :kbd:`↑` (up) or :kbd:`↓` (down) arrow keys to navigate through history matches. Additional default key bindings include :kbd:`Control+P` (up) and :kbd:`Control+N` (down).
 
 
 How do I run a subcommand? The backtick doesn't work!
@@ -231,7 +231,7 @@ Fish history recall is very simple yet effective:
 
   - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
 
-- :kbd:`Alt+↑,Up` recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
+- :kbd:`Alt+↑,Up` recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like. An alternate key binding is :kbd:`Alt+.`.
 
   - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press :kbd:`Alt+↑,Up`.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
 

From 95c97619c6741c7aa9e5d3847e7cc18d7eb18fc2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 31 Jul 2019 12:30:28 -0700
Subject: [PATCH 0829/1732] Use cbegin() in one place in reader

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

diff --git a/src/reader.cpp b/src/reader.cpp
index 6249a7a08..37eca2b7b 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -631,7 +631,7 @@ void reader_data_t::repaint() {
     // Re-render our completions page if necessary. Limit the term size of the pager to the true
     // term size, minus the number of lines consumed by our string. (Note this doesn't yet consider
     // wrapping).
-    int full_line_count = 1 + std::count(full_line.begin(), full_line.end(), '\n');
+    int full_line_count = 1 + std::count(full_line.cbegin(), full_line.cend(), '\n');
     pager.set_term_size(std::max(1, common_get_width()),
                         std::max(1, common_get_height() - full_line_count));
     pager.update_rendering(&current_page_rendering);

From 7046d251d9bd280ad38a57bf5e6c52056892e338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20Alexander=20Sei=EF=AC=86rup?= <klaus@seistrup.dk>
Date: Fri, 2 Aug 2019 11:45:57 +0200
Subject: [PATCH 0830/1732] Make sure nop command always suceeds

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

diff --git a/share/config.fish b/share/config.fish
index d1e50e55e..cecdeceb0 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -75,7 +75,9 @@ end
 function : -d "no-op function"
     # for compatibility with sh, bash, and others.
     # Often used to insert a comment into a chain of commands without having
-    # it eat up the remainder of the line, handy in Makefiles. 
+    # it eat up the remainder of the line, handy in Makefiles.
+    # This command always succeeds
+    true
 end
 
 #

From 28a17c4b05787af3389e1940d159d39bc1cb82b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20Alexander=20Sei=EF=AC=86rup?= <klaus@seistrup.dk>
Date: Fri, 2 Aug 2019 12:06:22 +0200
Subject: [PATCH 0831/1732] Document that the : command now always exits
 successfully

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14d7d18fc..c511215d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Empty universal variables may now be exported (#5992).
 - `string split` had a bug where empty strings would be dropped if the output was only empty strings; this has been fixed (#5987).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
+- The null command (:) now always exits successfully, rather than echoing last return code.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).

From 73bf60754c6236102b9a0743666cce79dd6aa887 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 3 Aug 2019 14:43:55 -0700
Subject: [PATCH 0832/1732] Don't assign jobs to fish's pgrp if there's no
 external process

Fixes #6011
---
 src/exec.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index 1b246bd8a..3ee725c94 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1013,6 +1013,19 @@ static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
 /// \return true if fish should claim the process group for this job.
 /// This is true if there is at least one external process and if the first process is fish code.
 static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
+    // Check if there's an external process.
+    // See #6011.
+    bool has_external = false;
+    for (const auto &p : j->processes) {
+        if (p->type == process_type_t::external) {
+            has_external = true;
+            break;
+        }
+    }
+    if (!has_external) {
+        return false;
+    }
+
     // Check the first process.
     // The terminal owner has to be the process which is permitted to read from stdin.
     // This is the first process in the pipeline. When executing, a process in the job will

From 67cf50eda430ee53a97ebbad119aecd4934edd4f Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Wed, 31 Jul 2019 10:09:20 +0900
Subject: [PATCH 0833/1732] Added completions of languages developed by
 Microsoft

* csc, csi, vbc - .NET Compiler Platform (Roslyn)
* fsharpc, fsharpi - F# compiler and REPL environment
* tsc - TypeScript compiler
---
 share/completions/csc.fish     | 130 ++++++++++++++++++++++++++++++
 share/completions/csi.fish     |   8 ++
 share/completions/fsharpc.fish |  90 +++++++++++++++++++++
 share/completions/fsharpi.fish |  67 ++++++++++++++++
 share/completions/tsc.fish     | 120 ++++++++++++++++++++++++++++
 share/completions/vbc.fish     | 140 +++++++++++++++++++++++++++++++++
 6 files changed, 555 insertions(+)
 create mode 100644 share/completions/csc.fish
 create mode 100644 share/completions/csi.fish
 create mode 100644 share/completions/fsharpc.fish
 create mode 100644 share/completions/fsharpi.fish
 create mode 100644 share/completions/tsc.fish
 create mode 100644 share/completions/vbc.fish

diff --git a/share/completions/csc.fish b/share/completions/csc.fish
new file mode 100644
index 000000000..669163e37
--- /dev/null
+++ b/share/completions/csc.fish
@@ -0,0 +1,130 @@
+# Completions for the Visual C# Compiler(Roslyn)
+# See: https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/listed-by-category
+
+# Optimization
+for bytes in 512 1024 2048 4096 8192
+    complete -c csc -o "filealign:$bytes" -d "Specifies the size of sections in the output file"
+end
+
+complete -c csc -s o -o "o+" -o optimize -o "optimize+" -d "Enable optimizations"
+complete -c csc -o "o-" -o "optimize-" -d "Disable optimizations"
+
+# Output Files
+complete -c csc -o deterministic -d "Causes the compiler to output an assembly whose binary content is identical across compilations if inputs are identical"
+complete -c csc -o "doc:" -d "Specifies an XML file where processed documentation comments are to be written"
+complete -c csc -o "out:" -d "Specifies the output file"
+complete -c csc -o "pathmap:" -d "Specify a mapping for source path names output by the compiler"
+complete -c csc -o "pdb:" -d "Specifies the file name and location of the .pdb file"
+complete -c csc -o "platform:anycpu" -d "Specify any platform as the output platform (default)"
+complete -c csc -o "platform:anycpu32bitpreferred" -d "Specify any platform as the output platform"
+complete -c csc -o "platform:ARM" -d "Specify ARM as the output platform"
+complete -c csc -o "platform:ARM64" -d "Specify ARM64 as the output platform"
+complete -c csc -o "platform:x64" -d "Specify AMD64 or EM64T as the output platform"
+complete -c csc -o "platform:x86" -d "Specify x86 as the output platform"
+complete -c csc -o "platform:Itanium" -d "Specify Itanium as the output platform"
+complete -c csc -o "preferreduilang:" -d "Specify a language for compiler output"
+complete -c csc -o "refout:" -d "Generate a reference assembly in addition to the primary assembly"
+complete -c csc -o refonly -d "Generate a reference assembly instead of a primary assembly"
+complete -c csc -o "t:appcontainerexe" -o "target:appcontainerexe" -d "Specify .exe file for Windows 8.x Store apps as the format of the output file"
+complete -c csc -o "t:exe" -o "target:exe" -d "Specify .exe file as the format of the output file (default)"
+complete -c csc -o "t:library" -o "target:library" -d "Specify code library as the format of the output file"
+complete -c csc -o "t:module" -o "target:module" -d "Specify module as the format of the output file"
+complete -c csc -o "t:winexe" -o "target:winexe" -d "Specify Windows program as the format of the output file"
+complete -c csc -o "t:winmdobj" -o "target:winmdobj" -d "Specify intermediate .winmdobj file as the format of the output file"
+complete -c csc -o "modulename:" -d "Specify the name of the source module"
+
+# .NET Framework Assemblies
+complete -c csc -o "addmodule:" -d "Specifies one or more modules to be part of this assembly"
+complete -c csc -o delaysign -o "delaysign+" -d "Instructs the compiler to add the public key but to leave the assembly unsigned"
+complete -c csc -o "delaysign-" -d "Disable -delaysign"
+complete -c csc -o "keycontainer:" -d "Specifies the name of the cryptographic key container"
+complete -c csc -o "keyfile:" -d "Specifies the filename containing the cryptographic key"
+complete -c csc -o "lib:" -d "Specifies the location of assemblies referenced by means of -reference"
+complete -c csc -o nostdlib -o "nostdlib+" -d "Instructs the compiler not to import the standard library (mscorlib.dll)"
+complete -c csc -o "nostdlib-" -d "Disable -nostdlib"
+complete -c csc -o publicsign -d "Apply a public key without signing the assembly, but set the bit in the assembly indicating the assembly is signed"
+complete -c csc -o "r:" -o "reference:" -d "Imports metadata from a file that contains an assembly"
+complete -c csc -o "a:" -o "analyzer:" -d "Run the analyzers from this assembly"
+complete -c csc -o "additionalfile:" -d "Names additional files that don't directly affect code generation but may be used by analyzers for producing errors or warnings"
+complete -c csc -o embed -d "Embed all source files in the PDB"
+complete -c csc -o "embed:" -d "Embed specific files in the PDB"
+
+# Debugging/Error Checking
+complete -c csc -o "bugreport:" -d "Creates a file that contains information that makes it easy to report a bug"
+complete -c csc -o checked -o "checked+" -d "Specifies whether integer arithmetic that overflows the bounds of the data type will cause an exception at run time"
+complete -c csc -o "checked-" -d "Disable -checked"
+
+complete -c csc -o debug -o "debug+" -d "Instruct the compiler to emit debugging information"
+for arguments in full pdbonly
+    complete -c csc -o "debug:$arguments" -d "Instruct the compiler to emit debugging information"
+end
+complete -c csc -o "debug-" -d "Disable -debug"
+
+for arguments in none prompt queue send
+    complete -c csc -o "errorreport:$arguments" -d "Sets error reporting behavior"
+end
+
+complete -c csc -o fullpaths -d "Specifies the absolute path to the file in compiler output"
+complete -c csc -o "nowarn:" -d "Suppresses the compiler's generation of specified warnings"
+
+for warning_level in (seq 0 4)
+    if test $warning_level -ne 4
+        complete -c csc -o "w:$warning_level" -o "warn:$warning_level" -d "Sets the warning level to $warning_level"
+    else
+        complete -c csc -o "w:$warning_level" -o "warn:$warning_level" -d "Sets the warning level to $warning_level (default)"
+    end
+end
+
+complete -c csc -o warnaserror -o "warnaserror+" -d "Promotes warnings to errors"
+complete -c csc -o "warnaserror-" -d "Disable -warnaserror"
+complete -c csc -o "ruleset:" -d "Specify a ruleset file that disables specific diagnostics"
+
+# Preprocessor
+complete -c csc -o "d:" -o "define:" -d "Defines preprocessor symbols"
+
+# Resources
+complete -c csc -o "l:" -o "link:" -d "Makes COM type information in specified assemblies available to the project"
+complete -c csc -o "linkres:" -o "linkresource:" -d "Creates a link to a managed resource"
+complete -c csc -o "res:" -o "resource:" -d "Embeds a .NET Framework resource into the output file"
+complete -c csc -o "win32icon:" -d "Specifies an .ico file to insert into the output file"
+complete -c csc -o "win32res:" -d "Specifies a Win32 resource to insert into the output file"
+
+# Miscellaneous
+complete -c csc -s "?" -o help -d "Lists compiler options to stdout"
+complete -c csc -o "baseaddress:" -d "Specifies the preferred base address at which to load a DLL"
+complete -c csc -o "codepage:" -d "Specifies the code page to use for all source code files in the compilation"
+complete -c csc -o highentropyva -o "highentropyva+" -d "Specifies that the executable file supports address space layout randomization (ASLR)"
+complete -c csc -o "highentropyva-" -d "Disable -highentropyva"
+
+complete -c csc -o "langversion:?" -d "Display the allowed values for language version"
+complete -c csc -o "langversion:default" -d "Specify latest major version as language version"
+complete -c csc -o "langversion:latest" -d "Specify latest version (including minor releases) as language version"
+complete -c csc -o "langversion:latestMajor" -d "Specify latest major version as language version"
+complete -c csc -o "langversion:preview" -d "Specify latest preview version as language version"
+complete -c csc -o "langversion:ISO-1" -d "Specify ISO/IEC 23270:2003 C# (1.0/1.2) as language version"
+complete -c csc -o "langversion:ISO-2" -d "Specify ISO/IEC 23270:2006 C# (2.0) as language version"
+for version_number in (seq 3 8)
+    switch $version_number
+        case 7
+            complete -c csc -o "langversion:$version_number" -d "Specify C# $version_number.0 as language version"
+            complete -c csc -o "langversion:$version_number.1" -d "Specify C# $version_number.1 as language version"
+            complete -c csc -o "langversion:$version_number.2" -d "Specify C# $version_number.2 as language version"
+            complete -c csc -o "langversion:$version_number.3" -d "Specify C# $version_number.3 as language version"
+        case 8
+            complete -c csc -o "langversion:$version_number.0" -d "Specify C# $version_number.0 as language version"
+        case "*"
+            complete -c csc -o "langversion:$version_number" -d "Specify C# $version_number.0 as language version"
+    end
+end
+
+complete -c csc -o "m:" -o "main:" -d "Specifies the location of the Main method"
+complete -c csc -o noconfig -d "Instructs the compiler not to compile with csc.rsp"
+complete -c csc -o nologo -d "Suppresses compiler banner information"
+complete -c csc -o "recurse:" -d "Searches subdirectories for source files to compile"
+complete -c csc -o "subsystemversion:" -d "Specifies the minimum version of the subsystem that the executable file can use"
+complete -c csc -o unsafe -d "Enables compilation of code that uses the unsafe keyword"
+complete -c csc -o utf8output -d "Displays compiler output using UTF-8 encoding"
+complete -c csc -o parallel -o "parallel+" -d "Specifies whether to use concurrent build"
+complete -c csc -o "parallel-" -d "Disable -parallel"
+complete -c csc -o "checksumalgorithm:SHA1" -d "Specify SHA1 as the algorithm for calculating the source file checksum stored in PDB (default)"
+complete -c csc -o "checksumalgorithm:SHA256" -d "Specify SHA256 as the algorithm for calculating the source file checksum stored in PDB"
diff --git a/share/completions/csi.fish b/share/completions/csi.fish
new file mode 100644
index 000000000..bb1c67bb2
--- /dev/null
+++ b/share/completions/csi.fish
@@ -0,0 +1,8 @@
+# Completions for the Visual C# Interactive Compiler(Roslyn)
+
+complete -c csi -o help -o "?" -d "Display this usage message"
+complete -c csi -o version -d "Display the version and exit"
+complete -c csi -s i -d "Drop to REPL after executing the specified script"
+complete -c csi -o "r:" -o "reference:" -d "Reference metadata from the specified assembly file(s)"
+complete -c csi -o "lib:" -o "libPath:" -o "libPaths:" -d "List of directories where to look for libraries specified by #r directive"
+complete -c csi -o "u:" -o "using:" -o "usings:" -o "import:" -o "imports:" -d "Define global namespace using"
diff --git a/share/completions/fsharpc.fish b/share/completions/fsharpc.fish
new file mode 100644
index 000000000..1b9094173
--- /dev/null
+++ b/share/completions/fsharpc.fish
@@ -0,0 +1,90 @@
+# Completions for the F# Compiler
+# See: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/compiler-options
+
+# Output files
+complete -c fsharpc -o "o:" -l "out:" -d "Name of the output file"
+complete -c fsharpc -o "a:exe" -l "target:exe" -d "Build a console executable"
+complete -c fsharpc -o "a:winexe" -l "target:winexe" -d "Build a Windows executable"
+complete -c fsharpc -o "a:library" -l "target:library" -d "Build a library"
+complete -c fsharpc -o "a:module" -l "target:module" -d "Build a module that can be added to another assembly"
+complete -c fsharpc -l delaysign -l "delaysign+" -d "Delay-sign the assembly using only the public portion of the strong name key"
+complete -c fsharpc -l "delaysign-" -d "Disable --delaysign"
+complete -c fsharpc -l "doc:" -d "Write the xmldoc of the assembly to the given file"
+complete -c fsharpc -l "keyfile:" -d "Specify a strong name key file"
+complete -c fsharpc -l "keycontainer:" -d "Specify a strong name key container"
+complete -c fsharpc -l "platform:x86" -d "Limit the platform this code can run on to x86"
+complete -c fsharpc -l "platform:Itanium" -d "Limit the platform this code can run on to Itanium"
+complete -c fsharpc -l "platform:x64" -d "Limit the platform this code can run on to x64"
+complete -c fsharpc -l "platform:anycpu32bitpreferred" -d "Limit the platform this code can run on to anycpu32bitpreferred"
+complete -c fsharpc -l "platform:anycpu" -d "Limit the platform this code can run on to anycpu (default)"
+complete -c fsharpc -l nooptimizationdata -d "Only include optimization information essential for implementing inlined constructs"
+complete -c fsharpc -l nointerfacedata -d "Don't add a resource to the generated assembly containing F#-specific metadata"
+complete -c fsharpc -l "sig:" -d "Print the inferred interface of the assembly to a file"
+
+# Input files
+complete -c fsharpc -o "r:" -l "reference:" -d "Reference an assembly"
+
+# Resources
+complete -c fsharpc -l "win32res:" -d "Specify a Win32 resource file (.res)"
+complete -c fsharpc -l "win32manifest:" -d "Specify a Win32 manifest file"
+complete -c fsharpc -l nowin32manifest -d "Do not include the default Win32 manifest"
+complete -c fsharpc -l "resource:" -d "Embed the specified managed resource"
+complete -c fsharpc -l "linkresource:" -d "Link the specified resource to this assembly where the resinfo format is <file>[,<string name>[,public|private]]"
+
+# Code generation
+complete -c fsharpc -s g -o "g+" -l debug -l "debug+" -d "Emit debug information"
+complete -c fsharpc -o "g-" -l "debug-" -d "Disable --debug"
+for arguments in full pdbonly portable embedded
+    complete -c fsharpc -o "g:$arguments" -l "debug:$arguments" -d "Specify debugging type"
+end
+
+complete -c fsharpc -s O -o "O+" -l optimize -l "optimize+" -d "Enable optimizations"
+complete -c fsharpc -o "O-" -l "optimize-" -d "Disable --optimize"
+complete -c fsharpc -l tailcalls -l "tailcalls+" -d "Enable or disable tailcalls"
+complete -c fsharpc -l "tailcalls-" -d "Disable --tailcalls"
+complete -c fsharpc -l deterministic -l "deterministic+" -d "Produce a deterministic assembly (including module version GUID and timestamp)"
+complete -c fsharpc -l "deterministic-" -d "Disable --deterministic"
+complete -c fsharpc -l crossoptimize -l "crossoptimize+" -d "Enable or disable cross-module optimizations"
+complete -c fsharpc -l "crossoptimize-" -d "Disable --crossoptimize"
+
+# Errors and warnings
+complete -c fsharpc -l warnaserror -l "warnaserror+" -d "Report all warnings as errors"
+complete -c fsharpc -l "warnaserror-" -d "Disable --warnaserror"
+complete -c fsharpc -l "warnaserror:" -l "warnaserror+:" -d "Report specific warnings as errors"
+complete -c fsharpc -l "warnaserror-:" -d "Disable --warnaserror:"
+
+for warning_level in (seq 0 5)
+    complete -c fsharpc -l "warn:$warning_level" -d "Set a warning level to $warning_level"
+end
+
+complete -c fsharpc -l "nowarn:" -d "Disable specific warning messages"
+complete -c fsharpc -l "warnon:" -d "Enable specific warnings that may be off by default"
+complete -c fsharpc -l consolecolors -l "consolecolors+" -d "Output warning and error messages in color"
+complete -c fsharpc -l "consolecolors-" -d "Disable --consolecolors"
+
+# Language
+complete -c fsharpc -l checked -l "checked+" -d "Generate overflow checks"
+complete -c fsharpc -l "checked-" -d "Disable --checked"
+complete -c fsharpc -o "d:" -l "define:" -d "Define conditional compilation symbols"
+complete -c fsharpc -l mlcompatibility -d "Ignore ML compatibility warnings"
+
+# Miscellaneous
+complete -c fsharpc -l nologo -d "Suppress compiler copyright message"
+complete -c fsharpc -s "?" -l help -d "Display this usage message"
+
+# Advanced
+complete -c fsharpc -l "codepage:" -d "Specify the codepage used to read source files"
+complete -c fsharpc -l utf8output -d "Output messages in UTF-8 encoding"
+complete -c fsharpc -l fullpaths -d "Output messages with fully qualified paths"
+complete -c fsharpc -o "I:" -l "lib:" -d "Specify a directory for the include path which is used to resolve source files and assemblies"
+complete -c fsharpc -l simpleresolution -d "Resolve assembly references using directory-based rules rather than MSBuild resolution"
+complete -c fsharpc -l "baseaddress:" -d "Base address for the library to be built"
+complete -c fsharpc -l noframework -d "Do not reference the default CLI assemblies by default"
+complete -c fsharpc -l standalone -d "Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated"
+complete -c fsharpc -l "staticlink:" -d "Statically link the given assembly and all referenced DLLs that depend on this assembly"
+complete -c fsharpc -l "pdb:" -d "Name the output debug file"
+complete -c fsharpc -l highentropyva -l "highentropyva+" -d "Enable high-entropy ASLR"
+complete -c fsharpc -l "highentropyva-" -d "Disable --highentropyva"
+complete -c fsharpc -l "subsystemversion:" -d "Specify subsystem version of this assembly"
+complete -c fsharpc -l "quotations-debug" -l "quotations-debug+" -d "Emit debug information in quotations"
+complete -c fsharpc -l "quotations-debug-" -d "Disable --quotations-debug"
diff --git a/share/completions/fsharpi.fish b/share/completions/fsharpi.fish
new file mode 100644
index 000000000..669229b58
--- /dev/null
+++ b/share/completions/fsharpi.fish
@@ -0,0 +1,67 @@
+# Completions for the F# Interactive
+# See: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/fsharp-interactive-options
+
+# Input files
+complete -c fsharpi -l "use:" -d "Use the given file on startup as initial input"
+complete -c fsharpi -l "load:" -d "#load the given file on startup"
+complete -c fsharpi -o "r:" -l "reference:" -d "Reference an assembly"
+
+# Code generation
+complete -c fsharpi -s g -o "g+" -l debug -l "debug+" -d "Emit debug information"
+complete -c fsharpi -o "g-" -l "debug-" -d "Disable --debug"
+for arguments in full pdbonly portable embedded
+    complete -c fsharpi -o "g:$arguments" -l "debug:$arguments" -d "Specify debugging type"
+end
+
+complete -c fsharpi -s O -o "O+" -l optimize -l "optimize+" -d "Enable optimizations"
+complete -c fsharpi -o "O-" -l "optimize-" -d "Disable --optimize"
+complete -c fsharpi -l tailcalls -l "tailcalls+" -d "Enable or disable tailcalls"
+complete -c fsharpi -l "tailcalls-" -d "Disable --tailcalls"
+complete -c fsharpi -l deterministic -l "deterministic+" -d "Produce a deterministic assembly (including module version GUID and timestamp)"
+complete -c fsharpi -l "deterministic-" -d "Disable --deterministic"
+complete -c fsharpi -l crossoptimize -l "crossoptimize+" -d "Enable or disable cross-module optimizations"
+complete -c fsharpi -l "crossoptimize-" -d "Disable --crossoptimize"
+
+# Errors and warnings
+complete -c fsharpi -l warnaserror -l "warnaserror+" -d "Report all warnings as errors"
+complete -c fsharpi -l "warnaserror-" -d "Disable --warnaserror"
+complete -c fsharpi -l "warnaserror:" -l "warnaserror+:" -d "Report specific warnings as errors"
+complete -c fsharpi -l "warnaserror-:" -d "Disable --warnaserror:"
+
+for warning_level in (seq 0 5)
+    complete -c fsharpi -l "warn:$warning_level" -d "Set a warning level to $warning_level"
+end
+
+complete -c fsharpi -l "nowarn:" -d "Disable specific warning messages"
+complete -c fsharpi -l "warnon:" -d "Enable specific warnings that may be off by default"
+complete -c fsharpi -l consolecolors -l "consolecolors+" -d "Output warning and error messages in color"
+complete -c fsharpi -l "consolecolors-" -d "Disable --consolecolors"
+
+# Language
+complete -c fsharpi -l checked -l "checked+" -d "Generate overflow checks"
+complete -c fsharpi -l "checked-" -d "Disable --checked"
+complete -c fsharpi -o "d:" -l "define:" -d "Define conditional compilation symbols"
+complete -c fsharpi -l mlcompatibility -d "Ignore ML compatibility warnings"
+
+# Miscellaneous
+complete -c fsharpi -l nologo -d "Suppress compiler copyright message"
+complete -c fsharpi -s "?" -l help -d "Display this usage message"
+
+# Advanced
+complete -c fsharpi -l "codepage:" -d "Specify the codepage used to read source files"
+complete -c fsharpi -l utf8output -d "Output messages in UTF-8 encoding"
+complete -c fsharpi -l fullpaths -d "Output messages with fully qualified paths"
+complete -c fsharpi -o "I:" -l "lib:" -d "Specify a directory for the include path which is used to resolve source files and assemblies"
+complete -c fsharpi -l simpleresolution -d "Resolve assembly references using directory-based rules rather than MSBuild resolution"
+complete -c fsharpi -l "targetprofile:" -d "Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib"
+complete -c fsharpi -l noframework -d "Do not reference the default CLI assemblies by default"
+complete -c fsharpi -l exec -d "Exit fsi after loading the files or running the .fsx script given on the command line"
+complete -c fsharpi -l gui -l "gui+" -d "Execute interactions on a Windows Forms event loop (on by default)"
+complete -c fsharpi -l "gui-" -d "Disable --gui"
+complete -c fsharpi -l quiet -d "Suppress fsi writing to stdout"
+complete -c fsharpi -l readline -l "readline+" -d "Support TAB completion in console (on by default)"
+complete -c fsharpi -l "readline-" -d "Disable --readline"
+complete -c fsharpi -l "quotations-debug" -l "quotations-debug+" -d "Emit debug information in quotations"
+complete -c fsharpi -l "quotations-debug-" -d "Disable --quotations-debug"
+complete -c fsharpi -l shadowcopyreferences -l "shadowcopyreferences+" -d "Prevents references from being locked by the F# Interactive process"
+complete -c fsharpi -l "shadowcopyreferences-" -d "Disable --shadowcopyreferences"
diff --git a/share/completions/tsc.fish b/share/completions/tsc.fish
new file mode 100644
index 000000000..302cc3030
--- /dev/null
+++ b/share/completions/tsc.fish
@@ -0,0 +1,120 @@
+# Completions for the TypeScript compiler
+# See: https://www.typescriptlang.org/docs/handbook/compiler-options.html
+
+complete -c tsc -l allowJs -d "Allow JavaScript files to be compiled"
+complete -c tsc -l allowSyntheticDefaultImports -d "Allow default imports from modules with no default export"
+complete -c tsc -l allowUmdGlobalAccess -d "Allow accessing UMD globals from modules"
+complete -c tsc -l allowUnreachableCode -d "Do not report errors on unreachable code"
+complete -c tsc -l allowUnusedLabels -d "Do not report errors on unused labels"
+complete -c tsc -l alwaysStrict -d "Parse in strict mode and emit \"use strict\" for each source file"
+complete -c tsc -l baseUrl -d "Base directory to resolve non-relative module names"
+complete -c tsc -s b -l build -d "Builds this project and all of its dependencies specified by Project References"
+complete -c tsc -l charset -d "The character set of the input files"
+complete -c tsc -l checkJs -d "Report errors in .js files"
+complete -c tsc -l composite -d "Ensure TypeScript can determine where to find the outputs of the referenced project to compile project"
+complete -c tsc -s d -l declaration -d "Generates corresponding .d.ts file"
+complete -c tsc -l declarationDir -d "Output directory for generated declaration files"
+complete -c tsc -l declarationMap -d "Generates a sourcemap for each corresponding ‘.d.ts’ file"
+complete -c tsc -l diagnostics -d "Show diagnostic information"
+complete -c tsc -l disableSizeLimit -d "Disable size limitation on JavaScript project"
+complete -c tsc -l downlevelIteration -d "Provide full support for iterables in for..of, spread and destructuring when targeting ES5 or ES3"
+complete -c tsc -l emitBOM -d "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files"
+complete -c tsc -l emitDeclarationOnly -d "Only emit ‘.d.ts’ declaration files"
+complete -c tsc -l emitDecoratorMetadata -d "Emit design-type metadata for decorated declarations in source"
+complete -c tsc -l esModuleInterop -d "Emit __importStar and __importDefault helpers for runtime babel ecosystem compatibility and enable --allowSyntheticDefaultImports for typesystem compatibility"
+complete -c tsc -l experimentalDecorators -d "Enables experimental support for ES decorators"
+complete -c tsc -l extendedDiagnostics -d "Show verbose diagnostic information"
+complete -c tsc -l forceConsistentCasingInFileNames -d "Disallow inconsistently-cased references to the same file"
+complete -c tsc -s h -l help -d "Print help message"
+complete -c tsc -l importHelpers -d "Import emit helpers (e.g. __extends, __rest, etc..) from tslib"
+complete -c tsc -l incremental -d "Enable incremental compilation by reading/writing information from prior compilations to a file on disk"
+complete -c tsc -l inlineSourceMap -d "Emit a single file with source maps instead of having a separate file"
+complete -c tsc -l inlineSources -d "Emit the source alongside the sourcemaps within a single file"
+complete -c tsc -l init -d "Initializes a TypeScript project and creates a tsconfig.json file"
+complete -c tsc -l isolatedModules -d "Transpile each file as a separate module (similar to “ts.transpileModule”)"
+complete -c tsc -l jsx -d "Support JSX in .tsx files: \"react\", \"preserve\", \"react-native\""
+complete -c tsc -l jsxFactory -d "Specify the JSX factory function to use when targeting react JSX emit, e.g. React.createElement or h"
+complete -c tsc -l keyofStringsOnly -d "Resolve keyof to string valued property names only (no numbers or symbols)"
+complete -c tsc -l lib -x -a "ES5 ES6 ES2015 ES7 ES2016 ES2017 ES2018 ESNext DOM DOM.Iterable WebWorker ScriptHost ES2015.Core ES2015.Collection ES2015.Generator ES2015.Iterable ES2015.Promise ES2015.Proxy ES2015.Reflect ES2015.Symbol ES2015.Symbol.WellKnown ES2016.Array.Include ES2017.object ES2017.Intl ES2017.SharedMemory ES2017.String ES2017.TypedArrays ES2018.Intl ES2018.Promise ES2018.RegExp ESNext.AsyncIterable ESNext.Array ESNext.Intl ESNext.Symbol" -d "List of library files to be included in the compilation"
+complete -c tsc -l listEmittedFiles -d "Print names of generated files part of the compilation"
+complete -c tsc -l listFiles -d "Print names of files part of the compilation"
+
+complete -c tsc -l locale -x -a "(
+    printf '%s\t%s\n' en 'English (US)'
+    printf '%s\t%s\n' cs Czech
+    printf '%s\t%s\n' de German
+    printf '%s\t%s\n' es Spanish
+    printf '%s\t%s\n' fr French
+    printf '%s\t%s\n' it Italian
+    printf '%s\t%s\n' ja Japanese
+    printf '%s\t%s\n' ko Korean
+    printf '%s\t%s\n' pl Polish
+    printf '%s\t%s\n' pt-BR 'Portuguese(Brazil)'
+    printf '%s\t%s\n' ru Russian
+    printf '%s\t%s\n' tr Turkish
+    printf '%s\t%s\n' zh-CN 'Simplified Chinese'
+    printf '%s\t%s\n' zh-TW 'Traditional Chinese'
+)" -d "The locale to use to show error messages, e.g. en-us"
+
+complete -c tsc -l mapRoot -d "Specifies the location where debugger should locate map files instead of generated locations"
+complete -c tsc -l maxNodeModuleJsDepth -d "The maximum dependency depth to search under node_modules and load JavaScript files"
+complete -c tsc -s m -l module -x -a "None CommonJS AMD System UMD ES6 ES2015 ESNext" -d "Specify module code generation"
+complete -c tsc -l moduleResolution -x -a "Node Classic" -d "Determine how modules get resolved"
+
+complete -c tsc -l newLine -x -a "(
+    printf '%s\t%s\n' crlf windows
+    printf '%s\t%s\n' lf unix
+)" -d "Use the specified end of line sequence to be used when emitting files"
+
+complete -c tsc -l noEmit -d "Do not emit outputs"
+complete -c tsc -l noEmitHelpers -d "Do not generate custom helper functions like __extends in compiled output"
+complete -c tsc -l noEmitOnError -d "Do not emit outputs if any errors were reported"
+complete -c tsc -l noErrorTruncation -d "Do not truncate error messages"
+complete -c tsc -l noFallthroughCasesInSwitch -d "Report errors for fallthrough cases in switch statement"
+complete -c tsc -l noImplicitAny -d "Raise error on expressions and declarations with an implied any type"
+complete -c tsc -l noImplicitReturns -d "Report an error when not all code paths in function return a value"
+complete -c tsc -l noImplicitThis -d "Raise error on this expressions with an implied any type"
+complete -c tsc -l noImplicitUseStrict -d "Do not emit \"use strict\" directives in module output"
+complete -c tsc -l noLib -d "Do not include the default library file (lib.d.ts)"
+complete -c tsc -l noResolve -d "Do not add triple-slash references or module import targets to the list of compiled files"
+complete -c tsc -l noStrictGenericChecks -d "Disable strict checking of generic signatures in function types"
+complete -c tsc -l noUnusedLocals -d "Report errors on unused locals"
+complete -c tsc -l noUnusedParameters -d "Report errors on unused parameters"
+complete -c tsc -l outDir -d "Redirect output structure to the directory"
+complete -c tsc -l outFile -d "Concatenate and emit output to single file"
+complete -c tsc -l preserveConstEnums -d "Do not erase const enum declarations in generated code"
+complete -c tsc -l preserveSymlinks -d "Do not resolve symlinks to their real path; treat a symlinked file like a real one"
+complete -c tsc -l preserveWatchOutput -d "Keep outdated console output in watch mode instead of clearing the screen"
+complete -c tsc -l pretty -d "Stylize errors and messages using color and context"
+complete -c tsc -s p -l project -d "Compile a project given a valid configuration file"
+complete -c tsc -l removeComments -d "Remove all comments except copy-right header comments beginning with /*!"
+complete -c tsc -l resolveJsonModule -d "Include modules imported with .json extension"
+complete -c tsc -l rootDir -d "Specifies the root directory of input files"
+complete -c tsc -l showConfig -d "Rather than actually execute a build with the other input options and config files, show the final implied config file in the output"
+complete -c tsc -l skipLibCheck -d "Skip type checking of all declaration files (*.d.ts)"
+complete -c tsc -l sourceMap -d "Generates corresponding .map file"
+complete -c tsc -l sourceRoot -d "Specifies the location where debugger should locate TypeScript files instead of source locations"
+complete -c tsc -l strict -d "Enable all strict type checking options"
+complete -c tsc -l strictBindCallApply -d "Enable stricter checking of the bind, call, and apply methods on functions"
+complete -c tsc -l strictFunctionTypes -d "Disable bivariant parameter checking for function types"
+complete -c tsc -l strictPropertyInitialization -d "Ensure non-undefined class properties are initialized in the constructor"
+complete -c tsc -l strictNullChecks -d "In strict null checking mode, the null and undefined values are not in the domain of every type and are only assignable to themselves and any (the one exception being that undefined is also assignable to void)"
+complete -c tsc -l suppressExcessPropertyErrors -d "Suppress excess property checks for object literals"
+complete -c tsc -l suppressImplicitAnyIndexErrors -d "Suppress --noImplicitAny errors for indexing objects lacking index signatures"
+
+complete -c tsc -s t -l target -x -a "(
+    printf '%s\t%s\n' ES3 'ECMAScript 3 (default)'
+    printf '%s\t%s\n' ES5 'ECMAScript 5'
+    printf '%s\t%s\n' ES6 'ECMAScript 6'
+    printf '%s\t%s\n' ES2015 'ECMAScript 2015'
+    printf '%s\t%s\n' ES2016 'ECMAScript 2016'
+    printf '%s\t%s\n' ES2017 'ECMAScript 2017'
+    printf '%s\t%s\n' ESNext 'Latest supported ECMAScript'
+)" -d "Specify ECMAScript target version"
+
+complete -c tsc -l traceResolution -d "Report module resolution log messages"
+complete -c tsc -l tsBuildInfoFile -d "Specify what file to store incremental build information in"
+complete -c tsc -l types -d "List of names of type definitions to include"
+complete -c tsc -l typeRoots -d "List of folders to include type definitions from"
+complete -c tsc -s v -l version -d "Print the compiler’s version"
+complete -c tsc -s w -l watch -d "Run the compiler in watch mode"
diff --git a/share/completions/vbc.fish b/share/completions/vbc.fish
new file mode 100644
index 000000000..4a2477199
--- /dev/null
+++ b/share/completions/vbc.fish
@@ -0,0 +1,140 @@
+# Completions for the Visual Basic Compiler(Roslyn)
+# See: https://docs.microsoft.com/en-us/dotnet/visual-basic/reference/command-line-compiler/compiler-options-listed-by-category
+
+# Compiler output
+complete -c vbc -o nologo -d "Suppresses compiler banner information"
+complete -c vbc -o utf8output -o "utf8output+" -d "Displays compiler output using UTF-8 encoding"
+complete -c vbc -o "utf8output-" -d "Disable -utf8output"
+complete -c vbc -o verbose -o "verbose+" -d "Outputs extra information during compilation"
+complete -c vbc -o "verbose-" -d "Disable -verbose"
+complete -c vbc -o "modulename:" -d "Specify the name of the source module"
+complete -c vbc -o "preferreduilang:" -d "Specify a language for compiler output"
+
+# Optimization
+for bytes in 512 1024 2048 4096 8192
+    complete -c vbc -o "filealign:$bytes" -d "Specifies where to align the sections of the output file"
+end
+
+complete -c vbc -o optimize -o "optimize+" -d "Enable optimizations"
+complete -c vbc -o "optimize-" -d "Disable optimizations"
+
+# Output files
+complete -c vbc -o doc -o "doc:" -o "doc+" -d "Process documentation comments to an XML file"
+complete -c vbc -o "doc-" -d "Disable -doc"
+complete -c vbc -o deterministic -d "Causes the compiler to output an assembly whose binary content is identical across compilations if inputs are identical"
+complete -c vbc -o netcf -d "Sets the compiler to target the .NET Compact Framework"
+complete -c vbc -o "out:" -d "Specifies an output file"
+complete -c vbc -o refonly -d "Outputs only a reference assembly"
+complete -c vbc -o "refout:" -d "Specifies the output path of a reference assembly"
+complete -c vbc -o "t:exe" -o "target:exe" -d "Causes the compiler to create an executable console application (default)"
+complete -c vbc -o "t:library" -o "target:library" -d "Causes the compiler to create a dynamic-link library (DLL)"
+complete -c vbc -o "t:module" -o "target:module" -d "Causes the compiler to generate a module that can be added to an assembly"
+complete -c vbc -o "t:winexe" -o "target:winexe" -d "Causes the compiler to create an executable Windows-based application"
+complete -c vbc -o "t:appcontainerexe" -o "target:appcontainerexe" -d "Causes the compiler to create an executable Windows-based application that must be run in an app container"
+complete -c vbc -o "t:winmdobj" -o "target:winmdobj" -d "Causes the compiler to create an intermediate file that you can convert to a Windows Runtime binary (.winmd) file"
+
+# .NET assemblies
+complete -c vbc -o "addmodule:" -d "Causes the compiler to make all type information from the specified file(s) available to the project you are currently compiling"
+complete -c vbc -o delaysign -o "delaysign+" -d "Specifies whether the assembly will be fully or partially signed"
+complete -c vbc -o "delaysign-" -d "Disable -delaysign"
+complete -c vbc -o "imports:" -d "Imports a namespace from a specified assembly"
+complete -c vbc -o "keycontainer:" -d "Specifies a key container name for a key pair to give an assembly a strong name"
+complete -c vbc -o "keyfile:" -d "Specifies a file containing a key or key pair to give an assembly a strong name"
+complete -c vbc -o "libpath:" -d "Specifies the location of assemblies referenced by the -reference option"
+complete -c vbc -o "r:" -o "reference:" -d "Imports metadata from an assembly"
+complete -c vbc -o "moduleassemblyname:" -d "Specifies the name of the assembly that a module will be a part of"
+complete -c vbc -o "a:" -o "analyzer:" -d "Run the analyzers from this assembly"
+complete -c vbc -o "additionalfile:" -d "Names additional files that don't directly affect code generation but may be used by analyzers for producing errors or warnings"
+
+# Debugging/error checking
+complete -c vbc -o "bugreport:" -d "Creates a file that contains information that makes it easy to report a bug"
+
+complete -c vbc -o debug -o "debug+" -d "Produces debugging information"
+for arguments in full pdbonly
+    complete -c vbc -o "debug:$arguments" -d "Produces debugging information"
+end
+complete -c vbc -o "debug-" -d "Disable -debug"
+
+complete -c vbc -o nowarn -o "nowarn:" -d "Suppresses the compiler's ability to generate warnings"
+complete -c vbc -o quiet -d "Prevents the compiler from displaying code for syntax-related errors and warnings"
+complete -c vbc -o removeintchecks -o "removeintchecks+" -d "Disables integer overflow checking"
+complete -c vbc -o "removeintchecks-" -d "Disable -removeintchecks"
+complete -c vbc -o warnaserror -o "warnaserror:" -o "warnaserror+" -o "warnaserror+:" -d "Promotes warnings to errors"
+complete -c vbc -o "warnaserror-" -o "warnaserror-:" -d "Disable -warnaserror"
+complete -c vbc -o "ruleset:" -d "Specify a ruleset file that disables specific diagnostics"
+
+# Help
+complete -c vbc -s "?" -o help -d "Displays the compiler options"
+
+# Language
+complete -c vbc -o "langversion:?" -d "Display the allowed values for language version"
+complete -c vbc -o "langversion:default" -d "Specify latest major version as language version"
+complete -c vbc -o "langversion:latest" -d "Specify latest version (including minor releases) as language version"
+for version_number in (seq 9 15)
+    switch $version_number
+        case (seq 9 12) 14
+            complete -c vbc -o "langversion:$version_number" -d "Specify $version_number as language version"
+            complete -c vbc -o "langversion:$version_number.0" -d "Specify $version_number.0 as language version"
+        case 15
+            complete -c vbc -o "langversion:$version_number" -d "Specify $version_number as language version"
+            complete -c vbc -o "langversion:$version_number.0" -d "Specify $version_number.0 as language version"
+            complete -c vbc -o "langversion:$version_number.3" -d "Specify $version_number.3 as language version"
+            complete -c vbc -o "langversion:$version_number.5" -d "Specify $version_number.5 as language version"
+    end
+end
+
+complete -c vbc -o optionexplicit -o "optionexplicit+" -d "Enforces explicit declaration of variables"
+complete -c vbc -o "optionexplicit-" -d "Disable -optionexplicit"
+complete -c vbc -o optionstrict -o "optionstrict+" -o "optionstrict:" -d "Enforces strict type semantics"
+complete -c vbc -o "optionstrict-" -d "Disable -optionstrict"
+
+for arguments in binary text
+    complete -c vbc -o "optioncompare:$arguments" -d "Specifies whether string comparisons should be binary or use locale-specific text semantics"
+end
+
+complete -c vbc -o optioninfer -o "optioninfer+" -d "Enables the use of local type inference in variable declarations"
+complete -c vbc -o "optioninfer-" -d "Disable -optioninfer"
+
+# Preprocessor
+complete -c vbc -o "d:" -o "define:" -d "Defines symbols for conditional compilation"
+
+# Resources
+complete -c vbc -o "linkres:" -o "linkresource:" -d "Creates a link to a managed resource"
+complete -c vbc -o "res:" -o "resource:" -d "Embeds a managed resource in an assembly"
+complete -c vbc -o "win32icon:" -d "Inserts an .ico file into the output file"
+complete -c vbc -o "win32resource:" -d "Inserts a Win32 resource into the output file"
+
+# Miscellaneous
+complete -c vbc -o "baseaddress:" -d "Specifies the base address of a DLL"
+complete -c vbc -o "codepage:" -d "Specifies the code page to use for all source code files in the compilation"
+
+for arguments in prompt queue send none
+    complete -c vbc -o "errorreport:$arguments" -d "Specifies how the Visual Basic compiler should report internal compiler errors"
+end
+
+complete -c vbc -o highentropyva -o "highentropyva+" -d "Tells the Windows kernel whether a particular executable supports high entropy Address Space Layout Randomization (ASLR)"
+complete -c vbc -o "highentropyva-" -d "Disable -highentropyva"
+complete -c vbc -o "m:" -o "main:" -d "Specifies the class that contains the Sub Main procedure to use at startup"
+complete -c vbc -o noconfig -d "Do not compile with Vbc.rsp"
+complete -c vbc -o nostdlib -d "Causes the compiler not to reference the standard libraries"
+complete -c vbc -o nowin32manifest -d "Instructs the compiler not to embed any application manifest into the executable file"
+complete -c vbc -o "platform:x86" -d "Specify x86 as the processor platform the compiler targets for the output file"
+complete -c vbc -o "platform:x64" -d "Specify AMD64 or EM64T as the processor platform the compiler targets for the output file"
+complete -c vbc -o "platform:Itanium" -d "Specify Itanium as the processor platform the compiler targets for the output file"
+complete -c vbc -o "platform:arm" -d "Specify ARM as the processor platform the compiler targets for the output file"
+complete -c vbc -o "platform:anycpu" -d "Specify any platform as the processor platform the compiler targets for the output file (default)"
+complete -c vbc -o "platform:anycpu32bitpreferred" -d "Specify any platform as the processor platform the compiler targets for the output file"
+complete -c vbc -o "recurse:" -d "Searches subdirectories for source files to compile"
+complete -c vbc -o "rootnamespace:" -d "Specifies a namespace for all type declarations"
+complete -c vbc -o "sdkpath:" -d "Specifies the location of Mscorlib.dll and Microsoft.VisualBasic.dll"
+
+complete -c vbc -o "vbruntime:" -d "Specifies that the compiler should compile without a reference to the Visual Basic Runtime Library, or with a reference to a specific runtime library"
+for arguments in - + "*"
+    complete -c vbc -o "vbruntime:$arguments" -d "Specifies that the compiler should compile without a reference to the Visual Basic Runtime Library, or with a reference to a specific runtime library"
+end
+
+complete -c vbc -o "win32manifest:" -d "Identifies a user-defined Win32 application manifest file to be embedded into a project's portable executable (PE) file"
+complete -c vbc -o parallel -o "parallel+" -d "Specifies whether to use concurrent build"
+complete -c vbc -o "parallel-" -d "Disable -parallel"
+complete -c vbc -o "checksumalgorithm:SHA1" -d "Specify SHA1 as the algorithm for calculating the source file checksum stored in PDB (default)"
+complete -c vbc -o "checksumalgorithm:SHA256" -d "Specify SHA256 as the algorithm for calculating the source file checksum stored in PDB"

From 0083555925b7866a1ba3884c03e248fd34105c52 Mon Sep 17 00:00:00 2001
From: mk2 <mk2@mk2.red>
Date: Sun, 4 Aug 2019 11:43:15 +0900
Subject: [PATCH 0834/1732] Move __fish_complete_abook_formats to abook

---
 share/completions/abook.fish                       | 13 +++++++++++++
 share/functions/__fish_complete_abook_formats.fish | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 share/functions/__fish_complete_abook_formats.fish

diff --git a/share/completions/abook.fish b/share/completions/abook.fish
index a2dc51b97..7ba131ee1 100644
--- a/share/completions/abook.fish
+++ b/share/completions/abook.fish
@@ -1,4 +1,17 @@
 
+function __fish_complete_abook_formats --description 'Complete abook formats'
+    set -l pat
+    switch $argv[1]
+        case in
+            set pat '/output:/,$d; /input:\|^$/d'
+        case out
+            set pat '/input:/,/output:/d; /^$/d'
+        case '*'
+            return 1
+    end
+    abook --formats | sed -e $pat -e 's/^\s\+//'
+end
+
 complete -c abook -s h -d 'Show usage'
 complete -c abook -s C -l config -d 'Use an alternative configuration file' -r
 complete -c abook -l datafile -d 'Use an alternative addressbook file' -r
diff --git a/share/functions/__fish_complete_abook_formats.fish b/share/functions/__fish_complete_abook_formats.fish
deleted file mode 100644
index bc58a2267..000000000
--- a/share/functions/__fish_complete_abook_formats.fish
+++ /dev/null
@@ -1,13 +0,0 @@
-function __fish_complete_abook_formats --description 'Complete abook formats'
-    set -l pat
-    switch $argv[1]
-        case in
-            set pat '/output:/,$d; /input:\|^$/d'
-        case out
-            set pat '/input:/,/output:/d; /^$/d'
-        case '*'
-            return 1
-    end
-    abook --formats | sed -e $pat -e 's/^\s\+//'
-
-end

From 75a6ad602fc60357faf7cd869edc7fb6a7b53f0c Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Sun, 4 Aug 2019 02:53:17 -0700
Subject: [PATCH 0835/1732] completions/canto.fish: s/cnato/canto/

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

diff --git a/share/completions/canto.fish b/share/completions/canto.fish
index 23f01f78f..98008712e 100644
--- a/share/completions/canto.fish
+++ b/share/completions/canto.fish
@@ -25,7 +25,7 @@ complete -f -c canto -s n -l checknew -d 'Show number of new items for feed'
 complete -f -c canto -n '__fish_canto_using_command -l --checknew' -d 'Feed' -a '(command canto -l)'
 
 complete -c canto -s o -l opml -d 'Print conf as OPML'
-complete -c cnato -s i -l import -d 'Import from OPML'
+complete -c canto -s i -l import -d 'Import from OPML'
 complete -f -c canto -s r -l url -d 'Add feed'
 
 complete -c canto -s D -l dir -d 'Set configuration directory'

From 0fc4b415ac9a147ec894813c4c6a9042a52f0450 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:24:18 +0200
Subject: [PATCH 0836/1732] Fix rgrep completions

This used the arguments the wrong way around.
---
 share/completions/rgrep.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/rgrep.fish b/share/completions/rgrep.fish
index 5662e5229..ea5b3a9e8 100644
--- a/share/completions/rgrep.fish
+++ b/share/completions/rgrep.fish
@@ -1 +1 @@
-complete -c grep -w rgrep
+complete -c rgrep -w grep

From 8ea034837dc4d478f8daa329380edc5333f13c8a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:25:33 +0200
Subject: [PATCH 0837/1732] Remove pacsrv completions

These have been broken for 4 years (completed `pacsrc` instead), and I
can't find the tool anywhere.

[ci skip]
---
 share/completions/pacsrv.fish | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 share/completions/pacsrv.fish

diff --git a/share/completions/pacsrv.fish b/share/completions/pacsrv.fish
deleted file mode 100644
index 6ca7ac0a0..000000000
--- a/share/completions/pacsrv.fish
+++ /dev/null
@@ -1 +0,0 @@
-complete -c pacsrc -w pacman

From ab1b2b84f6c93187259a93d4a39112403816d800 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:30:59 +0200
Subject: [PATCH 0838/1732] Move netcat completions to an autoloadable name

The file was named "netcat", but it completes a tool named "nc", so it
wouldn't be loaded.

[ci skip]
---
 share/completions/{netcat.fish => nc.fish} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename share/completions/{netcat.fish => nc.fish} (100%)

diff --git a/share/completions/netcat.fish b/share/completions/nc.fish
similarity index 100%
rename from share/completions/netcat.fish
rename to share/completions/nc.fish

From 3fd567749c5257607051e98560f36ee0717e8b38 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:31:29 +0200
Subject: [PATCH 0839/1732] Fix latex tool completions

Again the wrapping was used the wrong way around.

(also why on earth are there like fifty of these darn things?)

[ci skip]
---
 share/completions/elatex.fish    | 2 +-
 share/completions/etex.fish      | 2 +-
 share/completions/latex.fish     | 2 +-
 share/completions/lualatex.fish  | 2 +-
 share/completions/omega.fish     | 2 +-
 share/completions/pdfelatex.fish | 2 +-
 share/completions/pdfetex.fish   | 2 +-
 share/completions/pdflatex.fish  | 2 +-
 share/completions/pdftex.fish    | 2 +-
 share/completions/xelatex.fish   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/share/completions/elatex.fish b/share/completions/elatex.fish
index 5d0b5a71c..57f46615b 100644
--- a/share/completions/elatex.fish
+++ b/share/completions/elatex.fish
@@ -1,2 +1,2 @@
-complete -c tex -w elatex
+complete -c elatex -w tex
 
diff --git a/share/completions/etex.fish b/share/completions/etex.fish
index 6b05c91fb..575e05eaf 100644
--- a/share/completions/etex.fish
+++ b/share/completions/etex.fish
@@ -1 +1 @@
-complete -c tex -w etex
+complete -c etex -w tex
diff --git a/share/completions/latex.fish b/share/completions/latex.fish
index 635b6dc4d..f72e04a7b 100644
--- a/share/completions/latex.fish
+++ b/share/completions/latex.fish
@@ -1,2 +1,2 @@
-complete -c tex -w latex
+complete -c latex -w tex
 
diff --git a/share/completions/lualatex.fish b/share/completions/lualatex.fish
index 168ee6a41..279080671 100644
--- a/share/completions/lualatex.fish
+++ b/share/completions/lualatex.fish
@@ -1,2 +1,2 @@
-complete -c tex -w lualatex
+complete -c lualatex -w tex
 
diff --git a/share/completions/omega.fish b/share/completions/omega.fish
index 661cae5ea..13aba6c80 100644
--- a/share/completions/omega.fish
+++ b/share/completions/omega.fish
@@ -1,2 +1,2 @@
-complete -c tex -w omega
+complete -c omega -w tex
 
diff --git a/share/completions/pdfelatex.fish b/share/completions/pdfelatex.fish
index 3f2f7a3b8..9df0bf8e2 100644
--- a/share/completions/pdfelatex.fish
+++ b/share/completions/pdfelatex.fish
@@ -1,3 +1,3 @@
-complete -c tex -w pdfelatex
+complete -c pdfelatex -w tex
 
 
diff --git a/share/completions/pdfetex.fish b/share/completions/pdfetex.fish
index 162cd76b2..60e1329e1 100644
--- a/share/completions/pdfetex.fish
+++ b/share/completions/pdfetex.fish
@@ -1,3 +1,3 @@
-complete -c tex -w pdfetex
+complete -c pdfetex -w tex
 
 
diff --git a/share/completions/pdflatex.fish b/share/completions/pdflatex.fish
index e0c52630a..7f59bc364 100644
--- a/share/completions/pdflatex.fish
+++ b/share/completions/pdflatex.fish
@@ -1,2 +1,2 @@
-complete -c tex -w pdflatex
+complete -c pdflatex -w tex
 
diff --git a/share/completions/pdftex.fish b/share/completions/pdftex.fish
index dbe486207..025a483cb 100644
--- a/share/completions/pdftex.fish
+++ b/share/completions/pdftex.fish
@@ -1,3 +1,3 @@
-complete -c tex -w pdftex
+complete -c pdftex -w tex
 
 
diff --git a/share/completions/xelatex.fish b/share/completions/xelatex.fish
index 4d44c97ae..09098fbfc 100644
--- a/share/completions/xelatex.fish
+++ b/share/completions/xelatex.fish
@@ -1,2 +1,2 @@
-complete -c tex -w xelatex
+complete -c xelatex -w latex
 

From 3296bb6c3b47b5da0db166fef88b3f601602b44c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:32:30 +0200
Subject: [PATCH 0840/1732] Fix apt-show-versions command name

[ci skip]
---
 share/completions/apt-show-versions.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/apt-show-versions.fish b/share/completions/apt-show-versions.fish
index b3d4f8a60..61bb661f0 100644
--- a/share/completions/apt-show-versions.fish
+++ b/share/completions/apt-show-versions.fish
@@ -1,5 +1,5 @@
 #apt-show-versions
-complete -c apt-show-source -s h -l help -d 'Display help and exit'
+complete -c apt-show-versions -s h -l help -d 'Display help and exit'
 complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d 'Print PKG versions'
 complete -f -c apt-show-versions -s r -l regex -d 'Using regex'
 complete -f -c apt-show-versions -s u -l upgradeable -d 'Print only upgradeable packages'

From 2c3bc1e857741b4a1b57e703cdf07b2c887ec6ed Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 4 Aug 2019 15:33:28 +0200
Subject: [PATCH 0841/1732] Fix grep wrapper completions

[ci skip]
---
 share/completions/egrep.fish | 2 +-
 share/completions/fgrep.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/egrep.fish b/share/completions/egrep.fish
index 7f6714372..4ba90a782 100644
--- a/share/completions/egrep.fish
+++ b/share/completions/egrep.fish
@@ -1 +1 @@
-complete -c grep -w egrep
+complete -c egrep -w grep
diff --git a/share/completions/fgrep.fish b/share/completions/fgrep.fish
index 0ce7c6a6c..211209a28 100644
--- a/share/completions/fgrep.fish
+++ b/share/completions/fgrep.fish
@@ -1 +1 @@
-complete -c grep -w fgrep
+complete -c fgrep -w grep

From 29dede813918a2c42030d1b1b07fd07bcfce72e9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 4 Aug 2019 14:49:56 -0700
Subject: [PATCH 0842/1732] Migrate parse_util_detect_errors to a free function

---
 src/builtin_complete.cpp |  5 ++---
 src/parse_util.cpp       | 32 ++++++++++++++++++++++++++++++++
 src/parse_util.h         |  5 +++++
 src/parser.cpp           | 35 -----------------------------------
 src/parser.h             |  5 -----
 5 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 8f33632bb..8ae0bb528 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -303,11 +303,10 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         prefix.append(cmd);
         prefix.append(L": ");
 
-        wcstring err_text;
-        if (parser.detect_errors_in_argument_list(comp, &err_text, prefix.c_str())) {
+        if (maybe_t<wcstring> err_text = parse_util_detect_errors_in_argument_list(comp, prefix)) {
             streams.err.append_format(L"%ls: Completion '%ls' contained a syntax error\n", cmd,
                                       comp);
-            streams.err.append(err_text);
+            streams.err.append(*err_text);
             streams.err.push_back(L'\n');
             return STATUS_CMD_ERROR;
         }
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 7f5c14f05..b4348f7d3 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1333,3 +1333,35 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
 
     return res;
 }
+
+maybe_t<wcstring> parse_util_detect_errors_in_argument_list(const wcstring &arg_list_src,
+                                                            const wcstring &prefix) {
+    // Helper to return a description of the first error.
+    auto get_error_text = [&](const parse_error_list_t &errors) {
+        assert(!errors.empty() && "Expected an error");
+        return errors.at(0).describe_with_prefix(arg_list_src, prefix, false /* not interactive */,
+                                                 false /* don't skip caret */);
+    };
+
+    // Parse the string as an argument list.
+    parse_error_list_t errors;
+    parse_node_tree_t tree;
+    if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, &errors,
+                                symbol_freestanding_argument_list)) {
+        // Failed to parse.
+        return get_error_text(errors);
+    }
+
+    // Get the root argument list and extract arguments from it.
+    // Test each of these.
+    assert(!tree.empty() && "Should have parsed a tree");
+    tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
+    while (auto arg = arg_list.next_in_list<grammar::argument>()) {
+        const wcstring arg_src = arg.get_source(arg_list_src);
+        if (parse_util_detect_errors_in_argument(arg, arg_src, &errors)) {
+            return get_error_text(errors);
+        }
+    }
+
+    return none();
+}
diff --git a/src/parse_util.h b/src/parse_util.h
index 74438544c..e862b796f 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -132,6 +132,11 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
                                                   bool allow_incomplete = true,
                                                   parsed_source_ref_t *out_pstree = NULL);
 
+/// Detect errors in the specified string when parsed as an argument list. Returns the text of an
+/// error, or none if no error occurred.
+maybe_t<wcstring> parse_util_detect_errors_in_argument_list(const wcstring &arg_list_src,
+                                                            const wcstring &prefix = {});
+
 /// Test if this argument contains any errors. Detected errors include syntax errors in command
 /// substitutions, improperly escaped characters and improper use of the variable expansion
 /// operator. This does NOT currently detect unterminated quotes.
diff --git a/src/parser.cpp b/src/parser.cpp
index 73d7e10b7..bfaf9a003 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -680,41 +680,6 @@ template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>
                                  const io_chain_t &, enum block_type_t,
                                  std::shared_ptr<job_t> parent_job);
 
-bool parser_t::detect_errors_in_argument_list(const wcstring &arg_list_src, wcstring *out,
-                                              const wchar_t *prefix) const {
-    bool errored = false;
-    parse_error_list_t errors;
-
-    // Use empty string for the prefix if it's NULL.
-    if (!prefix) prefix = L"";  //!OCLINT(parameter reassignment)
-
-    // Parse the string as an argument list.
-    parse_node_tree_t tree;
-    if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, &errors,
-                                symbol_freestanding_argument_list)) {
-        // Failed to parse.
-        errored = true;
-    }
-
-    if (!errored) {
-        // Get the root argument list and extract arguments from it.
-        assert(!tree.empty());  //!OCLINT(multiple unary operator)
-        tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
-        while (auto arg = arg_list.next_in_list<grammar::argument>()) {
-            const wcstring arg_src = arg.get_source(arg_list_src);
-            if (parse_util_detect_errors_in_argument(arg, arg_src, &errors)) {
-                errored = true;
-            }
-        }
-    }
-
-    if (!errors.empty() && out != NULL) {
-        out->assign(errors.at(0).describe_with_prefix(
-            arg_list_src, prefix, false /* not interactive */, false /* don't skip caret */));
-    }
-    return errored;
-}
-
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                              wcstring &output) const {
     if (!errors.empty()) {
diff --git a/src/parser.h b/src/parser.h
index c522be72d..09842702d 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -335,11 +335,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     void get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                        wcstring &output) const;
 
-    /// Detect errors in the specified string when parsed as an argument list. Returns true if an
-    /// error occurred.
-    bool detect_errors_in_argument_list(const wcstring &arg_list_src, wcstring *out_err,
-                                        const wchar_t *prefix) const;
-
     /// Tell the parser that the specified function may not be run if not inside of a conditional
     /// block. This is to remove some possibilities of infinite recursion.
     void forbid_function(const wcstring &function);

From 9b89b820da99bde4d93484223fb3746b162b938d Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Sun, 4 Aug 2019 18:18:09 -0700
Subject: [PATCH 0843/1732] Add completions/src.fish

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

diff --git a/share/completions/src.fish b/share/completions/src.fish
new file mode 100644
index 000000000..fe62d1301
--- /dev/null
+++ b/share/completions/src.fish
@@ -0,0 +1,85 @@
+# Generated by hand from <http://www.catb.org/~esr/src/src.html> as of src 1.26.
+
+# TODO?: add short synonyms like ci, am
+# TODO: extract tag/branch names and feed to -a for tag delete, branch delete, rename
+
+complete -c src -f -n '__fish_use_subcommand'   -a help  -d 'Displays help for commands'
+complete -c src -f -n '__fish_seen_subcommand_from help' -a 'intro revisions commands commit amend checkout cat status log list diff fast-export fast-import ignores'
+
+complete -c src    -n '__fish_use_subcommand'   -a commit       -d 'Enters a commit for the specified files'
+complete -c src -x -n '__fish_seen_subcommand_from commit' -s m -d 'Enter commit message as a string'
+complete -c src -r -n '__fish_seen_subcommand_from commit' -s f -d 'Enter file containing commit message'
+complete -c src    -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
+
+complete -c src -r -n '__fish_use_subcommand'   -a amend       -d 'Amends the stored comment for a specified revision'
+complete -c src -x -n '__fish_seen_subcommand_from amend' -s m -d 'Enter commit message as a string'
+complete -c src -r -n '__fish_seen_subcommand_from amend' -s f -d 'Enter file containing commit message'
+complete -c src    -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
+
+complete -c src -r -n '__fish_use_subcommand' -a checkout -d 'Refresh working copy from history'
+
+complete -c src -r -n '__fish_use_subcommand' -a cat -d 'Send the specified revision of the files to standard output'
+
+complete -c src -r -n '__fish_use_subcommand'   -a status       -d 'Show status of files'
+complete -c src    -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
+
+complete -c src -r -n '__fish_use_subcommand'   -a tag            -d 'List/create/delete tags'
+complete -c src    -n '__fish_seen_subcommand_from tag' -a list   -d 'List tags'
+complete -c src    -n '__fish_seen_subcommand_from tag' -s l      -d 'List tags'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -a create -d 'Create tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s c      -d 'Create tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -a delete -d 'Delete tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s d      -d 'Delete tag'
+
+complete -c src -r -n '__fish_use_subcommand'   -a branch            -d 'List/create/delete branches'
+complete -c src    -n '__fish_seen_subcommand_from branch' -a list   -d 'List branches'
+complete -c src    -n '__fish_seen_subcommand_from branch' -s l      -d 'List branches'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -a create -d 'Create branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s c      -d 'Create branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -a delete -d 'Delete branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s d      -d 'Delete branch'
+
+complete -c src -r -n '__fish_use_subcommand'   -a rename            -d 'Rename tag/branch'
+
+complete -c src -r -n '__fish_use_subcommand'   -a list              -d 'List information about commits'
+# TODO: support `src list -<n>`
+complete -c src -x -n '__fish_seen_subcommand_from list' -s l        -d 'Limit per-file commit count'
+complete -c src -x -n '__fish_seen_subcommand_from list' -s f        -d 'Specify format string'
+
+# NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
+complete -c src -r -n '__fish_use_subcommand'   -a log                                           -d 'List information about commits'
+complete -c src -x -n '__fish_seen_subcommand_from log' -s v                                     -d 'Be more verbose'
+# TODO: support `src log -<n>`
+complete -c src -x -n '__fish_seen_subcommand_from log' -s l                                     -d 'Limit per-file log entries'
+complete -c src    -n '__fish_seen_subcommand_from log' -s p -l patch -s u                       -d 'Print unified-format diff'
+complete -c src    -n '__fish_seen_subcommand_from log' -s c                                     -d 'Print context diff'
+complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o b -d 'Ignore whitespace changes'
+complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o w -d 'Ignore all whitespace'
+complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o b -d 'Ignore whitespace changes'
+complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o w -d 'Ignore all whitespace'
+
+# NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
+complete -c src -r -n '__fish_use_subcommand'   -a diff       -d 'Print diff'
+complete -c src    -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
+complete -c src    -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
+complete -c src    -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
+complete -c src    -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
+
+complete -c src -r -n '__fish_use_subcommand'   -a ls          -d 'List all registered files'
+
+complete -c src -r -n '__fish_use_subcommand'   -a visualize   -d 'Emit DOT visualization'
+
+complete -c src -r -n '__fish_use_subcommand'   -a move        -d 'Rename a workfile and its history'
+
+complete -c src -r -n '__fish_use_subcommand'   -a copy        -d 'Copy a file and its master'
+
+complete -c src -r -n '__fish_use_subcommand'   -a fast-export -d 'Export as a Git fast-import stream'
+
+complete -c src -r -n '__fish_use_subcommand'   -a fast-import       -d 'Parse a git-fast-import stream from stdin'
+complete -c src    -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
+
+complete -c src -r -n '__fish_use_subcommand'   -a release           -d 'Release locks on files'
+
+complete -c src    -s d -d 'Enable debugging output'
+complete -c src -r -s S -d 'Set repository directory'
+complete -c src    -s T -d 'Set up for fast-export tests'

From 2c32885a2d64aebe4f37fa3fe40801ba91091fd7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 5 Aug 2019 18:04:37 +0200
Subject: [PATCH 0844/1732] Fix build on old gcc by using old-school
 initialization

It appears Gcc 4.8 doesn't get this particular expression, so we just
revert to the old `type foo = bar` style from the new `type foo{bar}`.

Fixes #6027.
---
 src/history.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/history.cpp b/src/history.cpp
index ea1f7ae59..704a59e04 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -835,7 +835,7 @@ struct history_impl_t {
     std::unique_ptr<history_file_contents_t> file_contents{};
 
     // The file ID of the history file.
-    file_id_t history_file_id{kInvalidFileID};
+    file_id_t history_file_id = kInvalidFileID;
 
     // The boundary timestamp distinguishes old items from new items. Items whose timestamps are <=
     // the boundary are considered "old". Items whose timestemps are > the boundary are new, and are

From 575fdb5492a8acabccdb6a6b60b2173260230941 Mon Sep 17 00:00:00 2001
From: Daniel Bretoi <danielb2@users.noreply.github.com>
Date: Tue, 6 Aug 2019 11:07:02 -0700
Subject: [PATCH 0845/1732] add missing flag

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

diff --git a/share/completions/jest.fish b/share/completions/jest.fish
index 14ebdb658..4b21fcb74 100644
--- a/share/completions/jest.fish
+++ b/share/completions/jest.fish
@@ -77,3 +77,4 @@ complete -f -c jest -l watch -d 'Watch files for changes and rerun tests related
 complete -f -c jest -l watchAll -d 'Watch files for changes and rerun all tests'
 complete -f -c jest -l watchman -d 'Whether to use watchman for file crawling'
 complete -f -c jest -l no-watchman -d 'Disable using watchman for file crawling'
+complete -f -c jest -l detectOpenHandles -d 'Print out remaining open handles preventing Jest from exiting at the end of a test run.'

From 0dc5eaeb97232cdf02311d9e543e44aca2098ac1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 6 Aug 2019 16:09:23 -0700
Subject: [PATCH 0846/1732] reader_expand_abbreviation_in_command to return
 maybe_t<wcstring>

---
 src/fish_tests.cpp | 56 +++++++++++++++++++++-------------------------
 src/reader.cpp     | 24 +++++++++-----------
 src/reader.h       |  5 +++--
 3 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index ebaa42f2c..7c20ff49c 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1875,54 +1875,48 @@ static void test_abbreviations() {
     if (!mresult) err(L"Unexpected failure with foo abbreviation");
     if (*mresult != L"bar") err(L"Wrong abbreviation result for foo");
 
-    bool expanded;
-    wcstring result;
-    expanded = reader_expand_abbreviation_in_command(L"just a command", 3, vars, &result);
-    if (expanded) err(L"Command wrongly expanded on line %ld", (long)__LINE__);
-    expanded = reader_expand_abbreviation_in_command(L"gc somebranch", 0, vars, &result);
-    if (!expanded) err(L"Command not expanded on line %ld", (long)__LINE__);
+    maybe_t<wcstring> result;
+    result = reader_expand_abbreviation_in_command(L"just a command", 3, vars);
+    if (result) err(L"Command wrongly expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(L"gc somebranch", 0, vars);
+    if (!result) err(L"Command not expanded on line %ld", (long)__LINE__);
 
-    expanded =
-        reader_expand_abbreviation_in_command(L"gc somebranch", std::wcslen(L"gc"), vars, &result);
-    if (!expanded) err(L"gc not expanded");
+    result = reader_expand_abbreviation_in_command(L"gc somebranch", std::wcslen(L"gc"), vars);
+    if (!result) err(L"gc not expanded");
     if (result != L"git checkout somebranch")
-        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
+        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // Space separation.
-    expanded =
-        reader_expand_abbreviation_in_command(L"gx somebranch", std::wcslen(L"gc"), vars, &result);
-    if (!expanded) err(L"gx not expanded");
+    result = reader_expand_abbreviation_in_command(L"gx somebranch", std::wcslen(L"gc"), vars);
+    if (!result) err(L"gx not expanded");
     if (result != L"git checkout somebranch")
-        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
+        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
-    expanded = reader_expand_abbreviation_in_command(L"echo hi ; gc somebranch",
-                                                     std::wcslen(L"echo hi ; g"), vars, &result);
-    if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(L"echo hi ; gc somebranch",
+                                                   std::wcslen(L"echo hi ; g"), vars);
+    if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo hi ; git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
-    expanded = reader_expand_abbreviation_in_command(
-        L"echo (echo (echo (echo (gc ", std::wcslen(L"echo (echo (echo (echo (gc"), vars, &result);
-    if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(
+        L"echo (echo (echo (echo (gc ", std::wcslen(L"echo (echo (echo (echo (gc"), vars);
+    if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo (echo (echo (echo (git checkout ")
-        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
+        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // If commands should be expanded.
-    expanded =
-        reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars, &result);
-    if (!expanded) err(L"gc not expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars);
+    if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"if git checkout")
-        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result.c_str());
+        err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // Others should not be.
-    expanded =
-        reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars, &result);
-    if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars);
+    if (result) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     // Others should not be.
-    expanded = reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"),
-                                                     vars, &result);
-    if (expanded) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
+    result = reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"), vars);
+    if (result) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     vars.pop();
 }
diff --git a/src/reader.cpp b/src/reader.cpp
index 37eca2b7b..7efe0d929 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -729,8 +729,8 @@ void reader_data_t::pager_selection_changed() {
 }
 
 /// Expand abbreviations at the given cursor position. Does NOT inspect 'data'.
-bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
-                                           const environment_t &vars, wcstring *output) {
+maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
+                                                        const environment_t &vars) {
     // See if we are at "command position". Get the surrounding command substitution, and get the
     // extent of the first token.
     const wchar_t *const buff = cmdline.c_str();
@@ -778,18 +778,16 @@ bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t curso
     }
 
     // Now if we found a command node, expand it.
-    bool result = false;
+    maybe_t<wcstring> result{};
     if (matching_cmd_node) {
         const wcstring token = matching_cmd_node.get_source(subcmd);
         if (auto abbreviation = expand_abbreviation(token, vars)) {
             // There was an abbreviation! Replace the token in the full command. Maintain the
             // relative position of the cursor.
-            if (output != NULL) {
-                output->assign(cmdline);
-                source_range_t r = *matching_cmd_node.source_range();
-                output->replace(subcmd_offset + r.start, r.length, *abbreviation);
-            }
-            result = true;
+            wcstring output = cmdline;
+            source_range_t r = *matching_cmd_node.source_range();
+            output.replace(subcmd_offset + r.start, r.length, *abbreviation);
+            result = std::move(output);
         }
     }
     return result;
@@ -804,15 +802,15 @@ bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) {
 
     if (expand_abbreviations && el == &command_line) {
         // Try expanding abbreviations.
-        wcstring new_cmdline;
         size_t cursor_pos = el->position - std::min(el->position, cursor_backtrack);
 
-        if (reader_expand_abbreviation_in_command(el->text, cursor_pos, vars(), &new_cmdline)) {
+        if (auto new_cmdline =
+                reader_expand_abbreviation_in_command(el->text, cursor_pos, vars())) {
             // We expanded an abbreviation! The cursor moves by the difference in the command line
             // lengths.
-            size_t new_buff_pos = el->position + new_cmdline.size() - el->text.size();
+            size_t new_buff_pos = el->position + new_cmdline->size() - el->text.size();
 
-            el->text = std::move(new_cmdline);
+            el->text = std::move(*new_cmdline);
             update_buff_pos(el, new_buff_pos);
             command_line_changed(el);
             result = true;
diff --git a/src/reader.h b/src/reader.h
index efd768304..76d7a6137 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -216,8 +216,9 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
                                             const wcstring &autosuggestion);
 
 /// Expand abbreviations at the given cursor position. Exposed for testing purposes only.
-bool reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
-                                           const environment_t &vars, wcstring *output);
+/// \return none if no abbreviations were expanded, otherwise the new command line.
+maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
+                                                        const environment_t &vars);
 
 /// Apply a completion string. Exposed for testing only.
 wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags,

From a3fa011ef5fe6128c06b0d40533d6e6ccac05908 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 8 Aug 2019 14:10:03 +0800
Subject: [PATCH 0847/1732] fish.spec: BuildRequire python-argparse on
 RHEL/CentOS 6

---
 fish.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fish.spec.in b/fish.spec.in
index 652d75b36..822f70e0a 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -18,7 +18,7 @@ BuildRequires: cmake
 %endif
 
 %if 0%{?opensuse_bs} && 0%{?rhel} && 0%{?rhel} < 7
-BuildRequires: gcc48 gcc48-c++
+BuildRequires: gcc48 gcc48-c++ python-argparse
 %endif
 
 %if 0%{?is_opensuse} || 0%{?fedora}

From eb80a909598ced348ead39a2134448c68174c788 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 8 Aug 2019 18:47:36 +0200
Subject: [PATCH 0848/1732] Update copyright information

Axel left in 2009, so anything after that let's just credit to "contributors".

See #6036.

[ci skip]
---
 COPYING                    | 1 +
 sphinx_doc_src/license.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index a8a80460d..527c6ad49 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,7 @@
 Fish is a smart and user-friendly command line shell.
 
 Copyright (C) 2005-2009 Axel Liljencrantz
+Copyright (C) 2009-2019 fish-shell contributors
 
 fish is free software.
 
diff --git a/sphinx_doc_src/license.rst b/sphinx_doc_src/license.rst
index a406b3564..0dc202149 100644
--- a/sphinx_doc_src/license.rst
+++ b/sphinx_doc_src/license.rst
@@ -1,7 +1,7 @@
 License
 ========
 
-``fish`` Copyright © 2005-2009 Axel Liljencrantz. ``fish`` is released under the GNU General Public License, version 2.
+``fish`` Copyright © 2005-2009 Axel Liljencrantz, 2009-2019 fish-shell contributors. ``fish`` is released under the GNU General Public License, version 2.
 
 ``fish`` includes other code licensed under the GNU General Public License, version 2, including GNU ``printf``.
 

From 36b9f1ed9c10cb94deaf777e5fdf32528d3abb61 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Thu, 8 Aug 2019 12:10:03 +0000
Subject: [PATCH 0849/1732] document vi mode cursor configuration

---
 sphinx_doc_src/index.rst | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 5b3dd5da8..4b9ac86d8 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1511,10 +1511,20 @@ It is also possible to add all emacs-mode bindings to vi-mode by using something
     end
 
 
-When in vi-mode, the :ref:`fish_mode_prompt <cmd-fish_mode_prompt>` function will display a mode indicator to the left of the prompt. The ``fish_vi_cursor`` function will be used to change the cursor's shape depending on the mode in supported terminals. To disable this feature, override it with an empty function. To display the mode elsewhere (like in your right prompt), use the output of the ``fish_default_mode_prompt`` function.
+When in vi-mode, the :ref:`fish_mode_prompt <cmd-fish_mode_prompt>` function will display a mode indicator to the left of the prompt. To disable this feature, override it with an empty function. To display the mode elsewhere (like in your right prompt), use the output of the ``fish_default_mode_prompt`` function.
 
 When a binding switches the mode, it will repaint the mode-prompt if it exists, and the rest of the prompt only if it doesn't. So if you want a mode-indicator in your ``fish_prompt``, you need to erase ``fish_mode_prompt`` e.g. by adding an empty file at `~/.config/fish/functions/fish_mode_prompt.fish`. (Bindings that change the mode are supposed to call the `repaint-mode` bind function, see :ref:`bind <cmd-bind>`)
 
+The ``fish_vi_cursor`` function will be used to change the cursor's shape depending on the mode in supported terminals. The following snippet can be used to manually configure cursors after enabling vi-mode::
+
+   # Emulates vim's cursor shape behavior
+   # Set the normal and visual mode cursors to a block
+   set fish_cursor_default block
+   # Set the insert mode cursor to a line
+   set fish_cursor_insert line
+   # Set the replace mode cursor to an underscore
+   set fish_cursor_replace_one underscore
+
 .. _vi-mode-command:
 
 Command mode

From 1693b53221a49e85f709005b70b54e718e4d75d4 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Thu, 8 Aug 2019 12:15:15 +0000
Subject: [PATCH 0850/1732] document changes in CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c511215d7..8180e3925 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - `string split` had a bug where empty strings would be dropped if the output was only empty strings; this has been fixed (#5987).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (:) now always exits successfully, rather than echoing last return code.
+- Cursor configuration instructions for vi-mode have been added to the fish documentation.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).

From cfc18c86a3ec48a675e3a84483b29deb06170224 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Thu, 8 Aug 2019 12:20:40 +0000
Subject: [PATCH 0851/1732] document fish_cursor_visual and blinking cursors

---
 sphinx_doc_src/index.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 4b9ac86d8..0c04aef1d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1524,6 +1524,12 @@ The ``fish_vi_cursor`` function will be used to change the cursor's shape depend
    set fish_cursor_insert line
    # Set the replace mode cursor to an underscore
    set fish_cursor_replace_one underscore
+   # The following variable can be used to configure cursor
+   # shape in visual mode, but due to fish_cursor_default, is
+   # redundant here
+   set fish_cursor_visual block
+
+Additionally, `blink` can be added after each of the cursor shape parameters to set a blinking cursor in the specified shape.
 
 .. _vi-mode-command:
 

From cc6a82c878b2dae367b47e900b959c1b7975be33 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Thu, 8 Aug 2019 12:48:26 +0000
Subject: [PATCH 0852/1732] clean up formatting

---
 sphinx_doc_src/index.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 0c04aef1d..0d2b9c1e6 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1524,12 +1524,11 @@ The ``fish_vi_cursor`` function will be used to change the cursor's shape depend
    set fish_cursor_insert line
    # Set the replace mode cursor to an underscore
    set fish_cursor_replace_one underscore
-   # The following variable can be used to configure cursor
-   # shape in visual mode, but due to fish_cursor_default, is
-   # redundant here
+   # The following variable can be used to configure cursor shape in
+   # visual mode, but due to fish_cursor_default, is redundant here
    set fish_cursor_visual block
 
-Additionally, `blink` can be added after each of the cursor shape parameters to set a blinking cursor in the specified shape.
+Additionally, ``blink`` can be added after each of the cursor shape parameters to set a blinking cursor in the specified shape.
 
 .. _vi-mode-command:
 

From ab6fd6554f5a4a4ae211ca68e23601f79c40d7c3 Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Wed, 7 Aug 2019 17:50:05 -0700
Subject: [PATCH 0853/1732] Add completions/cwebp.fish

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

diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
new file mode 100644
index 000000000..689e4d6b7
--- /dev/null
+++ b/share/completions/cwebp.fish
@@ -0,0 +1,146 @@
+# Current as of cwebp 1.0.3.
+
+set -l preset_opts '
+    default\t
+    photo\t
+    picture\t
+    drawing\t
+    icon\t
+    text\t
+'
+
+set -l z_opts '
+    0\tfastest
+    1\t
+    2\t
+    3\t
+    4\t
+    5\t
+    6\t
+    7\t
+    8\t
+    9\tslowest
+'
+
+set -l m_opts '
+    0\tfastest
+    1\t
+    2\t
+    3\t
+    4\tdefault
+    5\t
+    6\tslowest
+'
+
+set -l segments_opts '
+    1\t
+    2\t
+    3\t
+    4\tdefault
+'
+
+set -l sharpness_opts '
+    0\tmost sharp; default
+    1\t
+    2\t
+    3\t
+    4\t
+    5\t
+    6\t
+    7\tleast sharp
+'
+
+function __fish_cwebp_pass_opts
+    seq 0 10 | awk '{printf "%s\t\n", $0}' - 
+end
+
+set -l alpha_method_opts '
+    0\t
+    1\tdefault
+'
+
+set -l alpha_filter_opts '
+    none\t
+    fast\tdefault
+    best\t
+'
+
+set -l metadata_opts '
+    all\t
+    none\tdefault
+    exif\t
+    icc\t
+    xmp\t
+'
+
+function __fish_cwebp_is_first_arg_or_its_value -a 'arg' -d 'Like __fish_is_first_arg, but also returns true for the second token after a given parameter'
+    set -l tokens (commandline -co)
+
+    switch (count $tokens)
+        case 1
+            return 0
+        case 2
+            if test "$tokens[2]" = "$arg"
+                return 0
+            end
+            return 1
+        case '*'
+            return 1
+    end
+end
+
+complete -c cwebp -f -o h -o help             -d 'Help (short)'
+complete -c cwebp -f -o H -o longhelp -l help -d 'Help (long)'
+
+complete -c cwebp -x -o q       -d 'Quality (float; 0…100; default: 75)'
+complete -c cwebp -x -o alpha_q -d 'Transparency-compression quality (integer 0…100; default: 100)'
+
+complete -c cwebp -x -n '__fish_cwebp_is_first_arg_or_its_value -preset' -o preset -a $preset_opts -d 'Preset setting'
+
+complete -c cwebp -x -o z        -a "$z_opts"        -d 'Lossless preset of level'
+complete -c cwebp -x -o m        -a "$m_opts"        -d 'Compression method'
+complete -c cwebp -x -o segments -a "$segments_opts" -d 'Number of segments to use'
+complete -c cwebp -x -o size                         -d 'Target size (in bytes)'
+complete -c cwebp -x -o psnr                         -d 'Target PSNR (in dB; typically: 42)'
+
+complete -c cwebp -x -o s                                       -d 'Input size (width x height) for YUV'
+complete -c cwebp -x -o sns                                     -d 'Spatial noise shaping (integer 0…100; default: 50)'
+complete -c cwebp -x -o f                                       -d 'Filter strength (integer 0…100; default: 60)'
+complete -c cwebp -x -o sharpness -a "$sharpness_opts"          -d 'Filter sharpness'
+complete -c cwebp    -o strong                                  -d 'Use strong filter'
+complete -c cwebp    -o simple                                  -d 'Use simple filter'
+complete -c cwebp    -o sharp_yuv                               -d 'Use sharper (and slower) RGB->YUV conversion'
+complete -c cwebp -x -o partition_limit                         -d 'Limit quality to fit the 512k limit on the first partition (integer 0:no degradation…100:full degradation)'
+complete -c cwebp -x -o pass -a '(__fish_cwebp_pass_opts)'      -d 'Analysis pass number'
+complete -c cwebp -x -o crop                                    -d 'Crop picture with <x> <y> <v> <h> rectangle'
+complete -c cwebp -x -o resize                                  -d 'Resize picture to <w> <h> after any cropping'
+complete -c cwebp    -o mt                                      -d 'Use multi-threading if available'
+complete -c cwebp    -o low_memory                              -d 'Reduce memory usage (slows encoding)'
+complete -c cwebp -x -o map                                     -d 'Print map of extra info'
+complete -c cwebp    -o print_psnr                              -d 'Print averaged PSNR distortion'
+complete -c cwebp    -o print_ssim                              -d 'Print averaged SSIM distortion'
+complete -c cwebp    -o print_lsim                              -d 'Print local-similarity distortion'
+complete -c cwebp -r -o d -a '(__fish_complete_suffix .pgm)'    -d 'Dump compressed output to given PGM file'
+complete -c cwebp -x -o alpha_method -a "$alpha_method_opts"    -d 'Transparency-compression method'
+complete -c cwebp -x -o alpha_filter -a "$alpha_filter_opts" -k -d 'Predictive filtering for alpha plane'
+complete -c cwebp -x -o exact                                   -d 'Preserve RGB values in transparent area'
+complete -c cwebp -x -o blend_alpha                             -d 'Blend colors against background color (e.g. 0xc0e0d0)'
+complete -c cwebp    -o noalpha                                 -d 'Discard any transparency information'
+complete -c cwebp    -o lossless                                -d 'Encode image losslessly'
+complete -c cwebp -x -o near_lossless                           -d 'Use near-lossless image preprocessing (integer 0…100:off; default: 100)'
+complete -c cwebp -x -o hint -a 'photo picture graph'           -d 'Specify image-characteristics hint'
+
+complete -c cwebp -x -o metadata -a "$metadata_opts"  -k -d 'Comma-separated list of metadata to copy, if present'
+
+complete -c cwebp -o short    -d 'Condense printed messages'
+complete -c cwebp -o quiet    -d 'Don\'t print anything'
+complete -c cwebp -o version  -d 'Print version number and exit'
+complete -c cwebp -o noasm    -d 'Disable all assembly optimizations'
+complete -c cwebp -o v        -d 'Be verbose (print encoding/decoding times)'
+complete -c cwebp -o progress -d 'Report encoding progress'
+
+complete -c cwebp    -o jpeg_like -d 'Roughly match expected JPEG size'
+complete -c cwebp    -o af        -d 'Auto-adjust filter strength'
+complete -c cwebp -x -o pre       -d 'Pre-processing filter (integer)'
+
+complete -c cwebp -r -o o -a '(__fish_complete_suffix .webp)' -d 'Output to file'

From 30fd526fc1d3ecf1f8852f87dc7e6de2700dc40b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 10 Aug 2019 14:32:55 -0700
Subject: [PATCH 0854/1732] Correct an out-of-bounds index in screen

Fixes #6037
---
 src/screen.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 81dc4977a..9df04c231 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -36,6 +36,7 @@
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "highlight.h"
 #include "output.h"
 #include "pager.h"
@@ -387,7 +388,8 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
 
     if (b == L'\n') {
         // Current line is definitely hard wrapped.
-        s->desired.create_line(s->desired.line_count());
+        // Create the next line.
+        s->desired.create_line(s->desired.cursor.y + 1);
         s->desired.line(s->desired.cursor.y).is_soft_wrapped = false;
         int line_no = ++s->desired.cursor.y;
         s->desired.cursor.x = 0;
@@ -411,7 +413,6 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
         if ((s->desired.cursor.x + cw) > screen_width) {
             // Current line is soft wrapped (assuming we support it).
             s->desired.line(s->desired.cursor.y).is_soft_wrapped = true;
-            // std::fwprintf(stderr, L"\n\n1 Soft wrapping %d\n\n", s->desired.cursor.y);
 
             line_no = (int)s->desired.line_count();
             s->desired.add_line();

From fd5d8c1949ddf07b803e3bc1747365ba84a415f8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 10 Aug 2019 16:04:05 -0700
Subject: [PATCH 0855/1732] Remove __packed

We can use the new C++11 enum type feature to stop using this non-portable
__packed.
---
 config_cmake.h.in     | 4 ----
 src/parse_constants.h | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config_cmake.h.in b/config_cmake.h.in
index 76ae2a230..c7ce044a4 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -168,11 +168,7 @@
 #ifndef __sentinel
 #define __sentinel __attribute__ ((sentinel))
 #endif
-#ifndef __packed
-#define __packed __attribute__ ((packed))
-#endif
 #else
 #define __warn_unused
 #define __sentinel
-#define __packed
 #endif
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 2c916ac5e..b9145b2ce 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -13,7 +13,7 @@
     } while (0)
 
 // IMPORTANT: If the following enum table is modified you must also update token_enum_map below.
-enum parse_token_type_t {
+enum parse_token_type_t : uint8_t {
     token_type_invalid = 1,
     // Non-terminal tokens
     symbol_job_list,
@@ -71,7 +71,7 @@ enum parse_token_type_t {
     LAST_TOKEN_OR_SYMBOL = parse_token_type_terminate,
     FIRST_PARSE_TOKEN_TYPE = parse_token_type_string,
     LAST_PARSE_TOKEN_TYPE = parse_token_type_end
-} __packed;
+};
 
 const enum_map<parse_token_type_t> token_enum_map[] = {
     {parse_special_type_comment, L"parse_special_type_comment"},
@@ -96,7 +96,7 @@ const enum_map<parse_token_type_t> token_enum_map[] = {
 // array below.
 //
 // IMPORTANT: These enums must start at zero.
-enum parse_keyword_t {
+enum parse_keyword_t : uint8_t {
     parse_keyword_and,
     parse_keyword_begin,
     parse_keyword_builtin,
@@ -115,7 +115,7 @@ enum parse_keyword_t {
     parse_keyword_or,
     parse_keyword_switch,
     parse_keyword_while,
-} __packed;
+};
 
 const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!"},
                                                       {parse_keyword_and, L"and"},

From 74357bac91cdc9740cffbb91212f8e919b0cae05 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 10 Aug 2019 16:47:40 -0700
Subject: [PATCH 0856/1732] Remove an errant semicolon

---
 src/history.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/history.cpp b/src/history.cpp
index 704a59e04..cbbbef745 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -795,7 +795,6 @@ static size_t offset_of_next_item(const history_file_contents_t &contents, size_
     switch (contents.type()) {
         case history_type_fish_2_0:
             return offset_of_next_item_fish_2_0(contents, inout_cursor, cutoff_timestamp);
-            ;
         case history_type_fish_1_x:
             return offset_of_next_item_fish_1_x(contents.begin(), contents.length(), inout_cursor);
     }

From 91987a4548234959b8e0a3e5fbb35b9e9f06283d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 11 Aug 2019 12:34:29 -0700
Subject: [PATCH 0857/1732] Migrate history file format stuff into new file
 history_file.cpp

Breaks up the history.cpp monolith.
---
 CMakeLists.txt       |   4 +-
 src/history.cpp      | 603 +------------------------------------------
 src/history_file.cpp | 546 +++++++++++++++++++++++++++++++++++++++
 src/history_file.h   |  72 ++++++
 4 files changed, 629 insertions(+), 596 deletions(-)
 create mode 100644 src/history_file.cpp
 create mode 100644 src/history_file.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03ec972d0..475b00741 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,8 +94,8 @@ SET(FISH_SRCS
     src/color.cpp src/common.cpp src/complete.cpp src/env.cpp src/env_dispatch.cpp
     src/env_universal_common.cpp src/event.cpp src/exec.cpp src/expand.cpp
     src/fallback.cpp src/fish_version.cpp src/function.cpp src/highlight.cpp
-    src/history.cpp src/input.cpp src/input_common.cpp src/intern.cpp src/io.cpp
-    src/iothread.cpp src/kill.cpp src/output.cpp src/pager.cpp
+    src/history.cpp src/history_file.cpp src/input.cpp src/input_common.cpp src/intern.cpp
+    src/io.cpp src/iothread.cpp src/kill.cpp src/output.cpp src/pager.cpp
     src/parse_execution.cpp src/parse_productions.cpp src/parse_tree.cpp
     src/parse_util.cpp src/parser.cpp src/parser_keywords.cpp src/path.cpp
     src/postfork.cpp src/proc.cpp src/reader.cpp src/sanity.cpp src/screen.cpp
diff --git a/src/history.cpp b/src/history.cpp
index cbbbef745..2a005b440 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -12,7 +12,6 @@
 #include <cstring>
 // We need the sys/file.h for the flock() declaration on Linux but not OS X.
 #include <sys/file.h>  // IWYU pragma: keep
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
@@ -34,6 +33,7 @@
 #include "flog.h"
 #include "global_safety.h"
 #include "history.h"
+#include "history_file.h"
 #include "io.h"
 #include "iothread.h"
 #include "lru.h"
@@ -159,22 +159,6 @@ static bool history_file_lock(int fd, int lock_type) {
     return retval != -1;
 }
 
-// History file types.
-enum history_file_type_t { history_type_fish_2_0, history_type_fish_1_x };
-
-/// Try to infer the history file type based on inspecting the data.
-static maybe_t<history_file_type_t> infer_file_type(const void *data, size_t len) {
-    maybe_t<history_file_type_t> result{};
-    if (len > 0) {  // old fish started with a #
-        if (static_cast<const char *>(data)[0] == '#') {
-            result = history_type_fish_1_x;
-        } else {  // assume new fish
-            result = history_type_fish_2_0;
-        }
-    }
-    return result;
-}
-
 /// Our LRU cache is used for restricting the amount of history we have, and limiting how long we
 /// order it.
 class history_lru_item_t {
@@ -214,325 +198,8 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_lru_
 
 }  // anonymous namespace
 
-// history_file_contents_t holds the read-only contents of a file.
-class history_file_contents_t {
-    // The memory mapped pointer.
-    void *start_;
-
-    // The mapped length.
-    size_t length_;
-
-    // The type of the mapped file.
-    history_file_type_t type_;
-
-    // Private constructor; use the static create() function.
-    history_file_contents_t(void *mmap_start, size_t mmap_length, history_file_type_t type)
-        : start_(mmap_start), length_(mmap_length), type_(type) {
-        assert(mmap_start != MAP_FAILED && "Invalid mmap address");
-    }
-
-    history_file_contents_t(history_file_contents_t &&) = delete;
-    void operator=(history_file_contents_t &&) = delete;
-
-    // Check if we should mmap the fd.
-    // Don't try mmap() on non-local filesystems.
-    static bool should_mmap(int fd) {
-        if (history_t::never_mmap) return false;
-
-        // mmap only if we are known not-remote (return is 0).
-        int ret = fd_check_is_remote(fd);
-        return ret == 0;
-    }
-
-    // Read up to len bytes from fd into address, zeroing the rest.
-    // Return true on success, false on failure.
-    static bool read_from_fd(int fd, void *address, size_t len) {
-        size_t remaining = len;
-        char *ptr = static_cast<char *>(address);
-        while (remaining > 0) {
-            ssize_t amt = read(fd, ptr, remaining);
-            if (amt < 0) {
-                if (errno != EINTR) {
-                    return false;
-                }
-            } else if (amt == 0) {
-                break;
-            } else {
-                remaining -= amt;
-                ptr += amt;
-            }
-        }
-        std::memset(ptr, 0, remaining);
-        return true;
-    }
-
-   public:
-    // Access the address at a given offset.
-    const char *address_at(size_t offset) const {
-        assert(offset <= length_ && "Invalid offset");
-        auto base = static_cast<const char *>(start_);
-        return base + offset;
-    }
-
-    // Return a pointer to the beginning.
-    const char *begin() const { return address_at(0); }
-
-    // Return a pointer to one-past-the-end.
-    const char *end() const { return address_at(length_); }
-
-    // Get the size of the contents.
-    size_t length() const { return length_; }
-
-    // Get the file type.
-    history_file_type_t type() const { return type_; }
-
-    ~history_file_contents_t() { munmap(start_, length_); }
-
-    // Construct a history file contents from a file descriptor. The file descriptor is not closed.
-    static std::unique_ptr<history_file_contents_t> create(int fd) {
-        // Check that the file is seekable, and its size.
-        off_t len = lseek(fd, 0, SEEK_END);
-        if (len <= 0 || static_cast<unsigned long>(len) >= SIZE_MAX) return nullptr;
-        if (lseek(fd, 0, SEEK_SET) != 0) return nullptr;
-
-        // Read the file, possibly ussing mmap.
-        void *mmap_start = nullptr;
-        if (should_mmap(fd)) {
-            // We feel confident to map the file directly. Note this is still risky: if another
-            // process truncates the file we risk SIGBUS.
-            mmap_start = mmap(0, size_t(len), PROT_READ, MAP_PRIVATE, fd, 0);
-            if (mmap_start == MAP_FAILED) return nullptr;
-        } else {
-            // We don't want to map the file. mmap some private memory and then read into it. We use
-            // mmap instead of malloc so that the destructor can always munmap().
-            mmap_start =
-#ifdef MAP_ANON
-                mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-#else
-                mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-#endif
-            if (mmap_start == MAP_FAILED) return nullptr;
-            if (!read_from_fd(fd, mmap_start, len)) return nullptr;
-        }
-
-        // Check the file type.
-        auto mtype = infer_file_type(mmap_start, len);
-        if (!mtype) return nullptr;
-
-        return std::unique_ptr<history_file_contents_t>(
-            new history_file_contents_t(mmap_start, len, *mtype));
-    }
-};
-
 static wcstring history_filename(const wcstring &name, const wcstring &suffix);
 
-/// Replaces newlines with a literal backslash followed by an n, and replaces backslashes with two
-/// backslashes.
-static void escape_yaml(std::string *str);
-
-/// Inverse of escape_yaml.
-static void unescape_yaml(std::string *str);
-
-/// Read one line, stripping off any newline, and updating cursor. Note that our input string is NOT
-/// null terminated; it's just a memory mapped file.
-static size_t read_line(const char *base, size_t cursor, size_t len, std::string &result) {
-    // Locate the newline.
-    assert(cursor <= len);
-    const char *start = base + cursor;
-    const char *a_newline = (char *)std::memchr(start, '\n', len - cursor);
-    if (a_newline != NULL) {  // we found a newline
-        result.assign(start, a_newline - start);
-        // Return the amount to advance the cursor; skip over the newline.
-        return a_newline - start + 1;
-    }
-
-    // We ran off the end.
-    result.clear();
-    return len - cursor;
-}
-
-/// Trims leading spaces in the given string, returning how many there were.
-static size_t trim_leading_spaces(std::string &str) {
-    size_t i = 0, max = str.size();
-    while (i < max && str[i] == ' ') i++;
-    str.erase(0, i);
-    return i;
-}
-
-static bool extract_prefix_and_unescape_yaml(std::string *key, std::string *value,
-                                             const std::string &line) {
-    size_t where = line.find(':');
-    if (where != std::string::npos) {
-        key->assign(line, 0, where);
-
-        // Skip a space after the : if necessary.
-        size_t val_start = where + 1;
-        if (val_start < line.size() && line.at(val_start) == ' ') val_start++;
-        value->assign(line, val_start, line.size() - val_start);
-
-        unescape_yaml(key);
-        unescape_yaml(value);
-    }
-    return where != std::string::npos;
-}
-
-/// Remove backslashes from all newlines. This makes a string from the history file better formated
-/// for on screen display.
-static wcstring history_unescape_newlines_fish_1_x(const wcstring &in_str) {
-    wcstring out;
-    for (const wchar_t *in = in_str.c_str(); *in; in++) {
-        if (*in == L'\\') {
-            if (*(in + 1) != L'\n') {
-                out.push_back(*in);
-            }
-        } else {
-            out.push_back(*in);
-        }
-    }
-    return out;
-}
-
-/// Decode an item via the fish 1.x format. Adapted from fish 1.x's item_get().
-static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
-    const char *end = begin + length;
-    const char *pos = begin;
-    wcstring out;
-    bool was_backslash = false;
-    bool first_char = true;
-    bool timestamp_mode = false;
-    time_t timestamp = 0;
-
-    while (1) {
-        wchar_t c;
-        size_t res;
-        mbstate_t state = {};
-
-        if (MB_CUR_MAX == 1) {  // single-byte locale
-            c = (unsigned char)*pos;
-            res = 1;
-        } else {
-            res = std::mbrtowc(&c, pos, end - pos, &state);
-        }
-
-        if (res == (size_t)-1) {
-            pos++;
-            continue;
-        } else if (res == (size_t)-2) {
-            break;
-        } else if (res == (size_t)0) {
-            pos++;
-            continue;
-        }
-        pos += res;
-
-        if (c == L'\n') {
-            if (timestamp_mode) {
-                const wchar_t *time_string = out.c_str();
-                while (*time_string && !iswdigit(*time_string)) time_string++;
-
-                if (*time_string) {
-                    time_t tm = (time_t)fish_wcstol(time_string);
-                    if (!errno && tm >= 0) {
-                        timestamp = tm;
-                    }
-                }
-
-                out.clear();
-                timestamp_mode = false;
-                continue;
-            }
-            if (!was_backslash) break;
-        }
-
-        if (first_char) {
-            first_char = false;
-            if (c == L'#') timestamp_mode = true;
-        }
-
-        out.push_back(c);
-        was_backslash = (c == L'\\') && !was_backslash;
-    }
-
-    out = history_unescape_newlines_fish_1_x(out);
-    return history_item_t(out, timestamp);
-}
-
-/// Decode an item via the fish 2.0 format.
-static history_item_t decode_item_fish_2_0(const char *base, size_t len) {
-    wcstring cmd;
-    time_t when = 0;
-    path_list_t paths;
-
-    size_t indent = 0, cursor = 0;
-    std::string key, value, line;
-
-    // Read the "- cmd:" line.
-    size_t advance = read_line(base, cursor, len, line);
-    trim_leading_spaces(line);
-    if (!extract_prefix_and_unescape_yaml(&key, &value, line) || key != "- cmd") {
-        goto done;  //!OCLINT(goto is the cleanest way to handle bad input)
-    }
-
-    cursor += advance;
-    cmd = str2wcstring(value);
-
-    // Read the remaining lines.
-    for (;;) {
-        size_t advance = read_line(base, cursor, len, line);
-
-        size_t this_indent = trim_leading_spaces(line);
-        if (indent == 0) indent = this_indent;
-
-        if (this_indent == 0 || indent != this_indent) break;
-
-        if (!extract_prefix_and_unescape_yaml(&key, &value, line)) break;
-
-        // We are definitely going to consume this line.
-        cursor += advance;
-
-        if (key == "when") {
-            // Parse an int from the timestamp. Should this fail, strtol returns 0; that's
-            // acceptable.
-            char *end = NULL;
-            long tmp = strtol(value.c_str(), &end, 0);
-            when = tmp;
-        } else if (key == "paths") {
-            // Read lines starting with " - " until we can't read any more.
-            for (;;) {
-                size_t advance = read_line(base, cursor, len, line);
-                if (trim_leading_spaces(line) <= indent) break;
-
-                if (std::strncmp(line.c_str(), "- ", 2)) break;
-
-                // We're going to consume this line.
-                cursor += advance;
-
-                // Skip the leading dash-space and then store this path it.
-                line.erase(0, 2);
-                unescape_yaml(&line);
-                paths.push_back(str2wcstring(line));
-            }
-        }
-    }
-
-done:
-    history_item_t result(cmd, when);
-    result.set_required_paths(paths);
-    return result;
-}
-
-static history_item_t decode_item(const history_file_contents_t &contents, size_t offset) {
-    const char *base = contents.address_at(offset);
-    size_t len = contents.length() - offset;
-    switch (contents.type()) {
-        case history_type_fish_2_0:
-            return decode_item_fish_2_0(base, len);
-        case history_type_fish_1_x:
-            return decode_item_fish_1_x(base, len);
-    }
-    return history_item_t(L"");
-}
-
 /// We can merge two items if they are the same command. We use the more recent timestamp, more
 /// recent identifier, and the longer list of required paths.
 bool history_item_t::merge(const history_item_t &item) {
@@ -592,7 +259,7 @@ static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
                                   const path_list_t &required_paths,
                                   history_output_buffer_t *buffer) {
     std::string cmd = wcs2string(wcmd);
-    escape_yaml(&cmd);
+    escape_yaml_fish_2_0(&cmd);
     buffer->append("- cmd: ", cmd.c_str(), "\n");
     buffer->append("  when: ", std::to_string(timestamp).c_str(), "\n");
 
@@ -601,206 +268,12 @@ static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
 
         for (auto const &wpath : required_paths) {
             std::string path = wcs2string(wpath);
-            escape_yaml(&path);
+            escape_yaml_fish_2_0(&path);
             buffer->append("    - ", path.c_str(), "\n");
         }
     }
 }
 
-/// Parse a timestamp line that looks like this: spaces, "when:", spaces, timestamp, newline
-/// The string is NOT null terminated; however we do know it contains a newline, so stop when we
-/// reach it.
-static bool parse_timestamp(const char *str, time_t *out_when) {
-    const char *cursor = str;
-    // Advance past spaces.
-    while (*cursor == ' ') cursor++;
-
-    // Look for "when:".
-    size_t when_len = 5;
-    if (std::strncmp(cursor, "when:", when_len) != 0) return false;
-    cursor += when_len;
-
-    // Advance past spaces.
-    while (*cursor == ' ') cursor++;
-
-    // Try to parse a timestamp.
-    long timestamp = 0;
-    if (isdigit(*cursor) && (timestamp = strtol(cursor, NULL, 0)) > 0) {
-        *out_when = (time_t)timestamp;
-        return true;
-    }
-    return false;
-}
-
-/// Returns a pointer to the start of the next line, or NULL. The next line must itself end with a
-/// newline. Note that the string is not null terminated.
-static const char *next_line(const char *start, size_t length) {
-    // Handle the hopeless case.
-    if (length < 1) return NULL;
-
-    // Get a pointer to the end, that we must not pass.
-    const char *const end = start + length;
-
-    // Skip past the next newline.
-    const char *nextline = (const char *)std::memchr(start, '\n', length);
-    if (!nextline || nextline >= end) {
-        return NULL;
-    }
-    // Skip past the newline character itself.
-    if (++nextline >= end) {
-        return NULL;
-    }
-
-    // Make sure this new line is itself "newline terminated". If it's not, return NULL.
-    const char *next_newline = (const char *)std::memchr(nextline, '\n', end - nextline);
-    if (!next_newline) {
-        return NULL;
-    }
-
-    return nextline;
-}
-
-/// Support for iteratively locating the offsets of history items.
-/// Pass the file contents and a pointer to a cursor size_t, initially 0.
-/// If custoff_timestamp is nonzero, skip items created at or after that timestamp.
-/// Returns (size_t)-1 when done.
-static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &contents,
-                                           size_t *inout_cursor, time_t cutoff_timestamp) {
-    size_t cursor = *inout_cursor;
-    size_t result = size_t(-1);
-    const size_t length = contents.length();
-    const char *const begin = contents.begin();
-    const char *const end = contents.end();
-    while (cursor < length) {
-        const char *line_start = contents.address_at(cursor);
-
-        // Advance the cursor to the next line.
-        const char *a_newline = (const char *)std::memchr(line_start, '\n', length - cursor);
-        if (a_newline == NULL) break;
-
-        // Advance the cursor past this line. +1 is for the newline.
-        cursor = a_newline - begin + 1;
-
-        // Skip lines with a leading space, since these are in the interior of one of our items.
-        if (line_start[0] == ' ') continue;
-
-        // Skip very short lines to make one of the checks below easier.
-        if (a_newline - line_start < 3) continue;
-
-        // Try to be a little YAML compatible. Skip lines with leading %, ---, or ...
-        if (!std::memcmp(line_start, "%", 1) || !std::memcmp(line_start, "---", 3) ||
-            !std::memcmp(line_start, "...", 3))
-            continue;
-
-        // Hackish: fish 1.x rewriting a fish 2.0 history file can produce lines with lots of
-        // leading "- cmd: - cmd: - cmd:". Trim all but one leading "- cmd:".
-        const char *double_cmd = "- cmd: - cmd: ";
-        const size_t double_cmd_len = std::strlen(double_cmd);
-        while ((size_t)(a_newline - line_start) > double_cmd_len &&
-               !std::memcmp(line_start, double_cmd, double_cmd_len)) {
-            // Skip over just one of the - cmd. In the end there will be just one left.
-            line_start += std::strlen("- cmd: ");
-        }
-
-        // Hackish: fish 1.x rewriting a fish 2.0 history file can produce commands like "when:
-        // 123456". Ignore those.
-        const char *cmd_when = "- cmd:    when:";
-        const size_t cmd_when_len = std::strlen(cmd_when);
-        if ((size_t)(a_newline - line_start) >= cmd_when_len &&
-            !std::memcmp(line_start, cmd_when, cmd_when_len)) {
-            continue;
-        }
-
-        // At this point, we know line_start is at the beginning of an item. But maybe we want to
-        // skip this item because of timestamps. A 0 cutoff means we don't care; if we do care, then
-        // try parsing out a timestamp.
-        if (cutoff_timestamp != 0) {
-            // Hackish fast way to skip items created after our timestamp. This is the mechanism by
-            // which we avoid "seeing" commands from other sessions that started after we started.
-            // We try hard to ensure that our items are sorted by their timestamps, so in theory we
-            // could just break, but I don't think that works well if (for example) the clock
-            // changes. So we'll read all subsequent items.
-            // Walk over lines that we think are interior. These lines are not null terminated, but
-            // are guaranteed to contain a newline.
-            bool has_timestamp = false;
-            time_t timestamp = 0;
-            const char *interior_line;
-
-            for (interior_line = next_line(line_start, end - line_start);
-                 interior_line != NULL && !has_timestamp;
-                 interior_line = next_line(interior_line, end - interior_line)) {
-                // If the first character is not a space, it's not an interior line, so we're done.
-                if (interior_line[0] != ' ') break;
-
-                // Hackish optimization: since we just stepped over some interior line, update the
-                // cursor so we don't have to look at these lines next time.
-                cursor = interior_line - begin;
-
-                // Try parsing a timestamp from this line. If we succeed, the loop will break.
-                has_timestamp = parse_timestamp(interior_line, &timestamp);
-            }
-
-            // Skip this item if the timestamp is past our cutoff.
-            if (has_timestamp && timestamp > cutoff_timestamp) {
-                continue;
-            }
-        }
-
-        // We made it through the gauntlet.
-        result = line_start - begin;
-        break;  //!OCLINT(avoid branching statement as last in loop)
-    }
-
-    *inout_cursor = cursor;
-    return result;
-}
-
-/// Same as offset_of_next_item_fish_2_0, but for fish 1.x (pre fishfish).
-/// Adapted from history_populate_from_mmap in history.c
-static size_t offset_of_next_item_fish_1_x(const char *begin, size_t mmap_length,
-                                           size_t *inout_cursor) {
-    if (mmap_length == 0 || *inout_cursor >= mmap_length) return (size_t)-1;
-
-    const char *end = begin + mmap_length;
-    const char *pos;
-    bool ignore_newline = false;
-    bool do_push = true;
-    bool all_done = false;
-    size_t result = *inout_cursor;
-
-    for (pos = begin + *inout_cursor; pos < end && !all_done; pos++) {
-        if (do_push) {
-            ignore_newline = (*pos == '#');
-            do_push = false;
-        }
-
-        if (*pos == '\\') {
-            pos++;
-        } else if (*pos == '\n') {
-            if (!ignore_newline) {
-                // pos will be left pointing just after this newline, because of the ++ in the loop.
-                all_done = true;
-            }
-            ignore_newline = false;
-        }
-    }
-
-    *inout_cursor = (pos - begin);
-    return result;
-}
-
-/// Returns the offset of the next item based on the given history type, or -1.
-static size_t offset_of_next_item(const history_file_contents_t &contents, size_t *inout_cursor,
-                                  time_t cutoff_timestamp) {
-    switch (contents.type()) {
-        case history_type_fish_2_0:
-            return offset_of_next_item_fish_2_0(contents, inout_cursor, cutoff_timestamp);
-        case history_type_fish_1_x:
-            return offset_of_next_item_fish_1_x(contents.begin(), contents.length(), inout_cursor);
-    }
-    return size_t(-1);
-}
-
 struct history_impl_t {
     // Privately add an item. If pending, the item will not be returned by history searches until a
     // call to resolve_pending.
@@ -857,9 +330,6 @@ struct history_impl_t {
     // Loads old items if necessary.
     void load_old_if_needed();
 
-    // Reads the history file if necessary.
-    bool mmap_if_needed();
-
     // Deletes duplicates in new_items.
     void compact_new_items();
 
@@ -1062,7 +532,7 @@ void history_impl_t::get_history(wcstring_list_t &result) {
     load_old_if_needed();
     for (auto iter = old_item_offsets.crbegin(); iter != old_item_offsets.crend(); ++iter) {
         size_t offset = *iter;
-        const history_item_t item = decode_item(*file_contents, offset);
+        const history_item_t item = file_contents->decode_item(offset);
         if (seen.insert(item.str()).second) result.push_back(item.str());
     }
 }
@@ -1099,7 +569,7 @@ history_item_t history_impl_t::item_at_index(size_t idx) {
     if (idx < old_item_count) {
         // idx == 0 corresponds to last item in old_item_offsets.
         size_t offset = old_item_offsets.at(old_item_count - idx - 1);
-        return decode_item(*file_contents, offset);
+        return file_contents->decode_item(offset);
     }
 
     // Index past the valid range, so return an empty history item.
@@ -1129,13 +599,9 @@ void history_impl_t::populate_from_file_contents() {
     old_item_offsets.clear();
     if (file_contents) {
         size_t cursor = 0;
-        for (;;) {
-            size_t offset = offset_of_next_item(*file_contents, &cursor, boundary_timestamp);
-            // If we get back -1, we're done.
-            if (offset == size_t(-1)) break;
-
+        while (auto offset = file_contents->offset_of_next_item(&cursor, boundary_timestamp)) {
             // Remember this item.
-            old_item_offsets.push_back(offset);
+            old_item_offsets.push_back(*offset);
         }
     }
 }
@@ -1219,52 +685,6 @@ wcstring history_search_t::current_string() const {
     return item.str();
 }
 
-static void replace_all(std::string *str, const char *needle, const char *replacement) {
-    size_t needle_len = std::strlen(needle), replacement_len = std::strlen(replacement);
-    size_t offset = 0;
-    while ((offset = str->find(needle, offset)) != std::string::npos) {
-        str->replace(offset, needle_len, replacement);
-        offset += replacement_len;
-    }
-}
-
-static void escape_yaml(std::string *str) {
-    replace_all(str, "\\", "\\\\");  // replace one backslash with two
-    replace_all(str, "\n", "\\n");   // replace newline with backslash + literal n
-}
-
-/// This function is called frequently, so it ought to be fast.
-static void unescape_yaml(std::string *str) {
-    size_t cursor = 0, size = str->size();
-    while (cursor < size) {
-        // Operate on a const version of str, to avoid needless COWs that at() does.
-        const std::string &const_str = *str;
-
-        // Look for a backslash.
-        size_t backslash = const_str.find('\\', cursor);
-        if (backslash == std::string::npos || backslash + 1 >= size) {
-            // Either not found, or found as the last character.
-            break;
-        } else {
-            // Backslash found. Maybe we'll do something about it. Be sure to invoke the const
-            // version of at().
-            char escaped_char = const_str.at(backslash + 1);
-            if (escaped_char == '\\') {
-                // Two backslashes in a row. Delete the second one.
-                str->erase(backslash + 1, 1);
-                size--;
-            } else if (escaped_char == 'n') {
-                // Backslash + n. Replace with a newline.
-                str->replace(backslash, 2, "\n");
-                size--;
-            }
-            // The character at index backslash has now been made whole; start at the next
-            // character.
-            cursor = backslash + 1;
-        }
-    }
-}
-
 static wcstring history_filename(const wcstring &session_id, const wcstring &suffix) {
     if (session_id.empty()) return L"";
 
@@ -1321,16 +741,11 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
     // old file contents).
     if (auto local_file = history_file_contents_t::create(existing_fd)) {
         size_t cursor = 0;
-        for (;;) {
-            size_t offset = offset_of_next_item(*local_file, &cursor, 0);
-            // If we get back -1, we're done.
-            if (offset == (size_t)-1) break;
-
+        while (auto offset = local_file->offset_of_next_item(&cursor, 0)) {
             // Try decoding an old item.
-            const history_item_t old_item = decode_item(*local_file, offset);
+            const history_item_t old_item = local_file->decode_item(*offset);
 
             if (old_item.empty() || deleted_items.count(old_item.str()) > 0) {
-                // FLOGF(error, L"Item is deleted : %s\n", old_item.str().c_str());
                 continue;
             }
             // Add this old item.
diff --git a/src/history_file.cpp b/src/history_file.cpp
new file mode 100644
index 000000000..66941d24c
--- /dev/null
+++ b/src/history_file.cpp
@@ -0,0 +1,546 @@
+#include "config.h"
+
+#include "history.h"
+#include "history_file.h"
+
+#include <cstring>
+
+// Some forward declarations.
+static history_item_t decode_item_fish_2_0(const char *base, size_t len);
+static history_item_t decode_item_fish_1_x(const char *begin, size_t length);
+
+static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &contents,
+                                           size_t *inout_cursor, time_t cutoff_timestamp);
+static size_t offset_of_next_item_fish_1_x(const char *begin, size_t mmap_length,
+                                           size_t *inout_cursor);
+
+// Check if we should mmap the fd.
+// Don't try mmap() on non-local filesystems.
+static bool should_mmap(int fd) {
+    if (history_t::never_mmap) return false;
+
+    // mmap only if we are known not-remote (return is 0).
+    int ret = fd_check_is_remote(fd);
+    return ret == 0;
+}
+
+// Read up to len bytes from fd into address, zeroing the rest.
+// Return true on success, false on failure.
+static bool read_from_fd(int fd, void *address, size_t len) {
+    size_t remaining = len;
+    char *ptr = static_cast<char *>(address);
+    while (remaining > 0) {
+        ssize_t amt = read(fd, ptr, remaining);
+        if (amt < 0) {
+            if (errno != EINTR) {
+                return false;
+            }
+        } else if (amt == 0) {
+            break;
+        } else {
+            remaining -= amt;
+            ptr += amt;
+        }
+    }
+    std::memset(ptr, 0, remaining);
+    return true;
+}
+
+/// Try to infer the history file type based on inspecting the data.
+static maybe_t<history_file_type_t> infer_file_type(const void *data, size_t len) {
+    maybe_t<history_file_type_t> result{};
+    if (len > 0) {  // old fish started with a #
+        if (static_cast<const char *>(data)[0] == '#') {
+            result = history_type_fish_1_x;
+        } else {  // assume new fish
+            result = history_type_fish_2_0;
+        }
+    }
+    return result;
+}
+
+static void replace_all(std::string *str, const char *needle, const char *replacement) {
+    size_t needle_len = std::strlen(needle), replacement_len = std::strlen(replacement);
+    size_t offset = 0;
+    while ((offset = str->find(needle, offset)) != std::string::npos) {
+        str->replace(offset, needle_len, replacement);
+        offset += replacement_len;
+    }
+}
+
+void escape_yaml_fish_2_0(std::string *str) {
+    replace_all(str, "\\", "\\\\");  // replace one backslash with two
+    replace_all(str, "\n", "\\n");   // replace newline with backslash + literal n
+}
+
+/// This function is called frequently, so it ought to be fast.
+void unescape_yaml_fish_2_0(std::string *str) {
+    size_t cursor = 0, size = str->size();
+    while (cursor < size) {
+        // Operate on a const version of str, to avoid needless COWs that at() does.
+        const std::string &const_str = *str;
+
+        // Look for a backslash.
+        size_t backslash = const_str.find('\\', cursor);
+        if (backslash == std::string::npos || backslash + 1 >= size) {
+            // Either not found, or found as the last character.
+            break;
+        } else {
+            // Backslash found. Maybe we'll do something about it. Be sure to invoke the const
+            // version of at().
+            char escaped_char = const_str.at(backslash + 1);
+            if (escaped_char == '\\') {
+                // Two backslashes in a row. Delete the second one.
+                str->erase(backslash + 1, 1);
+                size--;
+            } else if (escaped_char == 'n') {
+                // Backslash + n. Replace with a newline.
+                str->replace(backslash, 2, "\n");
+                size--;
+            }
+            // The character at index backslash has now been made whole; start at the next
+            // character.
+            cursor = backslash + 1;
+        }
+    }
+}
+
+history_file_contents_t::~history_file_contents_t() { munmap(const_cast<char *>(start_), length_); }
+
+history_file_contents_t::history_file_contents_t(const char *mmap_start, size_t mmap_length,
+                                                 history_file_type_t type)
+    : start_(mmap_start), length_(mmap_length), type_(type) {
+    assert(mmap_start != MAP_FAILED && "Invalid mmap address");
+}
+
+std::unique_ptr<history_file_contents_t> history_file_contents_t::create(int fd) {
+    // Check that the file is seekable, and its size.
+    off_t len = lseek(fd, 0, SEEK_END);
+    if (len <= 0 || static_cast<unsigned long>(len) >= SIZE_MAX) return nullptr;
+    if (lseek(fd, 0, SEEK_SET) != 0) return nullptr;
+
+    // Read the file, possibly ussing mmap.
+    void *mmap_start = nullptr;
+    if (should_mmap(fd)) {
+        // We feel confident to map the file directly. Note this is still risky: if another
+        // process truncates the file we risk SIGBUS.
+        mmap_start = mmap(0, size_t(len), PROT_READ, MAP_PRIVATE, fd, 0);
+        if (mmap_start == MAP_FAILED) return nullptr;
+    } else {
+        // We don't want to map the file. mmap some private memory and then read into it. We use
+        // mmap instead of malloc so that the destructor can always munmap().
+        mmap_start =
+#ifdef MAP_ANON
+            mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+#else
+            mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#endif
+        if (mmap_start == MAP_FAILED) return nullptr;
+        if (!read_from_fd(fd, mmap_start, len)) return nullptr;
+    }
+
+    // Check the file type.
+    auto mtype = infer_file_type(mmap_start, len);
+    if (!mtype) return nullptr;
+
+    return std::unique_ptr<history_file_contents_t>(
+        new history_file_contents_t(static_cast<const char *>(mmap_start), len, *mtype));
+}
+
+history_item_t history_file_contents_t::decode_item(size_t offset) const {
+    const char *base = address_at(offset);
+    size_t len = this->length() - offset;
+    switch (this->type()) {
+        case history_type_fish_2_0:
+            return decode_item_fish_2_0(base, len);
+        case history_type_fish_1_x:
+            return decode_item_fish_1_x(base, len);
+    }
+    return history_item_t(L"");
+}
+
+maybe_t<size_t> history_file_contents_t::offset_of_next_item(size_t *cursor, time_t cutoff) {
+    size_t offset = size_t(-1);
+    switch (this->type()) {
+        case history_type_fish_2_0:
+            offset = offset_of_next_item_fish_2_0(*this, cursor, cutoff);
+            break;
+        case history_type_fish_1_x:
+            offset = offset_of_next_item_fish_1_x(this->begin(), this->length(), cursor);
+            break;
+    }
+    if (offset == size_t(-1)) {
+        return none();
+    }
+    return offset;
+}
+
+/// Read one line, stripping off any newline, and updating cursor. Note that our input string is NOT
+/// null terminated; it's just a memory mapped file.
+static size_t read_line(const char *base, size_t cursor, size_t len, std::string &result) {
+    // Locate the newline.
+    assert(cursor <= len);
+    const char *start = base + cursor;
+    const char *a_newline = (char *)std::memchr(start, '\n', len - cursor);
+    if (a_newline != NULL) {  // we found a newline
+        result.assign(start, a_newline - start);
+        // Return the amount to advance the cursor; skip over the newline.
+        return a_newline - start + 1;
+    }
+
+    // We ran off the end.
+    result.clear();
+    return len - cursor;
+}
+
+/// Trims leading spaces in the given string, returning how many there were.
+static size_t trim_leading_spaces(std::string &str) {
+    size_t i = 0, max = str.size();
+    while (i < max && str[i] == ' ') i++;
+    str.erase(0, i);
+    return i;
+}
+
+static bool extract_prefix_and_unescape_yaml(std::string *key, std::string *value,
+                                             const std::string &line) {
+    size_t where = line.find(':');
+    if (where != std::string::npos) {
+        key->assign(line, 0, where);
+
+        // Skip a space after the : if necessary.
+        size_t val_start = where + 1;
+        if (val_start < line.size() && line.at(val_start) == ' ') val_start++;
+        value->assign(line, val_start, line.size() - val_start);
+
+        unescape_yaml_fish_2_0(key);
+        unescape_yaml_fish_2_0(value);
+    }
+    return where != std::string::npos;
+}
+
+/// Decode an item via the fish 2.0 format.
+static history_item_t decode_item_fish_2_0(const char *base, size_t len) {
+    wcstring cmd;
+    time_t when = 0;
+    path_list_t paths;
+
+    size_t indent = 0, cursor = 0;
+    std::string key, value, line;
+
+    // Read the "- cmd:" line.
+    size_t advance = read_line(base, cursor, len, line);
+    trim_leading_spaces(line);
+    if (!extract_prefix_and_unescape_yaml(&key, &value, line) || key != "- cmd") {
+        goto done;  //!OCLINT(goto is the cleanest way to handle bad input)
+    }
+
+    cursor += advance;
+    cmd = str2wcstring(value);
+
+    // Read the remaining lines.
+    for (;;) {
+        size_t advance = read_line(base, cursor, len, line);
+
+        size_t this_indent = trim_leading_spaces(line);
+        if (indent == 0) indent = this_indent;
+
+        if (this_indent == 0 || indent != this_indent) break;
+
+        if (!extract_prefix_and_unescape_yaml(&key, &value, line)) break;
+
+        // We are definitely going to consume this line.
+        cursor += advance;
+
+        if (key == "when") {
+            // Parse an int from the timestamp. Should this fail, strtol returns 0; that's
+            // acceptable.
+            char *end = NULL;
+            long tmp = strtol(value.c_str(), &end, 0);
+            when = tmp;
+        } else if (key == "paths") {
+            // Read lines starting with " - " until we can't read any more.
+            for (;;) {
+                size_t advance = read_line(base, cursor, len, line);
+                if (trim_leading_spaces(line) <= indent) break;
+
+                if (std::strncmp(line.c_str(), "- ", 2)) break;
+
+                // We're going to consume this line.
+                cursor += advance;
+
+                // Skip the leading dash-space and then store this path it.
+                line.erase(0, 2);
+                unescape_yaml_fish_2_0(&line);
+                paths.push_back(str2wcstring(line));
+            }
+        }
+    }
+
+done:
+    history_item_t result(cmd, when);
+    result.set_required_paths(paths);
+    return result;
+}
+
+/// Parse a timestamp line that looks like this: spaces, "when:", spaces, timestamp, newline
+/// The string is NOT null terminated; however we do know it contains a newline, so stop when we
+/// reach it.
+static bool parse_timestamp(const char *str, time_t *out_when) {
+    const char *cursor = str;
+    // Advance past spaces.
+    while (*cursor == ' ') cursor++;
+
+    // Look for "when:".
+    size_t when_len = 5;
+    if (std::strncmp(cursor, "when:", when_len) != 0) return false;
+    cursor += when_len;
+
+    // Advance past spaces.
+    while (*cursor == ' ') cursor++;
+
+    // Try to parse a timestamp.
+    long timestamp = 0;
+    if (isdigit(*cursor) && (timestamp = strtol(cursor, NULL, 0)) > 0) {
+        *out_when = (time_t)timestamp;
+        return true;
+    }
+    return false;
+}
+
+/// Returns a pointer to the start of the next line, or NULL. The next line must itself end with a
+/// newline. Note that the string is not null terminated.
+static const char *next_line(const char *start, size_t length) {
+    // Handle the hopeless case.
+    if (length < 1) return NULL;
+
+    // Get a pointer to the end, that we must not pass.
+    const char *const end = start + length;
+
+    // Skip past the next newline.
+    const char *nextline = (const char *)std::memchr(start, '\n', length);
+    if (!nextline || nextline >= end) {
+        return NULL;
+    }
+    // Skip past the newline character itself.
+    if (++nextline >= end) {
+        return NULL;
+    }
+
+    // Make sure this new line is itself "newline terminated". If it's not, return NULL.
+    const char *next_newline = (const char *)std::memchr(nextline, '\n', end - nextline);
+    if (!next_newline) {
+        return NULL;
+    }
+
+    return nextline;
+}
+
+/// Support for iteratively locating the offsets of history items.
+/// Pass the file contents and a pointer to a cursor size_t, initially 0.
+/// If custoff_timestamp is nonzero, skip items created at or after that timestamp.
+/// Returns (size_t)-1 when done.
+static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &contents,
+                                           size_t *inout_cursor, time_t cutoff_timestamp) {
+    size_t cursor = *inout_cursor;
+    size_t result = size_t(-1);
+    const size_t length = contents.length();
+    const char *const begin = contents.begin();
+    const char *const end = contents.end();
+    while (cursor < length) {
+        const char *line_start = contents.address_at(cursor);
+
+        // Advance the cursor to the next line.
+        const char *a_newline = (const char *)std::memchr(line_start, '\n', length - cursor);
+        if (a_newline == NULL) break;
+
+        // Advance the cursor past this line. +1 is for the newline.
+        cursor = a_newline - begin + 1;
+
+        // Skip lines with a leading space, since these are in the interior of one of our items.
+        if (line_start[0] == ' ') continue;
+
+        // Skip very short lines to make one of the checks below easier.
+        if (a_newline - line_start < 3) continue;
+
+        // Try to be a little YAML compatible. Skip lines with leading %, ---, or ...
+        if (!std::memcmp(line_start, "%", 1) || !std::memcmp(line_start, "---", 3) ||
+            !std::memcmp(line_start, "...", 3))
+            continue;
+
+        // Hackish: fish 1.x rewriting a fish 2.0 history file can produce lines with lots of
+        // leading "- cmd: - cmd: - cmd:". Trim all but one leading "- cmd:".
+        const char *double_cmd = "- cmd: - cmd: ";
+        const size_t double_cmd_len = std::strlen(double_cmd);
+        while ((size_t)(a_newline - line_start) > double_cmd_len &&
+               !std::memcmp(line_start, double_cmd, double_cmd_len)) {
+            // Skip over just one of the - cmd. In the end there will be just one left.
+            line_start += std::strlen("- cmd: ");
+        }
+
+        // Hackish: fish 1.x rewriting a fish 2.0 history file can produce commands like "when:
+        // 123456". Ignore those.
+        const char *cmd_when = "- cmd:    when:";
+        const size_t cmd_when_len = std::strlen(cmd_when);
+        if ((size_t)(a_newline - line_start) >= cmd_when_len &&
+            !std::memcmp(line_start, cmd_when, cmd_when_len)) {
+            continue;
+        }
+
+        // At this point, we know line_start is at the beginning of an item. But maybe we want to
+        // skip this item because of timestamps. A 0 cutoff means we don't care; if we do care, then
+        // try parsing out a timestamp.
+        if (cutoff_timestamp != 0) {
+            // Hackish fast way to skip items created after our timestamp. This is the mechanism by
+            // which we avoid "seeing" commands from other sessions that started after we started.
+            // We try hard to ensure that our items are sorted by their timestamps, so in theory we
+            // could just break, but I don't think that works well if (for example) the clock
+            // changes. So we'll read all subsequent items.
+            // Walk over lines that we think are interior. These lines are not null terminated, but
+            // are guaranteed to contain a newline.
+            bool has_timestamp = false;
+            time_t timestamp = 0;
+            const char *interior_line;
+
+            for (interior_line = next_line(line_start, end - line_start);
+                 interior_line != NULL && !has_timestamp;
+                 interior_line = next_line(interior_line, end - interior_line)) {
+                // If the first character is not a space, it's not an interior line, so we're done.
+                if (interior_line[0] != ' ') break;
+
+                // Hackish optimization: since we just stepped over some interior line, update the
+                // cursor so we don't have to look at these lines next time.
+                cursor = interior_line - begin;
+
+                // Try parsing a timestamp from this line. If we succeed, the loop will break.
+                has_timestamp = parse_timestamp(interior_line, &timestamp);
+            }
+
+            // Skip this item if the timestamp is past our cutoff.
+            if (has_timestamp && timestamp > cutoff_timestamp) {
+                continue;
+            }
+        }
+
+        // We made it through the gauntlet.
+        result = line_start - begin;
+        break;  //!OCLINT(avoid branching statement as last in loop)
+    }
+
+    *inout_cursor = cursor;
+    return result;
+}
+
+/// Remove backslashes from all newlines. This makes a string from the history file better formated
+/// for on screen display.
+static wcstring history_unescape_newlines_fish_1_x(const wcstring &in_str) {
+    wcstring out;
+    for (const wchar_t *in = in_str.c_str(); *in; in++) {
+        if (*in == L'\\') {
+            if (*(in + 1) != L'\n') {
+                out.push_back(*in);
+            }
+        } else {
+            out.push_back(*in);
+        }
+    }
+    return out;
+}
+
+/// Decode an item via the fish 1.x format. Adapted from fish 1.x's item_get().
+static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
+    const char *end = begin + length;
+    const char *pos = begin;
+    wcstring out;
+    bool was_backslash = false;
+    bool first_char = true;
+    bool timestamp_mode = false;
+    time_t timestamp = 0;
+
+    while (1) {
+        wchar_t c;
+        size_t res;
+        mbstate_t state = {};
+
+        if (MB_CUR_MAX == 1) {  // single-byte locale
+            c = (unsigned char)*pos;
+            res = 1;
+        } else {
+            res = std::mbrtowc(&c, pos, end - pos, &state);
+        }
+
+        if (res == (size_t)-1) {
+            pos++;
+            continue;
+        } else if (res == (size_t)-2) {
+            break;
+        } else if (res == (size_t)0) {
+            pos++;
+            continue;
+        }
+        pos += res;
+
+        if (c == L'\n') {
+            if (timestamp_mode) {
+                const wchar_t *time_string = out.c_str();
+                while (*time_string && !iswdigit(*time_string)) time_string++;
+
+                if (*time_string) {
+                    time_t tm = (time_t)fish_wcstol(time_string);
+                    if (!errno && tm >= 0) {
+                        timestamp = tm;
+                    }
+                }
+
+                out.clear();
+                timestamp_mode = false;
+                continue;
+            }
+            if (!was_backslash) break;
+        }
+
+        if (first_char) {
+            first_char = false;
+            if (c == L'#') timestamp_mode = true;
+        }
+
+        out.push_back(c);
+        was_backslash = (c == L'\\') && !was_backslash;
+    }
+
+    out = history_unescape_newlines_fish_1_x(out);
+    return history_item_t(out, timestamp);
+}
+
+/// Same as offset_of_next_item_fish_2_0, but for fish 1.x (pre fishfish).
+/// Adapted from history_populate_from_mmap in history.c
+static size_t offset_of_next_item_fish_1_x(const char *begin, size_t mmap_length,
+                                           size_t *inout_cursor) {
+    if (mmap_length == 0 || *inout_cursor >= mmap_length) return (size_t)-1;
+
+    const char *end = begin + mmap_length;
+    const char *pos;
+    bool ignore_newline = false;
+    bool do_push = true;
+    bool all_done = false;
+    size_t result = *inout_cursor;
+
+    for (pos = begin + *inout_cursor; pos < end && !all_done; pos++) {
+        if (do_push) {
+            ignore_newline = (*pos == '#');
+            do_push = false;
+        }
+
+        if (*pos == '\\') {
+            pos++;
+        } else if (*pos == '\n') {
+            if (!ignore_newline) {
+                // pos will be left pointing just after this newline, because of the ++ in the loop.
+                all_done = true;
+            }
+            ignore_newline = false;
+        }
+    }
+
+    *inout_cursor = (pos - begin);
+    return result;
+}
diff --git a/src/history_file.h b/src/history_file.h
new file mode 100644
index 000000000..449ef0523
--- /dev/null
+++ b/src/history_file.h
@@ -0,0 +1,72 @@
+#ifndef FISH_HISTORY_FILE_H
+#define FISH_HISTORY_FILE_H
+
+#include "config.h"
+
+#include "maybe.h"
+
+#include <cassert>
+#include <memory>
+
+#include <sys/mman.h>
+
+// History file types.
+enum history_file_type_t { history_type_fish_2_0, history_type_fish_1_x };
+
+/// history_file_contents_t holds the read-only contents of a file.
+class history_file_contents_t {
+   public:
+    /// Construct a history file contents from a file descriptor. The file descriptor is not closed.
+    static std::unique_ptr<history_file_contents_t> create(int fd);
+
+    /// Decode an item at a given offset.
+    history_item_t decode_item(size_t offset) const;
+
+    /// Support for iterating item offsets.
+    /// The cursor should initially be 0.
+    /// If cutoff is nonzero, skip items whose timestamp is newer than cutoff.
+    /// \return the offset of the next item, or none() on end.
+    maybe_t<size_t> offset_of_next_item(size_t *cursor, time_t cutoff);
+
+    /// Get the file type.
+    history_file_type_t type() const { return type_; }
+
+    /// Get the size of the contents.
+    size_t length() const { return length_; }
+
+    /// Return a pointer to the beginning.
+    const char *begin() const { return address_at(0); }
+
+    /// Return a pointer to one-past-the-end.
+    const char *end() const { return address_at(length_); }
+
+    /// Access the address at a given offset.
+    const char *address_at(size_t offset) const {
+        assert(offset <= length_ && "Invalid offset");
+        return start_ + offset;
+    }
+
+    ~history_file_contents_t();
+
+   private:
+    // The memory mapped pointer.
+    const char *start_;
+
+    // The mapped length.
+    const size_t length_;
+
+    // The type of the mapped file.
+    const history_file_type_t type_;
+
+    // Private constructor; use the static create() function.
+    history_file_contents_t(const char *mmap_start, size_t mmap_length, history_file_type_t type);
+
+    history_file_contents_t(history_file_contents_t &&) = delete;
+    void operator=(history_file_contents_t &&) = delete;
+};
+
+// Support for escaping and unescaping the nonstandard "yaml" format introduced in fish 2.0.
+void escape_yaml_fish_2_0(std::string *str);
+void unescape_yaml_fish_2_0(std::string *str);
+
+#endif

From 2ddde381d4ce77e262f3e392eae544a51074bc39 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 11 Aug 2019 12:56:51 -0700
Subject: [PATCH 0858/1732] Clean up next_line() interface and implementation

---
 src/history_file.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/history_file.cpp b/src/history_file.cpp
index 66941d24c..4a416cf2c 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -309,26 +309,24 @@ static bool parse_timestamp(const char *str, time_t *out_when) {
 
 /// Returns a pointer to the start of the next line, or NULL. The next line must itself end with a
 /// newline. Note that the string is not null terminated.
-static const char *next_line(const char *start, size_t length) {
+static const char *next_line(const char *start, const char *end) {
     // Handle the hopeless case.
-    if (length < 1) return NULL;
-
-    // Get a pointer to the end, that we must not pass.
-    const char *const end = start + length;
+    if (end == start) return NULL;
 
     // Skip past the next newline.
-    const char *nextline = (const char *)std::memchr(start, '\n', length);
-    if (!nextline || nextline >= end) {
+    const char *nextline = std::find(start, end, '\n');
+    if (nextline == end) {
         return NULL;
     }
+
     // Skip past the newline character itself.
     if (++nextline >= end) {
         return NULL;
     }
 
     // Make sure this new line is itself "newline terminated". If it's not, return NULL.
-    const char *next_newline = (const char *)std::memchr(nextline, '\n', end - nextline);
-    if (!next_newline) {
+    const char *next_newline = std::find(nextline, end, '\n');
+    if (next_newline == end) {
         return NULL;
     }
 
@@ -401,9 +399,9 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
             time_t timestamp = 0;
             const char *interior_line;
 
-            for (interior_line = next_line(line_start, end - line_start);
+            for (interior_line = next_line(line_start, end);
                  interior_line != NULL && !has_timestamp;
-                 interior_line = next_line(interior_line, end - interior_line)) {
+                 interior_line = next_line(interior_line, end)) {
                 // If the first character is not a space, it's not an interior line, so we're done.
                 if (interior_line[0] != ' ') break;
 

From 92e9a34b470725e2ed986b01525c3076bfa08bd1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 11 Aug 2019 13:07:47 -0700
Subject: [PATCH 0859/1732] Simplify history_output_buffer_t

---
 src/history.cpp | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 2a005b440..7afc5bbae 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -76,12 +76,11 @@ static constexpr int max_save_tries = 1024;
 
 namespace {
 
-static size_t safe_strlen(const char *s) { return s ? std::strlen(s) : 0; }
 /// Helper class for certain output. This is basically a string that allows us to ensure we only
 /// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to
 /// implement your own streambuf? Total insanity.
 class history_output_buffer_t {
-    std::vector<char> buffer;
+    std::string buffer;
 
    public:
     /// Add a bit more to HISTORY_OUTPUT_BUFFER_SIZE because we flush once we've exceeded that size.
@@ -91,20 +90,9 @@ class history_output_buffer_t {
 
     /// Append one or more strings.
     void append(const char *s1, const char *s2 = NULL, const char *s3 = NULL) {
-        constexpr size_t ptr_count = 3;
-        const char *ptrs[ptr_count] = {s1, s2, s3};
-        size_t lengths[ptr_count] = {safe_strlen(s1), safe_strlen(s2), safe_strlen(s3)};
-
-        // Determine the additional size we'll need.
-        size_t additional_length = std::accumulate(std::begin(lengths), std::end(lengths), 0);
-        buffer.reserve(buffer.size() + additional_length);
-
-        // Append
-        for (size_t i = 0; i < ptr_count; i++) {
-            if (lengths[i] > 0) {
-                buffer.insert(buffer.end(), ptrs[i], ptrs[i] + lengths[i]);
-            }
-        }
+        if (s1) buffer.append(s1);
+        if (s2) buffer.append(s2);
+        if (s3) buffer.append(s3);
     }
 
     /// Output to a given fd, resetting our buffer. Returns true on success, false on error.
@@ -112,7 +100,7 @@ class history_output_buffer_t {
         if (buffer.empty()) {
             return true;
         }
-        bool result = write_loop(fd, &buffer.at(0), buffer.size()) >= 0;
+        bool result = write_loop(fd, buffer.data(), buffer.size()) >= 0;
         buffer.clear();
         return result;
     }

From 6b008c3eae71604b541ce81d34d0d24259f3da5a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 11 Aug 2019 13:41:04 -0700
Subject: [PATCH 0860/1732] Stop caching the lowercase string contents in
 history items

---
 src/history.cpp | 5 ++++-
 src/history.h   | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 7afc5bbae..c82a71375 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -208,13 +208,16 @@ bool history_item_t::merge(const history_item_t &item) {
 history_item_t::history_item_t(const wcstring &str, time_t when, history_identifier_t ident)
     : creation_timestamp(when), identifier(ident) {
     contents = trim(str);
-    contents_lower = wcstolower(contents);
 }
 
 bool history_item_t::matches_search(const wcstring &term, enum history_search_type_t type,
                                     bool case_sensitive) const {
     // Note that 'term' has already been lowercased when constructing the
     // search object if we're doing a case insensitive search.
+    wcstring contents_lower;
+    if (!case_sensitive) {
+        contents_lower = wcstolower(contents);
+    }
     const wcstring &content_to_match = case_sensitive ? contents : contents_lower;
 
     switch (type) {
diff --git a/src/history.h b/src/history.h
index 48d823efb..b9c5039bb 100644
--- a/src/history.h
+++ b/src/history.h
@@ -69,8 +69,7 @@ class history_item_t {
     bool merge(const history_item_t &item);
 
     // The actual contents of the entry.
-    wcstring contents;        // value as entered by the user
-    wcstring contents_lower;  // value normalized to all lowercase for case insensitive comparisons
+    wcstring contents;
 
     // Original creation time for the entry.
     time_t creation_timestamp;
@@ -85,7 +84,6 @@ class history_item_t {
     explicit history_item_t(const wcstring &str, time_t when = 0, history_identifier_t ident = 0);
 
     const wcstring &str() const { return contents; }
-    const wcstring &str_lower() const { return contents_lower; }
 
     bool empty() const { return contents.empty(); }
 

From 6eebe4cc83584f1fbbf7cc04c126f83ed2a65dee Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 11 Aug 2019 14:26:22 -0700
Subject: [PATCH 0861/1732] Eliminate history_lru_item_t

history_item_t is enough
---
 src/history.cpp | 36 +++++++++++-------------------------
 src/history.h   |  1 +
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index c82a71375..fd3080a9a 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -147,24 +147,12 @@ static bool history_file_lock(int fd, int lock_type) {
     return retval != -1;
 }
 
-/// Our LRU cache is used for restricting the amount of history we have, and limiting how long we
-/// order it.
-class history_lru_item_t {
-   public:
-    wcstring text;
-    time_t timestamp;
-    path_list_t required_paths;
-    explicit history_lru_item_t(const history_item_t &item)
-        : text(item.str()),
-          timestamp(item.timestamp()),
-          required_paths(item.get_required_paths()) {}
-};
-
-class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_lru_item_t> {
-    typedef lru_cache_t<history_lru_cache_t, history_lru_item_t> super;
+}  // anonymous namespace
 
+class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item_t> {
    public:
-    using super::super;
+    explicit history_lru_cache_t(size_t max)
+        : lru_cache_t<history_lru_cache_t, history_item_t>(max) {}
 
     /// Function to add a history item.
     void add_item(const history_item_t &item) {
@@ -174,18 +162,16 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_lru_
         // See if it's in the cache. If it is, update the timestamp. If not, we create a new node
         // and add it. Note that calling get_node promotes the node to the front.
         wcstring key = item.str();
-        history_lru_item_t *node = this->get(key);
+        history_item_t *node = this->get(key);
         if (node == NULL) {
-            this->insert(std::move(key), history_lru_item_t(item));
+            this->insert(std::move(key), item);
         } else {
-            node->timestamp = std::max(node->timestamp, item.timestamp());
+            node->creation_timestamp = std::max(node->timestamp(), item.timestamp());
             // What to do about paths here? Let's just ignore them.
         }
     }
 };
 
-}  // anonymous namespace
-
 static wcstring history_filename(const wcstring &name, const wcstring &suffix);
 
 /// We can merge two items if they are the same command. We use the more recent timestamp, more
@@ -753,16 +739,16 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
     // Stable-sort our items by timestamp
     // This is because we may have read "old" items with a later timestamp than our "new" items
     // This is the essential step that roughly orders items by history
-    lru.stable_sort([](const history_lru_item_t &item1, const history_lru_item_t &item2) {
-        return item1.timestamp < item2.timestamp;
+    lru.stable_sort([](const history_item_t &item1, const history_item_t &item2) {
+        return item1.timestamp() < item2.timestamp();
     });
 
     // Write them out.
     bool ok = true;
     history_output_buffer_t buffer(HISTORY_OUTPUT_BUFFER_SIZE);
     for (const auto &key_item : lru) {
-        const history_lru_item_t &item = key_item.second;
-        append_yaml_to_buffer(item.text, item.timestamp, item.required_paths, &buffer);
+        const history_item_t &item = key_item.second;
+        append_yaml_to_buffer(item.str(), item.timestamp(), item.required_paths, &buffer);
         if (buffer.output_size() >= HISTORY_OUTPUT_BUFFER_SIZE) {
             ok = buffer.flush_to_fd(dst_fd);
             if (!ok) {
diff --git a/src/history.h b/src/history.h
index b9c5039bb..ea199be46 100644
--- a/src/history.h
+++ b/src/history.h
@@ -62,6 +62,7 @@ typedef uint64_t history_identifier_t;
 class history_item_t {
     friend class history_t;
     friend struct history_impl_t;
+    friend class history_lru_cache_t;
     friend class history_tests_t;
 
    private:

From 3ae5b23971d7178ce791132e0dbb2df787ac7bf5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 12 Aug 2019 09:16:24 -0700
Subject: [PATCH 0862/1732] Migrate append_history_item_to_buffer to
 history_file.cpp

Also eliminate history_output_buffer_t, which no longer does anything useful.
---
 src/history.cpp      | 108 ++++++++++++-------------------------------
 src/history_file.cpp |  23 +++++++++
 src/history_file.h   |   5 ++
 3 files changed, 58 insertions(+), 78 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index fd3080a9a..fb167caac 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -76,38 +76,18 @@ static constexpr int max_save_tries = 1024;
 
 namespace {
 
-/// Helper class for certain output. This is basically a string that allows us to ensure we only
-/// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to
-/// implement your own streambuf? Total insanity.
-class history_output_buffer_t {
-    std::string buffer;
-
-   public:
-    /// Add a bit more to HISTORY_OUTPUT_BUFFER_SIZE because we flush once we've exceeded that size.
-    explicit history_output_buffer_t(size_t reserve_amt = HISTORY_OUTPUT_BUFFER_SIZE + 128) {
-        buffer.reserve(reserve_amt);
+/// If the size of \p buffer is at least \p min_size, output the contents of a string \p str to \p
+/// fd, and clear the string. \return 0 on success, an error code on failure.
+static int flush_to_fd(std::string *buffer, int fd, size_t min_size) {
+    if (buffer->empty() || buffer->size() < min_size) {
+        return 0;
     }
-
-    /// Append one or more strings.
-    void append(const char *s1, const char *s2 = NULL, const char *s3 = NULL) {
-        if (s1) buffer.append(s1);
-        if (s2) buffer.append(s2);
-        if (s3) buffer.append(s3);
+    if (write_loop(fd, buffer->data(), buffer->size()) < 0) {
+        return errno;
     }
-
-    /// Output to a given fd, resetting our buffer. Returns true on success, false on error.
-    bool flush_to_fd(int fd) {
-        if (buffer.empty()) {
-            return true;
-        }
-        bool result = write_loop(fd, buffer.data(), buffer.size()) >= 0;
-        buffer.clear();
-        return result;
-    }
-
-    /// Return how much data we've accumulated.
-    size_t output_size() const { return buffer.size(); }
-};
+    buffer->clear();
+    return 0;
+}
 
 class time_profiler_t {
     const char *what;
@@ -231,26 +211,6 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
     DIE("unexpected history_search_type_t value");
 }
 
-/// Append our YAML history format to the provided vector at the given offset, updating the offset.
-static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
-                                  const path_list_t &required_paths,
-                                  history_output_buffer_t *buffer) {
-    std::string cmd = wcs2string(wcmd);
-    escape_yaml_fish_2_0(&cmd);
-    buffer->append("- cmd: ", cmd.c_str(), "\n");
-    buffer->append("  when: ", std::to_string(timestamp).c_str(), "\n");
-
-    if (!required_paths.empty()) {
-        buffer->append("  paths:\n");
-
-        for (auto const &wpath : required_paths) {
-            std::string path = wcs2string(wpath);
-            escape_yaml_fish_2_0(&path);
-            buffer->append("    - ", path.c_str(), "\n");
-        }
-    }
-}
-
 struct history_impl_t {
     // Privately add an item. If pending, the item will not be returned by history searches until a
     // call to resolve_pending.
@@ -744,27 +704,22 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
     });
 
     // Write them out.
-    bool ok = true;
-    history_output_buffer_t buffer(HISTORY_OUTPUT_BUFFER_SIZE);
+    int err = 0;
+    std::string buffer;
+    buffer.reserve(HISTORY_OUTPUT_BUFFER_SIZE + 128);
     for (const auto &key_item : lru) {
-        const history_item_t &item = key_item.second;
-        append_yaml_to_buffer(item.str(), item.timestamp(), item.required_paths, &buffer);
-        if (buffer.output_size() >= HISTORY_OUTPUT_BUFFER_SIZE) {
-            ok = buffer.flush_to_fd(dst_fd);
-            if (!ok) {
-                debug(2, L"Error %d when writing to temporary history file", errno);
-                break;
-            }
-        }
+        append_history_item_to_buffer(key_item.second, &buffer);
+        err = flush_to_fd(&buffer, dst_fd, HISTORY_OUTPUT_BUFFER_SIZE);
+        if (err) break;
+    }
+    if (!err) {
+        err = flush_to_fd(&buffer, dst_fd, 0);
+    }
+    if (err) {
+        debug(2, L"Error %d when writing to temporary history file", err);
     }
 
-    if (ok) {
-        ok = buffer.flush_to_fd(dst_fd);
-        if (!ok) {
-            debug(2, L"Error %d when writing to temporary history file", errno);
-        }
-    }
-    return ok;
+    return err == 0;
 }
 
 // Returns the fd of an opened temporary file, or -1 on failure
@@ -962,23 +917,20 @@ bool history_impl_t::save_internal_via_appending() {
         // write even a pending item - pending items are ignored by history within the command
         // itself, but should still be written to the file.
         // TODO: consider filling the buffer ahead of time, so we can just lock, splat, and unlock?
-        bool errored = false;
+        int err = 0;
         // Use a small buffer size for appending, we usually only have 1 item
-        history_output_buffer_t buffer(64);
+        std::string buffer;
         while (first_unwritten_new_item_index < new_items.size()) {
             const history_item_t &item = new_items.at(first_unwritten_new_item_index);
-            append_yaml_to_buffer(item.str(), item.timestamp(), item.get_required_paths(), &buffer);
-            if (buffer.output_size() >= HISTORY_OUTPUT_BUFFER_SIZE) {
-                errored = !buffer.flush_to_fd(history_fd);
-                if (errored) break;
-            }
-
+            append_history_item_to_buffer(item, &buffer);
+            err = flush_to_fd(&buffer, history_fd, HISTORY_OUTPUT_BUFFER_SIZE);
+            if (err) break;
             // We wrote this item, hooray.
             first_unwritten_new_item_index++;
         }
 
-        if (!errored && buffer.flush_to_fd(history_fd)) {
-            ok = true;
+        if (!err) {
+            err = flush_to_fd(&buffer, history_fd, 0);
         }
 
         // Since we just modified the file, update our mmap_file_id to match its current state
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 4a416cf2c..b1e00b6f7 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -428,6 +428,29 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
     return result;
 }
 
+void append_history_item_to_buffer(const history_item_t &item, std::string *buffer) {
+    auto append = [=](const char *a, const char *b = nullptr, const char *c = nullptr) {
+        if (a) buffer->append(a);
+        if (b) buffer->append(b);
+        if (c) buffer->append(c);
+    };
+
+    std::string cmd = wcs2string(item.str());
+    escape_yaml_fish_2_0(&cmd);
+    append("- cmd: ", cmd.c_str(), "\n");
+    append("  when: ", std::to_string(item.timestamp()).c_str(), "\n");
+    const path_list_t &paths = item.get_required_paths();
+    if (!paths.empty()) {
+        append("  paths:\n");
+
+        for (const auto &wpath : paths) {
+            std::string path = wcs2string(wpath);
+            escape_yaml_fish_2_0(&path);
+            append("    - ", path.c_str(), "\n");
+        }
+    }
+}
+
 /// Remove backslashes from all newlines. This makes a string from the history file better formated
 /// for on screen display.
 static wcstring history_unescape_newlines_fish_1_x(const wcstring &in_str) {
diff --git a/src/history_file.h b/src/history_file.h
index 449ef0523..bc0065099 100644
--- a/src/history_file.h
+++ b/src/history_file.h
@@ -10,6 +10,8 @@
 
 #include <sys/mman.h>
 
+class history_item_t;
+
 // History file types.
 enum history_file_type_t { history_type_fish_2_0, history_type_fish_1_x };
 
@@ -65,6 +67,9 @@ class history_file_contents_t {
     void operator=(history_file_contents_t &&) = delete;
 };
 
+/// Append a history item to a buffer, in preparation for outputting it to the history file.
+void append_history_item_to_buffer(const history_item_t &item, std::string *buffer);
+
 // Support for escaping and unescaping the nonstandard "yaml" format introduced in fish 2.0.
 void escape_yaml_fish_2_0(std::string *str);
 void unescape_yaml_fish_2_0(std::string *str);

From ce178fd6fda1e6b4b9fe50d53042f787d9d81377 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 12 Aug 2019 09:22:21 -0700
Subject: [PATCH 0863/1732] Make escape_yaml_fish_2_0 and
 unescape_yaml_fish_2_0 static

They no longer need to be exposed.
---
 src/history_file.cpp | 5 +++--
 src/history_file.h   | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/history_file.cpp b/src/history_file.cpp
index b1e00b6f7..c21adc490 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -68,13 +68,14 @@ static void replace_all(std::string *str, const char *needle, const char *replac
     }
 }
 
-void escape_yaml_fish_2_0(std::string *str) {
+// Support for escaping and unescaping the nonstandard "yaml" format introduced in fish 2.0.
+static void escape_yaml_fish_2_0(std::string *str) {
     replace_all(str, "\\", "\\\\");  // replace one backslash with two
     replace_all(str, "\n", "\\n");   // replace newline with backslash + literal n
 }
 
 /// This function is called frequently, so it ought to be fast.
-void unescape_yaml_fish_2_0(std::string *str) {
+static void unescape_yaml_fish_2_0(std::string *str) {
     size_t cursor = 0, size = str->size();
     while (cursor < size) {
         // Operate on a const version of str, to avoid needless COWs that at() does.
diff --git a/src/history_file.h b/src/history_file.h
index bc0065099..a86fecf97 100644
--- a/src/history_file.h
+++ b/src/history_file.h
@@ -70,8 +70,4 @@ class history_file_contents_t {
 /// Append a history item to a buffer, in preparation for outputting it to the history file.
 void append_history_item_to_buffer(const history_item_t &item, std::string *buffer);
 
-// Support for escaping and unescaping the nonstandard "yaml" format introduced in fish 2.0.
-void escape_yaml_fish_2_0(std::string *str);
-void unescape_yaml_fish_2_0(std::string *str);
-
 #endif

From edc8d5d7a3edb6834e8c1d0afd7126101e4682d7 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 13 Aug 2019 22:28:17 -0700
Subject: [PATCH 0864/1732] string-replace-fewer-backslashes -> regex-easyesc

This shortens a very long feature name.

See discussion in #5805
---
 share/functions/fish_clipboard_paste.fish | 2 +-
 sphinx_doc_src/index.rst                  | 2 +-
 src/future_feature_flags.cpp              | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 7398bf140..54c78d445 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -26,7 +26,7 @@ function fish_clipboard_paste
     #
     # This eases pasting non-code (e.g. markdown or git commitishes).
     if __fish_commandline_is_singlequoted
-        if status test-feature string-replace-fewer-backslashes
+        if status test-feature regex-easyesc
             set data (string replace -ra "(['\\\])" '\\\\$1' -- $data)
         else
             set data (string replace -ra "(['\\\])" '\\\\\\\$1' -- $data)
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 0d2b9c1e6..f737907b1 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1714,7 +1714,7 @@ You can see the current list of features via ``status features``::
     > status features
     stderr-nocaret  on     3.0      ^ no longer redirects stderr
     qmark-noglob    off    3.0      ? no longer globs
-    string-replace-fewer-backslashes        off     3.1     string replace -r needs fewer backslashes in the replacement
+    regex-easyesc   off    3.1      string replace -r needs fewer \\'s
 
 There are two breaking changes in fish 3.0: caret ``^`` no longer redirects stderr, and question mark ``?`` is no longer a glob.
 
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index f8e430cb9..b2831a30f 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -13,8 +13,7 @@ features_t &mutable_fish_features() { return global_features; }
 const features_t::metadata_t features_t::metadata[features_t::flag_count] = {
     {stderr_nocaret, L"stderr-nocaret", L"3.0", L"^ no longer redirects stderr"},
     {qmark_noglob, L"qmark-noglob", L"3.0", L"? no longer globs"},
-    {string_replace_backslash, L"string-replace-fewer-backslashes", L"3.1",
-     L"string replace -r needs fewer backslashes in the replacement"},
+    {string_replace_backslash, L"regex-easyesc", L"3.1", L"string replace -r needs fewer \\'s"},
 };
 
 const struct features_t::metadata_t *features_t::metadata_for(const wchar_t *name) {

From 47798510bd8748c9f8f4d625b58465efe90e5ab6 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 13 Aug 2019 22:56:31 -0700
Subject: [PATCH 0865/1732] tests, CHANGELOG: regex-easyesc

Oops, missed these the first time around.
---
 CHANGELOG.md                                      | 2 +-
 tests/checks/features-string-backslashes-off.fish | 2 +-
 tests/checks/features-string-backslashes.fish     | 2 +-
 tests/status.out                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8180e3925..2ecf562eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
 - fish now underlines every valid entered path instead of just the last one.
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
-- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `string-replace-fewer-backslashes` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
+- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `regex-easyesc` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
 - `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
 - More of the documentation, including the tutorial, is now available as man pages as well.
diff --git a/tests/checks/features-string-backslashes-off.fish b/tests/checks/features-string-backslashes-off.fish
index 06593c9da..233cdcfc4 100644
--- a/tests/checks/features-string-backslashes-off.fish
+++ b/tests/checks/features-string-backslashes-off.fish
@@ -1,2 +1,2 @@
-#RUN: %fish --features 'no-string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
+#RUN: %fish --features 'no-regex-easyesc' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
 # CHECK: a\b\c
diff --git a/tests/checks/features-string-backslashes.fish b/tests/checks/features-string-backslashes.fish
index c73e1c0e6..596a12bd1 100644
--- a/tests/checks/features-string-backslashes.fish
+++ b/tests/checks/features-string-backslashes.fish
@@ -1,2 +1,2 @@
-#RUN: %fish --features 'string-replace-fewer-backslashes' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
+#RUN: %fish --features 'regex-easyesc' -C 'string replace -ra "\\\\" "\\\\\\\\" -- "a\b\c"'
 # CHECK: a\\b\\c
diff --git a/tests/status.out b/tests/status.out
index b5cb078c0..4a94d8cd3 100644
--- a/tests/status.out
+++ b/tests/status.out
@@ -6,7 +6,7 @@ test_function
 # Future Feature Flags
 stderr-nocaret	off	3.0	^ no longer redirects stderr
 qmark-noglob	off	3.0	? no longer globs
-string-replace-fewer-backslashes	off	3.1	string replace -r needs fewer backslashes in the replacement
+regex-easyesc	off	3.1	string replace -r needs fewer \'s
 1
 2
 

From 332b305f81fc6832783161628f99be972799bd1f Mon Sep 17 00:00:00 2001
From: Tobias Hernstig <sinizmaster@hotmail.com>
Date: Wed, 14 Aug 2019 18:52:44 +0200
Subject: [PATCH 0866/1732] Documentation: Initialization files paths

Adds slash to end of example paths to align with that
~/.config/fish/conf.d/ had a slash at the end.
---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index f737907b1..770d7421f 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1667,8 +1667,8 @@ Configuration files are evaluated in the following order:
 - Configuration snippets in files ending in ``.fish``, in the directories:
 
   - ``$__fish_config_dir/conf.d`` (by default, ``~/.config/fish/conf.d/``)
-  - ``$__fish_sysconf_dir/conf.d`` (by default, ``/etc/fish/conf.d``)
-  - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/vendor_conf.d``)
+  - ``$__fish_sysconf_dir/conf.d`` (by default, ``/etc/fish/conf.d/``)
+  - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/vendor_conf.d/``)
 
   If there are multiple files with the same name in these directories, only the first will be executed.
   They are executed in order of their filename, sorted (like globs) in a natural order (i.e. "01" sorts before "2").

From 7ab291775a0c2f5d273472975345246920ca3c50 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 15 Aug 2019 13:42:23 -0700
Subject: [PATCH 0867/1732] Add flog logging to history

---
 src/flog.h      | 2 ++
 src/history.cpp | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/flog.h b/src/flog.h
index 0a97e55fb..0ff1ac4a3 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -72,6 +72,8 @@ class category_list_t {
 
     category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
     category_t char_encoding{L"char-encoding", L"Character encoding issues"};
+
+    category_t history{L"history", L"Command history events"};
 };
 
 /// The class responsible for logging.
diff --git a/src/history.cpp b/src/history.cpp
index fb167caac..e69ddd643 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -541,6 +541,8 @@ void history_impl_t::populate_from_file_contents() {
             old_item_offsets.push_back(*offset);
         }
     }
+
+    FLOGF(history, "Loaded %lu old items", old_item_offsets.size());
 }
 
 void history_impl_t::load_old_if_needed() {
@@ -739,6 +741,8 @@ static int create_temporary_file(const wcstring &name_template, wcstring *out_pa
 }
 
 bool history_impl_t::save_internal_via_rewrite() {
+    FLOGF(history, "Saving %lu items via rewrite",
+          new_items.size() - first_unwritten_new_item_index);
     bool ok = false;
 
     // We want to rewrite the file, while holding the lock for as briefly as possible
@@ -847,6 +851,8 @@ bool history_impl_t::save_internal_via_rewrite() {
 // Function called to save our unwritten history file by appending to the existing history file
 // Returns true on success, false on failure.
 bool history_impl_t::save_internal_via_appending() {
+    FLOGF(history, "Saving %lu items via appending",
+          new_items.size() - first_unwritten_new_item_index);
     // No deleting allowed.
     assert(deleted_items.empty());
 
@@ -972,6 +978,9 @@ void history_impl_t::save(bool vacuum) {
     if (!vacuum && deleted_items.empty()) {
         // Try doing a fast append.
         ok = save_internal_via_appending();
+        if (!ok) {
+            FLOGF(history, "Appending failed");
+        }
     }
     if (!ok) {
         // We did not or could not append; rewrite the file ("vacuum" it).

From a87e0183df1c88c6c57c3f0897e8ee40f9950ae7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 15 Aug 2019 13:44:27 -0700
Subject: [PATCH 0868/1732] Stop rewriting the history file on every command

fish is designed to append to the history file in most cases. However
save_internal_via_appending was never returning success, so we were
always doing the slow rewrite path. Correctly return success.

Fixes #6042
---
 CHANGELOG.md    | 1 +
 src/history.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ecf562eb..16a8b05d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (:) now always exits successfully, rather than echoing last return code.
 - Cursor configuration instructions for vi-mode have been added to the fish documentation.
+- A bug caused fish to rewrite the history file on every command. This has been fixed: fish will append to the file in most cases (#6042).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/history.cpp b/src/history.cpp
index e69ddd643..151aff6f0 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -947,6 +947,8 @@ bool history_impl_t::save_internal_via_appending() {
         this->history_file_id = file_id_for_fd(history_fd);
 
         close(history_fd);
+
+        ok = (err == 0);
     }
 
     // If someone has replaced the file, forget our file state.

From 124def8f4b9127867815fb5f4b24593bdc32c336 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 15 Aug 2019 19:59:35 -0700
Subject: [PATCH 0869/1732] Un-changelog the history fix

Turns out the bug never actually shipped in a release; it bisected to
3ae5b23971d7178ce791132e0dbb2df787ac7bf5
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16a8b05d8..2ecf562eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,6 @@
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (:) now always exits successfully, rather than echoing last return code.
 - Cursor configuration instructions for vi-mode have been added to the fish documentation.
-- A bug caused fish to rewrite the history file on every command. This has been fixed: fish will append to the file in most cases (#6042).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).

From f137f24d75998f803da41f343ab8bc454faf7668 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 16 Aug 2019 17:50:41 -0700
Subject: [PATCH 0870/1732] Initialize a const variable

Fixes #6041
---
 src/autoload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autoload.cpp b/src/autoload.cpp
index 4cdbc6cf8..11c51c92e 100644
--- a/src/autoload.cpp
+++ b/src/autoload.cpp
@@ -31,7 +31,7 @@ class autoload_file_cache_t {
     using timestamp_t = std::chrono::time_point<std::chrono::steady_clock>;
 
     /// The directories from which to load.
-    const wcstring_list_t dirs_;
+    const wcstring_list_t dirs_{};
 
     /// Our LRU cache of checks that were misses.
     /// The key is the command, the  value is the time of the check.

From 5101bdeb9f2d2d0a362619edde3da8c1b9cd7101 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 16 Aug 2019 18:48:30 -0700
Subject: [PATCH 0871/1732] Remove the WSL warning

This warning is annoying and there is no way to disable it.

Ping #5661. Ping #5298. Closes #6038
---
 src/common.cpp | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 54856d3af..a775314ce 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/utsname.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wctype.h>
@@ -31,11 +32,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#ifdef __linux__
-// Includes for WSL detection
-#include <sys/utsname.h>
-#endif
-
 #ifdef __FreeBSD__
 #include <sys/sysctl.h>
 #elif __APPLE__
@@ -157,29 +153,10 @@ bool is_windows_subsystem_for_linux() {
 #elif not defined(__linux__)
     return false;
 #else
-    // We are purposely not using std::call_once as it may invoke locking, which is an unnecessary
-    // overhead since there's no actual race condition here - even if multiple threads call this
-    // routine simultaneously the first time around, we just end up needlessly querying uname(2) one
-    // more time.
-
     static bool wsl_state = []() {
-        utsname info;
+        utsname info{};
         uname(&info);
-
-        // Sample utsname.release under WSL: 4.4.0-17763-Microsoft
-        if (std::strstr(info.release, "Microsoft") != nullptr) {
-            const char *dash = std::strchr(info.release, '-');
-            if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
-                debug(1,
-                      "This version of WSL is not supported and fish will probably not work "
-                      "correctly!\n"
-                      "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
-            }
-
-            return true;
-        } else {
-            return false;
-        }
+        return std::strstr(info.release, "Microsoft") != nullptr;
     }();
 
     // Subsequent calls to this function may take place after fork() and before exec() in

From 85f57d1d33f46b4f933746981f63e3ab22f4da83 Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Thu, 15 Aug 2019 23:40:17 -0700
Subject: [PATCH 0872/1732] Create hledger.fish

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

diff --git a/share/completions/hledger.fish b/share/completions/hledger.fish
new file mode 100644
index 000000000..ec33a6cae
--- /dev/null
+++ b/share/completions/hledger.fish
@@ -0,0 +1,171 @@
+# Generated by hand against hledger --help as of version 1.14.2.
+
+# TODO: Handle the -NUM form of --depth=NUM.
+
+set -l debug_opts '
+    1\tdefault
+    2\t
+    3\t
+    4\t
+    5\t
+    6\t
+    7\t
+    8\t
+    9\t
+'
+
+set -l takes_general_input_flags     'add commodities files'
+set -l takes_general_reporting_flags 'import check-dates check-dupes close equity rewrite balancesheet bs balancesheetequity bse cashflow cf incomestatement is roi accounts a activity balance bal b prices print txns p print-unique register reg r register-match stats tags'
+
+# General input flags
+complete -c hledger -r -s f -l file              -d 'Input file'                                 -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r      -l rules-file        -d 'CSV-conversion-rules file'                  -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x      -l separator         -d 'CSV separator'                              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r      -l alias             -d 'Rename account'                             -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -f      -l anon              -d 'Anonymize accounts and payees'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x      -l pivot             -d 'Use some other field/tag for account names' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -s I -l ignore-assertions -d 'Ignore any balance assertions'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+
+# General reporting flags
+complete -c hledger -x -s b -l begin     -d 'Include postings/txns on or after this date'               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s e -l end       -d 'Include postings/txns before this date'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s D -l daily     -d 'Multiperiod/multicolumn report by day'                     -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s W -l weekly    -d 'Multiperiod/multicolumn report by week'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s M -l monthly   -d 'Multiperiod/multicolumn report by month'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Q -l quarterly -d 'Multiperiod/multicolumn report by quarter'                 -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Y -l yearly    -d 'Multiperiod/multicolumn report by year'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s p -l period    -d 'Set start date, end date, and report interval'             -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f      -l date2     -d 'Match secondary date instead'                              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s U -l unmarked  -d 'Include only unmarked postings/txns'                       -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s P -l pending   -d 'Include only pending (“!”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s C -l cleared   -d 'Include only cleared (“*”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s R -l real      -d 'Include only non-virtual postings'                         -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x      -l depth     -d 'Hide accounts/postings deeper than this'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s E -l empty     -d 'Show items with zero amount'                               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s B -l cost      -d 'Converts amounts to their cost at txn time'                -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s V -l value     -d 'Converts amounts to their market value on report end date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f      -l auto      -d 'Apply automated posting rules to modify txns'              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f      -l forecast  -d 'Apply periodic txn rules to generate future txns'          -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+
+# General help flags
+complete -c hledger -x -s h -l help                   -d 'Show help for this command'
+complete -c hledger -x      -l debug -a "$debug_opts" -d 'Show debug output'
+complete -c hledger -x      -l version                -d 'Show version information'
+
+# Commands
+
+# Data entry
+complete -c hledger -f -n '__fish_use_subcommand'   -a add                     -d 'Add transactions using guided prompts'
+complete -c hledger -f -n '__fish_seen_subcommand_from add' -l no-new-accounts -d 'Don’t allow creating new accounts'
+
+complete -c hledger    -n '__fish_use_subcommand'   -a import             -d 'Add new transactions from other files'
+complete -c hledger -f -n '__fish_seen_subcommand_from import' -l dry-run -d 'Just show the transactions to be imported'
+
+# Data management
+complete -c hledger -f -n '__fish_use_subcommand'   -a check-dates            -d 'Ensure transactions are ordered by date'
+complete -c hledger -f -n '__fish_seen_subcommand_from check-dates' -l strict -d 'Makes date comparing strict'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes    -d 'Ensure accounts have different leaf names'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a  'close equity'     -d 'Generate balance-resetting transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from close' -l opening -d 'Show just opening transaction'
+complete -c hledger -f -n '__fish_seen_subcommand_from close' -l closing -d 'Show just closing transaction'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a rewrite                 -d 'Generate automated postings/diffs'
+complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l add-posting -d 'Add a posting to account'
+complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff        -d 'Generate diff suitable for patch(1)'
+
+# Financial reports
+set -l financial_reports_commands 'balancesheet bs balancesheetequity bse cashflow cf incomestatement is' # these four (but not roi!) use the same commands
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs'                                                -d 'Show assets, liabilities, and net worth'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse'                                               -d 'Show assets, liabilities, and equity'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf'                                                -d 'Show changes in liquid assets'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is'                                                -d 'Show revenues and expenses'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l change                          -d 'Show balance change in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l cumulative                      -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical                      -d 'Show historical ending balance in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l flat                            -d 'Show accounts as a list'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l drop                            -d 'Omit N leading account-name parts (in flat mode)'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s N -l no-total                        -d 'Omit the final total row'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l tree                            -d 'Show accounts as a tree; amounts include subaccounts'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s A -l average                         -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l format                          -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l pretty-tables                   -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s O -l output-format -a 'txt csv html' -d 'Select an output format'
+complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file                     -d 'Write output to given file; extension selects format'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a roi                        -d 'Show return on investments'
+complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow           -d 'Show all amounts that were used to compute returns'
+complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment         -d 'Query to select investment transactions'
+complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l profit-loss -l pnl -d 'Query to select profit-and-loss or appreciation/valuation transactions'
+
+# Low-level reports
+complete -c hledger -f -n '__fish_use_subcommand'   -a accounts              -d 'Show account names'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l declared -d 'Show account names declared with account directives'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used     -d 'Show account names referenced by transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree     -d 'Show short account names as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat     -d 'Show short account names as a list'
+complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop     -d 'Omit N leading account name parts in flat mode'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a activity -d 'Show postings-per-interval bar charts'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a balance                                          -d 'Show balance changes/end balances/budgets in accounts'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l change                          -d 'Show balance change in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l cumulative                      -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical                      -d 'Show historical ending balance in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l tree                            -d 'Show accounts as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l flat                            -d 'Show accounts as a list'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s A -l average                         -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s N -l no-total                        -d 'Omit the final row'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l drop                            -d 'Omit N leading account name parts in flat mode'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l format                          -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l pretty-tables                   -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l budget                          -d 'Show performance compared to budget goals defined by periodic transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l invert                          -d 'Display all amounts with reversed sign'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l transpose                       -d 'Transpose rows and columns'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
+complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a commodities    -d 'Show commodity/currency symbols'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a files          -d 'Show input file paths'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a prices                    -d 'Show market-price records'
+complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs          -d 'Print transaction prices from postings'
+complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l inverted-costs -d 'Print transaction inverted prices from postings also'
+
+complete -c hledger -f -n '__fish_use_subcommand'  -a 'print txns'                                                      -d 'Show transactions'
+complete -c hledger -f -n '__fish_use_subcommand'  -a            'print-unique'                                         -d 'Show only transactions with unique descriptions'
+complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match                           -d 'Show the most-recent transaction most similar to STR'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit                        -d 'Show all amounts explicitly'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique'      -l new                             -d 'Show only newer-dated transactions added in each file since last run'
+complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
+complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a register                                          -d 'Show postings in one or more accounts & running total'
+complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l cumulative                      -d 'Show running total from report start date'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical                      -d 'Show historical running total/balance'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average                         -d 'Show running average of posting amounts instead of total (implies --empty)'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s r -l related                         -d 'Show postings’ siblings instead'
+complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l invert                          -d 'Display all amounts with reversed sign'
+complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width                           -d 'Set output width (defaults to terminal width or $COLUMNS)'
+complete -c hledger -x -n '__fish_seen_subcommand_from register' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
+complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a register-match -d 'Show a recent posting that best matches a description'
+
+complete -c hledger -f -n '__fish_use_subcommand'   -a stats                      -d 'Show journal statistics'
+complete -c hledger -r -n '__fish_seen_subcommand_from stats' -s o -l output-file -d 'Write output to given file; extension selects format'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a tags -d 'Show tag names'
+
+complete -c hledger -f -n '__fish_use_subcommand' -a test -d 'Run self-tests'
+
+# Help
+complete -c hledger -f -n '__fish_use_subcommand' -a help -d 'Show hledger manual list'

From 0da87d3e5ff89c5bf2724717cf37700f0f281e7b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 17 Aug 2019 20:01:44 -0700
Subject: [PATCH 0873/1732] Equip history_item_t with a default constructor

---
 src/history.cpp      | 2 +-
 src/history.h        | 3 ++-
 src/history_file.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 151aff6f0..77f1733e4 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -510,7 +510,7 @@ history_item_t history_impl_t::item_at_index(size_t idx) {
     }
 
     // Index past the valid range, so return an empty history item.
-    return history_item_t(wcstring(), 0);
+    return history_item_t{};
 }
 
 std::unordered_map<long, wcstring> history_impl_t::items_at_indexes(const std::vector<long> &idxs) {
diff --git a/src/history.h b/src/history.h
index ea199be46..42328e063 100644
--- a/src/history.h
+++ b/src/history.h
@@ -82,7 +82,8 @@ class history_item_t {
     path_list_t required_paths;
 
    public:
-    explicit history_item_t(const wcstring &str, time_t when = 0, history_identifier_t ident = 0);
+    explicit history_item_t(const wcstring &str = wcstring(), time_t when = 0,
+                            history_identifier_t ident = 0);
 
     const wcstring &str() const { return contents; }
 
diff --git a/src/history_file.cpp b/src/history_file.cpp
index c21adc490..5fcba1abb 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -157,7 +157,7 @@ history_item_t history_file_contents_t::decode_item(size_t offset) const {
         case history_type_fish_1_x:
             return decode_item_fish_1_x(base, len);
     }
-    return history_item_t(L"");
+    return history_item_t{};
 }
 
 maybe_t<size_t> history_file_contents_t::offset_of_next_item(size_t *cursor, time_t cutoff) {

From 9b2b7f787e73132d52888f3c8b9f70df410d0746 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 18 Aug 2019 11:14:45 -0700
Subject: [PATCH 0874/1732] Migrate history profiling to flog

---
 src/flog.h      | 2 ++
 src/history.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/flog.h b/src/flog.h
index 0ff1ac4a3..de334a388 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -74,6 +74,8 @@ class category_list_t {
     category_t char_encoding{L"char-encoding", L"Character encoding issues"};
 
     category_t history{L"history", L"Command history events"};
+
+    category_t profile_history{L"profile-history", L"History performance measurements"};
 };
 
 /// The class responsible for logging.
diff --git a/src/history.cpp b/src/history.cpp
index 77f1733e4..9463c9790 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -101,7 +101,7 @@ class time_profiler_t {
 
     ~time_profiler_t() {
         double end = timef();
-        debug(5, "%s: %.0f ms", what, (end - start) * 1000);
+        FLOGF(profile_history, "%s: %.0f ms", what, (end - start) * 1000);
     }
 };
 

From 903e7c6d5ec79adca0416e758011668f075439d0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 18 Aug 2019 12:14:07 -0700
Subject: [PATCH 0875/1732] history_lru_cache_t to use move semantics

---
 src/history.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 9463c9790..38e1a2ef1 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -135,7 +135,7 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item
         : lru_cache_t<history_lru_cache_t, history_item_t>(max) {}
 
     /// Function to add a history item.
-    void add_item(const history_item_t &item) {
+    void add_item(history_item_t item) {
         // Skip empty items.
         if (item.empty()) return;
 
@@ -144,7 +144,7 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item
         wcstring key = item.str();
         history_item_t *node = this->get(key);
         if (node == NULL) {
-            this->insert(std::move(key), item);
+            this->insert(std::move(key), std::move(item));
         } else {
             node->creation_timestamp = std::max(node->timestamp(), item.timestamp());
             // What to do about paths here? Let's just ignore them.
@@ -682,13 +682,13 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
         size_t cursor = 0;
         while (auto offset = local_file->offset_of_next_item(&cursor, 0)) {
             // Try decoding an old item.
-            const history_item_t old_item = local_file->decode_item(*offset);
+            history_item_t old_item = local_file->decode_item(*offset);
 
             if (old_item.empty() || deleted_items.count(old_item.str()) > 0) {
                 continue;
             }
             // Add this old item.
-            lru.add_item(old_item);
+            lru.add_item(std::move(old_item));
         }
     }
 

From ecacf346932c4bbee9f40871b2763595243f3c70 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Tue, 20 Aug 2019 05:17:43 +0900
Subject: [PATCH 0876/1732] Added `git restore` and `git switch` completions

These commands were added in version 2.23.
---
 share/completions/git.fish | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 6b5ab3d8b..e23c1ea53 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1424,6 +1424,13 @@ complete -f -c git -n '__fish_git_using_command reset; and contains -- -- (comma
 complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_reflog)' -d 'Reflog'
 # TODO options
 
+### restore
+complete -f -c git -n '__fish_git_needs_command' -a restore -d 'Restore working tree files'
+complete -f -c git -n '__fish_git_using_command restore' -s s -l source -d 'Specify the source tree used to restore working tree'
+complete -f -c git -n '__fish_git_using_command restore' -s p -l patch -d 'Interactive mode'
+complete -f -c git -n '__fish_git_using_command restore' -s W -l worktree -d 'Restore working tree (default)'
+complete -f -c git -n '__fish_git_using_command restore' -s S -l staged -d 'Restore the index'
+
 ### revert
 complete -f -c git -n '__fish_git_needs_command' -a revert -d 'Revert an existing commit'
 complete -f -c git -n '__fish_git_using_command revert' -ka '(__fish_git_commits)'
@@ -1450,6 +1457,15 @@ complete -f -c git -n '__fish_git_using_command status' -s u -l untracked-files
 complete -f -c git -n '__fish_git_using_command status' -l ignore-submodules -x -a 'none untracked dirty all' -d 'Ignore changes to submodules'
 # TODO options
 
+### switch
+complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
+complete -k -f -c git -n '__fish_git_using_command switch; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command switch' -s c -l create -d 'Create a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -s C -l force-create -d 'Force create a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment'
+complete -f -c git -n '__fish_git_using_command switch' -l no-guess -d 'Do not guess branch name from remote branch'
+complete -f -c git -n '__fish_git_using_command switch' -l orphan -d 'Create a new orphan branch'
+
 ### tag
 complete -f -c git -n '__fish_git_needs_command' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
 complete -f -c git -n '__fish_git_using_command tag; and __fish_not_contain_opt -s d; and __fish_not_contain_opt -s v; and test (count (commandline -opc | string match -r -v \'^-\')) -eq 3' -a '(__fish_git_branches)'
@@ -1657,6 +1673,7 @@ complete -f -c git -n '__fish_git_using_command help' -a push -d 'Update remote
 complete -f -c git -n '__fish_git_using_command help' -a rebase -d 'Forward-port local commits to the updated upstream head'
 complete -f -c git -n '__fish_git_using_command help' -a remote -d 'Manage set of tracked repositories'
 complete -f -c git -n '__fish_git_using_command help' -a reset -d 'Reset current HEAD to the specified state'
+complete -f -c git -n '__fish_git_using_command help' -a restore -d 'Restore working tree files'
 complete -f -c git -n '__fish_git_using_command help' -a revert -d 'Revert an existing commit'
 complete -f -c git -n '__fish_git_using_command help' -a rm -d 'Remove files from the working tree and from the index'
 complete -f -c git -n '__fish_git_using_command help' -a show -d 'Shows the last commit of a branch'
@@ -1664,6 +1681,7 @@ complete -f -c git -n '__fish_git_using_command help' -a show-branch -d 'Shows t
 complete -f -c git -n '__fish_git_using_command help' -a stash -d 'Stash away changes'
 complete -f -c git -n '__fish_git_using_command help' -a status -d 'Show the working tree status'
 complete -f -c git -n '__fish_git_using_command help' -a submodule -d 'Initialize, update or inspect submodules'
+complete -f -c git -n '__fish_git_using_command help' -a switch -d 'Switch to a branch'
 complete -f -c git -n '__fish_git_using_command help' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
 complete -f -c git -n '__fish_git_using_command help' -a whatchanged -d 'Show logs with difference each commit introduces'
 complete -f -c git -n '__fish_git_using_command help' -a worktree -d 'Manage multiple working trees'

From e3eb8f758bb994d81b94c4fff2a95f39e5693d0e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 22 Aug 2019 20:48:34 +0800
Subject: [PATCH 0877/1732] README: note that chsh requires logout/login

Suggested in #6051.

[ci skip]
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8fea01a69..bf8d44712 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ If you wish to use fish as your default shell, use the following command:
 
 	chsh -s /usr/local/bin/fish
 
-`chsh` will prompt you for your password and change your default shell. (Substitute `/usr/local/bin/fish` with whatever path fish was installed to, if it differs.)
+`chsh` will prompt you for your password and change your default shell. (Substitute `/usr/local/bin/fish` with whatever path fish was installed to, if it differs.) Log out, then log in again for the changes to take effect.
 
 Use the following command if fish isn't already added to `/etc/shells` to permit fish to be your login shell:
 

From 225b1204d6928b484335917af8fbfb0de20e6f90 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 22 Aug 2019 21:23:06 +0800
Subject: [PATCH 0878/1732] read: add --list as synonym for --array

Work on #5846.
---
 sphinx_doc_src/cmds/read.rst | 2 +-
 src/builtin_read.cpp         | 1 +
 tests/read.in                | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index f1edeaf2d..16568c0ae 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -43,7 +43,7 @@ The following options are available:
 
 - ``-x`` or ``--export`` exports the variables to child processes.
 
-- ``-a`` or ``--array`` stores the result as a list in a single variable.
+- ``-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.
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 12258a705..04a161b4b 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -62,6 +62,7 @@ static const struct woption long_options[] = {{L"array", no_argument, NULL, 'a'}
                                               {L"global", no_argument, NULL, 'g'},
                                               {L"help", no_argument, NULL, 'h'},
                                               {L"line", no_argument, NULL, 'L'},
+                                              {L"list", no_argument, NULL, 'a'},
                                               {L"local", no_argument, NULL, 'l'},
                                               {L"nchars", required_argument, NULL, 'n'},
                                               {L"null", no_argument, NULL, 'z'},
diff --git a/tests/read.in b/tests/read.in
index 4c8ca3475..c75137da5 100644
--- a/tests/read.in
+++ b/tests/read.in
@@ -10,8 +10,8 @@ read
 
 logmsg Read with -a and anything other than exactly on var name is an error
 read -a
-read -a v1 v2
-read -a v1
+read --array v1 v2
+read --list v1
 
 logmsg Verify correct behavior of subcommands and splitting of input.
 begin

From b0e9317dd22f029a8fe1264ca7256287f7892f23 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 20 Aug 2019 01:56:23 +0000
Subject: [PATCH 0879/1732] document auto option for
 __fish_git_prompt_showupstream

---
 sphinx_doc_src/cmds/fish_git_prompt.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index a89dd7bae..e6a92322a 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -20,6 +20,8 @@ There are numerous customization options, which can be controlled with git optio
 
 - ``$__fish_git_prompt_showupstream`` can be set to a number of values to determine how changes between HEAD and upstream are shown:
 
+     ``auto``
+          summarize the difference between HEAD and its upstream
      ``verbose``
           show number of commits ahead/behind (+/-) upstream
      ``name``
@@ -112,5 +114,3 @@ A simple prompt that displays git info::
         set -g __fish_git_prompt_showupstream auto
         printf '%s %s$' $PWD (fish_git_prompt)
     end
-
-

From ea041e6668ef73aa4905234c5b3dd9212db529f7 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 20 Aug 2019 01:58:48 +0000
Subject: [PATCH 0880/1732] specify that __fish_git_prompt_showupstream takes
 multiple arguments

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

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index e6a92322a..0995e87c3 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -18,7 +18,7 @@ There are numerous customization options, which can be controlled with git optio
 
 - ``$__fish_git_prompt_showuntrackedfiles`` or the git option ``bash.showUntrackedFiles`` can be set to show if the repository has untracked files (that aren't ignored).
 
-- ``$__fish_git_prompt_showupstream`` can be set to a number of values to determine how changes between HEAD and upstream are shown:
+- ``$__fish_git_prompt_showupstream`` can be set to a space-delimited list of values to determine how changes between HEAD and upstream are shown:
 
      ``auto``
           summarize the difference between HEAD and its upstream

From 1a361cd3ff8be413484874f430669d96803e8a8c Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 20 Aug 2019 02:03:22 +0000
Subject: [PATCH 0881/1732] specify that __fish_git_prompt_describe_style only
 takes one argument

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

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 0995e87c3..88b82de10 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -39,7 +39,7 @@ There are numerous customization options, which can be controlled with git optio
 
 - ``$__fish_git_prompt_shorten_branch_len`` can be set to the number of characters that the branch name will be shortened to.
 
-- ``$__fish_git_prompt_describe_style`` can be set to a number of styles that describe the current HEAD:
+- ``$__fish_git_prompt_describe_style`` can be set to one of the following styles to describe the current HEAD:
 
      ``contains``
          relative to newer annotated tag, such as ``(v1.6.3.2~35)``

From 4c656dd43e318c123a6939f1d08e14fb32b6ccbb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 23 Aug 2019 19:34:33 +0200
Subject: [PATCH 0882/1732] docs/fish_git_prompt: showupstream is a proper list

"space-delimited" sounds like you'd set it like `set
__fish_git_prompt_showupstream "auto verbose"`. This will not work.

It's a real actual proper list, which aren't space-delimited.

[ci skip]
---
 sphinx_doc_src/cmds/fish_git_prompt.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index 88b82de10..cbf3bddd5 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -18,7 +18,7 @@ There are numerous customization options, which can be controlled with git optio
 
 - ``$__fish_git_prompt_showuntrackedfiles`` or the git option ``bash.showUntrackedFiles`` can be set to show if the repository has untracked files (that aren't ignored).
 
-- ``$__fish_git_prompt_showupstream`` can be set to a space-delimited list of values to determine how changes between HEAD and upstream are shown:
+- ``$__fish_git_prompt_showupstream`` can be set to a list of values to determine how changes between HEAD and upstream are shown:
 
      ``auto``
           summarize the difference between HEAD and its upstream

From dd34bf0ba62ae6b3fab6641a4a692a5f3133a806 Mon Sep 17 00:00:00 2001
From: adiabatic <adiabatic@users.noreply.github.com>
Date: Wed, 21 Aug 2019 00:29:13 -0700
Subject: [PATCH 0883/1732] Create bat.fish

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

diff --git a/share/completions/bat.fish b/share/completions/bat.fish
new file mode 100644
index 000000000..0caf7cb39
--- /dev/null
+++ b/share/completions/bat.fish
@@ -0,0 +1,79 @@
+# Generated by hand against bat 0.11.0.
+
+# TODO: Have --map-syntax properly suggest from- and to-languages.
+# NOTE: The completion for --style won’t help the user write anything in the comma-separated-list form.
+# TODO: Support the `bat cache` subcommand.
+
+function __bat_complete_languages_and_extensions -d 'All languages and their filenames/extensions, one per line'
+    command bat --list-languages | string split : | string split ,
+end
+
+function __bat_complete_language_extensions -d 'All language extensions/names, one per line'
+    command bat --list-languages | cut -d : -f 2 | string split ,
+end
+
+function __bat_complete_themes -d 'All themes, one per line'
+    command bat --list-themes
+end
+
+set -l style_opts '
+    auto\tdefault
+    full\t
+    plain\t
+    changes\t
+    header\t
+    grid\t
+    numbers\t
+'
+
+set -l color_opts '
+    auto\tdefault
+    never\t
+    always\t
+'
+
+set -l italic_text_opts '
+    always\t
+    never\tdefault
+'
+
+set -l decorations_opts "$color_opts"
+set -l paging_opts      "$color_opts"
+
+set -l wrap_opts '
+    auto\tdefault
+    never\t
+    character\t
+'
+
+# While --tabs theoretically takes any number, most people should be OK with these. Specifying a list lets me explain what 0 does.
+set -l tabs_opts '
+    0\tpasses tabs through directly
+    1\t
+    2\t
+    4\t
+    8\t
+'
+
+complete -c bat -x -s l -l language       -a  "(__bat_complete_languages_and_extensions)" -d 'Set language for syntax highlighting'
+complete -c bat -f      -l list-language                                                  -d 'List supported languages for syntax highlighting'
+complete -c bat -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
+complete -c bat -x      -l theme          -a  "(__bat_complete_themes)"                   -d 'Set theme for syntax highlighting'
+complete -c bat -f      -l list-themes                                                    -d 'List syntax-highlighting themes'
+complete -c bat -x      -l style          -a  "$style_opts"                               -d 'Choose what to add to the file contents'
+complete -c bat    -s p -l plain                                                          -d 'Show no decorations; -pp disables paging too'
+complete -c bat    -s n -l number                                                         -d 'Only show line numbers and no other decorations'
+complete -c bat    -s A -l show-all                                                       -d 'Show non-printable characters'
+complete -c bat -x -s r -l line-range                                                     -d 'Only print lines from [M]:[N] (either optional)'
+complete -c bat -x -s H -l highlight-line                                                 -d 'Highlight the given line'
+complete -c bat -x      -l color          -ka "$color_opts"                               -d 'Specify when to use colors'
+complete -c bat -x      -l italic-text    -ka "$italic_text_opts"                         -d 'Specify when to use ANSI italic-text sequences'
+complete -c bat -x      -l decorations    -ka "$decorations_opts"                         -d 'Specify when to use --style decorations'
+complete -c bat -x      -l paging         -ka "$paging_opts"                              -d 'Specify when to use a pager'
+complete -c bat -x      -l pager                                                          -d 'Specify what pager to use'
+complete -c bat -x      -l wrap           -ka "$wrap_opts"                                -d 'Specify text-wrapping mode'
+complete -c bat -x      -l tabs           -a  "$tabs_opts"                                -d 'Sets tab width to N spaces'
+# Don’t suggest the always-ignored added-only-for-POSIX-compliance -u/--unbuffered. Output is always unbuffered.
+complete -c bat -x      -l terminal-width                                                 -d 'Explicitly set terminal width, optionally prefixed with +/-'
+complete -c bat    -s h -l help                                                           -d 'Print help'
+complete -c bat    -s V -l version                                                        -d 'Show version information'

From 99c498d3d753091c9cae4f26cad28d239f73e702 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 25 Aug 2019 13:37:06 -0700
Subject: [PATCH 0884/1732] Use move semantics in trim and history_item_t

---
 src/history.cpp      |  6 ++----
 src/history.h        |  2 +-
 src/wcstringutil.cpp | 15 +++++++++------
 src/wcstringutil.h   |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 38e1a2ef1..ba12fe40c 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -171,10 +171,8 @@ bool history_item_t::merge(const history_item_t &item) {
     return result;
 }
 
-history_item_t::history_item_t(const wcstring &str, time_t when, history_identifier_t ident)
-    : creation_timestamp(when), identifier(ident) {
-    contents = trim(str);
-}
+history_item_t::history_item_t(wcstring str, time_t when, history_identifier_t ident)
+    : contents(trim(std::move(str))), creation_timestamp(when), identifier(ident) {}
 
 bool history_item_t::matches_search(const wcstring &term, enum history_search_type_t type,
                                     bool case_sensitive) const {
diff --git a/src/history.h b/src/history.h
index 42328e063..102c3a560 100644
--- a/src/history.h
+++ b/src/history.h
@@ -82,7 +82,7 @@ class history_item_t {
     path_list_t required_paths;
 
    public:
-    explicit history_item_t(const wcstring &str = wcstring(), time_t when = 0,
+    explicit history_item_t(wcstring str = wcstring(), time_t when = 0,
                             history_identifier_t ident = 0);
 
     const wcstring &str() const { return contents; }
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index b0fac9809..3691f79e5 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -49,16 +49,19 @@ wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
     return output;
 }
 
-wcstring trim(const wcstring &input) { return trim(input, L"\t\v \r\n"); }
+wcstring trim(wcstring input) { return trim(std::move(input), L"\t\v \r\n"); }
 
-wcstring trim(const wcstring &input, const wchar_t *any_of) {
-    auto begin_offset = input.find_first_not_of(any_of);
-    if (begin_offset == wcstring::npos) {
+wcstring trim(wcstring input, const wchar_t *any_of) {
+    wcstring result = std::move(input);
+    size_t suffix = result.find_last_not_of(any_of);
+    if (suffix == wcstring::npos) {
         return wcstring{};
     }
-    auto end = input.cbegin() + input.find_last_not_of(any_of);
+    result.erase(suffix + 1);
 
-    wcstring result(input.begin() + begin_offset, end + 1);
+    auto prefix = result.find_first_not_of(any_of);
+    assert(prefix != wcstring::npos && "Should have one non-trimmed character");
+    result.erase(0, prefix);
     return result;
 }
 
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index 4fbfe0608..54ce9ba2a 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -65,8 +65,8 @@ enum class ellipsis_type {
 
 wcstring truncate(const wcstring &input, int max_len,
                   ellipsis_type etype = ellipsis_type::Prettiest);
-wcstring trim(const wcstring &input);
-wcstring trim(const wcstring &input, const wchar_t *any_of);
+wcstring trim(wcstring input);
+wcstring trim(wcstring input, const wchar_t *any_of);
 
 /// Converts a string to lowercase.
 wcstring wcstolower(wcstring input);

From 44022e65c2237bc3dd01b0fc9ccbf8c2dcbdfc51 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 25 Aug 2019 18:29:46 -0500
Subject: [PATCH 0885/1732] Revert "Remove the WSL warning"

This reverts commit 5101bdeb9f2d2d0a362619edde3da8c1b9cd7101.
---
 src/common.cpp | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index a775314ce..54856d3af 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -16,7 +16,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/utsname.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wctype.h>
@@ -32,6 +31,11 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef __linux__
+// Includes for WSL detection
+#include <sys/utsname.h>
+#endif
+
 #ifdef __FreeBSD__
 #include <sys/sysctl.h>
 #elif __APPLE__
@@ -153,10 +157,29 @@ bool is_windows_subsystem_for_linux() {
 #elif not defined(__linux__)
     return false;
 #else
+    // We are purposely not using std::call_once as it may invoke locking, which is an unnecessary
+    // overhead since there's no actual race condition here - even if multiple threads call this
+    // routine simultaneously the first time around, we just end up needlessly querying uname(2) one
+    // more time.
+
     static bool wsl_state = []() {
-        utsname info{};
+        utsname info;
         uname(&info);
-        return std::strstr(info.release, "Microsoft") != nullptr;
+
+        // Sample utsname.release under WSL: 4.4.0-17763-Microsoft
+        if (std::strstr(info.release, "Microsoft") != nullptr) {
+            const char *dash = std::strchr(info.release, '-');
+            if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
+                debug(1,
+                      "This version of WSL is not supported and fish will probably not work "
+                      "correctly!\n"
+                      "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
+            }
+
+            return true;
+        } else {
+            return false;
+        }
     }();
 
     // Subsequent calls to this function may take place after fork() and before exec() in

From af4b54e63567906f51b777ba6118b49686e22f6e Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 25 Aug 2019 18:50:17 -0500
Subject: [PATCH 0886/1732] Change WSL version check to a hard error, but
 include a bypass

Instead of warning (debug level 1), we now emit an error (debug level 0) if a known bad version of
WSL is detected. However, `FISH_NO_WSL_CHECK` can now be defined to skip both the check and the
startup message.
---
 src/common.cpp | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 54856d3af..bc7a0dcff 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -166,14 +166,26 @@ bool is_windows_subsystem_for_linux() {
         utsname info;
         uname(&info);
 
-        // Sample utsname.release under WSL: 4.4.0-17763-Microsoft
+        // Sample utsname.release under WSL, testing for something like `4.4.0-17763-Microsoft`
         if (std::strstr(info.release, "Microsoft") != nullptr) {
             const char *dash = std::strchr(info.release, '-');
             if (dash == nullptr || strtod(dash + 1, nullptr) < 17763) {
-                debug(1,
-                      "This version of WSL is not supported and fish will probably not work "
-                      "correctly!\n"
-                      "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
+                // #5298, #5661: There are acknowledged, published, and (later) fixed issues with
+                // job control under early WSL releases that prevent fish from running correctly,
+                // with unexpected failures when piping. Fish 3.0 nightly builds worked around this
+                // issue with some needlessly complicated code that was later stripped from the
+                // fish 3.0 release, so we just bail. Note that fish 2.0 was also broken, but we
+                // just didn't warn about it.
+
+                // #6038 & 5101bde: It's been requested that there be some sort of way to disable
+                // this check: if the environment variable FISH_NO_WSL_CHECK is present, this test
+                // is bypassed. We intentionally do not include this in the error message because
+                // it'll only allow fish to run but not to actually work. Here be dragons!
+                if (getenv("FISH_NO_WSL_CHECK") == nullptr) {
+                    debug(0,
+                          "This version of WSL has known bugs that prevent fish from working."
+                          "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
+                }
             }
 
             return true;
@@ -453,7 +465,8 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
         } else {
             size_t len = std::wcrtomb(&out[out_pos], in[in_pos], &state);
             if (len == (size_t)-1) {
-                FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation", in[in_pos]);
+                FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation",
+                      in[in_pos]);
                 std::memset(&state, 0, sizeof(state));
             } else {
                 out_pos += len;

From 35b64b0470dd2fbf2fa904065cc4fb977cbc3448 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Fri, 23 Aug 2019 23:44:16 +0000
Subject: [PATCH 0887/1732] add completions for qubes-gpg-client

---
 CHANGELOG.md                            |  1 +
 share/completions/qubes-gpg-client.fish | 84 +++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 share/completions/qubes-gpg-client.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ecf562eb..3a6f9639e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - Added completions for
   - `cf`
   - `bosh`
+  - `qubes-gpg-client` (#6067)
   - `vagrant`
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
diff --git a/share/completions/qubes-gpg-client.fish b/share/completions/qubes-gpg-client.fish
new file mode 100644
index 000000000..5c73bb335
--- /dev/null
+++ b/share/completions/qubes-gpg-client.fish
@@ -0,0 +1,84 @@
+
+# Completions for qubes-gpg-client.
+# These completions are mostly taken from fish's completions for gpg.
+#
+# Functions to generate completion options through gpg invocations
+# are not implemented for this tool, as they are incompatible with
+# Qubes's qrexec authorization prompts for split GPG (even if this worked,
+# the resulting behavior would be quite annoying)
+#
+# Completions for nearly all of qubes-gpg-client's command line options
+# are implemented-- the few that are excluded are not intended for
+# interactive usage or are poorly documented.
+
+complete -c qubes-gpg-client -s b -l detach-sign -d "Make a detached signature"
+complete -c qubes-gpg-client -s a -l armor -d "Create ASCII armored output"
+complete -c qubes-gpg-client -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+complete -c qubes-gpg-client -l decrypt -d "Decrypt specified file or stdin"
+complete -c qubes-gpg-client -s e -l encrypt -d "Encrypt data"
+complete -c qubes-gpg-client -s k -l list-keys -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c qubes-gpg-client -s K -l list-secret-keys -d "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c qubes-gpg-client -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+complete -c qubes-gpg-client -s o -l output -r -d "Write output to specified file"
+complete -c qubes-gpg-client -s q -l quiet -d "Quiet mode"
+complete -c qubes-gpg-client -s r -l recipient -x -d "Encrypt for specified user id"
+complete -c qubes-gpg-client -s R -l hidden-recipient -x -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c qubes-gpg-client -s s -l sign -d "Make a signature"
+complete -c qubes-gpg-client -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c qubes-gpg-client -s u -l local-user -x -d "Use specified key as the key to sign with"
+complete -c qubes-gpg-client -s v -l verbose -d "Give more information during processing"
+complete -c qubes-gpg-client -l always-trust -d "Skip key validation and assume that used keys are always valid"
+complete -c qubes-gpg-client -l batch -d "Batch mode"
+complete -c qubes-gpg-client -l cert-digest-algo -x -d "Use specified message digest algorithm when signing a key"
+complete -c qubes-gpg-client -l charset -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+complete -c qubes-gpg-client -l cipher-algo -x -d "Use specified cipher algorithm"
+complete -c qubes-gpg-client -l clearsign -d "Make a clear text signature"
+complete -c qubes-gpg-client -l command-fd -x -d "Read user input from specified file descriptor"
+complete -c qubes-gpg-client -l comment -x -d "Use specified string as comment string"
+complete -c qubes-gpg-client -l compress-algo -x -d "Use specified compression algorithm"
+complete -c qubes-gpg-client -l digest-algo -x -d "Use specified message digest algorithm"
+complete -c qubes-gpg-client -l disable-cipher-algo -x -d "Never allow the use of specified cipher algorithm"
+complete -c qubes-gpg-client -l disable-mdc -d "Disable the use of the modification detection code"
+complete -c qubes-gpg-client -l disable-pubkey-algo -x -d "Never allow the use of specified public key algorithm"
+complete -c qubes-gpg-client -l emit-version -d "Include the version string in ASCII armored output"
+complete -c qubes-gpg-client -l export -x -d 'Export all or the given keys from all keyrings'
+complete -c qubes-gpg-client -l fingerprint -d "List all keys with their fingerprints"
+complete -c qubes-gpg-client -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colons listing mode and print all timestamps as UNIX timestamps"
+complete -c qubes-gpg-client -l force-mdc -d "Force the use of encryption with a modification detection code"
+complete -c qubes-gpg-client -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+complete -c qubes-gpg-client -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+complete -c qubes-gpg-client -l gnupg -d "Use standard GnuPG behavior"
+complete -c qubes-gpg-client -l list-options -d "Display various internal configuration parameters of GnuPG"
+complete -c qubes-gpg-client -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+complete -c qubes-gpg-client -l list-public-keys -x -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c qubes-gpg-client -l list-sigs -d "Same as --list-keys, but the signatures are listed too"
+complete -c qubes-gpg-client -l max-output -x -d "Sets a limit on the number of bytes that will be generated when processing a file"
+complete -c qubes-gpg-client -l no-comments -d "Don't use a comment string"
+complete -c qubes-gpg-client -l no-emit-version -d "Don't include the version string in ASCII armored output"
+complete -c qubes-gpg-client -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+complete -c qubes-gpg-client -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+complete -c qubes-gpg-client -l no-greeting -d "Suppress the initial copyright message"
+complete -c qubes-gpg-client -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+complete -c qubes-gpg-client -l no-tty -d "Never write output to terminal"
+complete -c qubes-gpg-client -l no-verbose -d "Reset verbose level to 0"
+complete -c qubes-gpg-client -l openpgp -d "Reset all packet, cipher, and digest options to strict OpenPGP behavior"
+complete -c qubes-gpg-client -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+complete -c qubes-gpg-client -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+complete -c qubes-gpg-client -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+complete -c qubes-gpg-client -l s2k-cipher-algo -x -d "Use specified cipher algorithm to protect secret keys"
+complete -c qubes-gpg-client -l s2k-digest-algo -x -d "Use specified digest algorithm to mangle the passphrases"
+complete -c qubes-gpg-client -l s2k-count -x -d "Specify how many times the passphrase mangling for symmetric encryption is repeated"
+complete -c qubes-gpg-client -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+complete -c qubes-gpg-client -l status-fd -x -d "Write special status strings to the specified file descriptor"
+complete -c qubes-gpg-client -l store -d "Store only (make a simple RFC1991 packet)"
+complete -c qubes-gpg-client -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+complete -c qubes-gpg-client -l use-agent -d "Try to use the GnuPG-Agent"
+complete -c qubes-gpg-client -l verify -r -d "Assume specified file or stdin is sigfile and verify it"
+complete -c qubes-gpg-client -l version -d "Display version and supported algorithms, and exit"
+complete -c qubes-gpg-client -l with-colons -d "Print key listings delimited by colons"
+complete -c qubes-gpg-client -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+complete -c qubes-gpg-client -l with-keygrip -d "Include the keygrip in the key listings"
+
+# qubes-gpg-client-wrapper wraps qubes-gpg-client and qubes-gpg-import-key, but the latter needs no
+# completions (only takes a file as an argument)
+complete -c qubes-gpg-client-wrapper -w qubes-gpg-client

From 753f49dba9b207dc5d0f989ebb6c3e6cd6fafb32 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Tue, 27 Aug 2019 11:42:58 -0700
Subject: [PATCH 0888/1732] Added git rebase
 --rebase-merges[=(rebase-cousins|no-rebase-cousins)] to completion

See https://git-scm.com/docs/git-rebase/2.18.0#git-rebase--r
---
 share/completions/git.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e23c1ea53..6128c1e5b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1405,6 +1405,7 @@ complete -f -c git -n '__fish_git_using_command rebase' -l no-verify -d "Don't a
 complete -f -c git -n '__fish_git_using_command rebase' -s f -l force-rebase -d 'Force the rebase'
 complete -f -c git -n '__fish_git_using_command rebase' -s i -l interactive -d 'Interactive mode'
 complete -f -c git -n '__fish_git_using_command rebase' -s p -l preserve-merges -d 'Try to recreate merges'
+complete -f -c git -n '__fish_git_using_command rebase' -s r -l rebase-merges -a 'rebase-cousins no-rebase-cousins' -d 'Preserve branch structure'
 complete -f -c git -n '__fish_git_using_command rebase' -l root -d 'Rebase all reachable commits'
 complete -f -c git -n '__fish_git_using_command rebase' -l autosquash -d 'Automatic squashing'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-autosquash -d 'No automatic squashing'

From 42c6b9c17697a3e5062121d307bd5aa952b02053 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 30 Aug 2019 18:31:35 +0900
Subject: [PATCH 0889/1732] Implemented the completions of all options of `git
 restore` and `git switch` (#6054)

* Implemented the completions of all options of `git restore` and `git switch`

* Apply requested changes
---
 share/completions/git.fish | 43 ++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 6128c1e5b..802a8bab3 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1425,12 +1425,42 @@ complete -f -c git -n '__fish_git_using_command reset; and contains -- -- (comma
 complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_reflog)' -d 'Reflog'
 # TODO options
 
-### restore
+### restore and switch
+# restore options
 complete -f -c git -n '__fish_git_needs_command' -a restore -d 'Restore working tree files'
-complete -f -c git -n '__fish_git_using_command restore' -s s -l source -d 'Specify the source tree used to restore working tree'
+complete -f -c git -n '__fish_git_using_command restore' -s s -l source -d 'Specify the source tree used to restore the working tree'
 complete -f -c git -n '__fish_git_using_command restore' -s p -l patch -d 'Interactive mode'
 complete -f -c git -n '__fish_git_using_command restore' -s W -l worktree -d 'Restore working tree (default)'
 complete -f -c git -n '__fish_git_using_command restore' -s S -l staged -d 'Restore the index'
+complete -f -c git -n '__fish_git_using_command restore' -l ours -d 'When restoring files, use stage #2 (ours)'
+complete -f -c git -n '__fish_git_using_command restore' -l theirs -d 'When restoring files, use stage #3 (theirs)'
+complete -f -c git -n '__fish_git_using_command restore' -s m -l merge -d 'Recreate the conflicted merge in the unmerged paths when restoring files'
+complete -f -c git -n '__fish_git_using_command restore' -l ignore-unmerged -d 'When restoring files, do not abort the operation if there are unmerged entries'
+complete -f -c git -n '__fish_git_using_command restore' -l ignore-skip-worktree-bits -d 'Ignore the sparse-checkout file and unconditionally restore any files in <pathspec>'
+complete -f -c git -n '__fish_git_using_command restore' -l overlay -d 'Never remove files when restoring'
+complete -f -c git -n '__fish_git_using_command restore' -l no-overlay -d 'Remove files when restoring (default)'
+# switch options
+complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
+complete -k -f -c git -n '__fish_git_using_command switch; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command switch' -s c -l create -d 'Create a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -s C -l force-create -d 'Force create a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment'
+complete -f -c git -n '__fish_git_using_command switch' -l guess -d 'Guess branch name from remote branch (default)'
+complete -f -c git -n '__fish_git_using_command switch' -l no-guess -d 'Do not guess branch name from remote branch'
+complete -f -c git -n '__fish_git_using_command switch' -s f -l force -l discard-changes -d 'Proceed even if the index or the working tree differs from HEAD'
+complete -f -c git -n '__fish_git_using_command switch' -s m -l merge -d 'Merge the current branch and contents of the working tree into a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -s t -l track -d 'Track remote branch when creating a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -l no-track -d 'Do not track remote branch when creating a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -l orphan -d 'Create a new orphan branch'
+complete -f -c git -n '__fish_git_using_command switch' -l ignore-other-worktrees -d 'Force check out of the reference'
+complete -f -c git -n '__fish_git_using_command switch' -l recurse-submodules -d 'Update the work trees of submodules'
+complete -f -c git -n '__fish_git_using_command switch' -l no-recurse-submodules -d 'Do not update the work trees of submodules'
+# common options
+complete -f -c git -n '__fish_git_using_command restore switch' -s q -l quiet -d 'Suppress messages'
+complete -f -c git -n '__fish_git_using_command restore switch' -l progress -d 'Report progress status to stderr (default)'
+complete -f -c git -n '__fish_git_using_command restore switch' -l no-progress -d 'Do not report progress status to stderr'
+complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=merge' -d 'Same as --merge, but specify \'merge\' as the conflicting hunk style (default)'
+complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=diff3' -d 'Same as --merge, but specify \'diff3\' as the conflicting hunk style'
 
 ### revert
 complete -f -c git -n '__fish_git_needs_command' -a revert -d 'Revert an existing commit'
@@ -1458,15 +1488,6 @@ complete -f -c git -n '__fish_git_using_command status' -s u -l untracked-files
 complete -f -c git -n '__fish_git_using_command status' -l ignore-submodules -x -a 'none untracked dirty all' -d 'Ignore changes to submodules'
 # TODO options
 
-### switch
-complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
-complete -k -f -c git -n '__fish_git_using_command switch; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command switch' -s c -l create -d 'Create a new branch'
-complete -f -c git -n '__fish_git_using_command switch' -s C -l force-create -d 'Force create a new branch'
-complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment'
-complete -f -c git -n '__fish_git_using_command switch' -l no-guess -d 'Do not guess branch name from remote branch'
-complete -f -c git -n '__fish_git_using_command switch' -l orphan -d 'Create a new orphan branch'
-
 ### tag
 complete -f -c git -n '__fish_git_needs_command' -a tag -d 'Create, list, delete or verify a tag object signed with GPG'
 complete -f -c git -n '__fish_git_using_command tag; and __fish_not_contain_opt -s d; and __fish_not_contain_opt -s v; and test (count (commandline -opc | string match -r -v \'^-\')) -eq 3' -a '(__fish_git_branches)'

From 068aba1902c5568b2547747d9ffc670beebf81fe Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 23 Aug 2019 20:58:42 +0200
Subject: [PATCH 0890/1732] remove redundant call (done in constructor of
 completion_t)

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

diff --git a/src/complete.cpp b/src/complete.cpp
index e875976e0..3087ae889 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -400,8 +400,7 @@ static owning_lock<autoload_t> completion_autoloader{autoload_t(L"fish_complete_
 /// Create a new completion entry.
 void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
                        complete_flags_t flags, string_fuzzy_match_t match) {
-    complete_flags_t resolved_flags = resolve_auto_space(comp, flags);
-    completion_t completion{std::move(comp), std::move(desc), match, resolved_flags};
+    completion_t completion{std::move(comp), std::move(desc), match, flags};
     completions->push_back(std::move(completion));
 }
 

From 9fd9f70346587331e40159aaa1d808bf1eb6e2b9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 1 Sep 2019 17:08:51 -0700
Subject: [PATCH 0891/1732] Restore terminal modes after sending SIGCONT

Fixes #2214

Thanks to @bruce-hill for the patch.
---
 src/proc.cpp | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 70c0adb6d..7dafcefb4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -823,7 +823,7 @@ pid_t terminal_acquire_before_builtin(int job_pgid) {
 
 /// Returns control of the terminal to the shell, and saves the terminal attribute state to the job,
 /// so that we can restore the terminal ownership to the job at a later time.
-static bool terminal_return_from_job(job_t *j) {
+static bool terminal_return_from_job(job_t *j, int restore_attrs) {
     errno = 0;
     if (j->pgid == 0) {
         debug(2, "terminal_return_from_job() returning early due to no process group");
@@ -845,19 +845,17 @@ static bool terminal_return_from_job(job_t *j) {
         return false;
     }
 
-// Disabling this per
-// https://github.com/adityagodbole/fish-shell/commit/9d229cd18c3e5c25a8bd37e9ddd3b67ddc2d1b72 On
-// Linux, 'cd . ; ftp' prevents you from typing into the ftp prompt. See
-// https://github.com/fish-shell/fish-shell/issues/121
-#if 0
-// Restore the shell's terminal modes.
-if (tcsetattr(STDIN_FILENO, TCSADRAIN, &shell_modes) == -1) {
-if (errno == EIO) redirect_tty_output();
-debug(1, _(L"Could not return shell to foreground"));
-wperror(L"tcsetattr");
-return false;
-}
-#endif
+    // Need to restore the terminal's attributes or `bind \cF fg` will put the
+    // terminal into a broken state (until "enter" is pressed).
+    // See: https://github.com/fish-shell/fish-shell/issues/2114
+    if (restore_attrs) {
+        if (tcsetattr(STDIN_FILENO, TCSADRAIN, &shell_modes) == -1) {
+            if (errno == EIO) redirect_tty_output();
+            debug(1, _(L"Could not return shell to foreground"));
+            wperror(L"tcsetattr");
+            return false;
+        }
+    }
 
     return true;
 }
@@ -876,7 +874,10 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     bool term_transferred = false;
     cleanup_t take_term_back([&]() {
         if (term_transferred && reclaim_foreground_pgrp) {
-            terminal_return_from_job(this);
+            // Only restore terminal attrs if we're continuing a job. See:
+            // https://github.com/fish-shell/fish-shell/issues/121
+            // https://github.com/fish-shell/fish-shell/issues/2114
+            terminal_return_from_job(this, send_sigcont);
         }
     });
 

From 5221d723caca2953ae9eaedee5f0b138867bdbec Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 2 Sep 2019 06:58:26 +0900
Subject: [PATCH 0892/1732] Added patool completions

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

diff --git a/share/completions/patool.fish b/share/completions/patool.fish
new file mode 100644
index 000000000..00c97e983
--- /dev/null
+++ b/share/completions/patool.fish
@@ -0,0 +1,20 @@
+# Completions for patool
+
+# Global options
+complete -f -c patool -s h -l help -d "Show help message"
+complete -f -c patool -n "__fish_no_arguments" -s v -l verbose -d "Be verbose"
+complete -f -c patool -n "__fish_no_arguments" -l non-interactive -d "Run in batch mode"
+
+# Commands
+complete -f -c patool -n "__fish_use_subcommand" -a extract -d "Extract archive(s)"
+complete -f -c patool -n "__fish_use_subcommand" -a list -d "List files in archive(s)"
+complete -f -c patool -n "__fish_use_subcommand" -a create -d "Create archive"
+complete -f -c patool -n "__fish_use_subcommand" -a test -d "Test archive(s)"
+complete -f -c patool -n "__fish_use_subcommand" -a repack -d "Repackage archive to different format"
+complete -f -c patool -n "__fish_use_subcommand" -a recompress -d "Recompress archive to smaller"
+complete -f -c patool -n "__fish_use_subcommand" -a diff -d "Differences between two archives"
+complete -f -c patool -n "__fish_use_subcommand" -a search -d "Search contents of archive"
+complete -f -c patool -n "__fish_use_subcommand" -a formats -d "Show supported formats"
+
+# extract option
+complete -c patool -n "__fish_seen_subcommand_from extract" -l outdir -d "Specify output directory"

From 635dafeb9c3141518ca20f4c9c0c77cdb6f212a4 Mon Sep 17 00:00:00 2001
From: Nathan Galt <adiabatic@users.noreply.github.com>
Date: Tue, 27 Aug 2019 23:49:50 -0700
Subject: [PATCH 0893/1732] Update bat completion to support cache command

Closes #6076.
---
 share/completions/bat.fish | 53 ++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/share/completions/bat.fish b/share/completions/bat.fish
index 0caf7cb39..efd2ce5df 100644
--- a/share/completions/bat.fish
+++ b/share/completions/bat.fish
@@ -1,8 +1,8 @@
 # Generated by hand against bat 0.11.0.
+# bat is at <https://github.com/sharkdp/bat>.
 
 # TODO: Have --map-syntax properly suggest from- and to-languages.
 # NOTE: The completion for --style won’t help the user write anything in the comma-separated-list form.
-# TODO: Support the `bat cache` subcommand.
 
 function __bat_complete_languages_and_extensions -d 'All languages and their filenames/extensions, one per line'
     command bat --list-languages | string split : | string split ,
@@ -55,25 +55,34 @@ set -l tabs_opts '
     8\t
 '
 
-complete -c bat -x -s l -l language       -a  "(__bat_complete_languages_and_extensions)" -d 'Set language for syntax highlighting'
-complete -c bat -f      -l list-language                                                  -d 'List supported languages for syntax highlighting'
-complete -c bat -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
-complete -c bat -x      -l theme          -a  "(__bat_complete_themes)"                   -d 'Set theme for syntax highlighting'
-complete -c bat -f      -l list-themes                                                    -d 'List syntax-highlighting themes'
-complete -c bat -x      -l style          -a  "$style_opts"                               -d 'Choose what to add to the file contents'
-complete -c bat    -s p -l plain                                                          -d 'Show no decorations; -pp disables paging too'
-complete -c bat    -s n -l number                                                         -d 'Only show line numbers and no other decorations'
-complete -c bat    -s A -l show-all                                                       -d 'Show non-printable characters'
-complete -c bat -x -s r -l line-range                                                     -d 'Only print lines from [M]:[N] (either optional)'
-complete -c bat -x -s H -l highlight-line                                                 -d 'Highlight the given line'
-complete -c bat -x      -l color          -ka "$color_opts"                               -d 'Specify when to use colors'
-complete -c bat -x      -l italic-text    -ka "$italic_text_opts"                         -d 'Specify when to use ANSI italic-text sequences'
-complete -c bat -x      -l decorations    -ka "$decorations_opts"                         -d 'Specify when to use --style decorations'
-complete -c bat -x      -l paging         -ka "$paging_opts"                              -d 'Specify when to use a pager'
-complete -c bat -x      -l pager                                                          -d 'Specify what pager to use'
-complete -c bat -x      -l wrap           -ka "$wrap_opts"                                -d 'Specify text-wrapping mode'
-complete -c bat -x      -l tabs           -a  "$tabs_opts"                                -d 'Sets tab width to N spaces'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language       -a  '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-language                                                  -d 'List supported languages for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l theme          -a  '(__bat_complete_themes)'                   -d 'Set theme for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-themes                                                    -d 'List syntax-highlighting themes'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l style          -a  "$style_opts"                               -d 'Choose what to add to the file contents'
+complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s p -l plain                                                          -d 'Show no decorations; -pp disables paging too'
+complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s n -l number                                                         -d 'Only show line numbers and no other decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s A -l show-all                                                       -d 'Show non-printable characters'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s r -l line-range                                                     -d 'Only print lines from [M]:[N] (either optional)'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s H -l highlight-line                                                 -d 'Highlight the given line'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l color          -ka "$color_opts"                               -d 'Specify when to use colors'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l italic-text    -ka "$italic_text_opts"                         -d 'Specify when to use ANSI italic-text sequences'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l decorations    -ka "$decorations_opts"                         -d 'Specify when to use --style decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l paging         -ka "$paging_opts"                              -d 'Specify when to use a pager'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l pager                                                          -d 'Specify what pager to use'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l wrap           -ka "$wrap_opts"                                -d 'Specify text-wrapping mode'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l tabs           -a  "$tabs_opts"                                -d 'Sets tab width to N spaces'
 # Don’t suggest the always-ignored added-only-for-POSIX-compliance -u/--unbuffered. Output is always unbuffered.
-complete -c bat -x      -l terminal-width                                                 -d 'Explicitly set terminal width, optionally prefixed with +/-'
-complete -c bat    -s h -l help                                                           -d 'Print help'
-complete -c bat    -s V -l version                                                        -d 'Show version information'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l terminal-width                                                 -d 'Explicitly set terminal width, optionally prefixed with +/-'
+complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s h -l help                                                           -d 'Print help'
+complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s V -l version                                                        -d 'Show version information'
+
+# cache things
+complete -c bat -n '__fish_use_subcommand'   -a cache                    -d 'Manage syntax-definition and theme cache'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s b -l build  -d 'Initialize/update cache from the source directory'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s c -l clear  -d 'Remove cached definitions and themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l source -d 'Specify directory to load syntaxes/themes from'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l target -d 'Specify directory to store cached syntaxes/themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f      -l blank  -d 'Create completely new syntax/theme sets instead of appending to the defaults'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s h -l help   -d 'Print help about cache management'

From 76195dfe1daa337c283c7d5ee19cfe87fce688b3 Mon Sep 17 00:00:00 2001
From: Nathan Galt <adiabatic@users.noreply.github.com>
Date: Sun, 1 Sep 2019 17:03:34 -0700
Subject: [PATCH 0894/1732] Update bat completions from 0.11.0 to 0.12.0

Closes #6084.
---
 share/completions/bat.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/bat.fish b/share/completions/bat.fish
index efd2ce5df..78741480d 100644
--- a/share/completions/bat.fish
+++ b/share/completions/bat.fish
@@ -1,4 +1,4 @@
-# Generated by hand against bat 0.11.0.
+# Generated by hand against bat 0.12.0.
 # bat is at <https://github.com/sharkdp/bat>.
 
 # TODO: Have --map-syntax properly suggest from- and to-languages.
@@ -56,7 +56,7 @@ set -l tabs_opts '
 '
 
 complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language       -a  '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-language                                                  -d 'List supported languages for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -s L -l list-language                                                  -d 'List supported languages for syntax highlighting'
 complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
 complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l theme          -a  '(__bat_complete_themes)'                   -d 'Set theme for syntax highlighting'
 complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-themes                                                    -d 'List syntax-highlighting themes'

From 8b84f4f1179a82a55a4596d38dbdc4bfc9d7591f Mon Sep 17 00:00:00 2001
From: Nathan Galt <adiabatic@users.noreply.github.com>
Date: Mon, 2 Sep 2019 00:03:02 -0700
Subject: [PATCH 0895/1732] Add completions/tokei.fish

Closes #6085.
---
 share/completions/tokei.fish | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 share/completions/tokei.fish

diff --git a/share/completions/tokei.fish b/share/completions/tokei.fish
new file mode 100644
index 000000000..47653e825
--- /dev/null
+++ b/share/completions/tokei.fish
@@ -0,0 +1,25 @@
+# Written against `tokei --help`, version 10.0.1 compiled with support for CBOR, JSON, and YAML
+
+function __fish_tokei_supported_serializations
+    # Expecting a line like:
+    # tokei 10.0.1 compiled with serialization support: cbor, json, yaml
+    command tokei --help | grep 'with serialization support' | cut -d : -f 2 | string trim | string split ', '
+end
+
+complete -c tokei    -s f -l files            -d 'Print out statistics for individual files'
+complete -c tokei -f -s h -l help             -d 'Print help information'
+complete -c tokei         -l hidden           -d 'Count hidden files, too'
+complete -c tokei -f -s l -l languages        -d 'Print out supported languages'
+complete -c tokei         -l no-ignore        -d 'Don’t respect ignore files'
+complete -c tokei         -l no-ignore-parent -d 'Don’t respect ignore files in parent directories'
+complete -c tokei         -l no-ignore-vcs    -d 'Don’t respect version-control ignore files'
+complete -c tokei -f -s V -l version          -d 'Print version information'
+complete -c tokei    -s v -l verbose          -d 'Increase log output level'
+
+# Options
+complete -c tokei -x -s c -l columns                                               -d 'Set column width for terminal output'
+complete -c tokei -x -s e -l exclude                                               -d 'Ignore all files and directories containing this word'
+complete -c tokei -r -s i -l input                                                 -d 'Gives statistics from a previous Tokei run'
+complete -c tokei -x -s o -l output  -a  '(__fish_tokei_supported_serializations)' -d 'Choose output format'
+complete -c tokei -x -s s -l sort    -ka 'files lines code comments blanks'        -d 'Sort languages based on column'
+complete -c tokei -x -s t -l type    -a  '(command tokei --languages)'             -d 'Filters output by language type, comma-separated'

From 54ed2ad44039f8871a00d0ce9928e62dd210b641 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 2 Sep 2019 22:59:52 +0800
Subject: [PATCH 0896/1732] history: implement exact matching by default for
 delete

Brings behaviour into line with documented and intended behaviour.
Closes #6070.
---
 share/functions/history.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index 1e3110dff..9f8a229af 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -109,7 +109,7 @@ function history --description "display or manipulate interactive command histor
             end
 
             test -z "$search_mode"
-            and set search_mode "--contains"
+            and set search_mode "--exact"
 
             if test $search_mode = "--exact"
                 builtin history delete $search_mode $_flag_case_sensitive $searchterm

From f7dac82ed601135754d0c65536f79d07d83e9fae Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 23 Aug 2019 20:58:42 +0200
Subject: [PATCH 0897/1732] Escape separators (colon and equals) to improve
 completion

Fish completes parts of words split by the separators, so things like
`dd if=/dev/sd<TAB>` work.
This commit improves interactive completion if completion strings legitimately
contain '=' or ':'.  Consider this example where completion will suggest
a:a:1 and other files in the cwd in addition to a:1

touch a:1; complete -C'ls a:'

This behavior remains unchanged, but this commit allows to quote or escape
separators, so that e.g. `ls "a:<TAB>` and `ls a\:<TAB>` successfully complete
the filename.

This also makes the completion insert those escapes automatically unless
already quoted.
So `ls a<TAB>` will give `ls a\:1`.

Both changes match bash's behavior.
---
 src/common.cpp     |  8 ++++++--
 src/common.h       |  4 +++-
 src/complete.cpp   | 13 ++++++++-----
 src/parse_util.cpp |  3 ++-
 src/reader.cpp     |  5 +----
 src/reader.h       |  4 ++++
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index bc7a0dcff..7bd6cc92a 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -999,6 +999,7 @@ static void escape_string_script(const wchar_t *orig_in, size_t in_len, wcstring
     const bool escape_all = static_cast<bool>(flags & ESCAPE_ALL);
     const bool no_quoted = static_cast<bool>(flags & ESCAPE_NO_QUOTED);
     const bool no_tilde = static_cast<bool>(flags & ESCAPE_NO_TILDE);
+    const bool escape_separators = static_cast<bool>(flags & ESCAPE_SEPARATORS);
     const bool no_caret = feature_test(features_t::stderr_nocaret);
     const bool no_qmark = feature_test(features_t::qmark_noglob);
 
@@ -1098,9 +1099,12 @@ static void escape_string_script(const wchar_t *orig_in, size_t in_len, wcstring
                 case L';':
                 case L'"':
                 case L'%':
-                case L'~': {
+                case L'~':
+                case L':':
+                case L'=': {
                     bool char_is_normal = (c == L'~' && no_tilde) || (c == L'^' && no_caret) ||
-                                          (c == L'?' && no_qmark);
+                                          (c == L'?' && no_qmark) ||
+                                          ((c == L':' || c == L'=') && !escape_separators);
                     if (!char_is_normal) {
                         need_escape = 1;
                         if (escape_all) out += L'\\';
diff --git a/src/common.h b/src/common.h
index 1065ac2db..da3135c06 100644
--- a/src/common.h
+++ b/src/common.h
@@ -134,7 +134,9 @@ enum {
     /// string.
     ESCAPE_NO_QUOTED = 1 << 1,
     /// Do not escape tildes.
-    ESCAPE_NO_TILDE = 1 << 2
+    ESCAPE_NO_TILDE = 1 << 2,
+    /// Escape colon and equal sign.
+    ESCAPE_SEPARATORS = 1 << 3,
 };
 typedef unsigned int escape_flags_t;
 
diff --git a/src/complete.cpp b/src/complete.cpp
index 3087ae889..c9c175da9 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1098,6 +1098,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     // Squelch file descriptions per issue #254.
     if (this->type() == COMPLETE_AUTOSUGGEST || do_file) flags |= expand_flag::no_descriptions;
 
+    // Expand words separated by '=' separately, unless '=' is escaped or quoted.
     // We have the following cases:
     //
     // --foo=bar => expand just bar
@@ -1105,14 +1106,16 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     // foo=bar => expand the whole thing, and also just bar
     //
     // We also support colon separator (#2178). If there's more than one, prefer the last one.
-    size_t sep_index = str.find_last_of(L"=:");
-    bool complete_from_separator = (sep_index != wcstring::npos);
+    size_t sep_index = str.size();
+    do {
+        sep_index = sep_index == 0 ? wcstring::npos : str.find_last_of(L"=:", sep_index - 1);
+    } while (sep_index != wcstring::npos && is_backslashed(str, sep_index));
+    wchar_t quote = L'\0';
+    parse_util_get_parameter_info(str, str.size(), &quote, NULL, NULL);
+    bool complete_from_separator = (quote == L'\0') && (sep_index != wcstring::npos);
     bool complete_from_start = !complete_from_separator || !string_prefixes_string(L"-", str);
 
     if (complete_from_separator) {
-        // FIXME: This just cuts the token,
-        // so any quoting or braces gets lost.
-        // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         std::vector<completion_t> local_completions;
         if (expand_string(sep_string, &local_completions, flags, vars, parser, NULL) ==
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index b4348f7d3..76ea30738 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -523,7 +523,8 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
 wcstring parse_util_escape_string_with_quote(const wcstring &cmd, wchar_t quote, bool no_tilde) {
     wcstring result;
     if (quote == L'\0') {
-        escape_flags_t flags = ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0);
+        escape_flags_t flags =
+            ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0) | ESCAPE_SEPARATORS;
         result = escape_string(cmd, flags);
     } else {
         // Here we are going to escape a string with quotes.
diff --git a/src/reader.cpp b/src/reader.cpp
index 7efe0d929..d080be6cd 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -488,7 +488,6 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 static volatile sig_atomic_t interrupted = 0;
 
 // Prototypes for a bunch of functions defined later on.
-static bool is_backslashed(const wcstring &str, size_t pos);
 static wchar_t unescaped_quote(const wcstring &str, size_t pos);
 
 /// Mode on startup, which we restore on exit.
@@ -2297,9 +2296,7 @@ static int can_read(int fd) {
     return select(fd + 1, &fds, 0, 0, &can_read_timeout) == 1;
 }
 
-/// Test if the specified character in the specified string is backslashed. pos may be at the end of
-/// the string, which indicates if there is a trailing backslash.
-static bool is_backslashed(const wcstring &str, size_t pos) {
+bool is_backslashed(const wcstring &str, size_t pos) {
     // note pos == str.size() is OK.
     if (pos > str.size()) return false;
 
diff --git a/src/reader.h b/src/reader.h
index 76d7a6137..cfa0c73ac 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -232,4 +232,8 @@ void reader_bg_job_warning(const parser_t &parser);
 /// been executed between invocations of code.
 uint64_t reader_run_count();
 
+/// Test if the specified character in the specified string is backslashed. pos may be at the end of
+/// the string, which indicates if there is a trailing backslash.
+bool is_backslashed(const wcstring &str, size_t pos);
+
 #endif

From c20a9ea477b60c46287a5514ae3c2909bf960833 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 3 Sep 2019 00:51:02 +0000
Subject: [PATCH 0898/1732] fix compatibility with BSD sed

Closes #6087.
---
 share/completions/gpg.fish | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index e2dd8a50d..1ecfda228 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -59,7 +59,15 @@ function __fish_print_gpg_algo -d "Complete using all algorithms of the type spe
     # 	remove all blanks
     # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
     # 	print result
-    gpg --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
+    gpg --version | sed -ne "/$argv:/"'{:loop
+    /,$/{N; y!\n! !
+    b loop
+    }
+    s!^[^:]*:!!
+    s![ ]*!!g
+    y!,!\n!
+    p
+    }'
 end
 
 

From b760fd90647c8729a20dd21ee2422b4d4b15a0ff Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 5 Sep 2019 11:00:52 -0700
Subject: [PATCH 0899/1732] Correctly set g_use_posix_spawn at launch again

---
 src/env_dispatch.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 731d0c222..32ed7c2cb 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -334,6 +334,7 @@ static void run_inits(const environment_t &vars) {
     guess_emoji_width(vars);
     update_wait_on_escape_ms(vars);
     handle_read_limit_change(vars);
+    handle_fish_use_posix_spawn_change(vars);
 }
 
 /// Updates our idea of whether we support term256 and term24bit (see issue #10222).

From 06317f0a9844dcbf0ddd1a83aa39524b6b9aa32d Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 5 Sep 2019 20:44:12 -0500
Subject: [PATCH 0900/1732] Optimize `__fish_print_hostnames` hosts file
 loading/parsing

Reordering the `getent hosts` and read from `/etc/hosts` combined with
minimizing shelling and job invocations for parsing the output results
in a profiled and benchmarked ~42% decrease in the time it takes to run,
and that's on a machine with a very small hosts list in the first place.

This update also fixes the hadling of IPv6 addresses in the hosts
output, which were previously ignored, and ignores 127.* loopback
addresses in addition to the 0.0.0.0 address (plus adds support for
shorter IPv4 notations).
---
 share/functions/__fish_print_hostnames.fish | 69 ++++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index f4f07690f..3ccf2e80e 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -1,22 +1,26 @@
 function __fish_print_hostnames -d "Print a list of known hostnames"
-    # Print all hosts from /etc/hosts. Use 'getent hosts' on OSes that support it
-    # (apparently just Cygwin does not).
-    #
-    # Test if 'getent hosts' works and redirect output so errors don't print.
-    #
-    # This is all done under the assumption that `getent` *might* print more hosts than the static /etc/hosts.
-    type -q getent
-    # Ignore zero IPs.
-    and getent hosts 2>/dev/null | string match -r -v '^0.0.0.0' | string replace -r '^\s*\S+\s+' '' | string split ' '
-    # We care about _getent_s status, not `string split`s.
-    if test $pipestatus[1] -ne 0; and test -r /etc/hosts
-        # Ignore commented lines and functionally empty lines.
-        string match -r -v '^\s*0.0.0.0|^\s*#|^\s*$' </etc/hosts | string replace -r -a '#.*$' '' | string replace -r '^\s*\S+\s+' '' | string trim | string replace -r -a '\s+' ' ' | string split ' '
-    end
+    # This function used to primarily query `getent hosts` and only read from `/etc/hosts` if
+    # `getent` did not exist or `getent hosts` failed, based off the (documented) assumption that
+    # the former *might* return more hosts than the latter, which has never been officially noted
+    # to be the case. As `getent` is several times slower, involves shelling out, and is not
+    # available on some platforms (Cygin and at least some versions of macOS, such as 10.10), that
+    # order is now reversed and `getent hosts` is only used if the hosts file is not found at
+    # `/etc/hosts` for portability reasons.
+
+    begin
+        test -r /etc/hosts && read -z </etc/hosts
+        or type -q getent && getent hosts 2>/dev/null
+    end |
+    # Ignore comments, own IP addresses (127.*, 0.0[.0[.0]], ::1), non-host IPs (fe00::*, ff00::*),
+    # and leading/trailing whitespace. Split results on whitespace to handle multiple aliases for
+    # one IP.
+        string replace -irf '^\s*?(?!(?:#|0\.|127\.|ff0|fe0|::1))\S+\s*(.*?)\s*$' '$1' |
+        string split ' '
 
     # Print nfs servers from /etc/fstab
     if test -r /etc/fstab
-        string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab | string replace -r ':.*' ''
+        string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab |
+            string replace -r ':.*' ''
     end
 
     # Check hosts known to ssh.
@@ -25,25 +29,28 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
     # The directory is available as $PREFIX/etc, but that variable name is so generic that
     # it would cause false-positives.
     # Also, some people might use /usr/local/etc.
-    set -l known_hosts ~/.ssh/known_hosts{,2} {/data/data/com.termux/files/usr,/usr/local,}/etc/ssh/{,ssh_}known_hosts{,2}
+    set -l known_hosts ~/.ssh/known_hosts{,2} \
+        {/data/data/com.termux/files/usr,/usr/local,}/etc/ssh/{,ssh_}known_hosts{,2}
     # Check default ssh configs.
-    set -l ssh_config
-    # Get alias and commandline options.
-    set -l ssh_func_tokens (functions ssh | string match '*command ssh *' | string split ' ')
-    set -l ssh_command $ssh_func_tokens (commandline -cpo)
-    # Extract ssh config path from last -F short option.
-    if contains -- '-F' $ssh_command
-        set -l ssh_config_path_is_next 1
-        for token in $ssh_command
-            if contains -- '-F' $token
-                set ssh_config_path_is_next 0
-            else if test $ssh_config_path_is_next -eq 0
-                set ssh_config (eval "echo $token")
-                set ssh_config_path_is_next 1
+    set -l ssh_config ~/.ssh/config
+
+    # Inherit settings and parameters from `ssh` aliases, if any
+    if functions -q ssh
+        # Get alias and commandline options.
+        set -l ssh_func_tokens (functions ssh | string match '*command ssh *' | string split ' ')
+        set -l ssh_command $ssh_func_tokens (commandline -cpo)
+        # Extract ssh config path from last -F short option.
+        if contains -- '-F' $ssh_command
+            set -l ssh_config_path_is_next 1
+            for token in $ssh_command
+                if contains -- '-F' $token
+                    set ssh_config_path_is_next 0
+                else if test $ssh_config_path_is_next -eq 0
+                    set ssh_config (eval "echo $token")
+                    set ssh_config_path_is_next 1
+                end
             end
         end
-    else
-        set ssh_config $ssh_config ~/.ssh/config
     end
 
     # Extract ssh config paths from Include option

From 1db861b4dbb26c474f6d31cb9f4bbbafdde50fe9 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 5 Sep 2019 21:11:04 -0500
Subject: [PATCH 0901/1732] Clean & slightly optimize SSH hostnames handling in
 `__fish_print_hostnames`

---
 share/functions/__fish_print_hostnames.fish | 49 ++++++++++++---------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 3ccf2e80e..c9a269b46 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -103,31 +103,40 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
 
     for file in $ssh_configs
         if test -r $file
+            # Don't read from $file twice. We could use `while read` instead, but that is extremely
+            # slow.
+            read -z -l contents <$file
+
             # Print hosts from system wide ssh configuration file
-            string replace -rfi '^\s*Host\s+' '' <$file | string trim | string replace -r '\s+' ' ' | string split ' ' | string match -v '*\**'
-            # Extract known_host paths.
-            set known_hosts $known_hosts (string replace -rfi '.*KnownHostsFile\s*' '' <$file)
+            string replace -rfi '^\s*Host\s+(\S.*?)\s*$' '$1' -- $contents | string split ' ' | string match -v '*\**'
+            # Also extract known_host paths.
+            set known_hosts $known_hosts (string replace -rfi '.*KnownHostsFile\s*' '' -- $contents)
         end
     end
+
+    # Avoid shelling out to `awk` more than once by reading all files and operating on their
+    # combined contents
     for file in $known_hosts
         if test -r $file
-            # Ignore hosts that are hashed, commented or @-marked and strip the key.
-            awk '$1 !~ /[|#@]/ {
-            n=split($1, entries, ",")
-            for (i=1; i<=n; i++) {
-              # Ignore negated/wildcarded hosts.
-              if (!match(entry=entries[i], "[!*?]")) {
-                # Extract hosts with custom port.
-                if (substr(entry, 1, 1) == "[") {
-                  if (pos=match(entry, "]:.*$")) {
-                    entry=substr(entry, 2, pos-2)
-                  }
-                }
-                print entry
-              }
-            }
-          }' $file
+            read -z <$file
         end
-    end
+    end |
+        # Ignore hosts that are hashed, commented or @-marked and strip the key.
+        awk '$1 !~ /[|#@]/ {
+          n=split($1, entries, ",")
+          for (i=1; i<=n; i++) {
+            # Ignore negated/wildcarded hosts.
+            if (!match(entry=entries[i], "[!*?]")) {
+              # Extract hosts with custom port.
+              if (substr(entry, 1, 1) == "[") {
+                if (pos=match(entry, "]:.*$")) {
+                  entry=substr(entry, 2, pos-2)
+                }
+              }
+              print entry
+            }
+          }
+        }'
+
     return 0
 end

From 912421f1cb61fca530fb501b9e6a904dc21e44d6 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 5 Sep 2019 22:40:31 -0500
Subject: [PATCH 0902/1732] Switch away from `awk` for `__fish_print_hostnames`

By not manipulating each line or even each file at a time, we can go
back to `string` and piece together a pipeline that will execute
significantly faster than shelling out to `awk` will. This also removes
one of the few dependencies on `awk` in the codebase.

With this change, `__fish_print_hostnames` now finishes ~80% faster than
it used to a few commits back.
---
 share/functions/__fish_print_hostnames.fish | 27 +++++++++------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index c9a269b46..1034b49a5 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -121,22 +121,17 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
             read -z <$file
         end
     end |
-        # Ignore hosts that are hashed, commented or @-marked and strip the key.
-        awk '$1 !~ /[|#@]/ {
-          n=split($1, entries, ",")
-          for (i=1; i<=n; i++) {
-            # Ignore negated/wildcarded hosts.
-            if (!match(entry=entries[i], "[!*?]")) {
-              # Extract hosts with custom port.
-              if (substr(entry, 1, 1) == "[") {
-                if (pos=match(entry, "]:.*$")) {
-                  entry=substr(entry, 2, pos-2)
-                }
-              }
-              print entry
-            }
-          }
-        }'
+        # Ignore hosts that are hashed, commented or @-marked and strip the key
+        # Handle multiple comma-separated hostnames sharing a key, too.
+        #
+        # This one regex does everything we need, finding all matches including comma-separated
+        # values, but fish does not let us print only a capturing group without the entire match,
+        # and we can't use `string replace` instead (because CSV then fails).
+        # string match -ar "(?:^|,)(?![@|*!])\[?([^ ,:\]]+)\]?"
+        #
+        # Instead, manually piece together the regular expressions
+        string match -v -r '^\s*[!*|@#]' | string replace -r '^\s*(\S+) .*' '$1' |
+            string split ',' | string replace -r '\[?([^:\]]+).*' '$1'
 
     return 0
 end

From 80610addf8bfa237429f924b3bc1726b46465e3f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 5 Sep 2019 23:00:46 -0500
Subject: [PATCH 0903/1732] Avoid warnings about unsupported clang::weak_import
 w/ GCC on macOS

---
 src/fallback.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fallback.h b/src/fallback.h
index 0c5ddb237..62b8dc8b7 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -74,7 +74,7 @@ char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, lon
 ///
 /// On other platforms, use what's detected at build time.
 #if __APPLE__
-#if __DARWIN_C_LEVEL >= 200809L
+#if __DARWIN_C_LEVEL >= 200809L && __has_attribute(clang::weak_import)
 // We have to explicitly redeclare these as weak,
 // since we are forced to set the MIN_REQUIRED availability macro to 10.7
 // to use libc++, which in turn exposes these as strong

From f854e3dc2967106e92fcd9f61c67b2083e62cf8c Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 5 Sep 2019 23:11:59 -0500
Subject: [PATCH 0904/1732] Try fixing __has_attribute errors on Travis macOS

---
 src/fallback.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/fallback.h b/src/fallback.h
index 62b8dc8b7..c84987d61 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -66,18 +66,18 @@ char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, lon
                            long p5 = 0, long p6 = 0, long p7 = 0, long p8 = 0, long p9 = 0);
 #endif
 
-/// On OS X, use weak linking for wcsdup and wcscasecmp. Weak linking allows you to call the
-/// function only if it exists at runtime. You can detect it by testing the function pointer against
-/// NULL. To avoid making the callers do that, redefine wcsdup to wcsdup_use_weak, and likewise with
-/// wcscasecmp. This lets us use the same binary on SnowLeopard (10.6) and Lion+ (10.7), even though
-/// these functions only exist on 10.7+.
-///
-/// On other platforms, use what's detected at build time.
+// On OS X, use weak linking for wcsdup and wcscasecmp. Weak linking allows you to call the
+// function only if it exists at runtime. You can detect it by testing the function pointer against
+// NULL. To avoid making the callers do that, redefine wcsdup to wcsdup_use_weak, and likewise with
+// wcscasecmp. This lets us use the same binary on SnowLeopard (10.6) and Lion+ (10.7), even though
+// these functions only exist on 10.7+.
+//
+// On other platforms, use what's detected at build time.
 #if __APPLE__
-#if __DARWIN_C_LEVEL >= 200809L && __has_attribute(clang::weak_import)
-// We have to explicitly redeclare these as weak,
-// since we are forced to set the MIN_REQUIRED availability macro to 10.7
-// to use libc++, which in turn exposes these as strong
+// Avoid warnings about unknown `clang::weak_import` attribute (e.g. GCC 8.2.0 on macOS 10.10)
+#if __DARWIN_C_LEVEL >= 200809L && __clang__ && __has_attribute(weak_import)
+// We have to explicitly redeclare these as weak, since we are forced to set the MIN_REQUIRED
+// availability macro to 10.7 to use libc++, which in turn exposes these as strong
 [[clang::weak_import]] wchar_t *wcsdup(const wchar_t *);
 [[clang::weak_import]] int wcscasecmp(const wchar_t *, const wchar_t *);
 [[clang::weak_import]] int wcsncasecmp(const wchar_t *, const wchar_t *, size_t n);
@@ -92,8 +92,8 @@ wchar_t *wcsdup(const wchar_t *in);
 int wcscasecmp(const wchar_t *a, const wchar_t *b);
 int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n);
 wchar_t *wcsndup(const wchar_t *in, size_t c);
-#endif
-#else  //__APPLE__
+#endif // clang::weak_import
+#else  // __APPLE__
 
 /// These functions are missing from Solaris 10, and only accessible from
 /// Solaris 11 in the std:: namespace.

From 962bfa96689715666d2453611ae54595e2afe8ff Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 24 Aug 2019 10:31:36 +0200
Subject: [PATCH 0905/1732] Escape literal dollar signs in quoted completions

Closes #6060.
---
 src/parse_util.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 76ea30738..8b2df7565 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -548,6 +548,10 @@ wcstring parse_util_escape_string_with_quote(const wcstring &cmd, wchar_t quote,
                 case L'\\':
                     result.append({L'\\', L'\\'});
                     break;
+                case L'$':
+                    if (quote == L'"') result.push_back(L'\\');
+                    result.push_back(L'$');
+                    break;
                 default:
                     if (c == quote) result.push_back(L'\\');
                     result.push_back(c);

From fa6bac1283b9e8fd9f4dd7b32a1f0ea17e574dfb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Sep 2019 10:42:24 -0700
Subject: [PATCH 0906/1732] Correctly implement and --help and or --help

---
 src/parse_productions.cpp    |  6 +++++-
 tests/checks/andandoror.fish | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 4163d74a9..f752df8f1 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -66,7 +66,11 @@ RESOLVE(job_list) {
 
 // A job decorator is AND or OR
 RESOLVE(job_decorator) {
-    UNUSED(token2);
+    // If it's followed by --help, it's not a decoration.
+    if (token2.is_help_argument) {
+        *out_tag = parse_bool_none;
+        return production_for<empty>();
+    }
 
     switch (token1.keyword) {
         case parse_keyword_and: {
diff --git a/tests/checks/andandoror.fish b/tests/checks/andandoror.fish
index f4adb7a72..1242fd259 100644
--- a/tests/checks/andandoror.fish
+++ b/tests/checks/andandoror.fish
@@ -70,3 +70,32 @@ end
 # CHECK: 2
 # CHECK: 3
 # CHECK: 4
+
+# --help works
+builtin and --help >/dev/null
+echo $status
+and --help >/dev/null
+echo $status
+# CHECK: 0
+# CHECK: 0
+
+builtin and --help >/dev/null
+echo $status
+and --help >/dev/null
+echo $status
+# CHECK: 0
+# CHECK: 0
+
+builtin or --help >/dev/null
+echo $status
+or --help >/dev/null
+echo $status
+# CHECK: 0
+# CHECK: 0
+
+builtin not --help >/dev/null
+echo $status
+not --help >/dev/null
+echo $status
+# CHECK: 0
+# CHECK: 0

From e79df33e3ad06dbd3176d87e95f8b4923ae9e388 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Sep 2019 11:09:32 -0700
Subject: [PATCH 0907/1732] Disallow parsing 'and' and 'or' as commands

Except for and --help and or --help

Fixes #6089
---
 src/parse_productions.cpp | 8 ++++++++
 src/parse_tree.cpp        | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index f752df8f1..84745ff10 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -314,6 +314,14 @@ RESOLVE(block_header) {
 }
 
 RESOLVE(decorated_statement) {
+    // and/or are typically parsed in job_conjunction at the beginning of a job
+    // However they may be reached here through e.g. true && and false.
+    // Refuse to parse them as a command except for --help. See #6089.
+    if ((token1.keyword == parse_keyword_and || token1.keyword == parse_keyword_or) &&
+        !token2.is_help_argument) {
+        return NO_PRODUCTION;
+    }
+
     // If this is e.g. 'command --help' then the command is 'command' and not a decoration. If the
     // second token is not a string, then this is a naked 'command' and we should execute it as
     // undecorated.
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index c840f29ed..b2f4eec6c 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -156,6 +156,7 @@ static wcstring token_type_user_presentable_description(
 
     switch (type) {
         // Hackish. We only support the following types.
+        case symbol_decorated_statement:
         case symbol_statement:
             return L"a command";
         case symbol_argument:

From bc3dde997decd8db318bed322c8d31d0528f4879 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 24 Aug 2019 17:23:39 +0200
Subject: [PATCH 0908/1732] escape square brackets in an argument before
 completing it

fixes #5831
---
 src/complete.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/complete.cpp b/src/complete.cpp
index c9c175da9..fccf7016c 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -382,6 +382,8 @@ class completer_t {
 
     bool empty() const { return completions.empty(); }
 
+    void escape_opening_brackets(const wcstring &argument);
+
     void mark_completions_duplicating_arguments(const wcstring &prefix, const arg_list_t &args);
 
    public:
@@ -1349,6 +1351,42 @@ static void walk_wrap_chain(const wcstring &command_line, source_range_t command
     }
 }
 
+/// If the argument contains a '[' typed by the user, completion by appending to the argument might
+/// produce an invalid token (#5831).
+///
+/// Check if there is any unescaped, unquoted '['; if yes, make the completions replace the entire
+/// argument instead of appending, so '[' will be escaped.
+void completer_t::escape_opening_brackets(const wcstring &argument) {
+    bool have_unquoted_unescaped_bracket = false;
+    wchar_t quote = L'\0';
+    bool escaped = false;
+    for (wchar_t c : argument) {
+        have_unquoted_unescaped_bracket |= (c == L'[') && !quote && !escaped;
+        if (quote) {
+            if (c == quote && !escaped) quote = L'\0';
+        } else {
+            if ((c == L'\'' || c == L'"') && !escaped) quote = c;
+        }
+        escaped = c == L'\\';
+    }
+    if (!have_unquoted_unescaped_bracket) return;
+    // Since completion_apply_to_command_line will escape the completion, we need to provide an
+    // unescaped version.
+    wcstring unescaped_argument;
+    if (!unescape_string(argument, &unescaped_argument, UNESCAPE_INCOMPLETE)) return;
+    for (completion_t &comp : completions) {
+        if (comp.flags & COMPLETE_REPLACES_TOKEN) continue;
+        comp.flags |= COMPLETE_REPLACES_TOKEN;
+        if (comp.flags & COMPLETE_DONT_ESCAPE) {
+            // If the completion won't be escaped, we need to do it here.
+            // Currently, this will probably never happen since COMPLETE_DONT_ESCAPE
+            // is only set for user or variable names which cannot contain '['.
+            unescaped_argument = escape_string(unescaped_argument, ESCAPE_ALL);
+        }
+        comp.completion = unescaped_argument + comp.completion;
+    }
+}
+
 /// Set the DUPLICATES_ARG flag in any completion that duplicates an argument.
 void completer_t::mark_completions_duplicating_arguments(const wcstring &prefix,
                                                          const arg_list_t &args) {
@@ -1596,6 +1634,9 @@ void completer_t::perform() {
             // This function wants the unescaped string.
             complete_param_expand(current_token, do_file, handle_as_special_cd);
 
+            // Escape '[' in the argument before completing it.
+            escape_opening_brackets(current_argument);
+
             // Lastly mark any completions that appear to already be present in arguments.
             mark_completions_duplicating_arguments(current_token, all_arguments);
         }

From b2fe2f9ff31cc8ec105d4340fcb9362ee7e566fd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Sep 2019 15:39:50 -0700
Subject: [PATCH 0909/1732] Correct escaping and add tests for bracket
 completion

Add some tests for new bracket completion behavior, and fix an escaping
bug where \\[ was incorrectly marked as escaping.
---
 src/complete.cpp   | 17 ++++++++++++-----
 src/fish_tests.cpp | 29 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index fccf7016c..266df99fe 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1362,12 +1362,19 @@ void completer_t::escape_opening_brackets(const wcstring &argument) {
     bool escaped = false;
     for (wchar_t c : argument) {
         have_unquoted_unescaped_bracket |= (c == L'[') && !quote && !escaped;
-        if (quote) {
-            if (c == quote && !escaped) quote = L'\0';
-        } else {
-            if ((c == L'\'' || c == L'"') && !escaped) quote = c;
+        if (escaped) {
+            escaped = false;
+        } else if (c == L'\\') {
+            escaped = true;
+        } else if (c == L'\'' || c == L'"') {
+            if (quote == c) {
+                // Closing a quote.
+                quote = L'\0';
+            } else if (quote == L'\0') {
+                // Opening a quote.
+                quote = c;
+            }
         }
-        escaped = c == L'\\';
     }
     if (!have_unquoted_unescaped_bracket) return;
     // Since completion_apply_to_command_line will escape the completion, we need to provide an
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 7c20ff49c..3b3c045f9 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2619,6 +2619,8 @@ static void test_complete() {
 
     if (system("mkdir -p 'test/complete_test'")) err(L"mkdir failed");
     if (system("touch 'test/complete_test/has space'")) err(L"touch failed");
+    if (system("touch 'test/complete_test/bracket[abc]'")) err(L"touch failed");
+    if (system(R"(touch 'test/complete_test/gnarlybracket\[abc]')")) err(L"touch failed");
     if (system("touch 'test/complete_test/testfile'")) err(L"touch failed");
     if (system("chmod 700 'test/complete_test/testfile'")) err(L"chmod failed");
 
@@ -2643,6 +2645,33 @@ static void test_complete() {
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"space");
 
+    // Brackets - see #5831
+    completions.clear();
+    complete(L"echo (ls test/complete_test/bracket[", &completions, {}, vars, parser);
+    do_test(completions.size() == 1);
+    fprintf(stderr, "sup: %ls\n", completions.front().completion.c_str());
+    do_test(completions.at(0).completion == L"test/complete_test/bracket[abc]");
+
+    wcstring cmdline = L"touch test/complete_test/bracket[";
+    completions.clear();
+    complete(cmdline, &completions, {}, vars, parser);
+    do_test(completions.size() == 1);
+    do_test(completions.front().completion == L"test/complete_test/bracket[abc]");
+    size_t where = cmdline.size();
+    wcstring newcmdline = completion_apply_to_command_line(
+        completions.front().completion, completions.front().flags, cmdline, &where, false);
+    do_test(newcmdline == L"touch test/complete_test/bracket\\[abc\\] ");
+
+    completions.clear();
+    cmdline = LR"(touch test/complete_test/gnarlybracket\\[)";
+    complete(cmdline, &completions, {}, vars, parser);
+    do_test(completions.size() == 1);
+    do_test(completions.front().completion == LR"(test/complete_test/gnarlybracket\[abc])");
+    where = cmdline.size();
+    newcmdline = completion_apply_to_command_line(
+        completions.front().completion, completions.front().flags, cmdline, &where, false);
+    do_test(newcmdline == LR"(touch test/complete_test/gnarlybracket\\\[abc\] )");
+
     // Add a function and test completing it in various ways.
     // Note we're depending on function_data_t not complaining when given missing parsed_source /
     // body_node.

From 535a448d0e3a6c82217efba4b0d70133ab055943 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Sep 2019 15:44:07 -0700
Subject: [PATCH 0910/1732] Remove an errant fprintf

---
 src/fish_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3b3c045f9..fd0f42116 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2649,7 +2649,6 @@ static void test_complete() {
     completions.clear();
     complete(L"echo (ls test/complete_test/bracket[", &completions, {}, vars, parser);
     do_test(completions.size() == 1);
-    fprintf(stderr, "sup: %ls\n", completions.front().completion.c_str());
     do_test(completions.at(0).completion == L"test/complete_test/bracket[abc]");
 
     wcstring cmdline = L"touch test/complete_test/bracket[";

From 56d2942f59475feab9be9c43723df7f47f4b637c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 9 Sep 2019 09:07:25 -0700
Subject: [PATCH 0911/1732] Minor cleanup of how jobs store their command
 string

---
 src/builtin_wait.cpp | 2 +-
 src/proc.h           | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index f4cf2fa3b..beeafb1bc 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -145,7 +145,7 @@ static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids,
     bool found = false;
 
     for (const auto &j : parser.jobs()) {
-        if (j->command_is_empty()) continue;
+        if (j->command().empty()) continue;
 
         if (match_pid(j->command(), proc)) {
             if (!contains(ids, j->job_id)) {
diff --git a/src/proc.h b/src/proc.h
index d3d3e6455..166085acb 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -322,9 +322,6 @@ class job_t {
           std::shared_ptr<job_t> parent);
     ~job_t();
 
-    /// Returns whether the command is empty.
-    bool command_is_empty() const { return command_str.empty(); }
-
     /// Returns the command as a wchar_t *. */
     const wchar_t *command_wcstr() const { return command_str.c_str(); }
 
@@ -332,7 +329,7 @@ class job_t {
     const wcstring &command() const { return command_str; }
 
     /// Sets the command.
-    void set_command(const wcstring &cmd) { command_str = cmd; }
+    void set_command(wcstring cmd) { command_str = std::move(cmd); }
 
     /// \return whether it is OK to reap a given process. Sometimes we want to defer reaping a
     /// process if it is the group leader and the job is not yet constructed, because then we might

From 85f93ff002528dfcd746f822aabac63dd01a522f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 9 Sep 2019 20:54:34 -0500
Subject: [PATCH 0912/1732] Add dynamic completions for rustup

[ci skip]
---
 share/completions/rustup.fish | 261 ++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 share/completions/rustup.fish

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
new file mode 100644
index 000000000..ff0a5f2a3
--- /dev/null
+++ b/share/completions/rustup.fish
@@ -0,0 +1,261 @@
+complete -c rustup -e
+
+set -l subcmds \
+	"show" \
+	"update" \
+	"default" \
+	"toolchain" \
+	"target" \
+	"component" \
+	"override" \
+	"run" \
+	"which" \
+	"doc" \
+	"man" \
+	"self" \
+	"set" \
+	# "completions" \
+	"help"
+
+# rustup does not expose a mechanism of retrieving a list of all valid components (including non-installed)
+set __rustup_components \
+	"cargo" \
+	"clippy" \
+	"lldb-preview" \
+	"llvm-tools-preview" \
+	"miri" \
+	"rls" \
+	"rust-analysis" \
+	"rust-docs" \
+	"rust-mingw" \
+	"rust-src"
+
+# function __rustup_installable_components
+# 	set -l not_installed (comm -2 -3 (printf "%s\n" $__rustup_components | psub -F) (rustup component list --installed | psub -F) 2>/dev/null)
+# 	__rustup_strip_common_suffix_strict $not_installed
+# end
+
+# Trim trailing attributes, e.g. "rust-whatever (default)" -> "rust-whatever"
+set -l __rustup_toolchains (rustup toolchain list | string replace -rf "\s+.*" '')
+# By default, the long name of a toolchain is used (e.g. nightly-x86_64-unknown-linux-gnu),
+# but a shorter version can be used if it is unambiguous.
+set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_toolchains)
+
+# Needs to be global to retain access from functions
+set __rustup_channels "beta" "stable" "nightly"
+
+# All *valid* target triples, retrieved from source
+function __rustup_triples
+	# The list below must be kept sorted alphabetically
+	printf "%s\n" \
+		"aarch64-apple-ios" \
+		"aarch64-linux-android" \
+		"aarch64-pc-windows-msvc" \
+		"aarch64-unknown-cloudabi" \
+		"aarch64-unknown-fuchsia" \
+		"aarch64-unknown-linux-gnu" \
+		"aarch64-unknown-linux-musl" \
+		"aarch64-unknown-redox" \
+		"armebv7r-none-eabi" \
+		"armebv7r-none-eabihf" \
+		"arm-linux-androideabi" \
+		"arm-unknown-linux-gnueabi" \
+		"arm-unknown-linux-gnueabihf" \
+		"arm-unknown-linux-musleabi" \
+		"arm-unknown-linux-musleabihf" \
+		"armv5te-unknown-linux-gnueabi" \
+		"armv5te-unknown-linux-musleabi" \
+		"armv7-apple-ios" \
+		"armv7-linux-androideabi" \
+		"armv7r-none-eabi" \
+		"armv7r-none-eabihf" \
+		"armv7s-apple-ios" \
+		"armv7-unknown-cloudabi-eabihf" \
+		"armv7-unknown-linux-gnueabi" \
+		"armv7-unknown-linux-gnueabihf" \
+		"armv7-unknown-linux-musleabi" \
+		"armv7-unknown-linux-musleabihf" \
+		"asmjs-unknown-emscripten" \
+		"i386-apple-ios" \
+		"i586-pc-windows-msvc" \
+		"i586-unknown-linux-gnu" \
+		"i586-unknown-linux-musl" \
+		"i686-apple-darwin" \
+		"i686-linux-android" \
+		"i686-pc-windows-gnu" \
+		"i686-pc-windows-msvc" \
+		"i686-unknown-cloudabi" \
+		"i686-unknown-freebsd" \
+		"i686-unknown-haiku" \
+		"i686-unknown-linux-gnu" \
+		"i686-unknown-linux-musl" \
+		"i686-unknown-netbsd" \
+		"le32-unknown-nacl" \
+		"mips64el-unknown-linux-gnuabi64" \
+		"mips64-unknown-linux-gnuabi64" \
+		"mipsel-unknown-linux-gnu" \
+		"mipsel-unknown-linux-musl" \
+		"mipsel-unknown-linux-uclibc" \
+		"mipsisa32r6el-unknown-linux-gnu" \
+		"mipsisa32r6-unknown-linux-gnu" \
+		"mipsisa64r6el-unknown-linux-gnuabi64" \
+		"mipsisa64r6-unknown-linux-gnuabi64" \
+		"mips-unknown-linux-gnu" \
+		"mips-unknown-linux-musl" \
+		"mips-unknown-linux-uclibc" \
+		"msp430-none-elf" \
+		"nvptx64-nvidia-cuda" \
+		"powerpc64le-unknown-linux-gnu" \
+		"powerpc64-unknown-linux-gnu" \
+		"powerpc-unknown-linux-gnu" \
+		"powerpc-unknown-linux-gnuspe" \
+		"riscv32imac-unknown-none-elf" \
+		"riscv32imc-unknown-none-elf" \
+		"riscv32i-unknown-none-elf" \
+		"riscv64gc-unknown-none-elf" \
+		"riscv64imac-unknown-none-elf" \
+		"s390x-unknown-linux-gnu" \
+		"sparc64-unknown-linux-gnu" \
+		"sparc64-unknown-netbsd" \
+		"sparc-unknown-linux-gnu" \
+		"sparcv9-sun-solaris" \
+		"thumbv6m-none-eabi" \
+		"thumbv7em-none-eabi" \
+		"thumbv7em-none-eabihf" \
+		"thumbv7m-none-eabi" \
+		"thumbv7neon-linux-androideabi" \
+		"thumbv7neon-unknown-linux-gnueabihf" \
+		"thumbv8m.base-none-eabi" \
+		"thumbv8m.main-none-eabi" \
+		"thumbv8m.main-none-eabihf" \
+		"wasm32-unknown-emscripten" \
+		"wasm32-unknown-unknown" \
+		"x86_64-apple-darwin" \
+		"x86_64-apple-ios" \
+		"x86_64-fortanix-unknown-sgx" \
+		"x86_64-linux-android" \
+		"x86_64-pc-solaris" \
+		"x86_64-pc-windows-gnu" \
+		"x86_64-pc-windows-msvc" \
+		"x86_64-rumprun-netbsd" \
+		"x86_64-sun-solaris" \
+		"x86_64-unknown-bitrig" \
+		"x86_64-unknown-cloudabi" \
+		"x86_64-unknown-dragonfly" \
+		"x86_64-unknown-freebsd" \
+		"x86_64-unknown-fuchsia" \
+		"x86_64-unknown-haiku" \
+		"x86_64-unknown-linux-gnu" \
+		"x86_64-unknown-linux-gnu" \
+		"x86_64-unknown-linux-gnux32" \
+		"x86_64-unknown-linux-musl" \
+		"x86_64-unknown-netbsd" \
+		"x86_64-unknown-openbsd" \
+		"x86_64-unknown-redox"
+end
+
+# Given n arguments, return the longest suffix common to all
+function __rustup_common_suffix
+	if test (count $argv) -le 1
+		return
+	end
+
+	set -l index -1
+	set -l min_length 65335
+	for arg in $argv
+		if test (string length "$arg") -lt $min_length
+			set min_length (string length "$arg")
+		end
+	end
+
+	set -l length 1
+	set -l suffix
+	set -l done 0
+	while test $done -eq 0 -a $length -le $min_length
+		set match (string match -r -- ".{$length}\$" "$argv[1]")
+		for arg in $argv[2..-1]
+			set -l value (string match -r -- ".{$length}\$" "$arg")
+			if test "$value" = "$match"
+				continue
+			else if string match -qr -- . "$suffix"
+				set done 1
+				break
+			else
+				# No common suffix
+				return 1
+			end
+		end
+		set suffix "$match"
+		set length (math $length + 1)
+	end
+
+	printf "%s\n" "$suffix"
+end
+
+# Strip result of __rustup_common_suffix
+function __rustup_strip_common_suffix
+	set -l suffix (__rustup_common_suffix $argv)
+	string replace -r -- (string escape --style=regex -- $suffix)\$ "" $argv
+end
+
+# Strip result of __rustup_common_suffix, but require suffix to begin at a literal -
+function __rustup_strip_common_suffix_strict
+	set -l suffix (__rustup_common_suffix $argv | string match -r -- "-.*")
+	string replace -r -- (string escape --style=regex -- $suffix)\$ "" $argv
+end
+
+function __rustup_all_toolchains
+	printf "%s\n" $__rustup_channels
+	printf "%s\n" $__rustup_channels-(__rustup_triples)
+end
+
+# All valid toolchains excluding installed
+function __rustup_installable_toolchains
+	comm -2 -3 (__rustup_all_toolchains | psub -F) (printf "%s\n" $__rustup_toolchains | psub -F) \
+		# Ignore warnings about lists not being in sorted order, as we are aware of their contents
+		2>/dev/null
+end
+
+function __rustup_installed_components
+	# If the user has supplied `--toolchain foo`, use it to filter the list
+	set -l toolchain (commandline -j | string replace -r ".*\s--toolchain\s+(\S+)\s.*" '$1')
+	set -l toolchain_filter
+	if string match -qr . -- $toolchain
+		set toolchain_filter "--toolchain $toolchain"
+	end
+
+	set -l installed (rustup component list --installed $toolchain_filter)
+	__rustup_common_suffix_strict $installed
+end
+
+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_first_token" -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"
+complete -c rustup -n "__fish_prev_arg_in target" -xa "list add install remove uninstall help"
+complete -c rustup -n "__fish_prev_arg_in component" -xa "list add install remove uninstall help"
+complete -c rustup -n "__fish_prev_arg_in override" -xa "list set unset help"
+complete -c rustup -n "__fish_prev_arg_in run" -xa "$__rustup_toolchains_short $rustup_toolchains"
+complete -c rustup -n "__fish_prev_arg_in self" -xa "update remove uninstall upgrade-data help"
+complete -c rustup -n "__fish_prev_arg_in set" -xa "default-host help"
+
+complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_arg_in remove uninstall" \
+	-xa "$__rustup_toolchains $__rustup_toolchains_short"
+complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_arg_in add install" \
+	-xa "(__rustup_installable_toolchains)"
+
+complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in remove uninstall" \
+	-xa "(__rustup_installed_components)"
+complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \
+	-xa "$__rustup_components"
+
+complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in default-host" \
+	-xa "(__rustup_triples)"
+
+# Global argument completions where valid
+complete -c rustup -n "__fish_prev_arg_in --toolchain" -xa "$__rustup_toolchains $rustup_toolchains"
+

From 32546d6491927e2d351a7f144288721f01f154a7 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 10 Sep 2019 03:17:06 -0500
Subject: [PATCH 0913/1732] Reorder `rustup` completions to avoid undefined
 function error

[ci skip]
---
 share/completions/rustup.fish | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index ff0a5f2a3..de8c9ed18 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -35,15 +35,6 @@ set __rustup_components \
 # 	__rustup_strip_common_suffix_strict $not_installed
 # end
 
-# Trim trailing attributes, e.g. "rust-whatever (default)" -> "rust-whatever"
-set -l __rustup_toolchains (rustup toolchain list | string replace -rf "\s+.*" '')
-# By default, the long name of a toolchain is used (e.g. nightly-x86_64-unknown-linux-gnu),
-# but a shorter version can be used if it is unambiguous.
-set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_toolchains)
-
-# Needs to be global to retain access from functions
-set __rustup_channels "beta" "stable" "nightly"
-
 # All *valid* target triples, retrieved from source
 function __rustup_triples
 	# The list below must be kept sorted alphabetically
@@ -228,6 +219,15 @@ function __rustup_installed_components
 	__rustup_common_suffix_strict $installed
 end
 
+# Trim trailing attributes, e.g. "rust-whatever (default)" -> "rust-whatever"
+set -l __rustup_toolchains (rustup toolchain list | string replace -rf "\s+.*" '')
+# By default, the long name of a toolchain is used (e.g. nightly-x86_64-unknown-linux-gnu),
+# but a shorter version can be used if it is unambiguous.
+set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_toolchains)
+
+# Needs to be global to retain access from functions
+set __rustup_channels "beta" "stable" "nightly"
+
 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

From 58cd1a5140c00c2a899811c3ad1b391cc6f69277 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 10 Sep 2019 03:23:35 -0500
Subject: [PATCH 0914/1732] Eschew hard-coding rustup components in favor of a
 hack

[ci skip]
---
 share/completions/rustup.fish | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index de8c9ed18..e1c7c1dc6 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -17,18 +17,10 @@ set -l subcmds \
 	# "completions" \
 	"help"
 
-# rustup does not expose a mechanism of retrieving a list of all valid components (including non-installed)
-set __rustup_components \
-	"cargo" \
-	"clippy" \
-	"lldb-preview" \
-	"llvm-tools-preview" \
-	"miri" \
-	"rls" \
-	"rust-analysis" \
-	"rust-docs" \
-	"rust-mingw" \
-	"rust-src"
+# rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended
+function  __rustup_components
+	rustup component list | string match -r "^\S+" | string replace -f -- "-x86_64-unknown-linux-gnu" ""
+end
 
 # function __rustup_installable_components
 # 	set -l not_installed (comm -2 -3 (printf "%s\n" $__rustup_components | psub -F) (rustup component list --installed | psub -F) 2>/dev/null)
@@ -251,7 +243,7 @@ complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_ar
 complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in remove uninstall" \
 	-xa "(__rustup_installed_components)"
 complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \
-	-xa "$__rustup_components"
+	-xa "(__rustup_components)"
 
 complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in default-host" \
 	-xa "(__rustup_triples)"

From ccdef3936feb7665084942ca09288cf5b28c2f5c Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 11 Sep 2019 12:16:19 +0800
Subject: [PATCH 0915/1732] docs: improve introduction section

Work on review comments in #5312.
---
 sphinx_doc_src/index.rst | 60 +++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 770d7421f..a6cb5955a 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -4,50 +4,28 @@
 Introduction
 ============
 
-This is the documentation for *fish*: the **f**\ riendly **i**\ nteractive **sh**\ ell.
+This is the documentation for *fish*, the **f**\ riendly **i**\ nteractive **sh**\ ell.
 
-A shell is a commandline interpreter. It reads text input from the commandline and interpretes it as commands to operating system, see: `What is a Shell`_.
+A shell is a software program which helps you operate your computer, such as by starting other programs. fish offers a command-line shell interface which is focused on usability and interactive use.
 
-So shells serve as user-interface between applications and the operating system. There are many different shells. They differ on how this interface is implemented. *fish* specializes in the following ways:
+Some of the special features of fish are:
 
-- **Extensive UI**: *fish* supports the user with syntax highlighting, autosuggestions, tab completions and selections lists, that can be navigated and filtered, see: `Autosuggestions`_ and `Tab Completion`_.
+- **Extensive UI**: `syntax highlighting`_, autosuggestions_, `tab completion`_ and selection lists that can be navigated and filtered.
 
-- **No configuration needed**: *fish* comes preconfigured so that it will be an efficient helper on the commandline out of the box.
+- **No configuration needed**: fish is designed to be ready to use immediately, without requiring extensive configuration.
 
-- **Add new commands easily**: in *fish* new commands can be added on the fly. The syntax is easy to learn and there is no administrative overhead, see `Functions`_.
+- **Easy scripting**: new functions_ can be added on the fly. The syntax is easy to learn and use.
 
-- **Interactive shell**: *fish* focuses on commands that will be run in an interactive session: While it supports job control for external commands, its own commands share the process of the shell, that started them.
+What is a shell?
+================
 
-What is a Shell
-===============
+A shell can be seen as the outermost layer to the operating system of a computer. The core of the operating system is sometimes called the "kernel", as if the computer's software is like a nut.
 
-This section is about the basics of shells. *fish* is a shell and shells have a lot in common:
+The shell communicates with the underlying operating system, allowing the user to launch additional software programs, and enables the appropriate configuration of those programs. It can also communicate the results of the program, control the concurrent operation of multiple programs and even perform various tasks itself.
 
-- `Shell Standards`_ Why shells adjust to standards
-- `Manual Pages`_: Commands usually come with a standardized manual page
-- `Command Syntax`_: Shell commands have a standard syntax
-- `Commands versus Programs`_: Commands differ from normal programs
-- `Shebang Line`_: How the shell knows the language of a script
+In general, shells are controlled with either a text-based command-line interface (CLI), or a keyboard and mouse-based graphical user interface (GUI). fish is a command-line shell.
 
-Shell Standards
----------------
-
-A shell is an interface to the operating system that reads from the commandline of a terminal. A shell's task is to identify and interpret commands. The commands can come from different applications and can be written in different programming languages.
-
-This can only work smoothly if shells adapt to some common standards. For shells there is the POSIX standard, see `Command-line interpreters  <https://en.wikipedia.org/wiki/Command-line_interface#Command-line_interpreter>`_. ``fish`` tries to satisfy the POSIX standard wherever it does not get into the way of its own design principles, see :ref:`Design <Design>`.
-
-Manual Pages
-------------
-
-There is a common standard on how to receive help on shell commands: applications provide a manual page to their commands that can be opened with the ``man`` command:
-
-
-::
-
-    > man COMMAND
-
-
-This convention helps to make sure help can be found on commands no matter where they originate from. *fish*'s internal commands all come with a manual page.
+Many command-line shells use the common interface defined in the POSIX standards. fish has a different interface, due to its :ref:`design <Design>` principles, but uses the POSIX standard where it does not conflict with these principles.
 
 Command Syntax
 --------------
@@ -137,8 +115,20 @@ This line tells the shell to execute the file with the *bash* interpreter, that
 
 For a script, written in another language, just replace the interpreter ``/bin/bash`` with the language interpreter of that other language (for example ``/bin/python`` for a ``python`` script)
 
-This line is only needed when scripts are executed by another interpreter, so for *fish* internal commands, that are executed by *fish* the shebang line is not necessary.
+This line is only needed when scripts are executed by another interpreter, so for fish internal commands, that are executed by fish the shebang line is not necessary.
 
+Manual Pages
+------------
+
+There is a common standard on how to receive help on shell commands: applications provide a manual page to their commands that can be opened with the ``man`` command:
+
+
+::
+
+    > man COMMAND
+
+
+This convention helps to make sure help can be found on commands no matter where they originate from. fish's internal commands all come with a manual page.
 
 Installation and Start
 ======================

From e935f5ce89ae68d5c9b74e2d2b0d2f8bcc98110a Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 11 Sep 2019 12:18:27 +0800
Subject: [PATCH 0916/1732] docs: fix formatting of name of shells

Work on review comments in #5312.

[ci skip]
---
 sphinx_doc_src/index.rst | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index a6cb5955a..07bba7984 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -111,7 +111,7 @@ A scripts written in ``bash`` it would need a first line like this::
     #!/bin/bash
 
 
-This line tells the shell to execute the file with the *bash* interpreter, that is located at the path ``/bin/bash``.
+This line tells the shell to execute the file with the bash interpreter, that is located at the path ``/bin/bash``.
 
 For a script, written in another language, just replace the interpreter ``/bin/bash`` with the language interpreter of that other language (for example ``/bin/python`` for a ``python`` script)
 
@@ -133,25 +133,25 @@ This convention helps to make sure help can be found on commands no matter where
 Installation and Start
 ======================
 
-This section is on how to install, uninstall, start and exit a *fish* shell and on how to make *fish* the default shell:
+This section is on how to install, uninstall, start and exit a fish shell and on how to make fish the default shell:
 
-- `Installation`_: How to install *fish*
-- `Default Shell`_: How to switch to *fish* as the default shell
-- `Starting and Exiting`_ How to start and exit a *fish* shell
-- `Uninstalling`_: How to uninstall *fish*
-- `Executing Bash`_: How to execute *bash* commands in *fish*
+- `Installation`_: How to install fish
+- `Default Shell`_: How to switch to fish as the default shell
+- `Starting and Exiting`_ How to start and exit a fish shell
+- `Uninstalling`_: How to uninstall fish
+- `Executing Bash`_: How to execute bash commands in fish
 
 Installation
 ------------
 
-Instructions for installing fish are on the `fish homepage <https://fishshell.com/>`_. Search that page for "Go fish".
+Up-to-date instructions for installing the latest version of fish are on the `fish homepage <https://fishshell.com/>`_.
 
-To install the development version of *fish* see the instructions at the `project's GitHub page <https://github.com/fish-shell/fish-shell>`_.
+To install the development version of fish see the instructions at the `project's GitHub page <https://github.com/fish-shell/fish-shell>`_.
 
 Default Shell
 -------------
 
-You can make *fish* your default shell by adding *fish*'s  executable in two places:
+You can make fish your default shell by adding fish's  executable in two places:
 - add ``/usr/local/bin/fish``  to  ``/etc/shells``
 - change your default shell with ``chsh -s`` to ``/usr/local/bin/fish``
 
@@ -160,19 +160,19 @@ For for detailed instructions see `Switching to fish <tutorial.html#tut_switchin
 Uninstalling
 ------------
 
-For uninstalling *fish*: see :ref:`FAQ: Uninstalling fish <faq-uninstalling>`.
+For uninstalling fish: see :ref:`FAQ: Uninstalling fish <faq-uninstalling>`.
 
 Starting and Exiting
 --------------------
 
-Once *fish* has been installed, open a terminal. If *fish* is not the default shell:
+Once fish has been installed, open a terminal. If fish is not the default shell:
 
-- Enter ``fish`` to start a *fish* shell::
+- Enter ``fish`` to start a fish shell::
 
     > fish
 
 
-- Enter ``exit`` to exit a *fish* shell::
+- Enter ``exit`` to exit a fish shell::
 
     > exit
 
@@ -180,7 +180,7 @@ Once *fish* has been installed, open a terminal. If *fish* is not the default sh
 Executing Bash
 --------------
 
-If *fish* is your default shell and you want to copy commands from the internet, that are written in a different shell language, *bash* for example, you can proceed in the following way:
+If fish is your default shell and you want to copy commands from the internet, that are written in a different shell language, bash for example, you can proceed in the following way:
 
 Consider, that ``bash`` is also a command. With ``man bash`` you can see that there are two ways to do this:
 
@@ -189,7 +189,7 @@ Consider, that ``bash`` is also a command. With ``man bash`` you can see that th
     > bash -c SomeBashCommand
 
 
-or ``bash`` without a switch, opens a *bash* shell that you can use and ``exit`` afterwards.
+or ``bash`` without a switch, opens a bash shell that you can use and ``exit`` afterwards.
 
 
 .. _syntax:

From 737c2d156db4d32e63698b2bc4fe557fc7d5429b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 11 Sep 2019 23:12:10 +0800
Subject: [PATCH 0917/1732] history: fixup exact matching by default

Work on #6070. Fixup from 54ed2ad44039f8871a0.
---
 share/functions/history.fish    | 7 +++++--
 sphinx_doc_src/cmds/history.rst | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index 9f8a229af..ea7b399f4 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -33,6 +33,7 @@ function history --description "display or manipulate interactive command histor
     set -l hist_cmd
     set -l show_time
     set -l max_count
+    set -l search_mode
     set -q _flag_max
     set max_count -n$_flag_max
 
@@ -108,8 +109,10 @@ function history --description "display or manipulate interactive command histor
                 read -P"Search term: " searchterm
             end
 
-            test -z "$search_mode"
-            and set search_mode "--exact"
+            if test -z "$search_mode"
+                set search_mode "--exact"
+                set _flag_case_sensitive "-C"
+            end
 
             if test $search_mode = "--exact"
                 builtin history delete $search_mode $_flag_case_sensitive $searchterm
diff --git a/sphinx_doc_src/cmds/history.rst b/sphinx_doc_src/cmds/history.rst
index af239e7d1..68bd2c928 100644
--- a/sphinx_doc_src/cmds/history.rst
+++ b/sphinx_doc_src/cmds/history.rst
@@ -23,7 +23,7 @@ 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.
 
-- ``delete`` deletes history items. Without the ``--prefix`` or ``--contains`` options, the exact match of the specified text will be deleted. 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. Without the ``--prefix`` or ``--contains`` options, the exact, case-sensitive match of the specified text will be deleted. 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.
 

From 77ef2ef6c3f540fe3c38ad9a0b1adb68a4f2f10b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Wed, 11 Sep 2019 13:17:23 +0800
Subject: [PATCH 0918/1732] jobs: return success when a job is found via --last

Closes #6104.
---
 CHANGELOG.md         | 1 +
 src/builtin_jobs.cpp | 3 ++-
 tests/jobs.in        | 6 ++++++
 tests/jobs.out       | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a6f9639e..8cb00241d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (:) now always exits successfully, rather than echoing last return code.
 - Cursor configuration instructions for vi-mode have been added to the fish documentation.
+- `jobs --last` returns 0 to indicate success when a job is found (#6104).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index e3be3f63d..9a541a18b 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -174,9 +174,10 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         for (const auto &j : parser.jobs()) {
             if (j->is_visible()) {
                 builtin_jobs_print(j.get(), mode, !streams.out_is_redirected, streams);
-                return STATUS_CMD_ERROR;
+                return STATUS_CMD_OK;
             }
         }
+        return STATUS_CMD_ERROR;
 
     } else {
         if (w.woptind < argc) {
diff --git a/tests/jobs.in b/tests/jobs.in
index 7132953e4..644010113 100644
--- a/tests/jobs.in
+++ b/tests/jobs.in
@@ -30,3 +30,9 @@ function sleep_done_$sleep_job --on-job-exit $sleep_job
     functions --erase sleep_done_$sleep_job
 end
 sleep 2
+
+# Verify `jobs -l` works and returns the right status codes
+# https://github.com/fish-shell/fish-shell/issues/6104
+jobs --last --command; echo $status
+sleep 0.2 &
+jobs -lc; echo $status
diff --git a/tests/jobs.out b/tests/jobs.out
index 62e4d97d5..ef07059c4 100644
--- a/tests/jobs.out
+++ b/tests/jobs.out
@@ -9,3 +9,7 @@ sleep
 Command
 sleep
 sleep is done
+1
+Command
+sleep
+0

From 0ecfc2596171148b03393581e192a6f97afb8b8f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 12 Sep 2019 20:03:46 +0200
Subject: [PATCH 0919/1732] Fix highlighting of redirection to `-` (close file
 descriptor)

Fixes #6092
---
 src/highlight.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/highlight.cpp b/src/highlight.cpp
index 3149f97aa..2a8fa179d 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -992,8 +992,12 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                     path_apply_working_directory(target, this->working_directory);
                 switch (*redirect_type) {
                     case redirection_type_t::fd: {
-                        int fd = fish_wcstoi(target.c_str());
-                        target_is_valid = !errno && fd >= 0;
+                        if (target == L"-") {
+                            target_is_valid = true;
+                        } else {
+                            int fd = fish_wcstoi(target.c_str());
+                            target_is_valid = !errno && fd >= 0;
+                        }
                         break;
                     }
                     case redirection_type_t::input: {

From cc5e29734b0a177eb01b5f9f2fee2284b38b6127 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 11:56:02 -0700
Subject: [PATCH 0920/1732] Use maybe_t in string_last_char

---
 src/common.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 7bd6cc92a..1dd7415df 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1277,9 +1277,10 @@ wcstring debug_escape(const wcstring &in) {
     return result;
 }
 
-/// Helper to return the last character in a string, or NOT_A_WCHAR.
-static wint_t string_last_char(const wcstring &str) {
-    return str.empty() ? NOT_A_WCHAR : str.back();
+/// Helper to return the last character in a string, or none.
+static maybe_t<wchar_t> string_last_char(const wcstring &str) {
+    if (str.empty()) return none();
+    return str.back();
 }
 
 /// Given a null terminated string starting with a backslash, read the escape as if it is unquoted,

From 7ea3255eef526d98e2e04abadc0b4f465dc2514e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 12:46:57 -0700
Subject: [PATCH 0921/1732] Correct the exit expect test

There was an errant space which is not matched; this seems to cause problems
only on one machine for mysterious reasons.
---
 tests/exit.expect | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/exit.expect b/tests/exit.expect
index 86d7f6510..165798793 100644
--- a/tests/exit.expect
+++ b/tests/exit.expect
@@ -26,8 +26,8 @@ send "exit\r"
 expect -re "There are still jobs active:\r
 \r
    PID  Command\r
-  *\\d+  sleep 113 &\r
-  *\\d+  sleep 111 &\r
+ *\\d+  sleep 113 &\r
+ *\\d+  sleep 111 &\r
 \r
 A second attempt to exit will terminate them.\r
 Use 'disown PID' to remove jobs from the list without terminating them.\r"

From fa1dab040b6b2614d1b2fb1267cf0acfa7a476cd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 12:54:38 -0700
Subject: [PATCH 0922/1732] Use maybe_t in read_unquoted_escape

---
 src/common.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 1dd7415df..a6df48c9a 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1289,9 +1289,9 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
                                      bool unescape_special) {
     assert(input[0] == L'\\' && "Not an escape");
 
-    // Here's the character we'll ultimately append, or NOT_A_WCHAR for none. Note that L'\0' is a
+    // Here's the character we'll ultimately append, or none. Note that L'\0' is a
     // valid thing to append.
-    wint_t result_char_or_none = NOT_A_WCHAR;
+    maybe_t<wchar_t> result_char_or_none = none();
 
     bool errored = false;
     size_t in_pos = 1;  // in_pos always tracks the next character to read (and therefore the number
@@ -1434,7 +1434,7 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
         }
         // If a backslash is followed by an actual newline, swallow them both.
         case L'\n': {
-            result_char_or_none = NOT_A_WCHAR;
+            result_char_or_none = none();
             break;
         }
         default: {
@@ -1444,11 +1444,8 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
         }
     }
 
-    if (!errored && result_char_or_none != NOT_A_WCHAR) {
-        wchar_t result_char = static_cast<wchar_t>(result_char_or_none);
-        // If result_char is not NOT_A_WCHAR, it must be a valid wchar.
-        assert((wint_t)result_char == result_char_or_none);
-        result->push_back(result_char);
+    if (!errored && result_char_or_none.has_value()) {
+        result->push_back(*result_char_or_none);
     }
     if (errored) return none();
 

From 8747018cbc7f01c897a230ce7e0dae1566deab25 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 13:17:22 -0700
Subject: [PATCH 0923/1732] Use maybe_t in unescape_string_internal

---
 src/common.cpp | 30 ++++++++++++++++--------------
 src/expand.h   |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index a6df48c9a..87deb17ef 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1480,8 +1480,8 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
 
     for (size_t input_position = 0; input_position < input_len && !errored; input_position++) {
         const wchar_t c = input[input_position];
-        // Here's the character we'll append to result, or NOT_A_WCHAR to suppress it.
-        wint_t to_append_or_none = c;
+        // Here's the character we'll append to result, or none() to suppress it.
+        maybe_t<wchar_t> to_append_or_none = c;
         if (mode == mode_unquoted) {
             switch (c) {
                 case L'\\': {
@@ -1499,7 +1499,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         input_position += *escape_chars - 1;
                     }
                     // We've already appended, don't append anything else.
-                    to_append_or_none = NOT_A_WCHAR;
+                    to_append_or_none = none();
                     break;
                 }
                 case L'~': {
@@ -1602,18 +1602,21 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                 case L'\t':
                 case L' ': {
                     if (unescape_special && brace_count > 0) {
-                        to_append_or_none = brace_text_start ? wint_t(BRACE_SPACE) : NOT_A_WCHAR;
+                        to_append_or_none =
+                            brace_text_start ? maybe_t<wchar_t>(BRACE_SPACE) : none();
                     }
                     break;
                 }
                 case L'\'': {
                     mode = mode_single_quotes;
-                    to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
+                    to_append_or_none =
+                        unescape_special ? maybe_t<wchar_t>(INTERNAL_SEPARATOR) : none();
                     break;
                 }
                 case L'\"': {
                     mode = mode_double_quotes;
-                    to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
+                    to_append_or_none =
+                        unescape_special ? maybe_t<wchar_t>(INTERNAL_SEPARATOR) : none();
                     break;
                 }
                 default: {
@@ -1652,14 +1655,16 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     }
                 }
             } else if (c == L'\'') {
-                to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
+                to_append_or_none =
+                    unescape_special ? maybe_t<wchar_t>(INTERNAL_SEPARATOR) : none();
                 mode = mode_unquoted;
             }
         } else if (mode == mode_double_quotes) {
             switch (c) {
                 case L'"': {
                     mode = mode_unquoted;
-                    to_append_or_none = unescape_special ? wint_t(INTERNAL_SEPARATOR) : NOT_A_WCHAR;
+                    to_append_or_none =
+                        unescape_special ? maybe_t<wchar_t>(INTERNAL_SEPARATOR) : none();
                     break;
                 }
                 case '\\': {
@@ -1681,7 +1686,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         }
                         case '\n': {
                             /* Swallow newline */
-                            to_append_or_none = NOT_A_WCHAR;
+                            to_append_or_none = none();
                             input_position += 1; /* Skip over the backslash */
                             break;
                         }
@@ -1707,11 +1712,8 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
         }
 
         // Now maybe append the char.
-        if (to_append_or_none != NOT_A_WCHAR) {
-            wchar_t to_append_char = static_cast<wchar_t>(to_append_or_none);
-            // If result_char is not NOT_A_WCHAR, it must be a valid wchar.
-            assert((wint_t)to_append_char == to_append_or_none);
-            result.push_back(to_append_char);
+        if (to_append_or_none.has_value()) {
+            result.push_back(*to_append_or_none);
         }
     }
 
diff --git a/src/expand.h b/src/expand.h
index b492a2a18..371724307 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -70,7 +70,7 @@ using expand_flags_t = enum_set_t<expand_flag>;
 
 class completion_t;
 
-enum {
+enum : wchar_t {
     /// Character representing a home directory.
     HOME_DIRECTORY = EXPAND_RESERVED_BASE,
     /// Character representing process expansion for %self.

From 06269ed67dac50edd4fc97163d5236d937dad322 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 13:18:04 -0700
Subject: [PATCH 0924/1732] Remove NOT_A_WCHAR

It's now unused.
---
 src/common.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 87deb17ef..ab211f731 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -62,8 +62,6 @@
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-constexpr wint_t NOT_A_WCHAR = static_cast<wint_t>(WEOF);
-
 struct termios shell_modes;
 
 /// This allows us to notice when we've forked.
@@ -1550,8 +1548,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     if (unescape_special) {
                         brace_count++;
                         to_append_or_none = BRACE_BEGIN;
-                        // We need to store where the brace *ends up* in the output because of
-                        // NOT_A_WCHAR.
+                        // We need to store where the brace *ends up* in the output.
                         braces.push_back(result.size());
                     }
                     break;

From 5ebcd3de98bd109b6dbcbddd7ef1d63d9601aa5f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 14:22:37 -0700
Subject: [PATCH 0925/1732] Remove some unnecessary string formatting

---
 src/builtin_bind.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 0bd60682a..a3fa5abd2 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -133,10 +133,9 @@ void builtin_bind_t::list(const wchar_t *bind_mode, bool user, io_streams_t &str
 /// are defined for this terminal are printed.
 void builtin_bind_t::key_names(bool all, io_streams_t &streams) {
     const wcstring_list_t names = input_terminfo_get_names(!all);
-    for (size_t i = 0; i < names.size(); i++) {
-        const wcstring &name = names.at(i);
-
-        streams.out.append_format(L"%ls\n", name.c_str());
+    for (const wcstring &name : names) {
+        streams.out.append(name);
+        streams.out.append(L'\n');
     }
 }
 

From 5afcc439a502e9f29594e17675716728c70605b0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 14:59:01 -0700
Subject: [PATCH 0926/1732] Clean up input_terminfo_get_sequence

---
 src/input.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 94c9f90b8..0cb24e8e5 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -678,25 +678,20 @@ bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
     ASSERT_IS_MAIN_THREAD();
     assert(s_input_initialized);
     assert(name && "null name");
-
-    const char *res = 0;
-    int err = ENOENT;
-
     for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
         if (!std::wcscmp(name, m.name)) {
-            res = m.seq;
-            err = EILSEQ;
-            break;
+            // Found the mapping.
+            if (!m.seq) {
+                errno = EILSEQ;
+                return false;
+            } else {
+                *out_seq = str2wcstring(m.seq);
+                return true;
+            }
         }
     }
-
-    if (!res) {
-        errno = err;
-        return false;
-    }
-
-    *out_seq = format_string(L"%s", res);
-    return true;
+    errno = ENOENT;
+    return false;
 }
 
 bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {

From 5f6ee7f30f13ecded4847776a66f912a59116a6e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 15:07:48 -0700
Subject: [PATCH 0927/1732] Use the gold linker if available

The big reason to do this is that the gold linker doesn't complain about
_sys_nerr and _sys_errlist.
---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 475b00741..73ca4a860 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,15 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
 # Disable exception handling.
 ADD_COMPILE_OPTIONS(-fno-exceptions)
 
+# Prefer the gold linker because it doesn't emit useless warnings about sys_nerr and _sys_errlist.
+if (UNIX AND NOT APPLE)
+  EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+                  ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+  if ("${LD_VERSION}" MATCHES "GNU gold")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
+  endif()
+endif()
+
 # Hide the CMake Rules directories in Xcode projects.
 SOURCE_GROUP("CMake Rules" REGULAR_EXPRESSION "^$")
 

From 533ee65963fca411f30365db9f572ee7151e3667 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 16:36:57 -0700
Subject: [PATCH 0928/1732] Allow binding nul (zero byte)

This sequence can be generatd by control-spacebar. Allow it to be bound
properly.

To do this we must be sure that we never round-trip the key sequence
through a C string.
---
 src/builtin_bind.cpp    |  6 ++---
 src/builtin_bind.h      |  4 +--
 src/fish_key_reader.cpp | 56 ++++++++++++++++++++++-------------------
 src/input.cpp           | 55 ++++++++++++++++++++++++----------------
 src/input.h             |  9 +++----
 tests/bind.expect       | 11 ++++++++
 tests/bind.expect.out   |  1 +
 tests/fkr.expect        |  2 +-
 8 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index a3fa5abd2..035949623 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -150,7 +150,7 @@ void builtin_bind_t::function_names(io_streams_t &streams) {
 }
 
 /// Wraps input_terminfo_get_sequence(), appending the correct error messages as needed.
-bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq,
+bool builtin_bind_t::get_terminfo_sequence(const wcstring &seq, wcstring *out_seq,
                                            io_streams_t &streams) {
     if (input_terminfo_get_sequence(seq, out_seq)) {
         return true;
@@ -173,13 +173,13 @@ bool builtin_bind_t::get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq
 }
 
 /// Add specified key binding.
-bool builtin_bind_t::add(const wchar_t *seq, const wchar_t *const *cmds, size_t cmds_len,
+bool builtin_bind_t::add(const wcstring &seq, const wchar_t *const *cmds, size_t cmds_len,
                          const wchar_t *mode, const wchar_t *sets_mode, bool terminfo, bool user,
                          io_streams_t &streams) {
     if (terminfo) {
         wcstring seq2;
         if (get_terminfo_sequence(seq, &seq2, streams)) {
-            input_mappings_->add(seq2.c_str(), cmds, cmds_len, mode, sets_mode, user);
+            input_mappings_->add(seq2, cmds, cmds_len, mode, sets_mode, user);
         } else {
             return true;
         }
diff --git a/src/builtin_bind.h b/src/builtin_bind.h
index 83dcfde1b..d522f6383 100644
--- a/src/builtin_bind.h
+++ b/src/builtin_bind.h
@@ -26,11 +26,11 @@ class builtin_bind_t {
     void list(const wchar_t *bind_mode, bool user, io_streams_t &streams);
     void key_names(bool all, io_streams_t &streams);
     void function_names(io_streams_t &streams);
-    bool add(const wchar_t *seq, const wchar_t *const *cmds, size_t cmds_len, const wchar_t *mode,
+    bool add(const wcstring &seq, const wchar_t *const *cmds, size_t cmds_len, const wchar_t *mode,
              const wchar_t *sets_mode, bool terminfo, bool user, io_streams_t &streams);
     bool erase(wchar_t **seq, bool all, const wchar_t *mode, bool use_terminfo, bool user,
                io_streams_t &streams);
-    bool get_terminfo_sequence(const wchar_t *seq, wcstring *out_seq, io_streams_t &streams);
+    bool get_terminfo_sequence(const wcstring &seq, wcstring *out_seq, io_streams_t &streams);
     bool insert(int optind, int argc, wchar_t **argv, io_streams_t &streams);
     void list_modes(io_streams_t &streams);
     bool list_one(const wcstring &seq, const wcstring &bind_mode, bool user, io_streams_t &streams);
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 7dd58e5ab..02da91547 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -67,29 +67,30 @@ static bool should_exit(wchar_t wc) {
 }
 
 /// Return the name if the recent sequence of characters matches a known terminfo sequence.
-static char *sequence_name(wchar_t wc) {
-    unsigned char c = wc < 0x80 ? wc : 0;
-    static char recent_chars[8] = {0};
-
-    recent_chars[0] = recent_chars[1];
-    recent_chars[1] = recent_chars[2];
-    recent_chars[2] = recent_chars[3];
-    recent_chars[3] = recent_chars[4];
-    recent_chars[4] = recent_chars[5];
-    recent_chars[5] = recent_chars[6];
-    recent_chars[6] = recent_chars[7];
-    recent_chars[7] = c;
-
-    for (int idx = 7; idx >= 0; idx--) {
-        wcstring out_name;
-        wcstring seq = str2wcstring(recent_chars + idx, 8 - idx);
-        bool found = input_terminfo_get_name(seq, &out_name);
-        if (found) {
-            return strdup(wcs2string(out_name).c_str());
-        }
+static maybe_t<wcstring> sequence_name(wchar_t wc) {
+    static std::string recent_chars;
+    if (wc >= 0x80) {
+        // Terminfo sequences are always ASCII.
+        recent_chars.clear();
+        return none();
     }
 
-    return NULL;
+    unsigned char c = wc;
+    recent_chars.push_back(c);
+    while (recent_chars.size() > 8) {
+        recent_chars.erase(recent_chars.begin());
+    }
+
+    // Check all nonempty substrings extending to the end.
+    for (size_t i = 0; i < recent_chars.size(); i++) {
+        wcstring out_name;
+        wcstring seq = str2wcstring(recent_chars.substr(i));
+        if (input_terminfo_get_name(seq, &out_name)) {
+            return out_name;
+        }
+    }
+    return none();
+    ;
 }
 
 /// Return true if the character must be escaped when used in the sequence of chars to be bound in
@@ -174,10 +175,8 @@ static void output_info_about_char(wchar_t wc) {
 }
 
 static bool output_matching_key_name(wchar_t wc) {
-    char *name = sequence_name(wc);
-    if (name) {
-        std::fwprintf(stdout, L"bind -k %s 'do something'\n", name);
-        free(name);
+    if (maybe_t<wcstring> name = sequence_name(wc)) {
+        std::fwprintf(stdout, L"bind -k %ls 'do something'\n", name->c_str());
         return true;
     }
     return false;
@@ -223,7 +222,12 @@ static void process_input(bool continuous_mode) {
 
         wchar_t wc = evt.get_char();
         prev_tstamp = output_elapsed_time(prev_tstamp, first_char_seen);
-        add_char_to_bind_command(wc, bind_chars);
+        // Hack for #3189. Do not suggest \c@ as the binding for nul, because a string containing
+        // nul cannot be passed to builtin_bind since it uses C strings. We'll output the name of
+        // this key (nul) elsewhere.
+        if (wc) {
+            add_char_to_bind_command(wc, bind_chars);
+        }
         output_info_about_char(wc);
         if (output_matching_key_name(wc)) {
             output_bind_command(bind_chars);
diff --git a/src/input.cpp b/src/input.cpp
index 0cb24e8e5..fe797a5cb 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -34,6 +34,9 @@
 
 #define MAX_INPUT_FUNCTION_ARGS 20
 
+/// A name for our own key mapping for nul.
+static const wchar_t *k_nul_mapping_name = L"nul";
+
 /// Struct representing a keybinding. Returned by input_get_mappings.
 struct input_mapping_t {
     /// Character sequence which generates this event.
@@ -59,8 +62,17 @@ struct input_mapping_t {
 
 /// A struct representing the mapping from a terminfo key name to a terminfo character sequence.
 struct terminfo_mapping_t {
-    const wchar_t *name;  // name of key
-    const char *seq;      // character sequence generated on keypress
+    // name of key
+    const wchar_t *name;
+
+    // character sequence generated on keypress, or none if there was no mapping.
+    maybe_t<std::string> seq;
+
+    terminfo_mapping_t(const wchar_t *name, const char *s) : name(name) {
+        if (s) seq.emplace(s);
+    }
+
+    terminfo_mapping_t(const wchar_t *name, std::string s) : name(name), seq(std::move(s)) {}
 };
 
 static constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS;
@@ -159,9 +171,6 @@ acquired_lock<input_mapping_set_t> input_mappings() {
 /// Terminfo map list.
 static latch_t<std::vector<terminfo_mapping_t>> s_terminfo_mappings;
 
-#define TERMINFO_ADD(key) \
-    { (L## #key) + 4, key }
-
 /// \return the input terminfo.
 static std::vector<terminfo_mapping_t> create_input_terminfo();
 
@@ -211,10 +220,10 @@ static void input_mapping_insert_sorted(mapping_list_t &ml, input_mapping_t new_
 }
 
 /// Adds an input mapping.
-void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *const *commands,
+void input_mapping_set_t::add(wcstring sequence, const wchar_t *const *commands,
                               size_t commands_len, const wchar_t *mode, const wchar_t *sets_mode,
                               bool user) {
-    assert(sequence && commands && mode && sets_mode && "Null parameter");
+    assert(commands && mode && sets_mode && "Null parameter");
 
     // Clear cached mappings.
     all_mappings_cache_.reset();
@@ -233,13 +242,14 @@ void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *const *com
     }
 
     // Add a new mapping, using the next order.
-    const input_mapping_t new_mapping = input_mapping_t(sequence, commands_vector, mode, sets_mode);
+    input_mapping_t new_mapping =
+        input_mapping_t(std::move(sequence), commands_vector, mode, sets_mode);
     input_mapping_insert_sorted(ml, std::move(new_mapping));
 }
 
-void input_mapping_set_t::add(const wchar_t *sequence, const wchar_t *command, const wchar_t *mode,
+void input_mapping_set_t::add(wcstring sequence, const wchar_t *command, const wchar_t *mode,
                               const wchar_t *sets_mode, bool user) {
-    input_mapping_set_t::add(sequence, &command, 1, mode, sets_mode, user);
+    input_mapping_set_t::add(std::move(sequence), &command, 1, mode, sets_mode, user);
 }
 
 /// Handle interruptions to key reading by reaping finished jobs and propagating the interrupt to
@@ -587,6 +597,10 @@ std::shared_ptr<const mapping_list_t> input_mapping_set_t::all_mappings() {
 static std::vector<terminfo_mapping_t> create_input_terminfo() {
     assert(curses_initialized);
     if (!cur_term) return {};  // setupterm() failed so we can't referency any key definitions
+
+#define TERMINFO_ADD(key) \
+    { (L## #key) + 4, key }
+
     return {
         TERMINFO_ADD(key_a1), TERMINFO_ADD(key_a3), TERMINFO_ADD(key_b2),
             TERMINFO_ADD(key_backspace), TERMINFO_ADD(key_beg), TERMINFO_ADD(key_btab),
@@ -670,22 +684,26 @@ static std::vector<terminfo_mapping_t> create_input_terminfo() {
             TERMINFO_ADD(key_sr), TERMINFO_ADD(key_sredo), TERMINFO_ADD(key_sreplace),
             TERMINFO_ADD(key_sright), TERMINFO_ADD(key_srsume), TERMINFO_ADD(key_ssave),
             TERMINFO_ADD(key_ssuspend), TERMINFO_ADD(key_stab), TERMINFO_ADD(key_sundo),
-            TERMINFO_ADD(key_suspend), TERMINFO_ADD(key_undo), TERMINFO_ADD(key_up)
+            TERMINFO_ADD(key_suspend), TERMINFO_ADD(key_undo), TERMINFO_ADD(key_up),
+
+            // We introduce our own name for the string containing only the nul character - see
+            // #3189. This can typically be generated via control-space.
+            terminfo_mapping_t(k_nul_mapping_name, std::string{'\0'})
     };
+#undef TERMINFO_ADD
 }
 
-bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq) {
+bool input_terminfo_get_sequence(const wcstring &name, wcstring *out_seq) {
     ASSERT_IS_MAIN_THREAD();
     assert(s_input_initialized);
-    assert(name && "null name");
     for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
-        if (!std::wcscmp(name, m.name)) {
+        if (name == m.name) {
             // Found the mapping.
             if (!m.seq) {
                 errno = EILSEQ;
                 return false;
             } else {
-                *out_seq = str2wcstring(m.seq);
+                *out_seq = str2wcstring(*m.seq);
                 return true;
             }
         }
@@ -698,12 +716,7 @@ bool input_terminfo_get_name(const wcstring &seq, wcstring *out_name) {
     assert(s_input_initialized);
 
     for (const terminfo_mapping_t &m : *s_terminfo_mappings) {
-        if (!m.seq) {
-            continue;
-        }
-
-        const wcstring map_buf = format_string(L"%s", m.seq);
-        if (map_buf == seq) {
+        if (m.seq && seq == str2wcstring(*m.seq)) {
             out_name->assign(m.name);
             return true;
         }
diff --git a/src/input.h b/src/input.h
index b6369b899..6bff260de 100644
--- a/src/input.h
+++ b/src/input.h
@@ -109,11 +109,10 @@ class input_mapping_set_t {
     ///
     /// \param sequence the sequence to bind
     /// \param command an input function that will be run whenever the key sequence occurs
-    void add(const wchar_t *sequence, const wchar_t *command,
-             const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *new_mode = DEFAULT_BIND_MODE,
-             bool user = true);
+    void add(wcstring sequence, const wchar_t *command, const wchar_t *mode = DEFAULT_BIND_MODE,
+             const wchar_t *new_mode = DEFAULT_BIND_MODE, bool user = true);
 
-    void add(const wchar_t *sequence, const wchar_t *const *commands, size_t commands_len,
+    void add(wcstring sequence, const wchar_t *const *commands, size_t commands_len,
              const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *new_mode = DEFAULT_BIND_MODE,
              bool user = true);
 
@@ -128,7 +127,7 @@ acquired_lock<input_mapping_set_t> input_mappings();
 ///
 /// If no terminfo variable of the specified name could be found, return false and set errno to
 /// ENOENT. If the terminfo variable does not have a value, return false and set errno to EILSEQ.
-bool input_terminfo_get_sequence(const wchar_t *name, wcstring *out_seq);
+bool input_terminfo_get_sequence(const wcstring &name, wcstring *out_seq);
 
 /// Return the name of the terminfo variable with the specified sequence, in out_name. Returns true
 /// if found, false if not found.
diff --git a/tests/bind.expect b/tests/bind.expect
index ffe28ef8e..a81e91fdb 100644
--- a/tests/bind.expect
+++ b/tests/bind.expect
@@ -288,3 +288,14 @@ expect_prompt -re {git@} {
 } unmatched {
     puts stderr "ctrl-w does not stop at @"
 }
+
+# Ensure that nul can be bound properly (#3189).
+send "bind -k nul 'echo nul seen'\r"
+expect_prompt
+send -null 3
+send "\r"
+expect_prompt -re {nul seen\r\nnul seen\r\nnul seen} {
+    puts "nul seen"
+} unmatched {
+    puts stderr "nul not seen"
+}
diff --git a/tests/bind.expect.out b/tests/bind.expect.out
index 3e8f30c2b..e8c467f53 100644
--- a/tests/bind.expect.out
+++ b/tests/bind.expect.out
@@ -22,3 +22,4 @@ ctrl-v seen
 ctrl-o seen
 ctrl-w stops at :
 ctrl-w stops at @
+nul seen
diff --git a/tests/fkr.expect b/tests/fkr.expect
index 963cba0ed..0553af8ba 100644
--- a/tests/fkr.expect
+++ b/tests/fkr.expect
@@ -31,7 +31,7 @@ expect -ex "char: \\u1234\r\nbind \\e\\u1234 'do something'\r\n" {
 # Is a NULL char echoed correctly?
 sleep 0.020
 send -null
-expect -ex "char: \\c@\r\nbind \\c@ 'do something'\r\n" {
+expect -ex "char: \\c@\r\nbind -k nul 'do something'\r\n" {
     puts "\\c@ handled"
 } unmatched {
     puts stderr "\\c@ not handled"

From d903fe60731b5141b55274d9a9782038021d60b9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 14 Sep 2019 16:42:28 -0700
Subject: [PATCH 0929/1732] Relnote fix for #3189

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cb00241d..a594ff075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
 - When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+- The nul character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.

From 2f6c8fb21a603cae6719257dafb32c14190c2851 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 16:25:12 +0800
Subject: [PATCH 0930/1732] docs: source creates a new local scope

Discussed in #4443.
---
 sphinx_doc_src/cmds/source.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 2d07e24ce..074a8aa23 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -21,6 +21,8 @@ The return status of ``source`` is the return status of the last job to execute.
 
 ``.`` (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.
+
 
 Example
 -------

From 4265b02eb38ea04ec96fcf92ebc3d3bc2bb5cab1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 16:31:39 +0800
Subject: [PATCH 0931/1732] docs: standardise on exit status terminology

Exit status is used in the POSIX specification and is preferred over return code/return status/exit
code.

[ci skip]
---
 sphinx_doc_src/cmds/argparse.rst  | 2 +-
 sphinx_doc_src/cmds/command.rst   | 2 +-
 sphinx_doc_src/cmds/exit.rst      | 2 +-
 sphinx_doc_src/cmds/jobs.rst      | 4 ++--
 sphinx_doc_src/cmds/set_color.rst | 2 +-
 sphinx_doc_src/cmds/source.rst    | 2 +-
 sphinx_doc_src/cmds/trap.rst      | 2 +-
 sphinx_doc_src/cmds/ulimit.rst    | 2 +-
 sphinx_doc_src/index.rst          | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index ec79b444f..a27ae1a0d 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -95,7 +95,7 @@ Each option specification is a string composed of
 
 - ``=+`` if it requires a value and each instance of the flag is saved.
 
-- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the return status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#flag-value-validation>`__ for more information.
+- Optionally a ``!`` followed by fish script to validate the value. Typically this will be a function to run. If the exit status is zero the value for the flag is valid. If non-zero the value is invalid. Any error messages should be written to stdout (not stderr). See the section on `Flag Value Validation <#flag-value-validation>`__ for more information.
 
 See the :ref:`fish_opt <cmd-fish_opt>` command for a friendlier but more verbose way to create option specifications.
 
diff --git a/sphinx_doc_src/cmds/command.rst b/sphinx_doc_src/cmds/command.rst
index 69e25c8dd..8ff1a6eb1 100644
--- a/sphinx_doc_src/cmds/command.rst
+++ b/sphinx_doc_src/cmds/command.rst
@@ -18,7 +18,7 @@ The following options are available:
 
 - ``-a`` or ``--all`` returns all the external COMMANDNAMEs that are found in ``$PATH`` in the order they are found.
 
-- ``-q`` or ``--quiet``, silences the output and prints nothing, setting only the exit code. Implies ``--search``.
+- ``-q`` or ``--quiet``, silences the output and prints nothing, setting only the exit status. Implies ``--search``.
 
 - ``-s`` or ``--search`` returns the name of the external command that would be executed, or nothing if no file with the specified name could be found in the ``$PATH``.
 
diff --git a/sphinx_doc_src/cmds/exit.rst b/sphinx_doc_src/cmds/exit.rst
index 256a15589..d44ccd75f 100644
--- a/sphinx_doc_src/cmds/exit.rst
+++ b/sphinx_doc_src/cmds/exit.rst
@@ -12,6 +12,6 @@ exit [STATUS]
 Description
 -----------
 
-``exit`` causes fish to exit. If ``STATUS`` is supplied, it will be converted to an integer and used as the exit code. Otherwise, the exit code will be that of the last command executed.
+``exit`` causes fish to exit. If ``STATUS`` is supplied, it will be converted to an integer and used as the exit status. 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/sphinx_doc_src/cmds/jobs.rst b/sphinx_doc_src/cmds/jobs.rst
index 1c0f435cc..6595f669b 100644
--- a/sphinx_doc_src/cmds/jobs.rst
+++ b/sphinx_doc_src/cmds/jobs.rst
@@ -24,11 +24,11 @@ jobs accepts the following switches:
 
 - ``-p`` or ``--pid`` prints the process ID for each process in all jobs.
 
-- ``-q`` or ``--quiet`` prints no output for evaluation of jobs by exit code only.
+- ``-q`` or ``--quiet`` prints no output for evaluation of jobs by exit status only.
 
 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\%.
 
-The exit code of the ``jobs`` builtin is ``0`` if there are running background jobs and ``1`` otherwise.
+The exit status of the ``jobs`` builtin is ``0`` if there are running background jobs and ``1`` otherwise.
 
 no output.
 ----------
diff --git a/sphinx_doc_src/cmds/set_color.rst b/sphinx_doc_src/cmds/set_color.rst
index b9dc44761..4be42f857 100644
--- a/sphinx_doc_src/cmds/set_color.rst
+++ b/sphinx_doc_src/cmds/set_color.rst
@@ -39,7 +39,7 @@ Notes
 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.
 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 code 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 *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.
 
 Examples
 --------
diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 074a8aa23..132db2f1c 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -17,7 +17,7 @@ Description
 
 If no file is specified and stdin is not the terminal, or if the file name '``-``' is used, stdin will be read.
 
-The return status of ``source`` is the return status of the last job to execute. If something goes wrong while opening or reading the file, ``source`` exits with a non-zero status.
+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.
 
diff --git a/sphinx_doc_src/cmds/trap.rst b/sphinx_doc_src/cmds/trap.rst
index 770135cc5..c63dfbc60 100644
--- a/sphinx_doc_src/cmds/trap.rst
+++ b/sphinx_doc_src/cmds/trap.rst
@@ -32,7 +32,7 @@ If ``ARG`` is not present and ``-p`` has been supplied, then the trap commands a
 
 Signal names are case insensitive and the ``SIG`` prefix is optional.
 
-The return 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/sphinx_doc_src/cmds/ulimit.rst b/sphinx_doc_src/cmds/ulimit.rst
index ce03ba10e..9b4297626 100644
--- a/sphinx_doc_src/cmds/ulimit.rst
+++ b/sphinx_doc_src/cmds/ulimit.rst
@@ -40,7 +40,7 @@ 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 return 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:
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 07bba7984..9230e900d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -77,7 +77,7 @@ Arguments → Program → Return Values
 
 - the side effects take the center of the stage: they transform an **input stream of data** into an **output stream of data**. Both of these streams are usually the terminal, but they can be redirected.
 - the arguments become options or switches paired with data: the switches influence the behaviour of the command
-- the return value shrinks to an **exit code**: this exit code is 0 when the command executes normally and between 1 and 255 otherwise.
+- the return value shrinks to an **exit status**: this exit status is generally 0 when the command executes normally and between 1 and 255 otherwise.
 
 This leads to another way of programming and especially of combining commands:
 

From f11ee26aaea4287f8d5453d6a1d8b57adec40d9e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 16:35:33 +0800
Subject: [PATCH 0932/1732] docs: slight grammar improvement in source docs

[ci skip]
---
 sphinx_doc_src/cmds/source.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 132db2f1c..4f0233a08 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -38,4 +38,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 ``$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.

From 605885f85185e3c70774dd861db74507af017c71 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 16:50:52 +0800
Subject: [PATCH 0933/1732] docs: whitespace cleanup in source

Fixes some lint warnings.
---
 sphinx_doc_src/cmds/block.rst      |   9 +--
 sphinx_doc_src/cmds/nextd.rst      |   6 +-
 sphinx_doc_src/cmds/popd.rst       |   6 +-
 sphinx_doc_src/cmds/prevd.rst      |   6 +-
 sphinx_doc_src/cmds/prompt_pwd.rst |   9 +--
 sphinx_doc_src/cmds/psub.rst       |   4 +-
 sphinx_doc_src/cmds/pushd.rst      |  11 ++-
 sphinx_doc_src/cmds/read.rst       |   6 +-
 sphinx_doc_src/cmds/set.rst        |  13 ++--
 sphinx_doc_src/cmds/string.rst     | 103 +++++++++--------------------
 10 files changed, 57 insertions(+), 116 deletions(-)

diff --git a/sphinx_doc_src/cmds/block.rst b/sphinx_doc_src/cmds/block.rst
index dc786dd9a..b0f055875 100644
--- a/sphinx_doc_src/cmds/block.rst
+++ b/sphinx_doc_src/cmds/block.rst
@@ -32,24 +32,21 @@ The following parameters are available:
 Example
 -------
 
-
-
 ::
 
     # Create a function that listens for events
     function --on-event foo foo; echo 'foo fired'; end
-    
+
     # Block the delivery of events
     block -g
-    
+
     emit foo
     # No output will be produced
-    
+
     block -e
     # 'foo fired' will now be printed
 
 
-
 Notes
 -----
 
diff --git a/sphinx_doc_src/cmds/nextd.rst b/sphinx_doc_src/cmds/nextd.rst
index 05173e846..0c2457af6 100644
--- a/sphinx_doc_src/cmds/nextd.rst
+++ b/sphinx_doc_src/cmds/nextd.rst
@@ -29,13 +29,13 @@ Example
 
     cd /usr/src
     # Working directory is now /usr/src
-    
+
     cd /usr/src/fish-shell
     # Working directory is now /usr/src/fish-shell
-    
+
     prevd
     # Working directory is now /usr/src
-    
+
     nextd
     # Working directory is now /usr/src/fish-shell
 
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 96cd28eb5..29467fd47 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -19,18 +19,16 @@ You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more
 Example
 -------
 
-
-
 ::
 
     pushd /usr/src
     # Working directory is now /usr/src
     # Directory stack contains /usr/src
-    
+
     pushd /usr/src/fish-shell
     # Working directory is now /usr/src/fish-shell
     # Directory stack contains /usr/src /usr/src/fish-shell
-    
+
     popd
     # Working directory is now /usr/src
     # Directory stack contains /usr/src
diff --git a/sphinx_doc_src/cmds/prevd.rst b/sphinx_doc_src/cmds/prevd.rst
index e5b444220..0bbf57157 100644
--- a/sphinx_doc_src/cmds/prevd.rst
+++ b/sphinx_doc_src/cmds/prevd.rst
@@ -29,13 +29,13 @@ Example
 
     cd /usr/src
     # Working directory is now /usr/src
-    
+
     cd /usr/src/fish-shell
     # Working directory is now /usr/src/fish-shell
-    
+
     prevd
     # Working directory is now /usr/src
-    
+
     nextd
     # Working directory is now /usr/src/fish-shell
 
diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/sphinx_doc_src/cmds/prompt_pwd.rst
index fcd38f3f3..0ee7a0ea4 100644
--- a/sphinx_doc_src/cmds/prompt_pwd.rst
+++ b/sphinx_doc_src/cmds/prompt_pwd.rst
@@ -19,22 +19,19 @@ To change the number of characters per path component, set $fish_prompt_pwd_dir_
 Examples
 --------
 
-
-
 ::
 
     >_ cd ~/
     >_ echo $PWD
     /home/alfa
-    
+
     >_ prompt_pwd
     ~
-    
+
     >_ cd /tmp/banana/sausage/with/mustard
     >_ prompt_pwd
     /t/b/s/w/mustard
-    
+
     >_ set -g fish_prompt_pwd_dir_length 3
     >_ prompt_pwd
     /tmp/ban/sau/wit/mustard
-
diff --git a/sphinx_doc_src/cmds/psub.rst b/sphinx_doc_src/cmds/psub.rst
index d63edb3d0..dea5f2187 100644
--- a/sphinx_doc_src/cmds/psub.rst
+++ b/sphinx_doc_src/cmds/psub.rst
@@ -25,13 +25,11 @@ The following options are available:
 Example
 -------
 
-
-
 ::
 
     diff (sort a.txt | psub) (sort b.txt | psub)
     # shows the difference between the sorted versions of files ``a.txt`` and ``b.txt``.
-    
+
     source-highlight -f esc (cpp main.c | psub -f -s .c)
     # highlights ``main.c`` after preprocessing as a C source.
 
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index a4e97544d..727b11cf6 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -27,27 +27,24 @@ You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more
 Example
 -------
 
-
-
 ::
 
     pushd /usr/src
     # Working directory is now /usr/src
     # Directory stack contains /usr/src
-    
+
     pushd /usr/src/fish-shell
     # Working directory is now /usr/src/fish-shell
     # Directory stack contains /usr/src /usr/src/fish-shell
-    
+
     pushd /tmp/
     # Working directory is now /tmp
     # Directory stack contains /tmp /usr/src /usr/src/fish-shell
-    
+
     pushd +1
     # Working directory is now /usr/src
     # Directory stack contains /usr/src /usr/src/fish-shell /tmp
-    
+
     popd
     # Working directory is now /usr/src/fish-shell
     # Directory stack contains /usr/src/fish-shell /tmp
-
diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index 16568c0ae..1bed7993c 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -89,16 +89,14 @@ The following code stores the value 'hello' in the shell variable ``$foo``.
 ::
 
     echo hello|read foo
-    
+
     # This is a neat way to handle command output by-line:
     printf '%s\n' line1 line2 line3 line4 | while read -l foo
                       echo "This is another line: $foo"
                   end
-    
+
     # Delimiters given via "-d" are taken as one string
     echo a==b==c | read -d == -l a b c
     echo $a # a
     echo $b # b
     echo $c # c
-    
-
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index fe5aab282..068642ab5 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -96,29 +96,28 @@ Examples
 
     # Prints all global, exported variables.
     set -xg
-    
+
     # Sets the value of the variable $foo to be 'hi'.
     set foo hi
-    
+
     # Appends the value "there" to the variable $foo.
     set -a foo there
-    
+
     # Does the same thing as the previous two commands the way it would be done pre-fish 3.0.
     set foo hi
     set foo $foo there
-    
+
     # Removes the variable $smurf
     set -e smurf
-    
+
     # Changes the fourth element of the $PATH list to ~/bin
     set PATH[4] ~/bin
-    
+
     # Outputs the path to Python if ``type -p`` returns true.
     if set python_path (type -p python)
         echo "Python is at $python_path"
     end
 
-
 Notes
 -----
 
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 16478d5a8..83df2e2b3 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -129,7 +129,7 @@ Exit status: 0 if at least one match was found, or 1 otherwise.
 -------------------
 
 ``string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [(-N | --no-newline)] [(-q | --quiet)] [STRING...]``
-  
+
 ``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.
 
 "replace" subcommand
@@ -162,7 +162,7 @@ See also ``read --delimiter``.
 -------------------
 
 ``string split0 [(-m | --max) MAX] [(-n | --no-empty)] [(-q | --quiet)] [(-r | --right)] [STRING...]``
-  
+
 ``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.
@@ -171,14 +171,14 @@ See also ``read --delimiter``.
 ----------------
 
 ``string sub [(-s | --start) START] [(-l | --length) LENGTH] [(-q | --quiet)] [STRING...]``
-  
+
 ``string sub`` prints a substring of each string argument. The start of the substring can be specified with ``-s`` or ``--start`` 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 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.
 
 "trim" subcommand
 -----------------
 
 ``string trim [(-l | --left)] [(-r | --right)] [(-c | --chars CHARS)] [(-q | --quiet)] [STRING...]``
-  
+
 ``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.
 
 "upper" subcommand
@@ -261,89 +261,66 @@ Like ``sed``\ s `s/` command, ``string replace`` still prints strings that don't
 Examples
 --------
 
-
-
 ::
 
     >_ string length 'hello, world'
     12
-    
+
     >_ set str foo
     >_ string length -q $str; echo $status
     0
     # Equivalent to test -n $str
 
-
-
-
 ::
 
     >_ string sub --length 2 abcde
     ab
-    
+
     >_ string sub -s 2 -l 2 abcde
     bc
-    
+
     >_ string sub --start=-2 abcde
     de
 
-
-
-
 ::
 
     >_ string split . example.com
     example
     com
-    
+
     >_ string split -r -m1 / /usr/local/bin/fish
     /usr/local/bin
     fish
-    
+
     >_ string split '' abc
     a
     b
     c
 
-
-
-
 ::
 
     >_ seq 3 | string join ...
     1...2...3
 
-
-
-
 ::
 
     >_ string trim ' abc  '
     abc
-    
+
     >_ string trim --right --chars=yz xyzzy zany
     x
     zan
 
-
-
-
 ::
 
     >_ echo \\x07 | string escape
     cg
 
-
-
-
 ::
 
     >_ string escape --style=var 'a1 b2'\\u6161
     a1_20b2__c_E6_85_A1
 
-
-
-
 ::
 
     >_ echo \"(echo one\ntwo\nthree | string collect)\"
@@ -351,7 +328,7 @@ Examples
     two
     three
     "
-    
+
     >_ echo \"(echo one\ntwo\nthree | string collect -N)\"
     "one
     two
@@ -361,49 +338,42 @@ Examples
 Match Glob Examples
 -------------------
 
-
-
 ::
 
     >_ string match '?' a
     a
-    
+
     >_ string match 'a*b' axxb
     axxb
-    
+
     >_ string match -i 'a??B' Axxb
     Axxb
-    
+
     >_ echo 'ok?' | string match '*\\?'
     ok?
-    
+
     # Note that only the second STRING will match here.
     >_ string match 'foo' 'foo1' 'foo' 'foo2'
     foo
-    
+
     >_ string match -e 'foo' 'foo1' 'foo' 'foo2'
     foo1
     foo
     foo2
-    
-    
+
     >_ string match 'foo?' 'foo1' 'foo' 'foo2'
     foo1
     foo
     foo2
-    
-
 
 Match Regex Examples
 --------------------
 
-
-
 ::
 
     >_ string match -r 'cat|dog|fish' 'nice dog'
     dog
-    
+
     >_ string match -r -v "c.*[12]" {cat,dog}(seq 1 4)
     dog1
     dog2
@@ -411,99 +381,86 @@ Match Regex Examples
     dog3
     cat4
     dog4
-    
+
     >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56
     2:34:56
     2
     34
     56
-    
+
     >_ string match -r '^(\\w{{2,4}})\\g1$' papa mud murmur
     papa
     pa
     murmur
     mur
-    
+
     >_ string match -r -a -n at ratatat
     2 2
     4 2
     6 2
-    
+
     >_ string match -r -i '0x[0-9a-f]{{1,8}}' 'int magic = 0xBadC0de;'
     0xBadC0de
 
-
 NUL Delimited Examples
 ----------------------
 
-
-
 ::
 
     >_ # Count files in a directory, without being confused by newlines.
     >_ count (find . -print0 | string split0)
     42
-    
+
     >_ # Sort a list of elements which may contain newlines
     >_ set foo beta alpha\\ngamma
     >_ set foo (string join0 $foo | sort -z | string split0)
     >_ string escape $foo[1]
     alpha\\ngamma
 
-
 Replace Literal Examples
 ------------------------
 
-
-
 ::
 
     >_ string replace is was 'blue is my favorite'
     blue was my favorite
-    
+
     >_ string replace 3rd last 1st 2nd 3rd
     1st
     2nd
     last
-    
+
     >_ string replace -a ' ' _ 'spaces to underscores'
     spaces_to_underscores
 
-
 Replace Regex Examples
 ----------------------
 
-
-
 ::
 
     >_ string replace -r -a '[^\\d.]+' ' ' '0 one two 3.14 four 5x'
     0 3.14 5
-    
+
     >_ string replace -r '(\\w+)\\s+(\\w+)' '$2 $1 $$' 'left right'
     right left $
-    
+
     >_ string replace -r '\\s*newline\\s*' '\\n' 'put a newline here'
     put a
     here
 
-
 Repeat Examples
 ---------------
 
-
-
 ::
 
     >_ string repeat -n 2 'foo '
     foo foo
-    
+
     >_ echo foo | string repeat -n 2
     foofoo
-    
+
     >_ string repeat -n 2 -m 5 'foo'
     foofo
-    
+
     >_ string repeat -m 5 'foo'
     foofo
-

From c93c66f76b42ad074c0d2c46f43130d3045a53b6 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 17:31:47 +0800
Subject: [PATCH 0934/1732] docs: fix formatting in prompt_pwd manual

---
 sphinx_doc_src/cmds/prompt_pwd.rst | 4 ++--
 sphinx_doc_src/cmds/suspend.rst    | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/sphinx_doc_src/cmds/prompt_pwd.rst
index 0ee7a0ea4..9845c01fd 100644
--- a/sphinx_doc_src/cmds/prompt_pwd.rst
+++ b/sphinx_doc_src/cmds/prompt_pwd.rst
@@ -12,9 +12,9 @@ prompt_pwd
 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.
+``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, set $fish_prompt_pwd_dir_length to the number of characters. Setting it to 0 or an invalid value will disable shortening entirely.
+To change the number of characters per path component, set ``$fish_prompt_pwd_dir_length`` to the number of characters. Setting it to 0 or an invalid value will disable shortening entirely.
 
 Examples
 --------
diff --git a/sphinx_doc_src/cmds/suspend.rst b/sphinx_doc_src/cmds/suspend.rst
index 5c8c69a47..c43c9d3c2 100644
--- a/sphinx_doc_src/cmds/suspend.rst
+++ b/sphinx_doc_src/cmds/suspend.rst
@@ -12,9 +12,4 @@ suspend [--force]
 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.
\ No newline at end of file
+``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.

From 02d82dcf850c5be0f1857339cb920a89a6f1c84f Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 17:59:04 +0800
Subject: [PATCH 0935/1732] docs: update all command synopsis formatting

Adds synopses for those commands missing them.

Moves all synopsis sections to code blocks. This improves the appearance, although highlighting as
fish code may not be the ideal appearance.
---
 sphinx_doc_src/cmds/abbr.rst                  | 14 ++---
 sphinx_doc_src/cmds/alias.rst                 |  8 +--
 sphinx_doc_src/cmds/and.rst                   |  4 +-
 sphinx_doc_src/cmds/argparse.rst              |  4 +-
 sphinx_doc_src/cmds/begin.rst                 |  4 +-
 sphinx_doc_src/cmds/bg.rst                    |  3 +-
 sphinx_doc_src/cmds/bind.rst                  | 18 +++----
 sphinx_doc_src/cmds/block.rst                 |  4 +-
 sphinx_doc_src/cmds/break.rst                 |  4 +-
 sphinx_doc_src/cmds/breakpoint.rst            |  4 +-
 sphinx_doc_src/cmds/builtin.rst               |  5 +-
 sphinx_doc_src/cmds/case.rst                  |  6 +--
 sphinx_doc_src/cmds/cd.rst                    |  3 +-
 sphinx_doc_src/cmds/cdh.rst                   |  5 +-
 sphinx_doc_src/cmds/command.rst               |  3 +-
 sphinx_doc_src/cmds/commandline.rst           |  3 +-
 sphinx_doc_src/cmds/complete.rst              |  1 -
 sphinx_doc_src/cmds/contains.rst              |  3 +-
 sphinx_doc_src/cmds/continue.rst              |  3 +-
 sphinx_doc_src/cmds/count.rst                 |  7 +--
 sphinx_doc_src/cmds/dirh.rst                  |  3 +-
 sphinx_doc_src/cmds/dirs.rst                  |  5 +-
 sphinx_doc_src/cmds/disown.rst                |  3 +-
 sphinx_doc_src/cmds/echo.rst                  |  3 +-
 sphinx_doc_src/cmds/else.rst                  |  3 +-
 sphinx_doc_src/cmds/emit.rst                  |  3 +-
 sphinx_doc_src/cmds/end.rst                   | 11 ++--
 sphinx_doc_src/cmds/eval.rst                  |  4 +-
 sphinx_doc_src/cmds/exec.rst                  |  3 +-
 sphinx_doc_src/cmds/exit.rst                  |  3 +-
 sphinx_doc_src/cmds/false.rst                 |  3 +-
 sphinx_doc_src/cmds/fg.rst                    |  3 +-
 sphinx_doc_src/cmds/fish.rst                  |  3 +-
 sphinx_doc_src/cmds/fish_config.rst           |  6 +++
 sphinx_doc_src/cmds/fish_git_prompt.rst       |  9 ++++
 sphinx_doc_src/cmds/fish_hg_prompt.rst        |  9 ++++
 sphinx_doc_src/cmds/fish_indent.rst           |  4 +-
 sphinx_doc_src/cmds/fish_key_reader.rst       |  3 +-
 sphinx_doc_src/cmds/fish_mode_prompt.rst      | 10 +++-
 sphinx_doc_src/cmds/fish_svn_prompt.rst       |  9 ++++
 .../cmds/fish_update_completions.rst          |  6 +++
 sphinx_doc_src/cmds/fish_vcs_prompt.rst       |  9 ++++
 sphinx_doc_src/cmds/for.rst                   |  3 +-
 sphinx_doc_src/cmds/funced.rst                |  3 +-
 sphinx_doc_src/cmds/funcsave.rst              |  4 +-
 sphinx_doc_src/cmds/function.rst              |  4 +-
 sphinx_doc_src/cmds/functions.rst             | 11 ++--
 sphinx_doc_src/cmds/help.rst                  |  3 +-
 sphinx_doc_src/cmds/history.rst               | 13 ++---
 sphinx_doc_src/cmds/if.rst                    |  9 ++--
 sphinx_doc_src/cmds/isatty.rst                |  3 +-
 sphinx_doc_src/cmds/jobs.rst                  |  4 +-
 sphinx_doc_src/cmds/math.rst                  |  4 +-
 sphinx_doc_src/cmds/nextd.rst                 |  4 +-
 sphinx_doc_src/cmds/not.rst                   |  4 +-
 sphinx_doc_src/cmds/open.rst                  |  4 +-
 sphinx_doc_src/cmds/or.rst                    |  3 +-
 sphinx_doc_src/cmds/popd.rst                  |  4 +-
 sphinx_doc_src/cmds/prevd.rst                 |  3 +-
 sphinx_doc_src/cmds/printf.rst                |  3 +-
 sphinx_doc_src/cmds/prompt_pwd.rst            |  5 +-
 sphinx_doc_src/cmds/psub.rst                  |  3 +-
 sphinx_doc_src/cmds/pushd.rst                 |  3 +-
 sphinx_doc_src/cmds/pwd.rst                   |  4 +-
 sphinx_doc_src/cmds/random.rst                | 11 ++--
 sphinx_doc_src/cmds/read.rst                  |  3 +-
 sphinx_doc_src/cmds/realpath.rst              |  3 +-
 sphinx_doc_src/cmds/return.rst                |  3 +-
 sphinx_doc_src/cmds/set.rst                   | 15 +++---
 sphinx_doc_src/cmds/set_color.rst             |  3 +-
 sphinx_doc_src/cmds/source.rst                |  6 ++-
 sphinx_doc_src/cmds/status.rst                | 54 +++++++------------
 sphinx_doc_src/cmds/string.rst                | 45 ++++++----------
 sphinx_doc_src/cmds/suspend.rst               |  3 +-
 sphinx_doc_src/cmds/switch.rst                |  3 +-
 sphinx_doc_src/cmds/test.rst                  |  6 ++-
 sphinx_doc_src/cmds/trap.rst                  |  3 +-
 sphinx_doc_src/cmds/true.rst                  |  4 +-
 sphinx_doc_src/cmds/type.rst                  |  4 +-
 sphinx_doc_src/cmds/ulimit.rst                |  4 +-
 sphinx_doc_src/cmds/umask.rst                 |  4 +-
 sphinx_doc_src/cmds/vared.rst                 |  3 +-
 sphinx_doc_src/cmds/wait.rst                  |  3 +-
 sphinx_doc_src/cmds/while.rst                 |  4 +-
 84 files changed, 313 insertions(+), 193 deletions(-)

diff --git a/sphinx_doc_src/cmds/abbr.rst b/sphinx_doc_src/cmds/abbr.rst
index 638ad7b93..fd9a342d9 100644
--- a/sphinx_doc_src/cmds/abbr.rst
+++ b/sphinx_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...
+::
+
+    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/sphinx_doc_src/cmds/alias.rst b/sphinx_doc_src/cmds/alias.rst
index 0ed7988e9..e9d6adaae 100644
--- a/sphinx_doc_src/cmds/alias.rst
+++ b/sphinx_doc_src/cmds/alias.rst
@@ -6,9 +6,11 @@ alias - create a function
 Synopsis
 --------
 
-alias
-alias [OPTIONS] NAME DEFINITION
-alias [OPTIONS] NAME=DEFINITION
+::
+
+    alias
+    alias [OPTIONS] NAME DEFINITION
+    alias [OPTIONS] NAME=DEFINITION
 
 
 Description
diff --git a/sphinx_doc_src/cmds/and.rst b/sphinx_doc_src/cmds/and.rst
index a0c1070f2..7fef3296f 100644
--- a/sphinx_doc_src/cmds/and.rst
+++ b/sphinx_doc_src/cmds/and.rst
@@ -6,7 +6,9 @@ and - conditionally execute a command
 Synopsis
 --------
 
-COMMAND1; and COMMAND2
+::
+
+    COMMAND1; and COMMAND2
 
 
 Description
diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index a27ae1a0d..61e6853c2 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_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...]
+::
+
+    argparse [OPTIONS] OPTION_SPEC... -- [ARG...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/begin.rst b/sphinx_doc_src/cmds/begin.rst
index b903b7408..542e00294 100644
--- a/sphinx_doc_src/cmds/begin.rst
+++ b/sphinx_doc_src/cmds/begin.rst
@@ -6,7 +6,9 @@ begin - start a new block of code
 Synopsis
 --------
 
-begin; [COMMANDS...;] end
+::
+
+    begin; [COMMANDS...;] end
 
 
 Description
diff --git a/sphinx_doc_src/cmds/bg.rst b/sphinx_doc_src/cmds/bg.rst
index 2c5da16fe..d40efc573 100644
--- a/sphinx_doc_src/cmds/bg.rst
+++ b/sphinx_doc_src/cmds/bg.rst
@@ -6,8 +6,9 @@ bg - send jobs to background
 Synopsis
 --------
 
-bg [PID...]
+::
 
+    bg [PID...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 62fa5cd9b..eab4ca094 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -6,18 +6,14 @@ bind - handle fish key bindings
 Synopsis
 --------
 
-``bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [(-s | --silent)] [(-k | --key)] SEQUENCE COMMAND [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 [SEQUENCE...])``
+::
 
+    bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [(-s | --silent)] [(-k | --key)] SEQUENCE COMMAND [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 [SEQUENCE...])
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/block.rst b/sphinx_doc_src/cmds/block.rst
index b0f055875..b813ef8b2 100644
--- a/sphinx_doc_src/cmds/block.rst
+++ b/sphinx_doc_src/cmds/block.rst
@@ -6,7 +6,9 @@ block - temporarily block delivery of events
 Synopsis
 --------
 
-block [OPTIONS...]
+::
+
+    block [OPTIONS...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/break.rst b/sphinx_doc_src/cmds/break.rst
index 82bc2797d..7acfff689 100644
--- a/sphinx_doc_src/cmds/break.rst
+++ b/sphinx_doc_src/cmds/break.rst
@@ -6,7 +6,9 @@ break - stop the current inner loop
 Synopsis
 --------
 
-LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
+::
+
+    LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 
 
 Description
diff --git a/sphinx_doc_src/cmds/breakpoint.rst b/sphinx_doc_src/cmds/breakpoint.rst
index c51d2fa1c..aa465be6a 100644
--- a/sphinx_doc_src/cmds/breakpoint.rst
+++ b/sphinx_doc_src/cmds/breakpoint.rst
@@ -6,7 +6,9 @@ breakpoint - Launch debug mode
 Synopsis
 --------
 
-breakpoint
+::
+
+    breakpoint
 
 
 Description
diff --git a/sphinx_doc_src/cmds/builtin.rst b/sphinx_doc_src/cmds/builtin.rst
index 8649961cb..b802ac61a 100644
--- a/sphinx_doc_src/cmds/builtin.rst
+++ b/sphinx_doc_src/cmds/builtin.rst
@@ -6,9 +6,10 @@ builtin - run a builtin command
 Synopsis
 --------
 
-builtin [OPTIONS...] BUILTINNAME
-builtin --query BUILTINNAMES...
+::
 
+    builtin [OPTIONS...] BUILTINNAME
+    builtin --query BUILTINNAMES...
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/case.rst b/sphinx_doc_src/cmds/case.rst
index a5f0c85ae..155022c6b 100644
--- a/sphinx_doc_src/cmds/case.rst
+++ b/sphinx_doc_src/cmds/case.rst
@@ -6,8 +6,9 @@ case - conditionally execute a block of commands
 Synopsis
 --------
 
-switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
+::
 
+    switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 
 Description
 -----------
@@ -20,14 +21,11 @@ Note that fish does not fall through on case statements. Only the first matching
 
 Note that command substitutions in a case statement will be evaluated even if its body is not taken. All substitutions, including command substitutions, must be performed before the value can be compared against the parameter.
 
-
 Example
 -------
 
 Say \$animal contains the name of an animal. Then this code would classify it:
 
-
-
 ::
 
     switch $animal
diff --git a/sphinx_doc_src/cmds/cd.rst b/sphinx_doc_src/cmds/cd.rst
index 404a5fce6..f6d4491a2 100644
--- a/sphinx_doc_src/cmds/cd.rst
+++ b/sphinx_doc_src/cmds/cd.rst
@@ -6,8 +6,9 @@ cd - change directory
 Synopsis
 --------
 
-cd [DIRECTORY]
+::
 
+    cd [DIRECTORY]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/cdh.rst b/sphinx_doc_src/cmds/cdh.rst
index c1390a662..84ba35e1e 100644
--- a/sphinx_doc_src/cmds/cdh.rst
+++ b/sphinx_doc_src/cmds/cdh.rst
@@ -3,11 +3,12 @@
 cdh - change to a recently visited directory
 ============================================
 
-
 Synopsis
 --------
 
-cdh [ directory ]
+::
+
+    cdh [ directory ]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/command.rst b/sphinx_doc_src/cmds/command.rst
index 8ff1a6eb1..b1df173fc 100644
--- a/sphinx_doc_src/cmds/command.rst
+++ b/sphinx_doc_src/cmds/command.rst
@@ -6,8 +6,9 @@ command - run a program
 Synopsis
 --------
 
-command [OPTIONS] COMMANDNAME [ARGS...]
+::
 
+    command [OPTIONS] COMMANDNAME [ARGS...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/commandline.rst b/sphinx_doc_src/cmds/commandline.rst
index ee012beff..e04459063 100644
--- a/sphinx_doc_src/cmds/commandline.rst
+++ b/sphinx_doc_src/cmds/commandline.rst
@@ -6,8 +6,9 @@ commandline - set or get the current command line buffer
 Synopsis
 --------
 
-commandline [OPTIONS] [CMD]
+::
 
+    commandline [OPTIONS] [CMD]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index 09a402987..67ba062b3 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -24,7 +24,6 @@ Synopsis
           [( -d | --description ) DESCRIPTION]
   complete ( -C[STRING] | --do-complete[=STRING] )
 
-
 Description
 -----------
 
diff --git a/sphinx_doc_src/cmds/contains.rst b/sphinx_doc_src/cmds/contains.rst
index 32b0354f4..71db0f9fc 100644
--- a/sphinx_doc_src/cmds/contains.rst
+++ b/sphinx_doc_src/cmds/contains.rst
@@ -6,8 +6,9 @@ contains - test if a word is present in a list
 Synopsis
 --------
 
-contains [OPTIONS] KEY [VALUES...]
+::
 
+    contains [OPTIONS] KEY [VALUES...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/continue.rst b/sphinx_doc_src/cmds/continue.rst
index bef361bbc..f870edcec 100644
--- a/sphinx_doc_src/cmds/continue.rst
+++ b/sphinx_doc_src/cmds/continue.rst
@@ -6,8 +6,9 @@ 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/sphinx_doc_src/cmds/count.rst b/sphinx_doc_src/cmds/count.rst
index 150700313..4a1ff1948 100644
--- a/sphinx_doc_src/cmds/count.rst
+++ b/sphinx_doc_src/cmds/count.rst
@@ -6,10 +6,11 @@ count - count the number of elements of a list
 Synopsis
 --------
 
-count $VARIABLE
-COMMAND | count
-count < FILE
+::
 
+    count $VARIABLE
+    COMMAND | count
+    count < FILE
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/dirh.rst b/sphinx_doc_src/cmds/dirh.rst
index 7dd874b7b..449d24878 100644
--- a/sphinx_doc_src/cmds/dirh.rst
+++ b/sphinx_doc_src/cmds/dirh.rst
@@ -6,8 +6,9 @@ dirh - print directory history
 Synopsis
 --------
 
-dirh
+::
 
+    dirh
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/dirs.rst b/sphinx_doc_src/cmds/dirs.rst
index 286f2f679..1ddabb4e8 100644
--- a/sphinx_doc_src/cmds/dirs.rst
+++ b/sphinx_doc_src/cmds/dirs.rst
@@ -6,9 +6,10 @@ dirs - print directory stack
 Synopsis
 --------
 
-dirs
-dirs -c
+::
 
+    dirs
+    dirs -c
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index f423b4563..575b1ac86 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -6,8 +6,9 @@ disown - remove a process from the list of jobs
 Synopsis
 --------
 
-``disown [ PID ... ]``
+::
 
+    disown [ PID ... ]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/echo.rst b/sphinx_doc_src/cmds/echo.rst
index 003761187..6f8d82d19 100644
--- a/sphinx_doc_src/cmds/echo.rst
+++ b/sphinx_doc_src/cmds/echo.rst
@@ -6,8 +6,9 @@ echo - display a line of text
 Synopsis
 --------
 
-echo [OPTIONS] [STRING]
+::
 
+    echo [OPTIONS] [STRING]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/else.rst b/sphinx_doc_src/cmds/else.rst
index bfda1527e..fb1622488 100644
--- a/sphinx_doc_src/cmds/else.rst
+++ b/sphinx_doc_src/cmds/else.rst
@@ -6,8 +6,9 @@ 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/sphinx_doc_src/cmds/emit.rst b/sphinx_doc_src/cmds/emit.rst
index 85dbc2a5e..0e00e8e87 100644
--- a/sphinx_doc_src/cmds/emit.rst
+++ b/sphinx_doc_src/cmds/emit.rst
@@ -6,8 +6,9 @@ emit - Emit a generic event
 Synopsis
 --------
 
-emit EVENT_NAME [ARGUMENTS...]
+::
 
+    emit EVENT_NAME [ARGUMENTS...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/end.rst b/sphinx_doc_src/cmds/end.rst
index 9da25489f..286223ed4 100644
--- a/sphinx_doc_src/cmds/end.rst
+++ b/sphinx_doc_src/cmds/end.rst
@@ -6,12 +6,13 @@ end - end a block of commands.
 Synopsis
 --------
 
-begin; [COMMANDS...] end
-if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
-while CONDITION; COMMANDS...; end
-for VARNAME in [VALUES...]; COMMANDS...; end
-switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
+::
 
+    begin; [COMMANDS...] end
+    if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
+    while CONDITION; COMMANDS...; end
+    for VARNAME in [VALUES...]; COMMANDS...; end
+    switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/eval.rst b/sphinx_doc_src/cmds/eval.rst
index b59fb5b14..e6fdae17f 100644
--- a/sphinx_doc_src/cmds/eval.rst
+++ b/sphinx_doc_src/cmds/eval.rst
@@ -6,7 +6,9 @@ eval - evaluate the specified commands
 Synopsis
 --------
 
-eval [COMMANDS...]
+::
+
+    eval [COMMANDS...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/exec.rst b/sphinx_doc_src/cmds/exec.rst
index 7ad7b422d..37b7d9298 100644
--- a/sphinx_doc_src/cmds/exec.rst
+++ b/sphinx_doc_src/cmds/exec.rst
@@ -6,8 +6,9 @@ exec - execute command in current process
 Synopsis
 --------
 
-exec COMMAND [OPTIONS...]
+::
 
+    exec COMMAND [OPTIONS...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/exit.rst b/sphinx_doc_src/cmds/exit.rst
index d44ccd75f..47df52a75 100644
--- a/sphinx_doc_src/cmds/exit.rst
+++ b/sphinx_doc_src/cmds/exit.rst
@@ -6,8 +6,9 @@ exit - exit the shell
 Synopsis
 --------
 
-exit [STATUS]
+::
 
+    exit [STATUS]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/false.rst b/sphinx_doc_src/cmds/false.rst
index 67fd17a22..e4b1cf326 100644
--- a/sphinx_doc_src/cmds/false.rst
+++ b/sphinx_doc_src/cmds/false.rst
@@ -6,8 +6,9 @@ false - return an unsuccessful result
 Synopsis
 --------
 
-false
+::
 
+    false
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fg.rst b/sphinx_doc_src/cmds/fg.rst
index 88a7b1aca..3cbb4acf2 100644
--- a/sphinx_doc_src/cmds/fg.rst
+++ b/sphinx_doc_src/cmds/fg.rst
@@ -6,8 +6,9 @@ fg - bring job to foreground
 Synopsis
 --------
 
-fg [PID]
+::
 
+    fg [PID]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index b33aa4696..3ea2bfc30 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -6,8 +6,9 @@ fish - the friendly interactive shell
 Synopsis
 --------
 
-fish [OPTIONS] [-c command] [FILE [ARGUMENTS...]]
+::
 
+    fish [OPTIONS] [-c command] [FILE [ARGUMENTS...]]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fish_config.rst b/sphinx_doc_src/cmds/fish_config.rst
index 7b2c57b76..c5a372c58 100644
--- a/sphinx_doc_src/cmds/fish_config.rst
+++ b/sphinx_doc_src/cmds/fish_config.rst
@@ -3,6 +3,12 @@
 fish_config - start the web-based configuration interface
 =========================================================
 
+Synopsis
+--------
+
+::
+
+    fish_config [TAB]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/sphinx_doc_src/cmds/fish_git_prompt.rst
index cbf3bddd5..cd6723bfd 100644
--- a/sphinx_doc_src/cmds/fish_git_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_git_prompt.rst
@@ -3,6 +3,15 @@
 fish_git_prompt - output git information for use in a prompt
 ============================================================
 
+Synopsis
+--------
+
+::
+
+     function fish_prompt
+          echo -n (pwd)(fish_git_prompt) '$ '
+     end
+
 Description
 -----------
 
diff --git a/sphinx_doc_src/cmds/fish_hg_prompt.rst b/sphinx_doc_src/cmds/fish_hg_prompt.rst
index c91582eac..06cbea5ef 100644
--- a/sphinx_doc_src/cmds/fish_hg_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_hg_prompt.rst
@@ -3,6 +3,15 @@
 fish_hg_prompt - output Mercurial information for use in a prompt
 =================================================================
 
+Synopsis
+--------
+
+::
+
+     function fish_prompt
+          echo -n (pwd)(fish_hg_prompt) '$ '
+     end
+
 Description
 -----------
 
diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/sphinx_doc_src/cmds/fish_indent.rst
index 73919a5b6..74be5d152 100644
--- a/sphinx_doc_src/cmds/fish_indent.rst
+++ b/sphinx_doc_src/cmds/fish_indent.rst
@@ -6,7 +6,9 @@ fish_indent - indenter and prettifier
 Synopsis
 --------
 
-fish_indent [OPTIONS] [FILE...]
+::
+
+    fish_indent [OPTIONS] [FILE...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/fish_key_reader.rst b/sphinx_doc_src/cmds/fish_key_reader.rst
index 7d5e4d3d1..20ea98c4a 100644
--- a/sphinx_doc_src/cmds/fish_key_reader.rst
+++ b/sphinx_doc_src/cmds/fish_key_reader.rst
@@ -6,8 +6,9 @@ fish_key_reader - explore what characters keyboard keys send
 Synopsis
 --------
 
-fish_key_reader [OPTIONS]
+::
 
+    fish_key_reader [OPTIONS]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fish_mode_prompt.rst b/sphinx_doc_src/cmds/fish_mode_prompt.rst
index 965ff2e77..322e26316 100644
--- a/sphinx_doc_src/cmds/fish_mode_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_mode_prompt.rst
@@ -3,13 +3,21 @@
 fish_mode_prompt - define the appearance of the mode indicator
 ==============================================================
 
+Synopsis
+--------
 
+::
+
+     function fish_mode_prompt
+          echo -n "$fish_bind_mode "
+     end
 
-The fish_mode_prompt function will output the mode indicator for use in vi-mode.
 
 Description
 -----------
 
+The ``fish_mode_prompt`` function outputs the mode indicator for use in vi-mode.
+
 The default ``fish_mode_prompt`` function will output indicators about the current Vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. You can also define an empty ``fish_mode_prompt`` function to remove the Vi mode indicators. The ``$fish_bind_mode variable`` can be used to determine the current mode. It
 will be one of ``default``, ``insert``, ``replace_one``, or ``visual``.
 
diff --git a/sphinx_doc_src/cmds/fish_svn_prompt.rst b/sphinx_doc_src/cmds/fish_svn_prompt.rst
index f955c0a58..66e056b07 100644
--- a/sphinx_doc_src/cmds/fish_svn_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_svn_prompt.rst
@@ -3,6 +3,15 @@
 fish_svn_prompt - output Subversion information for use in a prompt
 ===================================================================
 
+Synopsis
+--------
+
+::
+
+     function fish_prompt
+          echo -n (pwd)(fish_svn_prompt) '$ '
+     end
+
 Description
 -----------
 
diff --git a/sphinx_doc_src/cmds/fish_update_completions.rst b/sphinx_doc_src/cmds/fish_update_completions.rst
index b3f75b585..be0b57f0b 100644
--- a/sphinx_doc_src/cmds/fish_update_completions.rst
+++ b/sphinx_doc_src/cmds/fish_update_completions.rst
@@ -3,6 +3,12 @@
 fish_update_completions - Update completions using manual pages
 ===============================================================
 
+Synopsis
+--------
+
+::
+
+     fish_update_completions
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/fish_vcs_prompt.rst b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
index 3cca83b35..e9facb769 100644
--- a/sphinx_doc_src/cmds/fish_vcs_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_vcs_prompt.rst
@@ -3,6 +3,15 @@
 fish_vcs_prompt - output version control system information for use in a prompt
 ===============================================================================
 
+Synopsis
+--------
+
+::
+
+     function fish_prompt
+          echo -n (pwd)(fish_vcs_prompt) '$ '
+     end
+
 Description
 -----------
 
diff --git a/sphinx_doc_src/cmds/for.rst b/sphinx_doc_src/cmds/for.rst
index 4c06c5912..3bd65fced 100644
--- a/sphinx_doc_src/cmds/for.rst
+++ b/sphinx_doc_src/cmds/for.rst
@@ -6,8 +6,9 @@ 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/sphinx_doc_src/cmds/funced.rst b/sphinx_doc_src/cmds/funced.rst
index df205b015..4d82e4199 100644
--- a/sphinx_doc_src/cmds/funced.rst
+++ b/sphinx_doc_src/cmds/funced.rst
@@ -6,8 +6,9 @@ funced - edit a function interactively
 Synopsis
 --------
 
-funced [OPTIONS] NAME
+::
 
+    funced [OPTIONS] NAME
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/funcsave.rst b/sphinx_doc_src/cmds/funcsave.rst
index 34f9d63a8..e290f826c 100644
--- a/sphinx_doc_src/cmds/funcsave.rst
+++ b/sphinx_doc_src/cmds/funcsave.rst
@@ -6,7 +6,9 @@ funcsave - save the definition of a function to the user's autoload directory
 Synopsis
 --------
 
-funcsave FUNCTION_NAME
+::
+
+    funcsave FUNCTION_NAME
 
 
 Description
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index 8259a65ba..173072e5c 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -6,7 +6,9 @@ function - create a function
 Synopsis
 --------
 
-function NAME [OPTIONS]; BODY; end
+::
+
+    function NAME [OPTIONS]; BODY; end
 
 
 Description
diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index 5a47852ac..adeaa7f42 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -6,12 +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 ] FUNCTIONS...
+::
 
+    functions [ -a | --all ] [ -n | --names ]
+    functions [ -D | --details ] [ -v ] FUNCTION
+    functions -c OLDNAME NEWNAME
+    functions -d DESCRIPTION FUNCTION
+    functions [ -e | -q ] FUNCTIONS...
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/help.rst b/sphinx_doc_src/cmds/help.rst
index c9f55ad06..9074e7905 100644
--- a/sphinx_doc_src/cmds/help.rst
+++ b/sphinx_doc_src/cmds/help.rst
@@ -6,8 +6,9 @@ help - display fish documentation
 Synopsis
 --------
 
-help [SECTION]
+::
 
+    help [SECTION]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/history.rst b/sphinx_doc_src/cmds/history.rst
index 68bd2c928..003ad0c92 100644
--- a/sphinx_doc_src/cmds/history.rst
+++ b/sphinx_doc_src/cmds/history.rst
@@ -6,13 +6,14 @@ history - Show and manipulate command history
 Synopsis
 --------
 
-history search [ --show-time ] [ --case-sensitive ] [ --exact | --prefix | --contains ] [ --max=n ] [ --null ] [ -R | --reverse ] [ "search string"... ]
-history delete [ --show-time ] [ --case-sensitive ] [ --exact | --prefix | --contains ] "search string"...
-history merge
-history save
-history clear
-history ( -h | --help )
+::
 
+    history search [ --show-time ] [ --case-sensitive ] [ --exact | --prefix | --contains ] [ --max=n ] [ --null ] [ -R | --reverse ] [ "search string"... ]
+    history delete [ --show-time ] [ --case-sensitive ] [ --exact | --prefix | --contains ] "search string"...
+    history merge
+    history save
+    history clear
+    history ( -h | --help )
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/if.rst b/sphinx_doc_src/cmds/if.rst
index 617f94f7d..b80b4b067 100644
--- a/sphinx_doc_src/cmds/if.rst
+++ b/sphinx_doc_src/cmds/if.rst
@@ -6,11 +6,12 @@ if - conditionally execute a command
 Synopsis
 --------
 
-if CONDITION; COMMANDS_TRUE...;
-[else if CONDITION2; COMMANDS_TRUE2...;]
-[else; COMMANDS_FALSE...;]
-end
+::
 
+    if CONDITION; COMMANDS_TRUE...;
+    [else if CONDITION2; COMMANDS_TRUE2...;]
+    [else; COMMANDS_FALSE...;]
+    end
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/isatty.rst b/sphinx_doc_src/cmds/isatty.rst
index 1d4711c36..69e940392 100644
--- a/sphinx_doc_src/cmds/isatty.rst
+++ b/sphinx_doc_src/cmds/isatty.rst
@@ -6,8 +6,9 @@ isatty - test if a file descriptor is a tty.
 Synopsis
 --------
 
-isatty [FILE DESCRIPTOR]
+::
 
+    isatty [FILE DESCRIPTOR]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/jobs.rst b/sphinx_doc_src/cmds/jobs.rst
index 6595f669b..949f10704 100644
--- a/sphinx_doc_src/cmds/jobs.rst
+++ b/sphinx_doc_src/cmds/jobs.rst
@@ -6,7 +6,9 @@ jobs - print currently running jobs
 Synopsis
 --------
 
-jobs [OPTIONS] [PID]
+::
+
+    jobs [OPTIONS] [PID]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/math.rst b/sphinx_doc_src/cmds/math.rst
index 93d5ea8e5..a69036425 100644
--- a/sphinx_doc_src/cmds/math.rst
+++ b/sphinx_doc_src/cmds/math.rst
@@ -6,7 +6,9 @@ math - Perform mathematics calculations
 Synopsis
 --------
 
-math [-sN | --scale=N] [--] EXPRESSION
+::
+
+    math [-sN | --scale=N] [--] EXPRESSION
 
 
 Description
diff --git a/sphinx_doc_src/cmds/nextd.rst b/sphinx_doc_src/cmds/nextd.rst
index 0c2457af6..f87b329ba 100644
--- a/sphinx_doc_src/cmds/nextd.rst
+++ b/sphinx_doc_src/cmds/nextd.rst
@@ -6,7 +6,9 @@ nextd - move forward through directory history
 Synopsis
 --------
 
-nextd [ -l | --list ] [POS]
+::
+
+    nextd [ -l | --list ] [POS]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/not.rst b/sphinx_doc_src/cmds/not.rst
index 55931a70b..0c13eb5de 100644
--- a/sphinx_doc_src/cmds/not.rst
+++ b/sphinx_doc_src/cmds/not.rst
@@ -6,7 +6,9 @@ not - negate the exit status of a job
 Synopsis
 --------
 
-not COMMAND [OPTIONS...]
+::
+
+    not COMMAND [OPTIONS...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/open.rst b/sphinx_doc_src/cmds/open.rst
index 092a9f57d..43dcbb2d4 100644
--- a/sphinx_doc_src/cmds/open.rst
+++ b/sphinx_doc_src/cmds/open.rst
@@ -6,7 +6,9 @@ open - open file in its default application
 Synopsis
 --------
 
-open FILES...
+::
+
+    open FILES...
 
 
 Description
diff --git a/sphinx_doc_src/cmds/or.rst b/sphinx_doc_src/cmds/or.rst
index 1cbdb8178..3184de82a 100644
--- a/sphinx_doc_src/cmds/or.rst
+++ b/sphinx_doc_src/cmds/or.rst
@@ -6,8 +6,9 @@ or - conditionally execute a command
 Synopsis
 --------
 
-COMMAND1; or COMMAND2
+::
 
+    COMMAND1; or COMMAND2
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 29467fd47..24e8f65e0 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -6,7 +6,9 @@ popd - move through directory stack
 Synopsis
 --------
 
-popd
+::
+
+    popd
 
 
 Description
diff --git a/sphinx_doc_src/cmds/prevd.rst b/sphinx_doc_src/cmds/prevd.rst
index 0bbf57157..20b83566e 100644
--- a/sphinx_doc_src/cmds/prevd.rst
+++ b/sphinx_doc_src/cmds/prevd.rst
@@ -6,8 +6,9 @@ prevd - move backward through directory history
 Synopsis
 --------
 
-prevd [ -l | --list ] [POS]
+::
 
+    prevd [ -l | --list ] [POS]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/printf.rst b/sphinx_doc_src/cmds/printf.rst
index 10a4b4821..3bc539595 100644
--- a/sphinx_doc_src/cmds/printf.rst
+++ b/sphinx_doc_src/cmds/printf.rst
@@ -6,8 +6,9 @@ printf - display text according to a format string
 Synopsis
 --------
 
-printf format [argument...]
+::
 
+    printf FORMAT [ARGUMENT ...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/sphinx_doc_src/cmds/prompt_pwd.rst
index 9845c01fd..973caf61f 100644
--- a/sphinx_doc_src/cmds/prompt_pwd.rst
+++ b/sphinx_doc_src/cmds/prompt_pwd.rst
@@ -6,8 +6,11 @@ prompt_pwd - Print pwd suitable for prompt
 Synopsis
 --------
 
-prompt_pwd
+::
 
+    function fish_prompt
+        echo -n (prompt_pwd) '$ '
+    end
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/psub.rst b/sphinx_doc_src/cmds/psub.rst
index dea5f2187..188dd6a9a 100644
--- a/sphinx_doc_src/cmds/psub.rst
+++ b/sphinx_doc_src/cmds/psub.rst
@@ -6,8 +6,9 @@ psub - perform process substitution
 Synopsis
 --------
 
-COMMAND1 ( COMMAND2 | psub [-F | --fifo] [-f | --file] [-s SUFFIX])
+::
 
+    COMMAND1 ( COMMAND2 | psub [-F | --fifo] [-f | --file] [-s SUFFIX])
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index 727b11cf6..5467510b1 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -6,8 +6,9 @@ pushd - push directory to directory stack
 Synopsis
 --------
 
-pushd [DIRECTORY]
+::
 
+    pushd [DIRECTORY]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/pwd.rst b/sphinx_doc_src/cmds/pwd.rst
index 1cf815a0f..4a16a7c05 100644
--- a/sphinx_doc_src/cmds/pwd.rst
+++ b/sphinx_doc_src/cmds/pwd.rst
@@ -6,7 +6,9 @@ pwd - output the current working directory
 Synopsis
 --------
 
-pwd
+::
+
+    pwd
 
 
 Description
diff --git a/sphinx_doc_src/cmds/random.rst b/sphinx_doc_src/cmds/random.rst
index 916aae5d0..7b912af83 100644
--- a/sphinx_doc_src/cmds/random.rst
+++ b/sphinx_doc_src/cmds/random.rst
@@ -6,12 +6,13 @@ random - generate random number
 Synopsis
 --------
 
-random
-random SEED
-random START END
-random START STEP END
-random choice [ITEMS...]
+::
 
+    random
+    random SEED
+    random START END
+    random START STEP END
+    random choice [ITEMS...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index 1bed7993c..9ab622616 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -6,8 +6,9 @@ read - read line of input into variables
 Synopsis
 --------
 
-read [OPTIONS] [VARIABLE ...]
+::
 
+    read [OPTIONS] [VARIABLE ...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/realpath.rst b/sphinx_doc_src/cmds/realpath.rst
index 2fee264de..5d594e492 100644
--- a/sphinx_doc_src/cmds/realpath.rst
+++ b/sphinx_doc_src/cmds/realpath.rst
@@ -6,8 +6,9 @@ realpath - Convert a path to an absolute path without symlinks
 Synopsis
 --------
 
-realpath path
+::
 
+    realpath PATH
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/return.rst b/sphinx_doc_src/cmds/return.rst
index 86b1202de..22823ca61 100644
--- a/sphinx_doc_src/cmds/return.rst
+++ b/sphinx_doc_src/cmds/return.rst
@@ -6,8 +6,9 @@ return - stop the current inner function
 Synopsis
 --------
 
-function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end
+::
 
+    function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index 068642ab5..f215ba0c9 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -6,14 +6,15 @@ set - display and change shell variables.
 Synopsis
 --------
 
-set [SCOPE_OPTIONS]
-set [OPTIONS] VARIABLE_NAME VALUES...
-set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
-set ( -q | --query ) [SCOPE_OPTIONS] VARIABLE_NAMES...
-set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME
-set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
-set ( -S | --show ) [VARIABLE_NAME]...
+::
 
+    set [SCOPE_OPTIONS]
+    set [OPTIONS] VARIABLE_NAME VALUES...
+    set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
+    set ( -q | --query ) [SCOPE_OPTIONS] VARIABLE_NAMES...
+    set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME
+    set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
+    set ( -S | --show ) [VARIABLE_NAME]...
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/set_color.rst b/sphinx_doc_src/cmds/set_color.rst
index 4be42f857..1653efb50 100644
--- a/sphinx_doc_src/cmds/set_color.rst
+++ b/sphinx_doc_src/cmds/set_color.rst
@@ -6,8 +6,9 @@ set_color - set the terminal color
 Synopsis
 --------
 
-set_color [OPTIONS] VALUE
+::
 
+    set_color [OPTIONS] VALUE
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 4f0233a08..facd65d3e 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -6,8 +6,10 @@ source - evaluate contents of file.
 Synopsis
 --------
 
-source FILENAME [ARGUMENTS...]
-somecommand | source
+::
+
+    source FILENAME [ARGUMENTS...]
+    somecommand | source
 
 
 Description
diff --git a/sphinx_doc_src/cmds/status.rst b/sphinx_doc_src/cmds/status.rst
index e503babdf..25fb27382 100644
--- a/sphinx_doc_src/cmds/status.rst
+++ b/sphinx_doc_src/cmds/status.rst
@@ -6,42 +6,26 @@ 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 fish-path``
-
-``status function``
-
-``status line-number``
-
-``status stack-trace``
-
-``status job-control CONTROL-TYPE``
-
-``status features``
-
-``status test-feature FEATURE``
+::
 
+    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 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/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 83df2e2b3..18484ca16 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -6,36 +6,23 @@ string - manipulate strings
 Synopsis
 --------
 
-``string collect [(-N | --no-trim-newlines)] [STRING...]``
-
-``string escape [(-n | --no-quoted)] [--style=xxx] [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 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 REPLACEMENT [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=xxx] [STRING...]``
-
-``string upper [(-q | --quiet)] [STRING...]``
+::
 
+    string collect [(-N | --no-trim-newlines)] [STRING...]
+    string escape [(-n | --no-quoted)] [--style=xxx] [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 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 REPLACEMENT [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=xxx] [STRING...]
+    string upper [(-q | --quiet)] [STRING...]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/suspend.rst b/sphinx_doc_src/cmds/suspend.rst
index c43c9d3c2..b82ce5940 100644
--- a/sphinx_doc_src/cmds/suspend.rst
+++ b/sphinx_doc_src/cmds/suspend.rst
@@ -6,8 +6,9 @@ suspend - suspend the current shell
 Synopsis
 --------
 
-suspend [--force]
+::
 
+    suspend [--force]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/switch.rst b/sphinx_doc_src/cmds/switch.rst
index 3613d68e8..ca42f7519 100644
--- a/sphinx_doc_src/cmds/switch.rst
+++ b/sphinx_doc_src/cmds/switch.rst
@@ -6,8 +6,9 @@ switch - conditionally execute a block of commands
 Synopsis
 --------
 
-switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
+::
 
+    switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/test.rst b/sphinx_doc_src/cmds/test.rst
index cbdd6e65d..a1f406276 100644
--- a/sphinx_doc_src/cmds/test.rst
+++ b/sphinx_doc_src/cmds/test.rst
@@ -6,8 +6,10 @@ test - perform tests on files and text
 Synopsis
 --------
 
-test [EXPRESSION]
-[ [EXPRESSION] ]
+::
+
+    test [EXPRESSION]
+    [ [EXPRESSION] ]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/trap.rst b/sphinx_doc_src/cmds/trap.rst
index c63dfbc60..37898497f 100644
--- a/sphinx_doc_src/cmds/trap.rst
+++ b/sphinx_doc_src/cmds/trap.rst
@@ -6,8 +6,9 @@ trap - perform an action when the shell receives a signal
 Synopsis
 --------
 
-trap [OPTIONS] [[ARG] REASON ... ]
+::
 
+    trap [OPTIONS] [[ARG] REASON ... ]
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/true.rst b/sphinx_doc_src/cmds/true.rst
index c6aa4d889..750d18cfe 100644
--- a/sphinx_doc_src/cmds/true.rst
+++ b/sphinx_doc_src/cmds/true.rst
@@ -6,7 +6,9 @@ true - return a successful result
 Synopsis
 --------
 
-true
+::
+
+    true
 
 
 Description
diff --git a/sphinx_doc_src/cmds/type.rst b/sphinx_doc_src/cmds/type.rst
index 7c6b1ae68..6a8627790 100644
--- a/sphinx_doc_src/cmds/type.rst
+++ b/sphinx_doc_src/cmds/type.rst
@@ -6,7 +6,9 @@ type - indicate how a command would be interpreted
 Synopsis
 --------
 
-type [OPTIONS] NAME [NAME ...]
+::
+
+    type [OPTIONS] NAME [NAME ...]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/ulimit.rst b/sphinx_doc_src/cmds/ulimit.rst
index 9b4297626..e99e02e6d 100644
--- a/sphinx_doc_src/cmds/ulimit.rst
+++ b/sphinx_doc_src/cmds/ulimit.rst
@@ -6,7 +6,9 @@ ulimit - set or get resource usage limits
 Synopsis
 --------
 
-ulimit [OPTIONS] [LIMIT]
+::
+
+    ulimit [OPTIONS] [LIMIT]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/umask.rst b/sphinx_doc_src/cmds/umask.rst
index bafbca7aa..4c374440d 100644
--- a/sphinx_doc_src/cmds/umask.rst
+++ b/sphinx_doc_src/cmds/umask.rst
@@ -6,7 +6,9 @@ umask - set or get the file creation mode mask
 Synopsis
 --------
 
-umask [OPTIONS] [MASK]
+::
+
+    umask [OPTIONS] [MASK]
 
 
 Description
diff --git a/sphinx_doc_src/cmds/vared.rst b/sphinx_doc_src/cmds/vared.rst
index b5caca6d0..c77599492 100644
--- a/sphinx_doc_src/cmds/vared.rst
+++ b/sphinx_doc_src/cmds/vared.rst
@@ -6,8 +6,9 @@ vared - interactively edit the value of an environment variable
 Synopsis
 --------
 
-vared VARIABLE_NAME
+::
 
+    vared VARIABLE_NAME
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/wait.rst b/sphinx_doc_src/cmds/wait.rst
index 6268d616b..12f37469a 100644
--- a/sphinx_doc_src/cmds/wait.rst
+++ b/sphinx_doc_src/cmds/wait.rst
@@ -6,8 +6,9 @@ wait - wait for jobs to complete
 Synopsis
 --------
 
-wait [-n | --any] [PID | PROCESS_NAME] ...
+::
 
+    wait [-n | --any] [PID | PROCESS_NAME] ...
 
 Description
 -----------
diff --git a/sphinx_doc_src/cmds/while.rst b/sphinx_doc_src/cmds/while.rst
index 78d3c77d5..de0c0d370 100644
--- a/sphinx_doc_src/cmds/while.rst
+++ b/sphinx_doc_src/cmds/while.rst
@@ -6,7 +6,9 @@ while - perform a command multiple times
 Synopsis
 --------
 
-while CONDITION; COMMANDS...; end
+::
+
+    while CONDITION; COMMANDS...; end
 
 
 Description

From e6d6c5c5c70b546b5cbd926f2dcdd2a1b6c7d1b5 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 20:48:22 +0800
Subject: [PATCH 0936/1732] docs: improve realpath documentation

---
 sphinx_doc_src/cmds/realpath.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/realpath.rst b/sphinx_doc_src/cmds/realpath.rst
index 5d594e492..7a567804d 100644
--- a/sphinx_doc_src/cmds/realpath.rst
+++ b/sphinx_doc_src/cmds/realpath.rst
@@ -13,6 +13,8 @@ Synopsis
 Description
 -----------
 
-This is implemented as a function and a builtin. The function will attempt to use an external realpath command if one can be found. Otherwise it falls back to the builtin.  The builtin does not support any options. It's meant to be used only by scripts which need to be portable. The builtin implementation behaves like GNU realpath when invoked without any options (which is the most common use case). In general scripts should not invoke the builtin directly. They should just use ``realpath``.
+``realpath`` resolves a path to its absolute path.
 
-If the path is invalid no translated path will be written to stdout and an error will be reported.
+fish provides a ``realpath`` builtin as a fallback for systems where there is no ``realpath`` command. fish's implementation always resolves its first argument, and does not support any options.
+
+If the operation fails, an error will be reported.

From a10547018e4e79f21a8170eebaf3a0f175e5739b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 17 Sep 2019 20:54:11 +0800
Subject: [PATCH 0937/1732] cmake: don't install realpath manpage on non-macOS
 systems

---
 cmake/Install.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 1bc71a923..d3bb7556d 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -44,10 +44,12 @@ SET(MANUALS ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/fish.1
 # Determine which man page we don't want to install.
 # On OS X, don't install a man page for open, since we defeat fish's open
 # function on OS X.
+# On other operating systems, don't install a realpath man page, as they almost all have a realpath
+# command, while macOS does not.
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   SET(CONDEMNED_PAGE "open.1")
 ELSE()
-  SET(CONDEMNED_PAGE "none")
+  SET(CONDEMNED_PAGE "realpath.1")
 ENDIF()
 
 # Define a function to help us create directories.

From 61f0756fe606ca927e5fe493cc32e746462fa72f Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 17 Sep 2019 22:00:08 -0700
Subject: [PATCH 0938/1732] builtins: Use standard builtin.h error macros more

---
 src/builtin.h               |  7 ++++---
 src/builtin_commandline.cpp |  2 +-
 src/builtin_exit.cpp        |  3 +--
 src/builtin_functions.cpp   |  6 +++---
 src/builtin_history.cpp     |  3 +--
 src/builtin_random.cpp      |  4 ++--
 src/builtin_read.cpp        |  3 +--
 src/builtin_return.cpp      |  2 +-
 src/builtin_string.cpp      | 11 +++++------
 tests/checks/argparse.fish  |  2 +-
 tests/checks/math.fish      |  4 ++--
 tests/checks/string.fish    |  6 +++---
 tests/functions.in          |  2 +-
 tests/random.err            | 16 ++++++++--------
 14 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/builtin.h b/src/builtin.h
index e5edfc2d4..ab4865057 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -52,9 +52,10 @@ enum { COMMAND_NOT_BUILTIN, BUILTIN_REGULAR, BUILTIN_FUNCTION };
 #define BUILTIN_ERR_UNKNOWN _(L"%ls: Unknown option '%ls'\n")
 
 /// Error message for unexpected args.
+#define BUILTIN_ERR_ARG_COUNT0 _(L"%ls: Expected an argument\n")
 #define BUILTIN_ERR_ARG_COUNT1 _(L"%ls: Expected %d args, got %d\n")
 #define BUILTIN_ERR_ARG_COUNT2 _(L"%ls %ls: Expected %d args, got %d\n")
-#define BUILTIN_ERR_MIN_ARG_COUNT1 _(L"%ls: Expected at least %d args, got only %d\n")
+#define BUILTIN_ERR_MIN_ARG_COUNT1 _(L"%ls: Expected at least %d args, got %d\n")
 #define BUILTIN_ERR_MAX_ARG_COUNT1 _(L"%ls: Expected at most %d args, got %d\n")
 
 /// Error message for invalid variable name.
@@ -66,8 +67,8 @@ enum { COMMAND_NOT_BUILTIN, BUILTIN_REGULAR, BUILTIN_FUNCTION };
 /// Error message when too many arguments are supplied to a builtin.
 #define BUILTIN_ERR_TOO_MANY_ARGUMENTS _(L"%ls: Too many arguments\n")
 
-/// Error message when number expected
-#define BUILTIN_ERR_NOT_NUMBER _(L"%ls: Argument '%ls' is not a number\n")
+/// Error message when integer expected
+#define BUILTIN_ERR_NOT_NUMBER _(L"%ls: Argument '%ls' is not a valid integer\n")
 
 /// Command that requires a subcommand was invoked without a recognized subcommand.
 #define BUILTIN_ERR_MISSING_SUBCMD _(L"%ls: Expected a subcommand to follow the command\n")
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 7b623e451..9e7db57e0 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -322,7 +322,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
 
     // Check for invalid switch combinations.
     if ((search_mode || line_mode || cursor_mode || paging_mode) && (argc - w.woptind > 1)) {
-        streams.err.append_format(L"%ls: Too many arguments", argv[0]);
+        streams.err.append_format(BUILTIN_ERR_TOO_MANY_ARGUMENTS, argv[0]);
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 7b375f59d..853b83cf0 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -83,8 +83,7 @@ int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     } else {
         retval = fish_wcstoi(argv[optind]);
         if (errno) {
-            streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd,
-                                      argv[optind]);
+            streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[optind]);
             builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 1edd67c3b..919b1f131 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -287,7 +287,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // Erase, desc, query, copy and list are mutually exclusive.
     bool describe = opts.description ? true : false;
     if (describe + opts.erase + opts.list + opts.query + opts.copy > 1) {
-        streams.err.append_format(_(L"%ls: Invalid combination of options\n"), cmd);
+        streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_INVALID_ARGS;
     }
@@ -319,8 +319,8 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (opts.report_metadata) {
         if (argc - optind != 1) {
-            streams.err.append_format(_(L"%ls: Expected exactly one function name for --details\n"),
-                                      cmd);
+            streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, argv[optind -1], 1,
+                                      argc - optind);
             return STATUS_INVALID_ARGS;
         }
 
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 877e88e1c..661dc50b0 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -161,8 +161,7 @@ static int parse_cmd_opts(history_cmd_opts_t &opts, int *optind,  //!OCLINT(high
             case 'n': {
                 long x = fish_wcstol(w.woptarg);
                 if (errno) {
-                    streams.err.append_format(_(L"%ls: max value '%ls' is not a valid number\n"),
-                                              cmd, w.woptarg);
+                    streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, w.woptarg);
                     return STATUS_INVALID_ARGS;
                 }
                 opts.max_items = static_cast<size_t>(x);
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index e20f22718..d6cfbb602 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -64,7 +64,7 @@ int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         auto parse_ll = [&](const wchar_t *str) {
             long long ll = fish_wcstoll(str);
             if (errno) {
-                streams.err.append_format(L"%ls: %ls is not a valid integer\n", cmd, str);
+                streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, str);
                 parse_error = true;
             }
             return ll;
@@ -72,7 +72,7 @@ int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         auto parse_ull = [&](const wchar_t *str) {
             unsigned long long ull = fish_wcstoull(str);
             if (errno) {
-                streams.err.append_format(L"%ls: %ls is not a valid integer\n", cmd, str);
+                streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, str);
                 parse_error = true;
             }
             return ull;
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 04a161b4b..94e831f2d 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -127,8 +127,7 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                         return STATUS_INVALID_ARGS;
                     }
 
-                    streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd,
-                                              w.woptarg);
+                    streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, w.woptarg);
                     builtin_print_error_trailer(parser, streams.err, cmd);
                     return STATUS_INVALID_ARGS;
                 }
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index c8873e2bc..ec6fd5739 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -82,7 +82,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     } else {
         retval = fish_wcstoi(argv[1]);
         if (errno) {
-            streams.err.append_format(_(L"%ls: Argument '%ls' must be an integer\n"), cmd, argv[1]);
+            streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[1]);
             builtin_print_error_trailer(parser, streams.err, cmd);
             return STATUS_INVALID_ARGS;
         }
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 697b288ef..3b4b17b6a 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -37,8 +37,6 @@
 
 class parser_t;
 
-#define STRING_ERR_MISSING _(L"%ls: Expected argument\n")
-
 // How many bytes we read() at once.
 // Bash uses 128 here, so we do too (see READ_CHUNK_SIZE).
 // This should be about the size of a line.
@@ -462,7 +460,7 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
             int retval = fn->second(argv, parser, streams, w, opts);
             if (retval != STATUS_CMD_OK) return retval;
         } else if (opt == ':') {
-            string_error(streams, STRING_ERR_MISSING, cmd);
+            string_error(streams, BUILTIN_ERR_MISSING, cmd, argv[w.woptind - 1]);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             string_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
@@ -477,15 +475,16 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
     // If the caller requires one or two mandatory args deal with that here.
     if (n_req_args) {
         opts->arg1 = string_get_arg_argv(optind, argv);
-        if (!opts->arg1) {
-            string_error(streams, STRING_ERR_MISSING, cmd);
+        if (!opts->arg1 && n_req_args == 1) {
+            string_error(streams, BUILTIN_ERR_ARG_COUNT0, cmd);
             return STATUS_INVALID_ARGS;
         }
     }
     if (n_req_args > 1) {
         opts->arg2 = string_get_arg_argv(optind, argv);
         if (!opts->arg2) {
-            string_error(streams, STRING_ERR_MISSING, cmd);
+            string_error(streams, BUILTIN_ERR_MIN_ARG_COUNT1, cmd, n_req_args,
+                         !!opts->arg2 + !!opts->arg1);
             return STATUS_INVALID_ARGS;
         }
     }
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index 4c25a3fbc..62352b7ae 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -29,7 +29,7 @@ argparse h-help=x
 # --max-args and --min-args work
 begin
     argparse --name min-max --min-args 1 h/help --
-    #CHECKERR: min-max: Expected at least 1 args, got only 0
+    #CHECKERR: min-max: Expected at least 1 args, got 0
     argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1
     argparse --name min-max --min-args 1 --max-args 3 h/help -- arg1 arg2
     argparse --name min-max --min-args 1 --max-args 3 h/help -- --help arg1 arg2 arg3
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index 5a278baf4..3513f26bf 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -103,9 +103,9 @@ not math '2 + 2 4'
 # CHECKERR: '2 + 2 4'
 # CHECKERR:        ^
 not math
-# CHECKERR: math: Expected at least 1 args, got only 0
+# CHECKERR: math: Expected at least 1 args, got 0
 not math -s 12
-# CHECKERR: math: Expected at least 1 args, got only 0
+# CHECKERR: math: Expected at least 1 args, got 0
 not math 2^999999
 # CHECKERR: math: Error: Result is infinite
 # CHECKERR: '2^999999'
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index 6e2ee8ba9..f1e598434 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -321,16 +321,16 @@ string repeat -m-1 "foo"; and echo "exit 0"
 # CHECKERR: string repeat: Invalid max value '-1'
 
 string repeat -n notanumber "foo"; and echo "exit 0"
-# CHECKERR: string repeat: Argument 'notanumber' is not a number
+# CHECKERR: string repeat: Argument 'notanumber' is not a valid integer
 
 string repeat -m notanumber "foo"; and echo "exit 0"
-# CHECKERR: string repeat: Argument 'notanumber' is not a number
+# CHECKERR: string repeat: Argument 'notanumber' is not a valid integer
 
 echo "stdin" | string repeat -n1 "and arg"; and echo "exit 0"
 # CHECKERR: string repeat: Too many arguments
 
 string repeat -n; and echo "exit 0"
-# CHECKERR: string repeat: Expected argument
+# CHECKERR: string repeat: Expected argument for option -n
 
 # FIXME: Also triggers usage
 # string repeat -l fakearg
diff --git a/tests/functions.in b/tests/functions.in
index 1e63ba59d..0cd4def92 100644
--- a/tests/functions.in
+++ b/tests/functions.in
@@ -8,7 +8,7 @@ end
 # ==========
 # Verify that `functions --details` works as expected when given too many args.
 set x (functions --details f1 f2 2>&1)
-if test "$x" != "functions: Expected exactly one function name for --details"
+if test "$x" != "functions --details: Expected 1 args, got 2"
     echo "Unexpected output for 'functions --details f1 f2': $x" >&2
 end
 
diff --git a/tests/random.err b/tests/random.err
index d6f1ea51d..0a9572bdf 100644
--- a/tests/random.err
+++ b/tests/random.err
@@ -1,14 +1,14 @@
-random: a is not a valid integer
-random: 18446744073709551614 is not a valid integer
+random: Argument 'a' is not a valid integer
+random: Argument '18446744073709551614' is not a valid integer
 random: Too many arguments
 random: END must be greater than START
-random: 18446744073709551614 is not a valid integer
-random: 1d is not a valid integer
-random: 1c is not a valid integer
+random: Argument '18446744073709551614' is not a valid integer
+random: Argument '1d' is not a valid integer
+random: Argument '1c' is not a valid integer
 random: END must be greater than START
-random: - is not a valid integer
-random: -1 is not a valid integer
-random: -9223372036854775807 is not a valid integer
+random: Argument '-' is not a valid integer
+random: Argument '-1' is not a valid integer
+random: Argument '-9223372036854775807' is not a valid integer
 random: STEP must be a positive integer
 random: range contains only one possible value
 random: range contains only one possible value

From 5f05d9734c47e8503ac6b28b5eb09c00bb20c31e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 17 Sep 2019 23:55:52 -0700
Subject: [PATCH 0939/1732] builtin_set_color.cpp: colorize set_color
 --print-colors

Each named color is now printed in that color, only if
hooked up to a TTY. Shouldn't affect scripts.
---
 src/builtin_set_color.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 98a74db3e..4f4a6f606 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -34,12 +34,18 @@
 class parser_t;
 
 static void print_colors(io_streams_t &streams) {
-    const wcstring_list_t result = rgb_color_t::named_color_names();
-    size_t i;
-    for (i = 0; i < result.size(); i++) {
-        streams.out.append(result.at(i));
-        streams.out.push_back(L'\n');
-    }
+    outputter_t outp;
+
+    for (wcstring color_name : rgb_color_t::named_color_names()) {
+        if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
+            rgb_color_t color = rgb_color_t(color_name);
+            outp.set_color(color, rgb_color_t::none());
+        }
+        outp.writestr(color_name.c_str());
+        outp.writech(L'\n');
+    } // conveniently, 'normal' is always the last color so we don't need to reset here
+
+    streams.out.append(str2wcstring(outp.contents()));
 }
 
 static const wchar_t *const short_options = L":b:hvoidrcu";

From 715836cb0a2ea542dee6a1c324c249a91de06471 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 18 Sep 2019 00:09:23 -0700
Subject: [PATCH 0940/1732] builtin_set_color.cpp: remove unnecessary .c_str()

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

diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 4f4a6f606..cb1bfcfdb 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -41,7 +41,7 @@ static void print_colors(io_streams_t &streams) {
             rgb_color_t color = rgb_color_t(color_name);
             outp.set_color(color, rgb_color_t::none());
         }
-        outp.writestr(color_name.c_str());
+        outp.writestr(color_name);
         outp.writech(L'\n');
     } // conveniently, 'normal' is always the last color so we don't need to reset here
 

From 22811ebcf63d3b0c35cd6acd66aa96ba4cd843ac Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 18 Sep 2019 01:31:03 -0700
Subject: [PATCH 0941/1732] Remove unused macros

Most just left behind after actual code was moved into different files.
---
 src/env.cpp          | 3 ---
 src/env_dispatch.cpp | 8 --------
 src/exec.cpp         | 3 ---
 src/input.cpp        | 2 --
 src/redirection.cpp  | 3 ---
 5 files changed, 19 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index c55a20ffa..8998c4790 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -33,9 +33,6 @@
 #include "reader.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-#define DEFAULT_TERM1 "ansi"
-#define DEFAULT_TERM2 "dumb"
-
 /// Some configuration path environment variables.
 #define FISH_DATADIR_VAR L"__fish_data_dir"
 #define FISH_SYSCONFDIR_VAR L"__fish_sysconf_dir"
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 32ed7c2cb..1fec8e7c8 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -54,14 +54,6 @@
 #define DEFAULT_TERM1 "ansi"
 #define DEFAULT_TERM2 "dumb"
 
-/// Some configuration path environment variables.
-#define FISH_DATADIR_VAR L"__fish_data_dir"
-#define FISH_SYSCONFDIR_VAR L"__fish_sysconf_dir"
-#define FISH_HELPDIR_VAR L"__fish_help_dir"
-#define FISH_BIN_DIR L"__fish_bin_dir"
-#define FISH_CONFIG_DIR L"__fish_config_dir"
-#define FISH_USER_DATA_DIR L"__fish_user_data_dir"
-
 /// List of all locale environment variable names that might trigger (re)initializing the locale
 /// subsystem.
 static const wcstring_list_t locale_variables({L"LANG", L"LANGUAGE", L"LC_ALL", L"LC_ADDRESS",
diff --git a/src/exec.cpp b/src/exec.cpp
index 3ee725c94..48c39c7ea 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -49,9 +49,6 @@
 /// File descriptor redirection error message.
 #define FD_ERROR _(L"An error occurred while redirecting file descriptor %d")
 
-/// File descriptor redirection error message.
-#define WRITE_ERROR _(L"An error occurred while writing output")
-
 /// File redirection error message.
 #define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
 
diff --git a/src/input.cpp b/src/input.cpp
index fe797a5cb..c1f15ae0f 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -32,8 +32,6 @@
 #include "signal.h"  // IWYU pragma: keep
 #include "wutil.h"   // IWYU pragma: keep
 
-#define MAX_INPUT_FUNCTION_ARGS 20
-
 /// A name for our own key mapping for nul.
 static const wchar_t *k_nul_mapping_name = L"nul";
 
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 5a30ea740..d442aa2e8 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -5,9 +5,6 @@
 
 #include <fcntl.h>
 
-/// File descriptor redirection error message.
-#define FD_ERROR "An error occurred while redirecting file descriptor %s"
-
 #define NOCLOB_ERROR _(L"The file '%ls' already exists")
 
 #define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")

From 8baea8b157ce7cffd020b7286c2a47bb2db56aac Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 20:42:41 +0200
Subject: [PATCH 0942/1732] Do not add a space after completion if one is
 already there

Example: type `cd --help --help`, move the cursor inside the first `--help` and press tab.
This used to add redundant spaces.
---
 src/fish_tests.cpp | 8 +++++---
 src/reader.cpp     | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index fd0f42116..5ef421ae7 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2844,8 +2844,10 @@ static void test_completion_insertions() {
 #define TEST_1_COMPLETION(a, b, c, d, e) test_1_completion(a, b, c, d, e, __LINE__)
     say(L"Testing completion insertions");
     TEST_1_COMPLETION(L"foo^", L"bar", 0, false, L"foobar ^");
-    // We really do want to insert two spaces here - otherwise it's hidden by the cursor.
-    TEST_1_COMPLETION(L"foo^ baz", L"bar", 0, false, L"foobar ^ baz");
+    // An unambiguous completion of a token that is already trailed by a space character.
+    // After completing, the cursor moves on to the next token, suggesting to the user that the
+    // current token is finished.
+    TEST_1_COMPLETION(L"foo^ baz", L"bar", 0, false, L"foobar ^baz");
     TEST_1_COMPLETION(L"'foo^", L"bar", 0, false, L"'foobar' ^");
     TEST_1_COMPLETION(L"'foo'^", L"bar", 0, false, L"'foobar' ^");
     TEST_1_COMPLETION(L"'foo\\'^", L"bar", 0, false, L"'foo\\'bar' ^");
@@ -2853,7 +2855,7 @@ static void test_completion_insertions() {
 
     // Test append only.
     TEST_1_COMPLETION(L"foo^", L"bar", 0, true, L"foobar ^");
-    TEST_1_COMPLETION(L"foo^ baz", L"bar", 0, true, L"foobar ^ baz");
+    TEST_1_COMPLETION(L"foo^ baz", L"bar", 0, true, L"foobar ^baz");
     TEST_1_COMPLETION(L"'foo^", L"bar", 0, true, L"'foobar' ^");
     TEST_1_COMPLETION(L"'foo'^", L"bar", 0, true, L"'foo'bar ^");
     TEST_1_COMPLETION(L"'foo\\'^", L"bar", 0, true, L"'foo\\'bar' ^");
diff --git a/src/reader.cpp b/src/reader.cpp
index d080be6cd..0249e7d18 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1146,6 +1146,7 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
 
     const size_t cursor_pos = *inout_cursor_pos;
     bool back_into_trailing_quote = false;
+    bool have_space_after_token = command_line[cursor_pos] == L' ';
 
     if (do_replace) {
         size_t move_cursor;
@@ -1168,7 +1169,7 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
         }
 
         if (add_space) {
-            sb.append(L" ");
+            if (!have_space_after_token) sb.append(L" ");
             move_cursor += 1;
         }
         sb.append(end);
@@ -1217,7 +1218,8 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
             // This is a quoted parameter, first print a quote.
             result.insert(new_cursor_pos++, wcstring(&quote, 1));
         }
-        result.insert(new_cursor_pos++, L" ");
+        if (!have_space_after_token) result.insert(new_cursor_pos, L" ");
+        new_cursor_pos++;
     }
     *inout_cursor_pos = new_cursor_pos;
     return result;

From ec834820f5f3b0f116c45734580ac6b3b66e08c2 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 9 Sep 2019 16:09:32 +0200
Subject: [PATCH 0943/1732] completions/git: handle 2 RM and 2 RD files

This commit makes git completions aware of files that are both staged as renamed, and have unstaged
modifications/are deleted.

__fish_git_files now potentially prints these files twice:

$ __fish_git_files renamed modified
foo   Renamed file
foo   Modified file

Fixes #6031
---
 share/completions/git.fish | 54 ++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 802a8bab3..e9bb6be7a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -180,6 +180,24 @@ function __fish_git_files
                     set -ql renamed
                     and set file (string replace -r '\t[^\t]*' '' -- "$line[10..-1]")
                     and set desc $renamed_desc
+                case '2 RM*'
+                    # Staged as renamed, with unstaged modifications (issue #6031)
+                    set -ql renamed
+                    or set -ql modified
+                    and set file (string replace -r '\t[^\t]*' '' -- "$line[10..-1]")
+                    set -ql renamed
+                    and set desc $renamed_desc
+                    set -ql modified
+                    and set --append desc $modified_desc
+                case '2 RD*'
+                    # Staged as renamed, but deleted in the worktree
+                    set -ql renamed
+                    or set -ql deleted
+                    and set file (string replace -r '\t[^\t]*' '' -- "$line[10..-1]")
+                    set -ql renamed
+                    and set desc $renamed_desc
+                    set -ql deleted
+                    and set --append desc $deleted_desc
                 case '2 .C*' '2 C.*'
                     set -ql copied
                     and set file (string replace -r '\t[^\t].*' '' -- "$line[10..-1]")
@@ -261,23 +279,25 @@ function __fish_git_files
             end
             # Only try printing if the file was selected.
             if set -q file[1]
-                # Without "-z", git sometimes _quotes_ filenames.
-                # It adds quotes around it _and_ escapes the character.
-                # e.g. `"a\\b"`.
-                # We just remove the quotes and hope it works out.
-                # If this contains newlines or tabs,
-                # there is nothing we can do, but that's a general issue with scripted completions.
-                set file (string trim -c \" -- $file)
-                # First the relative filename.
-                printf '%s\t%s\n' "$file" $desc
-                # Now from repo root.
-                # Only do this if the filename isn't a simple child,
-                # or the current token starts with ":"
-                if string match -q '../*' -- $file
-                    or string match -q ':*' -- (commandline -ct)
-                    set -l fromroot (builtin realpath -- $file 2>/dev/null)
-                    and set fromroot (string replace -- "$root/" ":/" "$fromroot")
-                    and printf '%s\t%s\n' "$fromroot" $desc
+                for d in $desc
+                    # Without "-z", git sometimes _quotes_ filenames.
+                    # It adds quotes around it _and_ escapes the character.
+                    # e.g. `"a\\b"`.
+                    # We just remove the quotes and hope it works out.
+                    # If this contains newlines or tabs,
+                    # there is nothing we can do, but that's a general issue with scripted completions.
+                    set file (string trim -c \" -- $file)
+                    # First the relative filename.
+                    printf '%s\t%s\n' "$file" $d
+                    # Now from repo root.
+                    # Only do this if the filename isn't a simple child,
+                    # or the current token starts with ":"
+                    if string match -q '../*' -- $file
+                        or string match -q ':*' -- (commandline -ct)
+                        set -l fromroot (builtin realpath -- $file 2>/dev/null)
+                        and set fromroot (string replace -- "$root/" ":/" "$fromroot")
+                        and printf '%s\t%s\n' "$fromroot" $d
+                    end
                 end
             end
         end

From eea3bd5fc3717bb81cff39082d42ea4d97c50108 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 08:51:59 +0200
Subject: [PATCH 0944/1732] completions/git: improve completion for git restore
 and git switch

- suggest relevant files for git restore
- add `-r` to require an argument for some options
---
 share/completions/git.fish | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e9bb6be7a..01f1b3049 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1448,7 +1448,7 @@ complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (c
 ### restore and switch
 # restore options
 complete -f -c git -n '__fish_git_needs_command' -a restore -d 'Restore working tree files'
-complete -f -c git -n '__fish_git_using_command restore' -s s -l source -d 'Specify the source tree used to restore the working tree'
+complete -f -c git -n '__fish_git_using_command restore' -r -s s -l source -d 'Specify the source tree used to restore the working tree' -a '(__fish_git_refs)'
 complete -f -c git -n '__fish_git_using_command restore' -s p -l patch -d 'Interactive mode'
 complete -f -c git -n '__fish_git_using_command restore' -s W -l worktree -d 'Restore working tree (default)'
 complete -f -c git -n '__fish_git_using_command restore' -s S -l staged -d 'Restore the index'
@@ -1459,11 +1459,14 @@ complete -f -c git -n '__fish_git_using_command restore' -l ignore-unmerged -d '
 complete -f -c git -n '__fish_git_using_command restore' -l ignore-skip-worktree-bits -d 'Ignore the sparse-checkout file and unconditionally restore any files in <pathspec>'
 complete -f -c git -n '__fish_git_using_command restore' -l overlay -d 'Never remove files when restoring'
 complete -f -c git -n '__fish_git_using_command restore' -l no-overlay -d 'Remove files when restoring (default)'
+complete -f -c git -n '__fish_git_using_command restore' -a '(__fish_git_files modified deleted unmerged)'
+complete -f -c git -n '__fish_git_using_command restore; and contains -- --staged (commandline -op)' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)'
+complete -f -c git -n '__fish_git_using_command restore; and __fish_contains_opt -s s source' -a '(git ls-files)'
 # switch options
 complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
-complete -k -f -c git -n '__fish_git_using_command switch; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command switch' -s c -l create -d 'Create a new branch'
-complete -f -c git -n '__fish_git_using_command switch' -s C -l force-create -d 'Force create a new branch'
+complete -k -f -c git -n '__fish_git_using_command switch' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command switch' -r -s c -l create -d 'Create a new branch'
+complete -f -c git -n '__fish_git_using_command switch' -r -s C -l force-create -d 'Force create a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment'
 complete -f -c git -n '__fish_git_using_command switch' -l guess -d 'Guess branch name from remote branch (default)'
 complete -f -c git -n '__fish_git_using_command switch' -l no-guess -d 'Do not guess branch name from remote branch'
@@ -1471,7 +1474,7 @@ complete -f -c git -n '__fish_git_using_command switch' -s f -l force -l discard
 complete -f -c git -n '__fish_git_using_command switch' -s m -l merge -d 'Merge the current branch and contents of the working tree into a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -s t -l track -d 'Track remote branch when creating a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -l no-track -d 'Do not track remote branch when creating a new branch'
-complete -f -c git -n '__fish_git_using_command switch' -l orphan -d 'Create a new orphan branch'
+complete -f -c git -n '__fish_git_using_command switch' -r -l orphan -d 'Create a new orphan branch'
 complete -f -c git -n '__fish_git_using_command switch' -l ignore-other-worktrees -d 'Force check out of the reference'
 complete -f -c git -n '__fish_git_using_command switch' -l recurse-submodules -d 'Update the work trees of submodules'
 complete -f -c git -n '__fish_git_using_command switch' -l no-recurse-submodules -d 'Do not update the work trees of submodules'

From f35e18bb9b4569910ad869d84f56865ecae65c2e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 18 Sep 2019 16:19:59 -0700
Subject: [PATCH 0945/1732] complete.cpp: don't double escape commands in
 `complete` output

The argument to --command was escaped both here and in
append_switch(), potentially producing incorrect output
---
 src/complete.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 266df99fe..512611346 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1699,8 +1699,7 @@ wcstring complete_print() {
             }
             append_format(out, L"complete%ls", modestr);
 
-            append_switch(out, e.cmd_is_path ? L"path" : L"command",
-                          escape_string(e.cmd, ESCAPE_ALL));
+            append_switch(out, e.cmd_is_path ? L"path" : L"command", e.cmd);
 
             switch (o.type) {
                 case option_type_args_only: {

From b7dd060dec894438878d2d0bb6056085f5a2c0eb Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 18 Sep 2019 23:35:16 -0700
Subject: [PATCH 0946/1732] sample prompts: use $USER instead of (whoami)

---
 share/tools/web_config/sample_prompts/pythonista.fish   | 2 +-
 share/tools/web_config/sample_prompts/screen_savvy.fish | 8 ++++----
 share/tools/web_config/sample_prompts/terlar.fish       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/pythonista.fish b/share/tools/web_config/sample_prompts/pythonista.fish
index 9529035c4..f40b7e7d9 100644
--- a/share/tools/web_config/sample_prompts/pythonista.fish
+++ b/share/tools/web_config/sample_prompts/pythonista.fish
@@ -7,7 +7,7 @@ function fish_prompt
         set -g VIRTUAL_ENV_DISABLE_PROMPT true
     end
     set_color yellow
-    printf '%s' (whoami)
+    printf '%s' $USER
     set_color normal
     printf ' at '
 
diff --git a/share/tools/web_config/sample_prompts/screen_savvy.fish b/share/tools/web_config/sample_prompts/screen_savvy.fish
index 411a55019..3679b665b 100644
--- a/share/tools/web_config/sample_prompts/screen_savvy.fish
+++ b/share/tools/web_config/sample_prompts/screen_savvy.fish
@@ -1,9 +1,9 @@
 # name: Screen Savvy
 # author: Matthias
-function fish_prompt -d "Write out the prompt"
-    if test -z $WINDOW
-        printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (prompt_hostname) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+function fish_prompt -d "Screen Savvy prompt"
+    if test -z "$WINDOW"
+        printf '%s%s@%s%s%s%s%s> ' (set_color yellow) $USER (set_color purple) (prompt_hostname) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
     else
-        printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (prompt_hostname) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+        printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) $USER (set_color purple) (prompt_hostname) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
     end
 end
diff --git a/share/tools/web_config/sample_prompts/terlar.fish b/share/tools/web_config/sample_prompts/terlar.fish
index ec1d8b5e4..5423403f3 100644
--- a/share/tools/web_config/sample_prompts/terlar.fish
+++ b/share/tools/web_config/sample_prompts/terlar.fish
@@ -6,7 +6,7 @@ function fish_prompt --description 'Write out the prompt'
 
     # User
     set_color $fish_color_user
-    echo -n (whoami)
+    echo -n $USER
     set_color normal
 
     echo -n '@'

From 3ae12ac4d3b9363fd8b6b3fa8c56da70aba71e2e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 19 Sep 2019 14:32:40 +0800
Subject: [PATCH 0947/1732] Revert "Escape separators (colon and equals) to
 improve completion"

This reverts commit f7dac82ed601135754d0c65536f79d07d83e9fae from pull
request #6059.

As discussed in #6099, this caused a regression in some completions (eg
dd).
---
 src/common.cpp     |  8 ++------
 src/common.h       |  4 +---
 src/complete.cpp   | 13 +++++--------
 src/parse_util.cpp |  3 +--
 src/reader.cpp     |  5 ++++-
 src/reader.h       |  4 ----
 6 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index ab211f731..85c8b2ce9 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -997,7 +997,6 @@ static void escape_string_script(const wchar_t *orig_in, size_t in_len, wcstring
     const bool escape_all = static_cast<bool>(flags & ESCAPE_ALL);
     const bool no_quoted = static_cast<bool>(flags & ESCAPE_NO_QUOTED);
     const bool no_tilde = static_cast<bool>(flags & ESCAPE_NO_TILDE);
-    const bool escape_separators = static_cast<bool>(flags & ESCAPE_SEPARATORS);
     const bool no_caret = feature_test(features_t::stderr_nocaret);
     const bool no_qmark = feature_test(features_t::qmark_noglob);
 
@@ -1097,12 +1096,9 @@ static void escape_string_script(const wchar_t *orig_in, size_t in_len, wcstring
                 case L';':
                 case L'"':
                 case L'%':
-                case L'~':
-                case L':':
-                case L'=': {
+                case L'~': {
                     bool char_is_normal = (c == L'~' && no_tilde) || (c == L'^' && no_caret) ||
-                                          (c == L'?' && no_qmark) ||
-                                          ((c == L':' || c == L'=') && !escape_separators);
+                                          (c == L'?' && no_qmark);
                     if (!char_is_normal) {
                         need_escape = 1;
                         if (escape_all) out += L'\\';
diff --git a/src/common.h b/src/common.h
index da3135c06..1065ac2db 100644
--- a/src/common.h
+++ b/src/common.h
@@ -134,9 +134,7 @@ enum {
     /// string.
     ESCAPE_NO_QUOTED = 1 << 1,
     /// Do not escape tildes.
-    ESCAPE_NO_TILDE = 1 << 2,
-    /// Escape colon and equal sign.
-    ESCAPE_SEPARATORS = 1 << 3,
+    ESCAPE_NO_TILDE = 1 << 2
 };
 typedef unsigned int escape_flags_t;
 
diff --git a/src/complete.cpp b/src/complete.cpp
index 512611346..b7a89f5df 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1100,7 +1100,6 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     // Squelch file descriptions per issue #254.
     if (this->type() == COMPLETE_AUTOSUGGEST || do_file) flags |= expand_flag::no_descriptions;
 
-    // Expand words separated by '=' separately, unless '=' is escaped or quoted.
     // We have the following cases:
     //
     // --foo=bar => expand just bar
@@ -1108,16 +1107,14 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
     // foo=bar => expand the whole thing, and also just bar
     //
     // We also support colon separator (#2178). If there's more than one, prefer the last one.
-    size_t sep_index = str.size();
-    do {
-        sep_index = sep_index == 0 ? wcstring::npos : str.find_last_of(L"=:", sep_index - 1);
-    } while (sep_index != wcstring::npos && is_backslashed(str, sep_index));
-    wchar_t quote = L'\0';
-    parse_util_get_parameter_info(str, str.size(), &quote, NULL, NULL);
-    bool complete_from_separator = (quote == L'\0') && (sep_index != wcstring::npos);
+    size_t sep_index = str.find_last_of(L"=:");
+    bool complete_from_separator = (sep_index != wcstring::npos);
     bool complete_from_start = !complete_from_separator || !string_prefixes_string(L"-", str);
 
     if (complete_from_separator) {
+        // FIXME: This just cuts the token,
+        // so any quoting or braces gets lost.
+        // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         std::vector<completion_t> local_completions;
         if (expand_string(sep_string, &local_completions, flags, vars, parser, NULL) ==
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 8b2df7565..9b6c987d4 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -523,8 +523,7 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
 wcstring parse_util_escape_string_with_quote(const wcstring &cmd, wchar_t quote, bool no_tilde) {
     wcstring result;
     if (quote == L'\0') {
-        escape_flags_t flags =
-            ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0) | ESCAPE_SEPARATORS;
+        escape_flags_t flags = ESCAPE_ALL | ESCAPE_NO_QUOTED | (no_tilde ? ESCAPE_NO_TILDE : 0);
         result = escape_string(cmd, flags);
     } else {
         // Here we are going to escape a string with quotes.
diff --git a/src/reader.cpp b/src/reader.cpp
index 0249e7d18..cc7dae99f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -488,6 +488,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 static volatile sig_atomic_t interrupted = 0;
 
 // Prototypes for a bunch of functions defined later on.
+static bool is_backslashed(const wcstring &str, size_t pos);
 static wchar_t unescaped_quote(const wcstring &str, size_t pos);
 
 /// Mode on startup, which we restore on exit.
@@ -2298,7 +2299,9 @@ static int can_read(int fd) {
     return select(fd + 1, &fds, 0, 0, &can_read_timeout) == 1;
 }
 
-bool is_backslashed(const wcstring &str, size_t pos) {
+/// Test if the specified character in the specified string is backslashed. pos may be at the end of
+/// the string, which indicates if there is a trailing backslash.
+static bool is_backslashed(const wcstring &str, size_t pos) {
     // note pos == str.size() is OK.
     if (pos > str.size()) return false;
 
diff --git a/src/reader.h b/src/reader.h
index cfa0c73ac..76d7a6137 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -232,8 +232,4 @@ void reader_bg_job_warning(const parser_t &parser);
 /// been executed between invocations of code.
 uint64_t reader_run_count();
 
-/// Test if the specified character in the specified string is backslashed. pos may be at the end of
-/// the string, which indicates if there is a trailing backslash.
-bool is_backslashed(const wcstring &str, size_t pos);
-
 #endif

From 3b8505bebeebd79c9cd3a3aa39a7404725db985a Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 19 Sep 2019 14:51:40 +0800
Subject: [PATCH 0948/1732] sphinx: get version number from built binary

---
 sphinx_doc_src/conf.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index f09c32c48..0313a7555 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -9,6 +9,7 @@
 import glob
 import os.path
 import pygments
+import subprocess
 from sphinx.errors import SphinxError, SphinxWarning
 
 # -- Helper functions --------------------------------------------------------
@@ -50,10 +51,14 @@ project = "fish-shell"
 copyright = "2019, fish-shell developers"
 author = "fish-shell developers"
 
-# The short X.Y version
-version = "3.1"
+# Parsing FISH-BUILD-VERSION-FILE is possible but hard to ensure that it is in the right place
+# fish_indent is guaranteed to be on PATH for the Pygments highlighter anyway
+ret = subprocess.run(('fish_indent', '--version',),
+                      stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.decode('utf-8')
 # The full version, including alpha/beta/rc tags
-release = "3.1.0"
+release = ret.strip().split(' ')[-1]
+# The short X.Y version
+version = release.rsplit('.', 1)[0]
 
 
 # -- General configuration ---------------------------------------------------

From 7302dcc12b7c03b626ef86393555fd69031f4007 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 01:46:56 -0700
Subject: [PATCH 0949/1732] complete: terser output with short options

Most of our completion scripts are written using the short options
anyhow, and this makes it less likely the output will span several
lines per command
---
 src/complete.cpp | 49 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index b7a89f5df..3e25d2cfb 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -922,9 +922,8 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         // While it may seem like first testing `path_get_path` before resorting to an env lookup
         // may be faster, path_get_path can potentially do a lot of FS/IO access, so env.get() +
         // function_exists() should still be faster.
-        head_exists =
-            head_exists || path_get_path(cmd_orig, nullptr,
-                                         vars);  // use cmd_orig here as it is potentially pathed
+        // Use cmd_orig here as it is potentially pathed.
+        head_exists = head_exists || path_get_path(cmd_orig, nullptr, vars);
     }
 
     if (!head_exists) {
@@ -1661,15 +1660,17 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
     *out_comps = completer.acquire_completions();
 }
 
-/// Print the GNU longopt style switch \c opt, and the argument \c argument to the specified
-/// stringbuffer, but only if arguemnt is non-null and longer than 0 characters.
-static void append_switch(wcstring &out, const wcstring &opt, const wcstring &argument) {
-    if (argument.empty()) return;
-
-    wcstring esc = escape_string(argument, ESCAPE_ALL);
-    append_format(out, L" --%ls %ls", opt.c_str(), esc.c_str());
+/// Print the short switch \c opt, and the argument \c arg to the specified
+/// wcstring, but only if \c argument isn't an empty string.
+static void append_switch(wcstring &out, const wchar_t opt, const wcstring arg) {
+    if (arg.empty()) return;
+    append_format(out, L" -%lc %ls", opt, escape_string(arg, ESCAPE_ALL).c_str());
+}
+static void append_switch(wcstring &out, const wchar_t opt) {
+    append_format(out, L" -%lc", opt);
 }
 
+/// Use by the bare `complete`, loaded completions are printed out as commands
 wcstring complete_print() {
     wcstring out;
     auto completion_set = s_completion_set.acquire();
@@ -1684,41 +1685,37 @@ wcstring complete_print() {
     for (const completion_entry_t &e : all_completions) {
         const option_list_t &options = e.get_options();
         for (const complete_entry_opt_t &o : options) {
-            const wchar_t *modestr = L"";
+            out.append(L"complete");
             if (o.result_mode.no_files && o.result_mode.requires_param) {
-                modestr = L" --exclusive";
+                append_switch(out, L'x');
             } else if (o.result_mode.no_files) {
-                modestr = L" --no-files";
+                append_switch(out, L'f');
             } else if (o.result_mode.force_files) {
-                modestr = L" --force-files";
+                append_switch(out, L'F');
             } else if (o.result_mode.requires_param) {
-                modestr = L" --require-parameter";
+                append_switch(out, L'r');
             }
-            append_format(out, L"complete%ls", modestr);
 
-            append_switch(out, e.cmd_is_path ? L"path" : L"command", e.cmd);
+            append_switch(out, e.cmd_is_path ? L'p' : L'c', e.cmd);
 
             switch (o.type) {
                 case option_type_args_only: {
                     break;
                 }
                 case option_type_short: {
-                    assert(!o.option.empty());  //!OCLINT(multiple unary operator)
-                    append_format(out, L" --short-option '%lc'", o.option.at(0));
+                    append_switch(out, L's', wcstring(1, o.option.at(0)));
                     break;
                 }
                 case option_type_single_long:
                 case option_type_double_long: {
-                    append_switch(
-                        out, o.type == option_type_single_long ? L"old-option" : L"long-option",
-                        o.option);
+                    append_switch(out, o.type == option_type_single_long ? L'o' : L'l', o.option);
                     break;
                 }
             }
 
-            append_switch(out, L"description", C_(o.desc));
-            append_switch(out, L"arguments", o.comp);
-            append_switch(out, L"condition", o.condition);
+            append_switch(out, L'd', C_(o.desc));
+            append_switch(out, L'a', o.comp);
+            append_switch(out, L'n', o.condition);
             out.append(L"\n");
         }
     }
@@ -1728,7 +1725,7 @@ wcstring complete_print() {
     for (const auto &entry : *locked_wrappers) {
         const wcstring &src = entry.first;
         for (const wcstring &target : entry.second) {
-            append_format(out, L"complete --command %ls --wraps %ls\n", src.c_str(),
+            append_format(out, L"complete -c %ls --wraps %ls\n", src.c_str(),
                           target.c_str());
         }
     }

From e9ee2fb0894846c5933b65d78fe71012c7448d34 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 02:01:33 -0700
Subject: [PATCH 0950/1732] complete: support -k (--keep-files) in printed
 completions

---
 src/complete.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/complete.cpp b/src/complete.cpp
index 3e25d2cfb..1fa8028cf 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1686,6 +1686,9 @@ wcstring complete_print() {
         const option_list_t &options = e.get_options();
         for (const complete_entry_opt_t &o : options) {
             out.append(L"complete");
+
+            if (o.flags & COMPLETE_DONT_SORT) append_switch(out, L'k');
+
             if (o.result_mode.no_files && o.result_mode.requires_param) {
                 append_switch(out, L'x');
             } else if (o.result_mode.no_files) {

From 620761b9b9ae0f8dabb63aa57525c1ab567fc459 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 04:21:24 -0700
Subject: [PATCH 0951/1732] complete: print long option names for less common
 ones

we now print --long options for ones I arbitrarily decided
are less likely to be remembered.

Also fixed the `--wraps` items at the end not being escaped
---
 src/complete.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 1fa8028cf..023508864 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1662,13 +1662,20 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
 
 /// Print the short switch \c opt, and the argument \c arg to the specified
 /// wcstring, but only if \c argument isn't an empty string.
-static void append_switch(wcstring &out, const wchar_t opt, const wcstring arg) {
+static void append_switch(wcstring &out, wchar_t opt, const wcstring arg) {
     if (arg.empty()) return;
     append_format(out, L" -%lc %ls", opt, escape_string(arg, ESCAPE_ALL).c_str());
 }
-static void append_switch(wcstring &out, const wchar_t opt) {
+static void append_switch(wcstring &out, const wcstring opt, const wcstring arg) {
+    if (arg.empty()) return;
+    append_format(out, L" --%ls %ls", opt.c_str(), escape_string(arg, ESCAPE_ALL).c_str());
+}
+static void append_switch(wcstring &out, wchar_t opt) {
     append_format(out, L" -%lc", opt);
 }
+static void append_switch(wcstring &out, const wcstring opt) {
+    append_format(out, L" --%ls", opt.c_str());
+}
 
 /// Use by the bare `complete`, loaded completions are printed out as commands
 wcstring complete_print() {
@@ -1690,13 +1697,13 @@ wcstring complete_print() {
             if (o.flags & COMPLETE_DONT_SORT) append_switch(out, L'k');
 
             if (o.result_mode.no_files && o.result_mode.requires_param) {
-                append_switch(out, L'x');
+                append_switch(out, L"exclusive");
             } else if (o.result_mode.no_files) {
-                append_switch(out, L'f');
+                append_switch(out, L"no-files");
             } else if (o.result_mode.force_files) {
-                append_switch(out, L'F');
+                append_switch(out, L"force-files");
             } else if (o.result_mode.requires_param) {
-                append_switch(out, L'r');
+                append_switch(out, L"requires-param");
             }
 
             append_switch(out, e.cmd_is_path ? L'p' : L'c', e.cmd);
@@ -1728,8 +1735,10 @@ wcstring complete_print() {
     for (const auto &entry : *locked_wrappers) {
         const wcstring &src = entry.first;
         for (const wcstring &target : entry.second) {
-            append_format(out, L"complete -c %ls --wraps %ls\n", src.c_str(),
-                          target.c_str());
+            out.append(L"complete");
+            append_switch(out, L'c', src);
+            append_switch(out, L"wraps", target);
+            out.append(L"\n");
         }
     }
     return out;

From cb79d8fa970c8ea6d537887e693dd23052aa194e Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 04:27:33 -0700
Subject: [PATCH 0952/1732] Colorize `complete` output

If interactive, `complete` commands are highlighted like they would
be if typed. Adds a little fun contrast and it's easier to read.

Moved a function out of fish_indent to highlight.h
---
 src/builtin_complete.cpp | 14 +++++++++++++-
 src/fish_indent.cpp      | 22 +---------------------
 src/highlight.cpp        | 19 +++++++++++++++++++
 src/highlight.h          |  2 ++
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 8ae0bb528..7a7faa8ed 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -17,6 +17,8 @@
 #include "parse_constants.h"
 #include "parse_util.h"
 #include "parser.h"
+#include "highlight.h"
+#include "color.h"
 #include "reader.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
@@ -378,7 +380,17 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     } else if (cmd_to_complete.empty() && path.empty()) {
         // No arguments specified, meaning we print the definitions of all specified completions
         // to stdout.
-        streams.out.append(complete_print());
+        const wcstring repr = complete_print();
+
+        // colorize if interactive
+        if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
+            std::vector<highlight_spec_t> colors;
+            size_t len = repr.size();
+            highlight_shell_no_io(repr, colors, len, nullptr, env_stack_t::globals());
+            streams.out.append(str2wcstring(colorize(repr, colors)));
+        } else {
+            streams.out.append(repr);
+        }
     } else {
         int flags = COMPLETE_AUTO_SPACE;
         if (preserve_order) {
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 4d78166fc..0d77e26ae 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -375,26 +375,6 @@ static wcstring prettify(const wcstring &src, bool do_indent) {
     return std::move(prettifier.output);
 }
 
-/// Given a string and list of colors of the same size, return the string with ANSI escape sequences
-/// representing the colors.
-static std::string ansi_colorize(const wcstring &text,
-                                 const std::vector<highlight_spec_t> &colors) {
-    assert(colors.size() == text.size());
-    outputter_t outp;
-
-    highlight_spec_t last_color = highlight_role_t::normal;
-    for (size_t i = 0; i < text.size(); i++) {
-        highlight_spec_t color = colors.at(i);
-        if (color != last_color) {
-            outp.set_color(highlight_get_color(color, false), rgb_color_t::normal());
-            last_color = color;
-        }
-        outp.writech(text.at(i));
-    }
-    outp.set_color(rgb_color_t::normal(), rgb_color_t::normal());
-    return outp.contents();
-}
-
 /// Given a string and list of colors of the same size, return the string with HTML span elements
 /// for the various colors.
 static const wchar_t *html_class_name_for_color(highlight_spec_t spec) {
@@ -676,7 +656,7 @@ int main(int argc, char *argv[]) {
                 break;
             }
             case output_type_ansi: {
-                colored_output = ansi_colorize(output_wtext, colors);
+                colored_output = colorize(output_wtext, colors);
                 break;
             }
             case output_type_html: {
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 2a8fa179d..dbb4bd293 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1297,6 +1297,25 @@ highlighter_t::color_array_t highlighter_t::highlight() {
     return std::move(color_array);
 }
 
+/// Given a string and list of colors of the same size, return the string with ANSI escape sequences
+/// representing the colors.
+std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &colors) {
+    assert(colors.size() == text.size());
+    outputter_t outp;
+
+    highlight_spec_t last_color = highlight_role_t::normal;
+    for (size_t i = 0; i < text.size(); i++) {
+        highlight_spec_t color = colors.at(i);
+        if (color != last_color) {
+            outp.set_color(highlight_get_color(color, false), rgb_color_t::normal());
+            last_color = color;
+        }
+        outp.writech(text.at(i));
+    }
+    outp.set_color(rgb_color_t::normal(), rgb_color_t::normal());
+    return outp.contents();
+}
+
 void highlight_shell(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,
                      wcstring_list_t *error, const environment_t &vars) {
     UNUSED(error);
diff --git a/src/highlight.h b/src/highlight.h
index a75b76481..fdf7f761e 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -72,6 +72,8 @@ struct highlight_spec_t {
 
 class history_item_t;
 
+std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &colors);
+
 /// Perform syntax highlighting for the shell commands in buff. The result is stored in the color
 /// array as a color_code from the HIGHLIGHT_ enum for each character in buff.
 ///

From fda8ad429b6231e08456dcebdb70b84979a03cb7 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 10:32:07 -0700
Subject: [PATCH 0953/1732] parse_util.cpp: remove truncate_string()

We already have something that does this
---
 src/parse_util.cpp | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 9b6c987d4..08d415ebd 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -22,6 +22,7 @@
 #include "parser.h"
 #include "tnode.h"
 #include "tokenizer.h"
+#include "wcstringutil.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -39,6 +40,9 @@
 /// Error message for arguments to 'end'
 #define END_ARG_ERR_MSG _(L"'end' does not take arguments. Did you forget a ';'?")
 
+/// Maximum length of a variable name to show in error reports before truncation
+static constexpr int var_err_len = 16;
+
 int parse_util_lineno(const wchar_t *str, size_t offset) {
     if (!str) return 0;
 
@@ -631,7 +635,7 @@ static void compute_indents_recursive(const parse_node_tree_t &tree, node_offset
             indents->at(node.source_start) = node_indent;
         } else {
             // An empty node. We have a source offset but no source length. This can come about when
-            // a node legitimately empty:
+            // a node is legitimately empty:
             //
             //   while true; end
             //
@@ -793,22 +797,6 @@ static bool first_argument_is_help(tnode_t<grammar::plain_statement> statement,
     return is_help;
 }
 
-/// If a var name or command is too long for error reporting, make it shorter.
-static wcstring truncate_string(const wcstring &str) {
-    const size_t max_len = 16;
-    wcstring result(str, 0, max_len);
-    if (str.size() > max_len) {
-        // Truncate!
-        wchar_t ellipsis_char = get_ellipsis_char();
-        if (ellipsis_char == L'\x2026') {
-            result.at(max_len - 1) = ellipsis_char;
-        } else {
-            result.replace(max_len - 3, 3, L"...");
-        }
-    }
-    return result;
-}
-
 /// Given a wide character immediately after a dollar sign, return the appropriate error message.
 /// For example, if wc is @, then the variable name was $@ and we suggest $argv.
 static const wchar_t *error_format_for_character(wchar_t wc) {
@@ -868,7 +856,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
                 append_syntax_error(
                     errors, global_after_dollar_pos,
                     double_quotes ? ERROR_BRACKETED_VARIABLE_QUOTED1 : ERROR_BRACKETED_VARIABLE1,
-                    truncate_string(var_name).c_str());
+                    truncate(var_name, var_err_len).c_str());
             } else {
                 append_syntax_error(errors, global_after_dollar_pos, ERROR_BAD_VAR_CHAR1, L'{');
             }
@@ -898,7 +886,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
             }
 
             append_syntax_error(errors, global_dollar_pos, ERROR_BAD_VAR_SUBCOMMAND1,
-                                truncate_string(token_after_parens).c_str());
+                                truncate(token_after_parens, var_err_len).c_str());
             break;
         }
         case L'\0': {
@@ -952,7 +940,7 @@ static parser_test_error_bits_t detect_dollar_cmdsub_errors(size_t arg_src_offse
             append_syntax_error(
                 out_errors,
                 arg_src_offset + arg_src.size() - 1,  // global position of the dollar
-                ERROR_BAD_VAR_SUBCOMMAND1, truncate_string(subcommand_first_token).c_str());
+                ERROR_BAD_VAR_SUBCOMMAND1, truncate(subcommand_first_token, var_err_len).c_str());
         }
     }
 

From 2b7b70a64f7c7a879fac91e8bf2da28950e0edf9 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 11:09:37 -0700
Subject: [PATCH 0954/1732] Ellipsis OCD

---
 src/builtin_set.cpp | 7 ++++++-
 src/parse_util.cpp  | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 303f089d8..996a5b9d7 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -571,9 +571,14 @@ static void show_scope(const wchar_t *var_name, int scope, io_streams_t &streams
     wcstring_list_t vals = var->as_list();
     streams.out.append_format(_(L"$%ls: set in %ls scope, %ls, with %d elements\n"), var_name,
                               scope_name, exportv, vals.size());
+
     for (size_t i = 0; i < vals.size(); i++) {
         if (vals.size() > 100) {
-            if (i == 50) streams.out.append(L"...\n");
+            if (i == 50) {
+                // try to print a mid-line ellipsis because we are eliding lines not words
+                streams.out.append(get_ellipsis_char() > 256 ? L"\u22EF" : get_ellipsis_str());
+                streams.out.push_back(L'\n');
+            }
             if (i >= 50 && i < vals.size() - 50) continue;
         }
         const wcstring value = vals[i];
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 08d415ebd..e2d730717 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -882,7 +882,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
 
             // Make sure we always show something.
             if (token_after_parens.empty()) {
-                token_after_parens = L"...";
+                token_after_parens = get_ellipsis_str();
             }
 
             append_syntax_error(errors, global_dollar_pos, ERROR_BAD_VAR_SUBCOMMAND1,
@@ -935,7 +935,7 @@ static parser_test_error_bits_t detect_dollar_cmdsub_errors(size_t arg_src_offse
             wcstring subcommand_first_token = tok_first(cmdsubst_src);
             if (subcommand_first_token.empty()) {
                 // e.g. $(). Report somthing.
-                subcommand_first_token = L"...";
+                subcommand_first_token = get_ellipsis_str();
             }
             append_syntax_error(
                 out_errors,

From 5c06e68115ba4a48a24ac2ba7613da6c1fe96bca Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 14:24:46 -0700
Subject: [PATCH 0955/1732] tests: add a lame gdate-based ms-precision timer if
 installed

I got tired of seeing ' ... ok (0 sec)' so now with GNU date/gdate
installed there is millisecond output shown. One can get rough
nanoseconds from gdate.
---
 tests/test.fish      | 12 ++++++------
 tests/test_util.fish | 23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/tests/test.fish b/tests/test.fish
index 40a145172..fc29fb4d2 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -34,12 +34,12 @@ function test_in_file
     set -l base (basename $file .in)
 
     echo -n "Testing file $file ... "
-    set starttime (date +%s)
+    set starttime (timestamp)
 
     ../test/root/bin/fish <$file >$base.tmp.out 2>$base.tmp.err
     set -l exit_status $status
     set -l res ok
-    set test_duration (math (date +%s) - $starttime)
+    set test_duration (delta $starttime)
 
     diff $base.tmp.out $base.out >/dev/null
     set -l out_status $status
@@ -47,7 +47,7 @@ function test_in_file
     set -l err_status $status
 
     if test $out_status -eq 0 -a $err_status -eq 0 -a $exit_status -eq 0
-        say green "ok ($test_duration sec)"
+        say green "ok ($test_duration $unit)"
         # clean up tmp files
         rm -f $base.tmp.{err,out}
         return 0
@@ -74,13 +74,13 @@ set -g python (__fish_anypython)
 function test_littlecheck_file
     set -l file $argv[1]
     echo -n "Testing file $file ... "
-    set starttime (date +%s)
+    set starttime (timestamp)
     $python ../littlecheck.py -s fish=../test/root/bin/fish $file
     set -l exit_status $status
     set -l res ok
-    set test_duration (math (date +%s) - $starttime)
+    set test_duration (delta $starttime)
     if test $exit_status -eq 0
-        say green "ok ($test_duration sec)"
+        say green "ok ($test_duration $unit)"
     end
     return $exit_status
 end
diff --git a/tests/test_util.fish b/tests/test_util.fish
index a23d46ca5..a4a2e400f 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -133,3 +133,26 @@ function colordiff -d 'Colored diff output for unified diffs'
         end
     end
 end
+
+# lame timer
+for program in {g,}date
+    if $program --version
+        set milli $program
+        set unit ms
+        break
+    else
+        set unit sec
+    end
+end
+
+function timestamp -V milli
+    set -q milli[1]
+    and $milli +%s%3N
+    or date +%s
+end
+
+function delta -V milli
+    set -q milli[1]
+    and math "( "($milli +%s%3N)" - $argv[1])"
+    or math (date +%s) - $starttime
+end

From 53a3533285e42fb57056d4159ef865226fcf48d2 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 15:01:09 -0700
Subject: [PATCH 0956/1732] Add tests for `complete` (no args)  output

Hopefully this should catch things if the output gets broken again.
---
 tests/checks/complete.fish | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 4eec49851..3ebf40a5d 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -39,3 +39,23 @@ complete -c t -l fileoption -rF
 # Only match one file because I don't want to touch this any time we add a test file.
 complete -C't --fileoption ' | string match bind.expect
 # CHECK: bind.expect
+
+# Make sure bare `complete` is reasonable,
+complete -p '/complete test/beta1' -d 'desc, desc' -sZ
+complete -c 'complete test beta2' -r -d 'desc \' desc2 [' -a 'foo bar'
+complete -c 'complete_test_beta2' -x -n 'false' -A -o test
+complete
+
+# CHECK: complete --no-files -c complete_test_alpha1 -a '(commandline)'
+# CHECK: complete --no-files -c complete_test_alpha2
+# CHECK: complete --no-files -c complete_test_alpha3
+# CHECK: complete --force-files -c t -l fileoption
+# CHECK: complete --no-files -c t -a '(t)'
+# CHECK: complete -p '/complete test/beta1' -s Z -d 'desc, desc'
+# CHECK: complete --requires-param -c 'complete test beta2' -d desc\ \'\ desc2\ \[ -a 'foo bar'
+# CHECK: complete --exclusive -c complete_test_beta2 -o test -n false
+# CHECK: complete -c myalias1 --wraps 'complete_test_alpha1 arg1'
+# CHECK: complete -c complete_test_alpha3 --wraps 'complete_test_alpha2 extra2'
+# CHECK: complete -c myalias2 --wraps 'complete_test_alpha1 arg2'
+# CHECK: complete -c complete_test_alpha2 --wraps 'complete_test_alpha1 extra1'
+# CHECK: complete -c . --wraps source

From 9486af88050062e59ca2e93d5c51f605737feac3 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 15:06:51 -0700
Subject: [PATCH 0957/1732] tests: fix date --version printing junk, update
 interactive.fish

---
 tests/interactive.fish | 6 +++---
 tests/test_util.fish   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/interactive.fish b/tests/interactive.fish
index 63af32f41..3cac395f9 100644
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@@ -42,14 +42,14 @@ end
 function test_file
     set -l file $argv[1]
     echo -n "Testing file $file ... "
-    set starttime (date +%s)
+    set starttime (timestamp)
     begin
         set -lx TERM dumb
         expect -n -c 'source interactive.expect.rc' -f $file >$file.tmp.out 2>$file.tmp.err
     end
     set -l exit_status $status
     set -l res ok
-    set test_duration (math (date +%s) - $starttime)
+    set test_duration (delta $starttime)
     mv -f interactive.tmp.log $file.tmp.log
 
     diff $file.tmp.out $file.out >/dev/null
@@ -58,7 +58,7 @@ function test_file
     set -l err_status $status
 
     if test $out_status -eq 0 -a $err_status -eq 0 -a $exit_status -eq 0
-        say green "ok ($test_duration sec)"
+        say green "ok ($test_duration $unit)"
         # clean up tmp files
         rm -f $file.tmp.{err,out,log}
         return 0
diff --git a/tests/test_util.fish b/tests/test_util.fish
index a4a2e400f..c49a9a38e 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -136,7 +136,7 @@ end
 
 # lame timer
 for program in {g,}date
-    if $program --version
+    if $program --version 1>/dev/null 2>/dev/null
         set milli $program
         set unit ms
         break
@@ -145,13 +145,13 @@ for program in {g,}date
     end
 end
 
-function timestamp -V milli
+function timestamp
     set -q milli[1]
     and $milli +%s%3N
     or date +%s
 end
 
-function delta -V milli
+function delta
     set -q milli[1]
     and math "( "($milli +%s%3N)" - $argv[1])"
     or math (date +%s) - $starttime

From 6459682c935af5597b6008597493291319f58a2d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 15:35:25 -0700
Subject: [PATCH 0958/1732] Work around indeterminant ordering for complete
 test

Not a cool fix but it should work
---
 tests/checks/complete.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 3ebf40a5d..2958e170a 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -54,8 +54,8 @@ complete
 # CHECK: complete -p '/complete test/beta1' -s Z -d 'desc, desc'
 # CHECK: complete --requires-param -c 'complete test beta2' -d desc\ \'\ desc2\ \[ -a 'foo bar'
 # CHECK: complete --exclusive -c complete_test_beta2 -o test -n false
-# CHECK: complete -c myalias1 --wraps 'complete_test_alpha1 arg1'
-# CHECK: complete -c complete_test_alpha3 --wraps 'complete_test_alpha2 extra2'
-# CHECK: complete -c myalias2 --wraps 'complete_test_alpha1 arg2'
-# CHECK: complete -c complete_test_alpha2 --wraps 'complete_test_alpha1 extra1'
+# CHECK: complete -c myalias{{1|2}} --wraps 'complete_test_alpha1 arg{{1|2}}'
+# CHECK: complete -c complete_test_alpha{{3|2}} --wraps 'complete_test_alpha{{2|1}} extra{{2|1}}'
+# CHECK: complete -c myalias{{2|1}} --wraps 'complete_test_alpha1 arg{{2|1}}'
+# CHECK: complete -c complete_test_alpha{{2|3}} --wraps 'complete_test_alpha{{1|2}} extra{{1|2}}'
 # CHECK: complete -c . --wraps source

From 102ddd2b799a06898be1605418e2fac90d8d7f42 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 19 Sep 2019 15:44:15 -0700
Subject: [PATCH 0959/1732] tests/checks/complete.fish: don't check unsorted
 lines

---
 tests/checks/complete.fish | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 2958e170a..a232fb589 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -54,8 +54,8 @@ complete
 # CHECK: complete -p '/complete test/beta1' -s Z -d 'desc, desc'
 # CHECK: complete --requires-param -c 'complete test beta2' -d desc\ \'\ desc2\ \[ -a 'foo bar'
 # CHECK: complete --exclusive -c complete_test_beta2 -o test -n false
-# CHECK: complete -c myalias{{1|2}} --wraps 'complete_test_alpha1 arg{{1|2}}'
-# CHECK: complete -c complete_test_alpha{{3|2}} --wraps 'complete_test_alpha{{2|1}} extra{{2|1}}'
-# CHECK: complete -c myalias{{2|1}} --wraps 'complete_test_alpha1 arg{{2|1}}'
-# CHECK: complete -c complete_test_alpha{{2|3}} --wraps 'complete_test_alpha{{1|2}} extra{{1|2}}'
-# CHECK: complete -c . --wraps source
+# CHECK: complete {{.*}}
+# CHECK: complete {{.*}}
+# CHECK: complete {{.*}}
+# CHECK: complete {{.*}}
+# CHECK: complete {{.*}}

From 8e0aa03c4a315290c96c6d8afffbfdde89b66c49 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 21 Sep 2019 16:32:14 +0800
Subject: [PATCH 0960/1732] cmake: sphinx-manpages requires fish_indent for
 version number

Fixes issue #6216.

Problem introduced in 3b8505bebeebd79c9cd3a3aa39a7404725db985a.
---
 cmake/Docs.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index 9e2758b16..93333da02 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -26,14 +26,17 @@ ADD_CUSTOM_TARGET(sphinx-docs
     DEPENDS sphinx_doc_src/fish_indent_lexer.py fish_indent
     COMMENT "Building HTML documentation with Sphinx")
 
+# sphinx-manpages needs the fish_indent binary for the version number
 ADD_CUSTOM_TARGET(sphinx-manpages
-    ${SPHINX_EXECUTABLE}
+    env PATH="$<TARGET_FILE_DIR:fish_indent>:$$PATH"
+        ${SPHINX_EXECUTABLE}
         -q -b man
         -c "${SPHINX_SRC_DIR}"
         -d "${SPHINX_CACHE_DIR}"
         "${SPHINX_SRC_DIR}"
         # TODO: This only works if we only have section 1 manpages.
         "${SPHINX_MANPAGE_DIR}/man1"
+    DEPENDS fish_indent
     COMMENT "Building man pages with Sphinx")
 
 IF(SPHINX_EXECUTABLE)

From d2e9ee290c6fb6da56cb0782e57f9fcf1a7dee51 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Sun, 8 Sep 2019 19:01:44 +0000
Subject: [PATCH 0961/1732] rewrite __fish_complete_gpg_key_id to produce
 better output

---
 share/completions/gpg.fish | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 1ecfda228..c3638bc25 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -21,23 +21,25 @@
 
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
     # 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 a s a
+    # completion, so we skip the <EMAIL> part and use it as a
     # description.
     # It also replaces colons with \x3a
     gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
 end
 
 function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
-    # Use user_id as the description
-    set -l lastid
+    # Use user id as description
+    set -l keyid
     gpg --list-keys --with-colons | while read garbage
         switch $garbage
+            # Extract user ids
             case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
-            case "*"
-                echo $garbage | cut -d ":" -f 5 | read fingerprint
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
+                printf "%s\t%s\n" $keyid $uid
+            # Extract key fingerprints (no subkeys)
+            case "pub*"
+                echo $garbage | cut -d ":" -f 5 | read keyid
         end
-        printf "%s\t%s\n" $fingerprint $lastid
     end
 end
 

From 1a59731ea70cbfd7ead17852547ceb47c2a021b0 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Sat, 24 Aug 2019 05:58:54 +0000
Subject: [PATCH 0962/1732] Create updated completions for gpg2

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

diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
new file mode 100644
index 000000000..27f8cdf31
--- /dev/null
+++ b/share/completions/gpg2.fish
@@ -0,0 +1,395 @@
+#
+# Completions for the gpg2 command.
+#
+# This program accepts an rather large number of switches. It allows
+# you to do things like changing what file descriptor errors should be
+# written to, to make gpg2 use a different locale than the one
+# specified in the environment or to specify an alternative home
+# directory.
+
+# Switches related to debugging, switches whose use is not
+# recommended, switches whose behaviour is as of yet undefined,
+# switches for experimental features, switches to make gpg2 compliant
+# to legacy pgp-versions, dos-specific switches, switches meant for
+# the options file and deprecated or obsolete switches have all been
+# removed. The remaining list of completions is still quite
+# impressive.
+
+#
+# Various functions used for dynamic completions
+#
+
+function __fish_complete_gpg2_user_id -d "Complete using gpg2 user ids"
+    # gpg2 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 a s a
+    # description.
+    # It also replaces colons with \x3a
+    gpg2 --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
+end
+
+function __fish_complete_gpg2_key_id -d 'Complete using gpg2 key ids'
+    # Use user_id as the description
+    set -l lastid
+    gpg2 --list-keys --with-colons | while read garbage
+        switch $garbage
+            case "uid*"
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
+            case "*"
+                echo $garbage | cut -d ":" -f 5 | read fingerprint
+        end
+        printf "%s\t%s\n" $fingerprint $lastid
+    end
+end
+
+function __fish_print_gpg2_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
+    # Set a known locale, so that the output format of 'gpg2 --version'
+    # is at least somewhat predictable. The locale will automatically
+    # expire when the function goes out of scope, and the original locale
+    # will take effect again.
+    set -lx LC_ALL C
+
+    # sed script explained:
+    # in the line that matches "$argv:"
+    #   define label 'loop'
+    #   if the line ends with a ','
+    #       add next line to buffer
+    #       transliterate '\n' with ' '
+    #       goto loop
+    #   remove everything until the first ':' of the line
+    #   remove all blanks
+    #   transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    #   print result
+    gpg2 --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
+end
+
+
+#
+# gpg2 subcommands
+#
+
+complete -c gpg2 -s s -l sign -d "Make a signature"
+complete -c gpg2 -l clearsign -d "Make a clear text signature"
+complete -c gpg2 -l clear-sign -d "Make a clear text signature"
+complete -c gpg2 -s b -l detach-sign -d "Make a detached signature"
+complete -c gpg2 -s e -l encrypt -d "Encrypt data"
+complete -c gpg2 -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+complete -c gpg2 -l store -d "Store only (make a simple literal data packet)"
+complete -c gpg2 -l decrypt -d "Decrypt specified file or stdin"
+complete -c gpg2 -l verify -d "Assume specified file or stdin is sigfile and verify it"
+complete -c gpg2 -l multifile -d "Modify certain other commands to accept multiple files for processing"
+complete -c gpg2 -l verify-files -d "Identical to '--multifile --verify'"
+complete -c gpg2 -l encrypt-files -d "Identical to '--multifile --encrypt'"
+complete -c gpg2 -l decrypt-files -d "Identical to --multifile --decrypt"
+
+complete -c gpg2 -s k -l list-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg2 -l list-public-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg2 -s K -l list-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c gpg2 -l list-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+complete -c gpg2 -l list-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+
+complete -c gpg2 -l check-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg2 -l check-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg2 -l fingerprint -xa "(__fish_complete_gpg2_user_id)" -d "List all keys with their fingerprints"
+complete -c gpg2 -l gen-key -d "Generate a new key pair"
+
+complete -c gpg2 -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg2_user_id)"
+
+complete -c gpg2 -l sign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key"
+complete -c gpg2 -l lsign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
+
+complete -c gpg2 -l delete-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the public keyring"
+complete -c gpg2 -l delete-secret-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the secret and public keyring"
+complete -c gpg2 -l delete-secret-and-public-key -xa "(__fish_complete_gpg2_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+complete -c gpg2 -l gen-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg2 -l desig-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
+
+complete -c gpg2 -l export -xa "(__fish_complete_gpg2_user_id)" -d 'Export all or the given keys from all keyrings'
+complete -c gpg2 -l send-keys -xa "(__fish_complete_gpg2_key_id)" -d "Same as --export but sends the keys to a keyserver"
+complete -c gpg2 -l export-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
+complete -c gpg2 -l export-secret-subkeys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
+
+complete -c gpg2 -l import -d 'Import/merge keys'
+complete -c gpg2 -l fast-import -d 'Import/merge keys'
+
+complete -c gpg2 -l recv-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg2 -l receive-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg2 -l refresh-keys -xa "(__fish_complete_gpg2_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+complete -c gpg2 -l search-keys -xa "(__fish_complete_gpg2_user_id)" -d "Search the keyserver for the given names"
+complete -c gpg2 -l update-trustdb -d "Do trust database maintenance"
+complete -c gpg2 -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+complete -c gpg2 -l export-ownertrust -d "Send the ownertrust values to stdout"
+complete -c gpg2 -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+complete -c gpg2 -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+complete -c gpg2 -l print-md -xa "(__fish_print_gpg2_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+complete -c gpg2 -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+complete -c gpg2 -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+complete -c gpg2 -l version -d "Display version and supported algorithms, and exit"
+complete -c gpg2 -l warranty -d "Display warranty and exit"
+complete -c gpg2 -s h -l help -d "Display help and exit"
+complete -c gpg2 -l passwd -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+complete -c gpg2 -l change-passphrase -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+complete -c gpg2 -l edit-card -d "Present a menu to work with a smartcard"
+complete -c gpg2 -l card-edit -d "Present a menu to work with a smartcard"
+complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
+complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
+complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
+complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
+complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
+complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
+complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
+complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
+complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
+complete -c gpg2 -l show-keys -d "Takes OpenPGP keys as input and prints information about them"
+
+
+#
+# gpg2 options
+#
+
+complete -c gpg2 -l agent-program -d "Specify an agent program to be used for secret key operations"
+complete -c gpg2 -s a -l armor -d "Create ASCII armored output"
+complete -c gpg2 -s o -l output -r -d "Write output to specified file"
+
+complete -c gpg2 -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+complete -c gpg2 -s u -l local-user -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the key to sign with"
+complete -c gpg2 -l default-key -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the default key to sign with"
+
+complete -c gpg2 -s r -l recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id"
+complete -c gpg2 -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+complete -c gpg2 -s R -l hidden-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg2 -l default-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Use specified user id as default recipient"
+complete -c gpg2 -l default-recipient-self -d "Use the default key as default recipient"
+complete -c gpg2 -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+complete -c gpg2 -s v -l verbose -d "Give more information during processing"
+complete -c gpg2 -s q -l quiet -d "Quiet mode"
+
+complete -c gpg2 -s z -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+complete -c gpg2 -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c gpg2 -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+complete -c gpg2 -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+complete -c gpg2 -s i -l interactive -d "Prompt before overwrite"
+
+complete -c gpg2 -l batch -d "Batch mode"
+complete -c gpg2 -l no-batch -d "Don't use batch mode"
+complete -c gpg2 -l no-tty -d "Never write output to terminal"
+
+complete -c gpg2 -l yes -d "Assume yes on most questions"
+complete -c gpg2 -l no -d "Assume no on most questions"
+
+complete -c gpg2 -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+complete -c gpg2 -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+complete -c gpg2 -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+complete -c gpg2 -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+complete -c gpg2 -l trusted-key -xa "(__fish_complete_gpg2_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+complete -c gpg2 -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+complete -c gpg2 -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+complete -c gpg2 -l keyserver -x -d "Use specified keyserver"
+complete -c gpg2 -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+complete -c gpg2 -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+complete -c gpg2 -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+complete -c gpg2 -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+complete -c gpg2 -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+complete -c gpg2 -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+complete -c gpg2 -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+complete -c gpg2 -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+complete -c gpg2 -l keyring -r -d "Add specified file to the current list of keyrings"
+
+complete -c gpg2 -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+complete -c gpg2 -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+complete -c gpg2 -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+complete -c gpg2 -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+complete -c gpg2 -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+complete -c gpg2 -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+complete -c gpg2 -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+complete -c gpg2 -l options -r -d "Read options from specified file, do not read the default options file"
+complete -c gpg2 -l no-options -d "Shortcut for '--options /dev/null'"
+complete -c gpg2 -l load-extension -x -d "Load an extension module"
+
+complete -c gpg2 -l status-fd -x -d "Write special status strings to the specified file descriptor"
+complete -c gpg2 -l logger-fd -x -d "Write log output to the specified file descriptor"
+complete -c gpg2 -l logger-file -r -d "Write log output to the specified file"
+complete -c gpg2 -l log-file -r -d "Write log output to the specified file"
+complete -c gpg2 -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+complete -c gpg2 -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+complete -c gpg2 -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+complete -c gpg2 -l comment -x -d "Use specified string as comment string"
+complete -c gpg2 -l no-comments -d "Don't use a comment string"
+
+complete -c gpg2 -l emit-version -d "Include the version string in ASCII armored output"
+complete -c gpg2 -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+complete -c gpg2 -l sig-notation -x
+complete -c gpg2 -l cert-notation -x
+
+complete -c gpg2 -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+complete -c gpg2 -l sig-policy-url -x -d "Set signature policy"
+complete -c gpg2 -l cert-policy-url -x -d "Set certificate policy"
+complete -c gpg2 -l set-policy-url -x -d "Set signature and certificate policy"
+complete -c gpg2 -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+complete -c gpg2 -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+complete -c gpg2 -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+complete -c gpg2 -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+complete -c gpg2 -l use-embedded-filename -d "Create file with name as given in data"
+complete -c gpg2 -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+complete -c gpg2 -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+complete -c gpg2 -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+complete -c gpg2 -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+complete -c gpg2 -l cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm"
+complete -c gpg2 -l digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm"
+complete -c gpg2 -l compress-algo -xa "(__fish_print_gpg2_algo Compression)" -d "Use specified compression algorithm"
+complete -c gpg2 -l cert-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm when signing a key"
+complete -c gpg2 -l s2k-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+complete -c gpg2 -l s2k-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+complete -c gpg2 -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+complete -c gpg2 -l disable-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
+complete -c gpg2 -l disable-pubkey-algo -xa "(__fish_print_gpg2_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+complete -c gpg2 -l no-sig-cache -d "Do not cache the verification status of key signatures"
+
+complete -c gpg2 -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+complete -c gpg2 -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+complete -c gpg2 -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+complete -c gpg2 -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+complete -c gpg2 -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+complete -c gpg2 -l escape-from-lines -d "Mangle From-field of email headers (default)"
+complete -c gpg2 -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+complete -c gpg2 -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+complete -c gpg2 -l command-fd -x -d "Read user input from specified file descriptor"
+
+complete -c gpg2 -l use-agent -d "Try to use the GnuPG-Agent"
+complete -c gpg2 -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+complete -c gpg2 -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+complete -c gpg2 -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+complete -c gpg2 -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+complete -c gpg2 -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+complete -c gpg2 -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+complete -c gpg2 -l force-mdc -d "Force the use of encryption with a modification detection code"
+complete -c gpg2 -l disable-mdc -d "Disable the use of the modification detection code"
+
+complete -c gpg2 -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+complete -c gpg2 -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+complete -c gpg2 -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+complete -c gpg2 -l ignore-time-conflict -d "Do not fail if signature is older than key"
+complete -c gpg2 -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+complete -c gpg2 -l ignore-crc-error -d "Ignore CRC errors"
+complete -c gpg2 -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+complete -c gpg2 -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+complete -c gpg2 -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+complete -c gpg2 -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+complete -c gpg2 -l no-verbose -d "Reset verbose level to 0"
+complete -c gpg2 -l no-greeting -d "Suppress the initial copyright message"
+complete -c gpg2 -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+complete -c gpg2 -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+complete -c gpg2 -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+complete -c gpg2 -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+complete -c gpg2 -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+complete -c gpg2 -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+complete -c gpg2 -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+complete -c gpg2 -l skip-verify -d "Skip the signature verification step"
+
+complete -c gpg2 -l with-colons -d "Print key listings delimited by colons"
+complete -c gpg2 -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+complete -c gpg2 -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+complete -c gpg2 -l fast-list-mode -d "Changes the output of the list commands to work faster"
+complete -c gpg2 -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+complete -c gpg2 -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+complete -c gpg2 -l show-session-key -d "Display the session key used for one message"
+complete -c gpg2 -l override-session-key -x -d "Don't use the public key but the specified session key"
+complete -c gpg2 -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+
+complete -c gpg2 -l ask-sig-expire -d "Prompt for an expiration time"
+complete -c gpg2 -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg2 -l ask-cert-expire -d "Prompt for an expiration time"
+complete -c gpg2 -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg2 -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+complete -c gpg2 -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+complete -c gpg2 -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+complete -c gpg2 -l ungroup -d "Remove a given entry from the --group list"
+complete -c gpg2 -l no-groups -d "Remove all entries from the --group list"
+
+complete -c gpg2 -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+complete -c gpg2 -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+complete -c gpg2 -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+complete -c gpg2 -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+complete -c gpg2 -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+complete -c gpg2 -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+complete -c gpg2 -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+complete -c gpg2 -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+complete -c gpg2 -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+complete -c gpg2 -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+complete -c gpg2 -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+complete -c gpg2 -l input-size-hint -r -d "Specify input size in bytes"
+complete -c gpg2 -l key-origin -d "Track the origin of a key"
+complete -c gpg2 -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+complete -c gpg2 -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+complete -c gpg2 -l no-keyring -d "Do not use any keyring at all"
+complete -c gpg2 -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
+complete -c gpg2 -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+complete -c gpg2 -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+complete -c gpg2 -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+complete -c gpg2 -l sender -xa "(__fish_complete_gpg2_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+complete -c gpg2 -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+complete -c gpg2 -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
+complete -c gpg2 -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
+complete -c gpg2 -l try-secret-key -xa "(__fish_complete_gpg2_key_id)" -d "Specify keys to be used for trial decryption"
+complete -c gpg2 -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
+complete -c gpg2 -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
+complete -c gpg2 -l with-keygrip -d "Include the keygrip in the key listings"
+complete -c gpg2 -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"

From 2f67cb341c8e80d20f880f970eb3b0384f67e852 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Sat, 24 Aug 2019 17:41:38 +0000
Subject: [PATCH 0963/1732] add remaining gpg2-specific completions; formatting

---
 share/completions/gpg2.fish | 40 ++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 27f8cdf31..4d173b965 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -90,7 +90,9 @@ complete -c gpg2 -l list-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Sam
 complete -c gpg2 -l check-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
 complete -c gpg2 -l check-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
 complete -c gpg2 -l fingerprint -xa "(__fish_complete_gpg2_user_id)" -d "List all keys with their fingerprints"
+
 complete -c gpg2 -l gen-key -d "Generate a new key pair"
+complete -c gpg2 -l generate-key -d "Generate a new key pair"
 
 complete -c gpg2 -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg2_user_id)"
 
@@ -102,7 +104,9 @@ complete -c gpg2 -l delete-secret-key -xa "(__fish_complete_gpg2_user_id)" -d "R
 complete -c gpg2 -l delete-secret-and-public-key -xa "(__fish_complete_gpg2_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
 
 complete -c gpg2 -l gen-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg2 -l generate-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
 complete -c gpg2 -l desig-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
+complete -c gpg2 -l generate-designated-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
 
 complete -c gpg2 -l export -xa "(__fish_complete_gpg2_user_id)" -d 'Export all or the given keys from all keyrings'
 complete -c gpg2 -l send-keys -xa "(__fish_complete_gpg2_key_id)" -d "Same as --export but sends the keys to a keyserver"
@@ -116,6 +120,7 @@ complete -c gpg2 -l recv-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the
 complete -c gpg2 -l receive-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
 complete -c gpg2 -l refresh-keys -xa "(__fish_complete_gpg2_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
 complete -c gpg2 -l search-keys -xa "(__fish_complete_gpg2_user_id)" -d "Search the keyserver for the given names"
+
 complete -c gpg2 -l update-trustdb -d "Do trust database maintenance"
 complete -c gpg2 -l check-trustdb -d "Do trust database maintenance without user interaction"
 
@@ -132,12 +137,16 @@ complete -c gpg2 -l gen-random -xa "0 1 2" -d "Emit specified number of random b
 complete -c gpg2 -l version -d "Display version and supported algorithms, and exit"
 complete -c gpg2 -l warranty -d "Display warranty and exit"
 complete -c gpg2 -s h -l help -d "Display help and exit"
+
 complete -c gpg2 -l passwd -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
 complete -c gpg2 -l change-passphrase -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+
 complete -c gpg2 -l edit-card -d "Present a menu to work with a smartcard"
 complete -c gpg2 -l card-edit -d "Present a menu to work with a smartcard"
+
 complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
 complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+
 complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
 complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
 complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
@@ -147,7 +156,11 @@ complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Dire
 complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
 complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
 complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-complete -c gpg2 -l show-keys -d "Takes OpenPGP keys as input and prints information about them"
+
+complete -c gpg2 -l show-keys -d "Take OpenPGP keys as input and print information about them"
+
+complete -c gpg2 -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+complete -c gpg2 -l full-generate-key -d "Generate a new key pair with dialogs for all options"
 
 
 #
@@ -166,6 +179,7 @@ complete -c gpg2 -l default-key -xa "(__fish_complete_gpg2_user_id)" -d "Use spe
 complete -c gpg2 -s r -l recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id"
 complete -c gpg2 -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
 complete -c gpg2 -s R -l hidden-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg2 -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
 complete -c gpg2 -l default-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Use specified user id as default recipient"
 complete -c gpg2 -l default-recipient-self -d "Use the default key as default recipient"
 complete -c gpg2 -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
@@ -365,30 +379,46 @@ complete -c gpg2 -l preserve-permissions -d "Don't change the permissions of a s
 complete -c gpg2 -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
 complete -c gpg2 -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
 complete -c gpg2 -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+
 complete -c gpg2 -l default-preference-list -x -d "Set the list of default preferences to the specified string"
-complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
 complete -c gpg2 -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+
+complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+
 complete -c gpg2 -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
 complete -c gpg2 -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
 complete -c gpg2 -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+
 complete -c gpg2 -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
 complete -c gpg2 -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+
 complete -c gpg2 -l input-size-hint -r -d "Specify input size in bytes"
-complete -c gpg2 -l key-origin -d "Track the origin of a key"
+
 complete -c gpg2 -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+
+complete -c gpg2 -l key-origin -d "Track the origin of a key"
+complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+
 complete -c gpg2 -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
 complete -c gpg2 -l no-keyring -d "Do not use any keyring at all"
+complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+
 complete -c gpg2 -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
 complete -c gpg2 -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+
 complete -c gpg2 -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+
 complete -c gpg2 -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+
 complete -c gpg2 -l sender -xa "(__fish_complete_gpg2_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+
 complete -c gpg2 -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+
 complete -c gpg2 -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
 complete -c gpg2 -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
+
 complete -c gpg2 -l try-secret-key -xa "(__fish_complete_gpg2_key_id)" -d "Specify keys to be used for trial decryption"
+
 complete -c gpg2 -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
 complete -c gpg2 -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
 complete -c gpg2 -l with-keygrip -d "Include the keygrip in the key listings"

From b8ba04dcf4001163880ecd6f1aa18aea653be14a Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 3 Sep 2019 00:45:46 +0000
Subject: [PATCH 0964/1732] fix compatibility with BSD sed

---
 share/completions/gpg2.fish | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 4d173b965..5cb14552a 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -57,9 +57,19 @@ function __fish_print_gpg2_algo -d "Complete using all algorithms of the type sp
     #       goto loop
     #   remove everything until the first ':' of the line
     #   remove all blanks
-    #   transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    #   transliterate ',' with '\n' (macOS apparently doesn't like '\n' on RHS of the s-command)
     #   print result
-    gpg2 --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
+    #   sed script must be formatted with newlines instead of semicolons to be compatible
+    #   with BSD sed (eg, on macOS)
+    gpg2 --version | sed -ne "/$argv:/"'{:loop
+    /,$/{N; y!\n! !
+    b loop
+    }
+    s!^[^:]*:!!
+    s![ ]*!!g
+    y!,!\n!
+    p
+    }'
 end
 
 

From d4a5ef170335e4c070335b7b5affab5bde61ec7e Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Sun, 8 Sep 2019 18:34:08 +0000
Subject: [PATCH 0965/1732] rewrite __fish_complete_gpg2_key_id to produce
 better output

---
 share/completions/gpg2.fish | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 5cb14552a..1097693f3 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -21,23 +21,25 @@
 
 function __fish_complete_gpg2_user_id -d "Complete using gpg2 user ids"
     # gpg2 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 a s a
+    # completion, so we skip the <EMAIL> part and use it as a
     # description.
     # It also replaces colons with \x3a
     gpg2 --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
 end
 
 function __fish_complete_gpg2_key_id -d 'Complete using gpg2 key ids'
-    # Use user_id as the description
-    set -l lastid
+    # Use user id as description
+    set -l keyid
     gpg2 --list-keys --with-colons | while read garbage
         switch $garbage
+            # Extract user id
             case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
-            case "*"
-                echo $garbage | cut -d ":" -f 5 | read fingerprint
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
+                printf "%s\t%s\n" $keyid $uid
+            # Extract key fingerprint (no subkeys)
+            case "pub*"
+                echo $garbage | cut -d ":" -f 5 | read keyid
         end
-        printf "%s\t%s\n" $fingerprint $lastid
     end
 end
 

From 66fd52aa15083f80e51c66c37a8285600fa94dbe Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 21 Sep 2019 22:24:11 +0800
Subject: [PATCH 0966/1732] fish_xgettext: update translation generation for
 new build system

Closes #6123.
---
 CONTRIBUTING.md                | 22 ++++++++++++++++++++--
 build_tools/fish_xgettext.fish | 15 ++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a8e0bd830..b879877bc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -297,7 +297,13 @@ sudo ln -s /usr/bin/clang-format-3.9 /usr/bin/clang-format
 
 ## Message Translations
 
-Fish uses the GNU gettext library to translate messages from English to other languages. To create or update a translation run `make po/[LANGUAGE CODE].po` where `LANGUAGE CODE` is the two letter ISO 639-1 language code of the language you are translating to (e.g. `de` for German). Make sure that you have the `xgettext`, `msgfmt` and `msgmerge` commands installed in order to do this.
+Fish uses the GNU gettext library to translate messages from English to other languages.
+
+All non-debug messages output for user consumption should be marked for translation. In C++, this requires the use of the `_` (underscore) macro:
+
+```
+streams.out.append_format(_(L"%ls: There are no jobs\n"), argv[0]);
+```
 
 All messages in fish script must be enclosed in single or double quote characters. They must also be translated via a subcommand. This means that the following are **not** valid:
 
@@ -315,6 +321,18 @@ echo (_ "goodbye")
 
 Note that you can use either single or double quotes to enclose the message to be translated. You can also optionally include spaces after the opening parentheses and once again before the closing parentheses.
 
-Be cautious about blindly updating an existing translation file. Trivial changes to an existing message (e.g., changing the punctuation) will cause existing translations to be removed, since the tools do literal string matching. Therefore, in general, you need to carefully review any recommended deletions.
+Creating and updating translations requires the Gettext tools, including `xgettext`, `msgfmt` and `msgmerge`. Translation sources are stored in the `po` directory, named `LANG.po`, where `LANG` is the two letter ISO 639-1 language code of the target language (eg `de` for German).
+
+To create a new translation, for example for German:
+* generate a `messages.pot` file by running `build_tools/fish_xgettext.fish` from the source tree
+* copy `messages.pot` to `po/LANG.po` ()
+
+To update a translation:
+* generate a `messages.pot` file by running `build_tools/fish_xgettext.fish` from the source tree
+* update the existing translation by running `msgmerge --update --no-fuzzy-matching po/LANG.po messages.pot`
+
+Many tools are available for editing translation files, including command-line and graphical user interface programs.
+
+Be cautious about blindly updating an existing translation file. Trivial changes to an existing message (eg changing the punctuation) will cause existing translations to be removed, since the tools do literal string matching. Therefore, in general, you need to carefully review any recommended deletions.
 
 Read the [translations wiki](https://github.com/fish-shell/fish-shell/wiki/Translations) for more information.
diff --git a/build_tools/fish_xgettext.fish b/build_tools/fish_xgettext.fish
index eeeddaf32..9a0e2b295 100755
--- a/build_tools/fish_xgettext.fish
+++ b/build_tools/fish_xgettext.fish
@@ -1,5 +1,8 @@
 #!/usr/bin/env fish
 #
+# Tool to generate messages.pot
+# Extended to replace the old Makefile rule which did not port easily to CMak
+
 # This script was originally motivated to work around a quirk (or bug depending on your viewpoint)
 # of the xgettext command. See https://lists.gnu.org/archive/html/bug-gettext/2014-11/msg00006.html.
 # However, it turns out that even if that quirk did not exist we would still need something like
@@ -8,14 +11,19 @@
 # all the strings we want translated. So we extract and normalize all such strings into a format
 # that `xgettext` can handle.
 
+# Start with the C++ source
+xgettext -k -k_ -kN_ -LC++ --no-wrap -o messages.pot src/*.cpp src/*.h
+
 # This regex handles descriptions for `complete` and `function` statements. These messages are not
 # particularly important to translate. Hence the "implicit" label.
-set implicit_regex '(?:^| +)(?:complete|function) .*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'
+set implicit_regex '(?:^| +)(?:complete|function).*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'
 
 # This regex handles explicit requests to translate a message. These are more important to translate
 # than messages which should be implicitly translated.
 set explicit_regex '.*\( *_ (([\'"]).+?(?<!\\\\)\\2) *\).*'
 
+rm -r /tmp/fish
+
 mkdir -p /tmp/fish/implicit/share/completions /tmp/fish/implicit/share/functions
 mkdir -p /tmp/fish/explicit/share/completions /tmp/fish/explicit/share/functions
 
@@ -40,3 +48,8 @@ for f in share/config.fish share/completions/*.fish share/functions/*.fish
     end </tmp/fish/implicit/$f.tmp >/tmp/fish/implicit/$f
     rm /tmp/fish/implicit/$f.tmp
 end
+
+xgettext -j -k -kN_ -LShell --from-code=UTF-8 -cDescription --no-wrap -o messages.pot /tmp/fish/explicit/share/*/*.fish
+xgettext -j -k -kN_ -LShell --from-code=UTF-8 -cDescription --no-wrap -o messages.pot /tmp/fish/implicit/share/*/*.fish
+
+rm -r /tmp/fish

From 56c0b997994721a7ec516a5b937ac607ceb3aa45 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 11:58:42 -0700
Subject: [PATCH 0967/1732] Format conf.py with black

---
 sphinx_doc_src/conf.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 0313a7555..4b067ecc0 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -53,12 +53,13 @@ author = "fish-shell developers"
 
 # Parsing FISH-BUILD-VERSION-FILE is possible but hard to ensure that it is in the right place
 # fish_indent is guaranteed to be on PATH for the Pygments highlighter anyway
-ret = subprocess.run(('fish_indent', '--version',),
-                      stdout=subprocess.PIPE, stderr=subprocess.PIPE).stderr.decode('utf-8')
+ret = subprocess.run(
+    ("fish_indent", "--version"), stdout=subprocess.PIPE, stderr=subprocess.PIPE
+).stderr.decode("utf-8")
 # The full version, including alpha/beta/rc tags
-release = ret.strip().split(' ')[-1]
+release = ret.strip().split(" ")[-1]
 # The short X.Y version
-version = release.rsplit('.', 1)[0]
+version = release.rsplit(".", 1)[0]
 
 
 # -- General configuration ---------------------------------------------------

From d7c695114a24c7096ff4c8a2ff67d75eccb3edd7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 12:04:21 -0700
Subject: [PATCH 0968/1732] Switch from subprocess.run to subprocess.check_call

Restores Python 2 compatibility in conf.py
---
 sphinx_doc_src/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 4b067ecc0..6423f116b 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -53,9 +53,9 @@ author = "fish-shell developers"
 
 # Parsing FISH-BUILD-VERSION-FILE is possible but hard to ensure that it is in the right place
 # fish_indent is guaranteed to be on PATH for the Pygments highlighter anyway
-ret = subprocess.run(
-    ("fish_indent", "--version"), stdout=subprocess.PIPE, stderr=subprocess.PIPE
-).stderr.decode("utf-8")
+ret = subprocess.check_output(
+    ("fish_indent", "--version"), stderr=subprocess.STDOUT
+).decode("utf-8")
 # The full version, including alpha/beta/rc tags
 release = ret.strip().split(" ")[-1]
 # The short X.Y version

From 4b181df25471c6640eb76d2b70c80064768c0b4b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 12:12:08 -0700
Subject: [PATCH 0969/1732] Correctly detect the presence of gdate

Fixes some test spew
---
 tests/test_util.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_util.fish b/tests/test_util.fish
index c49a9a38e..402b5e823 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -136,7 +136,7 @@ end
 
 # lame timer
 for program in {g,}date
-    if $program --version 1>/dev/null 2>/dev/null
+    if command -q $program
         set milli $program
         set unit ms
         break

From 6c5c0a73ebf5f75d3bc53d34befefa524af693a0 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 00:01:39 +0200
Subject: [PATCH 0970/1732] remove useless call, fix comment

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

diff --git a/src/reader.cpp b/src/reader.cpp
index cc7dae99f..845ad05f7 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -417,7 +417,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     /// Do what we need to do whenever our command line changes.
     void command_line_changed(const editable_line_t *el);
 
-    /// Do what we need to do whenever our pager selection.
+    /// Do what we need to do whenever our pager selection changes.
     void pager_selection_changed();
 
     /// Expand abbreviations at the current cursor position, minus backtrack_amt.
@@ -1606,8 +1606,6 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
         prefix.append(el->text, prefix_start + len - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
     }
 
-    wchar_t quote;
-    parse_util_get_parameter_info(el->text, el->position, &quote, NULL, NULL);
     // Update the pager data.
     pager.set_prefix(prefix);
     pager.set_completions(surviving_completions);

From e9e92178a960e72a520a0628c14e9d77882d9f6e Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 08:39:46 +0200
Subject: [PATCH 0971/1732] completions: simplify prefix computation

---
 src/reader.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 845ad05f7..59cb4a3da 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1589,21 +1589,15 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
     }
 
     // We didn't get a common prefix, or we want to print the list anyways.
-    size_t len, prefix_start = 0;
     wcstring prefix;
-    parse_util_get_parameter_info(el->text, el->position, NULL, &prefix_start, NULL);
-
-    assert(el->position >= prefix_start);
-    len = el->position - prefix_start;
-
     if (will_replace_token || match_type_requires_full_replacement(best_match_type)) {
         prefix.clear();  // no prefix
-    } else if (len <= PREFIX_MAX_LEN) {
-        prefix.append(el->text, prefix_start, len);
+    } else if (tok.size() <= PREFIX_MAX_LEN) {
+        prefix = tok;
     } else {
         // Append just the end of the string.
         prefix = wcstring{get_ellipsis_char()};
-        prefix.append(el->text, prefix_start + len - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
+        prefix.append(tok, tok.size() - PREFIX_MAX_LEN, PREFIX_MAX_LEN);
     }
 
     // Update the pager data.

From a7ea7648c3a1656515badac6e78d7519220b069a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 9 Sep 2019 21:54:44 +0200
Subject: [PATCH 0972/1732] Completion: maintain cursor position when there is
 no completion

Previously, tab-completion would move the cursor to the end of the current token, even
if no completion is inserted. This commit defers moving the cursor until we insert a completion.

Fixes #4124
---
 src/reader.cpp | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 59cb4a3da..27883eb52 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -457,7 +457,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
 
     void mark_repaint_needed() { repaint_needed = true; }
 
-    void completion_insert(const wchar_t *val, complete_flags_t flags);
+    void completion_insert(const wchar_t *val, size_t token_end, complete_flags_t flags);
 
     bool can_autosuggest() const;
     void autosuggest_completed(autosuggestion_result_t result);
@@ -473,8 +473,8 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     bool jump(jump_direction_t dir, jump_precision_t precision, editable_line_t *el,
               wchar_t target);
 
-    bool handle_completions(const std::vector<completion_t> &comp,
-                            bool cont_after_prefix_insertion);
+    bool handle_completions(const std::vector<completion_t> &comp, size_t token_begin,
+                            size_t token_end, bool cont_after_prefix_insertion);
 
     void sanity_check() const;
     void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, size_t pos);
@@ -1230,10 +1230,18 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
 /// not and correctly escapes the string.
 ///
 /// \param val the string to insert
+/// \param token_end the position after the token to complete
 /// \param flags A union of all flags describing the completion to insert. See the completion_t
 /// struct for more information on possible values.
-void reader_data_t::completion_insert(const wchar_t *val, complete_flags_t flags) {
+void reader_data_t::completion_insert(const wchar_t *val, size_t token_end,
+                                      complete_flags_t flags) {
     editable_line_t *el = active_edit_line();
+
+    // Move the cursor to the end of the token.
+    if (el->position != token_end) {
+        update_buff_pos(el, token_end);  // repaint() is done later
+    }
+
     size_t cursor = el->position;
     wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text, &cursor,
                                                                  false /* not append only */);
@@ -1460,21 +1468,19 @@ static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &c
 /// through the completions.
 ///
 /// \param comp the list of completion strings
+/// \param token_begin the position of the token to complete
+/// \param token_end the position after the token to complete
 /// \param cont_after_prefix_insertion If we have a shared prefix, whether to print the list of
 /// completions after inserting it.
 ///
 /// Return true if we inserted text into the command line, false if we did not.
-bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
-                                       bool cont_after_prefix_insertion) {
+bool reader_data_t::handle_completions(const std::vector<completion_t> &comp, size_t token_begin,
+                                       size_t token_end, bool cont_after_prefix_insertion) {
     bool done = false;
     bool success = false;
     const editable_line_t *el = &command_line;
-    const wchar_t *begin, *end, *buff = el->text.c_str();
 
-    parse_util_token_extent(buff, el->position, &begin, 0, 0, 0);
-    end = buff + el->position;
-
-    const wcstring tok(begin, end - begin);
+    const wcstring tok(el->text.c_str() + token_begin, token_end - token_begin);
 
     // Check trivial cases.
     size_t size = comp.size();
@@ -1490,7 +1496,7 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
         // If this is a replacement completion, check that we know how to replace it, e.g. that
         // the token doesn't contain evil operators like {}.
         if (!(c.flags & COMPLETE_REPLACES_TOKEN) || reader_can_replace(tok, c.flags)) {
-            completion_insert(c.completion.c_str(), c.flags);
+            completion_insert(c.completion.c_str(), token_end, c.flags);
         }
         done = true;
         success = true;
@@ -1579,7 +1585,7 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp,
             // We got something. If more than one completion contributed, then it means we have
             // a prefix; don't insert a space after it.
             if (prefix_is_partial_completion) flags |= COMPLETE_NO_SPACE;
-            completion_insert(common_prefix.c_str(), flags);
+            completion_insert(common_prefix.c_str(), token_end, flags);
             success = true;
         }
     }
@@ -2527,16 +2533,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // (echo foo) the last token is 'foo)'. Don't let that happen.
                 if (token_end > cmdsub_end) token_end = cmdsub_end;
 
-                // Figure out how many steps to get from the current position to the end of the
-                // current token.
-                size_t end_of_token_offset = token_end - buff;
-
-                // Move the cursor to the end.
-                if (el->position != end_of_token_offset) {
-                    update_buff_pos(el, end_of_token_offset);
-                    repaint();
-                }
-
                 // Construct a copy of the string from the beginning of the command substitution
                 // up to the end of the token we're completing.
                 const wcstring buffcpy = wcstring(cmdsub_begin, token_end);
@@ -2551,10 +2547,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
                 // Record our cycle_command_line.
                 cycle_command_line = el->text;
-                cycle_cursor_pos = el->position;
+                cycle_cursor_pos = token_end - buff;
 
                 bool cont_after_prefix_insertion = (c == rl::complete_and_search);
-                rls.comp_empty = handle_completions(rls.comp, cont_after_prefix_insertion);
+                rls.comp_empty = handle_completions(rls.comp, token_begin - buff, token_end - buff,
+                                                    cont_after_prefix_insertion);
 
                 // Show the search field if requested and if we printed a list of completions.
                 if (c == rl::complete_and_search && !rls.comp_empty && !pager.empty()) {

From a1f1abc137d0684cb22ae3d6aa4579243c586895 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 12:40:24 -0700
Subject: [PATCH 0973/1732] Stop passing true to escape_string

It wants a flags, not a boolean.
---
 src/builtin_functions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 919b1f131..c5a297b0d 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -139,11 +139,11 @@ static wcstring functions_def(const wcstring &name) {
     // But If the function name starts with a -, we'll need to output it after all the options.
     bool defer_function_name = (name.at(0) == L'-');
     if (!defer_function_name) {
-        out.append(escape_string(name, true));
+        out.append(escape_string(name, ESCAPE_ALL));
     }
 
     if (!desc.empty()) {
-        wcstring esc_desc = escape_string(desc, true);
+        wcstring esc_desc = escape_string(desc, ESCAPE_ALL);
         out.append(L" --description ");
         out.append(esc_desc);
     }
@@ -200,7 +200,7 @@ static wcstring functions_def(const wcstring &name) {
     // Output the function name if we deferred it.
     if (defer_function_name) {
         out.append(L" -- ");
-        out.append(escape_string(name, true));
+        out.append(escape_string(name, ESCAPE_ALL));
     }
 
     // Output any inherited variables as `set -l` lines.
@@ -319,7 +319,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     if (opts.report_metadata) {
         if (argc - optind != 1) {
-            streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, argv[optind -1], 1,
+            streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, argv[optind - 1], 1,
                                       argc - optind);
             return STATUS_INVALID_ARGS;
         }

From 95aea7839de17d83e9678b0c9e845d53c11f5c40 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 12:48:51 -0700
Subject: [PATCH 0974/1732] Show wrap targets when printing a function

Fixes #1625
---
 src/builtin_functions.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index c5a297b0d..d55a43bae 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -15,6 +15,7 @@
 #include "builtin.h"
 #include "builtin_functions.h"
 #include "common.h"
+#include "complete.h"
 #include "env.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
@@ -136,12 +137,18 @@ static wcstring functions_def(const wcstring &name) {
     out.append(L"function ");
 
     // Typically we prefer to specify the function name first, e.g. "function foo --description bar"
-    // But If the function name starts with a -, we'll need to output it after all the options.
+    // But if the function name starts with a -, we'll need to output it after all the options.
     bool defer_function_name = (name.at(0) == L'-');
     if (!defer_function_name) {
         out.append(escape_string(name, ESCAPE_ALL));
     }
 
+    // Output wrap targets.
+    for (const wcstring &wrap : complete_get_wrap_targets(name)) {
+        out.append(L" --wraps=");
+        out.append(escape_string(wrap, ESCAPE_ALL));
+    }
+
     if (!desc.empty()) {
         wcstring esc_desc = escape_string(desc, ESCAPE_ALL);
         out.append(L" --description ");

From 3f2f44ce739a5ea9f5f9d9505f7e218698c625da Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 13:07:19 -0700
Subject: [PATCH 0975/1732] Introduce reader_test_should_cancel

This centralizes the logic around cancellation due to either sigint or a
stale threaded operation.
---
 src/complete.cpp |  8 ++------
 src/history.cpp  |  3 +--
 src/reader.cpp   | 17 +++++++++--------
 src/reader.h     | 11 ++++-------
 src/wildcard.cpp |  5 +----
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 023508864..0689f1656 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1278,9 +1278,7 @@ bool completer_t::try_complete_user(const wcstring &str) {
     setpwent();
     // cppcheck-suppress getpwentCalled
     while (struct passwd *pw = getpwent()) {
-        bool interrupted =
-            is_main_thread() ? reader_test_and_clear_interrupted() : reader_thread_job_is_stale();
-        if (interrupted) {
+        if (reader_test_should_cancel()) {
             break;
         }
         const wcstring pw_name_str = str2wcstring(pw->pw_name);
@@ -1670,9 +1668,7 @@ static void append_switch(wcstring &out, const wcstring opt, const wcstring arg)
     if (arg.empty()) return;
     append_format(out, L" --%ls %ls", opt.c_str(), escape_string(arg, ESCAPE_ALL).c_str());
 }
-static void append_switch(wcstring &out, wchar_t opt) {
-    append_format(out, L" -%lc", opt);
-}
+static void append_switch(wcstring &out, wchar_t opt) { append_format(out, L" -%lc", opt); }
 static void append_switch(wcstring &out, const wcstring opt) {
     append_format(out, L" --%ls", opt.c_str());
 }
diff --git a/src/history.cpp b/src/history.cpp
index ba12fe40c..ea2bb5c1c 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -579,11 +579,10 @@ bool history_search_t::go_backwards() {
     const size_t max_index = (size_t)-1;
 
     if (current_index_ == max_index) return false;
-    const bool main_thread = is_main_thread();
 
     size_t index = current_index_;
     while (++index < max_index) {
-        if (main_thread ? reader_test_and_clear_interrupted() : reader_thread_job_is_stale()) {
+        if (reader_test_should_cancel()) {
             return false;
         }
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 27883eb52..7474dfcfe 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -836,7 +836,13 @@ void reader_data_t::repaint_if_needed() {
 
 void reader_reset_interrupted() { interrupted = 0; }
 
-bool reader_test_interrupted() { return interrupted != 0; }
+bool reader_test_should_cancel() {
+    if (is_main_thread()) {
+        return interrupted;
+    } else {
+        return read_generation_count() != s_thread_generation;
+    }
+}
 
 bool reader_test_and_clear_interrupted() {
     int res = interrupted;
@@ -846,11 +852,6 @@ bool reader_test_and_clear_interrupted() {
     return res != 0;
 }
 
-bool reader_thread_job_is_stale() {
-    ASSERT_IS_BACKGROUND_THREAD();
-    return read_generation_count() != s_thread_generation;
-}
-
 void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor_position) {
     if (!term_supports_setting_title()) return;
 
@@ -1275,7 +1276,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         }
 
         history_search_t searcher(*history, search_string, HISTORY_SEARCH_TYPE_PREFIX);
-        while (!reader_thread_job_is_stale() && searcher.go_backwards()) {
+        while (!reader_test_should_cancel() && searcher.go_backwards()) {
             history_item_t item = searcher.current_item();
 
             // Skip items with newlines because they make terrible autosuggestions.
@@ -1288,7 +1289,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         }
 
         // Maybe cancel here.
-        if (reader_thread_job_is_stale()) return nothing;
+        if (reader_test_should_cancel()) return nothing;
 
         // Here we do something a little funny. If the line ends with a space, and the cursor is not
         // at the end, don't use completion autosuggestions. It ends up being pretty weird seeing
diff --git a/src/reader.h b/src/reader.h
index 76d7a6137..a6b4ca3ef 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -115,8 +115,10 @@ size_t reader_get_cursor_pos();
 /// selection, true otherwise.
 bool reader_get_selection(size_t *start, size_t *len);
 
-/// Return the value of the interrupted flag, which is set by the sigint handler.
-bool reader_test_interrupted();
+/// Return whether we have been interrupted and should cancel the current operation.
+/// This may be because we received a sigint, or because we are in a background thread
+/// and the job is now stale.
+bool reader_test_should_cancel();
 
 /// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it
 /// was set.
@@ -131,11 +133,6 @@ void reader_reset_interrupted();
 /// was set. If the current reader is interruptible, call \c reader_exit().
 int reader_reading_interrupted();
 
-/// Returns true if the current reader generation count does not equal the generation count the
-/// current thread was started with. Note 1: currently only valid for autocompletion threads! Other
-/// threads don't set the threadlocal generation count when they start up.
-bool reader_thread_job_is_stale();
-
 /// Read one line of input. Before calling this function, reader_push() must have been called in
 /// order to set up a valid reader environment. If nchars > 0, return after reading that many
 /// characters even if a full line has not yet been read. Note: the returned value may be longer
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 0c908f3da..53e222a8c 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -499,10 +499,7 @@ class wildcard_expander_t {
 
     /// Indicate whether we should cancel wildcard expansion. This latches 'interrupt'.
     bool interrupted() {
-        if (!did_interrupt) {
-            did_interrupt = (is_main_thread() ? reader_test_and_clear_interrupted()
-                                              : reader_thread_job_is_stale());
-        }
+        did_interrupt = did_interrupt || reader_test_should_cancel();
         return did_interrupt;
     }
 

From 77dbe109e052d1de46250741cb2a6a0597f833ae Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 13:11:45 -0700
Subject: [PATCH 0976/1732] Allow cancellation out of expanding a runaway wrap
 chain

This makes it easier to control-C out of a completion.
---
 src/complete.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/complete.cpp b/src/complete.cpp
index 0689f1656..b334da2fa 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1083,6 +1083,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
 /// Perform generic (not command-specific) expansions on the specified string.
 void completer_t::complete_param_expand(const wcstring &str, bool do_file,
                                         bool handle_as_special_cd) {
+    if (reader_test_should_cancel()) return;
     expand_flags_t flags =
         this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::for_completions;
 
@@ -1318,6 +1319,7 @@ static void walk_wrap_chain(const wcstring &command_line, source_range_t command
                             const wrap_chain_visitor_t &visitor, size_t depth = 0) {
     // Limit our recursion depth. This prevents cycles in the wrap chain graph from overflowing.
     if (depth > 24) return;
+    if (reader_test_should_cancel()) return;
 
     // Extract command from the command line and invoke the receiver with it.
     wcstring command(command_line, command_range.start, command_range.length);

From 5f64972908949b423170482b058446630d350571 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 13:38:59 -0700
Subject: [PATCH 0977/1732] Do not try the same (command, wraps) pair more than
 once when completing

This prevents runaway wrap chains. Fixes #5638.
---
 src/complete.cpp        | 39 ++++++++++++++++++++++++++++-----------
 tests/checks/wraps.fish | 29 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 tests/checks/wraps.fish

diff --git a/src/complete.cpp b/src/complete.cpp
index b334da2fa..ce95bb211 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -19,6 +19,7 @@
 #include <list>
 #include <memory>
 #include <numeric>
+#include <set>
 #include <string>
 #include <type_traits>
 #include <unordered_map>
@@ -1307,16 +1308,16 @@ bool completer_t::try_complete_user(const wcstring &str) {
 #endif
 }
 
-// The callback type for walk_wrap_chain
+// The callback type for walk_wrap_chain.
 using wrap_chain_visitor_t = std::function<void(const wcstring &, const wcstring &, size_t depth)>;
 
-// Helper to complete a parameter for a command and its transitive wrap chain.
-// Given a command line \p command_line and the range of the command itself within the command line
-// as \p command_range, invoke the \p receiver with the command and the command line. Then, for each
-// target wrapped by the given command, update the command line with that target and invoke this
-// recursively.
-static void walk_wrap_chain(const wcstring &command_line, source_range_t command_range,
-                            const wrap_chain_visitor_t &visitor, size_t depth = 0) {
+// A set tracking which (command, wrap) pairs we have seen.
+using wrap_chain_visited_set_t = std::set<std::pair<wcstring, wcstring>>;
+
+// Recursive implementation of walk_wrap_chain().
+static void walk_wrap_chain_recursive(const wcstring &command_line, source_range_t command_range,
+                                      const wrap_chain_visitor_t &visitor,
+                                      wrap_chain_visited_set_t *visited, size_t depth) {
     // Limit our recursion depth. This prevents cycles in the wrap chain graph from overflowing.
     if (depth > 24) return;
     if (reader_test_should_cancel()) return;
@@ -1339,14 +1340,30 @@ static void walk_wrap_chain(const wcstring &command_line, source_range_t command
         if (!wrapped_command.empty()) {
             size_t where = faux_commandline.find(wrapped_command, command_range.start);
             if (where != wcstring::npos) {
-                // Recurse with our new command and command line.
-                source_range_t faux_source_range{uint32_t(where), uint32_t(wrapped_command.size())};
-                walk_wrap_chain(faux_commandline, faux_source_range, visitor, depth + 1);
+                // Do not recurse if we have already seen this.
+                if (visited->insert({command, wrapped_command}).second) {
+                    // Recurse with our new command and command line.
+                    source_range_t faux_source_range{uint32_t(where),
+                                                     uint32_t(wrapped_command.size())};
+                    walk_wrap_chain_recursive(faux_commandline, faux_source_range, visitor, visited,
+                                              depth + 1);
+                }
             }
         }
     }
 }
 
+// Helper to complete a parameter for a command and its transitive wrap chain.
+// Given a command line \p command_line and the range of the command itself within the command line
+// as \p command_range, invoke the \p receiver with the command and the command line. Then, for each
+// target wrapped by the given command, update the command line with that target and invoke this
+// recursively.
+static void walk_wrap_chain(const wcstring &command_line, source_range_t command_range,
+                            const wrap_chain_visitor_t &visitor) {
+    wrap_chain_visited_set_t visited;
+    walk_wrap_chain_recursive(command_line, command_range, visitor, &visited, 0);
+}
+
 /// If the argument contains a '[' typed by the user, completion by appending to the argument might
 /// produce an invalid token (#5831).
 ///
diff --git a/tests/checks/wraps.fish b/tests/checks/wraps.fish
new file mode 100644
index 000000000..5ffc9edb5
--- /dev/null
+++ b/tests/checks/wraps.fish
@@ -0,0 +1,29 @@
+#RUN: %fish %s
+# Validate some things about command wrapping.
+
+# This tests that we do not trigger a combinatorial explosion - see #5638.
+# Ensure it completes successully.
+complete -c testcommand --wraps "testcommand x "
+complete -c testcommand --wraps "testcommand y "
+complete -c testcommand --no-files -a normal
+complete -C'testcommand '
+# CHECK: normal
+
+# We get the same completion twice. TODO: fix this.
+# CHECK: normal
+
+
+# This tests that a call to complete from within a completion doesn't trigger
+# wrap chain explosion - #5638 again.
+function testcommand2_complete
+    set -l tokens (commandline -opc) (commandline -ct)
+    set -e tokens[1]
+    echo $tokens 1>&2
+    complete -C"$tokens"
+end
+
+complete -c testcommand2 -x -a "(testcommand2_complete)"
+complete -c testcommand2 --wraps "testcommand2 from_wraps "
+complete -C'testcommand2 explicit '
+# CHECKERR: explicit
+# CHECKERR: from_wraps explicit

From 3f7bc7232ed79037c2c27a255dba974532a5076a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 14:31:13 -0700
Subject: [PATCH 0978/1732] yank_POP -> yank_pop

---
 src/input.cpp      | 2 +-
 src/input_common.h | 2 +-
 src/reader.cpp     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index c1f15ae0f..a4d293e09 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -97,7 +97,7 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::backward_delete_char, L"backward-delete-char"},
     {readline_cmd_t::kill_line, L"kill-line"},
     {readline_cmd_t::yank, L"yank"},
-    {readline_cmd_t::yank_POP, L"yank-pop"},
+    {readline_cmd_t::yank_pop, L"yank-pop"},
     {readline_cmd_t::complete, L"complete"},
     {readline_cmd_t::complete_and_search, L"complete-and-search"},
     {readline_cmd_t::pager_toggle_search, L"pager-toggle-search"},
diff --git a/src/input_common.h b/src/input_common.h
index 4f616d116..b7d67b761 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -23,7 +23,7 @@ enum class readline_cmd_t {
     backward_delete_char,
     kill_line,
     yank,
-    yank_POP,
+    yank_pop,
     complete,
     complete_and_search,
     pager_toggle_search,
diff --git a/src/reader.cpp b/src/reader.cpp
index 7474dfcfe..22d6b3e42 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1040,7 +1040,7 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
         case rl::backward_delete_char:
         case rl::kill_line:
         case rl::yank:
-        case rl::yank_POP:
+        case rl::yank_pop:
         case rl::backward_kill_line:
         case rl::kill_whole_line:
         case rl::kill_word:
@@ -2650,7 +2650,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             rls.yank_len = yank_str.size();
             break;
         }
-        case rl::yank_POP: {
+        case rl::yank_pop: {
             if (rls.yank_len) {
                 for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
 
@@ -3231,7 +3231,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) &&
                "Should have a char or readline");
 
-        if (rls.last_cmd != rl::yank && rls.last_cmd != rl::yank_POP) {
+        if (rls.last_cmd != rl::yank && rls.last_cmd != rl::yank_pop) {
             rls.yank_len = 0;
         }
 

From 1ecbe363d07cd0a06eb4accebfeb296756b8d186 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 15:17:09 -0700
Subject: [PATCH 0979/1732] Correct an assertion message

---
 src/reader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 22d6b3e42..561b50cd9 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3149,10 +3149,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
             // Some commands should have been handled internally by input_readch().
         case rl::self_insert: {
-            DIE("self-insert should have been handled by input_readch");
+            DIE("self-insert should have been handled by inputter_t::readch");
         }
         case rl::func_and: {
-            DIE("self-insert should have been handled by input_readch");
+            DIE("self-insert should have been handled by inputter_t::readch");
         }
         case rl::vi_arg_digit:
         case rl::vi_delete_to: {

From 18b56637f794db1a01ef0003e30f52fb4217c814 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 15:57:21 -0700
Subject: [PATCH 0980/1732] self-insert bindings to insert their own sequence

Prior to this fix, self-insert would always wait for a new character.
Track in char_event what sequence generated the readline event, and then
if the sequence is not empty, insert that sequence.

This will support implementing the space binding via pure readline
functions.
---
 src/input.cpp      | 9 +++++++--
 src/input_common.h | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index a4d293e09..cc200b496 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -377,7 +377,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
              it != end; ++it) {
             readline_cmd_t code = input_function_get_code(*it).value();
             function_push_args(code);
-            event_queue_.push_front(code);
+            event_queue_.push_front(char_event_t(code, m.seq));
         }
     } else if (has_commands && !has_functions) {
         // Execute all commands.
@@ -404,7 +404,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
 bool inputter_t::mapping_is_match(const input_mapping_t &m) {
     const wcstring &str = m.seq;
 
-    assert(str.size() > 0 && "zero-length input string passed to input_mapping_is_match!");
+    assert(str.size() > 0 && "zero-length input string passed to mapping_is_match!");
 
     bool timed = false;
     for (size_t i = 0; i < str.size(); ++i) {
@@ -495,6 +495,11 @@ char_event_t inputter_t::readch(bool allow_commands) {
         if (evt.is_readline()) {
             switch (evt.get_readline()) {
                 case readline_cmd_t::self_insert: {
+                    // Typically self-insert is generated by the generic (empty) binding.
+                    // However if it is generated by a real sequence, then insert that sequence.
+                    for (auto iter = evt.seq.crbegin(); iter != evt.seq.crend(); ++iter) {
+                        event_queue_.push_front(*iter);
+                    }
                     // Issue #1595: ensure we only insert characters, not readline functions. The
                     // common case is that this will be empty.
                     return read_characters_no_readline();
diff --git a/src/input_common.h b/src/input_common.h
index b7d67b761..8a728e1ba 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -105,8 +105,13 @@ class char_event_t {
     } v_{};
 
    public:
+    /// The type of event.
     char_event_type_t type;
 
+    /// The sequence of characters in the input mapping which generated this event.
+    /// Note that the generic self-insert case does not have any characters, so this would be empty.
+    wcstring seq{};
+
     bool is_timeout() const { return type == char_event_type_t::timeout; }
 
     bool is_char() const { return type == char_event_type_t::charc; }
@@ -129,7 +134,8 @@ class char_event_t {
 
     /* implicit */ char_event_t(wchar_t c) : type(char_event_type_t::charc) { v_.c = c; }
 
-    /* implicit */ char_event_t(readline_cmd_t rl) : type(char_event_type_t::readline) {
+    /* implicit */ char_event_t(readline_cmd_t rl, wcstring seq = {})
+        : type(char_event_type_t::readline), seq(std::move(seq)) {
         v_.rl = rl;
     }
 

From e1f46d22de2e9b11361b82ea03c6aec4ce2bab34 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 16:04:57 -0700
Subject: [PATCH 0981/1732] Simplify space binding and fix search

With the new support for self-insert inserting a bound sequence,
the default binding for space as expanding abbreviations can be simplified
to just `self-insert expand-abbr`. This also fixes the bug where space
would cancel pager search.
---
 share/functions/fish_default_key_bindings.fish | 2 +-
 share/functions/fish_vi_key_bindings.fish      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index 5bf00b216..73583c5a7 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -32,7 +32,7 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
     or exit # protect against invalid $argv
 
     # Space expands abbrs _and_ inserts itself.
-    bind --preset $argv " " 'commandline -i " "; commandline -f expand-abbr'
+    bind --preset $argv " " self-insert expand-abbr
 
     bind --preset $argv \n execute
     bind --preset $argv \r execute
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 4a7366ed8..0b002cf9b 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -55,7 +55,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
 
     bind -s --preset -M insert "" self-insert
     # Space expands abbrs _and_ inserts itself.
-    bind -s --preset -M insert " " 'commandline -i " "; commandline -f expand-abbr'
+    bind -s --preset -M insert " " self-insert expand-abbr
 
     # Add a way to switch from insert to normal (command) mode.
     # Note if we are paging, we want to stay in insert mode

From 6bbf3726fc754a3b0bd8c18ad45505e032ac241c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 16:04:47 -0700
Subject: [PATCH 0982/1732] Relnote expand-abbr and self-insert changes

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a594ff075..4243d4675 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
 - When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
 - The nul character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
+- A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
+- The `self-insert` readline command will now insert the binding sequence, if not empty.
 
 ### For distributors and developers
 - The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.

From 7804a5e47722679c0688e729783095830581a494 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 21 Sep 2019 18:40:32 -0700
Subject: [PATCH 0983/1732] Revert "Correctly detect the presence of gdate"

This reverts commit 4b181df25471c6640eb76d2b70c80064768c0b4b.

It will result in systems without a GNU date having a literal "N"
in the output.
---
 tests/test_util.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_util.fish b/tests/test_util.fish
index 402b5e823..c49a9a38e 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -136,7 +136,7 @@ end
 
 # lame timer
 for program in {g,}date
-    if command -q $program
+    if $program --version 1>/dev/null 2>/dev/null
         set milli $program
         set unit ms
         break

From 902c6ec4a31820e599ee54fd388d53dfc86d431c Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 21 Sep 2019 18:42:55 -0700
Subject: [PATCH 0984/1732] Check for {g,}date existance before trying
 --version

---
 tests/test_util.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_util.fish b/tests/test_util.fish
index c49a9a38e..5d6ce8840 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -136,7 +136,7 @@ end
 
 # lame timer
 for program in {g,}date
-    if $program --version 1>/dev/null 2>/dev/null
+    if command -q $program && $program --version 1>/dev/null 2>/dev/null
         set milli $program
         set unit ms
         break

From 70a1d8314c51691ba7b1aa7ada5d3fe3d7964d83 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Sep 2019 19:36:56 -0700
Subject: [PATCH 0985/1732] Optimize parse_color

---
 src/output.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/output.cpp b/src/output.cpp
index 5ce29e547..2320a8ae6 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -466,17 +466,14 @@ rgb_color_t parse_color(const env_var_t &var, bool is_background) {
 
     std::vector<rgb_color_t> candidates;
 
-    wcstring_list_t el;
-    var.to_list(el);
-
-    for (size_t j = 0; j < el.size(); j++) {
-        const wcstring &next = el.at(j);
-        wcstring color_name;
+    wcstring color_name;
+    for (const wcstring &next : var.as_list()) {
+        color_name.clear();
         if (is_background) {
             // Look for something like "--background=red".
-            const wcstring prefix = L"--background=";
+            const wchar_t *prefix = L"--background=";
             if (string_prefixes_string(prefix, next)) {
-                color_name = wcstring(next, prefix.size());
+                color_name = wcstring(next, wcslen(prefix));
             }
         } else {
             if (next == L"--bold" || next == L"-o")

From d99c19cc033a6ace2282dcb56a1e90fe5569da21 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 22 Sep 2019 19:01:41 +0200
Subject: [PATCH 0986/1732] Fix completions for chown (#6132)

Reproducer: type `chown --f<TAB>`
---
 share/completions/chown.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/chown.fish b/share/completions/chown.fish
index 11eb6fae7..5d72dfd24 100644
--- a/share/completions/chown.fish
+++ b/share/completions/chown.fish
@@ -9,4 +9,4 @@ 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)"
+complete -c chown -d "Username" -a "(string match -r -- '.*:' (commandline -ct))(__fish_complete_groups)"

From eef62b8848811cf709a6108cf28cb85cb4b2fec6 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 22 Sep 2019 14:00:57 -0700
Subject: [PATCH 0987/1732] Correct wc completions for macOS, BSDs.

---
 share/completions/wc.fish | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/share/completions/wc.fish b/share/completions/wc.fish
index a9c2dcc39..efbccb3d6 100644
--- a/share/completions/wc.fish
+++ b/share/completions/wc.fish
@@ -1,7 +1,20 @@
-complete -c wc -s c -l bytes -d "Print byte counts"
-complete -c wc -s m -l chars -d "Print character counts"
-complete -c wc -s l -l lines -d "Print newline counts"
-complete -c wc -s L -l max-line-length -d "Print length of longest line"
-complete -c wc -s w -l words -d "Print word counts"
-complete -c wc -l help -d "Display help and exit"
-complete -c wc -l version -d "Display version and exit"
+if command -q wc && command wc --version >/dev/null 2>/dev/null
+	complete -c wc -s c -l bytes -d "Print byte count"
+	complete -c wc -s m -l chars -d "Print character count"
+	complete -c wc -s l -l lines -d "Print number of lines"
+	complete -c wc -s L -l max-line-length -d "Print length of longest line"
+	complete -c wc -s w -l words -d "Print number of words"
+	complete -c wc -l help -d "Display help and exit"
+	complete -c wc -l version -d "Display version and exit"
+else
+	complete -c wc -s c -d "Print byte count"
+	complete -c wc -s m -d "Print character count"
+	complete -c wc -s l -d "Print number of lines"
+	complete -c wc -s w -d "Print number of words"
+	switch (uname -s)
+		case FreeBSD NetBSD
+			complete -c wc -s L -d "Print length of longest line"
+		case OpenBSD
+			complete -c wc -s h -d "Use B, KB, MB, GB, TB, PB, EB unit suffixes"
+	end
+end

From bc533ad939bf7421e27c071c531cc6169c765f19 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 12 Sep 2019 17:58:42 +0200
Subject: [PATCH 0988/1732] Fix completion inside command substitution
 inserting spurious quote

Reproducer: type `: (: ""`, move the cursor after the second colon and press tab.
---
 src/reader.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 561b50cd9..bdc3b769e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1184,7 +1184,17 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
     wchar_t quote = L'\0';
     wcstring replaced;
     if (do_escape) {
-        parse_util_get_parameter_info(command_line, cursor_pos, &quote, NULL, NULL);
+        // We need to figure out whether the token we complete has unclosed quotes. Since the token
+        // may be inside a command substitutions we must first determine the extents of the
+        // innermost command substitution.
+        const wchar_t *cmdsub_begin, *cmdsub_end;
+        parse_util_cmdsubst_extent(command_line.c_str(), cursor_pos, &cmdsub_begin, &cmdsub_end);
+        size_t cmdsub_offset = cmdsub_begin - command_line.c_str();
+        // Find the last quote in the token to complete. By parsing only the string inside any
+        // command substitution, we prevent the tokenizer from treating the entire command
+        // substitution as one token.
+        parse_util_get_parameter_info(command_line.substr(cmdsub_offset, (cmdsub_end - cmdsub_begin)),
+                                      cursor_pos - cmdsub_offset, &quote, NULL, NULL);
 
         // If the token is reported as unquoted, but ends with a (unescaped) quote, and we can
         // modify the command line, then delete the trailing quote so that we can insert within

From a19d9b2e73cbab3b923319b69d69c50aabb3c1fc Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Sep 2019 14:06:14 -0700
Subject: [PATCH 0989/1732] Add a test for #6130

---
 src/fish_tests.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 5ef421ae7..6c7f0565c 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2869,6 +2869,9 @@ static void test_completion_insertions() {
 
     TEST_1_COMPLETION(L"foo^", L"bar", COMPLETE_REPLACES_TOKEN, false, L"bar ^");
     TEST_1_COMPLETION(L"'foo^", L"bar", COMPLETE_REPLACES_TOKEN, false, L"bar ^");
+
+    // See #6130
+    TEST_1_COMPLETION(L": (:^ ''", L"", 0, false, L": (: ^''");
 }
 
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,

From a3db4128bc18c09cddf8b03cb3e908a2815d3216 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 22 Sep 2019 15:46:39 -0700
Subject: [PATCH 0990/1732] use std::tolower

---
 src/builtin_string.cpp | 4 ++--
 src/expand.h           | 4 ++--
 src/history.cpp        | 3 ++-
 src/wcstringutil.cpp   | 8 --------
 src/wcstringutil.h     | 3 ---
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 3b4b17b6a..ef544c7da 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -633,7 +633,7 @@ class wildcard_matcher_t : public string_matcher_t {
                        io_streams_t &streams)
         : string_matcher_t(opts, streams), wcpattern(parse_util_unescape_wildcards(pattern)) {
         if (opts.ignore_case) {
-            wcpattern = wcstolower(std::move(wcpattern));
+            wcpattern = std::tolower(std::move(wcpattern));
         }
         if (opts.entire) {
             if (!wcpattern.empty()) {
@@ -654,7 +654,7 @@ class wildcard_matcher_t : public string_matcher_t {
         bool match;
 
         if (opts.ignore_case) {
-            match = wildcard_match(wcstolower(arg), wcpattern, false);
+            match = wildcard_match(std::tolower(arg), wcpattern, false);
         } else {
             match = wildcard_match(arg, wcpattern, false);
         }
diff --git a/src/expand.h b/src/expand.h
index 371724307..40d4832c1 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -79,9 +79,9 @@ enum : wchar_t {
     VARIABLE_EXPAND,
     /// Character representing variable expansion into a single element.
     VARIABLE_EXPAND_SINGLE,
-    /// Character representing the start of a bracket expansion.
+    /// Character representing the start of a brace expansion.
     BRACE_BEGIN,
-    /// Character representing the end of a bracket expansion.
+    /// Character representing the end of a brace expansion.
     BRACE_END,
     /// Character representing separation between two bracket elements.
     BRACE_SEP,
diff --git a/src/history.cpp b/src/history.cpp
index ea2bb5c1c..182e0b3b3 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -22,6 +22,7 @@
 #include <cwchar>
 #include <functional>
 #include <iterator>
+#include <locale>
 #include <map>
 #include <numeric>
 #include <type_traits>
@@ -180,7 +181,7 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
     // search object if we're doing a case insensitive search.
     wcstring contents_lower;
     if (!case_sensitive) {
-        contents_lower = wcstolower(contents);
+        contents_lower = std::tolower(contents);
     }
     const wcstring &content_to_match = case_sensitive ? contents : contents_lower;
 
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index 3691f79e5..ea5f8b9a9 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -4,8 +4,6 @@
 #include "common.h"
 #include "wcstringutil.h"
 
-#include <wctype.h>
-
 typedef wcstring::size_type size_type;
 
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
@@ -64,9 +62,3 @@ wcstring trim(wcstring input, const wchar_t *any_of) {
     result.erase(0, prefix);
     return result;
 }
-
-wcstring wcstolower(wcstring input) {
-    wcstring result = std::move(input);
-    std::transform(result.begin(), result.end(), result.begin(), towlower);
-    return result;
-}
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index 54ce9ba2a..ee884b857 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -68,7 +68,4 @@ wcstring truncate(const wcstring &input, int max_len,
 wcstring trim(wcstring input);
 wcstring trim(wcstring input, const wchar_t *any_of);
 
-/// Converts a string to lowercase.
-wcstring wcstolower(wcstring input);
-
 #endif

From 91c4dad8126ddafd127eb222287104294dd366bd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Sep 2019 15:33:08 -0700
Subject: [PATCH 0991/1732] Revert "use std::tolower"

This reverts commit a3db4128bc18c09cddf8b03cb3e908a2815d3216.

This broke the build.
---
 src/builtin_string.cpp | 4 ++--
 src/expand.h           | 4 ++--
 src/history.cpp        | 3 +--
 src/wcstringutil.cpp   | 8 ++++++++
 src/wcstringutil.h     | 3 +++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index ef544c7da..3b4b17b6a 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -633,7 +633,7 @@ class wildcard_matcher_t : public string_matcher_t {
                        io_streams_t &streams)
         : string_matcher_t(opts, streams), wcpattern(parse_util_unescape_wildcards(pattern)) {
         if (opts.ignore_case) {
-            wcpattern = std::tolower(std::move(wcpattern));
+            wcpattern = wcstolower(std::move(wcpattern));
         }
         if (opts.entire) {
             if (!wcpattern.empty()) {
@@ -654,7 +654,7 @@ class wildcard_matcher_t : public string_matcher_t {
         bool match;
 
         if (opts.ignore_case) {
-            match = wildcard_match(std::tolower(arg), wcpattern, false);
+            match = wildcard_match(wcstolower(arg), wcpattern, false);
         } else {
             match = wildcard_match(arg, wcpattern, false);
         }
diff --git a/src/expand.h b/src/expand.h
index 40d4832c1..371724307 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -79,9 +79,9 @@ enum : wchar_t {
     VARIABLE_EXPAND,
     /// Character representing variable expansion into a single element.
     VARIABLE_EXPAND_SINGLE,
-    /// Character representing the start of a brace expansion.
+    /// Character representing the start of a bracket expansion.
     BRACE_BEGIN,
-    /// Character representing the end of a brace expansion.
+    /// Character representing the end of a bracket expansion.
     BRACE_END,
     /// Character representing separation between two bracket elements.
     BRACE_SEP,
diff --git a/src/history.cpp b/src/history.cpp
index 182e0b3b3..ea2bb5c1c 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -22,7 +22,6 @@
 #include <cwchar>
 #include <functional>
 #include <iterator>
-#include <locale>
 #include <map>
 #include <numeric>
 #include <type_traits>
@@ -181,7 +180,7 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
     // search object if we're doing a case insensitive search.
     wcstring contents_lower;
     if (!case_sensitive) {
-        contents_lower = std::tolower(contents);
+        contents_lower = wcstolower(contents);
     }
     const wcstring &content_to_match = case_sensitive ? contents : contents_lower;
 
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index ea5f8b9a9..3691f79e5 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -4,6 +4,8 @@
 #include "common.h"
 #include "wcstringutil.h"
 
+#include <wctype.h>
+
 typedef wcstring::size_type size_type;
 
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
@@ -62,3 +64,9 @@ wcstring trim(wcstring input, const wchar_t *any_of) {
     result.erase(0, prefix);
     return result;
 }
+
+wcstring wcstolower(wcstring input) {
+    wcstring result = std::move(input);
+    std::transform(result.begin(), result.end(), result.begin(), towlower);
+    return result;
+}
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index ee884b857..54ce9ba2a 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -68,4 +68,7 @@ wcstring truncate(const wcstring &input, int max_len,
 wcstring trim(wcstring input);
 wcstring trim(wcstring input, const wchar_t *any_of);
 
+/// Converts a string to lowercase.
+wcstring wcstolower(wcstring input);
+
 #endif

From e6c72f74a8e092748bc8d4bf47a8adf20b82045d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sun, 22 Sep 2019 21:16:30 -0700
Subject: [PATCH 0992/1732] make rgb_color_t smaller

rgb_color_t was 5 bytes, now it's 4 again.
big arrays holding colors are going to be smaller.
---
 src/color.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/color.h b/src/color.h
index 2e437b966..edc2f1d46 100644
--- a/src/color.h
+++ b/src/color.h
@@ -17,7 +17,7 @@ struct color24_t {
 class rgb_color_t {
     // Types
     enum { type_none, type_named, type_rgb, type_normal, type_reset };
-    unsigned char type : 4;
+    unsigned char type : 3;
 
     // Flags
     enum {

From 10f38c68651e1a1311207b58301e8a9f91c57307 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 23 Sep 2019 23:29:40 +0800
Subject: [PATCH 0993/1732] CHANGELOG: work on 3.1.0

[ci skip]
---
 CHANGELOG.md | 61 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4243d4675..d20393791 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,11 @@
-# fish next-minor
+# fish 3.1.0
 
-## Deprecations
-- The vcs-prompt functions have been renamed to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
-
-## Notable Fixes and improvements
-- fish no longer requires buffering for the last function in a pipeline.
-- Add `$pipestatus` support
-- $PATH is no longer reordered in child fishes (#5956).
-- `eval` is now implemented internally rather than being a function; as such, the evaluated code now shares the same argument scope as `eval` rather than being executed in a new scope (#4443).
-- macOS Mojave: fish.app can actually run (#5727), 10.14.4's Terminal.app no longer causes an error on launch (#5725)
-- cd now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
+## Notable improvements and fixes
+- A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632)
+- fish no longer buffers pipes to the last function in a pipeline, improving many cases where pipes appeared to block or hang (#1396).
+- `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
+- `cd` now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
 - Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
-- fish now underlines every valid entered path instead of just the last one.
 - The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
 - `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `regex-easyesc` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
@@ -41,7 +35,7 @@
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
-- `test` (aka `[`) now prints a stacktrace on error, making the offending call easier to find (#5771).
+- `test` (aka `[`) now prints a stack trace on error, making the offending call easier to find (#5771).
 - The default read limit has been increased to 100MiB (#5267).
 - `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
 - `functions --erase` now also prevents fish from autoloading a function for the first time (#5951).
@@ -51,7 +45,8 @@
 - fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
 - Pasting will now strip leading spaces if they would trigger history ignoring (#4327).
 - New color options for the pager have been added (#5524).
-- Better detection and support for using fish from the system console, where limited colors and special characters are supported (#5552 and others)
+- Better detection and support for using fish from the system console, where limited colors and special characters are supported (#5552 and others).
+- fish now underlines every valid entered path instead of just the last one.
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
 - The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
@@ -59,10 +54,33 @@
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - Lots of improvements to completions.
 - Added completions for
-  - `cf`
+  - `aws`
+  - `bat`
   - `bosh`
+  - `camcontrol`
+  - `cf`
+  - `csc`
+  - `csi`
+  - `cwebp`
+  - `epkginfo`
+  - `ffmpeg`
+  - `ffplay`
+  - `ffprobe`
+  - `fsharpc`
+  - `fsharpi`
+  - `gpg2` (#6062)
+  - `hledger`
+  - `mariner`
+  - `patool`
   - `qubes-gpg-client` (#6067)
-  - `vagrant`
+  - `rg`
+  - `rustup`
+  - `speedtest-cli`
+  - `speedtest`
+  - `src`
+  - `tokei`
+  - `tsc`
+  - `vbc`
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
@@ -70,14 +88,17 @@
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
 - When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
-- The nul character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
+- The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
 - A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
 - The `self-insert` readline command will now insert the binding sequence, if not empty.
 
+## Deprecations
+- The vcs-prompt functions have been promoted to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
+
 ### For distributors and developers
-- The autotools-based build system and legacy Xcode build systems have been removed, leaving only the CMake build system. All distributors and developers must migrate to the CMake build.
-- The doxygen-based documentation system has been removed and replaced with one based on sphinx. All distributors and developers must migrate to that.
-- The INTERNAL_WCWIDTH build option to use the system wcwidth has been removed. We believe our wcwidth is a better choice, as it has a number of configuration options that the other path never gained (#5777).
+- fish 3.0 introduced a CMake-based build system. In fish 3.1, both the Autotools-based build and legacy Xcode build system have been removed, leaving only the CMake build system. All distributors and developers must install CMake.
+- The documentation is now built with Sphinx. The old Doxygen-based documentation system has been removed. Developers, and distributors who wish to rebuild the documentation, must install Sphinx.
+- The `INTERNAL_WCWIDTH` build option has been removed, as fish always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
 
 ---
 

From ed0a7f5cdb1082be3be87fb5e17e0f459ecf0a1e Mon Sep 17 00:00:00 2001
From: Jakob Landbo <jakoblandbo@gmail.com>
Date: Mon, 23 Sep 2019 21:59:25 +0200
Subject: [PATCH 0994/1732] completions/git: Added autostash option to rebase

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 01f1b3049..acc4ebce7 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1429,6 +1429,8 @@ complete -f -c git -n '__fish_git_using_command rebase' -s r -l rebase-merges -a
 complete -f -c git -n '__fish_git_using_command rebase' -l root -d 'Rebase all reachable commits'
 complete -f -c git -n '__fish_git_using_command rebase' -l autosquash -d 'Automatic squashing'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-autosquash -d 'No automatic squashing'
+complete -f -c git -n '__fish_git_using_command rebase' -l autostash -d 'Before starting rebase, stash local changes, and apply stash when done'
+complete -f -c git -n '__fish_git_using_command rebase' -l no-autostash -d 'Do not stash local changes before starting rebase'
 complete -f -c git -n '__fish_git_using_command rebase' -l no-ff -d 'No fast-forward'
 # This actually takes script for $SHELL, but completing that is... complicated.
 complete -r -c git -n '__fish_git_using_command rebase' -l exec -d 'Execute shellscript'

From 8230755bfd65268b735c38815dec7852a302f731 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Tue, 24 Sep 2019 23:34:10 -0700
Subject: [PATCH 0995/1732] Make sure rgb_color_t doesn't grow

For years the comment above the class claimed it was 4 bytes, but
it had grown to 5. Add a static_assert() to prevent that from
happening again.
---
 src/color.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/color.h b/src/color.h
index edc2f1d46..02d98e80a 100644
--- a/src/color.h
+++ b/src/color.h
@@ -13,7 +13,8 @@ struct color24_t {
     unsigned char rgb[3];
 };
 
-/// A type that represents a color. We work hard to keep it at a size of 4 bytes.
+/// A type that represents a color. We work hard to keep it at a size of 4 bytes and verify with
+/// static_assert
 class rgb_color_t {
     // Types
     enum { type_none, type_named, type_rgb, type_normal, type_reset };
@@ -169,4 +170,6 @@ class rgb_color_t {
     static wcstring_list_t named_color_names(void);
 };
 
+static_assert(sizeof(rgb_color_t) <= 4, "rgb_color_t is too big");
+
 #endif

From 2dbbaa6a978bade9de468ffc0d064841fa84f9b3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 24 Sep 2019 07:43:38 +0200
Subject: [PATCH 0996/1732] Honor required parameters in completions for
 builtins

This adds the -r (or -x) flag to completions of builtins' options that have a required_argument.
---
 share/completions/bind.fish     |  4 ++--
 share/completions/complete.fish | 16 ++++++++--------
 share/completions/function.fish |  4 ++--
 share/completions/history.fish  |  2 +-
 share/completions/math.fish     |  2 +-
 share/completions/read.fish     |  4 ++--
 share/completions/string.fish   | 12 ++++++------
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/share/completions/bind.fish b/share/completions/bind.fish
index 05375a1d8..dd37570c5 100644
--- a/share/completions/bind.fish
+++ b/share/completions/bind.fish
@@ -50,8 +50,8 @@ complete -c bind -s f -l function-names -d 'Print names of available functions'
 complete -c bind -s h -l help -d "Display help and exit"
 complete -c bind -s k -l key -d 'Specify key name, not sequence'
 complete -c bind -s K -l key-names -d 'Print names of available keys'
-complete -c bind -s M -l mode -d 'Specify the bind mode that the bind is used in'
-complete -c bind -s m -l sets-mode -d 'Change current mode after bind is executed'
+complete -c bind -s M -l mode -d 'Specify the bind mode that the bind is used in' -xa '(bind -L)'
+complete -c bind -s m -l sets-mode -d 'Change current mode after bind is executed' -xa '(bind -L)'
 complete -c bind -s L -l list-modes -d 'Display a list of defined bind modes'
 
 complete -c bind -n __fish_bind_test1 -a '(bind --key-names)' -d 'Key name' -x
diff --git a/share/completions/complete.fish b/share/completions/complete.fish
index 6e9a7b1f6..266e3a687 100644
--- a/share/completions/complete.fish
+++ b/share/completions/complete.fish
@@ -1,20 +1,20 @@
 # Completions for complete
 
 complete -c complete -s c -l command -d "Command to add completion to" -r
-complete -c complete -s p -l path -d "Path to add completion to"
-complete -c complete -s s -l short-option -d "POSIX-style short option to complete"
-complete -c complete -s l -l long-option -d "GNU-style long option to complete"
-complete -c complete -s o -l old-option -d "Old style long option to complete"
+complete -c complete -s p -l path -d "Path to add completion to" -r
+complete -c complete -s s -l short-option -d "POSIX-style short option to complete" -x
+complete -c complete -s l -l long-option -d "GNU-style long option to complete" -x
+complete -c complete -s o -l old-option -d "Old style long option to complete" -x
 complete -c complete -s f -l no-files -d "Don't use file completion"
 complete -c complete -s r -l require-parameter -d "Require parameter"
 complete -c complete -s x -l exclusive -d "Require parameter and don\'t use file completion"
-complete -c complete -s a -l arguments -d "Space-separated list of possible option arguments"
-complete -c complete -s d -l description -d "Description of completion"
+complete -c complete -s a -l arguments -d "Space-separated list of possible option arguments" -x
+complete -c complete -s d -l description -d "Description of completion" -x
 complete -c complete -s e -l erase -d "Remove completion"
 complete -c complete -s h -l help -d "Display help and exit"
 complete -c complete -s C -l do-complete -d "Print completions for a commandline specified as a parameter"
-complete -c complete -s n -l condition -d "Completion only used if command has zero exit status" -r
-complete -c complete -s w -l wraps -d "Inherit completions from specified command"
+complete -c complete -s n -l condition -d "Completion only used if command has zero exit status" -x
+complete -c complete -s w -l wraps -d "Inherit completions from specified command" -r
 
 # Deprecated options
 
diff --git a/share/completions/function.fish b/share/completions/function.fish
index e85f43103..7399da787 100644
--- a/share/completions/function.fish
+++ b/share/completions/function.fish
@@ -6,6 +6,6 @@ complete -c function -s p -l on-process-exit -d "Make the function a process exi
 complete -c function -s s -l on-signal -d "Make the function a signal event handler" -x
 complete -c function -s v -l on-variable -d "Make the function a variable update event handler" -x
 complete -c function -s e -l on-event -d "Make the function a generic event handler" -xa 'fish_prompt fish_command_not_found'
-complete -c function -s a -l argument-names -d "Specify named arguments"
+complete -c function -s a -l argument-names -d "Specify named arguments" -x
 complete -c function -s S -l no-scope-shadowing -d "Do not shadow variable scope of calling function"
-complete -c function -s w -l wraps -d "Inherit completions from the given command"
+complete -c function -s w -l wraps -d "Inherit completions from the given command" -r
diff --git a/share/completions/history.fish b/share/completions/history.fish
index 98d665d71..fdc33f8d3 100644
--- a/share/completions/history.fish
+++ b/share/completions/history.fish
@@ -13,7 +13,7 @@ complete -c history -n '__fish_seen_subcommand_from search delete' \
 complete -c history -n '__fish_seen_subcommand_from search delete' \
     -s C -l case-sensitive -d "Match items in a case-sensitive manner"
 complete -c history -n '__fish_seen_subcommand_from search' \
-    -s n -l max -d "Limit output to the first 'n' matches"
+    -s n -l max -d "Limit output to the first 'n' matches" -x
 
 # We don't include a completion for the "save" subcommand because it should not be used
 # interactively.
diff --git a/share/completions/math.fish b/share/completions/math.fish
index a448f374b..f0fb6374e 100644
--- a/share/completions/math.fish
+++ b/share/completions/math.fish
@@ -1,2 +1,2 @@
 complete -f -c math -r
-complete -f -c math -s s -l scale -r
+complete -f -c math -s s -l scale -r -x
diff --git a/share/completions/read.fish b/share/completions/read.fish
index 23076bbb1..1941cca3c 100644
--- a/share/completions/read.fish
+++ b/share/completions/read.fish
@@ -6,10 +6,10 @@ complete -c read -s l -l local -d "Make variable scope local"
 complete -c read -s U -l universal -d "Make variable scope universal, i.e. share variable with all the users fish processes on this computer"
 complete -c read -s u -l unexport -d "Do not export variable to subprocess"
 complete -c read -s m -l mode-name -d "Name to load/save history under" -r -a "read fish"
-complete -c read -s c -l command -d "Initial contents of read buffwhen reading interactively"
+complete -c read -s c -l command -d "Initial contents of read buffer when reading interactively" -r
 complete -c read -s S -l shell -d "Use syntax highlighting, tab completions and command termination suitable for entering shellscript code"
 complete -c read -s s -l silent -d "Secure mode: mask characters at the command line (suitable for passwords)"
-complete -c read -s n -l nchars -d "Read the specified number of characters"
+complete -c read -s n -l nchars -d "Read the specified number of characters" -x
 complete -c read -s a -l array -d "Store the results as an array"
 complete -c read -s R -l right-prompt -d "Set right-hand prompt command" -x
 complete -c read -s z -l null -d "Use NUL character as line terminator"
diff --git a/share/completions/string.fish b/share/completions/string.fish
index ffe2ff4b2..a9cf614b8 100644
--- a/share/completions/string.fish
+++ b/share/completions/string.fish
@@ -6,8 +6,8 @@ complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "lower"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "upper"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "length"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "sub"
-complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s s -l start -a "(seq 1 10)"
-complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s l -l length -a "(seq 1 10)"
+complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s s -l start -xa "(seq 1 10)"
+complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] sub" -s l -l length -xa "(seq 1 10)"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "split"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "split0"
 complete -x -c string -n 'test (count (commandline -opc)) -ge 2; and string match -qr split0\?\$ -- (commandline -opc)[2]' -s m -l max -a "(seq 1 10)" -d "Specify maximum number of splits"
@@ -21,11 +21,11 @@ complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "join0"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "trim"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s l -l left -d "Trim only leading chars"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s r -l right -d "Trim only trailing chars"
-complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s c -l chars -d "Specify the chars to trim (default: whitespace)"
+complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] trim" -s c -l chars -d "Specify the chars to trim (default: whitespace)" -x
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "escape"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "unescape"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] escape; or contains -- (commandline -opc)[2] unescape" -s n -l no-quoted -d "Escape with \\ instead of quotes"
-complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] escape; or contains -- (commandline -opc)[2] unescape" -l style -d "Specify escaping style" -a "
+complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] escape; or contains -- (commandline -opc)[2] unescape" -l style -d "Specify escaping style" -xa "
 (printf '%s\t%s\n' script 'For use in scripts' \
  var 'For use as a variable name' \
  regex 'For string match -r, string replace -r' \
@@ -42,6 +42,6 @@ complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains --
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] match replace" -s r -l regex -d "Use regex instead of globs"
 
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "repeat"
-complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s n -l count -a "(seq 1 10)" -d "Repetition count"
-complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s m -l max -a "(seq 1 10)" -d "Maximum number of printed chars"
+complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s n -l count -xa "(seq 1 10)" -d "Repetition count"
+complete -x -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s m -l max -xa "(seq 1 10)" -d "Maximum number of printed chars"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and contains -- (commandline -opc)[2] repeat" -s N -l no-newline -d "Remove newline"

From 8063d6d0b81276e5a4d3e5c4d0d2f86a73b16086 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 25 Sep 2019 09:44:27 +0200
Subject: [PATCH 0997/1732] complete builtin: suggest commands for options
 --comand and --wraps

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

diff --git a/share/completions/complete.fish b/share/completions/complete.fish
index 266e3a687..35ab244df 100644
--- a/share/completions/complete.fish
+++ b/share/completions/complete.fish
@@ -1,6 +1,6 @@
 # Completions for complete
 
-complete -c complete -s c -l command -d "Command to add completion to" -r
+complete -c complete -s c -l command -d "Command to add completion to" -xa '(__fish_complete_command)'
 complete -c complete -s p -l path -d "Path to add completion to" -r
 complete -c complete -s s -l short-option -d "POSIX-style short option to complete" -x
 complete -c complete -s l -l long-option -d "GNU-style long option to complete" -x
@@ -14,7 +14,7 @@ complete -c complete -s e -l erase -d "Remove completion"
 complete -c complete -s h -l help -d "Display help and exit"
 complete -c complete -s C -l do-complete -d "Print completions for a commandline specified as a parameter"
 complete -c complete -s n -l condition -d "Completion only used if command has zero exit status" -x
-complete -c complete -s w -l wraps -d "Inherit completions from specified command" -r
+complete -c complete -s w -l wraps -d "Inherit completions from specified command" -xa '(__fish_complete_command)'
 
 # Deprecated options
 

From 19c575e116f44b2b5b7287af4e15cdeb3e511c80 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Wed, 25 Sep 2019 04:03:47 -0700
Subject: [PATCH 0998/1732] builtin functions: colorize output if interactive

We can also get rid of the | fish_indent --ansi stuff in type.fish
---
 share/functions/type.fish |  6 +-----
 src/builtin_functions.cpp | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/share/functions/type.fish b/share/functions/type.fish
index 66df5ee6b..7145056c3 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -49,11 +49,7 @@ function type --description 'Print the type of a command'
                 switch $mode
                     case normal
                         printf (_ '%s is a function with definition\n') $i
-                        if isatty stdout
-                            functions $i | fish_indent --ansi
-                        else
-                            functions $i | fish_indent
-                        end
+                        functions $i
                     case type
                         echo (_ 'function')
                     case path
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index d55a43bae..b871bff9e 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -20,6 +20,7 @@
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "function.h"
+#include "highlight.h"
 #include "io.h"
 #include "parser_keywords.h"
 #include "proc.h"
@@ -261,7 +262,15 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
 
     if (metadata_as_comments) {
         if (std::wcscmp(path, L"stdin")) {
-            streams.out.append_format(L"# Defined in %ls @ line %d\n", path, line_number);
+            wcstring comment;
+            append_format(comment, L"# Defined in %ls @ line %d\n", path, line_number);
+            if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
+                std::vector<highlight_spec_t> colors;
+                highlight_shell_no_io(comment, colors, comment.size(), nullptr, env_stack_t::globals());
+                streams.out.append(str2wcstring(colorize(comment, colors)));
+            } else {
+                streams.out.append(comment);
+            }
         }
     } else {
         streams.out.append_format(L"%ls\n", path);
@@ -426,7 +435,15 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 if (i != optind) streams.out.append(L"\n");
                 const wchar_t *funcname = argv[optind];
                 report_function_metadata(funcname, opts.verbose, streams, parser, true);
-                streams.out.append(functions_def(funcname));
+                wcstring def = functions_def(funcname);
+
+                if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
+                    std::vector<highlight_spec_t> colors;
+                    highlight_shell_no_io(def, colors, def.size(), nullptr, env_stack_t::globals());
+                    streams.out.append(str2wcstring(colorize(def, colors)));
+                } else {
+                    streams.out.append(def);
+                }
             }
         }
     }

From 3ca4dbb2b9646d2ec39ecb8920a433eddee8e153 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 26 Sep 2019 22:58:36 +0800
Subject: [PATCH 0999/1732] CHANGELOG: work on 3.1.0

[ci skip]
---
 CHANGELOG.md | 80 ++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d20393791..2bf5d1e33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,33 +4,31 @@
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632)
 - fish no longer buffers pipes to the last function in a pipeline, improving many cases where pipes appeared to block or hang (#1396).
 - `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
-- `cd` now always checks the current directory, even if $CDPATH does not include it or "." (#4484).
-- Error messages no longer include a (rather large) help summary and the stacktrace has been shortened (#3404, #5434).
-- The `--debug` option has been extended to allow specifying categories. Categories may be listed via `fish --print-debug-categories`.
-- `string replace` had an additional round of escaping in the replacement (not the match!), so escaping backslashes would require `string replace -ra '([ab])' '\\\\\\\$1' a`. A new feature flag `regex-easyesc` can be used to disable this, so that it becomes `string replace -ra '([ab])' '\\\\$1' a` (#5556).
-- Some parser errors did not set `$status` to non-zero. This has been corrected (b2a1da602f79878f4b0adc4881216c928a542608).
-- `string` has a new `collect` subcommand that disables newline-splitting on its input. This is meant to be used as the end of a command substitution pipeline to produce a single output argument potentially containing internal newlines, such as `set output (some-cmd | string collect)`. Any trailing newlines are trimmed, just like `"$(cmd)"` substitution in sh. It also supports a `--no-trim-newlines` flag to disable trailing newline trimming, which may be useful when doing something like `set contents (cat filename | string collect -N)` (#159).
-- More of the documentation, including the tutorial, is now available as man pages as well.
+- Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
+- Error messages from builtin commands no longer include an extensive usage summary, and have more readable stack traces (#3404, #5434).
+- `fish`'s debugging arguments have been significantly imporved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output. 
+- `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556).
+- A bug where some parser errors did not set `$status` to non-zero has been fixed.
+- `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
+- The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
-- `string split` had a bug where empty strings would be dropped if the output was only empty strings; this has been fixed (#5987).
+- A bug where `string split` would be drop empty strings if the output was only empty strings has been fixed (#5987).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
-- The null command (:) now always exits successfully, rather than echoing last return code.
-- Cursor configuration instructions for vi-mode have been added to the fish documentation.
+- The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
 - `jobs --last` returns 0 to indicate success when a job is found (#6104).
 
 ### Syntax changes and new commands
-- Brace expansion now only takes place if the braces include a "," or a variable expansion, so things like `git reset HEAD@{0}` now work (#5869).
+- Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
-- mandoc can now be used to format the output from `--help` if nroff is not installed.
 - In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - `complete --do-complete` now also does fuzzy matches (#5467).
-- `count` now also counts lines fed on stdin (#5744).
+- `count` now also counts lines fed on standard input (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
-- `complete -C foo` now works instead of erroring out and requiring `complete -Cfoo`.
+- `complete -C foo` now works as expected, rather than requiring `complete -Cfoo`.
 - `complete` gained a new `--force-files` (short `-F`) switch to reenable file completions. This allows `sudo -E` and `pacman -Qo` to complete correctly (#5646).
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
@@ -42,45 +40,40 @@
 
 ### Interactive improvements
 - Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
-- fish_clipboard_* now supports wayland by means of [wl-clipboard](https://github.com/bugaevc/wl-clipboard).
-- Pasting will now strip leading spaces if they would trigger history ignoring (#4327).
-- New color options for the pager have been added (#5524).
-- Better detection and support for using fish from the system console, where limited colors and special characters are supported (#5552 and others).
-- fish now underlines every valid entered path instead of just the last one.
+- The `fish_clipboard_*` functions support wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
+- Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
+- New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).
+- Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552 and others).
+- fish now underlines every valid entered path instead of just the last one (#5872).
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
-- The `path_helper` on macOS now only runs in login shells, matching the bash implementation.
+- fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
-- Fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), hopefully making setting $fish_emoji_width superfluous in most cases (#5722).
+- fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), eliminating the need to set `$fish_emoji_width` in most cases (#5722).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
-- Lots of improvements to completions.
 - Added completions for
   - `aws`
-  - `bat`
-  - `bosh`
+  - `bat` (#6052)
+  - `bosh` (#5700)
   - `camcontrol`
-  - `cf`
-  - `csc`
-  - `csi`
-  - `cwebp`
-  - `epkginfo`
-  - `ffmpeg`
-  - `ffplay`
-  - `ffprobe`
-  - `fsharpc`
-  - `fsharpi`
+  - `cf` (#5700)
+  - `csc` and `csi` (#6016)
+  - `cwebp` (#6034)
+  - `epkginfo` (#5829)
+  - `ffmpeg`, `ffplay`, and `ffprobe` (#5922)
+  - `fsharpc` and `fsharpi` (#6016)
   - `gpg2` (#6062)
-  - `hledger`
-  - `mariner`
-  - `patool`
+  - `hledger` (#6043)
+  - `mariner` (#5718)
+  - `patool` (#6083)
   - `qubes-gpg-client` (#6067)
   - `rg`
   - `rustup`
-  - `speedtest-cli`
-  - `speedtest`
-  - `src`
-  - `tokei`
-  - `tsc`
-  - `vbc`
+  - `speedtest` and `speedtest-cli` (#5840)
+  - `src` (#6026)
+  - `tokei` (#6085)
+  - `tsc` (#6016)
+  - `vbc` (#6016)
+- Lots of improvements to completions.
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
 - The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
@@ -99,6 +92,7 @@
 - fish 3.0 introduced a CMake-based build system. In fish 3.1, both the Autotools-based build and legacy Xcode build system have been removed, leaving only the CMake build system. All distributors and developers must install CMake.
 - The documentation is now built with Sphinx. The old Doxygen-based documentation system has been removed. Developers, and distributors who wish to rebuild the documentation, must install Sphinx.
 - The `INTERNAL_WCWIDTH` build option has been removed, as fish always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
+- mandoc is now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
 
 ---
 

From 4747bdd7e791c9e2b7c02f2cc9a4a9cfd87ffee4 Mon Sep 17 00:00:00 2001
From: aca <acadx0@gmail.com>
Date: Sun, 22 Sep 2019 04:21:21 +0900
Subject: [PATCH 1000/1732] completions/go: add/improve completion

- completion for go mod/generate
- better description for go help
---
 share/completions/go.fish | 60 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/share/completions/go.fish b/share/completions/go.fish
index 095a7ba66..7523214ef 100644
--- a/share/completions/go.fish
+++ b/share/completions/go.fish
@@ -2,7 +2,7 @@
 # See: https://golang.org
 
 # Completions for go build commands
-set -l __go_cmds_w_buildflags build get install run test
+set -l __go_cmds_w_buildflags build get install run test generate
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -s a -d 'force rebuild'
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -s n -d 'print the commands but do not run them'
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -s p -r -d 'number parallel builds (default=#cpus)'
@@ -17,6 +17,7 @@ complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o gcfla
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o installsuffix -r -d 'suffix for installation directory'
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o ldflags -r -d 'linker flags'
 complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o tags -r -d 'build tags'
+complete -c go -n "__fish_seen_subcommand_from $__go_cmds_w_buildflags" -o mod -x -d 'module download mode to use' -a 'readonly vendor'
 
 
 # Completions for go cmds that takes file arguments
@@ -61,10 +62,53 @@ complete -c go -n '__fish_use_subcommand' -a get -d 'download and install packag
 complete -c go -n '__fish_seen_subcommand_from get' -s d -d "stop after downloading the packages; don't install"
 complete -c go -n '__fish_seen_subcommand_from get' -o fix -d "run fix tool on packages before resolving dependencies or building"
 complete -c go -n '__fish_seen_subcommand_from get' -s u -d "update remote packages"
+complete -c go -n '__fish_seen_subcommand_from get' -s v -d "verbose progress and debug output"
+complete -c go -n '__fish_seen_subcommand_from get' -s t -d "also download the packages required to build the tests"
+complete -c go -n '__fish_seen_subcommand_from get' -o insecure -d "flag permits fetching & resolving domains using insecure schemes"
+
+# generate
+complete -c go -n '__fish_use_subcommand' -a generate -d 'Generate runs commands described by directives within existing files.'
+complete -c go -n '__fish_seen_subcommand_from get' -s n -d "prints commands that would be executed"
+complete -c go -n '__fish_seen_subcommand_from get' -s x -d "prints commands as they are executed"
+complete -c go -n '__fish_seen_subcommand_from get' -s v -d "prints the names of packages and files as they are processed"
+complete -c go -n '__fish_seen_subcommand_from get' -o run -d "prints the names of packages and files as they are processed"
 
 # help
 complete -c go -n '__fish_use_subcommand' -a help -d 'get help on topic'
-complete -c go -n '__fish_seen_subcommand_from help' -xa 'build clean doc env fix fmt get install list run test tool version vet gopath packages remote testflag testfunc' -d "target tool"
+complete -c go -n '__fish_seen_subcommand_from help' -xa bug            -d "start a bug report"
+complete -c go -n '__fish_seen_subcommand_from help' -xa build          -d "compile packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa clean          -d "remove object files and cached files"
+complete -c go -n '__fish_seen_subcommand_from help' -xa doc            -d "show documentation for package or symbol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa env            -d "print Go environment information"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fix            -d "update packages to use new APIs"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fmt            -d "gofmt (reformat) package sources"
+complete -c go -n '__fish_seen_subcommand_from help' -xa generate       -d "generate Go files by processing source"
+complete -c go -n '__fish_seen_subcommand_from help' -xa get            -d "download and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa install        -d "compile and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa list           -d "list packages or modules"
+complete -c go -n '__fish_seen_subcommand_from help' -xa mod            -d "module maintenance"
+complete -c go -n '__fish_seen_subcommand_from help' -xa run            -d "compile and run Go program"
+complete -c go -n '__fish_seen_subcommand_from help' -xa test           -d "test packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa tool           -d "run specified go tool"
+complete -c go -n '__fish_seen_subcommand_from help' -xa version        -d "print Go version"
+complete -c go -n '__fish_seen_subcommand_from help' -xa vet            -d "report likely mistakes in packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa buildmode      -d "build modes"
+complete -c go -n '__fish_seen_subcommand_from help' -xa c              -d "calling between Go and C"
+complete -c go -n '__fish_seen_subcommand_from help' -xa cache          -d "build and test caching"
+complete -c go -n '__fish_seen_subcommand_from help' -xa environment    -d "environment variables"
+complete -c go -n '__fish_seen_subcommand_from help' -xa filetype       -d "file types"
+complete -c go -n '__fish_seen_subcommand_from help' -xa go.mod         -d "the go.mod file"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath         -d "GOPATH environment variable"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath-get     -d "legacy GOPATH go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa goproxy        -d "module proxy protocol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa importpath     -d "import path syntax"
+complete -c go -n '__fish_seen_subcommand_from help' -xa modules        -d "modules, module versions, and more"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-get     -d "module-aware go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-auth    -d "module authentication using go.sum"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-private -d "module configuration for non-public modules"
+complete -c go -n '__fish_seen_subcommand_from help' -xa packages       -d "package lists and patterns"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testflag       -d "testing flags"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc       -d "testing functions"
 
 # install
 complete -c go -n '__fish_use_subcommand' -a install -d 'compile and install packages and dependencies'
@@ -75,6 +119,7 @@ complete -c go -n '__fish_seen_subcommand_from list' -s e -d "tolerate erroneous
 complete -c go -n '__fish_seen_subcommand_from list' -s f -r -d "pass in template for formatting"
 complete -c go -n '__fish_seen_subcommand_from list' -o json -d "print in JSON format"
 complete -c go -n '__fish_seen_subcommand_from list' -o tags -r -d 'list of build tags'
+complete -c go -n '__fish_seen_subcommand_from list' -s m -d 'list modules instead of packages'
 
 # run
 complete -c go -n '__fish_use_subcommand' -a run -d 'compile and run Go program'
@@ -97,3 +142,14 @@ complete -c go -f -n '__fish_seen_subcommand_from version'
 complete -c go -n '__fish_use_subcommand' -a vet -d 'vet packages'
 complete -c go -n '__fish_seen_subcommand_from vet' -s n -d "print the command that would be executed"
 complete -c go -n '__fish_seen_subcommand_from vet' -s x -d "prints commands as they are executed"
+
+# mod
+complete -c go -n '__fish_use_subcommand' -a mod -d 'module maintenance'
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a download -d "download modules to local cache"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit     -d "edit go.mod from tools or scripts"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph    -d "print module requirement graph"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a init     -d "initialize new module in current directory"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a tidy     -d "add missing and remove unused modules"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a vendor   -d "make vendored copy of dependencies"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a verify   -d "verify dependencies have expected content"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a why      -d "explain why packages or modules are needed"

From dae4faa512d59877199bfa86226ee93f6c6191ea Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 27 Sep 2019 13:01:38 -0700
Subject: [PATCH 1001/1732] Fix completions for `abbr --erase`

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

diff --git a/share/completions/abbr.fish b/share/completions/abbr.fish
index 05e4feeb4..f9557a32f 100644
--- a/share/completions/abbr.fish
+++ b/share/completions/abbr.fish
@@ -1,7 +1,7 @@
 complete -c abbr -f -s a -l add -d 'Add abbreviation'
 # Abbr keys can't contain spaces, so we can safely replace the first space with a tab
 # `abbr -s` won't work here because that already escapes
-complete -c abbr -s e -l erase -d 'Erase abbreviation' -xa '(string replace " " \t -- $fish_user_abbreviations)'
+complete -c abbr -s e -l erase -d 'Erase abbreviation' -xa '(abbr --list)'
 complete -c abbr -f -s s -l show -d 'Print all abbreviations'
 complete -c abbr -f -s l -l list -d 'Print all abbreviation names'
 complete -c abbr -f -s h -l help -d 'Help'

From 23cd8268f293a94a49c80c03c35b49642a0a7031 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 30 Sep 2019 16:02:06 +0200
Subject: [PATCH 1002/1732] docs: Fix universal variables link

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index bf43086b1..ccbf4ad3c 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -611,7 +611,7 @@ and it will be exported like that, and when fish starts it splits the $PATH it r
 
 You can do so directly in ``config.fish``, like you might do in other shells with ``.profile``. See :ref:`this example <path_example>`.
 
-A faster way is to modify the ``$fish_user_paths`` [universal variable](#tut_universal), which is automatically prepended to ``$PATH``. For example, to permanently add ``/usr/local/bin`` to your ``$PATH``, you could write::
+A faster way is to modify the ``$fish_user_paths`` :ref:`universal variable <tut-universal>`, which is automatically prepended to ``$PATH``. For example, to permanently add ``/usr/local/bin`` to your ``$PATH``, you could write::
 
     >_ set -U fish_user_paths /usr/local/bin $fish_user_paths
 
@@ -665,6 +665,8 @@ This is the preferred way to define your prompt as well::
 
 See the documentation for :ref:`funced <cmd-funced>` and :ref:`funcsave <cmd-funcsave>` for ways to create these files automatically.
 
+.. _tut-universal:
+
 Universal Variables
 -------------------
 

From f1baa514a8b073385512004e016e7f6570c6dbee Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Wed, 2 Oct 2019 11:54:56 +0200
Subject: [PATCH 1003/1732] doc: add ref to cmd-breakpoint

[ci skip]
---
 sphinx_doc_src/cmds/fish_breakpoint_prompt.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
index 1c2722e63..200bee6e7 100644
--- a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
@@ -16,7 +16,7 @@ Synopsis
 Description
 -----------
 
-By defining the ``fish_breakpoint_prompt`` function, the user can choose a custom prompt when asking for input in response to a ``breakpoint`` command. The ``fish_breakpoint_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
+By defining the ``fish_breakpoint_prompt`` function, the user can choose a custom prompt when asking for input in response to a :ref:`breakpoint <cmd-breakpoint>` command. The ``fish_breakpoint_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
 
 The exit status of commands within ``fish_breakpoint_prompt`` will not modify the value of `$status <index.html#variables-status>`__ outside of the ``fish_breakpoint_prompt`` function.
 

From 2fa3c6298bbe69cb9a22751a389f67eedeaeb95e Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Tue, 1 Oct 2019 18:31:06 -0700
Subject: [PATCH 1004/1732] Unmarked the colo(u)r options of the git command as
 requiring an argument

According to man, the argument is optional:

$ man git
       --color[=WHEN], --colour[=WHEN]
---
 share/completions/grep.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/grep.fish b/share/completions/grep.fish
index 0070661da..c8e164353 100644
--- a/share/completions/grep.fish
+++ b/share/completions/grep.fish
@@ -4,8 +4,8 @@ complete -c grep -s B -l before-context -d "Print NUM lines of leading context"
 complete -c grep -s C -l context -d "Print NUM lines of context"
 complete -c grep -s b -l byte-offset -d "Print byte offset of matches"
 complete -c grep -l binary-files -d "Assume data type for binary files" -x -a "binary\tBinary\ format text\tText\ format"
-complete -c grep -l colour -x -d "Colour output" -a "never always auto"
-complete -c grep -l color -x -d "Color output" -a "never always auto"
+complete -c grep -l colour -f -d "Colour output" -a "never always auto"
+complete -c grep -l color -f -d "Color output" -a "never always auto"
 complete -c grep -s c -l count -d "Only print number of matches"
 complete -c grep -s D -l devices -x -a "read skip" -d "Action for devices"
 complete -c grep -s d -l directories -x -a "read skip recurse" -d "Action for directories"

From 0df464ca2c4113e06fc937c8b0cf7cf045f784d7 Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Wed, 2 Oct 2019 16:49:58 +0200
Subject: [PATCH 1005/1732] doc: mention the disown command in the jobs section
 - fix #5530

---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 9230e900d..c2eb1e2e3 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -414,7 +414,7 @@ Most programs allow you to suspend the program's execution and return control to
 If you instead want to put a suspended job into the background, use the :ref:`bg <cmd-bg>` command.
 
 To get a listing of all currently started jobs, use the :ref:`jobs <cmd-jobs>` command.
-
+These listed jobs can be removed with the :ref:`disown <cmd-disown>` command.
 
 .. _syntax-function:
 

From 70fc2611bd511a82b2534a26f6e508bb0d7f8799 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 2 Oct 2019 20:37:24 +0200
Subject: [PATCH 1006/1732] webconfig: Escape abbrs properly

Fixes #6120
---
 share/tools/web_config/webconfig.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 1832f19ac..7d2107197 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -1189,7 +1189,8 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
 
     def do_save_abbreviation(self, abbreviation):
         out, err = run_fish_cmd(
-            "abbr --add '%s' '%s'" % (abbreviation["word"], abbreviation["phrase"])
+            # Remove one layer of single-quotes because escape_fish_cmd adds them back.
+            "abbr --add %s %s" % (escape_fish_cmd(abbreviation["word"].strip("'")), escape_fish_cmd(abbreviation["phrase"].strip("'")))
         )
         if err:
             return err

From b9a22c713616c6ea643f7c4c1905ce8d08e88c26 Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Thu, 3 Oct 2019 15:03:49 +0200
Subject: [PATCH 1007/1732] doc: mention $fish_function_path in the Autoloading
 Functions section - fix #3371

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index ccbf4ad3c..5a94c2081 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -663,7 +663,7 @@ This is the preferred way to define your prompt as well::
     end
 
 
-See the documentation for :ref:`funced <cmd-funced>` and :ref:`funcsave <cmd-funcsave>` for ways to create these files automatically.
+See the documentation for :ref:`funced <cmd-funced>` and :ref:`funcsave <cmd-funcsave>` for ways to create these files automatically, and :ref:`$fish_function_path <syntax-function-autoloading>` to control their location.
 
 .. _tut-universal:
 

From aa011f70a87bde6e9db7e73f99fba8e0698684e0 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 3 Oct 2019 07:55:52 +0200
Subject: [PATCH 1008/1732] Print an error when complete reaches its recursion
 limit

---
 src/builtin_complete.cpp   | 5 ++++-
 tests/checks/complete.fish | 6 ++++++
 tests/checks/wraps.fish    | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 7a7faa8ed..ef4ae8b88 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -336,7 +336,10 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         parser.libdata().transient_commandlines.push_back(do_complete_param);
         cleanup_t remove_transient([&] { parser.libdata().transient_commandlines.pop_back(); });
 
-        if (parser.libdata().builtin_complete_recursion_level < 1) {
+        // Allow a limited number of recursive calls to complete (#3474).
+        if (parser.libdata().builtin_complete_recursion_level >= 1) {
+            streams.err.append_format(L"%ls: maximum recursive depth reached\n", cmd);
+        } else {
             parser.libdata().builtin_complete_recursion_level++;
 
             std::vector<completion_t> comp;
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index a232fb589..733f78c3a 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -59,3 +59,9 @@ complete
 # CHECK: complete {{.*}}
 # CHECK: complete {{.*}}
 # CHECK: complete {{.*}}
+
+# Recursive calls to complete (see #3474)
+complete -c complete_test_recurse1 -xa '(echo recursing 1>&2; complete -C"complete_test_recurse1 ")'
+complete -C'complete_test_recurse1 '
+# CHECKERR: recursing
+# CHECKERR: complete: maximum recursive depth reached
diff --git a/tests/checks/wraps.fish b/tests/checks/wraps.fish
index 5ffc9edb5..14d223977 100644
--- a/tests/checks/wraps.fish
+++ b/tests/checks/wraps.fish
@@ -26,4 +26,6 @@ complete -c testcommand2 -x -a "(testcommand2_complete)"
 complete -c testcommand2 --wraps "testcommand2 from_wraps "
 complete -C'testcommand2 explicit '
 # CHECKERR: explicit
+# CHECKERR: complete: maximum recursive depth reached
 # CHECKERR: from_wraps explicit
+# CHECKERR: complete: maximum recursive depth reached

From e1677148999a54c7f0927fc1f37cef37835b5548 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 3 Oct 2019 07:58:04 +0200
Subject: [PATCH 1009/1732] Raise the recursion limit of complete

Users should generally prefer to use complete --wraps but this
corrects some unexpected behavior.

Fixes #3474
---
 src/builtin_complete.cpp   |  2 +-
 tests/checks/complete.fish | 23 +++++++++++++++++++++++
 tests/checks/wraps.fish    |  3 ---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index ef4ae8b88..abb5ecd63 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -337,7 +337,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         cleanup_t remove_transient([&] { parser.libdata().transient_commandlines.pop_back(); });
 
         // Allow a limited number of recursive calls to complete (#3474).
-        if (parser.libdata().builtin_complete_recursion_level >= 1) {
+        if (parser.libdata().builtin_complete_recursion_level >= 24) {
             streams.err.append_format(L"%ls: maximum recursive depth reached\n", cmd);
         } else {
             parser.libdata().builtin_complete_recursion_level++;
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 733f78c3a..6d4cd8faa 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -64,4 +64,27 @@ complete
 complete -c complete_test_recurse1 -xa '(echo recursing 1>&2; complete -C"complete_test_recurse1 ")'
 complete -C'complete_test_recurse1 '
 # CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
+# CHECKERR: recursing
 # CHECKERR: complete: maximum recursive depth reached
diff --git a/tests/checks/wraps.fish b/tests/checks/wraps.fish
index 14d223977..febe10a54 100644
--- a/tests/checks/wraps.fish
+++ b/tests/checks/wraps.fish
@@ -19,13 +19,10 @@ function testcommand2_complete
     set -l tokens (commandline -opc) (commandline -ct)
     set -e tokens[1]
     echo $tokens 1>&2
-    complete -C"$tokens"
 end
 
 complete -c testcommand2 -x -a "(testcommand2_complete)"
 complete -c testcommand2 --wraps "testcommand2 from_wraps "
 complete -C'testcommand2 explicit '
 # CHECKERR: explicit
-# CHECKERR: complete: maximum recursive depth reached
 # CHECKERR: from_wraps explicit
-# CHECKERR: complete: maximum recursive depth reached

From d74b774f51d3e47cbe694f7b23aa900aede4d1b0 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 1 Oct 2019 19:10:01 +0200
Subject: [PATCH 1010/1732] Fix paginate binding (\ep) for multiline jobs

Reproducer: type `: \<RET><M-p>`. This used to print an error due to builtin test receiving
too many arguments.

It looks like (commandline -j) can return multiple items, because a job can be broken up in multiple
lines terminated by backslashes.
---
 share/functions/__fish_paginate.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_paginate.fish b/share/functions/__fish_paginate.fish
index 937c5c6de..ae7ae896f 100644
--- a/share/functions/__fish_paginate.fish
+++ b/share/functions/__fish_paginate.fish
@@ -5,7 +5,7 @@ function __fish_paginate -d "Paginate the current command using the users defaul
         set cmd $PAGER
     end
 
-    if test -z (commandline -j)
+    if test -z (commandline -j | string join '')
         commandline -a $history[1]
     end
 

From 75bd8214959443f1703f51bc654b5652f9577acb Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 4 Oct 2019 07:11:04 +0800
Subject: [PATCH 1011/1732] CHANGELOG: minor work on 3.1.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bf5d1e33..be9a2e226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 - `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
 - Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
 - Error messages from builtin commands no longer include an extensive usage summary, and have more readable stack traces (#3404, #5434).
-- `fish`'s debugging arguments have been significantly imporved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output. 
+- `fish`'s debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
 - `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556).
 - A bug where some parser errors did not set `$status` to non-zero has been fixed.
 - `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
@@ -26,6 +26,7 @@
 - In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
 - `complete --do-complete` now also does fuzzy matches (#5467).
+- `complete --do-complete` can be used inside completions, allowing limited recursion (#3474).
 - `count` now also counts lines fed on standard input (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works as expected, rather than requiring `complete -Cfoo`.

From 9516fa5017ad66c563f067bcce8d0b95c317fd6f Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 4 Oct 2019 07:13:16 +0800
Subject: [PATCH 1012/1732] complete: document change in
 22ce8c23c62feeac13800dc805f91805450e3ee4

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

diff --git a/sphinx_doc_src/cmds/complete.rst b/sphinx_doc_src/cmds/complete.rst
index 67ba062b3..929cc6f4c 100644
--- a/sphinx_doc_src/cmds/complete.rst
+++ b/sphinx_doc_src/cmds/complete.rst
@@ -22,7 +22,7 @@ Synopsis
           [( -w | --wraps ) WRAPPED_COMMAND]...
           [( -n | --condition ) CONDITION]
           [( -d | --description ) DESCRIPTION]
-  complete ( -C[STRING] | --do-complete[=STRING] )
+  complete ( -C [STRING] | --do-complete[=STRING] )
 
 Description
 -----------

From 76f4b659811082e885aa0058ca396b73e29489ee Mon Sep 17 00:00:00 2001
From: domdom <github@dfer.me>
Date: Sat, 28 Sep 2019 01:56:47 +1000
Subject: [PATCH 1013/1732] Add prefix history search

---
 src/input.cpp      |  2 ++
 src/input_common.h |  2 ++
 src/reader.cpp     | 40 +++++++++++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index cc200b496..e4583980a 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -91,6 +91,8 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::backward_word, L"backward-word"},
     {readline_cmd_t::forward_bigword, L"forward-bigword"},
     {readline_cmd_t::backward_bigword, L"backward-bigword"},
+    {readline_cmd_t::history_prefix_search_backward, L"history-prefix-search-backward"},
+    {readline_cmd_t::history_prefix_search_forward, L"history-prefix-search-forward"},
     {readline_cmd_t::history_search_backward, L"history-search-backward"},
     {readline_cmd_t::history_search_forward, L"history-search-forward"},
     {readline_cmd_t::delete_char, L"delete-char"},
diff --git a/src/input_common.h b/src/input_common.h
index 8a728e1ba..72aca87c7 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -19,6 +19,8 @@ enum class readline_cmd_t {
     backward_bigword,
     history_search_backward,
     history_search_forward,
+    history_prefix_search_backward,
+    history_prefix_search_forward,
     delete_char,
     backward_delete_char,
     kill_line,
diff --git a/src/reader.cpp b/src/reader.cpp
index bdc3b769e..d7a6dc6a4 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -161,6 +161,7 @@ class reader_history_search_t {
     enum mode_t {
         inactive,  // no search
         line,      // searching by line
+        prefix,    // searching by prefix
         token      // searching by token
     };
 
@@ -192,7 +193,7 @@ class reader_history_search_t {
     bool append_matches_from_search() {
         const size_t before = matches_.size();
         wcstring text = search_.current_string();
-        if (mode_ == line) {
+        if (mode_ == line || mode_ == prefix) {
             add_if_new(std::move(text));
         } else if (mode_ == token) {
             const wcstring &needle = search_string();
@@ -255,6 +256,8 @@ class reader_history_search_t {
 
     bool by_line() const { return mode_ == line; }
 
+    bool by_prefix() const { return mode_ == prefix; }
+
     /// Move the history search in the given direction \p dir.
     bool move_in_direction(history_search_direction_t dir) {
         return dir == history_search_direction_t::forward ? move_forwards() : move_backwards();
@@ -293,8 +296,9 @@ class reader_history_search_t {
         match_index_ = 0;
         mode_ = mode;
         // We can skip dedup in history_search_t because we do it ourselves in skips_.
-        search_ =
-            history_search_t(*hist, text, HISTORY_SEARCH_TYPE_CONTAINS, history_search_no_dedup);
+        search_ = history_search_t(
+            *hist, text, by_prefix() ? HISTORY_SEARCH_TYPE_PREFIX : HISTORY_SEARCH_TYPE_CONTAINS,
+            history_search_no_dedup);
     }
 
     /// Reset to inactive search.
@@ -1002,6 +1006,8 @@ void reader_force_exit() {
 static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field) {
     using rl = readline_cmd_t;
     switch (c) {
+        case rl::history_prefix_search_backward:
+        case rl::history_prefix_search_forward:
         case rl::history_search_backward:
         case rl::history_search_forward:
         case rl::history_token_search_backward:
@@ -1068,6 +1074,8 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
 /// Indicates if the given command ends the history search.
 static bool command_ends_history_search(readline_cmd_t c) {
     switch (c) {
+        case readline_cmd_t::history_prefix_search_backward:
+        case readline_cmd_t::history_prefix_search_forward:
         case readline_cmd_t::history_search_backward:
         case readline_cmd_t::history_search_forward:
         case readline_cmd_t::history_token_search_backward:
@@ -1839,7 +1847,7 @@ void reader_data_t::update_command_line_from_history_search() {
                                                    : history_search.current_result();
     if (history_search.by_token()) {
         replace_current_token(new_text);
-    } else if (history_search.by_line()) {
+    } else if (history_search.by_line() || history_search.by_prefix()) {
         set_command_line_and_position(&command_line, new_text, new_text.size());
     }
 }
@@ -2772,15 +2780,23 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             break;
         }
 
+        case rl::history_prefix_search_backward:
+        case rl::history_prefix_search_forward:
         case rl::history_search_backward:
-        case rl::history_token_search_backward:
         case rl::history_search_forward:
+        case rl::history_token_search_backward:
         case rl::history_token_search_forward: {
+            reader_history_search_t::mode_t mode =
+                (c == rl::history_token_search_backward || c == rl::history_token_search_forward)
+                    ? reader_history_search_t::token
+                    : (c == rl::history_prefix_search_backward ||
+                       c == rl::history_prefix_search_forward)
+                          ? reader_history_search_t::prefix
+                          : reader_history_search_t::line;
+
             if (history_search.is_at_end()) {
                 const editable_line_t *el = &command_line;
-                bool by_token = (c == rl::history_token_search_backward) ||
-                                (c == rl::history_token_search_forward);
-                if (by_token) {
+                if (mode == reader_history_search_t::token) {
                     // Searching by token.
                     const wchar_t *begin, *end;
                     const wchar_t *buff = el->text.c_str();
@@ -2795,18 +2811,20 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                     }
                 } else {
                     // Searching by line.
-                    history_search.reset_to_mode(el->text, history, reader_history_search_t::line);
+                    history_search.reset_to_mode(el->text, history, mode);
 
                     // Skip the autosuggestion in the history unless it was truncated.
                     const wcstring &suggest = autosuggestion;
-                    if (!suggest.empty() && !screen.autosuggestion_is_truncated) {
+                    if (!suggest.empty() && !screen.autosuggestion_is_truncated &&
+                        mode != reader_history_search_t::prefix) {
                         history_search.add_skip(suggest);
                     }
                 }
             }
             if (history_search.active()) {
                 history_search_direction_t dir =
-                    (c == rl::history_search_backward || c == rl::history_token_search_backward)
+                    (c == rl::history_search_backward || c == rl::history_token_search_backward ||
+                     c == rl::history_prefix_search_backward)
                         ? history_search_direction_t::backward
                         : history_search_direction_t::forward;
                 history_search.move_in_direction(dir);

From 1602902e126b2db40a91f1f0f856638757ec2554 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Tue, 1 Oct 2019 18:36:56 -0700
Subject: [PATCH 1014/1732] Improved shell completion for Composer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Added missing commands and arguments.
2. Removed alternative spelling of some commands (e.g. clear-cache|clearcache) since a choice of spelling is not really useful for completion.
3. Fixed a typo: np-ansi → no-ansi.
4. Removed redundant backslash in front of $COMPOSER_HOME.

The updated completion was initially generated using the bamarni/symfony-console-autocomplete package and then incorporated into the existing code.
---
 share/completions/composer.fish | 271 ++++++++++++++++++++++++++++----
 1 file changed, 241 insertions(+), 30 deletions(-)

diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 93e420040..c96d8b2a8 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -60,66 +60,277 @@ if 'scripts' in data and data['scripts']:
 " | python
 end
 
-#add cmds list
-set --local composer_cmds 'about' 'archive' 'browse' 'clear-cache' 'clearcache' 'config' 'create-project' 'depends' 'diagnose' 'dump-autoload' 'dumpautoload' 'global' 'help' 'home' 'init' 'install' 'licenses' 'list' 'remove' 'require' 'run-script' 'search' 'self-update' 'selfupdate' 'show' 'status' 'update' 'validate'
-
-#help
-complete -f -c composer -n '__fish_composer_using_command help' -a "$composer_cmds"
-
-#update
-complete -f -c composer -n '__fish_composer_using_command update' -a "(__fish_composer_required_packages)"
-
-#remove
-complete -f -c composer -n '__fish_composer_using_command remove' -a "(__fish_composer_required_packages)"
-
-#diagnostics on installed commands
-complete -f -c composer -n '__fish_composer_using_command why' -a "(__fish_composer_installed_packages)"
-complete -f -c composer -n '__fish_composer_using_command why-not' -a "(__fish_composer_installed_packages)"
-complete -f -c composer -n '__fish_composer_using_command depends' -a "(__fish_composer_installed_packages)"
+# add cmds list
+set --local composer_cmds 'about' 'archive' 'browse' 'check-platform-reqs' 'clear-cache' 'config' 'create-project' 'depends' 'diagnose' 'dump-autoload' 'exec' 'global' 'help' 'home' 'init' 'install' 'licenses' 'list' 'outdated' 'prohibits' 'remove' 'require' 'run-script' 'search' 'self-update' 'show' 'suggests' 'status' 'update' 'validate' 'why' 'why-not'
 
 # Custom scripts
 complete -f -c composer -n '__fish_composer_needs_command' -a '(__fish_composer_scripts)' -d 'User script'
 complete -f -c composer -n '__fish_composer_using_command run-script' -a "(__fish_composer_scripts)"
+complete -f -c composer -n '__fish_composer_using_command run-script' -l 'timeout' -d 'Sets script timeout in seconds, or 0 for never.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l 'dev' -d 'Sets the dev mode.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l 'no-dev' -d 'Disables the dev mode.'
+complete -f -c composer -n '__fish_composer_using_command run-script' -l 'list' -d 'List scripts.'
 
-#popisky
+# commands
 complete -f -c composer -n '__fish_composer_needs_command' -a 'about' -d 'Short information about Composer'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'archive' -d 'Create an archive of this composer package'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'browse' -d 'Opens the package\'s repository URL or homepage in your browser.'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'check-platform-reqs' -d 'Check that platform requirements are satisfied.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'clear-cache' -d 'Clears composer\'s internal package cache.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'clearcache' -d 'Clears composer\'s internal package cache.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'config' -d 'Set config options'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'create-project' -d 'Create new project from a package into given directory.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'depends' -d 'Shows which packages depend on the given package'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'diagnose' -d 'Diagnoses the system to identify common errors.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'dump-autoload' -d 'Dumps the autoloader'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'dumpautoload' -d 'Dumps the autoloader'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'global' -d 'Allows running commands in the global composer dir (\$COMPOSER_HOME).'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'exec' -d 'Executes a vendored binary/script.'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'global' -d 'Allows running commands in the global composer dir ($COMPOSER_HOME).'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'help' -d 'Displays help for a command'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'home' -d 'Opens the package\'s repository URL or homepage in your browser.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'init' -d 'Creates a basic composer.json file in current directory.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'install' -d 'Installs the project dependencies from the composer.lock file if present, or falls back on the composer.json.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'licenses' -d 'Show information about licenses of dependencies'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'list' -d 'Lists commands'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'outdated' -d 'Shows a list of installed packages that have updates available, including their latest version.'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'prohibits' -d 'Shows which packages prevent the given package from being installed.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'remove' -d 'Removes a package from the require or require-dev'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'require' -d 'Adds required packages to your composer.json and installs them'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'run-script' -d 'Run the scripts defined in composer.json.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'search' -d 'Search for packages'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'self-update' -d 'Updates composer.phar to the latest version.'
-complete -f -c composer -n '__fish_composer_needs_command' -a 'selfupdate' -d 'Updates composer.phar to the latest version.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'show' -d 'Show information about packages'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'status' -d 'Show a list of locally modified packages'
+complete -f -c composer -n '__fish_composer_needs_command' -a 'suggests' -d 'Shows package suggestions.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'update' -d 'Updates your dependencies to the latest version according to composer.json, and updates the composer.lock file.'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'validate' -d 'Validates a composer.json'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'why' -d 'Shows which packages cause the given package to be installed'
 complete -f -c composer -n '__fish_composer_needs_command' -a 'why-not' -d 'Shows which packages prevent the given package from being installed'
 
-complete -f -c composer -n '__fish_composer_needs_command' -s 'h' -l 'help' -d 'Displays composer\'s help.'
-complete -f -c composer -n '__fish_composer_needs_command' -s 'q' -l 'quiet' -d 'Do not output any message.'
-complete -f -c composer -n '__fish_composer_needs_command' -s 'v' -l 'verbose' -d 'Increase the verbosity of messages: 1 for normal output (-v), 2 for more verbose output (-vv) and 3 for debug (-vvv).'
-complete -f -c composer -n '__fish_composer_needs_command' -s 'V' -l 'version' -d 'Display composer\'s application version.'
-complete -f -c composer -n '__fish_composer_needs_command' -l 'ansi' -d 'Force ANSI output.'
-complete -f -c composer -n '__fish_composer_needs_command' -l 'np-ansi' -d 'Disable ANSI output.'
-complete -f -c composer -n '__fish_composer_needs_command' -s 'n' -l 'no-interaction' -d 'Do not ask any interactive question.'
-complete -f -c composer -n '__fish_composer_needs_command' -l 'profile' -d 'Display timing and memory usage information.'
-complete -f -c composer -n '__fish_composer_needs_command' -s 'd' -l 'working-dir' -d 'If specified, use the given directory as working directory.'
+# archive
+complete -f -c composer -n '__fish_composer_using_command archive' -l 'format' -d 'Format of the resulting archive: tar or zip'
+complete -f -c composer -n '__fish_composer_using_command archive' -l 'dir' -d 'Write the archive to this directory'
+complete -f -c composer -n '__fish_composer_using_command archive' -l 'file' -d 'Write the archive with the given file name. Note that the format will be appended.'
+complete -f -c composer -n '__fish_composer_using_command archive' -l 'ignore-filters' -d 'Ignore filters when saving package'
 
+# browse
+complete -f -c composer -n '__fish_composer_using_command browse' -l 'homepage' -d 'Open the homepage instead of the repository URL.'
+complete -f -c composer -n '__fish_composer_using_command browse' -l 'show' -d 'Only show the homepage or repository URL.'
+
+# check-platform-reqs
+complete -f -c composer -n '__fish_composer_using_command check-platform-reqs' -l 'no-dev' -d 'Disables checking of require-dev packages requirements.'
+
+# config
+complete -f -c composer -n '__fish_composer_using_command config' -l 'global' -d 'Apply command to the global config file'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'editor' -d 'Open editor'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'auth' -d 'Affect auth config file (only used for --editor)'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'unset' -d 'Unset the given setting-key'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'list' -d 'List configuration settings'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'file' -d 'If you want to choose a different composer.json or config.json'
+complete -f -c composer -n '__fish_composer_using_command config' -l 'absolute' -d 'Returns absolute paths when fetching *-dir config values instead of relative'
+
+# create-project
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'stability' -d 'Minimum-stability allowed (unless a version is specified).'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'repository' -d 'Pick a different repository (as url or json config) to look for the package.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'repository-url' -d 'DEPRECATED: Use --repository instead.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-dev' -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-scripts' -d 'Whether to prevent execution of all defined scripts in the root package.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-secure-http' -d 'Disable the secure-http config option temporarily while installing the root package. Use at your own risk. Using this flag is a bad idea.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'keep-vcs' -d 'Whether to prevent deleting the vcs folder.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'remove-vcs' -d 'Whether to force deletion of the vcs folder without prompting.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'no-install' -d 'Whether to skip installation of the package dependencies.'
+complete -f -c composer -n '__fish_composer_using_command create-project' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+
+# depends
+complete -f -c composer -n '__fish_composer_using_command depends' -a "(__fish_composer_installed_packages)"
+complete -f -c composer -n '__fish_composer_using_command depends' -l 'recursive' -d 'Recursively resolves up to the root package'
+complete -f -c composer -n '__fish_composer_using_command depends' -l 'tree' -d 'Prints the results as a nested tree'
+
+# dump-autoload
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'optimize' -d 'Optimizes PSR0 and PSR4 packages to be loaded with classmaps too, good for production.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize`.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'apcu' -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command dump-autoload' -l 'no-dev' -d 'Disables autoload-dev rules.'
+
+# exec
+complete -f -c composer -n '__fish_composer_using_command exec' -l 'list'
+
+# help
+complete -f -c composer -n '__fish_composer_using_command help' -a "$composer_cmds"
+complete -f -c composer -n '__fish_composer_using_command help' -l 'xml' -d 'To output help as XML'
+complete -f -c composer -n '__fish_composer_using_command help' -l 'format' -d 'The output format (txt, xml, json, or md)'
+complete -f -c composer -n '__fish_composer_using_command help' -l 'raw' -d 'To output raw command help'
+
+# init
+complete -f -c composer -n '__fish_composer_using_command init' -l 'name' -d 'Name of the package'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'description' -d 'Description of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'author' -d 'Author name of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'type' -d 'Type of package (e.g. library, project, metapackage, composer-plugin)'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'homepage' -d 'Homepage of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'require' -d 'Package to require with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'require-dev' -d 'Package to require for development with a version constraint, e.g. foo/bar:1.0.0 or foo/bar=1.0.0 or "foo/bar 1.0.0"'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'stability' -d 'Minimum stability (empty or one of: stable, RC, beta, alpha, dev)'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'license' -d 'License of package'
+complete -f -c composer -n '__fish_composer_using_command init' -l 'repository' -d 'Add custom repositories, either by URL or using JSON arrays'
+
+# install
+complete -f -c composer -n '__fish_composer_using_command install' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'dry-run' -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-dev' -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-autoloader' -d 'Skips autoloader generation'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'no-suggest' -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command install' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+
+# licenses
+complete -f -c composer -n '__fish_composer_using_command licenses' -l 'format' -d 'Format of the output: text or json'
+complete -f -c composer -n '__fish_composer_using_command licenses' -l 'no-dev' -d 'Disables search in require-dev packages.'
+
+# list
+complete -f -c composer -n '__fish_composer_using_command list' -l 'xml' -d 'To output list as XML'
+complete -f -c composer -n '__fish_composer_using_command list' -l 'raw' -d 'To output raw command list'
+complete -f -c composer -n '__fish_composer_using_command list' -l 'format' -d 'The output format (txt, xml, json, or md)'
+
+# outdated
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'outdated' -d 'Show only packages that are outdated (this is the default, but present here for compat with `show`'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'all' -d 'Show all installed packages with their latest versions'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'direct' -d 'Shows only packages that are directly required by the root package'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'strict' -d 'Return a non-zero exit code when there are outdated packages'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'minor-only' -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'format' -d 'Format of the output: text or json'
+complete -f -c composer -n '__fish_composer_using_command outdated' -l 'ignore' -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
+
+# prohibits
+complete -f -c composer -n '__fish_composer_using_command prohibits' -l 'recursive' -d 'Recursively resolves up to the root package'
+complete -f -c composer -n '__fish_composer_using_command prohibits' -l 'tree' -d 'Prints the results as a nested tree'
+
+# remove
+complete -f -c composer -n '__fish_composer_using_command remove' -a "(__fish_composer_required_packages)"
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'dev' -d 'Removes a package from the require-dev section.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-update' -d 'Disables the automatic update of the dependencies.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'update-no-dev' -d 'Run the dependency update with the --no-dev option.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'update-with-dependencies' -d 'Allows inherited dependencies to be updated with explicit dependencies. (Deprecrated, is now default behavior)'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'no-update-with-dependencies' -d 'Does not allow inherited dependencies to be updated with explicit dependencies.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command remove' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+
+# require
+complete -f -c composer -n '__fish_composer_using_command require' -l 'dev' -d 'Add requirement to require-dev.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'no-suggest' -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'no-update' -d 'Disables the automatic update of the dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'update-no-dev' -d 'Run the dependency update with the --no-dev option.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'update-with-dependencies' -d 'Allows inherited dependencies to be updated, except those that are root requirements.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'update-with-all-dependencies' -d 'Allows all inherited dependencies to be updated, including those that are root requirements.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-stable' -d 'Prefer stable versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'prefer-lowest' -d 'Prefer lowest versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'sort-packages' -d 'Sorts packages when adding/updating a new dependency'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command require' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+
+# search
+complete -f -c composer -n '__fish_composer_using_command search' -l 'only-name' -d 'Search only in name'
+complete -f -c composer -n '__fish_composer_using_command search' -l 'type' -d 'Search for a specific package type'
+
+# self-update
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'rollback' -d 'Revert to an older installation of composer'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'clean-backups' -d 'Delete old backups during an update. This makes the current version of composer the only backup available after the update'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'update-keys' -d 'Prompt user for a key update'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'stable' -d 'Force an update to the stable channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'preview' -d 'Force an update to the preview channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'snapshot' -d 'Force an update to the snapshot channel'
+complete -f -c composer -n '__fish_composer_using_command self-update' -l 'set-channel-only' -d 'Only store the channel as the default one and then exit'
+
+# show
+complete -f -c composer -n '__fish_composer_using_command show' -l 'all' -d 'List all packages'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'installed' -d 'List installed packages only (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'platform' -d 'List platform packages only'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'available' -d 'List available packages only'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'self' -d 'Show the root package information'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'name-only' -d 'List package names only'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'path' -d 'Show package paths'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'tree' -d 'List the dependencies as a tree'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'latest' -d 'Show the latest version'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'outdated' -d 'Show the latest version but only for packages that are outdated'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'ignore' -d 'Ignore specified package(s). Use it with the --outdated option if you don\'t want to be informed about new versions of some packages.'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'minor-only' -d 'Show only packages that have minor SemVer-compatible updates. Use with the --outdated option.'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'direct' -d 'Shows only packages that are directly required by the root package'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'strict' -d 'Return a non-zero exit code when there are outdated packages'
+complete -f -c composer -n '__fish_composer_using_command show' -l 'format' -d 'Format of the output: text or json'
+
+# suggests
+complete -f -c composer -n '__fish_composer_using_command suggests' -l 'by-package' -d 'Groups output by suggesting package'
+complete -f -c composer -n '__fish_composer_using_command suggests' -l 'by-suggestion' -d 'Groups output by suggested package'
+complete -f -c composer -n '__fish_composer_using_command suggests' -l 'no-dev' -d 'Exclude suggestions from require-dev packages'
+
+# update
+complete -f -c composer -n '__fish_composer_using_command update' -a "(__fish_composer_required_packages)"
+complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-source' -d 'Forces installation from package sources when possible, including VCS information.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-dist' -d 'Forces installation from package dist even for dev versions.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'dry-run' -d 'Outputs the operations but will not execute anything (implicitly enables --verbose).'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'dev' -d 'Enables installation of require-dev packages (enabled by default, only present for BC).'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-dev' -d 'Disables installation of require-dev packages.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'lock' -d 'Only updates the lock file hash to suppress warning about the lock file being out of date.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-custom-installers' -d 'DEPRECATED: Use no-plugins instead.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-autoloader' -d 'Skips autoloader generation'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-scripts' -d 'Skips the execution of all scripts defined in composer.json file.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-progress' -d 'Do not output download progress.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'no-suggest' -d 'Do not show package suggestions.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'with-dependencies' -d 'Add also dependencies of whitelisted packages to the whitelist, except those defined in root package.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'with-all-dependencies' -d 'Add also all dependencies of whitelisted packages to the whitelist, including those defined in root package.'
+complete -f -c composer -n '__fish_composer_using_command update' -s 'v' -l 'verbose' -d 'Shows more details including new commits pulled in when updating packages.'
+complete -f -c composer -n '__fish_composer_using_command update' -s 'o' -l 'optimize-autoloader' -d 'Optimize autoloader during autoloader dump.'
+complete -f -c composer -n '__fish_composer_using_command update' -s 'a' -l 'classmap-authoritative' -d 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'apcu-autoloader' -d 'Use APCu to cache found/not-found classes.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'ignore-platform-reqs' -d 'Ignore platform requirements (php & ext- packages).'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-stable' -d 'Prefer stable versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'prefer-lowest' -d 'Prefer lowest versions of dependencies.'
+complete -f -c composer -n '__fish_composer_using_command update' -s 'i' -l 'interactive' -d 'Interactive interface with autocompletion to select the packages to update.'
+complete -f -c composer -n '__fish_composer_using_command update' -l 'root-reqs' -d 'Restricts the update to your first degree dependencies.'
+
+# validate
+complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-all' -d 'Do not validate requires for overly strict/loose constraints'
+complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-lock' -d 'Do not check if lock file is up to date'
+complete -f -c composer -n '__fish_composer_using_command validate' -l 'no-check-publish' -d 'Do not check for publish errors'
+complete -f -c composer -n '__fish_composer_using_command validate' -l 'with-dependencies' -d 'Also validate the composer.json of all installed dependencies'
+complete -f -c composer -n '__fish_composer_using_command validate' -l 'strict' -d 'Return a non-zero exit code for warnings as well as errors'
+
+# why
+complete -f -c composer -n '__fish_composer_using_command why' -a "(__fish_composer_installed_packages)"
+
+# why-not
+complete -f -c composer -n '__fish_composer_using_command why-not' -a "(__fish_composer_installed_packages)"
+
+# global options
+complete -c composer -n '__fish_composer_needs_command' -s 'h' -l 'help' -d 'Displays composer\'s help.'
+complete -c composer -n '__fish_composer_needs_command' -s 'q' -l 'quiet' -d 'Do not output any message.'
+complete -c composer -n '__fish_composer_needs_command' -s 'v' -l 'verbose' -d 'Increase the verbosity of messages: 1 for normal output (-v), 2 for more verbose output (-vv) and 3 for debug (-vvv).'
+complete -c composer -n '__fish_composer_needs_command' -s 'V' -l 'version' -d 'Display composer\'s application version.'
+complete -c composer -n '__fish_composer_needs_command' -l 'ansi' -d 'Force ANSI output.'
+complete -c composer -n '__fish_composer_needs_command' -l 'no-ansi' -d 'Disable ANSI output.'
+complete -c composer -n '__fish_composer_needs_command' -s 'n' -l 'no-interaction' -d 'Do not ask any interactive question.'
+complete -c composer -n '__fish_composer_needs_command' -l 'profile' -d 'Display timing and memory usage information.'
+complete -c composer -n '__fish_composer_needs_command' -l 'no-plugins' -d 'Whether to disable plugins.'
+complete -c composer -n '__fish_composer_needs_command' -s 'd' -l 'working-dir' -d 'If specified, use the given directory as working directory.'
+complete -c composer -n '__fish_composer_needs_command' -l 'no-cache' -d 'Prevent use of the cache.'

From 7017a2fcf9431f15237808df281f5bcac0b28309 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 6 Oct 2019 13:28:42 +0200
Subject: [PATCH 1015/1732] Unexpand abbreviations' variable names before
 completing them

Fixes #6166
---
 src/expand.cpp         | 4 +++-
 src/expand.h           | 1 +
 tests/checks/abbr.fish | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index fbdc8c8d0..5f0b362c6 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1211,7 +1211,9 @@ std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars) {
     std::map<wcstring, wcstring> result;
     for (const wcstring &name : names) {
         if (string_prefixes_string(prefix, name)) {
-            result[name.substr(prefix.size())] = vars.get(name)->as_string();
+            wcstring key;
+            unescape_string(name.substr(prefix.size()), &key, UNESCAPE_DEFAULT, STRING_STYLE_VAR);
+            result[key] = vars.get(name)->as_string();
         }
     }
     return result;
diff --git a/src/expand.h b/src/expand.h
index 371724307..3737d8494 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -177,6 +177,7 @@ wcstring replace_home_directory_with_tilde(const wcstring &str, const environmen
 maybe_t<wcstring> expand_abbreviation(const wcstring &src, const environment_t &vars);
 
 /// \return a snapshot of all abbreviations as a map abbreviation->expansion.
+/// The abbreviations are unescaped, i.e. they may not be valid variable identifiers (#6166).
 std::map<wcstring, wcstring> get_abbreviations(const environment_t &vars);
 
 // Terrible hacks
diff --git a/tests/checks/abbr.fish b/tests/checks/abbr.fish
index dd8eaddd3..b2c3a64ef 100644
--- a/tests/checks/abbr.fish
+++ b/tests/checks/abbr.fish
@@ -85,3 +85,7 @@ abbr __abbr11 omega11
 abbr __abbr12 omega12
 abbr -r __abbr11 __abbr12
 # CHECKERR: abbr --rename: Abbreviation __abbr12 already exists, cannot rename __abbr11
+
+abbr __abbr-with-dashes omega
+complete -C__abbr-with
+# CHECK: __abbr-with-dashes	Abbreviation: omega

From 0fdad2dd6a8a94d34c4cbedf263a40e6e8a893ac Mon Sep 17 00:00:00 2001
From: domdom <github@dfer.me>
Date: Sun, 6 Oct 2019 06:50:20 +1000
Subject: [PATCH 1016/1732] doc: mention history prefix search binds in
 binds.rst

Mention history-prefix-search-forward and history-prefix-search-backward in
binds.rst
---
 sphinx_doc_src/cmds/bind.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index eab4ca094..fd7a17e81 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -122,6 +122,10 @@ The following special input functions are available:
 
 - ``history-search-forward``, search the history for the next match
 
+- ``history-prefix-search-backward``, search the history for the previous prefix match
+
+- ``history-prefix-search-forward``, search the history for the next prefix match
+
 - ``history-token-search-backward``, search the history for the previous matching argument
 
 - ``history-token-search-forward``, search the history for the next matching argument

From 26adff33784a8d323cb3246d61f3263253566459 Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Fri, 4 Oct 2019 15:03:25 +0200
Subject: [PATCH 1017/1732] doc: add link to event handlers in emit

[ci skip]
---
 sphinx_doc_src/cmds/emit.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/emit.rst b/sphinx_doc_src/cmds/emit.rst
index 0e00e8e87..92be19482 100644
--- a/sphinx_doc_src/cmds/emit.rst
+++ b/sphinx_doc_src/cmds/emit.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``emit`` emits, or fires, an event. Events are delivered to, or caught by, special functions called event handlers. The arguments are passed to the event handlers as function arguments.
+``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.
 
 
 Example

From e44d207d64327bb78de0313eea532c50b9cd430e Mon Sep 17 00:00:00 2001
From: Kon Doumou <unknown>
Date: Wed, 18 Sep 2019 23:35:33 +0300
Subject: [PATCH 1018/1732] sudo keywork is ignored when alt+h is pressed

if `sudo` is in the beggining of the command string, then at alt+h press
the manual of the following command is shown instead.

Fixes https://github.com/fish-shell/fish-shell/issues/5982
---
 share/functions/__fish_man_page.fish | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/share/functions/__fish_man_page.fish b/share/functions/__fish_man_page.fish
index 5c490cc6a..acb6fda44 100644
--- a/share/functions/__fish_man_page.fish
+++ b/share/functions/__fish_man_page.fish
@@ -8,6 +8,12 @@ function __fish_man_page
         return
     end
 
+    #Skip `sudo` and display then manpage of following command
+    while set -q args[2] 
+        and test $args[1] = "sudo" 
+        set args $args[2..-1]
+    end
+
     # If there are at least two tokens not starting with "-", the second one might be a subcommand.
     # Try "man first-second" and fall back to "man first" if that doesn't work out.
     set -l maincmd (basename $args[1])

From 87dee7ad1c5cf13067ee24fdaaea437aa9f7b8ea Mon Sep 17 00:00:00 2001
From: madblobfish <madblobfish@users.noreply.github.com>
Date: Mon, 23 Sep 2019 18:15:55 +0200
Subject: [PATCH 1019/1732] improved ansible-vault completions

---
 share/completions/ansible-vault.fish | 45 ++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/share/completions/ansible-vault.fish b/share/completions/ansible-vault.fish
index 7437ef5b9..5ef4d428c 100644
--- a/share/completions/ansible-vault.fish
+++ b/share/completions/ansible-vault.fish
@@ -1,7 +1,40 @@
-complete -c ansible-vault -l ask-vault-pass -f -d "Ask for vault password"
-complete -c ansible-vault -s h -l help -f -d "Show this help message and exit"
-complete -c ansible-vault -l new-vault-password-file -r -d "New vault password file for rekey"
-complete -c ansible-vault -l output -r -d "Output file name for encrypt or decrypt; use - for stdout"
-complete -c ansible-vault -l vault-password-file -r -d "Vault password file"
-complete -c ansible-vault -s v -l verbose -d "Verbose mode (-vvv for more, -vvvv to enable connection debugging)"
+
+function __fish_ansible_vault_no_subcommand -d 'Test if ansible-vault has yet to be given the subcommand'
+    commandline -pc | not string match --regex '[^-]\b(?:create|decrypt|edit|encrypt|encrypt_string|rekey|view)\b'
+end
+
+function __fish_ansible_vault_using_command
+    set -l cmd (string trim (__fish_ansible_vault_no_subcommand))
+    test -z "$cmd";
+    and return 1
+    contains -- "$cmd" $argv
+end
+
+
+# generic options
 complete -c ansible-vault -l version -d "Display version and exit"
+complete -c ansible-vault -s h -l help -f -d "Show help message and exit"
+complete -c ansible-vault -s v -l verbose -d "Verbose mode (-vvv for more, -vvvv to enable connection debugging)"
+complete -c ansible-vault -l ask-vault-pass -f -d "Ask for vault password"
+complete -c ansible-vault -l new-vault-id -r -d "the new vault identity to use for rekey"
+complete -c ansible-vault -l new-vault-password-file -r -d "New vault password file for rekey"
+complete -c ansible-vault -l vault-id -r -d "the vault identity to use"
+complete -c ansible-vault -l vault-password-file -r -d "Vault password file"
+
+# subcommands
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a decrypt -d 'Decrypt encrypted file or stdin'
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a encrypt -d 'Encrypt a file or stdin'
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra create -d 'Create encrypted file'
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra edit -d 'Edit encrypted file'
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra rekey -d 'Rekey encrypted file'
+complete -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -ra view -d 'View contents of something encrypted'
+complete -f -c ansible-vault -n '__fish_ansible_vault_no_subcommand' -a encrypt_string -d 'Encrypt string'
+
+# encrypt_string options
+complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string' -r -l stdin-name -f -d 'Specify the variable name for stdin'
+complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string' -r -s n -l name -f -d 'Specify the variable name'
+complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string' -s p -l prompt -d 'Prompt for the string to encrypt'
+
+# shared options
+complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string rekey edit create' -l encrypt-vault-id -r -d "the vault id used to encrypt (required if more than vault-id is provided)"
+complete -c ansible-vault -n '__fish_ansible_vault_using_command encrypt encrypt_string decrypt' -l output -r -d "Output file name for encrypt or decrypt; use - for stdout"

From e5fc8abefebac935ffc8419dc606248243f56e77 Mon Sep 17 00:00:00 2001
From: Greg Anders <greg@gpanders.com>
Date: Sun, 6 Oct 2019 07:14:10 -0600
Subject: [PATCH 1020/1732] Fix default Alt+W keybinding (#6110)

* Fix default Alt+W keybinding

The old keybinding would chop off the last line of the `whatis` output
when using a multi-line prompt. This fix corrects that.

* Make variable local and remove unneeded if statement

* Test that token is non-empty
---
 share/functions/__fish_shared_key_bindings.fish |  2 +-
 .../functions/__fish_whatis_current_token.fish  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 share/functions/__fish_whatis_current_token.fish

diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index 68f6c38fe..331faa508 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -80,7 +80,7 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     bind --preset $argv \e. history-token-search-backward
 
     bind --preset $argv \el __fish_list_current_token
-    bind --preset $argv \ew 'set tok (commandline -pt); if test -n "$tok[1]"; echo; whatis $tok[1]; commandline -f repaint; end'
+    bind --preset $argv \ew __fish_whatis_current_token
     # ncurses > 6.0 sends a "delete scrollback" sequence along with clear.
     # This string replace removes it.
     bind --preset $argv \cl 'echo -n (clear | string replace \e\[3J ""); commandline -f repaint'
diff --git a/share/functions/__fish_whatis_current_token.fish b/share/functions/__fish_whatis_current_token.fish
new file mode 100644
index 000000000..5bbd668c9
--- /dev/null
+++ b/share/functions/__fish_whatis_current_token.fish
@@ -0,0 +1,17 @@
+# This function is typically bound to Alt-W, it is used to list man page entries
+# for the command under the cursor.
+function __fish_whatis_current_token -d "Show man page entries related to the token under the cursor"
+    set -l tok (commandline -pt)
+
+    if test -n "$tok[1]"
+        printf "\n"
+        whatis $tok[1]
+
+        set -l line_count (count (fish_prompt))
+        for x in (seq 2 $line_count)
+            printf "\n"
+        end
+
+        commandline -f repaint
+    end
+end

From 0f802eaad8aeb2a10bfb78e88980a5b8ca5c33bb Mon Sep 17 00:00:00 2001
From: Greg Anders <greande@sandia.gov>
Date: Wed, 25 Sep 2019 10:34:54 -0600
Subject: [PATCH 1021/1732] Add default \es keybinding for "prepend sudo"

---
 share/functions/__fish_prepend_sudo.fish        | 8 ++++++++
 share/functions/__fish_shared_key_bindings.fish | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 share/functions/__fish_prepend_sudo.fish

diff --git a/share/functions/__fish_prepend_sudo.fish b/share/functions/__fish_prepend_sudo.fish
new file mode 100644
index 000000000..a696d8ac3
--- /dev/null
+++ b/share/functions/__fish_prepend_sudo.fish
@@ -0,0 +1,8 @@
+function __fish_prepend_sudo -d "Prepend 'sudo ' to the beginning of the current commandline"
+    set -l cmd (commandline -boc)
+    if test "$cmd[1]" != "sudo"
+        commandline -C 0
+        commandline -i "sudo "
+        commandline -f end-of-line
+    end
+end
diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index 331faa508..668f59228 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -93,6 +93,9 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
     bind --preset $argv \ed 'set -l cmd (commandline); if test -z "$cmd"; echo; dirh; commandline -f repaint; else; commandline -f kill-word; end'
     bind --preset $argv \cd delete-or-exit
 
+    # Prepend 'sudo ' to the current commandline
+    bind --preset $argv \es __fish_prepend_sudo
+
     # Allow reading manpages by pressing F1 (many GUI applications) or Alt+h (like in zsh).
     bind --preset $argv -k f1 __fish_man_page
     bind --preset $argv \eh __fish_man_page

From e5c84e63b60c14909768066da7678cb896ce4bea Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Oct 2019 15:22:25 +0200
Subject: [PATCH 1022/1732] Document prepend-sudo

[ci skip]
---
 sphinx_doc_src/index.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index c2eb1e2e3..e24ff62e0 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1454,6 +1454,8 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Alt+v` Same as :kbd:`Alt+e`.
 
+- :kbd:`Alt+s` Prepends `sudo` to the current commandline.
+
 .. _emacs-mode:
 
 Emacs mode commands

From 8bc44b2bff62c2faf14e210e02f23f1f3fbda516 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Oct 2019 15:31:58 +0200
Subject: [PATCH 1023/1732] CHANGELOG: Introduce sub-headers for interactive
 improvements

These are just too many and too different to keep them under one heading.
---
 CHANGELOG.md | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be9a2e226..b3bb0bbdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,17 +40,30 @@
 - `functions --erase` now also prevents fish from autoloading a function for the first time (#5951).
 
 ### Interactive improvements
-- Major improvements in performance and functionality to the 'sorin' sample prompt (#5411).
-- The `fish_clipboard_*` functions support wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
+- fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
+- The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
+- `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
+#### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
+- The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
+- The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
+- The `fish_clipboard_*` functions support wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
+- The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
+- If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
+- The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
+- The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
+- A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
+- The `self-insert` readline command will now insert the binding sequence, if not empty.
+#### Improved prompts
+- The git prompt in informative mode now shows the number of stashes if enabled.
+- The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
+#### Improved output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).
 - Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552 and others).
-- fish now underlines every valid entered path instead of just the last one (#5872).
-- The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
-- fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
-- The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
 - fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), eliminating the need to set `$fish_emoji_width` in most cases (#5722).
-- The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
+- fish now underlines every valid entered path instead of just the last one (#5872).
+- When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+#### New or improved completions
 - Added completions for
   - `aws`
   - `bat` (#6052)
@@ -75,16 +88,6 @@
   - `tsc` (#6016)
   - `vbc` (#6016)
 - Lots of improvements to completions.
-- The git prompt in informative mode now shows the number of stashes if enabled.
-- The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
-- The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
-- If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
-- The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
-- `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
-- When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
-- The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
-- A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
-- The `self-insert` readline command will now insert the binding sequence, if not empty.
 
 ## Deprecations
 - The vcs-prompt functions have been promoted to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
@@ -92,8 +95,8 @@
 ### For distributors and developers
 - fish 3.0 introduced a CMake-based build system. In fish 3.1, both the Autotools-based build and legacy Xcode build system have been removed, leaving only the CMake build system. All distributors and developers must install CMake.
 - The documentation is now built with Sphinx. The old Doxygen-based documentation system has been removed. Developers, and distributors who wish to rebuild the documentation, must install Sphinx.
-- The `INTERNAL_WCWIDTH` build option has been removed, as fish always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
-- mandoc is now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
+- The `INTERNAL_WCWIDTH` build option has been removed, as fish now always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
+- mandoc can now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
 
 ---
 

From eca1fcad9039942919fd7add0c76b02ddae8190b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 6 Oct 2019 15:38:11 +0200
Subject: [PATCH 1024/1732] CHANGELOG: Document the new binding changes

[ci skip]
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3bb0bbdd..3bfdf12f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
+
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
@@ -54,15 +55,22 @@
 - The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
 - A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
 - The `self-insert` readline command will now insert the binding sequence, if not empty.
+- A new binding to prepend `sudo`, bound to alt-s by default (#6140).
+- The alt-w binding to describe a command should now work better with multiline prompts (#6110)
+- The alt-h binding to open a command's man page now tries to ignore `sudo` (#6122).
+- A new pair of bind functions, `history-prefix-search-backward` (and forward) was introduced (#6143).
+
 #### Improved prompts
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
+
 #### Improved output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).
 - Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552 and others).
 - fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), eliminating the need to set `$fish_emoji_width` in most cases (#5722).
 - fish now underlines every valid entered path instead of just the last one (#5872).
 - When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+
 #### New or improved completions
 - Added completions for
   - `aws`

From dfc45f3e10727ed3a9bee999a0b8cb10342b6585 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Wed, 2 Oct 2019 11:45:01 -0700
Subject: [PATCH 1025/1732] Clear line if new indentation greater than old.

Make sure initial indentation is skipped, rather than written as spaces.
This is a tweak to pull request #5928.
---
 src/screen.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 9df04c231..5dc1ae83a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -668,7 +668,6 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         size_t skip_prefix = shared_prefix;
         if (shared_prefix < o_line.indentation) {
             if (o_line.indentation > s_line.indentation
-                && s_line.indentation != s_line.size()
                 && !has_cleared_screen && clr_eol && clr_eos) {
                 s_set_color(scr, vars, highlight_spec_t{});
                 s_move(scr, 0, (int)i);
@@ -679,16 +678,17 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             }
             skip_prefix = o_line.indentation;
         }
-        if (!should_clear_screen_this_line) {
-            // Compute how much we should skip. At a minimum we skip over the prompt. But also skip
-            // over the shared prefix of what we want to output now, and what we output before, to
-            // avoid repeatedly outputting it.
-            if (skip_prefix > 0) {
-                size_t skip_width = shared_prefix < skip_prefix ? skip_prefix
-                    : fish_wcswidth(&o_line.text.at(0), shared_prefix);
-                if (skip_width > skip_remaining) skip_remaining = skip_width;
-            }
 
+        // Compute how much we should skip. At a minimum we skip over the prompt. But also skip
+        // over the shared prefix of what we want to output now, and what we output before, to
+        // avoid repeatedly outputting it.
+        if (skip_prefix > 0) {
+            size_t skip_width = shared_prefix < skip_prefix ? skip_prefix
+                                                : fish_wcswidth(&o_line.text.at(0), shared_prefix);
+            if (skip_width > skip_remaining) skip_remaining = skip_width;
+        }
+
+        if (!should_clear_screen_this_line) {
             // If we're soft wrapped, and if we're going to change the first character of the next
             // line, don't skip over the last two characters so that we maintain soft-wrapping.
             if (o_line.is_soft_wrapped && i + 1 < scr->desired.line_count()) {

From afb8f42f39b370eb52771ec04d093755290c1737 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Sun, 29 Sep 2019 22:09:26 -0700
Subject: [PATCH 1026/1732] Emit omitted-newline string before fish_prompt
 event

See issue #6118 "omitted-newline string emitted after fish_prompt event"
---
 src/reader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index d7a6dc6a4..2cb60c977 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2258,7 +2258,6 @@ static int read_i(parser_t &parser) {
     data->prev_end_loop = 0;
 
     while (!shell_is_exiting()) {
-        event_fire_generic(parser, L"fish_prompt");
         run_count++;
 
         if (parser.libdata().is_breakpoint && function_exists(DEBUG_PROMPT_FUNCTION_NAME, parser)) {
@@ -3207,10 +3206,11 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
 
     history_search.reset();
 
+    s_reset(&screen, screen_reset_abandon_line);
+    event_fire_generic(parser(), L"fish_prompt");
     exec_prompt();
 
     super_highlight_me_plenty();
-    s_reset(&screen, screen_reset_abandon_line);
     repaint();
 
     // Get the current terminal modes. These will be restored when the function returns.

From 9b86d5dd16e99dd5d785ee6263c42af4c6932726 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 3 Oct 2019 12:26:51 +0200
Subject: [PATCH 1027/1732] Export all local exported variables in a new scope

Fixes #6153
---
 CHANGELOG.md          |  1 +
 src/env.cpp           | 13 +++++++------
 tests/checks/set.fish | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bfdf12f3..bf3423007 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
+- A bug where local variables would not be exported to functions has been fixed (#6153).
 - A bug where `string split` would be drop empty strings if the output was only empty strings has been fixed (#5987).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
diff --git a/src/env.cpp b/src/env.cpp
index 8998c4790..8f6b21b06 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -855,7 +855,7 @@ class env_stack_impl_t final : public env_scoped_impl_t {
     virtual ~env_stack_impl_t() = default;
 
    private:
-    // The scopes of caller functions, which are currently shadowed.
+    /// The scopes of caller functions, which are currently shadowed.
     std::vector<env_node_ref_t> shadowed_locals_;
 
     /// A restricted set of variable flags.
@@ -936,12 +936,13 @@ void env_stack_impl_t::push_nonshadowing() {
 
 void env_stack_impl_t::push_shadowing() {
     // Propagate local exported variables.
-    // TODO: this should take all local exported variables, not just those in the top scope.
     auto node = std::make_shared<env_node_t>(true, nullptr);
-    for (const auto &var : locals_->env) {
-        if (var.second.exports()) {
-            node->env.insert(var);
-            node->changed_exported();
+    for (auto cursor = locals_; cursor; cursor = cursor->next) {
+        for (const auto &var : cursor->env) {
+            if (var.second.exports()) {
+                node->env.insert(var);
+                node->changed_exported();
+            }
         }
     }
     this->shadowed_locals_.push_back(std::move(locals_));
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 4865ec916..cd692bf17 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -448,4 +448,18 @@ set -e -U __fish_test_global_vs_universal
 echo "global-vs-universal 5: $__fish_test_global_vs_universal"
 # CHECK: global-vs-universal 5: 
 
+# Export local variables from all parent scopes (issue #6153).
+function func; echo $local; end
+set -lx local outer
+func
+# CHECK: outer
+begin
+    func
+    # CHECK: outer
+
+    set -lx local inner
+    begin; func; end
+    # CHECK: inner
+end
+
 true

From a069b95f6332e9b22481653340652a67de39127a Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 3 Sep 2019 01:13:53 +0000
Subject: [PATCH 1028/1732] split gpg2- and gpg1-specific completions to
 conditional block

This allows gpg.fish to account for both gpg versions.
---
 share/completions/gpg.fish       |  76 ++++++-
 share/completions/gpg2.fish      |   4 +-
 share/completions/gpgbackup.fish | 356 +++++++++++++++++++++++++++++++
 3 files changed, 429 insertions(+), 7 deletions(-)
 create mode 100644 share/completions/gpgbackup.fish

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index c3638bc25..522c89ba8 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -19,6 +19,7 @@
 # Various functions used for dynamic completions
 #
 
+
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
     # 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
@@ -72,6 +73,69 @@ function __fish_print_gpg_algo -d "Complete using all algorithms of the type spe
     }'
 end
 
+if test (gpg --version | sed '1q;d' | cut -b 13) -eq 2
+    complete -c gpg -l no-keyring -d "Do not use any keyring at all"
+    complete -c gpg -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+    complete -c gpg -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+    complete -c gpg -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+    complete -c gpg -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+    complete -c gpg -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+    complete -c gpg -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
+    complete -c gpg -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
+    complete -c gpg -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+    complete -c gpg -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+    complete -c gpg -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+    complete -c gpg -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+    complete -c gpg -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+    complete -c gpg -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
+    complete -c gpg -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
+    complete -c gpg -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
+    complete -c gpg -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+    complete -c gpg -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+    complete -c gpg -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+    complete -c gpg -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+    complete -c gpg -l show-keys -d "Take OpenPGP keys as input and print information about them"
+    complete -c gpg -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
+    complete -c gpg -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
+    complete -c gpg -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
+    complete -c gpg -l try-secret-key -xa "(__fish_complete_gpg_key_id)" -d "Specify keys to be used for trial decryption"
+
+    complete -c gpg -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
+    complete -c gpg -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
+    complete -c gpg -l with-keygrip -d "Include the keygrip in the key listings"
+    complete -c gpg -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+    complete -c gpg -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+    complete -c gpg -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+    complete -c gpg -l log-file -r -d "Write log output to the specified file"
+    complete -c gpg -l locate-keys -d "Locate the keys given as arguments"
+    complete -c gpg -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+    complete -c gpg -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+    complete -c gpg -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+    complete -c gpg -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+    complete -c gpg -l key-origin -d "Track the origin of a key"
+    complete -c gpg -l input-size-hint -r -d "Specify input size in bytes"
+    complete -c gpg -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
+    complete -c gpg -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+    complete -c gpg -l generate-key -d "Generate a new key pair"
+    complete -c gpg -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+    complete -c gpg -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+    complete -c gpg -l full-generate-key -d "Generate a new key pair with dialogs for all options"
+    complete -c gpg -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+    complete -c gpg -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+    complete -c gpg -l edit-card -d "Present a menu to work with a smartcard"
+    complete -c gpg -l card-edit -d "Present a menu to work with a smartcard"
+    complete -c gpg -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+    complete -c gpg -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+    complete -c gpg -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+    complete -c gpg -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+    complete -c gpg -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+    complete -c gpg -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+    complete -c gpg -l agent-program -d "Specify an agent program to be used for secret key operations"
+    complete -c gpg -l clear-sign -d "Make a clear text signature"
+else
+    complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
+    complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
+end
 
 #
 # gpg subcommands
@@ -82,7 +146,7 @@ complete -c gpg -l clearsign -d "Make a clear text signature"
 complete -c gpg -s b -l detach-sign -d "Make a detached signature"
 complete -c gpg -s e -l encrypt -d "Encrypt data"
 complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg -l store -d "Store only (make a simple RFC1991 packet)"
+complete -c gpg -l store -d "Store only (make a simple literal data packet)"
 complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
 complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
 complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
@@ -96,7 +160,9 @@ complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d
 complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
 
 complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg -l check-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
 complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
+
 complete -c gpg -l gen-key -d "Generate a new key pair"
 
 complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
@@ -122,6 +188,7 @@ complete -c gpg -l fast-import -d 'Import/merge keys'
 complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
 complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
 complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
+
 complete -c gpg -l update-trustdb -d "Do trust database maintenance"
 complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
 
@@ -219,6 +286,7 @@ complete -c gpg -l load-extension -x -d "Load an extension module"
 
 complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
 complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
+complete -c gpg -l logger-file -r -d "Write log output to the specified file"
 complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
 
 complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
@@ -260,13 +328,10 @@ complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use
 complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
 complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
 
-complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
-
 complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
 complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
 
 complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
-complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
 
 complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
 complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
@@ -333,8 +398,6 @@ complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary
 complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
 
 complete -c gpg -l show-session-key -d "Display the session key used for one message"
-complete -c gpg -l override-session-key -x -d "Don't use the public key but the specified session key"
-
 complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
 complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
 
@@ -353,4 +416,5 @@ complete -c gpg -l preserve-permissions -d "Don't change the permissions of a se
 complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
 complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
 complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+
 complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 1097693f3..9cd1bb331 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -160,12 +160,14 @@ complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
 complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
 
 complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
-complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
+complete -c gpg2 -l quick-addkey -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
+complete -c gpg2 -l quick-adduid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
 complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
 complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
 complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
 complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
 complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
+complete -c gpg2 -l quick-revuid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
 complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
 complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
 
diff --git a/share/completions/gpgbackup.fish b/share/completions/gpgbackup.fish
new file mode 100644
index 000000000..c3638bc25
--- /dev/null
+++ b/share/completions/gpgbackup.fish
@@ -0,0 +1,356 @@
+#
+# Completions for the gpg command.
+#
+# This program accepts an rather large number of switches. It allows
+# you to do things like changing what file descriptor errors should be
+# written to, to make gpg use a different locale than the one
+# specified in the environment or to specify an alternative home
+# directory.
+
+# Switches related to debugging, switches whose use is not
+# recommended, switches whose behaviour is as of yet undefined,
+# switches for experimental features, switches to make gpg compliant
+# to legacy pgp-versions, dos-specific switches, switches meant for
+# the options file and deprecated or obsolete switches have all been
+# removed. The remaining list of completions is still quite
+# impressive.
+
+#
+# Various functions used for dynamic completions
+#
+
+function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
+    # 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 colons with \x3a
+    gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
+end
+
+function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
+    # Use user id as description
+    set -l keyid
+    gpg --list-keys --with-colons | while read garbage
+        switch $garbage
+            # Extract user ids
+            case "uid*"
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
+                printf "%s\t%s\n" $keyid $uid
+            # Extract key fingerprints (no subkeys)
+            case "pub*"
+                echo $garbage | cut -d ":" -f 5 | read keyid
+        end
+    end
+end
+
+function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
+    # Set a known locale, so that the output format of 'gpg --version'
+    # is at least somewhat predictable. The locale will automatically
+    # expire when the function goes out of scope, and the original locale
+    # will take effect again.
+    set -lx LC_ALL C
+
+    # sed script explained:
+    # in the line that matches "$argv:"
+    # 	define label 'loop'
+    # 	if the line ends with a ','
+    # 		add next line to buffer
+    #		transliterate '\n' with ' '
+    #		goto loop
+    # 	remove everything until the first ':' of the line
+    # 	remove all blanks
+    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    # 	print result
+    gpg --version | sed -ne "/$argv:/"'{:loop
+    /,$/{N; y!\n! !
+    b loop
+    }
+    s!^[^:]*:!!
+    s![ ]*!!g
+    y!,!\n!
+    p
+    }'
+end
+
+
+#
+# gpg subcommands
+#
+
+complete -c gpg -s s -l sign -d "Make a signature"
+complete -c gpg -l clearsign -d "Make a clear text signature"
+complete -c gpg -s b -l detach-sign -d "Make a detached signature"
+complete -c gpg -s e -l encrypt -d "Encrypt data"
+complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+complete -c gpg -l store -d "Store only (make a simple RFC1991 packet)"
+complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
+complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
+complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
+complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
+complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
+complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
+
+complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+
+complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
+complete -c gpg -l gen-key -d "Generate a new key pair"
+
+complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
+
+complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
+complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
+
+complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
+complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
+complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+
+complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
+complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
+complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+
+complete -c gpg -l import -d 'Import/merge keys'
+complete -c gpg -l fast-import -d 'Import/merge keys'
+
+complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
+complete -c gpg -l update-trustdb -d "Do trust database maintenance"
+complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
+complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+complete -c gpg -l version -d "Display version and supported algorithms, and exit"
+complete -c gpg -l warranty -d "Display warranty and exit"
+complete -c gpg -s h -l help -d "Display help and exit"
+
+
+#
+# gpg options
+#
+
+complete -c gpg -s a -l armor -d "Create ASCII armored output"
+complete -c gpg -s o -l output -r -d "Write output to specified file"
+
+complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
+complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
+
+complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
+complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
+complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
+complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+complete -c gpg -s v -l verbose -d "Give more information during processing"
+complete -c gpg -s q -l quiet -d "Quiet mode"
+
+complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+complete -c gpg -s i -l interactive -d "Prompt before overwrite"
+
+complete -c gpg -l batch -d "Batch mode"
+complete -c gpg -l no-batch -d "Don't use batch mode"
+complete -c gpg -l no-tty -d "Never write output to terminal"
+
+complete -c gpg -l yes -d "Assume yes on most questions"
+complete -c gpg -l no -d "Assume no on most questions"
+
+complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+complete -c gpg -l keyserver -x -d "Use specified keyserver"
+complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
+
+complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
+complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
+complete -c gpg -l load-extension -x -d "Load an extension module"
+
+complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
+complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
+complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+complete -c gpg -l comment -x -d "Use specified string as comment string"
+complete -c gpg -l no-comments -d "Don't use a comment string"
+
+complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
+complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+complete -c gpg -l sig-notation -x
+complete -c gpg -l cert-notation -x
+
+complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+complete -c gpg -l sig-policy-url -x -d "Set signature policy"
+complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
+complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
+complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
+complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
+complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
+complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
+complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
+complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
+
+complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
+complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
+complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
+
+complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
+complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
+
+complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
+complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
+complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
+
+complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
+complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
+complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+complete -c gpg -l no-verbose -d "Reset verbose level to 0"
+complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
+complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+complete -c gpg -l skip-verify -d "Skip the signature verification step"
+
+complete -c gpg -l with-colons -d "Print key listings delimited by colons"
+complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
+complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+complete -c gpg -l show-session-key -d "Display the session key used for one message"
+complete -c gpg -l override-session-key -x -d "Don't use the public key but the specified session key"
+
+complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
+complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
+complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
+complete -c gpg -l no-groups -d "Remove all entries from the --group list"
+
+complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"

From 9160e77b016ff0756743da9b035c351c747c92a9 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 24 Sep 2019 22:31:44 +0000
Subject: [PATCH 1029/1732] break version-specific completions out into
 independent function; document changes

---
 share/completions/gpg.fish                |  65 +---
 share/completions/gpg2.fish               |   1 +
 share/completions/gpgbackup.fish          | 356 ----------------------
 share/functions/__fish_complete_gpg2.fish |  60 ++++
 4 files changed, 66 insertions(+), 416 deletions(-)
 delete mode 100644 share/completions/gpgbackup.fish
 create mode 100644 share/functions/__fish_complete_gpg2.fish

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 522c89ba8..1f649fccb 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -73,68 +73,13 @@ function __fish_print_gpg_algo -d "Complete using all algorithms of the type spe
     }'
 end
 
-if test (gpg --version | sed '1q;d' | cut -b 13) -eq 2
-    complete -c gpg -l no-keyring -d "Do not use any keyring at all"
-    complete -c gpg -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-    complete -c gpg -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
-    complete -c gpg -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
-    complete -c gpg -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-    complete -c gpg -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-    complete -c gpg -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
-    complete -c gpg -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
-    complete -c gpg -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-    complete -c gpg -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-    complete -c gpg -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
-    complete -c gpg -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-    complete -c gpg -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-    complete -c gpg -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
-    complete -c gpg -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-    complete -c gpg -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
-    complete -c gpg -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-    complete -c gpg -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
-    complete -c gpg -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
-    complete -c gpg -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
-    complete -c gpg -l show-keys -d "Take OpenPGP keys as input and print information about them"
-    complete -c gpg -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
-    complete -c gpg -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
-    complete -c gpg -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
-    complete -c gpg -l try-secret-key -xa "(__fish_complete_gpg_key_id)" -d "Specify keys to be used for trial decryption"
-
-    complete -c gpg -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
-    complete -c gpg -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
-    complete -c gpg -l with-keygrip -d "Include the keygrip in the key listings"
-    complete -c gpg -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
-    complete -c gpg -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
-    complete -c gpg -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
-    complete -c gpg -l log-file -r -d "Write log output to the specified file"
-    complete -c gpg -l locate-keys -d "Locate the keys given as arguments"
-    complete -c gpg -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
-    complete -c gpg -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-    complete -c gpg -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
-    complete -c gpg -l known-notation -r -d "Tell GnuPG about a critical signature notation"
-    complete -c gpg -l key-origin -d "Track the origin of a key"
-    complete -c gpg -l input-size-hint -r -d "Specify input size in bytes"
-    complete -c gpg -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
-    complete -c gpg -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-    complete -c gpg -l generate-key -d "Generate a new key pair"
-    complete -c gpg -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-    complete -c gpg -l full-gen-key -d "Generate a new key pair with dialogs for all options"
-    complete -c gpg -l full-generate-key -d "Generate a new key pair with dialogs for all options"
-    complete -c gpg -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-    complete -c gpg -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-    complete -c gpg -l edit-card -d "Present a menu to work with a smartcard"
-    complete -c gpg -l card-edit -d "Present a menu to work with a smartcard"
-    complete -c gpg -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
-    complete -c gpg -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
-    complete -c gpg -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
-    complete -c gpg -l default-new-key-algo -x -d "Change the default algorothms for key generation"
-    complete -c gpg -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
-    complete -c gpg -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-    complete -c gpg -l agent-program -d "Specify an agent program to be used for secret key operations"
-    complete -c gpg -l clear-sign -d "Make a clear text signature"
-else
+if string match -q 'gpg (GnuPG) 1.*' (gpg --version)
     complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
     complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
+    complete -c gpg -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
+    complete -c gpg -l rfc1991 "Try to be more RFC-1991 compliant"
+else
+    __fish_complete_gpg2 gpg
 end
 
 #
diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 9cd1bb331..6526e5ca9 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -162,6 +162,7 @@ complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments
 complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
 complete -c gpg2 -l quick-addkey -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
 complete -c gpg2 -l quick-adduid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
+complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
 complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
 complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
 complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
diff --git a/share/completions/gpgbackup.fish b/share/completions/gpgbackup.fish
deleted file mode 100644
index c3638bc25..000000000
--- a/share/completions/gpgbackup.fish
+++ /dev/null
@@ -1,356 +0,0 @@
-#
-# Completions for the gpg command.
-#
-# This program accepts an rather large number of switches. It allows
-# you to do things like changing what file descriptor errors should be
-# written to, to make gpg use a different locale than the one
-# specified in the environment or to specify an alternative home
-# directory.
-
-# Switches related to debugging, switches whose use is not
-# recommended, switches whose behaviour is as of yet undefined,
-# switches for experimental features, switches to make gpg compliant
-# to legacy pgp-versions, dos-specific switches, switches meant for
-# the options file and deprecated or obsolete switches have all been
-# removed. The remaining list of completions is still quite
-# impressive.
-
-#
-# Various functions used for dynamic completions
-#
-
-function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
-    # 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 colons with \x3a
-    gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
-end
-
-function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
-    # Use user id as description
-    set -l keyid
-    gpg --list-keys --with-colons | while read garbage
-        switch $garbage
-            # Extract user ids
-            case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
-                printf "%s\t%s\n" $keyid $uid
-            # Extract key fingerprints (no subkeys)
-            case "pub*"
-                echo $garbage | cut -d ":" -f 5 | read keyid
-        end
-    end
-end
-
-function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
-    # Set a known locale, so that the output format of 'gpg --version'
-    # is at least somewhat predictable. The locale will automatically
-    # expire when the function goes out of scope, and the original locale
-    # will take effect again.
-    set -lx LC_ALL C
-
-    # sed script explained:
-    # in the line that matches "$argv:"
-    # 	define label 'loop'
-    # 	if the line ends with a ','
-    # 		add next line to buffer
-    #		transliterate '\n' with ' '
-    #		goto loop
-    # 	remove everything until the first ':' of the line
-    # 	remove all blanks
-    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
-    # 	print result
-    gpg --version | sed -ne "/$argv:/"'{:loop
-    /,$/{N; y!\n! !
-    b loop
-    }
-    s!^[^:]*:!!
-    s![ ]*!!g
-    y!,!\n!
-    p
-    }'
-end
-
-
-#
-# gpg subcommands
-#
-
-complete -c gpg -s s -l sign -d "Make a signature"
-complete -c gpg -l clearsign -d "Make a clear text signature"
-complete -c gpg -s b -l detach-sign -d "Make a detached signature"
-complete -c gpg -s e -l encrypt -d "Encrypt data"
-complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg -l store -d "Store only (make a simple RFC1991 packet)"
-complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
-complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
-complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
-complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
-complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
-complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
-
-complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
-complete -c gpg -l gen-key -d "Generate a new key pair"
-
-complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
-
-complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
-complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
-complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
-complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-
-complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
-complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
-complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-complete -c gpg -l import -d 'Import/merge keys'
-complete -c gpg -l fast-import -d 'Import/merge keys'
-
-complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
-complete -c gpg -l update-trustdb -d "Do trust database maintenance"
-complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
-complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-complete -c gpg -l version -d "Display version and supported algorithms, and exit"
-complete -c gpg -l warranty -d "Display warranty and exit"
-complete -c gpg -s h -l help -d "Display help and exit"
-
-
-#
-# gpg options
-#
-
-complete -c gpg -s a -l armor -d "Create ASCII armored output"
-complete -c gpg -s o -l output -r -d "Write output to specified file"
-
-complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
-complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
-
-complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
-complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
-complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
-complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-complete -c gpg -s v -l verbose -d "Give more information during processing"
-complete -c gpg -s q -l quiet -d "Quiet mode"
-
-complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-complete -c gpg -s i -l interactive -d "Prompt before overwrite"
-
-complete -c gpg -l batch -d "Batch mode"
-complete -c gpg -l no-batch -d "Don't use batch mode"
-complete -c gpg -l no-tty -d "Never write output to terminal"
-
-complete -c gpg -l yes -d "Assume yes on most questions"
-complete -c gpg -l no -d "Assume no on most questions"
-
-complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-complete -c gpg -l keyserver -x -d "Use specified keyserver"
-complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
-
-complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
-complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
-complete -c gpg -l load-extension -x -d "Load an extension module"
-
-complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
-complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
-complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-complete -c gpg -l comment -x -d "Use specified string as comment string"
-complete -c gpg -l no-comments -d "Don't use a comment string"
-
-complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
-complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-complete -c gpg -l sig-notation -x
-complete -c gpg -l cert-notation -x
-
-complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-complete -c gpg -l sig-policy-url -x -d "Set signature policy"
-complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
-complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
-complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
-complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
-complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
-complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
-complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
-
-complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
-complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
-
-complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
-complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
-
-complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
-complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
-complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
-
-complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
-complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
-complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-complete -c gpg -l no-verbose -d "Reset verbose level to 0"
-complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
-complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-complete -c gpg -l skip-verify -d "Skip the signature verification step"
-
-complete -c gpg -l with-colons -d "Print key listings delimited by colons"
-complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
-complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-complete -c gpg -l show-session-key -d "Display the session key used for one message"
-complete -c gpg -l override-session-key -x -d "Don't use the public key but the specified session key"
-
-complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
-complete -c gpg -l no-groups -d "Remove all entries from the --group list"
-
-complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
diff --git a/share/functions/__fish_complete_gpg2.fish b/share/functions/__fish_complete_gpg2.fish
new file mode 100644
index 000000000..0ce04fa2b
--- /dev/null
+++ b/share/functions/__fish_complete_gpg2.fish
@@ -0,0 +1,60 @@
+function __fish_complete_gpg2 -d "Internal function for gpg completion code deduplication" -a __fish_complete_gpg2_command
+    complete -c $__fish_complete_gpg2_command -l no-keyring -d "Do not use any keyring at all"
+    complete -c $__fish_complete_gpg2_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+    complete -c $__fish_complete_gpg2_command -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+    complete -c $__fish_complete_gpg2_command -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+    complete -c $__fish_complete_gpg2_command -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+    complete -c $__fish_complete_gpg2_command -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+    complete -c $__fish_complete_gpg2_command -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
+    complete -c $__fish_complete_gpg2_command -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
+    complete -c $__fish_complete_gpg2_command -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+    complete -c $__fish_complete_gpg2_command -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+    complete -c $__fish_complete_gpg2_command -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+    complete -c $__fish_complete_gpg2_command -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+    complete -c $__fish_complete_gpg2_command -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+    complete -c $__fish_complete_gpg2_command -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
+    complete -c $__fish_complete_gpg2_command -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
+    complete -c $__fish_complete_gpg2_command -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
+    complete -c $__fish_complete_gpg2_command -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+    complete -c $__fish_complete_gpg2_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+    complete -c $__fish_complete_gpg2_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+    complete -c $__fish_complete_gpg2_command -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+    complete -c $__fish_complete_gpg2_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
+    complete -c $__fish_complete_gpg2_command -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
+    complete -c $__fish_complete_gpg2_command -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
+    complete -c $__fish_complete_gpg2_command -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
+    complete -c $__fish_complete_gpg2_command -l try-secret-key -xa "(__fish_complete_gpg_key_id)" -d "Specify keys to be used for trial decryption"
+
+    complete -c $__fish_complete_gpg2_command -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
+    complete -c $__fish_complete_gpg2_command -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
+    complete -c $__fish_complete_gpg2_command -l with-keygrip -d "Include the keygrip in the key listings"
+    complete -c $__fish_complete_gpg2_command -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+    complete -c $__fish_complete_gpg2_command -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+    complete -c $__fish_complete_gpg2_command -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+    complete -c $__fish_complete_gpg2_command -l log-file -r -d "Write log output to the specified file"
+    complete -c $__fish_complete_gpg2_command -l locate-keys -d "Locate the keys given as arguments"
+    complete -c $__fish_complete_gpg2_command -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+    complete -c $__fish_complete_gpg2_command -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+    complete -c $__fish_complete_gpg2_command -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+    complete -c $__fish_complete_gpg2_command -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+    complete -c $__fish_complete_gpg2_command -l key-origin -d "Track the origin of a key"
+    complete -c $__fish_complete_gpg2_command -l input-size-hint -r -d "Specify input size in bytes"
+    complete -c $__fish_complete_gpg2_command -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
+    complete -c $__fish_complete_gpg2_command -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+    complete -c $__fish_complete_gpg2_command -l generate-key -d "Generate a new key pair"
+    complete -c $__fish_complete_gpg2_command -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+    complete -c $__fish_complete_gpg2_command -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+    complete -c $__fish_complete_gpg2_command -l full-generate-key -d "Generate a new key pair with dialogs for all options"
+    complete -c $__fish_complete_gpg2_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+    complete -c $__fish_complete_gpg2_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+    complete -c $__fish_complete_gpg2_command -l edit-card -d "Present a menu to work with a smartcard"
+    complete -c $__fish_complete_gpg2_command -l card-edit -d "Present a menu to work with a smartcard"
+    complete -c $__fish_complete_gpg2_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+    complete -c $__fish_complete_gpg2_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+    complete -c $__fish_complete_gpg2_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+    complete -c $__fish_complete_gpg2_command -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+    complete -c $__fish_complete_gpg2_command -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+    complete -c $__fish_complete_gpg2_command -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+    complete -c $__fish_complete_gpg2_command -l agent-program -d "Specify an agent program to be used for secret key operations"
+    complete -c $__fish_complete_gpg2_command -l clear-sign -d "Make a clear text signature"
+end

From d558218d035a83d3f6027fae3da8de6346cd0bde Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Fri, 4 Oct 2019 00:40:23 +0000
Subject: [PATCH 1030/1732] gut gpg.fish/gpg1.fish/gpg2.fish; migrate
 functionality to __fish_complete_gpg.fish

---
 share/completions/gpg.fish                | 291 +----------------
 share/completions/gpg1.fish               |   1 +
 share/completions/gpg2.fish               | 365 +---------------------
 share/functions/__fish_complete_gpg.fish  | 349 +++++++++++++++++++++
 share/functions/__fish_complete_gpg2.fish |  60 ----
 5 files changed, 352 insertions(+), 714 deletions(-)
 create mode 100644 share/completions/gpg1.fish
 create mode 100644 share/functions/__fish_complete_gpg.fish
 delete mode 100644 share/functions/__fish_complete_gpg2.fish

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 1f649fccb..6f21aad47 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -73,293 +73,4 @@ function __fish_print_gpg_algo -d "Complete using all algorithms of the type spe
     }'
 end
 
-if string match -q 'gpg (GnuPG) 1.*' (gpg --version)
-    complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
-    complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
-    complete -c gpg -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
-    complete -c gpg -l rfc1991 "Try to be more RFC-1991 compliant"
-else
-    __fish_complete_gpg2 gpg
-end
-
-#
-# gpg subcommands
-#
-
-complete -c gpg -s s -l sign -d "Make a signature"
-complete -c gpg -l clearsign -d "Make a clear text signature"
-complete -c gpg -s b -l detach-sign -d "Make a detached signature"
-complete -c gpg -s e -l encrypt -d "Encrypt data"
-complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg -l store -d "Store only (make a simple literal data packet)"
-complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
-complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
-complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
-complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
-complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
-complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
-
-complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg -l check-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
-
-complete -c gpg -l gen-key -d "Generate a new key pair"
-
-complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
-
-complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
-complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
-complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
-complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-
-complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
-complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
-complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-complete -c gpg -l import -d 'Import/merge keys'
-complete -c gpg -l fast-import -d 'Import/merge keys'
-
-complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
-
-complete -c gpg -l update-trustdb -d "Do trust database maintenance"
-complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
-complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-complete -c gpg -l version -d "Display version and supported algorithms, and exit"
-complete -c gpg -l warranty -d "Display warranty and exit"
-complete -c gpg -s h -l help -d "Display help and exit"
-
-
-#
-# gpg options
-#
-
-complete -c gpg -s a -l armor -d "Create ASCII armored output"
-complete -c gpg -s o -l output -r -d "Write output to specified file"
-
-complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
-complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
-
-complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
-complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
-complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
-complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-complete -c gpg -s v -l verbose -d "Give more information during processing"
-complete -c gpg -s q -l quiet -d "Quiet mode"
-
-complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-complete -c gpg -s i -l interactive -d "Prompt before overwrite"
-
-complete -c gpg -l batch -d "Batch mode"
-complete -c gpg -l no-batch -d "Don't use batch mode"
-complete -c gpg -l no-tty -d "Never write output to terminal"
-
-complete -c gpg -l yes -d "Assume yes on most questions"
-complete -c gpg -l no -d "Assume no on most questions"
-
-complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-complete -c gpg -l keyserver -x -d "Use specified keyserver"
-complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
-
-complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
-complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
-complete -c gpg -l load-extension -x -d "Load an extension module"
-
-complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
-complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
-complete -c gpg -l logger-file -r -d "Write log output to the specified file"
-complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-complete -c gpg -l comment -x -d "Use specified string as comment string"
-complete -c gpg -l no-comments -d "Don't use a comment string"
-
-complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
-complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-complete -c gpg -l sig-notation -x
-complete -c gpg -l cert-notation -x
-
-complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-complete -c gpg -l sig-policy-url -x -d "Set signature policy"
-complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
-complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
-complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
-complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
-complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
-complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
-complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
-
-complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
-complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
-
-complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
-complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
-complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
-
-complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
-complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
-complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-complete -c gpg -l no-verbose -d "Reset verbose level to 0"
-complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
-complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-complete -c gpg -l skip-verify -d "Skip the signature verification step"
-
-complete -c gpg -l with-colons -d "Print key listings delimited by colons"
-complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
-complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-complete -c gpg -l show-session-key -d "Display the session key used for one message"
-complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
-complete -c gpg -l no-groups -d "Remove all entries from the --group list"
-
-complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-
-complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+__fish_complete_gpg gpg
diff --git a/share/completions/gpg1.fish b/share/completions/gpg1.fish
new file mode 100644
index 000000000..a360b528d
--- /dev/null
+++ b/share/completions/gpg1.fish
@@ -0,0 +1 @@
+__fish_complete_gpg gpg1
diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 6526e5ca9..7bd278ca5 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -74,367 +74,4 @@ function __fish_print_gpg2_algo -d "Complete using all algorithms of the type sp
     }'
 end
 
-
-#
-# gpg2 subcommands
-#
-
-complete -c gpg2 -s s -l sign -d "Make a signature"
-complete -c gpg2 -l clearsign -d "Make a clear text signature"
-complete -c gpg2 -l clear-sign -d "Make a clear text signature"
-complete -c gpg2 -s b -l detach-sign -d "Make a detached signature"
-complete -c gpg2 -s e -l encrypt -d "Encrypt data"
-complete -c gpg2 -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg2 -l store -d "Store only (make a simple literal data packet)"
-complete -c gpg2 -l decrypt -d "Decrypt specified file or stdin"
-complete -c gpg2 -l verify -d "Assume specified file or stdin is sigfile and verify it"
-complete -c gpg2 -l multifile -d "Modify certain other commands to accept multiple files for processing"
-complete -c gpg2 -l verify-files -d "Identical to '--multifile --verify'"
-complete -c gpg2 -l encrypt-files -d "Identical to '--multifile --encrypt'"
-complete -c gpg2 -l decrypt-files -d "Identical to --multifile --decrypt"
-
-complete -c gpg2 -s k -l list-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg2 -l list-public-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg2 -s K -l list-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-complete -c gpg2 -l list-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-complete -c gpg2 -l list-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-complete -c gpg2 -l check-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg2 -l check-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg2 -l fingerprint -xa "(__fish_complete_gpg2_user_id)" -d "List all keys with their fingerprints"
-
-complete -c gpg2 -l gen-key -d "Generate a new key pair"
-complete -c gpg2 -l generate-key -d "Generate a new key pair"
-
-complete -c gpg2 -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg2_user_id)"
-
-complete -c gpg2 -l sign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key"
-complete -c gpg2 -l lsign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-complete -c gpg2 -l delete-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the public keyring"
-complete -c gpg2 -l delete-secret-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the secret and public keyring"
-complete -c gpg2 -l delete-secret-and-public-key -xa "(__fish_complete_gpg2_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-complete -c gpg2 -l gen-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg2 -l generate-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg2 -l desig-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
-complete -c gpg2 -l generate-designated-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
-
-complete -c gpg2 -l export -xa "(__fish_complete_gpg2_user_id)" -d 'Export all or the given keys from all keyrings'
-complete -c gpg2 -l send-keys -xa "(__fish_complete_gpg2_key_id)" -d "Same as --export but sends the keys to a keyserver"
-complete -c gpg2 -l export-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
-complete -c gpg2 -l export-secret-subkeys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-complete -c gpg2 -l import -d 'Import/merge keys'
-complete -c gpg2 -l fast-import -d 'Import/merge keys'
-
-complete -c gpg2 -l recv-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg2 -l receive-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg2 -l refresh-keys -xa "(__fish_complete_gpg2_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-complete -c gpg2 -l search-keys -xa "(__fish_complete_gpg2_user_id)" -d "Search the keyserver for the given names"
-
-complete -c gpg2 -l update-trustdb -d "Do trust database maintenance"
-complete -c gpg2 -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-complete -c gpg2 -l export-ownertrust -d "Send the ownertrust values to stdout"
-complete -c gpg2 -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-complete -c gpg2 -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-complete -c gpg2 -l print-md -xa "(__fish_print_gpg2_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-complete -c gpg2 -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-complete -c gpg2 -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-complete -c gpg2 -l version -d "Display version and supported algorithms, and exit"
-complete -c gpg2 -l warranty -d "Display warranty and exit"
-complete -c gpg2 -s h -l help -d "Display help and exit"
-
-complete -c gpg2 -l passwd -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-complete -c gpg2 -l change-passphrase -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-
-complete -c gpg2 -l edit-card -d "Present a menu to work with a smartcard"
-complete -c gpg2 -l card-edit -d "Present a menu to work with a smartcard"
-
-complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
-complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
-
-complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
-complete -c gpg2 -l quick-addkey -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
-complete -c gpg2 -l quick-adduid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
-complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
-complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
-complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
-complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
-complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
-complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
-complete -c gpg2 -l quick-revuid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
-complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
-complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-
-complete -c gpg2 -l show-keys -d "Take OpenPGP keys as input and print information about them"
-
-complete -c gpg2 -l full-gen-key -d "Generate a new key pair with dialogs for all options"
-complete -c gpg2 -l full-generate-key -d "Generate a new key pair with dialogs for all options"
-
-
-#
-# gpg2 options
-#
-
-complete -c gpg2 -l agent-program -d "Specify an agent program to be used for secret key operations"
-complete -c gpg2 -s a -l armor -d "Create ASCII armored output"
-complete -c gpg2 -s o -l output -r -d "Write output to specified file"
-
-complete -c gpg2 -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-complete -c gpg2 -s u -l local-user -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the key to sign with"
-complete -c gpg2 -l default-key -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the default key to sign with"
-
-complete -c gpg2 -s r -l recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id"
-complete -c gpg2 -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
-complete -c gpg2 -s R -l hidden-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-complete -c gpg2 -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
-complete -c gpg2 -l default-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Use specified user id as default recipient"
-complete -c gpg2 -l default-recipient-self -d "Use the default key as default recipient"
-complete -c gpg2 -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-complete -c gpg2 -s v -l verbose -d "Give more information during processing"
-complete -c gpg2 -s q -l quiet -d "Quiet mode"
-
-complete -c gpg2 -s z -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-complete -c gpg2 -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg2 -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-complete -c gpg2 -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-complete -c gpg2 -s i -l interactive -d "Prompt before overwrite"
-
-complete -c gpg2 -l batch -d "Batch mode"
-complete -c gpg2 -l no-batch -d "Don't use batch mode"
-complete -c gpg2 -l no-tty -d "Never write output to terminal"
-
-complete -c gpg2 -l yes -d "Assume yes on most questions"
-complete -c gpg2 -l no -d "Assume no on most questions"
-
-complete -c gpg2 -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-complete -c gpg2 -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-complete -c gpg2 -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-complete -c gpg2 -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-complete -c gpg2 -l trusted-key -xa "(__fish_complete_gpg2_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-complete -c gpg2 -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-complete -c gpg2 -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-complete -c gpg2 -l keyserver -x -d "Use specified keyserver"
-complete -c gpg2 -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-complete -c gpg2 -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-complete -c gpg2 -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-complete -c gpg2 -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-complete -c gpg2 -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-complete -c gpg2 -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-complete -c gpg2 -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-complete -c gpg2 -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-complete -c gpg2 -l keyring -r -d "Add specified file to the current list of keyrings"
-
-complete -c gpg2 -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-complete -c gpg2 -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-complete -c gpg2 -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-complete -c gpg2 -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-complete -c gpg2 -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-complete -c gpg2 -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-complete -c gpg2 -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-complete -c gpg2 -l options -r -d "Read options from specified file, do not read the default options file"
-complete -c gpg2 -l no-options -d "Shortcut for '--options /dev/null'"
-complete -c gpg2 -l load-extension -x -d "Load an extension module"
-
-complete -c gpg2 -l status-fd -x -d "Write special status strings to the specified file descriptor"
-complete -c gpg2 -l logger-fd -x -d "Write log output to the specified file descriptor"
-complete -c gpg2 -l logger-file -r -d "Write log output to the specified file"
-complete -c gpg2 -l log-file -r -d "Write log output to the specified file"
-complete -c gpg2 -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-complete -c gpg2 -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-complete -c gpg2 -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-complete -c gpg2 -l comment -x -d "Use specified string as comment string"
-complete -c gpg2 -l no-comments -d "Don't use a comment string"
-
-complete -c gpg2 -l emit-version -d "Include the version string in ASCII armored output"
-complete -c gpg2 -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-complete -c gpg2 -l sig-notation -x
-complete -c gpg2 -l cert-notation -x
-
-complete -c gpg2 -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-complete -c gpg2 -l sig-policy-url -x -d "Set signature policy"
-complete -c gpg2 -l cert-policy-url -x -d "Set certificate policy"
-complete -c gpg2 -l set-policy-url -x -d "Set signature and certificate policy"
-complete -c gpg2 -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-complete -c gpg2 -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-complete -c gpg2 -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-complete -c gpg2 -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-complete -c gpg2 -l use-embedded-filename -d "Create file with name as given in data"
-complete -c gpg2 -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-complete -c gpg2 -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-complete -c gpg2 -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-complete -c gpg2 -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-complete -c gpg2 -l cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm"
-complete -c gpg2 -l digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm"
-complete -c gpg2 -l compress-algo -xa "(__fish_print_gpg2_algo Compression)" -d "Use specified compression algorithm"
-complete -c gpg2 -l cert-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-complete -c gpg2 -l s2k-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-complete -c gpg2 -l s2k-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-complete -c gpg2 -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-complete -c gpg2 -l disable-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-complete -c gpg2 -l disable-pubkey-algo -xa "(__fish_print_gpg2_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-complete -c gpg2 -l no-sig-cache -d "Do not cache the verification status of key signatures"
-
-complete -c gpg2 -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-complete -c gpg2 -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-complete -c gpg2 -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-complete -c gpg2 -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-complete -c gpg2 -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-complete -c gpg2 -l escape-from-lines -d "Mangle From-field of email headers (default)"
-complete -c gpg2 -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-complete -c gpg2 -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-complete -c gpg2 -l command-fd -x -d "Read user input from specified file descriptor"
-
-complete -c gpg2 -l use-agent -d "Try to use the GnuPG-Agent"
-complete -c gpg2 -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-complete -c gpg2 -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-complete -c gpg2 -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-complete -c gpg2 -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-complete -c gpg2 -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-complete -c gpg2 -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-complete -c gpg2 -l force-mdc -d "Force the use of encryption with a modification detection code"
-complete -c gpg2 -l disable-mdc -d "Disable the use of the modification detection code"
-
-complete -c gpg2 -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg2 -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-complete -c gpg2 -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-complete -c gpg2 -l ignore-time-conflict -d "Do not fail if signature is older than key"
-complete -c gpg2 -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-complete -c gpg2 -l ignore-crc-error -d "Ignore CRC errors"
-complete -c gpg2 -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-complete -c gpg2 -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-complete -c gpg2 -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-complete -c gpg2 -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-complete -c gpg2 -l no-verbose -d "Reset verbose level to 0"
-complete -c gpg2 -l no-greeting -d "Suppress the initial copyright message"
-complete -c gpg2 -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-complete -c gpg2 -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-complete -c gpg2 -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-complete -c gpg2 -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-complete -c gpg2 -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-complete -c gpg2 -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-complete -c gpg2 -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-complete -c gpg2 -l skip-verify -d "Skip the signature verification step"
-
-complete -c gpg2 -l with-colons -d "Print key listings delimited by colons"
-complete -c gpg2 -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-complete -c gpg2 -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-complete -c gpg2 -l fast-list-mode -d "Changes the output of the list commands to work faster"
-complete -c gpg2 -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-complete -c gpg2 -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-complete -c gpg2 -l show-session-key -d "Display the session key used for one message"
-complete -c gpg2 -l override-session-key -x -d "Don't use the public key but the specified session key"
-complete -c gpg2 -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
-
-complete -c gpg2 -l ask-sig-expire -d "Prompt for an expiration time"
-complete -c gpg2 -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg2 -l ask-cert-expire -d "Prompt for an expiration time"
-complete -c gpg2 -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg2 -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-complete -c gpg2 -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-complete -c gpg2 -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-complete -c gpg2 -l ungroup -d "Remove a given entry from the --group list"
-complete -c gpg2 -l no-groups -d "Remove all entries from the --group list"
-
-complete -c gpg2 -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-complete -c gpg2 -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-complete -c gpg2 -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-complete -c gpg2 -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-
-complete -c gpg2 -l default-preference-list -x -d "Set the list of default preferences to the specified string"
-complete -c gpg2 -l default-new-key-algo -x -d "Change the default algorothms for key generation"
-
-complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
-
-complete -c gpg2 -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
-complete -c gpg2 -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
-complete -c gpg2 -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
-
-complete -c gpg2 -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-complete -c gpg2 -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-
-complete -c gpg2 -l input-size-hint -r -d "Specify input size in bytes"
-
-complete -c gpg2 -l known-notation -r -d "Tell GnuPG about a critical signature notation"
-
-complete -c gpg2 -l key-origin -d "Track the origin of a key"
-complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
-
-complete -c gpg2 -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
-complete -c gpg2 -l no-keyring -d "Do not use any keyring at all"
-complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
-
-complete -c gpg2 -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
-complete -c gpg2 -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-
-complete -c gpg2 -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
-
-complete -c gpg2 -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-
-complete -c gpg2 -l sender -xa "(__fish_complete_gpg2_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
-
-complete -c gpg2 -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
-
-complete -c gpg2 -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
-complete -c gpg2 -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
-
-complete -c gpg2 -l try-secret-key -xa "(__fish_complete_gpg2_key_id)" -d "Specify keys to be used for trial decryption"
-
-complete -c gpg2 -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
-complete -c gpg2 -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
-complete -c gpg2 -l with-keygrip -d "Include the keygrip in the key listings"
-complete -c gpg2 -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+__fish_complete_gpg gpg2
diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
new file mode 100644
index 000000000..032343b6f
--- /dev/null
+++ b/share/functions/__fish_complete_gpg.fish
@@ -0,0 +1,349 @@
+function __fish_complete_gpg -d "Internal function for gpg completion code deduplication" -a __fish_complete_gpg_command
+    if string match -q 'gpg (GnuPG) 1.*' (gpg --version)
+        complete -c $__fish_complete_gpg_command -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
+        complete -c $__fish_complete_gpg_command -l no-sig-create-check -d "Do not verify each signature right after creation"
+        complete -c $__fish_complete_gpg_command -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
+        complete -c $__fish_complete_gpg_command -l rfc1991 "Try to be more RFC-1991 compliant"
+    else
+        complete -c $__fish_complete_gpg_command -l no-keyring -d "Do not use any keyring at all"
+        complete -c $__fish_complete_gpg_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+        complete -c $__fish_complete_gpg_command -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+        complete -c $__fish_complete_gpg_command -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+        complete -c $__fish_complete_gpg_command -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+        complete -c $__fish_complete_gpg_command -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+        complete -c $__fish_complete_gpg_command -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
+        complete -c $__fish_complete_gpg_command -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+        complete -c $__fish_complete_gpg_command -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
+        complete -c $__fish_complete_gpg_command -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+        complete -c $__fish_complete_gpg_command -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
+        complete -c $__fish_complete_gpg_command -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
+        complete -c $__fish_complete_gpg_command -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
+        complete -c $__fish_complete_gpg_command -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+        complete -c $__fish_complete_gpg_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+        complete -c $__fish_complete_gpg_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+        complete -c $__fish_complete_gpg_command -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+        complete -c $__fish_complete_gpg_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
+        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)" -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"
+        complete -c $__fish_complete_gpg_command -l with-keygrip -d "Include the keygrip in the key listings"
+        complete -c $__fish_complete_gpg_command -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+        complete -c $__fish_complete_gpg_command -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+        complete -c $__fish_complete_gpg_command -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+        complete -c $__fish_complete_gpg_command -l log-file -r -d "Write log output to the specified file"
+        complete -c $__fish_complete_gpg_command -l locate-keys -d "Locate the keys given as arguments"
+        complete -c $__fish_complete_gpg_command -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+        complete -c $__fish_complete_gpg_command -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+        complete -c $__fish_complete_gpg_command -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+        complete -c $__fish_complete_gpg_command -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+        complete -c $__fish_complete_gpg_command -l key-origin -d "Track the origin of a key"
+        complete -c $__fish_complete_gpg_command -l input-size-hint -r -d "Specify input size in bytes"
+        complete -c $__fish_complete_gpg_command -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
+        complete -c $__fish_complete_gpg_command -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+        complete -c $__fish_complete_gpg_command -l generate-key -d "Generate a new key pair"
+        complete -c $__fish_complete_gpg_command -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+        complete -c $__fish_complete_gpg_command -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+        complete -c $__fish_complete_gpg_command -l full-generate-key -d "Generate a new key pair with dialogs for all options"
+        complete -c $__fish_complete_gpg_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+        complete -c $__fish_complete_gpg_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+        complete -c $__fish_complete_gpg_command -l edit-card -d "Present a menu to work with a smartcard"
+        complete -c $__fish_complete_gpg_command -l card-edit -d "Present a menu to work with a smartcard"
+        complete -c $__fish_complete_gpg_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+        complete -c $__fish_complete_gpg_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+        complete -c $__fish_complete_gpg_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+        complete -c $__fish_complete_gpg_command -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+        complete -c $__fish_complete_gpg_command -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+        complete -c $__fish_complete_gpg_command -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+        complete -c $__fish_complete_gpg_command -l agent-program -d "Specify an agent program to be used for secret key operations"
+        complete -c $__fish_complete_gpg_command -l clear-sign -d "Make a clear text signature"
+    end
+
+    #
+    # gpg subcommands
+    #
+
+    complete -c gpg -s s -l sign -d "Make a signature"
+    complete -c gpg -l clearsign -d "Make a clear text signature"
+    complete -c gpg -s b -l detach-sign -d "Make a detached signature"
+    complete -c gpg -s e -l encrypt -d "Encrypt data"
+    complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+    complete -c gpg -l store -d "Store only (make a simple literal data packet)"
+    complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
+    complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
+    complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
+    complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
+    complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
+    complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
+
+    complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+    complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+    complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+    complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+
+    complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+    complete -c gpg -l check-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+    complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
+
+    complete -c gpg -l gen-key -d "Generate a new key pair"
+
+    complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
+
+    complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
+    complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
+
+    complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
+    complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
+    complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+    complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+    complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+
+    complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
+    complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
+    complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+    complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+
+    complete -c gpg -l import -d 'Import/merge keys'
+    complete -c gpg -l fast-import -d 'Import/merge keys'
+
+    complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+    complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+    complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
+
+    complete -c gpg -l update-trustdb -d "Do trust database maintenance"
+    complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+    complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
+    complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+    complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+    complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+    complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+    complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+    complete -c gpg -l version -d "Display version and supported algorithms, and exit"
+    complete -c gpg -l warranty -d "Display warranty and exit"
+    complete -c gpg -s h -l help -d "Display help and exit"
+
+
+    #
+    # gpg options
+    #
+
+    complete -c gpg -s a -l armor -d "Create ASCII armored output"
+    complete -c gpg -s o -l output -r -d "Write output to specified file"
+
+    complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+    complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
+    complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
+
+    complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
+    complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+    complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
+    complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
+    complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+    complete -c gpg -s v -l verbose -d "Give more information during processing"
+    complete -c gpg -s q -l quiet -d "Quiet mode"
+
+    complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
+    complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
+    complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+    complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+    complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+    complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+    complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+    complete -c gpg -s i -l interactive -d "Prompt before overwrite"
+
+    complete -c gpg -l batch -d "Batch mode"
+    complete -c gpg -l no-batch -d "Don't use batch mode"
+    complete -c gpg -l no-tty -d "Never write output to terminal"
+
+    complete -c gpg -l yes -d "Assume yes on most questions"
+    complete -c gpg -l no -d "Assume no on most questions"
+
+    complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+    complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+    complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+    complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+    complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+    complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+    complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+    complete -c gpg -l keyserver -x -d "Use specified keyserver"
+    complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+    complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+    complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+    complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+    complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+    complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+    complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+    complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+    complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
+
+    complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+    complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+    complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+    complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+    complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+    complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+    complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+    complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
+    complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
+    complete -c gpg -l load-extension -x -d "Load an extension module"
+
+    complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
+    complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
+    complete -c gpg -l logger-file -r -d "Write log output to the specified file"
+    complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+    complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+    complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+    complete -c gpg -l comment -x -d "Use specified string as comment string"
+    complete -c gpg -l no-comments -d "Don't use a comment string"
+
+    complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
+    complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+    complete -c gpg -l sig-notation -x
+    complete -c gpg -l cert-notation -x
+
+    complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+    complete -c gpg -l sig-policy-url -x -d "Set signature policy"
+    complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
+    complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
+    complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+    complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+    complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+    complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+    complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
+    complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+    complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+    complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+    complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+    complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
+    complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
+    complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
+    complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
+    complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+    complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+    complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+    complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
+    complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+    complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
+
+    complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+    complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+    complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+    complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+    complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+    complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
+    complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+    complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+    complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
+
+    complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
+    complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+    complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+    complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+    complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+    complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+    complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+    complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
+    complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
+
+    complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+    complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+    complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+    complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
+    complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+    complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
+    complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+    complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+    complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+    complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+    complete -c gpg -l no-verbose -d "Reset verbose level to 0"
+    complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
+    complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+    complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+    complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+    complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+    complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+    complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+    complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+    complete -c gpg -l skip-verify -d "Skip the signature verification step"
+
+    complete -c gpg -l with-colons -d "Print key listings delimited by colons"
+    complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+    complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+    complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
+    complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+    complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+    complete -c gpg -l show-session-key -d "Display the session key used for one message"
+    complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
+    complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+    complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
+    complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+    complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+    complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+    complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+    complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
+    complete -c gpg -l no-groups -d "Remove all entries from the --group list"
+
+    complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+    complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+    complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+    complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+
+    complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+end
diff --git a/share/functions/__fish_complete_gpg2.fish b/share/functions/__fish_complete_gpg2.fish
deleted file mode 100644
index 0ce04fa2b..000000000
--- a/share/functions/__fish_complete_gpg2.fish
+++ /dev/null
@@ -1,60 +0,0 @@
-function __fish_complete_gpg2 -d "Internal function for gpg completion code deduplication" -a __fish_complete_gpg2_command
-    complete -c $__fish_complete_gpg2_command -l no-keyring -d "Do not use any keyring at all"
-    complete -c $__fish_complete_gpg2_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-    complete -c $__fish_complete_gpg2_command -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
-    complete -c $__fish_complete_gpg2_command -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
-    complete -c $__fish_complete_gpg2_command -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-    complete -c $__fish_complete_gpg2_command -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-    complete -c $__fish_complete_gpg2_command -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
-    complete -c $__fish_complete_gpg2_command -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
-    complete -c $__fish_complete_gpg2_command -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-    complete -c $__fish_complete_gpg2_command -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-    complete -c $__fish_complete_gpg2_command -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
-    complete -c $__fish_complete_gpg2_command -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-    complete -c $__fish_complete_gpg2_command -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-    complete -c $__fish_complete_gpg2_command -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
-    complete -c $__fish_complete_gpg2_command -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-    complete -c $__fish_complete_gpg2_command -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
-    complete -c $__fish_complete_gpg2_command -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-    complete -c $__fish_complete_gpg2_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
-    complete -c $__fish_complete_gpg2_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
-    complete -c $__fish_complete_gpg2_command -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
-    complete -c $__fish_complete_gpg2_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
-    complete -c $__fish_complete_gpg2_command -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
-    complete -c $__fish_complete_gpg2_command -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
-    complete -c $__fish_complete_gpg2_command -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
-    complete -c $__fish_complete_gpg2_command -l try-secret-key -xa "(__fish_complete_gpg_key_id)" -d "Specify keys to be used for trial decryption"
-
-    complete -c $__fish_complete_gpg2_command -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
-    complete -c $__fish_complete_gpg2_command -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
-    complete -c $__fish_complete_gpg2_command -l with-keygrip -d "Include the keygrip in the key listings"
-    complete -c $__fish_complete_gpg2_command -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
-    complete -c $__fish_complete_gpg2_command -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
-    complete -c $__fish_complete_gpg2_command -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
-    complete -c $__fish_complete_gpg2_command -l log-file -r -d "Write log output to the specified file"
-    complete -c $__fish_complete_gpg2_command -l locate-keys -d "Locate the keys given as arguments"
-    complete -c $__fish_complete_gpg2_command -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
-    complete -c $__fish_complete_gpg2_command -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-    complete -c $__fish_complete_gpg2_command -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
-    complete -c $__fish_complete_gpg2_command -l known-notation -r -d "Tell GnuPG about a critical signature notation"
-    complete -c $__fish_complete_gpg2_command -l key-origin -d "Track the origin of a key"
-    complete -c $__fish_complete_gpg2_command -l input-size-hint -r -d "Specify input size in bytes"
-    complete -c $__fish_complete_gpg2_command -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
-    complete -c $__fish_complete_gpg2_command -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-    complete -c $__fish_complete_gpg2_command -l generate-key -d "Generate a new key pair"
-    complete -c $__fish_complete_gpg2_command -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-    complete -c $__fish_complete_gpg2_command -l full-gen-key -d "Generate a new key pair with dialogs for all options"
-    complete -c $__fish_complete_gpg2_command -l full-generate-key -d "Generate a new key pair with dialogs for all options"
-    complete -c $__fish_complete_gpg2_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-    complete -c $__fish_complete_gpg2_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-    complete -c $__fish_complete_gpg2_command -l edit-card -d "Present a menu to work with a smartcard"
-    complete -c $__fish_complete_gpg2_command -l card-edit -d "Present a menu to work with a smartcard"
-    complete -c $__fish_complete_gpg2_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
-    complete -c $__fish_complete_gpg2_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
-    complete -c $__fish_complete_gpg2_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
-    complete -c $__fish_complete_gpg2_command -l default-new-key-algo -x -d "Change the default algorothms for key generation"
-    complete -c $__fish_complete_gpg2_command -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
-    complete -c $__fish_complete_gpg2_command -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-    complete -c $__fish_complete_gpg2_command -l agent-program -d "Specify an agent program to be used for secret key operations"
-    complete -c $__fish_complete_gpg2_command -l clear-sign -d "Make a clear text signature"
-end

From e2952f230b5d1fc99113e36b14930ddf61a8bfdf Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 6 Oct 2019 12:34:47 -0700
Subject: [PATCH 1031/1732] Revert #6139

Revert "gut gpg.fish/gpg1.fish/gpg2.fish; migrate functionality to __fish_complete_gpg.fish"

This reverts commit d558218d035a83d3f6027fae3da8de6346cd0bde.

Revert "break version-specific completions out into independent function;"

This reverts commit 9160e77b016ff0756743da9b035c351c747c92a9.

Revert "split gpg2- and gpg1-specific completions to conditional block"

This reverts commit a069b95f6332e9b22481653340652a67de39127a.
---
 share/completions/gpg.fish               | 284 +++++++++++++++++-
 share/completions/gpg1.fish              |   1 -
 share/completions/gpg2.fish              | 362 ++++++++++++++++++++++-
 share/functions/__fish_complete_gpg.fish | 349 ----------------------
 4 files changed, 643 insertions(+), 353 deletions(-)
 delete mode 100644 share/completions/gpg1.fish
 delete mode 100644 share/functions/__fish_complete_gpg.fish

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index 6f21aad47..c3638bc25 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -19,7 +19,6 @@
 # Various functions used for dynamic completions
 #
 
-
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
     # 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
@@ -73,4 +72,285 @@ function __fish_print_gpg_algo -d "Complete using all algorithms of the type spe
     }'
 end
 
-__fish_complete_gpg gpg
+
+#
+# gpg subcommands
+#
+
+complete -c gpg -s s -l sign -d "Make a signature"
+complete -c gpg -l clearsign -d "Make a clear text signature"
+complete -c gpg -s b -l detach-sign -d "Make a detached signature"
+complete -c gpg -s e -l encrypt -d "Encrypt data"
+complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+complete -c gpg -l store -d "Store only (make a simple RFC1991 packet)"
+complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
+complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
+complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
+complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
+complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
+complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
+
+complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+
+complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
+complete -c gpg -l gen-key -d "Generate a new key pair"
+
+complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
+
+complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
+complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
+
+complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
+complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
+complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
+
+complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
+complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
+complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
+
+complete -c gpg -l import -d 'Import/merge keys'
+complete -c gpg -l fast-import -d 'Import/merge keys'
+
+complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
+complete -c gpg -l update-trustdb -d "Do trust database maintenance"
+complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
+complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+complete -c gpg -l version -d "Display version and supported algorithms, and exit"
+complete -c gpg -l warranty -d "Display warranty and exit"
+complete -c gpg -s h -l help -d "Display help and exit"
+
+
+#
+# gpg options
+#
+
+complete -c gpg -s a -l armor -d "Create ASCII armored output"
+complete -c gpg -s o -l output -r -d "Write output to specified file"
+
+complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
+complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
+
+complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
+complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
+complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
+complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+complete -c gpg -s v -l verbose -d "Give more information during processing"
+complete -c gpg -s q -l quiet -d "Quiet mode"
+
+complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+complete -c gpg -s i -l interactive -d "Prompt before overwrite"
+
+complete -c gpg -l batch -d "Batch mode"
+complete -c gpg -l no-batch -d "Don't use batch mode"
+complete -c gpg -l no-tty -d "Never write output to terminal"
+
+complete -c gpg -l yes -d "Assume yes on most questions"
+complete -c gpg -l no -d "Assume no on most questions"
+
+complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+complete -c gpg -l keyserver -x -d "Use specified keyserver"
+complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
+
+complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
+complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
+complete -c gpg -l load-extension -x -d "Load an extension module"
+
+complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
+complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
+complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+complete -c gpg -l comment -x -d "Use specified string as comment string"
+complete -c gpg -l no-comments -d "Don't use a comment string"
+
+complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
+complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+complete -c gpg -l sig-notation -x
+complete -c gpg -l cert-notation -x
+
+complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+complete -c gpg -l sig-policy-url -x -d "Set signature policy"
+complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
+complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
+complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
+complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
+complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
+complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
+complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
+complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
+
+complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
+complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
+complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
+
+complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
+complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
+
+complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
+complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
+complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
+
+complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
+complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
+complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+complete -c gpg -l no-verbose -d "Reset verbose level to 0"
+complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
+complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+complete -c gpg -l skip-verify -d "Skip the signature verification step"
+
+complete -c gpg -l with-colons -d "Print key listings delimited by colons"
+complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
+complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+complete -c gpg -l show-session-key -d "Display the session key used for one message"
+complete -c gpg -l override-session-key -x -d "Don't use the public key but the specified session key"
+
+complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
+complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
+complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
+complete -c gpg -l no-groups -d "Remove all entries from the --group list"
+
+complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
diff --git a/share/completions/gpg1.fish b/share/completions/gpg1.fish
deleted file mode 100644
index a360b528d..000000000
--- a/share/completions/gpg1.fish
+++ /dev/null
@@ -1 +0,0 @@
-__fish_complete_gpg gpg1
diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 7bd278ca5..1097693f3 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -74,4 +74,364 @@ function __fish_print_gpg2_algo -d "Complete using all algorithms of the type sp
     }'
 end
 
-__fish_complete_gpg gpg2
+
+#
+# gpg2 subcommands
+#
+
+complete -c gpg2 -s s -l sign -d "Make a signature"
+complete -c gpg2 -l clearsign -d "Make a clear text signature"
+complete -c gpg2 -l clear-sign -d "Make a clear text signature"
+complete -c gpg2 -s b -l detach-sign -d "Make a detached signature"
+complete -c gpg2 -s e -l encrypt -d "Encrypt data"
+complete -c gpg2 -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+complete -c gpg2 -l store -d "Store only (make a simple literal data packet)"
+complete -c gpg2 -l decrypt -d "Decrypt specified file or stdin"
+complete -c gpg2 -l verify -d "Assume specified file or stdin is sigfile and verify it"
+complete -c gpg2 -l multifile -d "Modify certain other commands to accept multiple files for processing"
+complete -c gpg2 -l verify-files -d "Identical to '--multifile --verify'"
+complete -c gpg2 -l encrypt-files -d "Identical to '--multifile --encrypt'"
+complete -c gpg2 -l decrypt-files -d "Identical to --multifile --decrypt"
+
+complete -c gpg2 -s k -l list-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg2 -l list-public-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
+complete -c gpg2 -s K -l list-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
+complete -c gpg2 -l list-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+complete -c gpg2 -l list-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
+
+complete -c gpg2 -l check-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg2 -l check-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
+complete -c gpg2 -l fingerprint -xa "(__fish_complete_gpg2_user_id)" -d "List all keys with their fingerprints"
+
+complete -c gpg2 -l gen-key -d "Generate a new key pair"
+complete -c gpg2 -l generate-key -d "Generate a new key pair"
+
+complete -c gpg2 -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg2_user_id)"
+
+complete -c gpg2 -l sign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key"
+complete -c gpg2 -l lsign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
+
+complete -c gpg2 -l delete-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the public keyring"
+complete -c gpg2 -l delete-secret-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the secret and public keyring"
+complete -c gpg2 -l delete-secret-and-public-key -xa "(__fish_complete_gpg2_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
+
+complete -c gpg2 -l gen-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg2 -l generate-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
+complete -c gpg2 -l desig-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
+complete -c gpg2 -l generate-designated-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
+
+complete -c gpg2 -l export -xa "(__fish_complete_gpg2_user_id)" -d 'Export all or the given keys from all keyrings'
+complete -c gpg2 -l send-keys -xa "(__fish_complete_gpg2_key_id)" -d "Same as --export but sends the keys to a keyserver"
+complete -c gpg2 -l export-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
+complete -c gpg2 -l export-secret-subkeys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
+
+complete -c gpg2 -l import -d 'Import/merge keys'
+complete -c gpg2 -l fast-import -d 'Import/merge keys'
+
+complete -c gpg2 -l recv-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg2 -l receive-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
+complete -c gpg2 -l refresh-keys -xa "(__fish_complete_gpg2_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+complete -c gpg2 -l search-keys -xa "(__fish_complete_gpg2_user_id)" -d "Search the keyserver for the given names"
+
+complete -c gpg2 -l update-trustdb -d "Do trust database maintenance"
+complete -c gpg2 -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+complete -c gpg2 -l export-ownertrust -d "Send the ownertrust values to stdout"
+complete -c gpg2 -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+complete -c gpg2 -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+complete -c gpg2 -l print-md -xa "(__fish_print_gpg2_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+complete -c gpg2 -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+complete -c gpg2 -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+complete -c gpg2 -l version -d "Display version and supported algorithms, and exit"
+complete -c gpg2 -l warranty -d "Display warranty and exit"
+complete -c gpg2 -s h -l help -d "Display help and exit"
+
+complete -c gpg2 -l passwd -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+complete -c gpg2 -l change-passphrase -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
+
+complete -c gpg2 -l edit-card -d "Present a menu to work with a smartcard"
+complete -c gpg2 -l card-edit -d "Present a menu to work with a smartcard"
+
+complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
+complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+
+complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
+complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
+complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
+complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
+complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
+complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
+complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
+complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
+
+complete -c gpg2 -l show-keys -d "Take OpenPGP keys as input and print information about them"
+
+complete -c gpg2 -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+complete -c gpg2 -l full-generate-key -d "Generate a new key pair with dialogs for all options"
+
+
+#
+# gpg2 options
+#
+
+complete -c gpg2 -l agent-program -d "Specify an agent program to be used for secret key operations"
+complete -c gpg2 -s a -l armor -d "Create ASCII armored output"
+complete -c gpg2 -s o -l output -r -d "Write output to specified file"
+
+complete -c gpg2 -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+complete -c gpg2 -s u -l local-user -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the key to sign with"
+complete -c gpg2 -l default-key -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the default key to sign with"
+
+complete -c gpg2 -s r -l recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id"
+complete -c gpg2 -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+complete -c gpg2 -s R -l hidden-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
+complete -c gpg2 -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
+complete -c gpg2 -l default-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Use specified user id as default recipient"
+complete -c gpg2 -l default-recipient-self -d "Use the default key as default recipient"
+complete -c gpg2 -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+complete -c gpg2 -s v -l verbose -d "Give more information during processing"
+complete -c gpg2 -s q -l quiet -d "Quiet mode"
+
+complete -c gpg2 -s z -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+complete -c gpg2 -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+complete -c gpg2 -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+complete -c gpg2 -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+complete -c gpg2 -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+complete -c gpg2 -s i -l interactive -d "Prompt before overwrite"
+
+complete -c gpg2 -l batch -d "Batch mode"
+complete -c gpg2 -l no-batch -d "Don't use batch mode"
+complete -c gpg2 -l no-tty -d "Never write output to terminal"
+
+complete -c gpg2 -l yes -d "Assume yes on most questions"
+complete -c gpg2 -l no -d "Assume no on most questions"
+
+complete -c gpg2 -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+complete -c gpg2 -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+complete -c gpg2 -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+complete -c gpg2 -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+complete -c gpg2 -l trusted-key -xa "(__fish_complete_gpg2_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+complete -c gpg2 -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+complete -c gpg2 -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+complete -c gpg2 -l keyserver -x -d "Use specified keyserver"
+complete -c gpg2 -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+complete -c gpg2 -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+complete -c gpg2 -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+complete -c gpg2 -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+complete -c gpg2 -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+complete -c gpg2 -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+complete -c gpg2 -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+complete -c gpg2 -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+complete -c gpg2 -l keyring -r -d "Add specified file to the current list of keyrings"
+
+complete -c gpg2 -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+complete -c gpg2 -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+complete -c gpg2 -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+complete -c gpg2 -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+complete -c gpg2 -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+complete -c gpg2 -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+complete -c gpg2 -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+complete -c gpg2 -l options -r -d "Read options from specified file, do not read the default options file"
+complete -c gpg2 -l no-options -d "Shortcut for '--options /dev/null'"
+complete -c gpg2 -l load-extension -x -d "Load an extension module"
+
+complete -c gpg2 -l status-fd -x -d "Write special status strings to the specified file descriptor"
+complete -c gpg2 -l logger-fd -x -d "Write log output to the specified file descriptor"
+complete -c gpg2 -l logger-file -r -d "Write log output to the specified file"
+complete -c gpg2 -l log-file -r -d "Write log output to the specified file"
+complete -c gpg2 -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+complete -c gpg2 -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+complete -c gpg2 -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+complete -c gpg2 -l comment -x -d "Use specified string as comment string"
+complete -c gpg2 -l no-comments -d "Don't use a comment string"
+
+complete -c gpg2 -l emit-version -d "Include the version string in ASCII armored output"
+complete -c gpg2 -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+complete -c gpg2 -l sig-notation -x
+complete -c gpg2 -l cert-notation -x
+
+complete -c gpg2 -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+complete -c gpg2 -l sig-policy-url -x -d "Set signature policy"
+complete -c gpg2 -l cert-policy-url -x -d "Set certificate policy"
+complete -c gpg2 -l set-policy-url -x -d "Set signature and certificate policy"
+complete -c gpg2 -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+complete -c gpg2 -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+complete -c gpg2 -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+complete -c gpg2 -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+complete -c gpg2 -l use-embedded-filename -d "Create file with name as given in data"
+complete -c gpg2 -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+complete -c gpg2 -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+complete -c gpg2 -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+complete -c gpg2 -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+complete -c gpg2 -l cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm"
+complete -c gpg2 -l digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm"
+complete -c gpg2 -l compress-algo -xa "(__fish_print_gpg2_algo Compression)" -d "Use specified compression algorithm"
+complete -c gpg2 -l cert-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm when signing a key"
+complete -c gpg2 -l s2k-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+complete -c gpg2 -l s2k-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+complete -c gpg2 -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+complete -c gpg2 -l disable-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
+complete -c gpg2 -l disable-pubkey-algo -xa "(__fish_print_gpg2_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+complete -c gpg2 -l no-sig-cache -d "Do not cache the verification status of key signatures"
+
+complete -c gpg2 -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+complete -c gpg2 -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+complete -c gpg2 -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+complete -c gpg2 -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+complete -c gpg2 -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+complete -c gpg2 -l escape-from-lines -d "Mangle From-field of email headers (default)"
+complete -c gpg2 -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+complete -c gpg2 -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+complete -c gpg2 -l command-fd -x -d "Read user input from specified file descriptor"
+
+complete -c gpg2 -l use-agent -d "Try to use the GnuPG-Agent"
+complete -c gpg2 -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+complete -c gpg2 -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+complete -c gpg2 -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+complete -c gpg2 -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+complete -c gpg2 -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+complete -c gpg2 -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+complete -c gpg2 -l force-mdc -d "Force the use of encryption with a modification detection code"
+complete -c gpg2 -l disable-mdc -d "Disable the use of the modification detection code"
+
+complete -c gpg2 -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+complete -c gpg2 -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+complete -c gpg2 -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+complete -c gpg2 -l ignore-time-conflict -d "Do not fail if signature is older than key"
+complete -c gpg2 -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+complete -c gpg2 -l ignore-crc-error -d "Ignore CRC errors"
+complete -c gpg2 -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+complete -c gpg2 -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+complete -c gpg2 -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+complete -c gpg2 -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+complete -c gpg2 -l no-verbose -d "Reset verbose level to 0"
+complete -c gpg2 -l no-greeting -d "Suppress the initial copyright message"
+complete -c gpg2 -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+complete -c gpg2 -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+complete -c gpg2 -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+complete -c gpg2 -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+complete -c gpg2 -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+complete -c gpg2 -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+complete -c gpg2 -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+complete -c gpg2 -l skip-verify -d "Skip the signature verification step"
+
+complete -c gpg2 -l with-colons -d "Print key listings delimited by colons"
+complete -c gpg2 -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+complete -c gpg2 -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+complete -c gpg2 -l fast-list-mode -d "Changes the output of the list commands to work faster"
+complete -c gpg2 -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+complete -c gpg2 -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+complete -c gpg2 -l show-session-key -d "Display the session key used for one message"
+complete -c gpg2 -l override-session-key -x -d "Don't use the public key but the specified session key"
+complete -c gpg2 -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+
+complete -c gpg2 -l ask-sig-expire -d "Prompt for an expiration time"
+complete -c gpg2 -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg2 -l ask-cert-expire -d "Prompt for an expiration time"
+complete -c gpg2 -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+complete -c gpg2 -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+complete -c gpg2 -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+complete -c gpg2 -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+complete -c gpg2 -l ungroup -d "Remove a given entry from the --group list"
+complete -c gpg2 -l no-groups -d "Remove all entries from the --group list"
+
+complete -c gpg2 -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+complete -c gpg2 -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+complete -c gpg2 -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+complete -c gpg2 -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+
+complete -c gpg2 -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+complete -c gpg2 -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+
+complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+
+complete -c gpg2 -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+complete -c gpg2 -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+complete -c gpg2 -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+
+complete -c gpg2 -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+complete -c gpg2 -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+
+complete -c gpg2 -l input-size-hint -r -d "Specify input size in bytes"
+
+complete -c gpg2 -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+
+complete -c gpg2 -l key-origin -d "Track the origin of a key"
+complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+
+complete -c gpg2 -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+complete -c gpg2 -l no-keyring -d "Do not use any keyring at all"
+complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+
+complete -c gpg2 -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
+complete -c gpg2 -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+
+complete -c gpg2 -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+
+complete -c gpg2 -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+
+complete -c gpg2 -l sender -xa "(__fish_complete_gpg2_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+
+complete -c gpg2 -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+
+complete -c gpg2 -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
+complete -c gpg2 -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
+
+complete -c gpg2 -l try-secret-key -xa "(__fish_complete_gpg2_key_id)" -d "Specify keys to be used for trial decryption"
+
+complete -c gpg2 -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
+complete -c gpg2 -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
+complete -c gpg2 -l with-keygrip -d "Include the keygrip in the key listings"
+complete -c gpg2 -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
deleted file mode 100644
index 032343b6f..000000000
--- a/share/functions/__fish_complete_gpg.fish
+++ /dev/null
@@ -1,349 +0,0 @@
-function __fish_complete_gpg -d "Internal function for gpg completion code deduplication" -a __fish_complete_gpg_command
-    if string match -q 'gpg (GnuPG) 1.*' (gpg --version)
-        complete -c $__fish_complete_gpg_command -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
-        complete -c $__fish_complete_gpg_command -l no-sig-create-check -d "Do not verify each signature right after creation"
-        complete -c $__fish_complete_gpg_command -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
-        complete -c $__fish_complete_gpg_command -l rfc1991 "Try to be more RFC-1991 compliant"
-    else
-        complete -c $__fish_complete_gpg_command -l no-keyring -d "Do not use any keyring at all"
-        complete -c $__fish_complete_gpg_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-        complete -c $__fish_complete_gpg_command -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
-        complete -c $__fish_complete_gpg_command -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
-        complete -c $__fish_complete_gpg_command -l passwd -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-        complete -c $__fish_complete_gpg_command -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-        complete -c $__fish_complete_gpg_command -l quick-add-key -xa "(__fish_complete_gpg_key_id)" -d "Directly add a subkey to a key"
-        complete -c $__fish_complete_gpg_command -l quick-add-uid -xa "(__fish_complete_gpg_user_id)" -d "Adds a new user id to an existing key"
-        complete -c $__fish_complete_gpg_command -l quick-gen-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-        complete -c $__fish_complete_gpg_command -l quick-generate-key -xa "(__fish_complete_gpg_user_id)" -d "Generate a standard key without needing to answer prompts"
-        complete -c $__fish_complete_gpg_command -l quick-lsign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
-        complete -c $__fish_complete_gpg_command -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-        complete -c $__fish_complete_gpg_command -l quick-revuid -xa "(__fish_complete_gpg_user_id)" -d "Revokes a user id on an existing key"
-        complete -c $__fish_complete_gpg_command -l quick-set-expire -xa "(__fish_complete_gpg_key_id)" -d "Set the expiration time of the specified key"
-        complete -c $__fish_complete_gpg_command -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-        complete -c $__fish_complete_gpg_command -l quick-sign-key -xa "(__fish_complete_gpg_key_id)" -d "Directly sign a key from the passphrase"
-        complete -c $__fish_complete_gpg_command -l receive-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-        complete -c $__fish_complete_gpg_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
-        complete -c $__fish_complete_gpg_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
-        complete -c $__fish_complete_gpg_command -l sender -xa "(__fish_complete_gpg_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
-        complete -c $__fish_complete_gpg_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
-        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)" -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"
-        complete -c $__fish_complete_gpg_command -l with-keygrip -d "Include the keygrip in the key listings"
-        complete -c $__fish_complete_gpg_command -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
-        complete -c $__fish_complete_gpg_command -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
-        complete -c $__fish_complete_gpg_command -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
-        complete -c $__fish_complete_gpg_command -l log-file -r -d "Write log output to the specified file"
-        complete -c $__fish_complete_gpg_command -l locate-keys -d "Locate the keys given as arguments"
-        complete -c $__fish_complete_gpg_command -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
-        complete -c $__fish_complete_gpg_command -l list-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-        complete -c $__fish_complete_gpg_command -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
-        complete -c $__fish_complete_gpg_command -l known-notation -r -d "Tell GnuPG about a critical signature notation"
-        complete -c $__fish_complete_gpg_command -l key-origin -d "Track the origin of a key"
-        complete -c $__fish_complete_gpg_command -l input-size-hint -r -d "Specify input size in bytes"
-        complete -c $__fish_complete_gpg_command -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
-        complete -c $__fish_complete_gpg_command -l generate-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-        complete -c $__fish_complete_gpg_command -l generate-key -d "Generate a new key pair"
-        complete -c $__fish_complete_gpg_command -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-        complete -c $__fish_complete_gpg_command -l full-gen-key -d "Generate a new key pair with dialogs for all options"
-        complete -c $__fish_complete_gpg_command -l full-generate-key -d "Generate a new key pair with dialogs for all options"
-        complete -c $__fish_complete_gpg_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-        complete -c $__fish_complete_gpg_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-        complete -c $__fish_complete_gpg_command -l edit-card -d "Present a menu to work with a smartcard"
-        complete -c $__fish_complete_gpg_command -l card-edit -d "Present a menu to work with a smartcard"
-        complete -c $__fish_complete_gpg_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
-        complete -c $__fish_complete_gpg_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
-        complete -c $__fish_complete_gpg_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
-        complete -c $__fish_complete_gpg_command -l default-new-key-algo -x -d "Change the default algorothms for key generation"
-        complete -c $__fish_complete_gpg_command -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
-        complete -c $__fish_complete_gpg_command -l change-passphrase -xa "(__fish_complete_gpg_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-        complete -c $__fish_complete_gpg_command -l agent-program -d "Specify an agent program to be used for secret key operations"
-        complete -c $__fish_complete_gpg_command -l clear-sign -d "Make a clear text signature"
-    end
-
-    #
-    # gpg subcommands
-    #
-
-    complete -c gpg -s s -l sign -d "Make a signature"
-    complete -c gpg -l clearsign -d "Make a clear text signature"
-    complete -c gpg -s b -l detach-sign -d "Make a detached signature"
-    complete -c gpg -s e -l encrypt -d "Encrypt data"
-    complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-    complete -c gpg -l store -d "Store only (make a simple literal data packet)"
-    complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
-    complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
-    complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
-    complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
-    complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
-    complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
-
-    complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-    complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-    complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-    complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-    complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-    complete -c gpg -l check-signatures -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-    complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
-
-    complete -c gpg -l gen-key -d "Generate a new key pair"
-
-    complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
-
-    complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
-    complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-    complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
-    complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
-    complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-    complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-    complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-
-    complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
-    complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
-    complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-    complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-    complete -c gpg -l import -d 'Import/merge keys'
-    complete -c gpg -l fast-import -d 'Import/merge keys'
-
-    complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-    complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-    complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
-
-    complete -c gpg -l update-trustdb -d "Do trust database maintenance"
-    complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-    complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
-    complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-    complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-    complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-    complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-    complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-    complete -c gpg -l version -d "Display version and supported algorithms, and exit"
-    complete -c gpg -l warranty -d "Display warranty and exit"
-    complete -c gpg -s h -l help -d "Display help and exit"
-
-
-    #
-    # gpg options
-    #
-
-    complete -c gpg -s a -l armor -d "Create ASCII armored output"
-    complete -c gpg -s o -l output -r -d "Write output to specified file"
-
-    complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-    complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
-    complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
-
-    complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
-    complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-    complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
-    complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
-    complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-    complete -c gpg -s v -l verbose -d "Give more information during processing"
-    complete -c gpg -s q -l quiet -d "Quiet mode"
-
-    complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
-    complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
-    complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-    complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-    complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-    complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-    complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-    complete -c gpg -s i -l interactive -d "Prompt before overwrite"
-
-    complete -c gpg -l batch -d "Batch mode"
-    complete -c gpg -l no-batch -d "Don't use batch mode"
-    complete -c gpg -l no-tty -d "Never write output to terminal"
-
-    complete -c gpg -l yes -d "Assume yes on most questions"
-    complete -c gpg -l no -d "Assume no on most questions"
-
-    complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-    complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-    complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-    complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-    complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-    complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-    complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-    complete -c gpg -l keyserver -x -d "Use specified keyserver"
-    complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-    complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-    complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-    complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-    complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-    complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-    complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-    complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-    complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
-
-    complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-    complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-    complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-    complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-    complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-    complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-    complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-    complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
-    complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
-    complete -c gpg -l load-extension -x -d "Load an extension module"
-
-    complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
-    complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
-    complete -c gpg -l logger-file -r -d "Write log output to the specified file"
-    complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-    complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-    complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-    complete -c gpg -l comment -x -d "Use specified string as comment string"
-    complete -c gpg -l no-comments -d "Don't use a comment string"
-
-    complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
-    complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-    complete -c gpg -l sig-notation -x
-    complete -c gpg -l cert-notation -x
-
-    complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-    complete -c gpg -l sig-policy-url -x -d "Set signature policy"
-    complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
-    complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
-    complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-    complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-    complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-    complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-    complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
-    complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-    complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-    complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-    complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-    complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
-    complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
-    complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
-    complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-    complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-    complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-    complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-    complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-    complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-    complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
-
-    complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-    complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-    complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-    complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-    complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-    complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
-    complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-    complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-    complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
-
-    complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
-    complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-    complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-    complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-    complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-    complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-    complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-    complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
-    complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
-
-    complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-    complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-    complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-    complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
-    complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-    complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
-    complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-    complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-    complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-    complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-    complete -c gpg -l no-verbose -d "Reset verbose level to 0"
-    complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
-    complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-    complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-    complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-    complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-    complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-    complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-    complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-    complete -c gpg -l skip-verify -d "Skip the signature verification step"
-
-    complete -c gpg -l with-colons -d "Print key listings delimited by colons"
-    complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-    complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-    complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
-    complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-    complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-    complete -c gpg -l show-session-key -d "Display the session key used for one message"
-    complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
-    complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-    complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
-    complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-    complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-    complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-    complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-    complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
-    complete -c gpg -l no-groups -d "Remove all entries from the --group list"
-
-    complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-    complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-    complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-    complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-
-    complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
-end

From f91c725ff0e27c6daec514dfe0aa0c7785e96688 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 4 Oct 2019 20:28:47 +0200
Subject: [PATCH 1032/1732] Fix caret position of invalid expansion in command
 position

Fixes #5812
---
 src/parse_execution.cpp     |  6 ++++++
 tests/checks/expansion.fish | 13 +++++++++++++
 tests/expansion.err         |  2 +-
 tests/expansion.in          |  1 -
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 tests/checks/expansion.fish

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 847396187..d0df9a682 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -753,12 +753,18 @@ parse_execution_result_t parse_execution_context_t::expand_command(
 
     // Get the unexpanded command string. We expect to always get it here.
     wcstring unexp_cmd = *command_for_plain_statement(statement, pstree->src);
+    size_t pos_of_command_token = statement.child<0>().source_range()->start;
 
     // Expand the string to produce completions, and report errors.
     expand_result_t expand_err =
         expand_to_command_and_args(unexp_cmd, parser->vars(), out_cmd, out_args, &errors);
     if (expand_err == expand_result_t::error) {
         parser->set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
+        // Issue #5812 - the expansions were done on the command token,
+        // excluding prefixes such as " " or "if ".
+        // This means that the error positions are relative to the beginning
+        // of the token; we need to make them relative to the original source.
+        for (auto &error : errors) error.source_start += pos_of_command_token;
         return report_errors(errors);
     } else if (expand_err == expand_result_t::wildcard_no_match) {
         return report_unmatched_wildcard_error(statement);
diff --git a/tests/checks/expansion.fish b/tests/checks/expansion.fish
new file mode 100644
index 000000000..d7b7c7805
--- /dev/null
+++ b/tests/checks/expansion.fish
@@ -0,0 +1,13 @@
+# RUN: %fish -C 'set -g fish %fish' %s
+
+# caret position (#5812)
+printf '<%s>\n' ($fish -c ' $f[a]' 2>&1)
+
+# CHECK: <fish: Invalid index value>
+# CHECK: < $f[a]>
+# CHECK: <    ^>
+
+printf '<%s>\n' ($fish -c 'if $f[a]; end' 2>&1)
+# CHECK: <fish: Invalid index value>
+# CHECK: <if $f[a]; end>
+# CHECK: <      ^>
diff --git a/tests/expansion.err b/tests/expansion.err
index 678e91d37..de28e0563 100644
--- a/tests/expansion.err
+++ b/tests/expansion.err
@@ -41,4 +41,4 @@ echo {}}
 
 fish: Command substitutions not allowed
 command (asd)
-^
+        ^
diff --git a/tests/expansion.in b/tests/expansion.in
index e36c8ff0f..da7d8da92 100644
--- a/tests/expansion.in
+++ b/tests/expansion.in
@@ -153,6 +153,5 @@ logmsg Test fatal syntax errors
 ../test/root/bin/fish -c 'echo $,foo'
 ../test/root/bin/fish -c 'echo {'
 ../test/root/bin/fish -c 'echo {}}'
-# The output for this is wrong in non-interactive mode and will need fixing when #5812 is fixed
 ../test/root/bin/fish -c 'command (asd)'
 true

From 9c651d7db03c40553b47f5dc14ec3e8c425f49e5 Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Mon, 7 Oct 2019 13:13:04 +0200
Subject: [PATCH 1033/1732] doc: add link to feature flags in fish command

[ci skip]
---
 sphinx_doc_src/cmds/fish.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 3ea2bfc30..5063b3bd0 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -43,6 +43,6 @@ The following options are available:
 
 - ``-D`` or ``--debug-stack-frames=DEBUG_LEVEL`` specify how many stack frames to display when debug messages are written. The default is zero. A value of 3 or 4 is usually sufficient to gain insight into how a given debug call was reached but you can specify a value up to 128.
 
-- ``-f`` or ``--features=FEATURES`` enables one or more feature flags (separated by a comma). These are how fish stages changes that might break scripts.
+- ``-f`` or ``--features=FEATURES`` enables one or more :ref:`feature flags <featureflags>` (separated by a comma). These are how fish stages changes that might break scripts.
 
 The fish exit status is generally the exit status of the last foreground command. If fish is exiting because of a parse error, the exit status is 127.

From 422441e9033382c7c994967d45b2d4b7f9302bfb Mon Sep 17 00:00:00 2001
From: matoruru <40382980+matoruru@users.noreply.github.com>
Date: Tue, 8 Oct 2019 00:32:56 +0900
Subject: [PATCH 1034/1732] Add completions/sfdx.fish (#6149)

* Add completions/sfdx.fish

* completions/sfdx.fish: add completion for options

* completions/sfdx.fish: add a completion for --manifest(-x) option which need package.json

* completions/sfdx.fish: replace redundant function with already existing one
---
 share/completions/sfdx.fish | 1062 +++++++++++++++++++++++++++++++++++
 1 file changed, 1062 insertions(+)
 create mode 100644 share/completions/sfdx.fish

diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
new file mode 100644
index 000000000..7ce1bc030
--- /dev/null
+++ b/share/completions/sfdx.fish
@@ -0,0 +1,1062 @@
+# Tab completion for sfdx (https://developer.salesforce.com/tools/sfdxcli).
+
+function __fish_sfdx_using_command
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
+    end
+    return 1
+end
+
+function __fish_sfdx_find_packagexml
+    # To find manifest (in other words package.xml)
+    printf '%s\n' (find . -type f -regex ".*/package.xml" | string sub -s 3)
+end
+
+set -l sfdx_looking -c sfdx -n '__fish_use_subcommand'
+
+set -l sfdx_loglevels 'trace debug info warn error fatal TRACE DEBUG INFO WARN ERROR FATAL'
+
+#
+# commands
+#
+complete $sfdx_looking -xa commands -d 'list all the commands'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s h -l help   -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s j -l json   -d 'output in json format'
+complete -c sfdx -n '__fish_sfdx_using_command commands'      -l hidden -d 'also show hidden commands'
+
+#
+# force
+#
+complete $sfdx_looking -xa force -d 'tools for the Salesforce developer'
+complete -c sfdx -n '__fish_sfdx_using_command force' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:alias -d 'manage username aliases'
+
+complete $sfdx_looking -xa force:alias:list -d 'list username aliases for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:alias:set  -d 'set username aliases for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex -d 'work with Apex code'
+
+complete $sfdx_looking -xa force:apex:execute -d 'execute anonymous Apex code'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s f -l apexcodefile   -d 'path to a local file containing Apex code'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex:class -d 'create an Apex class'
+
+complete $sfdx_looking -xa force:apex:class:create -d 'create an Apex class'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s d -l outputdir  -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s n -l classname  -d '(required) name of the generated Apex class'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s t -l template   -d '[default: DefaultApexClass] template to use for file creation' -xa 'DefaultApexClass ApexException ApexUnitTest InboundEmailService'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l json       -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex:log -d 'work with Apex logs'
+
+complete $sfdx_looking -xa force:apex:log:get -d 'fetch the last debug log'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s c -l color          -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s i -l logid          -d 'ID of the log to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s n -l number         -d 'number of most recent logs to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex:log:list -d 'list debug logs'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex:log:tail -d 'start debug logging and display logs'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s c -l color          -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s d -l debuglevel     -d 'debug level for trace flag'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s s -l skiptraceflag  -d 'skip trace flag setup'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:apex:test -d 'work with Apex tests'
+
+complete $sfdx_looking -xa force:apex:test:report -d 'display test results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s c -l codecoverage   -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s d -l outputdir      -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s i -l testrunid      -d '(required) ID of test run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s w -l wait           -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l verbose        -d 'display Apex test processing details'
+
+complete $sfdx_looking -xa force:apex:test:run -d 'invoke Apex tests'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s c -l codecoverage   -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s d -l outputdir      -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s l -l testlevel      -d 'testlevel enum value' -xa 'RunLocalTests RunAllTestsInOrg RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s n -l classnames     -d 'comma-separated list of Apex test class names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s r -l resultformat   -d 'result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s s -l suitenames     -d 'comma-separated list of Apex test suite names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s t -l tests          -d 'comma-separated list of Apex test class names or IDs and, if applicable, test methods to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s w -l wait           -d 'the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s y -l synchronous    -d 'run tests from a single class synchronously'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l verbose        -d 'display Apex test processing details'
+
+complete $sfdx_looking -xa force:apex:trigger -d 'create an Apex trigger'
+
+complete $sfdx_looking -xa force:apex:trigger:create -d 'create an Apex trigger'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s a -l apiversion    -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s e -l triggerevents -d '[default: before insert] events that fire the trigger (before insert|before update|before delete|after insert|after update|after delete|after undelete)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s n -l triggername   -d '(required) name of the generated Apex trigger'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s s -l sobject       -d '[default: SOBJECT] sObject to create a trigger on'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s t -l template      -d '[default: ApexTrigger] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l json          -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:auth -d 'authorize an org for use with the Salesforce'
+
+complete $sfdx_looking -xa force:auth:list -d 'list auth connection information'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:auth:logout -d 'log out from authorized orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s a -l all            -d 'include all authenticated orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:auth:jwt -d 'authorize an org using JWT'
+
+complete $sfdx_looking -xa force:auth:jwt:grant -d 'authorize an org using the JWT flow'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s f -l jwtkeyfile               -d '(required) path to a file containing the private key'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s u -l username                 -d '(required) authentication username'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l json                     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:auth:sfdxurl -d 'authorize an org using sfdxurl'
+
+complete $sfdx_looking -xa force:auth:sfdxurl:store -d 'authorize an org using an SFDX auth URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s f -l sfdxurlfile              -d '(required) path to a file containing the sfdx url'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l json                     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:auth:web -d 'authorize an org using a web browser'
+
+complete $sfdx_looking -xa force:auth:web:login -d 'authorize an org using the web login flow'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l json                     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:config -d 'configure the Salesforce CLI'
+
+complete $sfdx_looking -xa force:config:get -d 'get config var values for given names'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l verbose  -d 'emit additional command output to stdout'
+
+complete $sfdx_looking -xa force:config:list -d 'list config vars for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:config:set -d 'set config vars for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -s g -l global   -d 'set config var globally (to be used from any directory)'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:data -d 'manipulate records in your org'
+
+complete $sfdx_looking -xa force:data:bulk -d 'manipulate records using the bulk API'
+
+complete $sfdx_looking -xa force:data:bulk:delete -d 'bulk delete records from a csv file'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile        -d '(required) the path to the CSV file containing the ids of the records to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype    -d '(required) the sObject type of the records you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:data:bulk:status -d 'view the status of a bulk data load job or batch'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s b -l batchid        -d 'the ID of the batch whose status you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s i -l jobid          -d '(required) the ID of the job you want to view or of the job whose batch you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:data:bulk:upsert -d 'bulk upsert records from a CSV file'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l csvfile        -d '(required) the path to the CSV file that defines the records to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid     -d '(required) the column name of the external ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype    -d '(required) the sObject type of the records you want to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:data:record -d 'manipulate records using the enterprise API'
+
+complete $sfdx_looking -xa force:data:record:create -d 'create a record'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s v -l values         -d '(required) the <fieldName>=<value> pairs you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l perflog        -d 'get API performance data'
+
+complete $sfdx_looking -xa force:data:record:delete -d 'delete a record'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l perflog        -d 'get API performance data'
+
+complete $sfdx_looking -xa force:data:record:get -d 'view a record'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l perflog        -d 'get API performance data'
+
+complete $sfdx_looking -xa force:data:record:update -d 'update a record'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l perflog        -d 'get API performance data'
+
+complete $sfdx_looking -xa force:data:soql -d 'fetch records using SOQL'
+
+complete $sfdx_looking -xa force:data:soql:query -d 'execute a SOQL query'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s q -l query          -d '(required) SOQL query to execute'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human csv json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s t -l usetoolingapi  -d 'execute query with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l perflog        -d 'get API performance data'
+
+complete $sfdx_looking -xa force:data:tree -d 'manipulate records using the tree API'
+
+complete $sfdx_looking -xa force:data:tree:export -d 'export data from an org into sObject tree format for force:data:tree:import consumption'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir      -d 'directory to store files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate mulitple sobject tree files and a plan definition file for aggregated import'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query          -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix         -d 'prefix of generated files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:data:tree:import -d 'import data into an org using SObject Tree Save API'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s f -l sobjecttreefiles -d 'comma-delimited, ordered paths of json files containing collection of record trees to insert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s p -l plan             -d 'path to plan to insert multiple data files that have master-detail relationships'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l confighelp       -d 'display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l apiversion       -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l json             -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:doc -d 'display help for force commands'
+
+complete $sfdx_looking -xa force:doc:commands -d 'display help for force commands'
+
+complete $sfdx_looking -xa force:doc:commands:display -d 'display help for force commands'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:doc:commands:list -d 'list the force commands'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -s u -l usage    -d 'list only docopt usage strings'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning -d 'create Aura components and Lightning web'
+
+complete $sfdx_looking -xa force:lightning:lint -d 'analyze (lint) Aura component code'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -s i -l ignore   -d 'pattern used to ignore some folders'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l config   -d 'path to a custom ESLint configuration file'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l exit     -d 'exit with error code 1 if there are lint issues'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l files    -d 'pattern used to include specific files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l verbose  -d 'report warnings in addition to errors'
+
+complete $sfdx_looking -xa force:lightning:app -d 'create a Lightning app'
+
+complete $sfdx_looking -xa force:lightning:app:create -d 'create a Lightning app'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s d -l outputdir  -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s n -l appname    -d '(required) name of the generated Lightning app'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s t -l template   -d '[default: DefaultLightningApp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l json       -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning:component -d 'create a bundle for an Aura component or a Lightning web component'
+
+complete $sfdx_looking -xa force:lightning:component:create -d 'create a bundle for an Aura component or a Lightning web component'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s a -l apiversion    -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s n -l componentname -d '(required) name of the generated Lightning component'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s t -l template      -d '[default: DefaultLightningCmp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l json          -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l type          -d '[default: aura] type of the Lightning component' -xa 'aura lwc'
+
+complete $sfdx_looking -xa force:lightning:event -d 'create a Lightning event'
+
+complete $sfdx_looking -xa force:lightning:event:create -d 'create a Lightning event'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s d -l outputdir  -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s n -l eventname  -d '(required) name of the generated Lightning event'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s t -l template   -d '[default: DefaultLightningEvt] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l json       -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning:interface -d 'create a Lightning interface'
+
+complete $sfdx_looking -xa force:lightning:interface:create -d 'create a Lightning interface'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s a -l apiversion    -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s n -l interfacename -d '(required) name of the generated Lightning interface'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s t -l template      -d '[default: DefaultLightningIntf] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l json          -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning:test -d 'test Aura components'
+
+complete $sfdx_looking -xa force:lightning:test:create -d 'create a Lightning test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s n -l testname  -d '(required) name of the generated Lightning test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s t -l template  -d '[default: DefaultLightningTest] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l json      -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning:test:install -d 'install Lightning Testing Service unmanaged package in your org'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s r -l releaseversion -d '[default: latest] release version of Lightning Testing Service'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype    -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait           -d '[default: 2 minutes] number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:lightning:test:run -d 'invoke Aura component tests'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s a -l appname          -d 'name of your Lightning test application'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s d -l outputdir        -d 'directory path to store test run artifacts: for example, log files and test results'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s f -l configfile       -d 'path to config file for the test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s o -l leavebrowseropen -d 'leave browser open'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s r -l resultformat     -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s t -l timeout          -d '[default: 60000] time (ms) to wait for results element in dom'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l apiversion       -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l json             -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:limits -d 'view your org’s limits'
+
+complete $sfdx_looking -xa force:limits:api -d 'view your org’s API limits'
+
+complete $sfdx_looking -xa force:limits:api:display -d 'display current org’s limits'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:mdapi -d 'retrieve and deploy metadata using Metadata'
+
+complete $sfdx_looking -xa force:mdapi:convert -d 'convert metadata from the Metadata API format into the source format'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s d -l outputdir -d 'the output directory to store the source–formatted files'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s r -l rootdir   -d '(required) the root directory containing the Metadata API–formatted metadata'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l json      -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:mdapi:deploy -d 'deploy metadata using Metadata API'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s c -l checkonly                -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s d -l deploydir                -d 'root of directory tree of files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s f -l zipfile                  -d 'path to .zip file of metadata to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s g -l ignorewarnings           -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s l -l testlevel                -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s o -l ignoreerrors             -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s r -l runtests                 -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s u -l targetusername           -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s w -l wait                     -d 'wait time for command to finish in minutes (default: 0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l apiversion               -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l json                     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l verbose                  -d 'verbose output of deploy results'
+
+complete $sfdx_looking -xa force:mdapi:deploy:cancel -d 'cancel a metadata deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:mdapi:deploy:report -d 'check the status of a metadata deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l verbose        -d 'verbose output of deploy results'
+
+complete $sfdx_looking -xa force:mdapi:describemetadata -d 'display the metadata types enabled for your org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s a -l apiversion     -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s f -l resultfile     -d 'filter metadata known by the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:mdapi:listmetadata -d 'display properties of metadata components of a specified type'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion      -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile      -d 'path to the file where results are stored'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype    -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l folder          -d 'folder associated with the component; required for components that use folders; folder names are case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l json            -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:mdapi:retrieve -d 'retrieve metadata using Metadata API'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s a -l apiversion        -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s d -l sourcedir         -d 'source dir to use instead of the default package dir in sfdx-project.json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s k -l unpackaged        -d 'file path of manifest of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s p -l packagenames      -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s r -l retrievetargetdir -d '(required) directory root for the retrieved files'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s s -l singlepackage     -d 'a single-package retrieve (default: false)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l json              -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l verbose           -d 'verbose output of retrieve result'
+
+complete $sfdx_looking -xa force:mdapi:retrieve:report -d 'check the status of a metadata retrieval'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s i -l jobid             -d 'job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s r -l retrievetargetdir -d 'directory root for the retrieved files'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l apiversion        -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l json              -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l verbose           -d 'verbose output of retrieve result'
+
+complete $sfdx_looking -xa force:org -d 'manage your orgs'
+
+complete $sfdx_looking -xa force:org:clone -d 'clone a sandbox org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias           -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile     -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s s -l setdefaultusername -d 'set the created org as the default username'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type               -d '(required) type of org to create' -xa 'sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait               -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l apiversion         -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l json               -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:create -d 'create a scratch or sandbox org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s a -l setalias             -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s c -l noancestors          -d 'do not include second-generation package ancestors in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s d -l durationdays         -d 'duration of the scratch org (in days) (default:7, min:1, max:30)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s f -l definitionfile       -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s i -l clientid             -d 'connected app consumer key; not supported for sandbox org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s n -l nonamespace          -d 'create the scratch org with no namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s s -l setdefaultusername   -d 'set the created org as the default username'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s t -l type                 -d '[default: scratch] type of org to create; sandbox org creation is in beta' -xa 'scratch sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s w -l wait                 -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:delete -d 'mark a scratch org for deletion'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s p -l noprompt             -d 'no prompt to confirm deletion'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:display -d 'get org description'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l verbose        -d 'emit additional command output to stdout'
+
+complete $sfdx_looking -xa force:org:list -d 'list all orgs you’ve created or authenticated to'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -s p -l noprompt -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l all      -d 'include expired, deleted, and unknown-status scratch orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l clean    -d 'remove all local org authorizations for non-active orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l verbose  -d 'list more information about each org'
+
+complete $sfdx_looking -xa force:org:open -d 'open an org in your browser'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s p -l path           -d 'navigation URL path'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s r -l urlonly        -d 'display navigation URL, but don’t launch browser'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:status -d 'report sandbox org creation status and headlessly authenticate to org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalias           -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname        -d '(required) name of the sandbox org to check status for'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s s -l setdefaultusername -d 'set the created org as the default username'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait               -d '[default: 6 minutes] number of minutes to wait while polling for status'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l apiversion         -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l json               -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:shape -d 'manage org shape'
+
+complete $sfdx_looking -xa force:org:shape:create -d 'create a snapshot of org edition, features, and licenses'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:shape:delete -d 'delete all org shapes for a target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:shape:list -d 'list all org shapes you’ve created'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l verbose  -d 'list more information about each org shape'
+
+complete $sfdx_looking -xa force:org:snapshot -d 'snapshot a scratch org'
+
+complete $sfdx_looking -xa force:org:snapshot:create -d 'snapshot a scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s d -l description          -d 'description of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s n -l snapshotname         -d '(required) unique name of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s o -l sourceorg            -d '(required) ID or locally authenticated username or alias of scratch org to snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:snapshot:delete -d 'delete a scratch org snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s s -l snapshot             -d '(required) name or ID of snapshot to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:snapshot:get -d 'get details about a scratch org snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s s -l snapshot             -d '(required) name or ID of snapshot to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:org:snapshot:list -d 'list scratch org snapshots'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package -d 'develop and install packages'
+
+complete $sfdx_looking -xa force:package:create -d 'create a package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s d -l description -d 'package description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s e -l nonamespace -d 'creates the package with no namespace; available only for unlocked packages.'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s n -l name        -d '(required) package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l path        -d '(required) path to directory that contains the contents of the package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l packagetype -d '(required) package type' -xa 'Managed Unlocked'
+
+complete $sfdx_looking -xa force:package:install -d 'install packages'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt        -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s w -l wait            -d 'number of minutes to wait for installation status'
+
+complete $sfdx_looking -xa force:package:list -d 'list all packages in the Dev Hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l verbose              -d 'display extended package detail'
+
+complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:update -d 'update package details'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s d -l description          -d 'new package description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s n -l name                 -d 'new package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s p -l package              -d '(required) ID (starts with 0Ho) or alias of the package to update'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:hammertest -d 'run ISV Hammer tests'
+
+complete $sfdx_looking -xa force:package:hammertest:list -d 'list the statuses of running and completed ISV Hammer tests'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s i -l packageversionid     -d 'ID of the package version to list results for'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:hammertest:report -d 'display the status or results of a ISV Hammer test'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s i -l requestid      -d '(required) ID of the hammer request to report on'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s s -l summary        -d 'report only a results summary (hide Apex test failures)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:hammertest:run -d 'run ISV Hammer'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s d -l scheduledrundatetime -d 'earliest date/time to run the package upgrade test (YYYY-MM-DD HH:mm:ss, in GMT)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s f -l subscriberfile       -d 'file with list of subscriber orgs IDs, one per line'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s i -l packageversionids    -d '(required) comma-separated list of package version IDs to test'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s p -l preview              -d 'run the package hammer test in the Salesforce preview version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s s -l subscriberorgs       -d 'comma-separated list of subscriber org IDs'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s t -l apextests            -d 'after package upgrade validation, run the package\'s Apex tests in the subscriber org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:install -d 'install packages'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt        -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s w -l wait            -d 'number of minutes to wait for installation status'
+
+complete $sfdx_looking -xa force:package:install:report -d 'retrieve the status of a package installation request'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s i -l requestid      -d '(required) ID of the package install request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:installed -d 'list installed packages'
+
+complete $sfdx_looking -xa force:package:installed:list -d 'list the org’s installed packages'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:uninstall:report -d 'retrieve status of package uninstall request'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s i -l requestid      -d '(required) ID of the package uninstall request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package:version -d 'develop package versions'
+
+complete $sfdx_looking -xa force:package1 -d 'develop first-generation managed and'
+
+complete $sfdx_looking -xa force:package1:version -d 'develop package versions'
+
+complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name            -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package1:version:display -d 'display details about a first-generation package version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s i -l packageversionid -d '(required) metadata package version ID (starts with 04t)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l apiversion       -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l json             -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package1:version:list -d 'list package versions for the specified first-generation package or for the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s i -l packageid      -d 'metadata package ID (starts with 033)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name=name       -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:package1:version:create:get -d 'retrieve the status of a package version creation request'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s i -l requestid      -d '(required) PackageUploadRequest ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:project -d 'set up a Salesforce DX project'
+
+complete $sfdx_looking -xa force:project:create -d 'create a Salesforce DX project'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s d -l outputdir                      -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s n -l projectname                    -d '(required) name of the generated project'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s p -l defaultpackagedir              -d '[default: force-app] default package directory name'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s s -l namespace                      -d 'project associated namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s t -l template                       -d '[default: standard] template to use for project creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s x -l manifest                       -d 'generate a manifest (package.xml) for change-set-based development'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l json                           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:project:upgrade -d 'update project config files to the latest format'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -s f -l forceupgrade -d 'run all upgrades even if project has already been upgraded'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l json         -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l loglevel     -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:schema -d 'view standard and custom objects'
+
+complete $sfdx_looking -xa force:schema:sobject -d 'view standard and custom objects'
+
+complete $sfdx_looking -xa force:schema:sobject:describe -d 'describe an object'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s s -l sobjecttype    -d '(required) the API name of the object to describe'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s t -l usetoolingapi  -d 'execute with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:schema:sobject:list -d 'list all objects of a specified category'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s c -l sobjecttypecategory -d '(required) the type of objects to list (all|custom|standard)'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s u -l targetusername      -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l apiversion          -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l json                -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l loglevel            -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source -d 'sync your project with your orgs'
+
+complete $sfdx_looking -xa force:source:convert -d 'convert source into Metadata API format'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s d -l outputdir   -d 'output directory to store the Metadata API–formatted files in'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s n -l packagename -d 'name of the package to associate with the metadata-formatted files'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s r -l rootdir     -d 'a source directory other than the default package to convert'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l json        -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l loglevel    -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:delete -d 'delete source from your project and from a non-source-tracked org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s m -l metadata       -d 'comma-separated list of names of metadata components to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s p -l sourcepath     -d 'comma-separated list of paths to the local metadata to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s r -l noprompt       -d 'do not prompt for delete confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+
+complete $sfdx_looking -xa force:source:open -d 'edit a Lightning Page with Lightning App Builder'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s f -l sourcefile     -d  '(required) file to edit'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s r -l urlonly        -d  'generate a navigation URL; don’t launch the editor'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:pull -d 'pull source from the scratch org to the project'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to the project'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:push -d 'push source to a scratch org from the project'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s g -l ignorewarnings -d 'deploy changes even if warnings are generated'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:retrieve -d 'retrieve source from an org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s a -l apiversion                     -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s m -l metadata                       -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s n -l packagenames                   -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s p -l sourcepath                     -d 'comma-separated list of source file paths to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l json                           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l verbose                        -d 'verbose output of retrieve result'
+
+complete $sfdx_looking -xa force:source:status -d 'list local changes and/or changes in a scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s a -l all            -d 'list all the changes that have been made'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s l -l local          -d 'list the changes that have been made locally'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s r -l remote         -d 'list the changes that have been made in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+
+complete $sfdx_looking -xa force:source:deploy:cancel -d 'cancel a source deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:source:deploy:report -d 'check the status of a metadata deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:user -d 'perform user-related admin tasks'
+
+complete $sfdx_looking -xa force:user:create -d 'create a user for a scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s a -l setalias             -d 'set an alias for the created username to reference within the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s f -l definitionfile       -d 'file path to a user definition'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:user:display -d 'displays information about a user of a scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:user:list -d 'lists all users of a scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:user:password -d 'perform password-related admin tasks'
+
+complete $sfdx_looking -xa force:user:password:generate -d 'generate a password for scratch org users'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s o -l onbehalfof           -d 'comma-separated list of usernames for which to generate passwords'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l apiversion           -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l json                 -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:user:permset -d 'perform permset-related admin tasks'
+
+complete $sfdx_looking -xa force:user:permset:assign -d 'assign a permission set to one or more users of an org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s n -l permsetname    -d '(required) the name of the permission set to assign'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s o -l onbehalfof     -d 'comma-separated list of usernames or aliases to assign the permission set to'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l apiversion     -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:visualforce -d 'create and edit Visualforce files'
+
+complete $sfdx_looking -xa force:visualforce:component -d 'create a Visualforce component'
+
+complete $sfdx_looking -xa force:visualforce:component:create -d 'create a Visualforce component'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p a -l apiversion    -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p l -l label         -d '(required) Visualforce component label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p n -l componentname -d '(required) name of the generated Visualforce component'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p t -l template      -d '[default: DefaultVFComponent] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l json          -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa force:visualforce:page -d 'create a Visualforce page'
+
+complete $sfdx_looking -xa force:visualforce:page:create -d 'create a Visualforce page'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p a -l apiversion    -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p l -l label         -d '(required) Visualforce page label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p n -l componentname -d '(required) name of the generated Visualforce page'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p t -l template      -d '[default: DefaultVFPage] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l json          -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+#
+# help
+#
+complete $sfdx_looking -xa help -d 'display help for sfdx'
+
+#
+# plugins
+#
+complete $sfdx_looking -xa plugins -d 'add/remove/create CLI plug-ins'
+complete -c sfdx -n '__fish_sfdx_using_command plugins' -l core -d 'show core plugins'
+
+complete $sfdx_looking -xa plugins:install -d 'installs a plugin into the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s f -l force   -d 'yarn install with force flag'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s v -l verbose
+
+complete $sfdx_looking -xa plugins:link -d 'links a plugin into the CLI for development'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s v -l verbose
+
+complete $sfdx_looking -xa plugins:uninstall -d 'removes a plugin from the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s v -l verbose
+
+complete $sfdx_looking -xa plugins:update -d 'update installed plugins'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s v -l verbose
+
+complete $sfdx_looking -xa plugins:generate -d 'create a new sfdx-cli plugin'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -s h -l help     -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l defaults -d 'use defaults for every setting'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l force    -d 'overwrite existing files'
+
+complete $sfdx_looking -xa plugins:trust -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
+
+complete $sfdx_looking -xa plugins:trust:sign -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s k -l privatekeypath -d '(required) the local file path for the private key.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s p -l publickeyurl   -d '(required) the url where the public key/certificate will be hosted.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s s -l signatureurl   -d '(required) the url location where the signature will be hosted minus the name of the actual signature file.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l json           -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+complete $sfdx_looking -xa plugins:trust:verify -d 'For an npm validate the associated digital signature if it exits.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s n -l npm      -d '(required) Specify the npm name. This can include a tag/version'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s r -l registry -d 'The registry name. the behavior is the same as npm.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+
+#
+# update
+#
+complete $sfdx_looking -xa update -d 'update the sfdx CLI'
+
+#
+# which
+#
+complete $sfdx_looking -xa which -d 'show which plugin a command is in'

From a7913c3a1095f0b2ac571ed0ea07ab8e2d2958dd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 7 Oct 2019 21:21:38 +0200
Subject: [PATCH 1035/1732] function: Reject invalid variable names for
 --argument-names

Fixes #6147.
---
 src/builtin_function.cpp   |  4 ++++
 tests/checks/function.fish | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 tests/checks/function.fish

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 94df2c21d..7ba5c9c06 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -225,6 +225,10 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     if (argc != optind) {
         if (opts.named_arguments.size()) {
             for (int i = optind; i < argc; i++) {
+                if (!valid_var_name(argv[i])) {
+                    streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, argv[i]);
+                    return STATUS_INVALID_ARGS;
+                }
                 opts.named_arguments.push_back(argv[i]);
             }
         } else {
diff --git a/tests/checks/function.fish b/tests/checks/function.fish
new file mode 100644
index 000000000..51a3b3a32
--- /dev/null
+++ b/tests/checks/function.fish
@@ -0,0 +1,14 @@
+#RUN: %fish %s
+function t --argument-names a b c
+    echo t
+end
+
+function t2 --argument-names a b c --no-scope-shadowing
+    echo t2
+end
+#CHECKERR: function.fish (line {{\d+}}): function: Variable name '--no-scope-shadowing' is not valid. See `help identifiers`.
+#CHECKERR: function t2 --argument-names a b c --no-scope-shadowing
+#CHECKERR: ^
+
+functions -q t2 && echo exists || echo does not exist
+#CHECK: does not exist

From 7dbbd16d0ad00b184b7208ec5805142175ffda72 Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Tue, 8 Oct 2019 18:01:32 +0200
Subject: [PATCH 1036/1732] doc: add missing down-line and up-line (#6177)

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index fd7a17e81..d1291bbe4 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -100,6 +100,8 @@ The following special input functions are available:
 
 - ``delete-or-exit``, deletes one character to the right of the cursor or exits the shell if the commandline is empty.
 
+- ``down-line``, move down one line
+
 - ``downcase-word``, make the current word lowercase
 
 - ``end-of-buffer``, moves to the end of the buffer, i.e. the end of the first line
@@ -154,6 +156,8 @@ The following special input functions are available:
 
 - ``transpose-words``, transpose two words to the left of the cursor
 
+- ``up-line``, move up one line
+
 - ``upcase-word``, make the current word uppercase
 
 - ``yank``, insert the latest entry of the killring into the buffer

From ff18b2a09a1dba5446ca523fb3f53e68c6e830cc Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 8 Oct 2019 18:36:50 +0200
Subject: [PATCH 1037/1732] Fix tests

This didn't account for the path differing from when I ran the test
manually.

Sorry!
---
 tests/checks/function.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/function.fish b/tests/checks/function.fish
index 51a3b3a32..58a7d99a5 100644
--- a/tests/checks/function.fish
+++ b/tests/checks/function.fish
@@ -6,7 +6,7 @@ end
 function t2 --argument-names a b c --no-scope-shadowing
     echo t2
 end
-#CHECKERR: function.fish (line {{\d+}}): function: Variable name '--no-scope-shadowing' is not valid. See `help identifiers`.
+#CHECKERR: {{.*/?}}function.fish (line {{\d+}}): function: Variable name '--no-scope-shadowing' is not valid. See `help identifiers`.
 #CHECKERR: function t2 --argument-names a b c --no-scope-shadowing
 #CHECKERR: ^
 

From 055a332133687c4a6231f6adf961f49b4d1b6f60 Mon Sep 17 00:00:00 2001
From: Greg Anders <greg@gpanders.com>
Date: Tue, 8 Oct 2019 11:14:51 -0600
Subject: [PATCH 1038/1732] Only print extra newlines for multi-line prompts
 (#6179)

Corrects #6110

BSD `seq` produces a down-counting sequence when the second argument is
smaller than the first, e.g.:

    $ seq 2 1
    2
    1
    $

While GNU `seq` produces no output at all:

    $ seq 2 1
    $

To accommodate for this behavior, only run `seq` when we are sure that
the second argument is greater than or equal to the first (in this case,
the second argument `line_count` should be greater than 1).
---
 share/functions/__fish_whatis_current_token.fish | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_whatis_current_token.fish b/share/functions/__fish_whatis_current_token.fish
index 5bbd668c9..e5269e68f 100644
--- a/share/functions/__fish_whatis_current_token.fish
+++ b/share/functions/__fish_whatis_current_token.fish
@@ -8,8 +8,13 @@ function __fish_whatis_current_token -d "Show man page entries related to the to
         whatis $tok[1]
 
         set -l line_count (count (fish_prompt))
-        for x in (seq 2 $line_count)
-            printf "\n"
+        # Ensure line_count is greater than one to accomodate different
+        # versions of the `seq` command, some of which print the sequence in
+        # reverse order when the second argument is smaller than the first
+        if test $line_count -gt 1
+            for x in (seq 2 $line_count)
+                printf "\n"
+            end
         end
 
         commandline -f repaint

From 2e6ab0b418f2fb17fcbf18ef5b118bc342a1118a Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Tue, 8 Oct 2019 21:24:24 +0200
Subject: [PATCH 1039/1732] cd: Fix test for too many args

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

diff --git a/share/functions/cd.fish b/share/functions/cd.fish
index e04b227a0..df7b0c8c9 100644
--- a/share/functions/cd.fish
+++ b/share/functions/cd.fish
@@ -4,7 +4,7 @@
 function cd --description "Change directory"
     set -l MAX_DIR_HIST 25
 
-    if test (count $argv) -gt 1
+    if test (count $argv) -gt (test "$argv[1]" = "--" && echo 2 || echo 1)
         printf "%s\n" (_ "Too many args for cd command")
         return 1
     end

From 3d1e9423c205410912041fd017a715aa89fe8ed4 Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Tue, 8 Oct 2019 21:29:48 +0200
Subject: [PATCH 1040/1732] cd: Add test for changing to a dir starting with a
 `-` char

---
 tests/cd.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/cd.in b/tests/cd.in
index d52c2e46d..6ea2c0289 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -76,6 +76,12 @@ set -g CDPATH ./
 cd $base
 test $PWD = $base; and echo No crash with ./ CDPATH
 
+# test for directories beginning with a hyphen
+mkdir $base/-testdir
+cd $base
+cd -- -testdir
+test $PWD = $base/-testdir
+
 # cd back before removing the test directory again.
 cd $oldpwd
 rm -Rf $base

From 15ed682bfae5fafb0ead001da511085349bbf485 Mon Sep 17 00:00:00 2001
From: Aaron Miller <acmiller273@gmail.com>
Date: Thu, 10 Oct 2019 12:09:26 -0400
Subject: [PATCH 1041/1732] Fix options after --argument-names to function
 (#6188)

This stops reading argument names after another option appears. It does not break any previous uses and in fact fixes uses like

```fish
function foo --argument-names bar --description baz
```

* `function` command handles options after argument names (Fixes #6186)

* Removed unneccesary test
---
 src/builtin_function.cpp   | 17 +++++++++++++++--
 tests/checks/function.fish | 10 ----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 7ba5c9c06..3012e8832 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -35,9 +35,9 @@ struct function_cmd_opts_t {
     wcstring_list_t wrap_targets;
 };
 
-// This command is atypical in using the "+" (REQUIRE_ORDER) option for flag parsing.
+// This command is atypical in using the "-" (RETURN_IN_ORDER) option for flag parsing.
 // This is needed due to the semantics of the -a/--argument-names flag.
-static const wchar_t *const short_options = L"+:a:d:e:hj:p:s:v:w:SV:";
+static const wchar_t *const short_options = L"-:a:d:e:hj:p:s:v:w:SV:";
 static const struct woption long_options[] = {{L"description", required_argument, NULL, 'd'},
                                               {L"on-signal", required_argument, NULL, 's'},
                                               {L"on-job-exit", required_argument, NULL, 'j'},
@@ -56,8 +56,20 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
     const wchar_t *cmd = L"function";
     int opt;
     wgetopter_t w;
+    bool handling_named_arguments = false;
     while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+        if (opt != 'a' && opt != 1) handling_named_arguments = false;
         switch (opt) {
+            case 1: {
+                if (handling_named_arguments) {
+                    opts.named_arguments.push_back(w.woptarg);
+                    break;
+                } else {
+                    streams.err.append_format(_(L"%ls: Unexpected positional argument '%ls'"), cmd,
+                                              w.woptarg);
+                    return STATUS_INVALID_ARGS;
+                }
+            }
             case 'd': {
                 opts.description = w.woptarg;
                 break;
@@ -122,6 +134,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                 break;
             }
             case 'a': {
+                handling_named_arguments = true;
                 opts.named_arguments.push_back(w.woptarg);
                 break;
             }
diff --git a/tests/checks/function.fish b/tests/checks/function.fish
index 58a7d99a5..5d6a22be1 100644
--- a/tests/checks/function.fish
+++ b/tests/checks/function.fish
@@ -2,13 +2,3 @@
 function t --argument-names a b c
     echo t
 end
-
-function t2 --argument-names a b c --no-scope-shadowing
-    echo t2
-end
-#CHECKERR: {{.*/?}}function.fish (line {{\d+}}): function: Variable name '--no-scope-shadowing' is not valid. See `help identifiers`.
-#CHECKERR: function t2 --argument-names a b c --no-scope-shadowing
-#CHECKERR: ^
-
-functions -q t2 && echo exists || echo does not exist
-#CHECK: does not exist

From 8c5aca599f92b08b97e72160c8631c2e675d8ae3 Mon Sep 17 00:00:00 2001
From: aca <acadx0@gmail.com>
Date: Wed, 9 Oct 2019 00:47:17 +0900
Subject: [PATCH 1042/1732] completions/fzf: completion for fzf

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

diff --git a/share/completions/fzf.fish b/share/completions/fzf.fish
new file mode 100644
index 000000000..bfdd62795
--- /dev/null
+++ b/share/completions/fzf.fish
@@ -0,0 +1,72 @@
+complete -c fzf -f
+
+# Search mode
+complete -c fzf -l no-extended -d 'no-extended'
+complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +x -d 'no-extended'
+complete -c fzf -s e -l --exact -d 'Enable exact-match'
+complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +i -d 'case-sensitive match'
+complete -c fzf -s i -d 'Case-insensitive match'
+complete -c fzf -l literal -d 'Do not normalize latin script letters for matching'
+complete -c fzf -l algo -d 'Fuzzy matching algorithm' -x -a 'v1 v2'
+complete -c fzf -s n -l nth -d 'Comma-separated list of field index expressions for limiting search scope' -x
+complete -c fzf -l with-nth -d 'Transform the presentation of each line using field index expressions' -x
+complete -c fzf -s d -l delimiter -d 'Field delimiter regex for --nth and --with-nth' -x
+
+# Search result
+complete -c fzf -l no-sort -d 'Do not sort the result'
+complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +s -d 'Do not sort the result'
+complete -c fzf -l tac -d 'Reverse the order of the input'
+complete -c fzf -l tiebreak -d 'Comma-separated list of sort criteria to apply when the scores are tied.' -x
+
+# Interface
+complete -c fzf -s m -l multi -d 'Enable multi-select with tab/shift-tab'
+complete -c fzf -l no-multi -d 'Disable multi-select'
+complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +m -d 'Disable multi-select'
+complete -c fzf -l no-mouse -d  'Disable mouse'
+complete -c fzf -l bind -d  'Comma-separated list of custom key bindings' -x
+complete -c fzf -l cycle -d 'Enable cyclic scroll'
+complete -c fzf -l no-hscroll -d 'Disable horizontal scroll'
+complete -c fzf -l hscroll-off -d 'Number of screen columns to keep to the right of the highlighted substring' -x
+complete -c fzf -l filepath-word -d 'Make word-wise movements and actions respect path separators'
+complete -c fzf -l jump-labels  -d 'Make word-wise movements and actions respect path separators' -x
+
+# layout
+complete -c fzf -l height -d 'Display fzf window below the cursor with the given height instead of using the full screen' -x
+complete -c fzf -l min-height -d 'Minimum height when --height is given in percent (default: 10)' -x
+complete -c fzf -l layout -d 'Choose the layout' -x -a 'default reverse reverse-list'
+complete -c fzf -l reverse -d 'A synonym for --layout=reverse'
+complete -c fzf -l border -d 'Draw border above and below the finder'
+complete -c fzf -l no-unicode -d 'Use ASCII characters instead of Unicode box drawing characters to draw border'
+complete -c fzf -l margin -d 'Comma-separated expression for margins around the finder'
+complete -c fzf -l inline-info -d 'Display finder info inline with the query '
+complete -c fzf -l prompt -d 'Input prompt' -x
+complete -c fzf -l header -d 'The  given  string  will be printed as the sticky header' -x
+complete -c fzf -l header-lines -d 'The first N lines of the input are treated as the sticky header' -x
+
+# Display
+complete -c fzf -l ansi -d 'Enable processing of ANSI color codes'
+complete -c fzf -l tabstop -d 'Number of spaces for a tab character (default: 8)'
+complete -c fzf -l color -d 'Color configuration' -x
+complete -c fzf -l no-bold -d 'Do not use bold text'
+complete -c fzf -l black -d 'Use black background'
+
+# History
+complete -c fzf -l history -d 'Load search history from the specified file and update the file on completion' -x
+complete -c fzf -l history-size -d 'Maximum number of entries in the history file' -x
+
+# Preview
+complete -c fzf -l preview -d 'Execute the given command for the current line and display the result on the preview window' -x
+complete -c fzf -l preview-window -d 'Determine the layout of the preview window' -x
+
+# Scripting
+complete -c fzf -s q -l query -d 'Start the finder with the given query' -x
+complete -c fzf -s 1 -l select-1 -d 'Automatically select the only match'
+complete -c fzf -s 0 -l exit-0 -d 'Exit immediately when there\'s no match'
+complete -c fzf -s f -l filter -d 'Filter mode. Do not start interactive finder' -x
+complete -c fzf -l print-query -d 'Print query as the first line'
+complete -c fzf -l expect -d 'Comma-separated list of keys that can be used to complete fzf in addition to the default enter key' -x
+complete -c fzf -l read0 -d 'Read input delimited by ASCII NUL characters instead of newline characters'
+complete -c fzf -l print0 -d 'Print output delimited by ASCII NUL characters instead of newline characters'
+complete -c fzf -l no-clear -d 'Do not clear finder interface on exit'
+complete -c fzf -l sync -d 'Synchronous search for multi-staged filtering'
+complete -c fzf -l version -d 'Display version information and exit'

From 1f35b146de34c922b6d0ea5d10f055dafd691269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Martinez?= <clementmartinezdev@gmail.com>
Date: Tue, 8 Oct 2019 19:04:27 +0200
Subject: [PATCH 1043/1732] Add grub-mkrescue completions

---
 share/completions/grub-mkrescue.fish | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 share/completions/grub-mkrescue.fish

diff --git a/share/completions/grub-mkrescue.fish b/share/completions/grub-mkrescue.fish
new file mode 100644
index 000000000..3fb7f334a
--- /dev/null
+++ b/share/completions/grub-mkrescue.fish
@@ -0,0 +1,28 @@
+# grub-mkrescue makes GRUB CD-ROM, disk, pendrive and floppy bootable image.
+
+complete -c grub-mkrescue -l compress -a 'no\tNo\ compression xz\tXZ gz\tGZ lzo\tLZO' -x -d "Compress GRUB files"
+complete -c grub-mkrescue -l dtb -r -d "Embed a specific DTB"
+complete -c grub-mkrescue -l directory -s d -r -d "Use images and modules under given directory"
+complete -c grub-mkrescue -l fonts -r -d "Install given fonts"
+complete -c grub-mkrescue -l install-modules -r -d "Install only the given modules"
+complete -c grub-mkrescue -l pubkey -s k -r -d "Embed given file as public key for signature checking"
+complete -c grub-mkrescue -l locale-directory -r -d "Use translation under given directory"
+complete -c grub-mkrescue -l locales -r -d "Install only given locales"
+complete -c grub-mkrescue -l modules -r -d "Pre-load specified modules"
+complete -c grub-mkrescue -l theme -r -d "Install given theme"
+complete -c grub-mkrescue -l verbose -s v -d "Print verbose messages"
+complete -c grub-mkrescue -l arcs-boot -d "Enable ARCS boot"
+complete -c grub-mkrescue -l core-compress -x -a 'xz\tXZ\ compression none\tNo\ compression auto\tAuto' -d "Choose compression to use for core image"
+complete -c grub-mkrescue -l label-gbcolor -x -d "Use given color for label background"
+complete -c grub-mkrescue -l label-color -x -d "Use given color for label"
+complete -c grub-mkrescue -l label-font -r -d "Use given file font for label"
+complete -c grub-mkrescue -l output -s o -r -d "Save output in given file"
+complete -c grub-mkrescue -l product-name -x -d "Use given string as product name"
+complete -c grub-mkrescue -l product-version -x -d "Use given string as product version"
+complete -c grub-mkrescue -l rom-directory -r -d "Save ROM image in given directory"
+complete -c grub-mkrescue -l sparc-boot -d "Enable sparc boot"
+complete -c grub-mkrescue -l xorriso -r -d "Use given file as xorriso"
+complete -c grub-mkrescue -l help -s '?' -d "Show help"
+complete -c grub-mkrescue -l usage -d "Show short usage message"
+complete -c grub-mkrescue -l version -s V -d "Show program version"
+

From 09a97528a99ea7e449e7194c58e4ae4a99c078e2 Mon Sep 17 00:00:00 2001
From: Delapouite <delapouite@gmail.com>
Date: Wed, 9 Oct 2019 07:56:49 +0200
Subject: [PATCH 1044/1732] doc: add cross-refs between if and else commands

---
 sphinx_doc_src/cmds/else.rst | 2 +-
 sphinx_doc_src/cmds/if.rst   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/else.rst b/sphinx_doc_src/cmds/else.rst
index fb1622488..2355dafd4 100644
--- a/sphinx_doc_src/cmds/else.rst
+++ b/sphinx_doc_src/cmds/else.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``if`` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute. If it is not 0 and ``else`` is given, ``COMMANDS_FALSE`` will be executed.
+:ref:`if <cmd-if>` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute. If it is not 0 and ``else`` is given, ``COMMANDS_FALSE`` will be executed.
 
 
 Example
diff --git a/sphinx_doc_src/cmds/if.rst b/sphinx_doc_src/cmds/if.rst
index b80b4b067..6e2e178b4 100644
--- a/sphinx_doc_src/cmds/if.rst
+++ b/sphinx_doc_src/cmds/if.rst
@@ -16,7 +16,7 @@ Synopsis
 Description
 -----------
 
-``if`` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute.  If the exit status is not 0 and ``else`` is given, ``COMMANDS_FALSE`` will be executed.
+``if`` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute.  If the exit status is not 0 and :ref:`else <cmd-else>` is given, ``COMMANDS_FALSE`` will be executed.
 
 You can use :ref:`and <cmd-and>` or :ref:`or <cmd-or>` in the condition. See the second example below.
 

From d502ad2c253d931a1674909a4b402285e8c4a4cf Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Thu, 10 Oct 2019 11:15:04 -0700
Subject: [PATCH 1045/1732] Prefer using clr_eos to clear "remaining lines"

This is both more efficient than multiple clr_eol sequences,
and also works better with shell-integration.
---
 src/screen.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 5dc1ae83a..0568d4956 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -642,6 +642,8 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
     const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
+    if (scr->desired.line_count() < lines_with_stuff)
+        need_clear_screen = true;
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);
@@ -792,7 +794,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     }
 
     // Clear remaining lines (if any) if we haven't cleared the screen.
-    if (!has_cleared_screen && scr->desired.line_count() < lines_with_stuff && clr_eol) {
+    if (!has_cleared_screen && need_clear_screen && clr_eol) {
         s_set_color(scr, vars, highlight_spec_t{});
         for (size_t i = scr->desired.line_count(); i < lines_with_stuff; i++) {
             s_move(scr, 0, (int)i);

From 478f54c035bd80236e1e9774e9344b6099d34967 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Sat, 12 Oct 2019 19:33:08 -0700
Subject: [PATCH 1046/1732] Added PHPUnit shell completion

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

diff --git a/share/completions/phpunit.fish b/share/completions/phpunit.fish
new file mode 100644
index 000000000..44375ea04
--- /dev/null
+++ b/share/completions/phpunit.fish
@@ -0,0 +1,111 @@
+# Lists PHPUnit test suites
+function __fish_phpunit_list_suites
+    __fish_phpunit_list --list-suites
+end
+
+# Lists PHPUnit test groups
+function __fish_phpunit_list_groups
+    __fish_phpunit_list --list-groups
+end
+
+# Lists PHPUnit objects corresponding to the given option
+function __fish_phpunit_list --argument option
+    # Use the same PHPUnit binary as in the command being completed
+    set -l phpunit (commandline -o)[1]
+    test -x $phpunit
+    or return
+
+    $phpunit $option | tail -n +4 | string trim -c ' -'
+end
+
+# Code Coverage Options:
+complete -x -c phpunit -l coverage-clover -d 'Generate code coverage report in Clover XML format'
+complete -x -c phpunit -l coverage-crap4j -d 'Generate code coverage report in Crap4J XML format'
+complete -x -c phpunit -l coverage-html -d 'Generate code coverage report in HTML format'
+complete -x -c phpunit -l coverage-php -d 'Export PHP_CodeCoverage object to file'
+complete -x -c phpunit -l coverage-text -d 'Generate code coverage report in text format'
+complete -x -c phpunit -l coverage-xml -d 'Generate code coverage report in PHPUnit XML format'
+complete -x -c phpunit -l whitelist -d 'Whitelist <dir> for code coverage analysis'
+complete -f -c phpunit -l disable-coverage-ignore -d 'Disable annotations for ignoring code coverage'
+complete -f -c phpunit -l no-coverage -d 'Ignore code coverage configuration'
+complete -x -c phpunit -l dump-xdebug-filter -d 'Generate script to set Xdebug code coverage filter'
+
+# Logging Options:
+complete -x -c phpunit -l log-junit -d 'Log test execution in JUnit XML format to file'
+complete -x -c phpunit -l log-teamcity -d 'Log test execution in TeamCity format to file'
+complete -x -c phpunit -l testdox-html -d 'Write agile documentation in HTML format to file'
+complete -x -c phpunit -l testdox-text -d 'Write agile documentation in Text format to file'
+complete -x -c phpunit -l testdox-xml -d 'Write agile documentation in XML format to file'
+complete -f -c phpunit -l reverse-list -d 'Print defects in reverse order'
+
+# Test Selection Options:
+complete -x -c phpunit -l filter -d 'Filter which tests to run'
+complete -x -c phpunit -l testsuite -a '(__fish_phpunit_list_suites)' -d 'Filter which testsuite to run'
+complete -x -c phpunit -l group -a '(__fish_phpunit_list_groups)' -d 'Only runs tests from the specified group(s)'
+complete -f -c phpunit -l exclude-group -d 'Exclude tests from the specified group(s)'
+complete -f -c phpunit -l list-groups -d 'List available test groups'
+complete -f -c phpunit -l list-suites -d 'List available test suites'
+complete -f -c phpunit -l list-tests -d 'List available tests'
+complete -x -c phpunit -l list-tests-xml -d 'List available tests in XML format'
+complete -x -c phpunit -l test-suffix -d 'Only search for test in files with specified suffix(es). Default: Test.php,.phpt'
+
+# Test Execution Options:
+complete -f -c phpunit -l dont-report-useless-tests -d 'Do not report tests that do not test anything'
+complete -f -c phpunit -l strict-coverage -d 'Be strict about @covers annotation usage'
+complete -f -c phpunit -l strict-global-state -d 'Be strict about changes to global state'
+complete -f -c phpunit -l disallow-test-output -d 'Be strict about output during tests'
+complete -f -c phpunit -l disallow-resource-usage -d 'Be strict about resource usage during small tests'
+complete -f -c phpunit -l enforce-time-limit -d 'Enforce time limit based on test size'
+complete -f -c phpunit -l default-time-limit -d 'Timeout in seconds for tests without @small, @medium or @large'
+complete -f -c phpunit -l disallow-todo-tests -d 'Disallow @todo-annotated tests'
+
+complete -f -c phpunit -l process-isolation -d 'Run each test in a separate PHP process'
+complete -f -c phpunit -l globals-backup -d 'Backup and restore $GLOBALS for each test'
+complete -f -c phpunit -l static-backup -d 'Backup and restore static attributes for each test'
+
+complete -f -c phpunit -l colors -a 'never auto always' -d 'Use colors in output'
+complete -x -c phpunit -l columns -a 'max' -d 'Number of columns to use for progress output'
+complete -f -c phpunit -l stderr -d 'Write to STDERR instead of STDOUT'
+complete -f -c phpunit -l stop-on-defect -d 'Stop execution upon first not-passed test'
+complete -f -c phpunit -l stop-on-error -d 'Stop execution upon first error'
+complete -f -c phpunit -l stop-on-failure -d 'Stop execution upon first error or failure'
+complete -f -c phpunit -l stop-on-warning -d 'Stop execution upon first warning'
+complete -f -c phpunit -l stop-on-risky -d 'Stop execution upon first risky test'
+complete -f -c phpunit -l stop-on-skipped -d 'Stop execution upon first skipped test'
+complete -f -c phpunit -l stop-on-incomplete -d 'Stop execution upon first incomplete test'
+complete -f -c phpunit -l fail-on-warning -d 'Treat tests with warnings as failures'
+complete -f -c phpunit -l fail-on-risky -d 'Treat risky tests as failures'
+complete -f -c phpunit -s v -l verbose -d 'Output more verbose information'
+complete -f -c phpunit -l debug -d 'Display debugging information'
+
+complete -x -c phpunit -l loader -d 'TestSuiteLoader implementation to use'
+complete -x -c phpunit -l repeat -d 'Runs the test(s) repeatedly'
+complete -f -c phpunit -l teamcity -d 'Report test execution progress in TeamCity format'
+complete -f -c phpunit -l testdox -d 'Report test execution progress in TestDox format'
+complete -f -c phpunit -l testdox-group -d 'Only include tests from the specified group(s)'
+complete -f -c phpunit -l testdox-exclude-group -d 'Exclude tests from the specified group(s)'
+complete -x -c phpunit -l no-interaction -d 'Disable TestDox progress animation'
+complete -x -c phpunit -l printer -d 'TestListener implementation to use'
+
+complete -x -c phpunit -l order-by -a 'default defects duration no-depends random reverse size' -d 'Run tests in order'
+complete -x -c phpunit -l random-order-seed -d 'Use a specific random seed for random order'
+complete -f -c phpunit -l cache-result -d 'Write test results to cache file'
+complete -f -c phpunit -l do-not-cache-result -d 'Do not write test results to cache file'
+
+# Configuration Options:
+complete -x -c phpunit -l prepend -d 'A PHP script that is included as early as possible'
+complete -x -c phpunit -l bootstrap -d 'A PHP script that is included before the tests run'
+complete -x -c phpunit -s c -l configuration -d 'Read configuration from XML file'
+complete -f -c phpunit -l no-configuration -d 'Ignore default configuration file (phpunit.xml)'
+complete -f -c phpunit -l no-logging -d 'Ignore logging configuration'
+complete -f -c phpunit -l no-extensions -d 'Do not load PHPUnit extensions'
+complete -f -c phpunit -l include-path -d 'Prepend PHP\'s include_path with given path(s)'
+complete -x -c phpunit -s d -d 'Sets a php.ini value in the format key[=value]'
+complete -f -c phpunit -l generate-configuration -d 'Generate configuration file with suggested settings'
+complete -x -c phpunit -l cache-result-file -d 'Specify result cache path and filename'
+
+# Miscellaneous Options:
+complete -f -c phpunit -s h -l help -d 'Prints usage information'
+complete -f -c phpunit -l version -d 'Prints the version and exits'
+complete -x -c phpunit -l atleast-version -d 'Checks that version is greater than min and exits'
+complete -f -c phpunit -l check-version -d 'Check whether PHPUnit is the latest version'

From 39671e6b192ec094c82e9932e1579f891fea44f8 Mon Sep 17 00:00:00 2001
From: Andy <andys8@users.noreply.github.com>
Date: Sun, 13 Oct 2019 18:28:04 +0200
Subject: [PATCH 1047/1732] Fix ranger options: choosefile(s), choosedir

Source <https://github.com/ranger/ranger/blob/ee344c896e85f92f91d097a95e88ae4ead786c7b/ranger/core/main.py#L293-L303>
---
 share/completions/ranger.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/completions/ranger.fish b/share/completions/ranger.fish
index 3f5a9e45e..0c4de549e 100644
--- a/share/completions/ranger.fish
+++ b/share/completions/ranger.fish
@@ -2,9 +2,9 @@ complete -c ranger -s d -l debug -d "Activate debug mode"
 complete -c ranger -s c -l clean -d "Activate clean mode"
 complete -c ranger -s r -l confdir -d "Change configuration directory"
 complete -c ranger -l copy-config -x -d "Create copies of the default configuration" -a "all commands commands_full rc rifle scope"
-complete -c ranger -l chosefile -r -d "Pick file with ranger"
-complete -c ranger -l chosefiles -r -d "Pick multiple files with ranger"
-complete -c ranger -l chosedir -r -d "Pick directory"
+complete -c ranger -l choosefile -r -d "Pick file with ranger"
+complete -c ranger -l choosefiles -r -d "Pick multiple files with ranger"
+complete -c ranger -l choosedir -r -d "Pick directory"
 complete -c ranger -l selectfile -r -d "Open ranger with given file selected"
 complete -c ranger -l list-unused-keys -d "List common keys which are not bound"
 complete -c ranger -l list-tagged-files -f -d "List all tagged files with given tag (default *)"

From e73e9c3e2ed146c7fe012eb840eb845c86b1b571 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 13 Oct 2019 15:45:02 -0700
Subject: [PATCH 1048/1732] Ensure that clang-format places config.h first in
 header list

---
 .clang-format | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.clang-format b/.clang-format
index c540053d5..0243776b3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -6,5 +6,11 @@
 BasedOnStyle: Google
 ColumnLimit: 100
 IndentWidth: 4
+
+# Place config.h first always.
+IncludeCategories:
+  - Regex: '^"config.h"'
+    Priority: -1
+
 # We don't want OCLint pragmas to be reformatted.
 CommentPragmas: '^!OCLINT'

From 82eca4bc867204fe87b4efbf5ec73feb215d97fb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 13 Oct 2019 15:50:48 -0700
Subject: [PATCH 1049/1732] Run clang-format on all files

The main change here is to reorder headers.
---
 src/autoload.h               |  8 ++++----
 src/builtin.cpp              |  7 ++++---
 src/builtin_argparse.cpp     |  5 +++--
 src/builtin_bg.cpp           |  3 ++-
 src/builtin_bind.cpp         |  3 ++-
 src/builtin_block.cpp        |  3 ++-
 src/builtin_builtin.cpp      |  3 ++-
 src/builtin_cd.cpp           |  3 ++-
 src/builtin_command.cpp      |  3 ++-
 src/builtin_commandline.cpp  |  1 +
 src/builtin_complete.cpp     |  6 +++---
 src/builtin_complete.h       |  3 +--
 src/builtin_contains.cpp     |  4 +++-
 src/builtin_disown.cpp       |  3 ++-
 src/builtin_echo.cpp         |  3 ++-
 src/builtin_emit.cpp         |  3 ++-
 src/builtin_exit.cpp         |  3 ++-
 src/builtin_fg.cpp           |  4 +++-
 src/builtin_function.cpp     |  3 ++-
 src/builtin_functions.cpp    |  8 +++++---
 src/builtin_history.cpp      |  5 +++--
 src/builtin_jobs.h           |  3 +--
 src/builtin_math.cpp         |  8 ++++----
 src/builtin_printf.cpp       |  1 +
 src/builtin_printf.h         |  3 +--
 src/builtin_pwd.cpp          |  3 ++-
 src/builtin_random.cpp       |  5 +++--
 src/builtin_read.cpp         |  7 ++++---
 src/builtin_realpath.cpp     |  4 +++-
 src/builtin_return.cpp       |  3 ++-
 src/builtin_set.cpp          |  4 ++--
 src/builtin_set.h            |  3 +--
 src/builtin_set_color.cpp    |  2 +-
 src/builtin_set_color.h      |  3 +--
 src/builtin_source.cpp       |  4 +++-
 src/builtin_status.cpp       |  7 ++++---
 src/builtin_string.cpp       |  2 +-
 src/builtin_string.h         |  3 +--
 src/builtin_test.cpp         |  7 ++++---
 src/builtin_ulimit.h         |  3 +--
 src/builtin_wait.cpp         |  7 ++++---
 src/builtin_wait.h           |  1 +
 src/color.cpp                |  4 +++-
 src/color.h                  |  1 -
 src/common.cpp               |  1 +
 src/complete.cpp             |  5 +++--
 src/complete.h               |  1 -
 src/env.cpp                  |  3 ++-
 src/env_dispatch.cpp         |  2 ++
 src/env_dispatch.h           |  4 ++--
 src/env_universal_common.cpp |  3 ++-
 src/event.cpp                |  3 ++-
 src/exec.cpp                 |  4 ++--
 src/expand.cpp               |  1 +
 src/fallback.cpp             |  4 +++-
 src/fallback.h               |  4 ++--
 src/fish.cpp                 |  2 +-
 src/fish_indent.cpp          |  2 +-
 src/fish_key_reader.cpp      |  2 +-
 src/fish_tests.cpp           |  6 +++---
 src/flog.cpp                 |  6 +++---
 src/flog.h                   |  5 +++--
 src/function.cpp             |  2 +-
 src/future_feature_flags.cpp |  3 ++-
 src/future_feature_flags.h   |  1 +
 src/global_safety.h          |  4 ++--
 src/highlight.cpp            |  2 +-
 src/history.cpp              |  1 +
 src/history_file.cpp         |  3 ++-
 src/history_file.h           |  4 ++--
 src/input.cpp                |  1 +
 src/input_common.cpp         |  3 ++-
 src/input_common.h           |  7 ++++---
 src/intern.cpp               |  5 +++--
 src/io.cpp                   |  4 +++-
 src/iothread.cpp             |  7 ++++---
 src/iothread.h               |  1 +
 src/kill.cpp                 |  1 +
 src/lru.h                    |  1 -
 src/output.cpp               |  3 ++-
 src/pager.cpp                |  2 +-
 src/parse_constants.h        |  3 ++-
 src/parse_execution.cpp      |  8 +++++---
 src/parse_grammar.h          |  1 +
 src/parse_productions.cpp    |  3 ++-
 src/parse_tree.cpp           |  5 +++--
 src/parse_util.cpp           |  5 +++--
 src/parser.cpp               |  5 +++--
 src/parser_keywords.cpp      |  3 ++-
 src/path.cpp                 |  5 +++--
 src/postfork.cpp             |  1 +
 src/print_help.cpp           |  4 +++-
 src/proc.cpp                 |  1 +
 src/reader.cpp               |  8 +++++---
 src/redirection.cpp          |  3 ++-
 src/redirection.h            |  4 ++--
 src/sanity.cpp               |  3 ++-
 src/screen.cpp               | 25 ++++++++++++-------------
 src/screen.h                 |  2 +-
 src/tinyexpr.cpp             |  5 +++--
 src/tokenizer.cpp            |  5 +++--
 src/topic_monitor.cpp        |  7 ++++---
 src/topic_monitor.h          |  8 ++++----
 src/utf8.cpp                 |  3 ++-
 src/util.cpp                 |  6 ++++--
 src/wcstringutil.cpp         |  3 ++-
 src/wgetopt.cpp              |  1 +
 src/wildcard.cpp             |  5 +++--
 src/wutil.cpp                |  3 ++-
 src/wutil.h                  |  1 +
 110 files changed, 250 insertions(+), 171 deletions(-)

diff --git a/src/autoload.h b/src/autoload.h
index 3a17538fd..64efce9c4 100644
--- a/src/autoload.h
+++ b/src/autoload.h
@@ -4,15 +4,15 @@
 
 #include "config.h"  // IWYU pragma: keep
 
-#include "common.h"
-#include "env.h"
-#include "wutil.h"
-
 #include <cassert>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
 
+#include "common.h"
+#include "env.h"
+#include "wutil.h"
+
 class autoload_file_cache_t;
 class environment_t;
 class parser_t;
diff --git a/src/builtin.cpp b/src/builtin.cpp
index fd6b51331..0d7ecc7f2 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -17,17 +17,18 @@
 // 4). Use 'git add sphinx_doc_src/NAME.txt' to start tracking changes to the documentation file.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <cstring>
-#include <cwchar>
 
 #include <algorithm>
+#include <cstring>
+#include <cwchar>
 #include <memory>
 #include <string>
 
-#include "builtin.h"
 #include "builtin_argparse.h"
 #include "builtin_bg.h"
 #include "builtin_bind.h"
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index b6c4405c6..4d482773e 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -3,12 +3,14 @@
 // See issue #4190 for the rationale behind the original behavior of this builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_argparse.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ -16,7 +18,6 @@
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_argparse.h"
 #include "common.h"
 #include "env.h"
 #include "exec.h"
diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index b2d8f3aae..60bc11bb4 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -1,6 +1,8 @@
 // Implementation of the bg builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_bg.h"
+
 #include <errno.h>
 #include <stdlib.h>
 
@@ -8,7 +10,6 @@
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_bg.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 035949623..477e15075 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -1,6 +1,8 @@
 // Implementation of the bind builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_bind.h"
+
 #include <errno.h>
 #include <stddef.h>
 
@@ -10,7 +12,6 @@
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_bind.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "input.h"     // IWYU pragma: keep
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index dfe8ef046..b42487dd3 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -1,10 +1,11 @@
 // Implementation of the bind builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_block.h"
+
 #include <stddef.h>
 
 #include "builtin.h"
-#include "builtin_block.h"
 #include "common.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index c27eeae35..dd8391c8a 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -1,12 +1,13 @@
 // Implementation of the builtin builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin.h"
+
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
 
-#include "builtin.h"
 #include "builtin_builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index ae34ceb12..7599e5cd3 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -1,12 +1,13 @@
 // Implementation of the cd builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_cd.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
 #include "builtin.h"
-#include "builtin_cd.h"
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_command.cpp b/src/builtin_command.cpp
index 28a98c1ad..b13fdd390 100644
--- a/src/builtin_command.cpp
+++ b/src/builtin_command.cpp
@@ -1,12 +1,13 @@
 // Implementation of the command builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_command.h"
+
 #include <unistd.h>
 
 #include <string>
 
 #include "builtin.h"
-#include "builtin_command.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 9e7db57e0..0c849612b 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
+
 #include <cwchar>
 
 #include "builtin.h"
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index abb5ecd63..19fcd435c 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -2,23 +2,23 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stddef.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "builtin.h"
+#include "color.h"
 #include "common.h"
 #include "complete.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "highlight.h"
 #include "io.h"
 #include "parse_constants.h"
 #include "parse_util.h"
 #include "parser.h"
-#include "highlight.h"
-#include "color.h"
 #include "reader.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
diff --git a/src/builtin_complete.h b/src/builtin_complete.h
index 7cbaccd5b..f69d98356 100644
--- a/src/builtin_complete.h
+++ b/src/builtin_complete.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_COMPLETE_H
 #define FISH_BUILTIN_COMPLETE_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_contains.cpp b/src/builtin_contains.cpp
index 2589f2dce..289b04645 100644
--- a/src/builtin_contains.cpp
+++ b/src/builtin_contains.cpp
@@ -1,11 +1,13 @@
 // Implementation of the contains builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_contains.h"
+
 #include <unistd.h>
+
 #include <cwchar>
 
 #include "builtin.h"
-#include "builtin_contains.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 622d1373f..d8e568ec9 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -1,13 +1,14 @@
 // Implementation of the disown builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_disown.h"
+
 #include <errno.h>
 #include <signal.h>
 
 #include <set>
 
 #include "builtin.h"
-#include "builtin_disown.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_echo.cpp b/src/builtin_echo.cpp
index cbd7949e0..cb5b9f891 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtin_echo.cpp
@@ -1,11 +1,12 @@
 // Implementation of the echo builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_echo.h"
+
 #include <limits.h>
 #include <stddef.h>
 
 #include "builtin.h"
-#include "builtin_echo.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_emit.cpp b/src/builtin_emit.cpp
index 46045ef5c..8ef33a320 100644
--- a/src/builtin_emit.cpp
+++ b/src/builtin_emit.cpp
@@ -1,8 +1,9 @@
 // Implementation of the emit builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include "builtin.h"
 #include "builtin_emit.h"
+
+#include "builtin.h"
 #include "common.h"
 #include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 853b83cf0..e747f10ae 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -1,11 +1,12 @@
 // Implementation of the exit builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_exit.h"
+
 #include <errno.h>
 #include <stddef.h>
 
 #include "builtin.h"
-#include "builtin_exit.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 7e24477a0..072e038a2 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -1,13 +1,15 @@
 // Implementation of the fg builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_fg.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cwchar>
 
 #include "builtin.h"
-#include "builtin_fg.h"
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 3012e8832..415778880 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -1,6 +1,8 @@
 // Implementation of the function builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_function.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -11,7 +13,6 @@
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_function.h"
 #include "common.h"
 #include "complete.h"
 #include "event.h"
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index b871bff9e..8d8ccfe22 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -1,11 +1,13 @@
 // Implementation of the functions builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_functions.h"
+
 #include <stddef.h>
 #include <unistd.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <map>
 #include <memory>
 #include <string>
@@ -13,7 +15,6 @@
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_functions.h"
 #include "common.h"
 #include "complete.h"
 #include "env.h"
@@ -266,7 +267,8 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
             append_format(comment, L"# Defined in %ls @ line %d\n", path, line_number);
             if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
                 std::vector<highlight_spec_t> colors;
-                highlight_shell_no_io(comment, colors, comment.size(), nullptr, env_stack_t::globals());
+                highlight_shell_no_io(comment, colors, comment.size(), nullptr,
+                                      env_stack_t::globals());
                 streams.out.append(str2wcstring(colorize(comment, colors)));
             } else {
                 streams.out.append(comment);
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 661dc50b0..70d68da61 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -1,16 +1,17 @@
 // Implementation of the history builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_history.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <string>
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_history.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "history.h"
diff --git a/src/builtin_jobs.h b/src/builtin_jobs.h
index 7f6babbf9..adb3cfba0 100644
--- a/src/builtin_jobs.h
+++ b/src/builtin_jobs.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_JOBS_H
 #define FISH_BUILTIN_JOBS_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index ebe3918af..b2d1e11fb 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -1,22 +1,22 @@
 // Implementation of the math builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_math.h"
+
 #include <errno.h>
 #include <stddef.h>
-#include <cstring>
 
 #include <algorithm>
 #include <cmath>
+#include <cstring>
 #include <limits>
 #include <string>
 
-#include "tinyexpr.h"
-
 #include "builtin.h"
-#include "builtin_math.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
+#include "tinyexpr.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 55c4be7b6..d722dd4e7 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -59,6 +59,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <wctype.h>
+
 #include <cstring>
 #include <cwchar>
 
diff --git a/src/builtin_printf.h b/src/builtin_printf.h
index b0608cbb5..4248d9785 100644
--- a/src/builtin_printf.h
+++ b/src/builtin_printf.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_PRINTF_H
 #define FISH_BUILTIN_PRINTF_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_pwd.cpp b/src/builtin_pwd.cpp
index 143bc6e8c..328cec5d7 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtin_pwd.cpp
@@ -1,10 +1,11 @@
 // Implementation of the pwd builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_pwd.h"
+
 #include <cstring>
 
 #include "builtin.h"
-#include "builtin_pwd.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index d6cfbb602..f97a63914 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -1,15 +1,16 @@
 // Implementation of the random builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_random.h"
+
 #include <errno.h>
 #include <stdint.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <random>
 
 #include "builtin.h"
-#include "builtin_random.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 94e831f2d..0fd657305 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -1,23 +1,24 @@
 // Implementation of the read builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_read.h"
+
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <cstring>
-#include <cwchar>
 
 #include <algorithm>
+#include <cstring>
+#include <cwchar>
 #include <memory>
 #include <numeric>
 #include <string>
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_read.h"
 #include "common.h"
 #include "complete.h"
 #include "env.h"
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 98f51234c..bd4118805 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -1,13 +1,15 @@
 // Implementation of the realpath builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_realpath.h"
+
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cstring>
 #include <cwchar>
 
 #include "builtin.h"
-#include "builtin_realpath.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index ec6fd5739..0debc5ca5 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -1,11 +1,12 @@
 // Implementation of the return builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_return.h"
+
 #include <errno.h>
 #include <stddef.h>
 
 #include "builtin.h"
-#include "builtin_return.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 996a5b9d7..5b8c06fea 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -6,10 +6,10 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <cstring>
-#include <cwchar>
 
 #include <algorithm>
+#include <cstring>
+#include <cwchar>
 #include <iterator>
 #include <memory>
 #include <set>
diff --git a/src/builtin_set.h b/src/builtin_set.h
index af930ad23..ffd517da3 100644
--- a/src/builtin_set.h
+++ b/src/builtin_set.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_SET_H
 #define FISH_BUILTIN_SET_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index cb1bfcfdb..f84e33fac 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -43,7 +43,7 @@ static void print_colors(io_streams_t &streams) {
         }
         outp.writestr(color_name);
         outp.writech(L'\n');
-    } // conveniently, 'normal' is always the last color so we don't need to reset here
+    }  // conveniently, 'normal' is always the last color so we don't need to reset here
 
     streams.out.append(str2wcstring(outp.contents()));
 }
diff --git a/src/builtin_set_color.h b/src/builtin_set_color.h
index f35d57936..87ae3e37f 100644
--- a/src/builtin_set_color.h
+++ b/src/builtin_set_color.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_SET_COLOR_H
 #define FISH_BUILTIN_SET_COLOR_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 8f4b4f14b..aec69ffef 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -1,13 +1,15 @@
 // Implementation of the source builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin_source.h"
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include <cwchar>
 
 #include "builtin.h"
-#include "builtin_source.h"
 #include "common.h"
 #include "env.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 25fe787cf..28b8e0489 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -1,13 +1,14 @@
 // Implementation of the status builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <stddef.h>
-#include <cwchar>
+#include "builtin_status.h"
 
+#include <stddef.h>
+
+#include <cwchar>
 #include <string>
 
 #include "builtin.h"
-#include "builtin_status.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 3b4b17b6a..b3d1663ef 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -12,9 +12,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <cwctype>
 #include <iterator>
 #include <memory>
diff --git a/src/builtin_string.h b/src/builtin_string.h
index 22dcfb28e..ce139a6f0 100644
--- a/src/builtin_string.h
+++ b/src/builtin_string.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_STRING_H
 #define FISH_BUILTIN_STRING_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 1e0245f8b..db74fceae 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -3,22 +3,23 @@
 // Implemented from scratch (yes, really) by way of IEEE 1003.1 as reference.
 #include "config.h"  // IWYU pragma: keep
 
+#include "builtin.h"
+
 #include <errno.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cstring>
-#include <cwchar>
 
 #include <cmath>
+#include <cstring>
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <utility>
 
-#include "builtin.h"
 #include "common.h"
 #include "io.h"
 #include "parser.h"
diff --git a/src/builtin_ulimit.h b/src/builtin_ulimit.h
index 54de72642..19c9348e5 100644
--- a/src/builtin_ulimit.h
+++ b/src/builtin_ulimit.h
@@ -2,9 +2,8 @@
 #ifndef FISH_BUILTIN_ULIMIT_H
 #define FISH_BUILTIN_ULIMIT_H
 
-#include <cwchar>
-
 #include <cstring>
+#include <cwchar>
 
 class parser_t;
 
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index beeafb1bc..a8b39b9ce 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -1,9 +1,12 @@
 // Functions for waiting for processes completed.
+#include "builtin_wait.h"
+
+#include <sys/wait.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "builtin.h"
-#include "builtin_wait.h"
 #include "common.h"
 #include "parser.h"
 #include "proc.h"
@@ -11,8 +14,6 @@
 #include "wgetopt.h"
 #include "wutil.h"
 
-#include <sys/wait.h>
-
 /// Return the job id to which the process with pid belongs.
 /// If a specified process has already finished but the job hasn't, parser_t::job_get_from_pid()
 /// doesn't work properly, so use this function in wait command.
diff --git a/src/builtin_wait.h b/src/builtin_wait.h
index a57e7fb40..d0444c34b 100644
--- a/src/builtin_wait.h
+++ b/src/builtin_wait.h
@@ -3,6 +3,7 @@
 #define FISH_BUILTIN_WAIT_H
 
 class parser_t;
+struct io_streams_t;
 
 int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv);
 #endif
diff --git a/src/color.cpp b/src/color.cpp
index e27545b92..30e1dfdfb 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -1,12 +1,14 @@
 // Color class implementation.
 #include "config.h"  // IWYU pragma: keep
 
+#include "color.h"
+
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <cwchar>  // IWYU pragma: keep
 
-#include "color.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 
diff --git a/src/color.h b/src/color.h
index 02d98e80a..a53d79bf2 100644
--- a/src/color.h
+++ b/src/color.h
@@ -3,7 +3,6 @@
 #define FISH_COLOR_H
 
 #include <cstring>
-
 #include <string>
 
 #include "common.h"
diff --git a/src/common.cpp b/src/common.cpp
index 85c8b2ce9..fbb81a7c0 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -19,6 +19,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <wctype.h>
+
 #include <cstring>
 #include <cwchar>
 #ifdef HAVE_EXECINFO_H
diff --git a/src/complete.cpp b/src/complete.cpp
index ce95bb211..4d78260fc 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -5,15 +5,17 @@
 ///
 #include "config.h"  // IWYU pragma: keep
 
+#include "complete.h"
+
 #include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <algorithm>
 #include <atomic>
 #include <cstddef>
+#include <cwchar>
 #include <functional>
 #include <iterator>
 #include <list>
@@ -29,7 +31,6 @@
 #include "autoload.h"
 #include "builtin.h"
 #include "common.h"
-#include "complete.h"
 #include "env.h"
 #include "exec.h"
 #include "expand.h"
diff --git a/src/complete.h b/src/complete.h
index 90ad580d4..cdf49240a 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "common.h"
-
 #include "enum_set.h"
 
 struct completion_mode_t {
diff --git a/src/env.cpp b/src/env.cpp
index 8f6b21b06..7bf5f3523 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1,6 +1,8 @@
 // Functions for setting and getting environment variables.
 #include "config.h"  // IWYU pragma: keep
 
+#include "env.h"
+
 #include <errno.h>
 #include <pwd.h>
 #include <stddef.h>
@@ -18,7 +20,6 @@
 
 #include "builtin_bind.h"
 #include "common.h"
-#include "env.h"
 #include "env_dispatch.h"
 #include "env_universal_common.h"
 #include "event.h"
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 1fec8e7c8..424b44bad 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
 
@@ -25,6 +26,7 @@
 #endif
 
 #include <assert.h>
+
 #include <algorithm>
 #include <functional>
 #include <memory>
diff --git a/src/env_dispatch.h b/src/env_dispatch.h
index 6105d1a8e..4ff5d1b3f 100644
--- a/src/env_dispatch.h
+++ b/src/env_dispatch.h
@@ -4,11 +4,11 @@
 
 #include "config.h"  // IWYU pragma: keep
 
+#include <memory>
+
 #include "common.h"
 #include "env_universal_common.h"
 
-#include <memory>
-
 /// Initialize variable dispatch.
 class environment_t;
 void env_dispatch_init(const environment_t &vars);
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index b9bdb20bf..122a0a16c 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
+
 #include <cstring>
 #ifdef __CYGWIN__
 #include <sys/mman.h>
@@ -28,9 +29,9 @@
 #include <sys/time.h>   // IWYU pragma: keep
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
-#include <cwchar>
 
 #include <atomic>
+#include <cwchar>
 #include <map>
 #include <string>
 #include <type_traits>
diff --git a/src/event.cpp b/src/event.cpp
index cda927517..5e760f139 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,6 +1,8 @@
 // Functions for handling event triggers.
 #include "config.h"  // IWYU pragma: keep
 
+#include "event.h"
+
 #include <signal.h>
 #include <stddef.h>
 #include <unistd.h>
@@ -13,7 +15,6 @@
 #include <type_traits>
 
 #include "common.h"
-#include "event.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "input_common.h"
 #include "io.h"
diff --git a/src/exec.cpp b/src/exec.cpp
index 48c39c7ea..2a9957e33 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -16,13 +16,13 @@
 #include <stdio.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <cstring>
-#include <stack>
 
 #include <algorithm>
+#include <cstring>
 #include <functional>
 #include <map>
 #include <memory>
+#include <stack>
 #include <string>
 #include <type_traits>
 #include <vector>
diff --git a/src/expand.cpp b/src/expand.cpp
index 5f0b362c6..c363bcbba 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <wctype.h>
+
 #include <cstring>
 #include <cwchar>
 
diff --git a/src/fallback.cpp b/src/fallback.cpp
index 7eaaa90dd..fc5818884 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -18,6 +18,7 @@
 #include <sys/types.h>  // IWYU pragma: keep
 #include <unistd.h>
 #include <wctype.h>
+
 #include <algorithm>
 #include <cstring>
 #include <cwchar>
@@ -37,7 +38,8 @@
 #include <ncurses/term.h>
 #endif
 #include <signal.h>  // IWYU pragma: keep
-#include <cwchar>    // IWYU pragma: keep
+
+#include <cwchar>  // IWYU pragma: keep
 
 #include "common.h"    // IWYU pragma: keep
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/fallback.h b/src/fallback.h
index c84987d61..855bf4616 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -92,8 +92,8 @@ wchar_t *wcsdup(const wchar_t *in);
 int wcscasecmp(const wchar_t *a, const wchar_t *b);
 int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n);
 wchar_t *wcsndup(const wchar_t *in, size_t c);
-#endif // clang::weak_import
-#else  // __APPLE__
+#endif  // clang::weak_import
+#else   // __APPLE__
 
 /// These functions are missing from Solaris 10, and only accessible from
 /// Solaris 11 in the std:: namespace.
diff --git a/src/fish.cpp b/src/fish.cpp
index 3db9d58f2..959ed36d7 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
-
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 0d77e26ae..7e228807e 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include <stdio.h>
 #include <stdlib.h>
 #include <wctype.h>
-#include <cstring>
 
+#include <cstring>
 #include <cwchar>
 #include <memory>
 #include <stack>
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 02da91547..1b49de34c 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -16,9 +16,9 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
-
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 6c7f0565c..e5837704e 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -24,18 +24,18 @@
 #include <time.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cstring>
-#include <cwchar>
-#include <thread>
 
 #include <algorithm>
 #include <array>
 #include <atomic>
 #include <cmath>
+#include <cstring>
+#include <cwchar>
 #include <functional>
 #include <memory>
 #include <set>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/src/flog.cpp b/src/flog.cpp
index 89ef71bc0..ce25a1b7a 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -2,15 +2,15 @@
 #include "config.h"
 
 #include "flog.h"
-#include "global_safety.h"
+
+#include <vector>
 
 #include "common.h"
 #include "enum_set.h"
+#include "global_safety.h"
 #include "parse_util.h"
 #include "wildcard.h"
 
-#include <vector>
-
 namespace flog_details {
 
 // Note we are relying on the order of global initialization within this file.
diff --git a/src/flog.h b/src/flog.h
index de334a388..4f417e3c5 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -4,13 +4,14 @@
 
 #include "config.h"  // IWYU pragma: keep
 
-#include "global_safety.h"
-
 #include <stdio.h>
+
 #include <string>
 #include <type_traits>
 #include <utility>
 
+#include "global_safety.h"
+
 using wcstring = std::wstring;
 using wcstring_list_t = std::vector<wcstring>;
 
diff --git a/src/function.cpp b/src/function.cpp
index 60bb58e1f..0e220eee2 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -8,9 +8,9 @@
 #include <dirent.h>
 #include <pthread.h>
 #include <stddef.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <map>
 #include <memory>
 #include <string>
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index b2831a30f..fd90cd5eb 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -1,8 +1,9 @@
 #include "config.h"  // IWYU pragma: keep
 
-#include <cwchar>
 #include "future_feature_flags.h"
 
+#include <cwchar>
+
 /// The set of features applying to this instance.
 static features_t global_features;
 
diff --git a/src/future_feature_flags.h b/src/future_feature_flags.h
index 822c127ee..bfc393160 100644
--- a/src/future_feature_flags.h
+++ b/src/future_feature_flags.h
@@ -3,6 +3,7 @@
 #define FISH_FUTURE_FEATURE_FLAGS_H
 
 #include <assert.h>
+
 #include <unordered_map>
 
 #include "common.h"
diff --git a/src/global_safety.h b/src/global_safety.h
index 4121d6190..b0a74320c 100644
--- a/src/global_safety.h
+++ b/src/global_safety.h
@@ -4,11 +4,11 @@
 
 #include "config.h"  // IWYU pragma: keep
 
-#include "common.h"
-
 #include <atomic>
 #include <cassert>
 
+#include "common.h"
+
 // fish is multithreaded. Global (which includes function and file-level statics) when used naively
 // may therefore lead to data races. Use the following types to characterize and enforce correct
 // access patterns.
diff --git a/src/highlight.cpp b/src/highlight.cpp
index dbb4bd293..73e7b424c 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -6,9 +6,9 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/src/history.cpp b/src/history.cpp
index ea2bb5c1c..766fce720 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -8,6 +8,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cstdint>
 #include <cstring>
 // We need the sys/file.h for the flock() declaration on Linux but not OS X.
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 5fcba1abb..43a7476bc 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -1,10 +1,11 @@
 #include "config.h"
 
-#include "history.h"
 #include "history_file.h"
 
 #include <cstring>
 
+#include "history.h"
+
 // Some forward declarations.
 static history_item_t decode_item_fish_2_0(const char *base, size_t len);
 static history_item_t decode_item_fish_1_x(const char *begin, size_t length);
diff --git a/src/history_file.h b/src/history_file.h
index a86fecf97..8bd209180 100644
--- a/src/history_file.h
+++ b/src/history_file.h
@@ -3,12 +3,12 @@
 
 #include "config.h"
 
-#include "maybe.h"
+#include <sys/mman.h>
 
 #include <cassert>
 #include <memory>
 
-#include <sys/mman.h>
+#include "maybe.h"
 
 class history_item_t;
 
diff --git a/src/input.cpp b/src/input.cpp
index e4583980a..afacf24eb 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -3,6 +3,7 @@
 
 #include <errno.h>
 #include <wctype.h>
+
 #include <cwchar>
 #if HAVE_TERM_H
 #include <curses.h>
diff --git a/src/input_common.cpp b/src/input_common.cpp
index b7bd37f10..2dc4c203e 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -3,6 +3,7 @@
 
 #include <errno.h>
 #include <unistd.h>
+
 #include <cstring>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -11,8 +12,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <deque>
 #include <list>
 #include <memory>
diff --git a/src/input_common.h b/src/input_common.h
index 72aca87c7..9d3ecd6ca 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -2,12 +2,13 @@
 #ifndef INPUT_COMMON_H
 #define INPUT_COMMON_H
 
+#include <stddef.h>
+
+#include <queue>
+
 #include "common.h"
 #include "maybe.h"
 
-#include <stddef.h>
-#include <queue>
-
 enum class readline_cmd_t {
     beginning_of_line,
     end_of_line,
diff --git a/src/intern.cpp b/src/intern.cpp
index 1073a6b07..e609dd3b6 100644
--- a/src/intern.cpp
+++ b/src/intern.cpp
@@ -1,16 +1,17 @@
 // Library for pooling common strings.
 #include "config.h"  // IWYU pragma: keep
 
+#include "intern.h"
+
 #include <stddef.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <memory>
 #include <vector>
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
-#include "intern.h"
 
 bool string_less_than_string(const wchar_t *a, const wchar_t *b) { return std::wcscmp(a, b) < 0; }
 
diff --git a/src/io.cpp b/src/io.cpp
index 54ead1392..129044239 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -1,17 +1,19 @@
 // Utilities for io redirection.
 #include "config.h"  // IWYU pragma: keep
 
+#include "io.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
 
 #include "common.h"
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
 #include "iothread.h"
 #include "redirection.h"
 #include "wutil.h"  // IWYU pragma: keep
diff --git a/src/iothread.cpp b/src/iothread.cpp
index f2ed12d52..6d83e9897 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -1,5 +1,7 @@
 #include "config.h"  // IWYU pragma: keep
 
+#include "iothread.h"
+
 #include <limits.h>
 #include <pthread.h>
 #include <signal.h>
@@ -8,16 +10,15 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <atomic>
-#include <cstring>
 
+#include <atomic>
 #include <condition_variable>
+#include <cstring>
 #include <queue>
 
 #include "common.h"
 #include "flog.h"
 #include "global_safety.h"
-#include "iothread.h"
 #include "wutil.h"
 
 #ifdef _POSIX_THREAD_THREADS_MAX
diff --git a/src/iothread.h b/src/iothread.h
index 70a5a2c58..c64576d24 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -3,6 +3,7 @@
 #define FISH_IOTHREAD_H
 
 #include <pthread.h>
+
 #include <functional>
 #include <type_traits>
 
diff --git a/src/kill.cpp b/src/kill.cpp
index 89fa8124c..e13626595 100644
--- a/src/kill.cpp
+++ b/src/kill.cpp
@@ -5,6 +5,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stddef.h>
+
 #include <algorithm>
 #include <list>
 #include <memory>
diff --git a/src/lru.h b/src/lru.h
index aa0237d68..68aa591ed 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -3,7 +3,6 @@
 #define FISH_LRU_H
 
 #include <cwchar>
-
 #include <unordered_map>
 
 #include "common.h"
diff --git a/src/output.cpp b/src/output.cpp
index 2320a8ae6..63d40e972 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cstring>
 #if HAVE_CURSES_H
 #include <curses.h>
@@ -17,8 +18,8 @@
 #include <ncurses/term.h>
 #endif
 #include <limits.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/pager.cpp b/src/pager.cpp
index c39a4a4a6..233730663 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -3,9 +3,9 @@
 // IWYU pragma: no_include <cstddef>
 #include <stddef.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <numeric>
 #include <type_traits>
 #include <unordered_map>
diff --git a/src/parse_constants.h b/src/parse_constants.h
index b9145b2ce..af171a1ba 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -2,9 +2,10 @@
 #ifndef FISH_PARSE_CONSTANTS_H
 #define FISH_PARSE_CONSTANTS_H
 
-#include "common.h"
 #include "config.h"
 
+#include "common.h"
+
 #define PARSE_ASSERT(a) assert(a)
 #define PARSER_DIE()                   \
     do {                               \
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index d0df9a682..491df34b6 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -8,6 +8,8 @@
 // for the execution to finish to see them.
 #include "config.h"  // IWYU pragma: keep
 
+#include "parse_execution.h"
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -15,9 +17,9 @@
 #include <termios.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <type_traits>
@@ -36,7 +38,6 @@
 #include "io.h"
 #include "maybe.h"
 #include "parse_constants.h"
-#include "parse_execution.h"
 #include "parse_util.h"
 #include "parser.h"
 #include "path.h"
@@ -488,7 +489,8 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         return result;
     }
 
-    const wcstring &switch_value_expanded = switch_values_expanded.size() == 1 ? switch_values_expanded.at(0).completion : L"";
+    const wcstring &switch_value_expanded =
+        switch_values_expanded.size() == 1 ? switch_values_expanded.at(0).completion : L"";
 
     block_t *sb = parser->push_block(block_t::switch_block());
 
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index be5c23512..f760a4021 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -5,6 +5,7 @@
 #include <array>
 #include <tuple>
 #include <type_traits>
+
 #include "parse_constants.h"
 #include "tokenizer.h"
 
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 84745ff10..36882a168 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -1,12 +1,13 @@
 #include "config.h"  // IWYU pragma: keep
 
+#include "parse_productions.h"
+
 #include <stdio.h>
 
 #include "common.h"
 #include "flog.h"
 #include "parse_constants.h"
 #include "parse_grammar.h"
-#include "parse_productions.h"
 #include "parse_tree.h"
 
 using namespace parse_productions;
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index b2f4eec6c..d4e261416 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1,12 +1,14 @@
 // Programmatic representation of fish code.
 #include "config.h"  // IWYU pragma: keep
 
+#include "parse_tree.h"
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <string>
 #include <type_traits>
 #include <vector>
@@ -16,7 +18,6 @@
 #include "flog.h"
 #include "parse_constants.h"
 #include "parse_productions.h"
-#include "parse_tree.h"
 #include "proc.h"
 #include "tnode.h"
 #include "tokenizer.h"
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index e2d730717..388baae62 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -4,10 +4,12 @@
 // that are somehow related to parsing the code.
 #include "config.h"  // IWYU pragma: keep
 
+#include "parse_util.h"
+
 #include <stdarg.h>
 #include <stdlib.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <type_traits>
@@ -18,7 +20,6 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
 #include "parse_constants.h"
-#include "parse_util.h"
 #include "parser.h"
 #include "tnode.h"
 #include "tokenizer.h"
diff --git a/src/parser.cpp b/src/parser.cpp
index bfaf9a003..2c48686f1 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1,11 +1,13 @@
 // The fish parser. Contains functions for parsing and evaluating code.
 #include "config.h"  // IWYU pragma: keep
 
+#include "parser.h"
+
 #include <fcntl.h>
 #include <stdio.h>
-#include <cwchar>
 
 #include <algorithm>
+#include <cwchar>
 #include <memory>
 #include <utility>
 
@@ -19,7 +21,6 @@
 #include "parse_constants.h"
 #include "parse_execution.h"
 #include "parse_util.h"
-#include "parser.h"
 #include "proc.h"
 #include "reader.h"
 #include "sanity.h"
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 15c232461..80003be71 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -1,12 +1,13 @@
 // Functions having to do with parser keywords, like testing if a function is a block command.
 #include "config.h"  // IWYU pragma: keep
 
+#include "parser_keywords.h"
+
 #include <string>
 #include <unordered_set>
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
-#include "parser_keywords.h"
 
 typedef std::unordered_set<wcstring> string_set_t;
 
diff --git a/src/path.cpp b/src/path.cpp
index 7634fd246..802fccf80 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -3,12 +3,14 @@
 // issues.
 #include "config.h"  // IWYU pragma: keep
 
+#include "path.h"
+
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
-
 #include <memory>
 #include <string>
 #include <type_traits>
@@ -19,7 +21,6 @@
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "flog.h"
-#include "path.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// Unexpected error in path_get_path().
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 0d85275bc..0fe4458b1 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -6,6 +6,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <time.h>
+
 #include <cstring>
 #include <memory>
 #if FISH_USE_POSIX_SPAWN
diff --git a/src/print_help.cpp b/src/print_help.cpp
index db8ed074b..0b2fa3c71 100644
--- a/src/print_help.cpp
+++ b/src/print_help.cpp
@@ -1,12 +1,14 @@
 // Print help message for the specified command.
 #include "config.h"  // IWYU pragma: keep
 
+#include "print_help.h"
+
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cstring>
 
 #include "common.h"
-#include "print_help.h"
 
 #define CMD_LEN 1024
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 7dafcefb4..d6f216c8b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <wctype.h>
+
 #include <atomic>
 #include <cwchar>
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 2cb60c977..5377e0647 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -23,6 +23,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <cstring>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -33,11 +34,11 @@
 #include <time.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <algorithm>
 #include <atomic>
 #include <csignal>
+#include <cwchar>
 #include <deque>
 #include <functional>
 #include <memory>
@@ -1201,8 +1202,9 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
         // Find the last quote in the token to complete. By parsing only the string inside any
         // command substitution, we prevent the tokenizer from treating the entire command
         // substitution as one token.
-        parse_util_get_parameter_info(command_line.substr(cmdsub_offset, (cmdsub_end - cmdsub_begin)),
-                                      cursor_pos - cmdsub_offset, &quote, NULL, NULL);
+        parse_util_get_parameter_info(
+            command_line.substr(cmdsub_offset, (cmdsub_end - cmdsub_begin)),
+            cursor_pos - cmdsub_offset, &quote, NULL, NULL);
 
         // If the token is reported as unquoted, but ends with a (unescaped) quote, and we can
         // modify the command line, then delete the trailing quote so that we can insert within
diff --git a/src/redirection.cpp b/src/redirection.cpp
index d442aa2e8..6a09db081 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -1,10 +1,11 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include "redirection.h"
-#include "wutil.h"
 
 #include <fcntl.h>
 
+#include "wutil.h"
+
 #define NOCLOB_ERROR _(L"The file '%ls' already exists")
 
 #define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
diff --git a/src/redirection.h b/src/redirection.h
index 73748fc0a..9d5861f1d 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -1,12 +1,12 @@
 #ifndef FISH_REDIRECTION_H
 #define FISH_REDIRECTION_H
 
+#include <vector>
+
 #include "common.h"
 #include "io.h"
 #include "maybe.h"
 
-#include <vector>
-
 /// This file supports "applying" redirections.
 
 /// A class representing a sequence of basic redirections.
diff --git a/src/sanity.cpp b/src/sanity.cpp
index f00dd143e..677214384 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -1,6 +1,8 @@
 // Functions for performing sanity checks on the program state.
 #include "config.h"  // IWYU pragma: keep
 
+#include "sanity.h"
+
 #include <unistd.h>
 
 #include "common.h"
@@ -11,7 +13,6 @@
 #include "kill.h"
 #include "proc.h"
 #include "reader.h"
-#include "sanity.h"
 
 /// Status from earlier sanity checks.
 static relaxed_atomic_bool_t insane{false};
diff --git a/src/screen.cpp b/src/screen.cpp
index 0568d4956..b9968f653 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -13,6 +13,7 @@
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
+
 #include <cstring>
 #include <cwchar>
 
@@ -642,8 +643,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
     const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
-    if (scr->desired.line_count() < lines_with_stuff)
-        need_clear_screen = true;
+    if (scr->desired.line_count() < lines_with_stuff) need_clear_screen = true;
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);
@@ -669,12 +669,11 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         const size_t shared_prefix = line_shared_prefix(o_line, s_line);
         size_t skip_prefix = shared_prefix;
         if (shared_prefix < o_line.indentation) {
-            if (o_line.indentation > s_line.indentation
-                && !has_cleared_screen && clr_eol && clr_eos) {
+            if (o_line.indentation > s_line.indentation && !has_cleared_screen && clr_eol &&
+                clr_eos) {
                 s_set_color(scr, vars, highlight_spec_t{});
                 s_move(scr, 0, (int)i);
-                s_write_mbs(scr,
-                            should_clear_screen_this_line ? clr_eos : clr_eol);
+                s_write_mbs(scr, should_clear_screen_this_line ? clr_eos : clr_eol);
                 has_cleared_screen = should_clear_screen_this_line;
                 has_cleared_line = true;
             }
@@ -685,8 +684,9 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         // over the shared prefix of what we want to output now, and what we output before, to
         // avoid repeatedly outputting it.
         if (skip_prefix > 0) {
-            size_t skip_width = shared_prefix < skip_prefix ? skip_prefix
-                                                : fish_wcswidth(&o_line.text.at(0), shared_prefix);
+            size_t skip_width = shared_prefix < skip_prefix
+                                    ? skip_prefix
+                                    : fish_wcswidth(&o_line.text.at(0), shared_prefix);
             if (skip_width > skip_remaining) skip_remaining = skip_width;
         }
 
@@ -722,21 +722,20 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         }
 
         // Now actually output stuff.
-        for (; ; j++) {
+        for (;; j++) {
             bool done = j >= o_line.size();
             // Clear the screen if we have not done so yet.
             // If we are about to output into the last column, clear the screen first. If we clear
             // the screen after we output into the last column, it can erase the last character due
             // to the sticky right cursor. If we clear the screen too early, we can defeat soft
             // wrapping.
-            if (should_clear_screen_this_line && !has_cleared_screen
-                && (done || j + 1 == (size_t)screen_width)) {
+            if (should_clear_screen_this_line && !has_cleared_screen &&
+                (done || j + 1 == (size_t)screen_width)) {
                 s_move(scr, current_width, (int)i);
                 s_write_mbs(scr, clr_eos);
                 has_cleared_screen = true;
             }
-            if (done)
-                break;
+            if (done) break;
 
             perform_any_impending_soft_wrap(scr, current_width, (int)i);
             s_move(scr, current_width, (int)i);
diff --git a/src/screen.h b/src/screen.h
index 907bc7924..b5c301e4d 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -12,10 +12,10 @@
 
 #include <stddef.h>
 #include <sys/stat.h>
-#include <cwchar>
 
 #include <algorithm>
 #include <cstddef>
+#include <cwchar>
 #include <list>
 #include <memory>
 #include <unordered_map>
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 884c30f6e..d9d1cea72 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -24,14 +24,15 @@
 
 // This version has been altered and ported to C++ for inclusion in fish.
 #include "tinyexpr.h"
+
 #include <ctype.h>
 #include <limits.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstring>
 
 #include <algorithm>
+#include <cstring>
 #include <iterator>
 #include <utility>
 
@@ -263,7 +264,7 @@ void next_token(state *s) {
                 }
             } else {
                 /* Look for an operator or special character. */
-                switch (s->next++ [0]) {
+                switch (s->next++[0]) {
                     // The "te_fun2" casts are necessary to pick the right overload.
                     case '+':
                         s->type = TOK_INFIX;
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index b33f0ba3d..14287bcf2 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -2,19 +2,20 @@
 // extended to support marks, tokenizing multiple strings and disposing of unused string segments.
 #include "config.h"  // IWYU pragma: keep
 
+#include "tokenizer.h"
+
 #include <fcntl.h>
 #include <limits.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <string>
 #include <type_traits>
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
-#include "tokenizer.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 // _(s) is already wgettext(s).c_str(), so let's not convert back to wcstring
diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index f1fe05a6c..7f5327735 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -1,13 +1,14 @@
 #include "config.h"  // IWYU pragma: keep
 
-#include "flog.h"
-#include "iothread.h"
 #include "topic_monitor.h"
-#include "wutil.h"
 
 #include <limits.h>
 #include <unistd.h>
 
+#include "flog.h"
+#include "iothread.h"
+#include "wutil.h"
+
 // Whoof. Thread Sanitizer swallows signals and replays them at its leisure, at the point where
 // instrumented code makes certain blocking calls. But tsan cannot interrupt a signal call, so
 // if we're blocked in read() (like the topic monitor wants to be!), we'll never receive SIGCHLD
diff --git a/src/topic_monitor.h b/src/topic_monitor.h
index 4bd86f7f0..c0673c712 100644
--- a/src/topic_monitor.h
+++ b/src/topic_monitor.h
@@ -1,10 +1,6 @@
 #ifndef FISH_TOPIC_MONITOR_H
 #define FISH_TOPIC_MONITOR_H
 
-#include "common.h"
-#include "enum_set.h"
-#include "io.h"
-
 #include <array>
 #include <atomic>
 #include <bitset>
@@ -12,6 +8,10 @@
 #include <limits>
 #include <numeric>
 
+#include "common.h"
+#include "enum_set.h"
+#include "io.h"
+
 /** Topic monitoring support. Topics are conceptually "a thing that can happen." For example,
  delivery of a SIGINT, a child process exits, etc. It is possible to post to a topic, which means
  that that thing happened.
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 94fe6b1cd..7bd9351ae 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -15,6 +15,8 @@
  */
 #include "config.h"  // IWYU pragma: keep
 
+#include "utf8.h"
+
 #include <stdint.h>  // IWYU pragma: keep
 #include <sys/types.h>
 
@@ -22,7 +24,6 @@
 #include <string>
 
 #include "common.h"
-#include "utf8.h"
 
 #define _NXT 0x80
 #define _SEQ2 0xc0
diff --git a/src/util.cpp b/src/util.cpp
index 3503d7bab..74c03d5c8 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,16 +1,18 @@
 // Generic utilities library.
 #include "config.h"  // IWYU pragma: keep
 
+#include "util.h"
+
 #include <errno.h>
 #include <stddef.h>
 #include <sys/time.h>
 #include <wctype.h>
+
 #include <cwchar>
 
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
-#include "util.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "wutil.h"     // IWYU pragma: keep
 
 // Compare the strings to see if they begin with an integer that can be compared and return the
 // result of that comparison.
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index 3691f79e5..f081214f2 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -1,11 +1,12 @@
 // Helper functions for working with wcstring.
 #include "config.h"  // IWYU pragma: keep
 
-#include "common.h"
 #include "wcstringutil.h"
 
 #include <wctype.h>
 
+#include "common.h"
+
 typedef wcstring::size_type size_type;
 
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index 332c210b1..df24fb64f 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -39,6 +39,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include <stdio.h>
+
 #include <cstring>
 #include <cwchar>
 
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 53e222a8c..23ec03ff8 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -2,14 +2,16 @@
 // provides recursive wildcards using **.
 #include "config.h"  // IWYU pragma: keep
 
+#include "wildcard.h"
+
 #include <dirent.h>
 #include <errno.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cwchar>
 
+#include <cwchar>
 #include <memory>
 #include <string>
 #include <unordered_set>
@@ -21,7 +23,6 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
 #include "reader.h"
-#include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// Description for generic executable.
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 1f448ba14..808d3f0d6 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+
 #include <cstring>
 #if defined(__linux__)
 #include <sys/statfs.h>
@@ -19,9 +20,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <wctype.h>
-#include <cwchar>
 
 #include <atomic>
+#include <cwchar>
 #include <string>
 #include <unordered_map>
 
diff --git a/src/wutil.h b/src/wutil.h
index e3c1837ca..e31d90d30 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <wctype.h>
+
 #include <string>
 
 #ifdef HAVE_XLOCALE_H

From 1a65e18ba8cfbfede331b04d8a091be8490c5a80 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 13 Oct 2019 16:06:16 -0700
Subject: [PATCH 1050/1732] Clean up some tokenization

Remove TOK_NONE
Turn token_type into an enum class
Make next() turn a maybe_t<tok_t> instead of a bool
---
 src/builtin_commandline.cpp |   9 ++-
 src/fish_test_helper.cpp    |   8 +++
 src/fish_tests.cpp          |  96 +++++++++++++++--------------
 src/parse_tree.cpp          |  55 ++++++++---------
 src/parse_util.cpp          |  79 ++++++++++++------------
 src/parse_util.h            |   2 +-
 src/reader.cpp              |  15 +++--
 src/tokenizer.cpp           | 116 ++++++++++++++++++------------------
 src/tokenizer.h             |  31 +++++-----
 9 files changed, 210 insertions(+), 201 deletions(-)

diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 0c849612b..cf309b498 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -100,12 +100,11 @@ static void write_part(const wchar_t *begin, const wchar_t *end, int cut_at_curs
         wcstring out;
         wcstring buff(begin, end - begin);
         tokenizer_t tok(buff.c_str(), TOK_ACCEPT_UNFINISHED);
-        tok_t token;
-        while (tok.next(&token)) {
-            if ((cut_at_cursor) && (token.offset + token.length >= pos)) break;
+        while (auto token = tok.next()) {
+            if ((cut_at_cursor) && (token->offset + token->length >= pos)) break;
 
-            if (token.type == TOK_STRING) {
-                wcstring tmp = tok.text_of(token);
+            if (token->type == token_type_t::string) {
+                wcstring tmp = tok.text_of(*token);
                 unescape_string_in_place(&tmp, UNESCAPE_INCOMPLETE);
                 out.append(tmp);
                 out.push_back(L'\n');
diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index 5ee10407e..dd70b3ed6 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -39,6 +39,12 @@ static void sigint_parent() {
     fprintf(stderr, "Sent SIGINT to %d\n", parent);
 }
 
+static void print_stdout_stderr() {
+    fprintf(stdout, "stdout\n");
+    fprintf(stderr, "stderr\n");
+    fflush(nullptr);
+}
+
 int main(int argc, char *argv[]) {
     if (argc <= 1) {
         fprintf(stderr, "No commands given.\n");
@@ -51,6 +57,8 @@ int main(int argc, char *argv[]) {
             report_foreground();
         } else if (!strcmp(argv[i], "sigint_parent")) {
             sigint_parent();
+        } else if (!strcmp(argv[i], "print_stdout_stderr")) {
+            print_stdout_stderr();
         } else {
             fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
             return EXIT_FAILURE;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index e5837704e..2a566fd23 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -564,29 +564,27 @@ static void test_convert_nulls() {
 /// Test the tokenizer.
 static void test_tokenizer() {
     say(L"Testing tokenizer");
-    tok_t token;
-
     {
-        bool got = false;
         const wchar_t *str = L"alpha beta";
         tokenizer_t t(str, 0);
+        maybe_t<tok_t> token{};
 
-        got = t.next(&token);  // alpha
-        do_test(got);
-        do_test(token.type == TOK_STRING);
-        do_test(token.offset == 0);
-        do_test(token.length == 5);
-        do_test(t.text_of(token) == L"alpha");
+        token = t.next();  // alpha
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::string);
+        do_test(token->offset == 0);
+        do_test(token->length == 5);
+        do_test(t.text_of(*token) == L"alpha");
 
-        got = t.next(&token);  // beta
-        do_test(got);
-        do_test(token.type == TOK_STRING);
-        do_test(token.offset == 6);
-        do_test(token.length == 4);
-        do_test(t.text_of(token) == L"beta");
+        token = t.next();  // beta
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::string);
+        do_test(token->offset == 6);
+        do_test(token->length == 4);
+        do_test(t.text_of(*token) == L"beta");
 
-        got = t.next(&token);
-        do_test(!got);
+        token = t.next();
+        do_test(!token.has_value());
     }
 
     const wchar_t *str =
@@ -595,30 +593,31 @@ static void test_tokenizer() {
         L"&&& ||| "
         L"&& || & |"
         L"Compress_Newlines\n  \n\t\n   \nInto_Just_One";
-    const int types[] = {TOK_STRING, TOK_REDIRECT,   TOK_STRING,   TOK_REDIRECT, TOK_STRING,
-                         TOK_STRING, TOK_STRING,     TOK_REDIRECT, TOK_REDIRECT, TOK_STRING,
-                         TOK_ANDAND, TOK_BACKGROUND, TOK_OROR,     TOK_PIPE,     TOK_ANDAND,
-                         TOK_OROR,   TOK_BACKGROUND, TOK_PIPE,     TOK_STRING,   TOK_END,
-                         TOK_STRING};
+    using tt = token_type_t;
+    const token_type_t types[] = {
+        tt::string, tt::redirect, tt::string,   tt::redirect, tt::string,     tt::string,
+        tt::string, tt::redirect, tt::redirect, tt::string,   tt::andand,     tt::background,
+        tt::oror,   tt::pipe,     tt::andand,   tt::oror,     tt::background, tt::pipe,
+        tt::string, tt::end,      tt::string};
 
     say(L"Test correct tokenization");
 
     {
         tokenizer_t t(str, 0);
         size_t i = 0;
-        while (t.next(&token)) {
+        while (auto token = t.next()) {
             if (i >= sizeof types / sizeof *types) {
                 err(L"Too many tokens returned from tokenizer");
-                std::fwprintf(stdout, L"Got excess token type %ld\n", (long)token.type);
+                std::fwprintf(stdout, L"Got excess token type %ld\n", (long)token->type);
                 break;
             }
-            if (types[i] != token.type) {
+            if (types[i] != token->type) {
                 err(L"Tokenization error:");
                 std::fwprintf(
                     stdout,
                     L"Token number %zu of string \n'%ls'\n, expected type %ld, got token type "
                     L"%ld\n",
-                    i + 1, str, (long)types[i], (long)token.type);
+                    i + 1, str, (long)types[i], (long)token->type);
             }
             i++;
         }
@@ -630,37 +629,44 @@ static void test_tokenizer() {
     // Test some errors.
     {
         tokenizer_t t(L"abc\\", 0);
-        do_test(t.next(&token));
-        do_test(token.type == TOK_ERROR);
-        do_test(token.error == tokenizer_error_t::unterminated_escape);
-        do_test(token.error_offset == 3);
+        auto token = t.next();
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::error);
+        do_test(token->error == tokenizer_error_t::unterminated_escape);
+        do_test(token->error_offset == 3);
     }
 
     {
         tokenizer_t t(L"abc )defg(hij", 0);
-        do_test(t.next(&token));
-        do_test(t.next(&token));
-        do_test(token.type == TOK_ERROR);
-        do_test(token.error == tokenizer_error_t::closing_unopened_subshell);
-        do_test(token.error_offset == 4);
+        auto token = t.next();
+        do_test(token.has_value());
+        token = t.next();
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::error);
+        do_test(token->error == tokenizer_error_t::closing_unopened_subshell);
+        do_test(token->error_offset == 4);
     }
 
     {
         tokenizer_t t(L"abc defg(hij (klm)", 0);
-        do_test(t.next(&token));
-        do_test(t.next(&token));
-        do_test(token.type == TOK_ERROR);
-        do_test(token.error == tokenizer_error_t::unterminated_subshell);
-        do_test(token.error_offset == 4);
+        auto token = t.next();
+        do_test(token.has_value());
+        token = t.next();
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::error);
+        do_test(token->error == tokenizer_error_t::unterminated_subshell);
+        do_test(token->error_offset == 4);
     }
 
     {
         tokenizer_t t(L"abc defg[hij (klm)", 0);
-        do_test(t.next(&token));
-        do_test(t.next(&token));
-        do_test(token.type == TOK_ERROR);
-        do_test(token.error == tokenizer_error_t::unterminated_slice);
-        do_test(token.error_offset == 4);
+        auto token = t.next();
+        do_test(token.has_value());
+        token = t.next();
+        do_test(token.has_value());
+        do_test(token->type == token_type_t::error);
+        do_test(token->error == tokenizer_error_t::unterminated_slice);
+        do_test(token->error_offset == 4);
     }
 
     // Test redirection_type_for_string.
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index d4e261416..6b216a135 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -18,6 +18,7 @@
 #include "flog.h"
 #include "parse_constants.h"
 #include "parse_productions.h"
+#include "parse_tree.h"
 #include "proc.h"
 #include "tnode.h"
 #include "tokenizer.h"
@@ -235,28 +236,25 @@ wcstring parse_token_t::user_presentable_description() const {
 
 /// Convert from tokenizer_t's token type to a parse_token_t type.
 static inline parse_token_type_t parse_token_type_from_tokenizer_token(
-    enum token_type tokenizer_token_type) {
+    enum token_type_t tokenizer_token_type) {
     switch (tokenizer_token_type) {
-        case TOK_NONE:
-            DIE("TOK_NONE passed to parse_token_type_from_tokenizer_token");
-            return token_type_invalid;
-        case TOK_STRING:
+        case token_type_t::string:
             return parse_token_type_string;
-        case TOK_PIPE:
+        case token_type_t::pipe:
             return parse_token_type_pipe;
-        case TOK_ANDAND:
+        case token_type_t::andand:
             return parse_token_type_andand;
-        case TOK_OROR:
+        case token_type_t::oror:
             return parse_token_type_oror;
-        case TOK_END:
+        case token_type_t::end:
             return parse_token_type_end;
-        case TOK_BACKGROUND:
+        case token_type_t::background:
             return parse_token_type_background;
-        case TOK_REDIRECT:
+        case token_type_t::redirect:
             return parse_token_type_redirection;
-        case TOK_ERROR:
+        case token_type_t::error:
             return parse_special_type_tokenizer_error;
-        case TOK_COMMENT:
+        case token_type_t::comment:
             return parse_special_type_comment;
     }
     FLOGF(error, L"Bad token type %d passed to %s", (int)tokenizer_token_type, __FUNCTION__);
@@ -960,9 +958,9 @@ static bool is_keyword_char(wchar_t c) {
 }
 
 /// Given a token, returns the keyword it matches, or parse_keyword_none.
-static parse_keyword_t keyword_for_token(token_type tok, const wcstring &token) {
+static parse_keyword_t keyword_for_token(token_type_t tok, const wcstring &token) {
     /* Only strings can be keywords */
-    if (tok != TOK_STRING) {
+    if (tok != token_type_t::string) {
         return parse_keyword_none;
     }
 
@@ -1009,32 +1007,35 @@ static inline bool is_help_argument(const wcstring &txt) {
 }
 
 /// Return a new parse token, advancing the tokenizer.
-static inline parse_token_t next_parse_token(tokenizer_t *tok, tok_t *token, wcstring *storage) {
-    if (!tok->next(token)) {
+static inline parse_token_t next_parse_token(tokenizer_t *tok, maybe_t<tok_t> *out_token,
+                                             wcstring *storage) {
+    *out_token = tok->next();
+    if (!out_token->has_value()) {
         return kTerminalToken;
     }
+    const tok_t &token = **out_token;
 
     // Set the type, keyword, and whether there's a dash prefix. Note that this is quite sketchy,
     // because it ignores quotes. This is the historical behavior. For example, `builtin --names`
     // lists builtins, but `builtin "--names"` attempts to run --names as a command. Amazingly as of
     // this writing (10/12/13) nobody seems to have noticed this. Squint at it really hard and it
     // even starts to look like a feature.
-    parse_token_t result{parse_token_type_from_tokenizer_token(token->type)};
-    const wcstring &text = tok->copy_text_of(*token, storage);
-    result.keyword = keyword_for_token(token->type, text);
+    parse_token_t result{parse_token_type_from_tokenizer_token(token.type)};
+    const wcstring &text = tok->copy_text_of(token, storage);
+    result.keyword = keyword_for_token(token.type, text);
     result.has_dash_prefix = !text.empty() && text.at(0) == L'-';
     result.is_help_argument = result.has_dash_prefix && is_help_argument(text);
     result.is_newline = (result.type == parse_token_type_end && text == L"\n");
-    result.preceding_escaped_nl = token->preceding_escaped_nl;
+    result.preceding_escaped_nl = token.preceding_escaped_nl;
 
     // These assertions are totally bogus. Basically our tokenizer works in size_t but we work in
     // uint32_t to save some space. If we have a source file larger than 4 GB, we'll probably just
     // crash.
-    assert(token->offset < SOURCE_OFFSET_INVALID);
-    result.source_start = (source_offset_t)token->offset;
+    assert(token.offset < SOURCE_OFFSET_INVALID);
+    result.source_start = (source_offset_t)token.offset;
 
-    assert(token->length <= SOURCE_OFFSET_INVALID);
-    result.source_length = (source_offset_t)token->length;
+    assert(token.length <= SOURCE_OFFSET_INVALID);
+    result.source_length = (source_offset_t)token.length;
 
     return result;
 }
@@ -1063,7 +1064,7 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
     parse_token_t queue[2] = {kInvalidToken, kInvalidToken};
 
     // Loop until we have a terminal token.
-    tok_t tokenizer_token;
+    maybe_t<tok_t> tokenizer_token{};
     for (size_t token_count = 0; queue[0].type != parse_token_type_terminate; token_count++) {
         // Push a new token onto the queue.
         queue[0] = queue[1];
@@ -1084,7 +1085,7 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
         // Handle tokenizer errors. This is a hack because really the parser should report this for
         // itself; but it has no way of getting the tokenizer message.
         if (queue[1].type == parse_special_type_tokenizer_error) {
-            parser.report_tokenizer_error(tokenizer_token);
+            parser.report_tokenizer_error(*tokenizer_token);
         }
 
         if (!parser.has_fatal_error()) {
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 388baae62..a3c9e2616 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -20,6 +20,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
 #include "parse_constants.h"
+#include "parse_util.h"
 #include "parser.h"
 #include "tnode.h"
 #include "tokenizer.h"
@@ -310,32 +311,32 @@ static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const
     assert(buffcpy != NULL);
 
     tokenizer_t tok(buffcpy, TOK_ACCEPT_UNFINISHED);
-    tok_t token;
-    while (tok.next(&token) && !finished) {
-        size_t tok_begin = token.offset;
+    for (maybe_t<tok_t> token = tok.next(); token && !finished; token = tok.next())
+        while ((token = tok.next()) && !finished) {
+            size_t tok_begin = token->offset;
 
-        switch (token.type) {
-            case TOK_PIPE: {
-                if (!process) {
+            switch (token->type) {
+                case token_type_t::pipe: {
+                    if (!process) {
+                        break;
+                    }
+                }
+                /* FALLTHROUGH */
+                case token_type_t::end:
+                case token_type_t::background: {
+                    if (tok_begin >= pos) {
+                        finished = 1;
+                        if (b) *b = (wchar_t *)begin + tok_begin;
+                    } else {
+                        if (a) *a = (wchar_t *)begin + tok_begin + 1;
+                    }
+                    break;
+                }
+                default: {
                     break;
                 }
             }
-            /* FALLTHROUGH */
-            case TOK_END:
-            case TOK_BACKGROUND: {
-                if (tok_begin >= pos) {
-                    finished = 1;
-                    if (b) *b = (wchar_t *)begin + tok_begin;
-                } else {
-                    if (a) *a = (wchar_t *)begin + tok_begin + 1;
-                }
-                break;
-            }
-            default: {
-                break;
-            }
         }
-    }
 
     free(buffcpy);
 }
@@ -380,14 +381,13 @@ void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar
     const wcstring buffcpy = wcstring(cmdsubst_begin, cmdsubst_end - cmdsubst_begin);
 
     tokenizer_t tok(buffcpy.c_str(), TOK_ACCEPT_UNFINISHED);
-    tok_t token;
-    while (tok.next(&token)) {
-        size_t tok_begin = token.offset;
+    while (maybe_t<tok_t> token = tok.next()) {
+        size_t tok_begin = token->offset;
         size_t tok_end = tok_begin;
 
         // Calculate end of token.
-        if (token.type == TOK_STRING) {
-            tok_end += token.length;
+        if (token->type == token_type_t::string) {
+            tok_end += token->length;
         }
 
         // Cursor was before beginning of this token, means that the cursor is between two tokens,
@@ -399,16 +399,16 @@ void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar
 
         // If cursor is inside the token, this is the token we are looking for. If so, set a and b
         // and break.
-        if (token.type == TOK_STRING && tok_end >= offset_within_cmdsubst) {
-            a = cmdsubst_begin + token.offset;
-            b = a + token.length;
+        if (token->type == token_type_t::string && tok_end >= offset_within_cmdsubst) {
+            a = cmdsubst_begin + token->offset;
+            b = a + token->length;
             break;
         }
 
         // Remember previous string token.
-        if (token.type == TOK_STRING) {
-            pa = cmdsubst_begin + token.offset;
-            pb = pa + token.length;
+        if (token->type == token_type_t::string) {
+            pa = cmdsubst_begin + token->offset;
+            pb = pa + token->length;
         }
     }
 
@@ -482,21 +482,20 @@ static wchar_t get_quote(const wcstring &cmd_str, size_t len) {
 }
 
 void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_t *quote,
-                                   size_t *offset, enum token_type *out_type) {
+                                   size_t *offset, token_type_t *out_type) {
     size_t prev_pos = 0;
     wchar_t last_quote = L'\0';
 
     tokenizer_t tok(cmd.c_str(), TOK_ACCEPT_UNFINISHED);
-    tok_t token;
-    while (tok.next(&token)) {
-        if (token.offset > pos) break;
+    while (auto token = tok.next()) {
+        if (token->offset > pos) break;
 
-        if (token.type == TOK_STRING)
-            last_quote = get_quote(tok.text_of(token), pos - token.offset);
+        if (token->type == token_type_t::string)
+            last_quote = get_quote(tok.text_of(*token), pos - token->offset);
 
-        if (out_type != NULL) *out_type = token.type;
+        if (out_type != NULL) *out_type = token->type;
 
-        prev_pos = token.offset;
+        prev_pos = token->offset;
     }
 
     wchar_t *cmd_tmp = wcsdup(cmd.c_str());
diff --git a/src/parse_util.h b/src/parse_util.h
index e862b796f..a3e7a849e 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -110,7 +110,7 @@ bool parse_util_argument_is_help(const wchar_t *s);
 /// \param offset If not NULL, get_param will store the offset to the beginning of the parameter.
 /// \param out_type If not NULL, get_param will store the token type.
 void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_t *quote,
-                                   size_t *offset, enum token_type *out_type);
+                                   size_t *offset, token_type_t *out_type);
 
 /// Attempts to escape the string 'cmd' using the given quote type, as determined by the quote
 /// character. The quote can be a single quote or double quote, or L'\0' to indicate no quoting (and
diff --git a/src/reader.cpp b/src/reader.cpp
index 5377e0647..13713bd92 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -199,12 +199,11 @@ class reader_history_search_t {
         } else if (mode_ == token) {
             const wcstring &needle = search_string();
             tokenizer_t tok(text.c_str(), TOK_ACCEPT_UNFINISHED);
-            tok_t token;
 
             wcstring_list_t local_tokens;
-            while (tok.next(&token)) {
-                if (token.type != TOK_STRING) continue;
-                wcstring text = tok.text_of(token);
+            while (auto token = tok.next()) {
+                if (token->type != token_type_t::string) continue;
+                wcstring text = tok.text_of(*token);
                 if (text.find(needle) != wcstring::npos) {
                     local_tokens.emplace_back(std::move(text));
                 }
@@ -2346,11 +2345,11 @@ static wchar_t unescaped_quote(const wcstring &str, size_t pos) {
 /// Returns true if the last token is a comment.
 static bool text_ends_in_comment(const wcstring &text) {
     tokenizer_t tok(text.c_str(), TOK_ACCEPT_UNFINISHED | TOK_SHOW_COMMENTS);
-    tok_t token;
-    while (tok.next(&token)) {
-        ;  // pass
+    bool is_comment = false;
+    while (auto token = tok.next()) {
+        is_comment = token->type == token_type_t::comment;
     }
-    return token.type == TOK_COMMENT;
+    return is_comment;
 }
 
 /// \return true if an event is a normal character that should be inserted into the buffer.
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 14287bcf2..5e9235e0a 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -16,6 +16,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
+#include "tokenizer.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 // _(s) is already wgettext(s).c_str(), so let's not convert back to wcstring
@@ -64,8 +65,7 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
 
     this->has_next = false;
 
-    tok_t result;
-    result.type = TOK_ERROR;
+    tok_t result{token_type_t::error};
     result.error = error_type;
     result.offset = token_start - this->start;
     result.length = this->buff - token_start;
@@ -81,15 +81,7 @@ tokenizer_t::tokenizer_t(const wchar_t *start, tok_flags_t flags) : buff(start),
     this->show_blank_lines = static_cast<bool>(flags & TOK_SHOW_BLANK_LINES);
 }
 
-bool tokenizer_t::next(struct tok_t *result) {
-    assert(result != NULL);
-    maybe_t<tok_t> tok = this->tok_next();
-    if (!tok) {
-        return false;
-    }
-    *result = std::move(*tok);
-    return true;
-}
+tok_t::tok_t(token_type_t type) : type(type) {}
 
 /// Tests if this character can be a part of a string. The redirect ^ is allowed unless it's the
 /// first character. Hash (#) starts a comment if it's the first character in a token; otherwise it
@@ -252,31 +244,30 @@ tok_t tokenizer_t::read_string() {
     }
 
     if ((!this->accept_unfinished) && (mode != tok_modes::regular_text)) {
-        tok_t error;
-        if ((mode & tok_modes::char_escape) == tok_modes::char_escape) {
-            error = this->call_error(tokenizer_error_t::unterminated_escape, buff_start,
-                                     this->buff - 1);
-        } else if ((mode & tok_modes::array_brackets) == tok_modes::array_brackets) {
-            error = this->call_error(tokenizer_error_t::unterminated_slice, buff_start,
-                                     this->start + slice_offset);
-        } else if ((mode & tok_modes::subshell) == tok_modes::subshell) {
+        if (mode & tok_modes::char_escape) {
+            return this->call_error(tokenizer_error_t::unterminated_escape, buff_start,
+                                    this->buff - 1);
+        } else if (mode & tok_modes::array_brackets) {
+            return this->call_error(tokenizer_error_t::unterminated_slice, buff_start,
+                                    this->start + slice_offset);
+        } else if (mode & tok_modes::subshell) {
             assert(paran_offsets.size() > 0);
             size_t offset_of_open_paran = paran_offsets.back();
 
-            error = this->call_error(tokenizer_error_t::unterminated_subshell, buff_start,
-                                     this->start + offset_of_open_paran);
-        } else if ((mode & tok_modes::curly_braces) == tok_modes::curly_braces) {
+            return this->call_error(tokenizer_error_t::unterminated_subshell, buff_start,
+                                    this->start + offset_of_open_paran);
+        } else if (mode & tok_modes::curly_braces) {
             assert(brace_offsets.size() > 0);
             size_t offset_of_open_brace = brace_offsets.back();
 
-            error = this->call_error(tokenizer_error_t::unterminated_brace, buff_start,
-                                     this->start + offset_of_open_brace);
+            return this->call_error(tokenizer_error_t::unterminated_brace, buff_start,
+                                    this->start + offset_of_open_brace);
+        } else {
+            DIE("Unknown non-regular-text mode");
         }
-        return error;
     }
 
-    tok_t result;
-    result.type = TOK_STRING;
+    tok_t result(token_type_t::string);
     result.offset = buff_start - this->start;
     result.length = this->buff - buff_start;
     return result;
@@ -289,7 +280,7 @@ struct parsed_redir_or_pipe_t {
     size_t consumed{0};
 
     // The token type, always either TOK_PIPE or TOK_REDIRECT.
-    token_type type{TOK_REDIRECT};
+    token_type_t type{token_type_t::redirect};
 
     // The redirection mode if the type is TOK_REDIRECT.
     redirection_type_t redirection_mode{redirection_type_t::overwrite};
@@ -373,7 +364,7 @@ static maybe_t<parsed_redir_or_pipe_t> read_redirection_or_fd_pipe(const wchar_t
     } else if (opt_char == L'|') {
         // So the string looked like '2>|'. This is not a redirection - it's a pipe! That gets
         // handled elsewhere.
-        result.type = TOK_PIPE;
+        result.type = token_type_t::pipe;
         idx++;
     }
 
@@ -384,7 +375,7 @@ static maybe_t<parsed_redir_or_pipe_t> read_redirection_or_fd_pipe(const wchar_t
 maybe_t<redirection_type_t> redirection_type_for_string(const wcstring &str, int *out_fd) {
     auto v = read_redirection_or_fd_pipe(str.c_str());
     // Redirections only, no pipes.
-    if (!v || v->type != TOK_REDIRECT || v->fd < 0) return none();
+    if (!v || v->type != token_type_t::redirect || v->fd < 0) return none();
     if (out_fd) *out_fd = v->fd;
     return v->redirection_mode;
 }
@@ -395,7 +386,7 @@ int fd_redirected_by_pipe(const wcstring &str) {
         return STDOUT_FILENO;
     }
     auto v = read_redirection_or_fd_pipe(str.c_str());
-    return (v && v->type == TOK_PIPE) ? v->fd : -1;
+    return (v && v->type == token_type_t::pipe) ? v->fd : -1;
 }
 
 int oflags_for_redirection_type(redirection_type_t type) {
@@ -434,7 +425,7 @@ static bool iswspace_not_nl(wchar_t c) {
     }
 }
 
-maybe_t<tok_t> tokenizer_t::tok_next() {
+maybe_t<tok_t> tokenizer_t::next() {
     if (!this->has_next) {
         return none();
     }
@@ -464,8 +455,7 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
 
         // Maybe return the comment.
         if (this->show_comments) {
-            tok_t result;
-            result.type = TOK_COMMENT;
+            tok_t result(token_type_t::comment);
             result.offset = comment_start - this->start;
             result.length = comment_len;
             result.preceding_escaped_nl = preceding_escaped_nl;
@@ -476,10 +466,9 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
 
     // We made it past the comments and ate any trailing newlines we wanted to ignore.
     this->continue_line_after_comment = false;
-    size_t start_pos = this->buff - this->start;
+    const size_t start_pos = this->buff - this->start;
 
-    tok_t result;
-    result.offset = start_pos;
+    maybe_t<tok_t> result{};
     switch (*this->buff) {
         case L'\0': {
             this->has_next = false;
@@ -488,8 +477,9 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
         case L'\r':  // carriage-return
         case L'\n':  // newline
         case L';': {
-            result.type = TOK_END;
-            result.length = 1;
+            result.emplace(token_type_t::end);
+            result->offset = start_pos;
+            result->length = 1;
             this->buff++;
             // Hack: when we get a newline, swallow as many as we can. This compresses multiple
             // subsequent newlines into a single one.
@@ -503,25 +493,29 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
         }
         case L'&': {
             if (this->buff[1] == L'&') {
-                result.type = TOK_ANDAND;
-                result.length = 2;
+                result.emplace(token_type_t::andand);
+                result->offset = start_pos;
+                result->length = 2;
                 this->buff += 2;
             } else {
-                result.type = TOK_BACKGROUND;
-                result.length = 1;
+                result.emplace(token_type_t::background);
+                result->offset = start_pos;
+                result->length = 1;
                 this->buff++;
             }
             break;
         }
         case L'|': {
             if (this->buff[1] == L'|') {
-                result.type = TOK_OROR;
-                result.length = 2;
+                result.emplace(token_type_t::oror);
+                result->offset = start_pos;
+                result->length = 2;
                 this->buff += 2;
             } else {
-                result.type = TOK_PIPE;
-                result.redirected_fd = 1;
-                result.length = 1;
+                result.emplace(token_type_t::pipe);
+                result->redirected_fd = 1;
+                result->offset = start_pos;
+                result->length = 1;
                 this->buff++;
             }
             break;
@@ -535,9 +529,10 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
                 return this->call_error(tokenizer_error_t::invalid_redirect, this->buff,
                                         this->buff);
             }
-            result.type = redir_or_pipe->type;
-            result.redirected_fd = redir_or_pipe->fd;
-            result.length = redir_or_pipe->consumed;
+            result.emplace(redir_or_pipe->type);
+            result->offset = start_pos;
+            result->redirected_fd = redir_or_pipe->fd;
+            result->length = redir_or_pipe->consumed;
             this->buff += redir_or_pipe->consumed;
             break;
         }
@@ -553,13 +548,14 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
                 // It looks like a redirection or a pipe. But we don't support piping fd 0. Note
                 // that fd 0 may be -1, indicating overflow; but we don't treat that as a tokenizer
                 // error.
-                if (redir_or_pipe->type == TOK_PIPE && redir_or_pipe->fd == 0) {
+                if (redir_or_pipe->type == token_type_t::pipe && redir_or_pipe->fd == 0) {
                     return this->call_error(tokenizer_error_t::invalid_pipe, error_location,
                                             error_location);
                 }
-                result.type = redir_or_pipe->type;
-                result.redirected_fd = redir_or_pipe->fd;
-                result.length = redir_or_pipe->consumed;
+                result.emplace(redir_or_pipe->type);
+                result->redirected_fd = redir_or_pipe->fd;
+                result->offset = start_pos;
+                result->length = redir_or_pipe->consumed;
                 this->buff += redir_or_pipe->consumed;
             } else {
                 // Not a redirection or pipe, so just a string.
@@ -568,15 +564,17 @@ maybe_t<tok_t> tokenizer_t::tok_next() {
             break;
         }
     }
-    result.preceding_escaped_nl = preceding_escaped_nl;
+    assert(result.has_value() && "Should have a token");
+    result->preceding_escaped_nl = preceding_escaped_nl;
     return result;
 }
 
 wcstring tok_first(const wcstring &str) {
     tokenizer_t t(str.c_str(), 0);
-    tok_t token;
-    if (t.next(&token) && token.type == TOK_STRING) {
-        return t.text_of(token);
+    if (auto token = t.next()) {
+        if (token->type == token_type_t::string) {
+            return t.text_of(*token);
+        }
     }
     return {};
 }
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 0d0527e86..35b3aeb3e 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -10,17 +10,16 @@
 #include "parse_constants.h"
 
 /// Token types.
-enum token_type {
-    TOK_NONE,        /// Tokenizer not yet constructed
-    TOK_ERROR,       /// Error reading token
-    TOK_STRING,      /// String token
-    TOK_PIPE,        /// Pipe token
-    TOK_ANDAND,      /// && token
-    TOK_OROR,        /// || token
-    TOK_END,         /// End token (semicolon or newline, not literal end)
-    TOK_REDIRECT,    /// redirection token
-    TOK_BACKGROUND,  /// send job to bg token
-    TOK_COMMENT      /// comment token
+enum class token_type_t {
+    error,       /// Error reading token
+    string,      /// String token
+    pipe,        /// Pipe token
+    andand,      /// && token
+    oror,        /// || token
+    end,         /// End token (semicolon or newline, not literal end)
+    redirect,    /// redirection token
+    background,  /// send job to bg token
+    comment,     /// comment token
 };
 
 enum class redirection_type_t {
@@ -65,7 +64,7 @@ const wchar_t *tokenizer_get_error_message(tokenizer_error_t err);
 
 struct tok_t {
     // The type of the token.
-    token_type type{TOK_NONE};
+    token_type_t type;
 
     // Offset of the token.
     size_t offset{0};
@@ -85,7 +84,8 @@ struct tok_t {
     // at 'offset'.
     size_t error_offset{size_t(-1)};
 
-    tok_t() = default;
+    // Construct from a token type.
+    explicit tok_t(token_type_t type);
 };
 
 /// The tokenizer struct.
@@ -112,7 +112,6 @@ class tokenizer_t {
     tok_t call_error(tokenizer_error_t error_type, const wchar_t *token_start,
                      const wchar_t *error_loc);
     tok_t read_string();
-    maybe_t<tok_t> tok_next();
 
    public:
     /// Constructor for a tokenizer. b is the string that is to be tokenized. It is not copied, and
@@ -124,8 +123,8 @@ class tokenizer_t {
     /// token. Setting TOK_SHOW_COMMENTS will return comments as tokens
     tokenizer_t(const wchar_t *b, tok_flags_t flags);
 
-    /// Returns the next token by reference. Returns true if we got one, false if we're at the end.
-    bool next(struct tok_t *result);
+    /// Returns the next token, or none() if we are at the end.
+    maybe_t<tok_t> next();
 
     /// Returns the text of a token, as a string.
     wcstring text_of(const tok_t &tok) const { return wcstring(start + tok.offset, tok.length); }

From c160492d42f86cd2a641ae425aa4c2e3de8c3e8a Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 13 Oct 2019 23:04:18 -0700
Subject: [PATCH 1051/1732] Remove tok_t::redirected_fd

This wasn't used for anything.
---
 src/tokenizer.cpp | 3 ---
 src/tokenizer.h   | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 5e9235e0a..e823ef17e 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -513,7 +513,6 @@ maybe_t<tok_t> tokenizer_t::next() {
                 this->buff += 2;
             } else {
                 result.emplace(token_type_t::pipe);
-                result->redirected_fd = 1;
                 result->offset = start_pos;
                 result->length = 1;
                 this->buff++;
@@ -531,7 +530,6 @@ maybe_t<tok_t> tokenizer_t::next() {
             }
             result.emplace(redir_or_pipe->type);
             result->offset = start_pos;
-            result->redirected_fd = redir_or_pipe->fd;
             result->length = redir_or_pipe->consumed;
             this->buff += redir_or_pipe->consumed;
             break;
@@ -553,7 +551,6 @@ maybe_t<tok_t> tokenizer_t::next() {
                                             error_location);
                 }
                 result.emplace(redir_or_pipe->type);
-                result->redirected_fd = redir_or_pipe->fd;
                 result->offset = start_pos;
                 result->length = redir_or_pipe->consumed;
                 this->buff += redir_or_pipe->consumed;
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 35b3aeb3e..dc834365a 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -71,9 +71,6 @@ struct tok_t {
     // Length of the token.
     size_t length{0};
 
-    // If the token represents a redirection, the redirected fd.
-    maybe_t<int> redirected_fd{};
-
     // If an error, this is the error code.
     tokenizer_error_t error{tokenizer_error_t::none};
 

From 4b6de8b4a3b3948a1268f9a8a6a4d499692b3296 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 13 Oct 2019 23:05:55 -0700
Subject: [PATCH 1052/1732] Clean up a stale comment.

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

diff --git a/src/tokenizer.h b/src/tokenizer.h
index dc834365a..29606db6d 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -138,8 +138,7 @@ class tokenizer_t {
 /// returns the empty string.
 wcstring tok_first(const wcstring &str);
 
-/// Helper function to determine redirection type from a string, or TOK_NONE if the redirection is
-/// invalid. Also returns the fd by reference.
+/// Helper function to determine redirection type from a string. Also returns the fd by reference.
 maybe_t<redirection_type_t> redirection_type_for_string(const wcstring &str, int *out_fd = NULL);
 
 /// Helper function to determine which fd is redirected by a pipe.

From 5d84d3fe48095f6444d4eb635c5224900670ccec Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 14 Oct 2019 00:42:03 -0700
Subject: [PATCH 1053/1732] reader.cpp: remove unused pointer in read_ni

literally prehistoric in git blame
---
 src/reader.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 13713bd92..2cce0527a 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3483,7 +3483,6 @@ bool reader_get_selection(size_t *start, size_t *len) {
 /// highlighting. This is used for reading scripts and init files.
 static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
     FILE *in_stream;
-    wchar_t *buff = 0;
     std::vector<char> acc;
 
     int des = (fd == STDIN_FILENO ? dup(STDIN_FILENO) : fd);
@@ -3511,7 +3510,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
                     clearerr(in_stream);
                 } else {
                     // Fatal error.
-                    debug(1, _(L"Error while reading from file descriptor"));
+                    debug(1, _(L"Error while reading input file"));
                     // Reset buffer on error. We won't evaluate incomplete files.
                     acc.clear();
                     break;
@@ -3549,7 +3548,6 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
     } else {
         debug(1, _(L"Error while opening input stream"));
         wperror(L"fdopen");
-        free(buff);
         res = 1;
     }
     return res;

From d1970c7f2e910ab35de5db6c9dc7285923a1d8a5 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Mon, 14 Oct 2019 01:38:55 -0700
Subject: [PATCH 1054/1732] read_ni: be more specific in error if a file can't
 be read

for example, `fish /etc` now tells us "Is a directory"

make a couple char constants wchar_t constants
---
 src/reader.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 2cce0527a..20aeb3348 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -635,7 +635,7 @@ void reader_data_t::repaint() {
     // Re-render our completions page if necessary. Limit the term size of the pager to the true
     // term size, minus the number of lines consumed by our string. (Note this doesn't yet consider
     // wrapping).
-    int full_line_count = 1 + std::count(full_line.cbegin(), full_line.cend(), '\n');
+    int full_line_count = 1 + std::count(full_line.cbegin(), full_line.cend(), L'\n');
     pager.set_term_size(std::max(1, common_get_width()),
                         std::max(1, common_get_height() - full_line_count));
     pager.update_rendering(&current_page_rendering);
@@ -1299,7 +1299,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
             history_item_t item = searcher.current_item();
 
             // Skip items with newlines because they make terrible autosuggestions.
-            if (item.str().find('\n') != wcstring::npos) continue;
+            if (item.str().find(L'\n') != wcstring::npos) continue;
 
             if (autosuggest_validate_from_history(item, working_directory, *vars)) {
                 // The command autosuggestion was handled specially, so we're done.
@@ -2734,7 +2734,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
             // If the conditions are met, insert a new line at the position of the cursor.
             if (continue_on_next_line) {
-                insert_char(el, '\n');
+                insert_char(el, L'\n');
                 break;
             }
 
@@ -2769,7 +2769,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 repaint();
             } else if (command_test_result == PARSER_TEST_INCOMPLETE) {
                 // We are incomplete, continue editing.
-                insert_char(el, '\n');
+                insert_char(el, L'\n');
             } else {
                 // Result must be some combination including an error. The error message will
                 // already be printed, all we need to do is repaint.
@@ -3510,7 +3510,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
                     clearerr(in_stream);
                 } else {
                     // Fatal error.
-                    debug(1, _(L"Error while reading input file"));
+                    debug(0, _(L"Unable to read input file: %s"), strerror(errno));
                     // Reset buffer on error. We won't evaluate incomplete files.
                     acc.clear();
                     break;

From 087500e7b91fb482ec54cc52e917d77b0fc4143d Mon Sep 17 00:00:00 2001
From: Mark Stosberg <mark@rideamigos.com>
Date: Mon, 14 Oct 2019 12:00:12 -0400
Subject: [PATCH 1055/1732] doc: document relative path support for `source`.

[ci skip]
---
 sphinx_doc_src/cmds/source.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index facd65d3e..19ad85069 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -17,6 +17,8 @@ Description
 
 ``source`` evaluates the commands of the specified file in the current shell. This is different from starting a new process to perform the commands (i.e. ``fish < FILENAME``) 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.
 
+fish will search the working directory to resolve relative paths but will not search ``$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.

From cf3b24cf62762c43133f12ffc7b60862612f2c41 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 6 Oct 2019 12:49:56 +0200
Subject: [PATCH 1056/1732] fix typo

---
 src/builtin_complete.cpp   | 2 +-
 tests/checks/complete.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 19fcd435c..4d778b560 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -338,7 +338,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         // Allow a limited number of recursive calls to complete (#3474).
         if (parser.libdata().builtin_complete_recursion_level >= 24) {
-            streams.err.append_format(L"%ls: maximum recursive depth reached\n", cmd);
+            streams.err.append_format(L"%ls: maximum recursion depth reached\n", cmd);
         } else {
             parser.libdata().builtin_complete_recursion_level++;
 
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 6d4cd8faa..e8db603c7 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -87,4 +87,4 @@ complete -C'complete_test_recurse1 '
 # CHECKERR: recursing
 # CHECKERR: recursing
 # CHECKERR: recursing
-# CHECKERR: complete: maximum recursive depth reached
+# CHECKERR: complete: maximum recursion depth reached

From 2d2e15b63d005064b3a2a1c967048e0275b25c35 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 6 Oct 2019 15:34:43 +0200
Subject: [PATCH 1057/1732] Silently ignore recursive calls to `complete -C`
 without parameter

In e1677148999a54c7f0927fc1f37cef37835b5548 we allowed recursive calls
to complete. However, some completions use infinite recursion in their
completions and rely on `complete` to silently stop as soon as it is
called recursively twice without parameter (thus completing the
current commandline). For example:

complete -c su -s -xa "(complete -C(commandline -ct))"
su -c <TAB>

Infinite recursion happens because (commandline -ct) is an empty list,
which would print an error message.  This commmit explicitly detects
such recursive calls where `complete` has no parameter and silently
terminates.  This enables above completion (like before raising the
recursion limit) while still allowing legitimate cases with limited
recursion.

Closes #6171
---
 src/builtin_complete.cpp | 10 ++++++++--
 src/parser.h             |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 4d778b560..646c67ccd 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -336,11 +336,16 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         parser.libdata().transient_commandlines.push_back(do_complete_param);
         cleanup_t remove_transient([&] { parser.libdata().transient_commandlines.pop_back(); });
 
-        // Allow a limited number of recursive calls to complete (#3474).
-        if (parser.libdata().builtin_complete_recursion_level >= 24) {
+        if (parser.libdata().builtin_complete_current_commandline) {
+            // Prevent accidental recursion (see #6171).
+        } else if (parser.libdata().builtin_complete_recursion_level >= 24) {
+            // Allow a limited number of recursive calls to complete (#3474).
             streams.err.append_format(L"%ls: maximum recursion depth reached\n", cmd);
         } else {
             parser.libdata().builtin_complete_recursion_level++;
+            assert(!parser.libdata().builtin_complete_current_commandline);
+	    if (!have_do_complete_param)
+                parser.libdata().builtin_complete_current_commandline = true;
 
             std::vector<completion_t> comp;
             complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
@@ -379,6 +384,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             }
 
             parser.libdata().builtin_complete_recursion_level--;
+            parser.libdata().builtin_complete_current_commandline = false;
         }
     } else if (cmd_to_complete.empty() && path.empty()) {
         // No arguments specified, meaning we print the definitions of all specified completions
diff --git a/src/parser.h b/src/parser.h
index 09842702d..81ae57d52 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -132,6 +132,9 @@ struct library_data_t {
     /// Number of recursive calls to builtin_complete().
     uint32_t builtin_complete_recursion_level{0};
 
+    /// Whether we called builtin_complete -C without parameter.
+    bool builtin_complete_current_commandline{false};
+
     /// Whether we are currently cleaning processes.
     bool is_cleaning_procs{false};
 

From 35671dd9f094cf8c643c9cf224c27a2b55578937 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 14 Oct 2019 13:20:31 -0700
Subject: [PATCH 1058/1732] Clean up and unify pipes and redirections

This cleans up how pipes and redirections are recognized by the parser,
and unifies pipes and redirections into a single type.
---
 src/fish_tests.cpp      |  57 +++++---
 src/highlight.cpp       |  23 ++--
 src/parse_execution.cpp |  37 +++---
 src/tnode.cpp           |  13 +-
 src/tnode.h             |   8 +-
 src/tokenizer.cpp       | 281 ++++++++++++++++++++++------------------
 src/tokenizer.h         |  44 ++++++-
 7 files changed, 280 insertions(+), 183 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 2a566fd23..8f8b8a3c9 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -669,35 +669,60 @@ static void test_tokenizer() {
         do_test(token->error_offset == 4);
     }
 
-    // Test redirection_type_for_string.
-    if (redirection_type_for_string(L"<") != redirection_type_t::input)
+    // Test some redirection parsing.
+    auto pipe_or_redir = [](const wchar_t *s) { return pipe_or_redir_t::from_string(s); };
+    do_test(pipe_or_redir(L"|")->is_pipe);
+    do_test(pipe_or_redir(L"0>|")->is_pipe);
+    do_test(pipe_or_redir(L"0>|")->fd == 0);
+    do_test(pipe_or_redir(L"2>|")->is_pipe);
+    do_test(pipe_or_redir(L"2>|")->fd == 2);
+    do_test(pipe_or_redir(L">|")->is_pipe);
+    do_test(pipe_or_redir(L">|")->fd == STDOUT_FILENO);
+    do_test(!pipe_or_redir(L">")->is_pipe);
+    do_test(pipe_or_redir(L">")->fd == STDOUT_FILENO);
+    do_test(pipe_or_redir(L"2>")->fd == STDERR_FILENO);
+    do_test(pipe_or_redir(L"9999999999999>")->fd == -1);
+    do_test(pipe_or_redir(L"9999999999999>&2")->fd == -1);
+    do_test(pipe_or_redir(L"9999999999999>&2")->is_valid() == false);
+    do_test(pipe_or_redir(L"9999999999999>&2")->is_valid() == false);
+
+    auto get_redir_mode = [](const wchar_t *s) -> maybe_t<redirection_mode_t> {
+        if (auto redir = pipe_or_redir_t::from_string(s)) {
+            return redir->mode;
+        }
+        return none();
+    };
+
+    if (get_redir_mode(L"<") != redirection_mode_t::input)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"^") != redirection_type_t::overwrite)
+    if (get_redir_mode(L"^") != redirection_mode_t::overwrite)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L">") != redirection_type_t::overwrite)
+    if (get_redir_mode(L">") != redirection_mode_t::overwrite)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"2>") != redirection_type_t::overwrite)
+    if (get_redir_mode(L"2>") != redirection_mode_t::overwrite)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L">>") != redirection_type_t::append)
+    if (get_redir_mode(L">>") != redirection_mode_t::append)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"2>>") != redirection_type_t::append)
+    if (get_redir_mode(L"2>>") != redirection_mode_t::append)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"2>?") != redirection_type_t::noclob)
+    if (get_redir_mode(L"2>?") != redirection_mode_t::noclob)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"9999999999999999>?"))
+    if (get_redir_mode(L"9999999999999999>?") != redirection_mode_t::noclob)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"2>&3") != redirection_type_t::fd)
+    if (get_redir_mode(L"2>&3") != redirection_mode_t::fd)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
-    if (redirection_type_for_string(L"2>|"))
+    if (get_redir_mode(L"3<&0") != redirection_mode_t::fd)
+        err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
+    if (get_redir_mode(L"3</tmp/filetxt") != redirection_mode_t::input)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
 
     // Test ^ with our feature flag on and off.
     auto saved_flags = fish_features();
     mutable_fish_features().set(features_t::stderr_nocaret, false);
-    if (redirection_type_for_string(L"^") != redirection_type_t::overwrite)
+    if (get_redir_mode(L"^") != redirection_mode_t::overwrite)
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
     mutable_fish_features().set(features_t::stderr_nocaret, true);
-    if (redirection_type_for_string(L"^") != none())
+    if (get_redir_mode(L"^") != none())
         err(L"redirection_type_for_string failed on line %ld", (long)__LINE__);
     mutable_fish_features() = saved_flags;
 }
@@ -1004,8 +1029,8 @@ static void test_1_cancellation(const wchar_t *src) {
     parser_t::principal_parser().eval(src, io_chain_t{filler}, TOP);
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
-        err(L"Expected 0 bytes in out_buff, but instead found %lu bytes\n",
-            buffer->buffer().size());
+        err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
+            buffer->buffer().size(), src);
     }
     iothread_drain_all();
 }
@@ -5435,7 +5460,7 @@ int main(int argc, char **argv) {
     if (should_test_function("format")) test_format();
     if (should_test_function("convert")) test_convert();
     if (should_test_function("convert_nulls")) test_convert_nulls();
-    if (should_test_function("tok")) test_tokenizer();
+    if (should_test_function("tokenizer")) test_tokenizer();
     if (should_test_function("iothread")) test_iothread();
     if (should_test_function("pthread")) test_pthread();
     if (should_test_function("parser")) test_parser();
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 73e7b424c..6e0398dc4 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -958,11 +958,12 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
 
     if (redir_prim) {
         wcstring target;
-        const maybe_t<redirection_type_t> redirect_type =
-            redirection_type(redirection_node, this->buff, nullptr, &target);
+        const maybe_t<pipe_or_redir_t> redirect =
+            redirection_for_node(redirection_node, this->buff, &target);
 
         // We may get a missing redirection type if the redirection is invalid.
-        auto hl = redirect_type ? highlight_role_t::redirection : highlight_role_t::error;
+        auto hl = (redirect && redirect->is_valid()) ? highlight_role_t::redirection
+                                                     : highlight_role_t::error;
         this->color_node(redir_prim, hl);
 
         // Check if the argument contains a command substitution. If so, highlight it as a param
@@ -974,7 +975,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
             // disallow redirections into a non-existent directory.
             bool target_is_valid = true;
 
-            if (!redirect_type) {
+            if (!redirect || !redirect->is_valid()) {
                 // not a valid redirection
                 target_is_valid = false;
             } else if (!this->io_ok) {
@@ -990,8 +991,8 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                 // redirections). Note that the target is now unescaped.
                 const wcstring target_path =
                     path_apply_working_directory(target, this->working_directory);
-                switch (*redirect_type) {
-                    case redirection_type_t::fd: {
+                switch (redirect->mode) {
+                    case redirection_mode_t::fd: {
                         if (target == L"-") {
                             target_is_valid = true;
                         } else {
@@ -1000,16 +1001,16 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                         }
                         break;
                     }
-                    case redirection_type_t::input: {
+                    case redirection_mode_t::input: {
                         // Input redirections must have a readable non-directory.
                         struct stat buf = {};
                         target_is_valid = !waccess(target_path, R_OK) &&
                                           !wstat(target_path, &buf) && !S_ISDIR(buf.st_mode);
                         break;
                     }
-                    case redirection_type_t::overwrite:
-                    case redirection_type_t::append:
-                    case redirection_type_t::noclob: {
+                    case redirection_mode_t::overwrite:
+                    case redirection_mode_t::append:
+                    case redirection_mode_t::noclob: {
                         // Test whether the file exists, and whether it's writable (possibly after
                         // creating it). access() returns failure if the file does not exist.
                         bool file_exists = false, file_is_writable = false;
@@ -1053,7 +1054,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                         // NOCLOB means that we must not overwrite files that exist.
                         target_is_valid =
                             file_is_writable &&
-                            !(file_exists && redirect_type == redirection_type_t::noclob);
+                            !(file_exists && redirect->mode == redirection_mode_t::noclob);
                         break;
                     }
                 }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 491df34b6..badec1d8e 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -967,9 +967,15 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
 
     // Get all redirection nodes underneath the statement.
     while (auto redirect_node = node.next_in_list<g::redirection>()) {
-        int source_fd = -1;  // source fd
-        wcstring target;     // file path or target fd
-        auto redirect_type = redirection_type(redirect_node, pstree->src, &source_fd, &target);
+        wcstring target;  // file path or target fd
+        auto redirect = redirection_for_node(redirect_node, pstree->src, &target);
+
+        if (!redirect || !redirect->is_valid()) {
+            // TODO: improve this error message.
+            report_error(redirect_node, _(L"Invalid redirection: %ls"),
+                         redirect_node.get_source(pstree->src).c_str());
+            return false;
+        }
 
         // PCA: I can't justify this skip_variables flag. It was like this when I got here.
         bool target_expanded =
@@ -977,17 +983,17 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
                        parser->vars(), parser->shared());
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
-            errored =
-                report_error(redirect_node, _(L"Invalid redirection target: %ls"), target.c_str());
+            report_error(redirect_node, _(L"Invalid redirection target: %ls"), target.c_str());
+            return false;
         }
 
         // Generate the actual IO redirection.
         shared_ptr<io_data_t> new_io;
-        assert(redirect_type && "expected to have a valid redirection");
-        switch (*redirect_type) {
-            case redirection_type_t::fd: {
+        assert(redirect && redirect->is_valid() && "expected to have a valid redirection");
+        switch (redirect->mode) {
+            case redirection_mode_t::fd: {
                 if (target == L"-") {
-                    new_io.reset(new io_close_t(source_fd));
+                    new_io.reset(new io_close_t(redirect->fd));
                 } else {
                     int old_fd = fish_wcstoi(target.c_str());
                     if (errno || old_fd < 0) {
@@ -996,14 +1002,14 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
                               L"which is not a valid file descriptor");
                         errored = report_error(redirect_node, fmt, target.c_str());
                     } else {
-                        new_io.reset(new io_fd_t(source_fd, old_fd, true));
+                        new_io.reset(new io_fd_t(redirect->fd, old_fd, true));
                     }
                 }
                 break;
             }
             default: {
-                int oflags = oflags_for_redirection_type(*redirect_type);
-                io_file_t *new_io_file = new io_file_t(source_fd, target, oflags);
+                int oflags = redirect->oflags();
+                io_file_t *new_io_file = new io_file_t(redirect->fd, target, oflags);
                 new_io.reset(new_io_file);
                 break;
             }
@@ -1127,12 +1133,13 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
         tnode_t<g::statement> statement = job_cont.require_get_child<g::statement, 2>();
 
         // Handle the pipe, whose fd may not be the obvious stdout.
-        int pipe_write_fd = fd_redirected_by_pipe(get_source(pipe));
-        if (pipe_write_fd == -1) {
+        auto parsed_pipe = pipe_or_redir_t::from_string(get_source(pipe));
+        assert(parsed_pipe.has_value() && parsed_pipe->is_pipe && "Failed to parse valid pipe");
+        if (!parsed_pipe->is_valid()) {
             result = report_error(pipe, ILLEGAL_FD_ERR_MSG, get_source(pipe).c_str());
             break;
         }
-        processes.back()->pipe_write_fd = pipe_write_fd;
+        processes.back()->pipe_write_fd = parsed_pipe->fd;
 
         // Store the new process (and maybe with an error).
         processes.emplace_back(new process_t());
diff --git a/src/tnode.cpp b/src/tnode.cpp
index 5c2e62232..cc9f84743 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -55,19 +55,20 @@ enum parse_bool_statement_type_t bool_statement_type(
     return static_cast<parse_bool_statement_type_t>(cont.tag());
 }
 
-maybe_t<redirection_type_t> redirection_type(tnode_t<grammar::redirection> redirection,
-                                             const wcstring &src, int *out_fd,
-                                             wcstring *out_target) {
+maybe_t<pipe_or_redir_t> redirection_for_node(tnode_t<grammar::redirection> redirection,
+                                              const wcstring &src, wcstring *out_target) {
     assert(redirection && "redirection is missing");
-    maybe_t<redirection_type_t> result{};
     tnode_t<grammar::tok_redirection> prim = redirection.child<0>();  // like 2>
     assert(prim && "expected to have primitive");
 
+    maybe_t<pipe_or_redir_t> result{};
     if (prim.has_source()) {
-        result = redirection_type_for_string(prim.get_source(src), out_fd);
+        result = pipe_or_redir_t::from_string(prim.get_source(src));
+        assert(result.has_value() && "Failed to parse valid redirection");
+        assert(!result->is_pipe && "Should not be a pipe");
     }
     if (out_target != NULL) {
-        tnode_t<grammar::tok_string> target = redirection.child<1>();  // like &1 or file path
+        tnode_t<grammar::tok_string> target = redirection.child<1>();  // like 1 or file path
         *out_target = target.has_source() ? target.get_source(src) : wcstring();
     }
     return result;
diff --git a/src/tnode.h b/src/tnode.h
index fc2d14cc8..e65c8b783 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -242,10 +242,10 @@ enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decora
 enum parse_bool_statement_type_t bool_statement_type(
     tnode_t<grammar::job_conjunction_continuation> stmt);
 
-/// Given a redirection, get the redirection type (or none) and target (file path, or fd).
-maybe_t<redirection_type_t> redirection_type(tnode_t<grammar::redirection> redirection,
-                                             const wcstring &src, int *out_fd,
-                                             wcstring *out_target);
+/// Given a redirection node, get the parsed redirection and target of the redirection (file path,
+/// or fd).
+maybe_t<pipe_or_redir_t> redirection_for_node(tnode_t<grammar::redirection> redirection,
+                                              const wcstring &src, wcstring *out_target);
 
 /// Return the arguments under an arguments_list or arguments_or_redirection_list
 /// Do not return more than max.
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index e823ef17e..7fe4708a5 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -273,145 +273,172 @@ tok_t tokenizer_t::read_string() {
     return result;
 }
 
-// Reads a redirection or an "fd pipe" (like 2>|) from a string.
-// Returns the parsed pipe or redirection, or none() on error.
-struct parsed_redir_or_pipe_t {
-    // Number of characters consumed.
-    size_t consumed{0};
-
-    // The token type, always either TOK_PIPE or TOK_REDIRECT.
-    token_type_t type{token_type_t::redirect};
-
-    // The redirection mode if the type is TOK_REDIRECT.
-    redirection_type_t redirection_mode{redirection_type_t::overwrite};
-
-    // The redirected fd, or -1 on overflow.
-    int fd{0};
-};
-
-static maybe_t<parsed_redir_or_pipe_t> read_redirection_or_fd_pipe(const wchar_t *buff) {
-    bool errored = false;
-    parsed_redir_or_pipe_t result;
-    size_t idx = 0;
-
-    // Determine the fd. This may be specified as a prefix like '2>...' or it may be implicit like
-    // '>' or '^'. Try parsing out a number; if we did not get any digits then infer it from the
-    // first character. Watch out for overflow.
+// Parse an fd from the non-empty string [start, end), all of which are digits.
+// Return the fd, or -1 on overflow.
+static int parse_fd(const wchar_t *start, const wchar_t *end) {
+    assert(start < end && "String cannot be empty");
     long long big_fd = 0;
-    for (; iswdigit(buff[idx]); idx++) {
-        // Note that it's important we consume all the digits here, even if it overflows.
-        if (big_fd <= INT_MAX) big_fd = big_fd * 10 + (buff[idx] - L'0');
+    for (const wchar_t *cursor = start; cursor < end; ++cursor) {
+        assert(L'0' <= *cursor && *cursor <= L'9' && "Not a digit");
+        big_fd = big_fd * 10 + (*cursor - L'0');
+        if (big_fd > INT_MAX) return -1;
     }
+    assert(big_fd <= INT_MAX && "big_fd should be in range");
+    return static_cast<int>(big_fd);
+}
 
-    result.fd = (big_fd > INT_MAX ? -1 : static_cast<int>(big_fd));
+pipe_or_redir_t::pipe_or_redir_t() = default;
 
-    if (idx == 0) {
-        // We did not find a leading digit, so there's no explicit fd. Infer it from the type.
-        switch (buff[idx]) {
-            case L'>': {
-                result.fd = STDOUT_FILENO;
-                break;
+maybe_t<pipe_or_redir_t> pipe_or_redir_t::from_string(const wchar_t *buff) {
+    pipe_or_redir_t result{};
+
+    /* Examples of supported syntaxes.
+       Note we are only responsible for parsing the redirection part, not 'cmd' or 'file'.
+
+        cmd | cmd        normal pipe
+        cmd >| cmd       pipe with explicit fd
+        cmd 2>| cmd      pipe with explicit fd
+        cmd < file       stdin redirection
+        cmd > file       redirection
+        cmd >> file      appending redirection
+        cmd >? file      noclobber redirection
+        cmd >>? file     appending noclobber redirection
+        cmd 2> file      file redirection with explicit fd
+        cmd >&2 file     fd redirection with no explicit src fd (stdout is used)
+        cmd 1>&2 file    fd redirection with an explicit src fd
+        cmd <&2 file     fd redirection with no explicit src fd (stdin is used)
+        cmd 3<&0 file    fd redirection with an explicit src fd
+        cmd ^ file       caret (stderr) redirection, perhaps disabled via feature flags
+        cmd ^^ file      caret (stderr) redirection, perhaps disabled via feature flags
+    */
+
+    const wchar_t *cursor = buff;
+
+    // Extract a range of leading fd.
+    const wchar_t *fd_start = cursor;
+    while (iswdigit(*cursor)) cursor++;
+    const wchar_t *fd_end = cursor;
+    bool has_fd = (fd_end > fd_start);
+
+    // Try consuming a given character.
+    // Return true if consumed. On success, advances cursor.
+    auto try_consume = [&cursor](wchar_t c) -> bool {
+        if (*cursor != c) return false;
+        cursor++;
+        return true;
+    };
+
+    // Like try_consume, but asserts on failure.
+    auto consume = [&](wchar_t c) {
+        assert(*cursor == c && "Failed to consume char");
+        cursor++;
+    };
+
+    switch (*cursor) {
+        case L'|': {
+            if (has_fd) {
+                // Like 123|
+                return none();
             }
-            case L'<': {
-                result.fd = STDIN_FILENO;
-                break;
+            consume(L'|');
+            assert(*cursor != L'|' &&
+                   "|| passed as redirection, this should have been handled as 'or' by the caller");
+            result.fd = STDOUT_FILENO;
+            result.is_pipe = true;
+            break;
+        }
+        case L'>': {
+            consume(L'>');
+            if (try_consume(L'|')) {
+                // Note we differ from bash here.
+                // Consider `echo foo 2>| bar`
+                // In fish, this is a *pipe*. Run bar as a command and attach foo's stderr to bar's
+                // stdin, while leaving stdout as tty.
+                // In bash, this is a *redirection* to bar as a file. It is like > but ignores
+                // noclobber.
+                result.is_pipe = true;
+                result.fd = has_fd ? parse_fd(fd_start, fd_end)  // like 2>|
+                                   : STDOUT_FILENO;              // like >|
+            } else if (try_consume(L'&')) {
+                // This is a redirection to an fd.
+                result.mode = redirection_mode_t::fd;
+                result.fd = has_fd ? parse_fd(fd_start, fd_end)  // like 1>&2
+                                   : STDOUT_FILENO;              // like >&2
+            } else {
+                // This is a redirection to a file.
+                result.fd = has_fd ? parse_fd(fd_start, fd_end)  // like 1> file.txt
+                                   : STDOUT_FILENO;              // like > file.txt
+                // Note 'echo abc >>? file' is valid: it means append and noclobber.
+                // But here "noclobber" means the file must not exist, so appending
+                // can be ignored.
+                result.mode = redirection_mode_t::overwrite;
+                if (try_consume(L'>')) result.mode = redirection_mode_t::append;
+                if (try_consume(L'?')) result.mode = redirection_mode_t::noclob;
             }
-            case L'^': {
-                if (caret_redirs()) {
-                    result.fd = STDERR_FILENO;
-                } else {
-                    errored = true;
+            break;
+        }
+        case L'<': {
+            consume(L'<');
+            if (try_consume('&')) {
+                result.mode = redirection_mode_t::fd;
+            } else {
+                result.mode = redirection_mode_t::input;
+            }
+            result.fd = has_fd ? parse_fd(fd_start, fd_end)  // like 1<&3 or 1< /tmp/file.txt
+                               : STDIN_FILENO;               // like <&3 or < /tmp/file.txt
+            break;
+        }
+        case L'^': {
+            if (!caret_redirs()) {
+                // ^ is not special if caret_redirs is disabled.
+                return none();
+            } else {
+                if (has_fd) {
+                    return none();
                 }
-                break;
-            }
-            default: {
-                errored = true;
+                consume(L'^');
+                result.fd = STDERR_FILENO;
+                result.mode = redirection_mode_t::overwrite;
+                if (try_consume(L'^')) result.mode = redirection_mode_t::append;
+                if (try_consume(L'?')) result.mode = redirection_mode_t::noclob;
                 break;
             }
         }
-    }
 
-    // Either way we should have ended on the redirection character itself like '>'.
-    // Don't allow an fd with a caret redirection - see #1873
-    wchar_t redirect_char = buff[idx++];  // note increment of idx
-    if (redirect_char == L'>' || (redirect_char == L'^' && idx == 1 && caret_redirs())) {
-        result.redirection_mode = redirection_type_t::overwrite;
-        if (buff[idx] == redirect_char) {
-            // Doubled up like ^^ or >>. That means append.
-            result.redirection_mode = redirection_type_t::append;
-            idx++;
+        default: {
+            // Not a redirection.
+            return none();
         }
-    } else if (redirect_char == L'<') {
-        result.redirection_mode = redirection_type_t::input;
-    } else {
-        // Something else.
-        errored = true;
     }
 
-    // Bail on error.
-    if (errored) {
-        return none();
-    }
-
-    // Optional characters like & or ?, or the pipe char |.
-    wchar_t opt_char = buff[idx];
-    if (opt_char == L'&') {
-        result.redirection_mode = redirection_type_t::fd;
-        idx++;
-    } else if (opt_char == L'?') {
-        result.redirection_mode = redirection_type_t::noclob;
-        idx++;
-    } else if (opt_char == L'|') {
-        // So the string looked like '2>|'. This is not a redirection - it's a pipe! That gets
-        // handled elsewhere.
-        result.type = token_type_t::pipe;
-        idx++;
-    }
-
-    result.consumed = idx;
+    result.consumed = (cursor - buff);
+    assert(result.consumed > 0 && "Should have consumed at least one character on success");
     return result;
 }
 
-maybe_t<redirection_type_t> redirection_type_for_string(const wcstring &str, int *out_fd) {
-    auto v = read_redirection_or_fd_pipe(str.c_str());
-    // Redirections only, no pipes.
-    if (!v || v->type != token_type_t::redirect || v->fd < 0) return none();
-    if (out_fd) *out_fd = v->fd;
-    return v->redirection_mode;
-}
-
-int fd_redirected_by_pipe(const wcstring &str) {
-    // Hack for the common case.
-    if (str == L"|") {
-        return STDOUT_FILENO;
-    }
-    auto v = read_redirection_or_fd_pipe(str.c_str());
-    return (v && v->type == token_type_t::pipe) ? v->fd : -1;
-}
-
-int oflags_for_redirection_type(redirection_type_t type) {
-    switch (type) {
-        case redirection_type_t::append: {
+int pipe_or_redir_t::oflags() const {
+    switch (mode) {
+        case redirection_mode_t::append: {
             return O_CREAT | O_APPEND | O_WRONLY;
         }
-        case redirection_type_t::overwrite: {
+        case redirection_mode_t::overwrite: {
             return O_CREAT | O_WRONLY | O_TRUNC;
         }
-        case redirection_type_t::noclob: {
+        case redirection_mode_t::noclob: {
             return O_CREAT | O_EXCL | O_WRONLY;
         }
-        case redirection_type_t::input: {
+        case redirection_mode_t::input: {
             return O_RDONLY;
         }
-        case redirection_type_t::fd:
+        case redirection_mode_t::fd:
         default: {
             return -1;
         }
     }
 }
 
-/// Test if a character is whitespace. Differs from iswspace in that it does not consider a newline
-/// to be whitespace.
+/// Test if a character is whitespace. Differs from iswspace in that it does not consider a
+/// newline to be whitespace.
 static bool iswspace_not_nl(wchar_t c) {
     switch (c) {
         case L' ':
@@ -430,7 +457,8 @@ maybe_t<tok_t> tokenizer_t::next() {
         return none();
     }
 
-    // Consume non-newline whitespace. If we get an escaped newline, mark it and continue past it.
+    // Consume non-newline whitespace. If we get an escaped newline, mark it and continue past
+    // it.
     bool preceding_escaped_nl = false;
     for (;;) {
         if (this->buff[0] == L'\\' && this->buff[1] == L'\n') {
@@ -512,23 +540,27 @@ maybe_t<tok_t> tokenizer_t::next() {
                 result->length = 2;
                 this->buff += 2;
             } else {
-                result.emplace(token_type_t::pipe);
+                auto pipe = pipe_or_redir_t::from_string(buff);
+                assert(pipe.has_value() && pipe->is_pipe &&
+                       "Should always succeed to parse a | pipe");
+                result.emplace(pipe->token_type());
                 result->offset = start_pos;
-                result->length = 1;
-                this->buff++;
+                result->length = pipe->consumed;
+                this->buff += pipe->consumed;
             }
             break;
         }
         case L'>':
         case L'<': {
-            // There's some duplication with the code in the default case below. The key difference
-            // here is that we must never parse these as a string; a failed redirection is an error!
-            auto redir_or_pipe = read_redirection_or_fd_pipe(this->buff);
+            // There's some duplication with the code in the default case below. The key
+            // difference here is that we must never parse these as a string; a failed
+            // redirection is an error!
+            auto redir_or_pipe = pipe_or_redir_t::from_string(this->buff);
             if (!redir_or_pipe || redir_or_pipe->fd < 0) {
                 return this->call_error(tokenizer_error_t::invalid_redirect, this->buff,
                                         this->buff);
             }
-            result.emplace(redir_or_pipe->type);
+            result.emplace(redir_or_pipe->token_type());
             result->offset = start_pos;
             result->length = redir_or_pipe->consumed;
             this->buff += redir_or_pipe->consumed;
@@ -537,20 +569,20 @@ maybe_t<tok_t> tokenizer_t::next() {
         default: {
             // Maybe a redirection like '2>&1', maybe a pipe like 2>|, maybe just a string.
             const wchar_t *error_location = this->buff;
-            maybe_t<parsed_redir_or_pipe_t> redir_or_pipe;
+            maybe_t<pipe_or_redir_t> redir_or_pipe{};
             if (iswdigit(*this->buff) || (*this->buff == L'^' && caret_redirs())) {
-                redir_or_pipe = read_redirection_or_fd_pipe(this->buff);
+                redir_or_pipe = pipe_or_redir_t::from_string(this->buff);
             }
 
-            if (redir_or_pipe && redir_or_pipe->consumed > 0) {
+            if (redir_or_pipe) {
                 // It looks like a redirection or a pipe. But we don't support piping fd 0. Note
-                // that fd 0 may be -1, indicating overflow; but we don't treat that as a tokenizer
-                // error.
-                if (redir_or_pipe->type == token_type_t::pipe && redir_or_pipe->fd == 0) {
+                // that fd 0 may be -1, indicating overflow; but we don't treat that as a
+                // tokenizer error.
+                if (redir_or_pipe->is_pipe && redir_or_pipe->fd == 0) {
                     return this->call_error(tokenizer_error_t::invalid_pipe, error_location,
                                             error_location);
                 }
-                result.emplace(redir_or_pipe->type);
+                result.emplace(redir_or_pipe->token_type());
                 result->offset = start_pos;
                 result->length = redir_or_pipe->consumed;
                 this->buff += redir_or_pipe->consumed;
@@ -637,7 +669,8 @@ bool move_word_state_machine_t::consume_char_punctuation(wchar_t c) {
 
 bool move_word_state_machine_t::is_path_component_character(wchar_t c) {
     // Always treat separators as first. All this does is ensure that we treat ^ as a string
-    // character instead of as stderr redirection, which I hypothesize is usually what is desired.
+    // character instead of as stderr redirection, which I hypothesize is usually what is
+    // desired.
     return tok_is_string_character(c, true) && !std::wcschr(L"/={,}'\":@", c);
 }
 
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 29606db6d..91fd55993 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -22,7 +22,7 @@ enum class token_type_t {
     comment,     /// comment token
 };
 
-enum class redirection_type_t {
+enum class redirection_mode_t {
     overwrite,  // normal redirection: > file.txt
     append,     // appending redirection: >> file.txt
     input,      // input redirection: < file.txt
@@ -138,14 +138,44 @@ class tokenizer_t {
 /// returns the empty string.
 wcstring tok_first(const wcstring &str);
 
-/// Helper function to determine redirection type from a string. Also returns the fd by reference.
-maybe_t<redirection_type_t> redirection_type_for_string(const wcstring &str, int *out_fd = NULL);
+/// Struct wrapping up a parsed pipe or redirection.
+struct pipe_or_redir_t {
+    // The redirected fd, or -1 on overflow.
+    // In the common case of a pipe, this is 0 (STDOUT_FILENO).
+    // For example, in the case of "3>&1" this will be 3.
+    int fd{0};
 
-/// Helper function to determine which fd is redirected by a pipe.
-int fd_redirected_by_pipe(const wcstring &str);
+    // Whether we are a pipe (true) or redirection (false).
+    bool is_pipe{false};
 
-/// Helper function to return oflags (as in open(2)) for a redirection type.
-int oflags_for_redirection_type(redirection_type_t type);
+    // The redirection mode if the type is redirect.
+    // Ignored for pipes.
+    redirection_mode_t mode{redirection_mode_t::overwrite};
+
+    // Number of characters consumed when parsing the string.
+    size_t consumed{0};
+
+    // Construct from a string.
+    static maybe_t<pipe_or_redir_t> from_string(const wchar_t *buff);
+    static maybe_t<pipe_or_redir_t> from_string(const wcstring &buff) {
+        return from_string(buff.c_str());
+    }
+
+    // \return the oflags (as in open(2)) for this redirection.
+    int oflags() const;
+
+    // \return if we are "valid". Here "valid" means only that the source fd did not overflow.
+    // For example 99999999999> is invalid.
+    bool is_valid() const { return fd >= 0; }
+
+    // \return the token type for this redirection.
+    token_type_t token_type() const {
+        return is_pipe ? token_type_t::pipe : token_type_t::redirect;
+    }
+
+   private:
+    pipe_or_redir_t();
+};
 
 enum move_word_style_t {
     move_word_style_punctuation,      // stop at punctuation

From 38eb7129d31dfcad9a44cb7ba1aa10b4db23819a Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Mon, 14 Oct 2019 12:10:27 +0200
Subject: [PATCH 1059/1732] doc: add links to bg, fg and jobs in disown command

[ci skip]
---
 sphinx_doc_src/cmds/disown.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index 575b1ac86..2cc3607aa 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -17,7 +17,7 @@ Description
 
 Jobs in the list of jobs are sent a hang-up signal when fish terminates, which usually causes the job to terminate; ``disown`` allows these processes to continue regardless.
 
-If no process is specified, the most recently-used job is removed (like ``bg`` and ``fg``).  If one or more PIDs are specified, jobs with the specified process IDs are removed from the job list. Invalid jobs are ignored and a warning is printed.
+If no process is specified, the most recently-used job is removed (like :ref:`bg <cmd-bg>` and :ref:`fg <cmd-fg>`).  If one or more PIDs are specified, jobs with the specified process IDs are removed from the job list. Invalid jobs are ignored and a warning is printed.
 
 If a job is stopped, it is sent a signal to continue running, and a warning is printed. It is not possible to use the ``bg`` builtin to continue a job once it has been disowned.
 
@@ -28,4 +28,4 @@ Example
 
 ``firefox &; disown`` will start the Firefox web browser in the background and remove it from the job list, meaning it will not be closed when the fish process is closed.
 
-``disown (jobs -p)`` removes all jobs from the job list without terminating them.
+``disown (jobs -p)`` removes all :ref:`jobs <cmd-jobs>` from the job list without terminating them.

From ff2baf2591ebb476205f5b8965abcdff1fed51c7 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Tue, 15 Oct 2019 11:43:30 -0600
Subject: [PATCH 1060/1732] add completions for Visual Studio Code CLI tool

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

diff --git a/share/completions/code.fish b/share/completions/code.fish
new file mode 100644
index 000000000..9a1d2a6a8
--- /dev/null
+++ b/share/completions/code.fish
@@ -0,0 +1,41 @@
+# Visual Studio Code
+
+function __fish_complete_vscode_extensions
+  command --quiet code; and code --list-extensions
+end
+
+complete -c code -s d -l diff -d 'Compare two files with each other'
+complete -c code -s a -l add -d 'Add folder(s) to the last active window'
+complete -c code -s g -l goto -x -d 'line and character position'
+complete -c code -s n -l new-window -d 'Force to open a new window'
+complete -c code -s r -l reuse-window -d 'Force to open a file or folder in an already opened window'
+complete -c code -s w -l wait -d 'Wait for the files to be closed before returning'
+complete -c code -l locale -x -d 'The locale to use (e.g. en-US or zh-TW)'
+complete -c code -l user-data-dir -ra "(__fish_complete_directories)" -d 'Specifies the directory that user data is kept in'
+complete -c code -s v -l version -d 'Print version'
+complete -c code -s h -l help -d 'Print usage'
+complete -c code -l folder-uri -d 'Opens a window with given folder uri(s)'
+complete -c code -l file-uri -d 'Opens a window with given file uri(s)'
+
+# Extensions management
+complete -c code -l extensions-dir -d 'Set the root path for extensions'
+complete -c code -l list-extensions -d 'List the installed extensions'
+complete -c code -l show-versions -d 'Show versions of installed extensions' -n '__fish_seen_argument -l list-extensions'
+complete -c code -l install-extension -xa "(__fish_complete_vscode_extensions)" -d 'Installs or updates the extension'
+complete -c code -l force -n '__fish_seen_argument -l install-extension' -d 'Avoid prompts when installing'
+complete -c code -l enable-proposed-api -xa "(__fish_complete_vscode_extensions)" -d 'Enables proposed API features for extensions'
+complete -c code -l uninstall-extension -xa "(__fish_complete_vscode_extensions)" -d 'Uninstall extension'
+complete -c code -l disable-extension -xa "(__fish_complete_vscode_extensions)" -d 'Disable extension(s)'
+complete -c code -l disable-extensions -d 'Disable all installed extensions'
+
+# Troubleshooting
+complete -c code -l verbose -d 'Print verbose output (implies --wait)'
+complete -c code -l log -a 'critical error warn info debug trace off' -d 'Log level to use (default: info)'
+complete -c code -s s -l status -d 'Print process usage and diagnostics information'
+complete -c code -s p -l prof-modules -d 'Capture JS module performance markers'
+complete -c code -l prof-startup -d 'Run CPU profiler during startup'
+complete -c code -l inspect-extensions -d 'Allow debugging and profiling of extensions'
+complete -c code -l inspect-brk-extensions -x -d 'Allow debugging and profiling of extensions'
+complete -c code -l disable-gpu -d 'Disable GPU hardware acceleration'
+complete -c code -l upload-logs -d 'Uploads logs from current session to a secure endpoint'
+complete -c code -l max-memory -x -d 'Max memory size for a window (Mbytes)'

From 4c63ae357a55f7b0ed5f9e61aa72198d5d218f14 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Tue, 15 Oct 2019 11:56:04 -0600
Subject: [PATCH 1061/1732] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf3423007..d80fc2e88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@
   - `bosh` (#5700)
   - `camcontrol`
   - `cf` (#5700)
+  - `code` (#6205)
   - `csc` and `csi` (#6016)
   - `cwebp` (#6034)
   - `epkginfo` (#5829)

From cff721afda5a13217ad52d0e3722570ec1d9b13c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 15 Oct 2019 21:56:40 +0200
Subject: [PATCH 1062/1732] sphinx: highlight current page in the site
 navigation

Fixes #6189
---
 sphinx_doc_src/_static/custom.css | 1 +
 sphinx_doc_src/conf.py            | 1 +
 sphinx_doc_src/index.rst          | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 sphinx_doc_src/_static/custom.css

diff --git a/sphinx_doc_src/_static/custom.css b/sphinx_doc_src/_static/custom.css
new file mode 100644
index 000000000..29eb6b40b
--- /dev/null
+++ b/sphinx_doc_src/_static/custom.css
@@ -0,0 +1 @@
+.sphinxsidebar > ul.current > li.current { font-weight: bold }
diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index 6423f116b..fe9ad2180 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -29,6 +29,7 @@ def setup(app):
         os.path.join(this_dir, "fish_indent_lexer.py"), lexername="FishIndentLexer"
     )
     lexers["fish-docs-samples"] = fish_indent_lexer
+    app.add_css_file("custom.css")
 
 
 # The default language to assume
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index e24ff62e0..69e363a98 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1856,6 +1856,7 @@ Other help pages
 .. toctree::
    :maxdepth: 1
 
+   self
    commands
    design
    tutorial

From cc1c973025094736036c4c91ec83978576438fd3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 15 Oct 2019 14:37:10 -0700
Subject: [PATCH 1063/1732] Remove job_flags as an enum, just use a struct

This removes an over-complicated flag implementation, replacing it with
just a plain struct.
---
 src/builtin_bg.cpp      |  2 +-
 src/builtin_disown.cpp  |  2 +-
 src/builtin_fg.cpp      |  2 +-
 src/exec.cpp            | 14 ++++-----
 src/parse_execution.cpp |  7 +++--
 src/proc.cpp            | 16 ++++-------
 src/proc.h              | 64 +++++++++++++++++++----------------------
 7 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 60bc11bb4..2e9b4e5ea 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -31,7 +31,7 @@ static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
     streams.err.append_format(_(L"Send job %d '%ls' to background\n"), j->job_id,
                               j->command_wcstr());
     parser.job_promote(j);
-    j->set_flag(job_flag_t::FOREGROUND, false);
+    j->mut_flags().foreground = false;
     j->continue_job(parser, true, j->is_stopped());
     return STATUS_CMD_OK;
 }
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index d8e568ec9..f6c5965a3 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -35,7 +35,7 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
     // We cannot directly remove the job from the jobs() list as `disown` might be called
     // within the context of a subjob which will cause the parent job to crash in exec_job().
     // Instead, we set a flag and the parser removes the job from the jobs list later.
-    j->set_flag(job_flag_t::DISOWN_REQUESTED, true);
+    j->mut_flags().disown_requested = true;
     add_disowned_pgid(j->pgid);
 
     return STATUS_CMD_OK;
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 072e038a2..c06d2a1a7 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -105,7 +105,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     reader_write_title(job->command(), parser);
 
     parser.job_promote(job);
-    job->set_flag(job_flag_t::FOREGROUND, true);
+    job->mut_flags().foreground = true;
 
     job->continue_job(parser, true, job->is_stopped());
     return STATUS_CMD_OK;
diff --git a/src/exec.cpp b/src/exec.cpp
index 2a9957e33..f3403c9ce 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -316,7 +316,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
         // launch_process _never_ returns.
         launch_process_nofork(vars, j->processes.front().get());
     } else {
-        j->set_flag(job_flag_t::CONSTRUCTED, true);
+        j->mut_flags().constructed = true;
         j->processes.front()->completed = 1;
         return;
     }
@@ -563,15 +563,15 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     // way, the builtin does not need to know what job it is part of. It could
     // probably figure that out by walking the job list, but it seems more robust to
     // make exec handle things.
-    const int fg = j->is_foreground();
-    j->set_flag(job_flag_t::FOREGROUND, false);
+    const bool fg = j->is_foreground();
+    j->mut_flags().foreground = false;
 
     // Note this call may block for a long time, while the builtin performs I/O.
     p->status = builtin_run(parser, j->pgid, p->get_argv(), streams);
 
     // Restore the fg flag, which is temporarily set to false during builtin
     // execution so as not to confuse some job-handling builtins.
-    j->set_flag(job_flag_t::FOREGROUND, fg);
+    j->mut_flags().foreground = fg;
 
     return true;  // "success"
 }
@@ -1062,7 +1062,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     // Perhaps inherit our parent's pgid and job control flag.
     if (parent_job && parent_job->pgid != INVALID_PID) {
         j->pgid = parent_job->pgid;
-        j->set_flag(job_flag_t::JOB_CONTROL, true);
+        j->mut_flags().job_control = true;
     }
 
     if (j->pgid == INVALID_PID && should_claim_process_group_for_job(j)) {
@@ -1085,7 +1085,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         internal_exec(parser.vars(), j.get(), all_ios);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
-        bool status = j->get_flag(job_flag_t::NEGATE) ? 0 : 1;
+        bool status = j->flags().negate ? 0 : 1;
         parser.set_last_statuses(statuses_t::just(status));
         return false;
     }
@@ -1149,7 +1149,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id,
           j->command_wcstr(), j->pgid);
 
-    j->set_flag(job_flag_t::CONSTRUCTED, true);
+    j->mut_flags().constructed = true;
     if (!j->is_foreground()) {
         parser.vars().set_one(L"last_pid", ENV_GLOBAL, to_string(j->pgid));
     }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index badec1d8e..cbce87bb0 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1029,7 +1029,8 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
 
 parse_execution_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
-    job->set_flag(job_flag_t::NEGATE, !job->get_flag(job_flag_t::NEGATE));
+    auto &flags = job->mut_flags();
+    flags.negate = !flags.negate;
     return this->populate_job_process(job, proc,
                                       not_statement.require_get_child<g::statement, 1>());
 }
@@ -1263,8 +1264,8 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
     job->tmodes = tmodes;
 
-    job->set_flag(job_flag_t::FOREGROUND, !job_node_is_background(job_node));
-    job->set_flag(job_flag_t::JOB_CONTROL, wants_job_control);
+    job->mut_flags().foreground = !job_node_is_background(job_node);
+    job->mut_flags().job_control = wants_job_control;
 
     // We are about to populate a job. One possible argument to the job is a command substitution
     // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
diff --git a/src/proc.cpp b/src/proc.cpp
index d6f216c8b..b269934c8 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -177,10 +177,6 @@ bool job_t::job_chain_is_fully_constructed() const {
     return true;
 }
 
-void job_t::set_flag(job_flag_t flag, bool set) { this->flags.set(flag, set); }
-
-bool job_t::get_flag(job_flag_t flag) const { return this->flags.get(flag); }
-
 bool job_t::signal(int signal) {
     // Presumably we are distinguishing between the two cases below because we do
     // not want to send ourselves the signal in question in case the job shares
@@ -211,7 +207,7 @@ statuses_t job_t::get_statuses() const {
         st.pipestatus.push_back(p->status.status_value());
     }
     int laststatus = st.pipestatus.back();
-    st.status = (get_flag(job_flag_t::NEGATE) ? !laststatus : laststatus);
+    st.status = flags().negate ? !laststatus : laststatus;
     return st;
 }
 
@@ -453,7 +449,7 @@ void remove_disowned_jobs(job_list_t &jobs) {
     auto iter = jobs.begin();
     while (iter != jobs.end()) {
         const auto &j = *iter;
-        if (j->get_flag(job_flag_t::DISOWN_REQUESTED) && j->job_chain_is_fully_constructed()) {
+        if (j->flags().disown_requested && j->job_chain_is_fully_constructed()) {
             iter = jobs.erase(iter);
         } else {
             ++iter;
@@ -484,7 +480,7 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
     }
 
     int proc_is_job = (p->is_first_in_job && p->is_last_in_job);
-    if (proc_is_job) j->set_flag(job_flag_t::NOTIFIED, true);
+    if (proc_is_job) j->mut_flags().notified = true;
 
     // Handle signals other than SIGPIPE.
     // Always report crashes.
@@ -535,7 +531,7 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
 /// \return whether this job wants a status message printed when it stops or completes.
 static bool job_wants_message(const shared_ptr<job_t> &j) {
     // Did we already print a status message?
-    if (j->get_flag(job_flag_t::NOTIFIED)) return false;
+    if (j->flags().notified) return false;
 
     // Do we just skip notifications?
     if (j->skip_notification()) return false;
@@ -598,7 +594,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
         // Print the message if we need to.
         if (job_wants_message(j) && (j->is_completed() || j->is_stopped())) {
             print_job_status(j.get(), j->is_completed() ? JOB_ENDED : JOB_STOPPED);
-            j->set_flag(job_flag_t::NOTIFIED, true);
+            j->mut_flags().notified = true;
             printed = true;
         }
 
@@ -864,7 +860,7 @@ static bool terminal_return_from_job(job_t *j, int restore_attrs) {
 void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool send_sigcont) {
     // Put job first in the job list.
     parser.job_promote(this);
-    set_flag(job_flag_t::NOTIFIED, false);
+    mut_flags().notified = false;
 
     FLOGF(proc_job_run, L"%ls job %d, gid %d (%ls), %ls, %ls",
           send_sigcont ? L"Continue" : L"Start", job_id, pgid, command_wcstr(),
diff --git a/src/proc.h b/src/proc.h
index 166085acb..c093e5c1d 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -17,7 +17,6 @@
 #include <vector>
 
 #include "common.h"
-#include "enum_set.h"
 #include "event.h"
 #include "io.h"
 #include "parse_tree.h"
@@ -252,30 +251,6 @@ class process_t {
 typedef std::unique_ptr<process_t> process_ptr_t;
 typedef std::vector<process_ptr_t> process_list_t;
 
-/// Constants for the flag variable in the job struct.
-enum class job_flag_t {
-    /// Whether the user has been told about stopped job.
-    NOTIFIED,
-    /// Whether this job is in the foreground.
-    FOREGROUND,
-    /// Whether the specified job is completely constructed, i.e. completely parsed, and every
-    /// process in the job has been forked, etc.
-    CONSTRUCTED,
-    /// Whether the exit status should be negated. This flag can only be set by the not builtin.
-    NEGATE,
-    /// Whether the job is under job control, i.e. has its own pgrp.
-    JOB_CONTROL,
-    /// This job is disowned, and should be removed from the active jobs list.
-    DISOWN_REQUESTED,
-
-    JOB_FLAG_COUNT
-};
-
-template <>
-struct enum_info_t<job_flag_t> {
-    static constexpr auto count = job_flag_t::JOB_FLAG_COUNT;
-};
-
 typedef int job_id_t;
 job_id_t acquire_job_id(void);
 void release_job_id(job_id_t jobid);
@@ -384,15 +359,36 @@ class job_t {
     /// stops.
     struct termios tmodes {};
 
-    /// Bitset containing information about the job. A combination of the JOB_* constants.
-    enum_set_t<job_flag_t> flags{};
+    /// Flags associated with the job.
+    struct flags_t {
+        /// Whether the user has been told about stopped job.
+        bool notified{false};
 
-    // Get and set flags
-    bool get_flag(job_flag_t flag) const;
-    void set_flag(job_flag_t flag, bool set);
+        /// Whether this job is in the foreground.
+        bool foreground{false};
+
+        /// Whether the specified job is completely constructed, i.e. completely parsed, and every
+        /// process in the job has been forked, etc.
+        bool constructed{false};
+
+        /// Whether the exit status should be negated. This flag can only be set by the not builtin.
+        bool negate{false};
+
+        /// Whether the job is under job control, i.e. has its own pgrp.
+        bool job_control{false};
+
+        /// This job is disowned, and should be removed from the active jobs list.
+        bool disown_requested{false};
+    } job_flags{};
+
+    /// Access the job flags.
+    const flags_t &flags() const { return job_flags; }
+
+    /// Access mutable job flags.
+    flags_t &mut_flags() { return job_flags; }
 
     /// \return if we want job control.
-    bool wants_job_control() const { return get_flag(job_flag_t::JOB_CONTROL); }
+    bool wants_job_control() const { return flags().job_control; }
 
     /// \return if this job should own the terminal when it runs.
     bool should_claim_terminal() const { return properties.wants_terminal && is_foreground(); }
@@ -406,16 +402,16 @@ class job_t {
 
     // Helper functions to check presence of flags on instances of jobs
     /// The job has been fully constructed, i.e. all its member processes have been launched
-    bool is_constructed() const { return get_flag(job_flag_t::CONSTRUCTED); }
+    bool is_constructed() const { return flags().constructed; }
     /// The job was launched in the foreground and has control of the terminal
-    bool is_foreground() const { return get_flag(job_flag_t::FOREGROUND); }
+    bool is_foreground() const { return flags().foreground; }
     /// The job is complete, i.e. all its member processes have been reaped
     bool is_completed() const;
     /// The job is in a stopped state
     bool is_stopped() const;
     /// The job is OK to be externally visible, e.g. to the user via `jobs`
     bool is_visible() const {
-        return !is_completed() && is_constructed() && !get_flag(job_flag_t::DISOWN_REQUESTED);
+        return !is_completed() && is_constructed() && !flags().disown_requested;
     };
     bool skip_notification() const { return properties.skip_notification; }
     bool from_event_handler() const { return properties.from_event_handler; }

From ca11b5edc885a04c041345da8aa39b4abd32a4c9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 15 Oct 2019 22:33:53 -0700
Subject: [PATCH 1064/1732] Add a simple test for SIGINT out of loops

---
 tests/checks/sigint.fish | 11 +++++++++++
 tests/test.fish          |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 tests/checks/sigint.fish

diff --git a/tests/checks/sigint.fish b/tests/checks/sigint.fish
new file mode 100644
index 000000000..07f03b1cd
--- /dev/null
+++ b/tests/checks/sigint.fish
@@ -0,0 +1,11 @@
+#RUN: %fish -C "set helper %fish_test_helper" %s
+
+# Ensure we can break from a while loop.
+
+echo About to sigint
+$helper sigint_parent &
+while true ; end
+echo I should not be printed because I got sigint
+
+#CHECK: About to sigint
+#CHECKERR: Sent SIGINT to {{\d*}}
diff --git a/tests/test.fish b/tests/test.fish
index fc29fb4d2..3ee1da1b5 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -75,7 +75,10 @@ function test_littlecheck_file
     set -l file $argv[1]
     echo -n "Testing file $file ... "
     set starttime (timestamp)
-    $python ../littlecheck.py -s fish=../test/root/bin/fish $file
+    $python ../littlecheck.py \
+      -s fish=../test/root/bin/fish \
+      -s fish_test_helper=../test/root/bin/fish_test_helper \
+      $file
     set -l exit_status $status
     set -l res ok
     set test_duration (delta $starttime)

From 876176fc94f4f32dddd779735b106a38fc24f7ef Mon Sep 17 00:00:00 2001
From: ARifleman <54899319+ARifleman@users.noreply.github.com>
Date: Wed, 16 Oct 2019 00:18:18 -0600
Subject: [PATCH 1065/1732] Added 'Nord' color scheme to sample color schemes
 (#6201)

---
 share/tools/web_config/js/colorutils.js  | 36 ++++++++++++++++++++++++
 share/tools/web_config/js/controllers.js |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/share/tools/web_config/js/colorutils.js b/share/tools/web_config/js/colorutils.js
index 3ec2d69ed..4eaf3a6f8 100644
--- a/share/tools/web_config/js/colorutils.js
+++ b/share/tools/web_config/js/colorutils.js
@@ -279,6 +279,42 @@ var TomorrowTheme = {
     }
 }
 
+var nord = {
+    nord0: '2e3440',
+    nord1: '3b4252',
+    nord2: '434c5e',
+    nord3: '4c566a',
+    nord4: 'd8dee9',
+    nord5: 'e5e9f0',
+    nord6: 'eceff4',
+    nord7: '8fbcbb',
+    nord8: '88c0d0',
+    nord9: '81a1c1',
+    nord10: '5e81ac',
+    nord11: 'bf616a',
+    nord12: 'd08770',
+    nord13: 'ebcb8b',
+    nord14: 'a3be8c',
+    nord15: 'b48ead',
+};
+
+var color_scheme_nord = {
+    name: "Nord",
+    colors: dict_values(nord),
+
+    preferred_background: '#' + nord.nord0,
+
+    autosuggestion: nord.nord3,
+    command: nord.nord9,
+    comment: nord.nord2,
+    end: nord.nord8,
+    error: nord.nord13,
+    param: nord.nord6,
+    quote: nord.nord14,
+    redirection: nord.nord15,
+
+    url: 'http://www.nordtheme.com/'
+};
 
 var solarized = {
     base03: '002b36', base02: '073642', base01: '586e75', base00: '657b83', base0: '839496', base1: '93a1a1', base2: 'eee8d5', base3: 'fdf6e3', yellow: 'b58900', orange: 'cb4b16', red: 'dc322f', magenta: 'd33682', violet: '6c71c4', blue: '268bd2', cyan: '2aa198', green: '859900'
diff --git a/share/tools/web_config/js/controllers.js b/share/tools/web_config/js/controllers.js
index 5a69affa9..f1efb7d39 100644
--- a/share/tools/web_config/js/controllers.js
+++ b/share/tools/web_config/js/controllers.js
@@ -74,10 +74,10 @@ controllers.controller("colorsController", function($scope, $http) {
         $scope.noteThemeChanged();
     }
 
-    $scope.sampleTerminalBackgroundColors = ['white', '#' + solarized.base3, '#300', '#003', '#' + solarized.base03, '#232323', 'black'];
+    $scope.sampleTerminalBackgroundColors = ['white', '#' + solarized.base3, '#300', '#003', '#' + solarized.base03, '#232323', '#'+nord.nord0, 'black'];
 
     /* Array of FishColorSchemes */
-    $scope.colorSchemes = [color_scheme_fish_default, color_scheme_solarized_light, color_scheme_solarized_dark, color_scheme_tomorrow, color_scheme_tomorrow_night, color_scheme_tomorrow_night_bright];
+    $scope.colorSchemes = [color_scheme_fish_default, color_scheme_solarized_light, color_scheme_solarized_dark, color_scheme_tomorrow, color_scheme_tomorrow_night, color_scheme_tomorrow_night_bright, color_scheme_nord];
     for (var i=0; i < additional_color_schemes.length; i++)
         $scope.colorSchemes.push(additional_color_schemes[i])
 

From e3caaed73fd71a5162fc19f65165745a904e3e49 Mon Sep 17 00:00:00 2001
From: Delapouite <delapouite@gmail.com>
Date: Wed, 16 Oct 2019 09:05:59 +0200
Subject: [PATCH 1066/1732] doc: add links between dirs, pushd and popd

[ci skip]
---
 sphinx_doc_src/cmds/dirs.rst  | 2 +-
 sphinx_doc_src/cmds/popd.rst  | 2 +-
 sphinx_doc_src/cmds/pushd.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/cmds/dirs.rst b/sphinx_doc_src/cmds/dirs.rst
index 1ddabb4e8..e67d94293 100644
--- a/sphinx_doc_src/cmds/dirs.rst
+++ b/sphinx_doc_src/cmds/dirs.rst
@@ -14,7 +14,7 @@ Synopsis
 Description
 -----------
 
-``dirs`` prints the current directory stack, as created by the :ref:`pushd <cmd-pushd>` command.
+``dirs`` prints the current directory stack, as created by :ref:`pushd <cmd-pushd>` and modified by :ref:`popd <cmd-popd>`.
 
 With "-c", it clears the directory stack instead.
 
diff --git a/sphinx_doc_src/cmds/popd.rst b/sphinx_doc_src/cmds/popd.rst
index 24e8f65e0..a1e49cf4e 100644
--- a/sphinx_doc_src/cmds/popd.rst
+++ b/sphinx_doc_src/cmds/popd.rst
@@ -14,7 +14,7 @@ Synopsis
 Description
 -----------
 
-``popd`` removes the top directory from the directory stack and changes the working directory to the new top directory. Use :ref:`pushd <cmd-pushd>` to add directories to the stack.
+``popd`` removes the top directory from the directory stack and changes the working directory to the new top directory. Use :ref:`pushd <cmd-pushd>` to add directories to the stack or :ref:`dirs <cmd-dirs>` to print it.
 
 You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 
diff --git a/sphinx_doc_src/cmds/pushd.rst b/sphinx_doc_src/cmds/pushd.rst
index 5467510b1..25755b10a 100644
--- a/sphinx_doc_src/cmds/pushd.rst
+++ b/sphinx_doc_src/cmds/pushd.rst
@@ -21,7 +21,7 @@ Without arguments, it exchanges the top two directories in the stack.
 
 ``pushd -NUMBER`` rotates clockwise i.e. top to bottom.
 
-See also ``dirs`` and ``dirs -c``.
+See also :ref:`dirs <cmd-dirs>` to print the stack and ``dirs -c`` to clear it.
 
 You may be interested in the :ref:`cdh <cmd-cdh>` command which provides a more intuitive way to navigate to recently visited directories.
 

From 203a2e7af455f324bffa1f25374ba34692339ca4 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 15 Oct 2019 21:45:20 +0200
Subject: [PATCH 1067/1732] completions/grep: specify some required parameters

---
 share/completions/grep.fish | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/share/completions/grep.fish b/share/completions/grep.fish
index c8e164353..b5f336453 100644
--- a/share/completions/grep.fish
+++ b/share/completions/grep.fish
@@ -1,7 +1,7 @@
-complete -c grep -s A -l after-context -d "Print NUM lines of trailing context"
+complete -c grep -s A -l after-context -d "Print NUM lines of trailing context" -x
 complete -c grep -s a -l text -d "Process binary file as text"
-complete -c grep -s B -l before-context -d "Print NUM lines of leading context"
-complete -c grep -s C -l context -d "Print NUM lines of context"
+complete -c grep -s B -l before-context -d "Print NUM lines of leading context" -x
+complete -c grep -s C -l context -d "Print NUM lines of context" -x
 complete -c grep -s b -l byte-offset -d "Print byte offset of matches"
 complete -c grep -l binary-files -d "Assume data type for binary files" -x -a "binary\tBinary\ format text\tText\ format"
 complete -c grep -l colour -f -d "Colour output" -a "never always auto"
@@ -10,11 +10,11 @@ complete -c grep -s c -l count -d "Only print number of matches"
 complete -c grep -s D -l devices -x -a "read skip" -d "Action for devices"
 complete -c grep -s d -l directories -x -a "read skip recurse" -d "Action for directories"
 complete -c grep -s E -l extended-regexp -d "Pattern is extended regexp"
-complete -xc grep -s e -l regexp -d "Pattern is a regexp"
+complete -xc grep -s e -l regexp -d "Specify a pattern"
 complete -rc grep -l exclude-from -d "Read pattern list from file. Skip files whose base name matches list"
 complete -rc grep -l exclude-dir -d "Exclude matching directories from recursive searches"
 complete -c grep -s F -l fixed-strings -d "Pattern is a fixed string"
-complete -rc grep -s f -l file -r -d "Use patterns from a file"
+complete -rc grep -s f -l file -d "Use patterns from a file"
 complete -c grep -s G -l basic-regexp -d "Pattern is basic regex"
 complete -c grep -s H -l with-filename -d "Print filename"
 complete -c grep -s h -l no-filename -d "Suppress printing filename"
@@ -27,15 +27,15 @@ complete -c grep -s m -l max-count -d "Stop reading after NUM matches"
 complete -c grep -l mmap -d "Use the mmap system call to read input"
 complete -c grep -s n -l line-number -d "Print line number"
 complete -c grep -s o -l only-matching -d "Show only matching part"
-complete -c grep -l label -d "Rename stdin"
+complete -c grep -l label -d "Rename stdin" -x
 complete -c grep -l line-buffered -d "Use line buffering"
 complete -c grep -s P -l perl-regexp -d "Pattern is a Perl regexp (PCRE) string"
 complete -c grep -s q -l quiet -d "Do not write anything"
 complete -c grep -l silent -d "Do not write anything"
 complete -c grep -s R -l recursive -d "Read files under each directory, recursively"
 complete -c grep -s r -d "Read files under each directory, recursively"
-complete -c grep -l include -d "Search only files matching PATTERN"
-complete -c grep -l exclude -d "Skip files matching PATTERN"
+complete -c grep -l include -d "Search only files matching PATTERN" -r
+complete -c grep -l exclude -d "Skip files matching PATTERN" -r
 complete -c grep -s s -l no-messages -d "Suppress error messages"
 complete -c grep -s T -l initial-tab -d "Ensure first character of actual line content lies on a tab stop"
 complete -c grep -s U -l binary -d "Treat files as binary"

From 41bcf77e25f07cc6748776290824b7b0bc01dbdd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 12:58:17 +0200
Subject: [PATCH 1068/1732] fix comment

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

diff --git a/src/complete.cpp b/src/complete.cpp
index 4d78260fc..8829e4541 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -745,7 +745,7 @@ void completer_t::complete_abbr(const wcstring &cmd) {
 /// @param  desc
 ///    Description of the completion
 /// @param  flags
-///    The list into which the results will be inserted
+///    The flags
 ///
 void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
                                      const wcstring &desc, complete_flags_t flags) {

From eae1683033ca3eddeece1ddf150e2fc7bc90fa45 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Sep 2019 14:12:56 +0200
Subject: [PATCH 1069/1732] Completion: complete argument to last of a group of
 short options

Consider a group of short options, like -xzPARAM, where x and z are options and z takes an argument.

This commit enables completion of the argument to the last option (z), both within the same
token (-xzP) or in the next one (-xz P).

complete -C'-xz' will complete only parameters to z.
complete -C'-xz ' will complete only parameters to z if z requires a parameter
otherwise, it will also complete non-option parameters

To do so this implements a heuristic to differentiate such strings from single long options. To
detect whether our token contains some short options, we only require the first character after the
dash (here x) to be an option. Previously, all characters had to be short options. The last option
in our example is z. Everything after the last option is assumed to be a parameter to the last
option.

Assume there is also a single long option -x-foo, then complete -C'-x' will suggest both -x-foo and
-xy. However, when the single option x requires an argument, this will not suggest -x-foo.
However, I assume this will almost never happen in practise since completions very rarely mix
short and single long options.

Fixes #332
---
 src/complete.cpp           | 115 +++++++++++++++++++++----------------
 tests/checks/complete.fish |  36 ++++++++++++
 2 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 8829e4541..28eed5b96 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -812,58 +812,43 @@ static const wchar_t *param_match2(const complete_entry_opt_t *e, const wchar_t
 
     // Short options are like -DNDEBUG. Long options are like --color=auto. So check for an equal
     // sign for long options.
-    if (e->type != option_type_short) {
-        if (optstr[cursor] != L'=') {
-            return NULL;
-        }
-        cursor += 1;
+    assert(e->type != option_type_short);
+    if (optstr[cursor] != L'=') {
+        return NULL;
     }
+    cursor += 1;
     return &optstr[cursor];
 }
 
-/// Tests whether a short option is a viable completion. arg_str will be like '-xzv', nextopt will
-/// be a character like 'f' options will be the list of all options, used to validate the argument.
-static bool short_ok(const wcstring &arg, const complete_entry_opt_t *entry,
-                     const option_list_t &options) {
-    // Ensure it's a short option.
-    if (entry->type != option_type_short || entry->option.empty()) {
-        return false;
+/// Parses a token of short options plus one optional parameter like
+/// '-xzPARAM', where x and z are short options.
+///
+/// Returns the position of the last option character (e.g. the position of z which is 2).
+/// Everything after that is assumed to be part of the parameter.
+/// Returns wcstring::npos if there is no valid short option.
+size_t short_option_pos(const wcstring &arg, const option_list_t &options) {
+    if (arg.size() <= 1 || leading_dash_count(arg.c_str()) != 1) {
+        return wcstring::npos;
     }
-    const wchar_t nextopt = entry->option.at(0);
-
-    // Empty strings are always 'OK'.
-    if (arg.empty()) {
-        return true;
-    }
-
-    // The argument must start with exactly one dash.
-    if (leading_dash_count(arg.c_str()) != 1) {
-        return false;
-    }
-
-    // Short option must not be already present.
-    if (arg.find(nextopt) != wcstring::npos) {
-        return false;
-    }
-
-    // Verify that all characters in our combined short option list are present as short options in
-    // the options list. If we get a short option that can't be combined (NO_COMMON), then we stop.
-    bool result = true;
-    for (size_t i = 1; i < arg.size(); i++) {
-        wchar_t arg_char = arg.at(i);
-        const complete_entry_opt_t *match = NULL;
-        for (option_list_t::const_iterator iter = options.begin(); iter != options.end(); ++iter) {
-            if (iter->type == option_type_short && iter->option.at(0) == arg_char) {
-                match = &*iter;
+    for (size_t pos = 1; pos < arg.size(); pos++) {
+        wchar_t arg_char = arg.at(pos);
+        const complete_entry_opt_t *match = nullptr;
+        for (const complete_entry_opt_t &o : options) {
+            if (o.type == option_type_short && o.option.at(0) == arg_char) {
+                match = &o;
                 break;
             }
         }
-        if (match == NULL || (match->result_mode.requires_param)) {
-            result = false;
-            break;
+        if (match == nullptr) {
+            // The first character after the dash is not a valid option.
+            if (pos == 1) return wcstring::npos;
+            return pos - 1;
+        }
+        if (match->result_mode.requires_param) {
+            return pos;
         }
     }
-    return result;
+    return arg.size() - 1;
 }
 
 /// Load command-specific completions for the specified command.
@@ -954,13 +939,23 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
     // Now release the lock and test each option that we captured above. We have to do this outside
     // the lock because callouts (like the condition) may add or remove completions. See issue 2.
     for (const option_list_t &options : all_options) {
+        size_t short_opt_pos = short_option_pos(str, options);
+        bool last_option_requires_param = false;
         use_common = 1;
         if (use_switches) {
             if (str[0] == L'-') {
                 // Check if we are entering a combined option and argument (like --color=auto or
                 // -I/usr/include).
                 for (const complete_entry_opt_t &o : options) {
-                    const wchar_t *arg = param_match2(&o, str.c_str());
+                    const wchar_t *arg;
+                    if (o.type == option_type_short) {
+                        if (short_opt_pos == wcstring::npos) continue;
+                        if (o.option.at(0) != str.at(short_opt_pos)) continue;
+                        last_option_requires_param = o.result_mode.requires_param;
+                        arg = str.c_str() + short_opt_pos + 1;
+                    } else {
+                        arg = param_match2(&o, str.c_str());
+                    }
                     if (arg != NULL && this->condition_test(o.condition)) {
                         if (o.result_mode.requires_param) use_common = false;
                         if (o.result_mode.no_files) use_files = false;
@@ -987,17 +982,27 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                 }
 
                 // No old style option matched, or we are not using old style options. We check if
-                // any short (or gnu style options do.
+                // any short (or gnu style) options do.
                 if (!old_style_match) {
+                    size_t prev_short_opt_pos = short_option_pos(popt, options);
                     for (const complete_entry_opt_t &o : options) {
                         // Gnu-style options with _optional_ arguments must be specified as a single
                         // token, so that it can be differed from a regular argument.
                         // Here we are testing the previous argument for a GNU-style match,
                         // to see how we should complete the current argument
-                        if (o.type == option_type_double_long && !o.result_mode.requires_param)
-                            continue;
+                        if (!o.result_mode.requires_param) continue;
 
-                        if (param_match(&o, popt.c_str()) && this->condition_test(o.condition)) {
+                        bool match = false;
+                        if (o.type == option_type_short) {
+                            match = prev_short_opt_pos != wcstring::npos &&
+                                    // Only if the option was the last char in the token,
+                                    // i.e. there is no parameter yet.
+                                    prev_short_opt_pos + 1 == popt.size() &&
+                                    o.option.at(0) == popt.at(prev_short_opt_pos);
+                        } else if (o.type == option_type_double_long) {
+                            match = param_match(&o, popt.c_str());
+                        }
+                        if (match && this->condition_test(o.condition)) {
                             if (o.result_mode.requires_param) use_common = false;
                             if (o.result_mode.no_files) use_files = false;
                             if (o.result_mode.force_files) has_force = true;
@@ -1026,7 +1031,21 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
             }
 
             // Check if the short style option matches.
-            if (short_ok(str, &o, options)) {
+            if (o.type == option_type_short) {
+                wchar_t optchar = o.option.at(0);
+                if (short_opt_pos == wcstring::npos) {
+                    // str has no short option at all (but perhaps it is the
+                    // prefix of a single long option).
+                    // Only complete short options if there is no character after the dash.
+                    if (str != L"-") continue;
+                } else {
+                    // Only complete when the last short option has no parameter yet..
+                    if (short_opt_pos + 1 != str.size()) continue;
+                    // .. and it does not require one ..
+                    if (last_option_requires_param) continue;
+                    // .. and the option is not already there.
+                    if (str.find(optchar) != wcstring::npos) continue;
+                }
                 // It's a match.
                 wcstring desc = o.localized_desc();
                 // Append a short-style option
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index e8db603c7..48095f39d 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -88,3 +88,39 @@ complete -C'complete_test_recurse1 '
 # CHECKERR: recursing
 # CHECKERR: recursing
 # CHECKERR: complete: maximum recursion depth reached
+
+# short options
+complete -c foo -f -a non-option-argument
+complete -c foo -f --short-option x
+complete -c foo -f --short-option y -a 'ARGY'
+complete -c foo -f --short-option z -a 'ARGZ' -r
+complete -c foo -f --old-option single-long-ending-in-z
+complete -c foo -f --old-option x-single-long
+complete -c foo -f --old-option y-single-long
+complete -c foo -f --old-option z-single-long
+complete -c foo -f --long-option x-long -a 'ARGLONG'
+# Make sure that arguments of concatenated short options are expanded (#332)
+complete -C'foo -xy'
+# CHECK: -xyARGY
+# CHECK: -xyz
+# A required parameter means we don't want more short options.
+complete -C'foo -yz'
+# CHECK: -yzARGZ
+# Required parameter with space: complete only the parameter (no non-option arguments).
+complete -C'foo -xz '
+# CHECK: ARGZ
+# Optional parameter with space: complete only non-option arguments.
+complete -C'foo -xy '
+# CHECK: non-option-argument
+complete -C'foo -single-long-ending-in-z'
+# CHECK: -single-long-ending-in-z
+complete -C'foo -single-long-ending-in-z '
+# CHECK: non-option-argument
+# CHECK: -x-single-long
+complete -C'foo -x' | string match -- -x-single-long
+# CHECK: -y-single-long
+complete -C'foo -y' | string match -- -y-single-long
+# This does NOT suggest -z-single-long, but will probably not occur in practise.
+# CHECK: -zARGZ
+complete -C'foo -z'
+

From 3c727173c2bcad29cbafe46462b19147fa2f6efa Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 16 Oct 2019 11:55:40 -0700
Subject: [PATCH 1070/1732] Include ctime in history_file.h

Fixes a build failure on FreeBSD.

Fixes #6210
---
 src/history_file.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/history_file.h b/src/history_file.h
index 8bd209180..bc5992011 100644
--- a/src/history_file.h
+++ b/src/history_file.h
@@ -6,6 +6,7 @@
 #include <sys/mman.h>
 
 #include <cassert>
+#include <ctime>
 #include <memory>
 
 #include "maybe.h"

From 9a99836c745a22ec9b81617ffca93c4a7bef0c02 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 16 Oct 2019 18:56:27 -0500
Subject: [PATCH 1071/1732] [rustup] Fix `string replace` coalesce of multiple
 $argv

[ci skip]
---
 share/completions/rustup.fish | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index e1c7c1dc6..e8bd1b9eb 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -178,13 +178,13 @@ end
 # Strip result of __rustup_common_suffix
 function __rustup_strip_common_suffix
 	set -l suffix (__rustup_common_suffix $argv)
-	string replace -r -- (string escape --style=regex -- $suffix)\$ "" $argv
+	printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
 end
 
 # Strip result of __rustup_common_suffix, but require suffix to begin at a literal -
 function __rustup_strip_common_suffix_strict
 	set -l suffix (__rustup_common_suffix $argv | string match -r -- "-.*")
-	string replace -r -- (string escape --style=regex -- $suffix)\$ "" $argv
+	printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
 end
 
 function __rustup_all_toolchains
@@ -201,18 +201,18 @@ end
 
 function __rustup_installed_components
 	# If the user has supplied `--toolchain foo`, use it to filter the list
-	set -l toolchain (commandline -j | string replace -r ".*\s--toolchain\s+(\S+)\s.*" '$1')
+	set -l toolchain (commandline -j | string replace -rf ".*\s--toolchain\s+(\S+)\s.*" '$1')
 	set -l toolchain_filter
 	if string match -qr . -- $toolchain
 		set toolchain_filter "--toolchain $toolchain"
 	end
 
 	set -l installed (rustup component list --installed $toolchain_filter)
-	__rustup_common_suffix_strict $installed
+	__rustup_strip_common_suffix_strict $installed
 end
 
 # Trim trailing attributes, e.g. "rust-whatever (default)" -> "rust-whatever"
-set -l __rustup_toolchains (rustup toolchain list | string replace -rf "\s+.*" '')
+set -l __rustup_toolchains (rustup toolchain list | string replace -r "\s+.*" '')
 # By default, the long name of a toolchain is used (e.g. nightly-x86_64-unknown-linux-gnu),
 # but a shorter version can be used if it is unambiguous.
 set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_toolchains)
@@ -226,12 +226,12 @@ complete -c rustup -n "__fish_should_complete_switches" -s V -l version
 
 complete -c rustup -n "__fish_is_first_token" -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 default" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 complete -c rustup -n "__fish_prev_arg_in toolchain" -xa "add install list remove uninstall link help"
 complete -c rustup -n "__fish_prev_arg_in target" -xa "list add install remove uninstall help"
 complete -c rustup -n "__fish_prev_arg_in component" -xa "list add install remove uninstall help"
 complete -c rustup -n "__fish_prev_arg_in override" -xa "list set unset help"
-complete -c rustup -n "__fish_prev_arg_in run" -xa "$__rustup_toolchains_short $rustup_toolchains"
+complete -c rustup -n "__fish_prev_arg_in run" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 complete -c rustup -n "__fish_prev_arg_in self" -xa "update remove uninstall upgrade-data help"
 complete -c rustup -n "__fish_prev_arg_in set" -xa "default-host help"
 
@@ -249,5 +249,5 @@ complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in d
 	-xa "(__rustup_triples)"
 
 # Global argument completions where valid
-complete -c rustup -n "__fish_prev_arg_in --toolchain" -xa "$__rustup_toolchains $rustup_toolchains"
+complete -c rustup -n "__fish_prev_arg_in --toolchain" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 

From b29fd88cad6861c8040f4f5cda3205b55798aae0 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 16 Oct 2019 19:05:44 -0500
Subject: [PATCH 1072/1732] [rustup] Add completions for `rustup show` and
 `rustup profile`

[ci skip]
---
 share/completions/rustup.fish | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index e8bd1b9eb..3315ddadc 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -17,6 +17,12 @@ set -l subcmds \
 	# "completions" \
 	"help"
 
+set -l rustup_show \
+    "active-toolchain" \
+    "home" \
+    "profile" \
+    "help"
+
 # rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended
 function  __rustup_components
 	rustup component list | string match -r "^\S+" | string replace -f -- "-x86_64-unknown-linux-gnu" ""
@@ -220,6 +226,8 @@ set -l __rustup_toolchains_short (__rustup_strip_common_suffix_strict $__rustup_
 # Needs to be global to retain access from functions
 set __rustup_channels "beta" "stable" "nightly"
 
+set rustup_profiles "minimal" "default" "complete"
+
 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
@@ -233,7 +241,7 @@ complete -c rustup -n "__fish_prev_arg_in component" -xa "list add install remov
 complete -c rustup -n "__fish_prev_arg_in override" -xa "list set unset help"
 complete -c rustup -n "__fish_prev_arg_in run" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 complete -c rustup -n "__fish_prev_arg_in self" -xa "update remove uninstall upgrade-data help"
-complete -c rustup -n "__fish_prev_arg_in set" -xa "default-host help"
+complete -c rustup -n "__fish_prev_arg_in set" -xa "default-host profile help"
 
 complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_arg_in remove uninstall" \
 	-xa "$__rustup_toolchains $__rustup_toolchains_short"
@@ -245,9 +253,14 @@ complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_ar
 complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \
 	-xa "(__rustup_components)"
 
+complete -c rustup -n "__fish_seen_subcommand_from show;" -xa "$rustup_show"
+
 complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in default-host" \
 	-xa "(__rustup_triples)"
 
+complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in profile" \
+    -xa "$rustup_profiles"
+
 # Global argument completions where valid
 complete -c rustup -n "__fish_prev_arg_in --toolchain" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 

From 9c4edb68ff6a25c59d419068a1ed66e9120624d0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 17 Oct 2019 17:45:15 +0200
Subject: [PATCH 1073/1732] Add g++ completions that wrap gcc

Should be alright for a first pass.

Fixes #6217.

[ci skip]
---
 share/completions/g++.fish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 share/completions/g++.fish

diff --git a/share/completions/g++.fish b/share/completions/g++.fish
new file mode 100644
index 000000000..c7372f10d
--- /dev/null
+++ b/share/completions/g++.fish
@@ -0,0 +1 @@
+complete -c g++ -w gcc

From a2672dea7af950927e1e0a513aa56c44d7cd0b36 Mon Sep 17 00:00:00 2001
From: Delapouite <delapouite@gmail.com>
Date: Thu, 17 Oct 2019 08:49:42 +0200
Subject: [PATCH 1074/1732] doc: fix links pointing to history-search section

[ci skip]
---
 sphinx_doc_src/cmds/history.rst |  2 +-
 sphinx_doc_src/index.rst        | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sphinx_doc_src/cmds/history.rst b/sphinx_doc_src/cmds/history.rst
index 003ad0c92..0eefb7192 100644
--- a/sphinx_doc_src/cmds/history.rst
+++ b/sphinx_doc_src/cmds/history.rst
@@ -18,7 +18,7 @@ Synopsis
 Description
 -----------
 
-``history`` is used to search, delete, and otherwise manipulate the history of interactive commands.
+``history`` is used to search, delete, and otherwise manipulate the :ref:`history of interactive commands <history-search>`.
 
 The following operations (sub-commands) are available:
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 69e363a98..59c08ce66 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -504,7 +504,7 @@ Help on a specific builtin can also be obtained with the ``-h`` parameter. For i
 Autosuggestions
 ===============
 
-fish suggests commands as you type, based on command history, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
+fish suggests commands as you type, based on `command history <#history-search>`_, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
 
 To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+→,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
 
@@ -1397,7 +1397,7 @@ For a list of all builtins, functions and commands shipped with fish, see the :r
 Command line editor
 ===================
 
-The ``fish`` editor features copy and paste, a searchable history and many editor functions that can be bound to special keyboard shortcuts.
+The ``fish`` editor features copy and paste, a `searchable history <#history-search>`_ and many editor functions that can be bound to special keyboard shortcuts.
 
 Similar to bash, fish has Emacs and Vi editing modes. The default editing mode is Emacs. You can switch to Vi mode with ``fish_vi_key_bindings`` and switch back with ``fish_default_key_bindings``. You can also make your own key bindings by creating a function and setting $fish_key_bindings to its name. For example::
 
@@ -1424,9 +1424,9 @@ Some bindings are shared between emacs- and vi-mode because they aren't text edi
 
 - :kbd:`Shift,←,Left` and :kbd:`Shift,→,Right` move the cursor one word left or right, without stopping on punctuation.
 
-- :kbd:`↑` (Up) and :kbd:`↓` (Down) (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`↑` (Up) and :kbd:`↓` (Down) (or :kbd:`Control+P` and :kbd:`Control+N` for emacs aficionados) search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the `history <#history-search>`_ section for more information on history searching.
 
-- :kbd:`Alt+↑,Up` and :kbd:`Alt+↓,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`Alt+↑,Up` and :kbd:`Alt+↓,Down` search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the `history <#history-search>`_ section for more information on history searching.
 
 - :kbd:`Control+C` cancels the entire line.
 
@@ -1551,7 +1551,7 @@ Command mode is also known as normal mode.
 
 - :kbd:`u` search history backwards.
 
-- :kbd:`[` and :kbd:`]` search the command history for the previous/next token containing the token under the cursor before the search was started. See the `history <#history>`_ section for more information on history searching.
+- :kbd:`[` and :kbd:`]` search the command history for the previous/next token containing the token under the cursor before the search was started. See the `history <#history-search>`_ section for more information on history searching.
 
 - :kbd:`Backspace` moves the cursor left.
 
@@ -1607,6 +1607,8 @@ The command history is stored in the file ``~/.local/share/fish/fish_history`` (
 ``fish_history`` environment variable to change the name of the history session (resulting in a
 ``<session>_history`` file); both before starting the shell and while the shell is running.
 
+See the :ref:`history <cmd-history>` command for other manipulations.
+
 Examples:
 
 To search for previous entries containing the word 'make', type ``make`` in the console and press the up key.

From ed8b0c8c0c35ca36e6ecdf1cf48b6004792f09d7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 17 Oct 2019 03:04:33 +0200
Subject: [PATCH 1075/1732] Add completions for the kakoune editor

[ci skip]
---
 share/completions/kak.fish | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 share/completions/kak.fish

diff --git a/share/completions/kak.fish b/share/completions/kak.fish
new file mode 100644
index 000000000..7f99981fe
--- /dev/null
+++ b/share/completions/kak.fish
@@ -0,0 +1,17 @@
+complete -c kak -s c -x -a '(command kak -l)' -d 'connect to given session'
+complete -c kak -s e -x -d 'execute argument on client initialisation'
+complete -c kak -s E -x -d 'execute argument on server initialisation'
+complete -c kak -s n -d 'do not source kakrc files on startup'
+complete -c kak -s s -x -d 'set session name'
+complete -c kak -s d -d 'run as a headless session (requires -s)'
+complete -c kak -s p -x -d 'just send stdin as commands to the given session'
+complete -c kak -s f -x -d 'filter: for each file, select the entire buffer and execute the given keys'
+complete -c kak -s i -x -d 'backup the files o nwhich a filter is applied using the given suffix'
+complete -c kak -s q -d 'in filter mode be quiet about errors applying keys'
+complete -c kak -o ui -x -a 'ncurses dummy json' -d 'set the type of user interface to use'
+complete -c kak -s l -d 'list existing sessions'
+complete -c kak -o clear -d 'clear dead sessions'
+complete -c kak -o debug -x -d 'initial debug option value'
+complete -c kak -o version -d 'display kakoune version and exit'
+complete -c kak -o ro -d 'readonly mode'
+complete -c kak -o help -d 'display a help message and quit'

From 2fed311d4ccb6d337cdd6014ed10b0611e15718d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 17 Oct 2019 02:56:55 +0200
Subject: [PATCH 1076/1732] builtin commandline: fix flags -p and -j not
 splitting on && and ||

Fixes #6214
---
 CHANGELOG.md       | 1 +
 src/parse_util.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d80fc2e88..18a38f334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
 - `jobs --last` returns 0 to indicate success when a job is found (#6104).
+- `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214)
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index a3c9e2616..842d1cc59 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -323,12 +323,14 @@ static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const
                 }
                 /* FALLTHROUGH */
                 case token_type_t::end:
-                case token_type_t::background: {
+                case token_type_t::background:
+                case token_type_t::andand:
+                case token_type_t::oror: {
                     if (tok_begin >= pos) {
                         finished = 1;
                         if (b) *b = (wchar_t *)begin + tok_begin;
                     } else {
-                        if (a) *a = (wchar_t *)begin + tok_begin + 1;
+                        if (a) *a = (wchar_t *)begin + tok_begin + token->length;
                     }
                     break;
                 }

From 9652b3e11b39d8fd56f565d39059fb419fd95fc4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 18 Oct 2019 15:24:28 -0700
Subject: [PATCH 1077/1732] Clean up job_or_process_extent

This had a bad merge which happened to work, plus some other nonsense.
---
 src/parse_util.cpp | 66 ++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 842d1cc59..eb7a94f59 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -289,14 +289,13 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
 
 /// Get the beginning and end of the job or process definition under the cursor.
 static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **a,
-                                  const wchar_t **b, int process) {
+                                  const wchar_t **b, bool process) {
     assert(buff && "Null buffer");
-    const wchar_t *begin, *end;
-    wchar_t *buffcpy;
+    const wchar_t *begin = nullptr, *end = nullptr;
     int finished = 0;
 
-    if (a) *a = 0;
-    if (b) *b = 0;
+    if (a) *a = nullptr;
+    if (b) *b = nullptr;
     parse_util_cmdsubst_extent(buff, cursor_pos, &begin, &end);
     if (!end || !begin) {
         return;
@@ -307,49 +306,46 @@ static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const
 
     if (a) *a = begin;
     if (b) *b = end;
-    buffcpy = wcsndup(begin, end - begin);
-    assert(buffcpy != NULL);
 
-    tokenizer_t tok(buffcpy, TOK_ACCEPT_UNFINISHED);
-    for (maybe_t<tok_t> token = tok.next(); token && !finished; token = tok.next())
-        while ((token = tok.next()) && !finished) {
-            size_t tok_begin = token->offset;
+    const wcstring buffcpy(begin, end);
+    tokenizer_t tok(buffcpy.c_str(), TOK_ACCEPT_UNFINISHED);
+    maybe_t<tok_t> token{};
+    while ((token = tok.next()) && !finished) {
+        size_t tok_begin = token->offset;
 
-            switch (token->type) {
-                case token_type_t::pipe: {
-                    if (!process) {
-                        break;
-                    }
-                }
-                /* FALLTHROUGH */
-                case token_type_t::end:
-                case token_type_t::background:
-                case token_type_t::andand:
-                case token_type_t::oror: {
-                    if (tok_begin >= pos) {
-                        finished = 1;
-                        if (b) *b = (wchar_t *)begin + tok_begin;
-                    } else {
-                        if (a) *a = (wchar_t *)begin + tok_begin + token->length;
-                    }
-                    break;
-                }
-                default: {
+        switch (token->type) {
+            case token_type_t::pipe: {
+                if (!process) {
                     break;
                 }
             }
+            /* FALLTHROUGH */
+            case token_type_t::end:
+            case token_type_t::background:
+            case token_type_t::andand:
+            case token_type_t::oror: {
+                if (tok_begin >= pos) {
+                    finished = 1;
+                    if (b) *b = (wchar_t *)begin + tok_begin;
+                } else {
+                    if (a) *a = (wchar_t *)begin + tok_begin + token->length;
+                }
+                break;
+            }
+            default: {
+                break;
+            }
         }
-
-    free(buffcpy);
+    }
 }
 
 void parse_util_process_extent(const wchar_t *buff, size_t pos, const wchar_t **a,
                                const wchar_t **b) {
-    job_or_process_extent(buff, pos, a, b, 1);
+    job_or_process_extent(buff, pos, a, b, true);
 }
 
 void parse_util_job_extent(const wchar_t *buff, size_t pos, const wchar_t **a, const wchar_t **b) {
-    job_or_process_extent(buff, pos, a, b, 0);
+    job_or_process_extent(buff, pos, a, b, false);
 }
 
 void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **tok_begin,

From c8332bae8c229c437df11b558f38a1a115ffe906 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 18 Oct 2019 18:36:03 -0700
Subject: [PATCH 1078/1732] sucess -> success, failiure -> failure

---
 src/common.cpp          | 2 +-
 src/parse_execution.cpp | 2 +-
 src/postfork.cpp        | 2 +-
 src/postfork.h          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index fbb81a7c0..7012f2e78 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -500,7 +500,7 @@ void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig) {
     // formated string option or because the supplied destination string was to small. In GLIBC,
     // errno seems to be set to EINVAL either way.
     //
-    // Because of this, on failiure we try to increase the buffer size until the free space is
+    // Because of this, on failure we try to increase the buffer size until the free space is
     // larger than max_size, at which point it will conclude that the error was probably due to a
     // badly formated string option, and return an error. Make sure to null terminate string before
     // that, though.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index cbce87bb0..a445ace71 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -299,7 +299,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         }
         parser->pop_block(ib);
     } else {
-        // No job list means no sucessful conditions, so return 0 (issue #1443).
+        // No job list means no successful conditions, so return 0 (issue #1443).
         parser->set_last_statuses(statuses_t::just(STATUS_CMD_OK));
     }
 
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 0fe4458b1..9a5866b35 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -40,7 +40,7 @@
 
 /// Called only by the child to set its own process group (possibly creating a new group in the
 /// process if it is the first in a JOB_CONTROL job.
-/// Returns true on sucess, false on failiure.
+/// Returns true on success, false on failure.
 bool child_set_group(job_t *j, process_t *p) {
     if (j->wants_job_control()) {
         if (j->pgid == INVALID_PID) {
diff --git a/src/postfork.h b/src/postfork.h
index 3085fe0ef..aeac13c0b 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -29,7 +29,7 @@ bool child_set_group(job_t *j, process_t *p);     // called by child
 ///
 /// Assign the terminal to new_termowner unless it is INVALID_PID.
 ///
-/// \return 0 on sucess, -1 on failiure. When this function returns, signals are always unblocked.
+/// \return 0 on success, -1 on failure. When this function returns, signals are always unblocked.
 /// On failure, signal handlers, io redirections and process group of the process is undefined.
 int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &dup2s);
 

From 868eba5e80fd048ba08131aa13129d2eecdf0506 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 19 Oct 2019 12:31:09 +0200
Subject: [PATCH 1079/1732] Fix error on typing Alt-l on a token that starts
 with a dash

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

diff --git a/share/functions/__fish_list_current_token.fish b/share/functions/__fish_list_current_token.fish
index 0a0f2dab1..3fd7f61e8 100644
--- a/share/functions/__fish_list_current_token.fish
+++ b/share/functions/__fish_list_current_token.fish
@@ -7,7 +7,7 @@ function __fish_list_current_token -d "List contents of token under the cursor i
     if test -d $val
         ls $val
     else
-        set dir (dirname $val)
+        set dir (dirname -- $val)
         if test $dir != . -a -d $dir
             ls $dir
         else

From 5e274066e3ec199dd56d81f43db6ea276b6da019 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 17 Oct 2019 21:15:43 +0200
Subject: [PATCH 1080/1732] Always return absolute path in path_get_cdpath

Fixes #6220
---
 CHANGELOG.md         |  1 +
 src/path.cpp         | 11 ++++++-----
 src/path.h           |  3 +--
 tests/checks/cd.fish | 13 +++++++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 tests/checks/cd.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18a38f334..59403745c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
 - `jobs --last` returns 0 to indicate success when a job is found (#6104).
 - `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214)
+- `fish` now correctly handles CDPATH entries that starts with `..` (#6220)
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
diff --git a/src/path.cpp b/src/path.cpp
index 802fccf80..2532b13f6 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -161,8 +161,7 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
                                   const environment_t &env_vars) {
     int err = ENOENT;
     if (dir.empty()) return none();
-
-    assert(wd.empty() || wd.back() == L'/');
+    assert(!wd.empty() && wd.back() == L'/');
     wcstring_list_t paths;
     if (dir.at(0) == L'/') {
         // Absolute path.
@@ -181,14 +180,16 @@ maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
         cdpathsv.push_back(L".");
         for (wcstring next_path : cdpathsv) {
             if (next_path.empty()) next_path = L".";
-            if (next_path == L"." && !wd.empty()) {
+            if (next_path == L".") {
                 // next_path is just '.', and we have a working directory, so use the wd instead.
                 next_path = wd;
             }
 
-            // If next_path starts with ./ we need to replace the . with the wd.
-            if (string_prefixes_string(L"./", next_path) && !wd.empty()) {
+            // We want to return an absolute path (see issue 6220)
+            if (string_prefixes_string(L"./", next_path)) {
                 next_path = next_path.replace(0, 2, wd);
+            } else if (string_prefixes_string(L"../", next_path) || next_path == L"..") {
+                next_path = next_path.insert(0, wd);
             }
 
             expand_tilde(next_path, env_vars);
diff --git a/src/path.h b/src/path.h
index a6074df48..cc62576a0 100644
--- a/src/path.h
+++ b/src/path.h
@@ -58,8 +58,7 @@ wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars);
 /// are found, it is undefined which error status will be returned.
 ///
 /// \param dir The name of the directory.
-/// \param out_or_NULL If non-NULL, return the path to the resolved directory
-/// \param wd The working directory. The working directory should have a slash appended at the end.
+/// \param wd The working directory. The working directory must end with a slash.
 /// \param vars The environment variables to use (for the CDPATH variable)
 /// \return the command, or none() if it could not be found.
 maybe_t<wcstring> path_get_cdpath(const wcstring &dir, const wcstring &wd,
diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
new file mode 100644
index 000000000..7be303541
--- /dev/null
+++ b/tests/checks/cd.fish
@@ -0,0 +1,13 @@
+# RUN: %fish %s
+set -l tmp (mktemp -d)
+cd $tmp
+# resolve CDPATH (issue 6220)
+begin
+    mkdir -p x
+    # CHECK: /{{.*}}/x
+    cd x; pwd
+
+    # CHECK: /{{.*}}/x
+    set -lx CDPATH ..; cd x; pwd
+end
+rm -rf $tmp

From b7f35f949e0da259feee4f7cbd7ccac891e2a0e7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 17 Oct 2019 12:41:13 +0200
Subject: [PATCH 1081/1732] Do not import vars that are equivalent to a
 universal exported var

Universal exported variables (created by `set -xU`) used to show up
both as universal and global variable in child instances of fish.

As a result, when changing an exported universal variable, the
new value would only be visible after a new login (or deleting the
variable from global scope in each fish instance).

Additionally, something like `set -xU EDITOR vim -g` would be imported
into the global scope as a single word resulting in failures to
execute $EDITOR in fish.

We cannot simply give precedence to universal variables, because
another process might have exported the same variable.  Instead, we
only skip importing a variable when it is equivalent to an exported
universal variable with the same name.  We compare their values after
joining with spaces, hence skipping those imports does not change the
environment fish passes to its children. Only the representation in
fish is changed from `"vim -g"` to `vim -g`.

Closes #5258.
This eliminates the issue #5348 for universal variables.
---
 CHANGELOG.md               |  1 +
 src/env.cpp                | 13 +++++++++++++
 src/env_universal_common.h |  3 +++
 tests/checks/set.fish      | 12 ++++++++++++
 4 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59403745c..423fd3fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
+- Exported universal variables are no longer imported into the global scope, preventing shadowing. This makes it easier to change such variables for all fish sessions and avoids breakage when the value is a list of multiple elements (#5258).
 - A bug where local variables would not be exported to functions has been fixed (#6153).
 - A bug where `string split` would be drop empty strings if the output was only empty strings has been fixed (#5987).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
diff --git a/src/env.cpp b/src/env.cpp
index 7bf5f3523..38b590fa1 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -405,6 +405,19 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     callback_data_list_t callbacks;
     s_universal_variables->initialize(callbacks);
     env_universal_callbacks(&env_stack_t::principal(), callbacks);
+
+    // Do not import variables that have the same name and value as
+    // an exported universal variable. See issues #5258 and #5348.
+    for (const auto &kv : uvars()->get_table()) {
+        const wcstring &name = kv.first;
+        const env_var_t &uvar = kv.second;
+        if (!uvar.exports()) continue;
+        // Look for a global exported variable with the same name.
+        maybe_t<env_var_t> global = vars.globals().get(name, ENV_GLOBAL | ENV_EXPORT);
+        if (global && uvar.as_string() == global->as_string()) {
+            vars.globals().remove(name, ENV_GLOBAL | ENV_EXPORT);
+        }
+    }
 }
 
 static int set_umask(const wcstring_list_t &list_val) {
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index c9553edfc..3268b1c54 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -111,6 +111,9 @@ class env_universal_t {
     // Gets variable names.
     wcstring_list_t get_names(bool show_exported, bool show_unexported) const;
 
+    /// Get a view on the universal variable table.
+    const var_table_t &get_table() const { return vars; }
+
     /// Loads variables at the correct path, optionally migrating from a legacy path.
     bool initialize(callback_data_list_t &callbacks);
 
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index cd692bf17..db6855dbf 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -462,4 +462,16 @@ begin
     # CHECK: inner
 end
 
+# Skip importing universal variables (#5258)
+while set -q EDITOR; set -e EDITOR; end
+set -Ux EDITOR emacs -nw
+# CHECK: $EDITOR: not set in global scope
+# CHECK: $EDITOR: set in universal scope, exported, with 2 elements
+$FISH -c 'set -S EDITOR' | string match -r -e 'global|universal'
+
+# When the variable has been changed outside of fish we accept it.
+# CHECK: $EDITOR: set in global scope, exported, with 1 elements
+# CHECK: $EDITOR: set in universal scope, exported, with 2 elements
+sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'global|universal'
+
 true

From 9ea8aa072f5c3d5551e33cf7522853fea801cc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E9=9B=A8=E5=AF=92=20ArielAxionL?=
 <axionl@archlinuxcn.org>
Date: Wed, 16 Oct 2019 21:39:37 +0800
Subject: [PATCH 1082/1732] add a completion for zstd support

An update has been released by Arch Linux official to support the packages for zstd compression.

> https://www.archlinux.org/news/required-update-to-recent-libarchive/
---
 share/completions/pacman.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index fa0b08189..7a8b3ca0c 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -132,6 +132,6 @@ complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readabl
 
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
-# In practice, it's going to be tar.xz or tar.gz
+# In practice, it's going to be tar.xz, tar.gz or tar.zst
 # Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix .pkg.tar\{,.xz,.gz\})' -d 'Package file'
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix .pkg.tar\{,.xz,.gz,.zst\})' -d 'Package file'

From fc0c39b6fdb685ee64121ad58aa68194b3b35588 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 19 Oct 2019 14:12:45 +0200
Subject: [PATCH 1083/1732] expand: Remove unused includes

sys/sysctl.h is deprecated on glibc, so it leads to warnings.
According to fa4ec55c96, it was included for KERN_PROCARGS2 for
process expansion, but process expansion is gone, so it's unused now.

(there is another use of it in common.cpp, but that's only on FreeBSD)

Also 1f06e5f0b9ee483053b987c9cab9f1f5fce2590 only included
tokenizer.h (present since the initial commit) if KERN_PROCARGS2
wasn't available, so it can't have been important.

This builds and passes the tests on:

- Archlinux, with glibc 2.30
- Alpine, with musl
- FreeBSD
- NetBSD
---
 src/expand.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index c363bcbba..32fcf6d4e 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -13,9 +13,6 @@
 #include <cstring>
 #include <cwchar>
 
-#ifdef HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>  // IWYU pragma: keep
-#endif
 #ifdef SunOS
 #include <procfs.h>
 #endif
@@ -51,10 +48,6 @@
 #include "wcstringutil.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
-#ifdef KERN_PROCARGS2
-#else
-#include "tokenizer.h"
-#endif
 
 /// Characters which make a string unclean if they are the first character of the string. See \c
 /// expand_is_clean().

From e0d623d4b72df889de2c64c2813c659ab43ce2ac Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 19 Oct 2019 14:25:03 +0200
Subject: [PATCH 1084/1732] tests/test_util: Fix wrong argument in `delta`

This spewed errors because the `math` invocation got no second
operand:

    Testing file checks/sigint.fish ... math: Error: Too few arguments
    '1571487730 -'

but only if the `date` didn't do milliseconds, which is the case on
FreeBSD and NetBSD.

(also force the variable to be global - we don't want to have a
universal causing trouble here)
---
 tests/test_util.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_util.fish b/tests/test_util.fish
index 5d6ce8840..53c2b438d 100644
--- a/tests/test_util.fish
+++ b/tests/test_util.fish
@@ -137,7 +137,7 @@ end
 # lame timer
 for program in {g,}date
     if command -q $program && $program --version 1>/dev/null 2>/dev/null
-        set milli $program
+        set -g milli $program
         set unit ms
         break
     else
@@ -154,5 +154,5 @@ end
 function delta
     set -q milli[1]
     and math "( "($milli +%s%3N)" - $argv[1])"
-    or math (date +%s) - $starttime
+    or math (date +%s) - $argv[1]
 end

From aa1bf9f2778c154bb106c58b922101defe010423 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 15 Oct 2019 21:59:37 +0200
Subject: [PATCH 1085/1732] sphinx: honor changes in static html assets

Also fix custom.css.
---
 cmake/Docs.cmake                  | 4 +++-
 sphinx_doc_src/_static/custom.css | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index 93333da02..4bb942a76 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -16,7 +16,9 @@ SET(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man")
 # sphinx-docs uses fish_indent for highlighting.
 # Prepend the output dir of fish_indent to PATH.
 ADD_CUSTOM_TARGET(sphinx-docs
-    env PATH="$<TARGET_FILE_DIR:fish_indent>:$$PATH"
+    ${CMAKE_COMMAND} -E copy_if_different ${SPHINX_SRC_DIR}/_static/pygments.css ${SPHINX_HTML_DIR}/_static/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SPHINX_SRC_DIR}/_static/custom.css ${SPHINX_HTML_DIR}/_static/
+    COMMAND env PATH="$<TARGET_FILE_DIR:fish_indent>:$$PATH"
         ${SPHINX_EXECUTABLE}
         -q -b html
         -c "${SPHINX_SRC_DIR}"
diff --git a/sphinx_doc_src/_static/custom.css b/sphinx_doc_src/_static/custom.css
index 29eb6b40b..b631991e3 100644
--- a/sphinx_doc_src/_static/custom.css
+++ b/sphinx_doc_src/_static/custom.css
@@ -1 +1 @@
-.sphinxsidebar > ul.current > li.current { font-weight: bold }
+.sphinxsidebar ul.current > li.current { font-weight: bold }

From 00fc1306d07c9912e93f0b6d5349de7f2cda60dc Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 19 Oct 2019 16:05:39 +0200
Subject: [PATCH 1086/1732] completions/git: allow arbitrary refs in git push
 remote src:dest

When there is already a "src:", we assume that it is a valid ref and
just complete "dst". This allows completion of dest if src is e.g. a
commit SHA (completing all possible refs would probably impact
performance).

See issue #3035.
---
 share/completions/git.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index acc4ebce7..c6d0caa0a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1387,8 +1387,8 @@ complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_
 # git push REMOTE :BRANCH deletes BRANCH on remote REMOTE
 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_branch_for_remote | string replace -r \t".*" "")' -d 'Delete remote branch'
 # then src:dest (where both src and dest are git objects, so we want to complete branches)
-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".*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Force-push local branch to remote branch'
-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".*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Push local branch to remote branch'
+complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "+*:*" -- (commandline -ct)' -a '(commandline -ct | string replace -r ":.*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Force-push local branch to remote branch'
+complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "*:*" -- (commandline -ct)'  -a '(commandline -ct | string replace -r ":.*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Push local branch to remote branch'
 complete -f -c git -n '__fish_git_using_command push' -l all -d 'Push all refs under refs/heads/'
 complete -f -c git -n '__fish_git_using_command push' -l prune -d "Remove remote branches that don't have a local counterpart"
 complete -f -c git -n '__fish_git_using_command push' -l mirror -d 'Push all refs under refs/'

From bd71308788990918bf8a452cfa4e73d53fbe80fd Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 20 Sep 2019 10:49:13 -0700
Subject: [PATCH 1087/1732] Add git completions for range-diff

---
 share/completions/git.fish | 138 ++++++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 64 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index c6d0caa0a..d1a8d0e2a 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -748,70 +748,70 @@ complete -f -c git -n '__fish_git_needs_command' -l icase-pathspecs -d 'Match pa
 # Options shared between multiple commands
 complete -f -c git -n '__fish_git_using_command log show diff-tree rev-list' -l pretty -a '(__fish_git_show_opt pretty)'
 
-complete -c git -n '__fish_git_using_command diff show' -l abbrev -d 'Show only a partial prefix instead of the full 40-byte hexadecimal object name'
-complete -c git -n '__fish_git_using_command diff show' -l binary -d 'Output a binary diff that can be applied with "git-apply"'
-complete -c git -n '__fish_git_using_command diff show' -l check -d 'Warn if changes introduce conflict markers or whitespace errors'
-complete -c git -n '__fish_git_using_command diff show' -l color -d 'Show colored diff'
-complete -c git -n '__fish_git_using_command diff show' -l color-moved -d 'Moved lines of code are colored differently'
-complete -c git -n '__fish_git_using_command diff show' -l color-words -d 'Equivalent to --word-diff=color plus --word-diff-regex=<regex>'
-complete -c git -n '__fish_git_using_command diff show' -l compact-summary -d 'Output a condensed summary of extended header information'
-complete -c git -n '__fish_git_using_command diff show' -l dst-prefix -d 'Show the given destination prefix instead of "b/"'
-complete -c git -n '__fish_git_using_command diff show' -l ext-diff -d 'Allow an external diff helper to be executed'
-complete -c git -n '__fish_git_using_command diff show' -l find-copies-harder -d 'Inspect unmodified files as candidates for the source of copy'
-complete -c git -n '__fish_git_using_command diff show' -l find-object -d 'Look for differences that change the number of occurrences of the specified object'
-complete -c git -n '__fish_git_using_command diff show' -l full-index -d 'Show the full pre- and post-image blob object names on the "index" line'
-complete -c git -n '__fish_git_using_command diff show' -l histogram -d 'Generate a diff using the "histogram diff" algorithm'
-complete -c git -n '__fish_git_using_command diff show' -l ignore-blank-lines -d 'Ignore changes whose lines are all blank'
-complete -c git -n '__fish_git_using_command diff show' -l ignore-cr-at-eol -d 'Ignore carrige-return at the end of line when doing a comparison'
-complete -c git -n '__fish_git_using_command diff show' -l ignore-space-at-eol -d 'Ignore changes in whitespace at EOL'
-complete -c git -n '__fish_git_using_command diff show' -l indent-heuristic -d 'Enable the heuristic that shift diff hunk boundaries'
-complete -c git -n '__fish_git_using_command diff show' -l inter-hunk-context -d 'Show the context between diff hunks, up to the specified number of lines'
-complete -c git -n '__fish_git_using_command diff show' -l ita-invisible-in-index -d 'Make the entry appear as a new file in "git diff" and non-existent in "git diff -l cached"'
-complete -c git -n '__fish_git_using_command diff show' -l line-prefix -d 'Prepend an additional prefix to every line of output'
-complete -c git -n '__fish_git_using_command diff show' -l minimal -d 'Spend extra time to make sure the smallest possible diff is produced'
-complete -c git -n '__fish_git_using_command diff show' -l name-only -d 'Show only names of changed files'
-complete -c git -n '__fish_git_using_command diff show' -l name-status -d 'Show only names and status of changed files'
-complete -c git -n '__fish_git_using_command diff show' -l no-color -d 'Turn off colored diff'
-complete -c git -n '__fish_git_using_command diff show' -l no-ext-diff -d 'Disallow external diff drivers'
-complete -c git -n '__fish_git_using_command diff show' -l no-indent-heuristic -d 'Disable the indent heuristic'
-complete -c git -n '__fish_git_using_command diff show' -l no-prefix -d 'Do not show any source or destination prefix'
-complete -c git -n '__fish_git_using_command diff show' -l no-renames -d 'Turn off rename detection'
-complete -c git -n '__fish_git_using_command diff show' -l no-textconv -d 'Disallow external text conversion filters to be run when comparing binary files'
-complete -c git -n '__fish_git_using_command diff show' -l numstat -d 'Shows number of added/deleted lines in decimal notation'
-complete -c git -n '__fish_git_using_command diff show' -l patch-with-raw -d 'Synonym for -p --raw'
-complete -c git -n '__fish_git_using_command diff show' -l patch-with-stat -d 'Synonym for -p --stat'
-complete -c git -n '__fish_git_using_command diff show' -l patience -d 'Generate a diff using the "patience diff" algorithm'
-complete -c git -n '__fish_git_using_command diff show' -l pickaxe-all -d 'When -S or -G finds a change, show all the changes in that changeset'
-complete -c git -n '__fish_git_using_command diff show' -l pickaxe-regex -d 'Treat the <string> given to -S as an extended POSIX regular expression to match'
-complete -c git -n '__fish_git_using_command diff show' -l relative -d 'Exclude changes outside the directory and show relative pathnames'
-complete -c git -n '__fish_git_using_command diff show' -l shortstat -d 'Output only the last line of the --stat format containing total number of modified files'
-complete -c git -n '__fish_git_using_command diff show' -l src-prefix -d 'Show the given source prefix instead of "a/"'
-complete -c git -n '__fish_git_using_command diff show' -l stat -d 'Generate a diffstat'
-complete -c git -n '__fish_git_using_command diff show' -l summary -d 'Output a condensed summary of extended header information'
-complete -c git -n '__fish_git_using_command diff show' -l textconv -d 'Allow external text conversion filters to be run when comparing binary files'
-complete -c git -n '__fish_git_using_command diff show' -l word-diff -d 'Show a word diff'
-complete -c git -n '__fish_git_using_command diff show' -l word-diff-regex -d 'Use <regex> to decide what a word is'
-complete -c git -n '__fish_git_using_command diff show' -s a -l text -d 'Treat all files as text'
-complete -c git -n '__fish_git_using_command diff show' -s B -l break-rewrites -d 'Break complete rewrite changes into pairs of delete and create'
-complete -c git -n '__fish_git_using_command diff show' -s b -l ignore-space-change -d 'Ignore changes in amount of whitespace'
-complete -c git -n '__fish_git_using_command diff show' -s C -l find-copies -d 'Detect copies as well as renames'
-complete -c git -n '__fish_git_using_command diff show' -s D -l irreversible-delete -d 'Omit the preimage for deletes'
-complete -c git -n '__fish_git_using_command diff show' -s G -d 'Look for differences whose patch text contains added/removed lines that match <regex>'
-complete -c git -n '__fish_git_using_command diff show' -s M -l find-renames -d 'Detect and report renames'
-complete -c git -n '__fish_git_using_command diff show' -s R -d 'Show differences from index or on-disk file to tree contents'
-complete -c git -n '__fish_git_using_command diff show' -s S -d 'Look for differences that change the number of occurrences of the specified string'
-complete -c git -n '__fish_git_using_command diff show' -s W -l function-context -d 'Show whole surrounding functions of changes'
-complete -c git -n '__fish_git_using_command diff show' -s w -l ignore-all-space -d 'Ignore whitespace when comparing lines'
-complete -c git -n '__fish_git_using_command diff show' -s z -d 'Use NULs as output field/commit terminators'
-complete -r -c git -n '__fish_git_using_command diff show' -s O -d 'Control the order in which files appear in the output'
-complete -f -c git -n '__fish_git_using_command diff show' -l anchored -d 'Generate a diff using the "anchored diff" algorithm'
-complete -x -c git -n '__fish_git_using_command diff show' -s l -d 'Prevents rename/copy detection if the number of rename/copy targets exceeds the specified number'
-complete -x -c git -n '__fish_git_using_command diff show' -l diff-filter -a '(__fish_git_diff_opt diff-filter)' -d 'Choose diff filters'
-complete -x -c git -n '__fish_git_using_command diff log show' -l diff-algorithm -a '(__fish_git_diff_opt diff-algorithm)' -d 'Choose a diff algorithm'
-complete -x -c git -n '__fish_git_using_command diff log show' -l dirstat -a '(__fish_git_diff_opt dirstat)' -d 'Output the distribution of relative amount of changes for each sub-directory'
-complete -x -c git -n '__fish_git_using_command diff log show' -l ignore-submodules -a '(__fish_git_diff_opt ignore-submodules)' -d 'Ignore changes to submodules in the diff generation'
-complete -x -c git -n '__fish_git_using_command diff log show' -l submodule -a '(__fish_git_diff_opt submodule)' -d 'Specify how differences in submodules are shown'
-complete -x -c git -n '__fish_git_using_command diff log show' -l ws-error-highlight -a '(__fish_git_diff_opt ws-error-highlight)' -d 'Highlight whitespace errors in lines of the diff'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l abbrev -d 'Show only a partial prefix instead of the full 40-byte hexadecimal object name'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l binary -d 'Output a binary diff that can be applied with "git-apply"'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l check -d 'Warn if changes introduce conflict markers or whitespace errors'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l color -d 'Show colored diff'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l color-moved -d 'Moved lines of code are colored differently'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l color-words -d 'Equivalent to --word-diff=color plus --word-diff-regex=<regex>'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l compact-summary -d 'Output a condensed summary of extended header information'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l dst-prefix -d 'Show the given destination prefix instead of "b/"'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l ext-diff -d 'Allow an external diff helper to be executed'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l find-copies-harder -d 'Inspect unmodified files as candidates for the source of copy'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l find-object -d 'Look for differences that change the number of occurrences of the specified object'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l full-index -d 'Show the full pre- and post-image blob object names on the "index" line'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l histogram -d 'Generate a diff using the "histogram diff" algorithm'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l ignore-blank-lines -d 'Ignore changes whose lines are all blank'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l ignore-cr-at-eol -d 'Ignore carrige-return at the end of line when doing a comparison'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l ignore-space-at-eol -d 'Ignore changes in whitespace at EOL'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l indent-heuristic -d 'Enable the heuristic that shift diff hunk boundaries'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l inter-hunk-context -d 'Show the context between diff hunks, up to the specified number of lines'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l ita-invisible-in-index -d 'Make the entry appear as a new file in "git diff" and non-existent in "git diff -l cached"'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l line-prefix -d 'Prepend an additional prefix to every line of output'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l minimal -d 'Spend extra time to make sure the smallest possible diff is produced'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l name-only -d 'Show only names of changed files'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l name-status -d 'Show only names and status of changed files'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-color -d 'Turn off colored diff'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-ext-diff -d 'Disallow external diff drivers'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-indent-heuristic -d 'Disable the indent heuristic'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-prefix -d 'Do not show any source or destination prefix'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-renames -d 'Turn off rename detection'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l no-textconv -d 'Disallow external text conversion filters to be run when comparing binary files'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l numstat -d 'Shows number of added/deleted lines in decimal notation'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l patch-with-raw -d 'Synonym for -p --raw'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l patch-with-stat -d 'Synonym for -p --stat'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l patience -d 'Generate a diff using the "patience diff" algorithm'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l pickaxe-all -d 'When -S or -G finds a change, show all the changes in that changeset'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l pickaxe-regex -d 'Treat the <string> given to -S as an extended POSIX regular expression to match'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l relative -d 'Exclude changes outside the directory and show relative pathnames'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l shortstat -d 'Output only the last line of the --stat format containing total number of modified files'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l src-prefix -d 'Show the given source prefix instead of "a/"'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l stat -d 'Generate a diffstat'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l summary -d 'Output a condensed summary of extended header information'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l textconv -d 'Allow external text conversion filters to be run when comparing binary files'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l word-diff -d 'Show a word diff'
+complete -c git -n '__fish_git_using_command diff show range-diff' -l word-diff-regex -d 'Use <regex> to decide what a word is'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s a -l text -d 'Treat all files as text'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s B -l break-rewrites -d 'Break complete rewrite changes into pairs of delete and create'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s b -l ignore-space-change -d 'Ignore changes in amount of whitespace'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s C -l find-copies -d 'Detect copies as well as renames'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s D -l irreversible-delete -d 'Omit the preimage for deletes'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s G -d 'Look for differences whose patch text contains added/removed lines that match <regex>'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s M -l find-renames -d 'Detect and report renames'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s R -d 'Show differences from index or on-disk file to tree contents'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s S -d 'Look for differences that change the number of occurrences of the specified string'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s W -l function-context -d 'Show whole surrounding functions of changes'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s w -l ignore-all-space -d 'Ignore whitespace when comparing lines'
+complete -c git -n '__fish_git_using_command diff show range-diff' -s z -d 'Use NULs as output field/commit terminators'
+complete -r -c git -n '__fish_git_using_command diff show range-diff' -s O -d 'Control the order in which files appear in the output'
+complete -f -c git -n '__fish_git_using_command diff show range-diff' -l anchored -d 'Generate a diff using the "anchored diff" algorithm'
+complete -x -c git -n '__fish_git_using_command diff show range-diff' -s l -d 'Prevents rename/copy detection if the number of rename/copy targets exceeds the specified number'
+complete -x -c git -n '__fish_git_using_command diff show range-diff' -l diff-filter -a '(__fish_git_diff_opt diff-filter)' -d 'Choose diff filters'
+complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l diff-algorithm -a '(__fish_git_diff_opt diff-algorithm)' -d 'Choose a diff algorithm'
+complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l dirstat -a '(__fish_git_diff_opt dirstat)' -d 'Output the distribution of relative amount of changes for each sub-directory'
+complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l ignore-submodules -a '(__fish_git_diff_opt ignore-submodules)' -d 'Ignore changes to submodules in the diff generation'
+complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l submodule -a '(__fish_git_diff_opt submodule)' -d 'Specify how differences in submodules are shown'
+complete -x -c git -n '__fish_git_using_command diff log show range-diff' -l ws-error-highlight -a '(__fish_git_diff_opt ws-error-highlight)' -d 'Highlight whitespace errors in lines of the diff'
 
 #### fetch
 complete -f -c git -n '__fish_git_needs_command' -a fetch -d 'Download objects and refs from another repository'
@@ -1378,6 +1378,15 @@ complete -f -c git -n '__fish_git_using_command pull' -l autostash -d 'Before st
 complete -f -c git -n '__fish_git_using_command pull' -l no-autostash -d 'Do not stash local changes before starting rebase'
 # TODO other options
 
+### range-diff
+complete -f -c git -n '__fish_git_needs_command' -a range-diff -d 'Compare two commit ranges (e.g. two versions of a branch)'
+complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_heads)' -d 'Head'
+complete -f -c git -n '__fish_git_using_command range-diff' -a '(__fish_git_tags)' -d 'Tag'
+complete -f -c git -n '__fish_git_using_command range-diff' -l creation-factor -d 'Percentage by which creation is weighted'
+complete -f -c git -n '__fish_git_using_command range-diff' -l no-dual-color -d 'Use simple diff colors'
+
+
 ### push
 complete -f -c git -n '__fish_git_needs_command' -a push -d 'Update remote refs along with associated objects'
 complete -f -c git -n '__fish_git_using_command push; and not __fish_git_branch_for_remote' -a '(__fish_git_remotes)' -d 'Remote alias'
@@ -1717,6 +1726,7 @@ complete -f -c git -n '__fish_git_using_command help' -a mv -d 'Move or rename a
 complete -f -c git -n '__fish_git_using_command help' -a prune -d 'Prune all unreachable objects from the object database'
 complete -f -c git -n '__fish_git_using_command help' -a pull -d 'Fetch from and merge with another repository or a local branch'
 complete -f -c git -n '__fish_git_using_command help' -a push -d 'Update remote refs along with associated objects'
+complete -f -c git -n '__fish_git_using_command help' -a range-diff -d 'Compare two commit ranges (e.g. two versions of a branch)'
 complete -f -c git -n '__fish_git_using_command help' -a rebase -d 'Forward-port local commits to the updated upstream head'
 complete -f -c git -n '__fish_git_using_command help' -a remote -d 'Manage set of tracked repositories'
 complete -f -c git -n '__fish_git_using_command help' -a reset -d 'Reset current HEAD to the specified state'

From 3de3a34e79687aa258d8cfa95c0c6bfd9a62467b Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 18 Oct 2019 13:46:05 -0700
Subject: [PATCH 1088/1732] Add completion for `git log --date=human`

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index d1a8d0e2a..06b49ab39 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1159,6 +1159,7 @@ complete -x -c git -n '__fish_git_using_command log' -l date -a '
   short
   short-local
   raw
+  human
   unix
   format:
   default

From 63e840995e636577d97e925d0469d02be5785277 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 18 Oct 2019 13:54:40 -0700
Subject: [PATCH 1089/1732] git-reset: Don't suggest branch completions if --
 is present

If "--" is present in the command line, it's usually safe to assume that
the user is going to want to complete a file tracked by git so let's
only suggest branches if "--" isn't present.
---
 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 06b49ab39..8cc1202b6 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1448,7 +1448,7 @@ complete -r -c git -n '__fish_git_using_command rebase' -l exec -d 'Execute shel
 ### reset
 complete -c git -n '__fish_git_needs_command' -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset files in working directory'
-complete -c git -n '__fish_git_using_command reset' -a '(__fish_git_branches)'
+complete -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
 # reset can either undo changes to versioned modified files,
 # or remove files from the staging area.
 # Deleted files seem to need a "--" separator.

From 9384801e3ce0d5b1b404bd9db4ad75cef547673e Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 18 Oct 2019 14:11:18 -0700
Subject: [PATCH 1090/1732] Add completions for `push` subcommand to git stash

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 8cc1202b6..7267db2d0 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1587,6 +1587,7 @@ complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a create -d 'Create a stash'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a save -d 'Save a new stash'
 complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a branch -d 'Create a new branch from a stash'
+complete -f -c git -n '__fish_git_using_command stash; and __fish_git_stash_not_using_subcommand' -a push -d 'Create a new stash with given files'
 
 complete -f -c git -n '__fish_git_stash_using_command apply' -a '(__fish_git_complete_stashes)'
 complete -f -c git -n '__fish_git_stash_using_command branch' -a '(__fish_git_complete_stashes)'
@@ -1594,6 +1595,10 @@ complete -f -c git -n '__fish_git_stash_using_command drop' -a '(__fish_git_comp
 complete -f -c git -n '__fish_git_stash_using_command pop' -a '(__fish_git_complete_stashes)'
 complete -f -c git -n '__fish_git_stash_using_command show' -a '(__fish_git_complete_stashes)'
 
+complete -f -c git -n '__fish_git_stash_using_command push' -a '(__fish_git_files modified deleted)'
+complete -f -c git -n '__fish_git_stash_using_command push' -s p -l patch -d 'Interactively select hunks'
+complete -f -c git -n '__fish_git_stash_using_command push' -s m -l message -d 'Add a description'
+
 ### config
 complete -f -c git -n '__fish_git_needs_command' -a config -d 'Set and read git configuration variables'
 # TODO options

From 486bc71cf8e3cccd1b27157db433f236b9996761 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 18 Oct 2019 14:30:27 -0700
Subject: [PATCH 1091/1732] Add completions for git reflog

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 7267db2d0..61dcc391b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1445,6 +1445,14 @@ complete -f -c git -n '__fish_git_using_command rebase' -l no-ff -d 'No fast-for
 # This actually takes script for $SHELL, but completing that is... complicated.
 complete -r -c git -n '__fish_git_using_command rebase' -l exec -d 'Execute shellscript'
 
+### reflog
+set -l reflogcommands show expire delete exists
+complete -f -c git -n '__fish_git_needs_command' -a reflog -d 'Manage reflog information'
+complete -f -c git -n '__fish_git_using_command reflog' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command reflog' -a '(__fish_git_heads)' -d 'Head'
+
+complete -f -c git -n "__fish_git_using_command reflog; and not __fish_seen_subcommand_from $reflogcommands" -a "$reflogcommands"
+
 ### reset
 complete -c git -n '__fish_git_needs_command' -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset files in working directory'
@@ -1734,6 +1742,7 @@ complete -f -c git -n '__fish_git_using_command help' -a pull -d 'Fetch from and
 complete -f -c git -n '__fish_git_using_command help' -a push -d 'Update remote refs along with associated objects'
 complete -f -c git -n '__fish_git_using_command help' -a range-diff -d 'Compare two commit ranges (e.g. two versions of a branch)'
 complete -f -c git -n '__fish_git_using_command help' -a rebase -d 'Forward-port local commits to the updated upstream head'
+complete -f -c git -n '__fish_git_using_command help' -a reflog -d 'Manage reflog information'
 complete -f -c git -n '__fish_git_using_command help' -a remote -d 'Manage set of tracked repositories'
 complete -f -c git -n '__fish_git_using_command help' -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command help' -a restore -d 'Restore working tree files'

From cc84dc75109812bb1e81b33208764bb66a21da13 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 18 Oct 2019 15:05:11 -0700
Subject: [PATCH 1092/1732] Add completions for git rev-parse

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 61dcc391b..fec630986 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1505,6 +1505,12 @@ complete -f -c git -n '__fish_git_using_command restore switch' -l no-progress -
 complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=merge' -d 'Same as --merge, but specify \'merge\' as the conflicting hunk style (default)'
 complete -f -c git -n '__fish_git_using_command restore switch' -l 'conflict=diff3' -d 'Same as --merge, but specify \'diff3\' as the conflicting hunk style'
 
+### rev-parse
+complete -f -c git -n '__fish_git_needs_command' -a rev-parse -d 'Pick out and massage parameters'
+complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_branches)'
+complete -f -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_heads)' -d 'Head'
+complete -k -c git -n '__fish_git_using_command rev-parse' -a '(__fish_git_tags)' -d 'Tag'
+
 ### revert
 complete -f -c git -n '__fish_git_needs_command' -a revert -d 'Revert an existing commit'
 complete -f -c git -n '__fish_git_using_command revert' -ka '(__fish_git_commits)'
@@ -1747,6 +1753,7 @@ complete -f -c git -n '__fish_git_using_command help' -a remote -d 'Manage set o
 complete -f -c git -n '__fish_git_using_command help' -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command help' -a restore -d 'Restore working tree files'
 complete -f -c git -n '__fish_git_using_command help' -a revert -d 'Revert an existing commit'
+complete -f -c git -n '__fish_git_using_command help' -a rev-parse -d 'Pick out and massage parameters'
 complete -f -c git -n '__fish_git_using_command help' -a rm -d 'Remove files from the working tree and from the index'
 complete -f -c git -n '__fish_git_using_command help' -a show -d 'Shows the last commit of a branch'
 complete -f -c git -n '__fish_git_using_command help' -a show-branch -d 'Shows the commits on branches'

From 12a5dd219f5733a67c15ffb1b679234b69202226 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 19 Oct 2019 08:15:47 -0700
Subject: [PATCH 1093/1732] Add completions for git-commit

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index fec630986..a2a18f929 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -985,8 +985,16 @@ complete -f -c git -n '__fish_git_using_command clone' -l recursive -d 'Initiali
 complete -c git -n '__fish_git_needs_command' -a commit -d 'Record changes to the repository'
 complete -c git -n '__fish_git_using_command commit' -l amend -d 'Amend the log message of the last commit'
 complete -f -c git -n '__fish_git_using_command commit' -a '(__fish_git_files modified)'
+complete -c git -n '__fish_git_using_command commit' -s a -l all -d 'Automatically stage modified and deleted files'
+complete -c git -n '__fish_git_using_command commit' -s p -l patch -d 'Use interactive patch selection interface'
 complete -f -c git -n '__fish_git_using_command commit' -l fixup -d 'Fixup commit to be used with rebase --autosquash'
-complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt fixup' -k -a '(__fish_git_recent_commits)'
+complete -f -c git -n '__fish_git_using_command commit' -l squash -d 'Squash commit to be used with rebase --autosquash'
+complete -c git -n '__fish_git_using_command commit' -l reset-author -d 'When amending, reset author of commit to the committer'
+complete -x -c git -n '__fish_git_using_command commit' -l author -d 'Override the commit author'
+complete -x -c git -n '__fish_git_using_command commit' -l date -d 'Override the author date'
+complete -x -c git -n '__fish_git_using_command commit' -s m -l message -d 'Use the given message as the commit message'
+complete -f -c git -n '__fish_git_using_command commit' -l no-edit -d 'Use the selected commit message without launching an editor'
+complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt fixup squash' -k -a '(__fish_git_recent_commits)'
 # TODO options
 
 ### describe
@@ -1716,6 +1724,7 @@ complete -f -c git -n '__fish_git_using_command blame' -s e -l show-email -d 'Sh
 complete -f -c git -n '__fish_git_using_command blame' -s w -d 'Ignore whitespace changes'
 
 ### help
+complete -f -c git -n '__fish_git_needs_command' -a help -d 'Display help information about Git'
 complete -f -c git -n '__fish_git_using_command help' -a '(__fish_git_help_all_concepts)'
 complete -f -c git -n '__fish_git_using_command help' -a add -d 'Add file contents to the index'
 complete -f -c git -n '__fish_git_using_command help' -a apply -d 'Apply a patch on a git index file and a working tree'

From ffb551fc060ca0d1a1aa36f56a6a4ccf49859bff Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 19 Oct 2019 09:03:20 -0700
Subject: [PATCH 1094/1732] Add --cut-at-cursor option to `commandline -op`
 calls in git completions

We used to just check for the presence of "--" on the command line to
make judgements about which completions to suggest. Now, even if "--" is
present, we can still make different suggestions by taking the cursor's
position into account.
---
 share/completions/git.fish | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index a2a18f929..79023c5b5 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -914,11 +914,11 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 
 ### checkout
 complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_tags)' -d 'Tag'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_heads)' -d 'Head'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -op)' -a '(__fish_git_recent_commits)'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_tags)' -d 'Tag'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_heads)' -d 'Head'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_recent_commits)'
 complete -k -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_files modified deleted)'
 complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'
 complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch'
@@ -1071,7 +1071,7 @@ complete -f -c git -n '__fish_git_needs_command' -a init -d 'Create an empty git
 ### log
 complete -c git -n '__fish_git_needs_command' -a shortlog -d 'Show commit shortlog'
 complete -c git -n '__fish_git_needs_command' -a log -d 'Show commit logs'
-complete -c git -n '__fish_git_using_command log; and not contains -- -- (commandline -op)' -a '(__fish_git_ranges)'
+complete -c git -n '__fish_git_using_command log; and not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
 
 complete -c git -n '__fish_git_using_command log' -l follow -d 'Continue listing file history beyond renames'
 complete -c git -n '__fish_git_using_command log' -l no-decorate -d 'Don\'t print ref names'
@@ -1464,13 +1464,13 @@ complete -f -c git -n "__fish_git_using_command reflog; and not __fish_seen_subc
 ### reset
 complete -c git -n '__fish_git_needs_command' -a reset -d 'Reset current HEAD to the specified state'
 complete -f -c git -n '__fish_git_using_command reset' -l hard -d 'Reset files in working directory'
-complete -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_branches)'
+complete -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
 # reset can either undo changes to versioned modified files,
 # or remove files from the staging area.
 # Deleted files seem to need a "--" separator.
-complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_files all-staged modified)'
-complete -f -c git -n '__fish_git_using_command reset; and contains -- -- (commandline -op)' -a '(__fish_git_files all-staged deleted modified)'
-complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -op)' -a '(__fish_git_reflog)' -d 'Reflog'
+complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_files all-staged modified)'
+complete -f -c git -n '__fish_git_using_command reset; and contains -- -- (commandline -opc)' -a '(__fish_git_files all-staged deleted modified)'
+complete -f -c git -n '__fish_git_using_command reset; and not contains -- -- (commandline -opc)' -a '(__fish_git_reflog)' -d 'Reflog'
 # TODO options
 
 ### restore and switch
@@ -1488,7 +1488,7 @@ complete -f -c git -n '__fish_git_using_command restore' -l ignore-skip-worktree
 complete -f -c git -n '__fish_git_using_command restore' -l overlay -d 'Never remove files when restoring'
 complete -f -c git -n '__fish_git_using_command restore' -l no-overlay -d 'Remove files when restoring (default)'
 complete -f -c git -n '__fish_git_using_command restore' -a '(__fish_git_files modified deleted unmerged)'
-complete -f -c git -n '__fish_git_using_command restore; and contains -- --staged (commandline -op)' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)'
+complete -f -c git -n '__fish_git_using_command restore; and contains -- --staged (commandline -opc)' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)'
 complete -f -c git -n '__fish_git_using_command restore; and __fish_contains_opt -s s source' -a '(git ls-files)'
 # switch options
 complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'

From b52d3d641eb3c9845065236a60c03ad65d470292 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 20 Oct 2019 08:15:58 +0200
Subject: [PATCH 1095/1732] Fix clean build of sphinx-docs

---
 cmake/Docs.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake
index 4bb942a76..eedb757e0 100644
--- a/cmake/Docs.cmake
+++ b/cmake/Docs.cmake
@@ -16,7 +16,8 @@ SET(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man")
 # sphinx-docs uses fish_indent for highlighting.
 # Prepend the output dir of fish_indent to PATH.
 ADD_CUSTOM_TARGET(sphinx-docs
-    ${CMAKE_COMMAND} -E copy_if_different ${SPHINX_SRC_DIR}/_static/pygments.css ${SPHINX_HTML_DIR}/_static/
+    mkdir -p ${SPHINX_HTML_DIR}/_static/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SPHINX_SRC_DIR}/_static/pygments.css ${SPHINX_HTML_DIR}/_static/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SPHINX_SRC_DIR}/_static/custom.css ${SPHINX_HTML_DIR}/_static/
     COMMAND env PATH="$<TARGET_FILE_DIR:fish_indent>:$$PATH"
         ${SPHINX_EXECUTABLE}

From d579964c7d947bd90f9d72e33e66af85bd9941e1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 20 Oct 2019 17:21:29 +0800
Subject: [PATCH 1096/1732] travis: enable thread sanitizer build

---
 .travis.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 41a7540ae..da410da8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,18 @@ matrix:
             - libncurses5-dev
             - libpcre2-dev
             - python
+    - os: linux
+      compiler: clang
+      env:
+          - CXXFLAGS="-g -O2 -fsanitize=thread"
+      addons:
+        apt:
+          packages:
+            - expect
+            - gettext
+            - libncurses5-dev
+            - libpcre2-dev
+            - python
     - os: osx
       before_install:
         - brew update

From 66938d206a0a801ecee87e21863badef7d0d5587 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 22 Oct 2019 21:56:44 +0200
Subject: [PATCH 1097/1732] string: Error out on `match -eq`

The `--entire` would enable output even though the `--quiet` should
have silenced it. These two don't make any sense together so print an
error, because the user could have just left off the `-q`.
---
 src/builtin_string.cpp   | 6 ++++++
 tests/checks/string.fish | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index b3d1663ef..637492da3 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -864,6 +864,12 @@ static int string_match(parser_t &parser, io_streams_t &streams, int argc, wchar
         return STATUS_INVALID_ARGS;
     }
 
+    if (opts.entire && opts.quiet) {
+        streams.err.append_format(BUILTIN_ERR_COMBO2, cmd,
+                                  _(L"--entire and --quiet are mutually exclusive"));
+        return STATUS_INVALID_ARGS;
+    }
+
     std::unique_ptr<string_matcher_t> matcher;
     if (opts.regex) {
         matcher = make_unique<pcre2_matcher_t>(cmd, pattern, opts, streams);
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index f1e598434..a82b15883 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -559,3 +559,7 @@ function dualcollect
 end
 count (dualcollect)
 # CHECK: 3
+
+string match -qer asd asd
+# CHECKERR: match: Invalid combination of options,
+# CHECKERR: --entire and --quiet are mutually exclusive

From 5fa9fb52aac6ff64a46faecdec7cb9567593d9b8 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <floam@rMBP.local>
Date: Tue, 22 Oct 2019 16:27:12 -0700
Subject: [PATCH 1098/1732] config_make.h.in: remove __sentinel

We haven't used this attribute for a while
---
 config_cmake.h.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config_cmake.h.in b/config_cmake.h.in
index c7ce044a4..cbf047f1d 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -165,10 +165,6 @@
 #ifndef __warn_unused
 #define __warn_unused __attribute__ ((warn_unused_result))
 #endif
-#ifndef __sentinel
-#define __sentinel __attribute__ ((sentinel))
-#endif
 #else
 #define __warn_unused
-#define __sentinel
 #endif

From 59e4314752b67d6fff436a53c3648cd48c34b067 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <floam@rMBP.local>
Date: Tue, 22 Oct 2019 16:28:56 -0700
Subject: [PATCH 1099/1732] Apply --reverse for fish_color_*'s being used for a
 background

e.g. Allows using `--reverse` in fish_pager_color_search_match
and actually having the selected pager items display reversed.
---
 src/output.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/output.cpp b/src/output.cpp
index 63d40e972..a50671a34 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -476,6 +476,10 @@ rgb_color_t parse_color(const env_var_t &var, bool is_background) {
             if (string_prefixes_string(prefix, next)) {
                 color_name = wcstring(next, wcslen(prefix));
             }
+            // Reverse should be meaningful in either context
+            if (next == L"--reverse" || next == L"-r") {
+                is_reverse = true;
+            }
         } else {
             if (next == L"--bold" || next == L"-o")
                 is_bold = true;

From 305a657694204e4b7de742a74989e278eac7020b Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 22 Oct 2019 00:21:40 +0000
Subject: [PATCH 1100/1732] fix typos

---
 sphinx_doc_src/index.rst | 12 ++++++------
 src/builtin.h            |  2 +-
 src/builtin_realpath.cpp |  2 +-
 src/fish_tests.cpp       |  2 +-
 src/highlight.h          |  4 ++--
 src/history_file.cpp     |  2 +-
 src/kill.h               |  2 +-
 src/parse_execution.cpp  |  2 +-
 src/parser.h             |  2 +-
 src/path.h               |  2 +-
 src/screen.cpp           |  2 +-
 src/wildcard.cpp         |  2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 59c08ce66..fefb73736 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -41,7 +41,7 @@ The pattern below is a basic pattern:
     COMMAND [OPTIONS] ARGUMENTS
 
 
-- **COMMAND**: the name of the executeable
+- **COMMAND**: the name of the executable
 
 - **[OPTIONS]**: options can change the behaviour of a command
 
@@ -59,11 +59,11 @@ Example:
 
 ::
 
-    >echo -s Hallo World!
-    HalloWorld!
+    >echo -s Hello World!
+    HelloWorld!
 
 
--  both ``Hallo`` and ``World!`` are arguments to the echo command
+-  both ``Hello`` and ``World!`` are arguments to the echo command
 - ``-s`` is an option that suppresses spaces in the output of the command
 
 Commands versus Programs
@@ -87,7 +87,7 @@ There are two ways to combine shell commands:
 
 Example::
 
-    # Every line of the ``ls`` command is immediatelly passed on to the ``grep`` command
+    # Every line of the ``ls`` command is immediately passed on to the ``grep`` command
     >ls -l | grep "my topic"
 
 
@@ -829,7 +829,7 @@ In these cases, the expansion eliminates the string, as a result of the implicit
 
 If, in the example above, $WORD is undefined or an empty list, the "s" is not printed. However, it is printed, if $WORD is the empty string.
 
-Unlike all other expanions, variable expansion also happens in double quoted strings. Inside double quotes (``"these"``), variables will always expand to exactly one argument. If they are empty or undefined, it will result in an empty string. If they have one element, they'll expand to that element. If they have more than that, the elements will be joined with spaces.
+Unlike all other expansions, variable expansion also happens in double quoted strings. Inside double quotes (``"these"``), variables will always expand to exactly one argument. If they are empty or undefined, it will result in an empty string. If they have one element, they'll expand to that element. If they have more than that, the elements will be joined with spaces.
 
 Outside of double quotes, variables will expand to as many arguments as they have elements. That means an empty list will expand to nothing, a variable with one element will expand to that element, and a variable with multiple elements will expand to each of those elements separately.
 
diff --git a/src/builtin.h b/src/builtin.h
index ab4865057..a17fec0b5 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -18,7 +18,7 @@ struct io_streams_t;
 struct builtin_data_t {
     // Name of the builtin.
     const wchar_t *name;
-    // Function pointer tothe builtin implementation.
+    // Function pointer to the builtin implementation.
     int (*func)(parser_t &parser, io_streams_t &streams, wchar_t **argv);
     // Description of what the builtin does.
     const wchar_t *desc;
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index bd4118805..d98a38f83 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -15,7 +15,7 @@
 #include "io.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-/// An implementation of the external realpath command. Desn't support any options.
+/// An implementation of the external realpath command. Doesn't support any options.
 /// In general scripts shouldn't invoke this directly. They should just use `realpath` which
 /// will fallback to this builtin if an external command cannot be found.
 int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 8f8b8a3c9..739144cd1 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -106,7 +106,7 @@ static bool should_test_function(const char *func_name) {
 #define ESCAPE_TEST_COUNT 100000
 /// The average length of strings to unescape.
 #define ESCAPE_TEST_LENGTH 100
-/// The higest character number of character to try and escape.
+/// The highest character number of character to try and escape.
 #define ESCAPE_TEST_CHAR 4000
 
 /// Number of encountered errors.
diff --git a/src/highlight.h b/src/highlight.h
index fdf7f761e..872405ec8 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -78,7 +78,7 @@ std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &
 /// array as a color_code from the HIGHLIGHT_ enum for each character in buff.
 ///
 /// \param buffstr The buffer on which to perform syntax highlighting
-/// \param color The array in wchich to store the color codes. The first 8 bits are used for fg
+/// \param color The array in which to store the color codes. The first 8 bits are used for fg
 /// color, the next 8 bits for bg color.
 /// \param pos the cursor position. Used for quote matching, etc.
 /// \param error a list in which a description of each error will be inserted. May be 0, in whcich
@@ -96,7 +96,7 @@ void highlight_shell_no_io(const wcstring &buffstr, std::vector<highlight_spec_t
 /// for each character in buff.
 ///
 /// \param buffstr The buffer on which to perform syntax highlighting
-/// \param color The array in wchich to store the color codes. The first 8 bits are used for fg
+/// \param color The array in which to store the color codes. The first 8 bits are used for fg
 /// color, the next 8 bits for bg color.
 /// \param pos the cursor position. Used for quote matching, etc.
 /// \param error a list in which a description of each error will be inserted. May be 0, in whcich
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 43a7476bc..48bda1c3f 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -121,7 +121,7 @@ std::unique_ptr<history_file_contents_t> history_file_contents_t::create(int fd)
     if (len <= 0 || static_cast<unsigned long>(len) >= SIZE_MAX) return nullptr;
     if (lseek(fd, 0, SEEK_SET) != 0) return nullptr;
 
-    // Read the file, possibly ussing mmap.
+    // Read the file, possibly using mmap.
     void *mmap_start = nullptr;
     if (should_mmap(fd)) {
         // We feel confident to map the file directly. Note this is still risky: if another
diff --git a/src/kill.h b/src/kill.h
index 8e959ca50..a089e4041 100644
--- a/src/kill.h
+++ b/src/kill.h
@@ -1,6 +1,6 @@
 // Prototypes for the killring.
 //
-// Works like the killring in emacs and readline. The killring is cut and paste whith a memory of
+// Works like the killring in emacs and readline. The killring is cut and paste with a memory of
 // previous cuts.
 #ifndef FISH_KILL_H
 #define FISH_KILL_H
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index a445ace71..80e38ef08 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1307,7 +1307,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             remove_job(*this->parser, job.get());
         }
 
-        // Update universal vaiables on external conmmands.
+        // Update universal variables on external conmmands.
         // TODO: justify this, why not on every command?
         if (job_contained_external_command) {
             parser->vars().universal_barrier();
diff --git a/src/parser.h b/src/parser.h
index 81ae57d52..8dfff38f1 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -121,7 +121,7 @@ class parse_execution_context_t;
 class completion_t;
 struct event_t;
 
-/// Miscelleneous data used to avoid recursion and others.
+/// Miscellaneous data used to avoid recursion and others.
 struct library_data_t {
     /// A counter incremented every time a command executes.
     uint64_t exec_count{0};
diff --git a/src/path.h b/src/path.h
index cc62576a0..4b5cb98ff 100644
--- a/src/path.h
+++ b/src/path.h
@@ -53,7 +53,7 @@ wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars);
 /// directories for relative paths.
 ///
 /// If no valid path is found, false is returned and errno is set to ENOTDIR if at least one such
-/// path was found, but it did not point to a directory, EROTTEN if a arotten symbolic link was
+/// path was found, but it did not point to a directory, EROTTEN if a rotten symbolic link was
 /// found, or ENOENT if no file of the specified name was found. If both a rotten symlink and a file
 /// are found, it is undefined which error status will be returned.
 ///
diff --git a/src/screen.cpp b/src/screen.cpp
index b9968f653..8f85d1890 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -285,7 +285,7 @@ void layout_cache_t::add_prompt_layout(wcstring input, prompt_layout_t layout) {
 }
 
 /// Calculate layout information for the given prompt. Does some clever magic to detect common
-/// escape sequences that may be embeded in a prompt, such as those to set visual attributes.
+/// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
 static prompt_layout_t calc_prompt_layout(const wcstring &prompt, layout_cache_t &cache) {
     if (auto cached_layout = cache.find_prompt_layout(prompt)) {
         return *cached_layout;
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 23ec03ff8..c38ea25a0 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -805,7 +805,7 @@ void wildcard_expander_t::expand_last_segment(const wcstring &base_dir, DIR *bas
 ///
 /// Args:
 /// base_dir: the "working directory" against which the wildcard is to be resolved
-/// wc: the wildcard string itself, e.g. foo*bar/baz (where * is acutally ANY_CHAR)
+/// wc: the wildcard string itself, e.g. foo*bar/baz (where * is actually ANY_CHAR)
 /// prefix: the string that should be prepended for completions that replace their token.
 //    This is usually the same thing as the original wildcard, but for fuzzy matching, we
 //    expand intermediate segments. effective_prefix is always either empty, or ends with a slash

From b1fb99b578707fddc0796a7bd15bfcbe52bb06c8 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Wed, 23 Oct 2019 09:32:43 -0600
Subject: [PATCH 1101/1732] add completions for `cygpath` and `cygstart`

---
 share/completions/cygpath.fish  | 26 ++++++++++++++++++++++++++
 share/completions/cygstart.fish | 25 +++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 share/completions/cygpath.fish
 create mode 100644 share/completions/cygstart.fish

diff --git a/share/completions/cygpath.fish b/share/completions/cygpath.fish
new file mode 100644
index 000000000..2a7a8d696
--- /dev/null
+++ b/share/completions/cygpath.fish
@@ -0,0 +1,26 @@
+complete -c cygpath -s d -l dos -d 'Print DOS/short form (C:PROGRA~1)'
+complete -c cygpath -s m -l mixed -d 'Print Windows form with regular slashes (C:/WINNT)'
+complete -c cygpath -s M -l mode -d 'Report on mode of file'
+complete -c cygpath -s u -l unix -d 'Print Unix form (/cygdrive/c/winnt)'
+complete -c cygpath -s w -l windows -d 'Print Windows form (C:\\WINNT)'
+complete -c cygpath -s t -l type -a 'dos mixed unix windows' -d 'Print TYPE form'
+complete -c cygpath -s a -l absolute -d 'Output absolute path'
+complete -c cygpath -s l -l long-name -d 'Print Windows long form' -n '__fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s p -l path -d 'NAME is a colon-separated list'
+complete -c cygpath -s U -l proc-cygdrive -d 'Emit /proc/cygdrive instead of /cygdrive prefix'
+complete -c cygpath -s s -l short-name -d 'Print DOS/short form' -n '__fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s C -l codepage -r -a 'ANSI OEM UTF8' -d 'Print pathname in CODEPAGE' -n '__fish_seen_argument -s d -l dos; or __fish_seen_argument -s w -l windows; or __fish_seen_argument -s m -l mixed'
+complete -c cygpath -s A -l allusers -d 'Use "All Users" instead of current user' -n '__fish_seen_argument -s D -l desktop; or __fish_seen_argument -s O -l mydocs; or __fish_seen_argument -s P -l smprograms'
+complete -c cygpath -s D -l desktop -d 'Output "Desktop" directory'
+complete -c cygpath -s H -l homeroot -d 'Output "Profiles" directory'
+complete -c cygpath -s O -l mydocs -d 'Output "My Documents" directory'
+complete -c cygpath -s P -l smprograms -d 'Output Start Menu "Programs" directory'
+complete -c cygpath -s S -l sysdir -d 'Output system directory'
+complete -c cygpath -s W -l windir -d 'Output "Windows" directory'
+complete -c cygpath -s F -l folder -x -d 'Output special folder with numeric ID'
+complete -c cygpath -s f -l file -r -d 'Read FILE for input'
+complete -c cygpath -s o -l option -d 'Read options from FILE as well' -n '__fish_seen_argument -s f -l file'
+complete -c cygpath -s c -l close -x -d 'Close HANDLE'
+complete -c cygpath -s i -l ignore -d 'Ignore missing argument'
+complete -c cygpath -s h -l help -d 'Output usage information'
+complete -c cygpath -s V -l version -d 'Output version information'
diff --git a/share/completions/cygstart.fish b/share/completions/cygstart.fish
new file mode 100644
index 000000000..8e04e3d58
--- /dev/null
+++ b/share/completions/cygstart.fish
@@ -0,0 +1,25 @@
+complete -c cygstart -s a -l action -r -a 'open explore edit find print' -d 'Use specified action instead of default'
+complete -c cygstart -s o -l open -d 'Short for: --action open'
+complete -c cygstart -s x -l explore -d 'Short for: --action explore'
+complete -c cygstart -s e -l edit -d 'Short for: --action edit'
+complete -c cygstart -s f -l find -d 'Short for: --action find'
+complete -c cygstart -s p -l print -d 'Short for: --action print'
+complete -c cygstart -s d -l directory -r -d 'Set working directory'
+complete -c cygstart -l hide -d 'Hide window and activates another window'
+complete -c cygstart -l maximize -d 'Maximize the specified window'
+complete -c cygstart -l minimize -d 'Minimize the specified window'
+complete -c cygstart -l restore -d 'Activate and display window'
+complete -c cygstart -l show -d 'Activate window and display in current size and position'
+complete -c cygstart -l showmaximized -d 'Activate and maximize window'
+complete -c cygstart -l showminimized -d 'Activate and minimize window'
+complete -c cygstart -l showminnoactive -d 'Display window minimized'
+complete -c cygstart -l showna -d 'Display window in current state'
+complete -c cygstart -l shownoactivate -d 'Display a window in most recent size and position'
+complete -c cygstart -l shownormal -d 'Activate and display a window'
+complete -c cygstart -s w -l wait -d 'Wait until the application terminates before exiting'
+complete -c cygstart -s v -l verbose -d 'Show the actual ShellExecute call made'
+complete -c cygstart -s '?' -l help -d 'Show this help message'
+complete -c cygstart -l usage -d 'Display brief usage message'
+complete -c cygstart -l version -d 'Display version information'
+complete -c cygstart -l license -d 'Display licensing information'
+complete -c cygstart -l reference -d 'Open MSDN reference for ShellExecute'

From 8c9f3c7bd4ec4eafe08bfcff18eaedba555401b5 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Wed, 23 Oct 2019 09:36:45 -0600
Subject: [PATCH 1102/1732] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 423fd3fad..c35da48ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@
   - `code` (#6205)
   - `csc` and `csi` (#6016)
   - `cwebp` (#6034)
+  - `cygpath` and `cygstart` (#6239)
   - `epkginfo` (#5829)
   - `ffmpeg`, `ffplay`, and `ffprobe` (#5922)
   - `fsharpc` and `fsharpi` (#6016)

From 785b7d943811cc768036a30e47949c6c253e20c7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 23 Oct 2019 03:11:13 +0200
Subject: [PATCH 1103/1732] typo

---
 src/parse_productions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 36882a168..05fc80cee 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -17,8 +17,8 @@ using namespace grammar;
 
 // Herein are encoded the productions for our LL2 fish grammar.
 //
-// Each symbol (e.g. symbol_job_list) has a corresponding function (e.g. resolve_job_lits). The
-// function accepts two tokens, representing the first and second lookahead, and returns returns a
+// Each symbol (e.g. symbol_job_list) has a corresponding function (e.g. resolve_job_list). The
+// function accepts two tokens, representing the first and second lookahead, and returns a
 // production representing the rule, or NULL on error. There is also a tag value which is returned
 // by reference; the tag is a sort of node annotation.
 //

From 947e46b9cc7abb38f7724144cbe91aa2768314b9 Mon Sep 17 00:00:00 2001
From: Ryan Adolf <ryanadolf123@gmail.com>
Date: Tue, 22 Oct 2019 00:25:42 -0700
Subject: [PATCH 1104/1732] Add completions for iw

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

diff --git a/share/completions/iw.fish b/share/completions/iw.fish
new file mode 100644
index 000000000..2b199d2cf
--- /dev/null
+++ b/share/completions/iw.fish
@@ -0,0 +1,278 @@
+# iw(8) completion for fish
+
+# The completions for iw are based off those for ip, which has a similar options structure.
+
+set -l iw_commands dev phy reg event features commands list
+# wdev not supported since it is barely documented
+
+function __fish_iw_device
+    __fish_print_interfaces | while read i
+        printf '%s\t%s\n' $i "Device"
+    end
+end
+
+function __fish_iw_phy
+    set -l phys /sys/class/ieee80211/*
+    string match --regex '[^/]*$' $phys
+end
+
+function __fish_iw_ssid
+    printf '%s\n' (iw dev $argv[1] scan dump | string match --regex --entire SSID | string split ' ')[2]
+end
+
+function __fish_complete_iw
+    set -l cmd (commandline -opc)
+
+    if string match --quiet -- '-*' $cmd[2]
+        set -e cmd[2] # Allow other completions to complete as normal
+    end
+    if not set -q cmd[2]
+        return # Uses completions from $iw_commands
+    else if not set -q cmd[3]
+        switch $cmd[2]
+            case dev
+                __fish_iw_device
+            case phy
+                __fish_iw_phy
+        end
+        return
+    end
+    switch $cmd[2]
+        case dev
+            switch "$cmd[4]"
+                case ap
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' stop "Stop AP functionality" \
+                        start "Start AP functionality"
+                    end
+                case auth connect
+                    if not set -q cmd[5]
+                        __fish_iw_ssid $cmd[3]
+                    end
+                case disconnect
+                case cqm
+                    if not set -q cmd[5]
+                        echo rssi
+                    else if not set -q cmd[6]
+                        echo threshold
+                        echo off
+                    end
+                case ftm
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' start_responder "Start an FTM responder" \
+                        get_stats "Get FTM responder statistics"
+                    end
+                case ibss
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' join "Join an IBSS cell or create one" \
+                        leave "Leave the current IBSS cell"
+                    end
+                case 'switch'
+                    if not set -q cmd[5]
+                        echo channel
+                        echo freq
+                    end
+                case info del
+                case interface
+                    if not set -q cmd[5]
+                        echo add
+                    end
+                case link
+                case measurement
+                    if not set -q cmd[5]
+                        echo ftm_request
+                    else if not set -q cmd[6]
+                        __fish_complete_path
+                    end
+                    # options after config file?
+                case mesh
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' leave "Leave a mesh" \
+                        join "Join a mesh"
+                    end
+                case mgmt
+                    if not set -q cmd[5]
+                        echo dump
+                    else if not set -q cmd[6]
+                        echo frame
+                    end
+                case mpath
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' dump "List known mesh paths" \
+                        set "Set an existing mesh path's next hop" \
+                        new "Create a new mesh math manually" \
+                        del "Remove the mesh path to a node" \
+                        get "Get information on a mesh path to a node" \
+                        probe "Inject ethernet frame to a peer"
+                    end
+                case mpp
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' dump "List known mesh proxy paths" \
+                        get "Get information on mesh proxy path to a node"
+                    end
+                case ocb
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' leave "Leave the OCB mode network" \
+                        join "Join the OCB mode network"
+                    end
+                case cac
+                    if not set -q cmd[5]
+                        echo channel
+                        echo freq
+                        echo trigger
+                    end
+                case roc
+                    if not set -q cmd[5]
+                        echo start
+                    end
+                case scan
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' sched_stop "Stop an ongoing scheduled scan" \
+                        sched_start "Start a scheduled scan" \
+                        abort "Abort ongoing scan" \
+                        trigger "Trigger a scan" \
+                        dump "Dmp the current scan results"
+                    end
+                    # -u option?
+                case set
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' bitrates "Rate masks" \
+                        mcast_rate "Multicast bitrate" \
+                        peer "WDS peer" \
+                        noack_map "Noack map for TIDs" \
+                        4addr "4addr (WDS) mode" \
+                        type "Interface type/mode" \
+                        meshid "" \
+                        monitor "Monitor flags" \
+                        mesh_param "Mesh parameter" \
+                        txpower "Transmit power" \
+                        channel "" \
+                        freq "" \
+                        power_save "Power save state"
+                    end
+                case get
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' mesh_param "Mesh parameter" \
+                        power_save "Power save state"
+                    end
+                case station
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' dump "List all stations known" \
+                        set "Set station options" \
+                        del "Remove a station entry" \
+                        get "Get information for a station"
+                    end
+                case survey
+                    if not set -q cmd[5]
+                        echo dump
+                    end
+                case vendor
+                    if not set -q cmd[5]
+                        echo recvbin
+                        echo recv
+                        echo send
+                    end
+                case '*'
+                    printf '%s\t%s\n' ap "Start/stop AP functionality" \
+                    auth "Authenticate with a network" \
+                    connect "Join a network" \
+                    disconnect "Disconnect from the current network" \
+                    cqm "Set connection quality monitor RSSI threshold" \
+                    ftm "Control the FTM responder" \
+                    ibss "Join or leave a IBSS cell" \
+                    'switch' "Switch the operating channel by sending a CSA" \
+                    info "Show information for this interface" \
+                    del "Remove this virtual interface" \
+                    interface "Control the interface" \
+                    link "Print information about the current link" \
+                    measurement "Perform measurements" \
+                    mesh "Join or leave a mesh" \
+                    mpp "Get information on mesh proxy paths" \
+                    mgmt "Print mgmt frames" \
+                    mpath "Interact with mesh paths" \
+                    ocb "Join or leave an OCB mode network" \
+                    offchannel "Leave operating channel" \
+                    cac "Start or trigger a channel availability chec" \
+                    roc "" \
+                    scan "Scan and probe for SSIDs" \
+                    set "Set parameters" \
+                    get "Get parameters" \
+                    station "Set station parameters" \
+                    survey "List all gathered channel survey data" \
+                    vendor ""
+            end
+        case phy
+            switch "$cmd[4]"
+                case coalesce
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' show "Show coalesce status" \
+                        disable "Disable coalesce" \
+                        enable "Enable coalesce"
+                    else if [ "$cmd[5]" = "enable" ] && not set -q cmd[6]
+                        __fish_complete_path # Enable takes a config file
+                    end
+                case hwsim
+                    if not set -q cmd[5]
+                        printf '%s\n' wakequeues stopqueues setps getps
+                    end
+                case info
+                case interface
+                    if not set -q cmd[5]
+                        echo add
+                    end
+                case channels
+                case reg
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' get "Print the current regulatory domain information" \
+                        set "Notify kernel about current regulatory domain"
+                    end
+                case set
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' txq "TXQ parameters" \
+                        antenna "Bitmap of allowed antennas" \
+                        txpower "Transmit power" \
+                        distance "Link distance coverage class" \
+                        netns "Network namespace" \
+                        retry "Retry limit" \
+                        rts "Rts threshold" \
+                        frag "Fragmentation threshold" \
+                        channel "" \
+                        name "Wireless device name"
+                    end
+                case get
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' txq "TXQ parameters"
+                    end
+                case get
+                    if not set -q cmd[5]
+                        printf '%s\t%s\n' show "Show WoWLAN status" \
+                        disable "Disable WoWLAN" \
+                        enable "Enable WoWLAN"
+                    end
+                case '*'
+                    printf '%s\t%s\n' coalesce "Interface with coalesce" \
+                    hwsim "" \
+                    info "Show wireless device capabilities" \
+                    interface "Add a new virutal interface" \
+                    channels "Show available channels" \
+                    reg "Manage regulatory domains" \
+                    set "Set parameters" \
+                    get "Get parameters"
+            end
+    end
+end
+
+complete -f -c iw
+complete -f -c iw -a '(__fish_complete_iw)'
+complete -f -c iw -n "not __fish_seen_subcommand_from $iw_commands" -a "$iw_commands"
+# Yes, iw only takes options before "objects"
+complete -f -c iw -l debug -d "Enable netlink message debugging" -n "not __fish_seen_subcommand_from $iw_commands"
+complete -f -c iw -l version -d "Print the version" -n "not __fish_seen_subcommand_from $iw_commands"
+
+complete -f -c iw -n "__fish_seen_subcommand_from event" -s t -d 'Print timestamp'
+complete -f -c iw -n "__fish_seen_subcommand_from event" -s r -d 'Print relative timestamp'
+complete -f -c iw -n "__fish_seen_subcommand_from event" -s f -d 'Print full frame for auth/assoc'
+
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'reload' -d 'Reload the kernel\'s regulatory database'
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'get' -d 'Print the kernel\'s current regulatory domain information'
+complete -f -c iw -n "__fish_seen_subcommand_from reg" -a 'set' -d 'Notify the kernel about the current regulatory domain'

From 44c311b5df13daf6491ea25e2da1c57dc1edbaed Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 24 Oct 2019 11:06:19 +0200
Subject: [PATCH 1105/1732] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c35da48ed..9fadbdec0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -89,8 +89,11 @@
   - `epkginfo` (#5829)
   - `ffmpeg`, `ffplay`, and `ffprobe` (#5922)
   - `fsharpc` and `fsharpi` (#6016)
+  - `g++` (#6217)
   - `gpg2` (#6062)
   - `hledger` (#6043)
+  - `iw` (#6232)
+  - `kak`
   - `mariner` (#5718)
   - `patool` (#6083)
   - `qubes-gpg-client` (#6067)

From 4fbc6cd3f88ea4b3834f19f6b52e8d4b76726cb0 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 24 Oct 2019 17:13:50 +0800
Subject: [PATCH 1106/1732] CHANGELOG: minor work on 3.1.0

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fadbdec0..cf5fc004f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - `string split0` now returns 0 if it split something (#5701).
 - In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
+- `cd` understands the `--` argument to make it possible to change to directories starting with a hyphen (#6071).
 - `complete --do-complete` now also does fuzzy matches (#5467).
 - `complete --do-complete` can be used inside completions, allowing limited recursion (#3474).
 - `count` now also counts lines fed on standard input (#5744).
@@ -89,16 +90,20 @@
   - `epkginfo` (#5829)
   - `ffmpeg`, `ffplay`, and `ffprobe` (#5922)
   - `fsharpc` and `fsharpi` (#6016)
+  - `fzf` (#6178)
   - `g++` (#6217)
   - `gpg2` (#6062)
+  - `grub-mkrescue` (#6182)
   - `hledger` (#6043)
   - `iw` (#6232)
   - `kak`
   - `mariner` (#5718)
   - `patool` (#6083)
+  - `phpunit` (#6197)
   - `qubes-gpg-client` (#6067)
   - `rg`
   - `rustup`
+  - `sfdx` (#6149)
   - `speedtest` and `speedtest-cli` (#5840)
   - `src` (#6026)
   - `tokei` (#6085)

From 0a5c2051b1988fef44c541a5fb4ae6515a79d09d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 24 Oct 2019 11:41:16 +0200
Subject: [PATCH 1107/1732] Always use wl-{copy,paste} if running on wayland

---
 share/functions/fish_clipboard_copy.fish  | 4 ++--
 share/functions/fish_clipboard_paste.fish | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/functions/fish_clipboard_copy.fish b/share/functions/fish_clipboard_copy.fish
index 0054198aa..47fa8264a 100644
--- a/share/functions/fish_clipboard_copy.fish
+++ b/share/functions/fish_clipboard_copy.fish
@@ -4,13 +4,13 @@ function fish_clipboard_copy
     test -n "$cmdline"; or set cmdline (commandline)
     if type -q pbcopy
         printf '%s\n' $cmdline | pbcopy
+    else if set -q WAYLAND_DISPLAY; and type -q wl-copy
+        printf '%s\n' $cmdline | wl-copy
     else if type -q xsel
         # Silence error so no error message shows up
         # if e.g. X isn't running.
         printf '%s\n' $cmdline | xsel --clipboard 2>/dev/null
     else if type -q xclip
         printf '%s\n' $cmdline | xclip -selection clipboard 2>/dev/null
-    else if type -q wl-copy
-        printf '%s\n' $cmdline | wl-copy
     end
 end
diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 54c78d445..0ed27abce 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -2,6 +2,8 @@ function fish_clipboard_paste
     set -l data
     if type -q pbpaste
         set data (pbpaste)
+    else if set -q WAYLAND_DISPLAY; and type -q wl-paste
+        set data (wl-paste)
     else if type -q xsel
         # Return if `xsel` failed.
         # That way we don't print the redundant (and overly verbose for this) commandline error.
@@ -13,8 +15,6 @@ function fish_clipboard_paste
         if not set data (xclip -selection clipboard -o 2>/dev/null)
             return 1
         end
-    else if type -q wl-paste
-        set data (wl-paste)
     end
     # Also split on \r to turn it into a newline,
     # otherwise the output looks really confusing.

From 655f7c8c63de6ee547164a9519f542d54d2efd8c Mon Sep 17 00:00:00 2001
From: Bruno Heridet <delapouite@gmail.com>
Date: Wed, 23 Oct 2019 17:44:59 +0200
Subject: [PATCH 1108/1732] doc: add link to echo in printf command

[ci skip]
---
 sphinx_doc_src/cmds/printf.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/printf.rst b/sphinx_doc_src/cmds/printf.rst
index 3bc539595..bb67c0e5e 100644
--- a/sphinx_doc_src/cmds/printf.rst
+++ b/sphinx_doc_src/cmds/printf.rst
@@ -16,7 +16,7 @@ printf formats the string FORMAT with ARGUMENT, and displays the result.
 
 The string FORMAT should contain format specifiers, each of which are replaced with successive arguments according to the specifier. Specifiers are detailed below, and are taken from the C library function ``printf(3)``.
 
-Unlike ``echo``, ``printf`` does not append a new line unless it is specified as part of the string.
+Unlike :ref:`echo <cmd-echo>`, ``printf`` does not append a new line unless it is specified as part of the string.
 
 Valid format specifiers are:
 

From 6a9ab0599f84af9eb4bd81ef8982eb7f992303cb Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Fri, 25 Oct 2019 15:22:09 +0200
Subject: [PATCH 1109/1732] completion: zpaq archiver (#6245)

---
 CHANGELOG.md                |  1 +
 share/completions/zpaq.fish | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 share/completions/zpaq.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf5fc004f..a0bd455a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,6 +109,7 @@
   - `tokei` (#6085)
   - `tsc` (#6016)
   - `vbc` (#6016)
+  - `zpaq` (#6245)
 - Lots of improvements to completions.
 
 ## Deprecations
diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
new file mode 100644
index 000000000..9334945a3
--- /dev/null
+++ b/share/completions/zpaq.fish
@@ -0,0 +1,44 @@
+#zpaq 7.15
+
+#variables
+set -l seen __fish_seen_subcommand_from
+set -l commands a add l list x extract
+set -l command1 a add
+set -l command2 l list
+set -l command3 x extract
+
+#commands
+complete -c zpaq -f -n "not $seen $commands" -a "$commands"
+complete -c zpaq -f -n "not $seen $commands" -a a -d "add"
+complete -c zpaq -f -n "not $seen $commands" -a add -d "Append files to archive if dates have changed"
+complete -c zpaq -f -n "not $seen $commands" -a x -d "extract"
+complete -c zpaq -f -n "not $seen $commands" -a extract -d "Extract most recent versions of files"
+complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
+complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive by dates"
+
+#options
+complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories" 
+complete -c zpaq -f -n "$seen $commands" -o f -d "-force"
+complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
+complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
+complete -c zpaq -f -n "$seen $command3" -o force -d "Overwrite existing output files"
+complete -c zpaq -x -n "$seen $commands" -o fragment -a N -d "Set the dedupe fragment size (64 2^N to 8128 2^N bytes)"
+complete -c zpaq -x -n "$seen $command1" -o index -a F -d "Create suffix for archive indexed by F, update F"
+complete -c zpaq -x -n "$seen $command3" -o index -a F -d "Create index F for archive"
+complete -c zpaq -x -n "$seen $commands" -o key -a X -d "Create or access encrypted archive with password X"
+complete -c zpaq -x -n "$seen $command1" -o mN -d "-method N"
+complete -c zpaq -x -n "$seen $command1" -o method -a N -d "Compress level N (0..5 = faster..better, default 1)"
+complete -c zpaq -f -n "$seen $commands" -o noattributes -d "Ignore/don't save file attributes or permissions"
+complete -c zpaq -r -n "$seen $commands" -o not -d "Exclude. * and ? match any string or char"
+complete -c zpaq -r -n "$seen $command2" -o not -d "Exclude. =[+-#^?] exclude by comparison result"
+complete -c zpaq -r -n "$seen $commands" -o only -d "Include only matches (default: *)"
+complete -c zpaq -x -n "$seen $command3" -o repack -a "F X" -d "Extract to new archive F with key [X] (default: none)"
+complete -c zpaq -x -n "$seen $commands" -o sN -d "-summary N"
+complete -c zpaq -x -n "$seen $commands" -o summary -a N -d "If N > 0 show brief progress"
+complete -c zpaq -x -n "$seen $command2" -o summary -a N -d "Show top N sorted by size. -1: show frag IDs"
+complete -c zpaq -f -n "$seen $command3" -o test -d "Verify but do not write files"
+complete -c zpaq -x -n "$seen $commands" -o tN -d "-threads N"
+complete -c zpaq -x -n "$seen $commands" -o threads -a N -d "Use N threads (default: 0 = all cores)"
+complete -c zpaq -r -n "$seen $commands" -o to -a P -d "Rename files... to P... or all to P/all"
+complete -c zpaq -x -n "$seen $commands" -o until -a N -d "Roll back archive to N'th update or -N from end"
+complete -c zpaq -x -n "$seen $commands" -o until -a D -d "Set date D, roll back (UT, default time: 235959)"

From 4cdc5e402073df18fcdcb766cce6285291452a11 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Wed, 23 Oct 2019 22:13:24 +0800
Subject: [PATCH 1110/1732] completions/pacman.fish: Update for pacman 5.2
 pacman 5.2 has remove File Options `-s --search` and `-o --owns`. Ref:
 [pacman: rework the UI of
 -F](https://git.archlinux.org/pacman.git/commit/?id=ff1ae94c102cab487444bcdb0c76ee489c11dfe8)

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

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 7a8b3ca0c..862459694 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -121,14 +121,11 @@ complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
 set -l has_file_opt '__fish_contains_opt list search -s l -s s'
 complete -c $progname -n "$files; and not $has_file_opt" -xa --list -d 'List files owned by given packages'
 complete -c $progname -n "$files; and not $has_file_opt" -xa -l -d 'List files owned by given packages'
-complete -c $progname -n "$files; and not $has_file_opt" -xa --search -d 'Search packages for matching files'
-complete -c $progname -n "$files; and not $has_file_opt" -xa -s -d 'Search packages for matching files'
 complete -c $progname -n "$files" -s y -l refresh -d 'Refresh the files database' -f
 complete -c $progname -n "$files" -s l -l list -d 'List files owned by given packages' -xa $listall
-complete -c $progname -n "$files" -s s -l search -d 'Search packages for matching files'
-complete -c $progname -n "$files" -s o -l owns -d 'Search for packages that include the given files'
+complete -c $progname -n "$files" -s x -l regex -d 'Interpret each query as a regular expression' -f
 complete -c $progname -n "$files" -s q -l quiet -d 'Show less information' -f
-complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readable format: repo\0pkgname\0pkgver\0path\n' -f
+complete -c $progname -n "$files" -l machinereadable -d 'Print each match in a machine readable output format' -f
 
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports

From 2b9dd4595cd32cfb3c86294e2ce8fd3aa03cc3ab Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Thu, 24 Oct 2019 02:53:28 +0800
Subject: [PATCH 1111/1732] completes/pacman.fish: replace `--force` to
 `--overwrite`

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

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 862459694..b474f8ddf 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -66,7 +66,7 @@ end
 
 # Upgrade options (sync, upgrade)
 for condition in sync upgrade
-    complete -c $progname -n $$condition -l force -d 'Bypass file conflict checks' -f
+    complete -c $progname -n $$condition -l overwrite -d 'overwrite conflicting files (can be used more than once)'
     complete -c $progname -n $$condition -l ignore -d 'Ignore upgrade of PACKAGE' -xa "$listinstalled" -f
     complete -c $progname -n $$condition -l ignoregroup -d 'Ignore upgrade of GROUP' -xa "$listgroups" -f
     complete -c $progname -n $$condition -l needed -d 'Do not reinstall up-to-date targets' -f

From d1214edc7a6f7593b3ccaf7ef5c8de84c120d8f4 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Fri, 25 Oct 2019 17:05:39 +0800
Subject: [PATCH 1112/1732] functions/__fish_print_pacman_repos.fish: fix This
 function return wrong data. Fix this.

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

diff --git a/share/functions/__fish_print_pacman_repos.fish b/share/functions/__fish_print_pacman_repos.fish
index 92d4919af..daa866350 100644
--- a/share/functions/__fish_print_pacman_repos.fish
+++ b/share/functions/__fish_print_pacman_repos.fish
@@ -1,3 +1,3 @@
 function __fish_print_pacman_repos --description "Print the repositories configured for arch's pacman package manager"
-    string replace -r -a "\[(.+)\]" "\1" </etc/pacman.conf | string match -r -v "^#|options"
+    string match -er "\[.*\]" </etc/pacman.conf | string match -r -v "^#|options" | string replace -ra "\[|\]" ""
 end

From 080f367635771d5c703c98d5f78c025b1ff493c4 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Fri, 25 Oct 2019 17:08:13 +0800
Subject: [PATCH 1113/1732] completions/pacman.fish: refine completions Refine
 completions with pacman 5.2.0 man pages

---
 share/completions/pacman.fish | 122 ++++++++++++++++++----------------
 1 file changed, 66 insertions(+), 56 deletions(-)

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index b474f8ddf..6f01df231 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -23,6 +23,7 @@ complete -c pacman -f
 # HACK: We only need these two to coerce fish to stop file completion and complete options
 complete -c $progname -n $noopt -a "-D" -d "Modify the package database"
 complete -c $progname -n $noopt -a "-Q" -d "Query the package database"
+
 # Primary operations
 complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
 complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
@@ -36,97 +37,106 @@ complete -c $progname -s h -f -l help -d 'Display help'
 
 # General options
 # Only offer these once a command has been given so they get prominent display
-complete -c $progname -n "not $noopt" -s b -l dbpath -d 'Alternative database location' -xa '(__fish_complete_directories)'
-complete -c $progname -n "not $noopt" -s r -l root -d 'Alternative installation root'
-complete -c $progname -n "not $noopt" -s v -l verbose -d 'Output more status messages'
+complete -c $progname -n "not $noopt" -s b -l dbpath -d 'Alternate database location' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -s r -l root -d 'Alternate installation root' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -s v -l verbose -d 'Output more status messages' -f
 complete -c $progname -n "not $noopt" -l arch -d 'Alternate architecture' -f
-complete -c $progname -n "not $noopt" -l cachedir -d 'Alternative package cache location'
-complete -c $progname -n "not $noopt" -l config -d 'Alternate config file'
+complete -c $progname -n "not $noopt" -l cachedir -d 'Alternate package cache location' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l color -d 'Colorize the output' -fa '{auto,always,never}'
+complete -c $progname -n "not $noopt" -l config -d 'Alternate config file' -F
+complete -c $progname -n "not $noopt" -l confirm -d 'Always ask for confirmation' -f
 complete -c $progname -n "not $noopt" -l debug -d 'Display debug messages' -f
-complete -c $progname -n "not $noopt" -l gpgdir -d 'GPG directory to verify signatures'
-complete -c $progname -n "not $noopt" -l hookdir -d 'Hook file directory'
-complete -c $progname -n "not $noopt" -l logfile -d 'Specify alternative log file'
-complete -c $progname -n "not $noopt" -l noconfirm -d 'Bypass any question' -f
+complete -c $progname -n "not $noopt" -l disable-download-timeout -d 'Use relaxed timeouts for download' -f
+complete -c $progname -n "not $noopt" -l gpgdir -d 'Alternate home directory for GnuPG' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l hookdir -d 'Alternate hook location' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l logfile -d 'Alternate log file'
+complete -c $progname -n "not $noopt" -l noconfirm -d 'Bypass any confirmation' -f
+complete -c $progname -n "not $noopt" -l sysroot -d 'Operate on a mounted guest system (root-only)' -xa '(__fish_complete_directories)'
+
+# File, query, sync options
+for condition in files query sync
+    complete -c $progname -n $$condition -s q -l quiet -d 'Show less information' -f
+end
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
     complete -c $progname -n $$condition -s d -l nodeps -d 'Skip [all] dependency checks' -f
+    complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets' -f
+    complete -c $progname -n $$condition -l assume-installed -d 'Add a virtual package to satisfy dependencies' -f
     complete -c $progname -n $$condition -l dbonly -d 'Modify database entry only' -f
     complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progress bar' -f
     complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute install script' -f
-    complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets' -f
-    complete -c $progname -n $$condition -l print-format -x -d 'Specify printf-like format' -f
+    complete -c $progname -n $$condition -l print-format -d 'Specify printf-like format' -x
 end
 
-# Database and upgrade options (database, sync, upgrade)
-for condition in database sync upgrade
-    complete -c $progname -n $$condition -l asdeps -d 'Mark PACKAGE as dependency' -f
-    complete -c $progname -n $$condition -l asexplicit -d 'Mark PACKAGE as explicitly installed' -f
+# File and query options
+for condition in files query
+    complete -c $progname -n $$condition -s l -l list -d 'List the files owned by PACKAGE' -f
 end
 
-# Upgrade options (sync, upgrade)
-for condition in sync upgrade
-    complete -c $progname -n $$condition -l overwrite -d 'overwrite conflicting files (can be used more than once)'
-    complete -c $progname -n $$condition -l ignore -d 'Ignore upgrade of PACKAGE' -xa "$listinstalled" -f
-    complete -c $progname -n $$condition -l ignoregroup -d 'Ignore upgrade of GROUP' -xa "$listgroups" -f
-    complete -c $progname -n $$condition -l needed -d 'Do not reinstall up-to-date targets' -f
-    complete -c $progname -n $$condition -l recursive -d 'Recursively reinstall all dependencies' -f
+# File and sync options
+for condition in files sync
+    complete -c $progname -n $$condition -s y -l refresh -d 'Download fresh package databases [force]' -f
 end
 
 # Query and sync options
 for condition in query sync
-    complete -c $progname -n $$condition -s g -l groups -d 'Display all packages in GROUP' -xa "$listgroups" -f
-    complete -c $progname -n $$condition -s i -l info -d 'Display information on PACKAGE' -f
-    complete -c $progname -n $$condition -s q -l quiet -d 'Show less information' -f
-    complete -c $progname -n $$condition -s s -l search -r -d 'Search packages for regexp' -f
+    complete -c $progname -n $$condition -s g -l groups -d 'Display members of [all] package GROUP' -xa "$listgroups"
 end
 
+# Sync and upgrade options (sync, upgrade)
+for condition in sync upgrade
+    complete -c $progname -n $$condition -l asdeps -d 'Install packages as non-explicitly installed' -f
+    complete -c $progname -n $$condition -l asexplicit -d 'Install packages as explicitly installed' -f
+    complete -c $progname -n $$condition -l ignore -d 'Ignore a package upgrade (can be used more than once)' -f
+    complete -c $progname -n $$condition -l ignoregroup -d 'Ignore a group upgrade (can be used more than once)' -f
+    complete -c $progname -n $$condition -l needed -d 'Do not reinstall up to date packages' -f
+    complete -c $progname -n $$condition -l overwrite -d 'Overwrite conflicting files (can be used more than once)' -F
+end
+
+# Database options
+set -l has_db_opt '__fish_contains_opt asdeps asexplicit check -s k'
+complete -c $progname -n "$database; and not $has_db_opt" -s k -l check -d 'Check database validity'
+complete -c $progname -n $database -s q -l quite -d 'Suppress output of success messages' -f
+complete -c $progname -n "$database; and not $has_db_opt" -l asdeps -d 'Mark PACKAGE as dependency' -x
+complete -c $progname -n "$database; and not $has_db_opt" -l asexplicit -d 'Mark PACKAGE as explicitly installed' -x
+complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
+
+# File options - since pacman 5
+complete -c $progname -n "$files" -s x -l regex -d 'Interpret each query as a regular expression' -f
+complete -c $progname -n "$files" -l machinereadable -d 'Print each match in a machine readable output format' -f
+
 # Query options
 complete -c $progname -n $query -s c -l changelog -d 'View the change log of PACKAGE' -f
 complete -c $progname -n $query -s d -l deps -d 'List only non-explicit packages (dependencies)' -f
 complete -c $progname -n $query -s e -l explicit -d 'List only explicitly installed packages' -f
-complete -c $progname -n $query -s k -l check -d 'Check if all files owned by PACKAGE are present' -f
-complete -c $progname -n $query -s l -l list -d 'List all files owned by PACKAGE' -f
-complete -c $progname -n $query -s m -l foreign -d 'List all packages not in the database' -f
-complete -c $progname -n $query -s o -l owns -rF -d 'Search for the package that owns FILE'
-complete -c $progname -n $query -s p -l file -d 'Apply the query to a package file, not package'
-complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages' -f
+complete -c $progname -n $query -s i -l info -d 'View PACKAGE [backup files] information' -f
+complete -c $progname -n $query -s k -l check -d 'Check that PACKAGE files exist' -f
+complete -c $progname -n $query -s m -l foreign -d 'List installed packages not found in sync database' -f
+complete -c $progname -n $query -s n -l native -d 'list installed packages only found in sync database' -f
+complete -c $progname -n $query -s o -l owns -d 'Query the package that owns FILE' -rF
+complete -c $progname -n $query -s p -l file -d 'Query a package file instead of the database' -F
+complete -c $progname -n $query -s s -l search -d 'Search locally-installed packages for regexp' -f
+complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages [and optdepends]' -f
 complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' -f
-complete -c $progname -n "$query" -d 'Installed package' -xa $listinstalled -f
+complete -c $progname -n $query -d 'Installed package' -xa $listinstalled
 
 # Remove options
 complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
 complete -c $progname -n $remove -s n -l nosave -d 'Ignore file backup designations' -f
 complete -c $progname -n $remove -s s -l recursive -d 'Also remove dependencies of PACKAGE' -f
 complete -c $progname -n $remove -s u -l unneeded -d 'Only remove targets not required by PACKAGE' -f
-complete -c $progname -n "$remove" -d 'Installed package' -xa $listinstalled -f
+complete -c $progname -n "$remove" -d 'Installed package' -xa $listinstalled
 
 # Sync options
-complete -c $progname -n $sync -s c -l clean -d 'Remove [all] packages from cache'
-complete -c $progname -n $sync -s l -l list -xa "$listrepos" -d 'List all packages in REPOSITORY'
-complete -c $progname -n "$sync; and not __fish_contains_opt -s u sysupgrade" -s u -l sysupgrade -d 'Upgrade all packages that are out of date'
-complete -c $progname -n "$sync; and __fish_contains_opt -s u sysupgrade" -s u -l sysupgrade -d 'Also downgrade packages'
+complete -c $progname -n $sync -s c -l clean -d 'Remove [all] packages from cache' -f
+complete -c $progname -n $sync -s i -l info -d 'View PACKAGE [extended] information' -f
+complete -c $progname -n $sync -s l -l list -d 'List all packages in REPOSITORY' -xa "$listrepos"
+complete -c $progname -n $sync -s s -l search -d 'Search remote repositories for regexp' -f
+complete -c $progname -n $sync -s u -l sysupgrade -d 'Upgrade all packages that are out of date'
 complete -c $progname -n $sync -s w -l downloadonly -d 'Only download the target packages'
-complete -c $progname -n $sync -s y -l refresh -d 'Download fresh copy of the package list'
 complete -c $progname -n "$sync" -xa "$listall $listgroups"
 
-# Database options
-set -l has_db_opt '__fish_contains_opt asdeps asexplicit'
-complete -c $progname -n "$database; and not $has_db_opt" -xa --asdeps -d 'Mark PACKAGE as dependency'
-complete -c $progname -n "$database; and not $has_db_opt" -xa --asexplicit -d 'Mark PACKAGE as explicitly installed'
-complete -c $progname -n "$database; and not $has_db_opt" -s k -l check -d 'Check database validity'
-complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
-
-# File options - since pacman 5
-set -l has_file_opt '__fish_contains_opt list search -s l -s s'
-complete -c $progname -n "$files; and not $has_file_opt" -xa --list -d 'List files owned by given packages'
-complete -c $progname -n "$files; and not $has_file_opt" -xa -l -d 'List files owned by given packages'
-complete -c $progname -n "$files" -s y -l refresh -d 'Refresh the files database' -f
-complete -c $progname -n "$files" -s l -l list -d 'List files owned by given packages' -xa $listall
-complete -c $progname -n "$files" -s x -l regex -d 'Interpret each query as a regular expression' -f
-complete -c $progname -n "$files" -s q -l quiet -d 'Show less information' -f
-complete -c $progname -n "$files" -l machinereadable -d 'Print each match in a machine readable output format' -f
-
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar.xz, tar.gz or tar.zst

From 0ec954a8c265313318a8f4449638ce28fd5b8ba2 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Fri, 25 Oct 2019 23:56:17 +0800
Subject: [PATCH 1114/1732] completions/pacman.fish: -F add package completions
 `-F` add package completions, let `-Fl` work fine Another changes:     Add
 missing quotes, let format neat

---
 share/completions/pacman.fish | 133 +++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 6f01df231..33be93865 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -1,6 +1,6 @@
 # Completions for pacman
 # Author: Giorgio Lando <patroclo7@gmail.com>
-# Updated by maxfl, SanskritFritz, faho, f1u77y
+# Updated by maxfl, SanskritFritz, faho, f1u77y, akiirui
 
 set -l progname pacman
 
@@ -18,86 +18,86 @@ set -l sync '__fish_contains_opt -s S sync'
 set -l upgrade '__fish_contains_opt -s U upgrade'
 set -l files '__fish_contains_opt -s F files'
 
-complete -c pacman -e
-complete -c pacman -f
+complete -c $progname -e
+complete -c $progname -f
 # HACK: We only need these two to coerce fish to stop file completion and complete options
-complete -c $progname -n $noopt -a "-D" -d "Modify the package database"
-complete -c $progname -n $noopt -a "-Q" -d "Query the package database"
+complete -c $progname -n "$noopt" -a "-D" -d "Modify the package database"
+complete -c $progname -n "$noopt" -a "-Q" -d "Query the package database"
 
 # Primary operations
-complete -c $progname -s D -f -l database -n $noopt -d 'Modify the package database'
-complete -c $progname -s Q -f -l query -n $noopt -d 'Query the package database'
-complete -c $progname -s R -f -l remove -n $noopt -d 'Remove packages from the system'
-complete -c $progname -s S -f -l sync -n $noopt -d 'Synchronize packages'
-complete -c $progname -s T -f -l deptest -n $noopt -d 'Check dependencies'
-complete -c $progname -s U -f -l upgrade -n $noopt -d 'Upgrade or add a local package'
-complete -c $progname -s F -f -l files -n $noopt -d 'Query the files database'
+complete -c $progname -s D -f -l database -n "$noopt" -d 'Modify the package database'
+complete -c $progname -s Q -f -l query -n "$noopt" -d 'Query the package database'
+complete -c $progname -s R -f -l remove -n "$noopt" -d 'Remove packages from the system'
+complete -c $progname -s S -f -l sync -n "$noopt" -d 'Synchronize packages'
+complete -c $progname -s T -f -l deptest -n "$noopt" -d 'Check dependencies'
+complete -c $progname -s U -f -l upgrade -n "$noopt" -d 'Upgrade or add a local package'
+complete -c $progname -s F -f -l files -n "$noopt" -d 'Query the files database'
 complete -c $progname -s V -f -l version -d 'Display version and exit'
 complete -c $progname -s h -f -l help -d 'Display help'
 
 # General options
 # Only offer these once a command has been given so they get prominent display
-complete -c $progname -n "not $noopt" -s b -l dbpath -d 'Alternate database location' -xa '(__fish_complete_directories)'
-complete -c $progname -n "not $noopt" -s r -l root -d 'Alternate installation root' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -s b -l dbpath -d 'Alternate database location' -xa "(__fish_complete_directories)"
+complete -c $progname -n "not $noopt" -s r -l root -d 'Alternate installation root' -xa "(__fish_complete_directories)"
 complete -c $progname -n "not $noopt" -s v -l verbose -d 'Output more status messages' -f
 complete -c $progname -n "not $noopt" -l arch -d 'Alternate architecture' -f
-complete -c $progname -n "not $noopt" -l cachedir -d 'Alternate package cache location' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l cachedir -d 'Alternate package cache location' -xa "(__fish_complete_directories)"
 complete -c $progname -n "not $noopt" -l color -d 'Colorize the output' -fa '{auto,always,never}'
-complete -c $progname -n "not $noopt" -l config -d 'Alternate config file' -F
+complete -c $progname -n "not $noopt" -l config -d 'Alternate config file' -rF
 complete -c $progname -n "not $noopt" -l confirm -d 'Always ask for confirmation' -f
 complete -c $progname -n "not $noopt" -l debug -d 'Display debug messages' -f
 complete -c $progname -n "not $noopt" -l disable-download-timeout -d 'Use relaxed timeouts for download' -f
-complete -c $progname -n "not $noopt" -l gpgdir -d 'Alternate home directory for GnuPG' -xa '(__fish_complete_directories)'
-complete -c $progname -n "not $noopt" -l hookdir -d 'Alternate hook location' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l gpgdir -d 'Alternate home directory for GnuPG' -xa "(__fish_complete_directories)"
+complete -c $progname -n "not $noopt" -l hookdir -d 'Alternate hook location' -xa "(__fish_complete_directories)"
 complete -c $progname -n "not $noopt" -l logfile -d 'Alternate log file'
 complete -c $progname -n "not $noopt" -l noconfirm -d 'Bypass any confirmation' -f
-complete -c $progname -n "not $noopt" -l sysroot -d 'Operate on a mounted guest system (root-only)' -xa '(__fish_complete_directories)'
+complete -c $progname -n "not $noopt" -l sysroot -d 'Operate on a mounted guest system (root-only)' -xa "(__fish_complete_directories)"
 
-# File, query, sync options
+# File, query, sync options (files, query, sync)
 for condition in files query sync
-    complete -c $progname -n $$condition -s q -l quiet -d 'Show less information' -f
+    complete -c $progname -n "$$condition" -s q -l quiet -d 'Show less information' -f
 end
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
-    complete -c $progname -n $$condition -s d -l nodeps -d 'Skip [all] dependency checks' -f
-    complete -c $progname -n $$condition -s p -l print -d 'Dry run, only print targets' -f
-    complete -c $progname -n $$condition -l assume-installed -d 'Add a virtual package to satisfy dependencies' -f
-    complete -c $progname -n $$condition -l dbonly -d 'Modify database entry only' -f
-    complete -c $progname -n $$condition -l noprogressbar -d 'Do not display progress bar' -f
-    complete -c $progname -n $$condition -l noscriptlet -d 'Do not execute install script' -f
-    complete -c $progname -n $$condition -l print-format -d 'Specify printf-like format' -x
+    complete -c $progname -n "$$condition" -s d -l nodeps -d 'Skip [all] dependency checks' -f
+    complete -c $progname -n "$$condition" -s p -l print -d 'Dry run, only print targets' -f
+    complete -c $progname -n "$$condition" -l assume-installed -d 'Add a virtual package to satisfy dependencies' -f
+    complete -c $progname -n "$$condition" -l dbonly -d 'Modify database entry only' -f
+    complete -c $progname -n "$$condition" -l noprogressbar -d 'Do not display progress bar' -f
+    complete -c $progname -n "$$condition" -l noscriptlet -d 'Do not execute install script' -f
+    complete -c $progname -n "$$condition" -l print-format -d 'Specify printf-like format' -x
 end
 
-# File and query options
+# File and query options (files, query)
 for condition in files query
-    complete -c $progname -n $$condition -s l -l list -d 'List the files owned by PACKAGE' -f
+    complete -c $progname -n "$$condition" -s l -l list -d 'List the files owned by PACKAGE' -f
 end
 
-# File and sync options
+# File and sync options (files, sync)
 for condition in files sync
-    complete -c $progname -n $$condition -s y -l refresh -d 'Download fresh package databases [force]' -f
+    complete -c $progname -n "$$condition" -s y -l refresh -d 'Download fresh package databases [force]' -f
 end
 
-# Query and sync options
+# Query and sync options (query, sync)
 for condition in query sync
-    complete -c $progname -n $$condition -s g -l groups -d 'Display members of [all] package GROUP' -xa "$listgroups"
+    complete -c $progname -n "$$condition" -s g -l groups -d 'Display members of [all] package GROUP' -xa "$listgroups"
 end
 
 # Sync and upgrade options (sync, upgrade)
 for condition in sync upgrade
-    complete -c $progname -n $$condition -l asdeps -d 'Install packages as non-explicitly installed' -f
-    complete -c $progname -n $$condition -l asexplicit -d 'Install packages as explicitly installed' -f
-    complete -c $progname -n $$condition -l ignore -d 'Ignore a package upgrade (can be used more than once)' -f
-    complete -c $progname -n $$condition -l ignoregroup -d 'Ignore a group upgrade (can be used more than once)' -f
-    complete -c $progname -n $$condition -l needed -d 'Do not reinstall up to date packages' -f
-    complete -c $progname -n $$condition -l overwrite -d 'Overwrite conflicting files (can be used more than once)' -F
+    complete -c $progname -n "$$condition" -l asdeps -d 'Install packages as non-explicitly installed' -f
+    complete -c $progname -n "$$condition" -l asexplicit -d 'Install packages as explicitly installed' -f
+    complete -c $progname -n "$$condition" -l ignore -d 'Ignore a package upgrade (can be used more than once)' -f
+    complete -c $progname -n "$$condition" -l ignoregroup -d 'Ignore a group upgrade (can be used more than once)' -f
+    complete -c $progname -n "$$condition" -l needed -d 'Do not reinstall up to date packages' -f
+    complete -c $progname -n "$$condition" -l overwrite -d 'Overwrite conflicting files (can be used more than once)' -rF
 end
 
 # Database options
 set -l has_db_opt '__fish_contains_opt asdeps asexplicit check -s k'
 complete -c $progname -n "$database; and not $has_db_opt" -s k -l check -d 'Check database validity'
-complete -c $progname -n $database -s q -l quite -d 'Suppress output of success messages' -f
+complete -c $progname -n "$database" -s q -l quite -d 'Suppress output of success messages' -f
 complete -c $progname -n "$database; and not $has_db_opt" -l asdeps -d 'Mark PACKAGE as dependency' -x
 complete -c $progname -n "$database; and not $has_db_opt" -l asexplicit -d 'Mark PACKAGE as explicitly installed' -x
 complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
@@ -105,40 +105,41 @@ complete -c $progname -n "$has_db_opt; and $database" -xa "$listinstalled"
 # File options - since pacman 5
 complete -c $progname -n "$files" -s x -l regex -d 'Interpret each query as a regular expression' -f
 complete -c $progname -n "$files" -l machinereadable -d 'Print each match in a machine readable output format' -f
+complete -c $progname -n "$files" -d 'Package' -xa "$listall"
 
 # Query options
-complete -c $progname -n $query -s c -l changelog -d 'View the change log of PACKAGE' -f
-complete -c $progname -n $query -s d -l deps -d 'List only non-explicit packages (dependencies)' -f
-complete -c $progname -n $query -s e -l explicit -d 'List only explicitly installed packages' -f
-complete -c $progname -n $query -s i -l info -d 'View PACKAGE [backup files] information' -f
-complete -c $progname -n $query -s k -l check -d 'Check that PACKAGE files exist' -f
-complete -c $progname -n $query -s m -l foreign -d 'List installed packages not found in sync database' -f
-complete -c $progname -n $query -s n -l native -d 'list installed packages only found in sync database' -f
-complete -c $progname -n $query -s o -l owns -d 'Query the package that owns FILE' -rF
-complete -c $progname -n $query -s p -l file -d 'Query a package file instead of the database' -F
-complete -c $progname -n $query -s s -l search -d 'Search locally-installed packages for regexp' -f
-complete -c $progname -n $query -s t -l unrequired -d 'List only unrequired packages [and optdepends]' -f
-complete -c $progname -n $query -s u -l upgrades -d 'List only out-of-date packages' -f
-complete -c $progname -n $query -d 'Installed package' -xa $listinstalled
+complete -c $progname -n "$query" -s c -l changelog -d 'View the change log of PACKAGE' -f
+complete -c $progname -n "$query" -s d -l deps -d 'List only non-explicit packages (dependencies)' -f
+complete -c $progname -n "$query" -s e -l explicit -d 'List only explicitly installed packages' -f
+complete -c $progname -n "$query" -s i -l info -d 'View PACKAGE [backup files] information' -f
+complete -c $progname -n "$query" -s k -l check -d 'Check that PACKAGE files exist' -f
+complete -c $progname -n "$query" -s m -l foreign -d 'List installed packages not found in sync database' -f
+complete -c $progname -n "$query" -s n -l native -d 'list installed packages only found in sync database' -f
+complete -c $progname -n "$query" -s o -l owns -d 'Query the package that owns FILE' -rF
+complete -c $progname -n "$query" -s p -l file -d 'Query a package file instead of the database' -rF
+complete -c $progname -n "$query" -s s -l search -d 'Search locally-installed packages for regexp' -f
+complete -c $progname -n "$query" -s t -l unrequired -d 'List only unrequired packages [and optdepends]' -f
+complete -c $progname -n "$query" -s u -l upgrades -d 'List only out-of-date packages' -f
+complete -c $progname -n "$query" -d 'Installed package' -xa "$listinstalled"
 
 # Remove options
-complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
-complete -c $progname -n $remove -s n -l nosave -d 'Ignore file backup designations' -f
-complete -c $progname -n $remove -s s -l recursive -d 'Also remove dependencies of PACKAGE' -f
-complete -c $progname -n $remove -s u -l unneeded -d 'Only remove targets not required by PACKAGE' -f
-complete -c $progname -n "$remove" -d 'Installed package' -xa $listinstalled
+complete -c $progname -n "$remove" -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
+complete -c $progname -n "$remove" -s n -l nosave -d 'Ignore file backup designations' -f
+complete -c $progname -n "$remove" -s s -l recursive -d 'Also remove dependencies of PACKAGE' -f
+complete -c $progname -n "$remove" -s u -l unneeded -d 'Only remove targets not required by PACKAGE' -f
+complete -c $progname -n "$remove" -d 'Installed package' -xa "$listinstalled"
 
 # Sync options
-complete -c $progname -n $sync -s c -l clean -d 'Remove [all] packages from cache' -f
-complete -c $progname -n $sync -s i -l info -d 'View PACKAGE [extended] information' -f
-complete -c $progname -n $sync -s l -l list -d 'List all packages in REPOSITORY' -xa "$listrepos"
-complete -c $progname -n $sync -s s -l search -d 'Search remote repositories for regexp' -f
-complete -c $progname -n $sync -s u -l sysupgrade -d 'Upgrade all packages that are out of date'
-complete -c $progname -n $sync -s w -l downloadonly -d 'Only download the target packages'
+complete -c $progname -n "$sync" -s c -l clean -d 'Remove [all] packages from cache' -f
+complete -c $progname -n "$sync" -s i -l info -d 'View PACKAGE [extended] information' -f
+complete -c $progname -n "$sync" -s l -l list -d 'List all packages in REPOSITORY' -xa "$listrepos"
+complete -c $progname -n "$sync" -s s -l search -d 'Search remote repositories for regexp' -f
+complete -c $progname -n "$sync" -s u -l sysupgrade -d 'Upgrade all packages that are out of date'
+complete -c $progname -n "$sync" -s w -l downloadonly -d 'Only download the target packages'
 complete -c $progname -n "$sync" -xa "$listall $listgroups"
 
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar.xz, tar.gz or tar.zst
 # Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix .pkg.tar\{,.xz,.gz,.zst\})' -d 'Package file'
+complete -c $progname -n "$upgrade" -d 'Package file' -xa "(__fish_complete_suffix .pkg.tar\{,.xz,.gz,.zst\})"

From f8ead077bf4c7508c04b0d485d2adb909a96582b Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sat, 26 Oct 2019 04:12:09 +0800
Subject: [PATCH 1115/1732] completions/pacman.fish: add `ignore` &
 `ignoregroups` completions `ignore`       -> `$listall` `ignoregroups` ->
 `$listgroups`

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

diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 33be93865..188c1c344 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -88,8 +88,8 @@ end
 for condition in sync upgrade
     complete -c $progname -n "$$condition" -l asdeps -d 'Install packages as non-explicitly installed' -f
     complete -c $progname -n "$$condition" -l asexplicit -d 'Install packages as explicitly installed' -f
-    complete -c $progname -n "$$condition" -l ignore -d 'Ignore a package upgrade (can be used more than once)' -f
-    complete -c $progname -n "$$condition" -l ignoregroup -d 'Ignore a group upgrade (can be used more than once)' -f
+    complete -c $progname -n "$$condition" -l ignore -d 'Ignore a package upgrade (can be used more than once)' -xa "$listall"
+    complete -c $progname -n "$$condition" -l ignoregroup -d 'Ignore a group upgrade (can be used more than once)' -xa "$listgroups"
     complete -c $progname -n "$$condition" -l needed -d 'Do not reinstall up to date packages' -f
     complete -c $progname -n "$$condition" -l overwrite -d 'Overwrite conflicting files (can be used more than once)' -rF
 end

From 2810ba00148fcf76990a46d2e8123ff2659570b1 Mon Sep 17 00:00:00 2001
From: Lior Stern <liorst4@gmail.com>
Date: Fri, 25 Oct 2019 12:49:18 +0300
Subject: [PATCH 1116/1732] Check that /proc/version is readable before reading
 it in web_config.

/proc/version may be unreadable in Android.
---
 share/tools/web_config/webconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 7d2107197..a4e9e09dc 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -43,7 +43,7 @@ def isMacOS10_12_5_OrLater():
 
 def is_wsl():
     """ Return whether we are running under the Windows Subsystem for Linux """
-    if "linux" in platform.system().lower():
+    if "linux" in platform.system().lower() and os.access("/proc/version", os.R_OK):
         with open("/proc/version", "r") as f:
             if "Microsoft" in f.read():
                 return True

From af48fa5d91f86da65d352b0e7a9a7ca5e6d8e31d Mon Sep 17 00:00:00 2001
From: Gabriel Medeiros Coelho <gabriel_mcoelho@hotmail.com>
Date: Wed, 23 Oct 2019 13:02:52 -0300
Subject: [PATCH 1117/1732] change href attribute to ng-href

Since the url is inside a AngularJS markup {{url}}, it's better to use **ng-href**.

From  [AngularJS Documentation](https://docs.angularjs.org/api/ng/directive/ngHref):
<br>
"Using AngularJS markup like {{hash}} in an href attribute will make the link go to the wrong URL if the user clicks it before AngularJS has a chance to replace the {{hash}} markup with its value. Until AngularJS replaces the markup the link will be broken and will most likely return a 404 error. The ngHref directive solves this problem."
---
 share/tools/web_config/partials/colors.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/tools/web_config/partials/colors.html b/share/tools/web_config/partials/colors.html
index 69f055fb1..3c704c0a7 100644
--- a/share/tools/web_config/partials/colors.html
+++ b/share/tools/web_config/partials/colors.html
@@ -127,7 +127,7 @@ fish cannot change the background color of your terminal. Refer to your terminal
 				<div class="color_scheme_choice_label">
 					<!-- This click/clickBubble nonsense is so that we can have a separate URL inside a parent with an onClick handler -->
                                         {{colorScheme.name}}
-          <a data-ng-show="colorScheme.url" style="text-decoration: none; color: inherit;" href="{{colorScheme.url}}">&#10138;</a>
+          <a data-ng-show="colorScheme.url" style="text-decoration: none; color: inherit;" ng-href="{{colorScheme.url}}">&#10138;</a>
 				</div>
 				<div class="colorpicker_text_sample_tight" data-ng-style="{'background-color': colorScheme.preferred_background}">
 					<span data-ng-style="{'color': colorScheme.command}">/bright/vixens</span>

From 4be30a872a1f64bbf1b8592d23f2d1685c0437c9 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Wed, 23 Oct 2019 09:41:25 -0600
Subject: [PATCH 1118/1732] add completion for `nethack`

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

diff --git a/share/completions/nethack.fish b/share/completions/nethack.fish
new file mode 100644
index 000000000..7d060ebd3
--- /dev/null
+++ b/share/completions/nethack.fish
@@ -0,0 +1,24 @@
+function __fish_complete_nethack
+  set -l roles Archeologist Barbarian Cave{man,woman} Healer Knight Monk \
+               Priest{,ess} Rogue Ranger Samurai Tourist Valkyrie Wizard
+
+  set -l races Human Elf Dwarf Gnome Orc
+
+  for r in $$argv[1]
+    printf "%s\t%s\n" (string sub -l 3 $r) $r
+  end
+end
+
+complete -c nethack -s d -ra "(__fish_complete_directories)" -d 'Specify a playground directory'
+complete -c nethack -s n -d 'Suppress printing any news from the game administrator'
+complete -c nethack -s p -x -a "(__fish_complete_nethack roles)" -d 'Specify profession'
+complete -c nethack -s r -x -a "(__fish_complete_nethack races)" -d 'Specify race'
+complete -c nethack -s D -d 'Start in debugging (wizard) mode'
+complete -c nethack -s X -d 'Start in discovery mode'
+complete -c nethack -s u -x -d 'Specify player name'
+complete -c nethack -o dec -d 'Use DEC graphics'
+complete -c nethack -o ibm -d 'Use IBM graphics'
+complete -c nethack -l version -d 'Show version information'
+complete -c nethack -l version:paste -d 'Show version information & copy it to paste buffer'
+complete -c nethack -s s -d 'Print the list of your scores'
+complete -c nethack -s v -d 'Print all versions present in the score file'

From b6fbec81075f6c019af1c8e189fe3690e00f6dc4 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Wed, 23 Oct 2019 09:46:31 -0600
Subject: [PATCH 1119/1732] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0bd455a8..5c2e4be25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@
   - `iw` (#6232)
   - `kak`
   - `mariner` (#5718)
+  - `nethack` (#6240)
   - `patool` (#6083)
   - `phpunit` (#6197)
   - `qubes-gpg-client` (#6067)

From 7ce38a1ee68237133bece78453cd5c514e2ab114 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 25 Oct 2019 04:10:32 +0900
Subject: [PATCH 1120/1732] Add supported compression algo to completions for
 tar

- lzip (--lzip)
- LZMA (--lzma)
- lzop (--lzop)
- Zstandard (--zstd)
---
 share/completions/tar.fish | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index 6c453ae1b..d03afff17 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -66,3 +66,7 @@ complete -c tar -s z -l gzip -d "Filter through gzip"
 complete -c tar -l gunzip -d "Filter through gzip"
 complete -c tar -l use-compress-program -r -d "Filter through specified program"
 complete -c tar -s J -l xz -d "Filter through xz"
+complete -c tar -l lzip -d "Filter through lzip"
+complete -c tar -l lzma -d "Filter through lzma"
+complete -c tar -l lzop -d "Filter through lzop"
+complete -c tar -l zstd -d "Filter through zstd"

From 3e28ab454f9eb9458254d87b3fb132eae7438ba6 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 25 Oct 2019 04:19:54 +0900
Subject: [PATCH 1121/1732] Rename long option of bzip2

From `--bzip` to `--bzip2`
---
 share/completions/tar.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index d03afff17..122a4ded0 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -25,7 +25,7 @@ complete -c tar -s G -l incremental -d "Use old incremental GNU format"
 complete -c tar -s g -l listed-incremental -d "Use new incremental GNU format"
 complete -c tar -s h -l dereference -d "Dereference symlinks"
 complete -c tar -s i -l ignore-zeros -d "Ignore zero block in archive"
-complete -c tar -s j -l bzip -d "Filter through bzip2"
+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 -s K -l starting-file -r -d "Starting file in archive"

From 0ef6a136e83271ac2bc80e1aee313839a20a9951 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sun, 27 Oct 2019 00:15:42 +0800
Subject: [PATCH 1122/1732] completions: add btrfs (#6243)

* completions: add btrfs
Completion definitions for the btrfs-progs.

* completes/btrfs.fish: using `not set -q argv[1]` instead of `test -z $argv`

* CHANGELOG: add btrfs completions
---
 CHANGELOG.md                 |   1 +
 share/completions/btrfs.fish | 134 +++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 share/completions/btrfs.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c2e4be25..ae361417b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@
   - `aws`
   - `bat` (#6052)
   - `bosh` (#5700)
+  - `btrfs`
   - `camcontrol`
   - `cf` (#5700)
   - `code` (#6205)
diff --git a/share/completions/btrfs.fish b/share/completions/btrfs.fish
new file mode 100644
index 000000000..5cf2c45bf
--- /dev/null
+++ b/share/completions/btrfs.fish
@@ -0,0 +1,134 @@
+# Completions for btrfs-progs
+# Author: Akatsuki (akiirui) <imaykiller@gmail.com>
+
+# Todo:
+# 1. Detailed options per command
+# 2. Simplified descriptions
+# ...and more
+
+# Filter the completions per command groups
+function __btrfs_options_groups
+    if not set -q argv[1]
+        return 1
+    end
+    set -l cmd (commandline -cp)
+    if string match -qr -- "$argv\s+\S*\$" $cmd
+        return 0
+    end
+    return 1
+end
+
+# Primary command
+complete -f -c btrfs -n '__fish_is_first_arg' -a check -d 'Check structural integrity of a filesystem (unmounted).'
+complete -f -c btrfs -n '__fish_is_first_arg' -a restore -d 'Try to restore files from a damaged filesystem (unmounted)'
+complete -f -c btrfs -n '__fish_is_first_arg' -a send -d 'Send the subvolume(s) to stdout.'
+complete -f -c btrfs -n '__fish_is_first_arg' -a receive -d 'Receive subvolumes from a stream'
+complete -f -c btrfs -n '__fish_is_first_arg' -a help -d 'Display help information'
+complete -f -c btrfs -n '__fish_is_first_arg' -a version -d 'Display btrfs-progs version'
+
+# Primary command groups
+complete -f -c btrfs -n '__fish_is_first_arg' -a subvolume -d 'manage subvolumes: create, delete, list, etc'
+complete -f -c btrfs -n '__fish_is_first_arg' -a filesystem -d 'overall filesystem tasks and information'
+complete -f -c btrfs -n '__fish_is_first_arg' -a balance -d 'balance data across devices, or change block groups using filters'
+complete -f -c btrfs -n '__fish_is_first_arg' -a device -d 'manage and query devices in the filesystem'
+complete -f -c btrfs -n '__fish_is_first_arg' -a scrub -d 'verify checksums of data and metadata'
+complete -f -c btrfs -n '__fish_is_first_arg' -a rescue -d 'toolbox for specific rescue operations'
+complete -f -c btrfs -n '__fish_is_first_arg' -a inspect-internal -d 'query various internal information'
+complete -f -c btrfs -n '__fish_is_first_arg' -a property -d 'modify properties of filesystem objects'
+complete -f -c btrfs -n '__fish_is_first_arg' -a quota -d 'manage filesystem quota settings'
+complete -f -c btrfs -n '__fish_is_first_arg' -a qgroup -d 'manage quota groups'
+complete -f -c btrfs -n '__fish_is_first_arg' -a replace -d 'replace a device in the filesystem'
+
+set -l subvolume '__btrfs_options_groups subvolume'
+set -l filesystem '__btrfs_options_groups filesystem'
+set -l balance '__btrfs_options_groups balance'
+set -l device '__btrfs_options_groups device'
+set -l scrub '__btrfs_options_groups scrub'
+set -l rescue '__btrfs_options_groups rescue'
+set -l inspect_internal "__btrfs_options_groups inspect-internal"
+set -l property '__btrfs_options_groups property'
+set -l quota '__btrfs_options_groups quota'
+set -l qgroup '__btrfs_options_groups qgroup'
+set -l replace '__btrfs_options_groups replace'
+
+# btrfs subvolume
+complete -f -c btrfs -n $subvolume -a create -d 'Create a subvolume'
+complete -f -c btrfs -n $subvolume -a delete -d 'Delete subvolume(s)'
+complete -f -c btrfs -n $subvolume -a list -d 'List subvolumes and snapshots in the filesystem.'
+complete -f -c btrfs -n $subvolume -a snapshot -d 'Create a snapshot of the subvolume'
+complete -f -c btrfs -n $subvolume -a get-default -d 'Get the default subvolume of a filesystem'
+complete -f -c btrfs -n $subvolume -a set-default -d 'Set the default subvolume of the filesystem mounted as default.'
+complete -f -c btrfs -n $subvolume -a find-new -d 'List the recently modified files in a filesystem'
+complete -f -c btrfs -n $subvolume -a show -d 'Show more information about the subvolume (UUIDs, generations, times, snapshots)'
+complete -f -c btrfs -n $subvolume -a sync -d 'Wait until given subvolume(s) are completely removed from the filesystem.'
+
+# btrfs filesystem
+complete -f -c btrfs -n $filesystem -a df -d 'Show space usage information for a mount point'
+complete -f -c btrfs -n $filesystem -a du -d 'Summarize disk usage of each file.'
+complete -f -c btrfs -n $filesystem -a show -d 'Show the structure of a filesystem'
+complete -f -c btrfs -n $filesystem -a sync -d 'Force a sync on a filesystem'
+complete -f -c btrfs -n $filesystem -a defragment -d 'Defragment a file or a directory'
+complete -f -c btrfs -n $filesystem -a resize -d 'Resize a filesystem'
+complete -f -c btrfs -n $filesystem -a label -d 'Get or change the label of a filesystem'
+complete -f -c btrfs -n $filesystem -a usage -d 'Show detailed information about internal filesystem usage.'
+
+# btrfs balance
+complete -f -c btrfs -n $balance -a start -d 'Balance chunks across the devices'
+complete -f -c btrfs -n $balance -a pause -d 'Pause running balance'
+complete -f -c btrfs -n $balance -a cancel -d 'Cancel running or paused balance'
+complete -f -c btrfs -n $balance -a resume -d 'Resume interrupted balance'
+complete -f -c btrfs -n $balance -a status -d 'Show status of running or paused balance'
+
+# btrfs device
+complete -f -c btrfs -n $device -a add -d 'Add one or more devices to a mounted filesystem.'
+complete -f -c btrfs -n $device -a delete -d 'Remove a device from a filesystem'
+complete -f -c btrfs -n $device -a remove -d 'Remove a device from a filesystem'
+complete -f -c btrfs -n $device -a scan -d 'Scan or forget (unregister) devices of btrfs filesystems'
+complete -f -c btrfs -n $device -a ready -d 'Check and wait until a group of devices of a filesystem is ready for mount'
+complete -f -c btrfs -n $device -a stats -d 'Show device IO error statistics'
+complete -f -c btrfs -n $device -a usage -d 'Show detailed information about internal allocations in devices.'
+
+# btrfs scrub
+complete -f -c btrfs -n $scrub -a start -d 'Start a new scrub. If a scrub is already running, the new one fails.'
+complete -f -c btrfs -n $scrub -a cancel -d 'Cancel a running scrub'
+complete -f -c btrfs -n $scrub -a resume -d 'Resume previously canceled or interrupted scrub'
+complete -f -c btrfs -n $scrub -a status -d 'Show status of running or finished scrub'
+
+# btrfs rescue
+complete -f -c btrfs -n $rescue -a chunk-recover -d 'Recover the chunk tree by scanning the devices one by one.'
+complete -f -c btrfs -n $rescue -a super-recover -d 'Recover bad superblocks from good copies'
+complete -f -c btrfs -n $rescue -a zero-log -d 'Clear the tree log. Usable if it\'s corrupted and prevents mount.'
+complete -f -c btrfs -n $rescue -a fix-device-size -d 'Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size'
+
+# btrfs inspect-internal
+complete -f -c btrfs -n $inspect_internal -a inode-resolve -d 'Get file system paths for the given inode'
+complete -f -c btrfs -n $inspect_internal -a logical-resolve -d 'Get file system paths for the given logical address'
+complete -f -c btrfs -n $inspect_internal -a subvolid-resolve -d 'Get file system paths for the given subvolume ID.'
+complete -f -c btrfs -n $inspect_internal -a rootid -d 'Get tree ID of the containing subvolume of path.'
+complete -f -c btrfs -n $inspect_internal -a min-dev-size -d 'Get the minimum size the device can be shrunk to. The device id 1 is used by default.'
+complete -f -c btrfs -n $inspect_internal -a dump-tree -d 'Dump tree structures from a given device'
+complete -f -c btrfs -n $inspect_internal -a dump-super -d 'Dump superblock from a device in a textual form'
+complete -f -c btrfs -n $inspect_internal -a tree-stats -d 'Print various stats for trees'
+
+# btrfs property
+complete -f -c btrfs -n $property -a get -d 'Get a property value of a btrfs object'
+complete -f -c btrfs -n $property -a set -d 'Set a property on a btrfs object'
+complete -f -c btrfs -n $property -a list -d 'Lists available properties with their descriptions for the given object'
+
+# btrfs quota
+complete -f -c btrfs -n $quota -a enable -d 'Enable subvolume quota support for a filesystem.'
+complete -f -c btrfs -n $quota -a disable -d 'Disable subvolume quota support for a filesystem.'
+complete -f -c btrfs -n $quota -a rescan -d 'Trash all qgroup numbers and scan the metadata again with the current config.'
+
+# btrfs qgroup
+complete -f -c btrfs -n $qgroup -a assign -d 'Assign SRC as the child qgroup of DST'
+complete -f -c btrfs -n $qgroup -a remove -d 'Remove a child qgroup SRC from DST.'
+complete -f -c btrfs -n $qgroup -a create -d 'Create a subvolume quota group.'
+complete -f -c btrfs -n $qgroup -a destroy -d 'Destroy a quota group.'
+complete -f -c btrfs -n $qgroup -a show -d 'Show subvolume quota groups.'
+complete -f -c btrfs -n $qgroup -a limit -d 'Set the limits a subvolume quota group.'
+
+# btrfs replace
+complete -f -c btrfs -n $replace -a start -d 'Replace device of a btrfs filesystem.'
+complete -f -c btrfs -n $replace -a status -d 'Print status and progress information of a running device replace'
+complete -f -c btrfs -n $replace -a cancel -d 'Cancel a running device replace operation.'

From 5b2250883a977d17c0bf691eb9fd24ce148b923b Mon Sep 17 00:00:00 2001
From: Lior Stern <liorst4@gmail.com>
Date: Fri, 25 Oct 2019 16:36:51 +0300
Subject: [PATCH 1123/1732] Add termux support for fish_config.

---
 share/tools/web_config/webconfig.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index a4e9e09dc..81e1d527f 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -8,6 +8,7 @@ try:
 except ImportError:
     from cgi import escape as escape_html
 from distutils.version import LooseVersion
+from distutils.spawn import find_executable
 import glob
 import multiprocessing.pool
 import operator
@@ -49,6 +50,10 @@ def is_wsl():
                 return True
     return False
 
+def is_termux():
+    """ Return whether we are running under the Termux application for Android"""
+    return 'com.termux' in os.environ['PATH'] and find_executable('termux-open-url')
+
 
 # Disable CLI web browsers
 term = os.environ.pop("TERM", None)
@@ -1505,6 +1510,8 @@ if isMacOS10_12_5_OrLater():
     subprocess.check_call(["open", fileurl])
 elif is_wsl():
     subprocess.call(["cmd.exe", "/c", "start %s" % url])
+elif is_termux():
+    subprocess.call(["termux-open-url", url])
 else:
     webbrowser.open(fileurl)
 

From b89a6451a3f18589750864e3709d24bb307b484a Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sun, 27 Oct 2019 00:17:52 +0800
Subject: [PATCH 1124/1732] functions/__fish_print_hostnames: Fix ssh_configs
 no values return (#6236)

* functions/__fish_print_hostnames: Fix ssh_configs no values return
`string replace` not working with mutlilines variable.
So split per line first.

* functions/__fish_print_hostnames: remove quotes at `split '\n'`
"\n with quotes" will cause `string split` weird issues.

* functions/__fish_print_hostnames: using `read -alz -d \n`
Fix `$contents` issues together
---
 share/functions/__fish_print_hostnames.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 1034b49a5..8bf21f8e8 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -105,10 +105,10 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
         if test -r $file
             # Don't read from $file twice. We could use `while read` instead, but that is extremely
             # slow.
-            read -z -l contents <$file
+            read -alz -d \n contents <$file
 
             # Print hosts from system wide ssh configuration file
-            string replace -rfi '^\s*Host\s+(\S.*?)\s*$' '$1' -- $contents | string split ' ' | string match -v '*\**'
+            string replace -rfi '^\s*Host\s+(\S.*?)\s*$' '$1' -- $contents | string match -v '*\**'
             # Also extract known_host paths.
             set known_hosts $known_hosts (string replace -rfi '.*KnownHostsFile\s*' '' -- $contents)
         end

From 9d1ccf81108f7e7d733f4caa38a3c7dfaf4074cb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 18 Oct 2019 16:26:15 +0200
Subject: [PATCH 1125/1732] Fix composer completions on Python 3

Some distros (Arch) use python command for Python 3, so we need to update the scripts to work with it. We cannot just switch to python3 command because MacOS does not ship it.
---
 share/completions/composer.fish | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index c96d8b2a8..437cf9652 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -22,18 +22,21 @@ end
 
 function __fish_composer_required_packages
     test -f composer.json; or return
+    set -l python (__fish_anypython); or return
     echo "
+import itertools
 import json
 json_data = open('composer.json')
 data = json.load(json_data)
 json_data.close()
-packages = data['require'].keys() + data['require-dev'].keys()
-print \"\n\".join(packages)
-      " | python
+packages = itertools.chain(data['require'].keys(), data['require-dev'].keys())
+print(\"\n\".join(packages))
+      " | $python
 end
 
 function __fish_composer_installed_packages
     test -f composer.lock; or return
+    set -l python (__fish_anypython); or return
     echo "
 import json
 json_data = open('composer.lock')
@@ -44,20 +47,21 @@ for package in data['packages']:
     installed_packages.append(package['name'])
 for package in data['packages-dev']:
     installed_packages.append(package['name'])
-print \"\n\".join(installed_packages)
-" | python
+print(\"\n\".join(installed_packages))
+" | $python
 end
 
 function __fish_composer_scripts
     test -f composer.json; or return
+    set -l python (__fish_anypython); or return
     echo "
 import json
 json_data = open('composer.json')
 data = json.load(json_data)
 json_data.close()
 if 'scripts' in data and data['scripts']:
-    print \"\n\".join(data['scripts'].keys())
-" | python
+    print(\"\n\".join(data['scripts'].keys()))
+" | $python
 end
 
 # add cmds list

From 4a1edbd3cb17feef519abc45fcde2fad020fd3c4 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 25 Oct 2019 15:47:43 +0200
Subject: [PATCH 1126/1732] make completions for ninja aware of the build
 directory passed by -C

---
 share/completions/ninja.fish | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/share/completions/ninja.fish b/share/completions/ninja.fish
index 935d324bd..f1b739589 100644
--- a/share/completions/ninja.fish
+++ b/share/completions/ninja.fish
@@ -1,14 +1,19 @@
+function __fish_ninja
+    set -l saved_args $argv
+    set -l dir .
+    argparse -i C/dir= -- (commandline -opc)
+    and set -ql _flag_C
+    and set -l dir $_flag_C
+    test -f $dir/build.ninja
+    and command ninja -C$dir $saved_args
+end
+
 function __fish_print_ninja_tools
-    echo list
-    if test -f build.ninja
-        ninja -t list | string match -v '*:' | string replace -r '\s+(\w+).*' '$1'
-    end
+    __fish_ninja -t list | string match -v '*:' | string replace -r '\s+(\w+).*' '$1'
 end
 
 function __fish_print_ninja_targets
-    if test -f build.ninja
-        ninja -t targets 2>/dev/null | string replace -r ':.*' ''
-    end
+    __fish_ninja -t targets 2>/dev/null | string replace -r ':.*' ''
 end
 complete -c ninja -f -a '(__fish_print_ninja_targets)' -d target
 complete -x -c ninja -s t -x -a "(__fish_print_ninja_tools)" -d subtool

From 9564e4a6d6630e0e65027a5cb543991058f1664f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 26 Oct 2019 14:18:13 +0200
Subject: [PATCH 1127/1732] Fix formatting in dump_tree

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

diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 6b216a135..e23b6a177 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -285,7 +285,7 @@ static void dump_tree_recursive(const parse_node_tree_t &nodes, const wcstring &
         if (indent > 0) indent -= 1;
     }
 
-    append_format(*result, L"%2lu - %l2u  ", *line, node_idx);
+    append_format(*result, L"%2lu - %2lu  ", *line, node_idx);
     result->append(indent * spacesPerIndent, L' ');
     result->append(node.describe());
     if (node.child_count > 0) {

From 40c553db29f0fd8a73f655d0fa3ae284f09a902a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 27 Oct 2019 06:46:50 +0100
Subject: [PATCH 1128/1732] Fix completion scripts for builtins "exec" and
 "not"

---
 share/completions/exec.fish | 2 +-
 share/completions/not.fish  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/share/completions/exec.fish b/share/completions/exec.fish
index b1043bf76..a2abf228a 100644
--- a/share/completions/exec.fish
+++ b/share/completions/exec.fish
@@ -1,2 +1,2 @@
-
 complete -c exec -s h -l help -d 'Display help and exit'
+complete -c exec -r -a '(__fish_complete_subcommand)'
diff --git a/share/completions/not.fish b/share/completions/not.fish
index e0c7b86fe..90fa69045 100644
--- a/share/completions/not.fish
+++ b/share/completions/not.fish
@@ -1,4 +1,2 @@
-
 complete -c not -s h -l help -d 'Display help and exit'
-complete -c not -xa '__fish_complete_subcommand'
-
+complete -c not -xa '(__fish_complete_subcommand)'

From a930cabb919fe08a4e6acee840659ba7cf05ff95 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 27 Oct 2019 06:47:39 +0100
Subject: [PATCH 1129/1732] Update comment

---
 src/parse_grammar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index f760a4021..0a6e5bcc4 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -236,7 +236,7 @@ DEF_ALT(job_continuation) {
     ALT_BODY(job_continuation, piped, empty);
 };
 
-// A statement is a normal command, or an if / while / and etc
+// A statement is a normal command, or an if / while / not etc.
 DEF_ALT(statement) {
     using nots = single<not_statement>;
     using block = single<block_statement>;

From 56b4763c67c4aea415bcd5cc5721483f0a71055e Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 27 Oct 2019 08:07:54 +0100
Subject: [PATCH 1130/1732] Fix file completion for builtins "set" and "test
 -f" and others

---
 share/completions/test.fish                   | 32 +++++++++----------
 .../functions/__fish_config_interactive.fish  |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/share/completions/test.fish b/share/completions/test.fish
index e7e260034..6ff658dc7 100644
--- a/share/completions/test.fish
+++ b/share/completions/test.fish
@@ -15,20 +15,20 @@ complete -c test -f -o ne -d "Left number != right number"
 #complete -c test -o ef -d "Left file equal to right file"
 #complete -c test -o nt -d "Left file newer than right file"
 #complete -c test -o ot -d "Left file older than right file"
-complete -c test -s b -d "File is block device"
-complete -c test -s c -d "File is character device"
-complete -c test -s d -d "File is directory"
-complete -c test -s e -d "File exists"
-complete -c test -s f -d "File is regular"
-complete -c test -s g -d "File is set-group-ID"
-complete -c test -s G -d "File owned by our effective group ID"
-complete -c test -s L -d "File is a symlink"
-complete -c test -s O -d "File owned by our effective user ID"
-complete -c test -s p -d "File is a named pipe"
-complete -c test -s r -d "File is readable"
-complete -c test -s s -d "File size is non-zero"
-complete -c test -s S -d "File is a socket"
+complete -c test -s b -r -d "File is block device"
+complete -c test -s c -r -d "File is character device"
+complete -c test -s d -r -d "File is directory"
+complete -c test -s e -r -d "File exists"
+complete -c test -s f -r -d "File is regular"
+complete -c test -s g -r -d "File is set-group-ID"
+complete -c test -s G -r -d "File owned by our effective group ID"
+complete -c test -s L -r -d "File is a symlink"
+complete -c test -s O -r -d "File owned by our effective user ID"
+complete -c test -s p -r -d "File is a named pipe"
+complete -c test -s r -r -d "File is readable"
+complete -c test -s s -r -d "File size is non-zero"
+complete -c test -s S -r -d "File is a socket"
 complete -c test -f -s t -d "FD is a terminal"
-complete -c test -s u -d "File set-user-ID bit is set"
-complete -c test -s w -d "File is writable"
-complete -c test -s x -d "File is executable"
+complete -c test -s u -r -d "File set-user-ID bit is set"
+complete -c test -s w -r -d "File is writable"
+complete -c test -s x -r -d "File is executable"
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 073bb1271..ec059f3c9 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -167,7 +167,7 @@ function __fish_config_interactive -d "Initializations that should be performed
     #
     # Only a few builtins take filenames; initialize the rest with no file completions
     #
-    complete -c(builtin -n | string match -rv 'source|cd|exec|realpath') --no-files
+    complete -c(builtin -n | string match -rv 'source|cd|exec|realpath|set|\[|test') --no-files
 
     # Reload key bindings when binding variable change
     function __fish_reload_key_bindings -d "Reload key bindings when binding variable change" --on-variable fish_key_bindings

From ae6bdfa37c7cf9462f9ffd53de91a70644c18570 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 27 Oct 2019 12:31:35 -0500
Subject: [PATCH 1131/1732] Handle empty clipboard for all providers

Closes #6254
---
 share/functions/fish_clipboard_paste.fish | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 0ed27abce..08c0402b5 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -1,21 +1,20 @@
 function fish_clipboard_paste
     set -l data
     if type -q pbpaste
-        set data (pbpaste)
+        set data (pbpaste 2>/dev/null)
     else if set -q WAYLAND_DISPLAY; and type -q wl-paste
-        set data (wl-paste)
+        set data (wl-paste 2>/dev/null)
     else if type -q xsel
-        # Return if `xsel` failed.
-        # That way we don't print the redundant (and overly verbose for this) commandline error.
-        # Also require non-empty contents to not clear the buffer.
-        if not set data (xsel --clipboard 2>/dev/null)
-            return 1
-        end
+        set data (xsel --clipboard 2>/dev/null)
     else if type -q xclip
-        if not set data (xclip -selection clipboard -o 2>/dev/null)
-            return 1
-        end
+        set data (xclip -selection clipboard -o 2>/dev/null)
     end
+
+    # Issue 6254: Handle zero-length clipboard content
+    if not string match -qr . -- "$data"
+        return 1
+    end
+
     # Also split on \r to turn it into a newline,
     # otherwise the output looks really confusing.
     set data (string split \r -- $data)

From f620ddf03bd4232ef68e6e794b17c444daf9a0ea Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Sun, 27 Oct 2019 12:34:58 -0500
Subject: [PATCH 1132/1732] Set fish_clipboard_paste handler once on startup

Instead of searching each time.
---
 share/functions/fish_clipboard_paste.fish | 30 +++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 08c0402b5..9a7754a35 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -1,14 +1,24 @@
-function fish_clipboard_paste
-    set -l data
-    if type -q pbpaste
-        set data (pbpaste 2>/dev/null)
-    else if set -q WAYLAND_DISPLAY; and type -q wl-paste
-        set data (wl-paste 2>/dev/null)
-    else if type -q xsel
-        set data (xsel --clipboard 2>/dev/null)
-    else if type -q xclip
-        set data (xclip -selection clipboard -o 2>/dev/null)
+# Search for and set clipboard handler only once at startup
+if type -q pbpaste
+    function __fish_clipboard_paste
+        pbpaste 2>/dev/null
     end
+else if set -q WAYLAND_DISPLAY; and type -q wl-paste
+    function __fish_clipboard_paste
+        wl-paste 2>/dev/null
+    end
+else if type -q xsel
+    function __fish_clipboard_paste
+        xsel --clipboard 2>/dev/null
+    end
+else if type -q xclip
+    function __fish_clipboard_paste
+        xclip -selection clipboard -o 2>/dev/null
+    end
+end
+
+function fish_clipboard_paste
+    set -l data (__fish_clipboard_paste)
 
     # Issue 6254: Handle zero-length clipboard content
     if not string match -qr . -- "$data"

From 756e9826bcedecfa755772c4b37653f85b339520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Martinez?= <clementmartinezdev@gmail.com>
Date: Sun, 27 Oct 2019 13:22:47 +0100
Subject: [PATCH 1133/1732] Improve `gpg` completions

---
 share/completions/gpg.fish | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index c3638bc25..abc1ba997 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -354,3 +354,26 @@ complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal c
 complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
 complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
 complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+complete -c gpg -l card-status -d "Print card status"
+complete -c gpg -l change-passphrase -d "Change passphrase"
+complete -c gpg -l change-pin -d "Change pin"
+complete -c gpg -l check-signatures -d "List and check key signatures"
+complete -c gpg -l clear-sign -d "Make clear text signature"
+complete -c gpg -l delete-keys -d "Remove keys from public keyring"
+complete -c gpg -l delete-secret-keys -d "Remove keys from secret keyring"
+complete -c gpg -l edit-card -d "Change data on card"
+complete -c gpg -l full-generate-key -d "Full featured key par generation"
+complete -c gpg -l generate-key -d "Generate a new key pair"
+complete -c gpg -l generate-revocation -d "Generate revocation certificate"
+complete -c gpg -l list-signatures -d "List keys and signatures"
+complete -c gpg -l openpgp -d "Use strict OpenPGP behavior"
+complete -c gpg -l quick-add-uid -d "Quickly generate new key pair"
+complete -c gpg -l quick-generate-key -d "Quickly generate new key pair"
+complete -c gpg -l quick-lsign-key -d "Quickly sign key locally"
+complete -c gpg -l quick-sign-key -d "Quickly sign key"
+complete -c gpg -l quick-revoke-uid -d "Quickly revoke user-id"
+complete -c gpg -l quick-set-expire -d "Quickly set new expiration date"
+complete -c gpg -l receive-keys -d "Import keys from keyserver"
+complete -c gpg -l server -d "Run in server mode"
+complete -c gpg -l tofu-policy -x -d "Set given TOFU policy for key"
+

From 2a92e66902cdc15af74c03d25378262a256ec181 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 14 Oct 2019 15:45:40 -0700
Subject: [PATCH 1134/1732] Support for &> and &| as convenience redirections

This adds support for &> and &| syntax, which both redirect stdout, and
also apply a redirection of stderr to stdout.
---
 CHANGELOG.md               |  5 +++--
 sphinx_doc_src/index.rst   |  7 ++++---
 src/fish_tests.cpp         | 22 ++++++++++++++++++----
 src/parse_execution.cpp    | 18 ++++++++++++++++++
 src/proc.h                 |  2 +-
 src/tokenizer.cpp          | 33 ++++++++++++++++++++++++++++++++-
 src/tokenizer.h            |  4 ++++
 tests/checks/redirect.fish | 27 +++++++++++++++++++++++++++
 8 files changed, 107 insertions(+), 11 deletions(-)
 create mode 100644 tests/checks/redirect.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae361417b..12754e5ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,8 +19,9 @@
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
 - `jobs --last` returns 0 to indicate success when a job is found (#6104).
-- `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214)
-- `fish` now correctly handles CDPATH entries that starts with `..` (#6220)
+- `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
+- `fish` now correctly handles CDPATH entries that starts with `..` (#6220).
+- New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index fefb73736..0a25e42d7 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -337,8 +337,6 @@ Most programs use three input/output (IO) streams, each represented by a number
 
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
-The reason for providing for two output file descriptors is to allow separation of errors and warnings from regular program output.
-
 Any file descriptor can be directed to a different output than its default through a simple mechanism called a redirection.
 
 An example of a file redirection is ``echo hello > output.txt``, which directs the output of the echo command to the file output.txt.
@@ -358,9 +356,11 @@ An example of a file redirection is ``echo hello > output.txt``, which directs t
 
 - An ampersand followed by a minus sign (``&-``). The file descriptor will be closed.
 
+As a convenience, the redirection ``&>`` can be used to direct both stdout and stderr to the same file.
+
 Example:
 
-To redirect both standard output and standard error to the file 'all_output.txt', you can write ``echo Hello > all_output.txt 2>&1``.
+To redirect both standard output and standard error to the file 'all_output.txt', you can write ``echo Hello &> all_output.txt``, which is a convenience for ``echo Hello > all_output.txt 2>&1``.
 
 Any file descriptor can be redirected in an arbitrary way by prefixing the redirection with the file descriptor.
 
@@ -388,6 +388,7 @@ Pipes usually connect file descriptor 1 (standard output) of the first process t
 
 will attempt to build the fish program, and any errors will be shown using the less pager.
 
+As a convenience, the pipe ``&|`` may be used to redirect both stdout and stderr to the same process. (Note this is different from bash, which uses ``|&``).
 
 .. _syntax-background:
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 739144cd1..4476c6019 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -590,15 +590,16 @@ static void test_tokenizer() {
     const wchar_t *str =
         L"string <redirection  2>&1 'nested \"quoted\" '(string containing subshells "
         L"){and,brackets}$as[$well (as variable arrays)] not_a_redirect^ ^ ^^is_a_redirect "
+        L"&| &> "
         L"&&& ||| "
         L"&& || & |"
         L"Compress_Newlines\n  \n\t\n   \nInto_Just_One";
     using tt = token_type_t;
     const token_type_t types[] = {
-        tt::string, tt::redirect, tt::string,   tt::redirect, tt::string,     tt::string,
-        tt::string, tt::redirect, tt::redirect, tt::string,   tt::andand,     tt::background,
-        tt::oror,   tt::pipe,     tt::andand,   tt::oror,     tt::background, tt::pipe,
-        tt::string, tt::end,      tt::string};
+        tt::string,     tt::redirect,   tt::string,   tt::redirect, tt::string, tt::string,
+        tt::string,     tt::redirect,   tt::redirect, tt::string,   tt::pipe,   tt::redirect,
+        tt::andand,     tt::background, tt::oror,     tt::pipe,     tt::andand, tt::oror,
+        tt::background, tt::pipe,       tt::string,   tt::end,      tt::string};
 
     say(L"Test correct tokenization");
 
@@ -686,6 +687,13 @@ static void test_tokenizer() {
     do_test(pipe_or_redir(L"9999999999999>&2")->is_valid() == false);
     do_test(pipe_or_redir(L"9999999999999>&2")->is_valid() == false);
 
+    do_test(pipe_or_redir(L"&|")->is_pipe);
+    do_test(pipe_or_redir(L"&|")->stderr_merge);
+    do_test(!pipe_or_redir(L"&>")->is_pipe);
+    do_test(pipe_or_redir(L"&>")->stderr_merge);
+    do_test(pipe_or_redir(L"&>>")->stderr_merge);
+    do_test(pipe_or_redir(L"&>?")->stderr_merge);
+
     auto get_redir_mode = [](const wchar_t *s) -> maybe_t<redirection_mode_t> {
         if (auto redir = pipe_or_redir_t::from_string(s)) {
             return redir->mode;
@@ -4609,6 +4617,12 @@ static void test_highlighting() {
         {L"self%not", highlight_role_t::param},
     });
 
+    highlight_tests.push_back({
+        {L"false", highlight_role_t::command},
+        {L"&|", highlight_role_t::statement_terminator},
+        {L"true", highlight_role_t::command},
+    });
+
     auto &vars = parser_t::principal_parser().vars();
     // Verify variables and wildcards in commands using /bin/cat.
     vars.set(L"VARIABLE_IN_COMMAND", ENV_LOCAL, {L"a"});
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 80e38ef08..2a0f6c7bf 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -80,6 +80,11 @@ static wcstring profiling_cmd_name_for_redirectable_block(const parse_node_t &no
     return result;
 }
 
+/// Get a redirection from stderr to stdout (i.e. 2>&1).
+static std::shared_ptr<io_data_t> get_stderr_merge() {
+    return std::make_shared<io_fd_t>(STDERR_FILENO, STDOUT_FILENO, true /* user_supplied */);
+}
+
 parse_execution_context_t::parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
                                                      std::shared_ptr<job_t> parent)
     : pstree(std::move(pstree)), parser(p), parent_job(std::move(parent)) {}
@@ -1019,6 +1024,12 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
         if (new_io.get() != NULL) {
             result.push_back(new_io);
         }
+
+        if (redirect->stderr_merge) {
+            // This was a redirect like &> which also modifies stderr.
+            // Also redirect stderr to stdout.
+            result.push_back(get_stderr_merge());
+        }
     }
 
     if (out_chain && !errored) {
@@ -1141,6 +1152,13 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
             break;
         }
         processes.back()->pipe_write_fd = parsed_pipe->fd;
+        if (parsed_pipe->stderr_merge) {
+            // This was a pipe like &| which redirects both stdout and stderr.
+            // Also redirect stderr to stdout.
+            auto ios = processes.back()->io_chain();
+            ios.push_back(get_stderr_merge());
+            processes.back()->set_io_chain(std::move(ios));
+        }
 
         // Store the new process (and maybe with an error).
         processes.emplace_back(new process_t());
diff --git a/src/proc.h b/src/proc.h
index c093e5c1d..4b086011e 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -215,7 +215,7 @@ class process_t {
     /// IO chain getter and setter.
     const io_chain_t &io_chain() const { return process_io_chain; }
 
-    void set_io_chain(const io_chain_t &chain) { this->process_io_chain = chain; }
+    void set_io_chain(io_chain_t chain) { this->process_io_chain = std::move(chain); }
 
     /// Store the current topic generations. That is, right before the process is launched, record
     /// the generations of all topics; then we can tell which generation values have changed after
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 7fe4708a5..037c4bbd8 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -296,6 +296,7 @@ maybe_t<pipe_or_redir_t> pipe_or_redir_t::from_string(const wchar_t *buff) {
        Note we are only responsible for parsing the redirection part, not 'cmd' or 'file'.
 
         cmd | cmd        normal pipe
+        cmd &| cmd       normal pipe plus stderr-merge
         cmd >| cmd       pipe with explicit fd
         cmd 2>| cmd      pipe with explicit fd
         cmd < file       stdin redirection
@@ -308,6 +309,7 @@ maybe_t<pipe_or_redir_t> pipe_or_redir_t::from_string(const wchar_t *buff) {
         cmd 1>&2 file    fd redirection with an explicit src fd
         cmd <&2 file     fd redirection with no explicit src fd (stdin is used)
         cmd 3<&0 file    fd redirection with an explicit src fd
+        cmd &> file      redirection with stderr merge
         cmd ^ file       caret (stderr) redirection, perhaps disabled via feature flags
         cmd ^^ file      caret (stderr) redirection, perhaps disabled via feature flags
     */
@@ -404,7 +406,25 @@ maybe_t<pipe_or_redir_t> pipe_or_redir_t::from_string(const wchar_t *buff) {
                 break;
             }
         }
-
+        case L'&': {
+            consume(L'&');
+            if (try_consume(L'|')) {
+                // &| is pipe with stderr merge.
+                result.fd = STDOUT_FILENO;
+                result.is_pipe = true;
+                result.stderr_merge = true;
+            } else if (try_consume(L'>')) {
+                result.fd = STDOUT_FILENO;
+                result.stderr_merge = true;
+                result.mode = redirection_mode_t::overwrite;
+                if (try_consume(L'>')) result.mode = redirection_mode_t::append;  // like &>>
+                if (try_consume(L'?'))
+                    result.mode = redirection_mode_t::noclob;  // like &>? or &>>?
+            } else {
+                return none();
+            }
+            break;
+        }
         default: {
             // Not a redirection.
             return none();
@@ -521,10 +541,20 @@ maybe_t<tok_t> tokenizer_t::next() {
         }
         case L'&': {
             if (this->buff[1] == L'&') {
+                // && is and.
                 result.emplace(token_type_t::andand);
                 result->offset = start_pos;
                 result->length = 2;
                 this->buff += 2;
+            } else if (this->buff[1] == L'>' || this->buff[1] == L'|') {
+                // &> and &| redirect both stdout and stderr.
+                auto redir = pipe_or_redir_t::from_string(buff);
+                assert(redir.has_value() &&
+                       "Should always succeed to parse a &> or &| redirection");
+                result.emplace(redir->token_type());
+                result->offset = start_pos;
+                result->length = redir->consumed;
+                this->buff += redir->consumed;
             } else {
                 result.emplace(token_type_t::background);
                 result->offset = start_pos;
@@ -535,6 +565,7 @@ maybe_t<tok_t> tokenizer_t::next() {
         }
         case L'|': {
             if (this->buff[1] == L'|') {
+                // || is or.
                 result.emplace(token_type_t::oror);
                 result->offset = start_pos;
                 result->length = 2;
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 91fd55993..a24a26d38 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -152,6 +152,10 @@ struct pipe_or_redir_t {
     // Ignored for pipes.
     redirection_mode_t mode{redirection_mode_t::overwrite};
 
+    // Whether, in addition to this redirection, stderr should also be dup'd to stdout
+    // For example &| or &>
+    bool stderr_merge{false};
+
     // Number of characters consumed when parsing the string.
     size_t consumed{0};
 
diff --git a/tests/checks/redirect.fish b/tests/checks/redirect.fish
new file mode 100644
index 000000000..d7768c70a
--- /dev/null
+++ b/tests/checks/redirect.fish
@@ -0,0 +1,27 @@
+#RUN: %fish %s
+
+function outnerr
+    command echo out $argv
+    command echo err $argv 1>&2
+end
+
+outnerr 0 &| count
+#CHECK: 2
+
+set -l tmpdir (mktemp -d)
+outnerr overwrite &> $tmpdir/file.txt
+cat $tmpdir/file.txt
+#CHECK: out overwrite
+#CHECK: err overwrite
+
+outnerr append &>> $tmpdir/file.txt
+cat $tmpdir/file.txt
+#CHECK: out overwrite
+#CHECK: err overwrite
+#CHECK: out append
+#CHECK: err append
+
+echo noclobber &>>? $tmpdir/file.txt
+#CHECKERR: {{.*}} The file {{.*}} already exists
+
+rm -Rf $tmpdir

From 0bfd897ee0c3b23831921949fe9af30130bd7966 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 27 Oct 2019 14:35:14 -0700
Subject: [PATCH 1135/1732] Add a special error message for |&

---
 src/tokenizer.cpp          | 6 ++++++
 src/tokenizer.h            | 1 +
 tests/checks/redirect.fish | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 037c4bbd8..1320c9698 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -36,6 +36,8 @@ const wchar_t *tokenizer_get_error_message(tokenizer_error_t err) {
             return _(L"Invalid input/output redirection");
         case tokenizer_error_t::invalid_pipe:
             return _(L"Cannot use stdin (fd 0) as pipe output");
+        case tokenizer_error_t::invalid_pipe_ampersand:
+            return _(L"|& is not valid. In fish, use &| to pipe both stdout and stderr.");
         case tokenizer_error_t::closing_unopened_subshell:
             return _(L"Unexpected ')' for unopened parenthesis");
         case tokenizer_error_t::illegal_slice:
@@ -570,6 +572,10 @@ maybe_t<tok_t> tokenizer_t::next() {
                 result->offset = start_pos;
                 result->length = 2;
                 this->buff += 2;
+            } else if (this->buff[1] == L'&') {
+                // |& is a bashism; in fish it's &|.
+                return this->call_error(tokenizer_error_t::invalid_pipe_ampersand, this->buff,
+                                        this->buff);
             } else {
                 auto pipe = pipe_or_redir_t::from_string(buff);
                 assert(pipe.has_value() && pipe->is_pipe &&
diff --git a/src/tokenizer.h b/src/tokenizer.h
index a24a26d38..571d20c01 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -51,6 +51,7 @@ enum class tokenizer_error_t {
     unterminated_escape,
     invalid_redirect,
     invalid_pipe,
+    invalid_pipe_ampersand,
     closing_unopened_subshell,
     illegal_slice,
     closing_unopened_brace,
diff --git a/tests/checks/redirect.fish b/tests/checks/redirect.fish
index d7768c70a..61c9eb004 100644
--- a/tests/checks/redirect.fish
+++ b/tests/checks/redirect.fish
@@ -24,4 +24,9 @@ cat $tmpdir/file.txt
 echo noclobber &>>? $tmpdir/file.txt
 #CHECKERR: {{.*}} The file {{.*}} already exists
 
+eval "echo foo |& false"
+#CHECKERR: {{.*}} |& is not valid. In fish, use &| to pipe both stdout and stderr.
+#CHECKERR: echo foo |& false
+#CHECKERR:          ^
+
 rm -Rf $tmpdir

From afd20b8e1abf330c7d4ffbd7db2d7b23864e46b8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 27 Oct 2019 15:44:08 -0700
Subject: [PATCH 1136/1732] Correctly report the range of tokenizer errors

This enables proper syntax highlighting of tokenizer errors.
---
 src/fish_tests.cpp |  5 +++++
 src/parse_tree.cpp |  4 ++--
 src/tokenizer.cpp  | 21 +++++++++++----------
 src/tokenizer.h    |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 4476c6019..3b0526a53 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4623,6 +4623,11 @@ static void test_highlighting() {
         {L"true", highlight_role_t::command},
     });
 
+    highlight_tests.push_back({
+        {L"false", highlight_role_t::command},
+        {L"|&", highlight_role_t::error},
+    });
+
     auto &vars = parser_t::principal_parser().vars();
     // Verify variables and wildcards in commands using /bin/cat.
     vars.set(L"VARIABLE_IN_COMMAND", ENV_LOCAL, {L"a"});
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index e23b6a177..269b36d60 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -83,7 +83,7 @@ wcstring parse_error_t::describe_with_prefix(const wcstring &src, const wcstring
     assert(line_end >= line_start);
     assert(source_start >= line_start);
 
-    // Don't include the caret and line if we're interactive this is the first line, because
+    // Don't include the caret and line if we're interactive and this is the first line, because
     // then it's obvious.
     bool interactive_skip_caret = is_interactive && source_start == 0;
     if (interactive_skip_caret) {
@@ -637,7 +637,7 @@ void parse_ll_t::parse_error_at_location(size_t source_start, size_t source_leng
 
         err.source_start = source_start;
         err.source_length = source_length;
-        this->errors.push_back(err);
+        this->errors.push_back(std::move(err));
     }
 }
 
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 1320c9698..39d54fc81 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -60,7 +60,7 @@ static bool caret_redirs() { return !feature_test(features_t::stderr_nocaret); }
 
 /// Return an error token and mark that we no longer have a next token.
 tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token_start,
-                              const wchar_t *error_loc) {
+                              const wchar_t *error_loc, maybe_t<size_t> token_length) {
     assert(error_type != tokenizer_error_t::none && "tokenizer_error_t::none passed to call_error");
     assert(error_loc >= token_start && "Invalid error location");
     assert(this->buff >= token_start && "Invalid buff location");
@@ -70,7 +70,8 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
     tok_t result{token_type_t::error};
     result.error = error_type;
     result.offset = token_start - this->start;
-    result.length = this->buff - token_start;
+    // If we are passed a token_length, then use it; otherwise infer it from the buffer.
+    result.length = token_length ? *token_length : this->buff - token_start;
     result.error_offset = error_loc - token_start;
     return result;
 }
@@ -174,12 +175,12 @@ tok_t tokenizer_t::read_string() {
         } else if (c == L')') {
             if (expecting.size() > 0 && expecting.back() == L'}') {
                 return this->call_error(tokenizer_error_t::expected_bclose_found_pclose,
-                                        this->start, this->buff);
+                                        this->start, this->buff, 1);
             }
             switch (paran_offsets.size()) {
                 case 0:
                     return this->call_error(tokenizer_error_t::closing_unopened_subshell,
-                                            this->start, this->buff);
+                                            this->start, this->buff, 1);
                 case 1:
                     mode &= ~(tok_modes::subshell);
                 default:
@@ -189,7 +190,7 @@ tok_t tokenizer_t::read_string() {
         } else if (c == L'}') {
             if (expecting.size() > 0 && expecting.back() == L')') {
                 return this->call_error(tokenizer_error_t::expected_pclose_found_bclose,
-                                        this->start, this->buff);
+                                        this->start, this->buff, 1);
             }
             switch (brace_offsets.size()) {
                 case 0:
@@ -248,7 +249,7 @@ tok_t tokenizer_t::read_string() {
     if ((!this->accept_unfinished) && (mode != tok_modes::regular_text)) {
         if (mode & tok_modes::char_escape) {
             return this->call_error(tokenizer_error_t::unterminated_escape, buff_start,
-                                    this->buff - 1);
+                                    this->buff - 1, 1);
         } else if (mode & tok_modes::array_brackets) {
             return this->call_error(tokenizer_error_t::unterminated_slice, buff_start,
                                     this->start + slice_offset);
@@ -575,7 +576,7 @@ maybe_t<tok_t> tokenizer_t::next() {
             } else if (this->buff[1] == L'&') {
                 // |& is a bashism; in fish it's &|.
                 return this->call_error(tokenizer_error_t::invalid_pipe_ampersand, this->buff,
-                                        this->buff);
+                                        this->buff, 2);
             } else {
                 auto pipe = pipe_or_redir_t::from_string(buff);
                 assert(pipe.has_value() && pipe->is_pipe &&
@@ -594,8 +595,8 @@ maybe_t<tok_t> tokenizer_t::next() {
             // redirection is an error!
             auto redir_or_pipe = pipe_or_redir_t::from_string(this->buff);
             if (!redir_or_pipe || redir_or_pipe->fd < 0) {
-                return this->call_error(tokenizer_error_t::invalid_redirect, this->buff,
-                                        this->buff);
+                return this->call_error(tokenizer_error_t::invalid_redirect, this->buff, this->buff,
+                                        redir_or_pipe ? redir_or_pipe->consumed : 0);
             }
             result.emplace(redir_or_pipe->token_type());
             result->offset = start_pos;
@@ -617,7 +618,7 @@ maybe_t<tok_t> tokenizer_t::next() {
                 // tokenizer error.
                 if (redir_or_pipe->is_pipe && redir_or_pipe->fd == 0) {
                     return this->call_error(tokenizer_error_t::invalid_pipe, error_location,
-                                            error_location);
+                                            error_location, redir_or_pipe->consumed);
                 }
                 result.emplace(redir_or_pipe->token_type());
                 result->offset = start_pos;
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 571d20c01..1e97b893c 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -108,7 +108,7 @@ class tokenizer_t {
     bool continue_line_after_comment{false};
 
     tok_t call_error(tokenizer_error_t error_type, const wchar_t *token_start,
-                     const wchar_t *error_loc);
+                     const wchar_t *error_loc, maybe_t<size_t> token_length = {});
     tok_t read_string();
 
    public:

From eeac3333df6b30bf5663beaf116bf607cc44f37b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 27 Oct 2019 16:08:49 -0700
Subject: [PATCH 1137/1732] Correctly highlight input following a tokenizer
 error

---
 src/fish_tests.cpp |  2 ++
 src/parse_tree.cpp |  3 +--
 src/tokenizer.cpp  | 10 +++++++++-
 src/tokenizer.h    |  5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3b0526a53..d53eb3cb1 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4626,6 +4626,8 @@ static void test_highlighting() {
     highlight_tests.push_back({
         {L"false", highlight_role_t::command},
         {L"|&", highlight_role_t::error},
+        {L"true", highlight_role_t::command},
+        {L"stuff", highlight_role_t::param},
     });
 
     auto &vars = parser_t::principal_parser().vars();
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 269b36d60..a1070ee49 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1052,10 +1052,9 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
     // Construct the tokenizer.
     tok_flags_t tok_options = 0;
     if (parse_flags & parse_flag_include_comments) tok_options |= TOK_SHOW_COMMENTS;
-
     if (parse_flags & parse_flag_accept_incomplete_tokens) tok_options |= TOK_ACCEPT_UNFINISHED;
-
     if (parse_flags & parse_flag_show_blank_lines) tok_options |= TOK_SHOW_BLANK_LINES;
+    if (parse_flags & parse_flag_continue_after_error) tok_options |= TOK_CONTINUE_AFTER_ERROR;
 
     tokenizer_t tok(str.c_str(), tok_options);
 
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 39d54fc81..712d12ee0 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -65,7 +65,14 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
     assert(error_loc >= token_start && "Invalid error location");
     assert(this->buff >= token_start && "Invalid buff location");
 
-    this->has_next = false;
+    // If continue_after_error is set and we have a real token length, then skip past it.
+    // Otherwise give up.
+    if (token_length.has_value() && continue_after_error) {
+        assert(this->buff < error_loc + *token_length && "Unable to continue past error");
+        this->buff = error_loc + *token_length;
+    } else {
+        this->has_next = false;
+    }
 
     tok_t result{token_type_t::error};
     result.error = error_type;
@@ -82,6 +89,7 @@ tokenizer_t::tokenizer_t(const wchar_t *start, tok_flags_t flags) : buff(start),
     this->accept_unfinished = static_cast<bool>(flags & TOK_ACCEPT_UNFINISHED);
     this->show_comments = static_cast<bool>(flags & TOK_SHOW_COMMENTS);
     this->show_blank_lines = static_cast<bool>(flags & TOK_SHOW_BLANK_LINES);
+    this->continue_after_error = static_cast<bool>(flags & TOK_CONTINUE_AFTER_ERROR);
 }
 
 tok_t::tok_t(token_type_t type) : type(type) {}
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 1e97b893c..964e9afd6 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -41,6 +41,9 @@ enum class redirection_mode_t {
 /// the tokenizer to return each of them as a separate END.
 #define TOK_SHOW_BLANK_LINES 4
 
+/// Make an effort to continue after an error.
+#define TOK_CONTINUE_AFTER_ERROR 8
+
 typedef unsigned int tok_flags_t;
 
 enum class tokenizer_error_t {
@@ -104,6 +107,8 @@ class tokenizer_t {
     bool show_comments{false};
     /// Whether all blank lines are returned.
     bool show_blank_lines{false};
+    /// Whether to attempt to continue after an error.
+    bool continue_after_error{false};
     /// Whether to continue the previous line after the comment.
     bool continue_line_after_comment{false};
 

From b43f80e2d9941bad4a48912612a11e65ed1a5295 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sun, 27 Oct 2019 14:08:31 +0800
Subject: [PATCH 1138/1732] completions/btrfs.fish: Add detailed options
 completions

Add completion for options in option groups
Remove myself author information
---
 share/completions/btrfs.fish | 330 +++++++++++++++++++++++++++++++++--
 1 file changed, 313 insertions(+), 17 deletions(-)

diff --git a/share/completions/btrfs.fish b/share/completions/btrfs.fish
index 5cf2c45bf..d924f204d 100644
--- a/share/completions/btrfs.fish
+++ b/share/completions/btrfs.fish
@@ -1,10 +1,21 @@
 # Completions for btrfs-progs
-# Author: Akatsuki (akiirui) <imaykiller@gmail.com>
 
 # Todo:
-# 1. Detailed options per command
-# 2. Simplified descriptions
-# ...and more
+# - (Done) Detailed options per command
+# - Simplified duplicate options completion with `for`
+# - Simplified descriptions
+
+# Filter the completions per primary command
+function __btrfs_options
+    if not set -q argv[1]
+        return 1
+    end
+    set -l cmd (commandline -cp)
+    if string match -qr -- "btrfs\s+$argv[1]\s+\S*" $cmd
+        return 0
+    end
+    return 1
+end
 
 # Filter the completions per command groups
 function __btrfs_options_groups
@@ -12,12 +23,39 @@ function __btrfs_options_groups
         return 1
     end
     set -l cmd (commandline -cp)
-    if string match -qr -- "$argv\s+\S*\$" $cmd
+    if set -q argv[2]
+        if string match -qr -- "btrfs\s+$argv[1]\s+$argv[2]\s+\S*" $cmd
+            return 0
+        end
+        return 1
+    end
+    if string match -qr -- "btrfs\s+$argv[1]\s+\S*\$" $cmd
         return 0
     end
     return 1
 end
 
+set -l check '__btrfs_options check'
+set -l restore '__btrfs_options restore'
+set -l send '__btrfs_options send'
+set -l receive '__btrfs_options receive'
+set -l help '__btrfs_options help'
+
+set -l subvolume '__btrfs_options_groups subvolume'
+set -l filesystem '__btrfs_options_groups filesystem'
+set -l balance '__btrfs_options_groups balance'
+set -l device '__btrfs_options_groups device'
+set -l scrub '__btrfs_options_groups scrub'
+set -l rescue '__btrfs_options_groups rescue'
+set -l inspect_internal '__btrfs_options_groups inspect-internal'
+set -l property '__btrfs_options_groups property'
+set -l quota '__btrfs_options_groups quota'
+set -l qgroup '__btrfs_options_groups qgroup'
+set -l replace '__btrfs_options_groups replace'
+
+# Global command
+complete -f -c btrfs -l help -d 'Display help information'
+
 # Primary command
 complete -f -c btrfs -n '__fish_is_first_arg' -a check -d 'Check structural integrity of a filesystem (unmounted).'
 complete -f -c btrfs -n '__fish_is_first_arg' -a restore -d 'Try to restore files from a damaged filesystem (unmounted)'
@@ -39,96 +77,354 @@ complete -f -c btrfs -n '__fish_is_first_arg' -a quota -d 'manage filesystem quo
 complete -f -c btrfs -n '__fish_is_first_arg' -a qgroup -d 'manage quota groups'
 complete -f -c btrfs -n '__fish_is_first_arg' -a replace -d 'replace a device in the filesystem'
 
-set -l subvolume '__btrfs_options_groups subvolume'
-set -l filesystem '__btrfs_options_groups filesystem'
-set -l balance '__btrfs_options_groups balance'
-set -l device '__btrfs_options_groups device'
-set -l scrub '__btrfs_options_groups scrub'
-set -l rescue '__btrfs_options_groups rescue'
-set -l inspect_internal "__btrfs_options_groups inspect-internal"
-set -l property '__btrfs_options_groups property'
-set -l quota '__btrfs_options_groups quota'
-set -l qgroup '__btrfs_options_groups qgroup'
-set -l replace '__btrfs_options_groups replace'
+# btrfs check
+complete -f -c btrfs -n $check -s s -l super -d 'Use this SUPERBLOCK copy'
+complete -f -c btrfs -n $check -s b -l backup -d 'Use the first valid BACKUP root copy'
+complete -f -c btrfs -n $check -s r -l tree-root -d 'Use the given bytenr for the TREE root'
+complete -f -c btrfs -n $check -l chunk-root -d 'Use the given bytenr for the CHUNK-TREE root'
+complete -f -c btrfs -n $check -l readonly -d 'Run in read-only mode'
+complete -f -c btrfs -n $check -l repair -d 'Try to repair the filesystem'
+complete -f -c btrfs -n $check -l force -d 'Skip mount checks, repair is not possible'
+complete -f -c btrfs -n $check -l mode -d 'Allows choice of memory/IO trade-offs' -ra '{original,lowmem}'
+complete -f -c btrfs -n $check -l init-csum-tree -d 'Create a new CRC tree (repair only)'
+complete -f -c btrfs -n $check -l init-extent-tree -d 'Create a new extent tree (repair only)'
+complete -f -c btrfs -n $check -l clear-space-cache -d 'clear space cache (repair only)' -ra '{v1,v2}'
+complete -f -c btrfs -n $check -l check-data-csum -d 'Verify checksums of data blocks'
+complete -f -c btrfs -n $check -s Q -l qgroup-report -d 'Print a report on qgroup consistency'
+complete -f -c btrfs -n $check -s E -l subvol-extents -d 'Print subvolume extents and sharing state'
+complete -f -c btrfs -n $check -s p -l progress -d 'Indicate progress'
+
+# btrfs restore
+complete -f -c btrfs -n $restore -s s -l snapshots -d 'Get snapshots'
+complete -f -c btrfs -n $restore -s x -l xattr -d 'Restore extended attributes'
+complete -f -c btrfs -n $restore -s m -l metadata -d 'Restore owner, mode and times'
+complete -f -c btrfs -n $restore -s S -l symlink -d 'Restore symbolic links'
+complete -f -c btrfs -n $restore -s v -l verbose -d 'Verbose'
+complete -f -c btrfs -n $restore -s i -l ignore-errors -d 'Ignore errors'
+complete -f -c btrfs -n $restore -s o -l overwrite -d 'Overwrite'
+complete -f -c btrfs -n $restore -s t -d 'Tree location'
+complete -f -c btrfs -n $restore -s f -d 'Filesystem location'
+complete -f -c btrfs -n $restore -s u -l super -d 'Super mirror'
+complete -f -c btrfs -n $restore -s r -l root -d 'Root objectid'
+complete -f -c btrfs -n $restore -s d -d 'Find dir'
+complete -f -c btrfs -n $restore -s l -l list-roots -d 'List tree roots'
+complete -f -c btrfs -n $restore -s D -l dry-run -d 'Only list files that would be recovered'
+complete -f -c btrfs -n $restore -l path-regex -d 'Restore only filenames matching regex'
+complete -f -c btrfs -n $restore -s c -d 'Ignore case (--path-regex only)'
+
+# btrfs send
+complete -f -c btrfs -n $send -s e -d ''
+complete -f -c btrfs -n $send -s p -d 'Send an incremental stream from <parent> to <subvol>'
+complete -f -c btrfs -n $send -s c -d 'Use this snapshot as a clone source for an incremental send'
+complete -f -c btrfs -n $send -s f -d 'Output is normally written to stdout'
+complete -f -c btrfs -n $send -l no-data -d 'send in NO_FILE_DATA mode'
+complete -f -c btrfs -n $send -s v -l verbose -d 'Enable verbose output to stderr'
+complete -f -c btrfs -n $send -s q -l quiet -d 'Suppress all messages, except errors'
+
+# btrfs receive
+complete -f -c btrfs -n $receive -s v -d 'Increase verbosity about performed actions'
+complete -f -c btrfs -n $receive -s q -l quiet -d 'Suppress all messages, except errors'
+complete -f -c btrfs -n $receive -s f -d 'Read the stream from FILE instead of stdin'
+complete -f -c btrfs -n $receive -s e -d 'Terminate after receiving an <end cmd> marker in the stream'
+complete -f -c btrfs -n $receive -s C -l chroot -d 'Confine the process to <mount> using chroot'
+complete -f -c btrfs -n $receive -s E -l max-errors -d 'Terminate when NUMBER errors occur'
+complete -f -c btrfs -n $receive -s m -d 'The root mount point of the destination filesystem'
+complete -f -c btrfs -n $receive -l dump -d 'Dump stream metadata'
+
+# btrfs help
+complete -f -c btrfs -n $help -l full -d 'Display detailed help on every command'
+complete -f -c btrfs -n $help -l box -d 'Show list of built-in tools (busybox style)'
 
 # btrfs subvolume
 complete -f -c btrfs -n $subvolume -a create -d 'Create a subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume create' -s i -d 'Add subvolume to a qgroup (can be given multiple times)'
+
 complete -f -c btrfs -n $subvolume -a delete -d 'Delete subvolume(s)'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s c -l commit-after -d 'Wait for transaction commit at the end of the operation'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s C -l commit-each -d 'Wait for transaction commit after deleting each subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s v -l verbose -d 'Verbose output of operations'
+
 complete -f -c btrfs -n $subvolume -a list -d 'List subvolumes and snapshots in the filesystem.'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s o -d 'Print only subvolumes below specified path'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s a -d 'Print all the subvolumes and absolute and relative path'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s p -d 'Print parent ID'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s c -d 'Print the ogeneration of the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s g -d 'Print the generation of the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s u -d 'Print the uuid of subvolumes (and snapshots)'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s q -d 'Print the parent uuid of the snapshots'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s R -d 'Print the uuid of the received snapshots'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s s -d 'List only snapshots'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s r -d 'List readonly subvolumes (including snapshots)'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s d -d 'List deleted subvolumes that are not yet cleaned'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s t -d 'Print the result as a table'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s G -d 'Filter the subvolumes by generation'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s C -d 'Filter the subvolumes by ogeneration'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -l sort -d 'List the subvolume in order' -a '{gen,ogen,rootid,path}'
+
 complete -f -c btrfs -n $subvolume -a snapshot -d 'Create a snapshot of the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume snapshot' -s r -d 'Create a readonly snapshot'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume snapshot' -s i -d 'Add snapshot to a qgroup (can be given multiple times)'
+
 complete -f -c btrfs -n $subvolume -a get-default -d 'Get the default subvolume of a filesystem'
 complete -f -c btrfs -n $subvolume -a set-default -d 'Set the default subvolume of the filesystem mounted as default.'
 complete -f -c btrfs -n $subvolume -a find-new -d 'List the recently modified files in a filesystem'
-complete -f -c btrfs -n $subvolume -a show -d 'Show more information about the subvolume (UUIDs, generations, times, snapshots)'
+
+complete -f -c btrfs -n $subvolume -a show -d 'Show more information about the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s r -l rootid -d 'Show rootid of the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s u -l uuid -d 'Show uuid of the subvolume'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+
 complete -f -c btrfs -n $subvolume -a sync -d 'Wait until given subvolume(s) are completely removed from the filesystem.'
+complete -f -c btrfs -n '__btrfs_options_groups subvolume sync' -s s -d 'Sleep NUMBER seconds between checks'
 
 # btrfs filesystem
 complete -f -c btrfs -n $filesystem -a df -d 'Show space usage information for a mount point'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+
 complete -f -c btrfs -n $filesystem -a du -d 'Summarize disk usage of each file.'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -s s -l summarize -d 'Display only a total for each argument'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+
 complete -f -c btrfs -n $filesystem -a show -d 'Show the structure of a filesystem'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -s d -l all-devices -d 'Show only disks under /dev containing btrfs filesystem'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -s m -l mounted -d 'Show only mounted btrfs'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+
 complete -f -c btrfs -n $filesystem -a sync -d 'Force a sync on a filesystem'
+
 complete -f -c btrfs -n $filesystem -a defragment -d 'Defragment a file or a directory'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s v -d 'Be verbose'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s r -d 'Defragment files recursively'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s c -d 'Compress the file while defragmenting' -ra '{zlib,lzo,zstd}'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s f -d 'Flush data to disk immediately after defragmenting'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s s -d 'Defragment only from NUMBER byte onward'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s l -d 'Defragment only up to LEN bytes'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s t -d 'Target extent SIZE hint'
+
 complete -f -c btrfs -n $filesystem -a resize -d 'Resize a filesystem'
 complete -f -c btrfs -n $filesystem -a label -d 'Get or change the label of a filesystem'
+
 complete -f -c btrfs -n $filesystem -a usage -d 'Show detailed information about internal filesystem usage.'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s T -d 'Show data in tabular format'
 
 # btrfs balance
 complete -f -c btrfs -n $balance -a start -d 'Balance chunks across the devices'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -s d -d 'Act on data chunks with FILTERS'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -s m -d 'Act on metadata chunks with FILTERS'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -s s -d 'Act on system chunks with FILTERS (only under -f)'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -s v -d 'Be verbose'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -s f -d 'Force a reduction of metadata integrity'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -l full-balance -d 'Do not print warning and do not delay start'
+complete -f -c btrfs -n '__btrfs_options_groups balance start' -l background -l bg -d 'Run the balance as a background process'
+
 complete -f -c btrfs -n $balance -a pause -d 'Pause running balance'
 complete -f -c btrfs -n $balance -a cancel -d 'Cancel running or paused balance'
 complete -f -c btrfs -n $balance -a resume -d 'Resume interrupted balance'
+
 complete -f -c btrfs -n $balance -a status -d 'Show status of running or paused balance'
+complete -f -c btrfs -n '__btrfs_options_groups balance status' -s v -d 'Be verbose'
 
 # btrfs device
 complete -f -c btrfs -n $device -a add -d 'Add one or more devices to a mounted filesystem.'
+complete -f -c btrfs -n '__btrfs_options_groups device add' -s K -l nodiscard -d 'Do not perform TRIM on DEVICES'
+complete -f -c btrfs -n '__btrfs_options_groups device add' -s f -l force -d 'Force overwrite existing filesystem on the disk'
+
 complete -f -c btrfs -n $device -a delete -d 'Remove a device from a filesystem'
 complete -f -c btrfs -n $device -a remove -d 'Remove a device from a filesystem'
+
 complete -f -c btrfs -n $device -a scan -d 'Scan or forget (unregister) devices of btrfs filesystems'
+complete -f -c btrfs -n '__btrfs_options_groups device scan' -s d -l all-devices -d 'Enumerate and register all devices'
+complete -f -c btrfs -n '__btrfs_options_groups device scan' -s u -l forget -d 'Unregister a given device or all stale devices'
+
 complete -f -c btrfs -n $device -a ready -d 'Check and wait until a group of devices of a filesystem is ready for mount'
+
 complete -f -c btrfs -n $device -a stats -d 'Show device IO error statistics'
+complete -f -c btrfs -n '__btrfs_options_groups device stats' -s c -l check -d 'Return non-zero if any stat counter is not zero'
+complete -f -c btrfs -n '__btrfs_options_groups device stats' -s z -l reset -d 'Show current stats and reset values to zero'
+
 complete -f -c btrfs -n $device -a usage -d 'Show detailed information about internal allocations in devices.'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups device usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
 
 # btrfs scrub
 complete -f -c btrfs -n $scrub -a start -d 'Start a new scrub. If a scrub is already running, the new one fails.'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s B -d 'Do not background'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s d -d 'Stats per device (-B only)'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s q -d 'Be quiet'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s r -d 'Read only mode'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s R -d 'Raw print mode, print full data instead of summary'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s c -d 'Set ioprio class (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s f -d 'Force starting new scrub'
+
 complete -f -c btrfs -n $scrub -a cancel -d 'Cancel a running scrub'
+
 complete -f -c btrfs -n $scrub -a resume -d 'Resume previously canceled or interrupted scrub'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s B -d 'Do not background'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s d -d 'Stats per device (-B only)'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s q -d 'Be quiet'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s r -d 'Read only mode'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s R -d 'Raw print mode, print full data instead of summary'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s c -d 'Set ioprio class (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
+
 complete -f -c btrfs -n $scrub -a status -d 'Show status of running or finished scrub'
+complete -f -c btrfs -n '__btrfs_options_groups scrub status' -s d -d 'Stats per DEVICE'
+complete -f -c btrfs -n '__btrfs_options_groups scrub status' -s R -d 'Print raw stats'
 
 # btrfs rescue
 complete -f -c btrfs -n $rescue -a chunk-recover -d 'Recover the chunk tree by scanning the devices one by one.'
+complete -f -c btrfs -n '__btrfs_options_groups rescue chunk-recover' -s y -d 'Assume an answer of YES to all questions'
+complete -f -c btrfs -n '__btrfs_options_groups rescue chunk-recover' -s v -d 'Verbose mode'
+
 complete -f -c btrfs -n $rescue -a super-recover -d 'Recover bad superblocks from good copies'
+complete -f -c btrfs -n '__btrfs_options_groups rescue super-recover' -s y -d 'Assume an answer of YES to all questions'
+complete -f -c btrfs -n '__btrfs_options_groups rescue super-recover' -s v -d 'Verbose mode'
+
 complete -f -c btrfs -n $rescue -a zero-log -d 'Clear the tree log. Usable if it\'s corrupted and prevents mount.'
 complete -f -c btrfs -n $rescue -a fix-device-size -d 'Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size'
 
 # btrfs inspect-internal
 complete -f -c btrfs -n $inspect_internal -a inode-resolve -d 'Get file system paths for the given inode'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal inode-resolve' -s v -d 'Verbose mode'
+
 complete -f -c btrfs -n $inspect_internal -a logical-resolve -d 'Get file system paths for the given logical address'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s P -d 'Skip the path resolving and print the inodes instead'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s v -d 'Verbose mode'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s s -d 'Set inode container\'s SIZE'
+
 complete -f -c btrfs -n $inspect_internal -a subvolid-resolve -d 'Get file system paths for the given subvolume ID.'
 complete -f -c btrfs -n $inspect_internal -a rootid -d 'Get tree ID of the containing subvolume of path.'
+
 complete -f -c btrfs -n $inspect_internal -a min-dev-size -d 'Get the minimum size the device can be shrunk to. The device id 1 is used by default.'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal min-dev-size' -l id -d 'Specify the DEVICE-ID to query'
+
 complete -f -c btrfs -n $inspect_internal -a dump-tree -d 'Dump tree structures from a given device'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s e -l extents -d 'Print only extent info: extent and device trees'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s d -l device -d 'Print only device info: tree root, chunk and device trees'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s r -l roots -d 'Print only short root node info'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s R -l backups -d 'Print short root node info and backup root info'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s u -l uuid -d 'Print only the uuid tree'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s b -l block -d 'Print info from the specified BLOCK only'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s t -l tree -d 'Print only tree with the given ID'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l follow -d 'Use with -b, to show all children tree blocks of <block_num>'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l noscan -d 'Do not scan the devices from the filesystem'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l bfs -d 'Breadth-first traversal of the trees, print nodes, then leaves'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l dfs -d 'Depth-first traversal of the trees'
+
 complete -f -c btrfs -n $inspect_internal -a dump-super -d 'Dump superblock from a device in a textual form'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s f -l full -d 'Print full superblock information, backup roots etc.'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s a -l all -d 'Print information about all superblocks'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s s -l super -d 'Specify which SUPER-BLOCK copy to print out' -ra '{0,1,2}'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s F -l force -d 'Attempt to dump superblocks with bad magic'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -l bytenr -d 'Specify alternate superblock OFFSET'
+
 complete -f -c btrfs -n $inspect_internal -a tree-stats -d 'Print various stats for trees'
+complete -f -c btrfs -n '__btrfs_options_groups inspect-internal tree-stats' -s b -d 'Show raw numbers in bytes'
 
 # btrfs property
 complete -f -c btrfs -n $property -a get -d 'Get a property value of a btrfs object'
+complete -f -c btrfs -n '__btrfs_options_groups property get' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
+
 complete -f -c btrfs -n $property -a set -d 'Set a property on a btrfs object'
+complete -f -c btrfs -n '__btrfs_options_groups property set' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
+
 complete -f -c btrfs -n $property -a list -d 'Lists available properties with their descriptions for the given object'
+complete -f -c btrfs -n '__btrfs_options_groups property list' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
+
 
 # btrfs quota
 complete -f -c btrfs -n $quota -a enable -d 'Enable subvolume quota support for a filesystem.'
 complete -f -c btrfs -n $quota -a disable -d 'Disable subvolume quota support for a filesystem.'
+
 complete -f -c btrfs -n $quota -a rescan -d 'Trash all qgroup numbers and scan the metadata again with the current config.'
+complete -f -c btrfs -n '__btrfs_options_groups quota rescan' -s s -d 'Show status of a running rescan operation'
+complete -f -c btrfs -n '__btrfs_options_groups quota rescan' -s w -d 'Wait for rescan operation to finish'
 
 # btrfs qgroup
 complete -f -c btrfs -n $qgroup -a assign -d 'Assign SRC as the child qgroup of DST'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup assign' -l rescan -d 'Schedule qutoa rescan if needed'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup assign' -l no-rescan -d 'Don\'t schedule quota rescan'
+
 complete -f -c btrfs -n $qgroup -a remove -d 'Remove a child qgroup SRC from DST.'
 complete -f -c btrfs -n $qgroup -a create -d 'Create a subvolume quota group.'
 complete -f -c btrfs -n $qgroup -a destroy -d 'Destroy a quota group.'
+
 complete -f -c btrfs -n $qgroup -a show -d 'Show subvolume quota groups.'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s p -d 'Print parent qgroup id'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s c -d 'Print child qgroup id'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s r -d 'Print limit of referenced size of qgroup'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s e -d 'Print limit of exclusive size of qgroup'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s F -d 'List all qgroups including ancestral qgroups'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s f -d 'List all qgroups excluding ancestral qgroups'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l sort -d 'List qgroups sorted by specified items' -a '{qgroupid,rfer,excl,max_rfer,max_excl}'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l sync -d 'Force sync of the filesystem before getting info'
+
 complete -f -c btrfs -n $qgroup -a limit -d 'Set the limits a subvolume quota group.'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup limit' -s c -d 'Limit amount of data after compression'
+complete -f -c btrfs -n '__btrfs_options_groups qgroup limit' -s e -d 'Limit space exclusively assigned to this qgroup'
 
 # btrfs replace
 complete -f -c btrfs -n $replace -a start -d 'Replace device of a btrfs filesystem.'
+complete -f -c btrfs -n '__btrfs_options_groups replace start' -s r -d 'Only read from <srcdev> if no other zero-defect mirror exists'
+complete -f -c btrfs -n '__btrfs_options_groups replace start' -s f -d 'Force using and overwriting <targetdev>'
+complete -f -c btrfs -n '__btrfs_options_groups replace start' -s B -d 'Do not background'
+
 complete -f -c btrfs -n $replace -a status -d 'Print status and progress information of a running device replace'
+complete -f -c btrfs -n '__btrfs_options_groups replace status' -s 1 -d 'Only print once until the replace operation finishes'
+
 complete -f -c btrfs -n $replace -a cancel -d 'Cancel a running device replace operation.'

From 446735af0770056f95cd711d09ad7658a427e1ee Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sun, 27 Oct 2019 21:52:55 +0800
Subject: [PATCH 1139/1732] completions/btrfs.fish: Format options list

Format the list of completion per command
Easier to read and edit at next time if need
---
 share/completions/btrfs.fish | 460 +++++++++++++++++------------------
 1 file changed, 229 insertions(+), 231 deletions(-)

diff --git a/share/completions/btrfs.fish b/share/completions/btrfs.fish
index d924f204d..9db3c5712 100644
--- a/share/completions/btrfs.fish
+++ b/share/completions/btrfs.fish
@@ -6,7 +6,7 @@
 # - Simplified descriptions
 
 # Filter the completions per primary command
-function __btrfs_options
+function __btrfs_commands
     if not set -q argv[1]
         return 1
     end
@@ -17,8 +17,8 @@ function __btrfs_options
     return 1
 end
 
-# Filter the completions per command groups
-function __btrfs_options_groups
+# Filter the completions per command group
+function __btrfs_command_groups
     if not set -q argv[1]
         return 1
     end
@@ -35,23 +35,23 @@ function __btrfs_options_groups
     return 1
 end
 
-set -l check '__btrfs_options check'
-set -l restore '__btrfs_options restore'
-set -l send '__btrfs_options send'
-set -l receive '__btrfs_options receive'
-set -l help '__btrfs_options help'
+set -l check '__btrfs_commands check'
+set -l restore '__btrfs_commands restore'
+set -l send '__btrfs_commands send'
+set -l receive '__btrfs_commands receive'
+set -l help '__btrfs_commands help'
 
-set -l subvolume '__btrfs_options_groups subvolume'
-set -l filesystem '__btrfs_options_groups filesystem'
-set -l balance '__btrfs_options_groups balance'
-set -l device '__btrfs_options_groups device'
-set -l scrub '__btrfs_options_groups scrub'
-set -l rescue '__btrfs_options_groups rescue'
-set -l inspect_internal '__btrfs_options_groups inspect-internal'
-set -l property '__btrfs_options_groups property'
-set -l quota '__btrfs_options_groups quota'
-set -l qgroup '__btrfs_options_groups qgroup'
-set -l replace '__btrfs_options_groups replace'
+set -l subvolume '__btrfs_command_groups subvolume'
+set -l filesystem '__btrfs_command_groups filesystem'
+set -l balance '__btrfs_command_groups balance'
+set -l device '__btrfs_command_groups device'
+set -l scrub '__btrfs_command_groups scrub'
+set -l rescue '__btrfs_command_groups rescue'
+set -l inspect_internal '__btrfs_command_groups inspect-internal'
+set -l property '__btrfs_command_groups property'
+set -l quota '__btrfs_command_groups quota'
+set -l qgroup '__btrfs_command_groups qgroup'
+set -l replace '__btrfs_command_groups replace'
 
 # Global command
 complete -f -c btrfs -l help -d 'Display help information'
@@ -137,294 +137,292 @@ complete -f -c btrfs -n $help -l box -d 'Show list of built-in tools (busybox st
 
 # btrfs subvolume
 complete -f -c btrfs -n $subvolume -a create -d 'Create a subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume create' -s i -d 'Add subvolume to a qgroup (can be given multiple times)'
-
 complete -f -c btrfs -n $subvolume -a delete -d 'Delete subvolume(s)'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s c -l commit-after -d 'Wait for transaction commit at the end of the operation'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s C -l commit-each -d 'Wait for transaction commit after deleting each subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume delete' -s v -l verbose -d 'Verbose output of operations'
-
 complete -f -c btrfs -n $subvolume -a list -d 'List subvolumes and snapshots in the filesystem.'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s o -d 'Print only subvolumes below specified path'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s a -d 'Print all the subvolumes and absolute and relative path'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s p -d 'Print parent ID'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s c -d 'Print the ogeneration of the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s g -d 'Print the generation of the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s u -d 'Print the uuid of subvolumes (and snapshots)'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s q -d 'Print the parent uuid of the snapshots'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s R -d 'Print the uuid of the received snapshots'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s s -d 'List only snapshots'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s r -d 'List readonly subvolumes (including snapshots)'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s d -d 'List deleted subvolumes that are not yet cleaned'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s t -d 'Print the result as a table'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s G -d 'Filter the subvolumes by generation'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -s C -d 'Filter the subvolumes by ogeneration'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume list' -l sort -d 'List the subvolume in order' -a '{gen,ogen,rootid,path}'
-
 complete -f -c btrfs -n $subvolume -a snapshot -d 'Create a snapshot of the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume snapshot' -s r -d 'Create a readonly snapshot'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume snapshot' -s i -d 'Add snapshot to a qgroup (can be given multiple times)'
-
 complete -f -c btrfs -n $subvolume -a get-default -d 'Get the default subvolume of a filesystem'
 complete -f -c btrfs -n $subvolume -a set-default -d 'Set the default subvolume of the filesystem mounted as default.'
 complete -f -c btrfs -n $subvolume -a find-new -d 'List the recently modified files in a filesystem'
-
 complete -f -c btrfs -n $subvolume -a show -d 'Show more information about the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s r -l rootid -d 'Show rootid of the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s u -l uuid -d 'Show uuid of the subvolume'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s b -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s H -d 'Show human friendly numbers, base 1000'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume show' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
-
 complete -f -c btrfs -n $subvolume -a sync -d 'Wait until given subvolume(s) are completely removed from the filesystem.'
-complete -f -c btrfs -n '__btrfs_options_groups subvolume sync' -s s -d 'Sleep NUMBER seconds between checks'
+# btrfs subvolume create
+complete -f -c btrfs -n '__btrfs_command_groups subvolume create' -s i -d 'Add subvolume to a qgroup (can be given multiple times)'
+# btrfs subvolume delete
+complete -f -c btrfs -n '__btrfs_command_groups subvolume delete' -s c -l commit-after -d 'Wait for transaction commit at the end of the operation'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume delete' -s C -l commit-each -d 'Wait for transaction commit after deleting each subvolume'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume delete' -s v -l verbose -d 'Verbose output of operations'
+# btrfs subvolume list
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s o -d 'Print only subvolumes below specified path'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s a -d 'Print all the subvolumes and absolute and relative path'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s p -d 'Print parent ID'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s c -d 'Print the ogeneration of the subvolume'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s g -d 'Print the generation of the subvolume'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s u -d 'Print the uuid of subvolumes (and snapshots)'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s q -d 'Print the parent uuid of the snapshots'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s R -d 'Print the uuid of the received snapshots'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s s -d 'List only snapshots'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s r -d 'List readonly subvolumes (including snapshots)'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s d -d 'List deleted subvolumes that are not yet cleaned'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s t -d 'Print the result as a table'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s G -d 'Filter the subvolumes by generation'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -s C -d 'Filter the subvolumes by ogeneration'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume list' -l sort -d 'List the subvolume in order' -a '{gen,ogen,rootid,path}'
+# btrfs subvolume snapshot
+complete -f -c btrfs -n '__btrfs_command_groups subvolume snapshot' -s r -d 'Create a readonly snapshot'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume snapshot' -s i -d 'Add snapshot to a qgroup (can be given multiple times)'
+# btrfs subvolume show
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s r -l rootid -d 'Show rootid of the subvolume'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s u -l uuid -d 'Show uuid of the subvolume'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups subvolume show' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+# btrfs subvolume sync
+complete -f -c btrfs -n '__btrfs_command_groups subvolume sync' -s s -d 'Sleep NUMBER seconds between checks'
 
 # btrfs filesystem
 complete -f -c btrfs -n $filesystem -a df -d 'Show space usage information for a mount point'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s b -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s H -d 'Show human friendly numbers, base 1000'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem df' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
-
 complete -f -c btrfs -n $filesystem -a du -d 'Summarize disk usage of each file.'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -s s -l summarize -d 'Display only a total for each argument'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem du' -l tbytes -d 'Show sizes in TiB, or TB with --si'
-
 complete -f -c btrfs -n $filesystem -a show -d 'Show the structure of a filesystem'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -s d -l all-devices -d 'Show only disks under /dev containing btrfs filesystem'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -s m -l mounted -d 'Show only mounted btrfs'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
-
 complete -f -c btrfs -n $filesystem -a sync -d 'Force a sync on a filesystem'
-
 complete -f -c btrfs -n $filesystem -a defragment -d 'Defragment a file or a directory'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s v -d 'Be verbose'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s r -d 'Defragment files recursively'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s c -d 'Compress the file while defragmenting' -ra '{zlib,lzo,zstd}'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s f -d 'Flush data to disk immediately after defragmenting'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s s -d 'Defragment only from NUMBER byte onward'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s l -d 'Defragment only up to LEN bytes'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem defragment' -s t -d 'Target extent SIZE hint'
-
 complete -f -c btrfs -n $filesystem -a resize -d 'Resize a filesystem'
 complete -f -c btrfs -n $filesystem -a label -d 'Get or change the label of a filesystem'
-
 complete -f -c btrfs -n $filesystem -a usage -d 'Show detailed information about internal filesystem usage.'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s b -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s H -d 'Show human friendly numbers, base 1000'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups filesystem usage' -s T -d 'Show data in tabular format'
+# btrfs filesystem df
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem df' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+# btrfs filesystem du
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -s s -l summarize -d 'Display only a total for each argument'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem du' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+# btrfs filesystem show
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -s d -l all-devices -d 'Show only disks under /dev containing btrfs filesystem'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -s m -l mounted -d 'Show only mounted btrfs'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+# btrfs filesystem defragment
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s v -d 'Be verbose'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s r -d 'Defragment files recursively'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s c -d 'Compress the file while defragmenting' -ra '{zlib,lzo,zstd}'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s f -d 'Flush data to disk immediately after defragmenting'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s s -d 'Defragment only from NUMBER byte onward'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s l -d 'Defragment only up to LEN bytes'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem defragment' -s t -d 'Target extent SIZE hint'
+# btrfs filesystem usage
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups filesystem usage' -s T -d 'Show data in tabular format'
 
 # btrfs balance
 complete -f -c btrfs -n $balance -a start -d 'Balance chunks across the devices'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -s d -d 'Act on data chunks with FILTERS'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -s m -d 'Act on metadata chunks with FILTERS'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -s s -d 'Act on system chunks with FILTERS (only under -f)'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -s v -d 'Be verbose'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -s f -d 'Force a reduction of metadata integrity'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -l full-balance -d 'Do not print warning and do not delay start'
-complete -f -c btrfs -n '__btrfs_options_groups balance start' -l background -l bg -d 'Run the balance as a background process'
-
 complete -f -c btrfs -n $balance -a pause -d 'Pause running balance'
 complete -f -c btrfs -n $balance -a cancel -d 'Cancel running or paused balance'
 complete -f -c btrfs -n $balance -a resume -d 'Resume interrupted balance'
-
 complete -f -c btrfs -n $balance -a status -d 'Show status of running or paused balance'
-complete -f -c btrfs -n '__btrfs_options_groups balance status' -s v -d 'Be verbose'
+# btrfs balance start
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -s d -d 'Act on data chunks with FILTERS'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -s m -d 'Act on metadata chunks with FILTERS'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -s s -d 'Act on system chunks with FILTERS (only under -f)'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -s v -d 'Be verbose'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -s f -d 'Force a reduction of metadata integrity'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -l full-balance -d 'Do not print warning and do not delay start'
+complete -f -c btrfs -n '__btrfs_command_groups balance start' -l background -l bg -d 'Run the balance as a background process'
+# btrfs balance status
+complete -f -c btrfs -n '__btrfs_command_groups balance status' -s v -d 'Be verbose'
 
 # btrfs device
 complete -f -c btrfs -n $device -a add -d 'Add one or more devices to a mounted filesystem.'
-complete -f -c btrfs -n '__btrfs_options_groups device add' -s K -l nodiscard -d 'Do not perform TRIM on DEVICES'
-complete -f -c btrfs -n '__btrfs_options_groups device add' -s f -l force -d 'Force overwrite existing filesystem on the disk'
-
 complete -f -c btrfs -n $device -a delete -d 'Remove a device from a filesystem'
 complete -f -c btrfs -n $device -a remove -d 'Remove a device from a filesystem'
-
 complete -f -c btrfs -n $device -a scan -d 'Scan or forget (unregister) devices of btrfs filesystems'
-complete -f -c btrfs -n '__btrfs_options_groups device scan' -s d -l all-devices -d 'Enumerate and register all devices'
-complete -f -c btrfs -n '__btrfs_options_groups device scan' -s u -l forget -d 'Unregister a given device or all stale devices'
-
 complete -f -c btrfs -n $device -a ready -d 'Check and wait until a group of devices of a filesystem is ready for mount'
-
 complete -f -c btrfs -n $device -a stats -d 'Show device IO error statistics'
-complete -f -c btrfs -n '__btrfs_options_groups device stats' -s c -l check -d 'Return non-zero if any stat counter is not zero'
-complete -f -c btrfs -n '__btrfs_options_groups device stats' -s z -l reset -d 'Show current stats and reset values to zero'
-
 complete -f -c btrfs -n $device -a usage -d 'Show detailed information about internal allocations in devices.'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s b -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s H -d 'Show human friendly numbers, base 1000'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups device usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
+# btrfs device add
+complete -f -c btrfs -n '__btrfs_command_groups device add' -s K -l nodiscard -d 'Do not perform TRIM on DEVICES'
+complete -f -c btrfs -n '__btrfs_command_groups device add' -s f -l force -d 'Force overwrite existing filesystem on the disk'
+# btrfs device scan
+complete -f -c btrfs -n '__btrfs_command_groups device scan' -s d -l all-devices -d 'Enumerate and register all devices'
+complete -f -c btrfs -n '__btrfs_command_groups device scan' -s u -l forget -d 'Unregister a given device or all stale devices'
+# btrfs device stats
+complete -f -c btrfs -n '__btrfs_command_groups device stats' -s c -l check -d 'Return non-zero if any stat counter is not zero'
+complete -f -c btrfs -n '__btrfs_command_groups device stats' -s z -l reset -d 'Show current stats and reset values to zero'
+# btrfs device usage
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s b -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s h -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s H -d 'Show human friendly numbers, base 1000'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s k -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s m -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s g -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups device usage' -s t -l tbytes -d 'Show sizes in TiB, or TB with --si'
 
 # btrfs scrub
 complete -f -c btrfs -n $scrub -a start -d 'Start a new scrub. If a scrub is already running, the new one fails.'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s B -d 'Do not background'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s d -d 'Stats per device (-B only)'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s q -d 'Be quiet'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s r -d 'Read only mode'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s R -d 'Raw print mode, print full data instead of summary'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s c -d 'Set ioprio class (see ionice(1) manpage)'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
-complete -f -c btrfs -n '__btrfs_options_groups scrub start' -s f -d 'Force starting new scrub'
-
 complete -f -c btrfs -n $scrub -a cancel -d 'Cancel a running scrub'
-
 complete -f -c btrfs -n $scrub -a resume -d 'Resume previously canceled or interrupted scrub'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s B -d 'Do not background'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s d -d 'Stats per device (-B only)'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s q -d 'Be quiet'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s r -d 'Read only mode'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s R -d 'Raw print mode, print full data instead of summary'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s c -d 'Set ioprio class (see ionice(1) manpage)'
-complete -f -c btrfs -n '__btrfs_options_groups scrub resume' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
-
 complete -f -c btrfs -n $scrub -a status -d 'Show status of running or finished scrub'
-complete -f -c btrfs -n '__btrfs_options_groups scrub status' -s d -d 'Stats per DEVICE'
-complete -f -c btrfs -n '__btrfs_options_groups scrub status' -s R -d 'Print raw stats'
+# btrfs scrub start
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s B -d 'Do not background'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s d -d 'Stats per device (-B only)'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s q -d 'Be quiet'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s r -d 'Read only mode'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s R -d 'Raw print mode, print full data instead of summary'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s c -d 'Set ioprio class (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_command_groups scrub start' -s f -d 'Force starting new scrub'
+# btrfs scrub resume
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s B -d 'Do not background'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s d -d 'Stats per device (-B only)'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s q -d 'Be quiet'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s r -d 'Read only mode'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s R -d 'Raw print mode, print full data instead of summary'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s c -d 'Set ioprio class (see ionice(1) manpage)'
+complete -f -c btrfs -n '__btrfs_command_groups scrub resume' -s n -d 'Set ioprio classdata (see ionice(1) manpage)'
+# btrfs scrub status
+complete -f -c btrfs -n '__btrfs_command_groups scrub status' -s d -d 'Stats per DEVICE'
+complete -f -c btrfs -n '__btrfs_command_groups scrub status' -s R -d 'Print raw stats'
 
 # btrfs rescue
 complete -f -c btrfs -n $rescue -a chunk-recover -d 'Recover the chunk tree by scanning the devices one by one.'
-complete -f -c btrfs -n '__btrfs_options_groups rescue chunk-recover' -s y -d 'Assume an answer of YES to all questions'
-complete -f -c btrfs -n '__btrfs_options_groups rescue chunk-recover' -s v -d 'Verbose mode'
-
 complete -f -c btrfs -n $rescue -a super-recover -d 'Recover bad superblocks from good copies'
-complete -f -c btrfs -n '__btrfs_options_groups rescue super-recover' -s y -d 'Assume an answer of YES to all questions'
-complete -f -c btrfs -n '__btrfs_options_groups rescue super-recover' -s v -d 'Verbose mode'
-
 complete -f -c btrfs -n $rescue -a zero-log -d 'Clear the tree log. Usable if it\'s corrupted and prevents mount.'
 complete -f -c btrfs -n $rescue -a fix-device-size -d 'Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size'
+# btrfs rescue chunk-recover
+complete -f -c btrfs -n '__btrfs_command_groups rescue chunk-recover' -s y -d 'Assume an answer of YES to all questions'
+complete -f -c btrfs -n '__btrfs_command_groups rescue chunk-recover' -s v -d 'Verbose mode'
+# btrfs rescue super-recover
+complete -f -c btrfs -n '__btrfs_command_groups rescue super-recover' -s y -d 'Assume an answer of YES to all questions'
+complete -f -c btrfs -n '__btrfs_command_groups rescue super-recover' -s v -d 'Verbose mode'
 
 # btrfs inspect-internal
 complete -f -c btrfs -n $inspect_internal -a inode-resolve -d 'Get file system paths for the given inode'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal inode-resolve' -s v -d 'Verbose mode'
-
 complete -f -c btrfs -n $inspect_internal -a logical-resolve -d 'Get file system paths for the given logical address'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s P -d 'Skip the path resolving and print the inodes instead'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s v -d 'Verbose mode'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal logical-resolve' -s s -d 'Set inode container\'s SIZE'
-
 complete -f -c btrfs -n $inspect_internal -a subvolid-resolve -d 'Get file system paths for the given subvolume ID.'
 complete -f -c btrfs -n $inspect_internal -a rootid -d 'Get tree ID of the containing subvolume of path.'
-
 complete -f -c btrfs -n $inspect_internal -a min-dev-size -d 'Get the minimum size the device can be shrunk to. The device id 1 is used by default.'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal min-dev-size' -l id -d 'Specify the DEVICE-ID to query'
-
 complete -f -c btrfs -n $inspect_internal -a dump-tree -d 'Dump tree structures from a given device'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s e -l extents -d 'Print only extent info: extent and device trees'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s d -l device -d 'Print only device info: tree root, chunk and device trees'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s r -l roots -d 'Print only short root node info'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s R -l backups -d 'Print short root node info and backup root info'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s u -l uuid -d 'Print only the uuid tree'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s b -l block -d 'Print info from the specified BLOCK only'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -s t -l tree -d 'Print only tree with the given ID'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l follow -d 'Use with -b, to show all children tree blocks of <block_num>'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l noscan -d 'Do not scan the devices from the filesystem'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l bfs -d 'Breadth-first traversal of the trees, print nodes, then leaves'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-tree' -l dfs -d 'Depth-first traversal of the trees'
-
 complete -f -c btrfs -n $inspect_internal -a dump-super -d 'Dump superblock from a device in a textual form'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s f -l full -d 'Print full superblock information, backup roots etc.'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s a -l all -d 'Print information about all superblocks'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s s -l super -d 'Specify which SUPER-BLOCK copy to print out' -ra '{0,1,2}'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -s F -l force -d 'Attempt to dump superblocks with bad magic'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal dump-super' -l bytenr -d 'Specify alternate superblock OFFSET'
-
 complete -f -c btrfs -n $inspect_internal -a tree-stats -d 'Print various stats for trees'
-complete -f -c btrfs -n '__btrfs_options_groups inspect-internal tree-stats' -s b -d 'Show raw numbers in bytes'
+# btrfs inspect-internal inode-resolve
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal inode-resolve' -s v -d 'Verbose mode'
+# btrfs inspect-internal logical-resolve
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal logical-resolve' -s P -d 'Skip the path resolving and print the inodes instead'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal logical-resolve' -s v -d 'Verbose mode'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal logical-resolve' -s s -d 'Set inode container\'s SIZE'
+# btrfs inspect-internal min-dev-size
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal min-dev-size' -l id -d 'Specify the DEVICE-ID to query'
+# btrfs inspect-internal dump-tree
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s e -l extents -d 'Print only extent info: extent and device trees'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s d -l device -d 'Print only device info: tree root, chunk and device trees'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s r -l roots -d 'Print only short root node info'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s R -l backups -d 'Print short root node info and backup root info'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s u -l uuid -d 'Print only the uuid tree'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s b -l block -d 'Print info from the specified BLOCK only'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -s t -l tree -d 'Print only tree with the given ID'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -l follow -d 'Use with -b, to show all children tree blocks of <block_num>'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -l noscan -d 'Do not scan the devices from the filesystem'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -l bfs -d 'Breadth-first traversal of the trees, print nodes, then leaves'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-tree' -l dfs -d 'Depth-first traversal of the trees'
+# btrfs inspect-internal dump-super
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-super' -s f -l full -d 'Print full superblock information, backup roots etc.'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-super' -s a -l all -d 'Print information about all superblocks'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-super' -s s -l super -d 'Specify which SUPER-BLOCK copy to print out' -ra '{0,1,2}'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-super' -s F -l force -d 'Attempt to dump superblocks with bad magic'
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal dump-super' -l bytenr -d 'Specify alternate superblock OFFSET'
+# btrfs inspect-internal tree-stats
+complete -f -c btrfs -n '__btrfs_command_groups inspect-internal tree-stats' -s b -d 'Show raw numbers in bytes'
 
 # btrfs property
 complete -f -c btrfs -n $property -a get -d 'Get a property value of a btrfs object'
-complete -f -c btrfs -n '__btrfs_options_groups property get' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
-
 complete -f -c btrfs -n $property -a set -d 'Set a property on a btrfs object'
-complete -f -c btrfs -n '__btrfs_options_groups property set' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
-
 complete -f -c btrfs -n $property -a list -d 'Lists available properties with their descriptions for the given object'
-complete -f -c btrfs -n '__btrfs_options_groups property list' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
-
+# btrfs property get
+complete -f -c btrfs -n '__btrfs_command_groups property get' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
+# btrfs property set
+complete -f -c btrfs -n '__btrfs_command_groups property set' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
+# btrfs property list
+complete -f -c btrfs -n '__btrfs_command_groups property list' -s t -d 'List properties for the given object type' -ra '{inode,subvol,filesystem,device}'
 
 # btrfs quota
 complete -f -c btrfs -n $quota -a enable -d 'Enable subvolume quota support for a filesystem.'
 complete -f -c btrfs -n $quota -a disable -d 'Disable subvolume quota support for a filesystem.'
-
 complete -f -c btrfs -n $quota -a rescan -d 'Trash all qgroup numbers and scan the metadata again with the current config.'
-complete -f -c btrfs -n '__btrfs_options_groups quota rescan' -s s -d 'Show status of a running rescan operation'
-complete -f -c btrfs -n '__btrfs_options_groups quota rescan' -s w -d 'Wait for rescan operation to finish'
+# btrfs quota rescan
+complete -f -c btrfs -n '__btrfs_command_groups quota rescan' -s s -d 'Show status of a running rescan operation'
+complete -f -c btrfs -n '__btrfs_command_groups quota rescan' -s w -d 'Wait for rescan operation to finish'
 
 # btrfs qgroup
 complete -f -c btrfs -n $qgroup -a assign -d 'Assign SRC as the child qgroup of DST'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup assign' -l rescan -d 'Schedule qutoa rescan if needed'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup assign' -l no-rescan -d 'Don\'t schedule quota rescan'
-
 complete -f -c btrfs -n $qgroup -a remove -d 'Remove a child qgroup SRC from DST.'
 complete -f -c btrfs -n $qgroup -a create -d 'Create a subvolume quota group.'
 complete -f -c btrfs -n $qgroup -a destroy -d 'Destroy a quota group.'
-
 complete -f -c btrfs -n $qgroup -a show -d 'Show subvolume quota groups.'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s p -d 'Print parent qgroup id'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s c -d 'Print child qgroup id'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s r -d 'Print limit of referenced size of qgroup'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s e -d 'Print limit of exclusive size of qgroup'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s F -d 'List all qgroups including ancestral qgroups'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -s f -d 'List all qgroups excluding ancestral qgroups'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l raw -d 'Show raw numbers in bytes'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l human-readable -d 'Show human friendly numbers, base 1024'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l sort -d 'List qgroups sorted by specified items' -a '{qgroupid,rfer,excl,max_rfer,max_excl}'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup show' -l sync -d 'Force sync of the filesystem before getting info'
-
 complete -f -c btrfs -n $qgroup -a limit -d 'Set the limits a subvolume quota group.'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup limit' -s c -d 'Limit amount of data after compression'
-complete -f -c btrfs -n '__btrfs_options_groups qgroup limit' -s e -d 'Limit space exclusively assigned to this qgroup'
+# btrfs qgroup assign
+complete -f -c btrfs -n '__btrfs_command_groups qgroup assign' -l rescan -d 'Schedule qutoa rescan if needed'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup assign' -l no-rescan -d 'Don\'t schedule quota rescan'
+# btrfs qgroup show
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s p -d 'Print parent qgroup id'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s c -d 'Print child qgroup id'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s r -d 'Print limit of referenced size of qgroup'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s e -d 'Print limit of exclusive size of qgroup'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s F -d 'List all qgroups including ancestral qgroups'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -s f -d 'List all qgroups excluding ancestral qgroups'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l raw -d 'Show raw numbers in bytes'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l human-readable -d 'Show human friendly numbers, base 1024'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l iec -d 'Use 1024 as a base (KiB, MiB, GiB, TiB)'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l si -d 'Use 1000 as a base (kB, MB, GB, TB)'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l kbytes -d 'Show sizes in KiB, or kB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l mbytes -d 'Show sizes in MiB, or MB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l gbytes -d 'Show sizes in GiB, or GB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l tbytes -d 'Show sizes in TiB, or TB with --si'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l sort -d 'List qgroups sorted by specified items' -a '{qgroupid,rfer,excl,max_rfer,max_excl}'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup show' -l sync -d 'Force sync of the filesystem before getting info'
+# btrfs qgroup limit
+complete -f -c btrfs -n '__btrfs_command_groups qgroup limit' -s c -d 'Limit amount of data after compression'
+complete -f -c btrfs -n '__btrfs_command_groups qgroup limit' -s e -d 'Limit space exclusively assigned to this qgroup'
 
 # btrfs replace
 complete -f -c btrfs -n $replace -a start -d 'Replace device of a btrfs filesystem.'
-complete -f -c btrfs -n '__btrfs_options_groups replace start' -s r -d 'Only read from <srcdev> if no other zero-defect mirror exists'
-complete -f -c btrfs -n '__btrfs_options_groups replace start' -s f -d 'Force using and overwriting <targetdev>'
-complete -f -c btrfs -n '__btrfs_options_groups replace start' -s B -d 'Do not background'
-
 complete -f -c btrfs -n $replace -a status -d 'Print status and progress information of a running device replace'
-complete -f -c btrfs -n '__btrfs_options_groups replace status' -s 1 -d 'Only print once until the replace operation finishes'
-
 complete -f -c btrfs -n $replace -a cancel -d 'Cancel a running device replace operation.'
+# btrfs replace start
+complete -f -c btrfs -n '__btrfs_command_groups replace start' -s r -d 'Only read from <srcdev> if no other zero-defect mirror exists'
+complete -f -c btrfs -n '__btrfs_command_groups replace start' -s f -d 'Force using and overwriting <targetdev>'
+complete -f -c btrfs -n '__btrfs_command_groups replace start' -s B -d 'Do not background'
+# btrfs replace status
+complete -f -c btrfs -n '__btrfs_command_groups replace status' -s 1 -d 'Only print once until the replace operation finishes'

From d992480204ca0afc1bee275b4d52e06b6efe8d7d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 31 Jul 2019 11:06:39 -0700
Subject: [PATCH 1140/1732] Clean up a few string handling bits

---
 src/builtin_string.cpp | 2 +-
 src/screen.cpp         | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 637492da3..6d1e9dc7f 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -766,7 +766,7 @@ class pcre2_matcher_t : public string_matcher_t {
                                               (unsigned long)(end - begin));
                 } else if (end > begin) {
                     // May have end < begin if \K is used.
-                    streams.out.append(wcstring(&arg[begin], end - begin));
+                    streams.out.append(arg.substr(begin, end - begin));
                 }
                 streams.out.push_back(L'\n');
             }
diff --git a/src/screen.cpp b/src/screen.cpp
index 8f85d1890..993ccdd83 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -286,15 +286,17 @@ void layout_cache_t::add_prompt_layout(wcstring input, prompt_layout_t layout) {
 
 /// Calculate layout information for the given prompt. Does some clever magic to detect common
 /// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
-static prompt_layout_t calc_prompt_layout(const wcstring &prompt, layout_cache_t &cache) {
-    if (auto cached_layout = cache.find_prompt_layout(prompt)) {
+/// escape sequences that may be embeded in a prompt, such as those to set visual attributes.
+static prompt_layout_t calc_prompt_layout(const wcstring &prompt_str, layout_cache_t &cache) {
+    if (auto cached_layout = cache.find_prompt_layout(prompt_str)) {
         return *cached_layout;
     }
 
     prompt_layout_t prompt_layout = {1, 0, 0};
     size_t current_line_width = 0;
 
-    for (int j = 0; prompt[j]; j++) {
+    const wchar_t *prompt = prompt_str.c_str();
+    for (size_t j = 0; prompt[j]; j++) {
         if (prompt[j] == L'\x1B') {
             // This is the start of an escape code. Skip over it if it's at least one char long.
             size_t len = escape_code_length(&prompt[j]);

From 61486954bcbce94559c99ab3b677e114dcfd1f9a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 20 Oct 2019 11:38:17 +0200
Subject: [PATCH 1141/1732] Use a pager to view long outputs of builtin --help

Every builtin or function shipped with fish supports flag -h or --help to
print a slightly condensed version of its manpage.
Some of those help messages are longer than a typical screen;
this commit pipes the help to a pager to make it easier to read.

As in other places in fish we assume that either $PAGER or "less" is a
valid pager and use that.

In three places (error messages for bg, break and continue) the help is
printed to stderr instead of stdout.  To make sure the error message is
visible in the pager, we pass it to builtin_print_help, every call of which
needs to be updated.

Fixes #6227
---
 share/functions/__fish_print_help.fish | 23 +++++++++-
 src/builtin.cpp                        | 60 ++++++++++----------------
 src/builtin.h                          |  2 +-
 src/builtin_argparse.cpp               |  2 +-
 src/builtin_bg.cpp                     |  6 +--
 src/builtin_bind.cpp                   |  2 +-
 src/builtin_block.cpp                  |  2 +-
 src/builtin_builtin.cpp                |  2 +-
 src/builtin_cd.cpp                     |  2 +-
 src/builtin_command.cpp                |  4 +-
 src/builtin_commandline.cpp            |  2 +-
 src/builtin_complete.cpp               |  2 +-
 src/builtin_contains.cpp               |  2 +-
 src/builtin_disown.cpp                 |  2 +-
 src/builtin_emit.cpp                   |  2 +-
 src/builtin_exit.cpp                   |  2 +-
 src/builtin_fg.cpp                     |  2 +-
 src/builtin_functions.cpp              |  2 +-
 src/builtin_history.cpp                |  2 +-
 src/builtin_jobs.cpp                   |  2 +-
 src/builtin_math.cpp                   |  2 +-
 src/builtin_printf.cpp                 |  2 +-
 src/builtin_pwd.cpp                    |  2 +-
 src/builtin_random.cpp                 |  2 +-
 src/builtin_read.cpp                   |  2 +-
 src/builtin_realpath.cpp               |  4 +-
 src/builtin_return.cpp                 |  2 +-
 src/builtin_set.cpp                    |  2 +-
 src/builtin_set_color.cpp              |  2 +-
 src/builtin_source.cpp                 |  2 +-
 src/builtin_status.cpp                 |  2 +-
 src/builtin_string.cpp                 |  2 +-
 src/builtin_ulimit.cpp                 |  2 +-
 33 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index 0d74aa084..462068bb3 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -1,4 +1,4 @@
-function __fish_print_help --description "Print help message for the specified fish function or builtin" --argument item
+function __fish_print_help --description "Print help message for the specified fish function or builtin" --argument item error_message
     if test "$item" = '.'
         set item source
     end
@@ -53,6 +53,8 @@ function __fish_print_help --description "Print help message for the specified f
     # the `-s` flag to `less` that `man` passes.
     set -l state blank
     set -l have_name
+    begin
+        string join \n $error_message
     for line in $help
         # categorize the line
         set -l line_type
@@ -103,5 +105,22 @@ function __fish_print_help --description "Print help message for the specified f
                         # skip it
                 end
         end
-    end | string replace -ra '^       ' '' | ul # post-process with `ul`, to interpret the old-style grotty escapes
+    end
+    end | string replace -ra '^       ' '' | ul | # post-process with `ul`, to interpret the old-style grotty escapes
+    begin
+        set -l pager less
+        set -q PAGER
+        and set pager $PAGER
+        not isatty stdout
+        and set pager cat # cannot use a builtin here
+        # similar to man, but add -F to quit paging when the help output is brief (#6227)
+        set -xl LESS "$LESS"isrFX
+        # less options:
+        # -i (--ignore-case) search case-insensitively, like man
+        # -s (--squeeze-blank-lines) not strictly necessary since we already do that above
+        # -r (--raw-control-chars) to display bold, underline and colors
+        # -F (--quit-if-one-screen) to maintain the non-paging behavior for small outputs
+        # -X (--no-init) not sure if this is needed but git uses it
+        $pager
+    end
 end
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 0d7ecc7f2..5584231e7 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -146,42 +146,27 @@ int parse_help_only_cmd_opts(struct help_only_cmd_opts_t &opts, int *optind, int
     return STATUS_CMD_OK;
 }
 
-/// Obtain help/usage information for the specified builtin from manpage in subshell
+/// Display help/usage information for the specified builtin or function from manpage
 ///
 /// @param  name
-///    builtin name to get up help for
+///    builtin or function name to get up help for
 ///
-/// @return
-///    A wcstring with a formatted manpage.
-///
-wcstring builtin_help_get(parser_t &parser, io_streams_t &streams, const wchar_t *name) {
-    UNUSED(parser);
+/// Process and print help for the specified builtin or function.
+void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *name,
+                        wcstring *error_message) {
     UNUSED(streams);
     // This won't ever work if no_exec is set.
-    if (no_exec()) return wcstring();
-
-    wcstring_list_t lst;
-    wcstring out;
-    const wcstring name_esc = escape_string(name, 1);
-    wcstring cmd = format_string(L"__fish_print_help %ls", name_esc.c_str());
-    if (exec_subshell(cmd, parser, lst, false /* don't apply exit status */) >= 0) {
-        for (size_t i = 0; i < lst.size(); i++) {
-            out.append(lst.at(i));
-            out.push_back(L'\n');
-        }
+    if (no_exec()) return;
+    const wcstring name_esc = escape_string(name, ESCAPE_ALL);
+    wcstring cmd = format_string(L"__fish_print_help %ls ", name_esc.c_str());
+    io_chain_t ios;
+    if (error_message) {
+        cmd.append(escape_string(*error_message, ESCAPE_ALL));
+        // If it's an error, redirect the output of __fish_print_help to stderr
+        ios.push_back(std::make_shared<io_fd_t>(STDOUT_FILENO, STDERR_FILENO, false));
     }
-    return out;
-}
-
-/// Process and print for the specified builtin. If @c b is `sb_err`, also print the line
-/// information.
-///
-/// If @c b is the buffer representing standard error, and the help message is about to be printed
-/// to an interactive screen, it may be shortened to fit the screen.
-///
-void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
-                        output_stream_t &b) {
-    b.append(builtin_help_get(parser, streams, cmd));
+    parser.eval(cmd, ios, TOP);
+    // ignore the exit status of __fish_print_help
 }
 
 /// Perform error reporting for encounter with unknown option.
@@ -221,14 +206,14 @@ static int builtin_generic(parser_t &parser, io_streams_t &streams, wchar_t **ar
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
     // Hackish - if we have no arguments other than the command, we are a "naked invocation" and we
     // just print help.
     if (argc == 1) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_INVALID_ARGS;
     }
 
@@ -272,9 +257,8 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
     int argc = builtin_count_args(argv);
 
     if (argc != 1) {
-        streams.err.append_format(BUILTIN_ERR_UNKNOWN, argv[0], argv[1]);
-
-        builtin_print_help(parser, streams, argv[0], streams.err);
+        wcstring error_message = format_string(BUILTIN_ERR_UNKNOWN, argv[0], argv[1]);
+        builtin_print_help(parser, streams, argv[0], &error_message);
         return STATUS_INVALID_ARGS;
     }
 
@@ -286,8 +270,8 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
         if (b->type() == FUNCTION_CALL) break;
     }
     if (!has_loop) {
-        streams.err.append_format(_(L"%ls: Not inside of loop\n"), argv[0]);
-        builtin_print_help(parser, streams, argv[0], streams.err);
+        wcstring error_message = format_string(_(L"%ls: Not inside of loop\n"), argv[0]);
+        builtin_print_help(parser, streams, argv[0], &error_message);
         return STATUS_CMD_ERROR;
     }
 
@@ -455,7 +439,7 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
     // follows the keyword by `-h` or `--help`. Since it isn't really a builtin command we need to
     // handle displaying help for it here.
     if (argv[1] && !argv[2] && parse_util_argument_is_help(argv[1]) && cmd_needs_help(argv[0])) {
-        builtin_print_help(parser, streams, argv[0], streams.out);
+        builtin_print_help(parser, streams, argv[0]);
         return proc_status_t::from_exit_code(STATUS_CMD_OK);
     }
 
diff --git a/src/builtin.h b/src/builtin.h
index a17fec0b5..359dd40be 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -89,7 +89,7 @@ const wchar_t *builtin_get_desc(const wcstring &b);
 wcstring builtin_help_get(parser_t &parser, const wchar_t *cmd);
 
 void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
-                        output_stream_t &b);
+                        wcstring *error_message = nullptr);
 int builtin_count_args(const wchar_t *const *argv);
 
 void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 4d482773e..2153a9379 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -699,7 +699,7 @@ int builtin_argparse(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 2e9b4e5ea..83b95faae 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -21,10 +21,10 @@
 static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
     assert(j != NULL);
     if (!j->wants_job_control()) {
-        streams.err.append_format(
+        wcstring error_message = format_string(
             _(L"%ls: Can't put job %d, '%ls' to background because it is not under job control\n"),
             L"bg", j->job_id, j->command_wcstr());
-        builtin_print_help(parser, streams, L"bg", streams.err);
+        builtin_print_help(parser, streams, L"bg", &error_message);
         return STATUS_CMD_ERROR;
     }
 
@@ -47,7 +47,7 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 477e15075..29c36c9a2 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -431,7 +431,7 @@ int builtin_bind_t::builtin_bind(parser_t &parser, io_streams_t &streams, wchar_
         return STATUS_CMD_OK;
     }
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index b42487dd3..00d70dfe0 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -81,7 +81,7 @@ int builtin_block(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index dd8391c8a..e4ff40924 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -77,7 +77,7 @@ int builtin_builtin(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index 7599e5cd3..31654747e 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -31,7 +31,7 @@ int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_command.cpp b/src/builtin_command.cpp
index b13fdd390..396850528 100644
--- a/src/builtin_command.cpp
+++ b/src/builtin_command.cpp
@@ -84,13 +84,13 @@ int builtin_command(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
     // Quiet implies find_path.
     if (!opts.find_path && !opts.all_paths && !opts.quiet) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index cf309b498..a8d3e112f 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -263,7 +263,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
                 break;
             }
             case 'h': {
-                builtin_print_help(parser, streams, cmd, streams.out);
+                builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
             }
             case ':': {
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 646c67ccd..7847c1b72 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -247,7 +247,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 break;
             }
             case 'h': {
-                builtin_print_help(parser, streams, cmd, streams.out);
+                builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
             }
             case ':': {
diff --git a/src/builtin_contains.cpp b/src/builtin_contains.cpp
index 289b04645..c98c0bb1a 100644
--- a/src/builtin_contains.cpp
+++ b/src/builtin_contains.cpp
@@ -68,7 +68,7 @@ int builtin_contains(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index f6c5965a3..aa1115883 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -52,7 +52,7 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_emit.cpp b/src/builtin_emit.cpp
index 8ef33a320..b837b30ab 100644
--- a/src/builtin_emit.cpp
+++ b/src/builtin_emit.cpp
@@ -21,7 +21,7 @@ int builtin_emit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index e747f10ae..6f8e9d58c 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -69,7 +69,7 @@ int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index c06d2a1a7..4a7808cab 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -31,7 +31,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 8d8ccfe22..bca9eace2 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -298,7 +298,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 70d68da61..adfac2063 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -212,7 +212,7 @@ int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 9a541a18b..fc080b73c 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -151,7 +151,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 break;
             }
             case 'h': {
-                builtin_print_help(parser, streams, cmd, streams.out);
+                builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
             }
             case ':': {
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index b2d1e11fb..d7a3c7fc8 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -243,7 +243,7 @@ int builtin_math(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index d722dd4e7..dccdc5226 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -742,7 +742,7 @@ int builtin_printf(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_pwd.cpp b/src/builtin_pwd.cpp
index 328cec5d7..8c0c7a71a 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtin_pwd.cpp
@@ -33,7 +33,7 @@ int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 resolve_symlinks = true;
                 break;
             case 'h':
-                builtin_print_help(parser, streams, cmd, streams.out);
+                builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
             case '?': {
                 builtin_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index f97a63914..3478810fd 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -38,7 +38,7 @@ int builtin_random(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 0fd657305..b2af119d6 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -431,7 +431,7 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index d98a38f83..3a4ea7c89 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -28,13 +28,13 @@ int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
     if (optind + 1 != argc) {  // TODO: allow arbitrary args. `realpath *` should print many paths
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, cmd, 1, argc - optind);
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 0debc5ca5..11d8354c9 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -68,7 +68,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 5b8c06fea..6e3630676 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -807,7 +807,7 @@ int builtin_set(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     argc -= optind;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index f84e33fac..0867cc684 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -109,7 +109,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 break;
             }
             case 'h': {
-                builtin_print_help(parser, streams, argv[0], streams.out);
+                builtin_print_help(parser, streams, argv[0]);
                 return STATUS_CMD_OK;
             }
             case 'o': {
diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index aec69ffef..0765053fb 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -33,7 +33,7 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 28b8e0489..cc974878d 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -280,7 +280,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (retval != STATUS_CMD_OK) return retval;
 
     if (opts.print_help) {
-        builtin_print_help(parser, streams, cmd, streams.out);
+        builtin_print_help(parser, streams, cmd);
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 6d1e9dc7f..f5cc6f971 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1358,7 +1358,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (std::wcscmp(argv[1], L"-h") == 0 || std::wcscmp(argv[1], L"--help") == 0) {
-        builtin_print_help(parser, streams, L"string", streams.out);
+        builtin_print_help(parser, streams, L"string");
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index 40fe6bfef..f50d9b4e9 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -239,7 +239,7 @@ int builtin_ulimit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             }
 #endif
             case 'h': {
-                builtin_print_help(parser, streams, cmd, streams.out);
+                builtin_print_help(parser, streams, cmd);
                 return STATUS_CMD_OK;
             }
             case ':': {

From 97d031e20cb198173a12902f0778d03820328c14 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 20 Oct 2019 17:17:47 +0200
Subject: [PATCH 1142/1732] reformat

---
 share/functions/__fish_print_help.fish | 94 +++++++++++++-------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index 462068bb3..1f7f54164 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -55,57 +55,57 @@ function __fish_print_help --description "Print help message for the specified f
     set -l have_name
     begin
         string join \n $error_message
-    for line in $help
-        # categorize the line
-        set -l line_type
-        switch $line
-            case ' *' \t\*
-                # starts with whitespace, check if it has non-whitespace
-                printf "%s\n" $line | read -l word __
-                if test -n $word
-                    set line_type normal
-                else
-                    # lines with just spaces probably shouldn't happen
-                    # but let's consider them to be blank
+        for line in $help
+            # categorize the line
+            set -l line_type
+            switch $line
+                case ' *' \t\*
+                    # starts with whitespace, check if it has non-whitespace
+                    printf "%s\n" $line | read -l word __
+                    if test -n $word
+                        set line_type normal
+                    else
+                        # lines with just spaces probably shouldn't happen
+                        # but let's consider them to be blank
+                        set line_type blank
+                    end
+                case ''
                     set line_type blank
-                end
-            case ''
-                set line_type blank
-            case '*'
-                # Remove man's bolding
-                set -l name (string replace -ra '(.)'\b'.' '$1' -- $line)
-                # We start after we have the name
-                contains -- $name NAME; and set have_name 1; and continue
-                # We ignore the SYNOPSIS header
-                contains -- $name SYNOPSIS; and continue
-                # Everything after COPYRIGHT is useless
-                contains -- $name COPYRIGHT; and break
+                case '*'
+                    # Remove man's bolding
+                    set -l name (string replace -ra '(.)'\b'.' '$1' -- $line)
+                    # We start after we have the name
+                    contains -- $name NAME; and set have_name 1; and continue
+                    # We ignore the SYNOPSIS header
+                    contains -- $name SYNOPSIS; and continue
+                    # Everything after COPYRIGHT is useless
+                    contains -- $name COPYRIGHT; and break
 
-                # not leading space, and not empty, so must contain a non-space
-                # in the first column. That makes it a header/footer.
-                set line_type meta
-        end
+                    # not leading space, and not empty, so must contain a non-space
+                    # in the first column. That makes it a header/footer.
+                    set line_type meta
+            end
 
-        set -q have_name[1]; or continue
-        switch $state
-            case normal
-                switch $line_type
-                    case normal meta
-                        printf "%s\n" $line
-                    case blank
-                        set state blank
-                end
-            case blank
-                switch $line_type
-                    case normal meta
-                        echo # print the blank line
-                        printf "%s\n" $line
-                        set state normal
-                    case blank meta
-                        # skip it
-                end
+            set -q have_name[1]; or continue
+            switch $state
+                case normal
+                    switch $line_type
+                        case normal meta
+                            printf "%s\n" $line
+                        case blank
+                            set state blank
+                    end
+                case blank
+                    switch $line_type
+                        case normal meta
+                            echo # print the blank line
+                            printf "%s\n" $line
+                            set state normal
+                        case blank meta
+                            # skip it
+                    end
+            end
         end
-    end
     end | string replace -ra '^       ' '' | ul | # post-process with `ul`, to interpret the old-style grotty escapes
     begin
         set -l pager less

From 5ce4cb66d34528d9fb5c3f6af5dc9ef116007f45 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 28 Oct 2019 18:30:36 +0100
Subject: [PATCH 1143/1732] fix stale doc

[ci skip]
---
 sphinx_doc_src/index.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 0a25e42d7..7fdc01095 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1833,9 +1833,6 @@ Fish includes a built in debugging facility. The debugger allows you to stop exe
 
 To start a debug session simply run the builtin command ``breakpoint`` at the point in a function or script where you wish to gain control. Also, the default action of the TRAP signal is to call this builtin. So a running script can be debugged by sending it the TRAP signal with the ``kill`` command. Once in the debugger, it is easy to insert new breakpoints by using the funced function to edit the definition of a function.
 
-Note: At the moment the debug prompt is identical to your normal fish prompt. This can make it hard to recognize that you've entered a debug session. `Issue 1310 <https://github.com/fish-shell/fish-shell/issues/1310>`_ is open to improve this.
-
-
 .. _more-help:
 
 Further help and development

From 21a6a192ae1a808c3d52f71f7f1531e25e146bf7 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Tue, 24 Sep 2019 22:31:44 +0000
Subject: [PATCH 1144/1732] refactor gpg.fish completions

refactor gpg completions into functions
comment changes; improve gpg version detection

[ci skip]
---
 CHANGELOG.md                                  |   1 +
 share/completions/gpg.fish                    | 380 +--------------
 share/completions/gpg1.fish                   |   1 +
 share/completions/gpg2.fish                   | 438 +-----------------
 share/functions/__fish_complete_gpg.fish      | 366 +++++++++++++++
 .../functions/__fish_complete_gpg_key_id.fish |  17 +
 .../__fish_complete_gpg_user_id.fish          |   9 +
 share/functions/__fish_print_gpg_algo.fish    |  30 ++
 8 files changed, 426 insertions(+), 816 deletions(-)
 create mode 100644 share/completions/gpg1.fish
 create mode 100644 share/functions/__fish_complete_gpg.fish
 create mode 100644 share/functions/__fish_complete_gpg_key_id.fish
 create mode 100644 share/functions/__fish_complete_gpg_user_id.fish
 create mode 100644 share/functions/__fish_print_gpg_algo.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12754e5ff..08a6ab856 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -94,6 +94,7 @@
   - `fsharpc` and `fsharpi` (#6016)
   - `fzf` (#6178)
   - `g++` (#6217)
+  - `gpg1` (#6139)
   - `gpg2` (#6062)
   - `grub-mkrescue` (#6182)
   - `hledger` (#6043)
diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index abc1ba997..3229e3e11 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -1,379 +1 @@
-#
-# Completions for the gpg command.
-#
-# This program accepts an rather large number of switches. It allows
-# you to do things like changing what file descriptor errors should be
-# written to, to make gpg use a different locale than the one
-# specified in the environment or to specify an alternative home
-# directory.
-
-# Switches related to debugging, switches whose use is not
-# recommended, switches whose behaviour is as of yet undefined,
-# switches for experimental features, switches to make gpg compliant
-# to legacy pgp-versions, dos-specific switches, switches meant for
-# the options file and deprecated or obsolete switches have all been
-# removed. The remaining list of completions is still quite
-# impressive.
-
-#
-# Various functions used for dynamic completions
-#
-
-function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
-    # 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 colons with \x3a
-    gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
-end
-
-function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
-    # Use user id as description
-    set -l keyid
-    gpg --list-keys --with-colons | while read garbage
-        switch $garbage
-            # Extract user ids
-            case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
-                printf "%s\t%s\n" $keyid $uid
-            # Extract key fingerprints (no subkeys)
-            case "pub*"
-                echo $garbage | cut -d ":" -f 5 | read keyid
-        end
-    end
-end
-
-function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
-    # Set a known locale, so that the output format of 'gpg --version'
-    # is at least somewhat predictable. The locale will automatically
-    # expire when the function goes out of scope, and the original locale
-    # will take effect again.
-    set -lx LC_ALL C
-
-    # sed script explained:
-    # in the line that matches "$argv:"
-    # 	define label 'loop'
-    # 	if the line ends with a ','
-    # 		add next line to buffer
-    #		transliterate '\n' with ' '
-    #		goto loop
-    # 	remove everything until the first ':' of the line
-    # 	remove all blanks
-    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
-    # 	print result
-    gpg --version | sed -ne "/$argv:/"'{:loop
-    /,$/{N; y!\n! !
-    b loop
-    }
-    s!^[^:]*:!!
-    s![ ]*!!g
-    y!,!\n!
-    p
-    }'
-end
-
-
-#
-# gpg subcommands
-#
-
-complete -c gpg -s s -l sign -d "Make a signature"
-complete -c gpg -l clearsign -d "Make a clear text signature"
-complete -c gpg -s b -l detach-sign -d "Make a detached signature"
-complete -c gpg -s e -l encrypt -d "Encrypt data"
-complete -c gpg -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg -l store -d "Store only (make a simple RFC1991 packet)"
-complete -c gpg -l decrypt -d "Decrypt specified file or stdin"
-complete -c gpg -l verify -d "Assume specified file or stdin is sigfile and verify it"
-complete -c gpg -l multifile -d "Modify certain other commands to accept multiple files for processing"
-complete -c gpg -l verify-files -d "Identical to '--multifile --verify'"
-complete -c gpg -l encrypt-files -d "Identical to '--multifile --encrypt'"
-complete -c gpg -l decrypt-files -d "Identical to --multifile --decrypt"
-
-complete -c gpg -s k -l list-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -l list-public-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg -s K -l list-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-complete -c gpg -l list-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-complete -c gpg -l check-sigs -xa "(__fish_complete_gpg_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg -l fingerprint -xa "(__fish_complete_gpg_user_id)" -d "List all keys with their fingerprints"
-complete -c gpg -l gen-key -d "Generate a new key pair"
-
-complete -c gpg -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id)"
-
-complete -c gpg -l sign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key"
-complete -c gpg -l lsign-key -xa "(__fish_complete_gpg_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the public keyring"
-complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" -d "Remove key from the secret and public keyring"
-complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" -d "Generate a designated revocation certificate for a key"
-
-complete -c gpg -l export -xa "(__fish_complete_gpg_user_id)" -d 'Export all or the given keys from all keyrings'
-complete -c gpg -l send-keys -xa "(__fish_complete_gpg_key_id)" -d "Same as --export but sends the keys to a keyserver"
-complete -c gpg -l export-secret-keys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-complete -c gpg -l export-secret-subkeys -xa "(__fish_complete_gpg_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-complete -c gpg -l import -d 'Import/merge keys'
-complete -c gpg -l fast-import -d 'Import/merge keys'
-
-complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-complete -c gpg -l search-keys -xa "(__fish_complete_gpg_user_id)" -d "Search the keyserver for the given names"
-complete -c gpg -l update-trustdb -d "Do trust database maintenance"
-complete -c gpg -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-complete -c gpg -l export-ownertrust -d "Send the ownertrust values to stdout"
-complete -c gpg -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-complete -c gpg -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-complete -c gpg -l print-md -xa "(__fish_print_gpg_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-complete -c gpg -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-complete -c gpg -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-complete -c gpg -l version -d "Display version and supported algorithms, and exit"
-complete -c gpg -l warranty -d "Display warranty and exit"
-complete -c gpg -s h -l help -d "Display help and exit"
-
-
-#
-# gpg options
-#
-
-complete -c gpg -s a -l armor -d "Create ASCII armored output"
-complete -c gpg -s o -l output -r -d "Write output to specified file"
-
-complete -c gpg -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-complete -c gpg -s u -l local-user -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the key to sign with"
-complete -c gpg -l default-key -xa "(__fish_complete_gpg_user_id)" -d "Use specified key as the default key to sign with"
-
-complete -c gpg -s r -l recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id"
-complete -c gpg -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-complete -c gpg -l default-recipient -xa "(__fish_complete_gpg_user_id)" -d "Use specified user id as default recipient"
-complete -c gpg -l default-recipient-self -d "Use the default key as default recipient"
-complete -c gpg -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-complete -c gpg -s v -l verbose -d "Give more information during processing"
-complete -c gpg -s q -l quiet -d "Quiet mode"
-
-complete -c gpg -s z -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-complete -c gpg -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-complete -c gpg -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-complete -c gpg -s i -l interactive -d "Prompt before overwrite"
-
-complete -c gpg -l batch -d "Batch mode"
-complete -c gpg -l no-batch -d "Don't use batch mode"
-complete -c gpg -l no-tty -d "Never write output to terminal"
-
-complete -c gpg -l yes -d "Assume yes on most questions"
-complete -c gpg -l no -d "Assume no on most questions"
-
-complete -c gpg -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-complete -c gpg -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-complete -c gpg -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-complete -c gpg -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-complete -c gpg -l trusted-key -xa "(__fish_complete_gpg_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-complete -c gpg -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-complete -c gpg -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-complete -c gpg -l keyserver -x -d "Use specified keyserver"
-complete -c gpg -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-complete -c gpg -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-complete -c gpg -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-complete -c gpg -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-complete -c gpg -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-complete -c gpg -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-complete -c gpg -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-complete -c gpg -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-complete -c gpg -l keyring -r -d "Add specified file to the current list of keyrings"
-
-complete -c gpg -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-complete -c gpg -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-complete -c gpg -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-complete -c gpg -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-complete -c gpg -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-complete -c gpg -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-complete -c gpg -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-complete -c gpg -l options -r -d "Read options from specified file, do not read the default options file"
-complete -c gpg -l no-options -d "Shortcut for '--options /dev/null'"
-complete -c gpg -l load-extension -x -d "Load an extension module"
-
-complete -c gpg -l status-fd -x -d "Write special status strings to the specified file descriptor"
-complete -c gpg -l logger-fd -x -d "Write log output to the specified file descriptor"
-complete -c gpg -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-complete -c gpg -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-complete -c gpg -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-complete -c gpg -l comment -x -d "Use specified string as comment string"
-complete -c gpg -l no-comments -d "Don't use a comment string"
-
-complete -c gpg -l emit-version -d "Include the version string in ASCII armored output"
-complete -c gpg -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-complete -c gpg -l sig-notation -x
-complete -c gpg -l cert-notation -x
-
-complete -c gpg -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-complete -c gpg -l sig-policy-url -x -d "Set signature policy"
-complete -c gpg -l cert-policy-url -x -d "Set certificate policy"
-complete -c gpg -l set-policy-url -x -d "Set signature and certificate policy"
-complete -c gpg -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-complete -c gpg -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-complete -c gpg -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-complete -c gpg -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-complete -c gpg -l use-embedded-filename -d "Create file with name as given in data"
-complete -c gpg -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-complete -c gpg -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-complete -c gpg -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-complete -c gpg -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-complete -c gpg -l cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm"
-complete -c gpg -l digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm"
-complete -c gpg -l compress-algo -xa "(__fish_print_gpg_algo Compression)" -d "Use specified compression algorithm"
-complete -c gpg -l cert-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-complete -c gpg -l s2k-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-complete -c gpg -l s2k-digest-algo -xa "(__fish_print_gpg_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-complete -c gpg -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-complete -c gpg -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
-
-complete -c gpg -l disable-cipher-algo -xa "(__fish_print_gpg_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-complete -c gpg -l disable-pubkey-algo -xa "(__fish_print_gpg_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-complete -c gpg -l no-sig-cache -d "Do not cache the verification status of key signatures"
-complete -c gpg -l no-sig-create-check -d "Do not verify each signature right after creation"
-
-complete -c gpg -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-complete -c gpg -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-complete -c gpg -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-complete -c gpg -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-complete -c gpg -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-complete -c gpg -l escape-from-lines -d "Mangle From-field of email headers (default)"
-complete -c gpg -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-complete -c gpg -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-complete -c gpg -l command-fd -x -d "Read user input from specified file descriptor"
-
-complete -c gpg -l use-agent -d "Try to use the GnuPG-Agent"
-complete -c gpg -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-complete -c gpg -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-complete -c gpg -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-complete -c gpg -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-complete -c gpg -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-complete -c gpg -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-complete -c gpg -l force-mdc -d "Force the use of encryption with a modification detection code"
-complete -c gpg -l disable-mdc -d "Disable the use of the modification detection code"
-
-complete -c gpg -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-complete -c gpg -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-complete -c gpg -l ignore-time-conflict -d "Do not fail if signature is older than key"
-complete -c gpg -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-complete -c gpg -l ignore-crc-error -d "Ignore CRC errors"
-complete -c gpg -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-complete -c gpg -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-complete -c gpg -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-complete -c gpg -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-complete -c gpg -l no-verbose -d "Reset verbose level to 0"
-complete -c gpg -l no-greeting -d "Suppress the initial copyright message"
-complete -c gpg -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-complete -c gpg -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-complete -c gpg -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-complete -c gpg -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-complete -c gpg -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-complete -c gpg -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-complete -c gpg -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-complete -c gpg -l skip-verify -d "Skip the signature verification step"
-
-complete -c gpg -l with-colons -d "Print key listings delimited by colons"
-complete -c gpg -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-complete -c gpg -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-complete -c gpg -l fast-list-mode -d "Changes the output of the list commands to work faster"
-complete -c gpg -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-complete -c gpg -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-complete -c gpg -l show-session-key -d "Display the session key used for one message"
-complete -c gpg -l override-session-key -x -d "Don't use the public key but the specified session key"
-
-complete -c gpg -l ask-sig-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l ask-cert-expire -d "Prompt for an expiration time"
-complete -c gpg -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-complete -c gpg -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-complete -c gpg -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-complete -c gpg -l ungroup -d "Remove a given entry from the --group list"
-complete -c gpg -l no-groups -d "Remove all entries from the --group list"
-
-complete -c gpg -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-complete -c gpg -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-complete -c gpg -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-complete -c gpg -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-complete -c gpg -l default-preference-list -x -d "Set the list of default preferences to the specified string"
-complete -c gpg -l card-status -d "Print card status"
-complete -c gpg -l change-passphrase -d "Change passphrase"
-complete -c gpg -l change-pin -d "Change pin"
-complete -c gpg -l check-signatures -d "List and check key signatures"
-complete -c gpg -l clear-sign -d "Make clear text signature"
-complete -c gpg -l delete-keys -d "Remove keys from public keyring"
-complete -c gpg -l delete-secret-keys -d "Remove keys from secret keyring"
-complete -c gpg -l edit-card -d "Change data on card"
-complete -c gpg -l full-generate-key -d "Full featured key par generation"
-complete -c gpg -l generate-key -d "Generate a new key pair"
-complete -c gpg -l generate-revocation -d "Generate revocation certificate"
-complete -c gpg -l list-signatures -d "List keys and signatures"
-complete -c gpg -l openpgp -d "Use strict OpenPGP behavior"
-complete -c gpg -l quick-add-uid -d "Quickly generate new key pair"
-complete -c gpg -l quick-generate-key -d "Quickly generate new key pair"
-complete -c gpg -l quick-lsign-key -d "Quickly sign key locally"
-complete -c gpg -l quick-sign-key -d "Quickly sign key"
-complete -c gpg -l quick-revoke-uid -d "Quickly revoke user-id"
-complete -c gpg -l quick-set-expire -d "Quickly set new expiration date"
-complete -c gpg -l receive-keys -d "Import keys from keyserver"
-complete -c gpg -l server -d "Run in server mode"
-complete -c gpg -l tofu-policy -x -d "Set given TOFU policy for key"
-
+__fish_complete_gpg gpg
diff --git a/share/completions/gpg1.fish b/share/completions/gpg1.fish
new file mode 100644
index 000000000..a360b528d
--- /dev/null
+++ b/share/completions/gpg1.fish
@@ -0,0 +1 @@
+__fish_complete_gpg gpg1
diff --git a/share/completions/gpg2.fish b/share/completions/gpg2.fish
index 1097693f3..cbe007378 100644
--- a/share/completions/gpg2.fish
+++ b/share/completions/gpg2.fish
@@ -1,437 +1 @@
-#
-# Completions for the gpg2 command.
-#
-# This program accepts an rather large number of switches. It allows
-# you to do things like changing what file descriptor errors should be
-# written to, to make gpg2 use a different locale than the one
-# specified in the environment or to specify an alternative home
-# directory.
-
-# Switches related to debugging, switches whose use is not
-# recommended, switches whose behaviour is as of yet undefined,
-# switches for experimental features, switches to make gpg2 compliant
-# to legacy pgp-versions, dos-specific switches, switches meant for
-# the options file and deprecated or obsolete switches have all been
-# removed. The remaining list of completions is still quite
-# impressive.
-
-#
-# Various functions used for dynamic completions
-#
-
-function __fish_complete_gpg2_user_id -d "Complete using gpg2 user ids"
-    # gpg2 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 colons with \x3a
-    gpg2 --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
-end
-
-function __fish_complete_gpg2_key_id -d 'Complete using gpg2 key ids'
-    # Use user id as description
-    set -l keyid
-    gpg2 --list-keys --with-colons | while read garbage
-        switch $garbage
-            # Extract user id
-            case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
-                printf "%s\t%s\n" $keyid $uid
-            # Extract key fingerprint (no subkeys)
-            case "pub*"
-                echo $garbage | cut -d ":" -f 5 | read keyid
-        end
-    end
-end
-
-function __fish_print_gpg2_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
-    # Set a known locale, so that the output format of 'gpg2 --version'
-    # is at least somewhat predictable. The locale will automatically
-    # expire when the function goes out of scope, and the original locale
-    # will take effect again.
-    set -lx LC_ALL C
-
-    # sed script explained:
-    # in the line that matches "$argv:"
-    #   define label 'loop'
-    #   if the line ends with a ','
-    #       add next line to buffer
-    #       transliterate '\n' with ' '
-    #       goto loop
-    #   remove everything until the first ':' of the line
-    #   remove all blanks
-    #   transliterate ',' with '\n' (macOS apparently doesn't like '\n' on RHS of the s-command)
-    #   print result
-    #   sed script must be formatted with newlines instead of semicolons to be compatible
-    #   with BSD sed (eg, on macOS)
-    gpg2 --version | sed -ne "/$argv:/"'{:loop
-    /,$/{N; y!\n! !
-    b loop
-    }
-    s!^[^:]*:!!
-    s![ ]*!!g
-    y!,!\n!
-    p
-    }'
-end
-
-
-#
-# gpg2 subcommands
-#
-
-complete -c gpg2 -s s -l sign -d "Make a signature"
-complete -c gpg2 -l clearsign -d "Make a clear text signature"
-complete -c gpg2 -l clear-sign -d "Make a clear text signature"
-complete -c gpg2 -s b -l detach-sign -d "Make a detached signature"
-complete -c gpg2 -s e -l encrypt -d "Encrypt data"
-complete -c gpg2 -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
-complete -c gpg2 -l store -d "Store only (make a simple literal data packet)"
-complete -c gpg2 -l decrypt -d "Decrypt specified file or stdin"
-complete -c gpg2 -l verify -d "Assume specified file or stdin is sigfile and verify it"
-complete -c gpg2 -l multifile -d "Modify certain other commands to accept multiple files for processing"
-complete -c gpg2 -l verify-files -d "Identical to '--multifile --verify'"
-complete -c gpg2 -l encrypt-files -d "Identical to '--multifile --encrypt'"
-complete -c gpg2 -l decrypt-files -d "Identical to --multifile --decrypt"
-
-complete -c gpg2 -s k -l list-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg2 -l list-public-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the public keyrings, or just the ones given on the command line"
-complete -c gpg2 -s K -l list-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "List all keys from the secret keyrings, or just the ones given on the command line"
-complete -c gpg2 -l list-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-complete -c gpg2 -l list-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed too"
-
-complete -c gpg2 -l check-sigs -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg2 -l check-signatures -xa "(__fish_complete_gpg2_user_id)" -d "Same as --list-keys, but the signatures are listed and verified"
-complete -c gpg2 -l fingerprint -xa "(__fish_complete_gpg2_user_id)" -d "List all keys with their fingerprints"
-
-complete -c gpg2 -l gen-key -d "Generate a new key pair"
-complete -c gpg2 -l generate-key -d "Generate a new key pair"
-
-complete -c gpg2 -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg2_user_id)"
-
-complete -c gpg2 -l sign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key"
-complete -c gpg2 -l lsign-key -xa "(__fish_complete_gpg2_user_id)" -d "Sign a public key with your secret key but mark it as non exportable"
-
-complete -c gpg2 -l delete-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the public keyring"
-complete -c gpg2 -l delete-secret-key -xa "(__fish_complete_gpg2_user_id)" -d "Remove key from the secret and public keyring"
-complete -c gpg2 -l delete-secret-and-public-key -xa "(__fish_complete_gpg2_user_id)" -d "Same as --delete-key, but if a secret key exists, it will be removed first"
-
-complete -c gpg2 -l gen-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg2 -l generate-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a revocation certificate for the complete key"
-complete -c gpg2 -l desig-revoke -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
-complete -c gpg2 -l generate-designated-revocation -xa "(__fish_complete_gpg2_user_id)" -d "Generate a designated revocation certificate for a key"
-
-complete -c gpg2 -l export -xa "(__fish_complete_gpg2_user_id)" -d 'Export all or the given keys from all keyrings'
-complete -c gpg2 -l send-keys -xa "(__fish_complete_gpg2_key_id)" -d "Same as --export but sends the keys to a keyserver"
-complete -c gpg2 -l export-secret-keys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
-complete -c gpg2 -l export-secret-subkeys -xa "(__fish_complete_gpg2_user_id)" -d "Same as --export, but exports the secret keys instead"
-
-complete -c gpg2 -l import -d 'Import/merge keys'
-complete -c gpg2 -l fast-import -d 'Import/merge keys'
-
-complete -c gpg2 -l recv-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg2 -l receive-keys -xa "(__fish_complete_gpg2_key_id)" -d "Import the keys with the given key IDs from a keyserver"
-complete -c gpg2 -l refresh-keys -xa "(__fish_complete_gpg2_key_id)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
-complete -c gpg2 -l search-keys -xa "(__fish_complete_gpg2_user_id)" -d "Search the keyserver for the given names"
-
-complete -c gpg2 -l update-trustdb -d "Do trust database maintenance"
-complete -c gpg2 -l check-trustdb -d "Do trust database maintenance without user interaction"
-
-complete -c gpg2 -l export-ownertrust -d "Send the ownertrust values to stdout"
-complete -c gpg2 -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
-
-complete -c gpg2 -l rebuild-keydb-caches -d "Create signature caches in the keyring"
-
-complete -c gpg2 -l print-md -xa "(__fish_print_gpg2_algo Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
-complete -c gpg2 -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
-
-complete -c gpg2 -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
-
-complete -c gpg2 -l version -d "Display version and supported algorithms, and exit"
-complete -c gpg2 -l warranty -d "Display warranty and exit"
-complete -c gpg2 -s h -l help -d "Display help and exit"
-
-complete -c gpg2 -l passwd -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-complete -c gpg2 -l change-passphrase -xa "(__fish_complete_gpg2_user_id)" -d "Change the passphrase of the secret key belonging to the given user id"
-
-complete -c gpg2 -l edit-card -d "Present a menu to work with a smartcard"
-complete -c gpg2 -l card-edit -d "Present a menu to work with a smartcard"
-
-complete -c gpg2 -l locate-keys -d "Locate the keys given as arguments"
-complete -c gpg2 -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
-
-complete -c gpg2 -l quick-add-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly add a subkey to a key"
-complete -c gpg2 -l quick-add-uid -xa "(__fish_complete_gpg2_user_id)" -d "Adds a new user id to an existing key"
-complete -c gpg2 -l quick-generate-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
-complete -c gpg2 -l quick-gen-key -xa "(__fish_complete_gpg2_user_id)" -d "Generate a standard key without needing to answer prompts"
-complete -c gpg2 -l quick-sign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase"
-complete -c gpg2 -l quick-lsign-key -xa "(__fish_complete_gpg2_key_id)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
-complete -c gpg2 -l quick-revoke-uid -xa "(__fish_complete_gpg2_user_id)" -d "Revokes a user id on an existing key"
-complete -c gpg2 -l quick-set-expire -xa "(__fish_complete_gpg2_key_id)" -d "Set the expiration time of the specified key"
-complete -c gpg2 -l quick-set-primary-uid -xa "(__fish_complete_gpg2_user_id)" -d "Sets or updates the priary uid flag for the specified key"
-
-complete -c gpg2 -l show-keys -d "Take OpenPGP keys as input and print information about them"
-
-complete -c gpg2 -l full-gen-key -d "Generate a new key pair with dialogs for all options"
-complete -c gpg2 -l full-generate-key -d "Generate a new key pair with dialogs for all options"
-
-
-#
-# gpg2 options
-#
-
-complete -c gpg2 -l agent-program -d "Specify an agent program to be used for secret key operations"
-complete -c gpg2 -s a -l armor -d "Create ASCII armored output"
-complete -c gpg2 -s o -l output -r -d "Write output to specified file"
-
-complete -c gpg2 -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
-
-complete -c gpg2 -s u -l local-user -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the key to sign with"
-complete -c gpg2 -l default-key -xa "(__fish_complete_gpg2_user_id)" -d "Use specified key as the default key to sign with"
-
-complete -c gpg2 -s r -l recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id"
-complete -c gpg2 -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
-complete -c gpg2 -s R -l hidden-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Encrypt for specified user id, but hide the keyid of the key"
-complete -c gpg2 -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
-complete -c gpg2 -l default-recipient -xa "(__fish_complete_gpg2_user_id)" -d "Use specified user id as default recipient"
-complete -c gpg2 -l default-recipient-self -d "Use the default key as default recipient"
-complete -c gpg2 -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
-
-complete -c gpg2 -s v -l verbose -d "Give more information during processing"
-complete -c gpg2 -s q -l quiet -d "Quiet mode"
-
-complete -c gpg2 -s z -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
-complete -c gpg2 -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
-
-complete -c gpg2 -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-complete -c gpg2 -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
-
-complete -c gpg2 -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
-
-complete -c gpg2 -s i -l interactive -d "Prompt before overwrite"
-
-complete -c gpg2 -l batch -d "Batch mode"
-complete -c gpg2 -l no-batch -d "Don't use batch mode"
-complete -c gpg2 -l no-tty -d "Never write output to terminal"
-
-complete -c gpg2 -l yes -d "Assume yes on most questions"
-complete -c gpg2 -l no -d "Assume no on most questions"
-
-complete -c gpg2 -l ask-cert-level -d "Prompt for a certification level when making a key signature"
-complete -c gpg2 -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
-complete -c gpg2 -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
-complete -c gpg2 -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
-
-complete -c gpg2 -l trusted-key -xa "(__fish_complete_gpg2_key_id)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
-complete -c gpg2 -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
-
-complete -c gpg2 -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
-
-complete -c gpg2 -l keyserver -x -d "Use specified keyserver"
-complete -c gpg2 -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
-
-complete -c gpg2 -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
-complete -c gpg2 -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
-complete -c gpg2 -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
-complete -c gpg2 -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
-
-complete -c gpg2 -l photo-viewer -r -d "The command line that should be run to view a photo ID"
-complete -c gpg2 -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
-
-complete -c gpg2 -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
-complete -c gpg2 -l keyring -r -d "Add specified file to the current list of keyrings"
-
-complete -c gpg2 -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
-complete -c gpg2 -l primary-keyring -r -d "Designate specified file as the primary public keyring"
-
-complete -c gpg2 -l trustdb-name -r -d "Use specified file instead of the default trustdb"
-complete -c gpg2 -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
-complete -c gpg2 -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
-
-complete -c gpg2 -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
-complete -c gpg2 -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
-complete -c gpg2 -l options -r -d "Read options from specified file, do not read the default options file"
-complete -c gpg2 -l no-options -d "Shortcut for '--options /dev/null'"
-complete -c gpg2 -l load-extension -x -d "Load an extension module"
-
-complete -c gpg2 -l status-fd -x -d "Write special status strings to the specified file descriptor"
-complete -c gpg2 -l logger-fd -x -d "Write log output to the specified file descriptor"
-complete -c gpg2 -l logger-file -r -d "Write log output to the specified file"
-complete -c gpg2 -l log-file -r -d "Write log output to the specified file"
-complete -c gpg2 -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
-
-complete -c gpg2 -l sk-comments -d "Include secret key comment packets when exporting secret keys"
-complete -c gpg2 -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
-
-complete -c gpg2 -l comment -x -d "Use specified string as comment string"
-complete -c gpg2 -l no-comments -d "Don't use a comment string"
-
-complete -c gpg2 -l emit-version -d "Include the version string in ASCII armored output"
-complete -c gpg2 -l no-emit-version -d "Don't include the version string in ASCII armored output"
-
-complete -c gpg2 -l sig-notation -x
-complete -c gpg2 -l cert-notation -x
-
-complete -c gpg2 -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
-complete -c gpg2 -l sig-policy-url -x -d "Set signature policy"
-complete -c gpg2 -l cert-policy-url -x -d "Set certificate policy"
-complete -c gpg2 -l set-policy-url -x -d "Set signature and certificate policy"
-complete -c gpg2 -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
-
-complete -c gpg2 -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
-
-complete -c gpg2 -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
-complete -c gpg2 -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
-
-complete -c gpg2 -l use-embedded-filename -d "Create file with name as given in data"
-complete -c gpg2 -l no-use-embedded-filename -d "Don't create file with name as given in data"
-
-complete -c gpg2 -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
-complete -c gpg2 -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
-
-complete -c gpg2 -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
-
-complete -c gpg2 -l cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm"
-complete -c gpg2 -l digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm"
-complete -c gpg2 -l compress-algo -xa "(__fish_print_gpg2_algo Compression)" -d "Use specified compression algorithm"
-complete -c gpg2 -l cert-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified message digest algorithm when signing a key"
-complete -c gpg2 -l s2k-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Use specified cipher algorithm to protect secret keys"
-complete -c gpg2 -l s2k-digest-algo -xa "(__fish_print_gpg2_algo Hash)" -d "Use specified digest algorithm to mangle the passphrases"
-complete -c gpg2 -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
-
-complete -c gpg2 -l disable-cipher-algo -xa "(__fish_print_gpg2_algo Cipher)" -d "Never allow the use of specified cipher algorithm"
-complete -c gpg2 -l disable-pubkey-algo -xa "(__fish_print_gpg2_algo Pubkey)" -d "Never allow the use of specified public key algorithm"
-
-complete -c gpg2 -l no-sig-cache -d "Do not cache the verification status of key signatures"
-
-complete -c gpg2 -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
-complete -c gpg2 -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
-
-complete -c gpg2 -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
-complete -c gpg2 -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
-complete -c gpg2 -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
-
-complete -c gpg2 -l escape-from-lines -d "Mangle From-field of email headers (default)"
-complete -c gpg2 -l no-escape-from-lines -d "Do not mangle From-field of email headers"
-
-complete -c gpg2 -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
-complete -c gpg2 -l command-fd -x -d "Read user input from specified file descriptor"
-
-complete -c gpg2 -l use-agent -d "Try to use the GnuPG-Agent"
-complete -c gpg2 -l no-use-agent -d "Do not try to use the GnuPG-Agent"
-complete -c gpg2 -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
-
-complete -c gpg2 -l force-v3-sigs -d "Force v3 signatures for signatures on data"
-complete -c gpg2 -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
-
-complete -c gpg2 -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
-complete -c gpg2 -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
-
-complete -c gpg2 -l force-mdc -d "Force the use of encryption with a modification detection code"
-complete -c gpg2 -l disable-mdc -d "Disable the use of the modification detection code"
-
-complete -c gpg2 -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
-complete -c gpg2 -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
-
-complete -c gpg2 -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
-
-complete -c gpg2 -l ignore-time-conflict -d "Do not fail if signature is older than key"
-complete -c gpg2 -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
-complete -c gpg2 -l ignore-crc-error -d "Ignore CRC errors"
-complete -c gpg2 -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
-
-complete -c gpg2 -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
-complete -c gpg2 -l lock-multiple -d "Release the locks every time a lock is no longer needed"
-
-complete -c gpg2 -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
-complete -c gpg2 -l no-verbose -d "Reset verbose level to 0"
-complete -c gpg2 -l no-greeting -d "Suppress the initial copyright message"
-complete -c gpg2 -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
-complete -c gpg2 -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
-complete -c gpg2 -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
-
-complete -c gpg2 -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
-
-complete -c gpg2 -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
-complete -c gpg2 -l no-armor -d "Assume the input data is not in ASCII armored format"
-
-complete -c gpg2 -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
-
-complete -c gpg2 -l skip-verify -d "Skip the signature verification step"
-
-complete -c gpg2 -l with-colons -d "Print key listings delimited by colons"
-complete -c gpg2 -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
-complete -c gpg2 -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
-
-complete -c gpg2 -l fast-list-mode -d "Changes the output of the list commands to work faster"
-complete -c gpg2 -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
-
-complete -c gpg2 -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
-
-complete -c gpg2 -l show-session-key -d "Display the session key used for one message"
-complete -c gpg2 -l override-session-key -x -d "Don't use the public key but the specified session key"
-complete -c gpg2 -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
-
-complete -c gpg2 -l ask-sig-expire -d "Prompt for an expiration time"
-complete -c gpg2 -l no-ask-sig-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg2 -l ask-cert-expire -d "Prompt for an expiration time"
-complete -c gpg2 -l no-ask-cert-expire -d "Do not prompt for an expiration time"
-
-complete -c gpg2 -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
-complete -c gpg2 -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
-
-complete -c gpg2 -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
-complete -c gpg2 -l ungroup -d "Remove a given entry from the --group list"
-complete -c gpg2 -l no-groups -d "Remove all entries from the --group list"
-
-complete -c gpg2 -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
-
-complete -c gpg2 -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
-complete -c gpg2 -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
-complete -c gpg2 -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
-
-complete -c gpg2 -l default-preference-list -x -d "Set the list of default preferences to the specified string"
-complete -c gpg2 -l default-new-key-algo -x -d "Change the default algorothms for key generation"
-
-complete -c gpg2 -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
-
-complete -c gpg2 -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
-complete -c gpg2 -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
-complete -c gpg2 -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
-
-complete -c gpg2 -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-complete -c gpg2 -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
-
-complete -c gpg2 -l input-size-hint -r -d "Specify input size in bytes"
-
-complete -c gpg2 -l known-notation -r -d "Tell GnuPG about a critical signature notation"
-
-complete -c gpg2 -l key-origin -d "Track the origin of a key"
-complete -c gpg2 -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
-
-complete -c gpg2 -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
-complete -c gpg2 -l no-keyring -d "Do not use any keyring at all"
-complete -c gpg2 -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
-
-complete -c gpg2 -l skip-hidden-recipients -d "During decryption, skip all anonymous recipients"
-complete -c gpg2 -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
-
-complete -c gpg2 -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
-
-complete -c gpg2 -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
-
-complete -c gpg2 -l sender -xa "(__fish_complete_gpg2_user_id)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
-
-complete -c gpg2 -l list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
-
-complete -c gpg2 -l tofu-default-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy"
-complete -c gpg2 -l tofu-policy -xa "auto good unknown bad ask" -d "Set the default TOFU policy for the specified keys"
-
-complete -c gpg2 -l try-secret-key -xa "(__fish_complete_gpg2_key_id)" -d "Specify keys to be used for trial decryption"
-
-complete -c gpg2 -l with-icao-spelling -d "Print the ICAO spelling of the fingerprint in addition to the hex digits"
-complete -c gpg2 -l with-key-origin -d "Include the locally held information on the origin and last update of a key in a key listing"
-complete -c gpg2 -l with-keygrip -d "Include the keygrip in the key listings"
-complete -c gpg2 -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+__fish_complete_gpg gpg2
diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
new file mode 100644
index 000000000..4843d6de5
--- /dev/null
+++ b/share/functions/__fish_complete_gpg.fish
@@ -0,0 +1,366 @@
+#
+# Completions for the gpg program.
+#
+# This program accepts an rather large number of switches. It allows
+# you to do things like changing what file descriptor errors should be
+# written to, to make gpg use a different locale than the one
+# specified in the environment or to specify an alternative home
+# directory.
+
+# Switches related to debugging, switches whose use is not
+# recommended, switches whose behaviour is as of yet undefined,
+# switches for experimental features, switches to make gpg compliant
+# to legacy pgp-versions, dos-specific switches, switches meant for
+# the options file and deprecated or obsolete switches have all been
+# removed. The remaining list of completions is still quite
+# impressive.
+
+function __fish_complete_gpg -d "Internal function for gpg completion code deduplication" -a __fish_complete_gpg_command
+    if string match -q 'gpg (GnuPG) 1.*' ($__fish_complete_gpg_command --version)
+        complete -c $__fish_complete_gpg_command -l simple-sk-checksum -d 'Integrity protect secret keys by using a SHA-1 checksum'
+        complete -c $__fish_complete_gpg_command -l no-sig-create-check -d "Do not verify each signature right after creation"
+        complete -c $__fish_complete_gpg_command -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
+        complete -c $__fish_complete_gpg_command -l rfc1991 -d "Try to be more RFC-1991 compliant"
+    else
+        complete -c $__fish_complete_gpg_command -l no-keyring -d "Do not use any keyring at all"
+        complete -c $__fish_complete_gpg_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
+        complete -c $__fish_complete_gpg_command -l only-sign-text-ids -d "Exclude any non-text-based user ids from selection for signing"
+        complete -c $__fish_complete_gpg_command -l override-session-key-fd -x -d "Don't use the public key but the specified session key"
+        complete -c $__fish_complete_gpg_command -l passwd -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Change the passphrase of the secret key belonging to the given user id"
+        complete -c $__fish_complete_gpg_command -l pinentry-mode -xa "default ask cancel error loopback" -d "Set the pinentry mode"
+        complete -c $__fish_complete_gpg_command -l quick-add-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Directly add a subkey to a key"
+        complete -c $__fish_complete_gpg_command -l quick-add-uid -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Adds a new user id to an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-gen-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a standard key without needing to answer prompts"
+        complete -c $__fish_complete_gpg_command -l quick-generate-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a standard key without needing to answer prompts"
+        complete -c $__fish_complete_gpg_command -l quick-lsign-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Directly sign a key from the passphrase; marks signatures as non-exportable"
+        complete -c $__fish_complete_gpg_command -l quick-revoke-uid -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Revokes a user id on an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-revuid -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Revokes a user id on an existing key"
+        complete -c $__fish_complete_gpg_command -l quick-set-expire -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Set the expiration time of the specified key"
+        complete -c $__fish_complete_gpg_command -l quick-set-primary-uid -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Sets or updates the priary uid flag for the specified key"
+        complete -c $__fish_complete_gpg_command -l quick-sign-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Directly sign a key from the passphrase"
+        complete -c $__fish_complete_gpg_command -l receive-keys -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Import the keys with the given key IDs from a keyserver"
+        complete -c $__fish_complete_gpg_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
+        complete -c $__fish_complete_gpg_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
+        complete -c $__fish_complete_gpg_command -l sender -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+        complete -c $__fish_complete_gpg_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
+        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 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"
+        complete -c $__fish_complete_gpg_command -l with-keygrip -d "Include the keygrip in the key listings"
+        complete -c $__fish_complete_gpg_command -l with-secret -d "Include info about the presence of a secret key in public key listings done with --with-colons"
+        complete -c $__fish_complete_gpg_command -l no-symkey-cache -d "Disable the passphrase cache used for symmetrical en- and decryption"
+        complete -c $__fish_complete_gpg_command -l no-autostart -d "Do not start the gpg-agent or the dirmngr if it has not been started and its service is required"
+        complete -c $__fish_complete_gpg_command -l log-file -r -d "Write log output to the specified file"
+        complete -c $__fish_complete_gpg_command -l locate-keys -d "Locate the keys given as arguments"
+        complete -c $__fish_complete_gpg_command -l locate-external-keys -d "Locate they keys given as arguments; do not consider local keys"
+        complete -c $__fish_complete_gpg_command -l list-signatures -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 list-gcrypt-config -d "Display various internal configuration parameters of libgcrypt"
+        complete -c $__fish_complete_gpg_command -l known-notation -r -d "Tell GnuPG about a critical signature notation"
+        complete -c $__fish_complete_gpg_command -l key-origin -d "Track the origin of a key"
+        complete -c $__fish_complete_gpg_command -l input-size-hint -r -d "Specify input size in bytes"
+        complete -c $__fish_complete_gpg_command -s F -l hidden-recipient-file -r -d "Similar to --hidden-recipient, but encrypts to key stored in file instead"
+        complete -c $__fish_complete_gpg_command -l generate-revocation -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a revocation certificate for the complete key"
+        complete -c $__fish_complete_gpg_command -l generate-key -d "Generate a new key pair"
+        complete -c $__fish_complete_gpg_command -l generate-designated-revocation -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a designated revocation certificate for a key"
+        complete -c $__fish_complete_gpg_command -l full-gen-key -d "Generate a new key pair with dialogs for all options"
+        complete -c $__fish_complete_gpg_command -l full-generate-key -d "Generate a new key pair with dialogs for all options"
+        complete -c $__fish_complete_gpg_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+        complete -c $__fish_complete_gpg_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
+        complete -c $__fish_complete_gpg_command -l edit-card -d "Present a menu to work with a smartcard"
+        complete -c $__fish_complete_gpg_command -l card-edit -d "Present a menu to work with a smartcard"
+        complete -c $__fish_complete_gpg_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
+        complete -c $__fish_complete_gpg_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
+        complete -c $__fish_complete_gpg_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
+        complete -c $__fish_complete_gpg_command -l default-new-key-algo -x -d "Change the default algorothms for key generation"
+        complete -c $__fish_complete_gpg_command -l compliance -xa "gnupg openpgp rfc4880 rfc4880bis rfc2440 pgp6 pgp7 pgp8" -d "Set a compliance standard for GnuPG"
+        complete -c $__fish_complete_gpg_command -l change-passphrase -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Change the passphrase of the secret key belonging to the given user id"
+        complete -c $__fish_complete_gpg_command -l agent-program -d "Specify an agent program to be used for secret key operations"
+        complete -c $__fish_complete_gpg_command -l clear-sign -d "Make a clear text signature"
+    end
+
+    #
+    # gpg subcommands
+    #
+
+    complete -c $__fish_complete_gpg_command -s s -l sign -d "Make a signature"
+    complete -c $__fish_complete_gpg_command -l clearsign -d "Make a clear text signature"
+    complete -c $__fish_complete_gpg_command -s b -l detach-sign -d "Make a detached signature"
+    complete -c $__fish_complete_gpg_command -s e -l encrypt -d "Encrypt data"
+    complete -c $__fish_complete_gpg_command -s c -l symmetric -d "Encrypt with a symmetric cipher using a passphrase"
+    complete -c $__fish_complete_gpg_command -l store -d "Store only (make a simple literal data packet)"
+    complete -c $__fish_complete_gpg_command -l decrypt -d "Decrypt specified file or stdin"
+    complete -c $__fish_complete_gpg_command -l verify -d "Assume specified file or stdin is sigfile and verify it"
+    complete -c $__fish_complete_gpg_command -l multifile -d "Modify certain other commands to accept multiple files for processing"
+    complete -c $__fish_complete_gpg_command -l verify-files -d "Identical to '--multifile --verify'"
+    complete -c $__fish_complete_gpg_command -l encrypt-files -d "Identical to '--multifile --encrypt'"
+    complete -c $__fish_complete_gpg_command -l decrypt-files -d "Identical to --multifile --decrypt"
+
+    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 -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"
+    complete -c $__fish_complete_gpg_command -l check-signatures -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Same as --list-keys, but the signatures are listed and verified"
+    complete -c $__fish_complete_gpg_command -l fingerprint -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "List all keys with their fingerprints"
+
+    complete -c $__fish_complete_gpg_command -l gen-key -d "Generate a new key pair"
+
+    complete -c $__fish_complete_gpg_command -l edit-key -d "Present a menu which enables you to do all key related tasks" -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)"
+
+    complete -c $__fish_complete_gpg_command -l sign-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Sign a public key with your secret key"
+    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-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"
+    complete -c $__fish_complete_gpg_command -l desig-revoke -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Generate a designated revocation certificate for a key"
+
+    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 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-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'
+    complete -c $__fish_complete_gpg_command -l fast-import -d 'Import/merge keys'
+
+    complete -c $__fish_complete_gpg_command -l recv-keys -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Import the keys with the given key IDs from a keyserver"
+    complete -c $__fish_complete_gpg_command -l refresh-keys -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Request updates from a keyserver for keys that already exist on the local keyring"
+    complete -c $__fish_complete_gpg_command -l search-keys -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Search the keyserver for the given names"
+
+    complete -c $__fish_complete_gpg_command -l update-trustdb -d "Do trust database maintenance"
+    complete -c $__fish_complete_gpg_command -l check-trustdb -d "Do trust database maintenance without user interaction"
+
+    complete -c $__fish_complete_gpg_command -l export-ownertrust -d "Send the ownertrust values to stdout"
+    complete -c $__fish_complete_gpg_command -l import-ownertrust -d "Update the trustdb with the ownertrust values stored in specified files or stdin"
+
+    complete -c $__fish_complete_gpg_command -l rebuild-keydb-caches -d "Create signature caches in the keyring"
+
+    complete -c $__fish_complete_gpg_command -l print-md -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Hash)" -d "Print message digest of specified algorithm for all given files or stdin"
+    complete -c $__fish_complete_gpg_command -l print-mds -d "Print message digest of all algorithms for all given files or stdin"
+
+    complete -c $__fish_complete_gpg_command -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
+
+    complete -c $__fish_complete_gpg_command -l version -d "Display version and supported algorithms, and exit"
+    complete -c $__fish_complete_gpg_command -l warranty -d "Display warranty and exit"
+    complete -c $__fish_complete_gpg_command -s h -l help -d "Display help and exit"
+
+
+    #
+    # gpg options
+    #
+
+    complete -c $__fish_complete_gpg_command -s a -l armor -d "Create ASCII armored output"
+    complete -c $__fish_complete_gpg_command -s o -l output -r -d "Write output to specified file"
+
+    complete -c $__fish_complete_gpg_command -l max-output -d "Sets a limit on the number of bytes that will be generated when processing a file" -x
+
+    complete -c $__fish_complete_gpg_command -s u -l local-user -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Use specified key as the key to sign with"
+    complete -c $__fish_complete_gpg_command -l default-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Use specified key as the default key to sign with"
+
+    complete -c $__fish_complete_gpg_command -s r -l recipient -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Encrypt for specified user id"
+    complete -c $__fish_complete_gpg_command -s R -l hidden-recipient -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Encrypt for specified user id, but hide the keyid of the key"
+    complete -c $__fish_complete_gpg_command -l default-recipient -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Use specified user id as default recipient"
+    complete -c $__fish_complete_gpg_command -l default-recipient-self -d "Use the default key as default recipient"
+    complete -c $__fish_complete_gpg_command -l no-default-recipient -d "Reset --default-recipient and --default-recipient-self"
+
+    complete -c $__fish_complete_gpg_command -s v -l verbose -d "Give more information during processing"
+    complete -c $__fish_complete_gpg_command -s q -l quiet -d "Quiet mode"
+
+    complete -c $__fish_complete_gpg_command -s z -d "Compression level" -xa "(seq 1 9)"
+    complete -c $__fish_complete_gpg_command -l compress-level -d "Compression level" -xa "(seq 1 9)"
+    complete -c $__fish_complete_gpg_command -l bzip2-compress-level -d "Compression level" -xa "(seq 1 9)"
+    complete -c $__fish_complete_gpg_command -l bzip2-decompress-lowmem -d "Use a different decompression method for BZIP2 compressed files"
+
+    complete -c $__fish_complete_gpg_command -s t -l textmode -d "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+    complete -c $__fish_complete_gpg_command -l no-textmode -d "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
+
+    complete -c $__fish_complete_gpg_command -s n -l dry-run -d "Don't make any changes (this is not completely implemented)"
+
+    complete -c $__fish_complete_gpg_command -s i -l interactive -d "Prompt before overwrite"
+
+    complete -c $__fish_complete_gpg_command -l batch -d "Batch mode"
+    complete -c $__fish_complete_gpg_command -l no-batch -d "Don't use batch mode"
+    complete -c $__fish_complete_gpg_command -l no-tty -d "Never write output to terminal"
+
+    complete -c $__fish_complete_gpg_command -l yes -d "Assume yes on most questions"
+    complete -c $__fish_complete_gpg_command -l no -d "Assume no on most questions"
+
+    complete -c $__fish_complete_gpg_command -l ask-cert-level -d "Prompt for a certification level when making a key signature"
+    complete -c $__fish_complete_gpg_command -l no-ask-cert-level -d "Don't prompt for a certification level when making a key signature"
+    complete -c $__fish_complete_gpg_command -l default-cert-level -xa "0\t'Not verified' 1\t'Not verified' 2\t'Caual verification' 3\t'Extensive verification'" -d "The default certification level to use for the level check when signing a key"
+    complete -c $__fish_complete_gpg_command -l min-cert-level -xa "0 1 2 3" -d "Disregard any signatures with a certification level below specified level when building the trust database"
+
+    complete -c $__fish_complete_gpg_command -l trusted-key -xa "(__fish_complete_gpg_key_id $__fish_complete_gpg_command)" -d "Assume that the specified key is as trustworthy as one of your own secret keys"
+    complete -c $__fish_complete_gpg_command -l trust-model -xa "pgp classic direct always" -d "Specify trust model"
+
+    complete -c $__fish_complete_gpg_command -l keyid-format -xa "short 0xshort long 0xlong" -d "Select how to display key IDs"
+
+    complete -c $__fish_complete_gpg_command -l keyserver -x -d "Use specified keyserver"
+    complete -c $__fish_complete_gpg_command -l keyserver-options -xa "(__fish_append , include-revoked include-disabled honor-keyserver-url include-subkeys use-temp-files keep-temp-files verbose timeout http-proxy auto-key-retrieve)" -d "Options for the keyserver"
+
+    complete -c $__fish_complete_gpg_command -l import-options -xa "(__fish_append , import-local-sigs repair-pks-subkey-bug merge-only)" -d "Options for importing keys"
+    complete -c $__fish_complete_gpg_command -l export-options -xa "(__fish_append , export-local-sigs export-attributes export-sensitive-revkeys export-minimal)" -d "Options for exporting keys"
+    complete -c $__fish_complete_gpg_command -l list-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids show-unusable-subkeys show-keyring show-sig-expire show-sig-subpackets )" -d "Options for listing keys and signatures"
+    complete -c $__fish_complete_gpg_command -l verify-options -xa "(__fish_append , show-photos show-policy-urls show-notations show-std-notations show-user-notations show-keyserver-urls show-uid-validity show-unusable-uids)" -d "Options for verifying signatures"
+
+    complete -c $__fish_complete_gpg_command -l photo-viewer -r -d "The command line that should be run to view a photo ID"
+    complete -c $__fish_complete_gpg_command -l exec-path -r -d "Sets a list of directories to search for photo viewers and keyserver helpers"
+
+    complete -c $__fish_complete_gpg_command -l show-keyring -d "Display the keyring name at the head of key listings to show which keyring a given key resides on"
+    complete -c $__fish_complete_gpg_command -l keyring -r -d "Add specified file to the current list of keyrings"
+
+    complete -c $__fish_complete_gpg_command -l secret-keyring -r -d "Add specified file to the current list of secret keyrings"
+    complete -c $__fish_complete_gpg_command -l primary-keyring -r -d "Designate specified file as the primary public keyring"
+
+    complete -c $__fish_complete_gpg_command -l trustdb-name -r -d "Use specified file instead of the default trustdb"
+    complete -c $__fish_complete_gpg_command -l homedir -xa "(__fish_complete_directories (commandline -ct))" -d "Set the home directory"
+    complete -c $__fish_complete_gpg_command -l display-charset -xa " iso-8859-1 iso-8859-2 iso-8859-15 koi8-r utf-8 " -d "Set the native character set"
+
+    complete -c $__fish_complete_gpg_command -l utf8-strings -d "Assume that following command line arguments are given in UTF8"
+    complete -c $__fish_complete_gpg_command -l no-utf8-strings -d "Assume that following arguments are encoded in the character set specified by --display-charset"
+    complete -c $__fish_complete_gpg_command -l options -r -d "Read options from specified file, do not read the default options file"
+    complete -c $__fish_complete_gpg_command -l no-options -d "Shortcut for '--options /dev/null'"
+    complete -c $__fish_complete_gpg_command -l load-extension -x -d "Load an extension module"
+
+    complete -c $__fish_complete_gpg_command -l status-fd -x -d "Write special status strings to the specified file descriptor"
+    complete -c $__fish_complete_gpg_command -l logger-fd -x -d "Write log output to the specified file descriptor"
+    complete -c $__fish_complete_gpg_command -l logger-file -r -d "Write log output to the specified file"
+    complete -c $__fish_complete_gpg_command -l attribute-fd -d "Write attribute subpackets to the specified file descriptor"
+
+    complete -c $__fish_complete_gpg_command -l sk-comments -d "Include secret key comment packets when exporting secret keys"
+    complete -c $__fish_complete_gpg_command -l no-sk-comments -d "Don't include secret key comment packets when exporting secret keys"
+
+    complete -c $__fish_complete_gpg_command -l comment -x -d "Use specified string as comment string"
+    complete -c $__fish_complete_gpg_command -l no-comments -d "Don't use a comment string"
+
+    complete -c $__fish_complete_gpg_command -l emit-version -d "Include the version string in ASCII armored output"
+    complete -c $__fish_complete_gpg_command -l no-emit-version -d "Don't include the version string in ASCII armored output"
+
+    complete -c $__fish_complete_gpg_command -l sig-notation -x
+    complete -c $__fish_complete_gpg_command -l cert-notation -x
+
+    complete -c $__fish_complete_gpg_command -s N -l set-notation -x -d "Put the specified name value pair into the signature as notation data"
+    complete -c $__fish_complete_gpg_command -l sig-policy-url -x -d "Set signature policy"
+    complete -c $__fish_complete_gpg_command -l cert-policy-url -x -d "Set certificate policy"
+    complete -c $__fish_complete_gpg_command -l set-policy-url -x -d "Set signature and certificate policy"
+    complete -c $__fish_complete_gpg_command -l sig-keyserver-url -x -d "Use specified URL as a preferred keyserver for data signatures"
+
+    complete -c $__fish_complete_gpg_command -l set-filename -x -d "Use specified string as the filename which is stored inside messages"
+
+    complete -c $__fish_complete_gpg_command -l for-your-eyes-only -d "Set the 'for your eyes only' flag in the message"
+    complete -c $__fish_complete_gpg_command -l no-for-your-eyes-only -d "Clear the 'for your eyes only' flag in the message"
+
+    complete -c $__fish_complete_gpg_command -l use-embedded-filename -d "Create file with name as given in data"
+    complete -c $__fish_complete_gpg_command -l no-use-embedded-filename -d "Don't create file with name as given in data"
+
+    complete -c $__fish_complete_gpg_command -l completes-needed -x -d "Number of completely trusted users to introduce a new key signer (defaults to 1)"
+    complete -c $__fish_complete_gpg_command -l marginals-needed -x -d "Number of marginally trusted users to introduce a new key signer (defaults to 3)"
+
+    complete -c $__fish_complete_gpg_command -l max-cert-depth -x -d "Maximum depth of a certification chain (default is 5)"
+
+    complete -c $__fish_complete_gpg_command -l cipher-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Cipher)" -d "Use specified cipher algorithm"
+    complete -c $__fish_complete_gpg_command -l digest-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Hash)" -d "Use specified message digest algorithm"
+    complete -c $__fish_complete_gpg_command -l compress-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Compression)" -d "Use specified compression algorithm"
+    complete -c $__fish_complete_gpg_command -l cert-digest-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Hash)" -d "Use specified message digest algorithm when signing a key"
+    complete -c $__fish_complete_gpg_command -l s2k-cipher-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Cipher)" -d "Use specified cipher algorithm to protect secret keys"
+    complete -c $__fish_complete_gpg_command -l s2k-digest-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Hash)" -d "Use specified digest algorithm to mangle the passphrases"
+    complete -c $__fish_complete_gpg_command -l s2k-mode -xa "0\t'Plain passphrase' 1\t'Salted passphrase' 3\t'Repeated salted mangling'" -d "Selects how passphrases are mangled"
+
+    complete -c $__fish_complete_gpg_command -l disable-cipher-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Cipher)" -d "Never allow the use of specified cipher algorithm"
+    complete -c $__fish_complete_gpg_command -l disable-pubkey-algo -xa "(__fish_print_gpg_algo $__fish_complete_gpg_command Pubkey)" -d "Never allow the use of specified public key algorithm"
+
+    complete -c $__fish_complete_gpg_command -l no-sig-cache -d "Do not cache the verification status of key signatures"
+
+    complete -c $__fish_complete_gpg_command -l auto-check-trustdb -d "Automatically run the --check-trustdb command internally when needed"
+    complete -c $__fish_complete_gpg_command -l no-auto-check-trustdb -d "Never automatically run the --check-trustdb"
+
+    complete -c $__fish_complete_gpg_command -l throw-keyids -d "Do not put the recipient keyid into encrypted packets"
+    complete -c $__fish_complete_gpg_command -l no-throw-keyids -d "Put the recipient keyid into encrypted packets"
+    complete -c $__fish_complete_gpg_command -l not-dash-escaped -d "Change the behavior of cleartext signatures so that they can be used for patch files"
+
+    complete -c $__fish_complete_gpg_command -l escape-from-lines -d "Mangle From-field of email headers (default)"
+    complete -c $__fish_complete_gpg_command -l no-escape-from-lines -d "Do not mangle From-field of email headers"
+
+    complete -c $__fish_complete_gpg_command -l passphrase-fd -x -d "Read passphrase from specified file descriptor"
+    complete -c $__fish_complete_gpg_command -l command-fd -x -d "Read user input from specified file descriptor"
+
+    complete -c $__fish_complete_gpg_command -l use-agent -d "Try to use the GnuPG-Agent"
+    complete -c $__fish_complete_gpg_command -l no-use-agent -d "Do not try to use the GnuPG-Agent"
+    complete -c $__fish_complete_gpg_command -l gpg-agent-info -x -d "Override value of GPG_AGENT_INFO environment variable"
+
+    complete -c $__fish_complete_gpg_command -l force-v3-sigs -d "Force v3 signatures for signatures on data"
+    complete -c $__fish_complete_gpg_command -l no-force-v3-sigs -d "Do not force v3 signatures for signatures on data"
+
+    complete -c $__fish_complete_gpg_command -l force-v4-certs -d "Always use v4 key signatures even on v3 keys"
+    complete -c $__fish_complete_gpg_command -l no-force-v4-certs -d "Don't use v4 key signatures on v3 keys"
+
+    complete -c $__fish_complete_gpg_command -l force-mdc -d "Force the use of encryption with a modification detection code"
+    complete -c $__fish_complete_gpg_command -l disable-mdc -d "Disable the use of the modification detection code"
+
+    complete -c $__fish_complete_gpg_command -l allow-non-selfsigned-uid -d "Allow the import and use of keys with user IDs which are not self-signed"
+    complete -c $__fish_complete_gpg_command -l no-allow-non-selfsigned-uid -d "Do not allow the import and use of keys with user IDs which are not self-signed"
+
+    complete -c $__fish_complete_gpg_command -l allow-freeform-uid -d "Disable all checks on the form of the user ID while generating a new one"
+
+    complete -c $__fish_complete_gpg_command -l ignore-time-conflict -d "Do not fail if signature is older than key"
+    complete -c $__fish_complete_gpg_command -l ignore-valid-from -d "Allow subkeys that have a timestamp from the future"
+    complete -c $__fish_complete_gpg_command -l ignore-crc-error -d "Ignore CRC errors"
+    complete -c $__fish_complete_gpg_command -l ignore-mdc-error -d "Do not fail on MDC integrity protection failure"
+
+    complete -c $__fish_complete_gpg_command -l lock-once -d "Lock the databases the first time a lock is requested and do not release the lock until the process terminates"
+    complete -c $__fish_complete_gpg_command -l lock-multiple -d "Release the locks every time a lock is no longer needed"
+
+    complete -c $__fish_complete_gpg_command -l no-random-seed-file -d "Do not create an internal pool file for quicker generation of random numbers"
+    complete -c $__fish_complete_gpg_command -l no-verbose -d "Reset verbose level to 0"
+    complete -c $__fish_complete_gpg_command -l no-greeting -d "Suppress the initial copyright message"
+    complete -c $__fish_complete_gpg_command -l no-secmem-warning -d "Suppress the warning about 'using insecure memory'"
+    complete -c $__fish_complete_gpg_command -l no-permission-warning -d "Suppress the warning about unsafe file and home directory (--homedir) permissions"
+    complete -c $__fish_complete_gpg_command -l no-mdc-warning -d "Suppress the warning about missing MDC integrity protection"
+
+    complete -c $__fish_complete_gpg_command -l require-secmem -d "Refuse to run if GnuPG cannot get secure memory"
+
+    complete -c $__fish_complete_gpg_command -l no-require-secmem -d "Do not refuse to run if GnuPG cannot get secure memory (default)"
+    complete -c $__fish_complete_gpg_command -l no-armor -d "Assume the input data is not in ASCII armored format"
+
+    complete -c $__fish_complete_gpg_command -l no-default-keyring -d "Do not add the default keyrings to the list of keyrings"
+
+    complete -c $__fish_complete_gpg_command -l skip-verify -d "Skip the signature verification step"
+
+    complete -c $__fish_complete_gpg_command -l with-colons -d "Print key listings delimited by colons"
+    complete -c $__fish_complete_gpg_command -l with-key-data -d "Print key listings delimited by colons (like --with-colons) and print the public key data"
+    complete -c $__fish_complete_gpg_command -l with-fingerprint -d "Same as the command --fingerprint but changes only the format of the output and may be used together with another command"
+
+    complete -c $__fish_complete_gpg_command -l fast-list-mode -d "Changes the output of the list commands to work faster"
+    complete -c $__fish_complete_gpg_command -l fixed-list-mode -d "Do not merge primary user ID and primary key in --with-colon listing mode and print all timestamps as UNIX timestamps"
+
+    complete -c $__fish_complete_gpg_command -l list-only -d "Changes the behaviour of some commands. This is like --dry-run but different"
+
+    complete -c $__fish_complete_gpg_command -l show-session-key -d "Display the session key used for one message"
+    complete -c $__fish_complete_gpg_command -l ask-sig-expire -d "Prompt for an expiration time"
+    complete -c $__fish_complete_gpg_command -l no-ask-sig-expire -d "Do not prompt for an expiration time"
+
+    complete -c $__fish_complete_gpg_command -l ask-cert-expire -d "Prompt for an expiration time"
+    complete -c $__fish_complete_gpg_command -l no-ask-cert-expire -d "Do not prompt for an expiration time"
+
+    complete -c $__fish_complete_gpg_command -l try-all-secrets -d "Don't look at the key ID as stored in the message but try all secret keys in turn to find the right decryption key"
+    complete -c $__fish_complete_gpg_command -l enable-special-filenames -d "Enable a mode in which filenames of the form -&n, where n is a non-negative decimal number, refer to the file descriptor n and not to a file with that name"
+
+    complete -c $__fish_complete_gpg_command -l group -x -d "Sets up a named group, which is similar to aliases in email programs"
+    complete -c $__fish_complete_gpg_command -l ungroup -d "Remove a given entry from the --group list"
+    complete -c $__fish_complete_gpg_command -l no-groups -d "Remove all entries from the --group list"
+
+    complete -c $__fish_complete_gpg_command -l preserve-permissions -d "Don't change the permissions of a secret keyring back to user read/write only"
+
+    complete -c $__fish_complete_gpg_command -l personal-cipher-preferences -x -d "Set the list of personal cipher preferences to the specified string"
+    complete -c $__fish_complete_gpg_command -l personal-digest-preferences -x -d "Set the list of personal digest preferences to the specified string"
+    complete -c $__fish_complete_gpg_command -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
+
+    complete -c $__fish_complete_gpg_command -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+end
diff --git a/share/functions/__fish_complete_gpg_key_id.fish b/share/functions/__fish_complete_gpg_key_id.fish
new file mode 100644
index 000000000..3fe4fa8f0
--- /dev/null
+++ b/share/functions/__fish_complete_gpg_key_id.fish
@@ -0,0 +1,17 @@
+# 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
+    # Use user id as description
+    set -l keyid
+    $__fish_complete_gpg_command --list-keys --with-colons | while read garbage
+        switch $garbage
+            # Extract user ids
+            case "uid*"
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
+                printf "%s\t%s\n" $keyid $uid
+            # Extract key fingerprints (no subkeys)
+            case "pub*"
+                echo $garbage | cut -d ":" -f 5 | read keyid
+        end
+    end
+end
diff --git a/share/functions/__fish_complete_gpg_user_id.fish b/share/functions/__fish_complete_gpg_user_id.fish
new file mode 100644
index 000000000..0bc95b171
--- /dev/null
+++ b/share/functions/__fish_complete_gpg_user_id.fish
@@ -0,0 +1,9 @@
+# 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
+    # 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 colons with \x3a
+    $__fish_complete_gpg_command --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
+end
diff --git a/share/functions/__fish_print_gpg_algo.fish b/share/functions/__fish_print_gpg_algo.fish
new file mode 100644
index 000000000..445e19c6a
--- /dev/null
+++ b/share/functions/__fish_print_gpg_algo.fish
@@ -0,0 +1,30 @@
+# Helper function for contextual autocompletion of GPG crypto algorithm options
+
+function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[2] supported by gpg. argv[2] is a regexp" -a __fish_complete_gpg_command
+    # Set a known locale, so that the output format of 'gpg --version'
+    # is at least somewhat predictable. The locale will automatically
+    # expire when the function goes out of scope, and the original locale
+    # will take effect again.
+    set -lx LC_ALL C
+
+    # sed script explained:
+    # in the line that matches "$argv:"
+    # 	define label 'loop'
+    # 	if the line ends with a ','
+    # 		add next line to buffer
+    #		transliterate '\n' with ' '
+    #		goto loop
+    # 	remove everything until the first ':' of the line
+    # 	remove all blanks
+    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    # 	print result
+    $__fish_complete_gpg_command --version | sed -ne "/$argv[2]:/"'{:loop
+    /,$/{N; y!\n! !
+    b loop
+    }
+    s!^[^:]*:!!
+    s![ ]*!!g
+    y!,!\n!
+    p
+    }'
+end

From ba56a2ec0eb9a04afe947bd7e5360f19fc7d12c2 Mon Sep 17 00:00:00 2001
From: Amy Grace <zgracem@users.noreply.github.com>
Date: Tue, 29 Oct 2019 12:11:25 -0600
Subject: [PATCH 1145/1732] Add completions for `irb` (#6260)

---
 CHANGELOG.md               |  1 +
 share/completions/irb.fish | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 share/completions/irb.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08a6ab856..d05072e29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@
   - `gpg2` (#6062)
   - `grub-mkrescue` (#6182)
   - `hledger` (#6043)
+  - `irb` (#6260)
   - `iw` (#6232)
   - `kak`
   - `mariner` (#5718)
diff --git a/share/completions/irb.fish b/share/completions/irb.fish
new file mode 100644
index 000000000..bed177a8b
--- /dev/null
+++ b/share/completions/irb.fish
@@ -0,0 +1,31 @@
+# irb (interactive ruby)
+
+complete -c irb -s f -d "Suppresses read of ~/.irbrc"
+complete -c irb -s d -d "Set \$DEBUG to true"
+complete -c irb -s r -f -d "Load LIB using require"
+complete -c irb -s I -xa "(__fish_complete_directories)" -d "Specify \$LOAD_PATH directory"
+complete -c irb -s U -d "Same as 'ruby -U'"
+complete -c irb -s E -l encoding -d "Specify default text encoding"
+complete -c irb -s w -d "Turn on warnings'"
+complete -c irb -s W -xa '0 1 2' -d "Set warning level"
+complete -c irb -l context-mode -xa '0 1 2 3' -d "Create Binding Object"
+complete -c irb -l echo -d "Show result"
+complete -c irb -l noecho -d "Don't show result"
+complete -c irb -l inspect -d "Use 'inspect' for output"
+complete -c irb -l noinspect -d "Don't use 'inspect' for output"
+complete -c irb -l readline -d "Use Readline extension module"
+complete -c irb -l noreadline -d "Don't use Readline extension module"
+complete -c irb -l prompt -xa "default simple xmp inf-ruby" -d "Switch prompt mode"
+complete -c irb -l prompt-mode -xa "default simple xmp inf-ruby" -d "Switch prompt mode"
+complete -c irb -l inf-ruby-mode -d "Use prompt for emacs inf-ruby-mode"
+complete -c irb -l sample-book-mode -d "Simple prompt mode"
+complete -c irb -l simple-prompt -d "Simple prompt mode"
+complete -c irb -l noprompt -d "No prompt mode"
+complete -c irb -l single-irb -d "Share self with sub-irb"
+complete -c irb -l tracer -d "Displays trace for each execution of commands"
+complete -c irb -l back-trace-limit -x -d "Displays backtrace, top N and tail N"
+complete -c irb -l irb_debug -x -d "Sets internal debug level to N"
+complete -c irb -l verbose -d "Show details"
+complete -c irb -l noverbose -d "Don't show details"
+complete -c irb -s v -l version -d "Print the version of irb"
+complete -c irb -s h -l help -d "Print a summary of options"

From 4095247debd2e2f726f811b9d2365f42e1f8a618 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 20 Oct 2019 21:07:26 +0200
Subject: [PATCH 1146/1732] completions/git: some improvements

---
 share/completions/git.fish             | 16 ++++++++--------
 share/functions/__fish_any_arg_in.fish |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 share/functions/__fish_any_arg_in.fish

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 79023c5b5..fccdd0ad9 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -729,14 +729,14 @@ 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'
 complete -x -c git -n '__fish_git_needs_command' -s C -a '(__fish_complete_directories)' -d 'Run as if git was started in this directory'
 complete -x -c git -n '__fish_git_needs_command' -s c -a '(command git config -l 2>/dev/null | string replace = \t)' -d 'Set a configuration option'
-complete -x -c git -n '__fish_git_needs_command' -l exec-path -a '(__fish_git_complete_directories)' -d 'Get or set the path to the git programs'
+complete -x -c git -n '__fish_git_needs_command' -l exec-path -a '(__fish_complete_directories)' -d 'Get or set the path to the git programs'
 complete -f -c git -n '__fish_git_needs_command' -l html-path -d 'Print the path to the html documentation'
 complete -f -c git -n '__fish_git_needs_command' -l man-path -d 'Print the path to the man documentation'
 complete -f -c git -n '__fish_git_needs_command' -l info-path -d 'Print the path to the info documentation'
 complete -f -c git -n '__fish_git_needs_command' -s p -l paginate -d 'Pipe output into a pager'
 complete -f -c git -n '__fish_git_needs_command' -l no-pager -d 'Do not pipe output into a pager'
-complete -f -c git -n '__fish_git_needs_command' -l git-dir -d 'Set the path to the repository'
-complete -f -c git -n '__fish_git_needs_command' -l work-tree -d 'Set the path to the working tree'
+complete -r -c git -n '__fish_git_needs_command' -l git-dir -d 'Set the path to the repository'
+complete -r -c git -n '__fish_git_needs_command' -l work-tree -d 'Set the path to the working tree'
 complete -f -c git -n '__fish_git_needs_command' -l namespace -d 'Set the namespace'
 complete -f -c git -n '__fish_git_needs_command' -l bare -d 'Treat the repository as bare'
 complete -f -c git -n '__fish_git_needs_command' -l no-replace-objects -d 'Do not use replacement refs to replace git objects'
@@ -1588,15 +1588,15 @@ complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcom
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -l lock -d 'Lock working tree after creation'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from add' -s q -l quiet -d 'Suppress feedback messages'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from list' -l porcelain -d 'Output in an easy-to-parse format for scripts'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -a '(__fish_git_complete_worktrees)'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from lock' -l reason -d 'An explanation why the working tree is locked'
-complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move' -a '(__fish_git_complete_worktrees)'
-complete -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move; and not __fish_any_arg_in (__fish_git_complete_worktrees)' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
+complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from move; and __fish_any_arg_in (__fish_git_complete_worktrees)' -a '(__fish_complete_directories)'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s n -l dry-run -d 'Do not remove anything'
 complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -s v -l verbose -d 'Report all removals'
 complete -x -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from prune' -l expire -d 'Only expire unused working trees older than <time>'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from remove' -a '(__fish_git_complete_worktrees)'
-complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from unlock' -a '(__fish_git_complete_worktrees)'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from remove' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
+complete -f -c git -n '__fish_git_using_command worktree; and __fish_seen_subcommand_from unlock' -a '(__fish_git_complete_worktrees)' -d 'Worktree'
 
 ### stash
 complete -c git -n '__fish_git_needs_command' -a stash -d 'Stash away changes'
diff --git a/share/functions/__fish_any_arg_in.fish b/share/functions/__fish_any_arg_in.fish
new file mode 100644
index 000000000..53ba903d2
--- /dev/null
+++ b/share/functions/__fish_any_arg_in.fish
@@ -0,0 +1,9 @@
+# returns 0 only if any argument is on of the supplied arguments
+function __fish_any_arg_in
+    set -l haystack $argv
+    for arg in (commandline -opc)
+        contains -- $arg $haystack
+        and return 0
+    end
+    return 1
+end

From f4b4ff63b97fbdcb1da6e66ba6ccfffeda8ed70c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 20 Oct 2019 21:15:28 +0200
Subject: [PATCH 1147/1732] completions/git: honor global git arguments like
 --git-dir

Fixes #6219
---
 share/completions/git.fish | 72 ++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index fccdd0ad9..9650f0045 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1,5 +1,30 @@
 # fish completion for git
-# Use 'command git' to avoid interactions for aliases from git to (e.g.) hub
+
+# Use this instead of calling git directly; it passes the commands that are
+# already present on the commandline to git. This is relevant for --work-tree etc, see issue #6219.
+function __fish_git
+    set -l saved_args $argv
+    set -l global_args
+    set -l cmd (commandline -opc)
+    # We assume that git is the first command until we have a better awareness of subcommands, see #2705.
+    set -e cmd[1]
+    if argparse -s (__fish_git_global_optspecs) -- $cmd 2>/dev/null
+        # All arguments that were parsed by argparse are global git options.
+        set -l num_global_args (math (count $cmd) - (count $argv))
+        if test $num_global_args -ne 0
+            set global_args $cmd[1..$num_global_args]
+        end
+    end
+    # Using 'command git' to avoid interactions for aliases from git to (e.g.) hub
+    command git $global_args $saved_args
+end
+
+# Print an optspec for argparse to handle git's options that are independent of any subcommand.
+function __fish_git_global_optspecs
+    string join \n v-version h/help C= c=+ 'e-exec-path=?' H-html-path M-man-path I-info-path p/paginate \
+    P/no-pager o-no-replace-objects b-bare G-git-dir= W-work-tree= N-namespace= S-super-prefix= \
+    l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs
+end
 
 function __fish_git_commits
     # Complete commits with their subject line as the description
@@ -13,7 +38,7 @@ function __fish_git_commits
     # that happens for 3 commits out of 600k.
     # For fish, at the time of writing, out of 12200 commits, 7 commits need 8 characters.
     # And since this takes about 1/3rd of the time that disambiguating takes...
-    command git log --pretty=tformat:"%H"\t"%<(64,trunc)%s" --all --max-count=1000 2>/dev/null \
+    __fish_git log --pretty=tformat:"%H"\t"%<(64,trunc)%s" --all --max-count=1000 2>/dev/null \
         | string replace -r '^([0-9a-f]{10})[0-9a-f]*\t(.*)' '$1\t$2'
 end
 
@@ -21,19 +46,19 @@ function __fish_git_recent_commits
     # Like __fish_git_commits, but not on all branches and limited to
     # the last 50 commits. Used for fixup, where only the current branch
     # and the latest commits make sense.
-    command git log --pretty=tformat:"%h"\t"%<(64,trunc)%s" --max-count=50 2>/dev/null
+    __fish_git log --pretty=tformat:"%h"\t"%<(64,trunc)%s" --max-count=50 2>/dev/null
 end
 
 function __fish_git_branches
     # This is much faster than using `git branch`,
     # and avoids having to deal with localized "detached HEAD" messages.
-    command git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null \
+    __fish_git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null \
         | string replace -r '^refs/heads/(.*)$' '$1\tLocal Branch' \
         | string replace -r '^refs/remotes/(.*)$' '$1\tRemote Branch'
 end
 
 function __fish_git_local_branches
-    command git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null \
+    __fish_git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null \
         | string replace -rf '^refs/heads/(.*)$' '$1\tLocal Branch'
 end
 
@@ -42,18 +67,18 @@ function __fish_git_unique_remote_branches
     # if they are unambiguous.
     # E.g. if only alice has a "frobulate" branch
     # `git checkout frobulate` is equivalent to `git checkout -b frobulate --track alice/frobulate`.
-    command git for-each-ref --format="%(refname:strip=3)" \
+    __fish_git for-each-ref --format="%(refname:strip=3)" \
         --sort="refname:strip=3" \
         "refs/remotes/*/$match*" "refs/remotes/*/*/**" 2>/dev/null | \
         uniq -u
 end
 
 function __fish_git_tags
-    command git tag --sort=-creatordate 2>/dev/null
+    __fish_git tag --sort=-creatordate 2>/dev/null
 end
 
 function __fish_git_heads
-    set -l gitdir (command git rev-parse --git-dir 2>/dev/null)
+    set -l gitdir (__fish_git rev-parse --git-dir 2>/dev/null)
     or return # No git dir, no need to even test.
     for head in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD
         if test -f $gitdir/$head
@@ -69,7 +94,7 @@ function __fish_git_refs
 end
 
 function __fish_git_remotes
-    command git remote 2>/dev/null
+    __fish_git remote 2>/dev/null
 end
 
 function __fish_git_files
@@ -90,7 +115,7 @@ function __fish_git_files
     # to get _all_ kinds of staged files.
 
     # Save the repo root to remove it from the path later.
-    set -l root (command git rev-parse --show-toplevel --is-bare-repository 2>/dev/null)
+    set -l root (__fish_git rev-parse --show-toplevel --is-bare-repository 2>/dev/null)
     or return
 
     # Skip bare repositories.
@@ -152,10 +177,10 @@ function __fish_git_files
 
     # We pick the v2 format if we can, because it shows relative filenames (if used without "-z").
     # We fall back on the v1 format by reading git's _version_, because trying v2 first is too slow.
-    set -l ver (command git --version | string replace -rf 'git version (\d+)\.(\d+)\.?.*' '$1\n$2')
+    set -l ver (__fish_git --version | string replace -rf 'git version (\d+)\.(\d+)\.?.*' '$1\n$2')
     # Version >= 2.11.* has the v2 format.
     if test "$ver[1]" -gt 2 2>/dev/null; or test "$ver[1]" -eq 2 -a "$ver[2]" -ge 11 2>/dev/null
-        command git $git_opt status --porcelain=2 $status_opt \
+        __fish_git $git_opt status --porcelain=2 $status_opt \
             | while read -la -d ' ' line
             set -l file
             set -l desc
@@ -312,7 +337,7 @@ function __fish_git_files
         set -l previous
         # Note that we can't use space as a delimiter between status and filename, because
         # the status can contain spaces - " M" is different from "M ".
-        command git $git_opt status --porcelain -z $status_opt \
+        __fish_git $git_opt status --porcelain -z $status_opt \
             | while read -lz line
             set -l desc
             # The entire line is the "from" from a rename.
@@ -499,16 +524,9 @@ end
 
 function __fish_git_needs_command
     # Figure out if the current invocation already has a command.
-
-    # Git has tons of options, but fortunately only a few can appear before the command.
-    # They are listed here.
-    set -l opts h-help p P-paginate N-no-pager b-bare o-no-replace-objects \
-        l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs \
-        e-exec-path= G-git-dir= c= C= v-version H-html-path \
-        m-man-path I-info-path w-work-tree= a-namespace= s-super-prefix=
-    set cmd (commandline -opc)
+    set -l cmd (commandline -opc)
     set -e cmd[1]
-    argparse -s $opts -- $cmd 2>/dev/null
+    argparse -s (__fish_git_global_optspecs) -- $cmd 2>/dev/null
     or return 0
     # These flags function as commands, effectively.
     set -q _flag_version; and return 1
@@ -591,15 +609,15 @@ function __fish_git_stash_not_using_subcommand
 end
 
 function __fish_git_complete_worktrees
-    command git worktree list --porcelain | string replace --regex --filter '^worktree\s*' ''
+    __fish_git worktree list --porcelain | string replace --regex --filter '^worktree\s*' ''
 end
 
 function __fish_git_complete_stashes
-    command git stash list --format=%gd:%gs 2>/dev/null | string replace ":" \t
+    __fish_git stash list --format=%gd:%gs 2>/dev/null | string replace ":" \t
 end
 
 function __fish_git_aliases
-    command git config -z --get-regexp '^alias\.' 2>/dev/null | while read -lz key value
+    __fish_git config -z --get-regexp '^alias\.' 2>/dev/null | while read -lz key value
         begin
             set -l name (string replace -r '^.*\.' '' -- $key)
             printf "%s\t%s\n" $name "Alias for $value"
@@ -652,7 +670,7 @@ function __fish_git_possible_commithash
 end
 
 function __fish_git_reflog
-    command git reflog --no-decorate 2>/dev/null | string replace -r '[0-9a-f]* (.+@\{[0-9]+\}): (.*)$' '$1\t$2'
+    __fish_git reflog --no-decorate 2>/dev/null | string replace -r '[0-9a-f]* (.+@\{[0-9]+\}): (.*)$' '$1\t$2'
 end
 
 function __fish_git_help_all_concepts
@@ -728,7 +746,7 @@ end
 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'
 complete -x -c git -n '__fish_git_needs_command' -s C -a '(__fish_complete_directories)' -d 'Run as if git was started in this directory'
-complete -x -c git -n '__fish_git_needs_command' -s c -a '(command git config -l 2>/dev/null | string replace = \t)' -d 'Set a configuration option'
+complete -x -c git -n '__fish_git_needs_command' -s c -a '(__fish_git config -l 2>/dev/null | string replace = \t)' -d 'Set a configuration option'
 complete -x -c git -n '__fish_git_needs_command' -l exec-path -a '(__fish_complete_directories)' -d 'Get or set the path to the git programs'
 complete -f -c git -n '__fish_git_needs_command' -l html-path -d 'Print the path to the html documentation'
 complete -f -c git -n '__fish_git_needs_command' -l man-path -d 'Print the path to the man documentation'

From deefdaec57a7948699ea2c1c7001a4b947a9aa5f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 29 Oct 2019 20:48:10 +0100
Subject: [PATCH 1148/1732] Use the new &| in __fish_paginate

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

diff --git a/share/functions/__fish_paginate.fish b/share/functions/__fish_paginate.fish
index ae7ae896f..f7c888a37 100644
--- a/share/functions/__fish_paginate.fish
+++ b/share/functions/__fish_paginate.fish
@@ -11,7 +11,7 @@ function __fish_paginate -d "Paginate the current command using the users defaul
 
     if commandline -j | string match -q -r -v "$cmd *\$"
 
-        commandline -aj " 2>&1 | $cmd;"
+        commandline -aj " &| $cmd;"
     end
 
 end

From 20314c5b3d7e6656b2589259f4e078f1a8d45d41 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 30 Oct 2019 11:54:58 +0100
Subject: [PATCH 1149/1732] completions/git: improve diff completions

Offer commit ranges only if left of a --.
Suggest added files in git diff --cached (or the --staged synonym)
Fixes #6262
---
 share/completions/git.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 9650f0045..1fbaf23d9 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1038,8 +1038,8 @@ complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Fo
 
 ### diff
 complete -c git -n '__fish_git_needs_command' -a diff -d 'Show changes between commits, commit and working tree, etc'
-complete -c git -n '__fish_git_using_command diff' -a '(__fish_git_ranges)'
-complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index'
+complete -c git -n '__fish_git_using_command diff; and not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
+complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index (same as --staged)'
 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'
@@ -1047,8 +1047,8 @@ complete -c git -n '__fish_git_using_command diff' -s 1 -l base -d 'Compare the
 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"'
 complete -c git -n '__fish_git_using_command diff' -s 0 -d 'Omit diff output for unmerged entries and just show "Unmerged"'
-complete -c git -n '__fish_git_using_command diff; and not __fish_contains_opt cached' -fa '(__fish_git_files modified deleted)'
-complete -c git -n '__fish_git_using_command diff; and __fish_contains_opt cached' -fa '(__fish_git_files modified-staged deleted-staged)'
+complete -c git -n '__fish_git_using_command diff; and not __fish_contains_opt cached staged' -a '(__fish_git_files modified deleted)'
+complete -c git -n '__fish_git_using_command diff; and __fish_contains_opt cached staged' -fa '(__fish_git_files all-staged)'
 
 ### Function to list available tools for git difftool and mergetool
 

From 8acff328e0f249ec01b1fe2a28f41de5e6129e5b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 30 Oct 2019 21:45:50 +0100
Subject: [PATCH 1150/1732] svn_prompt: Check for svnversion

MacOS Catalina apparently ships a stripped down svn that doesn't have
`svnversion`, which we use to print the revision.

For now skip the entire step to remove error spam.

Fixes #6267.

[ci skip]
---
 share/functions/fish_svn_prompt.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/functions/fish_svn_prompt.fish b/share/functions/fish_svn_prompt.fish
index 58690a8f0..013fcd5db 100644
--- a/share/functions/fish_svn_prompt.fish
+++ b/share/functions/fish_svn_prompt.fish
@@ -90,8 +90,8 @@ end
 
 
 function fish_svn_prompt --description "Prompt function for svn"
-    # if svn isn't installed then don't do anything
-    if not command -sq svn
+    # if svn isn't installed or doesn't offer svnversion then don't do anything
+    if not command -sq svn svnversion
         return 1
     end
 

From 0ec278d6bc08946e965f8b1a1982a5c42a148272 Mon Sep 17 00:00:00 2001
From: Oleg Butuzov <butuzov@users.noreply.github.com>
Date: Sun, 27 Oct 2019 16:47:03 +0200
Subject: [PATCH 1151/1732] Fixing broken link to bind.html

---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 7fdc01095..d9adbefe2 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1214,7 +1214,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``fish_ambiguous_width`` controls the computed width of ambiguous-width characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
 
-- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the `bind <cmds/bind.html#special-case-the-escape-character>`__ builtin command. This delay facilitates using escape as a meta key.
+- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the :ref:`bind <cmd-bind>` builtin command. This delay facilitates using escape as a meta key.
 
 - ``fish_greeting``, the greeting message printed on startup.
 
@@ -1481,7 +1481,7 @@ Emacs mode commands
 - :kbd:`Alt+t` transposes the last two words
 
 
-You can change these key bindings using the `bind <cmds/bind.html">`__ builtin.
+You can change these key bindings using the :ref:`bind <cmd-bind>` builtin.
 
 
 .. _vi-mode:

From d2b814bb7c9cab7f83c9953d6c204f17e77bf34b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 31 Oct 2019 21:12:57 +0800
Subject: [PATCH 1152/1732] docs: add link for explanation of escape key in
 bind documentation

---
 sphinx_doc_src/cmds/bind.rst | 1 +
 sphinx_doc_src/index.rst     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index d1291bbe4..454166d2f 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -193,6 +193,7 @@ Performs a history search when the :kbd:`Page Up` key is pressed.
 
 Turns on Vi key bindings and rebinds :kbd:`Control+C` to clear the input line.
 
+.. _cmd-bind-escape:
 
 Special Case: The escape Character
 ----------------------------------
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d9adbefe2..16e1bb9b6 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1214,7 +1214,7 @@ The user can change the settings of ``fish`` by changing the values of certain v
 
 - ``fish_ambiguous_width`` controls the computed width of ambiguous-width characters. This should be set to 1 if your terminal emulator renders these characters as single-width (typical), or 2 if double-width.
 
-- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. See the documentation for the :ref:`bind <cmd-bind>` builtin command. This delay facilitates using escape as a meta key.
+- ``fish_escape_delay_ms`` overrides the default timeout of 30ms after seeing an escape character before giving up on matching a key binding. This is explained in the documentation for the :ref:`bind <cmd-bind-escape>` builtin command. This delay facilitates using escape as a meta key.
 
 - ``fish_greeting``, the greeting message printed on startup.
 

From c2dbe36e4ad6b55637c1161c56b6ad7f2ed08b6d Mon Sep 17 00:00:00 2001
From: Roman Beranek <roman.beranek@prusa3d.com>
Date: Wed, 30 Oct 2019 13:00:17 +0100
Subject: [PATCH 1153/1732] scp completions: remove inappropriate opt '-q' from
 `string match -eq` cmd

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

diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index feae1a8c6..c7b05ac3f 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -52,7 +52,7 @@ complete -c scp -d "Local Path" -n "not string match @ -- (commandline -ct)"
 # Remote path
 #
 # Get the list of remote files from the scp target.
-complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -eq ':'" -a "
+complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -e ':'" -a "
 (__scp_remote_target):( \
         command ssh (__scp2ssh_port_number) -o 'BatchMode yes' (__scp_remote_target) /bin/ls\ -dp\ (__scp_remote_path_prefix)\* 2>/dev/null
 )

From ec4bbe248e29565fa8446eda6f749362b048676e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 31 Oct 2019 19:15:03 +0100
Subject: [PATCH 1154/1732] Revert "Prefer using clr_eos to clear "remaining
 lines""

This reverts commit d502ad2c253d931a1674909a4b402285e8c4a4cf.

Fixes #6263
---
 src/screen.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 993ccdd83..61b75abf1 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -645,7 +645,6 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
     const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
-    if (scr->desired.line_count() < lines_with_stuff) need_clear_screen = true;
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);
@@ -795,7 +794,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     }
 
     // Clear remaining lines (if any) if we haven't cleared the screen.
-    if (!has_cleared_screen && need_clear_screen && clr_eol) {
+    if (!has_cleared_screen && scr->desired.line_count() < lines_with_stuff && clr_eol) {
         s_set_color(scr, vars, highlight_spec_t{});
         for (size_t i = scr->desired.line_count(); i < lines_with_stuff; i++) {
             s_move(scr, 0, (int)i);

From 326f5586deb33cc8d711d51b36a400c85d44185e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 31 Oct 2019 19:23:54 +0100
Subject: [PATCH 1155/1732] Remove Makefile(s)

They were just wrappers around `cmake` and caused cmake with the Makefile generator
to mark in-tree builds as dirty, since it would overwrite them with its own.

Fixes #6264
---
 BSDmakefile | 53 ----------------------------------------------------
 Makefile    | 54 -----------------------------------------------------
 2 files changed, 107 deletions(-)
 delete mode 100644 BSDmakefile
 delete mode 100644 Makefile

diff --git a/BSDmakefile b/BSDmakefile
deleted file mode 100644
index 85f5ee162..000000000
--- a/BSDmakefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# This is a very basic `make` wrapper around the CMake build toolchain.
-#
-# Supported arguments:
-#   PREFIX: sets the installation prefix
-#   GENERATOR: explicitly specifies the CMake generator to use
-
-# By default, bmake will try to cd into ./obj before anything else. Don't do that.
-.OBJDIR: ./
-
-CMAKE?=cmake
-
-# Before anything else, test for CMake, which is the only requirement to be able to run
-# this Makefile CMake will perform the remaining dependency tests on its own.
-.BEGIN:
-	@which $(CMAKE) >/dev/null 2>/dev/null || \
-		(echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
-
-# Prefer to use ninja, if it is installed
-_GENERATOR!=which ninja 2>/dev/null >/dev/null && echo Ninja || echo "Unix Makefiles"
-GENERATOR?=$(_GENERATOR)
-
-.if $(GENERATOR) == "Ninja"
-BUILDFILE=build/build.ninja
-.else
-BUILDFILE=build/Makefile
-.endif
-
-PREFIX?=/usr/local
-
-build/fish: build/$(BUILDFILE)
-	$(CMAKE) --build build
-
-build:
-	mkdir -p build
-
-build/$(BUILDFILE): build
-	cd build; $(CMAKE) .. -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-
-.PHONY: install
-install: build/fish
-	$(CMAKE) --build build --target install
-
-.PHONY: clean
-clean:
-	rm -rf build
-
-.PHONY: test
-test: build/fish
-	$(CMAKE) --build build --target test
-
-.PHONY: run
-run: build/fish
-	build/fish
diff --git a/Makefile b/Makefile
deleted file mode 100644
index dedfec76c..000000000
--- a/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is a very basic `make` wrapper around the CMake build toolchain.
-#
-# Supported arguments:
-#   PREFIX: sets the installation prefix
-#   GENERATOR: explicitly specifies the CMake generator to use
-
-CMAKE ?= cmake
-
-GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
-			 echo 'Unix Makefiles')
-prefix ?= /usr/local
-PREFIX ?= $(prefix)
-
-ifeq ($(GENERATOR), Ninja)
-BUILDFILE = build.ninja
-else
-BUILDFILE = Makefile
-endif
-
-all: .begin build/fish
-
-PHONY: .begin
-.begin:
-	@which $(CMAKE) > /dev/null 2> /dev/null || \
-		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
-
-build/fish: build/$(BUILDFILE)
-	$(CMAKE) --build build
-
-build/$(BUILDFILE): build
-	cd build; $(CMAKE) .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-
-build:
-	mkdir -p build
-
-.PHONY: clean
-clean:
-	rm -rf build
-
-.PHONY: test
-test: build/fish
-	$(CMAKE) --build build --target test
-
-.PHONY: install
-install: build/fish
-	$(CMAKE) --build build --target install
-
-.PHONY: run
-run: build/fish
-	./build/fish || true
-
-.PHONY: exec
-exec: build/fish
-	exec ./build/fish

From ab011b0c2864051090adce1950c821ae7542e522 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 31 Oct 2019 20:08:32 +0100
Subject: [PATCH 1156/1732] Overhaul CHANGELOG

This reorders many CHANGELOG entries.
The main idea is to keep the "NOTABLE fixes and improvements" for the headline items,
so a bunch of entries (like "Empty uvars can now be exported") are moved to more specific sections.

Other than that, there's some rewording, and the new feature flag is mentioned in Deprecations,
because that's effectively what it is.

[ci skip]
---
 CHANGELOG.md | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d05072e29..4f7ad4045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,28 +3,17 @@
 ## Notable improvements and fixes
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632)
 - fish no longer buffers pipes to the last function in a pipeline, improving many cases where pipes appeared to block or hang (#1396).
-- `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
-- Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
-- Error messages from builtin commands no longer include an extensive usage summary, and have more readable stack traces (#3404, #5434).
+- An overhaul of error messages for builtin commands, including a removal of the overwhelming usage summary, more readable stack traces (#3404, #5434), stack traces for `test` (aka `[`) (#5771).
 - `fish`'s debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
-- `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556).
-- A bug where some parser errors did not set `$status` to non-zero has been fixed.
 - `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
-- Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
-- Empty universal variables may now be exported (#5992).
-- Exported universal variables are no longer imported into the global scope, preventing shadowing. This makes it easier to change such variables for all fish sessions and avoids breakage when the value is a list of multiple elements (#5258).
-- A bug where local variables would not be exported to functions has been fixed (#6153).
-- A bug where `string split` would be drop empty strings if the output was only empty strings has been fixed (#5987).
-- `switch` now allows arguments that expand to nothing, like empty variables (#5677).
-- The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
-- `jobs --last` returns 0 to indicate success when a job is found (#6104).
-- `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
+- Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
 - `fish` now correctly handles CDPATH entries that starts with `..` (#6220).
-- New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
+- New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
+- `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
@@ -40,10 +29,18 @@
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
-- `test` (aka `[`) now prints a stack trace on error, making the offending call easier to find (#5771).
 - The default read limit has been increased to 100MiB (#5267).
 - `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
 - `functions --erase` now also prevents fish from autoloading a function for the first time (#5951).
+- `jobs --last` returns 0 to indicate success when a job is found (#6104).
+- `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
+- A bug where `string split` would drop empty strings if the output was only empty strings has been fixed (#5987).
+- `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
+- Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
+- Empty universal variables may now be exported (#5992).
+- Exported universal variables are no longer imported into the global scope, preventing shadowing. This makes it easier to change such variables for all fish sessions and avoids breakage when the value is a list of multiple elements (#5258).
+- A bug where local variables would not be exported to functions has been fixed (#6153).
+- The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
 
 ### Interactive improvements
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
@@ -119,6 +116,7 @@
 
 ## Deprecations
 - The vcs-prompt functions have been promoted to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
+- `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556). As a reminder, the intention behind feature flags is that this will eventually become the default and then only option, so scripts should be updated.
 
 ### For distributors and developers
 - fish 3.0 introduced a CMake-based build system. In fish 3.1, both the Autotools-based build and legacy Xcode build system have been removed, leaving only the CMake build system. All distributors and developers must install CMake.

From 067b30208d6624b5134138e524c9d12fb7c776a3 Mon Sep 17 00:00:00 2001
From: 0x005c <52650857+0x005c@users.noreply.github.com>
Date: Wed, 30 Oct 2019 20:49:13 +0900
Subject: [PATCH 1157/1732] Fix `math` incorrect parenthesis error on missing
 term

---
 src/builtin_math.cpp   | 2 ++
 src/tinyexpr.cpp       | 4 ++--
 src/tinyexpr.h         | 3 ++-
 tests/checks/math.fish | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index d7a3c7fc8..822040930 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -147,6 +147,8 @@ static const wchar_t *math_describe_error(te_error_t &error) {
             return _(L"Too many arguments");
         case TE_ERROR_MISSING_OPERATOR:
             return _(L"Missing operator");
+        case TE_ERROR_UNEXPECTED_TOKEN:
+            return _(L"Unexpected token");
         case TE_ERROR_UNKNOWN:
             return _(L"Expression is bogus");
         default:
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index d9d1cea72..61c007e17 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -367,7 +367,7 @@ static te_expr *base(state *s) {
                 }
                 if (s->type == TOK_CLOSE && i == arity - 1) {
                     next_token(s);
-                } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
+                } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNEXPECTED_TOKEN) {
                     s->type = TOK_ERROR;
                     s->error = i < arity ? TE_ERROR_TOO_FEW_ARGS : TE_ERROR_TOO_MANY_ARGS;
                 }
@@ -403,7 +403,7 @@ static te_expr *base(state *s) {
         default:
             ret = new_expr(0, 0);
             s->type = TOK_ERROR;
-            s->error = TE_ERROR_UNKNOWN;
+            s->error = TE_ERROR_UNEXPECTED_TOKEN;
             ret->value = NAN;
             break;
     }
diff --git a/src/tinyexpr.h b/src/tinyexpr.h
index 193cc706b..fb945525b 100644
--- a/src/tinyexpr.h
+++ b/src/tinyexpr.h
@@ -35,7 +35,8 @@ typedef enum {
     TE_ERROR_TOO_FEW_ARGS = 4,
     TE_ERROR_TOO_MANY_ARGS = 5,
     TE_ERROR_MISSING_OPERATOR = 6,
-    TE_ERROR_UNKNOWN = 7
+    TE_ERROR_UNEXPECTED_TOKEN = 7,
+    TE_ERROR_UNKNOWN = 8
 } te_error_type_t;
 
 typedef struct te_error_t {
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index 3513f26bf..a66e9937a 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -91,7 +91,7 @@ not math 'ncr(1)'
 # CHECKERR: 'ncr(1)'
 # CHECKERR:       ^
 not math 'max()'
-# CHECKERR: math: Error: Expression is bogus
+# CHECKERR: math: Error: Unexpected token
 # CHECKERR: 'max()'
 # CHECKERR:    ^
 not math 'sin()'

From c0d8439f3a5391b2980a0302401e00365a47e5e4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 1 Nov 2019 08:40:56 +0100
Subject: [PATCH 1158/1732] math: Print special error for logical operators

Until now, something like

`math '7 = 2'`

would complain about a "missing" operator.

Now we print an error about logical operators not being supported and
point the user towards `test`.

Fixes #6096
---
 src/builtin_math.cpp   | 2 ++
 src/tinyexpr.cpp       | 9 +++++++++
 src/tinyexpr.h         | 3 ++-
 tests/checks/math.fish | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 822040930..611c29141 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -149,6 +149,8 @@ static const wchar_t *math_describe_error(te_error_t &error) {
             return _(L"Missing operator");
         case TE_ERROR_UNEXPECTED_TOKEN:
             return _(L"Unexpected token");
+        case TE_ERROR_LOGICAL_OPERATOR:
+            return _(L"Logical operations are not supported, use `test` instead");
         case TE_ERROR_UNKNOWN:
             return _(L"Expression is bogus");
         default:
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 61c007e17..e16b87b6f 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -306,6 +306,15 @@ void next_token(state *s) {
                     case '\n':
                     case '\r':
                         break;
+                    case '=':
+                    case '>':
+                    case '<':
+                    case '&':
+                    case '|':
+                    case '!':
+                        s->type = TOK_ERROR;
+                        s->error = TE_ERROR_LOGICAL_OPERATOR;
+                        break;
                     default:
                         s->type = TOK_ERROR;
                         s->error = TE_ERROR_MISSING_OPERATOR;
diff --git a/src/tinyexpr.h b/src/tinyexpr.h
index fb945525b..bd6e93409 100644
--- a/src/tinyexpr.h
+++ b/src/tinyexpr.h
@@ -36,7 +36,8 @@ typedef enum {
     TE_ERROR_TOO_MANY_ARGS = 5,
     TE_ERROR_MISSING_OPERATOR = 6,
     TE_ERROR_UNEXPECTED_TOKEN = 7,
-    TE_ERROR_UNKNOWN = 8
+    TE_ERROR_LOGICAL_OPERATOR = 8,
+    TE_ERROR_UNKNOWN = 9
 } te_error_type_t;
 
 typedef struct te_error_t {
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index a66e9937a..a4fa92f69 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -126,3 +126,8 @@ math 0x 3
 # CHECK: 20
 # CHECK: 8
 # CHECK: 0
+
+math "42 >= 1337"
+# CHECKERR: math: Error: Logical operations are not supported, use `test` instead
+# CHECKERR: '42 >= 1337'
+# CHECKERR:     ^

From 9380b7ff39816d16b3fb905f4e4ad4a50609c71e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 1 Nov 2019 08:52:38 +0100
Subject: [PATCH 1159/1732] history: Use `--contains` by default for "delete"

This just makes more sense, as people don't want to enter exact
matches if they delete interactively.

It also brings it in line with "search".

Fixes #6142
Rejects #6070
---
 share/functions/history.fish    | 3 +--
 sphinx_doc_src/cmds/history.rst | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index ea7b399f4..65856a89f 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -110,8 +110,7 @@ function history --description "display or manipulate interactive command histor
             end
 
             if test -z "$search_mode"
-                set search_mode "--exact"
-                set _flag_case_sensitive "-C"
+                set search_mode "--contains"
             end
 
             if test $search_mode = "--exact"
diff --git a/sphinx_doc_src/cmds/history.rst b/sphinx_doc_src/cmds/history.rst
index 0eefb7192..938f8953d 100644
--- a/sphinx_doc_src/cmds/history.rst
+++ b/sphinx_doc_src/cmds/history.rst
@@ -24,7 +24,7 @@ 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.
 
-- ``delete`` deletes history items. Without the ``--prefix`` or ``--contains`` options, the exact, case-sensitive match of the specified text will be deleted. 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.
 

From 6702c84d1517fe56521593a9a7cce26898b3e1a5 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 1 Nov 2019 13:21:49 +0100
Subject: [PATCH 1160/1732] Prevent buffer overflow when custom completions
 edit the commandline

This was introduced in a7ea7648c3a1656515badac6e78d7519220b069a
"Completion: maintain cursor position when there is no completion"
---
 src/reader.cpp            |  5 +++++
 tests/complete.expect     | 20 ++++++++++++++++++++
 tests/complete.expect.err |  0
 tests/complete.expect.out |  0
 4 files changed, 25 insertions(+)
 create mode 100644 tests/complete.expect
 create mode 100644 tests/complete.expect.err
 create mode 100644 tests/complete.expect.out

diff --git a/src/reader.cpp b/src/reader.cpp
index 20aeb3348..3b743b19e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2561,6 +2561,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                                                              completion_request_t::fuzzy_match};
                 complete_func(buffcpy, &rls.comp, complete_flags, vars, parser_ref);
 
+
+                // User-supplied completions may have changed the commandline - prevent buffer overflow.
+                if (token_begin > buff + el->text.size()) token_begin = buff + el->text.size();
+                if (token_end   > buff + el->text.size()) token_end   = buff + el->text.size();
+
                 // Munge our completions.
                 completions_sort_and_prioritize(&rls.comp);
 
diff --git a/tests/complete.expect b/tests/complete.expect
new file mode 100644
index 000000000..0d929ae8c
--- /dev/null
+++ b/tests/complete.expect
@@ -0,0 +1,20 @@
+# vim: set filetype=expect:
+spawn $fish
+set sid $spawn_id
+expect_prompt
+
+send_line {
+    complete -c my_is -n 'test (count (commandline -opc)) = 1' -xa arg
+    complete -c my_is -n '__fish_seen_subcommand_from not' -xa '(
+	set -l cmd (commandline -opc) (commandline -ct)
+	set cmd (string join " " my_is $cmd[3..-1])" "
+	commandline --replace --current-process $cmd
+	complete -C"$cmd"
+    )'
+}
+send "my_is not \t"
+send "still.alive"
+expect -re {.*still.alive} {
+} eof {
+    error "did fish crash?"
+}
diff --git a/tests/complete.expect.err b/tests/complete.expect.err
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/complete.expect.out b/tests/complete.expect.out
new file mode 100644
index 000000000..e69de29bb

From 3365410bde9e63e9f3cded6bc8fc28096b6645da Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 1 Nov 2019 20:58:35 +0800
Subject: [PATCH 1161/1732] cmake: only define test policy on old versions

CMP0037 only reserves the test name if CTest is included on newer versions of CMake.

This commit fixes a build warning.
---
 cmake/Tests.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
index 6845a1204..cc61bc837 100644
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -99,7 +99,8 @@ ADD_CUSTOM_TARGET(serial_test_high_level
 # Create the 'test' target.
 # Set a policy so CMake stops complaining about the name 'test'.
 CMAKE_POLICY(PUSH)
-IF(POLICY CMP0037)
+
+IF(${CMAKE_VERSION} VERSION_LESS 3.11.0 AND POLICY CMP0037)
   CMAKE_POLICY(SET CMP0037 OLD)
 ENDIF()
 ADD_CUSTOM_TARGET(test)

From 713c8f2d322024d26a3d3c469d7babe1ae803169 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 1 Nov 2019 21:16:24 +0800
Subject: [PATCH 1162/1732] gpg completions: add further options

Restores work from #6251 wiped out by merge.
---
 share/functions/__fish_complete_gpg.fish | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
index 4843d6de5..a915a9cce 100644
--- a/share/functions/__fish_complete_gpg.fish
+++ b/share/functions/__fish_complete_gpg.fish
@@ -21,6 +21,8 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l no-sig-create-check -d "Do not verify each signature right after creation"
         complete -c $__fish_complete_gpg_command -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
         complete -c $__fish_complete_gpg_command -l rfc1991 -d "Try to be more RFC-1991 compliant"
+        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"
     else
         complete -c $__fish_complete_gpg_command -l no-keyring -d "Do not use any keyring at all"
         complete -c $__fish_complete_gpg_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
@@ -80,6 +82,8 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l change-passphrase -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Change the passphrase of the secret key belonging to the given user id"
         complete -c $__fish_complete_gpg_command -l agent-program -d "Specify an agent program to be used for secret key operations"
         complete -c $__fish_complete_gpg_command -l clear-sign -d "Make a clear text signature"
+        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"
     end
 
     #
@@ -115,8 +119,6 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
     complete -c $__fish_complete_gpg_command -l sign-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Sign a public key with your secret key"
     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-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"
@@ -147,6 +149,9 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
 
     complete -c $__fish_complete_gpg_command -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
 
+    complete -c $__fish_complete_gpg_command -l card-status -x -d "Print smartcard status"
+    complete -c $__fish_complete_gpg_command -l change-pin -x -d "Change smartcard PIN"
+
     complete -c $__fish_complete_gpg_command -l version -d "Display version and supported algorithms, and exit"
     complete -c $__fish_complete_gpg_command -l warranty -d "Display warranty and exit"
     complete -c $__fish_complete_gpg_command -s h -l help -d "Display help and exit"
@@ -363,4 +368,6 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
     complete -c $__fish_complete_gpg_command -l personal-compress-preferences -x -d "Set the list of personal compression preferences to the specified string"
 
     complete -c $__fish_complete_gpg_command -l default-preference-list -x -d "Set the list of default preferences to the specified string"
+
+    complete -c $__fish_complete_gpg_command -l openpgp -x -d "Use strict OpenPGP behaviour"
 end

From e0d4a1d78bbecf5f2bdfb75a0237ecadba2c414d Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 31 Oct 2019 18:25:46 +0100
Subject: [PATCH 1163/1732] Fix sudo/doas completions not using /sbin

Fixes #6259
[ci skip]
---
 share/completions/doas.fish                          | 1 +
 share/completions/sudo.fish                          | 1 +
 share/functions/__fish_complete_subcommand_root.fish | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 share/functions/__fish_complete_subcommand_root.fish

diff --git a/share/completions/doas.fish b/share/completions/doas.fish
index 6789e6021..b711f0a3c 100644
--- a/share/completions/doas.fish
+++ b/share/completions/doas.fish
@@ -23,6 +23,7 @@ end
 
 function __fish_complete_doas_subcommand
     set -l args (__fish_doas_print_remaining_args)
+    set -lx -a PATH /sbin /usr/sbin
     complete -C"$args"
 end
 
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index fdbe253fc..765db5e30 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -33,6 +33,7 @@ end
 
 function __fish_complete_sudo_subcommand
     set -l args (__fish_sudo_print_remaining_args)
+    set -lx -a PATH /sbin /usr/sbin
     complete -C"$args"
 end
 
diff --git a/share/functions/__fish_complete_subcommand_root.fish b/share/functions/__fish_complete_subcommand_root.fish
deleted file mode 100644
index d434d0cbb..000000000
--- a/share/functions/__fish_complete_subcommand_root.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_complete_subcommand_root -d "Run the __fish_complete_subcommand function using a PATH containing /sbin and /usr/sbin"
-    set -lx -p PATH /sbin /usr/sbin 2>/dev/null
-    __fish_complete_subcommand $argv
-end

From dfc1d1931d2f743f4413832b53889dbedd1f6569 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 1 Nov 2019 17:20:09 +0100
Subject: [PATCH 1164/1732] Add /usr/local/sbin to PATH for sudo completions

[ci skip]
---
 share/completions/doas.fish | 2 +-
 share/completions/sudo.fish | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/doas.fish b/share/completions/doas.fish
index b711f0a3c..411d67a41 100644
--- a/share/completions/doas.fish
+++ b/share/completions/doas.fish
@@ -23,7 +23,7 @@ end
 
 function __fish_complete_doas_subcommand
     set -l args (__fish_doas_print_remaining_args)
-    set -lx -a PATH /sbin /usr/sbin
+    set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
     complete -C"$args"
 end
 
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index 765db5e30..f092fddce 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -33,7 +33,7 @@ end
 
 function __fish_complete_sudo_subcommand
     set -l args (__fish_sudo_print_remaining_args)
-    set -lx -a PATH /sbin /usr/sbin
+    set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
     complete -C"$args"
 end
 

From 4dbb20942195633a74ae6125cfea055a824c0f66 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 1 Nov 2019 19:11:51 +0100
Subject: [PATCH 1165/1732] Docs: escape word characters after backticks

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 2 +-
 sphinx_doc_src/cmds/wait.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 454166d2f..59f589266 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -32,7 +32,7 @@ When ``COMMAND`` is a shellscript command, it is a good practice to put the actu
 
 If a script produces output, it should finish by calling ``commandline -f repaint`` to tell fish that a repaint is in order.
 
-When multiple ``COMMAND``s are provided, they are all run in the specified order when the key is pressed. Note that special input functions cannot be combined with ordinary shell script commands. The commands must be entirely a sequence of special input functions (from ``bind -f``) or all shell script commands (i.e., valid fish script).
+When multiple ``COMMAND``\s are provided, they are all run in the specified order when the key is pressed. Note that special input functions cannot be combined with ordinary shell script commands. The commands must be entirely a sequence of special input functions (from ``bind -f``) or all shell script commands (i.e., valid fish script).
 
 If no ``SEQUENCE`` is provided, all bindings (or just the bindings in the specified ``MODE``) are printed. If ``SEQUENCE`` is provided without ``COMMAND``, just the binding matching that sequence is printed.
 
diff --git a/sphinx_doc_src/cmds/wait.rst b/sphinx_doc_src/cmds/wait.rst
index 12f37469a..2c11bdde3 100644
--- a/sphinx_doc_src/cmds/wait.rst
+++ b/sphinx_doc_src/cmds/wait.rst
@@ -47,4 +47,4 @@ spawns five jobs in the background, and then waits until all of them finishes.
     hoge &
     wait sleep
 
-spawns five jobs and ``hoge`` in the background, and then waits until all ``sleep``s finishes, and doesn't wait for ``hoge`` finishing.
+spawns five jobs and ``hoge`` in the background, and then waits until all ``sleep``\s finish, and doesn't wait for ``hoge`` finishing.

From 151e75d141616d70e121a3c3ca970a64c8b841bb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 2 Nov 2019 13:40:31 -0700
Subject: [PATCH 1166/1732] Autosuggestions to validate the first command, not
 the last command

When considering an autosuggestion from history, we attempt to validate the
command to ensure that we don't suggest invalid (e.g. path-dependent)
commands. Prior to this fix, we would validate the last command in the
command line (e.g. in `cd /bin && ./stuff` we would validate "./stuff".
This doesn't really make sense; we should be validating the first command
because it has the potential to change the PWD. Switch to validating the
first command.

Also remove some helper functions that became dead through this change.
---
 src/highlight.cpp  | 28 ++++++++++++++++++----------
 src/parse_tree.cpp | 17 -----------------
 src/parse_tree.h   | 10 ----------
 src/tnode.h        |  5 -----
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/highlight.cpp b/src/highlight.cpp
index 6e0398dc4..88fb88223 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -395,23 +395,31 @@ static bool has_expand_reserved(const wcstring &str) {
     return result;
 }
 
-// Parse a command line. Return by reference the last command, and the last argument to that command
-// (as a string), if any. This is used by autosuggestions.
+// Parse a command line. Return by reference the first command, and the first argument to that
+// command (as a string), if any. This is used to validate autosuggestions.
 static bool autosuggest_parse_command(const wcstring &buff, const environment_t &vars,
-                                      wcstring *out_expanded_command, wcstring *out_last_arg) {
+                                      wcstring *out_expanded_command, wcstring *out_arg) {
     // Parse the buffer.
     parse_node_tree_t parse_tree;
     parse_tree_from_string(buff,
                            parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens,
                            &parse_tree, NULL);
 
-    // Find the last statement.
-    auto last_statement = parse_tree.find_last_node<g::plain_statement>();
-    if (last_statement &&
-        plain_statement_get_expanded_command(buff, last_statement, vars, out_expanded_command)) {
-        // Find the last argument. If we don't get one, return an invalid node.
-        if (auto last_arg = parse_tree.find_last_node<g::argument>(last_statement)) {
-            *out_last_arg = last_arg.get_source(buff);
+    // Find the first statement.
+    tnode_t<g::plain_statement> first_statement{};
+    for (const auto &node : parse_tree) {
+        if (node.type == symbol_plain_statement) {
+            first_statement = tnode_t<g::plain_statement>(&parse_tree, &node);
+            break;
+        }
+    }
+
+    if (first_statement &&
+        plain_statement_get_expanded_command(buff, first_statement, vars, out_expanded_command)) {
+        // Find the first argument.
+        auto args_and_redirs = first_statement.child<1>();
+        if (auto arg = args_and_redirs.next_in_list<grammar::argument>()) {
+            *out_arg = arg.get_source(buff);
         }
         return true;
     }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index a1070ee49..cef4a826a 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1212,20 +1212,3 @@ const parse_node_t *parse_node_tree_t::find_node_matching_source_location(
 
     return result;
 }
-
-const parse_node_t *parse_node_tree_t::find_last_node_of_type(parse_token_type_t type,
-                                                              const parse_node_t *parent) const {
-    const parse_node_t *result = NULL;
-    // Find nodes of the given type in the tree, working backwards.
-    size_t idx = this->size();
-    while (idx--) {
-        const parse_node_t &node = this->at(idx);
-        bool expected_type = (node.type == type);
-        if (expected_type && (parent == NULL || node_has_ancestor(*this, node, *parent))) {
-            // The types match and it has the right parent.
-            result = &node;
-            break;
-        }
-    }
-    return result;
-}
diff --git a/src/parse_tree.h b/src/parse_tree.h
index e0ddf63d2..d813249cb 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -181,11 +181,6 @@ class parse_node_tree_t : public std::vector<parse_node_t> {
     const parse_node_t *get_parent(const parse_node_t &node,
                                    parse_token_type_t expected_type = token_type_invalid) const;
 
-    // Finds the last node of a given type, or empty if it could not be found. If parent is NULL,
-    // this finds the last node in the tree of that type.
-    template <typename Type>
-    tnode_t<Type> find_last_node(const parse_node_t *parent = NULL) const;
-
     // Finds a node containing the given source location. If 'parent' is not NULL, it must be an
     // ancestor.
     const parse_node_t *find_node_matching_source_location(parse_token_type_t type,
@@ -205,11 +200,6 @@ class parse_node_tree_t : public std::vector<parse_node_t> {
     const parse_node_t *next_node_in_node_list(const parse_node_t &node_list,
                                                parse_token_type_t item_type,
                                                const parse_node_t **list_tail) const;
-
-    // Finds the last node of a given type underneath a given node, or NULL if it could not be
-    // found. If parent is NULL, this finds the last node in the tree of that type.
-    const parse_node_t *find_last_node_of_type(parse_token_type_t type,
-                                               const parse_node_t *parent) const;
 };
 
 /// The big entry point. Parse a string, attempting to produce a tree for the given goal type.
diff --git a/src/tnode.h b/src/tnode.h
index e65c8b783..e7b2939e9 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -223,11 +223,6 @@ tnode_t<Type> parse_node_tree_t::find_child(const parse_node_t &parent) const {
     return tnode_t<Type>(this, &this->find_child(parent, Type::token));
 }
 
-template <typename Type>
-tnode_t<Type> parse_node_tree_t::find_last_node(const parse_node_t *parent) const {
-    return tnode_t<Type>(this, this->find_last_node_of_type(Type::token, parent));
-}
-
 /// Given a plain statement, get the command from the child node. Returns the command string on
 /// success, none on failure.
 maybe_t<wcstring> command_for_plain_statement(tnode_t<grammar::plain_statement> stmt,

From 5ece4481a5dfadba1644292c2b50ead9484b9aca Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Fri, 1 Nov 2019 09:28:41 -0700
Subject: [PATCH 1167/1732] Prefer using clr_eos to clear "remaining lines" -
 but reset color first

This un-reverts pull request #6190, but adds a missing
reset of the color before doing the clr_eos.
---
 src/screen.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index 61b75abf1..575bb71e9 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -645,6 +645,8 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
     const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
+    if (scr->desired.line_count() < lines_with_stuff)
+        need_clear_screen = true;
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);
@@ -732,6 +734,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             // wrapping.
             if (should_clear_screen_this_line && !has_cleared_screen &&
                 (done || j + 1 == (size_t)screen_width)) {
+                s_set_color(scr, vars, highlight_spec_t{});
                 s_move(scr, current_width, (int)i);
                 s_write_mbs(scr, clr_eos);
                 has_cleared_screen = true;
@@ -794,7 +797,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     }
 
     // Clear remaining lines (if any) if we haven't cleared the screen.
-    if (!has_cleared_screen && scr->desired.line_count() < lines_with_stuff && clr_eol) {
+    if (!has_cleared_screen && need_clear_screen && clr_eol) {
         s_set_color(scr, vars, highlight_spec_t{});
         for (size_t i = scr->desired.line_count(); i < lines_with_stuff; i++) {
             s_move(scr, 0, (int)i);

From dd1f8489a7ec70c600d729bccb39be4a62f77fb0 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Sat, 2 Nov 2019 13:40:40 -0600
Subject: [PATCH 1168/1732] add -o/--old to __fish_seen_argument

---
 share/functions/__fish_seen_argument.fish | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 877554dfd..2f8704387 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -1,5 +1,5 @@
 function __fish_seen_argument
-    argparse 's/short=+' 'l/long=+' -- $argv
+    argparse 's/short=+' 'o/old=+' 'l/long=+' -- $argv
 
     set cmd (commandline -co)
     set -e cmd[1]
@@ -10,6 +10,12 @@ function __fish_seen_argument
             end
         end
 
+        for o in $_flag_o
+            if string match -qr "^-$s\$" -- $t
+                return 0
+            end
+        end
+
         for l in $_flag_l
             if string match -q -- "--$l" $t
                 return 0

From a7f1d2c0c702df8709e7206135121ec075ef2973 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 18 Oct 2019 18:08:22 -0700
Subject: [PATCH 1169/1732] Add support for fish_trace variable to trace
 execution

This adds support for `fish_trace`, a new variable intended to serve the
same purpose as `set -x` as in bash. Setting this variable to anything
non-empty causes execution to be traced. In the future we may give more
specific meaning to the value of the variable.

The user's prompt is not traced unless you run it explicitly. Events are
also not traced because it is noisy; however autoloading is.

Fixes #3427
---
 CHANGELOG.md                 |  1 +
 CMakeLists.txt               |  2 +-
 sphinx_doc_src/cmds/fish.rst |  2 +-
 sphinx_doc_src/index.rst     |  2 +
 src/event.cpp                |  3 ++
 src/exec.cpp                 |  7 ++++
 src/flog.cpp                 |  2 +
 src/flog.h                   |  7 ++++
 src/parse_execution.cpp      | 19 +++++++++-
 src/parser.h                 |  4 ++
 src/proc.h                   |  1 +
 src/reader.cpp               | 14 +++++--
 src/trace.cpp                | 36 ++++++++++++++++++
 src/trace.h                  | 23 ++++++++++++
 tests/checks/trace.fish      | 72 ++++++++++++++++++++++++++++++++++++
 15 files changed, 189 insertions(+), 6 deletions(-)
 create mode 100644 src/trace.cpp
 create mode 100644 src/trace.h
 create mode 100644 tests/checks/trace.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d05072e29..24fb54d96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
 - `fish` now correctly handles CDPATH entries that starts with `..` (#6220).
 - New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
+- The `fish_trace` variable may be set to trace execution. This performs a similar role as `set -x`.
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73ca4a860..c77d77641 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,7 @@ SET(FISH_SRCS
     src/signal.cpp src/tinyexpr.cpp src/tnode.cpp src/tokenizer.cpp src/utf8.cpp src/util.cpp
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
-    src/flog.cpp
+    src/flog.cpp src/trace.cpp
 )
 
 # Header files are just globbed.
diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index 5063b3bd0..e0adc6bec 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -23,7 +23,7 @@ The following options are available:
 
 - ``-d`` or ``--debug=CATEGORY_GLOB`` enables debug output and specifies a glob for matching debug categories (like ``fish -d``). Defaults to empty.
 
-- ``-o`` or ``--debug-output=path`` Specify a file path to receive the debug output. The default is stderr.
+- ``-o`` or ``--debug-output=path`` Specify a file path to receive the debug output, including categories and ``fish_trace``. The default is stderr.
 
 - ``-i`` or ``--interactive`` specify that fish is to run in interactive mode
 
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 16e1bb9b6..193df98a1 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1224,6 +1224,8 @@ The user can change the settings of ``fish`` by changing the values of certain v
   empty string, history is not saved to disk (but is still available within the interactive
   session).
 
+- ``fish_trace``, if set and not empty, will cause fish to print commands before they execute, similar to `set -x` in bash. The trace is printed to the path given by the :ref:`--debug-output <cmd-fish>` option to fish (stderr by default).
+
 - ``fish_user_paths``, a list of directories that are prepended to ``PATH``. This can be a universal variable.
 
 - ``umask``, the current file creation mask. The preferred way to change the umask variable is through the :ref:`umask <cmd-umask>` function. An attempt to set umask to an invalid value will always fail.
diff --git a/src/event.cpp b/src/event.cpp
index 5e760f139..a60f25ae2 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -246,6 +246,9 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
     assert(ld.is_event >= 0 && "is_event should not be negative");
     scoped_push<decltype(ld.is_event)> inc_event{&ld.is_event, ld.is_event + 1};
 
+    // Suppress fish_trace during events.
+    scoped_push<bool> suppress_trace{&ld.suppress_fish_trace, true};
+
     // Capture the event handlers that match this event.
     event_handler_list_t fire;
     for (const auto &handler : *s_event_handlers.acquire()) {
diff --git a/src/exec.cpp b/src/exec.cpp
index f3403c9ce..21a190556 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -44,6 +44,7 @@
 #include "reader.h"
 #include "redirection.h"
 #include "signal.h"
+#include "trace.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// File descriptor redirection error message.
@@ -899,6 +900,12 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     // which depends on the redirection being evaluated before the pipe. So the write end of the
     // pipe comes first, the read pipe of the pipe comes last. See issue #966.
 
+    // Maybe trace this process.
+    // TODO: 'and' and 'or' will not show.
+    if (trace_enabled(parser)) {
+        trace_argv(parser, nullptr, p->get_argv_array().to_list());
+    }
+
     // The IO chain for this process.
     io_chain_t process_net_io_chain = j->block_io_chain();
     if (pipes.write.valid()) {
diff --git a/src/flog.cpp b/src/flog.cpp
index ce25a1b7a..f46f22f2a 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -94,6 +94,8 @@ void activate_flog_categories_by_pattern(const wcstring &inwc) {
 
 void set_flog_output_file(FILE *f) { g_logger.acquire()->set_file(f); }
 
+void log_extra_to_flog_file(const wcstring &s) { g_logger.acquire()->log_extra(s.c_str()); }
+
 std::vector<const category_t *> get_flog_categories() {
     std::vector<const category_t *> result(s_all_categories.begin(), s_all_categories.end());
     std::sort(result.begin(), result.end(), [](const category_t *a, const category_t *b) {
diff --git a/src/flog.h b/src/flog.h
index 4f417e3c5..d95ac7e98 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -125,6 +125,9 @@ class logger_t {
 
     void log_fmt(const category_t &cat, const wchar_t *fmt, ...);
     void log_fmt(const category_t &cat, const char *fmt, ...);
+
+    // Log outside of the usual flog usage.
+    void log_extra(const wchar_t *s) { log1(s); }
 };
 
 extern owning_lock<logger_t> g_logger;
@@ -141,6 +144,10 @@ void set_flog_output_file(FILE *f);
 /// \return a list of all categories, sorted by name.
 std::vector<const flog_details::category_t *> get_flog_categories();
 
+/// Print some extra stuff to the flog file (stderr by default).
+/// This is used by the tracing machinery.
+void log_extra_to_flog_file(const wcstring &s);
+
 /// Output to the fish log a sequence of arguments, separated by spaces, and ending with a newline.
 #define FLOG(wht, ...)                                                        \
     do {                                                                      \
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2a0f6c7bf..a742f57f5 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -45,6 +45,7 @@
 #include "reader.h"
 #include "tnode.h"
 #include "tokenizer.h"
+#include "trace.h"
 #include "util.h"
 #include "wildcard.h"
 #include "wutil.h"
@@ -250,6 +251,10 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
     tnode_t<g::job_list> job_list_to_execute;
     tnode_t<g::if_clause> if_clause = statement.child<0>();
     tnode_t<g::else_clause> else_clause = statement.child<1>();
+
+    // We start with the 'if'.
+    trace_if_enabled(*parser, L"if");
+
     for (;;) {
         if (should_cancel_execution(associated_block)) {
             result = parse_execution_cancelled;
@@ -286,10 +291,12 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
                 if_clause = maybe_if_clause;
                 else_clause = else_cont.try_get_child<g::else_clause, 1>();
                 assert(else_clause && "Expected to have an else clause");
+                trace_if_enabled(*parser, L"else if");
             } else {
                 // It's the final 'else', we're done.
                 job_list_to_execute = else_cont.try_get_child<g::job_list, 1>();
                 assert(job_list_to_execute && "Should have a job list");
+                trace_if_enabled(*parser, L"else");
                 break;
             }
         }
@@ -308,6 +315,8 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         parser->set_last_statuses(statuses_t::just(STATUS_CMD_OK));
     }
 
+    trace_if_enabled(*parser, L"end if");
+
     // It's possible there's a last-minute cancellation (issue #1297).
     if (should_cancel_execution(associated_block)) {
         result = parse_execution_cancelled;
@@ -320,10 +329,11 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
 parse_execution_result_t parse_execution_context_t::run_begin_statement(
     tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
+    trace_if_enabled(*parser, L"begin");
     block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
     parse_execution_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
-
+    trace_if_enabled(*parser, L"end begin");
     return ret;
 }
 
@@ -339,6 +349,7 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
     if (result != parse_execution_success) {
         return result;
     }
+    trace_if_enabled(*parser, L"function", arguments);
     io_streams_t streams(0);  // no limit on the amount of output from builtin_function()
     int err = builtin_function(*parser, streams, arguments, pstree, body);
     parser->set_last_statuses(statuses_t::just(err));
@@ -418,6 +429,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         return parse_execution_errored;
     }
 
+    trace_if_enabled(*parser, L"for", arguments);
     block_t *fb = parser->push_block(block_t::for_block());
 
     // Now drive the for loop.
@@ -446,6 +458,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     }
 
     parser->pop_block(fb);
+    trace_if_enabled(*parser, L"end for");
     return ret;
 }
 
@@ -562,6 +575,8 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
     tnode_t<g::job_conjunction> condition_head = header.child<1>();
     tnode_t<g::andor_job_list> condition_boolean_tail = header.child<3>();
 
+    trace_if_enabled(*parser, L"while");
+
     // Run while the condition is true.
     for (;;) {
         // Save off the exit status if it came from the loop body. We'll restore it if the condition
@@ -596,6 +611,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         // Push a while block and then check its cancellation reason.
         auto &ld = parser->libdata();
         ld.loop_status = loop_status_t::normals;
+
         block_t *wb = parser->push_block(block_t::while_block());
         this->run_job_list(contents, wb);
         auto cancel_reason = this->cancellation_reason(wb);
@@ -618,6 +634,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
             break;
         }
     }
+    trace_if_enabled(*parser, L"end while");
     return ret;
 }
 
diff --git a/src/parser.h b/src/parser.h
index 8dfff38f1..3ba18ab62 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -158,6 +158,10 @@ struct library_data_t {
     /// Whether we are currently interactive.
     bool is_interactive{false};
 
+    /// Whether to suppress fish_trace output. This occurs in the prompt, event handlers, and key
+    /// bindings.
+    bool suppress_fish_trace{false};
+
     /// Whether we should break or continue the current loop.
     enum loop_status_t loop_status { loop_status_t::normals };
 
diff --git a/src/proc.h b/src/proc.h
index 4b086011e..0678a899d 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -197,6 +197,7 @@ class process_t {
 
     /// Returns argv.
     wchar_t **get_argv() { return argv_array.get(); }
+    const wchar_t *const *get_argv() const { return argv_array.get(); }
     const null_terminated_array_t<wchar_t> &get_argv_array() const { return argv_array; }
 
     /// Returns argv[idx].
diff --git a/src/reader.cpp b/src/reader.cpp
index 3b743b19e..d27d52866 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -860,6 +860,7 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
     if (!term_supports_setting_title()) return;
 
     scoped_push<bool> noninteractive{&parser.libdata().is_interactive, false};
+    scoped_push<bool> in_title(&parser.libdata().suppress_fish_trace, true);
 
     wcstring fish_title_command = DEFAULT_TITLE;
     if (function_exists(L"fish_title", parser)) {
@@ -907,6 +908,9 @@ void reader_data_t::exec_prompt() {
     left_prompt_buff.clear();
     right_prompt_buff.clear();
 
+    // Suppress fish_trace while in the prompt.
+    scoped_push<bool> in_prompt(&parser().libdata().suppress_fish_trace, true);
+
     // Do not allow the exit status of the prompts to leak through.
     const bool apply_exit_status = false;
 
@@ -2561,10 +2565,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                                                              completion_request_t::fuzzy_match};
                 complete_func(buffcpy, &rls.comp, complete_flags, vars, parser_ref);
 
-
-                // User-supplied completions may have changed the commandline - prevent buffer overflow.
+                // User-supplied completions may have changed the commandline - prevent buffer
+                // overflow.
                 if (token_begin > buff + el->text.size()) token_begin = buff + el->text.size();
-                if (token_end   > buff + el->text.size()) token_end   = buff + el->text.size();
+                if (token_end > buff + el->text.size()) token_end = buff + el->text.size();
 
                 // Munge our completions.
                 completions_sort_and_prioritize(&rls.comp);
@@ -3200,6 +3204,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     readline_loop_state_t rls{};
     struct termios old_modes;
 
+    // Suppress fish_trace during executing key bindings.
+    // This is simply to reduce noise.
+    scoped_push<bool> in_title(&parser().libdata().suppress_fish_trace, true);
+
     // If nchars_or_0 is positive, then that's the maximum number of chars. Otherwise keep it at
     // SIZE_MAX.
     if (nchars_or_0 > 0) {
diff --git a/src/trace.cpp b/src/trace.cpp
new file mode 100644
index 000000000..03b6481db
--- /dev/null
+++ b/src/trace.cpp
@@ -0,0 +1,36 @@
+#include "config.h"
+
+#include "trace.h"
+
+#include "common.h"
+#include "flog.h"
+#include "parser.h"
+
+bool trace_enabled(const parser_t &parser) {
+    auto &ld = parser.libdata();
+    if (ld.suppress_fish_trace) return false;
+    // TODO: this variable lookup is somewhat expensive, consider how to make this cheaper.
+    return !parser.vars().get(L"fish_trace").missing_or_empty();
+}
+
+/// Trace an "argv": a list of arguments where the first is the command.
+void trace_argv(const parser_t &parser, const wchar_t *command, const wcstring_list_t &argv) {
+    // Format into a string to prevent interleaving with flog in other threads.
+    // Add the + prefix.
+    wcstring trace_text(parser.block_count(), '+');
+
+    if (command && command[0]) {
+        trace_text.push_back(L' ');
+        trace_text.append(command);
+    }
+    for (const wcstring &arg : argv) {
+        trace_text.push_back(L' ');
+        trace_text.append(escape_string(arg, ESCAPE_ALL));
+    }
+    trace_text.push_back('\n');
+    log_extra_to_flog_file(trace_text);
+}
+
+void trace_if_enabled(const parser_t &parser, const wchar_t *command, const wcstring_list_t &argv) {
+    if (trace_enabled(parser)) trace_argv(parser, command, argv);
+}
diff --git a/src/trace.h b/src/trace.h
new file mode 100644
index 000000000..b0ba0abb7
--- /dev/null
+++ b/src/trace.h
@@ -0,0 +1,23 @@
+/// Support for fish_trace.
+#ifndef FISH_TRACE_H
+#define FISH_TRACE_H
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "common.h"
+
+class parser_t;
+class process_t;
+
+/// Trace an "argv": a list of arguments. Each argument is escaped.
+/// If \p command is not null, it is traced first (and not escaped)
+void trace_argv(const parser_t &parser, const wchar_t *command, const wcstring_list_t &argv);
+
+/// \return whether tracing is enabled.
+bool trace_enabled(const parser_t &parser);
+
+/// Convenience helper to trace a single string if tracing is enabled.
+void trace_if_enabled(const parser_t &parser, const wchar_t *command,
+                      const wcstring_list_t &argv = {});
+
+#endif
diff --git a/tests/checks/trace.fish b/tests/checks/trace.fish
new file mode 100644
index 000000000..e2396d702
--- /dev/null
+++ b/tests/checks/trace.fish
@@ -0,0 +1,72 @@
+# RUN: %fish %s
+
+echo untraced
+# CHECK: untraced
+
+set fish_trace 1
+
+for i in 1 2 3
+    echo $i
+end
+
+# CHECK: 1
+# CHECK: 2
+# CHECK: 3
+
+# CHECKERR: + for 1 2 3
+# CHECKERR: ++ echo 1
+# CHECKERR: ++ echo 2
+# CHECKERR: ++ echo 3
+# CHECKERR: + end for
+
+while true
+    and true
+    echo inside
+    break
+end
+
+# CHECK: inside
+
+# CHECKERR: + while
+# CHECKERR: + true
+# CHECKERR: + true
+# CHECKERR: ++ echo inside
+# CHECKERR: ++ break
+# CHECKERR: + end while
+
+while true && true
+    echo inside2
+    break
+end
+
+# CHECK: inside2
+
+# CHECKERR: + while
+# CHECKERR: + true
+# CHECKERR: + true
+# CHECKERR: ++ echo inside2
+# CHECKERR: ++ break
+# CHECKERR: + end while
+
+if true && false
+else if false || true
+    echo inside3
+else if will_not_execute
+end
+
+# CHECK: inside3
+
+# CHECKERR: + if
+# CHECKERR: + true
+# CHECKERR: + false
+# CHECKERR: + else if
+# CHECKERR: + false
+# CHECKERR: + true
+# CHECKERR: ++ echo inside3
+# CHECKERR: + end if
+
+set -e fish_trace
+# CHECKERR: + set -e fish_trace
+
+echo untraced
+# CHECK: untraced

From 72bf5898d36ea40a77d66a1970b875e6fb4e4b0c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 2 Nov 2019 16:46:33 -0700
Subject: [PATCH 1170/1732] Clean up how PATH and CDPATH munging occurs

PATH and CDPATH have special behavior around empty elements. Express this
directly in env_stack_t::set rather than via variable dispatch; this is
cleaner.
---
 src/env.cpp                           | 40 ++++++---------------------
 src/env.h                             |  3 --
 src/env_dispatch.cpp                  |  6 ----
 tests/checks/colon-delimited-var.fish | 26 +++++++++++++++++
 4 files changed, 35 insertions(+), 40 deletions(-)
 create mode 100644 tests/checks/colon-delimited-var.fish

diff --git a/src/env.cpp b/src/env.cpp
index 38b590fa1..064eef09d 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -133,27 +133,6 @@ static export_generation_t next_export_generation() {
     return ++*val;
 }
 
-/// Some env vars contain a list of paths where an empty path element is equivalent to ".".
-/// Unfortunately that convention causes problems for fish scripts. So this function replaces the
-/// empty path element with an explicit ".". See issue #3914.
-void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars) {
-    const auto paths = vars.get(var_name);
-    if (paths.missing_or_empty()) return;
-
-    // See if there's any empties.
-    const wcstring empty = wcstring();
-    const wcstring_list_t &strs = paths->as_list();
-    if (contains(strs, empty)) {
-        // Copy the list and replace empties with L"."
-        wcstring_list_t newstrs = strs;
-        std::replace(newstrs.begin(), newstrs.end(), empty, wcstring(L"."));
-        int retval = vars.set(var_name, ENV_DEFAULT | ENV_USER, std::move(newstrs));
-        if (retval != ENV_OK) {
-            FLOGF(error, L"fix_colon_delimited_var failed unexpectedly with retval %d", retval);
-        }
-    }
-}
-
 const wcstring_list_t &env_var_t::as_list() const { return *vals_; }
 
 wchar_t env_var_t::get_delimiter() const {
@@ -231,14 +210,6 @@ void misc_init() {
     }
 }
 
-/// Ensure the content of the magic path env vars is reasonable. Specifically, that empty path
-/// elements are converted to explicit "." to make the vars easier to use in fish scripts.
-static void init_path_vars() {
-    // Do not replace empties in MATHPATH - see #4158.
-    fix_colon_delimited_var(L"PATH", env_stack_t::globals());
-    fix_colon_delimited_var(L"CDPATH", env_stack_t::globals());
-}
-
 /// Make sure the PATH variable contains something.
 static void setup_path() {
     auto &vars = env_stack_t::globals();
@@ -297,8 +268,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     path_get_data(user_data_dir);
     vars.set_one(FISH_USER_DATA_DIR, ENV_GLOBAL, user_data_dir);
 
-    init_path_vars();
-
     // Set up the USER and PATH variables
     setup_path();
 
@@ -1268,6 +1237,15 @@ int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t
         path_make_canonical(vals.front());
     }
 
+    // Hacky stuff around PATH and CDPATH: #3914.
+    // Not MANPATH; see #4158.
+    // Replace empties with dot. Note we ignore pathvar here.
+    if (key == L"PATH" || key == L"CDPATH") {
+        auto munged_vals = colon_split(vals);
+        std::replace(munged_vals.begin(), munged_vals.end(), wcstring(L""), wcstring(L"."));
+        vals = std::move(munged_vals);
+    }
+
     bool needs_uvar_sync = false;
     auto ret = acquire_impl()->set(key, mode, std::move(vals), &needs_uvar_sync);
     if (ret == ENV_OK) {
diff --git a/src/env.h b/src/env.h
index 873bfeaa6..a14b0dcdb 100644
--- a/src/env.h
+++ b/src/env.h
@@ -322,9 +322,6 @@ bool term_supports_setting_title();
 /// Gets a path appropriate for runtime storage
 wcstring env_get_runtime_path();
 
-/// Replace empty path elements with "." - see #3914.
-void fix_colon_delimited_var(const wcstring &var_name, env_stack_t &vars);
-
 /// A wrapper around setenv() and unsetenv() which use a lock.
 /// In general setenv() and getenv() are highly incompatible with threads. This makes it only
 /// slightly safer.
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 424b44bad..2e91b4d94 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -252,10 +252,6 @@ static void handle_tz_change(const wcstring &var_name, env_stack_t &vars) {
     handle_timezone(var_name.c_str(), vars);
 }
 
-static void handle_magic_colon_var_change(const wcstring &var_name, env_stack_t &vars) {
-    fix_colon_delimited_var(var_name, vars);
-}
-
 static void handle_locale_change(const environment_t &vars) {
     init_locale(vars);
     // We need to re-guess emoji width because the locale might have changed to a multibyte one.
@@ -301,8 +297,6 @@ static std::unique_ptr<const var_dispatch_table_t> create_dispatch_table() {
         var_dispatch_table->add(var_name, handle_curses_change);
     }
 
-    var_dispatch_table->add(L"PATH", handle_magic_colon_var_change);
-    var_dispatch_table->add(L"CDPATH", handle_magic_colon_var_change);
     var_dispatch_table->add(L"fish_term256", handle_fish_term_change);
     var_dispatch_table->add(L"fish_term24bit", handle_fish_term_change);
     var_dispatch_table->add(L"fish_escape_delay_ms", update_wait_on_escape_ms);
diff --git a/tests/checks/colon-delimited-var.fish b/tests/checks/colon-delimited-var.fish
new file mode 100644
index 000000000..8eeaac956
--- /dev/null
+++ b/tests/checks/colon-delimited-var.fish
@@ -0,0 +1,26 @@
+# RUN: env PATH="a::b" CDPATH="d::e" MANPATH="x::y" %fish %s
+
+# In PATH and CDPATH, empty elements are treated the same as "."
+# In fish we replace them explicitly. Ensure that works.
+# Do not replace empties in MATHPATH - see #4158.
+
+echo "$PATH"
+# CHECK: a:.:b
+
+echo "$CDPATH"
+# CHECK: d:.:e
+
+echo "$MANPATH"
+# CHECK: x::y
+
+set PATH abc '' def
+echo "$PATH"
+# CHECK: abc:.:def
+
+set CDPATH '' qqq
+echo "$CDPATH"
+# CHECK: .:qqq
+
+set MANPATH 123 '' 456
+echo "$MANPATH"
+# CHECK: 123::456

From be35b858c5f4d81d60f04c1e7ca6b2cdd69e3f72 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 2 Nov 2019 18:27:35 -0700
Subject: [PATCH 1171/1732] Minor allocation reduction in format_history_record

Reuse some storage across calls.
---
 src/history.cpp | 40 +++++++++++++++++-----------------------
 src/history.h   |  4 ++--
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 766fce720..88bbc7e58 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -612,15 +612,12 @@ bool history_search_t::go_backwards() {
     return false;
 }
 
-history_item_t history_search_t::current_item() const {
+const history_item_t &history_search_t::current_item() const {
     assert(current_item_ && "No current item");
     return *current_item_;
 }
 
-wcstring history_search_t::current_string() const {
-    history_item_t item = this->current_item();
-    return item.str();
-}
+const wcstring &history_search_t::current_string() const { return this->current_item().str(); }
 
 static wcstring history_filename(const wcstring &session_id, const wcstring &suffix) {
     if (session_id.empty()) return L"";
@@ -993,7 +990,8 @@ void history_impl_t::save(bool vacuum) {
 // Returns nothing. The only possible failure involves formatting the timestamp. If that happens we
 // simply omit the timestamp from the output.
 static void format_history_record(const history_item_t &item, const wchar_t *show_time_format,
-                                  bool null_terminate, wcstring &result) {
+                                  bool null_terminate, wcstring *result) {
+    result->clear();
     if (show_time_format) {
         const time_t seconds = item.timestamp();
         struct tm timestamp;
@@ -1002,17 +1000,13 @@ static void format_history_record(const history_item_t &item, const wchar_t *sho
             wchar_t timestamp_string[max_tstamp_length + 1];
             if (std::wcsftime(timestamp_string, max_tstamp_length, show_time_format, &timestamp) !=
                 0) {
-                result.append(timestamp_string);
+                result->append(timestamp_string);
             }
         }
     }
 
-    result.append(item.str());
-    if (null_terminate) {
-        result.push_back(L'\0');
-    } else {
-        result.push_back(L'\n');
-    }
+    result->append(item.str());
+    result->push_back(null_terminate ? L'\0' : L'\n');
 }
 
 void history_impl_t::disable_automatic_saving() {
@@ -1364,20 +1358,20 @@ bool history_t::search(history_search_type_t search_type, const wcstring_list_t
     size_t hist_size = this->size();
     if (max_items > hist_size) max_items = hist_size;
 
+    wcstring formatted_record;
     if (reverse) {
         for (size_t i = max_items; i != 0; --i) {
             auto cur_item = this->item_at_index(i);
-            wcstring result;
-            format_history_record(cur_item, show_time_format, null_terminate, result);
-            streams.out.append(result);
+            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
+            streams.out.append(formatted_record);
         }
     } else {
         // Start at one because zero is the current command.
         for (size_t i = 1; i < max_items + 1; ++i) {
             auto cur_item = this->item_at_index(i);
             wcstring result;
-            format_history_record(cur_item, show_time_format, null_terminate, result);
-            streams.out.append(result);
+            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
+            streams.out.append(formatted_record);
         }
     }
 
@@ -1400,14 +1394,14 @@ bool history_t::search_with_args(history_search_type_t search_type,
         }
         history_search_t searcher = history_search_t(
             *this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case);
+        wcstring formatted_record;
         while (searcher.go_backwards()) {
-            wcstring result;
-            auto cur_item = searcher.current_item();
-            format_history_record(cur_item, show_time_format, null_terminate, result);
+            const auto &cur_item = searcher.current_item();
+            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
             if (reverse) {
-                results.push_back(result);
+                results.push_back(formatted_record);
             } else {
-                streams.out.append(result);
+                streams.out.append(formatted_record);
             }
             if (--max_items == 0) break;
         }
diff --git a/src/history.h b/src/history.h
index 102c3a560..9a5d1b81b 100644
--- a/src/history.h
+++ b/src/history.h
@@ -257,10 +257,10 @@ class history_search_t {
     bool go_backwards();
 
     // Returns the current search result item. asserts if there is no current item.
-    history_item_t current_item() const;
+    const history_item_t &current_item() const;
 
     // Returns the current search result item contents. asserts if there is no current item.
-    wcstring current_string() const;
+    const wcstring &current_string() const;
 
     // Constructor.
     history_search_t(history_t &hist, const wcstring &str,

From 52e900690b31aee0bba436fdbd328bdeb5945493 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 2 Nov 2019 18:56:16 -0700
Subject: [PATCH 1172/1732] Make history_search_type_t an enum class

---
 src/builtin_history.cpp | 12 ++++++------
 src/fish_tests.cpp      | 10 +++++-----
 src/history.cpp         | 10 +++++-----
 src/history.h           | 16 ++++++++--------
 src/reader.cpp          |  5 +++--
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index adfac2063..13040d3cf 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -141,17 +141,17 @@ static int parse_cmd_opts(history_cmd_opts_t &opts, int *optind,  //!OCLINT(high
                 break;
             }
             case 'p': {
-                opts.search_type = HISTORY_SEARCH_TYPE_PREFIX_GLOB;
+                opts.search_type = history_search_type_t::prefix_glob;
                 opts.history_search_type_defined = true;
                 break;
             }
             case 'c': {
-                opts.search_type = HISTORY_SEARCH_TYPE_CONTAINS_GLOB;
+                opts.search_type = history_search_type_t::contains_glob;
                 opts.history_search_type_defined = true;
                 break;
             }
             case 'e': {
-                opts.search_type = HISTORY_SEARCH_TYPE_EXACT;
+                opts.search_type = history_search_type_t::exact;
                 opts.history_search_type_defined = true;
                 break;
             }
@@ -242,8 +242,8 @@ int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // Establish appropriate defaults.
     if (opts.hist_cmd == HIST_UNDEF) opts.hist_cmd = HIST_SEARCH;
     if (!opts.history_search_type_defined) {
-        if (opts.hist_cmd == HIST_SEARCH) opts.search_type = HISTORY_SEARCH_TYPE_CONTAINS_GLOB;
-        if (opts.hist_cmd == HIST_DELETE) opts.search_type = HISTORY_SEARCH_TYPE_EXACT;
+        if (opts.hist_cmd == HIST_SEARCH) opts.search_type = history_search_type_t::contains_glob;
+        if (opts.hist_cmd == HIST_DELETE) opts.search_type = history_search_type_t::exact;
     }
 
     int status = STATUS_CMD_OK;
@@ -259,7 +259,7 @@ int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             // TODO: Move this code to the history module and support the other search types
             // including case-insensitive matches. At this time we expect the non-exact deletions to
             // be handled only by the history function's interactive delete feature.
-            if (opts.search_type != HISTORY_SEARCH_TYPE_EXACT) {
+            if (opts.search_type != history_search_type_t::exact) {
                 streams.err.append_format(_(L"builtin history delete only supports --exact\n"));
                 status = STATUS_INVALID_ARGS;
                 break;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index d53eb3cb1..8db4808b3 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3593,7 +3593,7 @@ void history_tests_t::test_history() {
     test_history_matches(searcher, expected, __LINE__);
 
     // Items matching "alpha", case-insensitive.
-    searcher = history_search_t(history, L"AlPhA", HISTORY_SEARCH_TYPE_CONTAINS, nocase);
+    searcher = history_search_t(history, L"AlPhA", history_search_type_t::contains, nocase);
     set_expected([](const wcstring &s) { return wcstolower(s).find(L"alpha") != wcstring::npos; });
     test_history_matches(searcher, expected, __LINE__);
 
@@ -3603,23 +3603,23 @@ void history_tests_t::test_history() {
     test_history_matches(searcher, expected, __LINE__);
 
     // Items starting with "be", case-sensitive.
-    searcher = history_search_t(history, L"be", HISTORY_SEARCH_TYPE_PREFIX, 0);
+    searcher = history_search_t(history, L"be", history_search_type_t::prefix, 0);
     set_expected([](const wcstring &s) { return string_prefixes_string(L"be", s); });
     test_history_matches(searcher, expected, __LINE__);
 
     // Items starting with "be", case-insensitive.
-    searcher = history_search_t(history, L"be", HISTORY_SEARCH_TYPE_PREFIX, nocase);
+    searcher = history_search_t(history, L"be", history_search_type_t::prefix, nocase);
     set_expected(
         [](const wcstring &s) { return string_prefixes_string_case_insensitive(L"be", s); });
     test_history_matches(searcher, expected, __LINE__);
 
     // Items exactly matching "alph", case-sensitive.
-    searcher = history_search_t(history, L"alph", HISTORY_SEARCH_TYPE_EXACT, 0);
+    searcher = history_search_t(history, L"alph", history_search_type_t::exact, 0);
     set_expected([](const wcstring &s) { return s == L"alph"; });
     test_history_matches(searcher, expected, __LINE__);
 
     // Items exactly matching "alph", case-insensitive.
-    searcher = history_search_t(history, L"alph", HISTORY_SEARCH_TYPE_EXACT, nocase);
+    searcher = history_search_t(history, L"alph", history_search_type_t::exact, nocase);
     set_expected([](const wcstring &s) { return wcstolower(s) == L"alph"; });
     test_history_matches(searcher, expected, __LINE__);
 
diff --git a/src/history.cpp b/src/history.cpp
index 88bbc7e58..120a89848 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -186,22 +186,22 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
     const wcstring &content_to_match = case_sensitive ? contents : contents_lower;
 
     switch (type) {
-        case HISTORY_SEARCH_TYPE_EXACT: {
+        case history_search_type_t::exact: {
             return term == content_to_match;
         }
-        case HISTORY_SEARCH_TYPE_CONTAINS: {
+        case history_search_type_t::contains: {
             return content_to_match.find(term) != wcstring::npos;
         }
-        case HISTORY_SEARCH_TYPE_PREFIX: {
+        case history_search_type_t::prefix: {
             return string_prefixes_string(term, content_to_match);
         }
-        case HISTORY_SEARCH_TYPE_CONTAINS_GLOB: {
+        case history_search_type_t::contains_glob: {
             wcstring wcpattern1 = parse_util_unescape_wildcards(term);
             if (wcpattern1.front() != ANY_STRING) wcpattern1.insert(0, 1, ANY_STRING);
             if (wcpattern1.back() != ANY_STRING) wcpattern1.push_back(ANY_STRING);
             return wildcard_match(content_to_match, wcpattern1);
         }
-        case HISTORY_SEARCH_TYPE_PREFIX_GLOB: {
+        case history_search_type_t::prefix_glob: {
             wcstring wcpattern2 = parse_util_unescape_wildcards(term);
             if (wcpattern2.back() != ANY_STRING) wcpattern2.push_back(ANY_STRING);
             return wildcard_match(content_to_match, wcpattern2);
diff --git a/src/history.h b/src/history.h
index 9a5d1b81b..8711c0015 100644
--- a/src/history.h
+++ b/src/history.h
@@ -44,17 +44,17 @@ class environment_t;
 
 typedef std::vector<wcstring> path_list_t;
 
-enum history_search_type_t {
+enum class history_search_type_t {
     // Search for commands exactly matching the given string.
-    HISTORY_SEARCH_TYPE_EXACT = 1,
+    exact,
     // Search for commands containing the given string.
-    HISTORY_SEARCH_TYPE_CONTAINS,
+    contains,
     // Search for commands starting with the given string.
-    HISTORY_SEARCH_TYPE_PREFIX,
+    prefix,
     // Search for commands containing the given glob pattern.
-    HISTORY_SEARCH_TYPE_CONTAINS_GLOB,
+    contains_glob,
     // Search for commands starting with the given glob pattern.
-    HISTORY_SEARCH_TYPE_PREFIX_GLOB
+    prefix_glob,
 };
 
 typedef uint64_t history_identifier_t;
@@ -229,7 +229,7 @@ class history_search_t {
     wcstring canon_term_;
 
     // Our search type.
-    enum history_search_type_t search_type_ { HISTORY_SEARCH_TYPE_CONTAINS };
+    enum history_search_type_t search_type_ { history_search_type_t::contains };
 
     // Our flags.
     history_search_flags_t flags_{0};
@@ -264,7 +264,7 @@ class history_search_t {
 
     // Constructor.
     history_search_t(history_t &hist, const wcstring &str,
-                     enum history_search_type_t type = HISTORY_SEARCH_TYPE_CONTAINS,
+                     enum history_search_type_t type = history_search_type_t::contains,
                      history_search_flags_t flags = 0)
         : history_(&hist), orig_term_(str), canon_term_(str), search_type_(type), flags_(flags) {
         if (ignores_case()) {
diff --git a/src/reader.cpp b/src/reader.cpp
index d27d52866..1d535278a 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -297,7 +297,8 @@ class reader_history_search_t {
         mode_ = mode;
         // We can skip dedup in history_search_t because we do it ourselves in skips_.
         search_ = history_search_t(
-            *hist, text, by_prefix() ? HISTORY_SEARCH_TYPE_PREFIX : HISTORY_SEARCH_TYPE_CONTAINS,
+            *hist, text,
+            by_prefix() ? history_search_type_t::prefix : history_search_type_t::contains,
             history_search_no_dedup);
     }
 
@@ -1298,7 +1299,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
             return nothing;
         }
 
-        history_search_t searcher(*history, search_string, HISTORY_SEARCH_TYPE_PREFIX);
+        history_search_t searcher(*history, search_string, history_search_type_t::prefix);
         while (!reader_test_should_cancel() && searcher.go_backwards()) {
             history_item_t item = searcher.current_item();
 

From 47c0b5f931fe25e9de911791a60d6bd35bfb5516 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 2 Nov 2019 19:33:45 -0700
Subject: [PATCH 1173/1732] Simplify history searching and fix deduplication

The history search logic had a not very useful "fast path" which was also
buggy because it neglected to dedup. Switch the "fast path" to just a
history search type which always matches.

Fixes #6278
---
 src/history.cpp | 101 +++++++++++++++++++++---------------------------
 src/history.h   |   6 +--
 2 files changed, 46 insertions(+), 61 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 120a89848..7b6772b07 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -206,6 +206,9 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
             if (wcpattern2.back() != ANY_STRING) wcpattern2.push_back(ANY_STRING);
             return wildcard_match(content_to_match, wcpattern2);
         }
+        case history_search_type_t::match_everything: {
+            return true;
+        }
     }
     DIE("unexpected history_search_type_t value");
 }
@@ -1343,76 +1346,60 @@ void history_t::resolve_pending() { impl()->resolve_pending(); }
 
 void history_t::save() { impl()->save(); }
 
+/// Perform a search of \p hist for \p search_string. Invoke a function \p func for each match. If
+/// \p func returns true, continue the search; else stop it.
+static void do_1_history_search(history_t &hist, history_search_type_t search_type,
+                                const wcstring &search_string, bool case_sensitive,
+                                const std::function<bool(const history_item_t &item)> &func) {
+    history_search_t searcher = history_search_t(hist, search_string, search_type,
+                                                 case_sensitive ? 0 : history_search_ignore_case);
+    while (searcher.go_backwards()) {
+        if (!func(searcher.current_item())) {
+            break;
+        }
+    }
+}
+
 // Searches history.
 bool history_t::search(history_search_type_t search_type, const wcstring_list_t &search_args,
                        const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
                        bool null_terminate, bool reverse, io_streams_t &streams) {
-    if (!search_args.empty()) {
-        // User wants the results filtered. This is not the common case so we do it separate
-        // from the code below for unfiltered output which is much cheaper.
-        return search_with_args(search_type, search_args, show_time_format, max_items,
-                                case_sensitive, null_terminate, reverse, streams);
-    }
-
-    // scoped_lock locker(lock);
-    size_t hist_size = this->size();
-    if (max_items > hist_size) max_items = hist_size;
-
+    wcstring_list_t collected;
     wcstring formatted_record;
-    if (reverse) {
-        for (size_t i = max_items; i != 0; --i) {
-            auto cur_item = this->item_at_index(i);
-            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
+    size_t remaining = max_items;
+
+    // The function we use to act on each item.
+    std::function<bool(const history_item_t &item)> func = [&](const history_item_t &item) -> bool {
+        if (remaining == 0) return false;
+        remaining -= 1;
+        format_history_record(item, show_time_format, null_terminate, &formatted_record);
+        if (reverse) {
+            // We need to collect this for later.
+            collected.push_back(std::move(formatted_record));
+        } else {
+            // We can output this immediately.
             streams.out.append(formatted_record);
         }
+        return true;
+    };
+
+    if (search_args.empty()) {
+        // The user had no search terms; just append everything.
+        do_1_history_search(*this, history_search_type_t::match_everything, {}, false, func);
     } else {
-        // Start at one because zero is the current command.
-        for (size_t i = 1; i < max_items + 1; ++i) {
-            auto cur_item = this->item_at_index(i);
-            wcstring result;
-            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
-            streams.out.append(formatted_record);
-        }
-    }
-
-    return true;
-}
-
-bool history_t::search_with_args(history_search_type_t search_type,
-                                 const wcstring_list_t &search_args,
-                                 const wchar_t *show_time_format, size_t max_items,
-                                 bool case_sensitive, bool null_terminate, bool reverse,
-                                 io_streams_t &streams) {
-    wcstring_list_t results;
-    size_t hist_size = this->size();
-    if (max_items > hist_size) max_items = hist_size;
-
-    for (const wcstring &search_string : search_args) {
-        if (search_string.empty()) {
-            streams.err.append_format(L"Searching for the empty string isn't allowed");
-            return false;
-        }
-        history_search_t searcher = history_search_t(
-            *this, search_string, search_type, case_sensitive ? 0 : history_search_ignore_case);
-        wcstring formatted_record;
-        while (searcher.go_backwards()) {
-            const auto &cur_item = searcher.current_item();
-            format_history_record(cur_item, show_time_format, null_terminate, &formatted_record);
-            if (reverse) {
-                results.push_back(formatted_record);
-            } else {
-                streams.out.append(formatted_record);
+        for (const wcstring &search_string : search_args) {
+            if (search_string.empty()) {
+                streams.err.append_format(L"Searching for the empty string isn't allowed");
+                return false;
             }
-            if (--max_items == 0) break;
+            do_1_history_search(*this, search_type, search_string, case_sensitive, func);
         }
     }
 
-    if (reverse) {
-        for (auto it = results.rbegin(); it != results.rend(); it++) {
-            streams.out.append(*it);
-        }
+    // Output any items we collected (which only happens in reverse).
+    for (auto iter = collected.rbegin(); iter != collected.rend(); ++iter) {
+        streams.out.append(*iter);
     }
-
     return true;
 }
 
diff --git a/src/history.h b/src/history.h
index 8711c0015..66895e496 100644
--- a/src/history.h
+++ b/src/history.h
@@ -55,6 +55,8 @@ enum class history_search_type_t {
     contains_glob,
     // Search for commands starting with the given glob pattern.
     prefix_glob,
+    // Matches everything.
+    match_everything,
 };
 
 typedef uint64_t history_identifier_t;
@@ -172,10 +174,6 @@ class history_t {
                 const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
                 bool null_terminate, bool reverse, io_streams_t &streams);
 
-    bool search_with_args(history_search_type_t search_type, const wcstring_list_t &search_args,
-                          const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
-                          bool null_terminate, bool reverse, io_streams_t &streams);
-
     // Irreversibly clears history.
     void clear();
 

From 19b59fc54edf3af85e97570bc054878b0e889048 Mon Sep 17 00:00:00 2001
From: LawAbidingCactus <lawabidingcactus@lawabidingcactus.com>
Date: Sun, 3 Nov 2019 00:32:20 +0000
Subject: [PATCH 1174/1732] minor fixes to version-specific completions

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

diff --git a/share/functions/__fish_complete_gpg.fish b/share/functions/__fish_complete_gpg.fish
index a915a9cce..06c1f9e79 100644
--- a/share/functions/__fish_complete_gpg.fish
+++ b/share/functions/__fish_complete_gpg.fish
@@ -21,8 +21,6 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l no-sig-create-check -d "Do not verify each signature right after creation"
         complete -c $__fish_complete_gpg_command -l pgp2 -d "Set up all options to be as PGP 2.x compliant as possible"
         complete -c $__fish_complete_gpg_command -l rfc1991 -d "Try to be more RFC-1991 compliant"
-        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"
     else
         complete -c $__fish_complete_gpg_command -l no-keyring -d "Do not use any keyring at all"
         complete -c $__fish_complete_gpg_command -l no-skip-hidden-recipients -d "During decryption, do not skip all anonymous recipients"
@@ -44,6 +42,7 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -s f -l recipient-file -r -d "Similar to --recipient, but encrypts to key stored in file instead"
         complete -c $__fish_complete_gpg_command -l request-origin -r -d "Tell gpg to assume that the operation ultimately originated at a particular origin"
         complete -c $__fish_complete_gpg_command -l sender -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "When creating a signature, tells gpg the user id of a key; when verifying, used to restrict information printed"
+        complete -c $__fish_complete_gpg_command -l show-key -d "Take OpenPGP keys as input and print information about them"
         complete -c $__fish_complete_gpg_command -l show-keys -d "Take OpenPGP keys as input and print information about them"
         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"
@@ -73,7 +72,6 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l export-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
         complete -c $__fish_complete_gpg_command -l import-filter -d "Define an import/export filter to apply to an imported/exported keyblock before it is written"
         complete -c $__fish_complete_gpg_command -l edit-card -d "Present a menu to work with a smartcard"
-        complete -c $__fish_complete_gpg_command -l card-edit -d "Present a menu to work with a smartcard"
         complete -c $__fish_complete_gpg_command -l disable-signer-uid -d "Don't embed the uid of the signing key in the data signature"
         complete -c $__fish_complete_gpg_command -l disable-dirmngr -d "Entirely disable the use of the Dirmngr"
         complete -c $__fish_complete_gpg_command -l dirmngr-program -r -d "Specify a dirmngr program to be used for keyserver access"
@@ -82,8 +80,6 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
         complete -c $__fish_complete_gpg_command -l change-passphrase -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Change the passphrase of the secret key belonging to the given user id"
         complete -c $__fish_complete_gpg_command -l agent-program -d "Specify an agent program to be used for secret key operations"
         complete -c $__fish_complete_gpg_command -l clear-sign -d "Make a clear text signature"
-        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"
     end
 
     #
@@ -119,6 +115,10 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
     complete -c $__fish_complete_gpg_command -l sign-key -xa "(__fish_complete_gpg_user_id $__fish_complete_gpg_command)" -d "Sign a public key with your secret key"
     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-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-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"
@@ -149,6 +149,7 @@ function __fish_complete_gpg -d "Internal function for gpg completion code dedup
 
     complete -c $__fish_complete_gpg_command -l gen-random -xa "0 1 2" -d "Emit specified number of random bytes of the given quality level"
 
+    complete -c $__fish_complete_gpg_command -l card-edit -d "Present a menu to work with a smartcard"
     complete -c $__fish_complete_gpg_command -l card-status -x -d "Print smartcard status"
     complete -c $__fish_complete_gpg_command -l change-pin -x -d "Change smartcard PIN"
 

From 6fb7f9b6b828ee904db81e10c2fd89dc55d37f0f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 29 Oct 2019 13:32:26 +0100
Subject: [PATCH 1175/1732] Fix completion for builtins (with subcommands)

Presently the completion engine ignores builtins that are part of the
fish syntax. This can be a problem when completing a string that was
based on the output of `commandline -p`.  This changes completions to
treat these builtins like any other command.

This also disables generic (filename) completion inside comments and
after strings that do not tokenize.

Additionally, comments are stripped off the output of `commandline -p`.

Fixes #5415
Fixes #2705
---
 CHANGELOG.md                                  |   1 +
 share/completions/begin.fish                  |   2 +
 share/completions/builtin.fish                |   9 +-
 share/completions/command.fish                |  11 +-
 share/completions/exec.fish                   |   5 +-
 share/completions/for.fish                    |   3 +
 share/completions/if.fish                     |   2 +
 share/completions/while.fish                  |   2 +
 .../__fish_complete_external_command.fish     |   3 +
 .../functions/__fish_config_interactive.fish  |   3 +-
 src/builtin_commandline.cpp                   |   2 +-
 src/complete.cpp                              | 410 +++++++-----------
 src/parse_tree.h                              |  10 +
 src/parse_util.cpp                            |  19 +-
 src/parse_util.h                              |   7 +-
 src/tnode.h                                   |   5 -
 src/tokenizer.h                               |   7 +
 tests/checks/complete.fish                    |  26 ++
 18 files changed, 248 insertions(+), 279 deletions(-)
 create mode 100644 share/completions/begin.fish
 create mode 100644 share/completions/for.fish
 create mode 100644 share/completions/if.fish
 create mode 100644 share/completions/while.fish
 create mode 100644 share/functions/__fish_complete_external_command.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcebe1e2b..250d4d9e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
+- Completion of subcommands to builtins like `and` or `not` has been fixed (#6249).
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
diff --git a/share/completions/begin.fish b/share/completions/begin.fish
new file mode 100644
index 000000000..e95aa4bbc
--- /dev/null
+++ b/share/completions/begin.fish
@@ -0,0 +1,2 @@
+complete -c begin -s h -l help -d 'Display help and exit'
+complete -c begin -xa '(__fish_complete_subcommand)'
diff --git a/share/completions/builtin.fish b/share/completions/builtin.fish
index 9a24eb3b5..27800d3b3 100644
--- a/share/completions/builtin.fish
+++ b/share/completions/builtin.fish
@@ -1,5 +1,4 @@
-
-complete -c builtin -s h -l help -d 'Display help and exit'
-complete -c builtin -s n -l names -d 'Print names of all existing builtins'
-complete -c builtin -xa '(builtin -n)'
-complete -c builtin -n '__fish_use_subcommand' -xa '(__fish_complete_subcommand)'
+complete -c builtin -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
+complete -c builtin -n 'test (count (commandline -opc)) -eq 1' -s n -l names -d 'Print names of all existing builtins'
+complete -c builtin -n 'test (count (commandline -opc)) -eq 1' -xa '(builtin -n)'
+complete -c builtin -n 'test (count (commandline -opc)) -ge 2' -xa '(__fish_complete_subcommand)'
diff --git a/share/completions/command.fish b/share/completions/command.fish
index 1ed4cbf7d..7c3e6956b 100644
--- a/share/completions/command.fish
+++ b/share/completions/command.fish
@@ -1,4 +1,7 @@
-
-complete -c command -s h -l help -d 'Display help and exit'
-complete -c command -s s -l search -d 'Print the file that would be executed'
-complete -c command -d "Command to run" -xa "(__fish_complete_subcommand)"
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -s a -l all -d 'Print all external commands by the given name'
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -s q -l quiet -d 'Do not print anything, only set exit status'
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
+complete -c command -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
+complete -c command -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
diff --git a/share/completions/exec.fish b/share/completions/exec.fish
index a2abf228a..1123f1e3e 100644
--- a/share/completions/exec.fish
+++ b/share/completions/exec.fish
@@ -1,2 +1,3 @@
-complete -c exec -s h -l help -d 'Display help and exit'
-complete -c exec -r -a '(__fish_complete_subcommand)'
+complete -c exec -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
+complete -c exec -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
+complete -c exec -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
diff --git a/share/completions/for.fish b/share/completions/for.fish
new file mode 100644
index 000000000..e7d74a390
--- /dev/null
+++ b/share/completions/for.fish
@@ -0,0 +1,3 @@
+complete -c for -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
+complete -c for -n 'test (count (commandline -opc)) -eq 1' -f
+complete -c for -n 'test (count (commandline -opc)) -eq 2' -xa in
diff --git a/share/completions/if.fish b/share/completions/if.fish
new file mode 100644
index 000000000..978b1868d
--- /dev/null
+++ b/share/completions/if.fish
@@ -0,0 +1,2 @@
+complete -c if -s h -l help -d 'Display help and exit'
+complete -c if -xa '(__fish_complete_subcommand)'
diff --git a/share/completions/while.fish b/share/completions/while.fish
new file mode 100644
index 000000000..d85e72092
--- /dev/null
+++ b/share/completions/while.fish
@@ -0,0 +1,2 @@
+complete -c while -s h -l help -d 'Display help and exit'
+complete -c while -xa '(__fish_complete_subcommand)'
diff --git a/share/functions/__fish_complete_external_command.fish b/share/functions/__fish_complete_external_command.fish
new file mode 100644
index 000000000..218aee4f3
--- /dev/null
+++ b/share/functions/__fish_complete_external_command.fish
@@ -0,0 +1,3 @@
+function __fish_complete_external_command
+    command find $PATH/ -maxdepth 1 -perm +u+x 2>&- | string match -r '[^/]*$'
+end
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index ec059f3c9..af03801cf 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -163,11 +163,12 @@ function __fish_config_interactive -d "Initializations that should be performed
     # the user tries [ interactively.
     #
     complete -c [ --wraps test
+    complete -c ! --wraps not
 
     #
     # Only a few builtins take filenames; initialize the rest with no file completions
     #
-    complete -c(builtin -n | string match -rv 'source|cd|exec|realpath|set|\[|test') --no-files
+    complete -c(builtin -n | string match -rv '(source|cd|exec|realpath|set|\\[|test|for)') --no-files
 
     # Reload key bindings when binding variable change
     function __fish_reload_key_bindings -d "Reload key bindings when binding variable change" --on-variable fish_key_bindings
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index a8d3e112f..bb924a4e5 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -398,7 +398,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             break;
         }
         case PROCESS_MODE: {
-            parse_util_process_extent(current_buffer, current_cursor_pos, &begin, &end);
+            parse_util_process_extent(current_buffer, current_cursor_pos, &begin, &end, nullptr);
             break;
         }
         case JOB_MODE: {
diff --git a/src/complete.cpp b/src/complete.cpp
index 28eed5b96..495bedc9f 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -119,8 +119,6 @@ typedef struct complete_entry_opt {
 
 } complete_entry_opt_t;
 
-using arg_list_t = std::vector<tnode_t<grammar::argument>>;
-
 /// Last value used in the order field of completion_entry_t.
 static std::atomic<unsigned int> k_complete_order{0};
 
@@ -352,8 +350,7 @@ class completer_t {
     void complete_param_expand(const wcstring &str, bool do_file,
                                bool handle_as_special_cd = false);
 
-    void complete_cmd(const wcstring &str, bool use_function, bool use_builtin, bool use_command,
-                      bool use_implicit_cd);
+    void complete_cmd(const wcstring &str);
 
     /// Attempt to complete an abbreviation for the given string.
     void complete_abbr(const wcstring &str);
@@ -386,7 +383,8 @@ class completer_t {
 
     void escape_opening_brackets(const wcstring &argument);
 
-    void mark_completions_duplicating_arguments(const wcstring &prefix, const arg_list_t &args);
+    void mark_completions_duplicating_arguments(const wcstring &prefix,
+                                                const std::vector<tok_t> &args);
 
    public:
     completer_t(const environment_t &vars, const std::shared_ptr<parser_t> &parser, wcstring c,
@@ -665,54 +663,45 @@ static wcstring complete_function_desc(const wcstring &fn) {
 /// using an absolute path, functions, builtins and directories for implicit cd commands.
 ///
 /// \param str_cmd the command string to find completions for
-void completer_t::complete_cmd(const wcstring &str_cmd, bool use_function, bool use_builtin,
-                               bool use_command, bool use_implicit_cd) {
+void completer_t::complete_cmd(const wcstring &str_cmd) {
     if (str_cmd.empty()) return;
 
     std::vector<completion_t> possible_comp;
 
-    if (use_command) {
-        // Append all possible executables
-        expand_result_t result =
-            expand_string(str_cmd, &this->completions,
-                          this->expand_flags() | expand_flag::special_for_command |
-                              expand_flag::for_completions | expand_flag::executables_only,
-                          vars, parser, NULL);
-        if (result != expand_result_t::error && this->wants_descriptions()) {
-            this->complete_cmd_desc(str_cmd);
-        }
+    // Append all possible executables
+    expand_result_t result =
+        expand_string(str_cmd, &this->completions,
+                      this->expand_flags() | expand_flag::special_for_command |
+                          expand_flag::for_completions | expand_flag::executables_only,
+                      vars, parser, NULL);
+    if (result != expand_result_t::error && this->wants_descriptions()) {
+        this->complete_cmd_desc(str_cmd);
     }
 
-    if (use_implicit_cd) {
-        // We don't really care if this succeeds or fails. If it succeeds this->completions will be
-        // updated with choices for the user.
-        expand_result_t ignore =
-            // Append all matching directories
-            expand_string(
-                str_cmd, &this->completions,
-                this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
-                vars, parser, NULL);
-        UNUSED(ignore);
-    }
+    // We don't really care if this succeeds or fails. If it succeeds this->completions will be
+    // updated with choices for the user.
+    expand_result_t ignore =
+        // Append all matching directories
+        expand_string(
+            str_cmd, &this->completions,
+            this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
+            vars, parser, NULL);
+    UNUSED(ignore);
 
     if (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~') {
-        if (use_function) {
-            wcstring_list_t names = function_get_names(str_cmd.at(0) == L'_');
-            for (wcstring &name : names) {
-                // Append all known matching functions
-                append_completion(&possible_comp, std::move(name));
-            }
-
-            this->complete_strings(str_cmd, complete_function_desc, possible_comp, 0);
+        wcstring_list_t names = function_get_names(str_cmd.at(0) == L'_');
+        for (wcstring &name : names) {
+            // Append all known matching functions
+            append_completion(&possible_comp, std::move(name));
         }
 
+        this->complete_strings(str_cmd, complete_function_desc, possible_comp, 0);
+
         possible_comp.clear();
 
-        if (use_builtin) {
-            // Append all matching builtins
-            builtin_get_names(&possible_comp);
-            this->complete_strings(str_cmd, builtin_get_desc, possible_comp, 0);
-        }
+        // Append all matching builtins
+        builtin_get_names(&possible_comp);
+        this->complete_strings(str_cmd, builtin_get_desc, possible_comp, 0);
     }
 }
 
@@ -1429,7 +1418,7 @@ void completer_t::escape_opening_brackets(const wcstring &argument) {
 
 /// Set the DUPLICATES_ARG flag in any completion that duplicates an argument.
 void completer_t::mark_completions_duplicating_arguments(const wcstring &prefix,
-                                                         const arg_list_t &args) {
+                                                         const std::vector<tok_t> &args) {
     // Get all the arguments, unescaped, into an array that we're going to bsearch.
     wcstring_list_t arg_strs;
     for (const auto &arg : args) {
@@ -1453,234 +1442,153 @@ void completer_t::mark_completions_duplicating_arguments(const wcstring &prefix,
     }
 }
 
-/// Return the index of an argument from \p args containing the position \p pos, or none if none.
-static maybe_t<size_t> find_argument_containing_position(const arg_list_t &args, size_t pos) {
-    size_t idx = 0;
-    for (const auto &arg : args) {
-        if (arg.location_in_or_at_end_of_source_range(pos)) {
-            return idx;
-        }
-        idx++;
-    }
-    return none();
-}
-
 void completer_t::perform() {
-    wcstring current_command;
-    const size_t pos = cmd.size();
-    // debug( 1, L"Complete '%ls'", cmd.c_str() );
-
-    const wchar_t *tok_begin = nullptr;
-    parse_util_token_extent(cmd.c_str(), cmd.size(), &tok_begin, nullptr, nullptr, nullptr);
-    assert(tok_begin != nullptr);
-
-    // If we are completing a variable name or a tilde expansion user name, we do that and return.
-    // No need for any other completions.
-    // Unconditionally complete variables and processes.
-    const wcstring current_token = tok_begin;
-    if (try_complete_variable(current_token) || try_complete_user(current_token)) {
-        return;
-    }
-
-    parse_node_tree_t tree;
-    parse_tree_from_string(cmd,
-                           parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens |
-                               parse_flag_include_comments,
-                           &tree, NULL);
+    const size_t cursor_pos = cmd.size();
 
     // Find the plain statement to operate on. The cursor may be past it (#1261), so backtrack
     // until we know we're no longer in a space. But the space may actually be part of the
     // argument (#2477).
-    size_t position_in_statement = pos;
+    size_t position_in_statement = cursor_pos;
     while (position_in_statement > 0 && cmd.at(position_in_statement - 1) == L' ') {
         position_in_statement--;
     }
-    auto plain_statement = tnode_t<grammar::plain_statement>::find_node_matching_source_location(
-        &tree, position_in_statement, nullptr);
-    if (!plain_statement) {
-        // Not part of a plain statement. This could be e.g. a for loop header, case expression,
-        // etc. Do generic file completions (issue #1309). If we had to backtrack, it means
-        // there was whitespace; don't do an autosuggestion in that case. Also don't do it if we
-        // are just after a pipe, semicolon, or & (issue #1631), or in a comment.
-        //
-        // Overall this logic is a total mess. A better approach would be to return the
-        // "possible next token" from the parse tree directly (this data is available as the
-        // first of the sequence of nodes without source locations at the very end of the parse
-        // tree).
-        bool do_file = true;
-        if (flags & completion_request_t::autosuggestion) {
-            if (position_in_statement < pos) {
-                do_file = false;
-            } else if (pos > 0) {
-                // If the previous character is in one of these types, we don't do file
-                // suggestions.
-                const parse_token_type_t bad_types[] = {parse_token_type_pipe, parse_token_type_end,
-                                                        parse_token_type_background,
-                                                        parse_special_type_comment};
-                for (parse_token_type_t type : bad_types) {
-                    if (tree.find_node_matching_source_location(type, pos - 1, NULL)) {
-                        do_file = false;
-                        break;
-                    }
-                }
-            }
-        }
-        complete_param_expand(current_token, do_file);
-    } else {
-        assert(plain_statement && plain_statement.has_source());
 
-        bool use_command = true;
-        bool use_function = true;
-        bool use_builtin = true;
-        bool use_implicit_cd = true;
-        bool use_abbr = true;
+    // Get all the arguments.
+    std::vector<tok_t> tokens;
+    parse_util_process_extent(cmd.c_str(), position_in_statement, nullptr, nullptr, &tokens);
 
-        // Get the command node.
-        tnode_t<grammar::tok_string> cmd_node = plain_statement.child<0>();
-        assert(cmd_node && cmd_node.has_source() && "Expected command node to be valid");
+    // Hack: fix autosuggestion by removing prefixing "and"s #6249.
+    if (flags & completion_request_t::autosuggestion) {
+        constexpr const wchar_t *prefix_cmds[] = {L"and", L"begin", L"command", L"exec",
+                                                  L"if",  L"not",   L"or",      L"while"};
+        while (!tokens.empty()) {
+            auto cmd_string = tokens.front().get_source(cmd);
+            bool is_subcommand = std::find_if(std::begin(prefix_cmds), std::end(prefix_cmds),
+                                              [&cmd_string](const wchar_t *prefix) {
+                                                  return cmd_string == prefix;
+                                              }) != std::end(prefix_cmds);
+            if (!is_subcommand) break;
+            tokens.erase(tokens.begin());
+        };
+    }
+    // Empty process (cursor is after one of ;, &, |, \n, &&, || modulo whitespace).
+    if (tokens.empty()) {
+        // Don't autosuggest anything based on the empty string (generalizes #1631).
+        if (flags & completion_request_t::autosuggestion) return;
 
-        // Get the actual command string.
-        current_command = cmd_node.get_source(cmd);
+        // fish has been using generic completion of filenames relative to the current directory.
+        // TODO there's some discussion in issue #5418 on what else we could do here.
+        complete_param_expand(L"", true /* do_file */);
+        return;
+    }
 
-        // Check the decoration.
-        switch (get_decoration(plain_statement)) {
-            case parse_statement_decoration_none: {
-                use_command = true;
-                use_function = true;
-                use_builtin = true;
-                use_implicit_cd = true;
-                use_abbr = true;
-                break;
-            }
-            case parse_statement_decoration_command:
-            case parse_statement_decoration_exec: {
-                use_command = true;
-                use_function = false;
-                use_builtin = false;
-                use_implicit_cd = false;
-                use_abbr = false;
-                break;
-            }
-            case parse_statement_decoration_builtin: {
-                use_command = false;
-                use_function = false;
-                use_builtin = true;
-                use_implicit_cd = false;
-                use_abbr = false;
-                break;
-            }
-        }
+    const tok_t &cmd_tok = tokens.front();
+    const tok_t &cur_tok = tokens.back();
+    // Since fish does not currently support redirect in command position, we return here.
+    if (cmd_tok.type != token_type_t::string) return;
+    if (cur_tok.type == token_type_t::error) return;
+    for (const auto &tok : tokens) {  // If there was an error, it was in the last token.
+        assert(tok.type == token_type_t::string || tok.type == token_type_t::redirect);
+    }
+    // If we are completing a variable name or a tilde expansion user name, we do that and return.
+    // No need for any other completions.
+    const wcstring current_token = cur_tok.get_source(cmd);
+    if (try_complete_variable(current_token) || try_complete_user(current_token)) {
+        return;
+    }
 
-        if (cmd_node.location_in_or_at_end_of_source_range(pos)) {
-            // Complete command filename.
-            complete_cmd(current_token, use_function, use_builtin, use_command, use_implicit_cd);
-            if (use_abbr) complete_abbr(current_token);
+    if (cmd_tok.location_in_or_at_end_of_source_range(cursor_pos)) {
+        // Complete command filename.
+        complete_cmd(current_token);
+        complete_abbr(current_token);
+        return;
+    }
+    // See whether we are in an argument, in a redirection or in the whitespace in between.
+    bool in_redirection = cur_tok.type == token_type_t::redirect;
+
+    bool had_ddash = false;
+    wcstring current_argument, previous_argument;
+    if (cur_tok.type == token_type_t::string &&
+        cur_tok.location_in_or_at_end_of_source_range(position_in_statement)) {
+        // If the cursor is in whitespace, then the "current" argument is empty and the
+        // previous argument is the matching one. But if the cursor was in or at the end
+        // of the argument, then the current argument is the matching one, and the
+        // previous argument is the one before it.
+        bool cursor_in_whitespace = !cur_tok.location_in_or_at_end_of_source_range(cursor_pos);
+        if (cursor_in_whitespace) {
+            current_argument.clear();
+            previous_argument = current_token;
         } else {
-            // Get all the arguments.
-            arg_list_t all_arguments = plain_statement.descendants<grammar::argument>();
-
-            // See whether we are in an argument. We may also be in a redirection, or nothing at
-            // all.
-            maybe_t<size_t> matching_arg_index =
-                find_argument_containing_position(all_arguments, position_in_statement);
-
-            bool had_ddash = false;
-            wcstring current_argument, previous_argument;
-            if (matching_arg_index) {
-                const wcstring matching_arg = all_arguments.at(*matching_arg_index).get_source(cmd);
-
-                // If the cursor is in whitespace, then the "current" argument is empty and the
-                // previous argument is the matching one. But if the cursor was in or at the end
-                // of the argument, then the current argument is the matching one, and the
-                // previous argument is the one before it.
-                bool cursor_in_whitespace =
-                    !plain_statement.location_in_or_at_end_of_source_range(pos);
-                if (cursor_in_whitespace) {
-                    current_argument.clear();
-                    previous_argument = matching_arg;
-                } else {
-                    current_argument = matching_arg;
-                    if (*matching_arg_index > 0) {
-                        previous_argument =
-                            all_arguments.at(*matching_arg_index - 1).get_source(cmd);
-                    }
-                }
-
-                // Check to see if we have a preceding double-dash.
-                for (size_t i = 0; i < *matching_arg_index; i++) {
-                    if (all_arguments.at(i).get_source(cmd) == L"--") {
-                        had_ddash = true;
-                        break;
-                    }
-                }
+            current_argument = current_token;
+            if (tokens.size() >= 2) {
+                tok_t prev_tok = tokens.at(tokens.size() - 2);
+                if (prev_tok.type == token_type_t::string) previous_argument = prev_tok.get_source(cmd);
             }
+        }
 
-            // If we are not in an argument, we may be in a redirection.
-            bool in_redirection = false;
-            if (!matching_arg_index) {
-                if (tnode_t<grammar::redirection>::find_node_matching_source_location(
-                        &tree, position_in_statement, plain_statement)) {
-                    in_redirection = true;
-                }
+        // Check to see if we have a preceding double-dash.
+        for (size_t i = 0; i < tokens.size() - 1; i++) {
+            if (tokens.at(i).get_source(cmd) == L"--") {
+                had_ddash = true;
+                break;
             }
-
-            bool do_file = false, handle_as_special_cd = false;
-            if (in_redirection) {
-                do_file = true;
-            } else {
-                // Try completing as an argument.
-                wcstring current_command_unescape, previous_argument_unescape,
-                    current_argument_unescape;
-                if (unescape_string(current_command, &current_command_unescape, UNESCAPE_DEFAULT) &&
-                    unescape_string(previous_argument, &previous_argument_unescape,
-                                    UNESCAPE_DEFAULT) &&
-                    unescape_string(current_argument, &current_argument_unescape,
-                                    UNESCAPE_INCOMPLETE)) {
-                    // Have to walk over the command and its entire wrap chain. If any command
-                    // disables do_file, then they all do.
-                    do_file = true;
-                    auto receiver = [&](const wcstring &cmd, const wcstring &cmdline,
-                                        size_t depth) {
-                        // Perhaps set a transient commandline so that custom completions
-                        // buitin_commandline will refer to the wrapped command. But not if
-                        // we're doing autosuggestions.
-                        bool wants_transient =
-                            depth > 0 && !(flags & completion_request_t::autosuggestion);
-                        if (wants_transient) {
-                            parser->libdata().transient_commandlines.push_back(cmdline);
-                        }
-                        // Now invoke any custom completions for this command.
-                        if (!complete_param(cmd, previous_argument_unescape,
-                                            current_argument_unescape, !had_ddash)) {
-                            do_file = false;
-                        }
-                        if (wants_transient) {
-                            parser->libdata().transient_commandlines.pop_back();
-                        }
-                    };
-                    walk_wrap_chain(cmd, *cmd_node.source_range(), receiver);
-                }
-
-                // Hack. If we're cd, handle it specially (issue #1059, others).
-                handle_as_special_cd = (current_command_unescape == L"cd");
-
-                // And if we're autosuggesting, and the token is empty, don't do file suggestions.
-                if ((flags & completion_request_t::autosuggestion) &&
-                    current_argument_unescape.empty()) {
-                    do_file = false;
-                }
-            }
-
-            // This function wants the unescaped string.
-            complete_param_expand(current_token, do_file, handle_as_special_cd);
-
-            // Escape '[' in the argument before completing it.
-            escape_opening_brackets(current_argument);
-
-            // Lastly mark any completions that appear to already be present in arguments.
-            mark_completions_duplicating_arguments(current_token, all_arguments);
         }
     }
+
+    bool do_file = false, handle_as_special_cd = false;
+    if (in_redirection) {
+        do_file = true;
+    } else {
+        // Try completing as an argument.
+        wcstring current_command = cmd_tok.get_source(cmd), current_command_unescape,
+                 previous_argument_unescape, current_argument_unescape;
+        if (unescape_string(current_command, &current_command_unescape, UNESCAPE_DEFAULT) &&
+            unescape_string(previous_argument, &previous_argument_unescape, UNESCAPE_DEFAULT) &&
+            unescape_string(current_argument, &current_argument_unescape, UNESCAPE_INCOMPLETE)) {
+            // Have to walk over the command and its entire wrap chain. If any command
+            // disables do_file, then they all do.
+            do_file = true;
+            auto receiver = [&](const wcstring &cmd, const wcstring &cmdline, size_t depth) {
+                // Perhaps set a transient commandline so that custom completions
+                // buitin_commandline will refer to the wrapped command. But not if
+                // we're doing autosuggestions.
+                bool wants_transient = depth > 0 && !(flags & completion_request_t::autosuggestion);
+                if (wants_transient) {
+                    parser->libdata().transient_commandlines.push_back(cmdline);
+                }
+                // Now invoke any custom completions for this command.
+                if (!complete_param(cmd, previous_argument_unescape, current_argument_unescape,
+                                    !had_ddash)) {
+                    do_file = false;
+                }
+                if (wants_transient) {
+                    parser->libdata().transient_commandlines.pop_back();
+                }
+            };
+            assert(cmd_tok.offset < std::numeric_limits<uint32_t>::max());
+            assert(cmd_tok.length < std::numeric_limits<uint32_t>::max());
+            source_range_t range = {static_cast<uint32_t>(cmd_tok.offset),
+                                    static_cast<uint32_t>(cmd_tok.length)};
+            walk_wrap_chain(cmd, range, receiver);
+        }
+
+        // Hack. If we're cd, handle it specially (issue #1059, others).
+        handle_as_special_cd = (current_command_unescape == L"cd");
+
+        // And if we're autosuggesting, and the token is empty, don't do file suggestions.
+        if ((flags & completion_request_t::autosuggestion) && current_argument_unescape.empty()) {
+            do_file = false;
+        }
+    }
+
+    // This function wants the unescaped string.
+    complete_param_expand(current_argument, do_file, handle_as_special_cd);
+
+    // Escape '[' in the argument before completing it.
+    escape_opening_brackets(current_argument);
+
+    // Lastly mark any completions that appear to already be present in arguments.
+    mark_completions_duplicating_arguments(current_token, tokens);
 }
 
 void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_comps,
diff --git a/src/parse_tree.h b/src/parse_tree.h
index d813249cb..1eb654b72 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -25,6 +25,11 @@ typedef uint32_t source_offset_t;
 
 constexpr source_offset_t SOURCE_OFFSET_INVALID = static_cast<source_offset_t>(-1);
 
+struct source_range_t {
+    uint32_t start;
+    uint32_t length;
+};
+
 /// A struct representing the token type that we use internally.
 struct parse_token_t {
     enum parse_token_type_t type;  // The type of the token as represented by the parser
@@ -137,6 +142,11 @@ class parse_node_t {
         return this->flags & parse_node_flag_preceding_escaped_nl;
     }
 
+    source_range_t source_range() const {
+        assert(has_source());
+        return {source_start, source_length};
+    }
+
     /// Gets source for the node, or the empty string if it has no source.
     wcstring get_source(const wcstring &str) const {
         if (!has_source())
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index eb7a94f59..90846f474 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -288,8 +288,9 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
 }
 
 /// Get the beginning and end of the job or process definition under the cursor.
-static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **a,
-                                  const wchar_t **b, bool process) {
+static void job_or_process_extent(bool process, const wchar_t *buff, size_t cursor_pos,
+                                  const wchar_t **a, const wchar_t **b,
+                                  std::vector<tok_t> *tokens) {
     assert(buff && "Null buffer");
     const wchar_t *begin = nullptr, *end = nullptr;
     int finished = 0;
@@ -323,29 +324,33 @@ static void job_or_process_extent(const wchar_t *buff, size_t cursor_pos, const
             case token_type_t::end:
             case token_type_t::background:
             case token_type_t::andand:
-            case token_type_t::oror: {
+            case token_type_t::oror:
+            case token_type_t::comment: {
                 if (tok_begin >= pos) {
                     finished = 1;
                     if (b) *b = (wchar_t *)begin + tok_begin;
                 } else {
+                    // Statement at cursor might start after this token.
                     if (a) *a = (wchar_t *)begin + tok_begin + token->length;
+                    if (tokens) tokens->clear();
                 }
-                break;
+                continue;  // Do not add this to tokens
             }
             default: {
                 break;
             }
         }
+        if (tokens) tokens->push_back(*token);
     }
 }
 
 void parse_util_process_extent(const wchar_t *buff, size_t pos, const wchar_t **a,
-                               const wchar_t **b) {
-    job_or_process_extent(buff, pos, a, b, true);
+                               const wchar_t **b, std::vector<tok_t> *tokens) {
+    job_or_process_extent(true, buff, pos, a, b, tokens);
 }
 
 void parse_util_job_extent(const wchar_t *buff, size_t pos, const wchar_t **a, const wchar_t **b) {
-    job_or_process_extent(buff, pos, a, b, false);
+    job_or_process_extent(false, buff, pos, a, b, nullptr);
 }
 
 void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **tok_begin,
diff --git a/src/parse_util.h b/src/parse_util.h
index a3e7a849e..3ce8fb3ab 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -55,10 +55,11 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
 ///
 /// \param buff the string to search for subshells
 /// \param cursor_pos the position of the cursor
-/// \param a the start of the searched string
-/// \param b the end of the searched string
+/// \param a the start of the process
+/// \param b the end of the process
+/// \param tokens the tokens in the process
 void parse_util_process_extent(const wchar_t *buff, size_t cursor_pos, const wchar_t **a,
-                               const wchar_t **b);
+                               const wchar_t **b, std::vector<tok_t> *tokens);
 
 /// Find the beginning and end of the job definition under the cursor
 ///
diff --git a/src/tnode.h b/src/tnode.h
index e7b2939e9..491541336 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -5,11 +5,6 @@
 #include "parse_grammar.h"
 #include "parse_tree.h"
 
-struct source_range_t {
-    uint32_t start;
-    uint32_t length;
-};
-
 // Check if a child type is possible for a parent type at a given index.
 template <typename Parent, typename Child, size_t Index>
 constexpr bool child_type_possible_at_index() {
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 964e9afd6..d1689f0a5 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -87,6 +87,13 @@ struct tok_t {
 
     // Construct from a token type.
     explicit tok_t(token_type_t type);
+
+    /// Returns whether the given location is within the source range or at its end.
+    bool location_in_or_at_end_of_source_range(size_t loc) const {
+        return offset <= loc && loc - offset <= length;
+    }
+    /// Gets source for the token, or the empty string if it has no source.
+    wcstring get_source(const wcstring &str) const { return {str, offset, length}; }
 };
 
 /// The tokenizer struct.
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 48095f39d..93d5ba31d 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -124,3 +124,29 @@ complete -C'foo -y' | string match -- -y-single-long
 # CHECK: -zARGZ
 complete -C'foo -z'
 
+
+# Builtins (with subcommands; #2705)
+complete -c complete_test_subcommand -n 'test (commandline -op)[1] = complete_test_subcommand' -xa 'ok'
+complete -C'not complete_test_subcommand '
+# CHECK: ok
+complete -C'echo; and complete_test_subcommand '
+# CHECK: ok
+complete -C'or complete_test_subcommand '
+# CHECK: ok
+complete -C'echo && command complete_test_subcommand '
+# CHECK: ok
+complete -C'echo || exec complete_test_subcommand '
+# CHECK: ok
+complete -C'echo | builtin complete_test_subcommand '
+# CHECK: ok
+complete -C'echo & complete_test_subcommand '
+# CHECK: ok
+complete -C'if while begin begin complete_test_subcommand '
+# CHECK: ok
+
+complete -C'for _ in ' | string collect >&- && echo completed some files
+# CHECK: completed some files
+
+# function; #5415
+complete -C'function : --arg'
+# CHECK: --argument-names	{{.*}}

From d77c465d23b07ec57318deb77710003a27d12b58 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 4 Nov 2019 17:33:37 +0100
Subject: [PATCH 1176/1732] string: Allow `-eq` again

Instead of forbidding it for both modes, allow it for both and make it
quiet for string.

Fixes #6282
---
 src/builtin_string.cpp   | 8 +-------
 tests/checks/string.fish | 8 ++++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index f5cc6f971..d464a18e4 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -750,7 +750,7 @@ class pcre2_matcher_t : public string_matcher_t {
             return 0;
         }
 
-        if (opts.entire) {
+        if (opts.entire && !opts.quiet) {
             streams.out.append(arg);
             streams.out.push_back(L'\n');
         }
@@ -864,12 +864,6 @@ static int string_match(parser_t &parser, io_streams_t &streams, int argc, wchar
         return STATUS_INVALID_ARGS;
     }
 
-    if (opts.entire && opts.quiet) {
-        streams.err.append_format(BUILTIN_ERR_COMBO2, cmd,
-                                  _(L"--entire and --quiet are mutually exclusive"));
-        return STATUS_INVALID_ARGS;
-    }
-
     std::unique_ptr<string_matcher_t> matcher;
     if (opts.regex) {
         matcher = make_unique<pcre2_matcher_t>(cmd, pattern, opts, streams);
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index a82b15883..dc3eb6e84 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -561,5 +561,9 @@ count (dualcollect)
 # CHECK: 3
 
 string match -qer asd asd
-# CHECKERR: match: Invalid combination of options,
-# CHECKERR: --entire and --quiet are mutually exclusive
+echo $status
+# CHECK: 0
+
+string match -eq asd asd
+echo $status
+# CHECK: 0

From e68c24beffcf0319e1dd4d3c64068660a1ec5ed6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 4 Nov 2019 20:08:45 +0100
Subject: [PATCH 1177/1732] docs/tutorial: Fix formatting

This removes the explicit html coloring that was used in the tutorial.
Where necessary we just add pseudo-html like `<red>...</red>` to
explain it to the users.

I don't know how to reintroduce coloring here, but it's not super
important as the user can always just check for themselves.

See #5696

[ci skip]
---
 sphinx_doc_src/tutorial.rst | 162 ++++++++++++++++++------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 5a94c2081..73f47a625 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -22,7 +22,7 @@ which means you are all set up and can start using fish::
     > fish
     Welcome to fish, the friendly interactive shell
     Type help for instructions on how to use fish
-    you@hostname ~>____
+    you@hostname ~>
 
 
 This prompt that you see above is the ``fish`` default prompt: it shows your username, hostname, and working directory.
@@ -45,7 +45,7 @@ Running Commands
 
 ``fish`` runs commands like other shells: you type a command, followed by its arguments. Spaces are separators::
 
-    >_ echo hello world
+    > echo hello world
     hello world
 
 
@@ -53,9 +53,9 @@ This runs the command `echo` with the arguments `hello` and `world`.
 
 You can include a literal space in an argument with a backslash, or by using single or double quotes::
 
-    >_ mkdir My\ Files
-    >_ cp ~/Some\ File 'My Files'
-    >_ ls "My Files"
+    > mkdir My\ Files
+    > cp ~/Some\ File 'My Files'
+    > ls "My Files"
     Some File
 
 
@@ -71,7 +71,7 @@ Getting Help
 
 ::
 
-    >_ man set
+    > man set
     set - handle shell variables
       Synopsis...
 
@@ -82,17 +82,17 @@ Syntax Highlighting
 
 You'll quickly notice that ``fish`` performs syntax highlighting as you type. Invalid commands are colored red by default::
 
-    >_ <eror>/bin/mkd</eror>
+    > <red>/bin/mkd</red>
 
 
 A command may be invalid because it does not exist, or refers to a file that you cannot execute. When the command becomes valid, it is shown in a different color::
 
-    >_ /bin/mkdir
+    > /bin/mkdir
 
 
 ``fish`` will underline valid file paths as you type them::
 
-    >_ cat <u>~/somefi</u>___
+    > cat <underline>~/somefi</underline>
 
 
 This tells you that there exists a file that starts with '``somefi``', which is useful feedback as you type.
@@ -105,7 +105,7 @@ Wildcards
 
 ``fish`` supports the familiar wildcard ``*``. To list all JPEG files::
 
-    >_ ls *.jpg
+    > ls *.jpg
     lena.jpg
     meena.jpg
     santa maria.jpg
@@ -113,14 +113,14 @@ Wildcards
 
 You can include multiple wildcards::
 
-    >_ ls l*.p*
+    > ls l*.p*
     lena.png
     lesson.pdf
 
 
 Especially powerful is the recursive wildcard ** which searches directories recursively::
 
-    >_ ls /var/**.log
+    > ls /var/**.log
     /var/log/system.log
     /var/run/sntp.log
 
@@ -133,8 +133,8 @@ Pipes and Redirections
 
 You can pipe between commands with the usual vertical bar::
 
-    >_ echo hello world | wc
-           1       2      12
+    > echo hello world | wc
+          1       2      12
 
 
 stdin and stdout can be redirected via the familiar `<` and `<`. stderr is redirected with a `2>`.
@@ -143,7 +143,7 @@ stdin and stdout can be redirected via the familiar `<` and `<`. stderr is redir
 
 ::
 
-    >_ grep fish < /etc/shells > ~/output.txt 2> ~/errors.txt
+    > grep fish < /etc/shells > ~/output.txt 2> ~/errors.txt
 
 
 
@@ -152,17 +152,17 @@ Autosuggestions
 
 ``fish`` suggests commands as you type, and shows the suggestion to the right of the cursor, in gray. For example::
 
-    >_ <eror>/bin/h</eror><s>___ostname</s>
+    > <red>/bin/h</red><gray>ostname</gray>
 
 
 It knows about paths and options::
 
-    >_ grep --i<s>___gnore-case</s>
+    > grep --i<gray>gnore-case</gray>
 
 
 And history too. Type a command once, and you can re-summon it by just typing a few letters::
 
-    >_ <eror>r<</eror><s>___sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
+    > <red>r</red><gray>sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</gray>
 
 
 To accept the autosuggestion, hit :kbd:`→` (right arrow) or :kbd:`Control+F`. To accept a single word of the autosuggestion, :kbd:`Alt+→` (right arrow). If the autosuggestion is not what you want, just ignore it.
@@ -174,22 +174,22 @@ Tab Completions
 
 Press :kbd:`Tab`, and ``fish`` will attempt to complete the command, argument, or path::
 
-    >_ <eror>/pri</eror> :kbd:`Tab` => /private/
+    > <red>/pri</red> :kbd:`Tab` => /private/
 
 
 If there's more than one possibility, it will list them::
 
-    >_ <eror>~/stuff/s</eror> :kbd:`Tab`
-    <mtch>~/stuff/script.sh  <i>(Executable, 4.8kB)</i>  \mtch{~/stuff/s</mtch>ources/  <i>(Directory)</i>}
+    > <red>~/stuff/s</red> :kbd:`Tab`
+    ~/stuff/script.sh  (Executable, 4.8kB)  ~/stuff/sources/  (Directory)
 
 
 Hit tab again to cycle through the possibilities.
 
 ``fish`` can also complete many commands, like git branches::
 
-    >_ git merge pr :kbd:`Tab` => git merge prompt_designer
-    >_ git checkout b :kbd:`Tab`
-    <mtch>builtin_list_io_merge <i>(Branch)</i> \mtch{b</mtch>uiltin_set_color <i>(Branch)</i> <mtch>b</mtch>usted_events <i>(Tag)</i>}
+    > git merge pr :kbd:`Tab` => git merge prompt_designer
+    > git checkout b :kbd:`Tab`
+    builtin_list_io_merge (Branch) builtin_set_color (Branch) busted_events (Tag)
 
 
 Try hitting tab and see what ``fish`` can do!
@@ -199,15 +199,15 @@ Variables
 
 Like other shells, a dollar sign performs variable substitution::
 
-    >_ echo My home directory is $HOME
+    > echo My home directory is $HOME
     My home directory is /home/tutorial
 
 
 Variable substitution also happens in double quotes, but not single quotes::
 
-    >_ echo "My current directory is $PWD"
+    > echo "My current directory is $PWD"
     My current directory is /home/tutorial
-    >_ echo 'My current directory is $PWD'
+    > echo 'My current directory is $PWD'
     My current directory is $PWD
 
 
@@ -215,8 +215,8 @@ Unlike other shells, ``fish`` has no dedicated `VARIABLE=VALUE` syntax for setti
 
 ::
 
-    >_ set name 'Mister Noodle'
-    >_ echo $name
+    > set name 'Mister Noodle'
+    > echo $name
     Mister Noodle
 
 
@@ -224,8 +224,8 @@ Unlike other shells, ``fish`` has no dedicated `VARIABLE=VALUE` syntax for setti
 
 Unlike other shells, variables are not further split after substitution::
 
-    >_ mkdir $name
-    >_ ls
+    > mkdir $name
+    > ls
     Mister Noodle
 
 
@@ -235,8 +235,8 @@ You can erase (or "delete") a variable with ``-e`` or ``--erase``
 
 ::
 
-    >_ set -e MyVariable
-    >_ env | grep MyVariable
+    > set -e MyVariable
+    > env | grep MyVariable
     (no output)
 
 Exports (Shell Variables)
@@ -248,8 +248,8 @@ To give a variable to an external command, it needs to be "exported". Unlike oth
 
 ::
 
-    >_ set -x MyVariable SomeValue
-    >_ env | grep MyVariable
+    > set -x MyVariable SomeValue
+    > env | grep MyVariable
     MyVariable=SomeValue
 
 It can also be unexported with ``--unexport`` or ``-u``.
@@ -266,7 +266,7 @@ Some variables, like ``$PWD``, only have one value. By convention, we talk about
 
 Other variables, like ``$PATH``, really do have multiple values. During variable expansion, the variable expands to become multiple arguments::
 
-    >_ echo $PATH
+    > echo $PATH
     /usr/bin /bin /usr/sbin /sbin /usr/local/bin
 
 
@@ -276,23 +276,23 @@ Lists cannot contain other lists: there is no recursion.  A variable is a list o
 
 Get the length of a list with ``count``::
 
-    >_ count $PATH
+    > count $PATH
     5
 
 
 You can append (or prepend) to a list by setting the list to itself, with some additional arguments. Here we append /usr/local/bin to $PATH::
 
-    >_ set PATH $PATH /usr/local/bin
+    > set PATH $PATH /usr/local/bin
 
 
 
 You can access individual elements with square brackets. Indexing starts at 1 from the beginning, and -1 from the end::
 
-    >_ echo $PATH
+    > echo $PATH
     /usr/bin /bin /usr/sbin /sbin /usr/local/bin
-    >_ echo $PATH[1]
+    > echo $PATH[1]
     /usr/bin
-    >_ echo $PATH[-1]
+    > echo $PATH[-1]
     /usr/local/bin
 
 
@@ -302,15 +302,15 @@ You can also access ranges of elements, known as "slices:"
 
 ::
 
-    >_ echo $PATH[1..2]
+    > echo $PATH[1..2]
     /usr/bin /bin
-    >_ echo $PATH[-1..2]
+    > echo $PATH[-1..2]
     /usr/local/bin /sbin /usr/sbin /bin
 
 
 You can iterate over a list (or a slice) with a for loop::
 
-    >_ for val in $PATH
+    > for val in $PATH
         echo "entry: $val"
       end
     entry: /usr/bin/
@@ -322,13 +322,13 @@ You can iterate over a list (or a slice) with a for loop::
 
 Lists adjacent to other lists or strings are expanded as :ref:`cartesian products <cartesian-product>` unless quoted (see :ref:`Variable expansion <expand-variable>`)::
 
-    >_ set a 1 2 3
-    >_ set 1 a b c
-    >_ echo $a$1
+    > set a 1 2 3
+    > set 1 a b c
+    > echo $a$1
     1a 2a 3a 1b 2b 3b 1c 2c 3c
-    >_ echo $a" banana"
+    > echo $a" banana"
     1 banana 2 banana 3 banana
-    >_ echo "$a banana"
+    > echo "$a banana"
     1 2 3 banana
 
 
@@ -339,21 +339,21 @@ Command Substitutions
 
 Command substitutions use the output of one command as an argument to another. Unlike other shells, ``fish`` does not use backticks `` for command substitutions. Instead, it uses parentheses::
 
-    >_ echo In (pwd), running (uname)
+    > echo In (pwd), running (uname)
     In /home/tutorial, running FreeBSD
 
 
 A common idiom is to capture the output of a command in a variable::
 
-    >_ set os (uname)
-    >_ echo $os
+    > set os (uname)
+    > echo $os
     Linux
 
 
 Command substitutions are not expanded within quotes. Instead, you can temporarily close the quotes, add the command substitution, and reopen them, all in the same argument::
 
-    >_ touch "testing_"(date +%s)".txt"
-    >_ ls *.txt
+    > touch "testing_"(date +%s)".txt"
+    > ls *.txt
     testing_1360099791.txt
 
 
@@ -362,9 +362,9 @@ Unlike other shells, fish does not split command substitutions on any whitespace
 
 ::
 
-    >_ printf '%s\n' (pkg-config --libs gio-2.0)
+    > printf '%s\n' (pkg-config --libs gio-2.0)
     -lgio-2.0 -lgobject-2.0 -lglib-2.0
-    >_ printf '%s\n' (pkg-config --libs gio-2.0 | string split " ")
+    > printf '%s\n' (pkg-config --libs gio-2.0 | string split " ")
     -lgio-2.0
     -lgobject-2.0
     -lglib-2.0
@@ -394,8 +394,8 @@ Unlike other shells, ``fish`` stores the exit status of the last command in ``$s
 
 ::
 
-    >_ false
-    >_ echo $status
+    > false
+    > echo $status
     1
 
 
@@ -410,13 +410,13 @@ Combiners (And, Or, Not)
 
 fish supports the familiar ``&&`` and ``||`` to combine commands, and ``!`` to negate them::
 
-    >_ ./configure && make && sudo make install
+    > ./configure && make && sudo make install
 
 Here, `make` is only executed if `./configure` succeeds (returns 0), and `sudo make install` is only executed if both `./configure` and `make` succeed.
 
 fish also supports ``and``, ``or``, and ``not``. The first two are job modifiers and have lower precedence. Example usage::
 
-    >_ cp file1.txt file1_bak.txt && cp file2.txt file2_bak.txt ; and echo "Backup successful"; or echo "Backup failed"
+    > cp file1.txt file1_bak.txt && cp file2.txt file2_bak.txt ; and echo "Backup successful"; or echo "Backup failed"
     Backup failed
 
 
@@ -503,12 +503,12 @@ 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 ``function`` builtin::
 
-    >_ function say_hello
+    > function say_hello
          echo Hello $argv
       end
-    >_ say_hello
+    > say_hello
     Hello
-    >_ say_hello everybody!
+    > say_hello everybody!
     Hello everybody!
 
 
@@ -516,13 +516,13 @@ Unlike other shells, ``fish`` does not have aliases or special prompt syntax. Fu
 
 You can list the names of all functions with the ``functions`` keyword (note the plural!). ``fish`` starts out with a number of functions::
 
-    >_ functions
+    > functions
     alias, cd, delete-or-exit, dirh, dirs, down-or-search, eval, export, fish_command_not_found_setup, fish_config, fish_default_key_bindings, fish_prompt, fish_right_prompt, fish_sigtrap_handler, fish_update_completions, funced, funcsave, grep, help, history, isatty, ls, man, math, nextd, nextd-or-forward-word, open, popd, prevd, prevd-or-backward-word, prompt_pwd, psub, pushd, seq, setenv, trap, type, umask, up-or-search, vared
 
 
 You can see the source for any function by passing its name to ``functions``::
 
-    >_ functions ls
+    > functions ls
     function ls --description 'List contents of directory'
         command ls -G $argv
     end
@@ -533,7 +533,7 @@ Loops
 
 While loops::
 
-    >_ while true
+    > while true
         echo "Loop forever"
     end
     Loop forever
@@ -544,14 +544,14 @@ While loops::
 
 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
 
@@ -563,7 +563,7 @@ Unlike other shells, there is no prompt variable like PS1. To display your promp
 
 You can define your own prompt::
 
-    >_ function fish_prompt
+    > function fish_prompt
         echo "New Prompt % "
     end
     New Prompt % 
@@ -574,7 +574,7 @@ You can define your own prompt::
 
 Multiple lines are OK. Colors can be set via ``set_color``, passing it named ANSI colors, or hex RGB values::
 
-    >_ function fish_prompt
+    > function fish_prompt
           set_color purple
           date "+%m/%d/%y"
           set_color FF0
@@ -595,16 +595,16 @@ $PATH
 
 To prepend /usr/local/bin and /usr/sbin to ``$PATH``, you can write::
 
-    >_ set PATH /usr/local/bin /usr/sbin $PATH
+    > set PATH /usr/local/bin /usr/sbin $PATH
 
 
 To remove /usr/local/bin from ``$PATH``, you can write::
 
-    >_ set PATH (string match -v /usr/local/bin $PATH)
+    > set PATH (string match -v /usr/local/bin $PATH)
 
 For compatibility with other shells and external commands, $PATH is a :ref:`path variable<variables-path>`, and so will be joined with colons (not spaces) when you quote it:
 
-    >_ echo "$PATH"
+    > echo "$PATH"
     /usr/local/sbin:/usr/local/bin:/usr/bin
 
 and it will be exported like that, and when fish starts it splits the $PATH it receives into a list on colon.
@@ -613,7 +613,7 @@ You can do so directly in ``config.fish``, like you might do in other shells wit
 
 A faster way is to modify the ``$fish_user_paths`` :ref:`universal variable <tut-universal>`, which is automatically prepended to ``$PATH``. For example, to permanently add ``/usr/local/bin`` to your ``$PATH``, you could write::
 
-    >_ set -U fish_user_paths /usr/local/bin $fish_user_paths
+    > set -U fish_user_paths /usr/local/bin $fish_user_paths
 
 
 The advantage is that you don't have to go mucking around in files: just run this once at the command line, and it will affect the current session and all future instances too. (Note: you should NOT add this line to ``config.fish``. If you do, the variable will get longer each time you run fish!)
@@ -629,7 +629,7 @@ It is possible to directly create functions and variables in ``config.fish`` fil
 
 ::
 
-    >_ cat ~/.config/fish/config.fish
+    > cat ~/.config/fish/config.fish
     
     set -x PATH $PATH /sbin/
     
@@ -649,7 +649,7 @@ When ``fish`` encounters a command, it attempts to autoload a function for that
 
 For example, if you wanted to have a function ``ll``, you would add a text file ``ll.fish`` to ``~/.config/fish/functions``::
 
-    >_ cat ~/.config/fish/functions/ll.fish
+    > cat ~/.config/fish/functions/ll.fish
     function ll
         ls -lh $argv
     end
@@ -657,7 +657,7 @@ For example, if you wanted to have a function ``ll``, you would add a text file
 
 This is the preferred way to define your prompt as well::
 
-    >_ cat ~/.config/fish/functions/fish_prompt.fish
+    > cat ~/.config/fish/functions/fish_prompt.fish
     function fish_prompt
         echo (pwd) "> "
     end
@@ -672,12 +672,12 @@ Universal Variables
 
 A universal variable is a variable whose value is shared across all instances of ``fish``, now and in the future – even after a reboot. You can make a variable universal with ``set -U``::
 
-    >_ set -U EDITOR vim
+    > set -U EDITOR vim
 
 
 Now in another shell::
 
-    >_ echo $EDITOR
+    > echo $EDITOR
     vim
 
 
@@ -696,12 +696,12 @@ You can use the following commands for this:
 Add the fish shell ``/usr/local/bin/fish``
 to ``/etc/shells`` with::
 
-    >echo /usr/local/bin/fish | sudo tee -a /etc/shells
+    > echo /usr/local/bin/fish | sudo tee -a /etc/shells
 
 
 Change your default shell to fish with::
 
-    >chsh -s /usr/local/bin/fish
+    > chsh -s /usr/local/bin/fish
 
 
 (To change it back to another shell, just substitute ``/usr/local/bin/fish``

From e893c8ca976752f26841767d030c69111b6aaa61 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 4 Nov 2019 20:47:58 +0100
Subject: [PATCH 1178/1732] Revert "Set fish_clipboard_paste handler once on
 startup"

This reverts commit f620ddf03bd4232ef68e6e794b17c444daf9a0ea.

Setting the paste handler isn't performance-sensitive.

On the other hand setting it this way makes things less transparent,
less flexible (if e.g. a paste handler is installed while the shell is running),
and causes #6286.

Fixes #6286.

[ci skip]
---
 share/functions/fish_clipboard_paste.fish | 30 ++++++++---------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/share/functions/fish_clipboard_paste.fish b/share/functions/fish_clipboard_paste.fish
index 9a7754a35..08c0402b5 100644
--- a/share/functions/fish_clipboard_paste.fish
+++ b/share/functions/fish_clipboard_paste.fish
@@ -1,24 +1,14 @@
-# Search for and set clipboard handler only once at startup
-if type -q pbpaste
-    function __fish_clipboard_paste
-        pbpaste 2>/dev/null
-    end
-else if set -q WAYLAND_DISPLAY; and type -q wl-paste
-    function __fish_clipboard_paste
-        wl-paste 2>/dev/null
-    end
-else if type -q xsel
-    function __fish_clipboard_paste
-        xsel --clipboard 2>/dev/null
-    end
-else if type -q xclip
-    function __fish_clipboard_paste
-        xclip -selection clipboard -o 2>/dev/null
-    end
-end
-
 function fish_clipboard_paste
-    set -l data (__fish_clipboard_paste)
+    set -l data
+    if type -q pbpaste
+        set data (pbpaste 2>/dev/null)
+    else if set -q WAYLAND_DISPLAY; and type -q wl-paste
+        set data (wl-paste 2>/dev/null)
+    else if type -q xsel
+        set data (xsel --clipboard 2>/dev/null)
+    else if type -q xclip
+        set data (xclip -selection clipboard -o 2>/dev/null)
+    end
 
     # Issue 6254: Handle zero-length clipboard content
     if not string match -qr . -- "$data"

From afb56a007dc0c02d606279924dcb97fa82533709 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 08:44:04 +0100
Subject: [PATCH 1179/1732] Fix completions for env

Fixes #5306
---
 share/completions/env.fish | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/share/completions/env.fish b/share/completions/env.fish
index 2f939bd91..1de054afd 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -1,6 +1,6 @@
 function __fish_complete_env_subcommand
-    argparse -s s/ignore-environment u/unset h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null
-    or return
+    argparse -s s/ignore-environment u/unset= h-help v-version -- (commandline -opc) (commandline -ct) 2>/dev/null
+    or return 1
 
     # argv[1] is `env` or an alias.
     set -e argv[1]
@@ -8,6 +8,7 @@ function __fish_complete_env_subcommand
     # Remove all VAR=VAL arguments up to the first that isn't
     while set -q argv[1]
         if string match -q '*=*' -- $argv[1]
+        or string match -q -- '-*' $argv[1]
             set -e argv[1]
         else
             break
@@ -15,19 +16,17 @@ function __fish_complete_env_subcommand
     end
 
     # Then complete the rest as if it was given as a command.
-    if set -q argv[1]
-        complete -C"$argv"
+    if test -n "$argv"
+        complete -C "$argv"
         return 0
     end
     return 1
 end
 
-# Files aren't useful with env. They are correctly suggested with the command.
-complete -c env -f
+complete -c env -a "(__fish_complete_env_subcommand)"
 
-complete -c env -a "(__fish_complete_env_subcommand)" # -d "Command"
-
-complete -c env -n 'not __fish_complete_env_subcommand' -a "(set -n)=" -x -d "Redefine variable"
+# complete VAR= only if the cursor is left of the =, otherwise complete the file right of the =
+complete -c env -n 'not __fish_complete_env_subcommand; and not string match -eq = -- (commandline -ct)' -a "(set -n)=" -f -d "Redefine variable"
 complete -c env -n 'not __fish_complete_env_subcommand' -s i -l ignore-environment -d "Start with an empty environment"
 complete -c env -n 'not __fish_complete_env_subcommand' -s u -l unset -d "Remove variable from the environment" -x -a "(set -n)"
 complete -c env -n 'not __fish_complete_env_subcommand' -l help -d "Display help and exit"

From 12e783e30ec1147ea3e210dab8e56d066bac15ad Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 08:45:57 +0100
Subject: [PATCH 1180/1732] sphinx docs: put search box above TOC

Makes it visible without having to scroll down.
[ci skip]
---
 sphinx_doc_src/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index fe9ad2180..dc06c190d 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -129,7 +129,7 @@ html_static_path = ["_static"]
 # default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
 # 'searchbox.html']``.
 #
-html_sidebars = {"**": ["globaltoc.html", "localtoc.html", "searchbox.html"]}
+html_sidebars = {"**": ["globaltoc.html", "searchbox.html", "localtoc.html"]}
 
 
 # -- Options for HTMLHelp output ---------------------------------------------

From 36693e43919524c1c071f3ae5010ba7b01065710 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 3 Nov 2019 23:55:54 +0100
Subject: [PATCH 1181/1732] Complete empty subcomands consistently

If the command is empty, try to complete starting from the empty command
instead of the whole commandline.
---
 share/completions/doas.fish                           | 2 +-
 share/completions/su.fish                             | 2 +-
 share/completions/sudo.fish                           | 2 +-
 share/completions/svn.fish                            | 4 ++--
 share/completions/type.fish                           | 2 +-
 share/completions/which.fish                          | 2 +-
 share/completions/xterm.fish                          | 2 +-
 share/functions/__fish_complete_command.fish          | 6 ++++--
 share/functions/__fish_complete_external_command.fish | 2 +-
 share/functions/__fish_complete_subcommand.fish       | 2 +-
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/share/completions/doas.fish b/share/completions/doas.fish
index 411d67a41..e56071ec4 100644
--- a/share/completions/doas.fish
+++ b/share/completions/doas.fish
@@ -24,7 +24,7 @@ end
 function __fish_complete_doas_subcommand
     set -l args (__fish_doas_print_remaining_args)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
-    complete -C"$args"
+    complete -C "$args"
 end
 
 complete -c doas -n "not __fish_doas_print_remaining_args" -s a -d "Choose auth method on systems using /etc/login.conf"
diff --git a/share/completions/su.fish b/share/completions/su.fish
index 83115209b..410f22c19 100644
--- a/share/completions/su.fish
+++ b/share/completions/su.fish
@@ -2,7 +2,7 @@
 
 complete -x -c su -a "(__fish_complete_users)"
 complete -c su -s l -l login -d "Make login shell"
-complete -r -c su -s c -l command -d "Pass command to shell" -xa "(complete -C(commandline -ct))"
+complete -c su -s c -l command -d "Pass command to shell" -xa "(__fish_complete_external_command)"
 complete -c su -s f -l fast -d "Pass -f to the shell"
 complete -c su -s m -l preserve_environment -d "Preserve environment"
 complete -c su -s p -d "Preserve environment"
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index f092fddce..f432b5334 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -34,7 +34,7 @@ end
 function __fish_complete_sudo_subcommand
     set -l args (__fish_sudo_print_remaining_args)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
-    complete -C"$args"
+    complete -C "$args"
 end
 
 # All these options should be valid for GNU and OSX sudo
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index 6590ac876..7e02653d3 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -172,7 +172,7 @@ for cmd in $blame $diff $log $merge
 end
 
 for cmd in $cleanup $merge $switch $update
-    _svn_cmpl_ $cmd -l diff3-cmd -d 'Use as merge command' -xa "(complete -C(commandline -ct))"
+    _svn_cmpl_ $cmd -l diff3-cmd -d 'Use as merge command' -xa "(__fish_complete_external_command)"
 end
 
 for cmd in $blame $info $list $log $stat
@@ -193,7 +193,7 @@ end
 
 for cmd in $diff $log
     _svn_cmpl_ $cmd -l internal-diff -d 'Override diff-cmd specified in config file'
-    _svn_cmpl_ $cmd -l diff-cmd -d 'Use external diff command' -xa "(complete -C(commandline -ct))"
+    _svn_cmpl_ $cmd -l diff-cmd -d 'Use external diff command' -xa "(__fish_complete_external_command)"
 end
 
 for cmd in $add $import
diff --git a/share/completions/type.fish b/share/completions/type.fish
index e9598c7f0..e58ba1de2 100644
--- a/share/completions/type.fish
+++ b/share/completions/type.fish
@@ -10,4 +10,4 @@ complete -c type -s q -l quiet -d "Suppress output"
 complete -c type -a "(builtin -n)" -d "Builtin"
 complete -c type -a "(functions -n)" -d "Function"
 
-complete -c type -a "(complete -C(commandline -ct))" -x
+complete -c type -a "(__fish_complete_command)" -x
diff --git a/share/completions/which.fish b/share/completions/which.fish
index d6c6decef..1b54defc9 100644
--- a/share/completions/which.fish
+++ b/share/completions/which.fish
@@ -16,4 +16,4 @@ else # OSX
     complete -c which -s s -d "Print no output, only return 0 if found"
 end
 
-complete -c which -a "(complete -C(commandline -ct))" -x
+complete -c which -a "(__fish_complete_external_command)" -x
diff --git a/share/completions/xterm.fish b/share/completions/xterm.fish
index 036d0643e..b8c254d73 100644
--- a/share/completions/xterm.fish
+++ b/share/completions/xterm.fish
@@ -98,7 +98,7 @@ complete -c xterm -o wc -d 'Use wide characters'
 complete -c xterm -o wf -d 'Wait the first time for the window to be mapped'
 complete -c xterm -o Sccn -d 'Use as input/output channel for an existing program'
 
-complete -c xterm -s e -a "(complete -C(commandline -ct))" -x -d 'Run program in xterm'
+complete -c xterm -s e -a "(__fish_complete_external_command)" -x -d 'Run program in xterm'
 
 complete -r -c xterm -o bcf -d 'Blinking cursor will be off for that many milliseconds'
 complete -r -c xterm -o bcn -d 'Blinking cursor will be on for that many milliseconds'
diff --git a/share/functions/__fish_complete_command.fish b/share/functions/__fish_complete_command.fish
index f6cc7e20a..ddbfb0273 100644
--- a/share/functions/__fish_complete_command.fish
+++ b/share/functions/__fish_complete_command.fish
@@ -3,8 +3,10 @@ function __fish_complete_command --description 'Complete using all available com
     switch $ctoken
         case '*=*'
             set ctoken (string split "=" -- $ctoken)
-            printf '%s\n' $ctoken[1]=(complete -C$ctoken[2])
+            printf '%s\n' $ctoken[1]=(complete -C "$ctoken[2]")
+        case '-*' # do not try to complete options as commands
+            return
         case '*'
-            complete -C$ctoken
+            complete -C "$ctoken"
     end
 end
diff --git a/share/functions/__fish_complete_external_command.fish b/share/functions/__fish_complete_external_command.fish
index 218aee4f3..2790c61e7 100644
--- a/share/functions/__fish_complete_external_command.fish
+++ b/share/functions/__fish_complete_external_command.fish
@@ -1,3 +1,3 @@
 function __fish_complete_external_command
-    command find $PATH/ -maxdepth 1 -perm +u+x 2>&- | string match -r '[^/]*$'
+    command find $PATH/ -maxdepth 1 -perm -u+x 2>&- | string match -r '[^/]*$'
 end
diff --git a/share/functions/__fish_complete_subcommand.fish b/share/functions/__fish_complete_subcommand.fish
index 9f5ac1d59..79496d6d2 100644
--- a/share/functions/__fish_complete_subcommand.fish
+++ b/share/functions/__fish_complete_subcommand.fish
@@ -39,7 +39,7 @@ function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowin
         end
     end
 
-    printf "%s\n" (complete -C$res)
+    printf "%s\n" (complete -C "$res")
 
 end
 

From 4c733822315cdd128034a50b99786c4817832faa Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 09:49:01 +0100
Subject: [PATCH 1182/1732] Fix function definitions potentially leaking as
 completions

---
 src/complete.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/complete.cpp b/src/complete.cpp
index 495bedc9f..c22c8d6e2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -655,6 +655,15 @@ static wcstring complete_function_desc(const wcstring &fn) {
     bool has_description = function_get_desc(fn, result);
     if (!has_description) {
         function_get_definition(fn, result);
+        // Consider complete -a '(complete -C "prefix")':
+        // If some functions whose name starts with prefix and whose
+        // definition includes a line that starts with prefix, this line
+        // would be suggested as completion.
+        // Replace newlines by spaces to avoid these excess lines.
+        // The completion description will be shown in one line regardless.
+        for (wchar_t &c : result) {
+            if (c == L'\n') c = L' ';
+        }
     }
     return result;
 }

From 277fca9c6a26600ce8dc7cb2a035d412a9476868 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 3 Nov 2019 23:55:54 +0100
Subject: [PATCH 1183/1732] Complete all available commands on empty
 commandline

---
 src/complete.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index c22c8d6e2..94e162366 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -673,8 +673,6 @@ static wcstring complete_function_desc(const wcstring &fn) {
 ///
 /// \param str_cmd the command string to find completions for
 void completer_t::complete_cmd(const wcstring &str_cmd) {
-    if (str_cmd.empty()) return;
-
     std::vector<completion_t> possible_comp;
 
     // Append all possible executables
@@ -697,8 +695,9 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
             vars, parser, NULL);
     UNUSED(ignore);
 
-    if (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~') {
-        wcstring_list_t names = function_get_names(str_cmd.at(0) == L'_');
+    if (str_cmd.empty() || (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~')) {
+        bool include_hidden = !str_cmd.empty() && str_cmd.at(0) == L'_';
+        wcstring_list_t names = function_get_names(include_hidden);
         for (wcstring &name : names) {
             // Append all known matching functions
             append_completion(&possible_comp, std::move(name));
@@ -1485,9 +1484,8 @@ void completer_t::perform() {
         // Don't autosuggest anything based on the empty string (generalizes #1631).
         if (flags & completion_request_t::autosuggestion) return;
 
-        // fish has been using generic completion of filenames relative to the current directory.
-        // TODO there's some discussion in issue #5418 on what else we could do here.
-        complete_param_expand(L"", true /* do_file */);
+        complete_cmd(L"");
+        complete_abbr(L"");
         return;
     }
 

From d8b305d6e455227925806f5b408c1e92abf27b9b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 5 Nov 2019 18:06:20 +0800
Subject: [PATCH 1184/1732] README.md: add dependency on tee

Required for psub to work correctly.

[ci skip]
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf8d44712..e94c40730 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Once installed, run `fish` from your current shell to try fish out!
 Running fish requires:
 
 * curses or ncurses (preinstalled on most \*nix systems)
-* some common \*nix system utilities (currently `mktemp`), in addition to the basic POSIX utilities (`cat`, `cut`, `dirname`, `ls`, `mkdir`, `mkfifo`, `rm`, `sort`, `tr`, `uname` and `sed` at least, but the full coreutils plus find, sed and awk is preferred)
+* some common \*nix system utilities (currently `mktemp`), in addition to the basic POSIX utilities (`cat`, `cut`, `dirname`, `ls`, `mkdir`, `mkfifo`, `rm`, `sort`, `tee`, `tr`, `uname` and `sed` at least, but the full coreutils plus find, sed and awk is preferred)
 * gettext (library and `gettext` command), if compiled with translation support
 
 The following optional features also have specific requirements:

From 4f1fa9513cc8aeb6c64df20d5a21e7f263fba538 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 10:56:03 +0100
Subject: [PATCH 1185/1732] Make most subcommand completions take external
 commands only

Also fix ssh completions which were broken by
277fca9c6a26600ce8dc7cb2a035d412a9476868.
---
 share/completions/and.fish                    |  2 +-
 share/completions/begin.fish                  |  2 +-
 share/completions/command.fish                |  3 +-
 share/completions/doas.fish                   |  2 +-
 share/completions/env.fish                    |  2 +-
 share/completions/exec.fish                   |  3 +-
 share/completions/if.fish                     |  2 +-
 share/completions/mosh.fish                   |  2 +-
 share/completions/not.fish                    |  2 +-
 share/completions/or.fish                     |  2 +-
 share/completions/ssh.fish                    |  2 +-
 share/completions/sudo.fish                   |  2 +-
 share/completions/while.fish                  |  2 +-
 .../functions/__fish_complete_subcommand.fish | 73 +++++++++++--------
 14 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/share/completions/and.fish b/share/completions/and.fish
index 9066e6101..50d2825b6 100644
--- a/share/completions/and.fish
+++ b/share/completions/and.fish
@@ -1,3 +1,3 @@
 complete -c and -s h -l help -d 'Display help and exit'
-complete -c and -xa '( __fish_complete_subcommand )'
+complete -c and -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
 
diff --git a/share/completions/begin.fish b/share/completions/begin.fish
index e95aa4bbc..4d3c1256f 100644
--- a/share/completions/begin.fish
+++ b/share/completions/begin.fish
@@ -1,2 +1,2 @@
 complete -c begin -s h -l help -d 'Display help and exit'
-complete -c begin -xa '(__fish_complete_subcommand)'
+complete -c begin -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
diff --git a/share/completions/command.fish b/share/completions/command.fish
index 7c3e6956b..85d4eca3a 100644
--- a/share/completions/command.fish
+++ b/share/completions/command.fish
@@ -3,5 +3,4 @@ complete -c command -n 'test (count (commandline -opc)) -eq 1' -s a -l all -d 'P
 complete -c command -n 'test (count (commandline -opc)) -eq 1' -s q -l quiet -d 'Do not print anything, only set exit status'
 complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
 complete -c command -n 'test (count (commandline -opc)) -eq 1' -s s -l search -d 'Print the file that would be executed'
-complete -c command -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
-complete -c command -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
+complete -c command -xa "(__fish_complete_subcommand)"
diff --git a/share/completions/doas.fish b/share/completions/doas.fish
index e56071ec4..e90cf7730 100644
--- a/share/completions/doas.fish
+++ b/share/completions/doas.fish
@@ -24,7 +24,7 @@ end
 function __fish_complete_doas_subcommand
     set -l args (__fish_doas_print_remaining_args)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
-    complete -C "$args"
+    __fish_complete_subcommand --commandline $args
 end
 
 complete -c doas -n "not __fish_doas_print_remaining_args" -s a -d "Choose auth method on systems using /etc/login.conf"
diff --git a/share/completions/env.fish b/share/completions/env.fish
index 1de054afd..370cd3fed 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -17,7 +17,7 @@ function __fish_complete_env_subcommand
 
     # Then complete the rest as if it was given as a command.
     if test -n "$argv"
-        complete -C "$argv"
+        __fish_complete_subcomand --commandline $argv
         return 0
     end
     return 1
diff --git a/share/completions/exec.fish b/share/completions/exec.fish
index 1123f1e3e..73b535ee0 100644
--- a/share/completions/exec.fish
+++ b/share/completions/exec.fish
@@ -1,3 +1,2 @@
 complete -c exec -n 'test (count (commandline -opc)) -eq 1' -s h -l help -d 'Display help and exit'
-complete -c exec -n 'test (count (commandline -opc)) -eq 1' -xa "(__fish_complete_external_command)"
-complete -c exec -n 'test (count (commandline -opc)) -ge 2' -xa "(__fish_complete_subcommand)"
+complete -c exec -xa "(__fish_complete_subcommand)"
diff --git a/share/completions/if.fish b/share/completions/if.fish
index 978b1868d..5a2c2bdd4 100644
--- a/share/completions/if.fish
+++ b/share/completions/if.fish
@@ -1,2 +1,2 @@
 complete -c if -s h -l help -d 'Display help and exit'
-complete -c if -xa '(__fish_complete_subcommand)'
+complete -c if -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
diff --git a/share/completions/mosh.fish b/share/completions/mosh.fish
index 36a00b36f..2185d24da 100644
--- a/share/completions/mosh.fish
+++ b/share/completions/mosh.fish
@@ -4,7 +4,7 @@ complete -x -c mosh -d Hostname -a "(__fish_complete_user_at_hosts)"
 complete -x -c mosh -d User -a "
 (__fish_print_users)@
 "
-complete -c mosh -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
+complete -c mosh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
 
 complete -c mosh -l client -d 'Path to client helper on local machine (default: "mosh-client")'
 complete -c mosh -l server -d 'Command to run server helper on remote machine (default: "mosh-server")'
diff --git a/share/completions/not.fish b/share/completions/not.fish
index 90fa69045..f77344e86 100644
--- a/share/completions/not.fish
+++ b/share/completions/not.fish
@@ -1,2 +1,2 @@
 complete -c not -s h -l help -d 'Display help and exit'
-complete -c not -xa '(__fish_complete_subcommand)'
+complete -c not -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
diff --git a/share/completions/or.fish b/share/completions/or.fish
index d95e0957d..2c081c22d 100644
--- a/share/completions/or.fish
+++ b/share/completions/or.fish
@@ -1,3 +1,3 @@
 
 complete -c or -s h -l help -d 'Display help and exit'
-complete -c or -xa '(__fish_complete_subcommand)'
+complete -c or -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index f2becec78..6bbc57118 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -13,7 +13,7 @@ complete -x -c ssh -d "Remote" -a "(__fish_complete_user_at_hosts)"
 # (__fish_print_users | string match -r -v '^_')@
 # "
 
-complete -c ssh -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
+complete -c ssh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command to run" -x -a '(__fish_complete_subcommand --fcs-skip=2)'
 
 complete -c ssh -s a -d "Disables forwarding of the authentication agent"
 complete -c ssh -s A -d "Enables forwarding of the authentication agent"
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index f432b5334..24abb0cce 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -34,7 +34,7 @@ end
 function __fish_complete_sudo_subcommand
     set -l args (__fish_sudo_print_remaining_args)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
-    complete -C "$args"
+    __fish_complete_subcommand --commandline $args
 end
 
 # All these options should be valid for GNU and OSX sudo
diff --git a/share/completions/while.fish b/share/completions/while.fish
index d85e72092..d799cf9ec 100644
--- a/share/completions/while.fish
+++ b/share/completions/while.fish
@@ -1,2 +1,2 @@
 complete -c while -s h -l help -d 'Display help and exit'
-complete -c while -xa '(__fish_complete_subcommand)'
+complete -c while -xa '(__fish_complete_subcommand --allow-functions-and-builtins)'
diff --git a/share/functions/__fish_complete_subcommand.fish b/share/functions/__fish_complete_subcommand.fish
index 79496d6d2..d67c009a5 100644
--- a/share/functions/__fish_complete_subcommand.fish
+++ b/share/functions/__fish_complete_subcommand.fish
@@ -1,45 +1,58 @@
 function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowing
+    # Pass --commandline to complete the remainder of the arguments instead of the commandline.
+    # Pass --allow-functions-and-builtins to enable the completion of the first token as function or builtin.
+    # Other args are considered flags to the supercommand that require an option.
+
+    # How many non-option tokens we skip in the input commandline before completing the subcommand
+    # Usually 1; for ssh 2.
     set -l skip_next 1
-    set -l test
-    switch "$argv[1]"
-        case '--fcs-skip=*'
-            set -l rest
-            string replace -a = ' ' -- $argv[1] | read test skip_next
-            set -e argv[1]
-    end
-
-    set -l res ""
-    set -l had_cmd 0
-    set -l cmd (commandline -cop) (commandline -ct)
-
-    for i in $cmd
-
-        if test $skip_next -gt 0
-            set skip_next (math $skip_next - 1)
-            continue
+    set -l allow_functions_and_builtins false
+    set -l subcommand
+    while string match -rq -- '^--[a-z]' $argv[1]
+        set -l arg $argv[1]
+        set -e argv[1]
+        switch $arg
+            case '--fcs-skip=*'
+                set skip_next (string split = -- $arg)[2]
+            case '--allow-functions-and-builtins'
+                set allow_functions_and_builtins true
+            case '--commandline'
+                set subcommand $argv
+                set -e argv
+                break
         end
+    end
+    set -l options_with_param $argv
 
-        if test "$had_cmd" = 1
-            set res "$res $i"
-        else
-
-            if contains -- $i $argv
+    if not string length -q $subcommand
+        set cmd (commandline -cop) (commandline -ct)
+        while set -q cmd[1]
+            set -l token $cmd[1]
+            set -e cmd[1]
+            if contains -- $token $options_with_param
                 set skip_next (math $skip_next + 1)
                 continue
             end
-
-            switch $i
-                case '-*'
-                case '*=*'
+            switch $token
+                case '-*' '*=*'
+                    continue
                 case '*'
-
-                    set had_cmd 1
-                    set res $i
+                    if test $skip_next -gt 0
+                        set skip_next (math $skip_next - 1)
+                        continue
+                    end
+                    # found the start of our command
+                    set subcommand $token $cmd
+                    break
             end
         end
     end
 
-    printf "%s\n" (complete -C "$res")
+    if test $allow_functions_and_builtins = false && test (count $subcommand) -eq 1
+        __fish_complete_external_command
+    else
+        printf "%s\n" (complete -C "$subcommand")
+    end
 
 end
 

From 23eb6e9c09fa5b022eba254fcb07007ffcfc3b14 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 12:59:49 +0100
Subject: [PATCH 1186/1732] Don't compute $history for variable completion
 description

Fixes #6288
---
 src/complete.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 94e162366..0120f03d9 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1190,13 +1190,18 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
 
         wcstring desc;
         if (this->wants_descriptions()) {
-            // Can't use this->vars here, it could be any variable.
-            auto var = vars.get(env_name);
-            if (!var) continue;
-
             if (this->type() != COMPLETE_AUTOSUGGEST) {
-                wcstring value = expand_escape_variable(*var);
-                desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str());
+                // $history can be huge, don't put it in the completion description; see #6288.
+                if (env_name == L"history") {
+                    desc = format_string(L"Full history of interactive commands");
+                } else {
+                    // Can't use this->vars here, it could be any variable.
+                    auto var = vars.get(env_name);
+                    if (!var) continue;
+
+                    wcstring value = expand_escape_variable(*var);
+                    desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str());
+                }
             }
         }
 

From 04c912e0e3c15532d5a5e90ac2534982070777f9 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 13:32:41 +0100
Subject: [PATCH 1187/1732] Fix typo, closes #6289

[ci skip]
---
 share/completions/env.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/env.fish b/share/completions/env.fish
index 370cd3fed..adcff27f9 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -17,7 +17,7 @@ function __fish_complete_env_subcommand
 
     # Then complete the rest as if it was given as a command.
     if test -n "$argv"
-        __fish_complete_subcomand --commandline $argv
+        __fish_complete_subcommand --commandline $argv
         return 0
     end
     return 1

From e1e82ecd40fa54372983d18a78cb7e5defd46c51 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 5 Nov 2019 21:48:33 +0800
Subject: [PATCH 1188/1732] CHANGELOG: work towards 3.1.0

Up-to-date to eac9ec90.

[ci skip]
---
 CHANGELOG.md | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250d4d9e0..7fedbcab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,13 +3,14 @@
 ## Notable improvements and fixes
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632)
 - fish no longer buffers pipes to the last function in a pipeline, improving many cases where pipes appeared to block or hang (#1396).
-- An overhaul of error messages for builtin commands, including a removal of the overwhelming usage summary, more readable stack traces (#3404, #5434), stack traces for `test` (aka `[`) (#5771).
-- `fish`'s debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
+- An overhaul of error messages for builtin commands, including a removal of the overwhelming usage summary, more readable stack traces (#3404, #5434), and stack traces for `test` (aka `[`) (#5771).
+- fish's debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
 - `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
 - Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
-- `fish` now correctly handles CDPATH entries that starts with `..` (#6220).
+- fish now correctly handles CDPATH entries that starts with `..` (#6220).
 - The `fish_trace` variable may be set to trace execution. This performs a similar role as `set -x`.
+- fish uses the temporary directory determined by the system, rather than relying on `/tmp` (#3845).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
@@ -20,15 +21,17 @@
 - `string split0` now returns 0 if it split something (#5701).
 - In the interest of consistency, `builtin -q` and `command -q` can now be used to query if a builtin or command exists (#5631).
 - `math` now accepts `--scale=max` for the maximum scale (#5579).
+- `builtin $var` now works correctly, allowing a variable as the builtin name (#5639).
 - `cd` understands the `--` argument to make it possible to change to directories starting with a hyphen (#6071).
 - `complete --do-complete` now also does fuzzy matches (#5467).
 - `complete --do-complete` can be used inside completions, allowing limited recursion (#3474).
 - `count` now also counts lines fed on standard input (#5744).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works as expected, rather than requiring `complete -Cfoo`.
-- `complete` gained a new `--force-files` (short `-F`) switch to reenable file completions. This allows `sudo -E` and `pacman -Qo` to complete correctly (#5646).
+- `complete` has a new `--force-files` option, to re-enable file completions. This allows `sudo -E` and `pacman -Qo` to complete correctly (#5646).
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
-- `argparse` learned a new `--ignore-unknown` flag to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
+- `argparse` has a new `--ignore-unknown` option to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
+- `read -S` (short option of `--shell`) is recognised correctly (#5660).
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
 - The default read limit has been increased to 100MiB (#5267).
 - `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
@@ -37,44 +40,50 @@
 - `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
 - A bug where `string split` would drop empty strings if the output was only empty strings has been fixed (#5987).
 - `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
+- `abbr` has a new `--query` option to check for the existence of an abbreviation.
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
 - Empty universal variables may now be exported (#5992).
 - Exported universal variables are no longer imported into the global scope, preventing shadowing. This makes it easier to change such variables for all fish sessions and avoids breakage when the value is a list of multiple elements (#5258).
 - A bug where local variables would not be exported to functions has been fixed (#6153).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
+- `type --path` with a function argument will now output the path to the file containing the definition of that function, if it exists.
 
 ### Interactive improvements
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
 - Completion of subcommands to builtins like `and` or `not` has been fixed (#6249).
+- `dirh` outputs its stack in the correct order (#5477).
+- `funced` and the edit-commandline-in-buffer bindings did not work in fish 3.0 when the `$EDITOR` variable contained spaces; this has been corrected (#5625).
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
+- Shift-Left and Shift-Right now default to moving backwards and forwards by one bigword (words separated by whitespace) (#1505).
 - The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
 - The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
-- The `fish_clipboard_*` functions support wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
-- The nextd and prevd functions no longer print "Hit end of history", instead using a BEL.
+- The `fish_clipboard_*` functions support Wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
+- The nextd and prevd functions no longer print "Hit end of history", instead using a bell.
 - If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
 - The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
 - The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
 - A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
 - The `self-insert` readline command will now insert the binding sequence, if not empty.
-- A new binding to prepend `sudo`, bound to alt-s by default (#6140).
-- The alt-w binding to describe a command should now work better with multiline prompts (#6110)
-- The alt-h binding to open a command's man page now tries to ignore `sudo` (#6122).
+- A new binding to prepend `sudo`, bound to Alt-S by default (#6140).
+- The Alt-W binding to describe a command should now work better with multiline prompts (#6110)
+- The Alt-H binding to open a command's man page now tries to ignore `sudo` (#6122).
 - A new pair of bind functions, `history-prefix-search-backward` (and forward) was introduced (#6143).
 
 #### Improved prompts
 - The git prompt in informative mode now shows the number of stashes if enabled.
-- The git prompt now has an option ($__fish_git_prompt_use_informative_chars) to use the (more modern) informative characters without enabling informative mode.
+- The git prompt now has an option (`$__fish_git_prompt_use_informative_chars`) to use the (more modern) informative characters without enabling informative mode.
 
-#### Improved output
+#### Improved terminal output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).
 - Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552 and others).
 - fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), eliminating the need to set `$fish_emoji_width` in most cases (#5722).
 - fish now underlines every valid entered path instead of just the last one (#5872).
 - When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+- The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
 
 #### New or improved completions
 - Added completions for
@@ -116,7 +125,7 @@
   - `zpaq` (#6245)
 - Lots of improvements to completions.
 
-## Deprecations
+### Deprecations
 - The vcs-prompt functions have been promoted to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
 - `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556). As a reminder, the intention behind feature flags is that this will eventually become the default and then only option, so scripts should be updated.
 
@@ -125,6 +134,7 @@
 - The documentation is now built with Sphinx. The old Doxygen-based documentation system has been removed. Developers, and distributors who wish to rebuild the documentation, must install Sphinx.
 - The `INTERNAL_WCWIDTH` build option has been removed, as fish now always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
 - mandoc can now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
+- Some bugs preventing building on Solaris-derived systems such as Illumos were fixed (#5458, #5461, #5611).
 
 ---
 

From 939d4674e49ffa0474ae40b3634af5ad75ee2027 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 5 Nov 2019 16:47:01 +0100
Subject: [PATCH 1189/1732] Do not compute $history in `builtin set`.

Most uses of set don't care about the value of $history, and it
can be expensive to compute.

See #6290
---
 src/builtin_set.cpp | 25 +++++++++++++++++--------
 src/complete.cpp    |  3 ++-
 src/history.h       |  5 +++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 6e3630676..3aca80a74 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -21,6 +21,7 @@
 #include "env.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "history.h"
 #include "io.h"
 #include "parser.h"
 #include "proc.h"
@@ -463,7 +464,7 @@ static env_mode_flags_t compute_scope(set_cmd_opts_t &opts) {
 }
 
 /// Print the names of all environment variables in the scope. It will include the values unless the
-/// `set --list` flag was used.
+/// `set --names` flag was used.
 static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc, wchar_t **argv,
                             parser_t &parser, io_streams_t &streams) {
     UNUSED(cmd);
@@ -481,10 +482,17 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
         streams.out.append(e_key);
 
         if (!names_only) {
-            auto var = parser.vars().get(key, compute_scope(opts));
-            if (!var.missing_or_empty()) {
+            wcstring val;
+            if (key == L"history") {
+                val = history_variable_description;
+            } else {
+                auto var = parser.vars().get(key, compute_scope(opts));
+                if (!var.missing_or_empty()) {
+                    val = expand_escape_variable(*var);
+                }
+            }
+            if (!val.empty()) {
                 bool shorten = false;
-                wcstring val = expand_escape_variable(*var);
                 if (opts.shorten_ok && val.length() > 64) {
                     shorten = true;
                     val.resize(60);
@@ -596,10 +604,11 @@ static int builtin_set_show(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
     if (argc == 0) {  // show all vars
         wcstring_list_t names = parser.vars().get_names(ENV_USER);
         sort(names.begin(), names.end());
-        for (auto it : names) {
-            show_scope(it.c_str(), ENV_LOCAL, streams, vars);
-            show_scope(it.c_str(), ENV_GLOBAL, streams, vars);
-            show_scope(it.c_str(), ENV_UNIVERSAL, streams, vars);
+        for (const auto &name : names) {
+            if (name == L"history") continue;
+            show_scope(name.c_str(), ENV_LOCAL, streams, vars);
+            show_scope(name.c_str(), ENV_GLOBAL, streams, vars);
+            show_scope(name.c_str(), ENV_UNIVERSAL, streams, vars);
             streams.out.push_back(L'\n');
         }
     } else {
diff --git a/src/complete.cpp b/src/complete.cpp
index 0120f03d9..8461d8637 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -36,6 +36,7 @@
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "function.h"
+#include "history.h"
 #include "iothread.h"
 #include "parse_constants.h"
 #include "parse_util.h"
@@ -1193,7 +1194,7 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
             if (this->type() != COMPLETE_AUTOSUGGEST) {
                 // $history can be huge, don't put it in the completion description; see #6288.
                 if (env_name == L"history") {
-                    desc = format_string(L"Full history of interactive commands");
+                    desc = history_variable_description;
                 } else {
                     // Can't use this->vars here, it could be any variable.
                     auto var = vars.get(env_name);
diff --git a/src/history.h b/src/history.h
index 66895e496..17410e8f7 100644
--- a/src/history.h
+++ b/src/history.h
@@ -293,4 +293,9 @@ bool all_paths_are_valid(const path_list_t &paths, const wcstring &working_direc
 void start_private_mode();
 /// Queries private mode status.
 bool in_private_mode();
+
+/// The description of the $history environment variable, as offered in completions and
+/// the output of builtin set.
+constexpr const wchar_t *history_variable_description = L"Full history of interactive commands";
+
 #endif

From 16bf98f928c11b422e26818411fe279a4ba3c3d5 Mon Sep 17 00:00:00 2001
From: James Stidard <james@stidard.com>
Date: Tue, 5 Nov 2019 22:23:46 +0000
Subject: [PATCH 1190/1732] Fix: equality vs identity

Changes identity `is` for equality `==` check. To remove python warnings when updating auto complete

```
/usr/local/Cellar/fish/3.0.2/share/fish/tools/deroff.py:770: SyntaxWarning: "is" with a literal. Did you mean "=="?
  if len(comps) is 2:
/usr/local/Cellar/fish/3.0.2/share/fish/tools/deroff.py:954: SyntaxWarning: "is" with a literal. Did you mean "=="?
  if len(comps) is 2:
Parsing man pages and writing completions to /Users/james/.local/share/fish/generated_completions/
  6155 / 6155 : zic.8
```
---
 share/tools/deroff.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/tools/deroff.py b/share/tools/deroff.py
index 84d20e544..40b4ba1a3 100755
--- a/share/tools/deroff.py
+++ b/share/tools/deroff.py
@@ -800,7 +800,7 @@ class Deroffer:
         if self.str_at(0):
             # Split at whitespace
             comps = self.s.split(None, 2)
-            if len(comps) is 2:
+            if len(comps) == 2:
                 name, value = comps
                 value = value.rstrip()
                 self.reg_table[name] = value
@@ -998,7 +998,7 @@ class Deroffer:
             if self.str_at(0):
                 # Split at whitespace
                 comps = self.s.split(None, 2)
-                if len(comps) is 2:
+                if len(comps) == 2:
                     name, value = comps
                     value = value.rstrip()
                     self.reg_table[name] = value

From 3b4234a9deb0978fa79fddc64c8696cd4a4eb103 Mon Sep 17 00:00:00 2001
From: Jakub Darul <daruljakub@protonmail.com>
Date: Wed, 6 Nov 2019 14:16:04 +0100
Subject: [PATCH 1191/1732] added d0 to vi keybindings

---
 share/functions/fish_vi_key_bindings.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 0b002cf9b..360a83f93 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -134,6 +134,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset D kill-line
     bind -s --preset d\$ kill-line
     bind -s --preset d\^ backward-kill-line
+    bind -s --preset d0 backward-kill-line
     bind -s --preset dw kill-word
     bind -s --preset dW kill-bigword
     bind -s --preset diw forward-char forward-char backward-word kill-word

From b089a579bd30b6d0200e61dc991fb3356bf9f10f Mon Sep 17 00:00:00 2001
From: Christopher Rogers <christorogers@gmail.com>
Date: Thu, 7 Nov 2019 15:32:43 +0900
Subject: [PATCH 1192/1732] Fix typo in git clean completion

---
 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 1fbaf23d9..04463476e 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1710,7 +1710,7 @@ complete -f -c git -n '__fish_git_needs_command' -a clean -d 'Remove untracked f
 complete -f -c git -n '__fish_git_using_command clean' -s f -l force -d 'Force run'
 complete -f -c git -n '__fish_git_using_command clean' -s i -l interactive -d 'Show what would be done and clean files interactively'
 complete -f -c git -n '__fish_git_using_command clean' -s n -l dry-run -d 'Don\'t actually remove anything, just show what would be done'
-complete -f -c git -n '__fish_git_using_command clean' -s q -l quite -d 'Be quiet, only report errors'
+complete -f -c git -n '__fish_git_using_command clean' -s q -l quiet -d 'Be quiet, only report errors'
 complete -f -c git -n '__fish_git_using_command clean' -s d -d 'Remove untracked directories in addition to untracked files'
 complete -f -c git -n '__fish_git_using_command clean' -s x -d 'Remove ignored files, as well'
 complete -f -c git -n '__fish_git_using_command clean' -s X -d 'Remove only ignored files'

From 08eac28bd89a5bb0df822e76aad594a0450000fa Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 27 Oct 2019 10:56:24 +0100
Subject: [PATCH 1193/1732] Add individual documentation pages for string's
 subcommands

This adds string-x.rst for each subcommand x of string. The main page
(string.rst) is not changed, except that examples are shown directly after
each subcommand.  The subcommand sections in string.rst are created by
textual inclusion of parts of the string-x.rst files.

Subcommand man pages can be viewed with either of:

```
man string collect
man string-collect
string collect <press F1 or Alt-h>
string collect -h
```

While `string -h ...` still prints the full help.

Closes #5968
---
 share/completions/string.fish           |   1 +
 sphinx_doc_src/cmds/string-collect.rst  |  46 +++
 sphinx_doc_src/cmds/string-escape.rst   |  47 +++
 sphinx_doc_src/cmds/string-join.rst     |  37 +++
 sphinx_doc_src/cmds/string-join0.rst    |   5 +
 sphinx_doc_src/cmds/string-length.rst   |  39 +++
 sphinx_doc_src/cmds/string-lower.rst    |  26 ++
 sphinx_doc_src/cmds/string-match.rst    | 108 ++++++
 sphinx_doc_src/cmds/string-repeat.rst   |  46 +++
 sphinx_doc_src/cmds/string-replace.rst  |  66 ++++
 sphinx_doc_src/cmds/string-split.rst    |  67 ++++
 sphinx_doc_src/cmds/string-split0.rst   |   5 +
 sphinx_doc_src/cmds/string-sub.rst      |  40 +++
 sphinx_doc_src/cmds/string-trim.rst     |  39 +++
 sphinx_doc_src/cmds/string-unescape.rst |   5 +
 sphinx_doc_src/cmds/string-upper.rst    |  25 ++
 sphinx_doc_src/cmds/string.rst          | 418 ++++++++----------------
 sphinx_doc_src/index.rst                |   2 +-
 src/builtin_string.cpp                  |   5 +
 19 files changed, 748 insertions(+), 279 deletions(-)
 create mode 100644 sphinx_doc_src/cmds/string-collect.rst
 create mode 100644 sphinx_doc_src/cmds/string-escape.rst
 create mode 100644 sphinx_doc_src/cmds/string-join.rst
 create mode 100644 sphinx_doc_src/cmds/string-join0.rst
 create mode 100644 sphinx_doc_src/cmds/string-length.rst
 create mode 100644 sphinx_doc_src/cmds/string-lower.rst
 create mode 100644 sphinx_doc_src/cmds/string-match.rst
 create mode 100644 sphinx_doc_src/cmds/string-repeat.rst
 create mode 100644 sphinx_doc_src/cmds/string-replace.rst
 create mode 100644 sphinx_doc_src/cmds/string-split.rst
 create mode 100644 sphinx_doc_src/cmds/string-split0.rst
 create mode 100644 sphinx_doc_src/cmds/string-sub.rst
 create mode 100644 sphinx_doc_src/cmds/string-trim.rst
 create mode 100644 sphinx_doc_src/cmds/string-unescape.rst
 create mode 100644 sphinx_doc_src/cmds/string-upper.rst

diff --git a/share/completions/string.fish b/share/completions/string.fish
index a9cf614b8..8b54fba66 100644
--- a/share/completions/string.fish
+++ b/share/completions/string.fish
@@ -1,6 +1,7 @@
 # Completion for builtin string
 # This follows a strict command-then-options approach, so we can just test the number of tokens
 complete -f -c string
+complete -f -c string -n "test (count (commandline -opc)) -le 2" -s h -l help -d "Display help and exit"
 complete -f -c string -n "test (count (commandline -opc)) -ge 2; and not contains -- (commandline -opc)[2] escape collect" -s q -l quiet -d "Do not print output"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "lower"
 complete -f -c string -n "test (count (commandline -opc)) -lt 2" -a "upper"
diff --git a/sphinx_doc_src/cmds/string-collect.rst b/sphinx_doc_src/cmds/string-collect.rst
new file mode 100644
index 000000000..2e06f7990
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-collect.rst
@@ -0,0 +1,46 @@
+string-collect - join strings into one
+======================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string collect [(-N | --no-trim-newlines)] [STRING...]
+
+.. END SYNOPSIS
+
+Description
+-----------
+
+.. BEGIN DESCRIPTION
+
+``string collect`` collects its input into a single output argument, without splitting the output when used in a command substitution. This is useful when trying to collect multiline output from another command into a variable. Exit status: 0 if any output argument is non-empty, or 1 otherwise.
+
+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 in sh. ``--no-trim-newlines`` can be used to disable this behavior, which may be useful when running a command such as ``set contents (cat filename | string collect -N)``.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ echo \"(echo one\ntwo\nthree | string collect)\"
+    "one
+    two
+    three
+    "
+
+    >_ echo \"(echo one\ntwo\nthree | string collect -N)\"
+    "one
+    two
+    three"
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-escape.rst b/sphinx_doc_src/cmds/string-escape.rst
new file mode 100644
index 000000000..4548d52da
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-escape.rst
@@ -0,0 +1,47 @@
+string-escape - escape special characters
+=========================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string escape [(-n | --no-quoted)] [--style=xxx] [STRING...]
+    string unescape [--style=xxx] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+``--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=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``.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ echo \\x07 | string escape
+    cg
+
+    >_ string escape --style=var 'a1 b2'\\u6161
+    a1_20b2__c_E6_85_A1
+
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-join.rst b/sphinx_doc_src/cmds/string-join.rst
new file mode 100644
index 000000000..267c56992
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-join.rst
@@ -0,0 +1,37 @@
+string-join - join strings with delimiter
+=========================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string join [(-q | --quiet)] SEP [STRING...]
+    string join0 [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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 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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ seq 3 | string join ...
+    1...2...3
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-join0.rst b/sphinx_doc_src/cmds/string-join0.rst
new file mode 100644
index 000000000..c13d124ca
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-join0.rst
@@ -0,0 +1,5 @@
+string-join0 - join strings with zero bytes
+===========================================
+
+.. include:: string-join.rst
+   :start-line: 2
diff --git a/sphinx_doc_src/cmds/string-length.rst b/sphinx_doc_src/cmds/string-length.rst
new file mode 100644
index 000000000..d5a9ca359
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-length.rst
@@ -0,0 +1,39 @@
+string-length - print string lengths
+====================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string length [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ string length 'hello, world'
+    12
+
+    >_ set str foo
+    >_ string length -q $str; echo $status
+    0
+    # Equivalent to test -n $str
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-lower.rst b/sphinx_doc_src/cmds/string-lower.rst
new file mode 100644
index 000000000..08e359efe
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-lower.rst
@@ -0,0 +1,26 @@
+string-lower - convert strings to lowercase
+===========================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string lower [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+.. END DESCRIPTION
+
+
+.. BEGIN EXAMPLES
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-match.rst b/sphinx_doc_src/cmds/string-match.rst
new file mode 100644
index 000000000..e4d1c4738
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-match.rst
@@ -0,0 +1,108 @@
+string-match - match substrings
+===============================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string match [(-a | --all)] [(-e | --entire)] [(-i | --ignore-case)] [(-r | --regex)] [(-n | --index)] [(-q | --quiet)] [(-v | --invert)] PATTERN [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+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``.
+
+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 ``--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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+Match Glob Examples
+^^^^^^^^^^^^^^^^^^^
+
+::
+
+    >_ string match '?' a
+    a
+
+    >_ string match 'a*b' axxb
+    axxb
+
+    >_ string match -i 'a??B' Axxb
+    Axxb
+
+    >_ echo 'ok?' | string match '*\\?'
+    ok?
+
+    # Note that only the second STRING will match here.
+    >_ string match 'foo' 'foo1' 'foo' 'foo2'
+    foo
+
+    >_ string match -e 'foo' 'foo1' 'foo' 'foo2'
+    foo1
+    foo
+    foo2
+
+    >_ string match 'foo?' 'foo1' 'foo' 'foo2'
+    foo1
+    foo
+    foo2
+
+Match Regex Examples
+^^^^^^^^^^^^^^^^^^^^
+
+::
+
+    >_ string match -r 'cat|dog|fish' 'nice dog'
+    dog
+
+    >_ string match -r -v "c.*[12]" {cat,dog}(seq 1 4)
+    dog1
+    dog2
+    cat3
+    dog3
+    cat4
+    dog4
+
+    >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56
+    2:34:56
+    2
+    34
+    56
+
+    >_ string match -r '^(\\w{{2,4}})\\g1$' papa mud murmur
+    papa
+    pa
+    murmur
+    mur
+
+    >_ string match -r -a -n at ratatat
+    2 2
+    4 2
+    6 2
+
+    >_ string match -r -i '0x[0-9a-f]{{1,8}}' 'int magic = 0xBadC0de;'
+    0xBadC0de
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-repeat.rst b/sphinx_doc_src/cmds/string-repeat.rst
new file mode 100644
index 000000000..f5b597324
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-repeat.rst
@@ -0,0 +1,46 @@
+string-repeat - multiply a string
+=================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [(-N | --no-newline)] [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+Repeat Examples
+^^^^^^^^^^^^^^^
+
+::
+
+    >_ string repeat -n 2 'foo '
+    foo foo
+
+    >_ echo foo | string repeat -n 2
+    foofoo
+
+    >_ string repeat -n 2 -m 5 'foo'
+    foofo
+
+    >_ string repeat -m 5 'foo'
+    foofo
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-replace.rst b/sphinx_doc_src/cmds/string-replace.rst
new file mode 100644
index 000000000..1564b03e4
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-replace.rst
@@ -0,0 +1,66 @@
+string-replace - replace substrings
+===================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string replace [(-a | --all)] [(-f | --filter)] [(-i | --ignore-case)] [(-r | --regex)] [(-q | --quiet)] PATTERN REPLACEMENT [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+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``.
+
+Exit status: 0 if at least one replacement was performed, or 1 otherwise.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+Replace Literal Examples
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+::
+
+    >_ string replace is was 'blue is my favorite'
+    blue was my favorite
+
+    >_ string replace 3rd last 1st 2nd 3rd
+    1st
+    2nd
+    last
+
+    >_ string replace -a ' ' _ 'spaces to underscores'
+    spaces_to_underscores
+
+Replace Regex Examples
+^^^^^^^^^^^^^^^^^^^^^^
+
+::
+
+    >_ string replace -r -a '[^\\d.]+' ' ' '0 one two 3.14 four 5x'
+    0 3.14 5
+
+    >_ string replace -r '(\\w+)\\s+(\\w+)' '$2 $1 $$' 'left right'
+    right left $
+
+    >_ string replace -r '\\s*newline\\s*' '\\n' 'put a newline here'
+    put a
+    here
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-split.rst b/sphinx_doc_src/cmds/string-split.rst
new file mode 100644
index 000000000..c83e8ddc2
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-split.rst
@@ -0,0 +1,67 @@
+string-split - split strings by delimiter
+=========================================
+
+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...]
+
+.. END SYNOPSIS
+
+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.
+
+See also ``read --delimiter``.
+
+``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.
+
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ string split . example.com
+    example
+    com
+
+    >_ string split -r -m1 / /usr/local/bin/fish
+    /usr/local/bin
+    fish
+
+    >_ string split '' abc
+    a
+    b
+    c
+
+NUL Delimited Examples
+^^^^^^^^^^^^^^^^^^^^^^
+
+::
+
+    >_ # Count files in a directory, without being confused by newlines.
+    >_ count (find . -print0 | string split0)
+    42
+
+    >_ # Sort a list of elements which may contain newlines
+    >_ set foo beta alpha\\ngamma
+    >_ set foo (string join0 $foo | sort -z | string split0)
+    >_ string escape $foo[1]
+    alpha\\ngamma
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-split0.rst b/sphinx_doc_src/cmds/string-split0.rst
new file mode 100644
index 000000000..d3b4ee8e8
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-split0.rst
@@ -0,0 +1,5 @@
+string-split0 - split on zero bytes
+===================================
+
+.. include:: string-split.rst
+   :start-line: 2
diff --git a/sphinx_doc_src/cmds/string-sub.rst b/sphinx_doc_src/cmds/string-sub.rst
new file mode 100644
index 000000000..16cc2eb82
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-sub.rst
@@ -0,0 +1,40 @@
+string-sub - extract substrings
+===============================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string sub [(-s | --start) START] [(-l | --length) LENGTH] [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+Description
+-----------
+
+.. BEGIN DESCRIPTION
+
+``string sub`` prints a substring of each string argument. The start of the substring can be specified with ``-s`` or ``--start`` 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 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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ string sub --length 2 abcde
+    ab
+
+    >_ string sub -s 2 -l 2 abcde
+    bc
+
+    >_ string sub --start=-2 abcde
+    de
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-trim.rst b/sphinx_doc_src/cmds/string-trim.rst
new file mode 100644
index 000000000..832f4f653
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-trim.rst
@@ -0,0 +1,39 @@
+string-trim - remove trailing whitespace
+========================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string trim [(-l | --left)] [(-r | --right)] [(-c | --chars CHARS)] [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+.. END DESCRIPTION
+
+Examples
+--------
+
+.. BEGIN EXAMPLES
+
+::
+
+    >_ string trim ' abc  '
+    abc
+
+    >_ string trim --right --chars=yz xyzzy zany
+    x
+    zan
+
+
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string-unescape.rst b/sphinx_doc_src/cmds/string-unescape.rst
new file mode 100644
index 000000000..cc6c2f22b
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-unescape.rst
@@ -0,0 +1,5 @@
+string-unescape - expand escape sequences
+=========================================
+
+.. include:: string-escape.rst
+   :start-line: 2
diff --git a/sphinx_doc_src/cmds/string-upper.rst b/sphinx_doc_src/cmds/string-upper.rst
new file mode 100644
index 000000000..e73da7dfc
--- /dev/null
+++ b/sphinx_doc_src/cmds/string-upper.rst
@@ -0,0 +1,25 @@
+string-upper - convert strings to uppercase
+===========================================
+
+Synopsis
+--------
+
+.. BEGIN SYNOPSIS
+
+::
+
+    string upper [(-q | --quiet)] [STRING...]
+
+.. END SYNOPSIS
+
+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.
+
+.. END DESCRIPTION
+
+.. BEGIN EXAMPLES
+.. END EXAMPLES
diff --git a/sphinx_doc_src/cmds/string.rst b/sphinx_doc_src/cmds/string.rst
index 18484ca16..f0e5dfb93 100644
--- a/sphinx_doc_src/cmds/string.rst
+++ b/sphinx_doc_src/cmds/string.rst
@@ -40,140 +40,209 @@ The following subcommands are available.
 "collect" subcommand
 --------------------
 
-``string collect [(-N | --no-trim-newlines)] [STRING...]``
+.. include:: string-collect.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``string collect`` collects its input into a single output argument, without splitting the output when used in a command substitution. This is useful when trying to collect multiline output from another command into a variable. Exit status: 0 if any output argument is non-empty, or 1 otherwise.
+.. include:: string-collect.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-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``.
+Examples
+^^^^^^^^
 
-Any trailing newlines on the input are trimmed, just as with ``"$(cmd)"`` substitution in sh. ``--no-trim-newlines`` can be used to disable this behavior, which may be useful when running a command such as ``set contents (cat filename | string collect -N)``.
+.. include:: string-collect.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "escape" and "unescape" subcommands
 -----------------------------------
 
-``string escape [(-n | --no-quoted)] [--style=xxx] [STRING...]``
+.. include:: string-escape.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-escape.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-``--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.
+Examples
+^^^^^^^^
 
-``--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.
+.. include:: string-escape.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
-``--style=regex`` escapes an input string for literal matching within a regex expression. The string is first converted to UTF-8 before being encoded.
+"join" and "join0" subcommands
+------------------------------
 
-``string unescape [--style=xxx] [STRING...]``
+.. include:: string-join.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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``.
+.. include:: string-join.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-"join" subcommand
------------------
+Examples
+^^^^^^^^
 
-``string join [(-q | --quiet)] SEP [STRING...]``
-
-``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.
-
-"join0" subcommand
-------------------
-
-``string join0 [(-q | --quiet)] [STRING...]``
-
-``string join`` 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.
+.. include:: string-join.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "length" subcommand
 -------------------
 
-``string length [(-q | --quiet)] [STRING...]``
+.. include:: string-length.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-length.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+Examples
+^^^^^^^^
+
+.. include:: string-length.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "lower" subcommand
 ------------------
 
-``string lower [(-q | --quiet)] [STRING...]``
+.. include:: string-lower.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-lower.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+.. include:: string-lower.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "match" subcommand
 ------------------
 
-``string match [(-a | --all)] [(-e | --entire)] [(-i | --ignore-case)] [(-r | --regex)] [(-n | --index)] [(-q | --quiet)] [(-v | --invert)] PATTERN [STRING...]``
+.. include:: string-match.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-match.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-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``.
-
-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 ``--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.
+.. include:: string-match.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "repeat" subcommand
 -------------------
 
-``string repeat [(-n | --count) COUNT] [(-m | --max) MAX] [(-N | --no-newline)] [(-q | --quiet)] [STRING...]``
+.. include:: string-repeat.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-repeat.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+Examples
+^^^^^^^^
+
+.. include:: string-repeat.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "replace" subcommand
 --------------------
 
-``string replace [(-a | --all)] [(-f | --filter)] [(-i | --ignore-case)] [(-r | --regex)] [(-q | --quiet)] PATTERN REPLACEMENT [STRING...]``
+.. include:: string-replace.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-replace.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-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``.
-
-Exit status: 0 if at least one replacement was performed, or 1 otherwise.
+.. include:: string-replace.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 .. _cmd-string-split:
-
-"split" subcommand
-------------------
-
-``string split [(-m | --max) MAX] [(-n | --no-empty)] [(-q | --quiet)] [(-r | --right)] SEP [STRING...]``
-
-``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.
-
-See also ``read --delimiter``.
-
 .. _cmd-string-split0:
 
-"split0" subcommand
--------------------
+"split" and "split0" subcommands
+--------------------------------
 
-``string split0 [(-m | --max) MAX] [(-n | --no-empty)] [(-q | --quiet)] [(-r | --right)] [STRING...]``
+.. include:: string-split.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``string split0`` splits each STRING on the zero byte (NUL). Options are the same as ``string split`` except that no separator is given.
+.. include:: string-split.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
 
-``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.
+Examples
+^^^^^^^^
+
+.. include:: string-split.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "sub" subcommand
 ----------------
 
-``string sub [(-s | --start) START] [(-l | --length) LENGTH] [(-q | --quiet)] [STRING...]``
+.. include:: string-sub.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``string sub`` prints a substring of each string argument. The start of the substring can be specified with ``-s`` or ``--start`` 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 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.
+.. include:: string-sub.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+Examples
+^^^^^^^^
+
+.. include:: string-sub.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "trim" subcommand
 -----------------
 
-``string trim [(-l | --left)] [(-r | --right)] [(-c | --chars CHARS)] [(-q | --quiet)] [STRING...]``
+.. include:: string-trim.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-trim.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+Examples
+^^^^^^^^
+
+.. include:: string-trim.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 "upper" subcommand
 ------------------
 
-``string upper [(-q | --quiet)] [STRING...]``
+.. include:: string-upper.rst
+   :start-after: BEGIN SYNOPSIS
+   :end-before: END SYNOPSIS
 
-``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.
+.. include:: string-upper.rst
+   :start-after: BEGIN DESCRIPTION
+   :end-before: END DESCRIPTION
+
+.. include:: string-upper.rst
+   :start-after: BEGIN EXAMPLES
+   :end-before: END EXAMPLES
 
 Regular Expressions
 -------------------
@@ -239,215 +308,8 @@ 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, whie `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/` 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``.
 
 ``string split somedelimiter`` is a replacement for ``tr somedelimiter \\n``.
-
-Examples
---------
-
-::
-
-    >_ string length 'hello, world'
-    12
-
-    >_ set str foo
-    >_ string length -q $str; echo $status
-    0
-    # Equivalent to test -n $str
-
-::
-
-    >_ string sub --length 2 abcde
-    ab
-
-    >_ string sub -s 2 -l 2 abcde
-    bc
-
-    >_ string sub --start=-2 abcde
-    de
-
-::
-
-    >_ string split . example.com
-    example
-    com
-
-    >_ string split -r -m1 / /usr/local/bin/fish
-    /usr/local/bin
-    fish
-
-    >_ string split '' abc
-    a
-    b
-    c
-
-::
-
-    >_ seq 3 | string join ...
-    1...2...3
-
-::
-
-    >_ string trim ' abc  '
-    abc
-
-    >_ string trim --right --chars=yz xyzzy zany
-    x
-    zan
-
-::
-
-    >_ echo \\x07 | string escape
-    cg
-
-::
-
-    >_ string escape --style=var 'a1 b2'\\u6161
-    a1_20b2__c_E6_85_A1
-
-::
-
-    >_ echo \"(echo one\ntwo\nthree | string collect)\"
-    "one
-    two
-    three
-    "
-
-    >_ echo \"(echo one\ntwo\nthree | string collect -N)\"
-    "one
-    two
-    three"
-
-
-Match Glob Examples
--------------------
-
-::
-
-    >_ string match '?' a
-    a
-
-    >_ string match 'a*b' axxb
-    axxb
-
-    >_ string match -i 'a??B' Axxb
-    Axxb
-
-    >_ echo 'ok?' | string match '*\\?'
-    ok?
-
-    # Note that only the second STRING will match here.
-    >_ string match 'foo' 'foo1' 'foo' 'foo2'
-    foo
-
-    >_ string match -e 'foo' 'foo1' 'foo' 'foo2'
-    foo1
-    foo
-    foo2
-
-    >_ string match 'foo?' 'foo1' 'foo' 'foo2'
-    foo1
-    foo
-    foo2
-
-Match Regex Examples
---------------------
-
-::
-
-    >_ string match -r 'cat|dog|fish' 'nice dog'
-    dog
-
-    >_ string match -r -v "c.*[12]" {cat,dog}(seq 1 4)
-    dog1
-    dog2
-    cat3
-    dog3
-    cat4
-    dog4
-
-    >_ string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56
-    2:34:56
-    2
-    34
-    56
-
-    >_ string match -r '^(\\w{{2,4}})\\g1$' papa mud murmur
-    papa
-    pa
-    murmur
-    mur
-
-    >_ string match -r -a -n at ratatat
-    2 2
-    4 2
-    6 2
-
-    >_ string match -r -i '0x[0-9a-f]{{1,8}}' 'int magic = 0xBadC0de;'
-    0xBadC0de
-
-NUL Delimited Examples
-----------------------
-
-::
-
-    >_ # Count files in a directory, without being confused by newlines.
-    >_ count (find . -print0 | string split0)
-    42
-
-    >_ # Sort a list of elements which may contain newlines
-    >_ set foo beta alpha\\ngamma
-    >_ set foo (string join0 $foo | sort -z | string split0)
-    >_ string escape $foo[1]
-    alpha\\ngamma
-
-Replace Literal Examples
-------------------------
-
-::
-
-    >_ string replace is was 'blue is my favorite'
-    blue was my favorite
-
-    >_ string replace 3rd last 1st 2nd 3rd
-    1st
-    2nd
-    last
-
-    >_ string replace -a ' ' _ 'spaces to underscores'
-    spaces_to_underscores
-
-Replace Regex Examples
-----------------------
-
-::
-
-    >_ string replace -r -a '[^\\d.]+' ' ' '0 one two 3.14 four 5x'
-    0 3.14 5
-
-    >_ string replace -r '(\\w+)\\s+(\\w+)' '$2 $1 $$' 'left right'
-    right left $
-
-    >_ string replace -r '\\s*newline\\s*' '\\n' 'put a newline here'
-    put a
-    here
-
-Repeat Examples
----------------
-
-::
-
-    >_ string repeat -n 2 'foo '
-    foo foo
-
-    >_ echo foo | string repeat -n 2
-    foofoo
-
-    >_ string repeat -n 2 -m 5 'foo'
-    foofo
-
-    >_ string repeat -m 5 'foo'
-    foofo
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 193df98a1..8c3a966f1 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -730,7 +730,7 @@ Command substitution
 
 The output of a series of commands can be used as the parameters to another command. If a parameter contains a set of parenthesis, the text enclosed by the parenthesis will be interpreted as a list of commands. On expansion, this list is executed, and substituted by the output. If the output is more than one line long, each line will be expanded to a new parameter. Setting ``IFS`` to the empty string will disable line splitting.
 
-If the output is piped to :ref:`string split <cmd-string-split>` or `string split0 <cmd-string-split0>` as the last step, those splits are used as they appear and no additional splitting on newlines takes place.
+If the output is piped to :ref:`string split or string split0 <cmd-string-split>` as the last step, those splits are used as they appear and no additional splitting on newlines takes place.
 
 The exit status of the last run command substitution is available in the `status <#variables-status>`_ variable if the substitution occurs in the context of a ``set`` command.
 
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index d464a18e4..ae21e7cb2 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1366,6 +1366,11 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_INVALID_ARGS;
     }
 
+    if (argc >= 3 && (std::wcscmp(argv[2], L"-h") == 0 || std::wcscmp(argv[2], L"--help") == 0)) {
+        wcstring string_dash_subcommand = wcstring(argv[0]) + L"-" + argv[1];
+        builtin_print_help(parser, streams, string_dash_subcommand.c_str());
+        return STATUS_CMD_OK;
+    }
     argc--;
     argv++;
     return subcmd->handler(parser, streams, argc, argv);

From 35115d3d54eb8373bf8e08452309575dd3afc456 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 7 Nov 2019 17:45:54 +0100
Subject: [PATCH 1194/1732] __fish_print_help: do not read $LESS

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

diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index 1f7f54164..beaf6b9fc 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -114,7 +114,7 @@ function __fish_print_help --description "Print help message for the specified f
         not isatty stdout
         and set pager cat # cannot use a builtin here
         # similar to man, but add -F to quit paging when the help output is brief (#6227)
-        set -xl LESS "$LESS"isrFX
+        set -xl LESS isrFX
         # less options:
         # -i (--ignore-case) search case-insensitively, like man
         # -s (--squeeze-blank-lines) not strictly necessary since we already do that above

From 422e2dcbdd5d65b811efc6b2d2f3ee797ec10129 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 19 Oct 2019 14:34:07 -0700
Subject: [PATCH 1195/1732] Add completions for `rustup doc`

[As of rustup 1.20][1], users can give a topic as an argument to `rustup
doc` to open the relevant documentation page in a browser. This commit
adds completions for these topics to assist users in finding what
they're looking for.

[1]: https://blog.rust-lang.org/2019/10/15/Rustup-1.20.0.html#improvements-to-rustup-doc
---
 share/completions/rustup.fish | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index 3315ddadc..6382d61c0 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -264,3 +264,35 @@ complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in p
 # Global argument completions where valid
 complete -c rustup -n "__fish_prev_arg_in --toolchain" -xa "$__rustup_toolchains_short $__rustup_toolchains"
 
+complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_docs_primitives)'
+complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_docs_keywords)'
+complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_docs_macros)'
+complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_docs_modules)'
+
+function __fish_rustup_docs_modules
+  set -l doc_path (__rustup_doc_path)
+  command find "$doc_path"/{std,core,alloc} -name index.html \
+  | string replace --regex "$doc_path/(.+)/index\.html" '$1\tModule' \
+  | string replace --all / ::
+end
+
+function __fish_rustup_docs_keywords
+  set -l doc_path (__rustup_doc_path)
+  string replace --regex "$doc_path/std/keyword\.(.+)\.html" '$1\tKeyword' "$doc_path"/std/keyword.*.html
+end
+
+function __fish_rustup_docs_primitives
+  set -l doc_path (__rustup_doc_path)
+  string replace --regex "$doc_path/std/primitive\.(.+)\.html" '$1\tPrimitive' "$doc_path"/std/primitive.*.html
+end
+
+function __fish_rustup_docs_macros
+  set -l doc_path (__rustup_doc_path)
+  string replace --regex "$doc_path/" '' "$doc_path"/{std,core,alloc}/macro.*.html \
+  | string replace --regex 'macro\.(.+)\.html' '$1\tMacro' \
+  | string replace --all / ::
+end
+
+function __rustup_doc_path
+  rustup doc --path | string replace --regex '/[^/]*$' ''
+end

From 1cfa3fa819ff4b22a14d9eb3b14dca52113e1d38 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 7 Nov 2019 18:09:34 +0100
Subject: [PATCH 1196/1732] Speed up import of bash history

Fixes #6295
---
 src/history.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 7b6772b07..52af3401a 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -216,7 +216,7 @@ bool history_item_t::matches_search(const wcstring &term, enum history_search_ty
 struct history_impl_t {
     // Privately add an item. If pending, the item will not be returned by history searches until a
     // call to resolve_pending.
-    void add(const history_item_t &item, bool pending = false);
+    void add(const history_item_t &item, bool pending = false, bool do_save = true);
 
     // Internal function.
     void clear_file_state();
@@ -303,7 +303,7 @@ struct history_impl_t {
     // item_at_index until a call to resolve_pending(). Pending items are tracked with an offset
     // into the array of new items, so adding a non-pending item has the effect of resolving all
     // pending items.
-    void add(const wcstring &str, history_identifier_t ident = 0, bool pending = false);
+    void add(const wcstring &str, history_identifier_t ident = 0, bool pending = false, bool save = true);
 
     // Remove a history item.
     void remove(const wcstring &str);
@@ -351,7 +351,7 @@ struct history_impl_t {
     size_t size();
 };
 
-void history_impl_t::add(const history_item_t &item, bool pending) {
+void history_impl_t::add(const history_item_t &item, bool pending, bool do_save) {
     // Try merging with the last item.
     if (!new_items.empty() && new_items.back().merge(item)) {
         // We merged, so we don't have to add anything. Maybe this item was pending, but it just got
@@ -361,7 +361,7 @@ void history_impl_t::add(const history_item_t &item, bool pending) {
         // We have to add a new item.
         new_items.push_back(item);
         this->has_pending_item = pending;
-        save_unless_disabled();
+        if (do_save) save_unless_disabled();
     }
 }
 
@@ -399,7 +399,7 @@ void history_impl_t::save_unless_disabled() {
     countdown_to_vacuum--;
 }
 
-void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending) {
+void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending, bool do_save) {
     time_t when = time(NULL);
     // Big hack: do not allow timestamps equal to our boundary date. This is because we include
     // items whose timestamps are equal to our boundary when reading old history, so we can catch
@@ -409,7 +409,7 @@ void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool p
         when++;
     }
 
-    this->add(history_item_t(str, when, ident), pending);
+    this->add(history_item_t(str, when, ident), pending, do_save);
 }
 
 // Remove matching history entries from our list of new items. This only supports literal,
@@ -1164,8 +1164,11 @@ void history_impl_t::populate_from_bash(FILE *stream) {
 
         wcstring wide_line = str2wcstring(line);
         // Add this line if it doesn't contain anything we know we can't handle.
-        if (should_import_bash_history_line(wide_line)) this->add(wide_line);
+        if (should_import_bash_history_line(wide_line)) {
+            this->add(wide_line, 0, false /* pending */, false /* do_save */);
+        }
     }
+    this->save_unless_disabled();
 }
 
 void history_impl_t::incorporate_external_changes() {

From e94b9ccf3e5b2581a68651143728db683cd0a871 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 7 Nov 2019 23:08:31 +0100
Subject: [PATCH 1197/1732] Do import bash history commands containing && or ||

---
 src/fish_tests.cpp        | 1 +
 src/history.cpp           | 4 ----
 tests/history_sample_bash | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 8db4808b3..978e7f1c3 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3984,6 +3984,7 @@ void history_tests_t::test_history_formats() {
         // The results are in the reverse order that they appear in the bash history file.
         // We don't expect whitespace to be elided (#4908: except for leading/trailing whitespace)
         const wchar_t *expected[] = {L"sleep 123",
+                                     L"a && echo valid construct",
                                      L"final line",
                                      L"echo supsup",
                                      L"export XVAR='exported'",
diff --git a/src/history.cpp b/src/history.cpp
index 52af3401a..7b400fc68 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1127,10 +1127,6 @@ static bool should_import_bash_history_line(const wcstring &line) {
     if (line.find(L"((") != std::string::npos) return false;
     if (line.find(L"))") != std::string::npos) return false;
 
-    // Temporarily skip lines with && and ||
-    if (line.find(L"&&") != std::string::npos) return false;
-    if (line.find(L"||") != std::string::npos) return false;
-
     // Skip lines that end with a backslash. We do not handle multiline commands from bash history.
     if (line.back() == L'\\') return false;
 
diff --git a/tests/history_sample_bash b/tests/history_sample_bash
index d800f0397..45609fae3 100644
--- a/tests/history_sample_bash
+++ b/tests/history_sample_bash
@@ -12,7 +12,7 @@ echo hello \
 another `command
     and arg` to skip
 backticks `are not allowed`
-a && echo invalid construct
+a && echo valid construct
 [[ x = y ]] && echo double brackets not allowed
 (( 1 = 2 )) && echo double parens not allowed
 posix_cmd_sub $(is not supported)

From d242ff18082bf94a14eba32a63efce9627784cc7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 7 Nov 2019 23:17:15 +0100
Subject: [PATCH 1198/1732] Add description for automatic
 fish_update_completions job

See #6269
---
 share/functions/__fish_config_interactive.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index af03801cf..96ff9d0ef 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -111,7 +111,8 @@ function __fish_config_interactive -d "Initializations that should be performed
             set -l update_args -B $__fish_data_dir/tools/create_manpage_completions.py --manpath --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions'
             for py in python{3,2,}
                 if command -sq $py
-                    $py $update_args >/dev/null 2>&1 &
+                    set -l c $py $update_args
+                    $c (: fish_update_completions: generating completions from man pages) >/dev/null 2>&1 &
                     break
                 end
             end

From 8f3d745e6095c97586087077ef2c8075cba1a95d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 7 Nov 2019 22:24:13 -0800
Subject: [PATCH 1199/1732] Teach env_stack_impl_t to report whether it
 modifies a global

This will help in limiting variable dispatch changes to global and
principal modifications.
---
 src/env.cpp | 86 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 064eef09d..1b1ce107c 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -373,7 +373,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     s_universal_variables.emplace(L"");
     callback_data_list_t callbacks;
     s_universal_variables->initialize(callbacks);
-    env_universal_callbacks(&env_stack_t::principal(), callbacks);
+    env_universal_callbacks(&vars, callbacks);
 
     // Do not import variables that have the same name and value as
     // an exported universal variable. See issues #5258 and #5348.
@@ -806,17 +806,30 @@ std::shared_ptr<environment_t> env_scoped_impl_t::snapshot() const {
     return ret;
 }
 
+// A struct that wraps up the result of setting or removing a variable.
+struct mod_result_t {
+    // The publicly visible status of the set call.
+    int status{ENV_OK};
+
+    // Whether we modified the global scope.
+    bool global_modified{false};
+
+    // Whether we modified universal variables.
+    bool uvar_modified{false};
+
+    explicit mod_result_t(int status) : status(status) {}
+};
+
 /// A mutable subclass of env_scoped_impl_t.
 class env_stack_impl_t final : public env_scoped_impl_t {
    public:
     using env_scoped_impl_t::env_scoped_impl_t;
 
     /// Set a variable under the name \p key, using the given \p mode, setting its value to \p val.
-    int set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val,
-            bool *out_needs_uvar_sync);
+    mod_result_t set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val);
 
     /// Remove a variable under the name \p key.
-    int remove(const wcstring &key, int var_mode, bool *out_needs_uvar_sync);
+    mod_result_t remove(const wcstring &key, int var_mode);
 
     /// Push a new shadowing local scope.
     void push_shadowing();
@@ -1072,12 +1085,12 @@ void env_stack_impl_t::set_universal(const wcstring &key, wcstring_list_t val,
     uvars()->set(key, new_var);
 }
 
-int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t val,
-                          bool *out_needs_uvar_sync) {
+mod_result_t env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode,
+                                   wcstring_list_t val) {
     const query_t query(mode);
     // Handle electric and read-only variables.
     if (auto ret = try_set_electric(key, query, val)) {
-        return *ret;
+        return mod_result_t{*ret};
     }
 
     // Resolve as much of our flags as we can. Note these contain maybes, and we may defer the final
@@ -1097,14 +1110,17 @@ int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_l
         flags.pathvar = query.pathvar;
     }
 
+    mod_result_t result{ENV_OK};
     if (query.has_scope) {
         // The user requested a particular scope.
         if (query.universal) {
             set_universal(key, std::move(val), query);
-            *out_needs_uvar_sync = true;
+            result.uvar_modified = true;
         } else if (query.global) {
             set_in_node(globals_, key, std::move(val), flags);
+            result.global_modified = true;
         } else if (query.local) {
+            assert(locals_ != globals_ && "Locals should not be globals");
             set_in_node(locals_, key, std::move(val), flags);
         } else {
             DIE("Unknown scope");
@@ -1115,56 +1131,56 @@ int env_stack_impl_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_l
     } else if (env_node_ref_t node = find_in_chain(globals_, key)) {
         // Existing global variable.
         set_in_node(node, key, std::move(val), flags);
+        result.global_modified = true;
     } else if (uvars() && uvars()->get(key)) {
         // Existing universal variable.
         set_universal(key, std::move(val), query);
-        *out_needs_uvar_sync = true;
+        result.uvar_modified = true;
     } else {
         // Unspecified scope with no existing variables.
         auto node = resolve_unspecified_scope();
         assert(node && "Should always resolve some scope");
         set_in_node(node, key, std::move(val), flags);
+        result.global_modified = (node == globals_);
     }
-    return ENV_OK;
+    return result;
 }
 
-int env_stack_impl_t::remove(const wcstring &key, int mode, bool *out_needs_uvar_sync) {
+mod_result_t env_stack_impl_t::remove(const wcstring &key, int mode) {
     const query_t query(mode);
 
     // Users can't remove read-only keys.
     if (query.user && is_read_only(key)) {
-        return ENV_SCOPE;
+        return mod_result_t{ENV_SCOPE};
     }
 
     // Helper to remove from uvars.
-    auto remove_from_uvars = [&] {
-        if (!uvars()) return false;
-        auto flags = uvars()->get_flags(key);
-        if (!flags) return false;
-        *out_needs_uvar_sync = true;
-        return uvars()->remove(key);
-    };
+    auto remove_from_uvars = [&] { return uvars() && uvars()->remove(key); };
 
+    mod_result_t result{ENV_OK};
     if (query.has_scope) {
         // The user requested erasing from a particular scope.
         if (query.universal) {
-            return remove_from_uvars() ? ENV_OK : ENV_NOT_FOUND;
+            result.status = remove_from_uvars() ? ENV_OK : ENV_NOT_FOUND;
+            result.uvar_modified = true;
         } else if (query.global) {
-            return remove_from_chain(globals_, key) ? ENV_OK : ENV_NOT_FOUND;
+            result.status = remove_from_chain(globals_, key) ? ENV_OK : ENV_NOT_FOUND;
+            result.global_modified = true;
         } else if (query.local) {
-            return remove_from_chain(locals_, key) ? ENV_OK : ENV_NOT_FOUND;
+            result.status = remove_from_chain(locals_, key) ? ENV_OK : ENV_NOT_FOUND;
         } else {
             DIE("Unknown scope");
         }
     } else if (remove_from_chain(locals_, key)) {
-        return ENV_OK;
+        // pass
     } else if (remove_from_chain(globals_, key)) {
-        return ENV_OK;
+        result.global_modified = true;
     } else if (remove_from_uvars()) {
-        return ENV_OK;
+        result.uvar_modified = true;
     } else {
-        return ENV_NOT_FOUND;
+        result.status = ENV_NOT_FOUND;
     }
+    return result;
 }
 
 bool env_stack_t::universal_barrier() {
@@ -1246,19 +1262,18 @@ int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t
         vals = std::move(munged_vals);
     }
 
-    bool needs_uvar_sync = false;
-    auto ret = acquire_impl()->set(key, mode, std::move(vals), &needs_uvar_sync);
-    if (ret == ENV_OK) {
+    mod_result_t ret = acquire_impl()->set(key, mode, std::move(vals));
+    if (ret.status == ENV_OK) {
         // Important to not hold the lock here.
         env_dispatch_var_change(key, *this);
         if (out_events) {
             out_events->push_back(event_t::variable(key, {L"VARIABLE", L"SET", key}));
         }
     }
-    if (needs_uvar_sync) {
+    if (ret.uvar_modified) {
         universal_barrier();
     }
-    return ret;
+    return ret.status;
 }
 
 int env_stack_t::set_one(const wcstring &key, env_mode_flags_t mode, wcstring val,
@@ -1274,19 +1289,18 @@ int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode,
 }
 
 int env_stack_t::remove(const wcstring &key, int mode, std::vector<event_t> *out_events) {
-    bool needs_uvar_sync = false;
-    int ret = acquire_impl()->remove(key, mode, &needs_uvar_sync);
-    if (ret == ENV_OK) {
+    mod_result_t ret = acquire_impl()->remove(key, mode);
+    if (ret.status == ENV_OK) {
         // Important to not hold the lock here.
         env_dispatch_var_change(key, *this);
         if (out_events) {
             out_events->push_back(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
         }
     }
-    if (needs_uvar_sync) {
+    if (ret.uvar_modified) {
         universal_barrier();
     }
-    return ret;
+    return ret.status;
 }
 
 std::shared_ptr<const null_terminated_array_t<char>> env_stack_t::export_arr() {

From 7f59a7e7cfd2d49d8df3d652ff1e1b8a0b1527bc Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 7 Nov 2019 23:15:26 -0800
Subject: [PATCH 1200/1732] Only dispatch variable changes for the principal
 variable stack or globals

fish will react to certain variable modifications, such as "TZ." Only do
this if the main stack is modified. This has no effect now because there
is always a single stack, but will become important when concurrent
execution is supported.
---
 src/env.cpp | 26 ++++++++++++++++++--------
 src/env.h   |  3 +++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/env.cpp b/src/env.cpp
index 1b1ce107c..2eac7d73f 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -1264,13 +1264,17 @@ int env_stack_t::set(const wcstring &key, env_mode_flags_t mode, wcstring_list_t
 
     mod_result_t ret = acquire_impl()->set(key, mode, std::move(vals));
     if (ret.status == ENV_OK) {
+        // If we modified the global state, or we are principal, then dispatch changes.
         // Important to not hold the lock here.
-        env_dispatch_var_change(key, *this);
+        if (ret.global_modified || is_principal()) {
+            env_dispatch_var_change(key, *this);
+        }
         if (out_events) {
             out_events->push_back(event_t::variable(key, {L"VARIABLE", L"SET", key}));
         }
     }
-    if (ret.uvar_modified) {
+    // If the principal stack modified universal variables, then post a barrier.
+    if (ret.uvar_modified && is_principal()) {
         universal_barrier();
     }
     return ret.status;
@@ -1291,13 +1295,15 @@ int env_stack_t::set_empty(const wcstring &key, env_mode_flags_t mode,
 int env_stack_t::remove(const wcstring &key, int mode, std::vector<event_t> *out_events) {
     mod_result_t ret = acquire_impl()->remove(key, mode);
     if (ret.status == ENV_OK) {
-        // Important to not hold the lock here.
-        env_dispatch_var_change(key, *this);
+        if (ret.global_modified || is_principal()) {
+            // Important to not hold the lock here.
+            env_dispatch_var_change(key, *this);
+        }
         if (out_events) {
             out_events->push_back(event_t::variable(key, {L"VARIABLE", L"ERASE", key}));
         }
     }
-    if (ret.uvar_modified) {
+    if (ret.uvar_modified && is_principal()) {
         universal_barrier();
     }
     return ret.status;
@@ -1330,9 +1336,13 @@ void env_stack_t::push(bool new_scope) {
 
 void env_stack_t::pop() {
     auto popped = acquire_impl()->pop();
-    // TODO: we would like to coalesce locale / curses changes, so that we only re-initialize once.
-    for (const auto &kv : popped->env) {
-        env_dispatch_var_change(kv.first, *this);
+    // Only dispatch variable changes if we are the principal environment.
+    if (this == principal_ref().get()) {
+        // TODO: we would like to coalesce locale / curses changes, so that we only re-initialize
+        // once.
+        for (const auto &kv : popped->env) {
+            env_dispatch_var_change(kv.first, *this);
+        }
     }
 }
 
diff --git a/src/env.h b/src/env.h
index a14b0dcdb..454cfd94f 100644
--- a/src/env.h
+++ b/src/env.h
@@ -226,6 +226,9 @@ class env_stack_t final : public environment_t {
 
     explicit env_stack_t(std::unique_ptr<env_stack_impl_t> impl);
 
+    /// \return whether we are the principal stack.
+    bool is_principal() const { return this == principal_ref().get(); }
+
    public:
     ~env_stack_t() override;
     env_stack_t(env_stack_t &&);

From 5c3e43bc0cd7ca2160967b99bbb635b20bed14dd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 8 Nov 2019 10:47:04 +0100
Subject: [PATCH 1201/1732] vi mode: make return key in replace mode insert a
 newline

Fixes #6298

[ci skip]
---
 share/functions/fish_vi_key_bindings.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 360a83f93..718205206 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -215,6 +215,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     #
     bind -s --preset -m replace_one r repaint-mode
     bind -s --preset -M replace_one -m default '' delete-char self-insert backward-char repaint-mode
+    bind -s --preset -M replace_one -m default \r 'commandline -f delete-char; commandline -i \n; commandline -f backward-char; commandline -f repaint-mode'
     bind -s --preset -M replace_one -m default \e cancel repaint-mode
 
     #

From 0e4a75c0b55f2082b009e177fa50ba2d2bdb5acf Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 8 Nov 2019 11:08:37 +0100
Subject: [PATCH 1202/1732] Do not print greeting with empty $fish_greeting and
 --private

Fixes #6299

[ci skip]
---
 share/functions/__fish_config_interactive.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 96ff9d0ef..5edd87ccb 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -30,7 +30,7 @@ function __fish_config_interactive -d "Initializations that should be performed
         set -U fish_greeting "$line1$line2"
     end
 
-    if set -q fish_private_mode
+    if set -q fish_private_mode and string length -q -- $fish_greeting
         set -l line (_ "fish is running in private mode, history will not be persisted.")
         set -g fish_greeting $fish_greeting.\n$line
     end

From 270fd14b00dd1d067d39ef6efa77a78feafc54fd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 8 Nov 2019 11:40:03 +0100
Subject: [PATCH 1203/1732] Fix typo

[ci skip]
---
 share/functions/__fish_config_interactive.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 5edd87ccb..601d24172 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -30,7 +30,7 @@ function __fish_config_interactive -d "Initializations that should be performed
         set -U fish_greeting "$line1$line2"
     end
 
-    if set -q fish_private_mode and string length -q -- $fish_greeting
+    if set -q fish_private_mode; and string length -q -- $fish_greeting
         set -l line (_ "fish is running in private mode, history will not be persisted.")
         set -g fish_greeting $fish_greeting.\n$line
     end

From 41c42c86e3bc3d784d7d941cac5fd1ffc27f2ca1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 8 Nov 2019 21:41:06 +0800
Subject: [PATCH 1204/1732] travis: remove superfluous CXXFLAGS

Discussion in #6296.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da410da8b..774bfeead 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
             - libpcre2-dev
             - python
       env:
-          - CXXFLAGS="-g -O2 -Werror=address"
+          - CXXFLAGS="-Werror=address"
     - os: linux
       compiler: gcc
       addons:
@@ -27,11 +27,11 @@ matrix:
             - g++-multilib
             - python
       env:
-          - CXXFLAGS="-g -O2 -m32 -Werror=address" CFLAGS="-g -m32"
+          - CXXFLAGS="-m32 -Werror=address" CFLAGS="-m32"
     - os: linux
       compiler: clang
       env:
-          - CXXFLAGS="-g -O2 -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address"
+          - CXXFLAGS="-fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address"
           - ASAN_OPTIONS=check_initialization_order=1:detect_stack_use_after_return=1:detect_leaks=1
           - UBSAN_OPTIONS=print_stacktrace=1:report_error_type=1:suppressions=$TRAVIS_BUILD_DIR/build_tools/ubsan.blacklist
       addons:
@@ -45,7 +45,7 @@ matrix:
     - os: linux
       compiler: clang
       env:
-          - CXXFLAGS="-g -O2 -fsanitize=thread"
+          - CXXFLAGS="-fsanitize=thread"
       addons:
         apt:
           packages:

From eb2386f3e3e8ec9abc781c6745b78a8a1b17f179 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 8 Nov 2019 16:40:15 -0800
Subject: [PATCH 1205/1732] Rename tokenizer_t::buff to token_cursor

That should clarify its role vis-a-vis 'start'.
---
 src/tokenizer.cpp | 122 ++++++++++++++++++++++++----------------------
 src/tokenizer.h   |   2 +-
 2 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 712d12ee0..a7c3d1dfb 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -63,13 +63,13 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
                               const wchar_t *error_loc, maybe_t<size_t> token_length) {
     assert(error_type != tokenizer_error_t::none && "tokenizer_error_t::none passed to call_error");
     assert(error_loc >= token_start && "Invalid error location");
-    assert(this->buff >= token_start && "Invalid buff location");
+    assert(this->token_cursor >= token_start && "Invalid buff location");
 
     // If continue_after_error is set and we have a real token length, then skip past it.
     // Otherwise give up.
     if (token_length.has_value() && continue_after_error) {
-        assert(this->buff < error_loc + *token_length && "Unable to continue past error");
-        this->buff = error_loc + *token_length;
+        assert(this->token_cursor < error_loc + *token_length && "Unable to continue past error");
+        this->token_cursor = error_loc + *token_length;
     } else {
         this->has_next = false;
     }
@@ -78,12 +78,13 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
     result.error = error_type;
     result.offset = token_start - this->start;
     // If we are passed a token_length, then use it; otherwise infer it from the buffer.
-    result.length = token_length ? *token_length : this->buff - token_start;
+    result.length = token_length ? *token_length : this->token_cursor - token_start;
     result.error_offset = error_loc - token_start;
     return result;
 }
 
-tokenizer_t::tokenizer_t(const wchar_t *start, tok_flags_t flags) : buff(start), start(start) {
+tokenizer_t::tokenizer_t(const wchar_t *start, tok_flags_t flags)
+    : token_cursor(start), start(start) {
     assert(start != nullptr && "Invalid start");
 
     this->accept_unfinished = static_cast<bool>(flags & TOK_ACCEPT_UNFINISHED);
@@ -145,11 +146,11 @@ tok_t tokenizer_t::read_string() {
     std::vector<int> brace_offsets;
     std::vector<char> expecting;
     int slice_offset = 0;
-    const wchar_t *const buff_start = this->buff;
+    const wchar_t *const buff_start = this->token_cursor;
     bool is_first = true;
 
     while (true) {
-        wchar_t c = *this->buff;
+        wchar_t c = *this->token_cursor;
 #if false
         wcstring msg = L"Handling 0x%x (%lc)";
         tok_mode mode_begin = mode;
@@ -173,22 +174,22 @@ tok_t tokenizer_t::read_string() {
         else if (c == L'\\') {
             mode |= tok_modes::char_escape;
         } else if (c == L'(') {
-            paran_offsets.push_back(this->buff - this->start);
+            paran_offsets.push_back(this->token_cursor - this->start);
             expecting.push_back(L')');
             mode |= tok_modes::subshell;
         } else if (c == L'{') {
-            brace_offsets.push_back(this->buff - this->start);
+            brace_offsets.push_back(this->token_cursor - this->start);
             expecting.push_back(L'}');
             mode |= tok_modes::curly_braces;
         } else if (c == L')') {
             if (expecting.size() > 0 && expecting.back() == L'}') {
                 return this->call_error(tokenizer_error_t::expected_bclose_found_pclose,
-                                        this->start, this->buff, 1);
+                                        this->start, this->token_cursor, 1);
             }
             switch (paran_offsets.size()) {
                 case 0:
                     return this->call_error(tokenizer_error_t::closing_unopened_subshell,
-                                            this->start, this->buff, 1);
+                                            this->start, this->token_cursor, 1);
                 case 1:
                     mode &= ~(tok_modes::subshell);
                 default:
@@ -198,12 +199,12 @@ tok_t tokenizer_t::read_string() {
         } else if (c == L'}') {
             if (expecting.size() > 0 && expecting.back() == L')') {
                 return this->call_error(tokenizer_error_t::expected_pclose_found_bclose,
-                                        this->start, this->buff, 1);
+                                        this->start, this->token_cursor, 1);
             }
             switch (brace_offsets.size()) {
                 case 0:
-                    return this->call_error(tokenizer_error_t::closing_unopened_brace, this->buff,
-                                            this->start + wcslen(this->start));
+                    return this->call_error(tokenizer_error_t::closing_unopened_brace,
+                                            this->token_cursor, this->start + wcslen(this->start));
                 case 1:
                     mode &= ~(tok_modes::curly_braces);
                 default:
@@ -211,9 +212,9 @@ tok_t tokenizer_t::read_string() {
             }
             expecting.pop_back();
         } else if (c == L'[') {
-            if (this->buff != buff_start) {
+            if (this->token_cursor != buff_start) {
                 mode |= tok_modes::array_brackets;
-                slice_offset = this->buff - this->start;
+                slice_offset = this->token_cursor - this->start;
             } else {
                 // This is actually allowed so the test operator `[` can be used as the head of a
                 // command
@@ -225,12 +226,12 @@ tok_t tokenizer_t::read_string() {
         else if (c == L']' && ((mode & tok_modes::array_brackets) == tok_modes::array_brackets)) {
             mode &= ~(tok_modes::array_brackets);
         } else if (c == L'\'' || c == L'"') {
-            const wchar_t *end = quote_end(this->buff);
+            const wchar_t *end = quote_end(this->token_cursor);
             if (end) {
-                this->buff = end;
+                this->token_cursor = end;
             } else {
-                const wchar_t *error_loc = this->buff;
-                this->buff += std::wcslen(this->buff);
+                const wchar_t *error_loc = this->token_cursor;
+                this->token_cursor += std::wcslen(this->token_cursor);
                 if ((!this->accept_unfinished)) {
                     return this->call_error(tokenizer_error_t::unterminated_quote, buff_start,
                                             error_loc);
@@ -250,14 +251,14 @@ tok_t tokenizer_t::read_string() {
         FLOGF(error, msg.c_str(), c, c, int(mode_begin), int(mode));
 #endif
 
-        this->buff++;
+        this->token_cursor++;
         is_first = false;
     }
 
     if ((!this->accept_unfinished) && (mode != tok_modes::regular_text)) {
         if (mode & tok_modes::char_escape) {
             return this->call_error(tokenizer_error_t::unterminated_escape, buff_start,
-                                    this->buff - 1, 1);
+                                    this->token_cursor - 1, 1);
         } else if (mode & tok_modes::array_brackets) {
             return this->call_error(tokenizer_error_t::unterminated_slice, buff_start,
                                     this->start + slice_offset);
@@ -280,7 +281,7 @@ tok_t tokenizer_t::read_string() {
 
     tok_t result(token_type_t::string);
     result.offset = buff_start - this->start;
-    result.length = this->buff - buff_start;
+    result.length = this->token_cursor - buff_start;
     return result;
 }
 
@@ -492,25 +493,27 @@ maybe_t<tok_t> tokenizer_t::next() {
     // it.
     bool preceding_escaped_nl = false;
     for (;;) {
-        if (this->buff[0] == L'\\' && this->buff[1] == L'\n') {
-            this->buff += 2;
+        if (this->token_cursor[0] == L'\\' && this->token_cursor[1] == L'\n') {
+            this->token_cursor += 2;
             this->continue_line_after_comment = true;
             preceding_escaped_nl = true;
-        } else if (iswspace_not_nl(this->buff[0])) {
-            this->buff++;
+        } else if (iswspace_not_nl(this->token_cursor[0])) {
+            this->token_cursor++;
         } else {
             break;
         }
     }
 
-    while (*this->buff == L'#') {
+    while (*this->token_cursor == L'#') {
         // We have a comment, walk over the comment.
-        const wchar_t *comment_start = this->buff;
-        while (this->buff[0] != L'\n' && this->buff[0] != L'\0') this->buff++;
-        size_t comment_len = this->buff - comment_start;
+        const wchar_t *comment_start = this->token_cursor;
+        while (this->token_cursor[0] != L'\n' && this->token_cursor[0] != L'\0')
+            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.
-        if (this->buff[0] == L'\n' && this->continue_line_after_comment) this->buff++;
+        if (this->token_cursor[0] == L'\n' && this->continue_line_after_comment)
+            this->token_cursor++;
 
         // Maybe return the comment.
         if (this->show_comments) {
@@ -520,15 +523,15 @@ maybe_t<tok_t> tokenizer_t::next() {
             result.preceding_escaped_nl = preceding_escaped_nl;
             return result;
         }
-        while (iswspace_not_nl(this->buff[0])) this->buff++;
+        while (iswspace_not_nl(this->token_cursor[0])) this->token_cursor++;
     }
 
     // We made it past the comments and ate any trailing newlines we wanted to ignore.
     this->continue_line_after_comment = false;
-    const size_t start_pos = this->buff - this->start;
+    const size_t start_pos = this->token_cursor - this->start;
 
     maybe_t<tok_t> result{};
-    switch (*this->buff) {
+    switch (*this->token_cursor) {
         case L'\0': {
             this->has_next = false;
             return none();
@@ -539,60 +542,60 @@ maybe_t<tok_t> tokenizer_t::next() {
             result.emplace(token_type_t::end);
             result->offset = start_pos;
             result->length = 1;
-            this->buff++;
+            this->token_cursor++;
             // Hack: when we get a newline, swallow as many as we can. This compresses multiple
             // subsequent newlines into a single one.
             if (!this->show_blank_lines) {
-                while (*this->buff == L'\n' || *this->buff == 13 /* CR */ || *this->buff == ' ' ||
-                       *this->buff == '\t') {
-                    this->buff++;
+                while (*this->token_cursor == L'\n' || *this->token_cursor == 13 /* CR */ ||
+                       *this->token_cursor == ' ' || *this->token_cursor == '\t') {
+                    this->token_cursor++;
                 }
             }
             break;
         }
         case L'&': {
-            if (this->buff[1] == L'&') {
+            if (this->token_cursor[1] == L'&') {
                 // && is and.
                 result.emplace(token_type_t::andand);
                 result->offset = start_pos;
                 result->length = 2;
-                this->buff += 2;
-            } else if (this->buff[1] == L'>' || this->buff[1] == L'|') {
+                this->token_cursor += 2;
+            } else if (this->token_cursor[1] == L'>' || this->token_cursor[1] == L'|') {
                 // &> and &| redirect both stdout and stderr.
-                auto redir = pipe_or_redir_t::from_string(buff);
+                auto redir = pipe_or_redir_t::from_string(this->token_cursor);
                 assert(redir.has_value() &&
                        "Should always succeed to parse a &> or &| redirection");
                 result.emplace(redir->token_type());
                 result->offset = start_pos;
                 result->length = redir->consumed;
-                this->buff += redir->consumed;
+                this->token_cursor += redir->consumed;
             } else {
                 result.emplace(token_type_t::background);
                 result->offset = start_pos;
                 result->length = 1;
-                this->buff++;
+                this->token_cursor++;
             }
             break;
         }
         case L'|': {
-            if (this->buff[1] == L'|') {
+            if (this->token_cursor[1] == L'|') {
                 // || is or.
                 result.emplace(token_type_t::oror);
                 result->offset = start_pos;
                 result->length = 2;
-                this->buff += 2;
-            } else if (this->buff[1] == L'&') {
+                this->token_cursor += 2;
+            } else if (this->token_cursor[1] == L'&') {
                 // |& is a bashism; in fish it's &|.
-                return this->call_error(tokenizer_error_t::invalid_pipe_ampersand, this->buff,
-                                        this->buff, 2);
+                return this->call_error(tokenizer_error_t::invalid_pipe_ampersand,
+                                        this->token_cursor, this->token_cursor, 2);
             } else {
-                auto pipe = pipe_or_redir_t::from_string(buff);
+                auto pipe = pipe_or_redir_t::from_string(this->token_cursor);
                 assert(pipe.has_value() && pipe->is_pipe &&
                        "Should always succeed to parse a | pipe");
                 result.emplace(pipe->token_type());
                 result->offset = start_pos;
                 result->length = pipe->consumed;
-                this->buff += pipe->consumed;
+                this->token_cursor += pipe->consumed;
             }
             break;
         }
@@ -601,23 +604,24 @@ maybe_t<tok_t> tokenizer_t::next() {
             // There's some duplication with the code in the default case below. The key
             // difference here is that we must never parse these as a string; a failed
             // redirection is an error!
-            auto redir_or_pipe = pipe_or_redir_t::from_string(this->buff);
+            auto redir_or_pipe = pipe_or_redir_t::from_string(this->token_cursor);
             if (!redir_or_pipe || redir_or_pipe->fd < 0) {
-                return this->call_error(tokenizer_error_t::invalid_redirect, this->buff, this->buff,
+                return this->call_error(tokenizer_error_t::invalid_redirect, this->token_cursor,
+                                        this->token_cursor,
                                         redir_or_pipe ? redir_or_pipe->consumed : 0);
             }
             result.emplace(redir_or_pipe->token_type());
             result->offset = start_pos;
             result->length = redir_or_pipe->consumed;
-            this->buff += redir_or_pipe->consumed;
+            this->token_cursor += redir_or_pipe->consumed;
             break;
         }
         default: {
             // Maybe a redirection like '2>&1', maybe a pipe like 2>|, maybe just a string.
-            const wchar_t *error_location = this->buff;
+            const wchar_t *error_location = this->token_cursor;
             maybe_t<pipe_or_redir_t> redir_or_pipe{};
-            if (iswdigit(*this->buff) || (*this->buff == L'^' && caret_redirs())) {
-                redir_or_pipe = pipe_or_redir_t::from_string(this->buff);
+            if (iswdigit(*this->token_cursor) || (*this->token_cursor == L'^' && caret_redirs())) {
+                redir_or_pipe = pipe_or_redir_t::from_string(this->token_cursor);
             }
 
             if (redir_or_pipe) {
@@ -631,7 +635,7 @@ maybe_t<tok_t> tokenizer_t::next() {
                 result.emplace(redir_or_pipe->token_type());
                 result->offset = start_pos;
                 result->length = redir_or_pipe->consumed;
-                this->buff += redir_or_pipe->consumed;
+                this->token_cursor += redir_or_pipe->consumed;
             } else {
                 // Not a redirection or pipe, so just a string.
                 result = this->read_string();
diff --git a/src/tokenizer.h b/src/tokenizer.h
index d1689f0a5..992e92f8c 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -103,7 +103,7 @@ class tokenizer_t {
     void operator=(const tokenizer_t &) = delete;
 
     /// A pointer into the original string, showing where the next token begins.
-    const wchar_t *buff;
+    const wchar_t *token_cursor;
     /// The start of the original string.
     const wchar_t *const start;
     /// Whether we have additional tokens.

From ef8b5e4fa0bd593d15bbf539005c66c08328bbec Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 8 Nov 2019 16:53:13 -0800
Subject: [PATCH 1206/1732] Correct certain tokenizer error reporting for
 unclosed subshells

There was some confusion about the different pointers and offsets
in tokenizer_t::call_error.

Fixes #6281
---
 src/fish_tests.cpp |  8 +++++++-
 src/tokenizer.cpp  | 35 +++++++++++++++++------------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 978e7f1c3..823313264 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -645,7 +645,8 @@ static void test_tokenizer() {
         do_test(token.has_value());
         do_test(token->type == token_type_t::error);
         do_test(token->error == tokenizer_error_t::closing_unopened_subshell);
-        do_test(token->error_offset == 4);
+        do_test(token->offset == 4);
+        do_test(token->error_offset == 0);
     }
 
     {
@@ -4631,6 +4632,11 @@ static void test_highlighting() {
         {L"stuff", highlight_role_t::param},
     });
 
+    highlight_tests.push_back({
+        {L"echo", highlight_role_t::command},
+        {L")", highlight_role_t::error},
+    });
+
     auto &vars = parser_t::principal_parser().vars();
     // Verify variables and wildcards in commands using /bin/cat.
     vars.set(L"VARIABLE_IN_COMMAND", ENV_LOCAL, {L"a"});
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index a7c3d1dfb..48e8315fd 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -184,31 +184,30 @@ tok_t tokenizer_t::read_string() {
         } else if (c == L')') {
             if (expecting.size() > 0 && expecting.back() == L'}') {
                 return this->call_error(tokenizer_error_t::expected_bclose_found_pclose,
-                                        this->start, this->token_cursor, 1);
+                                        this->token_cursor, this->token_cursor, 1);
             }
-            switch (paran_offsets.size()) {
-                case 0:
-                    return this->call_error(tokenizer_error_t::closing_unopened_subshell,
-                                            this->start, this->token_cursor, 1);
-                case 1:
-                    mode &= ~(tok_modes::subshell);
-                default:
-                    paran_offsets.pop_back();
+            if (paran_offsets.empty()) {
+                return this->call_error(tokenizer_error_t::closing_unopened_subshell,
+                                        this->token_cursor, this->token_cursor, 1);
+            }
+            paran_offsets.pop_back();
+            if (paran_offsets.empty()) {
+                mode &= ~(tok_modes::subshell);
             }
             expecting.pop_back();
         } else if (c == L'}') {
             if (expecting.size() > 0 && expecting.back() == L')') {
                 return this->call_error(tokenizer_error_t::expected_pclose_found_bclose,
-                                        this->start, this->token_cursor, 1);
+                                        this->token_cursor, this->token_cursor, 1);
             }
-            switch (brace_offsets.size()) {
-                case 0:
-                    return this->call_error(tokenizer_error_t::closing_unopened_brace,
-                                            this->token_cursor, this->start + wcslen(this->start));
-                case 1:
-                    mode &= ~(tok_modes::curly_braces);
-                default:
-                    brace_offsets.pop_back();
+            if (brace_offsets.empty()) {
+                return this->call_error(tokenizer_error_t::closing_unopened_brace,
+                                        this->token_cursor,
+                                        this->token_cursor + wcslen(this->token_cursor));
+            }
+            brace_offsets.pop_back();
+            if (brace_offsets.empty()) {
+                mode &= ~(tok_modes::curly_braces);
             }
             expecting.pop_back();
         } else if (c == L'[') {

From 896ef65f8c337831244efab0ac0eda3112c25600 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 8 Nov 2019 16:55:54 -0800
Subject: [PATCH 1207/1732] Rename error_offset to error_offset_within_token

Hopefully clarify the role of this variable.
---
 src/fish_tests.cpp | 8 ++++----
 src/parse_tree.cpp | 5 +++--
 src/tokenizer.cpp  | 2 +-
 src/tokenizer.h    | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 823313264..5e67bfa3b 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -634,7 +634,7 @@ static void test_tokenizer() {
         do_test(token.has_value());
         do_test(token->type == token_type_t::error);
         do_test(token->error == tokenizer_error_t::unterminated_escape);
-        do_test(token->error_offset == 3);
+        do_test(token->error_offset_within_token == 3);
     }
 
     {
@@ -646,7 +646,7 @@ static void test_tokenizer() {
         do_test(token->type == token_type_t::error);
         do_test(token->error == tokenizer_error_t::closing_unopened_subshell);
         do_test(token->offset == 4);
-        do_test(token->error_offset == 0);
+        do_test(token->error_offset_within_token == 0);
     }
 
     {
@@ -657,7 +657,7 @@ static void test_tokenizer() {
         do_test(token.has_value());
         do_test(token->type == token_type_t::error);
         do_test(token->error == tokenizer_error_t::unterminated_subshell);
-        do_test(token->error_offset == 4);
+        do_test(token->error_offset_within_token == 4);
     }
 
     {
@@ -668,7 +668,7 @@ static void test_tokenizer() {
         do_test(token.has_value());
         do_test(token->type == token_type_t::error);
         do_test(token->error == tokenizer_error_t::unterminated_slice);
-        do_test(token->error_offset == 4);
+        do_test(token->error_offset_within_token == 4);
     }
 
     // Test some redirection parsing.
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index cef4a826a..93fc83dab 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -694,8 +694,9 @@ void parse_ll_t::parse_error_failed_production(struct parse_stack_element_t &sta
 
 void parse_ll_t::report_tokenizer_error(const tok_t &tok) {
     parse_error_code_t parse_error_code = parse_error_from_tokenizer_error(tok.error);
-    this->parse_error_at_location(tok.offset, tok.length, tok.offset + tok.error_offset,
-                                  parse_error_code, L"%ls", tokenizer_get_error_message(tok.error));
+    this->parse_error_at_location(tok.offset, tok.length,
+                                  tok.offset + tok.error_offset_within_token, parse_error_code,
+                                  L"%ls", tokenizer_get_error_message(tok.error));
 }
 
 void parse_ll_t::parse_error_unexpected_token(const wchar_t *expected, parse_token_t token) {
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 48e8315fd..49c18c224 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -79,7 +79,7 @@ tok_t tokenizer_t::call_error(tokenizer_error_t error_type, const wchar_t *token
     result.offset = token_start - this->start;
     // If we are passed a token_length, then use it; otherwise infer it from the buffer.
     result.length = token_length ? *token_length : this->token_cursor - token_start;
-    result.error_offset = error_loc - token_start;
+    result.error_offset_within_token = error_loc - token_start;
     return result;
 }
 
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 992e92f8c..b666fd245 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -83,7 +83,7 @@ struct tok_t {
 
     // If an error, this is the offset of the error within the token. A value of 0 means it occurred
     // at 'offset'.
-    size_t error_offset{size_t(-1)};
+    size_t error_offset_within_token{size_t(-1)};
 
     // Construct from a token type.
     explicit tok_t(token_type_t type);

From 82227b88546f63a89077f25dc303743a5641efd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Martinez?= <clementmartinezdev@gmail.com>
Date: Sat, 9 Nov 2019 01:07:23 +0100
Subject: [PATCH 1208/1732] Add `apt install --reinstall` completion

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

diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index 9b4d46895..22fdd739b 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -42,6 +42,7 @@ __fish_apt_subcommand show -r -d 'Show package information'
 
 # Install
 __fish_apt_subcommand install -r -d 'Install packages'
+__fish_apt_option install -l reinstall -d 'Reinstall package'
 
 # Remove
 __fish_apt_subcommand remove -r -d 'Remove packages'

From 7bd134f795a85091f4b57f57b28ee5e89694e369 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 9 Nov 2019 16:07:33 -0800
Subject: [PATCH 1209/1732] Reformat all .cpp files

---
 src/builtin_complete.cpp | 2 +-
 src/complete.cpp         | 3 ++-
 src/history.cpp          | 6 ++++--
 src/screen.cpp           | 3 +--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 7847c1b72..319bd3e9d 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -344,7 +344,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         } else {
             parser.libdata().builtin_complete_recursion_level++;
             assert(!parser.libdata().builtin_complete_current_commandline);
-	    if (!have_do_complete_param)
+            if (!have_do_complete_param)
                 parser.libdata().builtin_complete_current_commandline = true;
 
             std::vector<completion_t> comp;
diff --git a/src/complete.cpp b/src/complete.cpp
index 8461d8637..1a62e964f 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1535,7 +1535,8 @@ void completer_t::perform() {
             current_argument = current_token;
             if (tokens.size() >= 2) {
                 tok_t prev_tok = tokens.at(tokens.size() - 2);
-                if (prev_tok.type == token_type_t::string) previous_argument = prev_tok.get_source(cmd);
+                if (prev_tok.type == token_type_t::string)
+                    previous_argument = prev_tok.get_source(cmd);
             }
         }
 
diff --git a/src/history.cpp b/src/history.cpp
index 7b400fc68..796e89919 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -303,7 +303,8 @@ struct history_impl_t {
     // item_at_index until a call to resolve_pending(). Pending items are tracked with an offset
     // into the array of new items, so adding a non-pending item has the effect of resolving all
     // pending items.
-    void add(const wcstring &str, history_identifier_t ident = 0, bool pending = false, bool save = true);
+    void add(const wcstring &str, history_identifier_t ident = 0, bool pending = false,
+             bool save = true);
 
     // Remove a history item.
     void remove(const wcstring &str);
@@ -399,7 +400,8 @@ void history_impl_t::save_unless_disabled() {
     countdown_to_vacuum--;
 }
 
-void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending, bool do_save) {
+void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending,
+                         bool do_save) {
     time_t when = time(NULL);
     // Big hack: do not allow timestamps equal to our boundary date. This is because we include
     // items whose timestamps are equal to our boundary when reading old history, so we can catch
diff --git a/src/screen.cpp b/src/screen.cpp
index 575bb71e9..e4d248c84 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -645,8 +645,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     // Determine how many lines have stuff on them; we need to clear lines with stuff that we don't
     // want.
     const size_t lines_with_stuff = std::max(actual_lines_before_reset, scr->actual.line_count());
-    if (scr->desired.line_count() < lines_with_stuff)
-        need_clear_screen = true;
+    if (scr->desired.line_count() < lines_with_stuff) need_clear_screen = true;
 
     if (left_prompt != scr->actual_left_prompt) {
         s_move(scr, 0, 0);

From 626237c9c385503c345a2b7fec919ab0402dc968 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 12:17:54 -0800
Subject: [PATCH 1210/1732] Add a check for fish function stack overflow

---
 tests/checks/stack-overflow.fish | 277 +++++++++++++++++++++++++++++++
 1 file changed, 277 insertions(+)
 create mode 100644 tests/checks/stack-overflow.fish

diff --git a/tests/checks/stack-overflow.fish b/tests/checks/stack-overflow.fish
new file mode 100644
index 000000000..201a73666
--- /dev/null
+++ b/tests/checks/stack-overflow.fish
@@ -0,0 +1,277 @@
+#RUN: %fish %s
+
+# Check that we correctly detect an overflow of fish's function stack.
+# This is dependent on the internal max stack depth of course.
+
+function left
+    right
+end
+
+function right
+    left
+end
+
+left
+
+#CHECKERR: {{.*}} The function call stack limit has been exceeded. {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}

From 2555ecf7576d748166c0b4b54e5728c90eea6e5e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 12:36:46 -0800
Subject: [PATCH 1211/1732] Remove the forbidden function stack

Detect forbidden functions directly from the associated block_t.
Also unify where we do stack overflow detection.
---
 src/exec.cpp                     |  2 --
 src/parse_execution.cpp          | 33 +++++++++++++-------------------
 src/parser.cpp                   | 19 ++++++++++++++----
 src/parser.h                     | 12 +++---------
 tests/checks/stack-overflow.fish |  2 ++
 5 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 21a190556..27f2101c1 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -814,11 +814,9 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         block_t *fb =
             parser.push_block(block_t::function_block(func_name, argv, props->shadow_scope));
         function_prepare_environment(parser.vars(), func_name, std::move(argv), inherit_vars);
-        parser.forbid_function(func_name);
 
         internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
 
-        parser.allow_function();
         parser.pop_block(fb);
 
         // If we returned due to a return statement, then stop returning now.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index a742f57f5..0bdd90133 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -108,11 +108,8 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
         return {};
     }
 
-    // Check to see which function call is forbidden.
-    if (parser->forbidden_function.empty()) {
-        return {};
-    }
-    const wcstring &forbidden_function_name = parser->forbidden_function.back();
+    // Get the function name of the immediate block.
+    const wcstring &forbidden_function_name = parent->function_name;
 
     // Get the first job in the job list.
     tnode_t<g::job> first_job = job_list.try_get_child<g::job_conjunction, 1>().child<0>();
@@ -823,13 +820,6 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     // Determine the process type.
     enum process_type_t process_type = process_type_for_command(statement, cmd);
 
-    // Check for stack overflow.
-    if (process_type == process_type_t::function &&
-        parser->forbidden_function.size() > FISH_MAX_STACK_DEPTH) {
-        this->report_error(statement, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
-        return parse_execution_errored;
-    }
-
     // Protect against exec with background processes running
     if (process_type == process_type_t::exec && parser->is_interactive()) {
         bool have_bg = false;
@@ -1451,21 +1441,24 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::job_lis
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
+    assert(associated_block && "Null block");
     scoped_push<io_chain_t> block_io_push(&block_io, io);
-    enum parse_execution_result_t status = parse_execution_success;
+
+    // Check for infinite recursion: a function which immediately calls itself..
     wcstring func_name;
     auto infinite_recursive_node =
         this->infinite_recursive_statement_in_job_list(job_list, &func_name);
     if (infinite_recursive_node) {
         // We have an infinite recursion.
-        this->report_error(infinite_recursive_node, INFINITE_FUNC_RECURSION_ERR_MSG,
-                           func_name.c_str());
-        status = parse_execution_errored;
-    } else {
-        // No infinite recursion.
-        status = this->run_job_list(job_list, associated_block);
+        return this->report_error(infinite_recursive_node, INFINITE_FUNC_RECURSION_ERR_MSG,
+                                  func_name.c_str());
     }
-    return status;
+
+    // Check for stack overflow. The TOP check ensures we only do this for function calls.
+    if (associated_block->type() == TOP && parser->function_stack_is_overflowing()) {
+        return this->report_error(job_list, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
+    }
+    return this->run_job_list(job_list, associated_block);
 }
 
 int parse_execution_context_t::line_offset_of_node(tnode_t<g::job> node) {
diff --git a/src/parser.cpp b/src/parser.cpp
index 2c48686f1..2357f3794 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -240,10 +240,6 @@ block_t *parser_t::block_at_index(size_t idx) {
 
 block_t *parser_t::current_block() { return block_stack.empty() ? NULL : &block_stack.back(); }
 
-void parser_t::forbid_function(const wcstring &function) { forbidden_function.push_back(function); }
-
-void parser_t::allow_function() { forbidden_function.pop_back(); }
-
 /// Print profiling information to the specified stream.
 static void print_profile(const std::vector<std::unique_ptr<profile_item_t>> &items, FILE *out) {
     for (size_t pos = 0; pos < items.size(); pos++) {
@@ -510,6 +506,21 @@ const wchar_t *parser_t::current_filename() const {
     return libdata().current_filename;
 }
 
+bool parser_t::function_stack_is_overflowing() const {
+    // We are interested in whether the count of functions on the stack exceeds
+    // FISH_MAX_STACK_DEPTH. We don't separately track the number of functions, but we can have a
+    // fast path through the eval_level. If the eval_level is in bounds, so must be the stack depth.
+    if (eval_level <= FISH_MAX_STACK_DEPTH) {
+        return false;
+    }
+    // Count the functions.
+    int depth = 0;
+    for (const auto &b : block_stack) {
+        depth += (b.type() == FUNCTION_CALL || b.type() == FUNCTION_CALL_NO_SHADOW);
+    }
+    return depth > FISH_MAX_STACK_DEPTH;
+}
+
 wcstring parser_t::current_line() {
     if (!execution_context) {
         return wcstring();
diff --git a/src/parser.h b/src/parser.h
index 3ba18ab62..923851b81 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -193,8 +193,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     volatile sig_atomic_t cancellation_requested = false;
     /// The current execution context.
     std::unique_ptr<parse_execution_context_t> execution_context;
-    /// List of called functions, used to help prevent infinite recursion.
-    wcstring_list_t forbidden_function;
     /// The jobs associated with this parser.
     job_list_t job_list;
     /// The list of blocks. This is a deque because we give out raw pointers to callers, who hold
@@ -342,13 +340,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     void get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                        wcstring &output) const;
 
-    /// Tell the parser that the specified function may not be run if not inside of a conditional
-    /// block. This is to remove some possibilities of infinite recursion.
-    void forbid_function(const wcstring &function);
-
-    /// Undo last call to parser_forbid_function().
-    void allow_function();
-
     /// Output profiling data to the given filename.
     void emit_profiling(const char *path) const;
 
@@ -364,6 +355,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Return a string representing the current stack trace.
     wcstring stack_trace() const;
 
+    /// \return whether the number of functions in the stack exceeds our stack depth limit.
+    bool function_stack_is_overflowing() const;
+
     /// \return a shared pointer reference to this parser.
     std::shared_ptr<parser_t> shared();
 
diff --git a/tests/checks/stack-overflow.fish b/tests/checks/stack-overflow.fish
index 201a73666..e7d742135 100644
--- a/tests/checks/stack-overflow.fish
+++ b/tests/checks/stack-overflow.fish
@@ -275,3 +275,5 @@ left
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}

From ffb4f7a4ffbf4090a80af2cb9db28dc69bbd45e8 Mon Sep 17 00:00:00 2001
From: Sam Yu <ytz1995@gmail.com>
Date: Sun, 10 Nov 2019 18:03:42 +0800
Subject: [PATCH 1212/1732] Update zypper completion

- update options to the newest version
- re-format and align
---
 share/completions/zypper.fish | 559 +++++++++++++++++++---------------
 1 file changed, 321 insertions(+), 238 deletions(-)

diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index 82e331bd4..ec61f1ea4 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -6,6 +6,7 @@ set -g __fish_zypper_repo_commands repos lr removerepo rr renamerepo nr modifyre
 set -g __fish_zypper_file_commands install in addrepo ar
 set -g __fish_zypper_package_types package patch pattern product srcpackage application
 set -g __fish_zypper_download_modes only in-advance in-heaps as-needed
+set -g __fish_zypper_solver_focus_modes Job Installed Update
 
 function __fish_zypper_cmd_in_array
     for i in (commandline -pco)
@@ -89,202 +90,249 @@ complete -n '__fish_zypper_use_pkg' -c zypper -a '(__fish_zypper_print_packages)
 complete -f -n '__fish_zypper_use_repo' -c zypper -a '(__fish_zypper_print_repos)' -d 'Repo'
 complete -f -n '__fish_zypper_not_use_file' -c zypper
 
-complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
+# Commands:
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?'   -d 'Print help'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
+
+#  Repository Management:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr'      -d 'List all defined repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar'    -d 'Add a new repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref'   -d 'Refresh all repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc'      -d 'Clean local caches'
+
+#  Service Management:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls'      -d 'List all defined services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as'    -d 'Add a new service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
+
+#  Software Management:
+complete    -n '__fish_zypper_no_subcommand' -c zypper -a 'install in'        -d 'Install packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm'         -d 'Remove packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve'         -d 'Verify integrity of package dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
+
+#  Update Management:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up'        -d 'Update installed packages with newer versions'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu'  -d 'List available updates'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch'            -d 'Install needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp'  -d 'List needed patches'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
+
+#  Querying:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se'        -d 'Search for packages matching a pattern'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if'          -d 'Show full information for specified packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info'       -d 'Show full information for specified patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info'     -d 'Show full information for specified patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info'     -d 'Show full information for specified products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch'      -d 'List all available patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa'      -d 'List all available packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt'      -d 'List all available patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd'      -d 'List all available products'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
+
+#  Package Locks:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al'    -d 'Add a package lock'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll'      -d 'List current package locks'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
+
+#  Locale Management:
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc'      -d 'List requested locales (languages codes)'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc'    -d 'Add locale(s) to requested locales'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelocale rloc' -d 'Remove locale(s) from requested locales'
+
+#  Other Commands:
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos'    -d 'Print the target operating system ID string'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses'        -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download'        -d 'Download rpms specified on the commandline to a local directory'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'needs-rebooting' -d 'Check if the needs-reboot flag was set'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps'              -d 'List running processes which might still use files and libraries deleted by recent upgrades'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config -s c -r -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
+#  Subcommands:
+
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'subcommand' -d 'Lists available subcommands'
+
+# Global Options:
+
+complete -c zypper -n '__fish_zypper_no_subcommand' -l help            -s h -d 'Help'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l version         -s V -d 'Output the version number'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids            -d 'Output a list of zypper user prompts'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l config       -r -s c -d 'Use specified config file instead of the default'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata             -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet           -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose         -s v -d 'Increase verbosity'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev       -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style     -s s -d 'Table style (integer)'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible  -s r -d 'Turn on rug compatibility'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -d 'Use an additional repository'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
-
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout          -s x -d 'Switch to XML output'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown  -s i -d 'Ignore unknown packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l terse           -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
+
+complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D  -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir  -s C  -r -d 'Use alternative directory for all caches'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir    -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir   -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir    -r -d 'Use alternative package cache directory'
+
+#  Repository Options
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks        -d 'Ignore GPG check failures and continue'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo    -s p -r -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -r -d 'Additionally use disabled repositories providing a specific keyword'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh           -d 'Do not refresh the repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                -d 'Ignore CD/DVD repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote            -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever           -d 'Set the value of $releasever in all .repo files'
+
+#  Target Options
+complete -c zypper -n '__fish_zypper_no_subcommand' -l root               -s R -r -d 'Operate on a different root directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot             -r -d 'Operate on a different root directory, but share repositories with the host'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 function __fish_zypper_is_subcommand_lr
     __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -s e -r -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export         -r -s e -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias             -s a -d 'Show also repository alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name              -s n -d 'Show also repository name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh           -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri               -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority          -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details           -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service           -s s -d 'Show also alias of parent service'
 complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri       -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name      -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias     -s A -d 'Sort the list by alias'
 
 function __fish_zypper_is_subcommand_ar
     __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -s r -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -s n -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo           -r -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check             -s c -d 'Probe URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check          -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority          -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages     -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages  -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name           -r -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable            -s d -d 'Add the repository as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable           -s d -d 'Add the repository as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh           -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh        -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_rr
     __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth          -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query         -d 'Ignore query string in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all            -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local          -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote         -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_mr
     __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -s n -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name           -r -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable           -s d -d "Disable the repository"
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable            -s e -d 'Enable the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh           -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh        -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority       -r -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages     -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages  -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -s m -d 'Apply changes to repositories of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all               -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local             -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote            -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type    -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
     __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force            -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build      -s b -d 'Force rebuild of the database'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download   -s d -d 'Force download of raw metadata'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only       -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only    -s D -d "Only download raw metadata, don't build the database"
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services         -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
     __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri               -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority          -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details           -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos        -s r -d 'Show also repositories belonging to the services'
 complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri       -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name      -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
     __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l type -s t -d 'Type of the service (ris)'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -s n -d 'Specify descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name    -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable     -s d -d 'Add the service as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable    -s d -d 'Add the service as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh    -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_ms
     __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -s i -d 'Add a RIS service repository to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -s j -d 'Remove a RIS service repository to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name       -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable        -s e -d 'Enable a disabled service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable       -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh       -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh    -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all           -s a -d 'Apply changes to all services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local         -s l -d 'Apply changes to all local services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote        -s t -d 'Apply changes to all remote services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type   -s m -d 'Apply changes to services of specified type'
+
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable  -r -s i -d 'Add a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -r -s I -d 'Add a RIS service repository to disable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable  -r -s j -d 'Remove a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -r -s J -d 'Remove a RIS service repository to disable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable     -s k -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable    -s K -d 'Clear the list of RIS repositories to disable'
 
 function __fish_zypper_is_subcommand_rs
     __fish_zypper_cmd_in_array removeservice rs
@@ -297,177 +345,207 @@ function __fish_zypper_is_subcommand_refs
     __fish_zypper_cmd_in_array refresh-services refs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force          -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos     -s r -d 'Refresh also repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l restore-status -s R -d 'Also restore service repositories enabled/disabled state'
+
+function __fish_zypper_subcommand_has_solver_expert_options
+    __fish_zypper_cmd_in_array install in verify ve source-install si install-new-recommends inr update up dist-upgrade dup patch
+end
+
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver      -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution  -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution   -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -f -r -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends        -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends     -d 'Do not install recommended packages, only required'
+
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_in
     __fish_zypper_cmd_in_array install in
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -f -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-recommends -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l recommends -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name          -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability    -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details            -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage         -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force         -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run       -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_rm
     __fish_zypper_cmd_in_array remove rm
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name          -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability    -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run       -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps    -s u -d 'Automatically remove unneeded dependencies'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
+
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l solver-focus -f -r -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
 
 function __fish_zypper_is_subcommand_ve
     __fish_zypper_cmd_in_array verify ve
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run       -s D -d 'Test the repair, do not actually do anything to the system'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm    -s y -d 'Don\'t require user interaction'
 
 function __fish_zypper_is_subcommand_si
     __fish_zypper_cmd_in_array source-install si
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only   -s d -d 'Install only build dependencies of specified packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps     -s D -d "Don't install build dependencies"
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only     -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_inr
     __fish_zypper_cmd_in_array install-new-recommends inr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
 
 function __fish_zypper_is_subcommand_up
     __fish_zypper_cmd_in_array update up
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort        -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive   -d 'Do not skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive   -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run       -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-recommends -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_lu
     __fish_zypper_cmd_in_array list-updates lu
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all    -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
+
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_lp
     __fish_zypper_cmd_in_array list-patches lp
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'List needed patches for Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -d 'List all patches in this category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
+set -g __fish_zypper_patch_category security recommended optional feature document yast
+set -g __fish_zypper_patch_severity critical important moderate low unspecified
+
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all      -s a -d 'List all patches, not only the needed ones'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -d 'List patches issued up to the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'List needed patches for CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issuesstring -d 'Look for issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -r -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity      -r -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date       -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues        -d 'Select issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_dup
     __fish_zypper_cmd_in_array dist-upgrade dup
 end
 
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-recommends -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l recommends -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run       -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm    -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-downgrade -d 'Do not allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-downgrade -d 'Allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-name-change -d 'Do not allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-name-change -d 'Allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-arch-change -d 'Do not allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-arch-change -d 'Allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-vendor-change -d 'Do not allow installed resolvables to switch vendors'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-vendor-change -d 'Allow installed resolvables to switch vendors'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_pchk
     __fish_zypper_cmd_in_array patch-check pchk
 end
 
+complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l updatestack-only -d 'Consider only patches which affect the package management itself'
 complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_se
     __fish_zypper_cmd_in_array search se
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only -s u -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings         -d 'Search for a match to partial words (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words              -d 'Search for a match to whole words only'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x         -d 'Searches for an exact package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides                 -d 'Search for packages which provide the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires                 -d 'Search for packages which require the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends               -d 'Search for packages which recommend the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements              -d 'Search for packages which supplements the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name                -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list           -s f -d 'Search for a match in the file list of packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive      -s C -d 'Perform case-sensitive search'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details             -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose             -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-all -d 'Search for a match with all search strings (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-any -d 'Search for a match with any of the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only      -s i -d 'Show only packages that are already installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only  -s u -d 'Show only packages that are not currently installed'
 
 function __fish_zypper_is_subcommand_if
     __fish_zypper_cmd_in_array info if
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l match-substrings -s s -d 'Print information for packages partially matching name'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show symbols the package provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show symbols the package requires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show symbols the package conflicts with'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show symbols the package obsoletes'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show symbols the package recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show symbols the package suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides              -d 'Show provides'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires              -d 'Show requires and prerequires'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts             -d 'Show conflicts'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes             -d 'Show obsoletes'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends            -d 'Show recommends'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements           -d 'Show supplements'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests              -d 'Show suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_pch
     __fish_zypper_cmd_in_array patches pch
@@ -479,30 +557,31 @@ function __fish_zypper_is_subcommand_pa
     __fish_zypper_cmd_in_array packages pa
 end
 
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned                -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested               -d 'Show packages which are suggested'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended             -d 'Show packages which are recommended'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded                -d 'Show packages which are unneeded'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name       -s N -d 'Sort the list by package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo       -s R -d 'Sort the list by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only     -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
 
 function __fish_zypper_is_subcommand_pt
     __fish_zypper_cmd_in_array patterns pt
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only     -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
     __fish_zypper_cmd_in_array products pd
 end
 
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd               -r -d 'XML output only: Literally forward the XML tags found in a product file'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only     -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
@@ -524,7 +603,7 @@ function __fish_zypper_is_subcommand_cl
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty      -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_vcmp
     __fish_zypper_cmd_in_array versioncmp vcmp
@@ -543,34 +622,38 @@ function __fish_zypper_is_subcommand_clean
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -r -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata     -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all          -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
     __fish_zypper_cmd_in_array patch
 end
 
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only   -d 'Consider only patches which affect the package management itself'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update        -d 'Additionally try to update all packages not covered by patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo    -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -r -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity      -r -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date            -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla      -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive   -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive   -d 'Skip interactive patches'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Install patch fixing the specified bugzilla issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -d 'Install all patches in this category'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Install patch fixing the specified CVE issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -d 'Install patches issued until the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l debug-solver -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-recommends -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run       -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_sourcedownload
     __fish_zypper_cmd_in_array source-download
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -s d -d 'Download all source rpms to this directory. Default: /var/cache/zypper/source-download'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -r -s d -d 'Download all source rpms to this directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete            -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete         -d 'Do not delete extraneous source rpms'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status            -d "Don't download any source rpms, but show which source rpms are missing or extraneous"

From 35bc811310bb0698bad138163b7b6c5c4aa8102a Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Fri, 8 Nov 2019 08:04:59 -0700
Subject: [PATCH 1213/1732] add completions for `plutil`

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

diff --git a/share/completions/plutil.fish b/share/completions/plutil.fish
new file mode 100644
index 000000000..84dd89d43
--- /dev/null
+++ b/share/completions/plutil.fish
@@ -0,0 +1,14 @@
+complete -c plutil -o help -d "Show usage information and exit"
+complete -c plutil -o lint -d "Check plist files for syntax errors"
+complete -c plutil -o convert -xa "xml1 binary1 json swift objc" -d "Rewrite file in FORMAT"
+complete -c plutil -s r -n "__fish_seen_argument -s convert; and __fish_seen_subcommand_from json" -d "Pretty-print JSON"
+complete -c plutil -s o -r -n "__fish_seen_argument -s convert" -d "Alternate path for conversion result"
+complete -c plutil -s e -x -n "__fish_seen_argument -s convert" -d "Alternate extension for converted files"
+complete -c plutil -o header -n "__fish_seen_argument -s convert; and __fish_seen_subcommand_from objc" -d "Convert FILE to Obj-C literal and create a .h file"
+complete -c plutil -o insert -x -d "Insert VALUE into the plist"
+complete -c plutil -o replace -x -d "Overwrite existing VALUE in the plist"
+complete -c plutil -o type -n "__fish_seen_argument -o insert; or __fish_seen_argument -o replace" -xa "-bool -integer -float -string -date -data -xml -json"
+complete -c plutil -o remove -x -d "Removes the value at KEYPATH"
+complete -c plutil -o extract -x -d "Outputs the value at KEYPATH as a new plist"
+complete -c plutil -s p -d "Print the plist in a human-readable fashion"
+complete -c plutil -s s -d "Be silent on success"

From 012a3137dfc72f79d8995ab5911390d154745f15 Mon Sep 17 00:00:00 2001
From: "Z. Grace Moreau" <zgracem@users.noreply.github.com>
Date: Fri, 8 Nov 2019 08:07:52 -0700
Subject: [PATCH 1214/1732] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fedbcab3..e7ab96b43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@
   - `nethack` (#6240)
   - `patool` (#6083)
   - `phpunit` (#6197)
+  - `plutil` (#6301)
   - `qubes-gpg-client` (#6067)
   - `rg`
   - `rustup`

From 87f4f33600ac1362e8a2bc97580d8c6f2f3903f7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 13:01:47 -0800
Subject: [PATCH 1215/1732] Remove vars parameter from
 function_exists_no_autoload

This variable was unused.
---
 src/complete.cpp  | 2 +-
 src/function.cpp  | 3 +--
 src/function.h    | 2 +-
 src/highlight.cpp | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 1a62e964f..bda719620 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -903,7 +903,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
     bool head_exists = builtin_exists(cmd);
     // Only reload environment variables if builtin_exists returned false, as an optimization
     if (head_exists == false) {
-        head_exists = function_exists_no_autoload(cmd, vars);
+        head_exists = function_exists_no_autoload(cmd);
         // While it may seem like first testing `path_get_path` before resorting to an env lookup
         // may be faster, path_get_path can potentially do a lot of FS/IO access, so env.get() +
         // function_exists() should still be faster.
diff --git a/src/function.cpp b/src/function.cpp
index 0e220eee2..c54c76671 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -226,8 +226,7 @@ void function_load(const wcstring &cmd, parser_t &parser) {
     }
 }
 
-int function_exists_no_autoload(const wcstring &cmd, const environment_t &vars) {
-    (void)vars;
+int function_exists_no_autoload(const wcstring &cmd) {
     if (parser_keywords_is_reserved(cmd)) return 0;
     auto funcset = function_set.acquire();
 
diff --git a/src/function.h b/src/function.h
index dcfb14cb8..80cc39ace 100644
--- a/src/function.h
+++ b/src/function.h
@@ -77,7 +77,7 @@ int function_exists(const wcstring &name, parser_t &parser);
 void function_load(const wcstring &name, parser_t &parser);
 
 /// Returns true if the function with the name name exists, without triggering autoload.
-int function_exists_no_autoload(const wcstring &name, const environment_t &vars);
+int function_exists_no_autoload(const wcstring &name);
 
 /// Returns all function names.
 ///
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 88fb88223..529745ea9 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -461,8 +461,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
     bool cmd_ok = false;
     if (path_get_path(parsed_command, NULL, vars)) {
         cmd_ok = true;
-    } else if (builtin_exists(parsed_command) ||
-               function_exists_no_autoload(parsed_command, vars)) {
+    } else if (builtin_exists(parsed_command) || function_exists_no_autoload(parsed_command)) {
         cmd_ok = true;
     }
 
@@ -1122,7 +1121,7 @@ static bool command_is_valid(const wcstring &cmd, enum parse_statement_decoratio
     if (!is_valid && builtin_ok) is_valid = builtin_exists(cmd);
 
     // Functions
-    if (!is_valid && function_ok) is_valid = function_exists_no_autoload(cmd, vars);
+    if (!is_valid && function_ok) is_valid = function_exists_no_autoload(cmd);
 
     // Abbreviations
     if (!is_valid && abbreviation_ok) is_valid = expand_abbreviation(cmd, vars).has_value();

From f2093aef43b958711925704234cec5ae0224d8b4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 13:25:55 -0800
Subject: [PATCH 1216/1732] Remove io_chain_t::push_front

It was unused.
---
 src/io.cpp | 5 -----
 src/io.h   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 129044239..6bf0782b4 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -214,11 +214,6 @@ void io_chain_t::push_back(shared_ptr<io_data_t> element) {
     std::vector<shared_ptr<io_data_t> >::push_back(std::move(element));
 }
 
-void io_chain_t::push_front(shared_ptr<io_data_t> element) {
-    assert(element.get() != nullptr);
-    this->insert(this->begin(), std::move(element));
-}
-
 void io_chain_t::append(const io_chain_t &chain) {
     this->insert(this->end(), chain.begin(), chain.end());
 }
diff --git a/src/io.h b/src/io.h
index 79ea595de..0b18b0d18 100644
--- a/src/io.h
+++ b/src/io.h
@@ -333,7 +333,6 @@ class io_chain_t : public std::vector<shared_ptr<io_data_t>> {
 
     void remove(const shared_ptr<const io_data_t> &element);
     void push_back(shared_ptr<io_data_t> element);
-    void push_front(shared_ptr<io_data_t> element);
     void append(const io_chain_t &chain);
 
     shared_ptr<const io_data_t> get_io_for_fd(int fd) const;

From 424c56006dc52dfaa0dc7ba55c7a724ed39b6b78 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 13:31:47 -0800
Subject: [PATCH 1217/1732] Add a paranoid assert to io_chain_t::append

---
 src/io.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/io.cpp b/src/io.cpp
index 6bf0782b4..620c627ac 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -215,6 +215,7 @@ void io_chain_t::push_back(shared_ptr<io_data_t> element) {
 }
 
 void io_chain_t::append(const io_chain_t &chain) {
+    assert(&chain != this && "Cannot append self to self");
     this->insert(this->end(), chain.begin(), chain.end());
 }
 

From 521d0e84f5d435afcf0c0d7fb1a58ffce048f35f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 13:33:20 -0800
Subject: [PATCH 1218/1732] Remove non-const get_io_for_fd

These could be made unused.
---
 src/exec.cpp |  8 ++++----
 src/io.cpp   | 13 -------------
 src/io.h     |  2 --
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 27f2101c1..58c6cf9dd 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -76,7 +76,7 @@ void exec_close(int fd) {
 }
 
 /// Returns true if the redirection is a file redirection to a file other than /dev/null.
-static bool redirection_is_to_real_file(const shared_ptr<io_data_t> &io) {
+static bool redirection_is_to_real_file(const shared_ptr<const io_data_t> &io) {
     bool result = false;
     if (io && io->io_mode == io_mode_t::file) {
         // It's a file redirection. Compare the path to /dev/null.
@@ -594,8 +594,8 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
     // We will try to elide constructing an internal process. However if the output is going to a
     // real file, we have to do it. For example in `echo -n > file.txt` we proceed to open file.txt
     // even though there is no output, so that it is properly truncated.
-    const shared_ptr<io_data_t> stdout_io = io_chain->get_io_for_fd(STDOUT_FILENO);
-    const shared_ptr<io_data_t> stderr_io = io_chain->get_io_for_fd(STDERR_FILENO);
+    const shared_ptr<const io_data_t> stdout_io = io_chain->get_io_for_fd(STDOUT_FILENO);
+    const shared_ptr<const io_data_t> stderr_io = io_chain->get_io_for_fd(STDERR_FILENO);
     bool must_use_process =
         redirection_is_to_real_file(stdout_io) || redirection_is_to_real_file(stderr_io);
 
@@ -610,7 +610,7 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
     // need for a similar check for stderr.
     bool stdout_done = false;
     if (stdout_io && stdout_io->io_mode == io_mode_t::bufferfill) {
-        auto stdout_buffer = static_cast<io_bufferfill_t *>(stdout_io.get())->buffer();
+        auto stdout_buffer = static_cast<const io_bufferfill_t *>(stdout_io.get())->buffer();
         stdout_buffer->append_from_stream(stdout_stream);
         stdout_done = true;
     }
diff --git a/src/io.cpp b/src/io.cpp
index 620c627ac..a857170ca 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -337,20 +337,7 @@ shared_ptr<const io_data_t> io_chain_t::get_io_for_fd(int fd) const {
     return shared_ptr<const io_data_t>();
 }
 
-shared_ptr<io_data_t> io_chain_t::get_io_for_fd(int fd) {
-    size_t idx = this->size();
-    while (idx--) {
-        const shared_ptr<io_data_t> &data = this->at(idx);
-        if (data->fd == fd) {
-            return data;
-        }
-    }
-    return shared_ptr<io_data_t>();
-}
-
 /// The old function returned the last match, so we mimic that.
 shared_ptr<const io_data_t> io_chain_get(const io_chain_t &src, int fd) {
     return src.get_io_for_fd(fd);
 }
-
-shared_ptr<io_data_t> io_chain_get(io_chain_t &src, int fd) { return src.get_io_for_fd(fd); }
diff --git a/src/io.h b/src/io.h
index 0b18b0d18..7a754a7e8 100644
--- a/src/io.h
+++ b/src/io.h
@@ -336,12 +336,10 @@ class io_chain_t : public std::vector<shared_ptr<io_data_t>> {
     void append(const io_chain_t &chain);
 
     shared_ptr<const io_data_t> get_io_for_fd(int fd) const;
-    shared_ptr<io_data_t> get_io_for_fd(int fd);
 };
 
 /// Return the last io redirection in the chain for the specified file descriptor.
 shared_ptr<const io_data_t> io_chain_get(const io_chain_t &src, int fd);
-shared_ptr<io_data_t> io_chain_get(io_chain_t &src, int fd);
 
 /// Helper type returned from making autoclose pipes.
 struct autoclose_pipes_t {

From ac2eed2ffa71aa6db08dad2ea6f6b0dd89f815d6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 14:00:30 -0800
Subject: [PATCH 1219/1732] Make io_chain_t store const io_data_t

This will make it easier to reason about with concurrent execution.
---
 src/exec.cpp | 21 +++++++++------------
 src/io.cpp   | 21 +++++++--------------
 src/io.h     | 17 +++++++++--------
 3 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 58c6cf9dd..0f8145f21 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -182,9 +182,6 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
     safe_launch_process(p, actual_cmd, argv_array.get(), envv);
 }
 
-/// Check if the IO redirection chains contains redirections for the specified file descriptor.
-static int has_fd(const io_chain_t &d, int fd) { return io_chain_get(d, fd).get() != NULL; }
-
 /// Make a copy of the specified io redirection chain, but change file redirection into fd
 /// redirection. This makes the redirection chain suitable for use as block-level io, since the file
 /// won't be repeatedly reopened for every command in the block, which would reset the cursor
@@ -211,7 +208,7 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const w
     // Make our chain of redirections.
     io_chain_t result_chain;
 
-    for (const shared_ptr<io_data_t> &in : in_chain) {
+    for (const io_data_ref_t &in : in_chain) {
         switch (in->io_mode) {
             case io_mode_t::pipe:
             case io_mode_t::bufferfill:
@@ -222,7 +219,7 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const w
             }
             case io_mode_t::file: {
                 // We have a path-based redireciton. Resolve it to a file.
-                io_file_t *in_file = static_cast<io_file_t *>(in.get());
+                const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
                 int fd = wopen(path_apply_working_directory(in_file->filename, pwd), in_file->flags,
                                OPEN_MASK);
                 if (fd < 0) {
@@ -487,7 +484,7 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     // be reading from.
     if (pipe_read) {
         local_builtin_stdin = pipe_read->pipe_fd();
-    } else if (const auto in = proc_io_chain.get_io_for_fd(STDIN_FILENO)) {
+    } else if (const auto in = proc_io_chain.io_for_fd(STDIN_FILENO)) {
         switch (in->io_mode) {
             case io_mode_t::fd: {
                 const io_fd_t *in_fd = static_cast<const io_fd_t *>(in.get());
@@ -546,13 +543,13 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     } else {
         // We are not a pipe. Check if there is a redirection local to the process
         // that's not io_mode_t::close.
-        const shared_ptr<const io_data_t> stdin_io = io_chain_get(p->io_chain(), STDIN_FILENO);
+        const shared_ptr<const io_data_t> stdin_io = p->io_chain().io_for_fd(STDIN_FILENO);
         stdin_is_directly_redirected = stdin_io && stdin_io->io_mode != io_mode_t::close;
     }
 
     streams.stdin_fd = local_builtin_stdin;
-    streams.out_is_redirected = has_fd(proc_io_chain, STDOUT_FILENO);
-    streams.err_is_redirected = has_fd(proc_io_chain, STDERR_FILENO);
+    streams.out_is_redirected = proc_io_chain.io_for_fd(STDOUT_FILENO) != nullptr;
+    streams.err_is_redirected = proc_io_chain.io_for_fd(STDERR_FILENO) != nullptr;
     streams.stdin_is_directly_redirected = stdin_is_directly_redirected;
     streams.io_chain = &proc_io_chain;
 
@@ -594,8 +591,8 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
     // We will try to elide constructing an internal process. However if the output is going to a
     // real file, we have to do it. For example in `echo -n > file.txt` we proceed to open file.txt
     // even though there is no output, so that it is properly truncated.
-    const shared_ptr<const io_data_t> stdout_io = io_chain->get_io_for_fd(STDOUT_FILENO);
-    const shared_ptr<const io_data_t> stderr_io = io_chain->get_io_for_fd(STDERR_FILENO);
+    const shared_ptr<const io_data_t> stdout_io = io_chain->io_for_fd(STDOUT_FILENO);
+    const shared_ptr<const io_data_t> stderr_io = io_chain->io_for_fd(STDERR_FILENO);
     bool must_use_process =
         redirection_is_to_real_file(stdout_io) || redirection_is_to_real_file(stderr_io);
 
@@ -1080,7 +1077,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     // The read limit is dictated by the last bufferfill.
     for (auto &io : all_ios) {
         if ((io->io_mode == io_mode_t::bufferfill)) {
-            const auto *bf = static_cast<io_bufferfill_t *>(io.get());
+            const auto *bf = static_cast<const io_bufferfill_t *>(io.get());
             stdout_read_limit = bf->buffer()->read_limit();
         }
     }
diff --git a/src/io.cpp b/src/io.cpp
index a857170ca..8ba416975 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -208,10 +208,10 @@ void io_chain_t::remove(const shared_ptr<const io_data_t> &element) {
     }
 }
 
-void io_chain_t::push_back(shared_ptr<io_data_t> element) {
+void io_chain_t::push_back(io_data_ref_t element) {
     // Ensure we never push back NULL.
     assert(element.get() != nullptr);
-    std::vector<shared_ptr<io_data_t> >::push_back(std::move(element));
+    std::vector<io_data_ref_t>::push_back(std::move(element));
 }
 
 void io_chain_t::append(const io_chain_t &chain) {
@@ -248,7 +248,7 @@ void io_print(const io_chain_t &chain)
 #endif
 
 int move_fd_to_unused(int fd, const io_chain_t &io_chain, bool cloexec) {
-    if (fd < 0 || io_chain.get_io_for_fd(fd).get() == NULL) {
+    if (fd < 0 || io_chain.io_for_fd(fd).get() == nullptr) {
         return fd;
     }
 
@@ -325,19 +325,12 @@ maybe_t<autoclose_pipes_t> make_autoclose_pipes(const io_chain_t &ios) {
     return {std::move(result)};
 }
 
-/// Return the last IO for the given fd.
-shared_ptr<const io_data_t> io_chain_t::get_io_for_fd(int fd) const {
-    size_t idx = this->size();
-    while (idx--) {
-        const shared_ptr<io_data_t> &data = this->at(idx);
+shared_ptr<const io_data_t> io_chain_t::io_for_fd(int fd) const {
+    for (auto iter = rbegin(); iter != rend(); ++iter) {
+        const auto &data = *iter;
         if (data->fd == fd) {
             return data;
         }
     }
-    return shared_ptr<const io_data_t>();
-}
-
-/// The old function returned the last match, so we mimic that.
-shared_ptr<const io_data_t> io_chain_get(const io_chain_t &src, int fd) {
-    return src.get_io_for_fd(fd);
+    return nullptr;
 }
diff --git a/src/io.h b/src/io.h
index 7a754a7e8..3d114510d 100644
--- a/src/io.h
+++ b/src/io.h
@@ -325,22 +325,23 @@ class io_buffer_t {
     void append_from_stream(const output_stream_t &stream);
 };
 
-class io_chain_t : public std::vector<shared_ptr<io_data_t>> {
+using io_data_ref_t = std::shared_ptr<const io_data_t>;
+
+class io_chain_t : public std::vector<io_data_ref_t> {
    public:
-    using std::vector<shared_ptr<io_data_t>>::vector;
+    using std::vector<io_data_ref_t>::vector;
     // user-declared ctor to allow const init. Do not default this, it will break the build.
     io_chain_t() {}
 
-    void remove(const shared_ptr<const io_data_t> &element);
-    void push_back(shared_ptr<io_data_t> element);
+    void remove(const io_data_ref_t &element);
+    void push_back(io_data_ref_t element);
     void append(const io_chain_t &chain);
 
-    shared_ptr<const io_data_t> get_io_for_fd(int fd) const;
+    /// \return the last io redirection in the chain for the specified file descriptor, or nullptr
+    /// if none.
+    io_data_ref_t io_for_fd(int fd) const;
 };
 
-/// Return the last io redirection in the chain for the specified file descriptor.
-shared_ptr<const io_data_t> io_chain_get(const io_chain_t &src, int fd);
-
 /// Helper type returned from making autoclose pipes.
 struct autoclose_pipes_t {
     /// Read end of the pipe.

From b0cf94e3ba48334b16bac39b20fed632e008fb66 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 10 Nov 2019 14:46:21 -0800
Subject: [PATCH 1220/1732] Refactor function_prepare_environment

Migrate it into exec.cpp to reduce the complexity of
exec_block_or_func_process.
---
 src/exec.cpp     | 68 +++++++++++++++++++++++++++++++++++-------------
 src/function.cpp | 25 ------------------
 src/function.h   |  4 ---
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0f8145f21..25ace6366 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -769,6 +769,53 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
     return true;
 }
 
+// Given that we are about to execute a function type proc \p, push a function block and set up the
+// variable environment.
+static block_t *function_prepare_environment(parser_t &parser, const process_t *p,
+                                             const function_properties_t &props) {
+    // Extract the function name and remaining arguments.
+    wcstring func_name;
+    wcstring_list_t argv = p->get_argv_array().to_list();
+    if (!argv.empty()) {
+        // Extract and remove the function name from argv.
+        func_name = std::move(*argv.begin());
+        argv.erase(argv.begin());
+    }
+    block_t *fb = parser.push_block(block_t::function_block(func_name, argv, props.shadow_scope));
+    auto &vars = parser.vars();
+
+    // Setup the environment for the function. There are three components of the environment:
+    // 1. named arguments
+    // 2. inherited variables
+    // 3. argv
+
+    size_t idx = 0;
+    for (const wcstring &named_arg : props.named_arguments) {
+        if (idx < argv.size()) {
+            vars.set_one(named_arg, ENV_LOCAL | ENV_USER, argv.at(idx));
+        } else {
+            vars.set_empty(named_arg, ENV_LOCAL | ENV_USER);
+        }
+        idx++;
+    }
+
+    std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
+    for (const auto &kv : inherit_vars) {
+        vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
+    }
+
+    vars.set_argv(std::move(argv));
+    return fb;
+}
+
+// Given that we are done executing a function, restore the environment.
+static void function_restore_environment(parser_t &parser, const block_t *block) {
+    parser.pop_block(block);
+
+    // If we returned due to a return statement, then stop returning now.
+    parser.libdata().returning = false;
+}
+
 /// Execute a block node or function "process".
 /// \p user_ios contains the list of user-specified ios, used so we can avoid stomping on them with
 /// our pipes.
@@ -794,30 +841,15 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     }
 
     if (p->type == process_type_t::function) {
-        const wcstring func_name = p->argv0();
-        auto props = function_get_properties(func_name);
+        auto props = function_get_properties(p->argv0());
         if (!props) {
             FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
             return false;
         }
 
-        const std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
-
-        // TODO: we want to store the args in both the function block and the environment.
-        // Find a way to share memory here?
-        wcstring_list_t argv = p->get_argv_array().to_list();
-        // Remove the function name from argv.
-        if (!argv.empty()) argv.erase(argv.begin());
-        block_t *fb =
-            parser.push_block(block_t::function_block(func_name, argv, props->shadow_scope));
-        function_prepare_environment(parser.vars(), func_name, std::move(argv), inherit_vars);
-
+        const block_t *fb = function_prepare_environment(parser, p, *props);
         internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
-
-        parser.pop_block(fb);
-
-        // If we returned due to a return statement, then stop returning now.
-        parser.libdata().returning = false;
+        function_restore_environment(parser, fb);
     } else {
         assert(p->type == process_type_t::block_node);
         assert(p->block_node_source && p->internal_block_node && "Process is missing node info");
diff --git a/src/function.cpp b/src/function.cpp
index c54c76671..21135cdb1 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -364,28 +364,3 @@ void function_invalidate_path() {
     }
     funcset->autoloader.clear();
 }
-
-// Setup the environment for the function. There are three components of the environment:
-// 1. argv
-// 2. named arguments
-// 3. inherited variables
-void function_prepare_environment(env_stack_t &vars, const wcstring &name, wcstring_list_t argv,
-                                  const std::map<wcstring, env_var_t> &inherited_vars) {
-    vars.set_argv(argv);
-    auto props = function_get_properties(name);
-    if (props && !props->named_arguments.empty()) {
-        auto argv_iter = argv.cbegin();
-        for (const wcstring &named_arg : props->named_arguments) {
-            if (argv_iter != argv.cend()) {
-                vars.set_one(named_arg, ENV_LOCAL | ENV_USER, std::move(*argv_iter));
-                ++argv_iter;
-            } else {
-                vars.set_empty(named_arg, ENV_LOCAL | ENV_USER);
-            }
-        }
-    }
-
-    for (const auto &kv : inherited_vars) {
-        vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
-    }
-}
diff --git a/src/function.h b/src/function.h
index 80cc39ace..62f2d6a5f 100644
--- a/src/function.h
+++ b/src/function.h
@@ -108,10 +108,6 @@ std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name);
 /// is successful.
 bool function_copy(const wcstring &name, const wcstring &new_name);
 
-/// Prepares the environment for executing a function.
-void function_prepare_environment(env_stack_t &vars, const wcstring &name, wcstring_list_t argv,
-                                  const std::map<wcstring, env_var_t> &inherited_vars);
-
 /// Observes that fish_function_path has changed.
 void function_invalidate_path();
 

From b51edcfcace4d26b076e95ecfee23945651b7a5c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Nov 2019 09:53:10 -0800
Subject: [PATCH 1221/1732] Simplify function_info_t and function_data_t

Work towards cleaning up function definition. Migrate inherit_vars into
props and capture their values at the point of definition.
---
 src/builtin_function.cpp  | 23 ++++++++++++-----
 src/builtin_functions.cpp |  8 ++----
 src/exec.cpp              |  5 ++--
 src/function.cpp          | 54 +++++++++------------------------------
 src/function.h            | 17 ++++++------
 5 files changed, 40 insertions(+), 67 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 415778880..70b2328e5 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -253,17 +253,26 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     }
 
     // We have what we need to actually define the function.
+    auto props = std::make_shared<function_properties_t>();
+    props->shadow_scope = opts.shadow_scope;
+    props->named_arguments = std::move(opts.named_arguments);
+
+    // Populate inherit_vars.
+    for (const wcstring &name : opts.inherit_vars) {
+        if (auto var = parser.vars().get(name)) {
+            props->inherit_vars[name] = var->as_list();
+        }
+    }
+
+    props->parsed_source = source;
+    props->body_node = body;
+
     function_data_t d;
     d.name = function_name;
-    if (!opts.description.empty()) d.description = opts.description;
-    // d.description = opts.description;
+    d.description = opts.description;
+    d.props = props;
     d.events = std::move(opts.events);
-    d.props.shadow_scope = opts.shadow_scope;
-    d.props.named_arguments = std::move(opts.named_arguments);
-    d.inherit_vars = std::move(opts.inherit_vars);
 
-    d.props.parsed_source = source;
-    d.props.body_node = body;
     function_add(std::move(d), parser);
 
     // Handle wrap targets by creating the appropriate completions.
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index bca9eace2..8e5cca2d0 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -213,15 +213,11 @@ static wcstring functions_def(const wcstring &name) {
     }
 
     // Output any inherited variables as `set -l` lines.
-    std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(name);
-    for (const auto &kv : inherit_vars) {
-        wcstring_list_t lst;
-        kv.second.to_list(lst);
-
+    for (const auto &kv : props->inherit_vars) {
         // We don't know what indentation style the function uses,
         // so we do what fish_indent would.
         append_format(out, L"\n    set -l %ls", kv.first.c_str());
-        for (const auto &arg : lst) {
+        for (const auto &arg : kv.second) {
             wcstring earg = escape_string(arg, ESCAPE_ALL);
             out.push_back(L' ');
             out.append(earg);
diff --git a/src/exec.cpp b/src/exec.cpp
index 25ace6366..9e952c1c2 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -799,9 +799,8 @@ static block_t *function_prepare_environment(parser_t &parser, const process_t *
         idx++;
     }
 
-    std::map<wcstring, env_var_t> inherit_vars = function_get_inherit_vars(func_name);
-    for (const auto &kv : inherit_vars) {
-        vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second.as_list());
+    for (const auto &kv : props.inherit_vars) {
+        vars.set(kv.first, ENV_LOCAL | ENV_USER, kv.second);
     }
 
     vars.set_argv(std::move(argv));
diff --git a/src/function.cpp b/src/function.cpp
index 21135cdb1..2767bbc6a 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -34,23 +34,16 @@
 class function_info_t {
    public:
     /// Immutable properties of the function.
-    std::shared_ptr<const function_properties_t> props;
+    function_properties_ref_t props;
     /// Function description. This may be changed after the function is created.
     wcstring description;
     /// File where this function was defined (intern'd string).
     const wchar_t *const definition_file;
-    /// Mapping of all variables that were inherited from the function definition scope to their
-    /// values.
-    const std::map<wcstring, env_var_t> inherit_vars;
     /// Flag for specifying that this function was automatically loaded.
     const bool is_autoload;
 
-    /// Constructs relevant information from the function_data.
-    function_info_t(function_data_t data, const environment_t &vars, const wchar_t *filename,
+    function_info_t(function_properties_ref_t props, wcstring desc, const wchar_t *def_file,
                     bool autoload);
-
-    /// Used by function_copy.
-    function_info_t(const function_info_t &data, const wchar_t *filename, bool autoload);
 };
 
 /// Type wrapping up the set of all functions.
@@ -148,30 +141,11 @@ static void autoload_names(std::unordered_set<wcstring> &names, int get_hidden)
     }
 }
 
-static std::map<wcstring, env_var_t> snapshot_vars(const wcstring_list_t &vars,
-                                                   const environment_t &src) {
-    std::map<wcstring, env_var_t> result;
-    for (const wcstring &name : vars) {
-        auto var = src.get(name);
-        if (var) result[name] = std::move(*var);
-    }
-    return result;
-}
-
-function_info_t::function_info_t(function_data_t data, const environment_t &vars,
-                                 const wchar_t *filename, bool autoload)
-    : props(std::make_shared<const function_properties_t>(std::move(data.props))),
-      description(std::move(data.description)),
-      definition_file(intern(filename)),
-      inherit_vars(snapshot_vars(data.inherit_vars, vars)),
-      is_autoload(autoload) {}
-
-function_info_t::function_info_t(const function_info_t &data, const wchar_t *filename,
-                                 bool autoload)
-    : props(data.props),
-      description(data.description),
-      definition_file(intern(filename)),
-      inherit_vars(data.inherit_vars),
+function_info_t::function_info_t(function_properties_ref_t props, wcstring desc,
+                                 const wchar_t *def_file, bool autoload)
+    : props(std::move(props)),
+      description(std::move(desc)),
+      definition_file(intern(def_file)),
       is_autoload(autoload) {}
 
 void function_add(const function_data_t &data, const parser_t &parser) {
@@ -191,8 +165,8 @@ void function_add(const function_data_t &data, const parser_t &parser) {
 
     // Create and store a new function.
     const wchar_t *filename = parser.libdata().current_filename;
-    auto ins = funcset->funcs.emplace(data.name,
-                                      function_info_t(data, parser.vars(), filename, is_autoload));
+    auto ins = funcset->funcs.emplace(
+        data.name, function_info_t(data.props, data.description, filename, is_autoload));
     assert(ins.second && "Function should not already be present in the table");
     (void)ins;
 
@@ -261,12 +235,6 @@ bool function_get_definition(const wcstring &name, wcstring &out_definition) {
     return false;
 }
 
-std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name) {
-    const auto funcset = function_set.acquire();
-    const function_info_t *func = funcset->get_info(name);
-    return func ? func->inherit_vars : std::map<wcstring, env_var_t>();
-}
-
 bool function_get_desc(const wcstring &name, wcstring &out_desc) {
     const auto funcset = function_set.acquire();
     const function_info_t *func = funcset->get_info(name);
@@ -294,12 +262,14 @@ bool function_copy(const wcstring &name, const wcstring &new_name) {
         // No such function.
         return false;
     }
+    const function_info_t &src_func = iter->second;
 
     // This new instance of the function shouldn't be tied to the definition file of the
     // original, so pass NULL filename, etc.
     // Note this will NOT overwrite an existing function with the new name.
     // TODO: rationalize if this behavior is desired.
-    funcset->funcs.emplace(new_name, function_info_t(iter->second, nullptr, false));
+    funcset->funcs.emplace(new_name,
+                           function_info_t(src_func.props, src_func.description, nullptr, false));
     return true;
 }
 
diff --git a/src/function.h b/src/function.h
index 62f2d6a5f..27170d1e7 100644
--- a/src/function.h
+++ b/src/function.h
@@ -26,10 +26,16 @@ struct function_properties_t {
     /// List of all named arguments for this function.
     wcstring_list_t named_arguments;
 
+    /// Mapping of all variables that were inherited from the function definition scope to their
+    /// values.
+    std::map<wcstring, wcstring_list_t> inherit_vars;
+
     /// Set to true if invoking this function shadows the variables of the underlying function.
     bool shadow_scope{true};
 };
 
+using function_properties_ref_t = std::shared_ptr<const function_properties_t>;
+
 /// Structure describing a function. This is used by the parser to store data on a function while
 /// parsing it. It is not used internally to store functions, the function_info_t structure
 /// is used for that purpose. Parhaps this should be merged with function_info_t.
@@ -38,11 +44,8 @@ struct function_data_t {
     wcstring name;
     /// Description of function.
     wcstring description;
-    /// List of all variables that are inherited from the function definition scope. The variable
-    /// values are snapshotted when function_add() is called.
-    wcstring_list_t inherit_vars;
     /// Function's metadata fields
-    function_properties_t props;
+    function_properties_ref_t props;
     /// List of all event handlers for this function.
     std::vector<event_description_t> events;
 };
@@ -54,7 +57,7 @@ void function_add(const function_data_t &data, const parser_t &parser);
 void function_remove(const wcstring &name);
 
 /// Returns the properties for a function, or nullptr if none. This does not trigger autoloading.
-std::shared_ptr<const function_properties_t> function_get_properties(const wcstring &name);
+function_properties_ref_t function_get_properties(const wcstring &name);
 
 /// Returns by reference the definition of the function with the name \c name. Returns true if
 /// successful, false if no function with the given name exists.
@@ -100,10 +103,6 @@ const wchar_t *function_get_definition_file(const wcstring &name);
 /// This does not trigger autoloading.
 int function_get_definition_lineno(const wcstring &name);
 
-/// Returns a mapping of all variables of the specified function that were inherited from the scope
-/// of the function definition to their values.
-std::map<wcstring, env_var_t> function_get_inherit_vars(const wcstring &name);
-
 /// Creates a new function using the same definition as the specified function. Returns true if copy
 /// is successful.
 bool function_copy(const wcstring &name, const wcstring &new_name);

From 6d7a66592b973ac8a4723c19336f0095aa4ce335 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Nov 2019 10:00:42 -0800
Subject: [PATCH 1222/1732] Make function_add take the filename directly
 instead of a parser

---
 src/builtin_function.cpp | 2 +-
 src/fish_tests.cpp       | 4 ++--
 src/function.cpp         | 3 +--
 src/function.h           | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 70b2328e5..bec57530e 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -273,7 +273,7 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     d.props = props;
     d.events = std::move(opts.events);
 
-    function_add(std::move(d), parser);
+    function_add(std::move(d), parser.libdata().current_filename);
 
     // Handle wrap targets by creating the appropriate completions.
     for (const wcstring &wt : opts.wrap_targets) complete_add_wrapper(function_name, wt);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 5e67bfa3b..3704d4c60 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2716,7 +2716,7 @@ static void test_complete() {
     // body_node.
     struct function_data_t func_data = {};
     func_data.name = L"scuttlebutt";
-    function_add(func_data, parser_t::principal_parser());
+    function_add(func_data, nullptr);
 
     // Complete a function name.
     completions.clear();
@@ -2830,7 +2830,7 @@ static void test_complete() {
     auto &pvars = parser_t::principal_parser().vars();
     function_data_t fd;
     fd.name = L"testabbrsonetwothreefour";
-    function_add(fd, parser_t::principal_parser());
+    function_add(fd, nullptr);
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
     complete(L"testabbrsonetwothree", &completions, {}, pvars, parser);
     do_test(ret == 0);
diff --git a/src/function.cpp b/src/function.cpp
index 2767bbc6a..6bb5a2537 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -148,7 +148,7 @@ function_info_t::function_info_t(function_properties_ref_t props, wcstring desc,
       definition_file(intern(def_file)),
       is_autoload(autoload) {}
 
-void function_add(const function_data_t &data, const parser_t &parser) {
+void function_add(const function_data_t &data, const wchar_t *filename) {
     ASSERT_IS_MAIN_THREAD();
     auto funcset = function_set.acquire();
 
@@ -164,7 +164,6 @@ void function_add(const function_data_t &data, const parser_t &parser) {
     bool is_autoload = funcset->autoloader.autoload_in_progress(data.name);
 
     // Create and store a new function.
-    const wchar_t *filename = parser.libdata().current_filename;
     auto ins = funcset->funcs.emplace(
         data.name, function_info_t(data.props, data.description, filename, is_autoload));
     assert(ins.second && "Function should not already be present in the table");
diff --git a/src/function.h b/src/function.h
index 27170d1e7..c897339aa 100644
--- a/src/function.h
+++ b/src/function.h
@@ -51,7 +51,7 @@ struct function_data_t {
 };
 
 /// Add a function.
-void function_add(const function_data_t &data, const parser_t &parser);
+void function_add(const function_data_t &data, const wchar_t *filename);
 
 /// Remove the function with the specified name.
 void function_remove(const wcstring &name);

From ec08a507693e5833c86349896c37bdc01535dc8c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 12 Nov 2019 11:25:41 -0800
Subject: [PATCH 1223/1732] Eliminate function_data_t

This struct is now mostly useless and can go.
---
 src/builtin_function.cpp | 17 ++++++++---------
 src/fish_tests.cpp       | 10 +++-------
 src/function.cpp         | 16 ++++++----------
 src/function.h           | 17 ++---------------
 4 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index bec57530e..7c4dec37b 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -256,6 +256,8 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     auto props = std::make_shared<function_properties_t>();
     props->shadow_scope = opts.shadow_scope;
     props->named_arguments = std::move(opts.named_arguments);
+    props->parsed_source = source;
+    props->body_node = body;
 
     // Populate inherit_vars.
     for (const wcstring &name : opts.inherit_vars) {
@@ -264,16 +266,13 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
         }
     }
 
-    props->parsed_source = source;
-    props->body_node = body;
+    // Add the function itself.
+    function_add(function_name, opts.description, props, parser.libdata().current_filename);
 
-    function_data_t d;
-    d.name = function_name;
-    d.description = opts.description;
-    d.props = props;
-    d.events = std::move(opts.events);
-
-    function_add(std::move(d), parser.libdata().current_filename);
+    // Add any event handlers.
+    for (const event_description_t &ed : opts.events) {
+        event_add_handler(std::make_shared<event_handler_t>(ed, function_name));
+    }
 
     // Handle wrap targets by creating the appropriate completions.
     for (const wcstring &wt : opts.wrap_targets) complete_add_wrapper(function_name, wt);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3704d4c60..2d34e6eac 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2712,11 +2712,9 @@ static void test_complete() {
     do_test(newcmdline == LR"(touch test/complete_test/gnarlybracket\\\[abc\] )");
 
     // Add a function and test completing it in various ways.
-    // Note we're depending on function_data_t not complaining when given missing parsed_source /
+    // Note we're depending on function_add not complaining when given missing parsed_source /
     // body_node.
-    struct function_data_t func_data = {};
-    func_data.name = L"scuttlebutt";
-    function_add(func_data, nullptr);
+    function_add(L"scuttlebutt", {}, nullptr, {});
 
     // Complete a function name.
     completions.clear();
@@ -2828,9 +2826,7 @@ static void test_complete() {
 
     // Test abbreviations.
     auto &pvars = parser_t::principal_parser().vars();
-    function_data_t fd;
-    fd.name = L"testabbrsonetwothreefour";
-    function_add(fd, nullptr);
+    function_add(L"testabbrsonetwothreefour", {}, nullptr, {});
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
     complete(L"testabbrsonetwothree", &completions, {}, pvars, parser);
     do_test(ret == 0);
diff --git a/src/function.cpp b/src/function.cpp
index 6bb5a2537..62b8d75ec 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -148,31 +148,27 @@ function_info_t::function_info_t(function_properties_ref_t props, wcstring desc,
       definition_file(intern(def_file)),
       is_autoload(autoload) {}
 
-void function_add(const function_data_t &data, const wchar_t *filename) {
+void function_add(wcstring name, wcstring description, function_properties_ref_t props,
+                  const wchar_t *filename) {
     ASSERT_IS_MAIN_THREAD();
     auto funcset = function_set.acquire();
 
     // Historical check. TODO: rationalize this.
-    if (data.name.empty()) {
+    if (name.empty()) {
         return;
     }
 
     // Remove the old function.
-    funcset->remove(data.name);
+    funcset->remove(name);
 
     // Check if this is a function that we are autoloading.
-    bool is_autoload = funcset->autoloader.autoload_in_progress(data.name);
+    bool is_autoload = funcset->autoloader.autoload_in_progress(name);
 
     // Create and store a new function.
     auto ins = funcset->funcs.emplace(
-        data.name, function_info_t(data.props, data.description, filename, is_autoload));
+        std::move(name), function_info_t(props, std::move(description), filename, is_autoload));
     assert(ins.second && "Function should not already be present in the table");
     (void)ins;
-
-    // Add event handlers.
-    for (const event_description_t &ed : data.events) {
-        event_add_handler(std::make_shared<event_handler_t>(ed, data.name));
-    }
 }
 
 std::shared_ptr<const function_properties_t> function_get_properties(const wcstring &name) {
diff --git a/src/function.h b/src/function.h
index c897339aa..a5eaaac2d 100644
--- a/src/function.h
+++ b/src/function.h
@@ -36,22 +36,9 @@ struct function_properties_t {
 
 using function_properties_ref_t = std::shared_ptr<const function_properties_t>;
 
-/// Structure describing a function. This is used by the parser to store data on a function while
-/// parsing it. It is not used internally to store functions, the function_info_t structure
-/// is used for that purpose. Parhaps this should be merged with function_info_t.
-struct function_data_t {
-    /// Name of function.
-    wcstring name;
-    /// Description of function.
-    wcstring description;
-    /// Function's metadata fields
-    function_properties_ref_t props;
-    /// List of all event handlers for this function.
-    std::vector<event_description_t> events;
-};
-
 /// Add a function.
-void function_add(const function_data_t &data, const wchar_t *filename);
+void function_add(wcstring name, wcstring description, function_properties_ref_t props,
+                  const wchar_t *filename);
 
 /// Remove the function with the specified name.
 void function_remove(const wcstring &name);

From e37bb0721dd0596353bfb9f5b09b237902d6f82a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 12 Nov 2019 21:40:13 +0100
Subject: [PATCH 1224/1732] completions/git: fix typo in deleted-staged files

Fixes #6315
---
 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 04463476e..bfd56e6ea 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -125,19 +125,20 @@ function __fish_git_files
 
     # Cache the translated descriptions so we don't have to get it
     # once per file.
+    contains -- all-staged $argv; and set -l all_staged
     contains -- unmerged $argv; and set -l unmerged
     and set -l unmerged_desc (_ "Unmerged File")
-    contains -- added $argv; or contains -- all-staged $argv; and set -l added
+    contains -- added $argv; or set -ql all_staged; and set -l added
     and set -l added_desc (_ "Added file")
     contains -- modified $argv; and set -l modified
     and set -l modified_desc (_ "Modified file")
     contains -- untracked $argv; and set -l untracked
     and set -l untracked_desc (_ "Untracked file")
-    contains -- modified-staged $argv; or contains -- all-staged $argv; and set -l modified_staged
+    contains -- modified-staged $argv; or set -ql all_staged; and set -l modified_staged
     and set -l staged_modified_desc (_ "Staged modified file")
     contains -- deleted $argv; and set -l deleted
     and set -l deleted_desc (_ "Deleted file")
-    contains -- deleted-staged $argv; or contains -- all-staged $argv; and set -l deleted_staged
+    contains -- deleted-staged $argv; or set -ql all_staged; and set -l deleted_staged
     and set -l staged_deleted_desc (_ "Staged deleted file")
     contains -- ignored $argv; and set -l ignored
     and set -l ignored_desc (_ "Ignored file")
@@ -286,7 +287,7 @@ function __fish_git_files
                     # There is both X unmodified and Y either M or D ("not updated")
                     # and Y is D and X is unmodified or [MARC] ("deleted in work tree").
                     # For our purposes, we assume this is a staged deletion.
-                    set -ql deleted-staged; or set -ql all-staged
+                    set -ql deleted_staged
                     and set file "$line[9..-1]"
                     and set desc $staged_deleted_desc
                 case "$q"' *'

From 8aaccf15872c61ccbcf956bca0b711d0bb104620 Mon Sep 17 00:00:00 2001
From: ideal <idealities@gmail.com>
Date: Wed, 6 Nov 2019 21:23:58 +0800
Subject: [PATCH 1225/1732] Reduce times of move and copy operation

---
 src/lru.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lru.h b/src/lru.h
index 68aa591ed..63fc09e52 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -41,7 +41,7 @@ class lru_cache_t {
         // The value from the client
         Contents value;
 
-        explicit lru_node_t(const Contents &v) : value(std::move(v)) {}
+        explicit lru_node_t(Contents &&v) : value(std::move(v)) {}
     };
 
     typedef typename std::unordered_map<wcstring, lru_node_t>::iterator node_iter_t;
@@ -217,7 +217,7 @@ class lru_cache_t {
 
     // Adds a node under the given key without triggering eviction. Returns true if the node was
     // added, false if the node was not because a node with that key is already in the set.
-    bool insert_no_eviction(wcstring key, Contents value) {
+    bool insert_no_eviction(wcstring &&key, Contents &&value) {
         // Try inserting; return false if it was already in the set.
         auto iter_inserted = this->node_map.emplace(std::move(key), lru_node_t(std::move(value)));
         if (!iter_inserted.second) {

From 34e06c44408947e0942098d7c69e58fff1b37c04 Mon Sep 17 00:00:00 2001
From: Robin Linden <dev@robinlinden.eu>
Date: Fri, 8 Nov 2019 00:08:20 +0100
Subject: [PATCH 1226/1732] Remove overrides of default CMake flags

CMake sets these flags to sane defaults depending on which compiler
you're using, so overriding them isn't very nice.

For example:

with g++, I get
-- Debug: -g
-- RelWithDebInfo: -O2 -g -DNDEBUG
-- MinSizeRel: -O2 -g -DNDEBUG
-- Release: -O3 -DNDEBUG

and with MSVC you get something like
-- Debug: /MDd /Zi /Ob0 /Od /RTC1
-- RelWithDebInfo: /MD /Zi /O2 /Ob1 /DNDEBUG
-- MinSizeRel: /MD /Zi /O2 /Ob1 /DNDEBUG
-- Release: /MD /O2 /Ob2 /DNDEBUG
---
 CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c77d77641..417c3dd54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,6 @@ PROJECT(fish)
 
 # We are C++11.
 SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 SET(DEFAULT_BUILD_TYPE "RelWithDebInfo")
 
 IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)

From 2c81229ee61f7aa67a0198e92dfc460957e3ea4e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 13 Nov 2019 13:13:08 -0800
Subject: [PATCH 1227/1732] Remove CMake's NDEBUG definition from release
 builds

---
 CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 417c3dd54..7d9dff233 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,15 @@ PROJECT(fish)
 SET(CMAKE_CXX_STANDARD 11)
 SET(DEFAULT_BUILD_TYPE "RelWithDebInfo")
 
+# Use the default flags (#6296) but remove -DNDEBUG so that asserts remain enabled.
+STRING(REPLACE "-DNDEBUG" ""
+  CMAKE_CXX_FLAGS_RELWITHDEBINFO
+  "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+
+STRING(REPLACE "-DNDEBUG" ""
+  CMAKE_CXX_FLAGS_RELEASE
+  "${CMAKE_CXX_FLAGS_RELEASE}")
+
 IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     MESSAGE(STATUS "Setting build type to default '${DEFAULT_BUILD_TYPE}'")
     SET(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}")

From 4de9a3e102b91fee982bcb1054e36c0cd7625a57 Mon Sep 17 00:00:00 2001
From: Sam Yu <ytz1995@gmail.com>
Date: Mon, 11 Nov 2019 18:14:19 +0800
Subject: [PATCH 1228/1732] Update zypper completion

- fix repo completion
- add completion for locale management
---
 share/completions/zypper.fish | 132 +++++++++++++++++++++-------------
 1 file changed, 84 insertions(+), 48 deletions(-)

diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index ec61f1ea4..bdda36602 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -1,6 +1,6 @@
 # completion for zypper
 
-set -g __fish_zypper_all_commands shell sh repos lr addrepo ar removerepo rr renamerepo nr modifyrepo mr refresh ref clean cc services ls addservice as modifyservice ms removeservice rs refresh-services refs install in remove rm verify ve source-install si install-new-recommends inr update up list-updates lu patch list-patches lp dist-upgrade dup patch-check pchk search se info if patch-info pattern-info product-info patches pch packages pa patterns pt products pd what-provides wp addlock al removelock rl locks ll cleanlocks cl versioncmp vcmp targetos tos licenses source-download
+set -g __fish_zypper_all_commands shell sh repos lr addrepo ar removerepo rr renamerepo nr modifyrepo mr refresh ref clean cc services ls addservice as modifyservice ms removeservice rs refresh-services refs install in remove rm verify ve source-install si install-new-recommends inr update up list-updates lu patch list-patches lp dist-upgrade dup patch-check pchk search se info if patch-info pattern-info product-info patches pch packages pa patterns pt products pd what-provides wp addlock al removelock rl locks ll cleanlocks cl locales lloc addlocale aloc removelocale rloc versioncmp vcmp targetos tos licenses download source-download needs-rebooting ps
 set -g __fish_zypper_pkg_commands install in remove rm info if addlock al removelock rl source-install si update up
 set -g __fish_zypper_repo_commands repos lr removerepo rr renamerepo nr modifyrepo mr refresh ref clean cc packages pa patches pch patterns pt products pd
 set -g __fish_zypper_file_commands install in addrepo ar
@@ -189,8 +189,8 @@ complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir    -r -d 'U
 #  Repository Options
 complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks        -d 'Ignore GPG check failures and continue'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo    -s p -r -d 'Use an additional repository'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -r -d 'Additionally use disabled repositories providing a specific keyword'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo    -s p -rf -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -rf -d 'Additionally use disabled repositories providing a specific keyword'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh           -d 'Do not refresh the repositories'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                -d 'Ignore CD/DVD repositories'
@@ -287,7 +287,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build      -s b
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download   -s d -d 'Force download of raw metadata'
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only       -s B -d "Only build the database, don't download metadata"
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only    -s D -d "Only download raw metadata, don't build the database"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services         -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
@@ -356,7 +356,7 @@ end
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver      -d 'Create solver test case for debugging'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution  -d 'Force the solver to find a solution (even an aggressive one)'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution   -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -f -r -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends        -d 'Install also recommended packages in addition to the required'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends     -d 'Do not install recommended packages, only required'
 
@@ -369,31 +369,31 @@ function __fish_zypper_is_subcommand_in
     __fish_zypper_cmd_in_array install in
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -f -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name          -s n -d 'Select packages by plain name, not by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability    -s C -d 'Select packages by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage         -d 'Allow to replace a newer item with an older one.'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force         -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm    -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run       -s D -d 'Test the installation, do not actually install'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_rm
     __fish_zypper_cmd_in_array remove rm
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name          -s n -d 'Select packages by plain name, not by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability    -s C -d 'Select packages by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm    -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run       -s D -d 'Test the removal, do not actually remove'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps    -s u -d 'Automatically remove unneeded dependencies'
@@ -402,7 +402,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l solver-focus -f -r -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
 
 function __fish_zypper_is_subcommand_ve
     __fish_zypper_cmd_in_array verify ve
@@ -410,9 +410,9 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details            -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run       -s D -d 'Test the repair, do not actually do anything to the system'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm    -s y -d 'Don\'t require user interaction'
 
 function __fish_zypper_is_subcommand_si
@@ -421,8 +421,8 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only   -s d -d 'Install only build dependencies of specified packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps     -s D -d "Don't install build dependencies"
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only     -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_inr
@@ -431,35 +431,35 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
 
 function __fish_zypper_is_subcommand_up
     __fish_zypper_cmd_in_array update up
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details            -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort        -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm    -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive   -d 'Do not skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive   -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run       -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_lu
     __fish_zypper_cmd_in_array list-updates lu
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all    -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
@@ -474,10 +474,10 @@ set -g __fish_zypper_patch_category security recommended optional feature docume
 set -g __fish_zypper_patch_severity critical important moderate low unspecified
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all      -s a -d 'List all patches, not only the needed ones'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -r -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity      -r -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date       -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date       -rf -d 'Select patches issued up to, but not including, the specified date'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'Select applicable patches for the specified CVE issues'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues        -d 'Select issues matching the specified string'
@@ -487,14 +487,14 @@ function __fish_zypper_is_subcommand_dup
     __fish_zypper_cmd_in_array dist-upgrade dup
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details            -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run       -s D -d 'Test the upgrade, do not actually upgrade'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_pchk
@@ -502,7 +502,7 @@ function __fish_zypper_is_subcommand_pchk
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l updatestack-only -d 'Consider only patches which affect the package management itself'
-complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_se
@@ -519,7 +519,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name                -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list           -s f -d 'Search for a match in the file list of packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
@@ -528,7 +528,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details             -s
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose             -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only      -s i -d 'Show only packages that are already installed'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only  -s u -d 'Show only packages that are not currently installed'
 
@@ -537,7 +537,7 @@ function __fish_zypper_is_subcommand_if
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l match-substrings -s s -d 'Print information for packages partially matching name'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides              -d 'Show provides'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires              -d 'Show requires and prerequires'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts             -d 'Show conflicts'
@@ -545,13 +545,13 @@ complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends            -d 'Show recommends'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements           -d 'Show supplements'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests              -d 'Show suggests'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_pch
     __fish_zypper_cmd_in_array patches pch
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pch' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 
 function __fish_zypper_is_subcommand_pa
     __fish_zypper_cmd_in_array packages pa
@@ -563,7 +563,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded                -d 'Show packages which are unneeded'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name       -s N -d 'Sort the list by package name'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo       -s R -d 'Sort the list by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only     -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
 
@@ -571,7 +571,7 @@ function __fish_zypper_is_subcommand_pt
     __fish_zypper_cmd_in_array patterns pt
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only     -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
@@ -580,7 +580,7 @@ function __fish_zypper_is_subcommand_pd
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd               -r -d 'XML output only: Literally forward the XML tags found in a product file'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only     -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
 
@@ -588,15 +588,15 @@ function __fish_zypper_is_subcommand_al
     __fish_zypper_cmd_in_array addlock al
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_al' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_rl
     __fish_zypper_cmd_in_array removelock rl
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
+complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_cl
     __fish_zypper_cmd_in_array cleanlocks cl
@@ -605,6 +605,25 @@ end
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty      -s e -d "Clean only locks which doesn't lock anything"
 
+function __fish_zypper_is_subcommand_lloc
+    __fish_zypper_cmd_in_array locales lloc
+end
+
+complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l packages -s p -d 'Show corresponding packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all      -s a -d 'List all available locales'
+
+function __fish_zypper_is_subcommand_aloc
+    __fish_zypper_cmd_in_array addlocale aloc
+end
+
+complete -c zypper -n '__fish_zypper_is_subcommand_aloc' -l no-packages -s n -d 'Do not install corresponding packages for given locale(s)'
+
+function __fish_zypper_is_subcommand_rloc
+    __fish_zypper_cmd_in_array removelocale rloc
+end
+
+complete -c zypper -n '__fish_zypper_is_subcommand_rloc' -l no-packages -s n -d 'Do not remove corresponding packages for given locale(s)'
+
 function __fish_zypper_is_subcommand_vcmp
     __fish_zypper_cmd_in_array versioncmp vcmp
 end
@@ -621,7 +640,7 @@ function __fish_zypper_is_subcommand_clean
     __fish_zypper_cmd_in_array clean
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -r -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -rf -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata     -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all          -s a -d 'Clean both metadata and package caches'
@@ -634,9 +653,9 @@ complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update        -d 'Additionally try to update all packages not covered by patches'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details            -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo    -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -r -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity      -r -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo    -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date            -r -d 'Select patches issued up to, but not including, the specified date'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla      -s b -d 'Select applicable patches for the specified Bugzilla issues'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                -d 'Select applicable patches for the specified CVE issues'
@@ -646,7 +665,7 @@ complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive   -d 'Skip interactive patches'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run       -s D -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_sourcedownload
@@ -657,3 +676,20 @@ complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete            -d 'Delete extraneous source rpms in the local directory'
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete         -d 'Do not delete extraneous source rpms'
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status            -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+
+function __fish_zypper_is_subcommand_download
+    __fish_zypper_cmd_in_array download
+end
+
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches  -d 'Download all versions matching the commandline arguments'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from      -r -d 'Select packages from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l dry-run -s D -d 'Don\'t change anything, just report what would be done'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l repo -r -s r -d 'Work only with the specified repository'
+
+function __fish_zypper_is_subcommand_ps
+    __fish_zypper_cmd_in_array ps
+end
+
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short        -s s -d 'Create a short table not showing the deleted files'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print        -rf  -d 'For each associated system service print <format> on the standard output, followed by a newline'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l debugFile -r -s d -d 'Write debug output to file'

From 9251601e0b0a2d1ed1ee55ab5d739827c2d57f09 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Wed, 13 Nov 2019 11:44:12 -0800
Subject: [PATCH 1229/1732] Added completion of the argument for the `composer
 show` command

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

diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 437cf9652..b441970eb 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -267,6 +267,7 @@ complete -f -c composer -n '__fish_composer_using_command self-update' -l 'snaps
 complete -f -c composer -n '__fish_composer_using_command self-update' -l 'set-channel-only' -d 'Only store the channel as the default one and then exit'
 
 # show
+complete -f -c composer -n '__fish_composer_using_command show' -a "(__fish_composer_installed_packages)"
 complete -f -c composer -n '__fish_composer_using_command show' -l 'all' -d 'List all packages'
 complete -f -c composer -n '__fish_composer_using_command show' -l 'installed' -d 'List installed packages only (enabled by default, only present for BC).'
 complete -f -c composer -n '__fish_composer_using_command show' -l 'platform' -d 'List platform packages only'

From 91bda38d5732d28d40b0721af315f211bf72bbdb Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Wed, 13 Nov 2019 12:08:03 -0800
Subject: [PATCH 1230/1732] Added the missing argument for -c|--configuration
 option of PHPUnit

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

diff --git a/share/completions/phpunit.fish b/share/completions/phpunit.fish
index 44375ea04..70db34109 100644
--- a/share/completions/phpunit.fish
+++ b/share/completions/phpunit.fish
@@ -95,7 +95,7 @@ complete -f -c phpunit -l do-not-cache-result -d 'Do not write test results to c
 # Configuration Options:
 complete -x -c phpunit -l prepend -d 'A PHP script that is included as early as possible'
 complete -x -c phpunit -l bootstrap -d 'A PHP script that is included before the tests run'
-complete -x -c phpunit -s c -l configuration -d 'Read configuration from XML file'
+complete -x -c phpunit -s c -l configuration -a '(__fish_complete_suffix ".xml{,.dist}")' -d 'Read configuration from XML file'
 complete -f -c phpunit -l no-configuration -d 'Ignore default configuration file (phpunit.xml)'
 complete -f -c phpunit -l no-logging -d 'Ignore logging configuration'
 complete -f -c phpunit -l no-extensions -d 'Do not load PHPUnit extensions'

From ee982c4f6c14fe4456591179652f312961f8b8b1 Mon Sep 17 00:00:00 2001
From: Ankush Patil <aspraz2658@gmail.com>
Date: Sat, 9 Nov 2019 11:24:33 +0530
Subject: [PATCH 1231/1732] Fixes #6280 : Added right associativity to 'pow'
 function

---
 src/tinyexpr.cpp       | 16 ++++++++++++++--
 tests/checks/math.fish |  5 +++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index e16b87b6f..8c22259c7 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -444,11 +444,23 @@ static te_expr *factor(state *s) {
     /* <factor>    =    <power> {"^" <power>} */
     te_expr *ret = power(s);
 
+    te_expr *insertion = 0;
+
     while (s->type == TOK_INFIX && (s->function == (const void *)(te_fun2)pow)) {
         te_fun2 t = (te_fun2)s->function;
         next_token(s);
-        ret = NEW_EXPR(TE_FUNCTION2, ret, power(s));
-        ret->function = (const void *)t;
+
+        if (insertion) {
+            /* Make exponentiation go right-to-left. */
+            te_expr *insert = NEW_EXPR(TE_FUNCTION2, insertion->parameters[1], power(s));
+            insert->function = (const void *)t;
+            insertion->parameters[1] = insert;
+            insertion = insert;
+        } else {
+            ret = NEW_EXPR(TE_FUNCTION2, ret, power(s));
+            ret->function = (const void *)t;
+            insertion = ret;
+        }
     }
 
     return ret;
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index a4fa92f69..321a03a15 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -59,6 +59,11 @@ math '-10^15'
 # CHECK: 100000000000000
 # CHECK: -1000000000000000
 
+math 3^0.5^2
+math -2^2
+# CHECK: 1.316074
+# CHECK: 4
+
 math -s0 '1.0 / 2.0'
 math -s0 '3.0 / 2.0'
 math -s0 '10^15 / 2.0'

From e18fd3cddb57e9421b536405ff6e17abde469d8e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 13 Nov 2019 18:01:47 -0800
Subject: [PATCH 1232/1732] Allow unclosed subshells in interactive mode

If the user has an unclosed subshell in interactive mode, break the
line instead of producing an error.

Fixes #6316
---
 src/fish_tests.cpp |  4 ++++
 src/parse_util.cpp | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 2d34e6eac..f3728e9b0 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -891,6 +891,10 @@ static void test_parser() {
         err(L"unterminated pipe not reported properly");
     }
 
+    if (parse_util_detect_errors(L"echo (\nfoo\n  bar") != PARSER_TEST_INCOMPLETE) {
+        err(L"unterminated multiline subhsell not reported properly");
+    }
+
     if (parse_util_detect_errors(L"begin ; true ; end | ") != PARSER_TEST_INCOMPLETE) {
         err(L"unterminated pipe not reported properly");
     }
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 90846f474..238d38491 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1227,9 +1227,9 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
     // detecting job_continuations that have source for pipes but not the statement.
     bool has_unclosed_pipe = false;
 
-    // Whether there's an unclosed quote, and therefore unfinished. This is only set if
+    // Whether there's an unclosed quote or subshell, and therefore unfinished. This is only set if
     // allow_incomplete is set.
-    bool has_unclosed_quote = false;
+    bool has_unclosed_quote_or_subshell = false;
 
     // Parse the input string into a parse tree. Some errors are detected here.
     bool parsed = parse_tree_from_string(
@@ -1239,9 +1239,10 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
     if (allow_incomplete) {
         size_t idx = parse_errors.size();
         while (idx--) {
-            if (parse_errors.at(idx).code == parse_error_tokenizer_unterminated_quote) {
+            if (parse_errors.at(idx).code == parse_error_tokenizer_unterminated_quote ||
+                parse_errors.at(idx).code == parse_error_tokenizer_unterminated_subshell) {
                 // Remove this error, since we don't consider it a real error.
-                has_unclosed_quote = true;
+                has_unclosed_quote_or_subshell = true;
                 parse_errors.erase(parse_errors.begin() + idx);
             }
         }
@@ -1250,7 +1251,7 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
     // Issue #1238: If the only error was unterminated quote, then consider this to have parsed
     // successfully. A better fix would be to have parse_tree_from_string return this information
     // directly (but it would be a shame to munge up its nice bool return).
-    if (parse_errors.empty() && has_unclosed_quote) {
+    if (parse_errors.empty() && has_unclosed_quote_or_subshell) {
         parsed = true;
     }
 
@@ -1258,8 +1259,8 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
         errored = true;
     }
 
-    // has_unclosed_quote may only be set if allow_incomplete is true.
-    assert(!has_unclosed_quote || allow_incomplete);
+    // has_unclosed_quote_or_subshell may only be set if allow_incomplete is true.
+    assert(!has_unclosed_quote_or_subshell || allow_incomplete);
 
     // Expand all commands.
     // Verify 'or' and 'and' not used inside pipelines.
@@ -1315,7 +1316,7 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
 
     if (errored) res |= PARSER_TEST_ERROR;
 
-    if (has_unclosed_block || has_unclosed_quote || has_unclosed_pipe)
+    if (has_unclosed_block || has_unclosed_quote_or_subshell || has_unclosed_pipe)
         res |= PARSER_TEST_INCOMPLETE;
 
     if (out_errors != NULL) {

From 7527fc265bafb9146c7924d591c43df5fbedd024 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 14 Nov 2019 17:13:39 +0100
Subject: [PATCH 1233/1732] psub: Use explicit `command`

This would have prevented #6323.

While we don't want to pepper `command` everywhere, `psub` is kind of
a core thing, so we should try to proof it against common problems.
---
 share/functions/psub.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/functions/psub.fish b/share/functions/psub.fish
index 8c8a7eac8..c88ad89bb 100644
--- a/share/functions/psub.fish
+++ b/share/functions/psub.fish
@@ -28,18 +28,18 @@ function psub --description "Read from stdin into a file and output the filename
         set dirname (mktemp -d $tmpdir/.psub.XXXXXXXXXX)
         or return
         set filename $dirname/psub.fifo"$_flag_suffix"
-        mkfifo $filename
+        command mkfifo $filename
         # Note that if we were to do the obvious `cat >$filename &`, we would deadlock
         # because $filename may be opened before the fork. Use tee to ensure it is opened
         # after the fork.
-        tee $filename >/dev/null &
+        command tee $filename >/dev/null &
     else if test -z "$_flag_suffix"
         set filename (mktemp $tmpdir/.psub.XXXXXXXXXX)
-        cat >$filename
+        command cat >$filename
     else
         set dirname (mktemp -d $tmpdir/.psub.XXXXXXXXXX)
         set filename "$dirname/psub$_flag_suffix"
-        cat >$filename
+        command cat >$filename
     end
 
     # Write filename to stdout

From 64ce1088fd98ebe1e81bc185d67b39052528b1fa Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 14 Nov 2019 17:58:39 -0800
Subject: [PATCH 1234/1732] Make function_prepare_environment take argv instead
 of the process

This will help concurrent execution.
---
 src/exec.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 9e952c1c2..ae033abba 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -769,13 +769,12 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
     return true;
 }
 
-// Given that we are about to execute a function type proc \p, push a function block and set up the
+// Given that we are about to execute a function, push a function block and set up the
 // variable environment.
-static block_t *function_prepare_environment(parser_t &parser, const process_t *p,
+static block_t *function_prepare_environment(parser_t &parser, wcstring_list_t argv,
                                              const function_properties_t &props) {
     // Extract the function name and remaining arguments.
     wcstring func_name;
-    wcstring_list_t argv = p->get_argv_array().to_list();
     if (!argv.empty()) {
         // Extract and remove the function name from argv.
         func_name = std::move(*argv.begin());
@@ -846,7 +845,8 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
             return false;
         }
 
-        const block_t *fb = function_prepare_environment(parser, p, *props);
+        const block_t *fb =
+            function_prepare_environment(parser, p->get_argv_array().to_list(), *props);
         internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
         function_restore_environment(parser, fb);
     } else {

From c14a7cbc8fc742932bce8c7ca3b54306b4e612df Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 16 Nov 2019 11:21:45 +0100
Subject: [PATCH 1235/1732] seq.fish: Allow "--" separator

This ended up breaking the random test on OpenBSD (apparently the only
place where this is actually used).
---
 share/functions/seq.fish | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/functions/seq.fish b/share/functions/seq.fish
index e574a65c5..49014f59e 100644
--- a/share/functions/seq.fish
+++ b/share/functions/seq.fish
@@ -16,28 +16,28 @@ if not command -sq seq
     end
 
     function __fish_fallback_seq --description "Fallback implementation of the seq command"
-
         set -l from 1
         set -l step 1
         set -l to 1
 
+        # Remove a "--" argument if it happens first.
+        if test "x$argv[1]" = "x--"
+            set -e argv[1]
+        end
+
         switch (count $argv)
             case 1
                 set to $argv[1]
-
             case 2
                 set from $argv[1]
                 set to $argv[2]
-
             case 3
                 set from $argv[1]
                 set step $argv[2]
                 set to $argv[3]
-
             case '*'
                 printf (_ "%s: Expected 1, 2 or 3 arguments, got %d\n") seq (count $argv)
                 return 1
-
         end
 
         for i in $from $step $to

From aae111584ddc1037531a84dbda44750e8bf1e0ff Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 16 Nov 2019 12:11:09 +0100
Subject: [PATCH 1236/1732] Disable localized number test on OpenBSD

This feature simply does not work there.
---
 tests/checks/printf.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/checks/printf.fish b/tests/checks/printf.fish
index 16677f5ce..c2696c7b1 100644
--- a/tests/checks/printf.fish
+++ b/tests/checks/printf.fish
@@ -83,7 +83,8 @@ for locale in {$acceptable_locales}.{UTF-8,UTF8}
     end
 end
 
-if set -q numeric_locale[1]
+# OpenBSD's wcstod does not honor LC_NUMERIC, meaning this feature is broken there.
+if set -q numeric_locale[1]; and test (uname) != "OpenBSD"
     set -x LC_NUMERIC $numeric_locale
     printf '%e\n' "3,45"  # should succeed, output should be 3,450000e+00
     printf '%e\n' "4.56"  # should succeed, output should be 4,560000e+00

From 330f1701d7846e3275c30922c0fc897e249b9630 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 16 Nov 2019 14:57:59 +0100
Subject: [PATCH 1237/1732] Restyle

This mostly fixes some wrong indents or replaces some stray tab indents.

I excluded alignment on purpose, because we have a whole bunch of code
that goes like

```fish
complete -c foo -n 'some-condition'        -l someoption
complete -c foo -n 'some-longer-condition' -l someotheroption
```

and changing it seems like a larger thing and would include more
thrashing.

See #3622.
---
 share/completions/ansible-vault.fish          |   2 +-
 share/completions/code.fish                   |   2 +-
 share/completions/cwebp.fish                  |   2 +-
 share/completions/git.fish                    |   6 +-
 share/completions/iw.fish                     | 156 ++++----
 share/completions/nethack.fish                |  12 +-
 share/completions/rustup.fish                 | 378 +++++++++---------
 share/completions/wc.fish                     |  34 +-
 share/completions/zpaq.fish                   |   2 +-
 .../functions/__fish_complete_gpg_key_id.fish |   2 +-
 share/functions/__fish_man_page.fish          |   4 +-
 share/functions/__fish_print_hostnames.fish   |  28 +-
 share/tools/web_config/webconfig.py           |   9 +-
 13 files changed, 321 insertions(+), 316 deletions(-)

diff --git a/share/completions/ansible-vault.fish b/share/completions/ansible-vault.fish
index 5ef4d428c..6a50495c2 100644
--- a/share/completions/ansible-vault.fish
+++ b/share/completions/ansible-vault.fish
@@ -5,7 +5,7 @@ end
 
 function __fish_ansible_vault_using_command
     set -l cmd (string trim (__fish_ansible_vault_no_subcommand))
-    test -z "$cmd";
+    test -z "$cmd"
     and return 1
     contains -- "$cmd" $argv
 end
diff --git a/share/completions/code.fish b/share/completions/code.fish
index 9a1d2a6a8..c4f44cc5e 100644
--- a/share/completions/code.fish
+++ b/share/completions/code.fish
@@ -1,7 +1,7 @@
 # Visual Studio Code
 
 function __fish_complete_vscode_extensions
-  command --quiet code; and code --list-extensions
+    command --quiet code; and code --list-extensions
 end
 
 complete -c code -s d -l diff -d 'Compare two files with each other'
diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
index 689e4d6b7..a7434af83 100644
--- a/share/completions/cwebp.fish
+++ b/share/completions/cwebp.fish
@@ -51,7 +51,7 @@ set -l sharpness_opts '
 '
 
 function __fish_cwebp_pass_opts
-    seq 0 10 | awk '{printf "%s\t\n", $0}' - 
+    seq 0 10 | awk '{printf "%s\t\n", $0}' -
 end
 
 set -l alpha_method_opts '
diff --git a/share/completions/git.fish b/share/completions/git.fish
index bfd56e6ea..683b781d0 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -22,8 +22,8 @@ end
 # Print an optspec for argparse to handle git's options that are independent of any subcommand.
 function __fish_git_global_optspecs
     string join \n v-version h/help C= c=+ 'e-exec-path=?' H-html-path M-man-path I-info-path p/paginate \
-    P/no-pager o-no-replace-objects b-bare G-git-dir= W-work-tree= N-namespace= S-super-prefix= \
-    l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs
+        P/no-pager o-no-replace-objects b-bare G-git-dir= W-work-tree= N-namespace= S-super-prefix= \
+        l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs
 end
 
 function __fish_git_commits
@@ -1425,7 +1425,7 @@ complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_
 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_branch_for_remote | string replace -r \t".*" "")' -d 'Delete remote branch'
 # then src:dest (where both src and dest are git objects, so we want to complete branches)
 complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "+*:*" -- (commandline -ct)' -a '(commandline -ct | string replace -r ":.*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Force-push local branch to remote branch'
-complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "*:*" -- (commandline -ct)'  -a '(commandline -ct | string replace -r ":.*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Push local branch to remote branch'
+complete -f -c git -n '__fish_git_using_command push; and __fish_git_branch_for_remote; and string match -q "*:*" -- (commandline -ct)' -a '(commandline -ct | string replace -r ":.*" ""):(__fish_git_branch_for_remote | string replace -r \t".*" "")' -d 'Push local branch to remote branch'
 complete -f -c git -n '__fish_git_using_command push' -l all -d 'Push all refs under refs/heads/'
 complete -f -c git -n '__fish_git_using_command push' -l prune -d "Remove remote branches that don't have a local counterpart"
 complete -f -c git -n '__fish_git_using_command push' -l mirror -d 'Push all refs under refs/'
diff --git a/share/completions/iw.fish b/share/completions/iw.fish
index 2b199d2cf..00a7172ed 100644
--- a/share/completions/iw.fish
+++ b/share/completions/iw.fish
@@ -43,7 +43,7 @@ function __fish_complete_iw
                 case ap
                     if not set -q cmd[5]
                         printf '%s\t%s\n' stop "Stop AP functionality" \
-                        start "Start AP functionality"
+                            start "Start AP functionality"
                     end
                 case auth connect
                     if not set -q cmd[5]
@@ -60,12 +60,12 @@ function __fish_complete_iw
                 case ftm
                     if not set -q cmd[5]
                         printf '%s\t%s\n' start_responder "Start an FTM responder" \
-                        get_stats "Get FTM responder statistics"
+                            get_stats "Get FTM responder statistics"
                     end
                 case ibss
                     if not set -q cmd[5]
                         printf '%s\t%s\n' join "Join an IBSS cell or create one" \
-                        leave "Leave the current IBSS cell"
+                            leave "Leave the current IBSS cell"
                     end
                 case 'switch'
                     if not set -q cmd[5]
@@ -88,7 +88,7 @@ function __fish_complete_iw
                 case mesh
                     if not set -q cmd[5]
                         printf '%s\t%s\n' leave "Leave a mesh" \
-                        join "Join a mesh"
+                            join "Join a mesh"
                     end
                 case mgmt
                     if not set -q cmd[5]
@@ -99,21 +99,21 @@ function __fish_complete_iw
                 case mpath
                     if not set -q cmd[5]
                         printf '%s\t%s\n' dump "List known mesh paths" \
-                        set "Set an existing mesh path's next hop" \
-                        new "Create a new mesh math manually" \
-                        del "Remove the mesh path to a node" \
-                        get "Get information on a mesh path to a node" \
-                        probe "Inject ethernet frame to a peer"
+                            set "Set an existing mesh path's next hop" \
+                            new "Create a new mesh math manually" \
+                            del "Remove the mesh path to a node" \
+                            get "Get information on a mesh path to a node" \
+                            probe "Inject ethernet frame to a peer"
                     end
                 case mpp
                     if not set -q cmd[5]
                         printf '%s\t%s\n' dump "List known mesh proxy paths" \
-                        get "Get information on mesh proxy path to a node"
+                            get "Get information on mesh proxy path to a node"
                     end
                 case ocb
                     if not set -q cmd[5]
                         printf '%s\t%s\n' leave "Leave the OCB mode network" \
-                        join "Join the OCB mode network"
+                            join "Join the OCB mode network"
                     end
                 case cac
                     if not set -q cmd[5]
@@ -128,39 +128,39 @@ function __fish_complete_iw
                 case scan
                     if not set -q cmd[5]
                         printf '%s\t%s\n' sched_stop "Stop an ongoing scheduled scan" \
-                        sched_start "Start a scheduled scan" \
-                        abort "Abort ongoing scan" \
-                        trigger "Trigger a scan" \
-                        dump "Dmp the current scan results"
+                            sched_start "Start a scheduled scan" \
+                            abort "Abort ongoing scan" \
+                            trigger "Trigger a scan" \
+                            dump "Dmp the current scan results"
                     end
                     # -u option?
                 case set
                     if not set -q cmd[5]
                         printf '%s\t%s\n' bitrates "Rate masks" \
-                        mcast_rate "Multicast bitrate" \
-                        peer "WDS peer" \
-                        noack_map "Noack map for TIDs" \
-                        4addr "4addr (WDS) mode" \
-                        type "Interface type/mode" \
-                        meshid "" \
-                        monitor "Monitor flags" \
-                        mesh_param "Mesh parameter" \
-                        txpower "Transmit power" \
-                        channel "" \
-                        freq "" \
-                        power_save "Power save state"
+                            mcast_rate "Multicast bitrate" \
+                            peer "WDS peer" \
+                            noack_map "Noack map for TIDs" \
+                            4addr "4addr (WDS) mode" \
+                            type "Interface type/mode" \
+                            meshid "" \
+                            monitor "Monitor flags" \
+                            mesh_param "Mesh parameter" \
+                            txpower "Transmit power" \
+                            channel "" \
+                            freq "" \
+                            power_save "Power save state"
                     end
                 case get
                     if not set -q cmd[5]
                         printf '%s\t%s\n' mesh_param "Mesh parameter" \
-                        power_save "Power save state"
+                            power_save "Power save state"
                     end
                 case station
                     if not set -q cmd[5]
                         printf '%s\t%s\n' dump "List all stations known" \
-                        set "Set station options" \
-                        del "Remove a station entry" \
-                        get "Get information for a station"
+                            set "Set station options" \
+                            del "Remove a station entry" \
+                            get "Get information for a station"
                     end
                 case survey
                     if not set -q cmd[5]
@@ -174,40 +174,40 @@ function __fish_complete_iw
                     end
                 case '*'
                     printf '%s\t%s\n' ap "Start/stop AP functionality" \
-                    auth "Authenticate with a network" \
-                    connect "Join a network" \
-                    disconnect "Disconnect from the current network" \
-                    cqm "Set connection quality monitor RSSI threshold" \
-                    ftm "Control the FTM responder" \
-                    ibss "Join or leave a IBSS cell" \
-                    'switch' "Switch the operating channel by sending a CSA" \
-                    info "Show information for this interface" \
-                    del "Remove this virtual interface" \
-                    interface "Control the interface" \
-                    link "Print information about the current link" \
-                    measurement "Perform measurements" \
-                    mesh "Join or leave a mesh" \
-                    mpp "Get information on mesh proxy paths" \
-                    mgmt "Print mgmt frames" \
-                    mpath "Interact with mesh paths" \
-                    ocb "Join or leave an OCB mode network" \
-                    offchannel "Leave operating channel" \
-                    cac "Start or trigger a channel availability chec" \
-                    roc "" \
-                    scan "Scan and probe for SSIDs" \
-                    set "Set parameters" \
-                    get "Get parameters" \
-                    station "Set station parameters" \
-                    survey "List all gathered channel survey data" \
-                    vendor ""
+                        auth "Authenticate with a network" \
+                        connect "Join a network" \
+                        disconnect "Disconnect from the current network" \
+                        cqm "Set connection quality monitor RSSI threshold" \
+                        ftm "Control the FTM responder" \
+                        ibss "Join or leave a IBSS cell" \
+                        'switch' "Switch the operating channel by sending a CSA" \
+                        info "Show information for this interface" \
+                        del "Remove this virtual interface" \
+                        interface "Control the interface" \
+                        link "Print information about the current link" \
+                        measurement "Perform measurements" \
+                        mesh "Join or leave a mesh" \
+                        mpp "Get information on mesh proxy paths" \
+                        mgmt "Print mgmt frames" \
+                        mpath "Interact with mesh paths" \
+                        ocb "Join or leave an OCB mode network" \
+                        offchannel "Leave operating channel" \
+                        cac "Start or trigger a channel availability chec" \
+                        roc "" \
+                        scan "Scan and probe for SSIDs" \
+                        set "Set parameters" \
+                        get "Get parameters" \
+                        station "Set station parameters" \
+                        survey "List all gathered channel survey data" \
+                        vendor ""
             end
         case phy
             switch "$cmd[4]"
                 case coalesce
                     if not set -q cmd[5]
                         printf '%s\t%s\n' show "Show coalesce status" \
-                        disable "Disable coalesce" \
-                        enable "Enable coalesce"
+                            disable "Disable coalesce" \
+                            enable "Enable coalesce"
                     else if [ "$cmd[5]" = "enable" ] && not set -q cmd[6]
                         __fish_complete_path # Enable takes a config file
                     end
@@ -224,20 +224,20 @@ function __fish_complete_iw
                 case reg
                     if not set -q cmd[5]
                         printf '%s\t%s\n' get "Print the current regulatory domain information" \
-                        set "Notify kernel about current regulatory domain"
+                            set "Notify kernel about current regulatory domain"
                     end
                 case set
                     if not set -q cmd[5]
                         printf '%s\t%s\n' txq "TXQ parameters" \
-                        antenna "Bitmap of allowed antennas" \
-                        txpower "Transmit power" \
-                        distance "Link distance coverage class" \
-                        netns "Network namespace" \
-                        retry "Retry limit" \
-                        rts "Rts threshold" \
-                        frag "Fragmentation threshold" \
-                        channel "" \
-                        name "Wireless device name"
+                            antenna "Bitmap of allowed antennas" \
+                            txpower "Transmit power" \
+                            distance "Link distance coverage class" \
+                            netns "Network namespace" \
+                            retry "Retry limit" \
+                            rts "Rts threshold" \
+                            frag "Fragmentation threshold" \
+                            channel "" \
+                            name "Wireless device name"
                     end
                 case get
                     if not set -q cmd[5]
@@ -246,18 +246,18 @@ function __fish_complete_iw
                 case get
                     if not set -q cmd[5]
                         printf '%s\t%s\n' show "Show WoWLAN status" \
-                        disable "Disable WoWLAN" \
-                        enable "Enable WoWLAN"
+                            disable "Disable WoWLAN" \
+                            enable "Enable WoWLAN"
                     end
                 case '*'
                     printf '%s\t%s\n' coalesce "Interface with coalesce" \
-                    hwsim "" \
-                    info "Show wireless device capabilities" \
-                    interface "Add a new virutal interface" \
-                    channels "Show available channels" \
-                    reg "Manage regulatory domains" \
-                    set "Set parameters" \
-                    get "Get parameters"
+                        hwsim "" \
+                        info "Show wireless device capabilities" \
+                        interface "Add a new virutal interface" \
+                        channels "Show available channels" \
+                        reg "Manage regulatory domains" \
+                        set "Set parameters" \
+                        get "Get parameters"
             end
     end
 end
diff --git a/share/completions/nethack.fish b/share/completions/nethack.fish
index 7d060ebd3..7ed5fa9e7 100644
--- a/share/completions/nethack.fish
+++ b/share/completions/nethack.fish
@@ -1,12 +1,12 @@
 function __fish_complete_nethack
-  set -l roles Archeologist Barbarian Cave{man,woman} Healer Knight Monk \
-               Priest{,ess} Rogue Ranger Samurai Tourist Valkyrie Wizard
+    set -l roles Archeologist Barbarian Cave{man,woman} Healer Knight Monk \
+        Priest{,ess} Rogue Ranger Samurai Tourist Valkyrie Wizard
 
-  set -l races Human Elf Dwarf Gnome Orc
+    set -l races Human Elf Dwarf Gnome Orc
 
-  for r in $$argv[1]
-    printf "%s\t%s\n" (string sub -l 3 $r) $r
-  end
+    for r in $$argv[1]
+        printf "%s\t%s\n" (string sub -l 3 $r) $r
+    end
 end
 
 complete -c nethack -s d -ra "(__fish_complete_directories)" -d 'Specify a playground directory'
diff --git a/share/completions/rustup.fish b/share/completions/rustup.fish
index 6382d61c0..f61bc1293 100644
--- a/share/completions/rustup.fish
+++ b/share/completions/rustup.fish
@@ -1,21 +1,21 @@
 complete -c rustup -e
 
 set -l subcmds \
-	"show" \
-	"update" \
-	"default" \
-	"toolchain" \
-	"target" \
-	"component" \
-	"override" \
-	"run" \
-	"which" \
-	"doc" \
-	"man" \
-	"self" \
-	"set" \
-	# "completions" \
-	"help"
+    "show" \
+    "update" \
+    "default" \
+    "toolchain" \
+    "target" \
+    "component" \
+    "override" \
+    "run" \
+    "which" \
+    "doc" \
+    "man" \
+    "self" \
+    "set" \
+    # "completions" \
+    "help"
 
 set -l rustup_show \
     "active-toolchain" \
@@ -24,8 +24,8 @@ set -l rustup_show \
     "help"
 
 # rustup does not really expose a mechanism of retrieving a list of all valid components without the archs appended
-function  __rustup_components
-	rustup component list | string match -r "^\S+" | string replace -f -- "-x86_64-unknown-linux-gnu" ""
+function __rustup_components
+    rustup component list | string match -r "^\S+" | string replace -f -- "-x86_64-unknown-linux-gnu" ""
 end
 
 # function __rustup_installable_components
@@ -35,186 +35,186 @@ end
 
 # All *valid* target triples, retrieved from source
 function __rustup_triples
-	# The list below must be kept sorted alphabetically
-	printf "%s\n" \
-		"aarch64-apple-ios" \
-		"aarch64-linux-android" \
-		"aarch64-pc-windows-msvc" \
-		"aarch64-unknown-cloudabi" \
-		"aarch64-unknown-fuchsia" \
-		"aarch64-unknown-linux-gnu" \
-		"aarch64-unknown-linux-musl" \
-		"aarch64-unknown-redox" \
-		"armebv7r-none-eabi" \
-		"armebv7r-none-eabihf" \
-		"arm-linux-androideabi" \
-		"arm-unknown-linux-gnueabi" \
-		"arm-unknown-linux-gnueabihf" \
-		"arm-unknown-linux-musleabi" \
-		"arm-unknown-linux-musleabihf" \
-		"armv5te-unknown-linux-gnueabi" \
-		"armv5te-unknown-linux-musleabi" \
-		"armv7-apple-ios" \
-		"armv7-linux-androideabi" \
-		"armv7r-none-eabi" \
-		"armv7r-none-eabihf" \
-		"armv7s-apple-ios" \
-		"armv7-unknown-cloudabi-eabihf" \
-		"armv7-unknown-linux-gnueabi" \
-		"armv7-unknown-linux-gnueabihf" \
-		"armv7-unknown-linux-musleabi" \
-		"armv7-unknown-linux-musleabihf" \
-		"asmjs-unknown-emscripten" \
-		"i386-apple-ios" \
-		"i586-pc-windows-msvc" \
-		"i586-unknown-linux-gnu" \
-		"i586-unknown-linux-musl" \
-		"i686-apple-darwin" \
-		"i686-linux-android" \
-		"i686-pc-windows-gnu" \
-		"i686-pc-windows-msvc" \
-		"i686-unknown-cloudabi" \
-		"i686-unknown-freebsd" \
-		"i686-unknown-haiku" \
-		"i686-unknown-linux-gnu" \
-		"i686-unknown-linux-musl" \
-		"i686-unknown-netbsd" \
-		"le32-unknown-nacl" \
-		"mips64el-unknown-linux-gnuabi64" \
-		"mips64-unknown-linux-gnuabi64" \
-		"mipsel-unknown-linux-gnu" \
-		"mipsel-unknown-linux-musl" \
-		"mipsel-unknown-linux-uclibc" \
-		"mipsisa32r6el-unknown-linux-gnu" \
-		"mipsisa32r6-unknown-linux-gnu" \
-		"mipsisa64r6el-unknown-linux-gnuabi64" \
-		"mipsisa64r6-unknown-linux-gnuabi64" \
-		"mips-unknown-linux-gnu" \
-		"mips-unknown-linux-musl" \
-		"mips-unknown-linux-uclibc" \
-		"msp430-none-elf" \
-		"nvptx64-nvidia-cuda" \
-		"powerpc64le-unknown-linux-gnu" \
-		"powerpc64-unknown-linux-gnu" \
-		"powerpc-unknown-linux-gnu" \
-		"powerpc-unknown-linux-gnuspe" \
-		"riscv32imac-unknown-none-elf" \
-		"riscv32imc-unknown-none-elf" \
-		"riscv32i-unknown-none-elf" \
-		"riscv64gc-unknown-none-elf" \
-		"riscv64imac-unknown-none-elf" \
-		"s390x-unknown-linux-gnu" \
-		"sparc64-unknown-linux-gnu" \
-		"sparc64-unknown-netbsd" \
-		"sparc-unknown-linux-gnu" \
-		"sparcv9-sun-solaris" \
-		"thumbv6m-none-eabi" \
-		"thumbv7em-none-eabi" \
-		"thumbv7em-none-eabihf" \
-		"thumbv7m-none-eabi" \
-		"thumbv7neon-linux-androideabi" \
-		"thumbv7neon-unknown-linux-gnueabihf" \
-		"thumbv8m.base-none-eabi" \
-		"thumbv8m.main-none-eabi" \
-		"thumbv8m.main-none-eabihf" \
-		"wasm32-unknown-emscripten" \
-		"wasm32-unknown-unknown" \
-		"x86_64-apple-darwin" \
-		"x86_64-apple-ios" \
-		"x86_64-fortanix-unknown-sgx" \
-		"x86_64-linux-android" \
-		"x86_64-pc-solaris" \
-		"x86_64-pc-windows-gnu" \
-		"x86_64-pc-windows-msvc" \
-		"x86_64-rumprun-netbsd" \
-		"x86_64-sun-solaris" \
-		"x86_64-unknown-bitrig" \
-		"x86_64-unknown-cloudabi" \
-		"x86_64-unknown-dragonfly" \
-		"x86_64-unknown-freebsd" \
-		"x86_64-unknown-fuchsia" \
-		"x86_64-unknown-haiku" \
-		"x86_64-unknown-linux-gnu" \
-		"x86_64-unknown-linux-gnu" \
-		"x86_64-unknown-linux-gnux32" \
-		"x86_64-unknown-linux-musl" \
-		"x86_64-unknown-netbsd" \
-		"x86_64-unknown-openbsd" \
-		"x86_64-unknown-redox"
+    # The list below must be kept sorted alphabetically
+    printf "%s\n" \
+        "aarch64-apple-ios" \
+        "aarch64-linux-android" \
+        "aarch64-pc-windows-msvc" \
+        "aarch64-unknown-cloudabi" \
+        "aarch64-unknown-fuchsia" \
+        "aarch64-unknown-linux-gnu" \
+        "aarch64-unknown-linux-musl" \
+        "aarch64-unknown-redox" \
+        "armebv7r-none-eabi" \
+        "armebv7r-none-eabihf" \
+        "arm-linux-androideabi" \
+        "arm-unknown-linux-gnueabi" \
+        "arm-unknown-linux-gnueabihf" \
+        "arm-unknown-linux-musleabi" \
+        "arm-unknown-linux-musleabihf" \
+        "armv5te-unknown-linux-gnueabi" \
+        "armv5te-unknown-linux-musleabi" \
+        "armv7-apple-ios" \
+        "armv7-linux-androideabi" \
+        "armv7r-none-eabi" \
+        "armv7r-none-eabihf" \
+        "armv7s-apple-ios" \
+        "armv7-unknown-cloudabi-eabihf" \
+        "armv7-unknown-linux-gnueabi" \
+        "armv7-unknown-linux-gnueabihf" \
+        "armv7-unknown-linux-musleabi" \
+        "armv7-unknown-linux-musleabihf" \
+        "asmjs-unknown-emscripten" \
+        "i386-apple-ios" \
+        "i586-pc-windows-msvc" \
+        "i586-unknown-linux-gnu" \
+        "i586-unknown-linux-musl" \
+        "i686-apple-darwin" \
+        "i686-linux-android" \
+        "i686-pc-windows-gnu" \
+        "i686-pc-windows-msvc" \
+        "i686-unknown-cloudabi" \
+        "i686-unknown-freebsd" \
+        "i686-unknown-haiku" \
+        "i686-unknown-linux-gnu" \
+        "i686-unknown-linux-musl" \
+        "i686-unknown-netbsd" \
+        "le32-unknown-nacl" \
+        "mips64el-unknown-linux-gnuabi64" \
+        "mips64-unknown-linux-gnuabi64" \
+        "mipsel-unknown-linux-gnu" \
+        "mipsel-unknown-linux-musl" \
+        "mipsel-unknown-linux-uclibc" \
+        "mipsisa32r6el-unknown-linux-gnu" \
+        "mipsisa32r6-unknown-linux-gnu" \
+        "mipsisa64r6el-unknown-linux-gnuabi64" \
+        "mipsisa64r6-unknown-linux-gnuabi64" \
+        "mips-unknown-linux-gnu" \
+        "mips-unknown-linux-musl" \
+        "mips-unknown-linux-uclibc" \
+        "msp430-none-elf" \
+        "nvptx64-nvidia-cuda" \
+        "powerpc64le-unknown-linux-gnu" \
+        "powerpc64-unknown-linux-gnu" \
+        "powerpc-unknown-linux-gnu" \
+        "powerpc-unknown-linux-gnuspe" \
+        "riscv32imac-unknown-none-elf" \
+        "riscv32imc-unknown-none-elf" \
+        "riscv32i-unknown-none-elf" \
+        "riscv64gc-unknown-none-elf" \
+        "riscv64imac-unknown-none-elf" \
+        "s390x-unknown-linux-gnu" \
+        "sparc64-unknown-linux-gnu" \
+        "sparc64-unknown-netbsd" \
+        "sparc-unknown-linux-gnu" \
+        "sparcv9-sun-solaris" \
+        "thumbv6m-none-eabi" \
+        "thumbv7em-none-eabi" \
+        "thumbv7em-none-eabihf" \
+        "thumbv7m-none-eabi" \
+        "thumbv7neon-linux-androideabi" \
+        "thumbv7neon-unknown-linux-gnueabihf" \
+        "thumbv8m.base-none-eabi" \
+        "thumbv8m.main-none-eabi" \
+        "thumbv8m.main-none-eabihf" \
+        "wasm32-unknown-emscripten" \
+        "wasm32-unknown-unknown" \
+        "x86_64-apple-darwin" \
+        "x86_64-apple-ios" \
+        "x86_64-fortanix-unknown-sgx" \
+        "x86_64-linux-android" \
+        "x86_64-pc-solaris" \
+        "x86_64-pc-windows-gnu" \
+        "x86_64-pc-windows-msvc" \
+        "x86_64-rumprun-netbsd" \
+        "x86_64-sun-solaris" \
+        "x86_64-unknown-bitrig" \
+        "x86_64-unknown-cloudabi" \
+        "x86_64-unknown-dragonfly" \
+        "x86_64-unknown-freebsd" \
+        "x86_64-unknown-fuchsia" \
+        "x86_64-unknown-haiku" \
+        "x86_64-unknown-linux-gnu" \
+        "x86_64-unknown-linux-gnu" \
+        "x86_64-unknown-linux-gnux32" \
+        "x86_64-unknown-linux-musl" \
+        "x86_64-unknown-netbsd" \
+        "x86_64-unknown-openbsd" \
+        "x86_64-unknown-redox"
 end
 
 # Given n arguments, return the longest suffix common to all
 function __rustup_common_suffix
-	if test (count $argv) -le 1
-		return
-	end
+    if test (count $argv) -le 1
+        return
+    end
 
-	set -l index -1
-	set -l min_length 65335
-	for arg in $argv
-		if test (string length "$arg") -lt $min_length
-			set min_length (string length "$arg")
-		end
-	end
+    set -l index -1
+    set -l min_length 65335
+    for arg in $argv
+        if test (string length "$arg") -lt $min_length
+            set min_length (string length "$arg")
+        end
+    end
 
-	set -l length 1
-	set -l suffix
-	set -l done 0
-	while test $done -eq 0 -a $length -le $min_length
-		set match (string match -r -- ".{$length}\$" "$argv[1]")
-		for arg in $argv[2..-1]
-			set -l value (string match -r -- ".{$length}\$" "$arg")
-			if test "$value" = "$match"
-				continue
-			else if string match -qr -- . "$suffix"
-				set done 1
-				break
-			else
-				# No common suffix
-				return 1
-			end
-		end
-		set suffix "$match"
-		set length (math $length + 1)
-	end
+    set -l length 1
+    set -l suffix
+    set -l done 0
+    while test $done -eq 0 -a $length -le $min_length
+        set match (string match -r -- ".{$length}\$" "$argv[1]")
+        for arg in $argv[2..-1]
+            set -l value (string match -r -- ".{$length}\$" "$arg")
+            if test "$value" = "$match"
+                continue
+            else if string match -qr -- . "$suffix"
+                set done 1
+                break
+            else
+                # No common suffix
+                return 1
+            end
+        end
+        set suffix "$match"
+        set length (math $length + 1)
+    end
 
-	printf "%s\n" "$suffix"
+    printf "%s\n" "$suffix"
 end
 
 # Strip result of __rustup_common_suffix
 function __rustup_strip_common_suffix
-	set -l suffix (__rustup_common_suffix $argv)
-	printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
+    set -l suffix (__rustup_common_suffix $argv)
+    printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
 end
 
 # Strip result of __rustup_common_suffix, but require suffix to begin at a literal -
 function __rustup_strip_common_suffix_strict
-	set -l suffix (__rustup_common_suffix $argv | string match -r -- "-.*")
-	printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
+    set -l suffix (__rustup_common_suffix $argv | string match -r -- "-.*")
+    printf "%s\n" $argv | string replace -r -- (string escape --style=regex -- "$suffix")\$ ""
 end
 
 function __rustup_all_toolchains
-	printf "%s\n" $__rustup_channels
-	printf "%s\n" $__rustup_channels-(__rustup_triples)
+    printf "%s\n" $__rustup_channels
+    printf "%s\n" $__rustup_channels-(__rustup_triples)
 end
 
 # All valid toolchains excluding installed
 function __rustup_installable_toolchains
-	comm -2 -3 (__rustup_all_toolchains | psub -F) (printf "%s\n" $__rustup_toolchains | psub -F) \
-		# Ignore warnings about lists not being in sorted order, as we are aware of their contents
-		2>/dev/null
+    comm -2 -3 (__rustup_all_toolchains | psub -F) (printf "%s\n" $__rustup_toolchains | psub -F) \
+        # Ignore warnings about lists not being in sorted order, as we are aware of their contents
+        2>/dev/null
 end
 
 function __rustup_installed_components
-	# If the user has supplied `--toolchain foo`, use it to filter the list
-	set -l toolchain (commandline -j | string replace -rf ".*\s--toolchain\s+(\S+)\s.*" '$1')
-	set -l toolchain_filter
-	if string match -qr . -- $toolchain
-		set toolchain_filter "--toolchain $toolchain"
-	end
+    # If the user has supplied `--toolchain foo`, use it to filter the list
+    set -l toolchain (commandline -j | string replace -rf ".*\s--toolchain\s+(\S+)\s.*" '$1')
+    set -l toolchain_filter
+    if string match -qr . -- $toolchain
+        set toolchain_filter "--toolchain $toolchain"
+    end
 
-	set -l installed (rustup component list --installed $toolchain_filter)
-	__rustup_strip_common_suffix_strict $installed
+    set -l installed (rustup component list --installed $toolchain_filter)
+    __rustup_strip_common_suffix_strict $installed
 end
 
 # Trim trailing attributes, e.g. "rust-whatever (default)" -> "rust-whatever"
@@ -244,19 +244,19 @@ complete -c rustup -n "__fish_prev_arg_in self" -xa "update remove uninstall upg
 complete -c rustup -n "__fish_prev_arg_in set" -xa "default-host profile help"
 
 complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_arg_in remove uninstall" \
-	-xa "$__rustup_toolchains $__rustup_toolchains_short"
+    -xa "$__rustup_toolchains $__rustup_toolchains_short"
 complete -c rustup -n "__fish_seen_subcommand_from toolchain; and __fish_prev_arg_in add install" \
-	-xa "(__rustup_installable_toolchains)"
+    -xa "(__rustup_installable_toolchains)"
 
 complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in remove uninstall" \
-	-xa "(__rustup_installed_components)"
+    -xa "(__rustup_installed_components)"
 complete -c rustup -n "__fish_seen_subcommand_from component; and __fish_prev_arg_in add install" \
-	-xa "(__rustup_components)"
+    -xa "(__rustup_components)"
 
 complete -c rustup -n "__fish_seen_subcommand_from show;" -xa "$rustup_show"
 
 complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in default-host" \
-	-xa "(__rustup_triples)"
+    -xa "(__rustup_triples)"
 
 complete -c rustup -n "__fish_seen_subcommand_from set; and __fish_prev_arg_in profile" \
     -xa "$rustup_profiles"
@@ -270,29 +270,29 @@ complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_do
 complete -f -c rustup -n '__fish_seen_subcommand_from doc' -a '(__fish_rustup_docs_modules)'
 
 function __fish_rustup_docs_modules
-  set -l doc_path (__rustup_doc_path)
-  command find "$doc_path"/{std,core,alloc} -name index.html \
-  | string replace --regex "$doc_path/(.+)/index\.html" '$1\tModule' \
-  | string replace --all / ::
+    set -l doc_path (__rustup_doc_path)
+    command find "$doc_path"/{std,core,alloc} -name index.html \
+        | string replace --regex "$doc_path/(.+)/index\.html" '$1\tModule' \
+        | string replace --all / ::
 end
 
 function __fish_rustup_docs_keywords
-  set -l doc_path (__rustup_doc_path)
-  string replace --regex "$doc_path/std/keyword\.(.+)\.html" '$1\tKeyword' "$doc_path"/std/keyword.*.html
+    set -l doc_path (__rustup_doc_path)
+    string replace --regex "$doc_path/std/keyword\.(.+)\.html" '$1\tKeyword' "$doc_path"/std/keyword.*.html
 end
 
 function __fish_rustup_docs_primitives
-  set -l doc_path (__rustup_doc_path)
-  string replace --regex "$doc_path/std/primitive\.(.+)\.html" '$1\tPrimitive' "$doc_path"/std/primitive.*.html
+    set -l doc_path (__rustup_doc_path)
+    string replace --regex "$doc_path/std/primitive\.(.+)\.html" '$1\tPrimitive' "$doc_path"/std/primitive.*.html
 end
 
 function __fish_rustup_docs_macros
-  set -l doc_path (__rustup_doc_path)
-  string replace --regex "$doc_path/" '' "$doc_path"/{std,core,alloc}/macro.*.html \
-  | string replace --regex 'macro\.(.+)\.html' '$1\tMacro' \
-  | string replace --all / ::
+    set -l doc_path (__rustup_doc_path)
+    string replace --regex "$doc_path/" '' "$doc_path"/{std,core,alloc}/macro.*.html \
+        | string replace --regex 'macro\.(.+)\.html' '$1\tMacro' \
+        | string replace --all / ::
 end
 
 function __rustup_doc_path
-  rustup doc --path | string replace --regex '/[^/]*$' ''
+    rustup doc --path | string replace --regex '/[^/]*$' ''
 end
diff --git a/share/completions/wc.fish b/share/completions/wc.fish
index efbccb3d6..90cbb75c5 100644
--- a/share/completions/wc.fish
+++ b/share/completions/wc.fish
@@ -1,20 +1,20 @@
 if command -q wc && command wc --version >/dev/null 2>/dev/null
-	complete -c wc -s c -l bytes -d "Print byte count"
-	complete -c wc -s m -l chars -d "Print character count"
-	complete -c wc -s l -l lines -d "Print number of lines"
-	complete -c wc -s L -l max-line-length -d "Print length of longest line"
-	complete -c wc -s w -l words -d "Print number of words"
-	complete -c wc -l help -d "Display help and exit"
-	complete -c wc -l version -d "Display version and exit"
+    complete -c wc -s c -l bytes -d "Print byte count"
+    complete -c wc -s m -l chars -d "Print character count"
+    complete -c wc -s l -l lines -d "Print number of lines"
+    complete -c wc -s L -l max-line-length -d "Print length of longest line"
+    complete -c wc -s w -l words -d "Print number of words"
+    complete -c wc -l help -d "Display help and exit"
+    complete -c wc -l version -d "Display version and exit"
 else
-	complete -c wc -s c -d "Print byte count"
-	complete -c wc -s m -d "Print character count"
-	complete -c wc -s l -d "Print number of lines"
-	complete -c wc -s w -d "Print number of words"
-	switch (uname -s)
-		case FreeBSD NetBSD
-			complete -c wc -s L -d "Print length of longest line"
-		case OpenBSD
-			complete -c wc -s h -d "Use B, KB, MB, GB, TB, PB, EB unit suffixes"
-	end
+    complete -c wc -s c -d "Print byte count"
+    complete -c wc -s m -d "Print character count"
+    complete -c wc -s l -d "Print number of lines"
+    complete -c wc -s w -d "Print number of words"
+    switch (uname -s)
+        case FreeBSD NetBSD
+            complete -c wc -s L -d "Print length of longest line"
+        case OpenBSD
+            complete -c wc -s h -d "Use B, KB, MB, GB, TB, PB, EB unit suffixes"
+    end
 end
diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
index 9334945a3..46bc6c025 100644
--- a/share/completions/zpaq.fish
+++ b/share/completions/zpaq.fish
@@ -17,7 +17,7 @@ complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
 complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive by dates"
 
 #options
-complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories" 
+complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories"
 complete -c zpaq -f -n "$seen $commands" -o f -d "-force"
 complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
 complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
diff --git a/share/functions/__fish_complete_gpg_key_id.fish b/share/functions/__fish_complete_gpg_key_id.fish
index 3fe4fa8f0..da9c042d1 100644
--- a/share/functions/__fish_complete_gpg_key_id.fish
+++ b/share/functions/__fish_complete_gpg_key_id.fish
@@ -9,7 +9,7 @@ function __fish_complete_gpg_key_id -d 'Complete using gpg key ids' -a __fish_co
             case "uid*"
                 echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
                 printf "%s\t%s\n" $keyid $uid
-            # Extract key fingerprints (no subkeys)
+                # Extract key fingerprints (no subkeys)
             case "pub*"
                 echo $garbage | cut -d ":" -f 5 | read keyid
         end
diff --git a/share/functions/__fish_man_page.fish b/share/functions/__fish_man_page.fish
index acb6fda44..38979eeee 100644
--- a/share/functions/__fish_man_page.fish
+++ b/share/functions/__fish_man_page.fish
@@ -9,8 +9,8 @@ function __fish_man_page
     end
 
     #Skip `sudo` and display then manpage of following command
-    while set -q args[2] 
-        and test $args[1] = "sudo" 
+    while set -q args[2]
+        and test $args[1] = "sudo"
         set args $args[2..-1]
     end
 
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 8bf21f8e8..26e3461da 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -14,13 +14,13 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
     # Ignore comments, own IP addresses (127.*, 0.0[.0[.0]], ::1), non-host IPs (fe00::*, ff00::*),
     # and leading/trailing whitespace. Split results on whitespace to handle multiple aliases for
     # one IP.
-        string replace -irf '^\s*?(?!(?:#|0\.|127\.|ff0|fe0|::1))\S+\s*(.*?)\s*$' '$1' |
-        string split ' '
+    string replace -irf '^\s*?(?!(?:#|0\.|127\.|ff0|fe0|::1))\S+\s*(.*?)\s*$' '$1' |
+    string split ' '
 
     # Print nfs servers from /etc/fstab
     if test -r /etc/fstab
         string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab |
-            string replace -r ':.*' ''
+        string replace -r ':.*' ''
     end
 
     # Check hosts known to ssh.
@@ -121,17 +121,17 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
             read -z <$file
         end
     end |
-        # Ignore hosts that are hashed, commented or @-marked and strip the key
-        # Handle multiple comma-separated hostnames sharing a key, too.
-        #
-        # This one regex does everything we need, finding all matches including comma-separated
-        # values, but fish does not let us print only a capturing group without the entire match,
-        # and we can't use `string replace` instead (because CSV then fails).
-        # string match -ar "(?:^|,)(?![@|*!])\[?([^ ,:\]]+)\]?"
-        #
-        # Instead, manually piece together the regular expressions
-        string match -v -r '^\s*[!*|@#]' | string replace -r '^\s*(\S+) .*' '$1' |
-            string split ',' | string replace -r '\[?([^:\]]+).*' '$1'
+    # Ignore hosts that are hashed, commented or @-marked and strip the key
+    # Handle multiple comma-separated hostnames sharing a key, too.
+    #
+    # This one regex does everything we need, finding all matches including comma-separated
+    # values, but fish does not let us print only a capturing group without the entire match,
+    # and we can't use `string replace` instead (because CSV then fails).
+    # string match -ar "(?:^|,)(?![@|*!])\[?([^ ,:\]]+)\]?"
+    #
+    # Instead, manually piece together the regular expressions
+    string match -v -r '^\s*[!*|@#]' | string replace -r '^\s*(\S+) .*' '$1' |
+    string split ',' | string replace -r '\[?([^:\]]+).*' '$1'
 
     return 0
 end
diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 81e1d527f..793f5848b 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -50,9 +50,10 @@ def is_wsl():
                 return True
     return False
 
+
 def is_termux():
     """ Return whether we are running under the Termux application for Android"""
-    return 'com.termux' in os.environ['PATH'] and find_executable('termux-open-url')
+    return "com.termux" in os.environ["PATH"] and find_executable("termux-open-url")
 
 
 # Disable CLI web browsers
@@ -1195,7 +1196,11 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_save_abbreviation(self, abbreviation):
         out, err = run_fish_cmd(
             # Remove one layer of single-quotes because escape_fish_cmd adds them back.
-            "abbr --add %s %s" % (escape_fish_cmd(abbreviation["word"].strip("'")), escape_fish_cmd(abbreviation["phrase"].strip("'")))
+            "abbr --add %s %s"
+            % (
+                escape_fish_cmd(abbreviation["word"].strip("'")),
+                escape_fish_cmd(abbreviation["phrase"].strip("'")),
+            )
         )
         if err:
             return err

From cb72a33e0cf00fde31009ba78b68578afac91844 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Sat, 16 Nov 2019 14:50:54 +0800
Subject: [PATCH 1238/1732] Fix some issues in __fish_complete_subcommand.fish

Fix 'string length: Unknown option': add `--` before $subcommand

Fix count $subcommand always = 1 with `sudo` and `doas`:
give argv as array to __fish_complete_subcommand

[ci skip]
---
 share/completions/doas.fish                     | 4 ++--
 share/completions/sudo.fish                     | 4 ++--
 share/functions/__fish_clang_complete.fish      | 2 +-
 share/functions/__fish_complete_subcommand.fish | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/share/completions/doas.fish b/share/completions/doas.fish
index e90cf7730..10527c0fe 100644
--- a/share/completions/doas.fish
+++ b/share/completions/doas.fish
@@ -14,7 +14,7 @@ function __fish_doas_print_remaining_args
     # we want.
     if test -n "$argv"
         and not string match -qr '^-' $argv[1]
-        echo $argv
+        string join0 -- $argv
         return 0
     else
         return 1
@@ -22,7 +22,7 @@ function __fish_doas_print_remaining_args
 end
 
 function __fish_complete_doas_subcommand
-    set -l args (__fish_doas_print_remaining_args)
+    set -l args (__fish_doas_print_remaining_args | string split0)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
     __fish_complete_subcommand --commandline $args
 end
diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index 24abb0cce..7889ebf49 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -20,7 +20,7 @@ function __fish_sudo_print_remaining_args
     # we want.
     if test -n "$argv"
         and not string match -qr '^-' $argv[1]
-        echo $argv
+        string join0 -- $argv
         return 0
     else
         return 1
@@ -32,7 +32,7 @@ function __fish_sudo_no_subcommand
 end
 
 function __fish_complete_sudo_subcommand
-    set -l args (__fish_sudo_print_remaining_args)
+    set -l args (__fish_sudo_print_remaining_args | string split0)
     set -lx -a PATH /usr/local/sbin /sbin /usr/sbin
     __fish_complete_subcommand --commandline $args
 end
diff --git a/share/functions/__fish_clang_complete.fish b/share/functions/__fish_clang_complete.fish
index de1bdb677..b2b68b9c0 100644
--- a/share/functions/__fish_clang_complete.fish
+++ b/share/functions/__fish_clang_complete.fish
@@ -9,7 +9,7 @@ function __fish_clang_complete
     # Don't hard-code the name of the clang binary
     set -l clang (commandline -o)[1]
     # first get the completions from clang, with the prefix separated from the value by a comma
-    $clang --autocomplete=(commandline -ct | string replace -- "$prefix" "$prefix,") 2>/dev/null |
+    $clang --autocomplete=(commandline -ct | string unescape | string replace -- "$prefix" "$prefix,") 2>/dev/null |
     # and put it in a format that fish understands
     string replace -r -- '^([^ ]+)\s*(.*)' "$prefix\$1\t\$2"
 end
diff --git a/share/functions/__fish_complete_subcommand.fish b/share/functions/__fish_complete_subcommand.fish
index d67c009a5..bd7cc5009 100644
--- a/share/functions/__fish_complete_subcommand.fish
+++ b/share/functions/__fish_complete_subcommand.fish
@@ -24,7 +24,7 @@ function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowin
     end
     set -l options_with_param $argv
 
-    if not string length -q $subcommand
+    if not string length -q -- $subcommand
         set cmd (commandline -cop) (commandline -ct)
         while set -q cmd[1]
             set -l token $cmd[1]
@@ -55,4 +55,3 @@ function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowin
     end
 
 end
-

From 98a98b14249f3f4a94a3b0e32c6c11c564915609 Mon Sep 17 00:00:00 2001
From: Ray Hogenson <rhogenson@posteo.net>
Date: Fri, 15 Nov 2019 18:34:27 -0800
Subject: [PATCH 1239/1732] Change vi selection mode to be inclusive

The current cursor position should be included in the selection to be
consistent with the behavior of vi.

Fixes #5770
---
 src/reader.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 1d535278a..79e5346fe 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -594,10 +594,10 @@ void reader_data_t::update_buff_pos(editable_line_t *el, size_t buff_pos) {
     if (el == &command_line && sel_active) {
         if (sel_begin_pos <= buff_pos) {
             sel_start_pos = sel_begin_pos;
-            sel_stop_pos = buff_pos;
+            sel_stop_pos = buff_pos + 1;
         } else {
             sel_start_pos = buff_pos;
-            sel_stop_pos = sel_begin_pos;
+            sel_stop_pos = sel_begin_pos + 1;
         }
     }
 }
@@ -3095,11 +3095,12 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::begin_selection:
         case rl::end_selection: {
             sel_start_pos = command_line.position;
-            sel_stop_pos = command_line.position;
             if (c == rl::begin_selection) {
+                sel_stop_pos = command_line.position + 1;
                 sel_active = true;
                 sel_begin_pos = command_line.position;
             } else {
+                sel_stop_pos = command_line.position;
                 sel_active = false;
             }
 

From 03a289c9ef096c26711296f9745d266d3536f932 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 11:53:49 -0800
Subject: [PATCH 1240/1732] Add an aliases benchmark

---
 benchmarks/benchmarks/aliases.fish | 1102 ++++++++++++++++++++++++++++
 src/fish.cpp                       |    1 +
 2 files changed, 1103 insertions(+)
 create mode 100644 benchmarks/benchmarks/aliases.fish

diff --git a/benchmarks/benchmarks/aliases.fish b/benchmarks/benchmarks/aliases.fish
new file mode 100644
index 000000000..0eb865842
--- /dev/null
+++ b/benchmarks/benchmarks/aliases.fish
@@ -0,0 +1,1102 @@
+function alias --description 'Creates a function wrapping a command'
+    set -l options 'h/help' 's/save'
+    argparse -n alias --max-args=2 $options -- $argv
+    or return
+
+    if set -q _flag_help
+        __fish_print_help alias
+        return 0
+    end
+
+    set -l name
+    set -l body
+    set -l prefix
+    set -l first_word
+    set -l wrapped_cmd
+
+    if not set -q argv[1]
+        # Print the known aliases.
+        for func in (functions -n)
+            set -l output (functions $func | string match -r -- "^function .* --description 'alias (.*)'")
+            if set -q output[2]
+                set output (string replace -r -- '^'$func'[= ]' '' $output[2])
+                echo alias $func (string escape -- $output[1])
+            end
+        end
+        return 0
+    else if not set -q argv[2]
+        # Alias definition of the form "name=value".
+        set -l tmp (string split -m 1 "=" -- $argv) ""
+        set name $tmp[1]
+        set body $tmp[2]
+    else
+        # Alias definition of the form "name value".
+        set name $argv[1]
+        set body $argv[2]
+    end
+
+    # sanity check
+    if test -z "$name"
+        printf ( _ "%s: Name cannot be empty\n") alias
+        return 1
+    else if test -z "$body"
+        printf ( _ "%s: Body cannot be empty\n") alias
+        return 1
+    end
+
+    # Extract the first command from the body. This is supposed to replace all non-escaped (i.e.
+    # preceded by an odd number of `\`) spaces with a newline so it splits on them. See issue #2220
+    # for why the following borderline incomprehensible code exists.
+    set -l tmp (string replace -ra -- "([^\\\ ])((\\\\\\\)*) " '$1\n' $body)
+    set first_word (string trim -- $tmp[1])
+    # If the user does something like `alias x 'foo; bar'` we need to strip the semicolon.
+    set base_command (string trim -c ';' -- $first_word)
+    if set -q tmp[2]
+        set body $tmp[2..-1]
+    else
+        set body
+    end
+
+    # Prevent the alias from immediately running into an infinite recursion if
+    # $body starts with the same command as $name.
+    if test $base_command = $name
+        if contains $name (builtin --names)
+            set prefix builtin
+        else
+            set prefix command
+        end
+    end
+    set -l cmd_string (string escape -- "alias $argv")
+    set wrapped_cmd (string join ' ' -- $first_word $body | string escape)
+    echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end" | source
+    if set -q _flag_save
+        funcsave $name
+    end
+    #echo "function $name --wraps $wrapped_cmd --description $cmd_string; $prefix $first_word $body \$argv; end"
+end
+
+alias alias0='something --arg0'
+alias alias1='something --arg1'
+alias alias2='something --arg2'
+alias alias3='something --arg3'
+alias alias4='something --arg4'
+alias alias5='something --arg5'
+alias alias6='something --arg6'
+alias alias7='something --arg7'
+alias alias8='something --arg8'
+alias alias9='something --arg9'
+alias alias10='something --arg10'
+alias alias11='something --arg11'
+alias alias12='something --arg12'
+alias alias13='something --arg13'
+alias alias14='something --arg14'
+alias alias15='something --arg15'
+alias alias16='something --arg16'
+alias alias17='something --arg17'
+alias alias18='something --arg18'
+alias alias19='something --arg19'
+alias alias20='something --arg20'
+alias alias21='something --arg21'
+alias alias22='something --arg22'
+alias alias23='something --arg23'
+alias alias24='something --arg24'
+alias alias25='something --arg25'
+alias alias26='something --arg26'
+alias alias27='something --arg27'
+alias alias28='something --arg28'
+alias alias29='something --arg29'
+alias alias30='something --arg30'
+alias alias31='something --arg31'
+alias alias32='something --arg32'
+alias alias33='something --arg33'
+alias alias34='something --arg34'
+alias alias35='something --arg35'
+alias alias36='something --arg36'
+alias alias37='something --arg37'
+alias alias38='something --arg38'
+alias alias39='something --arg39'
+alias alias40='something --arg40'
+alias alias41='something --arg41'
+alias alias42='something --arg42'
+alias alias43='something --arg43'
+alias alias44='something --arg44'
+alias alias45='something --arg45'
+alias alias46='something --arg46'
+alias alias47='something --arg47'
+alias alias48='something --arg48'
+alias alias49='something --arg49'
+alias alias50='something --arg50'
+alias alias51='something --arg51'
+alias alias52='something --arg52'
+alias alias53='something --arg53'
+alias alias54='something --arg54'
+alias alias55='something --arg55'
+alias alias56='something --arg56'
+alias alias57='something --arg57'
+alias alias58='something --arg58'
+alias alias59='something --arg59'
+alias alias60='something --arg60'
+alias alias61='something --arg61'
+alias alias62='something --arg62'
+alias alias63='something --arg63'
+alias alias64='something --arg64'
+alias alias65='something --arg65'
+alias alias66='something --arg66'
+alias alias67='something --arg67'
+alias alias68='something --arg68'
+alias alias69='something --arg69'
+alias alias70='something --arg70'
+alias alias71='something --arg71'
+alias alias72='something --arg72'
+alias alias73='something --arg73'
+alias alias74='something --arg74'
+alias alias75='something --arg75'
+alias alias76='something --arg76'
+alias alias77='something --arg77'
+alias alias78='something --arg78'
+alias alias79='something --arg79'
+alias alias80='something --arg80'
+alias alias81='something --arg81'
+alias alias82='something --arg82'
+alias alias83='something --arg83'
+alias alias84='something --arg84'
+alias alias85='something --arg85'
+alias alias86='something --arg86'
+alias alias87='something --arg87'
+alias alias88='something --arg88'
+alias alias89='something --arg89'
+alias alias90='something --arg90'
+alias alias91='something --arg91'
+alias alias92='something --arg92'
+alias alias93='something --arg93'
+alias alias94='something --arg94'
+alias alias95='something --arg95'
+alias alias96='something --arg96'
+alias alias97='something --arg97'
+alias alias98='something --arg98'
+alias alias99='something --arg99'
+alias alias100='something --arg100'
+alias alias101='something --arg101'
+alias alias102='something --arg102'
+alias alias103='something --arg103'
+alias alias104='something --arg104'
+alias alias105='something --arg105'
+alias alias106='something --arg106'
+alias alias107='something --arg107'
+alias alias108='something --arg108'
+alias alias109='something --arg109'
+alias alias110='something --arg110'
+alias alias111='something --arg111'
+alias alias112='something --arg112'
+alias alias113='something --arg113'
+alias alias114='something --arg114'
+alias alias115='something --arg115'
+alias alias116='something --arg116'
+alias alias117='something --arg117'
+alias alias118='something --arg118'
+alias alias119='something --arg119'
+alias alias120='something --arg120'
+alias alias121='something --arg121'
+alias alias122='something --arg122'
+alias alias123='something --arg123'
+alias alias124='something --arg124'
+alias alias125='something --arg125'
+alias alias126='something --arg126'
+alias alias127='something --arg127'
+alias alias128='something --arg128'
+alias alias129='something --arg129'
+alias alias130='something --arg130'
+alias alias131='something --arg131'
+alias alias132='something --arg132'
+alias alias133='something --arg133'
+alias alias134='something --arg134'
+alias alias135='something --arg135'
+alias alias136='something --arg136'
+alias alias137='something --arg137'
+alias alias138='something --arg138'
+alias alias139='something --arg139'
+alias alias140='something --arg140'
+alias alias141='something --arg141'
+alias alias142='something --arg142'
+alias alias143='something --arg143'
+alias alias144='something --arg144'
+alias alias145='something --arg145'
+alias alias146='something --arg146'
+alias alias147='something --arg147'
+alias alias148='something --arg148'
+alias alias149='something --arg149'
+alias alias150='something --arg150'
+alias alias151='something --arg151'
+alias alias152='something --arg152'
+alias alias153='something --arg153'
+alias alias154='something --arg154'
+alias alias155='something --arg155'
+alias alias156='something --arg156'
+alias alias157='something --arg157'
+alias alias158='something --arg158'
+alias alias159='something --arg159'
+alias alias160='something --arg160'
+alias alias161='something --arg161'
+alias alias162='something --arg162'
+alias alias163='something --arg163'
+alias alias164='something --arg164'
+alias alias165='something --arg165'
+alias alias166='something --arg166'
+alias alias167='something --arg167'
+alias alias168='something --arg168'
+alias alias169='something --arg169'
+alias alias170='something --arg170'
+alias alias171='something --arg171'
+alias alias172='something --arg172'
+alias alias173='something --arg173'
+alias alias174='something --arg174'
+alias alias175='something --arg175'
+alias alias176='something --arg176'
+alias alias177='something --arg177'
+alias alias178='something --arg178'
+alias alias179='something --arg179'
+alias alias180='something --arg180'
+alias alias181='something --arg181'
+alias alias182='something --arg182'
+alias alias183='something --arg183'
+alias alias184='something --arg184'
+alias alias185='something --arg185'
+alias alias186='something --arg186'
+alias alias187='something --arg187'
+alias alias188='something --arg188'
+alias alias189='something --arg189'
+alias alias190='something --arg190'
+alias alias191='something --arg191'
+alias alias192='something --arg192'
+alias alias193='something --arg193'
+alias alias194='something --arg194'
+alias alias195='something --arg195'
+alias alias196='something --arg196'
+alias alias197='something --arg197'
+alias alias198='something --arg198'
+alias alias199='something --arg199'
+alias alias200='something --arg200'
+alias alias201='something --arg201'
+alias alias202='something --arg202'
+alias alias203='something --arg203'
+alias alias204='something --arg204'
+alias alias205='something --arg205'
+alias alias206='something --arg206'
+alias alias207='something --arg207'
+alias alias208='something --arg208'
+alias alias209='something --arg209'
+alias alias210='something --arg210'
+alias alias211='something --arg211'
+alias alias212='something --arg212'
+alias alias213='something --arg213'
+alias alias214='something --arg214'
+alias alias215='something --arg215'
+alias alias216='something --arg216'
+alias alias217='something --arg217'
+alias alias218='something --arg218'
+alias alias219='something --arg219'
+alias alias220='something --arg220'
+alias alias221='something --arg221'
+alias alias222='something --arg222'
+alias alias223='something --arg223'
+alias alias224='something --arg224'
+alias alias225='something --arg225'
+alias alias226='something --arg226'
+alias alias227='something --arg227'
+alias alias228='something --arg228'
+alias alias229='something --arg229'
+alias alias230='something --arg230'
+alias alias231='something --arg231'
+alias alias232='something --arg232'
+alias alias233='something --arg233'
+alias alias234='something --arg234'
+alias alias235='something --arg235'
+alias alias236='something --arg236'
+alias alias237='something --arg237'
+alias alias238='something --arg238'
+alias alias239='something --arg239'
+alias alias240='something --arg240'
+alias alias241='something --arg241'
+alias alias242='something --arg242'
+alias alias243='something --arg243'
+alias alias244='something --arg244'
+alias alias245='something --arg245'
+alias alias246='something --arg246'
+alias alias247='something --arg247'
+alias alias248='something --arg248'
+alias alias249='something --arg249'
+alias alias250='something --arg250'
+alias alias251='something --arg251'
+alias alias252='something --arg252'
+alias alias253='something --arg253'
+alias alias254='something --arg254'
+alias alias255='something --arg255'
+alias alias256='something --arg256'
+alias alias257='something --arg257'
+alias alias258='something --arg258'
+alias alias259='something --arg259'
+alias alias260='something --arg260'
+alias alias261='something --arg261'
+alias alias262='something --arg262'
+alias alias263='something --arg263'
+alias alias264='something --arg264'
+alias alias265='something --arg265'
+alias alias266='something --arg266'
+alias alias267='something --arg267'
+alias alias268='something --arg268'
+alias alias269='something --arg269'
+alias alias270='something --arg270'
+alias alias271='something --arg271'
+alias alias272='something --arg272'
+alias alias273='something --arg273'
+alias alias274='something --arg274'
+alias alias275='something --arg275'
+alias alias276='something --arg276'
+alias alias277='something --arg277'
+alias alias278='something --arg278'
+alias alias279='something --arg279'
+alias alias280='something --arg280'
+alias alias281='something --arg281'
+alias alias282='something --arg282'
+alias alias283='something --arg283'
+alias alias284='something --arg284'
+alias alias285='something --arg285'
+alias alias286='something --arg286'
+alias alias287='something --arg287'
+alias alias288='something --arg288'
+alias alias289='something --arg289'
+alias alias290='something --arg290'
+alias alias291='something --arg291'
+alias alias292='something --arg292'
+alias alias293='something --arg293'
+alias alias294='something --arg294'
+alias alias295='something --arg295'
+alias alias296='something --arg296'
+alias alias297='something --arg297'
+alias alias298='something --arg298'
+alias alias299='something --arg299'
+alias alias300='something --arg300'
+alias alias301='something --arg301'
+alias alias302='something --arg302'
+alias alias303='something --arg303'
+alias alias304='something --arg304'
+alias alias305='something --arg305'
+alias alias306='something --arg306'
+alias alias307='something --arg307'
+alias alias308='something --arg308'
+alias alias309='something --arg309'
+alias alias310='something --arg310'
+alias alias311='something --arg311'
+alias alias312='something --arg312'
+alias alias313='something --arg313'
+alias alias314='something --arg314'
+alias alias315='something --arg315'
+alias alias316='something --arg316'
+alias alias317='something --arg317'
+alias alias318='something --arg318'
+alias alias319='something --arg319'
+alias alias320='something --arg320'
+alias alias321='something --arg321'
+alias alias322='something --arg322'
+alias alias323='something --arg323'
+alias alias324='something --arg324'
+alias alias325='something --arg325'
+alias alias326='something --arg326'
+alias alias327='something --arg327'
+alias alias328='something --arg328'
+alias alias329='something --arg329'
+alias alias330='something --arg330'
+alias alias331='something --arg331'
+alias alias332='something --arg332'
+alias alias333='something --arg333'
+alias alias334='something --arg334'
+alias alias335='something --arg335'
+alias alias336='something --arg336'
+alias alias337='something --arg337'
+alias alias338='something --arg338'
+alias alias339='something --arg339'
+alias alias340='something --arg340'
+alias alias341='something --arg341'
+alias alias342='something --arg342'
+alias alias343='something --arg343'
+alias alias344='something --arg344'
+alias alias345='something --arg345'
+alias alias346='something --arg346'
+alias alias347='something --arg347'
+alias alias348='something --arg348'
+alias alias349='something --arg349'
+alias alias350='something --arg350'
+alias alias351='something --arg351'
+alias alias352='something --arg352'
+alias alias353='something --arg353'
+alias alias354='something --arg354'
+alias alias355='something --arg355'
+alias alias356='something --arg356'
+alias alias357='something --arg357'
+alias alias358='something --arg358'
+alias alias359='something --arg359'
+alias alias360='something --arg360'
+alias alias361='something --arg361'
+alias alias362='something --arg362'
+alias alias363='something --arg363'
+alias alias364='something --arg364'
+alias alias365='something --arg365'
+alias alias366='something --arg366'
+alias alias367='something --arg367'
+alias alias368='something --arg368'
+alias alias369='something --arg369'
+alias alias370='something --arg370'
+alias alias371='something --arg371'
+alias alias372='something --arg372'
+alias alias373='something --arg373'
+alias alias374='something --arg374'
+alias alias375='something --arg375'
+alias alias376='something --arg376'
+alias alias377='something --arg377'
+alias alias378='something --arg378'
+alias alias379='something --arg379'
+alias alias380='something --arg380'
+alias alias381='something --arg381'
+alias alias382='something --arg382'
+alias alias383='something --arg383'
+alias alias384='something --arg384'
+alias alias385='something --arg385'
+alias alias386='something --arg386'
+alias alias387='something --arg387'
+alias alias388='something --arg388'
+alias alias389='something --arg389'
+alias alias390='something --arg390'
+alias alias391='something --arg391'
+alias alias392='something --arg392'
+alias alias393='something --arg393'
+alias alias394='something --arg394'
+alias alias395='something --arg395'
+alias alias396='something --arg396'
+alias alias397='something --arg397'
+alias alias398='something --arg398'
+alias alias399='something --arg399'
+alias alias400='something --arg400'
+alias alias401='something --arg401'
+alias alias402='something --arg402'
+alias alias403='something --arg403'
+alias alias404='something --arg404'
+alias alias405='something --arg405'
+alias alias406='something --arg406'
+alias alias407='something --arg407'
+alias alias408='something --arg408'
+alias alias409='something --arg409'
+alias alias410='something --arg410'
+alias alias411='something --arg411'
+alias alias412='something --arg412'
+alias alias413='something --arg413'
+alias alias414='something --arg414'
+alias alias415='something --arg415'
+alias alias416='something --arg416'
+alias alias417='something --arg417'
+alias alias418='something --arg418'
+alias alias419='something --arg419'
+alias alias420='something --arg420'
+alias alias421='something --arg421'
+alias alias422='something --arg422'
+alias alias423='something --arg423'
+alias alias424='something --arg424'
+alias alias425='something --arg425'
+alias alias426='something --arg426'
+alias alias427='something --arg427'
+alias alias428='something --arg428'
+alias alias429='something --arg429'
+alias alias430='something --arg430'
+alias alias431='something --arg431'
+alias alias432='something --arg432'
+alias alias433='something --arg433'
+alias alias434='something --arg434'
+alias alias435='something --arg435'
+alias alias436='something --arg436'
+alias alias437='something --arg437'
+alias alias438='something --arg438'
+alias alias439='something --arg439'
+alias alias440='something --arg440'
+alias alias441='something --arg441'
+alias alias442='something --arg442'
+alias alias443='something --arg443'
+alias alias444='something --arg444'
+alias alias445='something --arg445'
+alias alias446='something --arg446'
+alias alias447='something --arg447'
+alias alias448='something --arg448'
+alias alias449='something --arg449'
+alias alias450='something --arg450'
+alias alias451='something --arg451'
+alias alias452='something --arg452'
+alias alias453='something --arg453'
+alias alias454='something --arg454'
+alias alias455='something --arg455'
+alias alias456='something --arg456'
+alias alias457='something --arg457'
+alias alias458='something --arg458'
+alias alias459='something --arg459'
+alias alias460='something --arg460'
+alias alias461='something --arg461'
+alias alias462='something --arg462'
+alias alias463='something --arg463'
+alias alias464='something --arg464'
+alias alias465='something --arg465'
+alias alias466='something --arg466'
+alias alias467='something --arg467'
+alias alias468='something --arg468'
+alias alias469='something --arg469'
+alias alias470='something --arg470'
+alias alias471='something --arg471'
+alias alias472='something --arg472'
+alias alias473='something --arg473'
+alias alias474='something --arg474'
+alias alias475='something --arg475'
+alias alias476='something --arg476'
+alias alias477='something --arg477'
+alias alias478='something --arg478'
+alias alias479='something --arg479'
+alias alias480='something --arg480'
+alias alias481='something --arg481'
+alias alias482='something --arg482'
+alias alias483='something --arg483'
+alias alias484='something --arg484'
+alias alias485='something --arg485'
+alias alias486='something --arg486'
+alias alias487='something --arg487'
+alias alias488='something --arg488'
+alias alias489='something --arg489'
+alias alias490='something --arg490'
+alias alias491='something --arg491'
+alias alias492='something --arg492'
+alias alias493='something --arg493'
+alias alias494='something --arg494'
+alias alias495='something --arg495'
+alias alias496='something --arg496'
+alias alias497='something --arg497'
+alias alias498='something --arg498'
+alias alias499='something --arg499'
+alias alias500='something --arg500'
+alias alias501='something --arg501'
+alias alias502='something --arg502'
+alias alias503='something --arg503'
+alias alias504='something --arg504'
+alias alias505='something --arg505'
+alias alias506='something --arg506'
+alias alias507='something --arg507'
+alias alias508='something --arg508'
+alias alias509='something --arg509'
+alias alias510='something --arg510'
+alias alias511='something --arg511'
+alias alias512='something --arg512'
+alias alias513='something --arg513'
+alias alias514='something --arg514'
+alias alias515='something --arg515'
+alias alias516='something --arg516'
+alias alias517='something --arg517'
+alias alias518='something --arg518'
+alias alias519='something --arg519'
+alias alias520='something --arg520'
+alias alias521='something --arg521'
+alias alias522='something --arg522'
+alias alias523='something --arg523'
+alias alias524='something --arg524'
+alias alias525='something --arg525'
+alias alias526='something --arg526'
+alias alias527='something --arg527'
+alias alias528='something --arg528'
+alias alias529='something --arg529'
+alias alias530='something --arg530'
+alias alias531='something --arg531'
+alias alias532='something --arg532'
+alias alias533='something --arg533'
+alias alias534='something --arg534'
+alias alias535='something --arg535'
+alias alias536='something --arg536'
+alias alias537='something --arg537'
+alias alias538='something --arg538'
+alias alias539='something --arg539'
+alias alias540='something --arg540'
+alias alias541='something --arg541'
+alias alias542='something --arg542'
+alias alias543='something --arg543'
+alias alias544='something --arg544'
+alias alias545='something --arg545'
+alias alias546='something --arg546'
+alias alias547='something --arg547'
+alias alias548='something --arg548'
+alias alias549='something --arg549'
+alias alias550='something --arg550'
+alias alias551='something --arg551'
+alias alias552='something --arg552'
+alias alias553='something --arg553'
+alias alias554='something --arg554'
+alias alias555='something --arg555'
+alias alias556='something --arg556'
+alias alias557='something --arg557'
+alias alias558='something --arg558'
+alias alias559='something --arg559'
+alias alias560='something --arg560'
+alias alias561='something --arg561'
+alias alias562='something --arg562'
+alias alias563='something --arg563'
+alias alias564='something --arg564'
+alias alias565='something --arg565'
+alias alias566='something --arg566'
+alias alias567='something --arg567'
+alias alias568='something --arg568'
+alias alias569='something --arg569'
+alias alias570='something --arg570'
+alias alias571='something --arg571'
+alias alias572='something --arg572'
+alias alias573='something --arg573'
+alias alias574='something --arg574'
+alias alias575='something --arg575'
+alias alias576='something --arg576'
+alias alias577='something --arg577'
+alias alias578='something --arg578'
+alias alias579='something --arg579'
+alias alias580='something --arg580'
+alias alias581='something --arg581'
+alias alias582='something --arg582'
+alias alias583='something --arg583'
+alias alias584='something --arg584'
+alias alias585='something --arg585'
+alias alias586='something --arg586'
+alias alias587='something --arg587'
+alias alias588='something --arg588'
+alias alias589='something --arg589'
+alias alias590='something --arg590'
+alias alias591='something --arg591'
+alias alias592='something --arg592'
+alias alias593='something --arg593'
+alias alias594='something --arg594'
+alias alias595='something --arg595'
+alias alias596='something --arg596'
+alias alias597='something --arg597'
+alias alias598='something --arg598'
+alias alias599='something --arg599'
+alias alias600='something --arg600'
+alias alias601='something --arg601'
+alias alias602='something --arg602'
+alias alias603='something --arg603'
+alias alias604='something --arg604'
+alias alias605='something --arg605'
+alias alias606='something --arg606'
+alias alias607='something --arg607'
+alias alias608='something --arg608'
+alias alias609='something --arg609'
+alias alias610='something --arg610'
+alias alias611='something --arg611'
+alias alias612='something --arg612'
+alias alias613='something --arg613'
+alias alias614='something --arg614'
+alias alias615='something --arg615'
+alias alias616='something --arg616'
+alias alias617='something --arg617'
+alias alias618='something --arg618'
+alias alias619='something --arg619'
+alias alias620='something --arg620'
+alias alias621='something --arg621'
+alias alias622='something --arg622'
+alias alias623='something --arg623'
+alias alias624='something --arg624'
+alias alias625='something --arg625'
+alias alias626='something --arg626'
+alias alias627='something --arg627'
+alias alias628='something --arg628'
+alias alias629='something --arg629'
+alias alias630='something --arg630'
+alias alias631='something --arg631'
+alias alias632='something --arg632'
+alias alias633='something --arg633'
+alias alias634='something --arg634'
+alias alias635='something --arg635'
+alias alias636='something --arg636'
+alias alias637='something --arg637'
+alias alias638='something --arg638'
+alias alias639='something --arg639'
+alias alias640='something --arg640'
+alias alias641='something --arg641'
+alias alias642='something --arg642'
+alias alias643='something --arg643'
+alias alias644='something --arg644'
+alias alias645='something --arg645'
+alias alias646='something --arg646'
+alias alias647='something --arg647'
+alias alias648='something --arg648'
+alias alias649='something --arg649'
+alias alias650='something --arg650'
+alias alias651='something --arg651'
+alias alias652='something --arg652'
+alias alias653='something --arg653'
+alias alias654='something --arg654'
+alias alias655='something --arg655'
+alias alias656='something --arg656'
+alias alias657='something --arg657'
+alias alias658='something --arg658'
+alias alias659='something --arg659'
+alias alias660='something --arg660'
+alias alias661='something --arg661'
+alias alias662='something --arg662'
+alias alias663='something --arg663'
+alias alias664='something --arg664'
+alias alias665='something --arg665'
+alias alias666='something --arg666'
+alias alias667='something --arg667'
+alias alias668='something --arg668'
+alias alias669='something --arg669'
+alias alias670='something --arg670'
+alias alias671='something --arg671'
+alias alias672='something --arg672'
+alias alias673='something --arg673'
+alias alias674='something --arg674'
+alias alias675='something --arg675'
+alias alias676='something --arg676'
+alias alias677='something --arg677'
+alias alias678='something --arg678'
+alias alias679='something --arg679'
+alias alias680='something --arg680'
+alias alias681='something --arg681'
+alias alias682='something --arg682'
+alias alias683='something --arg683'
+alias alias684='something --arg684'
+alias alias685='something --arg685'
+alias alias686='something --arg686'
+alias alias687='something --arg687'
+alias alias688='something --arg688'
+alias alias689='something --arg689'
+alias alias690='something --arg690'
+alias alias691='something --arg691'
+alias alias692='something --arg692'
+alias alias693='something --arg693'
+alias alias694='something --arg694'
+alias alias695='something --arg695'
+alias alias696='something --arg696'
+alias alias697='something --arg697'
+alias alias698='something --arg698'
+alias alias699='something --arg699'
+alias alias700='something --arg700'
+alias alias701='something --arg701'
+alias alias702='something --arg702'
+alias alias703='something --arg703'
+alias alias704='something --arg704'
+alias alias705='something --arg705'
+alias alias706='something --arg706'
+alias alias707='something --arg707'
+alias alias708='something --arg708'
+alias alias709='something --arg709'
+alias alias710='something --arg710'
+alias alias711='something --arg711'
+alias alias712='something --arg712'
+alias alias713='something --arg713'
+alias alias714='something --arg714'
+alias alias715='something --arg715'
+alias alias716='something --arg716'
+alias alias717='something --arg717'
+alias alias718='something --arg718'
+alias alias719='something --arg719'
+alias alias720='something --arg720'
+alias alias721='something --arg721'
+alias alias722='something --arg722'
+alias alias723='something --arg723'
+alias alias724='something --arg724'
+alias alias725='something --arg725'
+alias alias726='something --arg726'
+alias alias727='something --arg727'
+alias alias728='something --arg728'
+alias alias729='something --arg729'
+alias alias730='something --arg730'
+alias alias731='something --arg731'
+alias alias732='something --arg732'
+alias alias733='something --arg733'
+alias alias734='something --arg734'
+alias alias735='something --arg735'
+alias alias736='something --arg736'
+alias alias737='something --arg737'
+alias alias738='something --arg738'
+alias alias739='something --arg739'
+alias alias740='something --arg740'
+alias alias741='something --arg741'
+alias alias742='something --arg742'
+alias alias743='something --arg743'
+alias alias744='something --arg744'
+alias alias745='something --arg745'
+alias alias746='something --arg746'
+alias alias747='something --arg747'
+alias alias748='something --arg748'
+alias alias749='something --arg749'
+alias alias750='something --arg750'
+alias alias751='something --arg751'
+alias alias752='something --arg752'
+alias alias753='something --arg753'
+alias alias754='something --arg754'
+alias alias755='something --arg755'
+alias alias756='something --arg756'
+alias alias757='something --arg757'
+alias alias758='something --arg758'
+alias alias759='something --arg759'
+alias alias760='something --arg760'
+alias alias761='something --arg761'
+alias alias762='something --arg762'
+alias alias763='something --arg763'
+alias alias764='something --arg764'
+alias alias765='something --arg765'
+alias alias766='something --arg766'
+alias alias767='something --arg767'
+alias alias768='something --arg768'
+alias alias769='something --arg769'
+alias alias770='something --arg770'
+alias alias771='something --arg771'
+alias alias772='something --arg772'
+alias alias773='something --arg773'
+alias alias774='something --arg774'
+alias alias775='something --arg775'
+alias alias776='something --arg776'
+alias alias777='something --arg777'
+alias alias778='something --arg778'
+alias alias779='something --arg779'
+alias alias780='something --arg780'
+alias alias781='something --arg781'
+alias alias782='something --arg782'
+alias alias783='something --arg783'
+alias alias784='something --arg784'
+alias alias785='something --arg785'
+alias alias786='something --arg786'
+alias alias787='something --arg787'
+alias alias788='something --arg788'
+alias alias789='something --arg789'
+alias alias790='something --arg790'
+alias alias791='something --arg791'
+alias alias792='something --arg792'
+alias alias793='something --arg793'
+alias alias794='something --arg794'
+alias alias795='something --arg795'
+alias alias796='something --arg796'
+alias alias797='something --arg797'
+alias alias798='something --arg798'
+alias alias799='something --arg799'
+alias alias800='something --arg800'
+alias alias801='something --arg801'
+alias alias802='something --arg802'
+alias alias803='something --arg803'
+alias alias804='something --arg804'
+alias alias805='something --arg805'
+alias alias806='something --arg806'
+alias alias807='something --arg807'
+alias alias808='something --arg808'
+alias alias809='something --arg809'
+alias alias810='something --arg810'
+alias alias811='something --arg811'
+alias alias812='something --arg812'
+alias alias813='something --arg813'
+alias alias814='something --arg814'
+alias alias815='something --arg815'
+alias alias816='something --arg816'
+alias alias817='something --arg817'
+alias alias818='something --arg818'
+alias alias819='something --arg819'
+alias alias820='something --arg820'
+alias alias821='something --arg821'
+alias alias822='something --arg822'
+alias alias823='something --arg823'
+alias alias824='something --arg824'
+alias alias825='something --arg825'
+alias alias826='something --arg826'
+alias alias827='something --arg827'
+alias alias828='something --arg828'
+alias alias829='something --arg829'
+alias alias830='something --arg830'
+alias alias831='something --arg831'
+alias alias832='something --arg832'
+alias alias833='something --arg833'
+alias alias834='something --arg834'
+alias alias835='something --arg835'
+alias alias836='something --arg836'
+alias alias837='something --arg837'
+alias alias838='something --arg838'
+alias alias839='something --arg839'
+alias alias840='something --arg840'
+alias alias841='something --arg841'
+alias alias842='something --arg842'
+alias alias843='something --arg843'
+alias alias844='something --arg844'
+alias alias845='something --arg845'
+alias alias846='something --arg846'
+alias alias847='something --arg847'
+alias alias848='something --arg848'
+alias alias849='something --arg849'
+alias alias850='something --arg850'
+alias alias851='something --arg851'
+alias alias852='something --arg852'
+alias alias853='something --arg853'
+alias alias854='something --arg854'
+alias alias855='something --arg855'
+alias alias856='something --arg856'
+alias alias857='something --arg857'
+alias alias858='something --arg858'
+alias alias859='something --arg859'
+alias alias860='something --arg860'
+alias alias861='something --arg861'
+alias alias862='something --arg862'
+alias alias863='something --arg863'
+alias alias864='something --arg864'
+alias alias865='something --arg865'
+alias alias866='something --arg866'
+alias alias867='something --arg867'
+alias alias868='something --arg868'
+alias alias869='something --arg869'
+alias alias870='something --arg870'
+alias alias871='something --arg871'
+alias alias872='something --arg872'
+alias alias873='something --arg873'
+alias alias874='something --arg874'
+alias alias875='something --arg875'
+alias alias876='something --arg876'
+alias alias877='something --arg877'
+alias alias878='something --arg878'
+alias alias879='something --arg879'
+alias alias880='something --arg880'
+alias alias881='something --arg881'
+alias alias882='something --arg882'
+alias alias883='something --arg883'
+alias alias884='something --arg884'
+alias alias885='something --arg885'
+alias alias886='something --arg886'
+alias alias887='something --arg887'
+alias alias888='something --arg888'
+alias alias889='something --arg889'
+alias alias890='something --arg890'
+alias alias891='something --arg891'
+alias alias892='something --arg892'
+alias alias893='something --arg893'
+alias alias894='something --arg894'
+alias alias895='something --arg895'
+alias alias896='something --arg896'
+alias alias897='something --arg897'
+alias alias898='something --arg898'
+alias alias899='something --arg899'
+alias alias900='something --arg900'
+alias alias901='something --arg901'
+alias alias902='something --arg902'
+alias alias903='something --arg903'
+alias alias904='something --arg904'
+alias alias905='something --arg905'
+alias alias906='something --arg906'
+alias alias907='something --arg907'
+alias alias908='something --arg908'
+alias alias909='something --arg909'
+alias alias910='something --arg910'
+alias alias911='something --arg911'
+alias alias912='something --arg912'
+alias alias913='something --arg913'
+alias alias914='something --arg914'
+alias alias915='something --arg915'
+alias alias916='something --arg916'
+alias alias917='something --arg917'
+alias alias918='something --arg918'
+alias alias919='something --arg919'
+alias alias920='something --arg920'
+alias alias921='something --arg921'
+alias alias922='something --arg922'
+alias alias923='something --arg923'
+alias alias924='something --arg924'
+alias alias925='something --arg925'
+alias alias926='something --arg926'
+alias alias927='something --arg927'
+alias alias928='something --arg928'
+alias alias929='something --arg929'
+alias alias930='something --arg930'
+alias alias931='something --arg931'
+alias alias932='something --arg932'
+alias alias933='something --arg933'
+alias alias934='something --arg934'
+alias alias935='something --arg935'
+alias alias936='something --arg936'
+alias alias937='something --arg937'
+alias alias938='something --arg938'
+alias alias939='something --arg939'
+alias alias940='something --arg940'
+alias alias941='something --arg941'
+alias alias942='something --arg942'
+alias alias943='something --arg943'
+alias alias944='something --arg944'
+alias alias945='something --arg945'
+alias alias946='something --arg946'
+alias alias947='something --arg947'
+alias alias948='something --arg948'
+alias alias949='something --arg949'
+alias alias950='something --arg950'
+alias alias951='something --arg951'
+alias alias952='something --arg952'
+alias alias953='something --arg953'
+alias alias954='something --arg954'
+alias alias955='something --arg955'
+alias alias956='something --arg956'
+alias alias957='something --arg957'
+alias alias958='something --arg958'
+alias alias959='something --arg959'
+alias alias960='something --arg960'
+alias alias961='something --arg961'
+alias alias962='something --arg962'
+alias alias963='something --arg963'
+alias alias964='something --arg964'
+alias alias965='something --arg965'
+alias alias966='something --arg966'
+alias alias967='something --arg967'
+alias alias968='something --arg968'
+alias alias969='something --arg969'
+alias alias970='something --arg970'
+alias alias971='something --arg971'
+alias alias972='something --arg972'
+alias alias973='something --arg973'
+alias alias974='something --arg974'
+alias alias975='something --arg975'
+alias alias976='something --arg976'
+alias alias977='something --arg977'
+alias alias978='something --arg978'
+alias alias979='something --arg979'
+alias alias980='something --arg980'
+alias alias981='something --arg981'
+alias alias982='something --arg982'
+alias alias983='something --arg983'
+alias alias984='something --arg984'
+alias alias985='something --arg985'
+alias alias986='something --arg986'
+alias alias987='something --arg987'
+alias alias988='something --arg988'
+alias alias989='something --arg989'
+alias alias990='something --arg990'
+alias alias991='something --arg991'
+alias alias992='something --arg992'
+alias alias993='something --arg993'
+alias alias994='something --arg994'
+alias alias995='something --arg995'
+alias alias996='something --arg996'
+alias alias997='something --arg997'
+alias alias998='something --arg998'
+alias alias999='something --arg999'
+alias alias1000='something --arg1000'
+alias alias1001='something --arg1001'
+alias alias1002='something --arg1002'
+alias alias1003='something --arg1003'
+alias alias1004='something --arg1004'
+alias alias1005='something --arg1005'
+alias alias1006='something --arg1006'
+alias alias1007='something --arg1007'
+alias alias1008='something --arg1008'
+alias alias1009='something --arg1009'
+alias alias1010='something --arg1010'
+alias alias1011='something --arg1011'
+alias alias1012='something --arg1012'
+alias alias1013='something --arg1013'
+alias alias1014='something --arg1014'
+alias alias1015='something --arg1015'
+alias alias1016='something --arg1016'
+alias alias1017='something --arg1017'
+alias alias1018='something --arg1018'
+alias alias1019='something --arg1019'
+alias alias1020='something --arg1020'
+alias alias1021='something --arg1021'
+alias alias1022='something --arg1022'
+alias alias1023='something --arg1023'
+
diff --git a/src/fish.cpp b/src/fish.cpp
index 959ed36d7..18e29cb18 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -108,6 +108,7 @@ static void print_rusage_self(FILE *fp) {
     fprintf(fp, "  rusage self:\n");
     fprintf(fp, "      user time: %llu ms\n", tv_to_msec(rs.ru_utime));
     fprintf(fp, "       sys time: %llu ms\n", tv_to_msec(rs.ru_stime));
+    fprintf(fp, "     total time: %llu ms\n", tv_to_msec(rs.ru_utime) + tv_to_msec(rs.ru_stime));
     fprintf(fp, "        max rss: %ld kb\n", rss_kb);
     fprintf(fp, "        signals: %ld\n", rs.ru_nsignals);
 #endif

From 3fb9159b097c5dc5254c7570ae15efdb6d2e09b7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 12:13:18 -0800
Subject: [PATCH 1241/1732] Rename spawn_request_t to work_request_t and clean
 up the API a bit

---
 src/iothread.cpp | 68 +++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 6d83e9897..d8d6771aa 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -31,6 +31,9 @@
 #define IO_MAX_THREADS 64
 #endif
 
+// The minimum number of threads kept waiting in the pool.
+#define IO_MIN_THREADS 1
+
 // Values for the wakeup bytes sent to the ioport.
 #define IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE 99
 #define IO_SERVICE_RESULT_QUEUE 100
@@ -40,19 +43,17 @@ static void iothread_service_result_queue();
 
 typedef std::function<void(void)> void_function_t;
 
-struct spawn_request_t {
+struct work_request_t {
     void_function_t handler;
     void_function_t completion;
 
-    spawn_request_t() {}
-
-    spawn_request_t(void_function_t &&f, void_function_t &&comp) : handler(f), completion(comp) {}
+    work_request_t(void_function_t &&f, void_function_t &&comp) : handler(f), completion(comp) {}
 
     // Move-only
-    spawn_request_t &operator=(const spawn_request_t &) = delete;
-    spawn_request_t &operator=(spawn_request_t &&) = default;
-    spawn_request_t(const spawn_request_t &) = delete;
-    spawn_request_t(spawn_request_t &&) = default;
+    work_request_t &operator=(const work_request_t &) = delete;
+    work_request_t &operator=(work_request_t &&) = default;
+    work_request_t(const work_request_t &) = delete;
+    work_request_t(work_request_t &&) = default;
 };
 
 struct main_thread_request_t {
@@ -68,13 +69,17 @@ struct main_thread_request_t {
     main_thread_request_t(main_thread_request_t &&) = delete;
 };
 
-// Spawn support. Requests are allocated and come in on request_queue and go out on result_queue
-struct thread_data_t {
-    std::queue<spawn_request_t> request_queue;
+/// Data about the current set of IO threads and requests.
+struct thread_pool_data_t {
+    /// The queue of outstanding, unclaimed requests.
+    std::queue<work_request_t> request_queue;
+
+    /// The number of extant threads which are able to run requests.
     int thread_count = 0;
 };
-static owning_lock<thread_data_t> s_spawn_requests;
-static owning_lock<std::queue<spawn_request_t>> s_result_queue;
+static owning_lock<thread_pool_data_t> s_thread_pool;
+
+static owning_lock<std::queue<work_request_t>> s_result_queue;
 
 // "Do on main thread" support.
 static std::mutex s_main_thread_performer_lock;               // protects the main thread requests
@@ -108,17 +113,17 @@ static const notify_pipes_t &get_notify_pipes() {
     return s_notify_pipes;
 }
 
-static bool dequeue_spawn_request(spawn_request_t *result) {
-    auto requests = s_spawn_requests.acquire();
+static maybe_t<work_request_t> dequeue_spawn_request() {
+    maybe_t<work_request_t> result{};
+    auto requests = s_thread_pool.acquire();
     if (!requests->request_queue.empty()) {
-        *result = std::move(requests->request_queue.front());
+        result = std::move(requests->request_queue.front());
         requests->request_queue.pop();
-        return true;
     }
-    return false;
+    return result;
 }
 
-static void enqueue_thread_result(spawn_request_t req) {
+static void enqueue_thread_result(work_request_t req) {
     s_result_queue.acquire()->push(std::move(req));
 }
 
@@ -127,18 +132,17 @@ static void *this_thread() { return (void *)(intptr_t)pthread_self(); }
 /// The function that does thread work.
 static void *iothread_worker(void *unused) {
     UNUSED(unused);
-    struct spawn_request_t req;
-    while (dequeue_spawn_request(&req)) {
+    while (auto req = dequeue_spawn_request()) {
         debug(5, "pthread %p dequeued", this_thread());
 
         // Perform the work
-        req.handler();
+        req->handler();
 
         // If there's a completion handler, we have to enqueue it on the result queue.
         // Note we're using std::function's weirdo operator== here
-        if (req.completion != nullptr) {
+        if (req->completion != nullptr) {
             // Enqueue the result, and tell the main thread about it.
-            enqueue_thread_result(std::move(req));
+            enqueue_thread_result(req.acquire());
             const char wakeup_byte = IO_SERVICE_RESULT_QUEUE;
             int notify_fd = get_notify_pipes().write;
             assert_with_errno(write_loop(notify_fd, &wakeup_byte, sizeof wakeup_byte) != -1);
@@ -150,9 +154,9 @@ static void *iothread_worker(void *unused) {
     // it's possible that the main thread saw that thread_count is full, and decided to not
     // spawn a new thread, trusting in one of the existing threads to handle it. But we've already
     // committed to not handling anything else. Therefore, we have to decrement
-    // the thread count under the lock, which we still hold. Likewise, the main thread must
-    // check the value under the lock.
-    int new_thread_count = --s_spawn_requests.acquire()->thread_count;
+    // the thread count under the lock. Likewise, the main thread must check the value under the
+    // lock.
+    int new_thread_count = --s_thread_pool.acquire()->thread_count;
     assert(new_thread_count >= 0);
 
     debug(5, "pthread %p exiting", this_thread());
@@ -176,12 +180,12 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
 
-    struct spawn_request_t req(std::move(func), std::move(completion));
+    struct work_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
     bool spawn_new_thread = false;
     {
         // Lock around a local region.
-        auto spawn_reqs = s_spawn_requests.acquire();
+        auto spawn_reqs = s_thread_pool.acquire();
         spawn_reqs->request_queue.push(std::move(req));
         if (spawn_reqs->thread_count < IO_MAX_THREADS) {
             spawn_reqs->thread_count++;
@@ -246,7 +250,7 @@ void iothread_drain_all() {
 #endif
 
     // Nasty polling via select().
-    while (s_spawn_requests.acquire()->thread_count > 0) {
+    while (s_thread_pool.acquire()->thread_count > 0) {
         if (iothread_wait_for_pending_completions(1000)) {
             iothread_service_completion();
         }
@@ -294,12 +298,12 @@ static void iothread_service_main_thread_requests() {
 // Service the queue of results
 static void iothread_service_result_queue() {
     // Move the queue to a local variable.
-    std::queue<spawn_request_t> result_queue;
+    std::queue<work_request_t> result_queue;
     s_result_queue.acquire()->swap(result_queue);
 
     // Perform each completion in order
     while (!result_queue.empty()) {
-        spawn_request_t req(std::move(result_queue.front()));
+        work_request_t req(std::move(result_queue.front()));
         result_queue.pop();
         // ensure we don't invoke empty functions, that raises an exception
         if (req.completion != nullptr) {

From a74fc7ef6d9f8728f7816362c7f4875f505386aa Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 12:36:44 -0800
Subject: [PATCH 1242/1732] Remove the wait_for_threads_to_die parameter to
 execute_fork

This is always set to false so we can get rid of it.
---
 src/exec.cpp     | 7 +++----
 src/postfork.cpp | 4 ++--
 src/postfork.h   | 7 ++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index ae033abba..a6596b6f8 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -435,10 +435,9 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
 /// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the
 /// context of the child. Returns true if fork succeeded, false if fork failed.
 static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t *p,
-                                   const dup2_list_t &dup2s, bool drain_threads,
-                                   const char *fork_type,
+                                   const dup2_list_t &dup2s, const char *fork_type,
                                    const std::function<void()> &child_action) {
-    pid_t pid = execute_fork(drain_threads);
+    pid_t pid = execute_fork();
     if (pid == 0) {
         // This is the child process. Setup redirections, print correct output to
         // stdout and stderr, and then exit.
@@ -760,7 +759,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
     } else
 #endif
     {
-        if (!fork_child_for_process(j, p, *dup2s, false, "external command",
+        if (!fork_child_for_process(j, p, *dup2s, "external command",
                                     [&] { safe_launch_process(p, actual_cmd, argv, envv); })) {
             return false;
         }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 9a5866b35..680625bf1 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -168,10 +168,10 @@ int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &
 /// This function is a wrapper around fork. If the fork calls fails with EAGAIN, it is retried
 /// FORK_LAPS times, with a very slight delay between each lap. If fork fails even then, the process
 /// will exit with an error message.
-pid_t execute_fork(bool wait_for_threads_to_die) {
+pid_t execute_fork() {
     ASSERT_IS_MAIN_THREAD();
 
-    if (wait_for_threads_to_die || JOIN_THREADS_BEFORE_FORK) {
+    if (JOIN_THREADS_BEFORE_FORK) {
         // Make sure we have no outstanding threads before we fork. This is a pretty sketchy thing
         // to do here, both because exec.cpp shouldn't have to know about iothreads, and because the
         // completion handlers may do unexpected things.
diff --git a/src/postfork.h b/src/postfork.h
index aeac13c0b..442e666f3 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -33,11 +33,8 @@ bool child_set_group(job_t *j, process_t *p);     // called by child
 /// On failure, signal handlers, io redirections and process group of the process is undefined.
 int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &dup2s);
 
-/// Call fork(), optionally waiting until we are no longer multithreaded. If the forked child
-/// doesn't do anything that could allocate memory, take a lock, etc. (like call exec), then it's
-/// not necessary to wait for threads to die. If the forked child may do those things, it should
-/// wait for threads to die.
-pid_t execute_fork(bool wait_for_threads_to_die);
+/// Call fork(), retrying on failure a few times.
+pid_t execute_fork();
 
 /// Report an error from failing to exec or posix_spawn a command.
 void safe_report_exec_error(int err, const char *actual_cmd, const char *const *argv,

From 9d7d70c204073fb7fcfc393b8b78821b905e6817 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 13:37:15 -0800
Subject: [PATCH 1243/1732] Clean up some iothreads

Improve the iothread behavior by enabling an iothread to stick around for
a while waiting for work. This reduces the amount of iothread churn, which
is useful on platforms where threads are expensive.

Also do other modernization like clean up the locking discipline and use
FLOG.
---
 src/flog.h       |   2 +
 src/iothread.cpp | 179 ++++++++++++++++++++++++++++++++---------------
 src/iothread.h   |   3 +-
 3 files changed, 125 insertions(+), 59 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index d95ac7e98..29677935f 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -77,6 +77,8 @@ class category_list_t {
     category_t history{L"history", L"Command history events"};
 
     category_t profile_history{L"profile-history", L"History performance measurements"};
+
+    category_t iothread{L"iothread", L"Background IO thread events"};
 };
 
 /// The class responsible for logging.
diff --git a/src/iothread.cpp b/src/iothread.cpp
index d8d6771aa..e13af9900 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -13,7 +13,7 @@
 
 #include <atomic>
 #include <condition_variable>
-#include <cstring>
+#include <functional>
 #include <queue>
 
 #include "common.h"
@@ -31,13 +31,13 @@
 #define IO_MAX_THREADS 64
 #endif
 
-// The minimum number of threads kept waiting in the pool.
-#define IO_MIN_THREADS 1
-
 // Values for the wakeup bytes sent to the ioport.
 #define IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE 99
 #define IO_SERVICE_RESULT_QUEUE 100
 
+// The amount of time an IO thread many hang around to service requests, in milliseconds.
+#define IO_WAIT_FOR_WORK_DURATION_MS 500
+
 static void iothread_service_main_thread_requests();
 static void iothread_service_result_queue();
 
@@ -47,7 +47,8 @@ struct work_request_t {
     void_function_t handler;
     void_function_t completion;
 
-    work_request_t(void_function_t &&f, void_function_t &&comp) : handler(f), completion(comp) {}
+    work_request_t(void_function_t &&f, void_function_t &&comp)
+        : handler(std::move(f)), completion(std::move(comp)) {}
 
     // Move-only
     work_request_t &operator=(const work_request_t &) = delete;
@@ -57,7 +58,7 @@ struct work_request_t {
 };
 
 struct main_thread_request_t {
-    std::atomic<bool> done{false};
+    relaxed_atomic_bool_t done{false};
     void_function_t func;
 
     main_thread_request_t(void_function_t &&f) : func(f) {}
@@ -69,15 +70,44 @@ struct main_thread_request_t {
     main_thread_request_t(main_thread_request_t &&) = delete;
 };
 
-/// Data about the current set of IO threads and requests.
-struct thread_pool_data_t {
-    /// The queue of outstanding, unclaimed requests.
-    std::queue<work_request_t> request_queue;
+struct thread_pool_t {
+    struct data_t {
+        /// The queue of outstanding, unclaimed requests.
+        std::queue<work_request_t> request_queue{};
 
-    /// The number of extant threads which are able to run requests.
-    int thread_count = 0;
+        /// The number of threads that exist in the pool.
+        int total_threads{0};
+
+        /// The number of threads which are waiting for more work.
+        int waiting_threads{0};
+
+        /// A flag indicating we should not process new requests.
+        bool drain{false};
+    };
+
+    /// Data which needs to be atomically accessed.
+    owning_lock<data_t> data{};
+
+    /// The condition variable used to wake up waiting threads.
+    /// Note this is tied to data's lock.
+    std::condition_variable queue_cond{};
+
+    /// The minimum and maximum number of threads.
+    /// Here "minimum" means threads that are kept waiting in the pool.
+    /// Note that the pool is initially empty and threads may decide to exit based on a time wait.
+    const int soft_min_threads;
+    const int max_threads;
+
+    thread_pool_t(int soft_min_threads, int max_threads)
+        : soft_min_threads(soft_min_threads), max_threads(max_threads) {
+        assert(soft_min_threads >= 0 && max_threads >= 1 && soft_min_threads <= max_threads &&
+               "Invalid thread min and max");
+    }
 };
-static owning_lock<thread_pool_data_t> s_thread_pool;
+
+/// The thread pool for "iothreads" which are used to lift I/O off of the main thread.
+/// These are used for completions, etc.
+static thread_pool_t s_io_thread_pool(1, IO_MAX_THREADS);
 
 static owning_lock<std::queue<work_request_t>> s_result_queue;
 
@@ -113,13 +143,32 @@ static const notify_pipes_t &get_notify_pipes() {
     return s_notify_pipes;
 }
 
-static maybe_t<work_request_t> dequeue_spawn_request() {
-    maybe_t<work_request_t> result{};
-    auto requests = s_thread_pool.acquire();
-    if (!requests->request_queue.empty()) {
-        result = std::move(requests->request_queue.front());
-        requests->request_queue.pop();
+/// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
+/// reducing the active thread count.
+static maybe_t<work_request_t> iothread_dequeue_work_or_commit_to_exit() {
+    auto &pool = s_io_thread_pool;
+    auto data = pool.data.acquire();
+
+    while (data->request_queue.empty()) {
+        bool give_up = true;
+        if (!data->drain && data->total_threads == pool.soft_min_threads) {
+            // If we exit, it will drop below the soft min. So wait for a while before giving up.
+            data->waiting_threads += 1;
+            auto wait_ret = pool.queue_cond.wait_for(
+                data.get_lock(), std::chrono::milliseconds(IO_WAIT_FOR_WORK_DURATION_MS));
+            data->waiting_threads -= 1;
+            give_up = (wait_ret == std::cv_status::timeout);
+        }
+        if (give_up) {
+            // Balance the total_threads count from when we were spawned.
+            data->total_threads -= 1;
+            return none();
+        }
     }
+
+    // Oh! The queue has work for us!
+    maybe_t<work_request_t> result = std::move(data->request_queue.front());
+    data->request_queue.pop();
     return result;
 }
 
@@ -132,8 +181,8 @@ static void *this_thread() { return (void *)(intptr_t)pthread_self(); }
 /// The function that does thread work.
 static void *iothread_worker(void *unused) {
     UNUSED(unused);
-    while (auto req = dequeue_spawn_request()) {
-        debug(5, "pthread %p dequeued", this_thread());
+    while (auto req = iothread_dequeue_work_or_commit_to_exit()) {
+        FLOGF(iothread, L"pthread %p got work", this_thread());
 
         // Perform the work
         req->handler();
@@ -148,24 +197,12 @@ static void *iothread_worker(void *unused) {
             assert_with_errno(write_loop(notify_fd, &wakeup_byte, sizeof wakeup_byte) != -1);
         }
     }
-
-    // We believe we have exhausted the thread request queue. We want to decrement
-    // thread_count and exit. But it's possible that a request just came in. Furthermore,
-    // it's possible that the main thread saw that thread_count is full, and decided to not
-    // spawn a new thread, trusting in one of the existing threads to handle it. But we've already
-    // committed to not handling anything else. Therefore, we have to decrement
-    // the thread count under the lock. Likewise, the main thread must check the value under the
-    // lock.
-    int new_thread_count = --s_thread_pool.acquire()->thread_count;
-    assert(new_thread_count >= 0);
-
-    debug(5, "pthread %p exiting", this_thread());
-    // We're done.
-    return NULL;
+    FLOGF(iothread, L"pthread %p exiting", this_thread());
+    return nullptr;
 }
 
 /// Spawn another thread. No lock is held when this is called.
-static void iothread_spawn() {
+static pthread_t iothread_spawn() {
     // 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.
@@ -174,29 +211,43 @@ static void iothread_spawn() {
         // We will never join this thread.
         DIE_ON_FAILURE(pthread_detach(thread));
     }
+    return thread;
 }
 
 int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
+    assert(func && "Null function");
 
     struct work_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
+    auto &pool = s_io_thread_pool;
     bool spawn_new_thread = false;
+    bool wakeup_thread = false;
     {
         // Lock around a local region.
-        auto spawn_reqs = s_thread_pool.acquire();
-        spawn_reqs->request_queue.push(std::move(req));
-        if (spawn_reqs->thread_count < IO_MAX_THREADS) {
-            spawn_reqs->thread_count++;
+        auto data = pool.data.acquire();
+        data->request_queue.push(std::move(req));
+        if (data->drain) {
+            // Do nothing here.
+        } else if (data->waiting_threads > 0) {
+            // At least one thread is waiting, we will wake it up.
+            wakeup_thread = true;
+        } else if (data->total_threads < pool.max_threads) {
+            // No threads are waiting but we can spawn a new thread.
+            data->total_threads += 1;
             spawn_new_thread = true;
         }
-        local_thread_count = spawn_reqs->thread_count;
+        local_thread_count = data->total_threads;
     }
 
     // Kick off the thread if we decided to do so.
+    if (wakeup_thread) {
+        pool.queue_cond.notify_one();
+    }
     if (spawn_new_thread) {
-        iothread_spawn();
+        pthread_t pt = iothread_spawn();
+        FLOGF(iothread, L"pthread %p spawned", pt);
     }
     return local_thread_count;
 }
@@ -230,36 +281,48 @@ static bool iothread_wait_for_pending_completions(long timeout_usec) {
     return ret > 0;
 }
 
-/// Note that this function is quite sketchy. In particular, it drains threads, not requests,
-/// meaning that it may leave requests on the queue. This is the desired behavior (it may be called
-/// before fork, and we don't want to bother servicing requests before we fork), but in the test
-/// suite we depend on it draining all requests. In practice, this works, because a thread in
-/// practice won't exit while there is outstanding requests.
-///
 /// At the moment, this function is only used in the test suite and in a
 /// drain-all-threads-before-fork compatibility mode that no architecture requires, so it's OK that
 /// it's terrible.
-void iothread_drain_all() {
+int iothread_drain_all() {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
 
-#define TIME_DRAIN 0
-#if TIME_DRAIN
-    int thread_count = s_spawn_requests.acquire().value.thread_count;
+    int thread_count;
+    auto &pool = s_io_thread_pool;
+    // Set the drain flag.
+    {
+        auto data = pool.data.acquire();
+        assert(!data->drain && "Should not be draining already");
+        data->drain = true;
+        thread_count = data->total_threads;
+    }
+
+    // Wake everyone up.
+    pool.queue_cond.notify_all();
+
     double now = timef();
-#endif
 
     // Nasty polling via select().
-    while (s_thread_pool.acquire()->thread_count > 0) {
+    while (pool.data.acquire()->total_threads > 0) {
         if (iothread_wait_for_pending_completions(1000)) {
             iothread_service_completion();
         }
     }
-#if TIME_DRAIN
+
+    // Clear the drain flag.
+    // Even though we released the lock, nobody should have added a new thread while the drain flag
+    // is set.
+    {
+        auto data = pool.data.acquire();
+        assert(data->total_threads == 0 && "Should be no threads");
+        assert(data->drain && "Should be draining");
+        data->drain = false;
+    }
+
     double after = timef();
-    std::fwprintf(stdout, L"(Waited %.02f msec for %d thread(s) to drain)\n", 1000 * (after - now),
-                  thread_count);
-#endif
+    FLOGF(iothread, "Drained %d thread(s) in %.02f msec", thread_count, 1000 * (after - now));
+    return thread_count;
 }
 
 /// "Do on main thread" support.
diff --git a/src/iothread.h b/src/iothread.h
index c64576d24..10c0bc3c3 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -27,7 +27,8 @@ int iothread_port(void);
 void iothread_service_completion(void);
 
 /// Waits for all iothreads to terminate.
-void iothread_drain_all(void);
+/// \return the number of threads that were running.
+int iothread_drain_all(void);
 
 // Internal implementation
 int iothread_perform_impl(std::function<void(void)> &&func, std::function<void(void)> &&completion);

From 22230a1a0ddddc62732418773f3741073988df96 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 14:05:26 -0800
Subject: [PATCH 1244/1732] Migrate some iothread functions into member
 functions of thread_pool_t

---
 src/iothread.cpp | 83 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index e13af9900..035c5c482 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -86,7 +86,7 @@ struct thread_pool_t {
     };
 
     /// Data which needs to be atomically accessed.
-    owning_lock<data_t> data{};
+    owning_lock<data_t> req_data{};
 
     /// The condition variable used to wake up waiting threads.
     /// Note this is tied to data's lock.
@@ -103,6 +103,32 @@ struct thread_pool_t {
         assert(soft_min_threads >= 0 && max_threads >= 1 && soft_min_threads <= max_threads &&
                "Invalid thread min and max");
     }
+
+    /// Enqueue a new work item onto the thread pool.
+    /// The function \p func will execute in one of the pool's threads.
+    /// \p completion will run on the main thread, if it is not missing.
+    int perform(void_function_t &&func, void_function_t &&completion);
+
+   private:
+    /// The worker loop for this thread.
+    void *run();
+
+    /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
+    /// reducing the active thread count.
+    /// This runs in the background thread.
+    maybe_t<work_request_t> dequeue_work_or_commit_to_exit();
+
+    /// Trampoline function for pthread_spawn compatibility.
+    static void *run_trampoline(void *vpool);
+
+    /// Attempt to spawn a new pthread.
+    pthread_t spawn();
+
+    /// No copying or moving.
+    thread_pool_t(const thread_pool_t &) = delete;
+    thread_pool_t(thread_pool_t &&) = delete;
+    void operator=(const thread_pool_t &) = delete;
+    void operator=(thread_pool_t &&) = delete;
 };
 
 /// The thread pool for "iothreads" which are used to lift I/O off of the main thread.
@@ -145,16 +171,14 @@ static const notify_pipes_t &get_notify_pipes() {
 
 /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
 /// reducing the active thread count.
-static maybe_t<work_request_t> iothread_dequeue_work_or_commit_to_exit() {
-    auto &pool = s_io_thread_pool;
-    auto data = pool.data.acquire();
-
+maybe_t<work_request_t> thread_pool_t::dequeue_work_or_commit_to_exit() {
+    auto data = this->req_data.acquire();
     while (data->request_queue.empty()) {
         bool give_up = true;
-        if (!data->drain && data->total_threads == pool.soft_min_threads) {
+        if (!data->drain && data->total_threads == this->soft_min_threads) {
             // If we exit, it will drop below the soft min. So wait for a while before giving up.
             data->waiting_threads += 1;
-            auto wait_ret = pool.queue_cond.wait_for(
+            auto wait_ret = this->queue_cond.wait_for(
                 data.get_lock(), std::chrono::milliseconds(IO_WAIT_FOR_WORK_DURATION_MS));
             data->waiting_threads -= 1;
             give_up = (wait_ret == std::cv_status::timeout);
@@ -178,10 +202,8 @@ static void enqueue_thread_result(work_request_t req) {
 
 static void *this_thread() { return (void *)(intptr_t)pthread_self(); }
 
-/// The function that does thread work.
-static void *iothread_worker(void *unused) {
-    UNUSED(unused);
-    while (auto req = iothread_dequeue_work_or_commit_to_exit()) {
+void *thread_pool_t::run() {
+    while (auto req = dequeue_work_or_commit_to_exit()) {
         FLOGF(iothread, L"pthread %p got work", this_thread());
 
         // Perform the work
@@ -201,24 +223,27 @@ static void *iothread_worker(void *unused) {
     return nullptr;
 }
 
+void *thread_pool_t::run_trampoline(void *pool) {
+    assert(pool && "No thread pool given");
+    return static_cast<thread_pool_t *>(pool)->run();
+}
+
 /// Spawn another thread. No lock is held when this is called.
-static pthread_t iothread_spawn() {
+pthread_t thread_pool_t::spawn() {
     // 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;
-    if (make_pthread(&thread, iothread_worker, nullptr)) {
+    if (make_pthread(&thread, run_trampoline, static_cast<void *>(this))) {
         // We will never join this thread.
         DIE_ON_FAILURE(pthread_detach(thread));
     }
     return thread;
 }
 
-int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
-    ASSERT_IS_MAIN_THREAD();
-    ASSERT_IS_NOT_FORKED_CHILD();
-    assert(func && "Null function");
-
+int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion) {
+    assert(func && "Missing function");
+    // Note we permit an empty completion.
     struct work_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
     auto &pool = s_io_thread_pool;
@@ -226,7 +251,7 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
     bool wakeup_thread = false;
     {
         // Lock around a local region.
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         data->request_queue.push(std::move(req));
         if (data->drain) {
             // Do nothing here.
@@ -246,12 +271,22 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
         pool.queue_cond.notify_one();
     }
     if (spawn_new_thread) {
-        pthread_t pt = iothread_spawn();
-        FLOGF(iothread, L"pthread %p spawned", pt);
+        if (pthread_t pt = this->spawn()) {
+            FLOGF(iothread, L"pthread %p spawned", pt);
+        } else {
+            // We failed to spawn a thread; decrement the thread count.
+            pool.req_data.acquire()->total_threads -= 1;
+        }
     }
     return local_thread_count;
 }
 
+int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
+    ASSERT_IS_MAIN_THREAD();
+    ASSERT_IS_NOT_FORKED_CHILD();
+    return s_io_thread_pool.perform(std::move(func), std::move(completion));
+}
+
 int iothread_port() { return get_notify_pipes().read; }
 
 void iothread_service_completion() {
@@ -292,7 +327,7 @@ int iothread_drain_all() {
     auto &pool = s_io_thread_pool;
     // Set the drain flag.
     {
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         assert(!data->drain && "Should not be draining already");
         data->drain = true;
         thread_count = data->total_threads;
@@ -304,7 +339,7 @@ int iothread_drain_all() {
     double now = timef();
 
     // Nasty polling via select().
-    while (pool.data.acquire()->total_threads > 0) {
+    while (pool.req_data.acquire()->total_threads > 0) {
         if (iothread_wait_for_pending_completions(1000)) {
             iothread_service_completion();
         }
@@ -314,7 +349,7 @@ int iothread_drain_all() {
     // Even though we released the lock, nobody should have added a new thread while the drain flag
     // is set.
     {
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         assert(data->total_threads == 0 && "Should be no threads");
         assert(data->drain && "Should be draining");
         data->drain = false;

From 9023c2187f31497abfa1b10d2e5941ae332194b4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 14:11:07 -0800
Subject: [PATCH 1245/1732] Make shutdown_fillthread_ a relaxed_atomic_bool_t

Reduces the noisiness of working with it.
---
 src/io.cpp | 4 ++--
 src/io.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 8ba416975..ec92a9751 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -95,7 +95,7 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
         // allowing it to time out. Note the typical case is that the fd will be closed, in which
         // case select will return immediately.
         if (!readable) {
-            shutdown = this->shutdown_fillthread_.load(std::memory_order_relaxed);
+            shutdown = this->shutdown_fillthread_;
         }
 
         if (readable || shutdown) {
@@ -150,7 +150,7 @@ void io_buffer_t::begin_background_fillthread(autoclose_fd_t fd) {
 void io_buffer_t::complete_background_fillthread() {
     ASSERT_IS_MAIN_THREAD();
     assert(fillthread_ && "Should have a fillthread");
-    shutdown_fillthread_.store(true, std::memory_order_relaxed);
+    shutdown_fillthread_ = true;
     void *ignored = nullptr;
     int err = pthread_join(*fillthread_, &ignored);
     DIE_ON_FAILURE(err);
diff --git a/src/io.h b/src/io.h
index 3d114510d..0e01b1282 100644
--- a/src/io.h
+++ b/src/io.h
@@ -13,6 +13,7 @@
 
 #include "common.h"
 #include "env.h"
+#include "global_safety.h"
 #include "maybe.h"
 
 using std::shared_ptr;
@@ -276,7 +277,7 @@ class io_buffer_t {
     separated_buffer_t<std::string> buffer_;
 
     /// Atomic flag indicating our fillthread should shut down.
-    std::atomic<bool> shutdown_fillthread_{false};
+    relaxed_atomic_bool_t shutdown_fillthread_{false};
 
     /// The background fillthread itself, if any.
     maybe_t<pthread_t> fillthread_{};

From 80a4898e7592d372c1216a1e05d08d15dbdbec6d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 23:35:34 -0800
Subject: [PATCH 1246/1732] Revert "Migrate some iothread functions into member
 functions of thread_pool_t"

This reverts commit 22230a1a0ddddc62732418773f3741073988df96.
Also 9d7d70c204073fb7fcfc393b8b78821b905e6817

There's some subtle bug here, needs to be tracked down and tested.
---
 src/iothread.cpp | 83 ++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 59 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 035c5c482..e13af9900 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -86,7 +86,7 @@ struct thread_pool_t {
     };
 
     /// Data which needs to be atomically accessed.
-    owning_lock<data_t> req_data{};
+    owning_lock<data_t> data{};
 
     /// The condition variable used to wake up waiting threads.
     /// Note this is tied to data's lock.
@@ -103,32 +103,6 @@ struct thread_pool_t {
         assert(soft_min_threads >= 0 && max_threads >= 1 && soft_min_threads <= max_threads &&
                "Invalid thread min and max");
     }
-
-    /// Enqueue a new work item onto the thread pool.
-    /// The function \p func will execute in one of the pool's threads.
-    /// \p completion will run on the main thread, if it is not missing.
-    int perform(void_function_t &&func, void_function_t &&completion);
-
-   private:
-    /// The worker loop for this thread.
-    void *run();
-
-    /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
-    /// reducing the active thread count.
-    /// This runs in the background thread.
-    maybe_t<work_request_t> dequeue_work_or_commit_to_exit();
-
-    /// Trampoline function for pthread_spawn compatibility.
-    static void *run_trampoline(void *vpool);
-
-    /// Attempt to spawn a new pthread.
-    pthread_t spawn();
-
-    /// No copying or moving.
-    thread_pool_t(const thread_pool_t &) = delete;
-    thread_pool_t(thread_pool_t &&) = delete;
-    void operator=(const thread_pool_t &) = delete;
-    void operator=(thread_pool_t &&) = delete;
 };
 
 /// The thread pool for "iothreads" which are used to lift I/O off of the main thread.
@@ -171,14 +145,16 @@ static const notify_pipes_t &get_notify_pipes() {
 
 /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
 /// reducing the active thread count.
-maybe_t<work_request_t> thread_pool_t::dequeue_work_or_commit_to_exit() {
-    auto data = this->req_data.acquire();
+static maybe_t<work_request_t> iothread_dequeue_work_or_commit_to_exit() {
+    auto &pool = s_io_thread_pool;
+    auto data = pool.data.acquire();
+
     while (data->request_queue.empty()) {
         bool give_up = true;
-        if (!data->drain && data->total_threads == this->soft_min_threads) {
+        if (!data->drain && data->total_threads == pool.soft_min_threads) {
             // If we exit, it will drop below the soft min. So wait for a while before giving up.
             data->waiting_threads += 1;
-            auto wait_ret = this->queue_cond.wait_for(
+            auto wait_ret = pool.queue_cond.wait_for(
                 data.get_lock(), std::chrono::milliseconds(IO_WAIT_FOR_WORK_DURATION_MS));
             data->waiting_threads -= 1;
             give_up = (wait_ret == std::cv_status::timeout);
@@ -202,8 +178,10 @@ static void enqueue_thread_result(work_request_t req) {
 
 static void *this_thread() { return (void *)(intptr_t)pthread_self(); }
 
-void *thread_pool_t::run() {
-    while (auto req = dequeue_work_or_commit_to_exit()) {
+/// The function that does thread work.
+static void *iothread_worker(void *unused) {
+    UNUSED(unused);
+    while (auto req = iothread_dequeue_work_or_commit_to_exit()) {
         FLOGF(iothread, L"pthread %p got work", this_thread());
 
         // Perform the work
@@ -223,27 +201,24 @@ void *thread_pool_t::run() {
     return nullptr;
 }
 
-void *thread_pool_t::run_trampoline(void *pool) {
-    assert(pool && "No thread pool given");
-    return static_cast<thread_pool_t *>(pool)->run();
-}
-
 /// Spawn another thread. No lock is held when this is called.
-pthread_t thread_pool_t::spawn() {
+static pthread_t iothread_spawn() {
     // 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;
-    if (make_pthread(&thread, run_trampoline, static_cast<void *>(this))) {
+    if (make_pthread(&thread, iothread_worker, nullptr)) {
         // We will never join this thread.
         DIE_ON_FAILURE(pthread_detach(thread));
     }
     return thread;
 }
 
-int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion) {
-    assert(func && "Missing function");
-    // Note we permit an empty completion.
+int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
+    ASSERT_IS_MAIN_THREAD();
+    ASSERT_IS_NOT_FORKED_CHILD();
+    assert(func && "Null function");
+
     struct work_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
     auto &pool = s_io_thread_pool;
@@ -251,7 +226,7 @@ int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion)
     bool wakeup_thread = false;
     {
         // Lock around a local region.
-        auto data = pool.req_data.acquire();
+        auto data = pool.data.acquire();
         data->request_queue.push(std::move(req));
         if (data->drain) {
             // Do nothing here.
@@ -271,22 +246,12 @@ int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion)
         pool.queue_cond.notify_one();
     }
     if (spawn_new_thread) {
-        if (pthread_t pt = this->spawn()) {
-            FLOGF(iothread, L"pthread %p spawned", pt);
-        } else {
-            // We failed to spawn a thread; decrement the thread count.
-            pool.req_data.acquire()->total_threads -= 1;
-        }
+        pthread_t pt = iothread_spawn();
+        FLOGF(iothread, L"pthread %p spawned", pt);
     }
     return local_thread_count;
 }
 
-int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
-    ASSERT_IS_MAIN_THREAD();
-    ASSERT_IS_NOT_FORKED_CHILD();
-    return s_io_thread_pool.perform(std::move(func), std::move(completion));
-}
-
 int iothread_port() { return get_notify_pipes().read; }
 
 void iothread_service_completion() {
@@ -327,7 +292,7 @@ int iothread_drain_all() {
     auto &pool = s_io_thread_pool;
     // Set the drain flag.
     {
-        auto data = pool.req_data.acquire();
+        auto data = pool.data.acquire();
         assert(!data->drain && "Should not be draining already");
         data->drain = true;
         thread_count = data->total_threads;
@@ -339,7 +304,7 @@ int iothread_drain_all() {
     double now = timef();
 
     // Nasty polling via select().
-    while (pool.req_data.acquire()->total_threads > 0) {
+    while (pool.data.acquire()->total_threads > 0) {
         if (iothread_wait_for_pending_completions(1000)) {
             iothread_service_completion();
         }
@@ -349,7 +314,7 @@ int iothread_drain_all() {
     // Even though we released the lock, nobody should have added a new thread while the drain flag
     // is set.
     {
-        auto data = pool.req_data.acquire();
+        auto data = pool.data.acquire();
         assert(data->total_threads == 0 && "Should be no threads");
         assert(data->drain && "Should be draining");
         data->drain = false;

From 3b0f642de9fef3bac3ef98d8bcecdbdfb81e945b Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 24 Nov 2019 12:40:03 -0800
Subject: [PATCH 1247/1732] builtin-math: Use normal C trunc

uClibc-ng does not expose C++11 math
functions to the std namespace, breaking
compilation. This is fine as the argument
type is double.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_math.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 611c29141..f8e579db8 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -163,7 +163,7 @@ static wcstring format_double(double v, const math_cmd_opts_t &opts) {
     // As a special-case, a scale of 0 means to truncate to an integer
     // instead of rounding.
     if (opts.scale == 0) {
-        v = std::trunc(v);
+        v = trunc(v);
         return format_string(L"%.*f", opts.scale, v);
     }
 

From 7d5b44e828d322b6dccda16ae9c32ff52d4b4914 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 23 Oct 2019 03:13:29 +0200
Subject: [PATCH 1248/1732] Support FOO=bar syntax for passing variables to
 individual commands

This adds initial support for statements with prefixed variable assignments.
Statments like this are supported:

a=1 b=$a echo $b        # outputs 1

Just like in other shells, the left-hand side of each assignment must
be a valid variable identifier (no quoting/escaping).  Array indexing
(PATH[1]=/bin ls $PATH) is *not* yet supported, but can be added fairly
easily.

The right hand side may be any valid string token, like a command
substitution, or a brace expansion.

Since `a=* foo` is equivalent to `begin set -lx a *; foo; end`,
the assignment, like `set`, uses nullglob behavior, e.g. below command
can safely be used to check if a directory is empty.

x=/nothing/{,.}* test (count $x) -eq 0

Generic file completion is done after the equal sign, so for example
pressing tab after something like `HOME=/` completes files in the
root directory
Subcommand completion works, so something like
`GIT_DIR=repo.git and command git ` correctly calls git completions
(but the git completion does not use the variable as of now).

The variable assignment is highlighted like an argument.

Closes #6048
---
 CHANGELOG.md                          |   1 +
 sphinx_doc_src/cmds/set.rst           |   6 +
 sphinx_doc_src/faq.rst                |  20 +---
 src/complete.cpp                      |  32 ++++-
 src/exec.cpp                          |  11 ++
 src/fish_tests.cpp                    |   1 +
 src/highlight.cpp                     |   8 ++
 src/parse_constants.h                 |   7 +-
 src/parse_execution.cpp               | 162 ++++++++++++++++----------
 src/parse_execution.h                 |   8 +-
 src/parse_grammar.h                   |  22 +++-
 src/parse_grammar_elements.inc        |   2 +
 src/parse_productions.cpp             |  10 ++
 src/parse_tree.cpp                    |  21 ++++
 src/parse_tree.h                      |   4 +
 src/parser.cpp                        |   9 ++
 src/parser.h                          |   2 +
 src/proc.h                            |   7 ++
 src/tnode.cpp                         |  11 +-
 src/tnode.h                           |   6 +
 tests/checks/variable-assignment.fish |  78 +++++++++++++
 21 files changed, 335 insertions(+), 93 deletions(-)
 create mode 100644 tests/checks/variable-assignment.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ab96b43..baa41e918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
 - New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
+- The `VAR=val cmd` syntax can now be used to run a command in a modified environment (#6287).
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
diff --git a/sphinx_doc_src/cmds/set.rst b/sphinx_doc_src/cmds/set.rst
index f215ba0c9..2988b5145 100644
--- a/sphinx_doc_src/cmds/set.rst
+++ b/sphinx_doc_src/cmds/set.rst
@@ -119,6 +119,12 @@ Examples
         echo "Python is at $python_path"
     end
 
+    # Like other shells, fish 3.1 supports this syntax for passing a variable to just one command:
+    # Run fish with a temporary home directory.
+    HOME=(mktemp -d) fish
+    # Which is essentially the same as:
+    begin; set -lx HOME (mktemp -d); fish; end
+
 Notes
 -----
 
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index eafb53c44..ea601c131 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -8,6 +8,10 @@ Use the :ref:`set <cmd-set>` command::
     set -x key value
     set -e key
 
+Since fish 3.1 you can set an environment variable for just one command using the ``key=value some command`` syntax, like in other shells.  The two lines below behave identically - unlike other shells, fish will output ``value`` both times::
+
+    key=value echo $key
+    begin; set -lx key value; echo $key; end
 
 How do I run a command every login? What's fish's equivalent to .bashrc?
 ------------------------------------------------------------------------
@@ -95,22 +99,6 @@ If you are just interested in success or failure, you can run the command direct
 
 See the documentation for :ref:`test <cmd-test>` and :ref:`if <cmd-if>` for more information.
 
-How do I set an environment variable for just one command?
-----------------------------------------------------------
-``SOME_VAR=1 command`` produces an error: ``Unknown command "SOME_VAR=1"``.
-
-Use the ``env`` command.
-
-``env SOME_VAR=1 command``
-
-You can also declare a local variable in a block::
-
-    begin
-        set -lx SOME_VAR 1
-        command
-    end
-
-
 How do I check whether a variable is defined?
 ---------------------------------------------
 
diff --git a/src/complete.cpp b/src/complete.cpp
index bda719620..0d765e2f3 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1511,6 +1511,11 @@ void completer_t::perform() {
     }
 
     if (cmd_tok.location_in_or_at_end_of_source_range(cursor_pos)) {
+        maybe_t<size_t> equal_sign_pos = variable_assignment_equals_pos(current_token);
+        if (equal_sign_pos) {
+            complete_param_expand(current_token.substr(*equal_sign_pos + 1), true /* do_file */);
+            return;
+        }
         // Complete command filename.
         complete_cmd(current_token);
         complete_abbr(current_token);
@@ -1570,9 +1575,30 @@ void completer_t::perform() {
                 if (wants_transient) {
                     parser->libdata().transient_commandlines.push_back(cmdline);
                 }
-                // Now invoke any custom completions for this command.
-                if (!complete_param(cmd, previous_argument_unescape, current_argument_unescape,
-                                    !had_ddash)) {
+                bool is_variable_assignment = bool(variable_assignment_equals_pos(cmd));
+                if (is_variable_assignment && parser) {
+                    // To avoid issues like #2705 we complete commands starting with variable
+                    // assignments by recursively calling complete for the command suffix
+                    // without the first variable assignment token.
+                    wcstring unaliased_cmd;
+                    if (parser->libdata().transient_commandlines.empty()) {
+                        unaliased_cmd = cmdline;
+                    } else {
+                        unaliased_cmd = parser->libdata().transient_commandlines.back();
+                    }
+                    tokenizer_t tok(unaliased_cmd.c_str(), TOK_ACCEPT_UNFINISHED);
+                    maybe_t<tok_t> cmd_tok = tok.next();
+                    assert(cmd_tok);
+                    unaliased_cmd = unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
+                    parser->libdata().transient_commandlines.push_back(unaliased_cmd);
+                    cleanup_t remove_transient([&] { parser->libdata().transient_commandlines.pop_back(); });
+                    std::vector<completion_t> comp;
+                    complete(unaliased_cmd, &comp,
+                             completion_request_t::fuzzy_match, parser->vars(), parser->shared());
+                    this->completions.insert(completions.end(), comp.begin(), comp.end());
+                    do_file = false;
+                } else if (!complete_param(cmd, previous_argument_unescape, current_argument_unescape,
+                                    !had_ddash)) { // Invoke any custom completions for this command.
                     do_file = false;
                 }
                 if (wants_transient) {
diff --git a/src/exec.cpp b/src/exec.cpp
index a6596b6f8..fcc194341 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -961,6 +961,17 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
         parser.libdata().exec_count++;
     }
 
+    const block_t *block = nullptr;
+    cleanup_t pop_block([&]() {
+        if (block) parser.pop_block(block);
+    });
+    if (!p->variable_assignments.empty()) {
+        block = parser.push_block(block_t::variable_assignment_block());
+    }
+    for (const auto &assignment : p->variable_assignments) {
+        parser.vars().set(assignment.variable_name, ENV_LOCAL | ENV_EXPORT, assignment.values);
+    }
+
     // Execute the process.
     p->check_generations_before_launch();
     switch (p->type) {
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index f3728e9b0..d10aef7cb 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -4626,6 +4626,7 @@ static void test_highlighting() {
     });
 
     highlight_tests.push_back({
+        {L"HOME=.", highlight_role_t::param},
         {L"false", highlight_role_t::command},
         {L"|&", highlight_role_t::error},
         {L"true", highlight_role_t::command},
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 529745ea9..0972072ad 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1200,6 +1200,12 @@ highlighter_t::color_array_t highlighter_t::highlight() {
                 this->color_node(node, highlight_role_t::operat);
                 break;
 
+            case symbol_variable_assignment: {
+                tnode_t<g::variable_assignment> variable_assignment = {&parse_tree, &node};
+                this->color_argument(variable_assignment.child<0>());
+                break;
+            }
+
             case parse_token_type_pipe:
             case parse_token_type_background:
             case parse_token_type_end:
@@ -1223,6 +1229,8 @@ highlighter_t::color_array_t highlighter_t::highlight() {
                 if (!this->io_ok) {
                     // We cannot check if the command is invalid, so just assume it's valid.
                     is_valid_cmd = true;
+                } else if (variable_assignment_equals_pos(*cmd)) {
+                    is_valid_cmd = true;
                 } else {
                     wcstring expanded_cmd;
                     // Check to see if the command is valid.
diff --git a/src/parse_constants.h b/src/parse_constants.h
index af171a1ba..902ba92a0 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -40,6 +40,8 @@ enum parse_token_type_t : uint8_t {
     symbol_not_statement,
     symbol_decorated_statement,
     symbol_plain_statement,
+    symbol_variable_assignment,
+    symbol_variable_assignments,
     symbol_arguments_or_redirections_list,
     symbol_andor_job_list,
     symbol_argument_list,
@@ -277,11 +279,6 @@ void parse_error_offset_source_start(parse_error_list_t *errors, size_t amt);
 /// Error issued on $.
 #define ERROR_NO_VAR_NAME _(L"Expected a variable name after this $.")
 
-/// Error on foo=bar.
-#define ERROR_BAD_EQUALS_IN_COMMAND5                                                        \
-    _(L"Unsupported use of '='. To run '%ls' with a modified environment, please use 'env " \
-      L"%ls=%ls %ls%ls'")
-
 /// Error message for Posix-style assignment: foo=bar.
 #define ERROR_BAD_COMMAND_ASSIGN_ERR_MSG \
     _(L"Unsupported use of '='. In fish, please use 'set %ls %ls'.")
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 0bdd90133..5fa50b16d 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -123,8 +123,8 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
     // Get the list of plain statements.
     // Ignore statements with decorations like 'builtin' or 'command', since those
     // are not infinite recursion. In particular that is what enables 'wrapper functions'.
-    tnode_t<g::statement> statement = first_job.child<0>();
-    tnode_t<g::job_continuation> continuation = first_job.child<1>();
+    tnode_t<g::statement> statement = first_job.child<1>();
+    tnode_t<g::job_continuation> continuation = first_job.child<2>();
     const null_environment_t nullenv{};
     while (statement) {
         tnode_t<g::plain_statement> plain_statement =
@@ -207,10 +207,10 @@ parse_execution_context_t::cancellation_reason(const block_t *block) const {
 
 /// Return whether the job contains a single statement, of block type, with no redirections.
 bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) const {
-    tnode_t<g::statement> statement = job_node.child<0>();
+    tnode_t<g::statement> statement = job_node.child<1>();
 
     // Must be no pipes.
-    if (job_node.child<1>().try_get_child<g::tok_pipe, 0>()) {
+    if (job_node.child<2>().try_get_child<g::tok_pipe, 0>()) {
         return false;
     }
 
@@ -713,27 +713,7 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     // status to 127, which is the standard number used by other shells like bash and zsh.
 
     const wchar_t *const cmd = cmd_str.c_str();
-    const wchar_t *const equals_ptr = std::wcschr(cmd, L'=');
-    if (equals_ptr != NULL) {
-        // Try to figure out if this is a pure variable assignment (foo=bar), or if this appears to
-        // be running a command (foo=bar ruby...).
-        const wcstring name_str = wcstring(cmd, equals_ptr - cmd);  // variable name, up to the =
-        const wcstring val_str = wcstring(equals_ptr + 1);          // variable value, past the =
-
-        auto args = statement.descendants<g::argument>(1);
-        if (!args.empty()) {
-            const wcstring argument = get_source(args.at(0));
-
-            // Looks like a command.
-            this->report_error(statement, ERROR_BAD_EQUALS_IN_COMMAND5, argument.c_str(),
-                               name_str.c_str(), val_str.c_str(), argument.c_str(),
-                               get_ellipsis_str());
-        } else {
-            wcstring assigned_val = reconstruct_orig_str(val_str);
-            this->report_error(statement, ERROR_BAD_COMMAND_ASSIGN_ERR_MSG, name_str.c_str(),
-                               assigned_val.c_str());
-        }
-    } else if (err_code != ENOENT) {
+    if (err_code != ENOENT) {
         this->report_error(statement, _(L"The file '%ls' is not executable by this user"), cmd);
     } else {
         // Handle unrecognized commands with standard command not found handler that can make better
@@ -1049,8 +1029,9 @@ parse_execution_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
-    return this->populate_job_process(job, proc,
-                                      not_statement.require_get_child<g::statement, 1>());
+    return this->populate_job_process(
+        job, proc, not_statement.require_get_child<g::statement, 2>(),
+        not_statement.require_get_child<g::variable_assignments, 1>());
 }
 
 template <typename Type>
@@ -1080,12 +1061,65 @@ parse_execution_result_t parse_execution_context_t::populate_block_process(
     return parse_execution_success;
 }
 
+parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
+    process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
+    const block_t **block) {
+    variable_assignment_node_list_t assignment_list =
+        get_variable_assignment_nodes(variable_assignments);
+    if (assignment_list.empty()) return parse_execution_success;
+    *block = parser->push_block(block_t::variable_assignment_block());
+    for (const auto &variable_assignment : assignment_list) {
+        const wcstring &source = variable_assignment.get_source(pstree->src);
+        auto equals_pos = variable_assignment_equals_pos(source);
+        assert(equals_pos);
+        const wcstring &variable_name = source.substr(0, *equals_pos);
+        const wcstring expression = source.substr(*equals_pos + 1);
+        std::vector<completion_t> expression_expanded;
+        parse_error_list_t errors;
+        // TODO this is mostly copied from expand_arguments_from_nodes, maybe extract to function
+        auto expand_ret =
+            expand_string(expression, &expression_expanded, expand_flag::no_descriptions,
+                          parser->vars(), parser->shared(), &errors);
+        parse_error_offset_source_start(
+            &errors, variable_assignment.source_range()->start + *equals_pos + 1);
+        switch (expand_ret) {
+            case expand_result_t::error: {
+                this->report_errors(errors);
+                return parse_execution_errored;
+            }
+            case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
+            case expand_result_t::wildcard_match:
+            case expand_result_t::ok: {
+                break;
+            }
+            default: {
+                DIE("unexpected expand_string() return value");
+                break;
+            }
+        }
+        wcstring_list_t vals;
+        for (auto &completion : expression_expanded) {
+            vals.emplace_back(std::move(completion.completion));
+        }
+        if (proc) proc->variable_assignments.push_back({variable_name, vals});
+        parser->vars().set(std::move(variable_name), ENV_LOCAL | ENV_EXPORT, std::move(vals));
+    }
+    return parse_execution_success;
+}
+
 parse_execution_result_t parse_execution_context_t::populate_job_process(
-    job_t *job, process_t *proc, tnode_t<grammar::statement> statement) {
+    job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
+    tnode_t<grammar::variable_assignments> variable_assignments) {
     // Get the "specific statement" which is boolean / block / if / switch / decorated.
     const parse_node_t &specific_statement = statement.get_child_node<0>();
 
-    parse_execution_result_t result = parse_execution_success;
+    const block_t *block = nullptr;
+    parse_execution_result_t result =
+        this->apply_variable_assignments(proc, variable_assignments, &block);
+    cleanup_t scope([&]() {
+        if (block) parser->pop_block(block);
+    });
+    if (result != parse_execution_success) return parse_execution_errored;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1131,25 +1165,25 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
 
     // We are going to construct process_t structures for every statement in the job. Get the first
     // statement.
-    tnode_t<g::statement> statement = job_node.child<0>();
-    assert(statement);
-
-    parse_execution_result_t result = parse_execution_success;
+    tnode_t<g::statement> statement = job_node.child<1>();
+    tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
 
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
-    result = this->populate_job_process(j, processes.back().get(), statement);
+    parse_execution_result_t result =
+        this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
     // terminal (empty) job continuation.
-    tnode_t<g::job_continuation> job_cont = job_node.child<1>();
+    tnode_t<g::job_continuation> job_cont = job_node.child<2>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
         if (result != parse_execution_success) {
             break;
         }
-        tnode_t<g::statement> statement = job_cont.require_get_child<g::statement, 2>();
+        auto variable_assignments = job_cont.require_get_child<g::variable_assignments, 2>();
+        auto statement = job_cont.require_get_child<g::statement, 3>();
 
         // Handle the pipe, whose fd may not be the obvious stdout.
         auto parsed_pipe = pipe_or_redir_t::from_string(get_source(pipe));
@@ -1169,10 +1203,11 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
 
         // Store the new process (and maybe with an error).
         processes.emplace_back(new process_t());
-        result = this->populate_job_process(j, processes.back().get(), statement);
+        result =
+            this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
         // Get the next continuation.
-        job_cont = job_cont.require_get_child<g::job_continuation, 3>();
+        job_cont = job_cont.require_get_child<g::job_continuation, 4>();
         assert(job_cont);
     }
 
@@ -1231,30 +1266,39 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     // However, if there are no redirections, then we can just jump into the block directly, which
     // is significantly faster.
     if (job_is_simple_block(job_node)) {
-        parse_execution_result_t result = parse_execution_success;
+        tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
+        const block_t *block = nullptr;
+        parse_execution_result_t result =
+            this->apply_variable_assignments(nullptr, variable_assignments, &block);
+        cleanup_t scope([&]() {
+            if (block) parser->pop_block(block);
+        });
 
-        tnode_t<g::statement> statement = job_node.child<0>();
+        tnode_t<g::statement> statement = job_node.child<1>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
-        switch (specific_statement.type) {
-            case symbol_block_statement: {
-                result =
-                    this->run_block_statement({&tree(), &specific_statement}, associated_block);
-                break;
-            }
-            case symbol_if_statement: {
-                result = this->run_if_statement({&tree(), &specific_statement}, associated_block);
-                break;
-            }
-            case symbol_switch_statement: {
-                result = this->run_switch_statement({&tree(), &specific_statement});
-                break;
-            }
-            default: {
-                // Other types should be impossible due to the
-                // specific_statement_type_is_redirectable_block check.
-                PARSER_DIE();
-                break;
+        if (result == parse_execution_success) {
+            switch (specific_statement.type) {
+                case symbol_block_statement: {
+                    result =
+                        this->run_block_statement({&tree(), &specific_statement}, associated_block);
+                    break;
+                }
+                case symbol_if_statement: {
+                    result =
+                        this->run_if_statement({&tree(), &specific_statement}, associated_block);
+                    break;
+                }
+                case symbol_switch_statement: {
+                    result = this->run_switch_statement({&tree(), &specific_statement});
+                    break;
+                }
+                default: {
+                    // Other types should be impossible due to the
+                    // specific_statement_type_is_redirectable_block check.
+                    PARSER_DIE();
+                    break;
+                }
             }
         }
 
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 4d4b8f725..c5abcab85 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -87,10 +87,14 @@ class parse_execution_context_t {
 
     enum process_type_t process_type_for_command(tnode_t<grammar::plain_statement> statement,
                                                  const wcstring &cmd) const;
+    parse_execution_result_t apply_variable_assignments(
+        process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
+        const block_t **block);
 
     // These create process_t structures from statements.
-    parse_execution_result_t populate_job_process(job_t *job, process_t *proc,
-                                                  tnode_t<grammar::statement> statement);
+    parse_execution_result_t populate_job_process(
+        job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
+        tnode_t<grammar::variable_assignments> variable_assignments);
     parse_execution_result_t populate_not_process(job_t *job, process_t *proc,
                                                   tnode_t<grammar::not_statement> not_statement);
     parse_execution_result_t populate_plain_process(job_t *job, process_t *proc,
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index 0a6e5bcc4..1e0a5e5a2 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -228,15 +228,27 @@ DEF_ALT(job_conjunction_continuation) {
 // like if statements, where we require a command). To represent "non-empty", we require a
 // statement, followed by a possibly empty job_continuation, and then optionally a background
 // specifier '&'
-DEF(job) produces_sequence<statement, job_continuation, optional_background>{BODY(job)};
+DEF(job)
+produces_sequence<variable_assignments, statement, job_continuation, optional_background>{
+    BODY(job)};
 
 DEF_ALT(job_continuation) {
-    using piped = seq<tok_pipe, optional_newlines, statement, job_continuation>;
+    using piped =
+        seq<tok_pipe, optional_newlines, variable_assignments, statement, job_continuation>;
     using empty = grammar::empty;
     ALT_BODY(job_continuation, piped, empty);
 };
 
-// A statement is a normal command, or an if / while / not etc.
+// A list of assignments like HOME=$PWD
+DEF_ALT(variable_assignments) {
+    using empty = grammar::empty;
+    using var = seq<variable_assignment, variable_assignments>;
+    ALT_BODY(variable_assignments, empty, var);
+};
+// A string token like VAR=value
+DEF(variable_assignment) produces_single<tok_string>{BODY(variable_assignment)};
+
+// A statement is a normal command, or an if / while / and etc
 DEF_ALT(statement) {
     using nots = single<not_statement>;
     using block = single<block_statement>;
@@ -309,8 +321,8 @@ produces_sequence<keyword<parse_keyword_function>, argument, argument_list, tok_
     BODY(function_header)};
 
 DEF_ALT(not_statement) {
-    using nots = seq<keyword<parse_keyword_not>, statement>;
-    using exclams = seq<keyword<parse_keyword_exclam>, statement>;
+    using nots = seq<keyword<parse_keyword_not>, variable_assignments, statement>;
+    using exclams = seq<keyword<parse_keyword_exclam>, variable_assignments, statement>;
     ALT_BODY(not_statement, nots, exclams);
 };
 
diff --git a/src/parse_grammar_elements.inc b/src/parse_grammar_elements.inc
index 79339b6cb..4c88d7f82 100644
--- a/src/parse_grammar_elements.inc
+++ b/src/parse_grammar_elements.inc
@@ -22,6 +22,8 @@ ELEM(function_header)
 ELEM(not_statement)
 ELEM(andor_job_list)
 ELEM(decorated_statement)
+ELEM(variable_assignment)
+ELEM(variable_assignments)
 ELEM(plain_statement)
 ELEM(argument_list)
 ELEM(arguments_or_redirections_list)
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 05fc80cee..99cf0ffba 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -314,6 +314,16 @@ RESOLVE(block_header) {
     }
 }
 
+RESOLVE(variable_assignments) {
+    UNUSED(token2);
+    UNUSED(out_tag);
+    if (token1.may_be_variable_assignment) {
+        assert(token1.type == parse_token_type_string);
+        return production_for<var>();
+    }
+    return production_for<empty>();
+}
+
 RESOLVE(decorated_statement) {
     // and/or are typically parsed in job_conjunction at the beginning of a job
     // However they may be reached here through e.g. true && and false.
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 93fc83dab..56c38b707 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -1007,6 +1007,26 @@ static inline bool is_help_argument(const wcstring &txt) {
     return txt == L"-h" || txt == L"--help";
 }
 
+// Return the location of the equals sign, or npos if the string does
+// not look like a variable assignment like FOO=bar.  The detection
+// works similar as in some POSIX shells: only letters and numbers qre
+// allowed on the left hand side, no quotes or escaping.
+maybe_t<size_t> variable_assignment_equals_pos(const wcstring &txt) {
+    enum { init, has_some_variable_identifier } state = init;
+    // TODO bracket indexing
+    for (size_t i = 0; i < txt.size(); i++) {
+        wchar_t c = txt[i];
+        if (state == init) {
+            if (!valid_var_name_char(c)) return {};
+            state = has_some_variable_identifier;
+        } else {
+            if (c == '=') return {i};
+            if (!valid_var_name_char(c)) return {};
+        }
+    }
+    return {};
+}
+
 /// Return a new parse token, advancing the tokenizer.
 static inline parse_token_t next_parse_token(tokenizer_t *tok, maybe_t<tok_t> *out_token,
                                              wcstring *storage) {
@@ -1028,6 +1048,7 @@ static inline parse_token_t next_parse_token(tokenizer_t *tok, maybe_t<tok_t> *o
     result.is_help_argument = result.has_dash_prefix && is_help_argument(text);
     result.is_newline = (result.type == parse_token_type_end && text == L"\n");
     result.preceding_escaped_nl = token.preceding_escaped_nl;
+    result.may_be_variable_assignment = bool(variable_assignment_equals_pos(text));
 
     // These assertions are totally bogus. Basically our tokenizer works in size_t but we work in
     // uint32_t to save some space. If we have a source file larger than 4 GB, we'll probably just
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 1eb654b72..208f9ad11 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -38,6 +38,7 @@ struct parse_token_t {
     bool is_help_argument{false};      // Hackish: whether the source looks like '-h' or '--help'
     bool is_newline{false};            // Hackish: if TOK_END, whether the source is a newline.
     bool preceding_escaped_nl{false};  // Whether there was an escaped newline preceding this token.
+    bool may_be_variable_assignment{false};  // Hackish: whether this token is a string like FOO=bar
     source_offset_t source_start{SOURCE_OFFSET_INVALID};
     source_offset_t source_length{0};
 
@@ -234,4 +235,7 @@ using parsed_source_ref_t = std::shared_ptr<const parsed_source_t>;
 parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_error_list_t *errors,
                                  parse_token_type_t goal = symbol_job_list);
 
+/// The position of the equal sign in a variable assignment like foo=bar.
+maybe_t<size_t> variable_assignment_equals_pos(const wcstring &txt);
+
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 2357f3794..e8f3d6a13 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -41,6 +41,9 @@ class io_chain_t;
 /// Breakpoint block.
 #define BREAKPOINT_BLOCK N_(L"block created by breakpoint")
 
+/// Variable assignment block.
+#define VARIABLE_ASSIGNMENT_BLOCK N_(L"block created by variable assignment prefixing a command")
+
 /// If block description.
 #define IF_BLOCK N_(L"'if' conditional block")
 
@@ -95,6 +98,7 @@ static const struct block_lookup_entry block_lookup[] = {
     {SOURCE, L"source", SOURCE_BLOCK},
     {EVENT, 0, EVENT_BLOCK},
     {BREAKPOINT, L"breakpoint", BREAKPOINT_BLOCK},
+    {VARIABLE_ASSIGNMENT, L"variable assignment", VARIABLE_ASSIGNMENT_BLOCK},
     {(block_type_t)0, 0, 0}};
 
 // Given a file path, return something nicer. Currently we just "unexpand" tildes.
@@ -789,6 +793,10 @@ wcstring block_t::description() const {
             result.append(L"breakpoint");
             break;
         }
+        case VARIABLE_ASSIGNMENT: {
+            result.append(L"variable_assignment");
+            break;
+        }
     }
 
     if (this->src_lineno >= 0) {
@@ -831,3 +839,4 @@ block_t block_t::scope_block(block_type_t type) {
     return block_t(type);
 }
 block_t block_t::breakpoint_block() { return block_t(BREAKPOINT); }
+block_t block_t::variable_assignment_block() { return block_t(VARIABLE_ASSIGNMENT); }
diff --git a/src/parser.h b/src/parser.h
index 923851b81..5b826e3ae 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -43,6 +43,7 @@ enum block_type_t {
     SOURCE,                   /// Block created by the . (source) builtin
     EVENT,                    /// Block created on event notifier invocation
     BREAKPOINT,               /// Breakpoint block
+    VARIABLE_ASSIGNMENT,      /// Variable assignment before a command
 };
 
 /// Possible states for a loop.
@@ -98,6 +99,7 @@ class block_t {
     static block_t switch_block();
     static block_t scope_block(block_type_t type);
     static block_t breakpoint_block();
+    static block_t variable_assignment_block();
 
     ~block_t();
 };
diff --git a/src/proc.h b/src/proc.h
index 0678a899d..ad498b9f1 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -192,6 +192,13 @@ class process_t {
     parsed_source_ref_t block_node_source{};
     tnode_t<grammar::statement> internal_block_node{};
 
+    struct concrete_assignment {
+        wcstring variable_name;
+        wcstring_list_t values;
+    };
+    /// The expanded variable assignments for this process, as specified by the `a=b cmd` syntax.
+    std::vector<concrete_assignment> variable_assignments;
+
     /// Sets argv.
     void set_argv(const wcstring_list_t &argv) { argv_array.set(argv); }
 
diff --git a/src/tnode.cpp b/src/tnode.cpp
index cc9f84743..b29e82d28 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -90,6 +90,11 @@ std::vector<tnode_t<grammar::comment>> parse_node_tree_t::comment_nodes_for_node
     return result;
 }
 
+variable_assignment_node_list_t get_variable_assignment_nodes(
+    tnode_t<grammar::variable_assignments> list, size_t max) {
+    return list.descendants<grammar::variable_assignment>(max);
+}
+
 maybe_t<wcstring> command_for_plain_statement(tnode_t<grammar::plain_statement> stmt,
                                               const wcstring &src) {
     tnode_t<grammar::tok_string> cmd = stmt.child<0>();
@@ -109,7 +114,7 @@ arguments_node_list_t get_argument_nodes(tnode_t<grammar::arguments_or_redirecti
 }
 
 bool job_node_is_background(tnode_t<grammar::job> job) {
-    tnode_t<grammar::optional_background> bg = job.child<2>();
+    tnode_t<grammar::optional_background> bg = job.child<3>();
     return bg.tag() == parse_background;
 }
 
@@ -139,8 +144,8 @@ pipeline_position_t get_pipeline_position(tnode_t<grammar::statement> st) {
 
     // Check if we're the beginning of a job, and if so, whether that job
     // has a non-empty continuation.
-    tnode_t<job_continuation> jc = st.try_get_parent<job>().child<1>();
-    if (jc.try_get_child<statement, 2>()) {
+    tnode_t<job_continuation> jc = st.try_get_parent<job>().child<2>();
+    if (jc.try_get_child<statement, 3>()) {
         return pipeline_position_t::first;
     }
     return pipeline_position_t::none;
diff --git a/src/tnode.h b/src/tnode.h
index 491541336..b13958b2f 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -218,6 +218,12 @@ tnode_t<Type> parse_node_tree_t::find_child(const parse_node_t &parent) const {
     return tnode_t<Type>(this, &this->find_child(parent, Type::token));
 }
 
+/// Return the arguments under an arguments_list or arguments_or_redirection_list
+/// Do not return more than max.
+using variable_assignment_node_list_t = std::vector<tnode_t<grammar::variable_assignment>>;
+variable_assignment_node_list_t get_variable_assignment_nodes(
+    tnode_t<grammar::variable_assignments>, size_t max = -1);
+
 /// Given a plain statement, get the command from the child node. Returns the command string on
 /// success, none on failure.
 maybe_t<wcstring> command_for_plain_statement(tnode_t<grammar::plain_statement> stmt,
diff --git a/tests/checks/variable-assignment.fish b/tests/checks/variable-assignment.fish
new file mode 100644
index 000000000..1d3b60248
--- /dev/null
+++ b/tests/checks/variable-assignment.fish
@@ -0,0 +1,78 @@
+# RUN: %fish %s
+
+# erase all lowercase variables to make sure they don't break our tests
+for varname in (set -xn | string match -r '^[a-z].*')
+    while set -q $varname
+        set -e $varname
+    end
+end
+
+# CHECK: bar
+foo=bar echo $foo
+
+# CHECK: nil
+set -q foo; or echo nil
+
+# CHECK: lx
+foo=bar set -qlx foo; and echo lx
+
+# CHECK: 3
+a={1, 2, 3} count $a
+
+# CHECK: 1+2+3
+a={1, 2, 3} string join + $a
+
+# CHECK: 1 2 3
+a=(echo 1 2 3) echo $a
+
+# CHECK: a a2
+a=a b={$a}2 echo $a $b
+
+# CHECK: a
+a=a builtin echo $a
+
+# CHECK: 0
+a=failing-glob-* count $a
+
+# CHECK: ''
+a=b true | echo "'$a'"
+
+if a=b true
+    # CHECK: ''
+    echo "'$a'"
+end
+
+# CHECK: b
+not a=b echo $a
+
+# CHECK: b
+a=b not echo $a
+
+# CHECK: b
+a=b not builtin echo $a
+
+# CHECK: /usr/bin:/bin
+xPATH={/usr,}/bin sh -c 'echo $xPATH'
+
+# CHECK: 2
+yPATH=/usr/bin:/bin count $yPATH
+
+# CHECK: b
+a=b begin; true | echo $a; end
+
+# CHECK: b
+a=b if true; echo $a; end
+
+# CHECK: b
+a=b switch x; case x; echo $a; end
+
+complete -c x --erase
+complete -c x -xa arg
+complete -C' a=b x ' # Mind the leading space.
+# CHECK: arg
+alias xalias=x
+complete -C'a=b xalias '
+# CHECK: arg
+alias envxalias='a=b x'
+complete -C'a=b envxalias '
+# CHECK: arg

From 3cf6ebc0e1b5aaa10c4891a4247adab1d2663608 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Mon, 25 Nov 2019 20:03:25 +0900
Subject: [PATCH 1249/1732] Amend typos and grammar errors

---
 build_tools/fish_xgettext.fish              | 2 +-
 build_tools/style.fish                      | 2 +-
 config_cmake.h.in                           | 2 +-
 share/completions/VBoxHeadless.fish         | 2 +-
 share/completions/acpi.fish                 | 2 +-
 share/completions/apt-extracttemplates.fish | 2 +-
 share/completions/bundle.fish               | 2 +-
 share/completions/bzip2.fish                | 2 +-
 share/completions/cowsay.fish               | 2 +-
 share/completions/cowthink.fish             | 2 +-
 share/completions/dhcpcd.fish               | 2 +-
 share/completions/epkginfo.fish             | 2 +-
 share/completions/equery.fish               | 2 +-
 share/completions/feh.fish                  | 2 +-
 share/completions/find.fish                 | 2 +-
 share/completions/fossil.fish               | 2 +-
 share/completions/git.fish                  | 4 ++--
 share/completions/gprof.fish                | 4 ++--
 share/completions/gradle.fish               | 2 +-
 share/completions/ip.fish                   | 2 +-
 share/completions/iw.fish                   | 2 +-
 share/completions/jq.fish                   | 4 ++--
 share/completions/less.fish                 | 2 +-
 share/completions/logkeys.fish              | 2 +-
 share/completions/lsblk.fish                | 2 +-
 share/completions/mkdocs.fish               | 2 +-
 share/completions/mvn.fish                  | 6 +++---
 share/completions/pkg_delete.fish           | 2 +-
 share/completions/quilt.fish                | 2 +-
 share/completions/s3cmd.fish                | 2 +-
 share/completions/sfdx.fish                 | 2 +-
 share/completions/stat.fish                 | 2 +-
 share/completions/uniq.fish                 | 2 +-
 share/completions/valgrind.fish             | 2 +-
 share/completions/vim.fish                  | 2 +-
 share/completions/zpool.fish                | 2 +-
 src/builtin.cpp                             | 2 +-
 src/builtin_printf.cpp                      | 2 +-
 src/common.cpp                              | 2 +-
 src/common.h                                | 2 +-
 src/complete.h                              | 2 +-
 src/expand.cpp                              | 2 +-
 src/expand.h                                | 4 ++--
 src/fallback.h                              | 2 +-
 src/highlight.h                             | 2 +-
 src/history.cpp                             | 2 +-
 src/input.cpp                               | 2 +-
 src/iothread.h                              | 4 ++--
 src/pager.h                                 | 2 +-
 src/parse_util.cpp                          | 2 +-
 src/parse_util.h                            | 4 ++--
 src/parser.h                                | 2 +-
 src/path.cpp                                | 2 +-
 src/reader.cpp                              | 2 +-
 src/sanity.h                                | 2 +-
 src/screen.cpp                              | 4 ++--
 src/screen.h                                | 2 +-
 src/tokenizer.h                             | 2 +-
 src/topic_monitor.h                         | 2 +-
 src/wildcard.h                              | 6 +++---
 tests/checks/set.fish                       | 2 +-
 tests/checks/wraps.fish                     | 2 +-
 tests/locale.in                             | 2 +-
 tests/test2.in                              | 2 +-
 64 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/build_tools/fish_xgettext.fish b/build_tools/fish_xgettext.fish
index 9a0e2b295..f772d0f75 100755
--- a/build_tools/fish_xgettext.fish
+++ b/build_tools/fish_xgettext.fish
@@ -37,7 +37,7 @@ for f in share/config.fish share/completions/*.fish share/functions/*.fish
     rm /tmp/fish/explicit/$f.tmp
 
     # Handle `complete` / `function` description messages. The `| fish` is subtle. It basically
-    # avoids the need to use `source` with a command substituion that could affect the current
+    # avoids the need to use `source` with a command substitution that could affect the current
     # shell.
     string replace --filter --regex $implicit_regex 'echo $1' <$f | fish >/tmp/fish/implicit/$f.tmp ^/dev/null
     while read description
diff --git a/build_tools/style.fish b/build_tools/style.fish
index e3da235ae..4075bc9ef 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -23,7 +23,7 @@ if test $all = yes
     set files (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//')
     if set -q files[1]
         echo
-        echo You have uncommited changes. Cowardly refusing to restyle the entire code base.
+        echo You have uncommitted changes. Cowardly refusing to restyle the entire code base.
         echo
         exit 1
     end
diff --git a/config_cmake.h.in b/config_cmake.h.in
index cbf047f1d..ea7e90820 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -142,7 +142,7 @@
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "fish"
 
-/* Define to 1 if tparm accepts a fixed amount of paramters. */
+/* Define to 1 if tparm accepts a fixed amount of parameters. */
 #cmakedefine TPARM_SOLARIS_KLUDGE 1
 
 /* Enable GNU extensions on systems that have them.  */
diff --git a/share/completions/VBoxHeadless.fish b/share/completions/VBoxHeadless.fish
index 4dbbce6cd..7f9011565 100644
--- a/share/completions/VBoxHeadless.fish
+++ b/share/completions/VBoxHeadless.fish
@@ -5,7 +5,7 @@ complete -c VBoxHeadless -l vrdeproperty -o vrdeproperty -s e -x -d "Set VRDE pr
 complete -c VBoxHeadless -l settingspw -x -d "Specify settings password"
 complete -c VBoxHeadless -l settingspwfile -f -d "Specify file containing setting password"
 complete -c VBoxHeadless -l start-paused -o start-paused -d "Start VM in paused state"
-complete -c VBoxHeadless -l capture -o capture -s c -x -d "Record VM screen ouput to file"
+complete -c VBoxHeadless -l capture -o capture -s c -x -d "Record VM screen output to file"
 complete -c VBoxHeadless -l width -s w -x -d "Frame width when recording"
 complete -c VBoxHeadless -l height -s h -x -d "Frame height when recording"
 complete -c VBoxHeadless -l bitrate -s r -x -d "Recording bit rate when recording"
diff --git a/share/completions/acpi.fish b/share/completions/acpi.fish
index bf822be6c..99c7619d0 100644
--- a/share/completions/acpi.fish
+++ b/share/completions/acpi.fish
@@ -14,7 +14,7 @@ complete -c acpi -s A -l without-ac-adapter -d 'Suppress ac-adapter information'
 complete -c acpi -s V -l everything -d 'Show every device, overrides above options'
 complete -c acpi -s s -l show-empty -d 'Show non-operational devices'
 complete -c acpi -s S -l hide-empty -d 'Hide non-operational devices'
-complete -c acpi -s c -l celcius -d 'Use celcius as the temperature unit'
+complete -c acpi -s c -l celcius -d 'Use celsius as the temperature unit'
 complete -c acpi -s f -l fahrenheit -d 'Use fahrenheit as the temperature unit'
 complete -c acpi -s k -l kelvin -d 'Use kelvin as the temperature unit'
 complete -c acpi -s d -l directory -d '<dir> path to ACPI info (/proc/acpi)'
diff --git a/share/completions/apt-extracttemplates.fish b/share/completions/apt-extracttemplates.fish
index 9ddf27596..1d1d049ee 100644
--- a/share/completions/apt-extracttemplates.fish
+++ b/share/completions/apt-extracttemplates.fish
@@ -2,6 +2,6 @@
 #apt-extracttemplates
 complete -c apt-extracttemplates -s h -l help -d "Display help and exit"
 complete -r -c apt-extracttemplates -s t -d "Set temp dir"
-complete -r -c apt-extracttemplates -s c -d "Specifiy config file"
+complete -r -c apt-extracttemplates -s c -d "Specify config file"
 complete -r -c apt-extracttemplates -s o -d "Specify options"
 
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 5c3451cd6..d61b304d7 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -47,7 +47,7 @@ complete -f -n '__fish_bundle_using_command install' -c bundle -l binstubs -d 'C
 complete -f -n '__fish_bundle_using_command install' -c bundle -l shebang -d 'Specify a ruby executable to use with generated binstubs'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l standalone -d 'Make a bundle that can work without RubyGems or Bundler at run-time'
 complete -f -n '__fish_bundle_using_command install' -c bundle -s P -l trust-policy -d 'Apply a RubyGems security policy: {High,Medium,Low,No}Security'
-complete -f -n '__fish_bundle_using_command install' -c bundle -s j -l jobs -d 'Install  gems parallely by starting size number of parallel workers'
+complete -f -n '__fish_bundle_using_command install' -c bundle -s j -l jobs -d 'Install gems parallelly by starting size number of parallel workers'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l no-cache -d 'Do not update the cache in vendor/cache with the newly bundled gems'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l quiet -d 'Do not print progress information to stdout'
 complete -f -n '__fish_bundle_using_command install' -c bundle -l clean -d 'Run bundle clean automatically after install'
diff --git a/share/completions/bzip2.fish b/share/completions/bzip2.fish
index 4d9b589b4..01199d2b5 100644
--- a/share/completions/bzip2.fish
+++ b/share/completions/bzip2.fish
@@ -16,7 +16,7 @@ complete -c bzip2 -s t -l test -d "Check integrity"
 complete -c bzip2 -s f -l force -d "Overwrite"
 complete -c bzip2 -s k -l keep -d "Do not overwrite"
 complete -c bzip2 -s s -l small -d "Reduce memory usage"
-complete -c bzip2 -s q -l quiet -d "Supress errors"
+complete -c bzip2 -s q -l quiet -d "Suppress errors"
 complete -c bzip2 -s v -l verbose -d "Print compression ratios"
 complete -c bzip2 -s L -l license -d "Print license"
 complete -c bzip2 -s V -l version -d "Display version and exit"
diff --git a/share/completions/cowsay.fish b/share/completions/cowsay.fish
index 7f49c70aa..89b41dbd2 100644
--- a/share/completions/cowsay.fish
+++ b/share/completions/cowsay.fish
@@ -5,7 +5,7 @@ complete -c cowsay -s f -d "Specify cow file" -x -a '(cowsay -l|tail -n +2|tr \
 complete -c cowsay -s h -d "Display help and exit"
 complete -c cowsay -s l -d "List all cowfiles"
 complete -c cowsay -s n -d "No word wrapping"
-complete -c cowsay -s T -d "Specify tounge string"
+complete -c cowsay -s T -d "Specify tongue string"
 complete -c cowsay -s W -d "Column width" -r
 complete -c cowsay -s b -d "Borg cow"
 complete -c cowsay -s d -d "Dead cow"
diff --git a/share/completions/cowthink.fish b/share/completions/cowthink.fish
index f45b7b132..e99be1829 100644
--- a/share/completions/cowthink.fish
+++ b/share/completions/cowthink.fish
@@ -5,7 +5,7 @@ complete -c cowthink -s f -d "Specify cow file" -x -a '(cowthink -l|tail -n +2|t
 complete -c cowthink -s h -d "Display help and exit"
 complete -c cowthink -s l -d "List all cowfiles"
 complete -c cowthink -s n -d "No word wrapping"
-complete -c cowthink -s T -d "Specify tounge string"
+complete -c cowthink -s T -d "Specify tongue string"
 complete -c cowthink -s W -d "Column width" -r
 complete -c cowthink -s b -d "Borg cow"
 complete -c cowthink -s d -d "Dead cow"
diff --git a/share/completions/dhcpcd.fish b/share/completions/dhcpcd.fish
index 5d34fc275..8c9d7747c 100644
--- a/share/completions/dhcpcd.fish
+++ b/share/completions/dhcpcd.fish
@@ -18,7 +18,7 @@ complete -c dhcpcd -l logfile -s j -r -d 'Writes to specfied log file instead of
 complete -c dhcpcd -l release -s k -x -d 'Release lease and de-configure interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l leasetime -s l -x -d 'Request specific lease time in secs'
 complete -c dhcpcd -l master -s M -d 'Start dhcpcd in Master mode'
-complete -c dhcpcd -l metric -s m -x -d 'Set prefered interface based on given rank (lowest wins)'
+complete -c dhcpcd -l metric -s m -x -d 'Set preferred interface based on given rank (lowest wins)'
 complete -c dhcpcd -l rebind -s n -x -d 'Reload config and rebind specified interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l renew -s N -x -d 'Renew existing addresses on specified interface' -a '(__fish_print_interfaces)'
 complete -c dhcpcd -l option -s o -x -d 'Request DHCP option'
diff --git a/share/completions/epkginfo.fish b/share/completions/epkginfo.fish
index dfa0b596f..d885243c9 100644
--- a/share/completions/epkginfo.fish
+++ b/share/completions/epkginfo.fish
@@ -4,7 +4,7 @@ complete -c epkginfo -s h -l help -d "display help"
 complete -c epkginfo -s d -l description -d "extended pkg description"
 complete -c epkginfo -s H -l herd -d "herd(s) for the pkg"
 complete -c epkginfo -s k -l keywords -d "keywords for all matching pkg versions"
-complete -c epkginfo -s l -l license -d "licenses for the best maching version"
+complete -c epkginfo -s l -l license -d "licenses for the best matching version"
 complete -c epkginfo -s m -l maintainer -d "maintainer(s) for the pkg"
 complete -c epkginfo -s S -l stablreq -d "STABLEREQ arches (cc's) for all matching pkg versio"
 complete -c epkginfo -s u -l useflags -d "per-pkg USE flag descriptions"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index 4c2878c36..8ae7eec76 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -114,7 +114,7 @@ complete -c equery -n '__fish_seen_subcommand_from l list; and     __fish_contai
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description -d "Show extended pkg description"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd -d "Show pkg's herd(s)"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords -d "Show keywords for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best maching version"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best matching version"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer -d "Show the maintainer(s) for the pkg"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
 complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags -d "Show per-pkg USE flag descriptions"
diff --git a/share/completions/feh.fish b/share/completions/feh.fish
index 26e32cf65..70a95c399 100644
--- a/share/completions/feh.fish
+++ b/share/completions/feh.fish
@@ -45,7 +45,7 @@ complete -c feh -l output-dir -s j -r -d "Save files to given directory"
 complete -c feh -l preload -s p -d "Preload images"
 complete -c feh -l quiet -s q -d "Don't report non-fatal errors"
 complete -c feh -l randomize -s z -d "Randomize file list before displaying"
-complete -c feh -l recursive -s r -d "Recursivly expand any directory"
+complete -c feh -l recursive -s r -d "Recursively expand any directory"
 complete -c feh -l no-recursive -d "Don't recursively expand any directory (default)"
 complete -c feh -l reload -s R -x -d "Reload filelist after given time in second"
 complete -c feh -l reverse -s n -d "Reverse sort order"
diff --git a/share/completions/find.fish b/share/completions/find.fish
index ecc3d15ed..fab40bc62 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -47,7 +47,7 @@ complete -c find -o ilname -d "File is symlink matching specified case insensiti
 complete -c find -o iname -d "File name matches case insensitive pattern" -r
 complete -c find -o inum -d "File has specified inode number" -r
 complete -c find -o ipath -o iwholename -d "File path matches case insensitive pattern" -r
-complete -c find -o iregex -d "File name matches case insensetive regex" -r
+complete -c find -o iregex -d "File name matches case insensitive regex" -r
 
 complete -c find -o links -d "File has specified number of links" -r -a "1 2 3 4 5 6 7 8 9"
 complete -c find -o lname -d "File is symlink matching specified pattern" -r
diff --git a/share/completions/fossil.fish b/share/completions/fossil.fish
index 6b07c7a24..b5ce82140 100644
--- a/share/completions/fossil.fish
+++ b/share/completions/fossil.fish
@@ -222,7 +222,7 @@ complete -c fossil -n '__fish_fossil_command finfo' -s s -l status -d 'Select st
 complete -c fossil -n __fish_fossil_needs_command -f -a help -d 'Display help'
 complete -c fossil -n '__fish_fossil_command help' -s a -l all -d 'Show main and auxiliary commands'
 complete -c fossil -n '__fish_fossil_command help' -s t -l test -d 'Show test commands only'
-complete -c fossil -n '__fish_fossil_command help' -s x -l aux -d 'Show auxilary commands only'
+complete -c fossil -n '__fish_fossil_command help' -s x -l aux -d 'Show auxiliary commands only'
 complete -c fossil -n '__fish_fossil_command help' -s w -l www -d 'Show list of web UI pages'
 
 # import
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 683b781d0..c7835acc3 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1122,7 +1122,7 @@ complete -c git -n '__fish_git_using_command log' -l merges -d 'Print only merge
 complete -c git -n '__fish_git_using_command log' -l no-merges -d 'Don\'t print commits with more than one parent'
 complete -x -c git -n '__fish_git_using_command log' -l min-parents -d 'Show only commit with at least the given number of parents'
 complete -x -c git -n '__fish_git_using_command log' -l max-parents -d 'Show only commit with at most the given number of parents'
-complete -c git -n '__fish_git_using_command log' -l no-min-parents -d 'Show only commit without a mimimum number of parents'
+complete -c git -n '__fish_git_using_command log' -l no-min-parents -d 'Show only commit without a minimum number of parents'
 complete -c git -n '__fish_git_using_command log' -l no-max-parents -d 'Show only commit without a maximum number of parents'
 complete -c git -n '__fish_git_using_command log' -l first-parent -d 'Follow only the first parent commit upon seeing a merge commit'
 complete -c git -n '__fish_git_using_command log' -l not -d 'Reverse meaning of ^ prefix'
@@ -1571,7 +1571,7 @@ complete -f -c git -n '__fish_git_using_command tag' -s a -l annotate -d 'Make a
 complete -f -c git -n '__fish_git_using_command tag' -s s -l sign -d 'Make a GPG-signed tag'
 complete -f -c git -n '__fish_git_using_command tag' -s d -l delete -d 'Remove a tag'
 complete -f -c git -n '__fish_git_using_command tag' -s v -l verify -d 'Verify signature of a tag'
-complete -f -c git -n '__fish_git_using_command tag' -s f -l force -d 'Force overwriting exising tag'
+complete -f -c git -n '__fish_git_using_command tag' -s f -l force -d 'Force overwriting existing tag'
 complete -f -c git -n '__fish_git_using_command tag' -s l -l list -d 'List tags'
 complete -f -c git -n '__fish_git_using_command tag' -l contains -xka '(__fish_git_commits)' -d 'List tags that contain a commit'
 complete -f -c git -n '__fish_git_using_command tag; and __fish_contains_opt -s d delete -s v verify' -a '(__fish_git_tags)' -d 'Tag'
diff --git a/share/completions/gprof.fish b/share/completions/gprof.fish
index b95fa1d51..8ec61757f 100644
--- a/share/completions/gprof.fish
+++ b/share/completions/gprof.fish
@@ -18,12 +18,12 @@ complete -xc gprof -s w -l width -d "Set width of output"
 complete -c gprof -s x -l all-lines -d "Annotate every line"
 complete -xc gprof -l demangle -d "Set demangling style"
 complete -c gprof -l no-demangle -d "Turn of demangling"
-complete -xc gprof -s a -l no-static -d "Supress static functions"
+complete -xc gprof -s a -l no-static -d "Suppress static functions"
 complete -xc gprof -s c -l static-call-graph
 complete -xc gprof -s D -l ignore-non-functions -d "Ignore symbols not known to be functions"
 complete -xc gprof -s k -r -d "Delete arcs from callgraph"
 complete -xc gprof -s l -l line -d "Line by line profiling"
-complete -xc gprof -s m -l min-count -r -d "Supress output when executed less than specified times"
+complete -xc gprof -s m -l min-count -r -d "Suppress output when executed less than specified times"
 complete -xc gprof -s n -l time -d "Only propagate times for matching symbols"
 complete -xc gprof -s N -l no-time -d "Do not propagate times for matching symbols"
 complete -xc gprof -s z -l display-unused-functions -d "Mention unused functions in flat profile"
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index 05e70fb84..97a7e4756 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -5,7 +5,7 @@ complete -c gradle -l help -s h -d 'Show help'
 complete -c gradle -l no-rebuild -s a -d 'Don\'t rebuild dependencies'
 complete -c gradle -l build-file -s b -r -d 'Specify build file'
 complete -c gradle -l settings-file -s c -r -d 'Specify settings file'
-complete -c gradle -l configure-on-demand -d 'Only relevent project are configured'
+complete -c gradle -l configure-on-demand -d 'Only relevant project are configured'
 complete -c gradle -l console -x -d 'Specify console output type' -a 'plan auto rich'
 complete -c gradle -l continue -d 'Continue task execution after failure'
 complete -c gradle -l system-prop -s D -r -d 'Set system property of the JVM'
diff --git a/share/completions/ip.fish b/share/completions/ip.fish
index 05e3de3d4..219f1966a 100644
--- a/share/completions/ip.fish
+++ b/share/completions/ip.fish
@@ -248,7 +248,7 @@ function __fish_complete_ip
                                         # Lifetime
                                     case '*'
                                         printf '%s\t%s\n' forever "Keep address valid forever" \
-                                            home "(Ipv6 only) Designate address as home adress" \
+                                            home "(Ipv6 only) Designate address as home address" \
                                             nodad "(Ipv6 only) Don't perform duplicate address detection" \
                                             dev "Add address to specified device" \
                                             scope "Set scope of address" \
diff --git a/share/completions/iw.fish b/share/completions/iw.fish
index 00a7172ed..1a8f0e6c9 100644
--- a/share/completions/iw.fish
+++ b/share/completions/iw.fish
@@ -253,7 +253,7 @@ function __fish_complete_iw
                     printf '%s\t%s\n' coalesce "Interface with coalesce" \
                         hwsim "" \
                         info "Show wireless device capabilities" \
-                        interface "Add a new virutal interface" \
+                        interface "Add a new virtual interface" \
                         channels "Show available channels" \
                         reg "Manage regulatory domains" \
                         set "Set parameters" \
diff --git a/share/completions/jq.fish b/share/completions/jq.fish
index 6cc8e609d..30ec151a3 100644
--- a/share/completions/jq.fish
+++ b/share/completions/jq.fish
@@ -15,8 +15,8 @@ complete -c jq -l monochrome-output -s M -d 'Don\'t color output'
 complete -c jq -l ascii-output -s a -d 'Replace UTF-8 characters with escape sequences'
 complete -c jq -l unbuffered -d 'Flush output after each JSON object is printed'
 complete -c jq -l sort-keys -s S -d 'Sort object keys in output'
-complete -c jq -l raw-output -s r -d 'If output is string ouput its content directly to stdout'
-complete -c jq -l join-output -s j -d 'Raw ouput without newlines'
+complete -c jq -l raw-output -s r -d 'If output is string output its content directly to stdout'
+complete -c jq -l join-output -s j -d 'Raw output without newlines'
 complete -c jq -l from-file -s f -r -d 'Read filter from file'
 complete -c jq -s L -d 'Prepend given directory to search modules'
 complete -c jq -l exit-status -s e -x -d 'Set exit status'
diff --git a/share/completions/less.fish b/share/completions/less.fish
index a9232dd33..626f098e1 100644
--- a/share/completions/less.fish
+++ b/share/completions/less.fish
@@ -4,7 +4,7 @@ complete -c less -s b -l buffers -r -d "Buffer space"
 complete -c less -s B -l auto-buffers -d "Disable automtic buffer allocation"
 complete -c less -s c -l clear-screen -d "Repaint from top"
 complete -c less -s C -l CLEAR-SCREEN -d "Clear and repaint from top"
-complete -c less -s d -l dumb -d "Supress error for lacking terminal capability"
+complete -c less -s d -l dumb -d "Suppress error for lacking terminal capability"
 complete -c less -s e -l quit-at-eof -d "Exit on second EOF"
 complete -c less -s E -l QUIT-AT-EOF -d "Exit on EOF"
 complete -c less -s f -l force -d "Open non-regular files"
diff --git a/share/completions/logkeys.fish b/share/completions/logkeys.fish
index 62ce14944..2e6b381a9 100644
--- a/share/completions/logkeys.fish
+++ b/share/completions/logkeys.fish
@@ -1,7 +1,7 @@
 
 complete -c logkeys -s s -l start -d 'Starts the keylogging daemon'
 complete -c logkeys -s k -l kill -d 'Terminates the logkeys daemon'
-complete -c logkeys -s o -l output -d 'Set ouput LOGFILE'
+complete -c logkeys -s o -l output -d 'Set output LOGFILE'
 complete -c logkeys -s m -l keymap -n '__fish_not_contain_opt -s u' -d 'Use file as input KEYMAP'
 complete -c logkeys -s d -l device -d 'Use DEVICE as keyboard input'
 complete -c logkeys -s u -l us-keymap -n '__fish_not_contain_opt -s m' -d 'Treat keyboard as standard US keyboard'
diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish
index 359d2d328..e287871a9 100644
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -12,5 +12,5 @@ complete -c lsblk -s o -l output -d "output columns" -xa '( __fish_complete_list
 complete -c lsblk -s P -l pairs -d "use key='value' output format"
 complete -c lsblk -s r -l raw -d "use raw output format"
 complete -c lsblk -s t -l topology -d "output info about topology"
-complete -c lsblk -s l -l list -d "use list format ouput"
+complete -c lsblk -s l -l list -d "use list format output"
 
diff --git a/share/completions/mkdocs.fish b/share/completions/mkdocs.fish
index 182330cda..90782f881 100644
--- a/share/completions/mkdocs.fish
+++ b/share/completions/mkdocs.fish
@@ -18,7 +18,7 @@ complete -n 'contains build (commandline -poc)' -c mkdocs -s d -l site-dir -r -d
 complete -n 'not __fish_seen_subcommand_from build gh-deploy new serve' -f -c mkdocs -a 'gh-deploy' -d 'Deploy your documentation to GitHub Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s c -l clean -d 'Remove old site_dir before building (the default)'
 complete -n 'contains gh-deploy (commandline -poc)' -c mkdocs -s f -l config-file -r -d 'Provide a specific MkDocs config'
-complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s m -l message -r -d 'A commit message to use when commiting to the Github Pages remote branch'
+complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s m -l message -r -d 'A commit message to use when committing to the Github Pages remote branch'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s b -l remote-branch -r -d 'The remote branch to commit to for Github Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -s r -l remote-name -r -d 'The remote name to commit to for Github Pages'
 complete -n 'contains gh-deploy (commandline -poc)' -f -c mkdocs -l force -d 'Force the push to the repository'
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index 153884f22..18a243477 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -110,7 +110,7 @@ complete -c mvn -a "resources:copy-resources" -d "Copy resources of the configur
 complete -c mvn -a "resources:help" -d "Display help information on maven-resources-plugin. Call mvn resources:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
 complete -c mvn -a "resources:resources" -d "Copy resources for the main source code to the main output directory. Always uses the project.build.resources element to specify the resources to copy."
 complete -c mvn -a "site:attach-descriptor" -d "Adds the site descriptor (site.xml) to the list of files to be installed/deployed. For Maven-2.x this is enabled by default only when the project has pom packaging since it will be used by modules inheriting, but this can be enabled for other projects packaging if needed. This default execution has been removed from the built-in lifecycle of Maven 3.x for pom-projects. Users that actually use those projects to provide a common site descriptor for sub modules will need to explicitly define this goal execution to restore the intended behavior."
-complete -c mvn -a "site:deploy" -d "Deploys the generated site using wagon supported protocols to the site URL specified in the <distributionManagement> section of the POM. For scp protocol, the website files are packaged by wagon into zip archive, then the archive is transfered to the remote host, next it is un-archived which is much faster than making a file by file copy. "
+complete -c mvn -a "site:deploy" -d "Deploys the generated site using wagon supported protocols to the site URL specified in the <distributionManagement> section of the POM. For scp protocol, the website files are packaged by wagon into zip archive, then the archive is transferred to the remote host, next it is un-archived which is much faster than making a file by file copy. "
 complete -c mvn -a "site:effective-site" -d "Displays the effective site descriptor as an XML for this build, after inheritance and interpolation of site.xml."
 complete -c mvn -a "site:help" -d "Display help information on maven-site-plugin. Call mvn site:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
 complete -c mvn -a "site:jar" -d "Bundles the site output into a JAR so that it can be deployed to a repository."
@@ -522,7 +522,7 @@ complete -c mvn -a "fitnesse:help" -d "Display help information on fitnesse-mave
 complete -c mvn -a "fitnesse:run" -d "This goal uses the fitnesse.runner.TestRunner class for calling a remote FitNesse web page and executes the tests or suites locally into a forked JVM. It's possible to define several pages and/or servers."
 complete -c mvn -a "fitnesse:fitnesse" -d "Generates a FitNesse report from a FitNesse web server. The generated report is an external report generated FitNesse itself. If the project use Clover for code coverage and if FitNesse has clover dependency (ie use the ArtifactId-Version-clover.jar), the code executed during the FitNesse execution (phase integration-test) will be had to the unit-test code coverage. See the clover example."
 complete -c mvn -a "selenium:start-server" -d "Start the Selenium server."
-complete -c mvn -a "selenium:xvfb" -d "Starts an Xvfb instance suitable for handling X11 displays for headless systems. Use this in combonation with the start-server goal to allow browsers to be launched on headless unix systems. Optionally uses 'xauth' to setup authentication for the Xvfb instance to allow running tests using the frame buffer server when another X server is already running. "
+complete -c mvn -a "selenium:xvfb" -d "Starts an Xvfb instance suitable for handling X11 displays for headless systems. Use this in combination with the start-server goal to allow browsers to be launched on headless unix systems. Optionally uses 'xauth' to setup authentication for the Xvfb instance to allow running tests using the frame buffer server when another X server is already running. "
 complete -c mvn -a "selenium:stop-server" -d "Stop the Selenium server."
 complete -c mvn -a "selenium:selenese" -d "Run a suite of HTML Selenese tests."
 complete -c mvn -a "selenium:help" -d "Display help information on selenium-maven-plugin. Call   mvn selenium:help -Ddetail=true -Dgoal=<goal-name> to display parameter details."
@@ -732,7 +732,7 @@ complete -c mvn -a "android:connect" -d "Connect external IP addresses to the AD
 complete -c mvn -a "android:deploy" -d "Deploys the apk(s) of the current project(s) to all attached devices and emulators. Automatically skips other projects in a multi-module build that do not use packaging apk without terminating. Deploymnet is automatically performed when running mvn integration-test (or mvn install) on a project with instrumentation tests."
 complete -c mvn -a "android:deploy-apk" -d "Deploys a specified Android application apk to attached devices and emulators. By default it will deploy to all, but a subset or single one can be configured with the device and devices parameters.This goal can be used in non-android projects and as standalone execution on the command line. "
 complete -c mvn -a "android:deploy-dependencies" -d "Deploys all directly declared dependencies of <type>apk</type> in this project's pom. Usually used in a project with instrumentation tests, to deploy the apk to test onto the device before running the deploying and running the instrumentation tests apk. Automatically performed when running mvn integration-test (or mvn install) on a project with instrumentation tests."
-complete -c mvn -a "android:devices" -d "DevicesMojo lists all attached devices and emulators found with the android debug bridge. It uses the same naming convention for the emulator as used in other places in the Android Maven Plugin and adds the status of the device in the list. TODO The goal is very simple and could be enhanced for better display, a verbose option to display and to take the android.device paramter into account."
+complete -c mvn -a "android:devices" -d "DevicesMojo lists all attached devices and emulators found with the android debug bridge. It uses the same naming convention for the emulator as used in other places in the Android Maven Plugin and adds the status of the device in the list. TODO The goal is very simple and could be enhanced for better display, a verbose option to display and to take the android.device parameter into account."
 complete -c mvn -a "android:dex" -d "Converts compiled Java classes to the Android dex format."
 complete -c mvn -a "android:disconnect" -d "Disconnect external IP addresses from the ADB server."
 complete -c mvn -a "android:emma" -d "After compiled Java classes use emma tool"
diff --git a/share/completions/pkg_delete.fish b/share/completions/pkg_delete.fish
index faf2f6543..772e7fac7 100644
--- a/share/completions/pkg_delete.fish
+++ b/share/completions/pkg_delete.fish
@@ -3,6 +3,6 @@
 
 complete -c pkg_delete -a '(__fish_print_packages)' --description 'Package'
 
-complete -c pkg_delete -o a -d 'Delete unsed deps'
+complete -c pkg_delete -o a -d 'Delete unused deps'
 complete -c pkg_delete -o V -d 'Turn on stats'
 
diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish
index 7607d0da6..b9fc6823e 100644
--- a/share/completions/quilt.fish
+++ b/share/completions/quilt.fish
@@ -1,4 +1,4 @@
-# completions for quilt version 0.46 or similiar
+# 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"
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 545576e0e..9e5bcba23 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -12,7 +12,7 @@ end
 complete -c s3cmd -f -n "__s3cmd_is_valid_remote_path" -a "(s3cmd ls (commandline -ct) 2>/dev/null | string match -r -- 's3://.*')"
 complete -c s3cmd -f -n "__s3cmd_is_remote_path"
 
-# Supress file completions for initial command
+# Suppress file completions for initial command
 complete -c s3cmd -n "__fish_is_first_token" -f
 
 # Available commands
diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
index 7ce1bc030..84f274a78 100644
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@@ -286,7 +286,7 @@ complete $sfdx_looking -xa force:data:tree -d 'manipulate records using the tree
 
 complete $sfdx_looking -xa force:data:tree:export -d 'export data from an org into sObject tree format for force:data:tree:import consumption'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir      -d 'directory to store files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate mulitple sobject tree files and a plan definition file for aggregated import'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query          -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix         -d 'prefix of generated files'
diff --git a/share/completions/stat.fish b/share/completions/stat.fish
index 804e72032..88ba989ba 100644
--- a/share/completions/stat.fish
+++ b/share/completions/stat.fish
@@ -12,7 +12,7 @@ else # OS X
     complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
     complete -c stat -s l -d "Display output in ls -lT format"
     complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
-    complete -c stat -s q -d "Supress failure messages"
+    complete -c stat -s q -d "Suppress failure messages"
     complete -c stat -s r -d "Display raw information"
     complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
     complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index 6d966ffb4..7693c9517 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -1,5 +1,5 @@
 if uniq --version >/dev/null 2>/dev/null
-    complete -c uniq -s c -l count -d "Print number of occurences"
+    complete -c uniq -s c -l count -d "Print number of occurrences"
     complete -c uniq -s d -l repeated -d "Only print duplicates"
     complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
 		none\t'Remove none-duplicate lines'
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 6e73f254a..591fc64e8 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -42,7 +42,7 @@ complete -c valgrind -l demangle -xd "Demangle C++ names" -a "yes no"
 complete -xc valgrind -l num-callers -d "Callers in stack trace"
 complete -xc valgrind -l error-limit -d "Stop showing errors if too many" -a "yes no"
 complete -xc valgrind -l show-below-main -d "Continue trace below main()" -a "yes no"
-complete -rc valgrind -l suppressions -d "Supress errors from file"
+complete -rc valgrind -l suppressions -d "Suppress errors from file"
 complete -c valgrind -l gen-suppressions -d "Print suppressions for detected errors"
 complete -xc valgrind -l db-attach -d "Start debugger on error" -a "yes no"
 complete -rc valgrind -l db-command -d "Debugger command"
diff --git a/share/completions/vim.fish b/share/completions/vim.fish
index c44fef446..083c2f811 100644
--- a/share/completions/vim.fish
+++ b/share/completions/vim.fish
@@ -3,7 +3,7 @@
 
 # todo
 # +[num]        : Position the cursor on line number
-# +/{pat}       : Position the cursor on the first occurence of {pat}
+# +/{pat}       : Position the cursor on the first occurrence of {pat}
 # +{command}    : Execute Ex command after the first file has been read
 complete -c vim -s c -r -d 'Execute Ex command after the first file has been read'
 complete -c vim -s S -r -d 'Source file after the first file has been read'
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index 119294cfc..5c3a05ad6 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -158,7 +158,7 @@ function __fish_zpool_list_rw_properties
     echo -e "bootfs\t"(_ "Default bootable dataset")" (POOL/DATASET)"
     echo -e "cachefile\t"(_ "Pool configuration cache")" (PATH, none, '')"
     echo -e "comment\t"(_ "Comment about the pool")" (COMMENT)"
-    echo -e "dedupditto\t"(_ "Threshold for writting a ditto copy of deduplicated blocks")" (COUNT)"
+    echo -e "dedupditto\t"(_ "Threshold for writing a ditto copy of deduplicated blocks")" (COUNT)"
     echo -e "delegation\t"(_ "Allow rights delegation on the pool")" (on, off)"
     echo -e "failmode\t"(_ "Behavior in case of catastrophic pool failure")" (wait, continue, panic)"
     echo -e "listsnaps\t"(_ "Display snapshots even if 'zfs list' does not use '-t'")" (on, off)"
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 5584231e7..8df9d1518 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -336,7 +336,7 @@ int builtin_false(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 // NOTE: These must be kept in sorted order!
 static const builtin_data_t builtin_datas[] = {
     {L"[", &builtin_test, N_(L"Test a condition")},
-    {L"and", &builtin_generic, N_(L"Execute command if previous command suceeded")},
+    {L"and", &builtin_generic, N_(L"Execute command if previous 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")},
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index dccdc5226..e61250eff 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -210,7 +210,7 @@ void builtin_printf_state_t::nonfatal_error(const wchar_t *fmt, ...) {
     streams.err.append(errstr);
     if (!string_suffixes_string(L"\n", errstr)) streams.err.push_back(L'\n');
 
-    // We set the exit code to error, because one occured,
+    // We set the exit code to error, because one occurred,
     // but we don't do an early exit so we still print what we can.
     this->exit_code = STATUS_CMD_ERROR;
 }
diff --git a/src/common.cpp b/src/common.cpp
index 7012f2e78..9e060e2f3 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -655,7 +655,7 @@ ssize_t read_loop(int fd, void *buff, size_t count) {
 }
 
 /// Hack to not print error messages in the tests. Do not call this from functions in this module
-/// like `debug()`. It is only intended to supress diagnostic noise from testing things like the
+/// like `debug()`. It is only intended to suppress diagnostic noise from testing things like the
 /// fish parser where we expect a lot of diagnostic messages due to testing error conditions.
 bool should_suppress_stderr_for_tests() {
     return program_name && !std::wcscmp(program_name, TESTS_PROGRAM_NAME);
diff --git a/src/common.h b/src/common.h
index 1065ac2db..fafe40456 100644
--- a/src/common.h
+++ b/src/common.h
@@ -843,7 +843,7 @@ void common_handle_winch(int signal);
 /// Write the given paragraph of output, redoing linebreaks to fit the current screen.
 wcstring reformat_for_screen(const wcstring &msg);
 
-/// Make sure the specified direcotry exists. If needed, try to create it and any currently not
+/// Make sure the specified directory exists. If needed, try to create it and any currently not
 /// existing parent directories.
 ///
 /// \return 0 if, at the time of function return the directory exists, -1 otherwise.
diff --git a/src/complete.h b/src/complete.h
index cdf49240a..67fe20c84 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -152,7 +152,7 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
 /// \param option_type The type of option: can be option_type_short (-x),
 ///        option_type_single_long (-foo), option_type_double_long (--bar).
 /// \param result_mode Controls how to search further completions when this completion has been
-/// succesfully matched.
+/// successfully matched.
 /// \param comp A space separated list of completions which may contain subshells.
 /// \param desc A description of the completion.
 /// \param condition a command to be run to check it this completion should be used. If \c condition
diff --git a/src/expand.cpp b/src/expand.cpp
index 32fcf6d4e..4094a68ea 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -593,7 +593,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
     if (exec_subshell(subcmd, parser, sub_res, true /* apply_exit_status */,
                       true /* is_subcmd */) == -1) {
         append_cmdsub_error(errors, SOURCE_LOCATION_UNKNOWN,
-                            L"Unknown error while evaulating command substitution");
+                            L"Unknown error while evaluating command substitution");
         return false;
     }
 
diff --git a/src/expand.h b/src/expand.h
index 3737d8494..9accf704b 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -92,7 +92,7 @@ enum : wchar_t {
     /// Character representing an empty variable expansion. Only used transitively while expanding
     /// variables.
     VARIABLE_EXPAND_EMPTY,
-    /// This is a special psuedo-char that is not used other than to mark the end of the the special
+    /// This is a special pseudo-char that is not used other than to mark the end of the the special
     /// characters so we can sanity check the enum range.
     EXPAND_SENTINAL
 };
@@ -146,7 +146,7 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 /// \param parser the parser to use for command substitutions, or nullptr to disable.
 /// \param errors Resulting errors, or NULL to ignore
 ///
-/// \return Whether expansion succeded
+/// \return Whether expansion succeeded
 bool expand_one(wcstring &inout_str, expand_flags_t flags, const environment_t &vars,
                 const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = NULL);
 
diff --git a/src/fallback.h b/src/fallback.h
index 855bf4616..04f56158c 100644
--- a/src/fallback.h
+++ b/src/fallback.h
@@ -60,7 +60,7 @@ struct winsize {
 #endif
 
 #if defined(TPARM_SOLARIS_KLUDGE)
-/// Solaris tparm has a set fixed of paramters in its curses implementation, work around this here.
+/// Solaris tparm has a set fixed of parameters in its curses implementation, work around this here.
 #define tparm tparm_solaris_kludge
 char *tparm_solaris_kludge(char *str, long p1 = 0, long p2 = 0, long p3 = 0, long p4 = 0,
                            long p5 = 0, long p6 = 0, long p7 = 0, long p8 = 0, long p9 = 0);
diff --git a/src/highlight.h b/src/highlight.h
index 872405ec8..ec35e1cfe 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -91,7 +91,7 @@ void highlight_shell(const wcstring &buffstr, std::vector<highlight_spec_t> &col
 void highlight_shell_no_io(const wcstring &buffstr, std::vector<highlight_spec_t> &color,
                            size_t pos, wcstring_list_t *error, const environment_t &vars);
 
-/// Perform syntax highlighting for the text in buff. Matching quotes and paranthesis are
+/// Perform syntax highlighting for the text in buff. Matching quotes and parenthesis are
 /// highlighted. The result is stored in the color array as a color_code from the HIGHLIGHT_ enum
 /// for each character in buff.
 ///
diff --git a/src/history.cpp b/src/history.cpp
index 796e89919..e3b7e61cb 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -427,7 +427,7 @@ void history_impl_t::remove(const wcstring &str_to_remove) {
             new_items.erase(new_items.begin() + idx);
             // If this index is before our first_unwritten_new_item_index, then subtract one from
             // that index so it stays pointing at the same item. If it is equal to or larger, then
-            // we have not yet writen this item, so we don't have to adjust the index.
+            // we have not yet written this item, so we don't have to adjust the index.
             if (idx < first_unwritten_new_item_index) {
                 first_unwritten_new_item_index--;
             }
diff --git a/src/input.cpp b/src/input.cpp
index afacf24eb..565ecd1a7 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -263,7 +263,7 @@ static maybe_t<char_event_t> interrupt_handler() {
     // Reap stray processes, including printing exit status messages.
     // TODO: shouldn't need this parser here.
     if (job_reap(parser, true)) reader_repaint_needed();
-    // Tell the reader an event occured.
+    // Tell the reader an event occurred.
     if (reader_reading_interrupted()) {
         auto vintr = shell_modes.c_cc[VINTR];
         if (vintr == 0) {
diff --git a/src/iothread.h b/src/iothread.h
index 10c0bc3c3..ae3395471 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -13,7 +13,7 @@
 /// pointer, and returns an int, which is passed to the completionCallback.
 /// \param completionCallback The function to execute on the main thread once the background thread
 /// is complete. Accepts an int (the return value of handler) and the context.
-/// \param context A arbitary context pointer to pass to the handler and completion callback.
+/// \param context An arbitrary context pointer to pass to the handler and completion callback.
 /// \return A sequence number, currently not very useful.
 int iothread_perform_base(int (*handler)(void *), void (*completionCallback)(void *, int),
                           void *context);
@@ -23,7 +23,7 @@ int iothread_perform_base(int (*handler)(void *), void (*completionCallback)(voi
 /// \return A file descriptor on which to listen for completion callbacks.
 int iothread_port(void);
 
-/// Services one iothread competion callback.
+/// Services one iothread completion callback.
 void iothread_service_completion(void);
 
 /// Waits for all iothreads to terminate.
diff --git a/src/pager.h b/src/pager.h
index dcf0b186c..42b47a735 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -82,7 +82,7 @@ class pager_t {
    public:
     /// Data structure describing one or a group of related completions.
     struct comp_t {
-        /// The list of all completin strings this entry applies to.
+        /// The list of all completion strings this entry applies to.
         wcstring_list_t comp;
         /// The description.
         wcstring desc;
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 238d38491..6b99bebfd 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -248,7 +248,7 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
     const size_t bufflen = std::wcslen(buff);
     assert(cursor_pos <= bufflen);
 
-    // ap and bp are the beginning and end of the tightest command substitition found so far.
+    // ap and bp are the beginning and end of the tightest command substitution found so far.
     const wchar_t *ap = buff, *bp = buff + bufflen;
     const wchar_t *pos = buff;
     for (;;) {
diff --git a/src/parse_util.h b/src/parse_util.h
index 3ce8fb3ab..7eca9a88f 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -13,8 +13,8 @@
 /// Find the beginning and end of the first subshell in the specified string.
 ///
 /// \param in the string to search for subshells
-/// \param begin the starting paranthesis of the subshell
-/// \param end the ending paranthesis of the subshell
+/// \param begin the starting parenthesis of the subshell
+/// \param end the ending parenthesis of the subshell
 /// \param accept_incomplete whether to permit missing closing parenthesis
 /// \return -1 on syntax error, 0 if no subshells exist and 1 on success
 int parse_util_locate_cmdsubst(const wchar_t *in, wchar_t **begin, wchar_t **end,
diff --git a/src/parser.h b/src/parser.h
index 5b826e3ae..61189957a 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -346,7 +346,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     void emit_profiling(const char *path) const;
 
     /// Returns the file currently evaluated by the parser. This can be different than
-    /// reader_current_filename, e.g. if we are evaulating a function defined in a different file
+    /// reader_current_filename, e.g. if we are evaluating a function defined in a different file
     /// than the one curently read.
     const wchar_t *current_filename() const;
 
diff --git a/src/path.cpp b/src/path.cpp
index 2532b13f6..976103df2 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -293,7 +293,7 @@ struct base_directory_t {
     wcstring path{};       /// the path where we attempted to create the directory.
     bool success{false};   /// whether creating the directory succeeded.
     int err{0};            /// the error code if creating the directory failed.
-    bool used_xdg{false};  /// whether an XDG variable was used in resolving the direcotry.
+    bool used_xdg{false};  /// whether an XDG variable was used in resolving the directory.
 };
 
 /// Attempt to get a base directory, creating it if necessary. If a variable named \p xdg_var is
diff --git a/src/reader.cpp b/src/reader.cpp
index 79e5346fe..2c83ad2ec 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2412,7 +2412,7 @@ maybe_t<char_event_t> reader_data_t::read_normal_chars(readline_loop_state_t &rl
             break;
         }
         // Only allow commands on the first key; otherwise, we might have data we
-        // need to insert on the commandline that the commmand might need to be able
+        // need to insert on the commandline that the command might need to be able
         // to see.
         auto next_event = inputter.readch(false);
         if (event_is_normal_char(next_event)) {
diff --git a/src/sanity.h b/src/sanity.h
index 202f0d9e2..e156dd28d 100644
--- a/src/sanity.h
+++ b/src/sanity.h
@@ -9,7 +9,7 @@ void sanity_lose();
 ///
 /// \param ptr The pointer to validate
 /// \param err A description of what the pointer refers to, for use in error messages
-/// \param null_ok Wheter the pointer is allowed to point to 0
+/// \param null_ok Whether the pointer is allowed to point to 0
 void validate_pointer(const void *ptr, const wchar_t *err, int null_ok);
 
 #endif
diff --git a/src/screen.cpp b/src/screen.cpp
index e4d248c84..a96d22a44 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -80,7 +80,7 @@ static size_t try_sequence(const char *seq, const wchar_t *str) {
     return 0;  // this should never be executed
 }
 
-/// Returns the number of columns left until the next tab stop, given the current cursor postion.
+/// Returns the number of columns left until the next tab stop, given the current cursor position.
 static size_t next_tab_stop(size_t current_line_width) {
     // Assume tab stops every 8 characters if undefined.
     size_t tab_width = init_tabs > 0 ? (size_t)init_tabs : 8;
@@ -286,7 +286,7 @@ void layout_cache_t::add_prompt_layout(wcstring input, prompt_layout_t layout) {
 
 /// Calculate layout information for the given prompt. Does some clever magic to detect common
 /// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
-/// escape sequences that may be embeded in a prompt, such as those to set visual attributes.
+/// escape sequences that may be embedded in a prompt, such as those to set visual attributes.
 static prompt_layout_t calc_prompt_layout(const wcstring &prompt_str, layout_cache_t &cache) {
     if (auto cached_layout = cache.find_prompt_layout(prompt_str)) {
         return *cached_layout;
diff --git a/src/screen.h b/src/screen.h
index b5c301e4d..d4f3e277c 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -155,7 +155,7 @@ class screen_t {
 };
 
 /// This is the main function for the screen putput library. It is used to define the desired
-/// contents of the screen. The screen command will use it's knowlege of the current contents of the
+/// contents of the screen. The screen command will use its knowledge of the current contents of the
 /// screen in order to render the desired output using as few terminal commands as possible.
 ///
 /// \param s the screen on which to write
diff --git a/src/tokenizer.h b/src/tokenizer.h
index b666fd245..4d918d791 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -31,7 +31,7 @@ enum class redirection_mode_t {
 };
 
 /// Flag telling the tokenizer to accept incomplete parameters, i.e. parameters with mismatching
-/// paranthesis, etc. This is useful for tab-completion.
+/// parenthesis, etc. This is useful for tab-completion.
 #define TOK_ACCEPT_UNFINISHED 1
 
 /// Flag telling the tokenizer not to remove comments. Useful for syntax highlighting.
diff --git a/src/topic_monitor.h b/src/topic_monitor.h
index c0673c712..36b2e2594 100644
--- a/src/topic_monitor.h
+++ b/src/topic_monitor.h
@@ -63,7 +63,7 @@ constexpr generation_t invalid_generation = std::numeric_limits<generation_t>::m
 /// The initial value of a generation is always 0.
 using generation_list_t = enum_array_t<generation_t, topic_t>;
 
-/// Teh topic monitor class. This permits querying the current generation values for topics,
+/// The topic monitor class. This permits querying the current generation values for topics,
 /// optionally blocking until they increase.
 class topic_monitor_t {
    private:
diff --git a/src/wildcard.h b/src/wildcard.h
index 6f8a58df1..dd4b7827e 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -1,5 +1,5 @@
 // My own globbing implementation. Needed to implement this instead of using libs globbing to
-// support tab-expansion of globbed paramaters.
+// support tab-expansion of globbed parameters.
 #ifndef FISH_WILDCARD_H
 #define FISH_WILDCARD_H
 
@@ -17,7 +17,7 @@ enum {
     ANY_STRING,
     /// Character representing any character string.
     ANY_STRING_RECURSIVE,
-    /// This is a special psuedo-char that is not used other than to mark the
+    /// This is a special pseudo-char that is not used other than to mark the
     /// end of the the special characters so we can sanity check the enum range.
     ANY_SENTINAL
 };
@@ -32,7 +32,7 @@ enum {
 /// wildcard_expand for matches. On the last segment, matching is made to any file, and all matches
 /// are inserted to the list.
 ///
-/// If wildcard_expand encounters any errors (such as insufficient priviliges) during matching, no
+/// If wildcard_expand encounters any errors (such as insufficient privileges) during matching, no
 /// error messages will be printed and wildcard_expand will continue the matching process.
 ///
 /// \param wc The wildcard string
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index db6855dbf..260a582af 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -220,7 +220,7 @@ begin
             set test16res $test16res $__fish_test_universal_variables_variable_foo
 
             # This sequence seems pointless but it's really verifying that we
-            # succesfully expose higher scopes as we erase the closest scope.
+            # successfully expose higher scopes as we erase the closest scope.
             set -e __fish_test_universal_variables_variable_foo
             set test16res $test16res $__fish_test_universal_variables_variable_foo
 
diff --git a/tests/checks/wraps.fish b/tests/checks/wraps.fish
index febe10a54..3424ed958 100644
--- a/tests/checks/wraps.fish
+++ b/tests/checks/wraps.fish
@@ -2,7 +2,7 @@
 # Validate some things about command wrapping.
 
 # This tests that we do not trigger a combinatorial explosion - see #5638.
-# Ensure it completes successully.
+# Ensure it completes successfully.
 complete -c testcommand --wraps "testcommand x "
 complete -c testcommand --wraps "testcommand y "
 complete -c testcommand --no-files -a normal
diff --git a/tests/locale.in b/tests/locale.in
index 396a40b43..ccdd87439 100644
--- a/tests/locale.in
+++ b/tests/locale.in
@@ -41,7 +41,7 @@ end
 echo -n X\u00FBX | display_bytes
 echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' | display_bytes
 
-# The next tests deliberately spawn another fish instance to test inheritence of env vars.
+# The next tests deliberately spawn another fish instance to test inheritance of env vars.
 
 # This test is subtle. Despite the presence of the \u00fc unicode char (a "u"
 # with an umlaut) the fact the locale is C/POSIX will cause the \xfc byte to
diff --git a/tests/test2.in b/tests/test2.in
index 2a5ce81ee..1aabc9204 100644
--- a/tests/test2.in
+++ b/tests/test2.in
@@ -1,4 +1,4 @@
-#Tests complex parameter expantions
+#Tests complex parameter expansions
 
 set a A
 set aa AA

From d7e545d89b039a82be928a7da00804af1bb71429 Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Sat, 9 Nov 2019 11:00:42 +0900
Subject: [PATCH 1250/1732] "source" to identify itself as a "block" first

Signed-off-by: Osamu Aoki <osamu@debian.org>
---
 sphinx_doc_src/cmds/source.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/source.rst b/sphinx_doc_src/cmds/source.rst
index 19ad85069..b8ec6ed64 100644
--- a/sphinx_doc_src/cmds/source.rst
+++ b/sphinx_doc_src/cmds/source.rst
@@ -15,7 +15,7 @@ Synopsis
 Description
 -----------
 
-``source`` evaluates the commands of the specified file in the current shell. This is different from starting a new process to perform the commands (i.e. ``fish < FILENAME``) 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 < FILENAME``) 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.
 
 fish will search the working directory to resolve relative paths but will not search ``$PATH``.
 

From 435556001e4ba13e7b86e9387e7901fa655af9da Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Tue, 19 Nov 2019 00:02:21 +0900
Subject: [PATCH 1251/1732] "eval" example to use $cmd as an array

Signed-off-by: Osamu Aoki <osamu@debian.org>
---
 sphinx_doc_src/cmds/eval.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/eval.rst b/sphinx_doc_src/cmds/eval.rst
index e6fdae17f..3e9c0f895 100644
--- a/sphinx_doc_src/cmds/eval.rst
+++ b/sphinx_doc_src/cmds/eval.rst
@@ -17,7 +17,7 @@ Description
 
 If your command does not need access to stdin, consider using ``source`` instead.
 
-If no piping or other compound shell constructs are required, variable-expansion-as-command, as in  ``set cmd ls; $cmd``, is also an option.
+If no piping or other compound shell constructs are required, variable-expansion-as-command, as in  ``set cmd ls -la; $cmd``, is also an option.
 
 
 Example

From 5ca80a61e3e6da511ac1169a6f23db63e4669f39 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 16:54:36 -0800
Subject: [PATCH 1252/1732] [clang-tidy] Fix inconsistent declarations

Found with readability-inconsistent-declaration-parameter-name

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.h              | 6 +++---
 src/builtin_printf.cpp     | 2 +-
 src/color.h                | 4 ++--
 src/common.h               | 6 +++---
 src/complete.cpp           | 2 +-
 src/complete.h             | 4 ++--
 src/env_universal_common.h | 6 +++---
 src/exec.h                 | 4 ++--
 src/expand.h               | 4 ++--
 src/function.h             | 6 +++---
 src/highlight.h            | 2 +-
 src/history.cpp            | 4 ++--
 src/input.h                | 6 +++---
 src/output.h               | 6 +++---
 src/pager.h                | 4 ++--
 src/parse_execution.h      | 8 ++++----
 src/parse_tree.cpp         | 4 ++--
 src/parse_tree.h           | 6 +++---
 src/parse_util.h           | 4 ++--
 src/parser.h               | 4 ++--
 src/path.h                 | 2 +-
 src/proc.h                 | 4 ++--
 src/reader.h               | 2 +-
 src/tnode.h                | 2 +-
 src/tokenizer.h            | 4 ++--
 src/utf8.cpp               | 2 +-
 src/utf8.h                 | 2 +-
 src/wutil.h                | 8 ++++----
 28 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/builtin.h b/src/builtin.h
index 359dd40be..d6774088c 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -80,15 +80,15 @@ enum { COMMAND_NOT_BUILTIN, BUILTIN_REGULAR, BUILTIN_FUNCTION };
 void builtin_init();
 bool builtin_exists(const wcstring &cmd);
 
-proc_status_t builtin_run(parser_t &parser, int job_pgrp, wchar_t **argv, io_streams_t &streams);
+proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_streams_t &streams);
 
 wcstring_list_t builtin_get_names();
 void builtin_get_names(std::vector<completion_t> *list);
-const wchar_t *builtin_get_desc(const wcstring &b);
+const wchar_t *builtin_get_desc(const wcstring &name);
 
 wcstring builtin_help_get(parser_t &parser, const wchar_t *cmd);
 
-void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
+void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *name,
                         wcstring *error_message = nullptr);
 int builtin_count_args(const wchar_t *const *argv);
 
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index e61250eff..e634d74e5 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -92,7 +92,7 @@ struct builtin_printf_state_t {
     int print_formatted(const wchar_t *format, int argc, wchar_t **argv);
 
     void nonfatal_error(const wchar_t *fmt, ...);
-    void fatal_error(const wchar_t *format, ...);
+    void fatal_error(const wchar_t *fmt, ...);
 
     long print_esc(const wchar_t *escstart, bool octal_0);
     void print_esc_string(const wchar_t *str);
diff --git a/src/color.h b/src/color.h
index a53d79bf2..ed3e67f30 100644
--- a/src/color.h
+++ b/src/color.h
@@ -35,10 +35,10 @@ class rgb_color_t {
     } data;
 
     /// Try parsing a special color name like "normal".
-    bool try_parse_special(const wcstring &str);
+    bool try_parse_special(const wcstring &special);
 
     /// Try parsing an rgb color like "#F0A030".
-    bool try_parse_rgb(const wcstring &str);
+    bool try_parse_rgb(const wcstring &name);
 
     /// Try parsing an explicit color name like "magenta".
     bool try_parse_named(const wcstring &str);
diff --git a/src/common.h b/src/common.h
index fafe40456..f32e7e11a 100644
--- a/src/common.h
+++ b/src/common.h
@@ -748,7 +748,7 @@ void append_path_component(wcstring &path, const wcstring &component);
 wcstring format_string(const wchar_t *format, ...);
 wcstring vformat_string(const wchar_t *format, va_list va_orig);
 void append_format(wcstring &str, const wchar_t *format, ...);
-void append_formatv(wcstring &str, const wchar_t *format, va_list ap);
+void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig);
 
 #ifdef HAVE_STD__MAKE_UNIQUE
 using std::make_unique;
@@ -764,7 +764,7 @@ std::unique_ptr<T> make_unique(Args &&... args) {
 /// character is detemrined by examining \c in. Returns 0 on error.
 ///
 /// \param in the position of the opening quote.
-wchar_t *quote_end(const wchar_t *in);
+wchar_t *quote_end(const wchar_t *pos);
 
 /// A call to this function will reset the error counter. Some functions print out non-critical
 /// error messages. These should check the error_count before, and skip printing the message if
@@ -1031,7 +1031,7 @@ struct hash<const wcstring> {
 #endif
 
 /// Get the absolute path to the fish executable itself
-std::string get_executable_path(const char *fallback);
+std::string get_executable_path(const char *argv0);
 
 /// A RAII wrapper for resources that don't recur, so we don't have to create a separate RAII
 /// wrapper for each function. Avoids needing to call "return cleanup()" or similar / everywhere.
diff --git a/src/complete.cpp b/src/complete.cpp
index 0d765e2f3..79ebaa723 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -354,7 +354,7 @@ class completer_t {
     void complete_cmd(const wcstring &str);
 
     /// Attempt to complete an abbreviation for the given string.
-    void complete_abbr(const wcstring &str);
+    void complete_abbr(const wcstring &cmd);
 
     void complete_from_args(const wcstring &str, const wcstring &args, const wcstring &desc,
                             complete_flags_t flags);
diff --git a/src/complete.h b/src/complete.h
index 67fe20c84..32e63b813 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -196,8 +196,8 @@ void append_completion(std::vector<completion_t> *completions, wcstring comp,
                        string_fuzzy_match_t match = string_fuzzy_match_t(fuzzy_match_exact));
 
 /// Support for "wrap targets." A wrap target is a command that completes like another command.
-bool complete_add_wrapper(const wcstring &command, const wcstring &wrap_target);
-bool complete_remove_wrapper(const wcstring &command, const wcstring &wrap_target);
+bool complete_add_wrapper(const wcstring &command, const wcstring &new_target);
+bool complete_remove_wrapper(const wcstring &command, const wcstring &target_to_remove);
 
 /// Returns a list of wrap targets for a given command.
 wcstring_list_t complete_get_wrap_targets(const wcstring &command);
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 3268b1c54..e023b8fba 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -62,7 +62,7 @@ class env_universal_t {
     void load_from_fd(int fd, callback_data_list_t &callbacks);
 
     void set_internal(const wcstring &key, const env_var_t &var);
-    bool remove_internal(const wcstring &name);
+    bool remove_internal(const wcstring &key);
 
     // Functions concerned with saving.
     bool open_and_acquire_lock(const std::string &path, int *out_fd);
@@ -82,7 +82,7 @@ class env_universal_t {
     // vars_to_acquire.
     void acquire_variables(var_table_t &vars_to_acquire);
 
-    static bool populate_1_variable(const wchar_t *str, env_var_t::env_var_flags_t flags,
+    static bool populate_1_variable(const wchar_t *input, env_var_t::env_var_flags_t flags,
                                     var_table_t *vars, wcstring *storage);
 
     static void parse_message_2x_internal(const wcstring &msg, var_table_t *vars,
@@ -106,7 +106,7 @@ class env_universal_t {
     void set(const wcstring &key, env_var_t var);
 
     // Removes a variable. Returns true if it was found, false if not.
-    bool remove(const wcstring &name);
+    bool remove(const wcstring &key);
 
     // Gets variable names.
     wcstring_list_t get_names(bool show_exported, bool show_unexported) const;
diff --git a/src/exec.h b/src/exec.h
index 12c5d9051..ce3faf2a7 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -24,8 +24,8 @@ bool exec_job(parser_t &parser, std::shared_ptr<job_t> j);
 ///
 /// \return the status of the last job to exit, or -1 if en error was encountered.
 int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs,
-                  bool preserve_exit_status, bool is_subcmd = false);
-int exec_subshell(const wcstring &cmd, parser_t &parser, bool preserve_exit_status,
+                  bool apply_exit_status, bool is_subcmd = false);
+int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status,
                   bool is_subcmd = false);
 
 /// Loops over close until the syscall was run without being interrupted.
diff --git a/src/expand.h b/src/expand.h
index 9accf704b..294be885e 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -146,8 +146,8 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 /// \param parser the parser to use for command substitutions, or nullptr to disable.
 /// \param errors Resulting errors, or NULL to ignore
 ///
-/// \return Whether expansion succeeded
-bool expand_one(wcstring &inout_str, expand_flags_t flags, const environment_t &vars,
+/// \return Whether expansion succeeded.
+bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
                 const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = NULL);
 
 /// Expand a command string like $HOME/bin/cmd into a command and list of arguments.
diff --git a/src/function.h b/src/function.h
index a5eaaac2d..b777f7539 100644
--- a/src/function.h
+++ b/src/function.h
@@ -61,13 +61,13 @@ void function_set_desc(const wcstring &name, const wcstring &desc, parser_t &par
 
 /// Returns true if the function with the name name exists.
 /// This may autoload.
-int function_exists(const wcstring &name, parser_t &parser);
+int function_exists(const wcstring &cmd, parser_t &parser);
 
 /// Attempts to load a function if not yet loaded. This is used by the completion machinery.
-void function_load(const wcstring &name, parser_t &parser);
+void function_load(const wcstring &cmd, parser_t &parser);
 
 /// Returns true if the function with the name name exists, without triggering autoload.
-int function_exists_no_autoload(const wcstring &name);
+int function_exists_no_autoload(const wcstring &cmd);
 
 /// Returns all function names.
 ///
diff --git a/src/highlight.h b/src/highlight.h
index ec35e1cfe..79cc2e846 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -126,7 +126,7 @@ enum {
     PATH_EXPAND_TILDE = 1 << 1
 };
 typedef unsigned int path_flags_t;
-bool is_potential_path(const wcstring &const_path, const wcstring_list_t &directories,
+bool is_potential_path(const wcstring &potential_path_fragment, const wcstring_list_t &directories,
                        const environment_t &vars, path_flags_t flags);
 
 #endif
diff --git a/src/history.cpp b/src/history.cpp
index e3b7e61cb..a245fb948 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -153,7 +153,7 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item
     }
 };
 
-static wcstring history_filename(const wcstring &name, const wcstring &suffix);
+static wcstring history_filename(const wcstring &session_id, const wcstring &suffix);
 
 /// We can merge two items if they are the same command. We use the more recent timestamp, more
 /// recent identifier, and the longer list of required paths.
@@ -327,7 +327,7 @@ struct history_impl_t {
     void populate_from_config_path();
 
     // Populates from a bash history file.
-    void populate_from_bash(FILE *f);
+    void populate_from_bash(FILE *stream);
 
     // Incorporates the history of other shells into this history.
     void incorporate_external_changes();
diff --git a/src/input.h b/src/input.h
index 6bff260de..a58cc9e4f 100644
--- a/src/input.h
+++ b/src/input.h
@@ -100,7 +100,7 @@ class input_mapping_set_t {
     /// Gets the command bound to the specified key sequence in the specified mode. Returns true if
     /// it exists, false if not.
     bool get(const wcstring &sequence, const wcstring &mode, wcstring_list_t *out_cmds, bool user,
-             wcstring *out_new_mode);
+             wcstring *out_sets_mode);
 
     /// Returns all mapping names and modes.
     std::vector<input_mapping_name_t> get_names(bool user = true) const;
@@ -110,10 +110,10 @@ class input_mapping_set_t {
     /// \param sequence the sequence to bind
     /// \param command an input function that will be run whenever the key sequence occurs
     void add(wcstring sequence, const wchar_t *command, const wchar_t *mode = DEFAULT_BIND_MODE,
-             const wchar_t *new_mode = DEFAULT_BIND_MODE, bool user = true);
+             const wchar_t *sets_mode = DEFAULT_BIND_MODE, bool user = true);
 
     void add(wcstring sequence, const wchar_t *const *commands, size_t commands_len,
-             const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *new_mode = DEFAULT_BIND_MODE,
+             const wchar_t *mode = DEFAULT_BIND_MODE, const wchar_t *sets_mode = DEFAULT_BIND_MODE,
              bool user = true);
 
     /// \return a snapshot of the list of input mappings.
diff --git a/src/output.h b/src/output.h
index dee1ad982..7ef8f760e 100644
--- a/src/output.h
+++ b/src/output.h
@@ -108,15 +108,15 @@ void writembs_check(outputter_t &outp, const char *mbs, const char *mbs_name, bo
 #define writembs(outp, mbs) writembs_check((outp), (mbs), #mbs, true, __FILE__, __LINE__)
 #define writembs_nofail(outp, mbs) writembs_check((outp), (mbs), #mbs, false, __FILE__, __LINE__)
 
-rgb_color_t parse_color(const env_var_t &val, bool is_background);
+rgb_color_t parse_color(const env_var_t &var, bool is_background);
 
 /// Sets what colors are supported.
 enum { color_support_term256 = 1 << 0, color_support_term24bit = 1 << 1 };
 typedef unsigned int color_support_t;
 color_support_t output_get_color_support();
-void output_set_color_support(color_support_t support);
+void output_set_color_support(color_support_t val);
 
-rgb_color_t best_color(const std::vector<rgb_color_t> &colors, color_support_t support);
+rgb_color_t best_color(const std::vector<rgb_color_t> &candidates, color_support_t support);
 
 unsigned char index_for_color(rgb_color_t c);
 
diff --git a/src/pager.h b/src/pager.h
index 42b47a735..943f2ff47 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -131,7 +131,7 @@ class pager_t {
 
     bool completion_info_passes_filter(const comp_t &info) const;
 
-    void completion_print(size_t cols, const size_t *width_per_column, size_t row_start,
+    void completion_print(size_t cols, const size_t *width_by_column, size_t row_start,
                           size_t row_stop, const wcstring &prefix, const comp_info_list_t &lst,
                           page_rendering_t *rendering) const;
     line_t completion_print_item(const wcstring &prefix, const comp_t *c, size_t row, size_t column,
@@ -143,7 +143,7 @@ class pager_t {
     editable_line_t search_field_line;
 
     // Sets the set of completions.
-    void set_completions(const completion_list_t &comp);
+    void set_completions(const completion_list_t &raw_completions);
 
     // Sets the prefix.
     void set_prefix(const wcstring &pref);
diff --git a/src/parse_execution.h b/src/parse_execution.h
index c5abcab85..ff0c751d5 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -57,7 +57,7 @@ class parse_execution_context_t {
 
     // Report an error. Always returns true.
     parse_execution_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    parse_execution_result_t report_errors(const parse_error_list_t &errors) const;
+    parse_execution_result_t report_errors(const parse_error_list_t &error_list) const;
 
     // Wildcard error helper.
     parse_execution_result_t report_unmatched_wildcard_error(
@@ -113,7 +113,7 @@ class parse_execution_context_t {
     parse_execution_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
                                               const block_t *associated_block);
     parse_execution_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
-    parse_execution_result_t run_while_statement(tnode_t<grammar::while_header> statement,
+    parse_execution_result_t run_while_statement(tnode_t<grammar::while_header> header,
                                                  tnode_t<grammar::job_list> contents,
                                                  const block_t *associated_block);
     parse_execution_result_t run_function_statement(tnode_t<grammar::function_header> header,
@@ -131,7 +131,7 @@ class parse_execution_context_t {
                             io_chain_t *out_chain);
 
     parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_conj,
+    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
                                                  const block_t *associated_block);
     template <typename Type>
     parse_execution_result_t run_job_list(tnode_t<Type> job_list_node,
@@ -141,7 +141,7 @@ class parse_execution_context_t {
 
     // Returns the line number of the node. Not const since it touches cached_lineno_offset.
     int line_offset_of_node(tnode_t<grammar::job> node);
-    int line_offset_of_character_at_offset(size_t char_idx);
+    int line_offset_of_character_at_offset(size_t offset);
 
    public:
     parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 56c38b707..7898b7f5b 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -385,9 +385,9 @@ class parse_ll_t {
     bool top_node_handle_terminal_types(const parse_token_t &token);
 
     void parse_error_unexpected_token(const wchar_t *expected, parse_token_t token);
-    void parse_error(parse_token_t token, parse_error_code_t code, const wchar_t *format, ...);
+    void parse_error(parse_token_t token, parse_error_code_t code, const wchar_t *fmt, ...);
     void parse_error_at_location(size_t source_start, size_t source_length, size_t error_location,
-                                 parse_error_code_t code, const wchar_t *format, ...);
+                                 parse_error_code_t code, const wchar_t *fmt, ...);
     void parse_error_failed_production(struct parse_stack_element_t &elem, parse_token_t token);
     void parse_error_unbalancing_token(parse_token_t token);
 
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 208f9ad11..54b173266 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -66,7 +66,7 @@ enum {
 };
 typedef unsigned int parse_tree_flags_t;
 
-wcstring parse_dump_tree(const parse_node_tree_t &tree, const wcstring &src);
+wcstring parse_dump_tree(const parse_node_tree_t &nodes, const wcstring &src);
 
 const wchar_t *token_type_description(parse_token_type_t type);
 const wchar_t *keyword_description(parse_keyword_t type);
@@ -200,7 +200,7 @@ class parse_node_tree_t : public std::vector<parse_node_t> {
     // Utilities
 
     /// Given a node, return all of its comment nodes.
-    std::vector<tnode_t<grammar::comment>> comment_nodes_for_node(const parse_node_t &node) const;
+    std::vector<tnode_t<grammar::comment>> comment_nodes_for_node(const parse_node_t &parent) const;
 
    private:
     template <typename Type>
@@ -209,7 +209,7 @@ class parse_node_tree_t : public std::vector<parse_node_t> {
     /// the next element of the given type in that list, and the tail (by reference). Returns NULL
     /// if we've exhausted the list.
     const parse_node_t *next_node_in_node_list(const parse_node_t &node_list,
-                                               parse_token_type_t item_type,
+                                               parse_token_type_t entry_type,
                                                const parse_node_t **list_tail) const;
 };
 
diff --git a/src/parse_util.h b/src/parse_util.h
index 7eca9a88f..49458eed0 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -84,7 +84,7 @@ void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar
                              const wchar_t **prev_end);
 
 /// Get the linenumber at the specified character offset.
-int parse_util_lineno(const wchar_t *str, size_t len);
+int parse_util_lineno(const wchar_t *str, size_t offset);
 
 /// Calculate the line number of the specified cursor position.
 int parse_util_get_line_from_offset(const wcstring &str, size_t pos);
@@ -97,7 +97,7 @@ size_t parse_util_get_offset(const wcstring &str, int line, long line_offset);
 
 /// Return the given string, unescaping wildcard characters but not performing any other character
 /// transformation.
-wcstring parse_util_unescape_wildcards(const wcstring &in);
+wcstring parse_util_unescape_wildcards(const wcstring &str);
 
 /// Checks if the specified string is a help option.
 bool parse_util_argument_is_help(const wchar_t *s);
diff --git a/src/parser.h b/src/parser.h
index 61189957a..d14805776 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -229,7 +229,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     wcstring user_presentable_path(const wcstring &path) const;
 
     /// Helper for stack_trace().
-    void stack_trace_internal(size_t block_idx, wcstring *out) const;
+    void stack_trace_internal(size_t block_idx, wcstring *buff) const;
 
     /// Create a parser.
     parser_t();
@@ -318,7 +318,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     block_t *push_block(block_t &&b);
 
     /// Remove the outermost block, asserting it's the given one.
-    void pop_block(const block_t *b);
+    void pop_block(const block_t *expected);
 
     /// Return a description of the given blocktype.
     const wchar_t *get_block_desc(int block) const;
diff --git a/src/path.h b/src/path.h
index 4b5cb98ff..1bf64cb4b 100644
--- a/src/path.h
+++ b/src/path.h
@@ -44,7 +44,7 @@ void path_emit_config_directory_errors(env_stack_t &vars);
 /// Returns:
 /// false if the command can not be found else true. The result
 /// should be freed with free().
-bool path_get_path(const wcstring &cmd, wcstring *output_or_NULL, const environment_t &vars);
+bool path_get_path(const wcstring &cmd, wcstring *out_path, const environment_t &vars);
 
 /// Return all the paths that match the given command.
 wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars);
diff --git a/src/proc.h b/src/proc.h
index ad498b9f1..16dabfbad 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -261,7 +261,7 @@ typedef std::vector<process_ptr_t> process_list_t;
 
 typedef int job_id_t;
 job_id_t acquire_job_id(void);
-void release_job_id(job_id_t jobid);
+void release_job_id(job_id_t jid);
 
 /// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
 /// of flags.
@@ -488,7 +488,7 @@ class parser_t;
 bool job_reap(parser_t &parser, bool interactive);
 
 /// Mark a process as failed to execute (and therefore completed).
-void job_mark_process_as_failed(const std::shared_ptr<job_t> &job, const process_t *p);
+void job_mark_process_as_failed(const std::shared_ptr<job_t> &job, const process_t *failed_proc);
 
 /// Use the procfs filesystem to look up how many jiffies of cpu time was used by this process. This
 /// function is only available on systems with the procfs file entry 'stat', i.e. Linux.
diff --git a/src/reader.h b/src/reader.h
index a6b4ca3ef..11f1646bf 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -184,7 +184,7 @@ void reader_set_allow_autosuggesting(bool flag);
 void reader_set_expand_abbreviations(bool flag);
 
 /// Sets whether the reader should exit on ^C.
-void reader_set_exit_on_interrupt(bool flag);
+void reader_set_exit_on_interrupt(bool i);
 
 void reader_set_silent_status(bool f);
 
diff --git a/src/tnode.h b/src/tnode.h
index b13958b2f..5221bef94 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -236,7 +236,7 @@ parse_statement_decoration_t get_decoration(tnode_t<grammar::plain_statement> st
 enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decorator> stmt);
 
 enum parse_bool_statement_type_t bool_statement_type(
-    tnode_t<grammar::job_conjunction_continuation> stmt);
+    tnode_t<grammar::job_conjunction_continuation> cont);
 
 /// Given a redirection node, get the parsed redirection and target of the redirection (file path,
 /// or fd).
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 4d918d791..fada16eec 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -131,7 +131,7 @@ class tokenizer_t {
     /// \param flags Flags to the tokenizer. Setting TOK_ACCEPT_UNFINISHED will cause the tokenizer
     /// to accept incomplete tokens, such as a subshell without a closing parenthesis, as a valid
     /// token. Setting TOK_SHOW_COMMENTS will return comments as tokens
-    tokenizer_t(const wchar_t *b, tok_flags_t flags);
+    tokenizer_t(const wchar_t *start, tok_flags_t flags);
 
     /// Returns the next token, or none() if we are at the end.
     maybe_t<tok_t> next();
@@ -212,7 +212,7 @@ class move_word_state_machine_t {
     move_word_style_t style;
 
    public:
-    explicit move_word_state_machine_t(move_word_style_t st);
+    explicit move_word_state_machine_t(move_word_style_t syl);
     bool consume_char(wchar_t c);
     void reset();
 };
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 7bd9351ae..030f94f7c 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -38,7 +38,7 @@ typedef wchar_t utf8_wchar_t;
 
 typedef std::basic_string<utf8_wchar_t> utf8_wstring_t;
 
-static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring_t *result,
+static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring_t *out_string,
                                      int flags);
 static size_t wchar_to_utf8_internal(const utf8_wchar_t *in, size_t insize, char *out,
                                      size_t outsize, int flags);
diff --git a/src/utf8.h b/src/utf8.h
index 49d2b62b8..cfd2a1b2d 100644
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -27,7 +27,7 @@
 
 /// Convert a string between UTF8 and UCS-2/4 (depending on size of wchar_t). Returns true if
 /// successful, storing the result of the conversion in *result*.
-bool wchar_to_utf8_string(const std::wstring &input, std::string *result);
+bool wchar_to_utf8_string(const std::wstring &str, std::string *result);
 
 /// Convert a string between UTF8 and UCS-2/4 (depending on size of wchar_t). Returns nonzero if
 /// successful, storing the result of the conversion in *out*.
diff --git a/src/wutil.h b/src/wutil.h
index e31d90d30..ca261f63a 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -56,10 +56,10 @@ int wstat(const wcstring &file_name, struct stat *buf);
 int lwstat(const wcstring &file_name, struct stat *buf);
 
 /// Wide character version of access().
-int waccess(const wcstring &pathname, int mode);
+int waccess(const wcstring &file_name, int mode);
 
 /// Wide character version of unlink().
-int wunlink(const wcstring &pathname);
+int wunlink(const wcstring &file_name);
 
 /// Wide character version of perror().
 void wperror(const wchar_t *s);
@@ -113,10 +113,10 @@ std::wstring wbasename(const std::wstring &path);
 const wcstring &wgettext(const wchar_t *in);
 
 /// Wide character version of mkdir.
-int wmkdir(const wcstring &dir, int mode);
+int wmkdir(const wcstring &name, int mode);
 
 /// Wide character version of rename.
-int wrename(const wcstring &oldName, const wcstring &newName);
+int wrename(const wcstring &oldName, const wcstring &newv);
 
 #define PUA1_START 0xE000
 #define PUA1_END 0xF900

From 7f62e3073146aec8c9706515fffe5efa90f506c3 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 16:56:46 -0800
Subject: [PATCH 1253/1732] [clang-tidy] Replace size comparisons with empty

Found with readability-container-size-empty

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_function.cpp |  2 +-
 src/builtin_history.cpp  |  2 +-
 src/builtin_string.cpp   |  2 +-
 src/common.cpp           | 10 +++++-----
 src/fish.cpp             |  2 +-
 src/fish_key_reader.cpp  |  2 +-
 src/input.cpp            |  2 +-
 src/parser.cpp           |  2 +-
 src/reader.cpp           |  2 +-
 src/tokenizer.cpp        |  8 ++++----
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 7c4dec37b..c1b07ee26 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -237,7 +237,7 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     }
 
     if (argc != optind) {
-        if (opts.named_arguments.size()) {
+        if (!opts.named_arguments.empty()) {
             for (int i = optind; i < argc; i++) {
                 if (!valid_var_name(argv[i])) {
                     streams.err.append_format(BUILTIN_ERR_VARNAME, cmd, argv[i]);
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 13040d3cf..1c0480263 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -87,7 +87,7 @@ static bool check_for_unexpected_hist_args(const history_cmd_opts_t &opts, const
                                   subcmd_str);
         return true;
     }
-    if (args.size() != 0) {
+    if (!args.empty()) {
         const wchar_t *subcmd_str = enum_to_str(opts.hist_cmd, hist_enum_map);
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, subcmd_str, 0, args.size());
         return true;
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index ae21e7cb2..971305ad0 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1109,7 +1109,7 @@ static int string_split_maybe0(parser_t &parser, io_streams_t &streams, int argc
 
     const size_t split_count = splits.size();
     if (!opts.quiet) {
-        if (is_split0 && splits.size()) {
+        if (is_split0 && !splits.empty()) {
             // split0 ignores a trailing \0, so a\0b\0 is two elements.
             // In contrast to split, where a\nb\n is three - "a", "b" and "".
             //
diff --git a/src/common.cpp b/src/common.cpp
index 9e060e2f3..59259496d 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1519,7 +1519,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         // is ANY_STRING, delete the last char and store ANY_STRING_RECURSIVE to
                         // reflect the fact that ** is the recursive wildcard.
                         if (string_last_char(result) == ANY_STRING) {
-                            assert(result.size() > 0);
+                            assert(!result.empty());
                             result.resize(result.size() - 1);
                             to_append_or_none = ANY_STRING_RECURSIVE;
                         } else {
@@ -1561,10 +1561,10 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         brace_count--;
                         brace_text_start = brace_text_start && brace_count > 0;
                         to_append_or_none = BRACE_END;
-                        if (braces.size()) {
+                        if (!braces.empty()) {
                             // If we didn't have a var or separator since the last '{',
                             // put the literal back.
-                            if (!vars_or_seps.size() || vars_or_seps.back() < braces.back()) {
+                            if (vars_or_seps.empty() || vars_or_seps.back() < braces.back()) {
                                 result[braces.back()] = L'{';
                                 // We also need to turn all spaces back.
                                 for (size_t i = braces.back() + 1; i < result.size(); i++) {
@@ -1575,8 +1575,8 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
 
                             // Remove all seps inside the current brace pair, so if we have a
                             // surrounding pair we only get seps inside *that*.
-                            if (vars_or_seps.size()) {
-                                while (vars_or_seps.size() && vars_or_seps.back() > braces.back())
+                            if (!vars_or_seps.empty()) {
+                                while (!vars_or_seps.empty() && vars_or_seps.back() > braces.back())
                                     vars_or_seps.pop_back();
                             }
                             braces.pop_back();
diff --git a/src/fish.cpp b/src/fish.cpp
index 18e29cb18..3fc6fdcbf 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -393,7 +393,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
     // We are an interactive session if we have not been given an explicit
     // command or file to execute and stdin is a tty. Note that the -i or
     // --interactive options also force interactive mode.
-    if (opts->batch_cmds.size() == 0 && optind == argc && isatty(STDIN_FILENO)) {
+    if (opts->batch_cmds.empty() && optind == argc && isatty(STDIN_FILENO)) {
         set_interactive_session(true);
     }
 
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 1b49de34c..318e5274b 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -160,7 +160,7 @@ static void add_char_to_bind_command(wchar_t wc, std::vector<wchar_t> &bind_char
 }
 
 static void output_bind_command(std::vector<wchar_t> &bind_chars) {
-    if (bind_chars.size()) {
+    if (!bind_chars.empty()) {
         std::fputws(L"bind ", stdout);
         for (size_t i = 0; i < bind_chars.size(); i++) {
             std::fputws(char_to_symbol(bind_chars[i], true), stdout);
diff --git a/src/input.cpp b/src/input.cpp
index 565ecd1a7..91803b660 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -407,7 +407,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
 bool inputter_t::mapping_is_match(const input_mapping_t &m) {
     const wcstring &str = m.seq;
 
-    assert(str.size() > 0 && "zero-length input string passed to mapping_is_match!");
+    assert(!str.empty() && "zero-length input string passed to mapping_is_match!");
 
     bool timed = false;
     for (size_t i = 0; i < str.size(); ++i) {
diff --git a/src/parser.cpp b/src/parser.cpp
index e8f3d6a13..0a6955d8f 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -272,7 +272,7 @@ static void print_profile(const std::vector<std::unique_ptr<profile_item_t>> &it
             my_time -= prev->parse + prev->exec;
         }
 
-        if (me->cmd.size() == 0) {
+        if (me->cmd.empty()) {
             continue;
         }
 
diff --git a/src/reader.cpp b/src/reader.cpp
index 2c83ad2ec..43f5dc4c8 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -920,7 +920,7 @@ void reader_data_t::exec_prompt() {
     (void)get_current_winsize();
 
     // If we have any prompts, they must be run non-interactively.
-    if (left_prompt.size() || right_prompt.size()) {
+    if (!left_prompt.empty() || !right_prompt.empty()) {
         scoped_push<bool> noninteractive{&parser().libdata().is_interactive, false};
 
         exec_mode_prompt();
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 49c18c224..450cbc6e9 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -182,7 +182,7 @@ tok_t tokenizer_t::read_string() {
             expecting.push_back(L'}');
             mode |= tok_modes::curly_braces;
         } else if (c == L')') {
-            if (expecting.size() > 0 && expecting.back() == L'}') {
+            if (!expecting.empty() && expecting.back() == L'}') {
                 return this->call_error(tokenizer_error_t::expected_bclose_found_pclose,
                                         this->token_cursor, this->token_cursor, 1);
             }
@@ -196,7 +196,7 @@ tok_t tokenizer_t::read_string() {
             }
             expecting.pop_back();
         } else if (c == L'}') {
-            if (expecting.size() > 0 && expecting.back() == L')') {
+            if (!expecting.empty() && expecting.back() == L')') {
                 return this->call_error(tokenizer_error_t::expected_pclose_found_bclose,
                                         this->token_cursor, this->token_cursor, 1);
             }
@@ -262,13 +262,13 @@ tok_t tokenizer_t::read_string() {
             return this->call_error(tokenizer_error_t::unterminated_slice, buff_start,
                                     this->start + slice_offset);
         } else if (mode & tok_modes::subshell) {
-            assert(paran_offsets.size() > 0);
+            assert(!paran_offsets.empty());
             size_t offset_of_open_paran = paran_offsets.back();
 
             return this->call_error(tokenizer_error_t::unterminated_subshell, buff_start,
                                     this->start + offset_of_open_paran);
         } else if (mode & tok_modes::curly_braces) {
-            assert(brace_offsets.size() > 0);
+            assert(!brace_offsets.empty());
             size_t offset_of_open_brace = brace_offsets.back();
 
             return this->call_error(tokenizer_error_t::unterminated_brace, buff_start,

From 0dfa7421f31948aa80fc173222c64c36d01412cf Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 17:08:16 -0800
Subject: [PATCH 1254/1732] [clang-tidy] Convert C casts to C++ ones

Found with google-readability-casting

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_commandline.cpp  | 13 +++--
 src/builtin_history.cpp      |  2 +-
 src/builtin_jobs.cpp         |  2 +-
 src/builtin_printf.cpp       |  2 +-
 src/builtin_read.cpp         | 10 ++--
 src/builtin_set.cpp          | 10 ++--
 src/builtin_string.cpp       | 16 ++++---
 src/builtin_test.cpp         |  6 ++-
 src/color.cpp                | 10 ++--
 src/common.cpp               | 59 ++++++++++++-----------
 src/complete.cpp             |  2 +-
 src/env_dispatch.cpp         |  2 +-
 src/env_universal_common.cpp |  4 +-
 src/event.cpp                |  6 ++-
 src/exec.cpp                 |  3 +-
 src/expand.cpp               |  9 ++--
 src/fallback.cpp             |  4 +-
 src/fish.cpp                 | 10 ++--
 src/fish_indent.cpp          |  8 ++--
 src/fish_key_reader.cpp      |  4 +-
 src/highlight.cpp            |  2 +-
 src/history.cpp              |  4 +-
 src/history_file.cpp         | 23 ++++-----
 src/input_common.cpp         | 10 ++--
 src/output.cpp               | 10 ++--
 src/pager.cpp                |  8 ++--
 src/parse_execution.cpp      |  9 ++--
 src/parse_tree.cpp           | 10 ++--
 src/parse_util.cpp           | 16 +++----
 src/parser.cpp               |  2 +-
 src/proc.cpp                 |  6 +--
 src/reader.cpp               |  4 +-
 src/screen.cpp               | 54 +++++++++++----------
 src/tinyexpr.cpp             | 92 ++++++++++++++++++------------------
 src/utf8.cpp                 | 16 +++----
 src/wcstringutil.cpp         |  2 +-
 src/wgetopt.cpp              |  8 ++--
 src/wutil.cpp                | 10 +++-
 38 files changed, 249 insertions(+), 219 deletions(-)

diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index bb924a4e5..568dfcca5 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -129,7 +129,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     const wchar_t *current_buffer = 0;
 
     // What the commandline builtin considers to be the current cursor position.
-    size_t current_cursor_pos = (size_t)(-1);
+    size_t current_cursor_pos = static_cast<size_t>(-1);
 
     wchar_t *cmd = argv[0];
     int buffer_part = 0;
@@ -368,10 +368,12 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             }
 
             current_buffer = reader_get_buffer();
-            new_pos = std::max(0L, std::min(new_pos, (long)std::wcslen(current_buffer)));
-            reader_set_buffer(current_buffer, (size_t)new_pos);
+            new_pos =
+                std::max(0L, std::min(new_pos, static_cast<long>(std::wcslen(current_buffer))));
+            reader_set_buffer(current_buffer, static_cast<size_t>(new_pos));
         } else {
-            streams.out.append_format(L"%lu\n", (unsigned long)reader_get_cursor_pos());
+            streams.out.append_format(L"%lu\n",
+                                      static_cast<unsigned long>(reader_get_cursor_pos()));
         }
         return STATUS_CMD_OK;
     }
@@ -379,7 +381,8 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     if (line_mode) {
         size_t pos = reader_get_cursor_pos();
         const wchar_t *buff = reader_get_buffer();
-        streams.out.append_format(L"%lu\n", (unsigned long)parse_util_lineno(buff, pos));
+        streams.out.append_format(L"%lu\n",
+                                  static_cast<unsigned long>(parse_util_lineno(buff, pos)));
         return STATUS_CMD_OK;
     }
 
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 1c0480263..b5acd3b07 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -30,7 +30,7 @@ static const enum_map<hist_cmd_t> hist_enum_map[] = {
 
 struct history_cmd_opts_t {
     hist_cmd_t hist_cmd = HIST_UNDEF;
-    history_search_type_t search_type = (history_search_type_t)-1;
+    history_search_type_t search_type = static_cast<history_search_type_t>(-1);
     const wchar_t *show_time_format = NULL;
     size_t max_items = SIZE_MAX;
     bool print_help = false;
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index fc080b73c..da8389513 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -39,7 +39,7 @@ static int cpu_use(const job_t *j) {
         double t2 = 1000000.0 * t.tv_sec + t.tv_usec;
 
         // std::fwprintf( stderr, L"t1 %f t2 %f p1 %d p2 %d\n", t1, t2, jiffies, p->last_jiffies );
-        u += ((double)(jiffies - p->last_jiffies)) / (t2 - t1);
+        u += (static_cast<double>(jiffies - p->last_jiffies)) / (t2 - t1);
     }
     return u * 1000000;
 }
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index e634d74e5..0d3539e31 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -710,7 +710,7 @@ int builtin_printf_state_t::print_formatted(const wchar_t *format, int argc, wch
                 wchar_t conversion = *f;
                 if (conversion > 0xFF || !ok[conversion]) {
                     this->fatal_error(_(L"%.*ls: invalid conversion specification"),
-                                      (int)(f + 1 - direc_start), direc_start);
+                                      static_cast<int>(f + 1 - direc_start), direc_start);
                     return 0;
                 }
 
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index b2af119d6..7505c4214 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -220,7 +220,7 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
     interactive.restore();
     if (mline) {
         buff = mline.acquire();
-        if (nchars > 0 && (size_t)nchars < buff.size()) {
+        if (nchars > 0 && static_cast<size_t>(nchars) < buff.size()) {
             // Line may be longer than nchars if a keybinding used `commandline -i`
             // note: we're deliberately throwing away the tail of the commandline.
             // It shouldn't be unread because it was produced with `commandline -i`,
@@ -307,13 +307,13 @@ static int read_one_char_at_a_time(int fd, wcstring &buff, int nchars, bool spli
 
             nbytes++;
             if (MB_CUR_MAX == 1) {
-                res = (unsigned char)b;
+                res = static_cast<unsigned char>(b);
                 finished = true;
             } else {
                 size_t sz = std::mbrtowc(&res, &b, 1, &state);
-                if (sz == (size_t)-1) {
+                if (sz == static_cast<size_t>(-1)) {
                     std::memset(&state, 0, sizeof(state));
-                } else if (sz != (size_t)-2) {
+                } else if (sz != static_cast<size_t>(-2)) {
                     finished = true;
                 }
             }
@@ -328,7 +328,7 @@ static int read_one_char_at_a_time(int fd, wcstring &buff, int nchars, bool spli
         if (split_null && res == L'\0') break;
 
         buff.push_back(res);
-        if (nchars > 0 && (size_t)nchars <= buff.size()) {
+        if (nchars > 0 && static_cast<size_t>(nchars) <= buff.size()) {
             break;
         }
     }
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 3aca80a74..3556fd2f2 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -382,7 +382,7 @@ static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_s
             streams.err.append_format(_(L"%ls: Invalid index starting at '%ls'\n"), L"set", src);
             return -1;
         }
-        p = (wchar_t *)end;
+        p = const_cast<wchar_t *>(end);
 
         // Convert negative index to a positive index.
         if (l_ind < 0) l_ind = var.size() + l_ind + 1;
@@ -393,7 +393,7 @@ static int parse_index(std::vector<long> &indexes, wchar_t *src, int scope, io_s
             if (errno > 0) {  // ignore errno == -1 meaning the int did not end with a '\0'
                 return -1;
             }
-            p = (wchar_t *)end;
+            p = const_cast<wchar_t *>(end);
 
             // Convert negative index to a positive index.
             if (l_ind2 < 0) l_ind2 = var.size() + l_ind2 + 1;
@@ -423,7 +423,7 @@ static int update_values(wcstring_list_t &list, std::vector<long> &indexes,
         if (ind < 0) {
             return 1;
         }
-        if ((size_t)ind >= list.size()) {
+        if (static_cast<size_t>(ind) >= list.size()) {
             list.resize(ind + 1);
         }
 
@@ -444,7 +444,7 @@ static void erase_values(wcstring_list_t &list, const std::vector<long> &indexes
     decltype(indexes_set)::const_reverse_iterator iter;
     for (iter = indexes_set.rbegin(); iter != indexes_set.rend(); ++iter) {
         long val = *iter;
-        if (val > 0 && (size_t)val <= list.size()) {
+        if (val > 0 && static_cast<size_t>(val) <= list.size()) {
             // One-based indexing!
             list.erase(list.begin() + val - 1);
         }
@@ -535,7 +535,7 @@ static int builtin_set_query(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
             if (dest_str) dest_str->to_list(result);
 
             for (auto idx : indexes) {
-                if (idx < 1 || (size_t)idx > result.size()) retval++;
+                if (idx < 1 || static_cast<size_t>(idx) > result.size()) retval++;
             }
         } else {
             if (!parser.vars().get(arg, scope)) retval++;
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 971305ad0..4863fcb8a 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -676,7 +676,8 @@ class wildcard_matcher_t : public string_matcher_t {
 
 static wcstring pcre2_strerror(int err_code) {
     wchar_t buf[128];
-    pcre2_get_error_message(err_code, (PCRE2_UCHAR *)buf, sizeof(buf) / sizeof(wchar_t));
+    pcre2_get_error_message(err_code, reinterpret_cast<PCRE2_UCHAR *>(buf),
+                            sizeof(buf) / sizeof(wchar_t));
     return buf;
 }
 
@@ -762,8 +763,7 @@ class pcre2_matcher_t : public string_matcher_t {
 
             if (begin != PCRE2_UNSET && end != PCRE2_UNSET && !opts.quiet) {
                 if (opts.index) {
-                    streams.out.append_format(L"%lu %lu", (unsigned long)(begin + 1),
-                                              (unsigned long)(end - begin));
+                    streams.out.append_format(L"%lu %lu", (begin + 1), (end - begin));
                 } else if (end > begin) {
                     // May have end < begin if \K is used.
                     streams.out.append(arg.substr(begin, end - begin));
@@ -999,7 +999,7 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
                        (opts.all ? PCRE2_SUBSTITUTE_GLOBAL : 0);
     size_t arglen = arg.length();
     PCRE2_SIZE bufsize = (arglen == 0) ? 16 : 2 * arglen;
-    wchar_t *output = (wchar_t *)malloc(sizeof(wchar_t) * bufsize);
+    wchar_t *output = static_cast<wchar_t *>(malloc(sizeof(wchar_t) * bufsize));
     int pcre2_rc;
     PCRE2_SIZE outlen = bufsize;
 
@@ -1012,13 +1012,14 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
                                     options, regex.match,
                                     0,  // match context
                                     PCRE2_SPTR(replacement->c_str()), replacement->length(),
-                                    (PCRE2_UCHAR *)output, &outlen);
+                                    reinterpret_cast<PCRE2_UCHAR *>(output), &outlen);
 
         if (pcre2_rc != PCRE2_ERROR_NOMEMORY || bufsize >= outlen) {
             done = true;
         } else {
             bufsize = outlen;
-            wchar_t *new_output = (wchar_t *)realloc(output, sizeof(wchar_t) * bufsize);
+            wchar_t *new_output =
+                static_cast<wchar_t *>(realloc(output, sizeof(wchar_t) * bufsize));
             if (new_output) output = new_output;
         }
     }
@@ -1195,7 +1196,8 @@ static int string_repeat(parser_t &parser, io_streams_t &streams, int argc, wcha
     arg_iterator_t aiter(argv, optind, streams);
     if (const wcstring *word = aiter.nextstr()) {
         const bool limit_repeat =
-            (opts.max > 0 && word->length() * opts.count > (size_t)opts.max) || !opts.count;
+            (opts.max > 0 && word->length() * opts.count > static_cast<size_t>(opts.max)) ||
+            !opts.count;
         const wcstring repeated =
             limit_repeat ? wcsrepeat_until(*word, opts.max) : wcsrepeat(*word, opts.count);
         is_empty = repeated.empty();
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index db74fceae..1411054ea 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -543,7 +543,8 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
     assert(args.size() > 1);
 
     test_parser parser(args);
-    unique_ptr<expression> result = parser.parse_expression(0, (unsigned int)args.size());
+    unique_ptr<expression> result =
+        parser.parse_expression(0, static_cast<unsigned int>(args.size()));
 
     // Handle errors.
     // For now we only show the first error.
@@ -561,7 +562,8 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
         if (result->range.end < args.size()) {
             if (err.empty()) {
                 append_format(err, L"%ls: unexpected argument at index %lu: '%ls'\n", program_name,
-                              (unsigned long)result->range.end, args.at(result->range.end).c_str());
+                              static_cast<unsigned long>(result->range.end),
+                              args.at(result->range.end).c_str());
             }
             result.reset(NULL);
         }
diff --git a/src/color.cpp b/src/color.cpp
index 30e1dfdfb..c41dfd38e 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -88,15 +88,15 @@ static int parse_hex_digit(wchar_t x) {
 }
 
 static unsigned long squared_difference(long p1, long p2) {
-    unsigned long diff = (unsigned long)labs(p1 - p2);
+    unsigned long diff = static_cast<unsigned long>(labs(p1 - p2));
     return diff * diff;
 }
 
 static unsigned char convert_color(const unsigned char rgb[3], const uint32_t *colors,
                                    size_t color_count) {
     long r = rgb[0], g = rgb[1], b = rgb[2];
-    unsigned long best_distance = (unsigned long)-1;
-    unsigned char best_index = (unsigned char)-1;
+    unsigned long best_distance = static_cast<unsigned long>(-1);
+    unsigned char best_index = static_cast<unsigned char>(-1);
     for (unsigned char idx = 0; idx < color_count; idx++) {
         uint32_t color = colors[idx];
         long test_r = (color >> 16) & 0xFF, test_g = (color >> 8) & 0xFF,
@@ -294,7 +294,7 @@ unsigned char rgb_color_t::to_name_index() const {
     assert(type == type_named || type == type_rgb);
     if (type == type_named) return data.name_idx;
     if (type == type_rgb) return term16_color_for_rgb(data.color.rgb);
-    return (unsigned char)-1;  // this is an error
+    return static_cast<unsigned char>(-1);  // this is an error
 }
 
 void rgb_color_t::parse(const wcstring &str) {
@@ -320,7 +320,7 @@ wcstring rgb_color_t::description() const {
             return L"none";
         }
         case type_named: {
-            return format_string(L"named(%d: %ls)", (int)data.name_idx,
+            return format_string(L"named(%d: %ls)", static_cast<int>(data.name_idx),
                                  name_for_color_idx(data.name_idx));
         }
         case type_rgb: {
diff --git a/src/common.cpp b/src/common.cpp
index 59259496d..f251db257 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -222,7 +222,7 @@ bool is_windows_subsystem_for_linux() {
                 demangled = abi::__cxa_demangle(info.dli_sname, NULL, 0, &status);
             swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels,
                      status == 0 ? demangled : info.dli_sname == 0 ? symbols[i] : info.dli_sname,
-                     (char *)callstack[i] - (char *)info.dli_saddr);
+                     static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr));
             free(demangled);
         } else {
             swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s", i - skip_levels, symbols[i]);
@@ -272,7 +272,7 @@ int fgetws2(wcstring *s, FILE *f) {
             }
             default: {
                 i++;
-                s->push_back((wchar_t)c);
+                s->push_back(static_cast<wchar_t>(c));
                 break;
             }
         }
@@ -296,7 +296,7 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
     if (MB_CUR_MAX == 1) {
         // Single-byte locale, all values are legal.
         while (in_pos < in_len) {
-            result.push_back((unsigned char)in[in_pos]);
+            result.push_back(static_cast<unsigned char>(in[in_pos]));
             in_pos++;
         }
         return result;
@@ -325,10 +325,10 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
                 use_encode_direct = true;
             } else if (wc == INTERNAL_SEPARATOR) {
                 use_encode_direct = true;
-            } else if (ret == (size_t)-2) {
+            } else if (ret == static_cast<size_t>(-2)) {
                 // Incomplete sequence.
                 use_encode_direct = true;
-            } else if (ret == (size_t)-1) {
+            } else if (ret == static_cast<size_t>(-1)) {
                 // Invalid data.
                 use_encode_direct = true;
             } else if (ret > in_len - in_pos) {
@@ -343,7 +343,7 @@ static wcstring str2wcs_internal(const char *in, const size_t in_len) {
         }
 
         if (use_encode_direct) {
-            wc = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos];
+            wc = ENCODE_DIRECT_BASE + static_cast<unsigned char>(in[in_pos]);
             result.push_back(wc);
             in_pos++;
             std::memset(&state, 0, sizeof state);
@@ -390,7 +390,7 @@ char *wcs2str(const wchar_t *in, size_t len) {
     }
 
     // Here we probably allocate a buffer probably much larger than necessary.
-    char *out = (char *)malloc(MAX_UTF8_BYTES * len + 1);
+    char *out = static_cast<char *>(malloc(MAX_UTF8_BYTES * len + 1));
     assert(out);
     // Instead of returning the return value of wcs2str_internal, return `out` directly.
     // This eliminates false warnings in coverity about resource leaks.
@@ -425,7 +425,7 @@ std::string wcs2string(const wcstring &input) {
         } else {
             std::memset(converted, 0, sizeof converted);
             size_t len = std::wcrtomb(converted, wc, &state);
-            if (len == (size_t)-1) {
+            if (len == static_cast<size_t>(-1)) {
                 FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation", wc);
                 std::memset(&state, 0, sizeof(state));
             } else {
@@ -459,11 +459,11 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
             if (in[in_pos] & ~0xFF) {
                 out[out_pos++] = '?';
             } else {
-                out[out_pos++] = (unsigned char)in[in_pos];
+                out[out_pos++] = static_cast<unsigned char>(in[in_pos]);
             }
         } else {
             size_t len = std::wcrtomb(&out[out_pos], in[in_pos], &state);
-            if (len == (size_t)-1) {
+            if (len == static_cast<size_t>(-1)) {
                 FLOGF(char_encoding, L"Wide character U+%4X has no narrow representation",
                       in[in_pos]);
                 std::memset(&state, 0, sizeof(state));
@@ -483,7 +483,7 @@ static bool can_be_encoded(wchar_t wc) {
     char converted[MB_LEN_MAX];
     mbstate_t state = {};
 
-    return std::wcrtomb(converted, wc, &state) != (size_t)-1;
+    return std::wcrtomb(converted, wc, &state) != static_cast<size_t>(-1);
 }
 
 wcstring format_string(const wchar_t *format, ...) {
@@ -520,7 +520,7 @@ void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig) {
                 buff[0] = '\0';
                 break;
             }
-            buff = (wchar_t *)realloc((buff == static_buff ? NULL : buff), size);
+            buff = static_cast<wchar_t *>(realloc((buff == static_buff ? NULL : buff), size));
             assert(buff != NULL);
         }
 
@@ -566,7 +566,7 @@ wchar_t *quote_end(const wchar_t *pos) {
             if (!*pos) return 0;
         } else {
             if (*pos == c) {
-                return (wchar_t *)pos;
+                return const_cast<wchar_t *>(pos);
             }
         }
     }
@@ -613,7 +613,7 @@ long read_blocked(int fd, void *buf, size_t count) {
     long bytes_read = 0;
 
     while (count) {
-        ssize_t res = read(fd, (char *)buf + bytes_read, count);
+        ssize_t res = read(fd, static_cast<char *>(buf) + bytes_read, count);
         if (res == 0) {
             break;
         } else if (res == -1) {
@@ -640,10 +640,10 @@ ssize_t write_loop(int fd, const char *buff, size_t count) {
                 return -1;
             }
         } else {
-            out_cum += (size_t)out;
+            out_cum += static_cast<size_t>(out);
         }
     }
-    return (ssize_t)out_cum;
+    return static_cast<ssize_t>(out_cum);
 }
 
 ssize_t read_loop(int fd, void *buff, size_t count) {
@@ -664,11 +664,12 @@ bool should_suppress_stderr_for_tests() {
 static void debug_shared(const wchar_t level, const wcstring &msg) {
     pid_t current_pid;
     if (!is_forked_child()) {
-        std::fwprintf(stderr, L"<%lc> %ls: %ls\n", (unsigned long)level, program_name, msg.c_str());
+        std::fwprintf(stderr, L"<%lc> %ls: %ls\n", static_cast<unsigned long>(level), program_name,
+                      msg.c_str());
     } else {
         current_pid = getpid();
-        std::fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", (unsigned long)level, program_name,
-                      current_pid, msg.c_str());
+        std::fwprintf(stderr, L"<%lc> %ls: %d: %ls\n", static_cast<unsigned long>(level),
+                      program_name, current_pid, msg.c_str());
     }
 }
 
@@ -874,11 +875,11 @@ static void escape_string_url(const wcstring &in, wcstring &out) {
     const std::string narrow = wcs2string(in);
     for (auto &c1 : narrow) {
         // This silliness is so we get the correct result whether chars are signed or unsigned.
-        unsigned int c2 = (unsigned int)c1 & 0xFF;
+        unsigned int c2 = static_cast<unsigned int>(c1) & 0xFF;
         if (!(c2 & 0x80) &&
             (isalnum(c2) || c2 == '/' || c2 == '.' || c2 == '~' || c2 == '-' || c2 == '_')) {
             // The above characters don't need to be encoded.
-            out.push_back((wchar_t)c2);
+            out.push_back(static_cast<wchar_t>(c2));
         } else {
             // All other chars need to have their UTF-8 representation encoded in hex.
             wchar_t buf[4];
@@ -926,14 +927,14 @@ static void escape_string_var(const wcstring &in, wcstring &out) {
     const std::string narrow = wcs2string(in);
     for (auto c1 : narrow) {
         // This silliness is so we get the correct result whether chars are signed or unsigned.
-        unsigned int c2 = (unsigned int)c1 & 0xFF;
+        unsigned int c2 = static_cast<unsigned int>(c1) & 0xFF;
         if (!(c2 & 0x80) && isalnum(c2) && (!prev_was_hex_encoded || !is_hex_digit(c2))) {
             // ASCII alphanumerics don't need to be encoded.
             if (prev_was_hex_encoded) {
                 out.push_back(L'_');
                 prev_was_hex_encoded = false;
             }
-            out.push_back((wchar_t)c2);
+            out.push_back(static_cast<wchar_t>(c2));
         } else if (c2 == '_') {
             // Underscores are encoded by doubling them.
             out.append(L"__");
@@ -1333,7 +1334,7 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
                     max_val = WCHAR_MAX;
 
                     // Don't exceed the largest Unicode code point - see #1107.
-                    if (0x10FFFF < max_val) max_val = (wchar_t)0x10FFFF;
+                    if (0x10FFFF < max_val) max_val = static_cast<wchar_t>(0x10FFFF);
                     break;
                 }
                 case L'x': {
@@ -1368,7 +1369,8 @@ maybe_t<size_t> read_unquoted_escape(const wchar_t *input, wcstring *result, boo
             }
 
             if (res <= max_val) {
-                result_char_or_none = (wchar_t)((byte_literal ? ENCODE_DIRECT_BASE : 0) + res);
+                result_char_or_none =
+                    static_cast<wchar_t>((byte_literal ? ENCODE_DIRECT_BASE : 0) + res);
             } else {
                 errored = true;
             }
@@ -2156,11 +2158,12 @@ wcstring format_size(long long sz) {
 
         for (i = 0; sz_name[i]; i++) {
             if (sz < (1024 * 1024) || !sz_name[i + 1]) {
-                long isz = ((long)sz) / 1024;
+                long isz = (static_cast<long>(sz)) / 1024;
                 if (isz > 9)
                     result.append(format_string(L"%d%ls", isz, sz_name[i]));
                 else
-                    result.append(format_string(L"%.1f%ls", (double)sz / 1024, sz_name[i]));
+                    result.append(
+                        format_string(L"%.1f%ls", static_cast<double>(sz) / 1024, sz_name[i]));
                 break;
             }
             sz /= 1024;
@@ -2234,7 +2237,7 @@ double timef() {
     struct timeval tv;
     assert_with_errno(gettimeofday(&tv, 0) != -1);
     // return (double)tv.tv_sec + 0.000001 * tv.tv_usec;
-    return (double)tv.tv_sec + 1e-6 * tv.tv_usec;
+    return static_cast<double>(tv.tv_sec) + 1e-6 * tv.tv_usec;
 }
 
 void exit_without_destructors(int code) { _exit(code); }
diff --git a/src/complete.cpp b/src/complete.cpp
index 79ebaa723..d4c8d1530 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -156,7 +156,7 @@ template <>
 struct hash<completion_entry_t> {
     size_t operator()(const completion_entry_t &c) const {
         std::hash<wcstring> hasher;
-        return hasher((wcstring)c.cmd);
+        return hasher(wcstring(c.cmd));
     }
 };
 template <>
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 2e91b4d94..bf70a41cd 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -397,7 +397,7 @@ static bool initialize_curses_using_fallback(const char *term) {
     if (is_interactive_session()) debug(1, _(L"Using fallback terminal type '%s'."), term);
 
     int err_ret;
-    if (setupterm((char *)term, STDOUT_FILENO, &err_ret) == OK) return true;
+    if (setupterm(const_cast<char *>(term), STDOUT_FILENO, &err_ret) == OK) return true;
     if (is_interactive_session()) {
         debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
     }
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 122a0a16c..c091a3526 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -147,7 +147,7 @@ static wcstring full_escape(const wcstring &in) {
     for (wchar_t c : in) {
         if (is_universal_safe_to_encode_directly(c)) {
             out.push_back(c);
-        } else if (c <= (wchar_t)ASCII_MAX) {
+        } else if (c <= static_cast<wchar_t>(ASCII_MAX)) {
             // See #1225 for discussion of use of ASCII_MAX here.
             append_format(out, L"\\x%.2x", c);
         } else if (c < 65536) {
@@ -1380,7 +1380,7 @@ class universal_notifier_named_pipe_t : public universal_notifier_t {
                 // Oops, it already passed! Return something tiny.
                 readback_delay = 1000;
             } else {
-                readback_delay = (unsigned long)(this->readback_time_usec - now);
+                readback_delay = static_cast<unsigned long>(this->readback_time_usec - now);
             }
         }
 
diff --git a/src/event.cpp b/src/event.cpp
index a60f25ae2..69f41a3aa 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -91,7 +91,8 @@ static owning_lock<event_handler_list_t> s_event_handlers;
 static volatile sig_atomic_t s_observed_signals[NSIG] = {};
 
 static void set_signal_observed(int sig, bool val) {
-    if (sig >= 0 && (size_t)sig < sizeof s_observed_signals / sizeof *s_observed_signals) {
+    if (sig >= 0 &&
+        static_cast<size_t>(sig) < sizeof s_observed_signals / sizeof *s_observed_signals) {
         s_observed_signals[sig] = val;
     }
 }
@@ -232,7 +233,8 @@ event_handler_list_t event_get_function_handlers(const wcstring &name) {
 bool event_is_signal_observed(int sig) {
     // We are in a signal handler! Don't allocate memory, etc.
     bool result = false;
-    if (sig >= 0 && (unsigned long)sig < sizeof(s_observed_signals) / sizeof(*s_observed_signals)) {
+    if (sig >= 0 && static_cast<unsigned long>(sig) <
+                        sizeof(s_observed_signals) / sizeof(*s_observed_signals)) {
         result = s_observed_signals[sig];
     }
     return result;
diff --git a/src/exec.cpp b/src/exec.cpp
index fcc194341..02f6db8bb 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1264,7 +1264,8 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
             const char *cursor = begin;
             while (cursor < end) {
                 // Look for the next separator.
-                const char *stop = (const char *)std::memchr(cursor, '\n', end - cursor);
+                const char *stop =
+                    static_cast<const char *>(std::memchr(cursor, '\n', end - cursor));
                 const bool hit_separator = (stop != NULL);
                 if (!hit_separator) {
                     // If it's not found, just use the end.
diff --git a/src/expand.cpp b/src/expand.cpp
index 4094a68ea..71ef2ce31 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -150,7 +150,7 @@ wcstring expand_escape_variable(const env_var_t &var) {
 /// with [.
 static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long> &idx,
                           size_t array_size) {
-    const long size = (long)array_size;
+    const long size = static_cast<long>(array_size);
     size_t pos = 1;  // skip past the opening square brace
 
     int zero_index = -1;
@@ -234,7 +234,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
     }
 
     if (end_ptr) {
-        *end_ptr = (wchar_t *)(in + pos);
+        *end_ptr = const_cast<wchar_t *>(in + pos);
     }
 
     return 0;
@@ -621,7 +621,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
         tail_begin = slice_end;
         for (i = 0; i < slice_idx.size(); i++) {
             long idx = slice_idx.at(i);
-            if ((size_t)idx > sub_res.size() || idx < 1) {
+            if (static_cast<size_t>(idx) > sub_res.size() || idx < 1) {
                 continue;
             }
             idx = idx - 1;
@@ -811,7 +811,8 @@ wcstring replace_home_directory_with_tilde(const wcstring &str, const environmen
 /// equivalents. This is done to support skip_wildcards.
 static void remove_internal_separator(wcstring *str, bool conv) {
     // Remove all instances of INTERNAL_SEPARATOR.
-    str->erase(std::remove(str->begin(), str->end(), (wchar_t)INTERNAL_SEPARATOR), str->end());
+    str->erase(std::remove(str->begin(), str->end(), static_cast<wchar_t>(INTERNAL_SEPARATOR)),
+               str->end());
 
     // If conv is true, replace all instances of ANY_STRING with '*',
     // ANY_STRING_RECURSIVE with '*'.
diff --git a/src/fallback.cpp b/src/fallback.cpp
index fc5818884..c7ab786dc 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -77,7 +77,7 @@ int fish_mkstemp_cloexec(char *name_template) {
 // cppcheck-suppress unusedFunction
 [[gnu::unused]] static wchar_t *wcsdup_fallback(const wchar_t *in) {
     size_t len = std::wcslen(in);
-    wchar_t *out = (wchar_t *)malloc(sizeof(wchar_t) * (len + 1));
+    wchar_t *out = static_cast<wchar_t *>(malloc(sizeof(wchar_t) * (len + 1)));
     if (out == 0) {
         return 0;
     }
@@ -162,7 +162,7 @@ int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t n) {
 
 #ifndef HAVE_WCSNDUP
 wchar_t *wcsndup(const wchar_t *in, size_t c) {
-    wchar_t *res = (wchar_t *)malloc(sizeof(wchar_t) * (c + 1));
+    wchar_t *res = static_cast<wchar_t *>(malloc(sizeof(wchar_t) * (c + 1)));
     if (res == 0) {
         return 0;
     }
diff --git a/src/fish.cpp b/src/fish.cpp
index 3fc6fdcbf..e1284c3f3 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -83,8 +83,8 @@ static const char *s_profiling_output_filename = NULL;
 
 /// \return a timeval converted to milliseconds.
 long long tv_to_msec(const struct timeval &tv) {
-    long long msec = (long long)tv.tv_sec * 1000;  // milliseconds per second
-    msec += tv.tv_usec / 1000;                     // microseconds per millisecond
+    long long msec = static_cast<long long>(tv.tv_sec) * 1000;  // milliseconds per second
+    msec += tv.tv_usec / 1000;                                  // microseconds per millisecond
     return msec;
 }
 
@@ -299,7 +299,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
-                    debug_level = (int)tmp;
+                    debug_level = static_cast<int>(tmp);
                 } else {
                     activate_flog_categories_by_pattern(str2wcstring(optarg));
                 }
@@ -338,7 +338,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 // Compute width of longest name.
                 int name_width = 0;
                 for (const auto *cat : cats) {
-                    name_width = std::max(name_width, (int)wcslen(cat->name));
+                    name_width = std::max(name_width, static_cast<int>(wcslen(cat->name)));
                 }
                 // A little extra space.
                 name_width += 2;
@@ -371,7 +371,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-                    set_debug_stack_frames((int)tmp);
+                    set_debug_stack_frames(static_cast<int>(tmp));
                 } else {
                     std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"),
                                   optarg);
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 7e228807e..624f725e2 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -73,7 +73,7 @@ static wcstring read_file(FILE *f) {
             }
             break;
         }
-        result.push_back((wchar_t)c);
+        result.push_back(static_cast<wchar_t>(c));
     }
     return result;
 }
@@ -140,7 +140,7 @@ static void dump_node(indent_t node_indent, const parse_node_t &node, const wcst
     wcstring source_txt = L"";
     if (node.source_start != SOURCE_OFFSET_INVALID && node.source_length != SOURCE_OFFSET_INVALID) {
         int nextc_idx = node.source_start + node.source_length;
-        if ((size_t)nextc_idx < source.size()) {
+        if (static_cast<size_t>(nextc_idx) < source.size()) {
             nextc = source[node.source_start + node.source_length];
         }
         if (node.source_start > 0) prevc = source[node.source_start - 1];
@@ -565,7 +565,7 @@ int main(int argc, char *argv[]) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
-                    debug_level = (int)tmp;
+                    debug_level = static_cast<int>(tmp);
                 } else {
                     std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag"), optarg);
                     exit(1);
@@ -580,7 +580,7 @@ int main(int argc, char *argv[]) {
                 tmp = strtol(optarg, &end, 10);
 
                 if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-                    set_debug_stack_frames((int)tmp);
+                    set_debug_stack_frames(static_cast<int>(tmp));
                 } else {
                     std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag"),
                                   optarg);
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 318e5274b..fad5e7903 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -319,7 +319,7 @@ static bool parse_debug_level_flag() {
     long tmp = strtol(optarg, &end, 10);
 
     if (tmp >= 0 && tmp <= 10 && !*end && !errno) {
-        debug_level = (int)tmp;
+        debug_level = static_cast<int>(tmp);
     } else {
         std::fwprintf(stderr, _(L"Invalid value '%s' for debug-level flag\n"), optarg);
         return false;
@@ -333,7 +333,7 @@ static bool parse_debug_frames_flag() {
     char *end;
     long tmp = strtol(optarg, &end, 10);
     if (tmp > 0 && tmp <= 128 && !*end && !errno) {
-        set_debug_stack_frames((int)tmp);
+        set_debug_stack_frames(static_cast<int>(tmp));
     } else {
         std::fwprintf(stderr, _(L"Invalid value '%s' for debug-stack-frames flag\n"), optarg);
         return false;
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 0972072ad..13e85386d 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1422,7 +1422,7 @@ static void highlight_universal_internal(const wcstring &buffstr,
             wchar_t inc_char = c;
             int level = 0;
             bool match_found = false;
-            for (long i = pos; i >= 0 && (size_t)i < buffstr.size(); i += step) {
+            for (long i = pos; i >= 0 && static_cast<size_t>(i) < buffstr.size(); i += step) {
                 const wchar_t test_char = buffstr.at(i);
                 if (test_char == inc_char) level++;
                 if (test_char == dec_char) level--;
diff --git a/src/history.cpp b/src/history.cpp
index a245fb948..f277e8d74 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -378,7 +378,7 @@ void history_impl_t::save_unless_disabled() {
     // the counter.
     const int kVacuumFrequency = 25;
     if (countdown_to_vacuum < 0) {
-        unsigned int seed = (unsigned int)time(NULL);
+        unsigned int seed = static_cast<unsigned int>(time(NULL));
         // Generate a number in the range [0, kVacuumFrequency).
         countdown_to_vacuum = rand_r(&seed) / (RAND_MAX / kVacuumFrequency + 1);
     }
@@ -582,7 +582,7 @@ void history_impl_t::load_old_if_needed() {
 
 bool history_search_t::go_backwards() {
     // Backwards means increasing our index.
-    const size_t max_index = (size_t)-1;
+    const size_t max_index = static_cast<size_t>(-1);
 
     if (current_index_ == max_index) return false;
 
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 48bda1c3f..97a89c9ee 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -183,7 +183,7 @@ static size_t read_line(const char *base, size_t cursor, size_t len, std::string
     // Locate the newline.
     assert(cursor <= len);
     const char *start = base + cursor;
-    const char *a_newline = (char *)std::memchr(start, '\n', len - cursor);
+    const char *a_newline = static_cast<const char *>(std::memchr(start, '\n', len - cursor));
     if (a_newline != NULL) {  // we found a newline
         result.assign(start, a_newline - start);
         // Return the amount to advance the cursor; skip over the newline.
@@ -303,7 +303,7 @@ static bool parse_timestamp(const char *str, time_t *out_when) {
     // Try to parse a timestamp.
     long timestamp = 0;
     if (isdigit(*cursor) && (timestamp = strtol(cursor, NULL, 0)) > 0) {
-        *out_when = (time_t)timestamp;
+        *out_when = static_cast<time_t>(timestamp);
         return true;
     }
     return false;
@@ -350,7 +350,8 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         const char *line_start = contents.address_at(cursor);
 
         // Advance the cursor to the next line.
-        const char *a_newline = (const char *)std::memchr(line_start, '\n', length - cursor);
+        const char *a_newline =
+            static_cast<const char *>(std::memchr(line_start, '\n', length - cursor));
         if (a_newline == NULL) break;
 
         // Advance the cursor past this line. +1 is for the newline.
@@ -371,7 +372,7 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         // leading "- cmd: - cmd: - cmd:". Trim all but one leading "- cmd:".
         const char *double_cmd = "- cmd: - cmd: ";
         const size_t double_cmd_len = std::strlen(double_cmd);
-        while ((size_t)(a_newline - line_start) > double_cmd_len &&
+        while (static_cast<size_t>(a_newline - line_start) > double_cmd_len &&
                !std::memcmp(line_start, double_cmd, double_cmd_len)) {
             // Skip over just one of the - cmd. In the end there will be just one left.
             line_start += std::strlen("- cmd: ");
@@ -381,7 +382,7 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         // 123456". Ignore those.
         const char *cmd_when = "- cmd:    when:";
         const size_t cmd_when_len = std::strlen(cmd_when);
-        if ((size_t)(a_newline - line_start) >= cmd_when_len &&
+        if (static_cast<size_t>(a_newline - line_start) >= cmd_when_len &&
             !std::memcmp(line_start, cmd_when, cmd_when_len)) {
             continue;
         }
@@ -485,18 +486,18 @@ static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
         mbstate_t state = {};
 
         if (MB_CUR_MAX == 1) {  // single-byte locale
-            c = (unsigned char)*pos;
+            c = static_cast<unsigned char>(*pos);
             res = 1;
         } else {
             res = std::mbrtowc(&c, pos, end - pos, &state);
         }
 
-        if (res == (size_t)-1) {
+        if (res == static_cast<size_t>(-1)) {
             pos++;
             continue;
-        } else if (res == (size_t)-2) {
+        } else if (res == static_cast<size_t>(-2)) {
             break;
-        } else if (res == (size_t)0) {
+        } else if (res == static_cast<size_t>(0)) {
             pos++;
             continue;
         }
@@ -508,7 +509,7 @@ static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
                 while (*time_string && !iswdigit(*time_string)) time_string++;
 
                 if (*time_string) {
-                    time_t tm = (time_t)fish_wcstol(time_string);
+                    time_t tm = static_cast<time_t>(fish_wcstol(time_string));
                     if (!errno && tm >= 0) {
                         timestamp = tm;
                     }
@@ -538,7 +539,7 @@ static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
 /// Adapted from history_populate_from_mmap in history.c
 static size_t offset_of_next_item_fish_1_x(const char *begin, size_t mmap_length,
                                            size_t *inout_cursor) {
-    if (mmap_length == 0 || *inout_cursor >= mmap_length) return (size_t)-1;
+    if (mmap_length == 0 || *inout_cursor >= mmap_length) return static_cast<size_t>(-1);
 
     const char *end = begin + mmap_length;
     const char *pos;
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 2dc4c203e..29b849895 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -71,8 +71,8 @@ char_event_t input_event_queue_t::readb() {
         const unsigned long usecs_delay = notifier.usec_delay_between_polls();
         if (usecs_delay > 0) {
             unsigned long usecs_per_sec = 1000000;
-            tv.tv_sec = (int)(usecs_delay / usecs_per_sec);
-            tv.tv_usec = (int)(usecs_delay % usecs_per_sec);
+            tv.tv_sec = static_cast<int>(usecs_delay / usecs_per_sec);
+            tv.tv_usec = static_cast<int>(usecs_delay % usecs_per_sec);
         }
 
         res = select(fd_max + 1, &fdset, 0, 0, usecs_delay > 0 ? &tv : NULL);
@@ -144,7 +144,7 @@ void update_wait_on_escape_ms(const environment_t &vars) {
                       L"is not an integer or is < 10 or >= 5000 ms\n",
                       escape_time_ms->as_string().c_str());
     } else {
-        wait_on_escape_ms = (int)tmp;
+        wait_on_escape_ms = static_cast<int>(tmp);
     }
 }
 
@@ -186,12 +186,12 @@ char_event_t input_event_queue_t::readch() {
         size_t sz = std::mbrtowc(&res, &bb, 1, &state);
 
         switch (sz) {
-            case (size_t)(-1): {
+            case static_cast<size_t>(-1): {
                 std::memset(&state, '\0', sizeof(state));
                 debug(2, L"Illegal input");
                 return char_event_type_t::check_exit;
             }
-            case (size_t)(-2): {
+            case static_cast<size_t>(-2): {
                 break;
             }
             case 0: {
diff --git a/src/output.cpp b/src/output.cpp
index a50671a34..5ebf1e1db 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -36,7 +36,9 @@
 static color_support_t color_support = 0;
 
 /// Returns true if we think tparm can handle outputting a color index
-static bool term_supports_color_natively(unsigned int c) { return (unsigned)max_colors >= c + 1; }
+static bool term_supports_color_natively(unsigned int c) {
+    return static_cast<unsigned>(max_colors) >= c + 1;
+}
 
 color_support_t output_get_color_support() { return color_support; }
 
@@ -361,7 +363,7 @@ int outputter_t::term_puts(const char *str, int affcnt) {
     scoped_push<outputter_t *> push(&s_tputs_receiver, this);
     // On some systems, tputs takes a char*, on others a const char*.
     // Like tparm, we just cast it to unconst, that should work everywhere.
-    return tputs((char *)str, affcnt, tputs_writer);
+    return tputs(const_cast<char *>(str), affcnt, tputs_writer);
 }
 
 /// Write a wide character to the outputter. This should only be used when writing characters from
@@ -384,7 +386,7 @@ int outputter_t::writech(wint_t ch) {
     } else {
         mbstate_t state = {};
         len = std::wcrtomb(buff, ch, &state);
-        if (len == (size_t)-1) {
+        if (len == static_cast<size_t>(-1)) {
             return 1;
         }
     }
@@ -400,7 +402,7 @@ void outputter_t::writestr(const wchar_t *str) {
     assert(str && "Empty input string");
 
     size_t len = wcstombs(0, str, 0);  // figure amount of space needed
-    if (len == (size_t)-1) {
+    if (len == static_cast<size_t>(-1)) {
         debug(1, L"Tried to print invalid wide character string");
         return;
     }
diff --git a/src/pager.cpp b/src/pager.cpp
index 233730663..dd66e8b60 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -421,7 +421,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
         this->available_term_height - 1 -
         (search_field_shown ? 1 : 0);  // we always subtract 1 to make room for a comment row
     if (!this->fully_disclosed) {
-        term_height = std::min(term_height, (size_t)PAGER_UNDISCLOSED_MAX_ROWS);
+        term_height = std::min(term_height, static_cast<size_t>(PAGER_UNDISCLOSED_MAX_ROWS));
     }
 
     size_t row_count = divide_round_up(lst.size(), cols);
@@ -494,7 +494,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
     assert(rendering->remaining_to_disclose != 1);
     if (rendering->remaining_to_disclose > 1) {
         progress_text = format_string(_(L"%lsand %lu more rows"), get_ellipsis_str(),
-                                      (unsigned long)rendering->remaining_to_disclose);
+                                      static_cast<unsigned long>(rendering->remaining_to_disclose));
     } else if (start_row > 0 || stop_row < row_count) {
         // We have a scrollable interface. The +1 here is because we are zero indexed, but want
         // to present things as 1-indexed. We do not add 1 to stop_row or row_count because
@@ -566,7 +566,7 @@ page_rendering_t pager_t::render() const {
             continue;
         }
 
-        rendering.cols = (size_t)cols;
+        rendering.cols = cols;
         rendering.rows = min_rows_required_for_cols;
         rendering.selected_completion_idx =
             this->visual_selected_completion_index(rendering.rows, rendering.cols);
@@ -659,7 +659,7 @@ bool pager_t::select_next_completion_in_direction(selection_motion_t direction,
         // Cardinal directions. We have a completion index; we wish to compute its row and column.
         size_t current_row = this->get_selected_row(rendering);
         size_t current_col = this->get_selected_column(rendering);
-        size_t page_height = std::max(rendering.term_height - 1, (size_t)1);
+        size_t page_height = std::max(rendering.term_height - 1, static_cast<size_t>(1));
 
         switch (direction) {
             case selection_motion_t::page_north: {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 5fa50b16d..908317faf 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -699,7 +699,8 @@ static wcstring reconstruct_orig_str(wcstring tokenized_str) {
         // However, anyone writing the former is asking for trouble so I don't feel bad about not
         // accurately reconstructing what they typed.
         wcstring new_str = wcstring(tokenized_str);
-        std::replace(new_str.begin(), new_str.end(), (wchar_t)VARIABLE_EXPAND_SINGLE, L'$');
+        std::replace(new_str.begin(), new_str.end(), static_cast<wchar_t>(VARIABLE_EXPAND_SINGLE),
+                     L'$');
         orig_str = L"\"" + new_str + L"\"";
     }
 
@@ -1308,7 +1309,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             exec_time = get_time();
             profile_item->level = parser->eval_level;
             profile_item->parse = 0;
-            profile_item->exec = (int)(exec_time - start_time);
+            profile_item->exec = static_cast<int>(exec_time - start_time);
             profile_item->cmd = profiling_cmd_name_for_redirectable_block(
                 specific_statement, this->tree(), this->pstree->src);
             profile_item->skipped = false;
@@ -1386,8 +1387,8 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     if (profile_item != NULL) {
         exec_time = get_time();
         profile_item->level = parser->eval_level;
-        profile_item->parse = (int)(parse_time - start_time);
-        profile_item->exec = (int)(exec_time - parse_time);
+        profile_item->parse = static_cast<int>(parse_time - start_time);
+        profile_item->exec = static_cast<int>(exec_time - parse_time);
         profile_item->cmd = job ? job->command() : wcstring();
         profile_item->skipped = !populated_job;
     }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 7898b7f5b..a47d6fe3b 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -306,10 +306,10 @@ static void dump_tree_recursive(const parse_node_tree_t &nodes, const wcstring &
 
     if (node.type != parse_token_type_string) {
         if (node.has_source()) {
-            append_format(*result, L"  [%ld, %ld]", (long)node.source_start,
-                          (long)node.source_length);
+            append_format(*result, L"  [%ld, %ld]", static_cast<long>(node.source_start),
+                          static_cast<long>(node.source_length));
         } else {
-            append_format(*result, L"  [%ld, no src]", (long)node.source_start);
+            append_format(*result, L"  [%ld, no src]", static_cast<long>(node.source_start));
         }
     }
 
@@ -1054,10 +1054,10 @@ static inline parse_token_t next_parse_token(tokenizer_t *tok, maybe_t<tok_t> *o
     // uint32_t to save some space. If we have a source file larger than 4 GB, we'll probably just
     // crash.
     assert(token.offset < SOURCE_OFFSET_INVALID);
-    result.source_start = (source_offset_t)token.offset;
+    result.source_start = static_cast<source_offset_t>(token.offset);
 
     assert(token.length <= SOURCE_OFFSET_INVALID);
-    result.source_length = (source_offset_t)token.length;
+    result.source_length = static_cast<source_offset_t>(token.length);
 
     return result;
 }
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 6b99bebfd..027d8c834 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -77,11 +77,11 @@ size_t parse_util_get_offset_from_line(const wcstring &str, int line) {
     size_t i;
     int count = 0;
 
-    if (line < 0) return (size_t)-1;
+    if (line < 0) return static_cast<size_t>(-1);
     if (line == 0) return 0;
 
     for (i = 0;; i++) {
-        if (!buff[i]) return (size_t)-1;
+        if (!buff[i]) return static_cast<size_t>(-1);
 
         if (buff[i] == L'\n') {
             count++;
@@ -96,11 +96,11 @@ size_t parse_util_get_offset(const wcstring &str, int line, long line_offset) {
     size_t off = parse_util_get_offset_from_line(str, line);
     size_t off2 = parse_util_get_offset_from_line(str, line + 1);
 
-    if (off == (size_t)-1) return (size_t)-1;
-    if (off2 == (size_t)-1) off2 = str.length() + 1;
+    if (off == static_cast<size_t>(-1)) return static_cast<size_t>(-1);
+    if (off2 == static_cast<size_t>(-1)) off2 = str.length() + 1;
     if (line_offset < 0) line_offset = 0;  //!OCLINT(parameter reassignment)
 
-    if ((size_t)line_offset >= off2 - off - 1) {
+    if (static_cast<size_t>(line_offset) >= off2 - off - 1) {
         line_offset = off2 - off - 1;  //!OCLINT(parameter reassignment)
     }
 
@@ -170,7 +170,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
     }
 
     if (end) {
-        *end = paran_count ? (wchar_t *)in + std::wcslen(in) : paran_end;
+        *end = paran_count ? const_cast<wchar_t *>(in) + std::wcslen(in) : paran_end;
     }
 
     return 1;
@@ -328,10 +328,10 @@ static void job_or_process_extent(bool process, const wchar_t *buff, size_t curs
             case token_type_t::comment: {
                 if (tok_begin >= pos) {
                     finished = 1;
-                    if (b) *b = (wchar_t *)begin + tok_begin;
+                    if (b) *b = const_cast<wchar_t *>(begin) + tok_begin;
                 } else {
                     // Statement at cursor might start after this token.
-                    if (a) *a = (wchar_t *)begin + tok_begin + token->length;
+                    if (a) *a = const_cast<wchar_t *>(begin) + tok_begin + token->length;
                     if (tokens) tokens->clear();
                 }
                 continue;  // Do not add this to tokens
diff --git a/src/parser.cpp b/src/parser.cpp
index 0a6955d8f..1c118d92e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -99,7 +99,7 @@ static const struct block_lookup_entry block_lookup[] = {
     {EVENT, 0, EVENT_BLOCK},
     {BREAKPOINT, L"breakpoint", BREAKPOINT_BLOCK},
     {VARIABLE_ASSIGNMENT, L"variable assignment", VARIABLE_ASSIGNMENT_BLOCK},
-    {(block_type_t)0, 0, 0}};
+    {static_cast<block_type_t>(0), 0, 0}};
 
 // Given a file path, return something nicer. Currently we just "unexpand" tildes.
 wcstring parser_t::user_presentable_path(const wcstring &path) const {
diff --git a/src/proc.cpp b/src/proc.cpp
index b269934c8..05ecf8646 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -92,19 +92,19 @@ job_id_t acquire_job_id() {
     if (slot != consumed_job_ids->end()) {
         // We found a slot. Note that slot 0 corresponds to job ID 1.
         *slot = true;
-        return (job_id_t)(slot - consumed_job_ids->begin() + 1);
+        return static_cast<job_id_t>(slot - consumed_job_ids->begin() + 1);
     }
 
     // We did not find a slot; create a new slot. The size of the vector is now the job ID
     // (since it is one larger than the slot).
     consumed_job_ids->push_back(true);
-    return (job_id_t)consumed_job_ids->size();
+    return static_cast<job_id_t>(consumed_job_ids->size());
 }
 
 void release_job_id(job_id_t jid) {
     assert(jid > 0);
     auto consumed_job_ids = locked_consumed_job_ids.acquire();
-    size_t slot = (size_t)(jid - 1), count = consumed_job_ids->size();
+    size_t slot = static_cast<size_t>(jid - 1), count = consumed_job_ids->size();
 
     // Make sure this slot is within our vector and is currently set to consumed.
     assert(slot < count);
diff --git a/src/reader.cpp b/src/reader.cpp
index 43f5dc4c8..397a5520c 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2057,7 +2057,7 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
 void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bool no_io) {
     const editable_line_t *el = &command_line;
     assert(el != NULL);
-    long match_highlight_pos = (long)el->position + match_highlight_pos_adjust;
+    long match_highlight_pos = static_cast<long>(el->position) + match_highlight_pos_adjust;
     assert(match_highlight_pos >= 0);
 
     sanity_check();
@@ -3478,7 +3478,7 @@ void reader_set_buffer(const wcstring &b, size_t pos) {
 
 size_t reader_get_cursor_pos() {
     reader_data_t *data = current_data_or_null();
-    if (!data) return (size_t)-1;
+    if (!data) return static_cast<size_t>(-1);
 
     return data->command_line.position;
 }
diff --git a/src/screen.cpp b/src/screen.cpp
index a96d22a44..ac4b8d62d 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -83,7 +83,7 @@ static size_t try_sequence(const char *seq, const wchar_t *str) {
 /// Returns the number of columns left until the next tab stop, given the current cursor position.
 static size_t next_tab_stop(size_t current_line_width) {
     // Assume tab stops every 8 characters if undefined.
-    size_t tab_width = init_tabs > 0 ? (size_t)init_tabs : 8;
+    size_t tab_width = init_tabs > 0 ? static_cast<size_t>(init_tabs) : 8;
     return ((current_line_width / tab_width) + 1) * tab_width;
 }
 
@@ -205,7 +205,7 @@ static bool is_color_escape_seq(const wchar_t *code, size_t *resulting_length) {
         if (!esc[p]) continue;
 
         for (int k = 0; k < max_colors; k++) {
-            size_t esc_seq_len = try_sequence(tparm((char *)esc[p], k), code);
+            size_t esc_seq_len = try_sequence(tparm(const_cast<char *>(esc[p]), k), code);
             if (esc_seq_len) {
                 *resulting_length = esc_seq_len;
                 return true;
@@ -231,8 +231,8 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
         if (!esc2[p]) continue;
         // Test both padded and unpadded version, just to be safe. Most versions of tparm don't
         // actually seem to do anything these days.
-        size_t esc_seq_len =
-            std::max(try_sequence(tparm((char *)esc2[p]), code), try_sequence(esc2[p], code));
+        size_t esc_seq_len = std::max(try_sequence(tparm(const_cast<char *>(esc2[p])), code),
+                                      try_sequence(esc2[p], code));
         if (esc_seq_len) {
             *resulting_length = esc_seq_len;
             return true;
@@ -417,7 +417,7 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
             // Current line is soft wrapped (assuming we support it).
             s->desired.line(s->desired.cursor.y).is_soft_wrapped = true;
 
-            line_no = (int)s->desired.line_count();
+            line_no = static_cast<int>(s->desired.line_count());
             s->desired.add_line();
             s->desired.cursor.y++;
             s->desired.cursor.x = 0;
@@ -512,7 +512,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
     bool use_multi = multi_str != NULL && multi_str[0] != '\0' &&
                      abs(x_steps) * std::strlen(str) > std::strlen(multi_str);
     if (use_multi && cur_term) {
-        char *multi_param = tparm((char *)multi_str, abs(x_steps));
+        char *multi_param = tparm(const_cast<char *>(multi_str), abs(x_steps));
         writembs(outp, multi_param);
     } else {
         for (i = 0; i < abs(x_steps); i++) {
@@ -651,7 +651,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         s_move(scr, 0, 0);
         s_write_str(scr, left_prompt.c_str());
         scr->actual_left_prompt = left_prompt;
-        scr->actual.cursor.x = (int)left_prompt_width;
+        scr->actual.cursor.x = static_cast<int>(left_prompt_width);
     }
 
     for (size_t i = 0; i < scr->desired.line_count(); i++) {
@@ -674,7 +674,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             if (o_line.indentation > s_line.indentation && !has_cleared_screen && clr_eol &&
                 clr_eos) {
                 s_set_color(scr, vars, highlight_spec_t{});
-                s_move(scr, 0, (int)i);
+                s_move(scr, 0, static_cast<int>(i));
                 s_write_mbs(scr, should_clear_screen_this_line ? clr_eos : clr_eol);
                 has_cleared_screen = should_clear_screen_this_line;
                 has_cleared_line = true;
@@ -703,7 +703,8 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
                     }
                 }
                 if (next_line_will_change) {
-                    skip_remaining = std::min(skip_remaining, (size_t)(scr->actual_width - 2));
+                    skip_remaining =
+                        std::min(skip_remaining, static_cast<size_t>(scr->actual_width - 2));
                 }
             }
         }
@@ -732,16 +733,16 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             // to the sticky right cursor. If we clear the screen too early, we can defeat soft
             // wrapping.
             if (should_clear_screen_this_line && !has_cleared_screen &&
-                (done || j + 1 == (size_t)screen_width)) {
+                (done || j + 1 == static_cast<size_t>(screen_width))) {
                 s_set_color(scr, vars, highlight_spec_t{});
-                s_move(scr, current_width, (int)i);
+                s_move(scr, current_width, static_cast<int>(i));
                 s_write_mbs(scr, clr_eos);
                 has_cleared_screen = true;
             }
             if (done) break;
 
-            perform_any_impending_soft_wrap(scr, current_width, (int)i);
-            s_move(scr, current_width, (int)i);
+            perform_any_impending_soft_wrap(scr, current_width, static_cast<int>(i));
+            s_move(scr, current_width, static_cast<int>(i));
             s_set_color(scr, vars, o_line.color_at(j));
             auto width = fish_wcwidth_min_0(o_line.char_at(j));
             s_write_char(scr, o_line.char_at(j), width);
@@ -770,13 +771,13 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
         }
         if (clear_remainder && clr_eol) {
             s_set_color(scr, vars, highlight_spec_t{});
-            s_move(scr, current_width, (int)i);
+            s_move(scr, current_width, static_cast<int>(i));
             s_write_mbs(scr, clr_eol);
         }
 
         // Output any rprompt if this is the first line.
         if (i == 0 && right_prompt_width > 0) {  //!OCLINT(Use early exit/continue)
-            s_move(scr, (int)(screen_width - right_prompt_width), (int)i);
+            s_move(scr, static_cast<int>(screen_width - right_prompt_width), static_cast<int>(i));
             s_set_color(scr, vars, highlight_spec_t{});
             s_write_str(scr, right_prompt.c_str());
             scr->actual.cursor.x += right_prompt_width;
@@ -789,7 +790,8 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
             // wrapped. If so, then a cr will go to the beginning of the following line! So instead
             // issue a bunch of "move left" commands to get back onto the line, and then jump to the
             // front of it.
-            s_move(scr, scr->actual.cursor.x - (int)right_prompt_width, scr->actual.cursor.y);
+            s_move(scr, scr->actual.cursor.x - static_cast<int>(right_prompt_width),
+                   scr->actual.cursor.y);
             s_write_str(scr, L"\r");
             scr->actual.cursor.x = 0;
         }
@@ -799,7 +801,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
     if (!has_cleared_screen && need_clear_screen && clr_eol) {
         s_set_color(scr, vars, highlight_spec_t{});
         for (size_t i = scr->desired.line_count(); i < lines_with_stuff; i++) {
-            s_move(scr, 0, (int)i);
+            s_move(scr, 0, static_cast<int>(i));
             s_write_mbs(scr, clr_eol);
         }
     }
@@ -1075,8 +1077,8 @@ void s_write(screen_t *s, const wcstring &left_prompt, const wcstring &right_pro
     s->desired.cursor = cursor_arr;
 
     if (cursor_is_within_pager) {
-        s->desired.cursor.x = (int)cursor_pos;
-        s->desired.cursor.y = (int)s->desired.line_count();
+        s->desired.cursor.x = static_cast<int>(cursor_pos);
+        s->desired.cursor.y = static_cast<int>(s->desired.line_count());
     }
 
     // Append pager_data (none if empty).
@@ -1152,7 +1154,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
         if (screen_width > non_space_width) {
             bool justgrey = true;
             if (cur_term && enter_dim_mode) {
-                std::string dim = tparm((char *)enter_dim_mode);
+                std::string dim = tparm(enter_dim_mode);
                 if (!dim.empty()) {
                     // Use dim if they have it, so the color will be based on their actual normal
                     // color and the background of the termianl.
@@ -1163,22 +1165,22 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
             if (cur_term && justgrey && set_a_foreground) {
                 if (max_colors >= 238) {
                     // draw the string in a particular grey
-                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 237)));
+                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 237)));
                 } else if (max_colors >= 9) {
                     // bright black (the ninth color, looks grey)
-                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 8)));
+                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8)));
                 } else if (max_colors >= 2 && enter_bold_mode) {
                     // we might still get that color by setting black and going bold for bright
-                    abandon_line_string.append(str2wcstring(tparm((char *)enter_bold_mode)));
-                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 0)));
+                    abandon_line_string.append(str2wcstring(tparm(enter_bold_mode)));
+                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 0)));
                 }
             }
 
             abandon_line_string.append(get_omitted_newline_str());
 
             if (cur_term && exit_attribute_mode) {
-                abandon_line_string.append(str2wcstring(
-                    tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
+                abandon_line_string.append(
+                    str2wcstring(tparm(exit_attribute_mode)));  // normal text ANSI escape sequence
             }
 
             int newline_glitch_width = term_has_xn ? 0 : 1;
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 8c22259c7..c024b6401 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -109,7 +109,7 @@ static te_expr *new_expr(const int type, const te_expr *parameters[]) {
     const int arity = get_arity(type);
     const int psize = sizeof(te_expr *) * arity;
     const int size = sizeof(te_expr) + psize;
-    te_expr *ret = (te_expr *)malloc(size);
+    te_expr *ret = static_cast<te_expr *>(malloc(size));
     // This sets float to 0, which depends on the implementation.
     // We rely on IEEE-754 floats anyway, so it's okay.
     std::memset(ret, 0, size);
@@ -142,19 +142,19 @@ static constexpr double e() { return M_E; }
 static double fac(double a) { /* simplest version of fac */
     if (a < 0.0) return NAN;
     if (a > UINT_MAX) return INFINITY;
-    unsigned int ua = (unsigned int)(a);
+    unsigned int ua = static_cast<unsigned int>(a);
     unsigned long int result = 1, i;
     for (i = 1; i <= ua; i++) {
         if (i > ULONG_MAX / result) return INFINITY;
         result *= i;
     }
-    return (double)result;
+    return static_cast<double>(result);
 }
 
 static double ncr(double n, double r) {
     if (n < 0.0 || r < 0.0 || n < r) return NAN;
     if (n > UINT_MAX || r > UINT_MAX) return INFINITY;
-    unsigned long int un = (unsigned int)(n), ur = (unsigned int)(r), i;
+    unsigned long int un = static_cast<unsigned int>(n), ur = static_cast<unsigned int>(r), i;
     unsigned long int result = 1;
     if (ur > un / 2) ur = un - ur;
     for (i = 1; i <= ur; i++) {
@@ -169,31 +169,31 @@ static double npr(double n, double r) { return ncr(n, r) * fac(r); }
 
 static const te_builtin functions[] = {
     /* must be in alphabetical order */
-    {"abs", (const void *)(te_fun1)fabs, TE_FUNCTION1},
-    {"acos", (const void *)(te_fun1)acos, TE_FUNCTION1},
-    {"asin", (const void *)(te_fun1)asin, TE_FUNCTION1},
-    {"atan", (const void *)(te_fun1)atan, TE_FUNCTION1},
-    {"atan2", (const void *)(te_fun2)atan2, TE_FUNCTION2},
-    {"ceil", (const void *)(te_fun1)ceil, TE_FUNCTION1},
-    {"cos", (const void *)(te_fun1)cos, TE_FUNCTION1},
-    {"cosh", (const void *)(te_fun1)cosh, TE_FUNCTION1},
-    {"e", (const void *)(te_fun0)e, TE_FUNCTION0},
-    {"exp", (const void *)(te_fun1)exp, TE_FUNCTION1},
-    {"fac", (const void *)(te_fun1)fac, TE_FUNCTION1},
-    {"floor", (const void *)(te_fun1)floor, TE_FUNCTION1},
-    {"ln", (const void *)(te_fun1)log, TE_FUNCTION1},
-    {"log", (const void *)(te_fun1)log10, TE_FUNCTION1},
-    {"log10", (const void *)(te_fun1)log10, TE_FUNCTION1},
-    {"ncr", (const void *)(te_fun2)ncr, TE_FUNCTION2},
-    {"npr", (const void *)(te_fun2)npr, TE_FUNCTION2},
-    {"pi", (const void *)(te_fun0)pi, TE_FUNCTION0},
-    {"pow", (const void *)(te_fun2)pow, TE_FUNCTION2},
-    {"round", (const void *)(te_fun1)round, TE_FUNCTION1},
-    {"sin", (const void *)(te_fun1)sin, TE_FUNCTION1},
-    {"sinh", (const void *)(te_fun1)sinh, TE_FUNCTION1},
-    {"sqrt", (const void *)(te_fun1)sqrt, TE_FUNCTION1},
-    {"tan", (const void *)(te_fun1)tan, TE_FUNCTION1},
-    {"tanh", (const void *)(te_fun1)tanh, TE_FUNCTION1}};
+    {"abs", reinterpret_cast<const void *>(static_cast<te_fun1>(fabs)), TE_FUNCTION1},
+    {"acos", reinterpret_cast<const void *>(static_cast<te_fun1>(acos)), TE_FUNCTION1},
+    {"asin", reinterpret_cast<const void *>(static_cast<te_fun1>(asin)), TE_FUNCTION1},
+    {"atan", reinterpret_cast<const void *>(static_cast<te_fun1>(atan)), TE_FUNCTION1},
+    {"atan2", reinterpret_cast<const void *>(static_cast<te_fun2>(atan2)), TE_FUNCTION2},
+    {"ceil", reinterpret_cast<const void *>(static_cast<te_fun1>(ceil)), TE_FUNCTION1},
+    {"cos", reinterpret_cast<const void *>(static_cast<te_fun1>(cos)), TE_FUNCTION1},
+    {"cosh", reinterpret_cast<const void *>(static_cast<te_fun1>(cosh)), TE_FUNCTION1},
+    {"e", reinterpret_cast<const void *>(static_cast<te_fun0>(e)), TE_FUNCTION0},
+    {"exp", reinterpret_cast<const void *>(static_cast<te_fun1>(exp)), TE_FUNCTION1},
+    {"fac", reinterpret_cast<const void *>(static_cast<te_fun1>(fac)), TE_FUNCTION1},
+    {"floor", reinterpret_cast<const void *>(static_cast<te_fun1>(floor)), TE_FUNCTION1},
+    {"ln", reinterpret_cast<const void *>(static_cast<te_fun1>(log)), TE_FUNCTION1},
+    {"log", reinterpret_cast<const void *>(static_cast<te_fun1>(log10)), TE_FUNCTION1},
+    {"log10", reinterpret_cast<const void *>(static_cast<te_fun1>(log10)), TE_FUNCTION1},
+    {"ncr", reinterpret_cast<const void *>(static_cast<te_fun2>(ncr)), TE_FUNCTION2},
+    {"npr", reinterpret_cast<const void *>(static_cast<te_fun2>(npr)), TE_FUNCTION2},
+    {"pi", reinterpret_cast<const void *>(static_cast<te_fun0>(pi)), TE_FUNCTION0},
+    {"pow", reinterpret_cast<const void *>(static_cast<te_fun2>(pow)), TE_FUNCTION2},
+    {"round", reinterpret_cast<const void *>(static_cast<te_fun1>(round)), TE_FUNCTION1},
+    {"sin", reinterpret_cast<const void *>(static_cast<te_fun1>(sin)), TE_FUNCTION1},
+    {"sinh", reinterpret_cast<const void *>(static_cast<te_fun1>(sinh)), TE_FUNCTION1},
+    {"sqrt", reinterpret_cast<const void *>(static_cast<te_fun1>(sqrt)), TE_FUNCTION1},
+    {"tan", reinterpret_cast<const void *>(static_cast<te_fun1>(tan)), TE_FUNCTION1},
+    {"tanh", reinterpret_cast<const void *>(static_cast<te_fun1>(tanh)), TE_FUNCTION1}};
 
 static const te_builtin *find_builtin(const char *name, int len) {
     const auto end = std::end(functions);
@@ -231,7 +231,7 @@ void next_token(state *s) {
 
         /* Try reading a number. */
         if ((s->next[0] >= '0' && s->next[0] <= '9') || s->next[0] == '.') {
-            s->value = strtod(s->next, (char **)&s->next);
+            s->value = strtod(s->next, const_cast<char **>(&s->next));
             s->type = TOK_NUMBER;
         } else {
             /* Look for a variable or builtin function call. */
@@ -268,29 +268,29 @@ void next_token(state *s) {
                     // The "te_fun2" casts are necessary to pick the right overload.
                     case '+':
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)add;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(add));
                         break;
                     case '-':
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)sub;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(sub));
                         break;
                     case 'x':
                     case '*':
                         // We've already checked for whitespace above.
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)mul;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(mul));
                         break;
                     case '/':
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)divide;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(divide));
                         break;
                     case '^':
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)pow;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(pow));
                         break;
                     case '%':
                         s->type = TOK_INFIX;
-                        s->function = (const void *)(te_fun2)fmod;
+                        s->function = reinterpret_cast<const void *>(static_cast<te_fun2>(fmod));
                         break;
                     case '(':
                         s->type = TOK_OPEN;
@@ -434,7 +434,7 @@ static te_expr *power(state *s) {
         ret = base(s);
     } else {
         ret = NEW_EXPR(TE_FUNCTION1, base(s));
-        ret->function = (const void *)negate;
+        ret->function = reinterpret_cast<const void *>(negate);
     }
 
     return ret;
@@ -446,19 +446,20 @@ static te_expr *factor(state *s) {
 
     te_expr *insertion = 0;
 
-    while (s->type == TOK_INFIX && (s->function == (const void *)(te_fun2)pow)) {
+    while (s->type == TOK_INFIX &&
+           (s->function == reinterpret_cast<const void *>(static_cast<te_fun2>(pow)))) {
         te_fun2 t = (te_fun2)s->function;
         next_token(s);
 
         if (insertion) {
             /* Make exponentiation go right-to-left. */
             te_expr *insert = NEW_EXPR(TE_FUNCTION2, insertion->parameters[1], power(s));
-            insert->function = (const void *)t;
+            insert->function = reinterpret_cast<const void *>(t);
             insertion->parameters[1] = insert;
             insertion = insert;
         } else {
             ret = NEW_EXPR(TE_FUNCTION2, ret, power(s));
-            ret->function = (const void *)t;
+            ret->function = reinterpret_cast<const void *>(t);
             insertion = ret;
         }
     }
@@ -470,13 +471,14 @@ static te_expr *term(state *s) {
     /* <term>      =    <factor> {("*" | "/" | "%") <factor>} */
     te_expr *ret = factor(s);
 
-    while (s->type == TOK_INFIX && (s->function == (const void *)(te_fun2)mul ||
-                                    s->function == (const void *)(te_fun2)divide ||
-                                    s->function == (const void *)(te_fun2)fmod)) {
+    while (s->type == TOK_INFIX &&
+           (s->function == reinterpret_cast<const void *>(static_cast<te_fun2>(mul)) ||
+            s->function == reinterpret_cast<const void *>(static_cast<te_fun2>(divide)) ||
+            s->function == reinterpret_cast<const void *>(static_cast<te_fun2>(fmod)))) {
         te_fun2 t = (te_fun2)s->function;
         next_token(s);
         ret = NEW_EXPR(TE_FUNCTION2, ret, factor(s));
-        ret->function = (const void *)t;
+        ret->function = reinterpret_cast<const void *>(t);
     }
 
     return ret;
@@ -490,7 +492,7 @@ static te_expr *expr(state *s) {
         te_fun2 t = (te_fun2)s->function;
         next_token(s);
         ret = NEW_EXPR(TE_FUNCTION2, ret, term(s));
-        ret->function = (const void *)t;
+        ret->function = reinterpret_cast<const void *>(t);
     }
 
     return ret;
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 030f94f7c..21484cf33 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -185,23 +185,23 @@ static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring
         // Get number of bytes for one wide character.
         n = 1;  // default: 1 byte. Used when skipping bytes
         if ((*p & 0x80) == 0)
-            high = (utf8_wchar_t)*p;
+            high = static_cast<utf8_wchar_t>(*p);
         else if ((*p & 0xe0) == _SEQ2) {
             n = 2;
-            high = (utf8_wchar_t)(*p & 0x1f);
+            high = static_cast<utf8_wchar_t>(*p & 0x1f);
         } else if ((*p & 0xf0) == _SEQ3) {
             n = 3;
-            high = (utf8_wchar_t)(*p & 0x0f);
+            high = static_cast<utf8_wchar_t>(*p & 0x0f);
         } else if ((*p & 0xf8) == _SEQ4) {
             n = 4;
-            high = (utf8_wchar_t)(*p & 0x07);
+            high = static_cast<utf8_wchar_t>(*p & 0x07);
         } else {
             if ((flags & UTF8_IGNORE_ERROR) == 0) return 0;
             continue;
         }
 
         // Does the sequence header tell us truth about length?
-        if ((size_t)(lim - p) <= n - 1) {
+        if (static_cast<size_t>(lim - p) <= n - 1) {
             if ((flags & UTF8_IGNORE_ERROR) == 0) return 0;
             n = 1;
             continue;  // skip
@@ -225,7 +225,7 @@ static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring
         uint32_t out_val = 0;
         n_bits = 0;
         for (i = 1; i < n; i++) {
-            out_val |= (utf8_wchar_t)(p[n - i] & 0x3f) << n_bits;
+            out_val |= static_cast<utf8_wchar_t>(p[n - i] & 0x3f) << n_bits;
             n_bits += 6;  // 6 low bits in every byte
         }
         out_val |= high << n_bits;
@@ -242,7 +242,7 @@ static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring
 
         if (skip) {
             total--;
-        } else if (out_val > (uint32_t)UTF8_WCHAR_MAX) {
+        } else if (out_val > static_cast<uint32_t>(UTF8_WCHAR_MAX)) {
             // wchar_t is UCS-2, but the UTF-8 specified an astral character.
             return 0;
         } else {
@@ -276,7 +276,7 @@ static size_t wchar_to_utf8_internal(const utf8_wchar_t *in, size_t insize, char
 
     w = in;
     wlim = w + insize;
-    p = (unsigned char *)out;
+    p = reinterpret_cast<unsigned char *>(out);
     lim = p + outsize;
     total = 0;
     for (; w < wlim; w++) {
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index f081214f2..d29c1b8c3 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -34,7 +34,7 @@ wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_rang
 }
 
 wcstring truncate(const wcstring &input, int max_len, ellipsis_type etype) {
-    if (input.size() <= (size_t)max_len) {
+    if (input.size() <= static_cast<size_t>(max_len)) {
         return input;
     }
 
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index df24fb64f..031b691db 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -206,7 +206,8 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
 
     if (temp == NULL || c == ':') {
         if (wopterr) {
-            std::fwprintf(stderr, _(L"%ls: Invalid option -- %lc\n"), argv[0], (wint_t)c);
+            std::fwprintf(stderr, _(L"%ls: Invalid option -- %lc\n"), argv[0],
+                          static_cast<wint_t>(c));
         }
         woptopt = c;
 
@@ -238,7 +239,7 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
             if (wopterr) {
                 // 1003.2 specifies the format of this message.
                 std::fwprintf(stderr, _(L"%ls: Option requires an argument -- %lc\n"), argv[0],
-                              (wint_t)c);
+                              static_cast<wint_t>(c));
             }
             woptopt = c;
             c = missing_arg_return_colon ? ':' : '?';
@@ -308,7 +309,8 @@ const struct woption *wgetopter_t::_find_matching_long_opt(const struct woption
     // Test all long options for either exact match or abbreviated matches.
     for (const struct woption *p = longopts; p->name; p++, option_index++) {
         if (!std::wcsncmp(p->name, nextchar, nameend - nextchar)) {
-            if ((unsigned int)(nameend - nextchar) == (unsigned int)wcslen(p->name)) {
+            if (static_cast<unsigned int>(nameend - nextchar) ==
+                static_cast<unsigned int>(wcslen(p->name))) {
                 // Exact match found.
                 pfound = p;
                 *indfound = option_index;
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 808d3f0d6..52a0f6ffb 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -33,7 +33,13 @@
 
 typedef std::string cstring;
 
-const file_id_t kInvalidFileID = {(dev_t)-1LL, (ino_t)-1LL, (uint64_t)-1LL, -1, -1, -1, -1};
+const file_id_t kInvalidFileID = {static_cast<dev_t>(-1LL),
+                                  static_cast<ino_t>(-1LL),
+                                  static_cast<uint64_t>(-1LL),
+                                  -1,
+                                  -1,
+                                  -1,
+                                  -1};
 
 /// Map used as cache by wgettext.
 static owning_lock<std::unordered_map<wcstring, wcstring>> wgettext_map;
@@ -652,7 +658,7 @@ int fish_wcstoi(const wchar_t *str, const wchar_t **endptr, int base) {
         }
     }
     if (endptr) *endptr = _endptr;
-    return (int)result;
+    return static_cast<int>(result);
 }
 
 /// An enhanced version of wcstol().

From 8d54e928cd913380d6954074a9ad71ce32e6afa9 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 17:11:16 -0800
Subject: [PATCH 1255/1732] [clang-tidy] C to C++ headers

Found with modernize-deprecated-headers

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.cpp             |  4 ++--
 src/builtin_argparse.cpp    |  7 +++----
 src/builtin_bg.cpp          |  5 ++---
 src/builtin_bind.cpp        |  5 ++---
 src/builtin_block.cpp       |  2 +-
 src/builtin_builtin.cpp     |  3 +--
 src/builtin_cd.cpp          |  3 ++-
 src/builtin_commandline.cpp |  9 ++++-----
 src/builtin_complete.cpp    |  3 +--
 src/builtin_disown.cpp      |  5 ++---
 src/builtin_echo.cpp        |  4 ++--
 src/builtin_eval.cpp        |  4 ++--
 src/builtin_exit.cpp        |  4 ++--
 src/builtin_fg.cpp          |  7 +++----
 src/builtin_function.cpp    |  6 +++---
 src/builtin_functions.cpp   |  2 +-
 src/builtin_history.cpp     |  7 +++----
 src/builtin_jobs.cpp        |  5 +++--
 src/builtin_math.cpp        |  5 ++---
 src/builtin_printf.cpp      | 16 ++++++++--------
 src/builtin_random.cpp      |  5 ++---
 src/builtin_read.cpp        | 10 +++++-----
 src/builtin_realpath.cpp    |  5 ++---
 src/builtin_return.cpp      |  4 ++--
 src/builtin_set.cpp         |  6 +++---
 src/builtin_set_color.cpp   |  4 ++--
 src/builtin_status.cpp      |  3 +--
 src/builtin_string.cpp      | 14 ++++++--------
 src/builtin_test.cpp        |  6 +++---
 src/builtin_ulimit.cpp      |  5 +++--
 src/color.cpp               |  7 +++----
 src/fish_test_helper.cpp    |  9 +++++----
 32 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 8df9d1518..eb65c84ab 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -19,11 +19,11 @@
 
 #include "builtin.h"
 
-#include <errno.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <memory>
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 2153a9379..113988106 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -5,11 +5,10 @@
 
 #include "builtin_argparse.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
 #include <cwchar>
 #include <memory>
 #include <string>
diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 83b95faae..96e42d8b7 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_bg.h"
 
-#include <errno.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstdlib>
 #include <memory>
 #include <vector>
 
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 29c36c9a2..7b478c88c 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_bind.h"
 
-#include <errno.h>
-#include <stddef.h>
-
+#include <cerrno>
+#include <cstddef>
 #include <memory>
 #include <set>
 #include <string>
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index 00d70dfe0..2a44992f1 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -3,7 +3,7 @@
 
 #include "builtin_block.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index e4ff40924..1ce2c04a8 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin.h"
 
-#include <stddef.h>
-
 #include <algorithm>
+#include <cstddef>
 #include <string>
 
 #include "builtin_builtin.h"
diff --git a/src/builtin_cd.cpp b/src/builtin_cd.cpp
index 31654747e..98b3b4666 100644
--- a/src/builtin_cd.cpp
+++ b/src/builtin_cd.cpp
@@ -3,10 +3,11 @@
 
 #include "builtin_cd.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#include <cerrno>
+
 #include "builtin.h"
 #include "common.h"
 #include "env.h"
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index 568dfcca5..c342bf229 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -1,10 +1,9 @@
 // Functions used for implementing the commandline builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <cwchar>
 
 #include "builtin.h"
@@ -129,7 +128,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     const wchar_t *current_buffer = 0;
 
     // What the commandline builtin considers to be the current cursor position.
-    size_t current_cursor_pos = static_cast<size_t>(-1);
+    auto current_cursor_pos = static_cast<size_t>(-1);
 
     wchar_t *cmd = argv[0];
     int buffer_part = 0;
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 319bd3e9d..8355486e0 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -1,8 +1,7 @@
 // Functions used for implementing the complete builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <stddef.h>
-
+#include <cstddef>
 #include <cwchar>
 #include <memory>
 #include <string>
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index aa1115883..8b90830fa 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_disown.h"
 
-#include <errno.h>
-#include <signal.h>
-
+#include <cerrno>
+#include <csignal>
 #include <set>
 
 #include "builtin.h"
diff --git a/src/builtin_echo.cpp b/src/builtin_echo.cpp
index cb5b9f891..45165d0f8 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtin_echo.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_echo.h"
 
-#include <limits.h>
-#include <stddef.h>
+#include <climits>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 26621e321..8de6c10e2 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -1,8 +1,8 @@
 // Functions for executing the eval builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 6f8e9d58c..3b77cd521 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_exit.h"
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 4a7808cab..231d435fd 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_fg.h"
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 #include <cwchar>
 
 #include "builtin.h"
diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index c1b07ee26..9df7ca366 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -3,11 +3,11 @@
 
 #include "builtin_function.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 8e5cca2d0..bf2001e38 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -3,10 +3,10 @@
 
 #include "builtin_functions.h"
 
-#include <stddef.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cstddef>
 #include <cwchar>
 #include <map>
 #include <memory>
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index b5acd3b07..991dbf288 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_history.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
 #include <cwchar>
 #include <string>
 #include <vector>
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index da8389513..0a7b12e38 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -1,10 +1,11 @@
 // Functions for executing the jobs builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/time.h>
 
+#include <cerrno>
+#include <cstddef>
+
 #include "builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index f8e579db8..451410471 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -3,11 +3,10 @@
 
 #include "builtin_math.h"
 
-#include <errno.h>
-#include <stddef.h>
-
 #include <algorithm>
+#include <cerrno>
 #include <cmath>
+#include <cstddef>
 #include <cstring>
 #include <limits>
 #include <string>
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index 0d3539e31..d6401fc9a 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -50,18 +50,18 @@
 // This file has been imported from source code of printf command in GNU Coreutils version 6.9.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <sys/types.h>
-#include <wctype.h>
 
+#include <cerrno>
+#include <climits>
+#include <clocale>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
+#include <cwctype>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_random.cpp b/src/builtin_random.cpp
index 3478810fd..46771c766 100644
--- a/src/builtin_random.cpp
+++ b/src/builtin_random.cpp
@@ -3,10 +3,9 @@
 
 #include "builtin_random.h"
 
-#include <errno.h>
-#include <stdint.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <cstdint>
 #include <cwchar>
 #include <random>
 
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 7505c4214..90d03f8cc 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -3,14 +3,14 @@
 
 #include "builtin_read.h"
 
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <memory>
diff --git a/src/builtin_realpath.cpp b/src/builtin_realpath.cpp
index 3a4ea7c89..09858ee9d 100644
--- a/src/builtin_realpath.cpp
+++ b/src/builtin_realpath.cpp
@@ -3,9 +3,8 @@
 
 #include "builtin_realpath.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 11d8354c9..7663efb75 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -3,8 +3,8 @@
 
 #include "builtin_return.h"
 
-#include <errno.h>
-#include <stddef.h>
+#include <cerrno>
+#include <cstddef>
 
 #include "builtin.h"
 #include "common.h"
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 3556fd2f2..4246a04bb 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -1,13 +1,13 @@
 // Functions used for implementing the set builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <cerrno>
+#include <cstddef>
+#include <cstdlib>
 #include <cstring>
 #include <cwchar>
 #include <iterator>
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 0867cc684..ecd78fb88 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -1,8 +1,8 @@
 // Functions used for implementing the set_color builtin.
 #include "config.h"
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 #if HAVE_CURSES_H
 #include <curses.h>
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index cc974878d..fd97f5e0f 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -3,8 +3,7 @@
 
 #include "builtin_status.h"
 
-#include <stddef.h>
-
+#include <cstddef>
 #include <cwchar>
 #include <string>
 
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 4863fcb8a..b82edb713 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -5,15 +5,13 @@
 #ifdef _WIN32
 #define PCRE2_STATIC
 #endif
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <wctype.h>
-
 #include <algorithm>
+#include <cerrno>
+#include <climits>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cwchar>
 #include <cwctype>
 #include <iterator>
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 1411054ea..b821589ac 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -5,16 +5,16 @@
 
 #include "builtin.h"
 
-#include <errno.h>
-#include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <wctype.h>
 
+#include <cerrno>
 #include <cmath>
+#include <cstdarg>
 #include <cstring>
 #include <cwchar>
+#include <cwctype>
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index f50d9b4e9..d00eb03fc 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -1,10 +1,11 @@
 // Functions used for implementing the ulimit builtin.
 #include "config.h"  // IWYU pragma: keep
 
-#include <errno.h>
-#include <stddef.h>
 #include <sys/resource.h>
 
+#include <cerrno>
+#include <cstddef>
+
 #include "builtin.h"
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
diff --git a/src/color.cpp b/src/color.cpp
index c41dfd38e..6594cee92 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -3,10 +3,9 @@
 
 #include "color.h"
 
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <cwchar>  // IWYU pragma: keep
 
 #include "common.h"
diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index dd70b3ed6..20310f495 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -1,12 +1,13 @@
 // fish_test_helper is a little program with no fish dependencies that acts like certain other
 // programs, allowing fish to test its behavior.
 
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 static void become_foreground_then_print_stderr() {
     if (tcsetpgrp(STDOUT_FILENO, getpgrp()) < 0) {
         perror("tcsetgrp");

From 1055ff321c137a0d9263d7a03918167a9df969d4 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 18 Nov 2019 18:34:50 -0800
Subject: [PATCH 1256/1732] [clang-tidy] Replace NULL with nullptr

Found with modernize-use-nullptr

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.cpp              | 27 +++++-----
 src/builtin_argparse.cpp     | 16 +++---
 src/builtin_bg.cpp           |  2 +-
 src/builtin_bind.cpp         | 36 ++++++-------
 src/builtin_block.cpp        | 18 +++----
 src/builtin_builtin.cpp      | 10 ++--
 src/builtin_command.cpp      | 12 ++---
 src/builtin_commandline.cpp  | 45 +++++++++--------
 src/builtin_complete.cpp     | 51 +++++++++----------
 src/builtin_contains.cpp     |  7 +--
 src/builtin_disown.cpp       |  2 +-
 src/builtin_echo.cpp         |  6 +--
 src/builtin_exit.cpp         |  6 +--
 src/builtin_function.cpp     | 27 +++++-----
 src/builtin_functions.cpp    | 30 +++++------
 src/builtin_history.cpp      | 38 +++++++-------
 src/builtin_jobs.cpp         | 18 +++----
 src/builtin_math.cpp         | 18 +++----
 src/builtin_printf.cpp       |  2 +-
 src/builtin_pwd.cpp          |  6 +--
 src/builtin_read.cpp         | 44 ++++++++--------
 src/builtin_return.cpp       |  6 +--
 src/builtin_set.cpp          | 18 +++----
 src/builtin_set_color.cpp    | 32 ++++++------
 src/builtin_status.cpp       | 40 +++++++--------
 src/builtin_string.cpp       | 97 ++++++++++++++++++------------------
 src/builtin_test.cpp         | 32 ++++++------
 src/builtin_ulimit.cpp       | 34 ++++++-------
 src/builtin_wait.cpp         |  6 +--
 src/common.cpp               | 43 ++++++++--------
 src/common.h                 | 22 ++++----
 src/complete.cpp             | 22 ++++----
 src/env.cpp                  | 10 ++--
 src/env.h                    |  2 +-
 src/env_dispatch.cpp         | 12 ++---
 src/env_universal_common.cpp | 22 ++++----
 src/env_universal_common.h   |  2 +-
 src/event.h                  |  3 +-
 src/exec.cpp                 | 12 ++---
 src/expand.cpp               |  8 +--
 src/expand.h                 |  4 +-
 src/fallback.cpp             |  8 +--
 src/fish.cpp                 | 43 ++++++++--------
 src/fish_indent.cpp          | 28 +++++------
 src/fish_key_reader.cpp      | 23 +++++----
 src/function.cpp             |  2 +-
 src/highlight.cpp            | 18 +++----
 src/history.cpp              | 14 +++---
 src/history_file.cpp         | 22 ++++----
 src/input.cpp                |  4 +-
 src/input.h                  |  2 +-
 src/input_common.cpp         |  4 +-
 src/intern.cpp               |  2 +-
 src/io.cpp                   |  4 +-
 src/iothread.cpp             |  6 +--
 src/lru.h                    | 10 ++--
 src/output.cpp               |  4 +-
 src/pager.cpp                |  2 +-
 src/parse_constants.h        |  4 +-
 src/parse_execution.cpp      | 16 +++---
 src/parse_productions.cpp    |  8 +--
 src/parse_tree.cpp           | 26 +++++-----
 src/parse_util.cpp           | 46 ++++++++---------
 src/parse_util.h             |  6 +--
 src/parser.cpp               | 42 ++++++++--------
 src/postfork.cpp             |  2 +-
 src/proc.cpp                 |  8 +--
 src/proc.h                   |  4 +-
 src/reader.cpp               | 48 +++++++++---------
 src/sanity.cpp               |  2 +-
 src/screen.cpp               | 10 ++--
 src/signal.cpp               | 32 ++++++------
 src/tinyexpr.cpp             | 16 +++---
 src/tnode.cpp                | 14 +++---
 src/utf8.cpp                 | 20 ++++----
 src/util.cpp                 |  2 +-
 src/wgetopt.cpp              | 26 +++++-----
 src/wildcard.cpp             | 34 ++++++-------
 src/wutil.cpp                | 12 ++---
 src/wutil.h                  |  9 ++--
 80 files changed, 721 insertions(+), 710 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index eb65c84ab..f01c0a4dc 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -89,11 +89,11 @@ bool builtin_data_t::operator<(const builtin_data_t *other) const {
 /// Counts the number of arguments in the specified null-terminated array
 int builtin_count_args(const wchar_t *const *argv) {
     int argc;
-    for (argc = 1; argv[argc] != NULL;) {
+    for (argc = 1; argv[argc] != nullptr;) {
         argc++;
     }
 
-    assert(argv[argc] == NULL);
+    assert(argv[argc] == nullptr);
     return argc;
 }
 
@@ -101,11 +101,11 @@ int builtin_count_args(const wchar_t *const *argv) {
 /// to stderr. Used by the builtin commands.
 void builtin_wperror(const wchar_t *s, io_streams_t &streams) {
     char *err = std::strerror(errno);
-    if (s != NULL) {
+    if (s != nullptr) {
         streams.err.append(s);
         streams.err.append(L": ");
     }
-    if (err != NULL) {
+    if (err != nullptr) {
         const wcstring werr = str2wcstring(err);
         streams.err.append(werr);
         streams.err.push_back(L'\n');
@@ -113,15 +113,15 @@ void builtin_wperror(const wchar_t *s, io_streams_t &streams) {
 }
 
 static const wchar_t *const short_options = L"+:h";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {nullptr, 0, nullptr, 0}};
 
 int parse_help_only_cmd_opts(struct help_only_cmd_opts_t &opts, int *optind, int argc,
                              wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {  //!OCLINT(too few branches)
             case 'h': {
                 opts.print_help = true;
@@ -283,7 +283,7 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
 /// Implementation of the builtin breakpoint command, used to launch the interactive debugger.
 static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wchar_t *cmd = argv[0];
-    if (argv[1] != NULL) {
+    if (argv[1] != nullptr) {
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, cmd, 0, builtin_count_args(argv) - 1);
         return STATUS_INVALID_ARGS;
     }
@@ -310,7 +310,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
 int builtin_true(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     UNUSED(parser);
     UNUSED(streams);
-    if (argv[1] != NULL) {
+    if (argv[1] != nullptr) {
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, argv[0], 0, builtin_count_args(argv) - 1);
         return STATUS_INVALID_ARGS;
     }
@@ -320,7 +320,7 @@ int builtin_true(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 int builtin_false(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     UNUSED(parser);
     UNUSED(streams);
-    if (argv[1] != NULL) {
+    if (argv[1] != nullptr) {
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, argv[0], 0, builtin_count_args(argv) - 1);
         return STATUS_INVALID_ARGS;
     }
@@ -408,7 +408,7 @@ static const builtin_data_t *builtin_lookup(const wcstring &name) {
     if (found != array_end && name == found->name) {
         return found;
     }
-    return NULL;
+    return nullptr;
 }
 
 /// Initialize builtin data.
@@ -433,7 +433,8 @@ static bool cmd_needs_help(const wchar_t *cmd) { return contains(help_builtins,
 proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_streams_t &streams) {
     UNUSED(parser);
     UNUSED(streams);
-    if (argv == NULL || argv[0] == NULL) return proc_status_t::from_exit_code(STATUS_INVALID_ARGS);
+    if (argv == nullptr || argv[0] == nullptr)
+        return proc_status_t::from_exit_code(STATUS_INVALID_ARGS);
 
     // We can be handed a keyword by the parser as if it was a command. This happens when the user
     // follows the keyword by `-h` or `--help`. Since it isn't really a builtin command we need to
@@ -471,7 +472,7 @@ wcstring_list_t builtin_get_names() {
 
 /// Insert all builtin names into list.
 void builtin_get_names(std::vector<completion_t> *list) {
-    assert(list != NULL);
+    assert(list != nullptr);
     list->reserve(list->size() + BUILTIN_COUNT);
     for (size_t i = 0; i < BUILTIN_COUNT; i++) {
         append_completion(list, builtin_datas[i].name);
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 113988106..c99ee7128 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -60,10 +60,10 @@ struct argparse_cmd_opts_t {
 
 static const wchar_t *const short_options = L"+:hn:six:N:X:";
 static const struct woption long_options[] = {
-    {L"stop-nonopt", no_argument, NULL, 's'},    {L"ignore-unknown", no_argument, NULL, 'i'},
-    {L"name", required_argument, NULL, 'n'},     {L"exclusive", required_argument, NULL, 'x'},
-    {L"help", no_argument, NULL, 'h'},           {L"min-args", required_argument, NULL, 'N'},
-    {L"max-args", required_argument, NULL, 'X'}, {NULL, 0, NULL, 0}};
+    {L"stop-nonopt", no_argument, nullptr, 's'},    {L"ignore-unknown", no_argument, nullptr, 'i'},
+    {L"name", required_argument, nullptr, 'n'},     {L"exclusive", required_argument, nullptr, 'x'},
+    {L"help", no_argument, nullptr, 'h'},           {L"min-args", required_argument, nullptr, 'N'},
+    {L"max-args", required_argument, nullptr, 'X'}, {nullptr, 0, nullptr, 0}};
 
 // Check if any pair of mutually exclusive options was seen. Note that since every option must have
 // a short name we only need to check those.
@@ -343,7 +343,7 @@ static int parse_cmd_opts(argparse_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'n': {
                 opts.name = w.woptarg;
@@ -440,10 +440,10 @@ static void populate_option_strings(const argparse_cmd_opts_t &opts, wcstring *s
 
         if (!opt_spec->long_flag.empty()) {
             long_options->push_back(
-                {opt_spec->long_flag.c_str(), arg_type, NULL, opt_spec->short_flag});
+                {opt_spec->long_flag.c_str(), arg_type, nullptr, opt_spec->short_flag});
         }
     }
-    long_options->push_back({NULL, 0, NULL, 0});
+    long_options->push_back({nullptr, 0, nullptr, 0});
 }
 
 static int validate_arg(parser_t &parser, const argparse_cmd_opts_t &opts, option_spec_t *opt_spec,
@@ -501,7 +501,7 @@ static int validate_and_store_implicit_int(parser_t &parser, const argparse_cmd_
     opt_spec->vals.clear();
     opt_spec->vals.push_back(wcstring(val));
     opt_spec->num_seen++;
-    w.nextchar = NULL;
+    w.nextchar = nullptr;
     return STATUS_CMD_OK;
 }
 
diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 96e42d8b7..4858e0c8e 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -18,7 +18,7 @@
 
 /// Helper function for builtin_bg().
 static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
-    assert(j != NULL);
+    assert(j != nullptr);
     if (!j->wants_job_control()) {
         wcstring error_message = format_string(
             _(L"%ls: Can't put job %d, '%ls' to background because it is not under job control\n"),
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index 7b478c88c..e4b715d91 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -211,7 +211,7 @@ bool builtin_bind_t::erase(wchar_t **seq, bool all, const wchar_t *mode, bool us
     }
 
     bool res = false;
-    if (mode == NULL) mode = DEFAULT_BIND_MODE;  //!OCLINT(parameter reassignment)
+    if (mode == nullptr) mode = DEFAULT_BIND_MODE;  //!OCLINT(parameter reassignment)
 
     while (*seq) {
         if (use_terminfo) {
@@ -253,10 +253,10 @@ bool builtin_bind_t::insert(int optind, int argc, wchar_t **argv, io_streams_t &
         // We don't overload this with user and def because we want them to be grouped.
         // First the presets, then the users (because of scrolling).
         if (opts->preset) {
-            list(opts->bind_mode_given ? opts->bind_mode : NULL, false, streams);
+            list(opts->bind_mode_given ? opts->bind_mode : nullptr, false, streams);
         }
         if (opts->user) {
-            list(opts->bind_mode_given ? opts->bind_mode : NULL, true, streams);
+            list(opts->bind_mode_given ? opts->bind_mode : nullptr, true, streams);
         }
     } else if (arg_count == 1) {
         wcstring seq;
@@ -318,23 +318,23 @@ int parse_cmd_opts(bind_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss meth
                    int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     static const wchar_t *const short_options = L":aehkKfM:Lm:s";
-    static const struct woption long_options[] = {{L"all", no_argument, NULL, 'a'},
-                                                  {L"erase", no_argument, NULL, 'e'},
-                                                  {L"function-names", no_argument, NULL, 'f'},
-                                                  {L"help", no_argument, NULL, 'h'},
-                                                  {L"key", no_argument, NULL, 'k'},
-                                                  {L"key-names", no_argument, NULL, 'K'},
-                                                  {L"list-modes", no_argument, NULL, 'L'},
-                                                  {L"mode", required_argument, NULL, 'M'},
-                                                  {L"preset", no_argument, NULL, 'p'},
-                                                  {L"sets-mode", required_argument, NULL, 'm'},
-                                                  {L"silent", no_argument, NULL, 's'},
-                                                  {L"user", no_argument, NULL, 'u'},
-                                                  {NULL, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"all", no_argument, nullptr, 'a'},
+                                                  {L"erase", no_argument, nullptr, 'e'},
+                                                  {L"function-names", no_argument, nullptr, 'f'},
+                                                  {L"help", no_argument, nullptr, 'h'},
+                                                  {L"key", no_argument, nullptr, 'k'},
+                                                  {L"key-names", no_argument, nullptr, 'K'},
+                                                  {L"list-modes", no_argument, nullptr, 'L'},
+                                                  {L"mode", required_argument, nullptr, 'M'},
+                                                  {L"preset", no_argument, nullptr, 'p'},
+                                                  {L"sets-mode", required_argument, nullptr, 'm'},
+                                                  {L"silent", no_argument, nullptr, 's'},
+                                                  {L"user", no_argument, nullptr, 'u'},
+                                                  {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case L'a': {
                 opts.all = true;
@@ -438,7 +438,7 @@ int builtin_bind_t::builtin_bind(parser_t &parser, io_streams_t &streams, wchar_
     if (!opts.have_preset && !opts.have_user) opts.user = true;
     switch (opts.mode) {
         case BIND_ERASE: {
-            const wchar_t *bind_mode = opts.bind_mode_given ? opts.bind_mode : NULL;
+            const wchar_t *bind_mode = opts.bind_mode_given ? opts.bind_mode : nullptr;
             // If we get both, we erase both.
             if (opts.user) {
                 if (erase(&argv[optind], opts.all, bind_mode, opts.use_terminfo, /* user */ true,
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index 2a44992f1..d97ceecf2 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -25,15 +25,15 @@ static int parse_cmd_opts(block_cmd_opts_t &opts, int *optind,  //!OCLINT(high n
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     static const wchar_t *const short_options = L":eghl";
-    static const struct woption long_options[] = {{L"erase", no_argument, NULL, 'e'},
-                                                  {L"local", no_argument, NULL, 'l'},
-                                                  {L"global", no_argument, NULL, 'g'},
-                                                  {L"help", no_argument, NULL, 'h'},
-                                                  {NULL, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"erase", no_argument, nullptr, 'e'},
+                                                  {L"local", no_argument, nullptr, 'l'},
+                                                  {L"global", no_argument, nullptr, 'g'},
+                                                  {L"help", no_argument, nullptr, 'h'},
+                                                  {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'h': {
                 opts.print_help = true;
@@ -108,16 +108,16 @@ int builtin_block(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         case LOCAL: {
             // If this is the outermost block, then we're global
             if (block_idx + 1 >= parser.block_count()) {
-                block = NULL;
+                block = nullptr;
             }
             break;
         }
         case GLOBAL: {
-            block = NULL;
+            block = nullptr;
             break;
         }
         case UNSET: {
-            while (block != NULL && block->type() != FUNCTION_CALL &&
+            while (block != nullptr && block->type() != FUNCTION_CALL &&
                    block->type() != FUNCTION_CALL_NO_SHADOW) {
                 // Set it in function scope
                 block = parser.block_at_index(++block_idx);
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index 1ce2c04a8..eca1b4bd2 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -20,17 +20,17 @@ struct builtin_cmd_opts_t {
     bool query = false;
 };
 static const wchar_t *const short_options = L":hnq";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {L"names", no_argument, NULL, 'n'},
-                                              {L"query", no_argument, NULL, 'q'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {L"names", no_argument, nullptr, 'n'},
+                                              {L"query", no_argument, nullptr, 'q'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(builtin_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'h': {
                 opts.print_help = true;
diff --git a/src/builtin_command.cpp b/src/builtin_command.cpp
index 396850528..91cad034d 100644
--- a/src/builtin_command.cpp
+++ b/src/builtin_command.cpp
@@ -23,18 +23,18 @@ struct command_cmd_opts_t {
     bool all_paths = false;
 };
 static const wchar_t *const short_options = L":ahqsv";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {L"all", no_argument, NULL, 'a'},
-                                              {L"quiet", no_argument, NULL, 'q'},
-                                              {L"search", no_argument, NULL, 's'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {L"all", no_argument, nullptr, 'a'},
+                                              {L"quiet", no_argument, nullptr, 'q'},
+                                              {L"search", no_argument, nullptr, 's'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(command_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'a': {
                 opts.all_paths = true;
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index c342bf229..f91db88b0 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -125,7 +125,7 @@ static void write_part(const wchar_t *begin, const wchar_t *end, int cut_at_curs
 int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // Pointer to what the commandline builtin considers to be the current contents of the command
     // line buffer.
-    const wchar_t *current_buffer = 0;
+    const wchar_t *current_buffer = nullptr;
 
     // What the commandline builtin considers to be the current cursor position.
     auto current_cursor_pos = static_cast<size_t>(-1);
@@ -146,7 +146,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     int line_mode = 0;
     int search_mode = 0;
     int paging_mode = 0;
-    const wchar_t *begin = NULL, *end = NULL;
+    const wchar_t *begin = nullptr, *end = nullptr;
 
     const auto &ld = parser.libdata();
     wcstring transient_commandline;
@@ -173,28 +173,28 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     }
 
     static const wchar_t *const short_options = L":abijpctforhI:CLSsP";
-    static const struct woption long_options[] = {{L"append", no_argument, NULL, 'a'},
-                                                  {L"insert", no_argument, NULL, 'i'},
-                                                  {L"replace", no_argument, NULL, 'r'},
-                                                  {L"current-buffer", no_argument, NULL, 'b'},
-                                                  {L"current-job", no_argument, NULL, 'j'},
-                                                  {L"current-process", no_argument, NULL, 'p'},
-                                                  {L"current-selection", no_argument, NULL, 's'},
-                                                  {L"current-token", no_argument, NULL, 't'},
-                                                  {L"cut-at-cursor", no_argument, NULL, 'c'},
-                                                  {L"function", no_argument, NULL, 'f'},
-                                                  {L"tokenize", no_argument, NULL, 'o'},
-                                                  {L"help", no_argument, NULL, 'h'},
-                                                  {L"input", required_argument, NULL, 'I'},
-                                                  {L"cursor", no_argument, NULL, 'C'},
-                                                  {L"line", no_argument, NULL, 'L'},
-                                                  {L"search-mode", no_argument, NULL, 'S'},
-                                                  {L"paging-mode", no_argument, NULL, 'P'},
-                                                  {NULL, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"append", no_argument, nullptr, 'a'},
+                                                  {L"insert", no_argument, nullptr, 'i'},
+                                                  {L"replace", no_argument, nullptr, 'r'},
+                                                  {L"current-buffer", no_argument, nullptr, 'b'},
+                                                  {L"current-job", no_argument, nullptr, 'j'},
+                                                  {L"current-process", no_argument, nullptr, 'p'},
+                                                  {L"current-selection", no_argument, nullptr, 's'},
+                                                  {L"current-token", no_argument, nullptr, 't'},
+                                                  {L"cut-at-cursor", no_argument, nullptr, 'c'},
+                                                  {L"function", no_argument, nullptr, 'f'},
+                                                  {L"tokenize", no_argument, nullptr, 'o'},
+                                                  {L"help", no_argument, nullptr, 'h'},
+                                                  {L"input", required_argument, nullptr, 'I'},
+                                                  {L"cursor", no_argument, nullptr, 'C'},
+                                                  {L"line", no_argument, nullptr, 'L'},
+                                                  {L"search-mode", no_argument, nullptr, 'S'},
+                                                  {L"paging-mode", no_argument, nullptr, 'P'},
+                                                  {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case L'a': {
                 append_mode = APPEND_MODE;
@@ -408,7 +408,8 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
             break;
         }
         case TOKEN_MODE: {
-            parse_util_token_extent(current_buffer, current_cursor_pos, &begin, &end, 0, 0);
+            parse_util_token_extent(current_buffer, current_cursor_pos, &begin, &end, nullptr,
+                                    nullptr);
             break;
         }
         default: {
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 8355486e0..28fb3d4f6 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -128,30 +128,31 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool preserve_order = false;
 
     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[] = {{L"exclusive", no_argument, NULL, 'x'},
-                                                  {L"no-files", no_argument, NULL, 'f'},
-                                                  {L"force-files", no_argument, NULL, 'F'},
-                                                  {L"require-parameter", no_argument, NULL, 'r'},
-                                                  {L"path", required_argument, NULL, 'p'},
-                                                  {L"command", required_argument, NULL, 'c'},
-                                                  {L"short-option", required_argument, NULL, 's'},
-                                                  {L"long-option", required_argument, NULL, 'l'},
-                                                  {L"old-option", required_argument, NULL, 'o'},
-                                                  {L"description", required_argument, NULL, 'd'},
-                                                  {L"arguments", required_argument, NULL, 'a'},
-                                                  {L"erase", no_argument, NULL, 'e'},
-                                                  {L"unauthoritative", no_argument, NULL, 'u'},
-                                                  {L"authoritative", no_argument, NULL, 'A'},
-                                                  {L"condition", required_argument, NULL, 'n'},
-                                                  {L"wraps", required_argument, NULL, 'w'},
-                                                  {L"do-complete", optional_argument, NULL, 'C'},
-                                                  {L"help", no_argument, NULL, 'h'},
-                                                  {L"keep-order", no_argument, NULL, 'k'},
-                                                  {NULL, 0, NULL, 0}};
+    static const struct woption long_options[] = {
+        {L"exclusive", no_argument, nullptr, 'x'},
+        {L"no-files", no_argument, nullptr, 'f'},
+        {L"force-files", no_argument, nullptr, 'F'},
+        {L"require-parameter", no_argument, nullptr, 'r'},
+        {L"path", required_argument, nullptr, 'p'},
+        {L"command", required_argument, nullptr, 'c'},
+        {L"short-option", required_argument, nullptr, 's'},
+        {L"long-option", required_argument, nullptr, 'l'},
+        {L"old-option", required_argument, nullptr, 'o'},
+        {L"description", required_argument, nullptr, 'd'},
+        {L"arguments", required_argument, nullptr, 'a'},
+        {L"erase", no_argument, nullptr, 'e'},
+        {L"unauthoritative", no_argument, nullptr, 'u'},
+        {L"authoritative", no_argument, nullptr, 'A'},
+        {L"condition", required_argument, nullptr, 'n'},
+        {L"wraps", required_argument, nullptr, 'w'},
+        {L"do-complete", optional_argument, nullptr, 'C'},
+        {L"help", no_argument, nullptr, 'h'},
+        {L"keep-order", no_argument, nullptr, 'k'},
+        {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'x': {
                 result_mode.no_files = true;
@@ -241,7 +242,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             }
             case 'C': {
                 do_complete = true;
-                have_do_complete_param = w.woptarg != NULL;
+                have_do_complete_param = w.woptarg != nullptr;
                 if (have_do_complete_param) do_complete_param = w.woptarg;
                 break;
             }
@@ -317,7 +318,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         if (!have_do_complete_param) {
             // No argument given, try to use the current commandline.
             const wchar_t *cmd = reader_get_buffer();
-            if (cmd == NULL) {
+            if (cmd == nullptr) {
                 // This corresponds to using 'complete -C' in non-interactive mode.
                 // See #2361    .
                 builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
@@ -327,8 +328,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         const wchar_t *token;
 
-        parse_util_token_extent(do_complete_param.c_str(), do_complete_param.size(), &token, 0, 0,
-                                0);
+        parse_util_token_extent(do_complete_param.c_str(), do_complete_param.size(), &token,
+                                nullptr, nullptr, nullptr);
 
         // Create a scoped transient command line, so that builtin_commandline will see our
         // argument, not the reader buffer.
diff --git a/src/builtin_contains.cpp b/src/builtin_contains.cpp
index c98c0bb1a..a9e018859 100644
--- a/src/builtin_contains.cpp
+++ b/src/builtin_contains.cpp
@@ -19,15 +19,16 @@ struct contains_cmd_opts_t {
     bool print_index = false;
 };
 static const wchar_t *const short_options = L"+:hi";
-static const struct woption long_options[] = {
-    {L"help", no_argument, NULL, 'h'}, {L"index", no_argument, NULL, 'i'}, {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {L"index", no_argument, nullptr, 'i'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(contains_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'h': {
                 opts.print_help = true;
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index 8b90830fa..bdf2f4373 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -55,7 +55,7 @@ int builtin_disown(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     }
 
-    if (argv[1] == 0) {
+    if (argv[1] == nullptr) {
         // Select last constructed job (ie first job in the job queue) that is possible to disown.
         // Stopped jobs can be disowned (they will be continued).
         // Foreground jobs can be disowned.
diff --git a/src/builtin_echo.cpp b/src/builtin_echo.cpp
index 45165d0f8..d2bd798f1 100644
--- a/src/builtin_echo.cpp
+++ b/src/builtin_echo.cpp
@@ -19,7 +19,7 @@ struct echo_cmd_opts_t {
     bool interpret_special_chars = false;
 };
 static const wchar_t *const short_options = L"+:Eens";
-static const struct woption *const long_options = NULL;
+static const struct woption *const long_options = nullptr;
 
 static int parse_cmd_opts(echo_cmd_opts_t &opts, int *optind, int argc, wchar_t **argv,
                           parser_t &parser, io_streams_t &streams) {
@@ -28,7 +28,7 @@ static int parse_cmd_opts(echo_cmd_opts_t &opts, int *optind, int argc, wchar_t
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'n': {
                 opts.print_newline = false;
@@ -194,7 +194,7 @@ int builtin_echo(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool continue_output = true;
 
     const wchar_t *const *args_to_echo = argv + optind;
-    for (size_t idx = 0; continue_output && args_to_echo[idx] != NULL; idx++) {
+    for (size_t idx = 0; continue_output && args_to_echo[idx] != nullptr; idx++) {
         if (opts.print_spaces && idx > 0) {
             streams.out.push_back(' ');
         }
diff --git a/src/builtin_exit.cpp b/src/builtin_exit.cpp
index 3b77cd521..920107116 100644
--- a/src/builtin_exit.cpp
+++ b/src/builtin_exit.cpp
@@ -20,8 +20,8 @@ struct exit_cmd_opts_t {
     bool print_help = false;
 };
 static const wchar_t *const short_options = L":h";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(exit_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
@@ -30,7 +30,7 @@ static int parse_cmd_opts(exit_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {  //!OCLINT(too few branches)
             case 'h': {
                 opts.print_help = true;
diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 9df7ca366..b1a6655f5 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -39,18 +39,19 @@ struct function_cmd_opts_t {
 // This command is atypical in using the "-" (RETURN_IN_ORDER) option for flag parsing.
 // This is needed due to the semantics of the -a/--argument-names flag.
 static const wchar_t *const short_options = L"-:a:d:e:hj:p:s:v:w:SV:";
-static const struct woption long_options[] = {{L"description", required_argument, NULL, 'd'},
-                                              {L"on-signal", required_argument, NULL, 's'},
-                                              {L"on-job-exit", required_argument, NULL, 'j'},
-                                              {L"on-process-exit", required_argument, NULL, 'p'},
-                                              {L"on-variable", required_argument, NULL, 'v'},
-                                              {L"on-event", required_argument, NULL, 'e'},
-                                              {L"wraps", required_argument, NULL, 'w'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"argument-names", required_argument, NULL, 'a'},
-                                              {L"no-scope-shadowing", no_argument, NULL, 'S'},
-                                              {L"inherit-variable", required_argument, NULL, 'V'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {
+    {L"description", required_argument, nullptr, 'd'},
+    {L"on-signal", required_argument, nullptr, 's'},
+    {L"on-job-exit", required_argument, nullptr, 'j'},
+    {L"on-process-exit", required_argument, nullptr, 'p'},
+    {L"on-variable", required_argument, nullptr, 'v'},
+    {L"on-event", required_argument, nullptr, 'e'},
+    {L"wraps", required_argument, nullptr, 'w'},
+    {L"help", no_argument, nullptr, 'h'},
+    {L"argument-names", required_argument, nullptr, 'a'},
+    {L"no-scope-shadowing", no_argument, nullptr, 'S'},
+    {L"inherit-variable", required_argument, nullptr, 'V'},
+    {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
@@ -58,7 +59,7 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
     int opt;
     wgetopter_t w;
     bool handling_named_arguments = false;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         if (opt != 'a' && opt != 1) handling_named_arguments = false;
         switch (opt) {
             case 1: {
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index bf2001e38..04d684871 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -39,29 +39,29 @@ struct functions_cmd_opts_t {
     bool report_metadata = false;
     bool verbose = false;
     bool handlers = false;
-    wchar_t *handlers_type = NULL;
-    wchar_t *description = NULL;
+    wchar_t *handlers_type = nullptr;
+    wchar_t *description = nullptr;
 };
 static const wchar_t *const short_options = L":HDacd:ehnqv";
-static const struct woption long_options[] = {{L"erase", no_argument, NULL, 'e'},
-                                              {L"description", required_argument, NULL, 'd'},
-                                              {L"names", no_argument, NULL, 'n'},
-                                              {L"all", no_argument, NULL, 'a'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"query", no_argument, NULL, 'q'},
-                                              {L"copy", no_argument, NULL, 'c'},
-                                              {L"details", no_argument, NULL, 'D'},
-                                              {L"verbose", no_argument, NULL, 'v'},
-                                              {L"handlers", no_argument, NULL, 'H'},
-                                              {L"handlers-type", required_argument, NULL, 't'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"erase", no_argument, nullptr, 'e'},
+                                              {L"description", required_argument, nullptr, 'd'},
+                                              {L"names", no_argument, nullptr, 'n'},
+                                              {L"all", no_argument, nullptr, 'a'},
+                                              {L"help", no_argument, nullptr, 'h'},
+                                              {L"query", no_argument, nullptr, 'q'},
+                                              {L"copy", no_argument, nullptr, 'c'},
+                                              {L"details", no_argument, nullptr, 'D'},
+                                              {L"verbose", no_argument, nullptr, 'v'},
+                                              {L"handlers", no_argument, nullptr, 'H'},
+                                              {L"handlers-type", required_argument, nullptr, 't'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(functions_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'v': {
                 opts.verbose = true;
diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 991dbf288..4df5e30f4 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -25,12 +25,12 @@ enum hist_cmd_t { HIST_SEARCH = 1, HIST_DELETE, HIST_CLEAR, HIST_MERGE, HIST_SAV
 // Must be sorted by string, not enum or random.
 static const enum_map<hist_cmd_t> hist_enum_map[] = {
     {HIST_CLEAR, L"clear"}, {HIST_DELETE, L"delete"}, {HIST_MERGE, L"merge"},
-    {HIST_SAVE, L"save"},   {HIST_SEARCH, L"search"}, {HIST_UNDEF, NULL}};
+    {HIST_SAVE, L"save"},   {HIST_SEARCH, L"search"}, {HIST_UNDEF, nullptr}};
 
 struct history_cmd_opts_t {
     hist_cmd_t hist_cmd = HIST_UNDEF;
     history_search_type_t search_type = static_cast<history_search_type_t>(-1);
-    const wchar_t *show_time_format = NULL;
+    const wchar_t *show_time_format = nullptr;
     size_t max_items = SIZE_MAX;
     bool print_help = false;
     bool history_search_type_defined = false;
@@ -44,21 +44,21 @@ struct history_cmd_opts_t {
 /// supported at least until fish 3.0 and possibly longer to avoid breaking everyones
 /// config.fish and other scripts.
 static const wchar_t *const short_options = L":CRcehmn:pt::z";
-static const struct woption long_options[] = {{L"prefix", no_argument, NULL, 'p'},
-                                              {L"contains", no_argument, NULL, 'c'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"show-time", optional_argument, NULL, 't'},
-                                              {L"exact", no_argument, NULL, 'e'},
-                                              {L"max", required_argument, NULL, 'n'},
-                                              {L"null", no_argument, NULL, 'z'},
-                                              {L"case-sensitive", no_argument, NULL, 'C'},
-                                              {L"delete", no_argument, NULL, 1},
-                                              {L"search", no_argument, NULL, 2},
-                                              {L"save", no_argument, NULL, 3},
-                                              {L"clear", no_argument, NULL, 4},
-                                              {L"merge", no_argument, NULL, 5},
-                                              {L"reverse", no_argument, NULL, 'R'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"prefix", no_argument, nullptr, 'p'},
+                                              {L"contains", no_argument, nullptr, 'c'},
+                                              {L"help", no_argument, nullptr, 'h'},
+                                              {L"show-time", optional_argument, nullptr, 't'},
+                                              {L"exact", no_argument, nullptr, 'e'},
+                                              {L"max", required_argument, nullptr, 'n'},
+                                              {L"null", no_argument, nullptr, 'z'},
+                                              {L"case-sensitive", no_argument, nullptr, 'C'},
+                                              {L"delete", no_argument, nullptr, 1},
+                                              {L"search", no_argument, nullptr, 2},
+                                              {L"save", no_argument, nullptr, 3},
+                                              {L"clear", no_argument, nullptr, 4},
+                                              {L"merge", no_argument, nullptr, 5},
+                                              {L"reverse", no_argument, nullptr, 'R'},
+                                              {nullptr, 0, nullptr, 0}};
 
 /// Remember the history subcommand and disallow selecting more than one history subcommand.
 static bool set_hist_cmd(wchar_t *const cmd, hist_cmd_t *hist_cmd, hist_cmd_t sub_cmd,
@@ -99,7 +99,7 @@ static int parse_cmd_opts(history_cmd_opts_t &opts, int *optind,  //!OCLINT(high
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 1: {
                 if (!set_hist_cmd(cmd, &opts.hist_cmd, HIST_DELETE, streams)) {
@@ -186,7 +186,7 @@ static int parse_cmd_opts(history_cmd_opts_t &opts, int *optind,  //!OCLINT(high
                     builtin_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
                     return STATUS_INVALID_ARGS;
                 }
-                w.nextchar = NULL;
+                w.nextchar = nullptr;
                 break;
             }
             default: {
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 0a7b12e38..3b2530ae7 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -33,7 +33,7 @@ static int cpu_use(const job_t *j) {
     for (const process_ptr_t &p : j->processes) {
         struct timeval t;
         int jiffies;
-        gettimeofday(&t, 0);
+        gettimeofday(&t, nullptr);
         jiffies = proc_get_jiffies(p.get());
 
         double t1 = 1000000.0 * p->last_time.tv_sec + p->last_time.tv_usec;
@@ -119,17 +119,17 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int print_last = 0;
 
     static const wchar_t *const short_options = L":cghlpq";
-    static const struct woption long_options[] = {{L"command", no_argument, NULL, 'c'},
-                                                  {L"group", no_argument, NULL, 'g'},
-                                                  {L"help", no_argument, NULL, 'h'},
-                                                  {L"last", no_argument, NULL, 'l'},
-                                                  {L"pid", no_argument, NULL, 'p'},
-                                                  {L"quiet", no_argument, NULL, 'q'},
-                                                  {nullptr, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"command", no_argument, nullptr, 'c'},
+                                                  {L"group", no_argument, nullptr, 'g'},
+                                                  {L"help", no_argument, nullptr, 'h'},
+                                                  {L"last", no_argument, nullptr, 'l'},
+                                                  {L"pid", no_argument, nullptr, 'p'},
+                                                  {L"quiet", no_argument, nullptr, 'q'},
+                                                  {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'p': {
                 mode = JOBS_PRINT_PID;
diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 451410471..6ae67677b 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -35,16 +35,16 @@ struct math_cmd_opts_t {
 // This command is atypical in using the "+" (REQUIRE_ORDER) option for flag parsing.
 // This is needed because of the minus, `-`, operator in math expressions.
 static const wchar_t *const short_options = L"+:hs:";
-static const struct woption long_options[] = {{L"scale", required_argument, NULL, 's'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"scale", required_argument, nullptr, 's'},
+                                              {L"help", no_argument, nullptr, 'h'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(math_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     const wchar_t *cmd = L"math";
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 's': {
                 // "max" is the special value that tells us to pick the maximum scale.
@@ -97,10 +97,10 @@ static const wchar_t *math_get_arg_stdin(wcstring *storage, const io_streams_t &
         char ch = '\0';
         long rc = read_blocked(streams.stdin_fd, &ch, 1);
 
-        if (rc < 0) return NULL;  // failure
+        if (rc < 0) return nullptr;  // failure
 
         if (rc == 0) {  // EOF
-            if (arg.empty()) return NULL;
+            if (arg.empty()) return nullptr;
             break;
         }
 
@@ -115,7 +115,7 @@ static const wchar_t *math_get_arg_stdin(wcstring *storage, const io_streams_t &
 
 /// Return the next argument from argv.
 static const wchar_t *math_get_arg_argv(int *argidx, wchar_t **argv) {
-    return argv && argv[*argidx] ? argv[(*argidx)++] : NULL;
+    return argv && argv[*argidx] ? argv[(*argidx)++] : nullptr;
 }
 
 /// Get the arguments from argv or stdin based on the execution context. This mimics how builtin
@@ -196,7 +196,7 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
     // Switch locale while computing stuff.
     // This means that the "." is always the radix character,
     // so numbers work the same across locales.
-    char *saved_locale = strdup(setlocale(LC_NUMERIC, NULL));
+    char *saved_locale = strdup(setlocale(LC_NUMERIC, nullptr));
     setlocale(LC_NUMERIC, "C");
     double v = te_interp(narrow_str.c_str(), &error);
 
@@ -205,7 +205,7 @@ static int evaluate_expression(const wchar_t *cmd, parser_t &parser, io_streams_
         // TODO: Really, this should be done in tinyexpr
         // (e.g. infinite is the result of "x / 0"),
         // but that's much more work.
-        const char *error_message = NULL;
+        const char *error_message = nullptr;
         if (std::isinf(v)) {
             error_message = "Result is infinite";
         } else if (std::isnan(v)) {
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index d6401fc9a..e8a208b12 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -304,7 +304,7 @@ static T string_to_scalar_type(const wchar_t *s, builtin_printf_state_t *state)
         wchar_t ch = *++s;
         val = ch;
     } else {
-        wchar_t *end = NULL;
+        wchar_t *end = nullptr;
         errno = 0;
         val = raw_string_to_scalar_type<T>(s, &end);
         state->verify_numeric(s, end, errno);
diff --git a/src/builtin_pwd.cpp b/src/builtin_pwd.cpp
index 8c0c7a71a..e81e9f512 100644
--- a/src/builtin_pwd.cpp
+++ b/src/builtin_pwd.cpp
@@ -15,8 +15,8 @@
 
 /// The pwd builtin. Respect -P to resolve symbolic links. Respect -L to not do that (the default).
 static const wchar_t *const short_options = L"LPh";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {nullptr, 0, nullptr, 0}};
 int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     UNUSED(parser);
     const wchar_t *cmd = argv[0];
@@ -24,7 +24,7 @@ int builtin_pwd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool resolve_symlinks = false;
     wgetopter_t w;
     int opt;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'L':
                 resolve_symlinks = false;
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 90d03f8cc..d743b3357 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -38,8 +38,8 @@ struct read_cmd_opts_t {
     bool print_help = false;
     int place = ENV_USER;
     wcstring prompt_cmd;
-    const wchar_t *prompt = NULL;
-    const wchar_t *prompt_str = NULL;
+    const wchar_t *prompt = nullptr;
+    const wchar_t *prompt_str = nullptr;
     const wchar_t *right_prompt = L"";
     const wchar_t *commandline = L"";
     // If a delimiter was given. Used to distinguish between the default
@@ -56,32 +56,32 @@ struct read_cmd_opts_t {
 };
 
 static const wchar_t *const short_options = L":ac:d:ghiLlm:n:p:sSuxzP:UR:LB";
-static const struct woption long_options[] = {{L"array", no_argument, NULL, 'a'},
-                                              {L"command", required_argument, NULL, 'c'},
-                                              {L"delimiter", required_argument, NULL, 'd'},
-                                              {L"export", no_argument, NULL, 'x'},
-                                              {L"global", no_argument, NULL, 'g'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"line", no_argument, NULL, 'L'},
-                                              {L"list", no_argument, NULL, 'a'},
-                                              {L"local", no_argument, NULL, 'l'},
-                                              {L"nchars", required_argument, NULL, 'n'},
-                                              {L"null", no_argument, NULL, 'z'},
-                                              {L"prompt", required_argument, NULL, 'p'},
-                                              {L"prompt-str", required_argument, NULL, 'P'},
-                                              {L"right-prompt", required_argument, NULL, 'R'},
-                                              {L"shell", no_argument, NULL, 'S'},
-                                              {L"silent", no_argument, NULL, 's'},
-                                              {L"unexport", no_argument, NULL, 'u'},
-                                              {L"universal", no_argument, NULL, 'U'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"array", no_argument, nullptr, 'a'},
+                                              {L"command", required_argument, nullptr, 'c'},
+                                              {L"delimiter", required_argument, nullptr, 'd'},
+                                              {L"export", no_argument, nullptr, 'x'},
+                                              {L"global", no_argument, nullptr, 'g'},
+                                              {L"help", no_argument, nullptr, 'h'},
+                                              {L"line", no_argument, nullptr, 'L'},
+                                              {L"list", no_argument, nullptr, 'a'},
+                                              {L"local", no_argument, nullptr, 'l'},
+                                              {L"nchars", required_argument, nullptr, 'n'},
+                                              {L"null", no_argument, nullptr, 'z'},
+                                              {L"prompt", required_argument, nullptr, 'p'},
+                                              {L"prompt-str", required_argument, nullptr, 'P'},
+                                              {L"right-prompt", required_argument, nullptr, 'R'},
+                                              {L"shell", no_argument, nullptr, 'S'},
+                                              {L"silent", no_argument, nullptr, 's'},
+                                              {L"unexport", no_argument, nullptr, 'u'},
+                                              {L"universal", no_argument, nullptr, 'U'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'a': {
                 opts.array = true;
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 7663efb75..579ca5835 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -19,8 +19,8 @@ struct return_cmd_opts_t {
     bool print_help = false;
 };
 static const wchar_t *const short_options = L":h";
-static const struct woption long_options[] = {{L"help", no_argument, NULL, 'h'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"help", no_argument, nullptr, 'h'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static int parse_cmd_opts(return_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncss method)
                           int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
@@ -29,7 +29,7 @@ static int parse_cmd_opts(return_cmd_opts_t &opts, int *optind,  //!OCLINT(high
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {  //!OCLINT(too few branches)
             case 'h': {
                 opts.print_help = true;
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 4246a04bb..1798d2fc3 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -58,14 +58,14 @@ enum {
 // we stop scanning for flags when the first non-flag argument is seen.
 static const wchar_t *const short_options = L"+:LSUaeghlnpqux";
 static const struct woption long_options[] = {
-    {L"export", no_argument, NULL, 'x'},    {L"global", no_argument, NULL, 'g'},
-    {L"local", no_argument, NULL, 'l'},     {L"erase", no_argument, NULL, 'e'},
-    {L"names", no_argument, NULL, 'n'},     {L"unexport", no_argument, NULL, 'u'},
-    {L"universal", no_argument, NULL, 'U'}, {L"long", no_argument, NULL, 'L'},
-    {L"query", no_argument, NULL, 'q'},     {L"show", no_argument, NULL, 'S'},
-    {L"append", no_argument, NULL, 'a'},    {L"prepend", no_argument, NULL, 'p'},
-    {L"path", no_argument, NULL, opt_path}, {L"unpath", no_argument, NULL, opt_unpath},
-    {L"help", no_argument, NULL, 'h'},      {NULL, 0, NULL, 0}};
+    {L"export", no_argument, nullptr, 'x'},    {L"global", no_argument, nullptr, 'g'},
+    {L"local", no_argument, nullptr, 'l'},     {L"erase", no_argument, nullptr, 'e'},
+    {L"names", no_argument, nullptr, 'n'},     {L"unexport", no_argument, nullptr, 'u'},
+    {L"universal", no_argument, nullptr, 'U'}, {L"long", no_argument, nullptr, 'L'},
+    {L"query", no_argument, nullptr, 'q'},     {L"show", no_argument, nullptr, 'S'},
+    {L"append", no_argument, nullptr, 'a'},    {L"prepend", no_argument, nullptr, 'p'},
+    {L"path", no_argument, nullptr, opt_path}, {L"unpath", no_argument, nullptr, opt_unpath},
+    {L"help", no_argument, nullptr, 'h'},      {nullptr, 0, nullptr, 0}};
 
 // Hint for invalid path operation with a colon.
 #define BUILTIN_SET_PATH_ERROR _(L"%ls: Warning: $%ls entry \"%ls\" is not valid (%s)\n")
@@ -86,7 +86,7 @@ static int parse_cmd_opts(set_cmd_opts_t &opts, int *optind,  //!OCLINT(high ncs
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'a': {
                 opts.append = true;
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index ecd78fb88..78788928c 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -49,16 +49,16 @@ static void print_colors(io_streams_t &streams) {
 }
 
 static const wchar_t *const short_options = L":b:hvoidrcu";
-static const struct woption long_options[] = {{L"background", required_argument, NULL, 'b'},
-                                              {L"help", no_argument, NULL, 'h'},
-                                              {L"bold", no_argument, NULL, 'o'},
-                                              {L"underline", no_argument, NULL, 'u'},
-                                              {L"italics", no_argument, NULL, 'i'},
-                                              {L"dim", no_argument, NULL, 'd'},
-                                              {L"reverse", no_argument, NULL, 'r'},
-                                              {L"version", no_argument, NULL, 'v'},
-                                              {L"print-colors", no_argument, NULL, 'c'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"background", required_argument, nullptr, 'b'},
+                                              {L"help", no_argument, nullptr, 'h'},
+                                              {L"bold", no_argument, nullptr, 'o'},
+                                              {L"underline", no_argument, nullptr, 'u'},
+                                              {L"italics", no_argument, nullptr, 'i'},
+                                              {L"dim", no_argument, nullptr, 'd'},
+                                              {L"reverse", no_argument, nullptr, 'r'},
+                                              {L"version", no_argument, nullptr, 'v'},
+                                              {L"print-colors", no_argument, nullptr, 'c'},
+                                              {nullptr, 0, nullptr, 0}};
 
 #if __APPLE__
 static char sitm_esc[] = "\x1B[3m";
@@ -96,13 +96,13 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return EXIT_FAILURE;
     }
 
-    const wchar_t *bgcolor = NULL;
+    const wchar_t *bgcolor = nullptr;
     bool bold = false, underline = false, italics = false, dim = false, reverse = false;
 
     // Parse options to obtain the requested operation and the modifiers.
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'b': {
                 bgcolor = w.woptarg;
@@ -161,7 +161,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         fgcolors.push_back(fg);
     }
 
-    if (fgcolors.empty() && bgcolor == NULL && !bold && !underline && !italics && !dim &&
+    if (fgcolors.empty() && bgcolor == nullptr && !bold && !underline && !italics && !dim &&
         !reverse) {
         streams.err.append_format(_(L"%ls: Expected an argument\n"), argv[0]);
         return STATUS_INVALID_ARGS;
@@ -180,7 +180,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     // Test if we have at least basic support for setting fonts, colors and related bits - otherwise
     // just give up...
-    if (cur_term == NULL || !exit_attribute_mode) {
+    if (cur_term == nullptr || !exit_attribute_mode) {
         return STATUS_CMD_ERROR;
     }
     outputter_t outp;
@@ -207,7 +207,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         writembs_nofail(outp, enter_standout_mode);
     }
 
-    if (bgcolor != NULL && bg.is_normal()) {
+    if (bgcolor != nullptr && bg.is_normal()) {
         writembs_nofail(outp, tparm((char *)exit_attribute_mode));
     }
 
@@ -224,7 +224,7 @@ int builtin_set_color(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
     }
 
-    if (bgcolor != NULL && !bg.is_normal() && !bg.is_reset()) {
+    if (bgcolor != nullptr && !bg.is_normal() && !bg.is_reset()) {
         outp.write_color(bg, false /* not is_fg */);
     }
 
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index fd97f5e0f..2fcbce962 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -61,7 +61,7 @@ const enum_map<status_cmd_t> status_enum_map[] = {
     {STATUS_STACK_TRACE, L"print-stack-trace"},
     {STATUS_STACK_TRACE, L"stack-trace"},
     {STATUS_TEST_FEATURE, L"test-feature"},
-    {STATUS_UNDEF, NULL}};
+    {STATUS_UNDEF, nullptr}};
 #define status_enum_map_len (sizeof status_enum_map / sizeof *status_enum_map)
 
 #define CHECK_FOR_UNEXPECTED_STATUS_ARGS(status_cmd)                                        \
@@ -103,24 +103,24 @@ struct status_cmd_opts_t {
 /// scripts.
 static const wchar_t *const short_options = L":L:cbilfnhj:t";
 static const struct woption long_options[] = {
-    {L"help", no_argument, NULL, 'h'},
-    {L"current-filename", no_argument, NULL, 'f'},
-    {L"current-line-number", no_argument, NULL, 'n'},
-    {L"filename", no_argument, NULL, 'f'},
-    {L"fish-path", no_argument, NULL, STATUS_FISH_PATH},
-    {L"is-block", no_argument, NULL, 'b'},
-    {L"is-command-substitution", no_argument, NULL, 'c'},
-    {L"is-full-job-control", no_argument, NULL, STATUS_IS_FULL_JOB_CTRL},
-    {L"is-interactive", no_argument, NULL, 'i'},
-    {L"is-interactive-job-control", no_argument, NULL, STATUS_IS_INTERACTIVE_JOB_CTRL},
-    {L"is-login", no_argument, NULL, 'l'},
-    {L"is-no-job-control", no_argument, NULL, STATUS_IS_NO_JOB_CTRL},
-    {L"job-control", required_argument, NULL, 'j'},
-    {L"level", required_argument, NULL, 'L'},
-    {L"line", no_argument, NULL, 'n'},
-    {L"line-number", no_argument, NULL, 'n'},
-    {L"print-stack-trace", no_argument, NULL, 't'},
-    {NULL, 0, NULL, 0}};
+    {L"help", no_argument, nullptr, 'h'},
+    {L"current-filename", no_argument, nullptr, 'f'},
+    {L"current-line-number", no_argument, nullptr, 'n'},
+    {L"filename", no_argument, nullptr, 'f'},
+    {L"fish-path", no_argument, nullptr, STATUS_FISH_PATH},
+    {L"is-block", no_argument, nullptr, 'b'},
+    {L"is-command-substitution", no_argument, nullptr, 'c'},
+    {L"is-full-job-control", no_argument, nullptr, STATUS_IS_FULL_JOB_CTRL},
+    {L"is-interactive", no_argument, nullptr, 'i'},
+    {L"is-interactive-job-control", no_argument, nullptr, STATUS_IS_INTERACTIVE_JOB_CTRL},
+    {L"is-login", no_argument, nullptr, 'l'},
+    {L"is-no-job-control", no_argument, nullptr, STATUS_IS_NO_JOB_CTRL},
+    {L"job-control", required_argument, nullptr, 'j'},
+    {L"level", required_argument, nullptr, 'L'},
+    {L"line", no_argument, nullptr, 'n'},
+    {L"line-number", no_argument, nullptr, 'n'},
+    {L"print-stack-trace", no_argument, nullptr, 't'},
+    {nullptr, 0, nullptr, 0}};
 
 /// Remember the status subcommand and disallow selecting more than one status subcommand.
 static bool set_status_cmd(wchar_t *const cmd, status_cmd_opts_t &opts, status_cmd_t sub_cmd,
@@ -154,7 +154,7 @@ static int parse_cmd_opts(status_cmd_opts_t &opts, int *optind,  //!OCLINT(high
     wchar_t *cmd = argv[0];
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case STATUS_IS_FULL_JOB_CTRL: {
                 if (!set_status_cmd(cmd, opts, STATUS_IS_FULL_JOB_CTRL, streams)) {
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index b82edb713..9b2453305 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -60,7 +60,7 @@ static bool string_args_from_stdin(const io_streams_t &streams) {
 }
 
 static const wchar_t *string_get_arg_argv(int *argidx, const wchar_t *const *argv) {
-    return argv && argv[*argidx] ? argv[(*argidx)++] : NULL;
+    return argv && argv[*argidx] ? argv[(*argidx)++] : nullptr;
 }
 
 // A helper type for extracting arguments from either argv or stdin.
@@ -119,13 +119,13 @@ class arg_iterator_t {
 
     const wcstring *nextstr() {
         if (string_args_from_stdin(streams_)) {
-            return get_arg_stdin() ? &storage_ : NULL;
+            return get_arg_stdin() ? &storage_ : nullptr;
         }
         if (auto arg = string_get_arg_argv(&argidx_, argv_)) {
             storage_ = arg;
             return &storage_;
         } else {
-            return NULL;
+            return nullptr;
         }
     }
 };
@@ -176,8 +176,8 @@ typedef struct {  //!OCLINT(too many fields)
     long start = 0;
 
     const wchar_t *chars_to_trim = L" \f\n\r\t";
-    const wchar_t *arg1 = NULL;
-    const wchar_t *arg2 = NULL;
+    const wchar_t *arg1 = nullptr;
+    const wchar_t *arg2 = nullptr;
 
     escape_string_style_t escape_style = STRING_STYLE_SCRIPT;
 } options_t;
@@ -416,27 +416,27 @@ static wcstring construct_short_opts(options_t *opts) {  //!OCLINT(high npath co
 // Note that several long flags share the same short flag. That is okay. The caller is expected
 // to indicate that a max of one of the long flags sharing a short flag is valid.
 // Remember: adjust share/completions/string.fish when `string` options change
-static const struct woption long_options[] = {{L"all", no_argument, NULL, 'a'},
-                                              {L"chars", required_argument, NULL, 'c'},
-                                              {L"count", required_argument, NULL, 'n'},
-                                              {L"entire", no_argument, NULL, 'e'},
-                                              {L"filter", no_argument, NULL, 'f'},
-                                              {L"ignore-case", no_argument, NULL, 'i'},
-                                              {L"index", no_argument, NULL, 'n'},
-                                              {L"invert", no_argument, NULL, 'v'},
-                                              {L"left", no_argument, NULL, 'l'},
-                                              {L"length", required_argument, NULL, 'l'},
-                                              {L"max", required_argument, NULL, 'm'},
-                                              {L"no-empty", no_argument, NULL, 'n'},
-                                              {L"no-newline", no_argument, NULL, 'N'},
-                                              {L"no-quoted", no_argument, NULL, 'n'},
-                                              {L"quiet", no_argument, NULL, 'q'},
-                                              {L"regex", no_argument, NULL, 'r'},
-                                              {L"right", no_argument, NULL, 'r'},
-                                              {L"start", required_argument, NULL, 's'},
-                                              {L"style", required_argument, NULL, 1},
-                                              {L"no-trim-newlines", no_argument, NULL, 'N'},
-                                              {NULL, 0, NULL, 0}};
+static const struct woption long_options[] = {{L"all", no_argument, nullptr, 'a'},
+                                              {L"chars", required_argument, nullptr, 'c'},
+                                              {L"count", required_argument, nullptr, 'n'},
+                                              {L"entire", no_argument, nullptr, 'e'},
+                                              {L"filter", no_argument, nullptr, 'f'},
+                                              {L"ignore-case", no_argument, nullptr, 'i'},
+                                              {L"index", no_argument, nullptr, 'n'},
+                                              {L"invert", no_argument, nullptr, 'v'},
+                                              {L"left", no_argument, nullptr, 'l'},
+                                              {L"length", required_argument, nullptr, 'l'},
+                                              {L"max", required_argument, nullptr, 'm'},
+                                              {L"no-empty", no_argument, nullptr, 'n'},
+                                              {L"no-newline", no_argument, nullptr, 'N'},
+                                              {L"no-quoted", no_argument, nullptr, 'n'},
+                                              {L"quiet", no_argument, nullptr, 'q'},
+                                              {L"regex", no_argument, nullptr, 'r'},
+                                              {L"right", no_argument, nullptr, 'r'},
+                                              {L"start", required_argument, nullptr, 's'},
+                                              {L"style", required_argument, nullptr, 1},
+                                              {L"no-trim-newlines", no_argument, nullptr, 'N'},
+                                              {nullptr, 0, nullptr, 0}};
 
 static const std::unordered_map<char, decltype(*handle_flag_N)> flag_to_function = {
     {'N', handle_flag_N}, {'a', handle_flag_a}, {'c', handle_flag_c}, {'e', handle_flag_e},
@@ -452,7 +452,7 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
     const wchar_t *short_options = short_opts.c_str();
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         auto fn = flag_to_function.find(opt);
         if (fn != flag_to_function.end()) {
             int retval = fn->second(argv, parser, streams, w, opts);
@@ -685,7 +685,7 @@ struct compiled_regex_t {
 
     compiled_regex_t(const wchar_t *argv0, const wcstring &pattern, bool ignore_case,
                      io_streams_t &streams)
-        : code(0), match(0) {
+        : code(nullptr), match(nullptr) {
         // Disable some sequences that can lead to security problems.
         uint32_t options = PCRE2_NEVER_UTF;
 #if PCRE2_CODE_UNIT_WIDTH < 32
@@ -695,10 +695,10 @@ struct compiled_regex_t {
         int err_code = 0;
         PCRE2_SIZE err_offset = 0;
 
-        code =
-            pcre2_compile(PCRE2_SPTR(pattern.c_str()), pattern.length(),
-                          options | (ignore_case ? PCRE2_CASELESS : 0), &err_code, &err_offset, 0);
-        if (code == 0) {
+        code = pcre2_compile(PCRE2_SPTR(pattern.c_str()), pattern.length(),
+                             options | (ignore_case ? PCRE2_CASELESS : 0), &err_code, &err_offset,
+                             nullptr);
+        if (code == nullptr) {
             string_error(streams, _(L"%ls: Regular expression compile error: %ls\n"), argv0,
                          pcre2_strerror(err_code).c_str());
             string_error(streams, L"%ls: %ls\n", argv0, pattern.c_str());
@@ -706,15 +706,15 @@ struct compiled_regex_t {
             return;
         }
 
-        match = pcre2_match_data_create_from_pattern(code, 0);
+        match = pcre2_match_data_create_from_pattern(code, nullptr);
         assert(match);
     }
 
     ~compiled_regex_t() {
-        if (match != 0) {
+        if (match != nullptr) {
             pcre2_match_data_free(match);
         }
-        if (code != 0) {
+        if (code != nullptr) {
             pcre2_code_free(code);
         }
     }
@@ -785,7 +785,7 @@ class pcre2_matcher_t : public string_matcher_t {
     bool report_matches(const wcstring &arg) override {
         // A return value of true means all is well (even if no matches were found), false indicates
         // an unrecoverable error.
-        if (regex.code == 0) {
+        if (regex.code == nullptr) {
             // pcre2_compile() failed.
             return false;
         }
@@ -794,8 +794,8 @@ class pcre2_matcher_t : public string_matcher_t {
 
         // See pcre2demo.c for an explanation of this logic.
         PCRE2_SIZE arglen = arg.length();
-        int rc = report_match(
-            arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, 0, 0, regex.match, 0));
+        int rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, 0, 0,
+                                               regex.match, nullptr));
         if (rc < 0) {  // pcre2 match error.
             return false;
         } else if (rc == 0) {  // no match
@@ -822,7 +822,7 @@ class pcre2_matcher_t : public string_matcher_t {
             }
 
             rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, offset,
-                                               options, regex.match, 0));
+                                               options, regex.match, nullptr));
             if (rc < 0) {
                 return false;
             }
@@ -1008,7 +1008,7 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
         pcre2_rc = pcre2_substitute(regex.code, PCRE2_SPTR(arg.c_str()), arglen,
                                     0,  // start offset
                                     options, regex.match,
-                                    0,  // match context
+                                    nullptr,  // match context
                                     PCRE2_SPTR(replacement->c_str()), replacement->length(),
                                     reinterpret_cast<PCRE2_UCHAR *>(output), &outlen);
 
@@ -1332,14 +1332,13 @@ static const struct string_subcommand {
                    wchar_t **argv);                       //!OCLINT(unused param)
 }
 
-string_subcommands[] = {{L"escape", &string_escape},   {L"join", &string_join},
-                        {L"join0", &string_join0},     {L"length", &string_length},
-                        {L"match", &string_match},     {L"replace", &string_replace},
-                        {L"split", &string_split},     {L"split0", &string_split0},
-                        {L"sub", &string_sub},         {L"trim", &string_trim},
-                        {L"lower", &string_lower},     {L"upper", &string_upper},
-                        {L"repeat", &string_repeat},   {L"unescape", &string_unescape},
-                        {L"collect", &string_collect}, {NULL, NULL}};
+string_subcommands[] = {
+    {L"escape", &string_escape}, {L"join", &string_join},         {L"join0", &string_join0},
+    {L"length", &string_length}, {L"match", &string_match},       {L"replace", &string_replace},
+    {L"split", &string_split},   {L"split0", &string_split0},     {L"sub", &string_sub},
+    {L"trim", &string_trim},     {L"lower", &string_lower},       {L"upper", &string_upper},
+    {L"repeat", &string_repeat}, {L"unescape", &string_unescape}, {L"collect", &string_collect},
+    {nullptr, nullptr}};
 
 /// The string builtin, for manipulating strings.
 int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
@@ -1357,7 +1356,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     const string_subcommand *subcmd = &string_subcommands[0];
-    while (subcmd->name != 0 && std::wcscmp(subcmd->name, argv[1]) != 0) {
+    while (subcmd->name != nullptr && std::wcscmp(subcmd->name, argv[1]) != 0) {
         subcmd++;
     }
     if (!subcmd->handler) {
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index b821589ac..52d552a28 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -288,7 +288,7 @@ class parenthetical_expression : public expression {
 };
 
 void test_parser::add_error(const wchar_t *fmt, ...) {
-    assert(fmt != NULL);
+    assert(fmt != nullptr);
     va_list va;
     va_start(va, fmt);
     this->errors.push_back(vformat_string(fmt, va));
@@ -296,12 +296,12 @@ void test_parser::add_error(const wchar_t *fmt, ...) {
 }
 
 unique_ptr<expression> test_parser::error(const wchar_t *fmt, ...) {
-    assert(fmt != NULL);
+    assert(fmt != nullptr);
     va_list va;
     va_start(va, fmt);
     this->errors.push_back(vformat_string(fmt, va));
     va_end(va);
-    return NULL;
+    return nullptr;
 }
 
 unique_ptr<expression> test_parser::parse_unary_expression(unsigned int start, unsigned int end) {
@@ -315,7 +315,7 @@ unique_ptr<expression> test_parser::parse_unary_expression(unsigned int start, u
             return make_unique<unary_operator>(tok, range_t(start, subject->range.end),
                                                move(subject));
         }
-        return NULL;
+        return nullptr;
     }
     return parse_primary(start, end);
 }
@@ -323,7 +323,7 @@ unique_ptr<expression> test_parser::parse_unary_expression(unsigned int start, u
 /// Parse a combining expression (AND, OR).
 unique_ptr<expression> test_parser::parse_combining_expression(unsigned int start,
                                                                unsigned int end) {
-    if (start >= end) return NULL;
+    if (start >= end) return nullptr;
 
     std::vector<unique_ptr<expression>> subjects;
     std::vector<token_t> combiners;
@@ -363,7 +363,7 @@ unique_ptr<expression> test_parser::parse_combining_expression(unsigned int star
     }
 
     if (subjects.empty()) {
-        return NULL;  // no subjects
+        return nullptr;  // no subjects
     }
     // Our new expression takes ownership of all expressions we created. The token we pass is
     // irrelevant.
@@ -382,7 +382,7 @@ unique_ptr<expression> test_parser::parse_unary_primary(unsigned int start, unsi
 
     // All our unary primaries are prefix, so the operator is at start.
     const token_info_t *info = token_for_string(arg(start));
-    if (!(info->flags & UNARY_PRIMARY)) return NULL;
+    if (!(info->flags & UNARY_PRIMARY)) return nullptr;
 
     return make_unique<unary_primary>(info->tok, range_t(start, start + 2), arg(start + 1));
 }
@@ -416,7 +416,7 @@ unique_ptr<expression> test_parser::parse_binary_primary(unsigned int start, uns
 
     // All our binary primaries are infix, so the operator is at start + 1.
     const token_info_t *info = token_for_string(arg(start + 1));
-    if (!(info->flags & BINARY_PRIMARY)) return NULL;
+    if (!(info->flags & BINARY_PRIMARY)) return nullptr;
 
     return make_unique<binary_primary>(info->tok, range_t(start, start + 3), arg(start),
                                        arg(start + 2));
@@ -424,15 +424,15 @@ unique_ptr<expression> test_parser::parse_binary_primary(unsigned int start, uns
 
 unique_ptr<expression> test_parser::parse_parenthentical(unsigned int start, unsigned int end) {
     // We need at least three arguments: open paren, argument, close paren.
-    if (start + 3 >= end) return NULL;
+    if (start + 3 >= end) return nullptr;
 
     // Must start with an open expression.
     const token_info_t *open_paren = token_for_string(arg(start));
-    if (open_paren->tok != test_paren_open) return NULL;
+    if (open_paren->tok != test_paren_open) return nullptr;
 
     // Parse a subexpression.
     unique_ptr<expression> subexpr = parse_expression(start + 1, end);
-    if (!subexpr) return NULL;
+    if (!subexpr) return nullptr;
 
     // Parse a close paren.
     unsigned close_index = subexpr->range.end;
@@ -455,7 +455,7 @@ unique_ptr<expression> test_parser::parse_primary(unsigned int start, unsigned i
         return error(L"Missing argument at index %u", start);
     }
 
-    unique_ptr<expression> expr = NULL;
+    unique_ptr<expression> expr = nullptr;
     if (!expr) expr = parse_parenthentical(start, end);
     if (!expr) expr = parse_unary_primary(start, end);
     if (!expr) expr = parse_binary_primary(start, end);
@@ -466,7 +466,7 @@ unique_ptr<expression> test_parser::parse_primary(unsigned int start, unsigned i
 // See IEEE 1003.1 breakdown of the behavior for different parameter counts.
 unique_ptr<expression> test_parser::parse_3_arg_expression(unsigned int start, unsigned int end) {
     assert(end - start == 3);
-    unique_ptr<expression> result = NULL;
+    unique_ptr<expression> result = nullptr;
 
     const token_info_t *center_token = token_for_string(arg(start + 1));
     if (center_token->flags & BINARY_PRIMARY) {
@@ -491,7 +491,7 @@ unique_ptr<expression> test_parser::parse_3_arg_expression(unsigned int start, u
 
 unique_ptr<expression> test_parser::parse_4_arg_expression(unsigned int start, unsigned int end) {
     assert(end - start == 4);
-    unique_ptr<expression> result = NULL;
+    unique_ptr<expression> result = nullptr;
 
     token_t first_token = token_for_string(arg(start))->tok;
     if (first_token == test_bang) {
@@ -565,7 +565,7 @@ unique_ptr<expression> test_parser::parse_args(const wcstring_list_t &args, wcst
                               static_cast<unsigned long>(result->range.end),
                               args.at(result->range.end).c_str());
             }
-            result.reset(NULL);
+            result.reset(nullptr);
         }
     }
 
@@ -641,7 +641,7 @@ static bool parse_double(const wchar_t *arg, double *out_res) {
     // Consume leading spaces.
     while (arg && *arg != L'\0' && iswspace(*arg)) arg++;
     errno = 0;
-    wchar_t *end = NULL;
+    wchar_t *end = nullptr;
     *out_res = fish_wcstod(arg, &end);
     // Consume trailing spaces.
     while (end && *end != L'\0' && iswspace(*end)) end++;
diff --git a/src/builtin_ulimit.cpp b/src/builtin_ulimit.cpp
index d00eb03fc..3fda263d1 100644
--- a/src/builtin_ulimit.cpp
+++ b/src/builtin_ulimit.cpp
@@ -43,7 +43,7 @@ static const struct resource_t resource_arr[] = {
 #ifdef RLIMIT_AS
     {RLIMIT_AS, L"Maximum amount of virtual memory available to the shell", L'v', 1024},
 #endif
-    {0, 0, 0, 0}};
+    {0, nullptr, 0, 0}};
 
 /// Get the implicit multiplication factor for the specified resource limit.
 static int get_multiplier(int what) {
@@ -159,25 +159,25 @@ int builtin_ulimit(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
     static const wchar_t *const short_options = L":HSacdflmnstuvh";
     static const struct woption long_options[] = {
-        {L"all", no_argument, NULL, 'a'},
-        {L"hard", no_argument, NULL, 'H'},
-        {L"soft", no_argument, NULL, 'S'},
-        {L"core-size", no_argument, NULL, 'c'},
-        {L"data-size", no_argument, NULL, 'd'},
-        {L"file-size", no_argument, NULL, 'f'},
-        {L"lock-size", no_argument, NULL, 'l'},
-        {L"resident-set-size", no_argument, NULL, 'm'},
-        {L"file-descriptor-count", no_argument, NULL, 'n'},
-        {L"stack-size", no_argument, NULL, 's'},
-        {L"cpu-time", no_argument, NULL, 't'},
-        {L"process-count", no_argument, NULL, 'u'},
-        {L"virtual-memory-size", no_argument, NULL, 'v'},
-        {L"help", no_argument, NULL, 'h'},
-        {NULL, 0, NULL, 0}};
+        {L"all", no_argument, nullptr, 'a'},
+        {L"hard", no_argument, nullptr, 'H'},
+        {L"soft", no_argument, nullptr, 'S'},
+        {L"core-size", no_argument, nullptr, 'c'},
+        {L"data-size", no_argument, nullptr, 'd'},
+        {L"file-size", no_argument, nullptr, 'f'},
+        {L"lock-size", no_argument, nullptr, 'l'},
+        {L"resident-set-size", no_argument, nullptr, 'm'},
+        {L"file-descriptor-count", no_argument, nullptr, 'n'},
+        {L"stack-size", no_argument, nullptr, 's'},
+        {L"cpu-time", no_argument, nullptr, 't'},
+        {L"process-count", no_argument, nullptr, 'u'},
+        {L"virtual-memory-size", no_argument, nullptr, 'v'},
+        {L"help", no_argument, nullptr, 'h'},
+        {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'a': {
                 report_all = true;
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index a8b39b9ce..f514c09f6 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -183,12 +183,12 @@ int builtin_wait(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool any_flag = false;  // flag for -n option
 
     static const wchar_t *const short_options = L":n";
-    static const struct woption long_options[] = {{L"any", no_argument, NULL, 'n'},
-                                                  {NULL, 0, NULL, 0}};
+    static const struct woption long_options[] = {{L"any", no_argument, nullptr, 'n'},
+                                                  {nullptr, 0, nullptr, 0}};
 
     int opt;
     wgetopter_t w;
-    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
+    while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, nullptr)) != -1) {
         switch (opt) {
             case 'n':
                 any_flag = true;
diff --git a/src/common.cpp b/src/common.cpp
index f251db257..9fa1b5586 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -137,7 +137,7 @@ long convert_digit(wchar_t d, int base) {
 }
 
 /// Test whether the char is a valid hex digit as used by the `escape_string_*()` functions.
-static bool is_hex_digit(int c) { return std::strchr("0123456789ABCDEF", c) != NULL; }
+static bool is_hex_digit(int c) { return std::strchr("0123456789ABCDEF", c) != nullptr; }
 
 /// This is a specialization of `convert_digit()` that only handles base 16 and only uppercase.
 long convert_hex_digit(wchar_t d) {
@@ -216,13 +216,14 @@ bool is_windows_subsystem_for_linux() {
     for (int i = skip_levels; i < n_frames; i++) {
         Dl_info info;
         if (dladdr(callstack[i], &info) && info.dli_sname) {
-            char *demangled = NULL;
+            char *demangled = nullptr;
             int status = -1;
             if (info.dli_sname[0] == '_')
-                demangled = abi::__cxa_demangle(info.dli_sname, NULL, 0, &status);
-            swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels,
-                     status == 0 ? demangled : info.dli_sname == 0 ? symbols[i] : info.dli_sname,
-                     static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr));
+                demangled = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status);
+            swprintf(
+                text, sizeof(text) / sizeof(wchar_t), L"%-3d %s + %td", i - skip_levels,
+                status == 0 ? demangled : info.dli_sname == nullptr ? symbols[i] : info.dli_sname,
+                static_cast<char *>(callstack[i]) - static_cast<char *>(info.dli_saddr));
             free(demangled);
         } else {
             swprintf(text, sizeof(text) / sizeof(wchar_t), L"%-3d %s", i - skip_levels, symbols[i]);
@@ -287,7 +288,7 @@ int fgetws2(wcstring *s, FILE *f) {
 /// area.
 static wcstring str2wcs_internal(const char *in, const size_t in_len) {
     if (in_len == 0) return wcstring();
-    assert(in != NULL);
+    assert(in != nullptr);
 
     wcstring result;
     result.reserve(in_len);
@@ -375,7 +376,7 @@ wcstring str2wcstring(const std::string &in, size_t len) {
 }
 
 char *wcs2str(const wchar_t *in, size_t len) {
-    if (!in) return NULL;
+    if (!in) return nullptr;
     size_t desired_size = MAX_UTF8_BYTES * len + 1;
     char local_buff[512];
     if (desired_size <= sizeof local_buff / sizeof *local_buff) {
@@ -507,7 +508,7 @@ void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig) {
     const size_t max_size = (128 * 1024 * 1024);
     wchar_t static_buff[256];
     size_t size = 0;
-    wchar_t *buff = NULL;
+    wchar_t *buff = nullptr;
     int status = -1;
     while (status < 0) {
         // Reallocate if necessary.
@@ -520,8 +521,8 @@ void append_formatv(wcstring &target, const wchar_t *format, va_list va_orig) {
                 buff[0] = '\0';
                 break;
             }
-            buff = static_cast<wchar_t *>(realloc((buff == static_buff ? NULL : buff), size));
-            assert(buff != NULL);
+            buff = static_cast<wchar_t *>(realloc((buff == static_buff ? nullptr : buff), size));
+            assert(buff != nullptr);
         }
 
         // Try printing.
@@ -559,18 +560,18 @@ wchar_t *quote_end(const wchar_t *pos) {
     while (1) {
         pos++;
 
-        if (!*pos) return 0;
+        if (!*pos) return nullptr;
 
         if (*pos == L'\\') {
             pos++;
-            if (!*pos) return 0;
+            if (!*pos) return nullptr;
         } else {
             if (*pos == c) {
                 return const_cast<wchar_t *>(pos);
             }
         }
     }
-    return 0;
+    return nullptr;
 }
 
 void fish_setlocale() {
@@ -720,7 +721,7 @@ void debug_safe(int level, const char *msg, const char *param1, const char *para
     const char *cursor = msg;
     while (*cursor != '\0') {
         const char *end = std::strchr(cursor, '%');
-        if (end == NULL) end = cursor + std::strlen(cursor);
+        if (end == nullptr) end = cursor + std::strlen(cursor);
 
         ignore_result(write(STDERR_FILENO, cursor, end - cursor));
 
@@ -1721,7 +1722,7 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
 }
 
 bool unescape_string_in_place(wcstring *str, unescape_flags_t escape_special) {
-    assert(str != NULL);
+    assert(str != nullptr);
     wcstring output;
     bool success = unescape_string_internal(str->c_str(), str->size(), &output, escape_special);
     if (success) {
@@ -2145,7 +2146,7 @@ int create_directory(const wcstring &d) {
 
 wcstring format_size(long long sz) {
     wcstring result;
-    const wchar_t *sz_name[] = {L"kB", L"MB", L"GB", L"TB", L"PB", L"EB", L"ZB", L"YB", 0};
+    const wchar_t *sz_name[] = {L"kB", L"MB", L"GB", L"TB", L"PB", L"EB", L"ZB", L"YB", nullptr};
 
     if (sz < 0) {
         result.append(L"unknown");
@@ -2201,7 +2202,7 @@ void format_size_safe(char buff[128], unsigned long long sz) {
     const size_t max_len = buff_size - 1;  // need to leave room for a null terminator
     std::memset(buff, 0, buff_size);
     size_t idx = 0;
-    const char *const sz_name[] = {"kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL};
+    const char *const sz_name[] = {"kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", nullptr};
     if (sz < 1) {
         strncpy(buff, "empty", buff_size);
     } else if (sz < 1024) {
@@ -2235,7 +2236,7 @@ void format_size_safe(char buff[128], unsigned long long sz) {
 /// the gettimeofday function and will have the same precision as that function.
 double timef() {
     struct timeval tv;
-    assert_with_errno(gettimeofday(&tv, 0) != -1);
+    assert_with_errno(gettimeofday(&tv, nullptr) != -1);
     // return (double)tv.tv_sec + 0.000001 * tv.tv_usec;
     return static_cast<double>(tv.tv_sec) + 1e-6 * tv.tv_usec;
 }
@@ -2389,7 +2390,7 @@ static CharType_t **make_null_terminated_array_helper(
     // Now allocate their sum.
     unsigned char *base =
         static_cast<unsigned char *>(malloc(pointers_allocation_len + strings_allocation_len));
-    if (!base) return NULL;
+    if (!base) return nullptr;
 
     // Divvy it up into the pointers and strings.
     CharType_t **pointers = reinterpret_cast<CharType_t **>(base);
@@ -2402,7 +2403,7 @@ static CharType_t **make_null_terminated_array_helper(
         strings = std::copy(str.begin(), str.end(), strings);  // copy the string into strings
         *strings++ = (CharType_t)(0);  // each string needs a null terminator
     }
-    *pointers++ = NULL;  // array of pointers needs a null terminator
+    *pointers++ = nullptr;  // array of pointers needs a null terminator
 
     // Make sure we know what we're doing.
     assert((unsigned char *)pointers - base == (std::ptrdiff_t)pointers_allocation_len);
diff --git a/src/common.h b/src/common.h
index f32e7e11a..9a9acf6df 100644
--- a/src/common.h
+++ b/src/common.h
@@ -475,11 +475,13 @@ void format_size_safe(char buff[128], unsigned long long sz);
 
 /// Our crappier versions of debug which is guaranteed to not allocate any memory, or do anything
 /// other than call write(). This is useful after a call to fork() with threads.
-void debug_safe(int level, const char *msg, const char *param1 = NULL, const char *param2 = NULL,
-                const char *param3 = NULL, const char *param4 = NULL, const char *param5 = NULL,
-                const char *param6 = NULL, const char *param7 = NULL, const char *param8 = NULL,
-                const char *param9 = NULL, const char *param10 = NULL, const char *param11 = NULL,
-                const char *param12 = NULL);
+void debug_safe(int level, const char *msg, const char *param1 = nullptr,
+                const char *param2 = nullptr, const char *param3 = nullptr,
+                const char *param4 = nullptr, const char *param5 = nullptr,
+                const char *param6 = nullptr, const char *param7 = nullptr,
+                const char *param8 = nullptr, const char *param9 = nullptr,
+                const char *param10 = nullptr, const char *param11 = nullptr,
+                const char *param12 = nullptr);
 
 /// Writes out a long safely.
 void format_long_safe(char buff[64], long val);
@@ -529,7 +531,7 @@ char **make_null_terminated_array(const std::vector<std::string> &lst);
 // Helper class for managing a null-terminated array of null-terminated strings (of some char type).
 template <typename CharType_t>
 class null_terminated_array_t {
-    CharType_t **array{NULL};
+    CharType_t **array{nullptr};
 
     // No assignment or copying.
     void operator=(null_terminated_array_t rhs) = delete;
@@ -539,8 +541,8 @@ class null_terminated_array_t {
 
     size_t size() const {
         size_t len = 0;
-        if (array != NULL) {
-            while (array[len] != NULL) {
+        if (array != nullptr) {
+            while (array[len] != nullptr) {
                 len++;
             }
         }
@@ -549,7 +551,7 @@ class null_terminated_array_t {
 
     void free(void) {
         ::free((void *)array);
-        array = NULL;
+        array = nullptr;
     }
 
    public:
@@ -951,7 +953,7 @@ static const wchar_t *enum_to_str(T enum_val, const enum_map<T> map[]) {
             return entry->str;
         }
     }
-    return NULL;
+    return nullptr;
 };
 
 void redirect_tty_output();
diff --git a/src/complete.cpp b/src/complete.cpp
index d4c8d1530..bed7593ac 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -197,7 +197,7 @@ static complete_flags_t resolve_auto_space(const wcstring &comp, complete_flags_
     if (flags & COMPLETE_AUTO_SPACE) {
         new_flags &= ~COMPLETE_AUTO_SPACE;
         size_t len = comp.size();
-        if (len > 0 && (std::wcschr(L"/=@:", comp.at(len - 1)) != 0))
+        if (len > 0 && (std::wcschr(L"/=@:", comp.at(len - 1)) != nullptr))
             new_flags |= COMPLETE_NO_SPACE;
     }
     return new_flags;
@@ -681,7 +681,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
         expand_string(str_cmd, &this->completions,
                       this->expand_flags() | expand_flag::special_for_command |
                           expand_flag::for_completions | expand_flag::executables_only,
-                      vars, parser, NULL);
+                      vars, parser, nullptr);
     if (result != expand_result_t::error && this->wants_descriptions()) {
         this->complete_cmd_desc(str_cmd);
     }
@@ -693,7 +693,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
         expand_string(
             str_cmd, &this->completions,
             this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
-            vars, parser, NULL);
+            vars, parser, nullptr);
     UNUSED(ignore);
 
     if (str_cmd.empty() || (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~')) {
@@ -793,18 +793,18 @@ static bool param_match(const complete_entry_opt_t *e, const wchar_t *optstr) {
 static const wchar_t *param_match2(const complete_entry_opt_t *e, const wchar_t *optstr) {
     // We may get a complete_entry_opt_t with no options if it's just arguments.
     if (e->option.empty()) {
-        return NULL;
+        return nullptr;
     }
 
     // Verify leading dashes.
     size_t cursor = leading_dash_count(optstr);
     if (cursor != e->expected_dash_count()) {
-        return NULL;
+        return nullptr;
     }
 
     // Verify options match.
     if (!string_prefixes_string(e->option, &optstr[cursor])) {
-        return NULL;
+        return nullptr;
     }
     cursor += e->option.length();
 
@@ -812,7 +812,7 @@ static const wchar_t *param_match2(const complete_entry_opt_t *e, const wchar_t
     // sign for long options.
     assert(e->type != option_type_short);
     if (optstr[cursor] != L'=') {
-        return NULL;
+        return nullptr;
     }
     cursor += 1;
     return &optstr[cursor];
@@ -954,7 +954,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
                     } else {
                         arg = param_match2(&o, str.c_str());
                     }
-                    if (arg != NULL && this->condition_test(o.condition)) {
+                    if (arg != nullptr && this->condition_test(o.condition)) {
                         if (o.result_mode.requires_param) use_common = false;
                         if (o.result_mode.no_files) use_files = false;
                         if (o.result_mode.force_files) has_force = true;
@@ -1136,7 +1136,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         std::vector<completion_t> local_completions;
-        if (expand_string(sep_string, &local_completions, flags, vars, parser, NULL) ==
+        if (expand_string(sep_string, &local_completions, flags, vars, parser, nullptr) ==
             expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
         }
@@ -1156,7 +1156,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // consider relaxing this if there was a preceding double-dash argument.
         if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::fuzzy_match);
 
-        if (expand_string(str, &this->completions, flags, vars, parser, NULL) ==
+        if (expand_string(str, &this->completions, flags, vars, parser, nullptr) ==
             expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
         }
@@ -1638,7 +1638,7 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(cmd_with_subcmds.c_str(), cmd_with_subcmds.size(), &cmdsubst_begin,
                                &cmdsubst_end);
-    assert(cmdsubst_begin != NULL && cmdsubst_end != NULL && cmdsubst_end >= cmdsubst_begin);
+    assert(cmdsubst_begin != nullptr && cmdsubst_end != nullptr && cmdsubst_end >= cmdsubst_begin);
     wcstring cmd = wcstring(cmdsubst_begin, cmdsubst_end - cmdsubst_begin);
     completer_t completer(vars, parser, std::move(cmd), flags);
     completer.perform();
diff --git a/src/env.cpp b/src/env.cpp
index 2eac7d73f..7cfe7c0bb 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -206,7 +206,7 @@ void misc_init() {
     // issue #3748.
     if (isatty(STDOUT_FILENO)) {
         fflush(stdout);
-        setvbuf(stdout, NULL, _IONBF, 0);
+        setvbuf(stdout, nullptr, _IONBF, 0);
     }
 }
 
@@ -253,7 +253,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
     }
 
     // Set the given paths in the environment, if we have any.
-    if (paths != NULL) {
+    if (paths != nullptr) {
         vars.set_one(FISH_DATADIR_VAR, ENV_GLOBAL, paths->data);
         vars.set_one(FISH_SYSCONFDIR_VAR, ENV_GLOBAL, paths->sysconf);
         vars.set_one(FISH_HELPDIR_VAR, ENV_GLOBAL, paths->doc);
@@ -392,7 +392,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
 static int set_umask(const wcstring_list_t &list_val) {
     long mask = -1;
     if (list_val.size() == 1 && !list_val.front().empty()) {
-        mask = fish_wcstol(list_val.front().c_str(), NULL, 8);
+        mask = fish_wcstol(list_val.front().c_str(), nullptr, 8);
     }
 
     if (errno || mask > 0777 || mask < 0) return ENV_INVALID;
@@ -1401,14 +1401,14 @@ wcstring env_get_runtime_path() {
     // Check that the path is actually usable. Technically this is guaranteed by the fdo spec but in
     // practice it is not always the case: see #1828 and #2222.
     int mode = R_OK | W_OK | X_OK;
-    if (dir != NULL && access(dir, mode) == 0 && check_runtime_path(dir) == 0) {
+    if (dir != nullptr && access(dir, mode) == 0 && check_runtime_path(dir) == 0) {
         result = str2wcstring(dir);
     } else {
         // Don't rely on $USER being set, as setup_user() has not yet been called.
         // See https://github.com/fish-shell/fish-shell/issues/5180
         // getpeuid() can't fail, but getpwuid sure can.
         auto pwuid = getpwuid(geteuid());
-        const char *uname = pwuid ? pwuid->pw_name : NULL;
+        const char *uname = pwuid ? pwuid->pw_name : nullptr;
         // /tmp/fish.user
         std::string tmpdir = get_path_to_tmp_dir() + "/fish.";
         if (uname) {
diff --git a/src/env.h b/src/env.h
index 454cfd94f..190ef08bf 100644
--- a/src/env.h
+++ b/src/env.h
@@ -79,7 +79,7 @@ struct statuses_t {
 };
 
 /// Initialize environment variable data.
-void env_init(const struct config_paths_t *paths = NULL);
+void env_init(const struct config_paths_t *paths = nullptr);
 
 /// Various things we need to initialize at run-time that don't really fit any of the other init
 /// routines.
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index bf70a41cd..c3b959d4b 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -164,7 +164,7 @@ static void guess_emoji_width(const environment_t &vars) {
     double version = 0;
     if (auto version_var = vars.get(L"TERM_PROGRAM_VERSION")) {
         std::string narrow_version = wcs2string(version_var->as_string());
-        version = strtod(narrow_version.c_str(), NULL);
+        version = strtod(narrow_version.c_str(), nullptr);
     }
 
     if (term == L"Apple_Terminal" && version >= 400) {
@@ -349,7 +349,7 @@ static void update_fish_color_support(const environment_t &vars) {
         if (auto tp = vars.get(L"TERM_PROGRAM")) term_program = tp->as_string();
         if (auto tpv = vars.get(L"TERM_PROGRAM_VERSION")) {
             if (term_program == L"Apple_Terminal" &&
-                fish_wcstod(tpv->as_string().c_str(), NULL) > 299) {
+                fish_wcstod(tpv->as_string().c_str(), nullptr) > 299) {
                 // OS X Lion is version 299+, it has 256 color support (see github Wiki)
                 support_term256 = true;
                 debug(2, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
@@ -358,7 +358,7 @@ static void update_fish_color_support(const environment_t &vars) {
                 debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
             }
         }
-    } else if (cur_term != NULL) {
+    } else if (cur_term != nullptr) {
         // See if terminfo happens to identify 256 colors
         support_term256 = (max_colors >= 256);
         debug(2, L"256 color support: %d colors per terminfo entry for %ls", max_colors,
@@ -455,7 +455,7 @@ static void init_curses(const environment_t &vars) {
     }
 
     int err_ret;
-    if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) {
+    if (setupterm(nullptr, STDOUT_FILENO, &err_ret) == ERR) {
         auto term = vars.get(L"TERM");
         if (is_interactive_session()) {
             debug(1, _(L"Could not set up terminal."));
@@ -484,7 +484,7 @@ static void init_curses(const environment_t &vars) {
 static void init_locale(const environment_t &vars) {
     // We have to make a copy because the subsequent setlocale() call to change the locale will
     // invalidate the pointer from the this setlocale() call.
-    char *old_msg_locale = strdup(setlocale(LC_MESSAGES, NULL));
+    char *old_msg_locale = strdup(setlocale(LC_MESSAGES, nullptr));
 
     for (const auto &var_name : locale_variables) {
         const auto var = vars.get(var_name, ENV_EXPORT);
@@ -503,7 +503,7 @@ static void init_locale(const environment_t &vars) {
     fish_setlocale();
     FLOGF(env_locale, L"init_locale() setlocale(): '%s'", locale);
 
-    const char *new_msg_locale = setlocale(LC_MESSAGES, NULL);
+    const char *new_msg_locale = setlocale(LC_MESSAGES, nullptr);
     FLOGF(env_locale, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
     FLOGF(env_locale, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
 #ifdef HAVE__NL_MSG_CAT_CNTR
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index c091a3526..d6933c080 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -174,8 +174,8 @@ static bool append_utf8(const wcstring &input, std::string *receiver, std::strin
 static bool append_file_entry(env_var_t::env_var_flags_t flags, const wcstring &key_in,
                               const wcstring &val_in, std::string *result, std::string *storage) {
     namespace f3 = fish3_uvars;
-    assert(storage != NULL);
-    assert(result != NULL);
+    assert(storage != nullptr);
+    assert(result != nullptr);
 
     // Record the length on entry, in case we need to back up.
     bool success = true;
@@ -1069,7 +1069,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
     volatile universal_notifier_shmem_t *region;
 
     void open_shmem() {
-        assert(region == NULL);
+        assert(region == nullptr);
 
         // Use a path based on our uid to avoid collisions.
         char path[NAME_MAX];
@@ -1108,13 +1108,13 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
 
         // Memory map the region.
         if (!errored) {
-            void *addr = mmap(NULL, sizeof(universal_notifier_shmem_t), PROT_READ | PROT_WRITE,
+            void *addr = mmap(nullptr, sizeof(universal_notifier_shmem_t), PROT_READ | PROT_WRITE,
                               MAP_SHARED, fd, 0);
             if (addr == MAP_FAILED) {
                 const char *error = std::strerror(errno);
                 FLOGF(error, _(L"Unable to memory map shared memory object with path '%s': %s"),
                       path, error);
-                this->region = NULL;
+                this->region = nullptr;
             } else {
                 this->region = static_cast<universal_notifier_shmem_t *>(addr);
             }
@@ -1136,7 +1136,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
     // This isn't "safe" in the sense that multiple simultaneous increments may result in one being
     // lost, but it should always result in the value being changed, which is sufficient.
     void post_notification() {
-        if (region != NULL) {
+        if (region != nullptr) {
             /* Read off the seed */
             uint32_t seed = ntohl(region->universal_variable_seed);  //!OCLINT(constant cond op)
 
@@ -1153,12 +1153,12 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         }
     }
 
-    universal_notifier_shmem_poller_t() : last_change_time(0), last_seed(0), region(NULL) {
+    universal_notifier_shmem_poller_t() : last_change_time(0), last_seed(0), region(nullptr) {
         open_shmem();
     }
 
     ~universal_notifier_shmem_poller_t() {
-        if (region != NULL) {
+        if (region != nullptr) {
             // Behold: C++ in all its glory!
             void *address = const_cast<void *>(static_cast<volatile void *>(region));
             if (munmap(address, sizeof(universal_notifier_shmem_t)) < 0) {
@@ -1169,7 +1169,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
 
     bool poll() {
         bool result = false;
-        if (region != NULL) {
+        if (region != nullptr) {
             uint32_t seed = ntohl(region->universal_variable_seed);  //!OCLINT(constant cond op)
             if (seed != last_seed) {
                 result = true;
@@ -1424,7 +1424,7 @@ class universal_notifier_named_pipe_t : public universal_notifier_t {
         FD_ZERO(&fds);
         FD_SET(this->pipe_fd, &fds);
         struct timeval timeout = {};
-        select(this->pipe_fd + 1, &fds, NULL, NULL, &timeout);
+        select(this->pipe_fd + 1, &fds, nullptr, nullptr, &timeout);
         if (!FD_ISSET(this->pipe_fd, &fds)) {
             // No longer readable, no longer polling.
             polling_due_to_readable_fd = false;
@@ -1477,7 +1477,7 @@ std::unique_ptr<universal_notifier_t> universal_notifier_t::new_notifier_for_str
         }
     }
     DIE("should never reach this statement");
-    return NULL;
+    return nullptr;
 }
 
 // Default implementations.
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index e023b8fba..12d12d3c2 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -183,7 +183,7 @@ class universal_notifier_t {
 
     // Factory constructor.
     static std::unique_ptr<universal_notifier_t> new_notifier_for_strategy(
-        notifier_strategy_t strat, const wchar_t *test_path = NULL);
+        notifier_strategy_t strat, const wchar_t *test_path = nullptr);
 
     // Default instance. Other instances are possible for testing.
     static universal_notifier_t &default_notifier();
diff --git a/src/event.h b/src/event.h
index 1913d2e8b..13a6dd677 100644
--- a/src/event.h
+++ b/src/event.h
@@ -121,7 +121,8 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter);
 wcstring event_get_desc(const event_t &e);
 
 /// Fire a generic event with the specified name.
-void event_fire_generic(parser_t &parser, const wchar_t *name, const wcstring_list_t *args = NULL);
+void event_fire_generic(parser_t &parser, const wchar_t *name,
+                        const wcstring_list_t *args = nullptr);
 
 /// Return the event type for a given name, or none.
 maybe_t<event_type_t> event_type_for_name(const wcstring &name);
diff --git a/src/exec.cpp b/src/exec.cpp
index 02f6db8bb..3e78a01be 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -113,7 +113,7 @@ char *get_interpreter(const char *command, char *interpreter, size_t buff_size)
         return interpreter + 2;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /// This function is executed by the child process created by a call to fork(). It should be called
@@ -151,7 +151,7 @@ static void safe_launch_process(process_t *p, const char *actual_cmd, const char
             argv2[0] = sh_command;
             for (size_t i = 1; i < sizeof argv2 / sizeof *argv2; i++) {
                 argv2[i] = argv[i - 1];
-                if (argv2[i] == NULL) break;
+                if (argv2[i] == nullptr) break;
             }
 
             execve(sh_command, argv2, envv);
@@ -192,7 +192,7 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const w
                                              io_chain_t *out_chain,
                                              std::vector<autoclose_fd_t> *out_opened_fds) {
     ASSERT_IS_MAIN_THREAD();
-    assert(out_chain != NULL && out_opened_fds != NULL);
+    assert(out_chain != nullptr && out_opened_fds != nullptr);
     assert(out_chain->empty());
 
     // Just to be clear what we do for an empty chain.
@@ -1245,7 +1245,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
 
     parser.libdata().is_subshell = prev_subshell;
 
-    if (lst == NULL || !buffer) {
+    if (lst == nullptr || !buffer) {
         return subcommand_statuses.status;
     }
     // Walk over all the elements.
@@ -1266,7 +1266,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
                 // Look for the next separator.
                 const char *stop =
                     static_cast<const char *>(std::memchr(cursor, '\n', end - cursor));
-                const bool hit_separator = (stop != NULL);
+                const bool hit_separator = (stop != nullptr);
                 if (!hit_separator) {
                     // If it's not found, just use the end.
                     stop = end;
@@ -1297,5 +1297,5 @@ int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &output
 
 int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status, bool is_subcmd) {
     ASSERT_IS_MAIN_THREAD();
-    return exec_subshell_internal(cmd, parser, NULL, apply_exit_status, is_subcmd);
+    return exec_subshell_internal(cmd, parser, nullptr, apply_exit_status, is_subcmd);
 }
diff --git a/src/expand.cpp b/src/expand.cpp
index 71ef2ce31..1f4563337 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -68,7 +68,7 @@ static bool expand_is_clean(const wcstring &in) {
     if (in.empty()) return true;
 
     // Test characters that have a special meaning in the first character position.
-    if (std::wcschr(UNCLEAN_FIRST, in.at(0)) != NULL) return false;
+    if (std::wcschr(UNCLEAN_FIRST, in.at(0)) != nullptr) return false;
 
     // Test characters that have a special meaning in any character position.
     return in.find_first_of(UNCLEAN) == wcstring::npos;
@@ -457,8 +457,8 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     bool syntax_error = false;
     int brace_count = 0;
 
-    const wchar_t *brace_begin = NULL, *brace_end = NULL;
-    const wchar_t *last_sep = NULL;
+    const wchar_t *brace_begin = nullptr, *brace_end = nullptr;
+    const wchar_t *last_sep = nullptr;
 
     const wchar_t *item_begin;
     size_t length_preceding_braces, length_following_braces, tot_len;
@@ -518,7 +518,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
         return expand_result_t::error;
     }
 
-    if (brace_begin == NULL) {
+    if (brace_begin == nullptr) {
         append_completion(out, instr);
         return expand_result_t::ok;
     }
diff --git a/src/expand.h b/src/expand.h
index 294be885e..be08676b3 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -148,7 +148,7 @@ __warn_unused expand_result_t expand_string(wcstring input, std::vector<completi
 ///
 /// \return Whether expansion succeeded.
 bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
-                const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = NULL);
+                const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = nullptr);
 
 /// Expand a command string like $HOME/bin/cmd into a command and list of arguments.
 /// Return the command and arguments by reference.
@@ -158,7 +158,7 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
 // \return an expand error.
 expand_result_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
                                            wcstring *out_cmd, wcstring_list_t *out_args,
-                                           parse_error_list_t *errors = NULL);
+                                           parse_error_list_t *errors = nullptr);
 
 /// Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc.
 /// Suitable for pretty-printing.
diff --git a/src/fallback.cpp b/src/fallback.cpp
index c7ab786dc..c612625a4 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -78,8 +78,8 @@ int fish_mkstemp_cloexec(char *name_template) {
 [[gnu::unused]] static wchar_t *wcsdup_fallback(const wchar_t *in) {
     size_t len = std::wcslen(in);
     wchar_t *out = static_cast<wchar_t *>(malloc(sizeof(wchar_t) * (len + 1)));
-    if (out == 0) {
-        return 0;
+    if (out == nullptr) {
+        return nullptr;
     }
 
     std::memcpy(out, in, sizeof(wchar_t) * (len + 1));
@@ -163,8 +163,8 @@ int wcsncasecmp(const wchar_t *a, const wchar_t *b, size_t n) {
 #ifndef HAVE_WCSNDUP
 wchar_t *wcsndup(const wchar_t *in, size_t c) {
     wchar_t *res = static_cast<wchar_t *>(malloc(sizeof(wchar_t) * (c + 1)));
-    if (res == 0) {
-        return 0;
+    if (res == nullptr) {
+        return nullptr;
     }
     wcslcpy(res, in, c + 1);
     return res;
diff --git a/src/fish.cpp b/src/fish.cpp
index e1284c3f3..2a2fc964c 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -79,7 +79,7 @@ class fish_cmd_opts_t {
 };
 
 /// If we are doing profiling, the filename to output to.
-static const char *s_profiling_output_filename = NULL;
+static const char *s_profiling_output_filename = nullptr;
 
 /// \return a timeval converted to milliseconds.
 long long tv_to_msec(const struct timeval &tv) {
@@ -127,7 +127,7 @@ static bool get_realpath(std::string &path) {
     if ((ptr = realpath(path.c_str(), buff))) {
         path = ptr;
     }
-    return ptr != NULL;
+    return ptr != nullptr;
 }
 
 static struct config_paths_t determine_config_directory_paths(const char *argv0) {
@@ -157,7 +157,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
             // The next check is that we are in a reloctable directory tree
             const char *installed_suffix = "/bin/fish";
             const char *just_a_fish = "/fish";
-            const char *suffix = NULL;
+            const char *suffix = nullptr;
 
             if (has_suffix(exec_path, installed_suffix, false)) {
                 suffix = installed_suffix;
@@ -263,25 +263,26 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
 /// Parse the argument list, return the index of the first non-flag arguments.
 static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
     static const char *const short_opts = "+hPilnvc:C:p:d:f:D:";
-    static const struct option long_opts[] = {{"command", required_argument, NULL, 'c'},
-                                              {"init-command", required_argument, NULL, 'C'},
-                                              {"features", required_argument, NULL, 'f'},
-                                              {"debug", required_argument, NULL, 'd'},
-                                              {"debug-output", required_argument, NULL, 'o'},
-                                              {"debug-stack-frames", required_argument, NULL, 'D'},
-                                              {"interactive", no_argument, NULL, 'i'},
-                                              {"login", no_argument, NULL, 'l'},
-                                              {"no-execute", no_argument, NULL, 'n'},
-                                              {"print-rusage-self", no_argument, NULL, 1},
-                                              {"print-debug-categories", no_argument, NULL, 2},
-                                              {"profile", required_argument, NULL, 'p'},
-                                              {"private", no_argument, NULL, 'P'},
-                                              {"help", no_argument, NULL, 'h'},
-                                              {"version", no_argument, NULL, 'v'},
-                                              {NULL, 0, NULL, 0}};
+    static const struct option long_opts[] = {
+        {"command", required_argument, nullptr, 'c'},
+        {"init-command", required_argument, nullptr, 'C'},
+        {"features", required_argument, nullptr, 'f'},
+        {"debug", required_argument, nullptr, 'd'},
+        {"debug-output", required_argument, nullptr, 'o'},
+        {"debug-stack-frames", required_argument, nullptr, 'D'},
+        {"interactive", no_argument, nullptr, 'i'},
+        {"login", no_argument, nullptr, 'l'},
+        {"no-execute", no_argument, nullptr, 'n'},
+        {"print-rusage-self", no_argument, nullptr, 1},
+        {"print-debug-categories", no_argument, nullptr, 2},
+        {"profile", required_argument, nullptr, 'p'},
+        {"private", no_argument, nullptr, 'P'},
+        {"help", no_argument, nullptr, 'h'},
+        {"version", no_argument, nullptr, 'v'},
+        {nullptr, 0, nullptr, 0}};
 
     int opt;
-    while ((opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+    while ((opt = getopt_long(argc, argv, short_opts, long_opts, nullptr)) != -1) {
         switch (opt) {
             case 'c': {
                 opts->batch_cmds.push_back(optarg);
@@ -413,7 +414,7 @@ int main(int argc, char **argv) {
     // struct stat tmp;
     // stat("----------FISH_HIT_MAIN----------", &tmp);
 
-    const char *dummy_argv[2] = {"fish", NULL};
+    const char *dummy_argv[2] = {"fish", nullptr};
     if (!argv[0]) {
         argv = (char **)dummy_argv;  //!OCLINT(parameter reassignment)
         argc = 1;                    //!OCLINT(parameter reassignment)
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 624f725e2..0444f97b3 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -353,7 +353,7 @@ static wcstring prettify(const wcstring &src, bool do_indent) {
     parse_node_tree_t parse_tree;
     int parse_flags = (parse_flag_continue_after_error | parse_flag_include_comments |
                        parse_flag_leave_unterminated | parse_flag_show_blank_lines);
-    if (!parse_tree_from_string(src, parse_flags, &parse_tree, NULL)) {
+    if (!parse_tree_from_string(src, parse_flags, &parse_tree, nullptr)) {
         return src;  // we return the original string on failure
     }
 
@@ -508,20 +508,20 @@ int main(int argc, char *argv[]) {
     bool do_indent = true;
 
     const char *short_opts = "+d:hvwiD:";
-    const struct option long_opts[] = {{"debug-level", required_argument, NULL, 'd'},
-                                       {"debug-stack-frames", required_argument, NULL, 'D'},
-                                       {"dump-parse-tree", no_argument, NULL, 'P'},
-                                       {"no-indent", no_argument, NULL, 'i'},
-                                       {"help", no_argument, NULL, 'h'},
-                                       {"version", no_argument, NULL, 'v'},
-                                       {"write", no_argument, NULL, 'w'},
-                                       {"html", no_argument, NULL, 1},
-                                       {"ansi", no_argument, NULL, 2},
-                                       {"pygments", no_argument, NULL, 3},
-                                       {NULL, 0, NULL, 0}};
+    const struct option long_opts[] = {{"debug-level", required_argument, nullptr, 'd'},
+                                       {"debug-stack-frames", required_argument, nullptr, 'D'},
+                                       {"dump-parse-tree", no_argument, nullptr, 'P'},
+                                       {"no-indent", no_argument, nullptr, 'i'},
+                                       {"help", no_argument, nullptr, 'h'},
+                                       {"version", no_argument, nullptr, 'v'},
+                                       {"write", no_argument, nullptr, 'w'},
+                                       {"html", no_argument, nullptr, 1},
+                                       {"ansi", no_argument, nullptr, 2},
+                                       {"pygments", no_argument, nullptr, 3},
+                                       {nullptr, 0, nullptr, 0}};
 
     int opt;
-    while ((opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+    while ((opt = getopt_long(argc, argv, short_opts, long_opts, nullptr)) != -1) {
         switch (opt) {
             case 'P': {
                 dump_parse_tree = true;
@@ -633,7 +633,7 @@ int main(int argc, char *argv[]) {
         // Maybe colorize.
         std::vector<highlight_spec_t> colors;
         if (output_type != output_type_plain_text) {
-            highlight_shell_no_io(output_wtext, colors, output_wtext.size(), NULL,
+            highlight_shell_no_io(output_wtext, colors, output_wtext.size(), nullptr,
                                   env_stack_t::globals());
         }
 
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index fad5e7903..18d33a940 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -39,9 +39,10 @@
 struct config_paths_t determine_config_directory_paths(const char *argv0);
 
 static const wchar_t *ctrl_symbolic_names[] = {
-    NULL,   NULL,   NULL,   NULL, NULL, NULL,   NULL, L"\\a", L"\\b", L"\\t", L"\\n",
-    L"\\v", L"\\f", L"\\r", NULL, NULL, NULL,   NULL, NULL,   NULL,   NULL,   NULL,
-    NULL,   NULL,   NULL,   NULL, NULL, L"\\e", NULL, NULL,   NULL,   NULL};
+    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, L"\\a",
+    L"\\b",  L"\\t",  L"\\n",  L"\\v",  L"\\f",  L"\\r",  nullptr, nullptr,
+    nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+    nullptr, nullptr, nullptr, L"\\e",  nullptr, nullptr, nullptr, nullptr};
 static bool keep_running = true;
 
 /// Return true if the recent sequence of characters indicates the user wants to exit the program.
@@ -95,7 +96,7 @@ static maybe_t<wcstring> sequence_name(wchar_t wc) {
 
 /// Return true if the character must be escaped when used in the sequence of chars to be bound in
 /// a `bind` command.
-static bool must_escape(wchar_t wc) { return std::wcschr(L"[]()<>{}*\\?$#;&|'\"", wc) != NULL; }
+static bool must_escape(wchar_t wc) { return std::wcschr(L"[]()<>{}*\\?$#;&|'\"", wc) != nullptr; }
 
 static void ctrl_to_symbol(wchar_t *buf, int buf_len, wchar_t wc, bool bind_friendly) {
     if (ctrl_symbolic_names[wc]) {
@@ -344,15 +345,15 @@ static bool parse_debug_frames_flag() {
 
 static bool parse_flags(int argc, char **argv, bool *continuous_mode) {
     const char *short_opts = "+cd:D:hv";
-    const struct option long_opts[] = {{"continuous", no_argument, NULL, 'c'},
-                                       {"debug-level", required_argument, NULL, 'd'},
-                                       {"debug-stack-frames", required_argument, NULL, 'D'},
-                                       {"help", no_argument, NULL, 'h'},
-                                       {"version", no_argument, NULL, 'v'},
-                                       {NULL, 0, NULL, 0}};
+    const struct option long_opts[] = {{"continuous", no_argument, nullptr, 'c'},
+                                       {"debug-level", required_argument, nullptr, 'd'},
+                                       {"debug-stack-frames", required_argument, nullptr, 'D'},
+                                       {"help", no_argument, nullptr, 'h'},
+                                       {"version", no_argument, nullptr, 'v'},
+                                       {nullptr, 0, nullptr, 0}};
     int opt;
     bool error = false;
-    while (!error && (opt = getopt_long(argc, argv, short_opts, long_opts, NULL)) != -1) {
+    while (!error && (opt = getopt_long(argc, argv, short_opts, long_opts, nullptr)) != -1) {
         switch (opt) {
             case 'c': {
                 *continuous_mode = true;
diff --git a/src/function.cpp b/src/function.cpp
index 62b8d75ec..f659239e0 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -287,7 +287,7 @@ wcstring_list_t function_get_names(int get_hidden) {
 const wchar_t *function_get_definition_file(const wcstring &name) {
     const auto funcset = function_set.acquire();
     const function_info_t *func = funcset->get_info(name);
-    return func ? func->definition_file : NULL;
+    return func ? func->definition_file : nullptr;
 }
 
 bool function_is_autoloaded(const wcstring &name) {
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 13e85386d..c9375fb28 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -269,7 +269,7 @@ bool is_potential_path(const wcstring &potential_path_fragment, const wcstring_l
             }
         } else {
             // We do not end with a slash; it does not have to be a directory.
-            DIR *dir = NULL;
+            DIR *dir = nullptr;
             const wcstring dir_name = wdirname(abs_path);
             const wcstring filename_fragment = wbasename(abs_path);
             if (dir_name == L"/" && filename_fragment == L"/") {
@@ -287,7 +287,7 @@ bool is_potential_path(const wcstring &potential_path_fragment, const wcstring_l
                 // access.
                 wcstring ent;
                 bool is_dir = false;
-                while (wreaddir_resolving(dir, dir_name, ent, require_dir ? &is_dir : NULL)) {
+                while (wreaddir_resolving(dir, dir_name, ent, require_dir ? &is_dir : nullptr)) {
                     // Maybe skip directories.
                     if (require_dir && !is_dir) {
                         continue;
@@ -403,7 +403,7 @@ static bool autosuggest_parse_command(const wcstring &buff, const environment_t
     parse_node_tree_t parse_tree;
     parse_tree_from_string(buff,
                            parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens,
-                           &parse_tree, NULL);
+                           &parse_tree, nullptr);
 
     // Find the first statement.
     tnode_t<g::plain_statement> first_statement{};
@@ -459,7 +459,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
 
     // Not handled specially so handle it here.
     bool cmd_ok = false;
-    if (path_get_path(parsed_command, NULL, vars)) {
+    if (path_get_path(parsed_command, nullptr, vars)) {
         cmd_ok = true;
     } else if (builtin_exists(parsed_command) || function_exists_no_autoload(parsed_command)) {
         cmd_ok = true;
@@ -503,7 +503,7 @@ static size_t color_variable(const wchar_t *in, size_t in_len,
     // Handle a slice, up to dollar_count of them. Note that we currently don't do any validation of
     // the slice's contents, e.g. $foo[blah] will not show an error even though it's invalid.
     for (size_t slice_count = 0; slice_count < dollar_count && in[idx] == L'['; slice_count++) {
-        wchar_t *slice_begin = NULL, *slice_end = NULL;
+        wchar_t *slice_begin = nullptr, *slice_end = nullptr;
         int located = parse_util_locate_slice(in + idx, &slice_begin, &slice_end, false);
         if (located == 1) {
             size_t slice_begin_idx = slice_begin - in, slice_end_idx = slice_end - in;
@@ -813,7 +813,7 @@ class highlighter_t {
         parse_tree_from_string(buff,
                                parse_flag_continue_after_error | parse_flag_include_comments |
                                    parse_flag_accept_incomplete_tokens,
-                               &this->parse_tree, NULL);
+                               &this->parse_tree, nullptr);
     }
 
     // Perform highlighting, returning an array of colors.
@@ -975,7 +975,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
 
         // Check if the argument contains a command substitution. If so, highlight it as a param
         // even though it's a command redirection, and don't try to do any other validation.
-        if (parse_util_locate_cmdsubst(target.c_str(), NULL, NULL, true) != 0) {
+        if (parse_util_locate_cmdsubst(target.c_str(), nullptr, nullptr, true) != 0) {
             this->color_argument(redir_target);
         } else {
             // No command substitution, so we can highlight the target file or fd. For example,
@@ -1087,7 +1087,7 @@ void highlighter_t::color_children(const parse_node_t &parent, parse_token_type_
                                    highlight_spec_t color) {
     for (node_offset_t idx = 0; idx < parent.child_count; idx++) {
         const parse_node_t *child = this->parse_tree.get_child(parent, idx);
-        if (child != NULL && child->type == type) {
+        if (child != nullptr && child->type == type) {
             this->color_node(*child, color);
         }
     }
@@ -1127,7 +1127,7 @@ static bool command_is_valid(const wcstring &cmd, enum parse_statement_decoratio
     if (!is_valid && abbreviation_ok) is_valid = expand_abbreviation(cmd, vars).has_value();
 
     // Regular commands
-    if (!is_valid && command_ok) is_valid = path_get_path(cmd, NULL, vars);
+    if (!is_valid && command_ok) is_valid = path_get_path(cmd, nullptr, vars);
 
     // Implicit cd
     if (!is_valid && implicit_cd_ok) {
diff --git a/src/history.cpp b/src/history.cpp
index f277e8d74..911d0d577 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -144,7 +144,7 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item
         // and add it. Note that calling get_node promotes the node to the front.
         wcstring key = item.str();
         history_item_t *node = this->get(key);
-        if (node == NULL) {
+        if (node == nullptr) {
             this->insert(std::move(key), std::move(item));
         } else {
             node->creation_timestamp = std::max(node->timestamp(), item.timestamp());
@@ -252,7 +252,7 @@ struct history_impl_t {
     // the boundary are considered "old". Items whose timestemps are > the boundary are new, and are
     // ignored by this instance (unless they came from this instance). The timestamp may be adjusted
     // by incorporate_external_changes().
-    time_t boundary_timestamp{time(NULL)};
+    time_t boundary_timestamp{time(nullptr)};
 
     // How many items we add until the next vacuum. Initially a random value.
     int countdown_to_vacuum{-1};
@@ -378,7 +378,7 @@ void history_impl_t::save_unless_disabled() {
     // the counter.
     const int kVacuumFrequency = 25;
     if (countdown_to_vacuum < 0) {
-        unsigned int seed = static_cast<unsigned int>(time(NULL));
+        unsigned int seed = static_cast<unsigned int>(time(nullptr));
         // Generate a number in the range [0, kVacuumFrequency).
         countdown_to_vacuum = rand_r(&seed) / (RAND_MAX / kVacuumFrequency + 1);
     }
@@ -402,7 +402,7 @@ void history_impl_t::save_unless_disabled() {
 
 void history_impl_t::add(const wcstring &str, history_identifier_t ident, bool pending,
                          bool do_save) {
-    time_t when = time(NULL);
+    time_t when = time(nullptr);
     // Big hack: do not allow timestamps equal to our boundary date. This is because we include
     // items whose timestamps are equal to our boundary when reading old history, so we can catch
     // "just closed" items. But this means that we may interpret our own items, that we just wrote,
@@ -1108,7 +1108,7 @@ static bool should_import_bash_history_line(const wcstring &line) {
     if (line.empty()) return false;
 
     parse_node_tree_t parse_tree;
-    if (!parse_tree_from_string(line, parse_flag_none, &parse_tree, NULL)) return false;
+    if (!parse_tree_from_string(line, parse_flag_none, &parse_tree, nullptr)) return false;
 
     // In doing this test do not allow incomplete strings. Hence the "false" argument.
     parse_error_list_t errors;
@@ -1175,7 +1175,7 @@ void history_impl_t::incorporate_external_changes() {
     // is somehwhat expensive because we will be going back over old items. An optimization would be
     // to preserve old_item_offsets so that they don't have to be recomputed. (However, then items
     // *deleted* in other instances would not show up here).
-    time_t new_timestamp = time(NULL);
+    time_t new_timestamp = time(nullptr);
 
     // If for some reason the clock went backwards, we don't want to start dropping items; therefore
     // we only do work if time has progressed. This also makes multiple calls cheap.
@@ -1277,7 +1277,7 @@ void history_t::add_pending_with_file_detection(const wcstring &str,
     // Find all arguments that look like they could be file paths.
     bool needs_sync_write = false;
     parse_node_tree_t tree;
-    parse_tree_from_string(str, parse_flag_none, &tree, NULL);
+    parse_tree_from_string(str, parse_flag_none, &tree, nullptr);
 
     path_list_t potential_paths;
     for (const parse_node_t &node : tree) {
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 97a89c9ee..0617fbc1b 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -126,14 +126,14 @@ std::unique_ptr<history_file_contents_t> history_file_contents_t::create(int fd)
     if (should_mmap(fd)) {
         // We feel confident to map the file directly. Note this is still risky: if another
         // process truncates the file we risk SIGBUS.
-        mmap_start = mmap(0, size_t(len), PROT_READ, MAP_PRIVATE, fd, 0);
+        mmap_start = mmap(nullptr, size_t(len), PROT_READ, MAP_PRIVATE, fd, 0);
         if (mmap_start == MAP_FAILED) return nullptr;
     } else {
         // We don't want to map the file. mmap some private memory and then read into it. We use
         // mmap instead of malloc so that the destructor can always munmap().
         mmap_start =
 #ifdef MAP_ANON
-            mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+            mmap(nullptr, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
 #else
             mmap(0, size_t(len), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 #endif
@@ -184,7 +184,7 @@ static size_t read_line(const char *base, size_t cursor, size_t len, std::string
     assert(cursor <= len);
     const char *start = base + cursor;
     const char *a_newline = static_cast<const char *>(std::memchr(start, '\n', len - cursor));
-    if (a_newline != NULL) {  // we found a newline
+    if (a_newline != nullptr) {  // we found a newline
         result.assign(start, a_newline - start);
         // Return the amount to advance the cursor; skip over the newline.
         return a_newline - start + 1;
@@ -256,7 +256,7 @@ static history_item_t decode_item_fish_2_0(const char *base, size_t len) {
         if (key == "when") {
             // Parse an int from the timestamp. Should this fail, strtol returns 0; that's
             // acceptable.
-            char *end = NULL;
+            char *end = nullptr;
             long tmp = strtol(value.c_str(), &end, 0);
             when = tmp;
         } else if (key == "paths") {
@@ -302,7 +302,7 @@ static bool parse_timestamp(const char *str, time_t *out_when) {
 
     // Try to parse a timestamp.
     long timestamp = 0;
-    if (isdigit(*cursor) && (timestamp = strtol(cursor, NULL, 0)) > 0) {
+    if (isdigit(*cursor) && (timestamp = strtol(cursor, nullptr, 0)) > 0) {
         *out_when = static_cast<time_t>(timestamp);
         return true;
     }
@@ -313,23 +313,23 @@ static bool parse_timestamp(const char *str, time_t *out_when) {
 /// newline. Note that the string is not null terminated.
 static const char *next_line(const char *start, const char *end) {
     // Handle the hopeless case.
-    if (end == start) return NULL;
+    if (end == start) return nullptr;
 
     // Skip past the next newline.
     const char *nextline = std::find(start, end, '\n');
     if (nextline == end) {
-        return NULL;
+        return nullptr;
     }
 
     // Skip past the newline character itself.
     if (++nextline >= end) {
-        return NULL;
+        return nullptr;
     }
 
     // Make sure this new line is itself "newline terminated". If it's not, return NULL.
     const char *next_newline = std::find(nextline, end, '\n');
     if (next_newline == end) {
-        return NULL;
+        return nullptr;
     }
 
     return nextline;
@@ -352,7 +352,7 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
         // Advance the cursor to the next line.
         const char *a_newline =
             static_cast<const char *>(std::memchr(line_start, '\n', length - cursor));
-        if (a_newline == NULL) break;
+        if (a_newline == nullptr) break;
 
         // Advance the cursor past this line. +1 is for the newline.
         cursor = a_newline - begin + 1;
@@ -403,7 +403,7 @@ static size_t offset_of_next_item_fish_2_0(const history_file_contents_t &conten
             const char *interior_line;
 
             for (interior_line = next_line(line_start, end);
-                 interior_line != NULL && !has_timestamp;
+                 interior_line != nullptr && !has_timestamp;
                  interior_line = next_line(interior_line, end)) {
                 // If the first character is not a space, it's not an interior line, so we're done.
                 if (interior_line[0] != ' ') break;
diff --git a/src/input.cpp b/src/input.cpp
index 91803b660..c98600cff 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -436,7 +436,7 @@ void inputter_t::push_front(char_event_t ch) { event_queue_.push_front(ch); }
 /// \return the first mapping that matches, walking first over the user's mapping list, then the
 /// preset list. \return null if nothing matches.
 maybe_t<input_mapping_t> inputter_t::find_mapping() {
-    const input_mapping_t *generic = NULL;
+    const input_mapping_t *generic = nullptr;
     const auto &vars = parser_->vars();
     const wcstring bind_mode = input_get_bind_mode(vars);
 
@@ -553,7 +553,7 @@ std::vector<input_mapping_name_t> input_mapping_set_t::get_names(bool user) cons
 void input_mapping_set_t::clear(const wchar_t *mode, bool user) {
     all_mappings_cache_.reset();
     mapping_list_t &ml = user ? mapping_list_ : preset_mapping_list_;
-    auto should_erase = [=](const input_mapping_t &m) { return mode == NULL || mode == m.mode; };
+    auto should_erase = [=](const input_mapping_t &m) { return mode == nullptr || mode == m.mode; };
     ml.erase(std::remove_if(ml.begin(), ml.end(), should_erase), ml.end());
 }
 
diff --git a/src/input.h b/src/input.h
index a58cc9e4f..63e4e4533 100644
--- a/src/input.h
+++ b/src/input.h
@@ -91,7 +91,7 @@ class input_mapping_set_t {
     ~input_mapping_set_t();
 
     /// Erase all bindings.
-    void clear(const wchar_t *mode = NULL, bool user = true);
+    void clear(const wchar_t *mode = nullptr, bool user = true);
 
     /// Erase binding for specified key sequence.
     bool erase(const wcstring &sequence, const wcstring &mode = DEFAULT_BIND_MODE,
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 29b849895..4d4b82d64 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -75,7 +75,7 @@ char_event_t input_event_queue_t::readb() {
             tv.tv_usec = static_cast<int>(usecs_delay % usecs_per_sec);
         }
 
-        res = select(fd_max + 1, &fdset, 0, 0, usecs_delay > 0 ? &tv : NULL);
+        res = select(fd_max + 1, &fdset, nullptr, nullptr, usecs_delay > 0 ? &tv : nullptr);
         if (res == -1) {
             if (errno == EINTR || errno == EAGAIN) {
                 if (interrupt_handler) {
@@ -213,7 +213,7 @@ char_event_t input_event_queue_t::readch_timed(bool dequeue_timeouts) {
         FD_ZERO(&fds);
         FD_SET(STDIN_FILENO, &fds);
         struct timeval tm = {wait_on_escape_ms / 1000, 1000 * (wait_on_escape_ms % 1000)};
-        if (select(1, &fds, 0, 0, &tm) > 0) {
+        if (select(1, &fds, nullptr, nullptr, &tm) > 0) {
             result = readch();
         }
     }
diff --git a/src/intern.cpp b/src/intern.cpp
index e609dd3b6..53dc61214 100644
--- a/src/intern.cpp
+++ b/src/intern.cpp
@@ -19,7 +19,7 @@ bool string_less_than_string(const wchar_t *a, const wchar_t *b) { return std::w
 owning_lock<std::vector<const wchar_t *>> string_table;
 
 static const wchar_t *intern_with_dup(const wchar_t *in, bool dup) {
-    if (!in) return NULL;
+    if (!in) return nullptr;
 
     debug(5, L"intern %ls", in);
     auto table = string_table.acquire();
diff --git a/src/io.cpp b/src/io.cpp
index ec92a9751..92f880e69 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -79,7 +79,7 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
         fd_set fds;
         FD_ZERO(&fds);
         FD_SET(fd, &fds);
-        int ret = select(fd + 1, &fds, NULL, NULL, &tv);
+        int ret = select(fd + 1, &fds, nullptr, nullptr, &tv);
         // select(2) is allowed to (and does) update `tv` to indicate how much time was left, so we
         // need to restore the desired value each time.
         tv.tv_usec = poll_timeout_usec;
@@ -234,7 +234,7 @@ void io_print(const io_chain_t &chain)
     for (size_t i=0; i < chain.size(); i++)
     {
         const shared_ptr<io_data_t> &io = chain.at(i);
-        if (io.get() == NULL)
+        if (io.get() == nullptr)
         {
             std::fwprintf(stderr, L"\t(null)\n");
         }
diff --git a/src/iothread.cpp b/src/iothread.cpp
index e13af9900..9c784d17a 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -277,7 +277,7 @@ static bool iothread_wait_for_pending_completions(long timeout_usec) {
     fd_set fds;
     FD_ZERO(&fds);
     FD_SET(fd, &fds);
-    int ret = select(fd + 1, &fds, NULL, NULL, &tv);
+    int ret = select(fd + 1, &fds, nullptr, nullptr, &tv);
     return ret > 0;
 }
 
@@ -416,7 +416,7 @@ bool make_pthread(pthread_t *result, void *(*func)(void *), void *param) {
     // 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, NULL, func, param);
+    int err = pthread_create(&thread, nullptr, func, param);
     if (err == 0) {
         // Success, return the thread.
         debug(5, "pthread %p spawned", (void *)(intptr_t)thread);
@@ -425,7 +425,7 @@ bool make_pthread(pthread_t *result, void *(*func)(void *), void *param) {
         perror("pthread_create");
     }
     // Restore our sigmask.
-    DIE_ON_FAILURE(pthread_sigmask(SIG_SETMASK, &saved_set, NULL));
+    DIE_ON_FAILURE(pthread_sigmask(SIG_SETMASK, &saved_set, nullptr));
     return err == 0;
 }
 
diff --git a/src/lru.h b/src/lru.h
index 63fc09e52..97b19de2e 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -24,8 +24,8 @@ class lru_cache_t {
     struct lru_link_t {
         // Our doubly linked list
         // The base class is used for the mouth only
-        lru_link_t *prev = NULL;
-        lru_link_t *next = NULL;
+        lru_link_t *prev = nullptr;
+        lru_link_t *next = nullptr;
     };
 
     // The node type in our LRU cache
@@ -36,7 +36,7 @@ class lru_cache_t {
         lru_node_t(lru_node_t &&) = default;
 
         // Our key in the map. This is owned by the map itself.
-        const wcstring *key = NULL;
+        const wcstring *key = nullptr;
 
         // The value from the client
         Contents value;
@@ -78,7 +78,7 @@ class lru_cache_t {
     // Remove the node
     void evict_node(lru_node_t *node) {
         // We should never evict the mouth.
-        assert(node != &mouth && node != NULL && node->key != NULL);
+        assert(node != &mouth && node != nullptr && node->key != nullptr);
 
         auto iter = this->node_map.find(*node->key);
         assert(iter != this->node_map.end());
@@ -188,7 +188,7 @@ class lru_cache_t {
         auto where = this->node_map.find(key);
         if (where == this->node_map.end()) {
             // not found
-            return NULL;
+            return nullptr;
         }
         promote_node(&where->second);
         return &where->second.value;
diff --git a/src/output.cpp b/src/output.cpp
index 5ebf1e1db..75aa8bb43 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -401,7 +401,7 @@ int outputter_t::writech(wint_t ch) {
 void outputter_t::writestr(const wchar_t *str) {
     assert(str && "Empty input string");
 
-    size_t len = wcstombs(0, str, 0);  // figure amount of space needed
+    size_t len = wcstombs(nullptr, str, 0);  // figure amount of space needed
     if (len == static_cast<size_t>(-1)) {
         debug(1, L"Tried to print invalid wide character string");
         return;
@@ -526,7 +526,7 @@ rgb_color_t parse_color(const env_var_t &var, bool is_background) {
 /// Write specified multibyte string.
 void writembs_check(outputter_t &outp, const char *mbs, const char *mbs_name, bool critical,
                     const char *file, long line) {
-    if (mbs != NULL) {
+    if (mbs != nullptr) {
         outp.term_puts(mbs, 1);
     } else if (critical) {
         auto term = env_stack_t::globals().get(L"TERM");
diff --git a/src/pager.cpp b/src/pager.cpp
index dd66e8b60..d36a908e6 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -809,7 +809,7 @@ bool pager_t::is_navigating_contents() const {
 void pager_t::set_fully_disclosed(bool flag) { fully_disclosed = flag; }
 
 const completion_t *pager_t::selected_completion(const page_rendering_t &rendering) const {
-    const completion_t *result = NULL;
+    const completion_t *result = nullptr;
     size_t idx = visual_selected_completion_index(rendering.rows, rendering.cols);
     if (idx != PAGER_SELECTION_NONE) {
         result = &completion_infos.at(idx).representative;
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 902ba92a0..8f116b441 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -92,7 +92,7 @@ const enum_map<parse_token_type_t> token_enum_map[] = {
 #define ELEM(sym) {symbol_##sym, L"symbol_" #sym},
 #include "parse_grammar_elements.inc"
     {token_type_invalid, L"token_type_invalid"},
-    {token_type_invalid, NULL}};
+    {token_type_invalid, nullptr}};
 #define token_enum_map_len (sizeof token_enum_map / sizeof *token_enum_map)
 
 // IMPORTANT: If the following enum is modified you must update the corresponding keyword_enum_map
@@ -137,7 +137,7 @@ const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!
                                                       {parse_keyword_or, L"or"},
                                                       {parse_keyword_switch, L"switch"},
                                                       {parse_keyword_while, L"while"},
-                                                      {parse_keyword_none, NULL}};
+                                                      {parse_keyword_none, nullptr}};
 #define keyword_enum_map_len (sizeof keyword_enum_map / sizeof *keyword_enum_map)
 
 // Node tag values.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 908317faf..3ecffee42 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -138,7 +138,7 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
                 cmd == forbidden_function_name) {
                 // This is it.
                 infinite_recursive_statement = plain_statement;
-                if (out_func_name != NULL) {
+                if (out_func_name != nullptr) {
                     *out_func_name = forbidden_function_name;
                 }
                 break;
@@ -783,8 +783,8 @@ parse_execution_result_t parse_execution_context_t::expand_command(
 /// Creates a 'normal' (non-block) process.
 parse_execution_result_t parse_execution_context_t::populate_plain_process(
     job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
-    assert(job != NULL);
-    assert(proc != NULL);
+    assert(job != nullptr);
+    assert(proc != nullptr);
 
     // We may decide that a command should be an implicit cd.
     bool use_implicit_cd = false;
@@ -1009,7 +1009,7 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
         }
 
         // Append the new_io if we got one.
-        if (new_io.get() != NULL) {
+        if (new_io.get() != nullptr) {
             result.push_back(new_io);
         }
 
@@ -1258,7 +1258,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     // Profiling support.
     long long start_time = 0, parse_time = 0, exec_time = 0;
     profile_item_t *profile_item = this->parser->create_profile_item();
-    if (profile_item != NULL) {
+    if (profile_item != nullptr) {
         start_time = get_time();
     }
 
@@ -1303,7 +1303,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
             }
         }
 
-        if (profile_item != NULL) {
+        if (profile_item != nullptr) {
             // Block-types profile a little weird. They have no 'parse' time, and their command is
             // just the block type.
             exec_time = get_time();
@@ -1353,7 +1353,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     parser->libdata().caller_job_id = saved_caller_jid;
 
     // Store time it took to 'parse' the command.
-    if (profile_item != NULL) {
+    if (profile_item != nullptr) {
         parse_time = get_time();
     }
 
@@ -1384,7 +1384,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         }
     }
 
-    if (profile_item != NULL) {
+    if (profile_item != nullptr) {
         exec_time = get_time();
         profile_item->level = parser->eval_level;
         profile_item->parse = static_cast<int>(parse_time - start_time);
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 99cf0ffba..41acc802b 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -13,7 +13,7 @@
 using namespace parse_productions;
 using namespace grammar;
 
-#define NO_PRODUCTION NULL
+#define NO_PRODUCTION nullptr
 
 // Herein are encoded the productions for our LL2 fish grammar.
 //
@@ -408,7 +408,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
     const production_element_t *(*resolver)(const parse_token_t &input1,  //!OCLINT(unused param)
                                             const parse_token_t &input2,  //!OCLINT(unused param)
                                             parse_node_tag_t *out_tag) =  //!OCLINT(unused param)
-        NULL;
+        nullptr;
     switch (node_type) {
 // Handle all of our grammar elements
 #define ELEM(SYM)                \
@@ -445,10 +445,10 @@ const production_element_t *parse_productions::production_for_token(parse_token_
             break;
         }
     }
-    PARSE_ASSERT(resolver != NULL);
+    PARSE_ASSERT(resolver != nullptr);
 
     const production_element_t *result = resolver(input1, input2, out_tag);
-    if (result == NULL) {
+    if (result == nullptr) {
         debug(5, L"Node type '%ls' has no production for input '%ls' (in %s)",
               token_type_description(node_type), input1.describe().c_str(), __FUNCTION__);
     }
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index a47d6fe3b..ef2747c76 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -124,7 +124,7 @@ wcstring parse_error_t::describe(const wcstring &src, bool is_interactive) const
 }
 
 void parse_error_offset_source_start(parse_error_list_t *errors, size_t amt) {
-    assert(errors != NULL);
+    assert(errors != nullptr);
     if (amt > 0) {
         size_t i, max = errors->size();
         for (i = 0; i < max; i++) {
@@ -593,10 +593,10 @@ void parse_ll_t::determine_node_ranges() {
 }
 
 void parse_ll_t::acquire_output(parse_node_tree_t *output, parse_error_list_t *errors) {
-    if (output != NULL) {
+    if (output != nullptr) {
         *output = std::move(this->nodes);
     }
-    if (errors != NULL) {
+    if (errors != nullptr) {
         *errors = std::move(this->errors);
     }
 }
@@ -752,14 +752,14 @@ bool parse_ll_t::report_error_for_unclosed_block() {
     // switch_statement, etc., each with different node structures. But keep descending the first
     // child and eventually you hit a keyword: begin, if, etc. That's the keyword we care about.
     const parse_node_t *end_command = this->nodes.get_parent(top_node, symbol_end_command);
-    const parse_node_t *block_node = end_command ? this->nodes.get_parent(*end_command) : NULL;
+    const parse_node_t *block_node = end_command ? this->nodes.get_parent(*end_command) : nullptr;
 
     if (block_node && block_node->type == symbol_block_statement) {
         // Get the header.
         block_node = this->nodes.get_child(*block_node, 0, symbol_block_header);
         block_node = this->nodes.get_child(*block_node, 0);  // specific statement
     }
-    if (block_node == NULL) {
+    if (block_node == nullptr) {
         return reported_error;
     }
 
@@ -773,7 +773,7 @@ bool parse_ll_t::report_error_for_unclosed_block() {
     const parse_node_t *cursor = block_node;
     while (cursor->child_count > 0) {
         cursor = this->nodes.get_child(*cursor, 0);
-        assert(cursor != NULL);
+        assert(cursor != nullptr);
     }
     if (cursor->source_start != NODE_OFFSET_INVALID) {
         const wcstring node_desc = block_type_user_presentable_description(block_node->type);
@@ -917,7 +917,7 @@ void parse_ll_t::accept_tokens(parse_token_t token1, parse_token_t token2) {
         const production_element_t *production =
             production_for_token(stack_elem.type, token1, token2, &tag);
         node.tag = tag;
-        if (production == NULL) {
+        if (production == nullptr) {
             parse_error_failed_production(stack_elem, token1);
             // The above sets fatal_errored, which ends the loop.
         } else {
@@ -1066,7 +1066,7 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
                             parse_node_tree_t *output, parse_error_list_t *errors,
                             parse_token_type_t goal) {
     parse_ll_t parser(goal);
-    parser.set_should_generate_error_messages(errors != NULL);
+    parser.set_should_generate_error_messages(errors != nullptr);
 
     // A string whose storage we reuse.
     wcstring storage;
@@ -1147,7 +1147,7 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
 
 const parse_node_t *parse_node_tree_t::get_child(const parse_node_t &parent, node_offset_t which,
                                                  parse_token_type_t expected_type) const {
-    const parse_node_t *result = NULL;
+    const parse_node_t *result = nullptr;
 
     // We may get nodes with no children if we had an incomplete parse. Don't consider than an
     // error.
@@ -1185,7 +1185,7 @@ const parse_node_t &parse_node_tree_t::find_child(const parse_node_t &parent,
 
 const parse_node_t *parse_node_tree_t::get_parent(const parse_node_t &node,
                                                   parse_token_type_t expected_type) const {
-    const parse_node_t *result = NULL;
+    const parse_node_t *result = nullptr;
     if (node.parent != NODE_OFFSET_INVALID) {
         PARSE_ASSERT(node.parent < this->size());
         const parse_node_t &parent = this->at(node.parent);
@@ -1213,10 +1213,10 @@ static bool node_has_ancestor(const parse_node_tree_t &tree, const parse_node_t
 
 const parse_node_t *parse_node_tree_t::find_node_matching_source_location(
     parse_token_type_t type, size_t source_loc, const parse_node_t *parent) const {
-    const parse_node_t *result = NULL;
+    const parse_node_t *result = nullptr;
     // Find nodes of the given type in the tree, working backwards.
     const size_t len = this->size();
-    for (size_t idx = 0; idx < len && result == NULL; idx++) {
+    for (size_t idx = 0; idx < len && result == nullptr; idx++) {
         const parse_node_t &node = this->at(idx);
 
         // Types must match.
@@ -1226,7 +1226,7 @@ const parse_node_t *parse_node_tree_t::find_node_matching_source_location(
         if (!node.location_in_or_at_end_of_source_range(source_loc)) continue;
 
         // If a parent is given, it must be an ancestor.
-        if (parent != NULL && !node_has_ancestor(*this, node, *parent)) continue;
+        if (parent != nullptr && !node_has_ancestor(*this, node, *parent)) continue;
 
         // Found it.
         result = &node;
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 027d8c834..72edf9457 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -116,7 +116,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
     int syntax_error = 0;
     int paran_count = 0;
 
-    wchar_t *paran_begin = 0, *paran_end = 0;
+    wchar_t *paran_begin = nullptr, *paran_end = nullptr;
 
     assert(in && "null parameter");
 
@@ -131,7 +131,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
                 }
             } else {
                 if (*pos == open_type) {
-                    if ((paran_count == 0) && (paran_begin == 0)) {
+                    if ((paran_count == 0) && (paran_begin == nullptr)) {
                         paran_begin = pos;
                     }
 
@@ -139,7 +139,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
                 } else if (*pos == close_type) {
                     paran_count--;
 
-                    if ((paran_count == 0) && (paran_end == 0)) {
+                    if ((paran_count == 0) && (paran_end == nullptr)) {
                         paran_end = pos;
                         break;
                     }
@@ -161,7 +161,7 @@ static int parse_util_locate_brackets_of_type(const wchar_t *in, wchar_t **begin
         return -1;
     }
 
-    if (paran_begin == 0) {
+    if (paran_begin == nullptr) {
         return 0;
     }
 
@@ -202,7 +202,7 @@ static int parse_util_locate_brackets_range(const wcstring &str, size_t *inout_c
     const wchar_t *const buff = str.c_str();
     const wchar_t *const valid_range_start = buff + *inout_cursor_offset,
                          *valid_range_end = buff + str.size();
-    wchar_t *bracket_range_begin = NULL, *bracket_range_end = NULL;
+    wchar_t *bracket_range_begin = nullptr, *bracket_range_end = nullptr;
     int ret = parse_util_locate_brackets_of_type(valid_range_start, &bracket_range_begin,
                                                  &bracket_range_end, accept_incomplete, open_type,
                                                  close_type);
@@ -212,9 +212,9 @@ static int parse_util_locate_brackets_range(const wcstring &str, size_t *inout_c
 
     // The command substitutions must not be NULL and must be in the valid pointer range, and
     // the end must be bigger than the beginning.
-    assert(bracket_range_begin != NULL && bracket_range_begin >= valid_range_start &&
+    assert(bracket_range_begin != nullptr && bracket_range_begin >= valid_range_start &&
            bracket_range_begin <= valid_range_end);
-    assert(bracket_range_end != NULL && bracket_range_end > bracket_range_begin &&
+    assert(bracket_range_end != nullptr && bracket_range_end > bracket_range_begin &&
            bracket_range_end >= valid_range_start && bracket_range_end <= valid_range_end);
 
     // Assign the substring to the out_contents.
@@ -252,13 +252,13 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
     const wchar_t *ap = buff, *bp = buff + bufflen;
     const wchar_t *pos = buff;
     for (;;) {
-        wchar_t *begin = NULL, *end = NULL;
+        wchar_t *begin = nullptr, *end = nullptr;
         if (parse_util_locate_cmdsubst(pos, &begin, &end, true) <= 0) {
             // No subshell found, all done.
             break;
         }
         // Interpret NULL to mean the end.
-        if (end == NULL) {
+        if (end == nullptr) {
             end = const_cast<wchar_t *>(buff) + bufflen;
         }
 
@@ -283,8 +283,8 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
         }
     }
 
-    if (a != NULL) *a = ap;
-    if (b != NULL) *b = bp;
+    if (a != nullptr) *a = ap;
+    if (b != nullptr) *b = bp;
 }
 
 /// Get the beginning and end of the job or process definition under the cursor.
@@ -357,7 +357,7 @@ void parse_util_token_extent(const wchar_t *buff, size_t cursor_pos, const wchar
                              const wchar_t **tok_end, const wchar_t **prev_begin,
                              const wchar_t **prev_end) {
     assert(buff && "Null buffer");
-    const wchar_t *a = NULL, *b = NULL, *pa = NULL, *pb = NULL;
+    const wchar_t *a = nullptr, *b = nullptr, *pa = nullptr, *pb = nullptr;
 
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(buff, cursor_pos, &cmdsubst_begin, &cmdsubst_end);
@@ -471,7 +471,7 @@ static wchar_t get_quote(const wcstring &cmd_str, size_t len) {
             if (cmd[i] == L'\'' || cmd[i] == L'\"') {
                 const wchar_t *end = quote_end(&cmd[i]);
                 // std::fwprintf( stderr, L"Jump %d\n",  end-cmd );
-                if ((end == 0) || (!*end) || (end > cmd + len)) {
+                if ((end == nullptr) || (!*end) || (end > cmd + len)) {
                     res = cmd[i];
                     break;
                 }
@@ -496,7 +496,7 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
         if (token->type == token_type_t::string)
             last_quote = get_quote(tok.text_of(*token), pos - token->offset);
 
-        if (out_type != NULL) *out_type = token->type;
+        if (out_type != nullptr) *out_type = token->type;
 
         prev_pos = token->offset;
     }
@@ -506,7 +506,7 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
     size_t cmdlen = pos;
     bool finished = cmdlen != 0;
     if (finished) {
-        finished = (quote == NULL);
+        finished = (quote == nullptr);
         if (finished && std::wcschr(L" \t\n\r", cmd_tmp[cmdlen - 1])) {
             finished = cmdlen > 1 && cmd_tmp[cmdlen - 2] == L'\\';
         }
@@ -514,9 +514,9 @@ void parse_util_get_parameter_info(const wcstring &cmd, const size_t pos, wchar_
 
     if (quote) *quote = last_quote;
 
-    if (offset != 0) {
+    if (offset != nullptr) {
         if (finished) {
-            while ((cmd_tmp[prev_pos] != 0) && (std::wcschr(L";|", cmd_tmp[prev_pos]) != 0))
+            while ((cmd_tmp[prev_pos] != 0) && (std::wcschr(L";|", cmd_tmp[prev_pos]) != nullptr))
                 prev_pos++;
             *offset = prev_pos;
         } else {
@@ -688,7 +688,7 @@ std::vector<int> parse_util_compute_indents(const wcstring &src) {
     parse_tree_from_string(src,
                            parse_flag_continue_after_error | parse_flag_include_comments |
                                parse_flag_accept_incomplete_tokens,
-                           &tree, NULL /* errors */);
+                           &tree, nullptr /* errors */);
 
     // Start indenting at the first node. If we have a parse error, we'll have to start indenting
     // from the top again.
@@ -832,7 +832,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
                                       size_t dollar_pos, parse_error_list_t *errors) {
     // Note that dollar_pos is probably VARIABLE_EXPAND or VARIABLE_EXPAND_SINGLE, not a literal
     // dollar sign.
-    assert(errors != NULL);
+    assert(errors != nullptr);
     assert(dollar_pos < token.size());
     const bool double_quotes = token.at(dollar_pos) == VARIABLE_EXPAND_SINGLE;
     const size_t start_error_count = errors->size();
@@ -934,7 +934,7 @@ static parser_test_error_bits_t detect_dollar_cmdsub_errors(size_t arg_src_offse
     wchar_t last = unescaped_arg_src.at(unescaped_arg_src.size() - 1);
     if (last == VARIABLE_EXPAND) {
         result_bits |= PARSER_TEST_ERROR;
-        if (out_errors != NULL) {
+        if (out_errors != nullptr) {
             wcstring subcommand_first_token = tok_first(cmdsubst_src);
             if (subcommand_first_token.empty()) {
                 // e.g. $(). Report somthing.
@@ -995,7 +995,7 @@ parser_test_error_bits_t parse_util_detect_errors_in_argument(tnode_t<grammar::a
                 size_t error_offset = cmd_sub_start + 1 + source_start;
                 parse_error_offset_source_start(&subst_errors, error_offset);
 
-                if (out_errors != NULL) {
+                if (out_errors != nullptr) {
                     out_errors->insert(out_errors->end(), subst_errors.begin(), subst_errors.end());
 
                     // Hackish. Take this opportunity to report $(...) errors. We do this because
@@ -1319,11 +1319,11 @@ parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
     if (has_unclosed_block || has_unclosed_quote_or_subshell || has_unclosed_pipe)
         res |= PARSER_TEST_INCOMPLETE;
 
-    if (out_errors != NULL) {
+    if (out_errors != nullptr) {
         *out_errors = std::move(parse_errors);
     }
 
-    if (out_pstree != NULL) {
+    if (out_pstree != nullptr) {
         *out_pstree = std::make_shared<parsed_source_t>(buff_src, std::move(node_tree));
     }
 
diff --git a/src/parse_util.h b/src/parse_util.h
index 49458eed0..d7857b742 100644
--- a/src/parse_util.h
+++ b/src/parse_util.h
@@ -129,9 +129,9 @@ std::vector<int> parse_util_compute_indents(const wcstring &src);
 /// error. If out_pstree is not NULL, the resulting tree is returned by reference.
 class parse_node_tree_t;
 parser_test_error_bits_t parse_util_detect_errors(const wcstring &buff_src,
-                                                  parse_error_list_t *out_errors = NULL,
+                                                  parse_error_list_t *out_errors = nullptr,
                                                   bool allow_incomplete = true,
-                                                  parsed_source_ref_t *out_pstree = NULL);
+                                                  parsed_source_ref_t *out_pstree = nullptr);
 
 /// Detect errors in the specified string when parsed as an argument list. Returns the text of an
 /// error, or none if no error occurred.
@@ -144,7 +144,7 @@ maybe_t<wcstring> parse_util_detect_errors_in_argument_list(const wcstring &arg_
 class parse_node_t;
 parser_test_error_bits_t parse_util_detect_errors_in_argument(
     tnode_t<grammar::argument> node, const wcstring &arg_src,
-    parse_error_list_t *out_errors = NULL);
+    parse_error_list_t *out_errors = nullptr);
 
 /// Given a string containing a variable expansion error, append an appropriate error to the errors
 /// list. The global_token_pos is the offset of the token in the larger source, and the dollar_pos
diff --git a/src/parser.cpp b/src/parser.cpp
index 1c118d92e..7e19cb065 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -89,17 +89,17 @@ static const struct block_lookup_entry block_lookup[] = {
     {WHILE, L"while", WHILE_BLOCK},
     {FOR, L"for", FOR_BLOCK},
     {IF, L"if", IF_BLOCK},
-    {FUNCTION_CALL, 0, FUNCTION_CALL_BLOCK},
-    {FUNCTION_CALL_NO_SHADOW, 0, FUNCTION_CALL_NO_SHADOW_BLOCK},
+    {FUNCTION_CALL, nullptr, FUNCTION_CALL_BLOCK},
+    {FUNCTION_CALL_NO_SHADOW, nullptr, FUNCTION_CALL_NO_SHADOW_BLOCK},
     {SWITCH, L"switch", SWITCH_BLOCK},
-    {TOP, 0, TOP_BLOCK},
-    {SUBST, 0, SUBST_BLOCK},
+    {TOP, nullptr, TOP_BLOCK},
+    {SUBST, nullptr, SUBST_BLOCK},
     {BEGIN, L"begin", BEGIN_BLOCK},
     {SOURCE, L"source", SOURCE_BLOCK},
-    {EVENT, 0, EVENT_BLOCK},
+    {EVENT, nullptr, EVENT_BLOCK},
     {BREAKPOINT, L"breakpoint", BREAKPOINT_BLOCK},
     {VARIABLE_ASSIGNMENT, L"variable assignment", VARIABLE_ASSIGNMENT_BLOCK},
-    {static_cast<block_type_t>(0), 0, 0}};
+    {static_cast<block_type_t>(0), nullptr, nullptr}};
 
 // Given a file path, return something nicer. Currently we just "unexpand" tildes.
 wcstring parser_t::user_presentable_path(const wcstring &path) const {
@@ -141,7 +141,7 @@ block_t *parser_t::push_block(block_t &&block) {
     new_current.src_lineno = parser_t::get_lineno();
 
     const wchar_t *filename = parser_t::current_filename();
-    if (filename != NULL) {
+    if (filename != nullptr) {
         new_current.src_filename = intern(filename);
     }
 
@@ -234,15 +234,15 @@ wcstring parser_t::block_stack_description() const {
 const block_t *parser_t::block_at_index(size_t idx) const {
     // Zero corresponds to the last element in our vector.
     size_t count = block_stack.size();
-    return idx < count ? &block_stack.at(count - idx - 1) : NULL;
+    return idx < count ? &block_stack.at(count - idx - 1) : nullptr;
 }
 
 block_t *parser_t::block_at_index(size_t idx) {
     size_t count = block_stack.size();
-    return idx < count ? &block_stack.at(count - idx - 1) : NULL;
+    return idx < count ? &block_stack.at(count - idx - 1) : nullptr;
 }
 
-block_t *parser_t::current_block() { return block_stack.empty() ? NULL : &block_stack.back(); }
+block_t *parser_t::current_block() { return block_stack.empty() ? nullptr : &block_stack.back(); }
 
 /// Print profiling information to the specified stream.
 static void print_profile(const std::vector<std::unique_ptr<profile_item_t>> &items, FILE *out) {
@@ -320,7 +320,7 @@ std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_lis
                                                          const std::shared_ptr<parser_t> &parser) {
     // Parse the string as an argument list.
     parse_node_tree_t tree;
-    if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, NULL /* errors */,
+    if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, nullptr /* errors */,
                                 symbol_freestanding_argument_list)) {
         // Failed to parse. Here we expect to have reported any errors in test_args.
         return {};
@@ -332,7 +332,7 @@ std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_lis
     tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
     while (auto arg = arg_list.next_in_list<grammar::argument>()) {
         const wcstring arg_src = arg.get_source(arg_list_src);
-        if (expand_string(arg_src, &result, eflags, vars, parser, NULL /* errors */) ==
+        if (expand_string(arg_src, &result, eflags, vars, parser, nullptr /* errors */) ==
             expand_result_t::error) {
             break;  // failed to expand a string
         }
@@ -434,7 +434,7 @@ const wchar_t *parser_t::is_function(size_t idx) const {
     // PCA: Have to make this a string somehow.
     ASSERT_IS_MAIN_THREAD();
 
-    const wchar_t *result = NULL;
+    const wchar_t *result = nullptr;
     for (size_t block_idx = idx; block_idx < this->block_count(); block_idx++) {
         const block_t *b = this->block_at_index(block_idx);
         if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
@@ -462,7 +462,7 @@ const wchar_t *parser_t::get_function_name(int level) {
             }
             idx++;
         }
-        return NULL;  // couldn't find a breakpoint frame
+        return nullptr;  // couldn't find a breakpoint frame
     } else if (level == 1) {
         // Return the function name for the current level.
         return this->is_function();
@@ -477,7 +477,7 @@ const wchar_t *parser_t::get_function_name(int level) {
         }
         idx++;
     }
-    return NULL;  // couldn't find that function level
+    return nullptr;  // couldn't find that function level
 }
 
 int parser_t::get_lineno() const {
@@ -487,7 +487,7 @@ int parser_t::get_lineno() const {
 
         // If we are executing a function, we have to add in its offset.
         const wchar_t *function_name = is_function();
-        if (function_name != NULL) {
+        if (function_name != nullptr) {
             lineno += function_get_definition_lineno(function_name);
         }
     }
@@ -569,7 +569,7 @@ wcstring parser_t::current_line() {
 }
 
 void parser_t::job_add(shared_ptr<job_t> job) {
-    assert(job != NULL);
+    assert(job != nullptr);
     assert(!job->processes.empty());
     job_list.push_front(std::move(job));
 }
@@ -591,14 +591,14 @@ job_t *parser_t::job_get(job_id_t id) {
     for (const auto &job : job_list) {
         if (id <= 0 || job->job_id == id) return job.get();
     }
-    return NULL;
+    return nullptr;
 }
 
 job_t *parser_t::job_get_from_pid(pid_t pid) const {
     pid_t pgid = getpgid(pid);
 
     if (pgid == -1) {
-        return 0;
+        return nullptr;
     }
 
     for (const auto &job : jobs()) {
@@ -610,7 +610,7 @@ job_t *parser_t::job_get_from_pid(pid_t pid) const {
             }
         }
     }
-    return 0;
+    return nullptr;
 }
 
 profile_item_t *parser_t::create_profile_item() {
@@ -802,7 +802,7 @@ wcstring block_t::description() const {
     if (this->src_lineno >= 0) {
         append_format(result, L" (line %d)", this->src_lineno);
     }
-    if (this->src_filename != NULL) {
+    if (this->src_filename != nullptr) {
         append_format(result, L" (file %ls)", this->src_filename);
     }
     return result;
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 680625bf1..e1080e47d 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -199,7 +199,7 @@ pid_t execute_fork() {
         // Don't sleep on the final lap - sleeping might change the value of errno, which will break
         // the error reporting below.
         if (i != FORK_LAPS - 1) {
-            nanosleep(&pollint, NULL);
+            nanosleep(&pollint, nullptr);
         }
     }
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 05ecf8646..d61c5bed7 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -262,7 +262,7 @@ static void handle_child_status(process_t *proc, proc_status_t status) {
                 sigemptyset(&act.sa_mask);
                 act.sa_flags = 0;
                 act.sa_handler = SIG_DFL;
-                sigaction(sig, &act, 0);
+                sigaction(sig, &act, nullptr);
                 kill(getpid(), sig);
             }
         }
@@ -560,7 +560,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
 
     // This may be invoked in an exit handler, after the TERM has been torn down
     // Don't try to print in that case (#3222)
-    const bool interactive = allow_interactive && cur_term != NULL;
+    const bool interactive = allow_interactive && cur_term != nullptr;
 
     // Remove all disowned jobs.
     remove_disowned_jobs(parser.jobs());
@@ -686,7 +686,7 @@ unsigned long proc_get_jiffies(process_t *p) {
 void proc_update_jiffies(parser_t &parser) {
     for (const auto &job : parser.jobs()) {
         for (process_ptr_t &p : job->processes) {
-            gettimeofday(&p->last_time, 0);
+            gettimeofday(&p->last_time, nullptr);
             p->last_jiffies = proc_get_jiffies(p.get());
         }
     }
@@ -923,7 +923,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
 }
 
 void proc_sanity_check(const parser_t &parser) {
-    const job_t *fg_job = NULL;
+    const job_t *fg_job = nullptr;
 
     for (const auto &j : parser.jobs()) {
         if (!j->is_constructed()) continue;
diff --git a/src/proc.h b/src/proc.h
index 16dabfbad..6a627b26c 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -210,14 +210,14 @@ class process_t {
     /// Returns argv[idx].
     const wchar_t *argv(size_t idx) const {
         const wchar_t *const *argv = argv_array.get();
-        assert(argv != NULL);
+        assert(argv != nullptr);
         return argv[idx];
     }
 
     /// Returns argv[0], or NULL.
     const wchar_t *argv0() const {
         const wchar_t *const *argv = argv_array.get();
-        return argv ? argv[0] : NULL;
+        return argv ? argv[0] : nullptr;
     }
 
     /// IO chain getter and setter.
diff --git a/src/reader.cpp b/src/reader.cpp
index 397a5520c..4b4157eec 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -566,8 +566,8 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
     } else {
         // We have an autosuggestion which is not a prefix of the command line, i.e. a case
         // disagreement. Decide whose case we want to use.
-        const wchar_t *begin = NULL, *cmd = cmdline.c_str();
-        parse_util_token_extent(cmd, cmdline.size() - 1, &begin, NULL, NULL, NULL);
+        const wchar_t *begin = nullptr, *cmd = cmdline.c_str();
+        parse_util_token_extent(cmd, cmdline.size() - 1, &begin, nullptr, nullptr, nullptr);
         bool last_token_contains_uppercase = false;
         if (begin) {
             const wchar_t *end = begin + std::wcslen(begin);
@@ -720,7 +720,7 @@ void reader_data_t::pager_selection_changed() {
     size_t cursor_pos = this->cycle_cursor_pos;
     wcstring new_cmd_line;
 
-    if (completion == NULL) {
+    if (completion == nullptr) {
         new_cmd_line = this->cycle_command_line;
     } else {
         new_cmd_line =
@@ -739,10 +739,10 @@ maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline,
     // See if we are at "command position". Get the surrounding command substitution, and get the
     // extent of the first token.
     const wchar_t *const buff = cmdline.c_str();
-    const wchar_t *cmdsub_begin = NULL, *cmdsub_end = NULL;
+    const wchar_t *cmdsub_begin = nullptr, *cmdsub_end = nullptr;
     parse_util_cmdsubst_extent(buff, cursor_pos, &cmdsub_begin, &cmdsub_end);
-    assert(cmdsub_begin != NULL && cmdsub_begin >= buff);
-    assert(cmdsub_end != NULL && cmdsub_end >= cmdsub_begin);
+    assert(cmdsub_begin != nullptr && cmdsub_begin >= buff);
+    assert(cmdsub_end != nullptr && cmdsub_end >= cmdsub_begin);
 
     // Determine the offset of this command substitution.
     const size_t subcmd_offset = cmdsub_begin - buff;
@@ -754,7 +754,7 @@ maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline,
     parse_node_tree_t parse_tree;
     parse_tree_from_string(subcmd,
                            parse_flag_continue_after_error | parse_flag_accept_incomplete_tokens,
-                           &parse_tree, NULL);
+                           &parse_tree, nullptr);
 
     // Look for plain statements where the cursor is at the end of the command.
     using namespace grammar;
@@ -1168,7 +1168,7 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
         const wchar_t *begin, *end;
 
         const wchar_t *buff = command_line.c_str();
-        parse_util_token_extent(buff, cursor_pos, &begin, 0, 0, 0);
+        parse_util_token_extent(buff, cursor_pos, &begin, nullptr, nullptr, nullptr);
         end = buff + cursor_pos;
 
         wcstring sb(buff, begin - buff);
@@ -1208,7 +1208,7 @@ wcstring completion_apply_to_command_line(const wcstring &val, complete_flags_t
         // substitution as one token.
         parse_util_get_parameter_info(
             command_line.substr(cmdsub_offset, (cmdsub_end - cmdsub_begin)),
-            cursor_pos - cmdsub_offset, &quote, NULL, NULL);
+            cursor_pos - cmdsub_offset, &quote, nullptr, nullptr);
 
         // If the token is reported as unquoted, but ends with a (unescaped) quote, and we can
         // modify the command line, then delete the trailing quote so that we can insert within
@@ -1435,7 +1435,7 @@ void reader_data_t::flash() {
 
     pollint.tv_sec = 0;
     pollint.tv_nsec = 100 * 1000000;
-    nanosleep(&pollint, NULL);
+    nanosleep(&pollint, nullptr);
 
     super_highlight_me_plenty();
     repaint();
@@ -1660,7 +1660,7 @@ static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgi
         char buf[L_ctermid];
         char *tty = ctermid_r(buf);
 #else
-        char *tty = ctermid(NULL);
+        char *tty = ctermid(nullptr);
 #endif
         if (!tty) {
             wperror(L"ctermid");
@@ -1834,7 +1834,7 @@ void reader_data_t::replace_current_token(const wcstring &new_token) {
     // Find current token.
     editable_line_t *el = active_edit_line();
     const wchar_t *buff = el->text.c_str();
-    parse_util_token_extent(buff, el->position, &begin, &end, 0, 0);
+    parse_util_token_extent(buff, el->position, &begin, &end, nullptr, nullptr);
 
     if (!begin || !end) return;
 
@@ -1950,12 +1950,12 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
     reader_write_title(cmd, parser);
     term_donate(outp);
 
-    gettimeofday(&time_before, NULL);
+    gettimeofday(&time_before, nullptr);
 
     parser.eval(cmd, io_chain_t(), TOP);
     job_reap(parser, true);
 
-    gettimeofday(&time_after, NULL);
+    gettimeofday(&time_after, nullptr);
 
     // update the execution duration iff a command is requested for execution
     // issue - #4926
@@ -2041,7 +2041,7 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
         }
         s_thread_generation = generation_count;
         std::vector<highlight_spec_t> colors(text.size(), highlight_spec_t{});
-        highlight_func(text, colors, match_highlight_pos, NULL /* error */, *vars);
+        highlight_func(text, colors, match_highlight_pos, nullptr /* error */, *vars);
         return {std::move(colors), text};
     };
 }
@@ -2056,7 +2056,7 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
 ///        an asynchronous highlight in the background, which may perform disk I/O.
 void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bool no_io) {
     const editable_line_t *el = &command_line;
-    assert(el != NULL);
+    assert(el != nullptr);
     long match_highlight_pos = static_cast<long>(el->position) + match_highlight_pos_adjust;
     assert(match_highlight_pos >= 0);
 
@@ -2318,7 +2318,7 @@ static int can_read(int fd) {
 
     FD_ZERO(&fds);
     FD_SET(fd, &fds);
-    return select(fd + 1, &fds, 0, 0, &can_read_timeout) == 1;
+    return select(fd + 1, &fds, nullptr, nullptr, &can_read_timeout) == 1;
 }
 
 /// Test if the specified character in the specified string is backslashed. pos may be at the end of
@@ -2551,7 +2551,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // pass cmdsub_begin here, not buff.
                 const wchar_t *token_begin, *token_end;
                 parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin - buff),
-                                        &token_begin, &token_end, 0, 0);
+                                        &token_begin, &token_end, nullptr, nullptr);
 
                 // Hack: the token may extend past the end of the command substitution, e.g. in
                 // (echo foo) the last token is 'foo)'. Don't let that happen.
@@ -2771,7 +2771,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Finished command, execute it. Don't add items that start with a leading
                 // space.
                 const editable_line_t *el = &command_line;
-                if (history != NULL && !el->empty() && el->text.at(0) != L' ') {
+                if (history != nullptr && !el->empty() && el->text.at(0) != L' ') {
                     history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
                 }
                 rls.finished = true;
@@ -2810,7 +2810,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                     // Searching by token.
                     const wchar_t *begin, *end;
                     const wchar_t *buff = el->text.c_str();
-                    parse_util_token_extent(buff, el->position, &begin, &end, 0, 0);
+                    parse_util_token_extent(buff, el->position, &begin, &end, nullptr, nullptr);
                     if (begin) {
                         wcstring token(begin, end);
                         history_search.reset_to_mode(token, history,
@@ -3452,13 +3452,13 @@ void reader_react_to_color_change() {
 const wchar_t *reader_get_buffer() {
     ASSERT_IS_MAIN_THREAD();
     reader_data_t *data = current_data_or_null();
-    return data ? data->command_line.text.c_str() : NULL;
+    return data ? data->command_line.text.c_str() : nullptr;
 }
 
 history_t *reader_get_history() {
     ASSERT_IS_MAIN_THREAD();
     reader_data_t *data = current_data_or_null();
-    return data ? data->history : NULL;
+    return data ? data->history : nullptr;
 }
 
 void reader_sanity_check() {
@@ -3486,7 +3486,7 @@ size_t reader_get_cursor_pos() {
 bool reader_get_selection(size_t *start, size_t *len) {
     bool result = false;
     reader_data_t *data = current_data_or_null();
-    if (data != NULL && data->sel_active) {
+    if (data != nullptr && data->sel_active) {
         *start = data->sel_start_pos;
         *len = std::min(data->sel_stop_pos - data->sel_start_pos, data->command_line.size());
         result = true;
@@ -3509,7 +3509,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
     }
 
     in_stream = fdopen(des, "r");
-    if (in_stream != 0) {
+    if (in_stream != nullptr) {
         while (!feof(in_stream)) {
             char buff[4096];
             size_t c = fread(buff, 1, 4096, in_stream);
diff --git a/src/sanity.cpp b/src/sanity.cpp
index 677214384..cbe4b0e82 100644
--- a/src/sanity.cpp
+++ b/src/sanity.cpp
@@ -29,7 +29,7 @@ void validate_pointer(const void *ptr, const wchar_t *err, int null_ok) {
         sanity_lose();
     }
 
-    if ((!null_ok) && (ptr == 0)) {
+    if ((!null_ok) && (ptr == nullptr)) {
         FLOGF(error, _(L"The pointer '%ls' is null"), err);
         sanity_lose();
     }
diff --git a/src/screen.cpp b/src/screen.cpp
index ac4b8d62d..d441e88d1 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -104,7 +104,7 @@ static bool is_screen_name_escape_seq(const wchar_t *code, size_t *resulting_len
     }
     const wchar_t *const screen_name_end_sentinel = L"\x1B\\";
     const wchar_t *screen_name_end = std::wcsstr(&code[2], screen_name_end_sentinel);
-    if (screen_name_end == NULL) {
+    if (screen_name_end == nullptr) {
         // Consider just <esc>k to be the code.
         *resulting_length = 2;
     } else {
@@ -246,7 +246,7 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
 /// that begin with \x1B. If it doesn't we return zero. We also return zero if we don't recognize
 /// the escape sequence based on querying terminfo and other heuristics.
 size_t escape_code_length(const wchar_t *code) {
-    assert(code != NULL);
+    assert(code != nullptr);
     if (*code != L'\x1B') return 0;
 
     size_t esc_seq_len = cached_layouts.find_escape_code(code);
@@ -498,7 +498,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
         x_steps = 0;
     }
 
-    const char *multi_str = NULL;
+    const char *multi_str = nullptr;
     if (x_steps < 0) {
         str = cursor_left;
         multi_str = parm_left_cursor;
@@ -509,7 +509,7 @@ static void s_move(screen_t *s, int new_x, int new_y) {
 
     // Use the bulk ('multi') output for cursor movement if it is supported and it would be shorter
     // Note that this is required to avoid some visual glitches in iTerm (issue #1448).
-    bool use_multi = multi_str != NULL && multi_str[0] != '\0' &&
+    bool use_multi = multi_str != nullptr && multi_str[0] != '\0' &&
                      abs(x_steps) * std::strlen(str) > std::strlen(multi_str);
     if (use_multi && cur_term) {
         char *multi_param = tparm(const_cast<char *>(multi_str), abs(x_steps));
@@ -663,7 +663,7 @@ static void s_update(screen_t *scr, const wcstring &left_prompt, const wcstring
 
         // If this is the last line, maybe we should clear the screen.
         const bool should_clear_screen_this_line =
-            need_clear_screen && i + 1 == scr->desired.line_count() && clr_eos != NULL;
+            need_clear_screen && i + 1 == scr->desired.line_count() && clr_eos != nullptr;
 
         // Note that skip_remaining is a width, not a character count.
         size_t skip_remaining = start_pos;
diff --git a/src/signal.cpp b/src/signal.cpp
index a9837d863..c17587cea 100644
--- a/src/signal.cpp
+++ b/src/signal.cpp
@@ -268,10 +268,10 @@ void signal_reset_handlers() {
     for (const auto &data : signal_table) {
         if (data.signal == SIGHUP) {
             struct sigaction oact;
-            sigaction(SIGHUP, NULL, &oact);
+            sigaction(SIGHUP, nullptr, &oact);
             if (oact.sa_handler == SIG_IGN) continue;
         }
-        sigaction(data.signal, &act, NULL);
+        sigaction(data.signal, &act, nullptr);
     }
 }
 
@@ -284,35 +284,35 @@ static void set_interactive_handlers() {
     // Interactive mode. Ignore interactive signals.  We are a shell, we know what is best for
     // the user.
     act.sa_handler = SIG_IGN;
-    sigaction(SIGTSTP, &act, NULL);
-    sigaction(SIGTTOU, &act, NULL);
+    sigaction(SIGTSTP, &act, nullptr);
+    sigaction(SIGTTOU, &act, nullptr);
 
     // We don't ignore SIGTTIN because we might send it to ourself.
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
-    sigaction(SIGTTIN, &act, NULL);
+    sigaction(SIGTTIN, &act, nullptr);
 
     // SIGTERM restores the terminal controlling process before dying.
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
-    sigaction(SIGTERM, &act, NULL);
+    sigaction(SIGTERM, &act, nullptr);
 
-    sigaction(SIGHUP, NULL, &oact);
+    sigaction(SIGHUP, nullptr, &oact);
     if (oact.sa_handler == SIG_DFL) {
         act.sa_sigaction = &fish_signal_handler;
         act.sa_flags = SA_SIGINFO;
-        sigaction(SIGHUP, &act, NULL);
+        sigaction(SIGHUP, &act, nullptr);
     }
 
     // SIGALARM as part of our signal torture test
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
-    sigaction(SIGALRM, &act, NULL);
+    sigaction(SIGALRM, &act, nullptr);
 
 #ifdef SIGWINCH
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
-    sigaction(SIGWINCH, &act, NULL);
+    sigaction(SIGWINCH, &act, nullptr);
 #endif
 }
 
@@ -326,22 +326,22 @@ void signal_set_handlers(bool interactive) {
     // this signal interrupting other syscalls or terminating us.
     act.sa_sigaction = nullptr;
     act.sa_handler = SIG_IGN;
-    sigaction(SIGPIPE, &act, 0);
+    sigaction(SIGPIPE, &act, nullptr);
 
     // Ignore SIGQUIT.
     act.sa_handler = SIG_IGN;
-    sigaction(SIGQUIT, &act, 0);
+    sigaction(SIGQUIT, &act, nullptr);
 
     // Apply our SIGINT handler.
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO;
-    sigaction(SIGINT, &act, NULL);
+    sigaction(SIGINT, &act, nullptr);
 
     // Whether or not we're interactive we want SIGCHLD to not interrupt restartable syscalls.
     act.sa_flags = SA_SIGINFO;
     act.sa_sigaction = &fish_signal_handler;
     act.sa_flags = SA_SIGINFO | SA_RESTART;
-    if (sigaction(SIGCHLD, &act, 0)) {
+    if (sigaction(SIGCHLD, &act, nullptr)) {
         wperror(L"sigaction");
         FATAL_EXIT();
     }
@@ -378,7 +378,7 @@ void get_signals_with_handlers(sigset_t *set) {
     sigemptyset(set);
     for (const auto &data : signal_table) {
         struct sigaction act = {};
-        sigaction(data.signal, NULL, &act);
+        sigaction(data.signal, nullptr, &act);
         // If SIGHUP is being ignored (e.g., because were were run via `nohup`) don't reset it.
         // We don't special case other signals because if they're being ignored that shouldn't
         // affect processes we spawn. They should get the default behavior for those signals.
@@ -391,7 +391,7 @@ void get_signals_with_handlers(sigset_t *set) {
 void signal_unblock_all() {
     sigset_t iset;
     sigemptyset(&iset);
-    sigprocmask(SIG_SETMASK, &iset, NULL);
+    sigprocmask(SIG_SETMASK, &iset, nullptr);
 }
 
 sigint_checker_t::sigint_checker_t() {
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index c024b6401..c84c02436 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -205,7 +205,7 @@ static const te_builtin *find_builtin(const char *name, int len) {
                                                });
     // We need to compare again because we might have gotten the first "larger" element.
     if (found != end && std::strncmp(found->name, name, len) == 0) return found;
-    return NULL;
+    return nullptr;
 }
 
 static constexpr double add(double a, double b) { return a + b; }
@@ -336,13 +336,13 @@ static te_expr *base(state *s) {
 
     switch (s->type) {
         case TOK_NUMBER:
-            ret = new_expr(TE_CONSTANT, 0);
+            ret = new_expr(TE_CONSTANT, nullptr);
             ret->value = s->value;
             next_token(s);
             break;
 
         case TE_FUNCTION0:
-            ret = new_expr(s->type, 0);
+            ret = new_expr(s->type, nullptr);
             ret->function = s->function;
             next_token(s);
             if (s->type == TOK_OPEN) {
@@ -361,7 +361,7 @@ static te_expr *base(state *s) {
         case TE_FUNCTION3:
             arity = get_arity(s->type);
 
-            ret = new_expr(s->type, 0);
+            ret = new_expr(s->type, nullptr);
             ret->function = s->function;
             next_token(s);
 
@@ -404,13 +404,13 @@ static te_expr *base(state *s) {
             // This means we have too few things.
             // Instead of introducing another error, just call it
             // "too few args".
-            ret = new_expr(0, 0);
+            ret = new_expr(0, nullptr);
             s->type = TOK_ERROR;
             s->error = TE_ERROR_TOO_FEW_ARGS;
             ret->value = NAN;
             break;
         default:
-            ret = new_expr(0, 0);
+            ret = new_expr(0, nullptr);
             s->type = TOK_ERROR;
             s->error = TE_ERROR_UNEXPECTED_TOKEN;
             ret->value = NAN;
@@ -444,7 +444,7 @@ static te_expr *factor(state *s) {
     /* <factor>    =    <power> {"^" <power>} */
     te_expr *ret = power(s);
 
-    te_expr *insertion = 0;
+    te_expr *insertion = nullptr;
 
     while (s->type == TOK_INFIX &&
            (s->function == reinterpret_cast<const void *>(static_cast<te_fun2>(pow)))) {
@@ -566,7 +566,7 @@ te_expr *te_compile(const char *expression, te_error_t *error) {
                 error->type = TE_ERROR_TOO_MANY_ARGS;
             }
         }
-        return 0;
+        return nullptr;
     } else {
         optimize(root);
         if (error) error->position = 0;
diff --git a/src/tnode.cpp b/src/tnode.cpp
index b29e82d28..e84e88c5c 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -9,12 +9,12 @@ const parse_node_t *parse_node_tree_t::next_node_in_node_list(
     assert(list_type != entry_type);
 
     const parse_node_t *list_cursor = &node_list;
-    const parse_node_t *list_entry = NULL;
+    const parse_node_t *list_entry = nullptr;
 
     // Loop while we don't have an item but do have a list. Note that some nodes may contain
     // nothing; e.g. job_list contains blank lines as a production.
-    while (list_entry == NULL && list_cursor != NULL) {
-        const parse_node_t *next_cursor = NULL;
+    while (list_entry == nullptr && list_cursor != nullptr) {
+        const parse_node_t *next_cursor = nullptr;
 
         // Walk through the children.
         for (node_offset_t i = 0; i < list_cursor->child_count; i++) {
@@ -32,9 +32,9 @@ const parse_node_t *parse_node_tree_t::next_node_in_node_list(
     }
 
     // Return what we got.
-    assert(list_cursor == NULL || list_cursor->type == list_type);
-    assert(list_entry == NULL || list_entry->type == entry_type);
-    if (out_list_tail != NULL) *out_list_tail = list_cursor;
+    assert(list_cursor == nullptr || list_cursor->type == list_type);
+    assert(list_entry == nullptr || list_entry->type == entry_type);
+    if (out_list_tail != nullptr) *out_list_tail = list_cursor;
     return list_entry;
 }
 
@@ -67,7 +67,7 @@ maybe_t<pipe_or_redir_t> redirection_for_node(tnode_t<grammar::redirection> redi
         assert(result.has_value() && "Failed to parse valid redirection");
         assert(!result->is_pipe && "Should not be a pipe");
     }
-    if (out_target != NULL) {
+    if (out_target != nullptr) {
         tnode_t<grammar::tok_string> target = redirection.child<1>();  // like 1 or file path
         *out_target = target.has_source() ? target.get_source(src) : wcstring();
     }
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 21484cf33..843492e60 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -65,7 +65,7 @@ bool wchar_to_utf8_string(const std::wstring &str, std::string *result) {
 
     bool success = false;
     const wchar_t *input = str.c_str();
-    size_t outlen = wchar_to_utf8(input, inlen, NULL, 0, 0);
+    size_t outlen = wchar_to_utf8(input, inlen, nullptr, 0, 0);
     if (outlen > 0) {
         char *tmp = new char[outlen];
         size_t outlen2 = wchar_to_utf8(input, inlen, tmp, outlen, 0);
@@ -79,15 +79,15 @@ bool wchar_to_utf8_string(const std::wstring &str, std::string *result) {
 }
 
 size_t utf8_to_wchar(const char *in, size_t insize, std::wstring *out, int flags) {
-    if (in == NULL || insize == 0) {
+    if (in == nullptr || insize == 0) {
         return 0;
     }
 
     size_t result;
     if (sizeof(wchar_t) == sizeof(utf8_wchar_t)) {  //!OCLINT(constant if expression)
         result = utf8_to_wchar_internal(in, insize, reinterpret_cast<utf8_wstring_t *>(out), flags);
-    } else if (out == NULL) {
-        result = utf8_to_wchar_internal(in, insize, NULL, flags);
+    } else if (out == nullptr) {
+        result = utf8_to_wchar_internal(in, insize, nullptr, flags);
     } else {
         // Allocate a temporary buffer to hold the output, invoke the conversion with the temporary,
         // and then copy it back.
@@ -99,7 +99,7 @@ size_t utf8_to_wchar(const char *in, size_t insize, std::wstring *out, int flags
 }
 
 size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out, size_t outsize, int flags) {
-    if (in == NULL || insize == 0 || (outsize == 0 && out != NULL)) {
+    if (in == nullptr || insize == 0 || (outsize == 0 && out != nullptr)) {
         return 0;
     }
 
@@ -171,9 +171,9 @@ static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring
     utf8_wchar_t high;
     size_t n, total, i, n_bits;
 
-    if (in == NULL || insize == 0) return 0;
+    if (in == nullptr || insize == 0) return 0;
 
-    if (out_string != NULL) out_string->clear();
+    if (out_string != nullptr) out_string->clear();
 
     total = 0;
     p = (unsigned char *)in;
@@ -220,7 +220,7 @@ static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring
         }
 
         total++;
-        if (out_string == NULL) continue;
+        if (out_string == nullptr) continue;
 
         uint32_t out_val = 0;
         n_bits = 0;
@@ -272,7 +272,7 @@ static size_t wchar_to_utf8_internal(const utf8_wchar_t *in, size_t insize, char
     unsigned char *p, *lim;
     size_t total, n;
 
-    if (in == NULL || insize == 0 || (outsize == 0 && out != NULL)) return 0;
+    if (in == nullptr || insize == 0 || (outsize == 0 && out != nullptr)) return 0;
 
     w = in;
     wlim = w + insize;
@@ -306,7 +306,7 @@ static size_t wchar_to_utf8_internal(const utf8_wchar_t *in, size_t insize, char
 
         total += n;
 
-        if (out == NULL) continue;
+        if (out == nullptr) continue;
         if (size_t(lim - p) <= n - 1) return 0;  // no space left
 
         // Extract the wchar_t as big-endian. If wchar_t is UCS-16, the first two bytes will be 0.
diff --git a/src/util.cpp b/src/util.cpp
index 74c03d5c8..dcbbc2eac 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -103,6 +103,6 @@ int wcsfilecmp(const wchar_t *a, const wchar_t *b) {
 /// Return microseconds since the epoch.
 long long get_time() {
     struct timeval time_struct;
-    gettimeofday(&time_struct, 0);
+    gettimeofday(&time_struct, nullptr);
     return 1000000ll * time_struct.tv_sec + time_struct.tv_usec;
 }
diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp
index 031b691db..f64515763 100644
--- a/src/wgetopt.cpp
+++ b/src/wgetopt.cpp
@@ -115,7 +115,7 @@ void wgetopter_t::_wgetopt_initialize(const wchar_t *optstring) {
     // Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the
     // sequence of previously skipped non-option ARGV-elements is empty.
     first_nonopt = last_nonopt = woptind = 1;
-    nextchar = NULL;
+    nextchar = nullptr;
 
     // Determine how to handle the ordering of options and nonoptions.
     if (optstring[0] == '-') {
@@ -191,7 +191,7 @@ int wgetopter_t::_advance_to_next_argv(  //!OCLINT(high cyclomatic complexity)
     }
 
     // We have found another option-ARGV-element. Skip the initial punctuation.
-    nextchar = (argv[woptind] + 1 + (longopts != NULL && argv[woptind][1] == '-'));
+    nextchar = (argv[woptind] + 1 + (longopts != nullptr && argv[woptind][1] == '-'));
     return 0;
 }
 
@@ -204,7 +204,7 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
     // Increment `woptind' when we start to process its last character.
     if (*nextchar == '\0') ++woptind;
 
-    if (temp == NULL || c == ':') {
+    if (temp == nullptr || c == ':') {
         if (wopterr) {
             std::fwprintf(stderr, _(L"%ls: Invalid option -- %lc\n"), argv[0],
                           static_cast<wint_t>(c));
@@ -225,9 +225,9 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
             woptarg = nextchar;
             woptind++;
         } else {
-            woptarg = NULL;
+            woptarg = nullptr;
         }
-        nextchar = NULL;
+        nextchar = nullptr;
     } else {
         // This is an option that requires an argument.
         if (*nextchar != '\0') {
@@ -248,7 +248,7 @@ int wgetopter_t::_handle_short_opt(int argc, wchar_t **argv) {
             // ARGV-elt as argument.
             woptarg = argv[woptind++];
         }
-        nextchar = NULL;
+        nextchar = nullptr;
     }
 
     return c;
@@ -290,7 +290,7 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
     }
 
     nextchar += std::wcslen(nextchar);
-    if (longind != NULL) *longind = option_index;
+    if (longind != nullptr) *longind = option_index;
     if (pfound->flag) {
         *(pfound->flag) = pfound->val;
         *retval = 0;
@@ -303,7 +303,7 @@ void wgetopter_t::_update_long_opt(int argc, wchar_t **argv, const struct woptio
 const struct woption *wgetopter_t::_find_matching_long_opt(const struct woption *longopts,
                                                            wchar_t *nameend, int *exact, int *ambig,
                                                            int *indfound) {
-    const struct woption *pfound = NULL;
+    const struct woption *pfound = nullptr;
     int option_index = 0;
 
     // Test all long options for either exact match or abbreviated matches.
@@ -316,7 +316,7 @@ const struct woption *wgetopter_t::_find_matching_long_opt(const struct woption
                 *indfound = option_index;
                 *exact = 1;
                 break;
-            } else if (pfound == NULL) {
+            } else if (pfound == nullptr) {
                 // First nonexact match found.
                 pfound = p;
                 *indfound = option_index;
@@ -361,7 +361,7 @@ bool wgetopter_t::_handle_long_opt(int argc, wchar_t **argv, const struct woptio
     // Can't find it as a long option.  If this is not getopt_long_only, or the option starts
     // with '--' or is not a valid short option, then it's an error. Otherwise interpret it as a
     // short option.
-    if (!long_only || argv[woptind][1] == '-' || std::wcschr(shortopts, *nextchar) == NULL) {
+    if (!long_only || argv[woptind][1] == '-' || std::wcschr(shortopts, *nextchar) == nullptr) {
         if (wopterr) {
             if (argv[woptind][1] == '-')  // --option
                 std::fwprintf(stderr, _(L"%ls: Unrecognized option '--%ls'\n"), argv[0], nextchar);
@@ -422,9 +422,9 @@ bool wgetopter_t::_handle_long_opt(int argc, wchar_t **argv, const struct woptio
 int wgetopter_t::_wgetopt_internal(int argc, wchar_t **argv, const wchar_t *optstring,
                                    const struct woption *longopts, int *longind, int long_only) {
     if (!initialized) _wgetopt_initialize(optstring);
-    woptarg = NULL;
+    woptarg = nullptr;
 
-    if (nextchar == NULL || *nextchar == '\0') {
+    if (nextchar == nullptr || *nextchar == '\0') {
         int retval = _advance_to_next_argv(argc, argv, longopts);
         if (retval != 0) return retval;
     }
@@ -442,7 +442,7 @@ int wgetopter_t::_wgetopt_internal(int argc, wchar_t **argv, const wchar_t *opts
     // "u".
     //
     // This distinction seems to be the most useful approach.
-    if (longopts != NULL &&
+    if (longopts != nullptr &&
         (argv[woptind][1] == '-' ||
          (long_only && (argv[woptind][2] || !std::wcschr(shortopts, argv[woptind][1]))))) {
         int retval;
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index c38ea25a0..da31fcd0c 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -62,7 +62,7 @@ static size_t wildcard_find(const wchar_t *wc) {
 
 /// Implementation of wildcard_has. Needs to take the length to handle embedded nulls (issue #1631).
 static bool wildcard_has_impl(const wchar_t *str, size_t len, bool internal) {
-    assert(str != NULL);
+    assert(str != nullptr);
     bool qmark_is_wild = !feature_test(features_t::qmark_noglob);
     const wchar_t *end = str + len;
     if (internal) {
@@ -82,7 +82,7 @@ static bool wildcard_has_impl(const wchar_t *str, size_t len, bool internal) {
 }
 
 bool wildcard_has(const wchar_t *str, bool internal) {
-    assert(str != NULL);
+    assert(str != nullptr);
     return wildcard_has_impl(str, std::wcslen(str), internal);
 }
 
@@ -183,7 +183,7 @@ struct wc_complete_pack_t {
 
 // Weirdly specific and non-reusable helper function that makes its one call site much clearer.
 static bool has_prefix_match(const std::vector<completion_t> *comps, size_t first) {
-    if (comps != NULL) {
+    if (comps != nullptr) {
         const size_t after_count = comps->size();
         for (size_t j = first; j < after_count; j++) {
             if (comps->at(j).match.type <= fuzzy_match_prefix) {
@@ -202,8 +202,8 @@ static bool has_prefix_match(const std::vector<completion_t> *comps, size_t firs
 static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
                                        const wc_complete_pack_t &params, complete_flags_t flags,
                                        std::vector<completion_t> *out, bool is_first_call = false) {
-    assert(str != NULL);
-    assert(wc != NULL);
+    assert(str != nullptr);
+    assert(wc != nullptr);
 
     // Maybe early out for hidden files. We require that the wildcard match these exactly (i.e. a
     // dot); ANY_STRING not allowed.
@@ -226,7 +226,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
             match_acceptable = match_type_shares_prefix(match.type);
         }
 
-        if (!match_acceptable || out == NULL) {
+        if (!match_acceptable || out == nullptr) {
             return match_acceptable;
         }
 
@@ -291,7 +291,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
 
                     // If out is NULL, we don't care about the actual matches. If out is not
                     // NULL but we have a prefix match, stop there.
-                    if (out == NULL || has_prefix_match(out, before_count)) {
+                    if (out == nullptr || has_prefix_match(out, before_count)) {
                         break;
                     }
                 }
@@ -316,7 +316,7 @@ bool wildcard_complete(const wcstring &str, const wchar_t *wc,
                        std::vector<completion_t> *out, expand_flags_t expand_flags,
                        complete_flags_t flags) {
     // Note out may be NULL.
-    assert(wc != NULL);
+    assert(wc != nullptr);
     wc_complete_pack_t params(str, desc_func, expand_flags);
     return wildcard_complete_internal(str.c_str(), wc, params, flags, out, true /* first call */);
 }
@@ -390,7 +390,7 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
                                               const wchar_t *wc, expand_flags_t expand_flags,
                                               std::vector<completion_t> *out) {
     // Check if it will match before stat().
-    if (!wildcard_complete(filename, wc, {}, NULL, expand_flags, 0)) {
+    if (!wildcard_complete(filename, wc, {}, nullptr, expand_flags, 0)) {
         return false;
     }
 
@@ -634,7 +634,7 @@ class wildcard_expander_t {
           did_interrupt(false),
           did_add(false),
           has_fuzzy_ancestor(false) {
-        assert(resolved_completions != NULL);
+        assert(resolved_completions != nullptr);
 
         // Insert initial completions into our set to avoid duplicates.
         for (std::vector<completion_t>::const_iterator iter = resolved_completions->begin();
@@ -813,7 +813,7 @@ void wildcard_expander_t::expand_last_segment(const wcstring &base_dir, DIR *bas
 //    expansions
 void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
                                  const wcstring &effective_prefix) {
-    assert(wc != NULL);
+    assert(wc != nullptr);
 
     if (interrupted()) {
         return;
@@ -822,12 +822,12 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
     // Get the current segment and compute interesting properties about it.
     const size_t wc_len = std::wcslen(wc);
     const wchar_t *const next_slash = std::wcschr(wc, L'/');
-    const bool is_last_segment = (next_slash == NULL);
+    const bool is_last_segment = (next_slash == nullptr);
     const size_t wc_segment_len = next_slash ? next_slash - wc : wc_len;
     const wcstring wc_segment = wcstring(wc, wc_segment_len);
     const bool segment_has_wildcards =
         wildcard_has(wc_segment, true /* internal, i.e. look for ANY_CHAR instead of ? */);
-    const wchar_t *const wc_remainder = next_slash ? next_slash + 1 : NULL;
+    const wchar_t *const wc_remainder = next_slash ? next_slash + 1 : nullptr;
 
     if (wc_segment.empty()) {
         // Handle empty segment.
@@ -841,7 +841,7 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
     } else if (!segment_has_wildcards && !is_last_segment) {
         // Literal intermediate match. Note that we may not be able to actually read the directory
         // (issue #2099).
-        assert(next_slash != NULL);
+        assert(next_slash != nullptr);
 
         // Absolute path of the intermediate directory
         const wcstring intermediate_dirpath = base_dir + wc_segment + L'/';
@@ -859,7 +859,7 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
             waccess(intermediate_dirpath, F_OK) != 0) {
             assert(this->flags & expand_flag::for_completions);
             DIR *base_dir_fd = open_dir(base_dir);
-            if (base_dir_fd != NULL) {
+            if (base_dir_fd != nullptr) {
                 this->expand_literal_intermediate_segment_with_fuzz(
                     base_dir, base_dir_fd, wc_segment, wc_remainder, effective_prefix);
                 closedir(base_dir_fd);
@@ -874,7 +874,7 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
                 this->expand_last_segment(base_dir, dir, wc_segment, effective_prefix);
             } else {
                 // Not the last segment, nonempty wildcard.
-                assert(next_slash != NULL);
+                assert(next_slash != nullptr);
                 this->expand_intermediate_segment(base_dir, dir, wc_segment, wc_remainder,
                                                   effective_prefix + wc_segment + L'/');
             }
@@ -901,7 +901,7 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
 
 int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory,
                            expand_flags_t flags, std::vector<completion_t> *output) {
-    assert(output != NULL);
+    assert(output != nullptr);
     // Fuzzy matching only if we're doing completions.
     assert(flags.get(expand_flag::for_completions) || !flags.get(expand_flag::fuzzy_match));
 
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 52a0f6ffb..330ccb70b 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -102,7 +102,7 @@ bool wreaddir(DIR *dir, wcstring &out_name) {
 }
 
 bool wreaddir_for_dirs(DIR *dir, wcstring *out_name) {
-    struct dirent *result = NULL;
+    struct dirent *result = nullptr;
     while (!result) {
         result = readdir(dir);
         if (!result) break;
@@ -162,7 +162,7 @@ FILE *wfopen(const wcstring &path, const char *mode) {
         }
         default: {
             errno = EINVAL;
-            return NULL;
+            return nullptr;
         }
     }
     // Skip binary.
@@ -172,9 +172,9 @@ FILE *wfopen(const wcstring &path, const char *mode) {
     if (mode[idx] == '+') permissions = O_RDWR;
 
     int fd = wopen_cloexec(path, permissions | options, 0666);
-    if (fd < 0) return NULL;
+    if (fd < 0) return nullptr;
     FILE *result = fdopen(fd, mode);
-    if (result == NULL) close(fd);
+    if (result == nullptr) close(fd);
     return result;
 }
 
@@ -337,7 +337,7 @@ const char *safe_strerror(int err) {
     return std::strerror(err);
 #elif defined(HAVE__SYS__ERRS) || defined(HAVE_SYS_ERRLIST)
 #ifdef HAVE_SYS_ERRLIST
-    if (err >= 0 && err < sys_nerr && sys_errlist[err] != NULL) {
+    if (err >= 0 && err < sys_nerr && sys_errlist[err] != nullptr) {
         return sys_errlist[err];
     }
 #elif defined(HAVE__SYS__ERRS)
@@ -618,7 +618,7 @@ int fish_wcswidth(const wchar_t *str) { return fish_wcswidth(str, std::wcslen(st
 int fish_wcswidth(const wcstring &str) { return fish_wcswidth(str.c_str(), str.size()); }
 
 locale_t fish_c_locale() {
-    static const locale_t loc = newlocale(LC_ALL_MASK, "C", NULL);
+    static const locale_t loc = newlocale(LC_ALL_MASK, "C", nullptr);
     return loc;
 }
 
diff --git a/src/wutil.h b/src/wutil.h
index ca261f63a..0363e4f13 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -142,10 +142,11 @@ int fish_wcswidth(const wcstring &str);
 // returns an immortal locale_t corresponding to the C locale.
 locale_t fish_c_locale();
 
-int fish_wcstoi(const wchar_t *str, const wchar_t **endptr = NULL, int base = 10);
-long fish_wcstol(const wchar_t *str, const wchar_t **endptr = NULL, int base = 10);
-long long fish_wcstoll(const wchar_t *str, const wchar_t **endptr = NULL, int base = 10);
-unsigned long long fish_wcstoull(const wchar_t *str, const wchar_t **endptr = NULL, int base = 10);
+int fish_wcstoi(const wchar_t *str, const wchar_t **endptr = nullptr, int base = 10);
+long fish_wcstol(const wchar_t *str, const wchar_t **endptr = nullptr, int base = 10);
+long long fish_wcstoll(const wchar_t *str, const wchar_t **endptr = nullptr, int base = 10);
+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);
 
 /// Class for representing a file's inode. We use this to detect and avoid symlink loops, among

From 586ac3dfa7ddde84741772e76551dcdb1fbff75c Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 19 Nov 2019 13:46:47 -0800
Subject: [PATCH 1257/1732] [clang-tidy] Convert loops to range based

Found with modernize-loop-convert

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.cpp              |  8 ++++----
 src/builtin_argparse.cpp     |  4 ++--
 src/builtin_bind.cpp         |  7 +++----
 src/builtin_builtin.cpp      |  4 ++--
 src/builtin_command.cpp      |  2 +-
 src/builtin_complete.cpp     | 17 ++++++-----------
 src/builtin_functions.cpp    |  8 ++++----
 src/builtin_read.cpp         |  4 ++--
 src/builtin_set.cpp          |  3 +--
 src/builtin_set_color.cpp    |  2 +-
 src/builtin_string.cpp       |  4 ++--
 src/builtin_test.cpp         |  4 ++--
 src/common.cpp               |  3 +--
 src/complete.cpp             |  4 ++--
 src/env_universal_common.cpp |  4 ++--
 src/event.cpp                |  4 ++--
 src/expand.cpp               | 31 +++++++++++++++----------------
 src/fish.cpp                 |  4 ++--
 src/fish_key_reader.cpp      |  4 ++--
 src/highlight.cpp            | 11 +++--------
 src/history.cpp              |  2 +-
 src/input.cpp                |  3 +--
 src/output.cpp               |  3 +--
 src/pager.cpp                | 12 +++++-------
 src/reader.cpp               | 16 ++++++++--------
 src/screen.cpp               | 17 ++++++++---------
 src/wildcard.cpp             |  5 ++---
 27 files changed, 85 insertions(+), 105 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index f01c0a4dc..d888eff51 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -464,8 +464,8 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
 wcstring_list_t builtin_get_names() {
     wcstring_list_t result;
     result.reserve(BUILTIN_COUNT);
-    for (size_t i = 0; i < BUILTIN_COUNT; i++) {
-        result.push_back(builtin_datas[i].name);
+    for (const auto &builtin_data : builtin_datas) {
+        result.push_back(builtin_data.name);
     }
     return result;
 }
@@ -474,8 +474,8 @@ wcstring_list_t builtin_get_names() {
 void builtin_get_names(std::vector<completion_t> *list) {
     assert(list != nullptr);
     list->reserve(list->size() + BUILTIN_COUNT);
-    for (size_t i = 0; i < BUILTIN_COUNT; i++) {
-        append_completion(list, builtin_datas[i].name);
+    for (const auto &builtin_data : builtin_datas) {
+        append_completion(list, builtin_data.name);
     }
 }
 
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index c99ee7128..befb98722 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -671,8 +671,8 @@ static void set_argparse_result_vars(env_stack_t &vars, const argparse_cmd_opts_
             // We do a simple replacement of all non alphanum chars rather than calling
             // escape_string(long_flag, 0, STRING_STYLE_VAR).
             wcstring long_flag = opt_spec->long_flag;
-            for (size_t pos = 0; pos < long_flag.size(); pos++) {
-                if (!iswalnum(long_flag[pos])) long_flag[pos] = L'_';
+            for (auto &pos : long_flag) {
+                if (!iswalnum(pos)) pos = L'_';
             }
             vars.set(var_name_prefix + long_flag, ENV_LOCAL, opt_spec->vals);
         }
diff --git a/src/builtin_bind.cpp b/src/builtin_bind.cpp
index e4b715d91..419688229 100644
--- a/src/builtin_bind.cpp
+++ b/src/builtin_bind.cpp
@@ -89,8 +89,7 @@ bool builtin_bind_t::list_one(const wcstring &seq, const wcstring &bind_mode, bo
     }
 
     // Now show the list of commands.
-    for (size_t i = 0; i < ecmds.size(); i++) {
-        const wcstring &ecmd = ecmds.at(i);
+    for (const auto &ecmd : ecmds) {
         const wcstring escaped_ecmd = escape_string(ecmd, ESCAPE_ALL);
         streams.out.push_back(' ');
         streams.out.append(escaped_ecmd);
@@ -143,8 +142,8 @@ void builtin_bind_t::key_names(bool all, io_streams_t &streams) {
 void builtin_bind_t::function_names(io_streams_t &streams) {
     wcstring_list_t names = input_function_get_names();
 
-    for (size_t i = 0; i < names.size(); i++) {
-        const wchar_t *seq = names.at(i).c_str();
+    for (const auto &name : names) {
+        auto seq = name.c_str();
         streams.out.append_format(L"%ls\n", seq);
     }
 }
diff --git a/src/builtin_builtin.cpp b/src/builtin_builtin.cpp
index eca1b4bd2..f04a9c32f 100644
--- a/src/builtin_builtin.cpp
+++ b/src/builtin_builtin.cpp
@@ -102,8 +102,8 @@ int builtin_builtin(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         wcstring_list_t names = builtin_get_names();
         std::sort(names.begin(), names.end());
 
-        for (size_t i = 0; i < names.size(); i++) {
-            const wchar_t *el = names.at(i).c_str();
+        for (const auto &name : names) {
+            auto el = name.c_str();
 
             streams.out.append(el);
             streams.out.append(L"\n");
diff --git a/src/builtin_command.cpp b/src/builtin_command.cpp
index 91cad034d..d63bdbefa 100644
--- a/src/builtin_command.cpp
+++ b/src/builtin_command.cpp
@@ -99,7 +99,7 @@ int builtin_command(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         const wchar_t *command_name = argv[idx];
         if (opts.all_paths) {
             wcstring_list_t paths = path_get_paths(command_name, parser.vars());
-            for (auto path : paths) {
+            for (const auto &path : paths) {
                 if (!opts.quiet) streams.out.append_format(L"%ls\n", path.c_str());
                 ++found;
             }
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 28fb3d4f6..cbcd7f96a 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -291,10 +291,9 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                      false /* do not accept incomplete */)) {
             streams.err.append_format(L"%ls: Condition '%ls' contained a syntax error", cmd,
                                       condition);
-            for (size_t i = 0; i < errors.size(); i++) {
+            for (const auto &error : errors) {
                 streams.err.append_format(L"\n%ls: ", cmd);
-                streams.err.append(
-                    errors.at(i).describe(condition_string, parser.is_interactive()));
+                streams.err.append(error.describe(condition_string, parser.is_interactive()));
             }
             return STATUS_CMD_ERROR;
         }
@@ -351,9 +350,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
                      parser.shared());
 
-            for (size_t i = 0; i < comp.size(); i++) {
-                const completion_t &next = comp.at(i);
-
+            for (const auto &next : comp) {
                 // Make a fake commandline, and then apply the completion to it.
                 const wcstring faux_cmdline = token;
                 size_t tmp_cursor = faux_cmdline.size();
@@ -414,11 +411,9 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         // Handle wrap targets (probably empty). We only wrap commands, not paths.
-        for (size_t w = 0; w < wrap_targets.size(); w++) {
-            const wcstring &wrap_target = wrap_targets.at(w);
-            for (size_t i = 0; i < cmd_to_complete.size(); i++) {
-                (remove ? complete_remove_wrapper : complete_add_wrapper)(cmd_to_complete.at(i),
-                                                                          wrap_target);
+        for (const auto &wrap_target : wrap_targets) {
+            for (const auto &i : cmd_to_complete) {
+                (remove ? complete_remove_wrapper : complete_add_wrapper)(i, wrap_target);
             }
         }
     }
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 04d684871..e901e15fe 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -368,14 +368,14 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         bool is_screen = !streams.out_is_redirected && isatty(STDOUT_FILENO);
         if (is_screen) {
             wcstring buff;
-            for (size_t i = 0; i < names.size(); i++) {
-                buff.append(names.at(i));
+            for (const auto &name : names) {
+                buff.append(name);
                 buff.append(L", ");
             }
             streams.out.append(reformat_for_screen(buff));
         } else {
-            for (size_t i = 0; i < names.size(); i++) {
-                streams.out.append(names.at(i).c_str());
+            for (const auto &name : names) {
+                streams.out.append(name.c_str());
                 streams.out.append(L"\n");
             }
         }
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index d743b3357..763ca26b3 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -516,8 +516,8 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             } else {
                 // Not array mode: assign each char to a separate var with the remainder being
                 // assigned to the last var.
-                for (auto c = chars.begin(); c != chars.end() && vars_left(); ++c) {
-                    vars.set_one(*var_ptr++, opts.place, *c);
+                for (const auto &c : chars) {
+                    vars.set_one(*var_ptr++, opts.place, c);
                 }
             }
         } else if (opts.array) {
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 1798d2fc3..a179da5da 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -476,8 +476,7 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
     wcstring_list_t names = parser.vars().get_names(compute_scope(opts));
     sort(names.begin(), names.end());
 
-    for (size_t i = 0; i < names.size(); i++) {
-        const wcstring key = names.at(i);
+    for (const auto &key : names) {
         const wcstring e_key = escape_string(key, 0);
         streams.out.append(e_key);
 
diff --git a/src/builtin_set_color.cpp b/src/builtin_set_color.cpp
index 78788928c..a2fcd3ed1 100644
--- a/src/builtin_set_color.cpp
+++ b/src/builtin_set_color.cpp
@@ -36,7 +36,7 @@ class parser_t;
 static void print_colors(io_streams_t &streams) {
     outputter_t outp;
 
-    for (wcstring color_name : rgb_color_t::named_color_names()) {
+    for (const auto &color_name : rgb_color_t::named_color_names()) {
         if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
             rgb_color_t color = rgb_color_t(color_name);
             outp.set_color(color, rgb_color_t::none());
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 9b2453305..46944e1e4 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1100,8 +1100,8 @@ static int string_split_maybe0(parser_t &parser, io_streams_t &streams, int argc
 
     // If we are from the right, split_about gave us reversed strings, in reversed order!
     if (opts.right) {
-        for (size_t j = 0; j < splits.size(); j++) {
-            std::reverse(splits[j].begin(), splits[j].end());
+        for (auto &split : splits) {
+            std::reverse(split.begin(), split.end());
         }
         std::reverse(splits.begin(), splits.end());
     }
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 52d552a28..a3c9b640d 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -864,8 +864,8 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     bool result = expr->evaluate(eval_errors);
     if (!eval_errors.empty()) {
         if (!should_suppress_stderr_for_tests()) {
-            for (size_t i = 0; i < eval_errors.size(); i++) {
-                streams.err.append_format(L"%ls\n", eval_errors.at(i).c_str());
+            for (const auto &eval_error : eval_errors) {
+                streams.err.append_format(L"%ls\n", eval_error.c_str());
             }
             // Add a backtrace but not the "see help" message
             // because this isn't about passing the wrong options.
diff --git a/src/common.cpp b/src/common.cpp
index 9fa1b5586..ef6a6a0ea 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -410,8 +410,7 @@ std::string wcs2string(const wcstring &input) {
     mbstate_t state = {};
     char converted[MB_LEN_MAX];
 
-    for (size_t i = 0; i < input.size(); i++) {
-        wchar_t wc = input[i];
+    for (auto wc : input) {
         if (wc == INTERNAL_SEPARATOR) {
             ;  // do nothing
         } else if (wc >= ENCODE_DIRECT_BASE && wc < ENCODE_DIRECT_BASE + 256) {
diff --git a/src/complete.cpp b/src/complete.cpp
index bed7593ac..dfb242619 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -269,8 +269,8 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
                                      completion_request_flags_t flags) {
     // Find the best match type.
     fuzzy_match_type_t best_type = fuzzy_match_none;
-    for (size_t i = 0; i < comps->size(); i++) {
-        best_type = std::min(best_type, comps->at(i).match.type);
+    for (const auto &comp : *comps) {
+        best_type = std::min(best_type, comp.match.type);
     }
     // If the best type is an exact match, reduce it to prefix match. Otherwise a tab completion
     // will only show one match if it matches a file exactly. (see issue #959).
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index d6933c080..5e71a0248 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -1041,8 +1041,8 @@ static wcstring get_machine_identifier() {
     unsigned char mac_addr[MAC_ADDRESS_MAX_LEN] = {};
     if (get_mac_address(mac_addr)) {
         result.reserve(2 * MAC_ADDRESS_MAX_LEN);
-        for (size_t i = 0; i < MAC_ADDRESS_MAX_LEN; i++) {
-            append_format(result, L"%02x", mac_addr[i]);
+        for (auto i : mac_addr) {
+            append_format(result, L"%02x", i);
         }
     } else if (!get_hostname_identifier(result)) {
         result.assign(L"nohost");  // fallback to a dummy value
diff --git a/src/event.cpp b/src/event.cpp
index 69f41a3aa..b78da1f15 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -192,8 +192,8 @@ wcstring event_get_desc(const event_t &evt) {
 #if 0
 static void show_all_handlers(void) {
     std::fwprintf(stdout, L"event handlers:\n");
-    for (event_list_t::const_iterator iter = events.begin(); iter != events.end(); ++iter) {
-        const event_t *foo = *iter;
+    for (const auto& event : events) {
+        auto foo = event;
         wcstring tmp = event_get_desc(foo);
         std::fwprintf(stdout, L"    handler now %ls\n", tmp.c_str());
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index 1f4563337..37583ddb6 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -109,7 +109,7 @@ static void append_cmdsub_error(parse_error_list_t *errors, size_t source_start,
     error.text = vformat_string(fmt, va);
     va_end(va);
 
-    for (auto it : *errors) {
+    for (const auto &it : *errors) {
         if (error.text == it.text) return;
     }
 
@@ -757,8 +757,8 @@ static void unexpand_tildes(const wcstring &input, const environment_t &vars,
     // We only operate on completions that replace their contents. If we don't have any, we're done.
     // In particular, empty vectors are common.
     bool has_candidate_completion = false;
-    for (size_t i = 0; i < completions->size(); i++) {
-        if (completions->at(i).flags & COMPLETE_REPLACES_TOKEN) {
+    for (const auto &completion : *completions) {
+        if (completion.flags & COMPLETE_REPLACES_TOKEN) {
             has_candidate_completion = true;
             break;
         }
@@ -774,8 +774,7 @@ static void unexpand_tildes(const wcstring &input, const environment_t &vars,
     expand_tilde(home, vars);
 
     // Now for each completion that starts with home, replace it with the username_with_tilde.
-    for (size_t i = 0; i < completions->size(); i++) {
-        completion_t &comp = completions->at(i);
+    for (auto &comp : *completions) {
         if ((comp.flags & COMPLETE_REPLACES_TOKEN) &&
             string_prefixes_string(home, comp.completion)) {
             comp.completion.replace(0, home.size(), username_with_tilde);
@@ -817,15 +816,15 @@ static void remove_internal_separator(wcstring *str, bool conv) {
     // If conv is true, replace all instances of ANY_STRING with '*',
     // ANY_STRING_RECURSIVE with '*'.
     if (conv) {
-        for (size_t idx = 0; idx < str->size(); idx++) {
-            switch (str->at(idx)) {
+        for (auto &idx : *str) {
+            switch (idx) {
                 case ANY_CHAR: {
-                    str->at(idx) = L'?';
+                    idx = L'?';
                     break;
                 }
                 case ANY_STRING:
                 case ANY_STRING_RECURSIVE: {
-                    str->at(idx) = L'*';
+                    idx = L'*';
                     break;
                 }
                 default: {
@@ -903,9 +902,9 @@ expand_result_t expander_t::stage_variables(wcstring input, std::vector<completi
     unescape_string(input, &next, UNESCAPE_SPECIAL | UNESCAPE_INCOMPLETE);
 
     if (flags & expand_flag::skip_variables) {
-        for (size_t i = 0; i < next.size(); i++) {
-            if (next.at(i) == VARIABLE_EXPAND) {
-                next[i] = L'$';
+        for (auto &i : next) {
+            if (i == VARIABLE_EXPAND) {
+                i = L'$';
             }
         }
         append_completion(out, std::move(next));
@@ -942,7 +941,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
     const bool skip_wildcards = flags & expand_flag::skip_wildcards;
 
     if (has_wildcard && (flags & expand_flag::executables_only)) {
-        ;  // don't do wildcard expansion for executables, see issue #785
+        // don't do wildcard expansion for executables, see issue #785
     } else if ((for_completions && !skip_wildcards) || has_wildcard) {
         // We either have a wildcard, or we don't have a wildcard but we're doing completion
         // expansion (so we want to get the completion of a file path). Note that if
@@ -998,9 +997,9 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
 
         result = expand_result_t::wildcard_no_match;
         std::vector<completion_t> expanded;
-        for (size_t wd_idx = 0; wd_idx < effective_working_dirs.size(); wd_idx++) {
-            int local_wc_res = wildcard_expand_string(
-                path_to_expand, effective_working_dirs.at(wd_idx), flags, &expanded);
+        for (const auto &effective_working_dir : effective_working_dirs) {
+            int local_wc_res =
+                wildcard_expand_string(path_to_expand, effective_working_dir, flags, &expanded);
             if (local_wc_res > 0) {
                 // Something matched,so overall we matched.
                 result = expand_result_t::wildcard_match;
diff --git a/src/fish.cpp b/src/fish.cpp
index 2a2fc964c..068358a77 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -252,8 +252,8 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
     int res = 1;
     parser_t &parser = parser_t::principal_parser();
 
-    for (size_t i = 0; i < cmds->size(); i++) {
-        const wcstring cmd_wcs = str2wcstring(cmds->at(i));
+    for (const auto &cmd : *cmds) {
+        const wcstring cmd_wcs = str2wcstring(cmd);
         res = parser.eval(cmd_wcs, io, TOP);
     }
 
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 18d33a940..2f127a81b 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -163,8 +163,8 @@ static void add_char_to_bind_command(wchar_t wc, std::vector<wchar_t> &bind_char
 static void output_bind_command(std::vector<wchar_t> &bind_chars) {
     if (!bind_chars.empty()) {
         std::fputws(L"bind ", stdout);
-        for (size_t i = 0; i < bind_chars.size(); i++) {
-            std::fputws(char_to_symbol(bind_chars[i], true), stdout);
+        for (auto bind_char : bind_chars) {
+            std::fputws(char_to_symbol(bind_char, true), stdout);
         }
         std::fputws(L" 'do something'\n", stdout);
         bind_chars.clear();
diff --git a/src/highlight.cpp b/src/highlight.cpp
index c9375fb28..3f354f090 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -215,8 +215,7 @@ bool is_potential_path(const wcstring &potential_path_fragment, const wcstring_l
 
     // debug( 1, L"%ls -> %ls ->%ls", path, tilde, unescaped );
 
-    for (size_t i = 0; i < path_with_magic.size(); i++) {
-        wchar_t c = path_with_magic.at(i);
+    for (auto c : path_with_magic) {
         switch (c) {
             case PROCESS_EXPAND_SELF:
             case VARIABLE_EXPAND:
@@ -385,8 +384,7 @@ rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_backg
 
 static bool has_expand_reserved(const wcstring &str) {
     bool result = false;
-    for (size_t i = 0; i < str.size(); i++) {
-        wchar_t wc = str.at(i);
+    for (auto wc : str) {
         if (wc >= EXPAND_RESERVED_BASE && wc <= EXPAND_RESERVED_END) {
             result = true;
             break;
@@ -1290,10 +1288,7 @@ highlighter_t::color_array_t highlighter_t::highlight() {
     }
 
     // If the cursor is over an argument, and that argument is a valid path, underline it.
-    for (parse_node_tree_t::const_iterator iter = parse_tree.begin(); iter != parse_tree.end();
-         ++iter) {
-        const parse_node_t &node = *iter;
-
+    for (const auto &node : parse_tree) {
         // Must be an argument with source.
         if (node.type != symbol_argument || !node.has_source()) continue;
 
diff --git a/src/history.cpp b/src/history.cpp
index 911d0d577..c4dd8a02c 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -709,7 +709,7 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
     int err = 0;
     std::string buffer;
     buffer.reserve(HISTORY_OUTPUT_BUFFER_SIZE + 128);
-    for (const auto &key_item : lru) {
+    for (const auto key_item : lru) {
         append_history_item_to_buffer(key_item.second, &buffer);
         err = flush_to_fd(&buffer, dst_fd, HISTORY_OUTPUT_BUFFER_SIZE);
         if (err) break;
diff --git a/src/input.cpp b/src/input.cpp
index c98600cff..404cbce71 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -543,8 +543,7 @@ std::vector<input_mapping_name_t> input_mapping_set_t::get_names(bool user) cons
     std::vector<input_mapping_name_t> result;
     result.reserve(local_list.size());
 
-    for (size_t i = 0; i < local_list.size(); i++) {
-        const input_mapping_t &m = local_list.at(i);
+    for (const auto &m : local_list) {
         result.push_back((input_mapping_name_t){m.seq, m.mode});
     }
     return result;
diff --git a/src/output.cpp b/src/output.cpp
index 75aa8bb43..69ce26297 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -435,8 +435,7 @@ rgb_color_t best_color(const std::vector<rgb_color_t> &candidates, color_support
     }
 
     rgb_color_t first_rgb = rgb_color_t::none(), first_named = rgb_color_t::none();
-    for (size_t i = 0; i < candidates.size(); i++) {
-        const rgb_color_t &color = candidates.at(i);
+    for (const auto &color : candidates) {
         if (first_rgb.is_none() && color.is_rgb()) {
             first_rgb = color;
         }
diff --git a/src/pager.cpp b/src/pager.cpp
index d36a908e6..51e96df39 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -324,8 +324,8 @@ static comp_info_list_t process_completions_into_infos(const completion_list_t &
 
 void pager_t::measure_completion_infos(comp_info_list_t *infos, const wcstring &prefix) const {
     size_t prefix_len = fish_wcswidth(prefix);
-    for (size_t i = 0; i < infos->size(); i++) {
-        comp_t *comp = &infos->at(i);
+    for (auto &info : *infos) {
+        comp_t *comp = &info;
         const wcstring_list_t &comp_strings = comp->comp;
 
         for (size_t j = 0; j < comp_strings.size(); j++) {
@@ -359,9 +359,8 @@ bool pager_t::completion_info_passes_filter(const comp_t &info) const {
     }
 
     // Match against the completion strings.
-    for (size_t i = 0; i < info.comp.size(); i++) {
-        if (string_fuzzy_match_string(needle, prefix + info.comp.at(i), limit).type !=
-            fuzzy_match_none) {
+    for (const auto &i : info.comp) {
+        if (string_fuzzy_match_string(needle, prefix + i, limit).type != fuzzy_match_none) {
             return true;
         }
     }
@@ -372,8 +371,7 @@ bool pager_t::completion_info_passes_filter(const comp_t &info) const {
 // Update completion_infos from unfiltered_completion_infos, to reflect the filter.
 void pager_t::refilter_completions() {
     this->completion_infos.clear();
-    for (size_t i = 0; i < this->unfiltered_completion_infos.size(); i++) {
-        const comp_t &info = this->unfiltered_completion_infos.at(i);
+    for (const auto &info : this->unfiltered_completion_infos) {
         if (this->completion_info_passes_filter(info)) {
             this->completion_infos.push_back(info);
         }
diff --git a/src/reader.cpp b/src/reader.cpp
index 4b4157eec..ebfe0c1ba 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -877,8 +877,8 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
     if (exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */) != -1 &&
         !lst.empty()) {
         std::fputws(L"\x1B]0;", stdout);
-        for (size_t i = 0; i < lst.size(); i++) {
-            std::fputws(lst.at(i).c_str(), stdout);
+        for (const auto &i : lst) {
+            std::fputws(i.c_str(), stdout);
         }
         ignore_result(write(STDOUT_FILENO, "\a", 1));
     }
@@ -897,8 +897,8 @@ void reader_data_t::exec_mode_prompt() {
         exec_subshell(MODE_PROMPT_FUNCTION_NAME, parser(), mode_indicator_list, false);
         // We do not support multiple lines in the mode indicator, so just concatenate all of
         // them.
-        for (size_t i = 0; i < mode_indicator_list.size(); i++) {
-            mode_prompt_buff += mode_indicator_list.at(i);
+        for (const auto &i : mode_indicator_list) {
+            mode_prompt_buff += i;
         }
     }
 }
@@ -939,9 +939,9 @@ void reader_data_t::exec_prompt() {
             wcstring_list_t prompt_list;
             // Status is ignored.
             exec_subshell(right_prompt, parser(), prompt_list, apply_exit_status);
-            for (size_t i = 0; i < prompt_list.size(); i++) {
+            for (const auto &i : prompt_list) {
                 // Right prompt does not support multiple lines, so just concatenate all of them.
-                right_prompt_buff += prompt_list.at(i);
+                right_prompt_buff += i;
             }
         }
     }
@@ -1470,8 +1470,8 @@ static bool reader_can_replace(const wcstring &in, int flags) {
 /// Determine the best match type for a set of completions.
 static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &comp) {
     fuzzy_match_type_t best_type = fuzzy_match_none;
-    for (size_t i = 0; i < comp.size(); i++) {
-        best_type = std::min(best_type, comp.at(i).match.type);
+    for (const auto &i : comp) {
+        best_type = std::min(best_type, i.match.type);
     }
     // If the best type is an exact match, reduce it to prefix match. Otherwise a tab completion
     // will only show one match if it matches a file exactly. (see issue #959).
diff --git a/src/screen.cpp b/src/screen.cpp
index d441e88d1..d665e856d 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -201,11 +201,11 @@ static bool is_color_escape_seq(const wchar_t *code, size_t *resulting_length) {
         set_background,
     };
 
-    for (size_t p = 0; p < sizeof esc / sizeof *esc; p++) {
-        if (!esc[p]) continue;
+    for (auto p : esc) {
+        if (!p) continue;
 
         for (int k = 0; k < max_colors; k++) {
-            size_t esc_seq_len = try_sequence(tparm(const_cast<char *>(esc[p]), k), code);
+            size_t esc_seq_len = try_sequence(tparm(const_cast<char *>(p), k), code);
             if (esc_seq_len) {
                 *resulting_length = esc_seq_len;
                 return true;
@@ -227,12 +227,12 @@ static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length)
         exit_shadow_mode,    enter_standout_mode, exit_standout_mode,     enter_secure_mode,
         enter_dim_mode,      enter_blink_mode,    enter_alt_charset_mode, exit_alt_charset_mode};
 
-    for (size_t p = 0; p < sizeof esc2 / sizeof *esc2; p++) {
-        if (!esc2[p]) continue;
+    for (auto p : esc2) {
+        if (!p) continue;
         // Test both padded and unpadded version, just to be safe. Most versions of tparm don't
         // actually seem to do anything these days.
-        size_t esc_seq_len = std::max(try_sequence(tparm(const_cast<char *>(esc2[p])), code),
-                                      try_sequence(esc2[p], code));
+        size_t esc_seq_len =
+            std::max(try_sequence(tparm(const_cast<char *>(p)), code), try_sequence(p, code));
         if (esc_seq_len) {
             *resulting_length = esc_seq_len;
             return true;
@@ -892,8 +892,7 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
     // Get the width of the first line, and if there is more than one line.
     bool multiline = false;
     size_t first_line_width = 0;
-    for (size_t i = 0; i < commandline.size(); i++) {
-        wchar_t c = commandline.at(i);
+    for (auto c : commandline) {
         if (c == L'\n') {
             multiline = true;
             break;
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index da31fcd0c..58b8c00e7 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -637,9 +637,8 @@ class wildcard_expander_t {
         assert(resolved_completions != nullptr);
 
         // Insert initial completions into our set to avoid duplicates.
-        for (std::vector<completion_t>::const_iterator iter = resolved_completions->begin();
-             iter != resolved_completions->end(); ++iter) {
-            this->completion_set.insert(iter->completion);
+        for (const auto &resolved_completion : *resolved_completions) {
+            this->completion_set.insert(resolved_completion.completion);
         }
     }
 

From 69d0bb7c0d81556f4e78370f79233329d1486f00 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 19 Nov 2019 22:17:30 -0800
Subject: [PATCH 1258/1732] io.h: Add missing override

Found with clang's -Winconsistent-missing-destructor-override

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/common.cpp          | 4 ++--
 src/common.h            | 4 ++--
 src/complete.cpp        | 2 +-
 src/env.cpp             | 2 +-
 src/fallback.cpp        | 1 -
 src/fish_key_reader.cpp | 1 -
 src/history.cpp         | 2 +-
 src/io.h                | 4 ++--
 src/parse_tree.cpp      | 2 +-
 src/proc.h              | 2 +-
 src/reader.cpp          | 2 +-
 11 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index ef6a6a0ea..634afe81f 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -412,7 +412,7 @@ std::string wcs2string(const wcstring &input) {
 
     for (auto wc : input) {
         if (wc == INTERNAL_SEPARATOR) {
-            ;  // do nothing
+            // do nothing
         } else if (wc >= ENCODE_DIRECT_BASE && wc < ENCODE_DIRECT_BASE + 256) {
             result.push_back(wc - ENCODE_DIRECT_BASE);
         } else if (MB_CUR_MAX == 1) {  // single-byte locale (C/POSIX/ISO-8859)
@@ -450,7 +450,7 @@ static char *wcs2str_internal(const wchar_t *in, char *out) {
 
     while (in[in_pos]) {
         if (in[in_pos] == INTERNAL_SEPARATOR) {
-            ;  // do nothing
+            // do nothing
         } else if (in[in_pos] >= ENCODE_DIRECT_BASE && in[in_pos] < ENCODE_DIRECT_BASE + 256) {
             out[out_pos++] = in[in_pos] - ENCODE_DIRECT_BASE;
         } else if (MB_CUR_MAX == 1)  // single-byte locale (C/POSIX/ISO-8859)
diff --git a/src/common.h b/src/common.h
index 9a9acf6df..67b788405 100644
--- a/src/common.h
+++ b/src/common.h
@@ -208,12 +208,12 @@ extern const bool has_working_tty_timestamps;
 // `__attribute__((noreturn))` on the exit_without_destructors() function.
 // TODO: we use C++11 [[noreturn]] now, does that change things?
 #define FATAL_EXIT()                                \
-    {                                               \
+    do {                                            \
         char exit_read_buff;                        \
         show_stackframe(L'E');                      \
         ignore_result(read(0, &exit_read_buff, 1)); \
         exit_without_destructors(1);                \
-    }
+    } while (0)
 
 /// Exit the program at once after emitting an error message and stack trace if possible.
 /// We use our own private implementation of `assert()` for two reasons. First, some implementations
diff --git a/src/complete.cpp b/src/complete.cpp
index dfb242619..f6429faa8 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1483,7 +1483,7 @@ void completer_t::perform() {
                                               }) != std::end(prefix_cmds);
             if (!is_subcommand) break;
             tokens.erase(tokens.begin());
-        };
+        }
     }
     // Empty process (cursor is after one of ;, &, |, \n, &&, || modulo whitespace).
     if (tokens.empty()) {
diff --git a/src/env.cpp b/src/env.cpp
index 7cfe7c0bb..831c42c4a 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -506,7 +506,7 @@ class env_scoped_impl_t : public environment_t {
 
     std::shared_ptr<environment_t> snapshot() const;
 
-    virtual ~env_scoped_impl_t() = default;
+    ~env_scoped_impl_t() override = default;
 
     std::shared_ptr<const null_terminated_array_t<char>> export_array();
 
diff --git a/src/fallback.cpp b/src/fallback.cpp
index c612625a4..d52e0ec7c 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -221,7 +221,6 @@ int futimes(int fd, const struct timeval *times) {
 #if HAVE_GETTEXT
 char *fish_gettext(const char *msgid) {
     return gettext(msgid);
-    ;
 }
 
 char *fish_bindtextdomain(const char *domainname, const char *dirname) {
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 2f127a81b..ef556df71 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -91,7 +91,6 @@ static maybe_t<wcstring> sequence_name(wchar_t wc) {
         }
     }
     return none();
-    ;
 }
 
 /// Return true if the character must be escaped when used in the sequence of chars to be bound in
diff --git a/src/history.cpp b/src/history.cpp
index c4dd8a02c..faa9fb860 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1202,7 +1202,7 @@ wcstring history_session_id(const environment_t &vars) {
         if (session_id.empty()) {
             result.clear();
         } else if (session_id == L"default") {
-            ;  // using the default value
+            // using the default value
         } else if (valid_var_name(session_id)) {
             result = session_id;
         } else {
diff --git a/src/io.h b/src/io.h
index 0e01b1282..2c9c79deb 100644
--- a/src/io.h
+++ b/src/io.h
@@ -219,7 +219,7 @@ class io_pipe_t : public io_data_t {
     io_pipe_t(int fd, bool is_input, autoclose_fd_t pipe_fd)
         : io_data_t(io_mode_t::pipe, fd), pipe_fd_(std::move(pipe_fd)), is_input_(is_input) {}
 
-    ~io_pipe_t();
+    ~io_pipe_t() override;
 
     int pipe_fd() const { return pipe_fd_.fd(); }
 };
@@ -246,7 +246,7 @@ class io_bufferfill_t : public io_data_t {
           write_fd_(std::move(write_fd)),
           buffer_(std::move(buffer)) {}
 
-    ~io_bufferfill_t();
+    ~io_bufferfill_t() override;
 
     std::shared_ptr<io_buffer_t> buffer() const { return buffer_; }
 
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index ef2747c76..4454fbc74 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -857,7 +857,7 @@ bool parse_ll_t::top_node_handle_terminal_types(const parse_token_t &token) {
         } else if (stack_top.keyword == parse_keyword_end &&
                    token.type == parse_token_type_terminate &&
                    this->report_error_for_unclosed_block()) {
-            ;  // handled by report_error_for_unclosed_block
+            // handled by report_error_for_unclosed_block
         } else {
             const wcstring expected = stack_top.user_presentable_description();
             this->parse_error_unexpected_token(expected.c_str(), token);
diff --git a/src/proc.h b/src/proc.h
index 6a627b26c..9b5ae8226 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -420,7 +420,7 @@ class job_t {
     /// The job is OK to be externally visible, e.g. to the user via `jobs`
     bool is_visible() const {
         return !is_completed() && is_constructed() && !flags().disown_requested;
-    };
+    }
     bool skip_notification() const { return properties.skip_notification; }
     bool from_event_handler() const { return properties.from_event_handler; }
 
diff --git a/src/reader.cpp b/src/reader.cpp
index ebfe0c1ba..8a2ffb2ef 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2082,7 +2082,7 @@ void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bo
     const wcstring &cmd = el->text, &suggest = autosuggestion;
     if (can_autosuggest() && !suggest.empty() &&
         string_prefixes_string_case_insensitive(cmd, suggest)) {
-        ;  // the autosuggestion is still reasonable, so do nothing
+        // the autosuggestion is still reasonable, so do nothing
     } else {
         update_autosuggestion();
     }

From 1102b83b2d5bdf7018705c8a882edf6d3f133149 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 20 Nov 2019 17:49:19 -0800
Subject: [PATCH 1259/1732] builtin_printf: Use proper functions

Removes unnecessary type conversions.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_printf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index e8a208b12..a50b05321 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -288,13 +288,13 @@ uintmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
 
 template <>
 long double raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
-    double val = std::wcstod(s, end);
+    auto val = std::wcstold(s, end);
     if (**end == L'\0') return val;
     // The conversion using the user's locale failed. That may be due to the string not being a
     // valid floating point value. It could also be due to the locale using different separator
     // characters than the normal english convention. So try again by forcing the use of a locale
     // that employs the english convention for writing floating point numbers.
-    return wcstod_l(s, end, fish_c_locale());
+    return wcstold_l(s, end, fish_c_locale());
 }
 
 template <typename T>

From 267b8da935b9379b78d2ca4ffccccee6b46eb903 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Nov 2019 15:52:30 -0800
Subject: [PATCH 1260/1732] Remove dead function reconstruct_orig_str

This function is no longer called.
---
 src/parse_execution.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 3ecffee42..0efa83ea7 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -682,31 +682,6 @@ parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_er
     return parse_execution_errored;
 }
 
-// Given a command string that might contain fish special tokens return a string without those
-// tokens.
-//
-// TODO(krader1961): Figure out what VARIABLE_EXPAND means in this context. After looking at the
-// code and doing various tests I couldn't figure out why that token would be present when this
-// code is run. I was therefore unable to determine how to substitute its presence in the error
-// message.
-static wcstring reconstruct_orig_str(wcstring tokenized_str) {
-    wcstring orig_str = tokenized_str;
-
-    if (tokenized_str.find(VARIABLE_EXPAND_SINGLE) != std::string::npos) {
-        // Variable was quoted to force expansion of multiple elements into a single element.
-        //
-        // The following isn't entirely correct. For example, $abc"$def" will become "$abc$def".
-        // However, anyone writing the former is asking for trouble so I don't feel bad about not
-        // accurately reconstructing what they typed.
-        wcstring new_str = wcstring(tokenized_str);
-        std::replace(new_str.begin(), new_str.end(), static_cast<wchar_t>(VARIABLE_EXPAND_SINGLE),
-                     L'$');
-        orig_str = L"\"" + new_str + L"\"";
-    }
-
-    return orig_str;
-}
-
 /// Handle the case of command not found.
 parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     const wcstring &cmd_str, tnode_t<g::plain_statement> statement, int err_code) {

From 48dc9b1e82cecaba3fee9671353569722fae1769 Mon Sep 17 00:00:00 2001
From: 0x005c <52650857+0x005c@users.noreply.github.com>
Date: Sat, 23 Nov 2019 13:30:19 +0900
Subject: [PATCH 1261/1732] Add replace mode in vi-mode

---
 share/functions/fish_default_mode_prompt.fish |  3 +++
 share/functions/fish_vi_key_bindings.fish     | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index 27a9c9f62..afd5e38ca 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -12,6 +12,9 @@ function fish_default_mode_prompt --description "Display the default mode for th
             case replace_one
                 set_color --bold --background green white
                 echo '[R]'
+            case replace
+                set_color --bold --background cyan white
+                echo '[R]'
             case visual
                 set_color --bold --background magenta white
                 echo '[V]'
diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 718205206..12f1cdff9 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -218,6 +218,17 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     bind -s --preset -M replace_one -m default \r 'commandline -f delete-char; commandline -i \n; commandline -f backward-char; commandline -f repaint-mode'
     bind -s --preset -M replace_one -m default \e cancel repaint-mode
 
+    #
+    # Uppercase R, enters replace mode
+    #
+    bind -s --preset -m replace R repaint-mode
+    bind -s --preset -M replace '' delete-char self-insert
+    bind -s --preset -M replace -m insert \r execute repaint-mode
+    bind -s --preset -M replace -m default \e cancel repaint-mode
+    # in vim (and maybe in vi), <BS> deletes the changes
+    # but this binding just move cursor backward, not delete the changes
+    bind -s --preset -M replace -k backspace backward-char
+
     #
     # visual mode
     #
@@ -263,6 +274,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
     # the commenting chars so the command can be further edited then executed.
     bind -s --preset -M default \# __fish_toggle_comment_commandline
     bind -s --preset -M visual \# __fish_toggle_comment_commandline
+    bind -s --preset -M replace \# __fish_toggle_comment_commandline
 
     # Set the cursor shape
     # After executing once, this will have defined functions listening for the variable.

From d11a5088c5deff1204884962144ae5650f21b5e5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Nov 2019 16:42:18 -0800
Subject: [PATCH 1262/1732] Relnote vi replace mode #6342

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baa41e918..2da6185a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - Completion of subcommands to builtins like `and` or `not` has been fixed (#6249).
 - `dirh` outputs its stack in the correct order (#5477).
 - `funced` and the edit-commandline-in-buffer bindings did not work in fish 3.0 when the `$EDITOR` variable contained spaces; this has been corrected (#5625).
+- vi mode supports R to enter replace mode (#6342).
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).

From 305409a025ca4a7699146d9f1d5df03f15740c30 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 25 Nov 2019 16:43:54 -0800
Subject: [PATCH 1263/1732] Fix the vi mode bind test

Note support for the 'replace' mode.
---
 tests/bind.expect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bind.expect b/tests/bind.expect
index a81e91fdb..bb9984dbf 100644
--- a/tests/bind.expect
+++ b/tests/bind.expect
@@ -193,7 +193,7 @@ expect_prompt -re {\r\nTENT\r\n} {
 
 # Now test that exactly the expected bind modes are defined
 send "bind --list-modes\r"
-expect_prompt -re {\r\ndefault\r\ninsert\r\npaste\r\nreplace_one\r\nvisual\r\n} {
+expect_prompt -re {\r\ndefault\r\ninsert\r\npaste\r\nreplace\r\nreplace_one\r\nvisual\r\n} {
     puts "vi bind modes"
 } unmatched {
     puts stderr "Unexpected vi bind modes"

From b8a9f2f228c5c706b7524b0941be15c766320aff Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 26 Nov 2019 18:17:20 +0800
Subject: [PATCH 1264/1732] docs: restore compatibility with Sphinx < 1.8.0

---
 sphinx_doc_src/conf.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/conf.py b/sphinx_doc_src/conf.py
index dc06c190d..a83dee80a 100644
--- a/sphinx_doc_src/conf.py
+++ b/sphinx_doc_src/conf.py
@@ -29,7 +29,11 @@ def setup(app):
         os.path.join(this_dir, "fish_indent_lexer.py"), lexername="FishIndentLexer"
     )
     lexers["fish-docs-samples"] = fish_indent_lexer
-    app.add_css_file("custom.css")
+    # add_css_file only appears in Sphinx 1.8.0
+    if hasattr(app, "add_css_file"):
+        app.add_css_file("custom.css")
+    else:
+        app.add_stylesheet("custom.css")
 
 
 # The default language to assume

From 563bdf3cc72357357a85298dd2721cd9ae7fe738 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 26 Nov 2019 18:18:16 +0800
Subject: [PATCH 1265/1732] docs: update isatty documentation to refer to
 terminals

Use language that is more accurate, similar to what glibc uses.

Closes #6355.
---
 sphinx_doc_src/cmds/isatty.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/cmds/isatty.rst b/sphinx_doc_src/cmds/isatty.rst
index 69e940392..7edc65adc 100644
--- a/sphinx_doc_src/cmds/isatty.rst
+++ b/sphinx_doc_src/cmds/isatty.rst
@@ -1,7 +1,7 @@
 .. _cmd-isatty:
 
-isatty - test if a file descriptor is a tty.
-============================================
+isatty - test if a file descriptor is a terminal
+================================================
 
 Synopsis
 --------
@@ -13,11 +13,11 @@ Synopsis
 Description
 -----------
 
-``isatty`` tests if a file descriptor is a tty.
+``isatty`` tests if a file descriptor is a terminal (as opposed to a file). The name is derived from the system call of the same name, which for historical reasons refers to a teletypewriter (TTY).
 
 ``FILE DESCRIPTOR`` may be either the number of a file descriptor, or one of the strings ``stdin``, ``stdout``, or ``stderr``.
 
-If the specified file descriptor is a tty, the exit status of the command is zero. Otherwise, the exit status is non-zero. No messages are printed to standard error.
+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.
 
 
 Examples

From 97969a936354b2fadbfd3ad940f194df1f6a6251 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 25 Nov 2019 09:19:53 +0100
Subject: [PATCH 1266/1732] Restore error messages for bare variable assignment

Since #6287, bare variable assignments do not parse, which broke
the "Unsupported use of '='" error message.

This commit catches parse errors that occur on bare variable assignments.
When a statement node fails to parse, then we check if there is at least one
prefixing variable assignment. If so, we emit the old error message.

See also #6347
---
 src/parse_constants.h                 |  7 ++--
 src/parse_tree.cpp                    | 50 +++++++++++++++++++++++++--
 tests/checks/variable-assignment.fish |  8 +++++
 3 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/parse_constants.h b/src/parse_constants.h
index 8f116b441..d9abf4863 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -174,9 +174,10 @@ enum parse_error_code_t {
     parse_error_tokenizer_unterminated_escape,
     parse_error_tokenizer_other,
 
-    parse_error_unbalancing_end,   // end outside of block
-    parse_error_unbalancing_else,  // else outside of if
-    parse_error_unbalancing_case   // case outside of switch
+    parse_error_unbalancing_end,           // end outside of block
+    parse_error_unbalancing_else,          // else outside of if
+    parse_error_unbalancing_case,          // case outside of switch
+    parse_error_bare_variable_assignment,  // a=b without command
 };
 
 enum { PARSER_TEST_ERROR = 1, PARSER_TEST_INCOMPLETE = 2 };
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 4454fbc74..406872379 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -53,6 +53,15 @@ wcstring parse_error_t::describe_with_prefix(const wcstring &src, const wcstring
     if (skip_caret && this->text.empty()) return L"";
 
     wcstring result = prefix;
+    if (code == parse_error_bare_variable_assignment) {
+        wcstring assignment_src = src.substr(this->source_start, this->source_length);
+        maybe_t<size_t> equals_pos = variable_assignment_equals_pos(assignment_src);
+        assert(equals_pos);
+        wcstring variable = assignment_src.substr(0, *equals_pos);
+        wcstring value = assignment_src.substr(*equals_pos + 1);
+        append_format(result, ERROR_BAD_COMMAND_ASSIGN_ERR_MSG, variable.c_str(), value.c_str());
+        return result;
+    }
     result.append(this->text);
     if (skip_caret || source_start >= src.size() || source_start + source_length > src.size()) {
         return result;
@@ -918,8 +927,45 @@ void parse_ll_t::accept_tokens(parse_token_t token1, parse_token_t token2) {
             production_for_token(stack_elem.type, token1, token2, &tag);
         node.tag = tag;
         if (production == nullptr) {
-            parse_error_failed_production(stack_elem, token1);
-            // The above sets fatal_errored, which ends the loop.
+            tnode_t<grammar::variable_assignments> variable_assignments;
+            if (const parse_node_t *parent = nodes.get_parent(node)) {
+                switch (parent->type) {
+                    default:
+                        break;
+                    case symbol_job:
+                        variable_assignments =
+                            tnode_t<grammar::job>(&nodes, parent)
+                                .try_get_child<grammar::variable_assignments, 0>();
+                        break;
+                    case symbol_job_continuation:
+                        variable_assignments =
+                            tnode_t<grammar::job_continuation>(&nodes, parent)
+                                .try_get_child<grammar::variable_assignments, 2>();
+                        break;
+                    case symbol_not_statement:
+                        variable_assignments =
+                            tnode_t<grammar::not_statement>(&nodes, parent)
+                                .try_get_child<grammar::variable_assignments, 1>();
+                        break;
+                }
+            }
+            tnode_t<grammar::variable_assignment> variable_assignment;
+            tnode_t<grammar::tok_string> assignment_tok;
+            if (variable_assignments &&
+                (variable_assignment =
+                     variable_assignments.try_get_child<grammar::variable_assignment, 0>()) &&
+                (assignment_tok = variable_assignment.try_get_child<grammar::tok_string, 0>())) {
+                parse_token_t token(parse_token_type_string);
+                token.source_start = assignment_tok.source_range()->start;
+                token.source_length = assignment_tok.source_range()->length;
+                parse_error(token, parse_error_bare_variable_assignment,
+                            L" " /* won't be printed but must be non-empty, see
+                                    describe_with_prefix */
+                );
+            } else {
+                parse_error_failed_production(stack_elem, token1);
+            }
+            // The above set fatal_errored, which ends the loop.
         } else {
             bool is_terminate = (token1.type == parse_token_type_terminate);
 
diff --git a/tests/checks/variable-assignment.fish b/tests/checks/variable-assignment.fish
index 1d3b60248..a683a6b3c 100644
--- a/tests/checks/variable-assignment.fish
+++ b/tests/checks/variable-assignment.fish
@@ -76,3 +76,11 @@ complete -C'a=b xalias '
 alias envxalias='a=b x'
 complete -C'a=b envxalias '
 # CHECK: arg
+
+# Eval invalid grammar to allow fish to parse this file
+eval 'a=(echo b)'
+# CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a (echo b)'.
+eval ': | a=b'
+# CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.
+eval 'not a=b'
+# CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.

From f36705bb6662f9f1fc979d28781d7becbbf5df86 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 25 Nov 2019 12:47:33 +0100
Subject: [PATCH 1267/1732] Fix error messages for "and" and "or" after pipe

Fixes #6347
---
 src/parse_constants.h   |  1 +
 src/parse_tree.cpp      | 36 ++++++++++++++++++++++++++++--------
 src/parse_tree.h        |  3 +++
 src/parse_util.cpp      |  3 ---
 tests/checks/andor.fish |  9 +++++++++
 5 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 tests/checks/andor.fish

diff --git a/src/parse_constants.h b/src/parse_constants.h
index d9abf4863..f2d2a8006 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -178,6 +178,7 @@ enum parse_error_code_t {
     parse_error_unbalancing_else,          // else outside of if
     parse_error_unbalancing_case,          // case outside of switch
     parse_error_bare_variable_assignment,  // a=b without command
+    parse_error_andor_in_pipeline,         // "and" or "or" after a pipe
 };
 
 enum { PARSER_TEST_ERROR = 1, PARSER_TEST_INCOMPLETE = 2 };
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index 406872379..fce988a01 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -53,14 +53,23 @@ wcstring parse_error_t::describe_with_prefix(const wcstring &src, const wcstring
     if (skip_caret && this->text.empty()) return L"";
 
     wcstring result = prefix;
-    if (code == parse_error_bare_variable_assignment) {
-        wcstring assignment_src = src.substr(this->source_start, this->source_length);
-        maybe_t<size_t> equals_pos = variable_assignment_equals_pos(assignment_src);
-        assert(equals_pos);
-        wcstring variable = assignment_src.substr(0, *equals_pos);
-        wcstring value = assignment_src.substr(*equals_pos + 1);
-        append_format(result, ERROR_BAD_COMMAND_ASSIGN_ERR_MSG, variable.c_str(), value.c_str());
-        return result;
+    switch (code) {
+        default:
+            break;
+        case parse_error_andor_in_pipeline:
+            append_format(result, EXEC_ERR_MSG,
+                          src.substr(this->source_start, this->source_length).c_str());
+            return result;
+        case parse_error_bare_variable_assignment: {
+            wcstring assignment_src = src.substr(this->source_start, this->source_length);
+            maybe_t<size_t> equals_pos = variable_assignment_equals_pos(assignment_src);
+            assert(equals_pos);
+            wcstring variable = assignment_src.substr(0, *equals_pos);
+            wcstring value = assignment_src.substr(*equals_pos + 1);
+            append_format(result, ERROR_BAD_COMMAND_ASSIGN_ERR_MSG, variable.c_str(),
+                          value.c_str());
+            return result;
+        }
     }
     result.append(this->text);
     if (skip_caret || source_start >= src.size() || source_start + source_length > src.size()) {
@@ -929,6 +938,17 @@ void parse_ll_t::accept_tokens(parse_token_t token1, parse_token_t token2) {
         if (production == nullptr) {
             tnode_t<grammar::variable_assignments> variable_assignments;
             if (const parse_node_t *parent = nodes.get_parent(node)) {
+                if (parent->type == symbol_statement &&
+                    (token1.keyword == parse_keyword_and || token1.keyword == parse_keyword_or)) {
+                    if (const parse_node_t *grandparent = nodes.get_parent(*parent)) {
+                        if (grandparent->type == symbol_job_continuation) {
+                            parse_error(token1, parse_error_andor_in_pipeline, L" "
+                                /* won't be printed but must be non-empty, see
+                                    describe_with_prefix TODO clean that up */);
+                            continue;
+                        }
+                    }
+                }
                 switch (parent->type) {
                     default:
                         break;
diff --git a/src/parse_tree.h b/src/parse_tree.h
index 54b173266..d1f60834d 100644
--- a/src/parse_tree.h
+++ b/src/parse_tree.h
@@ -238,4 +238,7 @@ parsed_source_ref_t parse_source(wcstring src, parse_tree_flags_t flags, parse_e
 /// The position of the equal sign in a variable assignment like foo=bar.
 maybe_t<size_t> variable_assignment_equals_pos(const wcstring &txt);
 
+/// Error message for improper use of the exec builtin.
+#define EXEC_ERR_MSG _(L"The '%ls' command can not be used in a pipeline")
+
 #endif
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 72edf9457..733590373 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -28,9 +28,6 @@
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-/// Error message for improper use of the exec builtin.
-#define EXEC_ERR_MSG _(L"The '%ls' command can not be used in a pipeline")
-
 /// Error message for use of backgrounded commands before and/or.
 #define BOOL_AFTER_BACKGROUND_ERROR_MSG \
     _(L"The '%ls' command can not be used immediately after a backgrounded job")
diff --git a/tests/checks/andor.fish b/tests/checks/andor.fish
new file mode 100644
index 000000000..3d31dda4c
--- /dev/null
+++ b/tests/checks/andor.fish
@@ -0,0 +1,9 @@
+#RUN: %fish %s
+
+set -xl LANG C # uniform quotes
+
+eval 'true | and'
+# CHECKERR: {{.*}}: The 'and' command can not be used in a pipeline
+
+eval 'true | or'
+# CHECKERR: {{.*}}: The 'or' command can not be used in a pipeline

From 662fb3f3d1f81a05af60a7dab02bdc29152099c4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 26 Nov 2019 18:09:33 +0100
Subject: [PATCH 1268/1732] Fix line numbers in functions

This added the function offset *again*, but it's already included in
the line for the current file.

And yes, I have explicitly tested a function file with a function
defined at a later line.

Fixes #6350
---
 src/parser.cpp                |  6 ------
 tests/checks/line-number.fish | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 tests/checks/line-number.fish

diff --git a/src/parser.cpp b/src/parser.cpp
index 7e19cb065..aa437d004 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -484,12 +484,6 @@ int parser_t::get_lineno() const {
     int lineno = -1;
     if (execution_context) {
         lineno = execution_context->get_current_line_number();
-
-        // If we are executing a function, we have to add in its offset.
-        const wchar_t *function_name = is_function();
-        if (function_name != nullptr) {
-            lineno += function_get_definition_lineno(function_name);
-        }
     }
     return lineno;
 }
diff --git a/tests/checks/line-number.fish b/tests/checks/line-number.fish
new file mode 100644
index 000000000..ea1a4f4ee
--- /dev/null
+++ b/tests/checks/line-number.fish
@@ -0,0 +1,29 @@
+# RUN: %fish %s
+#
+# These lines left around because we need the line numbers.
+# This file in general requires careful editing in the middle, I recommend appending.
+function t --on-event linenumber
+    status line-number
+    status line-number
+    status line-number
+end
+
+emit linenumber
+# CHECK: 6
+# CHECK: 7
+# CHECK: 8
+
+type --nonexistent-option-so-we-get-a-backtrace
+# CHECKERR: type: Unknown option '--nonexistent-option-so-we-get-a-backtrace'
+# CHECKERR: {{.*/type.fish}} (line 7):
+# CHECKERR:    argparse -n type -x t,p,P $options -- $argv
+# CHECKERR:    ^
+# CHECKERR: in function 'type' with arguments '--nonexistent-option-so-we-get-a-backtrace'
+# CHECKERR:     called on line 16 of file {{.*}}line-number.fish
+
+function line-number
+    status line-number
+end
+
+line-number
+# CHECK: 25

From efe6fb3c3b5ab725c20e532bf60e2aedc8b90913 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 26 Nov 2019 11:10:04 -0800
Subject: [PATCH 1269/1732] Use hyperfine in the benchmark driver if available

---
 benchmarks/driver.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/benchmarks/driver.sh b/benchmarks/driver.sh
index 877cd8fe4..f2e0e45a6 100755
--- a/benchmarks/driver.sh
+++ b/benchmarks/driver.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: driver.sh /path/to/fish"
@@ -10,5 +10,8 @@ BENCHMARKS_DIR=$(dirname "$0")/benchmarks
 for benchmark in "$BENCHMARKS_DIR"/*; do
     echo $(basename "$benchmark")
     ${FISH_PATH} --print-rusage-self $benchmark > /dev/null
+    if hash hyperfine 2>/dev/null; then
+        hyperfine "${FISH_PATH} $benchmark > /dev/null"
+    fi
 done
 

From 9a3fb3e265a738eb8804e9d95c83a350df77b1da Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Nov 2019 16:21:11 +0100
Subject: [PATCH 1270/1732] Use POSIX sh in the benchmark driver

There are reasons to use bash, `hash` is not one of them, as `command
-v` is perfectly capable and in POSIX.

[ci skip]
---
 benchmarks/driver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmarks/driver.sh b/benchmarks/driver.sh
index f2e0e45a6..77706f44e 100755
--- a/benchmarks/driver.sh
+++ b/benchmarks/driver.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 if [ "$#" -ne 1 ]; then
     echo "Usage: driver.sh /path/to/fish"
@@ -10,7 +10,7 @@ BENCHMARKS_DIR=$(dirname "$0")/benchmarks
 for benchmark in "$BENCHMARKS_DIR"/*; do
     echo $(basename "$benchmark")
     ${FISH_PATH} --print-rusage-self $benchmark > /dev/null
-    if hash hyperfine 2>/dev/null; then
+    if command -v hyperfine >/dev/null 2>&1; then
         hyperfine "${FISH_PATH} $benchmark > /dev/null"
     fi
 done

From 439470b048a628db8fe6dfbf06307e81fdd4e5fa Mon Sep 17 00:00:00 2001
From: mk2 <mk2@mk2.red>
Date: Wed, 27 Nov 2019 22:35:04 +0900
Subject: [PATCH 1271/1732] Move __fish_complete_ant_targets to ant.fish

---
 share/completions/ant.fish                    | 56 +++++++++++++++++++
 .../__fish_complete_ant_targets.fish          | 55 ------------------
 2 files changed, 56 insertions(+), 55 deletions(-)
 delete mode 100644 share/functions/__fish_complete_ant_targets.fish

diff --git a/share/completions/ant.fish b/share/completions/ant.fish
index 7436876cb..e31b6b04f 100644
--- a/share/completions/ant.fish
+++ b/share/completions/ant.fish
@@ -1,5 +1,61 @@
 # Apache Ant (1.9.5) completion for Fish Shell.
 
+function __fish_complete_ant_targets -d "Print list of targets from build.xml and imported files"
+    function __get_buildfile -d "Get a buildfile that will be used by ant"
+        set -l tokens $argv # tokens from 'commandline -co'
+        set -l prev $tokens[1]
+        set -l buildfile "build.xml"
+        for token in $argv[2..-1]
+            switch $prev
+                case -buildfile -file -f
+                    set buildfile (eval echo $token)
+            end
+            set prev $token
+        end
+        # return last one
+        echo $buildfile
+    end
+    function __parse_ant_targets_from_projecthelp -d "Parse ant targets from projecthelp"
+        set -l buildfile $argv[1] # full path to buildfile
+        set -l targets (ant -p -debug -f $buildfile 2> /dev/null | string match -r '^\s[[:graph:]].*$')
+        for target in $targets
+            # Use [[:graph:]] and [[:print:]] to ignore ANSI escape code
+            set -l tokens (string match -r '^\s([[:graph:]]+)(?:\s+([[:print:]]+))?' "$target")
+            if [ (count $tokens) -ge 3 ]
+                echo $tokens[2]\t$tokens[3]
+            else if [ (count $tokens) -ge 2 ]
+                echo $tokens[2]
+            end
+        end
+    end
+    function __get_ant_targets_from_projecthelp -d "Get ant targets from projecthelp"
+        set -l buildfile $argv[1] # full path to buildfile
+
+        if [ \( -z "$XDG_CACHE_HOME" \) -o \( ! -d "$XDG_CACHE_HOME" \) ]
+            set XDG_CACHE_HOME "$HOME/.cache"
+        end
+
+        set -l cache_dir "$XDG_CACHE_HOME/fish/ant_completions"
+        mkdir -p $cache_dir
+
+        set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
+        if [ ! -s "$cache_file" ]
+            # generate cache file if empty
+            __parse_ant_targets_from_projecthelp $buildfile >$cache_file
+        end
+
+        cat $cache_file
+    end
+
+    set -l tokens $argv
+    set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
+    if [ $status -ne 0 ]
+        return 1 # return nothing if buildfile does not exist
+    end
+
+    __get_ant_targets_from_projecthelp $buildfile
+end
+
 # completion for ant targets
 complete -x -c ant -a "(__fish_complete_ant_targets (commandline -co))"
 
diff --git a/share/functions/__fish_complete_ant_targets.fish b/share/functions/__fish_complete_ant_targets.fish
deleted file mode 100644
index 14745c79a..000000000
--- a/share/functions/__fish_complete_ant_targets.fish
+++ /dev/null
@@ -1,55 +0,0 @@
-function __fish_complete_ant_targets -d "Print list of targets from build.xml and imported files"
-    function __get_buildfile -d "Get a buildfile that will be used by ant"
-        set -l tokens $argv # tokens from 'commandline -co'
-        set -l prev $tokens[1]
-        set -l buildfile "build.xml"
-        for token in $argv[2..-1]
-            switch $prev
-                case -buildfile -file -f
-                    set buildfile (eval echo $token)
-            end
-            set prev $token
-        end
-        # return last one
-        echo $buildfile
-    end
-    function __parse_ant_targets_from_projecthelp -d "Parse ant targets from projecthelp"
-        set -l buildfile $argv[1] # full path to buildfile
-        set -l targets (ant -p -debug -f $buildfile 2> /dev/null | string match -r '^\s[[:graph:]].*$')
-        for target in $targets
-            # Use [[:graph:]] and [[:print:]] to ignore ANSI escape code
-            set -l tokens (string match -r '^\s([[:graph:]]+)(?:\s+([[:print:]]+))?' "$target")
-            if [ (count $tokens) -ge 3 ]
-                echo $tokens[2]\t$tokens[3]
-            else if [ (count $tokens) -ge 2 ]
-                echo $tokens[2]
-            end
-        end
-    end
-    function __get_ant_targets_from_projecthelp -d "Get ant targets from projecthelp"
-        set -l buildfile $argv[1] # full path to buildfile
-
-        if [ \( -z "$XDG_CACHE_HOME" \) -o \( ! -d "$XDG_CACHE_HOME" \) ]
-            set XDG_CACHE_HOME "$HOME/.cache"
-        end
-
-        set -l cache_dir "$XDG_CACHE_HOME/fish/ant_completions"
-        mkdir -p $cache_dir
-
-        set -l cache_file $cache_dir/(fish_md5 -s $buildfile)
-        if [ ! -s "$cache_file" ]
-            # generate cache file if empty
-            __parse_ant_targets_from_projecthelp $buildfile >$cache_file
-        end
-
-        cat $cache_file
-    end
-
-    set -l tokens $argv
-    set -l buildfile (realpath -eq $buildfile (__get_buildfile $tokens))
-    if [ $status -ne 0 ]
-        return 1 # return nothing if buildfile does not exist
-    end
-
-    __get_ant_targets_from_projecthelp $buildfile
-end

From 83f153eb4ca991d79e512cb5e15d1be43eb40e02 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 27 Nov 2019 18:49:46 +0100
Subject: [PATCH 1272/1732] Revert "builtin_printf: Use proper functions"

This reverts commit 1102b83b2d5bdf7018705c8a882edf6d3f133149.

wcstold_l is not available on musl and we don't currently have our "own" implementation.

Revert for now until we do.
---
 src/builtin_printf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index a50b05321..e8a208b12 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -288,13 +288,13 @@ uintmax_t raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
 
 template <>
 long double raw_string_to_scalar_type(const wchar_t *s, wchar_t **end) {
-    auto val = std::wcstold(s, end);
+    double val = std::wcstod(s, end);
     if (**end == L'\0') return val;
     // The conversion using the user's locale failed. That may be due to the string not being a
     // valid floating point value. It could also be due to the locale using different separator
     // characters than the normal english convention. So try again by forcing the use of a locale
     // that employs the english convention for writing floating point numbers.
-    return wcstold_l(s, end, fish_c_locale());
+    return wcstod_l(s, end, fish_c_locale());
 }
 
 template <typename T>

From 106af5f56a9cb9ff696cf97d0498e5a03302d66b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 24 Nov 2019 12:20:28 -0800
Subject: [PATCH 1273/1732] Migrate some iothread functions into member
 functions of thread_pool_t

This reintroduces commits 22230a1a0ddddc62732418773f3741073988df96
and 9d7d70c204073fb7fcfc393b8b78821b905e6817, now with the bug fixed.

The problem was when there was one thread waiting in the pool. We enqueue
an item onto the pool and attempt to wake up the thread. But before the
thread runs, we enqueue another item - this second enqueue will see the
thread waiting and attempt to wake it up as well. If the two work items
were dependent (reader/writer) then we would have a deadlock.

The fix is to check if the number of waiting threads is at least as large
as the queue. If the number of enqueued items exceeds the number of waiting
threads, then spawn a new thread always.
---
 src/iothread.cpp | 139 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 88 insertions(+), 51 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 9c784d17a..4d4211d3a 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -76,17 +76,17 @@ struct thread_pool_t {
         std::queue<work_request_t> request_queue{};
 
         /// The number of threads that exist in the pool.
-        int total_threads{0};
+        size_t total_threads{0};
 
         /// The number of threads which are waiting for more work.
-        int waiting_threads{0};
+        size_t waiting_threads{0};
 
         /// A flag indicating we should not process new requests.
         bool drain{false};
     };
 
     /// Data which needs to be atomically accessed.
-    owning_lock<data_t> data{};
+    owning_lock<data_t> req_data{};
 
     /// The condition variable used to wake up waiting threads.
     /// Note this is tied to data's lock.
@@ -95,14 +95,38 @@ struct thread_pool_t {
     /// The minimum and maximum number of threads.
     /// Here "minimum" means threads that are kept waiting in the pool.
     /// Note that the pool is initially empty and threads may decide to exit based on a time wait.
-    const int soft_min_threads;
-    const int max_threads;
+    const size_t soft_min_threads;
+    const size_t max_threads;
 
-    thread_pool_t(int soft_min_threads, int max_threads)
-        : soft_min_threads(soft_min_threads), max_threads(max_threads) {
-        assert(soft_min_threads >= 0 && max_threads >= 1 && soft_min_threads <= max_threads &&
-               "Invalid thread min and max");
-    }
+    /// Construct with a soft minimum and maximum thread count.
+    thread_pool_t(size_t soft_min_threads, size_t max_threads)
+        : soft_min_threads(soft_min_threads), max_threads(max_threads) {}
+
+    /// Enqueue a new work item onto the thread pool.
+    /// The function \p func will execute in one of the pool's threads.
+    /// \p completion will run on the main thread, if it is not missing.
+    int perform(void_function_t &&func, void_function_t &&completion);
+
+   private:
+    /// The worker loop for this thread.
+    void *run();
+
+    /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
+    /// reducing the active thread count.
+    /// This runs in the background thread.
+    maybe_t<work_request_t> dequeue_work_or_commit_to_exit();
+
+    /// Trampoline function for pthread_spawn compatibility.
+    static void *run_trampoline(void *vpool);
+
+    /// Attempt to spawn a new pthread.
+    pthread_t spawn();
+
+    /// No copying or moving.
+    thread_pool_t(const thread_pool_t &) = delete;
+    thread_pool_t(thread_pool_t &&) = delete;
+    void operator=(const thread_pool_t &) = delete;
+    void operator=(thread_pool_t &&) = delete;
 };
 
 /// The thread pool for "iothreads" which are used to lift I/O off of the main thread.
@@ -145,30 +169,30 @@ static const notify_pipes_t &get_notify_pipes() {
 
 /// Dequeue a work item (perhaps waiting on the condition variable), or commit to exiting by
 /// reducing the active thread count.
-static maybe_t<work_request_t> iothread_dequeue_work_or_commit_to_exit() {
-    auto &pool = s_io_thread_pool;
-    auto data = pool.data.acquire();
-
-    while (data->request_queue.empty()) {
-        bool give_up = true;
-        if (!data->drain && data->total_threads == pool.soft_min_threads) {
-            // If we exit, it will drop below the soft min. So wait for a while before giving up.
-            data->waiting_threads += 1;
-            auto wait_ret = pool.queue_cond.wait_for(
-                data.get_lock(), std::chrono::milliseconds(IO_WAIT_FOR_WORK_DURATION_MS));
-            data->waiting_threads -= 1;
-            give_up = (wait_ret == std::cv_status::timeout);
-        }
-        if (give_up) {
-            // Balance the total_threads count from when we were spawned.
-            data->total_threads -= 1;
-            return none();
-        }
+maybe_t<work_request_t> thread_pool_t::dequeue_work_or_commit_to_exit() {
+    auto data = this->req_data.acquire();
+    // If the queue is empty, check to see if we should wait.
+    // We should wait if our exiting would drop us below the soft min.
+    if (data->request_queue.empty() && data->total_threads == this->soft_min_threads) {
+        data->waiting_threads += 1;
+        this->queue_cond.wait_for(data.get_lock(),
+                                  std::chrono::milliseconds(IO_WAIT_FOR_WORK_DURATION_MS));
+        data->waiting_threads -= 1;
     }
 
-    // Oh! The queue has work for us!
-    maybe_t<work_request_t> result = std::move(data->request_queue.front());
-    data->request_queue.pop();
+    // Now that we've perhaps waited, see if there's something on the queue.
+    maybe_t<work_request_t> result{};
+    if (!data->request_queue.empty()) {
+        result = std::move(data->request_queue.front());
+        data->request_queue.pop();
+    }
+    // If we are returning none, then ensure we balance the thread count increment from when we were
+    // created. This has to be done here in this awkward place because we've already committed to
+    // exiting - we will never pick up more work. So we need to ensure we decrement the thread count
+    // while holding the lock as we are effectively exited.
+    if (!result) {
+        data->total_threads -= 1;
+    }
     return result;
 }
 
@@ -178,10 +202,8 @@ static void enqueue_thread_result(work_request_t req) {
 
 static void *this_thread() { return (void *)(intptr_t)pthread_self(); }
 
-/// The function that does thread work.
-static void *iothread_worker(void *unused) {
-    UNUSED(unused);
-    while (auto req = iothread_dequeue_work_or_commit_to_exit()) {
+void *thread_pool_t::run() {
+    while (auto req = dequeue_work_or_commit_to_exit()) {
         FLOGF(iothread, L"pthread %p got work", this_thread());
 
         // Perform the work
@@ -201,24 +223,27 @@ static void *iothread_worker(void *unused) {
     return nullptr;
 }
 
+void *thread_pool_t::run_trampoline(void *pool) {
+    assert(pool && "No thread pool given");
+    return static_cast<thread_pool_t *>(pool)->run();
+}
+
 /// Spawn another thread. No lock is held when this is called.
-static pthread_t iothread_spawn() {
+pthread_t thread_pool_t::spawn() {
     // 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;
-    if (make_pthread(&thread, iothread_worker, nullptr)) {
+    if (make_pthread(&thread, run_trampoline, static_cast<void *>(this))) {
         // We will never join this thread.
         DIE_ON_FAILURE(pthread_detach(thread));
     }
     return thread;
 }
 
-int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
-    ASSERT_IS_MAIN_THREAD();
-    ASSERT_IS_NOT_FORKED_CHILD();
-    assert(func && "Null function");
-
+int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion) {
+    assert(func && "Missing function");
+    // Note we permit an empty completion.
     struct work_request_t req(std::move(func), std::move(completion));
     int local_thread_count = -1;
     auto &pool = s_io_thread_pool;
@@ -226,12 +251,13 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
     bool wakeup_thread = false;
     {
         // Lock around a local region.
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         data->request_queue.push(std::move(req));
+        FLOGF(iothread, L"enqueuing work item (count is %lu)", data->request_queue.size());
         if (data->drain) {
             // Do nothing here.
-        } else if (data->waiting_threads > 0) {
-            // At least one thread is waiting, we will wake it up.
+        } else if (data->waiting_threads >= data->request_queue.size()) {
+            // There's enough waiting threads, wake one up.
             wakeup_thread = true;
         } else if (data->total_threads < pool.max_threads) {
             // No threads are waiting but we can spawn a new thread.
@@ -243,15 +269,26 @@ int iothread_perform_impl(void_function_t &&func, void_function_t &&completion)
 
     // Kick off the thread if we decided to do so.
     if (wakeup_thread) {
+        FLOGF(iothread, L"notifying a thread", this_thread());
         pool.queue_cond.notify_one();
     }
     if (spawn_new_thread) {
-        pthread_t pt = iothread_spawn();
-        FLOGF(iothread, L"pthread %p spawned", pt);
+        if (pthread_t pt = this->spawn()) {
+            FLOGF(iothread, L"pthread %p spawned", pt);
+        } else {
+            // We failed to spawn a thread; decrement the thread count.
+            pool.req_data.acquire()->total_threads -= 1;
+        }
     }
     return local_thread_count;
 }
 
+int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
+    ASSERT_IS_MAIN_THREAD();
+    ASSERT_IS_NOT_FORKED_CHILD();
+    return s_io_thread_pool.perform(std::move(func), std::move(completion));
+}
+
 int iothread_port() { return get_notify_pipes().read; }
 
 void iothread_service_completion() {
@@ -292,7 +329,7 @@ int iothread_drain_all() {
     auto &pool = s_io_thread_pool;
     // Set the drain flag.
     {
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         assert(!data->drain && "Should not be draining already");
         data->drain = true;
         thread_count = data->total_threads;
@@ -304,7 +341,7 @@ int iothread_drain_all() {
     double now = timef();
 
     // Nasty polling via select().
-    while (pool.data.acquire()->total_threads > 0) {
+    while (pool.req_data.acquire()->total_threads > 0) {
         if (iothread_wait_for_pending_completions(1000)) {
             iothread_service_completion();
         }
@@ -314,7 +351,7 @@ int iothread_drain_all() {
     // Even though we released the lock, nobody should have added a new thread while the drain flag
     // is set.
     {
-        auto data = pool.data.acquire();
+        auto data = pool.req_data.acquire();
         assert(data->total_threads == 0 && "Should be no threads");
         assert(data->drain && "Should be draining");
         data->drain = false;

From b5d00754067bbbbac3be1ed19aed4376853c2bbe Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 23 Nov 2019 15:52:53 -0800
Subject: [PATCH 1274/1732] Use iothread pool for background fillthreads

Background fillthreads are used when we want to populate a buffer from an
external command. The most common is command substitution.

Prior to this commit, fish would spin up a fillthread whenever required.
This ended up being quite expensive.

Switch to using the iothread pool instead. This enables reusing the same
thread(s), which prevents needing to spawn new threads. This shows a big
perf win on the alias benchmark (766 -> 378 ms).
---
 src/io.cpp | 39 +++++++++++++++++++++------------------
 src/io.h   | 11 ++++++++---
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 92f880e69..443badeb7 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -127,34 +127,37 @@ void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
 
 void io_buffer_t::begin_background_fillthread(autoclose_fd_t fd) {
     ASSERT_IS_MAIN_THREAD();
-    assert(!fillthread_ && "Already have a fillthread");
+    assert(!fillthread_running() && "Already have a fillthread");
 
     // We want our background thread to own the fd but it's not easy to move into a std::function.
     // Use a shared_ptr.
     auto fdref = move_to_sharedptr(std::move(fd));
 
-    // Our function to read until the receiver is closed.
-    // It's OK to capture 'this' by value because 'this' owns the background thread and joins it
-    // before dtor.
-    std::function<void(void)> func = [this, fdref]() {
-        this->run_background_fillthread(std::move(*fdref));
-    };
+    // Construct a promise that can go into our background thread.
+    auto promise = std::make_shared<std::promise<void>>();
 
-    pthread_t fillthread{};
-    if (!make_pthread(&fillthread, std::move(func))) {
-        wperror(L"make_pthread");
-    }
-    fillthread_ = fillthread;
+    // Get the future associated with our promise.
+    // Note this should only ever be called once.
+    fillthread_waiter_ = promise->get_future();
+
+    // Run our function to read until the receiver is closed.
+    // It's OK to capture 'this' by value because 'this' owns the background thread and waits for it
+    // before dtor.
+    iothread_perform([this, promise, fdref]() {
+        this->run_background_fillthread(std::move(*fdref));
+        promise->set_value();
+    });
 }
 
 void io_buffer_t::complete_background_fillthread() {
     ASSERT_IS_MAIN_THREAD();
-    assert(fillthread_ && "Should have a fillthread");
+    assert(fillthread_running() && "Should have a fillthread");
     shutdown_fillthread_ = true;
-    void *ignored = nullptr;
-    int err = pthread_join(*fillthread_, &ignored);
-    DIE_ON_FAILURE(err);
-    fillthread_.reset();
+
+    // Wait for the fillthread to fulfill its promise, and then clear the future so we know we no
+    // longer have one.
+    fillthread_waiter_.wait();
+    fillthread_waiter_ = {};
 }
 
 shared_ptr<io_bufferfill_t> io_bufferfill_t::create(const io_chain_t &conflicts,
@@ -195,7 +198,7 @@ io_pipe_t::~io_pipe_t() = default;
 io_bufferfill_t::~io_bufferfill_t() = default;
 
 io_buffer_t::~io_buffer_t() {
-    assert(!fillthread_ && "io_buffer_t destroyed with outstanding fillthread");
+    assert(!fillthread_running() && "io_buffer_t destroyed with outstanding fillthread");
 }
 
 void io_chain_t::remove(const shared_ptr<const io_data_t> &element) {
diff --git a/src/io.h b/src/io.h
index 2c9c79deb..5ea8287de 100644
--- a/src/io.h
+++ b/src/io.h
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 
 #include <atomic>
+#include <future>
 #include <memory>
 #include <mutex>
 #include <vector>
@@ -279,8 +280,9 @@ class io_buffer_t {
     /// Atomic flag indicating our fillthread should shut down.
     relaxed_atomic_bool_t shutdown_fillthread_{false};
 
-    /// The background fillthread itself, if any.
-    maybe_t<pthread_t> fillthread_{};
+    /// The future allowing synchronization with the background fillthread, if the fillthread is
+    /// running. The fillthread fulfills the corresponding promise when it exits.
+    std::future<void> fillthread_waiter_{};
 
     /// Read limit of the buffer.
     const size_t read_limit_;
@@ -297,6 +299,9 @@ class io_buffer_t {
     /// End the background fillthread operation.
     void complete_background_fillthread();
 
+    /// Helper to return whether the fillthread is running.
+    bool fillthread_running() const { return fillthread_waiter_.valid(); }
+
    public:
     explicit io_buffer_t(size_t limit) : buffer_(limit), read_limit_(limit) {
         // Explicitly reset the discard flag because we share this buffer.
@@ -308,7 +313,7 @@ class io_buffer_t {
     /// Access the underlying buffer.
     /// This requires that the background fillthread be none.
     const separated_buffer_t<std::string> &buffer() const {
-        assert(!fillthread_ && "Cannot access buffer during background fill");
+        assert(!fillthread_running() && "Cannot access buffer during background fill");
         return buffer_;
     }
 

From a755bc5cf6accce3526125eee4506828d72e2e8e Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 27 Nov 2019 17:53:58 -0800
Subject: [PATCH 1275/1732] make_tarball.sh: Run through shellcheck

---
 build_tools/make_tarball.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh
index d0578e006..ffe12a930 100755
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -32,7 +32,7 @@ fi
 wd="$PWD"
 
 # Get the version from git-describe
-VERSION=`git describe --dirty 2>/dev/null`
+VERSION=$(git describe --dirty 2>/dev/null)
 
 # The name of the prefix, which is the directory that you get when you untar
 prefix="fish-$VERSION"
@@ -48,10 +48,10 @@ rm -f "$path" "$path".gz
 git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
 
 # tarball out the documentation, generate a version file
-PREFIX_TMPDIR=`mktemp -d`
-cd $PREFIX_TMPDIR
-echo $VERSION > version
-cmake $wd
+PREFIX_TMPDIR=$(mktemp -d)
+cd "$PREFIX_TMPDIR"
+echo "$VERSION" > version
+cmake "$wd"
 make doc
 
 TAR_APPEND="$TAR --append --file=$path --mtime=now --owner=0 --group=0 \

From 87e24db5ef0e188e47c915236058d7e527378286 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 27 Nov 2019 17:49:21 -0800
Subject: [PATCH 1276/1732] driver.sh: Run through shellcheck

---
 benchmarks/driver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benchmarks/driver.sh b/benchmarks/driver.sh
index 77706f44e..dcb0e5988 100755
--- a/benchmarks/driver.sh
+++ b/benchmarks/driver.sh
@@ -8,8 +8,8 @@ FISH_PATH=$1
 BENCHMARKS_DIR=$(dirname "$0")/benchmarks
 
 for benchmark in "$BENCHMARKS_DIR"/*; do
-    echo $(basename "$benchmark")
-    ${FISH_PATH} --print-rusage-self $benchmark > /dev/null
+    basename "$benchmark"
+    ${FISH_PATH} --print-rusage-self "$benchmark" > /dev/null
     if command -v hyperfine >/dev/null 2>&1; then
         hyperfine "${FISH_PATH} $benchmark > /dev/null"
     fi

From c3fa8c04bf8fea18561ff602640581525461f1f2 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 16:34:06 -0800
Subject: [PATCH 1277/1732] [clang-tidy] Don't empty initialize strings

Found with readability-redundant-string-init

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/fish_indent.cpp | 2 +-
 src/wildcard.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 0444f97b3..bb7cb185d 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -137,7 +137,7 @@ struct prettifier_t {
 static void dump_node(indent_t node_indent, const parse_node_t &node, const wcstring &source) {
     wchar_t nextc = L' ';
     wchar_t prevc = L' ';
-    wcstring source_txt = L"";
+    wcstring source_txt;
     if (node.source_start != SOURCE_OFFSET_INVALID && node.source_length != SOURCE_OFFSET_INVALID) {
         int nextc_idx = node.source_start + node.source_length;
         if (static_cast<size_t>(nextc_idx) < source.size()) {
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 58b8c00e7..952fb42e0 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -927,7 +927,7 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory
     // Check for a leading slash. If we find one, we have an absolute path: the prefix is empty, the
     // base dir is /, and the wildcard is the remainder. If we don't find one, the prefix is the
     // working directory, the base dir is empty.
-    wcstring prefix = L"", base_dir = L"", effective_wc;
+    wcstring prefix, base_dir, effective_wc;
     if (string_prefixes_string(L"/", wc)) {
         base_dir = L"/";
         effective_wc = wc.substr(1);

From 4087b2ee153afa8264cab8ecf874bc2d3b00ba91 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 16:36:13 -0800
Subject: [PATCH 1278/1732] [clang-tidy] Use bool literals

Found with modernize-use-bool-literals

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/common.cpp       |  6 +++---
 src/complete.cpp     |  4 ++--
 src/exec.cpp         | 10 +++++-----
 src/expand.cpp       |  2 +-
 src/fish_indent.cpp  |  2 +-
 src/history_file.cpp |  2 +-
 src/input_common.cpp |  2 +-
 src/parse_util.cpp   |  2 +-
 src/reader.cpp       | 12 ++++++------
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 634afe81f..cfa4cb0d8 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -252,7 +252,7 @@ int fgetws2(wcstring *s, FILE *f) {
     int i = 0;
     wint_t c;
 
-    while (1) {
+    while (true) {
         errno = 0;
 
         c = std::fgetwc(f);
@@ -556,7 +556,7 @@ void append_format(wcstring &str, const wchar_t *format, ...) {
 wchar_t *quote_end(const wchar_t *pos) {
     wchar_t c = *pos;
 
-    while (1) {
+    while (true) {
         pos++;
 
         if (!*pos) return nullptr;
@@ -816,7 +816,7 @@ wcstring reformat_for_screen(const wcstring &msg) {
     if (screen_width) {
         const wchar_t *start = msg.c_str();
         const wchar_t *pos = start;
-        while (1) {
+        while (true) {
             int overflow = 0;
 
             int tok_width = 0;
diff --git a/src/complete.cpp b/src/complete.cpp
index f6429faa8..a31496262 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -586,7 +586,7 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     // least two characters if we don't know the location of the whatis-database.
     if (cmd.length() < 2) return;
 
-    if (wildcard_has(cmd, 0)) {
+    if (wildcard_has(cmd, false)) {
         return;
     }
 
@@ -939,7 +939,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
     for (const option_list_t &options : all_options) {
         size_t short_opt_pos = short_option_pos(str, options);
         bool last_option_requires_param = false;
-        use_common = 1;
+        use_common = true;
         if (use_switches) {
             if (str[0] == L'-') {
                 // Check if we are entering a combined option and argument (like --color=auto or
diff --git a/src/exec.cpp b/src/exec.cpp
index 3e78a01be..a627cc362 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -315,7 +315,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
         launch_process_nofork(vars, j->processes.front().get());
     } else {
         j->mut_flags().constructed = true;
-        j->processes.front()->completed = 1;
+        j->processes.front()->completed = true;
         return;
     }
 }
@@ -645,7 +645,7 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
     if (!must_use_process && outbuff.empty() && errbuff.empty()) {
         // We do not need to construct a background process.
         // TODO: factor this job-status-setting stuff into a single place.
-        p->completed = 1;
+        p->completed = true;
         if (p->is_last_in_job) {
             FLOGF(exec_job_status, L"Set status of job %d (%ls) to %d using short circuit",
                   j->job_id, j->preview().c_str(), p->status);
@@ -863,7 +863,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     if (!block_output_bufferfill) {
         // No buffer, so we exit directly. This means we have to manually set the exit
         // status.
-        p->completed = 1;
+        p->completed = true;
         if (p->is_last_in_job) {
             parser.set_last_statuses(j->get_statuses());
         }
@@ -883,7 +883,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         if (p->is_last_in_job) {
             parser.set_last_statuses(j->get_statuses());
         }
-        p->completed = 1;
+        p->completed = true;
     }
     return true;
 }
@@ -1128,7 +1128,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         internal_exec(parser.vars(), j.get(), all_ios);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
-        bool status = j->flags().negate ? 0 : 1;
+        bool status = j->flags().negate ? false : true;
         parser.set_last_statuses(statuses_t::just(status));
         return false;
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index 37583ddb6..09ae53913 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -156,7 +156,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
     int zero_index = -1;
     bool literal_zero_index = true;
 
-    while (1) {
+    while (true) {
         while (iswspace(in[pos]) || (in[pos] == INTERNAL_SEPARATOR)) pos++;
         if (in[pos] == L']') {
             pos++;
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index bb7cb185d..5a2474f42 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -54,7 +54,7 @@ static int ret = 0;
 // Read the entire contents of a file into the specified string.
 static wcstring read_file(FILE *f) {
     wcstring result;
-    while (1) {
+    while (true) {
         wint_t c = std::fgetwc(f);
 
         if (c == WEOF) {
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 0617fbc1b..7ab551f56 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -480,7 +480,7 @@ static history_item_t decode_item_fish_1_x(const char *begin, size_t length) {
     bool timestamp_mode = false;
     time_t timestamp = 0;
 
-    while (1) {
+    while (true) {
         wchar_t c;
         size_t res;
         mbstate_t state = {};
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 4d4b82d64..a333a5627 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -171,7 +171,7 @@ char_event_t input_event_queue_t::readch() {
     }
     wchar_t res;
     mbstate_t state = {};
-    while (1) {
+    while (true) {
         auto evt = readb();
         if (!evt.is_char()) {
             return evt;
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 733590373..6463b11ef 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -457,7 +457,7 @@ static wchar_t get_quote(const wcstring &cmd_str, size_t len) {
     wchar_t res = 0;
     const wchar_t *const cmd = cmd_str.c_str();
 
-    while (1) {
+    while (true) {
         if (!cmd[i]) break;
 
         if (cmd[i] == L'\\') {
diff --git a/src/reader.cpp b/src/reader.cpp
index 8a2ffb2ef..e1b2a110f 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -517,7 +517,7 @@ static bool should_exit() { return s_end_current_loop || s_exit_forced; }
 static void term_donate(outputter_t &outp) {
     outp.set_color(rgb_color_t::normal(), rgb_color_t::normal());
 
-    while (1) {
+    while (true) {
         if (tcsetattr(STDIN_FILENO, TCSANOW, &tty_modes_for_external_cmds) == -1) {
             if (errno == EIO) redirect_tty_output();
             if (errno != EINTR) {
@@ -532,7 +532,7 @@ static void term_donate(outputter_t &outp) {
 
 /// Grab control of terminal.
 static void term_steal() {
-    while (1) {
+    while (true) {
         if (tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes) == -1) {
             if (errno == EIO) redirect_tty_output();
             if (errno != EINTR) {
@@ -2224,7 +2224,7 @@ static void handle_end_loop(const parser_t &parser) {
         if (!data->prev_end_loop && bg_jobs) {
             reader_bg_job_warning(parser);
             reader_set_end_loop(false);
-            data->prev_end_loop = 1;
+            data->prev_end_loop = true;
             return;
         }
     }
@@ -2261,7 +2261,7 @@ static int read_i(parser_t &parser) {
     reader_import_history_if_necessary();
 
     reader_data_t *data = current_data();
-    data->prev_end_loop = 0;
+    data->prev_end_loop = false;
 
     while (!shell_is_exiting()) {
         run_count++;
@@ -2302,7 +2302,7 @@ static int read_i(parser_t &parser) {
             if (shell_is_exiting()) {
                 handle_end_loop(parser);
             } else {
-                data->prev_end_loop = 0;
+                data->prev_end_loop = false;
             }
         }
     }
@@ -3254,7 +3254,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         }
 
         maybe_t<char_event_t> event_needing_handling{};
-        while (1) {
+        while (true) {
             event_needing_handling = read_normal_chars(rls);
             if (event_needing_handling.has_value()) break;
 

From 7d1cc992e544465e2520e863e7c277bbdf10e7c6 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 16:51:28 -0800
Subject: [PATCH 1279/1732] [clang-tidy] Simplify boolean expressions

Found with readability-simplify-boolean-expr

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_functions.cpp | 2 +-
 src/builtin_wait.cpp      | 5 +----
 src/color.cpp             | 2 +-
 src/complete.cpp          | 2 +-
 src/exec.cpp              | 2 +-
 src/expand.cpp            | 3 +--
 src/history.cpp           | 5 +----
 src/reader.cpp            | 4 +---
 src/wutil.cpp             | 3 +--
 9 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index e901e15fe..f25a3377c 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -299,7 +299,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     // Erase, desc, query, copy and list are mutually exclusive.
-    bool describe = opts.description ? true : false;
+    bool describe = opts.description != nullptr;
     if (describe + opts.erase + opts.list + opts.query + opts.copy > 1) {
         streams.err.append_format(BUILTIN_ERR_COMBO, cmd);
         builtin_print_error_trailer(parser, streams.err, cmd);
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index f514c09f6..678caf32e 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -60,10 +60,7 @@ static bool any_jobs_finished(size_t jobs_len, const parser_t &parser) {
             no_jobs_running = false;
         }
     }
-    if (no_jobs_running) {
-        return true;
-    }
-    return false;
+    return no_jobs_running;
 }
 
 static int wait_for_backgrounds(parser_t &parser, bool any_flag) {
diff --git a/src/color.cpp b/src/color.cpp
index 6594cee92..0a5857f4d 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -174,7 +174,7 @@ wcstring_list_t rgb_color_t::named_color_names() {
     wcstring_list_t result;
     result.reserve(1 + count);
     for (size_t i = 0; i < count; i++) {
-        if (named_colors[i].hidden == false) {
+        if (!named_colors[i].hidden) {
             result.push_back(named_colors[i].name);
         }
     }
diff --git a/src/complete.cpp b/src/complete.cpp
index a31496262..e014ead62 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -902,7 +902,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
     // FLOGF(error, L"\nThinking about looking up completions for %ls\n", cmd.c_str());
     bool head_exists = builtin_exists(cmd);
     // Only reload environment variables if builtin_exists returned false, as an optimization
-    if (head_exists == false) {
+    if (!head_exists) {
         head_exists = function_exists_no_autoload(cmd);
         // While it may seem like first testing `path_get_path` before resorting to an env lookup
         // may be faster, path_get_path can potentially do a lot of FS/IO access, so env.get() +
diff --git a/src/exec.cpp b/src/exec.cpp
index a627cc362..767291b03 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1128,7 +1128,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         internal_exec(parser.vars(), j.get(), all_ios);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
-        bool status = j->flags().negate ? false : true;
+        bool status = !j->flags().negate;
         parser.set_last_statuses(statuses_t::just(status));
         return false;
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index 09ae53913..f1334cb41 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -671,8 +671,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
         }
     }
 
-    if (parser.get_last_status() == STATUS_READ_TOO_MUCH) return false;
-    return true;
+    return parser.get_last_status() != STATUS_READ_TOO_MUCH;
 }
 
 // Given that input[0] is HOME_DIRECTORY or tilde (ugh), return the user's name. Return the empty
diff --git a/src/history.cpp b/src/history.cpp
index faa9fb860..4b6f165d6 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1239,10 +1239,7 @@ bool all_paths_are_valid(const path_list_t &paths, const wcstring &working_direc
 
 static bool string_could_be_path(const wcstring &potential_path) {
     // Assume that things with leading dashes aren't paths.
-    if (potential_path.empty() || potential_path.at(0) == L'-') {
-        return false;
-    }
-    return true;
+    return !(potential_path.empty() || potential_path.at(0) == L'-');
 }
 
 /// Very simple, just mark that we have no more pending items.
diff --git a/src/reader.cpp b/src/reader.cpp
index e1b2a110f..15e915f57 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2240,9 +2240,7 @@ static bool selection_is_at_top() {
     if (row != 0 && row != PAGER_SELECTION_NONE) return false;
 
     size_t col = pager->get_selected_column(data->current_page_rendering);
-    if (col != 0 && col != PAGER_SELECTION_NONE) return false;
-
-    return true;
+    return !(col != 0 && col != PAGER_SELECTION_NONE);
 }
 
 static relaxed_atomic_t<uint64_t> run_count{0};
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 330ccb70b..45b24922d 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -127,8 +127,7 @@ bool wreaddir_for_dirs(DIR *dir, wcstring *out_name) {
     if (result && out_name) {
         *out_name = str2wcstring(result->d_name);
     }
-    if (!result) return false;
-    return true;
+    return result != nullptr;
 }
 
 const wcstring wgetcwd() {

From 6f4a9d527c98e8591cf7a2082d5781040f864f17 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 16:56:39 -0800
Subject: [PATCH 1280/1732] [clang-tidy] Use C++ using instead of C typedef

Found with modernize-use-using

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_string.cpp  | 2 +-
 src/complete.cpp        | 4 ++--
 src/fish_indent.cpp     | 2 +-
 src/highlight.cpp       | 2 +-
 src/iothread.cpp        | 2 +-
 src/kill.cpp            | 2 +-
 src/pager.cpp           | 6 +++---
 src/parser_keywords.cpp | 2 +-
 src/proc.cpp            | 2 +-
 src/tinyexpr.cpp        | 6 +++---
 src/utf8.cpp            | 4 ++--
 src/wcstringutil.cpp    | 2 +-
 src/wutil.cpp           | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 46944e1e4..7dbf58e58 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -1222,7 +1222,7 @@ static int string_sub(parser_t &parser, io_streams_t &streams, int argc, wchar_t
     int nsub = 0;
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *s = aiter.nextstr()) {
-        typedef wcstring::size_type size_type;
+        using size_type = wcstring::size_type;
         size_type pos = 0;
         size_type count = wcstring::npos;
         if (opts.start > 0) {
diff --git a/src/complete.cpp b/src/complete.cpp
index e014ead62..fe4d67a40 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -124,7 +124,7 @@ typedef struct complete_entry_opt {
 static std::atomic<unsigned int> k_complete_order{0};
 
 /// Struct describing a command completion.
-typedef std::list<complete_entry_opt_t> option_list_t;
+using option_list_t = std::list<complete_entry_opt_t>;
 class completion_entry_t {
    public:
     /// List of all options.
@@ -166,7 +166,7 @@ struct equal_to<completion_entry_t> {
     }
 };
 }  // namespace std
-typedef std::unordered_set<completion_entry_t> completion_entry_set_t;
+using completion_entry_set_t = std::unordered_set<completion_entry_t>;
 static owning_lock<completion_entry_set_t> s_completion_set;
 
 /// Completion "wrapper" support. The map goes from wrapping-command to wrapped-command-list.
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 5a2474f42..8d23f8142 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #define SPACES_PER_INDENT 4
 
 // An indent_t represents an abstract indent depth. 2 means we are in a doubly-nested block, etc.
-typedef unsigned int indent_t;
+using indent_t = unsigned int;
 static bool dump_parse_tree = false;
 static int ret = 0;
 
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 3f354f090..a9e0550bd 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -774,7 +774,7 @@ class highlighter_t {
     // Working directory.
     const wcstring working_directory;
     // The resulting colors.
-    typedef std::vector<highlight_spec_t> color_array_t;
+    using color_array_t = std::vector<highlight_spec_t>;
     color_array_t color_array;
     // The parse tree of the buff.
     parse_node_tree_t parse_tree;
diff --git a/src/iothread.cpp b/src/iothread.cpp
index 4d4211d3a..eb49ac00f 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -41,7 +41,7 @@
 static void iothread_service_main_thread_requests();
 static void iothread_service_result_queue();
 
-typedef std::function<void(void)> void_function_t;
+using void_function_t = std::function<void()>;
 
 struct work_request_t {
     void_function_t handler;
diff --git a/src/kill.cpp b/src/kill.cpp
index e13626595..f7460cd24 100644
--- a/src/kill.cpp
+++ b/src/kill.cpp
@@ -15,7 +15,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 
 /** Kill ring */
-typedef std::list<wcstring> kill_list_t;
+using kill_list_t = std::list<wcstring>;
 static kill_list_t kill_list;
 
 void kill_add(wcstring str) {
diff --git a/src/pager.cpp b/src/pager.cpp
index 51e96df39..a26711a41 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -20,9 +20,9 @@
 #include "screen.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-typedef pager_t::comp_t comp_t;
-typedef std::vector<completion_t> completion_list_t;
-typedef std::vector<comp_t> comp_info_list_t;
+using comp_t = pager_t::comp_t;
+using completion_list_t = std::vector<completion_t>;
+using comp_info_list_t = std::vector<comp_t>;
 
 /// The minimum width (in characters) the terminal must to show completions at all.
 #define PAGER_MIN_WIDTH 16
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 80003be71..7c0c4065c 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -9,7 +9,7 @@
 #include "common.h"
 #include "fallback.h"  // IWYU pragma: keep
 
-typedef std::unordered_set<wcstring> string_set_t;
+using string_set_t = std::unordered_set<wcstring>;
 
 static const wcstring skip_keywords[]{
     L"else",
diff --git a/src/proc.cpp b/src/proc.cpp
index d61c5bed7..f450fbb89 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -290,7 +290,7 @@ io_chain_t job_t::all_io_redirections() const {
     return result;
 }
 
-typedef unsigned int process_generation_count_t;
+using process_generation_count_t = unsigned int;
 
 /// A list of pids/pgids that have been disowned. They are kept around until either they exit or
 /// we exit. Poll these from time-to-time to prevent zombie processes from happening (#5342).
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index c84c02436..035ea15b9 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -38,9 +38,9 @@
 
 // TODO: It would be nice not to rely on a typedef for this, especially one that can only do
 // functions with two args.
-typedef double (*te_fun2)(double, double);
-typedef double (*te_fun1)(double);
-typedef double (*te_fun0)();
+using te_fun2 = double (*)(double, double);
+using te_fun1 = double (*)(double);
+using te_fun0 = double (*)();
 
 enum {
     TE_CONSTANT = 0,
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 843492e60..1086fd8f1 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -33,10 +33,10 @@
 #define _BOM 0xfeff
 
 // We can tweak the following typedef to allow us to simulate Windows-style 16 bit wchar's on Unix.
-typedef wchar_t utf8_wchar_t;
+using utf8_wchar_t = wchar_t;
 #define UTF8_WCHAR_MAX (wchar_t) std::numeric_limits<utf8_wchar_t>::max()
 
-typedef std::basic_string<utf8_wchar_t> utf8_wstring_t;
+using utf8_wstring_t = std::basic_string<utf8_wchar_t>;
 
 static size_t utf8_to_wchar_internal(const char *in, size_t insize, utf8_wstring_t *out_string,
                                      int flags);
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index d29c1b8c3..f5a5658ae 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -7,7 +7,7 @@
 
 #include "common.h"
 
-typedef wcstring::size_type size_type;
+using size_type = wcstring::size_type;
 
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
     size_type pos = last.second == wcstring::npos ? wcstring::npos : last.first;
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 45b24922d..14365ecf7 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -31,7 +31,7 @@
 #include "flog.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-typedef std::string cstring;
+using cstring = std::string;
 
 const file_id_t kInvalidFileID = {static_cast<dev_t>(-1LL),
                                   static_cast<ino_t>(-1LL),

From 9507c3a159479ef164c24a96140cad5f81920639 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 16:59:22 -0800
Subject: [PATCH 1281/1732] [clang-tidy] Don't initialize member functions

Found with readability-redundant-member-init

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/screen.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index d665e856d..049735fc4 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1226,9 +1226,6 @@ void screen_force_clear_to_end() {
 
 screen_t::screen_t()
     : outp_(outputter_t::stdoutput()),
-      desired(),
-      actual(),
-      actual_left_prompt(),
       last_right_prompt_width(),
       actual_width(SCREEN_WIDTH_UNINITIALIZED),
       soft_wrap_location(INVALID_LOCATION),

From e45ae9df496b23a9421cebc0ed91fcb100df7cd2 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 17:20:16 -0800
Subject: [PATCH 1282/1732] [clang-tidy] Enclose macro arguments in ()

Found with bugprone-macro-parentheses

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin.cpp | 2 +-
 src/screen.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index d888eff51..9eca55180 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -222,7 +222,7 @@ static int builtin_generic(parser_t &parser, io_streams_t &streams, wchar_t **ar
 
 // How many bytes we read() at once.
 // Since this is just for counting, it can be massive.
-#define COUNT_CHUNK_SIZE 512 * 256
+#define COUNT_CHUNK_SIZE (512 * 256)
 /// Implementation of the builtin count command, used to count the number of arguments sent to it.
 static int builtin_count(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     UNUSED(parser);
diff --git a/src/screen.cpp b/src/screen.cpp
index 049735fc4..ed8668fa7 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -47,7 +47,7 @@
 #define INDENT_STEP 4u
 
 /// The initial screen width.
-#define SCREEN_WIDTH_UNINITIALIZED -1
+#define SCREEN_WIDTH_UNINITIALIZED (-1)
 
 /// A helper value for an invalid location.
 #define INVALID_LOCATION (screen_data_t::cursor_t(-1, -1))

From e4a7e7d4f730c63b27020c12b662fe74d5f46e60 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 25 Nov 2019 17:31:57 -0800
Subject: [PATCH 1283/1732] [clang-tidy] Use strcmp family properly

Found with bugprone-suspicious-string-compare

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/builtin_functions.cpp | 2 +-
 src/env_dispatch.cpp      | 2 +-
 src/history_file.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index f25a3377c..f189bd3e2 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -258,7 +258,7 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
     }
 
     if (metadata_as_comments) {
-        if (std::wcscmp(path, L"stdin")) {
+        if (std::wcscmp(path, L"stdin") != 0) {
             wcstring comment;
             append_format(comment, L"# Defined in %ls @ line %d\n", path, line_number);
             if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index c3b959d4b..1a747c677 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -507,7 +507,7 @@ static void init_locale(const environment_t &vars) {
     FLOGF(env_locale, L"old LC_MESSAGES locale: '%s'", old_msg_locale);
     FLOGF(env_locale, L"new LC_MESSAGES locale: '%s'", new_msg_locale);
 #ifdef HAVE__NL_MSG_CAT_CNTR
-    if (std::strcmp(old_msg_locale, new_msg_locale)) {
+    if (std::strcmp(old_msg_locale, new_msg_locale) != 0) {
         // Make change known to GNU gettext.
         extern int _nl_msg_cat_cntr;
         _nl_msg_cat_cntr++;
diff --git a/src/history_file.cpp b/src/history_file.cpp
index 7ab551f56..453c96dac 100644
--- a/src/history_file.cpp
+++ b/src/history_file.cpp
@@ -265,7 +265,7 @@ static history_item_t decode_item_fish_2_0(const char *base, size_t len) {
                 size_t advance = read_line(base, cursor, len, line);
                 if (trim_leading_spaces(line) <= indent) break;
 
-                if (std::strncmp(line.c_str(), "- ", 2)) break;
+                if (std::strncmp(line.c_str(), "- ", 2) != 0) break;
 
                 // We're going to consume this line.
                 cursor += advance;

From fb8e90de283b67a47aac27f2d14844258c777750 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 29 Nov 2019 23:57:19 -0800
Subject: [PATCH 1284/1732] clang-format .cpp files

---
 src/complete.cpp | 15 +++++++++------
 src/fallback.cpp |  4 +---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index fe4d67a40..a93047493 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1589,16 +1589,19 @@ void completer_t::perform() {
                     tokenizer_t tok(unaliased_cmd.c_str(), TOK_ACCEPT_UNFINISHED);
                     maybe_t<tok_t> cmd_tok = tok.next();
                     assert(cmd_tok);
-                    unaliased_cmd = unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
+                    unaliased_cmd =
+                        unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
                     parser->libdata().transient_commandlines.push_back(unaliased_cmd);
-                    cleanup_t remove_transient([&] { parser->libdata().transient_commandlines.pop_back(); });
+                    cleanup_t remove_transient(
+                        [&] { parser->libdata().transient_commandlines.pop_back(); });
                     std::vector<completion_t> comp;
-                    complete(unaliased_cmd, &comp,
-                             completion_request_t::fuzzy_match, parser->vars(), parser->shared());
+                    complete(unaliased_cmd, &comp, completion_request_t::fuzzy_match,
+                             parser->vars(), parser->shared());
                     this->completions.insert(completions.end(), comp.begin(), comp.end());
                     do_file = false;
-                } else if (!complete_param(cmd, previous_argument_unescape, current_argument_unescape,
-                                    !had_ddash)) { // Invoke any custom completions for this command.
+                } else if (!complete_param(
+                               cmd, previous_argument_unescape, current_argument_unescape,
+                               !had_ddash)) {  // Invoke any custom completions for this command.
                     do_file = false;
                 }
                 if (wants_transient) {
diff --git a/src/fallback.cpp b/src/fallback.cpp
index d52e0ec7c..6b7ff3d62 100644
--- a/src/fallback.cpp
+++ b/src/fallback.cpp
@@ -219,9 +219,7 @@ int futimes(int fd, const struct timeval *times) {
 #endif
 
 #if HAVE_GETTEXT
-char *fish_gettext(const char *msgid) {
-    return gettext(msgid);
-}
+char *fish_gettext(const char *msgid) { return gettext(msgid); }
 
 char *fish_bindtextdomain(const char *domainname, const char *dirname) {
     return bindtextdomain(domainname, dirname);

From c36d802dda7c9797fbf8bbd3dce1e413ccb20bb5 Mon Sep 17 00:00:00 2001
From: mk2 <mk2@mk2.red>
Date: Fri, 29 Nov 2019 21:57:11 +0900
Subject: [PATCH 1285/1732] Move __fish_complete_file_url to evince.fish

---
 share/completions/evince.fish                 | 20 +++++++++++++++++++
 share/functions/__fish_complete_file_url.fish | 20 -------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 share/functions/__fish_complete_file_url.fish

diff --git a/share/completions/evince.fish b/share/completions/evince.fish
index cc1e048e6..4324949ea 100644
--- a/share/completions/evince.fish
+++ b/share/completions/evince.fish
@@ -1,4 +1,24 @@
 
+function __fish_complete_file_url
+    set -l comp
+
+    if set -q argv[1]
+        set comp $argv[1]
+    else
+        set comp (commandline -ct)
+    end
+
+    set -l prefix (echo $comp|cut -c 1-7)
+
+    if test file:// = $prefix
+        set -l stripped (echo $comp|cut -c 8-)
+        printf "%s\n" file://(complete -C"echo $stripped")
+    else
+        echo file://
+    end
+
+end
+
 complete -c evince -a '(__fish_complete_file_url)'
 complete -c evince -s p -l page-label -d "The page of the document to display" -x
 complete -c evince -s f -l fullscreen -d "Run evince in fullscreen mode"
diff --git a/share/functions/__fish_complete_file_url.fish b/share/functions/__fish_complete_file_url.fish
deleted file mode 100644
index c19df569e..000000000
--- a/share/functions/__fish_complete_file_url.fish
+++ /dev/null
@@ -1,20 +0,0 @@
-
-function __fish_complete_file_url
-    set -l comp
-
-    if set -q argv[1]
-        set comp $argv[1]
-    else
-        set comp (commandline -ct)
-    end
-
-    set -l prefix (echo $comp|cut -c 1-7)
-
-    if test file:// = $prefix
-        set -l stripped (echo $comp|cut -c 8-)
-        printf "%s\n" file://(complete -C"echo $stripped")
-    else
-        echo file://
-    end
-
-end

From 39e5ffde93c7139bcf2372c6ee786cb6798e226f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 30 Nov 2019 00:23:00 -0800
Subject: [PATCH 1286/1732] Rename __fish_complete_file_url to
 __fish_evince_complete_file_url

As the function is now private to evince, use a less generic name.
---
 share/completions/evince.fish | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/share/completions/evince.fish b/share/completions/evince.fish
index 4324949ea..12e2c46e3 100644
--- a/share/completions/evince.fish
+++ b/share/completions/evince.fish
@@ -1,5 +1,5 @@
 
-function __fish_complete_file_url
+function __fish_evince_complete_file_url
     set -l comp
 
     if set -q argv[1]
@@ -19,10 +19,9 @@ function __fish_complete_file_url
 
 end
 
-complete -c evince -a '(__fish_complete_file_url)'
+complete -c evince -a '(__fish_evince_complete_file_url)'
 complete -c evince -s p -l page-label -d "The page of the document to display" -x
 complete -c evince -s f -l fullscreen -d "Run evince in fullscreen mode"
 complete -c evince -s s -l presentation -d "Run evince in presentation mode"
 complete -c evince -s w -l preview -d "Run evince as a previewer"
 complete -c evince -l display -d "X display to use"
-

From 9fe7efb82f4cc29f0e00c64f93a4350f615c4c82 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 28 Nov 2019 11:24:12 -0800
Subject: [PATCH 1287/1732] git_version_gen: Run through shellcheck

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 build_tools/git_version_gen.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh
index 86132888e..34966ab5c 100755
--- a/build_tools/git_version_gen.sh
+++ b/build_tools/git_version_gen.sh
@@ -7,7 +7,7 @@
 set -e
 
 # Find the fish git directory as two levels up from script directory.
-GIT_DIR="$( cd "$( dirname $( dirname "$0" ) )" && pwd )"
+GIT_DIR="$( cd "$( dirname "$( dirname "$0" )" )" && pwd )"
 DEF_VER=unknown
 
 # First see if there is a version file (included in release tarballs),
@@ -34,7 +34,7 @@ if test -r $FBVF
 then
 	VC=$(grep -v '^#' $FBVF | tr -d '"' | sed -e 's/^FISH_BUILD_VERSION=//')
 else
-	VC=unset
+	VC="unset"
 fi
 
 # Maybe output the FBVF

From 72bf267d96113109e81dd3eb4501b0319d9cf135 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 28 Nov 2019 11:37:43 -0800
Subject: [PATCH 1288/1732] make_pkg: Run through shellcheck

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 build_tools/make_pkg.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh
index 44897afb6..71c8ee1ed 100755
--- a/build_tools/make_pkg.sh
+++ b/build_tools/make_pkg.sh
@@ -2,11 +2,11 @@
 
 # Script to produce an OS X installer .pkg and .app(.zip)
 
-VERSION=`git describe --always --dirty 2>/dev/null`
+VERSION=$(git describe --always --dirty 2>/dev/null)
 if test -z "$VERSION" ; then
   echo "Could not get version from git"
   if test -f version; then
-    VERSION=`cat version`
+    VERSION=$(cat version)
   fi
 fi
 
@@ -17,19 +17,19 @@ set -x
 #Exit on error
 set -e
 
-PKGDIR=`mktemp -d`
+PKGDIR=$(mktemp -d)
 
 SRC_DIR=$PWD
 OUTPUT_PATH=${FISH_ARTEFACT_PATH:-~/fish_built}
 
-mkdir -p $PKGDIR/build $PKGDIR/root $PKGDIR/intermediates $PKGDIR/dst
-( cd "$PKGDIR/build" && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo "$SRC_DIR" && make -j 4 && env DESTDIR=$PKGDIR/root/ make install )
-pkgbuild --scripts build_tools/osx_package_scripts --root $PKGDIR/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION"  $PKGDIR/intermediates/fish.pkg
+mkdir -p "$PKGDIR/build" "$PKGDIR/root" "$PKGDIR/intermediates" "$PKGDIR/dst"
+{ cd "$PKGDIR/build" && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo "$SRC_DIR" && make -j 4 && env DESTDIR="$PKGDIR/root/" make install; }
+pkgbuild --scripts build_tools/osx_package_scripts --root "$PKGDIR/root/" --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" "$PKGDIR/intermediates/fish.pkg"
 
-productbuild  --package-path $PKGDIR/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ $OUTPUT_PATH/fish-$VERSION.pkg
+productbuild  --package-path "$PKGDIR/intermediates" --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ "$OUTPUT_PATH/fish-$VERSION.pkg"
 
 
 # Make the app
-( cd "$PKGDIR/build" && make fish_macapp && zip -r "$OUTPUT_PATH/fish-$VERSION.app.zip" fish.app )
+{ cd "$PKGDIR/build" && make fish_macapp && zip -r "$OUTPUT_PATH/fish-$VERSION.app.zip" fish.app; }
 
-rm -r $PKGDIR
+rm -r "$PKGDIR"

From 6b6884aec63dca3e0e1a2de288e513b204e5c4d7 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 28 Nov 2019 11:41:29 -0800
Subject: [PATCH 1289/1732] osx/install: Run through shellcheck

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 osx/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osx/install.sh b/osx/install.sh
index 44a790410..6e3ce6cb2 100755
--- a/osx/install.sh
+++ b/osx/install.sh
@@ -4,8 +4,8 @@
 set -e
 
 # Make sure we're run as root
-scriptname=`basename "$0"`
-if [[ $UID -ne 0 ]]; then
+scriptname=$(basename "$0")
+if [ "$UID" -ne 0 ]; then
      echo "${scriptname} must be run as root"
      exit 1
 fi

From 1f976a5041b8aa7d0c4786ace985cfacd8921839 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 16 Nov 2019 16:03:14 +0100
Subject: [PATCH 1290/1732] Disavow IRC channel

I don't know of any fish dev on there, so it's not a good channel to
reach us and I have no idea how good it is, so it's best to just ditch it.
---
 README.md                   | 2 +-
 sphinx_doc_src/tutorial.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e94c40730..6830a8e0f 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,6 @@ See the [Guide for Developers](CONTRIBUTING.md).
 
 ## Contact Us
 
-Questions, comments, rants and raves can be posted to the official fish mailing list at <https://lists.sourceforge.net/lists/listinfo/fish-users> or join us on our [gitter.im channel](https://gitter.im/fish-shell/fish-shell) or IRC channel [#fish at irc.oftc.net](https://webchat.oftc.net/?channels=fish). Or use the [fish tag on Stackoverflow](https://stackoverflow.com/questions/tagged/fish) for questions related to fish script and the [fish tag on Superuser](https://superuser.com/questions/tagged/fish) for all other questions (e.g., customizing colors, changing key bindings).
+Questions, comments, rants and raves can be posted to the official fish mailing list at <https://lists.sourceforge.net/lists/listinfo/fish-users> or join us on our [gitter.im channel](https://gitter.im/fish-shell/fish-shell). Or use the [fish tag on Stackoverflow](https://stackoverflow.com/questions/tagged/fish) for questions related to fish script and the [fish tag on Superuser](https://superuser.com/questions/tagged/fish) for all other questions (e.g., customizing colors, changing key bindings).
 
 Found a bug? Have an awesome idea? Please [open an issue](https://github.com/fish-shell/fish-shell/issues/new).
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 73f47a625..df4e3a114 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -711,4 +711,4 @@ with ``/bin/bash``, ``/bin/tcsh`` or ``/bin/zsh`` as appropriate in the steps ab
 Ready for more?
 ---------------
 
-If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, the `official gitter channel <https://gitter.im/fish-shell/fish-shell>`__, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, the IRC channel \#fish on ``irc.oftc.net``, and the `github page <https://github.com/fish-shell/fish-shell/>`__.
+If you want to learn more about fish, there is :ref:`lots of detailed documentation <intro>`, the `official gitter channel <https://gitter.im/fish-shell/fish-shell>`__, an `official mailing list <https://lists.sourceforge.net/lists/listinfo/fish-users>`__, and the `github page <https://github.com/fish-shell/fish-shell/>`__.

From 8192fb2f2a4ea9f6fb5513bac69597db1ccd0a45 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Wed, 27 Nov 2019 12:01:47 +0900
Subject: [PATCH 1291/1732] Fix Windows path support for WSL/Cygwin

- Use wslpath under WSL to provide full path to help file
- Use eval on the final command to cmd.exe
- Use trampoline where necessary for Cygwin
---
 share/functions/help.fish | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index bfbcc4443..91fc2580e 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -100,6 +100,8 @@ function help --description 'Show help for the fish shell'
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
             set fish_browser cygstart \"$fish_browser\"
+        else
+            set need_trampoline 1
         end
     end
 
@@ -107,13 +109,13 @@ function help --description 'Show help for the fish shell'
         case "."
             set fish_help_page "cmds/source.html"
         case globbing
-            set fish_help_page "index.html\#expand"
+            set fish_help_page "index.html#expand"
         case (__fish_print_commands)
             set fish_help_page "cmds/$fish_help_item.html"
         case $help_topics
-            set fish_help_page "index.html\#$fish_help_item"
+            set fish_help_page "index.html#$fish_help_item"
         case 'tut_*'
-            set fish_help_page "tutorial.html\#$fish_help_item"
+            set fish_help_page "tutorial.html#$fish_help_item"
         case tutorial
             set fish_help_page "tutorial.html"
         case "*"
@@ -137,9 +139,11 @@ function help --description 'Show help for the fish shell'
         # Help is installed, use it
         set page_url file://$__fish_help_dir/$fish_help_page
 
-        # In Cygwin, we need to convert the base help dir to a Windows path before converting it to a file URL
+        # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
         if type -q cygpath
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
+        else if type -q wslpath
+            set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
         end
     else
         # Go to the web. Only include one dot in the version string
@@ -152,7 +156,7 @@ function help --description 'Show help for the fish shell'
     if set -q need_trampoline[1]
         # If string replace doesn't replace anything, we don't actually need a
         # trampoline (they're only needed if there's a fragment in the path)
-        if set -l clean_url (string replace '\\#' '#' $page_url)
+        if set -l clean_url (string match -re '#' $page_url)
             # Write a temporary file that will redirect where we want.
             set -q TMPDIR
             or set -l TMPDIR /tmp
@@ -160,12 +164,22 @@ function help --description 'Show help for the fish shell'
             set -l tmpname $tmpdir/help.html
             echo '<meta http-equiv="refresh" content="0;URL=\''$clean_url'\'" />' >$tmpname
             set page_url file://$tmpname
+
+            # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
+            if type -q cygpath
+                set page_url file://(cygpath -m $tmpname)
+            else if type -q wslpath
+                set page_url file://(wslpath -w $tmpname)
+            end
         end
     end
 
+    # URL may contain # (anchor) or $ (hidden share in Windows)
+    set page_url (string escape $page_url)
+
     # cmd.exe needs more coaxing.
     if string match -qr 'cmd.exe$' -- $fish_browser[1]
-        $fish_browser /c "start $page_url"
+        eval $fish_browser /c "start $page_url"
         # If browser is known to be graphical, put into background
     else if contains -- $fish_browser[1] $graphical_browsers
         switch $fish_browser[1]

From 585e4e905b6c0d9f63d205a068f7add22c4b6d93 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Fri, 29 Nov 2019 12:14:40 +0900
Subject: [PATCH 1292/1732] Dont convert path if browser is going to be run in
 terminal

---
 share/functions/help.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 91fc2580e..ad1f38a85 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -143,6 +143,7 @@ function help --description 'Show help for the fish shell'
         if type -q cygpath
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
         else if type -q wslpath
+        and string match -qr '.exe' $fish_browser
             set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
         end
     else

From d1a153cc7eb2245bae184f220494970e9b913890 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Fri, 29 Nov 2019 14:09:58 +0900
Subject: [PATCH 1293/1732] Dont convert path if browser is going to be run in
 terminal

---
 share/functions/help.fish | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index ad1f38a85..2f6676b78 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -94,9 +94,11 @@ function help --description 'Show help for the fish shell'
         return 1
     end
 
-    # In Cygwin, start the user-specified browser using cygstart
+    # In Cygwin, start the user-specified browser using cygstart,
+    # only if a Windows browser is to be used.
     if type -q cygstart
         if test $fish_browser != "cygstart"
+        and not command -sq $fish_browser[1]
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
             set fish_browser cygstart \"$fish_browser\"
@@ -140,10 +142,12 @@ function help --description 'Show help for the fish shell'
         set page_url file://$__fish_help_dir/$fish_help_page
 
         # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
+        # but only if a Windows browser is being used
         if type -q cygpath
+        and string match -qr "cygstart" $fish_browser[1]
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
         else if type -q wslpath
-        and string match -qr '.exe' $fish_browser
+        and string match -qr '.exe' $fish_browser[1]
             set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
         end
     else

From b358cee5feb80b92b60bc22f214c02c1bcae8540 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 19:48:22 +0900
Subject: [PATCH 1294/1732] Move __fish_complete_setxkbmap into the completion
 script

---
 share/completions/setxkbmap.fish               | 3 +++
 share/functions/__fish_complete_setxkbmap.fish | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 share/functions/__fish_complete_setxkbmap.fish

diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 0d4592b3d..3ef699ce1 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -1,3 +1,6 @@
+function __fish_complete_setxkbmap --description 'Complete setxkb options' --argument-names what
+     sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
+end
 
 set -l filter '"s/\S+\s\S+\s(.+)\((.+)\)/\1\t\2/;"'
 
diff --git a/share/functions/__fish_complete_setxkbmap.fish b/share/functions/__fish_complete_setxkbmap.fish
deleted file mode 100644
index 7260f7e20..000000000
--- a/share/functions/__fish_complete_setxkbmap.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_complete_setxkbmap --description 'Complete setxkb options' --argument-names what
-    sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
-end

From b3291619f4cd04b527e2542022c729f75eb2600b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 20:15:53 +0900
Subject: [PATCH 1295/1732] Add missing logic to trampoline block

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

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 2f6676b78..207293846 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -171,9 +171,12 @@ function help --description 'Show help for the fish shell'
             set page_url file://$tmpname
 
             # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
+            # but only if a Windows browser is being used
             if type -q cygpath
+            and string match -qr "cygstart" $fish_browser[1]
                 set page_url file://(cygpath -m $tmpname)
             else if type -q wslpath
+            and string match -qr '.exe' $fish_browser[1]
                 set page_url file://(wslpath -w $tmpname)
             end
         end

From 6245d76e5765bff5797832819d13035643203d9b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 20:24:10 +0900
Subject: [PATCH 1296/1732] Move __fish_complete_lsusb into the completion
 script

---
 share/completions/lsusb.fish               | 4 ++++
 share/functions/__fish_complete_lsusb.fish | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 share/functions/__fish_complete_lsusb.fish

diff --git a/share/completions/lsusb.fish b/share/completions/lsusb.fish
index 4373b8e55..9ea781a58 100644
--- a/share/completions/lsusb.fish
+++ b/share/completions/lsusb.fish
@@ -1,3 +1,7 @@
+function __fish_complete_lsusb
+    lsusb | awk -F[ :] '{ print $2 ":" $4 }'
+end
+
 complete -c lsusb -s v -l verbose -d "Increase verbosity (show descriptors)"
 complete -x -c lsusb -s s -a '(__fish_complete_lsusb)' -d "Show only devices with specified device and/or bus numbers (in decimal)"
 complete -c lsusb -s d -d "Show only devices with the specified vendor and product ID numbers (in hexadecimal)"
diff --git a/share/functions/__fish_complete_lsusb.fish b/share/functions/__fish_complete_lsusb.fish
deleted file mode 100644
index b6814b29f..000000000
--- a/share/functions/__fish_complete_lsusb.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_complete_lsusb
-    lsusb | awk -F[ :] '{ print $2 ":" $4 }'
-end

From 6486349725b0ba3f34f5fc5889f5860b14ffb167 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 21:00:40 +0900
Subject: [PATCH 1297/1732] Move __fish_complete_tar into the completion script

---
 po/de.po                                 | 13 -------------
 po/en.po                                 | 13 -------------
 po/fr.po                                 | 13 -------------
 po/nb.po                                 | 13 -------------
 po/nn.po                                 | 13 -------------
 po/pl.po                                 | 13 -------------
 po/pt_BR.po                              | 13 -------------
 po/sv.po                                 | 13 -------------
 po/zh_CN.po                              | 13 -------------
 share/completions/tar.fish               | 20 +++++++++++++++++++-
 share/functions/__fish_complete_tar.fish | 21 ---------------------
 11 files changed, 19 insertions(+), 139 deletions(-)
 delete mode 100644 share/functions/__fish_complete_tar.fish

diff --git a/po/de.po b/po/de.po
index 7e83305d4..3cf1f84bd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3603,14 +3603,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr "Nicht vorhandene Dateien als leer behandeln"
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 #, fuzzy
 msgid "Achieved compression ratio"
@@ -67211,11 +67203,6 @@ msgstr "Saloppe Einhäng-Optionen tolerieren"
 msgid "Complete \"svn diff\" arguments"
 msgstr "Anzahl der Argumente zählen"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/en.po b/po/en.po
index f1474f970..9d93c2a78 100644
--- a/po/en.po
+++ b/po/en.po
@@ -3442,14 +3442,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr "Treat absent files as empty"
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr "%s\\tArchived file\\n"
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr "Achieved compression ratio"
@@ -66561,11 +66553,6 @@ msgstr "Complete using path"
 msgid "Complete \"svn diff\" arguments"
 msgstr "Complete “svn diff” arguments"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/fr.po b/po/fr.po
index c3c90cc9a..d8992d1bd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3623,14 +3623,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr "ou le fichier était vide"
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr "%s\\tFichier archivé\\n"
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr "Taux de compression attein"
@@ -65537,11 +65529,6 @@ msgstr "Compléter en utilisant les fichiers"
 msgid "Complete \"svn diff\" arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/nb.po b/po/nb.po
index 52e244788..e16759f7d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3377,14 +3377,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr ""
@@ -61999,11 +61991,6 @@ msgstr ""
 msgid "Complete \"svn diff\" arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 1241996d8..1795dd448 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3377,14 +3377,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr ""
@@ -61999,11 +61991,6 @@ msgstr ""
 msgid "Complete \"svn diff\" arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 37c89891d..de88612c7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3435,14 +3435,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr ""
@@ -62588,11 +62580,6 @@ msgstr ""
 msgid "Complete \"svn diff\" arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4e3ce749c..06a7ee48d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3578,14 +3578,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr "Treat absent files as empty"
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 #, fuzzy
 msgid "Achieved compression ratio"
@@ -67681,11 +67673,6 @@ msgstr "Tolerate sloppy mount options"
 msgid "Complete \"svn diff\" arguments"
 msgstr "Count the number of arguments"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/sv.po b/po/sv.po
index ff9d90655..c1dccba8e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3381,14 +3381,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr ""
@@ -62003,11 +61995,6 @@ msgstr ""
 msgid "Complete \"svn diff\" arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8a09b58ee..14bd2b644 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3419,14 +3419,6 @@ msgstr ""
 msgid "or the file was empty"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:2
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:3
-#: /tmp/fish/explicit/share/functions/__fish_complete_tar.fish:4
-#: /tmp/fish/explicit/share/functions/__fish_complete_unrar.fish:1
-msgid "%s\\tArchived file\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
 msgstr ""
@@ -62549,11 +62541,6 @@ msgstr ""
 msgid "Complete \"svn diff\" arguments"
 msgstr "参数的个数的计数"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_tar.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_complete_unrar.fish:1
-msgid "Peek inside of archives and list all files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/share/completions/tar.fish b/share/completions/tar.fish
index 122a4ded0..abeeb478d 100644
--- a/share/completions/tar.fish
+++ b/share/completions/tar.fish
@@ -1,5 +1,23 @@
+function __fish_complete_tar -d "Peek inside of archives and list all files"
+    set -l args (commandline -poc)
+    while count $args >/dev/null
+        switch $args[1]
+            case '-*f' '--file'
+                set -e args[1]
+                if test -f $args[1]
+                    set -l file_list (tar -atf $args[1] 2> /dev/null)
+                    if test -n "$file_list"
+                        printf (_ "%s\tArchived file\n") $file_list
+                    end
+                    return
+                end
+            case '*'
+                set -e args[1]
+                continue
+        end
+    end
+end
 
-# Peek inside of archives and list all files
 complete -c tar -a "(__fish_complete_tar)"
 
 complete -c tar -s A -l catenate -d "Append archive to archive"
diff --git a/share/functions/__fish_complete_tar.fish b/share/functions/__fish_complete_tar.fish
deleted file mode 100644
index a44620e58..000000000
--- a/share/functions/__fish_complete_tar.fish
+++ /dev/null
@@ -1,21 +0,0 @@
-
-function __fish_complete_tar -d "Peek inside of archives and list all files"
-
-    set -l args (commandline -poc)
-    while count $args >/dev/null
-        switch $args[1]
-            case '-*f' '--file'
-                set -e args[1]
-                if test -f $args[1]
-                    set -l file_list (tar -atf $args[1] 2> /dev/null)
-                    if test -n "$file_list"
-                        printf (_ "%s\tArchived file\n") $file_list
-                    end
-                    return
-                end
-            case '*'
-                set -e args[1]
-                continue
-        end
-    end
-end

From fa373c102c94eb392c77e0bff95fb28624772780 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 21:06:44 +0900
Subject: [PATCH 1298/1732] Move __fish_complete_wvdial_peers into the
 completion script

---
 po/de.po                                      |  5 ----
 po/en.po                                      |  4 ---
 po/fr.po                                      |  4 ---
 po/nb.po                                      |  4 ---
 po/nn.po                                      |  4 ---
 po/pl.po                                      |  4 ---
 po/pt_BR.po                                   |  4 ---
 po/sv.po                                      |  4 ---
 po/zh_CN.po                                   |  4 ---
 share/completions/wvdial.fish                 | 30 +++++++++++++++++++
 .../__fish_complete_wvdial_peers.fish         | 29 ------------------
 11 files changed, 30 insertions(+), 66 deletions(-)
 delete mode 100644 share/functions/__fish_complete_wvdial_peers.fish

diff --git a/po/de.po b/po/de.po
index 3cf1f84bd..9c97215bf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -67212,11 +67212,6 @@ msgstr "Liste laufender screen-Sitzungen ausgeben"
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-#, fuzzy
-msgid "Complete wvdial peers"
-msgstr "Vergleiche FILE1 mit allen Operanden"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 #, fuzzy
 msgid "Completes with ZFS mountpoint properties"
diff --git a/po/en.po b/po/en.po
index 9d93c2a78..bccfdc556 100644
--- a/po/en.po
+++ b/po/en.po
@@ -66562,10 +66562,6 @@ msgstr "Print hostname and user for stdin"
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr "Completes with ZFS mountpoint properties"
diff --git a/po/fr.po b/po/fr.po
index d8992d1bd..0c06c6acb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65538,10 +65538,6 @@ msgstr "Lister les noms d’hôtes connus"
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr "Complète avec les paramètres ZFS de point de montage"
diff --git a/po/nb.po b/po/nb.po
index e16759f7d..4295f20af 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -61999,10 +61999,6 @@ msgstr ""
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 1795dd448..2d6005502 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -61999,10 +61999,6 @@ msgstr ""
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index de88612c7..fef177869 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -62588,10 +62588,6 @@ msgstr ""
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 06a7ee48d..db3f7b34c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -67682,10 +67682,6 @@ msgstr "Print a list of all accepted color names"
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 #, fuzzy
 msgid "Completes with ZFS mountpoint properties"
diff --git a/po/sv.po b/po/sv.po
index c1dccba8e..8c8b288f2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -62003,10 +62003,6 @@ msgstr ""
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 14bd2b644..ba178b213 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -62549,10 +62549,6 @@ msgstr ""
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_wvdial_peers.fish:1
-msgid "Complete wvdial peers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 msgid "Completes with ZFS mountpoint properties"
 msgstr ""
diff --git a/share/completions/wvdial.fish b/share/completions/wvdial.fish
index 1186f2c49..adc1f2597 100644
--- a/share/completions/wvdial.fish
+++ b/share/completions/wvdial.fish
@@ -1,3 +1,33 @@
+function __fish_complete_wvdial_peers --description 'Complete wvdial peers' --argument cfgfiles
+    set -q cfgfiles[0]
+    or set -l cfgfiles /etc/wvdial.conf ~/.wvdialrc
+
+    # test if there is an alternative config file specified
+    set -l store_next
+    for opt in (commandline -cpo)
+        if set -q store_next[1]
+            set store_next
+            set cfgfiles $opt
+            continue
+        end
+
+        switch $opt
+            case -C --config
+                set store_next true
+            case '--config=*'
+                set cfgfiles (echo $opt | string replace '--config=' '')
+        end
+    end
+
+    for file in $cfgfiles
+        if test -f $file
+            string match -r '\[Dialer' <$file | string replace -r '\[Dialer (.+)\]' '$1'
+        end
+    end | sort -u | string match -v Defaults
+
+
+end
+
 complete -c wvdial -xa "(__fish_complete_wvdial_peers)" -d "wvdial connections"
 complete -c wvdial -s c -l chat -d 'Run wvdial as chat replacement from within pppd'
 complete -c wvdial -s C -l config -r -d 'Run wvdial with alternative config file'
diff --git a/share/functions/__fish_complete_wvdial_peers.fish b/share/functions/__fish_complete_wvdial_peers.fish
deleted file mode 100644
index 3708e17e4..000000000
--- a/share/functions/__fish_complete_wvdial_peers.fish
+++ /dev/null
@@ -1,29 +0,0 @@
-function __fish_complete_wvdial_peers --description 'Complete wvdial peers' --argument cfgfiles
-    set -q cfgfiles[0]
-    or set -l cfgfiles /etc/wvdial.conf ~/.wvdialrc
-
-    # test if there is an alternative config file specified
-    set -l store_next
-    for opt in (commandline -cpo)
-        if set -q store_next[1]
-            set store_next
-            set cfgfiles $opt
-            continue
-        end
-
-        switch $opt
-            case -C --config
-                set store_next true
-            case '--config=*'
-                set cfgfiles (echo $opt | string replace '--config=' '')
-        end
-    end
-
-    for file in $cfgfiles
-        if test -f $file
-            string match -r '\[Dialer' <$file | string replace -r '\[Dialer (.+)\]' '$1'
-        end
-    end | sort -u | string match -v Defaults
-
-
-end

From 2fd1e4ab756780fbe547af3303d7842f728f3386 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 20:27:17 +0900
Subject: [PATCH 1299/1732] Move __fish_complete_unrar into the completion
 script

---
 share/completions/unrar.fish               | 18 +++++++++++++++++-
 share/functions/__fish_complete_unrar.fish | 21 ---------------------
 2 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 share/functions/__fish_complete_unrar.fish

diff --git a/share/completions/unrar.fish b/share/completions/unrar.fish
index 2619ca279..41d85cc73 100644
--- a/share/completions/unrar.fish
+++ b/share/completions/unrar.fish
@@ -1,5 +1,21 @@
+function __fish_complete_unrar -d "Peek inside of archives and list all files"
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
+            case '-*'
+                continue
+
+            case '*.rar'
+                if test -f $i
+                    set -l file_list (unrar vb $i)
+                    printf (_ "%s\tArchived file\n") $file_list
+                end
+                return
+        end
+    end
+end
 
-# Peek inside of archives and list all files
 complete -c unrar -a "(__fish_complete_unrar)"
 
 complete -x -c unrar -n '__fish_use_subcommand' -a e -d "Extract files to current directory"
diff --git a/share/functions/__fish_complete_unrar.fish b/share/functions/__fish_complete_unrar.fish
deleted file mode 100644
index c5cbc7ad9..000000000
--- a/share/functions/__fish_complete_unrar.fish
+++ /dev/null
@@ -1,21 +0,0 @@
-
-function __fish_complete_unrar -d "Peek inside of archives and list all files"
-
-    set -l cmd (commandline -poc)
-    set -e cmd[1]
-    for i in $cmd
-        switch $i
-            case '-*'
-                continue
-
-            case '*.rar'
-                if test -f $i
-                    set -l file_list (unrar vb $i)
-                    printf (_ "%s\tArchived file\n") $file_list
-                end
-                return
-        end
-    end
-end
-
-

From 86133b0a2b641427418f2f8c34e81039240ccc67 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Nov 2019 20:05:31 +0100
Subject: [PATCH 1300/1732] Add `read --tokenize`

This splits a string into variables according to the shell's
tokenization rules, considering quoting, escaping etc.

This runs an automatic `unescape` on the string so it's presented like
it would be passed to the command. E.g.

    printf '%s\n' a\ b

returns the tokens

printf
%s\n
a b

It might be useful to add another mode "--tokenize-raw" that doesn't
do that, but this seems to be the more useful of the two.

Fixes #3823.
---
 sphinx_doc_src/cmds/read.rst | 13 +++++++-
 src/builtin_read.cpp         | 60 ++++++++++++++++++++++++++++++++++--
 tests/checks/read.fish       | 14 +++++++++
 3 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 tests/checks/read.fish

diff --git a/sphinx_doc_src/cmds/read.rst b/sphinx_doc_src/cmds/read.rst
index 9ab622616..bc086c5c8 100644
--- a/sphinx_doc_src/cmds/read.rst
+++ b/sphinx_doc_src/cmds/read.rst
@@ -38,6 +38,8 @@ The following options are available:
 
 - ``-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.
+
 - ``-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.
@@ -53,7 +55,7 @@ The following options are available:
 
 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 the ``--delimiter`` argument is not 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.
+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.
 
 With the ``--line`` option, ``read`` reads a line of input from standard input into each provided variable, stopping when each variable has been filled. The line is not tokenized.
 
@@ -101,3 +103,12 @@ The following code stores the value 'hello' in the shell variable ``$foo``.
     echo $a # a
     echo $b # b
     echo $c # c
+
+    # --tokenize honors quotes and escaping like the shell's argument passing:
+    echo 'a\ b' | read -t first second
+    echo $first # outputs "a b", $second is empty
+
+    echo 'a"foo bar"b (command echo wurst)*" "{a,b}' | read -lt -l a b c
+    echo $a # outputs 'afoo bar' (without the quotes)
+    echo $b # outputs '(command echo wurst)* {a,b}' (without the quotes)
+    echo $c # nothing
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 763ca26b3..20df8f37a 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -2,7 +2,6 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include "builtin_read.h"
-
 #include <unistd.h>
 
 #include <algorithm>
@@ -46,6 +45,7 @@ struct read_cmd_opts_t {
     // empty string and a given empty delimiter.
     bool have_delimiter = false;
     wcstring delimiter;
+    bool tokenize = false;
     bool shell = false;
     bool array = false;
     bool silent = false;
@@ -55,7 +55,7 @@ struct read_cmd_opts_t {
     bool one_line = false;
 };
 
-static const wchar_t *const short_options = L":ac:d:ghiLlm:n:p:sSuxzP:UR:LB";
+static const wchar_t *const short_options = L":ac:d:ghiLlm:n:p:sStuxzP:UR:LB";
 static const struct woption long_options[] = {{L"array", no_argument, nullptr, 'a'},
                                               {L"command", required_argument, nullptr, 'c'},
                                               {L"delimiter", required_argument, nullptr, 'd'},
@@ -72,6 +72,7 @@ static const struct woption long_options[] = {{L"array", no_argument, nullptr, '
                                               {L"right-prompt", required_argument, nullptr, 'R'},
                                               {L"shell", no_argument, nullptr, 'S'},
                                               {L"silent", no_argument, nullptr, 's'},
+                                              {L"tokenize", no_argument, nullptr, 't'},
                                               {L"unexport", no_argument, nullptr, 'u'},
                                               {L"universal", no_argument, nullptr, 'U'},
                                               {nullptr, 0, nullptr, 0}};
@@ -154,6 +155,10 @@ static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind,  //!OCLINT(high nc
                 opts.shell = true;
                 break;
             }
+            case L't': {
+                opts.tokenize = true;
+                break;
+            }
             case L'U': {
                 opts.place |= ENV_UNIVERSAL;
                 break;
@@ -397,6 +402,20 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
         return STATUS_INVALID_ARGS;
     }
 
+    if (opts.tokenize && opts.have_delimiter) {
+        streams.err.append_format(
+            BUILTIN_ERR_COMBO2, cmd,
+            L"--delimiter and --tokenize can not be used together");
+        return STATUS_INVALID_ARGS;
+    }
+
+    if (opts.tokenize && opts.one_line) {
+        streams.err.append_format(
+            BUILTIN_ERR_COMBO2, cmd,
+            L"--line and --tokenize can not be used together");
+        return STATUS_INVALID_ARGS;
+    }
+
     // Verify all variable names.
     for (int i = 0; i < argc; i++) {
         if (!valid_var_name(argv[i])) {
@@ -486,6 +505,43 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             return exit_res;
         }
 
+        if (opts.tokenize) {
+            tokenizer_t tok{buff.c_str(), TOK_ACCEPT_UNFINISHED};
+            wcstring out;
+            if (opts.array) {
+                // Array mode: assign each token as a separate element of the sole var.
+                wcstring_list_t tokens;
+                while (auto t = tok.next()) {
+                    auto text = tok.text_of(*t);
+                    if (unescape_string(text, &out, UNESCAPE_DEFAULT)) {
+                        tokens.push_back(out);
+                    } else {
+                        tokens.push_back(text);
+                    }
+                }
+
+                vars.set(*var_ptr++, opts.place, tokens);
+            } else {
+                maybe_t<tok_t> t;
+                while ((vars_left() - 1 > 0) && (t = tok.next())) {
+                    auto text = tok.text_of(*t);
+                    if (unescape_string(text, &out, UNESCAPE_DEFAULT)) {
+                        vars.set_one(*var_ptr++, opts.place, out);
+                    } else {
+                        vars.set_one(*var_ptr++, opts.place, text);
+                    }
+                }
+
+                // If we still have tokens, set the last variable to them.
+                if (t = tok.next()) {
+                    wcstring rest = wcstring(buff, t->offset);
+                    vars.set_one(*var_ptr++, opts.place, rest);
+                }
+            }
+            // The rest of the loop is other split-modes, we don't care about those.
+            continue;
+        }
+
         if (!opts.have_delimiter) {
             auto ifs = parser.vars().get(L"IFS");
             if (!ifs.missing_or_empty()) opts.delimiter = ifs->as_string();
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
new file mode 100644
index 000000000..fee0bb3c6
--- /dev/null
+++ b/tests/checks/read.fish
@@ -0,0 +1,14 @@
+# RUN: %fish %s
+echo 'a | b' | read -lt a b c
+
+set -l
+# CHECK: a a
+# CHECK: b '|'
+# CHECK: c b
+
+echo 'a"foo bar"b' | read -lt a b c
+
+set -l
+# CHECK: a 'afoo barb'
+# CHECK: b
+# CHECK: c

From 115892ccd270cce4f6b1a90810d7bf2b5bb5b3a2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 29 Nov 2019 20:09:02 +0100
Subject: [PATCH 1301/1732] alias: Use `read --tokenize`

This did some weird unescaping to try to extract the first word.

So we're now more likely to be *correct*, and the alias benchmark is
about 20% *faster*.

Call it a win-win.
---
 benchmarks/benchmarks/aliases.fish | 16 +++-------------
 share/functions/alias.fish         | 16 +++-------------
 tests/checks/alias.fish            |  2 ++
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/benchmarks/benchmarks/aliases.fish b/benchmarks/benchmarks/aliases.fish
index 0eb865842..e6a366685 100644
--- a/benchmarks/benchmarks/aliases.fish
+++ b/benchmarks/benchmarks/aliases.fish
@@ -44,22 +44,12 @@ function alias --description 'Creates a function wrapping a command'
         return 1
     end
 
-    # Extract the first command from the body. This is supposed to replace all non-escaped (i.e.
-    # preceded by an odd number of `\`) spaces with a newline so it splits on them. See issue #2220
-    # for why the following borderline incomprehensible code exists.
-    set -l tmp (string replace -ra -- "([^\\\ ])((\\\\\\\)*) " '$1\n' $body)
-    set first_word (string trim -- $tmp[1])
-    # If the user does something like `alias x 'foo; bar'` we need to strip the semicolon.
-    set base_command (string trim -c ';' -- $first_word)
-    if set -q tmp[2]
-        set body $tmp[2..-1]
-    else
-        set body
-    end
+    # Extract the first command from the body.
+    printf '%s\n' $body | read -lt first_word body
 
     # Prevent the alias from immediately running into an infinite recursion if
     # $body starts with the same command as $name.
-    if test $base_command = $name
+    if test $first_word = $name
         if contains $name (builtin --names)
             set prefix builtin
         else
diff --git a/share/functions/alias.fish b/share/functions/alias.fish
index 0651cc6ac..ea3c15863 100644
--- a/share/functions/alias.fish
+++ b/share/functions/alias.fish
@@ -44,22 +44,12 @@ function alias --description 'Creates a function wrapping a command'
         return 1
     end
 
-    # Extract the first command from the body. This is supposed to replace all non-escaped (i.e.
-    # preceded by an odd number of `\`) spaces with a newline so it splits on them. See issue #2220
-    # for why the following borderline incomprehensible code exists.
-    set -l tmp (string replace -ra -- "([^\\\ ])((\\\\\\\)*) " '$1\n' $body)
-    set first_word (string trim -- $tmp[1])
-    # If the user does something like `alias x 'foo; bar'` we need to strip the semicolon.
-    set base_command (string trim -c ';' -- $first_word)
-    if set -q tmp[2]
-        set body $tmp[2..-1]
-    else
-        set body
-    end
+    # Extract the first command from the body.
+    printf '%s\n' $body | read -lt first_word body
 
     # Prevent the alias from immediately running into an infinite recursion if
     # $body starts with the same command as $name.
-    if test $base_command = $name
+    if test $first_word = $name
         if contains $name (builtin --names)
             set prefix builtin
         else
diff --git a/tests/checks/alias.fish b/tests/checks/alias.fish
index fb3bb3f7c..569ee125e 100644
--- a/tests/checks/alias.fish
+++ b/tests/checks/alias.fish
@@ -10,9 +10,11 @@ my_alias
 
 alias a-2='echo "hello there"'
 
+alias foo '"a b" c d e'
 # Bare `alias` should list the aliases we have created and nothing else
 # We have to exclude two aliases because they're an artifact of the unit test
 # framework and we can't predict the definition.
 alias | grep -Ev '^alias (fish_indent|fish_key_reader) '
 # CHECK: alias a-2 'echo "hello there"'
+# CHECK: alias foo '"a b" c d e'
 # CHECK: alias my_alias 'foo; and echo foo ran'

From 00fc36c3eb2459deb1ec8ac6d4ffa383776cc226 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 30 Nov 2019 23:12:17 +0100
Subject: [PATCH 1302/1732] docs: Simplify argparse docs

This was a bit stuffy and verbose, so try to make it a tad more human.

Also don't mention `fish_opt` constantly. It's not actually all that
useful as argparse isn't as difficult to use as we thought.

[ci skip]
---
 sphinx_doc_src/cmds/argparse.rst | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/sphinx_doc_src/cmds/argparse.rst b/sphinx_doc_src/cmds/argparse.rst
index 61e6853c2..393a32e70 100644
--- a/sphinx_doc_src/cmds/argparse.rst
+++ b/sphinx_doc_src/cmds/argparse.rst
@@ -14,13 +14,13 @@ Synopsis
 Description
 -----------
 
-This command makes it easy for fish scripts and functions to handle arguments in a manner 100% identical to how fish builtin commands handle their arguments. You pass a sequence of arguments that define the options recognized, followed by a literal ``--``, then the arguments to be parsed (which might also include a literal ``--``). More on this in the `usage <#usage>`__ section below.
+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 `usage <#usage>`__ section below.
 
-Each OPTION_SPEC can be written in the `domain specific language <#option-specifications>`__ described below or created using the companion :ref:`fish_opt <cmd-fish_opt>` command. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
+Each option specification (``OPTION_SPEC``) is written in the `domain specific language <#option-specifications>`__ described below. All OPTION_SPECs must appear after any argparse flags and before the ``--`` that separates them from the arguments to be parsed.
 
 Each option that is seen in the ARG list will result in a var name of the form ``_flag_X``, where ``X`` is the short flag letter and the long flag name. The OPTION_SPEC always requires a short flag even if it can't be used. So there will always be ``_flag_X`` var set using the short flag letter if the corresponding short or long flag is seen. The long flag name var (e.g., ``_flag_help``) will only be defined, obviously, if the OPTION_SPEC includes a long flag name.
 
-For example ``_flag_h`` and ``_flag_help`` if ``-h`` or ``--help`` is seen. The var will be set with local scope (i.e., as if the script had done ``set -l _flag_X``). If the flag is a boolean (that is, does not have an associated value) the values are the short and long flags seen. If the option is not a boolean flag the values will be zero or more values corresponding to the values collected when the ARG list is processed. If the flag was not seen the flag var will not be set.
+For example ``_flag_h`` and ``_flag_help`` if ``-h`` or ``--help`` is seen. The var will be set with local scope (i.e., as if the script had done ``set -l _flag_X``). If the flag is a boolean (that is, it just is passed or not, it doesn't have a value) the values are the short and long flags seen. If the option is not a boolean the values will be zero or more values corresponding to the values collected when the ARG list is processed. If the flag was not seen the flag var will not be set.
 
 Options
 -------
@@ -37,14 +37,14 @@ The following ``argparse`` options are available. They must appear before all OP
 
 - ``-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. Using this arg is equivalent to calling the C function ``getopt_long()`` with the short options starting with a ``+`` symbol. This is sometimes known as "POSIXLY CORRECT". If this flag is not used then arguments are reordered (i.e., permuted) so that all non-option arguments are moved after option arguments. This mode has several uses but the main one is to implement a command that has subcommands.
+- ``-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.
 
 Usage
 -----
 
-Using this command involves passing two sets of arguments separated by ``--``. The first set consists of one or more option specifications (``OPTION_SPEC`` above) and options that modify the behavior of ``argparse``. These must be listed before the ``--`` argument. The second set are the arguments to be parsed in accordance with the option specifications. They occur after the ``--`` argument and can be empty. More about this below but here is a simple example that might be used in a function named ``my_function``:
+Using this command requires first passing option specifications (``OPTION_SPEC`` below), then a mandatory ``--``, and then the arguments you want to have parsed. More about this below but here is a simple example that might be used in a function named ``my_function``:
 
 
 
@@ -106,7 +106,7 @@ In the following examples if a flag is not seen when parsing the arguments then
 Flag Value Validation
 ---------------------
 
-It is common to want to validate the the value provided for an option satisfies some criteria. For example, that it is a valid integer within a specific range. You can always do this after ``argparse`` returns but you can also request that ``argparse`` perform the validation by executing arbitrary fish script. To do so simply append an ``!`` (exclamation-mark) then the fish script to be run. When that code is executed three vars will be defined:
+Sometimes you need to validate the option values. For example, that it is a valid integer within a specific range, or an ip address, or something entirely different. You can always do this after ``argparse`` returns but you can also request that ``argparse`` perform the validation by executing arbitrary fish script. To do so simply append an ``!`` (exclamation-mark) then the fish script to be run. When that code is executed three vars will be defined:
 
 - ``_argparse_cmd`` will be set to the value of the value of the ``argparse --name`` value.
 
@@ -148,8 +148,3 @@ Some OPTION_SPEC examples:
 After parsing the arguments the ``argv`` var is set with local scope to any values not already consumed during flag processing. If there are not unbound values the var 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.
-
-Notes
------
-
-Prior to the addition of this builtin command in the 2.7.0 release there were two main ways to parse the arguments passed to a fish script or function. One way was to use the OS provided ``getopt`` command. The problem with that is that the GNU and BSD implementations are not compatible. Which makes using that external command difficult other than in trivial situations. The other way is to iterate over ``$argv`` and use the fish ``switch`` statement to decide how to handle the argument. That, however, involves a huge amount of boilerplate code. It is also borderline impossible to implement the same behavior as builtin commands.

From d91b0f86f48ef78c446f90b9eb2e5c311e9f80ac Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 1 Dec 2019 18:05:57 +0100
Subject: [PATCH 1303/1732] Repaint all prompts if the variables change

This is a good idea in general and simplifies the Classic + VCS
prompt.
---
 .../functions/__fish_config_interactive.fish  |  6 ++-
 .../sample_prompts/classic_vcs.fish           | 49 ++++---------------
 2 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 601d24172..0c9ae3269 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -139,7 +139,11 @@ function __fish_config_interactive -d "Initializations that should be performed
     # fish_color_cwd{,_root} changes value. Like all event handlers, it can't be
     # autoloaded.
     #
-    function __fish_repaint -v fish_color_cwd -v fish_color_cwd_root -d "Event handler, repaints the prompt when fish_color_cwd* changes"
+    set -l varargs --on-variable fish_key_bindings
+    for var in user host cwd{,_root} status
+        set -a varargs --on-variable fish_color_$var
+    end
+    function __fish_repaint $varargs -d "Event handler, repaints the prompt when fish_color_cwd* changes"
         if status --is-interactive
             set -e __fish_prompt_cwd
             commandline -f repaint 2>/dev/null
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 768e782d3..ca141feb1 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -1,5 +1,5 @@
 # name: Classic + Vcs
-# author: Kevin Ballard
+# author: Lily Ballard
 # vim: set noet:
 
 function fish_prompt --description 'Write out the prompt'
@@ -7,44 +7,15 @@ function fish_prompt --description 'Write out the prompt'
     set -l last_status $status
     set -l normal (set_color normal)
 
-    # Hack; fish_config only copies the fish_prompt function (see #736)
-    if not set -q -g __fish_classic_git_functions_defined
-        set -g __fish_classic_git_functions_defined
-
-        function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
-            if status --is-interactive
-                commandline -f repaint 2>/dev/null
-            end
-        end
-
-        function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
-            if status --is-interactive
-                commandline -f repaint 2>/dev/null
-            end
-        end
-
-        function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
-            if status --is-interactive
-                commandline -f repaint 2>/dev/null
-            end
-        end
-
-        function __fish_repaint_bind_mode --on-variable fish_key_bindings --description "Event handler; repaint when fish_key_bindings changes"
-            if status --is-interactive
-                commandline -f repaint 2>/dev/null
-            end
-        end
-
-        # initialize our new variables
-        if not set -q __fish_classic_git_prompt_initialized
-            set -qU fish_color_user
-            or set -U fish_color_user -o green
-            set -qU fish_color_host
-            or set -U fish_color_host -o cyan
-            set -qU fish_color_status
-            or set -U fish_color_status red
-            set -U __fish_classic_git_prompt_initialized
-        end
+    # initialize our new variables
+    if not set -q __fish_classic_git_prompt_initialized
+        set -qU fish_color_user
+        or set -U fish_color_user -o green
+        set -qU fish_color_host
+        or set -U fish_color_host -o cyan
+        set -qU fish_color_status
+        or set -U fish_color_status red
+        set -U __fish_classic_git_prompt_initialized
     end
 
     set -l color_cwd

From 031d30c8ac45dd8c92e30ea95f98bb37ae608a38 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sun, 1 Dec 2019 11:03:44 +0000
Subject: [PATCH 1304/1732] Handle multiple arguments in $PAGER

$PAGER may contain arguments, and should thus be word-split before
invocation.
---
 share/functions/__fish_paginate.fish   | 2 +-
 share/functions/__fish_print_help.fish | 2 +-
 share/functions/history.fish           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_paginate.fish b/share/functions/__fish_paginate.fish
index f7c888a37..696c6137a 100644
--- a/share/functions/__fish_paginate.fish
+++ b/share/functions/__fish_paginate.fish
@@ -2,7 +2,7 @@ function __fish_paginate -d "Paginate the current command using the users defaul
 
     set -l cmd less
     if set -q PAGER
-        set cmd $PAGER
+        echo $PAGER | read -at cmd
     end
 
     if test -z (commandline -j | string join '')
diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index beaf6b9fc..55aa628c1 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -110,7 +110,7 @@ function __fish_print_help --description "Print help message for the specified f
     begin
         set -l pager less
         set -q PAGER
-        and set pager $PAGER
+        and echo $PAGER | read -at pager
         not isatty stdout
         and set pager cat # cannot use a builtin here
         # similar to man, but add -F to quit paging when the help output is brief (#6227)
diff --git a/share/functions/history.fish b/share/functions/history.fish
index 65856a89f..355d45147 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -86,7 +86,7 @@ function history --description "display or manipulate interactive command histor
             if isatty stdout
                 set -l pager less
                 set -q PAGER
-                and set pager $PAGER
+                and echo $PAGER | read -at pager
 
                 # If the user hasn't preconfigured less with the $LESS environment variable,
                 # we do so to have it behave like cat if output fits on one screen. Prevent the

From b4f0a67ef28d2f39a02e95051a10ac9cf94e6425 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 2 Dec 2019 02:58:02 +0900
Subject: [PATCH 1305/1732] Add `git-count-objects` and `git-gc` completions

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index c7835acc3..78503d91f 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1016,6 +1016,11 @@ complete -f -c git -n '__fish_git_using_command commit' -l no-edit -d 'Use the s
 complete -f -c git -n '__fish_git_using_command commit; and __fish_contains_opt fixup squash' -k -a '(__fish_git_recent_commits)'
 # TODO options
 
+### count-objects
+complete -f -c git -n '__fish_git_needs_command' -a count-objects -d 'Count unpacked number of objects and their disk consumption'
+complete -f -c git -n '__fish_git_using_command count-objects' -s v -l verbose -d 'Be verbose'
+complete -f -c git -n '__fish_git_using_command count-objects' -s H -l human-readable -d 'Print in human readable format'
+
 ### describe
 complete -c git -n '__fish_git_needs_command' -a describe -d 'Give an object a human readable name based on an available ref'
 complete -k -f -c git -n '__fish_git_using_command describe' -a '(__fish_git_tags)' -d 'Tag'
@@ -1078,6 +1083,15 @@ complete -f -c git -n '__fish_git_using_command difftool' -l trust-exit-code -d
 complete -f -c git -n '__fish_git_using_command difftool' -s x -l extcmd -d 'Specify a custom command for viewing diffs'
 # TODO options
 
+### gc
+complete -f -c git -n '__fish_git_needs_command' -a gc -d 'Cleanup unnecessary files and optimize the local repository'
+complete -f -c git -n '__fish_git_using_command gc' -l aggressive -d 'Aggressively optimize the repository'
+complete -f -c git -n '__fish_git_using_command gc' -l auto -d 'Checks any housekeeping is required and then run'
+complete -f -c git -n '__fish_git_using_command gc' -l prune -d 'Prune loose objects older than date'
+complete -f -c git -n '__fish_git_using_command gc' -l no-prune -d 'Do not prune any loose objects'
+complete -f -c git -n '__fish_git_using_command gc' -l quiet -d 'Be quiet'
+complete -f -c git -n '__fish_git_using_command gc' -l force -d 'Force `git gc` to run'
+complete -f -c git -n '__fish_git_using_command gc' -l keep-largest-pack -d 'Ignore `gc.bigPackThreshold`'
 
 ### grep
 complete -c git -n '__fish_git_needs_command' -a grep -d 'Print lines matching a pattern'
@@ -1757,12 +1771,14 @@ complete -f -c git -n '__fish_git_using_command help' -a clean -d 'Remove untrac
 complete -f -c git -n '__fish_git_using_command help' -a clone -d 'Clone a repository into a new directory'
 complete -f -c git -n '__fish_git_using_command help' -a commit -d 'Record changes to the repository'
 complete -f -c git -n '__fish_git_using_command help' -a config -d 'Set and read git configuration variables'
+complete -f -c git -n '__fish_git_using_command help' -a count-objects -d 'Count unpacked number of objects and their disk consumption'
 complete -f -c git -n '__fish_git_using_command help' -a describe -d 'Give an object a human-readable name'
 complete -f -c git -n '__fish_git_using_command help' -a diff -d 'Show changes between commits, commit and working tree, etc'
 complete -f -c git -n '__fish_git_using_command help' -a difftool -d 'Open diffs in a visual tool'
 complete -f -c git -n '__fish_git_using_command help' -a fetch -d 'Download objects and refs from another repository'
 complete -f -c git -n '__fish_git_using_command help' -a filter-branch -d 'Rewrite branches'
 complete -f -c git -n '__fish_git_using_command help' -a format-patch -d 'Generate patch series to send upstream'
+complete -f -c git -n '__fish_git_using_command help' -a gc -d 'Cleanup unnecessary files and optimize the local repository'
 complete -f -c git -n '__fish_git_using_command help' -a grep -d 'Print lines matching a pattern'
 complete -f -c git -n '__fish_git_using_command help' -a init -d 'Create an empty git repository or reinitialize an existing one'
 complete -f -c git -n '__fish_git_using_command help' -a log -d 'Show commit logs'

From 62d435f25b7163e7869a3949a0145640aa26f489 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 2 Dec 2019 03:54:08 +0900
Subject: [PATCH 1306/1732] Add completions of
 `--committer-date-is-author-date` and `--ignore-date` for `git-rebase`

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 78503d91f..e5d6c21bd 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1474,6 +1474,8 @@ complete -f -c git -n '__fish_git_using_command rebase' -s n -l no-stat -d "Don'
 complete -f -c git -n '__fish_git_using_command rebase' -l verify -d "Allow the pre-rebase hook to run"
 complete -f -c git -n '__fish_git_using_command rebase' -l no-verify -d "Don't allow the pre-rebase hook to run"
 complete -f -c git -n '__fish_git_using_command rebase' -s f -l force-rebase -d 'Force the rebase'
+complete -f -c git -n '__fish_git_using_command rebase' -l committer-date-is-author-date -d "Use the author date as the committer date"
+complete -f -c git -n '__fish_git_using_command rebase' -l ignore-date -d "Use the committer date as the author date"
 complete -f -c git -n '__fish_git_using_command rebase' -s i -l interactive -d 'Interactive mode'
 complete -f -c git -n '__fish_git_using_command rebase' -s p -l preserve-merges -d 'Try to recreate merges'
 complete -f -c git -n '__fish_git_using_command rebase' -s r -l rebase-merges -a 'rebase-cousins no-rebase-cousins' -d 'Preserve branch structure'

From 1f6f1b347cbb4e57e727916efd86e0d0e5f0b202 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 3 Dec 2019 14:47:52 +0800
Subject: [PATCH 1307/1732] fish.spec: use system pcre2 on all platforms except
 RHEL 6/7

---
 fish.spec.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fish.spec.in b/fish.spec.in
index 822f70e0a..c9d12d57f 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -14,17 +14,13 @@ BuildRequires:          ncurses-devel gettext gcc-c++ autoconf
 %if 0%{?rhel} && 0%{?rhel} < 8
 BuildRequires: cmake3
 %else
-BuildRequires: cmake
+BuildRequires: cmake pcre2-devel
 %endif
 
 %if 0%{?opensuse_bs} && 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires: gcc48 gcc48-c++ python-argparse
 %endif
 
-%if 0%{?is_opensuse} || 0%{?fedora}
-BuildRequires: pcre2-devel
-%endif
-
 # for tests
 %if 0%{?fedora}
 # Need the en_US.utf-8 locale at a minimum

From d90a62c1519a77de7e08f52f3297e5b6de9617e3 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 3 Dec 2019 15:05:38 +0800
Subject: [PATCH 1308/1732] fish.spec: depend on Python on CentOS/RHEL 8 for
 tests

---
 fish.spec.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fish.spec.in b/fish.spec.in
index c9d12d57f..d9ce6a7a0 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -22,10 +22,13 @@ BuildRequires: gcc48 gcc48-c++ python-argparse
 %endif
 
 # for tests
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} && 0%{?rhel} > 7
 # Need the en_US.utf-8 locale at a minimum
 BuildRequires: glibc-langpack-en
 %endif
+%if 0%{?rhel} && 0%{?rhel} > 7
+BuildRequires: python3
+%endif
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 

From c3374ffd08194a6bd3ba5594b63bedd092577428 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 3 Dec 2019 12:18:39 +0100
Subject: [PATCH 1309/1732] Use read --tokenize instead of eval for $BROWSER &
 $EDITOR

---
 share/functions/edit_command_buffer.fish | 19 ++++++++++---------
 share/functions/funced.fish              |  2 +-
 share/functions/help.fish                | 13 +++++--------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/share/functions/edit_command_buffer.fish b/share/functions/edit_command_buffer.fish
index 6ea2b0d2c..7440741c3 100644
--- a/share/functions/edit_command_buffer.fish
+++ b/share/functions/edit_command_buffer.fish
@@ -15,26 +15,27 @@ function edit_command_buffer --description 'Edit the command buffer in an extern
     end
 
     # Edit the command line with the users preferred editor or vim or emacs.
-    commandline -b >$f
+    set -l editor
     if set -q VISUAL
-        __fish_disable_bracketed_paste
-        eval $VISUAL $f
-        __fish_enable_bracketed_paste
+        echo $VISUAL | read -at editor
     else if set -q EDITOR
-        __fish_disable_bracketed_paste
-        eval $EDITOR $f
-        __fish_enable_bracketed_paste
+        echo $EDITOR | read -at editor
     else
         echo
         echo (_ 'External editor requested but $VISUAL or $EDITOR not set.')
         echo (_ 'Please set VISUAL or EDITOR to your preferred editor.')
         commandline -f repaint
-        command rm $f
         return 1
     end
 
+    commandline -b >$f
+    __fish_disable_bracketed_paste
+    $editor $f
+    set -l editor_status $status
+    __fish_enable_bracketed_paste
+
     # Here we're checking the exit status of the editor.
-    if test $status -eq 0 -a -s $f
+    if test $editor_status -eq 0 -a -s $f
         # Set the command to the output of the edited command and move the cursor to the
         # end of the edited command.
         commandline -r -- (cat $f)
diff --git a/share/functions/funced.fish b/share/functions/funced.fish
index 7ad717e0a..5d8afb956 100644
--- a/share/functions/funced.fish
+++ b/share/functions/funced.fish
@@ -52,7 +52,7 @@ function funced --description 'Edit function definition'
 
     # Break editor up to get its first command (i.e. discard flags)
     set -l editor_cmd
-    eval set editor_cmd $editor
+    echo $editor | read -ta editor_cmd
     if not type -q -f "$editor_cmd[1]"
         echo (_ "funced: The value for \$EDITOR '$editor' could not be used because the command '$editor_cmd[1]' could not be found")
         set editor fish
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 207293846..2e34bb4d5 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -30,7 +30,7 @@ function help --description 'Show help for the fish shell'
     if not set -q fish_browser[1]
         if set -q BROWSER
             # User has manually set a preferred browser, so we respect that
-            set fish_browser $BROWSER
+            echo $BROWSER | read -at fish_browser
         else
             # No browser set up, inferring.
             # We check a bunch and use the last we find.
@@ -101,7 +101,7 @@ function help --description 'Show help for the fish shell'
         and not command -sq $fish_browser[1]
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
-            set fish_browser cygstart \"$fish_browser\"
+            set fish_browser cygstart $fish_browser
         else
             set need_trampoline 1
         end
@@ -182,12 +182,9 @@ function help --description 'Show help for the fish shell'
         end
     end
 
-    # URL may contain # (anchor) or $ (hidden share in Windows)
-    set page_url (string escape $page_url)
-
     # cmd.exe needs more coaxing.
     if string match -qr 'cmd.exe$' -- $fish_browser[1]
-        eval $fish_browser /c "start $page_url"
+        $fish_browser /c "start $page_url"
         # If browser is known to be graphical, put into background
     else if contains -- $fish_browser[1] $graphical_browsers
         switch $fish_browser[1]
@@ -196,13 +193,13 @@ function help --description 'Show help for the fish shell'
             case '*'
                 printf (_ 'help: Help is being displayed in %s.\n') $fish_browser[1]
         end
-        eval "$fish_browser $page_url &"
+        $fish_browser $page_url &; disown
     else
         # Work around lynx bug where <div class="contents"> always has the same formatting as links (unreadable)
         # by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170
         if string match -q 'lynx*' -- $fish_browser
             set fish_browser $fish_browser -lss={$__fish_data_dir}/lynx.lss
         end
-        eval $fish_browser $page_url
+        $fish_browser $page_url
     end
 end

From dacc0b595c6fc6f7f32c8771c6d672b89b564d7f Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Mon, 2 Dec 2019 09:41:49 +0900
Subject: [PATCH 1310/1732] Dont clobber fish_browser if cygstart is available

---
 share/functions/help.fish | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/share/functions/help.fish b/share/functions/help.fish
index 2e34bb4d5..1835430d9 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -67,8 +67,8 @@ function help --description 'Show help for the fish shell'
             # If the OS appears to be Windows (graphical), try to use cygstart
             if type -q cygstart
                 set fish_browser cygstart
-                # If xdg-open is available, just use that
-                # but only if an X session is running
+            # If xdg-open is available, just use that
+            # but only if an X session is running
             else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
@@ -77,7 +77,8 @@ function help --description 'Show help for the fish shell'
             #
             # We use this instead of xdg-open because that's useless without a backend
             # like wsl-open which we'll check in a minute.
-            if set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
+            if not type -q cygstart
+            and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
                 # Use the first of these.
                 set fish_browser $cmd[1]
             end

From 1be8277f41068f0b291435de68be9226eaa3f369 Mon Sep 17 00:00:00 2001
From: Michael Jarvis <michael@jarvis.com>
Date: Tue, 3 Dec 2019 15:00:27 -0600
Subject: [PATCH 1311/1732] Minor tweak to silence warning

Silences a clang++ warning:

"using the result of an assignment as a condition without parentheses"
---
 src/builtin_read.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 20df8f37a..173462918 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -533,7 +533,7 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 }
 
                 // If we still have tokens, set the last variable to them.
-                if (t = tok.next()) {
+                if ((t = tok.next())) {
                     wcstring rest = wcstring(buff, t->offset);
                     vars.set_one(*var_ptr++, opts.place, rest);
                 }

From b3f8a93e02e6206f04c65271fd3b20df6fcd2e5b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 18:16:46 +0900
Subject: [PATCH 1312/1732] Move __fish_print_abook_emails into mutt completion
 script

---
 po/de.po                                       | 5 -----
 po/en.po                                       | 4 ----
 po/fr.po                                       | 4 ----
 po/nb.po                                       | 4 ----
 po/nn.po                                       | 4 ----
 po/pl.po                                       | 4 ----
 po/pt_BR.po                                    | 5 -----
 po/sv.po                                       | 4 ----
 po/zh_CN.po                                    | 4 ----
 share/completions/mutt.fish                    | 6 +++++-
 share/functions/__fish_print_abook_emails.fish | 4 ----
 11 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 share/functions/__fish_print_abook_emails.fish

diff --git a/po/de.po b/po/de.po
index 9c97215bf..3aee82ef7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -67455,11 +67455,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-#, fuzzy
-msgid "Print email addresses (abook)"
-msgstr "Tote Prozesse ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 #, fuzzy
 msgid "Print a list of known network addresses"
diff --git a/po/en.po b/po/en.po
index bccfdc556..f3beabd7e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -66804,10 +66804,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr "Print a list of local users"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr "Print email addresses (abook)"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr "Print a list of known network addresses"
diff --git a/po/fr.po b/po/fr.po
index 0c06c6acb..4a0d674ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65773,10 +65773,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr "Afficher les adresses email (abook)"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 4295f20af..b6b72c1b2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -62226,10 +62226,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 2d6005502..ea4ac501c 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -62226,10 +62226,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index fef177869..2a31f0d72 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -62816,10 +62816,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index db3f7b34c..0f7848944 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -67934,11 +67934,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr "Print a list of all accepted color names"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-#, fuzzy
-msgid "Print email addresses (abook)"
-msgstr "Print dead processes"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 #, fuzzy
 msgid "Print a list of known network addresses"
diff --git a/po/sv.po b/po/sv.po
index 8c8b288f2..91406d12a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -62230,10 +62230,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba178b213..cd4306433 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -62777,10 +62777,6 @@ msgstr ""
 msgid "Obtain a list of ports local collections"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_abook_emails.fish:1
-msgid "Print email addresses (abook)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
diff --git a/share/completions/mutt.fish b/share/completions/mutt.fish
index 35b6f30e1..b0dccc4b5 100644
--- a/share/completions/mutt.fish
+++ b/share/completions/mutt.fish
@@ -1,3 +1,8 @@
+function __fish_print_abook_emails --description 'Print email addresses (abook)'
+    abook --mutt-query "" | string match -r -v '^\s*$'
+
+end
+
 if command -sq abook
     complete -c mutt -f -a '(__fish_print_abook_emails)'
     complete -c mutt -s c -x -d 'Specify a carbon-copy (CC) recipient' -a '(__fish_print_abook_emails)'
@@ -27,4 +32,3 @@ complete -r -c mutt -s i -d 'Specify a file to include into the body of a messag
 complete -r -c mutt -s m -d 'Specify a default mailbox type'
 complete -r -c mutt -s Q -d 'Query a configuration variables value'
 complete -r -c mutt -s s -d 'Specify the subject of the message'
-
diff --git a/share/functions/__fish_print_abook_emails.fish b/share/functions/__fish_print_abook_emails.fish
deleted file mode 100644
index 671dbb50e..000000000
--- a/share/functions/__fish_print_abook_emails.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_print_abook_emails --description 'Print email addresses (abook)'
-    abook --mutt-query "" | string match -r -v '^\s*$'
-
-end

From 69255d5641fd32907283595432d84b7a3eda1edd Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 18:41:48 +0900
Subject: [PATCH 1313/1732] Move __fish_parse_configure into configure
 completion script

---
 share/completions/configure.fish            | 73 +++++++++++++++++++++
 share/functions/__fish_parse_configure.fish | 72 --------------------
 2 files changed, 73 insertions(+), 72 deletions(-)
 delete mode 100644 share/functions/__fish_parse_configure.fish

diff --git a/share/completions/configure.fish b/share/completions/configure.fish
index 6c7880ef2..017e7b3dd 100644
--- a/share/completions/configure.fish
+++ b/share/completions/configure.fish
@@ -1,3 +1,76 @@
+function __fish_parse_configure
+    if test (count $argv) -ne 1
+        echo "Usage: parse_configure path/to/configure" 1>&2
+        return 1
+    end
+
+    # `complete` parses `./configure` as `configure` so we have to handle all paths, not just ./
+    if not test -x $argv[1]
+        printf "Cannot find or execute '%s'\n" $argv[1] 1>&2
+        return 1
+    end
+
+    # Must support output along the lines of
+    #  -h, --help              display this help and exit
+    #      --help=short        display options specific to this package
+    #      --help=recursive    display the short help of all the included packages
+    #  -V, --version           display version information and exit
+    #  -q, --quiet, --silent   do not print `checking ...' messages
+
+    set -l next_line
+    set -l line
+    set -l buffer
+    # Just fish's `./configure --help` takes ~350ms to run, before parsing
+    # The following chain attempts to extract the help message:
+    cat $argv[1] | tr \n \u0e | sed -n 's/.*Report the --help message\(.*\?\)ac_status.*/\1/; s/ac_status.*//p' | tr \u0e \n |
+    while test "$next_line" != "" || read -lL next_line
+        # In autoconfigure scripts, the first column wraps at 26 chars
+        # echo next_line: $next_line
+        # echo old_line: $line
+        if test "$line" = ""
+            set line $next_line
+            set next_line "" # mark it as consumed
+            continue
+        else if string match -qr '^(   |\t){2,}[^-]\S*' -- $next_line
+            # echo "continuation line found. Old value of line: " \"$line\"
+            set line "$line "(string trim $next_line)
+            set next_line "" # mark it as consumed
+            continue
+        end
+
+        # echo line: $line
+
+        # Search for one or more strings starting with `-` separated by commas
+        if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description
+            for opt in (string split -n , -- $opts | string trim)
+
+                if string match -qr -- '--[a-z_0-9-]+=\[.*\]' $opt
+                    # --option=[OPTIONAL_VALUE]
+                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+\[=.*\]' $opt
+                    # --option[=OPTIONAL_VALUE]
+                    string replace -r -- '(--[a-z_0-9-]+)\[=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+=[A-Z]+' $opt
+                    # --option=CLASS_OF_VALUE (eg FILE or DIR)
+                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
+                else if string match -qr -- '--[a-z_0-9-]+=\S+' $opt
+                    # --option=literal_value, leave as-is
+                else if string match -qr -- '--[a-z_0-9-]+$' $opt
+                    # long option, leave as-is
+                else if string match -qr -- '-[^-]$' $opt
+                    # short option, leave as-is
+                else
+                    continue
+                end
+
+                echo "$opt"\t"$description" # parsed by `complete` as value and description
+            end
+        end
+
+        set line ""
+    end
+end
+
 complete -c configure -s h -l help -x -a "short recursive" -d "Display help and exit"
 complete -c configure -s V -l version -d "Display version and exit"
 complete -c configure -s q -l quiet -d "Quiet mode"
diff --git a/share/functions/__fish_parse_configure.fish b/share/functions/__fish_parse_configure.fish
deleted file mode 100644
index b99e93ed8..000000000
--- a/share/functions/__fish_parse_configure.fish
+++ /dev/null
@@ -1,72 +0,0 @@
-function __fish_parse_configure
-    if test (count $argv) -ne 1
-        echo "Usage: parse_configure path/to/configure" 1>&2
-        return 1
-    end
-
-    # `complete` parses `./configure` as `configure` so we have to handle all paths, not just ./
-    if not test -x $argv[1]
-        printf "Cannot find or execute '%s'\n" $argv[1] 1>&2
-        return 1
-    end
-
-    # Must support output along the lines of
-    #  -h, --help              display this help and exit
-    #      --help=short        display options specific to this package
-    #      --help=recursive    display the short help of all the included packages
-    #  -V, --version           display version information and exit
-    #  -q, --quiet, --silent   do not print `checking ...' messages
-
-    set -l next_line
-    set -l line
-    set -l buffer
-    # Just fish's `./configure --help` takes ~350ms to run, before parsing
-    # The following chain attempts to extract the help message:
-    cat $argv[1] | tr \n \u0e | sed -n 's/.*Report the --help message\(.*\?\)ac_status.*/\1/; s/ac_status.*//p' | tr \u0e \n |
-    while test "$next_line" != "" || read -lL next_line
-        # In autoconfigure scripts, the first column wraps at 26 chars
-        # echo next_line: $next_line
-        # echo old_line: $line
-        if test "$line" = ""
-            set line $next_line
-            set next_line "" # mark it as consumed
-            continue
-        else if string match -qr '^(   |\t){2,}[^-]\S*' -- $next_line
-            # echo "continuation line found. Old value of line: " \"$line\"
-            set line "$line "(string trim $next_line)
-            set next_line "" # mark it as consumed
-            continue
-        end
-
-        # echo line: $line
-
-        # Search for one or more strings starting with `-` separated by commas
-        if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description
-            for opt in (string split -n , -- $opts | string trim)
-
-                if string match -qr -- '--[a-z_0-9-]+=\[.*\]' $opt
-                    # --option=[OPTIONAL_VALUE]
-                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
-                else if string match -qr -- '--[a-z_0-9-]+\[=.*\]' $opt
-                    # --option[=OPTIONAL_VALUE]
-                    string replace -r -- '(--[a-z_0-9-]+)\[=.*' '$1' $opt | read opt
-                else if string match -qr -- '--[a-z_0-9-]+=[A-Z]+' $opt
-                    # --option=CLASS_OF_VALUE (eg FILE or DIR)
-                    string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
-                else if string match -qr -- '--[a-z_0-9-]+=\S+' $opt
-                    # --option=literal_value, leave as-is
-                else if string match -qr -- '--[a-z_0-9-]+$' $opt
-                    # long option, leave as-is
-                else if string match -qr -- '-[^-]$' $opt
-                    # short option, leave as-is
-                else
-                    continue
-                end
-
-                echo "$opt"\t"$description" # parsed by `complete` as value and description
-            end
-        end
-
-        set line ""
-    end
-end

From 40832f897c69321ccf43f0ea48f291bacdf6c43b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 18:46:29 +0900
Subject: [PATCH 1314/1732] Move __fish_portage_print_repository_names into
 emaint completion script

---
 share/completions/emaint.fish                              | 5 +++++
 share/functions/__fish_portage_print_repository_names.fish | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 share/functions/__fish_portage_print_repository_names.fish

diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index 547fe0a48..0b619e87a 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -1,3 +1,8 @@
+function __fish_portage_print_repository_names --description 'Print the names of all configured repositories'
+    # repos.conf may be a file or a directory
+    find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*\[([[:alnum:]_][[:alnum:]_-]*)\]' '$1' | string match -v -e DEFAULT
+end
+
 ## Global Opts
 complete -c emaint -s h -l help -d "Show this help message and exit"
 complete -c emaint -s c -l check -d "Check for problems"
diff --git a/share/functions/__fish_portage_print_repository_names.fish b/share/functions/__fish_portage_print_repository_names.fish
deleted file mode 100644
index d3a898ac1..000000000
--- a/share/functions/__fish_portage_print_repository_names.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_portage_print_repository_names --description 'Print the names of all configured repositories'
-    # repos.conf may be a file or a directory
-    find /etc/portage/repos.conf -type f -exec cat '{}' + | string replace -r --filter '^\s*\[([[:alnum:]_][[:alnum:]_-]*)\]' '$1' | string match -v -e DEFAULT
-end

From b658b421ad8f399b60744760acc971c37dffd8f4 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 18:53:16 +0900
Subject: [PATCH 1315/1732] Move __fish_ports_dirs into ports completion script

---
 share/completions/ports.fish           | 5 +++--
 share/functions/__fish_ports_dirs.fish | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 share/functions/__fish_ports_dirs.fish

diff --git a/share/completions/ports.fish b/share/completions/ports.fish
index beabb735c..f0a6f658e 100644
--- a/share/completions/ports.fish
+++ b/share/completions/ports.fish
@@ -1,8 +1,9 @@
-#completion for ports
+function __fish_ports_dirs -d 'Obtain a list of ports local collections'
+    ls /usr/ports
+end
 
 complete -f -c ports -s u -l update -a '(__fish_ports_dirs)' -d 'Update ports'
 complete -f -c ports -s l -l list -d 'List ports'
 complete -f -c ports -s d -l diff -d 'List version diffs between local and installed ports'
 complete -f -c ports -s v -l version -d 'Print version'
 complete -f -c ports -s h -l help -d 'Print help'
-
diff --git a/share/functions/__fish_ports_dirs.fish b/share/functions/__fish_ports_dirs.fish
deleted file mode 100644
index f4d3dc3bf..000000000
--- a/share/functions/__fish_ports_dirs.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# a function to print a list of ports local collections
-
-function __fish_ports_dirs -d 'Obtain a list of ports local collections'
-    ls /usr/ports
-end

From 9c15b5b7a4008488f1a0e4e786db42a6cea397ca Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 18:59:09 +0900
Subject: [PATCH 1316/1732] Move __fish_systemd_machines into machinectl
 completion script

---
 share/completions/machinectl.fish            | 8 ++++++++
 share/functions/__fish_systemd_machines.fish | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 share/functions/__fish_systemd_machines.fish

diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 847477b17..176c7c372 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -1,3 +1,11 @@
+function __fish_systemd_machine_images
+    # Like for running machines, I'm assuming machinectl doesn't allow spaces in image names
+    # This does not include the special image ".host" since it isn't valid for most operations
+    machinectl --no-legend --no-pager list-images | while read -l a b
+        echo $a
+    end
+end
+
 complete -f -e -c machinectl
 
 set -l commands list status show start login enable disable poweroff reboot \
diff --git a/share/functions/__fish_systemd_machines.fish b/share/functions/__fish_systemd_machines.fish
deleted file mode 100644
index a4ab375f7..000000000
--- a/share/functions/__fish_systemd_machines.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-# It seems machinectl will eliminate spaces from machine names so we don't need to handle that
-function __fish_systemd_machines
-    machinectl --no-legend --no-pager list --all | while read -l a b
-        echo $a
-    end
-end

From 5107de395d95d5766c32ca223b2bc5a3e2e4955b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 19:03:42 +0900
Subject: [PATCH 1317/1732] Move __fish_print_xdg_desktop_file_ids into
 xdg-mime completion script

---
 share/completions/xdg-mime.fish                        | 3 +++
 share/functions/__fish_print_xdg_desktop_file_ids.fish | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 share/functions/__fish_print_xdg_desktop_file_ids.fish

diff --git a/share/completions/xdg-mime.fish b/share/completions/xdg-mime.fish
index 00153e26d..09f479f93 100644
--- a/share/completions/xdg-mime.fish
+++ b/share/completions/xdg-mime.fish
@@ -1,3 +1,6 @@
+function __fish_print_xdg_desktop_file_ids --description 'Print all available xdg desktop file IDs'
+    find (__fish_print_xdg_applications_directories) -name \*.desktop \( -type f -or -type l \) -printf '%P\n' | tr / - | sort -u
+end
 
 # main completion
 complete -c xdg-mime -n 'not __fish_seen_subcommand_from query default install uninstall' -xa 'query default install uninstall'
diff --git a/share/functions/__fish_print_xdg_desktop_file_ids.fish b/share/functions/__fish_print_xdg_desktop_file_ids.fish
deleted file mode 100644
index 26673c1b5..000000000
--- a/share/functions/__fish_print_xdg_desktop_file_ids.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_print_xdg_desktop_file_ids --description 'Print all available xdg desktop file IDs'
-    find (__fish_print_xdg_applications_directories) -name \*.desktop \( -type f -or -type l \) -printf '%P\n' | tr / - | sort -u
-end

From 013001c28394fe81723942487c0714bca79b48d8 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 19:07:42 +0900
Subject: [PATCH 1318/1732] Move __fish_print_lsblk_columns into lsblk
 completion script

---
 share/completions/lsblk.fish                    | 6 +++++-
 share/functions/__fish_print_lsblk_columns.fish | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 share/functions/__fish_print_lsblk_columns.fish

diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish
index e287871a9..35ca6c04a 100644
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -1,3 +1,8 @@
+function __fish_print_lsblk_columns --description 'Print available lsblk columns'
+    lsblk --help | sed '1,/Available columns:/d; /^$/,$d; s/^\s\+//; s/\s/\t/'
+
+end
+
 complete -c lsblk -s a -l all -d "print all devices"
 complete -c lsblk -s b -l bytes -d "print SIZE in bytes rather than in human readable format"
 complete -c lsblk -s d -l nodeps -d "don't print slaves or holders"
@@ -13,4 +18,3 @@ complete -c lsblk -s P -l pairs -d "use key='value' output format"
 complete -c lsblk -s r -l raw -d "use raw output format"
 complete -c lsblk -s t -l topology -d "output info about topology"
 complete -c lsblk -s l -l list -d "use list format output"
-
diff --git a/share/functions/__fish_print_lsblk_columns.fish b/share/functions/__fish_print_lsblk_columns.fish
deleted file mode 100644
index a9c75a3d2..000000000
--- a/share/functions/__fish_print_lsblk_columns.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function __fish_print_lsblk_columns --description 'Print available lsblk columns'
-    lsblk --help | sed '1,/Available columns:/d; /^$/,$d; s/^\s\+//; s/\s/\t/'
-
-end

From 69dccce937d7b5ee67432c73ecb7ba958d09a339 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 19:12:12 +0900
Subject: [PATCH 1319/1732] Move __fish_print_function_prototypes into valgrind
 completion script

---
 share/completions/valgrind.fish                       | 7 +++++++
 share/functions/__fish_print_function_prototypes.fish | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 share/functions/__fish_print_function_prototypes.fish

diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 591fc64e8..a52ca3e54 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -72,6 +72,13 @@ complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l D1 -d "Type of L1
 complete -n "__fish_valgrind_skin cachegrind" -xc valgrind -l L2 -d "Type of L2 cache"
 
 
+function __fish_print_function_prototypes -d "Prints the names of all function prototypes found in the headers in the current directory"
+    set -l headers *.h *.hh *.hpp *.hxx
+    if set -q headers[1]
+        sed -n "s/^\(.*[^[a-zA-Z_0-9]\|\)\([a-zA-Z_][a-zA-Z_0-9]*\) *(.*);.*\$/\2/p" $headers
+    end
+end
+
 # Massif-specific options
 complete -c valgrind -n "__fish_valgrind_skin massif" -l alloc-fn -d "Specify a function that allocates memory" -x -a "(__fish_print_function_prototypes)"
 complete -c valgrind -n "__fish_valgrind_skin massif" -x -l heap -d 'Profile heap usage' -a 'yes\t"Profile heap usage" no\t"Do not profile heap usage"'
diff --git a/share/functions/__fish_print_function_prototypes.fish b/share/functions/__fish_print_function_prototypes.fish
deleted file mode 100644
index d50c43d6d..000000000
--- a/share/functions/__fish_print_function_prototypes.fish
+++ /dev/null
@@ -1,8 +0,0 @@
-
-function __fish_print_function_prototypes -d "Prints the names of all function prototypes found in the headers in the current directory"
-    set -l headers *.h *.hh *.hpp *.hxx
-    if set -q headers[1]
-        sed -n "s/^\(.*[^[a-zA-Z_0-9]\|\)\([a-zA-Z_][a-zA-Z_0-9]*\) *(.*);.*\$/\2/p" $headers
-    end
-end
-

From 965b142acd99b31ca8449b3d85b1f8407c385399 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 19:40:44 +0900
Subject: [PATCH 1320/1732] Move __fish_print_zfs_* into zfs completion script

---
 share/completions/zfs.fish                       | 16 +++++++++++++++-
 share/functions/__fish_print_zfs_bookmarks.fish  |  5 -----
 .../functions/__fish_print_zfs_filesystems.fish  |  3 ---
 share/functions/__fish_print_zfs_volumes.fish    |  3 ---
 4 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 share/functions/__fish_print_zfs_bookmarks.fish
 delete mode 100644 share/functions/__fish_print_zfs_filesystems.fish
 delete mode 100644 share/functions/__fish_print_zfs_volumes.fish

diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 8dd63fa7b..6b008fb49 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -1,5 +1,5 @@
 # Fish completions for the OpenZFS zfs command
-# Possible enhancements:
+# 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;
@@ -200,6 +200,20 @@ function __fish_zfs_list_permissions
     end | string match -r '@[[:alnum:]]*' | sort -u
 end
 
+function __fish_print_zfs_bookmarks -d "Lists ZFS bookmarks, if the feature is enabled"
+    if __fish_is_zfs_feature_enabled 'feature@bookmarks'
+        zfs list -t bookmark -o name -H
+    end
+end
+
+function __fish_print_zfs_filesystems -d "Lists ZFS filesystems"
+    zfs list -t filesystem -o name -H
+end
+
+function __fish_print_zfs_volumes -d "Lists ZFS volumes"
+    zfs list -t volume -o name -H
+end
+
 complete -c zfs -f -n '__fish_zfs_needs_command' -s '?' -a '?' -d 'Display a help message'
 complete -c zfs -f -n '__fish_zfs_needs_command' -a 'create' -d 'Create a volume or filesystem'
 complete -c zfs -f -n '__fish_zfs_needs_command' -a 'destroy' -d 'Destroy a dataset'
diff --git a/share/functions/__fish_print_zfs_bookmarks.fish b/share/functions/__fish_print_zfs_bookmarks.fish
deleted file mode 100644
index 569e7a9a4..000000000
--- a/share/functions/__fish_print_zfs_bookmarks.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-function __fish_print_zfs_bookmarks -d "Lists ZFS bookmarks, if the feature is enabled"
-    if __fish_is_zfs_feature_enabled 'feature@bookmarks'
-        zfs list -t bookmark -o name -H
-    end
-end
diff --git a/share/functions/__fish_print_zfs_filesystems.fish b/share/functions/__fish_print_zfs_filesystems.fish
deleted file mode 100644
index 8b314669d..000000000
--- a/share/functions/__fish_print_zfs_filesystems.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_print_zfs_filesystems -d "Lists ZFS filesystems"
-    zfs list -t filesystem -o name -H
-end
diff --git a/share/functions/__fish_print_zfs_volumes.fish b/share/functions/__fish_print_zfs_volumes.fish
deleted file mode 100644
index ec1eb5842..000000000
--- a/share/functions/__fish_print_zfs_volumes.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function __fish_print_zfs_volumes -d "Lists ZFS volumes"
-    zfs list -t volume -o name -H
-end

From a361cde1df0edc4d02461bb01d0bb547aac92c3b Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 17:29:06 +0900
Subject: [PATCH 1321/1732] Move __fish_complete_svn_diff into the completion
 script

---
 po/de.po                                      |  5 ----
 po/en.po                                      |  4 ---
 po/fr.po                                      |  4 ---
 po/nb.po                                      |  4 ---
 po/nn.po                                      |  4 ---
 po/pl.po                                      |  4 ---
 po/pt_BR.po                                   |  5 ----
 po/sv.po                                      |  4 ---
 po/zh_CN.po                                   |  5 ----
 share/completions/svn.fish                    | 30 +++++++++++++++++--
 share/functions/__fish_complete_svn_diff.fish | 25 ----------------
 11 files changed, 27 insertions(+), 67 deletions(-)
 delete mode 100644 share/functions/__fish_complete_svn_diff.fish

diff --git a/po/de.po b/po/de.po
index 3aee82ef7..62d767293 100644
--- a/po/de.po
+++ b/po/de.po
@@ -67198,11 +67198,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr "Saloppe Einhäng-Optionen tolerieren"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-#, fuzzy
-msgid "Complete \"svn diff\" arguments"
-msgstr "Anzahl der Argumente zählen"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/en.po b/po/en.po
index f3beabd7e..2064783e0 100644
--- a/po/en.po
+++ b/po/en.po
@@ -66549,10 +66549,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr "Complete using path"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr "Complete “svn diff” arguments"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/fr.po b/po/fr.po
index 4a0d674ae..7396be22e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65525,10 +65525,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr "Compléter en utilisant les fichiers"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/nb.po b/po/nb.po
index b6b72c1b2..76885be55 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -61987,10 +61987,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index ea4ac501c..6d0e889a1 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -61987,10 +61987,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 2a31f0d72..03dea99e1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -62576,10 +62576,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f7848944..bbbbef369 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -67668,11 +67668,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr "Tolerate sloppy mount options"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-#, fuzzy
-msgid "Complete \"svn diff\" arguments"
-msgstr "Count the number of arguments"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 #, fuzzy
 msgid "Print list host-names with user@"
diff --git a/po/sv.po b/po/sv.po
index 91406d12a..d298c438e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -61991,10 +61991,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-msgid "Complete \"svn diff\" arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cd4306433..e80c66d28 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -62536,11 +62536,6 @@ msgstr ""
 msgid "Complete using files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_svn_diff.fish:1
-#, fuzzy
-msgid "Complete \"svn diff\" arguments"
-msgstr "参数的个数的计数"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
 msgid "Print list host-names with user@"
 msgstr ""
diff --git a/share/completions/svn.fish b/share/completions/svn.fish
index 7e02653d3..c23efbf89 100644
--- a/share/completions/svn.fish
+++ b/share/completions/svn.fish
@@ -1,3 +1,29 @@
+function __fish_complete_svn_diff --description 'Complete "svn diff" arguments'
+    set -l cmdl (commandline -cop)
+    #set -l cmdl svn diff --diff-cmd diff --extensions '-a -b'
+    set -l diff diff
+    set -l args
+    while set -q cmdl[1]
+        switch $cmdl[1]
+            case --diff-cmd
+                if set -q cmdl[2]
+                    set diff $cmdl[2]
+                    set -e cmd[2]
+                end
+
+            case --extensions
+                if set -q cmdl[2]
+                    set args $cmdl[2]
+                    set -e cmdl[2]
+                end
+        end
+        set -e cmdl[1]
+    end
+    set -l token (commandline -cpt)
+    complete -C"$diff $args $token"
+
+end
+
 function _svn_cmpl_ -d 'Make a completion for a subcommand' --no-scope-shadowing --argument-names subcommand
     set -e argv[1]
     complete -c svn -n "__fish_seen_subcommand_from $subcommand" $argv
@@ -166,9 +192,7 @@ for cmd in $blame $diff $log $merge
     _svn_cmpl_ $cmd -l extensions -s x -d 'Ignore all whitespace' -xa '-w --ignore-all-space'
     _svn_cmpl_ $cmd -l extensions -s x -d 'Ignore eol style' -xa '-w --ignore-eol-style'
     _svn_cmpl_ $cmd -l extensions -s x -d 'Show C function name' -xa '-p --show-c-function'
-
-    # Next completion doesn't work, since fish doesn't respect -x key
-    #_svn_cmpl_ $cmd -l extensions -n '__fish_seen_subcommand_from --diff-cmd' -xa '(__fish_complete_svn_diff)'
+    _svn_cmpl_ $cmd -l extensions -n '__fish_seen_subcommand_from --diff-cmd' -xa '(__fish_complete_svn_diff)'
 end
 
 for cmd in $cleanup $merge $switch $update
diff --git a/share/functions/__fish_complete_svn_diff.fish b/share/functions/__fish_complete_svn_diff.fish
deleted file mode 100644
index eb67fcc21..000000000
--- a/share/functions/__fish_complete_svn_diff.fish
+++ /dev/null
@@ -1,25 +0,0 @@
-function __fish_complete_svn_diff --description 'Complete "svn diff" arguments'
-    set -l cmdl (commandline -cop)
-    #set -l cmdl svn diff --diff-cmd diff --extensions '-a -b'
-    set -l diff diff
-    set -l args
-    while set -q cmdl[1]
-        switch $cmdl[1]
-            case --diff-cmd
-                if set -q cmdl[2]
-                    set diff $cmdl[2]
-                    set -e cmd[2]
-                end
-
-            case --extensions
-                if set -q cmdl[2]
-                    set args $cmdl[2]
-                    set -e cmdl[2]
-                end
-        end
-        set -e cmdl[1]
-    end
-    set -l token (commandline -cpt)
-    complete -C"$diff $args $token"
-
-end

From 1fdb23637a56ff4687b49301e5061ffdd8f3b22f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 3 Dec 2019 21:10:09 +0100
Subject: [PATCH 1322/1732] Clean up Classic + VCS prompt

- Don't use a guard uvar - we're only setting variables now, and
- that's basically free.
- Allow non-universal color variables
- Simplify the root color setting a bit.
- Some comments

[ci skip]
---
 .../sample_prompts/classic_vcs.fish           | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index ca141feb1..352119b1d 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -1,39 +1,31 @@
 # name: Classic + Vcs
 # author: Lily Ballard
-# vim: set noet:
 
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
     set -l last_status $status
     set -l normal (set_color normal)
 
-    # initialize our new variables
-    if not set -q __fish_classic_git_prompt_initialized
-        set -qU fish_color_user
-        or set -U fish_color_user -o green
-        set -qU fish_color_host
-        or set -U fish_color_host -o cyan
-        set -qU fish_color_status
-        or set -U fish_color_status red
-        set -U __fish_classic_git_prompt_initialized
-    end
+    # Initialize our variables.
+    set -q fish_color_user
+    or set -U fish_color_user -o green
+    set -q fish_color_host
+    or set -U fish_color_host -o cyan
+    set -q fish_color_status
+    or set -U fish_color_status red
 
-    set -l color_cwd
+    # Color the prompt differently when we're root
+    set -l color_cwd $fish_color_cwd
     set -l prefix
-    set -l suffix
-    switch "$USER"
-        case root toor
+    set -l suffix '>'
+    if contains -- $USER root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
-            else
-                set color_cwd $fish_color_cwd
             end
             set suffix '#'
-        case '*'
-            set color_cwd $fish_color_cwd
-            set suffix '>'
     end
 
+    # Write pipestatus
     set -l prompt_status (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
     if test $last_status -ne 0
         set prompt_status " $prompt_status" (set_color $fish_color_status) "[$last_status]" "$normal"

From 9efb7fd5f6acaebeb8ea2ced3dde2f7fb159064e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 4 Dec 2019 21:10:22 +0100
Subject: [PATCH 1323/1732] __fish_cancel_commandline: Always repaint

Fixes #6394.
---
 share/functions/__fish_cancel_commandline.fish | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_cancel_commandline.fish b/share/functions/__fish_cancel_commandline.fish
index f3bd68513..23c76aa78 100644
--- a/share/functions/__fish_cancel_commandline.fish
+++ b/share/functions/__fish_cancel_commandline.fish
@@ -19,7 +19,9 @@ function __fish_cancel_commandline
             echo ""
         end
         commandline ""
-        commandline -f repaint
         emit fish_cancel
     end
+    # Repaint even if we haven't cancelled anything,
+    # so the prompt refreshes and the terminal scrolls to it.
+    commandline -f repaint
 end

From 3129b3c5ef522a8f260a1a7ee2181fdba9eef302 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 19:15:33 +0900
Subject: [PATCH 1324/1732] Move __fish_print_debian_services into invoke-rc.d
 completion script

---
 share/completions/invoke-rc.d.fish                | 8 +++++++-
 share/functions/__fish_print_debian_services.fish | 7 -------
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 share/functions/__fish_print_debian_services.fish

diff --git a/share/completions/invoke-rc.d.fish b/share/completions/invoke-rc.d.fish
index fcccafc36..f3c50ff5a 100644
--- a/share/completions/invoke-rc.d.fish
+++ b/share/completions/invoke-rc.d.fish
@@ -1,3 +1,10 @@
+function __fish_print_debian_services --description 'Prints services installed'
+    for service in /etc/init.d/*
+        if [ -x $service ]
+            basename $service
+        end
+    end
+end
 
 function __fish_invoke_rcd_has_service
     set tokens (commandline -opc)
@@ -15,4 +22,3 @@ complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'restart' -d 'R
 complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'reload' -d 'Reload Configuration'
 complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'force-reload' -d 'Force reloading configuration'
 complete -f -c invoke-rc.d -n '__fish_invoke_rcd_has_service' -a 'status' -d 'Print the status of the service'
-
diff --git a/share/functions/__fish_print_debian_services.fish b/share/functions/__fish_print_debian_services.fish
deleted file mode 100644
index 394c1e850..000000000
--- a/share/functions/__fish_print_debian_services.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-function __fish_print_debian_services --description 'Prints services installed'
-    for service in /etc/init.d/*
-        if [ -x $service ]
-            basename $service
-        end
-    end
-end

From c4400c31f73873deb89de4e7178bb64088dfa644 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sat, 30 Nov 2019 20:49:24 +0900
Subject: [PATCH 1325/1732] Remove deprecated function

---
 share/functions/fish_vi_mode.fish | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 share/functions/fish_vi_mode.fish

diff --git a/share/functions/fish_vi_mode.fish b/share/functions/fish_vi_mode.fish
deleted file mode 100644
index 8e2a92488..000000000
--- a/share/functions/fish_vi_mode.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-function fish_vi_mode
-    echo 'The `fish_vi_mode` function is deprecated.' >&2
-    echo 'Please switch to calling `fish_vi_key_bindings`.' >&2
-    # Turn on vi keybindings
-    set -g fish_key_bindings fish_vi_key_bindings
-end

From 7999cd4f2530da4c0d36211a6b56c2eedab23da0 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Tue, 3 Dec 2019 20:33:55 +0900
Subject: [PATCH 1326/1732] Remove fish_fallback_prompt function

---
 share/functions/fish_fallback_prompt.fish | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 share/functions/fish_fallback_prompt.fish

diff --git a/share/functions/fish_fallback_prompt.fish b/share/functions/fish_fallback_prompt.fish
deleted file mode 100644
index 17cd48477..000000000
--- a/share/functions/fish_fallback_prompt.fish
+++ /dev/null
@@ -1,22 +0,0 @@
-# vim: set noet:
-#
-# Set the default prompt command.
-
-function fish_fallback_prompt --description "A simple fallback prompt without too much color or special characters for linux VTs"
-    set -l color_cwd
-    set -l suffix
-    switch "$USER"
-        case root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            else
-                set color_cwd $fish_color_cwd
-            end
-            set suffix '#'
-        case '*'
-            set color_cwd $fish_color_cwd
-            set suffix '>'
-    end
-
-    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
-end

From 6dc4ac60ae05ef0e13bf9cefb14c1be2637666f2 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Fri, 6 Dec 2019 11:22:18 -0800
Subject: [PATCH 1327/1732] Use $PWD to retrieve the current directory in
 __fish_move_last.

(command pwd) uses the system's implementation of pwd. At least the GNU
coreutils implementation defaults to -P, which resulted in symlinks being
expanded when switching between directories with nextd/prevd.
---
 share/functions/__fish_move_last.fish | 2 +-
 tests/cd.in                           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_move_last.fish b/share/functions/__fish_move_last.fish
index 751b3d2a0..0e71046c1 100644
--- a/share/functions/__fish_move_last.fish
+++ b/share/functions/__fish_move_last.fish
@@ -12,7 +12,7 @@ function __fish_move_last -d "Move the last element of a directory history from
     end
 
     # Append current dir to the end of the destination
-    set -g (echo $dest) $$dest (command pwd)
+    set -g (echo $dest) $$dest $PWD
 
     set ssrc $$src
 
diff --git a/tests/cd.in b/tests/cd.in
index 6ea2c0289..1e84835fc 100644
--- a/tests/cd.in
+++ b/tests/cd.in
@@ -9,6 +9,8 @@ set real (mktemp -d)
 set link $base/link
 ln -s $real $link
 cd $link
+prevd
+nextd
 test "$PWD" = "$link" || echo "\$PWD != \$link:"\n   "\$PWD: $PWD"\n   "\$link: $link"\n
 test (pwd) = "$link" || echo "(pwd) != \$link:"\n   "\$PWD: "(pwd)\n   "\$link: $link"\n
 test (pwd -P) = "$real" || echo "(pwd -P) != \$real:"\n   "\$PWD: $PWD"\n   "\$real: $real"\n

From bc2634eaafb5b2ee2684d3f0a50eda482bb3a55d Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 29 Nov 2019 07:14:30 +0900
Subject: [PATCH 1328/1732] Add lz4 completions

Squashed commit of the following:

commit 08ea083bf87a613675789937d7f6740daa26fc61
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Thu Nov 28 23:51:35 2019 +0900

    Implementation of `lz4cat` completions

commit 027adedfeb7bb65ffd46e44b4266df3d98368326
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Thu Nov 28 23:36:12 2019 +0900

    Implementation of `unlz4` completions

commit 522925450a8076d4a0d3377cd9233abc643bbbf7
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Thu Nov 28 23:19:45 2019 +0900

    Implementation of `lz4c` completions

commit 298ce5e05e3be2cac774063ed2ee8289ba53cf24
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Thu Nov 28 23:02:52 2019 +0900

    Implementation of `lz4` completions
---
 share/completions/lz4.fish    | 41 +++++++++++++++++++++++++++++++++++
 share/completions/lz4c.fish   |  3 +++
 share/completions/lz4cat.fish | 18 +++++++++++++++
 share/completions/unlz4.fish  | 23 ++++++++++++++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 share/completions/lz4.fish
 create mode 100644 share/completions/lz4c.fish
 create mode 100644 share/completions/lz4cat.fish
 create mode 100644 share/completions/unlz4.fish

diff --git a/share/completions/lz4.fish b/share/completions/lz4.fish
new file mode 100644
index 000000000..3bd35ef58
--- /dev/null
+++ b/share/completions/lz4.fish
@@ -0,0 +1,41 @@
+# Completions for lz4
+
+complete -c lz4 -s z -l compress -d "Compress (default)"
+complete -c lz4 -s d -l decompress -l uncompress -d "Decompress" -x -a "
+(
+    __fish_complete_suffix .lz4
+)
+"
+
+complete -c lz4 -s t -l test -d "Test the integrity"
+complete -c lz4 -l list -d "List information about .lz4 file(s)"
+
+for level in (seq 1 12)
+    complete -c lz4 -o $level -d "Set compression level"
+end
+
+complete -c lz4 -l fast -d "Ultra-fast compression"
+complete -c lz4 -l best -d "Highest compression, same as -12"
+complete -c lz4 -l favor-decSpeed -d "Generate file(s) optimized for decompression speed"
+complete -r -c lz4 -s D -d "Use specified file as dictionary"
+complete -c lz4 -s f -l force -d "Overwrite without prompting"
+complete -c lz4 -s c -l stdout -l to-stdout -d "Force write to stdout"
+complete -c lz4 -s m -l multiple -d "Multiple input files"
+complete -c lz4 -s r -d "Recurse directories"
+complete -c lz4 -o B4 -d "Set block size to 64KB"
+complete -c lz4 -o B5 -d "Set block size to 256KB"
+complete -c lz4 -o B6 -d "Set block size to 1MB"
+complete -c lz4 -o B7 -d "Set block size to 4MB"
+complete -c lz4 -o BI -d "Block independence (default)"
+complete -c lz4 -o BD -d "Block dependency"
+complete -c lz4 -l no-frame-crc -d "Disable frame checksum"
+complete -c lz4 -l content-size -d "Header includes original size"
+complete -c lz4 -l sparse -d "Enable sparse mode"
+complete -c lz4 -l no-sparse -d "Disable sparse mode"
+complete -c lz4 -s v -l verbose -d "Be verbose"
+complete -c lz4 -s q -l quiet -d "Suppress warnings"
+complete -c lz4 -s h -l help -d "Show help"
+complete -c lz4 -s H -d "Show long help"
+complete -c lz4 -s V -l version -d "Show version"
+complete -c lz4 -s k -l keep -d "Keep input file(s) (default)"
+complete -c lz4 -l rm -d "Remove input file(s) after de/compression"
diff --git a/share/completions/lz4c.fish b/share/completions/lz4c.fish
new file mode 100644
index 000000000..9d5eeff61
--- /dev/null
+++ b/share/completions/lz4c.fish
@@ -0,0 +1,3 @@
+# Completions for lz4c
+
+complete -c lz4c -w lz4
diff --git a/share/completions/lz4cat.fish b/share/completions/lz4cat.fish
new file mode 100644
index 000000000..240b0e367
--- /dev/null
+++ b/share/completions/lz4cat.fish
@@ -0,0 +1,18 @@
+# Completions for lz4cat
+
+complete -c lz4cat -x -a "
+(
+    __fish_complete_suffix .lz4
+)
+"
+
+complete -c lz4cat -s t -l test -d "Test the integrity"
+complete -c lz4cat -l list -d "List information about .lz4 file(s)"
+complete -r -c lz4cat -s D -d "Use specified file as dictionary"
+complete -c lz4cat -l sparse -d "Enable sparse mode"
+complete -c lz4cat -l no-sparse -d "Disable sparse mode"
+complete -c lz4cat -s v -l verbose -d "Be verbose"
+complete -c lz4cat -s q -l quiet -d "Suppress warnings"
+complete -c lz4cat -s h -l help -d "Show help"
+complete -c lz4cat -s H -d "Show long help"
+complete -c lz4cat -s V -l version -d "Show version"
diff --git a/share/completions/unlz4.fish b/share/completions/unlz4.fish
new file mode 100644
index 000000000..a3abe6d07
--- /dev/null
+++ b/share/completions/unlz4.fish
@@ -0,0 +1,23 @@
+# Completions for unlz4
+
+complete -c unlz4 -x -a "
+(
+    __fish_complete_suffix .lz4
+)
+"
+
+complete -c unlz4 -s t -l test -d "Test the integrity"
+complete -c unlz4 -l list -d "List information about .lz4 file(s)"
+complete -r -c unlz4 -s D -d "Use specified file as dictionary"
+complete -c unlz4 -s f -l force -d "Overwrite without prompting"
+complete -c unlz4 -s c -l stdout -l to-stdout -d "Force write to stdout"
+complete -c unlz4 -s m -l multiple -d "Multiple input files"
+complete -c unlz4 -l sparse -d "Enable sparse mode"
+complete -c unlz4 -l no-sparse -d "Disable sparse mode"
+complete -c unlz4 -s v -l verbose -d "Be verbose"
+complete -c unlz4 -s q -l quiet -d "Suppress warnings"
+complete -c unlz4 -s h -l help -d "Show help"
+complete -c unlz4 -s H -d "Show long help"
+complete -c unlz4 -s V -l version -d "Show version"
+complete -c unlz4 -s k -l keep -d "Keep input file(s) (default)"
+complete -c unlz4 -l rm -d "Remove input file(s) after decompression"

From 8d56609734b6bd1505d7ce1e37bdf76bf8caa731 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 29 Nov 2019 07:18:33 +0900
Subject: [PATCH 1329/1732] Add zstd completions

Squashed commit of the following:

commit 55c8e73faff2418161404f012440acced09580e4
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 05:25:02 2019 +0900

    Implementation of `zstdless` completions

commit e81ae6f83fb9f23bdd6038fbf29ea594da098c2c
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 05:20:33 2019 +0900

    Implementation of `zstdgrep` completions

commit 2ade3a9c01bdc5b024f785c369fcb6c3e007cb19
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 04:50:42 2019 +0900

    Implementation of `pzstd` completions

commit 0b9cb86a6936f3de18db7b2c012da6efec89c8e8
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 04:39:52 2019 +0900

    Implementation of `zstdcat` completions

commit e4a4101d18a82fb06ee451560d079b9b81af5f3e
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 04:25:05 2019 +0900

    Implementation of `unzstd` completions

commit 88ad0af46d486a92ab3989c55abb3ff477e5a372
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 04:18:38 2019 +0900

    Implementation of `zstdmt` completions

commit 13f2bf7951501031c61a5c0f143b8a29eaa9437e
Author: Shun Sakai <sorairolake@protonmail.ch>
Date:   Fri Nov 29 01:13:52 2019 +0900

    Implementation of `zstd` completions
---
 share/completions/pzstd.fish    | 32 ++++++++++++++++++
 share/completions/unzstd.fish   | 35 ++++++++++++++++++++
 share/completions/zstd.fish     | 58 +++++++++++++++++++++++++++++++++
 share/completions/zstdcat.fish  | 28 ++++++++++++++++
 share/completions/zstdgrep.fish |  3 ++
 share/completions/zstdless.fish |  3 ++
 share/completions/zstdmt.fish   | 49 ++++++++++++++++++++++++++++
 7 files changed, 208 insertions(+)
 create mode 100644 share/completions/pzstd.fish
 create mode 100644 share/completions/unzstd.fish
 create mode 100644 share/completions/zstd.fish
 create mode 100644 share/completions/zstdcat.fish
 create mode 100644 share/completions/zstdgrep.fish
 create mode 100644 share/completions/zstdless.fish
 create mode 100644 share/completions/zstdmt.fish

diff --git a/share/completions/pzstd.fish b/share/completions/pzstd.fish
new file mode 100644
index 000000000..8366359f6
--- /dev/null
+++ b/share/completions/pzstd.fish
@@ -0,0 +1,32 @@
+# Completions for pzstd
+
+complete -c pzstd -s d -l decompress -d "Decompress" -x -a "
+(
+    __fish_complete_suffix .zst
+)
+"
+
+complete -c pzstd -s t -l test -d "Test the integrity"
+
+for level in (seq 1 19)
+    complete -c pzstd -o $level -d "Set compression level"
+end
+
+complete -c pzstd -l ultra -d "Enable compression level beyond 19"
+
+for threads in (seq 1 (count (cat /proc/cpuinfo | string match -r "processor")))
+    complete -x -c pzstd -s p -l processes -a "$threads" -d "De/compress using $threads working threads"
+end
+
+complete -r -c pzstd -s o -d "Specify file to save"
+complete -c pzstd -s f -l force -d "Overwrite without prompting"
+complete -c pzstd -s c -l stdout -d "Force write to stdout"
+complete -c pzstd -l rm -d "Remove input file(s) after de/compression"
+complete -c pzstd -s k -l keep -d "Keep input file(s) (default)"
+complete -c pzstd -s r -d "Recurse directories"
+complete -c pzstd -s h -l help -d "Show help"
+complete -c pzstd -s H -d "Show long help"
+complete -c pzstd -s V -l version -d "Show version"
+complete -c pzstd -s v -l verbose -d "Be verbose"
+complete -c pzstd -s q -l quiet -d "Suppress warnings"
+complete -c pzstd -l no-check -d "Disable integrity check"
diff --git a/share/completions/unzstd.fish b/share/completions/unzstd.fish
new file mode 100644
index 000000000..1a930a35f
--- /dev/null
+++ b/share/completions/unzstd.fish
@@ -0,0 +1,35 @@
+# Completions for unzstd
+
+complete -c unzstd -x -a "
+(
+    __fish_complete_suffix .zst
+)
+"
+
+complete -c unzstd -s t -l test -d "Test the integrity"
+complete -r -c unzstd -l train -d "Create a dictionary from specified file(s)"
+complete -c unzstd -s l -l list -d "List information about .zst file(s)"
+complete -c unzstd -l long -d "Enable long distance matching with specified windowLog"
+complete -c unzstd -l single-thread -d "Single-thread mode"
+complete -r -c unzstd -s D -d "Use specified file as dictionary"
+complete -r -c unzstd -s o -d "Specify file to save"
+complete -c unzstd -s f -l force -d "Overwrite without prompting"
+complete -c unzstd -s c -l stdout -d "Force write to stdout"
+complete -c unzstd -l sparse -d "Enable sparse mode"
+complete -c unzstd -l no-sparse -d "Disable sparse mode"
+complete -c unzstd -l rm -d "Remove input file(s) after decompression"
+complete -c unzstd -s k -l keep -d "Keep input file(s) (default)"
+complete -c unzstd -s r -d "Recurse directories"
+complete -c unzstd -l filelist -d "Read a list of files"
+complete -c unzstd -l output-dir-flat -d "Specify a directory to output all files"
+
+for format in zstd gzip xz lzma lz4
+    complete -c unzstd -l format="$format" -d "Specify the format to use for decompression"
+end
+
+complete -c unzstd -s h -l help -d "Show help"
+complete -c unzstd -s H -d "Show long help"
+complete -c unzstd -s V -l version -d "Show version"
+complete -c unzstd -s v -l verbose -d "Be verbose"
+complete -c unzstd -s q -l quiet -d "Suppress warnings"
+complete -c unzstd -l no-progress -d "Do not show the progress bar"
diff --git a/share/completions/zstd.fish b/share/completions/zstd.fish
new file mode 100644
index 000000000..39ce7a3a5
--- /dev/null
+++ b/share/completions/zstd.fish
@@ -0,0 +1,58 @@
+# Completions for zstd
+
+complete -c zstd -s z -l compress -d "Compress (default)"
+complete -c zstd -s d -l decompress -l uncompress -d "Decompress" -x -a "
+(
+    __fish_complete_suffix .zst
+)
+"
+
+complete -c zstd -s t -l test -d "Test the integrity"
+complete -r -c zstd -l train -d "Create a dictionary from specified file(s)"
+complete -c zstd -s l -l list -d "List information about .zst file(s)"
+
+for level in (seq 1 19)
+    complete -c zstd -o $level -d "Set compression level"
+end
+
+complete -c zstd -l fast -d "Ultra-fast compression"
+complete -c zstd -l ultra -d "Enable compression level beyond 19"
+complete -c zstd -l long -d "Enable long distance matching with specified windowLog"
+
+for threads in (seq 0 (count (cat /proc/cpuinfo | string match -r "processor")))
+    if test $threads -eq 0
+        complete -c zstd -o T"$threads" -l threads="$threads" -d "Compress using as many threads as there are CPU cores on the system"
+    else
+        complete -c zstd -o T"$threads" -l threads="$threads" -d "Compress using $threads working threads"
+    end
+end
+
+complete -c zstd -l single-thread -d "Single-thread mode"
+complete -c zstd -l adapt -d "Dynamically adapt compression level to I/O conditions"
+complete -c zstd -l stream-size -d "Optimize compression parameters for streaming input of specified bytes"
+complete -c zstd -l size-hint -d "Optimize compression parameters for streaming input of approximately this size"
+complete -c zstd -l rsyncable -d "Compress using a rsync-friendly method"
+complete -r -c zstd -s D -d "Use specified file as dictionary"
+complete -c zstd -l no-dictID -d "Do not write dictID into header"
+complete -r -c zstd -s o -d "Specify file to save"
+complete -c zstd -s f -l force -d "Overwrite without prompting"
+complete -c zstd -s c -l stdout -d "Force write to stdout"
+complete -c zstd -l sparse -d "Enable sparse mode"
+complete -c zstd -l no-sparse -d "Disable sparse mode"
+complete -c zstd -l rm -d "Remove input file(s) after de/compression"
+complete -c zstd -s k -l keep -d "Keep input file(s) (default)"
+complete -c zstd -s r -d "Recurse directories"
+complete -c zstd -l filelist -d "Read a list of files"
+complete -c zstd -l output-dir-flat -d "Specify a directory to output all files"
+
+for format in zstd gzip xz lzma lz4
+    complete -c zstd -l format="$format" -d "Specify the format to use for compression"
+end
+
+complete -c zstd -s h -l help -d "Show help"
+complete -c zstd -s H -d "Show long help"
+complete -c zstd -s V -l version -d "Show version"
+complete -c zstd -s v -l verbose -d "Be verbose"
+complete -c zstd -s q -l quiet -d "Suppress warnings"
+complete -c zstd -l no-progress -d "Do not show the progress bar"
+complete -c zstd -l no-check -d "Disable integrity check"
diff --git a/share/completions/zstdcat.fish b/share/completions/zstdcat.fish
new file mode 100644
index 000000000..0eff2939e
--- /dev/null
+++ b/share/completions/zstdcat.fish
@@ -0,0 +1,28 @@
+# Completions for zstdcat
+
+complete -c zstdcat -x -a "
+(
+    __fish_complete_suffix .zst
+)
+"
+
+complete -c zstdcat -s t -l test -d "Test the integrity"
+complete -c zstdcat -s l -l list -d "List information about .zst file(s)"
+complete -c zstdcat -l long -d "Enable long distance matching with specified windowLog"
+complete -c zstdcat -l single-thread -d "Single-thread mode"
+complete -r -c zstdcat -s D -d "Use specified file as dictionary"
+complete -c zstdcat -l sparse -d "Enable sparse mode"
+complete -c zstdcat -l no-sparse -d "Disable sparse mode"
+complete -c zstdcat -s r -d "Recurse directories"
+complete -c zstdcat -l filelist -d "Read a list of files"
+
+for format in zstd gzip xz lzma lz4
+    complete -c zstdcat -l format="$format" -d "Specify the format to use for decompression"
+end
+
+complete -c zstdcat -s h -l help -d "Show help"
+complete -c zstdcat -s H -d "Show long help"
+complete -c zstdcat -s V -l version -d "Show version"
+complete -c zstdcat -s v -l verbose -d "Be verbose"
+complete -c zstdcat -s q -l quiet -d "Suppress warnings"
+complete -c zstdcat -l no-progress -d "Do not show the progress bar"
diff --git a/share/completions/zstdgrep.fish b/share/completions/zstdgrep.fish
new file mode 100644
index 000000000..7547ec47d
--- /dev/null
+++ b/share/completions/zstdgrep.fish
@@ -0,0 +1,3 @@
+# Completions for zstdgrep
+
+complete -c zstdgrep -w grep
diff --git a/share/completions/zstdless.fish b/share/completions/zstdless.fish
new file mode 100644
index 000000000..3381dbca5
--- /dev/null
+++ b/share/completions/zstdless.fish
@@ -0,0 +1,3 @@
+# Completions for zstdless
+
+complete -c zstdless -w zstdcat
diff --git a/share/completions/zstdmt.fish b/share/completions/zstdmt.fish
new file mode 100644
index 000000000..ed813bc1f
--- /dev/null
+++ b/share/completions/zstdmt.fish
@@ -0,0 +1,49 @@
+# Completions for zstdmt
+
+complete -c zstdmt -s z -l compress -d "Compress (default)"
+complete -c zstdmt -s d -l decompress -l uncompress -d "Decompress" -x -a "
+(
+    __fish_complete_suffix .zst
+)
+"
+
+complete -c zstdmt -s t -l test -d "Test the integrity"
+complete -r -c zstdmt -l train -d "Create a dictionary from specified file(s)"
+complete -c zstdmt -s l -l list -d "List information about .zst file(s)"
+
+for level in (seq 1 19)
+    complete -c zstdmt -o $level -d "Set compression level"
+end
+
+complete -c zstdmt -l fast -d "Ultra-fast compression"
+complete -c zstdmt -l ultra -d "Enable compression level beyond 19"
+complete -c zstdmt -l long -d "Enable long distance matching with specified windowLog"
+complete -c zstdmt -l single-thread -d "Single-thread mode"
+complete -c zstdmt -l adapt -d "Dynamically adapt compression level to I/O conditions"
+complete -c zstdmt -l stream-size -d "Optimize compression parameters for streaming input of specified bytes"
+complete -c zstdmt -l size-hint -d "Optimize compression parameters for streaming input of approximately this size"
+complete -c zstdmt -l rsyncable -d "Compress using a rsync-friendly method"
+complete -r -c zstdmt -s D -d "Use specified file as dictionary"
+complete -c zstdmt -l no-dictID -d "Do not write dictID into header"
+complete -r -c zstdmt -s o -d "Specify file to save"
+complete -c zstdmt -s f -l force -d "Overwrite without prompting"
+complete -c zstdmt -s c -l stdout -d "Force write to stdout"
+complete -c zstdmt -l sparse -d "Enable sparse mode"
+complete -c zstdmt -l no-sparse -d "Disable sparse mode"
+complete -c zstdmt -l rm -d "Remove input file(s) after de/compression"
+complete -c zstdmt -s k -l keep -d "Keep input file(s) (default)"
+complete -c zstdmt -s r -d "Recurse directories"
+complete -c zstdmt -l filelist -d "Read a list of files"
+complete -c zstdmt -l output-dir-flat -d "Specify a directory to output all files"
+
+for format in zstd gzip xz lzma lz4
+    complete -c zstdmt -l format="$format" -d "Specify the format to use for compression"
+end
+
+complete -c zstdmt -s h -l help -d "Show help"
+complete -c zstdmt -s H -d "Show long help"
+complete -c zstdmt -s V -l version -d "Show version"
+complete -c zstdmt -s v -l verbose -d "Be verbose"
+complete -c zstdmt -s q -l quiet -d "Suppress warnings"
+complete -c zstdmt -l no-progress -d "Do not show the progress bar"
+complete -c zstdmt -l no-check -d "Disable integrity check"

From 9510d317c169cd00567989b4105b5000cf921ef1 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 29 Nov 2019 09:03:37 +0900
Subject: [PATCH 1330/1732] CHANGELOG: add lz4 and zstd completions

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2da6185a5..3dd56d34c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -111,11 +111,13 @@
   - `irb` (#6260)
   - `iw` (#6232)
   - `kak`
+  - `lz4`, `lz4c` and `lz4cat` (#6364)
   - `mariner` (#5718)
   - `nethack` (#6240)
   - `patool` (#6083)
   - `phpunit` (#6197)
   - `plutil` (#6301)
+  - `pzstd` (#6364)
   - `qubes-gpg-client` (#6067)
   - `rg`
   - `rustup`
@@ -124,8 +126,11 @@
   - `src` (#6026)
   - `tokei` (#6085)
   - `tsc` (#6016)
+  - `unlz4` (#6364)
+  - `unzstd` (#6364)
   - `vbc` (#6016)
   - `zpaq` (#6245)
+  - `zstd`, `zstdcat`, `zstdgrep`, `zstdless` and `zstdmt` (#6364)
 - Lots of improvements to completions.
 
 ### Deprecations

From b862c63905fc5785c681145b95c5c791af6ab1fe Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Sun, 1 Dec 2019 13:14:10 +0900
Subject: [PATCH 1331/1732] Fix an issue that cannot run on non-Linux systems

If Python 3.4 or later installed on the system, complement to the
number of physical cores. In addition, even if the number of physical
cores cannot be obtained, it was fixed to run properly.
---
 share/completions/pzstd.fish | 10 ++++++++--
 share/completions/zstd.fish  | 14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/share/completions/pzstd.fish b/share/completions/pzstd.fish
index 8366359f6..4c0024f04 100644
--- a/share/completions/pzstd.fish
+++ b/share/completions/pzstd.fish
@@ -14,8 +14,14 @@ end
 
 complete -c pzstd -l ultra -d "Enable compression level beyond 19"
 
-for threads in (seq 1 (count (cat /proc/cpuinfo | string match -r "processor")))
-    complete -x -c pzstd -s p -l processes -a "$threads" -d "De/compress using $threads working threads"
+## If Python 3.4 or later installed, the number of physical cores is assigned to a variable.
+set -l python (__fish_anypython)
+set -q python[1]; and set -l physical_cores ($python -c 'import os; os.cpu_count() is not None and print(os.cpu_count())' 2> /dev/null)
+
+if set -q physical_cores; and test -n "$physical_cores"
+    complete -x -c pzstd -s p -l processes -a "(seq 1 $physical_cores)" -d "De/compress using $threads working threads"
+else
+    complete -x -c pzstd -s p -l processes -a NUM -d "De/compress using NUM working threads"
 end
 
 complete -r -c pzstd -s o -d "Specify file to save"
diff --git a/share/completions/zstd.fish b/share/completions/zstd.fish
index 39ce7a3a5..69bddcfb6 100644
--- a/share/completions/zstd.fish
+++ b/share/completions/zstd.fish
@@ -19,12 +19,18 @@ complete -c zstd -l fast -d "Ultra-fast compression"
 complete -c zstd -l ultra -d "Enable compression level beyond 19"
 complete -c zstd -l long -d "Enable long distance matching with specified windowLog"
 
-for threads in (seq 0 (count (cat /proc/cpuinfo | string match -r "processor")))
-    if test $threads -eq 0
-        complete -c zstd -o T"$threads" -l threads="$threads" -d "Compress using as many threads as there are CPU cores on the system"
-    else
+## If Python 3.4 or later installed, the number of physical cores is assigned to a variable.
+set -l python (__fish_anypython)
+set -q python[1]; and set -l physical_cores ($python -c 'import os; os.cpu_count() is not None and print(os.cpu_count())' 2> /dev/null)
+## When using all physical cores.
+complete -c zstd -o T0 -l threads=0 -d "Compress using as many threads as there are CPU cores on the system"
+
+if set -q physical_cores; and test -n "$physical_cores"
+    for threads in (seq 1 $physical_cores)
         complete -c zstd -o T"$threads" -l threads="$threads" -d "Compress using $threads working threads"
     end
+else
+    complete -c zstd -o TNUM -l threads=NUM -d "Compress using NUM working threads"
 end
 
 complete -c zstd -l single-thread -d "Single-thread mode"

From b2332e9f3e2f27d9313d3c2c29afe4a8503d44dd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 7 Dec 2019 19:14:02 +0100
Subject: [PATCH 1332/1732] Switch default prompt to Classic+VCS

This has more info, in particular vcs and status.

The old default is still available as the "classic" prompt.

Fixes #6375.
---
 share/functions/fish_prompt.fish | 41 +++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 5aef15819..352119b1d 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -1,22 +1,35 @@
-# vim: set noet:
-#
-# Set the default prompt command.
+# name: Classic + Vcs
+# author: Lily Ballard
 
-function fish_prompt --description "Write out the prompt"
-    set -l color_cwd
-    set -l suffix
-    switch "$USER"
-        case root toor
+function fish_prompt --description 'Write out the prompt'
+    set -l last_pipestatus $pipestatus
+    set -l last_status $status
+    set -l normal (set_color normal)
+
+    # Initialize our variables.
+    set -q fish_color_user
+    or set -U fish_color_user -o green
+    set -q fish_color_host
+    or set -U fish_color_host -o cyan
+    set -q fish_color_status
+    or set -U fish_color_status red
+
+    # Color the prompt differently when we're root
+    set -l color_cwd $fish_color_cwd
+    set -l prefix
+    set -l suffix '>'
+    if contains -- $USER root toor
             if set -q fish_color_cwd_root
                 set color_cwd $fish_color_cwd_root
-            else
-                set color_cwd $fish_color_cwd
             end
             set suffix '#'
-        case '*'
-            set color_cwd $fish_color_cwd
-            set suffix '>'
     end
 
-    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
+    # Write pipestatus
+    set -l prompt_status (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
+    if test $last_status -ne 0
+        set prompt_status " $prompt_status" (set_color $fish_color_status) "[$last_status]" "$normal"
+    end
+
+    echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end

From a7f6fd22d4e3b835a7a2ee25af67286ca842b7cb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 30 Nov 2019 16:41:42 -0800
Subject: [PATCH 1333/1732] Factor block and fish function execution into a
 "performer" std::function

In preparation for concurrent execution, invert the control of function and
block execution. Allow a process to return an std::function that performs the
the execution. This can be run on either the main or a background thread
(eventually).
---
 src/exec.cpp | 74 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 767291b03..fb914fdd1 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -813,6 +813,52 @@ static void function_restore_environment(parser_t &parser, const block_t *block)
     parser.libdata().returning = false;
 }
 
+// The "performer" function of a block or function process.
+// This accepts a place to execute as \p parser, and a parent job as \p parent, and then executes
+// the result, returning a status.
+// This is factored out in this funny way in preparation for concurrent execution.
+using proc_performer_t =
+    std::function<proc_status_t(parser_t &parser, std::shared_ptr<job_t> parent)>;
+
+// \return a function which may be to run the given process \p.
+// May return an empty std::function in the rare case that the to-be called fish function no longer
+// exists. This is just a dumb artifact of the fact that we only capture the functions name, not its
+// properties, when creating the job; thus a race could delete the function before we fetch its
+// properties.
+static proc_performer_t get_performer_for_process(process_t *p, const io_chain_t &io_chain) {
+    assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
+           "Unexpected process type");
+    if (p->type == process_type_t::block_node) {
+        const parsed_source_ref_t &source = p->block_node_source;
+        tnode_t<grammar::statement> node = p->internal_block_node;
+        assert(source && node && "Process is missing node info");
+        return [=](parser_t &parser, std::shared_ptr<job_t> parent) {
+            internal_exec_helper(parser, source, node, io_chain, parent);
+            int status = parser.get_last_status();
+            // FIXME: setting the status this way is dangerous nonsense, we need to decode the
+            // status properly if it was a signal.
+            return proc_status_t::from_exit_code(status);
+        };
+    } else {
+        assert(p->type == process_type_t::function);
+        auto props = function_get_properties(p->argv0());
+        if (!props) {
+            FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
+            return proc_performer_t{};
+        }
+        auto argv = move_to_sharedptr(p->get_argv_array().to_list());
+        return [=](parser_t &parser, std::shared_ptr<job_t> parent) {
+            const block_t *fb = function_prepare_environment(parser, *argv, *props);
+            internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, parent);
+            function_restore_environment(parser, fb);
+            int status = parser.get_last_status();
+            // FIXME: setting the status this way is dangerous nonsense, we need to decode the
+            // status properly if it was a signal.
+            return proc_status_t::from_exit_code(status);
+        };
+    }
+}
+
 /// Execute a block node or function "process".
 /// \p user_ios contains the list of user-specified ios, used so we can avoid stomping on them with
 /// our pipes.
@@ -821,9 +867,6 @@ static void function_restore_environment(parser_t &parser, const block_t *block)
 static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
                                        const io_chain_t &user_ios, io_chain_t io_chain,
                                        bool allow_buffering) {
-    assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
-           "Unexpected process type");
-
     // Create an output buffer if we're piping to another process.
     shared_ptr<io_bufferfill_t> block_output_bufferfill{};
     if (!p->is_last_in_job && allow_buffering) {
@@ -837,28 +880,15 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
         io_chain.push_back(block_output_bufferfill);
     }
 
-    if (p->type == process_type_t::function) {
-        auto props = function_get_properties(p->argv0());
-        if (!props) {
-            FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
-            return false;
-        }
-
-        const block_t *fb =
-            function_prepare_environment(parser, p->get_argv_array().to_list(), *props);
-        internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, j);
-        function_restore_environment(parser, fb);
+    // Get the process performer, and just execute it directly.
+    // Do it in this scoped way so that the performer function can be eagerly deallocating releasing
+    // its captured io chain.
+    if (proc_performer_t performer = get_performer_for_process(p, io_chain)) {
+        p->status = performer(parser, j);
     } else {
-        assert(p->type == process_type_t::block_node);
-        assert(p->block_node_source && p->internal_block_node && "Process is missing node info");
-        internal_exec_helper(parser, p->block_node_source, p->internal_block_node, io_chain, j);
+        return false;
     }
 
-    int status = parser.get_last_status();
-    // FIXME: setting the status this way is dangerous nonsense, we need to decode the status
-    // properly if it was a signal.
-    p->status = proc_status_t::from_exit_code(status);
-
     // If we have a block output buffer, populate it now.
     if (!block_output_bufferfill) {
         // No buffer, so we exit directly. This means we have to manually set the exit

From 098fe86ebfb63dbdb8cb061c6913d4d60990cbe8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 7 Dec 2019 11:02:22 -0800
Subject: [PATCH 1334/1732] Port empty functions test to littlecheck

---
 tests/checks/empty.fish | 18 ++++++++++++++++++
 tests/empty.err         |  3 ---
 tests/empty.in          | 16 ----------------
 tests/empty.out         |  7 -------
 4 files changed, 18 insertions(+), 26 deletions(-)
 create mode 100644 tests/checks/empty.fish
 delete mode 100644 tests/empty.err
 delete mode 100644 tests/empty.in
 delete mode 100644 tests/empty.out

diff --git a/tests/checks/empty.fish b/tests/checks/empty.fish
new file mode 100644
index 000000000..c5c598fca
--- /dev/null
+++ b/tests/checks/empty.fish
@@ -0,0 +1,18 @@
+# RUN: %fish %s
+
+# See issue 5692
+
+function empty
+end
+
+# functions should not preserve $status
+false; empty; echo $status
+# CHECK: 0
+true; empty; echo $status
+# CHECK: 0
+
+# blocks should preserve $status
+false; begin; end; echo $status
+# CHECK: 1
+true; begin; end; echo $status
+# CHECK: 0
diff --git a/tests/empty.err b/tests/empty.err
deleted file mode 100644
index 793c955b5..000000000
--- a/tests/empty.err
+++ /dev/null
@@ -1,3 +0,0 @@
-
-####################
-# Testing `0` after empty functions and blocks
diff --git a/tests/empty.in b/tests/empty.in
deleted file mode 100644
index f27c24850..000000000
--- a/tests/empty.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# See issue 5692
-
-logmsg "Testing `$status` after empty functions and blocks"
-
-function empty
-end
-
-# functions shouldn't preserve $status
-
-false; empty; echo $status # 0
-true; empty; echo $status # 0
-
-# blocks should preserve $status
-
-false; begin; end; echo $status # 1
-true; begin; end; echo $status # 0
diff --git a/tests/empty.out b/tests/empty.out
deleted file mode 100644
index 0d0c1d513..000000000
--- a/tests/empty.out
+++ /dev/null
@@ -1,7 +0,0 @@
-
-####################
-# Testing `0` after empty functions and blocks
-0
-0
-1
-0

From f575c55f5ba16388ea33c970c7732135152e403b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 7 Dec 2019 11:04:00 -0800
Subject: [PATCH 1335/1732] Migrate the logic to make empty functions succeed
 into the performer

This is a more natural place for this logic.
---
 src/exec.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index fb914fdd1..257c0a27b 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -848,10 +848,20 @@ static proc_performer_t get_performer_for_process(process_t *p, const io_chain_t
         }
         auto argv = move_to_sharedptr(p->get_argv_array().to_list());
         return [=](parser_t &parser, std::shared_ptr<job_t> parent) {
+            const auto &ld = parser.libdata();
+            auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
             internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, parent);
             function_restore_environment(parser, fb);
-            int status = parser.get_last_status();
+
+            // If the function did not execute anything, treat it as success.
+            int status;
+            if (saved_exec_count == ld.exec_count) {
+                status = 0;
+            } else {
+                status = parser.get_last_status();
+            }
+
             // FIXME: setting the status this way is dangerous nonsense, we need to decode the
             // status properly if it was a signal.
             return proc_status_t::from_exit_code(status);
@@ -1015,15 +1025,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
                                             allow_buffering)) {
                 return false;
             }
-
-            // Functions are basically treated as named blocks, and this is the only place we can
-            // distinguish between them. A block by default does not touch $status, on the other
-            // hand, calling an empty function should clear $status.
-            if (parser.libdata().exec_count == cached_exec_count &&
-                p->type == process_type_t::function) {
-                p->status = proc_status_t::from_exit_code(0);
-            }
-
             break;
         }
 

From 2ec8cd3bca44881157325ddfe96d3512c6d94a6b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 7 Dec 2019 11:28:22 -0800
Subject: [PATCH 1336/1732] Remove a dead variable

---
 src/exec.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 257c0a27b..68815f44e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1020,7 +1020,6 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
             // were already launched, so they are ready to receive (or reject) our output.
             bool allow_buffering = !is_deferred_run;
-            auto cached_exec_count = parser.libdata().exec_count;
             if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain,
                                             allow_buffering)) {
                 return false;

From d47541a3d7a20fd522dfad032d5d26bebf87e4f4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Dec 2019 11:44:21 -0800
Subject: [PATCH 1337/1732] Add a tricky test to verify disowning an in-flight
 job

There's some logic in fish to prevent blowing up when an under-construction
job is disowned. Add a test for it.
---
 src/fish_test_helper.cpp        |  8 ++++++++
 tests/checks/disown-parent.fish | 14 ++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tests/checks/disown-parent.fish

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index 20310f495..5f3035a5b 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -46,6 +46,12 @@ static void print_stdout_stderr() {
     fflush(nullptr);
 }
 
+static void print_pid_then_sleep() {
+    fprintf(stdout, "%d\n", getpid());
+    fflush(nullptr);
+    usleep(1000000 / .5);  //.5 secs
+}
+
 int main(int argc, char *argv[]) {
     if (argc <= 1) {
         fprintf(stderr, "No commands given.\n");
@@ -60,6 +66,8 @@ int main(int argc, char *argv[]) {
             sigint_parent();
         } else if (!strcmp(argv[i], "print_stdout_stderr")) {
             print_stdout_stderr();
+        } else if (!strcmp(argv[i], "print_pid_then_sleep")) {
+            print_pid_then_sleep();
         } else {
             fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
             return EXIT_FAILURE;
diff --git a/tests/checks/disown-parent.fish b/tests/checks/disown-parent.fish
new file mode 100644
index 000000000..adfe8e344
--- /dev/null
+++ b/tests/checks/disown-parent.fish
@@ -0,0 +1,14 @@
+# RUN: env fish_test_helper=%fish_test_helper %fish %s
+
+# Ensure that a job which attempts to disown itself does not explode.
+# Here fish_test_helper is the process group leader; we attempt to disown
+# its pid within a pipeline containing it.
+
+function disowner
+    read -l pid
+    echo Disown $pid
+    disown $pid
+end
+$fish_test_helper print_pid_then_sleep | disowner
+
+# CHECK: Disown {{\d+}}

From 92a16921bf330912927f1cef3e970fd81238fc26 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Dec 2019 13:28:30 -0800
Subject: [PATCH 1338/1732] Add a test to verify that processes get the right
 pgrps in pipelines

---
 src/fish_test_helper.cpp          |  4 ++++
 tests/checks/pipeline-pgroup.fish | 30 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 tests/checks/pipeline-pgroup.fish

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index 5f3035a5b..9f6cd7b94 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -52,6 +52,8 @@ static void print_pid_then_sleep() {
     usleep(1000000 / .5);  //.5 secs
 }
 
+static void print_pgrp() { fprintf(stdout, "%d\n", getpgrp()); }
+
 int main(int argc, char *argv[]) {
     if (argc <= 1) {
         fprintf(stderr, "No commands given.\n");
@@ -68,6 +70,8 @@ int main(int argc, char *argv[]) {
             print_stdout_stderr();
         } else if (!strcmp(argv[i], "print_pid_then_sleep")) {
             print_pid_then_sleep();
+        } else if (!strcmp(argv[i], "print_pgrp")) {
+            print_pgrp();
         } else {
             fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
             return EXIT_FAILURE;
diff --git a/tests/checks/pipeline-pgroup.fish b/tests/checks/pipeline-pgroup.fish
new file mode 100644
index 000000000..7939adb45
--- /dev/null
+++ b/tests/checks/pipeline-pgroup.fish
@@ -0,0 +1,30 @@
+# RUN: env fth=%fish_test_helper %fish %s
+
+# Ensure that lots of nested jobs all end up in the same pgroup.
+
+function save_pgroup -a var_name
+    $fth print_pgrp | read -g $var_name
+end
+
+# Here everything should live in the pgroup of the first fish_test_helper.
+$fth print_pgrp | read -g global_group | save_pgroup g1 | begin; save_pgroup g2; end
+
+[ "$global_group" -eq "$g1" ] && [ "$g1" -eq "$g2" ]
+and echo "All pgroups agreed"
+or echo "Pgroups disagreed. Should be in $global_group but found $g1 and $g2"
+# CHECK: All pgroups agreed
+
+# Here everything should live in fish's pgroup.
+# Unfortunately we don't know what fish's pgroup is (it may not be fish's pid).
+# So run it twice and verify that everything agrees; this implies that it could
+# not have used any of the pids of the child procs.
+function nothing ; end
+nothing | $fth print_pgrp | read -g a0 | save_pgroup a1 | begin; save_pgroup a2; end
+nothing | $fth print_pgrp | read -g b0 | save_pgroup b1 | begin; save_pgroup b2; end
+
+[ "$a0" -eq "$a1" ] && [ "$a1" -eq "$a2" ] \
+  && [ "$b0" -eq "$b1" ] && [ "$b1" -eq "$b2" ] \
+  && [ "$a0" -eq "$b0" ]
+and echo "All pgroups agreed"
+or echo "Pgroups disagreed. Found $a0 $a1 $a2, and $b0 $b1 $b2"
+# CHECK: All pgroups agreed

From e3b8203187235dc4add8cbc08c220eac049fbffd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Dec 2019 14:43:30 -0800
Subject: [PATCH 1339/1732] Implement logger_t::log_fmt for narrow chars by
 trampolining to wide chars

This satifies the glibc.
---
 src/flog.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/flog.cpp b/src/flog.cpp
index f46f22f2a..477a295dd 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -56,13 +56,28 @@ void logger_t::log_fmt(const category_t &cat, const wchar_t *fmt, ...) {
 }
 
 void logger_t::log_fmt(const category_t &cat, const char *fmt, ...) {
+    // glibc dislikes mixing wide and narrow output functions.
+    // So construct a narrow string in-place and output that via wide functions.
     va_list va;
     va_start(va, fmt);
-    log1(cat.name);
-    log1(": ");
-    std::vfprintf(file_, fmt, va);
-    log1('\n');
+    int ret = vsnprintf(nullptr, 0, fmt, va);
     va_end(va);
+
+    if (ret < 0) {
+        perror("vsnprintf");
+        return;
+    }
+    size_t len = static_cast<size_t>(ret) + 1;
+    std::unique_ptr<char[]> buff(new char[len]);
+
+    va_start(va, fmt);
+    ret = vsnprintf(buff.get(), len, fmt, va);
+    va_end(va);
+    if (ret < 0) {
+        perror("vsnprintf");
+        return;
+    }
+    log_fmt(cat, L"%s", buff.get());
 }
 
 }  // namespace flog_details

From f136d634eb875b86f719d7d9dc5b6c08abd3d343 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Dec 2019 13:03:42 -0800
Subject: [PATCH 1340/1732] Collapse a job's "parent stuff" into a new type
 job_lineage_t

Currently a job needs to know three things about its "parents:"

1. Any IO redirections for the block or function containing this job
2. The pgid for the parent job
3. Whether the parent job has been fully constructed (to defer self-disown)

These are all tracked in somewhat separate awkward ways. Collapse them
into a single new type job_lineage_t.
---
 src/exec.cpp            | 47 ++++++++++++++++++++++-------------------
 src/parse_execution.cpp | 15 +++++--------
 src/parse_execution.h   | 12 +++++------
 src/parser.cpp          | 22 +++++++++----------
 src/parser.h            |  4 ++--
 src/proc.cpp            | 16 ++++----------
 src/proc.h              | 39 +++++++++++++++++++++++-----------
 7 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 68815f44e..04b34f47f 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -246,28 +246,27 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const w
     return success;
 }
 
-/// Morph an io redirection chain into redirections suitable for passing to eval, call eval, and
-/// clean up morphed redirections.
+/// Morph an io redirection chain into redirections suitable for passing to eval, and then call
+/// eval.
 ///
 /// \param parsed_source the parsed source code containing the node to evaluate
 /// \param node the node to evaluate
 /// \param ios the io redirections to be performed on this block
 template <typename T>
 void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, tnode_t<T> node,
-                          const io_chain_t &ios, std::shared_ptr<job_t> parent_job) {
+                          job_lineage_t lineage) {
     assert(parsed_source && node && "exec_helper missing source or without node");
 
     io_chain_t morphed_chain;
     std::vector<autoclose_fd_t> opened_fds;
-    if (!resolve_file_redirections_to_fds(ios, parser.vars().get_pwd_slash(), &morphed_chain,
-                                          &opened_fds)) {
+    if (!resolve_file_redirections_to_fds(lineage.block_io, parser.vars().get_pwd_slash(),
+                                          &morphed_chain, &opened_fds)) {
         parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
         return;
     }
 
-    parser.eval_node(parsed_source, node, morphed_chain, TOP, parent_job);
-
-    morphed_chain.clear();
+    lineage.block_io = std::move(morphed_chain);
+    parser.eval_node(parsed_source, node, TOP, std::move(lineage));
     job_reap(parser, false);
 }
 
@@ -817,23 +816,28 @@ static void function_restore_environment(parser_t &parser, const block_t *block)
 // This accepts a place to execute as \p parser, and a parent job as \p parent, and then executes
 // the result, returning a status.
 // This is factored out in this funny way in preparation for concurrent execution.
-using proc_performer_t =
-    std::function<proc_status_t(parser_t &parser, std::shared_ptr<job_t> parent)>;
+using proc_performer_t = std::function<proc_status_t(parser_t &parser)>;
 
 // \return a function which may be to run the given process \p.
 // May return an empty std::function in the rare case that the to-be called fish function no longer
 // exists. This is just a dumb artifact of the fact that we only capture the functions name, not its
 // properties, when creating the job; thus a race could delete the function before we fetch its
 // properties.
-static proc_performer_t get_performer_for_process(process_t *p, const io_chain_t &io_chain) {
+static proc_performer_t get_performer_for_process(process_t *p, const job_t *job,
+                                                  const io_chain_t &io_chain) {
     assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
            "Unexpected process type");
+    // Construct a lineage, starting from the job's lineage.
+    job_lineage_t lineage = job->lineage();
+    lineage.block_io = io_chain;
+    lineage.parent_pgid = (job->pgid == INVALID_PID ? none() : maybe_t<pid_t>(job->pgid));
+
     if (p->type == process_type_t::block_node) {
         const parsed_source_ref_t &source = p->block_node_source;
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
-        return [=](parser_t &parser, std::shared_ptr<job_t> parent) {
-            internal_exec_helper(parser, source, node, io_chain, parent);
+        return [=](parser_t &parser) {
+            internal_exec_helper(parser, source, node, lineage);
             int status = parser.get_last_status();
             // FIXME: setting the status this way is dangerous nonsense, we need to decode the
             // status properly if it was a signal.
@@ -847,11 +851,11 @@ static proc_performer_t get_performer_for_process(process_t *p, const io_chain_t
             return proc_performer_t{};
         }
         auto argv = move_to_sharedptr(p->get_argv_array().to_list());
-        return [=](parser_t &parser, std::shared_ptr<job_t> parent) {
+        return [=](parser_t &parser) {
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            internal_exec_helper(parser, props->parsed_source, props->body_node, io_chain, parent);
+            internal_exec_helper(parser, props->parsed_source, props->body_node, lineage);
             function_restore_environment(parser, fb);
 
             // If the function did not execute anything, treat it as success.
@@ -893,8 +897,8 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
     // Get the process performer, and just execute it directly.
     // Do it in this scoped way so that the performer function can be eagerly deallocating releasing
     // its captured io chain.
-    if (proc_performer_t performer = get_performer_for_process(p, io_chain)) {
-        p->status = performer(parser, j);
+    if (proc_performer_t performer = get_performer_for_process(p, j.get(), io_chain)) {
+        p->status = performer(parser);
     } else {
         return false;
     }
@@ -1130,11 +1134,10 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
     const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == getpgrp());
 
-    const std::shared_ptr<job_t> parent_job = j->get_parent();
-
-    // Perhaps inherit our parent's pgid and job control flag.
-    if (parent_job && parent_job->pgid != INVALID_PID) {
-        j->pgid = parent_job->pgid;
+    // If our lineage indicates a pgid, share it.
+    if (auto parent_pgid = j->lineage().parent_pgid) {
+        assert(*parent_pgid != INVALID_PID && "parent pgid should be none, not INVALID_PID");
+        j->pgid = *parent_pgid;
         j->mut_flags().job_control = true;
     }
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 0efa83ea7..bde328e00 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -87,8 +87,8 @@ static std::shared_ptr<io_data_t> get_stderr_merge() {
 }
 
 parse_execution_context_t::parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
-                                                     std::shared_ptr<job_t> parent)
-    : pstree(std::move(pstree)), parser(p), parent_job(std::move(parent)) {}
+                                                     job_lineage_t lineage)
+    : pstree(std::move(pstree)), parser(p), lineage(std::move(lineage)) {}
 
 // Utilities
 
@@ -1306,7 +1306,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         ld.is_subshell || ld.is_block || ld.is_event || !parser->is_interactive();
     props.from_event_handler = ld.is_event;
 
-    shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, block_io, parent_job);
+    shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, this->lineage);
     job->tmodes = tmodes;
 
     job->mut_flags().foreground = !job_node_is_background(job_node);
@@ -1434,12 +1434,9 @@ parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> j
 }
 
 parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
-                                                              const block_t *associated_block,
-                                                              const io_chain_t &io) {
+                                                              const block_t *associated_block) {
     assert(statement && "Empty node in eval_node");
     assert(statement.matches_node_tree(tree()) && "statement has unexpected tree");
-    // Apply this block IO for the duration of this function.
-    scoped_push<io_chain_t> block_io_push(&block_io, io);
     enum parse_execution_result_t status = parse_execution_success;
     if (auto block = statement.try_get_child<g::block_statement, 0>()) {
         status = this->run_block_statement(block, associated_block);
@@ -1456,13 +1453,11 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
 }
 
 parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
-                                                              const block_t *associated_block,
-                                                              const io_chain_t &io) {
+                                                              const block_t *associated_block) {
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
     assert(associated_block && "Null block");
-    scoped_push<io_chain_t> block_io_push(&block_io, io);
 
     // Check for infinite recursion: a function which immediately calls itself..
     wcstring func_name;
diff --git a/src/parse_execution.h b/src/parse_execution.h
index ff0c751d5..5c8d2f7dd 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -29,15 +29,14 @@ enum parse_execution_result_t {
 class parse_execution_context_t {
    private:
     parsed_source_ref_t pstree;
-    io_chain_t block_io;
     parser_t *const parser;
     // The currently executing job node, used to indicate the line number.
     tnode_t<grammar::job> executing_job_node{};
     // Cached line number information.
     size_t cached_lineno_offset = 0;
     int cached_lineno_count = 0;
-    // The parent job for any jobs created by this context.
-    const std::shared_ptr<job_t> parent_job;
+    // The lineage for any jobs created by this context.
+    const job_lineage_t lineage;
     // No copying allowed.
     parse_execution_context_t(const parse_execution_context_t &) = delete;
     parse_execution_context_t &operator=(const parse_execution_context_t &) = delete;
@@ -144,8 +143,7 @@ class parse_execution_context_t {
     int line_offset_of_character_at_offset(size_t offset);
 
    public:
-    parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
-                              std::shared_ptr<job_t> parent);
+    parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p, job_lineage_t lineage);
 
     /// Returns the current line number, indexed from 1. Not const since it touches
     /// cached_lineno_offset.
@@ -163,9 +161,9 @@ class parse_execution_context_t {
     /// Start executing at the given node. Returns 0 if there was no error, 1 if there was an
     /// error.
     parse_execution_result_t eval_node(tnode_t<grammar::statement> statement,
-                                       const block_t *associated_block, const io_chain_t &io);
+                                       const block_t *associated_block);
     parse_execution_result_t eval_node(tnode_t<grammar::job_list> job_list,
-                                       const block_t *associated_block, const io_chain_t &io);
+                                       const block_t *associated_block);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index aa437d004..698d5ff84 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -635,16 +635,18 @@ int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_t
 int parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) {
     assert(block_type == TOP || block_type == SUBST);
     if (!ps->tree.empty()) {
+        job_lineage_t lineage;
+        lineage.block_io = io;
         // Execute the first node.
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
-        return this->eval_node(ps, start, io, block_type, nullptr /* parent */);
+        return this->eval_node(ps, start, block_type, std::move(lineage));
     }
     return 0;
 }
 
 template <typename T>
-int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_t &io,
-                        block_type_t block_type, std::shared_ptr<job_t> parent_job) {
+int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
+                        job_lineage_t lineage) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -672,9 +674,9 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_
 
     // Create and set a new execution context.
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
-    scoped_push<exc_ctx_ref_t> exc(&execution_context,
-                                   make_unique<parse_execution_context_t>(ps, this, parent_job));
-    int result = execution_context->eval_node(node, scope_block, io);
+    scoped_push<exc_ctx_ref_t> exc(
+        &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
+    int result = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
@@ -684,11 +686,9 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_
 
 // Explicit instantiations. TODO: use overloads instead?
 template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::statement>,
-                                 const io_chain_t &, enum block_type_t,
-                                 std::shared_ptr<job_t> parent_job);
-template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>,
-                                 const io_chain_t &, enum block_type_t,
-                                 std::shared_ptr<job_t> parent_job);
+                                 enum block_type_t, job_lineage_t lineage);
+template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>, enum block_type_t,
+                                 job_lineage_t lineage);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                              wcstring &output) const {
diff --git a/src/parser.h b/src/parser.h
index d14805776..4bc12ee06 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -265,8 +265,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    int eval_node(parsed_source_ref_t ps, tnode_t<T> node, const io_chain_t &io,
-                  block_type_t block_type, std::shared_ptr<job_t> parent_job);
+    int eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
+                  job_lineage_t lineage);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
diff --git a/src/proc.cpp b/src/proc.cpp
index f450fbb89..603ce08c7 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -168,14 +168,7 @@ bool job_t::should_report_process_exits() const {
     return false;
 }
 
-bool job_t::job_chain_is_fully_constructed() const {
-    const job_t *cursor = this;
-    while (cursor) {
-        if (!cursor->is_constructed()) return false;
-        cursor = cursor->get_parent().get();
-    }
-    return true;
-}
+bool job_t::job_chain_is_fully_constructed() const { return *lineage().root_constructed; }
 
 bool job_t::signal(int signal) {
     // Presumably we are distinguishing between the two cases below because we do
@@ -275,15 +268,14 @@ void process_t::check_generations_before_launch() {
     gens_ = topic_monitor_t::principal().current_generations();
 }
 
-job_t::job_t(job_id_t job_id, const properties_t &props, io_chain_t bio,
-             std::shared_ptr<job_t> parent)
-    : properties(props), block_io(std::move(bio)), parent_job(std::move(parent)), job_id(job_id) {}
+job_t::job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage)
+    : properties(props), job_lineage(std::move(lineage)), job_id(job_id) {}
 
 job_t::~job_t() { release_job_id(job_id); }
 
 /// Return all the IO redirections. Start with the block IO, then walk over the processes.
 io_chain_t job_t::all_io_redirections() const {
-    io_chain_t result = this->block_io;
+    io_chain_t result = this->block_io_chain();
     for (const process_ptr_t &p : this->processes) {
         result.append(p->io_chain());
     }
diff --git a/src/proc.h b/src/proc.h
index 9b5ae8226..5dc918dab 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -18,6 +18,7 @@
 
 #include "common.h"
 #include "event.h"
+#include "global_safety.h"
 #include "io.h"
 #include "parse_tree.h"
 #include "tnode.h"
@@ -263,6 +264,25 @@ typedef int job_id_t;
 job_id_t acquire_job_id(void);
 void release_job_id(job_id_t jid);
 
+/// Information about where a job comes from.
+/// This should be safe to copy across threads; in particular that means this cannot contain a
+/// job_t.
+struct job_lineage_t {
+    /// The pgid of the parental job.
+    /// If our job is "nested" as part of a function or block execution, and that function or block
+    /// is part of a pipeline, then this may be set.
+    maybe_t<pid_t> parent_pgid{};
+
+    /// The IO chain associated with any block containing this job.
+    /// For example, in `begin; foo ; end < file.txt` this would have the 'file.txt' IO.
+    io_chain_t block_io{};
+
+    /// A shared pointer indicating that the entire tree of jobs is safe to disown.
+    /// This is set by the "root" job after it is constructed.
+    std::shared_ptr<relaxed_atomic_bool_t> root_constructed{
+        std::make_shared<relaxed_atomic_bool_t>(false)};
+};
+
 /// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
 /// of flags.
 class job_t {
@@ -289,20 +309,15 @@ class job_t {
     /// messages about job status on the terminal.
     wcstring command_str;
 
-    // The IO chain associated with the block.
-    const io_chain_t block_io;
-
-    // The parent job. If we were created as a nested job due to execution of a block or function in
-    // a pipeline, then this refers to the job corresponding to that pipeline. Otherwise it is null.
-    const std::shared_ptr<job_t> parent_job;
+    // The lineage associated with the job.
+    const job_lineage_t job_lineage;
 
     // No copying.
     job_t(const job_t &rhs) = delete;
     void operator=(const job_t &) = delete;
 
    public:
-    job_t(job_id_t job_id, const properties_t &props, io_chain_t bio,
-          std::shared_ptr<job_t> parent);
+    job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage);
     ~job_t();
 
     /// Returns the command as a wchar_t *. */
@@ -401,9 +416,12 @@ class job_t {
     /// \return if this job should own the terminal when it runs.
     bool should_claim_terminal() const { return properties.wants_terminal && is_foreground(); }
 
+    /// \return the job lineage.
+    const job_lineage_t &lineage() const { return job_lineage; }
+
     /// Returns the block IO redirections associated with the job. These are things like the IO
     /// redirections associated with the begin...end statement.
-    const io_chain_t &block_io_chain() const { return this->block_io; }
+    const io_chain_t &block_io_chain() const { return lineage().block_io; }
 
     /// Fetch all the IO redirections associated with the job.
     io_chain_t all_io_redirections() const;
@@ -428,9 +446,6 @@ class job_t {
     /// This implements some historical behavior which has not been justified.
     bool should_report_process_exits() const;
 
-    /// \return the parent job, or nullptr.
-    const std::shared_ptr<job_t> get_parent() const { return parent_job; }
-
     /// \return whether this job and its parent chain are fully constructed.
     bool job_chain_is_fully_constructed() const;
 

From efb72f1f9182174f79849c9d28fcd0bc229abf51 Mon Sep 17 00:00:00 2001
From: Akatsuki <3736910+akiirui@users.noreply.github.com>
Date: Tue, 10 Dec 2019 04:01:08 +0800
Subject: [PATCH 1341/1732] Revert "Move __fish_systemd_machines into
 machinectl completion script"

This reverts commit 9c15b5b7a4008488f1a0e4e786db42a6cea397ca.
---
 share/completions/machinectl.fish            | 8 --------
 share/functions/__fish_systemd_machines.fish | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 share/functions/__fish_systemd_machines.fish

diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 176c7c372..847477b17 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -1,11 +1,3 @@
-function __fish_systemd_machine_images
-    # Like for running machines, I'm assuming machinectl doesn't allow spaces in image names
-    # This does not include the special image ".host" since it isn't valid for most operations
-    machinectl --no-legend --no-pager list-images | while read -l a b
-        echo $a
-    end
-end
-
 complete -f -e -c machinectl
 
 set -l commands list status show start login enable disable poweroff reboot \
diff --git a/share/functions/__fish_systemd_machines.fish b/share/functions/__fish_systemd_machines.fish
new file mode 100644
index 000000000..a4ab375f7
--- /dev/null
+++ b/share/functions/__fish_systemd_machines.fish
@@ -0,0 +1,6 @@
+# It seems machinectl will eliminate spaces from machine names so we don't need to handle that
+function __fish_systemd_machines
+    machinectl --no-legend --no-pager list --all | while read -l a b
+        echo $a
+    end
+end

From 607eda7a7ad87cdf00d361873584c0eae007c143 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 9 Dec 2019 20:44:57 +0100
Subject: [PATCH 1342/1732] docs: Streamline some of the introductory parts of
 index.rst

Really "what is a shell" is covered by the part where it says it
offers a commandline interface.
---
 sphinx_doc_src/index.rst | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 8c3a966f1..dbbdd9552 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -6,7 +6,9 @@ Introduction
 
 This is the documentation for *fish*, the **f**\ riendly **i**\ nteractive **sh**\ ell.
 
-A shell is a software program which helps you operate your computer, such as by starting other programs. fish offers a command-line shell interface which is focused on usability and interactive use.
+A shell is a software program which helps you operate your computer, such as by starting other programs. fish offers a command-line interface focused on usability and interactive use.
+
+Unlike other shells, fish does not follow the POSIX standard, but still roughly belongs to the same family.
 
 Some of the special features of fish are:
 
@@ -16,24 +18,13 @@ Some of the special features of fish are:
 
 - **Easy scripting**: new functions_ can be added on the fly. The syntax is easy to learn and use.
 
-What is a shell?
-================
-
-A shell can be seen as the outermost layer to the operating system of a computer. The core of the operating system is sometimes called the "kernel", as if the computer's software is like a nut.
-
-The shell communicates with the underlying operating system, allowing the user to launch additional software programs, and enables the appropriate configuration of those programs. It can also communicate the results of the program, control the concurrent operation of multiple programs and even perform various tasks itself.
-
-In general, shells are controlled with either a text-based command-line interface (CLI), or a keyboard and mouse-based graphical user interface (GUI). fish is a command-line shell.
-
-Many command-line shells use the common interface defined in the POSIX standards. fish has a different interface, due to its :ref:`design <Design>` principles, but uses the POSIX standard where it does not conflict with these principles.
 
 Command Syntax
 --------------
 
-Shells also support some common syntax for executing commands. That way a command can be started in the same way, regardless of the application, where it comes from, and the shell, where it is executed in.
-
-The pattern below is a basic pattern:
+Shells support common syntax for executing commands. That way commands can be started in the same way, regardless of where they come from.
 
+Below is a basic pattern common among shells:
 
 
 ::
@@ -49,14 +40,13 @@ The pattern below is a basic pattern:
 
 For external **commands** the executable is usually stored on file and the file path must be included in the variable ``$PATH``, so that the file can be found: see `Special Variables`_.
 
-**Options** come in two forms: a short name, that is a hyphen with a single letter; or a long name, consisting of two hyphens with words connected by hyphens. Example: ``-h`` and ``--help`` are often used to print a help message. Options are a fixed set, described in the manual pages of the command, see `Manual Pages <#man-page>`_.
+**Options** come in multiple forms: a short name, that is a hyphen with a single letter; or a long name, (usually) consisting of two hyphens with words connected by hyphens. Example: ``-h`` and ``--help`` are often used to print a help message. Options are a fixed set, described in the manual pages of the command, see `Manual Pages <#man-page>`_.
 
 **Arguments** are the arbitrary input part of a command: often it is a file or directory name, sometimes it is a string or a list.
 
 Example:
 
 
-
 ::
 
     >echo -s Hello World!
@@ -66,12 +56,12 @@ Example:
 -  both ``Hello`` and ``World!`` are arguments to the echo command
 - ``-s`` is an option that suppresses spaces in the output of the command
 
-Commands versus Programs
+Commands versus Functions
 ------------------------
 
-**Programs** in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out:
+"Functions" (or "methods" or "procedures") in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out:
 
-Arguments → Program → Return Values
+Arguments → Function → Return Values
 
 **Shell commands** are different:
 
@@ -102,7 +92,7 @@ Example::
 Shebang Line
 ------------
 
-Since script for shell commands can be written in many different languages, they need to carry information about what interpreter is needed to execute them: For this they are expected to have a first line, the shebang line, which names an executable for this purpose:
+Since scripts for shell commands can be written in many different languages, they need to carry information about what interpreter is needed to execute them: For this they are expected to have a first line, the shebang line, which names an executable for this purpose:
 
 Example:
 
@@ -115,7 +105,7 @@ This line tells the shell to execute the file with the bash interpreter, that is
 
 For a script, written in another language, just replace the interpreter ``/bin/bash`` with the language interpreter of that other language (for example ``/bin/python`` for a ``python`` script)
 
-This line is only needed when scripts are executed by another interpreter, so for fish internal commands, that are executed by fish the shebang line is not necessary.
+This line is only needed when scripts are executed without specifying the interpreter. For functions inside fish or when executing a script with ```fish /path/to/script`` they aren't required (but don't hurt either!).
 
 Manual Pages
 ------------
@@ -180,7 +170,7 @@ Once fish has been installed, open a terminal. If fish is not the default shell:
 Executing Bash
 --------------
 
-If fish is your default shell and you want to copy commands from the internet, that are written in a different shell language, bash for example, you can proceed in the following way:
+If fish is your default shell and you want to copy commands from the internet that are written in a different shell language, bash for example, you can proceed in the following way:
 
 Consider, that ``bash`` is also a command. With ``man bash`` you can see that there are two ways to do this:
 

From c12232c24af269b765143adffe6697ef800fdf2e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 9 Dec 2019 21:03:42 +0100
Subject: [PATCH 1343/1732] docs: Some more wording changes

Try to sound more human, and also use footnotes. Footnotes are cool.

[ci skip]
---
 sphinx_doc_src/index.rst | 41 ++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index dbbdd9552..bb7a07376 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -57,7 +57,7 @@ Example:
 - ``-s`` is an option that suppresses spaces in the output of the command
 
 Commands versus Functions
-------------------------
+-------------------------
 
 "Functions" (or "methods" or "procedures") in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out:
 
@@ -316,10 +316,10 @@ Some characters can not be written directly on the command line. For these chara
 
 .. _redirects:
 
-Input/Output (IO) Redirection
+Input/Output Redirection
 -----------------------------
 
-Most programs use three input/output (IO) streams, each represented by a number called a file descriptor (FD). These are:
+Most programs use three input/output [#]_ streams, each represented by a number called a file descriptor (FD). These are:
 
 - Standard input, FD 0, for reading, defaults to reading from the keyboard.
 
@@ -336,7 +336,7 @@ An example of a file redirection is ``echo hello > output.txt``, which directs t
 - To write standard error to a file, write ``2>DESTINATION``
 - To append standard output to a file, write ``>>DESTINATION_FILE``
 - To append standard error to a file, write ``2>>DESTINATION_FILE``
-- To not overwrite ("clobber") an existing file, write ``>?DESTINATION`` or ``2>?DESTINATION``
+- To not overwrite ("clobber") an existing file, write ``>?DESTINATION`` or ``2>?DESTINATION`` (this is also known as the "noclobber" redirection)
 
 ``DESTINATION`` can be one of the following:
 
@@ -360,10 +360,12 @@ Any file descriptor can be redirected in an arbitrary way by prefixing the redir
 
 Example: ``echo Hello 2>output.stderr`` writes the standard error (file descriptor 2) of the target program to ``output.stderr``.
 
+.. [#] Also shortened as "I/O" or "IO".
+
 Piping
 ------
 
-The user can string together multiple commands into a so called pipeline. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '``|``'. For example
+The user can string together multiple commands into a *pipeline*. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '``|``'. For example
 
 ::
 
@@ -437,7 +439,7 @@ There are a few important things that need to be noted about aliases:
 
 - Always take care to add the ``$argv`` variable to the list of parameters to the wrapped command. This makes sure that if the user specifies any additional parameters to the function, they are passed on to the underlying command.
 
-- If the alias has the same name as the aliased command, it is necessary to prefix the call to the program with ``command`` in order to tell fish that the function should not call itself, but rather a command with the same name. Failing to do so will cause infinite recursion bugs.
+- If the alias has the same name as the aliased command, you need to prefix the call to the program with ``command`` to tell fish that the function should not call itself, but rather a command with the same name. If you forget to do so, the function would call itself until the end of time. Usually fish is smart enough to figure this out and will refrain from doing so (which is hopefully in your interest).
 
 - Autoloading isn't applicable to aliases. Since, by definition, the function is created at the time the alias command is executed. You cannot autoload aliases.
 
@@ -448,11 +450,15 @@ To easily create a function of this form, you can use the :ref:`alias <cmd-alias
 Autoloading functions
 ---------------------
 
-Functions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. This method of defining functions has several advantages. An autoloaded function becomes available automatically to all running shells. If the function definition is changed, all running shells will automatically reload the altered version. Startup time and memory usage is improved, etc.
+Functions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. This has some advantages:
 
-Fish automatically searches through any directories in the list variable ``$fish_function_path``, and any functions defined are automatically loaded when needed. A function definition file must have a filename consisting of the name of the function plus the suffix '``.fish``'.
+- An autoloaded function becomes available automatically to all running shells.
+- If the function definition is changed, all running shells will automatically reload the altered version.
+- Startup time and memory usage is improved, etc.
 
-By default, Fish searches the following for functions, using the first available file that it finds:
+When fish needs to load a function, it searches through any directories in the list variable ``$fish_function_path`` for a file with a name consisting of the name of the function plus the suffix '``.fish``' and loads the first it finds.
+
+By default ``$fish_function_path`` contains the following:
 
 - A directory for end-users to keep their own functions, usually ``~/.config/fish/functions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable).
 - A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions`` (really ``$__fish_sysconfdir/functions``).
@@ -792,20 +798,21 @@ To use a "," as an element, `quote <#quotes>`_ or `escape <#escapes>`_ it.
 Variable expansion
 ------------------
 
-A dollar sign followed by a string of characters is expanded into the value of the shell variable with the same name. For an introduction to the concept of shell variables, read the `Shell variables <#variables>`_ section.
-
-Undefined and empty variables expand to nothing.
-
-To separate a variable name from text encase the variable within double-quotes or braces.
+A dollar sign followed by a string of characters is expanded into the value of the shell variable with the same name. For more on shell variables, read the `Shell variables <#variables>`_ section.
 
 Examples::
 
     echo $HOME
     # Prints the home directory of the current user.
 
+Undefined and empty variables expand to nothing::
+
+
     echo $nonexistentvariable
     # Prints no output.
 
+To separate a variable name from text encase the variable within double-quotes or braces::
+
     echo The plural of $WORD is "$WORD"s
     # Prints "The plural of cat is cats" when $WORD is set to cat.
     echo The plural of $WORD is {$WORD}s
@@ -818,9 +825,9 @@ The latter syntax ``{$WORD}`` works by exploiting `brace expansion <#expand-brac
 
 In these cases, the expansion eliminates the string, as a result of the implicit :ref:`cartesian product <cartesian-product>`.
 
-If, in the example above, $WORD is undefined or an empty list, the "s" is not printed. However, it is printed, if $WORD is the empty string.
+If, in the example above, $WORD is undefined or an empty list, the "s" is not printed. However, it is printed if $WORD is the empty string (like after ``set WORD ""``).
 
-Unlike all other expansions, variable expansion also happens in double quoted strings. Inside double quotes (``"these"``), variables will always expand to exactly one argument. If they are empty or undefined, it will result in an empty string. If they have one element, they'll expand to that element. If they have more than that, the elements will be joined with spaces.
+Unlike all the other expansions, variable expansion also happens in double quoted strings. Inside double quotes (``"these"``), variables will always expand to exactly one argument. If they are empty or undefined, it will result in an empty string. If they have one element, they'll expand to that element. If they have more than that, the elements will be joined with spaces [#]_.
 
 Outside of double quotes, variables will expand to as many arguments as they have elements. That means an empty list will expand to nothing, a variable with one element will expand to that element, and a variable with multiple elements will expand to each of those elements separately.
 
@@ -842,6 +849,8 @@ The ``$`` symbol can also be used multiple times, as a kind of "dereference" ope
 When using this feature together with list brackets, the brackets will always match the innermost ``$`` dereference. Thus, ``$$foo[5]`` will always mean the fifth element of the ``foo`` variable should be dereferenced, not the fifth element of the doubly dereferenced variable ``foo``. The latter can instead be expressed as ``$$foo[1][5]``.
 
 
+.. [#] Unlike bash or zsh, which will join with the first character of $IFS (which usually is space).
+
 .. _cartesian-product:
 
 Cartesian Products

From be8aac53a3ab748675f1b280054876b8eb4cdd99 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 9 Dec 2019 21:14:54 +0100
Subject: [PATCH 1344/1732] docs: Reword range expansion

[ci skip]
---
 sphinx_doc_src/index.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index bb7a07376..f80787632 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -906,13 +906,18 @@ Examples::
 Index range expansion
 ---------------------
 
-Both command substitution and shell variable expansion support accessing only specific items by providing a set of indices in square brackets. It's often needed to access a sequence of elements. To do this, use the range operator '``..``' for this. A range '``a..b``', where range limits 'a' and 'b' are integer numbers, is expanded into a sequence of indices '``a a+1 a+2 ... b``' or '``a a-1 a-2 ... b``' depending on which of 'a' or 'b' is higher. The negative range limits are calculated from the end of the list or command substitution. Note that invalid indexes for either end are silently clamped to one or the size of the list as appropriate.
+Sometimes it's necessary to access only some of the elements of a list, or some of the lines a command substitution outputs. Both allow this by providing a set of indices in square brackets.
 
-Range expansion will go in reverse if the end element is earlier in the list than the start and forward if the end is later than the start, unless exactly one of the given indices is negative. This is to enable clamping without changing direction if the list has fewer elements than expected.
+Sequences of elements can be written with the range operator '``..``'. A range '``a..b``' ('a' and 'b' being integers) is expanded into a sequence of indices '``a a+1 a+2 ... b``' or '``a a-1 a-2 ... b``' depending on which of 'a' or 'b' is higher. Negative range limits are calculated from the end of the list. If an index is too large or small it's silently clamped to one or the size of the list as appropriate.
+
+If the end is smaller than the start, or the start is larger than the end, range expansion will go in reverse. This is unless exactly one of the given indices is negative, so the direction doesn't change if the list has fewer elements than expected.
 
 Some examples::
 
 
+    echo (seq 10)[1 2 3]
+    # Prints: 1 2 3
+
     # Limit the command substitution output
     echo (seq 10)[2..5]
     # Uses elements from 2 to 5

From 023eb48ba7cb89ccde5cd572a8a764ef4357abec Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 9 Dec 2019 21:22:09 +0100
Subject: [PATCH 1345/1732] docs: More rewording

[ci skip]
---
 sphinx_doc_src/index.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index f80787632..7b2bfbf24 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1006,11 +1006,11 @@ If the current directory contains the files 'foo' and 'bar', the command ``echo
 Shell variable and function names
 =================================
 
-The names given to shell objects such as variables and function names are known as "identifiers". Each type of identifier has rules that define the valid sequence of characters which compose the identifier.
+The names given to shell objects like variables and function names are known as "identifiers". Each type of identifier has rules that define what sequences of characters are valid to use.
 
 A variable name cannot be empty. It can contain only letters, digits, and underscores. It may begin and end with any of those characters.
 
-A function name cannot be empty. It may not begin with a hyphen ("-") and may not contain a slash ("/"). All other characters, including a space, are valid.
+A function name cannot be empty. It may not begin with a hyphen ("-") and may not contain a slash ("/"). All other characters, including a space, are valid. [#]_
 
 A bind mode name (e.g., ``bind -m abc ...``) is restricted to the rules for valid variable names.
 
@@ -1038,7 +1038,11 @@ To use the value of the variable ``smurf_color``, write ``$`` (dollar symbol) fo
 Variable scope
 --------------
 
-There are three kinds of variables in fish: universal, global and local variables. Universal variables are shared between all fish sessions a user is running on one computer. Global variables are specific to the current fish session, but are not associated with any specific block scope, and will never be erased unless the user explicitly requests it using ``set -e``. Local variables are specific to the current fish session, and associated with a specific block of commands, and is automatically erased when a specific block goes out of scope. A block of commands is a series of commands that begins with one of the commands ``for``, ``while`` , ``if``, ``function``, ``begin`` or ``switch``, and ends with the command ``end``. The user can specify that a variable should have either global or local scope using the ``-g/--global`` or ``-l/--local`` switches.
+There are three kinds of variables in fish: universal, global and local variables.
+
+- Universal variables are shared between all fish sessions a user is running on one computer.
+- Global variables are specific to the current fish session, but are not associated with any specific block scope, and will never be erased unless the user explicitly requests it using ``set -e``.
+- Local variables are specific to the current fish session, and associated with a specific block of commands, and is automatically erased when a specific block goes out of scope. A block of commands is a series of commands that begins with one of the commands ``for``, ``while`` , ``if``, ``function``, ``begin`` or ``switch``, and ends with the command ``end``.
 
 Variables can be explicitly set to be universal with the ``-U`` or ``--universal`` switch, global with the ``-g`` or ``--global`` switch, or local with the ``-l`` or ``--local`` switch.  The scoping rules when creating or updating a variable are:
 
@@ -1090,7 +1094,7 @@ For example::
     end
 
     function avast
-        set phrase 'Avast, mateys'
+        set --local phrase 'Avast, mateys'
         # Calling the shiver function here can not
         # change any variables in the local scope
         shiver

From b35eca5d9b3589d30ac08d3e9c6cbf62b811bdef Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 18:29:57 +0100
Subject: [PATCH 1346/1732] docs: Restructure introduction

Some more sections here were duplicated or not all that useful, and
it's weird to start with "Commands versus Functions".

Let's explain to people how to start fish, then let's get going.
---
 sphinx_doc_src/index.rst | 128 +++++++--------------------------------
 1 file changed, 23 insertions(+), 105 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 7b2bfbf24..accd1c45d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -6,7 +6,7 @@ Introduction
 
 This is the documentation for *fish*, the **f**\ riendly **i**\ nteractive **sh**\ ell.
 
-A shell is a software program which helps you operate your computer, such as by starting other programs. fish offers a command-line interface focused on usability and interactive use.
+A shell is a program which helps you operate your computer by starting other programs. fish offers a command-line interface focused on usability and interactive use.
 
 Unlike other shells, fish does not follow the POSIX standard, but still roughly belongs to the same family.
 
@@ -19,107 +19,6 @@ Some of the special features of fish are:
 - **Easy scripting**: new functions_ can be added on the fly. The syntax is easy to learn and use.
 
 
-Command Syntax
---------------
-
-Shells support common syntax for executing commands. That way commands can be started in the same way, regardless of where they come from.
-
-Below is a basic pattern common among shells:
-
-
-::
-
-    COMMAND [OPTIONS] ARGUMENTS
-
-
-- **COMMAND**: the name of the executable
-
-- **[OPTIONS]**: options can change the behaviour of a command
-
-- **ARGUMENTS**: input to the command
-
-For external **commands** the executable is usually stored on file and the file path must be included in the variable ``$PATH``, so that the file can be found: see `Special Variables`_.
-
-**Options** come in multiple forms: a short name, that is a hyphen with a single letter; or a long name, (usually) consisting of two hyphens with words connected by hyphens. Example: ``-h`` and ``--help`` are often used to print a help message. Options are a fixed set, described in the manual pages of the command, see `Manual Pages <#man-page>`_.
-
-**Arguments** are the arbitrary input part of a command: often it is a file or directory name, sometimes it is a string or a list.
-
-Example:
-
-
-::
-
-    >echo -s Hello World!
-    HelloWorld!
-
-
--  both ``Hello`` and ``World!`` are arguments to the echo command
-- ``-s`` is an option that suppresses spaces in the output of the command
-
-Commands versus Functions
--------------------------
-
-"Functions" (or "methods" or "procedures") in other languages can often be regarded as black boxes: they get complex input and return complex output. Sometimes they produce side effects such as writing to a file or reporting an error, but the emphasis is on: arguments in and return values out:
-
-Arguments → Function → Return Values
-
-**Shell commands** are different:
-
-- the side effects take the center of the stage: they transform an **input stream of data** into an **output stream of data**. Both of these streams are usually the terminal, but they can be redirected.
-- the arguments become options or switches paired with data: the switches influence the behaviour of the command
-- the return value shrinks to an **exit status**: this exit status is generally 0 when the command executes normally and between 1 and 255 otherwise.
-
-This leads to another way of programming and especially of combining commands:
-
-There are two ways to combine shell commands:
-
-- Commands can pass on their streams to each other: one command takes the output stream of another command as its input stream and the two commands execute in parallel. This is called piping, see `Piping`_.
-
-Example::
-
-    # Every line of the ``ls`` command is immediately passed on to the ``grep`` command
-    >ls -l | grep "my topic"
-
-
-- Commands can pass on all their output as a chunk: the output stream of one command is bundled and taken as data argument for the second command. This is called command substitution, see `Command Substitution`_.
-
-Example::
-
-    # the output of the inner ``ls`` command is taken as the input argument for the outer ``echo`` command
-    >echo (ls a*)
-
-
-Shebang Line
-------------
-
-Since scripts for shell commands can be written in many different languages, they need to carry information about what interpreter is needed to execute them: For this they are expected to have a first line, the shebang line, which names an executable for this purpose:
-
-Example:
-
-A scripts written in ``bash`` it would need a first line like this::
-
-    #!/bin/bash
-
-
-This line tells the shell to execute the file with the bash interpreter, that is located at the path ``/bin/bash``.
-
-For a script, written in another language, just replace the interpreter ``/bin/bash`` with the language interpreter of that other language (for example ``/bin/python`` for a ``python`` script)
-
-This line is only needed when scripts are executed without specifying the interpreter. For functions inside fish or when executing a script with ```fish /path/to/script`` they aren't required (but don't hurt either!).
-
-Manual Pages
-------------
-
-There is a common standard on how to receive help on shell commands: applications provide a manual page to their commands that can be opened with the ``man`` command:
-
-
-::
-
-    > man COMMAND
-
-
-This convention helps to make sure help can be found on commands no matter where they originate from. fish's internal commands all come with a manual page.
-
 Installation and Start
 ======================
 
@@ -182,12 +81,30 @@ Consider, that ``bash`` is also a command. With ``man bash`` you can see that th
 or ``bash`` without a switch, opens a bash shell that you can use and ``exit`` afterwards.
 
 
+Shebang Line
+------------
+
+Since scripts for shell commands can be written in many different languages, they need to carry information about what interpreter is needed to execute them: For this they are expected to have a first line, the shebang line, which names an executable for this purpose:
+
+Example:
+
+A scripts written in ``bash`` it would need a first line like this::
+
+    #!/bin/bash
+
+
+This line tells the shell to execute the file with the bash interpreter, that is located at the path ``/bin/bash``.
+
+For a script, written in another language, just replace the interpreter ``/bin/bash`` with the language interpreter of that other language (for example ``/bin/python`` for a ``python`` script)
+
+This line is only needed when scripts are executed without specifying the interpreter. For functions inside fish or when executing a script with ```fish /path/to/script`` they aren't required (but don't hurt either!).
+
 .. _syntax:
 
 Syntax overview
 ===============
 
-Shells like fish are used by giving them commands. Every ``fish`` command follows the same simple syntax.
+Shells like fish are used by giving them commands. Every ``fish`` command follows the same basic syntax.
 
 A command is executed by writing the name of the command followed by any arguments.
 
@@ -201,7 +118,7 @@ If you want to find out more about the echo command used above, read the manual
 
 ``man`` is a command for displaying a manual page on a given topic. The man command takes the name of the manual page to display as an argument. There are manual pages for almost every command on most computers. There are also manual pages for many other things, such as system libraries and important files.
 
-Every program on your computer can be used as a command in ``fish``. If the program file is located in one of the directories in the PATH_, it is sufficient to type the name of the program to use it. Otherwise the whole filename, including the directory (like ``/home/me/code/checkers/checkers`` or ``../checkers``) has to be used.
+Every program on your computer can be used as a command in ``fish``. If the program file is located in one of the directories in the PATH_, you can just use the name of the program to use it. Otherwise the whole filename, including the directory (like ``/home/me/code/checkers/checkers`` or ``../checkers``) has to be used.
 
 Here is a list of some useful commands:
 
@@ -333,7 +250,7 @@ An example of a file redirection is ``echo hello > output.txt``, which directs t
 
 - To read standard input from a file, write ``<SOURCE_FILE``
 - To write standard output to a file, write ``>DESTINATION``
-- To write standard error to a file, write ``2>DESTINATION``
+- To write standard error to a file, write ``2>DESTINATION`` [#]_
 - To append standard output to a file, write ``>>DESTINATION_FILE``
 - To append standard error to a file, write ``2>>DESTINATION_FILE``
 - To not overwrite ("clobber") an existing file, write ``>?DESTINATION`` or ``2>?DESTINATION`` (this is also known as the "noclobber" redirection)
@@ -361,6 +278,7 @@ Any file descriptor can be redirected in an arbitrary way by prefixing the redir
 Example: ``echo Hello 2>output.stderr`` writes the standard error (file descriptor 2) of the target program to ``output.stderr``.
 
 .. [#] Also shortened as "I/O" or "IO".
+.. [#] Previous versions of fish also allowed spelling this as ``^DESTINATION``, but that made another character special so it was deprecated and will be removed in future.
 
 Piping
 ------

From d05b7614dd3d2080573be6c2712cb6333b2478ab Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 18:35:25 +0100
Subject: [PATCH 1347/1732] Reorder setup instructions

First tell them how to install (though we don't actually do that right
now), then tell them how to start it, and only *then* tell them how to
make it the default or uninstall it.

Just seems sensible to try it first then delete it.
---
 sphinx_doc_src/index.rst | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index accd1c45d..adfba1a31 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -25,10 +25,11 @@ Installation and Start
 This section is on how to install, uninstall, start and exit a fish shell and on how to make fish the default shell:
 
 - `Installation`_: How to install fish
-- `Default Shell`_: How to switch to fish as the default shell
 - `Starting and Exiting`_ How to start and exit a fish shell
-- `Uninstalling`_: How to uninstall fish
 - `Executing Bash`_: How to execute bash commands in fish
+- `Default Shell`_: How to switch to fish as the default shell
+- `Uninstalling`_: How to uninstall fish
+
 
 Installation
 ------------
@@ -37,19 +38,6 @@ Up-to-date instructions for installing the latest version of fish are on the `fi
 
 To install the development version of fish see the instructions at the `project's GitHub page <https://github.com/fish-shell/fish-shell>`_.
 
-Default Shell
--------------
-
-You can make fish your default shell by adding fish's  executable in two places:
-- add ``/usr/local/bin/fish``  to  ``/etc/shells``
-- change your default shell with ``chsh -s`` to ``/usr/local/bin/fish``
-
-For for detailed instructions see `Switching to fish <tutorial.html#tut_switching_to_fish>`_.
-
-Uninstalling
-------------
-
-For uninstalling fish: see :ref:`FAQ: Uninstalling fish <faq-uninstalling>`.
 
 Starting and Exiting
 --------------------
@@ -81,6 +69,20 @@ Consider, that ``bash`` is also a command. With ``man bash`` you can see that th
 or ``bash`` without a switch, opens a bash shell that you can use and ``exit`` afterwards.
 
 
+Default Shell
+-------------
+
+You can make fish your default shell by adding fish's  executable in two places:
+- add ``/usr/local/bin/fish``  to  ``/etc/shells``
+- change your default shell with ``chsh -s`` to ``/usr/local/bin/fish``
+
+For for detailed instructions see `Switching to fish <tutorial.html#tut_switching_to_fish>`_.
+
+Uninstalling
+------------
+
+For uninstalling fish: see :ref:`FAQ: Uninstalling fish <faq-uninstalling>`.
+
 Shebang Line
 ------------
 
@@ -928,7 +930,7 @@ The names given to shell objects like variables and function names are known as
 
 A variable name cannot be empty. It can contain only letters, digits, and underscores. It may begin and end with any of those characters.
 
-A function name cannot be empty. It may not begin with a hyphen ("-") and may not contain a slash ("/"). All other characters, including a space, are valid. [#]_
+A function name cannot be empty. It may not begin with a hyphen ("-") and may not contain a slash ("/"). All other characters, including a space, are valid.
 
 A bind mode name (e.g., ``bind -m abc ...``) is restricted to the rules for valid variable names.
 

From 2b6b6a0de04b93adc3c5b410fdc829bde7528b75 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 18:47:14 +0100
Subject: [PATCH 1348/1732] docs: Link tutorial immediately

---
 sphinx_doc_src/index.rst    | 1 +
 sphinx_doc_src/tutorial.rst | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index adfba1a31..108695c3a 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -18,6 +18,7 @@ Some of the special features of fish are:
 
 - **Easy scripting**: new functions_ can be added on the fly. The syntax is easy to learn and use.
 
+This bit of the documentation is a quick guide on how to get going. If you are new to this, see the :ref:`tutorial <tutorial>`.
 
 Installation and Start
 ======================
diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index df4e3a114..72f387aac 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -1,5 +1,7 @@
 .. highlight:: fish-docs-samples
 
+.. _tutorial:
+
 Tutorial
 ========
 

From 8a5eda3e9b417de3cdc3d08f113e8473bd42d0f5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 18:47:46 +0100
Subject: [PATCH 1349/1732] docs: Some nits

[ci skip]
---
 sphinx_doc_src/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 108695c3a..d806c45b7 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -115,7 +115,7 @@ Example::
 
    echo hello world
 
-This calls the ``echo`` command. ``echo`` is a command which will write its arguments to the screen. In the example above, the output will be 'hello world'. Everything in fish is done with commands. There are commands for performing a set of commands multiple times, commands for assigning variables, commands for treating a group of commands as a single command, etc.. And every single command follows the same simple syntax.
+This calls the ``echo`` command. ``echo`` is a command which will write its arguments to the screen. In the example above, the output will be 'hello world'. Everything in fish is done with commands. There are commands for performing a set of commands multiple times, commands for assigning variables, commands for treating a group of commands as a single command, etc.. And every single command follows the same basic syntax.
 
 If you want to find out more about the echo command used above, read the manual page for the echo command by writing: ``man echo``
 
@@ -150,7 +150,7 @@ This is a short explanation of some of the commonly used words in fish.
 
 - **builtin** a command that is implemented in the shell. Builtins are commands that are so closely tied to the shell that it is impossible to implement them as external commands.
 
-- **command** a program that the shell can run.
+- **command** a program that the shell can run. In another sense also specifically an external command (i.e. neither a function or builtin).
 
 - **function** a block of commands that can be called as if they were a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
 

From eb7837113fffecce3ada15c8d25a764559e6ffc3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 19:03:44 +0100
Subject: [PATCH 1350/1732] docs: File completion can indeed be enabled again

[ci skip]
---
 sphinx_doc_src/index.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d806c45b7..c2dab77b8 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -483,11 +483,10 @@ As a simple example, here's an excerpt of the completions for systemd's ``timeda
 
   # Disable file completions for the entire command
   # because it does not take files anywhere
-  # Note that this can't be undone,
-  # so it's often better to only disable it for certain completions.
+  # Note that this can be undone by using "-F".
   #
   # File completions also need to be disabled
-  # if you wish to offer a certain set of files (e.g. just directories).
+  # if you want to have more control over what files are offered (e.g. just directories, or just files ending in ".mp3").
   complete -c timedatectl -f
 
   # This line offers the subcommands

From ea7868988a4081d4a3351e3eb575967cee624d9b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 19:05:37 +0100
Subject: [PATCH 1351/1732] docs: Remove "simple"

This just reads condescending. The user can decide for themselves how
simple something is.

[ci skip]
---
 sphinx_doc_src/index.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index c2dab77b8..2e15a0747 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -247,7 +247,7 @@ Most programs use three input/output [#]_ streams, each represented by a number
 
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
-Any file descriptor can be directed to a different output than its default through a simple mechanism called a redirection.
+Any file descriptor can be directed to a different output than its default through a mechanism called a redirection.
 
 An example of a file redirection is ``echo hello > output.txt``, which directs the output of the echo command to the file output.txt.
 
@@ -465,7 +465,7 @@ These are the general purpose tab completions that ``fish`` provides:
 Writing your own completions
 ----------------------------
 
-Specifying your own completions is not difficult. To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog``, one would start the completion command with ``complete -c myprog ...``
+To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog``, one would start the completion command with ``complete -c myprog ...``
 
 To provide a list of possible completions for myprog, use the ``-a`` switch. If ``myprog`` accepts the arguments start and stop, this can be specified as ``complete -c myprog -a 'start stop'``. The argument to the ``-a`` switch is always a single string. At completion time, it will be tokenized on spaces and tabs, and variable expansion, command substitution and other forms of parameter expansion will take place.
 
@@ -476,7 +476,7 @@ To provide a list of possible completions for myprog, use the ``-a`` switch. If
 
 There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the :ref:`complete <cmd-complete>` builtin, or write ``complete --help`` inside the ``fish`` shell.
 
-As a simple example, here's an excerpt of the completions for systemd's ``timedatectl``::
+As a more comprehensive example, here's a commented excerpt of the completions for systemd's ``timedatectl``::
 
   # All subcommands that timedatectl knows - this is useful for later.
   set -l commands status set-time set-timezone list-timezones set-local-rtc set-ntp

From 15c6d8fd4c2f067db1ea324286565b0360c17964 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 20:20:21 +0100
Subject: [PATCH 1352/1732] completions/zstd: Remove code to figure out number
 of CPUs

This purported to need python > 3.4, but used anypython.

Plus it's not super useful anyway since it can easily be told to
use *all* cpus, so there's no need to set it to the precise number.

See #6400.

[ci skip]
---
 share/completions/pzstd.fish | 10 +---------
 share/completions/zstd.fish  | 12 ------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/share/completions/pzstd.fish b/share/completions/pzstd.fish
index 4c0024f04..ea532a35f 100644
--- a/share/completions/pzstd.fish
+++ b/share/completions/pzstd.fish
@@ -14,15 +14,7 @@ end
 
 complete -c pzstd -l ultra -d "Enable compression level beyond 19"
 
-## If Python 3.4 or later installed, the number of physical cores is assigned to a variable.
-set -l python (__fish_anypython)
-set -q python[1]; and set -l physical_cores ($python -c 'import os; os.cpu_count() is not None and print(os.cpu_count())' 2> /dev/null)
-
-if set -q physical_cores; and test -n "$physical_cores"
-    complete -x -c pzstd -s p -l processes -a "(seq 1 $physical_cores)" -d "De/compress using $threads working threads"
-else
-    complete -x -c pzstd -s p -l processes -a NUM -d "De/compress using NUM working threads"
-end
+complete -x -c pzstd -s p -l processes -a "(seq 1 8)" -d "De/compress using NUM working threads"
 
 complete -r -c pzstd -s o -d "Specify file to save"
 complete -c pzstd -s f -l force -d "Overwrite without prompting"
diff --git a/share/completions/zstd.fish b/share/completions/zstd.fish
index 69bddcfb6..66944da1a 100644
--- a/share/completions/zstd.fish
+++ b/share/completions/zstd.fish
@@ -19,20 +19,8 @@ complete -c zstd -l fast -d "Ultra-fast compression"
 complete -c zstd -l ultra -d "Enable compression level beyond 19"
 complete -c zstd -l long -d "Enable long distance matching with specified windowLog"
 
-## If Python 3.4 or later installed, the number of physical cores is assigned to a variable.
-set -l python (__fish_anypython)
-set -q python[1]; and set -l physical_cores ($python -c 'import os; os.cpu_count() is not None and print(os.cpu_count())' 2> /dev/null)
-## When using all physical cores.
 complete -c zstd -o T0 -l threads=0 -d "Compress using as many threads as there are CPU cores on the system"
 
-if set -q physical_cores; and test -n "$physical_cores"
-    for threads in (seq 1 $physical_cores)
-        complete -c zstd -o T"$threads" -l threads="$threads" -d "Compress using $threads working threads"
-    end
-else
-    complete -c zstd -o TNUM -l threads=NUM -d "Compress using NUM working threads"
-end
-
 complete -c zstd -l single-thread -d "Single-thread mode"
 complete -c zstd -l adapt -d "Dynamically adapt compression level to I/O conditions"
 complete -c zstd -l stream-size -d "Optimize compression parameters for streaming input of specified bytes"

From b491e2bbfc4bbf0c94e950236a03975da1d1dcc6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 21:01:09 +0100
Subject: [PATCH 1353/1732] docs: Turn some sections into subsections

[ci skip]
---
 sphinx_doc_src/index.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 2e15a0747..f73aef058 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -420,7 +420,7 @@ Help
 Help on a specific builtin can also be obtained with the ``-h`` parameter. For instance, to obtain help on the ``fg`` builtin, either type ``fg -h`` or ``help fg``.
 
 Autosuggestions
-===============
+---------------
 
 fish suggests commands as you type, based on `command history <#history-search>`_, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
 
@@ -430,7 +430,7 @@ Autosuggestions are a powerful way to quickly summon frequently entered commands
 
 
 Tab Completion
-==============
+--------------
 
 Tab completion is one of the most time saving features of any modern shell. By tapping the tab key, the user asks ``fish`` to guess the rest of the command or parameter that the user is currently typing. If  ``fish`` can only find one possible completion, ``fish`` will write it out. If there is more than one completion, ``fish`` will write out the longest prefix that all completions have in common. If the completions differ on the first character, a list of all possible completions is printed. The list features descriptions of the completions and if the list doesn't fit the screen, it is scrollable by using the arrow keys, the page up/page down keys, the tab key or the space bar.
 
@@ -924,7 +924,7 @@ If the current directory contains the files 'foo' and 'bar', the command ``echo
 .. _identifiers:
 
 Shell variable and function names
-=================================
+---------------------------------
 
 The names given to shell objects like variables and function names are known as "identifiers". Each type of identifier has rules that define what sequences of characters are valid to use.
 
@@ -937,7 +937,7 @@ A bind mode name (e.g., ``bind -m abc ...``) is restricted to the rules for vali
 .. _variables:
 
 Shell variables
-===============
+---------------
 
 Shell variables are named pieces of data, which can be created, deleted and their values changed and used by the user.  Variables may optionally be "exported", so that a copy of the variable is available to any subprocesses the shell creates. An exported variable is referred to as an "environment variable".
 

From 6da4b682db11454cb0412675bb76d5bc5ad7bc55 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 10 Dec 2019 21:05:21 +0100
Subject: [PATCH 1354/1732] docs: Separate scripting/interactive sections

[ci skip]
---
 sphinx_doc_src/index.rst | 352 ++++++++++++++++++++-------------------
 1 file changed, 179 insertions(+), 173 deletions(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index f73aef058..d856384ac 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -410,181 +410,10 @@ The ``switch`` command is used to execute one of possibly many blocks of command
 The other conditionals use the `exit status <#variables-status>`_ of a command to decide if a command or a block of commands should be executed. See their documentation for more information.
 
 
-Help
-====
-
-``fish`` has an extensive help system. Use the :ref:`help <cmd-help>` command to obtain help on a specific subject or command. For instance, writing ``help syntax`` displays the `syntax section <#syntax>`_ of this documentation.
-
-``fish`` also has man pages for its commands. For example, ``man set`` will show the documentation for ``set`` as a man page.
-
-Help on a specific builtin can also be obtained with the ``-h`` parameter. For instance, to obtain help on the ``fg`` builtin, either type ``fg -h`` or ``help fg``.
-
-Autosuggestions
----------------
-
-fish suggests commands as you type, based on `command history <#history-search>`_, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
-
-To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+→,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
-
-Autosuggestions are a powerful way to quickly summon frequently entered commands, by typing the first few characters. They are also an efficient technique for navigating through directory hierarchies.
-
-
-Tab Completion
---------------
-
-Tab completion is one of the most time saving features of any modern shell. By tapping the tab key, the user asks ``fish`` to guess the rest of the command or parameter that the user is currently typing. If  ``fish`` can only find one possible completion, ``fish`` will write it out. If there is more than one completion, ``fish`` will write out the longest prefix that all completions have in common. If the completions differ on the first character, a list of all possible completions is printed. The list features descriptions of the completions and if the list doesn't fit the screen, it is scrollable by using the arrow keys, the page up/page down keys, the tab key or the space bar.
-
-If the list is visible, pressing control-S (or the ``pager-toggle-search`` binding) will allow filtering the list. Shift-tab (or the ``complete-and-search`` binding) will trigger completion with the search field immediately visible.
-These are the general purpose tab completions that ``fish`` provides:
-
-- Completion of commands (builtins, functions and regular programs).
-
-- Completion of shell variable names.
-
-- Completion of usernames for tilde expansion.
-
-- Completion of filenames, even on strings with wildcards such as '``*``' and '``**``'.
-
-``fish`` provides a large number of program specific completions. Most of these completions are simple options like the ``-l`` option for ``ls``, but some are more advanced. The latter include:
-
-- The programs ``man`` and ``whatis`` show all installed manual pages as completions.
-
-- The ``make`` program uses all targets in the Makefile in the current directory as completions.
-
-- The ``mount`` command uses all mount points specified in fstab as completions.
-
-- The ``ssh`` command uses all hosts that are stored in the known_hosts file as completions. (See the ssh documentation for more information)
-
-- The ``su`` command uses all users on the system as completions.
-
-- The ``apt-get``, ``rpm`` and ``yum`` commands use all installed packages as completions.
-
-
-.. _completion-own:
-
-Writing your own completions
-----------------------------
-
-To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog``, one would start the completion command with ``complete -c myprog ...``
-
-To provide a list of possible completions for myprog, use the ``-a`` switch. If ``myprog`` accepts the arguments start and stop, this can be specified as ``complete -c myprog -a 'start stop'``. The argument to the ``-a`` switch is always a single string. At completion time, it will be tokenized on spaces and tabs, and variable expansion, command substitution and other forms of parameter expansion will take place.
-
-``fish`` has a special syntax to support specifying switches accepted by a command. The switches ``-s``, ``-l`` and ``-o`` are used to specify a short switch (single character, such as ``-l``), a gnu style long switch (such as '``--color``') and an old-style long switch (like '``-shuffle``'), respectively. If the command 'myprog' has an option '-o' which can also be written as '``--output``', and which can take an additional value of either 'yes' or 'no', this can be specified by writing::
-
-  complete -c myprog -s o -l output -a "yes no"
-
-
-There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the :ref:`complete <cmd-complete>` builtin, or write ``complete --help`` inside the ``fish`` shell.
-
-As a more comprehensive example, here's a commented excerpt of the completions for systemd's ``timedatectl``::
-
-  # All subcommands that timedatectl knows - this is useful for later.
-  set -l commands status set-time set-timezone list-timezones set-local-rtc set-ntp
-
-  # Disable file completions for the entire command
-  # because it does not take files anywhere
-  # Note that this can be undone by using "-F".
-  #
-  # File completions also need to be disabled
-  # if you want to have more control over what files are offered (e.g. just directories, or just files ending in ".mp3").
-  complete -c timedatectl -f
-
-  # This line offers the subcommands
-  # -"status",
-  # -"set-timezone",
-  # -"set-time"
-  # -"list-timezones"
-  # if no subcommand has been given so far.
-  #
-  # The `-n`/`--condition` option takes script as a string, which it executes.
-  # If it returns true, the completion is offered.
-  # Here the condition is the `__fish_seen_subcommands_from` helper function.
-  # If returns true if any of the given commands is used on the commandline,
-  # as determined by a simple heuristic.
-  # For more complex uses, you can write your own function.
-  # See e.g. the git completions for an example.
-  #
-  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status set-time set-timezone list-timezones"
-
-  # If the "set-timezone" subcommand is used,
-  # offer the output of `timedatectl list-timezones` as completions.
-  # Each line of output is used as a separate candidate,
-  # and anything after a tab is taken as the description.
-  # It's often useful to transform command output with `string` into that form.
-  complete -c timedatectl -n "__fish_seen_subcommand_from set-timezone" -a "(timedatectl list-timezones)"
-
-  # Completion candidates can also be described via `-d`,
-  # which is useful if the description is constant.
-  # Try to keep these short, because that means the user gets to see more at once.
-  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-local-rtc" -d "Maintain RTC in local time"
-
-  # We can also limit options to certain subcommands by using conditions.
-  complete -c timedatectl -n "__fish_seen_subcommand_from set-local-rtc" -l adjust-system-clock -d 'Synchronize system clock from the RTC'
-
-  # These are simple options that can be used everywhere.
-  complete -c timedatectl -s h -l help -d 'Print a short help text and exit'
-  complete -c timedatectl -l version -d 'Print a short version string and exit'
-  complete -c timedatectl -l no-pager -d 'Do not pipe output into a pager'
-
-For examples of how to write your own complex completions, study the completions in ``/usr/share/fish/completions``. (The exact path depends on your chosen installation prefix and may be slightly different)
-
-.. _completion-func:
-
-Useful functions for writing completions
-----------------------------------------
-
-``fish`` ships with several functions that are very useful when writing command specific completions. Most of these functions name begins with the string '``__fish_``'. Such functions are internal to ``fish`` and their name and interface may change in future fish versions. Still, some of them may be very useful when writing completions. A few of these functions are described here. Be aware that they may be removed or changed in future versions of fish.
-
-Functions beginning with the string ``__fish_print_`` print a newline separated list of strings. For example, ``__fish_print_filesystems`` prints a list of all known file systems. Functions beginning with ``__fish_complete_`` print out a newline separated list of completions with descriptions. The description is separated from the completion by a tab character.
-
-- ``__fish_complete_directories STRING DESCRIPTION`` performs path completion on STRING, allowing only directories, and giving them the description DESCRIPTION.
-
-- ``__fish_complete_path STRING DESCRIPTION`` performs path completion on STRING, giving them the description DESCRIPTION.
-
-- ``__fish_complete_groups`` prints a list of all user groups with the groups members as description.
-
-- ``__fish_complete_pids`` prints a list of all processes IDs with the command name as description.
-
-- ``__fish_complete_suffix SUFFIX`` performs file completion allowing only files ending in SUFFIX, with an optional description.
-
-- ``__fish_complete_users`` prints a list of all users with their full name as description.
-
-- ``__fish_print_filesystems`` prints a list of all known file systems. Currently, this is a static list, and not dependent on what file systems the host operating system actually understands.
-
-- ``__fish_print_hostnames`` prints a list of all known hostnames. This functions searches the fstab for nfs servers, ssh for known hosts and checks the ``/etc/hosts`` file.
-
-- ``__fish_print_interfaces`` prints a list of all known network interfaces.
-
-- ``__fish_print_packages`` prints a list of all installed packages. This function currently handles Debian, rpm and Gentoo packages.
-
-.. _completion-path:
-
-Where to put completions
-------------------------
-
-Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the list variable ``$fish_complete_path``, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '``.fish``'.
-
-By default, Fish searches the following for completions, using the first available file that it finds:
-
-- A directory for end-users to keep their own completions, usually ``~/.config/fish/completions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable);
-- A directory for systems administrators to install completions for all users on the system, usually ``/etc/fish/completions``;
-- A directory for third-party software vendors to ship their own completions for their software, usually ``/usr/share/fish/vendor_completions.d``;
-- The completions shipped with fish, usually installed in ``/usr/share/fish/completions``; and
-- Completions automatically generated from the operating system's manual, usually stored in ``~/.local/share/fish/generated_completions``.
-
-These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
-
-This wide search may be confusing. If you are unsure, your completions probably belong in ``~/.config/fish/completions``.
-
-If you have written new completions for a common Unix command, please consider sharing your work by submitting it via the instructions in `Further help and development <#more-help>`_.
-
-If you are developing another program and would like to ship completions with your program, install them to the "vendor" completions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable completionsdir fish``.
-
-
 .. _expand:
 
 Parameter expansion (Globbing)
-==============================
+------------------------------
 
 When an argument for a program is given on the commandline, it undergoes the process of parameter expansion before it is sent on to the command. Parameter expansion is a powerful mechanism that allows you to expand the parameter in various ways, including performing wildcard matching on files, inserting the value of a shell variable into the parameter or even using the output of another command as a parameter list.
 
@@ -1317,12 +1146,189 @@ The most common way to set the locale to use a command like 'set -x LANG en_GB.u
 .. _builtin-overview:
 
 Builtin commands
-================
+----------------
 
 Many other shells have a large library of builtin commands. Most of these commands are also available as standalone commands, but have been implemented in the shell anyway. To avoid code duplication, and to avoid the confusion of subtly differing versions of the same command, ``fish`` generally only implements builtins for actions which cannot be performed by a regular command.
 
 For a list of all builtins, functions and commands shipped with fish, see the :ref:`list of commands <Commands>`. The documentation is also available by using the ``--help`` switch of the command.
 
+Interactive use
+===============
+
+Fish prides itself on being really nice to use interactively. That's down to a few features we'll explain in the next few sections.
+
+
+Help
+----
+
+``fish`` has an extensive help system. Use the :ref:`help <cmd-help>` command to obtain help on a specific subject or command. For instance, writing ``help syntax`` displays the `syntax section <#syntax>`_ of this documentation.
+
+``fish`` also has man pages for its commands. For example, ``man set`` will show the documentation for ``set`` as a man page.
+
+Help on a specific builtin can also be obtained with the ``-h`` parameter. For instance, to obtain help on the ``fg`` builtin, either type ``fg -h`` or ``help fg``.
+
+Autosuggestions
+---------------
+
+fish suggests commands as you type, based on `command history <#history-search>`_, completions, and valid file paths. As you type commands, you will see a suggestion offered after the cursor, in a muted gray color (which can be changed with the ``fish_color_autosuggestion`` variable).
+
+To accept the autosuggestion (replacing the command line contents), press right arrow or :kbd:`Control+F`. To accept the first suggested word, press :kbd:`Alt+→,Right` or :kbd:`Alt+F`. If the autosuggestion is not what you want, just ignore it: it won't execute unless you accept it.
+
+Autosuggestions are a powerful way to quickly summon frequently entered commands, by typing the first few characters. They are also an efficient technique for navigating through directory hierarchies.
+
+
+Tab Completion
+--------------
+
+Tab completion is one of the most time saving features of any modern shell. By tapping the tab key, the user asks ``fish`` to guess the rest of the command or parameter that the user is currently typing. If  ``fish`` can only find one possible completion, ``fish`` will write it out. If there is more than one completion, ``fish`` will write out the longest prefix that all completions have in common. If the completions differ on the first character, a list of all possible completions is printed. The list features descriptions of the completions and if the list doesn't fit the screen, it is scrollable by using the arrow keys, the page up/page down keys, the tab key or the space bar.
+
+If the list is visible, pressing control-S (or the ``pager-toggle-search`` binding) will allow filtering the list. Shift-tab (or the ``complete-and-search`` binding) will trigger completion with the search field immediately visible.
+These are the general purpose tab completions that ``fish`` provides:
+
+- Completion of commands (builtins, functions and regular programs).
+
+- Completion of shell variable names.
+
+- Completion of usernames for tilde expansion.
+
+- Completion of filenames, even on strings with wildcards such as '``*``' and '``**``'.
+
+``fish`` provides a large number of program specific completions. Most of these completions are simple options like the ``-l`` option for ``ls``, but some are more advanced. The latter include:
+
+- The programs ``man`` and ``whatis`` show all installed manual pages as completions.
+
+- The ``make`` program uses all targets in the Makefile in the current directory as completions.
+
+- The ``mount`` command uses all mount points specified in fstab as completions.
+
+- The ``ssh`` command uses all hosts that are stored in the known_hosts file as completions. (See the ssh documentation for more information)
+
+- The ``su`` command uses all users on the system as completions.
+
+- The ``apt-get``, ``rpm`` and ``yum`` commands use all installed packages as completions.
+
+
+.. _completion-own:
+
+Writing your own completions
+----------------------------
+
+To specify a completion, use the ``complete`` command. ``complete`` takes as a parameter the name of the command to specify a completion for. For example, to add a completion for the program ``myprog``, one would start the completion command with ``complete -c myprog ...``
+
+To provide a list of possible completions for myprog, use the ``-a`` switch. If ``myprog`` accepts the arguments start and stop, this can be specified as ``complete -c myprog -a 'start stop'``. The argument to the ``-a`` switch is always a single string. At completion time, it will be tokenized on spaces and tabs, and variable expansion, command substitution and other forms of parameter expansion will take place.
+
+``fish`` has a special syntax to support specifying switches accepted by a command. The switches ``-s``, ``-l`` and ``-o`` are used to specify a short switch (single character, such as ``-l``), a gnu style long switch (such as '``--color``') and an old-style long switch (like '``-shuffle``'), respectively. If the command 'myprog' has an option '-o' which can also be written as '``--output``', and which can take an additional value of either 'yes' or 'no', this can be specified by writing::
+
+  complete -c myprog -s o -l output -a "yes no"
+
+
+There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the ``complete`` command, see the documentation for the :ref:`complete <cmd-complete>` builtin, or write ``complete --help`` inside the ``fish`` shell.
+
+As a more comprehensive example, here's a commented excerpt of the completions for systemd's ``timedatectl``::
+
+  # All subcommands that timedatectl knows - this is useful for later.
+  set -l commands status set-time set-timezone list-timezones set-local-rtc set-ntp
+
+  # Disable file completions for the entire command
+  # because it does not take files anywhere
+  # Note that this can be undone by using "-F".
+  #
+  # File completions also need to be disabled
+  # if you want to have more control over what files are offered (e.g. just directories, or just files ending in ".mp3").
+  complete -c timedatectl -f
+
+  # This line offers the subcommands
+  # -"status",
+  # -"set-timezone",
+  # -"set-time"
+  # -"list-timezones"
+  # if no subcommand has been given so far.
+  #
+  # The `-n`/`--condition` option takes script as a string, which it executes.
+  # If it returns true, the completion is offered.
+  # Here the condition is the `__fish_seen_subcommands_from` helper function.
+  # If returns true if any of the given commands is used on the commandline,
+  # as determined by a simple heuristic.
+  # For more complex uses, you can write your own function.
+  # See e.g. the git completions for an example.
+  #
+  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "status set-time set-timezone list-timezones"
+
+  # If the "set-timezone" subcommand is used,
+  # offer the output of `timedatectl list-timezones` as completions.
+  # Each line of output is used as a separate candidate,
+  # and anything after a tab is taken as the description.
+  # It's often useful to transform command output with `string` into that form.
+  complete -c timedatectl -n "__fish_seen_subcommand_from set-timezone" -a "(timedatectl list-timezones)"
+
+  # Completion candidates can also be described via `-d`,
+  # which is useful if the description is constant.
+  # Try to keep these short, because that means the user gets to see more at once.
+  complete -c timedatectl -n "not __fish_seen_subcommand_from $commands" -a "set-local-rtc" -d "Maintain RTC in local time"
+
+  # We can also limit options to certain subcommands by using conditions.
+  complete -c timedatectl -n "__fish_seen_subcommand_from set-local-rtc" -l adjust-system-clock -d 'Synchronize system clock from the RTC'
+
+  # These are simple options that can be used everywhere.
+  complete -c timedatectl -s h -l help -d 'Print a short help text and exit'
+  complete -c timedatectl -l version -d 'Print a short version string and exit'
+  complete -c timedatectl -l no-pager -d 'Do not pipe output into a pager'
+
+For examples of how to write your own complex completions, study the completions in ``/usr/share/fish/completions``. (The exact path depends on your chosen installation prefix and may be slightly different)
+
+.. _completion-func:
+
+Useful functions for writing completions
+----------------------------------------
+
+``fish`` ships with several functions that are very useful when writing command specific completions. Most of these functions name begins with the string '``__fish_``'. Such functions are internal to ``fish`` and their name and interface may change in future fish versions. Still, some of them may be very useful when writing completions. A few of these functions are described here. Be aware that they may be removed or changed in future versions of fish.
+
+Functions beginning with the string ``__fish_print_`` print a newline separated list of strings. For example, ``__fish_print_filesystems`` prints a list of all known file systems. Functions beginning with ``__fish_complete_`` print out a newline separated list of completions with descriptions. The description is separated from the completion by a tab character.
+
+- ``__fish_complete_directories STRING DESCRIPTION`` performs path completion on STRING, allowing only directories, and giving them the description DESCRIPTION.
+
+- ``__fish_complete_path STRING DESCRIPTION`` performs path completion on STRING, giving them the description DESCRIPTION.
+
+- ``__fish_complete_groups`` prints a list of all user groups with the groups members as description.
+
+- ``__fish_complete_pids`` prints a list of all processes IDs with the command name as description.
+
+- ``__fish_complete_suffix SUFFIX`` performs file completion allowing only files ending in SUFFIX, with an optional description.
+
+- ``__fish_complete_users`` prints a list of all users with their full name as description.
+
+- ``__fish_print_filesystems`` prints a list of all known file systems. Currently, this is a static list, and not dependent on what file systems the host operating system actually understands.
+
+- ``__fish_print_hostnames`` prints a list of all known hostnames. This functions searches the fstab for nfs servers, ssh for known hosts and checks the ``/etc/hosts`` file.
+
+- ``__fish_print_interfaces`` prints a list of all known network interfaces.
+
+- ``__fish_print_packages`` prints a list of all installed packages. This function currently handles Debian, rpm and Gentoo packages.
+
+.. _completion-path:
+
+Where to put completions
+------------------------
+
+Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the list variable ``$fish_complete_path``, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '``.fish``'.
+
+By default, Fish searches the following for completions, using the first available file that it finds:
+
+- A directory for end-users to keep their own completions, usually ``~/.config/fish/completions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable);
+- A directory for systems administrators to install completions for all users on the system, usually ``/etc/fish/completions``;
+- A directory for third-party software vendors to ship their own completions for their software, usually ``/usr/share/fish/vendor_completions.d``;
+- The completions shipped with fish, usually installed in ``/usr/share/fish/completions``; and
+- Completions automatically generated from the operating system's manual, usually stored in ``~/.local/share/fish/generated_completions``.
+
+These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
+
+This wide search may be confusing. If you are unsure, your completions probably belong in ``~/.config/fish/completions``.
+
+If you have written new completions for a common Unix command, please consider sharing your work by submitting it via the instructions in `Further help and development <#more-help>`_.
+
+If you are developing another program and would like to ship completions with your program, install them to the "vendor" completions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable completionsdir fish``.
+
+
 .. _editor:
 
 Command line editor

From 6b2addd9f335c1a4475e0e6ce237c65e4ca943b4 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Dec 2019 22:32:35 +0100
Subject: [PATCH 1355/1732] prompt: don't print pipestatus if only the last
 process failed

Example: ps | grep something

[ci skip]
---
 share/functions/__fish_print_pipestatus.fish | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 0fbf17ad6..690588fde 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -6,8 +6,10 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
     set -l status_color $argv[5]
     set -e argv[1 2 3 4 5]
 
-    # only output $pipestatus if there was a pipe and any part of it had non-zero exit status
-    if set -q argv[2] && string match -qvr '^0$' $argv
+    # only output $pipestatus if there was a pipe
+    # and any part of it but the last one had non-zero exit status
+    # if only the last process failed, prompts already print $status which is $pipestatus[-1]
+    if set -q argv[2] && string match -qvr '^0$' $argv[1..-2]
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
         printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \

From eaa87ff88561982f139f86490b18a37f5dec1b59 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 10 Dec 2019 16:14:34 -0800
Subject: [PATCH 1356/1732] Correct a comment

A comment claimed that 0 was STDOUT_FILENO. In fact this should be 1.

Also default the fd for pipe_or_redir_t to -1, as 0 is not a sensible
default.
---
 src/tokenizer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tokenizer.h b/src/tokenizer.h
index fada16eec..5e6e3a12b 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -154,9 +154,9 @@ wcstring tok_first(const wcstring &str);
 /// Struct wrapping up a parsed pipe or redirection.
 struct pipe_or_redir_t {
     // The redirected fd, or -1 on overflow.
-    // In the common case of a pipe, this is 0 (STDOUT_FILENO).
+    // In the common case of a pipe, this is 1 (STDOUT_FILENO).
     // For example, in the case of "3>&1" this will be 3.
-    int fd{0};
+    int fd{-1};
 
     // Whether we are a pipe (true) or redirection (false).
     bool is_pipe{false};

From 6902459566b491e2debb136f43f815965910eeee Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 10 Dec 2019 22:32:35 +0100
Subject: [PATCH 1357/1732] prompt: don't print status of last process in pipe
 twice

If a command fails, print the pipestatus in red instead of yellow and
don't print the status of the last process again. See #6375.

Also use $fish_color_status for coloring status consistently.

Also use __fish_pipestatus_with_signal to print SIGPIPE instead
of a numeric code on e.g.: yes | less +q

[ci skip]
---
 share/functions/__fish_print_pipestatus.fish  |  6 ++----
 share/functions/fish_prompt.fish              |  6 +-----
 .../sample_prompts/classic_status.fish        |  8 +++-----
 .../sample_prompts/classic_vcs.fish           |  5 +----
 .../sample_prompts/informative.fish           | 19 +++++++------------
 .../sample_prompts/informative_vcs.fish       | 15 ++++++---------
 6 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 690588fde..b9f90e4f7 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -6,10 +6,8 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
     set -l status_color $argv[5]
     set -e argv[1 2 3 4 5]
 
-    # only output $pipestatus if there was a pipe
-    # and any part of it but the last one had non-zero exit status
-    # if only the last process failed, prompts already print $status which is $pipestatus[-1]
-    if set -q argv[2] && string match -qvr '^0$' $argv[1..-2]
+    # only output status codes if some process in the pipe failed
+    if string match -qvr '^0$' $argv
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
         printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 352119b1d..1b1fcc19b 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -3,7 +3,6 @@
 
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
-    set -l last_status $status
     set -l normal (set_color normal)
 
     # Initialize our variables.
@@ -26,10 +25,7 @@ function fish_prompt --description 'Write out the prompt'
     end
 
     # Write pipestatus
-    set -l prompt_status (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
-    if test $last_status -ne 0
-        set prompt_status " $prompt_status" (set_color $fish_color_status) "[$last_status]" "$normal"
-    end
+    set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
     echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index b84af5ebf..ff0e52669 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -4,13 +4,11 @@
 function fish_prompt --description "Write out the prompt"
     # Save our status
     set -l last_pipestatus $pipestatus
-    set -l last_status $status
 
-    __fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus
+    set -q fish_color_status
+    or set -U fish_color_status red
 
-    if test $last_status -ne 0
-        printf "%s(%s)%s " (set_color red --bold) (__fish_status_to_signal $last_status) (set_color normal)
-    end
+    __fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus
 
     set -l color_cwd
     set -l suffix
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 352119b1d..694a524c6 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -26,10 +26,7 @@ function fish_prompt --description 'Write out the prompt'
     end
 
     # Write pipestatus
-    set -l prompt_status (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
-    if test $last_status -ne 0
-        set prompt_status " $prompt_status" (set_color $fish_color_status) "[$last_status]" "$normal"
-    end
+    set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
     echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index fde4c3dfd..bced9ce89 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -4,14 +4,9 @@
 function fish_prompt --description 'Informative prompt'
     #Save the return status of the previous command
     set -l last_pipestatus $pipestatus
-    set -l last_status $status
 
-    #Set the color for the status depending on the value
-    if test $stat -gt 0
-        set -l status_color (set_color brred)
-    else
-        set -l status_color (set_color brgreen)
-    end
+    set -q fish_color_status
+    or set -U fish_color_status red
 
     switch "$USER"
         case root toor
@@ -20,11 +15,11 @@ function fish_prompt --description 'Informative prompt'
                                                              or set_color $fish_color_cwd) \
                 (prompt_pwd) (set_color normal)
         case '*'
-            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) \
-                                      (set_color bryellow) $last_pipestatus)
+            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) \
+                                      (set_color --bold $fish_color_status) $last_pipestatus)
 
-            printf '[%s] %s%s@%s %s%s %s%s(%s)%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
-                $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD "$pipestatus_string" \
-                $status_color $last_status (set_color normal)
+            printf '[%s] %s%s@%s %s%s %s%s%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
+                $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD $pipestatus_string \
+                (set_color normal)
     end
 end
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index cf16a3ca8..4da6f5172 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -3,7 +3,6 @@
 
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
-    set -l last_status $status
 
     if not set -q __fish_git_prompt_show_informative_status
         set -g __fish_git_prompt_show_informative_status 1
@@ -57,6 +56,9 @@ function fish_prompt --description 'Write out the prompt'
         set -g __fish_git_prompt_color_cleanstate green --bold
     end
 
+    set -q fish_color_status
+    or set -U fish_color_status red
+
     set -l color_cwd
     set -l prefix
     set -l suffix
@@ -80,14 +82,9 @@ function fish_prompt --description 'Write out the prompt'
 
     printf '%s ' (fish_vcs_prompt)
 
-    set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color yellow) (set_color --bold yellow) $last_pipestatus)
-    echo -n "$pipestatus_string"
-
-    if not test $last_status -eq 0
-        set_color $fish_color_error
-        echo -n "[$last_status] "
-        set_color normal
-    end
+    set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
+    echo -n $pipestatus_string
+    set_color normal
 
     echo -n "$suffix "
 end

From d4a3b30b735079541411885301fbebc6f112d97a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 11 Dec 2019 01:06:31 +0100
Subject: [PATCH 1358/1732] prompt: move status to the right in classic_status
 sample prompt

This is consistent with the other prompts that include status.

[ci skip]
---
 share/tools/web_config/sample_prompts/classic_status.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index ff0e52669..ababa9b95 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -8,8 +8,6 @@ function fish_prompt --description "Write out the prompt"
     set -q fish_color_status
     or set -U fish_color_status red
 
-    __fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus
-
     set -l color_cwd
     set -l suffix
     switch "$USER"
@@ -25,5 +23,7 @@ function fish_prompt --description "Write out the prompt"
             set suffix '>'
     end
 
-    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) (set_color normal) "$suffix "
+    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) \
+    (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
+    (set_color normal) "$suffix "
 end

From 0573e95b03739a7946e1f568d79fabb24345cd98 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 10 Dec 2019 17:05:17 -0800
Subject: [PATCH 1359/1732] Resurrect io_print

---
 src/io.cpp | 19 ++++++-------------
 src/io.h   |  7 +++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 443badeb7..21b98fc2f 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -222,21 +222,15 @@ void io_chain_t::append(const io_chain_t &chain) {
     this->insert(this->end(), chain.begin(), chain.end());
 }
 
-#if 0
-// This isn't used so the lint tools were complaining about its presence. I'm keeping it in the
-// source because it could be useful for debugging.
-void io_print(const io_chain_t &chain)
-{
-    if (chain.empty())
-    {
-        std::fwprintf(stderr, L"Empty chain %p\n", &chain);
+void io_chain_t::print() const {
+    if (this->empty()) {
+        std::fwprintf(stderr, L"Empty chain %p\n", this);
         return;
     }
 
-    std::fwprintf(stderr, L"Chain %p (%ld items):\n", &chain, (long)chain.size());
-    for (size_t i=0; i < chain.size(); i++)
-    {
-        const shared_ptr<io_data_t> &io = chain.at(i);
+    std::fwprintf(stderr, L"Chain %p (%ld items):\n", this, (long)this->size());
+    for (size_t i = 0; i < this->size(); i++) {
+        const auto &io = this->at(i);
         if (io.get() == nullptr)
         {
             std::fwprintf(stderr, L"\t(null)\n");
@@ -248,7 +242,6 @@ void io_print(const io_chain_t &chain)
         }
     }
 }
-#endif
 
 int move_fd_to_unused(int fd, const io_chain_t &io_chain, bool cloexec) {
     if (fd < 0 || io_chain.io_for_fd(fd).get() == nullptr) {
diff --git a/src/io.h b/src/io.h
index 5ea8287de..796caafc2 100644
--- a/src/io.h
+++ b/src/io.h
@@ -346,6 +346,9 @@ class io_chain_t : public std::vector<io_data_ref_t> {
     /// \return the last io redirection in the chain for the specified file descriptor, or nullptr
     /// if none.
     io_data_ref_t io_for_fd(int fd) const;
+
+    /// Output debugging information to stderr.
+    void print() const;
 };
 
 /// Helper type returned from making autoclose pipes.
@@ -436,9 +439,5 @@ struct io_streams_t {
     explicit io_streams_t(size_t read_limit) : out(read_limit), err(read_limit), stdin_fd(-1) {}
 };
 
-#if 0
-// Print debug information about the specified IO redirection chain to stderr.
-void io_print(const io_chain_t &chain);
-#endif
 
 #endif

From 1e15aa4c4a574b94942ca61137862730c63e0d49 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 10 Dec 2019 17:21:03 -0800
Subject: [PATCH 1360/1732] Correctly style io_chain_t::print

---
 src/io.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 21b98fc2f..acdb0e71e 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -231,12 +231,9 @@ void io_chain_t::print() const {
     std::fwprintf(stderr, L"Chain %p (%ld items):\n", this, (long)this->size());
     for (size_t i = 0; i < this->size(); i++) {
         const auto &io = this->at(i);
-        if (io.get() == nullptr)
-        {
+        if (io.get() == nullptr) {
             std::fwprintf(stderr, L"\t(null)\n");
-        }
-        else
-        {
+        } else {
             std::fwprintf(stderr, L"\t%lu: fd:%d, ", (unsigned long)i, io->fd);
             io->print();
         }

From 0b1af1ace405628f4f506fab6ab01b0b0f1e8db4 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 10 Dec 2019 18:32:56 -0800
Subject: [PATCH 1361/1732] Correct the use of the constructed pointer in job
 lineage

This was always being set to a different pointer. Ensure the root job
shares its constructed pointer with its children.
---
 src/exec.cpp |  4 ++--
 src/proc.cpp | 12 +++++++++++-
 src/proc.h   | 22 +++++++++++++---------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 04b34f47f..e3869955e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -313,7 +313,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
         // launch_process _never_ returns.
         launch_process_nofork(vars, j->processes.front().get());
     } else {
-        j->mut_flags().constructed = true;
+        j->mark_constructed();
         j->processes.front()->completed = true;
         return;
     }
@@ -1225,7 +1225,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id,
           j->command_wcstr(), j->pgid);
 
-    j->mut_flags().constructed = true;
+    j->mark_constructed();
     if (!j->is_foreground()) {
         parser.vars().set_one(L"last_pid", ENV_GLOBAL, to_string(j->pgid));
     }
diff --git a/src/proc.cpp b/src/proc.cpp
index 603ce08c7..372be6d61 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -269,7 +269,12 @@ void process_t::check_generations_before_launch() {
 }
 
 job_t::job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage)
-    : properties(props), job_lineage(std::move(lineage)), job_id(job_id) {}
+    : properties(props), job_lineage(std::move(lineage)), job_id(job_id) {
+    if (!job_lineage.root_constructed) {
+        // We are the root job, share our constructed pointer.
+        job_lineage.root_constructed = this->constructed;
+    }
+}
 
 job_t::~job_t() { release_job_id(job_id); }
 
@@ -282,6 +287,11 @@ io_chain_t job_t::all_io_redirections() const {
     return result;
 }
 
+void job_t::mark_constructed() {
+    assert(!is_constructed() && "Job was already constructed");
+    *constructed = true;
+}
+
 using process_generation_count_t = unsigned int;
 
 /// A list of pids/pgids that have been disowned. They are kept around until either they exit or
diff --git a/src/proc.h b/src/proc.h
index 5dc918dab..067847f16 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -278,9 +278,8 @@ struct job_lineage_t {
     io_chain_t block_io{};
 
     /// A shared pointer indicating that the entire tree of jobs is safe to disown.
-    /// This is set by the "root" job after it is constructed.
-    std::shared_ptr<relaxed_atomic_bool_t> root_constructed{
-        std::make_shared<relaxed_atomic_bool_t>(false)};
+    /// This is set to true by the "root" job after it is constructed.
+    std::shared_ptr<relaxed_atomic_bool_t> root_constructed{};
 };
 
 /// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
@@ -310,7 +309,7 @@ class job_t {
     wcstring command_str;
 
     // The lineage associated with the job.
-    const job_lineage_t job_lineage;
+    job_lineage_t job_lineage;
 
     // No copying.
     job_t(const job_t &rhs) = delete;
@@ -382,6 +381,12 @@ class job_t {
     /// stops.
     struct termios tmodes {};
 
+    /// Whether the specified job is completely constructed, i.e. completely parsed, and every
+    /// process in the job has been forked, etc.
+    /// This is a shared_ptr because it may be passed to child jobs through the lineage.
+    const std::shared_ptr<relaxed_atomic_bool_t> constructed =
+        std::make_shared<relaxed_atomic_bool_t>(false);
+
     /// Flags associated with the job.
     struct flags_t {
         /// Whether the user has been told about stopped job.
@@ -390,10 +395,6 @@ class job_t {
         /// Whether this job is in the foreground.
         bool foreground{false};
 
-        /// Whether the specified job is completely constructed, i.e. completely parsed, and every
-        /// process in the job has been forked, etc.
-        bool constructed{false};
-
         /// Whether the exit status should be negated. This flag can only be set by the not builtin.
         bool negate{false};
 
@@ -426,9 +427,12 @@ class job_t {
     /// Fetch all the IO redirections associated with the job.
     io_chain_t all_io_redirections() const;
 
+    /// Mark this job as constructed. The job must not have previously been marked as constructed.
+    void mark_constructed();
+
     // Helper functions to check presence of flags on instances of jobs
     /// The job has been fully constructed, i.e. all its member processes have been launched
-    bool is_constructed() const { return flags().constructed; }
+    bool is_constructed() const { return *constructed; }
     /// The job was launched in the foreground and has control of the terminal
     bool is_foreground() const { return flags().foreground; }
     /// The job is complete, i.e. all its member processes have been reaped

From 3f10da0d0109ca5bb80f0322ddd8446d225d071a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 11 Dec 2019 11:08:19 +0100
Subject: [PATCH 1362/1732] Persist new zero-length universal variables

Because of default initialization to an empty list, code that relies on
set -U __fish_init_3_x was run every time.
---
 src/env_universal_common.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 5e71a0248..2f6b23d21 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -268,8 +268,9 @@ maybe_t<env_var_t::env_var_flags_t> env_universal_t::get_flags(const wcstring &n
 
 void env_universal_t::set_internal(const wcstring &key, const env_var_t &var) {
     ASSERT_IS_LOCKED(lock);
+    bool new_entry = vars.count(key) == 0;
     env_var_t &entry = vars[key];
-    if (entry != var) {
+    if (new_entry || entry != var) {
         entry = var;
         this->modified.insert(key);
         if (entry.exports()) export_generation += 1;

From 2f1a5e65d8a8d639926517df0b8ece2613b1f04c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 11 Dec 2019 10:12:10 +0100
Subject: [PATCH 1363/1732] prompt: don't set default colors twice

The colors are set in __fish_config_interactive before the prompt is
painted for the first time.

Also initialize the $fish_color_status for the (pipe) status, bump the
version for that.
[ci skip]
---
 share/functions/__fish_config_interactive.fish           | 9 ++++-----
 share/functions/fish_prompt.fish                         | 5 -----
 .../tools/web_config/sample_prompts/classic_status.fish  | 3 ---
 share/tools/web_config/sample_prompts/classic_vcs.fish   | 4 ----
 share/tools/web_config/sample_prompts/informative.fish   | 3 ---
 .../tools/web_config/sample_prompts/informative_vcs.fish | 3 ---
 6 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 0c9ae3269..1deb4ecb6 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -44,9 +44,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     #
     # If we are starting up for the first time, set various defaults.
-    #
-    # bump this to 2_4_0 when rolling release if anything changes after 9/10/2016
-    if not set -q __fish_init_2_39_8
+    if not set -q __fish_init_3_1_0
 
         # Regular syntax highlighting colors
         __init_uvar fish_color_normal normal
@@ -61,9 +59,9 @@ function __fish_config_interactive -d "Initializations that should be performed
         __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_valid_path --underline
+        __init_uvar fish_color_status red
 
         __init_uvar fish_color_cwd green
         __init_uvar fish_color_cwd_root red
@@ -92,7 +90,8 @@ function __fish_config_interactive -d "Initializations that should be performed
         #
         __init_uvar fish_color_history_current --bold
 
-        set -U __fish_init_2_39_8
+        set -e __fish_init_2_39_8
+        set -U __fish_init_3_1_0
     end
 
     #
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 1b1fcc19b..eb81d5f9c 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -5,13 +5,8 @@ function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
     set -l normal (set_color normal)
 
-    # Initialize our variables.
-    set -q fish_color_user
-    or set -U fish_color_user -o green
     set -q fish_color_host
     or set -U fish_color_host -o cyan
-    set -q fish_color_status
-    or set -U fish_color_status red
 
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index ababa9b95..3322926c0 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -5,9 +5,6 @@ function fish_prompt --description "Write out the prompt"
     # Save our status
     set -l last_pipestatus $pipestatus
 
-    set -q fish_color_status
-    or set -U fish_color_status red
-
     set -l color_cwd
     set -l suffix
     switch "$USER"
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 694a524c6..04e60001d 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -7,12 +7,8 @@ function fish_prompt --description 'Write out the prompt'
     set -l normal (set_color normal)
 
     # Initialize our variables.
-    set -q fish_color_user
-    or set -U fish_color_user -o green
     set -q fish_color_host
     or set -U fish_color_host -o cyan
-    set -q fish_color_status
-    or set -U fish_color_status red
 
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index bced9ce89..b07299ac3 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -5,9 +5,6 @@ function fish_prompt --description 'Informative prompt'
     #Save the return status of the previous command
     set -l last_pipestatus $pipestatus
 
-    set -q fish_color_status
-    or set -U fish_color_status red
-
     switch "$USER"
         case root toor
             printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index 4da6f5172..30f042dfd 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -56,9 +56,6 @@ function fish_prompt --description 'Write out the prompt'
         set -g __fish_git_prompt_color_cleanstate green --bold
     end
 
-    set -q fish_color_status
-    or set -U fish_color_status red
-
     set -l color_cwd
     set -l prefix
     set -l suffix

From 94b5720343ca6c31fe75ea486a4ac5b4f30196cd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 11 Dec 2019 10:28:38 +0100
Subject: [PATCH 1364/1732] prompt: remove fallback for $fish_color_host

This was mostly dead, since $fish_color_host is set to normal in
__fish_config_interactive. The assignment was only used if the user
explicitly unsets fish_color_host (which they shouldn't, really).
Anyway it's weird to use cyan, use normal instead.
[ci skip]
---
 share/functions/fish_prompt.fish                       | 3 ---
 share/tools/web_config/sample_prompts/classic_vcs.fish | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index eb81d5f9c..71a668643 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -5,9 +5,6 @@ function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
     set -l normal (set_color normal)
 
-    set -q fish_color_host
-    or set -U fish_color_host -o cyan
-
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
     set -l prefix
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 04e60001d..7203b7320 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -6,10 +6,6 @@ function fish_prompt --description 'Write out the prompt'
     set -l last_status $status
     set -l normal (set_color normal)
 
-    # Initialize our variables.
-    set -q fish_color_host
-    or set -U fish_color_host -o cyan
-
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
     set -l prefix

From cc7ae030708307c1e74bc4a637525d3d43b40f66 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 11 Dec 2019 09:46:40 +0100
Subject: [PATCH 1365/1732] prompt: don't consider SIGPIPE a failure

[ci skip]
---
 share/functions/__fish_print_pipestatus.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index b9f90e4f7..c860821b4 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -7,7 +7,8 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
     set -e argv[1 2 3 4 5]
 
     # only output status codes if some process in the pipe failed
-    if string match -qvr '^0$' $argv
+    # SIGPIPE (141 = 128 + 13) is usually not a failure, see #6375.
+    if string match -qvr '^(0|141)$' $argv
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
         printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \

From ff4498ceec6d07dc8564a08a79623fce539cdd93 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 11 Dec 2019 20:50:23 +0100
Subject: [PATCH 1366/1732] CHANGELOG: Add some nice bits

[ci skip]
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dd56d34c..9ac468648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,8 @@
 - `dirh` outputs its stack in the correct order (#5477).
 - `funced` and the edit-commandline-in-buffer bindings did not work in fish 3.0 when the `$EDITOR` variable contained spaces; this has been corrected (#5625).
 - vi mode supports R to enter replace mode (#6342).
+- Builtins now pipe their help output to a pager automatically (#6227).
+- `set_color` now colors the `--print-colors` output in the matching colors if it is going to a terminal
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).

From 970288c854d9e45fab35f2c28dd067fce2b75122 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 11 Dec 2019 11:49:51 -0800
Subject: [PATCH 1367/1732] Migrate the read limit into parser_t::libdata

It is more natural here than "on the last bufferfill."
---
 src/exec.cpp | 24 ++++++++++--------------
 src/io.h     |  8 +-------
 src/parser.h |  3 +++
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index e3869955e..78b93772d 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1145,17 +1145,9 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         j->pgid = getpgrp();
     }
 
-    size_t stdout_read_limit = 0;
+    const size_t stdout_read_limit = parser.libdata().read_limit;
     io_chain_t all_ios = j->all_io_redirections();
 
-    // The read limit is dictated by the last bufferfill.
-    for (auto &io : all_ios) {
-        if ((io->io_mode == io_mode_t::bufferfill)) {
-            const auto *bf = static_cast<const io_bufferfill_t *>(io.get());
-            stdout_read_limit = bf->buffer()->read_limit();
-        }
-    }
-
     // Handle an exec call.
     if (j->processes.front()->type == process_type_t::exec) {
         internal_exec(parser.vars(), j.get(), all_ios);
@@ -1241,23 +1233,26 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
 static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstring_list_t *lst,
                                   bool apply_exit_status, bool is_subcmd) {
     ASSERT_IS_MAIN_THREAD();
-    bool prev_subshell = parser.libdata().is_subshell;
+    auto &ld = parser.libdata();
+    bool prev_subshell = ld.is_subshell;
     auto prev_statuses = parser.get_last_statuses();
     bool split_output = false;
 
+    auto prev_read_limit = ld.read_limit;
+    ld.read_limit = is_subcmd ? read_byte_limit : 0;
+
     const auto ifs = parser.vars().get(L"IFS");
     if (!ifs.missing_or_empty()) {
         split_output = true;
     }
 
-    parser.libdata().is_subshell = true;
+    ld.is_subshell = true;
     auto subcommand_statuses = statuses_t::just(-1);  // assume the worst
 
     // IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
     // be null.
-    size_t read_limit = is_subcmd ? read_byte_limit : 0;
     std::shared_ptr<io_buffer_t> buffer;
-    if (auto bufferfill = io_bufferfill_t::create(io_chain_t{}, read_limit)) {
+    if (auto bufferfill = io_bufferfill_t::create(io_chain_t{}, ld.read_limit)) {
         if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == 0) {
             subcommand_statuses = parser.get_last_statuses();
         }
@@ -1276,7 +1271,8 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
         parser.set_last_statuses(std::move(prev_statuses));
     }
 
-    parser.libdata().is_subshell = prev_subshell;
+    ld.is_subshell = prev_subshell;
+    ld.read_limit = prev_read_limit;
 
     if (lst == nullptr || !buffer) {
         return subcommand_statuses.status;
diff --git a/src/io.h b/src/io.h
index 796caafc2..22d87454a 100644
--- a/src/io.h
+++ b/src/io.h
@@ -284,9 +284,6 @@ class io_buffer_t {
     /// running. The fillthread fulfills the corresponding promise when it exits.
     std::future<void> fillthread_waiter_{};
 
-    /// Read limit of the buffer.
-    const size_t read_limit_;
-
     /// Lock for appending.
     std::mutex append_lock_{};
 
@@ -303,7 +300,7 @@ class io_buffer_t {
     bool fillthread_running() const { return fillthread_waiter_.valid(); }
 
    public:
-    explicit io_buffer_t(size_t limit) : buffer_(limit), read_limit_(limit) {
+    explicit io_buffer_t(size_t limit) : buffer_(limit) {
         // Explicitly reset the discard flag because we share this buffer.
         buffer_.reset_discard();
     }
@@ -323,9 +320,6 @@ class io_buffer_t {
         buffer_.append(ptr, ptr + count);
     }
 
-    /// \return the read limit.
-    size_t read_limit() const { return read_limit_; }
-
     /// Appends data from a given output_stream_t.
     /// Marks the receiver as discarded if the stream was discarded.
     void append_from_stream(const output_stream_t &stream);
diff --git a/src/parser.h b/src/parser.h
index 4bc12ee06..6bb0026b7 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -170,6 +170,9 @@ struct library_data_t {
     /// Whether we should return from the current function.
     bool returning{false};
 
+    /// The read limit to apply to captured subshell output, or 0 for none.
+    size_t read_limit{0};
+
     /// The current filename we are evaluating, either from builtin source or on the command line.
     /// This is an intern'd string.
     const wchar_t *current_filename{};

From 0b36d94006a4bba29614ccb104ba6549fe1a8dde Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 11 Dec 2019 20:58:24 +0100
Subject: [PATCH 1368/1732] docs: Link to the fish-doc and fish-tutorial pages
 from fish(1)

Just a brief explanation what that page is good for and how to get the
full scoop.

Fixes #5521.

[ci skip]
---
 sphinx_doc_src/cmds/fish.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/fish.rst b/sphinx_doc_src/cmds/fish.rst
index e0adc6bec..de76da2c9 100644
--- a/sphinx_doc_src/cmds/fish.rst
+++ b/sphinx_doc_src/cmds/fish.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``fish`` is a command-line shell written mainly with interactive use in mind. The :ref:`full manual <intro>` is available in HTML by using the :ref:`help <cmd-help>` command from inside fish.
+``fish`` is a command-line shell written mainly with interactive use in mind. This page briefly describes the options for invoking fish. The :ref:`full manual <intro>` is available in HTML by using the :ref:`help <cmd-help>` command from inside fish, and in the `fish-doc(1)` man page. The :ref:`tutorial <tutorial>` is available as HTML via ``help tutorial`` or in `fish-tutorial(1)`.
 
 The following options are available:
 

From 0b53e51634329dbce58fafe2b249ac2aca1e21d9 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Sun, 8 Dec 2019 15:16:17 +0900
Subject: [PATCH 1369/1732] Remove translations for non-existent
 files/functions

---
 po/de.po    | 360 ---------------------------------------------------
 po/en.po    | 350 --------------------------------------------------
 po/fr.po    | 322 ----------------------------------------------
 po/nb.po    | 315 ---------------------------------------------
 po/nn.po    | 314 ---------------------------------------------
 po/pl.po    | 323 ----------------------------------------------
 po/pt_BR.po | 361 ----------------------------------------------------
 po/sv.po    | 315 ---------------------------------------------
 po/zh_CN.po | 322 ----------------------------------------------
 9 files changed, 2982 deletions(-)

diff --git a/po/de.po b/po/de.po
index 62d767293..41f19ff5b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3514,43 +3514,6 @@ msgstr ""
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-#, fuzzy
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s: Ungültige Prozesskennung -- %ls\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-#, fuzzy
-msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s: Erwartete ein Argument, erhielt %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-#, fuzzy
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s: Argument erwartet -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 #, fuzzy
 msgid "%s: Name cannot be empty\\n"
@@ -4528,7 +4491,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -5158,7 +5120,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -13562,98 +13523,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-#, fuzzy
-msgid "Show output in a more script friendly format"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-#, fuzzy
-msgid "Download [twice to fetch dependencies]"
-msgstr "Status der Abhängigkeiten anzeigen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-#, fuzzy
-msgid "Search for packages by maintainer"
-msgstr "Paket entsprechend Muster suchen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-#, fuzzy
-msgid "Search for packages by name"
-msgstr "Vollständigen Paketnamen suchen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-#, fuzzy
-msgid "Check AUR packages for updates"
-msgstr "Komprimierte Patche erstellen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-#, fuzzy
-msgid "Use colored output"
-msgstr "Farben benutzen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-#, fuzzy
-msgid "Show debug output"
-msgstr "Debug-Ausgabe aktivieren"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-#, fuzzy
-msgid "Overwrite existing files when downloading"
-msgstr "Jede einzelne heruntergeladene Datei löschen"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-#, fuzzy
-msgid "Print formatted"
-msgstr "Befehlstyp ausgeben"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-#, fuzzy
-msgid "Display help and quit"
-msgstr "Hilfe anzeigen und beenden"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-#, fuzzy
-msgid "Ignore a package upgrade"
-msgstr "Gehaltene Pakete ignorieren"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-#, fuzzy
-msgid "Ignore a binary repo when checking for updates"
-msgstr "Benutzername für Zeitberechnungen ignorieren"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-#, fuzzy
-msgid "Specify a delimiter for list formatters"
-msgstr "Verzeichnis für rpm-Datenbank angeben"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-#, fuzzy
-msgid "Output less"
-msgstr "Ausgabeverfolgung"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-#, fuzzy
-msgid "Curl timeout in seconds"
-msgstr "Minimalintervall in Sekunden"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-#, fuzzy
-msgid "Output more"
-msgstr "Ausgabeverfolgung"
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 #, fuzzy
@@ -46128,97 +45997,6 @@ msgstr "Alle Dateisysteme anzeigen"
 msgid "Exclude files that match any pattern in file"
 msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-#, fuzzy
-msgid "Remote hostname"
-msgstr "Eintrag für Hostname entfernen"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-#, fuzzy
-msgid "Allow broadcasts"
-msgstr "Ping an eine Broadcast-Adresse erlauben"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-#, fuzzy
-msgid "Set keepalive option"
-msgstr "Konfigurationsoption festlegen"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-#, fuzzy
-msgid "Numeric-only IP addresses, no DNS"
-msgstr "Numerische Adresse"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-#, fuzzy
-msgid "Local port number"
-msgstr "Satznummer anzeigen"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-#, fuzzy
-msgid "Local source address"
-msgstr "Ursprung des Quellbaumes"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-#, fuzzy
-msgid "Set Type of Service"
-msgstr "Dienst anhalten"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 #, fuzzy
 msgid "List all available profiles for automatic selection"
@@ -52257,24 +52035,6 @@ msgstr "fish mit diesem Befehl ausführen"
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-#, fuzzy
-msgid "Filter started daemons"
-msgstr "Alle Namen ausgeben"
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-#, fuzzy
-msgid "Filter manually started daemons"
-msgstr "Alle installierten Pakete abfragen"
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -66695,10 +66455,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -66731,10 +66487,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr "Parameter als Befehl auswerten"
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr ""
@@ -66751,15 +66503,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-#, fuzzy
-msgid "Complete abook formats"
-msgstr "Vergleiche FILE1 mit allen Operanden"
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 #, fuzzy
 msgid "List archive contents"
@@ -67138,11 +66881,6 @@ msgstr "Saloppe Einhäng-Optionen tolerieren"
 msgid "Complete by list of running processes"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-#, fuzzy
-msgid "Complete setxkb options"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 #, fuzzy
 msgid "common completions for ssh commands"
@@ -67187,12 +66925,6 @@ msgstr "Optionen"
 msgid "Complete subcommand"
 msgstr "Vergleiche FILE1 mit allen Operanden"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 #, fuzzy
 msgid "Complete using files"
@@ -67283,7 +67015,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 #, fuzzy
 msgid "Obtain a list of installed packages"
 msgstr "Ein installiertes Paket neu erstellen und installieren"
@@ -67315,16 +67046,6 @@ msgstr "Zeigt Änderungsinformationen zu dem Paket an"
 msgid "Command used to find descriptions for commands"
 msgstr "Funktionstasten für Befehle nutzen"
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -67445,31 +67166,16 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-#, fuzzy
-msgid "Obtain a list of ports local collections"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 #, fuzzy
 msgid "Print a list of known network addresses"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
-msgid "Print arch daemons"
-msgstr "Alle Namen ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 #, fuzzy
 msgid "Print a list of documented fish commands"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-#, fuzzy
-msgid "Prints services installed"
-msgstr "Dienststatus ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -67479,12 +67185,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 #, fuzzy
 msgid "Print a list of local groups"
@@ -67514,11 +67214,6 @@ msgstr "Alle Versionen ausgeben"
 msgid "Print lpr printers"
 msgstr "Vollständige Datensätze ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-#, fuzzy
-msgid "Print available lsblk columns"
-msgstr "Verfügbare Liste ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 #, fuzzy
 msgid "Print mounted devices"
@@ -67548,76 +67243,25 @@ msgstr "Liste laufender screen-Sitzungen ausgeben"
 msgid "Print directories where desktop files are stored"
 msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-#, fuzzy
-msgid "Print all available xdg desktop file IDs"
-msgstr "Namen der verfügbaren Signale auflisten"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 #, fuzzy
 msgid "Print XDG mime types"
 msgstr "Befehlstyp ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
-msgid "Print xrandr modes"
-msgstr "Roheinträge ausgeben"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-#, fuzzy
-msgid "Print xrandr outputs"
-msgstr "Wortzählung ausgeben"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 #, fuzzy
 msgid "Print X windows"
 msgstr "APM-Informationen ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-#, fuzzy
-msgid "Lists ZFS filesystems"
-msgstr "Alle Dateisysteme anzeigen"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 #, fuzzy
 msgid "Lists ZFS snapshots"
 msgstr "Vertraute Schlüssel auflisten"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-#, fuzzy
-msgid "Lists ZFS volumes"
-msgstr "Nach Spalten auflisten"
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr "Prompt ausgeben"
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-#, fuzzy
-msgid "Test if prt-get has yet to be given the command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-#, fuzzy
-msgid "Obtain a list of ports"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-#, fuzzy
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-#, fuzzy
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 #, fuzzy
@@ -67650,10 +67294,6 @@ msgstr "Aktuelle Funktionen sind: "
 msgid "Call systemctl with some options from the current commandline"
 msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 2064783e0..06ef282b5 100644
--- a/po/en.po
+++ b/po/en.po
@@ -3357,41 +3357,6 @@ msgstr "%s %s: Abbreviation %s already exists, cannot rename %s\\n"
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr "%s %s: Unexpected argument -- '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s: invalid option -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr "%s: %s cannot be specified along with %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s: option requires an argument -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s: Unexpected argument -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-#, fuzzy
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr "%s: abbreviation must have a non-empty key\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr "%s: abbreviation must have a value\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr "%s: abbreviation '%s' already exists, cannot rename\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr "%s: no such abbreviation “%s”\\n"
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr "%s: Name cannot be empty\\n"
@@ -4981,7 +4946,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -13377,100 +13341,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-#, fuzzy
-msgid "Show output in a more script friendly format"
-msgstr "Output filenames using the specified format"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-#, fuzzy
-msgid "Download [twice to fetch dependencies]"
-msgstr "Show state of dependencies"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-#, fuzzy
-msgid "Search for packages by maintainer"
-msgstr "Search for packages matching a pattern"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-#, fuzzy
-msgid "Search for packages by name"
-msgstr "Search full package name"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-#, fuzzy
-msgid "Check AUR packages for updates"
-msgstr "Check for patches"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-#, fuzzy
-msgid "Use colored output"
-msgstr "Use colors in output"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-#, fuzzy
-msgid "Show debug output"
-msgstr "Turn on debug output"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-#, fuzzy
-msgid "Overwrite existing files when downloading"
-msgstr "Overwrite existing binstubs if they exist"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-#, fuzzy
-msgid "Print formatted"
-msgstr "Prints formatted text"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-#, fuzzy
-msgid "Display help and quit"
-msgstr "Display help and exit"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-#, fuzzy
-msgid "Ignore a package upgrade"
-msgstr "Ignore package Holds"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-#, fuzzy
-msgid "Ignore a binary repo when checking for updates"
-msgstr "Ignore ancestry when calculating merges"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-#, fuzzy
-msgid "Specify a delimiter for list formatters"
-msgstr "Specify directory for rpm database"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-#, fuzzy
-msgid "Output less"
-msgstr "Output file"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-#, fuzzy
-msgid "Download targets to DIR"
-msgstr "Don't unlock targets"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-#, fuzzy
-msgid "Limit the number of threads created [10]"
-msgstr "Only print number of matches"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-#, fuzzy
-msgid "Curl timeout in seconds"
-msgstr "Minimum interval in seconds"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-#, fuzzy
-msgid "Output more"
-msgstr "Output trace"
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 #, fuzzy
@@ -45835,97 +45705,6 @@ msgstr "Show all filesystems"
 msgid "Exclude files that match any pattern in file"
 msgstr "Exclude files that match pattern in file"
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-#, fuzzy
-msgid "Remote hostname"
-msgstr "Remove an entry for hostname"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-#, fuzzy
-msgid "Allow broadcasts"
-msgstr "Allow pinging a broadcast address"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-#, fuzzy
-msgid "Set keepalive option"
-msgstr "Set a config option"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-#, fuzzy
-msgid "Numeric-only IP addresses, no DNS"
-msgstr "Numerical address"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-#, fuzzy
-msgid "Local port number"
-msgstr "Show record number"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-#, fuzzy
-msgid "Local source address"
-msgstr "Root source tree"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-#, fuzzy
-msgid "Set Type of Service"
-msgstr "Stop service"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 #, fuzzy
 msgid "List all available profiles for automatic selection"
@@ -51931,24 +51710,6 @@ msgstr "Run fish with this command"
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-#, fuzzy
-msgid "Filter started daemons"
-msgstr "Print arch daemons"
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-#, fuzzy
-msgid "Filter manually started daemons"
-msgstr "Show manually installed packages"
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -66060,10 +65821,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -66097,10 +65854,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr "Edit a property with an external editor."
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr "Evaluate parameters as a command"
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr "Alias for the gettext command"
@@ -66118,14 +65871,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr "List archive contents"
@@ -66492,10 +66237,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr "Complete by list of running processes"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr "Complete setxkb options"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 #, fuzzy
 msgid "common completions for ssh commands"
@@ -66538,12 +66279,6 @@ msgstr "Options"
 msgid "Complete subcommand"
 msgstr "Complete dd operands"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 #, fuzzy
 msgid "Complete using files"
@@ -66632,7 +66367,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr "Test if adb has yet to be given the subcommand"
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 #, fuzzy
 msgid "Obtain a list of installed packages"
 msgstr "Rebuild and install an installed package"
@@ -66664,16 +66398,6 @@ msgstr "Display change information for the package"
 msgid "Command used to find descriptions for commands"
 msgstr "Use function keys for commands"
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -66795,27 +66519,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-#, fuzzy
-msgid "Obtain a list of ports local collections"
-msgstr "Print a list of local users"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr "Print a list of known network addresses"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-msgid "Print arch daemons"
-msgstr "Print arch daemons"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr "Print a list of documented fish commands"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr "Prints services installed"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -66825,14 +66536,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr "Print a list of known network interfaces"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-#, fuzzy
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-"Print a list of all function calls leading up to running the current command"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 msgid "Print a list of local groups"
 msgstr "Print a list of local groups"
@@ -66858,10 +66561,6 @@ msgstr "Print lpr options"
 msgid "Print lpr printers"
 msgstr "Print lpr printers"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr "Print available lsblk columns"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr "Print mounted devices"
@@ -66887,67 +66586,22 @@ msgstr "Print a list of local users"
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-#, fuzzy
-msgid "Print all available xdg desktop file IDs"
-msgstr "Print available lsblk columns"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr "Print XDG mime types"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-msgid "Print xrandr modes"
-msgstr "Print xrandr modes"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-msgid "Print xrandr outputs"
-msgstr "Print xrandr outputs"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr "Print X windows"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr "Lists ZFS bookmarks, if the feature is enabled"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr "Lists ZFS filesystems"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr "Lists ZFS snapshots"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr "Lists ZFS volumes"
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr "Write out the prompt"
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-#, fuzzy
-msgid "Test if prt-get has yet to be given the command"
-msgstr "Test if apt has yet to be given the subcommand"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-#, fuzzy
-msgid "Obtain a list of ports"
-msgstr "Print a list of local users"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-#, fuzzy
-msgid "Test if prt-get should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-#, fuzzy
-msgid "Test if prt-get should have ports as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -66978,10 +66632,6 @@ msgstr "Prompt function for Git"
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr "Test if the token under the cursor matches the specified wildcard"
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 7396be22e..dbc4fbfca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3533,40 +3533,6 @@ msgstr "%s %s : L’abréviation %s existe, impossible de renommer %s\\n"
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr "%s %s : Argument inattendu -- '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s : option invalide -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr "%s : %s ne peut être spécifié avec %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s : l’option requiert un argument -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s : Argument inattendu -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr "%s : l’abréviation ne peut comporter d’espaces dans la clé\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr "%s : l’abréviation doit être dotée d’une valeur\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr "%s : l’abréviation '%s' existe, impossible de renommer\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr "%s : aucune abréviation '%s'\\n"
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr "%s : Le nom ne peut être une chaîne vide\\n"
@@ -4478,7 +4444,6 @@ msgstr "<dir> chemin vers les informations ACPI (/proc/acpi)"
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -5098,7 +5063,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -13195,83 +13159,6 @@ msgstr "Appliquer la correction de couleur à l’image [matrice]"
 msgid "Enhance or reduce the image contrast"
 msgstr "Augmenter ou réduire le contraste de l’image"
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr "Afficher la sortie dans un format utilisable par un programme"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr "Télécharger (deux fois pour récupérer également les dépendances)"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-"Afficher les informations sur la cible (deux fois pour plus de détails)"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr "Rechercher les paquets par mainteneur"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr "Rechercher les paquets par nom"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr "Colorier la sortie"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr "Afficher les informations de débogage"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr "Écraser les fichiers existants lors du téléchargement"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-msgid "Print formatted"
-msgstr "Afficher de manière formatée"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr "Afficher l’aide et quitter"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr "Ignorer la mise à jour d’un paquet"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr "Ignorer un dépôt binaire lors de la recherche de mises à jour"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr "Spécifier un séparateur de liste"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr "Afficher moins de choses"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr "Télécharger les cibles dans DOSSIER"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr "Limiter le nombre de processus légers créés (10 par défaut)"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr "Délai d’attente en secondes pour curl"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr "Afficher plus de choses"
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -45808,90 +45695,6 @@ msgstr "Même système de fichiers"
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr "Nom de l’hôte distant"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr "Paramétrer l’option keepalive"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr "Adresse IP numérique, sans résolution DNS"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr "Adresse source locale"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr "Paramétrer le Type de service"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr "Lister tous les profils disponibles pour la sélection automatique"
@@ -51595,23 +51398,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-#, fuzzy
-msgid "Filter manually started daemons"
-msgstr "Reconstruire et installer un paquet installé"
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -65057,10 +64843,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -65092,10 +64874,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr "Évaluer le paramètre comme une commande"
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr "Alias pour la commande gettext"
@@ -65112,14 +64890,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -65471,10 +65241,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -65515,12 +65281,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr "Compléter la sous-commande"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr "Compléter en utilisant les fichiers"
@@ -65609,7 +65369,6 @@ msgstr ""
 "actuelle"
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr "Obtenir une liste des paquets installés"
 
@@ -65637,16 +65396,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -65765,27 +65514,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
-msgid "Print arch daemons"
-msgstr "Afficher les démons arch"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr "Afficher les services installés"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -65794,12 +65530,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 #, fuzzy
 msgid "Print a list of local groups"
@@ -65825,10 +65555,6 @@ msgstr "Afficher les options lpr"
 msgid "Print lpr printers"
 msgstr "Afficher les imprimantes lpr"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr "Afficher les colonnes lsblk disponibles"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr "Afficher les périphériques"
@@ -65854,66 +65580,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr "Omettre les dossiers pour la préservation des horodatages"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-#, fuzzy
-msgid "Print all available xdg desktop file IDs"
-msgstr "Lister tous les greffons disponibles"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
-msgid "Print xrandr modes"
-msgstr "Afficher tous les noms"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-msgid "Print xrandr outputs"
-msgstr "Afficher les sorties xrandr"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr "Afficher les fenêtres X"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr "Liste les marque-pages ZFS, si la fonctionnalité est activée"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr "Liste les systèmes de fichiers ZFS"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr "Liste les instantanés ZFS"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr "Liste les volumess ZFS"
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr "Vérifier si prt-get doit encore se faire donner la commande"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-"Vérifier si prt-get doit avoir les paquets comme complétions potentielles"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-"Vérifier si prt-get doit avoir les ports comme complétions potentielles"
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -65946,10 +65628,6 @@ msgstr ""
 "Vérifier si une option spécifique a été donnée sur la ligne de commande "
 "actuelle"
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 76885be55..5c813bf59 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3294,40 +3294,6 @@ msgstr ""
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-msgid "%s: invalid option -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
@@ -4209,7 +4175,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -4791,7 +4756,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -12586,82 +12550,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-msgid "Print formatted"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -42857,90 +42745,6 @@ msgstr ""
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr ""
@@ -48444,22 +48248,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-msgid "Filter manually started daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -61523,10 +61311,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -61557,10 +61341,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr ""
@@ -61577,14 +61357,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -61933,10 +61705,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -61977,12 +61745,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr ""
@@ -62066,7 +61828,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr ""
 
@@ -62094,16 +61855,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -62218,26 +61969,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-msgid "Print arch daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -62246,12 +61985,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 msgid "Print a list of local groups"
 msgstr ""
@@ -62276,10 +62009,6 @@ msgstr ""
 msgid "Print lpr printers"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr ""
@@ -62304,62 +62033,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-msgid "Print all available xdg desktop file IDs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-msgid "Print xrandr modes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-msgid "Print xrandr outputs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -62389,10 +62078,6 @@ msgstr ""
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 6d0e889a1..05532bc36 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3294,40 +3294,6 @@ msgstr ""
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-msgid "%s: invalid option -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
@@ -4791,7 +4757,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -12586,82 +12551,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-msgid "Print formatted"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -42857,90 +42746,6 @@ msgstr ""
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr ""
@@ -48444,22 +48249,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-msgid "Filter manually started daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -61523,10 +61312,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -61557,10 +61342,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr ""
@@ -61577,14 +61358,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -61933,10 +61706,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -61977,12 +61746,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr ""
@@ -62066,7 +61829,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr ""
 
@@ -62094,16 +61856,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -62218,26 +61970,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-msgid "Print arch daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -62246,12 +61986,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 msgid "Print a list of local groups"
 msgstr ""
@@ -62276,10 +62010,6 @@ msgstr ""
 msgid "Print lpr printers"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr ""
@@ -62304,62 +62034,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-msgid "Print all available xdg desktop file IDs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-msgid "Print xrandr modes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-msgid "Print xrandr outputs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -62389,10 +62079,6 @@ msgstr ""
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 03dea99e1..d2f511284 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3346,44 +3346,6 @@ msgstr ""
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr "%s %s: Oczekiwano argumentu -- '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-#, fuzzy
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s: Nieprawidłowa opcja -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-#, fuzzy
-msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s: Opcja wymaga argumentu -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-#, fuzzy
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s: Oczekiwano argumentu -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-#, fuzzy
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr "%s: Funkcja '%ls' już istnieje. Nie można utworzyć kopii\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 #, fuzzy
 msgid "%s: Name cannot be empty\\n"
@@ -4281,7 +4243,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -4868,7 +4829,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -12736,83 +12696,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-#, fuzzy
-msgid "Print formatted"
-msgstr "Zwraca sformatowany tekst"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -43260,90 +43143,6 @@ msgstr ""
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr ""
@@ -48884,22 +48683,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-msgid "Filter manually started daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -62108,10 +61891,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -62144,10 +61923,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr ""
@@ -62164,14 +61939,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -62522,10 +62289,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -62566,12 +62329,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr ""
@@ -62655,7 +62412,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr ""
 
@@ -62683,16 +62439,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -62808,27 +62554,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
-msgid "Print arch daemons"
-msgstr "Wypisz argumenty"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -62837,12 +62570,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 #, fuzzy
 msgid "Print a list of local groups"
@@ -62869,10 +62596,6 @@ msgstr ""
 msgid "Print lpr printers"
 msgstr "Wypisz argumenty"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr ""
@@ -62897,64 +62620,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-msgid "Print all available xdg desktop file IDs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
-msgid "Print xrandr modes"
-msgstr "Wypisz argumenty"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-#, fuzzy
-msgid "Print xrandr outputs"
-msgstr "Wypisz argumenty"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -62984,10 +62665,6 @@ msgstr ""
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bbbbef369..6d1c99387 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3489,44 +3489,6 @@ msgstr "%s %s: Função “%s” já existe. Não é possivel criar cópia “%s
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr "%s %s: Esperava argumento -- '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-#, fuzzy
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s: Opção inválida -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-#, fuzzy
-msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s: Opção requer argumento -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-#, fuzzy
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s: Esperava argumento -- %s\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-#, fuzzy
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr "%s: Unknown option “%s”\\n"
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 #, fuzzy
 msgid "%s: Name cannot be empty\\n"
@@ -5154,7 +5116,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -13805,100 +13766,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-#, fuzzy
-msgid "Show output in a more script friendly format"
-msgstr "Output profiling information to specified file"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-#, fuzzy
-msgid "Download [twice to fetch dependencies]"
-msgstr "Show state of dependencies"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-#, fuzzy
-msgid "Search for packages by maintainer"
-msgstr "Search package containing pattern"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-#, fuzzy
-msgid "Search for packages by name"
-msgstr "Search full package name"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-#, fuzzy
-msgid "Check AUR packages for updates"
-msgstr "Create compressed patches"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-#, fuzzy
-msgid "Use colored output"
-msgstr "Use colors"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-#, fuzzy
-msgid "Show debug output"
-msgstr "Turn on debug output"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-#, fuzzy
-msgid "Overwrite existing files when downloading"
-msgstr "Overwrite modified files with clean copies"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-#, fuzzy
-msgid "Print formatted"
-msgstr "Imprime texto formatado"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-#, fuzzy
-msgid "Display help and quit"
-msgstr "Display help and exit"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-#, fuzzy
-msgid "Ignore a package upgrade"
-msgstr "Ignore package Holds"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-#, fuzzy
-msgid "Ignore a binary repo when checking for updates"
-msgstr "Ignore ancestry when calculating merge"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-#, fuzzy
-msgid "Specify a delimiter for list formatters"
-msgstr "Specify directory for rpm database"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-#, fuzzy
-msgid "Output less"
-msgstr "Output file"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-#, fuzzy
-msgid "Download targets to DIR"
-msgstr "Don't unlock targets"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-#, fuzzy
-msgid "Limit the number of threads created [10]"
-msgstr "Only print number of matches"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-#, fuzzy
-msgid "Curl timeout in seconds"
-msgstr "Minimum interval in seconds"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-#, fuzzy
-msgid "Output more"
-msgstr "Output trace"
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 #, fuzzy
@@ -46505,97 +46372,6 @@ msgstr "Show all filesystems"
 msgid "Exclude files that match any pattern in file"
 msgstr "Exclude files thet match pattern in file"
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-#, fuzzy
-msgid "Remote hostname"
-msgstr "Remove an entry for hostname"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-#, fuzzy
-msgid "Allow broadcasts"
-msgstr "Allow pinging a broadcast address"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-#, fuzzy
-msgid "Set keepalive option"
-msgstr "Set a config option"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-#, fuzzy
-msgid "Numeric-only IP addresses, no DNS"
-msgstr "Numerical address"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-#, fuzzy
-msgid "Local port number"
-msgstr "Show record number"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-#, fuzzy
-msgid "Local source address"
-msgstr "Root source tree"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-#, fuzzy
-msgid "Set Type of Service"
-msgstr "Stop service"
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 #, fuzzy
 msgid "List all available profiles for automatic selection"
@@ -52661,24 +52437,6 @@ msgstr "Run fish with this command"
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-#, fuzzy
-msgid "Filter started daemons"
-msgstr "Print all names"
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-#, fuzzy
-msgid "Filter manually started daemons"
-msgstr "Query all installed packages"
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -67168,10 +66926,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -67206,10 +66960,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr "Edit a property with an external editor on targets"
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr "Evaluate parameters as a command"
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 #, fuzzy
 msgid "Alias for the gettext command"
@@ -67228,14 +66978,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 #, fuzzy
 msgid "List archive contents"
@@ -67610,11 +67352,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr "Print a list of running screen sessions"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-#, fuzzy
-msgid "Complete setxkb options"
-msgstr "Tolerate sloppy mount options"
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 #, fuzzy
 msgid "common completions for ssh commands"
@@ -67657,12 +67394,6 @@ msgstr "Opções"
 msgid "Complete subcommand"
 msgstr "Compare FILE1 to all operands"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 #, fuzzy
 msgid "Complete using files"
@@ -67758,7 +67489,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr "Test if apt has yet to be given the subcommand"
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 #, fuzzy
 msgid "Obtain a list of installed packages"
 msgstr "Rebuild and install an installed package"
@@ -67790,16 +67520,6 @@ msgstr "Display change information for the package"
 msgid "Command used to find descriptions for commands"
 msgstr "Use function keys for commands"
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -67924,31 +67644,16 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-#, fuzzy
-msgid "Obtain a list of ports local collections"
-msgstr "Print a list of all accepted color names"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 #, fuzzy
 msgid "Print a list of known network addresses"
 msgstr "Print a list of running screen sessions"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
-msgid "Print arch daemons"
-msgstr "Print all names"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 #, fuzzy
 msgid "Print a list of documented fish commands"
 msgstr "Print a list of all accepted color names"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-#, fuzzy
-msgid "Prints services installed"
-msgstr "Print service status"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -67958,14 +67663,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr "Print a list of all accepted color names"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-#, fuzzy
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-"Print a list of all function calls leading up to running the current command"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 #, fuzzy
 msgid "Print a list of local groups"
@@ -67996,11 +67693,6 @@ msgstr "Print all versions"
 msgid "Print lpr printers"
 msgstr "Print full records"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-#, fuzzy
-msgid "Print available lsblk columns"
-msgstr "Print available list"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 #, fuzzy
 msgid "Print mounted devices"
@@ -68030,75 +67722,26 @@ msgstr "Print a list of all accepted color names"
 msgid "Print directories where desktop files are stored"
 msgstr "Lista diretórios, não seu conteúdo"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-#, fuzzy
-msgid "Print all available xdg desktop file IDs"
-msgstr "List names of available signals"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 #, fuzzy
 msgid "Print XDG mime types"
 msgstr "Print command type"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
-msgid "Print xrandr modes"
-msgstr "Print raw entry names"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-#, fuzzy
-msgid "Print xrandr outputs"
-msgstr "Print word counts"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 #, fuzzy
 msgid "Print X windows"
 msgstr "Print APM info"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-#, fuzzy
-msgid "Lists ZFS filesystems"
-msgstr "Show all filesystems"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 #, fuzzy
 msgid "Lists ZFS snapshots"
 msgstr "Lista as chaves"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-#, fuzzy
-msgid "Lists ZFS volumes"
-msgstr "Lista por colunas"
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 #, fuzzy
 msgid "Write out the prompt"
 msgstr "Write out the prompt"
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-#, fuzzy
-msgid "Test if prt-get has yet to be given the command"
-msgstr "Test if apt has yet to be given the subcommand"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-#, fuzzy
-msgid "Obtain a list of ports"
-msgstr "Print a list of all accepted color names"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-#, fuzzy
-msgid "Test if prt-get should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-#, fuzzy
-msgid "Test if prt-get should have ports as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 #, fuzzy
@@ -68131,10 +67774,6 @@ msgstr "Current functions are: "
 msgid "Call systemctl with some options from the current commandline"
 msgstr "Test if apt has yet to be given the subcommand"
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index d298c438e..1ab5d6fc2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3298,40 +3298,6 @@ msgstr ""
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-msgid "%s: invalid option -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
@@ -4213,7 +4179,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -4795,7 +4760,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -12590,82 +12554,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-msgid "Print formatted"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -42861,90 +42749,6 @@ msgstr ""
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr ""
@@ -48448,22 +48252,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-msgid "Filter manually started daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -61527,10 +61315,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -61561,10 +61345,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr ""
@@ -61581,14 +61361,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -61937,10 +61709,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -61981,12 +61749,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr ""
@@ -62070,7 +61832,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr ""
 
@@ -62098,16 +61859,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -62222,26 +61973,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-msgid "Print arch daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -62250,12 +61989,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 msgid "Print a list of local groups"
 msgstr ""
@@ -62280,10 +62013,6 @@ msgstr ""
 msgid "Print lpr printers"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr ""
@@ -62308,62 +62037,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-msgid "Print all available xdg desktop file IDs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-msgid "Print xrandr modes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-msgid "Print xrandr outputs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -62393,10 +62082,6 @@ msgstr ""
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e80c66d28..37ad0289f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3332,43 +3332,6 @@ msgstr "%s %s：函数 “%s” 不存在 %s\\n"
 msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr "%s %s：应有一个参数，提供了 %s 个\\n"
 
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:1
-#, fuzzy
-msgid "%s: invalid option -- %s\\n"
-msgstr "%s：进程id %s 非法\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:2
-msgid "%s: %s cannot be specified along with %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:3
-msgid "%s: option requires an argument -- %s\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:4
-#, fuzzy
-msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%s：应有一个参数，提供了 %s 个\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:5
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:8
-msgid "%s: abbreviation cannot have spaces in the key\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:6
-msgid "%s: abbreviation must have a value\\n"
-msgstr ""
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:7
-#, fuzzy
-msgid "%s: abbreviation '%s' already exists, cannot rename\\n"
-msgstr "%s：函数 “%s” 不存在\\n"
-
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:9
-#: /tmp/fish/explicit/share/functions/abbr_old.fish:10
-msgid "%s: no such abbreviation '%s'\\n"
-msgstr ""
-
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
@@ -4268,7 +4231,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/echo.fish:5
 #: /tmp/fish/implicit/share/completions/entr.fish:3
 #: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/eval.fish:1
 #: /tmp/fish/implicit/share/completions/exec.fish:1
 #: /tmp/fish/implicit/share/completions/exit.fish:1
 #: /tmp/fish/implicit/share/completions/fg.fish:1
@@ -4854,7 +4816,6 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:2
 #: /tmp/fish/implicit/share/completions/mocha.fish:1
 #: /tmp/fish/implicit/share/completions/modinfo.fish:11
-#: /tmp/fish/implicit/share/completions/netcat.fish:7
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:1
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
@@ -12718,83 +12679,6 @@ msgstr ""
 msgid "Enhance or reduce the image contrast"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cower.fish:1
-msgid "Show output in a more script friendly format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:2
-msgid "Download [twice to fetch dependencies]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:3
-msgid "Show info for target [twice for more details]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:4
-msgid "Search for packages by maintainer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:5
-msgid "Search for packages by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:6
-msgid "Check AUR packages for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:7
-msgid "Use colored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:8
-msgid "Show debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:9
-msgid "Overwrite existing files when downloading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:10
-#, fuzzy
-msgid "Print formatted"
-msgstr "显示命令类型"
-
-#: /tmp/fish/implicit/share/completions/cower.fish:11
-msgid "Display help and quit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:12
-msgid "Ignore a package upgrade"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:13
-msgid "Ignore a binary repo when checking for updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:14
-msgid "Specify a delimiter for list formatters"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:15
-msgid "Output less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:16
-msgid "Download targets to DIR"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:17
-msgid "Limit the number of threads created [10]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:18
-msgid "Curl timeout in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cower.fish:19
-msgid "Output more"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
 msgid "Specify eye string"
@@ -43234,90 +43118,6 @@ msgstr ""
 msgid "Exclude files that match any pattern in file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/netcat.fish:1
-msgid "Remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:2
-msgid "Same as -e, but use /bin/sh"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:3
-msgid "Program to execute after connection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:4
-msgid "Allow broadcasts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:5
-msgid "Source-routing hop points"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:6
-msgid "Source-routing pointer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:8
-msgid "Delay interval for lines sent, ports scaned"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:9
-msgid "Set keepalive option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:10
-msgid "Listen mode, acts as a server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:11
-msgid "Numeric-only IP addresses, no DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:12
-msgid "Hex dump of traffic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:13
-msgid "Local port number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:14
-msgid "Randomize local and remote ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:15
-msgid "Quit after EOF on stdin and delay of secs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:16
-msgid "Local source address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:17
-msgid "Answer Telnet negotiation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:18
-msgid "UDP Mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:19
-msgid "Verbose, use twice to be more verbose"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:20
-msgid "Timeout for connects and final net reads"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:21
-msgid "Set Type of Service"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/netcat.fish:22
-msgid "No I/O - used for scanning"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
 msgid "List all available profiles for automatic selection"
 msgstr ""
@@ -48855,22 +48655,6 @@ msgstr ""
 msgid "Show the full path for the given Ruby command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rc.d.fish:1
-msgid "Filter started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:2
-msgid "Filter stopped daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:3
-msgid "Filter auto started daemons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rc.d.fish:4
-msgid "Filter manually started daemons"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rc-service.fish:1
 msgid "Tests if the service exists or not"
 msgstr ""
@@ -62066,10 +61850,6 @@ msgstr ""
 msgid "Manage abbreviations using new fish 3.0 scheme."
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/abbr_old.fish:1
-msgid "Manage abbreviations using old fish 2.x scheme."
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/alias.fish:1
 msgid "Creates a function wrapping a command"
 msgstr ""
@@ -62102,10 +61882,6 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/eval.fish:1
-msgid "Evaluate parameters as a command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/_.fish:1
 #, fuzzy
 msgid "Alias for the gettext command"
@@ -62123,14 +61899,6 @@ msgstr ""
 msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_abook_formats.fish:1
-msgid "Complete abook formats"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_ant_targets.fish:1
-msgid "Print list of targets from build.xml and imported files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 msgid "List archive contents"
 msgstr ""
@@ -62482,10 +62250,6 @@ msgstr ""
 msgid "Complete by list of running processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_setxkbmap.fish:1
-msgid "Complete setxkb options"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
@@ -62526,12 +62290,6 @@ msgstr ""
 msgid "Complete subcommand"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_subcommand_root.fish:1
-msgid ""
-"Run the __fish_complete_subcommand function using a PATH containing /sbin "
-"and /usr/sbin"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
 msgid "Complete using files"
 msgstr ""
@@ -62615,7 +62373,6 @@ msgid "Checks if a specific option has been given in the current commandline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#: /tmp/fish/implicit/share/functions/__fish_prt_packages.fish:1
 msgid "Obtain a list of installed packages"
 msgstr ""
 
@@ -62643,16 +62400,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_fallback_prompt.fish:1
-msgid ""
-"A simple fallback prompt without too much color or special characters for "
-"linux VTs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_filter_ant_targets.fish:1
-msgid "Display targets within an ant build.xml file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
 msgid "Helper function for __fish_git_prompt"
 msgstr ""
@@ -62768,27 +62515,14 @@ msgstr ""
 msgid "Paginate the current command using the users default pager"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_ports_dirs.fish:1
-msgid "Obtain a list of ports local collections"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 msgid "Print a list of known network addresses"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
-msgid "Print arch daemons"
-msgstr "打印单词计数"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 msgid "Print a list of documented fish commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_debian_services.fish:1
-msgid "Prints services installed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
@@ -62797,12 +62531,6 @@ msgstr ""
 msgid "Print a list of all known filesystem types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_function_prototypes.fish:1
-msgid ""
-"Prints the names of all function prototypes found in the headers in the "
-"current directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 #, fuzzy
 msgid "Print a list of local groups"
@@ -62829,10 +62557,6 @@ msgstr ""
 msgid "Print lpr printers"
 msgstr "打印单词计数"
 
-#: /tmp/fish/implicit/share/functions/__fish_print_lsblk_columns.fish:1
-msgid "Print available lsblk columns"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
 msgstr ""
@@ -62857,64 +62581,22 @@ msgstr ""
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xdg_desktop_file_ids.fish:1
-msgid "Print all available xdg desktop file IDs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
-msgid "Print xrandr modes"
-msgstr "打印单词计数"
-
-#: /tmp/fish/implicit/share/functions/__fish_print_xrandr_outputs.fish:1
-#, fuzzy
-msgid "Print xrandr outputs"
-msgstr "打印单词计数"
-
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 msgid "Print X windows"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_bookmarks.fish:1
-msgid "Lists ZFS bookmarks, if the feature is enabled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_filesystems.fish:1
-msgid "Lists ZFS filesystems"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_zfs_volumes.fish:1
-msgid "Lists ZFS volumes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_prt_no_subcommand.fish:1
-msgid "Test if prt-get has yet to be given the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_ports.fish:1
-msgid "Obtain a list of ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_package.fish:1
-msgid "Test if prt-get should have packages as potential completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_prt_use_port.fish:1
-msgid "Test if prt-get should have ports as potential completion"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 msgid "Show current path"
@@ -62945,10 +62627,6 @@ msgstr ""
 msgid "Call systemctl with some options from the current commandline"
 msgstr "设置或取得命令行"
 
-#: /tmp/fish/implicit/share/functions/__fish_test_arg.fish:1
-msgid "Test if the token under the cursor matches the specified wildcard"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""

From 16dc60600198ad73c44273f3a14fc73e537fe887 Mon Sep 17 00:00:00 2001
From: Dan Martinez <dfm@razorwind.org>
Date: Wed, 11 Dec 2019 13:24:29 -0800
Subject: [PATCH 1370/1732] Add the `--short` flag to `type` (#6403)

* Add the `--succinct` flag to `type`

* Use `echo` rather than `printf`

* Change `succinct` to `short`; print path if known

* Clean up the printing logic ever so slightly
---
 share/functions/type.fish    | 19 ++++++++++++++++---
 sphinx_doc_src/cmds/type.rst |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/share/functions/type.fish b/share/functions/type.fish
index 7145056c3..5a06f3fd9 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -3,7 +3,7 @@ function type --description 'Print the type of a command'
     set -q argv[1]
     or return 1
 
-    set -l options 'h/help' 'a/all' 'f/no-functions' 't/type' 'p/path' 'P/force-path' 'q/quiet'
+    set -l options 'h/help' 'a/all' 's/short' 'f/no-functions' 't/type' 'p/path' 'P/force-path' 'q/quiet'
     argparse -n type -x t,p,P $options -- $argv
     or return
 
@@ -16,6 +16,7 @@ function type --description 'Print the type of a command'
     set -l mode normal
     set -l multi no
     set -l selection all
+    set -l short no
 
     # Technically all four of these flags are mutually exclusive. However, we allow -q to be used
     # with the other three because old versions of this function explicitly allowed it by making
@@ -34,6 +35,9 @@ function type --description 'Print the type of a command'
     set -q _flag_all
     and set multi yes
 
+    set -q _flag_short
+    and set short yes
+
     set -q _flag_no_functions
     and set selection files
 
@@ -48,8 +52,17 @@ function type --description 'Print the type of a command'
                 set found 1
                 switch $mode
                     case normal
-                        printf (_ '%s is a function with definition\n') $i
-                        functions $i
+                        printf (_ '%s is a function') $i
+                        if test $short != yes
+                            echo (_ ' with definition')
+                            functions $i
+                        else
+                            set -l func_path (functions --details $i)
+                            if test $func_path != -
+                                printf (_ ' (defined in %s)') $func_path
+                            end
+                            echo
+                        end
                     case type
                         echo (_ 'function')
                     case path
diff --git a/sphinx_doc_src/cmds/type.rst b/sphinx_doc_src/cmds/type.rst
index 6a8627790..c362abe3c 100644
--- a/sphinx_doc_src/cmds/type.rst
+++ b/sphinx_doc_src/cmds/type.rst
@@ -20,6 +20,8 @@ The following options are available:
 
 - ``-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``.
+
 - ``-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.

From c0b3be9fb4ce09640c43b5b7cd7022c5a8c761d3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 11 Dec 2019 16:34:20 -0800
Subject: [PATCH 1371/1732] Stop storing block_io in job_t

Prior to this fix, a job would hold onto any IO redirections from its
parent. For example:

    begin
        echo a
    end < file.txt

The "echo a" job would hold a reference to the I/O redirection.
The problem is that jobs then extend the life of pipes until the job is
cleaned up. This can prevent pipes from closing, leading to hangs.

Fix this by not storing the block IO; this ensures that jobs do not
prolong the life of pipes.

Fixes #6397
---
 src/exec.cpp                       | 39 ++++++++++++++++++------------
 src/exec.h                         |  3 ++-
 src/parse_execution.cpp            |  2 +-
 src/proc.cpp                       | 20 +++------------
 src/proc.h                         | 19 ++++-----------
 tests/checks/self-signal-usr1.fish | 17 +++++++++++++
 6 files changed, 52 insertions(+), 48 deletions(-)
 create mode 100644 tests/checks/self-signal-usr1.fish

diff --git a/src/exec.cpp b/src/exec.cpp
index 78b93772d..ea5d4da96 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -827,10 +827,11 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
                                                   const io_chain_t &io_chain) {
     assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
            "Unexpected process type");
-    // Construct a lineage, starting from the job's lineage.
-    job_lineage_t lineage = job->lineage();
-    lineage.block_io = io_chain;
+    // Make a lineage for our children.
+    job_lineage_t lineage;
     lineage.parent_pgid = (job->pgid == INVALID_PID ? none() : maybe_t<pid_t>(job->pgid));
+    lineage.block_io = io_chain;
+    lineage.root_constructed = job->root_constructed;
 
     if (p->type == process_type_t::block_node) {
         const parsed_source_ref_t &source = p->block_node_source;
@@ -938,9 +939,9 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 /// in any child. If \p is_deferred_run is true, then this is a deferred run; this affects how
 /// certain buffering works. \returns true on success, false on exec error.
 static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
-                                autoclose_pipes_t pipes, const io_chain_t &all_ios,
-                                const autoclose_pipes_t &deferred_pipes, size_t stdout_read_limit,
-                                bool is_deferred_run = false) {
+                                const io_chain_t &block_io, autoclose_pipes_t pipes,
+                                const io_chain_t &all_ios, const autoclose_pipes_t &deferred_pipes,
+                                size_t stdout_read_limit, bool is_deferred_run = false) {
     // The write pipe (destined for stdout) needs to occur before redirections. For example,
     // with a redirection like this:
     //
@@ -976,7 +977,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
     }
 
     // The IO chain for this process.
-    io_chain_t process_net_io_chain = j->block_io_chain();
+    io_chain_t process_net_io_chain = block_io;
     if (pipes.write.valid()) {
         process_net_io_chain.push_back(std::make_shared<io_pipe_t>(
             p->pipe_write_fd, false /* not input */, std::move(pipes.write)));
@@ -1119,7 +1120,7 @@ static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
     DIE("unreachable");
 }
 
-bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
+bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineage) {
     assert(j && "null job_t passed to exec_job!");
 
     // Set to true if something goes wrong while executing the job, in which case the cleanup
@@ -1135,9 +1136,10 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == getpgrp());
 
     // If our lineage indicates a pgid, share it.
-    if (auto parent_pgid = j->lineage().parent_pgid) {
-        assert(*parent_pgid != INVALID_PID && "parent pgid should be none, not INVALID_PID");
-        j->pgid = *parent_pgid;
+    if (lineage.parent_pgid.has_value()) {
+        assert(*lineage.parent_pgid != INVALID_PID &&
+               "parent pgid should be none, not INVALID_PID");
+        j->pgid = *lineage.parent_pgid;
         j->mut_flags().job_control = true;
     }
 
@@ -1146,7 +1148,12 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     }
 
     const size_t stdout_read_limit = parser.libdata().read_limit;
-    io_chain_t all_ios = j->all_io_redirections();
+
+    // Get the list of all IOs so we can ensure our pipes do not conflict.
+    io_chain_t all_ios = lineage.block_io;
+    for (const auto &p : j->processes) {
+        all_ios.append(p->io_chain());
+    }
 
     // Handle an exec call.
     if (j->processes.front()->type == process_type_t::exec) {
@@ -1196,8 +1203,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
         if (p.get() == deferred_process) {
             deferred_pipes = std::move(proc_pipes);
         } else {
-            if (!exec_process_in_job(parser, p.get(), j, std::move(proc_pipes), all_ios,
-                                     deferred_pipes, stdout_read_limit)) {
+            if (!exec_process_in_job(parser, p.get(), j, lineage.block_io, std::move(proc_pipes),
+                                     all_ios, deferred_pipes, stdout_read_limit)) {
                 exec_error = true;
                 break;
             }
@@ -1208,8 +1215,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j) {
     // Now execute any deferred process.
     if (!exec_error && deferred_process) {
         assert(deferred_pipes.write.valid() && "Deferred process should always have a write pipe");
-        if (!exec_process_in_job(parser, deferred_process, j, std::move(deferred_pipes), all_ios,
-                                 {}, stdout_read_limit, true)) {
+        if (!exec_process_in_job(parser, deferred_process, j, lineage.block_io,
+                                 std::move(deferred_pipes), all_ios, {}, stdout_read_limit, true)) {
             exec_error = true;
         }
     }
diff --git a/src/exec.h b/src/exec.h
index ce3faf2a7..37fee0b25 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -13,8 +13,9 @@
 
 /// Execute the processes specified by \p j in the parser \p.
 class job_t;
+struct job_lineage_t;
 class parser_t;
-bool exec_job(parser_t &parser, std::shared_ptr<job_t> j);
+bool exec_job(parser_t &parser, std::shared_ptr<job_t> j, const job_lineage_t &lineage);
 
 /// Evaluate the expression cmd in a subshell, add the outputs into the list l. On return, the
 /// status flag as returned bu \c proc_gfet_last_status will not be changed.
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index bde328e00..f972fa422 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1348,7 +1348,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         }
 
         // Actually execute the job.
-        if (!exec_job(*this->parser, job)) {
+        if (!exec_job(*this->parser, job, lineage)) {
             remove_job(*this->parser, job.get());
         }
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 372be6d61..71b17d3e2 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -168,7 +168,7 @@ bool job_t::should_report_process_exits() const {
     return false;
 }
 
-bool job_t::job_chain_is_fully_constructed() const { return *lineage().root_constructed; }
+bool job_t::job_chain_is_fully_constructed() const { return *root_constructed; }
 
 bool job_t::signal(int signal) {
     // Presumably we are distinguishing between the two cases below because we do
@@ -269,24 +269,12 @@ void process_t::check_generations_before_launch() {
 }
 
 job_t::job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage)
-    : properties(props), job_lineage(std::move(lineage)), job_id(job_id) {
-    if (!job_lineage.root_constructed) {
-        // We are the root job, share our constructed pointer.
-        job_lineage.root_constructed = this->constructed;
-    }
-}
+    : properties(props),
+      job_id(job_id),
+      root_constructed(lineage.root_constructed ? lineage.root_constructed : this->constructed) {}
 
 job_t::~job_t() { release_job_id(job_id); }
 
-/// Return all the IO redirections. Start with the block IO, then walk over the processes.
-io_chain_t job_t::all_io_redirections() const {
-    io_chain_t result = this->block_io_chain();
-    for (const process_ptr_t &p : this->processes) {
-        result.append(p->io_chain());
-    }
-    return result;
-}
-
 void job_t::mark_constructed() {
     assert(!is_constructed() && "Job was already constructed");
     *constructed = true;
diff --git a/src/proc.h b/src/proc.h
index 067847f16..4cd507745 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -266,7 +266,8 @@ void release_job_id(job_id_t jid);
 
 /// Information about where a job comes from.
 /// This should be safe to copy across threads; in particular that means this cannot contain a
-/// job_t.
+/// job_t. It is also important that job_t not contain this: because it stores block IO, it will
+/// extend the life of the IO which may prevent pipes from closing in a timely manner. See #6397.
 struct job_lineage_t {
     /// The pgid of the parental job.
     /// If our job is "nested" as part of a function or block execution, and that function or block
@@ -308,9 +309,6 @@ class job_t {
     /// messages about job status on the terminal.
     wcstring command_str;
 
-    // The lineage associated with the job.
-    job_lineage_t job_lineage;
-
     // No copying.
     job_t(const job_t &rhs) = delete;
     void operator=(const job_t &) = delete;
@@ -387,6 +385,9 @@ class job_t {
     const std::shared_ptr<relaxed_atomic_bool_t> constructed =
         std::make_shared<relaxed_atomic_bool_t>(false);
 
+    /// Whether the root job is constructed; this may share a reference with 'constructed'.
+    const std::shared_ptr<relaxed_atomic_bool_t> root_constructed;
+
     /// Flags associated with the job.
     struct flags_t {
         /// Whether the user has been told about stopped job.
@@ -417,16 +418,6 @@ class job_t {
     /// \return if this job should own the terminal when it runs.
     bool should_claim_terminal() const { return properties.wants_terminal && is_foreground(); }
 
-    /// \return the job lineage.
-    const job_lineage_t &lineage() const { return job_lineage; }
-
-    /// Returns the block IO redirections associated with the job. These are things like the IO
-    /// redirections associated with the begin...end statement.
-    const io_chain_t &block_io_chain() const { return lineage().block_io; }
-
-    /// Fetch all the IO redirections associated with the job.
-    io_chain_t all_io_redirections() const;
-
     /// Mark this job as constructed. The job must not have previously been marked as constructed.
     void mark_constructed();
 
diff --git a/tests/checks/self-signal-usr1.fish b/tests/checks/self-signal-usr1.fish
new file mode 100644
index 000000000..15d45ee6b
--- /dev/null
+++ b/tests/checks/self-signal-usr1.fish
@@ -0,0 +1,17 @@
+#RUN: %fish %s
+
+# See #6397
+
+function f --on-signal USR1
+    begin
+        echo a
+        echo b
+    end | while read -l line
+        echo $line
+    end
+end
+
+kill -USR1 $fish_pid
+
+#CHECK: a
+#CHECK: b

From d22c7ab993fbfe0ced7cc94a0701bde55483a746 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 12 Dec 2019 09:07:58 +0100
Subject: [PATCH 1372/1732] enhance sudo completions

Flag e/edit does not take an argument, so `sudo -e a` TAB would complete
subcommands.

[ci skip]
---
 share/completions/sudo.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/completions/sudo.fish b/share/completions/sudo.fish
index 7889ebf49..5fd355f16 100644
--- a/share/completions/sudo.fish
+++ b/share/completions/sudo.fish
@@ -41,7 +41,7 @@ end
 complete -c sudo -n "__fish_no_arguments" -s h -d "Display help and exit"
 complete -c sudo -n "__fish_no_arguments" -s V -d "Display version information and exit"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s A -d "Ask for password via the askpass or \$SSH_ASKPASS program"
-complete -c sudo -n "__fish_sudo_no_subcommand" -s C -d "Close all file descriptors greater or equal to the given number" -a "(seq 0 255)"
+complete -c sudo -n "__fish_sudo_no_subcommand" -s C -d "Close all file descriptors greater or equal to the given number" -xa "0 1 2 255"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s E -d "Preserve environment"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s H -d "Set home"
 complete -c sudo -n "__fish_sudo_no_subcommand" -s K -d "Remove the credential timestamp entirely"
@@ -60,4 +60,4 @@ complete -c sudo -n "__fish_sudo_no_subcommand" -s u -a "(__fish_complete_users)
 complete -c sudo -n "__fish_sudo_no_subcommand" -s v -n "__fish_no_arguments" -d "Validate the credentials, extending timeout"
 
 # Complete the command we are executed under sudo
-complete -c sudo -x -a "(__fish_complete_sudo_subcommand)"
+complete -c sudo -x -n 'not __fish_seen_argument -s e' -a "(__fish_complete_sudo_subcommand)"

From 11d529557ab7756eb256a066458eb18f31d76e49 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Fri, 6 Dec 2019 07:32:42 +0900
Subject: [PATCH 1373/1732] Update `nmcli` completions

---
 share/completions/nmcli.fish | 70 ++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 11 deletions(-)

diff --git a/share/completions/nmcli.fish b/share/completions/nmcli.fish
index f1481d8bb..d2614b28a 100644
--- a/share/completions/nmcli.fish
+++ b/share/completions/nmcli.fish
@@ -1,3 +1,42 @@
+function __fish_nmcli_list_field_values
+    set -l command
+    set -l description
+
+    for i in $argv
+        switch $i
+            case id
+                set command "nmcli -g NAME connection show"
+                set description "Connection name"
+            case uuid
+                set command "nmcli -g UUID connection show"
+                set description "Connection UUID"
+            case path
+                set command "nmcli -g DBUS-PATH connection show"
+                set description "D-Bus static connection path"
+            case apath
+                set command "nmcli -g ACTIVE-PATH connection show --active"
+                set description "D-Bus active connection path"
+            case ifname
+                set command "nmcli -g DEVICE device status"
+                set description "Interface name"
+            case ssid
+                set command "nmcli -g SSID device wifi list"
+                set description "SSID"
+            case bssid
+                set command "nmcli -g BSSID device wifi list"
+                set description "BSSID"
+            case '*'
+                return 1
+        end
+
+        if $command | string length -q
+            printf '%s\n' ($command | string trim | string replace -rf '^(.+)$' '$1\t'$description'')
+        else
+            printf '%s\t%s\n' $i $description
+        end
+    end
+end
+
 set -l nmcli_commands general networking radio connection device agent monitor help
 set -l nmcli_general status hostname permissions logging help
 set -l nmcli_networking on off connectivity help
@@ -47,33 +86,42 @@ complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_see
 complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "edit" -d "Interactive edit"
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l active -d 'List only active profiles'
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l order -d 'Custom connection ordering'
-complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa 'id uuid path apath help'
-complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'id uuid path ifname help'
-complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'ap' -d 'Specify AP to connect to (only for Wi-Fi)'
+complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path apath) help'
+complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) ifname ap help'
+complete -c nmcli -n "contains_seq connection up ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq connection up ap -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
 complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'nsp' -d 'Specify NSP to connect to (only for WiMAX)'
 complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'passwd-file' -d 'password file to activate the connection'
-complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa 'id uuid path apath help'
+complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path apath) help'
 complete -c nmcli -n "contains_seq connection add -- (commandline -op)" -xa 'type ifname con-name autoconnect save master slave-type help'
+complete -c nmcli -n "contains_seq connection add ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
 complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -l temporary
-complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
 complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -l temporary
-complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa 'id uuid path help'
-complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa 'id uuid path type help'
+complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
+complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) type help'
 complete -c nmcli -n "contains_seq connection edit type -- (commandline -op)" -xa 'con-name'
-complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa 'id uuid path help'
-complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
+complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
 complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -l temporary
 complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -xa 'type file help'
-complete -c nmcli -n "contains_seq connection export -- (commandline -op)" -xa 'id uuid path help'
+complete -c nmcli -n "contains_seq connection export -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
 
 set -l wifi_commands list connect hotspot rescan help
 complete -c nmcli -n "__fish_seen_subcommand_from device; and not __fish_seen_subcommand_from $nmcli_device" -xa "$nmcli_device"
 complete -c nmcli -n "contains_seq device set -- (commandline -op)" -xa 'ifname autoconnect managed'
 complete -c nmcli -n "contains_seq device wifi -- (commandline -op); and not __fish_seen_subcommand_from $wifi_commands" -xa "$wifi_commands"
 complete -c nmcli -n "contains_seq device wifi list -- (commandline -op)" -xa 'ifname bssid'
-complete -c nmcli -n "contains_seq device wifi connect -- (commandline -op)" -xa 'password wep-key-type ifname bssid name private hidden'
+complete -c nmcli -n "contains_seq device wifi list ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq device wifi list bssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
+complete -c nmcli -n "contains_seq device wifi connect -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ssid bssid) password wep-key-type ifname bssid name private hidden'
+complete -c nmcli -n "contains_seq device wifi connect ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq device wifi connect bssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
 complete -c nmcli -n "contains_seq device wifi hotspot -- (commandline -op)" -xa 'ifname con-name ssid band channel password'
+complete -c nmcli -n "contains_seq device wifi hotspot ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
 complete -c nmcli -n "contains_seq device wifi rescan -- (commandline -op)" -xa 'ifname ssid'
+complete -c nmcli -n "contains_seq device wifi rescan ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq device wifi rescan ssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ssid)'
 complete -c nmcli -n "contains_seq device lldp -- (commandline -op)" -xa 'list'
 
 complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "secret" -d "Register nmcli as NM secret agent"

From a446085c4064a0f160977be9f715776e82e73331 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 12 Dec 2019 10:58:47 +0100
Subject: [PATCH 1374/1732] Update nmcli completions

Set variables for available connections and SSIDs only when the completion is loaded.
This is not perfect but faster than scanning for connections everytime.

Don't complete connection UUID, DBUS-PATH, ACTIVE-PATH because they are unintelligible.
Instead only complete the connection name.

See #6379

[ci skip]
---
 share/completions/nmcli.fish | 83 +++++++++++-------------------------
 1 file changed, 25 insertions(+), 58 deletions(-)

diff --git a/share/completions/nmcli.fish b/share/completions/nmcli.fish
index d2614b28a..15ebd07b9 100644
--- a/share/completions/nmcli.fish
+++ b/share/completions/nmcli.fish
@@ -1,41 +1,8 @@
-function __fish_nmcli_list_field_values
-    set -l command
-    set -l description
-
-    for i in $argv
-        switch $i
-            case id
-                set command "nmcli -g NAME connection show"
-                set description "Connection name"
-            case uuid
-                set command "nmcli -g UUID connection show"
-                set description "Connection UUID"
-            case path
-                set command "nmcli -g DBUS-PATH connection show"
-                set description "D-Bus static connection path"
-            case apath
-                set command "nmcli -g ACTIVE-PATH connection show --active"
-                set description "D-Bus active connection path"
-            case ifname
-                set command "nmcli -g DEVICE device status"
-                set description "Interface name"
-            case ssid
-                set command "nmcli -g SSID device wifi list"
-                set description "SSID"
-            case bssid
-                set command "nmcli -g BSSID device wifi list"
-                set description "BSSID"
-            case '*'
-                return 1
-        end
-
-        if $command | string length -q
-            printf '%s\n' ($command | string trim | string replace -rf '^(.+)$' '$1\t'$description'')
-        else
-            printf '%s\t%s\n' $i $description
-        end
-    end
-end
+set -l cname (string escape -- (nmcli -g NAME connection show --active)\t"Active connection")
+set -a cname (string escape -- (nmcli -g NAME connection show)\t"Connection")
+set -l ifname (string escape -- (nmcli -g DEVICE device status)\t"Interface name")
+set -l ssid (string escape -- (nmcli -g SSID device wifi list)\t"SSID")
+set -l bssid (string escape -- (nmcli -g BSSID device wifi list | string replace --all \\ '')\t"BSSID")
 
 set -l nmcli_commands general networking radio connection device agent monitor help
 set -l nmcli_general status hostname permissions logging help
@@ -86,42 +53,42 @@ complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_see
 complete -c nmcli -n "__fish_seen_subcommand_from connection; and not __fish_seen_subcommand_from $nmcli_connection" -xa "edit" -d "Interactive edit"
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l active -d 'List only active profiles'
 complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -l order -d 'Custom connection ordering'
-complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path apath) help'
-complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) ifname ap help'
-complete -c nmcli -n "contains_seq connection up ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
-complete -c nmcli -n "contains_seq connection up ap -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
+complete -c nmcli -n "contains_seq connection show -- (commandline -op)" -xa "help $cname" -k
+complete -c nmcli -n "contains_seq connection up -- (commandline -op) && not contains -- (commandline -op)[-1] ifname ap" -xa "help $cname" -k
+complete -c nmcli -n "contains_seq connection up -- (commandline -op) && test (commandline -op)[-1] = ifname" -xa "$ifname" -k
+complete -c nmcli -n "contains_seq connection up -- (commandline -op) && test (commandline -op)[-1] = ap" -xa "$bssid"
 complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'nsp' -d 'Specify NSP to connect to (only for WiMAX)'
 complete -c nmcli -n "contains_seq connection up -- (commandline -op)" -xa 'passwd-file' -d 'password file to activate the connection'
-complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path apath) help'
+complete -c nmcli -n "contains_seq connection down -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection add -- (commandline -op)" -xa 'type ifname con-name autoconnect save master slave-type help'
-complete -c nmcli -n "contains_seq connection add ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq connection add -- (commandline -op) && test (commandline -op)[-1] = ifname" -xa "$ifname"
 complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -l temporary
-complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
+complete -c nmcli -n "contains_seq connection modify -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -l temporary
-complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
-complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) type help'
+complete -c nmcli -n "contains_seq connection clone -- (commandline -op)" -xa "help $cname" -k
+complete -c nmcli -n "contains_seq connection edit -- (commandline -op)" -xa "type help $cname" -k
 complete -c nmcli -n "contains_seq connection edit type -- (commandline -op)" -xa 'con-name'
-complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
-complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
+complete -c nmcli -n "contains_seq connection delete -- (commandline -op)" -xa "help $cname" -k
+complete -c nmcli -n "contains_seq connection monitor -- (commandline -op)" -xa "help $cname" -k
 complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -l temporary
 complete -c nmcli -n "contains_seq connection import -- (commandline -op)" -xa 'type file help'
-complete -c nmcli -n "contains_seq connection export -- (commandline -op)" -xa '(__fish_nmcli_list_field_values id uuid path) help'
+complete -c nmcli -n "contains_seq connection export -- (commandline -op)" -xa "help $cname" -k
 
 set -l wifi_commands list connect hotspot rescan help
 complete -c nmcli -n "__fish_seen_subcommand_from device; and not __fish_seen_subcommand_from $nmcli_device" -xa "$nmcli_device"
 complete -c nmcli -n "contains_seq device set -- (commandline -op)" -xa 'ifname autoconnect managed'
 complete -c nmcli -n "contains_seq device wifi -- (commandline -op); and not __fish_seen_subcommand_from $wifi_commands" -xa "$wifi_commands"
 complete -c nmcli -n "contains_seq device wifi list -- (commandline -op)" -xa 'ifname bssid'
-complete -c nmcli -n "contains_seq device wifi list ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
-complete -c nmcli -n "contains_seq device wifi list bssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
-complete -c nmcli -n "contains_seq device wifi connect -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ssid bssid) password wep-key-type ifname bssid name private hidden'
-complete -c nmcli -n "contains_seq device wifi connect ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
-complete -c nmcli -n "contains_seq device wifi connect bssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values bssid)'
+complete -c nmcli -n "contains_seq device wifi list ifname -- (commandline -op)" -xa "$ifname"
+complete -c nmcli -n "contains_seq device wifi list bssid -- (commandline -op)" -xa "$bssid"
+complete -c nmcli -n "contains_seq device wifi connect -- (commandline -op)" -xa "$ssid $bssid password wep-key-type ifname bssid name private hidden" -k
+complete -c nmcli -n "contains_seq device wifi connect ifname -- (commandline -op)" -xa "$ifname"
+complete -c nmcli -n "contains_seq device wifi connect bssid -- (commandline -op)" -xa "$bssid"
 complete -c nmcli -n "contains_seq device wifi hotspot -- (commandline -op)" -xa 'ifname con-name ssid band channel password'
-complete -c nmcli -n "contains_seq device wifi hotspot ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
+complete -c nmcli -n "contains_seq device wifi hotspot ifname -- (commandline -op)" -xa "$ifname"
 complete -c nmcli -n "contains_seq device wifi rescan -- (commandline -op)" -xa 'ifname ssid'
-complete -c nmcli -n "contains_seq device wifi rescan ifname -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ifname)'
-complete -c nmcli -n "contains_seq device wifi rescan ssid -- (commandline -op)" -xa '(__fish_nmcli_list_field_values ssid)'
+complete -c nmcli -n "contains_seq device wifi rescan ifname -- (commandline -op)" -xa "$ifname"
+complete -c nmcli -n "contains_seq device wifi rescan ssid -- (commandline -op)" -xa "$ssid"
 complete -c nmcli -n "contains_seq device lldp -- (commandline -op)" -xa 'list'
 
 complete -c nmcli -n "__fish_seen_subcommand_from agent; and not __fish_seen_subcommand_from $nmcli_agent" -xa "secret" -d "Register nmcli as NM secret agent"

From f1e4dc7ca824ffe2387311e4d069a7da1ec4eef1 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Tue, 10 Dec 2019 23:26:30 +0100
Subject: [PATCH 1375/1732] Fixed completion for zpaq

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

diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
index 46bc6c025..95402f738 100644
--- a/share/completions/zpaq.fish
+++ b/share/completions/zpaq.fish
@@ -14,11 +14,11 @@ complete -c zpaq -f -n "not $seen $commands" -a add -d "Append files to archive
 complete -c zpaq -f -n "not $seen $commands" -a x -d "extract"
 complete -c zpaq -f -n "not $seen $commands" -a extract -d "Extract most recent versions of files"
 complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
-complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive by dates"
+complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive"
 
 #options
-complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories"
-complete -c zpaq -f -n "$seen $commands" -o f -d "-force"
+complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories" 
+complete -c zpaq -f -n "$seen $commands" -s f -d "-force"
 complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
 complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
 complete -c zpaq -f -n "$seen $command3" -o force -d "Overwrite existing output files"

From d23ea5f455f4944ecae7afba942aa47c3d3ac355 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Tue, 10 Dec 2019 23:29:02 +0100
Subject: [PATCH 1376/1732] Added completions for Keybase commands

---
 CHANGELOG.md                   |  1 +
 share/completions/keybase.fish | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 share/completions/keybase.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ac468648..6f7477bb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@
   - `irb` (#6260)
   - `iw` (#6232)
   - `kak`
+  - `keybase`
   - `lz4`, `lz4c` and `lz4cat` (#6364)
   - `mariner` (#5718)
   - `nethack` (#6240)
diff --git a/share/completions/keybase.fish b/share/completions/keybase.fish
new file mode 100644
index 000000000..d2059ae15
--- /dev/null
+++ b/share/completions/keybase.fish
@@ -0,0 +1,70 @@
+#Keybase 5.0.0
+
+function __fish_keybase_commandline_ends_with
+    set -l line (commandline -poc)
+    for i in (seq -1 -1 -(count $argv))
+        if test "$line[$i]" != "$argv[$i]"; return 1; end
+    end
+end
+
+#variables
+set -l ends __fish_keybase_commandline_ends_with
+set -l seen __fish_seen_subcommand_from
+#L0
+set -l c_keybase account blocks bot chat ctl currency decrypt deprovision device encrypt follow fs git h help id list-followers list-following log login logout oneshot paperkey passphrase pgp ping prove rekey selfprovision service sign signup sigs status team track unfollow untrack update verify version wallet
+#L1
+set -l c_keybase_account delete email h help lockdown recover-username upload-avatar
+set -l c_keybase_blocks h help list-users
+set -l c_keybase_bot h help signup token
+set -l c_keybase_chat add-to-channel api api-listen create-channel delete-channel delete-history download h help hide join-channel leave-channel list list-channels list-members list-unread ls lsur min-writer-role mute notification-settings read readd-member rename-channel report retention-policy search search-regexp send upload
+set -l c_keybase_ctl app-exit autostart h help init log-rotate redirector reload restart start stop watchdog watchdog2
+set -l c_keybase_currency add h help
+set -l c_keybase_device add h help list remove
+set -l c_keybase_fs clear-conflicts cp debug finish-resolving-conflicts get-status h help history kill ln ls mkdir mv ps quota read recover reset rm set-debug-level stat sync uploads write			
+set -l c_keybase_git create delete gc h help list settings
+set -l c_keybase_help advanced gpg keyring tor
+set -l c_keybase_log h help send
+set -l c_keybase_passphrase change check h help recover remember set
+set -l c_keybase_pgp decrypt drop encrypt export gen h help import list pull pull-private purge push-private select sign update verify
+set -l c_keybase_rekey h help paper status
+set -l c_keybase_sigs h help list revoke
+set -l c_keybase_team accept-invite add-member add-members-bulk api create delete edit-member h help ignore-request leave list-members list-memberships list-requests remove-member rename request-access settings show-tree
+set -l c_keybase_update check check-in-use notify
+set -l c_keybase_wallet accounts add-trustline api asset-search balances cancel cancel-request change-trustline-limit delete-trustline detail details export get-inflation get-started h help history import list lookup merge popular-assets reclaim rename request send send-path-payment set-currency set-inflation set-primary sign
+#L2
+set -l c_keybase_fs_sync disable enable h help show
+#...
+
+#global options
+complete -c keybase -f -n "not $seen $c_keybase" -s h -l help -d "Show help"
+#...
+
+#commands
+#L0
+complete -c keybase -f -n "$ends keybase" -a "$c_keybase"
+#L1
+complete -c keybase -f -n "$ends keybase account" -a "$c_keybase_account"
+complete -c keybase -f -n "$ends keybase blocks" -a "$c_keybase_blocks"
+complete -c keybase -f -n "$ends keybase bot" -a "$c_keybase_bot"
+complete -c keybase -f -n "$ends keybase chat" -a "$c_keybase_chat"
+complete -c keybase -f -n "$ends keybase ctl" -a "$c_keybase_ctl"
+complete -c keybase -f -n "$ends keybase currency" -a "$c_keybase_currency"
+complete -c keybase -f -n "$ends keybase device" -a "$c_keybase_device"
+complete -c keybase -f -n "$ends keybase fs" -a "$c_keybase_fs"
+complete -c keybase -f -n "$ends keybase git" -a "$c_keybase_git"
+complete -c keybase -f -n "$ends keybase h" -a "$c_keybase_help"
+complete -c keybase -f -n "$ends keybase help" -a "$c_keybase_help"
+complete -c keybase -f -n "$ends keybase log" -a "$c_keybase_log"
+complete -c keybase -f -n "$ends keybase passphrase" -a "$c_keybase_passphrase"
+complete -c keybase -f -n "$ends keybase pgp" -a "$c_keybase_pgp"
+complete -c keybase -f -n "$ends keybase rekey" -a "$c_keybase_rekey"
+complete -c keybase -f -n "$ends keybase sigs" -a "$c_keybase_sigs"
+complete -c keybase -f -n "$ends keybase team" -a "$c_keybase_team"
+complete -c keybase -f -n "$ends keybase update" -a "$c_keybase_update"
+complete -c keybase -f -n "$ends keybase wallet" -a "$c_keybase_wallet"
+#L2
+complete -c keybase -f -n "$ends keybase fs sync" -a "$c_keybase_fs_sync"
+
+
+#command options
+#...

From 9a3886dc2b9b8d20a50e7e9cb4d885170d8cde2a Mon Sep 17 00:00:00 2001
From: Dan Martinez <dfm@razorwind.org>
Date: Thu, 12 Dec 2019 08:09:52 -0800
Subject: [PATCH 1377/1732] Make `type -p` and `type -P` behave as documented
 (#6412)

* Make `type -p` and `type -P` behave as documented

* Recognize `-` as an additional sign of no path

Functions created via `source` (like by `alias`) cause `functions --details` to return `-`
rather than `stdin` when invoked upon them.
---
 share/functions/type.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/functions/type.fish b/share/functions/type.fish
index 5a06f3fd9..1817aadbb 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -68,6 +68,7 @@ function type --description 'Print the type of a command'
                     case path
                         set -l func_path (functions --details $i)
                         switch $func_path
+                            case "-"
                             case "n/a"
                             case "stdin"
                                 break
@@ -120,6 +121,7 @@ function type --description 'Print the type of a command'
 
         if test $found = 0
             and test $mode != quiet
+            and test $mode != path
             printf (_ "%s: Could not find '%s'\n") type $i >&2
         end
     end

From 4e52feb51abd675214755b22475e5ad0749006ca Mon Sep 17 00:00:00 2001
From: Dan Martinez <dfm@razorwind.org>
Date: Thu, 12 Dec 2019 11:42:11 -0800
Subject: [PATCH 1378/1732] Have `type` deal with both flavors of fileless
 function (#6421)

* Deal with *both* types of dynamic function

* Use a guard (`--`) when `-` is an argument
---
 share/functions/type.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/type.fish b/share/functions/type.fish
index 1817aadbb..795b01cad 100644
--- a/share/functions/type.fish
+++ b/share/functions/type.fish
@@ -58,7 +58,7 @@ function type --description 'Print the type of a command'
                             functions $i
                         else
                             set -l func_path (functions --details $i)
-                            if test $func_path != -
+                            if not contains -- $func_path - stdin
                                 printf (_ ' (defined in %s)') $func_path
                             end
                             echo

From be685faeb884dd8574fa7fcddc4be91ac5aea25c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 12 Dec 2019 14:42:03 -0800
Subject: [PATCH 1379/1732] Clean up how pipe fd avoidance works

fish has to ensure that the pipes it creates do not conflict with any
explicit fds named in redirections. Switch this code to using
autoclose_fd_t to make the ownership logic more explicit, and also
introduce fd_set_t to reduce the dependence on io_chain_t.
---
 src/exec.cpp        | 42 ++++++++++++------------
 src/fish_tests.cpp  | 18 ++++++++++-
 src/io.cpp          | 78 +++++++++++++++------------------------------
 src/io.h            | 37 ++++++++++++++++-----
 src/redirection.cpp | 23 ++++++-------
 5 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index ea5d4da96..84c4ff416 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -288,15 +288,13 @@ static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job) {
     return true;
 }
 
-void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
+void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
     // Do a regular launch -  but without forking first...
+    process_t *p = j->processes.front().get();
+    io_chain_t all_ios = block_io;
+    all_ios.append(p->io_chain());
 
     // child_setup_process makes sure signals are properly set up.
-
-    // PCA This is for handling exec. Passing all_ios here matches what fish 2.0.0 and 1.x did.
-    // It's known to be wrong - for example, it means that redirections bound for subsequent
-    // commands in the pipeline will apply to exec. However, using exec in a pipeline doesn't
-    // really make sense, so I'm not trying to fix it here.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
     if (redirs && !child_setup_process(INVALID_PID, false, *redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
@@ -311,7 +309,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &all_ios) {
         vars.set_one(L"SHLVL", ENV_GLOBAL | ENV_EXPORT, std::move(shlvl_str));
 
         // launch_process _never_ returns.
-        launch_process_nofork(vars, j->processes.front().get());
+        launch_process_nofork(vars, p);
     } else {
         j->mark_constructed();
         j->processes.front()->completed = true;
@@ -875,18 +873,17 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
 }
 
 /// Execute a block node or function "process".
-/// \p user_ios contains the list of user-specified ios, used so we can avoid stomping on them with
-/// our pipes.
+/// \p conflicts contains the list of fds which pipes should avoid.
 /// \p allow_buffering if true, permit buffering the output.
 /// \return true on success, false on error.
 static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
-                                       const io_chain_t &user_ios, io_chain_t io_chain,
+                                       const fd_set_t &conflicts, io_chain_t io_chain,
                                        bool allow_buffering) {
     // Create an output buffer if we're piping to another process.
     shared_ptr<io_bufferfill_t> block_output_bufferfill{};
     if (!p->is_last_in_job && allow_buffering) {
         // Be careful to handle failure, e.g. too many open fds.
-        block_output_bufferfill = io_bufferfill_t::create(user_ios);
+        block_output_bufferfill = io_bufferfill_t::create(conflicts);
         if (!block_output_bufferfill) {
             job_mark_process_as_failed(j, p);
             return false;
@@ -940,7 +937,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 /// certain buffering works. \returns true on success, false on exec error.
 static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
                                 const io_chain_t &block_io, autoclose_pipes_t pipes,
-                                const io_chain_t &all_ios, const autoclose_pipes_t &deferred_pipes,
+                                const fd_set_t &conflicts, const autoclose_pipes_t &deferred_pipes,
                                 size_t stdout_read_limit, bool is_deferred_run = false) {
     // The write pipe (destined for stdout) needs to occur before redirections. For example,
     // with a redirection like this:
@@ -1025,7 +1022,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
             // Allow buffering unless this is a deferred run. If deferred, then processes after us
             // were already launched, so they are ready to receive (or reject) our output.
             bool allow_buffering = !is_deferred_run;
-            if (!exec_block_or_func_process(parser, j, p, all_ios, process_net_io_chain,
+            if (!exec_block_or_func_process(parser, j, p, conflicts, process_net_io_chain,
                                             allow_buffering)) {
                 return false;
             }
@@ -1149,15 +1146,17 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineag
 
     const size_t stdout_read_limit = parser.libdata().read_limit;
 
-    // Get the list of all IOs so we can ensure our pipes do not conflict.
-    io_chain_t all_ios = lineage.block_io;
+    // Get the list of all FDs so we can ensure our pipes do not conflict.
+    fd_set_t conflicts = lineage.block_io.fd_set();
     for (const auto &p : j->processes) {
-        all_ios.append(p->io_chain());
+        for (const auto &io : p->io_chain()) {
+            conflicts.add(io->fd);
+        }
     }
 
     // Handle an exec call.
     if (j->processes.front()->type == process_type_t::exec) {
-        internal_exec(parser.vars(), j.get(), all_ios);
+        internal_exec(parser.vars(), j.get(), lineage.block_io);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
         bool status = !j->flags().negate;
@@ -1188,7 +1187,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineag
         autoclose_pipes_t proc_pipes;
         proc_pipes.read = std::move(pipe_next_read);
         if (!p->is_last_in_job) {
-            auto pipes = make_autoclose_pipes(all_ios);
+            auto pipes = make_autoclose_pipes(conflicts);
             if (!pipes) {
                 debug(1, PIPE_ERROR);
                 wperror(L"pipe");
@@ -1204,7 +1203,7 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineag
             deferred_pipes = std::move(proc_pipes);
         } else {
             if (!exec_process_in_job(parser, p.get(), j, lineage.block_io, std::move(proc_pipes),
-                                     all_ios, deferred_pipes, stdout_read_limit)) {
+                                     conflicts, deferred_pipes, stdout_read_limit)) {
                 exec_error = true;
                 break;
             }
@@ -1216,7 +1215,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineag
     if (!exec_error && deferred_process) {
         assert(deferred_pipes.write.valid() && "Deferred process should always have a write pipe");
         if (!exec_process_in_job(parser, deferred_process, j, lineage.block_io,
-                                 std::move(deferred_pipes), all_ios, {}, stdout_read_limit, true)) {
+                                 std::move(deferred_pipes), conflicts, {}, stdout_read_limit,
+                                 true)) {
             exec_error = true;
         }
     }
@@ -1259,7 +1259,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
     // be null.
     std::shared_ptr<io_buffer_t> buffer;
-    if (auto bufferfill = io_bufferfill_t::create(io_chain_t{}, ld.read_limit)) {
+    if (auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit)) {
         if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == 0) {
             subcommand_statuses = parser.get_last_statuses();
         }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index d10aef7cb..cbf6616ea 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1031,7 +1031,7 @@ static void test_parser() {
 }
 
 static void test_1_cancellation(const wchar_t *src) {
-    auto filler = io_bufferfill_t::create(io_chain_t{});
+    auto filler = io_bufferfill_t::create(fd_set_t{});
     pthread_t thread = pthread_self();
     double delay = 0.25 /* seconds */;
     iothread_perform([=]() {
@@ -3188,6 +3188,21 @@ static void test_input() {
     }
 }
 
+static void test_fd_set() {
+    say(L"Testing fd_set");
+    fd_set_t fds;
+    do_test(!fds.contains(0));
+    do_test(!fds.contains(100));
+    fds.add(1);
+    do_test(!fds.contains(0));
+    do_test(!fds.contains(100));
+    do_test(fds.contains(1));
+    fds.add(1);
+    do_test(!fds.contains(0));
+    do_test(!fds.contains(100));
+    do_test(fds.contains(1));
+}
+
 static void test_line_iterator() {
     say(L"Testing line iterator");
 
@@ -5518,6 +5533,7 @@ int main(int argc, char **argv) {
     if (should_test_function("complete")) test_complete();
     if (should_test_function("autoload")) test_autoload();
     if (should_test_function("input")) test_input();
+    if (should_test_function("io")) test_fd_set();
     if (should_test_function("line_iterator")) test_line_iterator();
     if (should_test_function("universal")) test_universal();
     if (should_test_function("universal")) test_universal_output();
diff --git a/src/io.cpp b/src/io.cpp
index acdb0e71e..3fcdd9070 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -160,7 +160,7 @@ void io_buffer_t::complete_background_fillthread() {
     fillthread_waiter_ = {};
 }
 
-shared_ptr<io_bufferfill_t> io_bufferfill_t::create(const io_chain_t &conflicts,
+shared_ptr<io_bufferfill_t> io_bufferfill_t::create(const fd_set_t &conflicts,
                                                     size_t buffer_limit) {
     // Construct our pipes.
     auto pipes = make_autoclose_pipes(conflicts);
@@ -240,64 +240,37 @@ void io_chain_t::print() const {
     }
 }
 
-int move_fd_to_unused(int fd, const io_chain_t &io_chain, bool cloexec) {
-    if (fd < 0 || io_chain.io_for_fd(fd).get() == nullptr) {
+fd_set_t io_chain_t::fd_set() const {
+    fd_set_t result;
+    for (const auto &io : *this) {
+        result.add(io->fd);
+    }
+    return result;
+}
+
+autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset, bool cloexec) {
+    if (!fd.valid() || !fdset.contains(fd.fd())) {
         return fd;
     }
 
     // We have fd >= 0, and it's a conflict. dup it and recurse. Note that we recurse before
     // anything is closed; this forces the kernel to give us a new one (or report fd exhaustion).
-    int new_fd = fd;
     int tmp_fd;
     do {
-        tmp_fd = dup(fd);
+        tmp_fd = dup(fd.fd());
     } while (tmp_fd < 0 && errno == EINTR);
 
-    assert(tmp_fd != fd);
+    assert(tmp_fd != fd.fd());
     if (tmp_fd < 0) {
         // Likely fd exhaustion.
-        new_fd = -1;
-    } else {
-        // Ok, we have a new candidate fd. Recurse. If we get a valid fd, either it's the same as
-        // what we gave it, or it's a new fd and what we gave it has been closed. If we get a
-        // negative value, the fd also has been closed.
-        if (cloexec) set_cloexec(tmp_fd);
-        new_fd = move_fd_to_unused(tmp_fd, io_chain);
+        return autoclose_fd_t{};
     }
-
-    // We're either returning a new fd or an error. In both cases, we promise to close the old one.
-    assert(new_fd != fd);
-    int saved_errno = errno;
-    exec_close(fd);
-    errno = saved_errno;
-    return new_fd;
+    // Ok, we have a new candidate fd. Recurse.
+    if (cloexec) set_cloexec(tmp_fd);
+    return move_fd_to_unused(autoclose_fd_t{tmp_fd}, fdset, cloexec);
 }
 
-static bool pipe_avoid_conflicts_with_io_chain(int fds[2], const io_chain_t &ios) {
-    bool success = true;
-    for (int i = 0; i < 2; i++) {
-        fds[i] = move_fd_to_unused(fds[i], ios);
-        if (fds[i] < 0) {
-            success = false;
-            break;
-        }
-    }
-
-    // If any fd failed, close all valid fds.
-    if (!success) {
-        int saved_errno = errno;
-        for (int i = 0; i < 2; i++) {
-            if (fds[i] >= 0) {
-                exec_close(fds[i]);
-                fds[i] = -1;
-            }
-        }
-        errno = saved_errno;
-    }
-    return success;
-}
-
-maybe_t<autoclose_pipes_t> make_autoclose_pipes(const io_chain_t &ios) {
+maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset) {
     int pipes[2] = {-1, -1};
 
     if (pipe(pipes) < 0) {
@@ -308,14 +281,13 @@ maybe_t<autoclose_pipes_t> make_autoclose_pipes(const io_chain_t &ios) {
     set_cloexec(pipes[0]);
     set_cloexec(pipes[1]);
 
-    if (!pipe_avoid_conflicts_with_io_chain(pipes, ios)) {
-        // The pipes are closed on failure here.
-        return none();
-    }
-    autoclose_pipes_t result;
-    result.read = autoclose_fd_t(pipes[0]);
-    result.write = autoclose_fd_t(pipes[1]);
-    return {std::move(result)};
+    auto read = move_fd_to_unused(autoclose_fd_t{pipes[0]}, fdset, true);
+    if (!read.valid()) return none();
+
+    auto write = move_fd_to_unused(autoclose_fd_t{pipes[1]}, fdset, true);
+    if (!write.valid()) return none();
+
+    return autoclose_pipes_t(std::move(read), std::move(write));
 }
 
 shared_ptr<const io_data_t> io_chain_t::io_for_fd(int fd) const {
diff --git a/src/io.h b/src/io.h
index 22d87454a..406bd8e84 100644
--- a/src/io.h
+++ b/src/io.h
@@ -19,6 +19,24 @@
 
 using std::shared_ptr;
 
+/// A simple set of FDs.
+struct fd_set_t {
+    std::vector<bool> fds;
+
+    void add(int fd) {
+        assert(fd >= 0 && "Invalid fd");
+        if ((size_t)fd >= fds.size()) {
+            fds.resize(fd + 1);
+        }
+        fds[fd] = true;
+    }
+
+    bool contains(int fd) const {
+        assert(fd >= 0 && "Invalid fd");
+        return (size_t)fd < fds.size() && fds[fd];
+    }
+};
+
 /// separated_buffer_t is composed of a sequence of elements, some of which may be explicitly
 /// separated (e.g. through string spit0) and some of which the separation is inferred. This enum
 /// tracks the type.
@@ -257,9 +275,9 @@ class io_bufferfill_t : public io_data_t {
     /// Create an io_bufferfill_t which, when written from, fills a buffer with the contents.
     /// \returns nullptr on failure, e.g. too many open fds.
     ///
-    /// \param conflicts A set of IO redirections. The function ensures that any pipe it makes does
+    /// \param conflicts A set of fds. The function ensures that any pipe it makes does
     /// not conflict with an fd redirection in this list.
-    static shared_ptr<io_bufferfill_t> create(const io_chain_t &conflicts, size_t buffer_limit = 0);
+    static shared_ptr<io_bufferfill_t> create(const fd_set_t &conflicts, size_t buffer_limit = 0);
 
     /// Reset the receiver (possibly closing the write end of the pipe), and complete the fillthread
     /// of the buffer. \return the buffer.
@@ -343,6 +361,9 @@ class io_chain_t : public std::vector<io_data_ref_t> {
 
     /// Output debugging information to stderr.
     void print() const;
+
+    /// \return the set of redirected FDs.
+    fd_set_t fd_set() const;
 };
 
 /// Helper type returned from making autoclose pipes.
@@ -360,13 +381,13 @@ struct autoclose_pipes_t {
 /// Call pipe(), populating autoclose fds, avoiding conflicts.
 /// The pipes are marked CLO_EXEC.
 /// \return pipes on success, none() on error.
-maybe_t<autoclose_pipes_t> make_autoclose_pipes(const io_chain_t &ios);
+maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset);
 
-/// If the given fd is used by the io chain, duplicates it repeatedly until an fd not used in the io
-/// chain is found, or we run out. If we return a new fd or an error, closes the old one.
-/// If \p cloexec is set, any fd created is marked close-on-exec.
-/// \returns -1 on failure (in which case the given fd is still closed).
-int move_fd_to_unused(int fd, const io_chain_t &io_chain, bool cloexec = true);
+/// If the given fd is present in \p fdset, duplicates it repeatedly until an fd not used in the set
+/// is found or we run out. If we return a new fd or an error, closes the old one. If \p cloexec is
+/// set, any fd created is marked close-on-exec. \returns -1 on failure (in which case the given fd
+/// is still closed).
+autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset, bool cloexec = true);
 
 /// Class representing the output that a builtin can generate.
 class output_stream_t {
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 6a09db081..e6395b40a 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -24,8 +24,8 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
                 // Here we definitely do not want to set CLO_EXEC because our child needs access.
                 // Open the file.
                 const io_file_t *io_file = static_cast<const io_file_t *>(io_ref.get());
-                int file_fd = wopen(io_file->filename, io_file->flags, OPEN_MASK);
-                if (file_fd < 0) {
+                autoclose_fd_t file_fd{wopen(io_file->filename, io_file->flags, OPEN_MASK)};
+                if (!file_fd.valid()) {
                     if ((io_file->flags & O_EXCL) && (errno == EEXIST)) {
                         debug(1, NOCLOB_ERROR, io_file->filename.c_str());
                     } else {
@@ -38,22 +38,23 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
                 // If by chance we got the file we want, we're done. Otherwise move the fd to an
                 // unused place and dup2 it.
                 // Note move_fd_to_unused() will close the incoming file_fd.
-                if (file_fd != io_file->fd) {
-                    file_fd = move_fd_to_unused(file_fd, io_chain, false /* cloexec */);
-                    if (file_fd < 0) {
+                if (file_fd.fd() != io_file->fd) {
+                    file_fd = move_fd_to_unused(std::move(file_fd), io_chain.fd_set(),
+                                                false /* cloexec */);
+                    if (!file_fd.valid()) {
                         debug(1, FILE_ERROR, io_file->filename.c_str());
                         if (should_debug(1)) wperror(L"dup");
                         return none();
                     }
                 }
-
-                // Record that we opened this file, so we will auto-close it.
-                assert(file_fd >= 0 && "Should have a valid file_fd");
-                result.opened_fds_.emplace_back(file_fd);
+                assert(file_fd.valid() && "Should have a valid file_fd");
 
                 // Mark our dup2 and our close actions.
-                result.add_dup2(file_fd, io_file->fd);
-                result.add_close(file_fd);
+                result.add_dup2(file_fd.fd(), io_file->fd);
+                result.add_close(file_fd.fd());
+
+                // Store our file.
+                result.opened_fds_.push_back(std::move(file_fd));
                 break;
             }
 

From af473d4d0c62d781abf9dd33723939178e0abf05 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 12 Dec 2019 16:44:24 -0800
Subject: [PATCH 1380/1732] Introduce redirection_spec_t

Prior to this change, a process after it has been constructed by
parse_execution, but before it is executed, was given a list of
io_data_t redirections. The problem is that redirections have a
sensitive ownership policy because they hold onto fds. This made it
rather hard to reason about fd lifetime.

Change these to redirection_spec_t. This is a textual description
of a redirection after expansion. It does not represent an open file and
so its lifetime is no longer important.

This enables files to be held only on the stack, and are no longer owned
by a process of indeterminate lifetime.
---
 src/exec.cpp            | 27 ++++++++++----
 src/io.cpp              | 24 ++++++++++++
 src/io.h                |  5 +++
 src/parse_execution.cpp | 82 +++++++++++++++--------------------------
 src/parse_execution.h   |  7 ++--
 src/proc.h              | 11 +++---
 src/redirection.cpp     | 23 ++++++++++++
 src/redirection.h       | 43 ++++++++++++++++++++-
 src/tokenizer.h         |  9 +----
 9 files changed, 152 insertions(+), 79 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 84c4ff416..5f4d2ec10 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -292,7 +292,9 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
     // Do a regular launch -  but without forking first...
     process_t *p = j->processes.front().get();
     io_chain_t all_ios = block_io;
-    all_ios.append(p->io_chain());
+    if (!all_ios.append_from_specs(p->redirection_specs())) {
+        return;
+    }
 
     // child_setup_process makes sure signals are properly set up.
     auto redirs = dup2_list_t::resolve_chain(all_ios);
@@ -532,15 +534,19 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     if (local_builtin_stdin == -1) return false;
 
     // Determine if we have a "direct" redirection for stdin.
-    bool stdin_is_directly_redirected;
+    bool stdin_is_directly_redirected = false;
     if (!p->is_first_in_job) {
         // We must have a pipe
         stdin_is_directly_redirected = true;
     } else {
         // We are not a pipe. Check if there is a redirection local to the process
         // that's not io_mode_t::close.
-        const shared_ptr<const io_data_t> stdin_io = p->io_chain().io_for_fd(STDIN_FILENO);
-        stdin_is_directly_redirected = stdin_io && stdin_io->io_mode != io_mode_t::close;
+        for (const auto &redir : p->redirection_specs()) {
+            if (redir.fd == STDIN_FILENO && !redir.is_close()) {
+                stdin_is_directly_redirected = true;
+                break;
+            }
+        }
     }
 
     streams.stdin_fd = local_builtin_stdin;
@@ -975,13 +981,18 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     // The IO chain for this process.
     io_chain_t process_net_io_chain = block_io;
+
     if (pipes.write.valid()) {
         process_net_io_chain.push_back(std::make_shared<io_pipe_t>(
             p->pipe_write_fd, false /* not input */, std::move(pipes.write)));
     }
 
-    // The explicit IO redirections associated with the process.
-    process_net_io_chain.append(p->io_chain());
+    // Append IOs from the process's redirection specs.
+    // This may fail.
+    if (!process_net_io_chain.append_from_specs(p->redirection_specs())) {
+        // Error.
+        return false;
+    }
 
     // Read pipe goes last.
     shared_ptr<io_pipe_t> pipe_read{};
@@ -1149,8 +1160,8 @@ bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineag
     // Get the list of all FDs so we can ensure our pipes do not conflict.
     fd_set_t conflicts = lineage.block_io.fd_set();
     for (const auto &p : j->processes) {
-        for (const auto &io : p->io_chain()) {
-            conflicts.add(io->fd);
+        for (const auto &spec : p->redirection_specs()) {
+            conflicts.add(spec.fd);
         }
     }
 
diff --git a/src/io.cpp b/src/io.cpp
index 3fcdd9070..5b59105a9 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -222,6 +222,30 @@ void io_chain_t::append(const io_chain_t &chain) {
     this->insert(this->end(), chain.begin(), chain.end());
 }
 
+bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs) {
+    for (const auto &spec : specs) {
+        switch (spec.mode) {
+            case redirection_mode_t::fd: {
+                if (spec.is_close()) {
+                    this->push_back(make_unique<io_close_t>(spec.fd));
+                } else {
+                    auto target_fd = spec.get_target_as_fd();
+                    assert(target_fd.has_value() &&
+                           "fd redirection should have been validated already");
+                    this->push_back(
+                        make_unique<io_fd_t>(spec.fd, *target_fd, true /* user supplied */));
+                }
+                break;
+            }
+            default: {
+                this->push_back(make_unique<io_file_t>(spec.fd, spec.target, spec.oflags()));
+                break;
+            }
+        }
+    }
+    return true;
+}
+
 void io_chain_t::print() const {
     if (this->empty()) {
         std::fwprintf(stderr, L"Empty chain %p\n", this);
diff --git a/src/io.h b/src/io.h
index 406bd8e84..d16cf2625 100644
--- a/src/io.h
+++ b/src/io.h
@@ -16,6 +16,7 @@
 #include "env.h"
 #include "global_safety.h"
 #include "maybe.h"
+#include "redirection.h"
 
 using std::shared_ptr;
 
@@ -359,6 +360,10 @@ class io_chain_t : public std::vector<io_data_ref_t> {
     /// if none.
     io_data_ref_t io_for_fd(int fd) const;
 
+    /// Attempt to resolve a list of redirection specs to IOs, appending to 'this'.
+    /// \return true on success, false on error, in which case an error will have been printed.
+    bool append_from_specs(const redirection_spec_list_t &specs);
+
     /// Output debugging information to stderr.
     void print() const;
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index f972fa422..d707c4164 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -82,8 +82,9 @@ static wcstring profiling_cmd_name_for_redirectable_block(const parse_node_t &no
 }
 
 /// Get a redirection from stderr to stdout (i.e. 2>&1).
-static std::shared_ptr<io_data_t> get_stderr_merge() {
-    return std::make_shared<io_fd_t>(STDERR_FILENO, STDOUT_FILENO, true /* user_supplied */);
+static redirection_spec_t get_stderr_merge() {
+    const wchar_t *stdout_fileno_str = L"1";
+    return redirection_spec_t{STDERR_FILENO, redirection_mode_t::fd, stdout_fileno_str};
 }
 
 parse_execution_context_t::parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
@@ -832,7 +833,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
 
     // Produce the full argument list and the set of IO redirections.
     wcstring_list_t cmd_args;
-    io_chain_t process_io_chain;
+    redirection_spec_list_t redirections;
     if (use_implicit_cd) {
         // Implicit cd is simple.
         cmd_args = {L"cd", cmd};
@@ -858,7 +859,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         }
 
         // The set of IO redirections that we construct for the process.
-        if (!this->determine_io_chain(statement.child<1>(), &process_io_chain)) {
+        if (!this->determine_redirections(statement.child<1>(), &redirections)) {
             return parse_execution_errored;
         }
 
@@ -869,7 +870,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     // Populate the process.
     proc->type = process_type;
     proc->set_argv(cmd_args);
-    proc->set_io_chain(process_io_chain);
+    proc->set_redirection_specs(std::move(redirections));
     proc->actual_cmd = std::move(path_to_external_command);
     return parse_execution_success;
 }
@@ -928,18 +929,15 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
     return parse_execution_success;
 }
 
-bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redirections_list> node,
-                                                   io_chain_t *out_chain) {
-    io_chain_t result;
-    bool errored = false;
-
+bool parse_execution_context_t::determine_redirections(
+    tnode_t<g::arguments_or_redirections_list> node, redirection_spec_list_t *out_redirections) {
     // Get all redirection nodes underneath the statement.
     while (auto redirect_node = node.next_in_list<g::redirection>()) {
         wcstring target;  // file path or target fd
         auto redirect = redirection_for_node(redirect_node, pstree->src, &target);
 
         if (!redirect || !redirect->is_valid()) {
-            // TODO: improve this error message.
+            // TODO: figure out if this can ever happen. If so, improve this error message.
             report_error(redirect_node, _(L"Invalid redirection: %ls"),
                          redirect_node.get_source(pstree->src).c_str());
             return false;
@@ -955,50 +953,27 @@ bool parse_execution_context_t::determine_io_chain(tnode_t<g::arguments_or_redir
             return false;
         }
 
-        // Generate the actual IO redirection.
-        shared_ptr<io_data_t> new_io;
+        // Make a redirection spec from the redirect token.
         assert(redirect && redirect->is_valid() && "expected to have a valid redirection");
-        switch (redirect->mode) {
-            case redirection_mode_t::fd: {
-                if (target == L"-") {
-                    new_io.reset(new io_close_t(redirect->fd));
-                } else {
-                    int old_fd = fish_wcstoi(target.c_str());
-                    if (errno || old_fd < 0) {
-                        const wchar_t *fmt =
-                            _(L"Requested redirection to '%ls', "
-                              L"which is not a valid file descriptor");
-                        errored = report_error(redirect_node, fmt, target.c_str());
-                    } else {
-                        new_io.reset(new io_fd_t(redirect->fd, old_fd, true));
-                    }
-                }
-                break;
-            }
-            default: {
-                int oflags = redirect->oflags();
-                io_file_t *new_io_file = new io_file_t(redirect->fd, target, oflags);
-                new_io.reset(new_io_file);
-                break;
-            }
-        }
 
-        // Append the new_io if we got one.
-        if (new_io.get() != nullptr) {
-            result.push_back(new_io);
+        redirection_spec_t spec{redirect->fd, redirect->mode, std::move(target)};
+
+        // Validate this spec.
+        if (spec.mode == redirection_mode_t::fd && !spec.is_close() && !spec.get_target_as_fd()) {
+            const wchar_t *fmt =
+                _(L"Requested redirection to '%ls', which is not a valid file descriptor");
+            report_error(redirect_node, fmt, spec.target.c_str());
+            return false;
         }
+        out_redirections->push_back(std::move(spec));
 
         if (redirect->stderr_merge) {
             // This was a redirect like &> which also modifies stderr.
             // Also redirect stderr to stdout.
-            result.push_back(get_stderr_merge());
+            out_redirections->push_back(get_stderr_merge());
         }
     }
-
-    if (out_chain && !errored) {
-        *out_chain = std::move(result);
-    }
-    return !errored;
+    return true;
 }
 
 parse_execution_result_t parse_execution_context_t::populate_not_process(
@@ -1026,14 +1001,15 @@ parse_execution_result_t parse_execution_context_t::populate_block_process(
     // The set of IO redirections that we construct for the process.
     // TODO: fix this ugly find_child.
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
-    io_chain_t process_io_chain;
-    bool errored = !this->determine_io_chain(arguments, &process_io_chain);
-    if (errored) return parse_execution_errored;
+    redirection_spec_list_t redirections;
+    if (!this->determine_redirections(arguments, &redirections)) {
+        return parse_execution_errored;
+    }
 
     proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
-    proc->set_io_chain(process_io_chain);
+    proc->set_redirection_specs(std::move(redirections));
     return parse_execution_success;
 }
 
@@ -1172,9 +1148,9 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
         if (parsed_pipe->stderr_merge) {
             // This was a pipe like &| which redirects both stdout and stderr.
             // Also redirect stderr to stdout.
-            auto ios = processes.back()->io_chain();
-            ios.push_back(get_stderr_merge());
-            processes.back()->set_io_chain(std::move(ios));
+            auto specs = processes.back()->redirection_specs();
+            specs.push_back(get_stderr_merge());
+            processes.back()->set_redirection_specs(std::move(specs));
         }
 
         // Store the new process (and maybe with an error).
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 5c8d2f7dd..4edf7dc76 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -125,9 +125,10 @@ class parse_execution_context_t {
                                                          wcstring_list_t *out_arguments,
                                                          globspec_t glob_behavior);
 
-    // Determines the IO chain. Returns true on success, false on error.
-    bool determine_io_chain(tnode_t<grammar::arguments_or_redirections_list> node,
-                            io_chain_t *out_chain);
+    // Determines the list of redirections for a node. Returns none() on failure, for example, an
+    // invalid fd.
+    bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
+                                redirection_spec_list_t *out_redirs);
 
     parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
     parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
diff --git a/src/proc.h b/src/proc.h
index 4cd507745..0118d560a 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -172,7 +172,7 @@ class process_t {
    private:
     null_terminated_array_t<wchar_t> argv_array;
 
-    io_chain_t process_io_chain;
+    redirection_spec_list_t proc_redirection_specs;
 
     // No copying.
     process_t(const process_t &rhs) = delete;
@@ -221,10 +221,11 @@ class process_t {
         return argv ? argv[0] : nullptr;
     }
 
-    /// IO chain getter and setter.
-    const io_chain_t &io_chain() const { return process_io_chain; }
-
-    void set_io_chain(io_chain_t chain) { this->process_io_chain = std::move(chain); }
+    /// Redirection list getter and setter.
+    const redirection_spec_list_t &redirection_specs() const { return proc_redirection_specs; }
+    void set_redirection_specs(redirection_spec_list_t specs) {
+        this->proc_redirection_specs = std::move(specs);
+    }
 
     /// Store the current topic generations. That is, right before the process is launched, record
     /// the generations of all topics; then we can tell which generation values have changed after
diff --git a/src/redirection.cpp b/src/redirection.cpp
index e6395b40a..8c65ea4c1 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -4,6 +4,7 @@
 
 #include <fcntl.h>
 
+#include "io.h"
 #include "wutil.h"
 
 #define NOCLOB_ERROR _(L"The file '%ls' already exists")
@@ -15,6 +16,28 @@
 
 dup2_list_t::~dup2_list_t() = default;
 
+maybe_t<int> redirection_spec_t::get_target_as_fd() const {
+    errno = 0;
+    int result = fish_wcstoi(target.c_str());
+    if (errno || result < 0) return none();
+    return result;
+}
+
+int redirection_spec_t::oflags() const {
+    switch (mode) {
+        case redirection_mode_t::append:
+            return O_CREAT | O_APPEND | O_WRONLY;
+        case redirection_mode_t::overwrite:
+            return O_CREAT | O_WRONLY | O_TRUNC;
+        case redirection_mode_t::noclob:
+            return O_CREAT | O_EXCL | O_WRONLY;
+        case redirection_mode_t::input:
+            return O_RDONLY;
+        case redirection_mode_t::fd:
+            DIE("Not a file redirection");
+    }
+}
+
 maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
     ASSERT_IS_NOT_FORKED_CHILD();
     dup2_list_t result;
diff --git a/src/redirection.h b/src/redirection.h
index 9d5861f1d..0d43e0882 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -4,10 +4,49 @@
 #include <vector>
 
 #include "common.h"
-#include "io.h"
 #include "maybe.h"
 
-/// This file supports "applying" redirections.
+/// This file supports specifying and applying redirections.
+
+enum class redirection_mode_t {
+    overwrite,  // normal redirection: > file.txt
+    append,     // appending redirection: >> file.txt
+    input,      // input redirection: < file.txt
+    fd,         // fd redirection: 2>&1
+    noclob      // noclobber redirection: >? file.txt
+};
+
+class io_chain_t;
+
+/// A struct which represents a redirection specification from the user.
+/// Here the file descriptors don't represent open files - it's purely textual.
+struct redirection_spec_t {
+    /// The redirected fd, or -1 on overflow.
+    /// In the common case of a pipe, this is 1 (STDOUT_FILENO).
+    /// For example, in the case of "3>&1" this will be 3.
+    int fd{-1};
+
+    /// The redirection mode.
+    redirection_mode_t mode{redirection_mode_t::overwrite};
+
+    /// The target of the redirection.
+    /// For example in "3>&1", this will be "1".
+    /// In "< file.txt" this will be "file.txt".
+    wcstring target{};
+
+    /// \return if this is a close-type redirection.
+    bool is_close() const { return mode == redirection_mode_t::fd && target == L"-"; }
+
+    /// Attempt to parse target as an fd. Return the fd, or none() if none.
+    maybe_t<int> get_target_as_fd() const;
+
+    /// \return the open flags for this redirection.
+    int oflags() const;
+
+    redirection_spec_t(int fd, redirection_mode_t mode, wcstring target)
+        : fd(fd), mode(mode), target(std::move(target)) {}
+};
+using redirection_spec_list_t = std::vector<redirection_spec_t>;
 
 /// A class representing a sequence of basic redirections.
 class dup2_list_t {
diff --git a/src/tokenizer.h b/src/tokenizer.h
index 5e6e3a12b..90563b701 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -8,6 +8,7 @@
 #include "common.h"
 #include "maybe.h"
 #include "parse_constants.h"
+#include "redirection.h"
 
 /// Token types.
 enum class token_type_t {
@@ -22,14 +23,6 @@ enum class token_type_t {
     comment,     /// comment token
 };
 
-enum class redirection_mode_t {
-    overwrite,  // normal redirection: > file.txt
-    append,     // appending redirection: >> file.txt
-    input,      // input redirection: < file.txt
-    fd,         // fd redirection: 2>&1
-    noclob      // noclobber redirection: >? file.txt
-};
-
 /// Flag telling the tokenizer to accept incomplete parameters, i.e. parameters with mismatching
 /// parenthesis, etc. This is useful for tab-completion.
 #define TOK_ACCEPT_UNFINISHED 1

From 33aff87c10d1f24cf87a4ffbae11f7317a426153 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 12 Dec 2019 17:27:48 -0800
Subject: [PATCH 1381/1732] Switch io_file_t to store an fd, not a path

Prior to this fix, a file redirection was turned into an io_file_t. This is
annoying because every place where we want to apply the redirection, we
might fail due to open() failing. Switch to opening the file at the point
we resolve the redirection spec. This will simplify a lot of code.
---
 src/exec.cpp        | 33 ++++++---------------------------
 src/fish_tests.cpp  |  9 ---------
 src/io.cpp          | 35 ++++++++++++++++++++++++++++++++---
 src/io.h            | 24 +++++++++++++++---------
 src/redirection.cpp | 36 ++----------------------------------
 5 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 5f4d2ec10..6b9fa908e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -80,8 +80,7 @@ static bool redirection_is_to_real_file(const shared_ptr<const io_data_t> &io) {
     bool result = false;
     if (io && io->io_mode == io_mode_t::file) {
         // It's a file redirection. Compare the path to /dev/null.
-        const wcstring &path = static_cast<const io_file_t *>(io.get())->filename;
-        if (path != L"/dev/null") {
+        if (!static_cast<const io_file_t *>(io.get())->is_dev_null()) {
             // It's not /dev/null.
             result = true;
         }
@@ -213,26 +212,11 @@ static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const w
             case io_mode_t::pipe:
             case io_mode_t::bufferfill:
             case io_mode_t::fd:
+            case io_mode_t::file:
             case io_mode_t::close: {
                 result_chain.push_back(in);
                 break;
             }
-            case io_mode_t::file: {
-                // We have a path-based redireciton. Resolve it to a file.
-                const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
-                int fd = wopen(path_apply_working_directory(in_file->filename, pwd), in_file->flags,
-                               OPEN_MASK);
-                if (fd < 0) {
-                    debug(1, FILE_ERROR, in_file->filename.c_str());
-                    wperror(L"open");
-                    success = false;
-                    break;
-                }
-
-                opened_fds.push_back(autoclose_fd_t(fd));
-                result_chain.push_back(std::make_shared<io_fd_t>(in->fd, fd, false));
-                break;
-            }
         }
         if (!success) {
             break;
@@ -292,7 +276,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
     // Do a regular launch -  but without forking first...
     process_t *p = j->processes.front().get();
     io_chain_t all_ios = block_io;
-    if (!all_ios.append_from_specs(p->redirection_specs())) {
+    if (!all_ios.append_from_specs(p->redirection_specs(), vars.get_pwd_slash())) {
         return;
     }
 
@@ -507,13 +491,7 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
             }
             case io_mode_t::file: {
                 const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
-                locally_opened_stdin =
-                    autoclose_fd_t{wopen(in_file->filename, in_file->flags, OPEN_MASK)};
-                if (!locally_opened_stdin.valid()) {
-                    debug(1, FILE_ERROR, in_file->filename.c_str());
-                    wperror(L"open");
-                }
-                local_builtin_stdin = locally_opened_stdin.fd();
+                local_builtin_stdin = in_file->file_fd();
                 break;
             }
             case io_mode_t::close: {
@@ -989,7 +967,8 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<
 
     // Append IOs from the process's redirection specs.
     // This may fail.
-    if (!process_net_io_chain.append_from_specs(p->redirection_specs())) {
+    if (!process_net_io_chain.append_from_specs(p->redirection_specs(),
+                                                parser.vars().get_pwd_slash())) {
         // Error.
         return false;
     }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index cbf6616ea..74659a3fe 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2479,15 +2479,6 @@ static void test_dup2s() {
     auto act2 = list->get_actions().at(1);
     do_test(act2.src == 19);
     do_test(act2.target == 3);
-
-    // Invalid files should fail to open.
-    // Suppress the debug() message.
-    int saved_debug_level = debug_level;
-    debug_level = -1;
-    chain.push_back(make_shared<io_file_t>(2, L"/definitely/not/a/valid/path/for/this/test", 0666));
-    list = dup2_list_t::resolve_chain(chain);
-    do_test(!list.has_value());
-    debug_level = saved_debug_level;
 }
 
 static void test_dup2s_fd_for_target_fd() {
diff --git a/src/io.cpp b/src/io.cpp
index 5b59105a9..2ff31bd90 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -4,6 +4,7 @@
 #include "io.h"
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -15,16 +16,29 @@
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "iothread.h"
+#include "path.h"
 #include "redirection.h"
 #include "wutil.h"  // IWYU pragma: keep
 
+/// File redirection error message.
+#define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
+#define NOCLOB_ERROR _(L"The file '%ls' already exists")
+
+/// Base open mode to pass to calls to open.
+#define OPEN_MASK 0666
+
 io_data_t::~io_data_t() = default;
 
+io_file_t::io_file_t(int f, autoclose_fd_t file, const wcstring &path)
+    : io_data_t(io_mode_t::file, f), file_fd_(std::move(file)), is_dev_null_(path == L"/dev/null") {
+    assert(file_fd_.valid() && "File is not valid");
+}
+
 void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
 
 void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
 
-void io_file_t::print() const { std::fwprintf(stderr, L"file (%ls)\n", filename.c_str()); }
+void io_file_t::print() const { std::fwprintf(stderr, L"file (%d)\n", file_fd_.fd()); }
 
 void io_pipe_t::print() const {
     std::fwprintf(stderr, L"pipe {%d} (input: %s)\n", pipe_fd(), is_input_ ? "yes" : "no");
@@ -195,6 +209,8 @@ std::shared_ptr<io_buffer_t> io_bufferfill_t::finish(std::shared_ptr<io_bufferfi
 
 io_pipe_t::~io_pipe_t() = default;
 
+io_file_t::~io_file_t() = default;
+
 io_bufferfill_t::~io_bufferfill_t() = default;
 
 io_buffer_t::~io_buffer_t() {
@@ -222,7 +238,7 @@ void io_chain_t::append(const io_chain_t &chain) {
     this->insert(this->end(), chain.begin(), chain.end());
 }
 
-bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs) {
+bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const wcstring &pwd) {
     for (const auto &spec : specs) {
         switch (spec.mode) {
             case redirection_mode_t::fd: {
@@ -238,7 +254,20 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs) {
                 break;
             }
             default: {
-                this->push_back(make_unique<io_file_t>(spec.fd, spec.target, spec.oflags()));
+                // We have a path-based redireciton. Resolve it to a file.
+                wcstring path = path_apply_working_directory(spec.target, pwd);
+                int oflags = spec.oflags();
+                autoclose_fd_t file{wopen(path, oflags, OPEN_MASK)};
+                if (!file.valid()) {
+                    if ((oflags & O_EXCL) && (errno == EEXIST)) {
+                        debug(1, NOCLOB_ERROR, spec.target.c_str());
+                    } else {
+                        debug(1, FILE_ERROR, spec.target.c_str());
+                        if (should_debug(1)) wperror(L"open");
+                    }
+                    return false;
+                }
+                this->push_back(std::make_shared<io_file_t>(spec.fd, std::move(file), path));
                 break;
             }
         }
diff --git a/src/io.h b/src/io.h
index d16cf2625..24d5e6da9 100644
--- a/src/io.h
+++ b/src/io.h
@@ -210,19 +210,25 @@ class io_fd_t : public io_data_t {
         : io_data_t(io_mode_t::fd, f), old_fd(old), user_supplied(us) {}
 };
 
+/// Represents a redirection to or from an opened file.
 class io_file_t : public io_data_t {
    public:
-    /// The filename.
-    wcstring filename;
-    /// file creation flags to send to open.
-    const int flags;
-
     void print() const override;
 
-    io_file_t(int f, wcstring fname, int fl = 0)
-        : io_data_t(io_mode_t::file, f), filename(std::move(fname)), flags(fl) {}
+    io_file_t(int f, autoclose_fd_t file, const wcstring &path);
 
-    ~io_file_t() override = default;
+    ~io_file_t() override;
+
+    int file_fd() const { return file_fd_.fd(); }
+
+    bool is_dev_null() const { return is_dev_null_; }
+
+   private:
+    // The fd for the file which we are writing to or reading from.
+    autoclose_fd_t file_fd_;
+
+    // Hackish - whether this is /dev/null.
+    const bool is_dev_null_;
 };
 
 /// Represents (one end) of a pipe.
@@ -362,7 +368,7 @@ class io_chain_t : public std::vector<io_data_ref_t> {
 
     /// Attempt to resolve a list of redirection specs to IOs, appending to 'this'.
     /// \return true on success, false on error, in which case an error will have been printed.
-    bool append_from_specs(const redirection_spec_list_t &specs);
+    bool append_from_specs(const redirection_spec_list_t &specs, const wcstring &pwd);
 
     /// Output debugging information to stderr.
     void print() const;
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 8c65ea4c1..4e0028b92 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -44,40 +44,8 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
     for (const auto &io_ref : io_chain) {
         switch (io_ref->io_mode) {
             case io_mode_t::file: {
-                // Here we definitely do not want to set CLO_EXEC because our child needs access.
-                // Open the file.
-                const io_file_t *io_file = static_cast<const io_file_t *>(io_ref.get());
-                autoclose_fd_t file_fd{wopen(io_file->filename, io_file->flags, OPEN_MASK)};
-                if (!file_fd.valid()) {
-                    if ((io_file->flags & O_EXCL) && (errno == EEXIST)) {
-                        debug(1, NOCLOB_ERROR, io_file->filename.c_str());
-                    } else {
-                        debug(1, FILE_ERROR, io_file->filename.c_str());
-                        if (should_debug(1)) wperror(L"open");
-                    }
-                    return none();
-                }
-
-                // If by chance we got the file we want, we're done. Otherwise move the fd to an
-                // unused place and dup2 it.
-                // Note move_fd_to_unused() will close the incoming file_fd.
-                if (file_fd.fd() != io_file->fd) {
-                    file_fd = move_fd_to_unused(std::move(file_fd), io_chain.fd_set(),
-                                                false /* cloexec */);
-                    if (!file_fd.valid()) {
-                        debug(1, FILE_ERROR, io_file->filename.c_str());
-                        if (should_debug(1)) wperror(L"dup");
-                        return none();
-                    }
-                }
-                assert(file_fd.valid() && "Should have a valid file_fd");
-
-                // Mark our dup2 and our close actions.
-                result.add_dup2(file_fd.fd(), io_file->fd);
-                result.add_close(file_fd.fd());
-
-                // Store our file.
-                result.opened_fds_.push_back(std::move(file_fd));
+                const io_file_t *io = static_cast<const io_file_t *>(io_ref.get());
+                result.add_dup2(io->file_fd(), io->fd);
                 break;
             }
 

From 5cd9de104963fc2a25d8335988844d923b2f5992 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 12 Dec 2019 17:33:45 -0800
Subject: [PATCH 1382/1732] Eliminate resolve_file_redirections_to_fds

Now that file redirections store FDs and not paths, this function has
nothing to do and can be removed.
---
 src/exec.cpp | 59 ----------------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 6b9fa908e..226907953 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -181,55 +181,6 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
     safe_launch_process(p, actual_cmd, argv_array.get(), envv);
 }
 
-/// Make a copy of the specified io redirection chain, but change file redirection into fd
-/// redirection. This makes the redirection chain suitable for use as block-level io, since the file
-/// won't be repeatedly reopened for every command in the block, which would reset the cursor
-/// position.
-///
-/// \return true on success, false on failure. Returns the output chain and opened_fds by reference.
-static bool resolve_file_redirections_to_fds(const io_chain_t &in_chain, const wcstring &pwd,
-                                             io_chain_t *out_chain,
-                                             std::vector<autoclose_fd_t> *out_opened_fds) {
-    ASSERT_IS_MAIN_THREAD();
-    assert(out_chain != nullptr && out_opened_fds != nullptr);
-    assert(out_chain->empty());
-
-    // Just to be clear what we do for an empty chain.
-    if (in_chain.empty()) {
-        return true;
-    }
-
-    bool success = true;
-
-    // All of the FDs that we create.
-    std::vector<autoclose_fd_t> opened_fds{};
-
-    // Make our chain of redirections.
-    io_chain_t result_chain;
-
-    for (const io_data_ref_t &in : in_chain) {
-        switch (in->io_mode) {
-            case io_mode_t::pipe:
-            case io_mode_t::bufferfill:
-            case io_mode_t::fd:
-            case io_mode_t::file:
-            case io_mode_t::close: {
-                result_chain.push_back(in);
-                break;
-            }
-        }
-        if (!success) {
-            break;
-        }
-    }
-
-    if (success) {
-        *out_chain = std::move(result_chain);
-        *out_opened_fds = std::move(opened_fds);
-    }
-    return success;
-}
-
 /// Morph an io redirection chain into redirections suitable for passing to eval, and then call
 /// eval.
 ///
@@ -240,16 +191,6 @@ template <typename T>
 void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, tnode_t<T> node,
                           job_lineage_t lineage) {
     assert(parsed_source && node && "exec_helper missing source or without node");
-
-    io_chain_t morphed_chain;
-    std::vector<autoclose_fd_t> opened_fds;
-    if (!resolve_file_redirections_to_fds(lineage.block_io, parser.vars().get_pwd_slash(),
-                                          &morphed_chain, &opened_fds)) {
-        parser.set_last_statuses(statuses_t::just(STATUS_EXEC_FAIL));
-        return;
-    }
-
-    lineage.block_io = std::move(morphed_chain);
     parser.eval_node(parsed_source, node, TOP, std::move(lineage));
     job_reap(parser, false);
 }

From 1f83fb47ce0830ee46cf8d3abd95198f7f03f1a5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 12 Dec 2019 17:37:36 -0800
Subject: [PATCH 1383/1732] Finish the IO cleanup.

Remove some dead code and add missing dtors.
---
 src/exec.cpp        | 32 +++++++-------------------------
 src/io.cpp          |  4 ++--
 src/io.h            |  3 +++
 src/redirection.cpp |  7 -------
 src/redirection.h   |  5 +----
 5 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 226907953..c5a47e460 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -50,12 +50,6 @@
 /// File descriptor redirection error message.
 #define FD_ERROR _(L"An error occurred while redirecting file descriptor %d")
 
-/// File redirection error message.
-#define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
-
-/// Base open mode to pass to calls to open.
-#define OPEN_MASK 0666
-
 /// Number of calls to fork() or posix_spawn().
 static relaxed_atomic_t<int> s_fork_count{0};
 
@@ -69,9 +63,11 @@ void exec_close(int fd) {
     }
 
     while (close(fd) == -1) {
-        debug(1, FD_ERROR, fd);
-        wperror(L"close");
-        break;
+        if (errno != EINTR) {
+            debug(1, FD_ERROR, fd);
+            wperror(L"close");
+            break;
+        }
     }
 }
 
@@ -181,20 +177,6 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
     safe_launch_process(p, actual_cmd, argv_array.get(), envv);
 }
 
-/// Morph an io redirection chain into redirections suitable for passing to eval, and then call
-/// eval.
-///
-/// \param parsed_source the parsed source code containing the node to evaluate
-/// \param node the node to evaluate
-/// \param ios the io redirections to be performed on this block
-template <typename T>
-void internal_exec_helper(parser_t &parser, parsed_source_ref_t parsed_source, tnode_t<T> node,
-                          job_lineage_t lineage) {
-    assert(parsed_source && node && "exec_helper missing source or without node");
-    parser.eval_node(parsed_source, node, TOP, std::move(lineage));
-    job_reap(parser, false);
-}
-
 // Returns whether we can use posix spawn for a given process in a given job.
 //
 // To avoid the race between the caller calling tcsetpgrp() and the client checking the
@@ -761,7 +743,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
         return [=](parser_t &parser) {
-            internal_exec_helper(parser, source, node, lineage);
+            parser.eval_node(source, node, TOP, lineage);
             int status = parser.get_last_status();
             // FIXME: setting the status this way is dangerous nonsense, we need to decode the
             // status properly if it was a signal.
@@ -779,7 +761,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            internal_exec_helper(parser, props->parsed_source, props->body_node, lineage);
+            parser.eval_node(props->parsed_source, props->body_node, TOP, lineage);
             function_restore_environment(parser, fb);
 
             // If the function did not execute anything, treat it as success.
diff --git a/src/io.cpp b/src/io.cpp
index 2ff31bd90..03797bf91 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -208,9 +208,9 @@ std::shared_ptr<io_buffer_t> io_bufferfill_t::finish(std::shared_ptr<io_bufferfi
 }
 
 io_pipe_t::~io_pipe_t() = default;
-
+io_fd_t::~io_fd_t() = default;
+io_close_t::~io_close_t() = default;
 io_file_t::~io_file_t() = default;
-
 io_bufferfill_t::~io_bufferfill_t() = default;
 
 io_buffer_t::~io_buffer_t() {
diff --git a/src/io.h b/src/io.h
index 24d5e6da9..6f569f08d 100644
--- a/src/io.h
+++ b/src/io.h
@@ -192,6 +192,7 @@ class io_close_t : public io_data_t {
     explicit io_close_t(int f) : io_data_t(io_mode_t::close, f) {}
 
     void print() const override;
+    ~io_close_t() override;
 };
 
 class io_fd_t : public io_data_t {
@@ -206,6 +207,8 @@ class io_fd_t : public io_data_t {
 
     void print() const override;
 
+    ~io_fd_t() override;
+
     io_fd_t(int f, int old, bool us)
         : io_data_t(io_mode_t::fd, f), old_fd(old), user_supplied(us) {}
 };
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 4e0028b92..940ddc014 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -7,13 +7,6 @@
 #include "io.h"
 #include "wutil.h"
 
-#define NOCLOB_ERROR _(L"The file '%ls' already exists")
-
-#define FILE_ERROR _(L"An error occurred while redirecting file '%ls'")
-
-/// Base open mode to pass to calls to open.
-#define OPEN_MASK 0666
-
 dup2_list_t::~dup2_list_t() = default;
 
 maybe_t<int> redirection_spec_t::get_target_as_fd() const {
diff --git a/src/redirection.h b/src/redirection.h
index 0d43e0882..c8a87e700 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -63,9 +63,6 @@ class dup2_list_t {
     /// The list of actions.
     std::vector<action_t> actions_;
 
-    /// The list of fds that we opened, and are responsible for closing.
-    std::vector<autoclose_fd_t> opened_fds_;
-
     /// Append a dup2 action.
     void add_dup2(int src, int target) {
         assert(src >= 0 && target >= 0 && "Invalid fd in add_dup2");
@@ -85,7 +82,7 @@ class dup2_list_t {
    public:
     ~dup2_list_t();
 
-    /// Disable copying because we own our fds.
+    /// Disable copying.
     dup2_list_t(const dup2_list_t &) = delete;
     void operator=(const dup2_list_t &) = delete;
 

From d6c71d77a968fe4d7169c9f07a935f297b373328 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 13 Dec 2019 16:16:19 -0800
Subject: [PATCH 1384/1732] Correctly cloexec file redirections

The IO cleanup left file redirections open in the child. For example,
/bin/cmd < file.txt would redirect stdin but also leave the file open.
Ensure these get closed properly.
---
 src/fish_test_helper.cpp | 14 ++++++++++++++
 src/io.cpp               |  3 ++-
 src/redirection.h        |  3 +++
 tests/checks/fds.fish    | 24 ++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/checks/fds.fish

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index 9f6cd7b94..a1590487d 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -1,6 +1,7 @@
 // fish_test_helper is a little program with no fish dependencies that acts like certain other
 // programs, allowing fish to test its behavior.
 
+#include <fcntl.h>
 #include <unistd.h>
 
 #include <csignal>
@@ -54,6 +55,17 @@ static void print_pid_then_sleep() {
 
 static void print_pgrp() { fprintf(stdout, "%d\n", getpgrp()); }
 
+static void print_fds() {
+    bool needs_space = false;
+    for (int fd = 0; fd <= 100; fd++) {
+        if (fcntl(fd, F_GETFD) >= 0) {
+            fprintf(stdout, "%s%d", needs_space ? " " : "", fd);
+            needs_space = true;
+        }
+    }
+    fputc('\n', stdout);
+}
+
 int main(int argc, char *argv[]) {
     if (argc <= 1) {
         fprintf(stderr, "No commands given.\n");
@@ -72,6 +84,8 @@ int main(int argc, char *argv[]) {
             print_pid_then_sleep();
         } else if (!strcmp(argv[i], "print_pgrp")) {
             print_pgrp();
+        } else if (!strcmp(argv[i], "print_fds")) {
+            print_fds();
         } else {
             fprintf(stderr, "%s: Unknown command: %s\n", argv[0], argv[i]);
             return EXIT_FAILURE;
diff --git a/src/io.cpp b/src/io.cpp
index 03797bf91..ca8648d7c 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -255,9 +255,10 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
             }
             default: {
                 // We have a path-based redireciton. Resolve it to a file.
+                // Mark it as CLO_EXEC because we don't want it to be open in any child.
                 wcstring path = path_apply_working_directory(spec.target, pwd);
                 int oflags = spec.oflags();
-                autoclose_fd_t file{wopen(path, oflags, OPEN_MASK)};
+                autoclose_fd_t file{wopen_cloexec(path, oflags, OPEN_MASK)};
                 if (!file.valid()) {
                     if ((oflags & O_EXCL) && (errno == EEXIST)) {
                         debug(1, NOCLOB_ERROR, spec.target.c_str());
diff --git a/src/redirection.h b/src/redirection.h
index c8a87e700..297afc366 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -66,6 +66,9 @@ class dup2_list_t {
     /// Append a dup2 action.
     void add_dup2(int src, int target) {
         assert(src >= 0 && target >= 0 && "Invalid fd in add_dup2");
+        // TODO: this is sloppy about CLO_EXEC. For example if the user does this:
+        //   /bin/stuff 6< file.txt
+        // and file.txt happens to get fd 6, then the file will be closed.
         if (src != target) {
             actions_.push_back(action_t{src, target});
         }
diff --git a/tests/checks/fds.fish b/tests/checks/fds.fish
new file mode 100644
index 000000000..82c20161d
--- /dev/null
+++ b/tests/checks/fds.fish
@@ -0,0 +1,24 @@
+# RUN: %fish -C "set helper %fish_test_helper" %s
+
+# Check that we don't leave stray FDs.
+
+$helper print_fds
+# CHECK: 0 1 2
+
+$helper print_fds 0>&-
+# CHECK: 1 2
+
+$helper print_fds 0>&- 2>&-
+# CHECK: 1
+
+false | $helper print_fds 0>&-
+# CHECK: 0 1 2
+
+$helper print_fds <(status current-filename)
+# CHECK: 0 1 2
+
+$helper print_fds <(status current-filename)
+# CHECK: 0 1 2
+
+$helper print_fds 3<(status current-filename)
+# CHECK: 0 1 2 3

From 9be77d1f9c63607c7537892bda7596c648beb366 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 13 Dec 2019 16:51:49 -0800
Subject: [PATCH 1385/1732] Correctly handle "self fd redirections"

This adds a test for the obscure case where an fd is redirected to
itself. This is tricky because the dup2 will not clear the CLO_EXEC bit.
So do it manually; also posix_spawn can't be used in this case.
---
 src/exec.cpp          | 14 ++++++++--
 src/postfork.cpp      | 13 ++++++++-
 src/redirection.h     |  9 +++----
 src/wutil.cpp         | 19 +++++++++-----
 src/wutil.h           |  4 +--
 tests/checks/fds.fish | 61 ++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index c5a47e460..a8a419dbf 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -182,7 +182,17 @@ static void launch_process_nofork(env_stack_t &vars, process_t *p) {
 // To avoid the race between the caller calling tcsetpgrp() and the client checking the
 // foreground process group, we don't use posix_spawn if we're going to foreground the process. (If
 // we use fork(), we can call tcsetpgrp after the fork, before the exec, and avoid the race).
-static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job) {
+static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job,
+                                        const dup2_list_t &dup2s) {
+    // Hack - do not use posix_spawn if there are self-fd redirections.
+    // For example if you were to write:
+    //   cmd 6< /dev/null
+    // it is possible that the open() of /dev/null would result in fd 6. Here even if we attempted
+    // to add a dup2 action, it would be ignored and the CLO_EXEC bit would remain. So don't use
+    // posix_spawn in this case; instead we'll call fork() and clear the CLO_EXEC bit manually.
+    for (const auto &action : dup2s.get_actions()) {
+        if (action.src == action.target) return false;
+    }
     if (job->wants_job_control()) {  //!OCLINT(collapsible if statements)
         // We are going to use job control; therefore when we launch this job it will get its own
         // process group ID. But will it be foregrounded?
@@ -594,7 +604,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
 #if FISH_USE_POSIX_SPAWN
     // Prefer to use posix_spawn, since it's faster on some systems like OS X.
-    bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j);
+    bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j, *dup2s);
     if (use_posix_spawn) {
         s_fork_count++;  // spawn counts as a fork+exec
         // Create posix spawn attributes and actions.
diff --git a/src/postfork.cpp b/src/postfork.cpp
index e1080e47d..9d939a83d 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -138,7 +138,18 @@ bool set_child_group(job_t *j, pid_t child_pid) {
 int child_setup_process(pid_t new_termowner, bool is_forked, const dup2_list_t &dup2s) {
     // Note we are called in a forked child.
     for (const auto &act : dup2s.get_actions()) {
-        int err = act.target < 0 ? close(act.src) : dup2(act.src, act.target);
+        int err;
+        if (act.target < 0) {
+            err = close(act.src);
+        } else if (act.target != act.src) {
+            // Normal redirection.
+            err = dup2(act.src, act.target);
+        } else {
+            // This is a weird case like /bin/cmd 6< file.txt
+            // The opened file (which is CLO_EXEC) wants to be dup2'd to its own fd.
+            // We need to unset the CLO_EXEC flag.
+            err = set_cloexec(act.src, false);
+        }
         if (err < 0) {
             if (is_forked) {
                 debug_safe(4, "redirect_in_child_after_fork failed in child_setup_process");
diff --git a/src/redirection.h b/src/redirection.h
index 297afc366..7bde368c4 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -66,12 +66,9 @@ class dup2_list_t {
     /// Append a dup2 action.
     void add_dup2(int src, int target) {
         assert(src >= 0 && target >= 0 && "Invalid fd in add_dup2");
-        // TODO: this is sloppy about CLO_EXEC. For example if the user does this:
-        //   /bin/stuff 6< file.txt
-        // and file.txt happens to get fd 6, then the file will be closed.
-        if (src != target) {
-            actions_.push_back(action_t{src, target});
-        }
+        // Note: record these even if src and target is the same.
+        // This is a note that we must clear the CLO_EXEC bit.
+        actions_.push_back(action_t{src, target});
     }
 
     /// Append a close action.
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 14365ecf7..9f21f3131 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -177,17 +177,24 @@ FILE *wfopen(const wcstring &path, const char *mode) {
     return result;
 }
 
-bool set_cloexec(int fd) {
+int set_cloexec(int fd, bool should_set) {
     // Note we don't want to overwrite existing flags like O_NONBLOCK which may be set. So fetch the
-    // existing flags and OR in our new one.
+    // existing flags and modify them.
     int flags = fcntl(fd, F_GETFD, 0);
     if (flags < 0) {
-        return false;
+        return -1;
     }
-    if (flags & FD_CLOEXEC) {
-        return true;
+    int new_flags = flags;
+    if (should_set) {
+        new_flags |= FD_CLOEXEC;
+    } else {
+        new_flags &= ~FD_CLOEXEC;
+    }
+    if (flags == new_flags) {
+        return 0;
+    } else {
+        return fcntl(fd, F_SETFD, new_flags);
     }
-    return fcntl(fd, F_SETFD, flags | FD_CLOEXEC) >= 0;
 }
 
 int open_cloexec(const std::string &cstring, int flags, mode_t mode, bool cloexec) {
diff --git a/src/wutil.h b/src/wutil.h
index 0363e4f13..8a3b74cd4 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -22,8 +22,8 @@
 /// Wide character version of fopen(). This sets CLO_EXEC.
 FILE *wfopen(const wcstring &path, const char *mode);
 
-/// Sets CLO_EXEC on a given fd.
-bool set_cloexec(int fd);
+/// Sets CLO_EXEC on a given fd according to the value of \p should_set.
+int set_cloexec(int fd, bool should_set = true);
 
 /// Wide character version of open().
 int wopen(const wcstring &pathname, int flags, mode_t mode = 0);
diff --git a/tests/checks/fds.fish b/tests/checks/fds.fish
index 82c20161d..c3b606a2c 100644
--- a/tests/checks/fds.fish
+++ b/tests/checks/fds.fish
@@ -14,11 +14,66 @@ $helper print_fds 0>&- 2>&-
 false | $helper print_fds 0>&-
 # CHECK: 0 1 2
 
-$helper print_fds <(status current-filename)
+$helper print_fds </dev/null
 # CHECK: 0 1 2
 
-$helper print_fds <(status current-filename)
+$helper print_fds </dev/null
 # CHECK: 0 1 2
 
-$helper print_fds 3<(status current-filename)
+$helper print_fds 3</dev/null
 # CHECK: 0 1 2 3
+
+# This attempts to trip a case where the file opened in fish
+# has the same fd as the redirection. In this case, the dup2
+# does not clear the CLO_EXEC bit.
+
+$helper print_fds 4</dev/null
+# CHECK: 0 1 2 4
+
+$helper print_fds 5</dev/null
+# CHECK: 0 1 2 5
+
+$helper print_fds 6</dev/null
+# CHECK: 0 1 2 6
+
+$helper print_fds 7</dev/null
+# CHECK: 0 1 2 7
+
+$helper print_fds 8</dev/null
+# CHECK: 0 1 2 8
+
+$helper print_fds 9</dev/null
+# CHECK: 0 1 2 9
+
+$helper print_fds 10</dev/null
+# CHECK: 0 1 2 10
+
+$helper print_fds 11</dev/null
+# CHECK: 0 1 2 11
+
+$helper print_fds 12</dev/null
+# CHECK: 0 1 2 12
+
+$helper print_fds 13</dev/null
+# CHECK: 0 1 2 13
+
+$helper print_fds 14</dev/null
+# CHECK: 0 1 2 14
+
+$helper print_fds 15</dev/null
+# CHECK: 0 1 2 15
+
+$helper print_fds 16</dev/null
+# CHECK: 0 1 2 16
+
+$helper print_fds 17</dev/null
+# CHECK: 0 1 2 17
+
+$helper print_fds 18</dev/null
+# CHECK: 0 1 2 18
+
+$helper print_fds 19</dev/null
+# CHECK: 0 1 2 19
+
+$helper print_fds 20</dev/null
+# CHECK: 0 1 2 20

From 58535408b0b2cd70ac53cc54f4a8d6f46080bd78 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 14 Dec 2019 10:42:08 +0800
Subject: [PATCH 1386/1732] redirection: add a default to
 redirection_spec_t::oflags switch

Fixes a compiler warning/error.
---
 src/redirection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redirection.cpp b/src/redirection.cpp
index 940ddc014..4ae858f74 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -27,6 +27,7 @@ int redirection_spec_t::oflags() const {
         case redirection_mode_t::input:
             return O_RDONLY;
         case redirection_mode_t::fd:
+        default:
             DIE("Not a file redirection");
     }
 }

From d2a7b631496728c1bdf2d031c0b1f9ae794cff93 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 14 Dec 2019 10:39:30 +0800
Subject: [PATCH 1387/1732] travis: turn on errors for some more serious
 compiler warnings

These warnings are upgraded to errors on several Open Build Service
platforms, so Travis should notify us as well.
---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 774bfeead..7a174d199 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,8 @@ matrix:
             - libpcre2-dev
             - python
       env:
-          - CXXFLAGS="-Werror=address"
+          # Some warnings upgraded to errors to match Open Build Service platforms
+          - CXXFLAGS="-Werror=address -Werror=return-type"
     - os: linux
       compiler: gcc
       addons:
@@ -27,7 +28,7 @@ matrix:
             - g++-multilib
             - python
       env:
-          - CXXFLAGS="-m32 -Werror=address" CFLAGS="-m32"
+          - CXXFLAGS="-m32 -Werror=address -Werror=return-type" CFLAGS="-m32"
     - os: linux
       compiler: clang
       env:

From 393c9ccf9935e8b420ac02cae55e70d310d2fe44 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Tue, 22 Oct 2019 14:21:55 -0700
Subject: [PATCH 1388/1732] Add missing completions for git-branch

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e5d6c21bd..fd3bd7ec3 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -960,12 +960,15 @@ complete -f -c git -n '__fish_git_needs_command' -a bisect -d 'Find the change t
 ### branch
 complete -f -c git -n '__fish_git_needs_command' -a branch -d 'List, create, or delete branches'
 complete -f -c git -n '__fish_git_using_command branch' -a '(__fish_git_branches)'
-complete -f -c git -n '__fish_git_using_command branch' -s d -d 'Delete branch' -xa '(__fish_git_local_branches)'
+complete -f -c git -n '__fish_git_using_command branch' -s d -l delete -d 'Delete branch' -xa '(__fish_git_local_branches)'
 complete -f -c git -n '__fish_git_using_command branch' -s D -d 'Force deletion of branch' -xa '(__fish_git_local_branches)'
-complete -f -c git -n '__fish_git_using_command branch' -s m -d 'Rename branch'
-complete -f -c git -n '__fish_git_using_command branch' -s M -d 'Force renaming branch'
-complete -f -c git -n '__fish_git_using_command branch' -s a -d 'Lists both local and remote branches'
-complete -f -c git -n '__fish_git_using_command branch' -s t -l track -d 'Track remote branch'
+complete -f -c git -n '__fish_git_using_command branch' -s f -l force -d 'Reset branch even if it already exists'
+complete -f -c git -n '__fish_git_using_command branch' -s m -l move -d 'Rename branch'
+complete -f -c git -n '__fish_git_using_command branch' -s M -d 'Force rename branch'
+complete -f -c git -n '__fish_git_using_command branch' -s c -l copy -d 'Copy branch'
+complete -f -c git -n '__fish_git_using_command branch' -s C -d 'Force copy branch'
+complete -f -c git -n '__fish_git_using_command branch' -s a -l all -d 'Lists both local and remote branches'
+complete -f -c git -n '__fish_git_using_command branch' -s t -l track -l track -d 'Track remote branch'
 complete -f -c git -n '__fish_git_using_command branch' -l no-track -d 'Do not track remote branch'
 complete -f -c git -n '__fish_git_using_command branch' -l set-upstream-to -d 'Set remote branch to track'
 complete -f -c git -n '__fish_git_using_command branch' -l merged -d 'List branches that have been merged'

From e7c401571b7b60d4084581cab3cc398619fc35b0 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Thu, 14 Nov 2019 13:01:03 -0800
Subject: [PATCH 1389/1732] Move unique remote branches up in suggested
 branches for git-checkout

Currently we suggest `origin/mybranch` before `mybranch` which seems
backwards. Most of the time users will want to check out `mybranch`.
---
 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 fd3bd7ec3..d16b049a0 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -935,8 +935,8 @@ complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modif
 complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and switch to a branch'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_tags)' -d 'Tag'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_heads)' -d 'Head'
-complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_branches)'
+complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -k -f -c git -n '__fish_git_using_command checkout; and not contains -- -- (commandline -opc)' -a '(__fish_git_recent_commits)'
 complete -k -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_files modified deleted)'
 complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'

From 48bf689358510d571a9d1b09bfa5b1cd79dd55b6 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Mon, 25 Nov 2019 12:33:05 -0800
Subject: [PATCH 1390/1732] Add completions for git-cherry-pick sequencer
 subcommands

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index d16b049a0..d7d3bac8e 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -989,6 +989,9 @@ complete -f -c git -n '__fish_git_using_command cherry-pick' -s x -d 'Append inf
 complete -f -c git -n '__fish_git_using_command cherry-pick' -s n -l no-commit -d 'Apply changes without making any commit'
 complete -f -c git -n '__fish_git_using_command cherry-pick' -s s -l signoff -d 'Add Signed-off-by line to the commit message'
 complete -f -c git -n '__fish_git_using_command cherry-pick' -l ff -d 'Fast-forward if possible'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -l continue -d 'Continue the operation in progress'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -l abort -d 'Cancel the operation'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -l skip -d 'Skip the current commit and continue with the rest of the sequence'
 
 ### clone
 complete -f -c git -n '__fish_git_needs_command' -a clone -d 'Clone a repository into a new directory'

From afd8fc3cdfcea4af46856f53c6e5b86ac26905db Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 13 Dec 2019 12:16:41 -0800
Subject: [PATCH 1391/1732] Correctly suggest files for git-restore when
 --staged is present

Previously we would include all modified, deleted, and unmerged files
regardless of what options are present.
---
 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 d7d3bac8e..e6f481239 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1528,7 +1528,7 @@ complete -f -c git -n '__fish_git_using_command restore' -l ignore-unmerged -d '
 complete -f -c git -n '__fish_git_using_command restore' -l ignore-skip-worktree-bits -d 'Ignore the sparse-checkout file and unconditionally restore any files in <pathspec>'
 complete -f -c git -n '__fish_git_using_command restore' -l overlay -d 'Never remove files when restoring'
 complete -f -c git -n '__fish_git_using_command restore' -l no-overlay -d 'Remove files when restoring (default)'
-complete -f -c git -n '__fish_git_using_command restore' -a '(__fish_git_files modified deleted unmerged)'
+complete -f -c git -n '__fish_git_using_command restore; and not contains -- --staged (commandline -opc)' -a '(__fish_git_files modified deleted unmerged)'
 complete -f -c git -n '__fish_git_using_command restore; and contains -- --staged (commandline -opc)' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)'
 complete -f -c git -n '__fish_git_using_command restore; and __fish_contains_opt -s s source' -a '(git ls-files)'
 # switch options

From 012773436e5683078dbb8d07706b3e2180ec8a21 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Fri, 13 Dec 2019 12:27:22 -0800
Subject: [PATCH 1392/1732] Suggest unique remote branches for git-switch

From the `git-switch` documentation:

If <branch> is not found but there does exist a tracking branch in
exactly one remote (call it <remote>) with a matching name, treat as
equivalent to

   $ git switch -c <branch> --track <remote>/<branch>
---
 share/completions/git.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/git.fish b/share/completions/git.fish
index e6f481239..83586f6a1 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1534,6 +1534,7 @@ complete -f -c git -n '__fish_git_using_command restore; and __fish_contains_opt
 # switch options
 complete -f -c git -n '__fish_git_needs_command' -a switch -d 'Switch to a branch'
 complete -k -f -c git -n '__fish_git_using_command switch' -a '(__fish_git_branches)'
+complete -k -f -c git -n '__fish_git_using_command switch' -a '(__fish_git_unique_remote_branches)' -d 'Unique Remote Branch'
 complete -f -c git -n '__fish_git_using_command switch' -r -s c -l create -d 'Create a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -r -s C -l force-create -d 'Force create a new branch'
 complete -f -c git -n '__fish_git_using_command switch' -s d -l detach -d 'Switch to a commit for inspection and discardable experiment'

From 625db1d3f61b20282363b5357e65f8451d618552 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 14 Dec 2019 22:35:58 +0800
Subject: [PATCH 1393/1732] docs: add fish_cancel event

Introduced in 2dcaf4f5c058 as part of #5973.

[ci skip]
---
 sphinx_doc_src/cmds/function.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index 173072e5c..52724cf8a 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -62,6 +62,8 @@ By using one of the event handler switches, a function can be made to run automa
 
 - ``fish_exit`` is emitted right before fish exits.
 
+- ``fish_cancel``, which is emitted when a commandline is cleared (used for terminal-shell integration).
+
 Example
 -------
 

From 5911fc94b8145e0f8c96dd946602147913a250ae Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 15 Dec 2019 21:48:55 +0800
Subject: [PATCH 1394/1732] littlecheck: pass close_fds to subprocess.Popen

Closes #6435.

close_fds=True is actually the default in Python 2.7 and 3.2, but not in
ancient (but still in production in Red Hat Enterprise Linux 6) Python
2.6. Enable it there as well.
---
 build_tools/littlecheck.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_tools/littlecheck.py b/build_tools/littlecheck.py
index 8fe5841dd..19759745c 100755
--- a/build_tools/littlecheck.py
+++ b/build_tools/littlecheck.py
@@ -250,7 +250,12 @@ class TestRun(object):
         if self.config.verbose:
             print(self.subbed_command)
         proc = subprocess.Popen(
-            self.subbed_command, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True
+            self.subbed_command,
+            stdin=PIPE,
+            stdout=PIPE,
+            stderr=PIPE,
+            shell=True,
+            close_fds=True,  # For Python 2.6 as shipped on RHEL 6
         )
         stdout, stderr = proc.communicate()
         outlines = [

From b1144a1fde571e513dc4f99003a2ff1d488bb226 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 16 Dec 2019 12:37:41 +0100
Subject: [PATCH 1395/1732] completion: fix file completion of redirection
 targets

This fixes a regression introduced in
6fb7f9b6b - Fix completion for builtins with subcommands
---
 src/complete.cpp           | 1 +
 tests/checks/complete.fish | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/complete.cpp b/src/complete.cpp
index a93047493..702af75d4 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1542,6 +1542,7 @@ void completer_t::perform() {
                 tok_t prev_tok = tokens.at(tokens.size() - 2);
                 if (prev_tok.type == token_type_t::string)
                     previous_argument = prev_tok.get_source(cmd);
+                in_redirection = prev_tok.type == token_type_t::redirect;
             }
         }
 
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 93d5ba31d..2f4469626 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -150,3 +150,6 @@ complete -C'for _ in ' | string collect >&- && echo completed some files
 # function; #5415
 complete -C'function : --arg'
 # CHECK: --argument-names	{{.*}}
+
+complete -C'echo > /' | string length -q && echo ok
+# CHECK: ok

From 24562a9f49e06ce1cf62448911407dc6c4fd757e Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 16 Dec 2019 12:56:30 +0100
Subject: [PATCH 1396/1732] avoid allocation on lookup of $fish_trace

Looking up a variable by a string literal implicitly constructs a wcstring.
By avoiding that, we get a noticeable reduction of temporary allocations.

$ HOME=. heaptrack ./fish -c true
heaptrack stats:			# baseline
        allocations:            7635
        leaked allocations:     3277
        temporary allocations:  602
heaptrack stats:			# new
        allocations:            7565
        leaked allocations:     3267
        temporary allocations:  530
---
 src/trace.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/trace.cpp b/src/trace.cpp
index 03b6481db..d7968c9c4 100644
--- a/src/trace.cpp
+++ b/src/trace.cpp
@@ -6,11 +6,13 @@
 #include "flog.h"
 #include "parser.h"
 
+static const wcstring VAR_fish_trace = L"fish_trace";
+
 bool trace_enabled(const parser_t &parser) {
     auto &ld = parser.libdata();
     if (ld.suppress_fish_trace) return false;
     // TODO: this variable lookup is somewhat expensive, consider how to make this cheaper.
-    return !parser.vars().get(L"fish_trace").missing_or_empty();
+    return !parser.vars().get(VAR_fish_trace).missing_or_empty();
 }
 
 /// Trace an "argv": a list of arguments where the first is the command.

From 3b2dbb99ec95ac083ace895c8e209d33a2539a30 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 16 Dec 2019 19:53:10 +0100
Subject: [PATCH 1397/1732] po: s/__fish_git_prompt/fish_git_prompt/g

---
 po/de.po    | 32 ++++++++++++++++----------------
 po/en.po    | 32 ++++++++++++++++----------------
 po/fr.po    | 32 ++++++++++++++++----------------
 po/nb.po    | 32 ++++++++++++++++----------------
 po/nn.po    | 32 ++++++++++++++++----------------
 po/pl.po    | 32 ++++++++++++++++----------------
 po/pt_BR.po | 32 ++++++++++++++++----------------
 po/sv.po    | 32 ++++++++++++++++----------------
 po/zh_CN.po | 32 ++++++++++++++++----------------
 9 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/po/de.po b/po/de.po
index 41f19ff5b..b27a1b28a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -67046,48 +67046,48 @@ msgstr "Zeigt Änderungsinformationen zu dem Paket an"
 msgid "Command used to find descriptions for commands"
 msgstr "Funktionstasten für Befehle nutzen"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 #, fuzzy
 msgid "Prompt function for Git"
 msgstr "Aktuelle Funktionen sind: "
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/en.po b/po/en.po
index 06ef282b5..257f15a0a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -66398,47 +66398,47 @@ msgstr "Display change information for the package"
 msgid "Command used to find descriptions for commands"
 msgstr "Use function keys for commands"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr "Prompt function for Git"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr "Event handler, repaints prompt when functionality changes"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr "Event handler, repaints prompt when any color changes"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr "Event handler, repaints prompt when any char changes"
 
diff --git a/po/fr.po b/po/fr.po
index dbc4fbfca..2539f6f8c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65396,48 +65396,48 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 #, fuzzy
 msgid "Prompt function for Git"
 msgstr "Fonctions d’invite pour Git"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 5c813bf59..e0458ca73 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -61855,47 +61855,47 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/nn.po b/po/nn.po
index 05532bc36..ce55ff93b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -61856,47 +61856,47 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index d2f511284..f361e2342 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -62439,47 +62439,47 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6d1c99387..9c2d8b971 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -67520,50 +67520,50 @@ msgstr "Display change information for the package"
 msgid "Command used to find descriptions for commands"
 msgstr "Use function keys for commands"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 #, fuzzy
 msgid "Prompt function for Git"
 msgstr "Current functions are: "
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 #, fuzzy
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 #, fuzzy
 msgid "Event handler, repaints prompt when any color changes"
 msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 #, fuzzy
 msgid "Event handler, repaints prompt when any char changes"
 msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
diff --git a/po/sv.po b/po/sv.po
index 1ab5d6fc2..ac78cd222 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -61859,47 +61859,47 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 37ad0289f..9a95ab73d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -62400,47 +62400,47 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-msgid "Helper function for __fish_git_prompt"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
+msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
 msgid "Prompt function for Git"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has staged "
+"fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:4
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:4
 msgid ""
-"__fish_git_prompt helper, tells whether or not the current branch has "
+"fish_git_prompt helper, tells whether or not the current branch has "
 "tracked, modified files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:5
-msgid "__fish_git_prompt helper, returns the current Git operation and branch"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:5
+msgid "fish_git_prompt helper, returns the current Git operation and branch"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:6
-msgid "__fish_git_prompt helper, checks char variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:6
+msgid "fish_git_prompt helper, checks char variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:7
-msgid "__fish_git_prompt helper, checks color variables"
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:7
+msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
 msgid "Event handler, repaints prompt when functionality changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
 msgid "Event handler, repaints prompt when any color changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
 msgid "Event handler, repaints prompt when any char changes"
 msgstr ""
 

From 8bf9f524619e43578d7c8ff5059b3f71beeddd52 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 16 Dec 2019 14:08:28 -0800
Subject: [PATCH 1398/1732] Always detach new pthreads

There are no longer any calls to pthread_join. Just make all pthreads
detached.
---
 src/fish_tests.cpp | 13 +++++++------
 src/iothread.cpp   | 29 ++++++++++++-----------------
 src/iothread.h     |  5 +++--
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 74659a3fe..a89147dbc 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -775,13 +775,14 @@ static void test_iothread() {
 
 static void test_pthread() {
     say(L"Testing pthreads");
-    pthread_t result = {};
-    int val = 3;
-    bool made = make_pthread(&result, [&val]() { val += 2; });
+    std::atomic<int> val{3};
+    std::promise<void> promise;
+    bool made = make_detached_pthread([&]() {
+        val = val + 2;
+        promise.set_value();
+    });
     do_test(made);
-    void *ignore = nullptr;
-    int ret = pthread_join(result, &ignore);
-    do_test(ret == 0);
+    promise.get_future().wait();
     do_test(val == 5);
 }
 
diff --git a/src/iothread.cpp b/src/iothread.cpp
index eb49ac00f..746a2dbac 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -120,7 +120,7 @@ struct thread_pool_t {
     static void *run_trampoline(void *vpool);
 
     /// Attempt to spawn a new pthread.
-    pthread_t spawn();
+    bool spawn();
 
     /// No copying or moving.
     thread_pool_t(const thread_pool_t &) = delete;
@@ -229,16 +229,8 @@ void *thread_pool_t::run_trampoline(void *pool) {
 }
 
 /// Spawn another thread. No lock is held when this is called.
-pthread_t thread_pool_t::spawn() {
-    // 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;
-    if (make_pthread(&thread, run_trampoline, static_cast<void *>(this))) {
-        // We will never join this thread.
-        DIE_ON_FAILURE(pthread_detach(thread));
-    }
-    return thread;
+bool thread_pool_t::spawn() {
+    return make_detached_pthread(&run_trampoline, static_cast<void *>(this));
 }
 
 int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion) {
@@ -273,8 +265,11 @@ int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion)
         pool.queue_cond.notify_one();
     }
     if (spawn_new_thread) {
-        if (pthread_t pt = this->spawn()) {
-            FLOGF(iothread, L"pthread %p spawned", pt);
+        // 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.
+        if (this->spawn()) {
+            FLOGF(iothread, L"pthread spawned");
         } else {
             // We failed to spawn a thread; decrement the thread count.
             pool.req_data.acquire()->total_threads -= 1;
@@ -441,7 +436,7 @@ void iothread_perform_on_main(void_function_t &&func) {
     assert(req.done);
 }
 
-bool make_pthread(pthread_t *result, void *(*func)(void *), void *param) {
+bool make_detached_pthread(void *(*func)(void *), void *param) {
     // The spawned thread inherits our signal mask. We don't want the thread to ever receive signals
     // on the spawned thread, so temporarily block all signals, spawn the thread, and then restore
     // it.
@@ -457,7 +452,7 @@ bool make_pthread(pthread_t *result, void *(*func)(void *), void *param) {
     if (err == 0) {
         // Success, return the thread.
         debug(5, "pthread %p spawned", (void *)(intptr_t)thread);
-        *result = thread;
+        DIE_ON_FAILURE(pthread_detach(thread));
     } else {
         perror("pthread_create");
     }
@@ -477,10 +472,10 @@ static void *func_invoker(void *param) {
     return nullptr;
 }
 
-bool make_pthread(pthread_t *result, void_func_t &&func) {
+bool make_detached_pthread(void_func_t &&func) {
     // Copy the function into a heap allocation.
     void_func_t *vf = new void_func_t(std::move(func));
-    if (make_pthread(result, func_invoker, vf)) {
+    if (make_detached_pthread(func_invoker, vf)) {
         return true;
     }
     // Thread spawning failed, clean up our heap allocation.
diff --git a/src/iothread.h b/src/iothread.h
index ae3395471..ad55b0996 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -79,10 +79,11 @@ inline int iothread_perform(std::function<void(void)> &&func) {
 void iothread_perform_on_main(std::function<void(void)> &&func);
 
 /// Creates a pthread, manipulating the signal mask so that the thread receives no signals.
+/// The thread is detached.
 /// The pthread runs \p func.
 /// \returns true on success, false on failure.
-bool make_pthread(pthread_t *result, void *(*func)(void *), void *param);
-bool make_pthread(pthread_t *result, std::function<void(void)> &&func);
+bool make_detached_pthread(void *(*func)(void *), void *param);
+bool make_detached_pthread(std::function<void(void)> &&func);
 
 /// \returns a thread ID for this thread.
 /// Thread IDs are never repeated.

From 4f3b3f7d61a24c46bd6e7ea6cc288fd5adb56655 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 16 Dec 2019 19:13:32 -0800
Subject: [PATCH 1399/1732] Rename GIT_DIR to FISH_BASE_DIR in
 git_version_gen.sh

$GIT_DIR is interpreted by git as an environment variable, pointing at the
.git directory. If git_version_gen.sh is run in an environment with an
exported GIT_DIR, it will re-export GIT_DIR to point at the fish source
directory. This will cause git operations to fail.

This could be reproduced as building fish as part of an interactive rebase
'exec' command. git_version_gen.sh would always fail!
---
 build_tools/git_version_gen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh
index 34966ab5c..49a15c108 100755
--- a/build_tools/git_version_gen.sh
+++ b/build_tools/git_version_gen.sh
@@ -6,8 +6,8 @@
 
 set -e
 
-# Find the fish git directory as two levels up from script directory.
-GIT_DIR="$( cd "$( dirname "$( dirname "$0" )" )" && pwd )"
+# Find the fish directory as two levels up from script directory.
+FISH_BASE_DIR="$( cd "$( dirname "$( dirname "$0" )" )" && pwd )"
 DEF_VER=unknown
 
 # First see if there is a version file (included in release tarballs),
@@ -15,7 +15,7 @@ DEF_VER=unknown
 if test -f version
 then
 	VN=$(cat version) || VN="$DEF_VER"
-elif ! VN=$(git -C "$GIT_DIR" describe --always --dirty 2>/dev/null); then
+elif ! VN=$(git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then
 	VN="$DEF_VER"
 fi
 

From 09f8e05b804b7d65b259dee0cf3b5010d6d3673e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 15:39:05 -0800
Subject: [PATCH 1400/1732] Clean up the return type of parser_t::eval

parser_t::eval indicates whether there was a parse error. It can be
easily confused with the status of the execution. Use a real type to
make it more clear.
---
 src/builtin_eval.cpp |  4 ++--
 src/exec.cpp         |  2 +-
 src/fish.cpp         |  3 ++-
 src/fish_tests.cpp   |  4 +---
 src/parser.cpp       | 49 +++++++++++++++++++++++++-------------------
 src/parser.h         | 24 ++++++++++++++++------
 6 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 8de6c10e2..1cbb0d262 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -27,8 +27,8 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) != 0) {
-            // This indicates a parse error; nothing actually got executed.
+        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
+            eval_result_t::ok) {
             status = STATUS_CMD_ERROR;
         } else if (cached_exec_count == parser.libdata().exec_count) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
diff --git a/src/exec.cpp b/src/exec.cpp
index a8a419dbf..a421c52f4 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1183,7 +1183,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // be null.
     std::shared_ptr<io_buffer_t> buffer;
     if (auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit)) {
-        if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == 0) {
+        if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == eval_result_t::ok) {
             subcommand_statuses = parser.get_last_statuses();
         }
         buffer = io_bufferfill_t::finish(std::move(bufferfill));
diff --git a/src/fish.cpp b/src/fish.cpp
index 068358a77..33bc0e198 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -254,7 +254,8 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
 
     for (const auto &cmd : *cmds) {
         const wcstring cmd_wcs = str2wcstring(cmd);
-        res = parser.eval(cmd_wcs, io, TOP);
+        eval_result_t eval_res = parser.eval(cmd_wcs, io, TOP);
+        res = (eval_res == eval_result_t::ok ? 0 : 1);
     }
 
     return res;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index a89147dbc..26aa0e4cb 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5202,13 +5202,11 @@ static void test_illegal_command_exit_code() {
         {L"abc?def", STATUS_UNMATCHED_WILDCARD},
     };
 
-    int res = 0;
-    UNUSED(res);
     const io_chain_t empty_ios;
     parser_t &parser = parser_t::principal_parser();
 
     for (const auto &test : tests) {
-        res = parser.eval(test.txt, empty_ios, TOP);
+        parser.eval(test.txt, empty_ios, TOP);
 
         int exit_status = parser.get_last_status();
         if (exit_status != test.result) {
diff --git a/src/parser.cpp b/src/parser.cpp
index 698d5ff84..2f5a73fdf 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -616,23 +616,25 @@ profile_item_t *parser_t::create_profile_item() {
     return result;
 }
 
-int parser_t::eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type) {
+eval_result_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
+                             enum block_type_t block_type) {
     // Parse the source into a tree, if we can.
     parse_error_list_t error_list;
-    parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list);
-    if (!ps) {
+    if (parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list)) {
+        return this->eval(ps, io, block_type);
+    } else {
         // Get a backtrace. This includes the message.
         wcstring backtrace_and_desc;
         this->get_backtrace(cmd, error_list, backtrace_and_desc);
 
         // Print it.
         std::fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
-        return 1;
+        return eval_result_t::error;
     }
-    return this->eval(ps, io, block_type);
 }
 
-int parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type) {
+eval_result_t parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io,
+                             enum block_type_t block_type) {
     assert(block_type == TOP || block_type == SUBST);
     if (!ps->tree.empty()) {
         job_lineage_t lineage;
@@ -641,12 +643,12 @@ int parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
         return this->eval_node(ps, start, block_type, std::move(lineage));
     }
-    return 0;
+    return eval_result_t::ok;
 }
 
 template <typename T>
-int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
-                        job_lineage_t lineage) {
+eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
+                                  job_lineage_t lineage) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -655,17 +657,13 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t bl
     // not empty, we are still in the process of cancelling; refuse to evaluate anything.
     if (this->cancellation_requested) {
         if (!block_stack.empty()) {
-            return 1;
+            return eval_result_t::cancelled;
         }
         this->cancellation_requested = false;
     }
 
     // Only certain blocks are allowed.
-    if ((block_type != TOP) && (block_type != SUBST)) {
-        debug(1, INVALID_SCOPE_ERR_MSG, parser_t::get_block_desc(block_type));
-        bugreport();
-        return 1;
-    }
+    assert((block_type == TOP || block_type == SUBST) && "Invalid block type");
 
     job_reap(*this, false);  // not sure why we reap jobs here
 
@@ -676,19 +674,28 @@ int parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t bl
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(
         &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
-    int result = execution_context->eval_node(node, scope_block);
+    parse_execution_result_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
     job_reap(*this, false);  // reap again
-    return result;
+    switch (res) {
+        case parse_execution_success:
+            return eval_result_t::ok;
+        case parse_execution_errored:
+            return eval_result_t::error;
+        case parse_execution_cancelled:
+            return eval_result_t::cancelled;
+        case parse_execution_skipped:
+            DIE("skipped should not be returned from run functions");
+    }
 }
 
 // Explicit instantiations. TODO: use overloads instead?
-template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::statement>,
-                                 enum block_type_t, job_lineage_t lineage);
-template int parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>, enum block_type_t,
-                                 job_lineage_t lineage);
+template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::statement>,
+                                           enum block_type_t, job_lineage_t lineage);
+template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>,
+                                           enum block_type_t, job_lineage_t lineage);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                              wcstring &output) const {
diff --git a/src/parser.h b/src/parser.h
index 6bb0026b7..bbe1c1eff 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -53,6 +53,18 @@ enum class loop_status_t {
     continues,  /// current loop block should be skipped
 };
 
+/// Result of the source code form of eval.
+enum class eval_result_t {
+    /// eval was able to evaluate the source or tree.
+    ok,
+
+    /// Evaluation was cancelled, e.g. because of a signal.
+    cancelled,
+
+    /// Parse or execution error (but not simply a failed command).
+    error,
+};
+
 /// block_t represents a block of commands.
 class block_t {
     /// Construct from a block type.
@@ -258,18 +270,18 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// \param io io redirections to perform on all started jobs
     /// \param block_type The type of block to push on the block stack
     ///
-    /// \return 0 on success, 1 on a parse error.
-    int eval(wcstring cmd, const io_chain_t &io, enum block_type_t block_type);
+    /// \return the eval result,
+    eval_result_t eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluate the parsed source ps.
-    /// \return 0 on success, 1 on a parse error.
-    int eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
+    /// Because the source has been parsed, a syntax error is impossible.
+    eval_result_t eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    int eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
-                  job_lineage_t lineage);
+    eval_result_t eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
+                            job_lineage_t lineage);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used

From 72de8768d9c8d744e650342bd52f75dfb9b94878 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 16:19:12 -0800
Subject: [PATCH 1401/1732] Remove RUNNING_IN_XCODE checks

This is never set any more.
---
 src/fish_tests.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 26aa0e4cb..ebf6591e3 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -127,22 +127,14 @@ static void err(const wchar_t *blah, ...) {
     va_start(va, blah);
     err_count++;
 
-    // Xcode's term doesn't support color (even though TERM claims it does).
-    bool colorize = !getenv("RUNNING_IN_XCODE");
-
     // Show errors in red.
-    if (colorize) {
-        std::fputws(L"\x1B[31m", stdout);
-    }
+    std::fputws(L"\x1B[31m", stdout);
     std::fwprintf(stdout, L"Error: ");
     std::vfwprintf(stdout, blah, va);
     va_end(va);
 
     // Return to normal color.
-    if (colorize) {
-        std::fputws(L"\x1B[0m", stdout);
-    }
-
+    std::fputws(L"\x1B[0m", stdout);
     std::fwprintf(stdout, L"\n");
 }
 
@@ -1050,10 +1042,6 @@ static void test_1_cancellation(const wchar_t *src) {
 }
 
 static void test_cancellation() {
-    if (getenv("RUNNING_IN_XCODE")) {
-        say(L"Skipping Ctrl-C cancellation test because we are running in Xcode debugger");
-        return;
-    }
     say(L"Testing Ctrl-C cancellation. If this hangs, that's a bug!");
 
     // Enable fish's signal handling here. We need to make this interactive for fish to install its

From ebc262cfbaf8ded7a2de5c10ad7ac622d814a733 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 16:41:10 -0800
Subject: [PATCH 1402/1732] Fix sporadic cancellation test failures

If a Control-C is received during expanding a command substitution, we
may execute the job anyways, because we do not check for cancellation
after the expansion. Ensure that does not happen.

This should fix sporadic test failures in the cancellation unit test.
---
 src/parse_execution.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index d707c4164..de5007b17 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -926,6 +926,11 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         }
     }
 
+    // We may have received a cancellation during this expansion.
+    if (parser->cancellation_requested) {
+        return parse_execution_cancelled;
+    }
+
     return parse_execution_success;
 }
 

From a58286baea9060f78ace3fdaf900bf45b1f1516e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 16:44:42 -0800
Subject: [PATCH 1403/1732] Remove parse_execution_skipped

This was unused.
---
 src/parse_execution.h | 3 ---
 src/parser.cpp        | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/parse_execution.h b/src/parse_execution.h
index 4edf7dc76..b9018f8ff 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -21,9 +21,6 @@ enum parse_execution_result_t {
     parse_execution_errored,
     /// The job was cancelled (e.g. Ctrl-C).
     parse_execution_cancelled,
-    /// The job was skipped (e.g. due to a not-taken 'and' command). This is a special return
-    /// allowed only from the populate functions, not the run functions.
-    parse_execution_skipped
 };
 
 class parse_execution_context_t {
diff --git a/src/parser.cpp b/src/parser.cpp
index 2f5a73fdf..1146fe1a3 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -686,8 +686,6 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
             return eval_result_t::error;
         case parse_execution_cancelled:
             return eval_result_t::cancelled;
-        case parse_execution_skipped:
-            DIE("skipped should not be returned from run functions");
     }
 }
 

From c011f3a8e992aabdea2cef7e942df50a82735efd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 16:52:15 -0800
Subject: [PATCH 1404/1732] Unify parse_execution_result_t and eval_result_t

These are just the same thing now; make everything eval_result_t.
---
 src/parse_execution.cpp | 225 ++++++++++++++++++++--------------------
 src/parse_execution.h   | 112 ++++++++++----------
 src/parser.cpp          |  11 +-
 src/parser.h            |  13 +--
 4 files changed, 169 insertions(+), 192 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index de5007b17..c1af96268 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -240,9 +240,9 @@ bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) co
     }
 }
 
-parse_execution_result_t parse_execution_context_t::run_if_statement(
-    tnode_t<g::if_statement> statement, const block_t *associated_block) {
-    parse_execution_result_t result = parse_execution_success;
+eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statement> statement,
+                                                          const block_t *associated_block) {
+    eval_result_t result = eval_result_t::ok;
 
     // We have a sequence of if clauses, with a final else, resulting in a single job list that we
     // execute.
@@ -255,7 +255,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
 
     for (;;) {
         if (should_cancel_execution(associated_block)) {
-            result = parse_execution_cancelled;
+            result = eval_result_t::cancelled;
             break;
         }
 
@@ -263,14 +263,14 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
         tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
 
-        // Check the condition and the tail. We treat parse_execution_errored here as failure, in
+        // Check the condition and the tail. We treat eval_result_t::error here as failure, in
         // accordance with historic behavior.
-        parse_execution_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == parse_execution_success) {
+        eval_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == eval_result_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
         const bool take_branch =
-            (cond_ret == parse_execution_success) && parser->get_last_status() == EXIT_SUCCESS;
+            (cond_ret == eval_result_t::ok) && parser->get_last_status() == EXIT_SUCCESS;
 
         if (take_branch) {
             // Condition succeeded.
@@ -305,7 +305,7 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         block_t *ib = parser->push_block(block_t::if_block());
         run_job_list(job_list_to_execute, ib);
         if (should_cancel_execution(ib)) {
-            result = parse_execution_cancelled;
+            result = eval_result_t::cancelled;
         }
         parser->pop_block(ib);
     } else {
@@ -317,34 +317,32 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
 
     // It's possible there's a last-minute cancellation (issue #1297).
     if (should_cancel_execution(associated_block)) {
-        result = parse_execution_cancelled;
+        result = eval_result_t::cancelled;
     }
 
     // Otherwise, take the exit status of the job list. Reversal of issue #1061.
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_begin_statement(
-    tnode_t<g::job_list> contents) {
+eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
     trace_if_enabled(*parser, L"begin");
     block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
-    parse_execution_result_t ret = run_job_list(contents, sb);
+    eval_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
     trace_if_enabled(*parser, L"end begin");
     return ret;
 }
 
 // Define a function.
-parse_execution_result_t parse_execution_context_t::run_function_statement(
-    tnode_t<g::function_header> header, tnode_t<g::job_list> body) {
+eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::function_header> header,
+                                                                tnode_t<g::job_list> body) {
     // Get arguments.
     wcstring_list_t arguments;
     argument_node_list_t arg_nodes = header.descendants<g::argument>();
-    parse_execution_result_t result =
-        this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
+    eval_result_t result = this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
 
-    if (result != parse_execution_success) {
+    if (result != eval_result_t::ok) {
         return result;
     }
     trace_if_enabled(*parser, L"function", arguments);
@@ -355,18 +353,18 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
     wcstring errtext = streams.err.contents();
     if (!errtext.empty()) {
         this->report_error(header, L"%ls", errtext.c_str());
-        result = parse_execution_errored;
+        result = eval_result_t::error;
     }
 
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_block_statement(
-    tnode_t<g::block_statement> statement, const block_t *associated_block) {
+eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_statement> statement,
+                                                             const block_t *associated_block) {
     tnode_t<g::block_header> bheader = statement.child<0>();
     tnode_t<g::job_list> contents = statement.child<1>();
 
-    parse_execution_result_t ret = parse_execution_success;
+    eval_result_t ret = eval_result_t::ok;
     if (auto header = bheader.try_get_child<g::for_header, 0>()) {
         ret = run_for_statement(header, contents);
     } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
@@ -391,7 +389,7 @@ bool parse_execution_context_t::is_function_context() const {
     return is_within_function_call;
 }
 
-parse_execution_result_t parse_execution_context_t::run_for_statement(
+eval_result_t parse_execution_context_t::run_for_statement(
     tnode_t<grammar::for_header> header, tnode_t<grammar::job_list> block_contents) {
     // Get the variable name: `for var_name in ...`. We expand the variable name. It better result
     // in just one.
@@ -399,14 +397,14 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     wcstring for_var_name = get_source(var_name_node);
     if (!expand_one(for_var_name, expand_flags_t{}, parser->vars(), parser->shared())) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     // Get the contents to iterate over.
     wcstring_list_t arguments;
-    parse_execution_result_t ret = this->expand_arguments_from_nodes(
-        get_argument_nodes(header.child<3>()), &arguments, nullglob);
-    if (ret != parse_execution_success) {
+    eval_result_t ret = this->expand_arguments_from_nodes(get_argument_nodes(header.child<3>()),
+                                                          &arguments, nullglob);
+    if (ret != eval_result_t::ok) {
         return ret;
     }
 
@@ -418,13 +416,13 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         if (retval != ENV_OK) {
             report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
                          for_var_name.c_str());
-            return parse_execution_errored;
+            return eval_result_t::error;
         }
     }
 
     if (!valid_var_name(for_var_name)) {
         report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     trace_if_enabled(*parser, L"for", arguments);
@@ -433,7 +431,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     // Now drive the for loop.
     for (const wcstring &val : arguments) {
         if (should_cancel_execution(fb)) {
-            ret = parse_execution_cancelled;
+            ret = eval_result_t::cancelled;
             break;
         }
 
@@ -460,9 +458,9 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     return ret;
 }
 
-parse_execution_result_t parse_execution_context_t::run_switch_statement(
+eval_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<grammar::switch_statement> statement) {
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
 
     // Get the switch variable.
     tnode_t<grammar::argument> switch_value_n = statement.child<1>();
@@ -495,13 +493,13 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         }
     }
 
-    if (result == parse_execution_success && switch_values_expanded.size() > 1) {
+    if (result == eval_result_t::ok && switch_values_expanded.size() > 1) {
         result =
             report_error(switch_value_n, _(L"switch: Expected at most one argument, got %lu\n"),
                          switch_values_expanded.size());
     }
 
-    if (result != parse_execution_success) {
+    if (result != eval_result_t::ok) {
         return result;
     }
 
@@ -515,7 +513,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<g::case_item> matching_case_item{};
     while (auto case_item = case_item_list.next_in_list<g::case_item>()) {
         if (should_cancel_execution(sb)) {
-            result = parse_execution_cancelled;
+            result = eval_result_t::cancelled;
             break;
         }
 
@@ -524,9 +522,9 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         // contains an unexpandable process will report and then fail to match.
         auto arg_nodes = get_argument_nodes(case_item.child<1>());
         wcstring_list_t case_args;
-        parse_execution_result_t case_result =
+        eval_result_t case_result =
             this->expand_arguments_from_nodes(arg_nodes, &case_args, failglob);
-        if (case_result == parse_execution_success) {
+        if (case_result == eval_result_t::ok) {
             for (const wcstring &arg : case_args) {
                 // Unescape wildcards so they can be expanded again.
                 wcstring unescaped_arg = parse_util_unescape_wildcards(arg);
@@ -544,7 +542,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
 
     if (matching_case_item) {
         // Success, evaluate the job list.
-        assert(result == parse_execution_success && "Expected success");
+        assert(result == eval_result_t::ok && "Expected success");
         auto job_list = matching_case_item.child<3>();
         result = this->run_job_list(job_list, sb);
     }
@@ -553,10 +551,10 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_while_statement(
-    tnode_t<grammar::while_header> header, tnode_t<grammar::job_list> contents,
-    const block_t *associated_block) {
-    parse_execution_result_t ret = parse_execution_success;
+eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::while_header> header,
+                                                             tnode_t<grammar::job_list> contents,
+                                                             const block_t *associated_block) {
+    eval_result_t ret = eval_result_t::ok;
 
     // "The exit status of the while loop shall be the exit status of the last compound-list-2
     // executed, or zero if none was executed."
@@ -584,16 +582,15 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         first_cond_check = false;
 
         // Check the condition.
-        parse_execution_result_t cond_ret =
-            this->run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == parse_execution_success) {
+        eval_result_t cond_ret = this->run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == eval_result_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
 
         // If the loop condition failed to execute, then exit the loop without modifying the exit
         // status. If the loop condition executed with a failure status, restore the status and then
         // exit the loop.
-        if (cond_ret != parse_execution_success) {
+        if (cond_ret != eval_result_t::ok) {
             break;
         } else if (parser->get_last_status() != EXIT_SUCCESS) {
             parser->set_last_statuses(cond_saved_status);
@@ -602,7 +599,7 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
 
         // Check cancellation.
         if (this->should_cancel_execution(associated_block)) {
-            ret = parse_execution_cancelled;
+            ret = eval_result_t::cancelled;
             break;
         }
 
@@ -636,10 +633,10 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
     return ret;
 }
 
-// Reports an error. Always returns parse_execution_errored, so you can assign the result to an
+// Reports an error. Always returns eval_result_t::error, so you can assign the result to an
 // 'errored' variable.
-parse_execution_result_t parse_execution_context_t::report_error(const parse_node_t &node,
-                                                                 const wchar_t *fmt, ...) const {
+eval_result_t parse_execution_context_t::report_error(const parse_node_t &node, const wchar_t *fmt,
+                                                      ...) const {
     // Create an error.
     parse_error_list_t error_list = parse_error_list_t(1);
     parse_error_t *error = &error_list.at(0);
@@ -653,11 +650,10 @@ parse_execution_result_t parse_execution_context_t::report_error(const parse_nod
     va_end(va);
 
     this->report_errors(error_list);
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-parse_execution_result_t parse_execution_context_t::report_errors(
-    const parse_error_list_t &error_list) const {
+eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const {
     if (!parser->cancellation_requested) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
@@ -672,19 +668,19 @@ parse_execution_result_t parse_execution_context_t::report_errors(
             std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
     }
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-/// Reports an unmatched wildcard error and returns parse_execution_errored.
-parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_error(
+/// Reports an unmatched wildcard error and returns eval_result_t::error.
+eval_result_t parse_execution_context_t::report_unmatched_wildcard_error(
     const parse_node_t &unmatched_wildcard) const {
     parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
     report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
 /// Handle the case of command not found.
-parse_execution_result_t parse_execution_context_t::handle_command_not_found(
+eval_result_t parse_execution_context_t::handle_command_not_found(
     const wcstring &cmd_str, tnode_t<g::plain_statement> statement, int err_code) {
     // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
     // status to 127, which is the standard number used by other shells like bash and zsh.
@@ -698,10 +694,10 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
         wcstring_list_t event_args;
         {
             auto args = get_argument_nodes(statement.child<1>());
-            parse_execution_result_t arg_result =
+            eval_result_t arg_result =
                 this->expand_arguments_from_nodes(args, &event_args, failglob);
 
-            if (arg_result != parse_execution_success) {
+            if (arg_result != eval_result_t::ok) {
                 return arg_result;
             }
 
@@ -718,12 +714,12 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
     parser->set_last_statuses(statuses_t::just(status));
 
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-parse_execution_result_t parse_execution_context_t::expand_command(
-    tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
-    wcstring_list_t *out_args) const {
+eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_statement> statement,
+                                                        wcstring *out_cmd,
+                                                        wcstring_list_t *out_args) const {
     // Here we're expanding a command, for example $HOME/bin/stuff or $randomthing. The first
     // completion becomes the command itself, everything after becomes arguments. Command
     // substitutions are not supported.
@@ -753,11 +749,11 @@ parse_execution_result_t parse_execution_context_t::expand_command(
     if (out_cmd->empty()) {
         return this->report_error(statement, _(L"The expanded command was empty."));
     }
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 /// Creates a 'normal' (non-block) process.
-parse_execution_result_t parse_execution_context_t::populate_plain_process(
+eval_result_t parse_execution_context_t::populate_plain_process(
     job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
     assert(job != nullptr);
     assert(proc != nullptr);
@@ -769,7 +765,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     wcstring cmd;
     wcstring_list_t args_from_cmd_expansion;
     auto ret = expand_command(statement, &cmd, &args_from_cmd_expansion);
-    if (ret != parse_execution_success) {
+    if (ret != eval_result_t::ok) {
         return ret;
     }
     assert(!cmd.empty() && "expand_command should not produce an empty command");
@@ -796,7 +792,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
             if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
                 reader_bg_job_warning(*parser);
                 last_exec_run_count = current_run_count;
-                return parse_execution_errored;
+                return eval_result_t::error;
             } else {
                 hup_background_jobs(*parser);
             }
@@ -852,15 +848,15 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         cmd_args.insert(cmd_args.end(), args_from_cmd_expansion.begin(),
                         args_from_cmd_expansion.end());
         argument_node_list_t arg_nodes = statement.descendants<g::argument>();
-        parse_execution_result_t arg_result =
+        eval_result_t arg_result =
             this->expand_arguments_from_nodes(arg_nodes, &cmd_args, glob_behavior);
-        if (arg_result != parse_execution_success) {
+        if (arg_result != eval_result_t::ok) {
             return arg_result;
         }
 
         // The set of IO redirections that we construct for the process.
         if (!this->determine_redirections(statement.child<1>(), &redirections)) {
-            return parse_execution_errored;
+            return eval_result_t::error;
         }
 
         // Determine the process type.
@@ -872,12 +868,12 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     proc->set_argv(cmd_args);
     proc->set_redirection_specs(std::move(redirections));
     proc->actual_cmd = std::move(path_to_external_command);
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 // Determine the list of arguments, expanding stuff. Reports any errors caused by expansion. If we
 // have a wildcard that could not be expanded, report the error and continue.
-parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
+eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
     const argument_node_list_t &argument_nodes, wcstring_list_t *out_arguments,
     globspec_t glob_behavior) {
     // Get all argument nodes underneath the statement. We guess we'll have that many arguments (but
@@ -898,13 +894,13 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return parse_execution_errored;
+                return eval_result_t::error;
             }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
                     report_unmatched_wildcard_error(arg_node);
-                    return parse_execution_errored;
+                    return eval_result_t::error;
                 }
                 break;
             }
@@ -928,10 +924,10 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
 
     // We may have received a cancellation during this expansion.
     if (parser->cancellation_requested) {
-        return parse_execution_cancelled;
+        return eval_result_t::cancelled;
     }
 
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 bool parse_execution_context_t::determine_redirections(
@@ -981,7 +977,7 @@ bool parse_execution_context_t::determine_redirections(
     return true;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_not_process(
+eval_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
@@ -991,9 +987,9 @@ parse_execution_result_t parse_execution_context_t::populate_not_process(
 }
 
 template <typename Type>
-parse_execution_result_t parse_execution_context_t::populate_block_process(
-    job_t *job, process_t *proc, tnode_t<g::statement> statement,
-    tnode_t<Type> specific_statement) {
+eval_result_t parse_execution_context_t::populate_block_process(job_t *job, process_t *proc,
+                                                                tnode_t<g::statement> statement,
+                                                                tnode_t<Type> specific_statement) {
     // We handle block statements by creating process_type_t::block_node, that will bounce back to
     // us when it's time to execute them.
     UNUSED(job);
@@ -1008,22 +1004,22 @@ parse_execution_result_t parse_execution_context_t::populate_block_process(
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
     redirection_spec_list_t redirections;
     if (!this->determine_redirections(arguments, &redirections)) {
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
     proc->set_redirection_specs(std::move(redirections));
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
-parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
+eval_result_t parse_execution_context_t::apply_variable_assignments(
     process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
     const block_t **block) {
     variable_assignment_node_list_t assignment_list =
         get_variable_assignment_nodes(variable_assignments);
-    if (assignment_list.empty()) return parse_execution_success;
+    if (assignment_list.empty()) return eval_result_t::ok;
     *block = parser->push_block(block_t::variable_assignment_block());
     for (const auto &variable_assignment : assignment_list) {
         const wcstring &source = variable_assignment.get_source(pstree->src);
@@ -1042,7 +1038,7 @@ parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return parse_execution_errored;
+                return eval_result_t::error;
             }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
             case expand_result_t::wildcard_match:
@@ -1061,22 +1057,21 @@ parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
         if (proc) proc->variable_assignments.push_back({variable_name, vals});
         parser->vars().set(std::move(variable_name), ENV_LOCAL | ENV_EXPORT, std::move(vals));
     }
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_job_process(
+eval_result_t parse_execution_context_t::populate_job_process(
     job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
     tnode_t<grammar::variable_assignments> variable_assignments) {
     // Get the "specific statement" which is boolean / block / if / switch / decorated.
     const parse_node_t &specific_statement = statement.get_child_node<0>();
 
     const block_t *block = nullptr;
-    parse_execution_result_t result =
-        this->apply_variable_assignments(proc, variable_assignments, &block);
+    eval_result_t result = this->apply_variable_assignments(proc, variable_assignments, &block);
     cleanup_t scope([&]() {
         if (block) parser->pop_block(block);
     });
-    if (result != parse_execution_success) return parse_execution_errored;
+    if (result != eval_result_t::ok) return eval_result_t::error;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1113,7 +1108,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
+eval_result_t parse_execution_context_t::populate_job_from_job_node(
     job_t *j, tnode_t<grammar::job> job_node, const block_t *associated_block) {
     UNUSED(associated_block);
 
@@ -1128,7 +1123,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
-    parse_execution_result_t result =
+    eval_result_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
@@ -1136,7 +1131,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     tnode_t<g::job_continuation> job_cont = job_node.child<2>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
-        if (result != parse_execution_success) {
+        if (result != eval_result_t::ok) {
             break;
         }
         auto variable_assignments = job_cont.require_get_child<g::variable_assignments, 2>();
@@ -1173,7 +1168,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     processes.back()->is_last_in_job = true;
 
     // Return what happened.
-    if (result == parse_execution_success) {
+    if (result == eval_result_t::ok) {
         // Link up the processes.
         assert(!processes.empty());  //!OCLINT(multiple unary operator)
         j->processes = std::move(processes);
@@ -1191,10 +1186,10 @@ static bool remove_job(parser_t &parser, job_t *job) {
     return false;
 }
 
-parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
-                                                              const block_t *associated_block) {
+eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
+                                                   const block_t *associated_block) {
     if (should_cancel_execution(associated_block)) {
-        return parse_execution_cancelled;
+        return eval_result_t::cancelled;
     }
 
     // Get terminal modes.
@@ -1202,7 +1197,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     // Increment the eval_level for the duration of this command.
@@ -1225,7 +1220,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     if (job_is_simple_block(job_node)) {
         tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
         const block_t *block = nullptr;
-        parse_execution_result_t result =
+        eval_result_t result =
             this->apply_variable_assignments(nullptr, variable_assignments, &block);
         cleanup_t scope([&]() {
             if (block) parser->pop_block(block);
@@ -1234,7 +1229,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         tnode_t<g::statement> statement = job_node.child<1>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
-        if (result == parse_execution_success) {
+        if (result == eval_result_t::ok) {
             switch (specific_statement.type) {
                 case symbol_block_statement: {
                     result =
@@ -1302,7 +1297,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
-    parse_execution_result_t pop_result =
+    eval_result_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
     assert(libdata.caller_job_id == job->job_id && "Caller job ID unexpectedly changed");
@@ -1314,7 +1309,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     // Clean up the job on failure or cancellation.
-    bool populated_job = (pop_result == parse_execution_success);
+    bool populated_job = (pop_result == eval_result_t::ok);
     if (populated_job) {
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
@@ -1350,12 +1345,12 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     job_reap(*parser, false);  // clean up jobs
-    return populated_job ? parse_execution_success : parse_execution_errored;
+    return populated_job ? eval_result_t::ok : eval_result_t::error;
 }
 
-parse_execution_result_t parse_execution_context_t::run_job_conjunction(
+eval_result_t parse_execution_context_t::run_job_conjunction(
     tnode_t<grammar::job_conjunction> job_expr, const block_t *associated_block) {
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
     tnode_t<g::job_conjunction> cursor = job_expr;
     // continuation is the parent of the cursor
     tnode_t<g::job_conjunction_continuation> continuation;
@@ -1391,20 +1386,20 @@ bool parse_execution_context_t::should_skip(parse_bool_statement_type_t type) co
 }
 
 template <typename Type>
-parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
-                                                                 const block_t *associated_block) {
+eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
+                                                      const block_t *associated_block) {
     // We handle both job_list and andor_job_list uniformly.
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
         if (should_cancel_execution(associated_block)) break;
 
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
         if (should_skip(get_decorator(job_conj))) {
-            result = parse_execution_success;
+            result = eval_result_t::ok;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
@@ -1414,11 +1409,11 @@ parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> j
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
-                                                              const block_t *associated_block) {
+eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
+                                                   const block_t *associated_block) {
     assert(statement && "Empty node in eval_node");
     assert(statement.matches_node_tree(tree()) && "statement has unexpected tree");
-    enum parse_execution_result_t status = parse_execution_success;
+    enum eval_result_t status = eval_result_t::ok;
     if (auto block = statement.try_get_child<g::block_statement, 0>()) {
         status = this->run_block_statement(block, associated_block);
     } else if (auto ifstat = statement.try_get_child<g::if_statement, 0>()) {
@@ -1433,8 +1428,8 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
     return status;
 }
 
-parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
-                                                              const block_t *associated_block) {
+eval_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
+                                                   const block_t *associated_block) {
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
diff --git a/src/parse_execution.h b/src/parse_execution.h
index b9018f8ff..4c577663e 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -13,14 +13,18 @@
 class block_t;
 class parser_t;
 
-enum parse_execution_result_t {
-    /// The job was successfully executed (though it have failed on its own).
-    parse_execution_success,
-    /// The job did not execute due to some error (e.g. failed to wildcard expand). An error will
-    /// have been printed and proc_last_status will have been set.
-    parse_execution_errored,
-    /// The job was cancelled (e.g. Ctrl-C).
-    parse_execution_cancelled,
+/// An eval_result represents evaluation errors including wildcards which failed to match, syntax
+/// errors, or other expansion errors. It also tracks when evaluation was skipped due to signal
+/// cancellation. Note it does not track the exit status of commands.
+enum class eval_result_t {
+    /// Evaluation was successfull.
+    ok,
+
+    /// Evaluation was cancelled, e.g. because of a signal.
+    cancelled,
+
+    /// A parse error or failed expansion (but not an error exit status from a command).
+    error,
 };
 
 class parse_execution_context_t {
@@ -51,18 +55,17 @@ class parse_execution_context_t {
     };
     execution_cancellation_reason_t cancellation_reason(const block_t *block) const;
 
-    // Report an error. Always returns true.
-    parse_execution_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    parse_execution_result_t report_errors(const parse_error_list_t &error_list) const;
+    // Report an error. Always returns 'eval_result_t::error'.
+    eval_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
+    eval_result_t report_errors(const parse_error_list_t &error_list) const;
 
     // Wildcard error helper.
-    parse_execution_result_t report_unmatched_wildcard_error(
-        const parse_node_t &unmatched_wildcard) const;
+    eval_result_t report_unmatched_wildcard_error(const parse_node_t &unmatched_wildcard) const;
 
     /// Command not found support.
-    parse_execution_result_t handle_command_not_found(const wcstring &cmd,
-                                                      tnode_t<grammar::plain_statement> statement,
-                                                      int err_code);
+    eval_result_t handle_command_not_found(const wcstring &cmd,
+                                           tnode_t<grammar::plain_statement> statement,
+                                           int err_code);
 
     // Utilities
     wcstring get_source(const parse_node_t &node) const;
@@ -72,8 +75,8 @@ class parse_execution_context_t {
 
     // Expand a command which may contain variables, producing an expand command and possibly
     // arguments. Prints an error message on error.
-    parse_execution_result_t expand_command(tnode_t<grammar::plain_statement> statement,
-                                            wcstring *out_cmd, wcstring_list_t *out_args) const;
+    eval_result_t expand_command(tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
+                                 wcstring_list_t *out_args) const;
 
     /// Return whether we should skip a job with the given bool statement type.
     bool should_skip(parse_bool_statement_type_t type) const;
@@ -83,58 +86,57 @@ class parse_execution_context_t {
 
     enum process_type_t process_type_for_command(tnode_t<grammar::plain_statement> statement,
                                                  const wcstring &cmd) const;
-    parse_execution_result_t apply_variable_assignments(
+    eval_result_t apply_variable_assignments(
         process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
         const block_t **block);
 
     // These create process_t structures from statements.
-    parse_execution_result_t populate_job_process(
-        job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
-        tnode_t<grammar::variable_assignments> variable_assignments);
-    parse_execution_result_t populate_not_process(job_t *job, process_t *proc,
-                                                  tnode_t<grammar::not_statement> not_statement);
-    parse_execution_result_t populate_plain_process(job_t *job, process_t *proc,
-                                                    tnode_t<grammar::plain_statement> statement);
+    eval_result_t populate_job_process(job_t *job, process_t *proc,
+                                       tnode_t<grammar::statement> statement,
+                                       tnode_t<grammar::variable_assignments> variable_assignments);
+    eval_result_t populate_not_process(job_t *job, process_t *proc,
+                                       tnode_t<grammar::not_statement> not_statement);
+    eval_result_t populate_plain_process(job_t *job, process_t *proc,
+                                         tnode_t<grammar::plain_statement> statement);
 
     template <typename Type>
-    parse_execution_result_t populate_block_process(job_t *job, process_t *proc,
-                                                    tnode_t<grammar::statement> statement,
-                                                    tnode_t<Type> specific_statement);
+    eval_result_t populate_block_process(job_t *job, process_t *proc,
+                                         tnode_t<grammar::statement> statement,
+                                         tnode_t<Type> specific_statement);
 
     // These encapsulate the actual logic of various (block) statements.
-    parse_execution_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
-                                                 const block_t *associated_block);
-    parse_execution_result_t run_for_statement(tnode_t<grammar::for_header> header,
-                                               tnode_t<grammar::job_list> contents);
-    parse_execution_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
-                                              const block_t *associated_block);
-    parse_execution_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
-    parse_execution_result_t run_while_statement(tnode_t<grammar::while_header> header,
-                                                 tnode_t<grammar::job_list> contents,
-                                                 const block_t *associated_block);
-    parse_execution_result_t run_function_statement(tnode_t<grammar::function_header> header,
-                                                    tnode_t<grammar::job_list> body);
-    parse_execution_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
+    eval_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
+                                      const block_t *associated_block);
+    eval_result_t run_for_statement(tnode_t<grammar::for_header> header,
+                                    tnode_t<grammar::job_list> contents);
+    eval_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
+                                   const block_t *associated_block);
+    eval_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
+    eval_result_t run_while_statement(tnode_t<grammar::while_header> header,
+                                      tnode_t<grammar::job_list> contents,
+                                      const block_t *associated_block);
+    eval_result_t run_function_statement(tnode_t<grammar::function_header> header,
+                                         tnode_t<grammar::job_list> body);
+    eval_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
 
     enum globspec_t { failglob, nullglob };
     using argument_node_list_t = std::vector<tnode_t<grammar::argument>>;
-    parse_execution_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
-                                                         wcstring_list_t *out_arguments,
-                                                         globspec_t glob_behavior);
+    eval_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
+                                              wcstring_list_t *out_arguments,
+                                              globspec_t glob_behavior);
 
     // Determines the list of redirections for a node. Returns none() on failure, for example, an
     // invalid fd.
     bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
                                 redirection_spec_list_t *out_redirs);
 
-    parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
-                                                 const block_t *associated_block);
+    eval_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
+    eval_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
+                                      const block_t *associated_block);
     template <typename Type>
-    parse_execution_result_t run_job_list(tnode_t<Type> job_list_node,
-                                          const block_t *associated_block);
-    parse_execution_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
-                                                        const block_t *associated_block);
+    eval_result_t run_job_list(tnode_t<Type> job_list_node, const block_t *associated_block);
+    eval_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
+                                             const block_t *associated_block);
 
     // Returns the line number of the node. Not const since it touches cached_lineno_offset.
     int line_offset_of_node(tnode_t<grammar::job> node);
@@ -158,10 +160,8 @@ class parse_execution_context_t {
 
     /// Start executing at the given node. Returns 0 if there was no error, 1 if there was an
     /// error.
-    parse_execution_result_t eval_node(tnode_t<grammar::statement> statement,
-                                       const block_t *associated_block);
-    parse_execution_result_t eval_node(tnode_t<grammar::job_list> job_list,
-                                       const block_t *associated_block);
+    eval_result_t eval_node(tnode_t<grammar::statement> statement, const block_t *associated_block);
+    eval_result_t eval_node(tnode_t<grammar::job_list> job_list, const block_t *associated_block);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 1146fe1a3..b457718f4 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -674,19 +674,12 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(
         &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
-    parse_execution_result_t res = execution_context->eval_node(node, scope_block);
+    eval_result_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
     job_reap(*this, false);  // reap again
-    switch (res) {
-        case parse_execution_success:
-            return eval_result_t::ok;
-        case parse_execution_errored:
-            return eval_result_t::error;
-        case parse_execution_cancelled:
-            return eval_result_t::cancelled;
-    }
+    return res;
 }
 
 // Explicit instantiations. TODO: use overloads instead?
diff --git a/src/parser.h b/src/parser.h
index bbe1c1eff..41aff1176 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -15,6 +15,7 @@
 #include "event.h"
 #include "expand.h"
 #include "parse_constants.h"
+#include "parse_execution.h"
 #include "parse_tree.h"
 #include "proc.h"
 
@@ -53,18 +54,6 @@ enum class loop_status_t {
     continues,  /// current loop block should be skipped
 };
 
-/// Result of the source code form of eval.
-enum class eval_result_t {
-    /// eval was able to evaluate the source or tree.
-    ok,
-
-    /// Evaluation was cancelled, e.g. because of a signal.
-    cancelled,
-
-    /// Parse or execution error (but not simply a failed command).
-    error,
-};
-
 /// block_t represents a block of commands.
 class block_t {
     /// Construct from a block type.

From b82b111e5569e7514305381b1f62846527b1c974 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 17:31:18 -0800
Subject: [PATCH 1405/1732] Revert "Unify parse_execution_result_t and
 eval_result_t"

This reverts commit c011f3a8e992aabdea2cef7e942df50a82735efd.

There is a bug where cancellation is being reported for normal control
flow, not just for SIGINT.
---
 src/parse_execution.cpp | 225 ++++++++++++++++++++--------------------
 src/parse_execution.h   | 112 ++++++++++----------
 src/parser.cpp          |  11 +-
 src/parser.h            |  13 ++-
 4 files changed, 192 insertions(+), 169 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c1af96268..de5007b17 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -240,9 +240,9 @@ bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) co
     }
 }
 
-eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statement> statement,
-                                                          const block_t *associated_block) {
-    eval_result_t result = eval_result_t::ok;
+parse_execution_result_t parse_execution_context_t::run_if_statement(
+    tnode_t<g::if_statement> statement, const block_t *associated_block) {
+    parse_execution_result_t result = parse_execution_success;
 
     // We have a sequence of if clauses, with a final else, resulting in a single job list that we
     // execute.
@@ -255,7 +255,7 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
 
     for (;;) {
         if (should_cancel_execution(associated_block)) {
-            result = eval_result_t::cancelled;
+            result = parse_execution_cancelled;
             break;
         }
 
@@ -263,14 +263,14 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
         tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
         tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
 
-        // Check the condition and the tail. We treat eval_result_t::error here as failure, in
+        // Check the condition and the tail. We treat parse_execution_errored here as failure, in
         // accordance with historic behavior.
-        eval_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == eval_result_t::ok) {
+        parse_execution_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == parse_execution_success) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
         const bool take_branch =
-            (cond_ret == eval_result_t::ok) && parser->get_last_status() == EXIT_SUCCESS;
+            (cond_ret == parse_execution_success) && parser->get_last_status() == EXIT_SUCCESS;
 
         if (take_branch) {
             // Condition succeeded.
@@ -305,7 +305,7 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
         block_t *ib = parser->push_block(block_t::if_block());
         run_job_list(job_list_to_execute, ib);
         if (should_cancel_execution(ib)) {
-            result = eval_result_t::cancelled;
+            result = parse_execution_cancelled;
         }
         parser->pop_block(ib);
     } else {
@@ -317,32 +317,34 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
 
     // It's possible there's a last-minute cancellation (issue #1297).
     if (should_cancel_execution(associated_block)) {
-        result = eval_result_t::cancelled;
+        result = parse_execution_cancelled;
     }
 
     // Otherwise, take the exit status of the job list. Reversal of issue #1061.
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list> contents) {
+parse_execution_result_t parse_execution_context_t::run_begin_statement(
+    tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
     trace_if_enabled(*parser, L"begin");
     block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
-    eval_result_t ret = run_job_list(contents, sb);
+    parse_execution_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
     trace_if_enabled(*parser, L"end begin");
     return ret;
 }
 
 // Define a function.
-eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::function_header> header,
-                                                                tnode_t<g::job_list> body) {
+parse_execution_result_t parse_execution_context_t::run_function_statement(
+    tnode_t<g::function_header> header, tnode_t<g::job_list> body) {
     // Get arguments.
     wcstring_list_t arguments;
     argument_node_list_t arg_nodes = header.descendants<g::argument>();
-    eval_result_t result = this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
+    parse_execution_result_t result =
+        this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
 
-    if (result != eval_result_t::ok) {
+    if (result != parse_execution_success) {
         return result;
     }
     trace_if_enabled(*parser, L"function", arguments);
@@ -353,18 +355,18 @@ eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::funct
     wcstring errtext = streams.err.contents();
     if (!errtext.empty()) {
         this->report_error(header, L"%ls", errtext.c_str());
-        result = eval_result_t::error;
+        result = parse_execution_errored;
     }
 
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_statement> statement,
-                                                             const block_t *associated_block) {
+parse_execution_result_t parse_execution_context_t::run_block_statement(
+    tnode_t<g::block_statement> statement, const block_t *associated_block) {
     tnode_t<g::block_header> bheader = statement.child<0>();
     tnode_t<g::job_list> contents = statement.child<1>();
 
-    eval_result_t ret = eval_result_t::ok;
+    parse_execution_result_t ret = parse_execution_success;
     if (auto header = bheader.try_get_child<g::for_header, 0>()) {
         ret = run_for_statement(header, contents);
     } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
@@ -389,7 +391,7 @@ bool parse_execution_context_t::is_function_context() const {
     return is_within_function_call;
 }
 
-eval_result_t parse_execution_context_t::run_for_statement(
+parse_execution_result_t parse_execution_context_t::run_for_statement(
     tnode_t<grammar::for_header> header, tnode_t<grammar::job_list> block_contents) {
     // Get the variable name: `for var_name in ...`. We expand the variable name. It better result
     // in just one.
@@ -397,14 +399,14 @@ eval_result_t parse_execution_context_t::run_for_statement(
     wcstring for_var_name = get_source(var_name_node);
     if (!expand_one(for_var_name, expand_flags_t{}, parser->vars(), parser->shared())) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
-        return eval_result_t::error;
+        return parse_execution_errored;
     }
 
     // Get the contents to iterate over.
     wcstring_list_t arguments;
-    eval_result_t ret = this->expand_arguments_from_nodes(get_argument_nodes(header.child<3>()),
-                                                          &arguments, nullglob);
-    if (ret != eval_result_t::ok) {
+    parse_execution_result_t ret = this->expand_arguments_from_nodes(
+        get_argument_nodes(header.child<3>()), &arguments, nullglob);
+    if (ret != parse_execution_success) {
         return ret;
     }
 
@@ -416,13 +418,13 @@ eval_result_t parse_execution_context_t::run_for_statement(
         if (retval != ENV_OK) {
             report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
                          for_var_name.c_str());
-            return eval_result_t::error;
+            return parse_execution_errored;
         }
     }
 
     if (!valid_var_name(for_var_name)) {
         report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
-        return eval_result_t::error;
+        return parse_execution_errored;
     }
 
     trace_if_enabled(*parser, L"for", arguments);
@@ -431,7 +433,7 @@ eval_result_t parse_execution_context_t::run_for_statement(
     // Now drive the for loop.
     for (const wcstring &val : arguments) {
         if (should_cancel_execution(fb)) {
-            ret = eval_result_t::cancelled;
+            ret = parse_execution_cancelled;
             break;
         }
 
@@ -458,9 +460,9 @@ eval_result_t parse_execution_context_t::run_for_statement(
     return ret;
 }
 
-eval_result_t parse_execution_context_t::run_switch_statement(
+parse_execution_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<grammar::switch_statement> statement) {
-    eval_result_t result = eval_result_t::ok;
+    parse_execution_result_t result = parse_execution_success;
 
     // Get the switch variable.
     tnode_t<grammar::argument> switch_value_n = statement.child<1>();
@@ -493,13 +495,13 @@ eval_result_t parse_execution_context_t::run_switch_statement(
         }
     }
 
-    if (result == eval_result_t::ok && switch_values_expanded.size() > 1) {
+    if (result == parse_execution_success && switch_values_expanded.size() > 1) {
         result =
             report_error(switch_value_n, _(L"switch: Expected at most one argument, got %lu\n"),
                          switch_values_expanded.size());
     }
 
-    if (result != eval_result_t::ok) {
+    if (result != parse_execution_success) {
         return result;
     }
 
@@ -513,7 +515,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<g::case_item> matching_case_item{};
     while (auto case_item = case_item_list.next_in_list<g::case_item>()) {
         if (should_cancel_execution(sb)) {
-            result = eval_result_t::cancelled;
+            result = parse_execution_cancelled;
             break;
         }
 
@@ -522,9 +524,9 @@ eval_result_t parse_execution_context_t::run_switch_statement(
         // contains an unexpandable process will report and then fail to match.
         auto arg_nodes = get_argument_nodes(case_item.child<1>());
         wcstring_list_t case_args;
-        eval_result_t case_result =
+        parse_execution_result_t case_result =
             this->expand_arguments_from_nodes(arg_nodes, &case_args, failglob);
-        if (case_result == eval_result_t::ok) {
+        if (case_result == parse_execution_success) {
             for (const wcstring &arg : case_args) {
                 // Unescape wildcards so they can be expanded again.
                 wcstring unescaped_arg = parse_util_unescape_wildcards(arg);
@@ -542,7 +544,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
 
     if (matching_case_item) {
         // Success, evaluate the job list.
-        assert(result == eval_result_t::ok && "Expected success");
+        assert(result == parse_execution_success && "Expected success");
         auto job_list = matching_case_item.child<3>();
         result = this->run_job_list(job_list, sb);
     }
@@ -551,10 +553,10 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::while_header> header,
-                                                             tnode_t<grammar::job_list> contents,
-                                                             const block_t *associated_block) {
-    eval_result_t ret = eval_result_t::ok;
+parse_execution_result_t parse_execution_context_t::run_while_statement(
+    tnode_t<grammar::while_header> header, tnode_t<grammar::job_list> contents,
+    const block_t *associated_block) {
+    parse_execution_result_t ret = parse_execution_success;
 
     // "The exit status of the while loop shall be the exit status of the last compound-list-2
     // executed, or zero if none was executed."
@@ -582,15 +584,16 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
         first_cond_check = false;
 
         // Check the condition.
-        eval_result_t cond_ret = this->run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == eval_result_t::ok) {
+        parse_execution_result_t cond_ret =
+            this->run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == parse_execution_success) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
 
         // If the loop condition failed to execute, then exit the loop without modifying the exit
         // status. If the loop condition executed with a failure status, restore the status and then
         // exit the loop.
-        if (cond_ret != eval_result_t::ok) {
+        if (cond_ret != parse_execution_success) {
             break;
         } else if (parser->get_last_status() != EXIT_SUCCESS) {
             parser->set_last_statuses(cond_saved_status);
@@ -599,7 +602,7 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
 
         // Check cancellation.
         if (this->should_cancel_execution(associated_block)) {
-            ret = eval_result_t::cancelled;
+            ret = parse_execution_cancelled;
             break;
         }
 
@@ -633,10 +636,10 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
     return ret;
 }
 
-// Reports an error. Always returns eval_result_t::error, so you can assign the result to an
+// Reports an error. Always returns parse_execution_errored, so you can assign the result to an
 // 'errored' variable.
-eval_result_t parse_execution_context_t::report_error(const parse_node_t &node, const wchar_t *fmt,
-                                                      ...) const {
+parse_execution_result_t parse_execution_context_t::report_error(const parse_node_t &node,
+                                                                 const wchar_t *fmt, ...) const {
     // Create an error.
     parse_error_list_t error_list = parse_error_list_t(1);
     parse_error_t *error = &error_list.at(0);
@@ -650,10 +653,11 @@ eval_result_t parse_execution_context_t::report_error(const parse_node_t &node,
     va_end(va);
 
     this->report_errors(error_list);
-    return eval_result_t::error;
+    return parse_execution_errored;
 }
 
-eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const {
+parse_execution_result_t parse_execution_context_t::report_errors(
+    const parse_error_list_t &error_list) const {
     if (!parser->cancellation_requested) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
@@ -668,19 +672,19 @@ eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t
             std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
     }
-    return eval_result_t::error;
+    return parse_execution_errored;
 }
 
-/// Reports an unmatched wildcard error and returns eval_result_t::error.
-eval_result_t parse_execution_context_t::report_unmatched_wildcard_error(
+/// Reports an unmatched wildcard error and returns parse_execution_errored.
+parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_error(
     const parse_node_t &unmatched_wildcard) const {
     parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
     report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
-    return eval_result_t::error;
+    return parse_execution_errored;
 }
 
 /// Handle the case of command not found.
-eval_result_t parse_execution_context_t::handle_command_not_found(
+parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     const wcstring &cmd_str, tnode_t<g::plain_statement> statement, int err_code) {
     // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
     // status to 127, which is the standard number used by other shells like bash and zsh.
@@ -694,10 +698,10 @@ eval_result_t parse_execution_context_t::handle_command_not_found(
         wcstring_list_t event_args;
         {
             auto args = get_argument_nodes(statement.child<1>());
-            eval_result_t arg_result =
+            parse_execution_result_t arg_result =
                 this->expand_arguments_from_nodes(args, &event_args, failglob);
 
-            if (arg_result != eval_result_t::ok) {
+            if (arg_result != parse_execution_success) {
                 return arg_result;
             }
 
@@ -714,12 +718,12 @@ eval_result_t parse_execution_context_t::handle_command_not_found(
     int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
     parser->set_last_statuses(statuses_t::just(status));
 
-    return eval_result_t::error;
+    return parse_execution_errored;
 }
 
-eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_statement> statement,
-                                                        wcstring *out_cmd,
-                                                        wcstring_list_t *out_args) const {
+parse_execution_result_t parse_execution_context_t::expand_command(
+    tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
+    wcstring_list_t *out_args) const {
     // Here we're expanding a command, for example $HOME/bin/stuff or $randomthing. The first
     // completion becomes the command itself, everything after becomes arguments. Command
     // substitutions are not supported.
@@ -749,11 +753,11 @@ eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_s
     if (out_cmd->empty()) {
         return this->report_error(statement, _(L"The expanded command was empty."));
     }
-    return eval_result_t::ok;
+    return parse_execution_success;
 }
 
 /// Creates a 'normal' (non-block) process.
-eval_result_t parse_execution_context_t::populate_plain_process(
+parse_execution_result_t parse_execution_context_t::populate_plain_process(
     job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
     assert(job != nullptr);
     assert(proc != nullptr);
@@ -765,7 +769,7 @@ eval_result_t parse_execution_context_t::populate_plain_process(
     wcstring cmd;
     wcstring_list_t args_from_cmd_expansion;
     auto ret = expand_command(statement, &cmd, &args_from_cmd_expansion);
-    if (ret != eval_result_t::ok) {
+    if (ret != parse_execution_success) {
         return ret;
     }
     assert(!cmd.empty() && "expand_command should not produce an empty command");
@@ -792,7 +796,7 @@ eval_result_t parse_execution_context_t::populate_plain_process(
             if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
                 reader_bg_job_warning(*parser);
                 last_exec_run_count = current_run_count;
-                return eval_result_t::error;
+                return parse_execution_errored;
             } else {
                 hup_background_jobs(*parser);
             }
@@ -848,15 +852,15 @@ eval_result_t parse_execution_context_t::populate_plain_process(
         cmd_args.insert(cmd_args.end(), args_from_cmd_expansion.begin(),
                         args_from_cmd_expansion.end());
         argument_node_list_t arg_nodes = statement.descendants<g::argument>();
-        eval_result_t arg_result =
+        parse_execution_result_t arg_result =
             this->expand_arguments_from_nodes(arg_nodes, &cmd_args, glob_behavior);
-        if (arg_result != eval_result_t::ok) {
+        if (arg_result != parse_execution_success) {
             return arg_result;
         }
 
         // The set of IO redirections that we construct for the process.
         if (!this->determine_redirections(statement.child<1>(), &redirections)) {
-            return eval_result_t::error;
+            return parse_execution_errored;
         }
 
         // Determine the process type.
@@ -868,12 +872,12 @@ eval_result_t parse_execution_context_t::populate_plain_process(
     proc->set_argv(cmd_args);
     proc->set_redirection_specs(std::move(redirections));
     proc->actual_cmd = std::move(path_to_external_command);
-    return eval_result_t::ok;
+    return parse_execution_success;
 }
 
 // Determine the list of arguments, expanding stuff. Reports any errors caused by expansion. If we
 // have a wildcard that could not be expanded, report the error and continue.
-eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
+parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
     const argument_node_list_t &argument_nodes, wcstring_list_t *out_arguments,
     globspec_t glob_behavior) {
     // Get all argument nodes underneath the statement. We guess we'll have that many arguments (but
@@ -894,13 +898,13 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return eval_result_t::error;
+                return parse_execution_errored;
             }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
                     report_unmatched_wildcard_error(arg_node);
-                    return eval_result_t::error;
+                    return parse_execution_errored;
                 }
                 break;
             }
@@ -924,10 +928,10 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
 
     // We may have received a cancellation during this expansion.
     if (parser->cancellation_requested) {
-        return eval_result_t::cancelled;
+        return parse_execution_cancelled;
     }
 
-    return eval_result_t::ok;
+    return parse_execution_success;
 }
 
 bool parse_execution_context_t::determine_redirections(
@@ -977,7 +981,7 @@ bool parse_execution_context_t::determine_redirections(
     return true;
 }
 
-eval_result_t parse_execution_context_t::populate_not_process(
+parse_execution_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
@@ -987,9 +991,9 @@ eval_result_t parse_execution_context_t::populate_not_process(
 }
 
 template <typename Type>
-eval_result_t parse_execution_context_t::populate_block_process(job_t *job, process_t *proc,
-                                                                tnode_t<g::statement> statement,
-                                                                tnode_t<Type> specific_statement) {
+parse_execution_result_t parse_execution_context_t::populate_block_process(
+    job_t *job, process_t *proc, tnode_t<g::statement> statement,
+    tnode_t<Type> specific_statement) {
     // We handle block statements by creating process_type_t::block_node, that will bounce back to
     // us when it's time to execute them.
     UNUSED(job);
@@ -1004,22 +1008,22 @@ eval_result_t parse_execution_context_t::populate_block_process(job_t *job, proc
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
     redirection_spec_list_t redirections;
     if (!this->determine_redirections(arguments, &redirections)) {
-        return eval_result_t::error;
+        return parse_execution_errored;
     }
 
     proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
     proc->set_redirection_specs(std::move(redirections));
-    return eval_result_t::ok;
+    return parse_execution_success;
 }
 
-eval_result_t parse_execution_context_t::apply_variable_assignments(
+parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
     process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
     const block_t **block) {
     variable_assignment_node_list_t assignment_list =
         get_variable_assignment_nodes(variable_assignments);
-    if (assignment_list.empty()) return eval_result_t::ok;
+    if (assignment_list.empty()) return parse_execution_success;
     *block = parser->push_block(block_t::variable_assignment_block());
     for (const auto &variable_assignment : assignment_list) {
         const wcstring &source = variable_assignment.get_source(pstree->src);
@@ -1038,7 +1042,7 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return eval_result_t::error;
+                return parse_execution_errored;
             }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
             case expand_result_t::wildcard_match:
@@ -1057,21 +1061,22 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         if (proc) proc->variable_assignments.push_back({variable_name, vals});
         parser->vars().set(std::move(variable_name), ENV_LOCAL | ENV_EXPORT, std::move(vals));
     }
-    return eval_result_t::ok;
+    return parse_execution_success;
 }
 
-eval_result_t parse_execution_context_t::populate_job_process(
+parse_execution_result_t parse_execution_context_t::populate_job_process(
     job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
     tnode_t<grammar::variable_assignments> variable_assignments) {
     // Get the "specific statement" which is boolean / block / if / switch / decorated.
     const parse_node_t &specific_statement = statement.get_child_node<0>();
 
     const block_t *block = nullptr;
-    eval_result_t result = this->apply_variable_assignments(proc, variable_assignments, &block);
+    parse_execution_result_t result =
+        this->apply_variable_assignments(proc, variable_assignments, &block);
     cleanup_t scope([&]() {
         if (block) parser->pop_block(block);
     });
-    if (result != eval_result_t::ok) return eval_result_t::error;
+    if (result != parse_execution_success) return parse_execution_errored;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1108,7 +1113,7 @@ eval_result_t parse_execution_context_t::populate_job_process(
     return result;
 }
 
-eval_result_t parse_execution_context_t::populate_job_from_job_node(
+parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     job_t *j, tnode_t<grammar::job> job_node, const block_t *associated_block) {
     UNUSED(associated_block);
 
@@ -1123,7 +1128,7 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
-    eval_result_t result =
+    parse_execution_result_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
@@ -1131,7 +1136,7 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     tnode_t<g::job_continuation> job_cont = job_node.child<2>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
-        if (result != eval_result_t::ok) {
+        if (result != parse_execution_success) {
             break;
         }
         auto variable_assignments = job_cont.require_get_child<g::variable_assignments, 2>();
@@ -1168,7 +1173,7 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     processes.back()->is_last_in_job = true;
 
     // Return what happened.
-    if (result == eval_result_t::ok) {
+    if (result == parse_execution_success) {
         // Link up the processes.
         assert(!processes.empty());  //!OCLINT(multiple unary operator)
         j->processes = std::move(processes);
@@ -1186,10 +1191,10 @@ static bool remove_job(parser_t &parser, job_t *job) {
     return false;
 }
 
-eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
-                                                   const block_t *associated_block) {
+parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
+                                                              const block_t *associated_block) {
     if (should_cancel_execution(associated_block)) {
-        return eval_result_t::cancelled;
+        return parse_execution_cancelled;
     }
 
     // Get terminal modes.
@@ -1197,7 +1202,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
-        return eval_result_t::error;
+        return parse_execution_errored;
     }
 
     // Increment the eval_level for the duration of this command.
@@ -1220,7 +1225,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     if (job_is_simple_block(job_node)) {
         tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
         const block_t *block = nullptr;
-        eval_result_t result =
+        parse_execution_result_t result =
             this->apply_variable_assignments(nullptr, variable_assignments, &block);
         cleanup_t scope([&]() {
             if (block) parser->pop_block(block);
@@ -1229,7 +1234,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
         tnode_t<g::statement> statement = job_node.child<1>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
-        if (result == eval_result_t::ok) {
+        if (result == parse_execution_success) {
             switch (specific_statement.type) {
                 case symbol_block_statement: {
                     result =
@@ -1297,7 +1302,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
-    eval_result_t pop_result =
+    parse_execution_result_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
     assert(libdata.caller_job_id == job->job_id && "Caller job ID unexpectedly changed");
@@ -1309,7 +1314,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     }
 
     // Clean up the job on failure or cancellation.
-    bool populated_job = (pop_result == eval_result_t::ok);
+    bool populated_job = (pop_result == parse_execution_success);
     if (populated_job) {
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
@@ -1345,12 +1350,12 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     }
 
     job_reap(*parser, false);  // clean up jobs
-    return populated_job ? eval_result_t::ok : eval_result_t::error;
+    return populated_job ? parse_execution_success : parse_execution_errored;
 }
 
-eval_result_t parse_execution_context_t::run_job_conjunction(
+parse_execution_result_t parse_execution_context_t::run_job_conjunction(
     tnode_t<grammar::job_conjunction> job_expr, const block_t *associated_block) {
-    eval_result_t result = eval_result_t::ok;
+    parse_execution_result_t result = parse_execution_success;
     tnode_t<g::job_conjunction> cursor = job_expr;
     // continuation is the parent of the cursor
     tnode_t<g::job_conjunction_continuation> continuation;
@@ -1386,20 +1391,20 @@ bool parse_execution_context_t::should_skip(parse_bool_statement_type_t type) co
 }
 
 template <typename Type>
-eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
-                                                      const block_t *associated_block) {
+parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
+                                                                 const block_t *associated_block) {
     // We handle both job_list and andor_job_list uniformly.
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
-    eval_result_t result = eval_result_t::ok;
+    parse_execution_result_t result = parse_execution_success;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
         if (should_cancel_execution(associated_block)) break;
 
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
         if (should_skip(get_decorator(job_conj))) {
-            result = eval_result_t::ok;
+            result = parse_execution_success;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
@@ -1409,11 +1414,11 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
     return result;
 }
 
-eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
-                                                   const block_t *associated_block) {
+parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
+                                                              const block_t *associated_block) {
     assert(statement && "Empty node in eval_node");
     assert(statement.matches_node_tree(tree()) && "statement has unexpected tree");
-    enum eval_result_t status = eval_result_t::ok;
+    enum parse_execution_result_t status = parse_execution_success;
     if (auto block = statement.try_get_child<g::block_statement, 0>()) {
         status = this->run_block_statement(block, associated_block);
     } else if (auto ifstat = statement.try_get_child<g::if_statement, 0>()) {
@@ -1428,8 +1433,8 @@ eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> stateme
     return status;
 }
 
-eval_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
-                                                   const block_t *associated_block) {
+parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
+                                                              const block_t *associated_block) {
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 4c577663e..b9018f8ff 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -13,18 +13,14 @@
 class block_t;
 class parser_t;
 
-/// An eval_result represents evaluation errors including wildcards which failed to match, syntax
-/// errors, or other expansion errors. It also tracks when evaluation was skipped due to signal
-/// cancellation. Note it does not track the exit status of commands.
-enum class eval_result_t {
-    /// Evaluation was successfull.
-    ok,
-
-    /// Evaluation was cancelled, e.g. because of a signal.
-    cancelled,
-
-    /// A parse error or failed expansion (but not an error exit status from a command).
-    error,
+enum parse_execution_result_t {
+    /// The job was successfully executed (though it have failed on its own).
+    parse_execution_success,
+    /// The job did not execute due to some error (e.g. failed to wildcard expand). An error will
+    /// have been printed and proc_last_status will have been set.
+    parse_execution_errored,
+    /// The job was cancelled (e.g. Ctrl-C).
+    parse_execution_cancelled,
 };
 
 class parse_execution_context_t {
@@ -55,17 +51,18 @@ class parse_execution_context_t {
     };
     execution_cancellation_reason_t cancellation_reason(const block_t *block) const;
 
-    // Report an error. Always returns 'eval_result_t::error'.
-    eval_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    eval_result_t report_errors(const parse_error_list_t &error_list) const;
+    // Report an error. Always returns true.
+    parse_execution_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
+    parse_execution_result_t report_errors(const parse_error_list_t &error_list) const;
 
     // Wildcard error helper.
-    eval_result_t report_unmatched_wildcard_error(const parse_node_t &unmatched_wildcard) const;
+    parse_execution_result_t report_unmatched_wildcard_error(
+        const parse_node_t &unmatched_wildcard) const;
 
     /// Command not found support.
-    eval_result_t handle_command_not_found(const wcstring &cmd,
-                                           tnode_t<grammar::plain_statement> statement,
-                                           int err_code);
+    parse_execution_result_t handle_command_not_found(const wcstring &cmd,
+                                                      tnode_t<grammar::plain_statement> statement,
+                                                      int err_code);
 
     // Utilities
     wcstring get_source(const parse_node_t &node) const;
@@ -75,8 +72,8 @@ class parse_execution_context_t {
 
     // Expand a command which may contain variables, producing an expand command and possibly
     // arguments. Prints an error message on error.
-    eval_result_t expand_command(tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
-                                 wcstring_list_t *out_args) const;
+    parse_execution_result_t expand_command(tnode_t<grammar::plain_statement> statement,
+                                            wcstring *out_cmd, wcstring_list_t *out_args) const;
 
     /// Return whether we should skip a job with the given bool statement type.
     bool should_skip(parse_bool_statement_type_t type) const;
@@ -86,57 +83,58 @@ class parse_execution_context_t {
 
     enum process_type_t process_type_for_command(tnode_t<grammar::plain_statement> statement,
                                                  const wcstring &cmd) const;
-    eval_result_t apply_variable_assignments(
+    parse_execution_result_t apply_variable_assignments(
         process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
         const block_t **block);
 
     // These create process_t structures from statements.
-    eval_result_t populate_job_process(job_t *job, process_t *proc,
-                                       tnode_t<grammar::statement> statement,
-                                       tnode_t<grammar::variable_assignments> variable_assignments);
-    eval_result_t populate_not_process(job_t *job, process_t *proc,
-                                       tnode_t<grammar::not_statement> not_statement);
-    eval_result_t populate_plain_process(job_t *job, process_t *proc,
-                                         tnode_t<grammar::plain_statement> statement);
+    parse_execution_result_t populate_job_process(
+        job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
+        tnode_t<grammar::variable_assignments> variable_assignments);
+    parse_execution_result_t populate_not_process(job_t *job, process_t *proc,
+                                                  tnode_t<grammar::not_statement> not_statement);
+    parse_execution_result_t populate_plain_process(job_t *job, process_t *proc,
+                                                    tnode_t<grammar::plain_statement> statement);
 
     template <typename Type>
-    eval_result_t populate_block_process(job_t *job, process_t *proc,
-                                         tnode_t<grammar::statement> statement,
-                                         tnode_t<Type> specific_statement);
+    parse_execution_result_t populate_block_process(job_t *job, process_t *proc,
+                                                    tnode_t<grammar::statement> statement,
+                                                    tnode_t<Type> specific_statement);
 
     // These encapsulate the actual logic of various (block) statements.
-    eval_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
-                                      const block_t *associated_block);
-    eval_result_t run_for_statement(tnode_t<grammar::for_header> header,
-                                    tnode_t<grammar::job_list> contents);
-    eval_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
-                                   const block_t *associated_block);
-    eval_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
-    eval_result_t run_while_statement(tnode_t<grammar::while_header> header,
-                                      tnode_t<grammar::job_list> contents,
-                                      const block_t *associated_block);
-    eval_result_t run_function_statement(tnode_t<grammar::function_header> header,
-                                         tnode_t<grammar::job_list> body);
-    eval_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
+    parse_execution_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
+                                                 const block_t *associated_block);
+    parse_execution_result_t run_for_statement(tnode_t<grammar::for_header> header,
+                                               tnode_t<grammar::job_list> contents);
+    parse_execution_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
+                                              const block_t *associated_block);
+    parse_execution_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
+    parse_execution_result_t run_while_statement(tnode_t<grammar::while_header> header,
+                                                 tnode_t<grammar::job_list> contents,
+                                                 const block_t *associated_block);
+    parse_execution_result_t run_function_statement(tnode_t<grammar::function_header> header,
+                                                    tnode_t<grammar::job_list> body);
+    parse_execution_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
 
     enum globspec_t { failglob, nullglob };
     using argument_node_list_t = std::vector<tnode_t<grammar::argument>>;
-    eval_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
-                                              wcstring_list_t *out_arguments,
-                                              globspec_t glob_behavior);
+    parse_execution_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
+                                                         wcstring_list_t *out_arguments,
+                                                         globspec_t glob_behavior);
 
     // Determines the list of redirections for a node. Returns none() on failure, for example, an
     // invalid fd.
     bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
                                 redirection_spec_list_t *out_redirs);
 
-    eval_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    eval_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
-                                      const block_t *associated_block);
+    parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
+    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
+                                                 const block_t *associated_block);
     template <typename Type>
-    eval_result_t run_job_list(tnode_t<Type> job_list_node, const block_t *associated_block);
-    eval_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
-                                             const block_t *associated_block);
+    parse_execution_result_t run_job_list(tnode_t<Type> job_list_node,
+                                          const block_t *associated_block);
+    parse_execution_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
+                                                        const block_t *associated_block);
 
     // Returns the line number of the node. Not const since it touches cached_lineno_offset.
     int line_offset_of_node(tnode_t<grammar::job> node);
@@ -160,8 +158,10 @@ class parse_execution_context_t {
 
     /// Start executing at the given node. Returns 0 if there was no error, 1 if there was an
     /// error.
-    eval_result_t eval_node(tnode_t<grammar::statement> statement, const block_t *associated_block);
-    eval_result_t eval_node(tnode_t<grammar::job_list> job_list, const block_t *associated_block);
+    parse_execution_result_t eval_node(tnode_t<grammar::statement> statement,
+                                       const block_t *associated_block);
+    parse_execution_result_t eval_node(tnode_t<grammar::job_list> job_list,
+                                       const block_t *associated_block);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index b457718f4..1146fe1a3 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -674,12 +674,19 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(
         &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
-    eval_result_t res = execution_context->eval_node(node, scope_block);
+    parse_execution_result_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
     job_reap(*this, false);  // reap again
-    return res;
+    switch (res) {
+        case parse_execution_success:
+            return eval_result_t::ok;
+        case parse_execution_errored:
+            return eval_result_t::error;
+        case parse_execution_cancelled:
+            return eval_result_t::cancelled;
+    }
 }
 
 // Explicit instantiations. TODO: use overloads instead?
diff --git a/src/parser.h b/src/parser.h
index 41aff1176..bbe1c1eff 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -15,7 +15,6 @@
 #include "event.h"
 #include "expand.h"
 #include "parse_constants.h"
-#include "parse_execution.h"
 #include "parse_tree.h"
 #include "proc.h"
 
@@ -54,6 +53,18 @@ enum class loop_status_t {
     continues,  /// current loop block should be skipped
 };
 
+/// Result of the source code form of eval.
+enum class eval_result_t {
+    /// eval was able to evaluate the source or tree.
+    ok,
+
+    /// Evaluation was cancelled, e.g. because of a signal.
+    cancelled,
+
+    /// Parse or execution error (but not simply a failed command).
+    error,
+};
+
 /// block_t represents a block of commands.
 class block_t {
     /// Construct from a block type.

From b3d2cdc0ff23d6487f84877a3b3c1a4499973edc Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 18:10:29 -0800
Subject: [PATCH 1406/1732] Unify parse_execution_result_t and eval_result_t
 again

Do other cleanup to better express the difference between cancellation
and control flow.
---
 src/fish_tests.cpp      |   6 +-
 src/parse_execution.cpp | 279 ++++++++++++++++++++--------------------
 src/parse_execution.h   | 131 +++++++++----------
 src/parser.cpp          |  15 +--
 src/parser.h            |  13 +-
 5 files changed, 212 insertions(+), 232 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index ebf6591e3..61f84b61e 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1032,12 +1032,16 @@ static void test_1_cancellation(const wchar_t *src) {
         usleep(delay * 1E6);
         pthread_kill(thread, SIGINT);
     });
-    parser_t::principal_parser().eval(src, io_chain_t{filler}, TOP);
+    eval_result_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler}, TOP);
+    fprintf(stderr, "eval: %d\n", (int)ret);
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
             buffer->buffer().size(), src);
     }
+    // TODO: cancelling out of command substitutions is currently reported as an error, not a
+    // cancellation.
+    // do_test(ret == eval_result_t::cancelled);
     iothread_drain_all();
 }
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index de5007b17..09be1e00a 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -183,27 +183,21 @@ process_type_t parse_execution_context_t::process_type_for_command(
     return process_type;
 }
 
-bool parse_execution_context_t::should_cancel_execution(const block_t *block) const {
-    return cancellation_reason(block) != execution_cancellation_none;
-}
-
-parse_execution_context_t::execution_cancellation_reason_t
-parse_execution_context_t::cancellation_reason(const block_t *block) const {
-    UNUSED(block);
+maybe_t<eval_result_t> parse_execution_context_t::check_end_execution() const {
     if (shell_is_exiting()) {
-        return execution_cancellation_exit;
+        return eval_result_t::cancelled;
     }
     if (parser && parser->cancellation_requested) {
-        return execution_cancellation_skip;
+        return eval_result_t::cancelled;
     }
     const auto &ld = parser->libdata();
     if (ld.returning) {
-        return execution_cancellation_skip;
+        return eval_result_t::control_flow;
     }
     if (ld.loop_status != loop_status_t::normals) {
-        return execution_cancellation_loop_control;
+        return eval_result_t::control_flow;
     }
-    return execution_cancellation_none;
+    return none();
 }
 
 /// Return whether the job contains a single statement, of block type, with no redirections.
@@ -240,9 +234,9 @@ bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) co
     }
 }
 
-parse_execution_result_t parse_execution_context_t::run_if_statement(
-    tnode_t<g::if_statement> statement, const block_t *associated_block) {
-    parse_execution_result_t result = parse_execution_success;
+eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statement> statement,
+                                                          const block_t *associated_block) {
+    eval_result_t result = eval_result_t::ok;
 
     // We have a sequence of if clauses, with a final else, resulting in a single job list that we
     // execute.
@@ -254,8 +248,8 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
     trace_if_enabled(*parser, L"if");
 
     for (;;) {
-        if (should_cancel_execution(associated_block)) {
-            result = parse_execution_cancelled;
+        if (auto ret = check_end_execution()) {
+            result = *ret;
             break;
         }
 
@@ -263,14 +257,14 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
         tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
         tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
 
-        // Check the condition and the tail. We treat parse_execution_errored here as failure, in
+        // Check the condition and the tail. We treat eval_result_t::error here as failure, in
         // accordance with historic behavior.
-        parse_execution_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == parse_execution_success) {
+        eval_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == eval_result_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
         const bool take_branch =
-            (cond_ret == parse_execution_success) && parser->get_last_status() == EXIT_SUCCESS;
+            (cond_ret == eval_result_t::ok) && parser->get_last_status() == EXIT_SUCCESS;
 
         if (take_branch) {
             // Condition succeeded.
@@ -304,8 +298,8 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
     if (job_list_to_execute) {
         block_t *ib = parser->push_block(block_t::if_block());
         run_job_list(job_list_to_execute, ib);
-        if (should_cancel_execution(ib)) {
-            result = parse_execution_cancelled;
+        if (auto ret = check_end_execution()) {
+            result = *ret;
         }
         parser->pop_block(ib);
     } else {
@@ -316,35 +310,33 @@ parse_execution_result_t parse_execution_context_t::run_if_statement(
     trace_if_enabled(*parser, L"end if");
 
     // It's possible there's a last-minute cancellation (issue #1297).
-    if (should_cancel_execution(associated_block)) {
-        result = parse_execution_cancelled;
+    if (auto ret = check_end_execution()) {
+        result = *ret;
     }
 
     // Otherwise, take the exit status of the job list. Reversal of issue #1061.
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_begin_statement(
-    tnode_t<g::job_list> contents) {
+eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
     trace_if_enabled(*parser, L"begin");
     block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
-    parse_execution_result_t ret = run_job_list(contents, sb);
+    eval_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
     trace_if_enabled(*parser, L"end begin");
     return ret;
 }
 
 // Define a function.
-parse_execution_result_t parse_execution_context_t::run_function_statement(
-    tnode_t<g::function_header> header, tnode_t<g::job_list> body) {
+eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::function_header> header,
+                                                                tnode_t<g::job_list> body) {
     // Get arguments.
     wcstring_list_t arguments;
     argument_node_list_t arg_nodes = header.descendants<g::argument>();
-    parse_execution_result_t result =
-        this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
+    eval_result_t result = this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
 
-    if (result != parse_execution_success) {
+    if (result != eval_result_t::ok) {
         return result;
     }
     trace_if_enabled(*parser, L"function", arguments);
@@ -355,18 +347,18 @@ parse_execution_result_t parse_execution_context_t::run_function_statement(
     wcstring errtext = streams.err.contents();
     if (!errtext.empty()) {
         this->report_error(header, L"%ls", errtext.c_str());
-        result = parse_execution_errored;
+        result = eval_result_t::error;
     }
 
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_block_statement(
-    tnode_t<g::block_statement> statement, const block_t *associated_block) {
+eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_statement> statement,
+                                                             const block_t *associated_block) {
     tnode_t<g::block_header> bheader = statement.child<0>();
     tnode_t<g::job_list> contents = statement.child<1>();
 
-    parse_execution_result_t ret = parse_execution_success;
+    eval_result_t ret = eval_result_t::ok;
     if (auto header = bheader.try_get_child<g::for_header, 0>()) {
         ret = run_for_statement(header, contents);
     } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
@@ -391,7 +383,7 @@ bool parse_execution_context_t::is_function_context() const {
     return is_within_function_call;
 }
 
-parse_execution_result_t parse_execution_context_t::run_for_statement(
+eval_result_t parse_execution_context_t::run_for_statement(
     tnode_t<grammar::for_header> header, tnode_t<grammar::job_list> block_contents) {
     // Get the variable name: `for var_name in ...`. We expand the variable name. It better result
     // in just one.
@@ -399,14 +391,14 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     wcstring for_var_name = get_source(var_name_node);
     if (!expand_one(for_var_name, expand_flags_t{}, parser->vars(), parser->shared())) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     // Get the contents to iterate over.
     wcstring_list_t arguments;
-    parse_execution_result_t ret = this->expand_arguments_from_nodes(
-        get_argument_nodes(header.child<3>()), &arguments, nullglob);
-    if (ret != parse_execution_success) {
+    eval_result_t ret = this->expand_arguments_from_nodes(get_argument_nodes(header.child<3>()),
+                                                          &arguments, nullglob);
+    if (ret != eval_result_t::ok) {
         return ret;
     }
 
@@ -418,13 +410,13 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         if (retval != ENV_OK) {
             report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
                          for_var_name.c_str());
-            return parse_execution_errored;
+            return eval_result_t::error;
         }
     }
 
     if (!valid_var_name(for_var_name)) {
         report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     trace_if_enabled(*parser, L"for", arguments);
@@ -432,8 +424,8 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
 
     // Now drive the for loop.
     for (const wcstring &val : arguments) {
-        if (should_cancel_execution(fb)) {
-            ret = parse_execution_cancelled;
+        if (auto reason = check_end_execution()) {
+            ret = *reason;
             break;
         }
 
@@ -445,7 +437,7 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
         ld.loop_status = loop_status_t::normals;
         this->run_job_list(block_contents, fb);
 
-        if (this->cancellation_reason(fb) == execution_cancellation_loop_control) {
+        if (check_end_execution() == eval_result_t::control_flow) {
             // Handle break or continue.
             bool do_break = (ld.loop_status == loop_status_t::breaks);
             ld.loop_status = loop_status_t::normals;
@@ -460,9 +452,9 @@ parse_execution_result_t parse_execution_context_t::run_for_statement(
     return ret;
 }
 
-parse_execution_result_t parse_execution_context_t::run_switch_statement(
+eval_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<grammar::switch_statement> statement) {
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
 
     // Get the switch variable.
     tnode_t<grammar::argument> switch_value_n = statement.child<1>();
@@ -495,13 +487,13 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         }
     }
 
-    if (result == parse_execution_success && switch_values_expanded.size() > 1) {
+    if (result == eval_result_t::ok && switch_values_expanded.size() > 1) {
         result =
             report_error(switch_value_n, _(L"switch: Expected at most one argument, got %lu\n"),
                          switch_values_expanded.size());
     }
 
-    if (result != parse_execution_success) {
+    if (result != eval_result_t::ok) {
         return result;
     }
 
@@ -514,8 +506,8 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<g::case_item_list> case_item_list = statement.child<3>();
     tnode_t<g::case_item> matching_case_item{};
     while (auto case_item = case_item_list.next_in_list<g::case_item>()) {
-        if (should_cancel_execution(sb)) {
-            result = parse_execution_cancelled;
+        if (auto ret = check_end_execution()) {
+            result = *ret;
             break;
         }
 
@@ -524,9 +516,9 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
         // contains an unexpandable process will report and then fail to match.
         auto arg_nodes = get_argument_nodes(case_item.child<1>());
         wcstring_list_t case_args;
-        parse_execution_result_t case_result =
+        eval_result_t case_result =
             this->expand_arguments_from_nodes(arg_nodes, &case_args, failglob);
-        if (case_result == parse_execution_success) {
+        if (case_result == eval_result_t::ok) {
             for (const wcstring &arg : case_args) {
                 // Unescape wildcards so they can be expanded again.
                 wcstring unescaped_arg = parse_util_unescape_wildcards(arg);
@@ -544,7 +536,7 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
 
     if (matching_case_item) {
         // Success, evaluate the job list.
-        assert(result == parse_execution_success && "Expected success");
+        assert(result == eval_result_t::ok && "Expected success");
         auto job_list = matching_case_item.child<3>();
         result = this->run_job_list(job_list, sb);
     }
@@ -553,10 +545,10 @@ parse_execution_result_t parse_execution_context_t::run_switch_statement(
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_while_statement(
-    tnode_t<grammar::while_header> header, tnode_t<grammar::job_list> contents,
-    const block_t *associated_block) {
-    parse_execution_result_t ret = parse_execution_success;
+eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::while_header> header,
+                                                             tnode_t<grammar::job_list> contents,
+                                                             const block_t *associated_block) {
+    eval_result_t ret = eval_result_t::ok;
 
     // "The exit status of the while loop shall be the exit status of the last compound-list-2
     // executed, or zero if none was executed."
@@ -584,16 +576,15 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         first_cond_check = false;
 
         // Check the condition.
-        parse_execution_result_t cond_ret =
-            this->run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == parse_execution_success) {
+        eval_result_t cond_ret = this->run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == eval_result_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
 
         // If the loop condition failed to execute, then exit the loop without modifying the exit
         // status. If the loop condition executed with a failure status, restore the status and then
         // exit the loop.
-        if (cond_ret != parse_execution_success) {
+        if (cond_ret != eval_result_t::ok) {
             break;
         } else if (parser->get_last_status() != EXIT_SUCCESS) {
             parser->set_last_statuses(cond_saved_status);
@@ -601,8 +592,8 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
         }
 
         // Check cancellation.
-        if (this->should_cancel_execution(associated_block)) {
-            ret = parse_execution_cancelled;
+        if (auto reason = check_end_execution()) {
+            ret = *reason;
             break;
         }
 
@@ -612,10 +603,10 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
 
         block_t *wb = parser->push_block(block_t::while_block());
         this->run_job_list(contents, wb);
-        auto cancel_reason = this->cancellation_reason(wb);
+        auto cancel_reason = this->check_end_execution();
         parser->pop_block(wb);
 
-        if (cancel_reason == execution_cancellation_loop_control) {
+        if (cancel_reason == eval_result_t::control_flow) {
             // Handle break or continue.
             bool do_break = (ld.loop_status == loop_status_t::breaks);
             ld.loop_status = loop_status_t::normals;
@@ -636,10 +627,10 @@ parse_execution_result_t parse_execution_context_t::run_while_statement(
     return ret;
 }
 
-// Reports an error. Always returns parse_execution_errored, so you can assign the result to an
+// Reports an error. Always returns eval_result_t::error, so you can assign the result to an
 // 'errored' variable.
-parse_execution_result_t parse_execution_context_t::report_error(const parse_node_t &node,
-                                                                 const wchar_t *fmt, ...) const {
+eval_result_t parse_execution_context_t::report_error(const parse_node_t &node, const wchar_t *fmt,
+                                                      ...) const {
     // Create an error.
     parse_error_list_t error_list = parse_error_list_t(1);
     parse_error_t *error = &error_list.at(0);
@@ -653,11 +644,10 @@ parse_execution_result_t parse_execution_context_t::report_error(const parse_nod
     va_end(va);
 
     this->report_errors(error_list);
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-parse_execution_result_t parse_execution_context_t::report_errors(
-    const parse_error_list_t &error_list) const {
+eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const {
     if (!parser->cancellation_requested) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
@@ -672,19 +662,19 @@ parse_execution_result_t parse_execution_context_t::report_errors(
             std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
     }
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-/// Reports an unmatched wildcard error and returns parse_execution_errored.
-parse_execution_result_t parse_execution_context_t::report_unmatched_wildcard_error(
+/// Reports an unmatched wildcard error and returns eval_result_t::error.
+eval_result_t parse_execution_context_t::report_unmatched_wildcard_error(
     const parse_node_t &unmatched_wildcard) const {
     parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
     report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
 /// Handle the case of command not found.
-parse_execution_result_t parse_execution_context_t::handle_command_not_found(
+eval_result_t parse_execution_context_t::handle_command_not_found(
     const wcstring &cmd_str, tnode_t<g::plain_statement> statement, int err_code) {
     // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
     // status to 127, which is the standard number used by other shells like bash and zsh.
@@ -698,10 +688,10 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
         wcstring_list_t event_args;
         {
             auto args = get_argument_nodes(statement.child<1>());
-            parse_execution_result_t arg_result =
+            eval_result_t arg_result =
                 this->expand_arguments_from_nodes(args, &event_args, failglob);
 
-            if (arg_result != parse_execution_success) {
+            if (arg_result != eval_result_t::ok) {
                 return arg_result;
             }
 
@@ -718,12 +708,12 @@ parse_execution_result_t parse_execution_context_t::handle_command_not_found(
     int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
     parser->set_last_statuses(statuses_t::just(status));
 
-    return parse_execution_errored;
+    return eval_result_t::error;
 }
 
-parse_execution_result_t parse_execution_context_t::expand_command(
-    tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
-    wcstring_list_t *out_args) const {
+eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_statement> statement,
+                                                        wcstring *out_cmd,
+                                                        wcstring_list_t *out_args) const {
     // Here we're expanding a command, for example $HOME/bin/stuff or $randomthing. The first
     // completion becomes the command itself, everything after becomes arguments. Command
     // substitutions are not supported.
@@ -753,11 +743,11 @@ parse_execution_result_t parse_execution_context_t::expand_command(
     if (out_cmd->empty()) {
         return this->report_error(statement, _(L"The expanded command was empty."));
     }
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 /// Creates a 'normal' (non-block) process.
-parse_execution_result_t parse_execution_context_t::populate_plain_process(
+eval_result_t parse_execution_context_t::populate_plain_process(
     job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
     assert(job != nullptr);
     assert(proc != nullptr);
@@ -769,7 +759,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     wcstring cmd;
     wcstring_list_t args_from_cmd_expansion;
     auto ret = expand_command(statement, &cmd, &args_from_cmd_expansion);
-    if (ret != parse_execution_success) {
+    if (ret != eval_result_t::ok) {
         return ret;
     }
     assert(!cmd.empty() && "expand_command should not produce an empty command");
@@ -796,7 +786,7 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
             if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
                 reader_bg_job_warning(*parser);
                 last_exec_run_count = current_run_count;
-                return parse_execution_errored;
+                return eval_result_t::error;
             } else {
                 hup_background_jobs(*parser);
             }
@@ -852,15 +842,15 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
         cmd_args.insert(cmd_args.end(), args_from_cmd_expansion.begin(),
                         args_from_cmd_expansion.end());
         argument_node_list_t arg_nodes = statement.descendants<g::argument>();
-        parse_execution_result_t arg_result =
+        eval_result_t arg_result =
             this->expand_arguments_from_nodes(arg_nodes, &cmd_args, glob_behavior);
-        if (arg_result != parse_execution_success) {
+        if (arg_result != eval_result_t::ok) {
             return arg_result;
         }
 
         // The set of IO redirections that we construct for the process.
         if (!this->determine_redirections(statement.child<1>(), &redirections)) {
-            return parse_execution_errored;
+            return eval_result_t::error;
         }
 
         // Determine the process type.
@@ -872,12 +862,12 @@ parse_execution_result_t parse_execution_context_t::populate_plain_process(
     proc->set_argv(cmd_args);
     proc->set_redirection_specs(std::move(redirections));
     proc->actual_cmd = std::move(path_to_external_command);
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 // Determine the list of arguments, expanding stuff. Reports any errors caused by expansion. If we
 // have a wildcard that could not be expanded, report the error and continue.
-parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
+eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
     const argument_node_list_t &argument_nodes, wcstring_list_t *out_arguments,
     globspec_t glob_behavior) {
     // Get all argument nodes underneath the statement. We guess we'll have that many arguments (but
@@ -897,14 +887,13 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
             case expand_result_t::error: {
-                this->report_errors(errors);
-                return parse_execution_errored;
+                return this->report_errors(errors);
             }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
                     report_unmatched_wildcard_error(arg_node);
-                    return parse_execution_errored;
+                    return eval_result_t::error;
                 }
                 break;
             }
@@ -927,11 +916,11 @@ parse_execution_result_t parse_execution_context_t::expand_arguments_from_nodes(
     }
 
     // We may have received a cancellation during this expansion.
-    if (parser->cancellation_requested) {
-        return parse_execution_cancelled;
+    if (auto ret = check_end_execution()) {
+        return *ret;
     }
 
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
 bool parse_execution_context_t::determine_redirections(
@@ -981,7 +970,7 @@ bool parse_execution_context_t::determine_redirections(
     return true;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_not_process(
+eval_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
@@ -991,9 +980,9 @@ parse_execution_result_t parse_execution_context_t::populate_not_process(
 }
 
 template <typename Type>
-parse_execution_result_t parse_execution_context_t::populate_block_process(
-    job_t *job, process_t *proc, tnode_t<g::statement> statement,
-    tnode_t<Type> specific_statement) {
+eval_result_t parse_execution_context_t::populate_block_process(job_t *job, process_t *proc,
+                                                                tnode_t<g::statement> statement,
+                                                                tnode_t<Type> specific_statement) {
     // We handle block statements by creating process_type_t::block_node, that will bounce back to
     // us when it's time to execute them.
     UNUSED(job);
@@ -1008,22 +997,22 @@ parse_execution_result_t parse_execution_context_t::populate_block_process(
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
     redirection_spec_list_t redirections;
     if (!this->determine_redirections(arguments, &redirections)) {
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
     proc->set_redirection_specs(std::move(redirections));
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
-parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
+eval_result_t parse_execution_context_t::apply_variable_assignments(
     process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
     const block_t **block) {
     variable_assignment_node_list_t assignment_list =
         get_variable_assignment_nodes(variable_assignments);
-    if (assignment_list.empty()) return parse_execution_success;
+    if (assignment_list.empty()) return eval_result_t::ok;
     *block = parser->push_block(block_t::variable_assignment_block());
     for (const auto &variable_assignment : assignment_list) {
         const wcstring &source = variable_assignment.get_source(pstree->src);
@@ -1042,7 +1031,7 @@ parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return parse_execution_errored;
+                return eval_result_t::error;
             }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
             case expand_result_t::wildcard_match:
@@ -1061,22 +1050,21 @@ parse_execution_result_t parse_execution_context_t::apply_variable_assignments(
         if (proc) proc->variable_assignments.push_back({variable_name, vals});
         parser->vars().set(std::move(variable_name), ENV_LOCAL | ENV_EXPORT, std::move(vals));
     }
-    return parse_execution_success;
+    return eval_result_t::ok;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_job_process(
+eval_result_t parse_execution_context_t::populate_job_process(
     job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
     tnode_t<grammar::variable_assignments> variable_assignments) {
     // Get the "specific statement" which is boolean / block / if / switch / decorated.
     const parse_node_t &specific_statement = statement.get_child_node<0>();
 
     const block_t *block = nullptr;
-    parse_execution_result_t result =
-        this->apply_variable_assignments(proc, variable_assignments, &block);
+    eval_result_t result = this->apply_variable_assignments(proc, variable_assignments, &block);
     cleanup_t scope([&]() {
         if (block) parser->pop_block(block);
     });
-    if (result != parse_execution_success) return parse_execution_errored;
+    if (result != eval_result_t::ok) return eval_result_t::error;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1113,7 +1101,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_process(
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
+eval_result_t parse_execution_context_t::populate_job_from_job_node(
     job_t *j, tnode_t<grammar::job> job_node, const block_t *associated_block) {
     UNUSED(associated_block);
 
@@ -1128,7 +1116,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
-    parse_execution_result_t result =
+    eval_result_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
@@ -1136,7 +1124,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     tnode_t<g::job_continuation> job_cont = job_node.child<2>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
-        if (result != parse_execution_success) {
+        if (result != eval_result_t::ok) {
             break;
         }
         auto variable_assignments = job_cont.require_get_child<g::variable_assignments, 2>();
@@ -1173,7 +1161,7 @@ parse_execution_result_t parse_execution_context_t::populate_job_from_job_node(
     processes.back()->is_last_in_job = true;
 
     // Return what happened.
-    if (result == parse_execution_success) {
+    if (result == eval_result_t::ok) {
         // Link up the processes.
         assert(!processes.empty());  //!OCLINT(multiple unary operator)
         j->processes = std::move(processes);
@@ -1191,10 +1179,10 @@ static bool remove_job(parser_t &parser, job_t *job) {
     return false;
 }
 
-parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
-                                                              const block_t *associated_block) {
-    if (should_cancel_execution(associated_block)) {
-        return parse_execution_cancelled;
+eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
+                                                   const block_t *associated_block) {
+    if (auto ret = check_end_execution()) {
+        return *ret;
     }
 
     // Get terminal modes.
@@ -1202,7 +1190,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
-        return parse_execution_errored;
+        return eval_result_t::error;
     }
 
     // Increment the eval_level for the duration of this command.
@@ -1225,7 +1213,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     if (job_is_simple_block(job_node)) {
         tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
         const block_t *block = nullptr;
-        parse_execution_result_t result =
+        eval_result_t result =
             this->apply_variable_assignments(nullptr, variable_assignments, &block);
         cleanup_t scope([&]() {
             if (block) parser->pop_block(block);
@@ -1234,7 +1222,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         tnode_t<g::statement> statement = job_node.child<1>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
-        if (result == parse_execution_success) {
+        if (result == eval_result_t::ok) {
             switch (specific_statement.type) {
                 case symbol_block_statement: {
                     result =
@@ -1302,7 +1290,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
-    parse_execution_result_t pop_result =
+    eval_result_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
     assert(libdata.caller_job_id == job->job_id && "Caller job ID unexpectedly changed");
@@ -1314,8 +1302,7 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
     }
 
     // Clean up the job on failure or cancellation.
-    bool populated_job = (pop_result == parse_execution_success);
-    if (populated_job) {
+    if (pop_result == eval_result_t::ok) {
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
 
@@ -1346,21 +1333,24 @@ parse_execution_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> jo
         profile_item->parse = static_cast<int>(parse_time - start_time);
         profile_item->exec = static_cast<int>(exec_time - parse_time);
         profile_item->cmd = job ? job->command() : wcstring();
-        profile_item->skipped = !populated_job;
+        profile_item->skipped = (pop_result != eval_result_t::ok);
     }
 
     job_reap(*parser, false);  // clean up jobs
-    return populated_job ? parse_execution_success : parse_execution_errored;
+    return pop_result;
 }
 
-parse_execution_result_t parse_execution_context_t::run_job_conjunction(
+eval_result_t parse_execution_context_t::run_job_conjunction(
     tnode_t<grammar::job_conjunction> job_expr, const block_t *associated_block) {
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
     tnode_t<g::job_conjunction> cursor = job_expr;
     // continuation is the parent of the cursor
     tnode_t<g::job_conjunction_continuation> continuation;
     while (cursor) {
-        if (should_cancel_execution(associated_block)) break;
+        if (auto reason = check_end_execution()) {
+            result = *reason;
+            break;
+        }
         bool skip = false;
         if (continuation) {
             // Check the conjunction type.
@@ -1391,20 +1381,23 @@ bool parse_execution_context_t::should_skip(parse_bool_statement_type_t type) co
 }
 
 template <typename Type>
-parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
-                                                                 const block_t *associated_block) {
+eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
+                                                      const block_t *associated_block) {
     // We handle both job_list and andor_job_list uniformly.
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
-    parse_execution_result_t result = parse_execution_success;
+    eval_result_t result = eval_result_t::ok;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
-        if (should_cancel_execution(associated_block)) break;
+        if (auto reason = check_end_execution()) {
+            result = *reason;
+            break;
+        }
 
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
         if (should_skip(get_decorator(job_conj))) {
-            result = parse_execution_success;
+            result = eval_result_t::ok;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
@@ -1414,11 +1407,11 @@ parse_execution_result_t parse_execution_context_t::run_job_list(tnode_t<Type> j
     return result;
 }
 
-parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
-                                                              const block_t *associated_block) {
+eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
+                                                   const block_t *associated_block) {
     assert(statement && "Empty node in eval_node");
     assert(statement.matches_node_tree(tree()) && "statement has unexpected tree");
-    enum parse_execution_result_t status = parse_execution_success;
+    enum eval_result_t status = eval_result_t::ok;
     if (auto block = statement.try_get_child<g::block_statement, 0>()) {
         status = this->run_block_statement(block, associated_block);
     } else if (auto ifstat = statement.try_get_child<g::if_statement, 0>()) {
@@ -1433,8 +1426,8 @@ parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::stateme
     return status;
 }
 
-parse_execution_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
-                                                              const block_t *associated_block) {
+eval_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
+                                                   const block_t *associated_block) {
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
diff --git a/src/parse_execution.h b/src/parse_execution.h
index b9018f8ff..493d65f4d 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -13,14 +13,21 @@
 class block_t;
 class parser_t;
 
-enum parse_execution_result_t {
-    /// The job was successfully executed (though it have failed on its own).
-    parse_execution_success,
-    /// The job did not execute due to some error (e.g. failed to wildcard expand). An error will
-    /// have been printed and proc_last_status will have been set.
-    parse_execution_errored,
-    /// The job was cancelled (e.g. Ctrl-C).
-    parse_execution_cancelled,
+/// An eval_result represents evaluation errors including wildcards which failed to match, syntax
+/// errors, or other expansion errors. It also tracks when evaluation was skipped due to signal
+/// cancellation. Note it does not track the exit status of commands.
+enum class eval_result_t {
+    /// Evaluation was successfull.
+    ok,
+
+    /// Evaluation was skipped due to control flow (break or return).
+    control_flow,
+
+    /// Evaluation was cancelled, e.g. because of a signal or exit.
+    cancelled,
+
+    /// A parse error or failed expansion (but not an error exit status from a command).
+    error,
 };
 
 class parse_execution_context_t {
@@ -38,31 +45,22 @@ class parse_execution_context_t {
     parse_execution_context_t(const parse_execution_context_t &) = delete;
     parse_execution_context_t &operator=(const parse_execution_context_t &) = delete;
 
-    // Should I cancel?
-    bool should_cancel_execution(const block_t *block) const;
+    // Check to see if we should end execution.
+    // \return the eval result to end with, or none() to continue on.
+    // This will never return eval_result_t::ok.
+    maybe_t<eval_result_t> check_end_execution() const;
 
-    // Ways that we can stop executing a block. These are in a sort of ascending order of
-    // importance, e.g. `exit` should trump `break`.
-    enum execution_cancellation_reason_t {
-        execution_cancellation_none,
-        execution_cancellation_loop_control,
-        execution_cancellation_skip,
-        execution_cancellation_exit
-    };
-    execution_cancellation_reason_t cancellation_reason(const block_t *block) const;
-
-    // Report an error. Always returns true.
-    parse_execution_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    parse_execution_result_t report_errors(const parse_error_list_t &error_list) const;
+    // Report an error. Always returns 'eval_result_t::error'.
+    eval_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
+    eval_result_t report_errors(const parse_error_list_t &error_list) const;
 
     // Wildcard error helper.
-    parse_execution_result_t report_unmatched_wildcard_error(
-        const parse_node_t &unmatched_wildcard) const;
+    eval_result_t report_unmatched_wildcard_error(const parse_node_t &unmatched_wildcard) const;
 
     /// Command not found support.
-    parse_execution_result_t handle_command_not_found(const wcstring &cmd,
-                                                      tnode_t<grammar::plain_statement> statement,
-                                                      int err_code);
+    eval_result_t handle_command_not_found(const wcstring &cmd,
+                                           tnode_t<grammar::plain_statement> statement,
+                                           int err_code);
 
     // Utilities
     wcstring get_source(const parse_node_t &node) const;
@@ -72,8 +70,8 @@ class parse_execution_context_t {
 
     // Expand a command which may contain variables, producing an expand command and possibly
     // arguments. Prints an error message on error.
-    parse_execution_result_t expand_command(tnode_t<grammar::plain_statement> statement,
-                                            wcstring *out_cmd, wcstring_list_t *out_args) const;
+    eval_result_t expand_command(tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
+                                 wcstring_list_t *out_args) const;
 
     /// Return whether we should skip a job with the given bool statement type.
     bool should_skip(parse_bool_statement_type_t type) const;
@@ -83,58 +81,57 @@ class parse_execution_context_t {
 
     enum process_type_t process_type_for_command(tnode_t<grammar::plain_statement> statement,
                                                  const wcstring &cmd) const;
-    parse_execution_result_t apply_variable_assignments(
+    eval_result_t apply_variable_assignments(
         process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
         const block_t **block);
 
     // These create process_t structures from statements.
-    parse_execution_result_t populate_job_process(
-        job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
-        tnode_t<grammar::variable_assignments> variable_assignments);
-    parse_execution_result_t populate_not_process(job_t *job, process_t *proc,
-                                                  tnode_t<grammar::not_statement> not_statement);
-    parse_execution_result_t populate_plain_process(job_t *job, process_t *proc,
-                                                    tnode_t<grammar::plain_statement> statement);
+    eval_result_t populate_job_process(job_t *job, process_t *proc,
+                                       tnode_t<grammar::statement> statement,
+                                       tnode_t<grammar::variable_assignments> variable_assignments);
+    eval_result_t populate_not_process(job_t *job, process_t *proc,
+                                       tnode_t<grammar::not_statement> not_statement);
+    eval_result_t populate_plain_process(job_t *job, process_t *proc,
+                                         tnode_t<grammar::plain_statement> statement);
 
     template <typename Type>
-    parse_execution_result_t populate_block_process(job_t *job, process_t *proc,
-                                                    tnode_t<grammar::statement> statement,
-                                                    tnode_t<Type> specific_statement);
+    eval_result_t populate_block_process(job_t *job, process_t *proc,
+                                         tnode_t<grammar::statement> statement,
+                                         tnode_t<Type> specific_statement);
 
     // These encapsulate the actual logic of various (block) statements.
-    parse_execution_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
-                                                 const block_t *associated_block);
-    parse_execution_result_t run_for_statement(tnode_t<grammar::for_header> header,
-                                               tnode_t<grammar::job_list> contents);
-    parse_execution_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
-                                              const block_t *associated_block);
-    parse_execution_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
-    parse_execution_result_t run_while_statement(tnode_t<grammar::while_header> header,
-                                                 tnode_t<grammar::job_list> contents,
-                                                 const block_t *associated_block);
-    parse_execution_result_t run_function_statement(tnode_t<grammar::function_header> header,
-                                                    tnode_t<grammar::job_list> body);
-    parse_execution_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
+    eval_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
+                                      const block_t *associated_block);
+    eval_result_t run_for_statement(tnode_t<grammar::for_header> header,
+                                    tnode_t<grammar::job_list> contents);
+    eval_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
+                                   const block_t *associated_block);
+    eval_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
+    eval_result_t run_while_statement(tnode_t<grammar::while_header> header,
+                                      tnode_t<grammar::job_list> contents,
+                                      const block_t *associated_block);
+    eval_result_t run_function_statement(tnode_t<grammar::function_header> header,
+                                         tnode_t<grammar::job_list> body);
+    eval_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
 
     enum globspec_t { failglob, nullglob };
     using argument_node_list_t = std::vector<tnode_t<grammar::argument>>;
-    parse_execution_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
-                                                         wcstring_list_t *out_arguments,
-                                                         globspec_t glob_behavior);
+    eval_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
+                                              wcstring_list_t *out_arguments,
+                                              globspec_t glob_behavior);
 
     // Determines the list of redirections for a node. Returns none() on failure, for example, an
     // invalid fd.
     bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
                                 redirection_spec_list_t *out_redirs);
 
-    parse_execution_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    parse_execution_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
-                                                 const block_t *associated_block);
+    eval_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
+    eval_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
+                                      const block_t *associated_block);
     template <typename Type>
-    parse_execution_result_t run_job_list(tnode_t<Type> job_list_node,
-                                          const block_t *associated_block);
-    parse_execution_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
-                                                        const block_t *associated_block);
+    eval_result_t run_job_list(tnode_t<Type> job_list_node, const block_t *associated_block);
+    eval_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
+                                             const block_t *associated_block);
 
     // Returns the line number of the node. Not const since it touches cached_lineno_offset.
     int line_offset_of_node(tnode_t<grammar::job> node);
@@ -158,10 +155,8 @@ class parse_execution_context_t {
 
     /// Start executing at the given node. Returns 0 if there was no error, 1 if there was an
     /// error.
-    parse_execution_result_t eval_node(tnode_t<grammar::statement> statement,
-                                       const block_t *associated_block);
-    parse_execution_result_t eval_node(tnode_t<grammar::job_list> job_list,
-                                       const block_t *associated_block);
+    eval_result_t eval_node(tnode_t<grammar::statement> statement, const block_t *associated_block);
+    eval_result_t eval_node(tnode_t<grammar::job_list> job_list, const block_t *associated_block);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 1146fe1a3..20fa4e01e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -674,19 +674,18 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(
         &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
-    parse_execution_result_t res = execution_context->eval_node(node, scope_block);
+    eval_result_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
     job_reap(*this, false);  // reap again
-    switch (res) {
-        case parse_execution_success:
-            return eval_result_t::ok;
-        case parse_execution_errored:
-            return eval_result_t::error;
-        case parse_execution_cancelled:
-            return eval_result_t::cancelled;
+
+    // control_flow is used internally to react to break and return.
+    // Here we treat that as success.
+    if (res == eval_result_t::control_flow) {
+        res = eval_result_t::ok;
     }
+    return res;
 }
 
 // Explicit instantiations. TODO: use overloads instead?
diff --git a/src/parser.h b/src/parser.h
index bbe1c1eff..41aff1176 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -15,6 +15,7 @@
 #include "event.h"
 #include "expand.h"
 #include "parse_constants.h"
+#include "parse_execution.h"
 #include "parse_tree.h"
 #include "proc.h"
 
@@ -53,18 +54,6 @@ enum class loop_status_t {
     continues,  /// current loop block should be skipped
 };
 
-/// Result of the source code form of eval.
-enum class eval_result_t {
-    /// eval was able to evaluate the source or tree.
-    ok,
-
-    /// Evaluation was cancelled, e.g. because of a signal.
-    cancelled,
-
-    /// Parse or execution error (but not simply a failed command).
-    error,
-};
-
 /// block_t represents a block of commands.
 class block_t {
     /// Construct from a block type.

From d4daa286909c14f4bba5bc9db287fcea7fa66e5c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 18:15:42 -0800
Subject: [PATCH 1407/1732] Correctly set the exit status in block and function
 processes

Previously, if the user control-C'd out of a process, we would set a
bogus exit status in the process, but it was difficult to observe this
because we would be cancelling anyways. But set it properly.
---
 src/exec.cpp | 42 ++++++++++++++++++++++++++----------------
 src/proc.h   |  5 +++++
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index a421c52f4..c872b9226 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -753,11 +753,17 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
         return [=](parser_t &parser) {
-            parser.eval_node(source, node, TOP, lineage);
-            int status = parser.get_last_status();
-            // FIXME: setting the status this way is dangerous nonsense, we need to decode the
-            // status properly if it was a signal.
-            return proc_status_t::from_exit_code(status);
+            eval_result_t res = parser.eval_node(source, node, TOP, lineage);
+            switch (res) {
+                case eval_result_t::ok:
+                case eval_result_t::error:
+                    return proc_status_t::from_exit_code(parser.get_last_status());
+                case eval_result_t::cancelled:
+                    // TODO: we should reflect the actual signal which was received.
+                    return proc_status_t::from_signal(SIGINT);
+                case eval_result_t::control_flow:
+                    DIE("eval_result_t::control_flow should not be returned from eval_node");
+            }
         };
     } else {
         assert(p->type == process_type_t::function);
@@ -771,20 +777,24 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            parser.eval_node(props->parsed_source, props->body_node, TOP, lineage);
+            auto res = parser.eval_node(props->parsed_source, props->body_node, TOP, lineage);
             function_restore_environment(parser, fb);
 
-            // If the function did not execute anything, treat it as success.
-            int status;
-            if (saved_exec_count == ld.exec_count) {
-                status = 0;
-            } else {
-                status = parser.get_last_status();
-            }
+            switch (res) {
+                case eval_result_t::ok:
+                    // If the function did not execute anything, treat it as success.
+                    return proc_status_t::from_exit_code(saved_exec_count == ld.exec_count
+                                                             ? EXIT_SUCCESS
+                                                             : parser.get_last_status());
+                case eval_result_t::error:
+                    return proc_status_t::from_exit_code(parser.get_last_status());
 
-            // FIXME: setting the status this way is dangerous nonsense, we need to decode the
-            // status properly if it was a signal.
-            return proc_status_t::from_exit_code(status);
+                case eval_result_t::cancelled:
+                    // TODO: we should reflect the actual signal which was received.
+                    return proc_status_t::from_signal(SIGINT);
+                case eval_result_t::control_flow:
+                    DIE("eval_result_t::control_flow should not be returned from eval_node");
+            }
         };
     }
 }
diff --git a/src/proc.h b/src/proc.h
index 0118d560a..c209007b3 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -74,6 +74,11 @@ class proc_status_t {
         return proc_status_t(w_exitcode(ret, 0 /* sig */));
     }
 
+    /// Construct directly from a signal.
+    static proc_status_t from_signal(int sig) {
+        return proc_status_t(w_exitcode(0 /* ret */, sig));
+    }
+
     /// \return if we are stopped (as in SIGSTOP).
     bool stopped() const { return WIFSTOPPED(status_); }
 

From 311f47d6837dc7cc9ac736f950ce83242291dd1f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 18:25:23 -0800
Subject: [PATCH 1408/1732] Remove an errant fprintf from the tests

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

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 61f84b61e..b78898bfc 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1033,7 +1033,6 @@ static void test_1_cancellation(const wchar_t *src) {
         pthread_kill(thread, SIGINT);
     });
     eval_result_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler}, TOP);
-    fprintf(stderr, "eval: %d\n", (int)ret);
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
@@ -1042,6 +1041,7 @@ static void test_1_cancellation(const wchar_t *src) {
     // TODO: cancelling out of command substitutions is currently reported as an error, not a
     // cancellation.
     // do_test(ret == eval_result_t::cancelled);
+    (void)ret;
     iothread_drain_all();
 }
 

From 7ab373fbbde0a149514823081dceabf881a2ba74 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 19:22:43 -0800
Subject: [PATCH 1409/1732] Fix some gcc warnings

---
 src/exec.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/exec.cpp b/src/exec.cpp
index c872b9226..c2356dd1b 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -762,6 +762,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
                     // TODO: we should reflect the actual signal which was received.
                     return proc_status_t::from_signal(SIGINT);
                 case eval_result_t::control_flow:
+                default:
                     DIE("eval_result_t::control_flow should not be returned from eval_node");
             }
         };

From e52433d6fecb1c7a6950c41809bdfee544a537c1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 17 Dec 2019 19:51:00 -0800
Subject: [PATCH 1410/1732] Fix gcc warnings harder

---
 src/complete.cpp | 8 ++++----
 src/exec.cpp     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 702af75d4..c3d2aae86 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -211,10 +211,10 @@ completion_t::completion_t(wcstring comp, wcstring desc, string_fuzzy_match_t ma
       match(std::move(mat)),
       flags(resolve_auto_space(completion, flags_val)) {}
 
-completion_t::completion_t(const completion_t &him) = default;
-completion_t::completion_t(completion_t &&him) = default;
-completion_t &completion_t::operator=(const completion_t &him) = default;
-completion_t &completion_t::operator=(completion_t &&him) = default;
+completion_t::completion_t(const completion_t &) = default;
+completion_t::completion_t(completion_t &&) = default;
+completion_t &completion_t::operator=(const completion_t &) = default;
+completion_t &completion_t::operator=(completion_t &&) = default;
 completion_t::~completion_t() = default;
 
 bool completion_t::is_naturally_less_than(const completion_t &a, const completion_t &b) {
diff --git a/src/exec.cpp b/src/exec.cpp
index c2356dd1b..011fcf240 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -793,6 +793,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
                 case eval_result_t::cancelled:
                     // TODO: we should reflect the actual signal which was received.
                     return proc_status_t::from_signal(SIGINT);
+                default:
                 case eval_result_t::control_flow:
                     DIE("eval_result_t::control_flow should not be returned from eval_node");
             }

From d90d4f849ce7dbf80755fc04ab791e03d6179dc3 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 12:31:24 -0600
Subject: [PATCH 1411/1732] Force symlink creation in realpath tests

If an earlier test was aborted, the symlink would still be present and
the subsequent run will fail to create the symlink as it wasn't forced.
---
 tests/checks/realpath.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/checks/realpath.fish b/tests/checks/realpath.fish
index 6add05cf2..8a6d6646a 100644
--- a/tests/checks/realpath.fish
+++ b/tests/checks/realpath.fish
@@ -52,7 +52,7 @@ builtin realpath .
 popd
 
 # A single symlink to a directory is correctly resolved.
-ln -s fish $XDG_DATA_HOME/fish-symlink
+ln -fs fish $XDG_DATA_HOME/fish-symlink
 set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink)
 set -l expected_real_path "$data_home_realpath/fish"
 if test "$real_path" = "$expected_real_path"
@@ -74,9 +74,9 @@ else
 end
 
 # A path with two symlinks, first to a directory, second to a file, is correctly resolved.
-ln -s fish $XDG_DATA_HOME/fish-symlink2
+ln -fs fish $XDG_DATA_HOME/fish-symlink2
 touch $XDG_DATA_HOME/fish/real_file
-ln -s real_file $XDG_DATA_HOME/fish/symlink_file
+ln -fs real_file $XDG_DATA_HOME/fish/symlink_file
 set -l real_path (builtin realpath $XDG_DATA_HOME/fish-symlink/symlink_file)
 set -l expected_real_path "$data_home_realpath/fish/real_file"
 if test "$real_path" = "$expected_real_path"

From 60670999ad0fb90aba5c17bfa1b21ab33995c727 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 12:32:04 -0600
Subject: [PATCH 1412/1732] Fix mismatched wchar_t sign comparison errors on
 some platforms

The C++ spec (as of C++17/n4713) does not specify the sign of `wchar_t`,
saying only (in section 6.7.1: Fundamental Types)

> Type wchar_t shall have the same size, signedness, and alignment
> requirements (6.6.5) as one of the other integral types, called its
> underlying type.

On most *nix platforms on AMD64 architecture, `wchar_t` is a signed type
and can be compared with `int32_t` without incident, but on at least
some platforms (tested: clang under FreeBSD 12.1 on AARCH64), `wchar_t`
appears to be unsigned leading to sign comparison warnings:

```
../src/widecharwidth/widechar_width.h:512:48: warning: comparison of
integers of different signs: 'const wchar_t' and 'int32_t' (aka 'int')
[-Wsign-compare]

    return where != std::end(arr) && where->lo <= c;
```

This patch forces the use of wchar_t for the range start/end values in
`widechar_range` and the associated comparison values.
---
 src/widecharwidth/widechar_width.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/widecharwidth/widechar_width.h b/src/widecharwidth/widechar_width.h
index 62caaf09e..3e63ffbd0 100644
--- a/src/widecharwidth/widechar_width.h
+++ b/src/widecharwidth/widechar_width.h
@@ -30,8 +30,8 @@ enum {
 
 /* An inclusive range of characters. */
 struct widechar_range {
-  int32_t lo;
-  int32_t hi;
+  wchar_t lo;
+  wchar_t hi;
 };
 
 /* Simple ASCII characters - used a lot, so we check them first. */
@@ -506,7 +506,7 @@ static const struct widechar_range widechar_widened_table[] = {
 };
 
 template<typename Collection>
-bool widechar_in_table(const Collection &arr, int32_t c) {
+bool widechar_in_table(const Collection &arr, wchar_t c) {
     auto where = std::lower_bound(std::begin(arr), std::end(arr), c,
         [](widechar_range p, wchar_t c) { return p.hi < c; });
     return where != std::end(arr) && where->lo <= c;

From 92401d8ebb7f8db6b2236feeda8f273ac8371a33 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 12:43:13 -0600
Subject: [PATCH 1413/1732] Fix unused return result hack to work on macOS/GCC
 7.4+

As of GCC 7.4 (at least under macOS 10.10), the previous workaround of
casting a must-use result to `(void)` to avoid warnings about unused
code no longer works.

This workaround is uglier but it quiets these warnings.
---
 src/topic_monitor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index 7f5327735..57763ae7a 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -154,7 +154,8 @@ generation_list_t topic_monitor_t::await_gens(const generation_list_t &input_gen
             (void)select(fd + 1, &fds, nullptr, nullptr, nullptr /* timeout */);
 #endif
             uint8_t ignored[PIPE_BUF];
-            (void)read(fd, ignored, sizeof ignored);
+            auto unused = read(fd, ignored, sizeof ignored);
+            if (unused) {}
 
             // We are finished reading. We must stop being the reader, and post on the condition
             // variable to wake up any other threads waiting for us to finish reading.

From 6dc8a1d3a78eea93638d5062faa2703d61b98213 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 13:13:23 -0600
Subject: [PATCH 1414/1732] Partially address #6340 (escape files starting with
 -)

This prefixes files beginning with `-` with a `./` when generating
completions *in fish code*. Standard completions for directory listings
generated by the C++ directory traversal code are not afected by this
patch.

Most fish completions defer to `__fish_complete_suffix` to generate the
file/directory completions, these *will* be corrected.
---
 share/functions/__fish_complete_suffix.fish | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/functions/__fish_complete_suffix.fish b/share/functions/__fish_complete_suffix.fish
index 401461cf0..4a9deb7a2 100644
--- a/share/functions/__fish_complete_suffix.fish
+++ b/share/functions/__fish_complete_suffix.fish
@@ -81,6 +81,9 @@ function __fish_complete_suffix -d "Complete using files"
     set files $all $dirs
     if string match -qr '^\\./' -- $comp
         set files ./$files
+    else
+        # "Escape" files starting with a literal dash `-` with a `./`
+        set files (string replace -r -- "^-" "./-" $files)
     end
 
     # Another problem is that expanded paths are not matched, either.

From 48bf3a4907cb86cd83c58f02e3334a8ea565daa9 Mon Sep 17 00:00:00 2001
From: Jason <ammgws@users.noreply.github.com>
Date: Mon, 16 Dec 2019 22:23:45 +0900
Subject: [PATCH 1415/1732] Delete __fish_sgrep.fish

---
 po/de.po                          | 4 ----
 po/en.po                          | 4 ----
 po/fr.po                          | 4 ----
 po/nb.po                          | 4 ----
 po/nn.po                          | 4 ----
 po/pl.po                          | 4 ----
 po/pt_BR.po                       | 4 ----
 po/zh_CN.po                       | 4 ----
 share/functions/__fish_sgrep.fish | 5 -----
 9 files changed, 37 deletions(-)
 delete mode 100644 share/functions/__fish_sgrep.fish

diff --git a/po/de.po b/po/de.po
index b27a1b28a..8f8fac50b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -67268,10 +67268,6 @@ msgstr "Prompt ausgeben"
 msgid "Show current path"
 msgstr "Quellpaket anzeigen"
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/en.po b/po/en.po
index 257f15a0a..0034da879 100644
--- a/po/en.po
+++ b/po/en.po
@@ -66607,10 +66607,6 @@ msgstr "Write out the prompt"
 msgid "Show current path"
 msgstr "Show current path"
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 2539f6f8c..63accfb26 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -65601,10 +65601,6 @@ msgstr ""
 msgid "Show current path"
 msgstr "Afficher le chemin actuel"
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index e0458ca73..afad29bb2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -62054,10 +62054,6 @@ msgstr ""
 msgid "Show current path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index ce55ff93b..9ffb4a1fb 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -62055,10 +62055,6 @@ msgstr ""
 msgid "Show current path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f361e2342..70d0d8412 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -62641,10 +62641,6 @@ msgstr ""
 msgid "Show current path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9c2d8b971..8dd7bc8d1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -67748,10 +67748,6 @@ msgstr "Write out the prompt"
 msgid "Show current path"
 msgstr "Show source package"
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9a95ab73d..897cb4574 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -62602,10 +62602,6 @@ msgstr ""
 msgid "Show current path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
-msgid "Call grep without honoring GREP_OPTIONS settings"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
 msgstr ""
diff --git a/share/functions/__fish_sgrep.fish b/share/functions/__fish_sgrep.fish
deleted file mode 100644
index 6dadabfe1..000000000
--- a/share/functions/__fish_sgrep.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# This function is deprecated. Do not introduce new uses. Use the `string` command instead.
-function __fish_sgrep -d "Call grep without honoring GREP_OPTIONS settings"
-    set -l GREP_OPTIONS
-    command grep $argv
-end

From 364929e46ee7e441f61d7f85b3d6f65208675292 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 14:12:15 -0600
Subject: [PATCH 1416/1732] Disown first-run python completions generation

Closes #6269.
---
 share/functions/__fish_config_interactive.fish | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 1deb4ecb6..55a524b62 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -111,7 +111,10 @@ function __fish_config_interactive -d "Initializations that should be performed
             for py in python{3,2,}
                 if command -sq $py
                     set -l c $py $update_args
+                    # Run python directly in the background and swallow all output
                     $c (: fish_update_completions: generating completions from man pages) >/dev/null 2>&1 &
+                    # Then disown the job so that it continues to run in case of an early exit (#6269)
+                    disown 2>&1 >/dev/null
                     break
                 end
             end

From 59562700151abba70fb782defb1adcce1ac7c1be Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 18:06:56 -0600
Subject: [PATCH 1417/1732] Add `time` builtin that understands fish script and
 external executables

This now works:

```fish
function foo
    for n in (seq 1 100000)
        test $n -eq 42
    end
end

time foo
```
---
 CMakeLists.txt       |   2 +-
 src/builtin.cpp      |   2 +
 src/builtin_time.cpp | 119 +++++++++++++++++++++++++++++++++++++++++++
 src/builtin_time.h   |   9 ++++
 4 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 src/builtin_time.cpp
 create mode 100644 src/builtin_time.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d9dff233..d7ecadf8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ SET(FISH_SRCS
     src/signal.cpp src/tinyexpr.cpp src/tnode.cpp src/tokenizer.cpp src/utf8.cpp src/util.cpp
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
-    src/flog.cpp src/trace.cpp
+    src/flog.cpp src/trace.cpp src/builtin_time.cpp
 )
 
 # Header files are just globbed.
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 9eca55180..74a327d5f 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -61,6 +61,7 @@
 #include "builtin_status.h"
 #include "builtin_string.h"
 #include "builtin_test.h"
+#include "builtin_time.h"
 #include "builtin_ulimit.h"
 #include "builtin_wait.h"
 #include "common.h"
@@ -387,6 +388,7 @@ static const builtin_data_t builtin_datas[] = {
     {L"string", &builtin_string, N_(L"Manipulate strings")},
     {L"switch", &builtin_generic, N_(L"Conditionally execute a block of commands")},
     {L"test", &builtin_test, N_(L"Test a condition")},
+    {L"time", &builtin_time, N_(L"Time the execution of a job")},
     {L"true", &builtin_true, N_(L"Return a successful result")},
     {L"ulimit", &builtin_ulimit, N_(L"Set or get the shells resource usage limits")},
     {L"wait", &builtin_wait, N_(L"Wait for background processes completed")},
diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
new file mode 100644
index 000000000..3a5267a77
--- /dev/null
+++ b/src/builtin_time.cpp
@@ -0,0 +1,119 @@
+// Functions for executing the time builtin.
+#include "config.h"  // IWYU pragma: keep
+
+#include <cerrno>
+#include <ctime>
+#include <chrono>
+#include <cstddef>
+
+#include "builtin.h"
+#include "common.h"
+#include "exec.h"
+#include "fallback.h"  // IWYU pragma: keep
+#include "io.h"
+#include "parser.h"
+#include "proc.h"
+#include "wgetopt.h"
+#include "wutil.h"  // IWYU pragma: keep
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+// Measuring time is always complicated with many caveats. Quite apart from the typical
+// gotchas faced by developers attempting to choose between monotonic vs non-monotonic and system vs
+// cpu clocks, the fact that we are executing as a shell further complicates matters: we can't just
+// observe the elapsed CPU time, because that does not reflect the total execution time for both
+// ourselves (internal shell execution time and the time it takes for builtins and functions to
+// execute) and any external processes we spawn.
+
+// It would be nice to use the C++1 type-safe <chrono> interfaces to measure elapsed time, but that
+// unfortunately is underspecified with regards to user/system time and only provides means of
+// querying guaranteed monotonicity and resolution for the various clocks. It can be used to measure
+// elapsed wall time nicely, but if we would like to provide information more useful for
+// benchmarking and tuning then we must turn to either clock_gettime(2), with extensions for thread-
+// and process-specific elapsed CPU time, or times(3) for a standard interface to overall process
+// and child user/system time elapsed between snapshots. At least on some systems, times(3) has been
+// deprecated in favor of getrusage(2), which offers a wider variety of metrics coalesced for SELF,
+// THREAD, or CHILDREN.
+
+static uint64_t micros(struct timeval t) {
+    return (static_cast<uint64_t>(t.tv_usec) + static_cast<uint64_t>(t.tv_sec * 1E6));
+};
+static uint64_t micros(struct timespec t) {
+    return (static_cast<uint64_t>(t.tv_nsec) / 1E3 + static_cast<uint64_t>(t.tv_sec * 1E6));
+};
+
+/// Implementation of time builtin.
+int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
+    int argc = builtin_count_args(argv);
+
+    bool verbose = false;
+    // In the future, we can consider accepting more command-line arguments to dictate the behavior
+    // of the `time` builtin and what it measures or reports.
+    if (argc > 1 && (argv[1] == wcstring(L"-h") || argv[1] == wcstring(L"--help"))) {
+        streams.out.append(L"time <command or expression>\n");
+        streams.out.append(L"Measures the elapsed wall, system, and user clocks in the execution of"
+                L" the given command or expression");
+        return 0;
+    }
+    if (argc > 1 && (argv[1] == wcstring(L"-v") || argv[1] == wcstring(L"--verbose"))) {
+        verbose = true;
+        argc -= 1;
+        argv += 1;
+    }
+
+    wcstring new_cmd;
+    for (int i = 1; i < argc; ++i) {
+        if (i > 1) new_cmd += L' ';
+        new_cmd += argv[i];
+    }
+
+    int status = STATUS_CMD_OK;
+    if (argc > 1) {
+        struct rusage fish_usage[2];
+        struct rusage child_usage [2];
+        struct timespec wall[2] {};
+
+        // Start counters
+        getrusage(RUSAGE_SELF, &fish_usage[0]);
+        getrusage(RUSAGE_CHILDREN, &child_usage[0]);
+        clock_gettime(CLOCK_MONOTONIC, &wall[0]);
+
+        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
+            eval_result_t::ok) {
+            status = STATUS_CMD_ERROR;
+        } else {
+            status = parser.get_last_status();
+        }
+
+        // Stop counters
+        getrusage(RUSAGE_SELF, &fish_usage[1]);
+        getrusage(RUSAGE_CHILDREN, &child_usage[1]);
+        clock_gettime(CLOCK_MONOTONIC, &wall[1]);
+
+
+        uint64_t fish_sys_micros = micros(fish_usage[1].ru_stime) - micros(fish_usage[0].ru_stime);
+        uint64_t fish_usr_micros = micros(fish_usage[1].ru_utime) - micros(fish_usage[0].ru_utime);
+        uint64_t child_sys_micros = micros(child_usage[1].ru_stime) - micros(child_usage[0].ru_stime);
+        uint64_t child_usr_micros = micros(child_usage[1].ru_utime) - micros(child_usage[0].ru_utime);
+
+        uint64_t net_sys_micros = fish_sys_micros + child_sys_micros;
+        uint64_t net_usr_micros = fish_usr_micros + child_usr_micros;
+        uint64_t wall_micros = micros(wall[1]) - micros(wall[0]);
+
+        streams.out.append_format(
+            L"\n__________________________________"              \
+            L"\nExecution completed in %f seconds"               \
+            L"\nuser time     %f seconds"                        \
+            L"\nsystem time   %f seconds"                        \
+            L"\n\n",
+            wall_micros / 1.0E6,
+            net_usr_micros / 1.0E6,
+            net_sys_micros / 1.0E6
+        );
+
+    }
+
+    return status;
+}
diff --git a/src/builtin_time.h b/src/builtin_time.h
new file mode 100644
index 000000000..97fd171b9
--- /dev/null
+++ b/src/builtin_time.h
@@ -0,0 +1,9 @@
+// Prototypes for executing builtin_time function.
+#ifndef FISH_BUILTIN_TIME_H
+#define FISH_BUILTIN_TIME_H
+
+class parser_t;
+struct io_streams_t;
+
+int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv);
+#endif

From 1ed5e7e478f7c9fb1a3f69f22624122ae5ef26da Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 19:21:23 -0600
Subject: [PATCH 1418/1732] Dynamically choose units for `time` output

---
 src/builtin_time.cpp | 58 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
index 3a5267a77..790c558d3 100644
--- a/src/builtin_time.cpp
+++ b/src/builtin_time.cpp
@@ -100,17 +100,61 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         uint64_t net_sys_micros = fish_sys_micros + child_sys_micros;
         uint64_t net_usr_micros = fish_usr_micros + child_usr_micros;
-        uint64_t wall_micros = micros(wall[1]) - micros(wall[0]);
+        uint64_t net_wall_micros = micros(wall[1]) - micros(wall[0]);
+
+        enum class unit {
+            minutes,
+            seconds,
+            milliseconds,
+            microseconds,
+        };
+
+        auto get_unit = [](uint64_t micros) {
+            if (micros > 900 * 1E6) {
+                return unit::minutes;
+            }
+            else if (micros > 1 * 1E6) {
+                return unit::seconds;
+            } else if (micros > 10E3) {
+                return unit::milliseconds;
+            } else {
+                return unit::microseconds;
+            }
+        };
+
+        auto unit_name = [](unit unit) {
+            switch (unit) {
+                case unit::minutes: return "minutes";
+                case unit::seconds: return "seconds";
+                case unit::milliseconds: return "milliseconds";
+                case unit::microseconds: return "microseconds";
+            }
+        };
+
+        auto convert = [](uint64_t micros, unit unit) {
+            switch (unit) {
+                case unit::minutes: return micros / 1.0E6 / 60.0;
+                case unit::seconds: return micros / 1.0E6;
+                case unit::milliseconds: return micros / 1.0E3;
+                case unit::microseconds: return micros / 1.0;
+            }
+        };
+
+        auto wall_unit = get_unit(net_wall_micros);
+        auto cpu_unit = get_unit((net_sys_micros + net_usr_micros) / 2);
+        auto wall_time = convert(net_wall_micros, wall_unit);
+        auto usr_time = convert(net_usr_micros, cpu_unit);
+        auto sys_time = convert(net_sys_micros, cpu_unit);
 
         streams.out.append_format(
             L"\n__________________________________"              \
-            L"\nExecution completed in %f seconds"               \
-            L"\nuser time     %f seconds"                        \
-            L"\nsystem time   %f seconds"                        \
+            L"\nExecuted in    %6.2F %s"               \
+            L"\n   usr time    %6.2F %s"                        \
+            L"\n   sys time    %6.2F %s"                        \
             L"\n\n",
-            wall_micros / 1.0E6,
-            net_usr_micros / 1.0E6,
-            net_sys_micros / 1.0E6
+            wall_time, unit_name(wall_unit),
+            usr_time, unit_name(cpu_unit),
+            sys_time, unit_name(cpu_unit)
         );
 
     }

From be376560671896636b735dd5b8b915b09044c617 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 20:09:08 -0600
Subject: [PATCH 1419/1732] Support `time -v` for detailed `time` output

This breaks down the usage into fish vs external processes.
---
 src/builtin_time.cpp | 101 +++++++++++++++++++++++++++++++++----------
 1 file changed, 77 insertions(+), 24 deletions(-)

diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
index 790c558d3..09215fc4f 100644
--- a/src/builtin_time.cpp
+++ b/src/builtin_time.cpp
@@ -16,6 +16,8 @@
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
+#include <algorithm>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -44,6 +46,14 @@ static uint64_t micros(struct timespec t) {
     return (static_cast<uint64_t>(t.tv_nsec) / 1E3 + static_cast<uint64_t>(t.tv_sec * 1E6));
 };
 
+// Linux makes available CLOCK_MONOTONIC_RAW, which is monotonic even in the presence of NTP
+// adjustments.
+#ifdef CLOCK_MONOTONIC_RAW
+    #define CLOCK_SRC CLOCK_MONOTONIC_RAW
+#else
+    #define CLOCK_SRC CLOCK_MONOTONIC
+#endif
+
 /// Implementation of time builtin.
 int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     int argc = builtin_count_args(argv);
@@ -78,7 +88,7 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Start counters
         getrusage(RUSAGE_SELF, &fish_usage[0]);
         getrusage(RUSAGE_CHILDREN, &child_usage[0]);
-        clock_gettime(CLOCK_MONOTONIC, &wall[0]);
+        clock_gettime(CLOCK_SRC, &wall[0]);
 
         if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
             eval_result_t::ok) {
@@ -90,17 +100,25 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Stop counters
         getrusage(RUSAGE_SELF, &fish_usage[1]);
         getrusage(RUSAGE_CHILDREN, &child_usage[1]);
-        clock_gettime(CLOCK_MONOTONIC, &wall[1]);
+        clock_gettime(CLOCK_SRC, &wall[1]);
 
+        int64_t fish_sys_micros = micros(fish_usage[1].ru_stime) - micros(fish_usage[0].ru_stime);
+        int64_t fish_usr_micros = micros(fish_usage[1].ru_utime) - micros(fish_usage[0].ru_utime);
+        int64_t child_sys_micros = micros(child_usage[1].ru_stime) - micros(child_usage[0].ru_stime);
+        int64_t child_usr_micros = micros(child_usage[1].ru_utime) - micros(child_usage[0].ru_utime);
 
-        uint64_t fish_sys_micros = micros(fish_usage[1].ru_stime) - micros(fish_usage[0].ru_stime);
-        uint64_t fish_usr_micros = micros(fish_usage[1].ru_utime) - micros(fish_usage[0].ru_utime);
-        uint64_t child_sys_micros = micros(child_usage[1].ru_stime) - micros(child_usage[0].ru_stime);
-        uint64_t child_usr_micros = micros(child_usage[1].ru_utime) - micros(child_usage[0].ru_utime);
+        // The result from getrusage is not necessarily realtime, it may be cached a few
+        // microseconds behind. In the event that execution completes extremely quickly or there is
+        // no data (say, we are measuring external execution time but no external processes have
+        // been launched), it can incorrectly appear to be negative.
+        fish_sys_micros = std::max(int64_t(0), fish_sys_micros);
+        fish_usr_micros = std::max(int64_t(0), fish_usr_micros);
+        child_sys_micros = std::max(int64_t(0), child_sys_micros);
+        child_usr_micros = std::max(int64_t(0), child_usr_micros);
 
-        uint64_t net_sys_micros = fish_sys_micros + child_sys_micros;
-        uint64_t net_usr_micros = fish_usr_micros + child_usr_micros;
-        uint64_t net_wall_micros = micros(wall[1]) - micros(wall[0]);
+        int64_t net_sys_micros = fish_sys_micros + child_sys_micros;
+        int64_t net_usr_micros = fish_usr_micros + child_usr_micros;
+        int64_t net_wall_micros = micros(wall[1]) - micros(wall[0]);
 
         enum class unit {
             minutes,
@@ -109,13 +127,12 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             microseconds,
         };
 
-        auto get_unit = [](uint64_t micros) {
+        auto get_unit = [](int64_t micros) {
             if (micros > 900 * 1E6) {
                 return unit::minutes;
-            }
-            else if (micros > 1 * 1E6) {
+            } else if (micros > 1 * 1E6) {
                 return unit::seconds;
-            } else if (micros > 10E3) {
+            } else if (micros > 1E3) {
                 return unit::milliseconds;
             } else {
                 return unit::microseconds;
@@ -131,7 +148,16 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             }
         };
 
-        auto convert = [](uint64_t micros, unit unit) {
+        auto unit_short_name = [](unit unit) {
+            switch (unit) {
+                case unit::minutes: return "mins";
+                case unit::seconds: return "secs";
+                case unit::milliseconds: return "millis";
+                case unit::microseconds: return "micros";
+            }
+        };
+
+        auto convert = [](int64_t micros, unit unit) {
             switch (unit) {
                 case unit::minutes: return micros / 1.0E6 / 60.0;
                 case unit::seconds: return micros / 1.0E6;
@@ -146,16 +172,43 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         auto usr_time = convert(net_usr_micros, cpu_unit);
         auto sys_time = convert(net_sys_micros, cpu_unit);
 
-        streams.out.append_format(
-            L"\n__________________________________"              \
-            L"\nExecuted in    %6.2F %s"               \
-            L"\n   usr time    %6.2F %s"                        \
-            L"\n   sys time    %6.2F %s"                        \
-            L"\n\n",
-            wall_time, unit_name(wall_unit),
-            usr_time, unit_name(cpu_unit),
-            sys_time, unit_name(cpu_unit)
-        );
+        if (!verbose) {
+            streams.err.append_format(
+                L"\n_______________________________"    \
+                L"\nExecuted in  %6.2F %s"              \
+                L"\n   usr time  %6.2F %s"              \
+                L"\n   sys time  %6.2F %s"              \
+                L"\n\n",
+                wall_time, unit_name(wall_unit),
+                usr_time, unit_name(cpu_unit),
+                sys_time, unit_name(cpu_unit)
+            );
+        } else {
+            auto fish_unit = get_unit((fish_sys_micros + fish_usr_micros) / 2);
+            auto child_unit = get_unit((child_sys_micros + child_usr_micros) / 2);
+            auto fish_usr_time = convert(fish_usr_micros, fish_unit);
+            auto fish_sys_time = convert(fish_sys_micros, fish_unit);
+            auto child_usr_time = convert(child_usr_micros, child_unit);
+            auto child_sys_time = convert(child_sys_micros, child_unit);
+
+            streams.err.append_format(
+                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\n",
+                wall_time, unit_short_name(wall_unit),
+                strlen(unit_short_name(wall_unit)) - 1, "fish",
+                strlen(unit_short_name(fish_unit)) - 1, "external",
+                usr_time, unit_short_name(cpu_unit),
+                fish_usr_time, unit_short_name(fish_unit),
+                child_usr_time, unit_short_name(child_unit),
+                sys_time, unit_short_name(cpu_unit),
+                fish_sys_time, unit_short_name(fish_unit),
+                child_sys_time, unit_short_name(child_unit)
+            );
+
+        }
 
     }
 

From 704a90deec9b26f7e5074b4f1953f6fc8127c7f6 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 20:48:02 -0600
Subject: [PATCH 1420/1732] Rename time `unit` enum to please gcc

---
 src/builtin_time.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
index 09215fc4f..2eb56ae3f 100644
--- a/src/builtin_time.cpp
+++ b/src/builtin_time.cpp
@@ -120,7 +120,7 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         int64_t net_usr_micros = fish_usr_micros + child_usr_micros;
         int64_t net_wall_micros = micros(wall[1]) - micros(wall[0]);
 
-        enum class unit {
+        enum class tunit {
             minutes,
             seconds,
             milliseconds,
@@ -129,40 +129,40 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         auto get_unit = [](int64_t micros) {
             if (micros > 900 * 1E6) {
-                return unit::minutes;
+                return tunit::minutes;
             } else if (micros > 1 * 1E6) {
-                return unit::seconds;
+                return tunit::seconds;
             } else if (micros > 1E3) {
-                return unit::milliseconds;
+                return tunit::milliseconds;
             } else {
-                return unit::microseconds;
+                return tunit::microseconds;
             }
         };
 
-        auto unit_name = [](unit unit) {
+        auto unit_name = [](tunit unit) {
             switch (unit) {
-                case unit::minutes: return "minutes";
-                case unit::seconds: return "seconds";
-                case unit::milliseconds: return "milliseconds";
-                case unit::microseconds: return "microseconds";
+                case tunit::minutes: return "minutes";
+                case tunit::seconds: return "seconds";
+                case tunit::milliseconds: return "milliseconds";
+                case tunit::microseconds: return "microseconds";
             }
         };
 
-        auto unit_short_name = [](unit unit) {
+        auto unit_short_name = [](tunit unit) {
             switch (unit) {
-                case unit::minutes: return "mins";
-                case unit::seconds: return "secs";
-                case unit::milliseconds: return "millis";
-                case unit::microseconds: return "micros";
+                case tunit::minutes: return "mins";
+                case tunit::seconds: return "secs";
+                case tunit::milliseconds: return "millis";
+                case tunit::microseconds: return "micros";
             }
         };
 
-        auto convert = [](int64_t micros, unit unit) {
+        auto convert = [](int64_t micros, tunit unit) {
             switch (unit) {
-                case unit::minutes: return micros / 1.0E6 / 60.0;
-                case unit::seconds: return micros / 1.0E6;
-                case unit::milliseconds: return micros / 1.0E3;
-                case unit::microseconds: return micros / 1.0;
+                case tunit::minutes: return micros / 1.0E6 / 60.0;
+                case tunit::seconds: return micros / 1.0E6;
+                case tunit::milliseconds: return micros / 1.0E3;
+                case tunit::microseconds: return micros / 1.0;
             }
         };
 

From 103726767c001476b413949ce65ba9aa364ab8ad Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 20:53:38 -0600
Subject: [PATCH 1421/1732] [time] Convince GCC control flow does not reach end
 of function

---
 src/builtin_time.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
index 2eb56ae3f..0f161be57 100644
--- a/src/builtin_time.cpp
+++ b/src/builtin_time.cpp
@@ -146,6 +146,8 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 case tunit::milliseconds: return "milliseconds";
                 case tunit::microseconds: return "microseconds";
             }
+            // GCC does not recognize the exhaustive switch above
+            return "";
         };
 
         auto unit_short_name = [](tunit unit) {
@@ -155,6 +157,8 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 case tunit::milliseconds: return "millis";
                 case tunit::microseconds: return "micros";
             }
+            // GCC does not recognize the exhaustive switch above
+            return "";
         };
 
         auto convert = [](int64_t micros, tunit unit) {
@@ -164,6 +168,8 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 case tunit::milliseconds: return micros / 1.0E3;
                 case tunit::microseconds: return micros / 1.0;
             }
+            // GCC does not recognize the exhaustive switch above
+            return 0.0;
         };
 
         auto wall_unit = get_unit(net_wall_micros);

From 99363625990740c61edc735d232ce8d368c2e6a7 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 13 Dec 2019 21:50:06 -0800
Subject: [PATCH 1422/1732] common.cpp: Don't always include cxxabi.h

cxxabi.h is not available with LLVM's libcxx
---
 src/common.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common.cpp b/src/common.cpp
index cfa4cb0d8..96873f17a 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1,8 +1,11 @@
 // Various functions, mostly string utilities, that are used by most parts of fish.
 #include "config.h"
 
-#include <ctype.h>
+#ifdef HAVE_BACKTRACE_SYMBOLS
 #include <cxxabi.h>
+#endif
+
+#include <ctype.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>

From aeaf2f93e2fcc5cc0d91e9802d51317c438e3baf Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 21:26:51 -0600
Subject: [PATCH 1423/1732] Revert "Remove Makefile(s)"

This reverts commit 326f5586deb33cc8d711d51b36a400c85d44185e.

See discussion in #6264.
---
 BSDmakefile | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile    | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 BSDmakefile
 create mode 100644 Makefile

diff --git a/BSDmakefile b/BSDmakefile
new file mode 100644
index 000000000..85f5ee162
--- /dev/null
+++ b/BSDmakefile
@@ -0,0 +1,53 @@
+# This is a very basic `make` wrapper around the CMake build toolchain.
+#
+# Supported arguments:
+#   PREFIX: sets the installation prefix
+#   GENERATOR: explicitly specifies the CMake generator to use
+
+# By default, bmake will try to cd into ./obj before anything else. Don't do that.
+.OBJDIR: ./
+
+CMAKE?=cmake
+
+# Before anything else, test for CMake, which is the only requirement to be able to run
+# this Makefile CMake will perform the remaining dependency tests on its own.
+.BEGIN:
+	@which $(CMAKE) >/dev/null 2>/dev/null || \
+		(echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
+
+# Prefer to use ninja, if it is installed
+_GENERATOR!=which ninja 2>/dev/null >/dev/null && echo Ninja || echo "Unix Makefiles"
+GENERATOR?=$(_GENERATOR)
+
+.if $(GENERATOR) == "Ninja"
+BUILDFILE=build/build.ninja
+.else
+BUILDFILE=build/Makefile
+.endif
+
+PREFIX?=/usr/local
+
+build/fish: build/$(BUILDFILE)
+	$(CMAKE) --build build
+
+build:
+	mkdir -p build
+
+build/$(BUILDFILE): build
+	cd build; $(CMAKE) .. -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+
+.PHONY: install
+install: build/fish
+	$(CMAKE) --build build --target install
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+.PHONY: test
+test: build/fish
+	$(CMAKE) --build build --target test
+
+.PHONY: run
+run: build/fish
+	build/fish
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..dedfec76c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,54 @@
+# This is a very basic `make` wrapper around the CMake build toolchain.
+#
+# Supported arguments:
+#   PREFIX: sets the installation prefix
+#   GENERATOR: explicitly specifies the CMake generator to use
+
+CMAKE ?= cmake
+
+GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
+			 echo 'Unix Makefiles')
+prefix ?= /usr/local
+PREFIX ?= $(prefix)
+
+ifeq ($(GENERATOR), Ninja)
+BUILDFILE = build.ninja
+else
+BUILDFILE = Makefile
+endif
+
+all: .begin build/fish
+
+PHONY: .begin
+.begin:
+	@which $(CMAKE) > /dev/null 2> /dev/null || \
+		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
+
+build/fish: build/$(BUILDFILE)
+	$(CMAKE) --build build
+
+build/$(BUILDFILE): build
+	cd build; $(CMAKE) .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+
+build:
+	mkdir -p build
+
+.PHONY: clean
+clean:
+	rm -rf build
+
+.PHONY: test
+test: build/fish
+	$(CMAKE) --build build --target test
+
+.PHONY: install
+install: build/fish
+	$(CMAKE) --build build --target install
+
+.PHONY: run
+run: build/fish
+	./build/fish || true
+
+.PHONY: exec
+exec: build/fish
+	exec ./build/fish

From abc2468c70c2026c59dde19380e3a0bca8a2bccf Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 21:28:56 -0600
Subject: [PATCH 1424/1732] Add alternate patch to support in-tree CMake
 Makefile builds

This patch keeps the existing `make` shims via `GNUmakefile` and
`BSDmakefile` but also resolves the issue reported in #6264 with
CMake-generated `Makefile` overwriting the extant `Makefile` causing the
source directory to become dirty once again.

Closes #6264
---
 Makefile => GNUmakefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
 rename Makefile => GNUmakefile (72%)

diff --git a/Makefile b/GNUmakefile
similarity index 72%
rename from Makefile
rename to GNUmakefile
index dedfec76c..246b2940e 100644
--- a/Makefile
+++ b/GNUmakefile
@@ -17,6 +17,16 @@ else
 BUILDFILE = Makefile
 endif
 
+
+# If CMake has generated an in-tree Makefile, use that instead (issue #6264)
+MAKE_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+ifeq ($(shell test -f $(MAKE_DIR)/Makefile && echo 1), 1)
+
+all:
+	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
+
+else
+
 all: .begin build/fish
 
 PHONY: .begin
@@ -28,7 +38,8 @@ build/fish: build/$(BUILDFILE)
 	$(CMAKE) --build build
 
 build/$(BUILDFILE): build
-	cd build; $(CMAKE) .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
+	cd build; $(CMAKE) .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G "$(GENERATOR)" \
+		-DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
 
 build:
 	mkdir -p build
@@ -52,3 +63,5 @@ run: build/fish
 .PHONY: exec
 exec: build/fish
 	exec ./build/fish
+
+endif # CMake in-tree build check

From 2a14199421769b63518e74c3f6eb830d4b1a551d Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 22:11:02 -0600
Subject: [PATCH 1425/1732] Replace pseudo `all` target with catch-all `%`

This should fix the CI broken in-tree builds.
---
 GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 246b2940e..b67dd736c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,7 +22,7 @@ endif
 MAKE_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 ifeq ($(shell test -f $(MAKE_DIR)/Makefile && echo 1), 1)
 
-all:
+%:
 	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
 
 else

From ec11bd4af78d22187eb3f027fed9b79a6d11678f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Wed, 18 Dec 2019 22:13:41 -0600
Subject: [PATCH 1426/1732] [make] add default `all` in addition to catch-all
 `%`

---
 GNUmakefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/GNUmakefile b/GNUmakefile
index b67dd736c..3d0d61d65 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,6 +22,8 @@ endif
 MAKE_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 ifeq ($(shell test -f $(MAKE_DIR)/Makefile && echo 1), 1)
 
+all:
+	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
 %:
 	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
 

From 22b2dbd97d1a042ed5fb8af9f771399a5ec21bf8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 19 Dec 2019 20:59:17 +0100
Subject: [PATCH 1427/1732] functions/history: X is incompatible with SDMV, not
 C

"-C" is short for "--case-sensitive", which is entirely okay with "--delete".

The one that isn't okay is "-X", which is short for "--Clear".

Seen on gitter.im
---
 share/functions/history.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index 355d45147..3573a01c7 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -16,7 +16,7 @@ end
 
 function history --description "display or manipulate interactive command history"
     set -l cmd history
-    set -l options --exclusive 'c,e,p' --exclusive 'S,D,M,V,C'
+    set -l options --exclusive 'c,e,p' --exclusive 'S,D,M,V,X'
     set -a options 'h/help' 'c/contains' 'e/exact' 'p/prefix'
     set -a options 'C/case-sensitive' 'R/reverse' 'z/null' 't/show-time=?' 'n#max'
     # The following options are deprecated and will be removed in the next major release.

From 0531c02ce4e047866a72118b12f5f3c49f81d834 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 19 Dec 2019 14:14:23 -0800
Subject: [PATCH 1428/1732] Remove 'user_supplied' flag for io_fd_t

user_supplied was used to distinguish IO redirections which were
explicit, vs those that came about through "transmogrphication." But
transmogrification is no more. Remove the flag.
---
 src/builtin.cpp    |  2 +-
 src/exec.cpp       |  8 +++-----
 src/fish_tests.cpp | 10 +++++-----
 src/io.cpp         |  3 +--
 src/io.h           |  8 +-------
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 74a327d5f..fee008cd2 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -164,7 +164,7 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *
     if (error_message) {
         cmd.append(escape_string(*error_message, ESCAPE_ALL));
         // If it's an error, redirect the output of __fish_print_help to stderr
-        ios.push_back(std::make_shared<io_fd_t>(STDOUT_FILENO, STDERR_FILENO, false));
+        ios.push_back(std::make_shared<io_fd_t>(STDOUT_FILENO, STDERR_FILENO));
     }
     parser.eval(cmd, ios, TOP);
     // ignore the exit status of __fish_print_help
diff --git a/src/exec.cpp b/src/exec.cpp
index 011fcf240..a7a0f214c 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -403,14 +403,12 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
         switch (in->io_mode) {
             case io_mode_t::fd: {
                 const io_fd_t *in_fd = static_cast<const io_fd_t *>(in.get());
-                // Ignore user-supplied fd redirections from an fd other than the
+                // Ignore fd redirections from an fd other than the
                 // standard ones. e.g. in source <&3 don't actually read from fd 3,
                 // which is internal to fish. We still respect this redirection in
                 // that we pass it on as a block IO to the code that source runs,
-                // and therefore this is not an error. Non-user supplied fd
-                // redirections come about through transmogrification, and we need
-                // to respect those here.
-                if (!in_fd->user_supplied || (in_fd->old_fd >= 0 && in_fd->old_fd < 3)) {
+                // and therefore this is not an error.
+                if (in_fd->old_fd >= 0 && in_fd->old_fd < 3) {
                     local_builtin_stdin = in_fd->old_fd;
                 }
                 break;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index b78898bfc..55cf42eae 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2460,7 +2460,7 @@ static void test_dup2s() {
     using std::make_shared;
     io_chain_t chain;
     chain.push_back(make_shared<io_close_t>(17));
-    chain.push_back(make_shared<io_fd_t>(3, 19, true));
+    chain.push_back(make_shared<io_fd_t>(3, 19));
     auto list = dup2_list_t::resolve_chain(chain);
     do_test(list.has_value());
     do_test(list->get_actions().size() == 2);
@@ -2479,10 +2479,10 @@ static void test_dup2s_fd_for_target_fd() {
     io_chain_t chain;
     // note io_fd_t params are backwards from dup2.
     chain.push_back(make_shared<io_close_t>(10));
-    chain.push_back(make_shared<io_fd_t>(9, 10, true));
-    chain.push_back(make_shared<io_fd_t>(5, 8, true));
-    chain.push_back(make_shared<io_fd_t>(1, 4, true));
-    chain.push_back(make_shared<io_fd_t>(3, 5, true));
+    chain.push_back(make_shared<io_fd_t>(9, 10));
+    chain.push_back(make_shared<io_fd_t>(5, 8));
+    chain.push_back(make_shared<io_fd_t>(1, 4));
+    chain.push_back(make_shared<io_fd_t>(3, 5));
     auto list = dup2_list_t::resolve_chain(chain);
 
     do_test(list.has_value());
diff --git a/src/io.cpp b/src/io.cpp
index ca8648d7c..83240c19a 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -248,8 +248,7 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
                     auto target_fd = spec.get_target_as_fd();
                     assert(target_fd.has_value() &&
                            "fd redirection should have been validated already");
-                    this->push_back(
-                        make_unique<io_fd_t>(spec.fd, *target_fd, true /* user supplied */));
+                    this->push_back(make_unique<io_fd_t>(spec.fd, *target_fd));
                 }
                 break;
             }
diff --git a/src/io.h b/src/io.h
index 6f569f08d..42a7edd21 100644
--- a/src/io.h
+++ b/src/io.h
@@ -200,17 +200,11 @@ class io_fd_t : public io_data_t {
     /// fd to redirect specified fd to. For example, in 2>&1, old_fd is 1, and io_data_t::fd is 2.
     const int old_fd;
 
-    /// Whether this redirection was supplied by a script. For example, 'cmd <&3' would have
-    /// user_supplied set to true. But a redirection that comes about through transmogrification
-    /// would not.
-    const bool user_supplied;
-
     void print() const override;
 
     ~io_fd_t() override;
 
-    io_fd_t(int f, int old, bool us)
-        : io_data_t(io_mode_t::fd, f), old_fd(old), user_supplied(us) {}
+    io_fd_t(int f, int old) : io_data_t(io_mode_t::fd, f), old_fd(old) {}
 };
 
 /// Represents a redirection to or from an opened file.

From 1410f938aad04216d824aec747bc7919849d7005 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 19 Dec 2019 19:32:18 +0100
Subject: [PATCH 1429/1732] read: discard IFS delimiters before the last token

Do this only when splitting on IFS characters which usually contains
whitespace characters --- read --delimiter is unchanged; it still
consumes no more than one delimiter per variable. This seems better,
because it allows arbitrary delimiters in the last field.

Fixes #6406
---
 src/builtin_read.cpp   | 8 ++++++++
 tests/checks/read.fish | 8 ++++++++
 tests/read.out         | 4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 173462918..052678143 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -608,6 +608,14 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                     wcstring substr;
                     loc = wcstring_tok(buff, (vars_left() > 1) ? opts.delimiter : wcstring(), loc);
                     if (loc.first != wcstring::npos) {
+                        if (vars_left() == 1) {  // Discard trailing delimiters, see #6406
+                            loc.first =
+                                std::find_if(buff.begin() + loc.first, buff.end(),
+                                             [&opts](wchar_t c) {
+                                                 return opts.delimiter.find(c) == wcstring::npos;
+                                             }) -
+                                buff.begin();
+                        }
                         substr = wcstring(buff, loc.first, loc.second);
                     }
                     vars.set_one(*var_ptr++, opts.place, substr);
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index fee0bb3c6..210f6022c 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -12,3 +12,11 @@ set -l
 # CHECK: a 'afoo barb'
 # CHECK: b
 # CHECK: c
+
+echo "a  b b" | read a b; string escape $a $b
+# CHECK: a
+# CHECK: 'b b'
+
+echo 'a<><>b<>b' | read -d '<>' a b; printf %s\n $a $b
+# CHECK: a
+# CHECK: <>b<>b
diff --git a/tests/read.out b/tests/read.out
index f29e2e1b9..177985ea2 100644
--- a/tests/read.out
+++ b/tests/read.out
@@ -27,7 +27,7 @@ two
 1 ''
 1 '' 1 ''
 1 'test' 1 '' 1 ''
-1 'foo' 1 'bar' 1 '  baz'
+1 'foo' 1 'bar' 1 'baz'
 0 a
 
 ####################
@@ -129,6 +129,6 @@ c
 Multi-char delimiters with IFS
 a
 b
-..c
+c
 
 banana sausage

From feb87bbda82c79d93a96b4c741afc07b080a1101 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 19 Dec 2019 23:41:26 +0100
Subject: [PATCH 1430/1732] __fish_man_page: ignore prefixing variable
 assignments

---
 share/functions/__fish_man_page.fish     | 4 ++--
 share/functions/__fish_prepend_sudo.fish | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_man_page.fish b/share/functions/__fish_man_page.fish
index 38979eeee..192b92077 100644
--- a/share/functions/__fish_man_page.fish
+++ b/share/functions/__fish_man_page.fish
@@ -10,8 +10,8 @@ function __fish_man_page
 
     #Skip `sudo` and display then manpage of following command
     while set -q args[2]
-        and test $args[1] = "sudo"
-        set args $args[2..-1]
+        and string match -qr -- '^(sudo|.*=.*)$' $args[1]
+        set -e args[1]
     end
 
     # If there are at least two tokens not starting with "-", the second one might be a subcommand.
diff --git a/share/functions/__fish_prepend_sudo.fish b/share/functions/__fish_prepend_sudo.fish
index a696d8ac3..aaca6c37a 100644
--- a/share/functions/__fish_prepend_sudo.fish
+++ b/share/functions/__fish_prepend_sudo.fish
@@ -1,5 +1,5 @@
 function __fish_prepend_sudo -d "Prepend 'sudo ' to the beginning of the current commandline"
-    set -l cmd (commandline -boc)
+    set -l cmd (commandline -poc)
     if test "$cmd[1]" != "sudo"
         commandline -C 0
         commandline -i "sudo "

From ca18d8813800c4f6458704918c164b97b87e8c61 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 19 Dec 2019 21:19:02 -0600
Subject: [PATCH 1431/1732] Switch to C++11 chrono's `steady_clock` for
 portability reasons

`clock_gettime()` is apparently not readily available on many fairly
recent *nix systems.

Closes #6440
---
 src/builtin_time.cpp | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
index 0f161be57..383bdbeeb 100644
--- a/src/builtin_time.cpp
+++ b/src/builtin_time.cpp
@@ -39,11 +39,27 @@
 // deprecated in favor of getrusage(2), which offers a wider variety of metrics coalesced for SELF,
 // THREAD, or CHILDREN.
 
-static uint64_t micros(struct timeval t) {
-    return (static_cast<uint64_t>(t.tv_usec) + static_cast<uint64_t>(t.tv_sec * 1E6));
+// With regards to the C++11 `<chrono>` interface, there are three different time sources (clocks)
+// that we can use portably: `system_clock`, `steady_clock`, and `high_resolution_clock`; with
+// different properties and guarantees. While the obvious difference is the direct tradeoff between
+// period and resolution (higher resolution equals ability to measure smaller time differences more
+// accurately, but at the cost of rolling over more frequently), but unfortunately it is not as
+// simple as starting two clocks and going with the highest resolution that hasn't rolled over.
+// `system_clock` is out because it is always subject to interference due to adjustments from NTP
+// servers or super users (as it reflects the "actual" time), but `high_resolution_clock` may or may
+// not be aliased to `system_clock` or `steady_clock`. In practice, there's likely no need to worry
+// about this too much, a survey <http://howardhinnant.github.io/clock_survey.html> of the different
+// libraries indicates that `high_resolution_clock` is either an alias for `steady_clock` (in which
+// case it offers no greater resolution) or it is an alias for `system_clock` (in which case, even
+// when it offers a greater resolution than `steady_clock` it is not fit for use).
+
+static int64_t micros(struct timeval t) {
+    return (static_cast<int64_t>(t.tv_usec) + static_cast<int64_t>(t.tv_sec * 1E6));
 };
-static uint64_t micros(struct timespec t) {
-    return (static_cast<uint64_t>(t.tv_nsec) / 1E3 + static_cast<uint64_t>(t.tv_sec * 1E6));
+
+template <typename D1, typename D2>
+static int64_t micros(const std::chrono::duration<D1, D2> &d) {
+    return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
 };
 
 // Linux makes available CLOCK_MONOTONIC_RAW, which is monotonic even in the presence of NTP
@@ -83,12 +99,11 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     if (argc > 1) {
         struct rusage fish_usage[2];
         struct rusage child_usage [2];
-        struct timespec wall[2] {};
 
         // Start counters
         getrusage(RUSAGE_SELF, &fish_usage[0]);
         getrusage(RUSAGE_CHILDREN, &child_usage[0]);
-        clock_gettime(CLOCK_SRC, &wall[0]);
+        auto wall_start = std::chrono::steady_clock::now();
 
         if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
             eval_result_t::ok) {
@@ -100,7 +115,7 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         // Stop counters
         getrusage(RUSAGE_SELF, &fish_usage[1]);
         getrusage(RUSAGE_CHILDREN, &child_usage[1]);
-        clock_gettime(CLOCK_SRC, &wall[1]);
+        auto wall_end = std::chrono::steady_clock::now();
 
         int64_t fish_sys_micros = micros(fish_usage[1].ru_stime) - micros(fish_usage[0].ru_stime);
         int64_t fish_usr_micros = micros(fish_usage[1].ru_utime) - micros(fish_usage[0].ru_utime);
@@ -118,7 +133,7 @@ int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
         int64_t net_sys_micros = fish_sys_micros + child_sys_micros;
         int64_t net_usr_micros = fish_usr_micros + child_usr_micros;
-        int64_t net_wall_micros = micros(wall[1]) - micros(wall[0]);
+        int64_t net_wall_micros = micros(wall_end - wall_start);
 
         enum class tunit {
             minutes,

From 664d6fb13298976f35ae9278ebb7a08e9beb6feb Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Thu, 19 Dec 2019 22:41:53 -0600
Subject: [PATCH 1432/1732] Convert `time` to a job decorator

---
 CMakeLists.txt            |   2 +-
 src/builtin.cpp           |   2 -
 src/builtin_time.cpp      | 237 --------------------------------------
 src/builtin_time.h        |   9 --
 src/parse_constants.h     |  11 +-
 src/parse_execution.cpp   |  27 ++++-
 src/parse_execution.h     |   2 +-
 src/parse_grammar.h       |   1 +
 src/parse_productions.cpp |  16 ++-
 src/parse_util.cpp        |   6 +-
 src/timer.cpp             | 192 ++++++++++++++++++++++++++++++
 src/timer.h               |  28 +++++
 src/tnode.cpp             |  10 +-
 src/tnode.h               |   6 +-
 14 files changed, 275 insertions(+), 274 deletions(-)
 delete mode 100644 src/builtin_time.cpp
 delete mode 100644 src/builtin_time.h
 create mode 100644 src/timer.cpp
 create mode 100644 src/timer.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7ecadf8c..32cf3ac17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ SET(FISH_SRCS
     src/signal.cpp src/tinyexpr.cpp src/tnode.cpp src/tokenizer.cpp src/utf8.cpp src/util.cpp
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
-    src/flog.cpp src/trace.cpp src/builtin_time.cpp
+    src/flog.cpp src/trace.cpp src/timer.cpp
 )
 
 # Header files are just globbed.
diff --git a/src/builtin.cpp b/src/builtin.cpp
index fee008cd2..0a09fca33 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -61,7 +61,6 @@
 #include "builtin_status.h"
 #include "builtin_string.h"
 #include "builtin_test.h"
-#include "builtin_time.h"
 #include "builtin_ulimit.h"
 #include "builtin_wait.h"
 #include "common.h"
@@ -388,7 +387,6 @@ static const builtin_data_t builtin_datas[] = {
     {L"string", &builtin_string, N_(L"Manipulate strings")},
     {L"switch", &builtin_generic, N_(L"Conditionally execute a block of commands")},
     {L"test", &builtin_test, N_(L"Test a condition")},
-    {L"time", &builtin_time, N_(L"Time the execution of a job")},
     {L"true", &builtin_true, N_(L"Return a successful result")},
     {L"ulimit", &builtin_ulimit, N_(L"Set or get the shells resource usage limits")},
     {L"wait", &builtin_wait, N_(L"Wait for background processes completed")},
diff --git a/src/builtin_time.cpp b/src/builtin_time.cpp
deleted file mode 100644
index 383bdbeeb..000000000
--- a/src/builtin_time.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-// Functions for executing the time builtin.
-#include "config.h"  // IWYU pragma: keep
-
-#include <cerrno>
-#include <ctime>
-#include <chrono>
-#include <cstddef>
-
-#include "builtin.h"
-#include "common.h"
-#include "exec.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "parser.h"
-#include "proc.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
-
-#include <algorithm>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-// Measuring time is always complicated with many caveats. Quite apart from the typical
-// gotchas faced by developers attempting to choose between monotonic vs non-monotonic and system vs
-// cpu clocks, the fact that we are executing as a shell further complicates matters: we can't just
-// observe the elapsed CPU time, because that does not reflect the total execution time for both
-// ourselves (internal shell execution time and the time it takes for builtins and functions to
-// execute) and any external processes we spawn.
-
-// It would be nice to use the C++1 type-safe <chrono> interfaces to measure elapsed time, but that
-// unfortunately is underspecified with regards to user/system time and only provides means of
-// querying guaranteed monotonicity and resolution for the various clocks. It can be used to measure
-// elapsed wall time nicely, but if we would like to provide information more useful for
-// benchmarking and tuning then we must turn to either clock_gettime(2), with extensions for thread-
-// and process-specific elapsed CPU time, or times(3) for a standard interface to overall process
-// and child user/system time elapsed between snapshots. At least on some systems, times(3) has been
-// deprecated in favor of getrusage(2), which offers a wider variety of metrics coalesced for SELF,
-// THREAD, or CHILDREN.
-
-// With regards to the C++11 `<chrono>` interface, there are three different time sources (clocks)
-// that we can use portably: `system_clock`, `steady_clock`, and `high_resolution_clock`; with
-// different properties and guarantees. While the obvious difference is the direct tradeoff between
-// period and resolution (higher resolution equals ability to measure smaller time differences more
-// accurately, but at the cost of rolling over more frequently), but unfortunately it is not as
-// simple as starting two clocks and going with the highest resolution that hasn't rolled over.
-// `system_clock` is out because it is always subject to interference due to adjustments from NTP
-// servers or super users (as it reflects the "actual" time), but `high_resolution_clock` may or may
-// not be aliased to `system_clock` or `steady_clock`. In practice, there's likely no need to worry
-// about this too much, a survey <http://howardhinnant.github.io/clock_survey.html> of the different
-// libraries indicates that `high_resolution_clock` is either an alias for `steady_clock` (in which
-// case it offers no greater resolution) or it is an alias for `system_clock` (in which case, even
-// when it offers a greater resolution than `steady_clock` it is not fit for use).
-
-static int64_t micros(struct timeval t) {
-    return (static_cast<int64_t>(t.tv_usec) + static_cast<int64_t>(t.tv_sec * 1E6));
-};
-
-template <typename D1, typename D2>
-static int64_t micros(const std::chrono::duration<D1, D2> &d) {
-    return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
-};
-
-// Linux makes available CLOCK_MONOTONIC_RAW, which is monotonic even in the presence of NTP
-// adjustments.
-#ifdef CLOCK_MONOTONIC_RAW
-    #define CLOCK_SRC CLOCK_MONOTONIC_RAW
-#else
-    #define CLOCK_SRC CLOCK_MONOTONIC
-#endif
-
-/// Implementation of time builtin.
-int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
-    int argc = builtin_count_args(argv);
-
-    bool verbose = false;
-    // In the future, we can consider accepting more command-line arguments to dictate the behavior
-    // of the `time` builtin and what it measures or reports.
-    if (argc > 1 && (argv[1] == wcstring(L"-h") || argv[1] == wcstring(L"--help"))) {
-        streams.out.append(L"time <command or expression>\n");
-        streams.out.append(L"Measures the elapsed wall, system, and user clocks in the execution of"
-                L" the given command or expression");
-        return 0;
-    }
-    if (argc > 1 && (argv[1] == wcstring(L"-v") || argv[1] == wcstring(L"--verbose"))) {
-        verbose = true;
-        argc -= 1;
-        argv += 1;
-    }
-
-    wcstring new_cmd;
-    for (int i = 1; i < argc; ++i) {
-        if (i > 1) new_cmd += L' ';
-        new_cmd += argv[i];
-    }
-
-    int status = STATUS_CMD_OK;
-    if (argc > 1) {
-        struct rusage fish_usage[2];
-        struct rusage child_usage [2];
-
-        // Start counters
-        getrusage(RUSAGE_SELF, &fish_usage[0]);
-        getrusage(RUSAGE_CHILDREN, &child_usage[0]);
-        auto wall_start = std::chrono::steady_clock::now();
-
-        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
-            eval_result_t::ok) {
-            status = STATUS_CMD_ERROR;
-        } else {
-            status = parser.get_last_status();
-        }
-
-        // Stop counters
-        getrusage(RUSAGE_SELF, &fish_usage[1]);
-        getrusage(RUSAGE_CHILDREN, &child_usage[1]);
-        auto wall_end = std::chrono::steady_clock::now();
-
-        int64_t fish_sys_micros = micros(fish_usage[1].ru_stime) - micros(fish_usage[0].ru_stime);
-        int64_t fish_usr_micros = micros(fish_usage[1].ru_utime) - micros(fish_usage[0].ru_utime);
-        int64_t child_sys_micros = micros(child_usage[1].ru_stime) - micros(child_usage[0].ru_stime);
-        int64_t child_usr_micros = micros(child_usage[1].ru_utime) - micros(child_usage[0].ru_utime);
-
-        // The result from getrusage is not necessarily realtime, it may be cached a few
-        // microseconds behind. In the event that execution completes extremely quickly or there is
-        // no data (say, we are measuring external execution time but no external processes have
-        // been launched), it can incorrectly appear to be negative.
-        fish_sys_micros = std::max(int64_t(0), fish_sys_micros);
-        fish_usr_micros = std::max(int64_t(0), fish_usr_micros);
-        child_sys_micros = std::max(int64_t(0), child_sys_micros);
-        child_usr_micros = std::max(int64_t(0), child_usr_micros);
-
-        int64_t net_sys_micros = fish_sys_micros + child_sys_micros;
-        int64_t net_usr_micros = fish_usr_micros + child_usr_micros;
-        int64_t net_wall_micros = micros(wall_end - wall_start);
-
-        enum class tunit {
-            minutes,
-            seconds,
-            milliseconds,
-            microseconds,
-        };
-
-        auto get_unit = [](int64_t micros) {
-            if (micros > 900 * 1E6) {
-                return tunit::minutes;
-            } else if (micros > 1 * 1E6) {
-                return tunit::seconds;
-            } else if (micros > 1E3) {
-                return tunit::milliseconds;
-            } else {
-                return tunit::microseconds;
-            }
-        };
-
-        auto unit_name = [](tunit unit) {
-            switch (unit) {
-                case tunit::minutes: return "minutes";
-                case tunit::seconds: return "seconds";
-                case tunit::milliseconds: return "milliseconds";
-                case tunit::microseconds: return "microseconds";
-            }
-            // GCC does not recognize the exhaustive switch above
-            return "";
-        };
-
-        auto unit_short_name = [](tunit unit) {
-            switch (unit) {
-                case tunit::minutes: return "mins";
-                case tunit::seconds: return "secs";
-                case tunit::milliseconds: return "millis";
-                case tunit::microseconds: return "micros";
-            }
-            // GCC does not recognize the exhaustive switch above
-            return "";
-        };
-
-        auto convert = [](int64_t micros, tunit unit) {
-            switch (unit) {
-                case tunit::minutes: return micros / 1.0E6 / 60.0;
-                case tunit::seconds: return micros / 1.0E6;
-                case tunit::milliseconds: return micros / 1.0E3;
-                case tunit::microseconds: return micros / 1.0;
-            }
-            // GCC does not recognize the exhaustive switch above
-            return 0.0;
-        };
-
-        auto wall_unit = get_unit(net_wall_micros);
-        auto cpu_unit = get_unit((net_sys_micros + net_usr_micros) / 2);
-        auto wall_time = convert(net_wall_micros, wall_unit);
-        auto usr_time = convert(net_usr_micros, cpu_unit);
-        auto sys_time = convert(net_sys_micros, cpu_unit);
-
-        if (!verbose) {
-            streams.err.append_format(
-                L"\n_______________________________"    \
-                L"\nExecuted in  %6.2F %s"              \
-                L"\n   usr time  %6.2F %s"              \
-                L"\n   sys time  %6.2F %s"              \
-                L"\n\n",
-                wall_time, unit_name(wall_unit),
-                usr_time, unit_name(cpu_unit),
-                sys_time, unit_name(cpu_unit)
-            );
-        } else {
-            auto fish_unit = get_unit((fish_sys_micros + fish_usr_micros) / 2);
-            auto child_unit = get_unit((child_sys_micros + child_usr_micros) / 2);
-            auto fish_usr_time = convert(fish_usr_micros, fish_unit);
-            auto fish_sys_time = convert(fish_sys_micros, fish_unit);
-            auto child_usr_time = convert(child_usr_micros, child_unit);
-            auto child_sys_time = convert(child_sys_micros, child_unit);
-
-            streams.err.append_format(
-                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\n",
-                wall_time, unit_short_name(wall_unit),
-                strlen(unit_short_name(wall_unit)) - 1, "fish",
-                strlen(unit_short_name(fish_unit)) - 1, "external",
-                usr_time, unit_short_name(cpu_unit),
-                fish_usr_time, unit_short_name(fish_unit),
-                child_usr_time, unit_short_name(child_unit),
-                sys_time, unit_short_name(cpu_unit),
-                fish_sys_time, unit_short_name(fish_unit),
-                child_sys_time, unit_short_name(child_unit)
-            );
-
-        }
-
-    }
-
-    return status;
-}
diff --git a/src/builtin_time.h b/src/builtin_time.h
deleted file mode 100644
index 97fd171b9..000000000
--- a/src/builtin_time.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Prototypes for executing builtin_time function.
-#ifndef FISH_BUILTIN_TIME_H
-#define FISH_BUILTIN_TIME_H
-
-class parser_t;
-struct io_streams_t;
-
-int builtin_time(parser_t &parser, io_streams_t &streams, wchar_t **argv);
-#endif
diff --git a/src/parse_constants.h b/src/parse_constants.h
index f2d2a8006..441436a88 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -117,6 +117,7 @@ enum parse_keyword_t : uint8_t {
     parse_keyword_not,
     parse_keyword_or,
     parse_keyword_switch,
+    parse_keyword_time,
     parse_keyword_while,
 };
 
@@ -136,6 +137,7 @@ const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!
                                                       {parse_keyword_not, L"not"},
                                                       {parse_keyword_or, L"or"},
                                                       {parse_keyword_switch, L"switch"},
+                                                      {parse_keyword_time, L"time"},
                                                       {parse_keyword_while, L"while"},
                                                       {parse_keyword_none, nullptr}};
 #define keyword_enum_map_len (sizeof keyword_enum_map / sizeof *keyword_enum_map)
@@ -150,8 +152,13 @@ enum parse_statement_decoration_t {
     parse_statement_decoration_exec,
 };
 
-// Boolean statement types, stored in node tag.
-enum parse_bool_statement_type_t { parse_bool_none, parse_bool_and, parse_bool_or };
+// Job decorations, stored in node tag.
+enum parse_job_decoration_t {
+    parse_job_decoration_none,
+    parse_job_decoration_and,
+    parse_job_decoration_or,
+    parse_job_decoration_time,
+};
 
 // Whether a statement is backgrounded.
 enum parse_optional_background_t { parse_no_background, parse_background };
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 09be1e00a..7403e6d9e 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -43,6 +43,7 @@
 #include "path.h"
 #include "proc.h"
 #include "reader.h"
+#include "timer.h"
 #include "tnode.h"
 #include "tokenizer.h"
 #include "trace.h"
@@ -1354,8 +1355,8 @@ eval_result_t parse_execution_context_t::run_job_conjunction(
         bool skip = false;
         if (continuation) {
             // Check the conjunction type.
-            parse_bool_statement_type_t conj = bool_statement_type(continuation);
-            assert((conj == parse_bool_and || conj == parse_bool_or) && "Unexpected conjunction");
+            parse_job_decoration_t conj = bool_statement_type(continuation);
+            assert((conj == parse_job_decoration_and || conj == parse_job_decoration_or) && "Unexpected conjunction");
             skip = should_skip(conj);
         }
         if (!skip) {
@@ -1367,12 +1368,12 @@ eval_result_t parse_execution_context_t::run_job_conjunction(
     return result;
 }
 
-bool parse_execution_context_t::should_skip(parse_bool_statement_type_t type) const {
+bool parse_execution_context_t::should_skip(parse_job_decoration_t type) const {
     switch (type) {
-        case parse_bool_and:
+        case parse_job_decoration_and:
             // AND. Skip if the last job failed.
             return parser->get_last_status() != 0;
-        case parse_bool_or:
+        case parse_job_decoration_or:
             // OR. Skip if the last job succeeded.
             return parser->get_last_status() == 0;
         default:
@@ -1387,6 +1388,7 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
+    static std::vector<timer_snapshot_t> active_timers;
     eval_result_t result = eval_result_t::ok;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
         if (auto reason = check_end_execution()) {
@@ -1396,11 +1398,26 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
 
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
+        bool timer_started = false;
+        if (get_decorator(job_conj) == parse_job_decoration_time) {
+            active_timers.emplace_back(timer_snapshot_t::take());
+            timer_started = true;
+        }
         if (should_skip(get_decorator(job_conj))) {
             result = eval_result_t::ok;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
+        if (timer_started) {
+            auto t1 = std::move(active_timers.back());
+            active_timers.pop_back();
+            auto t2 = timer_snapshot_t::take();
+
+            // Well, this is awkward. By defining `time` as a decorator and not a built-in, there's
+            // no associated stream for its output!
+            auto output = timer_snapshot_t::print_delta(std::move(t1), std::move(t2), true);
+            std::fwprintf(stderr, L"%S\n", output.c_str());
+        }
     }
 
     // Returns the result of the last job executed or skipped.
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 493d65f4d..b9c7a4d90 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -74,7 +74,7 @@ class parse_execution_context_t {
                                  wcstring_list_t *out_args) const;
 
     /// Return whether we should skip a job with the given bool statement type.
-    bool should_skip(parse_bool_statement_type_t type) const;
+    bool should_skip(parse_job_decoration_t type) const;
 
     /// Indicates whether a job is a simple block (one block, no redirections).
     bool job_is_simple_block(tnode_t<grammar::job> job) const;
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index 1e0a5e5a2..7c3062693 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -210,6 +210,7 @@ DEF_ALT(job_list) {
 DEF_ALT(job_decorator) {
     using ands = single<keyword<parse_keyword_and>>;
     using ors = single<keyword<parse_keyword_or>>;
+    using times = single<keyword<parse_keyword_time>>;
     using empty = grammar::empty;
     ALT_BODY(job_decorator, ands, ors, empty);
 };
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 41acc802b..3f56f7ca6 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -69,21 +69,25 @@ RESOLVE(job_list) {
 RESOLVE(job_decorator) {
     // If it's followed by --help, it's not a decoration.
     if (token2.is_help_argument) {
-        *out_tag = parse_bool_none;
+        *out_tag = parse_job_decoration_none;
         return production_for<empty>();
     }
 
     switch (token1.keyword) {
         case parse_keyword_and: {
-            *out_tag = parse_bool_and;
+            *out_tag = parse_job_decoration_and;
             return production_for<ands>();
         }
         case parse_keyword_or: {
-            *out_tag = parse_bool_or;
+            *out_tag = parse_job_decoration_or;
             return production_for<ors>();
         }
+        case parse_keyword_time: {
+            *out_tag = parse_job_decoration_time;
+            return production_for<times>();
+        }
         default: {
-            *out_tag = parse_bool_none;
+            *out_tag = parse_job_decoration_none;
             return production_for<empty>();
         }
     }
@@ -94,10 +98,10 @@ RESOLVE(job_conjunction_continuation) {
     UNUSED(out_tag);
     switch (token1.type) {
         case parse_token_type_andand:
-            *out_tag = parse_bool_and;
+            *out_tag = parse_job_decoration_and;
             return production_for<andands>();
         case parse_token_type_oror:
-            *out_tag = parse_bool_or;
+            *out_tag = parse_job_decoration_or;
             return production_for<orors>();
         default:
             return production_for<empty>();
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 6463b11ef..1b9ec383d 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1079,11 +1079,11 @@ static bool detect_errors_in_backgrounded_job(tnode_t<grammar::job> job,
         // Try getting the next job's decorator.
         if (auto next_job_dec = jlist.next_in_list<g::job_decorator>()) {
             // The next job is indeed a boolean statement.
-            parse_bool_statement_type_t bool_type = bool_statement_type(next_job_dec);
-            if (bool_type == parse_bool_and) {
+            parse_job_decoration_t bool_type = bool_statement_type(next_job_dec);
+            if (bool_type == parse_job_decoration_and) {
                 errored = append_syntax_error(parse_errors, next_job_dec.source_range()->start,
                                               BOOL_AFTER_BACKGROUND_ERROR_MSG, L"and");
-            } else if (bool_type == parse_bool_or) {
+            } else if (bool_type == parse_job_decoration_or) {
                 errored = append_syntax_error(parse_errors, next_job_dec.source_range()->start,
                                               BOOL_AFTER_BACKGROUND_ERROR_MSG, L"or");
             }
diff --git a/src/timer.cpp b/src/timer.cpp
new file mode 100644
index 000000000..08b7deb02
--- /dev/null
+++ b/src/timer.cpp
@@ -0,0 +1,192 @@
+// Functions for executing the time builtin.
+#include "config.h"  // IWYU pragma: keep
+
+#include <cerrno>
+#include <ctime>
+#include <chrono>
+#include <cstddef>
+
+#include "common.h"
+#include "builtin.h"
+#include "exec.h"
+#include "fallback.h"  // IWYU pragma: keep
+#include "io.h"
+#include "parser.h"
+#include "proc.h"
+#include "timer.h"
+#include "wgetopt.h"
+#include "wutil.h"  // IWYU pragma: keep
+
+#include <algorithm>
+#include <string.h>
+
+// Measuring time is always complicated with many caveats. Quite apart from the typical
+// gotchas faced by developers attempting to choose between monotonic vs non-monotonic and system vs
+// cpu clocks, the fact that we are executing as a shell further complicates matters: we can't just
+// observe the elapsed CPU time, because that does not reflect the total execution time for both
+// ourselves (internal shell execution time and the time it takes for builtins and functions to
+// execute) and any external processes we spawn.
+
+// It would be nice to use the C++1 type-safe <chrono> interfaces to measure elapsed time, but that
+// unfortunately is underspecified with regards to user/system time and only provides means of
+// querying guaranteed monotonicity and resolution for the various clocks. It can be used to measure
+// elapsed wall time nicely, but if we would like to provide information more useful for
+// benchmarking and tuning then we must turn to either clock_gettime(2), with extensions for thread-
+// and process-specific elapsed CPU time, or times(3) for a standard interface to overall process
+// and child user/system time elapsed between snapshots. At least on some systems, times(3) has been
+// deprecated in favor of getrusage(2), which offers a wider variety of metrics coalesced for SELF,
+// THREAD, or CHILDREN.
+
+// With regards to the C++11 `<chrono>` interface, there are three different time sources (clocks)
+// that we can use portably: `system_clock`, `steady_clock`, and `high_resolution_clock`; with
+// different properties and guarantees. While the obvious difference is the direct tradeoff between
+// period and resolution (higher resolution equals ability to measure smaller time differences more
+// accurately, but at the cost of rolling over more frequently), but unfortunately it is not as
+// simple as starting two clocks and going with the highest resolution that hasn't rolled over.
+// `system_clock` is out because it is always subject to interference due to adjustments from NTP
+// servers or super users (as it reflects the "actual" time), but `high_resolution_clock` may or may
+// not be aliased to `system_clock` or `steady_clock`. In practice, there's likely no need to worry
+// about this too much, a survey <http://howardhinnant.github.io/clock_survey.html> of the different
+// libraries indicates that `high_resolution_clock` is either an alias for `steady_clock` (in which
+// case it offers no greater resolution) or it is an alias for `system_clock` (in which case, even
+// when it offers a greater resolution than `steady_clock` it is not fit for use).
+
+static int64_t micros(struct timeval t) {
+    return (static_cast<int64_t>(t.tv_usec) + static_cast<int64_t>(t.tv_sec * 1E6));
+};
+
+template <typename D1, typename D2>
+static int64_t micros(const std::chrono::duration<D1, D2> &d) {
+    return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
+};
+
+
+timer_snapshot_t timer_snapshot_t::take() {
+    timer_snapshot_t snapshot;
+
+    getrusage(RUSAGE_SELF, &snapshot.cpu_fish);
+    getrusage(RUSAGE_CHILDREN, &snapshot.cpu_children);
+    snapshot.wall = std::chrono::steady_clock::now();
+
+    return snapshot;
+}
+
+wcstring
+timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool verbose /* = true */) {
+    int64_t fish_sys_micros = micros(t2.cpu_fish.ru_stime) - micros(t1.cpu_fish.ru_stime);
+    int64_t fish_usr_micros = micros(t2.cpu_fish.ru_utime) - micros(t1.cpu_fish.ru_utime);
+    int64_t child_sys_micros = micros(t2.cpu_children.ru_stime) - micros(t1.cpu_children.ru_stime);
+    int64_t child_usr_micros = micros(t2.cpu_children.ru_utime) - micros(t1.cpu_children.ru_utime);
+
+    // The result from getrusage is not necessarily realtime, it may be cached a few microseconds
+    // behind. In the event that execution completes extremely quickly or there is no data (say, we
+    // are measuring external execution time but no external processes have been launched), it can
+    // incorrectly appear to be negative.
+    fish_sys_micros = std::max(int64_t(0), fish_sys_micros);
+    fish_usr_micros = std::max(int64_t(0), fish_usr_micros);
+    child_sys_micros = std::max(int64_t(0), child_sys_micros);
+    child_usr_micros = std::max(int64_t(0), child_usr_micros);
+
+    int64_t net_sys_micros = fish_sys_micros + child_sys_micros;
+    int64_t net_usr_micros = fish_usr_micros + child_usr_micros;
+    int64_t net_wall_micros = micros(t2.wall - t1.wall);
+
+    enum class tunit {
+        minutes,
+        seconds,
+        milliseconds,
+        microseconds,
+    };
+
+    auto get_unit = [](int64_t micros) {
+        if (micros > 900 * 1E6) {
+            return tunit::minutes;
+        } else if (micros > 1 * 1E6) {
+            return tunit::seconds;
+        } else if (micros > 1E3) {
+            return tunit::milliseconds;
+        } else {
+            return tunit::microseconds;
+        }
+    };
+
+    auto unit_name = [](tunit unit) {
+        switch (unit) {
+            case tunit::minutes: return "minutes";
+            case tunit::seconds: return "seconds";
+            case tunit::milliseconds: return "milliseconds";
+            case tunit::microseconds: return "microseconds";
+        }
+        // GCC does not recognize the exhaustive switch above
+        return "";
+    };
+
+    auto unit_short_name = [](tunit unit) {
+        switch (unit) {
+            case tunit::minutes: return "mins";
+            case tunit::seconds: return "secs";
+            case tunit::milliseconds: return "millis";
+            case tunit::microseconds: return "micros";
+        }
+        // GCC does not recognize the exhaustive switch above
+        return "";
+    };
+
+    auto convert = [](int64_t micros, tunit unit) {
+        switch (unit) {
+            case tunit::minutes: return micros / 1.0E6 / 60.0;
+            case tunit::seconds: return micros / 1.0E6;
+            case tunit::milliseconds: return micros / 1.0E3;
+            case tunit::microseconds: return micros / 1.0;
+        }
+        // GCC does not recognize the exhaustive switch above
+        return 0.0;
+    };
+
+    auto wall_unit = get_unit(net_wall_micros);
+    auto cpu_unit = get_unit((net_sys_micros + net_usr_micros) / 2);
+    auto wall_time = convert(net_wall_micros, wall_unit);
+    auto usr_time = convert(net_usr_micros, cpu_unit);
+    auto sys_time = convert(net_sys_micros, cpu_unit);
+
+    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"              \
+            L"\n",
+            wall_time, unit_name(wall_unit),
+            usr_time, unit_name(cpu_unit),
+            sys_time, unit_name(cpu_unit)
+        );
+    } else {
+        auto fish_unit = get_unit((fish_sys_micros + fish_usr_micros) / 2);
+        auto child_unit = get_unit((child_sys_micros + child_usr_micros) / 2);
+        auto fish_usr_time = convert(fish_usr_micros, fish_unit);
+        auto fish_sys_time = convert(fish_sys_micros, fish_unit);
+        auto child_usr_time = convert(child_usr_micros, child_unit);
+        auto child_sys_time = convert(child_sys_micros, child_unit);
+
+        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"\n",
+            wall_time, unit_short_name(wall_unit),
+            strlen(unit_short_name(wall_unit)) - 1, "fish",
+            strlen(unit_short_name(fish_unit)) - 1, "external",
+            usr_time, unit_short_name(cpu_unit),
+            fish_usr_time, unit_short_name(fish_unit),
+            child_usr_time, unit_short_name(child_unit),
+            sys_time, unit_short_name(cpu_unit),
+            fish_sys_time, unit_short_name(fish_unit),
+            child_sys_time, unit_short_name(child_unit)
+        );
+
+    }
+
+    return output;
+};
diff --git a/src/timer.h b/src/timer.h
new file mode 100644
index 000000000..8ed1a2d7d
--- /dev/null
+++ b/src/timer.h
@@ -0,0 +1,28 @@
+// Prototypes for executing builtin_time function.
+#ifndef FISH_TIMER_H
+#define FISH_TIMER_H
+
+#include <chrono>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include "common.h"
+
+class parser_t;
+struct io_streams_t;
+
+struct timer_snapshot_t {
+public:
+    struct rusage cpu_fish;
+    struct rusage cpu_children;
+    std::chrono::time_point<std::chrono::steady_clock> wall;
+
+    static timer_snapshot_t take();
+    static wcstring print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool verbose = false);
+
+private:
+    timer_snapshot_t() {}
+};
+
+#endif
diff --git a/src/tnode.cpp b/src/tnode.cpp
index e84e88c5c..450098f69 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -46,13 +46,13 @@ enum parse_statement_decoration_t get_decoration(tnode_t<grammar::plain_statemen
     return decoration;
 }
 
-enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decorator> stmt) {
-    return static_cast<parse_bool_statement_type_t>(stmt.tag());
+enum parse_job_decoration_t bool_statement_type(tnode_t<grammar::job_decorator> stmt) {
+    return static_cast<parse_job_decoration_t>(stmt.tag());
 }
 
-enum parse_bool_statement_type_t bool_statement_type(
+enum parse_job_decoration_t bool_statement_type(
     tnode_t<grammar::job_conjunction_continuation> cont) {
-    return static_cast<parse_bool_statement_type_t>(cont.tag());
+    return static_cast<parse_job_decoration_t>(cont.tag());
 }
 
 maybe_t<pipe_or_redir_t> redirection_for_node(tnode_t<grammar::redirection> redirection,
@@ -118,7 +118,7 @@ bool job_node_is_background(tnode_t<grammar::job> job) {
     return bg.tag() == parse_background;
 }
 
-parse_bool_statement_type_t get_decorator(tnode_t<grammar::job_conjunction> conj) {
+parse_job_decoration_t get_decorator(tnode_t<grammar::job_conjunction> conj) {
     using namespace grammar;
     tnode_t<job_decorator> dec;
     // We have two possible parents: job_list and andor_job_list.
diff --git a/src/tnode.h b/src/tnode.h
index 5221bef94..0ec725f41 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -233,9 +233,9 @@ maybe_t<wcstring> command_for_plain_statement(tnode_t<grammar::plain_statement>
 parse_statement_decoration_t get_decoration(tnode_t<grammar::plain_statement> stmt);
 
 /// Return the type for a boolean statement.
-enum parse_bool_statement_type_t bool_statement_type(tnode_t<grammar::job_decorator> stmt);
+parse_job_decoration_t bool_statement_type(tnode_t<grammar::job_decorator> stmt);
 
-enum parse_bool_statement_type_t bool_statement_type(
+parse_job_decoration_t bool_statement_type(
     tnode_t<grammar::job_conjunction_continuation> cont);
 
 /// Given a redirection node, get the parsed redirection and target of the redirection (file path,
@@ -256,7 +256,7 @@ bool job_node_is_background(tnode_t<grammar::job>);
 /// If the conjunction is has a decorator (and/or), return it; otherwise return none. This only
 /// considers the leading conjunction, e.g. in `and true || false` only the 'true' conjunction will
 /// return 'and'.
-parse_bool_statement_type_t get_decorator(tnode_t<grammar::job_conjunction>);
+parse_job_decoration_t get_decorator(tnode_t<grammar::job_conjunction>);
 
 /// Return whether the statement is part of a pipeline.
 /// This doesn't detect e.g. pipelines involving our parent's block statements.

From 3274dbacf49390a3dd428f15b40613c1183958f3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 20 Dec 2019 09:20:50 +0100
Subject: [PATCH 1433/1732] Fix autosuggestions for time

---
 src/complete.cpp        | 12 ++----------
 src/parser_keywords.cpp |  3 ++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index c3d2aae86..2707931fd 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -39,6 +39,7 @@
 #include "history.h"
 #include "iothread.h"
 #include "parse_constants.h"
+#include "parser_keywords.h"
 #include "parse_util.h"
 #include "parser.h"
 #include "path.h"
@@ -1473,17 +1474,8 @@ void completer_t::perform() {
 
     // Hack: fix autosuggestion by removing prefixing "and"s #6249.
     if (flags & completion_request_t::autosuggestion) {
-        constexpr const wchar_t *prefix_cmds[] = {L"and", L"begin", L"command", L"exec",
-                                                  L"if",  L"not",   L"or",      L"while"};
-        while (!tokens.empty()) {
-            auto cmd_string = tokens.front().get_source(cmd);
-            bool is_subcommand = std::find_if(std::begin(prefix_cmds), std::end(prefix_cmds),
-                                              [&cmd_string](const wchar_t *prefix) {
-                                                  return cmd_string == prefix;
-                                              }) != std::end(prefix_cmds);
-            if (!is_subcommand) break;
+        while (!tokens.empty() && parser_keywords_is_subcommand(tokens.front().get_source(cmd)))
             tokens.erase(tokens.begin());
-        }
     }
     // Empty process (cursor is after one of ;, &, |, \n, &&, || modulo whitespace).
     if (tokens.empty()) {
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index 7c0c4065c..aae7b91b2 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -17,7 +17,8 @@ static const wcstring skip_keywords[]{
 };
 
 static const wcstring subcommand_keywords[]{L"command", L"builtin", L"while", L"exec",
-                                            L"if",      L"and",     L"or",    L"not"};
+                                            L"if",      L"and",     L"or",    L"not",
+                                            L"time",    L"begin"};
 
 static const string_set_t block_keywords = {L"for",      L"while",  L"if",
                                             L"function", L"switch", L"begin"};

From 780bac671f45ab2c5ef15c9e7d6dff0031673e28 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 20 Dec 2019 23:00:06 +0800
Subject: [PATCH 1434/1732] cmake: add -latomic on platforms that need it for
 64-bit atomic operations

Closes #5865.
---
 CMakeLists.txt              |  2 +-
 cmake/ConfigureChecks.cmake | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32cf3ac17..2f1560ecf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,7 @@ ADD_LIBRARY(fishlib STATIC ${FISH_SRCS})
 TARGET_SOURCES(fishlib PRIVATE ${FISH_HEADERS})
 TARGET_LINK_LIBRARIES(fishlib
   ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY} Threads::Threads ${CMAKE_DL_LIBS}
-  ${PCRE2_LIB} ${Intl_LIBRARIES})
+  ${PCRE2_LIB} ${Intl_LIBRARIES} ${ATOMIC_LIBRARY})
 
 # Define fish.
 ADD_EXECUTABLE(fish src/fish.cpp)
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 3bc0f41c3..69dbb17b0 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -187,3 +187,16 @@ int main () {
 )
 
 FIND_PROGRAM(SED sed)
+
+# https://github.com/fish-shell/fish-shell/issues/5865
+CHECK_CXX_SOURCE_COMPILES("
+#include <atomic>
+struct big { int foo[64]; };
+std::atomic<big> x;
+int main() {
+   return x.load().foo[13];
+}"
+LIBATOMIC_NOT_NEEDED)
+IF (NOT LIBATOMIC_NOT_NEEDED)
+    SET(ATOMIC_LIBRARY "atomic")
+ENDIF()

From 8f2f3b648ff49588d87f1529b2ff9584a9a1e95b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 20 Dec 2019 23:47:46 +0800
Subject: [PATCH 1435/1732] cmake: check for 64-bit atomic operations directly

780bac671f45ab2c5ef15c9e7d6dff0031673e28 did not actually successfully
compile on any platforms, leading to -latomic always being added
(including on platforms it does not exist on).

Work on #5865.
---
 cmake/ConfigureChecks.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 69dbb17b0..59d48140e 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -191,10 +191,10 @@ FIND_PROGRAM(SED sed)
 # https://github.com/fish-shell/fish-shell/issues/5865
 CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
-struct big { int foo[64]; };
-std::atomic<big> x;
+#include <cstdint>
+std::atomic<uint64_t> x;
 int main() {
-   return x.load().foo[13];
+   return x;
 }"
 LIBATOMIC_NOT_NEEDED)
 IF (NOT LIBATOMIC_NOT_NEEDED)

From dcf8b0e3aa1b05c0a62139dd7dd83f55071bd884 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 20 Dec 2019 16:53:09 +0100
Subject: [PATCH 1436/1732] Add test for time

---
 tests/checks/time.fish | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 tests/checks/time.fish

diff --git a/tests/checks/time.fish b/tests/checks/time.fish
new file mode 100644
index 000000000..dc50d1c4f
--- /dev/null
+++ b/tests/checks/time.fish
@@ -0,0 +1,27 @@
+#RUN: %fish %s
+time sleep 1s
+
+# 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}}
+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}}
+
+# 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}}

From 17b499d2ea670c24af6bf3f99d4854b744bb70d2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 20 Dec 2019 16:58:58 +0100
Subject: [PATCH 1437/1732] docs/printf: Don't double "%"

This might be a leftover from doxygen, but sphinx does *not* require
"%%" here to print "%", so it shows

    %%d

instead of the correct

    %d

[ci skip]
---
 sphinx_doc_src/cmds/printf.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sphinx_doc_src/cmds/printf.rst b/sphinx_doc_src/cmds/printf.rst
index bb67c0e5e..b6d82b369 100644
--- a/sphinx_doc_src/cmds/printf.rst
+++ b/sphinx_doc_src/cmds/printf.rst
@@ -20,23 +20,23 @@ Unlike :ref:`echo <cmd-echo>`, ``printf`` does not append a new line unless it i
 
 Valid format specifiers are:
 
-- ``%%d``: Argument will be used as decimal integer (signed or unsigned)
+- ``%d``: Argument will be used as decimal integer (signed or unsigned)
 
-- ``%%i``: Argument will be used as a signed integer
+- ``%i``: Argument will be used as a signed integer
 
-- ``%%o``: An octal unsigned integer
+- ``%o``: An octal unsigned integer
 
-- ``%%u``: An unsigned decimal integer
+- ``%u``: An unsigned decimal integer
 
-- ``%%x`` or ``%%X``: An unsigned hexadecimal integer
+- ``%x`` or ``%X``: An unsigned hexadecimal integer
 
-- ``%%f``, ``%%g`` or ``%%G``: A floating-point number
+- ``%f``, ``%g`` or ``%G``: A floating-point number
 
-- ``%%e`` or ``%%E``: A floating-point number in scientific (XXXeYY) notation
+- ``%e`` or ``%E``: A floating-point number in scientific (XXXeYY) notation
 
-- ``%%s``: A string
+- ``%s``: A string
 
-- ``%%b``: As a string, interpreting backslash escapes, except that octal escapes are of the form \0 or \0ooo.
+- ``%b``: As a string, interpreting backslash escapes, except that octal escapes are of the form \0 or \0ooo.
 
 ``%%`` signifies a literal "%".
 

From 97dd5ece266995530f18d5a9db66ab88528d0938 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 20 Dec 2019 14:40:57 -0800
Subject: [PATCH 1438/1732] Remove redirection_is_to_real_file

This was previously required so that, if there was a redirection to a
file, we would fork a process to create the file even if there was no
output. For example `echo -n >/tmp/file.txt` would have to create
file.txt even though it would be empty.

However now we open the file before fork, so we no longer need special
logic around this.
---
 src/exec.cpp               | 20 +-------------------
 tests/checks/redirect.fish | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index a7a0f214c..3b1505ee9 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -71,19 +71,6 @@ void exec_close(int fd) {
     }
 }
 
-/// Returns true if the redirection is a file redirection to a file other than /dev/null.
-static bool redirection_is_to_real_file(const shared_ptr<const io_data_t> &io) {
-    bool result = false;
-    if (io && io->io_mode == io_mode_t::file) {
-        // It's a file redirection. Compare the path to /dev/null.
-        if (!static_cast<const io_file_t *>(io.get())->is_dev_null()) {
-            // It's not /dev/null.
-            result = true;
-        }
-    }
-    return result;
-}
-
 /// Returns the interpreter for the specified script. Returns NULL if file is not a script with a
 /// shebang.
 char *get_interpreter(const char *command, char *interpreter, size_t buff_size) {
@@ -499,13 +486,8 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         p->status = proc_status_t::from_exit_code(STATUS_READ_TOO_MUCH);
     }
 
-    // We will try to elide constructing an internal process. However if the output is going to a
-    // real file, we have to do it. For example in `echo -n > file.txt` we proceed to open file.txt
-    // even though there is no output, so that it is properly truncated.
     const shared_ptr<const io_data_t> stdout_io = io_chain->io_for_fd(STDOUT_FILENO);
     const shared_ptr<const io_data_t> stderr_io = io_chain->io_for_fd(STDERR_FILENO);
-    bool must_use_process =
-        redirection_is_to_real_file(stdout_io) || redirection_is_to_real_file(stderr_io);
 
     // If we are directing output to a buffer, then we can just transfer it directly without needing
     // to write to the bufferfill pipe. Note this is how we handle explicitly separated stdout
@@ -554,7 +536,7 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         errbuff.clear();
     }
 
-    if (!must_use_process && outbuff.empty() && errbuff.empty()) {
+    if (outbuff.empty() && errbuff.empty()) {
         // We do not need to construct a background process.
         // TODO: factor this job-status-setting stuff into a single place.
         p->completed = true;
diff --git a/tests/checks/redirect.fish b/tests/checks/redirect.fish
index 61c9eb004..14bc3298c 100644
--- a/tests/checks/redirect.fish
+++ b/tests/checks/redirect.fish
@@ -9,19 +9,19 @@ outnerr 0 &| count
 #CHECK: 2
 
 set -l tmpdir (mktemp -d)
-outnerr overwrite &> $tmpdir/file.txt
+outnerr overwrite &>$tmpdir/file.txt
 cat $tmpdir/file.txt
 #CHECK: out overwrite
 #CHECK: err overwrite
 
-outnerr append &>> $tmpdir/file.txt
+outnerr append &>>$tmpdir/file.txt
 cat $tmpdir/file.txt
 #CHECK: out overwrite
 #CHECK: err overwrite
 #CHECK: out append
 #CHECK: err append
 
-echo noclobber &>>? $tmpdir/file.txt
+echo noclobber &>>?$tmpdir/file.txt
 #CHECKERR: {{.*}} The file {{.*}} already exists
 
 eval "echo foo |& false"
@@ -29,4 +29,18 @@ eval "echo foo |& false"
 #CHECKERR: echo foo |& false
 #CHECKERR:          ^
 
+# Ensure that redirection empty data still creates the file.
+rm -f $tmpdir/file.txt
+test -f $tmpdir/file.txt && echo "File exists" || echo "File does not exist"
+#CHECK: File does not exist
+
+echo -n >$tmpdir/file.txt
+test -f $tmpdir/file.txt && echo "File exists" || echo "File does not exist"
+#CHECK: File exists
+
+rm $tmpdir/file.txt
+echo -n 2>$tmpdir/file.txt
+test -f $tmpdir/file.txt && echo "File exists" || echo "File does not exist"
+#CHECK: File exists
+
 rm -Rf $tmpdir

From 2e7cbaeabadc54d00ae1080240130d9fcaf5ad1e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 20 Dec 2019 14:47:54 -0800
Subject: [PATCH 1439/1732] Remove io_file_t::is_dev_null

This is no longer used.
---
 src/io.cpp | 6 +++---
 src/io.h   | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 83240c19a..54a8218da 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -29,8 +29,8 @@
 
 io_data_t::~io_data_t() = default;
 
-io_file_t::io_file_t(int f, autoclose_fd_t file, const wcstring &path)
-    : io_data_t(io_mode_t::file, f), file_fd_(std::move(file)), is_dev_null_(path == L"/dev/null") {
+io_file_t::io_file_t(int f, autoclose_fd_t file)
+    : io_data_t(io_mode_t::file, f), file_fd_(std::move(file)) {
     assert(file_fd_.valid() && "File is not valid");
 }
 
@@ -267,7 +267,7 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
                     }
                     return false;
                 }
-                this->push_back(std::make_shared<io_file_t>(spec.fd, std::move(file), path));
+                this->push_back(std::make_shared<io_file_t>(spec.fd, std::move(file)));
                 break;
             }
         }
diff --git a/src/io.h b/src/io.h
index 42a7edd21..c43b70896 100644
--- a/src/io.h
+++ b/src/io.h
@@ -212,20 +212,15 @@ class io_file_t : public io_data_t {
    public:
     void print() const override;
 
-    io_file_t(int f, autoclose_fd_t file, const wcstring &path);
+    io_file_t(int f, autoclose_fd_t file);
 
     ~io_file_t() override;
 
     int file_fd() const { return file_fd_.fd(); }
 
-    bool is_dev_null() const { return is_dev_null_; }
-
    private:
     // The fd for the file which we are writing to or reading from.
     autoclose_fd_t file_fd_;
-
-    // Hackish - whether this is /dev/null.
-    const bool is_dev_null_;
 };
 
 /// Represents (one end) of a pipe.

From de37e52dcaccd9f3bb42af4b4bda7ed59215a5d6 Mon Sep 17 00:00:00 2001
From: Dan Martinez <dfm@razorwind.org>
Date: Sat, 21 Dec 2019 00:59:14 -0800
Subject: [PATCH 1440/1732] Mention how `functions --details` handles aliases
 (#6423)

* Mention how `functions --details` handles aliases

* Clarify that `source` is responsible for `-` paths
---
 sphinx_doc_src/cmds/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index adeaa7f42..f439f02d9 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -29,7 +29,7 @@ The following options are available:
 
 - ``-e`` or ``--erase`` causes the specified functions to be erased. This also means that it is prevented from autoloading.
 
-- ``-D`` or ``--details`` reports the path name where each function is defined or could be autoloaded, ``stdin`` if the function was defined interactively or on the command line or by reading stdin, and ``n/a`` if the function isn't available. If the ``--verbose`` option is also specified then five lines are written:
+- ``-D`` or ``--details`` reports the path name where each 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 ``source``, and ``n/a`` if the function isn't available. (Functions created via ``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``,

From 616ff28deac6e0461cc1cdc74f1f83cb28b02731 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Fri, 13 Dec 2019 23:16:39 +0900
Subject: [PATCH 1441/1732] Remove all fuzzy translations

---
 po/de.po    | 15176 +++++++++++++++------------------------------
 po/en.po    | 13096 +++++++++++++--------------------------
 po/fr.po    |  1795 ++----
 po/nb.po    |     6 +-
 po/nn.po    |     6 +-
 po/pl.po    |  1848 ++----
 po/pt_BR.po | 16712 +++++++++++++++++---------------------------------
 po/zh_CN.po |  1975 +++---
 8 files changed, 16930 insertions(+), 33684 deletions(-)

diff --git a/po/de.po b/po/de.po
index 8f8fac50b..0412a36d1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -39,14 +39,14 @@ msgid "%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag string '%ls' is not valid\n"
-msgstr "%ls: Maximalwert '%ls' ist keine gültige Zahl\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag '%ls' is not valid\n"
-msgstr "%ls: Maximalwert '%ls' ist keine gültige Zahl\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:196
 #, c-format
@@ -85,14 +85,14 @@ msgid "%ls: No option specs were provided\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --min-args value '%ls'\n"
-msgstr "%ls: Ungültiger Anfangswert '%ls'\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:401
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --max-args value '%ls'\n"
-msgstr "%ls: Ungültiger Anfangswert '%ls'\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:23
 #, c-format
@@ -109,19 +109,19 @@ msgid "Send job %d '%ls' to background\n"
 msgstr "Sende Job %d '%ls' in den Hintergrund\n"
 
 #: src/builtin_bg.cpp:63 src/builtin_disown.cpp:69 src/builtin_fg.cpp:49
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: There are no suitable jobs\n"
-msgstr "%ls: Es gibt keine passenden Jobs\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid job specifier\n"
-msgstr "%ls: '%ls' ist kein Job\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:95 src/builtin_disown.cpp:89 src/builtin_wait.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Could not find job '%d'\n"
-msgstr "%ls: Konnte '%d' nicht finden\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:141
 #, c-format
@@ -129,19 +129,19 @@ msgid "%ls: No key with name '%ls' found\n"
 msgstr "%ls: Kein Schlüssel mit Name '%ls' gefunden\n"
 
 #: src/builtin_bind.cpp:143
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Key with name '%ls' does not have any mapping\n"
-msgstr "%ls: Schlüssel '%ls' hat keine Zuordnung\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:146
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown error trying to bind to key named '%ls'\n"
-msgstr "%ls: Unbekannte Fehler beim Zuordnen von Schlüssel '%ls'\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No binding found for key '%ls'\n"
-msgstr "%ls: Keine Zuordnung für Taste '%ls'\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:242
 #, c-format
@@ -149,9 +149,9 @@ msgid "%ls: No binding found for sequence '%ls'\n"
 msgstr "%ls: Keine Zuordnung für Sequenz '%ls'\n"
 
 #: src/builtin_bind.cpp:406
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid state\n"
-msgstr "%ls: Ungültiger Zustand\n"
+msgstr ""
 
 #: src/builtin_block.cpp:89
 #, c-format
@@ -174,24 +174,24 @@ msgid "%ls: '%ls' is not a directory\n"
 msgstr "%ls: '%ls' ist kein Verzeichnis\n"
 
 #: src/builtin_cd.cpp:55
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: The directory '%ls' does not exist\n"
-msgstr "%ls: Verzeichnis '%ls' existiert nicht\n"
+msgstr ""
 
 #: src/builtin_cd.cpp:58
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is a rotten symlink\n"
-msgstr "%ls: '%ls' ist defekter symbolischer Link\n"
+msgstr ""
 
 #: src/builtin_cd.cpp:61
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown error trying to locate directory '%ls'\n"
-msgstr "%ls: Unbekannter Fehler beim Suchen von Verzeichnis '%ls'\n"
+msgstr ""
 
 #: src/builtin_cd.cpp:76
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Permission denied: '%ls'\n"
-msgstr "%ls: Keine Erlaubnis: '%ls'\n"
+msgstr ""
 
 #: src/builtin_cd.cpp:90
 #, c-format
@@ -199,34 +199,34 @@ msgid "%ls: Could not set PWD variable\n"
 msgstr "%ls: Konnte PWD-Variable nicht setzen\n"
 
 #: src/builtin_commandline.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown input function '%ls'"
-msgstr "%ls: Unbekannte Eingabefunktion '%ls'"
+msgstr ""
 
 #: src/builtin_complete.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid token '%ls'\n"
-msgstr "%ls: Ungültiges Token '%ls'\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:203
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -s requires a non-empty string\n"
-msgstr "%ls: -s benötigt einen nicht-leeren String\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:211
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -l requires a non-empty string\n"
-msgstr "%ls: -l benötigt einen nicht-leeren String\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -o requires a non-empty string\n"
-msgstr "%ls: -o benötigt einen nicht-leeren String\n"
+msgstr ""
 
 #: src/builtin_contains.cpp:75
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Key not specified\n"
-msgstr "%ls: Schlüssel nicht angegeben\n"
+msgstr ""
 
 #: src/builtin.cpp:262
 #, c-format
@@ -248,9 +248,8 @@ msgid "%ls: Command not valid at an interactive prompt\n"
 msgstr ""
 
 #: src/builtin.cpp:410 src/builtin.cpp:460
-#, fuzzy
 msgid "Test a condition"
-msgstr "Eine Bedingung testen"
+msgstr ""
 
 #: src/builtin.cpp:411
 msgid "Execute command if previous command suceeded"
@@ -320,28 +319,24 @@ msgid "Skip the rest of the current lap of the innermost loop"
 msgstr "Rest des aktuellen Durchlaufs der innersten Schleife überspringen"
 
 #: src/builtin.cpp:429
-#, fuzzy
 msgid "Count the number of arguments"
-msgstr "Anzahl der Argumente zählen"
+msgstr ""
 
 #: src/builtin.cpp:430
-#, fuzzy
 msgid "Remove job from job list"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: src/builtin.cpp:431
-#, fuzzy
 msgid "Print arguments"
-msgstr "Argumente ausgeben"
+msgstr ""
 
 #: src/builtin.cpp:432
 msgid "Evaluate block if condition is false"
 msgstr "Werte Block aus, wenn die Bedingung falsch ist"
 
 #: src/builtin.cpp:433
-#, fuzzy
 msgid "Emit an event"
-msgstr "Ein Ereignis auslösen"
+msgstr ""
 
 #: src/builtin.cpp:434
 msgid "End a block of commands"
@@ -388,9 +383,8 @@ msgid "Print currently running jobs"
 msgstr "Derzeit laufende Jobs ausgeben"
 
 #: src/builtin.cpp:445
-#, fuzzy
 msgid "Evaluate math expressions"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: src/builtin.cpp:446
 msgid "Negate exit status of job"
@@ -401,14 +395,12 @@ msgid "Execute command if previous command failed"
 msgstr "Befehl ausführen, wenn vorheriger Befehl fehlerhaft war"
 
 #: src/builtin.cpp:448
-#, fuzzy
 msgid "Prints formatted text"
-msgstr "Befehlstyp ausgeben"
+msgstr ""
 
 #: src/builtin.cpp:449
-#, fuzzy
 msgid "Print the working directory"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: src/builtin.cpp:450
 msgid "Generate random number"
@@ -502,43 +494,41 @@ msgstr ""
 "Jobsteuerung unterliegt\n"
 
 #: src/builtin_function.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown signal '%ls'"
-msgstr "%ls: Unbekanntes Signal '%ls'"
+msgstr ""
 
 #: src/builtin_function.cpp:113
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Cannot find calling job for event handler"
-msgstr "%ls: Kann aufrufenden Job zur Ereignisbehandlung nicht finden"
+msgstr ""
 
 #: src/builtin_function.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid process id '%ls'"
-msgstr "%ls: Ungültige Prozesskennung %ls"
+msgstr ""
 
 #: src/builtin_function.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected function name"
-msgstr "%ls: Erwartete einen Funktionsnamen"
+msgstr ""
 
 #: src/builtin_function.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Illegal function name '%ls'"
-msgstr "%ls: Ungültiger Funktionsname '%ls'"
+msgstr ""
 
 #: src/builtin_function.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: The name '%ls' is reserved,\n"
 "and can not be used as a function name"
 msgstr ""
-"%ls: Der Name '%ls' ist reserviert,\n"
-"und kann nicht als Funktionsname benutzt werden"
 
 #: src/builtin_function.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unexpected positional argument '%ls'"
-msgstr "%ls: Unerwartetes Argument '%ls'"
+msgstr ""
 
 #: src/builtin_functions.cpp:275 src/builtin.h:38
 #, c-format
@@ -556,17 +546,16 @@ msgid "%ls: Function '%ls' does not exist\n"
 msgstr "%ls: Funktion '%ls' existiert nicht\n"
 
 #: src/builtin_functions.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
-msgstr "%ls: Erwartete genau einen Funktionsnamen\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:342
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: Expected exactly two names (current function name, and new function "
 "name)\n"
 msgstr ""
-"%ls: Erwartete genau zwei Funktionsnamen (den aktuellen und den neuen)\n"
 
 #: src/builtin_functions.cpp:359
 #, c-format
@@ -574,9 +563,9 @@ msgid "%ls: Illegal function name '%ls'\n"
 msgstr "%ls: Ungültiger Funktionsname '%ls'\n"
 
 #: src/builtin_functions.cpp:368
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
-msgstr "%ls: Funktion '%ls' existiert schon. Kann keine Kopie '%ls' anlegen\n"
+msgstr ""
 
 #: src/builtin_history.cpp:71 src/builtin_status.cpp:117
 #, c-format
@@ -589,9 +578,9 @@ msgid "%ls: you cannot use any options with the %ls command\n"
 msgstr "%ls: Sie können keine Option mit dem %ls Befehl verwenden\n"
 
 #: src/builtin_history.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: max value '%ls' is not a valid number\n"
-msgstr "%ls: Maximalwert '%ls' ist keine gültige Zahl\n"
+msgstr ""
 
 #: src/builtin_history.cpp:261
 msgid "builtin history delete only supports --exact\n"
@@ -626,9 +615,8 @@ msgid "Group\n"
 msgstr "Gruppe\n"
 
 #: src/builtin_jobs.cpp:84
-#, fuzzy
 msgid "Process\n"
-msgstr "Prozess\n"
+msgstr ""
 
 #: src/builtin_jobs.cpp:95
 msgid "Command\n"
@@ -640,9 +628,9 @@ msgid "%ls: There are no jobs\n"
 msgstr "%ls: Es gibt keine Jobs\n"
 
 #: src/builtin_math.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid scale value\n"
-msgstr "%ls: '%ls' ist kein Job\n"
+msgstr ""
 
 #: src/builtin_math.cpp:148
 #, c-format
@@ -655,19 +643,18 @@ msgid "More than %d var names in math expression."
 msgstr ""
 
 #: src/builtin_math.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid expression: %ls\n"
-msgstr "%ls: Ungültige Prozesskennung %ls\n"
+msgstr ""
 
 #: src/builtin_printf.cpp:243
-#, fuzzy
 msgid "Number out of range"
-msgstr "Anzahl der Top-Server"
+msgstr ""
 
 #: src/builtin_printf.cpp:249
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: expected a numeric value"
-msgstr "%ls: erwartete Zahl"
+msgstr ""
 
 #: src/builtin_printf.cpp:251
 #, c-format
@@ -693,14 +680,14 @@ msgid "invalid field width: %ls"
 msgstr "Ungültige Feldlänge: %ls"
 
 #: src/builtin_printf.cpp:674
-#, fuzzy, c-format
+#, c-format
 msgid "invalid precision: %ls"
-msgstr "Ungültige Genauigkeit: %ls"
+msgstr ""
 
 #: src/builtin_printf.cpp:699
-#, fuzzy, c-format
+#, c-format
 msgid "%.*ls: invalid conversion specification"
-msgstr "%.*ls: Ungültige Umwandlungsspezifikation"
+msgstr ""
 
 #: src/builtin_read.cpp:123
 #, c-format
@@ -709,9 +696,9 @@ msgid ""
 msgstr ""
 
 #: src/builtin_read.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Argument '%ls' is out of range\n"
-msgstr "%ls: Argument '%ls' ist ausserhalb des Gültigkeitsbereichs\n"
+msgstr ""
 
 #: src/builtin_read.cpp:344
 #, c-format
@@ -719,9 +706,9 @@ msgid "%ls: You can't specify both -p and -P\n"
 msgstr ""
 
 #: src/builtin_realpath.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid path: %ls\n"
-msgstr "%ls: Ungültiger Indexstart bei '%ls'\n"
+msgstr ""
 
 #: src/builtin_return.cpp:100
 #, c-format
@@ -729,14 +716,14 @@ msgid "%ls: Not inside of function\n"
 msgstr "%ls: Nicht innerhalb einer Funktion\n"
 
 #: src/builtin_set_color.cpp:159 src/builtin_set_color.cpp:178
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown color '%ls'\n"
-msgstr "%ls: Unbekannte Farbe '%ls'\n"
+msgstr ""
 
 #: src/builtin_set_color.cpp:167
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected an argument\n"
-msgstr "%ls: Argument erwartet\n"
+msgstr ""
 
 #: src/builtin_set.cpp:62
 #, c-format
@@ -754,9 +741,9 @@ msgid "%ls: You provided %d indexes but %d values\n"
 msgstr ""
 
 #: src/builtin_set.cpp:66
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Erase needs a variable name\n"
-msgstr "%ls: Erase benötigt einen Variablennamen\n"
+msgstr ""
 
 #: src/builtin_set.cpp:67
 #, c-format
@@ -771,21 +758,19 @@ msgid ""
 msgstr ""
 
 #: src/builtin_set.cpp:303
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to change the read-only variable '%ls'\n"
-msgstr "%ls: Versuchte read-only Variable '%ls' zu ändern\n"
+msgstr ""
 
 #: src/builtin_set.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
 msgstr ""
-"%ls: Versuchte spezielle Variable '%ls' mit falscher Gültigkeit zu setzen\n"
 
 #: src/builtin_set.cpp:317
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
 msgstr ""
-"%ls: Versuchte spezielle Variable '%ls' auf ungültigen Wert zu setzen\n"
 
 #: src/builtin_set.cpp:355
 #, c-format
@@ -816,9 +801,9 @@ msgid "$%ls[%d]: length=%d value=|%ls|\n"
 msgstr ""
 
 #: src/builtin_set.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: invalid var name\n"
-msgstr "%ls: Ungültiger Zustand\n"
+msgstr ""
 
 #: src/builtin_set.cpp:584
 #, c-format
@@ -826,9 +811,9 @@ msgid "%ls: `set --show` does not allow slices with the var names\n"
 msgstr ""
 
 #: src/builtin_source.cpp:49 src/builtin_source.cpp:57
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Error encountered while sourcing file '%ls':\n"
-msgstr "%ls: Fehler beim Lesen der Datei '%ls'\n"
+msgstr ""
 
 #: src/builtin_source.cpp:65
 #, c-format
@@ -841,19 +826,17 @@ msgid "%ls: Error while reading file '%ls'\n"
 msgstr "%ls: Fehler beim Lesen der Datei '%ls'\n"
 
 #: src/builtin_status.cpp:155
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid level value '%ls'\n"
-msgstr "%ls: Ungültiger Längenwert '%ls'\n"
+msgstr ""
 
 #: src/builtin_status.cpp:276
-#, fuzzy
 msgid "This is a login shell\n"
-msgstr "Dies ist eine Login-Shell\n"
+msgstr ""
 
 #: src/builtin_status.cpp:278
-#, fuzzy
 msgid "This is not a login shell\n"
-msgstr "Dies ist keine Login-Shell\n"
+msgstr ""
 
 #: src/builtin_status.cpp:282
 #, c-format
@@ -861,9 +844,8 @@ msgid "Job control: %ls\n"
 msgstr "Jobsteuerung: %ls\n"
 
 #: src/builtin_status.cpp:284
-#, fuzzy
 msgid "Only on interactive jobs"
-msgstr "Nur bei interaktiven Jobs"
+msgstr ""
 
 #: src/builtin_status.cpp:285
 msgid "Never"
@@ -874,14 +856,12 @@ msgid "Always"
 msgstr "Immer"
 
 #: src/builtin_status.cpp:312 src/fish.cpp:433 src/parser.cpp:552
-#, fuzzy
 msgid "Standard input"
-msgstr "Standardeingabe"
+msgstr ""
 
 #: src/builtin_status.cpp:320
-#, fuzzy
 msgid "Not a function"
-msgstr "Funktion"
+msgstr ""
 
 #: src/builtin_string.cpp:39
 #, c-format
@@ -889,29 +869,29 @@ msgid "%ls: Expected argument\n"
 msgstr "%ls: Argument erwartet\n"
 
 #: src/builtin_string.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid escape style '%ls'\n"
-msgstr "%ls: Ungültiger Anfangswert '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:238
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid length value '%ls'\n"
-msgstr "%ls: Ungültiger Längenwert '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid max value '%ls'\n"
-msgstr "%ls: Ungültiger Anfangswert '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:275
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid count value '%ls'\n"
-msgstr "%ls: Ungültiger Längenwert '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:321
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid start value '%ls'\n"
-msgstr "%ls: Ungültiger Anfangswert '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:743
 #, c-format
@@ -938,19 +918,19 @@ msgid "%ls: Regular expression substitute error: %ls\n"
 msgstr "%ls: Fehler beim Ersetzen von Regulärem Ausdruck: %ls\n"
 
 #: src/builtin_test.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer '%ls'"
-msgstr "Ungültige Ganzzahl '%ls'"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: New limit cannot be an empty string\n"
-msgstr "%ls: Neues Limit kann nicht leer sein\n"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid limit '%ls'\n"
-msgstr "%ls: Ungültiges Limit '%ls'\n"
+msgstr ""
 
 #: src/common.cpp:1551
 msgid "Current terminal parameters have rows and/or columns set to zero."
@@ -974,11 +954,9 @@ msgid "This is a bug. Break on bugreport to debug."
 msgstr ""
 
 #: src/common.cpp:1782
-#, fuzzy, c-format
+#, c-format
 msgid "If you can reproduce it, please send a bug report to %s."
 msgstr ""
-"Wenn dieser Fehler reproduziert werden kann, senden Sie bitte einen "
-"Fehlerbericht an %s."
 
 #: src/common.cpp:1792
 msgid "empty"
@@ -990,44 +968,40 @@ msgid "Home for %ls"
 msgstr "Heimordner für %ls"
 
 #: src/complete.cpp:56
-#, fuzzy, c-format
+#, c-format
 msgid "Variable: %ls"
-msgstr "Variable: %ls"
+msgstr ""
 
 #: src/env.cpp:242
 msgid "Tried to pop empty environment stack."
 msgstr "Versuchte, einen leeren Umgebungsstack zu poppen."
 
 #: src/env.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Using fallback terminal type '%s'."
-msgstr "Benutze Fallbackterminaltyp '%ls'"
+msgstr ""
 
 #: src/env.cpp:542
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set up terminal using the fallback terminal type '%s'."
-msgstr "Konnte Terminal mit Fallbacktyp '%ls' nicht einrichten - beende"
+msgstr ""
 
 #: src/env.cpp:574
-#, fuzzy
 msgid "Could not set up terminal."
-msgstr "Konnte Terminal nicht einrichten"
+msgstr ""
 
 #: src/env.cpp:576
-#, fuzzy
 msgid "TERM environment variable not set."
-msgstr "TERM Umgebungsvariable nicht gesetzt"
+msgstr ""
 
 #: src/env.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "TERM environment variable set to '%ls'."
-msgstr "TERM Umgebungsvariable gesetzt auf '%ls'"
+msgstr ""
 
 #: src/env.cpp:579
-#, fuzzy
 msgid "Check that this terminal type is supported on this system."
 msgstr ""
-"Überprüfen sie das dieser Terminaltyp auf diesem System unterstützt wird"
 
 #: src/env.cpp:673
 msgid ""
@@ -1035,10 +1009,9 @@ msgid ""
 msgstr ""
 
 #: src/env_universal_common.cpp:461
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to write to universal variables file '%ls': %s"
 msgstr ""
-"Konnte nicht in die Datei für universelle Variablen '%ls' schreiben: %s"
 
 #: src/env_universal_common.cpp:481
 #, c-format
@@ -1046,9 +1019,9 @@ msgid "Unable to rename file from '%ls' to '%ls': %s"
 msgstr "Konnte Datei '%ls' nicht zu '%ls' umbenennen: %s"
 
 #: src/env_universal_common.cpp:533
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open temporary file '%ls': %s"
-msgstr "Konnte temporäre Datei '%ls' nicht öffnen: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:543
 #, c-format
@@ -1058,9 +1031,9 @@ msgstr ""
 "Sekunden)"
 
 #: src/env_universal_common.cpp:595
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open universal variable file '%ls': %s"
-msgstr "Konnte die Datei für universelle Variablen '%ls' nicht öffnen: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:970
 #, c-format
@@ -1083,14 +1056,14 @@ msgid "Unable to memory map shared memory object with path '%s': %s"
 msgstr ""
 
 #: src/env_universal_common.cpp:1396
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to make a pipe for universal variables using '%ls': %s"
-msgstr "Konnte keine Pipe für universelle Variablen mit '%ls' erstellen: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:1405
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open a pipe for universal variables using '%ls': %s"
-msgstr "Konnte keine Pipe für universelle Variablen mit '%ls' öffnen: %s"
+msgstr ""
 
 #: src/event.cpp:119
 #, c-format
@@ -1098,9 +1071,9 @@ msgid "signal handler for %ls (%ls)"
 msgstr "Signalbehandler für %ls (%ls)"
 
 #: src/event.cpp:124
-#, fuzzy, c-format
+#, c-format
 msgid "handler for variable '%ls'"
-msgstr "Behandler für Variable '%ls'"
+msgstr ""
 
 #: src/event.cpp:129
 #, c-format
@@ -1128,9 +1101,9 @@ msgid "handler for generic event '%ls'"
 msgstr ""
 
 #: src/event.cpp:157
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown event type '0x%x'"
-msgstr "Unbekannter Ereignistyp '0x%x'"
+msgstr ""
 
 #: src/event.cpp:403
 msgid "Signal list overflow. Signals have been ignored."
@@ -1142,14 +1115,13 @@ msgid "An error occurred while redirecting file descriptor %d"
 msgstr "Fehler beim Umleiten des Dateideskriptors %d"
 
 #: src/exec.cpp:48
-#, fuzzy
 msgid "An error occurred while writing output"
-msgstr "Fehler beim Schreiben der Ausgabe"
+msgstr ""
 
 #: src/exec.cpp:51
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred while redirecting file '%s'"
-msgstr "Fehler beim Umleiten der Datei '%s'"
+msgstr ""
 
 #: src/exec.cpp:714
 #, c-format
@@ -1162,14 +1134,12 @@ msgid "Unknown input redirection type %d"
 msgstr "Unbekannter Typ %d bei Eingabeumleitung "
 
 #: src/expand.cpp:55
-#, fuzzy
 msgid "Child process"
-msgstr "Kindprozess"
+msgstr ""
 
 #: src/expand.cpp:58
-#, fuzzy
 msgid "Process"
-msgstr "Prozess"
+msgstr ""
 
 #: src/expand.cpp:61
 msgid "Job"
@@ -1181,14 +1151,12 @@ msgid "Job: %ls"
 msgstr "Job: %ls"
 
 #: src/expand.cpp:67
-#, fuzzy
 msgid "Shell process"
-msgstr "Shellprozess"
+msgstr ""
 
 #: src/expand.cpp:70
-#, fuzzy
 msgid "Last background job"
-msgstr "Letzter Hintergrundjob"
+msgstr ""
 
 #: src/expand.cpp:398
 #, c-format
@@ -1197,9 +1165,8 @@ msgstr ""
 "Unerwarteter Fehler beim Konvertieren von PID '%ls' zu einer Ganzzahl\n"
 
 #: src/expand.cpp:984
-#, fuzzy
 msgid "Mismatched brackets"
-msgstr "Unpassende Klammern"
+msgstr ""
 
 #: src/expand.cpp:1063
 msgid "Too much data emitted by command substitution so it was discarded\n"
@@ -1251,9 +1218,8 @@ msgid "Opening \"%s\" failed: %s\n"
 msgstr "Öffnen von \"%s\" fehlgeschlagen: %s\n"
 
 #: src/fish_indent.cpp:469
-#, fuzzy
 msgid "Too many arguments\n"
-msgstr "Zu viele Argumente\n"
+msgstr ""
 
 #: src/fish_key_reader.cpp:241
 #, c-format
@@ -1261,14 +1227,14 @@ msgid "signal #%d (%ls) received\n"
 msgstr "Signal #%d (%ls) erhalten\n"
 
 #: src/fish_key_reader.cpp:313
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-level flag\n"
-msgstr "Ungültiger Wert '%s' für debug-level Option\n"
+msgstr ""
 
 #: src/fish_key_reader.cpp:327
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag\n"
-msgstr "Ungültiger Wert '%s' für debug-stack-frames Option\n"
+msgstr ""
 
 #: src/history.cpp:146
 #, c-format
@@ -1297,9 +1263,8 @@ msgstr ""
 "%s"
 
 #: src/pager.cpp:40
-#, fuzzy
 msgid "search: "
-msgstr "Suche: "
+msgstr ""
 
 #: src/pager.cpp:493
 #, c-format
@@ -1312,14 +1277,13 @@ msgid "rows %lu to %lu of %lu"
 msgstr "Zeilen %lu bis %lu von %lu"
 
 #: src/pager.cpp:503
-#, fuzzy
 msgid "(no matches)"
-msgstr "(Keine Treffer)"
+msgstr ""
 
 #: src/parse_execution.cpp:556
-#, fuzzy, c-format
+#, c-format
 msgid "switch: Expected exactly one argument, got %lu\n"
-msgstr "switch: Erwartete genau ein Argument, erhielt %lu\n"
+msgstr ""
 
 #: src/parse_execution.cpp:791
 #, c-format
@@ -1336,14 +1300,14 @@ msgid "The file '%ls' is not executable by this user"
 msgstr "Die Datei '%ls' kann von diesem Benutzer nicht ausgeführt werden"
 
 #: src/parse_execution.cpp:1007
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid redirection target: %ls"
-msgstr "Ungültiges Umleitungsziel: %ls"
+msgstr ""
 
 #: src/parse_execution.cpp:1021
-#, fuzzy, c-format
+#, c-format
 msgid "Requested redirection to '%ls', which is not a valid file descriptor"
-msgstr "Angeforderte Umleitung auf etwas, das kein Dateideskriptor ist %ls"
+msgstr ""
 
 #: src/parser.cpp:30
 #, c-format
@@ -1371,9 +1335,8 @@ msgid "function invocation block"
 msgstr "Funktionsausführungsblock"
 
 #: src/parser.cpp:48
-#, fuzzy
 msgid "function invocation block with no variable shadowing"
-msgstr "Funktionsausführungsblock ohne Variablenverdeckung"
+msgstr ""
 
 #: src/parser.cpp:51
 msgid "'switch' block"
@@ -1396,9 +1359,8 @@ msgid "block created by the . builtin"
 msgstr "Vom '.' builtin erstellter Block"
 
 #: src/parser.cpp:66
-#, fuzzy
 msgid "event handler block"
-msgstr "Ereignisbehandler-Block"
+msgstr ""
 
 #: src/parser.cpp:69
 msgid "unknown/invalid block"
@@ -1424,14 +1386,13 @@ msgid "from sourcing file %ls\n"
 msgstr ""
 
 #: src/parser.cpp:392
-#, fuzzy, c-format
+#, c-format
 msgid "in function '%ls'\n"
-msgstr "Unbekannte Funktion '%ls'\n"
+msgstr ""
 
 #: src/parser.cpp:396
-#, fuzzy
 msgid "in command substitution\n"
-msgstr "Befehlsersetzungsblock\n"
+msgstr ""
 
 #: src/parser.cpp:407
 #, c-format
@@ -1465,9 +1426,9 @@ msgid "Job inconsistency"
 msgstr "Jobinkonsistenz"
 
 #: src/parser.cpp:797
-#, fuzzy, c-format
+#, c-format
 msgid "%ls (line %lu): "
-msgstr "%ls (Zeile %lu): "
+msgstr ""
 
 #: src/parser.cpp:800
 #, c-format
@@ -1475,20 +1436,18 @@ msgid "%ls: "
 msgstr ""
 
 #: src/parse_util.cpp:28
-#, fuzzy, c-format
+#, c-format
 msgid "The '%ls' command can not be used in a pipeline"
-msgstr "Befehl '%ls' kann nicht in einer Pipe benutzt werden"
+msgstr ""
 
 #: src/parse_util.cpp:32
-#, fuzzy, c-format
+#, c-format
 msgid "The '%ls' command can not be used immediately after a backgrounded job"
 msgstr ""
-"Befehl '%ls' kann nicht direkt nach einem Hintergrundjob benutzt werden"
 
 #: src/parse_util.cpp:36
-#, fuzzy
 msgid "Backgrounded commands can not be used as conditionals"
-msgstr "Hintergrundkommandos können nicht als Bedingung verwendet werden"
+msgstr ""
 
 #: src/path.cpp:25
 #, c-format
@@ -1496,9 +1455,9 @@ msgid "Error while searching for command '%ls'"
 msgstr "Fehler beim Suchen des Befehls '%ls'"
 
 #: src/path.cpp:276
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to locate the %ls directory."
-msgstr "Konnte Verzeichnis %ls nicht finden."
+msgstr ""
 
 #: src/path.cpp:277
 #, c-format
@@ -1512,9 +1471,9 @@ msgid "Unable to locate %ls directory derived from $%ls: '%ls'."
 msgstr "Konnte Verzeichnis %ls abgeleitet von %ls nicht finden: '%ls'."
 
 #: src/path.cpp:283
-#, fuzzy, c-format
+#, c-format
 msgid "The error was '%s'."
-msgstr "Der Fehler war: '%s'."
+msgstr ""
 
 #: src/path.cpp:284
 #, c-format
@@ -1535,14 +1494,14 @@ msgid "Job %d, "
 msgstr ""
 
 #: src/proc.cpp:587
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: %ls'%ls' terminated by signal %ls (%ls)"
-msgstr "%ls: %ls'%ls' durch Signal %ls (%ls) beendet"
+msgstr ""
 
 #: src/proc.cpp:595
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Process %d, '%ls' %ls'%ls' terminated by signal %ls (%ls)"
-msgstr "%ls: Prozess %d, '%ls' %ls'%ls' durch Signal %ls (%ls) beendet"
+msgstr ""
 
 #: src/proc.cpp:779
 msgid "An error occured while reading output from code block"
@@ -1610,18 +1569,14 @@ msgid "Pop null reader block"
 msgstr ""
 
 #: src/reader.cpp:2160
-#, fuzzy
 msgid "There are still jobs active:\n"
-msgstr "Es gibt keine passenden Jobs\n"
+msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   Befehl\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -1638,9 +1593,8 @@ msgid "Unknown key binding 0x%X"
 msgstr "Unbekannte Tastenkombination 0x%X"
 
 #: src/reader.cpp:3294
-#, fuzzy
 msgid "Error while reading from file descriptor"
-msgstr "Fehler beim Lesen von Dateideskriptor"
+msgstr ""
 
 #: src/reader.cpp:3308
 msgid "Error while closing input stream"
@@ -1651,9 +1605,8 @@ msgid "Error while opening input stream"
 msgstr "Fehler beim Öffnen des Eingabestroms"
 
 #: src/sanity.cpp:18
-#, fuzzy
 msgid "Errors detected, shutting down. Break on sanity_lose() to debug."
-msgstr "Fehler gefunden, Programmabbruch"
+msgstr ""
 
 #: src/sanity.cpp:33
 #, c-format
@@ -1802,23 +1755,20 @@ msgid "Abort (Alias for SIGABRT)"
 msgstr ""
 
 #: src/signal.cpp:141
-#, fuzzy
 msgid "Unused signal"
-msgstr "Benutzerdefiniertes Signal 1"
+msgstr ""
 
 #: src/signal.cpp:173 src/signal.cpp:185
-#, fuzzy
 msgid "Unknown"
-msgstr "Unbekannt"
+msgstr ""
 
 #: src/signal.cpp:413
 msgid "Signal block mismatch"
 msgstr ""
 
 #: src/tokenizer.cpp:26
-#, fuzzy
 msgid "Unexpected end of string, quotes are not balanced"
-msgstr "Unerwartetes Zeichenende"
+msgstr ""
 
 #: src/tokenizer.cpp:29
 msgid "Unexpected end of string, parenthesis do not match"
@@ -1829,59 +1779,56 @@ msgid "Unexpected end of string, square brackets do not match"
 msgstr "Unerwartetes Stringende, eckige Klammern passen nicht"
 
 #: src/tokenizer.cpp:35
-#, fuzzy
 msgid "Unexpected end of string, incomplete escape sequence"
-msgstr "Unerwartetes Zeichenende, unvollständige Escapesequenz"
+msgstr ""
 
 #: src/tokenizer.cpp:38
-#, fuzzy
 msgid "Invalid input/output redirection"
-msgstr "Ungültige Umleitung"
+msgstr ""
 
 #: src/tokenizer.cpp:41
-#, fuzzy
 msgid "Cannot use stdin (fd 0) as pipe output"
-msgstr "Kann FD 0 nicht als Pipe-Ausgabe verwenden"
+msgstr ""
 
 #: src/wgetopt.cpp:246
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid option -- %lc\n"
-msgstr "%ls: Ungültige Option -- %lc\n"
+msgstr ""
 
 #: src/wgetopt.cpp:277
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option requires an argument -- %lc\n"
-msgstr "%ls: Option benötigt ein Argument -- %lc\n"
+msgstr ""
 
 #: src/wgetopt.cpp:304
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '--%ls' doesn't allow an argument\n"
-msgstr "%ls: Option '--%ls' erlaubt kein Argument\n"
+msgstr ""
 
 #: src/wgetopt.cpp:308
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%lc%ls' doesn't allow an argument\n"
-msgstr "%ls: Option '%lc%ls' erlaubt kein Argument\n"
+msgstr ""
 
 #: src/wgetopt.cpp:320
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%ls' requires an argument\n"
-msgstr "%ls: Option '%ls' benötigt ein Argument\n"
+msgstr ""
 
 #: src/wgetopt.cpp:383
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%ls' is ambiguous\n"
-msgstr "%ls: Option '%ls' ist mehrdeutig\n"
+msgstr ""
 
 #: src/wgetopt.cpp:402
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unrecognized option '--%ls'\n"
-msgstr "%ls: Unbekannte Option '%ls'\n"
+msgstr ""
 
 #: src/wgetopt.cpp:405
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unrecognized option '%lc%ls'\n"
-msgstr "%ls: Unbekannte Option '%lc%ls'\n"
+msgstr ""
 
 #: src/wildcard.cpp:27 /tmp/fish/implicit/share/completions/journalctl.fish:2
 msgid "Executable"
@@ -1919,9 +1866,8 @@ msgid "Symbolic link"
 msgstr "Symbolischer Link"
 
 #: src/wildcard.cpp:41
-#, fuzzy
 msgid "Symbolic link to directory"
-msgstr "Symbolischer Link auf Ordner"
+msgstr ""
 
 #: src/wildcard.cpp:43
 msgid "Rotten symbolic link"
@@ -1947,9 +1893,9 @@ msgid "getcwd() failed with errno %d/%s"
 msgstr "getcwd() schlug mit errno %d/%s fehl"
 
 #: src/builtin.h:35
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected argument for option %ls\n"
-msgstr "%ls: Erwartete ein Argument, erhielt %d\n"
+msgstr ""
 
 #: src/builtin.h:41
 #, c-format
@@ -1961,15 +1907,14 @@ msgstr ""
 "%ls\n"
 
 #: src/builtin.h:45
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable scope can only be one of universal, global and local\n"
-msgstr "%ls: Variablenbereich kann nur universell, global oder lokal sein\n"
+msgstr ""
 
 #: src/builtin.h:48
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable can't be both exported and unexported\n"
 msgstr ""
-"%ls: Variable kann nicht gleichzeitig exportiert und nicht exportiert sein\n"
 
 #: src/builtin.h:51
 #, c-format
@@ -1997,14 +1942,14 @@ msgid "%ls: Expected at most %d args, got %d\n"
 msgstr ""
 
 #: src/builtin.h:60
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: Maximalwert '%ls' ist keine gültige Zahl\n"
+msgstr ""
 
 #: src/builtin.h:63
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: mode name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: Maximalwert '%ls' ist keine gültige Zahl\n"
+msgstr ""
 
 #: src/builtin.h:66
 #, c-format
@@ -2012,9 +1957,9 @@ msgid "%ls: Too many arguments\n"
 msgstr "%ls: Zu viele Argumente\n"
 
 #: src/builtin.h:69
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Argument '%ls' is not a number\n"
-msgstr "%ls: Argument '%ls' muss eine Ganzzahl sein\n"
+msgstr ""
 
 #: src/builtin.h:72
 #, c-format
@@ -2022,9 +1967,9 @@ msgid "%ls: Expected a subcommand to follow the command\n"
 msgstr ""
 
 #: src/builtin.h:73
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Subcommand '%ls' is not valid\n"
-msgstr "%ls: '%ls' ist keine Datei\n"
+msgstr ""
 
 #: src/builtin.h:76
 #, c-format
@@ -2066,9 +2011,9 @@ msgid "Unable to expand variable name '%ls'"
 msgstr ""
 
 #: src/parse_constants.h:242
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to find a process '%ls'"
-msgstr "Konnte Prozess '%ls' nicht ausführen"
+msgstr ""
 
 #: src/parse_constants.h:245
 #, c-format
@@ -2076,31 +2021,26 @@ msgid "Illegal file descriptor in redirection '%ls'"
 msgstr ""
 
 #: src/parse_constants.h:248
-#, fuzzy, c-format
+#, c-format
 msgid "No matches for wildcard '%ls'. See `help expand`."
 msgstr ""
-"Warnung: Kein Treffer für Jokerzeichen '%ls'. Der Befehl wird nicht "
-"ausgeführt."
 
 #: src/parse_constants.h:251
-#, fuzzy
 msgid "'break' while not inside of loop"
-msgstr "Schleifensteuerungsbefehl 'while' nicht innerhalb einer Schleife"
+msgstr ""
 
 #: src/parse_constants.h:254
-#, fuzzy
 msgid "'continue' while not inside of loop"
-msgstr "Schleifensteuerungsbefehl 'while' nicht innerhalb einer Schleife"
+msgstr ""
 
 #: src/parse_constants.h:257
-#, fuzzy
 msgid "'return' outside of function definition"
-msgstr "Internen Befehl anstatt einer Funktion ausführen"
+msgstr ""
 
 #: src/parse_constants.h:262
-#, fuzzy, c-format
+#, c-format
 msgid "$%lc is not a valid variable in fish."
-msgstr "$%lc ist kein gültiger Variablenname"
+msgstr ""
 
 #: src/parse_constants.h:265
 #, c-format
@@ -2164,16 +2104,14 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:1
 #: /tmp/fish/explicit/share/completions/emerge.fish:4
-#, fuzzy
 msgid "All base system packages"
-msgstr "Erstellte Pakete löschen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:2
 #: /tmp/fish/explicit/share/completions/emerge.fish:5
 #: /tmp/fish/explicit/share/completions/emerge.fish:6
-#, fuzzy
 msgid "All packages in world"
-msgstr "Installierte Pakete synchronisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:3
 #: /tmp/fish/implicit/share/completions/aura.fish:90
@@ -2184,9 +2122,8 @@ msgstr "Installierte Pakete synchronisieren"
 #: /tmp/fish/implicit/share/completions/pacman.fish:55
 #: /tmp/fish/implicit/share/completions/yaourt.fish:69
 #: /tmp/fish/implicit/share/completions/yaourt.fish:76
-#, fuzzy
 msgid "Installed package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:7
 msgid "Packages that are linked to preserved libs"
@@ -2201,88 +2138,72 @@ msgid "Usage overview of emerge"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:10
-#, fuzzy
 msgid "Help on subject system"
-msgstr "Hilfeabschnitt zu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:11
-#, fuzzy
 msgid "Help on subject config"
-msgstr "Hilfeabschnitt zu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Help on subject sync"
-msgstr "Hilfeabschnitt zu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:13
-#, fuzzy
 msgid "Use colors in output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:14
-#, fuzzy
 msgid "Don't use colors in output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Pull in build time dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Don't pull in build time dependencies"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:1
-#, fuzzy
 msgid "list all packages owning file(s)"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:2
 msgid "check MD5sums and timestamps of package"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:3
-#, fuzzy
 msgid "list all packages depending on specified package"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:4
-#, fuzzy
 msgid "display a dependency tree for package"
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:5
-#, fuzzy
 msgid "list files owned by package"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:6
-#, fuzzy
 msgid "list all packages with specified useflag"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:7
-#, fuzzy
 msgid "list all packages matching pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:8
-#, fuzzy
 msgid "print size of files contained in package"
-msgstr "Die im Paket enthaltenen Auslöser-Skripte anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:9
-#, fuzzy
 msgid "display USE flags for package"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:10
-#, fuzzy
 msgid "print full path to ebuild for package"
-msgstr "Vollständigen Quellpfad ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:1
 msgid "Build a gem from a gemspec"
@@ -2293,82 +2214,68 @@ msgid "Adjust RubyGems certificate settings"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:3
-#, fuzzy
 msgid "Check installed gems"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:4
-#, fuzzy
 msgid "Cleanup old versions of installed gems in the local repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:5
-#, fuzzy
 msgid "Display the contents of the installed gems"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:6
-#, fuzzy
 msgid "Show the dependencies of an installed gem"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:7
-#, fuzzy
 msgid "Display RubyGems environmental information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:8
-#, fuzzy
 msgid "Provide help on the 'gem' command"
-msgstr "Hilfe für den Befehl 'gem'"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:9
-#, fuzzy
 msgid "Install a gem into the local repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:10
 msgid "Display all gems whose name starts with STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:11
-#, fuzzy
 msgid "Query gem information in local or remote repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:12
-#, fuzzy
 msgid "Generates RDoc for pre-installed gems"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:13
 msgid "Display all gems whose name contains STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:14
-#, fuzzy
 msgid "Display gem specification (in yaml)"
-msgstr "Letzte Veränderungszeit der Datei anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:15
-#, fuzzy
 msgid "Uninstall a gem from the local repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:16
-#, fuzzy
 msgid "Unpack an installed gem to the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:17
-#, fuzzy
 msgid "Update the named gem (or all installed gems) in the local repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:18
-#, fuzzy
 msgid "display the remote gem servers"
-msgstr "Datei zum Zugriff auf Server"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:19
 msgid "show some examples of usage"
@@ -2391,14 +2298,12 @@ msgid "Enables an existing service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:4
-#, fuzzy
 msgid "Disables an existing service"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:5
-#, fuzzy
 msgid "Removes the specified service name from the service cache"
-msgstr "Die auf der Befehlszeile angegebene Datei verschieben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:6
 msgid "Forces an existing service to start"
@@ -2425,14 +2330,12 @@ msgid "Prints a description of a domain or service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:12
-#, fuzzy
 msgid "Prints information about the service cache"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:13
-#, fuzzy
 msgid "Prints which services are disabled"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:14
 msgid ""
@@ -2441,14 +2344,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:15
-#, fuzzy
 msgid "Prints port information about a process"
-msgstr "Während der Verarbeitung zusätzliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:16
-#, fuzzy
 msgid "Prints port information about the host"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:17
 msgid "Resolves a port name from a process to an endpoint in launchd"
@@ -2459,9 +2360,8 @@ msgid "Reads or modifies launchd's resource limits"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:19
-#, fuzzy
 msgid "Prints performance statistics for a service"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:20
 msgid ""
@@ -2473,18 +2373,16 @@ msgid "Modifies persistent configuration parameters for launchd domains"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:22
-#, fuzzy
 msgid "Dumps launchd state to stdout"
-msgstr "Auf Standardausgabe dekomprimieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:23
 msgid "Dumps the jetsam properties category for all services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:24
-#, fuzzy
 msgid "Initiates a system reboot of the specified type"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:25
 msgid "Brings the system up from single-user mode with a console shell"
@@ -2499,24 +2397,20 @@ msgid "Unloads a service or directory of services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:28
-#, fuzzy
 msgid "Unloads the specified service name"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:29
-#, fuzzy
 msgid "Lists information about services"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:30
-#, fuzzy
 msgid "Starts the specified service"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:31
-#, fuzzy
 msgid "Stops the specified service if it is running"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:32
 msgid ""
@@ -2541,9 +2435,8 @@ msgid "Execute a program in the bootstrap context of a given user"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:37
-#, fuzzy
 msgid "Submit a basic job from the command line"
-msgstr "Festlegen oder Abrufen der Befehlszeile"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:38
 msgid "Prints the PID of the launchd controlling the session"
@@ -2554,28 +2447,24 @@ msgid "Prints the UID of the current launchd session"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:40
-#, fuzzy
 msgid "Prints the name of the current launchd session"
-msgstr "Rest des aktuellen Durchlaufs der innersten Schleife überspringen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:41
-#, fuzzy
 msgid "Prints a description of an error"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:42
 msgid "Prints the launchd variant"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:43
-#, fuzzy
 msgid "Prints the launchd version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:44
-#, fuzzy
 msgid "Prints the usage for a given subcommand"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:1
 #: /tmp/fish/explicit/share/completions/mdadm.fish:2
@@ -2584,9 +2473,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:3
 #: /tmp/fish/explicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Use last 1.x format superblock"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:5
 msgid "Use 1.0 format superblock"
@@ -2615,9 +2503,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/mdadm.fish:11
 #: /tmp/fish/explicit/share/completions/mdadm.fish:12
 #: /tmp/fish/explicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Stripped volume (RAID 0)"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:14
 #: /tmp/fish/explicit/share/completions/mdadm.fish:15
@@ -2655,9 +2542,8 @@ msgid "Pseudo RAID layer for single device (akin faulty RAID 1)"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Container"
-msgstr "Kein Neue-Zeile-Zeichen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:29
 msgid "Alias of left-asymmetric"
@@ -2680,9 +2566,8 @@ msgid "Alias of write-transient"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:34
-#, fuzzy
 msgid "Alias of read-transient"
-msgstr "Alias für atrm"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:35
 msgid "Alias of write-persistent"
@@ -2693,60 +2578,50 @@ msgid "Alias of read-persistent"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:37
-#, fuzzy
 msgid "Alias of read-fixable"
-msgstr "Datei ist lesbar"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Use standard format (default)"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:39
-#, fuzzy
 msgid "Use a non-partitionable array"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:40
 #: /tmp/fish/explicit/share/completions/mdadm.fish:41
 #: /tmp/fish/explicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Use a partitionable array"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:43
 msgid "Remove superblock misalignement from SPARC kernel 2.2"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:44
-#, fuzzy
 msgid "Correct superblock summaries"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Update array UUID"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:46
-#, fuzzy
 msgid "Update array name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:47
-#, fuzzy
 msgid "Update array nodes"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update array homehost"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Update array cluster name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:50
 msgid "Mark the array as dirty, thus forcing resync"
@@ -2757,18 +2632,16 @@ msgid "Reverse superblock endianness"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:52
-#, fuzzy
 msgid "Refresh device size"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:53
 msgid "Assume bitmap absence"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Reserve space for bad block list"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:55
 msgid "Free reserved space for bad block list"
@@ -2783,9 +2656,8 @@ msgid "Reset preferred minor to current one"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Abort currently running actions"
-msgstr "Derzeit laufende Jobs ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:59
 msgid "Abort currently running actions, prevent their restart"
@@ -2796,9 +2668,8 @@ msgid "Scrub the array (i.e. check constistency)"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Check, then resync"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/set.fish:1
 msgid "Locale"
@@ -2806,9 +2677,8 @@ msgstr "Locale"
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:1
 #: /tmp/fish/explicit/share/completions/telnet.fish:6
-#, fuzzy
 msgid "Specifies an 8-bit data path"
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:2
 msgid "Do not try to negotiate TELNET BINARY option"
@@ -2831,66 +2701,56 @@ msgid "Attempt automatic login"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:8
-#, fuzzy
 msgid "Disables reading user's .telnetrc"
-msgstr "Weiterleitung von Kerberos-Tickets deaktivieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:9
-#, fuzzy
 msgid "Sets debug mode"
-msgstr "Debug-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:10
 msgid "Sets IP TOS"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:11
-#, fuzzy
 msgid "Disables specified type of authentication"
-msgstr "Deaktiviert Weiterleitung des Authentifizierungs-Agenten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:12
-#, fuzzy
 msgid "User login"
-msgstr "Benutzer-Startverzeichnis"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:13
-#, fuzzy
 msgid "Log to tracefile"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:14
-#, fuzzy
 msgid "Turn on encryption"
-msgstr "Funktionsbeschreibung festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:15
 msgid "User interface similar to rlogin"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:16
-#, fuzzy
 msgid "Use Kerberos realm for authentication"
-msgstr "Pseudo-tty-Zuordnung erzwingen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/update-eix-remote.fish:1
 msgid "Remove all temporarily added virtual overlays from the eix database"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:1
-#, fuzzy
 msgid "ZFS filesystem"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:2
-#, fuzzy
 msgid "ZFS filesystem snapshot"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "ZFS block storage device"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:4
 msgid "ZFS snapshot bookmark"
@@ -2901,14 +2761,12 @@ msgid "Any ZFS dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:6
-#, fuzzy
 msgid "Dataset-specific value"
-msgstr "Angegebene Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Default ZFS value"
-msgstr "Datum festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:8
 msgid "Value inherited from parent dataset"
@@ -2919,19 +2777,16 @@ msgid "Value received by 'zfs receive'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "Value valid for the current mount"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:11
-#, fuzzy
 msgid "Read-only value"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:12
-#, fuzzy
 msgid "Dataset full name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:13
 #: /tmp/fish/explicit/share/completions/zpool.fish:2
@@ -2939,15 +2794,13 @@ msgstr "Dienstname"
 #: /tmp/fish/implicit/share/completions/minikube.fish:26
 #: /tmp/fish/implicit/share/completions/minikube.fish:27
 #: /tmp/fish/implicit/share/completions/minikube.fish:28
-#, fuzzy
 msgid "Property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:14
 #: /tmp/fish/explicit/share/completions/zpool.fish:3
-#, fuzzy
 msgid "Property value"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:15
 #: /tmp/fish/explicit/share/completions/zpool.fish:4
@@ -2955,24 +2808,20 @@ msgid "Property value origin"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:16
-#, fuzzy
 msgid "Identity type"
-msgstr "Datei identifizieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Identity name"
-msgstr "Datei identifizieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:18
-#, fuzzy
 msgid "Space usage"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:19
-#, fuzzy
 msgid "Space quota"
-msgstr "Markierungszeichen festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:20
 msgid "POSIX user"
@@ -2992,14 +2841,12 @@ msgid "POSIX group"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:24
-#, fuzzy
 msgid "Samba group"
-msgstr "Auswahl per Gruppe"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:26
-#, fuzzy
 msgid "Also needs the permission to be allowed"
-msgstr "Auswahl, wie Passwortsätze verstümmelt werden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:27
 msgid ""
@@ -3036,9 +2883,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:37
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:26
-#, fuzzy
 msgid "Volume block size"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:38
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:1
@@ -3048,9 +2894,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:39
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:2
-#, fuzzy
 msgid "Update access time on read"
-msgstr "Zugriffszeit behalten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:40
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:3
@@ -3059,27 +2904,23 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:41
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:4
-#, fuzzy
 msgid "Data checksum"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:42
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:5
-#, fuzzy
 msgid "Compression algorithm"
-msgstr "Benutze angegebenen Kompressionsalgorithmus"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:43
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:6
-#, fuzzy
 msgid "Number of copies of data"
-msgstr "Alle Zeilen nummerieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:44
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:7
-#, fuzzy
 msgid "Deduplication"
-msgstr "Nicht doppelte Zeilen entfernen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:45
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:2
@@ -3090,21 +2931,18 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:46
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:3
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:9
-#, fuzzy
 msgid "Can contained executables be executed"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:47
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:10
-#, fuzzy
 msgid "Max number of filesystems and volumes"
-msgstr "Maximalanzahl geschachtelter Blöcke erreicht."
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:48
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:11
-#, fuzzy
 msgid "Mountpoint"
-msgstr "Einhängepunkt"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:49
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:12
@@ -3118,22 +2956,19 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:51
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:14
-#, fuzzy
 msgid "Max number of snapshots"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:52
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:4
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:15
-#, fuzzy
 msgid "Read-only"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:53
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:16
-#, fuzzy
 msgid "Suggest block size"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:54
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:17
@@ -3178,9 +3013,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:62
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:25
-#, fuzzy
 msgid "Hide .zfs directory"
-msgstr "Datei ist ein Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:63
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:26
@@ -3189,9 +3023,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:64
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:27
-#, fuzzy
 msgid "Volume logical size"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:65
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:38
@@ -3230,9 +3063,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:79
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:35
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:45
-#, fuzzy
 msgid "On-disk version of filesystem"
-msgstr "Nur neuere Dateien speichern"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:71
 #: /tmp/fish/explicit/share/completions/zfs.fish:80
@@ -3247,9 +3079,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:10
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:37
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:47
-#, fuzzy
 msgid "Extended attributes"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:73
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:39
@@ -3264,9 +3095,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:78
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:44
-#, fuzzy
 msgid "Hide volume snapshots"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:82
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:30
@@ -3281,9 +3111,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:84
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:1
-#, fuzzy
 msgid "Unicode normalization"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:85
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:2
@@ -3294,30 +3123,25 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:87
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:8
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:9
-#, fuzzy
 msgid "Case sensitivity"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:88
-#, fuzzy
 msgid "Space properties"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:89
 #: /tmp/fish/explicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Dataset name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:1
-#, fuzzy
 msgid "Pool full name"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:5
-#, fuzzy
 msgid "Mirror of at least two devices"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:6
 #: /tmp/fish/explicit/share/completions/zpool.fish:7
@@ -3337,14 +3161,12 @@ msgid "Pseudo vdev for pool hot spares"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:11
-#, fuzzy
 msgid "SLOG device"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "L2ARC device"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:13
 msgid "Physically allocated space"
@@ -3354,9 +3176,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zpool.fish:15
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:1
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:2
-#, fuzzy
 msgid "Available space"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:16
 msgid "System boot partition size"
@@ -3367,9 +3188,8 @@ msgid "Usage percentage of pool"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Deduplication ratio"
-msgstr "Lese-/Schreib-Modus"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:19
 msgid "Amount of uninitialized space within the pool"
@@ -3392,9 +3212,8 @@ msgid "Pool GUID"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:24
-#, fuzzy
 msgid "Current pool health"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:25
 msgid "Total pool space"
@@ -3410,21 +3229,18 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:28
 #: /tmp/fish/explicit/share/completions/zpool.fish:29
-#, fuzzy
 msgid "Alternate root directory"
-msgstr "Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:30
 #: /tmp/fish/explicit/share/completions/zpool.fish:31
-#, fuzzy
 msgid "Import pool in read-only mode"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:32
 #: /tmp/fish/explicit/share/completions/zpool.fish:33
-#, fuzzy
 msgid "Automatic pool expansion on LUN growing"
-msgstr "Automatische Zeilenende-Verarbeitung"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:34
 #: /tmp/fish/explicit/share/completions/zpool.fish:35
@@ -3436,9 +3252,8 @@ msgid "Default bootable dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:37
-#, fuzzy
 msgid "Pool configuration cache"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:38
 msgid "Comment about the pool"
@@ -3461,28 +3276,24 @@ msgid "Display snapshots even if 'zfs list' does not use '-t'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:43
-#, fuzzy
 msgid "On-disk version of pool"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:44
 msgid "%sEnable the %s feature\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:45
-#, fuzzy
 msgid "All properties"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:1
-#, fuzzy
 msgid "%s: Could not figure out what to do!\\n"
-msgstr "%s: Konnte Startverzeichnis nicht finden\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:2
-#, fuzzy
 msgid "%s %s: Requires at least two arguments\\n"
-msgstr "%s: Erwartete ein Argument, erhielt %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:3
 #: /tmp/fish/explicit/share/functions/abbr.fish:5
@@ -3501,9 +3312,8 @@ msgid "%s %s: No abbreviation named %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:7
-#, fuzzy
 msgid "%s %s: Requires exactly two arguments\\n"
-msgstr "%s: Erwartete ein Argument, erhielt %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:11
 msgid "%s %s: Abbreviation %s already exists, cannot rename %s\\n"
@@ -3515,14 +3325,12 @@ msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
-#, fuzzy
 msgid "%s: Name cannot be empty\\n"
-msgstr "%s: Variablenname kann nicht leer sein\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:2
-#, fuzzy
 msgid "%s: Body cannot be empty\\n"
-msgstr "%s: Variablenname kann nicht leer sein\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/cd.fish:1
 msgid "Too many args for cd command"
@@ -3562,19 +3370,16 @@ msgid "Ignoring the output of your editor since its exit status was non-zero"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/edit_command_buffer.fish:4
-#, fuzzy
 msgid "or the file was empty"
-msgstr "Nicht vorhandene Dateien als leer behandeln"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
-#, fuzzy
 msgid "Achieved compression ratio"
-msgstr "Kompressionsraten ausgeben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:4
-#, fuzzy
 msgid "Dataset creation time"
-msgstr "Vergleiche Monatsnamen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:5
 msgid "Snapshot clones"
@@ -3590,9 +3395,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:8
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:9
-#, fuzzy
 msgid "Logical total space"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:10
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:11
@@ -3600,14 +3404,12 @@ msgid "Logical used space"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:12
-#, fuzzy
 msgid "Is currently mounted?"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:13
-#, fuzzy
 msgid "Source snapshot"
-msgstr "Ja erzwingen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:14
 msgid "Token for interrupted reception resumption"
@@ -3615,14 +3417,12 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:15
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:16
-#, fuzzy
 msgid "Total space"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:17
-#, fuzzy
 msgid "Achieved compression ratio of referenced space"
-msgstr "Zeige den für eine Nachricht benutzten Sitzungsschlüssel an"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:18
 msgid "Total lower-level snapshots"
@@ -3683,24 +3483,20 @@ msgid "%sMax usage by group %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:3
-#, fuzzy
 msgid "Allow overlay mount"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:4
-#, fuzzy
 msgid "SELinux context for the child filesystem"
-msgstr "Nur die Datenbank, nicht das Dateisystem aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:5
-#, fuzzy
 msgid "SELinux context for the filesystem being mounted"
-msgstr "Nur die Datenbank, nicht das Dateisystem aktualisieren"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:6
-#, fuzzy
 msgid "SELinux context for unlabeled files"
-msgstr "Bei unlesbaren Dateien nicht abbrechen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:7
 msgid "SELinux context for the root inode of the filesystem"
@@ -3716,9 +3512,8 @@ msgid "%s: Too many arguments %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_move_last.fish:1
-#, fuzzy
 msgid "Hit end of history…\\n"
-msgstr "Ende des Befehlsverlaufs errreicht ...\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/fish_opt.fish:1
 msgid "%s: The --short flag is required and must be a single character\\n"
@@ -3741,9 +3536,8 @@ msgid "Package"
 msgstr "Paket"
 
 #: /tmp/fish/explicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "python executable not found"
-msgstr "Entfernten Befehl nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:2
 msgid "Editing failed or was cancelled"
@@ -3758,14 +3552,12 @@ msgid "Edit the file again\\? [Y/n]"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:5
-#, fuzzy
 msgid "Cancelled function editing"
-msgstr "Funktionsdefinitonsblock"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:1
-#, fuzzy
 msgid "%s: Could not create configuration directory\\n"
-msgstr "%s: Konnte Startverzeichnis nicht finden\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:2
 msgid "%s: Unknown function '%s'\\n"
@@ -3784,9 +3576,8 @@ msgid "help: Help is being displayed in %s.\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:1
-#, fuzzy
 msgid "%ls: you cannot use any options with the %ls command\\n"
-msgstr "%ls: Sie können keine Option mit dem %ls Befehl verwenden\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:2
 msgid "%ls: %ls expected %d args, got %d\\n"
@@ -3810,9 +3601,8 @@ msgid "You did not say 'yes' so I will not clear your command history\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "%s: Too many arguments"
-msgstr "%s: Zu viele Argumente"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/nextd.fish:1
 #: /tmp/fish/explicit/share/functions/prevd.fish:1
@@ -3836,14 +3626,12 @@ msgid "%s: These flags are not allowed by fish realpath: '%s'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "%s: Expected 1, 2 or 3 arguments, got %d\\n"
-msgstr "%s: Erwartete ein Argument, erhielt %d\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:2
-#, fuzzy
 msgid "%s: '%s' is not a number\\n"
-msgstr "%s: '%s' ist kein Job\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:3
@@ -3867,9 +3655,8 @@ msgid "%s is a builtin\\n"
 msgstr "%s ist ein eingebauter Befehl\\n"
 
 #: /tmp/fish/explicit/share/functions/type.fish:4
-#, fuzzy
 msgid "builtin"
-msgstr "eingebauter Befehl\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:5
 msgid "%s is %s\\n"
@@ -3880,9 +3667,8 @@ msgid "file"
 msgstr "Datei"
 
 #: /tmp/fish/explicit/share/functions/type.fish:7
-#, fuzzy
 msgid "%s: Could not find '%s'\\n"
-msgstr "%s: Konnte '%s' nicht finden"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/umask.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:2
@@ -3902,27 +3688,20 @@ msgid "%s: Value '%s' for flag '%s' greater than max allowed of '%s'\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:1
-#, fuzzy
 msgid "%s: Unknown option %s\\n"
-msgstr "%s: Unbekannte Option %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
-#, fuzzy
 msgid ""
 "%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
 "of %s\\n"
 msgstr ""
-"%s: %s ist eine Feldvariable. Benutzen Sie %svared%s %s[n]%s zum Editieren "
-"den n. Elementes von %s\\n"
 
 #: /tmp/fish/explicit/share/functions/vared.fish:3
-#, fuzzy
 msgid ""
 "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
 "VARIABLE\\n"
 msgstr ""
-"%s: Erwartete genau ein Argument, erhielt %s.\\n\\nSynopsis:\\n\\t%svared%s "
-"VARIABLE\\n"
 
 #: /tmp/fish/implicit/share/config.fish:1
 msgid "Update PATH when fish_user_paths changes"
@@ -3938,9 +3717,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/a2enconf.fish:1
 #: /tmp/fish/implicit/share/completions/a2enmod.fish:1
 #: /tmp/fish/implicit/share/completions/a2ensite.fish:1
-#, fuzzy
 msgid "Don't show informative messages"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/a2disconf.fish:2
 #: /tmp/fish/implicit/share/completions/a2dismod.fish:2
@@ -3949,24 +3727,20 @@ msgid "Purge all traces of module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:1
-#, fuzzy
 msgid "Add abbreviation"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:2
-#, fuzzy
 msgid "Erase abbreviation"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:3
-#, fuzzy
 msgid "Print all abbreviations"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:4
-#, fuzzy
 msgid "Print all abbreviation names"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:5
 #: /tmp/fish/implicit/share/completions/help.fish:11
@@ -3977,24 +3751,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:1
 #: /tmp/fish/implicit/share/completions/grub-install.fish:32
-#, fuzzy
 msgid "Show usage"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:2
-#, fuzzy
 msgid "Use an alternative configuration file"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:3
-#, fuzzy
 msgid "Use an alternative addressbook file"
-msgstr "Muster aus Datei nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:4
-#, fuzzy
 msgid "Make a query for mutt"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:5
 msgid "Read email message from stdin and add the sender"
@@ -4009,41 +3779,35 @@ msgid "Convert address book files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:8
-#, fuzzy
 msgid "Input file format"
-msgstr "Zusätzliches Vollformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:9
-#, fuzzy
 msgid "Output file format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:10
 msgid "Input file (default: stdin)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:11
-#, fuzzy
 msgid "Output file (default: stdout)"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:12
-#, fuzzy
 msgid "Print available formats"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acat.fish:1
 #: /tmp/fish/implicit/share/completions/als.fish:1
 #: /tmp/fish/implicit/share/completions/aunpack.fish:1
-#, fuzzy
 msgid "Archive content"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/accept.fish:1
 #: /tmp/fish/implicit/share/completions/cupsaccept.fish:1
-#, fuzzy
 msgid "Accept reason"
-msgstr "Zu akzeptierende Protokolle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:1
 #: /tmp/fish/implicit/share/completions/grep.fish:23
@@ -4052,93 +3816,76 @@ msgid "Ignore case"
 msgstr "Gross-/Kleinschreibung ignorieren"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:2
-#, fuzzy
 msgid "Ignore case when pattern contains no uppercase"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:3
-#, fuzzy
 msgid "Don't ignore case"
-msgstr "Gross-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:4
-#, fuzzy
 msgid "Invert match"
-msgstr "Bedeutung der Treffer umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:5
-#, fuzzy
 msgid "Match only whole words"
-msgstr "Nur vollständig übereinstimmende Worte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:6
-#, fuzzy
 msgid "Quote all metacharacters"
-msgstr "Benutze per 'backslash (\\)'maskierte Zeichen "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:7
-#, fuzzy
 msgid "Only print line(s) NUM of each file"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:8
-#, fuzzy
 msgid "Only print filenames containing matches"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:9
-#, fuzzy
 msgid "Only print filenames with no matches"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:10
 msgid "Output the evaluation of Perl expression for each line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:11
-#, fuzzy
 msgid "Output the part of line matching pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:12
-#, fuzzy
 msgid "Print all lines"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:13
-#, fuzzy
 msgid "Specify pattern explicitly"
-msgstr "Vertrauensmodell angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:14
-#, fuzzy
 msgid "Stop searching in each file after NUM matches"
-msgstr "Lesen nach NUM Treffern beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:15
-#, fuzzy
 msgid "Stop searching after first match"
-msgstr "Lesen nach NUM Treffern beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:16
-#, fuzzy
 msgid "Print the filename for each match"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:17
-#, fuzzy
 msgid "Suppress the prefixing filename on output"
-msgstr "Dateinamenausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:18
-#, fuzzy
 msgid "Show number of lines matching per file"
-msgstr "Anzeigen, wer eine Datei beobachtet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:19
-#, fuzzy
 msgid "Show column number of first match"
-msgstr "Befehlsnamen eines jeden Jobs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:20
 msgid "Don't show column number of first match"
@@ -4164,19 +3911,16 @@ msgid "Print null byte as separator between filenames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:25
-#, fuzzy
 msgid "Suppress error messages about file errors"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:26
-#, fuzzy
 msgid "Pipes all ack output through command"
-msgstr "Ausgabe durch angegebenen Befehl schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:27
-#, fuzzy
 msgid "Do not send output through a pager"
-msgstr "Ausgabe durch 'pr' schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:28
 msgid "Prints a filename heading above file's results"
@@ -4187,9 +3931,8 @@ msgid "Don't print a filename heading above file's results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:30
-#, fuzzy
 msgid "Print a break between results"
-msgstr "Wartezeiten zwischen Abrufversuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:31
 msgid "Don't print a break between results"
@@ -4204,9 +3947,8 @@ msgid "No filename heading and no line breaks between results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:34
-#, fuzzy
 msgid "Highlight the matching text"
-msgstr "Ein Suchziel hervorheben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:35
 msgid "Don't highlight the matching text"
@@ -4217,9 +3959,8 @@ msgid "Set the color for filenames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:37
-#, fuzzy
 msgid "Set the color for matches"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:38
 msgid "Set the color for line numbers"
@@ -4230,14 +3971,12 @@ msgid "Flush output immediately"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:40
-#, fuzzy
 msgid "Only print the files selected"
-msgstr "Nur einmalige Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:41
-#, fuzzy
 msgid "Only select files matching pattern"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:42
 msgid "Sort the found files lexically"
@@ -4248,38 +3987,32 @@ msgid "Show which types each file has"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:44
-#, fuzzy
 msgid "Read the list of files to search from file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:45
 msgid "Read the list of files to search from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:46
-#, fuzzy
 msgid "Ignore directory"
-msgstr "include-Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:47
-#, fuzzy
 msgid "Don't ignore directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:48
-#, fuzzy
 msgid "Add filter for ignoring files"
-msgstr "Datentyp für Binärdateien unterstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:49
-#, fuzzy
 msgid "Recurse into subdirectories"
-msgstr "in Unterverzeichnis verzweigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:50
-#, fuzzy
 msgid "No descending into subdirectories"
-msgstr "Aktion für Verzeichnisse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:51
 #: /tmp/fish/implicit/share/completions/file.fish:7
@@ -4298,83 +4031,70 @@ msgid "Don't follow symlinks"
 msgstr "Symbolischen Links nicht folgen"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:53
-#, fuzzy
 msgid "Include only recognized files"
-msgstr "Nur die folgenden Namen einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:54
-#, fuzzy
 msgid "Include only X files"
-msgstr "Nur die folgenden Namen einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:55
 msgid "Replaces definition of type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:56
-#, fuzzy
 msgid "Specify definition of type"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:57
-#, fuzzy
 msgid "Removes all filters associated with type"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:58
-#, fuzzy
 msgid "Ignores environment variables and ackrc files"
-msgstr "Umgebungsvariablen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:59
-#, fuzzy
 msgid "Specifies location of ackrc file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:60
-#, fuzzy
 msgid "Ignore default definitions ack includes"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:61
-#, fuzzy
 msgid "Outputs default ackrc"
-msgstr "Standardaktion für mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:62
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:1
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:2
-#, fuzzy
 msgid "Shows help"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:63
-#, fuzzy
 msgid "Shows all known types"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:64
 msgid "Dump information on which options are loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:65
-#, fuzzy
 msgid "Forces ack to treat input as a pipe"
-msgstr "Die Eingabe aus einer Pipe erwarten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:66
 msgid "Forces ack to treat input as tty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:67
-#, fuzzy
 msgid "Shows man page"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:68
-#, fuzzy
 msgid "Displays version and copyright"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:69
 msgid "Bill the Cat"
@@ -4385,34 +4105,28 @@ msgid "The warning admiral"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:1
-#, fuzzy
 msgid "Show battery information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:2
-#, fuzzy
 msgid "Suppress battery information"
-msgstr "Informationelle Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:3
-#, fuzzy
 msgid "Show thermal information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:4
-#, fuzzy
 msgid "Suppress thermal information"
-msgstr "Informationelle Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:5
-#, fuzzy
 msgid "Show ac adapter information"
-msgstr "apropos-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:6
-#, fuzzy
 msgid "Suppress ac-adapter information"
-msgstr "Informationelle Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:7
 msgid "Show every device, overrides above options"
@@ -4580,14 +4294,12 @@ msgstr "Hilfe anzeigen und beenden"
 #: /tmp/fish/implicit/share/completions/timeout.fish:5
 #: /tmp/fish/implicit/share/completions/watch.fish:12
 #: /tmp/fish/implicit/share/completions/xgettext.fish:39
-#, fuzzy
 msgid "Output version information and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:1
-#, fuzzy
 msgid "Test if adb has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:2
 msgid "Run adb devices and parse output"
@@ -4610,29 +4322,24 @@ msgid "Communicate with emulator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:7
-#, fuzzy
 msgid "Connect to device"
-msgstr "Aktion für Gerätedateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:8
-#, fuzzy
 msgid "Disconnect from device"
-msgstr "Aktion für Gerätedateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:9
-#, fuzzy
 msgid "List all connected devices"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:10
-#, fuzzy
 msgid "Copy file to device"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:11
-#, fuzzy
 msgid "Copy file from device"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:12
 msgid "Copy host->device only if changed"
@@ -4651,51 +4358,44 @@ msgid "View device log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:16
-#, fuzzy
 msgid "Install package"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:17
-#, fuzzy
 msgid "Uninstall package"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:18
 msgid "List PIDs of processes hosting a JDWP transport"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:19
-#, fuzzy
 msgid "Port forwarding"
-msgstr "Dynamische Port-Weiterleitung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:20
-#, fuzzy
 msgid "Return bugreport information"
-msgstr "Keine Gruppeninformation ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:21
-#, fuzzy
 msgid "Perform device backup"
-msgstr "Trennung ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:22
 msgid "Restore device from backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:23
-#, fuzzy
 msgid "Show adb version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:24
 msgid "Show adb help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:25
-#, fuzzy
 msgid "Block until device is online"
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:26
 msgid "Ensure that there is a server running"
@@ -4714,24 +4414,20 @@ msgid "Reboots the device, optionally into the bootloader or recovery program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:30
-#, fuzzy
 msgid "Prints state of the device"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:31
-#, fuzzy
 msgid "Prints serial number of the device"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:32
-#, fuzzy
 msgid "Prints device path"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:33
-#, fuzzy
 msgid "Continuously print the device status"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:34
 msgid "Restart the adbd daemon with root permissions"
@@ -4750,9 +4446,8 @@ msgid "Run PPP over USB"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:38
-#, fuzzy
 msgid "Sideloads the given package"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:39
 msgid "Kick current connection from host side and make it reconnect."
@@ -4763,46 +4458,40 @@ msgid "Forward-lock the app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:41
-#, fuzzy
 msgid "Reinstall the app keeping its data"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:42
 msgid "Install on SD card instead of internal storage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:43
-#, fuzzy
 msgid "Algorithm name"
-msgstr "MAC-Algorithmus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:44
 msgid "Hex-encoded key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:45
-#, fuzzy
 msgid "Hex-encoded iv"
-msgstr "Standardeingabe umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:46
-#, fuzzy
 msgid "Keep the data and cache directories"
-msgstr "Keine Verzeichnis-Hierarchie erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:47
 msgid "Also list device qualifiers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:48
-#, fuzzy
 msgid "Device to disconnect"
-msgstr "Geräte-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:49
-#, fuzzy
 msgid "File to write backup data to"
-msgstr "Beschreibung des Patchpaketes editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:50
 msgid "Enable backup of the .apks themselves"
@@ -4830,14 +4519,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:56
-#, fuzzy
 msgid "Back up all installed applications"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:57
-#, fuzzy
 msgid "Include system applications in -all (default)"
-msgstr "Dokumentationsdateien installieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:58
 msgid "Exclude system applications in -all"
@@ -4848,9 +4535,8 @@ msgid "Package(s) to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "Funktionen auflisten oder entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4861,9 +4547,8 @@ msgid "Remove a specific forward socket connection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:63
-#, fuzzy
 msgid "Remove all forward socket connections"
-msgstr "entfernt weitergeleitete Ports"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:64
 msgid "Kick current connection from device side and make it reconnect."
@@ -4910,14 +4595,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:8
-#, fuzzy
 msgid "Display brief instructions"
-msgstr "Kompressionsrate anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:9
-#, fuzzy
 msgid "Use specified directory as the user's home directory"
-msgstr "Angegebenen Schlüssel als Schlüssel zum Signieren verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:10
 msgid ""
@@ -4932,9 +4615,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:12
-#, fuzzy
 msgid "Do not create the home directory, even if it doesni't exist"
-msgstr "Keine Verzeichnis-Hierarchie erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:13
 msgid "Suppress informational messages, only show warnings and errors"
@@ -4949,9 +4631,8 @@ msgid "Create a system user or group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:16
-#, fuzzy
 msgid "Force the new userid to be the given number"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:17
 msgid ""
@@ -4970,9 +4651,8 @@ msgid "Add new user to extra groups defined in the configuration file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:20
-#, fuzzy
 msgid "Display version and copyright information"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:1
 msgid "Save current driver state"
@@ -4991,18 +4671,16 @@ msgid "Try to restore control elements as much as possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:5
-#, fuzzy
 msgid "Ignore missing soundcards"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:6
 msgid "Do not restore mismatching control elements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:7
-#, fuzzy
 msgid "Do not init if restore fails"
-msgstr "Zeilen nicht ohne Begrenzer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:8
 msgid "Initialize all devices to a default state"
@@ -5021,43 +4699,36 @@ msgid "Notify daemon to do an operation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:12
-#, fuzzy
 msgid "Monitor events"
-msgstr "Benutzer beobachten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:13
-#, fuzzy
 msgid "Show available flags and commands"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:14
 msgid "Make output a bit more verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:15
-#, fuzzy
 msgid "Print alsactl version number"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:16
-#, fuzzy
 msgid "Select the configuration file to use"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:17
-#, fuzzy
 msgid "Use a lock file"
-msgstr "1B-Blockgröße verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:18
-#, fuzzy
 msgid "Do not use a lock file"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:19
-#, fuzzy
 msgid "Select the state lock file path"
-msgstr "Schnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:20
 msgid "Save restore and init state to this file"
@@ -5068,33 +4739,28 @@ msgid "Remove runstate file at first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:22
-#, fuzzy
 msgid "Set environment variable"
-msgstr "Behandlung von Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:23
-#, fuzzy
 msgid "The configuration file for init"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:24
 msgid "The store period in seconds for the daemon command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:25
-#, fuzzy
 msgid "The PID file to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:26
-#, fuzzy
 msgid "Run the task in background"
-msgstr "Job im Hintergrund ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:27
-#, fuzzy
 msgid "Use syslog for messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:28
 msgid "Set the process priority (see 'man nice')"
@@ -5124,52 +4790,44 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
 #: /tmp/fish/implicit/share/completions/yast2.fish:2
-#, fuzzy
 msgid "Show help"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:2
-#, fuzzy
 msgid "Soundcard number or id to use"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:3
-#, fuzzy
 msgid "Mixer device to control"
-msgstr "Bereichskontrolle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:4
-#, fuzzy
 msgid "Starting view mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:5
-#, fuzzy
 msgid "Toggle the using of colors"
-msgstr "Anzeige des entfernten Rechners ein/ausschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:6
 msgid "Mixer abstraction level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:1
-#, fuzzy
 msgid "this help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:2
-#, fuzzy
 msgid "select the card"
-msgstr "Auswahl per Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:3
 msgid "select the device, default 'default'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:4
-#, fuzzy
 msgid "debug mode"
-msgstr "Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:5
 msgid "do not perform range checking"
@@ -5180,24 +4838,20 @@ msgid "print version of this program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:7
-#, fuzzy
 msgid "be quiet"
-msgstr "Erzwungene Beendigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:8
-#, fuzzy
 msgid "show also inactive controls"
-msgstr "Interaktiven Modus erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:9
-#, fuzzy
 msgid "select abstraction level"
-msgstr "Eine Aktion auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:10
-#, fuzzy
 msgid "Read and execute commands from stdin sequentially"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:1
 #: /tmp/fish/implicit/share/completions/compare.fish:1
@@ -5381,9 +5035,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:21
 #: /tmp/fish/implicit/share/completions/display.fish:23
-#, fuzzy
 msgid "Displayed image cannot be modified"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:22
 #: /tmp/fish/implicit/share/completions/compare.fish:18
@@ -5442,9 +5095,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:50
 #: /tmp/fish/implicit/share/completions/montage.fish:40
 #: /tmp/fish/implicit/share/completions/stream.fish:14
-#, fuzzy
 msgid "Monitor progress "
-msgstr "Benutzer beobachten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:28
 msgid "Seconds to pause before reanimating"
@@ -5479,9 +5131,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:60
 #: /tmp/fish/implicit/share/completions/montage.fish:47
 #: /tmp/fish/implicit/share/completions/stream.fish:16
-#, fuzzy
 msgid "Suppress all warning messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:32
 #: /tmp/fish/implicit/share/completions/compare.fish:28
@@ -5593,9 +5244,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:80
 #: /tmp/fish/implicit/share/completions/montage.fish:68
 #: /tmp/fish/implicit/share/completions/stream.fish:27
-#, fuzzy
 msgid "Print detailed information about the image"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:42
 #: /tmp/fish/implicit/share/completions/display.fish:49
@@ -5643,9 +5293,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/identify.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:23
 #: /tmp/fish/implicit/share/completions/stream.fish:8
-#, fuzzy
 msgid "Extract area from image [geometry]"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:48
 #: /tmp/fish/implicit/share/completions/composite.fish:60
@@ -5710,17 +5359,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/animate.fish:56
 #: /tmp/fish/implicit/share/completions/display.fish:88
 #: /tmp/fish/implicit/share/completions/montage.fish:92
-#, fuzzy
 msgid "Merge a sequence of images"
-msgstr "Name statt Nummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:57
 #: /tmp/fish/implicit/share/completions/display.fish:89
 #: /tmp/fish/implicit/share/completions/mogrify.fish:33
 #: /tmp/fish/implicit/share/completions/montage.fish:77
-#, fuzzy
 msgid "Flatten a sequence of images"
-msgstr "Name statt Nummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:58
 #: /tmp/fish/implicit/share/completions/compare.fish:40
@@ -5731,9 +5378,8 @@ msgstr "Name statt Nummer ausgeben"
 #: /tmp/fish/implicit/share/completions/import.fish:65
 #: /tmp/fish/implicit/share/completions/montage.fish:100
 #: /tmp/fish/implicit/share/completions/stream.fish:29
-#, fuzzy
 msgid "Display copious debugging information [events]"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:59
 #: /tmp/fish/implicit/share/completions/compare.fish:41
@@ -5744,9 +5390,8 @@ msgstr "Zeigt Benutzungsinformation für den Befehl"
 #: /tmp/fish/implicit/share/completions/import.fish:53
 #: /tmp/fish/implicit/share/completions/montage.fish:101
 #: /tmp/fish/implicit/share/completions/stream.fish:30
-#, fuzzy
 msgid "Print program options"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:60
 #: /tmp/fish/implicit/share/completions/compare.fish:42
@@ -5822,9 +5467,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:11
 #: /tmp/fish/implicit/share/completions/xz.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:12
-#, fuzzy
 msgid "Display help"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:4
 #: /tmp/fish/implicit/share/completions/base64.fish:5
@@ -5832,50 +5476,41 @@ msgstr "Handbuchseite anzeigen"
 #: /tmp/fish/implicit/share/completions/lscpu.fish:9
 #: /tmp/fish/implicit/share/completions/netctl.fish:2
 #: /tmp/fish/implicit/share/completions/xz.fish:38
-#, fuzzy
 msgid "Display version"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:5
-#, fuzzy
 msgid "Enable colored output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:6
 #: /tmp/fish/implicit/share/completions/magento.fish:25
-#, fuzzy
 msgid "Disable colored output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:7
-#, fuzzy
 msgid "Modify or list configuration items"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:8
-#, fuzzy
 msgid "Set config item"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:9
-#, fuzzy
 msgid "Get config item"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:10
-#, fuzzy
 msgid "Delete config item"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:11
-#, fuzzy
 msgid "List config items"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:12
-#, fuzzy
 msgid "Edit config items"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:13
 msgid "Reduce duplication in node_modules in current directory"
@@ -5904,9 +5539,8 @@ msgid "Open a package's homepage in the default browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:19
-#, fuzzy
 msgid "Print URL instead of opening"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:20
 msgid "Output featured packages as JSON array"
@@ -5915,37 +5549,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/apm.fish:21
 #: /tmp/fish/implicit/share/completions/apm.fish:45
 #: /tmp/fish/implicit/share/completions/apm.fish:73
-#, fuzzy
 msgid "Only list themes"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:22
 msgid "Only list packages/themes compatible with specified Atom version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:23
-#, fuzzy
 msgid "Generates code scaffolding for theme or package"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:24
 msgid "Path to the package or theme template"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:25
-#, fuzzy
 msgid "Generates a basic package"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:26
-#, fuzzy
 msgid "Generates a basic theme"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:27
-#, fuzzy
 msgid "Generates a basic language package"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:28
 msgid "Convert TextMate bundle/theme"
@@ -5961,25 +5590,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:31
 #: /tmp/fish/implicit/share/completions/apm.fish:52
-#, fuzzy
 msgid "Show verbose debug information"
-msgstr "apropos-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:32
-#, fuzzy
 msgid "Specify text file containing packages to install"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:33
-#, fuzzy
 msgid "Do not install dev dependencies"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:34
 #: /tmp/fish/implicit/share/completions/apm.fish:51
-#, fuzzy
 msgid "Only install packages/themes compatible with specified Atom version"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:35
 msgid "Set npm log level to silent"
@@ -5998,51 +5623,44 @@ msgid "Link to ~/.atom/dev/packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:39
-#, fuzzy
 msgid "List all installed and bundled packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:40
 msgid "Print packages one per line with no formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:41
-#, fuzzy
 msgid "Include dev packages"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:42
-#, fuzzy
 msgid "Only list installed packages/themes"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:43
 msgid "Output all packages as a JSON object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:44
-#, fuzzy
 msgid "Include linked packages"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:46
-#, fuzzy
 msgid "Only list packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:47
 msgid "Save Atom API token to keychain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:48
-#, fuzzy
 msgid "Specify API token"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:49
-#, fuzzy
 msgid "Upgrade out of date packages"
-msgstr "Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:50
 msgid "Output outdated packages as JSON array"
@@ -6053,56 +5671,48 @@ msgid "Confirm before installing updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:54
-#, fuzzy
 msgid "List but don't install the outdated packages"
-msgstr "Installierte(s) Quellpaket(e) auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:55
-#, fuzzy
 msgid "Publish new version of package in current working directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:56
 msgid "Semantic version category for new version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:57
-#, fuzzy
 msgid "Specify a tag to publish"
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:58
-#, fuzzy
 msgid "Specify a new name for the package"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:59
 msgid "Rebuild modules installed in node_modules in current working directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:60
-#, fuzzy
 msgid "Rebuild module cache for installed packages"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:61
-#, fuzzy
 msgid "Search for Atom packages/themes in the atom.io registry"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:62
 msgid "Output matching packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:63
-#, fuzzy
 msgid "Search only non-theme packages"
-msgstr "In allen Handbuchseiten suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:64
-#, fuzzy
 msgid "Search only themes"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:65
 msgid "View information about package/theme in the atom.io registry"
@@ -6113,46 +5723,40 @@ msgid "Output as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:67
-#, fuzzy
 msgid "Show latest version compatible with specified Atom version"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:68
 msgid "Star the given packages on https://atom.io"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:69
-#, fuzzy
 msgid "Star all packages in ~/.atom/packages"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:70
-#, fuzzy
 msgid "List or install starred Atom packages and themes"
-msgstr "Installierte(s) Quellpaket(e) auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:71
 msgid "Output packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:72
-#, fuzzy
 msgid "Install the starred packages"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:74
 msgid "GitHub username to show starred packages for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:75
-#, fuzzy
 msgid "Runs the package's tests contained within the spec directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
-#, fuzzy
 msgid "Path to atom command"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:77
 msgid "Delete the symlink in ~/.atom/packages for the package"
@@ -6167,9 +5771,8 @@ msgid "Remove published package or version from the atom.io registry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:82
-#, fuzzy
 msgid "Do not prompt for confirmation"
-msgstr "Nicht nach einer Ablaufzeit fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:83
 msgid "Unstar given packages on https://atom.io"
@@ -6342,9 +5945,8 @@ msgid "Keyword as regex"
 msgstr "Schlüsselwort als regulärer Ausdruck"
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:6
-#, fuzzy
 msgid "Keyword as wildcards"
-msgstr "Schlüsselwort als Muster"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:7
 msgid "Keyword as exactly match"
@@ -6457,9 +6059,8 @@ msgstr "Bei allen Fragen ja annehmen"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:24
 #: /tmp/fish/implicit/share/completions/apt-get.fish:35
-#, fuzzy
 msgid "Use purge instead of remove"
-msgstr "purge anstelle von remove verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:25
 msgid "Do not run update"
@@ -6706,15 +6307,13 @@ msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:3
 #: /tmp/fish/implicit/share/completions/snap.fish:2
-#, fuzzy
 msgid "Test if given subcommand is used"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:7
 #: /tmp/fish/implicit/share/completions/git.fish:4
-#, fuzzy
 msgid "Set a configuration option"
-msgstr "Konfigurationsoption festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:8
 #: /tmp/fish/implicit/share/completions/hugo.fish:1
@@ -6726,9 +6325,8 @@ msgid "Configuration file"
 msgstr "Konfigurationsdatei"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:9
-#, fuzzy
 msgid "Target release"
-msgstr "Zielzeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
 msgid "Generate package from source"
@@ -6805,14 +6403,12 @@ msgid "Install one or more packages"
 msgstr "Ein oder mehrere Paket(e) installieren"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:10
-#, fuzzy
 msgid "Display changelog of one or more packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:11
-#, fuzzy
 msgid "Remove and purge one or more packages"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:12
 msgid "Remove one or more packages"
@@ -6839,14 +6435,12 @@ msgid "Clean packages no longer be downloaded"
 msgstr "Pakete, die nicht länger heruntergeladen werden, bereinigen"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:18
-#, fuzzy
 msgid "Remove automatically installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:19
-#, fuzzy
 msgid "Do not install recommended packages"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:20
 #: /tmp/fish/implicit/share/completions/aptitude.fish:28
@@ -6867,32 +6461,28 @@ msgid "Disable downloading packages"
 msgstr "Herunterladen von Paketen deaktivieren"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:25
-#, fuzzy
 msgid "Perform a simulation"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:26
 msgid "Automatic yes to prompts"
 msgstr "Automatisch Ja für Abfragen verwenden"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:27
-#, fuzzy
 msgid "Show upgraded packages"
-msgstr "Pakete nicht aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:28
-#, fuzzy
 msgid "Show full versions for packages"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:29
 msgid "Compile source packages"
 msgstr "Quellpakete kompilieren"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:30
-#, fuzzy
 msgid "Install recommended packages"
-msgstr "Quellpakete installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:31
 msgid "Ignore package Holds"
@@ -6907,14 +6497,12 @@ msgid "Force yes"
 msgstr "Ja erzwingen"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:34
-#, fuzzy
 msgid "Print the URIs"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:36
-#, fuzzy
 msgid "Reinstall packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:37
 msgid "Erase obsolete files"
@@ -6963,64 +6551,52 @@ msgid "Set a config option"
 msgstr "Konfigurationsoption festlegen"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:1
-#, fuzzy
 msgid "Test if aptitude has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:2
-#, fuzzy
 msgid "Test if aptitude command should have packages as potential completion"
 msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:4
 msgid "Display a brief help message. Identical to the help action"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:5
-#, fuzzy
 msgid "Remove any cached packages which can no longer be downloaded"
-msgstr "Pakete, die nicht länger heruntergeladen werden, bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:6
-#, fuzzy
 msgid "Remove all downloaded .deb files from the package cache directory"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:7
-#, fuzzy
 msgid "Forget all internal information about what packages are 'new'"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:8
-#, fuzzy
 msgid "Cancel all scheduled actions on all packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:9
-#, fuzzy
 msgid "Update the list of available packages from the apt sources"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:10
-#, fuzzy
 msgid "Upgrade installed packages to their most recent version"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:11
-#, fuzzy
 msgid "Download and displays the Debian changelog for the packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:12
-#, fuzzy
 msgid "Upgrade, removing or installing packages as necessary"
-msgstr "Neueste Pakete aktualisieren oder installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:13
-#, fuzzy
 msgid "Download the packages to the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:14
 msgid "Forbid the upgrade to a particular version"
@@ -7031,52 +6607,44 @@ msgid "Ignore the packages by future upgrade commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:16
-#, fuzzy
 msgid "Install the packages"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:17
-#, fuzzy
 msgid "Cancel any scheduled actions on the packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:18
-#, fuzzy
 msgid "Mark packages as automatically installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:19
 msgid "Remove and delete all associated configuration and data files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:20
-#, fuzzy
 msgid "Reinstall the packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:21
-#, fuzzy
 msgid "Remove the packages"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:22
-#, fuzzy
 msgid "Display detailed information about the packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:23
 msgid "Consider the packages by future upgrade commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:24
-#, fuzzy
 msgid "Mark packages as manually installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:25
-#, fuzzy
 msgid "Search for packages matching one of the patterns"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:26
 msgid "Display brief summary of the available commands and options"
@@ -7087,23 +6655,20 @@ msgid "Show explanations of automatic installations and removals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:30
-#, fuzzy
 msgid "Purge packages that are not required by any installed package"
-msgstr "Pakete abfragen, die von den angegebenen Paketen aktiviert werden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:31
 msgid "Always display a prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:32
-#, fuzzy
 msgid "Do not treat recommendations as dependencies"
-msgstr "Nicht nach zusätzlichen Abhängigkeiten fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:33
-#, fuzzy
 msgid "Treat recommendations as dependencies"
-msgstr "Zerstörte Abhängigkeiten korrigieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:34
 msgid "Don't perform the actions. Just show them"
@@ -7118,37 +6683,32 @@ msgid "Suppress incremental progress indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:37
-#, fuzzy
 msgid "Show which versions of packages will be installed"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:38
-#, fuzzy
 msgid "Display extra information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:39
-#, fuzzy
 msgid "Display the version of aptitude and compile information"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:40
 msgid "Start up the visual interface and display its preview screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:41
-#, fuzzy
 msgid "Assume the answer yes for all question prompts"
-msgstr "Bei allen Fragen ja annehmen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:42
 msgid "Show how much disk space will be used or freed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:43
-#, fuzzy
 msgid "Specify the format to be used by the search command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:44
 msgid "Set the release from which packages should be installed"
@@ -7159,9 +6719,8 @@ msgid "Specify the order for the output from the search command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:46
-#, fuzzy
 msgid "Set a configuration file option directly"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:47
 msgid "Specify the display width for the output from the search command"
@@ -7261,9 +6820,8 @@ msgid "Assume no to all questions"
 msgstr "Für alle Fragen nein annehmen"
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:22
-#, fuzzy
 msgid "List bugs from packages"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:23
 msgid "List bugs in rss format"
@@ -7274,9 +6832,8 @@ msgid "Read filenames from pipe"
 msgstr "Dateinamen über Pipe lesen"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:4
-#, fuzzy
 msgid "Select frontend interface"
-msgstr "Benutzerschnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:5
 #: /tmp/fish/implicit/share/completions/darcs.fish:749
@@ -7296,9 +6853,8 @@ msgid "Avoid changelogs from db in named file"
 msgstr "Änderungsprotokolle aus der Datenbank der benannten Datei vermeiden"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:9
-#, fuzzy
 msgid "Select display"
-msgstr "X Server-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:10
 msgid "Insert header"
@@ -7314,49 +6870,40 @@ msgid "Select an option profile"
 msgstr "Optionsprofil auswählen"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:5
-#, fuzzy
 msgid "Mark a package as automatically installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:6
-#, fuzzy
 msgid "Mark a package as manually installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:7
-#, fuzzy
 msgid "Hold a package, prevent automatic installation or removal"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:8
-#, fuzzy
 msgid "Cancel a hold on a package"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:9
-#, fuzzy
 msgid "Show automatically installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:10
-#, fuzzy
 msgid "Show manually installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:11
-#, fuzzy
 msgid "Show held packages"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:15
-#, fuzzy
 msgid "Write package statistics to a file"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:1
-#, fuzzy
 msgid "Generate master file"
-msgstr "Veröffentlichungsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:2
 msgid "Alias for 'get'"
@@ -7399,16 +6946,12 @@ msgid "Sync packages installed"
 msgstr "Installierte Pakete synchronisieren"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:13
-#, fuzzy
 msgid "Move file specified on commandline"
-msgstr "Die auf der Befehlszeile angegebene Datei verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:14
-#, fuzzy
 msgid "List packages that may serve as input to mirrorbin or mirrorsource"
 msgstr ""
-"Pakete auflisten, die als Quelle für mirrorbin oder mirrorsource dienen "
-"können"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:15
 msgid "Fetch package from STDIN"
@@ -7459,9 +7002,8 @@ msgid "Debug level[default 0]"
 msgstr "Debug-Grad [Standard 0]"
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:2
-#, fuzzy
 msgid "Show build dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:3
 msgid "Generate a dotty graph"
@@ -7476,16 +7018,12 @@ msgid "List packages depending on"
 msgstr "Pakete auflisten, die abhängen von "
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:6
-#, fuzzy
 msgid "Comma-separated list of dependency types to follow recursively"
 msgstr ""
-"Komma-getrennte Liste der Abhängigkeitstypen, die rekursiv abgearbeitet "
-"werden"
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:7
-#, fuzzy
 msgid "Comma-separated list of dependency types to show"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:8
 msgid ""
@@ -7509,9 +7047,8 @@ msgid "Probe a CD"
 msgstr "Eine CD testen"
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
-#, fuzzy
 msgid "Run in non-interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
@@ -7572,9 +7109,8 @@ msgid "Specify conffile"
 msgstr "Konfigurationsdatei angeben"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:2
-#, fuzzy
 msgid "Debian distribution"
-msgstr "Debian-Distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:3
 msgid "Servers in the areas"
@@ -7589,9 +7125,8 @@ msgid "Finish after number of servers"
 msgstr "Nach Anzahl der Server beenden"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:6
-#, fuzzy
 msgid "File to grab servers"
-msgstr "Datei für Serverantworten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:7
 msgid "File as input"
@@ -7734,9 +7269,8 @@ msgstr "Eine Aktion auswählen"
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:5
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:5
-#, fuzzy
 msgid "List of packages to install"
-msgstr "Installierte Pakete synchronisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:6
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:6
@@ -7761,79 +7295,65 @@ msgid "Reject protocols"
 msgstr "Abzulehnende Protokolle"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:1
-#, fuzzy
 msgid "Debugging command"
-msgstr "Debugger-Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:2
 #: /tmp/fish/implicit/share/completions/arc.fish:4
-#, fuzzy
 msgid "Don't use color or style for output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:3
-#, fuzzy
 msgid "Always use fromatting"
-msgstr "immer neuformatieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:5
-#, fuzzy
 msgid "Specify which libraies to load"
-msgstr "sendmail-Befehl angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:6
-#, fuzzy
 msgid "Specify the Conduit URI"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:7
-#, fuzzy
 msgid "Specify the Conduit token"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:8
-#, fuzzy
 msgid "Force a version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:9
-#, fuzzy
 msgid "Sets the timeout"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:10
-#, fuzzy
 msgid "Sets a config"
-msgstr "Konfigurationsoption festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:11
-#, fuzzy
 msgid "Skip the working copy configuration file"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:12
-#, fuzzy
 msgid "Use provided file instead of ~/.arcrc"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:13
-#, fuzzy
 msgid "Implements shell completion"
-msgstr "Keine Dateinamenvervollständigung benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:14
 msgid "Current term in the argument list being completed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:15
-#, fuzzy
 msgid "Reads an arc configuration option"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
-#, fuzzy
 msgid "Show detailed information about options"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:17
 msgid "Download a file to local disk"
@@ -7844,9 +7364,8 @@ msgid "Save the file with a specific name rather than the default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:19
-#, fuzzy
 msgid "Write file to stdout instead of to disk"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:20
 msgid "List your open Differential revisions"
@@ -7861,14 +7380,12 @@ msgid "Override configured lint engine for this project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:23
-#, fuzzy
 msgid "Apply patches suggested by lint to the working copy"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:24
-#, fuzzy
 msgid "Set minimum message severity"
-msgstr "Schwere festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:25
 #: /tmp/fish/implicit/share/completions/arc.fish:176
@@ -7876,14 +7393,12 @@ msgid "Never apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:26
-#, fuzzy
 msgid "Lint changes since a specific revision"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:27
-#, fuzzy
 msgid "Output the linter results to a file"
-msgstr "rss-Data in Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:28
 msgid "Show all lint warnings, not just those on changed lines"
@@ -7895,9 +7410,8 @@ msgid "When linting git repositories, amend HEAD with all patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:30
-#, fuzzy
 msgid "Lint all files in the project"
-msgstr "Alle Dateien als Text behandeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:31
 msgid "Specify how results will be displayed"
@@ -7921,9 +7435,8 @@ msgid "In the first form, list objects you've flagged"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:36
-#, fuzzy
 msgid "Edit the flag on an object"
-msgstr "Standardmäßig den langen Kommentar editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:37
 msgid "Set the color of a flag"
@@ -7934,14 +7447,12 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "Setzen der Terminalfarbe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
-#, fuzzy
 msgid "Export the local changeset to a file"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:41
 msgid "Export change as a unified patch"
@@ -8001,9 +7512,8 @@ msgid "what they do and which versions are installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:55
-#, fuzzy
 msgid "Search for linters"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:56
 msgid "Show detailed information, including options"
@@ -8018,24 +7528,20 @@ msgid "Stop tracking work in Phrequent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:59
-#, fuzzy
 msgid "A note to attach to the tracked time"
-msgstr "An den Tracker zu sendende IP-Adresse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:60
-#, fuzzy
 msgid "Create an alias"
-msgstr "Archiv erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:61
-#, fuzzy
 msgid "Sets an arc configuration option"
-msgstr "Konfigurationsoption festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:62
-#, fuzzy
 msgid "Set a local config value instead of a user one"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:63
 msgid "Start tracking work in Phrequent"
@@ -8050,9 +7556,8 @@ msgid "Provide a comment with your status change"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:66
-#, fuzzy
 msgid "Show available status options and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:67
 msgid "Publish an accepted revision after review"
@@ -8100,18 +7605,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:78
 #: /tmp/fish/implicit/share/completions/arc.fish:86
-#, fuzzy
 msgid "Use the message from a specific revision"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:79
 msgid "Show which commits will be selected"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:80
-#, fuzzy
 msgid "Print base commit only and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:81
 #: /tmp/fish/implicit/share/completions/arc.fish:173
@@ -8119,9 +7622,8 @@ msgid "Additional rules for determining base revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:82
-#, fuzzy
 msgid "Specify the end of the commit range to select"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:83
 msgid "Show committed and abandoned revisions"
@@ -8129,81 +7631,68 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:84
 #: /tmp/fish/implicit/share/completions/arc.fish:114
-#, fuzzy
 msgid "Alias for arc feature"
-msgstr "Alias für atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
-#, fuzzy
 msgid "Show the amended commit message"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:88
-#, fuzzy
 msgid "Upgrade arcanist and libphutil to the latest versions"
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:89
-#, fuzzy
 msgid "Shows the help"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:92
-#, fuzzy
 msgid "Language for syntax highlighting"
-msgstr "Keine Hervorhebung bei Suche"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:93
-#, fuzzy
 msgid "Output in JSON format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:94
-#, fuzzy
 msgid "Title for the paste"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:95
 msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
-#, fuzzy
 msgid "Do not run any sanity checks"
-msgstr "Aktualisierung nicht durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:101
-#, fuzzy
 msgid "Do not commit the changes"
-msgstr "Änderungen nicht zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:102
 msgid "Update the local working copy before applying the patch"
@@ -8214,23 +7703,20 @@ msgid "Apply changes from a git patch file or unified patch file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:104
-#, fuzzy
 msgid "Apply changes from an arc bundlej"
-msgstr "Patches (aus einem E-Mail-Paket) auf das Paketdepot anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:105
-#, fuzzy
 msgid "Do not apply dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:106
 msgid "Apply changes from a Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:107
-#, fuzzy
 msgid "Do not create a branch"
-msgstr "keine mtab schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:108
 msgid "Apply changes from a Differential revision"
@@ -8253,9 +7739,8 @@ msgid "Output upload information in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:113
-#, fuzzy
 msgid "Mark the file as temporary"
-msgstr "Datei als Terminal benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:115
 msgid "There's only one way to find out"
@@ -8266,14 +7751,12 @@ msgid "Show blame for the lines you changed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:117
-#, fuzzy
 msgid "Cover changes since a specific revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:118
-#, fuzzy
 msgid "Close a revision"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:119
 msgid "Do not print a success message"
@@ -8313,9 +7796,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:128
 #: /tmp/fish/implicit/share/completions/arc.fish:140
-#, fuzzy
 msgid "Specify the output format"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:129
 msgid "Include closed and abandoned revisions"
@@ -8338,43 +7820,37 @@ msgid "Show a detailed coverage report on the CLI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:134
-#, fuzzy
 msgid "Record a copy of the test results on the specified build target"
-msgstr "Testergebnisse in angegebener Datei zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:135
-#, fuzzy
 msgid "Use uglier formatting"
-msgstr "Zeilenpufferung benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:136
 msgid "Run unit tests covering changes since a specific revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:137
-#, fuzzy
 msgid "Run every test"
-msgstr "Ergebnisse umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:138
 msgid "Report results in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:139
-#, fuzzy
 msgid "Always enable coverage information"
-msgstr "immer neuformatieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:141
 #: /tmp/fish/implicit/share/completions/arc.fish:184
-#, fuzzy
 msgid "Always disable coverage information"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "Befehl ausführen, wenn vorheriger Befehl fehlerhaft war"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8385,9 +7861,8 @@ msgid "Generate a Differential diff or revision from local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:145
-#, fuzzy
 msgid "Generate diff by executing a specified command"
-msgstr "Interaktiver Modus nach Ausführung der Befehle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:146
 msgid "Attempt to convert non UTF-8 hunks into specified encoding"
@@ -8402,34 +7877,28 @@ msgid "When creating a revision, add reviewers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:149
-#, fuzzy
 msgid "Do not copy changes to the staging area"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:150
-#, fuzzy
 msgid "Read diff from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:151
-#, fuzzy
 msgid "Suppress warning about uncommitted changes"
-msgstr "Warnung über die Verwendung unsicheren Speichers unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:152
-#, fuzzy
 msgid "Read revision information from file"
-msgstr "Fehler beim Lesen der Eingabeinformationen aus Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:153
-#, fuzzy
 msgid "Do not run lint"
-msgstr "Aktualisierung nicht durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:154
-#, fuzzy
 msgid "Use the specified message when updating a revision"
-msgstr "Angegebenen Message-Digest-Algorithmus verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:155
 msgid "Create or update a revision without requesting a code review"
@@ -8444,9 +7913,8 @@ msgid "Always create a new revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:158
-#, fuzzy
 msgid "Disable lint cache"
-msgstr "Server-seitigen Cache deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:159
 msgid "Read revision information from a specific commit"
@@ -8457,9 +7925,8 @@ msgid "Only generate a diff, without running lint, unit tests, or other"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:161
-#, fuzzy
 msgid "Do not upload binaries"
-msgstr "Keine Init-Dateien laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:162
 msgid "only create a diff"
@@ -8470,19 +7937,16 @@ msgid "Apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:165
-#, fuzzy
 msgid "Specify the end of the commit range"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:166
-#, fuzzy
 msgid "When creating a revision, try to use the working copy commit"
-msgstr "Patches von einem anderen Paketdepot auf dieses kopieren und anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:167
-#, fuzzy
 msgid "Create a diff with a few lines of context."
-msgstr "NUM Kontext-Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:168
 msgid "Require excuse for lint advice in addition to lint warnings and errors"
@@ -8493,9 +7957,8 @@ msgid "Emit machine-readable JSON"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:170
-#, fuzzy
 msgid "Always update a specific revision"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:171
 msgid "Ignore unsound test failures without prompting"
@@ -8514,34 +7977,28 @@ msgid "Automatically add all unstaged and uncommitted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:177
-#, fuzzy
 msgid "Edit revision information"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:178
-#, fuzzy
 msgid "Do not run unit tests"
-msgstr "Aktualisierung nicht durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:179
-#, fuzzy
 msgid "Raise all lint warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:181
-#, fuzzy
 msgid "Only run lint and unit tests"
-msgstr "Nur doppelte Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:182
-#, fuzzy
 msgid "Skip checks for untracked files in the working copy"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:183
-#, fuzzy
 msgid "Display only new lint messages"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:185
 msgid "Create or update a libphutil library"
@@ -8568,14 +8025,12 @@ msgid "Force the library map to be updated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:191
-#, fuzzy
 msgid "Set the library name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:192
-#, fuzzy
 msgid "Shows the current version of arcanist"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:2
 msgid "Numerical address"
@@ -8610,42 +8065,36 @@ msgid "Take addr from filename, default /etc/ethers"
 msgstr "Adresse aus Dateiname entnehmen, Standard /etc/ethers"
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
-#, fuzzy
 msgid "Omit false conditionals"
-msgstr "Eine Bedingung testen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:2
-#, fuzzy
 msgid "Omit debugging directives"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:3
-#, fuzzy
 msgid "Include general information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:4
 msgid "Include high-level source"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:5
-#, fuzzy
 msgid "Include assembly"
-msgstr "Include-Pfad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:6
 msgid "Include macro expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:7
-#, fuzzy
 msgid "Omit forms processing"
-msgstr "Anmeldeprozess ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:8
-#, fuzzy
 msgid "Include symbols"
-msgstr "Datei ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:9
 msgid "Initially turn on alternate macro syntax"
@@ -8656,24 +8105,20 @@ msgid "Compress DWARF debug sections using zlib"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:11
-#, fuzzy
 msgid "Don't compress DWARF debug sections"
-msgstr "Keine Skrpte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:12
-#, fuzzy
 msgid "Produce assembler debugging messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:13
-#, fuzzy
 msgid "Remap debug information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:14
-#, fuzzy
 msgid "Redefine symbols"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:15
 msgid "Require executable stack for this object"
@@ -8700,173 +8145,146 @@ msgid "Skip whitespace and comment preprocessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:21
-#, fuzzy
 msgid "Generate debugging information"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:22
-#, fuzzy
 msgid "Generate STABS debugging information"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:23
 msgid "Generate STABS debug info with GNU extensions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:24
-#, fuzzy
 msgid "Generate DWARF2 debugging information"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:25
 msgid "Generate per-function section names for DWARF line information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:26
-#, fuzzy
 msgid "Set the hash table size close"
-msgstr "Standardzeichensatz festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
-#, fuzzy
 msgid "Show help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:28
-#, fuzzy
 msgid "Show target specific options"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:29
-#, fuzzy
 msgid "Add DIR to search list for .include directives"
-msgstr "include-Verzeichnisse ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:30
-#, fuzzy
 msgid "Don't warn about signed overflow"
-msgstr "Nur doppelte Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:31
 msgid "Warn when differences altered for long displacements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:32
-#, fuzzy
 msgid "Keep local symbols"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:33
 msgid "Assemble in MRI compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:34
-#, fuzzy
 msgid "Write dependency information in given file"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
-#, fuzzy
 msgid "Do not pad the end of sections to alignment boundaries"
-msgstr "Standardschlüsselringe nicht der Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:36
-#, fuzzy
 msgid "Set object-file output file name"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:37
-#, fuzzy
 msgid "Fold data section into text section"
-msgstr "Fließkomma-Ausnahmefehler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:38
 msgid "Prefer smaller memory use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:39
-#, fuzzy
 msgid "Print various measured statistics from execution"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:40
-#, fuzzy
 msgid "Strip local absolute symbols"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:41
 msgid "Use same format as native assembler when possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:42
-#, fuzzy
 msgid "Print assembler version number and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:43
 #: /tmp/fish/implicit/share/completions/gunzip.fish:8
 #: /tmp/fish/implicit/share/completions/gzip.fish:8
-#, fuzzy
 msgid "Suppress warnings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:44
-#, fuzzy
 msgid "Don't suppress warnings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:45
-#, fuzzy
 msgid "Treat warnings as errors"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:46
-#, fuzzy
 msgid "Generate object file even after errors"
-msgstr "Gepunkteten Graph generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:47
-#, fuzzy
 msgid "Read option from given file"
-msgstr "Cookies aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:48
-#, fuzzy
 msgid "Print assembler version number"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:49
 msgid "Don't optimize code alignment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:50
-#, fuzzy
 msgid "Quieten some warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:51
-#, fuzzy
 msgid "Generate 32 bits code"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:52
-#, fuzzy
 msgid "Generate 64 bits code"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:53
-#, fuzzy
 msgid "Generate x32 code"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:54
 msgid "Encode SSE instructions with VEX prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:55
-#, fuzzy
 msgid "Check SSE instructions"
-msgstr "Illegale Instruktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:56
 msgid "Check operand combinations for validity"
@@ -8889,14 +8307,12 @@ msgid "Encode EVEX instructions with specific EVEX.RC"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:61
-#, fuzzy
 msgid "Use specfied mnemonic"
-msgstr "Angegebene Warteschlange benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:62
-#, fuzzy
 msgid "Use specfied syntax"
-msgstr "Angegebene Warteschlange benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:63
 msgid "Support pseudo index registers"
@@ -8915,19 +8331,16 @@ msgid "Add BND prefix for all valid branches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:67
-#, fuzzy
 msgid "Disable branch optimization for shared code"
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:68
-#, fuzzy
 msgid "Strip all lock prefixes"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -8938,23 +8351,20 @@ msgid "Accept only Intel64 ISA"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:73
-#, fuzzy
 msgid "Optimize for given CPU"
-msgstr "Paketdepot optimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:1
-#, fuzzy
 msgid "Checkout package"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:2
 msgid "Show the full history of the target, with file diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:3
-#, fuzzy
 msgid "Put the source files in current directory"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:4
 msgid "Collect garbage"
@@ -8965,46 +8375,40 @@ msgid "Report approximate disk usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:7
-#, fuzzy
 msgid "List all known packages"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:8
 msgid "List the architectures the targets are available for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:9
-#, fuzzy
 msgid "List locally tracked packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:10
 msgid "List repos the targets exist in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:11
-#, fuzzy
 msgid "Show revision history of the target"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:12
-#, fuzzy
 msgid "Show condensed revision history"
-msgstr "Unterschiede zwischen Revisionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:13
 msgid "Show the target's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:14
-#, fuzzy
 msgid "Update given targets"
-msgstr "Aktualisierungs-Intervall"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:15
-#, fuzzy
 msgid "Remove target from local repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:1
 msgid "Limiting load factor"
@@ -9055,23 +8459,20 @@ msgid "Print the jobs listed"
 msgstr "Aufgelistete Jobs ausgeben"
 
 #: /tmp/fish/implicit/share/completions/atom.fish:1
-#, fuzzy
 msgid "Run in development mode."
-msgstr "Im Dummy-Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:2
 msgid "Keep the browser process in the foreground."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:3
-#, fuzzy
 msgid "Print usage message."
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:4
-#, fuzzy
 msgid "Log all output to file."
-msgstr "Eingabe in Datei protokollieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:5
 msgid "Open a new window."
@@ -9100,9 +8501,8 @@ msgid "Run the specified specs and exit with error code on failures."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:11
-#, fuzzy
 msgid "Print the version."
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:12
 msgid "Wait for window to be closed before returning."
@@ -9113,34 +8513,28 @@ msgid "Manage file archives of various types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:2
-#, fuzzy
 msgid "list files in archive (als)"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:3
-#, fuzzy
 msgid "extract files from archive (aunpack)"
-msgstr "Aus Archiv extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:4
-#, fuzzy
 msgid "extract archive to specified directory"
-msgstr "Jokerzeichen auf angegebenes Verzeichnis beschränken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:5
-#, fuzzy
 msgid "create archive (apack)"
-msgstr "Archiv erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:6
-#, fuzzy
 msgid "extract file to standard out (acat)"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:7
-#, fuzzy
 msgid "generate a diff between two archives (adiff)"
-msgstr "Diff zwischen zwei Versionen des Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:8
 msgid "repack archives to a different format (arepack)"
@@ -9155,9 +8549,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tee.fish:3
 #: /tmp/fish/implicit/share/completions/tr.fish:5
 #: /tmp/fish/implicit/share/completions/unexpand.fish:5
-#, fuzzy
 msgid "display this help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:10
 #: /tmp/fish/implicit/share/completions/dd.fish:2
@@ -9172,14 +8565,12 @@ msgstr "Hilfe anzeigen und beenden"
 #: /tmp/fish/implicit/share/completions/tee.fish:4
 #: /tmp/fish/implicit/share/completions/tr.fish:6
 #: /tmp/fish/implicit/share/completions/unexpand.fish:6
-#, fuzzy
 msgid "output version information and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:11
-#, fuzzy
 msgid "execute command above for each file specified"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:12
 msgid "override archive format (see below)"
@@ -9194,66 +8585,56 @@ msgid "always create subdirectory when extracting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:15
-#, fuzzy
 msgid "allow overwriting of local files"
-msgstr "Neue lokale Dateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:16
-#, fuzzy
 msgid "decrease verbosity level by one"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:17
-#, fuzzy
 msgid "increase verbosity level by one"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:18
 msgid "specify verbosity (0, 1 or 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:19
-#, fuzzy
 msgid "send output through pager"
-msgstr "Ausgabe durch 'pr' schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:20
 msgid "filenames from standard in are null-byte separated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:21
-#, fuzzy
 msgid "explain what is being done by atool"
-msgstr "Erläutere was geschieht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:22
 msgid "simulation mode - no filesystem changes are made"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:23
-#, fuzzy
 msgid "override a configuration option (KEY=VALUE)"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:24
-#, fuzzy
 msgid "load configuration defaults from file"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:1
-#, fuzzy
 msgid "Synchronize AUR packages"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:2
-#, fuzzy
 msgid "Save and restore package state"
-msgstr "Quellpakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:3
-#, fuzzy
 msgid "Package cache actions"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:4
 #: /tmp/fish/implicit/share/completions/pacaur.fish:1
@@ -9262,23 +8643,20 @@ msgstr "Handbuch-Sektionen"
 #: /tmp/fish/implicit/share/completions/pacman.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:1
 #: /tmp/fish/implicit/share/completions/yaourt.fish:4
-#, fuzzy
 msgid "Modify the package database"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:5
 msgid "Pacman log actions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:6
-#, fuzzy
 msgid "Build packages from ABS"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:7
-#, fuzzy
 msgid "Operate on orphan packages"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:8
 #: /tmp/fish/implicit/share/completions/pacaur.fish:2
@@ -9287,55 +8665,48 @@ msgstr "Paketliste aktualisieren"
 #: /tmp/fish/implicit/share/completions/pacman.fish:4
 #: /tmp/fish/implicit/share/completions/yaourt.fish:2
 #: /tmp/fish/implicit/share/completions/yaourt.fish:5
-#, fuzzy
 msgid "Query the package database"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:9
 #: /tmp/fish/implicit/share/completions/pacaur.fish:6
 #: /tmp/fish/implicit/share/completions/pacman.fish:5
 #: /tmp/fish/implicit/share/completions/yaourt.fish:6
-#, fuzzy
 msgid "Remove packages from the system"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:10
 #: /tmp/fish/implicit/share/completions/pacaur.fish:7
 #: /tmp/fish/implicit/share/completions/pacman.fish:6
 #: /tmp/fish/implicit/share/completions/yaourt.fish:7
-#, fuzzy
 msgid "Synchronize packages"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:11
 #: /tmp/fish/implicit/share/completions/pacaur.fish:8
 #: /tmp/fish/implicit/share/completions/pacman.fish:7
 #: /tmp/fish/implicit/share/completions/yaourt.fish:8
-#, fuzzy
 msgid "Check dependencies"
-msgstr "Zerstörte Abhängigkeiten korrigieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:12
 #: /tmp/fish/implicit/share/completions/pacaur.fish:9
 #: /tmp/fish/implicit/share/completions/pacman.fish:8
 #: /tmp/fish/implicit/share/completions/yaourt.fish:9
-#, fuzzy
 msgid "Upgrade or add a local package"
-msgstr "Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:13
 msgid "Show settings while running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:14
-#, fuzzy
 msgid "Do not use powerpill"
-msgstr "Nicht die gcc-Ummantelung benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:15
-#, fuzzy
 msgid "Show available languages"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:16
 msgid "View pacman.conf"
@@ -9361,58 +8732,51 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:23
 #: /tmp/fish/implicit/share/completions/pacman.fish:14
 #: /tmp/fish/implicit/share/completions/yaourt.fish:20
-#, fuzzy
 msgid "Output more status messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:22
 #: /tmp/fish/implicit/share/completions/pacaur.fish:24
 #: /tmp/fish/implicit/share/completions/pacman.fish:15
 #: /tmp/fish/implicit/share/completions/yaourt.fish:21
-#, fuzzy
 msgid "Alternate architecture"
-msgstr "Archiv erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:23
 #: /tmp/fish/implicit/share/completions/pacaur.fish:25
 #: /tmp/fish/implicit/share/completions/pacman.fish:16
 #: /tmp/fish/implicit/share/completions/yaourt.fish:22
-#, fuzzy
 msgid "Alternative package cache location"
-msgstr "Paketcache automatisch generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:24
 #: /tmp/fish/implicit/share/completions/pacaur.fish:26
 #: /tmp/fish/implicit/share/completions/pacman.fish:17
 #: /tmp/fish/implicit/share/completions/tmux.fish:12
 #: /tmp/fish/implicit/share/completions/yaourt.fish:23
-#, fuzzy
 msgid "Alternate config file"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:25
 #: /tmp/fish/implicit/share/completions/pacaur.fish:27
 #: /tmp/fish/implicit/share/completions/pacman.fish:18
 #: /tmp/fish/implicit/share/completions/yaourt.fish:24
-#, fuzzy
 msgid "Display debug messages"
-msgstr "Debug-Informationen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:26
 #: /tmp/fish/implicit/share/completions/pacaur.fish:28
 #: /tmp/fish/implicit/share/completions/pacman.fish:19
 #: /tmp/fish/implicit/share/completions/yaourt.fish:25
-#, fuzzy
 msgid "GPG directory to verify signatures"
-msgstr "Optionen zum Überprüfen von Signaturen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:27
 #: /tmp/fish/implicit/share/completions/pacaur.fish:30
 #: /tmp/fish/implicit/share/completions/pacman.fish:21
 #: /tmp/fish/implicit/share/completions/yaourt.fish:27
-#, fuzzy
 msgid "Specify alternative log file"
-msgstr "apt-Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:28
 #: /tmp/fish/implicit/share/completions/pacaur.fish:31
@@ -9425,9 +8789,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:45
 #: /tmp/fish/implicit/share/completions/pacman.fish:23
 #: /tmp/fish/implicit/share/completions/yaourt.fish:37
-#, fuzzy
 msgid "Skip [all] dependency checks"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:30
 #: /tmp/fish/implicit/share/completions/pacaur.fish:46
@@ -9440,9 +8803,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:48
 #: /tmp/fish/implicit/share/completions/pacman.fish:26
 #: /tmp/fish/implicit/share/completions/yaourt.fish:40
-#, fuzzy
 msgid "Do not execute install script"
-msgstr "Keine post-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:33
 #: /tmp/fish/implicit/share/completions/pacaur.fish:49
@@ -9455,9 +8817,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:50
 #: /tmp/fish/implicit/share/completions/pacman.fish:28
 #: /tmp/fish/implicit/share/completions/yaourt.fish:42
-#, fuzzy
 msgid "Specify printf-like format"
-msgstr "Zeilenlänge angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:35
 #: /tmp/fish/implicit/share/completions/pacaur.fish:51
@@ -9476,9 +8837,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacman.fish:63
 #: /tmp/fish/implicit/share/completions/yaourt.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:92
-#, fuzzy
 msgid "Mark PACKAGE as explicitly installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:37
 #: /tmp/fish/implicit/share/completions/pacaur.fish:53
@@ -9505,9 +8865,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:56
 #: /tmp/fish/implicit/share/completions/pacman.fish:34
 #: /tmp/fish/implicit/share/completions/yaourt.fish:48
-#, fuzzy
 msgid "Do not reinstall up-to-date targets"
-msgstr "Aktualisierung nicht durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:41
 #: /tmp/fish/implicit/share/completions/pacaur.fish:57
@@ -9520,17 +8879,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:58
 #: /tmp/fish/implicit/share/completions/pacman.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:50
-#, fuzzy
 msgid "Display all packages in GROUP"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:43
 #: /tmp/fish/implicit/share/completions/pacaur.fish:59
 #: /tmp/fish/implicit/share/completions/pacman.fish:37
 #: /tmp/fish/implicit/share/completions/yaourt.fish:51
-#, fuzzy
 msgid "Display information on PACKAGE"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:44
 #: /tmp/fish/implicit/share/completions/aura.fish:53
@@ -9540,31 +8897,27 @@ msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
 #: /tmp/fish/implicit/share/completions/pacman.fish:73
 #: /tmp/fish/implicit/share/completions/yaourt.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:102
-#, fuzzy
 msgid "Show less information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:45
 #: /tmp/fish/implicit/share/completions/pacaur.fish:61
 #: /tmp/fish/implicit/share/completions/pacman.fish:39
 #: /tmp/fish/implicit/share/completions/yaourt.fish:53
-#, fuzzy
 msgid "Search packages for regexp"
-msgstr "Nur Paketname suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:46
 msgid "Remove packages only needed during installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:47
-#, fuzzy
 msgid "View package dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:48
-#, fuzzy
 msgid "View package information"
-msgstr "Paketinformation anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:49
 msgid "Show PKGBUILD diffs"
@@ -9575,63 +8928,52 @@ msgid "View the packages's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:51
-#, fuzzy
 msgid "Show makepkg output"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:52
-#, fuzzy
 msgid "Build dependencies from ABS"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:54
-#, fuzzy
 msgid "Search AUR by string matching"
-msgstr "Rekursiv, Dateien gemäß MUSTER suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:55
-#, fuzzy
 msgid "Upgrade all installed AUR packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:56
-#, fuzzy
 msgid "Download the source tarball"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:57
-#, fuzzy
 msgid "Ignore given comma-separated packages"
-msgstr "Nicht authentifizierte Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:58
-#, fuzzy
 msgid "Specify a build location"
-msgstr "Debug-Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:59
-#, fuzzy
 msgid "User to build as"
-msgstr "Benutze <Befehl> zur Erstellung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:60
 msgid "Run customizepkg before build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:61
-#, fuzzy
 msgid "Include -git/-svn/etc packages"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:62
-#, fuzzy
 msgid "Prompt for PKGBUILD editing"
-msgstr "Nach Ablaufzeit fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:63
-#, fuzzy
 msgid "Ignore architecture checking"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:64
 msgid "Sort alphabetically"
@@ -9654,25 +8996,21 @@ msgid "Restores a record kept with -B"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:69
-#, fuzzy
 msgid "Backup to directory"
-msgstr "Zielverzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:70
-#, fuzzy
 msgid "Save this many versions"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:71
 #: /tmp/fish/implicit/share/completions/aura.fish:73
-#, fuzzy
 msgid "Search via regex"
-msgstr "Muster ist ein regulärer Ausdruck"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:72
-#, fuzzy
 msgid "Show package history"
-msgstr "Paketinformation anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:74
 msgid "Search ABS by regex"
@@ -9692,14 +9030,12 @@ msgid "Download fresh copy of the package list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:77
-#, fuzzy
 msgid "Sync the given to local ABS tree"
-msgstr "Pakete in lokalen Verzeichnisbaum verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:79
-#, fuzzy
 msgid "Uninstall orphan packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:80
 #: /tmp/fish/implicit/share/completions/pacaur.fish:62
@@ -9712,17 +9048,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:63
 #: /tmp/fish/implicit/share/completions/pacman.fish:41
 #: /tmp/fish/implicit/share/completions/yaourt.fish:60
-#, fuzzy
 msgid "List only non-explicit packages (dependencies)"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:82
 #: /tmp/fish/implicit/share/completions/pacaur.fish:64
 #: /tmp/fish/implicit/share/completions/pacman.fish:42
 #: /tmp/fish/implicit/share/completions/yaourt.fish:61
-#, fuzzy
 msgid "List only explicitly installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:83
 #: /tmp/fish/implicit/share/completions/pacaur.fish:65
@@ -9735,25 +9069,22 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:66
 #: /tmp/fish/implicit/share/completions/pacman.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:63
-#, fuzzy
 msgid "List all files owned by PACKAGE"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:85
 #: /tmp/fish/implicit/share/completions/pacaur.fish:67
 #: /tmp/fish/implicit/share/completions/pacman.fish:45
 #: /tmp/fish/implicit/share/completions/yaourt.fish:64
-#, fuzzy
 msgid "List all packages not in the database"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:86
 #: /tmp/fish/implicit/share/completions/pacaur.fish:68
 #: /tmp/fish/implicit/share/completions/pacman.fish:46
 #: /tmp/fish/implicit/share/completions/yaourt.fish:65
-#, fuzzy
 msgid "Search for the package that owns FILE"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:87
 #: /tmp/fish/implicit/share/completions/pacaur.fish:69
@@ -9766,33 +9097,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:70
 #: /tmp/fish/implicit/share/completions/pacman.fish:48
 #: /tmp/fish/implicit/share/completions/yaourt.fish:67
-#, fuzzy
 msgid "List only unrequired packages"
-msgstr "Nur aktualisierbare Pakete ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:71
 #: /tmp/fish/implicit/share/completions/pacman.fish:49
 #: /tmp/fish/implicit/share/completions/yaourt.fish:68
-#, fuzzy
 msgid "List only out-of-date packages"
-msgstr "Nur aktualisierbare Pakete ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:91
 #: /tmp/fish/implicit/share/completions/pacaur.fish:73
 #: /tmp/fish/implicit/share/completions/pacman.fish:51
 #: /tmp/fish/implicit/share/completions/yaourt.fish:72
-#, fuzzy
 msgid "Also remove packages depending on PACKAGE"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:92
 #: /tmp/fish/implicit/share/completions/pacaur.fish:74
 #: /tmp/fish/implicit/share/completions/pacman.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:73
-#, fuzzy
 msgid "Ignore file backup designations"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:93
 #: /tmp/fish/implicit/share/completions/pacaur.fish:75
@@ -9812,33 +9139,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:78
 #: /tmp/fish/implicit/share/completions/pacman.fish:56
 #: /tmp/fish/implicit/share/completions/yaourt.fish:77
-#, fuzzy
 msgid "Remove [all] packages from cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:97
 #: /tmp/fish/implicit/share/completions/pacaur.fish:79
 #: /tmp/fish/implicit/share/completions/pacman.fish:57
 #: /tmp/fish/implicit/share/completions/yaourt.fish:78
-#, fuzzy
 msgid "List all packages in REPOSITORY"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:98
 #: /tmp/fish/implicit/share/completions/pacaur.fish:80
 #: /tmp/fish/implicit/share/completions/pacman.fish:58
 #: /tmp/fish/implicit/share/completions/yaourt.fish:79
-#, fuzzy
 msgid "Upgrade all packages that are out of date"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:99
 #: /tmp/fish/implicit/share/completions/pacaur.fish:82
 #: /tmp/fish/implicit/share/completions/pacman.fish:60
 #: /tmp/fish/implicit/share/completions/yaourt.fish:81
-#, fuzzy
 msgid "Only download the target packages"
-msgstr "Herunterladen von Paketen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:101
 #: /tmp/fish/implicit/share/completions/aura.fish:102
@@ -9848,9 +9171,8 @@ msgstr "Herunterladen von Paketen deaktivieren"
 #: /tmp/fish/implicit/share/completions/pacman.fish:76
 #: /tmp/fish/implicit/share/completions/yaourt.fish:104
 #: /tmp/fish/implicit/share/completions/yaourt.fish:105
-#, fuzzy
 msgid "Package file"
-msgstr "Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/awk.fish:1
 msgid ""
@@ -9889,11 +9211,8 @@ msgid "Input_file Read a list of already existing known bad blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:5
-#, fuzzy
 msgid "Output_file Write the list of bad blocks to the specified file"
 msgstr ""
-"Die Liste der Standardeinstellungen gemäß der angegebenen Zeichenkette "
-"festlegen"
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:6
 msgid ""
@@ -9937,9 +9256,8 @@ msgid "Wrap encoded line after given number of caracters (default 76)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:1
-#, fuzzy
 msgid "Force interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:2
 msgid "Define math library"
@@ -9966,32 +9284,28 @@ msgid "Seems mode: goes back to the first directory containing string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bd.fish:3
-#, fuzzy
 msgid "Case insensitive move (implies seems mode)"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:1
 msgid "Show unavailable key bindings/erase all bindings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:2
-#, fuzzy
 msgid "Erase mode"
-msgstr "Ausführlicher Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:3
-#, fuzzy
 msgid "Print names of available functions"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:5
 msgid "Specify key name, not sequence"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:6
-#, fuzzy
 msgid "Print names of available keys"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:7
 msgid "Add to named bind mode"
@@ -10002,15 +9316,13 @@ msgid "Change current bind mode to named mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:9
-#, fuzzy
 msgid "Key name"
-msgstr "Benutzername"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:10
 #: /tmp/fish/implicit/share/completions/commandline.fish:17
-#, fuzzy
 msgid "Function name"
-msgstr "Funktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:1
 msgid "Specify a prefix to use for all bison output file names"
@@ -10050,9 +9362,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:9
-#, fuzzy
 msgid "Specify the name outfile for the parser file"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:10
 msgid ""
@@ -10073,9 +9384,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:13
-#, fuzzy
 msgid "Print the version number of bison and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:14
 msgid "Print a summary of the options to bison and exit"
@@ -10098,28 +9408,24 @@ msgid "Create a global (manually erased) event block"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:1
-#, fuzzy
 msgid "Check formula"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:2
-#, fuzzy
 msgid "Create a binary package"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:3
-#, fuzzy
 msgid "Output developer debug information"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:4
 msgid "Do not bump the bottle revision number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:5
-#, fuzzy
 msgid "Write bottle block to a Ruby source file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:6
 msgid "Write bottle block to formula file"
@@ -10130,14 +9436,12 @@ msgid "Merge multiple bottle outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:8
-#, fuzzy
 msgid "Display formula"
-msgstr "Zusammenfassung anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:9
-#, fuzzy
 msgid "Remove old installed versions"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:10
 msgid "Remove out-of-date keg-only brews as well"
@@ -10149,9 +9453,8 @@ msgid "Show what files would be removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:13
-#, fuzzy
 msgid "Scrub the cache"
-msgstr "Apt-Zwischenspeicher erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:14
 msgid "Create new formula from URL"
@@ -10166,14 +9469,12 @@ msgid "Use template for Autotools-style build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:17
-#, fuzzy
 msgid "Don't download URL"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:18
-#, fuzzy
 msgid "Override name autodetection"
-msgstr "Frame-Rate überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:19
 msgid "Override version autodetection"
@@ -10184,24 +9485,20 @@ msgid "Summarize specified formulae in one line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:21
-#, fuzzy
 msgid "Search names and descriptions"
-msgstr "Über Bildschirmende hinaus suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:22
-#, fuzzy
 msgid "Search only names"
-msgstr "In allen Handbuchseiten suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:23
-#, fuzzy
 msgid "Search only descriptions"
-msgstr "$PATH nach Skript durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:24
-#, fuzzy
 msgid "Show a formula's dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:25
 msgid "Show only 1 level down"
@@ -10212,33 +9509,28 @@ msgid "Show in topological order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:27
-#, fuzzy
 msgid "Show dependencies as tree"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:28
-#, fuzzy
 msgid "Show dependencies for all formulae"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:29
-#, fuzzy
 msgid "Show dependencies for installed formulae"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:30
 msgid "Determine installation prefix for non-brew software"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:31
-#, fuzzy
 msgid "Set name of package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:32
-#, fuzzy
 msgid "Set version of package"
-msgstr "Version des Quellpaketes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:33
 msgid "Check your system for problems"
@@ -10249,9 +9541,8 @@ msgid "Open brew/formula for editing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:35
-#, fuzzy
 msgid "Download source for formula"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:36
 msgid "Remove a previously cached version and re-fetch"
@@ -10262,48 +9553,42 @@ msgid "Download the HEAD version from a VCS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:38
-#, fuzzy
 msgid "Also download dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:39
 msgid "Make HEAD checkout verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:40
-#, fuzzy
 msgid "Fetch source package instead of bottle"
-msgstr "Quellpakete abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:42
 msgid "Open brew/formula's homepage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:43
-#, fuzzy
 msgid "Display information about formula"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:44
-#, fuzzy
 msgid "Display info for all formulae"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:45
 msgid "Open the GitHub History page for formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:46
-#, fuzzy
 msgid "Install formula"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:47
 #: /tmp/fish/implicit/share/completions/prt-get.fish:35
 #: /tmp/fish/implicit/share/completions/prt-get.fish:94
-#, fuzzy
 msgid "Force install"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:48
 msgid "If install fails, open shell in temp directory"
@@ -10314,9 +9599,8 @@ msgid "skip installing any dependencies of any kind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:50
-#, fuzzy
 msgid "Attempt to compile using the specified compiler"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:51
 msgid "Compile from source even if a bottle is provided"
@@ -10335,18 +9619,16 @@ msgid "Download and patch formula, then open a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:55
-#, fuzzy
 msgid "Force the specified build environment"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:56
 msgid "Optimize for a generic CPU architecture"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:57
-#, fuzzy
 msgid "Optimize for the specified CPU architecture"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:58
 msgid "Symlink installed formula"
@@ -10354,9 +9636,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:59
 #: /tmp/fish/implicit/share/completions/brew.fish:60
-#, fuzzy
 msgid "Overwrite existing files"
-msgstr "Neuere Dateien nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:61
 #: /tmp/fish/implicit/share/completions/brew.fish:62
@@ -10377,9 +9658,8 @@ msgid "Link .app bundles into ~/Applications instead"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:67
-#, fuzzy
 msgid "List all installed formula"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:68
 #: /tmp/fish/implicit/share/completions/brew.fish:71
@@ -10388,9 +9668,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:69
 #: /tmp/fish/implicit/share/completions/brew.fish:72
-#, fuzzy
 msgid "Show the version number"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:70
 #: /tmp/fish/implicit/share/completions/brew.fish:73
@@ -10398,9 +9677,8 @@ msgid "Show the versions of pinned formulae"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:74
-#, fuzzy
 msgid "Show log for formula"
-msgstr "Kurzes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:75
 #: /tmp/fish/implicit/share/completions/brew.fish:77
@@ -10412,9 +9690,8 @@ msgid "formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:76
-#, fuzzy
 msgid "Check formula for missing dependencies"
-msgstr "Nach zusätzlichen Abhängigkeiten fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:78
 msgid "Display install options for formula"
@@ -10429,33 +9706,28 @@ msgid "Show options for all formulae"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:81
-#, fuzzy
 msgid "Show options for all installed formulae"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:83
 msgid "Show formula that have updated versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:84
-#, fuzzy
 msgid "Display only names"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:85
-#, fuzzy
 msgid "Pin the specified formulae to their current versions"
-msgstr "Angegebene Datei zur aktuellen Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:87
-#, fuzzy
 msgid "Remove dead symlinks"
-msgstr "Quellpakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:88
-#, fuzzy
 msgid "Search for formula by name"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:89
 #: /tmp/fish/implicit/share/completions/brew.fish:91
@@ -10484,14 +9756,12 @@ msgid "Gracefully restart a service"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:97
-#, fuzzy
 msgid "Start a service"
-msgstr "Dienst starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:98
-#, fuzzy
 msgid "Stop a service"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:100
 msgid "All Services"
@@ -10502,9 +9772,8 @@ msgid "Instantiate a Homebrew build enviornment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:102
-#, fuzzy
 msgid "Use stdenv instead of superenv"
-msgstr "purge anstelle von remove verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:103
 msgid "Tap a new formula repository on GitHub"
@@ -10519,16 +9788,14 @@ msgid "Run tests for formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:107
-#, fuzzy
 msgid "Uninstall formula"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:108
 #: /tmp/fish/implicit/share/completions/brew.fish:109
 #: /tmp/fish/implicit/share/completions/brew.fish:110
-#, fuzzy
 msgid "Delete all installed versions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:111
 msgid "Unlink formula"
@@ -10543,19 +9810,16 @@ msgid "Remove links from ~/Applications created by brew linkapps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:114
-#, fuzzy
 msgid "Extract source code"
-msgstr "Skript extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:115
-#, fuzzy
 msgid "Unpin specified formulae"
-msgstr "Angegebene Datei ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:116
-#, fuzzy
 msgid "Remove a tapped repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:117
 msgid "Fetch newest version of Homebrew and formulas"
@@ -10566,29 +9830,24 @@ msgid "Use git pull --rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:119
-#, fuzzy
 msgid "Upgrade outdated brews"
-msgstr "Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:120
-#, fuzzy
 msgid "Show formulas that depend on specified formula"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:121
-#, fuzzy
 msgid "List only installed formulae"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:122
-#, fuzzy
 msgid "Resolve more than one level of dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:123
-#, fuzzy
 msgid "Print version number of brew"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:124
 msgid "Show Homebrew a summary of the build environment"
@@ -10599,75 +9858,64 @@ msgid "Display where Homebrew's .git directory is located"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:126
-#, fuzzy
 msgid "Show Homebrew and system configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:127
-#, fuzzy
 msgid "Display Homebrew's install path"
-msgstr "Kompressionsrate anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:128
-#, fuzzy
 msgid "Display formula's install path"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:129
-#, fuzzy
 msgid "Display Homebrew's download cache"
-msgstr "Herunterladen von Paketen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:130
 msgid "Display the file or directory used to cache formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:131
-#, fuzzy
 msgid "Display Homebrew's Cellar path"
-msgstr "Kompressionsrate anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:132
 msgid "Display formula's install path in Cellar"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/builtin.fish:2
-#, fuzzy
 msgid "Print names of all existing builtins"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:1
-#, fuzzy
 msgid "Test if bundle has been given no subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:2
-#, fuzzy
 msgid "Test if bundle has been given a specific subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:3
 msgid "Specify the number of times you wish to attempt network commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:4
-#, fuzzy
 msgid "Disable colorization in output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:5
 msgid "Enable verbose output mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:6
-#, fuzzy
 msgid "Display a help page"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:7
-#, fuzzy
 msgid "Prints version information"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:8
 #: /tmp/fish/implicit/share/completions/bundle.fish:40
@@ -10676,19 +9924,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:9
 #: /tmp/fish/implicit/share/completions/bundle.fish:57
-#, fuzzy
 msgid "The location of the Gemfile bundler should use"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:10
-#, fuzzy
 msgid "The location to install the gems in the bundle to"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:11
-#, fuzzy
 msgid "Installs the gems in the bundle to the system location"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:12
 msgid "A space-separated list of groups to skip installing"
@@ -10729,14 +9974,12 @@ msgid "Do not update the cache in vendor/cache with the newly bundled gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:21
-#, fuzzy
 msgid "Do not print progress information to stdout"
-msgstr "Keine Gruppeninformation ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:22
-#, fuzzy
 msgid "Run bundle clean automatically after install"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:23
 #: /tmp/fish/implicit/share/completions/bundle.fish:30
@@ -10745,9 +9988,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:24
 #: /tmp/fish/implicit/share/completions/bundle.fish:89
-#, fuzzy
 msgid "Do not remove stale gems from the cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:25
 msgid "Do not allow the Gemfile.lock to be updated after this install"
@@ -10755,9 +9997,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:26
 #: /tmp/fish/implicit/share/completions/bundle.fish:41
-#, fuzzy
 msgid "Update dependencies to their latest versions"
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:27
 msgid "The name of a :git or :path source used in the Gemfile"
@@ -10772,30 +10013,26 @@ msgid "Only output warnings and errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:31
-#, fuzzy
 msgid "Specify the number of jobs to run in parallel"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:32
 msgid "Update a specific group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:33
-#, fuzzy
 msgid ""
 "Package the .gem files required by your application into the vendor/cache "
 "directory"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:34
-#, fuzzy
 msgid "Install the binstubs of the listed gem"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:35
-#, fuzzy
 msgid "Binstub destination directory (default bin)"
-msgstr "Dokumentationsdateien installieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:36
 msgid "Overwrite existing binstubs if they exist"
@@ -10815,34 +10052,29 @@ msgid "Describe available tasks or one specific task"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:42
-#, fuzzy
 msgid "Package .gem files into the vendor/cache directory"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:44
-#, fuzzy
 msgid "Specify and read configuration options for bundler"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:45
 msgid "Check bundler requirements for your application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:46
-#, fuzzy
 msgid "Show all of the gems in the current bundle"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:47
-#, fuzzy
 msgid "Show the source location of a particular gem in the bundle"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:48
 #: /tmp/fish/implicit/share/completions/bundle.fish:64
-#, fuzzy
 msgid "Show all of the outdated gems in the current bundle"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:49
 #: /tmp/fish/implicit/share/completions/bundle.fish:69
@@ -10855,9 +10087,8 @@ msgid "Generate a visual representation of your dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:52
-#, fuzzy
 msgid "Generate a simple Gemfile"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:53
 #: /tmp/fish/implicit/share/completions/bundle.fish:78
@@ -10885,9 +10116,8 @@ msgid "Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:59
-#, fuzzy
 msgid "Lock the Gemfile"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:60
 #: /tmp/fish/implicit/share/completions/bundle.fish:62
@@ -10902,9 +10132,8 @@ msgid "List the paths of all gems required by your Gemfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:65
-#, fuzzy
 msgid "Check for newer pre-release gems"
-msgstr "Test auf Speicher-Lecks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:66
 msgid "Check against a specific source"
@@ -10923,9 +10152,8 @@ msgid "The name to use for the generated file (see format option)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:73
-#, fuzzy
 msgid "Show each gem version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:74
 msgid "Show the version of each required dependency"
@@ -10936,9 +10164,8 @@ msgid "Output a specific format (png, jpg, svg, dot, …)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:76
-#, fuzzy
 msgid "Generate a simple Gemfile, placed in the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:77
 msgid "Use a specified .gemspec to create the Gemfile"
@@ -10961,9 +10188,8 @@ msgid "Generate the boilerplate for C extension code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:84
-#, fuzzy
 msgid "Only display Ruby directive information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:86
 msgid "Only print out changes, do not actually clean gems"
@@ -10982,9 +10208,8 @@ msgid "Include all sources (including path and git)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:91
-#, fuzzy
 msgid "Prints the license of all gems in the bundle"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:92
 msgid "Print information about the environment Bundler is running under"
@@ -11004,9 +10229,8 @@ msgstr "Überschreiben"
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:3
 #: /tmp/fish/implicit/share/completions/bzip2.fish:5
-#, fuzzy
 msgid "Do not overwrite"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:4
 #: /tmp/fish/implicit/share/completions/bzcat.fish:1
@@ -11028,9 +10252,8 @@ msgid "Print license"
 msgstr "Lizenz ausgeben"
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
-#, fuzzy
 msgid "Suppress message payload display"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:2
 msgid "Show a flat list instead of a tree"
@@ -11041,9 +10264,8 @@ msgid "Activate the peer if necessary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:4
-#, fuzzy
 msgid "Only show unique (:X.Y) names"
-msgstr "Nur einmalige Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:5
 msgid "Only show well-known names"
@@ -11060,9 +10282,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bzip2.fish:1
 #: /tmp/fish/implicit/share/completions/gunzip.fish:1
 #: /tmp/fish/implicit/share/completions/gzip.fish:1
-#, fuzzy
 msgid "Compress to stdout"
-msgstr "Auf Standardausgabe dekomprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzip2.fish:2
 msgid "Compress file"
@@ -11087,28 +10308,24 @@ msgid "Large block size"
 msgstr "Grosse Blockgrösse"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:2
-#, fuzzy
 msgid "List all help topics"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:3
-#, fuzzy
 msgid "List all commands"
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:4
-#, fuzzy
 msgid "Help about supported formats"
-msgstr "Komma-getrenntes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:5
 msgid "Help about current supported formats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:6
-#, fuzzy
 msgid "How to specify revisions in bzr"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:7
 msgid "Show bug tracker settings in bzr"
@@ -11151,9 +10368,8 @@ msgid "Switch the checkout in the current directory to the new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:17
-#, fuzzy
 msgid "Hard-link working tree files where possible"
-msgstr "Arbeitsbaum mit Paketdepot synchronisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:18
 msgid "Bind new branch to from location"
@@ -11164,33 +10380,28 @@ msgid "Create a branch without a working-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:20
-#, fuzzy
 msgid "Make files or directories versioned"
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:21
-#, fuzzy
 msgid "Don't recursively add the contents of directories"
-msgstr "Keine Verzeichnis-Hierarchie erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:22
-#, fuzzy
 msgid "Ignore a file or pattern"
-msgstr "white space (Worttrenner) ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:23
 msgid "Display the default ignore rules that bzr uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:24
-#, fuzzy
 msgid "Move or rename a versioned file"
-msgstr "Datei nicht erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:25
-#, fuzzy
 msgid "Automatically guess renames"
-msgstr "Automatisch Ja für Abfragen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:26
 msgid ""
@@ -11199,41 +10410,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:27
-#, fuzzy
 msgid "Summarize changes in working copy"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:28
 msgid "Use short status indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:29
-#, fuzzy
 msgid "Only show versioned files"
-msgstr "Nur neuere Dateien speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:30
-#, fuzzy
 msgid "Don't show pending merges"
-msgstr "Führenden / nicht entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:31
 msgid "Do not mark object type using indicator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:32
-#, fuzzy
 msgid "Show internal object ids"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:33
 msgid "Show detailed diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:34
-#, fuzzy
 msgid "Pull in changes from another branch"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:35
 msgid ""
@@ -11242,9 +10448,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:36
-#, fuzzy
 msgid "Remember the specified location as a default"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:37
 msgid "Merge even if the destination tree has uncommitted changes"
@@ -11260,18 +10465,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:40
-#, fuzzy
 msgid "Show base revision text in conflicts"
-msgstr "Letzte Revision anzeigen, bei der jede Zeile verändert wurde"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:41
 msgid "Instead of merging, show a diff of the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:42
-#, fuzzy
 msgid "Select changes interactively"
-msgstr "Schnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:43
 msgid ""
@@ -11280,14 +10483,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:44
 #: /tmp/fish/implicit/share/completions/bzr.fish:45
-#, fuzzy
 msgid "Select changes introduced by the specified revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:46
-#, fuzzy
 msgid "Save some or all changes"
-msgstr "Anzahl der Audiokanäle festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:47
 msgid ""
@@ -11296,18 +10497,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:48
-#, fuzzy
 msgid "Take commit message from this file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:49
 msgid "Do not consider changes made to a given path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:50
-#, fuzzy
 msgid "Description of the new revision"
-msgstr "Beschreibung dieser Vervollständigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:51
 msgid "Set the author's name, if it's different from the commiter"
@@ -11326,9 +10525,8 @@ msgid "Mark a bug as being fixed by this revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:55
-#, fuzzy
 msgid "Refuse to commit if there are unknown files in the working tree"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:56
 msgid ""
@@ -11359,14 +10557,12 @@ msgid "Mail the request to this address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:62
-#, fuzzy
 msgid "Use the specified output format"
-msgstr "Angegebene Warteschlange benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:63
-#, fuzzy
 msgid "Do not include a bundle in the merge directive"
-msgstr "Unterverzeichnisgrösse nicht einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:64
 msgid ""
@@ -11379,50 +10575,41 @@ msgid "Do not include a preview patch in the merge directive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:66
-#, fuzzy
 msgid "Show history of changes"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:67
-#, fuzzy
 msgid "Validate storage"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:68
-#, fuzzy
 msgid "Check the working tree related to the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:69
-#, fuzzy
 msgid "Check the repository related to the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:70
-#, fuzzy
 msgid "Check the branch related to the current directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:71
-#, fuzzy
 msgid "Show usage message and options"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:382
-#, fuzzy
 msgid "Show help message"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:73
-#, fuzzy
 msgid "Only displays errors and warnings"
-msgstr "Einge Fehler zu Warnungen herabstufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:74
-#, fuzzy
 msgid "Display more information"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:75
 msgid "Show what would be done"
@@ -11481,18 +10668,16 @@ msgid "Default port to use for HTTPS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:14
-#, fuzzy
 msgid "Process log file"
-msgstr "Zeiger auf Prozessliste"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:15
 msgid "Path to write pid file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:16
-#, fuzzy
 msgid "List installed plugins"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:17
 msgid "Default port"
@@ -11511,14 +10696,12 @@ msgid "Hostname for which to revoke the certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:21
-#, fuzzy
 msgid "Root path of default site"
-msgstr "Standardpaketdepot nicht festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:22
-#, fuzzy
 msgid "Type of server to run"
-msgstr "Top-Server in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:23
 msgid "Parse the Caddyfile but do not start the server"
@@ -11533,9 +10716,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/modinfo.fish:10
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:128
-#, fuzzy
 msgid "Show version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:1
 msgid "Create an assertion to prevent the display from sleeping"
@@ -11558,9 +10740,8 @@ msgid "Create an assertion to declare that user is active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:6
-#, fuzzy
 msgid "Specifies the timeout value in seconds"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:7
 msgid "Waits for the process with the specified PID to exit"
@@ -11571,29 +10752,24 @@ msgid "Cancel jobs owned by username"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:1
-#, fuzzy
 msgid "Show Help"
-msgstr "Zeittyp anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:3
-#, fuzzy
 msgid "Update before running"
-msgstr "Quelle aktualisieren und erneut erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:4
-#, fuzzy
 msgid "List feeds"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:5
-#, fuzzy
 msgid "Show number of new items"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:6
-#, fuzzy
 msgid "Show number of new items for feed"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:7
 msgid "Feed"
@@ -11612,63 +10788,52 @@ msgid "Add feed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:11
-#, fuzzy
 msgid "Set configuration directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:12
 #: /tmp/fish/implicit/share/completions/pine.fish:10
-#, fuzzy
 msgid "Set configuration file"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:13
-#, fuzzy
 msgid "Set client log file"
-msgstr "Kennzeichnungsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:14
-#, fuzzy
 msgid "Set feed directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:15
-#, fuzzy
 msgid "Set script directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:1
 #: /tmp/fish/implicit/share/completions/light.fish:2
 #: /tmp/fish/implicit/share/completions/rustc.fish:1
-#, fuzzy
 msgid "Print version info and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:2
-#, fuzzy
 msgid "List installed commands"
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:3
 #: /tmp/fish/implicit/share/completions/rustc.fish:2
-#, fuzzy
 msgid "Use verbose output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:4
-#, fuzzy
 msgid "No output printed to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:5
-#, fuzzy
 msgid "Don't build documentation for dependencies"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:6
-#, fuzzy
 msgid "Specify a vcs to use"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:7
 msgid "Opens the docs in a browser after the operation"
@@ -11683,9 +10848,8 @@ msgid "Login of a user to remove as an owner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:10
-#, fuzzy
 msgid "Don't verify the contents by building them"
-msgstr "Zeit-Attribute nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:11
 msgid "Ignore warnings about a lack of human-usable metadata"
@@ -11724,9 +10888,8 @@ msgid "Path or URL to SRT or VTT file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:5
-#, fuzzy
 msgid "Set subtitles font scale"
-msgstr "Untertitel-Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:6
 msgid "Set subtitles font RGBA color"
@@ -11737,15 +10900,13 @@ msgid "Specify port to be used for serving subtitles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:8
-#, fuzzy
 msgid "Set local IP"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:9
 #: /tmp/fish/implicit/share/completions/pv.fish:12
-#, fuzzy
 msgid "No output"
-msgstr "Video-Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:10
 msgid "Explicitly set the mime-type"
@@ -11769,37 +10930,32 @@ msgid "Play in random order"
 msgstr "in zufälliger Reihenfolge spielen"
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:15
-#, fuzzy
 msgid "List all files in directories recursively"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:16
-#, fuzzy
 msgid "Set at which the volume changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:17
 msgid "Specify port to be used for serving local file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:18
-#, fuzzy
 msgid "Specify port to be used for serving transcoded file"
-msgstr "Port für Weboberfläche angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:19
-#, fuzzy
 msgid "Specify port to be used for serving torrented file"
-msgstr "Port für Weboberfläche angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:20
 msgid "Specify port to be used for serving file read from stdin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:21
-#, fuzzy
 msgid "Execute key command(s)"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:22
 msgid "Exit when playback begins or --command completes"
@@ -11826,9 +10982,8 @@ msgid "Do not print out a status report for failed SCSI commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:7
-#, fuzzy
 msgid "Force to continue on some errors"
-msgstr "Keine Fortsetzung bei Fehlern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:8
 msgid "Tell cdrecord to set the SCSI IMMED flag in certain commands"
@@ -11858,9 +11013,8 @@ msgid "Set TAO (Track At Once) writing mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:14
-#, fuzzy
 msgid "Set RAW writing mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:15
 msgid "Select Set RAW writing, the preferred raw writing mode"
@@ -11908,9 +11062,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:25
-#, fuzzy
 msgid "Load the media and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:26
 msgid "Load the media, lock the door and exit"
@@ -11933,9 +11086,8 @@ msgid "Format a CD-RW/DVD-RW/DVD+RW disc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:31
-#, fuzzy
 msgid "Set the FIFO (ring buffer) size to #"
-msgstr "Speicherpuffergröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:32
 msgid "Set the maximum transfer size for a single SCSI command to #"
@@ -11958,9 +11110,8 @@ msgid "Allows the user to manually select a driver for the device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-#, fuzzy
 msgid "Set driver specific options"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
 msgid ""
@@ -12003,9 +11154,8 @@ msgid "Ignore the known size of the medium, use for debugging only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:47
-#, fuzzy
 msgid "Use *.inf files to overwrite audio options"
-msgstr "Antwort für Überschreib-Fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:48
 msgid "Set the default pre-gap size for all tracks except track nr 1"
@@ -12162,9 +11312,8 @@ msgstr "Informationen über geänderte Dateien ausgeben"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:2
 #: /tmp/fish/implicit/share/completions/chown.fish:2
-#, fuzzy
 msgid "Dereference symbolic links"
-msgstr "Symbolische Verweise dereferenzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:3
 #: /tmp/fish/implicit/share/completions/chown.fish:3
@@ -12178,9 +11327,8 @@ msgstr "Von Eigner/Gruppe wechseln"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:5
 #: /tmp/fish/implicit/share/completions/chown.fish:5
-#, fuzzy
 msgid "Suppress errors"
-msgstr "Fehler unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:6
 #: /tmp/fish/implicit/share/completions/chown.fish:6
@@ -12207,29 +11355,25 @@ msgid "Do not treat / specially (the default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:3
-#, fuzzy
 msgid "Fail to operate recursively on /"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:4
 #: /tmp/fish/implicit/share/completions/readlink.fish:5
-#, fuzzy
 msgid "Suppress most error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:5
-#, fuzzy
 msgid "Output a diagnostic for every file processed"
-msgstr "Informationen zu jeder Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:6
 msgid "Use RFILEs mode instead of MODE values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:7
-#, fuzzy
 msgid "Change files and directories recursively"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chown.fish:11
 #: /tmp/fish/implicit/share/completions/chown.fish:12
@@ -12238,34 +11382,28 @@ msgid "Username"
 msgstr "Benutzername"
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
-#, fuzzy
 msgid "Specify your login shell"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:2
-#, fuzzy
 msgid "Display help and exit\t"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:4
-#, fuzzy
 msgid "List available shells and exit"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:2
-#, fuzzy
 msgid "Update your climate install"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:3
-#, fuzzy
 msgid "uninstall climate"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:4
-#, fuzzy
 msgid "Show climate version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:5
 msgid "Get the weather"
@@ -12273,23 +11411,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:6
 #: /tmp/fish/implicit/share/completions/climate.fish:7
-#, fuzzy
 msgid "Display remaining battery"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:8
 msgid "Lock computer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:9
-#, fuzzy
 msgid "Shutdown the computer"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:10
-#, fuzzy
 msgid "Restart the computer"
-msgstr "Startkapitel festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:12
 msgid "Put a console clock in the top right corner"
@@ -12304,67 +11439,56 @@ msgid "A stopwatch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:15
-#, fuzzy
 msgid "Pipe output to ix.io"
-msgstr "Ausgabe an Datei anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:16
-#, fuzzy
 msgid "Find the biggest files recursively"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:17
-#, fuzzy
 msgid "Find the biggest directories"
-msgstr "Datei ist ein Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:18
-#, fuzzy
 msgid "Find directory size"
-msgstr "Unterverzeichnisgrösse nicht einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:19
-#, fuzzy
 msgid "Remove empty directories"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:20
-#, fuzzy
 msgid "Extract any given archive"
-msgstr "Aus Archiv extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:21
-#, fuzzy
 msgid "Report duplicate files in a directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:22
-#, fuzzy
 msgid "Count the number of occurences"
-msgstr "Anzahl der Argumente zählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:23
 msgid "Monitor file for changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:24
-#, fuzzy
 msgid "Search for the given pattern recursively"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:25
-#, fuzzy
 msgid "Replace all occurences"
-msgstr "include-Verzeichnisse ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:26
 msgid "Create a ramfs of size (in MB) at path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:27
-#, fuzzy
 msgid "Test your network speed"
-msgstr "Markierungen, die Sie sehen möchten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:28
 msgid "Retrieve your local ip address"
@@ -12379,52 +11503,44 @@ msgid "Retrieve your public ip address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:31
-#, fuzzy
 msgid "List open ports"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:32
-#, fuzzy
 msgid "Edit the hosts file"
-msgstr "In Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:33
-#, fuzzy
 msgid "http-server serving the current directory"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:34
 msgid "Determine if server is up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:35
-#, fuzzy
 msgid "Download file from server"
-msgstr "Originaldateien editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:36
-#, fuzzy
 msgid "Download dir from server"
-msgstr "Eine Quelle herunterladen und extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:37
-#, fuzzy
 msgid "Upload to server"
-msgstr "Proxy-Server verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:38
-#, fuzzy
 msgid "Mount a remote path"
-msgstr "Patch nicht signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:39
 msgid "Unmount a ssh mount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:40
-#, fuzzy
 msgid "Undo the latest commit"
-msgstr "Das test-Skript ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:41
 msgid "Reset local repo to match remote"
@@ -12435,28 +11551,24 @@ msgid "Seset local repo to match remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:43
-#, fuzzy
 msgid "List all branches"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:44
-#, fuzzy
 msgid "Calculate the repo size"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:45
 msgid "Calculate total contribution for a user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:46
-#, fuzzy
 msgid "Display a performance overview"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:47
-#, fuzzy
 msgid "Find memory used"
-msgstr "Speicherbedarf reduzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:48
 msgid "Find disk used"
@@ -12471,18 +11583,16 @@ msgid "Find the trash size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:51
-#, fuzzy
 msgid "Empty the trash"
-msgstr "Shell verlassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:1
 msgid "Combine sets of lines from two files using boolean operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:2
-#, fuzzy
 msgid "Output lines that are in both files"
-msgstr "rss-Data in Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:3
 msgid "Output lines that are inf file1 but not in file2"
@@ -12497,9 +11607,8 @@ msgid "Output lines that are in either file1 or file2, but not in both files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:6
-#, fuzzy
 msgid "Read file from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/command.fish:2
 msgid "Print the file that would be executed"
@@ -12550,23 +11659,20 @@ msgid "Inject readline functions to reader"
 msgstr "readline-Funktion zum reader injizieren"
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:11
-#, fuzzy
 msgid "Print each token on a separate line"
-msgstr "Länge der längsten Zeile ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:12
-#, fuzzy
 msgid "Specify command to operate on"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:13
 msgid "Set/get cursor position, not buffer contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:14
-#, fuzzy
 msgid "Print the line that the cursor is on"
-msgstr "Nachrichten über den Programmablauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:15
 msgid "Return true if performing a history search"
@@ -12625,9 +11731,8 @@ msgid "Measure differences between images with this metric [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:23
-#, fuzzy
 msgid "Get the passphrase from this file [filename]"
-msgstr "Passwortsatz aus dem angegebenen Dateideskriptor lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:24
 #: /tmp/fish/implicit/share/completions/display.fish:32
@@ -12646,9 +11751,8 @@ msgid "JPEG/MIFF/PNG compression level [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:34
-#, fuzzy
 msgid "Search for subimage"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:36
 #: /tmp/fish/implicit/share/completions/composite.fish:74
@@ -12666,9 +11770,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/scanimage.fish:34
 #: /tmp/fish/implicit/share/completions/stream.fish:33
 #: /tmp/fish/implicit/share/completions/terraform.fish:1
-#, fuzzy
 msgid "Print version information"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:44
 #: /tmp/fish/implicit/share/completions/composite.fish:39
@@ -12687,14 +11790,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:73
 #: /tmp/fish/implicit/share/completions/montage.fish:59
 #: /tmp/fish/implicit/share/completions/stream.fish:25
-#, fuzzy
 msgid "Declare the image as modified"
-msgstr "Vorgegebene Datei wurde geändert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:1
-#, fuzzy
 msgid "Command to add completion to"
-msgstr "Pfad, bei dem Vervollständigung berücksichtigt werden soll"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:2
 msgid "Path to add completion to"
@@ -12737,14 +11838,12 @@ msgid "Option list is not complete"
 msgstr "Optionsliste ist nicht vollständig"
 
 #: /tmp/fish/implicit/share/completions/complete.fish:12
-#, fuzzy
 msgid "Remove completion"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:14
-#, fuzzy
 msgid "Print all completions for the specified commandline"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:15
 msgid ""
@@ -12753,24 +11852,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:16
-#, fuzzy
 msgid "Inherit completions from the specified command"
-msgstr "Ausgabe durch angegebenen Befehl schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:1
-#, fuzzy
 msgid "User script"
-msgstr "Datei auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:2
-#, fuzzy
 msgid "Short information about Composer"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:3
-#, fuzzy
 msgid "Create an archive of this composer package"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:4
 #: /tmp/fish/implicit/share/completions/composer.fish:15
@@ -12783,14 +11878,12 @@ msgid "Clears composer's internal package cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:8
-#, fuzzy
 msgid "Create new project from a package into given directory."
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:9
-#, fuzzy
 msgid "Shows which packages depend on the given package"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:10
 msgid "Diagnoses the system to identify common errors."
@@ -12798,9 +11891,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:11
 #: /tmp/fish/implicit/share/completions/composer.fish:12
-#, fuzzy
 msgid "Dumps the autoloader"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:13
 #, sh-format
@@ -12808,14 +11900,12 @@ msgid "Allows running commands in the global composer dir ($COMPOSER_HOME)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:14
-#, fuzzy
 msgid "Displays help for a command"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:16
-#, fuzzy
 msgid "Creates a basic composer.json file in current directory."
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:17
 msgid ""
@@ -12824,19 +11914,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:18
-#, fuzzy
 msgid "Show information about licenses of dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:19
-#, fuzzy
 msgid "Lists commands"
-msgstr "Prozessbefehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:20
-#, fuzzy
 msgid "Removes a package from the require or require-dev"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:21
 msgid "Adds required packages to your composer.json and installs them"
@@ -12848,25 +11935,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:23
 #: /tmp/fish/implicit/share/completions/npm.fish:34
-#, fuzzy
 msgid "Search for packages"
-msgstr "Quellpakete abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:24
 #: /tmp/fish/implicit/share/completions/composer.fish:25
-#, fuzzy
 msgid "Updates composer.phar to the latest version."
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:26
-#, fuzzy
 msgid "Show information about packages"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:27
-#, fuzzy
 msgid "Show a list of locally modified packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:28
 msgid ""
@@ -12879,23 +11962,20 @@ msgid "Validates a composer.json"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:30
-#, fuzzy
 msgid "Shows which packages cause the given package to be installed"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:31
-#, fuzzy
 msgid "Shows which packages prevent the given package from being installed"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:32
 msgid "Displays composer's help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:33
-#, fuzzy
 msgid "Do not output any message."
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:34
 msgid ""
@@ -12904,9 +11984,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:35
-#, fuzzy
 msgid "Display composer's application version."
-msgstr "Kompressionsrate anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:36
 msgid "Force ANSI output."
@@ -12917,9 +11996,8 @@ msgid "Disable ANSI output."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:38
-#, fuzzy
 msgid "Do not ask any interactive question."
-msgstr "Ausführung im interaktiven Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:39
 msgid "Display timing and memory usage information."
@@ -12949,15 +12027,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:5
 #: /tmp/fish/implicit/share/completions/mogrify.fish:15
 #: /tmp/fish/implicit/share/completions/montage.fish:11
-#, fuzzy
 msgid "Annotate image with comment [string]"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:12
-#, fuzzy
 msgid "Composite operator [operator]"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:13
 #: /tmp/fish/implicit/share/completions/convert.fish:24
@@ -13014,9 +12090,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:30
 #: /tmp/fish/implicit/share/completions/mogrify.fish:57
 #: /tmp/fish/implicit/share/completions/montage.fish:43
-#, fuzzy
 msgid "Font point size [value]"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:32
 #: /tmp/fish/implicit/share/completions/convert.fish:57
@@ -13029,9 +12104,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:62
 #: /tmp/fish/implicit/share/completions/import.fish:36
 #: /tmp/fish/implicit/share/completions/mogrify.fish:64
-#, fuzzy
 msgid "Image scene number [value]"
-msgstr "Vergleiche generelle numerische Werte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:43
 msgid "Repeat composite operation across and down image"
@@ -13158,9 +12232,8 @@ msgid "Architecture-dependent install directory"
 msgstr "Architekturabhängiges Installationsverzeichnis"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:10
-#, fuzzy
 msgid "Configure for building on BUILD"
-msgstr "Konfiguration zur Kompilererstellung für ZIEL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:11
 msgid "Cross-compile to build programs to run on HOST"
@@ -13175,9 +12248,8 @@ msgid "Shows if the system is online or offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:2
-#, fuzzy
 msgid "Display technologies"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:3
 msgid "Get System Clock Properties"
@@ -13188,23 +12260,20 @@ msgid "Enables given technology or offline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:5
-#, fuzzy
 msgid "Disables given technology or offline mode"
-msgstr "Import des Seitenmoduls deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:6
 msgid "Enable, disable tethering, set SSID and passphrase for wifi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:7
-#, fuzzy
 msgid "Display services"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:8
-#, fuzzy
 msgid "Display peers"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:9
 msgid "Scans for new services for given technology"
@@ -13219,24 +12288,20 @@ msgid "Disconnect a given service or peer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:12
-#, fuzzy
 msgid "Set service configuration options"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:13
-#, fuzzy
 msgid "Monitor signals from interfaces"
-msgstr "X-Schnittstelle nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:14
-#, fuzzy
 msgid "Display VPN connections"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:15
-#, fuzzy
 msgid "Enable or disable a session"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:16
 msgid "(Un)Register a Peer Service"
@@ -13266,9 +12331,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:7
 #: /tmp/fish/implicit/share/completions/mogrify.fish:5
-#, fuzzy
 msgid "Background color [color]"
-msgstr "Hintergrundfarbe ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:8
 #: /tmp/fish/implicit/share/completions/mogrify.fish:6
@@ -13350,14 +12414,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:51
 #: /tmp/fish/implicit/share/completions/identify.fish:18
 #: /tmp/fish/implicit/share/completions/mogrify.fish:56
-#, fuzzy
 msgid "Efficiently determine image attributes"
-msgstr "Zusätzliche Dateiattribute ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:53
-#, fuzzy
 msgid "Maximum number of significant digits to print [value]"
-msgstr "erlaubte Anzahl maximaler Verbindungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:54
 #: /tmp/fish/implicit/share/completions/mogrify.fish:58
@@ -13525,39 +12587,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
-#, fuzzy
 msgid "Specify eye string"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:2
 #: /tmp/fish/implicit/share/completions/cowthink.fish:2
-#, fuzzy
 msgid "Specify cow file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:4
 #: /tmp/fish/implicit/share/completions/cowthink.fish:4
-#, fuzzy
 msgid "List all cowfiles"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:5
 #: /tmp/fish/implicit/share/completions/cowthink.fish:5
-#, fuzzy
 msgid "No word wrapping"
-msgstr "Ping-Flood"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:6
 #: /tmp/fish/implicit/share/completions/cowthink.fish:6
-#, fuzzy
 msgid "Specify tounge string"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:7
 #: /tmp/fish/implicit/share/completions/cowthink.fish:7
-#, fuzzy
 msgid "Column width"
-msgstr "Zeilenbreite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:8
 #: /tmp/fish/implicit/share/completions/cowthink.fish:8
@@ -13601,9 +12657,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:1
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:1
-#, fuzzy
 msgid "Cancels all jobs on the named destination"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:2
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:2
@@ -13616,9 +12671,8 @@ msgid "Releases pending jobs for printing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:4
-#, fuzzy
 msgid "Disable reason"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:4
 msgid "Cancel reason"
@@ -13626,14 +12680,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsreject.fish:1
 #: /tmp/fish/implicit/share/completions/reject.fish:1
-#, fuzzy
 msgid "Reject reason"
-msgstr "Abzulehnende Protokolle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:1
-#, fuzzy
 msgid "Output byte range"
-msgstr "Bytebereich ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:2
 msgid "Output character range"
@@ -13648,107 +12700,88 @@ msgid "Select fields"
 msgstr "Felder auswählen"
 
 #: /tmp/fish/implicit/share/completions/cut.fish:5
-#, fuzzy
 msgid "Don't split multi byte characters"
-msgstr "Multibytezeichen nicht trennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:6
-#, fuzzy
 msgid "Do not print lines without delimiter"
-msgstr "Zeilen nicht ohne Begrenzer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:7
 msgid "Select output delimiter"
 msgstr "Ausgabebegrenzer festlegen"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:1
-#, fuzzy
 msgid "Displays usage information for command."
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:2
-#, fuzzy
 msgid "Cause CVS to be really quiet."
-msgstr "Veranlasst CVS, wirklich still zu sein"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:3
-#, fuzzy
 msgid "Cause CVS to be somewhat quiet."
-msgstr "Veranlasst CVS, etwas stiller zu sein"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:4
-#, fuzzy
 msgid "Make checked-out files read-only."
-msgstr "Ausgecheckte Dateien mit Schreibschutz versehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:5
-#, fuzzy
 msgid "Make checked-out files read-write (default)."
-msgstr "Ausgecheckte Dateien beschreibbar machen (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:6
-#, fuzzy
 msgid "Do not execute anything that will change the disk."
-msgstr "Nichts ausführen, was Änderungen auf die Platte schreibt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:7
-#, fuzzy
 msgid "Show trace of program execution -- try with -n."
-msgstr "Programmablauf anzeigen -- versuchen Sie -n"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:8
 msgid "Assume repository is read-only, such as CDROM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:9
-#, fuzzy
 msgid "CVS version and copyright."
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:10
-#, fuzzy
 msgid "Use 'tmpdir' for temporary files."
-msgstr "tmpdir für temporäre Dateien benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:11
-#, fuzzy
 msgid "Use 'editor' for editing log information."
-msgstr "Editor zum Editieren der Loginformation verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:13
-#, fuzzy
 msgid "Do not use the ~/.cvsrc file."
-msgstr "~/.cvsrc-Datei nicht benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:14
-#, fuzzy
 msgid "Request compression level '#' for net traffic."
-msgstr "Komprimierungsgrad für Netzverkehr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:15
-#, fuzzy
 msgid "Encrypt all net traffic."
-msgstr "Sämtlichen Netzverkehr verschlüsseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:16
-#, fuzzy
 msgid "Authenticate all net traffic."
-msgstr "Sämtlichen Netzverkehr authentifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:17
-#, fuzzy
 msgid "Use IPv4 addresses only."
-msgstr "Nur IPv4-Adressen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:18
-#, fuzzy
 msgid "Use IPv6 addresses only."
-msgstr "Nur IPv6-Adressen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:19
-#, fuzzy
 msgid "Set CVS user variable."
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:20
 msgid "Add a new file/directory to the repository"
@@ -13795,32 +12828,28 @@ msgid "Import sources into CVS, using vendor branches"
 msgstr "Quellen in CVS importieren, verwende Herstellerzweige"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:31
-#, fuzzy
 msgid "Create a CVS repository if it doesn't exist"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:32
 msgid "Kerberos server mode"
 msgstr "Kerberos-Servermodus"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:33
-#, fuzzy
 msgid "Print out history information for files"
-msgstr "Verlaufsinformationen für ein Modul ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:34
 msgid "Prompt for password for authenticating server"
 msgstr "Abfrage des Passworts für den Authentifizierungsserver"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:35
-#, fuzzy
 msgid "Removes entry in .cvspass for remote repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:36
-#, fuzzy
 msgid "List files available from CVS"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:37
 msgid "Password server mode"
@@ -13831,27 +12860,24 @@ msgid "Show last revision where each line of module was modified"
 msgstr "Zeige letzte Revision, bei der jede Modulzeile verändert wurde"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:39
-#, fuzzy
 msgid "Create 'patch' format diffs between releases"
-msgstr "Erstelle Diffs zwischen Veröffentlichungen im Patch-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:40
 msgid "Indicate that a Module is no longer in use"
 msgstr "Anzeigen, das ein Modul nicht mehr benutzt wird"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:41
-#, fuzzy
 msgid "Remove an entry from the repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:42
 msgid "Print out history information for a module"
 msgstr "Verlaufsinformationen für ein Modul ausgeben"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:43
-#, fuzzy
 msgid "List files in a module"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:44
 msgid "Add a symbolic tag to a module"
@@ -13862,9 +12888,8 @@ msgid "Server mode"
 msgstr "Server-Modus"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:46
-#, fuzzy
 msgid "Display status information on checked out files"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:47
 msgid "Add a symbolic tag to checked out version of files"
@@ -13872,23 +12897,20 @@ msgstr ""
 "Der Version von ausgecheckten Dateien eine symbolische Markierung hinzufügen"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
-#, fuzzy
 msgid "Undo an edit command"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:49
 msgid "Bring work tree in sync with repository"
 msgstr "Arbeitsbaum mit Paketdepot synchronisieren"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:50
-#, fuzzy
 msgid "Show current CVS version(s)"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:51
-#, fuzzy
 msgid "Set watches"
-msgstr "Architektur festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:52
 msgid "See who is watching a file"
@@ -13907,9 +12929,8 @@ msgid "Append (comma-separated) user names to access list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:56
-#, fuzzy
 msgid "Append another file's access list."
-msgstr "Neue Dateien anfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:57
 msgid "[rev]    Set default branch (highest branch on trunk if omitted)."
@@ -13924,14 +12945,12 @@ msgid "[users]  Remove (comma-separated) user names from access list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:60
-#, fuzzy
 msgid "Run interactively."
-msgstr "Benutzer interaktiv fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
-#, fuzzy
 msgid "Set keyword substitution mode:"
-msgstr "Befehlsersetzungsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:62
 msgid "[rev]    Lock revision (latest revision on branch,"
@@ -13942,9 +12961,8 @@ msgid "Set strict locking."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:64
-#, fuzzy
 msgid "Replace revision's log message."
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:65
 msgid "Tag branch or revision.  If :rev is omitted,"
@@ -13955,9 +12973,8 @@ msgid "Same as -n except override existing tag."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:67
-#, fuzzy
 msgid "Delete (outdate) specified range of revisions:"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:68
 msgid "Run quietly."
@@ -14002,9 +13019,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:259
 #: /tmp/fish/implicit/share/completions/cvs.fish:267
 #: /tmp/fish/implicit/share/completions/cvs.fish:278
-#, fuzzy
 msgid "Process directories recursively."
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:76
 #: /tmp/fish/implicit/share/completions/cvs.fish:205
@@ -14013,21 +13029,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:77
 #: /tmp/fish/implicit/share/completions/cvs.fish:206
-#, fuzzy
 msgid "Annotate binary files."
-msgstr "Kommentare in Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:78
 #: /tmp/fish/implicit/share/completions/cvs.fish:207
-#, fuzzy
 msgid "Annotate file as of specified revision/tag."
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:79
 #: /tmp/fish/implicit/share/completions/cvs.fish:208
-#, fuzzy
 msgid "Annotate file as of specified date."
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:80
 #: /tmp/fish/implicit/share/completions/cvs.fish:272
@@ -14043,9 +13056,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:198
 #: /tmp/fish/implicit/share/completions/cvs.fish:241
 #: /tmp/fish/implicit/share/completions/cvs.fish:273
-#, fuzzy
 msgid "Prune empty directories."
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:84
 msgid "\"cat\" the module database."
@@ -14064,9 +13076,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:102
 #: /tmp/fish/implicit/share/completions/cvs.fish:150
 #: /tmp/fish/implicit/share/completions/cvs.fish:211
-#, fuzzy
 msgid "Local directory only, not recursive"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:87
 #: /tmp/fish/implicit/share/completions/cvs.fish:152
@@ -14108,24 +13119,21 @@ msgid "Check for valid edits before committing."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:97
-#, fuzzy
 msgid "Local directory only (not recursive)."
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:98
 msgid "Force the file to be committed; disables recursion."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:99
-#, fuzzy
 msgid "Read the log message from file."
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:100
 #: /tmp/fish/implicit/share/completions/cvs.fish:180
-#, fuzzy
 msgid "Log message."
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:101
 msgid "Commit to this branch or trunk revision."
@@ -14133,9 +13141,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:104
 #: /tmp/fish/implicit/share/completions/cvs.fish:218
-#, fuzzy
 msgid "Specify keyword expansion mode."
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:105
 msgid "Diff revision for date against working file."
@@ -14158,45 +13165,38 @@ msgid "--ignore-case  Consider upper- and lower-case to be the same."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:110
-#, fuzzy
 msgid "--ignore-all-space  Ignore all white space."
-msgstr "white space (Worttrenner) ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:111
-#, fuzzy
 msgid "--ignore-space-change  Ignore changes in the amount of white space."
-msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:112
-#, fuzzy
 msgid "--ignore-blank-lines  Ignore changes whose lines are all blank."
-msgstr "Änderungen ignorieren, deren Zeilen dem reg. Ausdruck entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:113
-#, fuzzy
 msgid "--ignore-matching-lines=RE  Ignore changes whose lines all match RE."
-msgstr "Änderungen ignorieren, deren Zeilen dem reg. Ausdruck entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:114
 msgid "Binary  Read and write data in binary mode."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:115
-#, fuzzy
 msgid "--text  Treat all files as text."
-msgstr "Alle Dateien als Text behandeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:116
-#, fuzzy
 msgid ""
 "-C NUM  --context[=NUM]  Output NUM (default 2) lines of copied context."
-msgstr "NUM Zeilen des kopierten Kontextes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:117
-#, fuzzy
 msgid ""
 "-U NUM  --unified[=NUM]  Output NUM (default 2) lines of unified context."
-msgstr "NUM Zeilen des vereinheitlichten Kontextes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:118
 msgid "UM  Use NUM context lines."
@@ -14211,14 +13211,12 @@ msgid "--show-c-function  Show which C function each change is in."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:121
-#, fuzzy
 msgid "--show-function-line=RE  Show the most recent line matching RE."
-msgstr "Änderungen ignorieren, deren Zeilen dem reg. Ausdruck entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:122
-#, fuzzy
 msgid "Brief  Output only whether files differ."
-msgstr "Nur Unterschiede der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:123
 msgid "--ed  Output an ed script."
@@ -14229,14 +13227,12 @@ msgid "--forward-ed  Output something like an ed script in forward order."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:125
-#, fuzzy
 msgid "--rcs  Output an RCS format diff."
-msgstr "Normalen Diff ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:126
-#, fuzzy
 msgid "--side-by-side  Output in two columns."
-msgstr "Ausgabe in zwei Spalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:127
 msgid "--width=NUM  Output at most NUM (default 130) characters per line."
@@ -14273,9 +13269,8 @@ msgid "--initial-tab  Make tabs line up by prepending a tab."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:136
-#, fuzzy
 msgid "--new-file  Treat absent files as empty."
-msgstr "Nicht vorhandene Dateien als leer behandeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:137
 msgid "--report-identical-files  Report when two files are the same."
@@ -14286,9 +13281,8 @@ msgid "Horizon-lines=NUM  Keep NUM lines of the common prefix and suffix."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:139
-#, fuzzy
 msgid "--minimal  Try hard to find a smaller set of changes."
-msgstr "Versuche, eine kleinere Menge Änderungen zu finden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:140
 msgid ""
@@ -14300,18 +13294,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:266
 #: /tmp/fish/implicit/share/completions/cvs.fish:270
 #: /tmp/fish/implicit/share/completions/cvs.fish:286
-#, fuzzy
 msgid "Local directory only, not recursive."
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:142
 #: /tmp/fish/implicit/share/completions/cvs.fish:147
 #: /tmp/fish/implicit/share/completions/cvs.fish:151
 #: /tmp/fish/implicit/share/completions/cvs.fish:271
 #: /tmp/fish/implicit/share/completions/cvs.fish:287
-#, fuzzy
 msgid "Process directories recursively (default)."
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:143
 msgid "Specify action to register for temporary watch, one of:"
@@ -14328,19 +13320,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:146
 #: /tmp/fish/implicit/share/completions/cvs.fish:223
 #: /tmp/fish/implicit/share/completions/cvs.fish:258
-#, fuzzy
 msgid "Process this directory only (not recursive)."
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:153
-#, fuzzy
 msgid "Export tagged revisions."
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:154
-#, fuzzy
 msgid "Export revisions as of date."
-msgstr "Dem Muster entsprechende Einträge übergehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:155
 msgid "Export into dir instead of module name."
@@ -14359,18 +13348,16 @@ msgid "Committed (Modified) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:159
-#, fuzzy
 msgid "Checked out modules"
-msgstr "Module entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:160
 msgid "Look for specified module (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:161
-#, fuzzy
 msgid "Extract by record type"
-msgstr "Skript extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:162
 msgid "Everything (same as -x, but all record types)"
@@ -14385,14 +13372,12 @@ msgid "Last modified (committed or modified report)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:165
-#, fuzzy
 msgid "Working directory must match"
-msgstr "Verzeichnisnamen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
-#, fuzzy
 msgid "Since date (Many formats)"
-msgstr "Profildatenformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:167
 msgid "Back to record with str in module/file/repos field"
@@ -14407,9 +13392,8 @@ msgid "In module (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:170
-#, fuzzy
 msgid "In repository (repeatable)"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:171
 msgid "Since rev or tag (looks inside RCS files!)"
@@ -14436,9 +13420,8 @@ msgid "When importing new files, mark their trunk revisions as dead."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:177
-#, fuzzy
 msgid "Set default RCS keyword substitution mode."
-msgstr "Befehlsersetzungsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:178
 #: /tmp/fish/implicit/share/completions/cvs.fish:284
@@ -14451,9 +13434,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:181
 #: /tmp/fish/implicit/share/completions/cvs.fish:285
-#, fuzzy
 msgid "Wrappers specification line."
-msgstr "Letzte Veränderungszeit der Datei anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:183
 #: /tmp/fish/implicit/share/completions/cvs.fish:226
@@ -14462,15 +13444,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:184
 #: /tmp/fish/implicit/share/completions/cvs.fish:227
-#, fuzzy
 msgid "Only print header."
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:185
 #: /tmp/fish/implicit/share/completions/cvs.fish:228
-#, fuzzy
 msgid "Only print name of RCS file."
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:186
 #: /tmp/fish/implicit/share/completions/cvs.fish:229
@@ -14479,9 +13459,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:187
 #: /tmp/fish/implicit/share/completions/cvs.fish:230
-#, fuzzy
 msgid "Do not list tags."
-msgstr "keine mtab schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:188
 #: /tmp/fish/implicit/share/completions/cvs.fish:231
@@ -14495,27 +13474,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:190
 #: /tmp/fish/implicit/share/completions/cvs.fish:233
-#, fuzzy
 msgid "This option."
-msgstr "Konfigurations-Option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:191
 #: /tmp/fish/implicit/share/completions/cvs.fish:234
-#, fuzzy
 msgid "[revisions]"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:192
 #: /tmp/fish/implicit/share/completions/cvs.fish:235
-#, fuzzy
 msgid "A semicolon-separated list of dates"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:193
 #: /tmp/fish/implicit/share/completions/cvs.fish:236
-#, fuzzy
 msgid "Only list revisions with specified states."
-msgstr "Partition mit angegebenem Label einhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:194
 #: /tmp/fish/implicit/share/completions/cvs.fish:237
@@ -14524,9 +13499,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:195
 #: /tmp/fish/implicit/share/completions/cvs.fish:238
-#, fuzzy
 msgid "Show dead revisions (with tag when specified)."
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:196
 #: /tmp/fish/implicit/share/completions/cvs.fish:239
@@ -14535,21 +13509,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:197
 #: /tmp/fish/implicit/share/completions/cvs.fish:240
-#, fuzzy
 msgid "Display all details."
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:199
 #: /tmp/fish/implicit/share/completions/cvs.fish:242
-#, fuzzy
 msgid "List recursively."
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:200
 #: /tmp/fish/implicit/share/completions/cvs.fish:243
-#, fuzzy
 msgid "Show files with revision or tag."
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:201
 #: /tmp/fish/implicit/share/completions/cvs.fish:244
@@ -14570,9 +13541,8 @@ msgid "Context diffs (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:214
-#, fuzzy
 msgid "Unidiff format."
-msgstr "Listenformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:215
 msgid "Short patch - one liner per file."
@@ -14583,9 +13553,8 @@ msgid "Top two diffs - last change made to the file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:217
-#, fuzzy
 msgid "Use RCS Version vers for keyword expansion."
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:219
 msgid "Date."
@@ -14596,14 +13565,12 @@ msgid "Revision - symbolic or numeric."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:221
-#, fuzzy
 msgid "Delete the given directory."
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
-#, fuzzy
 msgid "Delete the file before removing it."
-msgstr "Dateien vor dem Löschen umpacken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:245
 msgid "Clear tag from removed files that would not otherwise be tagged."
@@ -14648,18 +13615,16 @@ msgid "Verbose format; includes tag information for the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:262
-#, fuzzy
 msgid "Check that working files are unmodified."
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:274
 msgid "Overwrite locally modified files with clean repository copies."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:275
-#, fuzzy
 msgid "Build directories, like checkout does."
-msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:279
 msgid "Send updates to standard output (avoids stickiness)."
@@ -14674,9 +13639,8 @@ msgid "Set date to update from (is sticky)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:288
-#, fuzzy
 msgid "Specify what actions, one of: "
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:1
 msgid "Build for 32-bit Cygwin"
@@ -14691,34 +13655,28 @@ msgid "Enable debugging messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:4
-#, fuzzy
 msgid "Cygport file"
-msgstr "Konfigurationsdatei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:5
-#, fuzzy
 msgid "Download all sources"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:6
-#, fuzzy
 msgid "Download missing sources"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:7
-#, fuzzy
 msgid "Prepare source directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:8
-#, fuzzy
 msgid "Build software"
-msgstr "Apt-Zwischenspeicher erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:9
-#, fuzzy
 msgid "Run test suite"
-msgstr "Das test-Skript ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:10
 msgid "Install into DESTDIR and run post-installation steps"
@@ -14729,62 +13687,52 @@ msgid "Run post-installation steps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:12
-#, fuzzy
 msgid "List package files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:13
-#, fuzzy
 msgid "List debug package files"
-msgstr "Fehler aus Paketen auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:14
-#, fuzzy
 msgid "Show dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:15
-#, fuzzy
 msgid "Show packaging info"
-msgstr "Paketinformation anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:16
 msgid "Show project homepage URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:17
-#, fuzzy
 msgid "Create packages, marked as test"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:18
-#, fuzzy
 msgid "Create packages"
-msgstr "Paket löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:19
-#, fuzzy
 msgid "Create source patches"
-msgstr "Quellpakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:20
-#, fuzzy
 msgid "Upload finished packages"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:21
-#, fuzzy
 msgid "Upload packages without marking !ready"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:22
 msgid "Send announcement email"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:23
-#, fuzzy
 msgid "Delete working directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:24
 msgid "Same as prep build inst pkg"
@@ -14795,37 +13743,32 @@ msgid "Darcs repo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:2
-#, fuzzy
 msgid "Set the specified option"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:3
-#, fuzzy
 msgid "Display help about darcs and darcs commands"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:4
 msgid "Add one or more new files or directories"
 msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:5
-#, fuzzy
 msgid "Remove files from version control"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:6
-#, fuzzy
 msgid "Move or rename files"
-msgstr "Datei nicht erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:7
 msgid "Substitute one word for another"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:8
-#, fuzzy
 msgid "Discard unrecorded changes"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:9
 msgid "Undo the last revert (may fail if changes after the revert)"
@@ -14834,46 +13777,40 @@ msgstr ""
 "Änderungen vorgenommen wurden)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:10
-#, fuzzy
 msgid "List unrecorded changes in the working tree"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:11
-#, fuzzy
 msgid "Create a patch from unrecorded changes"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:12
 msgid "Remove recorded patches without changing the working copy"
 msgstr "Aufgezeichnete Patche ohne Änderung der Arbeitskopie entfernen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:13
-#, fuzzy
 msgid "Improve a patch before it leaves your repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:14
-#, fuzzy
 msgid "Mark unresolved conflicts in working tree, for manual resolution"
-msgstr "Alle Konflikte in der Arbeitskopie für manuelle Resolution markieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:15
 msgid "Name the current repository state for future reference"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:16
-#, fuzzy
 msgid "Set a preference (test, predist, boringfile or binariesfile)"
-msgstr "Wert für eine Einstellung (test, predist, ...) festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:17
 msgid "Create a diff between two versions of the repository"
 msgstr "Diff zwischen zwei Versionen des Paketdepots erstellen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:18
-#, fuzzy
 msgid "List patches in the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:19
 msgid "Display which patch last modified something"
@@ -14896,14 +13833,12 @@ msgid "Copy and apply patches from another repository to this one"
 msgstr "Patches von einem anderen Paketdepot auf dieses kopieren und anwenden"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:24
-#, fuzzy
 msgid "Delete selected patches from the repository. (UNSAFE!)"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:25
-#, fuzzy
 msgid "Record a new patch reversing some recorded changes"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:26
 msgid "Copy and apply patches from this repository to another one"
@@ -14925,75 +13860,65 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:439
 #: /tmp/fish/implicit/share/completions/darcs.fish:847
 #: /tmp/fish/implicit/share/completions/darcs.fish:880
-#, fuzzy
 msgid "Select changes up to a patch matching PATTERN"
-msgstr "Patches entsprechend dem MUSTER auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:406
 #: /tmp/fish/implicit/share/completions/darcs.fish:440
 #: /tmp/fish/implicit/share/completions/darcs.fish:848
 #: /tmp/fish/implicit/share/completions/darcs.fish:881
-#, fuzzy
 msgid "Select changes up to a patch matching REGEXP"
-msgstr "Dem REGEXP entsprechende Patche auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:407
 #: /tmp/fish/implicit/share/completions/darcs.fish:441
-#, fuzzy
 msgid "Select changes up to a tag matching REGEXP"
-msgstr "Dem REGEXP entsprechende Markierungen auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:408
 #: /tmp/fish/implicit/share/completions/darcs.fish:442
 #: /tmp/fish/implicit/share/completions/darcs.fish:619
 #: /tmp/fish/implicit/share/completions/darcs.fish:657
-#, fuzzy
 msgid "Select changes starting with a patch matching PATTERN"
-msgstr "Patches entsprechend dem MUSTER auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:409
 #: /tmp/fish/implicit/share/completions/darcs.fish:443
 #: /tmp/fish/implicit/share/completions/darcs.fish:620
 #: /tmp/fish/implicit/share/completions/darcs.fish:658
-#, fuzzy
 msgid "Select changes starting with a patch matching REGEXP"
-msgstr "Dem REGEXP entsprechende Patche auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:410
 #: /tmp/fish/implicit/share/completions/darcs.fish:444
 #: /tmp/fish/implicit/share/completions/darcs.fish:621
 #: /tmp/fish/implicit/share/completions/darcs.fish:659
-#, fuzzy
 msgid "Select changes starting with a tag matching REGEXP"
-msgstr "Dem REGEXP entsprechende Markierungen auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:411
 #: /tmp/fish/implicit/share/completions/darcs.fish:495
 #: /tmp/fish/implicit/share/completions/darcs.fish:520
-#, fuzzy
 msgid "Select a single patch matching PATTERN"
-msgstr "Patches entsprechend dem MUSTER auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:412
 #: /tmp/fish/implicit/share/completions/darcs.fish:496
 #: /tmp/fish/implicit/share/completions/darcs.fish:521
-#, fuzzy
 msgid "Select a single patch matching REGEXP"
-msgstr "Dem REGEXP entsprechende Patche auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:413
 #: /tmp/fish/implicit/share/completions/darcs.fish:445
 #: /tmp/fish/implicit/share/completions/darcs.fish:622
 #: /tmp/fish/implicit/share/completions/darcs.fish:660
-#, fuzzy
 msgid "Select the last NUMBER patches"
-msgstr "Lesen nach NUM Treffern beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:414
 #: /tmp/fish/implicit/share/completions/darcs.fish:446
-#, fuzzy
 msgid "Select a range of patches"
-msgstr "Schnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:415
 msgid "Specify diff command (ignores --diff-opts)"
@@ -15008,9 +13933,8 @@ msgid "Pass -u option to diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:418
-#, fuzzy
 msgid "Output patch in diff's dumb format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:419
 #: /tmp/fish/implicit/share/completions/darcs.fish:463
@@ -15038,9 +13962,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:421
 #: /tmp/fish/implicit/share/completions/darcs.fish:525
-#, fuzzy
 msgid "Do patch application on disk [DEFAULT]"
-msgstr "Abbruch bei Patchen, die Konflikte erzeugen (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:422
 #: /tmp/fish/implicit/share/completions/darcs.fish:466
@@ -15103,9 +14026,8 @@ msgstr "Kurze Beschreibung des Befehls und seiner Argumente anzeigen"
 #: /tmp/fish/implicit/share/completions/darcs.fish:974
 #: /tmp/fish/implicit/share/completions/darcs.fish:992
 #: /tmp/fish/implicit/share/completions/darcs.fish:1012
-#, fuzzy
 msgid "Give only debug output"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:425
 #: /tmp/fish/implicit/share/completions/darcs.fish:469
@@ -15125,9 +14047,8 @@ msgstr "Debug-Ausgabe aktivieren"
 #: /tmp/fish/implicit/share/completions/darcs.fish:975
 #: /tmp/fish/implicit/share/completions/darcs.fish:993
 #: /tmp/fish/implicit/share/completions/darcs.fish:1013
-#, fuzzy
 msgid "Give debug and verbose output"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:426
 #: /tmp/fish/implicit/share/completions/darcs.fish:470
@@ -15168,9 +14089,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:977
 #: /tmp/fish/implicit/share/completions/darcs.fish:995
 #: /tmp/fish/implicit/share/completions/darcs.fish:1015
-#, fuzzy
 msgid "Give verbose output"
-msgstr "Ausgabe weder ausführlich noch schweigsam"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:428
 #: /tmp/fish/implicit/share/completions/darcs.fish:472
@@ -15232,9 +14152,8 @@ msgstr "Ausgabe weder ausführlich noch schweigsam"
 #: /tmp/fish/implicit/share/completions/darcs.fish:980
 #: /tmp/fish/implicit/share/completions/darcs.fish:998
 #: /tmp/fish/implicit/share/completions/darcs.fish:1018
-#, fuzzy
 msgid "Provide debugging timings information"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:431
 #: /tmp/fish/implicit/share/completions/darcs.fish:481
@@ -15275,9 +14194,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:982
 #: /tmp/fish/implicit/share/completions/darcs.fish:1001
 #: /tmp/fish/implicit/share/completions/darcs.fish:1026
-#, fuzzy
 msgid "Don't run posthook command"
-msgstr "Entfernten Befehl nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:433
 #: /tmp/fish/implicit/share/completions/darcs.fish:483
@@ -15360,9 +14278,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:986
 #: /tmp/fish/implicit/share/completions/darcs.fish:1005
 #: /tmp/fish/implicit/share/completions/darcs.fish:1030
-#, fuzzy
 msgid "Don't run prehook command"
-msgstr "Entfernten Befehl nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:437
 #: /tmp/fish/implicit/share/completions/darcs.fish:487
@@ -15438,9 +14355,8 @@ msgid "Return only NUMBER results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:451
-#, fuzzy
 msgid "Show only changes to specified files"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:452
 msgid "Show changes to all files [DEFAULT]"
@@ -15457,9 +14373,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:707
 #: /tmp/fish/implicit/share/completions/darcs.fish:760
 #: /tmp/fish/implicit/share/completions/darcs.fish:803
-#, fuzzy
 msgid "Generate XML formatted output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:455
 #: /tmp/fish/implicit/share/completions/darcs.fish:493
@@ -15467,14 +14382,12 @@ msgid "Give human-readable output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:456
-#, fuzzy
 msgid "Number the changes"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:457
-#, fuzzy
 msgid "Output count of changes"
-msgstr "Informationen über geänderte Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:458
 #: /tmp/fish/implicit/share/completions/darcs.fish:489
@@ -15482,9 +14395,8 @@ msgstr "Informationen über geänderte Dateien ausgeben"
 #: /tmp/fish/implicit/share/completions/darcs.fish:632
 #: /tmp/fish/implicit/share/completions/darcs.fish:708
 #: /tmp/fish/implicit/share/completions/darcs.fish:761
-#, fuzzy
 msgid "Summarize changes"
-msgstr "Änderungen nicht zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:459
 #: /tmp/fish/implicit/share/completions/darcs.fish:490
@@ -15496,18 +14408,16 @@ msgid "Don't summarize changes"
 msgstr "Änderungen nicht zusammenfassen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:460
-#, fuzzy
 msgid "Show changes in reverse order"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:461
 msgid "Show changes in the usual order [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:462
-#, fuzzy
 msgid "Specify the repository URL"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:464
 #: /tmp/fish/implicit/share/completions/darcs.fish:566
@@ -15566,9 +14476,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:869
 #: /tmp/fish/implicit/share/completions/darcs.fish:904
 #: /tmp/fish/implicit/share/completions/darcs.fish:1022
-#, fuzzy
 msgid "Disable HTTP pipelining"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:479
 #: /tmp/fish/implicit/share/completions/darcs.fish:609
@@ -15577,9 +14486,8 @@ msgstr "Warnungen über MFC deaktivieren"
 #: /tmp/fish/implicit/share/completions/darcs.fish:870
 #: /tmp/fish/implicit/share/completions/darcs.fish:905
 #: /tmp/fish/implicit/share/completions/darcs.fish:1023
-#, fuzzy
 msgid "Don't use patch caches"
-msgstr "Stapelverarbeitungsmodus nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:480
 #: /tmp/fish/implicit/share/completions/darcs.fish:610
@@ -15597,33 +14505,28 @@ msgstr ""
 "Patch in einem darcs-spezifischen Format ausgeben, das diff -u entspricht"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:492
-#, fuzzy
 msgid "Output patch in darcs' usual format"
 msgstr ""
-"Patch in einem darcs-spezifischen Format ausgeben, das diff -u entspricht"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:497
 #: /tmp/fish/implicit/share/completions/darcs.fish:522
 #: /tmp/fish/implicit/share/completions/darcs.fish:849
 #: /tmp/fish/implicit/share/completions/darcs.fish:882
-#, fuzzy
 msgid "Select tag matching REGEXP"
-msgstr "Dem REGEXP entsprechende Markierungen auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:498
 #: /tmp/fish/implicit/share/completions/darcs.fish:523
-#, fuzzy
 msgid "Select one patch"
-msgstr "Eine Aktion auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:499
 msgid "Specify hash of creator patch (see docs)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:518
-#, fuzzy
 msgid "Name of version"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:553
 #: /tmp/fish/implicit/share/completions/darcs.fish:602
@@ -15635,9 +14538,8 @@ msgid "Make scripts executable"
 msgstr "Skripte ausführbar machen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:568
-#, fuzzy
 msgid "Mark conflicts [DEFAULT]"
-msgstr "Konflikte markieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:569
 #: /tmp/fish/implicit/share/completions/darcs.fish:805
@@ -15646,9 +14548,8 @@ msgstr "Konflikte zulassen, sie aber nicht markieren"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:570
 #: /tmp/fish/implicit/share/completions/darcs.fish:807
-#, fuzzy
 msgid "Filter out any patches that would create conflicts"
-msgstr "Abbruch bei Patchen, die Konflikte erzeugen (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:571
 #: /tmp/fish/implicit/share/completions/darcs.fish:808
@@ -15681,9 +14582,8 @@ msgstr "Aktion nicht tatsächlich ausführen"
 #: /tmp/fish/implicit/share/completions/darcs.fish:626
 #: /tmp/fish/implicit/share/completions/darcs.fish:698
 #: /tmp/fish/implicit/share/completions/darcs.fish:744
-#, fuzzy
 msgid "Don't automatically fulfill dependencies"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:579
 #: /tmp/fish/implicit/share/completions/darcs.fish:627
@@ -15720,19 +14620,16 @@ msgstr "Standardpaketdepot nicht festlegen"
 #: /tmp/fish/implicit/share/completions/darcs.fish:584
 #: /tmp/fish/implicit/share/completions/darcs.fish:713
 #: /tmp/fish/implicit/share/completions/darcs.fish:768
-#, fuzzy
 msgid "Do not check if repositories are unrelated"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:594
-#, fuzzy
 msgid "Take intersection of all repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:595
-#, fuzzy
 msgid "Take union of all repositories [DEFAULT]"
-msgstr "Standardpaketdepot [STANDARD] festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:596
 msgid "Take complement of repositories (in order listed)"
@@ -15743,9 +14640,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:685
 #: /tmp/fish/implicit/share/completions/darcs.fish:830
 #: /tmp/fish/implicit/share/completions/darcs.fish:952
-#, fuzzy
 msgid "Create compressed patches"
-msgstr "Keine komprimierten Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:598
 #: /tmp/fish/implicit/share/completions/darcs.fish:725
@@ -15757,9 +14653,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:646
 #: /tmp/fish/implicit/share/completions/darcs.fish:828
 #: /tmp/fish/implicit/share/completions/darcs.fish:970
-#, fuzzy
 msgid "Don't trust the file modification times"
-msgstr "Modifizierungszeit nicht extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:600
 #: /tmp/fish/implicit/share/completions/darcs.fish:647
@@ -15771,9 +14666,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:601
 #: /tmp/fish/implicit/share/completions/darcs.fish:726
 #: /tmp/fish/implicit/share/completions/darcs.fish:781
-#, fuzzy
 msgid "Specify the remote repository URL to work with"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:603
 #: /tmp/fish/implicit/share/completions/darcs.fish:648
@@ -15813,9 +14707,8 @@ msgstr "Abfragen, ob der lange Kommentar editiert werden soll"
 #: /tmp/fish/implicit/share/completions/darcs.fish:673
 #: /tmp/fish/implicit/share/completions/darcs.fish:811
 #: /tmp/fish/implicit/share/completions/darcs.fish:967
-#, fuzzy
 msgid "Don't remove the test directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:674
 #: /tmp/fish/implicit/share/completions/darcs.fish:812
@@ -15854,52 +14747,45 @@ msgid "Specify destination email"
 msgstr "Ziel-E-Mail-Adresse angeben"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:752
-#, fuzzy
 msgid "Mail results to additional EMAIL(s)"
-msgstr "Ergebnisse an zusätzliche EMAIL(s) senden. Erfordert --reply"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:753
-#, fuzzy
 msgid "Specify mail subject"
-msgstr "makefile angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:754
-#, fuzzy
 msgid "Specify in-reply-to header"
-msgstr "Indexverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:755
 msgid "Specify output filename"
 msgstr "Ausgabedateiname angeben"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:763
-#, fuzzy
 msgid "Edit the patch bundle description"
-msgstr "Beschreibung des Patchpaketes editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:767
 #: /tmp/fish/implicit/share/completions/darcs.fish:827
-#, fuzzy
 msgid "Specify sendmail command"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:778
 msgid "Give patch name and comment in file"
 msgstr "Patch-Name und Kommentar in Datei angeben"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:779
-#, fuzzy
 msgid "Delete the logfile when done"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:780
 msgid "Keep the logfile when done [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:782
-#, fuzzy
 msgid "Send to context stored in FILENAME"
-msgstr "Kontext im DATEINAMEN abgespeichert senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:797
 msgid "Verify that the patch was signed by a key in PUBRING"
@@ -15907,10 +14793,8 @@ msgstr ""
 "Überprüfen, das der Patch mit einem Schlüssel aus PUBRING signiert wurde"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:798
-#, fuzzy
 msgid "Verify using openSSL with authorized keys from file KEYS"
 msgstr ""
-"Mittels openSSL und autorisierten Schlüsseln aus der Datei 'KEYS' überprüfen"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:799
 msgid "Don't verify patch signature"
@@ -15937,9 +14821,8 @@ msgid "Forward unsigned messages without extra header"
 msgstr "Unsignierte Nachrichten ohne zusätzliche Kopfzeile weiterleiten"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:826
-#, fuzzy
 msgid "Don't forward unsigned messages without extra header [DEFAULT]"
-msgstr "Unsignierte Nachrichten ohne zusätzliche Kopfzeile weiterleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:842
 #: /tmp/fish/implicit/share/completions/darcs.fish:1008
@@ -15956,21 +14839,18 @@ msgid "Get patch files only as needed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:845
-#, fuzzy
 msgid "Don't save patch files in the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:846
 #: /tmp/fish/implicit/share/completions/darcs.fish:963
-#, fuzzy
 msgid "Get a complete copy of the repository"
-msgstr "Das ganze Paketdepot prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:850
 #: /tmp/fish/implicit/share/completions/darcs.fish:883
-#, fuzzy
 msgid "Version specified by the context in FILENAME"
-msgstr "Kontext im DATEINAMEN abgespeichert senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:855
 #: /tmp/fish/implicit/share/completions/darcs.fish:885
@@ -15995,14 +14875,12 @@ msgid "Minimal features. What older repos use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:937
-#, fuzzy
 msgid "Reorder the patches in the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:938
-#, fuzzy
 msgid "Specify a sibling directory"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
@@ -16021,9 +14899,8 @@ msgid "Optimize hashed pristine layout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:953
-#, fuzzy
 msgid "Uncompress patches"
-msgstr "Keine komprimierten Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:1
 msgid "Read the value of a key"
@@ -16038,45 +14915,38 @@ msgid "Write a new value to a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:4
-#, fuzzy
 msgid "Delete a key or an entire directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:5
 msgid "Compile a binary database from keyfiles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:6
-#, fuzzy
 msgid "Update the system dconf databases"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:7
-#, fuzzy
 msgid "Watch a key or directory for changes"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:8
-#, fuzzy
 msgid "Dump an entire subpath to stdout"
-msgstr "Auf Standardausgabe dekomprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:9
-#, fuzzy
 msgid "Populate a subpath from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:1
 #: /tmp/fish/implicit/share/completions/emacs.fish:52
 #: /tmp/fish/implicit/share/completions/hg.fish:15
-#, fuzzy
 msgid "display help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:3
-#, fuzzy
 msgid "Complete dd operands"
-msgstr "Vergleiche FILE1 mit allen Operanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:1
 msgid "Restricts preferences operations to the current logged-in host"
@@ -16095,42 +14965,36 @@ msgid "Writes domain or or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:5
-#, fuzzy
 msgid "String as the value for the given key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:6
 msgid "Raw data bytes for given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:7
-#, fuzzy
 msgid "Integer as the value for the given key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:8
 msgid "Floating point number as the value for the given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:9
-#, fuzzy
 msgid "Boolean as the value for the given key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:10
-#, fuzzy
 msgid "Date as the value for the given key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:11
-#, fuzzy
 msgid "Array as the value for the given key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:12
-#, fuzzy
 msgid "Add new elements to the end of an array"
-msgstr "Text am Ende des selektierten Bereichs anfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:13
 msgid "Add a dictionary to domain"
@@ -16141,9 +15005,8 @@ msgid "Add new key/value pairs to a dictionary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:15
-#, fuzzy
 msgid "Shows the type for the given domain, key"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:16
 msgid "Renames old_key to new_key"
@@ -16154,57 +15017,48 @@ msgid "Deletes domain or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:18
-#, fuzzy
 msgid "Prints the names of all domains in the users defaults system"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:19
 msgid "Searches for word in domain names, keys, and values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:20
-#, fuzzy
 msgid "Prints a list of possible command formats"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:1
-#, fuzzy
 msgid "Include empty file systems"
-msgstr "Leere Dateisysteme einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:2
-#, fuzzy
 msgid "Print file system type"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:3
-#, fuzzy
 msgid "Excluded file system type"
-msgstr "Dateisystemtyp ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:4
-#, fuzzy
 msgid "Show all file systems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:1
-#, fuzzy
 msgid "Background immediately"
-msgstr "Direkt nach Start im Hintergrund arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:2
-#, fuzzy
 msgid "Use given script"
-msgstr "Aktualisierungs-Intervall"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:3
 msgid "Generate an RFC 4361 compliant clientid"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:4
-#, fuzzy
 msgid "Echo debug messages to stderr & syslog"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:5
 msgid "Use last acquired lease if cannot obtain one"
@@ -16215,28 +15069,24 @@ msgid "Use last acquired lease if cannot obtain one even if expired"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
-#, fuzzy
 msgid "Reapply configuration for each interface"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:9
 msgid "Request DHCP server to update DNS using FQDN instead of hostname"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:10
-#, fuzzy
 msgid "Specify config to load instead of /etc/dhcpcd.conf"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:11
-#, fuzzy
 msgid "Send hostname to DHCP server"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:12
 msgid "Send given clientid"
@@ -16247,47 +15097,40 @@ msgid "Override DHCPv4 vendorclassid field sent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:14
-#, fuzzy
 msgid "Writes to specfied log file instead of syslog"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:15
 msgid "Release lease and de-configure interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:16
-#, fuzzy
 msgid "Request specific lease time in secs"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:17
-#, fuzzy
 msgid "Start dhcpcd in Master mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:18
 msgid "Set prefered interface based on given rank (lowest wins)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:19
-#, fuzzy
 msgid "Reload config and rebind specified interface"
-msgstr "Quelladresse auf angegebene Schnittstellenadresse festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:20
-#, fuzzy
 msgid "Renew existing addresses on specified interface"
-msgstr "Quelladresse auf angegebene Schnittstellenadresse festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:21
-#, fuzzy
 msgid "Request DHCP option"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:22
-#, fuzzy
 msgid "Keep configuration even when dhcpcd exits"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:23
 msgid "Request given address in DHCP DISCOVER message"
@@ -16302,14 +15145,12 @@ msgid "Perform DHCPv6 Information Request"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:26
-#, fuzzy
 msgid "Configure static DHCP value"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:27
-#, fuzzy
 msgid "Timeout after seconds"
-msgstr "Minimalintervall in Sekunden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:28
 msgid "Tag DHCPv4 message with given userclass"
@@ -16324,9 +15165,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/htop.fish:8
 #: /tmp/fish/implicit/share/completions/pv.fish:33
 #: /tmp/fish/implicit/share/completions/subl.fish:9
-#, fuzzy
 msgid "Show version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:31
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:32
@@ -16371,9 +15211,8 @@ msgid "Ignore changes whose lines are all blank"
 msgstr "Änderungen ignorieren, deren Zeilen alle leer sind"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:8
-#, fuzzy
 msgid "Ignore changes whose lines match the REGEX"
-msgstr "Änderungen ignorieren, deren Zeilen alle leer sind"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:9
 #: /tmp/fish/implicit/share/completions/git.fish:323
@@ -16425,9 +15264,8 @@ msgid "Try to find a smaller set of changes"
 msgstr "Versuche, eine kleinere Menge Änderungen zu finden"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:21
-#, fuzzy
 msgid "Compare FILE1 to all operands"
-msgstr "Vergleiche FILE2 mit allen Operanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:22
 msgid "Compare FILE2 to all operands"
@@ -16454,43 +15292,36 @@ msgid "Bind to source address/port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:5
-#, fuzzy
 msgid "Specify batch mode file"
-msgstr "apt-Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:6
-#, fuzzy
 msgid "Specify query class"
-msgstr "Proxy-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:7
-#, fuzzy
 msgid "Specify TSIG key file"
-msgstr "makefile angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:8
 msgid "specify named base64 TSIG key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:9
-#, fuzzy
 msgid "Specify port number"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:10
-#, fuzzy
 msgid "Specify query name"
-msgstr "Proxy-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:11
-#, fuzzy
 msgid "Specify query type"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:12
-#, fuzzy
 msgid "Reverse lookup"
-msgstr "Sortierreihenfolge umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:13
 #: /tmp/fish/implicit/share/completions/killall.fish:10
@@ -16498,17 +15329,15 @@ msgstr "Sortierreihenfolge umkehren"
 #: /tmp/fish/implicit/share/completions/lsof.fish:1
 #: /tmp/fish/implicit/share/completions/lua.fish:5
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:1
-#, fuzzy
 msgid "Print help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:14
 #: /tmp/fish/implicit/share/completions/feh.fish:55
 #: /tmp/fish/implicit/share/completions/fuser.fish:12
 #: /tmp/fish/implicit/share/completions/tree.fish:43
-#, fuzzy
 msgid "Print version and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:15
 msgid "TCP mode"
@@ -16531,9 +15360,8 @@ msgid "Deprecated, treated as a synonym for +[no]search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:20
-#, fuzzy
 msgid "Recursive mode"
-msgstr "Sicherer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:21
 msgid "Dont revert to TCP for TC responses."
@@ -16576,9 +15404,8 @@ msgid "Control display of question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:31
-#, fuzzy
 msgid "Control display of answer"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:32
 msgid "Control display of authority"
@@ -16605,14 +15432,12 @@ msgid "Set or clear all display flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:38
-#, fuzzy
 msgid "Print question before sending"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:39
-#, fuzzy
 msgid "Search all authoritative nameservers"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:40
 msgid "ID responders in short answers"
@@ -16623,9 +15448,8 @@ msgid "Trace delegation down from root"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:42
-#, fuzzy
 msgid "Request DNSSEC records"
-msgstr "Sätze entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:43
 msgid "Request Name Server ID"
@@ -16640,19 +15464,16 @@ msgid "AXFR prints only one soa record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:46
-#, fuzzy
 msgid "Set number of UDP attempts"
-msgstr "Anzahl der Audiokanäle festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:47
-#, fuzzy
 msgid "Set number of UDP retries"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:48
-#, fuzzy
 msgid "Set query timeout"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:49
 msgid "Set EDNS0 Max UDP packet size"
@@ -16663,9 +15484,8 @@ msgid "Set NDOTS value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:51
-#, fuzzy
 msgid "Set EDNS version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:1
 msgid "List disks"
@@ -16674,27 +15494,24 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/diskutil.fish:2
 #: /tmp/fish/implicit/share/completions/diskutil.fish:4
 #: /tmp/fish/implicit/share/completions/diskutil.fish:8
-#, fuzzy
 msgid "Return a property list"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:3
 msgid "Get detailed information about a specific whole disk or partition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:5
-#, fuzzy
 msgid "Process all disks"
-msgstr "Alle Pakete verarbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:6
 msgid "Continuously display system-wide disk manipulation activity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:7
-#, fuzzy
 msgid "Show the file system personalities available"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:9
 msgid "Unmount a single volume"
@@ -16713,18 +15530,16 @@ msgid "Mount a single volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:13
-#, fuzzy
 msgid "Specify mount point"
-msgstr "Verzeichnis angeben, das kein Einhängeverzeichnis ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:14
 msgid "Mount an entire disk (all mountable volumes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:15
-#, fuzzy
 msgid "Rename a volume"
-msgstr "Modul umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:16
 msgid "Enable journaling on an HFS+ volume"
@@ -16743,9 +15558,8 @@ msgid "Enable ownership of a volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:20
-#, fuzzy
 msgid "Disable ownership of a volume"
-msgstr "Import des Seitenmoduls deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:21
 msgid "Verify the file system data structures of a volume"
@@ -16764,9 +15578,8 @@ msgid "Repair the partition map layout of a whole disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:25
-#, fuzzy
 msgid "Erase an existing disk"
-msgstr "Bestehendes Paket aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:26
 msgid "Write out a new empty file system volume"
@@ -16840,15 +15653,13 @@ msgid "Exit program when this window id is destroyed [id]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:53
-#, fuzzy
 msgid "Write image to a file [filename]"
-msgstr "Größe für alle Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:54
 #: /tmp/fish/implicit/share/completions/montage.fish:72
-#, fuzzy
 msgid "Automagically orient image"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:62
 msgid "Straighten an image [threshold]"
@@ -16877,9 +15688,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:69
 #: /tmp/fish/implicit/share/completions/montage.fish:79
-#, fuzzy
 msgid "Flop image in the horizontal direction"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:70
 #: /tmp/fish/implicit/share/completions/montage.fish:80
@@ -16915,14 +15725,12 @@ msgid "Threshold the image [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:1
-#, fuzzy
 msgid "ls -ldF all files in the package"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:2
-#, fuzzy
 msgid "du -sck all files in the package"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:1
 msgid "Clear the kernel ring buffer"
@@ -16945,14 +15753,12 @@ msgid "Enable printing messages to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:6
-#, fuzzy
 msgid "Use the file instead of the kernel log buffer"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:7
-#, fuzzy
 msgid "Restrict output to defined facilities"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:8
 #: /tmp/fish/implicit/share/completions/m4.fish:1
@@ -16960,124 +15766,104 @@ msgstr "Schreibe Ausgabe in die angegebene Datei"
 #: /tmp/fish/implicit/share/completions/timeout.fish:4
 #: /tmp/fish/implicit/share/completions/watch.fish:11
 #: /tmp/fish/implicit/share/completions/xgettext.fish:38
-#, fuzzy
 msgid "Display this help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:9
-#, fuzzy
 msgid "Display kernel messages"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:10
-#, fuzzy
 msgid "Restrict output to defined levels"
-msgstr "Ausgabe auf Datei umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:11
 msgid "Set level of messages printed to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:12
-#, fuzzy
 msgid "Print the raw message buffer"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:13
 msgid "Buffer size to query the kernel ring buffer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:14
-#, fuzzy
 msgid "Show human readable timestamp "
-msgstr "Lesbare Grössen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:15
 msgid "Don't print messages timestamp"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:16
-#, fuzzy
 msgid "Display userspace messages"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:18
 msgid "Decode facility and level to readable string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:1
-#, fuzzy
 msgid "Install .deb package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:2
-#, fuzzy
 msgid "Unpack .deb package"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:3
-#, fuzzy
 msgid "Configure package"
-msgstr "Quellpakete kompilieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:4
-#, fuzzy
 msgid "Remove package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:5
-#, fuzzy
 msgid "Purge package"
-msgstr "Paket löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:6
-#, fuzzy
 msgid "Verify contents of package"
-msgstr "Abhängigkeiten der Pakete nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:7
 msgid "Continue on all problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:8
-#, fuzzy
 msgid "Build package from directory"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:9
-#, fuzzy
 msgid "List contents of .deb"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:10
-#, fuzzy
 msgid "Show .deb information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:11
-#, fuzzy
 msgid "List packages matching pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:12
-#, fuzzy
 msgid "List contents of packages"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:13
-#, fuzzy
 msgid "Print status of package"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:14
-#, fuzzy
 msgid "Search for packages containing file"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:3
-#, fuzzy
 msgid "Set configuration frontend"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:4
 msgid "Set priority threshold"
@@ -17092,24 +15878,20 @@ msgid "Show only unseen question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:7
-#, fuzzy
 msgid "Reconfigure also inconsistent packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:8
-#, fuzzy
 msgid "Prevent reloading templates"
-msgstr "Zeichenkette vor relative Links stellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:1
-#, fuzzy
 msgid "Get current status of the dropboxd"
-msgstr "Exit-Status des Jobs verneinen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:2
-#, fuzzy
 msgid "Provide help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:3
 msgid "Return 1 if dropbox is running"
@@ -17136,14 +15918,12 @@ msgid "Get current sync status of one or more files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:9
-#, fuzzy
 msgid "List directory contents with current sync status"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:10
-#, fuzzy
 msgid "Ignores/excludes a directory from syncing"
-msgstr "Angegebene Anzahl von Verzeichniskomponenten ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:11
 msgid "Enables or disables LAN sync"
@@ -17160,24 +15940,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:14
-#, fuzzy
 msgid "Do not ignore entries starting with ."
-msgstr "Dateien ignorieren, die mit ~ enden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:15
-#, fuzzy
 msgid "Prints a list of directories currently excluded from syncing"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:16
-#, fuzzy
 msgid "Adds one or more directories to the exclusion list"
-msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:17
-#, fuzzy
 msgid "Removes one or more directories from the exclusion list"
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:1
 msgid "Write size for all files"
@@ -17236,14 +16012,12 @@ msgid "Display only a total for each argument"
 msgstr "Nur eine Gesamtsumme für jedes Argument anzeigen"
 
 #: /tmp/fish/implicit/share/completions/du.fish:14
-#, fuzzy
 msgid "Skip other file systems"
-msgstr "Andere Dateisysteme überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:15
-#, fuzzy
 msgid "Exclude files that match pattern in file"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:16
 #: /tmp/fish/implicit/share/completions/ncdu.fish:5
@@ -17259,38 +16033,32 @@ msgstr "Rekursionsgrenze"
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:14
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:15
 #: /tmp/fish/implicit/share/completions/netctl.fish:17
-#, fuzzy
 msgid "Profile"
-msgstr "Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:2
 msgid "Get usage help text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:3
-#, fuzzy
 msgid "Creates a configuration profile"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:4
-#, fuzzy
 msgid "Backup with pre/post script execution"
-msgstr "Keine post-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:5
-#, fuzzy
 msgid "Backup without executing pre/post scripts"
-msgstr "Keine post-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:6
-#, fuzzy
 msgid "Execute <profile>/pre script"
-msgstr "Keine pre-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:7
-#, fuzzy
 msgid "Execute <profile>/post script"
-msgstr "Keine post-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:8
 msgid "Force full backup"
@@ -17351,72 +16119,60 @@ msgid "Don"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:22
-#, fuzzy
 msgid "Output verbosity level"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:1
-#, fuzzy
 msgid "Do not output a newline"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:2
-#, fuzzy
 msgid "Do not separate arguments with spaces"
-msgstr "Variable nicht an Unterprozess exportieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:3
-#, fuzzy
 msgid "Disable backslash escapes"
-msgstr "Benutze per 'backslash (\\)'maskierte Zeichen "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:4
-#, fuzzy
 msgid "Enable backslash escapes"
-msgstr "Benutze per 'backslash (\\)'maskierte Zeichen "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:1
-#, fuzzy
 msgid "Show a help screen and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:3
-#, fuzzy
 msgid "Dump variables to stdout"
-msgstr "Auf Standardausgabe dekomprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:4
 msgid "Dump default values of variables to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:5
-#, fuzzy
 msgid "Print non-matching entries first"
-msgstr "Erste nicht zutreffende Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:6
 msgid "Don't read unguessable slots of installed packages (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:7
-#, fuzzy
 msgid "Always read slots of installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:8
-#, fuzzy
 msgid "(no) output (toggle)"
-msgstr "Ausgabe an Datei anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:9
-#, fuzzy
 msgid "Don't use ANSI color codes"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:10
-#, fuzzy
 msgid "Force colorful output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:11
 msgid "Compact search results (toggle)"
@@ -17435,9 +16191,8 @@ msgid "Print available versions line-by-line (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:15
-#, fuzzy
 msgid "Format string for normal output"
-msgstr "Stopp durch Terminalausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:16
 msgid "Format string for compact output"
@@ -17448,24 +16203,20 @@ msgid "Format string for verbose output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:18
-#, fuzzy
 msgid "Next expression only matches installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:19
-#, fuzzy
 msgid "Match packages installed in several versions"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:20
-#, fuzzy
 msgid "Match duplicated packages"
-msgstr "Quellpakete abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:21
-#, fuzzy
 msgid "Match packages with duplicated versions"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:22
 msgid "Match packages with a nontrivial slot"
@@ -17476,19 +16227,16 @@ msgid "Match packages with two different slots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:24
-#, fuzzy
 msgid "Match packages without best slotted version"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:25
-#, fuzzy
 msgid "Match packages from overlays"
-msgstr "Paket über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:26
-#, fuzzy
 msgid "Match packages with obsolete entries"
-msgstr "Pakete in lokalen Verzeichnisbaum verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:27
 msgid "Invert the expression (toggle)"
@@ -17503,57 +16251,48 @@ msgid "Search the description field"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:30
-#, fuzzy
 msgid "Search the category and name fields"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:31
-#, fuzzy
 msgid "Search the category field"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:32
-#, fuzzy
 msgid "Search the name field (default)"
-msgstr "Vollständige Befehlszeile selektieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:33
-#, fuzzy
 msgid "Search the homepage field"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:34
-#, fuzzy
 msgid "Search the license field"
-msgstr "Indexfeld der Quelle verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:35
 msgid "Search the provides field"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:36
-#, fuzzy
 msgid "Pattern is a regexp (default)"
-msgstr "Muster ist ein regulärer Ausdruck"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:37
-#, fuzzy
 msgid "Pattern is the exact string"
-msgstr "Muster ist eine feststehende Zeichenkette"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:38
-#, fuzzy
 msgid "Pattern is a wildcards-pattern"
-msgstr "Muster ist eine feststehende Zeichenkette"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:39
 msgid "Use fuzzy-search with the given max. levenshtein-distance (default: 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:1
-#, fuzzy
 msgid "Ignore all previous options"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:2
 msgid "Only show differences to the previously saved database and exit"
@@ -17573,9 +16312,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:6
-#, fuzzy
 msgid "Update database only and show differences"
-msgstr "Zwischenspeicher aktualisieren und Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:7
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
@@ -17614,26 +16352,22 @@ msgid "Really recreate the dep-cache (rm -rf /var/cache/edb/dep/*) (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:16
-#, fuzzy
 msgid "Do not really recreate the dep-cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:17
-#, fuzzy
 msgid "Show a short help text and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:1
 #: /tmp/fish/implicit/share/completions/iex.fish:1
-#, fuzzy
 msgid "Prints version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:2
 #: /tmp/fish/implicit/share/completions/iex.fish:2
-#, fuzzy
 msgid "Evaluates the given command"
-msgstr "Parameter als Befehl auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:3
 #: /tmp/fish/implicit/share/completions/iex.fish:3
@@ -17642,9 +16376,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:4
 #: /tmp/fish/implicit/share/completions/iex.fish:4
-#, fuzzy
 msgid "Finds and executes the given script"
-msgstr "Prerun-Skripte nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:5
 #: /tmp/fish/implicit/share/completions/iex.fish:5
@@ -17663,9 +16396,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:8
 #: /tmp/fish/implicit/share/completions/iex.fish:8
-#, fuzzy
 msgid "Start the given app and its dependencies"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:9
 #: /tmp/fish/implicit/share/completions/iex.fish:9
@@ -17702,14 +16434,12 @@ msgid "Does not halt the Erlang VM after execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:1
-#, fuzzy
 msgid "do not do interactive display; implies -q"
-msgstr "Ausführung im interaktiven Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:2
-#, fuzzy
 msgid "change to directory DIR"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:3
 msgid "start a server in the background"
@@ -17736,9 +16466,8 @@ msgid "do not load loadup.el into bare Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:9
-#, fuzzy
 msgid "do not load site-start.el"
-msgstr "Keine Init-Dateien laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:10
 msgid "do not add site-lisp directories to load-path"
@@ -17774,9 +16503,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:18
 #: /tmp/fish/implicit/share/completions/emacs.fish:19
-#, fuzzy
 msgid "evaluate Emacs Lisp expression EXPR"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:20
 #: /tmp/fish/implicit/share/completions/emacs.fish:21
@@ -17789,14 +16517,12 @@ msgid "call Emacs Lisp function FUNC with no arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:23
-#, fuzzy
 msgid "insert contents of FILE into current buffer"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:24
-#, fuzzy
 msgid "exit without asking for confirmation"
-msgstr "Nach Bestätigung fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:25
 msgid "load Emacs Lisp FILE using the load function"
@@ -17807,18 +16533,16 @@ msgid "override color mode for character terminals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:28
-#, fuzzy
 msgid "window background color"
-msgstr "Hintergrundfarbe ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:29
 msgid "disable many display features; used for debugging Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:30
-#, fuzzy
 msgid "main border color"
-msgstr "Hintergrundfarbe ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:31
 msgid "width of main border"
@@ -17833,9 +16557,8 @@ msgid "default font; must be fixed-width"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:34
-#, fuzzy
 msgid "window foreground color"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:35
 msgid "make the first frame high as the screen"
@@ -17883,9 +16606,8 @@ msgid "title for initial Emacs frame"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:46
-#, fuzzy
 msgid "disable blinking cursor"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:47
 msgid "switch foreground and background"
@@ -17900,9 +16622,8 @@ msgid "set additional X resources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:51
-#, fuzzy
 msgid "set parent window"
-msgstr "Root-Fenster auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:1
 #: /tmp/fish/implicit/share/completions/equery.fish:1
@@ -17917,12 +16638,10 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:3
-#, fuzzy
 msgid ""
 "Tests if emerge command should have an installed package as potential "
 "completion"
 msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:4
 msgid ""
@@ -17939,14 +16658,12 @@ msgid "Get informations to include in bug reports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:7
-#, fuzzy
 msgid "Displays the version number of emerge"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:8
-#, fuzzy
 msgid "Displays help information for emerge"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:9
 msgid "Remove packages that will not affect the functionality of the system"
@@ -17962,9 +16679,8 @@ msgid "WARNING: Delete all packages that are neither deps nor in world"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Process all meta-cache files"
-msgstr "Alle Pakete verarbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:13
 msgid "WARNING: Remove all but the latest version of package"
@@ -17975,28 +16691,24 @@ msgid "Check and update the dependency cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Resume the last merge operation"
-msgstr "Inhaltsgenerierung durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Search for matches in the portage tree"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:17
 msgid "Search for matches in package names and descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:18
-#, fuzzy
 msgid "WARNING: Remove the given package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:19
-#, fuzzy
 msgid "Update the given package"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:20
 msgid "Sort flag lists alphabetically"
@@ -18011,41 +16723,36 @@ msgid "Build a binary package additionally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:23
-#, fuzzy
 msgid "Only build a binary package"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:24
 msgid "Show changelog of package. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:25
-#, fuzzy
 msgid "Toggle colorized output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:26
 msgid "Align output. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:27
-#, fuzzy
 msgid "Run in debug mode"
-msgstr "Im Dummy-Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:28
 msgid "Consider the whole dependency tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:29
-#, fuzzy
 msgid "Reinstall all world packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:30
-#, fuzzy
 msgid "Only download the packages but don't install them"
-msgstr "Ordnet die angezeigten Paketen entsprechend der Installationszeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:31
 msgid "Same as --fetchonly and grab all potential files"
@@ -18064,118 +16771,100 @@ msgid "Ignore EMERGE_DEFAULT_OPTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:35
-#, fuzzy
 msgid "Include installed packages with changed USE flags"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:36
-#, fuzzy
 msgid "Disregard merge records"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:37
-#, fuzzy
 msgid "Don't merge dependencies"
-msgstr "Nicht nach zusätzlichen Abhängigkeiten fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:38
-#, fuzzy
 msgid "Skip already installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:39
-#, fuzzy
 msgid "Disable the spinner"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:40
-#, fuzzy
 msgid "Don't add packages to world"
-msgstr "Installierte Pakete synchronisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:41
-#, fuzzy
 msgid "Only merge dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:42
 msgid "Display what would be done without doing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:43
-#, fuzzy
 msgid "Use a condensed output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:44
 msgid "Remove the first package in the resume list. Use with --resume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:45
-#, fuzzy
 msgid "Show the dependency tree"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:46
-#, fuzzy
 msgid "Use binary package if available"
-msgstr "Index erstellen, wenn nicht vorhanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:47
-#, fuzzy
 msgid "Only use binary packages"
-msgstr "Nur Quellpakete akzeptieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:48
-#, fuzzy
 msgid "Run  in  verbose  mode"
-msgstr "Ausführlicher Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:49
-#, fuzzy
 msgid "Toggle build time dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:1
 msgid "Unmount when idle for specified MINUTES"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:2
-#, fuzzy
 msgid "Run in the foreground"
-msgstr "Job in Vordergrund schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:3
 msgid "Verbose messages when run foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:4
-#, fuzzy
 msgid "Run in single threaded mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:5
 msgid "Enables debugging within the FUSE library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:6
-#, fuzzy
 msgid "Return data even from corrupted files"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:7
 msgid "Make files public to all other users"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:8
-#, fuzzy
 msgid "Mount the filesystem on-demand"
-msgstr "Dateisystems aus fstab einhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:9
-#, fuzzy
 msgid "Produce encrypted view of plain files"
-msgstr "Beispiel-Konfigurationsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:10
 msgid "Use standard options when creating filesystem"
@@ -18186,23 +16875,20 @@ msgid "Pass on options to FUSE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:12
-#, fuzzy
 msgid "Don't use the default FUSE flags"
-msgstr "Standardpaketdepot nicht festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:13
 msgid "Get password from an external program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:14
-#, fuzzy
 msgid "Read password from standard input"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:15
-#, fuzzy
 msgid "Turn off key validation checking"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:1
 msgid ""
@@ -18215,14 +16901,12 @@ msgid "Clears the screen before running the utility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:4
-#, fuzzy
 msgid "Output version information"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:1
-#, fuzzy
 msgid "Redefine variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:2
 #: /tmp/fish/implicit/share/completions/nice.fish:1
@@ -18231,14 +16915,12 @@ msgid "Command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:3
-#, fuzzy
 msgid "Start with an empty environment"
-msgstr "Versuchte, einen leeren Umgebungsstack zu poppen."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:4
-#, fuzzy
 msgid "Remove variable from the environment"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
 msgid ""
@@ -18255,14 +16937,12 @@ msgid "turns off colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:6
-#, fuzzy
 msgid "displays a help summary"
-msgstr "Zusammenfassung anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:7
-#, fuzzy
 msgid "displays the equery version"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:8
 msgid "turns off pipe detection"
@@ -18281,42 +16961,36 @@ msgid "stop when first match found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:12
-#, fuzzy
 msgid "search in all available packages (slow)"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:13
-#, fuzzy
 msgid "search direct dependencies only (default)"
-msgstr "Modulabhängigkeiten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:14
 msgid "search indirect dependencies (very slow)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:15
-#, fuzzy
 msgid "do not show USE flags"
-msgstr "Keine Flags anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:16
-#, fuzzy
 msgid "do not use fancy formatting"
-msgstr "Kann Benutzerinformation nicht abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:17
-#, fuzzy
 msgid "output the timestamp of each file"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:18
 msgid "output the md5sum of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:19
-#, fuzzy
 msgid "output the type of each file"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:20
 msgid "filter output based on files type or path (comma separated list)"
@@ -18324,15 +16998,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:21
 #: /tmp/fish/implicit/share/completions/equery.fish:25
-#, fuzzy
 msgid "search installed packages (default)"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:22
 #: /tmp/fish/implicit/share/completions/equery.fish:26
-#, fuzzy
 msgid "do not search installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:23
 #: /tmp/fish/implicit/share/completions/equery.fish:27
@@ -18345,28 +17017,24 @@ msgid "also search in overlay tree (/usr/local/portage)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:29
-#, fuzzy
 msgid "query is a regular expression"
-msgstr "Ausdruck negieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:30
 msgid "list only those packages that exactly match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:31
-#, fuzzy
 msgid "only list installed duplicate packages"
-msgstr "Installierte(s) Quellpaket(e) auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:32
-#, fuzzy
 msgid "report size in bytes"
-msgstr "Größe in Gigabyte anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:33
-#, fuzzy
 msgid "include non-installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:1
 msgid "The page of the document to display"
@@ -18377,65 +17045,55 @@ msgid "Run evince in fullscreen mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:3
-#, fuzzy
 msgid "Run evince in presentation mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:4
 msgid "Run evince as a previewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:5
-#, fuzzy
 msgid "X display to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:1
-#, fuzzy
 msgid "Test if exercism has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:3
-#, fuzzy
 msgid "turn on verbose logging"
-msgstr "Angemeldete Benutzer auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:4
 #: /tmp/fish/implicit/share/completions/exercism.fish:19
 #: /tmp/fish/implicit/share/completions/ninja.fish:8
 #: /tmp/fish/implicit/share/completions/quilt.fish:1
-#, fuzzy
 msgid "show help"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:5
-#, fuzzy
 msgid "print the version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:6
-#, fuzzy
 msgid "Writes config values to a JSON file."
-msgstr "Top-Server in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:7
-#, fuzzy
 msgid "Outputs useful debug information."
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:8
-#, fuzzy
 msgid "Downloads a solution given the ID of the latest iteration."
-msgstr "Einen aufgezeichneten Patch mit einer besseren Version ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:9
 msgid "Fetches the next unsubmitted problem in each track."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:10
-#, fuzzy
 msgid "Lists the available problems for a language track, given its ID."
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:11
 msgid ""
@@ -18462,18 +17120,16 @@ msgid "Submits a new iteration to a problem on exercism.io."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:16
-#, fuzzy
 msgid "Lists the available language tracks."
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:17
 msgid "REMOVED"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:18
-#, fuzzy
 msgid "Upgrades the CLI to the latest released version."
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exit.fish:2
 msgid "Quit with normal exit status"
@@ -18492,9 +17148,8 @@ msgid "have tabs NUMBER characters apart, not 8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/expand.fish:3
-#, fuzzy
 msgid "use comma separated list of explicit tab positions"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:1
 msgid "create a backup of one or several jails"
@@ -18513,9 +17168,8 @@ msgid "jail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:3
-#, fuzzy
 msgid "manage specific jails"
-msgstr "Angegebene Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:5
 msgid "attach your console to a running jail"
@@ -18534,19 +17188,16 @@ msgid "dump diffs between jail initialisation and freeze time into a flavour"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:12
-#, fuzzy
 msgid "create the basejail from binary packages"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:13
-#, fuzzy
 msgid "list all jails"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:14
-#, fuzzy
 msgid "restart a running jail"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:16
 msgid "create new jails from archived versions"
@@ -18557,34 +17208,29 @@ msgid "create a snapshot of a jail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:19
-#, fuzzy
 msgid "start a jail"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:21
-#, fuzzy
 msgid "stop a running jail"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:23
 msgid "check for reasons for the jails to fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:24
-#, fuzzy
 msgid "create or update the basejail from source"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:1
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:2
-#, fuzzy
 msgid "show this help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:2
-#, fuzzy
 msgid "print detailed info about command NAME"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:3
 msgid "formats --list, choices: short, normal, nested"
@@ -18599,9 +17245,8 @@ msgid "Force sudo password prompt up-front"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:6
-#, fuzzy
 msgid "print list of possible commands and exit"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:7
 msgid "comma separated KEY=VALUE pairs to set Fab env vars"
@@ -18613,14 +17258,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:9
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:1
-#, fuzzy
 msgid "show program's version number and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:10
-#, fuzzy
 msgid "don't user the running SSH agent"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:11
 msgid "forward local agent to remote end"
@@ -18631,14 +17274,12 @@ msgid "abort instead of prompting (for password, host, etc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:13
-#, fuzzy
 msgid "specify location of config file to use"
-msgstr "apt-Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:14
-#, fuzzy
 msgid "Color error output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:15
 msgid "do not load user known_hosts file"
@@ -18657,9 +17298,8 @@ msgid "gateway host to connect through"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:19
-#, fuzzy
 msgid "Use GSS-API authentication"
-msgstr "Pseudo-tty-Zuordnung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:20
 msgid "Delegate GSS-API client credentials or not"
@@ -18670,14 +17310,12 @@ msgid "Perform GSS-API Key Exchange and user authentication"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:22
-#, fuzzy
 msgid "comma-separated list of output levels to hide"
-msgstr "Komma-getrenntes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:23
-#, fuzzy
 msgid "comma-separated list of hosts to operate on"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:24
 msgid "path to SSH private key file. May be repeated."
@@ -18700,14 +17338,12 @@ msgid "make M attempts to connect before giving up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:29
-#, fuzzy
 msgid "do not use pseudo-terminal in run/sudo"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:30
-#, fuzzy
 msgid "password for use with authentication and/or sudo"
-msgstr "Abfrage des Passworts für den Authentifizierungsserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:31
 msgid "default to parallel execution method"
@@ -18718,9 +17354,8 @@ msgid "SSH connection port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:33
-#, fuzzy
 msgid "reject unknown hosts"
-msgstr "Unbekannte Option: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:34
 msgid "password for use with sudo only"
@@ -18731,37 +17366,32 @@ msgid "load system known_hosts file before reading user known_hosts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:36
-#, fuzzy
 msgid "comma-separated list of roles to operate on"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:37
 msgid "specify a new shell, defaults to '/bin/bash -l -c'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:38
-#, fuzzy
 msgid "comma-separated list of output levels to show"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:39
 msgid "skip over hosts that can't be reached"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:40
-#, fuzzy
 msgid "skip over unknown tasks"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:41
-#, fuzzy
 msgid "Path to SSH config file"
-msgstr "Zeichenkette vor relative Links stellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:42
-#, fuzzy
 msgid "set connection timeout to N seconds"
-msgstr "Verbindungszeitüberschreitung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:43
 msgid "set remote command timeout to N seconds"
@@ -18776,14 +17406,12 @@ msgid "warn, instead of abort, when commands fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:46
-#, fuzzy
 msgid "comma-separated list of hosts to exclude"
-msgstr "Komma-getrenntes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:47
-#, fuzzy
 msgid "number of concurrent processes to use in parallel mode"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:1
 msgid "Specify a shell command as action to perform on the image"
@@ -18814,33 +17442,28 @@ msgid "Exit feh after one loop through the slideshow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:8
-#, fuzzy
 msgid "Draw the defined actions"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:9
-#, fuzzy
 msgid "Display some EXIF information"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:10
-#, fuzzy
 msgid "Draw filename"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:11
 msgid "Show overlay texts on semi-transparent background"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:12
-#, fuzzy
 msgid "Set global font"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:13
-#, fuzzy
 msgid "Add given path as directory to search fonts"
-msgstr "Zeige den für eine Nachricht benutzten Sitzungsschlüssel an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:14
 msgid "Disable antialiasing for zooming, bg settings, etc."
@@ -18855,32 +17478,28 @@ msgid "Limit window size. Format: [w x h] [+ x + y]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:17
-#, fuzzy
 msgid "Hide pointer"
-msgstr "Zeiger auf Jobliste"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:18
 msgid "Use style as background for transparent image parts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:19
-#, fuzzy
 msgid "Enable index mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:20
-#, fuzzy
 msgid "Show image information based on given format"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:21
 msgid "Execute given command line and display its output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:22
-#, fuzzy
 msgid "Keep files fetched using HTTP"
-msgstr "Rekursiv, dem MUSTER entsprechende Dateien überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:23
 msgid "Disable strict hostname and peer checking with HTTPS"
@@ -18915,14 +17534,12 @@ msgid "Only show image which are larger then given size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:31
-#, fuzzy
 msgid "Enable montage mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:32
-#, fuzzy
 msgid "Disable slideshow mode"
-msgstr "Cookie-Benutzung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:33
 msgid "Don't jump to first image after resorting filelist"
@@ -18937,37 +17554,32 @@ msgid "Don't limit window to screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:36
-#, fuzzy
 msgid "Disable Xinerama support"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:37
-#, fuzzy
 msgid "Save files to given directory"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:38
 msgid "Preload images"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:39
-#, fuzzy
 msgid "Don't report non-fatal errors"
-msgstr "Keine Fortsetzung bei Fehlern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:40
 msgid "Randomize file list before displaying"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:41
-#, fuzzy
 msgid "Recursivly expand any directory"
-msgstr "Unterverzeichnisse rekursiv vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:42
-#, fuzzy
 msgid "Don't recursively expand any directory (default)"
-msgstr "Dokumentationsdateien installieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:43
 msgid "Reload filelist after given time in second"
@@ -18996,23 +17608,20 @@ msgid "Sort file list with given parameter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:49
-#, fuzzy
 msgid "Start the filelist at given filename"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:50
-#, fuzzy
 msgid "Load options from given config file"
-msgstr "Cookies aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:51
 msgid "Set given title for window opended from thumbnail mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:52
-#, fuzzy
 msgid "Set window title"
-msgstr "Fenster über Kennung auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:53
 msgid "Just print names of images that can't be loaded by imlib2"
@@ -19039,9 +17648,8 @@ msgid "Limit montage's height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:61
-#, fuzzy
 msgid "Limit montage's width"
-msgstr "Zeilenbreite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:62
 msgid "Save created montage to given file"
@@ -19072,9 +17680,8 @@ msgid "Set font to print title on index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:69
-#, fuzzy
 msgid "Center file on background"
-msgstr "Job in Hintergrund schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:70
 msgid "Fit file into background by zooming until image fits"
@@ -19095,24 +17702,20 @@ msgid "Tile image if too small for screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:74
-#, fuzzy
 msgid "Do not write a ~/.fehbg file"
-msgstr "Neuere Dateien nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:1
-#, fuzzy
 msgid "Select font"
-msgstr "Eine Aktion auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:2
-#, fuzzy
 msgid "Change font directory"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:3
-#, fuzzy
 msgid "Center output horizontally"
-msgstr "nur numerische Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:4
 msgid "Make output flush-left"
@@ -19127,14 +17730,12 @@ msgid "Set justification according to text direction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:7
-#, fuzzy
 msgid "Set output to terminal width"
-msgstr "Niemals Ausgaben aufs Terminal schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:8
-#, fuzzy
 msgid "Set output width"
-msgstr "Ausgabebegrenzer festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:10
 msgid "Put FIGlet back to normal"
@@ -19145,9 +17746,8 @@ msgid "Switch to German (ISO 646-DE) character set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:12
-#, fuzzy
 msgid "Turns off German character set processing"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:13
 msgid "Add given control file"
@@ -19166,33 +17766,28 @@ msgid "Specify layout mode between 1 and 63"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:21
-#, fuzzy
 msgid "Print version and copyright"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:22
-#, fuzzy
 msgid "Print information given infocode"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:23
-#, fuzzy
 msgid "Print left-to-right"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:24
 msgid "Print right-to-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:25
-#, fuzzy
 msgid "Print with default text direction"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:1
-#, fuzzy
 msgid "Do not prepend filenames to output lines"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:2
 msgid "Print the parsed form of the magic file"
@@ -19203,18 +17798,16 @@ msgid "Write an output file containing a pre-parsed version of file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:4
-#, fuzzy
 msgid "Do not follow symlinks"
-msgstr "Symbolischen Links nicht folgen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:5
 msgid "Output mime type strings instead human readable strings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:6
-#, fuzzy
 msgid "Don't stop at the first match"
-msgstr "Patch nicht signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:8
 msgid "Flush stdout after checking each file"
@@ -19237,9 +17830,8 @@ msgid "Read block and character device files too"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:13
-#, fuzzy
 msgid "Print the version of the program and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:14
 msgid "Try to look inside compressed files"
@@ -19247,9 +17839,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:15
 #: /tmp/fish/implicit/share/completions/gv.fish:33
-#, fuzzy
 msgid "Print a help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:16
 msgid "Read  the  names of the files to be examined from a file"
@@ -19260,14 +17851,12 @@ msgid "Use other string as result field separator instead of :"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:18
-#, fuzzy
 msgid "Alternate list of files containing magic numbers"
-msgstr "Die im Paket enthaltenen Auslöser-Skripte anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:1
-#, fuzzy
 msgid "Never follow symlinks"
-msgstr "Symbolischen Links folgen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:3
 msgid ""
@@ -19291,9 +17880,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/find.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:66
 #: /tmp/fish/implicit/share/completions/zfs.fish:76
-#, fuzzy
 msgid "Maximum recursion depth"
-msgstr "Maximale Größe des Programms im Arbeitsspeicher"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:9
 msgid "Do not apply any tests or actions at levels less than specified level"
@@ -19314,28 +17902,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:13
-#, fuzzy
 msgid "Specify regular expression type"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:15
-#, fuzzy
 msgid "Turn warnings on"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:16
-#, fuzzy
 msgid "Turn warnings off"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:17
 msgid "File last accessed specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:18
-#, fuzzy
 msgid "File last accessed more recently than file was modified"
-msgstr "Letzte Revision anzeigen, bei der jede Zeile verändert wurde"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:19
 msgid "File last accessed specified number of days ago"
@@ -19359,44 +17943,36 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:24
 #: /tmp/fish/implicit/share/completions/test.fish:31
-#, fuzzy
 msgid "File is executable"
-msgstr "Datei ist schreibbar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
-msgstr "immer neuformatieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
-#, fuzzy
 msgid "File is on filesystem of specified type"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:27
-#, fuzzy
 msgid "Numeric group id of file"
-msgstr "nur numerische Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:28
-#, fuzzy
 msgid "Group name of file"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:29
-#, fuzzy
 msgid "File is symlink matching specified case insensitive pattern"
-msgstr "Dem Muster entsprechende Einträge übergehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:30
-#, fuzzy
 msgid "File name matches case insensitive pattern"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:31
-#, fuzzy
 msgid "File has specified inode number"
-msgstr "durch angegebenes Programm filtern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:32
 msgid "File path matches case insensitive pattern"
@@ -19407,32 +17983,28 @@ msgid "File name matches case insensetive regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:34
-#, fuzzy
 msgid "File has specified number of links"
-msgstr "Nur angegebene Anzahl Zeichen vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:35
-#, fuzzy
 msgid "File is symlink matching specified pattern"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:36
 msgid "File last modified specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:37
-#, fuzzy
 msgid "File last modified more recently than file was modified"
-msgstr "Letzte Revision anzeigen, bei der jede Zeile verändert wurde"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:38
 msgid "File last modified specified number of days ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:39
-#, fuzzy
 msgid "File name matches pattern"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:40
 msgid "No user corresponds to file's numeric user ID"
@@ -19443,43 +18015,36 @@ msgid "No group corresponds to file's numeric group ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:42
-#, fuzzy
 msgid "File path matches pattern"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:43
-#, fuzzy
 msgid "Files has specified permissions set"
-msgstr "Benutze angegebenen Kompressionsalgorithmus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:44
 msgid "File name matches regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:45
-#, fuzzy
 msgid "File refers to the same inode as specified file"
-msgstr "die in der angegebenen Datei aufgeführten Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:46
-#, fuzzy
 msgid "File uses specified units of space"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
-msgstr "Immer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
-#, fuzzy
 msgid "File is of specified type"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:49
-#, fuzzy
 msgid "File's owner has specified numeric user ID"
-msgstr "Datei gehört zu effektiver Benutzerkennung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:50
 msgid ""
@@ -19488,9 +18053,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:51
-#, fuzzy
 msgid "File's owner"
-msgstr "Datei ist Socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:52
 msgid ""
@@ -19499,51 +18063,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:53
-#, fuzzy
 msgid "File's security context matches specified pattern"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:54
-#, fuzzy
 msgid "Delete selected files"
-msgstr "Auswahl löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
-msgstr "Befehl ausführen, wenn vorheriger Befehl fehlerhaft war"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:57
-#, fuzzy
 msgid "List file in ls -dils format, write to specified file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:58
-#, fuzzy
 msgid "Print full file names into specified file"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:59
 msgid "Print null separated full file names into specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:60
-#, fuzzy
 msgid "Print formated data into specified file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:61
 msgid "Execute specified command for each located file after asking user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:62
-#, fuzzy
 msgid "Print full file names"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:63
 msgid ""
@@ -19556,28 +18113,24 @@ msgid "Print null separated full file names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
-#, fuzzy
 msgid "Print formated data"
-msgstr "Befehlstyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:66
 msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
-msgstr "Shell verlassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
-#, fuzzy
 msgid "List file in ls -dils format"
-msgstr "Fehler im rss-Format auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
-#, fuzzy
 msgid "Negate result of action"
-msgstr "Ausdruck negieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -19596,23 +18149,20 @@ msgid "Only parse input, do not execute"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:5
-#, fuzzy
 msgid "Run in interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:6
-#, fuzzy
 msgid "Run in login mode"
-msgstr "Im Dummy-Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:7
 msgid "Output profiling information to specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:8
-#, fuzzy
 msgid "Run with the specified verbosity level"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:3
 msgid "Do not indent output, only reformat into one job per line"
@@ -19623,9 +18173,8 @@ msgid "Colorize the output using ANSI escape sequences"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:5
-#, fuzzy
 msgid "Output in HTML format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:6
 #: /tmp/fish/implicit/share/completions/sort.fish:15
@@ -19633,28 +18182,24 @@ msgid "Write to file"
 msgstr "In Datei schreiben"
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:7
-#, fuzzy
 msgid "Enable debug at specified verbosity level"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:8
 msgid "Specify how many stack frames to display in debug messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:9
-#, fuzzy
 msgid "Dump information about parsed statements to stderr"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:1
-#, fuzzy
 msgid "Show the flac version number"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:2
-#, fuzzy
 msgid "Show this screen"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:3
 msgid "Show detailed explanation of usage and options"
@@ -19673,28 +18218,24 @@ msgid "Same as -d except an analysis file is written"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:7
-#, fuzzy
 msgid "Write output to stdout"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:8
 msgid "Do not write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:9
-#, fuzzy
 msgid "Do not print anything including errors"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:10
-#, fuzzy
 msgid "Force overwriting of output files"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:11
-#, fuzzy
 msgid "Force the output file name"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:12
 msgid "Prepend STRING to output names"
@@ -19721,18 +18262,16 @@ msgid "Serial number to use for the FLAC stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:18
-#, fuzzy
 msgid "Include residual signal in text output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:19
 msgid "Generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:20
-#, fuzzy
 msgid "Continue decoding through stream errors"
-msgstr "Fortsetzung nach Fehler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:21
 msgid "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
@@ -19763,9 +18302,8 @@ msgid "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:28
-#, fuzzy
 msgid "Read tags from file"
-msgstr "URLs aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:29
 msgid "Add seek point(s) {#|X|#x|#s}"
@@ -19814,9 +18352,8 @@ msgid "Synonymous with -l 12 -b 4608 -m -e -r 6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:42
-#, fuzzy
 msgid "Specify blocksize in samples"
-msgstr "Sources.list-Datei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:43
 msgid "Try mid-side coding for each frame"
@@ -19839,9 +18376,8 @@ msgid "Exhaustively search LP coeff quantization"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:48
-#, fuzzy
 msgid "Specify precision in bits"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:49
 msgid "Set [min,]max residual partition order"
@@ -19853,14 +18389,12 @@ msgid "Set byte order for samples"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:52
-#, fuzzy
 msgid "Number of channels"
-msgstr "Anzahl der Audiokanäle festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:53
-#, fuzzy
 msgid "Number of bits per sample"
-msgstr "Anzahl der Top-Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:54
 msgid "Sample rate in Hz"
@@ -19888,9 +18422,8 @@ msgid "No adaptive mid-side coding for all frames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:61
-#, fuzzy
 msgid "Don't continue decoding through stream errors"
-msgstr "Keine Fortsetzung bei Fehlern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:62
 msgid "Don't delete after a successful encode/decode"
@@ -19929,9 +18462,8 @@ msgid "Don't generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:71
-#, fuzzy
 msgid "Don't include residual signal in text output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:72
 msgid "Don't align multiple files on sector boundaries"
@@ -19942,14 +18474,12 @@ msgid "Write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:74
-#, fuzzy
 msgid "Don't force overwriting of output files"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:75
-#, fuzzy
 msgid "Don't verify a correct encoding"
-msgstr "Beim Lesen keine Paket- oder Kopfzeilen-Prüfsummen überprüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:1
 msgid "Install an application or runtime from a remote"
@@ -19960,14 +18490,12 @@ msgid "Update an installed application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:3
-#, fuzzy
 msgid "Uninstall an installed application or runtime"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:4
-#, fuzzy
 msgid "List installed apps and/or runtimes"
-msgstr "Installierte(s) Quellpaket(e) auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:5
 msgid "Show info for installed app or runtime"
@@ -19982,9 +18510,8 @@ msgid "Override permissions for an application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:8
-#, fuzzy
 msgid "Specify default version to run"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:9
 msgid "Enter the namespace of a running application"
@@ -19999,57 +18526,48 @@ msgid "Revoke access to a specific file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:12
-#, fuzzy
 msgid "Show information about a specific file"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:13
-#, fuzzy
 msgid "List exported files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:14
-#, fuzzy
 msgid "Add a new remote repository (by URL)"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:15
 msgid "Modify properties of a configured remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:16
-#, fuzzy
 msgid "Delete a configured remote"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:17
-#, fuzzy
 msgid "List all configured remotes"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:18
-#, fuzzy
 msgid "List contents of a configured remote"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:19
-#, fuzzy
 msgid "Initialize a directory for building"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:20
-#, fuzzy
 msgid "Run a build command inside the build dir"
-msgstr "Internen Befehl anstatt einer Funktion ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:21
 msgid "Finish a build dir for export"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:22
-#, fuzzy
 msgid "Export a build dir to a repository"
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:23
 msgid "Create a bundle file from a build directory"
@@ -20064,14 +18582,12 @@ msgid "Sign an application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:26
-#, fuzzy
 msgid "Update the summary file in a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:1
-#, fuzzy
 msgid "Add files to checkout"
-msgstr "Dateien an Archiv anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:2
 #: /tmp/fish/implicit/share/completions/fossil.fish:8
@@ -20083,17 +18599,15 @@ msgstr "Dateien an Archiv anhängen"
 #: /tmp/fish/implicit/share/completions/fossil.fish:202
 #: /tmp/fish/implicit/share/completions/fossil.fish:211
 #: /tmp/fish/implicit/share/completions/fossil.fish:300
-#, fuzzy
 msgid "Case insensitive file matching"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:3
 #: /tmp/fish/implicit/share/completions/fossil.fish:9
 #: /tmp/fish/implicit/share/completions/fossil.fish:78
 #: /tmp/fish/implicit/share/completions/fossil.fish:130
-#, fuzzy
 msgid "Include dotfiles"
-msgstr "Datei ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:4
 #: /tmp/fish/implicit/share/completions/fossil.fish:5
@@ -20101,14 +18615,12 @@ msgstr "Datei ausschliessen"
 #: /tmp/fish/implicit/share/completions/fossil.fish:11
 #: /tmp/fish/implicit/share/completions/fossil.fish:79
 #: /tmp/fish/implicit/share/completions/fossil.fish:131
-#, fuzzy
 msgid "Files to ignore"
-msgstr "zu ignorierenden HTML-Markierungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:7
-#, fuzzy
 msgid "Remove and add files to checkout"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:12
 #: /tmp/fish/implicit/share/completions/fossil.fish:82
@@ -20120,80 +18632,66 @@ msgid "Display actions without running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:13
-#, fuzzy
 msgid "Check all repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:14
-#, fuzzy
 msgid "List changes"
-msgstr "Keine Änderungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:15
 #: /tmp/fish/implicit/share/completions/fossil.fish:16
-#, fuzzy
 msgid "Ignore repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:17
-#, fuzzy
 msgid "Display locations"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:18
-#, fuzzy
 msgid "Pull repositories"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:19
-#, fuzzy
 msgid "Push repositories"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:20
-#, fuzzy
 msgid "Rebuild repositories"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:21
-#, fuzzy
 msgid "Sync repositories"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:22
-#, fuzzy
 msgid "Shows file modifications"
-msgstr "Änderungsdatum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:23
-#, fuzzy
 msgid "Show file versions"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:24
-#, fuzzy
 msgid "List all analyzed versions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:25
 #: /tmp/fish/implicit/share/completions/fossil.fish:137
-#, fuzzy
 msgid "Limit analyzed versions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:26
 msgid "Find regressions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:27
-#, fuzzy
 msgid "Identify version as not working"
-msgstr "Zeichenkette für User-Agent festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:28
-#, fuzzy
 msgid "Identify version as working"
-msgstr "Zeichenkette für User-Agent festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:29
 #: /tmp/fish/implicit/share/completions/fossil.fish:39
@@ -20206,14 +18704,12 @@ msgid "Show log of bisects in check-in order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:31
-#, fuzzy
 msgid "Skip version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:32
-#, fuzzy
 msgid "Show bisect options"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:33
 #: /tmp/fish/implicit/share/completions/fossil.fish:36
@@ -20235,9 +18731,8 @@ msgid "List versions between bad and good"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:41
-#, fuzzy
 msgid "Don't show anything"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:42
 msgid "Reinitialize bisect"
@@ -20246,69 +18741,57 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/fossil.fish:44
 #: /tmp/fish/implicit/share/completions/fossil.fish:45
 #: /tmp/fish/implicit/share/completions/fossil.fish:46
-#, fuzzy
 msgid "Show all versions"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:47
-#, fuzzy
 msgid "Undo latest bad/good command."
-msgstr "Befehlsblock beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:48
 #: /tmp/fish/implicit/share/completions/git.fish:88
-#, fuzzy
 msgid "Create a new branch"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:49
-#, fuzzy
 msgid "Create new branch"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:50
-#, fuzzy
 msgid "Make branch local"
-msgstr "Geltungsbereich der Variablen lokal machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:51
-#, fuzzy
 msgid "Set background color"
-msgstr "Hintergrundfarbe ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:52
 #: /tmp/fish/implicit/share/completions/fossil.fish:106
-#, fuzzy
 msgid "Don't sign the branch with GPG"
-msgstr "Patch nicht signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:53
 #: /tmp/fish/implicit/share/completions/fossil.fish:155
-#, fuzzy
 msgid "Override date"
-msgstr "Frame-Rate überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:54
-#, fuzzy
 msgid "Override user"
-msgstr "Frame-Rate überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:55
-#, fuzzy
 msgid "List branches"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:56
 #: /tmp/fish/implicit/share/completions/fossil.fish:57
-#, fuzzy
 msgid "Show all branches"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:58
 #: /tmp/fish/implicit/share/completions/fossil.fish:59
-#, fuzzy
 msgid "Show closed branches"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:60
 #: /tmp/fish/implicit/share/completions/fossil.fish:62
@@ -20318,39 +18801,33 @@ msgstr "Aktualisierte Pakete anzeigen"
 #: /tmp/fish/implicit/share/completions/fossil.fish:177
 #: /tmp/fish/implicit/share/completions/fossil.fish:180
 #: /tmp/fish/implicit/share/completions/fossil.fish:267
-#, fuzzy
 msgid "Run command on repository"
-msgstr "Befehl im aktuellen Prozess ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:61
-#, fuzzy
 msgid "Print a file"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:63
 #: /tmp/fish/implicit/share/completions/fossil.fish:140
-#, fuzzy
 msgid "Print specific revision"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:64
-#, fuzzy
 msgid "List local changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:65
 #: /tmp/fish/implicit/share/completions/fossil.fish:128
 #: /tmp/fish/implicit/share/completions/fossil.fish:263
-#, fuzzy
 msgid "Display absolute paths"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:66
 #: /tmp/fish/implicit/share/completions/fossil.fish:132
 #: /tmp/fish/implicit/share/completions/fossil.fish:264
-#, fuzzy
 msgid "Display relative paths"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:67
 #: /tmp/fish/implicit/share/completions/fossil.fish:265
@@ -20358,34 +18835,28 @@ msgid "Verify file status using SHA1"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:68
-#, fuzzy
 msgid "Identify the repository if there are changes"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:69
-#, fuzzy
 msgid "Say (none) if there are no changes"
-msgstr "Versuche, eine kleinere Menge Änderungen zu finden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:70
-#, fuzzy
 msgid "Checkout version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:71
-#, fuzzy
 msgid "Version to check out"
-msgstr "Version des Quellpaketes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:72
-#, fuzzy
 msgid "Ignore edited files"
-msgstr "Angegebene Datei ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:73
-#, fuzzy
 msgid "Ignore missing content"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:74
 msgid "Only update the manifest"
@@ -20393,14 +18864,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:75
 #: /tmp/fish/implicit/share/completions/fossil.fish:302
-#, fuzzy
 msgid "Update to latest version"
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:76
-#, fuzzy
 msgid "Delete all extra files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:80
 #: /tmp/fish/implicit/share/completions/fossil.fish:212
@@ -20412,19 +18881,16 @@ msgid "Remove without prompting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:83
-#, fuzzy
 msgid "Only remove Fossil temporary files"
-msgstr "tmpdir für temporäre Dateien benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:84
-#, fuzzy
 msgid "Show removed files"
-msgstr "Datei nicht erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:85
-#, fuzzy
 msgid "Clone repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:86
 #: /tmp/fish/implicit/share/completions/fossil.fish:154
@@ -20440,9 +18906,8 @@ msgid "Use SSL identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:89
-#, fuzzy
 msgid "Create new revision"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:91
 msgid "Allow unresolved merge conflicts"
@@ -20485,38 +18950,32 @@ msgid "Use a delta manifest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:101
-#, fuzzy
 msgid "Commit comment"
-msgstr "Kommentar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:102
-#, fuzzy
 msgid "Read commit comment from a file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:103
-#, fuzzy
 msgid "Mimetype of commit comment"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:105
-#, fuzzy
 msgid "Omit all warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:107
-#, fuzzy
 msgid "Don't sync the changes"
-msgstr "Änderungen nicht zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:108
 msgid "Assign a tag to the checkin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:109
-#, fuzzy
 msgid "Show differences"
-msgstr "Unterschiede bei Groß-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:110
 #: /tmp/fish/implicit/share/completions/fossil.fish:165
@@ -20525,33 +18984,28 @@ msgid "Binary files glob pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:111
-#, fuzzy
 msgid "Show diff of branch"
-msgstr "Hierarchie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:112
-#, fuzzy
 msgid "Show file names only"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:113
-#, fuzzy
 msgid "Context lines"
-msgstr "Kein Neue-Zeile-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:114
-#, fuzzy
 msgid "Include binary files"
-msgstr "Binärdateien überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:115
 msgid "Select revision to compare with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:116
-#, fuzzy
 msgid "Use internal diff logic"
-msgstr "Bearbeiten-Befehl rückgängig machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:117
 msgid "Side-by-side diff"
@@ -20570,27 +19024,24 @@ msgid "Unified diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:121
-#, fuzzy
 msgid "Output complete text"
-msgstr "mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:122
 msgid "Line width in side-by-side diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:123
-#, fuzzy
 msgid "Export repository to git"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:124
 msgid "Export rids of exported data to file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:125
-#, fuzzy
 msgid "Read rids of data to ignore from file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:127
 msgid "Show files that aren't part of checkout"
@@ -20601,38 +19052,32 @@ msgid "Print complete file history"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:134
-#, fuzzy
 msgid "Display one-line summary"
-msgstr "Zusammenfassung anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:136
-#, fuzzy
 msgid "Select log mode (default)"
-msgstr "Vollständige Befehlszeile selektieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:138
-#, fuzzy
 msgid "Skip changes"
-msgstr "Keine Änderungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:139
-#, fuzzy
 msgid "Select print mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:141
-#, fuzzy
 msgid "Select status mode"
-msgstr "Eine Methode auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:143
 msgid "Show main and auxiliary commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:144
-#, fuzzy
 msgid "Show test commands only"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:145
 msgid "Show auxilary commands only"
@@ -20643,44 +19088,37 @@ msgid "Show list of web UI pages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:147
-#, fuzzy
 msgid "Import repository from git"
-msgstr "Auf Standardausgabe komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:148
-#, fuzzy
 msgid "Allow importing into existing repository"
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:149
-#, fuzzy
 msgid "Provide information about object"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:151
 #: /tmp/fish/implicit/share/completions/fossil.fish:170
-#, fuzzy
 msgid "Show extra information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:152
-#, fuzzy
 msgid "Create a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:153
-#, fuzzy
 msgid "Copy settings from repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:156
 msgid "Make JSON request"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:158
-#, fuzzy
 msgid "List files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:159
 #: /tmp/fish/implicit/share/completions/fossil.fish:163
@@ -20692,29 +19130,24 @@ msgstr "Konfigurationsdatei benutzen"
 #: /tmp/fish/implicit/share/completions/git.fish:246
 #: /tmp/fish/implicit/share/completions/git.fish:295
 #: /tmp/fish/implicit/share/completions/git.fish:296
-#, fuzzy
 msgid "Tag"
-msgstr "Ziel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:160
-#, fuzzy
 msgid "Show commit time"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:161
-#, fuzzy
 msgid "Provide extra information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:162
-#, fuzzy
 msgid "Merge commits"
-msgstr "Sortierte Dateien mischen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:164
-#, fuzzy
 msgid "Use baseline"
-msgstr "Ansi-Modus benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:167
 msgid "Allow empty merge"
@@ -20725,14 +19158,12 @@ msgid "Close merged branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:171
-#, fuzzy
 msgid "Move file"
-msgstr "Archiv-Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:173
-#, fuzzy
 msgid "Open repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:174
 msgid "Only modify manifest"
@@ -20743,9 +19174,8 @@ msgid "Allow opening inside an opened repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:176
-#, fuzzy
 msgid "Pull from a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:178
 #: /tmp/fish/implicit/share/completions/fossil.fish:181
@@ -20753,44 +19183,36 @@ msgid "Pull private branches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:179
-#, fuzzy
 msgid "Push into a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:182
-#, fuzzy
 msgid "Rebuild a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:183
-#, fuzzy
 msgid "Compute clusters"
-msgstr "Schnellere Kompromierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:184
-#, fuzzy
 msgid "Compress database"
-msgstr "Alle Daten komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:185
-#, fuzzy
 msgid "Force rebuild even with errors"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:186
-#, fuzzy
 msgid "Skip BLOB table verification"
-msgstr "Verifizierung der Signatur überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:187
-#, fuzzy
 msgid "Set the database pagesize"
-msgstr "Standardzeichensatz festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:188
-#, fuzzy
 msgid "Scan in random order"
-msgstr "in zufälliger Reihenfolge spielen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:189
 msgid "Run VACUUM"
@@ -20809,33 +19231,28 @@ msgid "Set Write-Ahead-Log journalling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:193
-#, fuzzy
 msgid "Show statistics"
-msgstr "Zwischenspeicherstatistik anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:194
-#, fuzzy
 msgid "Default server URL"
-msgstr "Referer-URL festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:195
 msgid "Revert a commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:197
-#, fuzzy
 msgid "Revert back to given revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:198
-#, fuzzy
 msgid "Remove a file from repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:199
-#, fuzzy
 msgid "Remove files from this checkout"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:200
 msgid "Skip removing files from this checkout"
@@ -20846,19 +19263,16 @@ msgid "Display actions without runing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:203
-#, fuzzy
 msgid "Manage settings"
-msgstr "Strings manipulieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:204
-#, fuzzy
 msgid "Log accesses"
-msgstr "Zugriffszeit anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:205
-#, fuzzy
 msgid "Allow symbolic links"
-msgstr "Defekter symbolischer Link"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:206
 msgid "Allow automatically filling CAPTCHA"
@@ -20873,9 +19287,8 @@ msgid "Pull list of shunned references from server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:209
-#, fuzzy
 msgid "Automatically sync the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:213
 msgid "Sign commits using GPG"
@@ -20894,23 +19307,20 @@ msgid "Allow binary files to be diffed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:217
-#, fuzzy
 msgid "External diff command"
-msgstr "Bearbeiten-Befehl rückgängig machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:218
-#, fuzzy
 msgid "Disallow pushing to the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:219
 msgid "Text editor for writing check-in comments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:220
-#, fuzzy
 msgid "List of empty directories"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:221
 msgid "Non-UTF-8 files glob pattern"
@@ -20957,14 +19367,12 @@ msgid "HTTP request size limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:232
-#, fuzzy
 msgid "Use modification times"
-msgstr "Modifikationszeit ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:233
-#, fuzzy
 msgid "PGP command"
-msgstr "Jobbefehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:234
 msgid "HTTP proxy URL"
@@ -20975,9 +19383,8 @@ msgid "Report relative paths"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:236
-#, fuzzy
 msgid "Compute checksums over all files"
-msgstr "Größe für alle Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:237
 msgid "Allow users to register themselves"
@@ -20992,14 +19399,12 @@ msgid "Location of SSL CA root certificates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:240
-#, fuzzy
 msgid "SSL private certificate path"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:241
-#, fuzzy
 msgid "Allow Tcl scripting"
-msgstr "Tcl-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:242
 msgid "Tcl initialization script"
@@ -21010,49 +19415,42 @@ msgid "TH1 initialization script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:244
-#, fuzzy
 msgid "Web browser name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:245
 msgid "Set globally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:246
-#, fuzzy
 msgid "Run SQL commands"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:247
 msgid "Manage stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:248
-#, fuzzy
 msgid "Save current changes"
-msgstr "Fehler aus Paketen auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:249
 #: /tmp/fish/implicit/share/completions/fossil.fish:250
-#, fuzzy
 msgid "Stash comment"
-msgstr "Kommentar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:251
-#, fuzzy
 msgid "List all stashes"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:252
 #: /tmp/fish/implicit/share/completions/fossil.fish:253
-#, fuzzy
 msgid "Show information about files"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:254
-#, fuzzy
 msgid "Show stash contents"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:255
 msgid "Pop last stash"
@@ -21076,19 +19474,16 @@ msgid "Forget ALL stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:261
-#, fuzzy
 msgid "Compare stash"
-msgstr "Vergleiche Monatsnamen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:262
-#, fuzzy
 msgid "Show status"
-msgstr "Threads anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:266
-#, fuzzy
 msgid "Sync with a repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:268
 msgid "Sync private branches"
@@ -21099,9 +19494,8 @@ msgid "Manage tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:270
-#, fuzzy
 msgid "Add tag to check-in"
-msgstr "Taintprüfung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:271
 msgid "Add raw tag"
@@ -21112,19 +19506,16 @@ msgid "Propagate tag"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:273
-#, fuzzy
 msgid "Remove tag from check-in"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:275
-#, fuzzy
 msgid "Remove raw tag"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:276
-#, fuzzy
 msgid "Find tag"
-msgstr "Kennzeichnung bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:277
 msgid "Find raw tag"
@@ -21135,70 +19526,57 @@ msgid "Find tag type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:279
-#, fuzzy
 msgid "Limit number of tags"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:281
 #: /tmp/fish/implicit/share/completions/git.fish:293
-#, fuzzy
 msgid "List tags"
-msgstr "Kennzeichnung bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:282
-#, fuzzy
 msgid "List raw tags"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:283
-#, fuzzy
 msgid "Show timeline"
-msgstr "Zeittyp anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:284
-#, fuzzy
 msgid "Limit timeline entries"
-msgstr "Wartezeiten zwischen Abrufversuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:285
-#, fuzzy
 msgid "Output only event type"
-msgstr "mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:286
-#, fuzzy
 msgid "Output list of files changed"
-msgstr "3 Zeilen des vereinheitlichten Kontextes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:287
-#, fuzzy
 msgid "Open web UI"
-msgstr "Datei öffnen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:288
-#, fuzzy
 msgid "Start web server"
-msgstr "Dienst starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:289
-#, fuzzy
 msgid "Enable automatic login for localhost"
-msgstr "Automatische Pufferzuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:290
-#, fuzzy
 msgid "Only listen on localhost"
-msgstr "Nur Lokationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:291
-#, fuzzy
 msgid "Port to listen on"
-msgstr "Niedrigster Port, an dem gelauscht wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:292
-#, fuzzy
 msgid "Trace TH1 execution"
-msgstr "Löschung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:293
 msgid "Use base URL"
@@ -21217,34 +19595,28 @@ msgid "Use SCGI rather than HTTP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:297
-#, fuzzy
 msgid "Undo the changes"
-msgstr "Änderung der Fenstergröße"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:299
-#, fuzzy
 msgid "Update version"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:301
-#, fuzzy
 msgid "Print debug information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:304
-#, fuzzy
 msgid "Print information about all files"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:305
-#, fuzzy
 msgid "Print fossil version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:306
-#, fuzzy
 msgid "Print version of optional features"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:307
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:3
@@ -21262,30 +19634,26 @@ msgstr "Sämtliche Versions-Informationen ignorieren"
 #: /tmp/fish/implicit/share/completions/rejmerge.fish:3
 #: /tmp/fish/implicit/share/completions/root.fish:6
 #: /tmp/fish/implicit/share/completions/zypper.fish:4
-#, fuzzy
 msgid "Print help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
-#, fuzzy
 msgid "Save function"
-msgstr "Funktion löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
 msgid "Open function in external editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
-#, fuzzy
 msgid "Edit in interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:1
 #: /tmp/fish/implicit/share/completions/functions.fish:5
-#, fuzzy
 msgid "Set function description"
-msgstr "Funktionsdefinitonsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:2
 #: /tmp/fish/implicit/share/completions/functions.fish:2
@@ -21315,14 +19683,12 @@ msgid "Make the function a variable update event handler"
 msgstr "Funktion zur Ereignisbehandlung bei Variablenaktualisierung verwenden"
 
 #: /tmp/fish/implicit/share/completions/function.fish:8
-#, fuzzy
 msgid "Make the function a generic event handler"
-msgstr "Funktion zur Signalereignisbehandlung verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:9
-#, fuzzy
 msgid "Specify named arguments"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:10
 msgid "Do not shadow variable scope of calling function"
@@ -21337,38 +19703,32 @@ msgid "Erase function"
 msgstr "Funktion löschen"
 
 #: /tmp/fish/implicit/share/completions/functions.fish:3
-#, fuzzy
 msgid "Show hidden functions"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:6
-#, fuzzy
 msgid "Test if function is defined"
-msgstr "Test, ob Variable definiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:7
 msgid "List the names of the functions, but not their definition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:8
-#, fuzzy
 msgid "Copy the specified function to the specified new name"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:9
-#, fuzzy
 msgid "Display information about the function"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:10
-#, fuzzy
 msgid "Print more output"
-msgstr "Wortzählung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:1
-#, fuzzy
 msgid "Show all files specified on the command line"
-msgstr "Angegebene Datei zur aktuellen Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:2
 msgid "Kill processes, accessing the file"
@@ -21395,14 +19755,12 @@ msgid "Kill only processes which have write access"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:8
-#, fuzzy
 msgid "Slect a different namespace"
-msgstr "Benutzerschnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:9
-#, fuzzy
 msgid "Silent operation"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:10
 msgid "Append the user name of the process owner to each PID"
@@ -21420,9 +19778,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/sshfs.fish:4
 #: /tmp/fish/implicit/share/completions/sshfs.fish:8
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:19
-#, fuzzy
 msgid "Mount options"
-msgstr "Einhäng-Option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fusermount.fish:5
 msgid "Unmount"
@@ -21430,23 +19787,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fusermount.fish:6
 #: /tmp/fish/implicit/share/completions/gdb.fish:10
-#, fuzzy
 msgid "Quiet"
-msgstr "Stiller Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fusermount.fish:7
 msgid "Lazy unmount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
-#, fuzzy
 msgid "Standard mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:2
-#, fuzzy
 msgid "Place output in file"
-msgstr "Ausgabe an Datei anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:3
 msgid ""
@@ -21456,9 +19810,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:4
-#, fuzzy
 msgid "Use specified version of the C++ ABI"
-msgstr "Benutze angegebenen Kompressionsalgorithmus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:5
 #: /tmp/fish/implicit/share/completions/gcc.fish:481
@@ -21534,20 +19887,18 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:18
-#, fuzzy
 msgid "Display the version number and copyrights of the invoked GCC"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:19
 msgid "In C mode, support all ISO C90 programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:20
-#, fuzzy
 msgid ""
 "Do not recognize \"asm\", \"inline\" or \"typeof\" as a keyword, so that "
 "code can use these words as identifiers"
-msgstr "Schlüsselworte asm, inline oder typeof nicht erkennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:21
 #: /tmp/fish/implicit/share/completions/gcc.fish:22
@@ -21561,9 +19912,8 @@ msgid "Assert that compilation takes place in a hosted environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:24
-#, fuzzy
 msgid "Assert that compilation takes place in a freestanding environment"
-msgstr "Freistehende Umgebung bestätigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:25
 msgid "Accept some non-standard constructs used in Microsoft header files"
@@ -21608,9 +19958,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:37
-#, fuzzy
 msgid "Turn off all access checking"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:38
 msgid ""
@@ -21665,9 +20014,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:48
-#, fuzzy
 msgid "Don’t emit code for implicit instantiations of inline templates, either"
-msgstr "Keinen Code für implizite 'inline'-Vorlagen abgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:49
 msgid ""
@@ -21699,10 +20047,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:54
-#, fuzzy
 msgid ""
 "Downgrade some diagnostics about nonconformant code from errors to warnings"
-msgstr "Einge Fehler zu Warnungen herabstufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:55
 msgid "Enable automatic template instantiation at link time"
@@ -21721,13 +20068,10 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:58
-#, fuzzy
 msgid ""
 "Do not emit the extra code to use the routines specified in the C++ ABI for "
 "thread-safe initialization of local statics"
 msgstr ""
-"Keinen Code für die threadsichere Initialisierung lokaler statischer Objekte "
-"abgeben"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:59
 msgid ""
@@ -21743,9 +20087,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:61
-#, fuzzy
 msgid "Do not use weak symbol support, even if it is provided by the linker"
-msgstr "Unterstützung für schwache Symbole nich verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:62
 msgid ""
@@ -21913,9 +20256,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:92
-#, fuzzy
 msgid "Warn if a \"@selector("
-msgstr "Auswahl schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:93
 msgid ""
@@ -22634,24 +20976,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:239
-#, fuzzy
 msgid "Optimize even more"
-msgstr "Paketdepot optimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:240
-#, fuzzy
 msgid "Optimize yet more"
-msgstr "Paketdepot optimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:241
-#, fuzzy
 msgid "Do not optimize"
-msgstr "Nicht sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:242
-#, fuzzy
 msgid "Optimize for size"
-msgstr "Paketdepot optimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:243
 msgid ""
@@ -22691,9 +21029,8 @@ msgid "Don’t pay attention to the \"inline\" keyword"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:250
-#, fuzzy
 msgid "Integrate all simple functions into their callers"
-msgstr "readline-Funktion zum reader injizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:251
 msgid ""
@@ -22854,9 +21191,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:280
-#, fuzzy
 msgid "Perform cross-jumping transformation"
-msgstr "Inhaltsgenerierung durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:281
 msgid "Attempt to transform conditional jumps into branch-less equivalents"
@@ -23335,9 +21671,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:380
-#, fuzzy
 msgid "Pass option as an option to the preprocessor"
-msgstr "Integrierten Präprozessor nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:381
 msgid "Predefine name as a macro, with definition 1"
@@ -23360,18 +21695,14 @@ msgid "Do not predefine any system-specific or GCC-specific macros"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:385
-#, fuzzy
 msgid ""
 "Add the directory dir to the list of directories to be searched for header "
 "files"
 msgstr ""
-"Legt eine Liste von Verzeichnissen fest, die nach Bildbetrachtern und "
-"Schlüsselserver-Hilfsprogrammen durchsucht werden"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:386
-#, fuzzy
 msgid "Write output to file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:387
 msgid "Turns on all optional warnings which are desirable for normal code"
@@ -23508,9 +21839,8 @@ msgid "Specify the standard to which the code should conform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:419
-#, fuzzy
 msgid "Split the include path"
-msgstr "Include-Pfad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:420
 msgid "Do not search the standard system directories for header files"
@@ -23570,9 +21900,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:432
-#, fuzzy
 msgid "Accept universal character names in identifiers"
-msgstr "In Bezeichnern $ akzeptieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:433
 msgid ""
@@ -23631,9 +21960,8 @@ msgid "Inhibit generation of linemarkers in the output from the preprocessor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:445
-#, fuzzy
 msgid "Do not discard comments"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:446
 msgid "Do not discard comments, including during macro expansion"
@@ -23646,9 +21974,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:448
-#, fuzzy
 msgid "Process trigraph sequences"
-msgstr "at-Warteschlange nur einmal verarbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:449
 msgid ""
@@ -23802,9 +22129,8 @@ msgid "Compile code for little endian mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:486
-#, fuzzy
 msgid "Compile code for big endian mode"
-msgstr "Compiler-Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:487
 msgid "Prepend the name of the cpu to all public symbol names"
@@ -23824,9 +22150,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:493
-#, fuzzy
 msgid "Generate code for the specified ABI"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:494
 msgid ""
@@ -24025,9 +22350,8 @@ msgid "Change only the low 8 bits of the stack pointer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:532
-#, fuzzy
 msgid "Assume int to be 8 bit integer"
-msgstr "linke Ganzzahl von rechter verschieden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:533
 #: /tmp/fish/implicit/share/completions/gcc.fish:818
@@ -24063,9 +22387,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:539
-#, fuzzy
 msgid "Assume that the program is arbitrarily large"
-msgstr "Datentyp für Binärdateien unterstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:540
 #: /tmp/fish/implicit/share/completions/gcc.fish:909
@@ -24089,9 +22412,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:547
 #: /tmp/fish/implicit/share/completions/gcc.fish:743
 #: /tmp/fish/implicit/share/completions/gcc.fish:744
-#, fuzzy
 msgid "Generate code for the specified architecture"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:548
 #: /tmp/fish/implicit/share/completions/gcc.fish:549
@@ -24265,9 +22587,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:591
-#, fuzzy
 msgid "Produce a Mach-o bundle format file"
-msgstr "Beispiel-Konfigurationsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:592
 msgid ""
@@ -24504,38 +22825,32 @@ msgid "Change ABI to use double word insns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:698
-#, fuzzy
 msgid "Do not use double word instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:699
-#, fuzzy
 msgid "Use floating point double instructions"
-msgstr "Fließkomma-Ausnahmefehler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:700
-#, fuzzy
 msgid "Do not use floating point double instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:701
-#, fuzzy
 msgid "Use media instructions"
-msgstr "Illegale Instruktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:702
-#, fuzzy
 msgid "Do not use media instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:703
 msgid "Use multiply and add/subtract instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:704
-#, fuzzy
 msgid "Do not use multiply and add/subtract instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:705
 msgid ""
@@ -24598,48 +22913,40 @@ msgid "Use all eight media accumulator registers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:717
-#, fuzzy
 msgid "Pack VLIW instructions"
-msgstr "Illegale Instruktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:718
-#, fuzzy
 msgid "Do not pack VLIW instructions"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:719
 msgid "Do not mark ABI switches in e_flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:720
-#, fuzzy
 msgid "Enable the use of conditional-move instructions (default)"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:721
-#, fuzzy
 msgid "Disable the use of conditional-move instructions"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:722
-#, fuzzy
 msgid "Enable the use of conditional set instructions (default)"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:723
-#, fuzzy
 msgid "Disable the use of conditional set instructions"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:724
-#, fuzzy
 msgid "Enable the use of conditional execution (default)"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:725
-#, fuzzy
 msgid "Disable the use of conditional execution"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:726
 msgid "Run a pass to pack branches into VLIW instructions (default)"
@@ -24663,9 +22970,8 @@ msgid "Enable nested conditional execution optimizations (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:731
-#, fuzzy
 msgid "Disable nested conditional execution optimizations"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:732
 msgid ""
@@ -24699,9 +23005,8 @@ msgid "Generate code for the H8/300H"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:738
-#, fuzzy
 msgid "Generate code for the H8S"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:739
 msgid "Generate code for the H8S and H8/300H in the normal mode"
@@ -24789,14 +23094,12 @@ msgid "Generate the predefine, \"_SIO\", for server IO"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:764
-#, fuzzy
 msgid "Use GNU ld specific options"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:765
-#, fuzzy
 msgid "Use HP ld specific options"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:766
 msgid "Generate code that uses long call sequences"
@@ -24838,9 +23141,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:776
 #: /tmp/fish/implicit/share/completions/gcc.fish:777
-#, fuzzy
 msgid "A deprecated synonym for -mtune"
-msgstr "Synonym für -i"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:778
 #: /tmp/fish/implicit/share/completions/gcc.fish:779
@@ -25012,16 +23314,14 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:828
-#, fuzzy
 msgid "Generate code for a big endian target"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:829
 #: /tmp/fish/implicit/share/completions/gcc.fish:939
 #: /tmp/fish/implicit/share/completions/gcc.fish:940
-#, fuzzy
 msgid "Generate code for a little endian target"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:830
 #: /tmp/fish/implicit/share/completions/gcc.fish:831
@@ -25060,9 +23360,8 @@ msgid "Generate code that uses a single constant global pointer value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:842
-#, fuzzy
 msgid "Generate code that is self-relocatable"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:843
 msgid ""
@@ -25145,19 +23444,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:866
-#, fuzzy
 msgid "Generate code for the M32R/2"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:867
-#, fuzzy
 msgid "Generate code for the M32R/X"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:868
-#, fuzzy
 msgid "Generate code for the M32R"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:869
 msgid ""
@@ -25245,39 +23541,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:885
 #: /tmp/fish/implicit/share/completions/gcc.fish:886
-#, fuzzy
 msgid "Generate output for a 68000"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:887
 #: /tmp/fish/implicit/share/completions/gcc.fish:888
-#, fuzzy
 msgid "Generate output for a 68020"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:889
 msgid "Generate output containing 68881 instructions for floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:890
-#, fuzzy
 msgid "Generate output for a 68030"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:891
-#, fuzzy
 msgid "Generate output for a 68040"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:892
-#, fuzzy
 msgid "Generate output for a 68060"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:893
-#, fuzzy
 msgid "Generate output for a CPU32"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:894
 msgid "Generate output for a 520X \"coldfire\" family cpu"
@@ -25297,14 +23587,12 @@ msgid "Consider type \"int\" to be 16 bits wide, like \"short int\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:899
-#, fuzzy
 msgid "Do not use the bit-field instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:900
-#, fuzzy
 msgid "Do use the bit-field instructions"
-msgstr "Keine eingebauten Funktionen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:901
 msgid ""
@@ -25353,21 +23641,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:912
 #: /tmp/fish/implicit/share/completions/gcc.fish:913
-#, fuzzy
 msgid "Generate output for a 68HC11"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:914
 #: /tmp/fish/implicit/share/completions/gcc.fish:915
-#, fuzzy
 msgid "Generate output for a 68HC12"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:916
 #: /tmp/fish/implicit/share/completions/gcc.fish:917
-#, fuzzy
 msgid "Generate output for a 68HCS12"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:918
 msgid ""
@@ -25412,9 +23697,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:931
 #: /tmp/fish/implicit/share/completions/gcc.fish:932
-#, fuzzy
 msgid "Always treat bit-fields as int-sized"
-msgstr "Alle Bitfielder sind nicht vorzeichenbehaftet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:933
 #: /tmp/fish/implicit/share/completions/gcc.fish:934
@@ -25423,9 +23707,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:935
 #: /tmp/fish/implicit/share/completions/gcc.fish:936
-#, fuzzy
 msgid "Emit callgraph information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:937
 #: /tmp/fish/implicit/share/completions/gcc.fish:938
@@ -25438,9 +23721,8 @@ msgid "Generate code for the 210 processor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:943
-#, fuzzy
 msgid "Generate big-endian code"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:944
 msgid "Generate little-endian code"
@@ -25530,9 +23812,8 @@ msgid "Use floating-point coprocessor instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:970
-#, fuzzy
 msgid "Do not use floating-point coprocessor instructions"
-msgstr "Keinen Code für abweichende 'inline'-Funktionen abgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:971
 msgid ""
@@ -25628,9 +23909,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:998
 #: /tmp/fish/implicit/share/completions/gcc.fish:999
-#, fuzzy
 msgid "Disable (do not disable) use of the \"jal\" instruction"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1000
 #: /tmp/fish/implicit/share/completions/gcc.fish:1001
@@ -25834,9 +24114,8 @@ msgid "Use hardware FPP floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1055
-#, fuzzy
 msgid "Do not use hardware floating point"
-msgstr "Keine Dateinamenvervollständigung benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1056
 msgid "Return floating-point results in ac0 (fr0 in Unix assembler syntax)"
@@ -25891,9 +24170,8 @@ msgid "Use \"abshi2\" pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1072
-#, fuzzy
 msgid "Do not use \"abshi2\" pattern"
-msgstr "Erweitern Sie das Muster nicht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1073
 msgid "Pretend that branches are expensive"
@@ -26118,9 +24396,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:1191
 #: /tmp/fish/implicit/share/completions/gcc.fish:1195
 #: /tmp/fish/implicit/share/completions/gcc.fish:1196
-#, fuzzy
 msgid "On System V"
-msgstr "Subsystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1146
 #: /tmp/fish/implicit/share/completions/gcc.fish:1147
@@ -26334,29 +24611,24 @@ msgid "These arguments always have to be used in conjunction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1231
-#, fuzzy
 msgid "Generate code for the SH1"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1232
-#, fuzzy
 msgid "Generate code for the SH2"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1233
-#, fuzzy
 msgid "Generate code for the SH2e"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1234
-#, fuzzy
 msgid "Generate code for the SH3"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1235
-#, fuzzy
 msgid "Generate code for the SH3e"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1236
 msgid "Generate code for the SH4 without a floating-point unit"
@@ -26375,9 +24647,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1239
-#, fuzzy
 msgid "Generate code for the SH4"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1240
 msgid ""
@@ -26398,9 +24669,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1243
-#, fuzzy
 msgid "Generate code for the SH4a"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1244
 msgid ""
@@ -26424,9 +24694,8 @@ msgid "Use 32-bit offsets in \"switch\" tables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1250
-#, fuzzy
 msgid "Enable the use of the instruction \"fmovd\""
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1251
 #: /tmp/fish/implicit/share/completions/gcc.fish:1252
@@ -26614,18 +24883,16 @@ msgid "This is a synonym for -pthreads"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1300
-#, fuzzy
 msgid "Create a shared object"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1301
 msgid "Identify the versions of each tool used by the compiler, in a \""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1302
-#, fuzzy
 msgid "Refrain from adding \""
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1304
 #: /tmp/fish/implicit/share/completions/gcc.fish:1305
@@ -26680,10 +24947,9 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1320
 #: /tmp/fish/implicit/share/completions/gcc.fish:1321
-#, fuzzy
 msgid ""
 "Enable (disable) the use of the single instruction repeat instruction RPTS"
-msgstr "Benutzung des Veränderungserkennungscodes deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1322
 #: /tmp/fish/implicit/share/completions/gcc.fish:1323
@@ -26816,9 +25082,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1356
 #: /tmp/fish/implicit/share/completions/gcc.fish:1357
-#, fuzzy
 msgid "Control the treatment of literal pools"
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1358
 #: /tmp/fish/implicit/share/completions/gcc.fish:1359
@@ -26906,9 +25171,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1376
-#, fuzzy
 msgid "Ignore the #ident directive"
-msgstr "Nullblock im Archiv ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1377
 msgid "Don’t output a \""
@@ -27016,9 +25280,8 @@ msgid "List all options, with brief explanations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:2
-#, fuzzy
 msgid "Read symbol table from file file"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:3
 msgid "Enable writing into executable and core files"
@@ -27039,24 +25302,21 @@ msgid "Use file file as a core dump to examine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:7
-#, fuzzy
 msgid "Execute GDB commands from file file"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:8
 msgid "Add directory to the path to search for source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:9
-#, fuzzy
 msgid "Do not execute commands from any .gdbinit files"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:11
 #: /tmp/fish/implicit/share/completions/root.fish:1
-#, fuzzy
 msgid "Run in batch mode"
-msgstr "Im Dummy-Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:12
 msgid ""
@@ -27087,66 +25347,56 @@ msgid "Run GDB using a text (console) user interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:1
-#, fuzzy
 msgid "Print usage informations and quit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:2
-#, fuzzy
 msgid "Print the version and quit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
 msgid "Use URL as the remote source for gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:4
-#, fuzzy
 msgid "Use the given HTTP proxy for remote operations"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:5
-#, fuzzy
 msgid "Use no HTTP proxy for remote operations"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:6
 msgid "Get help on this command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:7
-#, fuzzy
 msgid "Set the verbose level of output"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:8
-#, fuzzy
 msgid "Use this config file instead of default"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:9
 msgid "Show stack backtrace on errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:10
-#, fuzzy
 msgid "Turn on Ruby debugging"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:11
-#, fuzzy
 msgid "Add a trusted certificate"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:12
-#, fuzzy
 msgid "List trusted certificates"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:13
-#, fuzzy
 msgid "Remove trusted certificates containing STRING"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:14
 msgid "Build private key and self-signed certificate for EMAIL_ADDR"
@@ -27157,9 +25407,8 @@ msgid "Certificate for --sign command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:16
-#, fuzzy
 msgid "Private key for --sign command"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:17
 msgid "Sign a certificate with my key and certificate"
@@ -27170,33 +25419,28 @@ msgid "Verify gem file against its internal checksum"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:19
-#, fuzzy
 msgid "Report 'unmanaged' or rogue files in the gem repository"
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:20
 msgid "Run unit tests for gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:21
-#, fuzzy
 msgid "Specify version for which to run unit tests"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:22
-#, fuzzy
 msgid "Don't really cleanup"
-msgstr "Nicht wirklich deinstallieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:23
-#, fuzzy
 msgid "List the files inside a Gem"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:24
-#, fuzzy
 msgid "Specify version for gem to view"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:25
 msgid "Search for gems under specific paths"
@@ -27208,28 +25452,24 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:27
 #: /tmp/fish/implicit/share/completions/gem.fish:82
-#, fuzzy
 msgid "Specify version of gem to uninstall"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:28
-#, fuzzy
 msgid "Include reverse dependencies in the output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:29
-#, fuzzy
 msgid "Don't include reverse dependencies in the output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:30
 msgid "Pipe Format (name --version ver)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:31
-#, fuzzy
 msgid "Specify version of gem to install"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:32
 #: /tmp/fish/implicit/share/completions/gem.fish:51
@@ -27282,51 +25522,43 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:40
 #: /tmp/fish/implicit/share/completions/gem.fish:89
-#, fuzzy
 msgid "Force gem to install, bypassing dependency checks"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:41
 #: /tmp/fish/implicit/share/completions/gem.fish:90
-#, fuzzy
 msgid "Don't force gem to install, bypassing dependency checks"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:42
 #: /tmp/fish/implicit/share/completions/gem.fish:91
-#, fuzzy
 msgid "Run unit tests prior to installation"
-msgstr "Vor der Installation nicht auf ausreichenden Plattenplatz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:43
 #: /tmp/fish/implicit/share/completions/gem.fish:92
-#, fuzzy
 msgid "Don't run unit tests prior to installation"
-msgstr "Vor der Installation nicht auf ausreichenden Plattenplatz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:44
 #: /tmp/fish/implicit/share/completions/gem.fish:93
-#, fuzzy
 msgid "Use bin wrappers for executables"
-msgstr "Datei ist ausführbar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:45
 #: /tmp/fish/implicit/share/completions/gem.fish:94
-#, fuzzy
 msgid "Don't use bin wrappers for executables"
-msgstr "Skripte nicht ausführbar machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:46
 #: /tmp/fish/implicit/share/completions/gem.fish:95
-#, fuzzy
 msgid "Specify gem trust policy"
-msgstr "Vertrauensmodell angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:47
 #: /tmp/fish/implicit/share/completions/gem.fish:96
-#, fuzzy
 msgid "Do not install any required dependent gems"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:48
 #: /tmp/fish/implicit/share/completions/gem.fish:97
@@ -27336,25 +25568,22 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:49
 #: /tmp/fish/implicit/share/completions/gem.fish:55
 #: /tmp/fish/implicit/share/completions/gem.fish:66
-#, fuzzy
 msgid "Display detailed information of gem(s)"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:50
 #: /tmp/fish/implicit/share/completions/gem.fish:56
 #: /tmp/fish/implicit/share/completions/gem.fish:67
-#, fuzzy
 msgid "Don't display detailed information of gem(s)"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:54
 msgid "Name of gem(s) to query on matches the provided REGEXP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:60
-#, fuzzy
 msgid "Generate RDoc/RI documentation for all installed gems"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:61
 msgid "Include RDoc generated documents"
@@ -27373,38 +25602,32 @@ msgid "Don't include RI generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:65
-#, fuzzy
 msgid "Specify version of gem to rdoc"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:71
-#, fuzzy
 msgid "Specify version of gem to examine"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:75
 msgid "Output specifications for all versions of the gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:76
-#, fuzzy
 msgid "Uninstall all matching versions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:77
-#, fuzzy
 msgid "Don't uninstall all matching versions"
-msgstr "Nicht wirklich deinstallieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:78
-#, fuzzy
 msgid "Ignore dependency requirements while uninstalling"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:79
-#, fuzzy
 msgid "Don't ignore dependency requirements while uninstalling"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:80
 msgid "Uninstall applicable executables without confirmation"
@@ -27415,18 +25638,16 @@ msgid "Don't uninstall applicable executables without confirmation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:83
-#, fuzzy
 msgid "Specify version of gem to unpack"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:98
 msgid "Update the RubyGems system software"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:1
-#, fuzzy
 msgid "Display the manual of a git command"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:3
 msgid "Run as if git was started in this directory"
@@ -27441,19 +25662,16 @@ msgid "Print the path to the html documentation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:7
-#, fuzzy
 msgid "Print the path to the man documentation"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:8
-#, fuzzy
 msgid "Print the path to the info documentation"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:9
-#, fuzzy
 msgid "Pipe output into a pager"
-msgstr "Ausgabe an Datei anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:10
 #: /tmp/fish/implicit/share/completions/journalctl.fish:6
@@ -27462,29 +25680,24 @@ msgstr "Ausgabe an Datei anhängen"
 #: /tmp/fish/implicit/share/completions/systemctl.fish:41
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:5
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:9
-#, fuzzy
 msgid "Do not pipe output into a pager"
-msgstr "Konnte Shell nicht wieder in Vordergrund zurückholen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:11
-#, fuzzy
 msgid "Set the path to the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:12
-#, fuzzy
 msgid "Set the path to the working tree"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:13
-#, fuzzy
 msgid "Set the namespace"
-msgstr "Volume-Namen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:14
-#, fuzzy
 msgid "Treat the repository as bare"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:15
 msgid "Do not use replacement refs to replace git objects"
@@ -27503,14 +25716,12 @@ msgid "Don't treat pathspecs as globs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:19
-#, fuzzy
 msgid "Match pathspecs case-insensitively"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:20
-#, fuzzy
 msgid "Download objects and refs from another repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:21
 msgid "Remote"
@@ -27541,9 +25752,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:276
 #: /tmp/fish/implicit/share/completions/mdadm.fish:12
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:1
-#, fuzzy
 msgid "Be quiet"
-msgstr "Erzwungene Beendigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:24
 #: /tmp/fish/implicit/share/completions/git.fish:41
@@ -27555,9 +25765,8 @@ msgstr "Erzwungene Beendigung"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:53
 #: /tmp/fish/implicit/share/completions/prt-get.fish:111
 #: /tmp/fish/implicit/share/completions/xz.fish:32
-#, fuzzy
 msgid "Be verbose"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:25
 #: /tmp/fish/implicit/share/completions/git.fish:215
@@ -27627,44 +25836,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:40
-#, fuzzy
 msgid "Manage set of tracked repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:42
-#, fuzzy
 msgid "Adds a new remote"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:43
-#, fuzzy
 msgid "Removes a remote"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:44
-#, fuzzy
 msgid "Shows a remote"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:45
-#, fuzzy
 msgid "Deletes all stale tracking branches"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:46
-#, fuzzy
 msgid "Fetches updates"
-msgstr "Quellpakete abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:47
-#, fuzzy
 msgid "Renames a remote"
-msgstr "Modul umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:48
-#, fuzzy
 msgid "Sets the default branch for a remote"
-msgstr "Standardaktion für mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:49
 msgid "Changes URLs for a remote"
@@ -27730,23 +25931,20 @@ msgid "Generate a diffstat, showing the number of changed lines of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:66
-#, fuzzy
 msgid "Shows the commits on branches"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:67
 msgid "Rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:68
-#, fuzzy
 msgid "Add file contents to the index"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:69
-#, fuzzy
 msgid "Don't actually add the file(s)"
-msgstr "Aktion nicht tatsächlich ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:71
 msgid "Allow adding otherwise ignored files"
@@ -27754,23 +25952,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:259
-#, fuzzy
 msgid "Interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:73
 msgid "Interactively choose hunks to stage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:74
-#, fuzzy
 msgid "Manually create a patch"
-msgstr "ARP-Adresse manuell erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:75
-#, fuzzy
 msgid "Only match tracked files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:76
 msgid "Match files both in working tree and index"
@@ -27799,14 +25994,12 @@ msgid "Checkout and switch to a branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:82
-#, fuzzy
 msgid "Local Branch"
-msgstr "Logisches Und"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:83
-#, fuzzy
 msgid "Remote Branch"
-msgstr "Eine Platte umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:84
 #: /tmp/fish/implicit/share/completions/git.fish:245
@@ -27818,14 +26011,12 @@ msgid "Track a new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:90
-#, fuzzy
 msgid "Keep staged changes"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:91
-#, fuzzy
 msgid "Keep unmerged changes"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:92
 msgid "Apply a patch on a git index file and a working tree"
@@ -27840,29 +26031,24 @@ msgid "Find the change that introduced a bug by binary search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:95
-#, fuzzy
 msgid "List, create, or delete branches"
-msgstr "Keine komprimierten Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:97
-#, fuzzy
 msgid "Delete branch"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:98
-#, fuzzy
 msgid "Force deletion of branch"
-msgstr "Löschung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:99
-#, fuzzy
 msgid "Rename branch"
-msgstr "Eine Platte umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:100
-#, fuzzy
 msgid "Force renaming branch"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:101
 msgid "Lists both local and remote branches"
@@ -27873,9 +26059,8 @@ msgid "Track remote branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:103
-#, fuzzy
 msgid "Do not track remote branch"
-msgstr "Entfernten Befehl nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:104
 msgid "Set remote branch to track"
@@ -27915,9 +26100,8 @@ msgid "Fast-forward if possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:115
-#, fuzzy
 msgid "Clone a repository into a new directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:116
 msgid "Copy files instead of using hardlinks"
@@ -27928,52 +26112,44 @@ msgid "Operate quietly and do not report progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:118
-#, fuzzy
 msgid "Provide more information on what is going on"
-msgstr "Während der Verarbeitung zusätzliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:119
 msgid "No checkout of HEAD is performed after the clone is complete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:120
-#, fuzzy
 msgid "Make a bare Git repository"
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:121
-#, fuzzy
 msgid "Set up a mirror of the source repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:122
-#, fuzzy
 msgid "Use a specific name of the remote instead of the default"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:123
 msgid "Use a specific branch instead of the one used by the cloned repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:124
-#, fuzzy
 msgid "Truncate the history to a specified number of revisions"
-msgstr "Priorität zunächst um angegebene Zahl erhöhen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:125
-#, fuzzy
 msgid "Initialize all submodules within the cloned repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:126
-#, fuzzy
 msgid "Record changes to the repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:127
-#, fuzzy
 msgid "Amend the log message of the last commit"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:128
 msgid "Fixup commit to be used with rebase --autosquash"
@@ -27984,14 +26160,12 @@ msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:131
-#, fuzzy
 msgid "Show diff of changes in the index"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:132
-#, fuzzy
 msgid "Compare two paths on the filesystem"
-msgstr "Archiv und Dateisystem vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:134
 msgid "Open diffs in a visual tool"
@@ -28002,9 +26176,8 @@ msgid "Visually show diff of changes in the index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:138
-#, fuzzy
 msgid "Print lines matching a pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:139
 msgid "Create an empty git repository or reinitialize an existing one"
@@ -28023,14 +26196,12 @@ msgid "Continue listing file history beyond renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:144
-#, fuzzy
 msgid "Don't print ref names"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:145
-#, fuzzy
 msgid "Print out ref names"
-msgstr "Kernel-Name ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:146
 msgid "Print ref name by which each commit was reached"
@@ -28041,9 +26212,8 @@ msgid "Limit the number of commits before starting to show the commit output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:148
-#, fuzzy
 msgid "Skip given number of commits"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:149
 #: /tmp/fish/implicit/share/completions/git.fish:150
@@ -28052,9 +26222,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:151
 #: /tmp/fish/implicit/share/completions/git.fish:152
-#, fuzzy
 msgid "Show commits older than specified date"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:153
 msgid "Limit commits from given author"
@@ -28069,9 +26238,8 @@ msgid "Limit commits to ones with reflog entries matching given pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:156
-#, fuzzy
 msgid "Limit commits with message that match given pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:157
 msgid "Limit commits to ones that match all given --grep"
@@ -28082,23 +26250,20 @@ msgid "Limit commits to ones with message that don't match --grep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:159
-#, fuzzy
 msgid "Case insensitive match"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:160
 msgid "Patterns are basic regular expressions (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:161
-#, fuzzy
 msgid "Patterns are extended regular expressions"
-msgstr "Muster ist ein erweiterter regulärer Ausdruck"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:162
-#, fuzzy
 msgid "Patterns are fixed strings"
-msgstr "Muster ist eine feststehende Zeichenkette"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:163
 msgid "Patterns are Perl-compatible regular expressions"
@@ -28109,9 +26274,8 @@ msgid "Stop when given path disappears from tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:165
-#, fuzzy
 msgid "Print only merge commits"
-msgstr "Anzahl Zeilenendzeichen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:166
 msgid "Don't print commits with more than one parent"
@@ -28171,9 +26335,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:178
-#, fuzzy
 msgid "Do not include refs matching given glob pattern"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:179
 msgid ""
@@ -28182,14 +26345,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:180
-#, fuzzy
 msgid "Ignore invalid object names"
-msgstr "Umgebungsvariablen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:181
-#, fuzzy
 msgid "Read commits from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:182
 msgid "Mark equivalent commits with = and inequivalent with +"
@@ -28208,9 +26369,8 @@ msgid "Autocommit the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:188
-#, fuzzy
 msgid "Don't autocommit the merge"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:189
 msgid "Edit auto-generated merge message"
@@ -28241,9 +26401,8 @@ msgid "Don't populate the log message with one-line descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:196
-#, fuzzy
 msgid "Show diffstat of the merge"
-msgstr "Änderungsdatum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:197
 msgid "Don't show diffstat of the merge"
@@ -28254,9 +26413,8 @@ msgid "Squash changes from other branch as a single commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:199
-#, fuzzy
 msgid "Don't squash changes"
-msgstr "Änderungen nicht zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:202
 #: /tmp/fish/implicit/share/completions/git.fish:219
@@ -28269,23 +26427,20 @@ msgid "Force no progress status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:204
-#, fuzzy
 msgid "Set the commit message"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:205
-#, fuzzy
 msgid "Abort the current conflict resolution process"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:206
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:207
-#, fuzzy
 msgid "Use specific merge resolution program"
-msgstr "Angegebenen Message-Digest-Algorithmus verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:209
 msgid "Move or rename a file, a directory, or a symlink"
@@ -28300,26 +26455,22 @@ msgid "Fetch from and merge with another repository or a local branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:214
-#, fuzzy
 msgid "Fetch all remotes"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:217
-#, fuzzy
 msgid "Keep downloaded pack"
-msgstr "Herunterladen von Paketen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:218
-#, fuzzy
 msgid "Disable automatic tag following"
-msgstr "Automatische Pufferzuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:220
 #: /tmp/fish/implicit/share/completions/git.fish:223
 #: /tmp/fish/implicit/share/completions/git.fish:243
-#, fuzzy
 msgid "Remote alias"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:222
 msgid "Update remote refs along with associated objects"
@@ -28350,9 +26501,8 @@ msgid "Push all refs under refs/"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:231
-#, fuzzy
 msgid "Delete all listed refs from the remote repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:232
 msgid "Push all refs under refs/tags"
@@ -28367,9 +26517,8 @@ msgid "Do everything except actually send the updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:235
-#, fuzzy
 msgid "Produce machine-readable output"
-msgstr "Audio-Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:236
 msgid "Force update of remote refs"
@@ -28389,14 +26538,12 @@ msgid "Forward-port local commits to the updated upstream head"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:247
-#, fuzzy
 msgid "Restart the rebasing process"
-msgstr "Automatische Zeilenende-Verarbeitung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:248
-#, fuzzy
 msgid "Abort the rebase operation"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:249
 msgid "Keep the commits that don't cahnge anything"
@@ -28411,9 +26558,8 @@ msgid "Use merging strategies to rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:254
-#, fuzzy
 msgid "Show diffstat of the rebase"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:255
 msgid "Don't show diffstat of the rebase"
@@ -28428,18 +26574,16 @@ msgid "Don't allow the pre-rebase hook to run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:258
-#, fuzzy
 msgid "Force the rebase"
-msgstr "Ja erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:260
 msgid "Try to recreate merges"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:261
-#, fuzzy
 msgid "Rebase all reachable commits"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:262
 msgid "Automatic squashing"
@@ -28450,19 +26594,16 @@ msgid "No automatic squashing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:264
-#, fuzzy
 msgid "No fast-forward"
-msgstr "Datum in Zukunft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:265
-#, fuzzy
 msgid "Reset current HEAD to the specified state"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:266
-#, fuzzy
 msgid "Reset files in working directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:270
 msgid "Reflog"
@@ -28473,14 +26614,12 @@ msgid "Revert an existing commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:272
-#, fuzzy
 msgid "Remove files from the working tree and from the index"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:273
-#, fuzzy
 msgid "Keep local copies"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:274
 msgid "Exit with a zero status even if no files matched"
@@ -28504,9 +26643,8 @@ msgid "Dry run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:279
-#, fuzzy
 msgid "Show the working tree status"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:280
 msgid "Give the output in the short-format"
@@ -28529,9 +26667,8 @@ msgid "The untracked files handling mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:285
-#, fuzzy
 msgid "Ignore changes to submodules"
-msgstr "Änderungen aufgrund von Tabulatorausweitung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:286
 msgid "Create, list, delete or verify a tag object signed with GPG"
@@ -28542,14 +26679,12 @@ msgid "Make an unsigned, annotated tag object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:289
-#, fuzzy
 msgid "Make a GPG-signed tag"
-msgstr "Signatur erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:290
-#, fuzzy
 msgid "Remove a tag"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:291
 msgid "Verify signature of a tag"
@@ -28564,14 +26699,12 @@ msgid "List tags that contain a commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:297
-#, fuzzy
 msgid "Stash away changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:298
-#, fuzzy
 msgid "List stashes"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:299
 msgid "Show the changes recorded in the stash"
@@ -28586,47 +26719,40 @@ msgid "Apply a single stashed state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:302
-#, fuzzy
 msgid "Remove all stashed states"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:303
-#, fuzzy
 msgid "Remove a single stashed state from the stash list"
-msgstr "Angegebenen Eintrag aus der --group-Liste entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:304
-#, fuzzy
 msgid "Create a stash"
-msgstr "Archiv erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:305
 msgid "Save a new stash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:306
-#, fuzzy
 msgid "Create a new branch from a stash"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:307
-#, fuzzy
 msgid "Set and read git configuration variables"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:308
-#, fuzzy
 msgid "Generate patch series to send upstream"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:310
 msgid "Generate plain patches without diffstat"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:311
-#, fuzzy
 msgid "Suppress diff output"
-msgstr "Informationelle Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:312
 msgid "Spend more time to create smaller diffs"
@@ -28649,18 +26775,16 @@ msgid "Show number of added/deleted lines in decimal notation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:317
-#, fuzzy
 msgid "Output only last line of the stat"
-msgstr "Nur die ersten von gleichen Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:318
 msgid "Output a condensed summary of extended header information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:319
-#, fuzzy
 msgid "Disable rename detection"
-msgstr "Nicht auf die Veränderungszeiten der Dateien vertrauen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:320
 msgid "Show full blob object names"
@@ -28675,24 +26799,20 @@ msgid "Also inspect unmodified files as source for a copy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:324
-#, fuzzy
 msgid "Ignore changes in whitespace at EOL"
-msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:325
-#, fuzzy
 msgid "Ignore changes in amount of whitespace"
-msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:326
-#, fuzzy
 msgid "Ignore whitespace when comparing lines"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:328
-#, fuzzy
 msgid "Show whole surrounding functions of changes"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:329
 msgid "Allow an external diff helper to be executed"
@@ -28729,9 +26849,8 @@ msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:337
-#, fuzzy
 msgid "Add a submodule"
-msgstr "Einem Modul eine symbolische Markierung hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:338
 msgid "Show submodule status"
@@ -28743,28 +26862,24 @@ msgid "Initialize all submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:340
-#, fuzzy
 msgid "Update all submodules"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:341
-#, fuzzy
 msgid "Show commit summary"
-msgstr "Zusammenfassung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:342
-#, fuzzy
 msgid "Run command on each submodule"
-msgstr "Befehle aus dem Cache starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:343
 msgid "Sync submodules' URL with .gitmodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:344
-#, fuzzy
 msgid "Only print error messages"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:346
 msgid "Checkout the superproject's commit on a detached HEAD in the submodule"
@@ -28800,9 +26915,8 @@ msgid "Also add ignored submodule path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:353
-#, fuzzy
 msgid "Remove even with local changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:354
 msgid "Use the commit stored in the index"
@@ -28813,23 +26927,20 @@ msgid "Compare the commit in the index with submodule HEAD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:356
-#, fuzzy
 msgid "Traverse submodules recursively"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:357
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:358
-#, fuzzy
 msgid "Remove untracked files from the working tree"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:359
-#, fuzzy
 msgid "Force run"
-msgstr "Erzwungene Beendigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:360
 msgid "Show what would be done and clean files interactively"
@@ -28852,46 +26963,40 @@ msgid "Remove ignored files, as well"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:365
-#, fuzzy
 msgid "Remove only ignored files"
-msgstr "Aktualisieren: nur geänderte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:366
-#, fuzzy
 msgid "Show what revision and author last modified each line of a file"
-msgstr "Letzte Revision anzeigen, bei der jede Zeile verändert wurde"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:367
 msgid "Show blank SHA-1 for boundary commits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:368
-#, fuzzy
 msgid "Do not treat root commits as boundaries"
-msgstr "Entfernten Befehl nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:369
 msgid "Include additional statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:370
-#, fuzzy
 msgid "Annotate only the given line range"
-msgstr "Kommentiere jede Zeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:371
 msgid "Show long rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:372
-#, fuzzy
 msgid "Show raw timestamp"
-msgstr "Zeittyp anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:373
-#, fuzzy
 msgid "Use revisions from named file instead of calling rev-list"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:374
 msgid "Walk history forward instead of backward"
@@ -28902,23 +27007,20 @@ msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:376
-#, fuzzy
 msgid "Show the porcelain format"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:377
-#, fuzzy
 msgid "Show the result incrementally"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:378
 msgid "Instead of working tree, use the contents of the named file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:379
-#, fuzzy
 msgid "Specifies the format used to output dates"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:380
 msgid "Detect moved or copied lines within a file"
@@ -28935,57 +27037,48 @@ msgid "Use the same output mode as git-annotate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:384
-#, fuzzy
 msgid "Show the filename in the original commit"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:385
 msgid "Show the line number in the original commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:386
-#, fuzzy
 msgid "Suppress the author name and timestamp from the output"
-msgstr "Unterschlüssel erlauben, deren Zeitstempel in der Zukunft liegt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:387
 msgid "Show the author email instead of author name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:388
-#, fuzzy
 msgid "Ignore whitespace changes"
-msgstr "white space (Worttrenner) ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:389
-#, fuzzy
 msgid "Custom command"
-msgstr "Jobbefehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:1
-#, fuzzy
 msgid "Comma-separated list of analyses to perform"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:2
-#, fuzzy
 msgid "Show examples in command line mode"
-msgstr "Vollständige Befehlszeile selektieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:3
-#, fuzzy
 msgid "Go root directory"
-msgstr "Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:4
-#, fuzzy
 msgid "Print HTML in command-line mode"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:5
-#, fuzzy
 msgid "HTTP service address"
-msgstr "Numerische Adresse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:6
 msgid "httptest.NewServer serves on this address and blocks"
@@ -29012,9 +27105,8 @@ msgid "Link identifiers to their declarations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:12
-#, fuzzy
 msgid "Maximum number of full text search results shown"
-msgstr "Maximale Zahl offener Datei-Deskriptoren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:13
 msgid "Regular expression matching note markers to show"
@@ -29037,9 +27129,8 @@ msgid "Print (exported) source in command-line mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:18
-#, fuzzy
 msgid "Tab width"
-msgstr "Zeilenbreite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:19
 msgid "Directory containing alternate template files"
@@ -29054,52 +27145,44 @@ msgid "Print HTML for named URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:23
-#, fuzzy
 msgid "Write index to a file"
-msgstr "In Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:24
 msgid "Zip file providing the file system to serve"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:1
-#, fuzzy
 msgid "Complete go build commands"
-msgstr "Vergleiche FILE1 mit allen Operanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:2
-#, fuzzy
 msgid "force rebuild"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:3
-#, fuzzy
 msgid "print the commands but do not run them"
-msgstr "Maskierte Befehle auf Standardfehlerausgabe ausgeben, nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:4
 msgid "number parallel builds (default=#cpus)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:5
-#, fuzzy
 msgid "enable data race detection"
-msgstr "Auswahl löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:6
-#, fuzzy
 msgid "print packages being built"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:7
-#, fuzzy
 msgid "print and preserve work directory"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:8
-#, fuzzy
 msgid "print the commands"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:9
 msgid "c compiler flags"
@@ -29130,19 +27213,16 @@ msgid "build tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:16
-#, fuzzy
 msgid "Complete go"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:17
-#, fuzzy
 msgid "compile packages and dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:18
-#, fuzzy
 msgid "remove object files"
-msgstr "Veraltete Dateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:19
 msgid ""
@@ -29151,9 +27231,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:20
-#, fuzzy
 msgid "print the remove commands it would execute, but not run them"
-msgstr "Maskierte Befehle auf Standardfehlerausgabe ausgeben, nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:21
 msgid ""
@@ -29171,99 +27250,83 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:24
 #: /tmp/fish/implicit/share/completions/go.fish:29
-#, fuzzy
 msgid "prints commands that would be executed"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:25
 #: /tmp/fish/implicit/share/completions/go.fish:30
 #: /tmp/fish/implicit/share/completions/go.fish:53
-#, fuzzy
 msgid "prints commands as they are executed"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:26
-#, fuzzy
 msgid "print Go environment information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:27
-#, fuzzy
 msgid "run go tool fix on packages"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:28
-#, fuzzy
 msgid "run gofmt on package sources"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:31
-#, fuzzy
 msgid "download and install packages and dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:32
-#, fuzzy
 msgid "stop after downloading the packages; don't install"
-msgstr "Herunterladen von Paketen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:33
 msgid "run fix tool on packages before resolving dependencies or building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:34
-#, fuzzy
 msgid "update remote packages"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:35
-#, fuzzy
 msgid "get help on topic"
-msgstr "Hilfe für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:36
 #: /tmp/fish/implicit/share/completions/go.fish:48
-#, fuzzy
 msgid "target tool"
-msgstr "Zielzeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:37
-#, fuzzy
 msgid "compile and install packages and dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:38
-#, fuzzy
 msgid "list packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:39
-#, fuzzy
 msgid "tolerate erroneous packages"
-msgstr "Quellpakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:40
 msgid "pass in template for formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:41
-#, fuzzy
 msgid "print in JSON format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:42
-#, fuzzy
 msgid "list of build tags"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:43
 msgid "compile and run Go program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:44
-#, fuzzy
 msgid "test packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:45
 msgid "compile the test binary to pkg.test but do not run it"
@@ -29274,39 +27337,34 @@ msgid "install dependent packages, but don't run tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:47
-#, fuzzy
 msgid "run specified go tool"
-msgstr "Defektes Paketdepot reparieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:49
 msgid "print the command that would be executed but not execute it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:50
-#, fuzzy
 msgid "print Go version"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:51
-#, fuzzy
 msgid "vet packages"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:52
 msgid "print the command that would be executed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:1
-#, fuzzy
 msgid "Write cpu profile to this file"
-msgstr "Top-Server in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:2
 #: /tmp/fish/implicit/share/completions/goimports.fish:1
 #: /tmp/fish/implicit/share/completions/gorename.fish:1
-#, fuzzy
 msgid "Display diffs instead of rewriting files"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:3
 msgid "Report all errors (not just the first 10 on different lines)"
@@ -29321,9 +27379,8 @@ msgid "Rewrite rule (e.g., 'a[b:len(a)] -> a[b:]')"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:6
-#, fuzzy
 msgid "Simplify code"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:7
 #: /tmp/fish/implicit/share/completions/goimports.fish:5
@@ -29331,9 +27388,8 @@ msgid "Write result to (source) file instead of stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:2
-#, fuzzy
 msgid "Report all errors"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:3
 msgid "List files whose formatting differs from goimport's"
@@ -29364,43 +27420,36 @@ msgid "Identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:5
-#, fuzzy
 msgid "Show usage message"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:6
 msgid "File and byte offset of identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:7
-#, fuzzy
 msgid "Build tag"
-msgstr "Apt-Zwischenspeicher erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:8
-#, fuzzy
 msgid "New name for identifier"
-msgstr "In Bezeichnern $ akzeptieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:9
-#, fuzzy
 msgid "Print verbose information"
-msgstr "Ausführliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:1
-#, fuzzy
 msgid "Add user to group"
-msgstr "Ausgabe mit Markierung versehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:2
-#, fuzzy
 msgid "Remove user from group"
-msgstr "Alle Einträge aus der --group-Liste entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:4
-#, fuzzy
 msgid "Remove the GROUP's password"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:5
 msgid "Restrict access to GROUP to its members"
@@ -29415,14 +27464,12 @@ msgid "set the list of administrators for GROUP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:1
-#, fuzzy
 msgid "Complete using gpg user ids"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:2
-#, fuzzy
 msgid "Complete using gpg key ids"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:3
 msgid ""
@@ -29457,9 +27504,8 @@ msgid "Store only (make a simple RFC1991 packet)"
 msgstr "Nur speichern (einfaches RFC1991-Paket erzeugen)"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:10
-#, fuzzy
 msgid "Decrypt specified file or stdin"
-msgstr "Für angegebene Benutzerkennung verschlüsseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:11
 msgid "Assume specified file or stdin is sigfile and verify it"
@@ -29517,9 +27563,8 @@ msgstr "Alle Schlüssel mit ihren Fingerabdrücken ausgeben"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
-#, fuzzy
 msgid "Generate a new key pair"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:23
 msgid "Present a menu which enables you to do all key related tasks"
@@ -29792,9 +27837,8 @@ msgstr ""
 "Ihrer eigenen geheimen Schlüssel"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:81
-#, fuzzy
 msgid "Specify trust model"
-msgstr "Vertrauensmodell angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:82
 msgid "Select how to display key IDs"
@@ -29861,9 +27905,8 @@ msgid "Use specified file instead of the default trustdb"
 msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:96
-#, fuzzy
 msgid "Set the home directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:97
 msgid "Set the native character set"
@@ -30044,9 +28087,8 @@ msgstr ""
 "zulassen"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:135
-#, fuzzy
 msgid "Do not cache the verification status of key signatures"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:136
 msgid "Do not verify each signature right after creation"
@@ -30165,9 +28207,8 @@ msgid "Ignore CRC errors"
 msgstr "CRC-Fehler ignorieren"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:161
-#, fuzzy
 msgid "Do not fail on MDC integrity protection failure"
-msgstr "Kein Abbruch beim Versagen des MDC-Integritätsschutzes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:162
 msgid ""
@@ -30189,9 +28230,8 @@ msgstr ""
 "erstellen"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:165
-#, fuzzy
 msgid "Reset verbose level to 0"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:166
 msgid "Suppress the initial copyright message"
@@ -30274,9 +28314,8 @@ msgstr ""
 "Ändert das Verhalten einiger Befehle. Ähnlich --dry-run, aber doch anders"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:181
-#, fuzzy
 msgid "Display the session key used for one message"
-msgstr "Zeige den für eine Nachricht benutzten Sitzungsschlüssel an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:182
 msgid "Don't use the public key but the specified session key"
@@ -30360,61 +28399,52 @@ msgstr ""
 "festlegen"
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:1
-#, fuzzy
 msgid "Print complete help message on program usage"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:2
-#, fuzzy
 msgid "Print short message on program usage"
-msgstr "Nachrichten über den Programmablauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:3
-#, fuzzy
 msgid "Turn on debugging"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:4
 msgid "Name of file to write debug info to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:5
-#, fuzzy
 msgid "Quiet output (default=verbose)"
-msgstr "Ausgabebegrenzer festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:6
 msgid "Hook script to call after downloads, captures, etc."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:7
-#, fuzzy
 msgid "Send file to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:8
-#, fuzzy
 msgid "Print filesize before data"
-msgstr "Dateigröße statt Plattenbelegung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:9
 msgid "List auto-detected cameras"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:10
-#, fuzzy
 msgid "Show EXIF information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:11
-#, fuzzy
 msgid "Show info"
-msgstr "Zeige versteckte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:12
-#, fuzzy
 msgid "Show summary"
-msgstr "Zusammenfassung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:13
 msgid "Show camera driver manual"
@@ -30425,76 +28455,64 @@ msgid "About the camera driver manual"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:15
-#, fuzzy
 msgid "Show storage information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:16
-#, fuzzy
 msgid "gPhoto shell"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:18
-#, fuzzy
 msgid "List supported camera models"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:19
-#, fuzzy
 msgid "List supported port devices"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:20
 msgid "Display camera/driver abilities"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:21
-#, fuzzy
 msgid "Specify device port"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:22
-#, fuzzy
 msgid "Specify serial transfer speed"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:23
-#, fuzzy
 msgid "Specify camera model"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:24
 msgid "(expert only) Override USB IDs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:25
-#, fuzzy
 msgid "List configuration tree"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:26
-#, fuzzy
 msgid "Dump full configuration tree"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:27
-#, fuzzy
 msgid "Get configuration value"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:28
 msgid "Set configuration value or index in choices"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:29
-#, fuzzy
 msgid "Set configuration value index in choices"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:30
-#, fuzzy
 msgid "Set configuration value"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:31
 msgid "Wait for event(s) from camera"
@@ -30509,18 +28527,16 @@ msgid "Capture a quick preview"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:34
-#, fuzzy
 msgid "Set bulb exposure time in seconds"
-msgstr "Maximalanzahl CPU-Zeit in Sekunden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:35
 msgid "Set number of frames to capture (default=infinite)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:36
-#, fuzzy
 msgid "Set capture interval in seconds"
-msgstr "Minimalintervall in Sekunden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:37
 msgid "Reset capture interval on signal (default=no)"
@@ -30535,9 +28551,8 @@ msgid "Capture an image and download it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:40
-#, fuzzy
 msgid "Capture a movie"
-msgstr "Tv-Capture-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:41
 msgid "Capture an audio clip"
@@ -30548,39 +28563,32 @@ msgid "Wait for shutter release on the camera and download"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:43
-#, fuzzy
 msgid "List folders in folder"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:44
-#, fuzzy
 msgid "List files in folder"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:45
-#, fuzzy
 msgid "Create a directory"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:46
-#, fuzzy
 msgid "Remove a directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:47
-#, fuzzy
 msgid "Display number of files"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:48
-#, fuzzy
 msgid "Get files given in range"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:49
-#, fuzzy
 msgid "Get all files from folder"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:50
 msgid "Get thumbnails given in range"
@@ -30599,9 +28607,8 @@ msgid "Get all metadata from folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:54
-#, fuzzy
 msgid "Upload metadata for file"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:55
 msgid "Get raw data given in range"
@@ -30616,14 +28623,12 @@ msgid "Get audio data given in range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:58
-#, fuzzy
 msgid "Get all audio data from folder"
-msgstr "Audio aus Datei spielen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:59
-#, fuzzy
 msgid "Delete files given in range"
-msgstr "Datei mit in den Daten enthaltenem Namen erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:60
 msgid "Delete all files in folder (--no-recurse by default)"
@@ -30650,14 +28655,12 @@ msgid "No recursion (default for deletion)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:66
-#, fuzzy
 msgid "Process new files only"
-msgstr "Binärdateien als Text behandeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:67
-#, fuzzy
 msgid "Overwrite files without asking"
-msgstr "Dateien gleichen Namens niemals überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:1
 msgid "Print annotated source"
@@ -30676,23 +28679,20 @@ msgid "Display summary"
 msgstr "Zusammenfassung anzeigen"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:5
-#, fuzzy
 msgid "Search directories for source"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:6
 msgid "No annotated source"
 msgstr "Keine kommentierte Quelle"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:7
-#, fuzzy
 msgid "Print full path of source"
-msgstr "Vollständigen Quellpfad ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:8
-#, fuzzy
 msgid "Print flat profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:9
 msgid "No flat profile"
@@ -30731,18 +28731,16 @@ msgid "Set width of output"
 msgstr "Ausgabebreite festlegen"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:18
-#, fuzzy
 msgid "Annotate every line"
-msgstr "Kommentiere jede Zeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:19
 msgid "Set demangling style"
 msgstr "Format für Entfernen der Zusatzinformation festlegen"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:20
-#, fuzzy
 msgid "Turn of demangling"
-msgstr "FTP-Mustererkennung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:21
 msgid "Supress static functions"
@@ -30789,28 +28787,24 @@ msgid "Print summary"
 msgstr "Zusammenfassung ausgeben"
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:2
-#, fuzzy
 msgid "Don't rebuild dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:3
-#, fuzzy
 msgid "Specify build file"
-msgstr "Erstellungsverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:4
-#, fuzzy
 msgid "Specify settings file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:5
 msgid "Only relevent project are configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:6
-#, fuzzy
 msgid "Specify console output type"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:7
 msgid "Continue task execution after failure"
@@ -30821,9 +28815,8 @@ msgid "Set system property of the JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:9
-#, fuzzy
 msgid "Log in debug mode"
-msgstr "Compiler-Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:10
 msgid "Uses Gradle Daemon to run build"
@@ -30834,56 +28827,48 @@ msgid "Uses Gradle Daemon in foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:12
-#, fuzzy
 msgid "Specify gradle user home directory"
-msgstr "Vertrauensmodell angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:13
 msgid "Launch Gradle GUI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:14
-#, fuzzy
 msgid "Specify an initialization script"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:15
-#, fuzzy
 msgid "Set log level to info"
-msgstr "Fehler-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:16
-#, fuzzy
 msgid "Include specified build in composite"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:17
 msgid "Runs build with all task actions disabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:18
-#, fuzzy
 msgid "Configure number of concurrent workers"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:19
-#, fuzzy
 msgid "Don't use deamon"
-msgstr "Stapelverarbeitungsmodus nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:20
-#, fuzzy
 msgid "Don't use network resources"
-msgstr "Integrierten Präprozessor nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:21
 msgid "Set project property for build script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:22
-#, fuzzy
 msgid "Specify start directory"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:23
 msgid "Build project in parallel"
@@ -30894,9 +28879,8 @@ msgid "Profile build execution time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:25
-#, fuzzy
 msgid "Specify project cache directory"
-msgstr "Verzeichnis für lokalen Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:26
 msgid "Only log erros"
@@ -30907,14 +28891,12 @@ msgid "Force build script recompiling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:28
-#, fuzzy
 msgid "Refresh state of dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:29
-#, fuzzy
 msgid "Ignore previously cached dependencies"
-msgstr "Zerstörte Abhängigkeiten korrigieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:30
 msgid "Print out full stacktrace for all exceptions"
@@ -30948,9 +28930,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/rfkill.fish:2
 #: /tmp/fish/implicit/share/completions/tmutil.fish:51
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:13
-#, fuzzy
 msgid "Print version"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:36
 msgid "Specify task to be excluded from execution"
@@ -30969,15 +28950,13 @@ msgid "Assume data type for binary files"
 msgstr "Datentyp für Binärdateien unterstellen"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:7
-#, fuzzy
 msgid "Colour output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:8
 #: /tmp/fish/implicit/share/completions/jq.fish:10
-#, fuzzy
 msgid "Color output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:9
 msgid "Only print number of matches"
@@ -31004,18 +28983,16 @@ msgid "Read pattern list from file. Skip files whose base name matches list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:15
-#, fuzzy
 msgid "Exclude matching directories from recursive searches"
-msgstr "Verzeichnisse nach Quelle durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:16
 msgid "Pattern is a fixed string"
 msgstr "Muster ist eine feststehende Zeichenkette"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:17
-#, fuzzy
 msgid "Use patterns from a file"
-msgstr "Muster aus Datei nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:18
 msgid "Pattern is basic regex"
@@ -31026,9 +29003,8 @@ msgid "Print filename"
 msgstr "Dateiname ausgeben"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
-#, fuzzy
 msgid "Suppress printing filename"
-msgstr "Dateinamenausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:22
 msgid "Skip binary files"
@@ -31051,9 +29027,8 @@ msgid "Use the mmap system call to read input"
 msgstr "mmap-Systemaufruf zum Lesen der Eingabe nutzen"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:28
-#, fuzzy
 msgid "Print line number"
-msgstr "Zeilennummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:29
 msgid "Show only matching part"
@@ -31068,9 +29043,8 @@ msgid "Use line buffering"
 msgstr "Zeilenpufferung benutzen"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:32
-#, fuzzy
 msgid "Pattern is a Perl regexp (PCRE) string"
-msgstr "Muster ist ein regulärer Ausdruck"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:33
 #: /tmp/fish/implicit/share/completions/grep.fish:34
@@ -31079,19 +29053,16 @@ msgstr "Nichts schreiben"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:35
 #: /tmp/fish/implicit/share/completions/grep.fish:36
-#, fuzzy
 msgid "Read files under each directory, recursively"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:37
-#, fuzzy
 msgid "Search only files matching PATTERN"
-msgstr "Rekursiv, Dateien gemäß MUSTER suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:38
-#, fuzzy
 msgid "Skip files matching PATTERN"
-msgstr "Rekursiv, dem MUSTER entsprechende Dateien überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:39
 msgid "Suppress error messages"
@@ -31122,9 +29093,8 @@ msgid "Only whole matching lines"
 msgstr "Nur vollständig übereinstimmende Zeilen"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:47
-#, fuzzy
 msgid "Ignore case (deprecated: use -i instead)"
-msgstr "Unterschiede bei Groß-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:48
 msgid "Treat input as a set of zero-terminated lines"
@@ -31144,9 +29114,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:3
 #: /tmp/fish/implicit/share/completions/useradd.fish:4
-#, fuzzy
 msgid "Display help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:4
 #: /tmp/fish/implicit/share/completions/useradd.fish:7
@@ -31279,53 +29248,44 @@ msgid "Check if given file is BIOS bootsector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-file.fish:32
-#, fuzzy
 msgid "Display usage and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:1
-#, fuzzy
 msgid "Compress GRUB files"
-msgstr "Datei komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:2
-#, fuzzy
 msgid "Use image and modules under given directory"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:3
-#, fuzzy
 msgid "Install given fonts"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:4
-#, fuzzy
 msgid "Install only given modules and their dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:5
 msgid "Embed given file as public key for signature checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:6
-#, fuzzy
 msgid "Use translations under given directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:7
-#, fuzzy
 msgid "Install only given locales"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:8
-#, fuzzy
 msgid "Preload specfied modules"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:9
-#, fuzzy
 msgid "Install given theme"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:11
 msgid "Make drive also bootable as floppy"
@@ -31336,24 +29296,20 @@ msgid "Install GRUB images under DIR/grub"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:13
-#, fuzzy
 msgid "Set bootloader ID"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:14
-#, fuzzy
 msgid "Choose compression to use for core image"
-msgstr "Zeige den für eine Nachricht benutzten Sitzungsschlüssel an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:15
-#, fuzzy
 msgid "Set disk module to use"
-msgstr "Wählen Sie aus, wie Schlüsselkennungen angezeigt werden sollen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:16
-#, fuzzy
 msgid "Use given directory as the EFI System Partition root"
-msgstr "Angegebenen Schlüssel als Schlüssel zum Signieren verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:17
 msgid "Install even if problems are detected"
@@ -31368,24 +29324,20 @@ msgid "Use given color for label background"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:20
-#, fuzzy
 msgid "Use given color for label"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:21
-#, fuzzy
 msgid "Use given file for label"
-msgstr "Sektion für Dateiformate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:22
-#, fuzzy
 msgid "Use given directory for PPC Mac install"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:23
-#, fuzzy
 msgid "Do not install bootsector"
-msgstr "Keine Init-Dateien laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:24
 msgid "Don't update the boot-device/Boot* NVRAM variables"
@@ -31396,23 +29348,20 @@ msgid "Don't apply any reed-solomon codes when embedding core.img"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:26
-#, fuzzy
 msgid "Set product version"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:27
-#, fuzzy
 msgid "Delete device map if it already exists"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:28
 msgid "The installation is removable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:29
-#, fuzzy
 msgid "Do not probe for filesystems"
-msgstr "Im lokalen Dateisystem bleiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:30
 msgid "Install GRUB for given platform"
@@ -31423,23 +29372,20 @@ msgid "Print the grunt version. Combine with --verbose for more info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:1
-#, fuzzy
 msgid "Print the version information"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
-#, fuzzy
 msgid "Specify a custom schemas directory"
-msgstr "Verzeichnis für lokalen Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:3
 msgid "Get the value of a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:4
-#, fuzzy
 msgid "Determine if a key is writable"
-msgstr "Datei ist schreibbar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:5
 msgid "Determine the valid value range of a key"
@@ -31466,24 +29412,20 @@ msgid "List all installed, non-relocatable schemas"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:11
-#, fuzzy
 msgid "List all installed, relocatable schemas"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:12
-#, fuzzy
 msgid "List all keys in a schema"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:13
-#, fuzzy
 msgid "List all children of a schema"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:14
-#, fuzzy
 msgid "List keys and values, recursively"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:4
 #: /tmp/fish/implicit/share/completions/gzip.fish:4
@@ -31502,9 +29444,8 @@ msgstr "Dateiname (zurück)sichern"
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:9
 #: /tmp/fish/implicit/share/completions/gzip.fish:9
-#, fuzzy
 msgid "Recurse directories"
-msgstr "Verzeichnisse rekursiv durchlaufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:10
 #: /tmp/fish/implicit/share/completions/gzip.fish:10
@@ -31521,19 +29462,16 @@ msgid "Display document using only black and white"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:2
-#, fuzzy
 msgid "Display document without colors"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:3
-#, fuzzy
 msgid "Display document as usual"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:4
-#, fuzzy
 msgid "Start ghostscript in safe mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:5
 msgid "Do not start ghostscript in safe mode"
@@ -31585,23 +29523,20 @@ msgid "The page should not be centered automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:17
-#, fuzzy
 msgid "Selects the paper size to be used"
-msgstr "Auswahl, wie Passwortsätze verstümmelt werden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:18
-#, fuzzy
 msgid "Sets the orientation of the page"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:19
 msgid "Selects the scale N, or arbitrary scale f.f"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:20
-#, fuzzy
 msgid "Selects the scale base N"
-msgstr "Zeitformat auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:21
 msgid "Interchange the meaning of the orientations landscape and seascape"
@@ -31617,9 +29552,8 @@ msgid "Use antialiasing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:24
-#, fuzzy
 msgid "Do not use antialiasing"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:25
 msgid "Dsc comments are respected"
@@ -31642,9 +29576,8 @@ msgid "Use backing pixmap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:30
-#, fuzzy
 msgid "Do not use backing pixmap"
-msgstr "Nicht die gcc-Ummantelung benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:31
 msgid "Watch the document file for changes"
@@ -31655,9 +29588,8 @@ msgid "Do not watch the document file for changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:34
-#, fuzzy
 msgid "Print a usage message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:35
 msgid "Fit the size of the window to the size of the page"
@@ -31668,9 +29600,8 @@ msgid "Do not fit the size of the window to the size of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:37
-#, fuzzy
 msgid "Set geometry"
-msgstr "Schwere festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:38
 msgid "Read and use additional resources from FILE (higher priority)"
@@ -31697,46 +29628,40 @@ msgid "Start in fullscreen mode (needs support from WM)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:44
-#, fuzzy
 msgid "Presentation mode "
-msgstr "Fragemodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:45
-#, fuzzy
 msgid "Show gv version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gzip.fish:14
-#, fuzzy
 msgid "Use fast setting"
-msgstr "Einstellung für Schnelligkeit verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gzip.fish:15
 msgid "Use high compression setting"
 msgstr "Einstellung für hohe Kompression verwenden"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:1
-#, fuzzy
 msgid "Enable verbose output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:2
 msgid "Location of your Helm config"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:3
-#, fuzzy
 msgid "Address of tiller"
-msgstr "Adressbereichsfehler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:4
 msgid "Name of the kubeconfig context to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:5
-#, fuzzy
 msgid "More information about a command"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:6
 msgid "The named Helm starter scaffold"
@@ -31760,9 +29685,8 @@ msgid "Prevent hooks from running during deletion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:10
-#, fuzzy
 msgid "Remove the release from the store"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:11
 #: /tmp/fish/implicit/share/completions/helm.fish:13
@@ -31775,9 +29699,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:12
 #: /tmp/fish/implicit/share/completions/helm.fish:14
-#, fuzzy
 msgid "Verify the packages against signatures"
-msgstr "Paketintegrität verifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:15
 #: /tmp/fish/implicit/share/completions/helm.fish:32
@@ -31803,17 +29726,15 @@ msgid "Directory into which the chart is expanded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:21
-#, fuzzy
 msgid "Verify the package against its signature"
-msgstr "Paketintegrität verifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:22
 #: /tmp/fish/implicit/share/completions/helm.fish:35
 #: /tmp/fish/implicit/share/completions/helm.fish:47
 #: /tmp/fish/implicit/share/completions/helm.fish:87
-#, fuzzy
 msgid "Chart version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
@@ -31826,28 +29747,24 @@ msgid "Dump all (computed) values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:27
-#, fuzzy
 msgid "Maximum number of revision to include in history"
-msgstr "Maximale Zahl offener Datei-Deskriptoren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:28
 msgid "Use the canary tiller image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:29
-#, fuzzy
 msgid "Do not install tiller"
-msgstr "Keine Init-Dateien laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:30
-#, fuzzy
 msgid "Do not install local or remote"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:31
-#, fuzzy
 msgid "Override tiller image"
-msgstr "Frame-Rate überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:33
 #: /tmp/fish/implicit/share/completions/helm.fish:38
@@ -31859,25 +29776,21 @@ msgid "Verify the provenance data for this chart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:37
-#, fuzzy
 msgid "Simulate an install"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:39
-#, fuzzy
 msgid "Release name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:40
-#, fuzzy
 msgid "Specify template used to name the release"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:41
 #: /tmp/fish/implicit/share/completions/helm.fish:82
-#, fuzzy
 msgid "Namespace"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:42
 msgid "Prevent hooks from running during install"
@@ -31889,68 +29802,57 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:44
 #: /tmp/fish/implicit/share/completions/helm.fish:84
-#, fuzzy
 msgid "Set values on the command line"
-msgstr "Festlegen oder Abrufen der Befehlszeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:45
 #: /tmp/fish/implicit/share/completions/helm.fish:85
-#, fuzzy
 msgid "Specify values in a YAML file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:46
-#, fuzzy
 msgid "Verify the package before installing it"
-msgstr "Paketintegrität verifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:48
-#, fuzzy
 msgid "Fail on lint warnings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:49
-#, fuzzy
 msgid "Show all releases"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:50
-#, fuzzy
 msgid "Sort by release date"
-msgstr "Nach Größe sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:51
-#, fuzzy
 msgid "Show deleted releases"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:52
 msgid "Show releases that are currently being deleted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:53
-#, fuzzy
 msgid "Show deployed releases"
-msgstr "Aktualisierte Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:54
-#, fuzzy
 msgid "Show failed releases"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:55
-#, fuzzy
 msgid "Maximum number of releases to fetch"
-msgstr "Maximalanzahl geschachtelter Blöcke erreicht."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:56
 msgid "Next release name in the list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:57
-#, fuzzy
 msgid "Reverse the sort order"
-msgstr "Sortierreihenfolge umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:58
 msgid "Output short listing format"
@@ -31961,9 +29863,8 @@ msgid "Name of the key to use when signing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:61
-#, fuzzy
 msgid "Save packaged chart to local chart repository"
-msgstr "Pakete in lokalen Verzeichnisbaum verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:62
 msgid "Use a PGP private key to sign this package"
@@ -31974,19 +29875,16 @@ msgid "Raise error if repo is already registered"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:64
-#, fuzzy
 msgid "Merge the generated index into the given index"
-msgstr "Schlüsselserver nach den angegebenen Namen durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:65
-#, fuzzy
 msgid "URL of chart repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:66
-#, fuzzy
 msgid "Repository"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:69
 msgid "Simulate a rollback"
@@ -32001,23 +29899,20 @@ msgid "Use regular expressions for searching"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:72
-#, fuzzy
 msgid "Show the long listing"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:73
-#, fuzzy
 msgid "Address to listen on"
-msgstr "Zeiger auf Prozessliste"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:74
 msgid "Path from which to serve charts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:79
-#, fuzzy
 msgid "Simulate an upgrade"
-msgstr "Aktualisierung der Distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:80
 msgid "Run an install if the release don't exists"
@@ -32032,14 +29927,12 @@ msgid "Verify the provenance of the chart before upgrading"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:89
-#, fuzzy
 msgid "Show the client version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:90
-#, fuzzy
 msgid "Show the server version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:1
 #: /tmp/fish/implicit/share/completions/help.fish:68
@@ -32047,136 +29940,113 @@ msgid "Autosuggestions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:2
-#, fuzzy
 msgid "Builtin commands"
-msgstr "Prozessbefehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:3
 msgid "Cartesian Products"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:4
-#, fuzzy
 msgid "Setting syntax highlighting colors"
-msgstr "Hilfe zur Farbeinrichtung zur Syntaxhervorhebung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:5
 msgid "Combining different expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:6
-#, fuzzy
 msgid "How tab-completion works"
-msgstr "Hilfe zur Tab-Vervollständigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:7
-#, fuzzy
 msgid "Useful functions for writing completions"
-msgstr "Funktionstasten für Befehle nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:8
-#, fuzzy
 msgid "Writing your own completions"
-msgstr "Beschreibung dieser Vervollständigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:9
-#, fuzzy
 msgid "Where to put completions"
-msgstr "Beschreibung dieser Vervollständigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:10
 msgid "Debugging fish scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:12
-#, fuzzy
 msgid "Command line editor"
-msgstr "Befehl im aktuellen Prozess ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:13
-#, fuzzy
 msgid "Emacs mode commands"
-msgstr "Befehlsblock beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:14
-#, fuzzy
 msgid "Escaping characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:15
-#, fuzzy
 msgid "Event handlers"
-msgstr "Ereignisbehandler-Block"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:16
 #: /tmp/fish/implicit/share/completions/help.fish:25
-#, fuzzy
 msgid "Parameter expansion (Globbing)"
-msgstr "Hilfe zur Parameter-Expansion (Dateinamen)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:17
-#, fuzzy
 msgid "Brace expansion {a,b,c}"
-msgstr "Hilfe zur Klammer-Expansion {a,b,c}"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:18
-#, fuzzy
 msgid "Command substitution"
-msgstr "Befehlsersetzungsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:19
-#, fuzzy
 msgid "Command substitution (SUBCOMMAND)"
-msgstr "Hilfe zu Befehlsersetzungen (SUBCOMMAND)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:20
-#, fuzzy
 msgid "Home directory expansion ~USER"
-msgstr "Hilfe zur Startverzeichnis-Expansion ~USER"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:21
-#, fuzzy
 msgid "Index range expansion"
-msgstr "Änderungen aufgrund von Tabulatorausweitung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:22
-#, fuzzy
 msgid "Process expansion %JOB"
-msgstr "Hilfe zur Prozess-Expansion %JOB"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:24
-#, fuzzy
 msgid "Wildcard expansion *.*"
-msgstr "Hilfe zur Muster-Expansion *.*"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:26
-#, fuzzy
 msgid "Configurable greeting"
-msgstr "Quellpakete kompilieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:27
 msgid "Help on how to reuse previously entered commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:28
-#, fuzzy
 msgid "Searchable history"
-msgstr "Paketinformation anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:29
-#, fuzzy
 msgid "Shell variable and function names"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:30
-#, fuzzy
 msgid "Initialization files"
-msgstr "Konfigurationsdatei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:31
-#, fuzzy
 msgid "Introduction"
-msgstr "Illegale Instruktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:32
 msgid "Common issues with fish"
@@ -32191,9 +30061,8 @@ msgid "Copy and paste (Kill Ring)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:35
-#, fuzzy
 msgid "Further help and development"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:36
 msgid "Multiline editing"
@@ -32208,135 +30077,113 @@ msgid "Piping"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:39
-#, fuzzy
 msgid "Programmable prompt"
-msgstr "Ausführlicher Prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:40
 msgid "Quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:41
-#, fuzzy
 msgid "Input/Output (IO) redirection"
-msgstr "Ungültige Umleitung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:44
-#, fuzzy
 msgid "Background jobs"
-msgstr "Letzter Hintergrundjob"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:45
-#, fuzzy
 msgid "Conditional execution of code and flow control"
-msgstr "Befehlsblock bedingt ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:46
 #: /tmp/fish/implicit/share/completions/help.fish:74
-#, fuzzy
 msgid "Functions"
-msgstr "Funktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:47
-#, fuzzy
 msgid "Autoloading functions"
-msgstr "Funktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:48
 msgid "Defining aliases"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:49
-#, fuzzy
 msgid "Job control"
-msgstr "Jobsteuerung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:50
-#, fuzzy
 msgid "Some common words"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:51
-#, fuzzy
 msgid "Programmable title"
-msgstr "Programm-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:52
-#, fuzzy
 msgid "Shell variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:53
 msgid "Arrays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:54
-#, fuzzy
 msgid "Variables for changing highlighting colors"
-msgstr "Hilfe zur Farbeinrichtung zur Syntaxhervorhebung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:55
-#, fuzzy
 msgid "Exporting variables"
-msgstr "Variable an Unterprozess exportieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:56
-#, fuzzy
 msgid "Variable scope for functions"
-msgstr "Funktion löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:57
-#, fuzzy
 msgid "Locale variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:58
 msgid "Variable scope"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:59
-#, fuzzy
 msgid "Special variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:60
-#, fuzzy
 msgid "The status variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:61
-#, fuzzy
 msgid "More on universal variables"
-msgstr "Hilfe zu Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:62
-#, fuzzy
 msgid "Vi mode commands"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:63
-#, fuzzy
 msgid "Command mode"
-msgstr "Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:64
-#, fuzzy
 msgid "Insert mode"
-msgstr "Kopfzeile einfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:65
-#, fuzzy
 msgid "Visual mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:66
 msgid "Tutorial"
@@ -32351,23 +30198,20 @@ msgid "Combiners (And, Or, Not)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:70
-#, fuzzy
 msgid "Command Substitutions"
-msgstr "Befehlsersetzungsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:71
 msgid "Conditionals (If, Else, Switch)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:72
-#, fuzzy
 msgid "Exit Status"
-msgstr "Exit-Status des Jobs verneinen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:73
-#, fuzzy
 msgid "Exports (Shell Variables)"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:75
 msgid "Getting Help"
@@ -32378,34 +30222,28 @@ msgid "Learning fish"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:77
-#, fuzzy
 msgid "Lists"
-msgstr "Kennzeichnung bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:78
-#, fuzzy
 msgid "Loops"
-msgstr "Schleifen-Skript"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:79
-#, fuzzy
 msgid "Ready for more?"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:81
-#, fuzzy
 msgid "Pipes and Redirections"
-msgstr "Verzeichnisnamen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:82
-#, fuzzy
 msgid "Prompt"
-msgstr "Prompt-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:83
-#, fuzzy
 msgid "Running Commands"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:84
 msgid "Separating Commands (Semicolon)"
@@ -32416,19 +30254,16 @@ msgid "Startup (Where's .bashrc?)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:86
-#, fuzzy
 msgid "Syntax Highlighting"
-msgstr "Keine Hervorhebung bei Suche"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:87
-#, fuzzy
 msgid "Tab Completions"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:88
-#, fuzzy
 msgid "Universal Variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:89
 msgid "Variables"
@@ -32443,9 +30278,8 @@ msgid "Wildcards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:1
-#, fuzzy
 msgid "list installed addons"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:2
 msgid "manage apps (create, destroy)"
@@ -32464,9 +30298,8 @@ msgid "manage custom domains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:6
-#, fuzzy
 msgid "display logs for an app"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:7
 msgid "manage dynos (dynos, workers)"
@@ -32506,9 +30339,8 @@ msgid "list commands and display help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:16
-#, fuzzy
 msgid "manage authentication keys"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:18
 msgid "manage maintenance mode for an app"
@@ -32531,9 +30363,8 @@ msgid "manage plugins to the heroku gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:23
-#, fuzzy
 msgid "list available regions"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:24
 msgid "manage the stack for an app"
@@ -32544,14 +30375,12 @@ msgid "check status of heroku platform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:26
-#, fuzzy
 msgid "update the heroku client"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:27
-#, fuzzy
 msgid "display version"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:28
 msgid ""
@@ -32572,28 +30401,24 @@ msgid "open an addon's documentation in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:32
-#, fuzzy
 msgid "downgrade an existing addon"
-msgstr "Bestehendes Paket aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:33
-#, fuzzy
 msgid "list all available addons"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:34
 msgid "open an addon's dashboard in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:35
-#, fuzzy
 msgid "uninstall one or more addons"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:36
-#, fuzzy
 msgid "upgrade an existing addon"
-msgstr "Bestehendes Paket aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:37
 msgid "the org to list the apps for"
@@ -32616,9 +30441,8 @@ msgid " permanently destroy an app (--app APP)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:42
-#, fuzzy
 msgid "show detailed app information"
-msgstr "apropos-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:43
 msgid " add yourself to an organization app (--app APP)"
@@ -32633,9 +30457,8 @@ msgid " lock an organization app to restrict access"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:46
-#, fuzzy
 msgid " open the app in a web browser"
-msgstr "Konnte keinen Webbrowser finden.\\n"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:47
 msgid " rename the app (apps:rename newname --app oldname)"
@@ -32650,18 +30473,16 @@ msgid "log in with your heroku credentials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:50
-#, fuzzy
 msgid "clear local authentication credentials"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:51
 msgid "display your api token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:52
-#, fuzzy
 msgid "display your heroku email address"
-msgstr "Datei zum Zugriff auf Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:53
 msgid "output config vars in shell format"
@@ -32669,9 +30490,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:54
 #: /tmp/fish/implicit/share/completions/heroku.fish:55
-#, fuzzy
 msgid "display a config value for an app"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:56
 #: /tmp/fish/implicit/share/completions/heroku.fish:57
@@ -32680,9 +30500,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:58
 #: /tmp/fish/implicit/share/completions/heroku.fish:59
-#, fuzzy
 msgid "unset one or more config vars"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:60
 msgid "add a custom domain to an app"
@@ -32698,18 +30517,16 @@ msgid "remove a custom domain from an app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:64
-#, fuzzy
 msgid "the number of lines to display"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:65
 msgid "only display logs from the given process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:66
-#, fuzzy
 msgid "only display logs from the given source"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:67
 msgid "continually stream logs"
@@ -32724,29 +30541,24 @@ msgid "cancel an in-progress backup or restore (default newest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:70
-#, fuzzy
 msgid "capture a new backup"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:71
-#, fuzzy
 msgid "delete a backup"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:72
-#, fuzzy
 msgid "downloads database backup"
-msgstr "Eine Quelle herunterladen und extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:73
-#, fuzzy
 msgid "get information about a specific backup"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:74
-#, fuzzy
 msgid "restore a backup (default latest) to a database"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:75
 msgid "schedule daily backups for given database"
@@ -32790,9 +30602,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:88
 #: /tmp/fish/implicit/share/completions/heroku.fish:89
-#, fuzzy
 msgid "view detailed information for a release"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:90
 #: /tmp/fish/implicit/share/completions/heroku.fish:91
@@ -32800,9 +30611,8 @@ msgid "roll back to an older release"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:92
-#, fuzzy
 msgid "specify dyno size"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:93
 msgid "open a remote console session (with optional COMMAND)"
@@ -32833,38 +30643,32 @@ msgid "repository root directory or name of overlay bundle file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:2
-#, fuzzy
 msgid "change working directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:3
 msgid "do not prompt, automatically pick the first choice for all prompts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:4
-#, fuzzy
 msgid "suppress output"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:5
-#, fuzzy
 msgid "enable additional output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:6
-#, fuzzy
 msgid "set/override config option"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:7
-#, fuzzy
 msgid "enable debugging output"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:8
-#, fuzzy
 msgid "start debugger"
-msgstr "Bei Fehler Debugger starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:9
 msgid "set the charset encoding"
@@ -32879,14 +30683,12 @@ msgid "always print a traceback on exception"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:12
-#, fuzzy
 msgid "time how long the command takes"
-msgstr "Festlegen oder Abrufen der Befehlszeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:13
-#, fuzzy
 msgid "print command execution profile"
-msgstr "Optionsprofil auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:16
 msgid "consider hidden changesets"
@@ -32923,9 +30725,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:453
 #: /tmp/fish/implicit/share/completions/hg.fish:460
 #: /tmp/fish/implicit/share/completions/hg.fish:495
-#, fuzzy
 msgid "include names matching the given patterns"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:20
 #: /tmp/fish/implicit/share/completions/hg.fish:26
@@ -32950,9 +30751,8 @@ msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
 #: /tmp/fish/implicit/share/completions/hg.fish:454
 #: /tmp/fish/implicit/share/completions/hg.fish:461
 #: /tmp/fish/implicit/share/completions/hg.fish:496
-#, fuzzy
 msgid "exclude names matching the given patterns"
-msgstr "Alle Module auflisten, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:21
 #: /tmp/fish/implicit/share/completions/hg.fish:48
@@ -32962,9 +30762,8 @@ msgstr "Alle Module auflisten, die den angegebenen Mustern entsprechen"
 #: /tmp/fish/implicit/share/completions/hg.fish:287
 #: /tmp/fish/implicit/share/completions/hg.fish:430
 #: /tmp/fish/implicit/share/completions/hg.fish:497
-#, fuzzy
 msgid "recurse into subrepositories"
-msgstr "in Unterverzeichnis verzweigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:22
 #: /tmp/fish/implicit/share/completions/hg.fish:27
@@ -33026,9 +30825,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:518
 #: /tmp/fish/implicit/share/completions/hg.fish:523
 #: /tmp/fish/implicit/share/completions/hg.fish:524
-#, fuzzy
 msgid "operate on patch repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:24
 #: /tmp/fish/implicit/share/completions/hg.fish:213
@@ -33036,23 +30834,20 @@ msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:29
-#, fuzzy
 msgid "annotate the specified revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:30
-#, fuzzy
 msgid "don't follow copies and renames"
-msgstr "Nur die folgenden Namen einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:31
 #: /tmp/fish/implicit/share/completions/hg.fish:128
 #: /tmp/fish/implicit/share/completions/hg.fish:145
 #: /tmp/fish/implicit/share/completions/hg.fish:165
 #: /tmp/fish/implicit/share/completions/hg.fish:328
-#, fuzzy
 msgid "treat all files as text"
-msgstr "Alle Dateien als Text behandeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:32
 #: /tmp/fish/implicit/share/completions/hg.fish:171
@@ -33060,9 +30855,8 @@ msgid "list the author (long with -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:33
-#, fuzzy
 msgid "list the filename"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:34
 #: /tmp/fish/implicit/share/completions/hg.fish:172
@@ -33070,14 +30864,12 @@ msgid "list the date (short with -q)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:35
-#, fuzzy
 msgid "list the revision number (default)"
-msgstr "Standardmäßig den langen Kommentar editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:36
-#, fuzzy
 msgid "list the changeset"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:37
 msgid "show line number at the first appearance"
@@ -33088,60 +30880,52 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:333
 #: /tmp/fish/implicit/share/completions/hg.fish:396
 #: /tmp/fish/implicit/share/completions/hg.fish:431
-#, fuzzy
 msgid "ignore white space when comparing lines"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:39
 #: /tmp/fish/implicit/share/completions/hg.fish:134
-#, fuzzy
 msgid "changes in the amount of white space"
-msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:40
 #: /tmp/fish/implicit/share/completions/hg.fish:135
 #: /tmp/fish/implicit/share/completions/hg.fish:335
 #: /tmp/fish/implicit/share/completions/hg.fish:398
 #: /tmp/fish/implicit/share/completions/hg.fish:433
-#, fuzzy
 msgid "ignore changes whose lines are all blank"
-msgstr "Änderungen ignorieren, deren Zeilen alle leer sind"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:44
 msgid "do not pass files through decoders"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:45
-#, fuzzy
 msgid "directory prefix for files in archive"
-msgstr "Startdatei im Archiv"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:46
-#, fuzzy
 msgid "revision to distribute"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:47
-#, fuzzy
 msgid "type of distribution to create"
-msgstr "Typ des L1-Anweisungs-Cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:52
 msgid "merge with old dirstate parent after backout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:53
-#, fuzzy
 msgid "revision to backout"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:54
 #: /tmp/fish/implicit/share/completions/hg.fish:160
 #: /tmp/fish/implicit/share/completions/hg.fish:269
 #: /tmp/fish/implicit/share/completions/hg.fish:452
-#, fuzzy
 msgid "specify merge tool"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:57
 #: /tmp/fish/implicit/share/completions/hg.fish:112
@@ -33151,9 +30935,8 @@ msgstr "Kernel-Version angeben"
 #: /tmp/fish/implicit/share/completions/hg.fish:394
 #: /tmp/fish/implicit/share/completions/hg.fish:408
 #: /tmp/fish/implicit/share/completions/hg.fish:426
-#, fuzzy
 msgid "use text as commit message"
-msgstr "Copyright-Meldung beim Start unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:58
 #: /tmp/fish/implicit/share/completions/hg.fish:113
@@ -33163,9 +30946,8 @@ msgstr "Copyright-Meldung beim Start unterdrücken"
 #: /tmp/fish/implicit/share/completions/hg.fish:395
 #: /tmp/fish/implicit/share/completions/hg.fish:409
 #: /tmp/fish/implicit/share/completions/hg.fish:427
-#, fuzzy
 msgid "read commit message from file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:59
 #: /tmp/fish/implicit/share/completions/hg.fish:114
@@ -33173,9 +30955,8 @@ msgstr "Paket aus Datei lesen"
 #: /tmp/fish/implicit/share/completions/hg.fish:211
 #: /tmp/fish/implicit/share/completions/hg.fish:428
 #: /tmp/fish/implicit/share/completions/hg.fish:513
-#, fuzzy
 msgid "record the specified date as commit date"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:60
 #: /tmp/fish/implicit/share/completions/hg.fish:115
@@ -33183,9 +30964,8 @@ msgstr "Angegebene Zeichenkette als Kommentar verwenden"
 #: /tmp/fish/implicit/share/completions/hg.fish:212
 #: /tmp/fish/implicit/share/completions/hg.fish:429
 #: /tmp/fish/implicit/share/completions/hg.fish:514
-#, fuzzy
 msgid "record the specified user as committer"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:62
 msgid "reset bisect state"
@@ -33212,9 +30992,8 @@ msgid "use command to check changeset state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:68
-#, fuzzy
 msgid "do not update to target"
-msgstr "Pakete nicht aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:70
 #: /tmp/fish/implicit/share/completions/ifdown.fish:2
@@ -33258,9 +31037,8 @@ msgid "run even when the destination is unrelated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:82
-#, fuzzy
 msgid "a changeset intended to be added to the destination"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:83
 msgid "a specific branch you would like to bundle"
@@ -33271,9 +31049,8 @@ msgid "a base changeset assumed to be available at the destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:85
-#, fuzzy
 msgid "bundle all changesets in the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:86
 msgid "bundle compression type to use (default: bzip2)"
@@ -33288,9 +31065,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:305
 #: /tmp/fish/implicit/share/completions/hg.fish:314
 #: /tmp/fish/implicit/share/completions/hg.fish:324
-#, fuzzy
 msgid "specify ssh command to use"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:88
 #: /tmp/fish/implicit/share/completions/hg.fish:104
@@ -33301,9 +31077,8 @@ msgstr "Befehl an die Shell übergeben"
 #: /tmp/fish/implicit/share/completions/hg.fish:306
 #: /tmp/fish/implicit/share/completions/hg.fish:315
 #: /tmp/fish/implicit/share/completions/hg.fish:325
-#, fuzzy
 msgid "specify hg command to run on the remote side"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:89
 msgid "do not verify server certificate (ignoring web.cacerts"
@@ -33311,37 +31086,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:91
 #: /tmp/fish/implicit/share/completions/hg.fish:142
-#, fuzzy
 msgid "print output to file with formatted name"
-msgstr "Ausgabe auf Datei umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:92
-#, fuzzy
 msgid "print the given revision"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:93
 msgid "apply any matching decode filter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:97
-#, fuzzy
 msgid "the clone will include an empty working copy (only a repository)"
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:98
 msgid "revision, tag or branch to check out"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:99
-#, fuzzy
 msgid "include the specified changeset"
-msgstr "Angegebenes Paket von Aktualisierung ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:100
-#, fuzzy
 msgid "clone only the specified branch"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:101
 #: /tmp/fish/implicit/share/completions/hg.fish:320
@@ -33375,20 +31145,17 @@ msgid "mark a branch as closed, hiding it from the branch list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:108
-#, fuzzy
 msgid "amend the parent of the working directory"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:109
 #: /tmp/fish/implicit/share/completions/hg.fish:423
-#, fuzzy
 msgid "use the secret phase for committing"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:118
-#, fuzzy
 msgid "untrusted configuration options"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:120
 msgid "record a copy that has already occurred"
@@ -33400,9 +31167,8 @@ msgid "forcibly copy over an existing managed file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:127
-#, fuzzy
 msgid "change made by revision"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:129
 #: /tmp/fish/implicit/share/completions/hg.fish:146
@@ -33414,9 +31180,8 @@ msgstr "Handbuch-Sektionen"
 #: /tmp/fish/implicit/share/completions/hg.fish:357
 #: /tmp/fish/implicit/share/completions/hg.fish:387
 #: /tmp/fish/implicit/share/completions/hg.fish:400
-#, fuzzy
 msgid "use git extended diff format"
-msgstr "Bearbeiten-Befehl rückgängig machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:130
 #: /tmp/fish/implicit/share/completions/hg.fish:147
@@ -33436,9 +31201,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:136
 #: /tmp/fish/implicit/share/completions/hg.fish:336
-#, fuzzy
 msgid "number of lines of context to show"
-msgstr "NUM Kontext-Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:137
 #: /tmp/fish/implicit/share/completions/hg.fish:225
@@ -33453,14 +31217,12 @@ msgid "against the second parent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:144
-#, fuzzy
 msgid "revisions to export"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:152
-#, fuzzy
 msgid "revisions to graft"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:153
 msgid "resume interrupted graft"
@@ -33472,28 +31234,24 @@ msgid "invoke editor on commit messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:155
-#, fuzzy
 msgid "append graft info to log message"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:156
-#, fuzzy
 msgid "the current date as commit date"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:157
-#, fuzzy
 msgid "the current user as committer"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:163
 msgid "end fields with NUL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:164
-#, fuzzy
 msgid "print all revisions that match"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:166
 #: /tmp/fish/implicit/share/completions/hg.fish:244
@@ -33501,18 +31259,16 @@ msgid "follow changeset history, or file history across copies and renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:167
-#, fuzzy
 msgid "ignore case when matching"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:168
 msgid "print only filenames and revisions that match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:169
-#, fuzzy
 msgid "print matching line numbers"
-msgstr "Zeilennummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:170
 msgid "only search files changed within revision range"
@@ -33535,38 +31291,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:259
 #: /tmp/fish/implicit/share/completions/hg.fish:282
 #: /tmp/fish/implicit/share/completions/hg.fish:290
-#, fuzzy
 msgid "display using template map file"
-msgstr "Alle Übereinstimmungen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:180
 #: /tmp/fish/implicit/share/completions/hg.fish:228
 #: /tmp/fish/implicit/share/completions/hg.fish:260
 #: /tmp/fish/implicit/share/completions/hg.fish:283
 #: /tmp/fish/implicit/share/completions/hg.fish:291
-#, fuzzy
 msgid "display with template"
-msgstr "Alle Übereinstimmungen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:182
-#, fuzzy
 msgid "only help for extensions"
-msgstr "Alle GNU-Erweiterungen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:183
-#, fuzzy
 msgid "show only help for commands"
-msgstr "Funktionstasten für Befehle nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:184
-#, fuzzy
 msgid "show topics matching keyword"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:185
-#, fuzzy
 msgid "read history edits from the specified file"
-msgstr "Benutzereingaben aus dem angegebenen Dateideskriptor lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:186
 msgid "continue an edit already in progress"
@@ -33581,63 +31331,52 @@ msgid "abort an edit in progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:189
-#, fuzzy
 msgid "changesets not found in destination"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:190
-#, fuzzy
 msgid "force outgoing even for unrelated repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:191
-#, fuzzy
 msgid "first revision to be edited"
-msgstr "Dem Muster entsprechende Einträge übergehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:193
-#, fuzzy
 msgid "identify the specified revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:194
-#, fuzzy
 msgid "show local revision number"
-msgstr "Satznummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:195
-#, fuzzy
 msgid "show global revision id"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:196
-#, fuzzy
 msgid "show branch"
-msgstr "Hierarchie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:197
-#, fuzzy
 msgid "show tags"
-msgstr "Threads anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:198
 msgid "show bookmarks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:203
-#, fuzzy
 msgid "directory strip option for patch"
-msgstr "Präfix zum Entfernen des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
-#, fuzzy
 msgid "don't commit, just update the working directory"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:206
-#, fuzzy
 msgid "apply patch without touching the working directory"
-msgstr "Einen inversen Patch ohne Änderung der Arbeitskopie aufzeichnen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:207
 msgid "apply patch to the nodes from which it was generated"
@@ -33657,9 +31396,8 @@ msgid "show newest record first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:217
-#, fuzzy
 msgid "file to store the bundles into"
-msgstr "Beschreibung des Patchpaketes editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:218
 msgid "a remote changeset intended to be added"
@@ -33678,9 +31416,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:221
 #: /tmp/fish/implicit/share/completions/hg.fish:253
 #: /tmp/fish/implicit/share/completions/hg.fish:276
-#, fuzzy
 msgid "show patch"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:223
 #: /tmp/fish/implicit/share/completions/hg.fish:255
@@ -33691,21 +31428,18 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:224
 #: /tmp/fish/implicit/share/completions/hg.fish:256
 #: /tmp/fish/implicit/share/completions/hg.fish:279
-#, fuzzy
 msgid "do not show merges"
-msgstr "Keine Flags anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:226
 #: /tmp/fish/implicit/share/completions/hg.fish:258
 #: /tmp/fish/implicit/share/completions/hg.fish:281
-#, fuzzy
 msgid "show the revision DAG"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:238
-#, fuzzy
 msgid "search the repository as it is in REV"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:239
 #: /tmp/fish/implicit/share/completions/hg.fish:492
@@ -33713,61 +31447,52 @@ msgid "end filenames with NUL, for use with xargs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:240
-#, fuzzy
 msgid "print complete paths from the filesystem root"
-msgstr "Nur die Datenbank, nicht das Dateisystem aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:245
-#, fuzzy
 msgid "show revisions matching date spec"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:246
-#, fuzzy
 msgid "show copied files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:247
 msgid "do case-insensitive search for a given text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:248
-#, fuzzy
 msgid "show the specified revision or range"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:249
 msgid "include revisions where files were removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:250
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "Befehlsgeschichte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:251
-#, fuzzy
 msgid "show changesets within the given named branch"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:252
 msgid "do not display revision or any of its ancestors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:264
-#, fuzzy
 msgid "revision to display"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:265
-#, fuzzy
 msgid "list files from all revisions"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:267
-#, fuzzy
 msgid "revision to merge"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:268
 msgid "review revisions to merge (no merge is performed)"
@@ -33775,9 +31500,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:272
 #: /tmp/fish/implicit/share/completions/hg.fish:310
-#, fuzzy
 msgid "a changeset intended to be included in the destination"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:275
 #: /tmp/fish/implicit/share/completions/hg.fish:312
@@ -33785,9 +31509,8 @@ msgid "a specific branch you would like to push"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:289
-#, fuzzy
 msgid "show parents of the specified revision"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:294
 msgid "set changeset phase to public"
@@ -33806,9 +31529,8 @@ msgid "allow to move boundary backward"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:298
-#, fuzzy
 msgid "target revision"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:300
 msgid "update to new branch head if changesets were pulled"
@@ -33827,9 +31549,8 @@ msgid "bookmark to pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:309
-#, fuzzy
 msgid "force push"
-msgstr "Ja erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:311
 msgid "bookmark to push"
@@ -33841,9 +31562,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:318
 #: /tmp/fish/implicit/share/completions/hg.fish:418
-#, fuzzy
 msgid "show only the preceding applied patch"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:319
 #: /tmp/fish/implicit/share/completions/hg.fish:367
@@ -33851,45 +31571,38 @@ msgstr "Nur zutreffenden Teil anzeigen"
 #: /tmp/fish/implicit/share/completions/hg.fish:416
 #: /tmp/fish/implicit/share/completions/hg.fish:417
 #: /tmp/fish/implicit/share/completions/hg.fish:419
-#, fuzzy
 msgid "print first line of patch header"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:321
-#, fuzzy
 msgid "do not update the new working directories"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:323
-#, fuzzy
 msgid "location of source patch repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:327
-#, fuzzy
 msgid "keep patch file"
-msgstr "Archiv-Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:334
 #: /tmp/fish/implicit/share/completions/hg.fish:397
 #: /tmp/fish/implicit/share/completions/hg.fish:432
-#, fuzzy
 msgid "ignore changes in the amount of white space"
-msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:340
 msgid "finish all applied changesets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:341
-#, fuzzy
 msgid "edit patch header"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:342
-#, fuzzy
 msgid "keep folded patch files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:345
 #: /tmp/fish/implicit/share/completions/hg.fish:369
@@ -33898,58 +31611,50 @@ msgid "tolerate non-conflicting local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:346
-#, fuzzy
 msgid "overwrite any local changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:347
 #: /tmp/fish/implicit/share/completions/hg.fish:371
 #: /tmp/fish/implicit/share/completions/hg.fish:379
 #: /tmp/fish/implicit/share/completions/hg.fish:459
-#, fuzzy
 msgid "do not save backup copies of files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:348
-#, fuzzy
 msgid "all patches and guards"
-msgstr "Installierte Pakete synchronisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:349
 msgid "drop all guards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:350
-#, fuzzy
 msgid "import file in patch directory"
-msgstr "Symbolischer Link auf Ordner"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:351
-#, fuzzy
 msgid "name of patch file"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:352
-#, fuzzy
 msgid "overwrite existing files"
-msgstr "Neuere Dateien nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:353
 msgid "place existing revisions under mq control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:355
-#, fuzzy
 msgid "qpush after importing"
-msgstr "Optionen zum Importieren von Schlüsseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:356
 #: /tmp/fish/implicit/share/completions/hg.fish:386
 #: /tmp/fish/implicit/share/completions/hg.fish:399
 #: /tmp/fish/implicit/share/completions/hg.fish:511
-#, fuzzy
 msgid "edit commit message"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:358
 #: /tmp/fish/implicit/share/completions/hg.fish:388
@@ -33976,53 +31681,44 @@ msgid "interactively record a new patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:368
-#, fuzzy
 msgid "pop all patches"
-msgstr "Alle Patches mit ja beantworten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:370
-#, fuzzy
 msgid "forget any local changes to patched files"
-msgstr "Vorbereitung zum Editieren einer beobachteten Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:374
-#, fuzzy
 msgid "apply on top of local changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:375
-#, fuzzy
 msgid "apply the target patch to its recorded parent"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:376
-#, fuzzy
 msgid "list patch name in commit text"
-msgstr "Patch-Name und Kommentar in Datei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:377
-#, fuzzy
 msgid "apply all patches"
-msgstr "<Datei>-Patch anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:378
 msgid "reorder patch series and apply only the patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:380
-#, fuzzy
 msgid "list all available queues"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:381
-#, fuzzy
 msgid "print name of active queue"
-msgstr "Effektive Benutzerkennung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:382
-#, fuzzy
 msgid "create new queue"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:383
 msgid "rename active queue"
@@ -34061,14 +31757,12 @@ msgid "interactively select changes to refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:411
-#, fuzzy
 msgid "disable all guards"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:412
-#, fuzzy
 msgid "list all guards in series file"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:413
 msgid "pop to before first guarded applied patch"
@@ -34079,14 +31773,12 @@ msgid "pop, then reapply patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:415
-#, fuzzy
 msgid "print patches not in series"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:422
-#, fuzzy
 msgid "amend the parent of the working dir"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:436
 msgid "record delete for missing files"
@@ -34105,9 +31797,8 @@ msgid "select all unresolved files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:448
-#, fuzzy
 msgid "list state of files needing merge"
-msgstr "Die im Paket enthaltenen Auslöser-Skripte anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:449
 msgid "mark files as resolved"
@@ -34128,23 +31819,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:457
 #: /tmp/fish/implicit/share/completions/hg.fish:521
-#, fuzzy
 msgid "tipmost revision matching date"
-msgstr "Dem Muster entsprechende Einträge übergehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:458
-#, fuzzy
 msgid "revert to the specified revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:465
 msgid "name of access log file to write to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:466
-#, fuzzy
 msgid "run server in background"
-msgstr "Job im Hintergrund ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:467
 msgid "used internally by daemon mode"
@@ -34167,9 +31855,8 @@ msgid "prefix path to serve from (default: server root)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:472
-#, fuzzy
 msgid "name to show in web pages (default: working directory)"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:473
 msgid "name of the hgweb config file (see \"hg help hgweb\")"
@@ -34181,9 +31868,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:475
 #: /tmp/fish/implicit/share/completions/hg.fish:476
-#, fuzzy
 msgid "for remote clients"
-msgstr "Funktionen auflisten oder entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:477
 msgid "web templates to use"
@@ -34198,34 +31884,28 @@ msgid "use IPv6 in addition to IPv4"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:480
-#, fuzzy
 msgid "SSL certificate file"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:482
-#, fuzzy
 msgid "show status of all files"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:483
-#, fuzzy
 msgid "show only modified files"
-msgstr "Nur diff-Datei herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:484
-#, fuzzy
 msgid "show only added files"
-msgstr "Aktualisieren: nur geänderte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:485
-#, fuzzy
 msgid "show only removed files"
-msgstr "Datei nicht erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:486
-#, fuzzy
 msgid "show only deleted (but tracked) files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:487
 msgid "show only files without changes"
@@ -34236,28 +31916,24 @@ msgid "show only unknown (not tracked) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:489
-#, fuzzy
 msgid "show only ignored files"
-msgstr "Aktualisieren: nur geänderte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:491
-#, fuzzy
 msgid "show source of copied files"
-msgstr "Indexfeld der Quelle verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:493
-#, fuzzy
 msgid "show difference from revision"
-msgstr "Unterschiede zwischen Revisionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:494
 msgid "list the changed files of a revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:499
-#, fuzzy
 msgid "strip specified revision"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:500
 msgid "force removal of changesets, discard uncommitted changes"
@@ -34280,74 +31956,62 @@ msgid "check for push and pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:507
-#, fuzzy
 msgid "force tag"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:508
 msgid "make the tag local"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:509
-#, fuzzy
 msgid "revision to tag"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:510
-#, fuzzy
 msgid "remove a tag"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:512
-#, fuzzy
 msgid "use <text> as commit message"
-msgstr "Copyright-Meldung beim Start unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:517
 msgid "update to new branch head if changesets were unbundled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:519
-#, fuzzy
 msgid "discard uncommitted changes (no backup)"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:520
-#, fuzzy
 msgid "update across branches if no uncommitted changes"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:1
-#, fuzzy
 msgid "Output file in given format"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:2
-#, fuzzy
 msgid "Specify tab length"
-msgstr "Zeilenlänge angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:3
-#, fuzzy
 msgid "Name of the input file"
-msgstr "Name des Quellpaketes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:4
-#, fuzzy
 msgid "Name of the output file"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:5
 #: /tmp/fish/implicit/share/completions/hugo.fish:57
 #: /tmp/fish/implicit/share/completions/tex.fish:10
-#, fuzzy
 msgid "Output directory"
-msgstr "mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:6
-#, fuzzy
 msgid "Set type of the source code"
-msgstr "Name des Quellpaketes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:7
 msgid "Highlight style"
@@ -34360,9 +32024,8 @@ msgstr "Aktualisierungs-Intervall"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:2
 #: /tmp/fish/implicit/share/completions/htop.fish:3
-#, fuzzy
 msgid "Start htop in monochrome mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:4
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:22
@@ -34370,117 +32033,96 @@ msgstr "Im Ordner-Index starten"
 #: /tmp/fish/implicit/share/completions/pv.fish:32
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:41
 #: /tmp/fish/implicit/share/completions/subl.fish:8
-#, fuzzy
 msgid "Show help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:5
-#, fuzzy
 msgid "Show only given PIDs"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:6
-#, fuzzy
 msgid "Monitor given user"
-msgstr "Benutzer beobachten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:7
-#, fuzzy
 msgid "Sort column"
-msgstr "Nach Spalten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:127
-#, fuzzy
 msgid "Debug output"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:3
-#, fuzzy
 msgid "Enable logging"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:4
-#, fuzzy
 msgid "Log file"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:6
 #: /tmp/fish/implicit/share/completions/iptables.fish:25
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:18
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:126
-#, fuzzy
 msgid "Verbose output"
-msgstr "Ausführlicher Prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:7
-#, fuzzy
 msgid "Verbose logging"
-msgstr "Angemeldete Benutzer auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:8
-#, fuzzy
 msgid "Hostname and path to the root"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:9
-#, fuzzy
 msgid "Include content marked as draft"
-msgstr "include-Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:10
-#, fuzzy
 msgid "Include expired content"
-msgstr "include-Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:11
-#, fuzzy
 msgid "Include content with publishdate in the future"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:12
-#, fuzzy
 msgid "Cache directory"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:13
 msgid "Canonicalize all relative URLs using baseurl"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:14
-#, fuzzy
 msgid "Remove files from destination not found in static directories"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:15
-#, fuzzy
 msgid "Content directory"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:16
-#, fuzzy
 msgid "Destination directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:17
-#, fuzzy
 msgid "Do not build 404 page"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:18
-#, fuzzy
 msgid "Disable different kinds of pages"
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:19
-#, fuzzy
 msgid "Do not build RSS files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:20
-#, fuzzy
 msgid "Do not build sitemap files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:21
 msgid "Add Git revision, date and author info to the pages"
@@ -34495,29 +32137,24 @@ msgid "Help for hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:24
-#, fuzzy
 msgid "Print missing translations"
-msgstr "Kompressionsraten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:25
-#, fuzzy
 msgid "Ignore the cache directory"
-msgstr "include-Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:26
-#, fuzzy
 msgid "Layout directory"
-msgstr "mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:27
-#, fuzzy
 msgid "Do not sync permission mode of files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:28
-#, fuzzy
 msgid "Do not sync modification time of files"
-msgstr "Nach Veränderungsdatum sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:29
 msgid "Pluralize titles in lists using inflect"
@@ -34529,29 +32166,25 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:31
 #: /tmp/fish/implicit/share/completions/hugo.fish:45
-#, fuzzy
 msgid "Render to memory"
-msgstr "Speicherbedarf reduzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:32
 #: /tmp/fish/implicit/share/completions/hugo.fish:58
 #: /tmp/fish/implicit/share/completions/hugo.fish:92
 #: /tmp/fish/implicit/share/completions/hugo.fish:103
-#, fuzzy
 msgid "Source directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:33
 #: /tmp/fish/implicit/share/completions/hugo.fish:46
-#, fuzzy
 msgid "Display memory and timing of different steps of the program"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:34
 #: /tmp/fish/implicit/share/completions/hugo.fish:47
-#, fuzzy
 msgid "Display metrics about template executions"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:35
 #: /tmp/fish/implicit/share/completions/hugo.fish:48
@@ -34559,24 +32192,20 @@ msgid "Calculate some improvement hints when combined with --templateMetrics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:36
-#, fuzzy
 msgid "Theme to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:37
-#, fuzzy
 msgid "Themes directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:38
-#, fuzzy
 msgid "Use /filename.html instead of /filename/"
-msgstr "purge anstelle von remove verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:39
-#, fuzzy
 msgid "Watch filesystem for changes and recreate as needed"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:40
 msgid "Benchmark Hugo by building the site a number of times"
@@ -34587,23 +32216,20 @@ msgid "Number of times to build the site"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:42
-#, fuzzy
 msgid "CPU profile file"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:43
 msgid "Help for benchmark"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:44
-#, fuzzy
 msgid "Memory profile file"
-msgstr "Datei nicht erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:49
-#, fuzzy
 msgid "Perform some verification checks"
-msgstr "Inhaltsgenerierung durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:50
 msgid "Help for check"
@@ -34614,34 +32240,28 @@ msgid "Check system ulimit settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:52
-#, fuzzy
 msgid "Help for ulimit"
-msgstr "Rekursionsgrenze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:53
-#, fuzzy
 msgid "Print the site configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:54
-#, fuzzy
 msgid "Help for config"
-msgstr "Hilfeabschnitt zu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:55
-#, fuzzy
 msgid "Convert the content to different formats"
-msgstr "Keine Verzeichnis-Hierarchie erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:56
-#, fuzzy
 msgid "Help for convert"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:59
-#, fuzzy
 msgid "Enable less safe operations"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:60
 msgid "Convert front matter to JSON"
@@ -34668,14 +32288,12 @@ msgid "Help for toYAML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:66
-#, fuzzy
 msgid "Print Hugo version and environment info"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:67
-#, fuzzy
 msgid "Help for env"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:68
 msgid "Collection of several useful generators"
@@ -34690,18 +32308,16 @@ msgid "Generate shell autocompletion script for Hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:71
-#, fuzzy
 msgid "Autocompletion file"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:72
 msgid "Help for autocomplete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:73
-#, fuzzy
 msgid "Autocompletion type"
-msgstr "Pfad, bei dem Vervollständigung berücksichtigt werden soll"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:74
 msgid "Generate CSS stylesheet for the Chroma code highlighter"
@@ -34712,199 +32328,168 @@ msgid "Help for chromastyles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:76
-#, fuzzy
 msgid "Style used for highlighting lines"
-msgstr "Keine Hervorhebung bei Suche"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:77
-#, fuzzy
 msgid "Style used for line numbers"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:78
 msgid "Highlighter style"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:79
-#, fuzzy
 msgid "Generate Markdown documentation for the Hugo CLI"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:80
-#, fuzzy
 msgid "Doc directory"
-msgstr "Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:81
 msgid "Help for doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:82
-#, fuzzy
 msgid "Generate man pages for the Hugo CLI"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:83
-#, fuzzy
 msgid "Man pages directory"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:84
-#, fuzzy
 msgid "Help for man"
-msgstr "Kurzes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:85
-#, fuzzy
 msgid "Import your site from others"
-msgstr "Auf Standardausgabe komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:86
-#, fuzzy
 msgid "Help for import"
-msgstr "Zu importierendes Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:87
 msgid "Import from Jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:88
-#, fuzzy
 msgid "Allow import into non-empty target directory"
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:89
 msgid "Help for jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:90
-#, fuzzy
 msgid "List various types of content"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:91
-#, fuzzy
 msgid "Help for list"
-msgstr "Heimordner für %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:93
-#, fuzzy
 msgid "List all drafts"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:94
 msgid "Help for drafts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:95
-#, fuzzy
 msgid "List all expired posts"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:96
-#, fuzzy
 msgid "Help for expired"
-msgstr "Zeitgeber abgelaufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:97
-#, fuzzy
 msgid "List all posts dated in the future"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:98
-#, fuzzy
 msgid "Help for future"
-msgstr "Alias für atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:99
-#, fuzzy
 msgid "Create new content"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:100
-#, fuzzy
 msgid "Editor to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:101
 msgid "Help for new"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:102
-#, fuzzy
 msgid "Content type to create"
-msgstr "Ausgabe an Datei anfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:104
-#, fuzzy
 msgid "Create a new site"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:105
-#, fuzzy
 msgid "Create site inside non-empty directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:106
 msgid "Config and front matter format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:107
-#, fuzzy
 msgid "Help for site"
-msgstr "Heimordner für %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:108
-#, fuzzy
 msgid "Create a new theme"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:109
-#, fuzzy
 msgid "Help for theme"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:110
-#, fuzzy
 msgid "Start high performance web server"
-msgstr "Dienst starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:111
-#, fuzzy
 msgid "Append port to baseurl"
-msgstr "Eingabe an Auswahl anfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:112
 msgid "Interface to which the server will bind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:113
-#, fuzzy
 msgid "Enable full re-renders on changes"
-msgstr "Fehler aus Paketen auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:114
 msgid "Watch without enabling live browser reload on rebuild"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:115
-#, fuzzy
 msgid "Help for server"
-msgstr "Proxy-Server verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:116
-#, fuzzy
 msgid "Port for live reloading"
-msgstr "Dynamische Port-Weiterleitung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:117
 msgid "Interval to poll memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:118
-#, fuzzy
 msgid "Memory usage log file"
-msgstr "Veraltete Dateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:119
 msgid "Navigate to changed content file on live browser reload"
@@ -34919,9 +32504,8 @@ msgid "Port on which the server will listen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:122
-#, fuzzy
 msgid "Render to destination directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:123
 msgid "Reset the content draft status"
@@ -34932,58 +32516,48 @@ msgid "Help for undraft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:125
-#, fuzzy
 msgid "Print the version number of Hugo"
-msgstr "Zeilennummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:126
-#, fuzzy
 msgid "Help for version"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:1
 msgid "Only send ipc message and suppress output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:2
-#, fuzzy
 msgid "Display version number and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:4
-#, fuzzy
 msgid "Set socket"
-msgstr "Socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:5
-#, fuzzy
 msgid "Specify ipc message type"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:1
-#, fuzzy
 msgid "Convert from specified encoding"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:2
-#, fuzzy
 msgid "Convert to specified encoding"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:3
-#, fuzzy
 msgid "List known coded character sets"
-msgstr "Standardzeichensatz festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:4
-#, fuzzy
 msgid "Output file"
-msgstr "Ausgabedatei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:5
-#, fuzzy
 msgid "Print progress information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:2
 #: /tmp/fish/implicit/share/completions/mogrify.fish:4
@@ -35004,9 +32578,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:26
-#, fuzzy
 msgid "Display the number of unique colors in the image"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:30
 msgid "Replace each pixel with its complementary color"
@@ -35021,9 +32594,8 @@ msgid "Print all group ids"
 msgstr "Alle Gruppenkennungen ausgeben"
 
 #: /tmp/fish/implicit/share/completions/id.fish:3
-#, fuzzy
 msgid "Print name, not number"
-msgstr "Zeilennummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/id.fish:4
 msgid "Print real ID, not effective"
@@ -35062,131 +32634,108 @@ msgid "Reports interface existence via return code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:2
-#, fuzzy
 msgid "Print out the whole config of iface"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:3
 msgid "Print out yes or no according to existence"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:4
-#, fuzzy
 msgid "Print out the address"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
-#, fuzzy
 msgid "Print netmask"
-msgstr "Zähler ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:6
-#, fuzzy
 msgid "Print network address"
-msgstr "Rechnernamen des Netzwerkknotens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:7
-#, fuzzy
 msgid "Print broadcast"
-msgstr "Datenbank ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:8
-#, fuzzy
 msgid "Print mtu"
-msgstr "Zähler ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:9
-#, fuzzy
 msgid "Print out the hardware address"
-msgstr "Hardwareadresse verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:10
-#, fuzzy
 msgid "Print flags"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:11
-#, fuzzy
 msgid "Print all statistics on input"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:12
-#, fuzzy
 msgid "Print # of in packets"
-msgstr "Anmeldeprozess ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:13
-#, fuzzy
 msgid "Print # of in bytes"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:14
-#, fuzzy
 msgid "Print # of in errors"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:15
-#, fuzzy
 msgid "Print # of in drops"
-msgstr "APM-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:16
-#, fuzzy
 msgid "Print # of in fifo overruns"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:17
-#, fuzzy
 msgid "Print # of in compress"
-msgstr "Anmeldeprozess ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:18
-#, fuzzy
 msgid "Print # of in multicast"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:19
-#, fuzzy
 msgid "Print all statistics on output"
-msgstr "Wortzählung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:20
-#, fuzzy
 msgid "Print # of out packets"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:21
-#, fuzzy
 msgid "Print # of out bytes"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:22
-#, fuzzy
 msgid "Print # of out errors"
-msgstr "Vollständige Datensätze ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:23
-#, fuzzy
 msgid "Print # of out drops"
-msgstr "Vollständige Datensätze ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:24
 msgid "Print # of out fifo overruns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:25
-#, fuzzy
 msgid "Print # of out collisions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:26
 msgid "Print # of out carrier loss"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:27
-#, fuzzy
 msgid "Print # of out multicast"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:28
 msgid "Print # of incoming bytes per second"
@@ -35197,9 +32746,8 @@ msgid "Print # of outgoing bytes per second"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:2
-#, fuzzy
 msgid "Include window border in the output image"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:10
 msgid "Obtain image by descending window hierarchy"
@@ -35231,27 +32779,24 @@ msgid "Seconds delay between snapshots [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:37
-#, fuzzy
 msgid "Select image from root window"
-msgstr "Root-Fenster auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:40
 msgid "Operate silently, i.e. don't ring any bells "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:41
-#, fuzzy
 msgid "Number of screen snapshots [value]"
-msgstr "Alle Zeilen nummerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:47
 msgid "Constant, Edge, Mirror, or Tile [method]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:48
-#, fuzzy
 msgid "Select window with this id or name [id]"
-msgstr "Fenster über Name auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:52
 msgid "Preferred size or location of the image [geometry]"
@@ -35263,78 +32808,64 @@ msgid "Make this color transparent within the image [color]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:1
-#, fuzzy
 msgid "Start the service"
-msgstr "Dienst starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:2
-#, fuzzy
 msgid "Stop the service"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:3
-#, fuzzy
 msgid "Restart the service"
-msgstr "Dienst starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:4
-#, fuzzy
 msgid "Reload Configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:5
-#, fuzzy
 msgid "Force reloading configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:6
-#, fuzzy
 msgid "Print the status of the service"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:1
-#, fuzzy
 msgid "Read commands from file or stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:2
-#, fuzzy
 msgid "Don't terminate on errors in batch mode"
-msgstr "Fehler in der Befehlszeile tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:3
-#, fuzzy
 msgid "Print the version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:4
-#, fuzzy
 msgid "Output more information"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:5
-#, fuzzy
 msgid "Output more detailed information"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:6
-#, fuzzy
 msgid "Specify maximum number of loops for 'ip addr flush'"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:7
 msgid "The protocol family to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:8
-#, fuzzy
 msgid "Short for --family inet"
-msgstr "Kurzes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:9
-#, fuzzy
 msgid "Short for --family inet6"
-msgstr "Kurzes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:10
 msgid "Short for --family bridge"
@@ -35353,23 +32884,20 @@ msgid "Short for --family link"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:14
-#, fuzzy
 msgid "Output on one line"
-msgstr "Nur die ersten von gleichen Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:15
 msgid "Resolve names and print them instead of addresses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:16
-#, fuzzy
 msgid "Use specified network namespace"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:17
-#, fuzzy
 msgid "Execute command for all objects"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:1
 msgid "Create a set identified with SETNAME"
@@ -35380,9 +32908,8 @@ msgid "Add a given entry to a SET"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:3
-#, fuzzy
 msgid "Delete an entry from a SET"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:4
 msgid "Test whether an entry is in a set"
@@ -35390,9 +32917,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:5
 #: /tmp/fish/implicit/share/completions/ipset.fish:6
-#, fuzzy
 msgid "Destroy the specified set or all sets"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
 msgid "a"
@@ -35403,71 +32929,61 @@ msgid "Output format to the list command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:10
-#, fuzzy
 msgid "Suppress any output"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:11
 msgid "Enforce name lookup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:12
-#, fuzzy
 msgid "List just the names of the sets"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:13
 msgid "List the set names and headers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:14
-#, fuzzy
 msgid "Filename instead of stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:1
-#, fuzzy
 msgid "Append rules to the end of a chain"
-msgstr "Dateien an Archiv anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:2
 msgid "Check whether a matching rule exists in a chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:3
-#, fuzzy
 msgid "Delete rules from a chain"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:4
 #: /tmp/fish/implicit/share/completions/iptables.fish:20
-#, fuzzy
 msgid "Specify the target of a rule"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:5
-#, fuzzy
 msgid "Specify a match to use"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:6
-#, fuzzy
 msgid "Insert rules in the beginning of a chain"
-msgstr "Bedeutung der Treffer umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:7
 msgid "Replace a rule in a chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:8
-#, fuzzy
 msgid "List all rules in a chain"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:9
-#, fuzzy
 msgid "Print all rules in a chain."
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:10
 msgid "Delete ALL rules in a chain"
@@ -35478,9 +32994,8 @@ msgid "Zero the packet and byte counters in chains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:12
-#, fuzzy
 msgid "Create a new user-defined chain by the given name"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:13
 msgid "Delete the optional user-defined chain specified"
@@ -35499,9 +33014,8 @@ msgid "The protocol of the rule or of the packet to check"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:18
-#, fuzzy
 msgid "Source specification"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:19
 msgid "Destination specification"
@@ -35529,14 +33043,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:27
 #: /tmp/fish/implicit/share/completions/pv.fish:11
-#, fuzzy
 msgid "Numeric output"
-msgstr "nur numerische Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:28
-#, fuzzy
 msgid "Expand numbers"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:29
 msgid "When listing rules, add line numbers"
@@ -35547,9 +33059,8 @@ msgid "The table to operate on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:31
-#, fuzzy
 msgid "Use this command to load modules"
-msgstr "Benutze <Befehl> zur Erstellung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:2
 msgid "Automock all files by default"
@@ -35568,9 +33079,8 @@ msgid "Whether to use the transform cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:6
-#, fuzzy
 msgid "Disable the cache"
-msgstr "Server-seitigen Cache deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:7
 msgid "The directory where Jest should store its  dependency information"
@@ -35585,9 +33095,8 @@ msgid "Automatically clear mock calls and instances every test"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:10
-#, fuzzy
 msgid "Alias for --coverage"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:11
 msgid ""
@@ -35603,14 +33112,12 @@ msgid "Forces test results output color highlighting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:14
-#, fuzzy
 msgid "Alias for --color"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:15
-#, fuzzy
 msgid "The path to a jest config file"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:16
 msgid ""
@@ -35623,9 +33130,8 @@ msgid "The directory where Jest should output its coverage files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:18
-#, fuzzy
 msgid "Pattern of files to ignore"
-msgstr "zu ignorierenden HTML-Markierungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:19
 msgid "A list of reporter names that Jest uses when writing coverage reports"
@@ -35638,24 +33144,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:21
-#, fuzzy
 msgid "Print debugging info about your jest config"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
-#, fuzzy
 msgid "The test environment used for all tests"
-msgstr "Behandlung von Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
-#, fuzzy
 msgid "Use this flag to show full diffs instead of a patch"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:24
-#, fuzzy
 msgid "Find related tests for a list of source files"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:25
 msgid "Force Jest to exit after all tests have completed running"
@@ -35670,9 +33172,8 @@ msgid "A JSON string with map of variables for the haste module system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:28
-#, fuzzy
 msgid "Prints the test results in JSON"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:29
 msgid "Will run all tests affected by file changes in the last commit made"
@@ -35691,9 +33192,8 @@ msgid "Maps code coverage reports against original source code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:33
-#, fuzzy
 msgid "Specifies the maximum number of workers"
-msgstr "Maximale Zahl offener Datei-Deskriptoren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:34
 msgid "Directory names to be searched recursively up from the requiring module"
@@ -35710,27 +33210,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:37
-#, fuzzy
 msgid "Modules to ignore"
-msgstr "zu ignorierenden HTML-Markierungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:38
 msgid "An alternative API to setting the NODE_PATH env variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:39
-#, fuzzy
 msgid "Disables stack trace in test results output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:40
 msgid "Activates notifications for test results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:41
-#, fuzzy
 msgid "Run tests based on the changed files"
-msgstr "Aktualisieren: nur geänderte Dateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:42
 msgid "A file where to write test results"
@@ -35749,9 +33246,8 @@ msgid "A list of custom reporters for the test suite"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:46
-#, fuzzy
 msgid "Automatically reset mock state between every test"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:47
 msgid "Whatever to reset the module registry for every test"
@@ -35762,18 +33258,16 @@ msgid "A JSON string which allows the use of a custom resolver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:49
-#, fuzzy
 msgid "The root directory that Jest should scan for tests and modules within"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:50
 msgid "Paths to directories that Jest should use to search for files in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:51
-#, fuzzy
 msgid "Run all tests serially in the current process"
-msgstr "Befehl im aktuellen Prozess ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:52
 msgid "The paths to modules to configure the testing environment"
@@ -35784,55 +33278,48 @@ msgid "The path to a module to configure the testing framework"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:54
-#, fuzzy
 msgid "Print your jest config and then exits"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
-#, fuzzy
 msgid "Prevent tests from printing messages through the console"
-msgstr "Fehlermeldungen per syslog senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:56
 msgid "Snapshot serializer modules Jest should use for snapshot testing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:57
-#, fuzzy
 msgid "Alias for --env"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:58
 msgid "The glob patterns Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:59
-#, fuzzy
 msgid "Run only tests with a name that matches the regex pattern"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:60
 msgid "Paths to skip"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:61
-#, fuzzy
 msgid "Regex for test paths"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:62
 msgid "The regexp pattern Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:63
-#, fuzzy
 msgid "Allows the use of a custom results processor"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:64
-#, fuzzy
 msgid "Allows to specify a custom test runner"
-msgstr "Autorkennung angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:65
 msgid "This option sets the URL for the jsdom environment"
@@ -35862,9 +33349,8 @@ msgid "Use this flag to re-record snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:71
-#, fuzzy
 msgid "Divert all output to stderr"
-msgstr "Audio-Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:72
 msgid "Display individual test results with the test suite hierarchy"
@@ -35873,18 +33359,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/jest.fish:73
 #: /tmp/fish/implicit/share/completions/snap.fish:15
 #: /tmp/fish/implicit/share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Print the version and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:74
 msgid "Watch files for changes and rerun tests related to changed files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:75
-#, fuzzy
 msgid "Watch files for changes and rerun all tests"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:76
 msgid "Whether to use watchman for file crawling"
@@ -35895,29 +33379,24 @@ msgid "Disable using watchman for file crawling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:1
-#, fuzzy
 msgid "Enable debugger"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:2
-#, fuzzy
 msgid "Output usage information"
-msgstr "Kann Benutzerinformation nicht abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:3
-#, fuzzy
 msgid "Output version number"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:4
-#, fuzzy
 msgid "Create a new JHipster application"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:5
-#, fuzzy
 msgid "Deploy the current application to AWS"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:6
 msgid "Create pipeline scripts for popular CI tools"
@@ -35944,28 +33423,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:11
-#, fuzzy
 msgid "Create a JDL file from the existing entities"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:12
-#, fuzzy
 msgid "Deploy the current application to Heroku"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:13
 msgid "Create entities from the JDL file passed in argument"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:14
-#, fuzzy
 msgid "Display information about your current project and system"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:15
-#, fuzzy
 msgid "Deploy the current application to Kubernetes"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:16
 msgid ""
@@ -35974,38 +33449,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:17
-#, fuzzy
 msgid "Deploy the current application to OpenShift"
-msgstr "Version und unterstützte Algorithmen anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:18
-#, fuzzy
 msgid "Deploy the current application to Rancher"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:19
-#, fuzzy
 msgid "Create a new JHipster server-side application"
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:20
-#, fuzzy
 msgid "Create a new Spring service bean"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:21
 msgid "Upgrade the JHipster version and the generated application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:22
-#, fuzzy
 msgid "Print command completion script"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:2
-#, fuzzy
 msgid "Show the process id of each process in the job"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:3
 msgid "Show group id of job"
@@ -36028,43 +33497,36 @@ msgid "OR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:4
-#, fuzzy
 msgid "Prints a short help text and exits"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:5
-#, fuzzy
 msgid "Prints a short version string and exits"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:7
-#, fuzzy
 msgid "Show all fields in full"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:8
-#, fuzzy
 msgid "Show live tail of entries"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:9
-#, fuzzy
 msgid "Controls the number of journal lines"
-msgstr "Anzahl der Argumente zählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:10
 msgid "Show all lines, even in follow mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:11
-#, fuzzy
 msgid "Controls the formatting"
-msgstr "Kann Benutzerinformation nicht abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:12
-#, fuzzy
 msgid "Suppress warning about normal user"
-msgstr "Warnung über die Verwendung unsicheren Speichers unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:13
 msgid "Show entries interleaved from all journals"
@@ -36075,9 +33537,8 @@ msgid "Show data only from a certain boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:15
-#, fuzzy
 msgid "Show data only of the specified unit"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:16
 msgid "Filter by priority"
@@ -36100,23 +33561,20 @@ msgid "Print all possible data values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:21
-#, fuzzy
 msgid "Specify journal directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:22
 msgid "Generate a new 128 bit ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:23
-#, fuzzy
 msgid "Show internal header information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:24
-#, fuzzy
 msgid "Shows the current disk usage"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:25
 msgid "Generate Forward Secure Sealing key pair"
@@ -36127,41 +33585,36 @@ msgid "Change interval for the sealing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:27
-#, fuzzy
 msgid "Check journal for internal consistency"
-msgstr "Paketdepot auf Konsistenz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:28
 msgid "Specifies FSS key for --verify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:1
-#, fuzzy
 msgid "Output version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:2
 msgid "Use application/json-seq MIME type scheme"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:3
-#, fuzzy
 msgid "Parse input in streaming fasion"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:4
 msgid "Run filter just once in large array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:5
-#, fuzzy
 msgid "Don't parse as JSON but as string"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:6
-#, fuzzy
 msgid "Ignore input and treat it as null"
-msgstr "Erzwinge die Behandlung der Eingabe als HTML"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:7
 msgid "Don't pretty-print JSON"
@@ -36176,23 +33629,20 @@ msgid "Use given number of spaces for indentation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:11
-#, fuzzy
 msgid "Don't color output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:12
-#, fuzzy
 msgid "Replace UTF-8 characters with escape sequences"
-msgstr "Nicht darstellbare Zeichen durch '?' ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:13
 msgid "Flush output after each JSON object is printed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:14
-#, fuzzy
 msgid "Sort object keys in output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:15
 msgid "If output is string ouput its content directly to stdout"
@@ -36203,62 +33653,52 @@ msgid "Raw ouput without newlines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:17
-#, fuzzy
 msgid "Read filter from file"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:18
 msgid "Prepend given directory to search modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:19
-#, fuzzy
 msgid "Set exit status"
-msgstr "Exit-Status des Jobs verneinen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:20
-#, fuzzy
 msgid "Set variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:21
-#, fuzzy
 msgid "Set JSON-encoded variable"
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:22
-#, fuzzy
 msgid "Read JSON in file and bind to given variable"
-msgstr "Eine Eingabezeile in Variablen einlesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:23
-#, fuzzy
 msgid "Read JSON in file and bind to given variable [see man]"
-msgstr "Eine Eingabezeile in Variablen einlesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:24
 msgid "Run tests in given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:1
-#, fuzzy
 msgid "List available modules"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:2
-#, fuzzy
 msgid "Show author information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:3
-#, fuzzy
 msgid "Show license information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:4
-#, fuzzy
 msgid "Set a language"
-msgstr "Untertitel-Sprache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:5
 msgid "Don't show main window"
@@ -36273,29 +33713,24 @@ msgid "Icon for the module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:8
-#, fuzzy
 msgid "Title for the window"
-msgstr "Root-Fenster auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:9
-#, fuzzy
 msgid "Show version information and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:10
-#, fuzzy
 msgid "Show help information and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:1
-#, fuzzy
 msgid "List all devices"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:2
-#, fuzzy
 msgid "List available (paired and reachable) devices"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:3
 msgid ""
@@ -36316,9 +33751,8 @@ msgid "Find the said device by ringing it."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:7
-#, fuzzy
 msgid "Stop pairing to a said device"
-msgstr "Stoppe und starte Dienst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:8
 msgid "Sends a ping to said device"
@@ -36329,74 +33763,60 @@ msgid "Same as ping but you can set the message to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:10
-#, fuzzy
 msgid "Share a file to a said device"
-msgstr "Vorgegebene Datei wurde geändert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:11
-#, fuzzy
 msgid "Display the notifications on a said device"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:12
-#, fuzzy
 msgid "Lock the specified device"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:13
-#, fuzzy
 msgid "Sends an SMS. Requires destination"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:14
-#, fuzzy
 msgid "Phone number to send the message"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:15
-#, fuzzy
 msgid "Device ID"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:16
-#, fuzzy
 msgid "Device Name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:17
-#, fuzzy
 msgid "Get encryption info about said device"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:18
-#, fuzzy
 msgid "Lists remote commands and their ids"
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:19
-#, fuzzy
 msgid "Executes a remote command by id"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:20
-#, fuzzy
 msgid "Displays this help."
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:21
-#, fuzzy
 msgid "Displays version information."
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:22
-#, fuzzy
 msgid "Show author information."
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:23
-#, fuzzy
 msgid "Show license information."
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:24
 msgid "The base file name of the desktop entry for this application."
@@ -36441,9 +33861,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:11
-#, fuzzy
 msgid "List names of available signals and exit"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:12
 msgid "Case sensitive argument match for processed"
@@ -36466,14 +33885,12 @@ msgid "Limit to processes matching specified PROCNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:18
-#, fuzzy
 msgid "Do not skip zombies"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:1
-#, fuzzy
 msgid "Test if kitchen has yet to be given the main command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:2
 #: /tmp/fish/implicit/share/completions/kitchen.fish:3
@@ -36481,9 +33898,8 @@ msgid "Describe available commands or one specific command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:4
-#, fuzzy
 msgid "Lists one or more instances"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:5
 msgid "List the name of each instance only, one per line"
@@ -36495,9 +33911,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:2
 #: /tmp/fish/implicit/share/completions/latexmk.fish:32
-#, fuzzy
 msgid "never use bibtex"
-msgstr "Benutzerattribute nicht überprüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:3
 msgid "use bibtex when needed, but only if the bib files exist"
@@ -36512,9 +33927,8 @@ msgid "Set contrast or intensity of banner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:6
-#, fuzzy
 msgid "Set scale for banner"
-msgstr "Datum in Zukunft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:7
 msgid "list commands used by latexmk for processing files"
@@ -36541,14 +33955,12 @@ msgid "Do NOT change to directory of source file when processing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:13
-#, fuzzy
 msgid "Show list of dependent files after processing"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:14
-#, fuzzy
 msgid "Do not show list of dependent files"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:15
 msgid ""
@@ -36561,9 +33973,8 @@ msgid "Filter to apply to dvi file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:17
-#, fuzzy
 msgid "generate dvi"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:18
 msgid "turn off required dvi"
@@ -36590,23 +34001,20 @@ msgid "process regardless of file timestamps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:24
-#, fuzzy
 msgid "Turn off -g"
-msgstr "FTP-Mustererkennung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:25
-#, fuzzy
 msgid "print help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:26
 msgid "set basename of output file(s) to STRING"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:27
-#, fuzzy
 msgid "force landscape mode"
-msgstr "Ansi-Modus benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:28
 msgid "turn off -l"
@@ -36633,9 +34041,8 @@ msgid "omit automatic reading of system, user and project rc files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:35
-#, fuzzy
 msgid "set name of directory for output files"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:36
 msgid "generate pdf by pdflatex"
@@ -36658,14 +34065,12 @@ msgid "turn off pdf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:41
-#, fuzzy
 msgid "generate postscript"
-msgstr "Keine post-Skripte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:42
-#, fuzzy
 msgid "turn off postscript"
-msgstr "Das test-Skript ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:43
 msgid "Filter to apply to postscript file"
@@ -36692,9 +34097,8 @@ msgid "preview document"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:49
-#, fuzzy
 msgid "turn off preview mode"
-msgstr "Autosplit-Modus aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:50
 msgid "preview document and continuously update"
@@ -36710,9 +34114,8 @@ msgid "silence progress messages from called programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:53
-#, fuzzy
 msgid "Read custom RC file"
-msgstr "URLs aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:54
 msgid "Use -recorder option for (pdf)latex"
@@ -36727,14 +34130,12 @@ msgid "Show list of rules after processing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:57
-#, fuzzy
 msgid "Do not show list of rules after processing"
-msgstr "Integrierten Präprozessor nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:59
-#, fuzzy
 msgid "show CPU time used"
-msgstr "Zeittyp anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:60
 msgid "don't show CPU time used"
@@ -36750,9 +34151,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:63
 #: /tmp/fish/implicit/share/completions/latexmk.fish:65
-#, fuzzy
 msgid "display program version"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:64
 msgid "display usual progress messages from called programs"
@@ -36787,23 +34187,20 @@ msgid "Write the classpath of the current project to output-file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:3
-#, fuzzy
 msgid "Remove all files from project's target-path."
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:4
 msgid "Compile Clojure source into .class files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:5
-#, fuzzy
 msgid "Build jar and deploy to remote repository."
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:6
-#, fuzzy
 msgid "Show details about dependencies."
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:7
 msgid "Higher-order task to perform other tasks in succession."
@@ -36814,18 +34211,16 @@ msgid "Display a list of tasks or help for a given task or subtask."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:9
-#, fuzzy
 msgid "Install current project to the local repository."
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:10
 msgid "Package up all the project's files into a jar file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:11
-#, fuzzy
 msgid "Compile Java source files."
-msgstr "Quellpakete kompilieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:12
 msgid "Start a Light Table client for this project"
@@ -36864,9 +34259,8 @@ msgid "List all available profiles or display one if given an argument."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:21
-#, fuzzy
 msgid "Run the project's tests."
-msgstr "Das test-Skript ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:22
 msgid "Run a task without nesting the project's JVM inside Leiningen's."
@@ -36885,9 +34279,8 @@ msgid "Upgrade Leiningen to specified version or latest stable."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:26
-#, fuzzy
 msgid "Print version for Leiningen and the current JVM."
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:27
 msgid "Apply the given task with the profile(s) specified."
@@ -36962,14 +34355,12 @@ msgid "Display status column"
 msgstr "Statusspalte anzeigen"
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
-#, fuzzy
 msgid "Specify key bindings file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:21
-#, fuzzy
 msgid "Prompt with percentage"
-msgstr "Prompt-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:22
 msgid "Verbose prompt"
@@ -36992,9 +34383,8 @@ msgid "Log to file, overwrite"
 msgstr "Protokoll in Datei, überschreiben"
 
 #: /tmp/fish/implicit/share/completions/less.fish:27
-#, fuzzy
 msgid "Start at first occurrence of pattern"
-msgstr "Start beim ersten Vorkommen des Musters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:28
 msgid "Prompt string"
@@ -37023,9 +34413,8 @@ msgid "Multiple blank lines sqeezed"
 msgstr "Mehrere Leerzeilen zusammengefasst"
 
 #: /tmp/fish/implicit/share/completions/less.fish:36
-#, fuzzy
 msgid "Do not fold long lines"
-msgstr "Lange Zeilen nicht umbrechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:37
 msgid "Edit tag"
@@ -37084,14 +34473,12 @@ msgid "Characters to scroll on left/right arrows"
 msgstr "Anzahl zu blätternde Zeichen bei Links-/Rechts-Pfeilen"
 
 #: /tmp/fish/implicit/share/completions/light.fish:3
-#, fuzzy
 msgid "Get value (default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:4
-#, fuzzy
 msgid "Set value"
-msgstr "Datum festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:5
 msgid "Add value"
@@ -37102,9 +34489,8 @@ msgid "Subtract value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:7
-#, fuzzy
 msgid "List controllers"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:8
 msgid "Restore brightness"
@@ -37115,28 +34501,24 @@ msgid "Save brightness"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:10
-#, fuzzy
 msgid "Brightness (default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:11
-#, fuzzy
 msgid "Maximum brightness"
-msgstr "Maximale Wiederholungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:12
 msgid "Minimum cap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:13
-#, fuzzy
 msgid "Selects controller automatically (default)"
-msgstr "Vollständige Befehlszeile selektieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:14
-#, fuzzy
 msgid "Specify controller to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:15
 msgid "Interpret & output values in percent"
@@ -37147,39 +34529,33 @@ msgid "Interpret & output values in raw mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:17
-#, fuzzy
 msgid "Sets the verbosity level"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:1
-#, fuzzy
 msgid "Make symbolic links instead of hard links"
-msgstr "Symbolische Links als Links speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:2
 #: /tmp/fish/implicit/share/completions/ln.fish:3
-#, fuzzy
 msgid "Make a backup of each existing destination file"
-msgstr "Sicherung jeder existierenden Zieldatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:4
 msgid "Allow superuser to attempt to hard link directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:5
-#, fuzzy
 msgid "Remove existing destination files"
-msgstr "Sicherung jeder existierenden Zieldatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:6
-#, fuzzy
 msgid "Prompt whether to remove destinations"
-msgstr "Abfragen, ob der lange Kommentar editiert werden soll"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:7
-#, fuzzy
 msgid "Dereference TARGETs that are symbolic links"
-msgstr "Symbolische Verweise dereferenzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:8
 msgid "Treat symlink to directory as if it were a file"
@@ -37202,9 +34578,8 @@ msgid "Treat LINK_NAME as a normal file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:13
-#, fuzzy
 msgid "Print name of each linked file"
-msgstr "Zeige Name, Zeile und Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:1
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:4
@@ -37226,30 +34601,26 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/localectl.fish:4
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:37
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:7
-#, fuzzy
 msgid "Print a short help text and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:5
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:38
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:8
-#, fuzzy
 msgid "Print a short version string and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:1
 msgid "Match all non-option arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:2
-#, fuzzy
 msgid "Match against the base name of the file"
-msgstr "Nur die Datenbank, nicht das Dateisystem aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:3
-#, fuzzy
 msgid "Print only the number of matches found"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:4
 msgid "Use different DATABASE file[s]"
@@ -37269,14 +34640,12 @@ msgid "Treat broken symbolic links as if they were existing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:9
-#, fuzzy
 msgid "Ignore case distinctions"
-msgstr "Unterschiede bei Groß-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:10
-#, fuzzy
 msgid "Limit  the number of matches"
-msgstr "Nur Anzahl von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:11
 msgid "Use ASCII NUL as a separator"
@@ -37291,20 +34660,17 @@ msgid "Match against the whole name of the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:14
-#, fuzzy
 msgid "The pattern is a regular expression"
-msgstr "Muster ist ein regulärer Ausdruck"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:15
-#, fuzzy
 msgid "Print a summary of the options and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:16
 #: /tmp/fish/implicit/share/completions/xmms.fish:11
-#, fuzzy
 msgid "Print the version number and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:1
 msgid "Starts the keylogging daemon"
@@ -37319,9 +34685,8 @@ msgid "Set ouput LOGFILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:4
-#, fuzzy
 msgid "Use file as input KEYMAP"
-msgstr "Datei als Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:5
 msgid "Use DEVICE as keyboard input"
@@ -37364,9 +34729,8 @@ msgid "Sets a standard System V interface script or PPD file "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:4
-#, fuzzy
 msgid "Deletes the named option from printer"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:5
 msgid ""
@@ -37456,18 +34820,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:1
-#, fuzzy
 msgid "Prints files to the named printer"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:2
 msgid "Specifies an existing job to modify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:3
-#, fuzzy
 msgid "Sets the number of copies to print from 1 to 100"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:4
 msgid "Sets the job priority from 1 (lowest) to 100 (highest)"
@@ -37479,18 +34841,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:6
 #: /tmp/fish/implicit/share/completions/lpr.fish:2
-#, fuzzy
 msgid "Sets the job name"
-msgstr "Volume-Namen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:7
 msgid "Specifies  when the job should be printed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:8
-#, fuzzy
 msgid "Specify the page ranges"
-msgstr "http-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:1
 msgid "Shows a \"long\" listing of devices or drivers"
@@ -37503,22 +34863,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:3
-#, fuzzy
 msgid ""
 "Specifies  a  comma-separated  list  of  device  or  PPD  schemes that "
 "should be excluded from the results"
 msgstr ""
-"Geben Sie eine Komma-getrennte Liste von Verzeichnissen an, die "
-"ausgeschlossen werden soll"
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:4
-#, fuzzy
 msgid ""
 "Specifies a comma-separated list of device or PPD schemes that should be "
 "included in the  results"
 msgstr ""
-"Geben Sie eine Komma-getrennte Liste von Verzeichnissen an, die "
-"ausgeschlossen werden soll"
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:5
 msgid "Specifies the language to match when listing drivers with the -m option"
@@ -37538,45 +34892,40 @@ msgid "Specifies the timeout when listing devices with the -v option (sec)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:1
-#, fuzzy
 msgid "Sets the user default printer"
-msgstr "Standardschlüssel als Standardempfänger benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:2
 msgid "Lists the printer specific options and their current settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:3
-#, fuzzy
 msgid "Specifies a new option for the named destination"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:4
 msgid "Sets the destination and instance for any options that follow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:5
-#, fuzzy
 msgid "Removes the specified option for the named destination"
-msgstr "Die auf der Befehlszeile angegebene Datei verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:6
 msgid "Removes the options for the named destination and instance"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:1
-#, fuzzy
 msgid "Change CUPS digest password"
-msgstr "Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:2
 msgid "Add password"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:3
-#, fuzzy
 msgid "Remove password"
-msgstr "Sätze entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:4
 msgid "Specify the group other, than default system group"
@@ -37588,14 +34937,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:6
-#, fuzzy
 msgid "Specifies an alternate server"
-msgstr "X-Server angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:3
-#, fuzzy
 msgid "Disables banner printing"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:4
 msgid ""
@@ -37611,9 +34958,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:6
-#, fuzzy
 msgid "Hold job for printing"
-msgstr "Druckformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:7
 msgid ""
@@ -37625,14 +34971,12 @@ msgid "Show the server hostname and port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:2
-#, fuzzy
 msgid "Shows the ranking of print jobs"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:3
-#, fuzzy
 msgid "Specifies which jobs to show"
-msgstr "sendmail-Befehl angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:4
 msgid "Shows the accepting state of selected printer queues"
@@ -37645,18 +34989,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:6
-#, fuzzy
 msgid "Shows the current default destination"
-msgstr "Derzeit ausgewertete Funktion stoppen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:7
 msgid "Shows a long listing of printers, classes, or jobs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:8
-#, fuzzy
 msgid "Shows the jobs queue on the specified destinations"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:9
 msgid "Shows the printers and whether or not they are enabled for printing"
@@ -37671,34 +35013,28 @@ msgid "Shows a status summary, including the default destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:12
-#, fuzzy
 msgid "Shows all status information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:13
-#, fuzzy
 msgid "Shows a list of print jobs queued by the specified users"
 msgstr ""
-"Die Liste der persönlichen Übersichtseinstellungen gemäß der angegebenen "
-"Zeichenkette festlegen"
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:14
 msgid "Shows the printers and what device they are attached to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:1
-#, fuzzy
 msgid "print all devices"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:2
 msgid "print SIZE in bytes rather than in human readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:3
-#, fuzzy
 msgid "don't print slaves or holders"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:4
 msgid "print discard capabilities"
@@ -37709,81 +35045,68 @@ msgid "exclude devices by major number (default: RAM disks)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:6
-#, fuzzy
 msgid "output info about filesystems"
-msgstr "Im lokalen Dateisystem bleiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:7
-#, fuzzy
 msgid "usage information (this)"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:8
 msgid "use ascii characters only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:9
-#, fuzzy
 msgid "output info about permissions"
-msgstr "Ausgabe in zwei Spalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:10
-#, fuzzy
 msgid "don't print headings"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:11
-#, fuzzy
 msgid "output columns"
-msgstr "Ausgabe in zwei Spalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:12
 msgid "use key='value' output format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:13
-#, fuzzy
 msgid "use raw output format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:14
 msgid "output info about topology"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:15
-#, fuzzy
 msgid "use list format ouput"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:1
-#, fuzzy
 msgid "Print both online and offline CPUs"
-msgstr "Zeige Name, Zeile und Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:2
-#, fuzzy
 msgid "Print online CPUs only"
-msgstr "Anzahl Zeilenendzeichen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:3
-#, fuzzy
 msgid "Print offline CPUs only"
-msgstr "Anzahl Zeilenendzeichen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:4
-#, fuzzy
 msgid "Print out an extended readable format"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:5
-#, fuzzy
 msgid "Print out a parseble format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:6
-#, fuzzy
 msgid "Use specified directory as system root"
-msgstr "Angegebenen Schlüssel als Schlüssel zum Signieren verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:7
 msgid "Print hexadecimal masks rather thans lists of CPUs"
@@ -37893,29 +35216,24 @@ msgid "Print size of files"
 msgstr "Größe der Dateien ausgeben"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:28
-#, fuzzy
 msgid "Group directories before files"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:29
-#, fuzzy
 msgid "Do not list implied entries matching specified shell pattern"
-msgstr "Dem Muster entsprechende Einträge übergehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:30
-#, fuzzy
 msgid "Display security context"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:31
-#, fuzzy
 msgid "Display  security  context  so  it fits on most displays"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:32
-#, fuzzy
 msgid "Display only security context and file name"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:33
 msgid "Print author"
@@ -37940,9 +35258,8 @@ msgid "Generate dired output"
 msgstr "dired-Ausgabe erzeugen"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
-#, fuzzy
 msgid "List format"
-msgstr "Langformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:39
 msgid "Long format, full-iso time"
@@ -37953,9 +35270,8 @@ msgid "Don't print group information"
 msgstr "Keine Gruppeninformation ausgeben"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:43
-#, fuzzy
 msgid "Skip entries matching pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:44
 #: /tmp/fish/implicit/share/completions/ls.fish:67
@@ -38035,9 +35351,8 @@ msgid "Causes list selections to be ANDed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:3
-#, fuzzy
 msgid "Use alternative name list file"
-msgstr "namelist-Datei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:4
 msgid "Avoid kernel functions that might block: lstat, readlink, stat"
@@ -38064,9 +35379,8 @@ msgid "use of device cache file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:9
-#, fuzzy
 msgid "select by group (^ - negates)"
-msgstr "Auswahl per Gruppe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:10
 msgid "Convert UIDs to login names"
@@ -38077,18 +35391,16 @@ msgid "Select or exclude processes by pid"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:12
-#, fuzzy
 msgid "Print PPID"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:13
 msgid "Produce terse output (pids only, no header)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:14
-#, fuzzy
 msgid "select by user (^ - negates)"
-msgstr "Auswahl per Benutzer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:1
 msgid "Increase verbosity (show descriptors)"
@@ -38118,52 +35430,44 @@ msgid "Show version of program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:7
-#, fuzzy
 msgid "Show usage and help"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:1
-#, fuzzy
 msgid "Execute string"
-msgstr "Programmlink"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:2
-#, fuzzy
 msgid "Require library"
-msgstr "Parameter anfordern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:3
-#, fuzzy
 msgid "Enter interactive mode after executing script"
-msgstr "Interaktiver Modus nach Ausführung der Befehle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:6
 msgid "Execute stdin and stop handling options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:1
-#, fuzzy
 msgid "Show command executions"
-msgstr "Befehlsnamen eines jeden Jobs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:2
 msgid "Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:3
-#, fuzzy
 msgid "Show the list of installed agents"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:4
-#, fuzzy
 msgid "Start the first matching agent"
-msgstr "Erste zutreffende Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:5
-#, fuzzy
 msgid "Stop the first matching agent"
-msgstr "Erste zutreffende Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:6
 msgid "Stop and start the first matching agent"
@@ -38178,29 +35482,25 @@ msgid "Opens the launchctl daemon file in the default editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:9
-#, fuzzy
 msgid "Service"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:10
 #: /tmp/fish/implicit/share/completions/lunchy.fish:12
-#, fuzzy
 msgid "Persist command"
-msgstr "Prozessbefehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:11
 msgid "Force start (disabled) agents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:1
-#, fuzzy
 msgid "Test if lxc has yet to be given the command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:2
-#, fuzzy
 msgid "Manage configuration."
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:3
 msgid "Copy containers within or in between lxd instances."
@@ -38211,9 +35511,8 @@ msgid "Delete containers or snapshots."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:5
-#, fuzzy
 msgid "Execute the specified command in a container."
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:6
 msgid "Manage files on a container."
@@ -38224,14 +35523,12 @@ msgid "Check if the LXD instance is up."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:8
-#, fuzzy
 msgid "Print help."
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:9
-#, fuzzy
 msgid "Manipulate container images."
-msgstr "Strings manipulieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:10
 msgid "List information on LXD servers and containers."
@@ -38246,14 +35543,12 @@ msgid "Launch a container from a particular image."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:13
-#, fuzzy
 msgid "Lists the available resources."
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:14
-#, fuzzy
 msgid "Prints all the subcommands help."
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:15
 msgid "Monitor activity on the LXD server."
@@ -38264,27 +35559,24 @@ msgid "Move containers within or in between lxd instances."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:17
-#, fuzzy
 msgid "Manage networks."
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:18
 msgid "Changes state of one or more containers to pause."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:19
-#, fuzzy
 msgid "Manage configuration profiles."
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:20
 msgid "Publish containers as images."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:21
-#, fuzzy
 msgid "Manage remote LXD servers."
-msgstr "Datei zum Zugriff auf Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:22
 msgid "Changes state of one or more containers to restart."
@@ -38307,24 +35599,20 @@ msgid "Changes state of one or more containers to stop."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:27
-#, fuzzy
 msgid "Prints the version number of this client tool."
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:1
-#, fuzzy
 msgid "print this help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:2
-#, fuzzy
 msgid "print version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:3
-#, fuzzy
 msgid "use specified profile"
-msgstr "Angegebene Datei ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:4
 msgid "set log level 0-5. 0 - none 5 - chatty"
@@ -38343,9 +35631,8 @@ msgid "Force a 'm4_' prefix to all builtins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:6
-#, fuzzy
 msgid "Suppress some warnings for builtins"
-msgstr "Dateinamenausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:7
 msgid ""
@@ -38369,9 +35656,8 @@ msgid "Undefine NAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:12
-#, fuzzy
 msgid "Suppress all GNU extensions"
-msgstr "Alle GNU-Erweiterungen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:13
 msgid "Set symbol lookup hash table size [509]"
@@ -38414,46 +35700,40 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/machinectl.fish:3
 #: /tmp/fish/implicit/share/completions/systemctl.fish:39
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:3
-#, fuzzy
 msgid "Print a short help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:4
 #: /tmp/fish/implicit/share/completions/pactl.fish:9
 #: /tmp/fish/implicit/share/completions/systemctl.fish:40
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:4
-#, fuzzy
 msgid "Print a short version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:6
 #: /tmp/fish/implicit/share/completions/systemctl.fish:22
-#, fuzzy
 msgid "Do not print header and footer"
-msgstr "Kopfzeile nicht ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:7
 msgid "Don't ask for password for privileged operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:8
-#, fuzzy
 msgid "List running machines"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:9
-#, fuzzy
 msgid "List startable machine images"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:10
 msgid "Also show machines starting with a '.'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:11
-#, fuzzy
 msgid "Show information about machine"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:12
 msgid "Do not ellipsize process tree entries"
@@ -38468,28 +35748,24 @@ msgid "Formatting of journal output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:15
-#, fuzzy
 msgid "Show properties of machines"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:16
-#, fuzzy
 msgid "Limit to certain properties"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:17
 msgid "Show all properties, even if not set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:18
-#, fuzzy
 msgid "Start machine"
-msgstr "Maschinenname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:19
-#, fuzzy
 msgid "Login to a machine"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:20
 msgid "Enable machine to start at boot"
@@ -38500,9 +35776,8 @@ msgid "Disable machine from starting at boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:22
-#, fuzzy
 msgid "Poweroff machine"
-msgstr "Stromausfall"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:23
 msgid "Reboot machine"
@@ -38513,52 +35788,44 @@ msgid "Terminate machine (without shutting down)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:25
-#, fuzzy
 msgid "Send signal to process in a machine"
-msgstr "Adresse an lokale Maschine binden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:26
 msgid "Choose who to send the signal to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:27
-#, fuzzy
 msgid "Signal to send"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:28
-#, fuzzy
 msgid "Bind-mount a directory to a machine"
-msgstr "Adresse an lokale Maschine binden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:29
-#, fuzzy
 msgid "Create destination directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
-#, fuzzy
 msgid "Apply read-only mount"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:31
 msgid "Copy file or directory to a machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:32
-#, fuzzy
 msgid "Copy file or directory from a machine"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:33
-#, fuzzy
 msgid "Open a shell on a machine"
-msgstr "Adresse an lokale Maschine binden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:34
-#, fuzzy
 msgid "Show a list of locally installed machines"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:35
 msgid "Show information about machine images (human-readable)"
@@ -38569,43 +35836,36 @@ msgid "Show properties of machine images (machine-readable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:37
-#, fuzzy
 msgid "Clone a machine image"
-msgstr "Maschinenname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:38
-#, fuzzy
 msgid "Rename a machine image"
-msgstr "Maschinenname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:39
-#, fuzzy
 msgid "Mark or unmark machine image as read-only"
-msgstr "Zwischenspeicherdatenbank schreibschützen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:40
-#, fuzzy
 msgid "Remove machine images"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:41
 msgid "Set size limit for machine image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:42
-#, fuzzy
 msgid "Download a .tar container image"
-msgstr "Nur tar-Datei herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:43
-#, fuzzy
 msgid "Download a .raw container image"
-msgstr "Nur tar-Datei herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:44
-#, fuzzy
 msgid "Download a .dkr container image"
-msgstr "Nur tar-Datei herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:45
 msgid "Import a .tar container image"
@@ -38624,105 +35884,88 @@ msgid "Export a .raw container image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:49
-#, fuzzy
 msgid "Specify compression format"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:50
-#, fuzzy
 msgid "Show running downloads, imports and exports"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:51
 msgid "Abort running downloads, imports or exports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:52
-#, fuzzy
 msgid "Verify image with specified method"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:53
 msgid "Verify image (not available for dkr)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:54
-#, fuzzy
 msgid "Specify index server"
-msgstr "X-Server angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:55
-#, fuzzy
 msgid "Overwrite existing machine image"
-msgstr "Bestehendes Paket aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:1
-#, fuzzy
 msgid "Shows all available URL protocols"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:2
-#, fuzzy
 msgid "Lists all Magento modules"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:3
-#, fuzzy
 msgid "Lists all indexer modes"
-msgstr "Roheinträge ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:4
-#, fuzzy
 msgid "Shows all available packing modes"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:5
 msgid "Shows all IDEs supported by magento"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:6
-#, fuzzy
 msgid "Shows all available magento tests"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:7
-#, fuzzy
 msgid "Shows all available magento theme areas"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:8
 msgid "Shows all existing magento languages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:9
-#, fuzzy
 msgid "Shows all available source theme file types"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:10
-#, fuzzy
 msgid "Shows all available deploy modes"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:11
-#, fuzzy
 msgid "Shows all available cache types"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:12
-#, fuzzy
 msgid "Shows all available verbosity levels"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:13
-#, fuzzy
 msgid "Shows all available output formats"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:14
-#, fuzzy
 msgid "Lists magento commands"
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:15
 msgid "Checks that prompt is not inside of magento command"
@@ -38730,9 +35973,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:16
 #: /tmp/fish/implicit/share/completions/p4.fish:23
-#, fuzzy
 msgid "Checks if prompt is in a specific command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:17
 #: /tmp/fish/implicit/share/completions/p4.fish:24
@@ -38741,37 +35983,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:18
 #: /tmp/fish/implicit/share/completions/p4.fish:25
-#, fuzzy
 msgid "Adds a specific option for a command"
-msgstr "Funktionstasten für Befehle nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:19
 msgid "Checks if a parameter has been given already"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:20
-#, fuzzy
 msgid "Show help for a command"
-msgstr "Hilfe für einen Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:21
-#, fuzzy
 msgid "Do not output any message"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:22
 msgid "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:24
-#, fuzzy
 msgid "Force colored output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:26
-#, fuzzy
 msgid "Don't ask any interactive question"
-msgstr "Ausführung im interaktiven Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:1
 msgid "Define"
@@ -38786,9 +36023,8 @@ msgid "Replace include directories"
 msgstr "include-Verzeichnisse ersetzen"
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:4
-#, fuzzy
 msgid "Append dependencies to makefile"
-msgstr "Modulabhängigkeiten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:5
 msgid "Specify makefile"
@@ -38881,126 +36117,108 @@ msgid "Touch files, don't run commands"
 msgstr "Dateien ändern, keine Befehle ausführen"
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
-#, fuzzy
 msgid "Print working directory"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:21
 msgid "Pretend file is modified"
 msgstr "Vorgegebene Datei wurde geändert"
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:1
-#, fuzzy
 msgid "Ignore missing or incomplete arch field"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:2
 msgid "Clean up work files after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:3
-#, fuzzy
 msgid "Use alternate config <file>"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:4
-#, fuzzy
 msgid "Do not perform dependency checks"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:5
-#, fuzzy
 msgid "Do not extract source files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:6
 msgid "Only perform integrity checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:7
-#, fuzzy
 msgid "Force rebuild of the package"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:8
-#, fuzzy
 msgid "Generate integrity checks"
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:9
-#, fuzzy
 msgid "Do not perform integrity checks"
-msgstr "Integrierten Präprozessor nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:10
-#, fuzzy
 msgid "Do not verify checksums"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:11
-#, fuzzy
 msgid "Do not verify PGP signatures"
-msgstr "Patch-Signatur nicht überprüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:12
-#, fuzzy
 msgid "Display syntax and command line options"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:13
 msgid "No automatic bump of pkgver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:14
-#, fuzzy
 msgid "Install the package after build"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:15
 msgid "Enable makepkg build logging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:16
-#, fuzzy
 msgid "Disable color in output messages"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:17
-#, fuzzy
 msgid "Only download and extract files"
-msgstr "Eine Quelle herunterladen und extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:18
 msgid "Use alternative <buildscript>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:19
-#, fuzzy
 msgid "Remove installed deps after build"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:20
 msgid "Repackage without rebuilding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:21
-#, fuzzy
 msgid "Install missing dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:22
 msgid "Build a source-only tarball for AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:23
-#, fuzzy
 msgid "Display the version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:24
-#, fuzzy
 msgid "Remove the srcdir before building the package"
-msgstr "Vor dem Deinstallieren der Pakete keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:25
 msgid "Build a source-only GPL tarball for AUR"
@@ -39015,23 +36233,20 @@ msgid "Run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:28
-#, fuzzy
 msgid "Do not create the archive"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:29
 msgid "Do not run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:30
-#, fuzzy
 msgid "Sign the resulting package with gpg"
-msgstr "Patch mit Ihrem gpg-Schlüssel signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:31
-#, fuzzy
 msgid "Do not create a signature for the package"
-msgstr "Nicht abbrechen, wenn die Signatur älter als der Schlüssel ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:32
 msgid "Specify a <key> to use when signing"
@@ -39050,19 +36265,16 @@ msgid "Passed to pacman: Install as dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:36
-#, fuzzy
 msgid "Passed to pacman: Do not display a progress bar"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:37
-#, fuzzy
 msgid "List all packages that would be built"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:38
-#, fuzzy
 msgid "Print SRCINFO to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:1
 msgid "Program section"
@@ -39081,9 +36293,8 @@ msgid "Device section"
 msgstr "Geräte-Sektion"
 
 #: /tmp/fish/implicit/share/completions/man.fish:5
-#, fuzzy
 msgid "File format section"
-msgstr "Primäre Auswahl verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:6
 msgid "Games section"
@@ -39126,14 +36337,12 @@ msgid "Pager"
 msgstr "Anzeigeprogramm"
 
 #: /tmp/fish/implicit/share/completions/man.fish:17
-#, fuzzy
 msgid "Manual sections"
-msgstr "Lokale Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:18
-#, fuzzy
 msgid "Display all matches"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:19
 msgid "Always reformat"
@@ -39168,9 +36377,8 @@ msgid "Set system"
 msgstr "System festlegen"
 
 #: /tmp/fish/implicit/share/completions/man.fish:28
-#, fuzzy
 msgid "Preprocessors"
-msgstr "Prozess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:29
 msgid "Format for printing"
@@ -39194,38 +36402,32 @@ msgid "Force color mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:4
-#, fuzzy
 msgid "Specify a different color set"
-msgstr "Satztrenner angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:5
-#, fuzzy
 msgid "Specify a name of skin"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:6
-#, fuzzy
 msgid "Disable mouse support"
-msgstr "Unterstützung für Suspension aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:7
 msgid "Start the internal editor with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:8
-#, fuzzy
 msgid "Display the compiled-in search paths"
-msgstr "Kompressionsrate anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:9
-#, fuzzy
 msgid "Display extended info about compiled-in paths"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:10
-#, fuzzy
 msgid "Display configure options"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:11
 msgid "Reset softkeys to their default"
@@ -39244,9 +36446,8 @@ msgid "Save the ftpfs dialog with the server in FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:15
-#, fuzzy
 msgid "Print the last working directory to FILE"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:16
 msgid "Set alternative mode drawing of frameworks"
@@ -39257,23 +36458,20 @@ msgid "Use the TERMCAP variable for terminal info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:18
-#, fuzzy
 msgid "Disable use of the concurrent shell"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:19
-#, fuzzy
 msgid "Enable use of the concurrent shell"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:20
 msgid "Start the internal viewer with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:21
-#, fuzzy
 msgid "Display the version of the program"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:22
 msgid "Force xterm mode"
@@ -39288,18 +36486,16 @@ msgid "Compute and check message digest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:2
-#, fuzzy
 msgid "Read in binary mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:3
 msgid "Read sums from files and check them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:4
-#, fuzzy
 msgid "Read in text mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:7
 msgid "Warn about improperly formatted checksum lines"
@@ -39310,9 +36506,8 @@ msgid "With --check, exit non-zero for any invalid input"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:9
-#, fuzzy
 msgid "Display help text"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:1
 msgid "Assemble a pre-existing array"
@@ -39323,14 +36518,12 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Select monitor mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:5
 msgid "Change the size or shape of an active array"
@@ -39341,182 +36534,150 @@ msgid "Manage devices in array, and possibly start it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:7
-#, fuzzy
 msgid "Start all auto-detected arrays"
-msgstr "Beschränkter Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:9
-#, fuzzy
 msgid "Display more detailed help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:11
 #: /tmp/fish/implicit/share/completions/obnam.fish:47
 #: /tmp/fish/implicit/share/completions/xrandr.fish:1
-#, fuzzy
 msgid "Be more verbose"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "Löschung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
-#, fuzzy
 msgid "Set metadata style to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:17
 msgid "Provide home host identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:18
-#, fuzzy
 msgid "Give name format preference"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:19
-#, fuzzy
 msgid "Give cluster name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "Satztrenner angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
-#, fuzzy
 msgid "Specify the space to use from each drive"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:23
-#, fuzzy
 msgid "Specify the size made available on the array"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:24
-#, fuzzy
 msgid "Specify the chunk size"
-msgstr "APT-Listenverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
-#, fuzzy
 msgid "Specify RAID level"
-msgstr "X-Server angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "Zeilenlänge angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Specify file for write-intent bitmap"
-msgstr "Port für Weboberfläche angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:29
-#, fuzzy
 msgid "Specify chunksize of bitmap"
-msgstr "Sources.list-Datei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:30
-#, fuzzy
 msgid "Prefer reading from other devices than these"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:31
-#, fuzzy
 msgid "Enable writes on array or device"
-msgstr "Datei ist ein Zeichengerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:32
-#, fuzzy
 msgid "Disable writes on array"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:33
-#, fuzzy
 msgid "Enable write-behind mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:34
 msgid "Assume the array is clean"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:35
-#, fuzzy
 msgid "Use this file as a backup"
-msgstr "Datei als makefile verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:36
-#, fuzzy
 msgid "Specify start of array data"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:37
 msgid "Resume frozen --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Set array name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:39
-#, fuzzy
 msgid "Run array despite warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:40
-#, fuzzy
 msgid "Give instruction for device file"
-msgstr "Aktion für Gerätedateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:41
-#, fuzzy
 msgid "Add devices to array"
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Specify max nodes in the cluster"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
-#, fuzzy
 msgid "Specify journal device for RAID-4/5/6 array"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:44
 msgid "UUID of array to assemble"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Minor number of array device"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:46
 msgid "Refuse to start without all drives"
@@ -39527,38 +36688,32 @@ msgid "Do not ask for backup file, unavailable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update superblock properties"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Freeze --grow command"
-msgstr "Prompt-Befehl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
-#, fuzzy
 msgid "Test mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:51
-#, fuzzy
 msgid "Hot-add listed devices"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:52
 msgid "Re-add a previously removed device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:53
-#, fuzzy
 msgid "Hot-add listed devices as spare"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Remove listed inactive devices"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:55
 msgid "Mark listed devices as faulty"
@@ -39573,56 +36728,48 @@ msgid "Give devices as replacement"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Confirm existence of device"
-msgstr "Aktion für Gerätedateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:59
 msgid "Examine device for md use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:60
-#, fuzzy
 msgid "Print details on array"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Print details on platform capabilities"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:62
 msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:65
-#, fuzzy
 msgid "Print report about bitmap"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
-#, fuzzy
 msgid "List recorded bad blocks"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -39633,28 +36780,24 @@ msgid "Erase possible superblock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:71
-#, fuzzy
 msgid "Delete subarray"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:72
-#, fuzzy
 msgid "Update subarray"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:73
-#, fuzzy
 msgid "Wait for pending operations"
-msgstr "Löschung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:74
 msgid "Mark array as clean ASAP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:75
-#, fuzzy
 msgid "Set sync action for md devices"
-msgstr "Aktion für Gerätedateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:76
 msgid "Rebuild /run/mdadm/map"
@@ -39665,9 +36808,8 @@ msgid "Automatically add eventually appearing device to array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:78
-#, fuzzy
 msgid "Mail address to send alerts to"
-msgstr "Zeiger auf Prozessliste"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:79
 msgid "Program to run in case of an event"
@@ -39698,25 +36840,21 @@ msgid "Check arrays only once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:86
-#, fuzzy
 msgid "Do not move spares between arrays"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:87
-#, fuzzy
 msgid "Be more concise"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:1
 #: /tmp/fish/implicit/share/completions/mdbook.fish:4
-#, fuzzy
 msgid "Prints help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:2
-#, fuzzy
 msgid "Prints version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:3
 msgid "Build book from markdown files"
@@ -39727,9 +36865,8 @@ msgid "Create boilerplate structure and files in directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:6
-#, fuzzy
 msgid "Skip confirmation prompts"
-msgstr "Bestätigung erfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:7
 msgid "Copy default theme into source folder"
@@ -39752,14 +36889,12 @@ msgid "Test that code samples compile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:12
-#, fuzzy
 msgid "Watch file changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:2
-#, fuzzy
 msgid "Ignore unknown options"
-msgstr "Unbekannte Option: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:3
 msgid "Do not reveal the resulting package in the Finder"
@@ -39770,66 +36905,56 @@ msgid "Avoid restricted operations such as heap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:5
-#, fuzzy
 msgid "Skip gathering system.log"
-msgstr "Andere Dateisysteme überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:6
-#, fuzzy
 msgid "Prints version of mddiagnose"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:7
 msgid "Minimal report"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:8
-#, fuzzy
 msgid "Evaluate indexing information for path"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
-#, fuzzy
 msgid "Write the diagnostic to the specified path"
-msgstr "Protokollausgabe auf angegebenen Dateideskriptor schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:1
-#, fuzzy
 msgid "Fetches the value of the specified attribute"
-msgstr "Grössen-Attribute nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:2
 msgid "Query only reports matching items count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:3
-#, fuzzy
 msgid "Search only within given directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:4
 msgid "Query should stay active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:5
-#, fuzzy
 msgid "Search on file name only"
-msgstr "Nur Paketname suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:6
-#, fuzzy
 msgid "Reprint results on live update"
-msgstr "Flaches Profil ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:7
-#, fuzzy
 msgid "Show contents of smart folder"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:8
 msgid "Use NUL (\\0) as a path separator, for use with xargs -0"
@@ -39848,71 +36973,61 @@ msgid "Import files using the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:2
-#, fuzzy
 msgid "Print timing information for this run"
-msgstr "Verlaufsinformationen für ein Modul ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:3
-#, fuzzy
 msgid "Print out the list of all of the attributes and exit"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:4
-#, fuzzy
 msgid "Print out the schema file and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:5
 msgid "Ask the server to reimport files for UTIs claimed by the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:6
-#, fuzzy
 msgid "Print out performance information gathered during the run"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:7
-#, fuzzy
 msgid "Print the list of installed importers and exit"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:8
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:7
-#, fuzzy
 msgid "Print debugging information"
-msgstr "Debug-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:9
 msgid "Dont send the imported attributes to the data store"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:10
-#, fuzzy
 msgid "Wait for the specified interval between scanning files"
-msgstr "Warte angegebenes Sekundenintervall zwischen dem Senden der Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:11
-#, fuzzy
 msgid "Write the imported attributes to a file"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:1
 msgid "Print only the matching metadata attribute value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:2
-#, fuzzy
 msgid "Print raw attribute data"
-msgstr "Roheinträge ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:3
 msgid "Sets a marker string to be used when a requested attribute is null"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:4
-#, fuzzy
 msgid "Output attributes in XML format to file"
-msgstr "rss-Data in Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:1
 msgid "Publish metadata"
@@ -39927,14 +37042,12 @@ msgid "Disable Spotlight activity for volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:4
-#, fuzzy
 msgid "Erase and rebuild index"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:5
-#, fuzzy
 msgid "Print indexing status"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:6
 msgid "Resolve files from file id with an optional volume path or device id"
@@ -39945,14 +37058,12 @@ msgid "Apply command to all volumes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:8
-#, fuzzy
 msgid "Apply command to all stores on the specified volume"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:9
-#, fuzzy
 msgid "Display verbose information"
-msgstr "Inode-Information auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:1
 msgid "Log to standard error as well as files"
@@ -39963,9 +37074,8 @@ msgid "When logging hits line file:N, emit a stack trace (default :0)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:3
-#, fuzzy
 msgid "Write log files in this directory"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:4
 msgid "Log to standard error instead of files"
@@ -39984,11 +37094,8 @@ msgid "Log level for logs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:8
-#, fuzzy
 msgid "Comma-separated list of pattern=N settings for file-filtered logging"
 msgstr ""
-"Komma-getrennte Liste vom Paketinstallationsstatus, die rekursiv verarbeitet "
-"werden"
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:9
 msgid "Disable the addon w/ADDON_NAME within minikube"
@@ -40046,9 +37153,8 @@ msgid "Unsets an individual value in a minikube config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:24
-#, fuzzy
 msgid "Display values currently set in the minikube config file"
-msgstr "Alle derzeit definierten Trap-Handler anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:29
 msgid "Go template format string for the config view output"
@@ -40059,18 +37165,16 @@ msgid "Display the kubernetes dashboard URL instead of opening it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:31
-#, fuzzy
 msgid "Add machine IP to NO_PROXY environment variable"
-msgstr "Behandlung von Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:32
 msgid "Force environment to be configured for a specified shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:33
-#, fuzzy
 msgid "Unset variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:35
 msgid "List the URLs for the services in local cluster"
@@ -40163,9 +37267,8 @@ msgid "The CIDR to be used for the VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:56
-#, fuzzy
 msgid "The KVM network name"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:57
 msgid "The hyperv virtual switch name"
@@ -40177,15 +37280,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:1
 #: /tmp/fish/implicit/share/completions/mix.fish:58
-#, fuzzy
 msgid "Starts all registered apps"
-msgstr "Beschränkter Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:2
 #: /tmp/fish/implicit/share/completions/mix.fish:59
-#, fuzzy
 msgid "Lists all archives"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:3
 #: /tmp/fish/implicit/share/completions/mix.fish:60
@@ -40194,69 +37295,58 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:4
 #: /tmp/fish/implicit/share/completions/mix.fish:61
-#, fuzzy
 msgid "Installs an archive locally"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:5
 #: /tmp/fish/implicit/share/completions/mix.fish:62
-#, fuzzy
 msgid "Uninstalls archives"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:6
 #: /tmp/fish/implicit/share/completions/mix.fish:63
-#, fuzzy
 msgid "Deletes generated application files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:7
 #: /tmp/fish/implicit/share/completions/mix.fish:64
-#, fuzzy
 msgid "Executes the given command"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:8
 #: /tmp/fish/implicit/share/completions/mix.fish:65
-#, fuzzy
 msgid "Compiles source files"
-msgstr "Quellpakete kompilieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:9
 #: /tmp/fish/implicit/share/completions/mix.fish:66
-#, fuzzy
 msgid "Lists dependencies and their status"
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:10
 #: /tmp/fish/implicit/share/completions/mix.fish:67
-#, fuzzy
 msgid "Deletes the given dependencies' files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:11
 #: /tmp/fish/implicit/share/completions/mix.fish:68
-#, fuzzy
 msgid "Compiles dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:12
 #: /tmp/fish/implicit/share/completions/mix.fish:69
-#, fuzzy
 msgid "Gets all out of date dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:13
 #: /tmp/fish/implicit/share/completions/mix.fish:70
-#, fuzzy
 msgid "Unlocks the given dependencies"
-msgstr "Zerstörte Abhängigkeiten korrigieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:14
 #: /tmp/fish/implicit/share/completions/mix.fish:71
-#, fuzzy
 msgid "Updates the given dependencies"
-msgstr "Zwischenspeicher aktualisieren und Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:15
 #: /tmp/fish/implicit/share/completions/mix.fish:72
@@ -40270,15 +37360,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:17
 #: /tmp/fish/implicit/share/completions/mix.fish:74
-#, fuzzy
 msgid "Prints help information for tasks"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:18
 #: /tmp/fish/implicit/share/completions/mix.fish:75
-#, fuzzy
 msgid "Loads and persists the given configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:19
 #: /tmp/fish/implicit/share/completions/mix.fish:76
@@ -40287,9 +37375,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:20
 #: /tmp/fish/implicit/share/completions/mix.fish:77
-#, fuzzy
 msgid "Installs Hex locally"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:21
 #: /tmp/fish/implicit/share/completions/mix.fish:78
@@ -40303,9 +37390,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:23
 #: /tmp/fish/implicit/share/completions/mix.fish:80
-#, fuzzy
 msgid "Creates a new Elixir project"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:24
 #: /tmp/fish/implicit/share/completions/mix.fish:81
@@ -40314,9 +37400,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:25
 #: /tmp/fish/implicit/share/completions/mix.fish:82
-#, fuzzy
 msgid "Runs the given file or expression"
-msgstr "Sektion für Dateiformate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:26
 #: /tmp/fish/implicit/share/completions/mix.fish:83
@@ -40324,24 +37409,20 @@ msgid "Runs a project's tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:27
-#, fuzzy
 msgid "specify input directory"
-msgstr "Indexverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:28
-#, fuzzy
 msgid "specify output file name"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:29
-#, fuzzy
 msgid "skip compilation"
-msgstr "Bestätigung erfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:30
-#, fuzzy
 msgid "Clean everything, including dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:31
 #: /tmp/fish/implicit/share/completions/mix.fish:48
@@ -40372,9 +37453,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:37
-#, fuzzy
 msgid "loads the given configuration file"
-msgstr "Beispiel-Konfigurationsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:38
 msgid "evaluates the given code"
@@ -40393,14 +37473,12 @@ msgid "does not compile even if files require compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:42
-#, fuzzy
 msgid "does not check dependencies"
-msgstr "Zwischenspeicher aktualisieren und Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:43
-#, fuzzy
 msgid "does not halt the system after running the command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:44
 msgid "does not start applications after compilation"
@@ -40423,29 +37501,24 @@ msgid "do not start applications after compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:51
-#, fuzzy
 msgid "disable color in the output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:52
-#, fuzzy
 msgid "enable color in the output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:53
-#, fuzzy
 msgid "include tests that match the filter"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:54
-#, fuzzy
 msgid "exclude tests that match the filter"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:55
-#, fuzzy
 msgid "run only tests that match the filter"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:56
 msgid "seeds the random number generator used to randomize test order"
@@ -40456,9 +37529,8 @@ msgid "set the timeout for the tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:1
-#, fuzzy
 msgid "Output version"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:2
 #: /tmp/fish/implicit/share/completions/mkdir.fish:6
@@ -40472,9 +37544,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:4
 #: /tmp/fish/implicit/share/completions/mkdir.fish:8
-#, fuzzy
 msgid "Print a message for each created directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:9
 msgid ""
@@ -40482,96 +37553,80 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:1
-#, fuzzy
 msgid "Disable alignment"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:2
-#, fuzzy
 msgid "Use Atari variation"
-msgstr "Primäre Auswahl verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:3
 msgid "Select location of backup sector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:4
-#, fuzzy
 msgid "Check for bad blocks"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:5
-#, fuzzy
 msgid "Create file given as device"
-msgstr "Vorgegebene Datei wurde geändert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:6
-#, fuzzy
 msgid "Specify drive number"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:7
-#, fuzzy
 msgid "Specify number of FATs"
-msgstr "Kernel-Version angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:8
-#, fuzzy
 msgid "Specify FAT size"
-msgstr "APT-Listenverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:9
-#, fuzzy
 msgid "Specify number of hidden sectors"
-msgstr "Satztrenner angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:10
-#, fuzzy
 msgid "Specify volume ID"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:11
 msgid "Force to use entire disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:12
-#, fuzzy
 msgid "Read bad blocks list from given file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:13
-#, fuzzy
 msgid "Specify file containing non bootable message"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:14
-#, fuzzy
 msgid "Specify media type"
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:15
-#, fuzzy
 msgid "Specify volume name"
-msgstr "Volume-Namen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:16
 msgid "Specify number of entries available in root directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:17
-#, fuzzy
 msgid "Specify number of reserved sectors"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:18
-#, fuzzy
 msgid "Specify number of sector per cluster"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:19
-#, fuzzy
 msgid "Specify number of bytes per logical sector"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:21
 msgid "Use constants for randomly generated data"
@@ -40590,9 +37645,8 @@ msgid "Set directory as the location where the initramfs is built"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:4
-#, fuzzy
 msgid "Generate a CPIO image as filename"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:5
 msgid "Output help for a hook"
@@ -40607,9 +37661,8 @@ msgid "Use kernelversion, instead of the current running kernel"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:8
-#, fuzzy
 msgid "List all available hooks"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:9
 msgid "Display modules found via autodetection"
@@ -40617,9 +37670,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:10
 #: /tmp/fish/implicit/share/completions/rc-service.fish:4
-#, fuzzy
 msgid "Disable color output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:11
 msgid "Process all presets contained in /etc/mkinitcpio.d"
@@ -40630,9 +37682,8 @@ msgid "Build initramfs image(s) according to specified preset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:13
-#, fuzzy
 msgid "Specifies the root directory to find modules in"
-msgstr "Das Paketdepotverzeichnis angeben, in dem gearbeitet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:14
 msgid "Skip hooks when generating the image"
@@ -40649,32 +37700,28 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:17
 #: /tmp/fish/implicit/share/completions/mvn.fish:34
 #: /tmp/fish/implicit/share/completions/termite.fish:2
-#, fuzzy
 msgid "Display version information"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:19
 msgid "Override the compression method with the compress program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:1
-#, fuzzy
 msgid "Show version information"
-msgstr "apropos-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:3
 msgid "Extract tracks to external files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:4
-#, fuzzy
 msgid "Extract tags as XML"
-msgstr "Auf stdout extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:5
-#, fuzzy
 msgid "Extract attachments"
-msgstr "Aus Archiv extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:6
 msgid "Extract chapters as XML"
@@ -40689,14 +37736,12 @@ msgid "Extract timecodes of a track as timecode v2 file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:9
-#, fuzzy
 msgid "Extract cue information as text file"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:10
-#, fuzzy
 msgid "Parse the whole file instead of relying on the index"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:11
 #: /tmp/fish/implicit/share/completions/rsync.fish:1
@@ -40705,28 +37750,24 @@ msgid "Increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:12
-#, fuzzy
 msgid "Suppress status output"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:13
 msgid "Force the translations for 'code' to be used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:14
-#, fuzzy
 msgid "Charset for strings on the command line"
-msgstr "Festlegen oder Abrufen der Befehlszeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:15
-#, fuzzy
 msgid "Outputs messages in specified charset"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:16
-#, fuzzy
 msgid "Redirect all messages into a file"
-msgstr "Alle Nachrichten an Logdatei anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:17
 msgid "Convert text subtitles to a charset"
@@ -40741,9 +37782,8 @@ msgid "Keep only the BlockAdditions up to the specified level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:20
-#, fuzzy
 msgid "Extract the data to a raw file"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:21
 msgid "Extract the data to a raw file including the CodecPrivate as header"
@@ -40754,15 +37794,13 @@ msgid "Exports the chapter information in a simple format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:23
-#, fuzzy
 msgid "Uses the chapter names of the specified language"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:2
 #: /tmp/fish/implicit/share/completions/yarn.fish:2
-#, fuzzy
 msgid "output the version number"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:3
 msgid "force all tests to take a callback (async) or return a promise"
@@ -40777,23 +37815,20 @@ msgid "force disabling of colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:6
-#, fuzzy
 msgid "enable growl notification support"
-msgstr "Unterstützung für Suspension aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:7
 msgid "<k=v,k2=v2,...>  reporter-specific options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:8
-#, fuzzy
 msgid "specify the reporter to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:9
-#, fuzzy
 msgid "sort test files"
-msgstr "Kommentare in Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:10
 msgid "bail after first test failure"
@@ -40804,18 +37839,16 @@ msgid "enable node's debugger, synonym for node --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:12
-#, fuzzy
 msgid "only run tests matching <pattern>"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:13
 msgid "only run tests containing <string>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:14
-#, fuzzy
 msgid "expose gc extension"
-msgstr "Sortierung nach Erweiterung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:15
 msgid "inverts --grep and --fgrep matches"
@@ -40838,18 +37871,16 @@ msgid "specify user-interface (bdd|tdd|qunit|exports)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:20
-#, fuzzy
 msgid "watch files for changes"
-msgstr "Lokale Änderungen patchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:21
 msgid "check for global variable leaks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:22
-#, fuzzy
 msgid "display the full stack trace"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:23
 msgid "use the given module(s) to compile files"
@@ -40878,18 +37909,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:29
-#, fuzzy
 msgid "include ICU data"
-msgstr "Include-Pfad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:30
 msgid "display actual/expected differences inline within each string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:31
-#, fuzzy
 msgid "display available interfaces"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:32
 msgid "silence deprecation warnings"
@@ -40905,9 +37934,8 @@ msgid "disables timeouts, given implicitly with --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:35
-#, fuzzy
 msgid "specify opts path"
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:36
 msgid "enable perf linux profiler (basic support)"
@@ -40922,14 +37950,12 @@ msgid "Time events including external callbacks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:39
-#, fuzzy
 msgid "include sub directories"
-msgstr "Unterverzeichnisgrösse nicht einschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:40
-#, fuzzy
 msgid "display available reporters"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:41
 msgid "set numbers of time to retry a failed test case"
@@ -40940,61 +37966,52 @@ msgid "throw an exception anytime a deprecated function is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:43
-#, fuzzy
 msgid "trace function calls"
-msgstr "Funktion löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:44
-#, fuzzy
 msgid "show stack traces on deprecations"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:45
-#, fuzzy
 msgid "enforce strict mode"
-msgstr "Beschränkter Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:46
 msgid "additional extensions to monitor with --watch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:47
-#, fuzzy
 msgid "wait for async suite definition"
-msgstr "Funktionsdefinitonsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:1
-#, fuzzy
 msgid "Print program version and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:2
-#, fuzzy
 msgid "Print usage and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:3
 msgid "Turn on logging to a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:4
-#, fuzzy
 msgid "Run only the server"
-msgstr "Optionen für den Schlüsselserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:5
 msgid "Run server in foreground, log to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:6
-#, fuzzy
 msgid "Use the specified sound driver"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:7
-#, fuzzy
 msgid "Start in MusicDir"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:8
 msgid ""
@@ -41007,9 +38024,8 @@ msgid "Add the files given on command line to the queue"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:10
-#, fuzzy
 msgid "Clear the playlist and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:11
 msgid "Start playing from the first item on the playlist"
@@ -41020,9 +38036,8 @@ msgid "Play files given on command line without modifying the playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:13
-#, fuzzy
 msgid "Stop playing"
-msgstr "Abspielliste einrichten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:14
 msgid "Play next song"
@@ -41033,9 +38048,8 @@ msgid "Play previous song"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:16
-#, fuzzy
 msgid "Shutdown the server"
-msgstr "Optionen für den Schlüsselserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:17
 msgid ""
@@ -41043,18 +38057,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:18
-#, fuzzy
 msgid "Use the specified config file instead of the default"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:19
 msgid "NAME=VALUE Override configuration option NAME with VALUE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:20
-#, fuzzy
 msgid "Use the specified MOC directory instead of the default"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:21
 msgid "Pause"
@@ -41085,18 +38097,16 @@ msgid "Use ASCII characters to draw lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:28
-#, fuzzy
 msgid "Print the information about the currently played file"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:29
 msgid "Print the formatted information about the currently played file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:30
-#, fuzzy
 msgid "Alias for -a"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:31
 msgid "Seek by N seconds (can be negative)"
@@ -41107,44 +38117,36 @@ msgid "N{%,s} Jump to some position of the current track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:33
-#, fuzzy
 msgid "Turn on a control"
-msgstr "Steuerung für Warnungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:34
-#, fuzzy
 msgid "Turn off a control"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:35
-#, fuzzy
 msgid "Toggle a control"
-msgstr "Eine Bedingung testen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:1
-#, fuzzy
 msgid "Print only 'author'"
-msgstr "Autor ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:2
-#, fuzzy
 msgid "Print only 'description'"
-msgstr "Funktionsbeschreibung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:3
-#, fuzzy
 msgid "Print only 'license'"
-msgstr "Lizenz ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:4
-#, fuzzy
 msgid "Print only 'parm'"
-msgstr "Kernel-Name ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:5
-#, fuzzy
 msgid "Print only 'filename'"
-msgstr "Dateiname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:6
 msgid "Use \\0 instead of \\n"
@@ -41184,28 +38186,24 @@ msgid "Remove modules"
 msgstr "Module entfernen"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:10
-#, fuzzy
 msgid "Ignore all version information"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:11
-#, fuzzy
 msgid "Ignore version magic information"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:12
 msgid "Ignore module interface version"
 msgstr "Modulschnittstellenversion ignorieren"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:13
-#, fuzzy
 msgid "List all modules matching the given wildcard"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:14
-#, fuzzy
 msgid "Insert modules matching the given wildcard"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:15
 msgid "Restrict wildcards to specified directory"
@@ -41216,9 +38214,8 @@ msgid "Send error messages through syslog"
 msgstr "Fehlermeldungen per syslog senden"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:17
-#, fuzzy
 msgid "Specify kernel version"
-msgstr "X-Server angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:18
 msgid "List dependencies of module"
@@ -41258,9 +38255,8 @@ msgid "Adaptively resize image with data dependent triangulation [geometry]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mogrify.fish:89
-#, fuzzy
 msgid "Automatically orient image"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:10
 msgid "Alternate image colorsapce [type]"
@@ -41372,9 +38368,8 @@ msgid "Use a particular server-side UDP port or port range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:4
-#, fuzzy
 msgid "Mount file systems in fstab"
-msgstr "Dateisystems aus fstab einhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:5
 msgid "Fork process for each mount"
@@ -41393,19 +38388,16 @@ msgid "Do not write mtab"
 msgstr "keine mtab schreiben"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:9
-#, fuzzy
 msgid "Tolerate sloppy mount options"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:10
-#, fuzzy
 msgid "Read only"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:11
-#, fuzzy
 msgid "Read/Write mode"
-msgstr "Lese-/Schreib-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:12
 msgid "Mount partition with specified label"
@@ -41416,9 +38408,8 @@ msgid "Mount partition with specified UID"
 msgstr "Partition mit angegebener UID einhängen"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:14
-#, fuzzy
 msgid "Exclude file systems"
-msgstr "Dateisysteme ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:15
 msgid "Remount a subtree to a second position"
@@ -41429,9 +38420,8 @@ msgid "Move a subtree to a new position"
 msgstr "Teilbaum zu einer neuen Position verschieben"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:17
-#, fuzzy
 msgid "File system"
-msgstr "Dateisystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:18
 msgid "Mount option"
@@ -41499,9 +38489,8 @@ msgid "Override framerate"
 msgstr "Frame-Rate überschreiben"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:20
-#, fuzzy
 msgid "Build index if unavailable"
-msgstr "Indexdateien neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:21
 msgid "Load index from file"
@@ -41516,9 +38505,8 @@ msgid "Rebuild index and save to file"
 msgstr "Index neu erstellen und in Datei speichern"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:24
-#, fuzzy
 msgid "Seek to given time position"
-msgstr "Zeitposition suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:25
 msgid "TV capture mode"
@@ -41551,56 +38539,48 @@ msgid "Audio output"
 msgstr "Audio-Ausgabe"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:1
-#, fuzzy
 msgid "Add specified directory to list for input files search"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:2
-#, fuzzy
 msgid "Generate a Java ResourceBundle class"
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:3
 msgid "Like --java, and assume Java2 (JDK 1.2 or higher)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:4
-#, fuzzy
 msgid "Generate a .NET .dll file"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:5
-#, fuzzy
 msgid "Generate a .NET .resources file"
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:6
-#, fuzzy
 msgid "Generate a tcl/msgcat .msg file"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:7
-#, fuzzy
 msgid "Generate a Qt .qm file"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:9
 msgid "Enable strict Uniforum mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:10
-#, fuzzy
 msgid "Resource name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:11
 msgid "Locale name, either language or language_COUNTRY"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:12
-#, fuzzy
 msgid "Base directory for output"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:13
 msgid "Input files are in Java .properties syntax"
@@ -41638,9 +38618,8 @@ msgid "Check presence of keyboard accelerators for menu items"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:21
-#, fuzzy
 msgid "Use fuzzy entries in output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:22
 msgid "Alignment"
@@ -41655,9 +38634,8 @@ msgid "Print statistics about translations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:27
-#, fuzzy
 msgid "Increase verbosity level"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:1
 #: /tmp/fish/implicit/share/completions/mutt.fish:16
@@ -41670,23 +38648,20 @@ msgid "Specify a blind-carbon-copy (BCC) recipient"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:3
-#, fuzzy
 msgid "Print the value of all configuration options to stdout"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:5
-#, fuzzy
 msgid "Bypass the system configuration file"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:6
 msgid "Resume a postponed message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:7
-#, fuzzy
 msgid "Open a mailbox in read-only mode"
-msgstr "Ordner nur zum Lesen öffnen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:8
 msgid "Display the Mutt version number and compile-time definitions"
@@ -41721,9 +38696,8 @@ msgid "Run command after processing of initialization files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:18
-#, fuzzy
 msgid "Specify which mailbox to load"
-msgstr "sendmail-Befehl angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:19
 msgid "Specify an initialization file to read instead of ~/.muttrc"
@@ -41734,24 +38708,20 @@ msgid "Specify a draft file containing header and body for the message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:21
-#, fuzzy
 msgid "Specify a file to include into the body of a message"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:22
-#, fuzzy
 msgid "Specify a default mailbox type"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:23
-#, fuzzy
 msgid "Query a configuration variables value"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:24
-#, fuzzy
 msgid "Specify the subject of the message"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:1
 msgid "Make backup of each existing destination file"
@@ -41792,9 +38762,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:3
-#, fuzzy
 msgid "Run in non-interactive (batch) mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:4
 msgid "The id of the build strategy to use."
@@ -41816,14 +38785,12 @@ msgid "Ineffective, only kept for backward compatibility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:8
-#, fuzzy
 msgid "Define a system property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:9
-#, fuzzy
 msgid "Produce execution error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:10
 msgid "Encrypt master security password"
@@ -41856,9 +38823,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:17
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:5
-#, fuzzy
 msgid "Display help information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:18
 msgid "Log file to where all build output will go."
@@ -41871,9 +38837,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:20
-#, fuzzy
 msgid "Do not recurse into sub-projects"
-msgstr "Variable nicht an Unterprozess exportieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:23
 msgid "Suppress SNAPSHOT updates"
@@ -41895,9 +38860,8 @@ msgid "Quiet output - only show errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:27
-#, fuzzy
 msgid "Resume reactor from specified project"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:28
 msgid "Alternate path for the user settings file"
@@ -41922,9 +38886,8 @@ msgid "Display version information WITHOUT stopping build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:35
-#, fuzzy
 msgid "Produce execution debug output"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:36
 msgid "Comma-delimited list of profiles to activate"
@@ -41947,9 +38910,8 @@ msgid "Run surefire tests with debugging on port 5005"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:41
-#, fuzzy
 msgid "Skip Javadoc generation"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:42
 msgid ""
@@ -41988,14 +38950,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:48
-#, fuzzy
 msgid "Installs the artifact in the remote repository."
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:49
-#, fuzzy
 msgid "Deploys an artifact to remote repository."
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:50
 msgid ""
@@ -42024,9 +38984,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:55
-#, fuzzy
 msgid "Installs a file in the local repository."
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:56
 msgid ""
@@ -42232,19 +39191,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:92
-#, fuzzy
 msgid "Generate a changelog report."
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:93
-#, fuzzy
 msgid "Generate a file activity report."
-msgstr "Gepunkteten Graph generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:94
-#, fuzzy
 msgid "Generate a developer activity report."
-msgstr "Gepunkteten Graph generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:95
 msgid ""
@@ -42536,9 +39492,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:147
-#, fuzzy
 msgid "Generates the project index page."
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:148
 msgid "Generates the Project Issue Tracking report."
@@ -42601,9 +39556,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:161
-#, fuzzy
 msgid "Generate Ant build files."
-msgstr "Inhaltsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:162
 msgid "Clean all Ant build files."
@@ -42675,9 +39629,8 @@ msgid "Build a JAR from the current Archetype project."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:173
-#, fuzzy
 msgid "Updates the local catalog"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:174
 msgid ""
@@ -42852,9 +39805,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:194
-#, fuzzy
 msgid "Displays the list of dependencies for this project."
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:195
 msgid ""
@@ -42877,9 +39829,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:198
-#, fuzzy
 msgid "Goal that resolves the project dependencies from the repository."
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:199
 msgid ""
@@ -42891,9 +39842,8 @@ msgid "Goal that resolves the project source dependencies from the repository."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:201
-#, fuzzy
 msgid "Displays the dependency tree for this project."
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:202
 msgid ""
@@ -43047,9 +39997,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:228
-#, fuzzy
 msgid "Apply one or more patches to project sources."
-msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:229
 msgid ""
@@ -43096,9 +40045,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:237
-#, fuzzy
 msgid "Generates a HelpMojo class."
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:238
 msgid ""
@@ -43220,23 +40168,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:254
-#, fuzzy
 msgid "Display the modification status of the files in the configured scm url."
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:255
-#, fuzzy
 msgid "Branch the project."
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:256
 msgid "Validate scm connection string."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:257
-#, fuzzy
 msgid "Commit changes to the configured scm url."
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:258
 msgid ""
@@ -43251,9 +40196,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:260
-#, fuzzy
 msgid "Add a file set to the project."
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:261
 msgid "Mark a set of files for deletion."
@@ -43274,14 +40218,12 @@ msgid "Get a fresh copy of the latest source from the configured scm url."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:265
-#, fuzzy
 msgid "Tag the project."
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:266
-#, fuzzy
 msgid "Edit/lock a set of files."
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:267
 msgid "This mojo will fail the build if there is any local modifications"
@@ -43326,9 +40268,8 @@ msgid "Empty goal, provided only to set loose the lifecycle."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:276
-#, fuzzy
 msgid "Copies artifacts from one repository to another repository."
-msgstr "Patches von diesem Paketdepot auf ein anderes kopieren und anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:277
 msgid ""
@@ -43386,19 +40327,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:285
-#, fuzzy
 msgid "Generates MyEclipse configuration files"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:286
-#, fuzzy
 msgid "Deletes configuration files used by MyEclipse"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:287
-#, fuzzy
 msgid "Generates the rad-6 configuration files."
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:288
 msgid ""
@@ -43407,9 +40345,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:289
-#, fuzzy
 msgid "Removes the not-available marker files from the repository."
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:290
 msgid ""
@@ -43661,9 +40598,8 @@ msgid "Weaves all main classes."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:335
-#, fuzzy
 msgid "Create eclipse configuration of aspectJ"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:336
 msgid ""
@@ -44489,9 +41425,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:477
-#, fuzzy
 msgid "Prints the configuration settings."
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:478
 msgid "Creates the HTML report for a test run based on XSLT."
@@ -44638,9 +41573,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:500
-#, fuzzy
 msgid "Add more resource directories to the POM."
-msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:501
 msgid "Store the maven core version in a property maven.version."
@@ -44651,9 +41585,8 @@ msgid "Attach additional artifacts to be installed and deployed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:503
-#, fuzzy
 msgid "Add test source directories to the POM."
-msgstr "Quellverzeichnisse bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:504
 msgid ""
@@ -44684,14 +41617,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:508
-#, fuzzy
 msgid "Add more source directories to the POM."
-msgstr "Quellverzeichnisse bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:509
-#, fuzzy
 msgid "Add more test resource directories to the POM."
-msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:510
 msgid ""
@@ -44775,9 +41706,8 @@ msgid "Runs nodetool repair on a Cassandra instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:526
-#, fuzzy
 msgid "Executes cql statements from maven."
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:528
 msgid "Runs nodetool flush on a Cassandra instance."
@@ -45001,9 +41931,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:567
-#, fuzzy
 msgid "Display all available licenses."
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:568
 msgid "Displays all the available comment style to box file headers."
@@ -45113,9 +42042,8 @@ msgid "Executes SQL against a database."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:585
-#, fuzzy
 msgid "List all files in the archive."
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:586
 msgid ""
@@ -45132,9 +42060,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:588
-#, fuzzy
 msgid "Remove a set of files from an existing archive."
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:589
 msgid "Copy a set of files in and out of an existing archive."
@@ -45247,9 +42174,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:610
-#, fuzzy
 msgid "Sets the parent version to the latest parent version."
-msgstr "Abhängigkeiten an makefile anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:611
 msgid "Sets properties to the latest versions of specific artifacts."
@@ -45273,9 +42199,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:615
 #: /tmp/fish/implicit/share/completions/mvn.fish:618
-#, fuzzy
 msgid "Replaces any version with the latest version."
-msgstr "Einen aufgezeichneten Patch mit einer besseren Version ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:616
 msgid ""
@@ -45322,9 +42247,8 @@ msgid "Move files from a virtual file system to another"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:626
-#, fuzzy
 msgid "Remove files from a virtual file system"
-msgstr "Dateien nach Archivierung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:627
 msgid ""
@@ -45353,9 +42277,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:631
 #: /tmp/fish/implicit/share/completions/mvn.fish:643
-#, fuzzy
 msgid "Closes a Nexus staging repository."
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:632
 msgid ""
@@ -45424,9 +42347,8 @@ msgid "Starts the App Engine development server and does not wait."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:646
-#, fuzzy
 msgid "Start the specified backend."
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:647
 msgid "Stops the App Engine development server."
@@ -45437,9 +42359,8 @@ msgid "Roll back a previously in-progress update."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:649
-#, fuzzy
 msgid "Start the specified module version."
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:650
 msgid "Change the default version, but more gently than set_default_version."
@@ -45458,9 +42379,8 @@ msgid "Debug the specified VM Runtime instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:654
-#, fuzzy
 msgid "Set the default serving version."
-msgstr "Alle Rechte extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:655
 msgid "Runs the datanucleus enhancer."
@@ -45490,9 +42410,8 @@ msgid "Runs the App Engine development server."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:661
-#, fuzzy
 msgid "Delete the specified backend."
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:662
 msgid "Update the specified backend or all backends."
@@ -45507,9 +42426,8 @@ msgid "Update application task queue definitions."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:665
-#, fuzzy
 msgid "Stop the specified module version."
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:666
 msgid "Rollback an in-progress update."
@@ -45524,9 +42442,8 @@ msgid "App Engine endpoints get-discovery-doc command."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:669
-#, fuzzy
 msgid "Stop the specified backend."
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:670
 msgid "Creates an Android Archive (aar) file. "
@@ -45900,9 +42817,8 @@ msgid "Finishes a hotfix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:728
-#, fuzzy
 msgid "Finishes a feature branch"
-msgstr "Zeilen nach EOF sind leer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:729
 msgid ""
@@ -45910,9 +42826,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:730
-#, fuzzy
 msgid "Starts a release"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:731
 msgid "Starts a feature branch"
@@ -45937,70 +42852,60 @@ msgid "Run an executable archive application."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:1
-#, fuzzy
 msgid "displays this help text"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:3
 msgid "show mount point directories with a 'D'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:4
-#, fuzzy
 msgid "show the mode bits of each file"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:5
-#, fuzzy
 msgid "show owner and group name of each file"
-msgstr "Befehlsnamen eines jeden Jobs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:6
 msgid "use a long listing format (-m -o -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:7
-#, fuzzy
 msgid "don't follow symlinks"
-msgstr "Symbolischen Links nicht folgen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:8
 msgid "vertical align of modes and owners"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:1
-#, fuzzy
 msgid "Perform the reverse operation"
-msgstr "Inhaltsgenerierung durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:2
-#, fuzzy
 msgid "Specifies the name of the character encoding"
-msgstr "Standardzeichensatz festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:3
 msgid "Pass \"option\" to JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:2
-#, fuzzy
 msgid "Quiet mode. Refresh interval 2 seconds"
-msgstr "Minimalintervall in Sekunden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:4
-#, fuzzy
 msgid "Same filesystem"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:6
-#, fuzzy
 msgid "Exclude files that match any pattern in file"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
-#, fuzzy
 msgid "List all available profiles for automatic selection"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:4
 msgid "Start automatic profile selection on interface"
@@ -46027,57 +42932,48 @@ msgid "Enable all profiles for automatic selection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:10
-#, fuzzy
 msgid "Disable all profiles for automatic selection"
-msgstr "Automatische Pufferzuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:11
-#, fuzzy
 msgid "Check whether specified profile is active"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:12
 msgid "Check whether specified profile is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:3
-#, fuzzy
 msgid "List available profiles"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:4
 msgid "Save which profiles are active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:5
-#, fuzzy
 msgid "Load saved profiles"
-msgstr "Index aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:6
-#, fuzzy
 msgid "Stops all profiles"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:7
-#, fuzzy
 msgid "Start a profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:8
-#, fuzzy
 msgid "Stop a profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:9
-#, fuzzy
 msgid "Restart a profile"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:10
-#, fuzzy
 msgid "Switch to a profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:11
 msgid "Show runtime status of a profile"
@@ -46100,29 +42996,25 @@ msgid "Check whether the unit is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:16
-#, fuzzy
 msgid "Open the specified profile in an editor"
-msgstr "Die auf der Befehlszeile angegebene Datei verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nextd.fish:1
 #: /tmp/fish/implicit/share/completions/prevd.fish:1
-#, fuzzy
 msgid "Also print directory history"
-msgstr "Auch Verzeichnisverlauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nice.fish:2
 msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "Jokerzeichen auf angegebenes Verzeichnis beschränken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
-#, fuzzy
 msgid "specify build file [default=build.ninja]"
-msgstr "Erstellungsverzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:3
 msgid "dry run"
@@ -46133,9 +43025,8 @@ msgid "show all command lines while building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:5
-#, fuzzy
 msgid "number of jobs to run in parallel [default derived from CPUs]"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:6
 msgid "do not start if load average > N"
@@ -46146,18 +43037,16 @@ msgid "keep going until N jobs fail [default=1]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:9
-#, fuzzy
 msgid "enable debugging, specify debug mode"
-msgstr "Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:10
 msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -46176,9 +43065,8 @@ msgid "use STYLE for numbering header lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:5
-#, fuzzy
 msgid "line number increment at each line"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:6
 msgid "group of NUMBER empty lines counted as one"
@@ -46209,47 +43097,40 @@ msgid "add STRING after (possible) line number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:13
-#, fuzzy
 msgid "first line number on each logical page"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:14
 msgid "use NUMBER columns for line numbers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:1
-#, fuzzy
 msgid "Output is terse"
-msgstr "Ausgabeverfolgung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:2
-#, fuzzy
 msgid "Output is pretty"
-msgstr "mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:3
 msgid "Switch between tabular and multiline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:4
-#, fuzzy
 msgid "Whether to use colors in output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:5
-#, fuzzy
 msgid "Specify the output fields"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:6
-#, fuzzy
 msgid "Whether to escape \":\" and \"\\"
-msgstr "Hashes auf der Platte prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:1
-#, fuzzy
 msgid "Display debugger-only symbols"
-msgstr "Debug-Informationen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:2
 #: /tmp/fish/implicit/share/completions/nm.fish:10
@@ -46257,27 +43138,24 @@ msgid "Print name of the input file before every symbol"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:3
-#, fuzzy
 msgid "Do not demangle low-level symbol names"
-msgstr "From-Feld aus E-Mail-Kopfzeilen nicht verstümmeln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:4
 msgid "Display dynamic symbols instead of normal symbols"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:5
-#, fuzzy
 msgid "Display only defined symbols"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:6
 msgid "Use the output format FORMAT. The default is \"bsd\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:7
-#, fuzzy
 msgid "Display only external symbols"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:8
 msgid ""
@@ -46285,47 +43163,40 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:9
-#, fuzzy
 msgid "Sort symbols numerically by address"
-msgstr "Numerische Adresse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:11
-#, fuzzy
 msgid "Do not sort the symbols"
-msgstr "Unterstützung für schwache Symbole nich verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:12
 msgid "Same as --format=posix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:13
-#, fuzzy
 msgid "Reverse the sense of the sort"
-msgstr "Bedeutung der Treffer umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:14
-#, fuzzy
 msgid "Load the specified plugin"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:15
-#, fuzzy
 msgid "Print size of defined symbols"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:16
 msgid "Include index for symbols from archive members"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:17
-#, fuzzy
 msgid "Sort symbols by size"
-msgstr "Nach Größe sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:18
-#, fuzzy
 msgid "Include special symbols in the output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:19
 msgid "Display synthetic symbols as well"
@@ -46340,34 +43211,28 @@ msgid "Specify the target object format as BFDNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:22
-#, fuzzy
 msgid "Display only undefined symbols"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:23
-#, fuzzy
 msgid "Display this information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:24
-#, fuzzy
 msgid "Display this program's version number"
-msgstr "Sektion für Dateiformate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
-#, fuzzy
 msgid "Print node's version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:2
-#, fuzzy
 msgid "Evaluate script"
-msgstr "Datei auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:3
-#, fuzzy
 msgid "Print result of --eval"
-msgstr "Flaches Profil ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:4
 msgid "Always enter the REPL even if stdin does not appear to be a terminal"
@@ -46378,18 +43243,16 @@ msgid "Silence deprecation warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:6
-#, fuzzy
 msgid "Show stack traces on deprecations"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:7
 msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -47138,18 +44001,16 @@ msgid "Minimal logging (no API, code, GC, suspect, or handles samples)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:175
-#, fuzzy
 msgid "Log all events to the log file"
-msgstr "Alle Nachrichten in Logdatei speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:176
 msgid "Activate runtime system %Log call"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:177
-#, fuzzy
 msgid "Log API events to the log file"
-msgstr "Alle Nachrichten in Logdatei speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:178
 msgid "Log code events to the log file without profiling"
@@ -47168,9 +44029,8 @@ msgid "log positions of (de)serialized objects in the snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:182
-#, fuzzy
 msgid "Log suspect operations"
-msgstr "Einhäng-Option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:183
 msgid "Log statistical profiling information (implies --log-code)"
@@ -47200,9 +44060,8 @@ msgid "Update sliding state window counters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:189
-#, fuzzy
 msgid "Specify the name of the log file"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:190
 msgid "Enable low-level linux profiler"
@@ -47213,76 +44072,63 @@ msgid "Complete the commandline using npm's 'completion' tool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:2
-#, fuzzy
 msgid "Manipulates package's cache"
-msgstr "Paketcache automatisch generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:3
-#, fuzzy
 msgid "Add the specified package to the local cache"
-msgstr "Angegebene Datei zur aktuellen Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:4
 msgid "Delete  data  out of the cache folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:5
-#, fuzzy
 msgid "Show the data in the cache"
-msgstr "Pakete im Zwischenspeicher anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:6
-#, fuzzy
 msgid "Manage the npm configuration files"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:7
 #: /tmp/fish/implicit/share/completions/npm.fish:14
-#, fuzzy
 msgid "Sets the config key to the value"
-msgstr "Verbindungszeitüberschreitung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:8
 #: /tmp/fish/implicit/share/completions/npm.fish:13
-#, fuzzy
 msgid "Echo the config value to stdout"
-msgstr "Eigentümervertrauenswerte auf Standardausgabe schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:9
-#, fuzzy
 msgid "Deletes the key from all configuration files"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:10
 #: /tmp/fish/implicit/share/completions/npm.fish:11
-#, fuzzy
 msgid "Show all the config settings"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:12
-#, fuzzy
 msgid "Opens the config file in an editor"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:15
-#, fuzzy
 msgid "install a package"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:16
-#, fuzzy
 msgid "Save to devDependencies in package.json"
-msgstr "Abhängigkeiten der Pakete nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:17
-#, fuzzy
 msgid "Save to dependencies in package.json"
-msgstr "Abhängigkeiten der Pakete nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:18
-#, fuzzy
 msgid "Install package globally"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:19
 #: /tmp/fish/implicit/share/completions/pkg.fish:25
@@ -47290,9 +44136,8 @@ msgstr "Pakete erneut installieren"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:24
 #: /tmp/fish/implicit/share/completions/prt-get.fish:84
 #: /tmp/fish/implicit/share/completions/yum.fish:29
-#, fuzzy
 msgid "List installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:20
 msgid ""
@@ -47300,58 +44145,48 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:21
-#, fuzzy
 msgid "Show information in JSON format"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:22
-#, fuzzy
 msgid "Show extended information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:23
 msgid "Show parseable output instead of tree view"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:24
-#, fuzzy
 msgid "Max display depth of the dependency tree"
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:25
-#, fuzzy
 msgid "Manage package owners"
-msgstr "Gehaltene Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:26
-#, fuzzy
 msgid "List package owners"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:27
-#, fuzzy
 msgid "Add a new owner to package"
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:28
-#, fuzzy
 msgid "Remove an owner from package"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:29
-#, fuzzy
 msgid "remove package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:30
-#, fuzzy
 msgid "remove global package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:31
-#, fuzzy
 msgid "Package will be removed from your dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:32
 msgid "Package will be removed from your devDependencies"
@@ -47368,51 +44203,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:36
-#, fuzzy
 msgid "Update package(s)"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:37
-#, fuzzy
 msgid "Update global package(s)"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:38
 msgid "Add a registry user account"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:39
-#, fuzzy
 msgid "Display npm bin folder"
-msgstr "Debug-Informationen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:40
 msgid "Bugs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:41
-#, fuzzy
 msgid "Reduce duplication"
-msgstr "Nicht doppelte Zeilen entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:42
-#, fuzzy
 msgid "Deprecate a version of a package"
-msgstr "Version des Quellpaketes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:43
 msgid "Docs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:44
-#, fuzzy
 msgid "Edit an installed package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:45
-#, fuzzy
 msgid "Browse an installed package"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:46
 msgid "Frequently Asked Questions"
@@ -47427,97 +44255,80 @@ msgid "View registry info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:50
-#, fuzzy
 msgid "Symlink a package folder"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:51
-#, fuzzy
 msgid "Check for outdated packages"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:52
-#, fuzzy
 msgid "Create a tarball from a package"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:53
-#, fuzzy
 msgid "Display NPM prefix"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:54
-#, fuzzy
 msgid "Remove extraneous packages"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:55
-#, fuzzy
 msgid "Publish a package"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:57
-#, fuzzy
 msgid "Display npm root"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:58
 msgid "Run arbitrary package scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:59
-#, fuzzy
 msgid "Lock down dependency versions"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:60
-#, fuzzy
 msgid "Mark your favorite packages"
-msgstr "Quellpakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:61
 msgid "View packages marked as favorites"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:62
-#, fuzzy
 msgid "Start a package"
-msgstr "Paket löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:63
-#, fuzzy
 msgid "Stop a package"
-msgstr "Informationen über ein Paket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:64
-#, fuzzy
 msgid "Add a package as a git submodule"
-msgstr "Einem Modul eine symbolische Markierung hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:65
-#, fuzzy
 msgid "Test a package"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:66
-#, fuzzy
 msgid "Remove a package from the registry"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:67
-#, fuzzy
 msgid "Remove star from a package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:68
-#, fuzzy
 msgid "Bump a package version"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:69
-#, fuzzy
 msgid "Display npm username"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nvram.fish:1
 msgid "Use  XML  format  for  reading  and  writing variables"
@@ -47540,121 +44351,100 @@ msgid "Delete all of the firmware variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:1
-#, fuzzy
 msgid "Display archive header information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:2
-#, fuzzy
 msgid "Display contents of the overall file header"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:3
 msgid "Display object format specific file header contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:4
-#, fuzzy
 msgid "Display object format specific contents"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:5
-#, fuzzy
 msgid "Display contents of section headers"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:6
-#, fuzzy
 msgid "Display content of section headers"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:7
-#, fuzzy
 msgid "Display the contents of all headers"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:8
-#, fuzzy
 msgid "Display assembler contents of executable sections"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:9
-#, fuzzy
 msgid "Display assembler contents of all sections"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:10
 msgid "Intermix source code with disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:11
-#, fuzzy
 msgid "Display full contents of all sections requested"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:12
-#, fuzzy
 msgid "Display debug information in object file"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:13
-#, fuzzy
 msgid "Display debug information using ctags style"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:14
-#, fuzzy
 msgid "Display (in raw form) any STABS info in file"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:15
-#, fuzzy
 msgid "Display DWARF info in file"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:16
-#, fuzzy
 msgid "Display contents of symbol table(s)"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:17
-#, fuzzy
 msgid "Display contents of dynamic symbol table"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:18
-#, fuzzy
 msgid "Display relocation entries in file"
-msgstr "Einträge in Zip-Datei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:19
-#, fuzzy
 msgid "Display dynamic relocation entries in file"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:20
-#, fuzzy
 msgid "Display version number"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:21
 msgid "List object formats and architectures supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:23
-#, fuzzy
 msgid "Specify target object format"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:24
-#, fuzzy
 msgid "Specify target architecture"
-msgstr "http-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:25
-#, fuzzy
 msgid "Only display information for given section"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:26
 msgid "Pass given options on to disassembler"
@@ -47681,9 +44471,8 @@ msgid "Add given directory to search list from source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:32
-#, fuzzy
 msgid "Include line numbers and filenames in output"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:33
 msgid "Include file offsets when displaying information"
@@ -47722,9 +44511,8 @@ msgid "Don't display hex alongside symbolic disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:42
-#, fuzzy
 msgid "Display specified number of bytes on single line for -d"
-msgstr "Zeilennummer für jede Zeile anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:43
 msgid "Add offset to all displayed section address"
@@ -47743,68 +44531,56 @@ msgid "Strip initial directory names for -S"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:47
-#, fuzzy
 msgid "Do not display DIEs at given depth or greater"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:48
-#, fuzzy
 msgid "Display DIEs starting with given number"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:49
 msgid "Make additional dwarf internal consistency checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:1
-#, fuzzy
 msgid "Add a key to the repository"
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:2
-#, fuzzy
 msgid "Backup data to repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:3
-#, fuzzy
 msgid "List clients and their keys in the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:4
-#, fuzzy
 msgid "List clients using the repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:5
-#, fuzzy
 msgid "Show difference between two generations"
-msgstr "Unterschiede zwischen Revisionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:6
-#, fuzzy
 msgid "Dump (some) data structures from a repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:7
-#, fuzzy
 msgid "Force a locked repository to be open"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:8
-#, fuzzy
 msgid "Forget (remove) specified backup generations"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:9
-#, fuzzy
 msgid "Verify internal consistency of backup repository"
-msgstr "Das ganze Paketdepot prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:10
-#, fuzzy
 msgid "List backup generations for client"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:11
 msgid "List generation ids for client"
@@ -47815,57 +44591,48 @@ msgid "Print help, including hidden subcommands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:14
-#, fuzzy
 msgid "List contents of a generation in kdirstat cache format"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:15
-#, fuzzy
 msgid "List error codes and explanations"
-msgstr "Keine Erklärungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:16
-#, fuzzy
 msgid "List available repository formats"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:17
 msgid "List keys and repository toplevels they are used in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:18
-#, fuzzy
 msgid "List repository toplevel directories and their keys"
-msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:19
-#, fuzzy
 msgid "List contents of a generation"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:20
 msgid "Mount a backup repository as a FUSE filesystem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:21
-#, fuzzy
 msgid "Check if the most recent generation is recent enough"
-msgstr "Die aktuellste Version ohne Fehler suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:22
-#, fuzzy
 msgid "Remove client and its key from repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:23
-#, fuzzy
 msgid "Remove a key from the repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:24
-#, fuzzy
 msgid "Restore some or all files from a generation"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:25
 msgid "Verify that live data and backed up data match"
@@ -47880,47 +44647,40 @@ msgid "Do not restore setuid/setgid bits in restored files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:28
-#, fuzzy
 msgid "Use CHECKSUM algorithm"
-msgstr "MAC-Algorithmus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:29
-#, fuzzy
 msgid "Name of client"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:30
-#, fuzzy
 msgid "Compress repository with"
-msgstr "Auf Standardausgabe komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:31
 msgid "For --nagios-last-backup-age: maximum age"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:32
-#, fuzzy
 msgid "Dump metadata about files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:33
-#, fuzzy
 msgid "Do not dump metadata about files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
-#, fuzzy
 msgid "Generate man page"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
 msgid "Which generation to restore"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:36
-#, fuzzy
 msgid "Show this help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:37
 msgid "Policy for what generations to keep when forgetting."
@@ -47931,19 +44691,16 @@ msgid "Wait TIMEOUT seconds for an existing lock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:39
-#, fuzzy
 msgid "Write output to FILE instead of STDOUT"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:40
-#, fuzzy
 msgid "Do not actually change anything"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:41
-#, fuzzy
 msgid "Actually commit changes"
-msgstr "Änderungen zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:42
 msgid "Show only errors, no progress updates"
@@ -47954,23 +44711,20 @@ msgid "Show errors and progress updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:44
-#, fuzzy
 msgid "Name of backup repository"
-msgstr "Defektes Paketdepot reparieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:45
-#, fuzzy
 msgid "Use FORMAT for new repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:46
 msgid "Where to restore / mount to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:48
-#, fuzzy
 msgid "Do not be verbose"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:49
 msgid "Verify N files randomly from the backup"
@@ -47978,9 +44732,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:50
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:72
-#, fuzzy
 msgid "Show version number and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:51
 msgid "For nagios-last-backup-age: maximum age"
@@ -47991,23 +44744,20 @@ msgid "Make a checkpoint after a given SIZE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:53
-#, fuzzy
 msgid "Deduplicate mode"
-msgstr "Lese-/Schreib-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:54
 msgid "REGEXP for pathnames to exclude"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:55
-#, fuzzy
 msgid "Exclude directories tagged as cache"
-msgstr "Verzeichnisse nach Quelle durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:56
-#, fuzzy
 msgid "Include directories tagged as cache"
-msgstr "include-Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:57
 #: /tmp/fish/implicit/share/completions/rsync.fish:77
@@ -48027,14 +44777,12 @@ msgid "Omit checkpoint generations at the end of backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:61
-#, fuzzy
 msgid "Do not follow mount points"
-msgstr "Lange Zeilen nicht umbrechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:62
-#, fuzzy
 msgid "Follow mount points"
-msgstr "Einhängepunkt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:63
 msgid "What to backup"
@@ -48049,34 +44797,28 @@ msgid "No not put small files into the B-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:66
-#, fuzzy
 msgid "Add FILE to config files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
-#, fuzzy
 msgid "Write out the current configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:68
-#, fuzzy
 msgid "Write out setting names"
-msgstr "Prompt ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:69
-#, fuzzy
 msgid "Show all options"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:70
-#, fuzzy
 msgid "List config files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:71
-#, fuzzy
 msgid "Clear list of configuration files to read"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:72
 msgid "Artificially crash the program after COUNTER files"
@@ -48087,9 +44829,8 @@ msgid "Pretend it is TIMESTAMP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:74
-#, fuzzy
 msgid "Simulate failures for files that match REGEXP"
-msgstr "Dem REGEXP entsprechende Patche auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:75
 msgid "FILENAME pattern for trace debugging"
@@ -48100,19 +44841,16 @@ msgid "PGP key with which to encrypt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:77
-#, fuzzy
 msgid "Home directory for GPG"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:78
-#, fuzzy
 msgid "Show additional user IDs"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:79
-#, fuzzy
 msgid "Do not show additional user IDs"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:80
 msgid "PGP key id"
@@ -48123,14 +44861,12 @@ msgid "Size of symmetric key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:82
-#, fuzzy
 msgid "Use /dev/urandom instead of /dev/random"
-msgstr "purge anstelle von remove verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:83
-#, fuzzy
 msgid "Use default /dev/random"
-msgstr "purge anstelle von remove verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:84
 msgid "fsck should try to fix problems"
@@ -48141,91 +44877,74 @@ msgid "fsck should not try to fix problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:86
-#, fuzzy
 msgid "Ignore chunks when checking integrity"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:87
-#, fuzzy
 msgid "Check chunks when checking integrity"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:88
-#, fuzzy
 msgid "Do not check data for cient NAME"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
-#, fuzzy
 msgid "Check only the last generation"
-msgstr "Inhaltsgenerierung durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:90
 #: /tmp/fish/implicit/share/completions/obnam.fish:100
-#, fuzzy
 msgid "Check all generations"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
-#, fuzzy
 msgid "fsck should remove unused chunks"
-msgstr "Quellpakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:93
-#, fuzzy
 msgid "Do not check checksums of files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:94
-#, fuzzy
 msgid "Check checksums of files"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:95
-#, fuzzy
 msgid "Do not check directories"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
-#, fuzzy
 msgid "Check directories"
-msgstr "Verzeichnisse rekursiv durchlaufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
-#, fuzzy
 msgid "Do not check files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:98
-#, fuzzy
 msgid "Check files"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:99
-#, fuzzy
 msgid "Do not check any generations"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:101
-#, fuzzy
 msgid "Do not check per-client B-trees"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:102
-#, fuzzy
 msgid "Check per-client B-trees"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:103
-#, fuzzy
 msgid "Do not check shared B-trees"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:104
-#, fuzzy
 msgid "Check shared B-trees"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:105
 msgid "Write log to FILE or syslog"
@@ -48272,9 +44991,8 @@ msgid "Chunk id level size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:116
-#, fuzzy
 msgid "Depth of chunk id mapping"
-msgstr "Tiefe der Aufrufkette"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:117
 msgid "Chunk id mapping lowest bits skip"
@@ -48313,9 +45031,8 @@ msgid "Use only paramiko, no openssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:126
-#, fuzzy
 msgid "Use openssh if available"
-msgstr "Index erstellen, wenn nicht vorhanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:127
 msgid "Executable to be used instead of \"ssh\""
@@ -48334,28 +45051,24 @@ msgid "FILENAME of the known_hosts file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:1
-#, fuzzy
 msgid "Produce no output to stderr"
-msgstr "Audio-Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:2
-#, fuzzy
 msgid "Print this help text"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:3
-#, fuzzy
 msgid "Print the version number"
-msgstr "Zeilennummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:4
 msgid "Set bits/sample for raw input. Default is 16"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:5
-#, fuzzy
 msgid "Set number of channels for raw input"
-msgstr "Anzahl der Audiokanäle festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:6
 msgid "Set samples/sec for raw input"
@@ -48374,9 +45087,8 @@ msgid "Enable the bitrate management engine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:10
-#, fuzzy
 msgid "Specify a minimum bitrate (in kbps)"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:11
 msgid "Specify a maximum bitrate in kbps"
@@ -48387,18 +45099,16 @@ msgid "option=value Sets an advanced encoder option to the given value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:13
-#, fuzzy
 msgid "Specify quality"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:14
 msgid "Resample input data to sampling rate n (Hz)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:15
-#, fuzzy
 msgid "Specify a serial number for the stream"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:16
 msgid ""
@@ -48415,9 +45125,8 @@ msgid "Produce filenames as this string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:19
-#, fuzzy
 msgid "Remove the specified characters from parameters"
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:20
 msgid "Replace characters removed by --name-remove"
@@ -48428,57 +45137,49 @@ msgid "Add the given string as an extra comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:22
-#, fuzzy
 msgid "Date for track"
-msgstr "Format festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:23
-#, fuzzy
 msgid "Track number"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:24
 msgid "Title of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:25
-#, fuzzy
 msgid "Name of album"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:26
-#, fuzzy
 msgid "Name of artist"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:27
 msgid "Genre of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:1
-#, fuzzy
 msgid "Display the manual for an OPAM command."
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:2
 #: /tmp/fish/implicit/share/completions/opam.fish:58
-#, fuzzy
 msgid "Show version information."
-msgstr "apropos-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:4
 msgid "Compatibility mode with OPAM 1.0"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:5
-#, fuzzy
 msgid "Print debug message on stdout."
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:6
-#, fuzzy
 msgid "Print the git version if it exists and exit."
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:7
 msgid "Do not use the external aspcud solver, even if available."
@@ -48489,9 +45190,8 @@ msgid "Do not install base packages (useful for testing purposes)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:9
-#, fuzzy
 msgid "Be quiet when installing a new compiler."
-msgstr "Ein neues Paket erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:10
 msgid "Use ROOT as the current root path."
@@ -48508,9 +45208,8 @@ msgid "Use SWITCH as the current compiler switch."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:13
-#, fuzzy
 msgid "Be more verbose."
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:14
 msgid ""
@@ -48519,23 +45218,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:15
-#, fuzzy
 msgid "Display configuration options for packages."
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:16
-#, fuzzy
 msgid "Enable all the global and user configuration options."
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:17
 msgid "Use csh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:18
-#, fuzzy
 msgid "Name of the configuration file to update instead of ~/."
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:19
 msgid "Backward-compatible option, equivalent to opam config env."
@@ -48546,14 +45242,12 @@ msgid "Use fish-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:21
-#, fuzzy
 msgid "Enable all the global configuration options."
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:22
-#, fuzzy
 msgid "List the current configuration."
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:23
 msgid "Do not load the auto-completion scripts in the environment."
@@ -48568,23 +45262,20 @@ msgid "Modify ~/. profile (or ~/."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:27
-#, fuzzy
 msgid "Recursive query."
-msgstr "Rekursive Kopie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:28
-#, fuzzy
 msgid "Display environment variables as an s-expression."
-msgstr "TERM Umgebungsvariable nicht gesetzt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:29
 msgid "Use sh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:30
-#, fuzzy
 msgid "Enable all the user configuration options."
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:31
 msgid "Use zsh-compatible mode for configuring OPAM.  DOMAINS."
@@ -48635,81 +45326,68 @@ msgid "returns assembly compile options."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:41
-#, fuzzy
 msgid "returns bytecode linking options."
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:42
 msgid "Prints a summary of your setup, useful for bug-reports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:43
-#, fuzzy
 msgid "Display help about OPAM and OPAM commands."
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:44
 msgid "Initialize OPAM state."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:45
-#, fuzzy
 msgid "Install a list of packages."
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:46
-#, fuzzy
 msgid "Display the list of available packages."
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:47
-#, fuzzy
 msgid "Pin a given package to a specific version."
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:48
-#, fuzzy
 msgid "Reinstall a list of packages."
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:49
-#, fuzzy
 msgid "Remove a list of packages."
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:50
-#, fuzzy
 msgid "Manage OPAM repositories."
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:51
-#, fuzzy
 msgid "Search into the package list."
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:52
-#, fuzzy
 msgid "Display information about specific packages."
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:53
 msgid "Manage multiple installation of compilers."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:54
-#, fuzzy
 msgid "Update the list of available packages."
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:55
-#, fuzzy
 msgid "Upgrade the installed package to latest version."
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:56
-#, fuzzy
 msgid "Administration tool for local repositories."
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:57
 msgid "Show this help in format FMT (pager, plain or groff)."
@@ -48720,32 +45398,28 @@ msgid "Check a local repo for errors."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:60
-#, fuzzy
 msgid "Add external dependencies."
-msgstr "Nach zusätzlichen Abhängigkeiten fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:61
 msgid "Initialize a repo for serving files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:62
-#, fuzzy
 msgid "Compute statistics."
-msgstr "Zwischenspeicherstatistik anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:5
-#, fuzzy
 msgid "Prints the list of all defined branches on the server"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:6
 msgid "Lists perforce users suitable for list of completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:7
-#, fuzzy
 msgid "Lists current user's workspaces"
-msgstr "Fehler aus Paketen auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:8
 msgid "Lists all changelists for current user"
@@ -48758,23 +45432,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:10
-#, fuzzy
 msgid "Lists all changelists with *shelved* files"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:11
-#, fuzzy
 msgid "Lists p4 commands"
-msgstr "Nach Spalten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:12
 msgid "Lists environment variables that can be consumed by perforce"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:13
-#, fuzzy
 msgid "Lists all of available file modes"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:17
 msgid "Values for --parallel option in various commands"
@@ -48875,14 +45546,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:43
-#, fuzzy
 msgid "Displays the version of the p4 application and exits."
-msgstr "Version und unterstützte Algorithmen anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:44
-#, fuzzy
 msgid "Displays basic usage information and exits."
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:3
@@ -48897,87 +45566,74 @@ msgid "Query the files database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:13
-#, fuzzy
 msgid "(AUR) Search for packages"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:14
-#, fuzzy
 msgid "(AUR) Show info for packages"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:15
 msgid "(AUR) Clone the packages' build files and build them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:16
-#, fuzzy
 msgid "(AUR) Clone build files, build and install packages"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:17
-#, fuzzy
 msgid "(AUR) Check foreign packages for updates"
-msgstr "Angegebenes Paket von Aktualisierung ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:18
-#, fuzzy
 msgid "(AUR) Update foreign packages"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:19
 msgid "(AUR) Clone the packages' build files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:20
-#, fuzzy
 msgid "Download dependencies recursively"
-msgstr "Dep und rdep rekursiv"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:29
 #: /tmp/fish/implicit/share/completions/pacman.fish:20
 #: /tmp/fish/implicit/share/completions/yaourt.fish:26
-#, fuzzy
 msgid "Hook file directory"
-msgstr "Datei ist ein Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:32
 msgid "Apply only for AUR targets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:33
-#, fuzzy
 msgid "Apply only for specified repo"
-msgstr "Für angegebene Benutzerkennung verschlüsseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:34
-#, fuzzy
 msgid "Edit build files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:35
-#, fuzzy
 msgid "Do not edit build files"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:36
-#, fuzzy
 msgid "Always rebuild packages"
-msgstr "Erstellte Pakete löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:37
-#, fuzzy
 msgid "Redirect output to the log in the clone directory"
-msgstr "Ausgabe auf Datei umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:38
 msgid "Point at a domain other than the default aur.archlinux.org"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:39
-#, fuzzy
 msgid "Use devel packages"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:40
 msgid "Ignore all results marked as out of date"
@@ -48996,16 +45652,14 @@ msgid "Sort descending by key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:44
-#, fuzzy
 msgid "Search by field"
-msgstr "Felder auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:81
 #: /tmp/fish/implicit/share/completions/pacman.fish:59
 #: /tmp/fish/implicit/share/completions/yaourt.fish:80
-#, fuzzy
 msgid "Also downgrade packages"
-msgstr "Fehler bei Downgrade-Paketen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:86
 #: /tmp/fish/implicit/share/completions/pacman.fish:64
@@ -49022,9 +45676,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/yaourt.fish:94
 #: /tmp/fish/implicit/share/completions/yaourt.fish:95
 #: /tmp/fish/implicit/share/completions/yaourt.fish:99
-#, fuzzy
 msgid "List files owned by given packages"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:90
@@ -49035,9 +45688,8 @@ msgstr "Dateien im Paket auflisten"
 #: /tmp/fish/implicit/share/completions/yaourt.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:97
 #: /tmp/fish/implicit/share/completions/yaourt.fish:100
-#, fuzzy
 msgid "Search packages for matching files"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:91
 #: /tmp/fish/implicit/share/completions/pacman.fish:69
@@ -49048,48 +45700,41 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:94
 #: /tmp/fish/implicit/share/completions/pacman.fish:72
 #: /tmp/fish/implicit/share/completions/yaourt.fish:101
-#, fuzzy
 msgid "Search for packages that include the given files"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:103
-#, fuzzy
 msgid "Show in machine readable format"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman.fish:74
 msgid "Show in machine readable format: repo\\0pkgname\\0pkgver\\0path\\n"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:1
-#, fuzzy
 msgid "Add or update keys from <file>"
-msgstr "Cookies aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:2
-#, fuzzy
 msgid "Use an alternate config <file>"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:3
-#, fuzzy
 msgid "Remove the <keys> from the keyring"
-msgstr "Entferne Schlüssel vom öffentlichen Schlüsselring"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:4
-#, fuzzy
 msgid "Export <keys> to stdout"
-msgstr "Auf stdout extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:5
 msgid "Present a menu on specified <keys>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:6
-#, fuzzy
 msgid "List a fingerprint for each specified <key>"
-msgstr "Zeigt alle Dateien in jedem gewählten Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:7
 msgid "Alternate home <dir> for GnuPG"
@@ -49112,19 +45757,16 @@ msgid "Initialize the keyring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:12
-#, fuzzy
 msgid "Use the specified <keyserver>"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:13
-#, fuzzy
 msgid "Lists all or specified <keys> from the keyring"
-msgstr "Alle oder angegebene Schlüssel aus allen Schlüsselringen exportieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:14
-#, fuzzy
 msgid "Same as --list-keys, but with signatures"
-msgstr "Entspricht --list-keys, aber auch die Signaturen werden angezeigt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:15
 msgid "Locally sign the given <key>"
@@ -49151,9 +45793,8 @@ msgid "Verify the given <signature> file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:21
-#, fuzzy
 msgid "Displays the program version"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacmd.fish:1
 msgid "Resume"
@@ -49168,76 +45809,64 @@ msgid "Show statistics about memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:2
-#, fuzzy
 msgid "Show info about the daemon"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:3
-#, fuzzy
 msgid "Show all loaded things of the specified type"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:4
-#, fuzzy
 msgid "Show shorter output"
-msgstr "Stopp durch Terminalausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:5
 msgid "Ask the daemon to exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:6
-#, fuzzy
 msgid "Upload a file to the sample cache"
-msgstr "Datei zum Speichern des Quellenzwischenspeichers auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:7
-#, fuzzy
 msgid "Play a sample from the cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:8
-#, fuzzy
 msgid "Remove a sample from the cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:10
-#, fuzzy
 msgid "Print help text and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:1
 msgid "Set an alternate database location"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:2
-#, fuzzy
 msgid "Colorize output"
-msgstr "breite Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:3
 msgid "Limit the depth of recursion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:4
-#, fuzzy
 msgid "Generate output for graphviz's dot"
-msgstr "Punktierte Ausgabe für Pakete erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:5
-#, fuzzy
 msgid "Display this help message"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:6
-#, fuzzy
 msgid "Enable linear output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:7
-#, fuzzy
 msgid "Show reverse dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:8
 msgid "Search sync DBs instead of local"
@@ -49248,9 +45877,8 @@ msgid "Show dependencies with no duplicates (implies -l)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:10
-#, fuzzy
 msgid "Set an alternate configuration file"
-msgstr "Globale Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:1
 msgid ""
@@ -49271,9 +45899,8 @@ msgid "Prefix pref to a file name when generating its simple backup file name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:5
-#, fuzzy
 msgid "Read and write all files in binary mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:6
 msgid "Interpret the patch file as a ordinary context diff"
@@ -49318,9 +45945,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:16
-#, fuzzy
 msgid "Read the patch from patchfile"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:17
 msgid ""
@@ -49354,9 +45980,8 @@ msgid "Use style word to quote output names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:24
-#, fuzzy
 msgid "Put rejects into rejectfile instead of the default .rej file"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:25
 msgid "Assume that this patch was created with the old and new files swapped"
@@ -49377,18 +46002,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:29
-#, fuzzy
 msgid "Interpret the patch file as a unified context diff"
-msgstr "3 Zeilen des vereinheitlichten Kontextes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:31
 msgid "Use method to determine backup file names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:32
-#, fuzzy
 msgid "Output extra information about the work being done"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:33
 msgid "Set internal debugging flags of interest only to patch patchers"
@@ -49411,14 +46034,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:1
-#, fuzzy
 msgid "Use the ABS tree"
-msgstr "Keinen unberührten Baum verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:2
-#, fuzzy
 msgid "Set the desired package architecture"
-msgstr "Datei zum Speichern des Paketzwischenspeichers auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:3
 msgid "Search the AUR"
@@ -49429,19 +46050,16 @@ msgid "Only search the AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:5
-#, fuzzy
 msgid "Set the output directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:6
-#, fuzzy
 msgid "Display this message"
-msgstr "Alle Übereinstimmungen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:7
-#, fuzzy
 msgid "Search for upgradable packages"
-msgstr "Nur aktualisierbare Pakete ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:8
 msgid "Search the ABS testing branches"
@@ -49488,9 +46106,8 @@ msgid "Keep text in content stream order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:11
-#, fuzzy
 msgid "Generate simple HTML file"
-msgstr "Masterdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:12
 msgid "Generate XHTML bounding boxes"
@@ -49501,9 +46118,8 @@ msgid "Sets encoding for the output [UTF-8]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:14
-#, fuzzy
 msgid "Lists the available encodings"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:15
 msgid "Sets the end-of-line convention"
@@ -49514,31 +46130,26 @@ msgid "Don't insert page breaks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:17
-#, fuzzy
 msgid "Specify owner password for the PDF"
-msgstr "Proxy-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:18
-#, fuzzy
 msgid "Specify user password for the PDF"
-msgstr "Proxy-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:19
 #: /tmp/fish/implicit/share/completions/xpdf.fish:28
-#, fuzzy
 msgid "Don't print any messages or errors"
-msgstr "Keine Fortsetzung bei Fehlern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:20
-#, fuzzy
 msgid "Print copyright and version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:21
 #: /tmp/fish/implicit/share/completions/xpdf.fish:31
-#, fuzzy
 msgid "Print usage information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:1
 #: /tmp/fish/implicit/share/completions/ruby.fish:1
@@ -49614,18 +46225,16 @@ msgstr "Debug-Option"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:18
 #: /tmp/fish/implicit/share/completions/ruby.fish:6
-#, fuzzy
 msgid "Execute command"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:19
 msgid "Execute command, enable optional features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
-#, fuzzy
 msgid "Disable sitecustomize.pl"
-msgstr "Cookie-Benutzung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:21
 #: /tmp/fish/implicit/share/completions/ruby.fish:8
@@ -49648,14 +46257,12 @@ msgid "Automatic line ending processing"
 msgstr "Automatische Zeilenende-Verarbeitung"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:26
-#, fuzzy
 msgid "Require module"
-msgstr "Datei erfordern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:27
-#, fuzzy
 msgid "Use module"
-msgstr "Unsicherer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:28
 #: /tmp/fish/implicit/share/completions/ruby.fish:12
@@ -49685,49 +46292,41 @@ msgid "Unsafe mode"
 msgstr "Unsicherer Modus"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:37
-#, fuzzy
 msgid "Display configuration and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:38
-#, fuzzy
 msgid "Show warnings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:39
-#, fuzzy
 msgid "Force warnings"
-msgstr "Warnungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:40
-#, fuzzy
 msgid "Disable warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:41
 #: /tmp/fish/implicit/share/completions/ruby.fish:21
-#, fuzzy
 msgid "Extract script"
-msgstr "Datei auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:1
 msgid "Show a filter parameter by modifier"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:2
-#, fuzzy
 msgid "Flush filter params specified by mod"
-msgstr "Nur angegebene Anzahl Zeichen vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
-#, fuzzy
 msgid "Output delimiter"
-msgstr "Ausgabebegrenzer festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:2
 msgid "List the process name as well as the process ID"
@@ -49742,9 +46341,8 @@ msgid "Open file"
 msgstr "Datei öffnen"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:4
-#, fuzzy
 msgid "Start in folder index"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:5
 msgid "Initial set of keystrokes"
@@ -49771,14 +46369,12 @@ msgid "Set global configuration file"
 msgstr "Globale Konfigurationsdatei festlegen"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:12
-#, fuzzy
 msgid "Restricted mode"
-msgstr "Beschränkter Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:13
-#, fuzzy
 msgid "Enable suspension support"
-msgstr "Unterstützung für Suspension aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:14
 msgid "Produce a sample global configuration file"
@@ -49869,9 +46465,8 @@ msgstr ""
 "angeschlossenen Schnittstelle senden"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:19
-#, fuzzy
 msgid "Specifies the number of data bytes to be sent"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:20
 msgid "Set socket buffer size"
@@ -49906,9 +46501,8 @@ msgid "Time to wait for a response, in seconds"
 msgstr "Zeit zum Warten auf eine Antwort, in Sekunden"
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:1
-#, fuzzy
 msgid "produce long format output for the specified USERs"
-msgstr "Protokollausgabe auf angegebenen Dateideskriptor schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:2
 msgid "omit the user's home directory and shell in long format"
@@ -49943,58 +46537,49 @@ msgid "omit the user's full name, remote host and idle time in short format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:1
-#, fuzzy
 msgid "failsafe to overwrite"
-msgstr "Protokoll in Datei, überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:2
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:3
-#, fuzzy
 msgid "Turn on stats"
-msgstr "Steuerung für Warnungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:3
-#, fuzzy
 msgid "Automated package installation"
-msgstr "Paket-Installationsreihenfolge nicht ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:1
-#, fuzzy
 msgid "Upgrade"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:2
 msgid "Force installation, overwriting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:1
-#, fuzzy
 msgid "Print versions of the specified libraries"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:2
-#, fuzzy
 msgid "Display the version of pkg-config and quit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:3
-#, fuzzy
 msgid "Displays a help message and quit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:4
-#, fuzzy
 msgid "Print message when errors occur"
-msgstr "Nachrichten über den Programmablauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:5
 msgid "Stay quiet when errors occur"
@@ -50013,9 +46598,8 @@ msgid "This prints the -I part of \"--cflags\"."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:10
-#, fuzzy
 msgid "Print link flags"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:11
 msgid "This prints the -L/-R part of \"--libs\"."
@@ -50038,14 +46622,12 @@ msgid "Returns a list of all variables defined in the package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:16
-#, fuzzy
 msgid "Return success if any -uninstalled packages are used"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:17
-#, fuzzy
 msgid "Test if a package has at most the specified version"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:18
 msgid "Test if a package has at least this version"
@@ -50056,9 +46638,8 @@ msgid "Test if a package has exactly this version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:20
-#, fuzzy
 msgid "Test if a package exists"
-msgstr "Paketintegrität verifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:21
 msgid "Output libraries suitable for static linking"
@@ -50069,23 +46650,20 @@ msgid "List all modules found in the pkg-config path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:23
-#, fuzzy
 msgid "List all modules the given packages provides"
-msgstr "Eigenschaften auflisten, die dieses Paket bereitstellt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:24
-#, fuzzy
 msgid "List all modules the given packages requires"
-msgstr "Eigenschaften auflisten, die dieses Paket bereitstellt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:25
 msgid "List all modules the given packages requires for static linking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:2
-#, fuzzy
 msgid "Delete unsed deps"
-msgstr "Auswahl löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:3
 msgid "only show files in a {s}bin/ directory. Works with -s, -l"
@@ -50096,39 +46674,32 @@ msgid "make searches case sensitive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:5
-#, fuzzy
 msgid "allow the use of * and ? as wildcards"
-msgstr "Erweitern Sie das Muster nicht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:6
-#, fuzzy
 msgid "allow the use of regex in searches"
 msgstr ""
-"Niemals die Benutzung des angegebenen Verschlüsselungsalgorithmus zulassen"
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:7
-#, fuzzy
 msgid "search only in the specified repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:8
-#, fuzzy
 msgid "enable verbose output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:9
-#, fuzzy
 msgid "provides information about the package owning a file"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:10
 msgid "list files of a given package; similar to \"pacman -Ql\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:11
-#, fuzzy
 msgid "search which package owns a file"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:12
 msgid ""
@@ -50137,19 +46708,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:2
-#, fuzzy
 msgid "Show debug information"
-msgstr "whatis-Information anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:3
-#, fuzzy
 msgid "List subcommands"
-msgstr "Nach Spalten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:4
-#, fuzzy
 msgid "Set configuration option"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:5
 msgid "Run sanity test"
@@ -50164,14 +46732,12 @@ msgid "Run package manager within chroot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:8
-#, fuzzy
 msgid "Install packages in specified root"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:9
-#, fuzzy
 msgid "Use configuration file"
-msgstr "Konfigurationsdatei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:10
 msgid "Set repository configuration directory"
@@ -50186,81 +46752,67 @@ msgid "Use IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:13
-#, fuzzy
 msgid "Display help for command"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:14
-#, fuzzy
 msgid "Install package file"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:15
-#, fuzzy
 msgid "Modify annotations on packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:16
-#, fuzzy
 msgid "Audit installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:17
-#, fuzzy
 msgid "Delete unneeded packages"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:18
 msgid "Dump package database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:19
-#, fuzzy
 msgid "Check installed packages"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:20
-#, fuzzy
 msgid "Clean local cache"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:21
-#, fuzzy
 msgid "Convert package from pkg_add format"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:22
-#, fuzzy
 msgid "Create a package"
-msgstr "Paket löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:23
 #: /tmp/fish/implicit/share/completions/pkg.fish:31
-#, fuzzy
 msgid "Remove a package"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:24
-#, fuzzy
 msgid "Download a remote package"
-msgstr "Eine Quelle herunterladen und extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:26
 #: /tmp/fish/implicit/share/completions/zypper.fish:3
 #: /tmp/fish/implicit/share/completions/zypper.fish:18
-#, fuzzy
 msgid "Install packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:27
-#, fuzzy
 msgid "Prevent package modification"
-msgstr "Paketname/Distribution ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:28
-#, fuzzy
 msgid "List package manager plugins"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:29
 #: /tmp/fish/implicit/share/completions/rpm.fish:95
@@ -50268,29 +46820,24 @@ msgid "Query installed packages"
 msgstr "Installierte Pakete abfragen"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:30
-#, fuzzy
 msgid "Register a package in a database"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:32
-#, fuzzy
 msgid "Create package repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:33
-#, fuzzy
 msgid "Query information for remote repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:34
-#, fuzzy
 msgid "Find packages"
-msgstr "Pakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:35
-#, fuzzy
 msgid "Modify package information in database"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:36
 msgid "Open a SQLite shell"
@@ -50301,36 +46848,32 @@ msgid "Display packages linking to shared library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:38
-#, fuzzy
 msgid "Display package statistics"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:39
 msgid "Stop preventing package modification"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:40
-#, fuzzy
 msgid "Update remote repositories"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:41
 msgid "Display UPDATING entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:43
-#, fuzzy
 msgid "Show package versions"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:44
 msgid "Check which package provides a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:45
-#, fuzzy
 msgid "Mark packages as automatic"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:46
 msgid "Force installation even when installed"
@@ -50338,206 +46881,171 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:47
 #: /tmp/fish/implicit/share/completions/pkg.fish:61
-#, fuzzy
 msgid "Disable installation scripts"
-msgstr "Pseudo-tty-Zuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:48
 #: /tmp/fish/implicit/share/completions/pkg.fish:62
-#, fuzzy
 msgid "Force installation with missing dependencies"
-msgstr "Keine Abhängigkeiten prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:49
-#, fuzzy
 msgid "Force quiet output"
-msgstr "Erzwungene Beendigung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:50
-#, fuzzy
 msgid "Do not make changes"
-msgstr "Änderungen nicht zusammenfassen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:51
-#, fuzzy
 msgid "Assume yes when asked for confirmation"
-msgstr "Nach Bestätigung fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:52
-#, fuzzy
 msgid "Delete all cached packages"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:53
-#, fuzzy
 msgid "Delete all installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:54
-#, fuzzy
 msgid "Case sensitive packages"
-msgstr "Erstellte Pakete löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:55
-#, fuzzy
 msgid "Disable deinstallation scripts"
-msgstr "Pseudo-tty-Zuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:56
-#, fuzzy
 msgid "Force package removal"
-msgstr "Gehaltene Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:57
 msgid "Treat the package name as shell glob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:58
-#, fuzzy
 msgid "Case insensitive packages"
-msgstr "Groß-/Klein-Schreibung nicht unterscheiden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:59
-#, fuzzy
 msgid "Remove recursively"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:60
 msgid "Treat the package name as regular expression"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:63
-#, fuzzy
 msgid "Do not perform actual installation"
-msgstr "Vor der Installation nicht auf ausreichenden Plattenplatz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:64
-#, fuzzy
 msgid "Reinstall packages required by this package"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:65
-#, fuzzy
 msgid "Use only a given repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:66
-#, fuzzy
 msgid "Do not automatically update database"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:67
 msgid "Force a full download of a repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:2
-#, fuzzy
 msgid "Package whose files to list"
-msgstr "Dateien vor dem Löschen umpacken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:3
-#, fuzzy
 msgid "Print the package owning file matching pattern"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:4
-#, fuzzy
 msgid "Print footprint for file"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:5
-#, fuzzy
 msgid "Specify alternative installation root"
-msgstr "installroot-Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:6
-#, fuzzy
 msgid "Print version of pkgutils"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:1
-#, fuzzy
 msgid "Install with pkgadd after build"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:2
 msgid "Upgrade with pkgadd after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:3
-#, fuzzy
 msgid "Search and build packages recursively"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:4
-#, fuzzy
 msgid "Download the sources"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:5
-#, fuzzy
 msgid "Only download the sources"
-msgstr "Quelle nicht herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:6
-#, fuzzy
 msgid "Check if the package is uptodate"
-msgstr "Angegebenes Paket von Aktualisierung ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:39
 #: /tmp/fish/implicit/share/completions/prt-get.fish:98
-#, fuzzy
 msgid "Update footprint"
-msgstr "Spiegelliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:40
 #: /tmp/fish/implicit/share/completions/prt-get.fish:99
-#, fuzzy
 msgid "Ignore footprint"
-msgstr "Fehler ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:37
 #: /tmp/fish/implicit/share/completions/prt-get.fish:96
-#, fuzzy
 msgid "Update md5sum"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:38
 #: /tmp/fish/implicit/share/completions/prt-get.fish:97
-#, fuzzy
 msgid "Ignore md5sum"
-msgstr "Gross-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:11
-#, fuzzy
 msgid "Do not strip executables"
-msgstr "Skripte ausführbar machen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:36
 #: /tmp/fish/implicit/share/completions/prt-get.fish:95
-#, fuzzy
 msgid "Force rebuild"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:13
-#, fuzzy
 msgid "Remove package and sources"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:14
-#, fuzzy
 msgid "Keep working dir"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:15
-#, fuzzy
 msgid "Use another config"
-msgstr "Muster aus Datei nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgrm.fish:1
 msgid "Package to remove"
@@ -50567,14 +47075,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:6
-#, fuzzy
 msgid "Displays help information"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:7
-#, fuzzy
 msgid "Prints the version and exits"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:1
 msgid "run 'make config' for all ports (overrides -G)."
@@ -50617,9 +47123,8 @@ msgid "recurse dependencies thoroughly, using all-depends-list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:11
-#, fuzzy
 msgid "verbose output."
-msgstr "Ausführlicher Prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:12
 msgid "save old shared libraries before deinstall [-R]… [See Man Page]"
@@ -50630,9 +47135,8 @@ msgid "interactive update mode -- ask whether to rebuild ports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:14
-#, fuzzy
 msgid "no cleaning of distfiles."
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:15
 msgid "always clean distfiles."
@@ -50667,9 +47171,8 @@ msgid "use the INDEX for status, but double-check with the port."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:23
-#, fuzzy
 msgid "do not try to use /usr/ports."
-msgstr "Nicht versuchen, den GnuPG-Agenten zu nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:24
 msgid "delete ports that are build-only dependencies a… [See Man Page]"
@@ -50688,18 +47191,16 @@ msgid "fail if no package is available."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:28
-#, fuzzy
 msgid "use packages for all build dependencies."
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:29
 msgid "use package if newer than installed even if the… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:30
-#, fuzzy
 msgid "fetch package even if it already exists locally."
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:31
 msgid "where local packages can be found, will fall ba… [See Man Page]"
@@ -50746,33 +47247,28 @@ msgid "answer yes to all user prompts for the features… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:42
-#, fuzzy
 msgid "display help message."
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:43
 msgid "display the version number El ENVIRONMENT The d… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:44
-#, fuzzy
 msgid "Ports Directory"
-msgstr "Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:45
-#, fuzzy
 msgid "Installed Package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:1
-#, fuzzy
 msgid "Update ports"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:2
-#, fuzzy
 msgid "List ports"
-msgstr "Zu importierendes Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:3
 msgid "List version diffs between local and installed ports"
@@ -50799,14 +47295,12 @@ msgid "Just write wtmp record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:7
-#, fuzzy
 msgid "Don't write wtmp record"
-msgstr "keine mtab schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:8
-#, fuzzy
 msgid "Don't send wall message"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:2
 #: /tmp/fish/implicit/share/completions/prt-get.fish:62
@@ -50818,15 +47312,13 @@ msgstr "Port"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:3
 #: /tmp/fish/implicit/share/completions/prt-get.fish:64
-#, fuzzy
 msgid "Install listed ports"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:4
 #: /tmp/fish/implicit/share/completions/prt-get.fish:65
-#, fuzzy
 msgid "Install listed ports and their deps"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:5
 #: /tmp/fish/implicit/share/completions/prt-get.fish:66
@@ -50835,33 +47327,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:6
 #: /tmp/fish/implicit/share/completions/prt-get.fish:67
-#, fuzzy
 msgid "Update listed packages"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:68
-#, fuzzy
 msgid "Remove listed packages"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:69
-#, fuzzy
 msgid "Update all outdated installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:70
-#, fuzzy
 msgid "Do not update this in sysup"
-msgstr "Zeiten für passende Symbole nicht propagieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:71
-#, fuzzy
 msgid "Remove this from lock"
-msgstr "Quellpakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:11
 #: /tmp/fish/implicit/share/completions/prt-get.fish:72
@@ -50870,9 +47357,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:73
-#, fuzzy
 msgid "Search for an expr in port names"
-msgstr "Nach Ablaufzeit fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:13
 #: /tmp/fish/implicit/share/completions/prt-get.fish:74
@@ -50881,21 +47367,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:14
 #: /tmp/fish/implicit/share/completions/prt-get.fish:75
-#, fuzzy
 msgid "Print info on a port"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:15
 #: /tmp/fish/implicit/share/completions/prt-get.fish:76
-#, fuzzy
 msgid "Search for a pattern in the footprints in the ports tree"
-msgstr "Nach einem String in einer Liste suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:16
 #: /tmp/fish/implicit/share/completions/prt-get.fish:77
-#, fuzzy
 msgid "Print the path of a port"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:17
 #: /tmp/fish/implicit/share/completions/prt-get.fish:78
@@ -50904,15 +47387,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:18
 #: /tmp/fish/implicit/share/completions/prt-get.fish:79
-#, fuzzy
 msgid "Print a list of deps for the listed ports"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:19
 #: /tmp/fish/implicit/share/completions/prt-get.fish:80
-#, fuzzy
 msgid "Print a simple list of deps for the listed ports"
-msgstr "Unterdrückungen für entdeckte Fehler ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:20
 #: /tmp/fish/implicit/share/completions/prt-get.fish:81
@@ -50920,56 +47401,47 @@ msgid "Print a deptree for the port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:21
-#, fuzzy
 msgid "List ports in multiple directories"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:22
 #: /tmp/fish/implicit/share/completions/prt-get.fish:82
-#, fuzzy
 msgid "List all the ports"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:23
 #: /tmp/fish/implicit/share/completions/prt-get.fish:83
-#, fuzzy
 msgid "Print formatted list of ports"
-msgstr "Befehlstyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:25
 #: /tmp/fish/implicit/share/completions/prt-get.fish:85
-#, fuzzy
 msgid "List installed packages which have no dependent packages"
-msgstr "Pakete auflisten, von denen dieses Paket abhängt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:26
-#, fuzzy
 msgid "Check if a port is installed"
-msgstr "Installierte Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:27
 #: /tmp/fish/implicit/share/completions/prt-get.fish:86
-#, fuzzy
 msgid "Print the version of an installed package"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:28
 #: /tmp/fish/implicit/share/completions/prt-get.fish:87
-#, fuzzy
 msgid "Print the listing of the directory of a port"
-msgstr "Arbeitsverzeichnis ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:29
 #: /tmp/fish/implicit/share/completions/prt-get.fish:88
-#, fuzzy
 msgid "Print a file in a port to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:30
 #: /tmp/fish/implicit/share/completions/prt-get.fish:89
-#, fuzzy
 msgid "Edit a file in a port"
-msgstr "Original-Dateien editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:31
 #: /tmp/fish/implicit/share/completions/prt-get.fish:90
@@ -50978,44 +47450,37 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:32
 #: /tmp/fish/implicit/share/completions/prt-get.fish:91
-#, fuzzy
 msgid "Print the configuration of prt-get"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:33
 #: /tmp/fish/implicit/share/completions/prt-get.fish:92
-#, fuzzy
 msgid "Show the current version of prt-get"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:34
 #: /tmp/fish/implicit/share/completions/prt-get.fish:93
-#, fuzzy
 msgid "Create a cache for prt-get"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:41
 #: /tmp/fish/implicit/share/completions/prt-get.fish:100
-#, fuzzy
 msgid "No stripping"
-msgstr "Prompt-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:42
 #: /tmp/fish/implicit/share/completions/prt-get.fish:101
-#, fuzzy
 msgid "Keep work directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:43
 #: /tmp/fish/implicit/share/completions/prt-get.fish:102
-#, fuzzy
 msgid "Ignore the listed ports"
-msgstr "Erste Zeile der Eingabe ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:44
-#, fuzzy
 msgid "Use cache"
-msgstr "Verzeichnis für Zwischenspeicher festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:46
 #: /tmp/fish/implicit/share/completions/prt-get.fish:104
@@ -51034,21 +47499,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:49
 #: /tmp/fish/implicit/share/completions/prt-get.fish:107
-#, fuzzy
 msgid "Ignore default config file"
-msgstr "Angegebene Datei ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:50
 #: /tmp/fish/implicit/share/completions/prt-get.fish:108
-#, fuzzy
 msgid "Prepend string to config file"
-msgstr "Zeichenkette vor relative Links stellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:51
 #: /tmp/fish/implicit/share/completions/prt-get.fish:109
-#, fuzzy
 msgid "Append string to config file"
-msgstr "apt-Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:52
 #: /tmp/fish/implicit/share/completions/prt-get.fish:110
@@ -51072,21 +47534,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:57
 #: /tmp/fish/implicit/share/completions/prt-get.fish:115
-#, fuzzy
 msgid "Prefer higher version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:58
 #: /tmp/fish/implicit/share/completions/prt-get.fish:116
-#, fuzzy
 msgid "Override prefer-higher"
-msgstr "Frame-Rate überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:59
 #: /tmp/fish/implicit/share/completions/prt-get.fish:117
-#, fuzzy
 msgid "Use alternative config file"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:60
 #: /tmp/fish/implicit/share/completions/prt-get.fish:118
@@ -51095,9 +47554,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:61
 #: /tmp/fish/implicit/share/completions/prt-get.fish:119
-#, fuzzy
 msgid "Write output to log file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:1
 #: /tmp/fish/implicit/share/completions/ps.fish:5
@@ -51169,9 +47627,8 @@ msgid "Add column for security data"
 msgstr "Spalte für Sicherheitsdaten hinzufügen"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:19
-#, fuzzy
 msgid "Show different scheduler information for the -l option"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:20
 msgid "Full format"
@@ -51198,9 +47655,8 @@ msgid "Wide output"
 msgstr "breite Ausgabe"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:29
-#, fuzzy
 msgid "Set screen width"
-msgstr "Angenommene Bildschirmbreite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:30
 msgid "Include dead child process data"
@@ -51211,34 +47667,28 @@ msgid "Repead header lines, one per page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:32
-#, fuzzy
 msgid "Print no headers"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:33
-#, fuzzy
 msgid "Set screen height"
-msgstr "Schwere festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:34
-#, fuzzy
 msgid "Spericy sorting order"
-msgstr "Mail-Sortierordnung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:35
-#, fuzzy
 msgid "Show threads. With LWP/NLWP"
-msgstr "Threads anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:36
-#, fuzzy
 msgid "Show threads. With SPID"
-msgstr "Threads anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:37
-#, fuzzy
 msgid "Show threads after processes"
-msgstr "Nach Präprozessordurchlauf anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:1
 msgid "database name to connect to"
@@ -51249,51 +47699,44 @@ msgid "run only single command (SQL or internal) and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
-#, fuzzy
 msgid "execute commands from file, then exit"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
-#, fuzzy
 msgid "list available databases, then exit"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:5
 msgid "do not read startup file (~/.psqlrc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:6
-#, fuzzy
 msgid "execute command file as a single transaction"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:7
-#, fuzzy
 msgid "show this help, then exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:8
-#, fuzzy
 msgid "output version information, then exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:9
 msgid "echo all input from script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:10
-#, fuzzy
 msgid "echo commands sent to server"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:11
 msgid "display queries that internal commands generate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:12
-#, fuzzy
 msgid "send session log to file"
-msgstr "Session-Cookies speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:13
 msgid "disable enhanced command line editing (readline)"
@@ -51328,18 +47771,16 @@ msgid "set printing option VAR to ARG (see \\pset command)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:21
-#, fuzzy
 msgid "print rows only"
-msgstr "Ausführliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:22
 msgid "set HTML table tag attributes (e.g., width, border)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:23
-#, fuzzy
 msgid "turn on expanded table output"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:24
 msgid "set field separator (default: '|')"
@@ -51358,14 +47799,12 @@ msgid "database server port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:28
-#, fuzzy
 msgid "database user name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:29
-#, fuzzy
 msgid "never prompt for password"
-msgstr "Vor Löschung niemals fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:30
 msgid "force password prompt (should happen automatically)"
@@ -51380,47 +47819,40 @@ msgid "Turn progress bar on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:2
-#, fuzzy
 msgid "Show timer"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:3
-#, fuzzy
 msgid "Show estimated time left"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:4
 msgid "Show estimated time of arrival"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:5
-#, fuzzy
 msgid "Show rate counter"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:6
-#, fuzzy
 msgid "Show average rate"
-msgstr "Pakete im Zwischenspeicher anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:7
-#, fuzzy
 msgid "Show total byte counter"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:8
 msgid "Show transfer buffer percentage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:9
-#, fuzzy
 msgid "Show the last NUM bytes written"
-msgstr "Gesamtzahl geschriebener Bytes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:10
-#, fuzzy
 msgid "Set output format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:13
 msgid "Wait for first byte before showing progress"
@@ -51431,43 +47863,36 @@ msgid "Wait given time (in secs) before showing progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:15
-#, fuzzy
 msgid "Set total number of bytes to be transfered"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:16
 msgid "Count lines instead of bytes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:17
-#, fuzzy
 msgid "Count null-terminated lines"
-msgstr "-T enthält null-terminierte Namen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:18
-#, fuzzy
 msgid "Wait given time (in secs) between updates"
-msgstr "Wartezeiten zwischen Abrufversuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:19
-#, fuzzy
 msgid "Set terminal width"
-msgstr "Stopp durch Terminaleingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:20
-#, fuzzy
 msgid "Set terminal height"
-msgstr "Stopp durch Terminaleingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:21
-#, fuzzy
 msgid "Prefix output with given name"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:22
-#, fuzzy
 msgid "Force output"
-msgstr "breite Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:23
 msgid "Use cursor positioning escape sequence instead of \\r"
@@ -51482,14 +47907,12 @@ msgid "Use transfer buffer size (in bytes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:26
-#, fuzzy
 msgid "Don't use slice"
-msgstr "Stapelverarbeitungsmodus nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:27
-#, fuzzy
 msgid "Ignore read errors"
-msgstr "Fehler ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:28
 msgid "Stop transfer after given number of bytes"
@@ -51512,20 +47935,17 @@ msgid "Report colourised filesystem disk space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:2
-#, fuzzy
 msgid "show this help message"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:3
 #: /tmp/fish/implicit/share/completions/quilt.fish:2
-#, fuzzy
 msgid "show version"
-msgstr "Version des Quellenbaumes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:4
-#, fuzzy
 msgid "include filesystems having 0 blocks"
-msgstr "Dateisysteme ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:5
 msgid "print sizes in human readable format (e.g., 1K 234M 2G)"
@@ -51540,14 +47960,12 @@ msgid "use BLOCKSIZE-byte blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:8
-#, fuzzy
 msgid "limit listing to local filesystems"
-msgstr "Nur lokale Dateisysteme auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:9
-#, fuzzy
 msgid "like --block-size=1024"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:10
 msgid "like --block-size=1048576"
@@ -51562,9 +47980,8 @@ msgid "use filesystem native block size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:13
-#, fuzzy
 msgid "do not use colours"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:14
 msgid ""
@@ -51583,48 +48000,40 @@ msgid "show inode instead of block usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:1
-#, fuzzy
 msgid "Set output file"
-msgstr "Kennzeichnungsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:2
-#, fuzzy
 msgid "Read one line at a time"
-msgstr "Zeige Name, Zeile und Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:3
-#, fuzzy
 msgid "Set lexer"
-msgstr "Schwere festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:4
 msgid "Guess lexer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:5
-#, fuzzy
 msgid "Set formater"
-msgstr "Formatdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:6
-#, fuzzy
 msgid "Set coma-seperated options"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:7
-#, fuzzy
 msgid "Set one option"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:8
-#, fuzzy
 msgid "Set filter"
-msgstr "Kennzeichnungsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:9
-#, fuzzy
 msgid "Print style definition for given style"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:10
 msgid "List lexers, formaters, styles or filters"
@@ -51635,18 +48044,16 @@ msgid "Guess and print lexer name based on given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:12
-#, fuzzy
 msgid "Print detailed help"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:13
 msgid "Print detailed traceback on unhandled exceptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:15
-#, fuzzy
 msgid "Print package version"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:1
 #: /tmp/fish/implicit/share/completions/python3.fish:1
@@ -51723,9 +48130,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:16
 #: /tmp/fish/implicit/share/completions/python3.fish:16
 #: /tmp/fish/implicit/share/completions/python.fish:17
-#, fuzzy
 msgid "Read program from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:18
@@ -51750,15 +48156,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:21
-#, fuzzy
 msgid "Don't print version and copyright messages on interactive startup"
-msgstr "Magische Versionsinformation ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:22
-#, fuzzy
 msgid "Set implementation-specific option"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:23
@@ -51769,38 +48173,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:20
 #: /tmp/fish/implicit/share/completions/python.fish:24
-#, fuzzy
 msgid "Issue errors"
-msgstr "Fehler ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:3
-#, fuzzy
 msgid "specify the file to Run Control file to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:4
 msgid "Runs the command in bash trace mode (-x). For internal debugging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:5
-#, fuzzy
 msgid "Add one or more files to the topmost or named patch"
-msgstr "Ein/mehrere neue Datei/en oder Verzeichnis/se hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:6
-#, fuzzy
 msgid "Print an annotated listing of the specified file"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:7
-#, fuzzy
 msgid "Print a list of applied patches"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:8
-#, fuzzy
 msgid "Remove the specified or topmost patch from the series file"
-msgstr "Die auf der Befehlszeile angegebene Datei verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:9
 msgid ""
@@ -51808,16 +48206,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:10
-#, fuzzy
 msgid "Edit the specified file(s) in /usr/bin/vim"
-msgstr "Angegebene Datei zur aktuellen Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:11
-#, fuzzy
 msgid "Print the list of files that the topmost or specified patch changes"
 msgstr ""
-"Die Liste der Standardeinstellungen gemäß der angegebenen Zeichenkette "
-"festlegen"
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:12
 msgid ""
@@ -51867,11 +48261,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:21
-#, fuzzy
 msgid "Print the list of patches that modify the specified file"
 msgstr ""
-"Die Liste der Standardeinstellungen gemäß der angegebenen Zeichenkette "
-"festlegen"
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:22
 msgid ""
@@ -51880,27 +48271,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:23
-#, fuzzy
 msgid "Apply patch(es) from the series file"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:24
 msgid "Refreshes the specified patch, or the topmost patch by default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:25
-#, fuzzy
 msgid "Remove one or more files from the topmost or named patch"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:26
 msgid "Rename the topmost or named patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:27
-#, fuzzy
 msgid "Print the names of all patches in the series file"
-msgstr "Prozesskennung jedes Prozesses im Job anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:28
 msgid " Initializes a source tree from an rpm spec file or a quilt series file"
@@ -51928,24 +48316,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:1
-#, fuzzy
 msgid "Activate debug mode"
-msgstr "Debug-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:2
-#, fuzzy
 msgid "Activate clean mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:3
-#, fuzzy
 msgid "Change configuration directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:4
-#, fuzzy
 msgid "Create copies of the default configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:5
 msgid "Pick file with ranger"
@@ -51956,9 +48340,8 @@ msgid "Pick multiple files with ranger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:7
-#, fuzzy
 msgid "Pick directory"
-msgstr "Verzeichnisse rekursiv durchlaufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:8
 msgid "Open ranger with given file selected"
@@ -51977,24 +48360,20 @@ msgid "Print statistics of CPU usage on exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:12
-#, fuzzy
 msgid "Execute command after configuration file read"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:1
-#, fuzzy
 msgid "List all rbenv commands"
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:2
-#, fuzzy
 msgid "Set or show the global Ruby version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:3
-#, fuzzy
 msgid "Install a ruby version"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:4
 msgid "Set or show the local directory-specific Ruby version"
@@ -52009,27 +48388,24 @@ msgid "Rehash rbenv shims (run this after installing binaries)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:7
-#, fuzzy
 msgid "rbenv root folder"
-msgstr "Ordner öffnen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:8
 msgid "Set or show the shell-specific Ruby version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:9
-#, fuzzy
 msgid "Show the current Ruby version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:10
 msgid "List all Ruby versions known by rbenv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:11
-#, fuzzy
 msgid "List all Ruby versions with the given command"
-msgstr "fish mit diesem Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:12
 msgid "Show the full path for the given Ruby command"
@@ -52040,24 +48416,20 @@ msgid "Tests if the service exists or not"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:2
-#, fuzzy
 msgid "List all available services"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:3
-#, fuzzy
 msgid "Display the help output"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:5
-#, fuzzy
 msgid "Display software version"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:6
-#, fuzzy
 msgid "Run verbosely"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:7
 msgid "Run quietly (Does not affect errors)"
@@ -52110,18 +48482,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:11
-#, fuzzy
 msgid "Read the specified number of characters"
-msgstr "Nur angegebene Anzahl Zeichen vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:12
 msgid "Store the results as an array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:13
-#, fuzzy
 msgid "Set right-hand prompt command"
-msgstr "Prompt-Befehl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:1
 msgid "Canonicalize, follow symlinks, last can be missing"
@@ -52140,18 +48510,16 @@ msgid "Do not output the trailing newline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:6
-#, fuzzy
 msgid "Report error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:1
 msgid "all components of the path must exist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:2
-#, fuzzy
 msgid "no components of the path need exist"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:3
 msgid "resolve '..' components before symlinks"
@@ -52162,9 +48530,8 @@ msgid "resolve symlinks as encountered (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:5
-#, fuzzy
 msgid "suppress most error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:6
 msgid "print the resolved path relative to FILE"
@@ -52175,9 +48542,8 @@ msgid "print absolute paths unless paths below FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:8
-#, fuzzy
 msgid "don't expand symlinks"
-msgstr "Symbolischen Links nicht folgen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:9
 msgid "separate output with NUL rather than newline"
@@ -52224,23 +48590,20 @@ msgid "Remove each component of path"
 msgstr "Jede Komponente des Pfades entfernen"
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
-#, fuzzy
 msgid "Prints the help text."
-msgstr "Befehlstyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:2
 msgid "Send errors to syslog instead of standard error."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:3
-#, fuzzy
 msgid "Print messages about what the program is doing."
-msgstr "Nachrichten über den Programmablauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:4
-#, fuzzy
 msgid "Show version of program and exit"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:5
 msgid ""
@@ -52249,37 +48612,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:2
-#, fuzzy
 msgid "Do not execute logon and logoff macros"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:3
 msgid "Exit after processing commandline macro files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:4
-#, fuzzy
 msgid "Do not show splashscreen"
-msgstr "Keine Flags anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:5
-#, fuzzy
 msgid "Exit on exception"
-msgstr "Ende bei zweitem EOF"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:7
-#, fuzzy
 msgid "Print ./configure options"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:8
 msgid "Run with memory usage monitoring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:5
-#, fuzzy
 msgid "List of rpm configuration files"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:6
 msgid "Pipe output through specified command"
@@ -52290,9 +48648,8 @@ msgid "Specify directory for rpm database"
 msgstr "Verzeichnis für rpm-Datenbank angeben"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:8
-#, fuzzy
 msgid "Specify root directory for rpm operations"
-msgstr "Verzeichnis für rpm-Datenbank angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:9
 msgid "Add suggested packages to the transaction set when needed"
@@ -52689,18 +49046,16 @@ msgid "Upgrade package if already installed"
 msgstr "Paket aktualisieren, wenn es bereits installiert ist"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:96
-#, fuzzy
 msgid "Verify package integrity"
-msgstr "Paketintegrität verifizieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:97
 msgid "Erase package"
 msgstr "Paket löschen"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:2
-#, fuzzy
 msgid "Suppress non-error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:3
 msgid "Skip based on checksum, not mod-time & size"
@@ -52715,9 +49070,8 @@ msgid "Turn off an implied OPTION (e.g. --no-D)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:6
-#, fuzzy
 msgid "Recurse into directories"
-msgstr "include-Verzeichnisse ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:7
 msgid "Use relative path names"
@@ -52744,28 +49098,24 @@ msgid "Skip files that are newer on the receiver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:13
-#, fuzzy
 msgid "Update destination files in-place"
-msgstr "Original-Dateien editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:14
-#, fuzzy
 msgid "Append data onto shorter files"
-msgstr "Neue Dateien anfügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:15
 msgid "Transfer directories without recursing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:16
-#, fuzzy
 msgid "Copy symlinks as symlinks"
-msgstr "Symbolische Links als Links speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:17
-#, fuzzy
 msgid "Transform symlink into referent file/dir"
-msgstr "Symlinks folgen und die Dateien abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:18
 msgid "Only \"unsafe\" symlinks are transformed"
@@ -52784,14 +49134,12 @@ msgid "Treat symlinked dir on receiver as dir"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:22
-#, fuzzy
 msgid "Preserve hard links"
-msgstr "Alle symbolischen Links dereferenzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:23
-#, fuzzy
 msgid "Preserve permissions"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:24
 msgid "Preserve executability"
@@ -52806,41 +49154,36 @@ msgid "Preserve extended attrs (implies -p) [n.s.]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:27
-#, fuzzy
 msgid "Change destination permissions"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:28
 msgid "Preserve owner (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:29
-#, fuzzy
 msgid "Preserve group"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:30
 msgid "Preserve device files (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:31
-#, fuzzy
 msgid "Preserve special files"
-msgstr "Dateieigentümer erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:32
 msgid "Same as --devices --specials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:33
-#, fuzzy
 msgid "Preserve times"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:34
-#, fuzzy
 msgid "Omit directories when preserving times"
-msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:35
 msgid "Receiver attempts super-user activities"
@@ -52867,14 +49210,12 @@ msgid "Force a fixed checksum block-size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:41
-#, fuzzy
 msgid "Specify the remote shell to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:42
-#, fuzzy
 msgid "Specify the rsync to run on remote machine"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:43
 msgid "Ignore non-existing files on receiving side"
@@ -52921,9 +49262,8 @@ msgid "Force deletion of dirs even if not empty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:54
-#, fuzzy
 msgid "Don’t delete more than NUM files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:55
 msgid "Don’t transfer any file larger than SIZE"
@@ -52962,18 +49302,16 @@ msgid "Don’t skip files that match size and time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:64
-#, fuzzy
 msgid "Skip files that match in size"
-msgstr "Rekursiv, dem MUSTER entsprechende Dateien überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:65
 msgid "Compare mod-times with reduced accuracy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:66
-#, fuzzy
 msgid "Create temporary files in directory DIR"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:67
 msgid "Find similar file for basis if no dest file"
@@ -52998,9 +49336,8 @@ msgid "Compress file data during the transfer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:72
-#, fuzzy
 msgid "Explicitly set compression level"
-msgstr "Komprimierungsgrad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:73
 msgid "Auto-ignore files in the same way CVS does"
@@ -53017,24 +49354,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:76
-#, fuzzy
 msgid "Exclude files matching PATTERN"
-msgstr "Rekursiv, dem MUSTER entsprechende Dateien überspringen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:78
-#, fuzzy
 msgid "Don’t exclude files matching PATTERN"
-msgstr "Rekursiv, Dateien gemäß MUSTER suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:79
-#, fuzzy
 msgid "Read include patterns from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:80
-#, fuzzy
 msgid "Read list of source-file names from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:81
 msgid "All *from/filter files are delimited by 0s"
@@ -53049,14 +49382,12 @@ msgid "Specify double-colon alternate port number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:84
-#, fuzzy
 msgid "Specify custom TCP options"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:85
-#, fuzzy
 msgid "Use blocking I/O for the remote shell"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:86
 msgid "Give some file-transfer stats"
@@ -53071,9 +49402,8 @@ msgid "Output numbers in a human-readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:89
-#, fuzzy
 msgid "Show progress during transfer"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:90
 msgid "Same as --partial --progress"
@@ -53084,18 +49414,16 @@ msgid "Output a change-summary for all updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:92
-#, fuzzy
 msgid "Output filenames using the specified format"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:93
 msgid "Read password from FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:94
-#, fuzzy
 msgid "List the files instead of copying them"
-msgstr "Dateien im Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:95
 msgid "Limit I/O bandwidth; KBytes per second"
@@ -53130,28 +49458,24 @@ msgid "Prefer IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:105
-#, fuzzy
 msgid "Remote path"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:1
-#, fuzzy
 msgid "Definition"
-msgstr "Funktion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:2
-#, fuzzy
 msgid "Do not remove source tree after installation"
-msgstr "Vor der Installation nicht auf ausreichenden Plattenplatz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:3
 msgid "Verbose mode: print compilation status to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:4
-#, fuzzy
 msgid "List all built-in definitions"
-msgstr "Einige eingebaute Funktionen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby.fish:4
 msgid "Kanji code-set"
@@ -53170,48 +49494,40 @@ msgid "Compiler debug mode"
 msgstr "Compiler-Debug-Modus"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:1
-#, fuzzy
 msgid "Make bucket"
-msgstr "Unpassende Klammern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:2
-#, fuzzy
 msgid "Remove bucket"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:3
-#, fuzzy
 msgid "List objects or buckets"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:4
-#, fuzzy
 msgid "List all object in all buckets"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:5
-#, fuzzy
 msgid "Put file into bucket"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:6
-#, fuzzy
 msgid "Get file from bucket"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:7
-#, fuzzy
 msgid "Delete file from bucket"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:8
 msgid "Delete file from bucket (alias for del)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:9
-#, fuzzy
 msgid "Restore file from Glacier storage"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:10
 msgid "Synchronize a directory tree to S3"
@@ -53222,9 +49538,8 @@ msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -53235,9 +49550,8 @@ msgid "Modify object metadata"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:15
-#, fuzzy
 msgid "Move object"
-msgstr "Veraltete Dateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:16
 msgid "Modify Access control list for Bucket or Files"
@@ -53264,28 +49578,24 @@ msgid "Modify Bucket Requester Pays policy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:22
-#, fuzzy
 msgid "Show multipart uploads"
-msgstr "Threads anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:23
 msgid "Abort a multipart upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:24
-#, fuzzy
 msgid "List parts of a multipart upload"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:25
-#, fuzzy
 msgid "Enable/disable bucket access logging"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:26
-#, fuzzy
 msgid "Sign arbitrary string using the secret key"
-msgstr "Einen öffentlichen Schlüssel mit Ihrem geheimen Schlüssel signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:27
 msgid "Sign an S3 URL to provide limited public access with expiry"
@@ -53300,9 +49610,8 @@ msgid "Create Website from bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:30
-#, fuzzy
 msgid "Delete Website"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:31
 msgid "Info about Website"
@@ -53317,52 +49626,44 @@ msgid "Upload a lifecycle policy for the bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:34
-#, fuzzy
 msgid "Remove a lifecycle policy for the bucket"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:35
-#, fuzzy
 msgid "List CloudFront distribution points"
-msgstr "Distributions-tarball erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:36
 msgid "Display CloudFront distribution point parameters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:37
-#, fuzzy
 msgid "Create CloudFront distribution point"
-msgstr "Distributions-tarball erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:38
-#, fuzzy
 msgid "Delete CloudFront distribution point"
-msgstr "Distributions-tarball erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:39
-#, fuzzy
 msgid "Change CloudFront distribution point parameters"
-msgstr "Distributions-tarball erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:40
 msgid "Display CloudFront invalidation request(s) status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:42
-#, fuzzy
 msgid "Run interactive (re)configuration tool"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
-#, fuzzy
 msgid "AWS Access Key"
-msgstr "Zugriffszeit anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:46
 msgid "AWS Secret Key"
@@ -53377,58 +49678,48 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
-#, fuzzy
 msgid "Don't use HTTPS"
-msgstr "Stapelverarbeitungsmodus nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:51
-#, fuzzy
 msgid "Encrypt files before uploading"
-msgstr "Dateien vor dem Löschen umpacken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:52
-#, fuzzy
 msgid "Don't encrypt files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:53
-#, fuzzy
 msgid "Force overwrite"
-msgstr "Nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:54
-#, fuzzy
 msgid "Resume partially downloaded file"
-msgstr "Herunterladen einer teilweise übertragenen Datei fortsetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:55
-#, fuzzy
 msgid "Resume partially uploaded files"
-msgstr "Herunterladen einer teilweise übertragenen Datei fortsetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:56
 msgid "Resume multipart upload by UploadId"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:57
-#, fuzzy
 msgid "Skip existing files at destination"
-msgstr "Sicherung jeder existierenden Zieldatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
-#, fuzzy
 msgid "Upload/download/delete recursively"
-msgstr "Dep und rdep rekursiv"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:59
-#, fuzzy
 msgid "Check MD5 sums (default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:60
 msgid "Skip MD5 sum check"
@@ -53451,33 +49742,28 @@ msgid "Revoke permission to named user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:65
-#, fuzzy
 msgid "Days to keep restored file"
-msgstr "Dateiname nciht (zurück)sichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:66
-#, fuzzy
 msgid "S3 glacier restore priority"
-msgstr "Zugriffsverlauf des Paketdepots anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:67
 msgid "Delete objects not found locally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:68
-#, fuzzy
 msgid "Don't delete dest objects"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:69
-#, fuzzy
 msgid "Delete after upload"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:70
-#, fuzzy
 msgid "Delete no more than NUM files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:71
 msgid "Max objects per response"
@@ -53488,66 +49774,56 @@ msgid "Additional parallel upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:73
-#, fuzzy
 msgid "Delete remotely after fetch"
-msgstr "Aus Archiv löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:74
-#, fuzzy
 msgid "Preserve FS attributes"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:75
-#, fuzzy
 msgid "Don't store FS attributes"
-msgstr "md5-Attribute nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:76
-#, fuzzy
 msgid "Exclude GLOB matches"
-msgstr "Dateisysteme ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:77
-#, fuzzy
 msgid "--exclude GLOBs from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:78
 msgid "Exclude REGEXP matches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:79
-#, fuzzy
 msgid "Read --rexclude REGEXPs from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:80
 msgid "Include GLOB matches even if previously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:81
-#, fuzzy
 msgid "Read --include GLOBs from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:82
 msgid "Include REGEXP matches even if preiously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:83
-#, fuzzy
 msgid "Read --rinclude REGEXPs from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:84
-#, fuzzy
 msgid "Read source-file names from FILE"
-msgstr "Dateinamen über Pipe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:85
-#, fuzzy
 msgid "Create bucket in region"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:86
 msgid "S3 endpoint (default: s3.amazonaws.com)"
@@ -53574,9 +49850,8 @@ msgid "Prefix for access logs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:92
-#, fuzzy
 msgid "Disable access logging"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:93
 msgid "Default MIME-type for objects"
@@ -53591,23 +49866,20 @@ msgid "Don't guess MIME-type, use default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:96
-#, fuzzy
 msgid "Don't use mime magic when guessing"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:97
-#, fuzzy
 msgid "Force MIME-type"
-msgstr "Ja erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:98
 msgid "Add HTTP header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:99
-#, fuzzy
 msgid "Remove HTTP header"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:100
 msgid "Use server-side encryption for upload"
@@ -53618,18 +49890,16 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:104
-#, fuzzy
 msgid "Use S3 name as-is"
-msgstr "Eine Platte umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:105
 msgid "No multipart on files larger than --multipart-chunk-size-mb"
@@ -53644,19 +49914,16 @@ msgid "Include MD5 sums in bucket listings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:108
-#, fuzzy
 msgid "Print sizes in human-readable form"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:109
-#, fuzzy
 msgid "Name of index-document"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:110
-#, fuzzy
 msgid "Name of error-document"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:111
 msgid "When expiration rule takes effect"
@@ -53671,42 +49938,36 @@ msgid "Apply expiry to objects matching prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:114
-#, fuzzy
 msgid "Show progress (default on TTY)"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:115
 msgid "Don't show progress meter (default if non-TTY)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:116
-#, fuzzy
 msgid "Show file transfer stats"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:117
-#, fuzzy
 msgid "Enable CloudFront distribution"
-msgstr "Debian-Distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:118
-#, fuzzy
 msgid "Disable CloudFront distribution"
-msgstr "Debian-Distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:119
-#, fuzzy
 msgid "Invalidate CloudFront file"
-msgstr "Datei ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:120
 msgid "Invalidate default index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:121
-#, fuzzy
 msgid "Don't invalidate default index"
-msgstr "Keine Erklärungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:122
 msgid "Add CNAME to CloudFront distribution"
@@ -53729,29 +49990,24 @@ msgid "Cache FILE containing MD5 values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:131
-#, fuzzy
 msgid "Silence stdout output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:132
-#, fuzzy
 msgid "Path to SSL CA certificate FILE"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:133
-#, fuzzy
 msgid "Validate SSL certificate"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:134
-#, fuzzy
 msgid "Don't validate SSL certificate"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:135
-#, fuzzy
 msgid "Validate SSL hostname"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:136
 msgid "Don't validate SSL hostname"
@@ -53762,23 +50018,20 @@ msgid "Use AWS Signature version 2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:138
-#, fuzzy
 msgid "Limit upload or download speed (bytes/sec)"
-msgstr "Herunterladegeschwindigkeit begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:139
 msgid "Set REQUESTER PAYS for operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:140
-#, fuzzy
 msgid "Produce long listing"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:141
-#, fuzzy
 msgid "Stop on error in transfer"
-msgstr "Bei zu vielen Fehlern Anzeige beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:142
 msgid "Provide Content-Disposition for signed URLs"
@@ -53807,23 +50060,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:4
-#, fuzzy
 msgid "Convert all the files in a directory. Requires --from and --to."
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:5
 #: /tmp/fish/implicit/share/completions/sass.fish:5
 #: /tmp/fish/implicit/share/completions/scss.fish:5
-#, fuzzy
 msgid "Show help message."
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:6
 #: /tmp/fish/implicit/share/completions/sass.fish:6
 #: /tmp/fish/implicit/share/completions/scss.fish:6
-#, fuzzy
 msgid "Print the Sass version."
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:7
 msgid "Convert underscores to dashes."
@@ -53850,9 +50100,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:11
 #: /tmp/fish/implicit/share/completions/sass.fish:14
 #: /tmp/fish/implicit/share/completions/scss.fish:15
-#, fuzzy
 msgid "Specify the default encoding for input files."
-msgstr "apt-Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:12
 #: /tmp/fish/implicit/share/completions/sass.fish:15
@@ -53867,9 +50116,8 @@ msgid "The path to save parsed Sass files. Defaults to .sass-cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:14
-#, fuzzy
 msgid "Don't cache to sassc files."
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:15
 #: /tmp/fish/implicit/share/completions/sass.fish:23
@@ -53879,9 +50127,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:1
 #: /tmp/fish/implicit/share/completions/scss.fish:1
-#, fuzzy
 msgid "Specify a Sass import path."
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:2
 #: /tmp/fish/implicit/share/completions/scss.fish:2
@@ -53956,9 +50203,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:18
 #: /tmp/fish/implicit/share/completions/scss.fish:19
-#, fuzzy
 msgid "Run an interactive SassScript shell."
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:19
 #: /tmp/fish/implicit/share/completions/scss.fish:20
@@ -53974,9 +50220,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:22
 #: /tmp/fish/implicit/share/completions/scss.fish:23
-#, fuzzy
 msgid "Don't cache parsed Sass files."
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:24
 #: /tmp/fish/implicit/share/completions/scss.fish:25
@@ -53984,93 +50229,80 @@ msgid "Silence warnings and status messages during compilation."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:1
-#, fuzzy
 msgid "Create a new sbt project from the given template"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:2
 msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
-#, fuzzy
 msgid "Set log level to debug"
-msgstr "Fehler-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:6
-#, fuzzy
 msgid "Disable ANSI color codes"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:7
 msgid "Launch even if there's no sbt project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:8
-#, fuzzy
 msgid "Use all local caches"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:9
 msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "Verzeichnis angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
-#, fuzzy
 msgid "Specify path to local Ivy repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "Konfigurationsoptionen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:16
-#, fuzzy
 msgid "Use specified version of sbt"
-msgstr "Benutze angegebenen Kompressionsalgorithmus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:17
-#, fuzzy
 msgid "Use specified jar as the sbt launcher"
-msgstr "Angegebenen Schlüssel als Schlüssel zum Signieren verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:18
 msgid "Use an RC version of sbt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:19
-#, fuzzy
 msgid "Use a snapshot version of sbt"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:20
 msgid "Alternate JAVA_HOME"
@@ -54134,19 +50366,16 @@ msgid "Gamma-correction table [0..255, …]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:12
-#, fuzzy
 msgid "Scan mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:13
-#, fuzzy
 msgid "Device name to use"
-msgstr "Geräte-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:14
-#, fuzzy
 msgid "List devices"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:15
 msgid "Print formatted device list [%d, %v, %m, %t, %i, %n]"
@@ -54161,9 +50390,8 @@ msgid "The filename of the image to be loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:18
-#, fuzzy
 msgid "Output image format"
-msgstr "Ausgabe im ISO 8601-Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:19
 msgid "Include this ICC profile into TIFF file"
@@ -54184,9 +50412,8 @@ msgid "How many pages to scan in batch mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:23
-#, fuzzy
 msgid "Increase page number in filename by #"
-msgstr "Groß-/Kleinschreibung beim Dateinamenvergleich ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:24
 msgid "Increment page number by two"
@@ -54201,9 +50428,8 @@ msgid "Only accept authorization requests using md5"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:27
-#, fuzzy
 msgid "Print progress messages"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:28
 msgid "Only set options, don't actually scan"
@@ -54214,14 +50440,12 @@ msgid "Test backend thoroughly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:30
-#, fuzzy
 msgid "List all available backend options"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:31
-#, fuzzy
 msgid "Display this help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:32
 msgid "Give even more status messages"
@@ -54282,9 +50506,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:9
-#, fuzzy
 msgid "Debug the build process"
-msgstr "Kindprozess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:10
 msgid ""
@@ -54294,9 +50517,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:11
-#, fuzzy
 msgid "Use file as the initial SConscript file"
-msgstr "Datei als Terminal benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:12
 msgid ""
@@ -54310,37 +50532,32 @@ msgid "Print the standard help message about command-line options and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:14
-#, fuzzy
 msgid "Ignore all errors from commands executed to rebuild files"
-msgstr "Fehler aus nicht leeren Verzeichnissen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:15
 msgid "Specifies a directory to search for imported Python modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:16
-#, fuzzy
 msgid "Cache implicit dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:17
 msgid "Force SCons to ignore the cached implicit dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:18
-#, fuzzy
 msgid "Force SCons to ignore changes in the implicit dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:19
-#, fuzzy
 msgid "Specifies the number of jobs (commands) to run simultaneously"
-msgstr "Gibt die Anzahl zu sendender Bytes an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:20
-#, fuzzy
 msgid "Continue as much as possible after an error"
-msgstr "Fortsetzung nach Fehler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:21
 msgid ""
@@ -54354,9 +50571,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:23
-#, fuzzy
 msgid "No execute"
-msgstr "Programm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:24
 msgid ""
@@ -54365,9 +50581,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:25
-#, fuzzy
 msgid "Do not run any commands, or print anything"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:26
 msgid ""
@@ -54376,14 +50591,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:27
-#, fuzzy
 msgid "Build dependencies in a random order"
-msgstr "Modulabhängigkeiten auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:28
-#, fuzzy
 msgid "Silent"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:29
 msgid ""
@@ -54410,9 +50623,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:34
-#, fuzzy
 msgid "Enable or disable warnings"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:35
 msgid "Turn off -w, even if it was turned on implicitly"
@@ -54425,14 +50637,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:1
-#, fuzzy
 msgid "Local Path"
-msgstr "Logisches Und"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:2
-#, fuzzy
 msgid "Remote Path"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:4
 msgid "Bandwidth limit"
@@ -54448,9 +50658,8 @@ msgid "Recursively copy"
 msgstr "Rekursive Kopie"
 
 #: /tmp/fish/implicit/share/completions/scp.fish:9
-#, fuzzy
 msgid "Encryption program"
-msgstr "Verschlüsselungsprogramm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:1
 msgid "Detect which folder screen uses"
@@ -54461,37 +50670,32 @@ msgid "Get the socket list on mac"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:3
-#, fuzzy
 msgid "Get the socket list"
-msgstr "Verbindungszeitüberschreitung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:4
-#, fuzzy
 msgid "Print a list of detached screen sessions"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:5
-#, fuzzy
 msgid "Print a list of attached screen sessions"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:6
 msgid "Print a list of running screen sessions"
 msgstr "Liste laufender screen-Sitzungen ausgeben"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:7
-#, fuzzy
 msgid "Include all capabilitys"
-msgstr "Include-Pfad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:8
 msgid "Adapt window size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:9
-#, fuzzy
 msgid "Specify init file"
-msgstr "Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:10
 #: /tmp/fish/implicit/share/completions/screen.fish:11
@@ -54499,9 +50703,8 @@ msgid "Detach screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:12
-#, fuzzy
 msgid "Reattach session"
-msgstr "Ausdruck negieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:13
 msgid "Reattach/create session"
@@ -54517,9 +50720,8 @@ msgid "Escape character"
 msgstr "Escape-Zeichen"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:16
-#, fuzzy
 msgid "Flow control on"
-msgstr "Einhängepunkt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:17
 msgid "Flow control off"
@@ -54538,72 +50740,61 @@ msgid "Interrupt display on C-c"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:21
-#, fuzzy
 msgid "Login on"
-msgstr "Logisches Oder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:22
-#, fuzzy
 msgid "Login off"
-msgstr "Logisches Oder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:23
 #: /tmp/fish/implicit/share/completions/screen.fish:24
-#, fuzzy
 msgid "List sessions"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:25
 msgid "Log on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:27
-#, fuzzy
 msgid "Optimal output"
-msgstr "breite Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:28
-#, fuzzy
 msgid "Preselect window"
-msgstr "Root-Fenster auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
-#, fuzzy
 msgid "Set shell"
-msgstr "System festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:31
-#, fuzzy
 msgid "Session name"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:32
-#, fuzzy
 msgid "Session title"
-msgstr "Session-Cookies speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:33
 msgid "UTF-8 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:35
-#, fuzzy
 msgid "Wipe dead sessions"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:36
 msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
-#, fuzzy
 msgid "Display version information and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:3
 msgid "When selecting a window, grab wm border too"
@@ -54614,9 +50805,8 @@ msgid "Display a countdown when used with delay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:5
-#, fuzzy
 msgid "Wait NUMBER of seconds before taking a shot"
-msgstr "Anzahl Sekunden, bevor eine http-Zeitüberschreitung vermutet wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:6
 msgid "Execute APPLICATION on the saved image"
@@ -54627,14 +50817,12 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "Eine Befehlsfolge mehrmals ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
-#, fuzzy
 msgid "Select a window or rectangle with the mouse"
-msgstr "Fenster durch Klicken auf den Rahmen auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:10
 msgid "Generate thumbnail PERCENT of original"
@@ -54661,9 +50849,8 @@ msgid "How to link generated output to the source files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/service.fish:1
-#, fuzzy
 msgid "Service name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:1
 msgid "Color"
@@ -54688,18 +50875,16 @@ msgid "Dim text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:6
-#, fuzzy
 msgid "Reverse color text"
-msgstr "Sortierreihenfolge umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:7
 msgid "Underline text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:9
-#, fuzzy
 msgid "Print a list of all accepted color names"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setfacl.fish:1
 msgid "Remove all extended ACL entries"
@@ -54730,9 +50915,8 @@ msgid "Test if We are specifying a locale value for the prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:3
-#, fuzzy
 msgid "Erase variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:8
 msgid "Share variable persistently across sessions"
@@ -54747,14 +50931,12 @@ msgid "List the names of the variables, but not their value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:14
-#, fuzzy
 msgid "Locale variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:15
-#, fuzzy
 msgid "Do not truncate long lines"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setsid.fish:2
 msgid "Set controlling terminal to current one"
@@ -54765,33 +50947,28 @@ msgid "Wait until program ends and return its exit value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:1
-#, fuzzy
 msgid "Print this message"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:2
 msgid "Specifies compatibility map component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:3
-#, fuzzy
 msgid "Specifies configuration file to use"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:4
-#, fuzzy
 msgid "Specifies the device ID to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:5
-#, fuzzy
 msgid "Specifies display to use"
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:6
-#, fuzzy
 msgid "Specifies geometry component name"
-msgstr "Angegebene Anzahl von Verzeichniskomponenten ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:7
 msgid "Add <dir> to list of directories to be used"
@@ -54802,9 +50979,8 @@ msgid "Specifies keycodes component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:9
-#, fuzzy
 msgid "Specifies name of keymap to load"
-msgstr "Liste zu installierender Pakete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:10
 msgid "Specifies layout used to choose component names"
@@ -54823,14 +50999,12 @@ msgid "Print a complete xkb_keymap description and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:14
-#, fuzzy
 msgid "Print the current layout settings and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:15
-#, fuzzy
 msgid "Name of rules file to use"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:16
 msgid "Specifies symbols component name"
@@ -54841,9 +51015,8 @@ msgid "Synchronize request w/X server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:18
-#, fuzzy
 msgid "Specifies types component name"
-msgstr "Proxy-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:19
 msgid "Sets verbosity (1..10).  Higher values yield more messages"
@@ -54858,77 +51031,61 @@ msgid "Verify a signed checksum list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "Angegebene Datei ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
-#, fuzzy
 msgid "Verify a signed message and sig"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:1
-#, fuzzy
 msgid "Test if snap has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:3
-#, fuzzy
 msgid "Test if snap command should have packages as potential completion"
 msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
 
 #: /tmp/fish/implicit/share/completions/snap.fish:4
-#, fuzzy
 msgid "Test if snap command should have files as potential completion"
 msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
 
 #: /tmp/fish/implicit/share/completions/snap.fish:5
 #: /tmp/fish/implicit/share/completions/snap.fish:6
-#, fuzzy
 msgid "List disabled snaps"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:7
-#, fuzzy
 msgid "List installed snaps"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "Schnittstelle stoppen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
-#, fuzzy
 msgid "List change IDs"
-msgstr "Keine Änderungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
-#, fuzzy
 msgid "Check that no assertion type is used yet"
 msgstr ""
-"Überprüfen sie das dieser Terminaltyp auf diesem System unterstützt wird"
 
 #: /tmp/fish/implicit/share/completions/snap.fish:12
 msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "Beschreibung des mime-Typs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
-#, fuzzy
 msgid "Show this help message"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:16
 msgid "Snap"
@@ -54983,9 +51140,8 @@ msgid "Define key"
 msgstr "Schlüssel definieren"
 
 #: /tmp/fish/implicit/share/completions/sort.fish:14
-#, fuzzy
 msgid "Merge sorted files"
-msgstr "Veraltete Dateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:16
 msgid "Stabilize sort"
@@ -55012,9 +51168,8 @@ msgid "Lines end with 0 byte"
 msgstr "Zeilen enden mit Null-Byte"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:2
-#, fuzzy
 msgid "Disables forwarding of the authentication agent"
-msgstr "Aktiviert Weiterleitung des Authentifizierungs-Agenten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:3
 msgid "Enables forwarding of the authentication agent"
@@ -55025,9 +51180,8 @@ msgid "Interface to transmit from"
 msgstr "Schnittstelle zur Übertragung"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:6
-#, fuzzy
 msgid "Go to background"
-msgstr "Job in Hintergrund schicken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:7
 msgid "Allow remote host to connect to local forwarded ports"
@@ -55039,9 +51193,8 @@ msgid "Smartcard device"
 msgstr "Smartcard-Gerät"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:9
-#, fuzzy
 msgid "Disable forwarding of Kerberos tickets"
-msgstr "Weiterleitung von Kerberos-Tickets deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:10
 msgid "User"
@@ -55052,9 +51205,8 @@ msgid "MAC algorithm"
 msgstr "MAC-Algorithmus"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:12
-#, fuzzy
 msgid "Prevent reading from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:13
 msgid "Do not execute remote command"
@@ -55065,9 +51217,8 @@ msgid "Subsystem"
 msgstr "Subsystem"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:17
-#, fuzzy
 msgid "Force pseudo-tty allocation"
-msgstr "Pseudo-tty-Zuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:18
 msgid "Disable pseudo-tty allocation"
@@ -55094,33 +51245,28 @@ msgid "Dynamic port forwarding"
 msgstr "Dynamische Port-Weiterleitung"
 
 #: /tmp/fish/implicit/share/completions/sshfs.fish:3
-#, fuzzy
 msgid "Compression"
-msgstr "Komprimierungsgrad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sshfs.fish:5
 msgid "Enable debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sshfs.fish:6
-#, fuzzy
 msgid "Foreground operation"
-msgstr "Löschung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sshfs.fish:7
-#, fuzzy
 msgid "Disable multi-threaded operation"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:1
-#, fuzzy
 msgid "Show this help text"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:2
-#, fuzzy
 msgid "Show only version number"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:3
 msgid "Run 'stack --docker-help' for details"
@@ -55179,9 +51325,8 @@ msgid "Specialized GHC variant, e.g. integersimple (implies --no-system-ghc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:15
-#, fuzzy
 msgid "Number of concurrent jobs to run"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:16
 msgid "Extra directories to check for C header files"
@@ -55224,9 +51369,8 @@ msgid "Override resolver in project file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:26
-#, fuzzy
 msgid "Use the specified compiler"
-msgstr "Angegebene Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:27
 msgid ""
@@ -55251,19 +51395,16 @@ msgid "Build the package(s) in this directory/configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:31
-#, fuzzy
 msgid "Shortcut for 'build --copy-bins'"
-msgstr "Abkürzung für '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:32
-#, fuzzy
 msgid "Shortcut for 'build --test'"
-msgstr "Abkürzung für '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:33
-#, fuzzy
 msgid "Shortcut for 'build --bench'"
-msgstr "Abkürzung für '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:34
 msgid "Shortcut for 'build --haddock'"
@@ -55292,42 +51433,36 @@ msgid "Get the appropriate GHC for your project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:40
-#, fuzzy
 msgid "Print out handy path information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:41
-#, fuzzy
 msgid "Unpack one or more packages locally"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:42
-#, fuzzy
 msgid "Update the package index"
-msgstr "Paketliste aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:43
 msgid "Upgrade to the latest stack (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:44
-#, fuzzy
 msgid "Upload a package to Hackage"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:45
-#, fuzzy
 msgid "Create source distribution tarballs"
-msgstr "Distributions-tarball erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:46
 msgid "Visualize your project's dependency graph using Graphviz dot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:47
-#, fuzzy
 msgid "Execute a command"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:48
 msgid "Run ghc"
@@ -55355,14 +51490,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:54
-#, fuzzy
 msgid "Clean the local packages"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:55
-#, fuzzy
 msgid "List the dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:56
 msgid "Query general build information (experimental)"
@@ -55393,14 +51526,12 @@ msgid "Subcommands specific to package signatures (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:2
-#, fuzzy
 msgid "Test if this is a login shell"
-msgstr "Dies ist eine Login-Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:3
-#, fuzzy
 msgid "Test if this is an interactive shell"
-msgstr "Willkommen zu fish, der freundlichen interaktiven Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:4
 msgid "Test if a command substitution is currently evaluated"
@@ -55427,14 +51558,12 @@ msgid "Test if all new jobs are put under job control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:10
-#, fuzzy
 msgid "Print the filename of the currently running script"
-msgstr "Derzeit laufende Jobs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:11
-#, fuzzy
 msgid "Print the line number of the currently running script"
-msgstr "Derzeit laufende Jobs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:12
 msgid ""
@@ -55442,43 +51571,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:13
-#, fuzzy
 msgid "Set which jobs are under job control"
-msgstr "Stoppanforderung über Jobsteuerung (^Z)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:14
-#, fuzzy
 msgid "Set all jobs under job control"
-msgstr "Job unter Curser selektieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:15
-#, fuzzy
 msgid "Set only interactive jobs under job control"
-msgstr "Job unter Curser selektieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:16
-#, fuzzy
 msgid "Set no jobs under job control"
-msgstr "Job unter Curser selektieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:13
-#, fuzzy
 msgid "Components one or more pixel components"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:23
 msgid "Pixel storage type [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:1
-#, fuzzy
 msgid "Do not print output"
-msgstr "Aktualisierung nicht durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:2
-#, fuzzy
 msgid "Specify maximum number of splits"
-msgstr "Maximale Zahl offener Datei-Deskriptoren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:3
 msgid "Split right-to-left"
@@ -55489,9 +51611,8 @@ msgid "Trim only leading characters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:5
-#, fuzzy
 msgid "Trim only trailing characters"
-msgstr "Alle nicht druckbaren Zeichen maskieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:6
 msgid "Specify the chars to trim (default: whitespace)"
@@ -55502,14 +51623,12 @@ msgid "Escape with \\ instead of quoting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:8
-#, fuzzy
 msgid "Report index and length of the matches"
-msgstr "Byte-Offset von Treffern ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:9
-#, fuzzy
 msgid "Report only non-matching input"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:10
 msgid "Report all matches per line/string"
@@ -55528,43 +51647,36 @@ msgid "Repetition count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:14
-#, fuzzy
 msgid "Maximum number of printed char"
-msgstr "Maximalanzahl geschachtelter Blöcke erreicht."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:15
-#, fuzzy
 msgid "Remove newline"
-msgstr "Kein Neue-Zeile-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
-#, fuzzy
 msgid "Open a new window"
-msgstr "Root-Fenster auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:4
-#, fuzzy
 msgid "Add folders to the current window"
-msgstr "Dateien an Archiv anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:5
 msgid "Wait for the files to be closed before returning"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:6
-#, fuzzy
 msgid "Don't activate the application"
-msgstr "Aktion nicht tatsächlich ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:7
 msgid "Keep the application activated after closing the file"
@@ -55581,44 +51693,36 @@ msgid "Preserve environment"
 msgstr "Umgebung erhalten"
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:4
-#, fuzzy
 msgid "Set home"
-msgstr "Zeit festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:5
-#, fuzzy
 msgid "Remove the credential timestamp entirely"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:6
-#, fuzzy
 msgid "Preserve group vector"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:7
-#, fuzzy
 msgid "Read password from stdin"
-msgstr "Namen über Standardeingabe lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:8
-#, fuzzy
 msgid "Run command in the background"
-msgstr "Job im Hintergrund ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:9
-#, fuzzy
 msgid "Edit"
-msgstr "Kennzeichnung bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:10
-#, fuzzy
 msgid "Run command as group"
-msgstr "Befehle aus dem Cache starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:12
-#, fuzzy
 msgid "Run a login shell"
-msgstr "Dies ist eine Login-Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:13
 msgid "Reset or ignore the credential timestamp"
@@ -55631,32 +51735,28 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:15
-#, fuzzy
 msgid "Do not prompt for a password - if one is needed, fail"
-msgstr "Nicht nach einer Ablaufzeit fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:16
-#, fuzzy
 msgid "Specify a custom password prompt"
-msgstr "http-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:17
 msgid "Run the given command in a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:18
-#, fuzzy
 msgid "Run command as user"
-msgstr "Befehle aus dem Cache starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:19
 msgid "Validate the credentials, extending timeout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:1
-#, fuzzy
 msgid "Make login shell"
-msgstr "Dies ist eine Login-Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:2
 msgid "Pass command to shell"
@@ -55678,21 +51778,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:3
 #: /tmp/fish/implicit/share/completions/svn.fish:5
-#, fuzzy
 msgid ""
 "Output the content of specified files or URLs with revision and author "
 "information in-line."
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:4
-#, fuzzy
 msgid "Output the content of specified files or URLs."
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:6
-#, fuzzy
 msgid "Check out a working copy from a repository."
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:7
 msgid ""
@@ -55701,19 +51798,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:8
-#, fuzzy
 msgid "Send changes from your working copy to the repository."
-msgstr "Änderungen der Arbeitskopie als Patch zum Paketdepot sichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:9
-#, fuzzy
 msgid "Duplicate something in working copy or repository, remembering history."
-msgstr "Änderungen der Arbeitskopie als Patch zum Paketdepot sichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:10
-#, fuzzy
 msgid "Display the differences between two revisions or paths."
-msgstr "Unterschiede zwischen Revisionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:11
 msgid "Create an unversioned copy of a tree."
@@ -55724,19 +51818,16 @@ msgid "Describe the usage of this program or its subcommands."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:13
-#, fuzzy
 msgid "Commit an unversioned file or tree into the repository."
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:14
-#, fuzzy
 msgid "Display information about a local or remote item."
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:15
-#, fuzzy
 msgid "List directory entries in the repository."
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:16
 msgid ""
@@ -55749,29 +51840,24 @@ msgid "Show the log messages for a set of revision(s) and/or file(s)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:18
-#, fuzzy
 msgid "Apply the differences between two sources to a working copy path."
-msgstr "Unterschiede zwischen Revisionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:19
-#, fuzzy
 msgid "Display information related to merges"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:20
-#, fuzzy
 msgid "Create a new directory under version control."
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:21
-#, fuzzy
 msgid "Move and/or rename something in working copy or repository."
-msgstr "Änderungen der Arbeitskopie als Patch zum Paketdepot sichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:22
-#, fuzzy
 msgid "Apply a unidiff patch to the working copy"
-msgstr "Nicht aufgezeichnete Änderungen in der Arbeitskopie anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:23
 msgid "Remove a property from files, dirs, or revisions."
@@ -55798,29 +51884,24 @@ msgid "Rewrite working copy url metadata"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:29
-#, fuzzy
 msgid "Remove files and directories from version control."
-msgstr "Ein oder mehrere Dateien/Verzeichnisse aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:30
-#, fuzzy
 msgid "Remove conflicts on working copy files or directories."
-msgstr "Eine/mehrere Datei/en oder Verzeichnis/se verschieben/umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:31
-#, fuzzy
 msgid "Remove 'conflicted' state on working copy files or directories."
-msgstr "Eine/mehrere Datei/en oder Verzeichnis/se verschieben/umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:32
-#, fuzzy
 msgid "Restore pristine working copy file (undo most local edits)."
-msgstr "Eine/mehrere Datei/en oder Verzeichnis/se verschieben/umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
-#, fuzzy
 msgid "Print the status of working copy files and directories."
-msgstr "Eine/mehrere Datei/en oder Verzeichnis/se verschieben/umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
 msgid "Update the working copy to a different URL."
@@ -55831,33 +51912,28 @@ msgid "Unlock working copy paths or URLs."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:36
-#, fuzzy
 msgid "Bring changes from the repository into the working copy."
-msgstr "Patches von einem anderen Paketdepot auf dieses kopieren und anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:37
 msgid "Upgrade the metadata storage format for a working copy."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:38
-#, fuzzy
 msgid "Specify a username ARG"
-msgstr "http-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:39
-#, fuzzy
 msgid "Specify a password ARG"
-msgstr "http-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:40
-#, fuzzy
 msgid "Do not cache authentication tokens"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:41
-#, fuzzy
 msgid "Do no interactive prompting"
-msgstr "Ausführung im interaktiven Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:42
 msgid ""
@@ -55866,9 +51942,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:43
-#, fuzzy
 msgid "Read user configuration files from directory ARG"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:44
 msgid ""
@@ -55888,9 +51963,8 @@ msgid "Open composition window with attached files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:7
-#, fuzzy
 msgid "Receive new messages"
-msgstr "E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:8
 msgid "Receive new messages of all accounts"
@@ -55909,9 +51983,8 @@ msgid "Show the total number of messages for each folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:12
-#, fuzzy
 msgid "Specify directory with configuration files"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:1
 msgid "The total number of worker threads to create (default: 1)"
@@ -55992,23 +52065,20 @@ msgid "Total size of data to transfer (default: 100G)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:20
-#, fuzzy
 msgid "Type of memory operations"
-msgstr "Optionen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:21
-#, fuzzy
 msgid "Number of files to create (default: 128)"
-msgstr "Ausgecheckte Dateien beschreibbar machen (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:22
 msgid "Block size to use in all I/O operations (default: 16K)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:23
-#, fuzzy
 msgid "Total size of files (default: 2G)"
-msgstr "Dokumentationsdateien installieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:24
 msgid "Type of workload to produce"
@@ -56071,11 +52141,8 @@ msgid "Number of point select queries in a single transaction (default: 10)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:38
-#, fuzzy
 msgid "Number of simple range queries in a single transaction (default: 1)"
 msgstr ""
-"Anzahl der vollständig vertrauenswürdigen Benutzer, um einen neuen "
-"Schlüsselunterzeichner einzuführen (Standard ist 1)"
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:39
 msgid "Number of SUM range queries in a single transaction (default: 1)"
@@ -56166,9 +52233,8 @@ msgid "MySQL database name (default: sbtest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:60
-#, fuzzy
 msgid "Type of the test table to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:61
 msgid "Use SSL connections. (default: no)"
@@ -56185,33 +52251,28 @@ msgid "Additional options passed to CREATE TABLE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:1
-#, fuzzy
 msgid "Start one or more units"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:2
-#, fuzzy
 msgid "Stop one or more units"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:3
-#, fuzzy
 msgid "Restart one or more units"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:4
 msgid "Runtime status about one or more units"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:5
-#, fuzzy
 msgid "Enable one or more units"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:6
-#, fuzzy
 msgid "Disable one or more units"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:7
 msgid "Start a unit and dependencies and disable all others"
@@ -56222,49 +52283,40 @@ msgid "Set the default target to boot into"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:9
-#, fuzzy
 msgid "List of unit types"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:10
-#, fuzzy
 msgid "List of unit states"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:11
-#, fuzzy
 msgid "Show all units or properties"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:12
-#, fuzzy
 msgid "Show also units of local containers"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:13
-#, fuzzy
 msgid "Show reverse dependencies between units"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:14
-#, fuzzy
 msgid "Show units ordered before specified unit"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:15
-#, fuzzy
 msgid "Show units ordered after specified unit"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:16
-#, fuzzy
 msgid "Do not ellipsize anything"
-msgstr "Nichts schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:17
-#, fuzzy
 msgid "Show the type of the socket"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:18
 msgid "How to deal with queued jobs"
@@ -56275,9 +52327,8 @@ msgid "Ignore inhibitor locks on shutdown or sleep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:20
-#, fuzzy
 msgid "Suppress output to STDOUT"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:21
 msgid "Do not wait for the requested operation to finish"
@@ -56302,14 +52353,12 @@ msgid "Do not send wall message before halt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:27
-#, fuzzy
 msgid "Do not reload daemon configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:28
-#, fuzzy
 msgid "Disable asking for password"
-msgstr "Operater-Schlüsselworte deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:29
 msgid "Send signal to which process"
@@ -56332,18 +52381,16 @@ msgid "Make changes only temporarily"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:34
-#, fuzzy
 msgid "Number of journal lines to show"
-msgstr "Nicht-leere Zeilen nummerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:35
 msgid "Control journal formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:36
-#, fuzzy
 msgid "list-dependencies flat, not as tree"
-msgstr "Abhängigkeiten für dieses Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:42
 msgid "Reboot to EFI setup"
@@ -56374,28 +52421,24 @@ msgid "Disk image to mount the root directory for the container from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:5
-#, fuzzy
 msgid "Invoke init in the container"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:6
-#, fuzzy
 msgid "Change to user in the container"
-msgstr "Zeige Zeit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:7
 msgid "Sets the machine name for this container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:8
-#, fuzzy
 msgid "Set the specified UUID for the container."
-msgstr "Angegebene Zeichenkette als Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:9
-#, fuzzy
 msgid "Make the container part of the specified slice"
-msgstr "Dateisysteme des angegebenen Typs anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:10
 msgid "Set a unit property on the scope unit"
@@ -56426,21 +52469,16 @@ msgid "Create a virtual Ethernet link (\"veth\") between host and container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:17
-#, fuzzy
 msgid "Adds the host side of the Ethernet link created to the specified bridge"
 msgstr ""
-"Die Liste der Standardeinstellungen gemäß der angegebenen Zeichenkette "
-"festlegen"
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:18
-#, fuzzy
 msgid "Map an ip port from the host to the container"
-msgstr "Patches von einem anderen Paketdepot auf dieses kopieren und anwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:19
-#, fuzzy
 msgid "Sets the SELinux security context"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:20
 msgid "Sets the SELinux security context for files in the API filesystems"
@@ -56475,19 +52513,16 @@ msgid "Bind mount a file or directory from the host in the container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:28
-#, fuzzy
 msgid "Mount a tmpfs file system into the container"
-msgstr "Dateisystems aus fstab einhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:29
-#, fuzzy
 msgid "Mount directories as overlayfs in the container"
-msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:30
-#, fuzzy
 msgid "Pass environment variables to init in the container"
-msgstr "TERM Umgebungsvariable nicht gesetzt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:31
 msgid "Share the system with the host [See Man Page]"
@@ -56631,9 +52666,8 @@ msgid "Reblock while reading"
 msgstr "Während des Lesens umblocken"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:16
-#, fuzzy
 msgid "Print directory names"
-msgstr "Verzeichnisnamen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:17
 msgid "Archive file"
@@ -56656,9 +52690,8 @@ msgid "Use new incremental GNU format"
 msgstr "Neues inkrementelles GNU-Format benutzen"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:22
-#, fuzzy
 msgid "Dereference symlinks"
-msgstr "Symbolische Links dereferenzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:23
 msgid "Ignore zero block in archive"
@@ -56713,9 +52746,8 @@ msgstr "Auf stdout extrahieren"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:38
 #: /tmp/fish/implicit/share/completions/tar.fish:39
-#, fuzzy
 msgid "Extract all permissions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:40
 msgid "Don't strip leading /"
@@ -56730,24 +52762,21 @@ msgid "Show record number"
 msgstr "Satznummer anzeigen"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:43
-#, fuzzy
 msgid "Remove files after adding to archive"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
-#, fuzzy
 msgid "Do not sort file arguments"
-msgstr "Keine Flags anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:46
 msgid "Preserve file ownership"
 msgstr "Dateieigentümer erhalten"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:47
-#, fuzzy
 msgid "Handle sparse files"
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:48
 msgid "Extract file from file"
@@ -56771,9 +52800,8 @@ msgid "Ask for confirmation"
 msgstr "Nach Bestätigung fragen"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:56
-#, fuzzy
 msgid "Verify archive"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:57
 msgid "Exclude file"
@@ -56798,9 +52826,8 @@ msgid "Filter through specified program"
 msgstr "durch angegebenes Programm filtern"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:64
-#, fuzzy
 msgid "Filter through xz"
-msgstr "durch gzip filtern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tee.fish:1
 msgid "append to the given FILEs, do not overwrite"
@@ -56811,9 +52838,8 @@ msgid "ignore interrupt signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:1
-#, fuzzy
 msgid "Display help message"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:3
 msgid "Tell termite start <cmd> instead of the shell"
@@ -56824,9 +52850,8 @@ msgid "The role to set the termite window to report itself with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:5
-#, fuzzy
 msgid "Set the termite window's title"
-msgstr "Setzen der Terminalfarbe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:6
 msgid "Tell termite to change to <dir> when launching"
@@ -56845,9 +52870,8 @@ msgid "Launch on <disp> X display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:10
-#, fuzzy
 msgid "Config file to use"
-msgstr "Wechsel zu Benutzer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:11
 msgid "Set the windows name part of WM_CLASS property"
@@ -56867,9 +52891,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:101
 #: /tmp/fish/implicit/share/completions/terraform.fish:116
 #: /tmp/fish/implicit/share/completions/terraform.fish:125
-#, fuzzy
 msgid "Path to backup the existing state file"
-msgstr "Sicherung jeder existierenden Zieldatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:5
 #: /tmp/fish/implicit/share/completions/terraform.fish:23
@@ -56890,9 +52913,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:104
 #: /tmp/fish/implicit/share/completions/terraform.fish:118
 #: /tmp/fish/implicit/share/completions/terraform.fish:127
-#, fuzzy
 msgid "Duration to retry a state lock"
-msgstr "Verzeichnisnamen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:7
 #: /tmp/fish/implicit/share/completions/terraform.fish:52
@@ -56921,9 +52943,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:9
 #: /tmp/fish/implicit/share/completions/terraform.fish:26
 #: /tmp/fish/implicit/share/completions/terraform.fish:84
-#, fuzzy
 msgid "Limit the number of concurrent operations"
-msgstr "Anzahl gleichzeitiger Jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:10
 #: /tmp/fish/implicit/share/completions/terraform.fish:27
@@ -56948,17 +52969,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:107
 #: /tmp/fish/implicit/share/completions/terraform.fish:122
 #: /tmp/fish/implicit/share/completions/terraform.fish:131
-#, fuzzy
 msgid "Path to write state"
-msgstr "keine mtab schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:13
 #: /tmp/fish/implicit/share/completions/terraform.fish:30
 #: /tmp/fish/implicit/share/completions/terraform.fish:87
 #: /tmp/fish/implicit/share/completions/terraform.fish:108
-#, fuzzy
 msgid "Resource to target"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:14
 #: /tmp/fish/implicit/share/completions/terraform.fish:18
@@ -56967,9 +52986,8 @@ msgstr "Dienstname"
 #: /tmp/fish/implicit/share/completions/terraform.fish:88
 #: /tmp/fish/implicit/share/completions/terraform.fish:96
 #: /tmp/fish/implicit/share/completions/terraform.fish:109
-#, fuzzy
 msgid "Set a variable in the Terraform configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:15
 #: /tmp/fish/implicit/share/completions/terraform.fish:19
@@ -56978,9 +52996,8 @@ msgstr "Dienstkonfiguration neu laden"
 #: /tmp/fish/implicit/share/completions/terraform.fish:89
 #: /tmp/fish/implicit/share/completions/terraform.fish:97
 #: /tmp/fish/implicit/share/completions/terraform.fish:110
-#, fuzzy
 msgid "Set variables from a file"
-msgstr "Formatdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:16
 msgid "Interactive console for Terraform interpolations"
@@ -56991,34 +53008,28 @@ msgid "Destroy Terraform-managed infrastructure"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:22
-#, fuzzy
 msgid "Don't ask for input for destroy confirmation"
-msgstr "Keine Gruppeninformation ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:33
-#, fuzzy
 msgid "Environment management"
-msgstr "Umgebung vor makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:34
-#, fuzzy
 msgid "List environments"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:35
-#, fuzzy
 msgid "Select an environment"
-msgstr "Eine Aktion auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:36
-#, fuzzy
 msgid "Create a new environment"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:37
-#, fuzzy
 msgid "Delete an existing environment"
-msgstr "Freistehende Umgebung bestätigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:38
 msgid "Rewrite config files to canonical format"
@@ -57029,23 +53040,20 @@ msgid "List files whose formatting differs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:40
-#, fuzzy
 msgid "Write result to source file"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:41
-#, fuzzy
 msgid "Display diffs of formatting changes"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:42
 msgid "Download and install modules for the configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:43
-#, fuzzy
 msgid "Check modules for updates"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:45
 msgid "Create a visual graph of Terraform resources"
@@ -57064,9 +53072,8 @@ msgid "Import existing infrastructure into Terraform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:51
-#, fuzzy
 msgid "Path to a directory of configuration files"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:56
 msgid "Specific provider to use for import"
@@ -57081,14 +53088,12 @@ msgid "Configure the backend for this environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:63
-#, fuzzy
 msgid "Backend configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:64
-#, fuzzy
 msgid "Download modules for this configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:65
 msgid "Ask for input if necessary"
@@ -57099,32 +53104,28 @@ msgid "Suppress prompts about copying state data"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:70
-#, fuzzy
 msgid "Read an output from a state file"
-msgstr "Job aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:71
 msgid "Path to the state file to read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:73
-#, fuzzy
 msgid "Return the outputs for a specific module"
-msgstr "Schreibe Ausgabe in die angegebene Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:74
-#, fuzzy
 msgid "Print output in JSON format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:75
 msgid "Generate and show an execution plan"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:76
-#, fuzzy
 msgid "Generate a plan to destroy all resources"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:77
 msgid "Return detailed exit codes"
@@ -57136,9 +53137,8 @@ msgid "Depth of modules to show in the output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:83
-#, fuzzy
 msgid "Write a plan file to the given path"
-msgstr "Datei der Eingabe voranstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:90
 msgid "Upload this Terraform module to Atlas to run"
@@ -57153,9 +53153,8 @@ msgid "Lock modules and upload completely"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:93
-#, fuzzy
 msgid "Name of the configuration in Atlas"
-msgstr "Eine Konfigurationsdatei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:94
 msgid "Access token to use to upload"
@@ -57200,23 +53199,20 @@ msgid "Validate the Terraform files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:134
-#, fuzzy
 msgid "Print the Terraform version"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:2
 msgid "Negate expression"
 msgstr "Ausdruck negieren"
 
 #: /tmp/fish/implicit/share/completions/test.fish:3
-#, fuzzy
 msgid "Logical AND"
-msgstr "Logisches Oder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:4
-#, fuzzy
 msgid "Logical OR"
-msgstr "Logisches Oder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:5
 msgid "String length is non-zero"
@@ -57283,24 +53279,20 @@ msgid "File is set-group-ID"
 msgstr "Datei ist set-group-ID"
 
 #: /tmp/fish/implicit/share/completions/test.fish:21
-#, fuzzy
 msgid "File owned by our effective group ID"
-msgstr "Datei gehört effektiver Gruppenkennung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:22
-#, fuzzy
 msgid "File is a symlink"
-msgstr "Datei ist symbolischer Link"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:23
-#, fuzzy
 msgid "File owned by our effective user ID"
-msgstr "Datei gehört zu effektiver Benutzerkennung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:24
-#, fuzzy
 msgid "File is a named pipe"
-msgstr "Datei ist eine benannte Pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:25
 msgid "File is readable"
@@ -57311,14 +53303,12 @@ msgid "File size is non-zero"
 msgstr "Dateigröße ist nicht 0"
 
 #: /tmp/fish/implicit/share/completions/test.fish:27
-#, fuzzy
 msgid "File is a socket"
-msgstr "Datei ist Socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:28
-#, fuzzy
 msgid "FD is a terminal"
-msgstr "FD ist ein Terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:29
 msgid "File set-user-ID bit is set"
@@ -57344,9 +53334,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tex.fish:7
 #: /tmp/fish/implicit/share/completions/tex.fish:8
 #: /tmp/fish/implicit/share/completions/tex.fish:9
-#, fuzzy
 msgid "Set interaction mode"
-msgstr "Schnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:11
 msgid "Enable \\write18{SHELL COMMAND}"
@@ -57357,9 +53346,8 @@ msgid "Disable \\write18{SHELL COMMAND}"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:13
-#, fuzzy
 msgid "Insert source specials into the DVI file"
-msgstr "Quellindexdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:1
 msgid "Maintain RTC in local time"
@@ -57378,21 +53366,16 @@ msgid "Execute operation on a local container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/time.fish:2
-#, fuzzy
 msgid "Specify output format"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/time.fish:3
-#, fuzzy
 msgid "Use the portable output format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/time.fish:4
-#, fuzzy
 msgid "Do not send the results to stderr, but overwrite the specified file"
 msgstr ""
-"Nicht den öffentlichen Schlüssel, sondern den angegebenen Sitzungsschlüssel "
-"benutzen"
 
 #: /tmp/fish/implicit/share/completions/time.fish:5
 msgid "(Used together with -o) Do not overwrite but append"
@@ -57407,9 +53390,8 @@ msgid "Send a KILL signal after DURATION"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timeout.fish:3
-#, fuzzy
 msgid "Specify the signal to be sent"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:1
 msgid "Add an exclusion not to back up a file"
@@ -57422,9 +53404,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:3
 #: /tmp/fish/implicit/share/completions/tmutil.fish:37
-#, fuzzy
 msgid "Path exclusion"
-msgstr "PKZIP-Rekursion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:4
 msgid "Bind a snapshot volume directory to the specified local disk"
@@ -57439,56 +53420,48 @@ msgid "Perform a backup diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:7
-#, fuzzy
 msgid "Compare all supported metadata"
-msgstr "Alle Daten komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:8
 msgid "No metadata comparison"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:9
-#, fuzzy
 msgid "Compare extended attributes"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:10
-#, fuzzy
 msgid "Compare creation times"
-msgstr "Vergleiche Monatsnamen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:11
-#, fuzzy
 msgid "Compare file data forks"
-msgstr "Profildatenformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:12
 msgid "Compare ACLs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:13
-#, fuzzy
 msgid "Compare file flags"
-msgstr "Datei komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:14
 msgid "Compare GIDs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:15
-#, fuzzy
 msgid "Compare file modes"
-msgstr "Vollständig ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:16
-#, fuzzy
 msgid "Compare sizes"
-msgstr "Datei komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:17
-#, fuzzy
 msgid "Compare modification times"
-msgstr "Modifikationszeit ändern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:18
 msgid "Compare UIDs"
@@ -57499,28 +53472,24 @@ msgid "Limit traversal depth to depth levels from the beginning of iteration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:20
-#, fuzzy
 msgid "Dont take exclusions into account"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:21
-#, fuzzy
 msgid "Ignore path"
-msgstr "Gross-/Kleinschreibung ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:22
 msgid "Ignore logical volume identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:23
-#, fuzzy
 msgid "Delete one or more snapshots"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:24
-#, fuzzy
 msgid "Print information about destinations"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:25
 msgid "Turn off automatic backups"
@@ -57556,33 +53525,28 @@ msgid "Print paths for all snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
-#, fuzzy
 msgid "Removes a backup destination"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:35
-#, fuzzy
 msgid "Remove an exclusion"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:38
 msgid "Restore an item"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:39
-#, fuzzy
 msgid "Set a backup destination"
-msgstr "Vervollständigung entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:40
-#, fuzzy
 msgid "Add to the list of destinations"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:41
 msgid "Enter the password at a non-echoing interactive prompt"
@@ -57597,23 +53561,20 @@ msgid "Begin a backup if one is not already running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:44
-#, fuzzy
 msgid "Automatic mode"
-msgstr "Kumulativer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:45
 msgid "Block until finished"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:46
-#, fuzzy
 msgid "Automatic rotation"
-msgstr "Kumulativer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:47
-#, fuzzy
 msgid "Backup destination"
-msgstr "Sicherung der Original-Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:48
 msgid "Cancel a backup currently in progress"
@@ -57628,24 +53589,20 @@ msgid "Verify snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:52
-#, fuzzy
 msgid "Print as XML"
-msgstr "Datenbank ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:1
-#, fuzzy
 msgid "available sessions"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:2
-#, fuzzy
 msgid "connected clients"
-msgstr "Funktionen auflisten oder entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:3
-#, fuzzy
 msgid "window panes"
-msgstr "Änderung der Fenstergröße"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:4
 msgid "Force tmux to assume the terminal supports 256 colours"
@@ -57656,62 +53613,52 @@ msgid "Like -2, but indicates that the terminal supports 88 colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:6
-#, fuzzy
 msgid "Behave as a login shell"
-msgstr "Dies ist eine Login-Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:7
-#, fuzzy
 msgid "Set the quiet server option"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:8
 msgid "Flag explicitly informs tmux that UTF-8 is supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:9
-#, fuzzy
 msgid "Request verbose logging"
-msgstr "Angemeldete Benutzer auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:10
-#, fuzzy
 msgid "Report the tmux version"
-msgstr "Sortierung nach Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:11
-#, fuzzy
 msgid "Execute command using the default shell"
-msgstr "Vollständige Befehlszeile selektieren (Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:13
-#, fuzzy
 msgid "Specify the name of the server socket to use"
-msgstr "Zeitablauf für Zwischenspeicher angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:14
 msgid "Full path to server socket. If set, -L is ignored."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:15
-#, fuzzy
 msgid "attach to existing session"
-msgstr "Eine lokale Kopie eines weiteren Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:16
-#, fuzzy
 msgid "detach other clients"
-msgstr "Funktionen auflisten oder entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:17
-#, fuzzy
 msgid "attach in read-only mode"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:18
-#, fuzzy
 msgid "detach current client"
-msgstr "Festlegen/Anzeigen aller aktuellen Begrenzungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:19
 msgid "SIGHUP parent process of client, likely causing it to exit"
@@ -57732,29 +53679,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:23
-#, fuzzy
 msgid "list all attached clients"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:24
-#, fuzzy
 msgid "list syntax for all tmux commands"
-msgstr "Diesen Befehl deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:25
-#, fuzzy
 msgid "list all sessions"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:26
-#, fuzzy
 msgid "lock client"
-msgstr "Blockgrösse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:27
-#, fuzzy
 msgid "lock session"
-msgstr "Blockgrösse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:28
 msgid "create a new session with name session-name"
@@ -57765,47 +53707,40 @@ msgid "don't attach to current window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:30
-#, fuzzy
 msgid "window-name"
-msgstr "Änderung der Fenstergröße"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:31
-#, fuzzy
 msgid "session-name"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:32
-#, fuzzy
 msgid "width"
-msgstr "Zeilenbreite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:33
 msgid "height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:34
-#, fuzzy
 msgid "refresh client"
-msgstr "Name des Patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:35
-#, fuzzy
 msgid "update client status bar"
-msgstr "Exit-Status des Jobs verneinen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:36
-#, fuzzy
 msgid "rename session"
-msgstr "Standardeingabe umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:37
 msgid "save msgs in status bar in per-client msg log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:38
-#, fuzzy
 msgid "execute commands from path"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:39
 msgid "start tmux server if not running; do not create a session"
@@ -57820,24 +53755,20 @@ msgid "Switch the current session for client target-client to target-session"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:42
-#, fuzzy
 msgid "move client to the last session"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:43
-#, fuzzy
 msgid "move client to the next session"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:44
-#, fuzzy
 msgid "move client to the previous session"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:45
-#, fuzzy
 msgid "toggle if client is read-only"
-msgstr "Ordner nur zum Lesen öffnen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:46
 #: /tmp/fish/implicit/share/completions/tmux.fish:47
@@ -57850,20 +53781,17 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tmux.fish:49
 #: /tmp/fish/implicit/share/completions/tmux.fish:80
 #: /tmp/fish/implicit/share/completions/tmux.fish:84
-#, fuzzy
 msgid "target-client"
-msgstr "Zielzeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:50
-#, fuzzy
 msgid "format string"
-msgstr "Prompt-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:51
 #: /tmp/fish/implicit/share/completions/tmux.fish:74
-#, fuzzy
 msgid "bind key to command"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:52
 msgid "bind for command mode instead of normal mode"
@@ -57874,9 +53802,8 @@ msgid "make the binding work without using a prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:54
-#, fuzzy
 msgid "key may repeat"
-msgstr "Man-Pfad angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:55
 msgid "choose key table for binding"
@@ -57884,15 +53811,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:56
 #: /tmp/fish/implicit/share/completions/tmux.fish:58
-#, fuzzy
 msgid "list all key bindings"
-msgstr "Fish-Tastenbelegungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:57
 #: /tmp/fish/implicit/share/completions/tmux.fish:68
-#, fuzzy
 msgid "key table"
-msgstr "Programm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:59
 msgid "reset terminal state"
@@ -57900,85 +53825,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:60
 #: /tmp/fish/implicit/share/completions/tmux.fish:63
-#, fuzzy
 msgid "target pane"
-msgstr "Zielzeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:61
 msgid "send the prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:62
-#, fuzzy
 msgid "use secondary prefix"
-msgstr "Verzeichnis-Präfix festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:64
 msgid "unbind the command bound to key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:65
-#, fuzzy
 msgid "remove all key bindings"
-msgstr "Konnte Tastenkürzel nicht analysieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:66
-#, fuzzy
 msgid "binding for command mode"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:67
 msgid "command bound to key without a prefix (if any) removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:69
-#, fuzzy
 msgid "Set or unset an environment variable"
-msgstr "Hilfe zu Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:70
 #: /tmp/fish/implicit/share/completions/tmux.fish:75
-#, fuzzy
 msgid "global environment"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:71
 msgid "remove from environment before starting a new process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:72
-#, fuzzy
 msgid "unset variable"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:77
 msgid "Open the command prompt in a client"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:78
-#, fuzzy
 msgid "Comma-separated list of initial text for each prompt"
-msgstr "Komma-getrennte Liste anzuzeigender Abhängigkeitstypen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:79
-#, fuzzy
 msgid "Comma-separated list of prompts"
-msgstr "Komma-getrenntes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:81
-#, fuzzy
 msgid "Display a message"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:82
-#, fuzzy
 msgid "print to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:83
-#, fuzzy
 msgid "target-pane"
-msgstr "Zielzeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:2
 msgid "Toggle command line/program name"
@@ -57989,9 +53902,8 @@ msgid "Toggle idle processes"
 msgstr "Anzeige wartender Prozesse umschalten"
 
 #: /tmp/fish/implicit/share/completions/top.fish:6
-#, fuzzy
 msgid "Maximum iterations"
-msgstr "Maximale Wiederholungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:7
 msgid "Monitor effective UID"
@@ -58022,9 +53934,8 @@ msgid "Output  a longer help message then quit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:3
-#, fuzzy
 msgid "Output version information then quit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:4
 msgid "Tell any running totem instance: Toggle between play and pause"
@@ -58083,33 +53994,28 @@ msgid "Add torrents to transmission"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:2
-#, fuzzy
 msgid "Enable debugging mode"
-msgstr "Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:3
 msgid "Use the alternate Limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:4
-#, fuzzy
 msgid "Don't use the alternate Limits"
-msgstr "Das test-Skript nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:5
-#, fuzzy
 msgid "Limit the alternate download speed"
-msgstr "Herunterladegeschwindigkeit begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:6
-#, fuzzy
 msgid "Limit the alternate upload speed"
-msgstr "Herunterladegeschwindigkeit begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:7
-#, fuzzy
 msgid "Use the scheduled on/off times"
-msgstr "Diese Dateizeiten verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:8
 msgid "Don't use the scheduled on/off times"
@@ -58144,23 +54050,20 @@ msgid "Don't store incomplete torrents in a different directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:16
-#, fuzzy
 msgid "Limit the maximum download speed to limit"
-msgstr "Herunterladegeschwindigkeit begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:17
-#, fuzzy
 msgid "Disable download speed limits"
-msgstr "Herunterladen von Paketen deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:18
 msgid "Set the session's maximum memory cache size (MiB)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:19
-#, fuzzy
 msgid "Encrypt all peer connections"
-msgstr "Sämtlichen Netzverkehr verschlüsseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:20
 msgid "Prefer encrypted peer connections"
@@ -58195,47 +54098,40 @@ msgid "All torrents should seed regardless of ratio"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:28
-#, fuzzy
 msgid "Print command-line option descriptions"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:29
 msgid "Show details of the current torrent(s)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:30
-#, fuzzy
 msgid "List session information from the server"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:31
-#, fuzzy
 msgid "List statistical information from the server"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:32
-#, fuzzy
 msgid "List all torrents"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:33
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:34
-#, fuzzy
 msgid "Disable portmapping"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:35
-#, fuzzy
 msgid "Set the username:password for authentication"
-msgstr "Abfrage des Passworts für den Authentifizierungsserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:37
-#, fuzzy
 msgid "Set authentication information from a netrc file"
-msgstr "Verlaufsinformationen für ein Modul ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:38
 msgid "Enable distributed hash table (DHT)"
@@ -58262,29 +54158,24 @@ msgid "Give this torrent low bandwidth"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:44
-#, fuzzy
 msgid "Try to download the specified files first"
-msgstr "Protokollausgabe auf angegebenen Dateideskriptor schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:45
-#, fuzzy
 msgid "Try to download the specified files normally"
-msgstr "Angegebene Datei zur aktuellen Schlüsselringliste hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:46
-#, fuzzy
 msgid "Try to download the specified files last"
-msgstr "Protokollausgabe auf angegebenen Dateideskriptor schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:47
-#, fuzzy
 msgid "Set the maximum number of peers"
-msgstr "Maximale Zahl offener Datei-Deskriptoren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:48
-#, fuzzy
 msgid "Remove the current torrents"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:49
 msgid "Remove the current torrents and delete data"
@@ -58319,19 +54210,16 @@ msgid "Add a tracker to a torrent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:57
-#, fuzzy
 msgid "Remove a tracker from a torrent"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:58
-#, fuzzy
 msgid "Start the current torrents"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:59
-#, fuzzy
 msgid "Stop the current torrents"
-msgstr "Derzeit ausgewertete Funktion stoppen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:60
 msgid "Start added torrents paused"
@@ -58362,9 +54250,8 @@ msgid "Make the current torrent(s) not honor the session limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:67
-#, fuzzy
 msgid "Limit the maximum upload speed (KiB/s)"
-msgstr "Herunterladegeschwindigkeit begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:68
 msgid "Disable upload speed limits"
@@ -58375,14 +54262,12 @@ msgid "Enable uTP for peer connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:70
-#, fuzzy
 msgid "Disable uTP for peer connections"
-msgstr "Automatische Pufferzuordnung deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:71
-#, fuzzy
 msgid "Verify the current torrents"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:73
 msgid "Use directory as default for new downloads"
@@ -58409,9 +54294,8 @@ msgid "List the current torrent's connected peers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/trap.fish:1
-#, fuzzy
 msgid "Display names of all signals"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/trap.fish:2
 msgid "Display all currently defined trap handlers"
@@ -58430,9 +54314,8 @@ msgid "Displays the most recent build for each branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:3
-#, fuzzy
 msgid "Lists or deletes repository caches"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:4
 msgid "Cancels a job or build"
@@ -58443,14 +54326,12 @@ msgid "Interactive shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:6
-#, fuzzy
 msgid "Disables a project"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:7
-#, fuzzy
 msgid "Enables a project"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:8
 msgid "Encrypts values for the .travis.yml"
@@ -58461,14 +54342,12 @@ msgid "Encrypts a file and adds decryption steps to .travis.yml"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:10
-#, fuzzy
 msgid "Displays or changes the API endpoint"
-msgstr "$ am Zeilenende anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
-#, fuzzy
 msgid "Show or modify build environment variables"
-msgstr "Behandlung von Umgebungsvariablen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:12
 msgid "Helps you out when in dire need of information"
@@ -58523,18 +54402,16 @@ msgid "Lists repositories the user has certain permissions on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:25
-#, fuzzy
 msgid "Lists recent requests"
-msgstr "Bytes per Anforderung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:26
 msgid "Restarts a build or job"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:27
-#, fuzzy
 msgid "Access repository settings"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:28
 msgid "Sets up an addon or deploy target"
@@ -58561,18 +54438,16 @@ msgid "Outputs the secret API token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:34
-#, fuzzy
 msgid "Outputs the client version"
-msgstr "Sicherung der Original-Version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:35
 msgid "Lists most recent builds"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:36
-#, fuzzy
 msgid "Outputs the current user"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:38
 msgid "Be interactive and colorful"
@@ -58583,67 +54458,56 @@ msgid "Don't be interactive and colorful"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:40
-#, fuzzy
 msgid "Don't rescue exceptions"
-msgstr "Keine Skrpte ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:41
-#, fuzzy
 msgid "Rescue exceptions"
-msgstr "Geräte-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:42
-#, fuzzy
 msgid "Don't check if travis client is up to date"
-msgstr "Vor der Installation nicht auf ausreichenden Plattenplatz prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:43
 msgid "Don't check if auto-completion is set up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:1
-#, fuzzy
 msgid "All files are listed"
-msgstr "Alle Bitfielder sind vorzeichenbehaftet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:2
-#, fuzzy
 msgid "List directories only"
-msgstr "Unterverzeichnisse rekursiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:3
-#, fuzzy
 msgid "Follow symbolic links like directories"
-msgstr "Symbolischer Link auf Ordner"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:4
-#, fuzzy
 msgid "Print the full path prefix for each file"
-msgstr "Vollständigen Quellpfad ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:5
-#, fuzzy
 msgid "Stay on current filesystem only"
-msgstr "Im lokalen Dateisystem bleiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:6
-#, fuzzy
 msgid "Descend only level directories deep"
-msgstr "Unterverzeichnisse rekursiv entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:7
 msgid "Rerun tree when max dir level reached"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:8
-#, fuzzy
 msgid "List only those files that match the pattern given"
-msgstr "Den Mustern in der Datei entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:9
-#, fuzzy
 msgid "Do not list files that match the given pattern"
-msgstr "Module einfügen, die den angegebenen Mustern entsprechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:10
 msgid "Turn off file/directory count at end of tree listing"
@@ -58662,43 +54526,36 @@ msgid "Print and format time according to the format <f>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:14
-#, fuzzy
 msgid "Output to file instead of stdout"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:15
-#, fuzzy
 msgid "Print non-printable characters as '?'"
-msgstr "Nicht darstellbare Zeichen durch '?' ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:16
-#, fuzzy
 msgid "Print non-printable characters as is"
-msgstr "Alle nicht druckbaren Zeichen maskieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:17
 msgid "Quote filenames with double quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:18
-#, fuzzy
 msgid "Print the protections for each file"
-msgstr "Starte Standardakion für jede Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:19
-#, fuzzy
 msgid "Displays file owner or UID number"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:20
-#, fuzzy
 msgid "Displays file group owner or GID number"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:21
-#, fuzzy
 msgid "Print the size in bytes of each file"
-msgstr "Größe der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:22
 msgid "Print the size in a more human readable way"
@@ -58717,14 +54574,12 @@ msgid "Appends '/', '=', '*', '@', '|' or '>' as per ls -F"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:26
-#, fuzzy
 msgid "Print inode number of each file"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:27
-#, fuzzy
 msgid "Print device ID number to which each file belongs"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:28
 msgid "Sort files alphanumerically by version"
@@ -58735,9 +54590,8 @@ msgid "Sort files in reverse alphanumeric order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:30
-#, fuzzy
 msgid "Sort files by last modification time"
-msgstr "Nach Veränderungsdatum sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:31
 msgid "Sort files by last status change time"
@@ -58752,9 +54606,8 @@ msgid "List directories before files (-U disables)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:34
-#, fuzzy
 msgid "Don't print indentation lines"
-msgstr "Keine Erklärungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:35
 msgid "Print ANSI lines graphic indentation lines"
@@ -58789,9 +54642,8 @@ msgid "Turn off hyperlinks in HTML output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:44
-#, fuzzy
 msgid "Print usage and this help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:1
 msgid "use the complement of SET1"
@@ -58820,14 +54672,12 @@ msgid "all letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:9
-#, fuzzy
 msgid "all horizontal whitespace"
-msgstr "white space (Worttrenner) ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:10
-#, fuzzy
 msgid "all control characters"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:11
 msgid "all digits"
@@ -58842,14 +54692,12 @@ msgid "all lower case letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:14
-#, fuzzy
 msgid "all printable characters, including space"
-msgstr "Anzahl Buchstaben ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:15
-#, fuzzy
 msgid "all punctuation characters"
-msgstr "Alle nicht druckbaren Zeichen maskieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:16
 msgid "all horizontal or vertical whitespace"
@@ -58887,122 +54735,100 @@ msgid "Guarantee that any output is unbuffered."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:24
-#, fuzzy
 msgid "alphanumeric characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:25
-#, fuzzy
 msgid "alphabetic characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:26
-#, fuzzy
 msgid "whitespace characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:27
-#, fuzzy
 msgid "control characters"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:28
-#, fuzzy
 msgid "numeric characters"
-msgstr "Anzahl Buchstaben ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:29
-#, fuzzy
 msgid "graphic characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:30
-#, fuzzy
 msgid "ideographic characters"
-msgstr "Nicht darstellbare Zeichen durch '?' ersetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:31
-#, fuzzy
 msgid "lower-case alphabetic characters"
-msgstr "Oktaldarstellung für nichtgrafische Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:32
-#, fuzzy
 msgid "phonographic characters"
-msgstr "Oktaldarstellung für nichtgrafische Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:33
-#, fuzzy
 msgid "printable characters"
-msgstr "Anzahl Buchstaben ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:34
-#, fuzzy
 msgid "punctuation characters"
-msgstr "Zeichenbereich ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:35
-#, fuzzy
 msgid "valid characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:36
-#, fuzzy
 msgid "space characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:37
-#, fuzzy
 msgid "special characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:38
-#, fuzzy
 msgid "upper-case characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:39
-#, fuzzy
 msgid "hexadecimal characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:2
 msgid "Print all possible definitions of the specified name"
 msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
 
 #: /tmp/fish/implicit/share/completions/type.fish:3
-#, fuzzy
 msgid "Suppress function and builtin lookup"
-msgstr "Unterdrücke Nachschlagen von Funktionen und eingebauten Befehlen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:4
-#, fuzzy
 msgid "Print command type"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:5
 msgid "Print path to command, or nothing if name is not a command"
 msgstr "Pfad zu Befehl ausgeben oder nichts, wenn es kein Befehl ist"
 
 #: /tmp/fish/implicit/share/completions/type.fish:6
-#, fuzzy
 msgid "Print path to command"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:7
-#, fuzzy
 msgid "Suppress output"
-msgstr "Normale Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:3
-#, fuzzy
 msgid "Shows information about an object"
-msgstr "Informationelle Ausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:4
-#, fuzzy
 msgid "Shows information about all objects"
-msgstr "Statusinformationen zu ausgecheckten Dateien anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:5
 msgid "Shows high-level status"
@@ -59014,15 +54840,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:7
 #: /tmp/fish/implicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Mount a filesystem"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:18
-#, fuzzy
 msgid "Unmount a filesystem"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:9
 msgid "Unlock an encrypted device"
@@ -59033,62 +54857,52 @@ msgid "Lock an encrypted device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:11
-#, fuzzy
 msgid "Set-up a loop device"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:12
-#, fuzzy
 msgid "Delete a loop device"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:13
 msgid "Safely power off a drive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:14
-#, fuzzy
 msgid "Set SMART data for a drive"
-msgstr "Datum in Zukunft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:15
-#, fuzzy
 msgid "Object to get information about"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:16
-#, fuzzy
 msgid "Block device to get information about"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:17
-#, fuzzy
 msgid "Drive to get information about"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:18
-#, fuzzy
 msgid "Filesystem type to use"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:20
 msgid "Force/layzy unmount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:22
-#, fuzzy
 msgid "Mounted block device"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:23
-#, fuzzy
 msgid "File to set-up a loop device for"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:24
-#, fuzzy
 msgid "Setup read-only device"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:25
 msgid "Start at <num> bytes into file"
@@ -59111,37 +54925,32 @@ msgid "File with libatasmart blob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:30
-#, fuzzy
 msgid "Do not authenticate the user if needed"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:31
 msgid "Object to "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:32
-#, fuzzy
 msgid "Block device to "
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:33
 msgid "Object path for ATA device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:34
-#, fuzzy
 msgid "Block device for ATA device"
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:1
-#, fuzzy
 msgid "Set or get soft limit"
-msgstr "Festlegen/Anzeigen aller aktuellen Begrenzungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:2
-#, fuzzy
 msgid "Set or get hard limit"
-msgstr "Festlegen/Anzeigen aller aktuellen Begrenzungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:3
 msgid "Set or get all current limits"
@@ -59189,9 +54998,8 @@ msgid "Maximum amount of virtual memory available to the shell"
 msgstr "Maximaler virtueller Speicher, der der Shell zur Verfügung steht"
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:15
-#, fuzzy
 msgid "New resource limit"
-msgstr "Rekursionsgrenze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/umount.fish:5
 msgid "Unmount without writing in /etc/mtab"
@@ -59249,38 +55057,32 @@ msgid "Behave as though all of the options mnrsv were specified."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:2
-#, fuzzy
 msgid "print the machine hardware name."
-msgstr "Maschinenname ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:3
-#, fuzzy
 msgid "print the nodename"
-msgstr "Kernel-Name ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:4
 msgid "print the machine processor architecture name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:5
-#, fuzzy
 msgid "print the operating system release."
-msgstr "Betriebssystem ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:6
-#, fuzzy
 msgid "print the operating system name."
-msgstr "Betriebssystem ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:7
-#, fuzzy
 msgid "print the operating system version."
-msgstr "Betriebssystem ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:8
-#, fuzzy
 msgid "Print all information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:9
 msgid "Print kernel name"
@@ -59295,28 +55097,24 @@ msgid "Print kernel release"
 msgstr "Kernel-Release ausgeben"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:12
-#, fuzzy
 msgid "Print kernel version"
-msgstr "Kernel-Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:13
 msgid "Print machine name"
 msgstr "Maschinenname ausgeben"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:14
-#, fuzzy
 msgid "Print processor"
-msgstr "Anmeldeprozess ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:15
-#, fuzzy
 msgid "Print hardware platform"
-msgstr "Hardware-Plattform ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:16
-#, fuzzy
 msgid "Print operating system"
-msgstr "Betriebssystem ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unexpand.fish:1
 msgid "convert all blanks, instead of just initial blanks"
@@ -59335,59 +55133,48 @@ msgid "use comma separated LIST of tab positions (enables -a)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:1
-#, fuzzy
 msgid "Extract files to current directory"
-msgstr "Dateien unter jedem Verzeichnis lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:3
-#, fuzzy
 msgid "List archive (technical)"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:4
-#, fuzzy
 msgid "List archive (bare)"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:5
-#, fuzzy
 msgid "Print file to stdout"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:6
-#, fuzzy
 msgid "Test archive files"
-msgstr "Archiv-Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:7
-#, fuzzy
 msgid "Verbosely list archive"
-msgstr "Archiv prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:8
-#, fuzzy
 msgid "Verbosely list archive (technical)"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:9
-#, fuzzy
 msgid "Verbosely list archive (bare)"
-msgstr "Archiv prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:10
-#, fuzzy
 msgid "Extract files with full path"
-msgstr "Datei aus Datei extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:1
-#, fuzzy
 msgid "Show a short help screen"
-msgstr "Nach ctime sortieren und anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:2
-#, fuzzy
 msgid "Show version string"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:3
 msgid "Show eixrc-variables"
@@ -59398,14 +55185,12 @@ msgid "Show default eixrc-variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:5
-#, fuzzy
 msgid "Produce no output"
-msgstr "Audio-Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:6
-#, fuzzy
 msgid "Output to the given file"
-msgstr "Ausgabe nach /dev/null"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:7
 msgid "Exclude the given overlay from the update-process"
@@ -59420,9 +55205,8 @@ msgid "Override cache method for a specified overlay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:2
-#, fuzzy
 msgid "Be verbose (default)"
-msgstr "(Standard)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:3
 msgid "Call wget as the given USER"
@@ -59437,14 +55221,12 @@ msgid "A comment about this user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:2
-#, fuzzy
 msgid "Home directory for the new user"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:3
-#, fuzzy
 msgid "Supplementary groups"
-msgstr "Auswahl per Gruppe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:5
 msgid "The user's home directory will be created if it does not exist"
@@ -59500,9 +55282,8 @@ msgid "Change user's password file comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:3
-#, fuzzy
 msgid "Change user's login directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:4
 msgid "Date on which the user account will be disabled"
@@ -59521,9 +55302,8 @@ msgid "List of groups which the user is also a member of"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:8
-#, fuzzy
 msgid "Change user's name"
-msgstr "Wechsel zu Benutzer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:9
 msgid "Lock user's password"
@@ -59538,9 +55318,8 @@ msgid "Allow non-unique UID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:13
-#, fuzzy
 msgid "Apply changes in this directory"
-msgstr "Arbeitsverzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:14
 msgid "The name of the user's new login shell"
@@ -59575,48 +55354,40 @@ msgid "The new SELinux user for the user's login"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:1
-#, fuzzy
 msgid "Test if vagrant has yet to be given the main command"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:2
-#, fuzzy
 msgid "Lists all available Vagrant boxes"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:4
-#, fuzzy
 msgid "Print the help and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:5
-#, fuzzy
 msgid "Manages boxes"
-msgstr "Handbuch-Sektionen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:6
 msgid "Adds a box"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:7
-#, fuzzy
 msgid "Lists all the installed boxes"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:8
-#, fuzzy
 msgid "Removes a box from Vagrant"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:9
-#, fuzzy
 msgid "Repackages the given box for redistribution"
-msgstr "Dateien vor dem Löschen umpacken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:10
-#, fuzzy
 msgid "Verifies the box with the given provider"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:11
 msgid "Connect to a remotely shared Vagrant environment"
@@ -59631,19 +55402,16 @@ msgid "Manually override static IP chosen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:14
-#, fuzzy
 msgid "SSH into the remote machine"
-msgstr "root-Verzeichnis für rpm-Operationen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:15
-#, fuzzy
 msgid "Destroys the running machine"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:16
-#, fuzzy
 msgid "Destroy without confirmation"
-msgstr "Nach Bestätigung fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:17
 msgid "Global status of Vagrant environments"
@@ -59658,14 +55426,12 @@ msgid "Install Vagrant plugins through ruby gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:20
-#, fuzzy
 msgid "Shuts down the running machine"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:21
-#, fuzzy
 msgid "Force shut down"
-msgstr "Erzwungener Stopp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:22
 msgid "Initializes the Vagrant environment"
@@ -59676,14 +55442,12 @@ msgid "Log in to Vagrant Cloud"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:24
-#, fuzzy
 msgid "Only checks if you're logged in"
-msgstr "Nur auf Sortierung testen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:25
-#, fuzzy
 msgid "Logs you out if you're logged in"
-msgstr "Angemeldete Benutzer auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:26
 msgid "Packages a running machine into a reusable box"
@@ -59694,9 +55458,8 @@ msgid "Name or UUID of the virtual machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:28
-#, fuzzy
 msgid "Output file name"
-msgstr "Ausgabedateiname angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:29
 msgid "Additional files to package with the box"
@@ -59711,18 +55474,16 @@ msgid "Manages plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:32
-#, fuzzy
 msgid "Installs a plugin"
-msgstr "Nach Erstellung installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:33
 msgid "Installs a license for a proprietary Vagrant plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:34
-#, fuzzy
 msgid "Lists installed plugins"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:35
 msgid "Uninstall the given plugin"
@@ -59742,9 +55503,8 @@ msgid "Connects to machine via RDP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:39
-#, fuzzy
 msgid "Restarts the running machine"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:40
 msgid "Provisioners will not run"
@@ -59787,62 +55547,52 @@ msgid "Key won't be encrypted with --ssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:51
-#, fuzzy
 msgid "Specific port for SSH when using --ssh"
-msgstr "Port für Weboberfläche angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:52
 msgid "Allow 'vagrant connect --ssh' only one time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:53
-#, fuzzy
 msgid "SSH into a running machine"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:54
-#, fuzzy
 msgid "Executes a single SSH command"
-msgstr "Argument als Befehl ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:55
-#, fuzzy
 msgid "Does not authenticate"
-msgstr "Überprüfungsstatus von Schlüsselsignaturen nicht zwischenspeichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:56
-#, fuzzy
 msgid "Outputs configuration for an SSH config file"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:57
-#, fuzzy
 msgid "Name of the host for the outputted configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:58
 msgid "Status of the machines Vagrant is managing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:59
-#, fuzzy
 msgid "Suspends the running machine"
-msgstr "Versteckte Funktionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:60
-#, fuzzy
 msgid "Creates and configures guest machines"
-msgstr "Konfigurationsdatei festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:61
-#, fuzzy
 msgid "Enable provision"
-msgstr "Optimierungen aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:62
-#, fuzzy
 msgid "Disable provision"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:63
 msgid "Enable only certain provisioners, by type"
@@ -59853,27 +55603,24 @@ msgid "Skin"
 msgstr "Oberfläche"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:3
-#, fuzzy
 msgid "Display help and debug options"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:7
 msgid "Valgrind-ise children"
 msgstr "Kinder Valgrind-isieren"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:8
-#, fuzzy
 msgid "Track file descriptors"
-msgstr "Auf Dateideskriptor umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:9
 msgid "Log to file descriptor"
 msgstr "Log auf Datei-Deskriptor ausgeben"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:10
-#, fuzzy
 msgid "Log to file"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:11
 msgid "Log to socket"
@@ -59908,15 +55655,13 @@ msgid "Debugger command"
 msgstr "Debugger-Befehl"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:19
-#, fuzzy
 msgid "File descriptor for input"
-msgstr "Datei-Deskriptor für Eingabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:20
 #: /tmp/fish/implicit/share/completions/valgrind.fish:26
-#, fuzzy
 msgid "Check for memory leaks"
-msgstr "Test auf Speicher-Lecks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:21
 #: /tmp/fish/implicit/share/completions/valgrind.fish:27
@@ -59971,9 +55716,8 @@ msgid "Specify a function that allocates memory"
 msgstr "Eine Funktion angeben, die Speicher zuordnet"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:36
-#, fuzzy
 msgid "Profile heap usage"
-msgstr "Profilstackauslastung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:37
 msgid "The number of bytes of heap overhead per allocation"
@@ -59992,40 +55736,34 @@ msgid "Profiling output format"
 msgstr "Ausgabeformat für Profilierung"
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:1
-#, fuzzy
 msgid "Start given VM"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:2
 msgid "Enable or disamble VRDE server or don't change setting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:3
-#, fuzzy
 msgid "Set VRDE property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:4
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:22
-#, fuzzy
 msgid "Specify settings password"
-msgstr "http-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:5
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:23
-#, fuzzy
 msgid "Specify file containing setting password"
-msgstr "http-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:6
-#, fuzzy
 msgid "Start VM in paused state"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:7
-#, fuzzy
 msgid "Record VM screen ouput to file"
-msgstr "Ausgabe auf Datei umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:8
 msgid "Frame width when recording"
@@ -60052,39 +55790,32 @@ msgid "Run separate VM process or attach to a running VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:3
-#, fuzzy
 msgid "Set temporary first hard disk"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:4
-#, fuzzy
 msgid "Set temporary first floppy disk"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:5
-#, fuzzy
 msgid "Set temporary CDROM/DVD"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:6
-#, fuzzy
 msgid "Set temporary boot device"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:7
-#, fuzzy
 msgid "Set temporary memory size in MB"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:8
-#, fuzzy
 msgid "Set temporary video memory size in MB"
-msgstr "Temporäres Verzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:9
-#, fuzzy
 msgid "Start VM in fullscreen mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:10
 msgid "Resize guest on fullscreen"
@@ -60103,14 +55834,12 @@ msgid "Make SDL frame non resizable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:14
-#, fuzzy
 msgid "Disable all hoskey combinations"
-msgstr "Nicht auf die Veränderungszeiten der Dateien vertrauen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:15
-#, fuzzy
 msgid "Disable specific hostkey combinations"
-msgstr "Deaktiviert Weiterleitung des Authentifizierungs-Agenten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:16
 msgid "Disable mouse/keyboard grabbing on mouse click w/o additions"
@@ -60138,14 +55867,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:24
-#, fuzzy
 msgid "Enable raw ring 3"
-msgstr "X11-Weiterleitung aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:25
-#, fuzzy
 msgid "Enable raw ring 0"
-msgstr "X11-Weiterleitung aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:26
 msgid "Enable PATM"
@@ -60160,14 +55887,12 @@ msgid "Permit usage of VT-x/AMD-V"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:29
-#, fuzzy
 msgid "Disable raw ring 3"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:30
-#, fuzzy
 msgid "Disable raw ring 0"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:31
 msgid "Disable PATM"
@@ -60199,37 +55924,32 @@ msgid "List saved file names after crash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:5
-#, fuzzy
 msgid "Read-only mode"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:6
 msgid "Use linear search for tags if tag file not sorted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:7
-#, fuzzy
 msgid "Start in display editing state"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:10
-#, fuzzy
 msgid "Recover file after crash"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:11
-#, fuzzy
 msgid "Edit the file containing a tag"
-msgstr "Die im Paket enthaltenen Auslöser-Skripte anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:12
 msgid "Begin editing by executing the specified  editor command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:1
-#, fuzzy
 msgid "Test if vim-addons has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:2
 msgid "list the names of the addons available in the system"
@@ -60240,14 +55960,12 @@ msgid "show the status of the addons available in the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:4
-#, fuzzy
 msgid "install one or more addons under ~/.vim"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:5
-#, fuzzy
 msgid "remove one or more addons from ~/.vim"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:6
 msgid "disable  one  or more addons to be used by the current user"
@@ -60262,255 +55980,215 @@ msgid "list, one per line, the files composing the specified addons"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:9
-#, fuzzy
 msgid "displays detailed information about the specified addons"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:10
-#, fuzzy
 msgid "show this usage message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:11
 msgid "be quiet and make the output more parseable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:12
-#, fuzzy
 msgid "set the registry directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:13
-#, fuzzy
 msgid "set the addons source directory"
-msgstr "Quellverzeichnis eintragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:14
-#, fuzzy
 msgid "set the addons target directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:15
 msgid "increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:16
-#, fuzzy
 msgid "set the system-wide target directory"
-msgstr "Das test-Verzeichnis entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:17
 msgid "set target directory to the system-wide one"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:1
-#, fuzzy
 msgid "Execute Ex command after the first file has been read"
-msgstr "Befehl ausführen, als ob es Teil von .wgetrc wäre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:2
 msgid "Source file after the first file has been read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:3
-#, fuzzy
 msgid "Execute Ex command before loading any vimrc"
-msgstr "Befehl ausführen, wenn vorheriger Befehl fehlerhaft war"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:4
-#, fuzzy
 msgid "Use device as terminal (Amiga only)"
-msgstr "Datei als Terminal benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:5
 msgid "Set the viminfo file location"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:6
-#, fuzzy
 msgid "Open stacked windows for each file"
-msgstr "Starte Standardakion für jede Datei"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:7
 msgid "Open side by side windows for each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:8
-#, fuzzy
 msgid "Open tab pages for each file"
-msgstr "Für jede Zeile der Datei Datum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:9
-#, fuzzy
 msgid "Start in quickFix mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:10
 msgid "Use swap files for recovery"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:11
-#, fuzzy
 msgid "Source and execute script file"
-msgstr "Skripte nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:12
-#, fuzzy
 msgid "Set the cursor to tag"
-msgstr "Verbindungszeitüberschreitung festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:13
-#, fuzzy
 msgid "Terminal name"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:14
 msgid "Use alternative vimrc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:15
-#, fuzzy
 msgid "Use alternative vimrc in GUI mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:16
-#, fuzzy
 msgid "Record all typed characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:17
 msgid "Record all typed characters (overwrite file)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:18
-#, fuzzy
 msgid "Start in Arabic mode"
-msgstr "Schnittstelle starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:19
-#, fuzzy
 msgid "Start in binary mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:20
 msgid "Behave mostly like vi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:21
-#, fuzzy
 msgid "Start in diff mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:22
-#, fuzzy
 msgid "Debugging mode"
-msgstr "Debug-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:23
-#, fuzzy
 msgid "Start in Ex mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:24
-#, fuzzy
 msgid "Start in improved Ex mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:25
 #: /tmp/fish/implicit/share/completions/vim.fish:46
-#, fuzzy
 msgid "Start in foreground mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:26
-#, fuzzy
 msgid "Start in Farsi mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:27
-#, fuzzy
 msgid "Start in GUI mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:28
 #: /tmp/fish/implicit/share/completions/vim.fish:48
-#, fuzzy
 msgid "Print help message and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:29
-#, fuzzy
 msgid "Start in Hebrew mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:30
 #: /tmp/fish/implicit/share/completions/vim.fish:37
-#, fuzzy
 msgid "List swap files"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:31
-#, fuzzy
 msgid "Start in lisp mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:32
-#, fuzzy
 msgid "Disable file modification"
-msgstr "Nicht auf die Veränderungszeiten der Dateien vertrauen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:33
-#, fuzzy
 msgid "Disallow file modification"
-msgstr "Änderungsdatum anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:34
 msgid "Reset compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:35
-#, fuzzy
 msgid "Don't use swap files"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:36
-#, fuzzy
 msgid "Read only mode"
-msgstr "Nur lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:38
-#, fuzzy
 msgid "Start in silent mode"
-msgstr "Standardmodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:39
-#, fuzzy
 msgid "Start in verbose mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:40
-#, fuzzy
 msgid "Start in vi mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:41
 msgid "Use encryption when writing files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:42
-#, fuzzy
 msgid "Don't connect to X server"
-msgstr "Keine Fortsetzung bei Fehlern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:43
-#, fuzzy
 msgid "Start in easy mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:44
-#, fuzzy
 msgid "Start in restricted mode"
-msgstr "Beschränkter Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:45
 msgid "Become an editor server for NetBeans"
@@ -60521,9 +56199,8 @@ msgid "Echo the Window ID on stdout (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:49
-#, fuzzy
 msgid "Do not expand wildcards"
-msgstr "Erweitern Sie das Muster nicht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:50
 msgid "Skip loading plugins"
@@ -60533,48 +56210,40 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/vim.fish:54
 #: /tmp/fish/implicit/share/completions/vim.fish:55
 #: /tmp/fish/implicit/share/completions/vim.fish:56
-#, fuzzy
 msgid "Edit files on Vim server"
-msgstr "Originaldateien editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:52
-#, fuzzy
 msgid "Evaluate expr on Vim server"
-msgstr "Ausdruck auswerten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:53
-#, fuzzy
 msgid "Send keys to Vim server"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:57
 msgid "List all Vim servers that can be found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:58
-#, fuzzy
 msgid "Set server name"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
-#, fuzzy
 msgid "Print version information and exit"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:1
-#, fuzzy
 msgid "Test if wajig has yet to be given the subcommand"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:2
-#, fuzzy
 msgid "Test if wajig command should have packages as potential completion"
 msgstr ""
-"Testen, ob der apt-Befehl Pakete zur möglichen Fertigstellung haben sollte"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:4
 msgid "Do system commands everything quietly."
@@ -60593,28 +56262,24 @@ msgid "Trace the sequence of commands performed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:8
-#, fuzzy
 msgid "Assume yes for any questions asked."
-msgstr "Bei allen Fragen ja annehmen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:9
-#, fuzzy
 msgid "Add a CD-ROM to the list of available sources of packages"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:10
 msgid "Mark the alternative to be auto set (using set priorities)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:11
-#, fuzzy
 msgid "Remove superseded deb files from the download cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:12
-#, fuzzy
 msgid "Do an update followed by a download of all updated packages"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:13
 msgid "Perform an install without asking questions (non-interactive)"
@@ -60629,24 +56294,20 @@ msgid "Check reported bugs in package using the Debian Bug Tracker"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:16
-#, fuzzy
 msgid "Retrieve/unpack sources and build .deb for the named packages"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:17
-#, fuzzy
 msgid "Retrieve packages required to build listed packages"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:18
-#, fuzzy
 msgid "Retrieve latest changelog for the package"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:19
-#, fuzzy
 msgid "Remove all deb files from the download cache"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:20
 #: /tmp/fish/implicit/share/completions/wajig.fish:53
@@ -60654,23 +56315,20 @@ msgid "List all the JIG commands and one line descriptions for each"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:21
-#, fuzzy
 msgid "Perform an update then a dist-upgrade"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:22
-#, fuzzy
 msgid "List of packages which depend/recommend/suggest the package"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:23
 msgid "One line description of packages (-v and -vv for more detail)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:24
-#, fuzzy
 msgid "One line description of new packages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:25
 msgid "Provide a detailed description of package (describe -vv)"
@@ -60681,38 +56339,32 @@ msgid "Provide a detailed description of new packages (describe -vv)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:27
-#, fuzzy
 msgid "Upgrade to new distribution (installed and new rqd packages)"
-msgstr "Neueste Pakete aktualisieren oder installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:28
 msgid "Equivalent to help with -verbose=2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:29
-#, fuzzy
 msgid "Download package files ready for an install"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:30
-#, fuzzy
 msgid "Download packages listed in file ready for an install"
-msgstr "Fehlende Pakete vom Spiegelserver herunterladen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:31
-#, fuzzy
 msgid "Install packages listed in a file"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:32
-#, fuzzy
 msgid "Remove packages listed in a file"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:33
-#, fuzzy
 msgid "Search for a file within installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
@@ -60728,14 +56380,12 @@ msgid "Perform apt-get -f install (to fix broken dependencies)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:37
-#, fuzzy
 msgid "Perform apt-get --fix-missing upgrade"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:38
-#, fuzzy
 msgid "Install packages and ignore file overwrites and depends"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:39
 msgid "Print documentation (detail depends on --verbose)"
@@ -60751,85 +56401,70 @@ msgid "Initialise or reset the JIG archive files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:42
-#, fuzzy
 msgid "Install (or upgrade) one or more packages or .deb files"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:43
 #: /tmp/fish/implicit/share/completions/wajig.fish:82
-#, fuzzy
 msgid "Install package and associated recommended packages"
 msgstr ""
-"Installiere diese Pakete, selbst wenn sie Dateien aus anderen, bereits "
-"installierten Paketen ersetzen"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:44
-#, fuzzy
 msgid "Install package and recommended and suggested packages"
 msgstr ""
-"Installiere diese Pakete, selbst wenn sie Dateien aus anderen, bereits "
-"installierten Paketen ersetzen"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:45
 #: /tmp/fish/implicit/share/completions/wajig.fish:111
-#, fuzzy
 msgid "Install package and associated suggested packages"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:46
 msgid "Check the integrity of installed packages (through checksums)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:47
-#, fuzzy
 msgid "List size of all large (>10MB) installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:48
 msgid "Identify when an update was last performed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:49
-#, fuzzy
 msgid "List the status and description of installed packages"
-msgstr "Keine Attribute der Paketdateien prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:50
-#, fuzzy
 msgid "List a one line description of given or all packages"
-msgstr "Keine Attribute der Paketdateien prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:51
 msgid "List the objects that can have alternatives configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:52
-#, fuzzy
 msgid "List the contents of the download cache"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:54
 msgid "List the daemons that JIG can start/stop/restart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:55
-#, fuzzy
 msgid "List the files that are supplied by the named package"
-msgstr "Zeigt alle Dateien in jedem gewählten Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:56
-#, fuzzy
 msgid "List those packages on hold"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:57
 msgid "List packages (with optional argument substring) installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:58
-#, fuzzy
 msgid "List the contents of the install/remove log file (filtered)"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:59
 msgid "List all known packages or those containing supplied string"
@@ -60837,24 +56472,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:60
 #: /tmp/fish/implicit/share/completions/wajig.fish:74
-#, fuzzy
 msgid "List libraries not required by any installed package"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:61
-#, fuzzy
 msgid "List the control scripts of the package of deb file"
-msgstr "Die im Paket enthaltenen Auslöser-Skripte anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:62
-#, fuzzy
 msgid "List packages that belong to a specific section"
-msgstr "Alle Pakete abfragen, die die angegebene Eigenschaft bereitstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:63
-#, fuzzy
 msgid "List the sections that are available"
-msgstr "Nur einfache Operationen durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:64
 msgid "Same as list but only prints first two columns, not truncated"
@@ -60865,57 +56496,49 @@ msgid "Same as list but avoids truncating package names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:66
-#, fuzzy
 msgid "Dist-upgrade using packages already downloaded"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:67
 msgid "Upgrade using packages already downloaded, but not any others"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:68
-#, fuzzy
 msgid "Runs the madison command of apt-cache."
-msgstr "Befehle aus dem Cache starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:69
-#, fuzzy
 msgid "Move packages in the download cache to a local Debian mirror"
-msgstr "Pakete aus Zwischenspeicher auf lokalen Spiegelserver verschieben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:70
 msgid "List packages that became available since last update"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:71
-#, fuzzy
 msgid "Obtain the latest news about the package"
-msgstr "Zeigt alle Dateien in jedem gewählten Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:72
-#, fuzzy
 msgid "List packages newly available for upgrading"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:73
-#, fuzzy
 msgid "List installed packages that do not meet the DFSG"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:75
 #: /tmp/fish/implicit/share/completions/wajig.fish:89
-#, fuzzy
 msgid "Generate a .deb file for an installed package"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:76
 msgid "From preferences file show priorities/policy (available)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:77
-#, fuzzy
 msgid "Remove one or more packages and configuration files"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:78
 msgid "Purge package and those it depend on and not required by others"
@@ -60930,54 +56553,48 @@ msgid "Display the package's README file from /usr/share/doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:81
-#, fuzzy
 msgid "Download package and any packages it depends on"
-msgstr "Pakete auflisten, von denen dieses Paket abhängt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:83
 msgid "Reconfigure the named installed packages or run gkdebconf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:84
-#, fuzzy
 msgid "Reinstall each of the named packages"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:85
 msgid "Reload daemon configs, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:86
-#, fuzzy
 msgid "Remove one or more packages (see also purge)"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:87
 msgid "Remove package and its dependees not required by others"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:88
-#, fuzzy
 msgid "Remove orphaned libraries (not required by installed packages)"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:91
 msgid "Stop then start a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:92
-#, fuzzy
 msgid "Install a RedHat .rpm package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:93
 msgid "Convert a RedHat .rpm file to a Debian .deb file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
-#, fuzzy
 msgid "Search for packages containing listed words"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
 msgid "Find local Debian archives suitable for sources.list"
@@ -61013,29 +56630,25 @@ msgid "Print out the size (in K) of all, or listed, installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:104
-#, fuzzy
 msgid "Generates list of package=version for all installed packages"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:105
-#, fuzzy
 msgid "Retrieve and unpack sources for the named packages"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:106
 msgid "Start a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:107
-#, fuzzy
 msgid "Show the version and available version of packages"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:108
 #: /tmp/fish/implicit/share/completions/wajig.fish:109
-#, fuzzy
 msgid "Show the version and available version of matching packages"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:110
 msgid "Stop a daemon, e.g., gdm, apache (see list-daemons)"
@@ -61046,18 +56659,16 @@ msgid "Run the Gnome task selector to install groups of packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:113
-#, fuzzy
 msgid "List packages with newer versions available for upgrading"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:114
 msgid "Remove listed packages from hold so they are again upgraded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:116
-#, fuzzy
 msgid "Update the list of down-loadable packages"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:117
 msgid "Update default alternative for things like x-window-manager"
@@ -61072,24 +56683,20 @@ msgid "Updates the local list of USB ids from the internet master list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:120
-#, fuzzy
 msgid "Upgrade all of the installed packages or just those listed"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:121
-#, fuzzy
 msgid "List version and distribution of (all) packages."
-msgstr "Keine Attribute der Paketdateien prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:122
-#, fuzzy
 msgid "A synonym for describe"
-msgstr "Synonym für -i"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:123
-#, fuzzy
 msgid "Find the package that supplies the given command or file"
-msgstr "Prototypen in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:1
 msgid "Beep if command has a non-zero exit"
@@ -61101,9 +56708,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:3
 #: /tmp/fish/implicit/share/completions/watch.fish:4
-#, fuzzy
 msgid "Highlight changes between updates"
-msgstr "Zeit zwischen Bildschirmaktualisierungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:5
 msgid "Exit if command has a non-zero exit"
@@ -61114,9 +56720,8 @@ msgid "Exit when output from command changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:7
-#, fuzzy
 msgid "Seconds to wait between updates"
-msgstr "Wartezeit zwischen den Anfragen weiterer Peers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:8
 msgid "Attempt run command in precise intervals"
@@ -61127,9 +56732,8 @@ msgid "Turn off header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:10
-#, fuzzy
 msgid "Pass command to exec instead of \"sh -c\""
-msgstr "Befehl an die Shell übergeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:1
 msgid "Print byte counts"
@@ -61148,9 +56752,8 @@ msgid "Print length of longest line"
 msgstr "Länge der längsten Zeile ausgeben"
 
 #: /tmp/fish/implicit/share/completions/wc.fish:5
-#, fuzzy
 msgid "Print word counts"
-msgstr "Anzahl Bytes ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:1
 msgid "Number sets BitsPerPixel value"
@@ -61214,18 +56817,16 @@ msgid "Prints the name of the game data directory and exits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:14
-#, fuzzy
 msgid "XxY sets the screen resolution"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:15
 msgid "Runs the game in a small test scenario"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:16
-#, fuzzy
 msgid "Shows the version number and exits"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:17
 msgid "Runs the game in windowed mode"
@@ -61281,9 +56882,8 @@ msgid "Dont print header"
 msgstr "Kopfzeile nicht ausgeben"
 
 #: /tmp/fish/implicit/share/completions/w.fish:2
-#, fuzzy
 msgid "Ignore username for time calculations"
-msgstr "Benutzername für Zeitberechnungen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/w.fish:3
 msgid "Short format"
@@ -61298,9 +56898,8 @@ msgid "Go to background immediately after startup"
 msgstr "Direkt nach Start im Hintergrund arbeiten"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:4
-#, fuzzy
 msgid "Execute command as if part of .wgetrc"
-msgstr "Befehl ausführen, wenn vorheriger Befehl fehlerhaft war"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:5
 msgid "Log all messages to logfile"
@@ -61461,9 +57060,8 @@ msgid "Disable server-side cache"
 msgstr "Server-seitigen Cache deaktivieren"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:49
-#, fuzzy
 msgid "Disable the use of cookies"
-msgstr "Session-Cookies speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:50
 msgid "Load cookies from file"
@@ -61519,9 +57117,8 @@ msgid "Turn off keep-alive for http downloads"
 msgstr "keep-alive-Option für http-Abrufe abschalten"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:63
-#, fuzzy
 msgid "Choose secure protocol"
-msgstr "Abzulehnende Protokolle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:64
 msgid "Only follow secure HTTPS links"
@@ -61532,29 +57129,24 @@ msgid "Don't validate the server's certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:66
-#, fuzzy
 msgid "Client certificate file"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:67
-#, fuzzy
 msgid "Client certificate type"
-msgstr "Zertifikatsregeln festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:68
-#, fuzzy
 msgid "Private key file"
-msgstr "In Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:69
-#, fuzzy
 msgid "Private key type"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:70
-#, fuzzy
 msgid "File with the bundle of CAs"
-msgstr "Beschreibung des Patchpaketes editieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:71
 msgid "Directory where hash list of CAs is stored"
@@ -61577,9 +57169,8 @@ msgid "Disable HSTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:76
-#, fuzzy
 msgid "Path of HSTS database"
-msgstr "Datenbank ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:77
 msgid "Don't remove the temporary .listing files generated"
@@ -61594,9 +57185,8 @@ msgid "Use the passive FTP retrieval scheme"
 msgstr "Passiven FTP-Modus benutzen"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:80
-#, fuzzy
 msgid "Traverse symlinks and retrieve pointed-to files"
-msgstr "Symlinks folgen und die Dateien abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:81
 msgid "Turn on recursive retrieving"
@@ -61689,9 +57279,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:100
 #: /tmp/fish/implicit/share/completions/wget.fish:101
-#, fuzzy
 msgid "Do not ever ascend to the parent directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:1
 #: /tmp/fish/implicit/share/completions/which.fish:13
@@ -61712,9 +57301,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:5
-#, fuzzy
 msgid "Ignore option '--read-functions'"
-msgstr "Ignoriere nicht als Funktionen bekannte Symbole"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:6
 msgid "Skip directories in PATH that start with a dot"
@@ -61749,14 +57337,12 @@ msgid "Same as -b -d --login -p -r -t -T -u"
 msgstr "Entspricht -b -d --login -p -r -t -T -u"
 
 #: /tmp/fish/implicit/share/completions/who.fish:2
-#, fuzzy
 msgid "Print time of last boot"
-msgstr "Zeit des letzten Neustarts anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:3
-#, fuzzy
 msgid "Print dead processes"
-msgstr "Anmeldeprozess ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:4
 msgid "Print line of headings"
@@ -61820,9 +57406,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:3
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:3
-#, fuzzy
 msgid "Print this help information."
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:4
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:4
@@ -61835,19 +57420,16 @@ msgid "Don't display anything except notifications."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:2
-#, fuzzy
 msgid "Scan for networks"
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:3
-#, fuzzy
 msgid "List networks"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:4
-#, fuzzy
 msgid "Show network details"
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:5
 msgid "Disconnect"
@@ -61858,47 +57440,40 @@ msgid "Connect"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:7
-#, fuzzy
 msgid "List encryption types"
-msgstr "Beschreibung des mime-Typs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:8
 msgid "Perform operation on wireless network"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:9
-#, fuzzy
 msgid "Perform operation on wired network"
-msgstr "Nur einfache Operationen durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:10
-#, fuzzy
 msgid "Save profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:11
-#, fuzzy
 msgid "Load profile"
-msgstr "Kein flaches Profil"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:12
 msgid "Set name for profile to save/load"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:13
-#, fuzzy
 msgid "Get or set network property"
-msgstr "Eigenschaft entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:14
-#, fuzzy
 msgid "Set network property to"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:15
-#, fuzzy
 msgid "Set the network"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:1
 msgid "get current WPA/EAPOL/EAP status"
@@ -61913,14 +57488,12 @@ msgid "show this usage help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:4
-#, fuzzy
 msgid "show interfaces/select interface"
-msgstr "Schnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:5
-#, fuzzy
 msgid "change debug level"
-msgstr "Debug-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:6
 msgid "show full wpa_cli license"
@@ -61935,106 +57508,88 @@ msgid "IEEE 802.1X EAPOL state machine logon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:9
-#, fuzzy
 msgid "set/list variables"
-msgstr "Variable löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:10
 msgid "show PMKSA cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:11
-#, fuzzy
 msgid "force reassociation"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:12
 msgid "force wpa_supplicant to re-read its config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:13
-#, fuzzy
 msgid "force preauthentication"
-msgstr "Pseudo-tty-Zuordnung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:14
-#, fuzzy
 msgid "configure identity for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:15
-#, fuzzy
 msgid "configure password for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:16
-#, fuzzy
 msgid "change password for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:17
-#, fuzzy
 msgid "configure pin for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:18
-#, fuzzy
 msgid "configure one-time-password for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:19
-#, fuzzy
 msgid "configure private key passphrase for an SSID"
-msgstr "Konfiguration für das Erstellen auf BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:20
 msgid "set preferred BSSID for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:21
-#, fuzzy
 msgid "list configured networks"
-msgstr "Konfigurationsdatei benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:22
-#, fuzzy
 msgid "select a network (disable others)"
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:23
-#, fuzzy
 msgid "enable a network"
-msgstr "Depot aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:24
-#, fuzzy
 msgid "disable a network"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:25
-#, fuzzy
 msgid "add a network"
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:26
-#, fuzzy
 msgid "remove a network"
-msgstr "Schlüssel entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:27
-#, fuzzy
 msgid "set/list network variables"
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
-#, fuzzy
 msgid "get network variables"
-msgstr "CVS-Benutzervariable festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
-#, fuzzy
 msgid "save the current configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:30
 msgid "disconnect and wait for reassociate command before connecting"
@@ -62081,9 +57636,8 @@ msgid "Run wvdial with alternative config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wvdial.fish:4
-#, fuzzy
 msgid "Don't output debug information"
-msgstr "Keine Gruppeninformation ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:1
 msgid ""
@@ -62108,9 +57662,8 @@ msgid "Use at most max-lines nonblank input lines per command line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:9
-#, fuzzy
 msgid "Use at most max-args arguments per command line"
-msgstr "Festlegen oder Abrufen der Befehlszeile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:10
 msgid ""
@@ -62132,23 +57685,20 @@ msgid "Print the command line on the standard error output before executing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:15
-#, fuzzy
 msgid "Exit if the size is exceeded"
-msgstr "Dateigrößenbegrenzung überschritten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:16
 msgid "Run up to max-procs processes at a time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:1
-#, fuzzy
 msgid "Query information"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:2
-#, fuzzy
 msgid "Query default application for type"
-msgstr "Standardaktion für mime-Typ ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:3
 msgid "Query file's filetype"
@@ -62159,35 +57709,29 @@ msgid "Choose application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:5
-#, fuzzy
 msgid "Mimetype"
-msgstr "Zeittyp anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:6
-#, fuzzy
 msgid "Add filetype description"
-msgstr "Dateityp-Anzeige anhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:7
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:10
-#, fuzzy
 msgid "Set mode"
-msgstr "Ruhiger Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:8
-#, fuzzy
 msgid "Disable vendor check"
-msgstr "Server-seitigen Cache deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:9
-#, fuzzy
 msgid "Remove filetype description"
-msgstr "Auf Dateideskriptor umleiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:12
-#, fuzzy
 msgid "Diplay long help"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:1
 msgid "Get list of input files from FILE"
@@ -62221,9 +57765,8 @@ msgid "Encoding of input files (except for Python, Tcl, Glade)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:9
-#, fuzzy
 msgid "Join messages with existing file"
-msgstr "Alle Nachrichten in Logdatei speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:10
 msgid "Entries from FILE"
@@ -62270,9 +57813,8 @@ msgid "More detailed formatstring recognition result"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:19
-#, fuzzy
 msgid "Do not use C escapes in output (default)"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:20
 msgid "Use C escapes in output, no extended chars"
@@ -62283,14 +57825,12 @@ msgid "Write PO file even if empty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:22
-#, fuzzy
 msgid "Write the"
-msgstr "In Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:23
-#, fuzzy
 msgid "Do not write #: filename:line lines"
-msgstr "Neuere Dateien nicht überschreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:24
 msgid "Generate #: filename:line lines (default)"
@@ -62301,18 +57841,16 @@ msgid "Write out strict Uniforum conforming"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:26
-#, fuzzy
 msgid "Write out a Java"
-msgstr "Prompt ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:27
 msgid "Write out a NeXTstep/GNUstep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:28
-#, fuzzy
 msgid "Set output page width"
-msgstr "Ausgabebegrenzer festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:29
 msgid ""
@@ -62321,23 +57859,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:30
-#, fuzzy
 msgid "Generate sorted output"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:31
-#, fuzzy
 msgid "Sort output by file location"
-msgstr "Nach Veränderungsdatum sortieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:32
 msgid "Dont write header with msgid \"\" entry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:33
-#, fuzzy
 msgid "Set copyright holder in output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:34
 msgid "Omit FSF copyright in output for foreign user"
@@ -62356,33 +57891,28 @@ msgid "Use STRING or \"\" as suffix for msgstr entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:1
-#, fuzzy
 msgid "Show summary of options"
-msgstr "Hilfe- und Debug-Optionen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:2
-#, fuzzy
 msgid "Select XMMS session (Default: 0)"
-msgstr "Auswahl per Sitzungskennung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:3
 msgid "Skip backwards in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:4
-#, fuzzy
 msgid "Start playing current playlist"
-msgstr "Festlegen/Anzeigen aller aktuellen Begrenzungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:5
-#, fuzzy
 msgid "Pause current song"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:6
-#, fuzzy
 msgid "Stop current song"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:7
 msgid "Pause if playing, play otherwise"
@@ -62393,24 +57923,20 @@ msgid "Skip forward in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:9
-#, fuzzy
 msgid "Don't clear the playlist"
-msgstr "Abspielliste einrichten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:10
-#, fuzzy
 msgid "Show the main window"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:1
-#, fuzzy
 msgid "Set the initial window geometry"
-msgstr "Setzen der Terminalfarbe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
-#, fuzzy
 msgid "Set the window title"
-msgstr "Zeitüberschreitung für Netzwerk festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:3
 msgid "Install a private colormap"
@@ -62421,9 +57947,8 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
-#, fuzzy
 msgid "Set reverse video mode"
-msgstr "Server-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
 msgid "Set the background of the page display"
@@ -62434,14 +57959,12 @@ msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "Setzen der Terminalfarbe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
-#, fuzzy
 msgid "Start in continuous view mode"
-msgstr "Im Ordner-Index starten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:10
 msgid "Enable or disable t1lib (Default: yes)"
@@ -62460,9 +57983,8 @@ msgid "Set the default file name for PostScript output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:14
-#, fuzzy
 msgid "Set the paper size"
-msgstr "Speicherpuffergröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:15
 msgid "Set the paper width, in points"
@@ -62473,28 +57995,24 @@ msgid "Set the paper height, in points"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:17
-#, fuzzy
 msgid "Generate Level 1 PostScript"
-msgstr "dired-Ausgabe erzeugen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:18
-#, fuzzy
 msgid "Sets the encoding to use for text output"
-msgstr "Ausgabe weder ausführlich noch schweigsam"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:19
 msgid "Sets the end-of-line convention to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:20
-#, fuzzy
 msgid "Specify the owner password for the PDF file"
-msgstr "Proxy-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:21
-#, fuzzy
 msgid "Specify the user password for the PDF file"
-msgstr "Proxy-Passwort angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:22
 msgid "Open xpdf in full-screen mode"
@@ -62513,24 +58031,20 @@ msgid "Raise xpdf remote server window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:26
-#, fuzzy
 msgid "Kill xpdf remote server"
-msgstr "Datei zum Zugriff auf Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:27
-#, fuzzy
 msgid "Print commands as they're executed"
-msgstr "Befehle auf Standardfehlerausgabe ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:29
-#, fuzzy
 msgid "Specify config file to use instead of ~/.xpdfrc"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:30
-#, fuzzy
 msgid "Print copyright and version information"
-msgstr "Komprimierungsinformation auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:2
 msgid "Display grammar and exit"
@@ -62573,9 +58087,8 @@ msgid "Select a window by clicking on its frame"
 msgstr "Fenster durch Klicken auf den Rahmen auswählen"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:12
-#, fuzzy
 msgid "Remove property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:13
 msgid "Set property"
@@ -62586,37 +58099,32 @@ msgid "Examine property updates forever"
 msgstr "Eigenschaftsaktualisierungen andauernd überprüfen"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:15
-#, fuzzy
 msgid "Set format"
-msgstr "Kurzes Format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:2
-#, fuzzy
 msgid "Make no changes"
-msgstr "Keine Änderungen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:3
 msgid "Apply modifications without grabbing the screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:4
-#, fuzzy
 msgid "Print out a summary of the usage and exit"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:5
 msgid "Print out the RandR version reported by the X server and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:6
-#, fuzzy
 msgid "Display the current state of the system"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:7
-#, fuzzy
 msgid "Select X display to use"
-msgstr "Wählen Sie aus, wie Schlüsselkennungen angezeigt werden sollen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:8
 msgid "Select which screen to manipulate"
@@ -62635,16 +58143,12 @@ msgid "Set the screen size (index or width x height)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:12
-#, fuzzy
 msgid "Set the refresh rate closest to the specified value"
 msgstr ""
-"Die Liste der Standardeinstellungen gemäß der angegebenen Zeichenkette "
-"festlegen"
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:13
-#, fuzzy
 msgid "Specify the orientation of the screen"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:14
 msgid "Reflect across the X axis"
@@ -62655,14 +58159,12 @@ msgid "Reflect across the Y axis"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:16
-#, fuzzy
 msgid "Display the contents of properties for each output"
-msgstr "Namen aller Signale anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:17
-#, fuzzy
 msgid "Set screen size"
-msgstr "Socketpuffergröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:18
 msgid "Set reported physical screen size"
@@ -62673,14 +58175,12 @@ msgid "Set dpi to calculate reported physical screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:20
-#, fuzzy
 msgid "Add new mode"
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:21
-#, fuzzy
 msgid "Removes a mode from the server"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:22
 msgid "Add a mode to the set of valid modes for an output"
@@ -62691,18 +58191,16 @@ msgid "Remove a mode from the set of valid modes for an output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:24
-#, fuzzy
 msgid "Selects an output to reconfigure"
-msgstr "Optionsprofil auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:25
 msgid "Enable connected but disabled outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:26
-#, fuzzy
 msgid "This selects a mode"
-msgstr "Eine Methode auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:27
 msgid ""
@@ -62715,42 +58213,36 @@ msgid "Set output position within the secreen in pixels"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:29
-#, fuzzy
 msgid "Set refresh rate"
-msgstr "Referer-URL festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:30
-#, fuzzy
 msgid "Set reflection"
-msgstr "Selektion umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:31
-#, fuzzy
 msgid "Set rotation"
-msgstr "Eine Aktion auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:32
 #: /tmp/fish/implicit/share/completions/xrandr.fish:33
 #: /tmp/fish/implicit/share/completions/xrandr.fish:34
 #: /tmp/fish/implicit/share/completions/xrandr.fish:35
 #: /tmp/fish/implicit/share/completions/xrandr.fish:36
-#, fuzzy
 msgid "Set position relative to the output"
-msgstr "Ausführlichkeitswert auf 0 zurücksetzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:37
 msgid "Set the property value: --set <prop> <value>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:38
-#, fuzzy
 msgid "Disables the output"
-msgstr "Ausgabe mit Markierung versehen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:39
-#, fuzzy
 msgid "Set the crtc"
-msgstr "Markierungszeichen festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:40
 msgid "Set gamma correction [red:green:blue]"
@@ -62761,14 +58253,12 @@ msgid "Set brightness. Multiplies gamma galues by brightness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:42
-#, fuzzy
 msgid "Don't define a primary output"
-msgstr "Keine ausführliche Ausgabe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:43
-#, fuzzy
 msgid "Print current screen configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:44
 msgid ""
@@ -62783,18 +58273,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:46
-#, fuzzy
 msgid "Set scren scale"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:47
 msgid "Set the output as primary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:1
-#, fuzzy
 msgid "display to use"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:2
 msgid "do all resources [default]"
@@ -62821,34 +58309,28 @@ msgid "preprocessor to use [/usr/bin/mcpp]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:8
-#, fuzzy
 msgid "do not use a preprocessor"
-msgstr "Integrierten Präprozessor nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:9
-#, fuzzy
 msgid "query resources"
-msgstr "Quellen aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:10
-#, fuzzy
 msgid "load resources from file [default]"
-msgstr "Cookies aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:11
-#, fuzzy
 msgid "add in resources from file"
-msgstr "Index aus Datei laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:12
-#, fuzzy
 msgid "merge resources from file & sort"
-msgstr "Fehler aus Datei unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:13
-#, fuzzy
 msgid "edit resources into file"
-msgstr "sources.list-Datei angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:14
 msgid "backup suffix for -edit [.bak]"
@@ -62859,18 +58341,16 @@ msgid "show preprocessor symbols"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:16
-#, fuzzy
 msgid "remove resources"
-msgstr "Sätze entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:17
 msgid "avoid server reset (avoid using this)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:18
-#, fuzzy
 msgid "don't warn about duplicates"
-msgstr "Nur doppelte Zeilen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:1
 msgid "Append input to selection"
@@ -62941,18 +58421,16 @@ msgid "Never highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:2
-#, fuzzy
 msgid "Enable active icon support"
-msgstr "Unterstützung für Suspension aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:3
 msgid "Disallow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:4
-#, fuzzy
 msgid "Turn off cursor blinking"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:5
 msgid "Enable the display of bold characters"
@@ -62979,9 +58457,8 @@ msgid "Don't workaround the bug in more(1)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:11
-#, fuzzy
 msgid "Disable dynamic color changing"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:12
 msgid "Don't ensure compatibility between normal and bold fonts bounding boxes"
@@ -63004,23 +58481,20 @@ msgid "Don't use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:17
-#, fuzzy
 msgid "Don't force insert mode"
-msgstr "Stapelverarbeitungsmodus nicht verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:18
-#, fuzzy
 msgid "Don't use jump scrolling"
-msgstr "Keinen Kommentar verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:19
 msgid "Don't treat C1 control characters as printable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:20
-#, fuzzy
 msgid "Turn off logging"
-msgstr "FTP-Mustererkennung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:21
 msgid "Turn off support for encodings according the locale setting"
@@ -63063,18 +58537,16 @@ msgid "Disable reverse-wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:31
-#, fuzzy
 msgid "Turn off asynchronous scrolling"
-msgstr "Zugriffsprüfung abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:32
 msgid "Send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:33
-#, fuzzy
 msgid "Don't display scrollbar"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:34
 msgid "Don't generate Sun Function Key escape codes for function keys"
@@ -63101,9 +58573,8 @@ msgid "VT102 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:40
-#, fuzzy
 msgid "Don't display toolbar or menubar"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:41
 msgid "Don't use UTF-8"
@@ -63114,27 +58585,24 @@ msgid "Display characters with underline attribute as color"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:43
-#, fuzzy
 msgid "Write to the system utmp log file"
-msgstr "Top-Server in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:44
 msgid "Don't use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:45
-#, fuzzy
 msgid "Don't use wide characters"
-msgstr "Keine per 'backslash (\\)'maskierte Zeichen verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:46
 msgid "Don't wait the first time for the window to be mapped"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:47
-#, fuzzy
 msgid "Print version number to the standard output"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:48
 msgid "Print out a verbose message describing the options"
@@ -63149,18 +58617,16 @@ msgid "Always highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:51
-#, fuzzy
 msgid "Disable active icon support"
-msgstr "Unterstützung für Suspension aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:52
 msgid "Allow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:53
-#, fuzzy
 msgid "Turn on cursor blinking"
-msgstr "Rekursiven Abruf aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:54
 msgid "Disable the display of bold characters"
@@ -63171,9 +58637,8 @@ msgid "Set the vt100 resource cutToBeginningOfLine to 'false'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:56
-#, fuzzy
 msgid "Set character class"
-msgstr "Anzahl Buchstaben ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:57
 msgid "Set the cjkWidth resource to 'true'"
@@ -63216,9 +58681,8 @@ msgid "Use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:67
-#, fuzzy
 msgid "Force insert mode"
-msgstr "Erzwungener Stopp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:68
 msgid "Treat C1 control characters as printable"
@@ -63233,9 +58697,8 @@ msgid "Force scrollbar to the left side"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:71
-#, fuzzy
 msgid "The shell in xterm's window will be login shell"
-msgstr "Dies ist keine Login-Shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:72
 msgid "Ring bell if the user types near the end of line"
@@ -63250,9 +58713,8 @@ msgid "Use builtin version for the wide-character calculation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:75
-#, fuzzy
 msgid "Disable underlining"
-msgstr "Warnungen über MFC deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:76
 msgid "Enable PC style bold colors"
@@ -63279,9 +58741,8 @@ msgid "Don't send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:82
-#, fuzzy
 msgid "Display scrollbar"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:83
 msgid "Generate Sun Function Key escape codes for function keys"
@@ -63304,9 +58765,8 @@ msgid "Assume Sun/PC keyboard"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:88
-#, fuzzy
 msgid "Display toolbar or menubar"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:89
 msgid "Use UTF-8"
@@ -63325,9 +58785,8 @@ msgid "Use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:93
-#, fuzzy
 msgid "Use wide characters"
-msgstr "Escape-Zeichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:94
 msgid "Wait the first time for the window to be mapped"
@@ -63374,9 +58833,8 @@ msgid "FreeType double-width font pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:105
-#, fuzzy
 msgid "Font for active icons"
-msgstr "Interaktiven Modus erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:106
 msgid "Font size for FreeType font"
@@ -63411,9 +58869,8 @@ msgid "File name for the encoding converter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:114
-#, fuzzy
 msgid "Log filename"
-msgstr "Log in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:115
 msgid "Maximum time in milliseconds between multi-click selections"
@@ -63428,19 +58885,16 @@ msgid "Distance from the right end for ringing the margin bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:118
-#, fuzzy
 msgid "Number of scrolled off lines"
-msgstr "Alle Zeilen nummerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:119
-#, fuzzy
 msgid "Terminal identification"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:121
-#, fuzzy
 msgid "zIconBeep percentage"
-msgstr "Prompt mit Prozentanzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:122
 msgid "Size of the inner border"
@@ -63451,70 +58905,60 @@ msgid "Use jump scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:124
-#, fuzzy
 msgid "Turn on logging"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:125
 msgid "Turn on asynchronous scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:126
-#, fuzzy
 msgid "Tektronix mode"
-msgstr "Fragemodus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:127
 msgid "This window should receive console output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:1
-#, fuzzy
 msgid "Compress"
-msgstr "Datei komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:2
-#, fuzzy
 msgid "Decompress"
-msgstr "Auf Standardausgabe dekomprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:3
-#, fuzzy
 msgid "Test the integrity of compressed files"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:4
-#, fuzzy
 msgid "Print information about compressed files"
-msgstr "Informative Nachrichten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:5
-#, fuzzy
 msgid "Don't delete the input files"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:6
-#, fuzzy
 msgid "Write to stdout instead of file"
-msgstr "Top-Server in Datei schreiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:7
 msgid "Decompress only the first .xz stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:8
-#, fuzzy
 msgid "Disable creation of sparse files"
-msgstr "Sparse-Dateien bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:9
 msgid "Use SUFFIX as the suffix for target file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:10
-#, fuzzy
 msgid "Read the filenames to process from file"
-msgstr "Paket aus Datei lesen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:11
 msgid "Identical to --files but filenames terminate with \\0"
@@ -63525,38 +58969,32 @@ msgid "Specify file format to compress/decompress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:13
-#, fuzzy
 msgid "Specify type of integrity check"
-msgstr "Port für Weboberfläche angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:14
-#, fuzzy
 msgid "Don't verify the integrity check"
-msgstr "Zeit-Attribute nicht prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:15
-#, fuzzy
 msgid "Select compression level"
-msgstr "Komprimierungsgrad"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:16
 msgid "Use slower variant"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:17
-#, fuzzy
 msgid "Alias of -0"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:18
-#, fuzzy
 msgid "Alias of -9"
-msgstr "Alias für atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:20
-#, fuzzy
 msgid "Set block sizes list"
-msgstr "Blockgröße festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:21
 msgid "Force flush if encoder did not fush after TIMEOUT ms"
@@ -63579,9 +59017,8 @@ msgid "Display error and exit if exceed memory usage limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:26
-#, fuzzy
 msgid "Specify the number of worker threads to use"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:27
 msgid "Add LZMA1 filter to filter chain"
@@ -63600,28 +59037,24 @@ msgid "Add Delta filter to filter chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:31
-#, fuzzy
 msgid "Suppress warnings/notices"
-msgstr "Dateinamenausgabe unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:33
-#, fuzzy
 msgid "Don't set the exit status to 2"
-msgstr "Exit-Status des Jobs verneinen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:34
 msgid "Print messages in a machine-parsable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:35
-#, fuzzy
 msgid "Display memory informations (physical, usage limits)"
-msgstr "Zeigt Benutzungsinformation für den Befehl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:37
-#, fuzzy
 msgid "Display long help"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:13
 msgid "Backup or restore alpm local database"
@@ -63640,9 +59073,8 @@ msgid "Show some statistics about your packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:29
-#, fuzzy
 msgid "Force color"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:30
 msgid "Force installation or updates"
@@ -63653,48 +59085,40 @@ msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:32
-#, fuzzy
 msgid "Disable color"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:33
-#, fuzzy
 msgid "Always ask for confirmation"
-msgstr "Nach Bestätigung fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:35
 msgid "Export built packages and their sources to DIR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:36
-#, fuzzy
 msgid "Use DIR as temporary folder"
-msgstr "tmpdir für temporäre Dateien benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:54
-#, fuzzy
 msgid "Show packages that conflict with one of the targets"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:55
-#, fuzzy
 msgid "Show packages that depend on one of the targets"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:56
-#, fuzzy
 msgid "Show packages that provide one of the targets"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:57
-#, fuzzy
 msgid "Show packages that replace one of the targets"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:58
-#, fuzzy
 msgid "Query the package names only"
-msgstr "Nur Paketname suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:70
 msgid "Query FILE instead of alpm/aur"
@@ -63713,23 +59137,20 @@ msgid "Pass -A or --ignorearch option to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:85
-#, fuzzy
 msgid "Specify a custom AUR url"
-msgstr "Autorkennung angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:86
 msgid "Build from sources(AUR or ABS)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:87
-#, fuzzy
 msgid "Also build all dependencies"
-msgstr "Erstellungsabhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:88
-#, fuzzy
 msgid "Search an update for devel packages"
-msgstr "Umgekehrte Abhängigkeiten für das Paket auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:89
 msgid "Search packages by maintainer instead of name (AUR only)"
@@ -63740,19 +59161,16 @@ msgid "Pass additional options to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:106
-#, fuzzy
 msgid "Clean all these files"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:107
-#, fuzzy
 msgid "Also install the package"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:1
-#, fuzzy
 msgid "output usage information"
-msgstr "Kann Benutzerinformation nicht abrufen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:3
 msgid "output verbose messages on internal operations"
@@ -63769,9 +59187,8 @@ msgid "use network only if dependencies are not available in local cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:6
-#, fuzzy
 msgid "don't run lifecycle scripts"
-msgstr "Das test-Skript nicht ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:7
 msgid "save HAR output of network traffic"
@@ -63786,32 +59203,28 @@ msgid "ignore engines check"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:10
-#, fuzzy
 msgid "ignore optional dependencies"
-msgstr "Zerstörte Abhängigkeiten korrigieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:11
-#, fuzzy
 msgid "ignore all caches"
-msgstr "Suche ignoriert Gross-/Kleinschreibung "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:12
 msgid "don't generate bin links when setting up packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:13
-#, fuzzy
 msgid "only allow one version of a package"
-msgstr "Ein oder mehrere Paket(e) installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:14
 msgid "don't read or generate a lockfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:15
-#, fuzzy
 msgid "don't generate a lockfile"
-msgstr "Veröffentlichungsdatei erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:16
 msgid "don't generate a lockfile and fail if an update is needed"
@@ -63824,37 +59237,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:18
-#, fuzzy
 msgid "specify a custom folder to store the yarn cache"
-msgstr "Datei zum Speichern des Quellenzwischenspeichers auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:19
 msgid "use a mutex to ensure only one yarn instance is executing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:20
-#, fuzzy
 msgid "disable emoji in output"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:21
-#, fuzzy
 msgid "disable progress bar"
-msgstr "Keinen Fortschrittsbalken anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:22
-#, fuzzy
 msgid "maximum number of concurrent network requests"
-msgstr "Mindestanzahl an Peers, um keine Anfragen zu stellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:1
 msgid "Module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:3
-#, fuzzy
 msgid "List all available modules"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:4
 msgid "Use the QT graphical user interface"
@@ -63877,63 +59285,52 @@ msgid "No window manager border for main window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:9
-#, fuzzy
 msgid "Use full screen"
-msgstr "Vollbildschirm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:1
-#, fuzzy
 msgid "Install the latest version of a package"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:2
-#, fuzzy
 msgid "Update specified packages (defaults to all packages)"
-msgstr "Angegebenes Paket von Aktualisierung ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:3
-#, fuzzy
 msgid "Print list of available updates"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:4
-#, fuzzy
 msgid "Remove the specified packages and packages that depend on them"
-msgstr "Pakete auflisten, von denen dieses Paket abhängt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:5
-#, fuzzy
 msgid "List available packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:6
-#, fuzzy
 msgid "Describe available packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:7
 msgid "Find package providing a feature or file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:8
-#, fuzzy
 msgid "find packages matching description regexp"
-msgstr "Inhalte eines Paketes auflisten, das dem Muster entspricht"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:9
-#, fuzzy
 msgid "Clean up cache directory"
-msgstr "Quellverzeichnisse bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:10
-#, fuzzy
 msgid "Generate rss changelog"
-msgstr "Ein neues Schlüsselpaar erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:14
-#, fuzzy
 msgid "Set debug level"
-msgstr "Debug-Grad festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:15
 msgid "Set error level"
@@ -63956,14 +59353,12 @@ msgid "Specify installroot"
 msgstr "installroot-Verzeichnis angeben"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:21
-#, fuzzy
 msgid "Enable repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:22
-#, fuzzy
 msgid "Disable repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:23
 msgid "Enables obsolets processing logic"
@@ -63978,80 +59373,66 @@ msgid "Exclude specified package from updates"
 msgstr "Angegebenes Paket von Aktualisierung ausschliessen"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:26
-#, fuzzy
 msgid "List all packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:27
 msgid "List packages available for installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:28
-#, fuzzy
 msgid "List packages with updates available"
-msgstr "Pakete auflisten, von denen dieses Paket abhängt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:30
-#, fuzzy
 msgid "List packages not available in repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:31
-#, fuzzy
 msgid "List packages that are obsoleted by packages in repositories"
 msgstr ""
-"Pakete auflisten, die als Quelle für mirrorbin oder mirrorsource dienen "
-"können"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:32
-#, fuzzy
 msgid "Delete cached package files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:33
-#, fuzzy
 msgid "Delete cached header files"
-msgstr "Veraltete Paketdateien löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:34
-#, fuzzy
 msgid "Delete all cache contents"
-msgstr "Nach Fertigstellung Logdatei löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:1
-#, fuzzy
 msgid ""
 "Internal completion function for appending string to the ZFS commandline"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:2
 #: /tmp/fish/implicit/share/completions/zpool.fish:2
-#, fuzzy
 msgid "Display a help message"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "Create a volume or filesystem"
-msgstr "Archiv und Dateisystem vergleichen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:4
 msgid "Destroy a dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:5
-#, fuzzy
 msgid "Create a snapshot"
-msgstr "Archiv erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:6
 msgid "Roll back a filesystem to a previous snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Create a clone of a snapshot"
-msgstr "Ein oder mehrere Paket(e) entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:8
 msgid ""
@@ -64060,24 +59441,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:9
-#, fuzzy
 msgid "Rename a dataset"
-msgstr "Eine Platte umbenennen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "List dataset properties"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:11
-#, fuzzy
 msgid "Set a dataset property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:12
-#, fuzzy
 msgid "Get one or several dataset properties"
-msgstr "Eigenschaft entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:13
 msgid "Set a dataset property to be inherited"
@@ -64104,9 +59481,8 @@ msgid "Stop sharing a given filesystem, or all of them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:21
-#, fuzzy
 msgid "Create a bookmark for a snapshot"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:22
 msgid "Output a stream representation of a dataset"
@@ -64132,14 +59508,12 @@ msgid "Put a named hold on a snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:27
-#, fuzzy
 msgid "List holds on a snapshot"
-msgstr "Auf Installierte begrenzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:28
-#, fuzzy
 msgid "Remove a named hold from a snapshot"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:29
 msgid ""
@@ -64154,70 +59528,58 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:31
 #: /tmp/fish/implicit/share/completions/zfs.fish:53
 #: /tmp/fish/implicit/share/completions/zfs.fish:58
-#, fuzzy
 msgid "Create all needed non-existing parent datasets"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:32
 #: /tmp/fish/implicit/share/completions/zfs.fish:33
-#, fuzzy
 msgid "Dataset property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:34
-#, fuzzy
 msgid "Volume size"
-msgstr "Datei komprimieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:35
-#, fuzzy
 msgid "Create a sparse volume"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:36
-#, fuzzy
 msgid "Blocksize"
-msgstr "Blockgrösse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:37
-#, fuzzy
 msgid "Recursively destroy children"
-msgstr "Rekursive Kopie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:38
 msgid "Recursively destroy all dependents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:39
-#, fuzzy
 msgid "Force unmounting"
-msgstr "Einhängen vortäuschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:41
-#, fuzzy
 msgid "Print machine-parsable verbose information"
-msgstr "Ausführliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:43
-#, fuzzy
 msgid "Defer snapshot deletion"
-msgstr "Auswahl löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:44
-#, fuzzy
 msgid "Dataset to destroy"
-msgstr "Startmenge der Tastendrücke"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:45
-#, fuzzy
 msgid "Recursively snapshot children"
-msgstr "Sicherer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:46
 #: /tmp/fish/implicit/share/completions/zfs.fish:47
-#, fuzzy
 msgid "Snapshot property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:48
 msgid "Dataset to snapshot"
@@ -64232,9 +59594,8 @@ msgid "Recursively destroy later snapshot, bookmarks and clones"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:51
-#, fuzzy
 msgid "Force unmounting of clones"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:52
 msgid "Snapshot to roll back to"
@@ -64242,9 +59603,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:54
 #: /tmp/fish/implicit/share/completions/zfs.fish:55
-#, fuzzy
 msgid "Clone property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:56
 msgid "Snapshot to clone"
@@ -64261,19 +59621,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:60
 #: /tmp/fish/implicit/share/completions/zfs.fish:62
 #: /tmp/fish/implicit/share/completions/zfs.fish:108
-#, fuzzy
 msgid "Force unmounting if needed"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:61
-#, fuzzy
 msgid "Do not remount filesystems during rename"
-msgstr "Im lokalen Dateisystem bleiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:63
-#, fuzzy
 msgid "Dataset to rename"
-msgstr "Dienstname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:64
 #: /tmp/fish/implicit/share/completions/zfs.fish:77
@@ -64282,31 +59639,27 @@ msgstr "Dienstname"
 #: /tmp/fish/implicit/share/completions/zpool.fish:59
 #: /tmp/fish/implicit/share/completions/zpool.fish:67
 #: /tmp/fish/implicit/share/completions/zpool.fish:99
-#, fuzzy
 msgid "Print output in a machine-parsable format"
-msgstr "Ausgabeformat für Profilierung"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:65
 #: /tmp/fish/implicit/share/completions/zfs.fish:75
 #: /tmp/fish/implicit/share/completions/zfs.fish:84
 #: /tmp/fish/implicit/share/completions/zfs.fish:89
-#, fuzzy
 msgid "Operate recursively on datasets"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:67
 #: /tmp/fish/implicit/share/completions/zpool.fish:105
-#, fuzzy
 msgid "Property to list"
-msgstr "Niedrigster Port, an dem gelauscht wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:68
 #: /tmp/fish/implicit/share/completions/zfs.fish:80
 #: /tmp/fish/implicit/share/completions/zfs.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:66
-#, fuzzy
 msgid "Print parsable (exact) values for numbers"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:69
 #: /tmp/fish/implicit/share/completions/zfs.fish:97
@@ -64324,9 +59677,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:73
 #: /tmp/fish/implicit/share/completions/zpool.fish:125
-#, fuzzy
 msgid "Property to set"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:74
 msgid "Dataset which property is to be setted"
@@ -64334,68 +59686,57 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:78
 #: /tmp/fish/implicit/share/completions/zpool.fish:68
-#, fuzzy
 msgid "Fields to display"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:79
-#, fuzzy
 msgid "Property source to display"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:82
-#, fuzzy
 msgid "Property to get"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:83
 msgid "Dataset which properties is to be got"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:85
-#, fuzzy
 msgid "Revert to the received value if available"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:86
 msgid "Dataset which properties is to be inherited"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:88
-#, fuzzy
 msgid "Upgrade all eligible filesystems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Upgrade to the specified version"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:91
-#, fuzzy
 msgid "Filesystem to upgrade"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:92
-#, fuzzy
 msgid "Print UID instead of user name"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:93
-#, fuzzy
 msgid "Print GID instead of group name"
-msgstr "Überschrift ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:96
-#, fuzzy
 msgid "Field to display"
-msgstr "X Server-Anzeige"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:99
 #: /tmp/fish/implicit/share/completions/zfs.fish:100
-#, fuzzy
 msgid "Identity types to display"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:101
 msgid "Translate S(amba)ID to POSIX ID"
@@ -64410,62 +59751,52 @@ msgid "Temporary mount point property"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:104
-#, fuzzy
 msgid "Report progress"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:105
-#, fuzzy
 msgid "Mount all available ZFS filesystems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:106
 msgid "Overlay mount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:107
-#, fuzzy
 msgid "Filesystem to mount"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:109
-#, fuzzy
 msgid "Unmount all available ZFS filesystems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:110
-#, fuzzy
 msgid "Filesystem to unmount"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:111
-#, fuzzy
 msgid "Share all eligible ZFS filesystems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:112
-#, fuzzy
 msgid "Filesystem to share"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:113
-#, fuzzy
 msgid "Unshare all shared ZFS filesystems"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:114
-#, fuzzy
 msgid "Filesystem to unshare"
-msgstr "Dateisystemtyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:115
 msgid "Snapshot to bookmark"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:116
-#, fuzzy
 msgid "Generate incremental stream from snapshot"
-msgstr "Neues inkrementelles GNU-Format benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:117
 msgid ""
@@ -64479,9 +59810,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:119
 #: /tmp/fish/implicit/share/completions/zfs.fish:128
-#, fuzzy
 msgid "Generate a deduplicated stream"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:120
 #: /tmp/fish/implicit/share/completions/zfs.fish:129
@@ -64495,52 +59825,43 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:122
 #: /tmp/fish/implicit/share/completions/zfs.fish:131
-#, fuzzy
 msgid "Print verbose information about the stream in a machine-parsable format"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:123
-#, fuzzy
 msgid "Generate compressed stream"
-msgstr "Paket aus Quelle generieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:125
 #: /tmp/fish/implicit/share/completions/zfs.fish:133
-#, fuzzy
 msgid "Include dataset properties"
-msgstr "Datei ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:126
 #: /tmp/fish/implicit/share/completions/zfs.fish:134
-#, fuzzy
 msgid "Print verbose information about the stream"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:135
-#, fuzzy
 msgid "Dataset to send"
-msgstr "Mail an Benutzer senden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:136
-#, fuzzy
 msgid ""
 "Print verbose information about the stream and the time spent processing it"
-msgstr "Statusinformation über Fish zurückgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:137
-#, fuzzy
 msgid "Dry run: do not actually receive the stream"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:138
-#, fuzzy
 msgid "Force rollback to the most recent snapshot"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:139
-#, fuzzy
 msgid "Unmount the target filesystem"
-msgstr "Alle Dateisysteme anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:140
 msgid "Discard the first element of the path of the sent snapshot"
@@ -64563,29 +59884,25 @@ msgid "Dataset to receive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:145
-#, fuzzy
 msgid "Delegate permissions only on the specified dataset"
-msgstr "Alle möglichen Definitionen des angegebenen Namens ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:146
 msgid "Delegate permissions only on the descendents dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:147
-#, fuzzy
 msgid "User to delegate permissions to"
-msgstr "Alle Rechte extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:148
-#, fuzzy
 msgid "Group to delegate permissions to"
-msgstr "Ausgabe in zwei Spalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:149
 #: /tmp/fish/implicit/share/completions/zfs.fish:150
-#, fuzzy
 msgid "Delegate permission to everyone"
-msgstr "Freistehende Umgebung bestätigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:151
 msgid "Delegate permissions only to the creator of later descendent datasets"
@@ -64600,71 +59917,62 @@ msgid "Dataset on which delegation is to be applied"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:154
-#, fuzzy
 msgid "Remove permissions only on the specified dataset"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:155
 msgid "Remove permissions only on the descendents dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:156
-#, fuzzy
 msgid "User to remove permissions from"
-msgstr "Umgebung erhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:157
-#, fuzzy
 msgid "Group to remove permissions from"
-msgstr "Ausgabe in zwei Spalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:158
 #: /tmp/fish/implicit/share/completions/zfs.fish:162
 #: /tmp/fish/implicit/share/completions/zfs.fish:163
-#, fuzzy
 msgid "Remove permission from everyone"
-msgstr "Alle Einträge aus der --group-Liste entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:159
 msgid "Remove permissions only on later created descendent datasets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:160
-#, fuzzy
 msgid "Remove a permission set or remove permissions from an existing one"
-msgstr "Alle gz-Dateien aus dem Zwischenspeicher entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:161
-#, fuzzy
 msgid "Remove permissions recursively"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:164
 msgid "Dataset on which delegation is to be removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:165
-#, fuzzy
 msgid "Apply hold recursively"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:166
 msgid "Snapshot on which hold is to be applied"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:167
-#, fuzzy
 msgid "List holds recursively"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:168
 msgid "Snapshot which holds are to be listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:169
-#, fuzzy
 msgid "Release hold recursively"
-msgstr "Rekursiv arbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:170
 msgid "Snapshot from which hold is to be removed"
@@ -64675,23 +59983,20 @@ msgid "Display file type (à la ls -F)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:173
-#, fuzzy
 msgid "Display inode change time"
-msgstr "Zeilennummer anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:174
 msgid "Source snapshot for the diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:175
-#, fuzzy
 msgid "Execution timeout"
-msgstr "Rekursionsgrenze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:176
-#, fuzzy
 msgid "Execution memory limit"
-msgstr "Rekursionsgrenze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:177
 msgid "Pool which program will be executed on"
@@ -64714,9 +60019,8 @@ msgid "Move into zipfile (delete files)"
 msgstr "In Zip-Datei verschieben (Dateien löschen)"
 
 #: /tmp/fish/implicit/share/completions/zip.fish:6
-#, fuzzy
 msgid "Do not store directory names"
-msgstr "Verzeichnisnamen nicht speichern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:7
 msgid "Do not compress at all"
@@ -64820,9 +60124,8 @@ msgid "Clear devices errors in pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:6
-#, fuzzy
 msgid "Create a new storage pool"
-msgstr "Neues Projekt erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:7
 msgid "Destroy a storage pool"
@@ -64833,89 +60136,76 @@ msgid "Detach virtual device from a mirroring pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:9
-#, fuzzy
 msgid "Display pool event log"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:10
 msgid "Export a pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:11
-#, fuzzy
 msgid "Get one or several pool properties"
-msgstr "Eigenschaft entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "Display pool command history"
-msgstr "Hilfe anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:13
-#, fuzzy
 msgid "List importable pools, or import some"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:14
-#, fuzzy
 msgid "Display pool I/O stats"
-msgstr "Steuerzeichen anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:15
-#, fuzzy
 msgid "Remove ZFS label information from the specified device"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:16
 msgid "List pools with health status and space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:17
-#, fuzzy
 msgid "Take the specified devices offline"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Bring the specified devices back online"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:19
 msgid "Reset pool GUID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:20
-#, fuzzy
 msgid "Remove virtual devices from pool"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:21
-#, fuzzy
 msgid "Reopen pool devices"
-msgstr "Alle Namen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:22
-#, fuzzy
 msgid "Replace a pool virtual device"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:23
 msgid "Start or stop scrubbing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:24
-#, fuzzy
 msgid "Set a pool property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:25
 msgid "Create a pool by splitting an existing mirror one"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:26
-#, fuzzy
 msgid "Display detailed pool health status"
-msgstr "URIs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:27
 msgid "List upgradeable pools, or upgrade one"
@@ -64925,15 +60215,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zpool.fish:36
 #: /tmp/fish/implicit/share/completions/zpool.fish:45
 #: /tmp/fish/implicit/share/completions/zpool.fish:117
-#, fuzzy
 msgid "Force use of virtual device"
-msgstr "Inode-Nummer der Dateien ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:29
 #: /tmp/fish/implicit/share/completions/zpool.fish:130
-#, fuzzy
 msgid "Dry run: only display resulting configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:30
 #: /tmp/fish/implicit/share/completions/zpool.fish:91
@@ -64948,38 +60236,33 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zpool.fish:101
 #: /tmp/fish/implicit/share/completions/zpool.fish:128
 #: /tmp/fish/implicit/share/completions/zpool.fish:136
-#, fuzzy
 msgid "Resolve device path symbolic links"
-msgstr "Symbolische Verweise dereferenzieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:32
 #: /tmp/fish/implicit/share/completions/zpool.fish:93
 #: /tmp/fish/implicit/share/completions/zpool.fish:102
 #: /tmp/fish/implicit/share/completions/zpool.fish:129
 #: /tmp/fish/implicit/share/completions/zpool.fish:137
-#, fuzzy
 msgid "Display device full path"
-msgstr "Handbuchseite anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:33
 #: /tmp/fish/implicit/share/completions/zpool.fish:37
 #: /tmp/fish/implicit/share/completions/zpool.fish:48
 #: /tmp/fish/implicit/share/completions/zpool.fish:118
 #: /tmp/fish/implicit/share/completions/zpool.fish:132
-#, fuzzy
 msgid "Pool property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:34
-#, fuzzy
 msgid "Pool to add virtual devices to"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:35
 #: /tmp/fish/implicit/share/completions/zpool.fish:53
-#, fuzzy
 msgid "Virtual device to add"
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:38
 msgid "Pool to attach virtual device to"
@@ -64987,14 +60270,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:39
 #: /tmp/fish/implicit/share/completions/zpool.fish:43
-#, fuzzy
 msgid "Virtual device to operate on"
-msgstr "Bereichskontrolle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:40
-#, fuzzy
 msgid "Initiate recovery mode"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:41
 #: /tmp/fish/implicit/share/completions/zpool.fish:85
@@ -65013,19 +60294,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:46
-#, fuzzy
 msgid "Dry run, only display resulting configuration"
-msgstr "Dienstkonfiguration neu laden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:47
-#, fuzzy
 msgid "Do not enable any feature on the new pool"
-msgstr "Nicht abbrechen, wenn die Signatur älter als der Schlüssel ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:49
-#, fuzzy
 msgid "Root filesystem property"
-msgstr "Eigenschaft festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:50
 #: /tmp/fish/implicit/share/completions/zpool.fish:83
@@ -65033,14 +60311,12 @@ msgid "Equivalent to \"-o cachefile=none,altroot=ROOT\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:51
-#, fuzzy
 msgid "Root filesystem mountpoint"
-msgstr "Lange Zeilen nicht umbrechen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:52
-#, fuzzy
 msgid "Set a different in-core pool name"
-msgstr "Benutzerschnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:54
 #: /tmp/fish/implicit/share/completions/zpool.fish:64
@@ -65052,74 +60328,64 @@ msgid "Pool to destroy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:56
-#, fuzzy
 msgid "Pool to detach device from"
-msgstr "Datei ist ein Block-Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:57
 msgid "Physical device to detach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:58
-#, fuzzy
 msgid "Print verbose event information"
-msgstr "Ausführliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:60
 msgid "Output appended data as the log grows"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:61
-#, fuzzy
 msgid "Clear all previous events"
-msgstr "Sämtliche Versions-Informationen ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:62
 msgid "Pool to read events from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:63
-#, fuzzy
 msgid "Export all pools"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:65
-#, fuzzy
 msgid "Pool to export"
-msgstr "Grafikanzeige auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:69
 msgid "Properties to get"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:70
-#, fuzzy
 msgid "Pool to get properties of"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:71
 msgid "Also display internal events"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:72
-#, fuzzy
 msgid "Display log records using long format"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:73
-#, fuzzy
 msgid "Pool to get command history of"
-msgstr "Keine Befehle ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:74
-#, fuzzy
 msgid "Read configuration from specified cache file"
-msgstr "Konfigurationsdatei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:75
-#, fuzzy
 msgid "Search for devices or files in specified directory"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:76
 msgid "List or import destroyed pools only (requires -f for importation)"
@@ -65127,38 +60393,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:77
 #: /tmp/fish/implicit/share/completions/zpool.fish:133
-#, fuzzy
 msgid "Mount properties for contained datasets"
-msgstr "Nur zutreffenden Teil anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:78
-#, fuzzy
 msgid "Properties of the imported pool"
-msgstr "Größe des freigegebenen Speicherpools festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:79
-#, fuzzy
 msgid "Force import"
-msgstr "Farben benutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:80
-#, fuzzy
 msgid "Recovery mode"
-msgstr "Server-Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:81
-#, fuzzy
 msgid "Search for and import all pools found"
-msgstr "Nach Ablaufzeit fragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:82
 msgid "Ignore missing log device (risk of loss of last changes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:84
-#, fuzzy
 msgid "Do not mount contained filesystems"
-msgstr "Im lokalen Dateisystem bleiben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:86
 msgid "Roll back to a previous TXG (hazardous)"
@@ -65169,32 +60429,27 @@ msgid "TXG to roll back to (implies -FX)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:88
-#, fuzzy
 msgid "Specify, as the last argument, a temporary pool name"
-msgstr "Geben Sie einen Titel für rss an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:89
-#, fuzzy
 msgid "Pool to import"
-msgstr "Zu importierendes Verzeichnis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:90
 #: /tmp/fish/implicit/share/completions/zpool.fish:103
 #: /tmp/fish/implicit/share/completions/zpool.fish:142
-#, fuzzy
 msgid "Display a timestamp using specified format"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:94
-#, fuzzy
 msgid "Omit statistics since boot"
-msgstr "Wortzählung ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:104
-#, fuzzy
 msgid "Print verbose statistics"
-msgstr "Ausführliche Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:96
 msgid "Pool to retrieve I/O stats from"
@@ -65205,14 +60460,12 @@ msgid "Treat exported or foreign devices as inactive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:98
-#, fuzzy
 msgid "Device to clear ZFS label information from"
-msgstr "Alle Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:106
-#, fuzzy
 msgid "Pool to list properties of"
-msgstr "Zeichensatzeigenschaften anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:107
 msgid "Temporarily offline"
@@ -65227,14 +60480,12 @@ msgid "Physical device to offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:110
-#, fuzzy
 msgid "Expand the device to use all available space"
-msgstr "Liste der Quellpakete aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:111
-#, fuzzy
 msgid "Pool to bring device back online on"
-msgstr "Blockorientiertes Gerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:112
 msgid "Physical device to bring back online"
@@ -65253,33 +60504,28 @@ msgid "Physical device to remove"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:116
-#, fuzzy
 msgid "Pool which devices are to be reopened"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:119
-#, fuzzy
 msgid "Pool to replace device"
-msgstr "Datei ist ein Zeichengerät"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:120
 msgid "Pool device to be replaced"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:121
-#, fuzzy
 msgid "Device to use for replacement"
-msgstr "Geräte-Sektion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:122
-#, fuzzy
 msgid "Stop scrubbing"
-msgstr "Dienst anhalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:123
-#, fuzzy
 msgid "Pause scrubbing"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:124
 msgid "Pool to start/stop scrubbing"
@@ -65294,15 +60540,13 @@ msgid "Set altroot for newpool and automatically import it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:134
-#, fuzzy
 msgid "Pool to split"
-msgstr "Niedrigster Port, an dem gelauscht wird"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:138
 #: /tmp/fish/implicit/share/completions/zpool.fish:139
-#, fuzzy
 msgid "Display deduplication histogram"
-msgstr "Alle Änderungsprotokolle anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:141
 msgid "Only display status for unhealthy or unavailable pools"
@@ -65318,14 +60562,12 @@ msgid "Upgrade all eligible pools, enabling all supported features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:145
-#, fuzzy
 msgid "Display upgradeable ZFS versions"
-msgstr "Paketsatz anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:146
-#, fuzzy
 msgid "Upgrade to the specified legacy version"
-msgstr "Fenster auf der angegebenen Anzeige erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:2
 msgid "Repo"
@@ -65336,264 +60578,212 @@ msgid "Accept multiple commands at once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:6
-#, fuzzy
 msgid "List all defined repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:7
-#, fuzzy
 msgid "Add a new repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:8
-#, fuzzy
 msgid "Remove specified repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:9
-#, fuzzy
 msgid "Rename specified repository"
-msgstr "Defektes Paketdepot reparieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:10
-#, fuzzy
 msgid "Modify specified repository"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:11
-#, fuzzy
 msgid "Refresh all repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:12
-#, fuzzy
 msgid "Clean local caches"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:13
-#, fuzzy
 msgid "List all defined services"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:14
-#, fuzzy
 msgid "Add a new service"
-msgstr "Neuen Schlüssel hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:15
-#, fuzzy
 msgid "Modify specified service"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:16
-#, fuzzy
 msgid "Remove specified service"
-msgstr "Angegebenen Schlüsselserver verwenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:17
-#, fuzzy
 msgid "Refresh all services"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:20
-#, fuzzy
 msgid "Verify integrity of package dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:21
-#, fuzzy
 msgid "Install source packages and their build dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:22
-#, fuzzy
 msgid "Install newly added packages recommended by installed packages"
 msgstr ""
-"Installiere diese Pakete, selbst wenn sie Dateien aus anderen, bereits "
-"installierten Paketen ersetzen"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:23
-#, fuzzy
 msgid "Update installed packages with newer versions"
-msgstr "Alle Quellpakete mit Version ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:24
-#, fuzzy
 msgid "List available updates"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:25
-#, fuzzy
 msgid "Install needed patches"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:26
-#, fuzzy
 msgid "List needed patches"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:27
-#, fuzzy
 msgid "Perform a distribution upgrade"
-msgstr "Simulation durchführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:28
-#, fuzzy
 msgid "Check for patches"
-msgstr "Komprimierte Patche erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:29
-#, fuzzy
 msgid "Search for packages matching a pattern"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:30
-#, fuzzy
 msgid "Show full information for specified packages"
-msgstr "Volle Versionen der Pakete anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:31
-#, fuzzy
 msgid "Show full information for specified patches"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:32
-#, fuzzy
 msgid "Show full information for specified patterns"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:33
-#, fuzzy
 msgid "Show full information for specified products"
-msgstr "Profilierungsinformation in angegebene Datei ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:34
-#, fuzzy
 msgid "List all available patches"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:35
-#, fuzzy
 msgid "List all available packages"
-msgstr "Pakete erneut installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:36
-#, fuzzy
 msgid "List all available patterns"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:37
-#, fuzzy
 msgid "List all available products"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:38
-#, fuzzy
 msgid "List packages providing specified capability"
-msgstr "Alle Pakete abfragen, die die angegebene Eigenschaft bereitstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:39
-#, fuzzy
 msgid "Add a package lock"
-msgstr "Ein Paket neu erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:40
-#, fuzzy
 msgid "Remove a package lock"
-msgstr "Pakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:41
-#, fuzzy
 msgid "List current package locks"
-msgstr "Fehler aus Paketen auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:42
-#, fuzzy
 msgid "Remove unused locks"
-msgstr "Quellpakete entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:43
-#, fuzzy
 msgid "Compare two version strings"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:44
-#, fuzzy
 msgid "Print the target operating system ID string"
-msgstr "Betriebssystem ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:45
 msgid "Print report about licenses and EULAs of installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:46
-#, fuzzy
 msgid "Download source rpms for all installed packages to a local directory"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:48
-#, fuzzy
 msgid "Output the version number"
-msgstr "Versionsnummer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:49
-#, fuzzy
 msgid "Use specified config file instead of the default"
-msgstr "Angegebene Datei anstelle der Standardvertrauensdatenbank nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:50
-#, fuzzy
 msgid "Suppress normal output, print only error messages"
-msgstr "Fehlermeldungen unterdrücken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:52
-#, fuzzy
 msgid "Do not abbreviate text in tables"
-msgstr "Keine Ausgabedateien erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:53
-#, fuzzy
 msgid "Table style (integer)"
-msgstr "Integrität der Zip-Datei testen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:54
-#, fuzzy
 msgid "Turn on rug compatibility"
-msgstr "Debug-Ausgabe aktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:55
 msgid "Do not ask anything, use default answers automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:56
-#, fuzzy
 msgid "Switch to XML output"
-msgstr "Ausgabebreite festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:57
-#, fuzzy
 msgid "Ignore unknown packages"
-msgstr "Fehlende Pakete ignorieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:58
-#, fuzzy
 msgid "Use an additional repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:59
-#, fuzzy
 msgid "Use alternative repository definition file directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:60
-#, fuzzy
 msgid "Use alternative directory for all caches"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:61
-#, fuzzy
 msgid "Operate on a different root directory"
-msgstr "Diff zwischen zwei Versionen des Paketdepots erstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:62
 msgid ""
@@ -65609,29 +60799,24 @@ msgid "Automatically trust and import new repository signing keys"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:65
-#, fuzzy
 msgid "Do not read meta-data from repositories"
-msgstr "Erstellte Dateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:66
-#, fuzzy
 msgid "Do not refresh the repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:67
-#, fuzzy
 msgid "Ignore CD/DVD repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:68
-#, fuzzy
 msgid "Ignore remote repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:69
-#, fuzzy
 msgid "Do not read installed packages"
-msgstr "Pakete nicht aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:70
 msgid "Output a list of zypper user prompts"
@@ -65658,26 +60843,22 @@ msgid "Export all defined repositories as a single local .repo file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:76
-#, fuzzy
 msgid "Show also repository alias"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:77
-#, fuzzy
 msgid "Show also repository name"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:78
 #: /tmp/fish/implicit/share/completions/zypper.fish:121
-#, fuzzy
 msgid "Show also base URI of repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:79
 #: /tmp/fish/implicit/share/completions/zypper.fish:122
-#, fuzzy
 msgid "Show also repository priority"
-msgstr "Zugriffsverlauf des Paketdepots anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:80
 msgid "Show also the autorefresh flag"
@@ -65699,9 +60880,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:84
 #: /tmp/fish/implicit/share/completions/zypper.fish:125
-#, fuzzy
 msgid "Sort the list by repository priority"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:85
 msgid "Sort the list by alias"
@@ -65721,23 +60901,20 @@ msgid "Type of repository (yast2, rpm-md, plaindir)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:89
-#, fuzzy
 msgid "Add the repository as disabled"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:90
-#, fuzzy
 msgid "Probe URI"
-msgstr "Eine CD testen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:91
 msgid "Don't probe URI, probe later during refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:92
-#, fuzzy
 msgid "Specify descriptive name for the repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:93
 #: /tmp/fish/implicit/share/completions/zypper.fish:106
@@ -65746,26 +60923,22 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:94
 #: /tmp/fish/implicit/share/completions/zypper.fish:107
-#, fuzzy
 msgid "Disable RPM files caching"
-msgstr "Nicht auf die Veränderungszeiten der Dateien vertrauen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:95
 #: /tmp/fish/implicit/share/completions/zypper.fish:108
-#, fuzzy
 msgid "Enable GPG check for this repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:96
 #: /tmp/fish/implicit/share/completions/zypper.fish:109
-#, fuzzy
 msgid "Disable GPG check for this repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:97
-#, fuzzy
 msgid "Enable autorefresh of the repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:98
 #: /tmp/fish/implicit/share/completions/zypper.fish:146
@@ -65774,67 +60947,56 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:99
 #: /tmp/fish/implicit/share/completions/zypper.fish:147
-#, fuzzy
 msgid "Ignore query string in the URI"
-msgstr "Dateien ignorieren, die mit ~ enden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:100
 msgid "Disable the repository (but don't remove it)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:101
-#, fuzzy
 msgid "Enable a disabled repository"
-msgstr "Defektes Paketdepot reparieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:102
-#, fuzzy
 msgid "Enable auto-refresh of the repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:103
-#, fuzzy
 msgid "Disable auto-refresh of the repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:104
-#, fuzzy
 msgid "Set a descriptive name for the repository"
-msgstr "Neue/s Datei/Verzeichnis zum Paketdepot hinzufügen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:105
-#, fuzzy
 msgid "Set priority of the repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:110
-#, fuzzy
 msgid "Apply changes to all repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:111
-#, fuzzy
 msgid "Apply changes to all local repositories"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:112
-#, fuzzy
 msgid "Apply changes to all remote repositories"
-msgstr "Einträge in .cvspass für entferntes Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:113
-#, fuzzy
 msgid "Apply changes to repositories of specified type"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:114
 msgid "Force a complete refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:115
-#, fuzzy
 msgid "Force rebuild of the database"
-msgstr "Index-Neuerstellung erzwingen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:116
 msgid "Force download of raw metadata"
@@ -65849,9 +61011,8 @@ msgid "Only download raw metadata, don't build the database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:119
-#, fuzzy
 msgid "Refresh only specified repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:120
 msgid "Refresh also services before refreshing repos"
@@ -65862,19 +61023,16 @@ msgid "Show also repositories belonging to the services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:128
-#, fuzzy
 msgid "Type of the service (ris)"
-msgstr "Anzahl der Top-Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:129
-#, fuzzy
 msgid "Add the service as disabled"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:130
-#, fuzzy
 msgid "Specify descriptive name for the service"
-msgstr "Ziel-E-Mail-Adresse angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:131
 msgid "Disable the service (but don't remove it)"
@@ -65893,39 +61051,32 @@ msgid "Disable auto-refresh of the service"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:135
-#, fuzzy
 msgid "Set a descriptive name for the service"
-msgstr "Beschreibung des mime-Typs ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:136
-#, fuzzy
 msgid "Add a RIS service repository to enable"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:137
-#, fuzzy
 msgid "Add a RIS service repository to disable"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:138
-#, fuzzy
 msgid "Remove a RIS service repository to enable"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:139
-#, fuzzy
 msgid "Remove a RIS service repository to disable"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:140
-#, fuzzy
 msgid "Clear the list of RIS repositories to enable"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:141
-#, fuzzy
 msgid "Clear the list of RIS repositories to disable"
-msgstr "Liste der rpm-Konfigurationsdateien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:142
 msgid "Apply changes to all services"
@@ -65936,19 +61087,16 @@ msgid "Apply changes to all local services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:144
-#, fuzzy
 msgid "Apply changes to all remote services"
-msgstr "Datei zum Zugriff auf Server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:145
-#, fuzzy
 msgid "Apply changes to services of specified type"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:148
-#, fuzzy
 msgid "Refresh also repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:149
 #: /tmp/fish/implicit/share/completions/zypper.fish:165
@@ -65956,9 +61104,8 @@ msgstr "Depot deaktivieren"
 #: /tmp/fish/implicit/share/completions/zypper.fish:190
 #: /tmp/fish/implicit/share/completions/zypper.fish:213
 #: /tmp/fish/implicit/share/completions/zypper.fish:276
-#, fuzzy
 msgid "Load only the specified repository"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:150
 msgid ""
@@ -65973,9 +61120,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:152
 #: /tmp/fish/implicit/share/completions/zypper.fish:168
-#, fuzzy
 msgid "Select packages by capability"
-msgstr "Alle Pakete abfragen, die die angegebene Eigenschaft bereitstellen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:153
 msgid ""
@@ -66007,9 +61153,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:194
 #: /tmp/fish/implicit/share/completions/zypper.fish:216
 #: /tmp/fish/implicit/share/completions/zypper.fish:278
-#, fuzzy
 msgid "Only download the packages, do not install"
-msgstr "Nie ins übergeordnete Verzeichnis wechseln"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:158
 msgid ""
@@ -66039,9 +61184,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:201
 #: /tmp/fish/implicit/share/completions/zypper.fish:219
 #: /tmp/fish/implicit/share/completions/zypper.fish:283
-#, fuzzy
 msgid "Install also recommended packages in addition to the required"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:162
 #: /tmp/fish/implicit/share/completions/zypper.fish:174
@@ -66050,9 +61194,8 @@ msgid "Force the solver to find a solution (even an aggressive one)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:163
-#, fuzzy
 msgid "Select packages from the specified repository"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:164
 #: /tmp/fish/implicit/share/completions/zypper.fish:179
@@ -66072,14 +61215,12 @@ msgid "Type of package (package, patch, pattern, product). Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:170
-#, fuzzy
 msgid "Automatically remove unneeded dependencies"
-msgstr "Pakete für Abhängigkeiten installieren/entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:171
-#, fuzzy
 msgid "No automatic removal of unneeded dependencies"
-msgstr "Status der Abhängigkeiten anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:172
 msgid "Test the removal, do not actually remove"
@@ -66090,24 +61231,20 @@ msgid "Test the repair, do not actually do anything to the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:181
-#, fuzzy
 msgid "Install only build dependencies of specified packages"
-msgstr "Pakete auflisten, die abhängen von "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:182
-#, fuzzy
 msgid "Don't install build dependencies"
-msgstr "Nicht automatisch Abhängigkeiten erfüllen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:183
-#, fuzzy
 msgid "Install packages only from specified repositories"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:184
-#, fuzzy
 msgid "Load only the specified repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:189
 msgid ""
@@ -66121,9 +61258,8 @@ msgid "Test the update, do not actually update"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:195
-#, fuzzy
 msgid "Skip interactive updates"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:198
 #: /tmp/fish/implicit/share/completions/zypper.fish:205
@@ -66133,9 +61269,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:203
-#, fuzzy
 msgid "List only updates from the specified repository"
-msgstr "Defektes Paketdepot reparieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:204
 msgid ""
@@ -66148,42 +61283,36 @@ msgid "List needed patches for Bugzilla issues"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:207
-#, fuzzy
 msgid "List all patches in this category"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:208
-#, fuzzy
 msgid "List all patches, not only the needed ones"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:209
-#, fuzzy
 msgid "List only patches from the specified repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:210
 msgid "List patches issued up to the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:211
-#, fuzzy
 msgid "List needed patches for CVE issues"
-msgstr "Neues Paket installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:212
-#, fuzzy
 msgid "Look for issues matching the specified string"
-msgstr "Dem Muster entsprechende Dateien ausschliessen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:215
 msgid "Test the upgrade, do not actually upgrade"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:220
-#, fuzzy
 msgid "Restrict upgrade to specified repository"
-msgstr "Jokerzeichen auf angegebenes Verzeichnis beschränken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:222
 msgid "Do not allow installed resolvables to be downgraded"
@@ -66218,9 +61347,8 @@ msgid "Allow installed resolvables to switch vendors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:230
-#, fuzzy
 msgid "Check for patches only in the specified repository"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:231
 msgid "Search also in package summaries and descriptions"
@@ -66231,126 +61359,107 @@ msgid "Perform case-sensitive search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:233
-#, fuzzy
 msgid "Show only packages that are already installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:234
-#, fuzzy
 msgid "Show only packages that are not currently installed"
-msgstr "Paket aktualisieren, wenn es bereits installiert ist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:235
-#, fuzzy
 msgid "Search only for packages of the specified type"
-msgstr "Pakete mit der angegebenen Gruppe abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:236
-#, fuzzy
 msgid "Search only in the specified repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:237
 msgid "Show each available version in each repository on a separate line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:238
-#, fuzzy
 msgid "Sort packages by name (default)"
-msgstr "Paketname nach Präfix ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:239
-#, fuzzy
 msgid "Sort packages by repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:240
 msgid "Search for a match with all search strings (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:241
-#, fuzzy
 msgid "Search for a match with any of the search strings"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:242
 msgid "Search for a match to partial words (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:243
-#, fuzzy
 msgid "Search for a match to whole words only"
-msgstr "Paket entsprechend Muster suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:244
-#, fuzzy
 msgid "Searches for an exact package name"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:245
-#, fuzzy
 msgid "Work only with the specified repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:247
 msgid "Show also requires and prerequires"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:248
-#, fuzzy
 msgid "Show also recommends"
-msgstr "Arp-Einträge anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:249
 #: /tmp/fish/implicit/share/completions/zypper.fish:250
 #: /tmp/fish/implicit/share/completions/zypper.fish:255
 #: /tmp/fish/implicit/share/completions/zypper.fish:258
-#, fuzzy
 msgid "Just another means to specify repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:251
-#, fuzzy
 msgid "Show only installed packages"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:252
-#, fuzzy
 msgid "Show only packages which are not installed"
-msgstr "Installierte Pakete synchronisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:253
-#, fuzzy
 msgid "Sort the list by package name"
-msgstr "Vollständigen Paketnamen suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:254
-#, fuzzy
 msgid "Sort the list by repository"
-msgstr "Paketdepot aktualisieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:256
-#, fuzzy
 msgid "Show only installed patterns"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:257
 msgid "Show only patterns which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:259
-#, fuzzy
 msgid "Show only installed products"
-msgstr "Alle installierten Pakete abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:260
 msgid "Show only products which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:261
-#, fuzzy
 msgid "Restrict the lock to the specified repository"
-msgstr "Jokerzeichen auf angegebenes Verzeichnis beschränken"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:262
 #: /tmp/fish/implicit/share/completions/zypper.fish:264
@@ -66358,76 +61467,64 @@ msgid "Type of package (package, patch, pattern, product).  Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:263
-#, fuzzy
 msgid "Remove only locks with specified repository"
-msgstr "Einen Eintrag aus dem Paketdepot entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:265
-#, fuzzy
 msgid "Clean only duplicate locks"
-msgstr "Nicht doppelte Zeilen entfernen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:266
 msgid "Clean only locks which doesn't lock anything"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:267
-#, fuzzy
 msgid "Takes missing release number as any release"
-msgstr "fehlende Hexzahl in Escapesequenz"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:268
 msgid "Show the operating system label"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:269
-#, fuzzy
 msgid "Clean only specified repositories"
-msgstr "Depot deaktivieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:270
-#, fuzzy
 msgid "Clean metadata cache"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:271
-#, fuzzy
 msgid "Clean raw metadata cache"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:272
-#, fuzzy
 msgid "Clean both metadata and package caches"
-msgstr "Lokalen Zwischenspeicher und Pakete bereinigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:274
-#, fuzzy
 msgid "Install patch fixing the specified bugzilla issue"
-msgstr "Partition mit angegebenem Label einhängen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:275
-#, fuzzy
 msgid "Install all patches in this category"
-msgstr "Dateien in das Paketdepot übertragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:279
-#, fuzzy
 msgid "Install patch fixing the specified CVE issue"
-msgstr "Ein (deinstalliertes) Paket in der angegebenen Datei abfragen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:280
 msgid "Install patches issued until the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:285
-#, fuzzy
 msgid "Skip interactive patches"
-msgstr "Im nicht interaktiven Modus ausführen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:286
-#, fuzzy
 msgid "Do not skip interactive patches"
-msgstr "Patch nicht signieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:287
 msgid ""
@@ -66436,14 +61533,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:288
-#, fuzzy
 msgid "Delete extraneous source rpms in the local directory"
-msgstr "CVS-Paketdepot erstellen, wenn es nicht existiert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:289
-#, fuzzy
 msgid "Do not delete extraneous source rpms"
-msgstr "Quelldateien nicht löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:290
 msgid ""
@@ -66460,9 +61555,8 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "Ende des Befehls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
@@ -66473,9 +61567,8 @@ msgid "Print the current directory history (the prev and next lists)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirs.fish:1
-#, fuzzy
 msgid "Print directory stack"
-msgstr "Verzeichnisnamen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/down-or-search.fish:1
 msgid ""
@@ -66504,9 +61597,8 @@ msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
-#, fuzzy
 msgid "List archive contents"
-msgstr "Archiv auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:1
 msgid "Maximum uploads at once"
@@ -66640,24 +61732,20 @@ msgid "Complete using all available commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_convert_options.fish:1
-#, fuzzy
 msgid "Complete Convert options"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
-#, fuzzy
 msgid "Complete directory prefixes"
-msgstr "Verzeichnis-Präfix festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:1
-#, fuzzy
 msgid "Complete ftp, pftp"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:2
-#, fuzzy
 msgid "Hostname"
-msgstr "Benutzername"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:3
 msgid "Use only IPv4 to contact any host"
@@ -66688,9 +61776,8 @@ msgid "Disable command editing and history support"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:10
-#, fuzzy
 msgid "Disable file name globbing"
-msgstr "Nicht auf die Veränderungszeiten der Dateien vertrauen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:11
 msgid "Do not explicitly bind data and control channels to same interface"
@@ -66701,32 +61788,28 @@ msgid "Verbose. Show all server responses and data transfer stats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:13
-#, fuzzy
 msgid "Enable debugging"
-msgstr "Entfernung der Zusatzinformationen abschalten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_groups.fish:1
 msgid "Print a list of local groups, with group members as the description"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_job_pids.fish:1
-#, fuzzy
 msgid "Print a list of job PIDs and their commands"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:1
-#, fuzzy
 msgid "Complete lpr common options"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:2
 msgid "Forces encryption when connecting to the server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:3
-#, fuzzy
 msgid "Specifies an alternate username"
-msgstr "http-Benutzername angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:4
 msgid "Specifies an alternate printer or class name"
@@ -66737,27 +61820,24 @@ msgid "Apply command to all printers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:7
-#, fuzzy
 msgid "Sets a job option"
-msgstr "Konfigurationsoption festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:8
 msgid "Send an email on job completion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:9
-#, fuzzy
 msgid "Landscape mode"
-msgstr "Unsicherer Modus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:10
 msgid "Media size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:11
-#, fuzzy
 msgid "Page ranges"
-msgstr "Anzeigeprogramm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:12
 msgid "Choose orientation (4-landscape)"
@@ -66780,33 +61860,28 @@ msgid "Scale image files to use up to number percent of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:17
-#, fuzzy
 msgid "Set the number of characters per inch to use"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:18
-#, fuzzy
 msgid "Set the number of lines per inch to use"
-msgstr "Anzahl der Versuche auf Anzahl festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:19
 msgid "Set the page margins when printing text files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr_option.fish:1
-#, fuzzy
 msgid "Complete lpr option"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_path.fish:1
-#, fuzzy
 msgid "Complete using path"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:1
-#, fuzzy
 msgid "Complete pgrep/pkill"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:2
 msgid "Match pattern against full command line"
@@ -66823,14 +61898,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:5
-#, fuzzy
 msgid "Select only the newest process"
-msgstr "Benutzerschnittstelle auswählen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:6
-#, fuzzy
 msgid "Select only the oldest process"
-msgstr "Lesen nach NUM Treffern beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:7
 msgid "Only match processes whose parent process ID is listed"
@@ -66857,9 +61930,8 @@ msgid "Only match processes whose real user ID is listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:12
-#, fuzzy
 msgid "Negates the matching"
-msgstr "Bedeutung der Treffer umkehren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:13
 msgid ""
@@ -66872,29 +61944,24 @@ msgid "Print a list of process identifiers along with brief descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ppp_peer.fish:1
-#, fuzzy
 msgid "Complete isp name for pon/poff"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_proc.fish:1
-#, fuzzy
 msgid "Complete by list of running processes"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
-#, fuzzy
 msgid "common completions for ssh commands"
-msgstr "Funktionstasten für Befehle nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:2
-#, fuzzy
 msgid "Protocol version 1 only"
-msgstr "Nur Protokoll-Version 1"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:3
-#, fuzzy
 msgid "Protocol version 2 only"
-msgstr "Nur Protokoll-Version 2"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:4
 msgid "IPv4 addresses only"
@@ -66921,38 +61988,32 @@ msgid "Options"
 msgstr "Optionen"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_subcommand.fish:1
-#, fuzzy
 msgid "Complete subcommand"
-msgstr "Vergleiche FILE1 mit allen Operanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
-#, fuzzy
 msgid "Complete using files"
-msgstr "Saloppe Einhäng-Optionen tolerieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
-#, fuzzy
 msgid "Print list host-names with user@"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_users.fish:1
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
-#, fuzzy
 msgid "Completes with ZFS mountpoint properties"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_pools.fish:1
-#, fuzzy
 msgid "Completes with available ZFS pools"
-msgstr "Vergleiche FILE1 mit allen Operanden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_ro_properties.fish:1
-#, fuzzy
 msgid "Completes with ZFS read-only properties"
-msgstr "Verzeichnis-Präfix festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_rw_properties.fish:1
 msgid "Completes with ZFS read-write properties"
@@ -66989,9 +62050,8 @@ msgid "Stop service"
 msgstr "Dienst anhalten"
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:6
-#, fuzzy
 msgid "Print service status"
-msgstr "Dienststatus ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:7
 msgid "Stop and then start service"
@@ -67010,14 +62070,12 @@ msgid "Repaint screen when window changes size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_contains_opt.fish:1
-#, fuzzy
 msgid "Checks if a specific option has been given in the current commandline"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#, fuzzy
 msgid "Obtain a list of installed packages"
-msgstr "Ein installiertes Paket neu erstellen und installieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_cursor_1337.fish:1
 msgid "Set cursor using OSC command 1337"
@@ -67032,29 +62090,21 @@ msgid "Set cursor (xterm)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_key_bindings.fish:1
-#, fuzzy
 msgid "Default (Emacs-like) key bindings for fish"
-msgstr "Datei mit Tastaturbindungen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_mode_prompt.fish:1
-#, fuzzy
 msgid "Display the default mode for the prompt"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_describe_command.fish:1
-#, fuzzy
 msgid "Command used to find descriptions for commands"
-msgstr "Funktionstasten für Befehle nutzen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
 msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
-#, fuzzy
-msgid "Prompt function for Git"
-msgstr "Aktuelle Funktionen sind: "
-
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
@@ -67098,9 +62148,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_hg_prompt.fish:1
-#, fuzzy
 msgid "Write out the hg prompt"
-msgstr "Prompt ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_hybrid_key_bindings.fish:1
 msgid "Vi-style bindings that inherit emacs-style bindings in all modes"
@@ -67111,9 +62160,8 @@ msgid "Test if no non-switch argument has been specified yet"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_git_repository.fish:1
-#, fuzzy
 msgid "Check if the current directory is a git repository"
-msgstr "Das ganze Paketdepot prüfen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_token_n.fish:1
 msgid "Test if current token is on Nth place"
@@ -67136,27 +62184,24 @@ msgid "Make list of kill signals for completion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:2
-#, fuzzy
 msgid "List names of available signals"
-msgstr "Namen der verfügbaren Signale auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:3
 msgid "List codes and names of available signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_mode_prompt.fish:1
-#, fuzzy
 msgid "Displays the current mode"
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_move_last.fish:1
 msgid "Move the last element of a directory history from src to dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_no_arguments.fish:1
-#, fuzzy
 msgid "Internal fish function"
-msgstr "Funktion löschen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_not_contain_opt.fish:1
 msgid "Checks that a specific option is not in the current command line"
@@ -67167,96 +62212,80 @@ msgid "Paginate the current command using the users default pager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
-#, fuzzy
 msgid "Print a list of known network addresses"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
-#, fuzzy
 msgid "Print a list of documented fish commands"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_filesystems.fish:1
-#, fuzzy
 msgid "Print a list of all known filesystem types"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
-#, fuzzy
 msgid "Print a list of local groups"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
 msgid "Print help message for the specified fish function or builtin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_hostnames.fish:1
-#, fuzzy
 msgid "Print a list of known hostnames"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_interfaces.fish:1
-#, fuzzy
 msgid "Print a list of known network interfaces"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_options.fish:1
-#, fuzzy
 msgid "Print lpr options"
-msgstr "Alle Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
-#, fuzzy
 msgid "Print lpr printers"
-msgstr "Vollständige Datensätze ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
-#, fuzzy
 msgid "Print mounted devices"
-msgstr "Wichtige Abhängigkeiten ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_pacman_repos.fish:1
 msgid "Print the repositories configured for arch's pacman package manager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_service_names.fish:1
-#, fuzzy
 msgid "All services known to the system"
-msgstr "Nach anderem System suchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_svn_rev.fish:1
-#, fuzzy
 msgid "Print svn revisions"
-msgstr "PKG-Versionen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_users.fish:1
-#, fuzzy
 msgid "Print a list of local users"
-msgstr "Liste laufender screen-Sitzungen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_applications_directories.fish:1
-#, fuzzy
 msgid "Print directories where desktop files are stored"
-msgstr "Verzeichnisse, aber nicht deren Inhalt auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
-#, fuzzy
 msgid "Print XDG mime types"
-msgstr "Befehlstyp ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
-#, fuzzy
 msgid "Print X windows"
-msgstr "APM-Informationen ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
-#, fuzzy
 msgid "Lists ZFS snapshots"
-msgstr "Vertraute Schlüssel auflisten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
 msgid "Write out the prompt"
@@ -67264,9 +62293,8 @@ msgstr "Prompt ausgeben"
 
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
-#, fuzzy
 msgid "Show current path"
-msgstr "Quellpaket anzeigen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
@@ -67281,28 +62309,24 @@ msgid "helper function that does pretty formatting on svn status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_svn_prompt.fish:2
-#, fuzzy
 msgid "Prompt function for svn"
-msgstr "Aktuelle Funktionen sind: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_fish_systemctl.fish:1
-#, fuzzy
 msgid "Call systemctl with some options from the current commandline"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "Update man-page based completions"
-msgstr "Befehlsspezifische Erweiterungen bearbeiten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
-#, fuzzy
 msgid "Test if a non-switch argument has been given in the current commandline"
-msgstr "Test, ob an apt noch ein Unterbefehl gegeben werden muss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_vcs_prompt.fish:1
 msgid "Print the prompts for all available vcsen"
@@ -67313,14 +62337,12 @@ msgid "Set cursor shape for different vi modes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_vi_key_bindings.fish:1
-#, fuzzy
 msgid "vi-like key bindings for fish"
-msgstr "Datei mit Tastaturbindungen angeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/funced.fish:1
-#, fuzzy
 msgid "Edit function definition"
-msgstr "Funktionsdefinitonsblock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/funcsave.fish:1
 msgid "Save the current definition of all specified functions to file"
@@ -67339,9 +62361,8 @@ msgid "Show or set the system's host name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "Tests if a file descriptor is a tty"
-msgstr "Datei-Deskriptoren beobachten"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/la.fish:1
 msgid ""
@@ -67350,26 +62371,22 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/ll.fish:1
-#, fuzzy
 msgid "List contents of directory using long format"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/ls.fish:1
 #: /tmp/fish/implicit/share/functions/ls.fish:2
 #: /tmp/fish/implicit/share/functions/ls.fish:3
-#, fuzzy
 msgid "List contents of directory"
-msgstr "Startverzeichnis festlegen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/man.fish:1
-#, fuzzy
 msgid "Format and display the on-line manual pages"
-msgstr "Zeigt Änderungsinformationen zu dem Paket an"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/nextd.fish:1
-#, fuzzy
 msgid "Move forward in the directory history"
-msgstr "Auch Verzeichnisverlauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/N_.fish:1
 msgid "No-op"
@@ -67384,9 +62401,8 @@ msgid "Pop directory from the stack and cd to it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/prevd.fish:1
-#, fuzzy
 msgid "Move back in the directory history"
-msgstr "Auch Verzeichnisverlauf ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/prompt_pwd.fish:1
 msgid "Print the current working directory, shortened to fit the prompt"
@@ -67399,29 +62415,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/pushd.fish:1
-#, fuzzy
 msgid "Push directory to stack"
-msgstr "Verzeichnis nach makefile durchsuchen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:1
-#, fuzzy
 msgid "print the resolved path [command realpath]"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:2
-#, fuzzy
 msgid "print the resolved path [command grealpath]"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:3
-#, fuzzy
 msgid "return an absolute path without symlinks"
-msgstr "Pfad zu absolutem Pfad ohne Symlinks konvertieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "Print sequences of numbers"
-msgstr "Name statt Nummer ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:2
 msgid "Fallback implementation of the seq command"
@@ -67432,28 +62443,24 @@ msgid "Set an env var for csh compatibility."
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/suspend.fish:1
-#, fuzzy
 msgid "Suspend the current shell."
-msgstr "Version anzeigen und beenden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__terlar_git_prompt.fish:1
-#, fuzzy
 msgid "Write out the git prompt"
-msgstr "Prompt ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/trap.fish:1
 msgid "Perform an action when the shell receives a signal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/type.fish:1
-#, fuzzy
 msgid "Print the type of a command"
-msgstr "Pfad zu Befehl ausgeben"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/umask.fish:1
-#, fuzzy
 msgid "Set default file permission mask"
-msgstr "Alle Rechte extrahieren"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/up-or-search.fish:1
 msgid ""
@@ -67462,18 +62469,15 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/vared.fish:1
-#, fuzzy
 msgid "Edit variable value"
-msgstr "Verfügbare Liste ausgeben"
+msgstr ""
 
-#, fuzzy
 #~ msgid "%ls: --array option requires a single variable name.\n"
 #~ msgstr "%ls: --array option benötigt einen Variablennamen.\n"
 
 #~ msgid "Try out the new parser"
 #~ msgstr "Zum Testen des neuen Parsers"
 
-#, fuzzy
 #~ msgid "printf: not enough arguments"
 #~ msgstr "printf: Nicht genug Argumente"
 
@@ -67482,7 +62486,6 @@ msgstr "Verfügbare Liste ausgeben"
 #~ msgstr ""
 #~ "%ls: Mehrere Variablennamen in einem Aufruf angegeben (%ls und %.*ls)\n"
 
-#, fuzzy
 #~ msgid "%ls: Values cannot be specfied with erase\n"
 #~ msgstr "%ls: Bei erase können keine Werte angegeben werden\n"
 
@@ -67493,18 +62496,15 @@ msgstr "Verfügbare Liste ausgeben"
 #~ "%ls: Warnung: Universelle Gültigkeit gewählt, aber eine globale Variable "
 #~ "'%ls' existiert.\n"
 
-#, fuzzy
 #~ msgid "string: Expected subcommand\n"
 #~ msgstr "string: Erwartete Unterbefehl\n"
 
-#, fuzzy
 #~ msgid "string: Unknown subcommand '%ls'\n"
 #~ msgstr "Unbekannter Befehl '%ls'\n"
 
 #~ msgid "getopt_long() unexpectedly returned zero\n"
 #~ msgstr "getopt_long() gab unerwartet null zurück\n"
 
-#, fuzzy
 #~ msgid "terminal_give_to_job(): Could not send job %d ('%ls') to foreground"
 #~ msgstr "Konnte Job %d ('%ls') nicht in den Vordergrund schicken"
 
@@ -67519,15 +62519,12 @@ msgstr "Verfügbare Liste ausgeben"
 #~ "Es gibt noch aktive jobs (benutzen sie den 'jobs' Befehl um sie zu "
 #~ "sehen.\n"
 
-#, fuzzy
 #~ msgid "funced: You must specify one function name"
 #~ msgstr "funced: Erwartete genau einen Funktionsnamen"
 
-#, fuzzy
 #~ msgid "%s: Expected function name\\n"
 #~ msgstr "%s: Erwartete genau einen Funktionsnamen\\n"
 
-#, fuzzy
 #~ msgid "%ls: Invalid combination of options,\\n%ls\\n"
 #~ msgstr "%ls: Ungültige Kombination von Optionen,\\n%ls\\n"
 
@@ -67535,11 +62532,9 @@ msgstr "Verfügbare Liste ausgeben"
 #~ msgstr ""
 #~ "Anzahl zu überspringender Positionen muss eine positive Ganzzahl sein\\n"
 
-#, fuzzy
 #~ msgid "Evaluate contents of file (deprecated, see \"source\")"
 #~ msgstr "Inhalt einer Datei auswerten"
 
-#, fuzzy
 #~ msgid "Incomplete aspects of fish"
 #~ msgstr "Saloppe Einhäng-Optionen tolerieren"
 
@@ -67561,30 +62556,23 @@ msgstr "Verfügbare Liste ausgeben"
 #~ msgid "Help on editor shortcuts"
 #~ msgstr "Hilfe zu Editor-Tastenkürzeln"
 
-#, fuzzy
 #~ msgid "ignore chnages in the amount of white space"
 #~ msgstr "Änderung in der Anzahl von Worttrennern ignorieren"
 
-#, fuzzy
 #~ msgid "Change to DIR"
 #~ msgstr "Wechsel zu Benutzer"
 
-#, fuzzy
 #~ msgid "Show a unit"
 #~ msgstr "Arp-Einträge anzeigen"
 
-#, fuzzy
 #~ msgid "Edit a unit"
 #~ msgstr "Ein Ereignis auslösen"
 
-#, fuzzy
 #~ msgid "Manage abbreviations"
 #~ msgstr "Handbuch-Sektionen"
 
-#, fuzzy
 #~ msgid "Print xdg mime applications"
 #~ msgstr "Alle Informationen ausgeben"
 
-#, fuzzy
 #~ msgid "Perform math calculations in bc"
 #~ msgstr "Simulation durchführen"
diff --git a/po/en.po b/po/en.po
index 0034da879..ba67ee0a9 100644
--- a/po/en.po
+++ b/po/en.po
@@ -19,16 +19,16 @@ msgstr ""
 "X-Generator: Poedit 1.8.11\n"
 
 #: src/autoload.cpp:96
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not autoload item '%ls', it is already being autoloaded. This is a "
 "circular dependency in the autoloading scripts, please remove it."
-msgstr "Could not autoload item “%ls”, it is already being autoloaded. "
+msgstr ""
 
 #: src/builtin_argparse.cpp:36
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid option spec '%ls' at char '%lc'\n"
-msgstr "%ls: Invalid option spec '%ls' at char '%lc'\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:129
 #, c-format
@@ -36,14 +36,14 @@ msgid "%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag string '%ls' is not valid\n"
-msgstr "%ls: Seed value “%ls” is not a valid number\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag '%ls' is not valid\n"
-msgstr "%ls: Seed value “%ls” is not a valid number\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:196
 #, c-format
@@ -82,14 +82,14 @@ msgid "%ls: No option specs were provided\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --min-args value '%ls'\n"
-msgstr "%ls: Invalid index starting at “%ls”\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:401
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --max-args value '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:23
 #, c-format
@@ -111,14 +111,14 @@ msgid "%ls: There are no suitable jobs\n"
 msgstr "%ls: There are no suitable jobs\n"
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid job specifier\n"
-msgstr "%ls: '%ls' is not a valid variable name\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:95 src/builtin_disown.cpp:89 src/builtin_wait.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Could not find job '%d'\n"
-msgstr "%s: Could not find “%d”\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:141
 #, c-format
@@ -196,29 +196,29 @@ msgid "%ls: Could not set PWD variable\n"
 msgstr "%ls: Could not set PWD variable\n"
 
 #: src/builtin_commandline.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown input function '%ls'"
-msgstr "%ls: Unknown input function “%ls”"
+msgstr ""
 
 #: src/builtin_complete.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid token '%ls'\n"
-msgstr "%ls: Invalid option -- %lc\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:203
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -s requires a non-empty string\n"
-msgstr "%ls: Variable name can not be the empty string\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:211
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -l requires a non-empty string\n"
-msgstr "%ls: Variable name can not be the empty string\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -o requires a non-empty string\n"
-msgstr "%ls: Variable name can not be the empty string\n"
+msgstr ""
 
 #: src/builtin_contains.cpp:75
 #, c-format
@@ -240,9 +240,9 @@ msgid "%ls: Not inside of loop\n"
 msgstr "%ls: Not inside of loop\n"
 
 #: src/builtin.cpp:372
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Command not valid at an interactive prompt\n"
-msgstr "%ls: Command only available in interactive sessions\n"
+msgstr ""
 
 #: src/builtin.cpp:410 src/builtin.cpp:460
 msgid "Test a condition"
@@ -319,9 +319,8 @@ msgid "Count the number of arguments"
 msgstr "Count the number of arguments"
 
 #: src/builtin.cpp:430
-#, fuzzy
 msgid "Remove job from job list"
-msgstr "Read job from file"
+msgstr ""
 
 #: src/builtin.cpp:431
 msgid "Print arguments"
@@ -380,9 +379,8 @@ msgid "Print currently running jobs"
 msgstr "Print currently running jobs"
 
 #: src/builtin.cpp:445
-#, fuzzy
 msgid "Evaluate math expressions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: src/builtin.cpp:446
 msgid "Negate exit status of job"
@@ -492,43 +490,41 @@ msgstr ""
 "control\n"
 
 #: src/builtin_function.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown signal '%ls'"
-msgstr "%ls: Unknown signal “%ls”"
+msgstr ""
 
 #: src/builtin_function.cpp:113
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Cannot find calling job for event handler"
-msgstr "%ls: Cannot find calling job for event handler"
+msgstr ""
 
 #: src/builtin_function.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid process id '%ls'"
-msgstr "%ls: Invalid process id %ls"
+msgstr ""
 
 #: src/builtin_function.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected function name"
-msgstr "%ls: Expected function name"
+msgstr ""
 
 #: src/builtin_function.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Illegal function name '%ls'"
-msgstr "%ls: Illegal function name “%ls”"
+msgstr ""
 
 #: src/builtin_function.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: The name '%ls' is reserved,\n"
 "and can not be used as a function name"
 msgstr ""
-"%ls: The name “%ls” is reserved,\n"
-"and can not be used as a function name"
 
 #: src/builtin_function.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unexpected positional argument '%ls'"
-msgstr "%s: Unexpected argument -- %s\\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:275 src/builtin.h:38
 #, c-format
@@ -546,9 +542,9 @@ msgid "%ls: Function '%ls' does not exist\n"
 msgstr "%ls: Function “%ls” does not exist\n"
 
 #: src/builtin_functions.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
-msgstr "%ls: Expected exactly one function name\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:342
 #, c-format
@@ -580,9 +576,9 @@ msgid "%ls: you cannot use any options with the %ls command\n"
 msgstr ""
 
 #: src/builtin_history.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: max value '%ls' is not a valid number\n"
-msgstr "%ls: Seed value “%ls” is not a valid number\n"
+msgstr ""
 
 #: src/builtin_history.cpp:261
 msgid "builtin history delete only supports --exact\n"
@@ -630,9 +626,9 @@ msgid "%ls: There are no jobs\n"
 msgstr "%ls: There are no jobs\n"
 
 #: src/builtin_math.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid scale value\n"
-msgstr "%ls: '%ls' is not a valid variable name\n"
+msgstr ""
 
 #: src/builtin_math.cpp:148
 #, c-format
@@ -645,14 +641,13 @@ msgid "More than %d var names in math expression."
 msgstr ""
 
 #: src/builtin_math.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid expression: %ls\n"
-msgstr "%ls: Invalid process id %ls\n"
+msgstr ""
 
 #: src/builtin_printf.cpp:243
-#, fuzzy
 msgid "Number out of range"
-msgstr "Number of top servers"
+msgstr ""
 
 #: src/builtin_printf.cpp:249
 #, c-format
@@ -709,9 +704,9 @@ msgid "%ls: You can't specify both -p and -P\n"
 msgstr ""
 
 #: src/builtin_realpath.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid path: %ls\n"
-msgstr "%ls: Invalid path: %ls\n"
+msgstr ""
 
 #: src/builtin_return.cpp:100
 #, c-format
@@ -749,9 +744,9 @@ msgid "%ls: Erase needs a variable name\n"
 msgstr "%ls: Erase needs a variable name\n"
 
 #: src/builtin_set.cpp:67
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Array index out of bounds\n"
-msgstr "%ls: Array index out of bounds\n"
+msgstr ""
 
 #: src/builtin_set.cpp:69
 #, c-format
@@ -781,9 +776,9 @@ msgid "%ls: Invalid index starting at '%ls'\n"
 msgstr "%ls: Invalid index starting at “%ls”\n"
 
 #: src/builtin_set.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: not set in %ls scope\n"
-msgstr "$%ls: not set in %ls scope\n"
+msgstr ""
 
 #: src/builtin_set.cpp:542
 msgid "exported"
@@ -804,9 +799,9 @@ msgid "$%ls[%d]: length=%d value=|%ls|\n"
 msgstr ""
 
 #: src/builtin_set.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: invalid var name\n"
-msgstr "$%ls: invalid var name\n"
+msgstr ""
 
 #: src/builtin_set.cpp:584
 #, c-format
@@ -829,9 +824,9 @@ msgid "%ls: Error while reading file '%ls'\n"
 msgstr "%ls: Error while reading file “%ls”\n"
 
 #: src/builtin_status.cpp:155
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid level value '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_status.cpp:276
 msgid "This is a login shell\n"
@@ -863,9 +858,8 @@ msgid "Standard input"
 msgstr "Standard input"
 
 #: src/builtin_status.cpp:320
-#, fuzzy
 msgid "Not a function"
-msgstr "function"
+msgstr ""
 
 #: src/builtin_string.cpp:39
 #, c-format
@@ -873,68 +867,68 @@ msgid "%ls: Expected argument\n"
 msgstr "%ls: Expected argument\n"
 
 #: src/builtin_string.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid escape style '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:238
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid length value '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid max value '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:275
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid count value '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:321
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid start value '%ls'\n"
-msgstr "%ls: Invalid index starting at “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:743
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression compile error: %ls\n"
-msgstr "%ls: Regular expression compile error: %ls\n"
+msgstr ""
 
 #: src/builtin_string.cpp:782
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression match error: %ls\n"
-msgstr "%ls: Regular expression match error: %ls\n"
+msgstr ""
 
 #: src/builtin_string.cpp:787
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression internal error\n"
-msgstr "%ls: Regular expression internal error\n"
+msgstr ""
 
 #: src/builtin_string.cpp:903
 msgid "--entire and --index are mutually exclusive"
 msgstr ""
 
 #: src/builtin_string.cpp:1055
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression substitute error: %ls\n"
-msgstr "%ls: Regular expression substitute error: %ls\n"
+msgstr ""
 
 #: src/builtin_test.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer '%ls'"
-msgstr "invalid precision: %ls"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: New limit cannot be an empty string\n"
-msgstr "%ls: Variable name can not be the empty string\n"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid limit '%ls'\n"
-msgstr "%ls: Invalid variable name “%ls”\n"
+msgstr ""
 
 #: src/common.cpp:1551
 msgid "Current terminal parameters have rows and/or columns set to zero."
@@ -958,9 +952,9 @@ msgid "This is a bug. Break on bugreport to debug."
 msgstr "This is a bug. Break on bugreport to debug."
 
 #: src/common.cpp:1782
-#, fuzzy, c-format
+#, c-format
 msgid "If you can reproduce it, please send a bug report to %s."
-msgstr "If this error can be reproduced, please send a bug report to %s."
+msgstr ""
 
 #: src/common.cpp:1792
 msgid "empty"
@@ -991,30 +985,26 @@ msgid "Could not set up terminal using the fallback terminal type '%s'."
 msgstr ""
 
 #: src/env.cpp:574
-#, fuzzy
 msgid "Could not set up terminal."
-msgstr "Could not set up terminal"
+msgstr ""
 
 #: src/env.cpp:576
-#, fuzzy
 msgid "TERM environment variable not set."
-msgstr "Handle environment variables"
+msgstr ""
 
 #: src/env.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "TERM environment variable set to '%ls'."
-msgstr "TERM environment variable set to '%ls'."
+msgstr ""
 
 #: src/env.cpp:579
-#, fuzzy
 msgid "Check that this terminal type is supported on this system."
-msgstr "Check that this terminal type is supported on this system."
+msgstr ""
 
 #: src/env.cpp:673
-#, fuzzy
 msgid ""
 "Could not determine current working directory. Is your locale set correctly?"
-msgstr "Print the current working directory, shortened to fit the prompt"
+msgstr ""
 
 #: src/env_universal_common.cpp:461
 #, c-format
@@ -1178,9 +1168,9 @@ msgid "Too much data emitted by command substitution so it was discarded\n"
 msgstr ""
 
 #: src/fish.cpp:275 src/fish_indent.cpp:419
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-level flag"
-msgstr "Invalid value “%s” for debug level switch"
+msgstr ""
 
 #: src/fish.cpp:302
 #, c-format
@@ -1188,9 +1178,9 @@ msgid "%s, version %s\n"
 msgstr "%s, version %s\n"
 
 #: src/fish.cpp:316 src/fish_indent.cpp:434
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag"
-msgstr "Invalid value “%s” for debug level switch"
+msgstr ""
 
 #: src/fish.cpp:366
 msgid "Can not use the no-execute mode when running an interactive session"
@@ -1229,14 +1219,14 @@ msgid "signal #%d (%ls) received\n"
 msgstr ""
 
 #: src/fish_key_reader.cpp:313
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-level flag\n"
-msgstr "Invalid value “%s” for debug level switch\n"
+msgstr ""
 
 #: src/fish_key_reader.cpp:327
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag\n"
-msgstr "Invalid value “%s” for debug level switch\n"
+msgstr ""
 
 #: src/history.cpp:146
 #, c-format
@@ -1244,10 +1234,10 @@ msgid "Locking the history file took too long (%.3f seconds)."
 msgstr ""
 
 #: src/history.cpp:1850
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "History session ID '%ls' is not a valid variable name. Falling back to `%ls`."
-msgstr "%ls: '%ls' is not a valid variable name"
+msgstr ""
 
 #: src/io.cpp:57
 #, c-format
@@ -1566,25 +1556,18 @@ msgid "Pop null reader block"
 msgstr "Pop null reader block"
 
 #: src/reader.cpp:2160
-#, fuzzy
 msgid "There are still jobs active:\n"
-msgstr "There are stopped jobs\n"
+msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   Command\n"
 
 #: src/reader.cpp:2170
-#, fuzzy
 msgid "A second attempt to exit will terminate them.\n"
 msgstr ""
-"There are stopped jobs. A second attempt to exit will enforce their "
-"termination.\n"
 
 #: src/reader.cpp:2171
 msgid ""
@@ -1783,9 +1766,8 @@ msgid "Unexpected end of string, square brackets do not match"
 msgstr "Unexpected end of string, square brackets do not match"
 
 #: src/tokenizer.cpp:35
-#, fuzzy
 msgid "Unexpected end of string, incomplete escape sequence"
-msgstr "Unexpected end of string, quotes are not balanced"
+msgstr ""
 
 #: src/tokenizer.cpp:38
 msgid "Invalid input/output redirection"
@@ -1972,9 +1954,9 @@ msgid "%ls: Expected a subcommand to follow the command\n"
 msgstr ""
 
 #: src/builtin.h:73
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Subcommand '%ls' is not valid\n"
-msgstr "%ls: “%ls” is not a file\n"
+msgstr ""
 
 #: src/builtin.h:76
 #, c-format
@@ -2033,19 +2015,16 @@ msgid "No matches for wildcard '%ls'. See `help expand`."
 msgstr "No matches for wildcard “%ls”. See `help expand`."
 
 #: src/parse_constants.h:251
-#, fuzzy
 msgid "'break' while not inside of loop"
-msgstr "break command while not inside of loop"
+msgstr ""
 
 #: src/parse_constants.h:254
-#, fuzzy
 msgid "'continue' while not inside of loop"
-msgstr "continue command while not inside of loop"
+msgstr ""
 
 #: src/parse_constants.h:257
-#, fuzzy
 msgid "'return' outside of function definition"
-msgstr "“return” builtin command outside of function definition"
+msgstr ""
 
 #: src/parse_constants.h:262
 #, c-format
@@ -2308,14 +2287,12 @@ msgid "Enables an existing service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:4
-#, fuzzy
 msgid "Disables an existing service"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:5
-#, fuzzy
 msgid "Removes the specified service name from the service cache"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:6
 msgid "Forces an existing service to start"
@@ -2342,14 +2319,12 @@ msgid "Prints a description of a domain or service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:12
-#, fuzzy
 msgid "Prints information about the service cache"
-msgstr "Print information about the environment Bundler is running under"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:13
-#, fuzzy
 msgid "Prints which services are disabled"
-msgstr "Prints services installed"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:14
 msgid ""
@@ -2358,14 +2333,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:15
-#, fuzzy
 msgid "Prints port information about a process"
-msgstr "Give more information during processing"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:16
-#, fuzzy
 msgid "Prints port information about the host"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:17
 msgid "Resolves a port name from a process to an endpoint in launchd"
@@ -2376,9 +2349,8 @@ msgid "Reads or modifies launchd's resource limits"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:19
-#, fuzzy
 msgid "Prints performance statistics for a service"
-msgstr "Write package statistics to a file"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:20
 msgid ""
@@ -2390,18 +2362,16 @@ msgid "Modifies persistent configuration parameters for launchd domains"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:22
-#, fuzzy
 msgid "Dumps launchd state to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:23
 msgid "Dumps the jetsam properties category for all services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:24
-#, fuzzy
 msgid "Initiates a system reboot of the specified type"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:25
 msgid "Brings the system up from single-user mode with a console shell"
@@ -2416,24 +2386,20 @@ msgid "Unloads a service or directory of services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:28
-#, fuzzy
 msgid "Unloads the specified service name"
-msgstr "Remove specified service"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:29
-#, fuzzy
 msgid "Lists information about services"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:30
-#, fuzzy
 msgid "Starts the specified service"
-msgstr "Remove specified service"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:31
-#, fuzzy
 msgid "Stops the specified service if it is running"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:32
 msgid ""
@@ -2454,14 +2420,12 @@ msgid "Execute a program in another process' bootstrap context"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:36
-#, fuzzy
 msgid "Execute a program in the bootstrap context of a given user"
-msgstr "Execute a script in the context of the current bundle"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:37
-#, fuzzy
 msgid "Submit a basic job from the command line"
-msgstr "Set or get the commandline"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:38
 msgid "Prints the PID of the launchd controlling the session"
@@ -2472,28 +2436,24 @@ msgid "Prints the UID of the current launchd session"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:40
-#, fuzzy
 msgid "Prints the name of the current launchd session"
-msgstr "Execute a script in the context of the current bundle"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:41
-#, fuzzy
 msgid "Prints a description of an error"
-msgstr "Print a list of local users"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:42
 msgid "Prints the launchd variant"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:43
-#, fuzzy
 msgid "Prints the launchd version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:44
-#, fuzzy
 msgid "Prints the usage for a given subcommand"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:1
 #: /tmp/fish/explicit/share/completions/mdadm.fish:2
@@ -3319,14 +3279,12 @@ msgid "All properties"
 msgstr "All properties"
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:1
-#, fuzzy
 msgid "%s: Could not figure out what to do!\\n"
-msgstr "%s: Could not create configuration directory\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:2
-#, fuzzy
 msgid "%s %s: Requires at least two arguments\\n"
-msgstr "%ls: Expected at least two arguments, got %d\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:3
 #: /tmp/fish/explicit/share/functions/abbr.fish:5
@@ -3403,9 +3361,8 @@ msgid "Ignoring the output of your editor since its exit status was non-zero"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/edit_command_buffer.fish:4
-#, fuzzy
 msgid "or the file was empty"
-msgstr "Treat absent files as empty"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
 msgid "Achieved compression ratio"
@@ -3570,9 +3527,8 @@ msgid "Package"
 msgstr "Package"
 
 #: /tmp/fish/explicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "python executable not found"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:2
 msgid "Editing failed or was cancelled"
@@ -3628,18 +3584,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:5
-#, fuzzy
 msgid "Command history cleared!"
-msgstr "Command to run"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:6
 msgid "You did not say 'yes' so I will not clear your command history\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "%s: Too many arguments"
-msgstr "%s: Too many arguments"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/nextd.fish:1
 #: /tmp/fish/explicit/share/functions/prevd.fish:1
@@ -3651,9 +3605,8 @@ msgid "No open utility found. Try installing \"xdg-open\" or \"xdg-utils\"."
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/popd.fish:1
-#, fuzzy
 msgid "%s: Directory stack is empty…\\n"
-msgstr "%s: Directory stack is empty...\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/psub.fish:1
 msgid "%s: Not inside of command substitution"
@@ -3759,9 +3712,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/a2enconf.fish:1
 #: /tmp/fish/implicit/share/completions/a2enmod.fish:1
 #: /tmp/fish/implicit/share/completions/a2ensite.fish:1
-#, fuzzy
 msgid "Don't show informative messages"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/a2disconf.fish:2
 #: /tmp/fish/implicit/share/completions/a2dismod.fish:2
@@ -3770,24 +3722,20 @@ msgid "Purge all traces of module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:1
-#, fuzzy
 msgid "Add abbreviation"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:2
-#, fuzzy
 msgid "Erase abbreviation"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:3
-#, fuzzy
 msgid "Print all abbreviations"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:4
-#, fuzzy
 msgid "Print all abbreviation names"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:5
 #: /tmp/fish/implicit/share/completions/help.fish:11
@@ -3798,24 +3746,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:1
 #: /tmp/fish/implicit/share/completions/grub-install.fish:32
-#, fuzzy
 msgid "Show usage"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:2
-#, fuzzy
 msgid "Use an alternative configuration file"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:3
-#, fuzzy
 msgid "Use an alternative addressbook file"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:4
-#, fuzzy
 msgid "Make a query for mutt"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:5
 msgid "Read email message from stdin and add the sender"
@@ -3830,42 +3774,35 @@ msgid "Convert address book files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:8
-#, fuzzy
 msgid "Input file format"
-msgstr "Extra full format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:9
-#, fuzzy
 msgid "Output file format"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:10
-#, fuzzy
 msgid "Input file (default: stdin)"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:11
-#, fuzzy
 msgid "Output file (default: stdout)"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:12
-#, fuzzy
 msgid "Print available formats"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acat.fish:1
 #: /tmp/fish/implicit/share/completions/als.fish:1
 #: /tmp/fish/implicit/share/completions/aunpack.fish:1
-#, fuzzy
 msgid "Archive content"
-msgstr "List archive contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/accept.fish:1
 #: /tmp/fish/implicit/share/completions/cupsaccept.fish:1
-#, fuzzy
 msgid "Accept reason"
-msgstr "Accept protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:1
 #: /tmp/fish/implicit/share/completions/grep.fish:23
@@ -3874,93 +3811,76 @@ msgid "Ignore case"
 msgstr "Ignore case"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:2
-#, fuzzy
 msgid "Ignore case when pattern contains no uppercase"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:3
-#, fuzzy
 msgid "Don't ignore case"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:4
-#, fuzzy
 msgid "Invert match"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:5
-#, fuzzy
 msgid "Match only whole words"
-msgstr "Only whole matching words"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:6
-#, fuzzy
 msgid "Quote all metacharacters"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:7
-#, fuzzy
 msgid "Only print line(s) NUM of each file"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:8
-#, fuzzy
 msgid "Only print filenames containing matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:9
-#, fuzzy
 msgid "Only print filenames with no matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:10
 msgid "Output the evaluation of Perl expression for each line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:11
-#, fuzzy
 msgid "Output the part of line matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:12
-#, fuzzy
 msgid "Print all lines"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:13
-#, fuzzy
 msgid "Specify pattern explicitly"
-msgstr "Specify gem trust policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:14
-#, fuzzy
 msgid "Stop searching in each file after NUM matches"
-msgstr "Stop reading after NUM matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:15
-#, fuzzy
 msgid "Stop searching after first match"
-msgstr "Stop reading after NUM matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:16
-#, fuzzy
 msgid "Print the filename for each match"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:17
-#, fuzzy
 msgid "Suppress the prefixing filename on output"
-msgstr "Suppress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:18
-#, fuzzy
 msgid "Show number of lines matching per file"
-msgstr "See who is watching a file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:19
-#, fuzzy
 msgid "Show column number of first match"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:20
 msgid "Don't show column number of first match"
@@ -3986,19 +3906,16 @@ msgid "Print null byte as separator between filenames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:25
-#, fuzzy
 msgid "Suppress error messages about file errors"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:26
-#, fuzzy
 msgid "Pipes all ack output through command"
-msgstr "Pipe output through specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:27
-#, fuzzy
 msgid "Do not send output through a pager"
-msgstr "Pass the output through “pr”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:28
 msgid "Prints a filename heading above file's results"
@@ -4009,9 +3926,8 @@ msgid "Don't print a filename heading above file's results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:30
-#, fuzzy
 msgid "Print a break between results"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:31
 msgid "Don't print a break between results"
@@ -4026,23 +3942,20 @@ msgid "No filename heading and no line breaks between results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:34
-#, fuzzy
 msgid "Highlight the matching text"
-msgstr "Hilight one search target"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:35
 msgid "Don't highlight the matching text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:36
-#, fuzzy
 msgid "Set the color for filenames"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:37
-#, fuzzy
 msgid "Set the color for matches"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:38
 msgid "Set the color for line numbers"
@@ -4053,14 +3966,12 @@ msgid "Flush output immediately"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:40
-#, fuzzy
 msgid "Only print the files selected"
-msgstr "Only print unique lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:41
-#, fuzzy
 msgid "Only select files matching pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:42
 msgid "Sort the found files lexically"
@@ -4071,38 +3982,32 @@ msgid "Show which types each file has"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:44
-#, fuzzy
 msgid "Read the list of files to search from file"
-msgstr "Read the log message from file."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:45
 msgid "Read the list of files to search from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:46
-#, fuzzy
 msgid "Ignore directory"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:47
-#, fuzzy
 msgid "Don't ignore directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:48
-#, fuzzy
 msgid "Add filter for ignoring files"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:49
-#, fuzzy
 msgid "Recurse into subdirectories"
-msgstr "Recurse into subdir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:50
-#, fuzzy
 msgid "No descending into subdirectories"
-msgstr "Add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:51
 #: /tmp/fish/implicit/share/completions/file.fish:7
@@ -4121,84 +4026,70 @@ msgid "Don't follow symlinks"
 msgstr "Don't follow symlinks"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:53
-#, fuzzy
 msgid "Include only recognized files"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:54
-#, fuzzy
 msgid "Include only X files"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:55
 msgid "Replaces definition of type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:56
-#, fuzzy
 msgid "Specify definition of type"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:57
-#, fuzzy
 msgid "Removes all filters associated with type"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:58
-#, fuzzy
 msgid "Ignores environment variables and ackrc files"
-msgstr "Ignore environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:59
-#, fuzzy
 msgid "Specifies location of ackrc file"
-msgstr "Specifiy config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:60
-#, fuzzy
 msgid "Ignore default definitions ack includes"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:61
-#, fuzzy
 msgid "Outputs default ackrc"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:62
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:1
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:2
-#, fuzzy
 msgid "Shows help"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:63
-#, fuzzy
 msgid "Shows all known types"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:64
-#, fuzzy
 msgid "Dump information on which options are loaded"
-msgstr "Show information which is stored by darcs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:65
-#, fuzzy
 msgid "Forces ack to treat input as a pipe"
-msgstr "Expect to receive input from a pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:66
 msgid "Forces ack to treat input as tty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:67
-#, fuzzy
 msgid "Shows man page"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:68
-#, fuzzy
 msgid "Displays version and copyright"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:69
 msgid "Bill the Cat"
@@ -4209,34 +4100,28 @@ msgid "The warning admiral"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:1
-#, fuzzy
 msgid "Show battery information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:2
-#, fuzzy
 msgid "Suppress battery information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:3
-#, fuzzy
 msgid "Show thermal information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:4
-#, fuzzy
 msgid "Suppress thermal information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:5
-#, fuzzy
 msgid "Show ac adapter information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:6
-#, fuzzy
 msgid "Suppress ac-adapter information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:7
 msgid "Show every device, overrides above options"
@@ -4405,9 +4290,8 @@ msgstr "Display help and exit"
 #: /tmp/fish/implicit/share/completions/timeout.fish:5
 #: /tmp/fish/implicit/share/completions/watch.fish:12
 #: /tmp/fish/implicit/share/completions/xgettext.fish:39
-#, fuzzy
 msgid "Output version information and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:1
 msgid "Test if adb has yet to be given the subcommand"
@@ -4434,29 +4318,24 @@ msgid "Communicate with emulator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:7
-#, fuzzy
 msgid "Connect to device"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:8
-#, fuzzy
 msgid "Disconnect from device"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:9
-#, fuzzy
 msgid "List all connected devices"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:10
-#, fuzzy
 msgid "Copy file to device"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:11
-#, fuzzy
 msgid "Copy file from device"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:12
 msgid "Copy host->device only if changed"
@@ -4475,52 +4354,44 @@ msgid "View device log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:16
-#, fuzzy
 msgid "Install package"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:17
-#, fuzzy
 msgid "Uninstall package"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:18
 msgid "List PIDs of processes hosting a JDWP transport"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:19
-#, fuzzy
 msgid "Port forwarding"
-msgstr "Dynamic port forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:20
-#, fuzzy
 msgid "Return bugreport information"
-msgstr "Don't print group information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:21
-#, fuzzy
 msgid "Perform device backup"
-msgstr "Perform delinking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:22
-#, fuzzy
 msgid "Restore device from backup"
-msgstr "Force full backup"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:23
-#, fuzzy
 msgid "Show adb version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:24
 msgid "Show adb help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:25
-#, fuzzy
 msgid "Block until device is online"
-msgstr "Block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:26
 msgid "Ensure that there is a server running"
@@ -4539,24 +4410,20 @@ msgid "Reboots the device, optionally into the bootloader or recovery program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:30
-#, fuzzy
 msgid "Prints state of the device"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:31
-#, fuzzy
 msgid "Prints serial number of the device"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:32
-#, fuzzy
 msgid "Prints device path"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:33
-#, fuzzy
 msgid "Continuously print the device status"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:34
 msgid "Restart the adbd daemon with root permissions"
@@ -4575,9 +4442,8 @@ msgid "Run PPP over USB"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:38
-#, fuzzy
 msgid "Sideloads the given package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:39
 msgid "Kick current connection from host side and make it reconnect."
@@ -4588,18 +4454,16 @@ msgid "Forward-lock the app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:41
-#, fuzzy
 msgid "Reinstall the app keeping its data"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:42
 msgid "Install on SD card instead of internal storage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:43
-#, fuzzy
 msgid "Algorithm name"
-msgstr "MAC algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:44
 msgid "Hex-encoded key"
@@ -4610,23 +4474,20 @@ msgid "Hex-encoded iv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:46
-#, fuzzy
 msgid "Keep the data and cache directories"
-msgstr "Do not create a hierarchy of directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:47
 msgid "Also list device qualifiers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:48
-#, fuzzy
 msgid "Device to disconnect"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:49
-#, fuzzy
 msgid "File to write backup data to"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:50
 msgid "Enable backup of the .apks themselves"
@@ -4654,14 +4515,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:56
-#, fuzzy
 msgid "Back up all installed applications"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:57
-#, fuzzy
 msgid "Include system applications in -all (default)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:58
 msgid "Exclude system applications in -all"
@@ -4672,9 +4531,8 @@ msgid "Package(s) to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "List or remove functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4685,9 +4543,8 @@ msgid "Remove a specific forward socket connection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:63
-#, fuzzy
 msgid "Remove all forward socket connections"
-msgstr "Remotely forwarded ports"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:64
 msgid "Kick current connection from device side and make it reconnect."
@@ -4718,9 +4575,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:5
-#, fuzzy
 msgid "Set the gecos field for the new entry generated"
-msgstr "Set the pre-gap size for the next track"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:6
 msgid ""
@@ -4735,14 +4591,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:8
-#, fuzzy
 msgid "Display brief instructions"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:9
-#, fuzzy
 msgid "Use specified directory as the user's home directory"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:10
 msgid ""
@@ -4757,9 +4611,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:12
-#, fuzzy
 msgid "Do not create the home directory, even if it doesni't exist"
-msgstr "Do not create a hierarchy of directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:13
 msgid "Suppress informational messages, only show warnings and errors"
@@ -4774,9 +4627,8 @@ msgid "Create a system user or group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:16
-#, fuzzy
 msgid "Force the new userid to be the given number"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:17
 msgid ""
@@ -4795,9 +4647,8 @@ msgid "Add new user to extra groups defined in the configuration file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:20
-#, fuzzy
 msgid "Display version and copyright information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:1
 msgid "Save current driver state"
@@ -4816,18 +4667,16 @@ msgid "Try to restore control elements as much as possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:5
-#, fuzzy
 msgid "Ignore missing soundcards"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:6
 msgid "Do not restore mismatching control elements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:7
-#, fuzzy
 msgid "Do not init if restore fails"
-msgstr "Do not print differences for deleted files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:8
 msgid "Initialize all devices to a default state"
@@ -4846,44 +4695,36 @@ msgid "Notify daemon to do an operation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:12
-#, fuzzy
 msgid "Monitor events"
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:13
-#, fuzzy
 msgid "Show available flags and commands"
-msgstr "Print available lsblk columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:14
-#, fuzzy
 msgid "Make output a bit more verbose"
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:15
-#, fuzzy
 msgid "Print alsactl version number"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:16
-#, fuzzy
 msgid "Select the configuration file to use"
-msgstr "Clear list of configuration files to read"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:17
-#, fuzzy
 msgid "Use a lock file"
-msgstr "Use 1B block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:18
-#, fuzzy
 msgid "Do not use a lock file"
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:19
-#, fuzzy
 msgid "Select the state lock file path"
-msgstr "Select a range of patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:20
 msgid "Save restore and init state to this file"
@@ -4894,33 +4735,28 @@ msgid "Remove runstate file at first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:22
-#, fuzzy
 msgid "Set environment variable"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:23
-#, fuzzy
 msgid "The configuration file for init"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:24
 msgid "The store period in seconds for the daemon command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:25
-#, fuzzy
 msgid "The PID file to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:26
-#, fuzzy
 msgid "Run the task in background"
-msgstr "Run job in background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:27
-#, fuzzy
 msgid "Use syslog for messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:28
 msgid "Set the process priority (see 'man nice')"
@@ -4950,81 +4786,68 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
 #: /tmp/fish/implicit/share/completions/yast2.fish:2
-#, fuzzy
 msgid "Show help"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:2
-#, fuzzy
 msgid "Soundcard number or id to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:3
-#, fuzzy
 msgid "Mixer device to control"
-msgstr "Division control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:4
-#, fuzzy
 msgid "Starting view mode"
-msgstr "Start in Hebrew mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:5
-#, fuzzy
 msgid "Toggle the using of colors"
-msgstr "Toggle printing of remote hostname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:6
 msgid "Mixer abstraction level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:1
-#, fuzzy
 msgid "this help"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:2
-#, fuzzy
 msgid "select the card"
-msgstr "Select by command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:3
 msgid "select the device, default 'default'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:4
-#, fuzzy
 msgid "debug mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:5
 msgid "do not perform range checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:6
-#, fuzzy
 msgid "print version of this program"
-msgstr "Specify version of gem to rdoc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:7
-#, fuzzy
 msgid "be quiet"
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:8
-#, fuzzy
 msgid "show also inactive controls"
-msgstr "Font for active icons"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:9
-#, fuzzy
 msgid "select abstraction level"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:10
-#, fuzzy
 msgid "Read and execute commands from stdin sequentially"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:1
 #: /tmp/fish/implicit/share/completions/compare.fish:1
@@ -5208,9 +5031,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:21
 #: /tmp/fish/implicit/share/completions/display.fish:23
-#, fuzzy
 msgid "Displayed image cannot be modified"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:22
 #: /tmp/fish/implicit/share/completions/compare.fish:18
@@ -5269,9 +5091,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:50
 #: /tmp/fish/implicit/share/completions/montage.fish:40
 #: /tmp/fish/implicit/share/completions/stream.fish:14
-#, fuzzy
 msgid "Monitor progress "
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:28
 msgid "Seconds to pause before reanimating"
@@ -5306,9 +5127,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:60
 #: /tmp/fish/implicit/share/completions/montage.fish:47
 #: /tmp/fish/implicit/share/completions/stream.fish:16
-#, fuzzy
 msgid "Suppress all warning messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:32
 #: /tmp/fish/implicit/share/completions/compare.fish:28
@@ -5420,9 +5240,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:80
 #: /tmp/fish/implicit/share/completions/montage.fish:68
 #: /tmp/fish/implicit/share/completions/stream.fish:27
-#, fuzzy
 msgid "Print detailed information about the image"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:42
 #: /tmp/fish/implicit/share/completions/display.fish:49
@@ -5470,9 +5289,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/identify.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:23
 #: /tmp/fish/implicit/share/completions/stream.fish:8
-#, fuzzy
 msgid "Extract area from image [geometry]"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:48
 #: /tmp/fish/implicit/share/completions/composite.fish:60
@@ -5537,17 +5355,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/animate.fish:56
 #: /tmp/fish/implicit/share/completions/display.fish:88
 #: /tmp/fish/implicit/share/completions/montage.fish:92
-#, fuzzy
 msgid "Merge a sequence of images"
-msgstr "Print sequences of numbers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:57
 #: /tmp/fish/implicit/share/completions/display.fish:89
 #: /tmp/fish/implicit/share/completions/mogrify.fish:33
 #: /tmp/fish/implicit/share/completions/montage.fish:77
-#, fuzzy
 msgid "Flatten a sequence of images"
-msgstr "Print sequences of numbers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:58
 #: /tmp/fish/implicit/share/completions/compare.fish:40
@@ -5558,9 +5374,8 @@ msgstr "Print sequences of numbers"
 #: /tmp/fish/implicit/share/completions/import.fish:65
 #: /tmp/fish/implicit/share/completions/montage.fish:100
 #: /tmp/fish/implicit/share/completions/stream.fish:29
-#, fuzzy
 msgid "Display copious debugging information [events]"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:59
 #: /tmp/fish/implicit/share/completions/compare.fish:41
@@ -5571,9 +5386,8 @@ msgstr "Display detailed information of gem(s)"
 #: /tmp/fish/implicit/share/completions/import.fish:53
 #: /tmp/fish/implicit/share/completions/montage.fish:101
 #: /tmp/fish/implicit/share/completions/stream.fish:30
-#, fuzzy
 msgid "Print program options"
-msgstr "Print lpr options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:60
 #: /tmp/fish/implicit/share/completions/compare.fish:42
@@ -5649,9 +5463,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:11
 #: /tmp/fish/implicit/share/completions/xz.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:12
-#, fuzzy
 msgid "Display help"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:4
 #: /tmp/fish/implicit/share/completions/base64.fish:5
@@ -5659,50 +5472,41 @@ msgstr "Display a help page"
 #: /tmp/fish/implicit/share/completions/lscpu.fish:9
 #: /tmp/fish/implicit/share/completions/netctl.fish:2
 #: /tmp/fish/implicit/share/completions/xz.fish:38
-#, fuzzy
 msgid "Display version"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:5
-#, fuzzy
 msgid "Enable colored output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:6
 #: /tmp/fish/implicit/share/completions/magento.fish:25
-#, fuzzy
 msgid "Disable colored output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:7
-#, fuzzy
 msgid "Modify or list configuration items"
-msgstr "Specify directory with configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:8
-#, fuzzy
 msgid "Set config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:9
-#, fuzzy
 msgid "Get config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:10
-#, fuzzy
 msgid "Delete config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:11
-#, fuzzy
 msgid "List config items"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:12
-#, fuzzy
 msgid "Edit config items"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:13
 msgid "Reduce duplication in node_modules in current directory"
@@ -5731,9 +5535,8 @@ msgid "Open a package's homepage in the default browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:19
-#, fuzzy
 msgid "Print URL instead of opening"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:20
 msgid "Output featured packages as JSON array"
@@ -5742,37 +5545,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/apm.fish:21
 #: /tmp/fish/implicit/share/completions/apm.fish:45
 #: /tmp/fish/implicit/share/completions/apm.fish:73
-#, fuzzy
 msgid "Only list themes"
-msgstr "Lists the keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:22
 msgid "Only list packages/themes compatible with specified Atom version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:23
-#, fuzzy
 msgid "Generates code scaffolding for theme or package"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:24
 msgid "Path to the package or theme template"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:25
-#, fuzzy
 msgid "Generates a basic package"
-msgstr "Generate man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:26
-#, fuzzy
 msgid "Generates a basic theme"
-msgstr "Generate a simple Gemfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:27
-#, fuzzy
 msgid "Generates a basic language package"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:28
 msgid "Convert TextMate bundle/theme"
@@ -5788,25 +5586,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:31
 #: /tmp/fish/implicit/share/completions/apm.fish:52
-#, fuzzy
 msgid "Show verbose debug information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:32
-#, fuzzy
 msgid "Specify text file containing packages to install"
-msgstr "Specify version of gem to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:33
-#, fuzzy
 msgid "Do not install dev dependencies"
-msgstr "Do not install any required dependent gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:34
 #: /tmp/fish/implicit/share/completions/apm.fish:51
-#, fuzzy
 msgid "Only install packages/themes compatible with specified Atom version"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:35
 msgid "Set npm log level to silent"
@@ -5825,51 +5619,44 @@ msgid "Link to ~/.atom/dev/packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:39
-#, fuzzy
 msgid "List all installed and bundled packages"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:40
 msgid "Print packages one per line with no formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:41
-#, fuzzy
 msgid "Include dev packages"
-msgstr "Installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:42
-#, fuzzy
 msgid "Only list installed packages/themes"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:43
 msgid "Output all packages as a JSON object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:44
-#, fuzzy
 msgid "Include linked packages"
-msgstr "Installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:46
-#, fuzzy
 msgid "Only list packages"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:47
 msgid "Save Atom API token to keychain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:48
-#, fuzzy
 msgid "Specify API token"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:49
-#, fuzzy
 msgid "Upgrade out of date packages"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:50
 msgid "Output outdated packages as JSON array"
@@ -5880,56 +5667,48 @@ msgid "Confirm before installing updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:54
-#, fuzzy
 msgid "List but don't install the outdated packages"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:55
-#, fuzzy
 msgid "Publish new version of package in current working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:56
 msgid "Semantic version category for new version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:57
-#, fuzzy
 msgid "Specify a tag to publish"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:58
-#, fuzzy
 msgid "Specify a new name for the package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:59
 msgid "Rebuild modules installed in node_modules in current working directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:60
-#, fuzzy
 msgid "Rebuild module cache for installed packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:61
-#, fuzzy
 msgid "Search for Atom packages/themes in the atom.io registry"
-msgstr "Search for packages matching a pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:62
 msgid "Output matching packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:63
-#, fuzzy
 msgid "Search only non-theme packages"
-msgstr "Search in all man pages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:64
-#, fuzzy
 msgid "Search only themes"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:65
 msgid "View information about package/theme in the atom.io registry"
@@ -5940,46 +5719,40 @@ msgid "Output as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:67
-#, fuzzy
 msgid "Show latest version compatible with specified Atom version"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:68
 msgid "Star the given packages on https://atom.io"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:69
-#, fuzzy
 msgid "Star all packages in ~/.atom/packages"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:70
-#, fuzzy
 msgid "List or install starred Atom packages and themes"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:71
 msgid "Output packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:72
-#, fuzzy
 msgid "Install the starred packages"
-msgstr "Install the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:74
 msgid "GitHub username to show starred packages for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:75
-#, fuzzy
 msgid "Runs the package's tests contained within the spec directory"
-msgstr "Download the packages to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
-#, fuzzy
 msgid "Path to atom command"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:77
 msgid "Delete the symlink in ~/.atom/packages for the package"
@@ -5994,9 +5767,8 @@ msgid "Remove published package or version from the atom.io registry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:82
-#, fuzzy
 msgid "Do not prompt for confirmation"
-msgstr "Do not prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:83
 msgid "Unstar given packages on https://atom.io"
@@ -6283,9 +6055,8 @@ msgstr "Assume yes to all questions"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:24
 #: /tmp/fish/implicit/share/completions/apt-get.fish:35
-#, fuzzy
 msgid "Use purge instead of remove"
-msgstr "Use label instead of filename in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:25
 msgid "Do not run update"
@@ -6531,15 +6302,13 @@ msgstr "Test if apt has yet to be given the subcommand"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:3
 #: /tmp/fish/implicit/share/completions/snap.fish:2
-#, fuzzy
 msgid "Test if given subcommand is used"
-msgstr "Test if bundle has been given no subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:7
 #: /tmp/fish/implicit/share/completions/git.fish:4
-#, fuzzy
 msgid "Set a configuration option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:8
 #: /tmp/fish/implicit/share/completions/hugo.fish:1
@@ -6551,9 +6320,8 @@ msgid "Configuration file"
 msgstr "Configuration file"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:9
-#, fuzzy
 msgid "Target release"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
 msgid "Generate package from source"
@@ -6630,9 +6398,8 @@ msgid "Install one or more packages"
 msgstr "Install one or more packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:10
-#, fuzzy
 msgid "Display changelog of one or more packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:11
 msgid "Remove and purge one or more packages"
@@ -6667,9 +6434,8 @@ msgid "Remove automatically installed packages"
 msgstr "Remove automatically installed packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:19
-#, fuzzy
 msgid "Do not install recommended packages"
-msgstr "Reinstall each of the named packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:20
 #: /tmp/fish/implicit/share/completions/aptitude.fish:28
@@ -6690,32 +6456,28 @@ msgid "Disable downloading packages"
 msgstr "Disable downloading packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:25
-#, fuzzy
 msgid "Perform a simulation"
-msgstr "Perform a distribution upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:26
 msgid "Automatic yes to prompts"
 msgstr "Automatic yes to prompts"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:27
-#, fuzzy
 msgid "Show upgraded packages"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:28
-#, fuzzy
 msgid "Show full versions for packages"
-msgstr "Show full information for specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:29
 msgid "Compile source packages"
 msgstr "Compile source packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:30
-#, fuzzy
 msgid "Install recommended packages"
-msgstr "Install source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:31
 msgid "Ignore package Holds"
@@ -6730,14 +6492,12 @@ msgid "Force yes"
 msgstr "Force yes"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:34
-#, fuzzy
 msgid "Print the URIs"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:36
-#, fuzzy
 msgid "Reinstall packages"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:37
 msgid "Erase obsolete files"
@@ -6806,9 +6566,8 @@ msgid "Remove all downloaded .deb files from the package cache directory"
 msgstr "Remove all downloaded .deb files from the package cache directory"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:7
-#, fuzzy
 msgid "Forget all internal information about what packages are 'new'"
-msgstr "Forget all internal information about what packages are \\new"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:8
 msgid "Cancel all scheduled actions on all packages"
@@ -6887,28 +6646,24 @@ msgid "Display brief summary of the available commands and options"
 msgstr "Display brief summary of the available commands and options"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:27
-#, fuzzy
 msgid "Show explanations of automatic installations and removals"
-msgstr "Hold a package, prevent automatic installation or removal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:30
-#, fuzzy
 msgid "Purge packages that are not required by any installed package"
-msgstr "Query packages that are triggered by the specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:31
 msgid "Always display a prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:32
-#, fuzzy
 msgid "Do not treat recommendations as dependencies"
-msgstr "Don't ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:33
-#, fuzzy
 msgid "Treat recommendations as dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:34
 msgid "Don't perform the actions. Just show them"
@@ -6923,51 +6678,44 @@ msgid "Suppress incremental progress indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:37
-#, fuzzy
 msgid "Show which versions of packages will be installed"
-msgstr "Specify version of gem to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:38
-#, fuzzy
 msgid "Display extra information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:39
-#, fuzzy
 msgid "Display the version of aptitude and compile information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:40
 msgid "Start up the visual interface and display its preview screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:41
-#, fuzzy
 msgid "Assume the answer yes for all question prompts"
-msgstr "Assume yes to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:42
 msgid "Show how much disk space will be used or freed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:43
-#, fuzzy
 msgid "Specify the format to be used by the search command"
-msgstr "Specify command to run before this darcs command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:44
 msgid "Set the release from which packages should be installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:45
-#, fuzzy
 msgid "Specify the order for the output from the search command"
-msgstr "Specify command to run after this darcs command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:46
-#, fuzzy
 msgid "Set a configuration file option directly"
-msgstr "Read user config files from named directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:47
 msgid "Specify the display width for the output from the search command"
@@ -7067,9 +6815,8 @@ msgid "Assume no to all questions"
 msgstr "Assume no to all questions"
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:22
-#, fuzzy
 msgid "List bugs from packages"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:23
 msgid "List bugs in rss format"
@@ -7101,9 +6848,8 @@ msgid "Avoid changelogs from db in named file"
 msgstr "Avoid changelogs from db in named file"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:9
-#, fuzzy
 msgid "Select display"
-msgstr "X server display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:10
 msgid "Insert header"
@@ -7151,9 +6897,8 @@ msgid "Write package statistics to a file"
 msgstr "Write package statistics to a file"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:1
-#, fuzzy
 msgid "Generate master file"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:2
 msgid "Alias for 'get'"
@@ -7196,9 +6941,8 @@ msgid "Sync packages installed"
 msgstr "Sync packages installed"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:13
-#, fuzzy
 msgid "Move file specified on commandline"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:14
 msgid "List packages that may serve as input to mirrorbin or mirrorsource"
@@ -7269,14 +7013,12 @@ msgid "List packages depending on"
 msgstr "List packages depending on"
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:6
-#, fuzzy
 msgid "Comma-separated list of dependency types to follow recursively"
-msgstr "Comma-separated list of dependancy types to follow recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:7
-#, fuzzy
 msgid "Comma-separated list of dependency types to show"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:8
 msgid ""
@@ -7297,9 +7039,8 @@ msgid "Probe a CD"
 msgstr "Probe a CD"
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
-#, fuzzy
 msgid "Run in non-interactive mode"
-msgstr "Run in noninteractive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
@@ -7368,18 +7109,16 @@ msgid "Servers in the areas"
 msgstr "Servers in the areas"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:4
-#, fuzzy
 msgid "Conf file"
-msgstr "Configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:5
 msgid "Finish after number of servers"
 msgstr "Finish after number of servers"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:6
-#, fuzzy
 msgid "File to grab servers"
-msgstr "File for server response"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:7
 msgid "File as input"
@@ -7390,9 +7129,8 @@ msgid "Mirror-list file"
 msgstr "Mirror-list file"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:9
-#, fuzzy
 msgid "Output sources.list file"
-msgstr "Set sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:10
 msgid "Use proxy server"
@@ -7523,9 +7261,8 @@ msgstr "Select an action"
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:5
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:5
-#, fuzzy
 msgid "List of packages to install"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:6
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:6
@@ -7550,79 +7287,65 @@ msgid "Reject protocols"
 msgstr "Reject protocols"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:1
-#, fuzzy
 msgid "Debugging command"
-msgstr "Debugger command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:2
 #: /tmp/fish/implicit/share/completions/arc.fish:4
-#, fuzzy
 msgid "Don't use color or style for output"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:3
-#, fuzzy
 msgid "Always use fromatting"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:5
-#, fuzzy
 msgid "Specify which libraies to load"
-msgstr "Specify which mailbox to load"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:6
-#, fuzzy
 msgid "Specify the Conduit URI"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:7
-#, fuzzy
 msgid "Specify the Conduit token"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:8
-#, fuzzy
 msgid "Force a version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:9
-#, fuzzy
 msgid "Sets the timeout"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:10
-#, fuzzy
 msgid "Sets a config"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:11
-#, fuzzy
 msgid "Skip the working copy configuration file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:12
-#, fuzzy
 msgid "Use provided file instead of ~/.arcrc"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:13
-#, fuzzy
 msgid "Implements shell completion"
-msgstr "Do not use file completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:14
 msgid "Current term in the argument list being completed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:15
-#, fuzzy
 msgid "Reads an arc configuration option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
-#, fuzzy
 msgid "Show detailed information about options"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:17
 msgid "Download a file to local disk"
@@ -7633,9 +7356,8 @@ msgid "Save the file with a specific name rather than the default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:19
-#, fuzzy
 msgid "Write file to stdout instead of to disk"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:20
 msgid "List your open Differential revisions"
@@ -7650,14 +7372,12 @@ msgid "Override configured lint engine for this project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:23
-#, fuzzy
 msgid "Apply patches suggested by lint to the working copy"
-msgstr "Apply a unidiff patch to the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:24
-#, fuzzy
 msgid "Set minimum message severity"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:25
 #: /tmp/fish/implicit/share/completions/arc.fish:176
@@ -7665,14 +7385,12 @@ msgid "Never apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:26
-#, fuzzy
 msgid "Lint changes since a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:27
-#, fuzzy
 msgid "Output the linter results to a file"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:28
 msgid "Show all lint warnings, not just those on changed lines"
@@ -7684,9 +7402,8 @@ msgid "When linting git repositories, amend HEAD with all patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:30
-#, fuzzy
 msgid "Lint all files in the project"
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:31
 msgid "Specify how results will be displayed"
@@ -7710,9 +7427,8 @@ msgid "In the first form, list objects you've flagged"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:36
-#, fuzzy
 msgid "Edit the flag on an object"
-msgstr "Edit the long comment by default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:37
 msgid "Set the color of a flag"
@@ -7723,14 +7439,12 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "Set the terminal color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
-#, fuzzy
 msgid "Export the local changeset to a file"
-msgstr "Write package statistics to a file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:41
 msgid "Export change as a unified patch"
@@ -7754,9 +7468,8 @@ msgid "Export from Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:46
-#, fuzzy
 msgid "Export from a Differential revision"
-msgstr "Export tagged revisions."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:47
 msgid "Open a file or object in your web browser"
@@ -7787,14 +7500,12 @@ msgid "After creating the task, open it in a web browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:54
-#, fuzzy
 msgid "what they do and which versions are installed"
-msgstr "display the path where gems are installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:55
-#, fuzzy
 msgid "Search for linters"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:56
 msgid "Show detailed information, including options"
@@ -7809,24 +7520,20 @@ msgid "Stop tracking work in Phrequent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:59
-#, fuzzy
 msgid "A note to attach to the tracked time"
-msgstr "IP to report to the tracker"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:60
-#, fuzzy
 msgid "Create an alias"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:61
-#, fuzzy
 msgid "Sets an arc configuration option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:62
-#, fuzzy
 msgid "Set a local config value instead of a user one"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:63
 msgid "Start tracking work in Phrequent"
@@ -7841,9 +7548,8 @@ msgid "Provide a comment with your status change"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:66
-#, fuzzy
 msgid "Show available status options and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:67
 msgid "Publish an accepted revision after review"
@@ -7866,9 +7572,8 @@ msgid "When updating the feature branch, use rebase instead of merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:72
-#, fuzzy
 msgid "Use squash strategy"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:73
 msgid "Keep the feature branch"
@@ -7892,18 +7597,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:78
 #: /tmp/fish/implicit/share/completions/arc.fish:86
-#, fuzzy
 msgid "Use the message from a specific revision"
-msgstr "Update the working copy to a different URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:79
 msgid "Show which commits will be selected"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:80
-#, fuzzy
 msgid "Print base commit only and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:81
 #: /tmp/fish/implicit/share/completions/arc.fish:173
@@ -7911,9 +7614,8 @@ msgid "Additional rules for determining base revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:82
-#, fuzzy
 msgid "Specify the end of the commit range to select"
-msgstr "Set the end of file string to eof-str"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:83
 msgid "Show committed and abandoned revisions"
@@ -7921,109 +7623,92 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:84
 #: /tmp/fish/implicit/share/completions/arc.fish:114
-#, fuzzy
 msgid "Alias for arc feature"
-msgstr "Alias for atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
-#, fuzzy
 msgid "Show the amended commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:88
-#, fuzzy
 msgid "Upgrade arcanist and libphutil to the latest versions"
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:89
-#, fuzzy
 msgid "Shows the help"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:92
-#, fuzzy
 msgid "Language for syntax highlighting"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:93
-#, fuzzy
 msgid "Output in JSON format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:94
-#, fuzzy
 msgid "Title for the paste"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:95
 msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "Apply a unidiff patch to the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
-#, fuzzy
 msgid "Do not run any sanity checks"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:101
-#, fuzzy
 msgid "Do not commit the changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:102
-#, fuzzy
 msgid "Update the local working copy before applying the patch"
-msgstr "Update the working copy to a different URL."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:103
 msgid "Apply changes from a git patch file or unified patch file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:104
-#, fuzzy
 msgid "Apply changes from an arc bundlej"
-msgstr "Apply patches (from an email bundle) to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:105
-#, fuzzy
 msgid "Do not apply dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:106
 msgid "Apply changes from a Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:107
-#, fuzzy
 msgid "Do not create a branch"
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:108
 msgid "Apply changes from a Differential revision"
@@ -8046,28 +7731,24 @@ msgid "Output upload information in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:113
-#, fuzzy
 msgid "Mark the file as temporary"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:115
 msgid "There's only one way to find out"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:116
-#, fuzzy
 msgid "Show blame for the lines you changed"
-msgstr "Show help for the fish shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:117
-#, fuzzy
 msgid "Cover changes since a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:118
-#, fuzzy
 msgid "Close a revision"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:119
 msgid "Do not print a success message"
@@ -8107,9 +7788,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:128
 #: /tmp/fish/implicit/share/completions/arc.fish:140
-#, fuzzy
 msgid "Specify the output format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:129
 msgid "Include closed and abandoned revisions"
@@ -8120,9 +7800,8 @@ msgid "Sort branches by status instead of time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:131
-#, fuzzy
 msgid "Run unit tests that cover specified paths"
-msgstr "Run unit tests for gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:132
 msgid "Override configured unit engine for this project"
@@ -8133,43 +7812,37 @@ msgid "Show a detailed coverage report on the CLI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:134
-#, fuzzy
 msgid "Record a copy of the test results on the specified build target"
-msgstr "Cache test results in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:135
-#, fuzzy
 msgid "Use uglier formatting"
-msgstr "Use unified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:136
 msgid "Run unit tests covering changes since a specific revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:137
-#, fuzzy
 msgid "Run every test"
-msgstr "Reverse results"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:138
 msgid "Report results in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:139
-#, fuzzy
 msgid "Always enable coverage information"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:141
 #: /tmp/fish/implicit/share/completions/arc.fish:184
-#, fuzzy
 msgid "Always disable coverage information"
-msgstr "Only display Ruby directive information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "Execute command if previous command failed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8180,9 +7853,8 @@ msgid "Generate a Differential diff or revision from local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:145
-#, fuzzy
 msgid "Generate diff by executing a specified command"
-msgstr "Interactive mode after executing commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:146
 msgid "Attempt to convert non UTF-8 hunks into specified encoding"
@@ -8197,33 +7869,28 @@ msgid "When creating a revision, add reviewers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:149
-#, fuzzy
 msgid "Do not copy changes to the staging area"
-msgstr "Do not actually change anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:150
-#, fuzzy
 msgid "Read diff from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:151
-#, fuzzy
 msgid "Suppress warning about uncommitted changes"
-msgstr "Suppress the warning about “using insecure memory”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:152
 msgid "Read revision information from file"
 msgstr "Read revision information from file"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:153
-#, fuzzy
 msgid "Do not run lint"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:154
-#, fuzzy
 msgid "Use the specified message when updating a revision"
-msgstr "Use specified message digest algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:155
 msgid "Create or update a revision without requesting a code review"
@@ -8234,14 +7901,12 @@ msgid "After creating a diff or revision, open it in a web browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:157
-#, fuzzy
 msgid "Always create a new revision"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:158
-#, fuzzy
 msgid "Disable lint cache"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:159
 msgid "Read revision information from a specific commit"
@@ -8252,9 +7917,8 @@ msgid "Only generate a diff, without running lint, unit tests, or other"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:161
-#, fuzzy
 msgid "Do not upload binaries"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:162
 msgid "only create a diff"
@@ -8265,19 +7929,16 @@ msgid "Apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:165
-#, fuzzy
 msgid "Specify the end of the commit range"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:166
-#, fuzzy
 msgid "When creating a revision, try to use the working copy commit"
-msgstr "Bring changes from the repository into the working copy."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:167
-#, fuzzy
 msgid "Create a diff with a few lines of context."
-msgstr "Print NUM lines of context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:168
 msgid "Require excuse for lint advice in addition to lint warnings and errors"
@@ -8288,9 +7949,8 @@ msgid "Emit machine-readable JSON"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:170
-#, fuzzy
 msgid "Always update a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:171
 msgid "Ignore unsound test failures without prompting"
@@ -8301,43 +7961,36 @@ msgid "Provide a prepared in advance excuse for any lints/tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:174
-#, fuzzy
 msgid "Never amend commits in the working copy with lint patches"
-msgstr "Save changes in the working copy to the repository as a patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:175
 msgid "Automatically add all unstaged and uncommitted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:177
-#, fuzzy
 msgid "Edit revision information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:178
-#, fuzzy
 msgid "Do not run unit tests"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:179
-#, fuzzy
 msgid "Raise all lint warnings"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:181
-#, fuzzy
 msgid "Only run lint and unit tests"
-msgstr "Only print duplicates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:182
-#, fuzzy
 msgid "Skip checks for untracked files in the working copy"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:183
-#, fuzzy
 msgid "Display only new lint messages"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:185
 msgid "Create or update a libphutil library"
@@ -8364,14 +8017,12 @@ msgid "Force the library map to be updated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:191
-#, fuzzy
 msgid "Set the library name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:192
-#, fuzzy
 msgid "Shows the current version of arcanist"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:2
 msgid "Numerical address"
@@ -8406,42 +8057,36 @@ msgid "Take addr from filename, default /etc/ethers"
 msgstr "Take addr from filename, default /etc/ethers"
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
-#, fuzzy
 msgid "Omit false conditionals"
-msgstr "Test a condition"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:2
-#, fuzzy
 msgid "Omit debugging directives"
-msgstr "Omit debian version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:3
-#, fuzzy
 msgid "Include general information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:4
 msgid "Include high-level source"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:5
-#, fuzzy
 msgid "Include assembly"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:6
 msgid "Include macro expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:7
-#, fuzzy
 msgid "Omit forms processing"
-msgstr "Alter default keyword processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:8
-#, fuzzy
 msgid "Include symbols"
-msgstr "Include empty filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:9
 msgid "Initially turn on alternate macro syntax"
@@ -8460,14 +8105,12 @@ msgid "Produce assembler debugging messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:13
-#, fuzzy
 msgid "Remap debug information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:14
-#, fuzzy
 msgid "Redefine symbols"
-msgstr "Redefine variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:15
 msgid "Require executable stack for this object"
@@ -8494,14 +8137,12 @@ msgid "Skip whitespace and comment preprocessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:21
-#, fuzzy
 msgid "Generate debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:22
-#, fuzzy
 msgid "Generate STABS debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:23
 msgid "Generate STABS debug info with GNU extensions"
@@ -8520,19 +8161,16 @@ msgid "Set the hash table size close"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
-#, fuzzy
 msgid "Show help message and exit"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:28
-#, fuzzy
 msgid "Show target specific options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:29
-#, fuzzy
 msgid "Add DIR to search list for .include directives"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:30
 msgid "Don't warn about signed overflow"
@@ -8551,33 +8189,28 @@ msgid "Assemble in MRI compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:34
-#, fuzzy
 msgid "Write dependency information in given file"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
-#, fuzzy
 msgid "Do not pad the end of sections to alignment boundaries"
-msgstr "Do not add the default keyrings to the list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:36
-#, fuzzy
 msgid "Set object-file output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:37
-#, fuzzy
 msgid "Fold data section into text section"
-msgstr "Floating point exception"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:38
 msgid "Prefer smaller memory use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:39
-#, fuzzy
 msgid "Print various measured statistics from execution"
-msgstr "Print out the previously obtained statistics from the file systems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:40
 msgid "Strip local absolute symbols"
@@ -8588,73 +8221,62 @@ msgid "Use same format as native assembler when possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:42
-#, fuzzy
 msgid "Print assembler version number and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:43
 #: /tmp/fish/implicit/share/completions/gunzip.fish:8
 #: /tmp/fish/implicit/share/completions/gzip.fish:8
-#, fuzzy
 msgid "Suppress warnings"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:44
-#, fuzzy
 msgid "Don't suppress warnings"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:45
-#, fuzzy
 msgid "Treat warnings as errors"
-msgstr "Only output warnings and errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:46
 msgid "Generate object file even after errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:47
-#, fuzzy
 msgid "Read option from given file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:48
-#, fuzzy
 msgid "Print assembler version number"
-msgstr "Print line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:49
 msgid "Don't optimize code alignment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:50
-#, fuzzy
 msgid "Quieten some warnings"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:51
-#, fuzzy
 msgid "Generate 32 bits code"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:52
-#, fuzzy
 msgid "Generate 64 bits code"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:53
-#, fuzzy
 msgid "Generate x32 code"
-msgstr "Generate man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:54
 msgid "Encode SSE instructions with VEX prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:55
-#, fuzzy
 msgid "Check SSE instructions"
-msgstr "Check all generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:56
 msgid "Check operand combinations for validity"
@@ -8677,14 +8299,12 @@ msgid "Encode EVEX instructions with specific EVEX.RC"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:61
-#, fuzzy
 msgid "Use specfied mnemonic"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:62
-#, fuzzy
 msgid "Use specfied syntax"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:63
 msgid "Support pseudo index registers"
@@ -8707,14 +8327,12 @@ msgid "Disable branch optimization for shared code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:68
-#, fuzzy
 msgid "Strip all lock prefixes"
-msgstr "Small block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -8729,18 +8347,16 @@ msgid "Optimize for given CPU"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:1
-#, fuzzy
 msgid "Checkout package"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:2
 msgid "Show the full history of the target, with file diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:3
-#, fuzzy
 msgid "Put the source files in current directory"
-msgstr "Extract files to current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:4
 msgid "Collect garbage"
@@ -8751,46 +8367,40 @@ msgid "Report approximate disk usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:7
-#, fuzzy
 msgid "List all known packages"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:8
 msgid "List the architectures the targets are available for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:9
-#, fuzzy
 msgid "List locally tracked packages"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:10
 msgid "List repos the targets exist in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:11
-#, fuzzy
 msgid "Show revision history of the target"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:12
-#, fuzzy
 msgid "Show condensed revision history"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:13
 msgid "Show the target's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:14
-#, fuzzy
 msgid "Update given targets"
-msgstr "Update interval"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:15
-#, fuzzy
 msgid "Remove target from local repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:1
 msgid "Limiting load factor"
@@ -8841,23 +8451,20 @@ msgid "Print the jobs listed"
 msgstr "Print the jobs listed"
 
 #: /tmp/fish/implicit/share/completions/atom.fish:1
-#, fuzzy
 msgid "Run in development mode."
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:2
 msgid "Keep the browser process in the foreground."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:3
-#, fuzzy
 msgid "Print usage message."
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:4
-#, fuzzy
 msgid "Log all output to file."
-msgstr "Log input to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:5
 msgid "Open a new window."
@@ -8886,9 +8493,8 @@ msgid "Run the specified specs and exit with error code on failures."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:11
-#, fuzzy
 msgid "Print the version."
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:12
 msgid "Wait for window to be closed before returning."
@@ -8899,34 +8505,28 @@ msgid "Manage file archives of various types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:2
-#, fuzzy
 msgid "list files in archive (als)"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:3
-#, fuzzy
 msgid "extract files from archive (aunpack)"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:4
-#, fuzzy
 msgid "extract archive to specified directory"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:5
-#, fuzzy
 msgid "create archive (apack)"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:6
-#, fuzzy
 msgid "extract file to standard out (acat)"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:7
-#, fuzzy
 msgid "generate a diff between two archives (adiff)"
-msgstr "Create a diff between two versions of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:8
 msgid "repack archives to a different format (arepack)"
@@ -8941,9 +8541,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tee.fish:3
 #: /tmp/fish/implicit/share/completions/tr.fish:5
 #: /tmp/fish/implicit/share/completions/unexpand.fish:5
-#, fuzzy
 msgid "display this help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:10
 #: /tmp/fish/implicit/share/completions/dd.fish:2
@@ -8958,14 +8557,12 @@ msgstr "Display help and exit"
 #: /tmp/fish/implicit/share/completions/tee.fish:4
 #: /tmp/fish/implicit/share/completions/tr.fish:6
 #: /tmp/fish/implicit/share/completions/unexpand.fish:6
-#, fuzzy
 msgid "output version information and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:11
-#, fuzzy
 msgid "execute command above for each file specified"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:12
 msgid "override archive format (see below)"
@@ -8980,66 +8577,56 @@ msgid "always create subdirectory when extracting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:15
-#, fuzzy
 msgid "allow overwriting of local files"
-msgstr "Build new local files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:16
-#, fuzzy
 msgid "decrease verbosity level by one"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:17
-#, fuzzy
 msgid "increase verbosity level by one"
-msgstr "Increment the misc debug level by one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:18
 msgid "specify verbosity (0, 1 or 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:19
-#, fuzzy
 msgid "send output through pager"
-msgstr "Pass the output through “pr”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:20
 msgid "filenames from standard in are null-byte separated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:21
-#, fuzzy
 msgid "explain what is being done by atool"
-msgstr "Explain what is done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:22
 msgid "simulation mode - no filesystem changes are made"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:23
-#, fuzzy
 msgid "override a configuration option (KEY=VALUE)"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:24
-#, fuzzy
 msgid "load configuration defaults from file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:1
-#, fuzzy
 msgid "Synchronize AUR packages"
-msgstr "Show held packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:2
-#, fuzzy
 msgid "Save and restore package state"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:3
-#, fuzzy
 msgid "Package cache actions"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:4
 #: /tmp/fish/implicit/share/completions/pacaur.fish:1
@@ -9048,23 +8635,20 @@ msgstr "Manage abbreviations"
 #: /tmp/fish/implicit/share/completions/pacman.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:1
 #: /tmp/fish/implicit/share/completions/yaourt.fish:4
-#, fuzzy
 msgid "Modify the package database"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:5
 msgid "Pacman log actions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:6
-#, fuzzy
 msgid "Build packages from ABS"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:7
-#, fuzzy
 msgid "Operate on orphan packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:8
 #: /tmp/fish/implicit/share/completions/pacaur.fish:2
@@ -9073,55 +8657,48 @@ msgstr "Update list of packages"
 #: /tmp/fish/implicit/share/completions/pacman.fish:4
 #: /tmp/fish/implicit/share/completions/yaourt.fish:2
 #: /tmp/fish/implicit/share/completions/yaourt.fish:5
-#, fuzzy
 msgid "Query the package database"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:9
 #: /tmp/fish/implicit/share/completions/pacaur.fish:6
 #: /tmp/fish/implicit/share/completions/pacman.fish:5
 #: /tmp/fish/implicit/share/completions/yaourt.fish:6
-#, fuzzy
 msgid "Remove packages from the system"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:10
 #: /tmp/fish/implicit/share/completions/pacaur.fish:7
 #: /tmp/fish/implicit/share/completions/pacman.fish:6
 #: /tmp/fish/implicit/share/completions/yaourt.fish:7
-#, fuzzy
 msgid "Synchronize packages"
-msgstr "Show held packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:11
 #: /tmp/fish/implicit/share/completions/pacaur.fish:8
 #: /tmp/fish/implicit/share/completions/pacman.fish:7
 #: /tmp/fish/implicit/share/completions/yaourt.fish:8
-#, fuzzy
 msgid "Check dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:12
 #: /tmp/fish/implicit/share/completions/pacaur.fish:9
 #: /tmp/fish/implicit/share/completions/pacman.fish:8
 #: /tmp/fish/implicit/share/completions/yaourt.fish:9
-#, fuzzy
 msgid "Upgrade or add a local package"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:13
 msgid "Show settings while running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:14
-#, fuzzy
 msgid "Do not use powerpill"
-msgstr "Do not use gcc wrapper"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:15
-#, fuzzy
 msgid "Show available languages"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:16
 msgid "View pacman.conf"
@@ -9147,58 +8724,51 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:23
 #: /tmp/fish/implicit/share/completions/pacman.fish:14
 #: /tmp/fish/implicit/share/completions/yaourt.fish:20
-#, fuzzy
 msgid "Output more status messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:22
 #: /tmp/fish/implicit/share/completions/pacaur.fish:24
 #: /tmp/fish/implicit/share/completions/pacman.fish:15
 #: /tmp/fish/implicit/share/completions/yaourt.fish:21
-#, fuzzy
 msgid "Alternate architecture"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:23
 #: /tmp/fish/implicit/share/completions/pacaur.fish:25
 #: /tmp/fish/implicit/share/completions/pacman.fish:16
 #: /tmp/fish/implicit/share/completions/yaourt.fish:22
-#, fuzzy
 msgid "Alternative package cache location"
-msgstr "Auto-gen package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:24
 #: /tmp/fish/implicit/share/completions/pacaur.fish:26
 #: /tmp/fish/implicit/share/completions/pacman.fish:17
 #: /tmp/fish/implicit/share/completions/tmux.fish:12
 #: /tmp/fish/implicit/share/completions/yaourt.fish:23
-#, fuzzy
 msgid "Alternate config file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:25
 #: /tmp/fish/implicit/share/completions/pacaur.fish:27
 #: /tmp/fish/implicit/share/completions/pacman.fish:18
 #: /tmp/fish/implicit/share/completions/yaourt.fish:24
-#, fuzzy
 msgid "Display debug messages"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:26
 #: /tmp/fish/implicit/share/completions/pacaur.fish:28
 #: /tmp/fish/implicit/share/completions/pacman.fish:19
 #: /tmp/fish/implicit/share/completions/yaourt.fish:25
-#, fuzzy
 msgid "GPG directory to verify signatures"
-msgstr "Options for verifying signatures"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:27
 #: /tmp/fish/implicit/share/completions/pacaur.fish:30
 #: /tmp/fish/implicit/share/completions/pacman.fish:21
 #: /tmp/fish/implicit/share/completions/yaourt.fish:27
-#, fuzzy
 msgid "Specify alternative log file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:28
 #: /tmp/fish/implicit/share/completions/pacaur.fish:31
@@ -9211,9 +8781,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:45
 #: /tmp/fish/implicit/share/completions/pacman.fish:23
 #: /tmp/fish/implicit/share/completions/yaourt.fish:37
-#, fuzzy
 msgid "Skip [all] dependency checks"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:30
 #: /tmp/fish/implicit/share/completions/pacaur.fish:46
@@ -9226,9 +8795,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:48
 #: /tmp/fish/implicit/share/completions/pacman.fish:26
 #: /tmp/fish/implicit/share/completions/yaourt.fish:40
-#, fuzzy
 msgid "Do not execute install script"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:33
 #: /tmp/fish/implicit/share/completions/pacaur.fish:49
@@ -9241,9 +8809,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:50
 #: /tmp/fish/implicit/share/completions/pacman.fish:28
 #: /tmp/fish/implicit/share/completions/yaourt.fish:42
-#, fuzzy
 msgid "Specify printf-like format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:35
 #: /tmp/fish/implicit/share/completions/pacaur.fish:51
@@ -9262,9 +8829,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacman.fish:63
 #: /tmp/fish/implicit/share/completions/yaourt.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:92
-#, fuzzy
 msgid "Mark PACKAGE as explicitly installed"
-msgstr "Mark packages as manually installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:37
 #: /tmp/fish/implicit/share/completions/pacaur.fish:53
@@ -9291,9 +8857,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:56
 #: /tmp/fish/implicit/share/completions/pacman.fish:34
 #: /tmp/fish/implicit/share/completions/yaourt.fish:48
-#, fuzzy
 msgid "Do not reinstall up-to-date targets"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:41
 #: /tmp/fish/implicit/share/completions/pacaur.fish:57
@@ -9306,17 +8871,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:58
 #: /tmp/fish/implicit/share/completions/pacman.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:50
-#, fuzzy
 msgid "Display all packages in GROUP"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:43
 #: /tmp/fish/implicit/share/completions/pacaur.fish:59
 #: /tmp/fish/implicit/share/completions/pacman.fish:37
 #: /tmp/fish/implicit/share/completions/yaourt.fish:51
-#, fuzzy
 msgid "Display information on PACKAGE"
-msgstr "Display information related to merges"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:44
 #: /tmp/fish/implicit/share/completions/aura.fish:53
@@ -9326,31 +8889,27 @@ msgstr "Display information related to merges"
 #: /tmp/fish/implicit/share/completions/pacman.fish:73
 #: /tmp/fish/implicit/share/completions/yaourt.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:102
-#, fuzzy
 msgid "Show less information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:45
 #: /tmp/fish/implicit/share/completions/pacaur.fish:61
 #: /tmp/fish/implicit/share/completions/pacman.fish:39
 #: /tmp/fish/implicit/share/completions/yaourt.fish:53
-#, fuzzy
 msgid "Search packages for regexp"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:46
 msgid "Remove packages only needed during installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:47
-#, fuzzy
 msgid "View package dependencies"
-msgstr "Verify integrity of package dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:48
-#, fuzzy
 msgid "View package information"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:49
 msgid "Show PKGBUILD diffs"
@@ -9361,63 +8920,52 @@ msgid "View the packages's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:51
-#, fuzzy
 msgid "Show makepkg output"
-msgstr "Show help about options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:52
-#, fuzzy
 msgid "Build dependencies from ABS"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:54
-#, fuzzy
 msgid "Search AUR by string matching"
-msgstr "Search only files matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:55
-#, fuzzy
 msgid "Upgrade all installed AUR packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:56
-#, fuzzy
 msgid "Download the source tarball"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:57
-#, fuzzy
 msgid "Ignore given comma-separated packages"
-msgstr "Ignore non-authenticated packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:58
-#, fuzzy
 msgid "Specify a build location"
-msgstr "Specify debugging options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:59
-#, fuzzy
 msgid "User to build as"
-msgstr "Use <command> to build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:60
 msgid "Run customizepkg before build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:61
-#, fuzzy
 msgid "Include -git/-svn/etc packages"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:62
-#, fuzzy
 msgid "Prompt for PKGBUILD editing"
-msgstr "Prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:63
-#, fuzzy
 msgid "Ignore architecture checking"
-msgstr "Ignore chunks when checking integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:64
 msgid "Sort alphabetically"
@@ -9440,25 +8988,21 @@ msgid "Restores a record kept with -B"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:69
-#, fuzzy
 msgid "Backup to directory"
-msgstr "Target directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:70
-#, fuzzy
 msgid "Save this many versions"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:71
 #: /tmp/fish/implicit/share/completions/aura.fish:73
-#, fuzzy
 msgid "Search via regex"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:72
-#, fuzzy
 msgid "Show package history"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:74
 msgid "Search ABS by regex"
@@ -9478,14 +9022,12 @@ msgid "Download fresh copy of the package list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:77
-#, fuzzy
 msgid "Sync the given to local ABS tree"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:79
-#, fuzzy
 msgid "Uninstall orphan packages"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:80
 #: /tmp/fish/implicit/share/completions/pacaur.fish:62
@@ -9498,17 +9040,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:63
 #: /tmp/fish/implicit/share/completions/pacman.fish:41
 #: /tmp/fish/implicit/share/completions/yaourt.fish:60
-#, fuzzy
 msgid "List only non-explicit packages (dependencies)"
-msgstr "Verify integrity of package dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:82
 #: /tmp/fish/implicit/share/completions/pacaur.fish:64
 #: /tmp/fish/implicit/share/completions/pacman.fish:42
 #: /tmp/fish/implicit/share/completions/yaourt.fish:61
-#, fuzzy
 msgid "List only explicitly installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:83
 #: /tmp/fish/implicit/share/completions/pacaur.fish:65
@@ -9521,25 +9061,22 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:66
 #: /tmp/fish/implicit/share/completions/pacman.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:63
-#, fuzzy
 msgid "List all files owned by PACKAGE"
-msgstr "list files owned by package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:85
 #: /tmp/fish/implicit/share/completions/pacaur.fish:67
 #: /tmp/fish/implicit/share/completions/pacman.fish:45
 #: /tmp/fish/implicit/share/completions/yaourt.fish:64
-#, fuzzy
 msgid "List all packages not in the database"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:86
 #: /tmp/fish/implicit/share/completions/pacaur.fish:68
 #: /tmp/fish/implicit/share/completions/pacman.fish:46
 #: /tmp/fish/implicit/share/completions/yaourt.fish:65
-#, fuzzy
 msgid "Search for the package that owns FILE"
-msgstr "Search for packages matching a pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:87
 #: /tmp/fish/implicit/share/completions/pacaur.fish:69
@@ -9552,33 +9089,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:70
 #: /tmp/fish/implicit/share/completions/pacman.fish:48
 #: /tmp/fish/implicit/share/completions/yaourt.fish:67
-#, fuzzy
 msgid "List only unrequired packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:71
 #: /tmp/fish/implicit/share/completions/pacman.fish:49
 #: /tmp/fish/implicit/share/completions/yaourt.fish:68
-#, fuzzy
 msgid "List only out-of-date packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:91
 #: /tmp/fish/implicit/share/completions/pacaur.fish:73
 #: /tmp/fish/implicit/share/completions/pacman.fish:51
 #: /tmp/fish/implicit/share/completions/yaourt.fish:72
-#, fuzzy
 msgid "Also remove packages depending on PACKAGE"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:92
 #: /tmp/fish/implicit/share/completions/pacaur.fish:74
 #: /tmp/fish/implicit/share/completions/pacman.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:73
-#, fuzzy
 msgid "Ignore file backup designations"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:93
 #: /tmp/fish/implicit/share/completions/pacaur.fish:75
@@ -9598,33 +9131,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:78
 #: /tmp/fish/implicit/share/completions/pacman.fish:56
 #: /tmp/fish/implicit/share/completions/yaourt.fish:77
-#, fuzzy
 msgid "Remove [all] packages from cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:97
 #: /tmp/fish/implicit/share/completions/pacaur.fish:79
 #: /tmp/fish/implicit/share/completions/pacman.fish:57
 #: /tmp/fish/implicit/share/completions/yaourt.fish:78
-#, fuzzy
 msgid "List all packages in REPOSITORY"
-msgstr "list all packages owning file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:98
 #: /tmp/fish/implicit/share/completions/pacaur.fish:80
 #: /tmp/fish/implicit/share/completions/pacman.fish:58
 #: /tmp/fish/implicit/share/completions/yaourt.fish:79
-#, fuzzy
 msgid "Upgrade all packages that are out of date"
-msgstr "Upgrade installed packages to their most recent version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:99
 #: /tmp/fish/implicit/share/completions/pacaur.fish:82
 #: /tmp/fish/implicit/share/completions/pacman.fish:60
 #: /tmp/fish/implicit/share/completions/yaourt.fish:81
-#, fuzzy
 msgid "Only download the target packages"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:101
 #: /tmp/fish/implicit/share/completions/aura.fish:102
@@ -9634,9 +9163,8 @@ msgstr "Disable downloading packages"
 #: /tmp/fish/implicit/share/completions/pacman.fish:76
 #: /tmp/fish/implicit/share/completions/yaourt.fish:104
 #: /tmp/fish/implicit/share/completions/yaourt.fish:105
-#, fuzzy
 msgid "Package file"
-msgstr "Package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/awk.fish:1
 msgid ""
@@ -9675,9 +9203,8 @@ msgid "Input_file Read a list of already existing known bad blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:5
-#, fuzzy
 msgid "Output_file Write the list of bad blocks to the specified file"
-msgstr "Set the list of default preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:6
 msgid ""
@@ -9721,9 +9248,8 @@ msgid "Wrap encoded line after given number of caracters (default 76)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:1
-#, fuzzy
 msgid "Force interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:2
 msgid "Define math library"
@@ -9750,33 +9276,28 @@ msgid "Seems mode: goes back to the first directory containing string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bd.fish:3
-#, fuzzy
 msgid "Case insensitive move (implies seems mode)"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:1
 msgid "Show unavailable key bindings/erase all bindings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:2
-#, fuzzy
 msgid "Erase mode"
-msgstr "Verbose mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:3
-#, fuzzy
 msgid "Print names of available functions"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:5
-#, fuzzy
 msgid "Specify key name, not sequence"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:6
-#, fuzzy
 msgid "Print names of available keys"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:7
 msgid "Add to named bind mode"
@@ -9787,15 +9308,13 @@ msgid "Change current bind mode to named mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:9
-#, fuzzy
 msgid "Key name"
-msgstr "name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:10
 #: /tmp/fish/implicit/share/completions/commandline.fish:17
-#, fuzzy
 msgid "Function name"
-msgstr "Function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:1
 msgid "Specify a prefix to use for all bison output file names"
@@ -9835,9 +9354,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:9
-#, fuzzy
 msgid "Specify the name outfile for the parser file"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:10
 msgid ""
@@ -9858,9 +9376,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:13
-#, fuzzy
 msgid "Print the version number of bison and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:14
 msgid "Print a summary of the options to bison and exit"
@@ -9883,28 +9400,24 @@ msgid "Create a global (manually erased) event block"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:1
-#, fuzzy
 msgid "Check formula"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:2
-#, fuzzy
 msgid "Create a binary package"
-msgstr "Cancel a hold on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:3
-#, fuzzy
 msgid "Output developer debug information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:4
 msgid "Do not bump the bottle revision number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:5
-#, fuzzy
 msgid "Write bottle block to a Ruby source file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:6
 msgid "Write bottle block to formula file"
@@ -9915,14 +9428,12 @@ msgid "Merge multiple bottle outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:8
-#, fuzzy
 msgid "Display formula"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:9
-#, fuzzy
 msgid "Remove old installed versions"
-msgstr "Remove automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:10
 msgid "Remove out-of-date keg-only brews as well"
@@ -9934,9 +9445,8 @@ msgid "Show what files would be removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:13
-#, fuzzy
 msgid "Scrub the cache"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:14
 msgid "Create new formula from URL"
@@ -9951,14 +9461,12 @@ msgid "Use template for Autotools-style build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:17
-#, fuzzy
 msgid "Don't download URL"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:18
-#, fuzzy
 msgid "Override name autodetection"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:19
 msgid "Override version autodetection"
@@ -9969,24 +9477,20 @@ msgid "Summarize specified formulae in one line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:21
-#, fuzzy
 msgid "Search names and descriptions"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:22
-#, fuzzy
 msgid "Search only names"
-msgstr "Search in all man pages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:23
-#, fuzzy
 msgid "Search only descriptions"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:24
-#, fuzzy
 msgid "Show a formula's dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:25
 msgid "Show only 1 level down"
@@ -9997,33 +9501,28 @@ msgid "Show in topological order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:27
-#, fuzzy
 msgid "Show dependencies as tree"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:28
-#, fuzzy
 msgid "Show dependencies for all formulae"
-msgstr "Show the dependencies of an installed gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:29
-#, fuzzy
 msgid "Show dependencies for installed formulae"
-msgstr "Show the dependencies of an installed gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:30
 msgid "Determine installation prefix for non-brew software"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:31
-#, fuzzy
 msgid "Set name of package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:32
-#, fuzzy
 msgid "Set version of package"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:33
 msgid "Check your system for problems"
@@ -10034,9 +9533,8 @@ msgid "Open brew/formula for editing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:35
-#, fuzzy
 msgid "Download source for formula"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:36
 msgid "Remove a previously cached version and re-fetch"
@@ -10047,48 +9545,42 @@ msgid "Download the HEAD version from a VCS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:38
-#, fuzzy
 msgid "Also download dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:39
 msgid "Make HEAD checkout verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:40
-#, fuzzy
 msgid "Fetch source package instead of bottle"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:42
 msgid "Open brew/formula's homepage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:43
-#, fuzzy
 msgid "Display information about formula"
-msgstr "Display information related to merges"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:44
-#, fuzzy
 msgid "Display info for all formulae"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:45
 msgid "Open the GitHub History page for formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:46
-#, fuzzy
 msgid "Install formula"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:47
 #: /tmp/fish/implicit/share/completions/prt-get.fish:35
 #: /tmp/fish/implicit/share/completions/prt-get.fish:94
-#, fuzzy
 msgid "Force install"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:48
 msgid "If install fails, open shell in temp directory"
@@ -10099,9 +9591,8 @@ msgid "skip installing any dependencies of any kind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:50
-#, fuzzy
 msgid "Attempt to compile using the specified compiler"
-msgstr "Output filenames using the specified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:51
 msgid "Compile from source even if a bottle is provided"
@@ -10120,18 +9611,16 @@ msgid "Download and patch formula, then open a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:55
-#, fuzzy
 msgid "Force the specified build environment"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:56
 msgid "Optimize for a generic CPU architecture"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:57
-#, fuzzy
 msgid "Optimize for the specified CPU architecture"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:58
 msgid "Symlink installed formula"
@@ -10139,9 +9628,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:59
 #: /tmp/fish/implicit/share/completions/brew.fish:60
-#, fuzzy
 msgid "Overwrite existing files"
-msgstr "Overwrite existing binstubs if they exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:61
 #: /tmp/fish/implicit/share/completions/brew.fish:62
@@ -10162,9 +9650,8 @@ msgid "Link .app bundles into ~/Applications instead"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:67
-#, fuzzy
 msgid "List all installed formula"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:68
 #: /tmp/fish/implicit/share/completions/brew.fish:71
@@ -10173,20 +9660,17 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:69
 #: /tmp/fish/implicit/share/completions/brew.fish:72
-#, fuzzy
 msgid "Show the version number"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:70
 #: /tmp/fish/implicit/share/completions/brew.fish:73
-#, fuzzy
 msgid "Show the versions of pinned formulae"
-msgstr "Show the version of each required dependency"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:74
-#, fuzzy
 msgid "Show log for formula"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:75
 #: /tmp/fish/implicit/share/completions/brew.fish:77
@@ -10198,9 +9682,8 @@ msgid "formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:76
-#, fuzzy
 msgid "Check formula for missing dependencies"
-msgstr "Ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:78
 msgid "Display install options for formula"
@@ -10215,33 +9698,28 @@ msgid "Show options for all formulae"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:81
-#, fuzzy
 msgid "Show options for all installed formulae"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:83
 msgid "Show formula that have updated versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:84
-#, fuzzy
 msgid "Display only names"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:85
-#, fuzzy
 msgid "Pin the specified formulae to their current versions"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:87
-#, fuzzy
 msgid "Remove dead symlinks"
-msgstr "Remove unused locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:88
-#, fuzzy
 msgid "Search for formula by name"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:89
 #: /tmp/fish/implicit/share/completions/brew.fish:91
@@ -10270,14 +9748,12 @@ msgid "Gracefully restart a service"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:97
-#, fuzzy
 msgid "Start a service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:98
-#, fuzzy
 msgid "Stop a service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:100
 msgid "All Services"
@@ -10288,9 +9764,8 @@ msgid "Instantiate a Homebrew build enviornment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:102
-#, fuzzy
 msgid "Use stdenv instead of superenv"
-msgstr "Use /dev/urandom instead of /dev/random"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:103
 msgid "Tap a new formula repository on GitHub"
@@ -10301,21 +9776,18 @@ msgid "Create and prune tap symlinks as appropriate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:105
-#, fuzzy
 msgid "Run tests for formula"
-msgstr "Run unit tests for gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:107
-#, fuzzy
 msgid "Uninstall formula"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:108
 #: /tmp/fish/implicit/share/completions/brew.fish:109
 #: /tmp/fish/implicit/share/completions/brew.fish:110
-#, fuzzy
 msgid "Delete all installed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:111
 msgid "Unlink formula"
@@ -10330,19 +9802,16 @@ msgid "Remove links from ~/Applications created by brew linkapps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:114
-#, fuzzy
 msgid "Extract source code"
-msgstr "Extract by record type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:115
-#, fuzzy
 msgid "Unpin specified formulae"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:116
-#, fuzzy
 msgid "Remove a tapped repository"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:117
 msgid "Fetch newest version of Homebrew and formulas"
@@ -10353,28 +9822,24 @@ msgid "Use git pull --rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:119
-#, fuzzy
 msgid "Upgrade outdated brews"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:120
 msgid "Show formulas that depend on specified formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:121
-#, fuzzy
 msgid "List only installed formulae"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:122
-#, fuzzy
 msgid "Resolve more than one level of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:123
-#, fuzzy
 msgid "Print version number of brew"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:124
 msgid "Show Homebrew a summary of the build environment"
@@ -10385,42 +9850,36 @@ msgid "Display where Homebrew's .git directory is located"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:126
-#, fuzzy
 msgid "Show Homebrew and system configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:127
-#, fuzzy
 msgid "Display Homebrew's install path"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:128
-#, fuzzy
 msgid "Display formula's install path"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:129
-#, fuzzy
 msgid "Display Homebrew's download cache"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:130
 msgid "Display the file or directory used to cache formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:131
-#, fuzzy
 msgid "Display Homebrew's Cellar path"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:132
 msgid "Display formula's install path in Cellar"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/builtin.fish:2
-#, fuzzy
 msgid "Print names of all existing builtins"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:1
 msgid "Test if bundle has been given no subcommand"
@@ -10435,9 +9894,8 @@ msgid "Specify the number of times you wish to attempt network commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:4
-#, fuzzy
 msgid "Disable colorization in output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:5
 msgid "Enable verbose output mode"
@@ -10448,9 +9906,8 @@ msgid "Display a help page"
 msgstr "Display a help page"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:7
-#, fuzzy
 msgid "Prints version information"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:8
 #: /tmp/fish/implicit/share/completions/bundle.fish:40
@@ -10703,9 +10160,8 @@ msgid "Show the version of each required dependency"
 msgstr "Show the version of each required dependency"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:75
-#, fuzzy
 msgid "Output a specific format (png, jpg, svg, dot, …)"
-msgstr "Output a specific format (png, jpg, svg, dot, ...)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:76
 msgid "Generate a simple Gemfile, placed in the current directory"
@@ -10773,9 +10229,8 @@ msgstr "Overwrite"
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:3
 #: /tmp/fish/implicit/share/completions/bzip2.fish:5
-#, fuzzy
 msgid "Do not overwrite"
-msgstr "Don't overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:4
 #: /tmp/fish/implicit/share/completions/bzcat.fish:1
@@ -10797,9 +10252,8 @@ msgid "Print license"
 msgstr "Print license"
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
-#, fuzzy
 msgid "Suppress message payload display"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:2
 msgid "Show a flat list instead of a tree"
@@ -10810,9 +10264,8 @@ msgid "Activate the peer if necessary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:4
-#, fuzzy
 msgid "Only show unique (:X.Y) names"
-msgstr "Only print unique lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:5
 msgid "Only show well-known names"
@@ -10829,9 +10282,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bzip2.fish:1
 #: /tmp/fish/implicit/share/completions/gunzip.fish:1
 #: /tmp/fish/implicit/share/completions/gzip.fish:1
-#, fuzzy
 msgid "Compress to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzip2.fish:2
 msgid "Compress file"
@@ -10856,28 +10308,24 @@ msgid "Large block size"
 msgstr "Large block size"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:2
-#, fuzzy
 msgid "List all help topics"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:3
-#, fuzzy
 msgid "List all commands"
-msgstr "list all “gem” commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:4
-#, fuzzy
 msgid "Help about supported formats"
-msgstr "Comma separated format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:5
 msgid "Help about current supported formats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:6
-#, fuzzy
 msgid "How to specify revisions in bzr"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:7
 msgid "Show bug tracker settings in bzr"
@@ -10900,14 +10348,12 @@ msgid "Never change revnos or the existing log. Append revisions to it only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:12
-#, fuzzy
 msgid "Make a copy of another branch"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:13
-#, fuzzy
 msgid "Proceed even if directory exits"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:14
 msgid "Create a stacked branch referring to the source branch"
@@ -10922,9 +10368,8 @@ msgid "Switch the checkout in the current directory to the new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:17
-#, fuzzy
 msgid "Hard-link working tree files where possible"
-msgstr "Bring work tree in sync with repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:18
 msgid "Bind new branch to from location"
@@ -10935,33 +10380,28 @@ msgid "Create a branch without a working-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:20
-#, fuzzy
 msgid "Make files or directories versioned"
-msgstr "Remove files and directories from version control."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:21
-#, fuzzy
 msgid "Don't recursively add the contents of directories"
-msgstr "Don't add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:22
-#, fuzzy
 msgid "Ignore a file or pattern"
-msgstr "Ignore all white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:23
 msgid "Display the default ignore rules that bzr uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:24
-#, fuzzy
 msgid "Move or rename a versioned file"
-msgstr "Move or rename files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:25
-#, fuzzy
 msgid "Automatically guess renames"
-msgstr "Automatic yes to prompts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:26
 msgid ""
@@ -10970,41 +10410,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:27
-#, fuzzy
 msgid "Summarize changes in working copy"
-msgstr "Recursively clean up the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:28
 msgid "Use short status indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:29
-#, fuzzy
 msgid "Only show versioned files"
-msgstr "Only store newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:30
-#, fuzzy
 msgid "Don't show pending merges"
-msgstr "Don't strip leading /"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:31
 msgid "Do not mark object type using indicator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:32
-#, fuzzy
 msgid "Show internal object ids"
-msgstr "Show all options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:33
 msgid "Show detailed diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:34
-#, fuzzy
 msgid "Pull in changes from another branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:35
 msgid ""
@@ -11013,9 +10448,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:36
-#, fuzzy
 msgid "Remember the specified location as a default"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:37
 msgid "Merge even if the destination tree has uncommitted changes"
@@ -11031,35 +10465,30 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:40
-#, fuzzy
 msgid "Show base revision text in conflicts"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:41
 msgid "Instead of merging, show a diff of the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:42
-#, fuzzy
 msgid "Select changes interactively"
-msgstr "Select interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:43
-#, fuzzy
 msgid ""
 "Branch to merge into, rather than the one containing the working directory"
-msgstr "Record an inverse patch without changing the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:44
 #: /tmp/fish/implicit/share/completions/bzr.fish:45
-#, fuzzy
 msgid "Select changes introduced by the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:46
-#, fuzzy
 msgid "Save some or all changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:47
 msgid ""
@@ -11068,18 +10497,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:48
-#, fuzzy
 msgid "Take commit message from this file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:49
 msgid "Do not consider changes made to a given path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:50
-#, fuzzy
 msgid "Description of the new revision"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:51
 msgid "Set the author's name, if it's different from the commiter"
@@ -11098,9 +10525,8 @@ msgid "Mark a bug as being fixed by this revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:55
-#, fuzzy
 msgid "Refuse to commit if there are unknown files in the working tree"
-msgstr "List unrecorded changes in the working tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:56
 msgid ""
@@ -11131,14 +10557,12 @@ msgid "Mail the request to this address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:62
-#, fuzzy
 msgid "Use the specified output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:63
-#, fuzzy
 msgid "Do not include a bundle in the merge directive"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:64
 msgid ""
@@ -11151,50 +10575,41 @@ msgid "Do not include a preview patch in the merge directive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:66
-#, fuzzy
 msgid "Show history of changes"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:67
-#, fuzzy
 msgid "Validate storage"
-msgstr "Validate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:68
-#, fuzzy
 msgid "Check the working tree related to the current directory"
-msgstr "Unpack an installed gem to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:69
-#, fuzzy
 msgid "Check the repository related to the current directory"
-msgstr "Unpack an installed gem to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:70
-#, fuzzy
 msgid "Check the branch related to the current directory"
-msgstr "Download the packages to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:71
-#, fuzzy
 msgid "Show usage message and options"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:382
-#, fuzzy
 msgid "Show help message"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:73
-#, fuzzy
 msgid "Only displays errors and warnings"
-msgstr "Downgrade some errors to warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:74
-#, fuzzy
 msgid "Display more information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:75
 msgid "Show what would be done"
@@ -11253,18 +10668,16 @@ msgid "Default port to use for HTTPS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:14
-#, fuzzy
 msgid "Process log file"
-msgstr "Process list pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:15
 msgid "Path to write pid file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:16
-#, fuzzy
 msgid "List installed plugins"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:17
 msgid "Default port"
@@ -11283,14 +10696,12 @@ msgid "Hostname for which to revoke the certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:21
-#, fuzzy
 msgid "Root path of default site"
-msgstr "Don't set default repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:22
-#, fuzzy
 msgid "Type of server to run"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:23
 msgid "Parse the Caddyfile but do not start the server"
@@ -11305,9 +10716,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/modinfo.fish:10
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:128
-#, fuzzy
 msgid "Show version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:1
 msgid "Create an assertion to prevent the display from sleeping"
@@ -11330,9 +10740,8 @@ msgid "Create an assertion to declare that user is active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:6
-#, fuzzy
 msgid "Specifies the timeout value in seconds"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:7
 msgid "Waits for the process with the specified PID to exit"
@@ -11343,29 +10752,24 @@ msgid "Cancel jobs owned by username"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:1
-#, fuzzy
 msgid "Show Help"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:3
-#, fuzzy
 msgid "Update before running"
-msgstr "Update source and rebuild"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:4
-#, fuzzy
 msgid "List feeds"
-msgstr "Lists the keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:5
-#, fuzzy
 msgid "Show number of new items"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:6
-#, fuzzy
 msgid "Show number of new items for feed"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:7
 msgid "Feed"
@@ -11384,68 +10788,56 @@ msgid "Add feed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:11
-#, fuzzy
 msgid "Set configuration directory"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:12
 #: /tmp/fish/implicit/share/completions/pine.fish:10
-#, fuzzy
 msgid "Set configuration file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:13
-#, fuzzy
 msgid "Set client log file"
-msgstr "Set tag file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:14
-#, fuzzy
 msgid "Set feed directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:15
-#, fuzzy
 msgid "Set script directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:1
 #: /tmp/fish/implicit/share/completions/light.fish:2
 #: /tmp/fish/implicit/share/completions/rustc.fish:1
-#, fuzzy
 msgid "Print version info and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:2
-#, fuzzy
 msgid "List installed commands"
-msgstr "list all “gem” commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:3
 #: /tmp/fish/implicit/share/completions/rustc.fish:2
-#, fuzzy
 msgid "Use verbose output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:4
-#, fuzzy
 msgid "No output printed to stdout"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:5
-#, fuzzy
 msgid "Don't build documentation for dependencies"
-msgstr "Don't pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:6
-#, fuzzy
 msgid "Specify a vcs to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:7
-#, fuzzy
 msgid "Opens the docs in a browser after the operation"
-msgstr "Use the given HTTP proxy for remote operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:8
 msgid "Login of a user to add as an owner"
@@ -11456,9 +10848,8 @@ msgid "Login of a user to remove as an owner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:10
-#, fuzzy
 msgid "Don't verify the contents by building them"
-msgstr "Don't verify time attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:11
 msgid "Ignore warnings about a lack of human-usable metadata"
@@ -11473,9 +10864,8 @@ msgid "Update a single dependency to exactly PRECISE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:14
-#, fuzzy
 msgid "The version to yank or un-yank"
-msgstr "Specify version of gem to unpack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:15
 msgid "Undo a yank, putting a version back into the index"
@@ -11498,29 +10888,25 @@ msgid "Path or URL to SRT or VTT file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:5
-#, fuzzy
 msgid "Set subtitles font scale"
-msgstr "Subtitle file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:6
 msgid "Set subtitles font RGBA color"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:7
-#, fuzzy
 msgid "Specify port to be used for serving subtitles"
-msgstr "Specify the register to be used for PIC addressing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:8
-#, fuzzy
 msgid "Set local IP"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:9
 #: /tmp/fish/implicit/share/completions/pv.fish:12
-#, fuzzy
 msgid "No output"
-msgstr "Video output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:10
 msgid "Explicitly set the mime-type"
@@ -11544,39 +10930,32 @@ msgid "Play in random order"
 msgstr "Play in random order"
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:15
-#, fuzzy
 msgid "List all files in directories recursively"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:16
-#, fuzzy
 msgid "Set at which the volume changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:17
-#, fuzzy
 msgid "Specify port to be used for serving local file"
-msgstr "Specify the register to be used for PIC addressing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:18
-#, fuzzy
 msgid "Specify port to be used for serving transcoded file"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:19
-#, fuzzy
 msgid "Specify port to be used for serving torrented file"
-msgstr "Specify the register to be used for PIC addressing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:20
-#, fuzzy
 msgid "Specify port to be used for serving file read from stdin"
-msgstr "Specify the register to be used for PIC addressing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:21
-#, fuzzy
 msgid "Execute key command(s)"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:22
 msgid "Exit when playback begins or --command completes"
@@ -11638,9 +11017,8 @@ msgid "Set TAO (Track At Once) writing mode"
 msgstr "Set TAO (Track At Once) writing mode"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:14
-#, fuzzy
 msgid "Set RAW writing mode"
-msgstr "Set TAO (Track At Once) writing mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:15
 msgid "Select Set RAW writing, the preferred raw writing mode"
@@ -11693,9 +11071,8 @@ msgstr ""
 "the SCSI driver"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:25
-#, fuzzy
 msgid "Load the media and exit"
-msgstr "Load the media, lock the door and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:26
 msgid "Load the media, lock the door and exit"
@@ -11742,9 +11119,8 @@ msgid "Allows the user to manually select a driver for the device"
 msgstr "Allows the user to manually select a driver for the device"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-#, fuzzy
 msgid "Set driver specific options"
-msgstr "Edit command specific completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
 msgid ""
@@ -11973,9 +11349,8 @@ msgstr "Output diagnostic for changed files"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:2
 #: /tmp/fish/implicit/share/completions/chown.fish:2
-#, fuzzy
 msgid "Dereference symbolic links"
-msgstr "Dereferense symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:3
 #: /tmp/fish/implicit/share/completions/chown.fish:3
@@ -11989,9 +11364,8 @@ msgstr "Change from owner/group"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:5
 #: /tmp/fish/implicit/share/completions/chown.fish:5
-#, fuzzy
 msgid "Suppress errors"
-msgstr "Supress errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:6
 #: /tmp/fish/implicit/share/completions/chown.fish:6
@@ -12018,29 +11392,25 @@ msgid "Do not treat / specially (the default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:3
-#, fuzzy
 msgid "Fail to operate recursively on /"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:4
 #: /tmp/fish/implicit/share/completions/readlink.fish:5
-#, fuzzy
 msgid "Suppress most error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:5
-#, fuzzy
 msgid "Output a diagnostic for every file processed"
-msgstr "Output diagnostic for every file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:6
 msgid "Use RFILEs mode instead of MODE values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:7
-#, fuzzy
 msgid "Change files and directories recursively"
-msgstr "Read files under each directory, recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chown.fish:11
 #: /tmp/fish/implicit/share/completions/chown.fish:12
@@ -12049,34 +11419,28 @@ msgid "Username"
 msgstr "Username"
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
-#, fuzzy
 msgid "Specify your login shell"
-msgstr "Specify log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:2
-#, fuzzy
 msgid "Display help and exit\t"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:4
-#, fuzzy
 msgid "List available shells and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:2
-#, fuzzy
 msgid "Update your climate install"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:3
-#, fuzzy
 msgid "uninstall climate"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:4
-#, fuzzy
 msgid "Show climate version"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:5
 msgid "Get the weather"
@@ -12084,23 +11448,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:6
 #: /tmp/fish/implicit/share/completions/climate.fish:7
-#, fuzzy
 msgid "Display remaining battery"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:8
 msgid "Lock computer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:9
-#, fuzzy
 msgid "Shutdown the computer"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:10
-#, fuzzy
 msgid "Restart the computer"
-msgstr "Set start chapter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:12
 msgid "Put a console clock in the top right corner"
@@ -12115,68 +11476,56 @@ msgid "A stopwatch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:15
-#, fuzzy
 msgid "Pipe output to ix.io"
-msgstr "Append output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:16
-#, fuzzy
 msgid "Find the biggest files recursively"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:17
-#, fuzzy
 msgid "Find the biggest directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:18
-#, fuzzy
 msgid "Find directory size"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:19
-#, fuzzy
 msgid "Remove empty directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:20
-#, fuzzy
 msgid "Extract any given archive"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:21
-#, fuzzy
 msgid "Report duplicate files in a directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:22
-#, fuzzy
 msgid "Count the number of occurences"
-msgstr "Print number of occurences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:23
-#, fuzzy
 msgid "Monitor file for changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:24
-#, fuzzy
 msgid "Search for the given pattern recursively"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:25
-#, fuzzy
 msgid "Replace all occurences"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:26
 msgid "Create a ramfs of size (in MB) at path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:27
-#, fuzzy
 msgid "Test your network speed"
-msgstr "Tags you want to see"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:28
 msgid "Retrieve your local ip address"
@@ -12191,52 +11540,44 @@ msgid "Retrieve your public ip address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:31
-#, fuzzy
 msgid "List open ports"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:32
-#, fuzzy
 msgid "Edit the hosts file"
-msgstr "Write to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:33
-#, fuzzy
 msgid "http-server serving the current directory"
-msgstr "Extract files to current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:34
 msgid "Determine if server is up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:35
-#, fuzzy
 msgid "Download file from server"
-msgstr "Edit files on Vim server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:36
-#, fuzzy
 msgid "Download dir from server"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:37
-#, fuzzy
 msgid "Upload to server"
-msgstr "Use proxy server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:38
-#, fuzzy
 msgid "Mount a remote path"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:39
 msgid "Unmount a ssh mount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:40
-#, fuzzy
 msgid "Undo the latest commit"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:41
 msgid "Reset local repo to match remote"
@@ -12247,28 +11588,24 @@ msgid "Seset local repo to match remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:43
-#, fuzzy
 msgid "List all branches"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:44
-#, fuzzy
 msgid "Calculate the repo size"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:45
 msgid "Calculate total contribution for a user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:46
-#, fuzzy
 msgid "Display a performance overview"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:47
-#, fuzzy
 msgid "Find memory used"
-msgstr "Reduce memory usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:48
 msgid "Find disk used"
@@ -12283,18 +11620,16 @@ msgid "Find the trash size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:51
-#, fuzzy
 msgid "Empty the trash"
-msgstr "Exit the shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:1
 msgid "Combine sets of lines from two files using boolean operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:2
-#, fuzzy
 msgid "Output lines that are in both files"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:3
 msgid "Output lines that are inf file1 but not in file2"
@@ -12309,9 +11644,8 @@ msgid "Output lines that are in either file1 or file2, but not in both files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:6
-#, fuzzy
 msgid "Read file from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/command.fish:2
 msgid "Print the file that would be executed"
@@ -12362,33 +11696,28 @@ msgid "Inject readline functions to reader"
 msgstr "Inject readline functions to reader"
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:11
-#, fuzzy
 msgid "Print each token on a separate line"
-msgstr "Print length of longest line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:12
-#, fuzzy
 msgid "Specify command to operate on"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:13
 msgid "Set/get cursor position, not buffer contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:14
-#, fuzzy
 msgid "Print the line that the cursor is on"
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:15
-#, fuzzy
 msgid "Return true if performing a history search"
-msgstr "Return true if array contains a sequence"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:16
-#, fuzzy
 msgid "Return true if showing pager content"
-msgstr "Return true if array contains a sequence"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:5
 #: /tmp/fish/implicit/share/completions/convert.fish:17
@@ -12439,9 +11768,8 @@ msgid "Measure differences between images with this metric [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:23
-#, fuzzy
 msgid "Get the passphrase from this file [filename]"
-msgstr "Read passphrase from specified file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:24
 #: /tmp/fish/implicit/share/completions/display.fish:32
@@ -12460,9 +11788,8 @@ msgid "JPEG/MIFF/PNG compression level [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:34
-#, fuzzy
 msgid "Search for subimage"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:36
 #: /tmp/fish/implicit/share/completions/composite.fish:74
@@ -12480,9 +11807,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/scanimage.fish:34
 #: /tmp/fish/implicit/share/completions/stream.fish:33
 #: /tmp/fish/implicit/share/completions/terraform.fish:1
-#, fuzzy
 msgid "Print version information"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:44
 #: /tmp/fish/implicit/share/completions/composite.fish:39
@@ -12501,14 +11827,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:73
 #: /tmp/fish/implicit/share/completions/montage.fish:59
 #: /tmp/fish/implicit/share/completions/stream.fish:25
-#, fuzzy
 msgid "Declare the image as modified"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:1
-#, fuzzy
 msgid "Command to add completion to"
-msgstr "Path to add completion to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:2
 msgid "Path to add completion to"
@@ -12551,14 +11875,12 @@ msgid "Option list is not complete"
 msgstr "Option list is not complete"
 
 #: /tmp/fish/implicit/share/completions/complete.fish:12
-#, fuzzy
 msgid "Remove completion"
-msgstr "Remove property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:14
-#, fuzzy
 msgid "Print all completions for the specified commandline"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:15
 msgid ""
@@ -12569,24 +11891,20 @@ msgstr ""
 "status"
 
 #: /tmp/fish/implicit/share/completions/complete.fish:16
-#, fuzzy
 msgid "Inherit completions from the specified command"
-msgstr "Pipe output through specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:1
-#, fuzzy
 msgid "User script"
-msgstr "Loop script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:2
-#, fuzzy
 msgid "Short information about Composer"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:3
-#, fuzzy
 msgid "Create an archive of this composer package"
-msgstr "Reinstall each of the named packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:4
 #: /tmp/fish/implicit/share/completions/composer.fish:15
@@ -12599,14 +11917,12 @@ msgid "Clears composer's internal package cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:8
-#, fuzzy
 msgid "Create new project from a package into given directory."
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:9
-#, fuzzy
 msgid "Shows which packages depend on the given package"
-msgstr "list all packages depending on specified package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:10
 msgid "Diagnoses the system to identify common errors."
@@ -12614,9 +11930,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:11
 #: /tmp/fish/implicit/share/completions/composer.fish:12
-#, fuzzy
 msgid "Dumps the autoloader"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:13
 #, sh-format
@@ -12624,14 +11939,12 @@ msgid "Allows running commands in the global composer dir ($COMPOSER_HOME)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:14
-#, fuzzy
 msgid "Displays help for a command"
-msgstr "Display help about darcs and darcs commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:16
-#, fuzzy
 msgid "Creates a basic composer.json file in current directory."
-msgstr "Generate a simple Gemfile, placed in the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:17
 msgid ""
@@ -12640,19 +11953,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:18
-#, fuzzy
 msgid "Show information about licenses of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:19
-#, fuzzy
 msgid "Lists commands"
-msgstr "Process command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:20
-#, fuzzy
 msgid "Removes a package from the require or require-dev"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:21
 msgid "Adds required packages to your composer.json and installs them"
@@ -12664,25 +11974,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:23
 #: /tmp/fish/implicit/share/completions/npm.fish:34
-#, fuzzy
 msgid "Search for packages"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:24
 #: /tmp/fish/implicit/share/completions/composer.fish:25
-#, fuzzy
 msgid "Updates composer.phar to the latest version."
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:26
-#, fuzzy
 msgid "Show information about packages"
-msgstr "Show full information for specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:27
-#, fuzzy
 msgid "Show a list of locally modified packages"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:28
 msgid ""
@@ -12707,9 +12013,8 @@ msgid "Displays composer's help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:33
-#, fuzzy
 msgid "Do not output any message."
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:34
 msgid ""
@@ -12718,9 +12023,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:35
-#, fuzzy
 msgid "Display composer's application version."
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:36
 msgid "Force ANSI output."
@@ -12731,14 +12035,12 @@ msgid "Disable ANSI output."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:38
-#, fuzzy
 msgid "Do not ask any interactive question."
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:39
-#, fuzzy
 msgid "Display timing and memory usage information."
-msgstr "Display RubyGems environmental information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:40
 msgid "If specified, use the given directory as working directory."
@@ -12764,15 +12066,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:5
 #: /tmp/fish/implicit/share/completions/mogrify.fish:15
 #: /tmp/fish/implicit/share/completions/montage.fish:11
-#, fuzzy
 msgid "Annotate image with comment [string]"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:12
-#, fuzzy
 msgid "Composite operator [operator]"
-msgstr "Complete Convert options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:13
 #: /tmp/fish/implicit/share/completions/convert.fish:24
@@ -12829,9 +12129,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:30
 #: /tmp/fish/implicit/share/completions/mogrify.fish:57
 #: /tmp/fish/implicit/share/completions/montage.fish:43
-#, fuzzy
 msgid "Font point size [value]"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:32
 #: /tmp/fish/implicit/share/completions/convert.fish:57
@@ -12844,9 +12143,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:62
 #: /tmp/fish/implicit/share/completions/import.fish:36
 #: /tmp/fish/implicit/share/completions/mogrify.fish:64
-#, fuzzy
 msgid "Image scene number [value]"
-msgstr "Compare general numeric value"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:43
 msgid "Repeat composite operation across and down image"
@@ -12961,9 +12259,8 @@ msgid "Do not create output files"
 msgstr "Do not create output files"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:7
-#, fuzzy
 msgid "Set source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:8
 msgid "Architecture-independent install directory"
@@ -12974,9 +12271,8 @@ msgid "Architecture-dependent install directory"
 msgstr "Architecture-dependent install directory"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:10
-#, fuzzy
 msgid "Configure for building on BUILD"
-msgstr "Configure for building compilers for TARGET"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:11
 msgid "Cross-compile to build programs to run on HOST"
@@ -12991,9 +12287,8 @@ msgid "Shows if the system is online or offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:2
-#, fuzzy
 msgid "Display technologies"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:3
 msgid "Get System Clock Properties"
@@ -13004,57 +12299,48 @@ msgid "Enables given technology or offline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:5
-#, fuzzy
 msgid "Disables given technology or offline mode"
-msgstr "Disable import of site module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:6
 msgid "Enable, disable tethering, set SSID and passphrase for wifi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:7
-#, fuzzy
 msgid "Display services"
-msgstr "Display security context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:8
-#, fuzzy
 msgid "Display peers"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:9
 msgid "Scans for new services for given technology"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:10
-#, fuzzy
 msgid "Connect a given service or peer"
-msgstr "Connect to the given user's DCOP server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:11
-#, fuzzy
 msgid "Disconnect a given service or peer"
-msgstr "Connect to the given user's DCOP server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:12
-#, fuzzy
 msgid "Set service configuration options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:13
-#, fuzzy
 msgid "Monitor signals from interfaces"
-msgstr "Do not use X interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:14
-#, fuzzy
 msgid "Display VPN connections"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:15
-#, fuzzy
 msgid "Enable or disable a session"
-msgstr "available sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:16
 msgid "(Un)Register a Peer Service"
@@ -13084,9 +12370,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:7
 #: /tmp/fish/implicit/share/completions/mogrify.fish:5
-#, fuzzy
 msgid "Background color [color]"
-msgstr "Change background color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:8
 #: /tmp/fish/implicit/share/completions/mogrify.fish:6
@@ -13168,14 +12453,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:51
 #: /tmp/fish/implicit/share/completions/identify.fish:18
 #: /tmp/fish/implicit/share/completions/mogrify.fish:56
-#, fuzzy
 msgid "Efficiently determine image attributes"
-msgstr "Exclude extra file attributes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:53
-#, fuzzy
 msgid "Maximum number of significant digits to print [value]"
-msgstr "Maximum number of connections to allow"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:54
 #: /tmp/fish/implicit/share/completions/mogrify.fish:58
@@ -13343,39 +12626,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
-#, fuzzy
 msgid "Specify eye string"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:2
 #: /tmp/fish/implicit/share/completions/cowthink.fish:2
-#, fuzzy
 msgid "Specify cow file"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:4
 #: /tmp/fish/implicit/share/completions/cowthink.fish:4
-#, fuzzy
 msgid "List all cowfiles"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:5
 #: /tmp/fish/implicit/share/completions/cowthink.fish:5
-#, fuzzy
 msgid "No word wrapping"
-msgstr "Flood ping"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:6
 #: /tmp/fish/implicit/share/completions/cowthink.fish:6
-#, fuzzy
 msgid "Specify tounge string"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:7
 #: /tmp/fish/implicit/share/completions/cowthink.fish:7
-#, fuzzy
 msgid "Column width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:8
 #: /tmp/fish/implicit/share/completions/cowthink.fish:8
@@ -13419,9 +12696,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:1
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:1
-#, fuzzy
 msgid "Cancels all jobs on the named destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:2
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:2
@@ -13434,9 +12710,8 @@ msgid "Releases pending jobs for printing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:4
-#, fuzzy
 msgid "Disable reason"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:4
 msgid "Cancel reason"
@@ -13444,9 +12719,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsreject.fish:1
 #: /tmp/fish/implicit/share/completions/reject.fish:1
-#, fuzzy
 msgid "Reject reason"
-msgstr "Reject protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:1
 msgid "Output byte range"
@@ -13465,101 +12739,84 @@ msgid "Select fields"
 msgstr "Select fields"
 
 #: /tmp/fish/implicit/share/completions/cut.fish:5
-#, fuzzy
 msgid "Don't split multi byte characters"
-msgstr "Define token to contain these characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:6
-#, fuzzy
 msgid "Do not print lines without delimiter"
-msgstr "Do not print differences for deleted files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:7
 msgid "Select output delimiter"
 msgstr "Select output delimiter"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:1
-#, fuzzy
 msgid "Displays usage information for command."
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:2
-#, fuzzy
 msgid "Cause CVS to be really quiet."
-msgstr "Cause CVS to be really quiet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:3
-#, fuzzy
 msgid "Cause CVS to be somewhat quiet."
-msgstr "Cause CVS to be somewhat quiet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:4
-#, fuzzy
 msgid "Make checked-out files read-only."
-msgstr "Make checked-out files read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:5
-#, fuzzy
 msgid "Make checked-out files read-write (default)."
-msgstr "Make checked-out files read-write (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:6
 msgid "Do not execute anything that will change the disk."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:7
-#, fuzzy
 msgid "Show trace of program execution -- try with -n."
-msgstr "Show trace of program execution -- try with -n"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:8
 msgid "Assume repository is read-only, such as CDROM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:9
-#, fuzzy
 msgid "CVS version and copyright."
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:10
-#, fuzzy
 msgid "Use 'tmpdir' for temporary files."
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:11
-#, fuzzy
 msgid "Use 'editor' for editing log information."
-msgstr "Use editor for editing log information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:13
-#, fuzzy
 msgid "Do not use the ~/.cvsrc file."
-msgstr "Do not use the ~/.cvsrc file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:14
-#, fuzzy
 msgid "Request compression level '#' for net traffic."
-msgstr "Request compression level # for net traffic."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:15
-#, fuzzy
 msgid "Encrypt all net traffic."
-msgstr "Encrypt all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:16
-#, fuzzy
 msgid "Authenticate all net traffic."
-msgstr "Authenticate all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:17
-#, fuzzy
 msgid "Use IPv4 addresses only."
-msgstr "IPv4 addresses only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:18
-#, fuzzy
 msgid "Use IPv6 addresses only."
-msgstr "IPv6 addresses only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:19
 msgid "Set CVS user variable."
@@ -13610,32 +12867,28 @@ msgid "Import sources into CVS, using vendor branches"
 msgstr "Import sources into CVS, using vendor branches"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:31
-#, fuzzy
 msgid "Create a CVS repository if it doesn't exist"
-msgstr "Create a CVS repository if it doesn't exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:32
 msgid "Kerberos server mode"
 msgstr "Kerberos server mode"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:33
-#, fuzzy
 msgid "Print out history information for files"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:34
 msgid "Prompt for password for authenticating server"
 msgstr "Prompt for password for authenticating server"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:35
-#, fuzzy
 msgid "Removes entry in .cvspass for remote repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:36
-#, fuzzy
 msgid "List files available from CVS"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:37
 msgid "Password server mode"
@@ -13646,27 +12899,24 @@ msgid "Show last revision where each line of module was modified"
 msgstr "Show last revision where each line of module was modified"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:39
-#, fuzzy
 msgid "Create 'patch' format diffs between releases"
-msgstr "Create patch format diffs between releases"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:40
 msgid "Indicate that a Module is no longer in use"
 msgstr "Indicate that a Module is no longer in use"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:41
-#, fuzzy
 msgid "Remove an entry from the repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:42
 msgid "Print out history information for a module"
 msgstr "Print out history information for a module"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:43
-#, fuzzy
 msgid "List files in a module"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:44
 msgid "Add a symbolic tag to a module"
@@ -13685,23 +12935,20 @@ msgid "Add a symbolic tag to checked out version of files"
 msgstr "Add a symbolic tag to checked out version of files"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
-#, fuzzy
 msgid "Undo an edit command"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:49
 msgid "Bring work tree in sync with repository"
 msgstr "Bring work tree in sync with repository"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:50
-#, fuzzy
 msgid "Show current CVS version(s)"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:51
-#, fuzzy
 msgid "Set watches"
-msgstr "Set arch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:52
 msgid "See who is watching a file"
@@ -13720,9 +12967,8 @@ msgid "Append (comma-separated) user names to access list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:56
-#, fuzzy
 msgid "Append another file's access list."
-msgstr "Append new files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:57
 msgid "[rev]    Set default branch (highest branch on trunk if omitted)."
@@ -13737,9 +12983,8 @@ msgid "[users]  Remove (comma-separated) user names from access list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:60
-#, fuzzy
 msgid "Run interactively."
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
 msgid "Set keyword substitution mode:"
@@ -13754,9 +12999,8 @@ msgid "Set strict locking."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:64
-#, fuzzy
 msgid "Replace revision's log message."
-msgstr "Replace revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:65
 msgid "Tag branch or revision.  If :rev is omitted,"
@@ -13767,28 +13011,24 @@ msgid "Same as -n except override existing tag."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:67
-#, fuzzy
 msgid "Delete (outdate) specified range of revisions:"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:68
-#, fuzzy
 msgid "Run quietly."
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:69
 msgid "Set revision state (latest revision on branch,"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:70
-#, fuzzy
 msgid "[file]   Get descriptive text from file (stdin if omitted)."
-msgstr "Write descriptive text from a file into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:71
-#, fuzzy
 msgid "-string  Set descriptive text."
-msgstr "Write descriptive text into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:72
 msgid "[rev]    Unlock the revision (latest revision on branch,"
@@ -13817,9 +13057,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:259
 #: /tmp/fish/implicit/share/completions/cvs.fish:267
 #: /tmp/fish/implicit/share/completions/cvs.fish:278
-#, fuzzy
 msgid "Process directories recursively."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:76
 #: /tmp/fish/implicit/share/completions/cvs.fish:205
@@ -13828,27 +13067,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:77
 #: /tmp/fish/implicit/share/completions/cvs.fish:206
-#, fuzzy
 msgid "Annotate binary files."
-msgstr "Annotate binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:78
 #: /tmp/fish/implicit/share/completions/cvs.fish:207
-#, fuzzy
 msgid "Annotate file as of specified revision/tag."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:79
 #: /tmp/fish/implicit/share/completions/cvs.fish:208
-#, fuzzy
 msgid "Annotate file as of specified date."
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:80
 #: /tmp/fish/implicit/share/completions/cvs.fish:272
-#, fuzzy
 msgid "Reset any sticky tags/date/kopts."
-msgstr "Reset sticky tags/dates/k-opts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:81
 #: /tmp/fish/implicit/share/completions/cvs.fish:148
@@ -13859,9 +13094,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:198
 #: /tmp/fish/implicit/share/completions/cvs.fish:241
 #: /tmp/fish/implicit/share/completions/cvs.fish:273
-#, fuzzy
 msgid "Prune empty directories."
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:84
 msgid "\"cat\" the module database."
@@ -13880,9 +13114,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:102
 #: /tmp/fish/implicit/share/completions/cvs.fish:150
 #: /tmp/fish/implicit/share/completions/cvs.fish:211
-#, fuzzy
 msgid "Local directory only, not recursive"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:87
 #: /tmp/fish/implicit/share/completions/cvs.fish:152
@@ -13924,9 +13157,8 @@ msgid "Check for valid edits before committing."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:97
-#, fuzzy
 msgid "Local directory only (not recursive)."
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:98
 msgid "Force the file to be committed; disables recursion."
@@ -13971,46 +13203,38 @@ msgid "--ignore-case  Consider upper- and lower-case to be the same."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:110
-#, fuzzy
 msgid "--ignore-all-space  Ignore all white space."
-msgstr "Ignore all white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:111
-#, fuzzy
 msgid "--ignore-space-change  Ignore changes in the amount of white space."
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:112
-#, fuzzy
 msgid "--ignore-blank-lines  Ignore changes whose lines are all blank."
-msgstr "Ignore changes whose lines match the REGEX"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:113
-#, fuzzy
 msgid "--ignore-matching-lines=RE  Ignore changes whose lines all match RE."
-msgstr "Ignore changes whose lines match the REGEX"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:114
-#, fuzzy
 msgid "Binary  Read and write data in binary mode."
-msgstr "Read and write all files in binary mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:115
-#, fuzzy
 msgid "--text  Treat all files as text."
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:116
-#, fuzzy
 msgid ""
 "-C NUM  --context[=NUM]  Output NUM (default 2) lines of copied context."
-msgstr "Output NUM lines of copied context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:117
-#, fuzzy
 msgid ""
 "-U NUM  --unified[=NUM]  Output NUM (default 2) lines of unified context."
-msgstr "Output NUM lines of unified context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:118
 msgid "UM  Use NUM context lines."
@@ -14021,37 +13245,32 @@ msgid "--label LABEL  Use LABEL instead of file name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:120
-#, fuzzy
 msgid "--show-c-function  Show which C function each change is in."
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:121
 msgid "--show-function-line=RE  Show the most recent line matching RE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:122
-#, fuzzy
 msgid "Brief  Output only whether files differ."
-msgstr "Output only whether the files differ"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:123
-#, fuzzy
 msgid "--ed  Output an ed script."
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:124
 msgid "--forward-ed  Output something like an ed script in forward order."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:125
-#, fuzzy
 msgid "--rcs  Output an RCS format diff."
-msgstr "Output a normal diff"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:126
-#, fuzzy
 msgid "--side-by-side  Output in two columns."
-msgstr "Output in two columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:127
 msgid "--width=NUM  Output at most NUM (default 130) characters per line."
@@ -14080,18 +13299,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:134
-#, fuzzy
 msgid "--expand-tabs  Expand tabs to spaces in output."
-msgstr "Expand tabs to spaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:135
 msgid "--initial-tab  Make tabs line up by prepending a tab."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:136
-#, fuzzy
 msgid "--new-file  Treat absent files as empty."
-msgstr "Treat absent files as empty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:137
 msgid "--report-identical-files  Report when two files are the same."
@@ -14102,9 +13319,8 @@ msgid "Horizon-lines=NUM  Keep NUM lines of the common prefix and suffix."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:139
-#, fuzzy
 msgid "--minimal  Try hard to find a smaller set of changes."
-msgstr "Try to find a smaller set of changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:140
 msgid ""
@@ -14116,18 +13332,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:266
 #: /tmp/fish/implicit/share/completions/cvs.fish:270
 #: /tmp/fish/implicit/share/completions/cvs.fish:286
-#, fuzzy
 msgid "Local directory only, not recursive."
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:142
 #: /tmp/fish/implicit/share/completions/cvs.fish:147
 #: /tmp/fish/implicit/share/completions/cvs.fish:151
 #: /tmp/fish/implicit/share/completions/cvs.fish:271
 #: /tmp/fish/implicit/share/completions/cvs.fish:287
-#, fuzzy
 msgid "Process directories recursively (default)."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:143
 msgid "Specify action to register for temporary watch, one of:"
@@ -14144,9 +13358,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:146
 #: /tmp/fish/implicit/share/completions/cvs.fish:223
 #: /tmp/fish/implicit/share/completions/cvs.fish:258
-#, fuzzy
 msgid "Process this directory only (not recursive)."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:153
 msgid "Export tagged revisions."
@@ -14165,18 +13378,16 @@ msgid "Use RCS kopt -k option on checkout."
 msgstr "Use RCS kopt -k option on checkout."
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:157
-#, fuzzy
 msgid "Produce report on all TAGs"
-msgstr "Report on all tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:158
 msgid "Committed (Modified) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:159
-#, fuzzy
 msgid "Checked out modules"
-msgstr "Report on checked-out modules"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:160
 msgid "Look for specified module (repeatable)"
@@ -14199,9 +13410,8 @@ msgid "Last modified (committed or modified report)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:165
-#, fuzzy
 msgid "Working directory must match"
-msgstr "Print directory stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
 msgid "Since date (Many formats)"
@@ -14248,56 +13458,47 @@ msgid "When importing new files, mark their trunk revisions as dead."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:177
-#, fuzzy
 msgid "Set default RCS keyword substitution mode."
-msgstr "Set keyword substitution mode:"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:178
 #: /tmp/fish/implicit/share/completions/cvs.fish:284
-#, fuzzy
 msgid "More files to ignore (! to reset)."
-msgstr "Files to ignore during import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:179
-#, fuzzy
 msgid "Vendor branch id."
-msgstr "Multiple vendor branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:181
 #: /tmp/fish/implicit/share/completions/cvs.fish:285
-#, fuzzy
 msgid "Wrappers specification line."
-msgstr "Display gem specification (in yaml)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:183
 #: /tmp/fish/implicit/share/completions/cvs.fish:226
-#, fuzzy
 msgid "Only list revisions on the default branch."
-msgstr "Print info about revision on default branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:184
 #: /tmp/fish/implicit/share/completions/cvs.fish:227
-#, fuzzy
 msgid "Only print header."
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:185
 #: /tmp/fish/implicit/share/completions/cvs.fish:228
-#, fuzzy
 msgid "Only print name of RCS file."
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:186
 #: /tmp/fish/implicit/share/completions/cvs.fish:229
-#, fuzzy
 msgid "Only print header and descriptive text."
-msgstr "Write descriptive text into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:187
 #: /tmp/fish/implicit/share/completions/cvs.fish:230
-#, fuzzy
 msgid "Do not list tags."
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:188
 #: /tmp/fish/implicit/share/completions/cvs.fish:231
@@ -14311,27 +13512,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:190
 #: /tmp/fish/implicit/share/completions/cvs.fish:233
-#, fuzzy
 msgid "This option."
-msgstr "Config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:191
 #: /tmp/fish/implicit/share/completions/cvs.fish:234
-#, fuzzy
 msgid "[revisions]"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:192
 #: /tmp/fish/implicit/share/completions/cvs.fish:235
-#, fuzzy
 msgid "A semicolon-separated list of dates"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:193
 #: /tmp/fish/implicit/share/completions/cvs.fish:236
-#, fuzzy
 msgid "Only list revisions with specified states."
-msgstr "Mount partition with specified label"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:194
 #: /tmp/fish/implicit/share/completions/cvs.fish:237
@@ -14340,9 +13537,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:195
 #: /tmp/fish/implicit/share/completions/cvs.fish:238
-#, fuzzy
 msgid "Show dead revisions (with tag when specified)."
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:196
 #: /tmp/fish/implicit/share/completions/cvs.fish:239
@@ -14351,21 +13547,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:197
 #: /tmp/fish/implicit/share/completions/cvs.fish:240
-#, fuzzy
 msgid "Display all details."
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:199
 #: /tmp/fish/implicit/share/completions/cvs.fish:242
-#, fuzzy
 msgid "List recursively."
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:200
 #: /tmp/fish/implicit/share/completions/cvs.fish:243
-#, fuzzy
 msgid "Show files with revision or tag."
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:201
 #: /tmp/fish/implicit/share/completions/cvs.fish:244
@@ -14382,14 +13575,12 @@ msgid "Date [-r rev2 | -D date2] modules…"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:213
-#, fuzzy
 msgid "Context diffs (default)"
-msgstr "Use context diff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:214
-#, fuzzy
 msgid "Unidiff format."
-msgstr "Use unidiff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:215
 msgid "Short patch - one liner per file."
@@ -14400,9 +13591,8 @@ msgid "Top two diffs - last change made to the file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:217
-#, fuzzy
 msgid "Use RCS Version vers for keyword expansion."
-msgstr "Specify keyword expansion mode."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:219
 msgid "Date."
@@ -14413,14 +13603,12 @@ msgid "Revision - symbolic or numeric."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:221
-#, fuzzy
 msgid "Delete the given directory."
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
-#, fuzzy
 msgid "Delete the file before removing it."
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:245
 msgid "Clear tag from removed files that would not otherwise be tagged."
@@ -14447,15 +13635,13 @@ msgid "Move tag if it already exists."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:252
-#, fuzzy
 msgid "No execution of 'tag program'."
-msgstr "Don't run any tag programs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:254
 #: /tmp/fish/implicit/share/completions/cvs.fish:268
-#, fuzzy
 msgid "Existing revision/tag."
-msgstr "Export tagged revisions."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:255
 #: /tmp/fish/implicit/share/completions/cvs.fish:269
@@ -14467,19 +13653,16 @@ msgid "Verbose format; includes tag information for the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:262
-#, fuzzy
 msgid "Check that working files are unmodified."
-msgstr "Check out a working copy from a repository."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:274
-#, fuzzy
 msgid "Overwrite locally modified files with clean repository copies."
-msgstr "Overwrite modified files with clean copies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:275
-#, fuzzy
 msgid "Build directories, like checkout does."
-msgstr "List directories, not their content"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:279
 msgid "Send updates to standard output (avoids stickiness)."
@@ -14494,9 +13677,8 @@ msgid "Set date to update from (is sticky)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:288
-#, fuzzy
 msgid "Specify what actions, one of: "
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:1
 msgid "Build for 32-bit Cygwin"
@@ -14507,106 +13689,88 @@ msgid "Build for 64-bit Cygwin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:3
-#, fuzzy
 msgid "Enable debugging messages"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:4
-#, fuzzy
 msgid "Cygport file"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:5
-#, fuzzy
 msgid "Download all sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:6
-#, fuzzy
 msgid "Download missing sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:7
-#, fuzzy
 msgid "Prepare source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:8
-#, fuzzy
 msgid "Build software"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:9
-#, fuzzy
 msgid "Run test suite"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:10
 msgid "Install into DESTDIR and run post-installation steps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:11
-#, fuzzy
 msgid "Run post-installation steps"
-msgstr "Run unit tests prior to installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:12
-#, fuzzy
 msgid "List package files"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:13
-#, fuzzy
 msgid "List debug package files"
-msgstr "List current package locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:14
-#, fuzzy
 msgid "Show dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:15
-#, fuzzy
 msgid "Show packaging info"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:16
 msgid "Show project homepage URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:17
-#, fuzzy
 msgid "Create packages, marked as test"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:18
-#, fuzzy
 msgid "Create packages"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:19
-#, fuzzy
 msgid "Create source patches"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:20
-#, fuzzy
 msgid "Upload finished packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:21
-#, fuzzy
 msgid "Upload packages without marking !ready"
-msgstr "Add a package lock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:22
 msgid "Send announcement email"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:23
-#, fuzzy
 msgid "Delete working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:24
 msgid "Same as prep build inst pkg"
@@ -14617,9 +13781,8 @@ msgid "Darcs repo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:2
-#, fuzzy
 msgid "Set the specified option"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:3
 msgid "Display help about darcs and darcs commands"
@@ -14674,9 +13837,8 @@ msgid "Name the current repository state for future reference"
 msgstr "Name the current repository state for future reference"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:16
-#, fuzzy
 msgid "Set a preference (test, predist, boringfile or binariesfile)"
-msgstr "Set a value for a preference (test, predist, ...)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:17
 msgid "Create a diff between two versions of the repository"
@@ -14807,9 +13969,8 @@ msgid "Pass -u option to diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:418
-#, fuzzy
 msgid "Output patch in diff's dumb format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:419
 #: /tmp/fish/implicit/share/completions/darcs.fish:463
@@ -14837,9 +13998,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:421
 #: /tmp/fish/implicit/share/completions/darcs.fish:525
-#, fuzzy
 msgid "Do patch application on disk [DEFAULT]"
-msgstr "Fail on patches that create conflicts [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:422
 #: /tmp/fish/implicit/share/completions/darcs.fish:466
@@ -14859,9 +14019,8 @@ msgstr "Fail on patches that create conflicts [DEFAULT]"
 #: /tmp/fish/implicit/share/completions/darcs.fish:972
 #: /tmp/fish/implicit/share/completions/darcs.fish:990
 #: /tmp/fish/implicit/share/completions/darcs.fish:1010
-#, fuzzy
 msgid "Disable this command"
-msgstr "Help for this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:423
 #: /tmp/fish/implicit/share/completions/darcs.fish:467
@@ -14903,9 +14062,8 @@ msgstr "Shows brief description of command and its arguments"
 #: /tmp/fish/implicit/share/completions/darcs.fish:974
 #: /tmp/fish/implicit/share/completions/darcs.fish:992
 #: /tmp/fish/implicit/share/completions/darcs.fish:1012
-#, fuzzy
 msgid "Give only debug output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:425
 #: /tmp/fish/implicit/share/completions/darcs.fish:469
@@ -14925,9 +14083,8 @@ msgstr "Turn on debug output"
 #: /tmp/fish/implicit/share/completions/darcs.fish:975
 #: /tmp/fish/implicit/share/completions/darcs.fish:993
 #: /tmp/fish/implicit/share/completions/darcs.fish:1013
-#, fuzzy
 msgid "Give debug and verbose output"
-msgstr "Give human readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:426
 #: /tmp/fish/implicit/share/completions/darcs.fish:470
@@ -14968,9 +14125,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:977
 #: /tmp/fish/implicit/share/completions/darcs.fish:995
 #: /tmp/fish/implicit/share/completions/darcs.fish:1015
-#, fuzzy
 msgid "Give verbose output"
-msgstr "Neither verbose nor quiet output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:428
 #: /tmp/fish/implicit/share/completions/darcs.fish:472
@@ -15032,9 +14188,8 @@ msgstr "Neither verbose nor quiet output"
 #: /tmp/fish/implicit/share/completions/darcs.fish:980
 #: /tmp/fish/implicit/share/completions/darcs.fish:998
 #: /tmp/fish/implicit/share/completions/darcs.fish:1018
-#, fuzzy
 msgid "Provide debugging timings information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:431
 #: /tmp/fish/implicit/share/completions/darcs.fish:481
@@ -15075,9 +14230,8 @@ msgstr "Specify command to run after this darcs command"
 #: /tmp/fish/implicit/share/completions/darcs.fish:982
 #: /tmp/fish/implicit/share/completions/darcs.fish:1001
 #: /tmp/fish/implicit/share/completions/darcs.fish:1026
-#, fuzzy
 msgid "Don't run posthook command"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:433
 #: /tmp/fish/implicit/share/completions/darcs.fish:483
@@ -15160,9 +14314,8 @@ msgstr "Specify command to run before this darcs command"
 #: /tmp/fish/implicit/share/completions/darcs.fish:986
 #: /tmp/fish/implicit/share/completions/darcs.fish:1005
 #: /tmp/fish/implicit/share/completions/darcs.fish:1030
-#, fuzzy
 msgid "Don't run prehook command"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:437
 #: /tmp/fish/implicit/share/completions/darcs.fish:487
@@ -15238,9 +14391,8 @@ msgid "Return only NUMBER results"
 msgstr "Return only NUMBER results"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:451
-#, fuzzy
 msgid "Show only changes to specified files"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:452
 msgid "Show changes to all files [DEFAULT]"
@@ -15266,14 +14418,12 @@ msgid "Give human-readable output"
 msgstr "Give human-readable output"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:456
-#, fuzzy
 msgid "Number the changes"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:457
-#, fuzzy
 msgid "Output count of changes"
-msgstr "Output diagnostic for changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:458
 #: /tmp/fish/implicit/share/completions/darcs.fish:489
@@ -15281,9 +14431,8 @@ msgstr "Output diagnostic for changed files"
 #: /tmp/fish/implicit/share/completions/darcs.fish:632
 #: /tmp/fish/implicit/share/completions/darcs.fish:708
 #: /tmp/fish/implicit/share/completions/darcs.fish:761
-#, fuzzy
 msgid "Summarize changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:459
 #: /tmp/fish/implicit/share/completions/darcs.fish:490
@@ -15295,18 +14444,16 @@ msgid "Don't summarize changes"
 msgstr "Don't summarize changes"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:460
-#, fuzzy
 msgid "Show changes in reverse order"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:461
 msgid "Show changes in the usual order [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:462
-#, fuzzy
 msgid "Specify the repository URL"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:464
 #: /tmp/fish/implicit/share/completions/darcs.fish:566
@@ -15345,9 +14492,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:867
 #: /tmp/fish/implicit/share/completions/darcs.fish:902
 #: /tmp/fish/implicit/share/completions/darcs.fish:1020
-#, fuzzy
 msgid "Don't use SSH ControlMaster feature [DEFAULT]"
-msgstr "Don't use experimental date appending trick. [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:477
 #: /tmp/fish/implicit/share/completions/darcs.fish:607
@@ -15366,9 +14512,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:869
 #: /tmp/fish/implicit/share/completions/darcs.fish:904
 #: /tmp/fish/implicit/share/completions/darcs.fish:1022
-#, fuzzy
 msgid "Disable HTTP pipelining"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:479
 #: /tmp/fish/implicit/share/completions/darcs.fish:609
@@ -15377,9 +14522,8 @@ msgstr "Disable warnings"
 #: /tmp/fish/implicit/share/completions/darcs.fish:870
 #: /tmp/fish/implicit/share/completions/darcs.fish:905
 #: /tmp/fish/implicit/share/completions/darcs.fish:1023
-#, fuzzy
 msgid "Don't use patch caches"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:480
 #: /tmp/fish/implicit/share/completions/darcs.fish:610
@@ -15396,9 +14540,8 @@ msgid "Output patch in a darcs-specific format similar to diff -u"
 msgstr "Output patch in a darcs-specific format similar to diff -u"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:492
-#, fuzzy
 msgid "Output patch in darcs' usual format"
-msgstr "Output patch in a darcs-specific format similar to diff -u"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:497
 #: /tmp/fish/implicit/share/completions/darcs.fish:522
@@ -15417,9 +14560,8 @@ msgid "Specify hash of creator patch (see docs)"
 msgstr "Specify hash of creator patch (see docs)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:518
-#, fuzzy
 msgid "Name of version"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:553
 #: /tmp/fish/implicit/share/completions/darcs.fish:602
@@ -15431,9 +14573,8 @@ msgid "Make scripts executable"
 msgstr "Make scripts executable"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:568
-#, fuzzy
 msgid "Mark conflicts [DEFAULT]"
-msgstr "Mark conflicts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:569
 #: /tmp/fish/implicit/share/completions/darcs.fish:805
@@ -15442,9 +14583,8 @@ msgstr "Allow conflicts, but don't mark them"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:570
 #: /tmp/fish/implicit/share/completions/darcs.fish:807
-#, fuzzy
 msgid "Filter out any patches that would create conflicts"
-msgstr "Fail on patches that create conflicts [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:571
 #: /tmp/fish/implicit/share/completions/darcs.fish:808
@@ -15477,9 +14617,8 @@ msgstr "Don't actually take the action"
 #: /tmp/fish/implicit/share/completions/darcs.fish:626
 #: /tmp/fish/implicit/share/completions/darcs.fish:698
 #: /tmp/fish/implicit/share/completions/darcs.fish:744
-#, fuzzy
 msgid "Don't automatically fulfill dependencies"
-msgstr "Don't pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:579
 #: /tmp/fish/implicit/share/completions/darcs.fish:627
@@ -15516,19 +14655,16 @@ msgstr "Don't set default repository"
 #: /tmp/fish/implicit/share/completions/darcs.fish:584
 #: /tmp/fish/implicit/share/completions/darcs.fish:713
 #: /tmp/fish/implicit/share/completions/darcs.fish:768
-#, fuzzy
 msgid "Do not check if repositories are unrelated"
-msgstr "Do not check directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:594
-#, fuzzy
 msgid "Take intersection of all repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:595
-#, fuzzy
 msgid "Take union of all repositories [DEFAULT]"
-msgstr "Set default repository [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:596
 msgid "Take complement of repositories (in order listed)"
@@ -15539,9 +14675,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:685
 #: /tmp/fish/implicit/share/completions/darcs.fish:830
 #: /tmp/fish/implicit/share/completions/darcs.fish:952
-#, fuzzy
 msgid "Create compressed patches"
-msgstr "Don't create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:598
 #: /tmp/fish/implicit/share/completions/darcs.fish:725
@@ -15553,9 +14688,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:646
 #: /tmp/fish/implicit/share/completions/darcs.fish:828
 #: /tmp/fish/implicit/share/completions/darcs.fish:970
-#, fuzzy
 msgid "Don't trust the file modification times"
-msgstr "Don't extract modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:600
 #: /tmp/fish/implicit/share/completions/darcs.fish:647
@@ -15663,9 +14797,8 @@ msgid "Specify output filename"
 msgstr "Specify output filename"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:763
-#, fuzzy
 msgid "Edit the patch bundle description"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:767
 #: /tmp/fish/implicit/share/completions/darcs.fish:827
@@ -15677,9 +14810,8 @@ msgid "Give patch name and comment in file"
 msgstr "Give patch name and comment in file"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:779
-#, fuzzy
 msgid "Delete the logfile when done"
-msgstr "Delete all cache contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:780
 msgid "Keep the logfile when done [DEFAULT]"
@@ -15694,9 +14826,8 @@ msgid "Verify that the patch was signed by a key in PUBRING"
 msgstr "Verify that the patch was signed by a key in PUBRING"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:798
-#, fuzzy
 msgid "Verify using openSSL with authorized keys from file KEYS"
-msgstr "Verify using openSSL with authorized keys from specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:799
 msgid "Don't verify patch signature"
@@ -15723,9 +14854,8 @@ msgid "Forward unsigned messages without extra header"
 msgstr "Forward unsigned messages without extra header"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:826
-#, fuzzy
 msgid "Don't forward unsigned messages without extra header [DEFAULT]"
-msgstr "Forward unsigned messages without extra header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:842
 #: /tmp/fish/implicit/share/completions/darcs.fish:1008
@@ -15742,15 +14872,13 @@ msgid "Get patch files only as needed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:845
-#, fuzzy
 msgid "Don't save patch files in the repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:846
 #: /tmp/fish/implicit/share/completions/darcs.fish:963
-#, fuzzy
 msgid "Get a complete copy of the repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:850
 #: /tmp/fish/implicit/share/completions/darcs.fish:883
@@ -15780,14 +14908,12 @@ msgid "Minimal features. What older repos use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:937
-#, fuzzy
 msgid "Reorder the patches in the repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:938
-#, fuzzy
 msgid "Specify a sibling directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
@@ -15806,9 +14932,8 @@ msgid "Optimize hashed pristine layout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:953
-#, fuzzy
 msgid "Uncompress patches"
-msgstr "Don't create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:1
 msgid "Read the value of a key"
@@ -15823,54 +14948,46 @@ msgid "Write a new value to a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:4
-#, fuzzy
 msgid "Delete a key or an entire directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:5
 msgid "Compile a binary database from keyfiles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:6
-#, fuzzy
 msgid "Update the system dconf databases"
-msgstr "Update the RubyGems system software"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:7
-#, fuzzy
 msgid "Watch a key or directory for changes"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:8
-#, fuzzy
 msgid "Dump an entire subpath to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:9
-#, fuzzy
 msgid "Populate a subpath from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:1
 #: /tmp/fish/implicit/share/completions/emacs.fish:52
 #: /tmp/fish/implicit/share/completions/hg.fish:15
-#, fuzzy
 msgid "display help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:3
 msgid "Complete dd operands"
 msgstr "Complete dd operands"
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:1
-#, fuzzy
 msgid "Restricts preferences operations to the current logged-in host"
-msgstr "Restrict operations to the REMOTE domain"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:2
-#, fuzzy
 msgid "Restricts preferences operations to hostname"
-msgstr "Restrict operations to the REMOTE domain"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:3
 msgid "Shows defaults entire given domain"
@@ -15881,42 +14998,36 @@ msgid "Writes domain or or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:5
-#, fuzzy
 msgid "String as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:6
 msgid "Raw data bytes for given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:7
-#, fuzzy
 msgid "Integer as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:8
 msgid "Floating point number as the value for the given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:9
-#, fuzzy
 msgid "Boolean as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:10
-#, fuzzy
 msgid "Date as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:11
-#, fuzzy
 msgid "Array as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:12
-#, fuzzy
 msgid "Add new elements to the end of an array"
-msgstr "Add text to the end of the selected area"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:13
 msgid "Add a dictionary to domain"
@@ -15927,9 +15038,8 @@ msgid "Add new key/value pairs to a dictionary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:15
-#, fuzzy
 msgid "Shows the type for the given domain, key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:16
 msgid "Renames old_key to new_key"
@@ -15940,43 +15050,36 @@ msgid "Deletes domain or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:18
-#, fuzzy
 msgid "Prints the names of all domains in the users defaults system"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:19
 msgid "Searches for word in domain names, keys, and values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:20
-#, fuzzy
 msgid "Prints a list of possible command formats"
-msgstr "Print a list of documented fish commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:1
-#, fuzzy
 msgid "Include empty file systems"
-msgstr "Include empty filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:2
-#, fuzzy
 msgid "Print file system type"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:3
-#, fuzzy
 msgid "Excluded file system type"
-msgstr "Excluded filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:4
-#, fuzzy
 msgid "Show all file systems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:1
-#, fuzzy
 msgid "Background immediately"
-msgstr "Go to background immediately after startup"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:2
 msgid "Use given script"
@@ -15999,28 +15102,24 @@ msgid "Use last acquired lease if cannot obtain one even if expired"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
-#, fuzzy
 msgid "Reapply configuration for each interface"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:9
 msgid "Request DHCP server to update DNS using FQDN instead of hostname"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:10
-#, fuzzy
 msgid "Specify config to load instead of /etc/dhcpcd.conf"
-msgstr "Specify an initialization file to read instead of ~/.muttrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:11
-#, fuzzy
 msgid "Send hostname to DHCP server"
-msgstr "Send keys to Vim server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:12
 msgid "Send given clientid"
@@ -16031,9 +15130,8 @@ msgid "Override DHCPv4 vendorclassid field sent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:14
-#, fuzzy
 msgid "Writes to specfied log file instead of syslog"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:15
 msgid "Release lease and de-configure interface"
@@ -16044,33 +15142,28 @@ msgid "Request specific lease time in secs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:17
-#, fuzzy
 msgid "Start dhcpcd in Master mode"
-msgstr "Start in easy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:18
 msgid "Set prefered interface based on given rank (lowest wins)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:19
-#, fuzzy
 msgid "Reload config and rebind specified interface"
-msgstr "Set source address to specified interface address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:20
-#, fuzzy
 msgid "Renew existing addresses on specified interface"
-msgstr "Set source address to specified interface address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:21
-#, fuzzy
 msgid "Request DHCP option"
-msgstr "Requests per pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:22
-#, fuzzy
 msgid "Keep configuration even when dhcpcd exits"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:23
 msgid "Request given address in DHCP DISCOVER message"
@@ -16081,19 +15174,16 @@ msgid "Request given address in DHCP INFORM message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:25
-#, fuzzy
 msgid "Perform DHCPv6 Information Request"
-msgstr "Information request"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:26
-#, fuzzy
 msgid "Configure static DHCP value"
-msgstr "Configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:27
-#, fuzzy
 msgid "Timeout after seconds"
-msgstr "Timeout for retrieving selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:28
 msgid "Tag DHCPv4 message with given userclass"
@@ -16108,9 +15198,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/htop.fish:8
 #: /tmp/fish/implicit/share/completions/pv.fish:33
 #: /tmp/fish/implicit/share/completions/subl.fish:9
-#, fuzzy
 msgid "Show version and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:31
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:32
@@ -16208,9 +15297,8 @@ msgid "Try to find a smaller set of changes"
 msgstr "Try to find a smaller set of changes"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:21
-#, fuzzy
 msgid "Compare FILE1 to all operands"
-msgstr "Compare FILE2 to all operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:22
 msgid "Compare FILE2 to all operands"
@@ -16237,43 +15325,36 @@ msgid "Bind to source address/port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:5
-#, fuzzy
 msgid "Specify batch mode file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:6
-#, fuzzy
 msgid "Specify query class"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:7
-#, fuzzy
 msgid "Specify TSIG key file"
-msgstr "Specify makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:8
 msgid "specify named base64 TSIG key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:9
-#, fuzzy
 msgid "Specify port number"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:10
-#, fuzzy
 msgid "Specify query name"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:11
-#, fuzzy
 msgid "Specify query type"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:12
-#, fuzzy
 msgid "Reverse lookup"
-msgstr "Reverse sort order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:13
 #: /tmp/fish/implicit/share/completions/killall.fish:10
@@ -16281,17 +15362,15 @@ msgstr "Reverse sort order"
 #: /tmp/fish/implicit/share/completions/lsof.fish:1
 #: /tmp/fish/implicit/share/completions/lua.fish:5
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:1
-#, fuzzy
 msgid "Print help and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:14
 #: /tmp/fish/implicit/share/completions/feh.fish:55
 #: /tmp/fish/implicit/share/completions/fuser.fish:12
 #: /tmp/fish/implicit/share/completions/tree.fish:43
-#, fuzzy
 msgid "Print version and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:15
 msgid "TCP mode"
@@ -16314,9 +15393,8 @@ msgid "Deprecated, treated as a synonym for +[no]search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:20
-#, fuzzy
 msgid "Recursive mode"
-msgstr "Secure mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:21
 msgid "Dont revert to TCP for TC responses."
@@ -16359,9 +15437,8 @@ msgid "Control display of question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:31
-#, fuzzy
 msgid "Control display of answer"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:32
 msgid "Control display of authority"
@@ -16388,14 +15465,12 @@ msgid "Set or clear all display flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:38
-#, fuzzy
 msgid "Print question before sending"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:39
-#, fuzzy
 msgid "Search all authoritative nameservers"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:40
 msgid "ID responders in short answers"
@@ -16406,9 +15481,8 @@ msgid "Trace delegation down from root"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:42
-#, fuzzy
 msgid "Request DNSSEC records"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:43
 msgid "Request Name Server ID"
@@ -16423,19 +15497,16 @@ msgid "AXFR prints only one soa record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:46
-#, fuzzy
 msgid "Set number of UDP attempts"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:47
-#, fuzzy
 msgid "Set number of UDP retries"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:48
-#, fuzzy
 msgid "Set query timeout"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:49
 msgid "Set EDNS0 Max UDP packet size"
@@ -16446,9 +15517,8 @@ msgid "Set NDOTS value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:51
-#, fuzzy
 msgid "Set EDNS version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:1
 msgid "List disks"
@@ -16457,27 +15527,24 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/diskutil.fish:2
 #: /tmp/fish/implicit/share/completions/diskutil.fish:4
 #: /tmp/fish/implicit/share/completions/diskutil.fish:8
-#, fuzzy
 msgid "Return a property list"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:3
 msgid "Get detailed information about a specific whole disk or partition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:5
-#, fuzzy
 msgid "Process all disks"
-msgstr "Process all packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:6
 msgid "Continuously display system-wide disk manipulation activity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:7
-#, fuzzy
 msgid "Show the file system personalities available"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:9
 msgid "Unmount a single volume"
@@ -16496,18 +15563,16 @@ msgid "Mount a single volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:13
-#, fuzzy
 msgid "Specify mount point"
-msgstr "Specify a non-mountpoint dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:14
 msgid "Mount an entire disk (all mountable volumes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:15
-#, fuzzy
 msgid "Rename a volume"
-msgstr "Rename module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:16
 msgid "Enable journaling on an HFS+ volume"
@@ -16526,9 +15591,8 @@ msgid "Enable ownership of a volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:20
-#, fuzzy
 msgid "Disable ownership of a volume"
-msgstr "Disable import of site module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:21
 msgid "Verify the file system data structures of a volume"
@@ -16547,9 +15611,8 @@ msgid "Repair the partition map layout of a whole disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:25
-#, fuzzy
 msgid "Erase an existing disk"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:26
 msgid "Write out a new empty file system volume"
@@ -16623,15 +15686,13 @@ msgid "Exit program when this window id is destroyed [id]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:53
-#, fuzzy
 msgid "Write image to a file [filename]"
-msgstr "Write size for all files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:54
 #: /tmp/fish/implicit/share/completions/montage.fish:72
-#, fuzzy
 msgid "Automagically orient image"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:62
 msgid "Straighten an image [threshold]"
@@ -16660,9 +15721,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:69
 #: /tmp/fish/implicit/share/completions/montage.fish:79
-#, fuzzy
 msgid "Flop image in the horizontal direction"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:70
 #: /tmp/fish/implicit/share/completions/montage.fish:80
@@ -16698,14 +15758,12 @@ msgid "Threshold the image [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:1
-#, fuzzy
 msgid "ls -ldF all files in the package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:2
-#, fuzzy
 msgid "du -sck all files in the package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:1
 msgid "Clear the kernel ring buffer"
@@ -16728,14 +15786,12 @@ msgid "Enable printing messages to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:6
-#, fuzzy
 msgid "Use the file instead of the kernel log buffer"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:7
-#, fuzzy
 msgid "Restrict output to defined facilities"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:8
 #: /tmp/fish/implicit/share/completions/m4.fish:1
@@ -16743,124 +15799,104 @@ msgstr "Write output to specified file"
 #: /tmp/fish/implicit/share/completions/timeout.fish:4
 #: /tmp/fish/implicit/share/completions/watch.fish:11
 #: /tmp/fish/implicit/share/completions/xgettext.fish:38
-#, fuzzy
 msgid "Display this help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:9
-#, fuzzy
 msgid "Display kernel messages"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:10
-#, fuzzy
 msgid "Restrict output to defined levels"
-msgstr "Redirect output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:11
 msgid "Set level of messages printed to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:12
-#, fuzzy
 msgid "Print the raw message buffer"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:13
 msgid "Buffer size to query the kernel ring buffer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:14
-#, fuzzy
 msgid "Show human readable timestamp "
-msgstr "Human readable sizes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:15
 msgid "Don't print messages timestamp"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:16
-#, fuzzy
 msgid "Display userspace messages"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:18
 msgid "Decode facility and level to readable string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:1
-#, fuzzy
 msgid "Install .deb package"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:2
-#, fuzzy
 msgid "Unpack .deb package"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:3
-#, fuzzy
 msgid "Configure package"
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:4
-#, fuzzy
 msgid "Remove package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:5
-#, fuzzy
 msgid "Purge package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:6
-#, fuzzy
 msgid "Verify contents of package"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:7
 msgid "Continue on all problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:8
-#, fuzzy
 msgid "Build package from directory"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:9
-#, fuzzy
 msgid "List contents of .deb"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:10
-#, fuzzy
 msgid "Show .deb information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:11
-#, fuzzy
 msgid "List packages matching pattern"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:12
-#, fuzzy
 msgid "List contents of packages"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:13
-#, fuzzy
 msgid "Print status of package"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:14
-#, fuzzy
 msgid "Search for packages containing file"
-msgstr "Search for packages containing listed words"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:3
-#, fuzzy
 msgid "Set configuration frontend"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:4
 msgid "Set priority threshold"
@@ -16875,24 +15911,20 @@ msgid "Show only unseen question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:7
-#, fuzzy
 msgid "Reconfigure also inconsistent packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:8
-#, fuzzy
 msgid "Prevent reloading templates"
-msgstr "Prepend string to relative links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:1
-#, fuzzy
 msgid "Get current status of the dropboxd"
-msgstr "Negate exit status of job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:2
-#, fuzzy
 msgid "Provide help"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:3
 msgid "Return 1 if dropbox is running"
@@ -16919,14 +15951,12 @@ msgid "Get current sync status of one or more files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:9
-#, fuzzy
 msgid "List directory contents with current sync status"
-msgstr "List directory entries in the repository."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:10
-#, fuzzy
 msgid "Ignores/excludes a directory from syncing"
-msgstr "Ignore specified number of directory components"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:11
 msgid "Enables or disables LAN sync"
@@ -16943,24 +15973,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:14
-#, fuzzy
 msgid "Do not ignore entries starting with ."
-msgstr "Ignore files ending with ~"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:15
-#, fuzzy
 msgid "Prints a list of directories currently excluded from syncing"
-msgstr "Print a list of documented fish commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:16
-#, fuzzy
 msgid "Adds one or more directories to the exclusion list"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:17
-#, fuzzy
 msgid "Removes one or more directories from the exclusion list"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:1
 msgid "Write size for all files"
@@ -17019,9 +16045,8 @@ msgid "Display only a total for each argument"
 msgstr "Display only a total for each argument"
 
 #: /tmp/fish/implicit/share/completions/du.fish:14
-#, fuzzy
 msgid "Skip other file systems"
-msgstr "Skip other filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:15
 msgid "Exclude files that match pattern in file"
@@ -17061,14 +16086,12 @@ msgid "Backup without executing pre/post scripts"
 msgstr "Backup without executing pre/post scripts"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:6
-#, fuzzy
 msgid "Execute <profile>/pre script"
-msgstr "Don't execute pre scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:7
-#, fuzzy
 msgid "Execute <profile>/post script"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:8
 msgid "Force full backup"
@@ -17119,9 +16142,8 @@ msgid "Do nothing but print out generated duplicity command lines"
 msgstr "Do nothing but print out generated duplicity command lines"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:20
-#, fuzzy
 msgid "Calculate what would be done, but don"
-msgstr "Calculate what would be done, but dont perform any actions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:21
 #: /tmp/fish/implicit/share/completions/md5sum.fish:5
@@ -17134,68 +16156,56 @@ msgid "Output verbosity level"
 msgstr "Output verbosity level"
 
 #: /tmp/fish/implicit/share/completions/echo.fish:1
-#, fuzzy
 msgid "Do not output a newline"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:2
-#, fuzzy
 msgid "Do not separate arguments with spaces"
-msgstr "Do not export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:3
-#, fuzzy
 msgid "Disable backslash escapes"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:4
-#, fuzzy
 msgid "Enable backslash escapes"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:1
-#, fuzzy
 msgid "Show a help screen and exit"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:3
-#, fuzzy
 msgid "Dump variables to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:4
-#, fuzzy
 msgid "Dump default values of variables to stdout"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:5
-#, fuzzy
 msgid "Print non-matching entries first"
-msgstr "Print first non-matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:6
 msgid "Don't read unguessable slots of installed packages (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:7
-#, fuzzy
 msgid "Always read slots of installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:8
-#, fuzzy
 msgid "(no) output (toggle)"
-msgstr "Append output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:9
-#, fuzzy
 msgid "Don't use ANSI color codes"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:10
-#, fuzzy
 msgid "Force colorful output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:11
 msgid "Compact search results (toggle)"
@@ -17214,9 +16224,8 @@ msgid "Print available versions line-by-line (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:15
-#, fuzzy
 msgid "Format string for normal output"
-msgstr "Stop from terminal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:16
 msgid "Format string for compact output"
@@ -17227,24 +16236,20 @@ msgid "Format string for verbose output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:18
-#, fuzzy
 msgid "Next expression only matches installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:19
-#, fuzzy
 msgid "Match packages installed in several versions"
-msgstr "Update installed packages with newer versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:20
-#, fuzzy
 msgid "Match duplicated packages"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:21
-#, fuzzy
 msgid "Match packages with duplicated versions"
-msgstr "Update installed packages with newer versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:22
 msgid "Match packages with a nontrivial slot"
@@ -17255,19 +16260,16 @@ msgid "Match packages with two different slots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:24
-#, fuzzy
 msgid "Match packages without best slotted version"
-msgstr "Update installed packages with newer versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:25
-#, fuzzy
 msgid "Match packages from overlays"
-msgstr "Fetch package from STDIN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:26
-#, fuzzy
 msgid "Match packages with obsolete entries"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:27
 msgid "Invert the expression (toggle)"
@@ -17278,62 +16280,52 @@ msgid "Use input from pipe of emerge -pv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:29
-#, fuzzy
 msgid "Search the description field"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:30
-#, fuzzy
 msgid "Search the category and name fields"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:31
-#, fuzzy
 msgid "Search the category field"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:32
-#, fuzzy
 msgid "Search the name field (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:33
-#, fuzzy
 msgid "Search the homepage field"
-msgstr "Read the log message from file."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:34
-#, fuzzy
 msgid "Search the license field"
-msgstr "Use source index field"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:35
 msgid "Search the provides field"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:36
-#, fuzzy
 msgid "Pattern is a regexp (default)"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:37
-#, fuzzy
 msgid "Pattern is the exact string"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:38
-#, fuzzy
 msgid "Pattern is a wildcards-pattern"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:39
 msgid "Use fuzzy-search with the given max. levenshtein-distance (default: 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:1
-#, fuzzy
 msgid "Ignore all previous options"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:2
 msgid "Only show differences to the previously saved database and exit"
@@ -17353,9 +16345,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:6
-#, fuzzy
 msgid "Update database only and show differences"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:7
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
@@ -17394,26 +16385,22 @@ msgid "Really recreate the dep-cache (rm -rf /var/cache/edb/dep/*) (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:16
-#, fuzzy
 msgid "Do not really recreate the dep-cache"
-msgstr "Do not remove stale gems from the cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:17
-#, fuzzy
 msgid "Show a short help text and exit"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:1
 #: /tmp/fish/implicit/share/completions/iex.fish:1
-#, fuzzy
 msgid "Prints version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:2
 #: /tmp/fish/implicit/share/completions/iex.fish:2
-#, fuzzy
 msgid "Evaluates the given command"
-msgstr "Evaluate parameters as a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:3
 #: /tmp/fish/implicit/share/completions/iex.fish:3
@@ -17422,9 +16409,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:4
 #: /tmp/fish/implicit/share/completions/iex.fish:4
-#, fuzzy
 msgid "Finds and executes the given script"
-msgstr "Don't execute preun scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:5
 #: /tmp/fish/implicit/share/completions/iex.fish:5
@@ -17443,9 +16429,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:8
 #: /tmp/fish/implicit/share/completions/iex.fish:8
-#, fuzzy
 msgid "Start the given app and its dependencies"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:9
 #: /tmp/fish/implicit/share/completions/iex.fish:9
@@ -17482,14 +16467,12 @@ msgid "Does not halt the Erlang VM after execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:1
-#, fuzzy
 msgid "do not do interactive display; implies -q"
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:2
-#, fuzzy
 msgid "change to directory DIR"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:3
 msgid "start a server in the background"
@@ -17516,9 +16499,8 @@ msgid "do not load loadup.el into bare Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:9
-#, fuzzy
 msgid "do not load site-start.el"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:10
 msgid "do not add site-lisp directories to load-path"
@@ -17554,9 +16536,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:18
 #: /tmp/fish/implicit/share/completions/emacs.fish:19
-#, fuzzy
 msgid "evaluate Emacs Lisp expression EXPR"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:20
 #: /tmp/fish/implicit/share/completions/emacs.fish:21
@@ -17569,14 +16550,12 @@ msgid "call Emacs Lisp function FUNC with no arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:23
-#, fuzzy
 msgid "insert contents of FILE into current buffer"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:24
-#, fuzzy
 msgid "exit without asking for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:25
 msgid "load Emacs Lisp FILE using the load function"
@@ -17587,23 +16566,20 @@ msgid "override color mode for character terminals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:28
-#, fuzzy
 msgid "window background color"
-msgstr "Change background color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:29
 msgid "disable many display features; used for debugging Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:30
-#, fuzzy
 msgid "main border color"
-msgstr "Change background color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:31
-#, fuzzy
 msgid "width of main border"
-msgstr "Size of the inner border"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:32
 msgid "color of the Emacs cursor indicating point"
@@ -17614,9 +16590,8 @@ msgid "default font; must be fixed-width"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:34
-#, fuzzy
 msgid "window foreground color"
-msgstr "Start in foreground mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:35
 msgid "make the first frame high as the screen"
@@ -17664,9 +16639,8 @@ msgid "title for initial Emacs frame"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:46
-#, fuzzy
 msgid "disable blinking cursor"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:47
 msgid "switch foreground and background"
@@ -17677,14 +16651,12 @@ msgid "enable vertical scroll bars"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:50
-#, fuzzy
 msgid "set additional X resources"
-msgstr "An additional command is required"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:51
-#, fuzzy
 msgid "set parent window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:1
 #: /tmp/fish/implicit/share/completions/equery.fish:1
@@ -17709,12 +16681,10 @@ msgstr ""
 "completion"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:4
-#, fuzzy
 msgid ""
 "Print completions for all packages including the version compare if that is "
 "already typed"
 msgstr ""
-"Prints completions for installed packages on the system from /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:5
 msgid "Synchronize the portage tree"
@@ -17725,14 +16695,12 @@ msgid "Get informations to include in bug reports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:7
-#, fuzzy
 msgid "Displays the version number of emerge"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:8
-#, fuzzy
 msgid "Displays help information for emerge"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:9
 msgid "Remove packages that will not affect the functionality of the system"
@@ -17748,45 +16716,36 @@ msgid "WARNING: Delete all packages that are neither deps nor in world"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Process all meta-cache files"
-msgstr "Process all packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:13
-#, fuzzy
 msgid "WARNING: Remove all but the latest version of package"
 msgstr ""
-"Removes all but the most recently installed version of a package from your "
-"system"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:14
 msgid "Check and update the dependency cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Resume the last merge operation"
-msgstr "Check only the last generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Search for matches in the portage tree"
 msgstr ""
-"Searches for matches of the supplied string in the current local portage tree"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:17
 msgid "Search for matches in package names and descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:18
-#, fuzzy
 msgid "WARNING: Remove the given package"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:19
-#, fuzzy
 msgid "Update the given package"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:20
 msgid "Sort flag lists alphabetically"
@@ -17801,41 +16760,36 @@ msgid "Build a binary package additionally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:23
-#, fuzzy
 msgid "Only build a binary package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:24
 msgid "Show changelog of package. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:25
-#, fuzzy
 msgid "Toggle colorized output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:26
 msgid "Align output. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:27
-#, fuzzy
 msgid "Run in debug mode"
-msgstr "Run in dummy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:28
 msgid "Consider the whole dependency tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:29
-#, fuzzy
 msgid "Reinstall all world packages"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:30
-#, fuzzy
 msgid "Only download the packages but don't install them"
-msgstr "Orders the package listing by install time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:31
 msgid "Same as --fetchonly and grab all potential files"
@@ -17854,118 +16808,100 @@ msgid "Ignore EMERGE_DEFAULT_OPTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:35
-#, fuzzy
 msgid "Include installed packages with changed USE flags"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:36
-#, fuzzy
 msgid "Disregard merge records"
-msgstr "Disregard ignores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:37
-#, fuzzy
 msgid "Don't merge dependencies"
-msgstr "Don't ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:38
-#, fuzzy
 msgid "Skip already installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:39
-#, fuzzy
 msgid "Disable the spinner"
-msgstr "disable a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:40
-#, fuzzy
 msgid "Don't add packages to world"
-msgstr "All packages in world"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:41
-#, fuzzy
 msgid "Only merge dependencies"
-msgstr "Pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:42
 msgid "Display what would be done without doing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:43
-#, fuzzy
 msgid "Use a condensed output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:44
 msgid "Remove the first package in the resume list. Use with --resume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:45
-#, fuzzy
 msgid "Show the dependency tree"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:46
-#, fuzzy
 msgid "Use binary package if available"
-msgstr "Use openssh if available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:47
-#, fuzzy
 msgid "Only use binary packages"
-msgstr "Only accept source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:48
-#, fuzzy
 msgid "Run  in  verbose  mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:49
-#, fuzzy
 msgid "Toggle build time dependencies"
-msgstr "Pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:1
 msgid "Unmount when idle for specified MINUTES"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:2
-#, fuzzy
 msgid "Run in the foreground"
-msgstr "Send job to foreground"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:3
 msgid "Verbose messages when run foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:4
-#, fuzzy
 msgid "Run in single threaded mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:5
 msgid "Enables debugging within the FUSE library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:6
-#, fuzzy
 msgid "Return data even from corrupted files"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:7
 msgid "Make files public to all other users"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:8
-#, fuzzy
 msgid "Mount the filesystem on-demand"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:9
-#, fuzzy
 msgid "Produce encrypted view of plain files"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:10
 msgid "Use standard options when creating filesystem"
@@ -17976,23 +16912,20 @@ msgid "Pass on options to FUSE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:12
-#, fuzzy
 msgid "Don't use the default FUSE flags"
-msgstr "Don't set default repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:13
 msgid "Get password from an external program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:14
-#, fuzzy
 msgid "Read password from standard input"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:15
-#, fuzzy
 msgid "Turn off key validation checking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:1
 msgid ""
@@ -18005,9 +16938,8 @@ msgid "Clears the screen before running the utility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:4
-#, fuzzy
 msgid "Output version information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:1
 msgid "Redefine variable"
@@ -18020,14 +16952,12 @@ msgid "Command"
 msgstr "Command"
 
 #: /tmp/fish/implicit/share/completions/env.fish:3
-#, fuzzy
 msgid "Start with an empty environment"
-msgstr "Tried to pop empty environment stack."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:4
-#, fuzzy
 msgid "Remove variable from the environment"
-msgstr "Removes a client from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
 msgid ""
@@ -18046,14 +16976,12 @@ msgid "turns off colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:6
-#, fuzzy
 msgid "displays a help summary"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:7
-#, fuzzy
 msgid "displays the equery version"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:8
 msgid "turns off pipe detection"
@@ -18072,42 +17000,36 @@ msgid "stop when first match found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:12
-#, fuzzy
 msgid "search in all available packages (slow)"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:13
-#, fuzzy
 msgid "search direct dependencies only (default)"
-msgstr "List dependencies of module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:14
 msgid "search indirect dependencies (very slow)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:15
-#, fuzzy
 msgid "do not show USE flags"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:16
-#, fuzzy
 msgid "do not use fancy formatting"
-msgstr "Could not get user information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:17
-#, fuzzy
 msgid "output the timestamp of each file"
-msgstr "Output the content of specified files or URLs."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:18
 msgid "output the md5sum of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:19
-#, fuzzy
 msgid "output the type of each file"
-msgstr "Output the content of specified files or URLs."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:20
 msgid "filter output based on files type or path (comma separated list)"
@@ -18115,15 +17037,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:21
 #: /tmp/fish/implicit/share/completions/equery.fish:25
-#, fuzzy
 msgid "search installed packages (default)"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:22
 #: /tmp/fish/implicit/share/completions/equery.fish:26
-#, fuzzy
 msgid "do not search installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:23
 #: /tmp/fish/implicit/share/completions/equery.fish:27
@@ -18144,89 +17064,75 @@ msgid "list only those packages that exactly match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:31
-#, fuzzy
 msgid "only list installed duplicate packages"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:32
-#, fuzzy
 msgid "report size in bytes"
-msgstr "Show sizes in gigabytes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:33
-#, fuzzy
 msgid "include non-installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:1
 msgid "The page of the document to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:2
-#, fuzzy
 msgid "Run evince in fullscreen mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:3
-#, fuzzy
 msgid "Run evince in presentation mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:4
 msgid "Run evince as a previewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:5
-#, fuzzy
 msgid "X display to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:1
-#, fuzzy
 msgid "Test if exercism has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:3
-#, fuzzy
 msgid "turn on verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:4
 #: /tmp/fish/implicit/share/completions/exercism.fish:19
 #: /tmp/fish/implicit/share/completions/ninja.fish:8
 #: /tmp/fish/implicit/share/completions/quilt.fish:1
-#, fuzzy
 msgid "show help"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:5
-#, fuzzy
 msgid "print the version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:6
-#, fuzzy
 msgid "Writes config values to a JSON file."
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:7
-#, fuzzy
 msgid "Outputs useful debug information."
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:8
-#, fuzzy
 msgid "Downloads a solution given the ID of the latest iteration."
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:9
 msgid "Fetches the next unsubmitted problem in each track."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:10
-#, fuzzy
 msgid "Lists the available problems for a language track, given its ID."
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:11
 msgid ""
@@ -18253,18 +17159,16 @@ msgid "Submits a new iteration to a problem on exercism.io."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:16
-#, fuzzy
 msgid "Lists the available language tracks."
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:17
 msgid "REMOVED"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:18
-#, fuzzy
 msgid "Upgrades the CLI to the latest released version."
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exit.fish:2
 msgid "Quit with normal exit status"
@@ -18283,9 +17187,8 @@ msgid "have tabs NUMBER characters apart, not 8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/expand.fish:3
-#, fuzzy
 msgid "use comma separated list of explicit tab positions"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:1
 msgid "create a backup of one or several jails"
@@ -18304,9 +17207,8 @@ msgid "jail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:3
-#, fuzzy
 msgid "manage specific jails"
-msgstr "Use specific conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:5
 msgid "attach your console to a running jail"
@@ -18329,9 +17231,8 @@ msgid "create the basejail from binary packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:13
-#, fuzzy
 msgid "list all jails"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:14
 msgid "restart a running jail"
@@ -18358,20 +17259,17 @@ msgid "check for reasons for the jails to fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:24
-#, fuzzy
 msgid "create or update the basejail from source"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:1
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:2
-#, fuzzy
 msgid "show this help message and exit"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:2
-#, fuzzy
 msgid "print detailed info about command NAME"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:3
 msgid "formats --list, choices: short, normal, nested"
@@ -18386,9 +17284,8 @@ msgid "Force sudo password prompt up-front"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:6
-#, fuzzy
 msgid "print list of possible commands and exit"
-msgstr "A list of possible arguments"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:7
 msgid "comma separated KEY=VALUE pairs to set Fab env vars"
@@ -18400,9 +17297,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:9
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:1
-#, fuzzy
 msgid "show program's version number and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:10
 msgid "don't user the running SSH agent"
@@ -18417,19 +17313,16 @@ msgid "abort instead of prompting (for password, host, etc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:13
-#, fuzzy
 msgid "specify location of config file to use"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:14
-#, fuzzy
 msgid "Color error output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:15
-#, fuzzy
 msgid "do not load user known_hosts file"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:16
 msgid "disconnect from hosts as soon as possible"
@@ -18444,9 +17337,8 @@ msgid "gateway host to connect through"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:19
-#, fuzzy
 msgid "Use GSS-API authentication"
-msgstr "force preauthentication"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:20
 msgid "Delegate GSS-API client credentials or not"
@@ -18457,14 +17349,12 @@ msgid "Perform GSS-API Key Exchange and user authentication"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:22
-#, fuzzy
 msgid "comma-separated list of output levels to hide"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:23
-#, fuzzy
 msgid "comma-separated list of hosts to operate on"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:24
 msgid "path to SSH private key file. May be repeated."
@@ -18491,9 +17381,8 @@ msgid "do not use pseudo-terminal in run/sudo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:30
-#, fuzzy
 msgid "password for use with authentication and/or sudo"
-msgstr "Prompt for password for authenticating server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:31
 msgid "default to parallel execution method"
@@ -18516,18 +17405,16 @@ msgid "load system known_hosts file before reading user known_hosts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:36
-#, fuzzy
 msgid "comma-separated list of roles to operate on"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:37
 msgid "specify a new shell, defaults to '/bin/bash -l -c'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:38
-#, fuzzy
 msgid "comma-separated list of output levels to show"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:39
 msgid "skip over hosts that can't be reached"
@@ -18538,19 +17425,16 @@ msgid "skip over unknown tasks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:41
-#, fuzzy
 msgid "Path to SSH config file"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:42
-#, fuzzy
 msgid "set connection timeout to N seconds"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:43
-#, fuzzy
 msgid "set remote command timeout to N seconds"
-msgstr "Set the default SCSI command timeout value to # seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:44
 msgid "username to use when connecting to remote hosts"
@@ -18561,18 +17445,16 @@ msgid "warn, instead of abort, when commands fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:46
-#, fuzzy
 msgid "comma-separated list of hosts to exclude"
-msgstr "Specify a comma-separated list of directories you wish to exclude"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:47
 msgid "number of concurrent processes to use in parallel mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:1
-#, fuzzy
 msgid "Specify a shell command as action to perform on the image"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:2
 msgid "Zoom pictures to screen size"
@@ -18599,33 +17481,28 @@ msgid "Exit feh after one loop through the slideshow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:8
-#, fuzzy
 msgid "Draw the defined actions"
-msgstr "Show the exited containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:9
-#, fuzzy
 msgid "Display some EXIF information"
-msgstr "Display RubyGems environmental information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:10
-#, fuzzy
 msgid "Draw filename"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:11
 msgid "Show overlay texts on semi-transparent background"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:12
-#, fuzzy
 msgid "Set global font"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:13
-#, fuzzy
 msgid "Add given path as directory to search fonts"
-msgstr "display path used to search for gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:14
 msgid "Disable antialiasing for zooming, bg settings, etc."
@@ -18640,32 +17517,28 @@ msgid "Limit window size. Format: [w x h] [+ x + y]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:17
-#, fuzzy
 msgid "Hide pointer"
-msgstr "Job list pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:18
 msgid "Use style as background for transparent image parts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:19
-#, fuzzy
 msgid "Enable index mode"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:20
-#, fuzzy
 msgid "Show image information based on given format"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:21
 msgid "Execute given command line and display its output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:22
-#, fuzzy
 msgid "Keep files fetched using HTTP"
-msgstr "Skip files matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:23
 msgid "Disable strict hostname and peer checking with HTTPS"
@@ -18700,14 +17573,12 @@ msgid "Only show image which are larger then given size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:31
-#, fuzzy
 msgid "Enable montage mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:32
-#, fuzzy
 msgid "Disable slideshow mode"
-msgstr "Disable sitecustomize.pl"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:33
 msgid "Don't jump to first image after resorting filelist"
@@ -18722,37 +17593,32 @@ msgid "Don't limit window to screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:36
-#, fuzzy
 msgid "Disable Xinerama support"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:37
-#, fuzzy
 msgid "Save files to given directory"
-msgstr "Extract files to current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:38
 msgid "Preload images"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:39
-#, fuzzy
 msgid "Don't report non-fatal errors"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:40
 msgid "Randomize file list before displaying"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:41
-#, fuzzy
 msgid "Recursivly expand any directory"
-msgstr "Recursively compare subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:42
-#, fuzzy
 msgid "Don't recursively expand any directory (default)"
-msgstr "Binstub destination directory (default bin)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:43
 msgid "Reload filelist after given time in second"
@@ -18781,23 +17647,20 @@ msgid "Sort file list with given parameter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:49
-#, fuzzy
 msgid "Start the filelist at given filename"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:50
-#, fuzzy
 msgid "Load options from given config file"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:51
 msgid "Set given title for window opended from thumbnail mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:52
-#, fuzzy
 msgid "Set window title"
-msgstr "Select window by id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:53
 msgid "Just print names of images that can't be loaded by imlib2"
@@ -18824,9 +17687,8 @@ msgid "Limit montage's height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:61
-#, fuzzy
 msgid "Limit montage's width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:62
 msgid "Save created montage to given file"
@@ -18857,9 +17719,8 @@ msgid "Set font to print title on index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:69
-#, fuzzy
 msgid "Center file on background"
-msgstr "Send job to background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:70
 msgid "Fit file into background by zooming until image fits"
@@ -18880,47 +17741,40 @@ msgid "Tile image if too small for screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:74
-#, fuzzy
 msgid "Do not write a ~/.fehbg file"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:1
-#, fuzzy
 msgid "Select font"
-msgstr "Select one patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:2
-#, fuzzy
 msgid "Change font directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:3
-#, fuzzy
 msgid "Center output horizontally"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:4
 msgid "Make output flush-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:5
-#, fuzzy
 msgid "Make output flush-right"
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:6
 msgid "Set justification according to text direction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:7
-#, fuzzy
 msgid "Set output to terminal width"
-msgstr "Never write output to terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:8
-#, fuzzy
 msgid "Set output width"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:10
 msgid "Put FIGlet back to normal"
@@ -18931,9 +17785,8 @@ msgid "Switch to German (ISO 646-DE) character set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:12
-#, fuzzy
 msgid "Turns off German character set processing"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:13
 msgid "Add given control file"
@@ -18952,33 +17805,28 @@ msgid "Specify layout mode between 1 and 63"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:21
-#, fuzzy
 msgid "Print version and copyright"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:22
-#, fuzzy
 msgid "Print information given infocode"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:23
-#, fuzzy
 msgid "Print left-to-right"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:24
 msgid "Print right-to-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:25
-#, fuzzy
 msgid "Print with default text direction"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:1
-#, fuzzy
 msgid "Do not prepend filenames to output lines"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:2
 msgid "Print the parsed form of the magic file"
@@ -18989,18 +17837,16 @@ msgid "Write an output file containing a pre-parsed version of file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:4
-#, fuzzy
 msgid "Do not follow symlinks"
-msgstr "Don't follow symlinks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:5
 msgid "Output mime type strings instead human readable strings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:6
-#, fuzzy
 msgid "Don't stop at the first match"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:8
 msgid "Flush stdout after checking each file"
@@ -19023,9 +17869,8 @@ msgid "Read block and character device files too"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:13
-#, fuzzy
 msgid "Print the version of the program and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:14
 msgid "Try to look inside compressed files"
@@ -19033,9 +17878,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:15
 #: /tmp/fish/implicit/share/completions/gv.fish:33
-#, fuzzy
 msgid "Print a help message and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:16
 msgid "Read  the  names of the files to be examined from a file"
@@ -19046,14 +17890,12 @@ msgid "Use other string as result field separator instead of :"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:18
-#, fuzzy
 msgid "Alternate list of files containing magic numbers"
-msgstr "print size of files contained in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:1
-#, fuzzy
 msgid "Never follow symlinks"
-msgstr "Never follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:3
 msgid ""
@@ -19066,9 +17908,8 @@ msgid "Measure from the beginning of today rather than  from  24  hours ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:5
-#, fuzzy
 msgid "Process subdirectories before the directory itself"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:7
 msgid ""
@@ -19100,28 +17941,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:13
-#, fuzzy
 msgid "Specify regular expression type"
-msgstr "Specify keyword expansion mode."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:15
-#, fuzzy
 msgid "Turn warnings on"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:16
-#, fuzzy
 msgid "Turn warnings off"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:17
 msgid "File last accessed specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:18
-#, fuzzy
 msgid "File last accessed more recently than file was modified"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:19
 msgid "File last accessed specified number of days ago"
@@ -19145,44 +17982,36 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:24
 #: /tmp/fish/implicit/share/completions/test.fish:31
-#, fuzzy
 msgid "File is executable"
-msgstr "File is writable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
-#, fuzzy
 msgid "File is on filesystem of specified type"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:27
-#, fuzzy
 msgid "Numeric group id of file"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:28
-#, fuzzy
 msgid "Group name of file"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:29
-#, fuzzy
 msgid "File is symlink matching specified case insensitive pattern"
-msgstr "Do not list implied entries matching specified shell pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:30
-#, fuzzy
 msgid "File name matches case insensitive pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:31
-#, fuzzy
 msgid "File has specified inode number"
-msgstr "Filter through specified program"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:32
 msgid "File path matches case insensitive pattern"
@@ -19193,32 +18022,28 @@ msgid "File name matches case insensetive regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:34
-#, fuzzy
 msgid "File has specified number of links"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:35
-#, fuzzy
 msgid "File is symlink matching specified pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:36
 msgid "File last modified specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:37
-#, fuzzy
 msgid "File last modified more recently than file was modified"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:38
 msgid "File last modified specified number of days ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:39
-#, fuzzy
 msgid "File name matches pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:40
 msgid "No user corresponds to file's numeric user ID"
@@ -19229,44 +18054,36 @@ msgid "No group corresponds to file's numeric group ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:42
-#, fuzzy
 msgid "File path matches pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:43
-#, fuzzy
 msgid "Files has specified permissions set"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:44
-#, fuzzy
 msgid "File name matches regex"
-msgstr "Ignore changes matching regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:45
-#, fuzzy
 msgid "File refers to the same inode as specified file"
-msgstr "Exclude files listed in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:46
-#, fuzzy
 msgid "File uses specified units of space"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
-msgstr "Always"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
-#, fuzzy
 msgid "File is of specified type"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:49
-#, fuzzy
 msgid "File's owner has specified numeric user ID"
-msgstr "File owned by effective user ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:50
 msgid ""
@@ -19275,9 +18092,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:51
-#, fuzzy
 msgid "File's owner"
-msgstr "File is socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:52
 msgid ""
@@ -19286,51 +18102,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:53
-#, fuzzy
 msgid "File's security context matches specified pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:54
-#, fuzzy
 msgid "Delete selected files"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
-msgstr "Execute command if previous command failed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:57
-#, fuzzy
 msgid "List file in ls -dils format, write to specified file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:58
-#, fuzzy
 msgid "Print full file names into specified file"
-msgstr "Output filenames using the specified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:59
 msgid "Print null separated full file names into specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:60
-#, fuzzy
 msgid "Print formated data into specified file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:61
 msgid "Execute specified command for each located file after asking user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:62
-#, fuzzy
 msgid "Print full file names"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:63
 msgid ""
@@ -19339,33 +18148,28 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:64
-#, fuzzy
 msgid "Print null separated full file names"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
-#, fuzzy
 msgid "Print formated data"
-msgstr "Prints formatted text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:66
 msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
-msgstr "Exit the shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
-#, fuzzy
 msgid "List file in ls -dils format"
-msgstr "List bugs in rss format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
-#, fuzzy
 msgid "Negate result of action"
-msgstr "Negate exit status of job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -19396,9 +18200,8 @@ msgid "Output profiling information to specified file"
 msgstr "Output profiling information to specified file"
 
 #: /tmp/fish/implicit/share/completions/fish.fish:8
-#, fuzzy
 msgid "Run with the specified verbosity level"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:3
 msgid "Do not indent output, only reformat into one job per line"
@@ -19409,9 +18212,8 @@ msgid "Colorize the output using ANSI escape sequences"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:5
-#, fuzzy
 msgid "Output in HTML format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:6
 #: /tmp/fish/implicit/share/completions/sort.fish:15
@@ -19419,28 +18221,24 @@ msgid "Write to file"
 msgstr "Write to file"
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:7
-#, fuzzy
 msgid "Enable debug at specified verbosity level"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:8
 msgid "Specify how many stack frames to display in debug messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:9
-#, fuzzy
 msgid "Dump information about parsed statements to stderr"
-msgstr "Display information about a local or remote item."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:1
-#, fuzzy
 msgid "Show the flac version number"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:2
-#, fuzzy
 msgid "Show this screen"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:3
 msgid "Show detailed explanation of usage and options"
@@ -19459,28 +18257,24 @@ msgid "Same as -d except an analysis file is written"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:7
-#, fuzzy
 msgid "Write output to stdout"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:8
 msgid "Do not write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:9
-#, fuzzy
 msgid "Do not print anything including errors"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:10
-#, fuzzy
 msgid "Force overwriting of output files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:11
-#, fuzzy
 msgid "Force the output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:12
 msgid "Prepend STRING to output names"
@@ -19507,18 +18301,16 @@ msgid "Serial number to use for the FLAC stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:18
-#, fuzzy
 msgid "Include residual signal in text output"
-msgstr "Include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:19
 msgid "Generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:20
-#, fuzzy
 msgid "Continue decoding through stream errors"
-msgstr "Continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:21
 msgid "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
@@ -19549,9 +18341,8 @@ msgid "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:28
-#, fuzzy
 msgid "Read tags from file"
-msgstr "Read URLs from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:29
 msgid "Add seek point(s) {#|X|#x|#s}"
@@ -19600,9 +18391,8 @@ msgid "Synonymous with -l 12 -b 4608 -m -e -r 6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:42
-#, fuzzy
 msgid "Specify blocksize in samples"
-msgstr "Specify sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:43
 msgid "Try mid-side coding for each frame"
@@ -19625,9 +18415,8 @@ msgid "Exhaustively search LP coeff quantization"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:48
-#, fuzzy
 msgid "Specify precision in bits"
-msgstr "Specify revision states"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:49
 msgid "Set [min,]max residual partition order"
@@ -19639,14 +18428,12 @@ msgid "Set byte order for samples"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:52
-#, fuzzy
 msgid "Number of channels"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:53
-#, fuzzy
 msgid "Number of bits per sample"
-msgstr "Number of top servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:54
 msgid "Sample rate in Hz"
@@ -19658,9 +18445,8 @@ msgid "Sign of samples"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:57
-#, fuzzy
 msgid "Size of the raw input in bytes"
-msgstr "Size of the inner border"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:58
 msgid "Force decoding to AIFF format"
@@ -19675,9 +18461,8 @@ msgid "No adaptive mid-side coding for all frames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:61
-#, fuzzy
 msgid "Don't continue decoding through stream errors"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:62
 msgid "Don't delete after a successful encode/decode"
@@ -19688,9 +18473,8 @@ msgid "No exhaustive model search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:64
-#, fuzzy
 msgid "Don't allow encoder to generate non-Subset files"
-msgstr "Don't include RDoc generated documents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:65
 msgid "Don't try mid-side coding for each frame"
@@ -19717,9 +18501,8 @@ msgid "Don't generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:71
-#, fuzzy
 msgid "Don't include residual signal in text output"
-msgstr "Don't include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:72
 msgid "Don't align multiple files on sector boundaries"
@@ -19730,14 +18513,12 @@ msgid "Write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:74
-#, fuzzy
 msgid "Don't force overwriting of output files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:75
-#, fuzzy
 msgid "Don't verify a correct encoding"
-msgstr "Don't verify package or header digests when reading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:1
 msgid "Install an application or runtime from a remote"
@@ -19748,33 +18529,28 @@ msgid "Update an installed application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:3
-#, fuzzy
 msgid "Uninstall an installed application or runtime"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:4
-#, fuzzy
 msgid "List installed apps and/or runtimes"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:5
 msgid "Show info for installed app or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:6
-#, fuzzy
 msgid "Run an application"
-msgstr "Print xdg mime applications"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:7
-#, fuzzy
 msgid "Override permissions for an application"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:8
-#, fuzzy
 msgid "Specify default version to run"
-msgstr "Specify version of gem to unpack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:9
 msgid "Enter the namespace of a running application"
@@ -19785,67 +18561,56 @@ msgid "Grant an application access to a specific file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:11
-#, fuzzy
 msgid "Revoke access to a specific file"
-msgstr "Check against a specific source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:12
-#, fuzzy
 msgid "Show information about a specific file"
-msgstr "Show full information for specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:13
-#, fuzzy
 msgid "List exported files"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:14
-#, fuzzy
 msgid "Add a new remote repository (by URL)"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:15
 msgid "Modify properties of a configured remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:16
-#, fuzzy
 msgid "Delete a configured remote"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:17
-#, fuzzy
 msgid "List all configured remotes"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:18
-#, fuzzy
 msgid "List contents of a configured remote"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:19
-#, fuzzy
 msgid "Initialize a directory for building"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:20
-#, fuzzy
 msgid "Run a build command inside the build dir"
-msgstr "Run a builtin command instead of a function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:21
 msgid "Finish a build dir for export"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:22
-#, fuzzy
 msgid "Export a build dir to a repository"
-msgstr "Add a new file/directory to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:23
-#, fuzzy
 msgid "Create a bundle file from a build directory"
-msgstr "Cleans up unused gems in your bundler directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:24
 msgid "Import a bundle file"
@@ -19856,14 +18621,12 @@ msgid "Sign an application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:26
-#, fuzzy
 msgid "Update the summary file in a repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:1
-#, fuzzy
 msgid "Add files to checkout"
-msgstr "Append files to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:2
 #: /tmp/fish/implicit/share/completions/fossil.fish:8
@@ -19875,17 +18638,15 @@ msgstr "Append files to archive"
 #: /tmp/fish/implicit/share/completions/fossil.fish:202
 #: /tmp/fish/implicit/share/completions/fossil.fish:211
 #: /tmp/fish/implicit/share/completions/fossil.fish:300
-#, fuzzy
 msgid "Case insensitive file matching"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:3
 #: /tmp/fish/implicit/share/completions/fossil.fish:9
 #: /tmp/fish/implicit/share/completions/fossil.fish:78
 #: /tmp/fish/implicit/share/completions/fossil.fish:130
-#, fuzzy
 msgid "Include dotfiles"
-msgstr "Exclude file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:4
 #: /tmp/fish/implicit/share/completions/fossil.fish:5
@@ -19893,14 +18654,12 @@ msgstr "Exclude file"
 #: /tmp/fish/implicit/share/completions/fossil.fish:11
 #: /tmp/fish/implicit/share/completions/fossil.fish:79
 #: /tmp/fish/implicit/share/completions/fossil.fish:131
-#, fuzzy
 msgid "Files to ignore"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:7
-#, fuzzy
 msgid "Remove and add files to checkout"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:12
 #: /tmp/fish/implicit/share/completions/fossil.fish:82
@@ -19912,80 +18671,66 @@ msgid "Display actions without running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:13
-#, fuzzy
 msgid "Check all repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:14
-#, fuzzy
 msgid "List changes"
-msgstr "No changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:15
 #: /tmp/fish/implicit/share/completions/fossil.fish:16
-#, fuzzy
 msgid "Ignore repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:17
-#, fuzzy
 msgid "Display locations"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:18
-#, fuzzy
 msgid "Pull repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:19
-#, fuzzy
 msgid "Push repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:20
-#, fuzzy
 msgid "Rebuild repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:21
-#, fuzzy
 msgid "Sync repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:22
-#, fuzzy
 msgid "Shows file modifications"
-msgstr "Disallow file modification"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:23
-#, fuzzy
 msgid "Show file versions"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:24
-#, fuzzy
 msgid "List all analyzed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:25
 #: /tmp/fish/implicit/share/completions/fossil.fish:137
-#, fuzzy
 msgid "Limit analyzed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:26
 msgid "Find regressions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:27
-#, fuzzy
 msgid "Identify version as not working"
-msgstr "Identify as agent-string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:28
-#, fuzzy
 msgid "Identify version as working"
-msgstr "Identify as agent-string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:29
 #: /tmp/fish/implicit/share/completions/fossil.fish:39
@@ -19998,14 +18743,12 @@ msgid "Show log of bisects in check-in order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:31
-#, fuzzy
 msgid "Skip version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:32
-#, fuzzy
 msgid "Show bisect options"
-msgstr "Show all options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:33
 #: /tmp/fish/implicit/share/completions/fossil.fish:36
@@ -20027,9 +18770,8 @@ msgid "List versions between bad and good"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:41
-#, fuzzy
 msgid "Don't show anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:42
 msgid "Reinitialize bisect"
@@ -20038,69 +18780,57 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/fossil.fish:44
 #: /tmp/fish/implicit/share/completions/fossil.fish:45
 #: /tmp/fish/implicit/share/completions/fossil.fish:46
-#, fuzzy
 msgid "Show all versions"
-msgstr "Show all options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:47
-#, fuzzy
 msgid "Undo latest bad/good command."
-msgstr "End a block of commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:48
 #: /tmp/fish/implicit/share/completions/git.fish:88
-#, fuzzy
 msgid "Create a new branch"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:49
-#, fuzzy
 msgid "Create new branch"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:50
-#, fuzzy
 msgid "Make branch local"
-msgstr "Make variable scope local"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:51
-#, fuzzy
 msgid "Set background color"
-msgstr "Change background color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:52
 #: /tmp/fish/implicit/share/completions/fossil.fish:106
-#, fuzzy
 msgid "Don't sign the branch with GPG"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:53
 #: /tmp/fish/implicit/share/completions/fossil.fish:155
-#, fuzzy
 msgid "Override date"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:54
-#, fuzzy
 msgid "Override user"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:55
-#, fuzzy
 msgid "List branches"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:56
 #: /tmp/fish/implicit/share/completions/fossil.fish:57
-#, fuzzy
 msgid "Show all branches"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:58
 #: /tmp/fish/implicit/share/completions/fossil.fish:59
-#, fuzzy
 msgid "Show closed branches"
-msgstr "Show held packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:60
 #: /tmp/fish/implicit/share/completions/fossil.fish:62
@@ -20110,39 +18840,33 @@ msgstr "Show held packages"
 #: /tmp/fish/implicit/share/completions/fossil.fish:177
 #: /tmp/fish/implicit/share/completions/fossil.fish:180
 #: /tmp/fish/implicit/share/completions/fossil.fish:267
-#, fuzzy
 msgid "Run command on repository"
-msgstr "Run command in current process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:61
-#, fuzzy
 msgid "Print a file"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:63
 #: /tmp/fish/implicit/share/completions/fossil.fish:140
-#, fuzzy
 msgid "Print specific revision"
-msgstr "Print svn revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:64
-#, fuzzy
 msgid "List local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:65
 #: /tmp/fish/implicit/share/completions/fossil.fish:128
 #: /tmp/fish/implicit/share/completions/fossil.fish:263
-#, fuzzy
 msgid "Display absolute paths"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:66
 #: /tmp/fish/implicit/share/completions/fossil.fish:132
 #: /tmp/fish/implicit/share/completions/fossil.fish:264
-#, fuzzy
 msgid "Display relative paths"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:67
 #: /tmp/fish/implicit/share/completions/fossil.fish:265
@@ -20150,34 +18874,28 @@ msgid "Verify file status using SHA1"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:68
-#, fuzzy
 msgid "Identify the repository if there are changes"
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:69
-#, fuzzy
 msgid "Say (none) if there are no changes"
-msgstr "Try operation but make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:70
-#, fuzzy
 msgid "Checkout version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:71
-#, fuzzy
 msgid "Version to check out"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:72
-#, fuzzy
 msgid "Ignore edited files"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:73
-#, fuzzy
 msgid "Ignore missing content"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:74
 msgid "Only update the manifest"
@@ -20185,14 +18903,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:75
 #: /tmp/fish/implicit/share/completions/fossil.fish:302
-#, fuzzy
 msgid "Update to latest version"
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:76
-#, fuzzy
 msgid "Delete all extra files"
-msgstr "Delete cached header files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:80
 #: /tmp/fish/implicit/share/completions/fossil.fish:212
@@ -20200,24 +18916,20 @@ msgid "Files to clean without prompting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:81
-#, fuzzy
 msgid "Remove without prompting"
-msgstr "Remove property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:83
-#, fuzzy
 msgid "Only remove Fossil temporary files"
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:84
-#, fuzzy
 msgid "Show removed files"
-msgstr "Move or rename files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:85
-#, fuzzy
 msgid "Clone repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:86
 #: /tmp/fish/implicit/share/completions/fossil.fish:154
@@ -20233,9 +18945,8 @@ msgid "Use SSL identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:89
-#, fuzzy
 msgid "Create new revision"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:91
 msgid "Allow unresolved merge conflicts"
@@ -20278,38 +18989,32 @@ msgid "Use a delta manifest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:101
-#, fuzzy
 msgid "Commit comment"
-msgstr "Comment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:102
-#, fuzzy
 msgid "Read commit comment from a file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:103
-#, fuzzy
 msgid "Mimetype of commit comment"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:105
-#, fuzzy
 msgid "Omit all warnings"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:107
-#, fuzzy
 msgid "Don't sync the changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:108
 msgid "Assign a tag to the checkin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:109
-#, fuzzy
 msgid "Show differences"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:110
 #: /tmp/fish/implicit/share/completions/fossil.fish:165
@@ -20318,38 +19023,32 @@ msgid "Binary files glob pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:111
-#, fuzzy
 msgid "Show diff of branch"
-msgstr "Show hierarchy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:112
-#, fuzzy
 msgid "Show file names only"
-msgstr "Log filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:113
-#, fuzzy
 msgid "Context lines"
-msgstr "Set context size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:114
-#, fuzzy
 msgid "Include binary files"
-msgstr "Annotate binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:115
 msgid "Select revision to compare with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:116
-#, fuzzy
 msgid "Use internal diff logic"
-msgstr "Use external diff command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:117
-#, fuzzy
 msgid "Side-by-side diff"
-msgstr "Use side-by-side format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:118
 msgid "Launch GUI"
@@ -20360,76 +19059,64 @@ msgid "Select revision to compare to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:120
-#, fuzzy
 msgid "Unified diff"
-msgstr "Use unified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:121
-#, fuzzy
 msgid "Output complete text"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:122
-#, fuzzy
 msgid "Line width in side-by-side diff"
-msgstr "Set column width for side-by-side format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:123
-#, fuzzy
 msgid "Export repository to git"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:124
 msgid "Export rids of exported data to file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:125
-#, fuzzy
 msgid "Read rids of data to ignore from file"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:127
 msgid "Show files that aren't part of checkout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:133
-#, fuzzy
 msgid "Print complete file history"
-msgstr "Print only file info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:134
-#, fuzzy
 msgid "Display one-line summary"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:136
-#, fuzzy
 msgid "Select log mode (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:138
-#, fuzzy
 msgid "Skip changes"
-msgstr "No changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:139
-#, fuzzy
 msgid "Select print mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:141
-#, fuzzy
 msgid "Select status mode"
-msgstr "Select a method"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:143
 msgid "Show main and auxiliary commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:144
-#, fuzzy
 msgid "Show test commands only"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:145
 msgid "Show auxilary commands only"
@@ -20440,44 +19127,37 @@ msgid "Show list of web UI pages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:147
-#, fuzzy
 msgid "Import repository from git"
-msgstr "Compress repository with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:148
-#, fuzzy
 msgid "Allow importing into existing repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:149
-#, fuzzy
 msgid "Provide information about object"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:151
 #: /tmp/fish/implicit/share/completions/fossil.fish:170
-#, fuzzy
 msgid "Show extra information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:152
-#, fuzzy
 msgid "Create a repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:153
-#, fuzzy
 msgid "Copy settings from repository"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:156
 msgid "Make JSON request"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:158
-#, fuzzy
 msgid "List files"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:159
 #: /tmp/fish/implicit/share/completions/fossil.fish:163
@@ -20493,24 +19173,20 @@ msgid "Tag"
 msgstr "Tag"
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:160
-#, fuzzy
 msgid "Show commit time"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:161
-#, fuzzy
 msgid "Provide extra information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:162
-#, fuzzy
 msgid "Merge commits"
-msgstr "Merge sorted files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:164
-#, fuzzy
 msgid "Use baseline"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:167
 msgid "Allow empty merge"
@@ -20521,14 +19197,12 @@ msgid "Close merged branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:171
-#, fuzzy
 msgid "Move file"
-msgstr "Archive file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:173
-#, fuzzy
 msgid "Open repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:174
 msgid "Only modify manifest"
@@ -20539,55 +19213,45 @@ msgid "Allow opening inside an opened repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:176
-#, fuzzy
 msgid "Pull from a repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:178
 #: /tmp/fish/implicit/share/completions/fossil.fish:181
-#, fuzzy
 msgid "Pull private branches"
-msgstr "Multiple vendor branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:179
-#, fuzzy
 msgid "Push into a repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:182
-#, fuzzy
 msgid "Rebuild a repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:183
-#, fuzzy
 msgid "Compute clusters"
-msgstr "Compress faster"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:184
-#, fuzzy
 msgid "Compress database"
-msgstr "Compress all data"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:185
-#, fuzzy
 msgid "Force rebuild even with errors"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:186
-#, fuzzy
 msgid "Skip BLOB table verification"
-msgstr "Skip the signature verification step"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:187
-#, fuzzy
 msgid "Set the database pagesize"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:188
-#, fuzzy
 msgid "Scan in random order"
-msgstr "Play in random order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:189
 msgid "Run VACUUM"
@@ -20606,34 +19270,28 @@ msgid "Set Write-Ahead-Log journalling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:193
-#, fuzzy
 msgid "Show statistics"
-msgstr "Show cache statistics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:194
-#, fuzzy
 msgid "Default server URL"
-msgstr "Set referer URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:195
-#, fuzzy
 msgid "Revert a commit"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:197
-#, fuzzy
 msgid "Revert back to given revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:198
-#, fuzzy
 msgid "Remove a file from repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:199
-#, fuzzy
 msgid "Remove files from this checkout"
-msgstr "Remove files from version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:200
 msgid "Skip removing files from this checkout"
@@ -20644,19 +19302,16 @@ msgid "Display actions without runing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:203
-#, fuzzy
 msgid "Manage settings"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:204
-#, fuzzy
 msgid "Log accesses"
-msgstr "Log message."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:205
-#, fuzzy
 msgid "Allow symbolic links"
-msgstr "Always follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:206
 msgid "Allow automatically filling CAPTCHA"
@@ -20671,9 +19326,8 @@ msgid "Pull list of shunned references from server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:209
-#, fuzzy
 msgid "Automatically sync the repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:213
 msgid "Sign commits using GPG"
@@ -20692,23 +19346,20 @@ msgid "Allow binary files to be diffed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:217
-#, fuzzy
 msgid "External diff command"
-msgstr "Use external diff command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:218
-#, fuzzy
 msgid "Disallow pushing to the repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:219
 msgid "Text editor for writing check-in comments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:220
-#, fuzzy
 msgid "List of empty directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:221
 msgid "Non-UTF-8 files glob pattern"
@@ -20731,9 +19382,8 @@ msgid "Send login credentials using HTTPS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:226
-#, fuzzy
 msgid "Files to ignore glob pattern"
-msgstr "Files to ignore during import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:227
 msgid "Files to keep when cleaning"
@@ -20756,14 +19406,12 @@ msgid "HTTP request size limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:232
-#, fuzzy
 msgid "Use modification times"
-msgstr "Change modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:233
-#, fuzzy
 msgid "PGP command"
-msgstr "Job command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:234
 msgid "HTTP proxy URL"
@@ -20774,9 +19422,8 @@ msgid "Report relative paths"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:236
-#, fuzzy
 msgid "Compute checksums over all files"
-msgstr "Write size for all files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:237
 msgid "Allow users to register themselves"
@@ -20791,14 +19438,12 @@ msgid "Location of SSL CA root certificates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:240
-#, fuzzy
 msgid "SSL private certificate path"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:241
-#, fuzzy
 msgid "Allow Tcl scripting"
-msgstr "Tcl section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:242
 msgid "Tcl initialization script"
@@ -20809,49 +19454,42 @@ msgid "TH1 initialization script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:244
-#, fuzzy
 msgid "Web browser name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:245
 msgid "Set globally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:246
-#, fuzzy
 msgid "Run SQL commands"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:247
 msgid "Manage stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:248
-#, fuzzy
 msgid "Save current changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:249
 #: /tmp/fish/implicit/share/completions/fossil.fish:250
-#, fuzzy
 msgid "Stash comment"
-msgstr "Set comment leader."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:251
-#, fuzzy
 msgid "List all stashes"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:252
 #: /tmp/fish/implicit/share/completions/fossil.fish:253
-#, fuzzy
 msgid "Show information about files"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:254
-#, fuzzy
 msgid "Show stash contents"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:255
 msgid "Pop last stash"
@@ -20875,19 +19513,16 @@ msgid "Forget ALL stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:261
-#, fuzzy
 msgid "Compare stash"
-msgstr "Compare month names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:262
-#, fuzzy
 msgid "Show status"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:266
-#, fuzzy
 msgid "Sync with a repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:268
 msgid "Sync private branches"
@@ -20898,9 +19533,8 @@ msgid "Manage tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:270
-#, fuzzy
 msgid "Add tag to check-in"
-msgstr "Taint checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:271
 msgid "Add raw tag"
@@ -20911,19 +19545,16 @@ msgid "Propagate tag"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:273
-#, fuzzy
 msgid "Remove tag from check-in"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:275
-#, fuzzy
 msgid "Remove raw tag"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:276
-#, fuzzy
 msgid "Find tag"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:277
 msgid "Find raw tag"
@@ -20934,70 +19565,57 @@ msgid "Find tag type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:279
-#, fuzzy
 msgid "Limit number of tags"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:281
 #: /tmp/fish/implicit/share/completions/git.fish:293
-#, fuzzy
 msgid "List tags"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:282
-#, fuzzy
 msgid "List raw tags"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:283
-#, fuzzy
 msgid "Show timeline"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:284
-#, fuzzy
 msgid "Limit timeline entries"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:285
-#, fuzzy
 msgid "Output only event type"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:286
-#, fuzzy
 msgid "Output list of files changed"
-msgstr "Output 3 lines of unified context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:287
-#, fuzzy
 msgid "Open web UI"
-msgstr "Open file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:288
-#, fuzzy
 msgid "Start web server"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:289
-#, fuzzy
 msgid "Enable automatic login for localhost"
-msgstr "Enable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:290
-#, fuzzy
 msgid "Only listen on localhost"
-msgstr "Only print locations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:291
-#, fuzzy
 msgid "Port to listen on"
-msgstr "Minimum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:292
-#, fuzzy
 msgid "Trace TH1 execution"
-msgstr "Force deletion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:293
 msgid "Use base URL"
@@ -21016,34 +19634,28 @@ msgid "Use SCGI rather than HTTP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:297
-#, fuzzy
 msgid "Undo the changes"
-msgstr "Window size change"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:299
-#, fuzzy
 msgid "Update version"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:301
-#, fuzzy
 msgid "Print debug information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:304
-#, fuzzy
 msgid "Print information about all files"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:305
-#, fuzzy
 msgid "Print fossil version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:306
-#, fuzzy
 msgid "Print version of optional features"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:307
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:3
@@ -21066,19 +19678,16 @@ msgstr "Print help"
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
-#, fuzzy
 msgid "Save function"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
-#, fuzzy
 msgid "Open function in external editor"
-msgstr "Specify external editor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
-#, fuzzy
 msgid "Edit in interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:1
 #: /tmp/fish/implicit/share/completions/functions.fish:5
@@ -21113,32 +19722,28 @@ msgid "Make the function a variable update event handler"
 msgstr "Make the function a variable update event handler"
 
 #: /tmp/fish/implicit/share/completions/function.fish:8
-#, fuzzy
 msgid "Make the function a generic event handler"
-msgstr "Make the function a signal event handler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:9
-#, fuzzy
 msgid "Specify named arguments"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:10
 msgid "Do not shadow variable scope of calling function"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:11
-#, fuzzy
 msgid "Inherit completions from the given command"
-msgstr "Restrict operations to the REMOTE domain"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:1
 msgid "Erase function"
 msgstr "Erase function"
 
 #: /tmp/fish/implicit/share/completions/functions.fish:3
-#, fuzzy
 msgid "Show hidden functions"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:6
 msgid "Test if function is defined"
@@ -21149,24 +19754,20 @@ msgid "List the names of the functions, but not their definition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:8
-#, fuzzy
 msgid "Copy the specified function to the specified new name"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:9
-#, fuzzy
 msgid "Display information about the function"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:10
-#, fuzzy
 msgid "Print more output"
-msgstr "Print xrandr outputs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:1
-#, fuzzy
 msgid "Show all files specified on the command line"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:2
 msgid "Kill processes, accessing the file"
@@ -21193,14 +19794,12 @@ msgid "Kill only processes which have write access"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:8
-#, fuzzy
 msgid "Slect a different namespace"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:9
-#, fuzzy
 msgid "Silent operation"
-msgstr "Foreground operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:10
 msgid "Append the user name of the process owner to each PID"
@@ -21235,14 +19834,12 @@ msgid "Lazy unmount"
 msgstr "Lazy unmount"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
-#, fuzzy
 msgid "Standard mode"
-msgstr "Start in Farsi mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:2
-#, fuzzy
 msgid "Place output in file"
-msgstr "Append output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:3
 msgid ""
@@ -21252,9 +19849,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:4
-#, fuzzy
 msgid "Use specified version of the C++ ABI"
-msgstr "Use specified compression algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:5
 #: /tmp/fish/implicit/share/completions/gcc.fish:481
@@ -21330,20 +19926,18 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:18
-#, fuzzy
 msgid "Display the version number and copyrights of the invoked GCC"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:19
 msgid "In C mode, support all ISO C90 programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:20
-#, fuzzy
 msgid ""
 "Do not recognize \"asm\", \"inline\" or \"typeof\" as a keyword, so that "
 "code can use these words as identifiers"
-msgstr "Do not recognize asm, inline or typeof keywords"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:21
 #: /tmp/fish/implicit/share/completions/gcc.fish:22
@@ -21357,9 +19951,8 @@ msgid "Assert that compilation takes place in a hosted environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:24
-#, fuzzy
 msgid "Assert that compilation takes place in a freestanding environment"
-msgstr "Assert freestanding environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:25
 msgid "Accept some non-standard constructs used in Microsoft header files"
@@ -21404,9 +19997,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:37
-#, fuzzy
 msgid "Turn off all access checking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:38
 msgid ""
@@ -21461,9 +20053,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:48
-#, fuzzy
 msgid "Don’t emit code for implicit instantiations of inline templates, either"
-msgstr "Do not emit code for implicit inline templates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:49
 msgid ""
@@ -21495,10 +20086,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:54
-#, fuzzy
 msgid ""
 "Downgrade some diagnostics about nonconformant code from errors to warnings"
-msgstr "Downgrade some errors to warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:55
 msgid "Enable automatic template instantiation at link time"
@@ -21517,11 +20107,10 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:58
-#, fuzzy
 msgid ""
 "Do not emit the extra code to use the routines specified in the C++ ABI for "
 "thread-safe initialization of local statics"
-msgstr "Do not emit code for thread-safe initialization of local statics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:59
 msgid ""
@@ -21537,9 +20126,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:61
-#, fuzzy
 msgid "Do not use weak symbol support, even if it is provided by the linker"
-msgstr "Do not use weak symbol support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:62
 msgid ""
@@ -21707,9 +20295,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:92
-#, fuzzy
 msgid "Warn if a \"@selector("
-msgstr "Write selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:93
 msgid ""
@@ -22180,9 +20767,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:186
-#, fuzzy
 msgid "Make all warnings into errors"
-msgstr "Only output warnings and errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:187
 msgid "This option is only active when -fstack-protector is active"
@@ -22429,24 +21015,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:239
-#, fuzzy
 msgid "Optimize even more"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:240
-#, fuzzy
 msgid "Optimize yet more"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:241
-#, fuzzy
 msgid "Do not optimize"
-msgstr "Do not sort"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:242
-#, fuzzy
 msgid "Optimize for size"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:243
 msgid ""
@@ -22486,9 +21068,8 @@ msgid "Don’t pay attention to the \"inline\" keyword"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:250
-#, fuzzy
 msgid "Integrate all simple functions into their callers"
-msgstr "Inject readline functions to reader"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:251
 msgid ""
@@ -22649,9 +21230,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:280
-#, fuzzy
 msgid "Perform cross-jumping transformation"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:281
 msgid "Attempt to transform conditional jumps into branch-less equivalents"
@@ -23130,9 +21710,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:380
-#, fuzzy
 msgid "Pass option as an option to the preprocessor"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:381
 msgid "Predefine name as a macro, with definition 1"
@@ -23155,17 +21734,14 @@ msgid "Do not predefine any system-specific or GCC-specific macros"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:385
-#, fuzzy
 msgid ""
 "Add the directory dir to the list of directories to be searched for header "
 "files"
 msgstr ""
-"Sets a list of directories to search for photo viewers and keyserver helpers"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:386
-#, fuzzy
 msgid "Write output to file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:387
 msgid "Turns on all optional warnings which are desirable for normal code"
@@ -23209,9 +21785,8 @@ msgid "Warn whenever an #else or an #endif are followed by text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:396
-#, fuzzy
 msgid "Make all warnings into hard errors"
-msgstr "Only output warnings and errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:397
 msgid "Issue warnings for code in system headers"
@@ -23303,9 +21878,8 @@ msgid "Specify the standard to which the code should conform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:419
-#, fuzzy
 msgid "Split the include path"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:420
 msgid "Do not search the standard system directories for header files"
@@ -23365,9 +21939,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:432
-#, fuzzy
 msgid "Accept universal character names in identifiers"
-msgstr "Accept $ in identifiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:433
 msgid ""
@@ -23426,9 +21999,8 @@ msgid "Inhibit generation of linemarkers in the output from the preprocessor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:445
-#, fuzzy
 msgid "Do not discard comments"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:446
 msgid "Do not discard comments, including during macro expansion"
@@ -23441,9 +22013,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:448
-#, fuzzy
 msgid "Process trigraph sequences"
-msgstr "Process at queue only once"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:449
 msgid ""
@@ -23600,9 +22171,8 @@ msgid "Compile code for little endian mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:486
-#, fuzzy
 msgid "Compile code for big endian mode"
-msgstr "Compiler debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:487
 msgid "Prepend the name of the cpu to all public symbol names"
@@ -23622,9 +22192,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:493
-#, fuzzy
 msgid "Generate code for the specified ABI"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:494
 msgid ""
@@ -23827,9 +22396,8 @@ msgid "Change only the low 8 bits of the stack pointer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:532
-#, fuzzy
 msgid "Assume int to be 8 bit integer"
-msgstr "Left integer not equal to right integer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:533
 #: /tmp/fish/implicit/share/completions/gcc.fish:818
@@ -23865,9 +22433,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:539
-#, fuzzy
 msgid "Assume that the program is arbitrarily large"
-msgstr "Assume data type for binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:540
 #: /tmp/fish/implicit/share/completions/gcc.fish:909
@@ -23876,12 +22443,9 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:541
 #: /tmp/fish/implicit/share/completions/gcc.fish:910
-#, fuzzy
 msgid ""
 "Generate code that doesn’t assume ID based shared libraries are being used"
 msgstr ""
-"Specified the identification number of the ID based shared library being "
-"compiled"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:542
 msgid ""
@@ -23896,9 +22460,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:547
 #: /tmp/fish/implicit/share/completions/gcc.fish:743
 #: /tmp/fish/implicit/share/completions/gcc.fish:744
-#, fuzzy
 msgid "Generate code for the specified architecture"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:548
 #: /tmp/fish/implicit/share/completions/gcc.fish:549
@@ -24072,9 +22635,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:591
-#, fuzzy
 msgid "Produce a Mach-o bundle format file"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:592
 msgid ""
@@ -24311,38 +22873,32 @@ msgid "Change ABI to use double word insns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:698
-#, fuzzy
 msgid "Do not use double word instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:699
-#, fuzzy
 msgid "Use floating point double instructions"
-msgstr "Floating point exception"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:700
-#, fuzzy
 msgid "Do not use floating point double instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:701
-#, fuzzy
 msgid "Use media instructions"
-msgstr "Illegal instruction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:702
-#, fuzzy
 msgid "Do not use media instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:703
 msgid "Use multiply and add/subtract instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:704
-#, fuzzy
 msgid "Do not use multiply and add/subtract instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:705
 msgid ""
@@ -24405,48 +22961,40 @@ msgid "Use all eight media accumulator registers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:717
-#, fuzzy
 msgid "Pack VLIW instructions"
-msgstr "Illegal instruction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:718
-#, fuzzy
 msgid "Do not pack VLIW instructions"
-msgstr "Do not check any generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:719
 msgid "Do not mark ABI switches in e_flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:720
-#, fuzzy
 msgid "Enable the use of conditional-move instructions (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:721
-#, fuzzy
 msgid "Disable the use of conditional-move instructions"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:722
-#, fuzzy
 msgid "Enable the use of conditional set instructions (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:723
-#, fuzzy
 msgid "Disable the use of conditional set instructions"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:724
-#, fuzzy
 msgid "Enable the use of conditional execution (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:725
-#, fuzzy
 msgid "Disable the use of conditional execution"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:726
 msgid "Run a pass to pack branches into VLIW instructions (default)"
@@ -24470,9 +23018,8 @@ msgid "Enable nested conditional execution optimizations (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:731
-#, fuzzy
 msgid "Disable nested conditional execution optimizations"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:732
 msgid ""
@@ -24506,9 +23053,8 @@ msgid "Generate code for the H8/300H"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:738
-#, fuzzy
 msgid "Generate code for the H8S"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:739
 msgid "Generate code for the H8S and H8/300H in the normal mode"
@@ -24596,14 +23142,12 @@ msgid "Generate the predefine, \"_SIO\", for server IO"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:764
-#, fuzzy
 msgid "Use GNU ld specific options"
-msgstr "Edit command specific completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:765
-#, fuzzy
 msgid "Use HP ld specific options"
-msgstr "Edit command specific completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:766
 msgid "Generate code that uses long call sequences"
@@ -24645,9 +23189,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:776
 #: /tmp/fish/implicit/share/completions/gcc.fish:777
-#, fuzzy
 msgid "A deprecated synonym for -mtune"
-msgstr "Obsolete synonym for -i"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:778
 #: /tmp/fish/implicit/share/completions/gcc.fish:779
@@ -24819,16 +23362,14 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:828
-#, fuzzy
 msgid "Generate code for a big endian target"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:829
 #: /tmp/fish/implicit/share/completions/gcc.fish:939
 #: /tmp/fish/implicit/share/completions/gcc.fish:940
-#, fuzzy
 msgid "Generate code for a little endian target"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:830
 #: /tmp/fish/implicit/share/completions/gcc.fish:831
@@ -24867,9 +23408,8 @@ msgid "Generate code that uses a single constant global pointer value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:842
-#, fuzzy
 msgid "Generate code that is self-relocatable"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:843
 msgid ""
@@ -24952,19 +23492,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:866
-#, fuzzy
 msgid "Generate code for the M32R/2"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:867
-#, fuzzy
 msgid "Generate code for the M32R/X"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:868
-#, fuzzy
 msgid "Generate code for the M32R"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:869
 msgid ""
@@ -25052,39 +23589,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:885
 #: /tmp/fish/implicit/share/completions/gcc.fish:886
-#, fuzzy
 msgid "Generate output for a 68000"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:887
 #: /tmp/fish/implicit/share/completions/gcc.fish:888
-#, fuzzy
 msgid "Generate output for a 68020"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:889
 msgid "Generate output containing 68881 instructions for floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:890
-#, fuzzy
 msgid "Generate output for a 68030"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:891
-#, fuzzy
 msgid "Generate output for a 68040"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:892
-#, fuzzy
 msgid "Generate output for a 68060"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:893
-#, fuzzy
 msgid "Generate output for a CPU32"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:894
 msgid "Generate output for a 520X \"coldfire\" family cpu"
@@ -25104,14 +23635,12 @@ msgid "Consider type \"int\" to be 16 bits wide, like \"short int\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:899
-#, fuzzy
 msgid "Do not use the bit-field instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:900
-#, fuzzy
 msgid "Do use the bit-field instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:901
 msgid ""
@@ -25153,31 +23682,25 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:911
-#, fuzzy
 msgid ""
 "=n Specified the identification number of the ID based shared library being "
 "compiled"
 msgstr ""
-"Specified the identification number of the ID based shared library being "
-"compiled"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:912
 #: /tmp/fish/implicit/share/completions/gcc.fish:913
-#, fuzzy
 msgid "Generate output for a 68HC11"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:914
 #: /tmp/fish/implicit/share/completions/gcc.fish:915
-#, fuzzy
 msgid "Generate output for a 68HC12"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:916
 #: /tmp/fish/implicit/share/completions/gcc.fish:917
-#, fuzzy
 msgid "Generate output for a 68HCS12"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:918
 msgid ""
@@ -25222,9 +23745,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:931
 #: /tmp/fish/implicit/share/completions/gcc.fish:932
-#, fuzzy
 msgid "Always treat bit-fields as int-sized"
-msgstr "All bitfields are unsigned"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:933
 #: /tmp/fish/implicit/share/completions/gcc.fish:934
@@ -25233,9 +23755,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:935
 #: /tmp/fish/implicit/share/completions/gcc.fish:936
-#, fuzzy
 msgid "Emit callgraph information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:937
 #: /tmp/fish/implicit/share/completions/gcc.fish:938
@@ -25248,9 +23769,8 @@ msgid "Generate code for the 210 processor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:943
-#, fuzzy
 msgid "Generate big-endian code"
-msgstr "Generate man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:944
 msgid "Generate little-endian code"
@@ -25340,9 +23860,8 @@ msgid "Use floating-point coprocessor instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:970
-#, fuzzy
 msgid "Do not use floating-point coprocessor instructions"
-msgstr "Do not emit out-of-line code for inline functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:971
 msgid ""
@@ -25438,9 +23957,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:998
 #: /tmp/fish/implicit/share/completions/gcc.fish:999
-#, fuzzy
 msgid "Disable (do not disable) use of the \"jal\" instruction"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1000
 #: /tmp/fish/implicit/share/completions/gcc.fish:1001
@@ -25644,9 +24162,8 @@ msgid "Use hardware FPP floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1055
-#, fuzzy
 msgid "Do not use hardware floating point"
-msgstr "Do not use file completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1056
 msgid "Return floating-point results in ac0 (fr0 in Unix assembler syntax)"
@@ -25701,9 +24218,8 @@ msgid "Use \"abshi2\" pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1072
-#, fuzzy
 msgid "Do not use \"abshi2\" pattern"
-msgstr "Do not expand pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1073
 msgid "Pretend that branches are expensive"
@@ -25718,9 +24234,8 @@ msgid "Generate code for a system with split I&D"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1076
-#, fuzzy
 msgid "Generate code for a system without split I&D"
-msgstr "Generate XML formatted output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1077
 msgid "Use Unix assembler syntax"
@@ -25929,9 +24444,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:1191
 #: /tmp/fish/implicit/share/completions/gcc.fish:1195
 #: /tmp/fish/implicit/share/completions/gcc.fish:1196
-#, fuzzy
 msgid "On System V"
-msgstr "Subsystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1146
 #: /tmp/fish/implicit/share/completions/gcc.fish:1147
@@ -26145,29 +24659,24 @@ msgid "These arguments always have to be used in conjunction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1231
-#, fuzzy
 msgid "Generate code for the SH1"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1232
-#, fuzzy
 msgid "Generate code for the SH2"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1233
-#, fuzzy
 msgid "Generate code for the SH2e"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1234
-#, fuzzy
 msgid "Generate code for the SH3"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1235
-#, fuzzy
 msgid "Generate code for the SH3e"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1236
 msgid "Generate code for the SH4 without a floating-point unit"
@@ -26186,9 +24695,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1239
-#, fuzzy
 msgid "Generate code for the SH4"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1240
 msgid ""
@@ -26209,9 +24717,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1243
-#, fuzzy
 msgid "Generate code for the SH4a"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1244
 msgid ""
@@ -26235,9 +24742,8 @@ msgid "Use 32-bit offsets in \"switch\" tables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1250
-#, fuzzy
 msgid "Enable the use of the instruction \"fmovd\""
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1251
 #: /tmp/fish/implicit/share/completions/gcc.fish:1252
@@ -26425,18 +24931,16 @@ msgid "This is a synonym for -pthreads"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1300
-#, fuzzy
 msgid "Create a shared object"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1301
 msgid "Identify the versions of each tool used by the compiler, in a \""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1302
-#, fuzzy
 msgid "Refrain from adding \""
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1304
 #: /tmp/fish/implicit/share/completions/gcc.fish:1305
@@ -26491,10 +24995,9 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1320
 #: /tmp/fish/implicit/share/completions/gcc.fish:1321
-#, fuzzy
 msgid ""
 "Enable (disable) the use of the single instruction repeat instruction RPTS"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1322
 #: /tmp/fish/implicit/share/completions/gcc.fish:1323
@@ -26627,9 +25130,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1356
 #: /tmp/fish/implicit/share/completions/gcc.fish:1357
-#, fuzzy
 msgid "Control the treatment of literal pools"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1358
 #: /tmp/fish/implicit/share/completions/gcc.fish:1359
@@ -26717,9 +25219,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1376
-#, fuzzy
 msgid "Ignore the #ident directive"
-msgstr "Ignore zero block in archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1377
 msgid "Don’t output a \""
@@ -26781,9 +25282,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1388
-#, fuzzy
 msgid "Generate instrumentation calls for entry and exit to functions"
-msgstr "Generate RI documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1389
 msgid ""
@@ -26813,9 +25313,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1397
-#, fuzzy
 msgid "=model Alter the thread-local storage model to be used"
-msgstr "Specify the access model for the thread local storage pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1398
 msgid ""
@@ -26825,14 +25324,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:1
-#, fuzzy
 msgid "List all options, with brief explanations"
-msgstr "List all properties on files, dirs, or revisions."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:2
-#, fuzzy
 msgid "Read symbol table from file file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:3
 msgid "Enable writing into executable and core files"
@@ -26853,24 +25350,21 @@ msgid "Use file file as a core dump to examine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:7
-#, fuzzy
 msgid "Execute GDB commands from file file"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:8
 msgid "Add directory to the path to search for source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:9
-#, fuzzy
 msgid "Do not execute commands from any .gdbinit files"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:11
 #: /tmp/fish/implicit/share/completions/root.fish:1
-#, fuzzy
 msgid "Run in batch mode"
-msgstr "Run in dummy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:12
 msgid ""
@@ -26901,14 +25395,12 @@ msgid "Run GDB using a text (console) user interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:1
-#, fuzzy
 msgid "Print usage informations and quit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:2
-#, fuzzy
 msgid "Print the version and quit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
 msgid "Use URL as the remote source for gems"
@@ -27202,9 +25694,8 @@ msgid "Update the RubyGems system software"
 msgstr "Update the RubyGems system software"
 
 #: /tmp/fish/implicit/share/completions/git.fish:1
-#, fuzzy
 msgid "Display the manual of a git command"
-msgstr "Display help about darcs and darcs commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:3
 msgid "Run as if git was started in this directory"
@@ -27219,19 +25710,16 @@ msgid "Print the path to the html documentation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:7
-#, fuzzy
 msgid "Print the path to the man documentation"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:8
-#, fuzzy
 msgid "Print the path to the info documentation"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:9
-#, fuzzy
 msgid "Pipe output into a pager"
-msgstr "Append output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:10
 #: /tmp/fish/implicit/share/completions/journalctl.fish:6
@@ -27240,29 +25728,24 @@ msgstr "Append output to file"
 #: /tmp/fish/implicit/share/completions/systemctl.fish:41
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:5
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:9
-#, fuzzy
 msgid "Do not pipe output into a pager"
-msgstr "Could not open tty for pager"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:11
-#, fuzzy
 msgid "Set the path to the repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:12
-#, fuzzy
 msgid "Set the path to the working tree"
-msgstr "Set the speed factor of the writing process to #"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:13
-#, fuzzy
 msgid "Set the namespace"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:14
-#, fuzzy
 msgid "Treat the repository as bare"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:15
 msgid "Do not use replacement refs to replace git objects"
@@ -27281,14 +25764,12 @@ msgid "Don't treat pathspecs as globs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:19
-#, fuzzy
 msgid "Match pathspecs case-insensitively"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:20
-#, fuzzy
 msgid "Download objects and refs from another repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:21
 msgid "Remote"
@@ -27319,9 +25800,8 @@ msgstr "Branch"
 #: /tmp/fish/implicit/share/completions/git.fish:276
 #: /tmp/fish/implicit/share/completions/mdadm.fish:12
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:1
-#, fuzzy
 msgid "Be quiet"
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:24
 #: /tmp/fish/implicit/share/completions/git.fish:41
@@ -27333,9 +25813,8 @@ msgstr "Run quietly"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:53
 #: /tmp/fish/implicit/share/completions/prt-get.fish:111
 #: /tmp/fish/implicit/share/completions/xz.fish:32
-#, fuzzy
 msgid "Be verbose"
-msgstr "Do not be verbose"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:25
 #: /tmp/fish/implicit/share/completions/git.fish:215
@@ -27394,10 +25873,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:38
-#, fuzzy
 msgid ""
 "Use this option to set the path to the temporary directory used for rewriting"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:39
 msgid ""
@@ -27406,44 +25884,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:40
-#, fuzzy
 msgid "Manage set of tracked repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:42
-#, fuzzy
 msgid "Adds a new remote"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:43
-#, fuzzy
 msgid "Removes a remote"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:44
-#, fuzzy
 msgid "Shows a remote"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:45
-#, fuzzy
 msgid "Deletes all stale tracking branches"
-msgstr "Delete all cache contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:46
-#, fuzzy
 msgid "Fetches updates"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:47
-#, fuzzy
 msgid "Renames a remote"
-msgstr "Rename module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:48
-#, fuzzy
 msgid "Sets the default branch for a remote"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:49
 msgid "Changes URLs for a remote"
@@ -27509,23 +25979,20 @@ msgid "Generate a diffstat, showing the number of changed lines of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:66
-#, fuzzy
 msgid "Shows the commits on branches"
-msgstr "Show the exited containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:67
 msgid "Rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:68
-#, fuzzy
 msgid "Add file contents to the index"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:69
-#, fuzzy
 msgid "Don't actually add the file(s)"
-msgstr "Don't actually take the action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:71
 msgid "Allow adding otherwise ignored files"
@@ -27533,23 +26000,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:259
-#, fuzzy
 msgid "Interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:73
 msgid "Interactively choose hunks to stage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:74
-#, fuzzy
 msgid "Manually create a patch"
-msgstr "Manually create ARP address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:75
-#, fuzzy
 msgid "Only match tracked files"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:76
 msgid "Match files both in working tree and index"
@@ -27578,14 +26042,12 @@ msgid "Checkout and switch to a branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:82
-#, fuzzy
 msgid "Local Branch"
-msgstr "Logical and"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:83
-#, fuzzy
 msgid "Remote Branch"
-msgstr "Branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:84
 #: /tmp/fish/implicit/share/completions/git.fish:245
@@ -27601,9 +26063,8 @@ msgid "Keep staged changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:91
-#, fuzzy
 msgid "Keep unmerged changes"
-msgstr "Discard unrecorded changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:92
 msgid "Apply a patch on a git index file and a working tree"
@@ -27618,43 +26079,36 @@ msgid "Find the change that introduced a bug by binary search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:95
-#, fuzzy
 msgid "List, create, or delete branches"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:97
-#, fuzzy
 msgid "Delete branch"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:98
-#, fuzzy
 msgid "Force deletion of branch"
-msgstr "Force deletion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:99
-#, fuzzy
 msgid "Rename branch"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:100
-#, fuzzy
 msgid "Force renaming branch"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:101
-#, fuzzy
 msgid "Lists both local and remote branches"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:102
 msgid "Track remote branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:103
-#, fuzzy
 msgid "Do not track remote branch"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:104
 msgid "Set remote branch to track"
@@ -27694,66 +26148,56 @@ msgid "Fast-forward if possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:115
-#, fuzzy
 msgid "Clone a repository into a new directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:116
-#, fuzzy
 msgid "Copy files instead of using hardlinks"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:117
 msgid "Operate quietly and do not report progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:118
-#, fuzzy
 msgid "Provide more information on what is going on"
-msgstr "Give more information during processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:119
 msgid "No checkout of HEAD is performed after the clone is complete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:120
-#, fuzzy
 msgid "Make a bare Git repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:121
-#, fuzzy
 msgid "Set up a mirror of the source repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:122
-#, fuzzy
 msgid "Use a specific name of the remote instead of the default"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:123
 msgid "Use a specific branch instead of the one used by the cloned repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:124
-#, fuzzy
 msgid "Truncate the history to a specified number of revisions"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:125
-#, fuzzy
 msgid "Initialize all submodules within the cloned repository"
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:126
-#, fuzzy
 msgid "Record changes to the repository"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:127
-#, fuzzy
 msgid "Amend the log message of the last commit"
-msgstr "Read the log message from file."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:128
 msgid "Fixup commit to be used with rebase --autosquash"
@@ -27764,14 +26208,12 @@ msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:131
-#, fuzzy
 msgid "Show diff of changes in the index"
-msgstr "Show all of the gems in the current bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:132
-#, fuzzy
 msgid "Compare two paths on the filesystem"
-msgstr "Compare archive and filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:134
 msgid "Open diffs in a visual tool"
@@ -27782,9 +26224,8 @@ msgid "Visually show diff of changes in the index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:138
-#, fuzzy
 msgid "Print lines matching a pattern"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:139
 msgid "Create an empty git repository or reinitialize an existing one"
@@ -27803,14 +26244,12 @@ msgid "Continue listing file history beyond renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:144
-#, fuzzy
 msgid "Don't print ref names"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:145
-#, fuzzy
 msgid "Print out ref names"
-msgstr "Print kernel name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:146
 msgid "Print ref name by which each commit was reached"
@@ -27821,9 +26260,8 @@ msgid "Limit the number of commits before starting to show the commit output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:148
-#, fuzzy
 msgid "Skip given number of commits"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:149
 #: /tmp/fish/implicit/share/completions/git.fish:150
@@ -27832,9 +26270,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:151
 #: /tmp/fish/implicit/share/completions/git.fish:152
-#, fuzzy
 msgid "Show commits older than specified date"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:153
 msgid "Limit commits from given author"
@@ -27849,9 +26286,8 @@ msgid "Limit commits to ones with reflog entries matching given pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:156
-#, fuzzy
 msgid "Limit commits with message that match given pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:157
 msgid "Limit commits to ones that match all given --grep"
@@ -27862,23 +26298,20 @@ msgid "Limit commits to ones with message that don't match --grep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:159
-#, fuzzy
 msgid "Case insensitive match"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:160
 msgid "Patterns are basic regular expressions (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:161
-#, fuzzy
 msgid "Patterns are extended regular expressions"
-msgstr "Pattern is extended regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:162
-#, fuzzy
 msgid "Patterns are fixed strings"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:163
 msgid "Patterns are Perl-compatible regular expressions"
@@ -27889,9 +26322,8 @@ msgid "Stop when given path disappears from tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:165
-#, fuzzy
 msgid "Print only merge commits"
-msgstr "Print only left column"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:166
 msgid "Don't print commits with more than one parent"
@@ -27951,9 +26383,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:178
-#, fuzzy
 msgid "Do not include refs matching given glob pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:179
 msgid ""
@@ -27962,14 +26393,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:180
-#, fuzzy
 msgid "Ignore invalid object names"
-msgstr "Ignore environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:181
-#, fuzzy
 msgid "Read commits from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:182
 msgid "Mark equivalent commits with = and inequivalent with +"
@@ -27988,9 +26417,8 @@ msgid "Autocommit the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:188
-#, fuzzy
 msgid "Don't autocommit the merge"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:189
 msgid "Edit auto-generated merge message"
@@ -28021,23 +26449,20 @@ msgid "Don't populate the log message with one-line descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:196
-#, fuzzy
 msgid "Show diffstat of the merge"
-msgstr "Show modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:197
 msgid "Don't show diffstat of the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:198
-#, fuzzy
 msgid "Squash changes from other branch as a single commit"
-msgstr "Bring changes from the repository into the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:199
-#, fuzzy
 msgid "Don't squash changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:202
 #: /tmp/fish/implicit/share/completions/git.fish:219
@@ -28050,23 +26475,20 @@ msgid "Force no progress status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:204
-#, fuzzy
 msgid "Set the commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:205
-#, fuzzy
 msgid "Abort the current conflict resolution process"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:206
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:207
-#, fuzzy
 msgid "Use specific merge resolution program"
-msgstr "Use specified message digest algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:209
 msgid "Move or rename a file, a directory, or a symlink"
@@ -28081,26 +26503,22 @@ msgid "Fetch from and merge with another repository or a local branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:214
-#, fuzzy
 msgid "Fetch all remotes"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:217
-#, fuzzy
 msgid "Keep downloaded pack"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:218
-#, fuzzy
 msgid "Disable automatic tag following"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:220
 #: /tmp/fish/implicit/share/completions/git.fish:223
 #: /tmp/fish/implicit/share/completions/git.fish:243
-#, fuzzy
 msgid "Remote alias"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:222
 msgid "Update remote refs along with associated objects"
@@ -28131,9 +26549,8 @@ msgid "Push all refs under refs/"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:231
-#, fuzzy
 msgid "Delete all listed refs from the remote repository"
-msgstr "Delete selected patches from the repository. (UNSAFE!)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:232
 msgid "Push all refs under refs/tags"
@@ -28148,9 +26565,8 @@ msgid "Do everything except actually send the updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:235
-#, fuzzy
 msgid "Produce machine-readable output"
-msgstr "Give human-readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:236
 msgid "Force update of remote refs"
@@ -28170,14 +26586,12 @@ msgid "Forward-port local commits to the updated upstream head"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:247
-#, fuzzy
 msgid "Restart the rebasing process"
-msgstr "Automatic line ending processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:248
-#, fuzzy
 msgid "Abort the rebase operation"
-msgstr "force reassociation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:249
 msgid "Keep the commits that don't cahnge anything"
@@ -28192,9 +26606,8 @@ msgid "Use merging strategies to rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:254
-#, fuzzy
 msgid "Show diffstat of the rebase"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:255
 msgid "Don't show diffstat of the rebase"
@@ -28209,18 +26622,16 @@ msgid "Don't allow the pre-rebase hook to run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:258
-#, fuzzy
 msgid "Force the rebase"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:260
 msgid "Try to recreate merges"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:261
-#, fuzzy
 msgid "Rebase all reachable commits"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:262
 msgid "Automatic squashing"
@@ -28231,38 +26642,32 @@ msgid "No automatic squashing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:264
-#, fuzzy
 msgid "No fast-forward"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:265
-#, fuzzy
 msgid "Reset current HEAD to the specified state"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:266
-#, fuzzy
 msgid "Reset files in working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:270
 msgid "Reflog"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:271
-#, fuzzy
 msgid "Revert an existing commit"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:272
-#, fuzzy
 msgid "Remove files from the working tree and from the index"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:273
-#, fuzzy
 msgid "Keep local copies"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:274
 msgid "Exit with a zero status even if no files matched"
@@ -28286,14 +26691,12 @@ msgid "Dry run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:279
-#, fuzzy
 msgid "Show the working tree status"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:280
-#, fuzzy
 msgid "Give the output in the short-format"
-msgstr "Give output suitable for get --context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:281
 msgid "Show the branch and tracking info even in short-format"
@@ -28312,9 +26715,8 @@ msgid "The untracked files handling mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:285
-#, fuzzy
 msgid "Ignore changes to submodules"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:286
 msgid "Create, list, delete or verify a tag object signed with GPG"
@@ -28325,14 +26727,12 @@ msgid "Make an unsigned, annotated tag object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:289
-#, fuzzy
 msgid "Make a GPG-signed tag"
-msgstr "Make a signature"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:290
-#, fuzzy
 msgid "Remove a tag"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:291
 msgid "Verify signature of a tag"
@@ -28347,19 +26747,16 @@ msgid "List tags that contain a commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:297
-#, fuzzy
 msgid "Stash away changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:298
-#, fuzzy
 msgid "List stashes"
-msgstr "Lists the keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:299
-#, fuzzy
 msgid "Show the changes recorded in the stash"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:300
 msgid "Apply and remove a single stashed state"
@@ -28370,47 +26767,40 @@ msgid "Apply a single stashed state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:302
-#, fuzzy
 msgid "Remove all stashed states"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:303
-#, fuzzy
 msgid "Remove a single stashed state from the stash list"
-msgstr "Remove a given entry from the --group list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:304
-#, fuzzy
 msgid "Create a stash"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:305
 msgid "Save a new stash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:306
-#, fuzzy
 msgid "Create a new branch from a stash"
-msgstr "Create a patch from unrecorded changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:307
-#, fuzzy
 msgid "Set and read git configuration variables"
-msgstr "Query a configuration variables value"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:308
-#, fuzzy
 msgid "Generate patch series to send upstream"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:310
 msgid "Generate plain patches without diffstat"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:311
-#, fuzzy
 msgid "Suppress diff output"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:312
 msgid "Spend more time to create smaller diffs"
@@ -28433,18 +26823,16 @@ msgid "Show number of added/deleted lines in decimal notation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:317
-#, fuzzy
 msgid "Output only last line of the stat"
-msgstr "Output only first of equal lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:318
 msgid "Output a condensed summary of extended header information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:319
-#, fuzzy
 msgid "Disable rename detection"
-msgstr "Disable file modification"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:320
 msgid "Show full blob object names"
@@ -28459,24 +26847,20 @@ msgid "Also inspect unmodified files as source for a copy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:324
-#, fuzzy
 msgid "Ignore changes in whitespace at EOL"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:325
-#, fuzzy
 msgid "Ignore changes in amount of whitespace"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:326
-#, fuzzy
 msgid "Ignore whitespace when comparing lines"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:328
-#, fuzzy
 msgid "Show whole surrounding functions of changes"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:329
 msgid "Allow an external diff helper to be executed"
@@ -28513,9 +26897,8 @@ msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:337
-#, fuzzy
 msgid "Add a submodule"
-msgstr "Add a symbolic tag to a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:338
 msgid "Show submodule status"
@@ -28527,28 +26910,24 @@ msgid "Initialize all submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:340
-#, fuzzy
 msgid "Update all submodules"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:341
-#, fuzzy
 msgid "Show commit summary"
-msgstr "Print summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:342
-#, fuzzy
 msgid "Run command on each submodule"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:343
 msgid "Sync submodules' URL with .gitmodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:344
-#, fuzzy
 msgid "Only print error messages"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:346
 msgid "Checkout the superproject's commit on a detached HEAD in the submodule"
@@ -28584,9 +26963,8 @@ msgid "Also add ignored submodule path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:353
-#, fuzzy
 msgid "Remove even with local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:354
 msgid "Use the commit stored in the index"
@@ -28597,23 +26975,20 @@ msgid "Compare the commit in the index with submodule HEAD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:356
-#, fuzzy
 msgid "Traverse submodules recursively"
-msgstr "Descend recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:357
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:358
-#, fuzzy
 msgid "Remove untracked files from the working tree"
-msgstr "Remove files from version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:359
-#, fuzzy
 msgid "Force run"
-msgstr "Forced quit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:360
 msgid "Show what would be done and clean files interactively"
@@ -28636,46 +27011,40 @@ msgid "Remove ignored files, as well"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:365
-#, fuzzy
 msgid "Remove only ignored files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:366
-#, fuzzy
 msgid "Show what revision and author last modified each line of a file"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:367
 msgid "Show blank SHA-1 for boundary commits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:368
-#, fuzzy
 msgid "Do not treat root commits as boundaries"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:369
 msgid "Include additional statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:370
-#, fuzzy
 msgid "Annotate only the given line range"
-msgstr "Annotate every line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:371
 msgid "Show long rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:372
-#, fuzzy
 msgid "Show raw timestamp"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:373
-#, fuzzy
 msgid "Use revisions from named file instead of calling rev-list"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:374
 msgid "Walk history forward instead of backward"
@@ -28686,23 +27055,20 @@ msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:376
-#, fuzzy
 msgid "Show the porcelain format"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:377
-#, fuzzy
 msgid "Show the result incrementally"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:378
 msgid "Instead of working tree, use the contents of the named file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:379
-#, fuzzy
 msgid "Specifies the format used to output dates"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:380
 msgid "Detect moved or copied lines within a file"
@@ -28715,63 +27081,52 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:383
-#, fuzzy
 msgid "Use the same output mode as git-annotate"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:384
-#, fuzzy
 msgid "Show the filename in the original commit"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:385
 msgid "Show the line number in the original commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:386
-#, fuzzy
 msgid "Suppress the author name and timestamp from the output"
-msgstr "Allow subkeys that have a timestamp from the future"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:387
-#, fuzzy
 msgid "Show the author email instead of author name"
-msgstr "Check out into dir instead of module name."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:388
-#, fuzzy
 msgid "Ignore whitespace changes"
-msgstr "Ignore whitespace"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:389
-#, fuzzy
 msgid "Custom command"
-msgstr "Job command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:1
-#, fuzzy
 msgid "Comma-separated list of analyses to perform"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:2
-#, fuzzy
 msgid "Show examples in command line mode"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:3
-#, fuzzy
 msgid "Go root directory"
-msgstr "Ports Directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:4
-#, fuzzy
 msgid "Print HTML in command-line mode"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:5
-#, fuzzy
 msgid "HTTP service address"
-msgstr "Numerical address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:6
 msgid "httptest.NewServer serves on this address and blocks"
@@ -28794,14 +27149,12 @@ msgid "Index throttle value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:11
-#, fuzzy
 msgid "Link identifiers to their declarations"
-msgstr "Lists the identifier for every generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:12
-#, fuzzy
 msgid "Maximum number of full text search results shown"
-msgstr "Maximum number of log entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:13
 msgid "Regular expression matching note markers to show"
@@ -28824,9 +27177,8 @@ msgid "Print (exported) source in command-line mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:18
-#, fuzzy
 msgid "Tab width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:19
 msgid "Directory containing alternate template files"
@@ -28841,52 +27193,44 @@ msgid "Print HTML for named URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:23
-#, fuzzy
 msgid "Write index to a file"
-msgstr "Write to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:24
 msgid "Zip file providing the file system to serve"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:1
-#, fuzzy
 msgid "Complete go build commands"
-msgstr "Complete dd operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:2
-#, fuzzy
 msgid "force rebuild"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:3
-#, fuzzy
 msgid "print the commands but do not run them"
-msgstr "Print quoted commands to stderr, do not run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:4
 msgid "number parallel builds (default=#cpus)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:5
-#, fuzzy
 msgid "enable data race detection"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:6
-#, fuzzy
 msgid "print packages being built"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:7
-#, fuzzy
 msgid "print and preserve work directory"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:8
-#, fuzzy
 msgid "print the commands"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:9
 msgid "c compiler flags"
@@ -28917,19 +27261,16 @@ msgid "build tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:16
-#, fuzzy
 msgid "Complete go"
-msgstr "Complete lpr option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:17
-#, fuzzy
 msgid "compile packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:18
-#, fuzzy
 msgid "remove object files"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:19
 msgid ""
@@ -28938,9 +27279,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:20
-#, fuzzy
 msgid "print the remove commands it would execute, but not run them"
-msgstr "Print quoted commands to stderr, do not run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:21
 msgid ""
@@ -28958,100 +27298,83 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:24
 #: /tmp/fish/implicit/share/completions/go.fish:29
-#, fuzzy
 msgid "prints commands that would be executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:25
 #: /tmp/fish/implicit/share/completions/go.fish:30
 #: /tmp/fish/implicit/share/completions/go.fish:53
-#, fuzzy
 msgid "prints commands as they are executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:26
-#, fuzzy
 msgid "print Go environment information"
-msgstr "Display RubyGems environmental information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:27
-#, fuzzy
 msgid "run go tool fix on packages"
-msgstr "Cancel a hold on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:28
-#, fuzzy
 msgid "run gofmt on package sources"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:31
-#, fuzzy
 msgid "download and install packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:32
-#, fuzzy
 msgid "stop after downloading the packages; don't install"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:33
 msgid "run fix tool on packages before resolving dependencies or building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:34
-#, fuzzy
 msgid "update remote packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:35
-#, fuzzy
 msgid "get help on topic"
-msgstr "Get help on this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:36
 #: /tmp/fish/implicit/share/completions/go.fish:48
-#, fuzzy
 msgid "target tool"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:37
-#, fuzzy
 msgid "compile and install packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:38
-#, fuzzy
 msgid "list packages"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:39
-#, fuzzy
 msgid "tolerate erroneous packages"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:40
-#, fuzzy
 msgid "pass in template for formatting"
-msgstr "Specifies line formatting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:41
-#, fuzzy
 msgid "print in JSON format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:42
-#, fuzzy
 msgid "list of build tags"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:43
 msgid "compile and run Go program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:44
-#, fuzzy
 msgid "test packages"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:45
 msgid "compile the test binary to pkg.test but do not run it"
@@ -29062,41 +27385,34 @@ msgid "install dependent packages, but don't run tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:47
-#, fuzzy
 msgid "run specified go tool"
-msgstr "Rename specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:49
-#, fuzzy
 msgid "print the command that would be executed but not execute it"
 msgstr ""
-"Print the command line on the standard error output before executing it"
 
 #: /tmp/fish/implicit/share/completions/go.fish:50
-#, fuzzy
 msgid "print Go version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:51
-#, fuzzy
 msgid "vet packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:52
 msgid "print the command that would be executed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:1
-#, fuzzy
 msgid "Write cpu profile to this file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:2
 #: /tmp/fish/implicit/share/completions/goimports.fish:1
 #: /tmp/fish/implicit/share/completions/gorename.fish:1
-#, fuzzy
 msgid "Display diffs instead of rewriting files"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:3
 msgid "Report all errors (not just the first 10 on different lines)"
@@ -29111,9 +27427,8 @@ msgid "Rewrite rule (e.g., 'a[b:len(a)] -> a[b:]')"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:6
-#, fuzzy
 msgid "Simplify code"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:7
 #: /tmp/fish/implicit/share/completions/goimports.fish:5
@@ -29121,9 +27436,8 @@ msgid "Write result to (source) file instead of stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:2
-#, fuzzy
 msgid "Report all errors"
-msgstr "Report on all tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:3
 msgid "List files whose formatting differs from goimport's"
@@ -29154,43 +27468,36 @@ msgid "Identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:5
-#, fuzzy
 msgid "Show usage message"
-msgstr "Log message."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:6
 msgid "File and byte offset of identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:7
-#, fuzzy
 msgid "Build tag"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:8
-#, fuzzy
 msgid "New name for identifier"
-msgstr "Accept $ in identifiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:9
-#, fuzzy
 msgid "Print verbose information"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:1
-#, fuzzy
 msgid "Add user to group"
-msgstr "Add label to output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:2
-#, fuzzy
 msgid "Remove user from group"
-msgstr "Remove all entries from the --group list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:4
-#, fuzzy
 msgid "Remove the GROUP's password"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:5
 msgid "Restrict access to GROUP to its members"
@@ -29205,14 +27512,12 @@ msgid "set the list of administrators for GROUP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:1
-#, fuzzy
 msgid "Complete using gpg user ids"
-msgstr "Complete using path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:2
-#, fuzzy
 msgid "Complete using gpg key ids"
-msgstr "Complete using path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:3
 msgid ""
@@ -29245,9 +27550,8 @@ msgid "Store only (make a simple RFC1991 packet)"
 msgstr "Store only (make a simple RFC1991 packet)"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:10
-#, fuzzy
 msgid "Decrypt specified file or stdin"
-msgstr "Encrypt for specified user id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:11
 msgid "Assume specified file or stdin is sigfile and verify it"
@@ -29300,9 +27604,8 @@ msgstr "List all keys with their fingerprints"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
-#, fuzzy
 msgid "Generate a new key pair"
-msgstr "Generate man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:23
 msgid "Present a menu which enables you to do all key related tasks"
@@ -29556,9 +27859,8 @@ msgstr ""
 "keys"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:81
-#, fuzzy
 msgid "Specify trust model"
-msgstr "Specify gem trust policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:82
 msgid "Select how to display key IDs"
@@ -29929,9 +28231,8 @@ msgstr ""
 "Do not create an internal pool file for quicker generation of random numbers"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:165
-#, fuzzy
 msgid "Reset verbose level to 0"
-msgstr "Set the verbose level of output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:166
 msgid "Suppress the initial copyright message"
@@ -30012,9 +28313,8 @@ msgstr ""
 "Changes the behaviour of some commands. This is like --dry-run but different"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:181
-#, fuzzy
 msgid "Display the session key used for one message"
-msgstr "display path used to search for gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:182
 msgid "Don't use the public key but the specified session key"
@@ -30085,62 +28385,52 @@ msgid "Set the list of default preferences to the specified string"
 msgstr "Set the list of default preferences to the specified string"
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:1
-#, fuzzy
 msgid "Print complete help message on program usage"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:2
-#, fuzzy
 msgid "Print short message on program usage"
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:3
-#, fuzzy
 msgid "Turn on debugging"
-msgstr "Turn on Ruby debugging"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:4
-#, fuzzy
 msgid "Name of file to write debug info to"
-msgstr "Use *.inf files to overwrite audio options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:5
-#, fuzzy
 msgid "Quiet output (default=verbose)"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:6
 msgid "Hook script to call after downloads, captures, etc."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:7
-#, fuzzy
 msgid "Send file to stdout"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:8
-#, fuzzy
 msgid "Print filesize before data"
-msgstr "Print file size, not disk usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:9
 msgid "List auto-detected cameras"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:10
-#, fuzzy
 msgid "Show EXIF information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:11
-#, fuzzy
 msgid "Show info"
-msgstr "Show hidden"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:12
-#, fuzzy
 msgid "Show summary"
-msgstr "Print summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:13
 msgid "Show camera driver manual"
@@ -30151,76 +28441,64 @@ msgid "About the camera driver manual"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:15
-#, fuzzy
 msgid "Show storage information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:16
-#, fuzzy
 msgid "gPhoto shell"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:18
-#, fuzzy
 msgid "List supported camera models"
-msgstr "List trusted certificates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:19
-#, fuzzy
 msgid "List supported port devices"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:20
 msgid "Display camera/driver abilities"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:21
-#, fuzzy
 msgid "Specify device port"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:22
-#, fuzzy
 msgid "Specify serial transfer speed"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:23
-#, fuzzy
 msgid "Specify camera model"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:24
 msgid "(expert only) Override USB IDs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:25
-#, fuzzy
 msgid "List configuration tree"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:26
-#, fuzzy
 msgid "Dump full configuration tree"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:27
-#, fuzzy
 msgid "Get configuration value"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:28
 msgid "Set configuration value or index in choices"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:29
-#, fuzzy
 msgid "Set configuration value index in choices"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:30
-#, fuzzy
 msgid "Set configuration value"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:31
 msgid "Wait for event(s) from camera"
@@ -30235,18 +28513,16 @@ msgid "Capture a quick preview"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:34
-#, fuzzy
 msgid "Set bulb exposure time in seconds"
-msgstr "Maximum amount of cpu time in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:35
 msgid "Set number of frames to capture (default=infinite)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:36
-#, fuzzy
 msgid "Set capture interval in seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:37
 msgid "Reset capture interval on signal (default=no)"
@@ -30261,9 +28537,8 @@ msgid "Capture an image and download it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:40
-#, fuzzy
 msgid "Capture a movie"
-msgstr "TV capture mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:41
 msgid "Capture an audio clip"
@@ -30274,39 +28549,32 @@ msgid "Wait for shutter release on the camera and download"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:43
-#, fuzzy
 msgid "List folders in folder"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:44
-#, fuzzy
 msgid "List files in folder"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:45
-#, fuzzy
 msgid "Create a directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:46
-#, fuzzy
 msgid "Remove a directory"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:47
-#, fuzzy
 msgid "Display number of files"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:48
-#, fuzzy
 msgid "Get files given in range"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:49
-#, fuzzy
 msgid "Get all files from folder"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:50
 msgid "Get thumbnails given in range"
@@ -30325,9 +28593,8 @@ msgid "Get all metadata from folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:54
-#, fuzzy
 msgid "Upload metadata for file"
-msgstr "Do not dump metadata about files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:55
 msgid "Get raw data given in range"
@@ -30342,14 +28609,12 @@ msgid "Get audio data given in range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:58
-#, fuzzy
 msgid "Get all audio data from folder"
-msgstr "Play audio from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:59
-#, fuzzy
 msgid "Delete files given in range"
-msgstr "Create file with name as given in data"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:60
 msgid "Delete all files in folder (--no-recurse by default)"
@@ -30360,9 +28625,8 @@ msgid "Upload a file to camera"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:62
-#, fuzzy
 msgid "Specify a filename or filename pattern"
-msgstr "Specify filenames to be filtered"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:63
 msgid "Specify camera folder (default=\"/\")"
@@ -30377,14 +28641,12 @@ msgid "No recursion (default for deletion)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:66
-#, fuzzy
 msgid "Process new files only"
-msgstr "Process binary file as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:67
-#, fuzzy
 msgid "Overwrite files without asking"
-msgstr "Never overwrite files with same name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:1
 msgid "Print annotated source"
@@ -30403,23 +28665,20 @@ msgid "Display summary"
 msgstr "Display summary"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:5
-#, fuzzy
 msgid "Search directories for source"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:6
 msgid "No annotated source"
 msgstr "No annotated source"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:7
-#, fuzzy
 msgid "Print full path of source"
-msgstr "print full path to ebuild for package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:8
-#, fuzzy
 msgid "Print flat profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:9
 msgid "No flat profile"
@@ -30466,9 +28725,8 @@ msgid "Set demangling style"
 msgstr "Set demangling style"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:20
-#, fuzzy
 msgid "Turn of demangling"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:21
 msgid "Supress static functions"
@@ -30515,28 +28773,24 @@ msgid "Print summary"
 msgstr "Print summary"
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:2
-#, fuzzy
 msgid "Don't rebuild dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:3
-#, fuzzy
 msgid "Specify build file"
-msgstr "Specify build-dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:4
-#, fuzzy
 msgid "Specify settings file"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:5
 msgid "Only relevent project are configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:6
-#, fuzzy
 msgid "Specify console output type"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:7
 msgid "Continue task execution after failure"
@@ -30547,9 +28801,8 @@ msgid "Set system property of the JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:9
-#, fuzzy
 msgid "Log in debug mode"
-msgstr "Compiler debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:10
 msgid "Uses Gradle Daemon to run build"
@@ -30560,56 +28813,48 @@ msgid "Uses Gradle Daemon in foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:12
-#, fuzzy
 msgid "Specify gradle user home directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:13
 msgid "Launch Gradle GUI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:14
-#, fuzzy
 msgid "Specify an initialization script"
-msgstr "Specify an initialization file to read instead of ~/.muttrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:15
-#, fuzzy
 msgid "Set log level to info"
-msgstr "Set error level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:16
-#, fuzzy
 msgid "Include specified build in composite"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:17
 msgid "Runs build with all task actions disabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:18
-#, fuzzy
 msgid "Configure number of concurrent workers"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:19
-#, fuzzy
 msgid "Don't use deamon"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:20
-#, fuzzy
 msgid "Don't use network resources"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:21
 msgid "Set project property for build script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:22
-#, fuzzy
 msgid "Specify start directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:23
 msgid "Build project in parallel"
@@ -30620,9 +28865,8 @@ msgid "Profile build execution time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:25
-#, fuzzy
 msgid "Specify project cache directory"
-msgstr "Specify local cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:26
 msgid "Only log erros"
@@ -30633,14 +28877,12 @@ msgid "Force build script recompiling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:28
-#, fuzzy
 msgid "Refresh state of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:29
-#, fuzzy
 msgid "Ignore previously cached dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:30
 msgid "Print out full stacktrace for all exceptions"
@@ -30674,14 +28916,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/rfkill.fish:2
 #: /tmp/fish/implicit/share/completions/tmutil.fish:51
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:13
-#, fuzzy
 msgid "Print version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:36
-#, fuzzy
 msgid "Specify task to be excluded from execution"
-msgstr "Specify umask to use when writing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:2
 msgid "Process binary file as text"
@@ -30696,15 +28936,13 @@ msgid "Assume data type for binary files"
 msgstr "Assume data type for binary files"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:7
-#, fuzzy
 msgid "Colour output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:8
 #: /tmp/fish/implicit/share/completions/jq.fish:10
-#, fuzzy
 msgid "Color output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:9
 msgid "Only print number of matches"
@@ -30739,9 +28977,8 @@ msgid "Pattern is a fixed string"
 msgstr "Pattern is a fixed string"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:17
-#, fuzzy
 msgid "Use patterns from a file"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:18
 msgid "Pattern is basic regex"
@@ -30842,9 +29079,8 @@ msgid "Only whole matching lines"
 msgstr "Only whole matching lines"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:47
-#, fuzzy
 msgid "Ignore case (deprecated: use -i instead)"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:48
 msgid "Treat input as a set of zero-terminated lines"
@@ -30864,9 +29100,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:3
 #: /tmp/fish/implicit/share/completions/useradd.fish:4
-#, fuzzy
 msgid "Display help message and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:4
 #: /tmp/fish/implicit/share/completions/useradd.fish:7
@@ -30999,53 +29234,44 @@ msgid "Check if given file is BIOS bootsector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-file.fish:32
-#, fuzzy
 msgid "Display usage and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:1
-#, fuzzy
 msgid "Compress GRUB files"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:2
-#, fuzzy
 msgid "Use image and modules under given directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:3
-#, fuzzy
 msgid "Install given fonts"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:4
-#, fuzzy
 msgid "Install only given modules and their dependencies"
-msgstr "Install source packages and their build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:5
 msgid "Embed given file as public key for signature checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:6
-#, fuzzy
 msgid "Use translations under given directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:7
-#, fuzzy
 msgid "Install only given locales"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:8
-#, fuzzy
 msgid "Preload specfied modules"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:9
-#, fuzzy
 msgid "Install given theme"
-msgstr "Install needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:11
 msgid "Make drive also bootable as floppy"
@@ -31056,18 +29282,16 @@ msgid "Install GRUB images under DIR/grub"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:13
-#, fuzzy
 msgid "Set bootloader ID"
-msgstr "Set comment leader."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:14
 msgid "Choose compression to use for core image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:15
-#, fuzzy
 msgid "Set disk module to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:16
 msgid "Use given directory as the EFI System Partition root"
@@ -31090,9 +29314,8 @@ msgid "Use given color for label"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:21
-#, fuzzy
 msgid "Use given file for label"
-msgstr "Use unified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:22
 msgid "Use given directory for PPC Mac install"
@@ -31111,9 +29334,8 @@ msgid "Don't apply any reed-solomon codes when embedding core.img"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:26
-#, fuzzy
 msgid "Set product version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:27
 msgid "Delete device map if it already exists"
@@ -31124,9 +29346,8 @@ msgid "The installation is removable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:29
-#, fuzzy
 msgid "Do not probe for filesystems"
-msgstr "Skip other filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:30
 msgid "Install GRUB for given platform"
@@ -31137,37 +29358,32 @@ msgid "Print the grunt version. Combine with --verbose for more info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:1
-#, fuzzy
 msgid "Print the version information"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
-#, fuzzy
 msgid "Specify a custom schemas directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:3
 msgid "Get the value of a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:4
-#, fuzzy
 msgid "Determine if a key is writable"
-msgstr "File is writable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:5
 msgid "Determine the valid value range of a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:6
-#, fuzzy
 msgid "Print the description of a key"
-msgstr "Output description of mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:7
-#, fuzzy
 msgid "Set the value of a key"
-msgstr "Set the misc debug value to #"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:8
 msgid "Reset a key to its default value"
@@ -31182,24 +29398,20 @@ msgid "List all installed, non-relocatable schemas"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:11
-#, fuzzy
 msgid "List all installed, relocatable schemas"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:12
-#, fuzzy
 msgid "List all keys in a schema"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:13
-#, fuzzy
 msgid "List all children of a schema"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:14
-#, fuzzy
 msgid "List keys and values, recursively"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:4
 #: /tmp/fish/implicit/share/completions/gzip.fish:4
@@ -31218,9 +29430,8 @@ msgstr "Save/restore filename"
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:9
 #: /tmp/fish/implicit/share/completions/gzip.fish:9
-#, fuzzy
 msgid "Recurse directories"
-msgstr "Check directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:10
 #: /tmp/fish/implicit/share/completions/gzip.fish:10
@@ -31237,19 +29448,16 @@ msgid "Display document using only black and white"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:2
-#, fuzzy
 msgid "Display document without colors"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:3
-#, fuzzy
 msgid "Display document as usual"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:4
-#, fuzzy
 msgid "Start ghostscript in safe mode"
-msgstr "Start in binary mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:5
 msgid "Do not start ghostscript in safe mode"
@@ -31301,23 +29509,20 @@ msgid "The page should not be centered automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:17
-#, fuzzy
 msgid "Selects the paper size to be used"
-msgstr "Selects how passphrases are mangled"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:18
-#, fuzzy
 msgid "Sets the orientation of the page"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:19
 msgid "Selects the scale N, or arbitrary scale f.f"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:20
-#, fuzzy
 msgid "Selects the scale base N"
-msgstr "Select time style"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:21
 msgid "Interchange the meaning of the orientations landscape and seascape"
@@ -31329,14 +29534,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:23
-#, fuzzy
 msgid "Use antialiasing"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:24
-#, fuzzy
 msgid "Do not use antialiasing"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:25
 msgid "Dsc comments are respected"
@@ -31359,9 +29562,8 @@ msgid "Use backing pixmap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:30
-#, fuzzy
 msgid "Do not use backing pixmap"
-msgstr "Do not use gcc wrapper"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:31
 msgid "Watch the document file for changes"
@@ -31372,9 +29574,8 @@ msgid "Do not watch the document file for changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:34
-#, fuzzy
 msgid "Print a usage message and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:35
 msgid "Fit the size of the window to the size of the page"
@@ -31385,9 +29586,8 @@ msgid "Do not fit the size of the window to the size of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:37
-#, fuzzy
 msgid "Set geometry"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:38
 msgid "Read and use additional resources from FILE (higher priority)"
@@ -31414,14 +29614,12 @@ msgid "Start in fullscreen mode (needs support from WM)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:44
-#, fuzzy
 msgid "Presentation mode "
-msgstr "Question mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:45
-#, fuzzy
 msgid "Show gv version and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gzip.fish:14
 msgid "Use fast setting"
@@ -31432,27 +29630,24 @@ msgid "Use high compression setting"
 msgstr "Use high compression setting"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:1
-#, fuzzy
 msgid "Enable verbose output"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:2
 msgid "Location of your Helm config"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:3
-#, fuzzy
 msgid "Address of tiller"
-msgstr "Address boundary error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:4
 msgid "Name of the kubeconfig context to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:5
-#, fuzzy
 msgid "More information about a command"
-msgstr "Display information about a local or remote item."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:6
 msgid "The named Helm starter scaffold"
@@ -31476,9 +29671,8 @@ msgid "Prevent hooks from running during deletion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:10
-#, fuzzy
 msgid "Remove the release from the store"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:11
 #: /tmp/fish/implicit/share/completions/helm.fish:13
@@ -31491,9 +29685,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:12
 #: /tmp/fish/implicit/share/completions/helm.fish:14
-#, fuzzy
 msgid "Verify the packages against signatures"
-msgstr "Verify package integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:15
 #: /tmp/fish/implicit/share/completions/helm.fish:32
@@ -31519,52 +29712,45 @@ msgid "Directory into which the chart is expanded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:21
-#, fuzzy
 msgid "Verify the package against its signature"
-msgstr "Verify gem file against its internal checksum"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:22
 #: /tmp/fish/implicit/share/completions/helm.fish:35
 #: /tmp/fish/implicit/share/completions/helm.fish:47
 #: /tmp/fish/implicit/share/completions/helm.fish:87
-#, fuzzy
 msgid "Chart version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
 #: /tmp/fish/implicit/share/completions/helm.fish:76
-#, fuzzy
 msgid "Revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:25
 msgid "Dump all (computed) values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:27
-#, fuzzy
 msgid "Maximum number of revision to include in history"
-msgstr "Maximum number of open file descriptors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:28
 msgid "Use the canary tiller image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:29
-#, fuzzy
 msgid "Do not install tiller"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:30
-#, fuzzy
 msgid "Do not install local or remote"
-msgstr "Display information about a local or remote item."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:31
-#, fuzzy
 msgid "Override tiller image"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:33
 #: /tmp/fish/implicit/share/completions/helm.fish:38
@@ -31576,25 +29762,21 @@ msgid "Verify the provenance data for this chart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:37
-#, fuzzy
 msgid "Simulate an install"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:39
-#, fuzzy
 msgid "Release name"
-msgstr "Resource name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:40
-#, fuzzy
 msgid "Specify template used to name the release"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:41
 #: /tmp/fish/implicit/share/completions/helm.fish:82
-#, fuzzy
 msgid "Namespace"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:42
 msgid "Prevent hooks from running during install"
@@ -31606,84 +29788,69 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:44
 #: /tmp/fish/implicit/share/completions/helm.fish:84
-#, fuzzy
 msgid "Set values on the command line"
-msgstr "Set or get the commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:45
 #: /tmp/fish/implicit/share/completions/helm.fish:85
-#, fuzzy
 msgid "Specify values in a YAML file"
-msgstr "Specify a config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:46
-#, fuzzy
 msgid "Verify the package before installing it"
-msgstr "Verify package integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:48
-#, fuzzy
 msgid "Fail on lint warnings"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:49
-#, fuzzy
 msgid "Show all releases"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:50
-#, fuzzy
 msgid "Sort by release date"
-msgstr "Sort by size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:51
-#, fuzzy
 msgid "Show deleted releases"
-msgstr "Show held packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:52
-#, fuzzy
 msgid "Show releases that are currently being deleted"
-msgstr "Show all of the gems in the current bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:53
-#, fuzzy
 msgid "Show deployed releases"
-msgstr "Show held packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:54
-#, fuzzy
 msgid "Show failed releases"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:55
-#, fuzzy
 msgid "Maximum number of releases to fetch"
-msgstr "Maximum number of nested blocks reached."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:56
 msgid "Next release name in the list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:57
-#, fuzzy
 msgid "Reverse the sort order"
-msgstr "Reverse sort order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:58
-#, fuzzy
 msgid "Output short listing format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:59
-#, fuzzy
 msgid "Name of the key to use when signing"
-msgstr "Specify umask to use when writing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:61
-#, fuzzy
 msgid "Save packaged chart to local chart repository"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:62
 msgid "Use a PGP private key to sign this package"
@@ -31694,19 +29861,16 @@ msgid "Raise error if repo is already registered"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:64
-#, fuzzy
 msgid "Merge the generated index into the given index"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:65
-#, fuzzy
 msgid "URL of chart repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:66
-#, fuzzy
 msgid "Repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:69
 msgid "Simulate a rollback"
@@ -31717,28 +29881,24 @@ msgid "Prevent hooks from running during rollback"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:71
-#, fuzzy
 msgid "Use regular expressions for searching"
-msgstr "Use high compression setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:72
-#, fuzzy
 msgid "Show the long listing"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:73
-#, fuzzy
 msgid "Address to listen on"
-msgstr "Process list pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:74
 msgid "Path from which to serve charts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:79
-#, fuzzy
 msgid "Simulate an upgrade"
-msgstr "Distro upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:80
 msgid "Run an install if the release don't exists"
@@ -31753,14 +29913,12 @@ msgid "Verify the provenance of the chart before upgrading"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:89
-#, fuzzy
 msgid "Show the client version"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:90
-#, fuzzy
 msgid "Show the server version"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:1
 #: /tmp/fish/implicit/share/completions/help.fish:68
@@ -31768,112 +29926,93 @@ msgid "Autosuggestions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:2
-#, fuzzy
 msgid "Builtin commands"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:3
 msgid "Cartesian Products"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:4
-#, fuzzy
 msgid "Setting syntax highlighting colors"
-msgstr "Help on setting syntax highlighting colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:5
 msgid "Combining different expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:6
-#, fuzzy
 msgid "How tab-completion works"
-msgstr "Help on how tab-completion works"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:7
-#, fuzzy
 msgid "Useful functions for writing completions"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:8
-#, fuzzy
 msgid "Writing your own completions"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:9
-#, fuzzy
 msgid "Where to put completions"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:10
 msgid "Debugging fish scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:12
-#, fuzzy
 msgid "Command line editor"
-msgstr "Command to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:13
-#, fuzzy
 msgid "Emacs mode commands"
-msgstr "End a block of commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:14
-#, fuzzy
 msgid "Escaping characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:15
-#, fuzzy
 msgid "Event handlers"
-msgstr "event handler block"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:16
 #: /tmp/fish/implicit/share/completions/help.fish:25
-#, fuzzy
 msgid "Parameter expansion (Globbing)"
-msgstr "Help on parameter expansion (Globbing)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:17
-#, fuzzy
 msgid "Brace expansion {a,b,c}"
-msgstr "Help on brace expansion {a,b,c}"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:18
-#, fuzzy
 msgid "Command substitution"
-msgstr "in command substitution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:19
-#, fuzzy
 msgid "Command substitution (SUBCOMMAND)"
-msgstr "Help on command substitution (SUBCOMMAND)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:20
-#, fuzzy
 msgid "Home directory expansion ~USER"
-msgstr "Help on home directory expansion ~USER"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:21
-#, fuzzy
 msgid "Index range expansion"
-msgstr "Ignore changes due to tab expansion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:22
-#, fuzzy
 msgid "Process expansion %JOB"
-msgstr "Help on process expansion %JOB"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:24
-#, fuzzy
 msgid "Wildcard expansion *.*"
-msgstr "Help on wildcard expansion *.*"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:26
-#, fuzzy
 msgid "Configurable greeting"
-msgstr "Configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:27
 msgid "Help on how to reuse previously entered commands"
@@ -31884,19 +30023,16 @@ msgid "Searchable history"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:29
-#, fuzzy
 msgid "Shell variable and function names"
-msgstr "Allow dash (-) in function name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:30
-#, fuzzy
 msgid "Initialization files"
-msgstr "Configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:31
-#, fuzzy
 msgid "Introduction"
-msgstr "Illegal instruction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:32
 msgid "Common issues with fish"
@@ -31927,48 +30063,41 @@ msgid "Piping"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:39
-#, fuzzy
 msgid "Programmable prompt"
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:40
 msgid "Quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:41
-#, fuzzy
 msgid "Input/Output (IO) redirection"
-msgstr "Invalid input/output redirection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "Show warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
 msgstr "Introduction to the fish syntax"
 
 #: /tmp/fish/implicit/share/completions/help.fish:44
-#, fuzzy
 msgid "Background jobs"
-msgstr "Last background job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:45
-#, fuzzy
 msgid "Conditional execution of code and flow control"
-msgstr "Conditionally execute a block of commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:46
 #: /tmp/fish/implicit/share/completions/help.fish:74
-#, fuzzy
 msgid "Functions"
-msgstr "Function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:47
-#, fuzzy
 msgid "Autoloading functions"
-msgstr "Supress static functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:48
 msgid "Defining aliases"
@@ -31983,77 +30112,64 @@ msgid "Some common words"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:51
-#, fuzzy
 msgid "Programmable title"
-msgstr "Program section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:52
-#, fuzzy
 msgid "Shell variables"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:53
 msgid "Arrays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:54
-#, fuzzy
 msgid "Variables for changing highlighting colors"
-msgstr "Help on setting syntax highlighting colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:55
-#, fuzzy
 msgid "Exporting variables"
-msgstr "Export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:56
-#, fuzzy
 msgid "Variable scope for functions"
-msgstr "Disable some built-in functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:57
-#, fuzzy
 msgid "Locale variables"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:58
 msgid "Variable scope"
 msgstr "Variable scope"
 
 #: /tmp/fish/implicit/share/completions/help.fish:59
-#, fuzzy
 msgid "Special variables"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:60
-#, fuzzy
 msgid "The status variable"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:61
-#, fuzzy
 msgid "More on universal variables"
-msgstr "Help on environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:62
-#, fuzzy
 msgid "Vi mode commands"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:63
-#, fuzzy
 msgid "Command mode"
-msgstr "Command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:64
-#, fuzzy
 msgid "Insert mode"
-msgstr "Insert header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:65
-#, fuzzy
 msgid "Visual mode"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:66
 msgid "Tutorial"
@@ -32068,9 +30184,8 @@ msgid "Combiners (And, Or, Not)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:70
-#, fuzzy
 msgid "Command Substitutions"
-msgstr "in command substitution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:71
 msgid "Conditionals (If, Else, Switch)"
@@ -32097,29 +30212,24 @@ msgid "Lists"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:78
-#, fuzzy
 msgid "Loops"
-msgstr "Loop script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:79
-#, fuzzy
 msgid "Ready for more?"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:81
-#, fuzzy
 msgid "Pipes and Redirections"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:82
-#, fuzzy
 msgid "Prompt"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:83
-#, fuzzy
 msgid "Running Commands"
-msgstr "Command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:84
 msgid "Separating Commands (Semicolon)"
@@ -32130,37 +30240,32 @@ msgid "Startup (Where's .bashrc?)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:86
-#, fuzzy
 msgid "Syntax Highlighting"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:87
-#, fuzzy
 msgid "Tab Completions"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:88
-#, fuzzy
 msgid "Universal Variables"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:89
 msgid "Variables"
 msgstr "Variables"
 
 #: /tmp/fish/implicit/share/completions/help.fish:90
-#, fuzzy
 msgid "Why fish?"
-msgstr "fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:91
 msgid "Wildcards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:1
-#, fuzzy
 msgid "list installed addons"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:2
 msgid "manage apps (create, destroy)"
@@ -32179,9 +30284,8 @@ msgid "manage custom domains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:6
-#, fuzzy
 msgid "display logs for an app"
-msgstr "display USE flags for package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:7
 msgid "manage dynos (dynos, workers)"
@@ -32221,9 +30325,8 @@ msgid "list commands and display help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:16
-#, fuzzy
 msgid "manage authentication keys"
-msgstr "Do not cache authentication tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:18
 msgid "manage maintenance mode for an app"
@@ -32246,9 +30349,8 @@ msgid "manage plugins to the heroku gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:23
-#, fuzzy
 msgid "list available regions"
-msgstr "available sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:24
 msgid "manage the stack for an app"
@@ -32259,14 +30361,12 @@ msgid "check status of heroku platform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:26
-#, fuzzy
 msgid "update the heroku client"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:27
-#, fuzzy
 msgid "display version"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:28
 msgid ""
@@ -32287,28 +30387,24 @@ msgid "open an addon's documentation in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:32
-#, fuzzy
 msgid "downgrade an existing addon"
-msgstr "Upgrade existing package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:33
-#, fuzzy
 msgid "list all available addons"
-msgstr "List all available patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:34
 msgid "open an addon's dashboard in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:35
-#, fuzzy
 msgid "uninstall one or more addons"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:36
-#, fuzzy
 msgid "upgrade an existing addon"
-msgstr "Upgrade existing package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:37
 msgid "the org to list the apps for"
@@ -32331,9 +30427,8 @@ msgid " permanently destroy an app (--app APP)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:42
-#, fuzzy
 msgid "show detailed app information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:43
 msgid " add yourself to an organization app (--app APP)"
@@ -32364,18 +30459,16 @@ msgid "log in with your heroku credentials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:50
-#, fuzzy
 msgid "clear local authentication credentials"
-msgstr "Do not cache authentication tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:51
 msgid "display your api token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:52
-#, fuzzy
 msgid "display your heroku email address"
-msgstr "display the remote gem servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:53
 msgid "output config vars in shell format"
@@ -32383,9 +30476,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:54
 #: /tmp/fish/implicit/share/completions/heroku.fish:55
-#, fuzzy
 msgid "display a config value for an app"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:56
 #: /tmp/fish/implicit/share/completions/heroku.fish:57
@@ -32394,9 +30486,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:58
 #: /tmp/fish/implicit/share/completions/heroku.fish:59
-#, fuzzy
 msgid "unset one or more config vars"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:60
 msgid "add a custom domain to an app"
@@ -32412,18 +30503,16 @@ msgid "remove a custom domain from an app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:64
-#, fuzzy
 msgid "the number of lines to display"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:65
 msgid "only display logs from the given process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:66
-#, fuzzy
 msgid "only display logs from the given source"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:67
 msgid "continually stream logs"
@@ -32442,18 +30531,16 @@ msgid "capture a new backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:71
-#, fuzzy
 msgid "delete a backup"
-msgstr "Set date back"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:72
 msgid "downloads database backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:73
-#, fuzzy
 msgid "get information about a specific backup"
-msgstr "Show full information for specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:74
 msgid "restore a backup (default latest) to a database"
@@ -32501,9 +30588,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:88
 #: /tmp/fish/implicit/share/completions/heroku.fish:89
-#, fuzzy
 msgid "view detailed information for a release"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:90
 #: /tmp/fish/implicit/share/completions/heroku.fish:91
@@ -32511,9 +30597,8 @@ msgid "roll back to an older release"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:92
-#, fuzzy
 msgid "specify dyno size"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:93
 msgid "open a remote console session (with optional COMMAND)"
@@ -32544,43 +30629,36 @@ msgid "repository root directory or name of overlay bundle file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:2
-#, fuzzy
 msgid "change working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:3
 msgid "do not prompt, automatically pick the first choice for all prompts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:4
-#, fuzzy
 msgid "suppress output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:5
-#, fuzzy
 msgid "enable additional output"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:6
-#, fuzzy
 msgid "set/override config option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:7
-#, fuzzy
 msgid "enable debugging output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:8
-#, fuzzy
 msgid "start debugger"
-msgstr "Start debugger on error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:9
-#, fuzzy
 msgid "set the charset encoding"
-msgstr "xterm encoding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:10
 msgid "set the charset encoding mode"
@@ -32591,14 +30669,12 @@ msgid "always print a traceback on exception"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:12
-#, fuzzy
 msgid "time how long the command takes"
-msgstr "Set or get the commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:13
-#, fuzzy
 msgid "print command execution profile"
-msgstr "Select an option profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:16
 msgid "consider hidden changesets"
@@ -32635,9 +30711,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:453
 #: /tmp/fish/implicit/share/completions/hg.fish:460
 #: /tmp/fish/implicit/share/completions/hg.fish:495
-#, fuzzy
 msgid "include names matching the given patterns"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:20
 #: /tmp/fish/implicit/share/completions/hg.fish:26
@@ -32662,9 +30737,8 @@ msgstr "Insert modules matching the given wildcard"
 #: /tmp/fish/implicit/share/completions/hg.fish:454
 #: /tmp/fish/implicit/share/completions/hg.fish:461
 #: /tmp/fish/implicit/share/completions/hg.fish:496
-#, fuzzy
 msgid "exclude names matching the given patterns"
-msgstr "List all modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:21
 #: /tmp/fish/implicit/share/completions/hg.fish:48
@@ -32674,9 +30748,8 @@ msgstr "List all modules matching the given wildcard"
 #: /tmp/fish/implicit/share/completions/hg.fish:287
 #: /tmp/fish/implicit/share/completions/hg.fish:430
 #: /tmp/fish/implicit/share/completions/hg.fish:497
-#, fuzzy
 msgid "recurse into subrepositories"
-msgstr "Recurse into subdir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:22
 #: /tmp/fish/implicit/share/completions/hg.fish:27
@@ -32738,9 +30811,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:518
 #: /tmp/fish/implicit/share/completions/hg.fish:523
 #: /tmp/fish/implicit/share/completions/hg.fish:524
-#, fuzzy
 msgid "operate on patch repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:24
 #: /tmp/fish/implicit/share/completions/hg.fish:213
@@ -32748,23 +30820,20 @@ msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:29
-#, fuzzy
 msgid "annotate the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:30
-#, fuzzy
 msgid "don't follow copies and renames"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:31
 #: /tmp/fish/implicit/share/completions/hg.fish:128
 #: /tmp/fish/implicit/share/completions/hg.fish:145
 #: /tmp/fish/implicit/share/completions/hg.fish:165
 #: /tmp/fish/implicit/share/completions/hg.fish:328
-#, fuzzy
 msgid "treat all files as text"
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:32
 #: /tmp/fish/implicit/share/completions/hg.fish:171
@@ -32772,9 +30841,8 @@ msgid "list the author (long with -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:33
-#, fuzzy
 msgid "list the filename"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:34
 #: /tmp/fish/implicit/share/completions/hg.fish:172
@@ -32782,14 +30850,12 @@ msgid "list the date (short with -q)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:35
-#, fuzzy
 msgid "list the revision number (default)"
-msgstr "Edit the long comment by default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:36
-#, fuzzy
 msgid "list the changeset"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:37
 msgid "show line number at the first appearance"
@@ -32800,60 +30866,52 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:333
 #: /tmp/fish/implicit/share/completions/hg.fish:396
 #: /tmp/fish/implicit/share/completions/hg.fish:431
-#, fuzzy
 msgid "ignore white space when comparing lines"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:39
 #: /tmp/fish/implicit/share/completions/hg.fish:134
-#, fuzzy
 msgid "changes in the amount of white space"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:40
 #: /tmp/fish/implicit/share/completions/hg.fish:135
 #: /tmp/fish/implicit/share/completions/hg.fish:335
 #: /tmp/fish/implicit/share/completions/hg.fish:398
 #: /tmp/fish/implicit/share/completions/hg.fish:433
-#, fuzzy
 msgid "ignore changes whose lines are all blank"
-msgstr "Ignore changes whose lines are all blank"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:44
 msgid "do not pass files through decoders"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:45
-#, fuzzy
 msgid "directory prefix for files in archive"
-msgstr "Starting file in archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:46
-#, fuzzy
 msgid "revision to distribute"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:47
-#, fuzzy
 msgid "type of distribution to create"
-msgstr "Type of L1 instruction cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:52
 msgid "merge with old dirstate parent after backout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:53
-#, fuzzy
 msgid "revision to backout"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:54
 #: /tmp/fish/implicit/share/completions/hg.fish:160
 #: /tmp/fish/implicit/share/completions/hg.fish:269
 #: /tmp/fish/implicit/share/completions/hg.fish:452
-#, fuzzy
 msgid "specify merge tool"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:57
 #: /tmp/fish/implicit/share/completions/hg.fish:112
@@ -32863,9 +30921,8 @@ msgstr "Specify trust model"
 #: /tmp/fish/implicit/share/completions/hg.fish:394
 #: /tmp/fish/implicit/share/completions/hg.fish:408
 #: /tmp/fish/implicit/share/completions/hg.fish:426
-#, fuzzy
 msgid "use text as commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:58
 #: /tmp/fish/implicit/share/completions/hg.fish:113
@@ -32875,9 +30932,8 @@ msgstr "Read commit message from file"
 #: /tmp/fish/implicit/share/completions/hg.fish:395
 #: /tmp/fish/implicit/share/completions/hg.fish:409
 #: /tmp/fish/implicit/share/completions/hg.fish:427
-#, fuzzy
 msgid "read commit message from file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:59
 #: /tmp/fish/implicit/share/completions/hg.fish:114
@@ -32885,9 +30941,8 @@ msgstr "Read commit message from file"
 #: /tmp/fish/implicit/share/completions/hg.fish:211
 #: /tmp/fish/implicit/share/completions/hg.fish:428
 #: /tmp/fish/implicit/share/completions/hg.fish:513
-#, fuzzy
 msgid "record the specified date as commit date"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:60
 #: /tmp/fish/implicit/share/completions/hg.fish:115
@@ -32895,9 +30950,8 @@ msgstr "Help for the specified command"
 #: /tmp/fish/implicit/share/completions/hg.fish:212
 #: /tmp/fish/implicit/share/completions/hg.fish:429
 #: /tmp/fish/implicit/share/completions/hg.fish:514
-#, fuzzy
 msgid "record the specified user as committer"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:62
 msgid "reset bisect state"
@@ -32908,9 +30962,8 @@ msgid "mark changeset good"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:64
-#, fuzzy
 msgid "mark changeset bad"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:65
 msgid "skip testing changeset"
@@ -32925,9 +30978,8 @@ msgid "use command to check changeset state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:68
-#, fuzzy
 msgid "do not update to target"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:70
 #: /tmp/fish/implicit/share/completions/ifdown.fish:2
@@ -32938,9 +30990,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:71
 #: /tmp/fish/implicit/share/completions/hg.fish:126
 #: /tmp/fish/implicit/share/completions/hg.fish:522
-#, fuzzy
 msgid "revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:72
 msgid "delete a given bookmark"
@@ -32972,23 +31023,20 @@ msgid "run even when the destination is unrelated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:82
-#, fuzzy
 msgid "a changeset intended to be added to the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:83
 msgid "a specific branch you would like to bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:84
-#, fuzzy
 msgid "a base changeset assumed to be available at the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:85
-#, fuzzy
 msgid "bundle all changesets in the repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:86
 msgid "bundle compression type to use (default: bzip2)"
@@ -33003,9 +31051,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:305
 #: /tmp/fish/implicit/share/completions/hg.fish:314
 #: /tmp/fish/implicit/share/completions/hg.fish:324
-#, fuzzy
 msgid "specify ssh command to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:88
 #: /tmp/fish/implicit/share/completions/hg.fish:104
@@ -33016,9 +31063,8 @@ msgstr "Pass command to shell"
 #: /tmp/fish/implicit/share/completions/hg.fish:306
 #: /tmp/fish/implicit/share/completions/hg.fish:315
 #: /tmp/fish/implicit/share/completions/hg.fish:325
-#, fuzzy
 msgid "specify hg command to run on the remote side"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:89
 msgid "do not verify server certificate (ignoring web.cacerts"
@@ -33026,37 +31072,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:91
 #: /tmp/fish/implicit/share/completions/hg.fish:142
-#, fuzzy
 msgid "print output to file with formatted name"
-msgstr "Redirect output to file if file does not exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:92
-#, fuzzy
 msgid "print the given revision"
-msgstr "Print svn revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:93
 msgid "apply any matching decode filter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:97
-#, fuzzy
 msgid "the clone will include an empty working copy (only a repository)"
-msgstr "Check out a working copy from a repository."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:98
 msgid "revision, tag or branch to check out"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:99
-#, fuzzy
 msgid "include the specified changeset"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:100
-#, fuzzy
 msgid "clone only the specified branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:101
 #: /tmp/fish/implicit/share/completions/hg.fish:320
@@ -33090,20 +31131,17 @@ msgid "mark a branch as closed, hiding it from the branch list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:108
-#, fuzzy
 msgid "amend the parent of the working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:109
 #: /tmp/fish/implicit/share/completions/hg.fish:423
-#, fuzzy
 msgid "use the secret phase for committing"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:118
-#, fuzzy
 msgid "untrusted configuration options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:120
 msgid "record a copy that has already occurred"
@@ -33115,9 +31153,8 @@ msgid "forcibly copy over an existing managed file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:127
-#, fuzzy
 msgid "change made by revision"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:129
 #: /tmp/fish/implicit/share/completions/hg.fish:146
@@ -33129,9 +31166,8 @@ msgstr "Manage abbreviations"
 #: /tmp/fish/implicit/share/completions/hg.fish:357
 #: /tmp/fish/implicit/share/completions/hg.fish:387
 #: /tmp/fish/implicit/share/completions/hg.fish:400
-#, fuzzy
 msgid "use git extended diff format"
-msgstr "Use context diff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:130
 #: /tmp/fish/implicit/share/completions/hg.fish:147
@@ -33141,9 +31177,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:131
 #: /tmp/fish/implicit/share/completions/hg.fish:331
-#, fuzzy
 msgid "show which function each change is in"
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:132
 #: /tmp/fish/implicit/share/completions/hg.fish:332
@@ -33152,9 +31187,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:136
 #: /tmp/fish/implicit/share/completions/hg.fish:336
-#, fuzzy
 msgid "number of lines of context to show"
-msgstr "Print NUM lines of context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:137
 #: /tmp/fish/implicit/share/completions/hg.fish:225
@@ -33169,14 +31203,12 @@ msgid "against the second parent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:144
-#, fuzzy
 msgid "revisions to export"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:152
-#, fuzzy
 msgid "revisions to graft"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:153
 msgid "resume interrupted graft"
@@ -33184,33 +31216,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:154
 #: /tmp/fish/implicit/share/completions/hg.fish:204
-#, fuzzy
 msgid "invoke editor on commit messages"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:155
-#, fuzzy
 msgid "append graft info to log message"
-msgstr "Specify log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:156
-#, fuzzy
 msgid "the current date as commit date"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:157
-#, fuzzy
 msgid "the current user as committer"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:163
 msgid "end fields with NUL"
 msgstr "end fields with NUL"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:164
-#, fuzzy
 msgid "print all revisions that match"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:166
 #: /tmp/fish/implicit/share/completions/hg.fish:244
@@ -33218,18 +31245,16 @@ msgid "follow changeset history, or file history across copies and renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:167
-#, fuzzy
 msgid "ignore case when matching"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:168
 msgid "print only filenames and revisions that match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:169
-#, fuzzy
 msgid "print matching line numbers"
-msgstr "Print line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:170
 msgid "only search files changed within revision range"
@@ -33252,38 +31277,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:259
 #: /tmp/fish/implicit/share/completions/hg.fish:282
 #: /tmp/fish/implicit/share/completions/hg.fish:290
-#, fuzzy
 msgid "display using template map file"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:180
 #: /tmp/fish/implicit/share/completions/hg.fish:228
 #: /tmp/fish/implicit/share/completions/hg.fish:260
 #: /tmp/fish/implicit/share/completions/hg.fish:283
 #: /tmp/fish/implicit/share/completions/hg.fish:291
-#, fuzzy
 msgid "display with template"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:182
-#, fuzzy
 msgid "only help for extensions"
-msgstr "Disable all GNU extensions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:183
-#, fuzzy
 msgid "show only help for commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:184
-#, fuzzy
 msgid "show topics matching keyword"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:185
-#, fuzzy
 msgid "read history edits from the specified file"
-msgstr "Read user input from specified file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:186
 msgid "continue an edit already in progress"
@@ -33298,63 +31317,52 @@ msgid "abort an edit in progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:189
-#, fuzzy
 msgid "changesets not found in destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:190
-#, fuzzy
 msgid "force outgoing even for unrelated repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:191
-#, fuzzy
 msgid "first revision to be edited"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:193
-#, fuzzy
 msgid "identify the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:194
-#, fuzzy
 msgid "show local revision number"
-msgstr "Show record number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:195
-#, fuzzy
 msgid "show global revision id"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:196
-#, fuzzy
 msgid "show branch"
-msgstr "Show hierarchy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:197
-#, fuzzy
 msgid "show tags"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:198
 msgid "show bookmarks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:203
-#, fuzzy
 msgid "directory strip option for patch"
-msgstr "Prefix to strip on patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
-#, fuzzy
 msgid "don't commit, just update the working directory"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:206
-#, fuzzy
 msgid "apply patch without touching the working directory"
-msgstr "Record an inverse patch without changing the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:207
 msgid "apply patch to the nodes from which it was generated"
@@ -33374,9 +31382,8 @@ msgid "show newest record first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:217
-#, fuzzy
 msgid "file to store the bundles into"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:218
 msgid "a remote changeset intended to be added"
@@ -33395,35 +31402,30 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:221
 #: /tmp/fish/implicit/share/completions/hg.fish:253
 #: /tmp/fish/implicit/share/completions/hg.fish:276
-#, fuzzy
 msgid "show patch"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:223
 #: /tmp/fish/implicit/share/completions/hg.fish:255
 #: /tmp/fish/implicit/share/completions/hg.fish:278
-#, fuzzy
 msgid "limit number of changes displayed"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:224
 #: /tmp/fish/implicit/share/completions/hg.fish:256
 #: /tmp/fish/implicit/share/completions/hg.fish:279
-#, fuzzy
 msgid "do not show merges"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:226
 #: /tmp/fish/implicit/share/completions/hg.fish:258
 #: /tmp/fish/implicit/share/completions/hg.fish:281
-#, fuzzy
 msgid "show the revision DAG"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:238
-#, fuzzy
 msgid "search the repository as it is in REV"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:239
 #: /tmp/fish/implicit/share/completions/hg.fish:492
@@ -33431,61 +31433,52 @@ msgid "end filenames with NUL, for use with xargs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:240
-#, fuzzy
 msgid "print complete paths from the filesystem root"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:245
-#, fuzzy
 msgid "show revisions matching date spec"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:246
-#, fuzzy
 msgid "show copied files"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:247
 msgid "do case-insensitive search for a given text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:248
-#, fuzzy
 msgid "show the specified revision or range"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:249
 msgid "include revisions where files were removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:250
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "History of commands executed by user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:251
-#, fuzzy
 msgid "show changesets within the given named branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:252
 msgid "do not display revision or any of its ancestors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:264
-#, fuzzy
 msgid "revision to display"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:265
-#, fuzzy
 msgid "list files from all revisions"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:267
-#, fuzzy
 msgid "revision to merge"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:268
 msgid "review revisions to merge (no merge is performed)"
@@ -33493,9 +31486,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:272
 #: /tmp/fish/implicit/share/completions/hg.fish:310
-#, fuzzy
 msgid "a changeset intended to be included in the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:275
 #: /tmp/fish/implicit/share/completions/hg.fish:312
@@ -33503,9 +31495,8 @@ msgid "a specific branch you would like to push"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:289
-#, fuzzy
 msgid "show parents of the specified revision"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:294
 msgid "set changeset phase to public"
@@ -33524,9 +31515,8 @@ msgid "allow to move boundary backward"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:298
-#, fuzzy
 msgid "target revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:300
 msgid "update to new branch head if changesets were pulled"
@@ -33545,9 +31535,8 @@ msgid "bookmark to pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:309
-#, fuzzy
 msgid "force push"
-msgstr "Force yes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:311
 msgid "bookmark to push"
@@ -33559,9 +31548,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:318
 #: /tmp/fish/implicit/share/completions/hg.fish:418
-#, fuzzy
 msgid "show only the preceding applied patch"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:319
 #: /tmp/fish/implicit/share/completions/hg.fish:367
@@ -33569,45 +31557,38 @@ msgstr "Show only matching part"
 #: /tmp/fish/implicit/share/completions/hg.fish:416
 #: /tmp/fish/implicit/share/completions/hg.fish:417
 #: /tmp/fish/implicit/share/completions/hg.fish:419
-#, fuzzy
 msgid "print first line of patch header"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:321
-#, fuzzy
 msgid "do not update the new working directories"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:323
-#, fuzzy
 msgid "location of source patch repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:327
-#, fuzzy
 msgid "keep patch file"
-msgstr "Test archive files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:334
 #: /tmp/fish/implicit/share/completions/hg.fish:397
 #: /tmp/fish/implicit/share/completions/hg.fish:432
-#, fuzzy
 msgid "ignore changes in the amount of white space"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:340
 msgid "finish all applied changesets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:341
-#, fuzzy
 msgid "edit patch header"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:342
-#, fuzzy
 msgid "keep folded patch files"
-msgstr "List needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:345
 #: /tmp/fish/implicit/share/completions/hg.fish:369
@@ -33616,58 +31597,50 @@ msgid "tolerate non-conflicting local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:346
-#, fuzzy
 msgid "overwrite any local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:347
 #: /tmp/fish/implicit/share/completions/hg.fish:371
 #: /tmp/fish/implicit/share/completions/hg.fish:379
 #: /tmp/fish/implicit/share/completions/hg.fish:459
-#, fuzzy
 msgid "do not save backup copies of files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:348
-#, fuzzy
 msgid "all patches and guards"
-msgstr "All packages in world"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:349
 msgid "drop all guards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:350
-#, fuzzy
 msgid "import file in patch directory"
-msgstr "Symbolic link to directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:351
-#, fuzzy
 msgid "name of patch file"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:352
-#, fuzzy
 msgid "overwrite existing files"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:353
 msgid "place existing revisions under mq control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:355
-#, fuzzy
 msgid "qpush after importing"
-msgstr "Options for importing keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:356
 #: /tmp/fish/implicit/share/completions/hg.fish:386
 #: /tmp/fish/implicit/share/completions/hg.fish:399
 #: /tmp/fish/implicit/share/completions/hg.fish:511
-#, fuzzy
 msgid "edit commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:358
 #: /tmp/fish/implicit/share/completions/hg.fish:388
@@ -33694,53 +31667,44 @@ msgid "interactively record a new patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:368
-#, fuzzy
 msgid "pop all patches"
-msgstr "Answer yes to all patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:370
-#, fuzzy
 msgid "forget any local changes to patched files"
-msgstr "Get ready to edit a watched file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:374
-#, fuzzy
 msgid "apply on top of local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:375
-#, fuzzy
 msgid "apply the target patch to its recorded parent"
-msgstr "Create a patch from unrecorded changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:376
-#, fuzzy
 msgid "list patch name in commit text"
-msgstr "Give patch name and comment in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:377
-#, fuzzy
 msgid "apply all patches"
-msgstr "Apply <file> patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:378
 msgid "reorder patch series and apply only the patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:380
-#, fuzzy
 msgid "list all available queues"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:381
-#, fuzzy
 msgid "print name of active queue"
-msgstr "Print number of occurences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:382
-#, fuzzy
 msgid "create new queue"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:383
 msgid "rename active queue"
@@ -33779,14 +31743,12 @@ msgid "interactively select changes to refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:411
-#, fuzzy
 msgid "disable all guards"
-msgstr "disable a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:412
-#, fuzzy
 msgid "list all guards in series file"
-msgstr "list all packages owning file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:413
 msgid "pop to before first guarded applied patch"
@@ -33797,19 +31759,16 @@ msgid "pop, then reapply patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:415
-#, fuzzy
 msgid "print patches not in series"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:422
-#, fuzzy
 msgid "amend the parent of the working dir"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:436
-#, fuzzy
 msgid "record delete for missing files"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:437
 msgid "remove (and delete) file even if added or modified"
@@ -33824,9 +31783,8 @@ msgid "select all unresolved files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:448
-#, fuzzy
 msgid "list state of files needing merge"
-msgstr "print size of files contained in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:449
 msgid "mark files as resolved"
@@ -33847,23 +31805,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:457
 #: /tmp/fish/implicit/share/completions/hg.fish:521
-#, fuzzy
 msgid "tipmost revision matching date"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:458
-#, fuzzy
 msgid "revert to the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:465
 msgid "name of access log file to write to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:466
-#, fuzzy
 msgid "run server in background"
-msgstr "Run job in background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:467
 msgid "used internally by daemon mode"
@@ -33886,9 +31841,8 @@ msgid "prefix path to serve from (default: server root)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:472
-#, fuzzy
 msgid "name to show in web pages (default: working directory)"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:473
 msgid "name of the hgweb config file (see \"hg help hgweb\")"
@@ -33900,9 +31854,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:475
 #: /tmp/fish/implicit/share/completions/hg.fish:476
-#, fuzzy
 msgid "for remote clients"
-msgstr "List or remove functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:477
 msgid "web templates to use"
@@ -33917,34 +31870,28 @@ msgid "use IPv6 in addition to IPv4"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:480
-#, fuzzy
 msgid "SSL certificate file"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:482
-#, fuzzy
 msgid "show status of all files"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:483
-#, fuzzy
 msgid "show only modified files"
-msgstr "Download only diff file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:484
-#, fuzzy
 msgid "show only added files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:485
-#, fuzzy
 msgid "show only removed files"
-msgstr "Move or rename files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:486
-#, fuzzy
 msgid "show only deleted (but tracked) files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:487
 msgid "show only files without changes"
@@ -33955,29 +31902,24 @@ msgid "show only unknown (not tracked) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:489
-#, fuzzy
 msgid "show only ignored files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:491
-#, fuzzy
 msgid "show source of copied files"
-msgstr "Use source index field"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:493
-#, fuzzy
 msgid "show difference from revision"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:494
-#, fuzzy
 msgid "list the changed files of a revision"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:499
-#, fuzzy
 msgid "strip specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:500
 msgid "force removal of changesets, discard uncommitted changes"
@@ -34000,74 +31942,62 @@ msgid "check for push and pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:507
-#, fuzzy
 msgid "force tag"
-msgstr "Force warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:508
 msgid "make the tag local"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:509
-#, fuzzy
 msgid "revision to tag"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:510
-#, fuzzy
 msgid "remove a tag"
-msgstr "remove a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:512
-#, fuzzy
 msgid "use <text> as commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:517
 msgid "update to new branch head if changesets were unbundled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:519
-#, fuzzy
 msgid "discard uncommitted changes (no backup)"
-msgstr "Discard unrecorded changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:520
-#, fuzzy
 msgid "update across branches if no uncommitted changes"
-msgstr "Create a patch from unrecorded changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:1
-#, fuzzy
 msgid "Output file in given format"
-msgstr "Output filenames using the specified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:2
-#, fuzzy
 msgid "Specify tab length"
-msgstr "Specify line-length"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:3
-#, fuzzy
 msgid "Name of the input file"
-msgstr "Name of the source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:4
-#, fuzzy
 msgid "Name of the output file"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:5
 #: /tmp/fish/implicit/share/completions/hugo.fish:57
 #: /tmp/fish/implicit/share/completions/tex.fish:10
-#, fuzzy
 msgid "Output directory"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:6
-#, fuzzy
 msgid "Set type of the source code"
-msgstr "Name of the source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:7
 msgid "Highlight style"
@@ -34080,9 +32010,8 @@ msgstr "Update interval"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:2
 #: /tmp/fish/implicit/share/completions/htop.fish:3
-#, fuzzy
 msgid "Start htop in monochrome mode"
-msgstr "Start in improved Ex mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:4
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:22
@@ -34094,112 +32023,92 @@ msgid "Show help and exit"
 msgstr "Show help and exit"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:5
-#, fuzzy
 msgid "Show only given PIDs"
-msgstr "Show additional user IDs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:6
-#, fuzzy
 msgid "Monitor given user"
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:7
-#, fuzzy
 msgid "Sort column"
-msgstr "List by columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:127
-#, fuzzy
 msgid "Debug output"
-msgstr "Debug option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:3
-#, fuzzy
 msgid "Enable logging"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:4
-#, fuzzy
 msgid "Log file"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:6
 #: /tmp/fish/implicit/share/completions/iptables.fish:25
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:18
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:126
-#, fuzzy
 msgid "Verbose output"
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:7
-#, fuzzy
 msgid "Verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:8
-#, fuzzy
 msgid "Hostname and path to the root"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:9
-#, fuzzy
 msgid "Include content marked as draft"
-msgstr "Include directories tagged as cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:10
-#, fuzzy
 msgid "Include expired content"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:11
-#, fuzzy
 msgid "Include content with publishdate in the future"
-msgstr "Include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:12
-#, fuzzy
 msgid "Cache directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:13
 msgid "Canonicalize all relative URLs using baseurl"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:14
-#, fuzzy
 msgid "Remove files from destination not found in static directories"
-msgstr "Remove files from version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:15
-#, fuzzy
 msgid "Content directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:16
-#, fuzzy
 msgid "Destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:17
-#, fuzzy
 msgid "Do not build 404 page"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:18
-#, fuzzy
 msgid "Disable different kinds of pages"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:19
-#, fuzzy
 msgid "Do not build RSS files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:20
-#, fuzzy
 msgid "Do not build sitemap files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:21
 msgid "Add Git revision, date and author info to the pages"
@@ -34214,29 +32123,24 @@ msgid "Help for hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:24
-#, fuzzy
 msgid "Print missing translations"
-msgstr "Print compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:25
-#, fuzzy
 msgid "Ignore the cache directory"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:26
-#, fuzzy
 msgid "Layout directory"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:27
-#, fuzzy
 msgid "Do not sync permission mode of files"
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:28
-#, fuzzy
 msgid "Do not sync modification time of files"
-msgstr "Sort by modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:29
 msgid "Pluralize titles in lists using inflect"
@@ -34248,29 +32152,25 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:31
 #: /tmp/fish/implicit/share/completions/hugo.fish:45
-#, fuzzy
 msgid "Render to memory"
-msgstr "Reduce memory usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:32
 #: /tmp/fish/implicit/share/completions/hugo.fish:58
 #: /tmp/fish/implicit/share/completions/hugo.fish:92
 #: /tmp/fish/implicit/share/completions/hugo.fish:103
-#, fuzzy
 msgid "Source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:33
 #: /tmp/fish/implicit/share/completions/hugo.fish:46
-#, fuzzy
 msgid "Display memory and timing of different steps of the program"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:34
 #: /tmp/fish/implicit/share/completions/hugo.fish:47
-#, fuzzy
 msgid "Display metrics about template executions"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:35
 #: /tmp/fish/implicit/share/completions/hugo.fish:48
@@ -34278,19 +32178,16 @@ msgid "Calculate some improvement hints when combined with --templateMetrics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:36
-#, fuzzy
 msgid "Theme to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:37
-#, fuzzy
 msgid "Themes directory"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:38
-#, fuzzy
 msgid "Use /filename.html instead of /filename/"
-msgstr "Use /dev/urandom instead of /dev/random"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:39
 msgid "Watch filesystem for changes and recreate as needed"
@@ -34301,28 +32198,24 @@ msgid "Benchmark Hugo by building the site a number of times"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:41
-#, fuzzy
 msgid "Number of times to build the site"
-msgstr "Name of the darcs executable on the remote server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:42
-#, fuzzy
 msgid "CPU profile file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:43
 msgid "Help for benchmark"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:44
-#, fuzzy
 msgid "Memory profile file"
-msgstr "Move or rename files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:49
-#, fuzzy
 msgid "Perform some verification checks"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:50
 msgid "Help for check"
@@ -34333,34 +32226,28 @@ msgid "Check system ulimit settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:52
-#, fuzzy
 msgid "Help for ulimit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:53
-#, fuzzy
 msgid "Print the site configuration"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:54
-#, fuzzy
 msgid "Help for config"
-msgstr "Help on subject config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:55
-#, fuzzy
 msgid "Convert the content to different formats"
-msgstr "Don't add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:56
-#, fuzzy
 msgid "Help for convert"
-msgstr "Alias for “get”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:59
-#, fuzzy
 msgid "Enable less safe operations"
-msgstr "Disable multi-threaded operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:60
 msgid "Convert front matter to JSON"
@@ -34387,14 +32274,12 @@ msgid "Help for toYAML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:66
-#, fuzzy
 msgid "Print Hugo version and environment info"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:67
-#, fuzzy
 msgid "Help for env"
-msgstr "Alias for “get”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:68
 msgid "Collection of several useful generators"
@@ -34409,18 +32294,16 @@ msgid "Generate shell autocompletion script for Hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:71
-#, fuzzy
 msgid "Autocompletion file"
-msgstr "Complete using path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:72
 msgid "Help for autocomplete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:73
-#, fuzzy
 msgid "Autocompletion type"
-msgstr "Path to add completion to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:74
 msgid "Generate CSS stylesheet for the Chroma code highlighter"
@@ -34431,199 +32314,168 @@ msgid "Help for chromastyles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:76
-#, fuzzy
 msgid "Style used for highlighting lines"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:77
-#, fuzzy
 msgid "Style used for line numbers"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:78
 msgid "Highlighter style"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:79
-#, fuzzy
 msgid "Generate Markdown documentation for the Hugo CLI"
-msgstr "Generate RDoc documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:80
-#, fuzzy
 msgid "Doc directory"
-msgstr "Directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:81
 msgid "Help for doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:82
-#, fuzzy
 msgid "Generate man pages for the Hugo CLI"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:83
-#, fuzzy
 msgid "Man pages directory"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:84
-#, fuzzy
 msgid "Help for man"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:85
-#, fuzzy
 msgid "Import your site from others"
-msgstr "Compress repository with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:86
-#, fuzzy
 msgid "Help for import"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:87
 msgid "Import from Jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:88
-#, fuzzy
 msgid "Allow import into non-empty target directory"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:89
 msgid "Help for jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:90
-#, fuzzy
 msgid "List various types of content"
-msgstr "List archive contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:91
-#, fuzzy
 msgid "Help for list"
-msgstr "Home for %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:93
-#, fuzzy
 msgid "List all drafts"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:94
 msgid "Help for drafts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:95
-#, fuzzy
 msgid "List all expired posts"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:96
-#, fuzzy
 msgid "Help for expired"
-msgstr "Timer expired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:97
-#, fuzzy
 msgid "List all posts dated in the future"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:98
-#, fuzzy
 msgid "Help for future"
-msgstr "Alias for atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:99
-#, fuzzy
 msgid "Create new content"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:100
-#, fuzzy
 msgid "Editor to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:101
 msgid "Help for new"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:102
-#, fuzzy
 msgid "Content type to create"
-msgstr "Concatenate output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:104
-#, fuzzy
 msgid "Create a new site"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:105
-#, fuzzy
 msgid "Create site inside non-empty directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:106
 msgid "Config and front matter format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:107
-#, fuzzy
 msgid "Help for site"
-msgstr "Home for %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:108
-#, fuzzy
 msgid "Create a new theme"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:109
-#, fuzzy
 msgid "Help for theme"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:110
-#, fuzzy
 msgid "Start high performance web server"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:111
-#, fuzzy
 msgid "Append port to baseurl"
-msgstr "Append input to selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:112
 msgid "Interface to which the server will bind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:113
-#, fuzzy
 msgid "Enable full re-renders on changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:114
 msgid "Watch without enabling live browser reload on rebuild"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:115
-#, fuzzy
 msgid "Help for server"
-msgstr "Use proxy server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:116
-#, fuzzy
 msgid "Port for live reloading"
-msgstr "Dynamic port forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:117
 msgid "Interval to poll memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:118
-#, fuzzy
 msgid "Memory usage log file"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:119
 msgid "Navigate to changed content file on live browser reload"
@@ -34638,9 +32490,8 @@ msgid "Port on which the server will listen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:122
-#, fuzzy
 msgid "Render to destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:123
 msgid "Reset the content draft status"
@@ -34651,58 +32502,48 @@ msgid "Help for undraft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:125
-#, fuzzy
 msgid "Print the version number of Hugo"
-msgstr "Print line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:126
-#, fuzzy
 msgid "Help for version"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:1
-#, fuzzy
 msgid "Only send ipc message and suppress output"
-msgstr "Run adb devices and parse output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:2
-#, fuzzy
 msgid "Display version number and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:4
-#, fuzzy
 msgid "Set socket"
-msgstr "Socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:5
-#, fuzzy
 msgid "Specify ipc message type"
-msgstr "Specify log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:1
-#, fuzzy
 msgid "Convert from specified encoding"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:2
-#, fuzzy
 msgid "Convert to specified encoding"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:3
-#, fuzzy
 msgid "List known coded character sets"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:4
 msgid "Output file"
 msgstr "Output file"
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:5
-#, fuzzy
 msgid "Print progress information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:2
 #: /tmp/fish/implicit/share/completions/mogrify.fish:4
@@ -34723,9 +32564,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:26
-#, fuzzy
 msgid "Display the number of unique colors in the image"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:30
 msgid "Replace each pixel with its complementary color"
@@ -34740,9 +32580,8 @@ msgid "Print all group ids"
 msgstr "Print all group ids"
 
 #: /tmp/fish/implicit/share/completions/id.fish:3
-#, fuzzy
 msgid "Print name, not number"
-msgstr "Print line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/id.fish:4
 msgid "Print real ID, not effective"
@@ -34781,131 +32620,108 @@ msgid "Reports interface existence via return code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:2
-#, fuzzy
 msgid "Print out the whole config of iface"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:3
 msgid "Print out yes or no according to existence"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:4
-#, fuzzy
 msgid "Print out the address"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
-#, fuzzy
 msgid "Print netmask"
-msgstr "Print tally"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:6
-#, fuzzy
 msgid "Print network address"
-msgstr "Print network node hostname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:7
-#, fuzzy
 msgid "Print broadcast"
-msgstr "Print processor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:8
-#, fuzzy
 msgid "Print mtu"
-msgstr "Print tally"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:9
-#, fuzzy
 msgid "Print out the hardware address"
-msgstr "Use hardware address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:10
-#, fuzzy
 msgid "Print flags"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:11
-#, fuzzy
 msgid "Print all statistics on input"
-msgstr "Write package statistics to a file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:12
-#, fuzzy
 msgid "Print # of in packets"
-msgstr "Print login process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:13
-#, fuzzy
 msgid "Print # of in bytes"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:14
-#, fuzzy
 msgid "Print # of in errors"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:15
-#, fuzzy
 msgid "Print # of in drops"
-msgstr "Print X windows"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:16
-#, fuzzy
 msgid "Print # of in fifo overruns"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:17
-#, fuzzy
 msgid "Print # of in compress"
-msgstr "Print login process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:18
-#, fuzzy
 msgid "Print # of in multicast"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:19
-#, fuzzy
 msgid "Print all statistics on output"
-msgstr "Print xrandr outputs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:20
-#, fuzzy
 msgid "Print # of out packets"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:21
-#, fuzzy
 msgid "Print # of out bytes"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:22
-#, fuzzy
 msgid "Print # of out errors"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:23
-#, fuzzy
 msgid "Print # of out drops"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:24
 msgid "Print # of out fifo overruns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:25
-#, fuzzy
 msgid "Print # of out collisions"
-msgstr "Print lpr options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:26
 msgid "Print # of out carrier loss"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:27
-#, fuzzy
 msgid "Print # of out multicast"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:28
 msgid "Print # of incoming bytes per second"
@@ -34916,9 +32732,8 @@ msgid "Print # of outgoing bytes per second"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:2
-#, fuzzy
 msgid "Include window border in the output image"
-msgstr "Include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:10
 msgid "Obtain image by descending window hierarchy"
@@ -34950,27 +32765,24 @@ msgid "Seconds delay between snapshots [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:37
-#, fuzzy
 msgid "Select image from root window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:40
 msgid "Operate silently, i.e. don't ring any bells "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:41
-#, fuzzy
 msgid "Number of screen snapshots [value]"
-msgstr "Number of scrolled off lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:47
 msgid "Constant, Edge, Mirror, or Tile [method]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:48
-#, fuzzy
 msgid "Select window with this id or name [id]"
-msgstr "Select window by name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:52
 msgid "Preferred size or location of the image [geometry]"
@@ -34982,78 +32794,64 @@ msgid "Make this color transparent within the image [color]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:1
-#, fuzzy
 msgid "Start the service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:2
-#, fuzzy
 msgid "Stop the service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:3
-#, fuzzy
 msgid "Restart the service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:4
-#, fuzzy
 msgid "Reload Configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:5
-#, fuzzy
 msgid "Force reloading configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:6
-#, fuzzy
 msgid "Print the status of the service"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:1
-#, fuzzy
 msgid "Read commands from file or stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:2
-#, fuzzy
 msgid "Don't terminate on errors in batch mode"
-msgstr "Be tolerant of errors in commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:3
-#, fuzzy
 msgid "Print the version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:4
-#, fuzzy
 msgid "Output more information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:5
-#, fuzzy
 msgid "Output more detailed information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:6
-#, fuzzy
 msgid "Specify maximum number of loops for 'ip addr flush'"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:7
 msgid "The protocol family to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:8
-#, fuzzy
 msgid "Short for --family inet"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:9
-#, fuzzy
 msgid "Short for --family inet6"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:10
 msgid "Short for --family bridge"
@@ -35072,23 +32870,20 @@ msgid "Short for --family link"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:14
-#, fuzzy
 msgid "Output on one line"
-msgstr "Output only first of equal lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:15
 msgid "Resolve names and print them instead of addresses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:16
-#, fuzzy
 msgid "Use specified network namespace"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:17
-#, fuzzy
 msgid "Execute command for all objects"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:1
 msgid "Create a set identified with SETNAME"
@@ -35099,9 +32894,8 @@ msgid "Add a given entry to a SET"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:3
-#, fuzzy
 msgid "Delete an entry from a SET"
-msgstr "Deletes an item from history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:4
 msgid "Test whether an entry is in a set"
@@ -35109,87 +32903,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:5
 #: /tmp/fish/implicit/share/completions/ipset.fish:6
-#, fuzzy
 msgid "Destroy the specified set or all sets"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
 msgid "a"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:9
-#, fuzzy
 msgid "Output format to the list command"
-msgstr "Help for this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:10
-#, fuzzy
 msgid "Suppress any output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:11
 msgid "Enforce name lookup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:12
-#, fuzzy
 msgid "List just the names of the sets"
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:13
-#, fuzzy
 msgid "List the set names and headers"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:14
-#, fuzzy
 msgid "Filename instead of stdout"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:1
-#, fuzzy
 msgid "Append rules to the end of a chain"
-msgstr "Append files to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:2
 msgid "Check whether a matching rule exists in a chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:3
-#, fuzzy
 msgid "Delete rules from a chain"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:4
 #: /tmp/fish/implicit/share/completions/iptables.fish:20
-#, fuzzy
 msgid "Specify the target of a rule"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:5
-#, fuzzy
 msgid "Specify a match to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:6
-#, fuzzy
 msgid "Insert rules in the beginning of a chain"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:7
-#, fuzzy
 msgid "Replace a rule in a chain"
-msgstr "Replace revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:8
-#, fuzzy
 msgid "List all rules in a chain"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:9
-#, fuzzy
 msgid "Print all rules in a chain."
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:10
 msgid "Delete ALL rules in a chain"
@@ -35200,9 +32980,8 @@ msgid "Zero the packet and byte counters in chains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:12
-#, fuzzy
 msgid "Create a new user-defined chain by the given name"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:13
 msgid "Delete the optional user-defined chain specified"
@@ -35221,9 +33000,8 @@ msgid "The protocol of the rule or of the packet to check"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:18
-#, fuzzy
 msgid "Source specification"
-msgstr "force reassociation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:19
 msgid "Destination specification"
@@ -35251,14 +33029,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:27
 #: /tmp/fish/implicit/share/completions/pv.fish:11
-#, fuzzy
 msgid "Numeric output"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:28
-#, fuzzy
 msgid "Expand numbers"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:29
 msgid "When listing rules, add line numbers"
@@ -35269,9 +33045,8 @@ msgid "The table to operate on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:31
-#, fuzzy
 msgid "Use this command to load modules"
-msgstr "Use <command> to build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:2
 msgid "Automock all files by default"
@@ -35290,9 +33065,8 @@ msgid "Whether to use the transform cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:6
-#, fuzzy
 msgid "Disable the cache"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:7
 msgid "The directory where Jest should store its  dependency information"
@@ -35307,9 +33081,8 @@ msgid "Automatically clear mock calls and instances every test"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:10
-#, fuzzy
 msgid "Alias for --coverage"
-msgstr "Alias for “get”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:11
 msgid ""
@@ -35325,14 +33098,12 @@ msgid "Forces test results output color highlighting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:14
-#, fuzzy
 msgid "Alias for --color"
-msgstr "Alias for atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:15
-#, fuzzy
 msgid "The path to a jest config file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:16
 msgid ""
@@ -35345,9 +33116,8 @@ msgid "The directory where Jest should output its coverage files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:18
-#, fuzzy
 msgid "Pattern of files to ignore"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:19
 msgid "A list of reporter names that Jest uses when writing coverage reports"
@@ -35360,18 +33130,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:21
-#, fuzzy
 msgid "Print debugging info about your jest config"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
 msgid "The test environment used for all tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
-#, fuzzy
 msgid "Use this flag to show full diffs instead of a patch"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:24
 msgid "Find related tests for a list of source files"
@@ -35410,9 +33178,8 @@ msgid "Maps code coverage reports against original source code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:33
-#, fuzzy
 msgid "Specifies the maximum number of workers"
-msgstr "Maximum number of log entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:34
 msgid "Directory names to be searched recursively up from the requiring module"
@@ -35429,9 +33196,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:37
-#, fuzzy
 msgid "Modules to ignore"
-msgstr "HTML tags to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:38
 msgid "An alternative API to setting the NODE_PATH env variable"
@@ -35446,9 +33212,8 @@ msgid "Activates notifications for test results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:41
-#, fuzzy
 msgid "Run tests based on the changed files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:42
 msgid "A file where to write test results"
@@ -35487,9 +33252,8 @@ msgid "Paths to directories that Jest should use to search for files in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:51
-#, fuzzy
 msgid "Run all tests serially in the current process"
-msgstr "Run command in current process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:52
 msgid "The paths to modules to configure the testing environment"
@@ -35504,18 +33268,16 @@ msgid "Print your jest config and then exits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
-#, fuzzy
 msgid "Prevent tests from printing messages through the console"
-msgstr "Send error messages through syslog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:56
 msgid "Snapshot serializer modules Jest should use for snapshot testing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:57
-#, fuzzy
 msgid "Alias for --env"
-msgstr "Alias for “get”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:58
 msgid "The glob patterns Jest uses to detect test files"
@@ -35573,9 +33335,8 @@ msgid "Use this flag to re-record snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:71
-#, fuzzy
 msgid "Divert all output to stderr"
-msgstr "Never write output to terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:72
 msgid "Display individual test results with the test suite hierarchy"
@@ -35584,9 +33345,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/jest.fish:73
 #: /tmp/fish/implicit/share/completions/snap.fish:15
 #: /tmp/fish/implicit/share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Print the version and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:74
 msgid "Watch files for changes and rerun tests related to changed files"
@@ -35605,29 +33365,24 @@ msgid "Disable using watchman for file crawling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:1
-#, fuzzy
 msgid "Enable debugger"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:2
-#, fuzzy
 msgid "Output usage information"
-msgstr "Could not get user information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:3
-#, fuzzy
 msgid "Output version number"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:4
-#, fuzzy
 msgid "Create a new JHipster application"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:5
-#, fuzzy
 msgid "Deploy the current application to AWS"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:6
 msgid "Create pipeline scripts for popular CI tools"
@@ -35654,28 +33409,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:11
-#, fuzzy
 msgid "Create a JDL file from the existing entities"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:12
-#, fuzzy
 msgid "Deploy the current application to Heroku"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:13
 msgid "Create entities from the JDL file passed in argument"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:14
-#, fuzzy
 msgid "Display information about your current project and system"
-msgstr "Display information about a local or remote item."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:15
-#, fuzzy
 msgid "Deploy the current application to Kubernetes"
-msgstr "Do not cache authentication tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:16
 msgid ""
@@ -35684,38 +33435,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:17
-#, fuzzy
 msgid "Deploy the current application to OpenShift"
-msgstr "Display version and supported algorithms, and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:18
-#, fuzzy
 msgid "Deploy the current application to Rancher"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:19
-#, fuzzy
 msgid "Create a new JHipster server-side application"
-msgstr "Create a new directory under version control."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:20
-#, fuzzy
 msgid "Create a new Spring service bean"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:21
 msgid "Upgrade the JHipster version and the generated application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:22
-#, fuzzy
 msgid "Print command completion script"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:2
-#, fuzzy
 msgid "Show the process id of each process in the job"
-msgstr "Show the source location of a particular gem in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:3
 msgid "Show group id of job"
@@ -35738,43 +33483,36 @@ msgid "OR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:4
-#, fuzzy
 msgid "Prints a short help text and exits"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:5
-#, fuzzy
 msgid "Prints a short version string and exits"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:7
-#, fuzzy
 msgid "Show all fields in full"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:8
-#, fuzzy
 msgid "Show live tail of entries"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:9
-#, fuzzy
 msgid "Controls the number of journal lines"
-msgstr "Count the number of arguments"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:10
 msgid "Show all lines, even in follow mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:11
-#, fuzzy
 msgid "Controls the formatting"
-msgstr "Could not get user information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:12
-#, fuzzy
 msgid "Suppress warning about normal user"
-msgstr "Suppress the warning about “using insecure memory”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:13
 msgid "Show entries interleaved from all journals"
@@ -35785,9 +33523,8 @@ msgid "Show data only from a certain boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:15
-#, fuzzy
 msgid "Show data only of the specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:16
 msgid "Filter by priority"
@@ -35806,28 +33543,24 @@ msgid "Entries on or older than DATE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:20
-#, fuzzy
 msgid "Print all possible data values"
-msgstr "Print as little as possible"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:21
-#, fuzzy
 msgid "Specify journal directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:22
 msgid "Generate a new 128 bit ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:23
-#, fuzzy
 msgid "Show internal header information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:24
-#, fuzzy
 msgid "Shows the current disk usage"
-msgstr "Show current path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:25
 msgid "Generate Forward Secure Sealing key pair"
@@ -35838,41 +33571,36 @@ msgid "Change interval for the sealing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:27
-#, fuzzy
 msgid "Check journal for internal consistency"
-msgstr "Check the repository for consistency"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:28
 msgid "Specifies FSS key for --verify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:1
-#, fuzzy
 msgid "Output version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:2
 msgid "Use application/json-seq MIME type scheme"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:3
-#, fuzzy
 msgid "Parse input in streaming fasion"
-msgstr "Print svn revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:4
 msgid "Run filter just once in large array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:5
-#, fuzzy
 msgid "Don't parse as JSON but as string"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:6
-#, fuzzy
 msgid "Ignore input and treat it as null"
-msgstr "Force input to be treated as HTML"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:7
 msgid "Don't pretty-print JSON"
@@ -35883,28 +33611,24 @@ msgid "Use a tab for indentation instead of 2 spaces"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:9
-#, fuzzy
 msgid "Use given number of spaces for indentation"
-msgstr "Use Kerberos realm for authentication"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:11
-#, fuzzy
 msgid "Don't color output"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:12
-#, fuzzy
 msgid "Replace UTF-8 characters with escape sequences"
-msgstr "Replace non-graphic characters with “?”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:13
 msgid "Flush output after each JSON object is printed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:14
-#, fuzzy
 msgid "Sort object keys in output"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:15
 msgid "If output is string ouput its content directly to stdout"
@@ -35915,64 +33639,52 @@ msgid "Raw ouput without newlines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:17
-#, fuzzy
 msgid "Read filter from file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:18
-#, fuzzy
 msgid "Prepend given directory to search modules"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:19
-#, fuzzy
 msgid "Set exit status"
-msgstr "Negate exit status of job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:20
-#, fuzzy
 msgid "Set variable"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:21
-#, fuzzy
 msgid "Set JSON-encoded variable"
-msgstr "Set CVS user variable."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:22
-#, fuzzy
 msgid "Read JSON in file and bind to given variable"
-msgstr "Read a line of input into variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:23
-#, fuzzy
 msgid "Read JSON in file and bind to given variable [see man]"
-msgstr "Read a line of input into variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:24
-#, fuzzy
 msgid "Run tests in given file"
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:1
-#, fuzzy
 msgid "List available modules"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:2
-#, fuzzy
 msgid "Show author information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:3
-#, fuzzy
 msgid "Show license information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:4
-#, fuzzy
 msgid "Set a language"
-msgstr "Subtitle language"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:5
 msgid "Don't show main window"
@@ -35987,24 +33699,20 @@ msgid "Icon for the module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:8
-#, fuzzy
 msgid "Title for the window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:9
-#, fuzzy
 msgid "Show version information and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:10
-#, fuzzy
 msgid "Show help information and exit"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:1
-#, fuzzy
 msgid "List all devices"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:2
 msgid "List available (paired and reachable) devices"
@@ -36029,9 +33737,8 @@ msgid "Find the said device by ringing it."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:7
-#, fuzzy
 msgid "Stop pairing to a said device"
-msgstr "Stop and then start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:8
 msgid "Sends a ping to said device"
@@ -36046,33 +33753,28 @@ msgid "Share a file to a said device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:11
-#, fuzzy
 msgid "Display the notifications on a said device"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:12
-#, fuzzy
 msgid "Lock the specified device"
-msgstr "Remove specified service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:13
 msgid "Sends an SMS. Requires destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:14
-#, fuzzy
 msgid "Phone number to send the message"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:15
-#, fuzzy
 msgid "Device ID"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:16
-#, fuzzy
 msgid "Device Name"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:17
 msgid "Get encryption info about said device"
@@ -36083,29 +33785,24 @@ msgid "Lists remote commands and their ids"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:19
-#, fuzzy
 msgid "Executes a remote command by id"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:20
-#, fuzzy
 msgid "Displays this help."
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:21
-#, fuzzy
 msgid "Displays version information."
-msgstr "Display RubyGems environmental information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:22
-#, fuzzy
 msgid "Show author information."
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:23
-#, fuzzy
 msgid "Show license information."
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:24
 msgid "The base file name of the desktop entry for this application."
@@ -36150,9 +33847,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:11
-#, fuzzy
 msgid "List names of available signals and exit"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:12
 msgid "Case sensitive argument match for processed"
@@ -36175,25 +33871,21 @@ msgid "Limit to processes matching specified PROCNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:18
-#, fuzzy
 msgid "Do not skip zombies"
-msgstr "Don't skip boring files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:1
-#, fuzzy
 msgid "Test if kitchen has yet to be given the main command"
-msgstr "Test if vagrant has yet to be given the main command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:2
 #: /tmp/fish/implicit/share/completions/kitchen.fish:3
-#, fuzzy
 msgid "Describe available commands or one specific command"
-msgstr "Describe available tasks or one specific task"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:4
-#, fuzzy
 msgid "Lists one or more instances"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:5
 msgid "List the name of each instance only, one per line"
@@ -36205,9 +33897,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:2
 #: /tmp/fish/implicit/share/completions/latexmk.fish:32
-#, fuzzy
 msgid "never use bibtex"
-msgstr "Don't verify user attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:3
 msgid "use bibtex when needed, but only if the bib files exist"
@@ -36222,9 +33913,8 @@ msgid "Set contrast or intensity of banner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:6
-#, fuzzy
 msgid "Set scale for banner"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:7
 msgid "list commands used by latexmk for processing files"
@@ -36251,14 +33941,12 @@ msgid "Do NOT change to directory of source file when processing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:13
-#, fuzzy
 msgid "Show list of dependent files after processing"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:14
-#, fuzzy
 msgid "Do not show list of dependent files"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:15
 msgid ""
@@ -36271,9 +33959,8 @@ msgid "Filter to apply to dvi file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:17
-#, fuzzy
 msgid "generate dvi"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:18
 msgid "turn off required dvi"
@@ -36284,9 +33971,8 @@ msgid "Execute specified Perl code (as part of latexmk start-up code)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:20
-#, fuzzy
 msgid "force continued processing past errors"
-msgstr "Force to continue on some errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:21
 msgid "turn off forced continuing processing past errors"
@@ -36301,23 +33987,20 @@ msgid "process regardless of file timestamps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:24
-#, fuzzy
 msgid "Turn off -g"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:25
-#, fuzzy
 msgid "print help"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:26
 msgid "set basename of output file(s) to STRING"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:27
-#, fuzzy
 msgid "force landscape mode"
-msgstr "Use ansi mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:28
 msgid "turn off -l"
@@ -36344,9 +34027,8 @@ msgid "omit automatic reading of system, user and project rc files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:35
-#, fuzzy
 msgid "set name of directory for output files"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:36
 msgid "generate pdf by pdflatex"
@@ -36369,14 +34051,12 @@ msgid "turn off pdf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:41
-#, fuzzy
 msgid "generate postscript"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:42
-#, fuzzy
 msgid "turn off postscript"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:43
 msgid "Filter to apply to postscript file"
@@ -36403,9 +34083,8 @@ msgid "preview document"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:49
-#, fuzzy
 msgid "turn off preview mode"
-msgstr "Turn on autosplit mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:50
 msgid "preview document and continuously update"
@@ -36421,9 +34100,8 @@ msgid "silence progress messages from called programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:53
-#, fuzzy
 msgid "Read custom RC file"
-msgstr "Read URLs from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:54
 msgid "Use -recorder option for (pdf)latex"
@@ -36438,14 +34116,12 @@ msgid "Show list of rules after processing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:57
-#, fuzzy
 msgid "Do not show list of rules after processing"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:59
-#, fuzzy
 msgid "show CPU time used"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:60
 msgid "don't show CPU time used"
@@ -36461,9 +34137,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:63
 #: /tmp/fish/implicit/share/completions/latexmk.fish:65
-#, fuzzy
 msgid "display program version"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:64
 msgid "display usual progress messages from called programs"
@@ -36498,23 +34173,20 @@ msgid "Write the classpath of the current project to output-file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:3
-#, fuzzy
 msgid "Remove all files from project's target-path."
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:4
 msgid "Compile Clojure source into .class files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:5
-#, fuzzy
 msgid "Build jar and deploy to remote repository."
-msgstr "Add a new file/directory to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:6
-#, fuzzy
 msgid "Show details about dependencies."
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:7
 msgid "Higher-order task to perform other tasks in succession."
@@ -36525,18 +34197,16 @@ msgid "Display a list of tasks or help for a given task or subtask."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:9
-#, fuzzy
 msgid "Install current project to the local repository."
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:10
 msgid "Package up all the project's files into a jar file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:11
-#, fuzzy
 msgid "Compile Java source files."
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:12
 msgid "Start a Light Table client for this project"
@@ -36555,9 +34225,8 @@ msgid "Write a pom.xml file to disk for Maven interoperability."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:16
-#, fuzzy
 msgid "Start a repl session either with the current project or standalone."
-msgstr "Start an IRB session in the context of the current bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:17
 msgid "Run only the test namespaces which failed last time around."
@@ -36576,9 +34245,8 @@ msgid "List all available profiles or display one if given an argument."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:21
-#, fuzzy
 msgid "Run the project's tests."
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:22
 msgid "Run a task without nesting the project's JVM inside Leiningen's."
@@ -36597,9 +34265,8 @@ msgid "Upgrade Leiningen to specified version or latest stable."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:26
-#, fuzzy
 msgid "Print version for Leiningen and the current JVM."
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:27
 msgid "Apply the given task with the profile(s) specified."
@@ -36674,14 +34341,12 @@ msgid "Display status column"
 msgstr "Display status column"
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
-#, fuzzy
 msgid "Specify key bindings file"
-msgstr "Specify a config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:21
-#, fuzzy
 msgid "Prompt with percentage"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:22
 msgid "Verbose prompt"
@@ -36734,9 +34399,8 @@ msgid "Multiple blank lines sqeezed"
 msgstr "Multiple blank lines sqeezed"
 
 #: /tmp/fish/implicit/share/completions/less.fish:36
-#, fuzzy
 msgid "Do not fold long lines"
-msgstr "Do not follow mount points"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:37
 msgid "Edit tag"
@@ -36795,14 +34459,12 @@ msgid "Characters to scroll on left/right arrows"
 msgstr "Characters to scroll on left/right arrows"
 
 #: /tmp/fish/implicit/share/completions/light.fish:3
-#, fuzzy
 msgid "Get value (default)"
-msgstr "(default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:4
-#, fuzzy
 msgid "Set value"
-msgstr "Set date"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:5
 msgid "Add value"
@@ -36813,9 +34475,8 @@ msgid "Subtract value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:7
-#, fuzzy
 msgid "List controllers"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:8
 msgid "Restore brightness"
@@ -36826,100 +34487,85 @@ msgid "Save brightness"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:10
-#, fuzzy
 msgid "Brightness (default)"
-msgstr "(default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:11
-#, fuzzy
 msgid "Maximum brightness"
-msgstr "Maximium iterations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:12
 msgid "Minimum cap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:13
-#, fuzzy
 msgid "Selects controller automatically (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:14
-#, fuzzy
 msgid "Specify controller to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:15
-#, fuzzy
 msgid "Interpret & output values in percent"
-msgstr "Interpret the patch file as an ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:16
 msgid "Interpret & output values in raw mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:17
-#, fuzzy
 msgid "Sets the verbosity level"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:1
-#, fuzzy
 msgid "Make symbolic links instead of hard links"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:2
 #: /tmp/fish/implicit/share/completions/ln.fish:3
-#, fuzzy
 msgid "Make a backup of each existing destination file"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:4
 msgid "Allow superuser to attempt to hard link directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:5
-#, fuzzy
 msgid "Remove existing destination files"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:6
-#, fuzzy
 msgid "Prompt whether to remove destinations"
-msgstr "Prompt for whether to edit the long comment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:7
-#, fuzzy
 msgid "Dereference TARGETs that are symbolic links"
-msgstr "Dereferense symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:8
 msgid "Treat symlink to directory as if it were a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:9
-#, fuzzy
 msgid "Make hard links directly to symbolic links"
-msgstr "Never follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:10
-#, fuzzy
 msgid "Override the usual ~ backup suffix"
-msgstr "Use suffix as the simple backup suffix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:11
 msgid "Specify the DIRECTORY in which to create the links"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:12
-#, fuzzy
 msgid "Treat LINK_NAME as a normal file"
-msgstr "Treat DEST as a normal file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:13
-#, fuzzy
 msgid "Print name of each linked file"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:1
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:4
@@ -36941,30 +34587,26 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/localectl.fish:4
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:37
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:7
-#, fuzzy
 msgid "Print a short help text and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:5
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:38
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:8
-#, fuzzy
 msgid "Print a short version string and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:1
 msgid "Match all non-option arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:2
-#, fuzzy
 msgid "Match against the base name of the file"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:3
-#, fuzzy
 msgid "Print only the number of matches found"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:4
 msgid "Use different DATABASE file[s]"
@@ -36980,19 +34622,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:7
 #: /tmp/fish/implicit/share/completions/locate.fish:8
-#, fuzzy
 msgid "Treat broken symbolic links as if they were existing"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:9
-#, fuzzy
 msgid "Ignore case distinctions"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:10
-#, fuzzy
 msgid "Limit  the number of matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:11
 msgid "Use ASCII NUL as a separator"
@@ -37007,20 +34646,17 @@ msgid "Match against the whole name of the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:14
-#, fuzzy
 msgid "The pattern is a regular expression"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:15
-#, fuzzy
 msgid "Print a summary of the options and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:16
 #: /tmp/fish/implicit/share/completions/xmms.fish:11
-#, fuzzy
 msgid "Print the version number and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:1
 msgid "Starts the keylogging daemon"
@@ -37035,9 +34671,8 @@ msgid "Set ouput LOGFILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:4
-#, fuzzy
 msgid "Use file as input KEYMAP"
-msgstr "File as input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:5
 msgid "Use DEVICE as keyboard input"
@@ -37080,9 +34715,8 @@ msgid "Sets a standard System V interface script or PPD file "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:4
-#, fuzzy
 msgid "Deletes the named option from printer"
-msgstr "Deletes an item from history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:5
 msgid ""
@@ -37103,9 +34737,8 @@ msgid "Enables the destination and accepts jobs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:9
-#, fuzzy
 msgid "Provides a textual location of the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:10
 msgid "Specifies a PostScript Printer Description file to use with the printer"
@@ -37160,9 +34793,8 @@ msgid "Sets the destination to shared/published or unshared/unpublished"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:24
-#, fuzzy
 msgid "Sets the IPP operation policy associated with the destination"
-msgstr "Lists the keys associated with each client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:25
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:26
@@ -37174,18 +34806,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:1
-#, fuzzy
 msgid "Prints files to the named printer"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:2
 msgid "Specifies an existing job to modify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:3
-#, fuzzy
 msgid "Sets the number of copies to print from 1 to 100"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:4
 msgid "Sets the job priority from 1 (lowest) to 100 (highest)"
@@ -37197,18 +34827,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:6
 #: /tmp/fish/implicit/share/completions/lpr.fish:2
-#, fuzzy
 msgid "Sets the job name"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:7
 msgid "Specifies  when the job should be printed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:8
-#, fuzzy
 msgid "Specify the page ranges"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:1
 msgid "Shows a \"long\" listing of devices or drivers"
@@ -37221,18 +34849,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:3
-#, fuzzy
 msgid ""
 "Specifies  a  comma-separated  list  of  device  or  PPD  schemes that "
 "should be excluded from the results"
-msgstr "Specify a comma-separated list of directories you wish to exclude"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:4
-#, fuzzy
 msgid ""
 "Specifies a comma-separated list of device or PPD schemes that should be "
 "included in the  results"
-msgstr "Specify a comma-separated list of directories you wish to exclude"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:5
 msgid "Specifies the language to match when listing drivers with the -m option"
@@ -37252,45 +34878,40 @@ msgid "Specifies the timeout when listing devices with the -v option (sec)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:1
-#, fuzzy
 msgid "Sets the user default printer"
-msgstr "Use the default key as default recipient"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:2
 msgid "Lists the printer specific options and their current settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:3
-#, fuzzy
 msgid "Specifies a new option for the named destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:4
 msgid "Sets the destination and instance for any options that follow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:5
-#, fuzzy
 msgid "Removes the specified option for the named destination"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:6
 msgid "Removes the options for the named destination and instance"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:1
-#, fuzzy
 msgid "Change CUPS digest password"
-msgstr "Change directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:2
 msgid "Add password"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:3
-#, fuzzy
 msgid "Remove password"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:4
 msgid "Specify the group other, than default system group"
@@ -37302,14 +34923,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:6
-#, fuzzy
 msgid "Specifies an alternate server"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:3
-#, fuzzy
 msgid "Disables banner printing"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:4
 msgid ""
@@ -37325,9 +34944,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:6
-#, fuzzy
 msgid "Hold job for printing"
-msgstr "Format for printing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:7
 msgid ""
@@ -37339,14 +34957,12 @@ msgid "Show the server hostname and port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:2
-#, fuzzy
 msgid "Shows the ranking of print jobs"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:3
-#, fuzzy
 msgid "Specifies which jobs to show"
-msgstr "Specify which mailbox to load"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:4
 msgid "Shows the accepting state of selected printer queues"
@@ -37359,18 +34975,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:6
-#, fuzzy
 msgid "Shows the current default destination"
-msgstr "Stop the currently evaluated function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:7
 msgid "Shows a long listing of printers, classes, or jobs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:8
-#, fuzzy
 msgid "Shows the jobs queue on the specified destinations"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:9
 msgid "Shows the printers and whether or not they are enabled for printing"
@@ -37385,119 +34999,100 @@ msgid "Shows a status summary, including the default destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:12
-#, fuzzy
 msgid "Shows all status information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:13
-#, fuzzy
 msgid "Shows a list of print jobs queued by the specified users"
-msgstr "Set the list of personal digest preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:14
 msgid "Shows the printers and what device they are attached to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:1
-#, fuzzy
 msgid "print all devices"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:2
 msgid "print SIZE in bytes rather than in human readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:3
-#, fuzzy
 msgid "don't print slaves or holders"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:4
-#, fuzzy
 msgid "print discard capabilities"
-msgstr "get capabilies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:5
 msgid "exclude devices by major number (default: RAM disks)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:6
-#, fuzzy
 msgid "output info about filesystems"
-msgstr "Stay in local filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:7
-#, fuzzy
 msgid "usage information (this)"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:8
 msgid "use ascii characters only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:9
-#, fuzzy
 msgid "output info about permissions"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:10
-#, fuzzy
 msgid "don't print headings"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:11
-#, fuzzy
 msgid "output columns"
-msgstr "Output in two columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:12
-#, fuzzy
 msgid "use key='value' output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:13
-#, fuzzy
 msgid "use raw output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:14
 msgid "output info about topology"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:15
-#, fuzzy
 msgid "use list format ouput"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:1
-#, fuzzy
 msgid "Print both online and offline CPUs"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:2
-#, fuzzy
 msgid "Print online CPUs only"
-msgstr "Print newline counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:3
-#, fuzzy
 msgid "Print offline CPUs only"
-msgstr "Print newline counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:4
-#, fuzzy
 msgid "Print out an extended readable format"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:5
-#, fuzzy
 msgid "Print out a parseble format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:6
-#, fuzzy
 msgid "Use specified directory as system root"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:7
 msgid "Print hexadecimal masks rather thans lists of CPUs"
@@ -37607,9 +35202,8 @@ msgid "Print size of files"
 msgstr "Print size of files"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:28
-#, fuzzy
 msgid "Group directories before files"
-msgstr "Copy directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:29
 msgid "Do not list implied entries matching specified shell pattern"
@@ -37650,9 +35244,8 @@ msgid "Generate dired output"
 msgstr "Generate dired output"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
-#, fuzzy
 msgid "List format"
-msgstr "Long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:39
 msgid "Long format, full-iso time"
@@ -37663,9 +35256,8 @@ msgid "Don't print group information"
 msgstr "Don't print group information"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:43
-#, fuzzy
 msgid "Skip entries matching pattern"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:44
 #: /tmp/fish/implicit/share/completions/ls.fish:67
@@ -37745,9 +35337,8 @@ msgid "Causes list selections to be ANDed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:3
-#, fuzzy
 msgid "Use alternative name list file"
-msgstr "Set namelist file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:4
 msgid "Avoid kernel functions that might block: lstat, readlink, stat"
@@ -37774,9 +35365,8 @@ msgid "use of device cache file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:9
-#, fuzzy
 msgid "select by group (^ - negates)"
-msgstr "Select by group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:10
 msgid "Convert UIDs to login names"
@@ -37787,18 +35377,16 @@ msgid "Select or exclude processes by pid"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:12
-#, fuzzy
 msgid "Print PPID"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:13
 msgid "Produce terse output (pids only, no header)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:14
-#, fuzzy
 msgid "select by user (^ - negates)"
-msgstr "Select by user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:1
 msgid "Increase verbosity (show descriptors)"
@@ -37810,12 +35398,10 @@ msgstr ""
 "Show only devices with specified device and/or bus numbers (in decimal)"
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:3
-#, fuzzy
 msgid ""
 "Show only devices with the specified vendor and product ID numbers (in "
 "hexadecimal)"
 msgstr ""
-"Show only devices with specified device and/or bus numbers (in decimal)"
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:4
 msgid "Selects which device lsusb will examine"
@@ -37831,52 +35417,44 @@ msgid "Show version of program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:7
-#, fuzzy
 msgid "Show usage and help"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:1
-#, fuzzy
 msgid "Execute string"
-msgstr "Executable link"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:2
-#, fuzzy
 msgid "Require library"
-msgstr "Require parameter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:3
-#, fuzzy
 msgid "Enter interactive mode after executing script"
-msgstr "Interactive mode after executing commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:6
 msgid "Execute stdin and stop handling options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:1
-#, fuzzy
 msgid "Show command executions"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:2
 msgid "Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:3
-#, fuzzy
 msgid "Show the list of installed agents"
-msgstr "Show the dependencies of an installed gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:4
-#, fuzzy
 msgid "Start the first matching agent"
-msgstr "Print first matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:5
-#, fuzzy
 msgid "Stop the first matching agent"
-msgstr "Print first matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:6
 msgid "Stop and start the first matching agent"
@@ -37891,29 +35469,25 @@ msgid "Opens the launchctl daemon file in the default editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:9
-#, fuzzy
 msgid "Service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:10
 #: /tmp/fish/implicit/share/completions/lunchy.fish:12
-#, fuzzy
 msgid "Persist command"
-msgstr "Process command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:11
 msgid "Force start (disabled) agents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:1
-#, fuzzy
 msgid "Test if lxc has yet to be given the command"
-msgstr "Test if adb has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:2
-#, fuzzy
 msgid "Manage configuration."
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:3
 msgid "Copy containers within or in between lxd instances."
@@ -37924,9 +35498,8 @@ msgid "Delete containers or snapshots."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:5
-#, fuzzy
 msgid "Execute the specified command in a container."
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:6
 msgid "Manage files on a container."
@@ -37937,9 +35510,8 @@ msgid "Check if the LXD instance is up."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:8
-#, fuzzy
 msgid "Print help."
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:9
 msgid "Manipulate container images."
@@ -37958,14 +35530,12 @@ msgid "Launch a container from a particular image."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:13
-#, fuzzy
 msgid "Lists the available resources."
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:14
-#, fuzzy
 msgid "Prints all the subcommands help."
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:15
 msgid "Monitor activity on the LXD server."
@@ -37976,27 +35546,24 @@ msgid "Move containers within or in between lxd instances."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:17
-#, fuzzy
 msgid "Manage networks."
-msgstr "add a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:18
 msgid "Changes state of one or more containers to pause."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:19
-#, fuzzy
 msgid "Manage configuration profiles."
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:20
 msgid "Publish containers as images."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:21
-#, fuzzy
 msgid "Manage remote LXD servers."
-msgstr "display the remote gem servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:22
 msgid "Changes state of one or more containers to restart."
@@ -38019,24 +35586,20 @@ msgid "Changes state of one or more containers to stop."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:27
-#, fuzzy
 msgid "Prints the version number of this client tool."
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:1
-#, fuzzy
 msgid "print this help and exit"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:2
-#, fuzzy
 msgid "print version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:3
-#, fuzzy
 msgid "use specified profile"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:4
 msgid "set log level 0-5. 0 - none 5 - chatty"
@@ -38055,9 +35618,8 @@ msgid "Force a 'm4_' prefix to all builtins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:6
-#, fuzzy
 msgid "Suppress some warnings for builtins"
-msgstr "Suppress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:7
 msgid ""
@@ -38081,9 +35643,8 @@ msgid "Undefine NAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:12
-#, fuzzy
 msgid "Suppress all GNU extensions"
-msgstr "Disable all GNU extensions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:13
 msgid "Set symbol lookup hash table size [509]"
@@ -38098,27 +35659,24 @@ msgid "Produce a frozen state on FILE at end"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:16
-#, fuzzy
 msgid "Reload a frozen state from FILE at start"
-msgstr "Read a batched update from FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:17
 msgid "Set debug level (no FLAGS implies 'aeq')"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:18
-#, fuzzy
 msgid "Redirect debug and trace output"
-msgstr "Run adb devices and parse output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:19
 msgid "Restrict macro tracing size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:20
-#, fuzzy
 msgid "Trace NAME when it is defined"
-msgstr "Test if function is defined"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:2
 #: /tmp/fish/implicit/share/completions/systemctl.fish:38
@@ -38129,46 +35687,40 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/machinectl.fish:3
 #: /tmp/fish/implicit/share/completions/systemctl.fish:39
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:3
-#, fuzzy
 msgid "Print a short help and exit"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:4
 #: /tmp/fish/implicit/share/completions/pactl.fish:9
 #: /tmp/fish/implicit/share/completions/systemctl.fish:40
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:4
-#, fuzzy
 msgid "Print a short version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:6
 #: /tmp/fish/implicit/share/completions/systemctl.fish:22
-#, fuzzy
 msgid "Do not print header and footer"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:7
 msgid "Don't ask for password for privileged operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:8
-#, fuzzy
 msgid "List running machines"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:9
-#, fuzzy
 msgid "List startable machine images"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:10
 msgid "Also show machines starting with a '.'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:11
-#, fuzzy
 msgid "Show information about machine"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:12
 msgid "Do not ellipsize process tree entries"
@@ -38183,28 +35735,24 @@ msgid "Formatting of journal output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:15
-#, fuzzy
 msgid "Show properties of machines"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:16
-#, fuzzy
 msgid "Limit to certain properties"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:17
 msgid "Show all properties, even if not set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:18
-#, fuzzy
 msgid "Start machine"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:19
-#, fuzzy
 msgid "Login to a machine"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:20
 msgid "Enable machine to start at boot"
@@ -38215,9 +35763,8 @@ msgid "Disable machine from starting at boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:22
-#, fuzzy
 msgid "Poweroff machine"
-msgstr "Power failure"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:23
 msgid "Reboot machine"
@@ -38228,52 +35775,44 @@ msgid "Terminate machine (without shutting down)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:25
-#, fuzzy
 msgid "Send signal to process in a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:26
 msgid "Choose who to send the signal to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:27
-#, fuzzy
 msgid "Signal to send"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:28
-#, fuzzy
 msgid "Bind-mount a directory to a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:29
-#, fuzzy
 msgid "Create destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
-#, fuzzy
 msgid "Apply read-only mount"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:31
 msgid "Copy file or directory to a machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:32
-#, fuzzy
 msgid "Copy file or directory from a machine"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:33
-#, fuzzy
 msgid "Open a shell on a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:34
-#, fuzzy
 msgid "Show a list of locally installed machines"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:35
 msgid "Show information about machine images (human-readable)"
@@ -38284,43 +35823,36 @@ msgid "Show properties of machine images (machine-readable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:37
-#, fuzzy
 msgid "Clone a machine image"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:38
-#, fuzzy
 msgid "Rename a machine image"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:39
-#, fuzzy
 msgid "Mark or unmark machine image as read-only"
-msgstr "Make caching db readonly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:40
-#, fuzzy
 msgid "Remove machine images"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:41
 msgid "Set size limit for machine image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:42
-#, fuzzy
 msgid "Download a .tar container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:43
-#, fuzzy
 msgid "Download a .raw container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:44
-#, fuzzy
 msgid "Download a .dkr container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:45
 msgid "Import a .tar container image"
@@ -38339,105 +35871,88 @@ msgid "Export a .raw container image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:49
-#, fuzzy
 msgid "Specify compression format"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:50
-#, fuzzy
 msgid "Show running downloads, imports and exports"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:51
 msgid "Abort running downloads, imports or exports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:52
-#, fuzzy
 msgid "Verify image with specified method"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:53
 msgid "Verify image (not available for dkr)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:54
-#, fuzzy
 msgid "Specify index server"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:55
-#, fuzzy
 msgid "Overwrite existing machine image"
-msgstr "Overwrite existing binstubs if they exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:1
-#, fuzzy
 msgid "Shows all available URL protocols"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:2
-#, fuzzy
 msgid "Lists all Magento modules"
-msgstr "Lists all available Vagrant boxes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:3
-#, fuzzy
 msgid "Lists all indexer modes"
-msgstr "Print xrandr modes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:4
-#, fuzzy
 msgid "Shows all available packing modes"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:5
 msgid "Shows all IDEs supported by magento"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:6
-#, fuzzy
 msgid "Shows all available magento tests"
-msgstr "List all available patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:7
-#, fuzzy
 msgid "Shows all available magento theme areas"
-msgstr "List all available patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:8
 msgid "Shows all existing magento languages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:9
-#, fuzzy
 msgid "Shows all available source theme file types"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:10
-#, fuzzy
 msgid "Shows all available deploy modes"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:11
-#, fuzzy
 msgid "Shows all available cache types"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:12
-#, fuzzy
 msgid "Shows all available verbosity levels"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:13
-#, fuzzy
 msgid "Shows all available output formats"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:14
-#, fuzzy
 msgid "Lists magento commands"
-msgstr "list all “gem” commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:15
 msgid "Checks that prompt is not inside of magento command"
@@ -38445,9 +35960,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:16
 #: /tmp/fish/implicit/share/completions/p4.fish:23
-#, fuzzy
 msgid "Checks if prompt is in a specific command"
-msgstr "Test if bundle has been given a specific subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:17
 #: /tmp/fish/implicit/share/completions/p4.fish:24
@@ -38456,37 +35970,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:18
 #: /tmp/fish/implicit/share/completions/p4.fish:25
-#, fuzzy
 msgid "Adds a specific option for a command"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:19
 msgid "Checks if a parameter has been given already"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:20
-#, fuzzy
 msgid "Show help for a command"
-msgstr "Help for this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:21
-#, fuzzy
 msgid "Do not output any message"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:22
 msgid "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:24
-#, fuzzy
 msgid "Force colored output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:26
-#, fuzzy
 msgid "Don't ask any interactive question"
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:1
 msgid "Define"
@@ -38595,126 +36104,108 @@ msgid "Touch files, don't run commands"
 msgstr "Touch files, don't run commands"
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
-#, fuzzy
 msgid "Print working directory"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:21
 msgid "Pretend file is modified"
 msgstr "Pretend file is modified"
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:1
-#, fuzzy
 msgid "Ignore missing or incomplete arch field"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:2
 msgid "Clean up work files after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:3
-#, fuzzy
 msgid "Use alternate config <file>"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:4
-#, fuzzy
 msgid "Do not perform dependency checks"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:5
-#, fuzzy
 msgid "Do not extract source files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:6
 msgid "Only perform integrity checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:7
-#, fuzzy
 msgid "Force rebuild of the package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:8
-#, fuzzy
 msgid "Generate integrity checks"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:9
-#, fuzzy
 msgid "Do not perform integrity checks"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:10
-#, fuzzy
 msgid "Do not verify checksums"
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:11
-#, fuzzy
 msgid "Do not verify PGP signatures"
-msgstr "Don't verify patch signature"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:12
-#, fuzzy
 msgid "Display syntax and command line options"
-msgstr "Display brief summary of the available commands and options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:13
 msgid "No automatic bump of pkgver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:14
-#, fuzzy
 msgid "Install the package after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:15
 msgid "Enable makepkg build logging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:16
-#, fuzzy
 msgid "Disable color in output messages"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:17
-#, fuzzy
 msgid "Only download and extract files"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:18
 msgid "Use alternative <buildscript>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:19
-#, fuzzy
 msgid "Remove installed deps after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:20
 msgid "Repackage without rebuilding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:21
-#, fuzzy
 msgid "Install missing dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:22
 msgid "Build a source-only tarball for AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:23
-#, fuzzy
 msgid "Display the version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:24
-#, fuzzy
 msgid "Remove the srcdir before building the package"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:25
 msgid "Build a source-only GPL tarball for AUR"
@@ -38729,28 +36220,24 @@ msgid "Run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:28
-#, fuzzy
 msgid "Do not create the archive"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:29
 msgid "Do not run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:30
-#, fuzzy
 msgid "Sign the resulting package with gpg"
-msgstr "Sign the patch with your gpg key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:31
-#, fuzzy
 msgid "Do not create a signature for the package"
-msgstr "Do not fail if signature is older than key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:32
-#, fuzzy
 msgid "Specify a <key> to use when signing"
-msgstr "Specify umask to use when writing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:33
 msgid "Passed to pacman: Do not ask for confirmation"
@@ -38765,19 +36252,16 @@ msgid "Passed to pacman: Install as dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:36
-#, fuzzy
 msgid "Passed to pacman: Do not display a progress bar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:37
-#, fuzzy
 msgid "List all packages that would be built"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:38
-#, fuzzy
 msgid "Print SRCINFO to stdout"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:1
 msgid "Program section"
@@ -38840,14 +36324,12 @@ msgid "Pager"
 msgstr "Pager"
 
 #: /tmp/fish/implicit/share/completions/man.fish:17
-#, fuzzy
 msgid "Manual sections"
-msgstr "Local section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:18
-#, fuzzy
 msgid "Display all matches"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:19
 msgid "Always reformat"
@@ -38907,48 +36389,40 @@ msgid "Force color mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:4
-#, fuzzy
 msgid "Specify a different color set"
-msgstr "Specify record separator"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:5
-#, fuzzy
 msgid "Specify a name of skin"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:6
-#, fuzzy
 msgid "Disable mouse support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:7
 msgid "Start the internal editor with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:8
-#, fuzzy
 msgid "Display the compiled-in search paths"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:9
-#, fuzzy
 msgid "Display extended info about compiled-in paths"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:10
-#, fuzzy
 msgid "Display configure options"
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:11
-#, fuzzy
 msgid "Reset softkeys to their default"
-msgstr "Restrict operations to the LOCAL domain (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:12
-#, fuzzy
 msgid "Specify a keymap FILE"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:13
 msgid "Use default hardcoded keys"
@@ -38959,9 +36433,8 @@ msgid "Save the ftpfs dialog with the server in FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:15
-#, fuzzy
 msgid "Print the last working directory to FILE"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:16
 msgid "Set alternative mode drawing of frameworks"
@@ -38972,23 +36445,20 @@ msgid "Use the TERMCAP variable for terminal info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:18
-#, fuzzy
 msgid "Disable use of the concurrent shell"
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:19
-#, fuzzy
 msgid "Enable use of the concurrent shell"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:20
 msgid "Start the internal viewer with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:21
-#, fuzzy
 msgid "Display the version of the program"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:22
 msgid "Force xterm mode"
@@ -39003,18 +36473,16 @@ msgid "Compute and check message digest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:2
-#, fuzzy
 msgid "Read in binary mode"
-msgstr "Start in binary mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:3
 msgid "Read sums from files and check them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:4
-#, fuzzy
 msgid "Read in text mode"
-msgstr "Start in Ex mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:7
 msgid "Warn about improperly formatted checksum lines"
@@ -39025,9 +36493,8 @@ msgid "With --check, exit non-zero for any invalid input"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:9
-#, fuzzy
 msgid "Display help text"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:1
 msgid "Assemble a pre-existing array"
@@ -39038,14 +36505,12 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Select monitor mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:5
 msgid "Change the size or shape of an active array"
@@ -39060,9 +36525,8 @@ msgid "Start all auto-detected arrays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:9
-#, fuzzy
 msgid "Display more detailed help"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:11
 #: /tmp/fish/implicit/share/completions/obnam.fish:47
@@ -39071,24 +36535,20 @@ msgid "Be more verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "Force operation to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
-#, fuzzy
 msgid "Set metadata style to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:17
 msgid "Provide home host identity"
@@ -39099,72 +36559,60 @@ msgid "Give name format preference"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:19
-#, fuzzy
 msgid "Give cluster name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
-#, fuzzy
 msgid "Specify the space to use from each drive"
-msgstr "Specify the rsync to run on remote machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:23
 msgid "Specify the size made available on the array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:24
-#, fuzzy
 msgid "Specify the chunk size"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "Specify record separator"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
-#, fuzzy
 msgid "Specify RAID level"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Specify file for write-intent bitmap"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:29
-#, fuzzy
 msgid "Specify chunksize of bitmap"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:30
 msgid "Prefer reading from other devices than these"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:31
-#, fuzzy
 msgid "Enable writes on array or device"
-msgstr "File is character device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:32
-#, fuzzy
 msgid "Disable writes on array"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:33
 msgid "Enable write-behind mode"
@@ -39175,41 +36623,36 @@ msgid "Assume the array is clean"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:35
-#, fuzzy
 msgid "Use this file as a backup"
-msgstr "Use this files times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:36
-#, fuzzy
 msgid "Specify start of array data"
-msgstr "Specify author id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:37
 msgid "Resume frozen --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Set array name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:39
 msgid "Run array despite warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:40
-#, fuzzy
 msgid "Give instruction for device file"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:41
 msgid "Add devices to array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Specify max nodes in the cluster"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
 msgid "Specify journal device for RAID-4/5/6 array"
@@ -39220,9 +36663,8 @@ msgid "UUID of array to assemble"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Minor number of array device"
-msgstr "Print number of occurences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:46
 msgid "Refuse to start without all drives"
@@ -39233,23 +36675,20 @@ msgid "Do not ask for backup file, unavailable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update superblock properties"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:49
 msgid "Freeze --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
-#, fuzzy
 msgid "Test mode"
-msgstr "Quiet mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:51
-#, fuzzy
 msgid "Hot-add listed devices"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:52
 msgid "Re-add a previously removed device"
@@ -39260,9 +36699,8 @@ msgid "Hot-add listed devices as spare"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Remove listed inactive devices"
-msgstr "Remove specified service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:55
 msgid "Mark listed devices as faulty"
@@ -39285,9 +36723,8 @@ msgid "Examine device for md use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:60
-#, fuzzy
 msgid "Print details on array"
-msgstr "Print tally"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
 msgid "Print details on platform capabilities"
@@ -39298,9 +36735,8 @@ msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
@@ -39311,19 +36747,16 @@ msgid "Print report about bitmap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
-#, fuzzy
 msgid "List recorded bad blocks"
-msgstr "List current package locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -39338,23 +36771,20 @@ msgid "Delete subarray"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:72
-#, fuzzy
 msgid "Update subarray"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:73
-#, fuzzy
 msgid "Wait for pending operations"
-msgstr "Foreground operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:74
 msgid "Mark array as clean ASAP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:75
-#, fuzzy
 msgid "Set sync action for md devices"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:76
 msgid "Rebuild /run/mdadm/map"
@@ -39397,9 +36827,8 @@ msgid "Check arrays only once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:86
-#, fuzzy
 msgid "Do not move spares between arrays"
-msgstr "Do not check shared B-trees"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:87
 msgid "Be more concise"
@@ -39407,14 +36836,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:1
 #: /tmp/fish/implicit/share/completions/mdbook.fish:4
-#, fuzzy
 msgid "Prints help"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:2
-#, fuzzy
 msgid "Prints version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:3
 msgid "Build book from markdown files"
@@ -39425,9 +36852,8 @@ msgid "Create boilerplate structure and files in directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:6
-#, fuzzy
 msgid "Skip confirmation prompts"
-msgstr "Ask confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:7
 msgid "Copy default theme into source folder"
@@ -39450,85 +36876,72 @@ msgid "Test that code samples compile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:12
-#, fuzzy
 msgid "Watch file changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:2
-#, fuzzy
 msgid "Ignore unknown options"
-msgstr "Unknown option: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:3
-#, fuzzy
 msgid "Do not reveal the resulting package in the Finder"
-msgstr "Do not pad the following tracks - the default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:4
 msgid "Avoid restricted operations such as heap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:5
-#, fuzzy
 msgid "Skip gathering system.log"
-msgstr "Skip other filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:6
-#, fuzzy
 msgid "Prints version of mddiagnose"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:7
 msgid "Minimal report"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:8
-#, fuzzy
 msgid "Evaluate indexing information for path"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
-#, fuzzy
 msgid "Write the diagnostic to the specified path"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:1
-#, fuzzy
 msgid "Fetches the value of the specified attribute"
-msgstr "Don't preserve the specified attributes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:2
 msgid "Query only reports matching items count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:3
-#, fuzzy
 msgid "Search only within given directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:4
 msgid "Query should stay active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:5
-#, fuzzy
 msgid "Search on file name only"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:6
-#, fuzzy
 msgid "Reprint results on live update"
-msgstr "Print result of --eval"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:7
-#, fuzzy
 msgid "Show contents of smart folder"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:8
 msgid "Use NUL (\\0) as a path separator, for use with xargs -0"
@@ -39547,71 +36960,61 @@ msgid "Import files using the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:2
-#, fuzzy
 msgid "Print timing information for this run"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:3
-#, fuzzy
 msgid "Print out the list of all of the attributes and exit"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:4
-#, fuzzy
 msgid "Print out the schema file and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:5
 msgid "Ask the server to reimport files for UTIs claimed by the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:6
-#, fuzzy
 msgid "Print out performance information gathered during the run"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:7
-#, fuzzy
 msgid "Print the list of installed importers and exit"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:8
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:7
-#, fuzzy
 msgid "Print debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:9
 msgid "Dont send the imported attributes to the data store"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:10
-#, fuzzy
 msgid "Wait for the specified interval between scanning files"
-msgstr "Wait specified interval of seconds between sending each packet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:11
-#, fuzzy
 msgid "Write the imported attributes to a file"
-msgstr "Write package statistics to a file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:1
 msgid "Print only the matching metadata attribute value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:2
-#, fuzzy
 msgid "Print raw attribute data"
-msgstr "Print raw entry names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:3
 msgid "Sets a marker string to be used when a requested attribute is null"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:4
-#, fuzzy
 msgid "Output attributes in XML format to file"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:1
 msgid "Publish metadata"
@@ -39626,14 +37029,12 @@ msgid "Disable Spotlight activity for volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:4
-#, fuzzy
 msgid "Erase and rebuild index"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:5
-#, fuzzy
 msgid "Print indexing status"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:6
 msgid "Resolve files from file id with an optional volume path or device id"
@@ -39644,14 +37045,12 @@ msgid "Apply command to all volumes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:8
-#, fuzzy
 msgid "Apply command to all stores on the specified volume"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:9
-#, fuzzy
 msgid "Display verbose information"
-msgstr "Display RubyGems environmental information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:1
 msgid "Log to standard error as well as files"
@@ -39662,9 +37061,8 @@ msgid "When logging hits line file:N, emit a stack trace (default :0)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:3
-#, fuzzy
 msgid "Write log files in this directory"
-msgstr "Verifies files in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:4
 msgid "Log to standard error instead of files"
@@ -39683,10 +37081,8 @@ msgid "Log level for logs"
 msgstr "Log level for logs"
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:8
-#, fuzzy
 msgid "Comma-separated list of pattern=N settings for file-filtered logging"
 msgstr ""
-"Comma-separated list of package installation states to follow recursively"
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:9
 msgid "Disable the addon w/ADDON_NAME within minikube"
@@ -39744,9 +37140,8 @@ msgid "Unsets an individual value in a minikube config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:24
-#, fuzzy
 msgid "Display values currently set in the minikube config file"
-msgstr "Display all currently defined trap handlers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:29
 msgid "Go template format string for the config view output"
@@ -39757,18 +37152,16 @@ msgid "Display the kubernetes dashboard URL instead of opening it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:31
-#, fuzzy
 msgid "Add machine IP to NO_PROXY environment variable"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:32
 msgid "Force environment to be configured for a specified shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:33
-#, fuzzy
 msgid "Unset variables"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:35
 msgid "List the URLs for the services in local cluster"
@@ -39861,9 +37254,8 @@ msgid "The CIDR to be used for the VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:56
-#, fuzzy
 msgid "The KVM network name"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:57
 msgid "The hyperv virtual switch name"
@@ -39875,15 +37267,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:1
 #: /tmp/fish/implicit/share/completions/mix.fish:58
-#, fuzzy
 msgid "Starts all registered apps"
-msgstr "Start in restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:2
 #: /tmp/fish/implicit/share/completions/mix.fish:59
-#, fuzzy
 msgid "Lists all archives"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:3
 #: /tmp/fish/implicit/share/completions/mix.fish:60
@@ -39892,69 +37282,58 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:4
 #: /tmp/fish/implicit/share/completions/mix.fish:61
-#, fuzzy
 msgid "Installs an archive locally"
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:5
 #: /tmp/fish/implicit/share/completions/mix.fish:62
-#, fuzzy
 msgid "Uninstalls archives"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:6
 #: /tmp/fish/implicit/share/completions/mix.fish:63
-#, fuzzy
 msgid "Deletes generated application files"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:7
 #: /tmp/fish/implicit/share/completions/mix.fish:64
-#, fuzzy
 msgid "Executes the given command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:8
 #: /tmp/fish/implicit/share/completions/mix.fish:65
-#, fuzzy
 msgid "Compiles source files"
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:9
 #: /tmp/fish/implicit/share/completions/mix.fish:66
-#, fuzzy
 msgid "Lists dependencies and their status"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:10
 #: /tmp/fish/implicit/share/completions/mix.fish:67
-#, fuzzy
 msgid "Deletes the given dependencies' files"
-msgstr "Delete cached header files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:11
 #: /tmp/fish/implicit/share/completions/mix.fish:68
-#, fuzzy
 msgid "Compiles dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:12
 #: /tmp/fish/implicit/share/completions/mix.fish:69
-#, fuzzy
 msgid "Gets all out of date dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:13
 #: /tmp/fish/implicit/share/completions/mix.fish:70
-#, fuzzy
 msgid "Unlocks the given dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:14
 #: /tmp/fish/implicit/share/completions/mix.fish:71
-#, fuzzy
 msgid "Updates the given dependencies"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:15
 #: /tmp/fish/implicit/share/completions/mix.fish:72
@@ -39968,15 +37347,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:17
 #: /tmp/fish/implicit/share/completions/mix.fish:74
-#, fuzzy
 msgid "Prints help information for tasks"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:18
 #: /tmp/fish/implicit/share/completions/mix.fish:75
-#, fuzzy
 msgid "Loads and persists the given configuration"
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:19
 #: /tmp/fish/implicit/share/completions/mix.fish:76
@@ -39985,9 +37362,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:20
 #: /tmp/fish/implicit/share/completions/mix.fish:77
-#, fuzzy
 msgid "Installs Hex locally"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:21
 #: /tmp/fish/implicit/share/completions/mix.fish:78
@@ -40001,9 +37377,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:23
 #: /tmp/fish/implicit/share/completions/mix.fish:80
-#, fuzzy
 msgid "Creates a new Elixir project"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:24
 #: /tmp/fish/implicit/share/completions/mix.fish:81
@@ -40012,9 +37387,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:25
 #: /tmp/fish/implicit/share/completions/mix.fish:82
-#, fuzzy
 msgid "Runs the given file or expression"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:26
 #: /tmp/fish/implicit/share/completions/mix.fish:83
@@ -40022,24 +37396,20 @@ msgid "Runs a project's tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:27
-#, fuzzy
 msgid "specify input directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:28
-#, fuzzy
 msgid "specify output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:29
-#, fuzzy
 msgid "skip compilation"
-msgstr "Ask confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:30
-#, fuzzy
 msgid "Clean everything, including dependencies"
-msgstr "Pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:31
 #: /tmp/fish/implicit/share/completions/mix.fish:48
@@ -40070,9 +37440,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:37
-#, fuzzy
 msgid "loads the given configuration file"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:38
 msgid "evaluates the given code"
@@ -40091,14 +37460,12 @@ msgid "does not compile even if files require compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:42
-#, fuzzy
 msgid "does not check dependencies"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:43
-#, fuzzy
 msgid "does not halt the system after running the command"
-msgstr "Do not fixate the disk after writing the tracks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:44
 msgid "does not start applications after compilation"
@@ -40121,29 +37488,24 @@ msgid "do not start applications after compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:51
-#, fuzzy
 msgid "disable color in the output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:52
-#, fuzzy
 msgid "enable color in the output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:53
-#, fuzzy
 msgid "include tests that match the filter"
-msgstr "Exclude files that match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:54
-#, fuzzy
 msgid "exclude tests that match the filter"
-msgstr "Exclude files that match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:55
-#, fuzzy
 msgid "run only tests that match the filter"
-msgstr "Exclude files that match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:56
 msgid "seeds the random number generator used to randomize test order"
@@ -40154,9 +37516,8 @@ msgid "set the timeout for the tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:1
-#, fuzzy
 msgid "Output version"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:2
 #: /tmp/fish/implicit/share/completions/mkdir.fish:6
@@ -40170,9 +37531,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:4
 #: /tmp/fish/implicit/share/completions/mkdir.fish:8
-#, fuzzy
 msgid "Print a message for each created directory"
-msgstr "Unpack an installed gem to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:9
 msgid ""
@@ -40180,97 +37540,80 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:1
-#, fuzzy
 msgid "Disable alignment"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:2
-#, fuzzy
 msgid "Use Atari variation"
-msgstr "Use primary selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:3
 msgid "Select location of backup sector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:4
-#, fuzzy
 msgid "Check for bad blocks"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:5
-#, fuzzy
 msgid "Create file given as device"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:6
-#, fuzzy
 msgid "Specify drive number"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:7
-#, fuzzy
 msgid "Specify number of FATs"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:8
-#, fuzzy
 msgid "Specify FAT size"
-msgstr "Specify APT list dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:9
-#, fuzzy
 msgid "Specify number of hidden sectors"
-msgstr "Specify version of gem to rdoc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:10
-#, fuzzy
 msgid "Specify volume ID"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:11
 msgid "Force to use entire disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:12
-#, fuzzy
 msgid "Read bad blocks list from given file"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:13
-#, fuzzy
 msgid "Specify file containing non bootable message"
-msgstr "Specify a draft file containing header and body for the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:14
-#, fuzzy
 msgid "Specify media type"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:15
-#, fuzzy
 msgid "Specify volume name"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:16
-#, fuzzy
 msgid "Specify number of entries available in root directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:17
-#, fuzzy
 msgid "Specify number of reserved sectors"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:18
-#, fuzzy
 msgid "Specify number of sector per cluster"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:19
-#, fuzzy
 msgid "Specify number of bytes per logical sector"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:21
 msgid "Use constants for randomly generated data"
@@ -40289,9 +37632,8 @@ msgid "Set directory as the location where the initramfs is built"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:4
-#, fuzzy
 msgid "Generate a CPIO image as filename"
-msgstr "Generate a simple Gemfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:5
 msgid "Output help for a hook"
@@ -40306,9 +37648,8 @@ msgid "Use kernelversion, instead of the current running kernel"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:8
-#, fuzzy
 msgid "List all available hooks"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:9
 msgid "Display modules found via autodetection"
@@ -40316,9 +37657,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:10
 #: /tmp/fish/implicit/share/completions/rc-service.fish:4
-#, fuzzy
 msgid "Disable color output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:11
 msgid "Process all presets contained in /etc/mkinitcpio.d"
@@ -40329,9 +37669,8 @@ msgid "Build initramfs image(s) according to specified preset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:13
-#, fuzzy
 msgid "Specifies the root directory to find modules in"
-msgstr "Specify the repository directory in which to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:14
 msgid "Skip hooks when generating the image"
@@ -40348,37 +37687,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:17
 #: /tmp/fish/implicit/share/completions/mvn.fish:34
 #: /tmp/fish/implicit/share/completions/termite.fish:2
-#, fuzzy
 msgid "Display version information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:19
 msgid "Override the compression method with the compress program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:1
-#, fuzzy
 msgid "Show version information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:3
 msgid "Extract tracks to external files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:4
-#, fuzzy
 msgid "Extract tags as XML"
-msgstr "Extract to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:5
-#, fuzzy
 msgid "Extract attachments"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:6
-#, fuzzy
 msgid "Extract chapters as XML"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:7
 msgid "Extract chapters and tags as CUE sheet"
@@ -40389,14 +37723,12 @@ msgid "Extract timecodes of a track as timecode v2 file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:9
-#, fuzzy
 msgid "Extract cue information as text file"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:10
-#, fuzzy
 msgid "Parse the whole file instead of relying on the index"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:11
 #: /tmp/fish/implicit/share/completions/rsync.fish:1
@@ -40405,28 +37737,24 @@ msgid "Increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:12
-#, fuzzy
 msgid "Suppress status output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:13
 msgid "Force the translations for 'code' to be used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:14
-#, fuzzy
 msgid "Charset for strings on the command line"
-msgstr "Set or get the commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:15
-#, fuzzy
 msgid "Outputs messages in specified charset"
-msgstr "Output filenames using the specified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:16
-#, fuzzy
 msgid "Redirect all messages into a file"
-msgstr "Append all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:17
 msgid "Convert text subtitles to a charset"
@@ -40441,9 +37769,8 @@ msgid "Keep only the BlockAdditions up to the specified level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:20
-#, fuzzy
 msgid "Extract the data to a raw file"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:21
 msgid "Extract the data to a raw file including the CodecPrivate as header"
@@ -40454,15 +37781,13 @@ msgid "Exports the chapter information in a simple format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:23
-#, fuzzy
 msgid "Uses the chapter names of the specified language"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:2
 #: /tmp/fish/implicit/share/completions/yarn.fish:2
-#, fuzzy
 msgid "output the version number"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:3
 msgid "force all tests to take a callback (async) or return a promise"
@@ -40477,23 +37802,20 @@ msgid "force disabling of colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:6
-#, fuzzy
 msgid "enable growl notification support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:7
 msgid "<k=v,k2=v2,...>  reporter-specific options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:8
-#, fuzzy
 msgid "specify the reporter to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:9
-#, fuzzy
 msgid "sort test files"
-msgstr "Report identical files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:10
 msgid "bail after first test failure"
@@ -40504,18 +37826,16 @@ msgid "enable node's debugger, synonym for node --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:12
-#, fuzzy
 msgid "only run tests matching <pattern>"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:13
 msgid "only run tests containing <string>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:14
-#, fuzzy
 msgid "expose gc extension"
-msgstr "Sort by extension"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:15
 msgid "inverts --grep and --fgrep matches"
@@ -40538,18 +37858,16 @@ msgid "specify user-interface (bdd|tdd|qunit|exports)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:20
-#, fuzzy
 msgid "watch files for changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:21
 msgid "check for global variable leaks"
 msgstr "check for global variable leaks"
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:22
-#, fuzzy
 msgid "display the full stack trace"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:23
 msgid "use the given module(s) to compile files"
@@ -40578,18 +37896,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:29
-#, fuzzy
 msgid "include ICU data"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:30
 msgid "display actual/expected differences inline within each string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:31
-#, fuzzy
 msgid "display available interfaces"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:32
 msgid "silence deprecation warnings"
@@ -40605,9 +37921,8 @@ msgid "disables timeouts, given implicitly with --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:35
-#, fuzzy
 msgid "specify opts path"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:36
 msgid "enable perf linux profiler (basic support)"
@@ -40622,14 +37937,12 @@ msgid "Time events including external callbacks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:39
-#, fuzzy
 msgid "include sub directories"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:40
-#, fuzzy
 msgid "display available reporters"
-msgstr "List all available patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:41
 msgid "set numbers of time to retry a failed test case"
@@ -40640,62 +37953,52 @@ msgid "throw an exception anytime a deprecated function is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:43
-#, fuzzy
 msgid "trace function calls"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:44
-#, fuzzy
 msgid "show stack traces on deprecations"
-msgstr "Show stack backtrace on errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:45
-#, fuzzy
 msgid "enforce strict mode"
-msgstr "Start in restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:46
 msgid "additional extensions to monitor with --watch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:47
-#, fuzzy
 msgid "wait for async suite definition"
-msgstr "Edit function definition"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:1
-#, fuzzy
 msgid "Print program version and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:2
-#, fuzzy
 msgid "Print usage and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:3
-#, fuzzy
 msgid "Turn on logging to a file"
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:4
-#, fuzzy
 msgid "Run only the server"
-msgstr "Options for the keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:5
 msgid "Run server in foreground, log to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:6
-#, fuzzy
 msgid "Use the specified sound driver"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:7
-#, fuzzy
 msgid "Start in MusicDir"
-msgstr "Start in Farsi mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:8
 msgid ""
@@ -40708,9 +38011,8 @@ msgid "Add the files given on command line to the queue"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:10
-#, fuzzy
 msgid "Clear the playlist and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:11
 msgid "Start playing from the first item on the playlist"
@@ -40733,9 +38035,8 @@ msgid "Play previous song"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:16
-#, fuzzy
 msgid "Shutdown the server"
-msgstr "Options for the keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:17
 msgid ""
@@ -40743,18 +38044,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:18
-#, fuzzy
 msgid "Use the specified config file instead of the default"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:19
 msgid "NAME=VALUE Override configuration option NAME with VALUE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:20
-#, fuzzy
 msgid "Use the specified MOC directory instead of the default"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:21
 msgid "Pause"
@@ -40785,18 +38084,16 @@ msgid "Use ASCII characters to draw lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:28
-#, fuzzy
 msgid "Print the information about the currently played file"
-msgstr "Print information about the environment Bundler is running under"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:29
 msgid "Print the formatted information about the currently played file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:30
-#, fuzzy
 msgid "Alias for -a"
-msgstr "Alias for atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:31
 msgid "Seek by N seconds (can be negative)"
@@ -40807,53 +38104,44 @@ msgid "N{%,s} Jump to some position of the current track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:33
-#, fuzzy
 msgid "Turn on a control"
-msgstr "Warning control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:34
-#, fuzzy
 msgid "Turn off a control"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:35
-#, fuzzy
 msgid "Toggle a control"
-msgstr "Test a condition"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:1
-#, fuzzy
 msgid "Print only 'author'"
-msgstr "Print author"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:2
-#, fuzzy
 msgid "Print only 'description'"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:3
-#, fuzzy
 msgid "Print only 'license'"
-msgstr "Print license"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:4
-#, fuzzy
 msgid "Print only 'parm'"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:5
-#, fuzzy
 msgid "Print only 'filename'"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:6
 msgid "Use \\0 instead of \\n"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:7
-#, fuzzy
 msgid "Print only provided FIELD"
-msgstr "Print only file info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:9
 msgid "Use DIR as filesystem root for /lib/modules"
@@ -40885,28 +38173,24 @@ msgid "Remove modules"
 msgstr "Remove modules"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:10
-#, fuzzy
 msgid "Ignore all version information"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:11
-#, fuzzy
 msgid "Ignore version magic information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:12
 msgid "Ignore module interface version"
 msgstr "Ignore module interface version"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:13
-#, fuzzy
 msgid "List all modules matching the given wildcard"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:14
-#, fuzzy
 msgid "Insert modules matching the given wildcard"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:15
 msgid "Restrict wildcards to specified directory"
@@ -40917,9 +38201,8 @@ msgid "Send error messages through syslog"
 msgstr "Send error messages through syslog"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:17
-#, fuzzy
 msgid "Specify kernel version"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:18
 msgid "List dependencies of module"
@@ -40959,9 +38242,8 @@ msgid "Adaptively resize image with data dependent triangulation [geometry]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mogrify.fish:89
-#, fuzzy
 msgid "Automatically orient image"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:10
 msgid "Alternate image colorsapce [type]"
@@ -41006,9 +38288,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:76
-#, fuzzy
 msgid "Set the image size [geometry]"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:82
 msgid "Simulate a Polaroid picture [angle]"
@@ -41074,9 +38355,8 @@ msgid "Use a particular server-side UDP port or port range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:4
-#, fuzzy
 msgid "Mount file systems in fstab"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:5
 msgid "Fork process for each mount"
@@ -41095,19 +38375,16 @@ msgid "Do not write mtab"
 msgstr "Do not write mtab"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:9
-#, fuzzy
 msgid "Tolerate sloppy mount options"
-msgstr "Complete Convert options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:10
-#, fuzzy
 msgid "Read only"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:11
-#, fuzzy
 msgid "Read/Write mode"
-msgstr "Deduplicate mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:12
 msgid "Mount partition with specified label"
@@ -41159,9 +38436,8 @@ msgid "Full screen"
 msgstr "Full screen"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:10
-#, fuzzy
 msgid "Set playlist"
-msgstr "Set system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:11
 msgid "Audio language"
@@ -41200,9 +38476,8 @@ msgid "Override framerate"
 msgstr "Override framerate"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:20
-#, fuzzy
 msgid "Build index if unavailable"
-msgstr "Rebuild index files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:21
 msgid "Load index from file"
@@ -41217,9 +38492,8 @@ msgid "Rebuild index and save to file"
 msgstr "Rebuild index and save to file"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:24
-#, fuzzy
 msgid "Seek to given time position"
-msgstr "Send to the given KDE session"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:25
 msgid "TV capture mode"
@@ -41252,9 +38526,8 @@ msgid "Audio output"
 msgstr "Audio output"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:1
-#, fuzzy
 msgid "Add specified directory to list for input files search"
-msgstr "Specify directory with configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:2
 msgid "Generate a Java ResourceBundle class"
@@ -41332,9 +38605,8 @@ msgid "Check presence of keyboard accelerators for menu items"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:21
-#, fuzzy
 msgid "Use fuzzy entries in output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:22
 msgid "Alignment"
@@ -41349,9 +38621,8 @@ msgid "Print statistics about translations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:27
-#, fuzzy
 msgid "Increase verbosity level"
-msgstr "Output verbosity level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:1
 #: /tmp/fish/implicit/share/completions/mutt.fish:16
@@ -41364,24 +38635,20 @@ msgid "Specify a blind-carbon-copy (BCC) recipient"
 msgstr "Specify a blind-carbon-copy (BCC) recipient"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:3
-#, fuzzy
 msgid "Print the value of all configuration options to stdout"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:5
-#, fuzzy
 msgid "Bypass the system configuration file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:6
-#, fuzzy
 msgid "Resume a postponed message"
-msgstr "Receive new messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:7
-#, fuzzy
 msgid "Open a mailbox in read-only mode"
-msgstr "Open folder read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:8
 msgid "Display the Mutt version number and compile-time definitions"
@@ -41482,9 +38749,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:3
-#, fuzzy
 msgid "Run in non-interactive (batch) mode"
-msgstr "Run in noninteractive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:4
 msgid "The id of the build strategy to use."
@@ -41506,14 +38772,12 @@ msgid "Ineffective, only kept for backward compatibility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:8
-#, fuzzy
 msgid "Define a system property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:9
-#, fuzzy
 msgid "Produce execution error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:10
 msgid "Encrypt master security password"
@@ -41546,9 +38810,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:17
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:5
-#, fuzzy
 msgid "Display help information"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:18
 msgid "Log file to where all build output will go."
@@ -41561,9 +38824,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:20
-#, fuzzy
 msgid "Do not recurse into sub-projects"
-msgstr "Do not export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:23
 msgid "Suppress SNAPSHOT updates"
@@ -41581,14 +38843,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:26
-#, fuzzy
 msgid "Quiet output - only show errors"
-msgstr "Force to continue on some errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:27
-#, fuzzy
 msgid "Resume reactor from specified project"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:28
 msgid "Alternate path for the user settings file"
@@ -41613,9 +38873,8 @@ msgid "Display version information WITHOUT stopping build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:35
-#, fuzzy
 msgid "Produce execution debug output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:36
 msgid "Comma-delimited list of profiles to activate"
@@ -41638,9 +38897,8 @@ msgid "Run surefire tests with debugging on port 5005"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:41
-#, fuzzy
 msgid "Skip Javadoc generation"
-msgstr "Check all generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:42
 msgid ""
@@ -41679,14 +38937,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:48
-#, fuzzy
 msgid "Installs the artifact in the remote repository."
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:49
-#, fuzzy
 msgid "Deploys an artifact to remote repository."
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:50
 msgid ""
@@ -41715,9 +38971,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:55
-#, fuzzy
 msgid "Installs a file in the local repository."
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:56
 msgid ""
@@ -41862,9 +39117,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:79
-#, fuzzy
 msgid "Build a JAR from the current project."
-msgstr "Build a gem from a gemspec"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:80
 msgid "Build a JAR of the test classes for the current project."
@@ -41924,19 +39178,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:92
-#, fuzzy
 msgid "Generate a changelog report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:93
-#, fuzzy
 msgid "Generate a file activity report."
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:94
-#, fuzzy
 msgid "Generate a developer activity report."
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:95
 msgid ""
@@ -42193,9 +39444,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:139
-#, fuzzy
 msgid "Creates a PMD report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:140
 msgid "Generates the Project Continuous Integration System report."
@@ -42229,9 +39479,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:147
-#, fuzzy
 msgid "Generates the project index page."
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:148
 msgid "Generates the Project Issue Tracking report."
@@ -42294,9 +39543,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:161
-#, fuzzy
 msgid "Generate Ant build files."
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:162
 msgid "Clean all Ant build files."
@@ -42368,9 +39616,8 @@ msgid "Build a JAR from the current Archetype project."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:173
-#, fuzzy
 msgid "Updates the local catalog"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:174
 msgid ""
@@ -42545,9 +39792,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:194
-#, fuzzy
 msgid "Displays the list of dependencies for this project."
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:195
 msgid ""
@@ -42570,9 +39816,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:198
-#, fuzzy
 msgid "Goal that resolves the project dependencies from the repository."
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:199
 msgid ""
@@ -42580,14 +39825,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:200
-#, fuzzy
 msgid "Goal that resolves the project source dependencies from the repository."
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:201
-#, fuzzy
 msgid "Displays the dependency tree for this project."
-msgstr "display a dependency tree for package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:202
 msgid ""
@@ -42741,9 +39984,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:228
-#, fuzzy
 msgid "Apply one or more patches to project sources."
-msgstr "Add one or more new files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:229
 msgid ""
@@ -42758,9 +40000,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:231
-#, fuzzy
 msgid "Generates a PDF document for a project."
-msgstr "Generate RDoc documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:232
 msgid ""
@@ -42769,9 +40010,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:233
-#, fuzzy
 msgid "Generates the Plugin's documentation report."
-msgstr "Generate RI documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:234
 msgid "Generate Xdoc files for the project mojos or goals."
@@ -42792,9 +40032,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:237
-#, fuzzy
 msgid "Generates a HelpMojo class."
-msgstr "Generate a Java ResourceBundle class"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:238
 msgid ""
@@ -42916,23 +40155,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:254
-#, fuzzy
 msgid "Display the modification status of the files in the configured scm url."
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:255
-#, fuzzy
 msgid "Branch the project."
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:256
 msgid "Validate scm connection string."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:257
-#, fuzzy
 msgid "Commit changes to the configured scm url."
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:258
 msgid ""
@@ -42947,14 +40183,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:260
-#, fuzzy
 msgid "Add a file set to the project."
-msgstr "Add a new file/directory to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:261
-#, fuzzy
 msgid "Mark a set of files for deletion."
-msgstr "Make list of kill signals for completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:262
 msgid "Unedit/unlock a set of files."
@@ -42971,14 +40205,12 @@ msgid "Get a fresh copy of the latest source from the configured scm url."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:265
-#, fuzzy
 msgid "Tag the project."
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:266
-#, fuzzy
 msgid "Edit/lock a set of files."
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:267
 msgid "This mojo will fail the build if there is any local modifications"
@@ -43023,9 +40255,8 @@ msgid "Empty goal, provided only to set loose the lifecycle."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:276
-#, fuzzy
 msgid "Copies artifacts from one repository to another repository."
-msgstr "Copy and apply patches from this repository to another one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:277
 msgid ""
@@ -43083,19 +40314,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:285
-#, fuzzy
 msgid "Generates MyEclipse configuration files"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:286
-#, fuzzy
 msgid "Deletes configuration files used by MyEclipse"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:287
-#, fuzzy
 msgid "Generates the rad-6 configuration files."
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:288
 msgid ""
@@ -43104,9 +40332,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:289
-#, fuzzy
 msgid "Removes the not-available marker files from the repository."
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:290
 msgid ""
@@ -43342,9 +40569,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:331
-#, fuzzy
 msgid "Generates Antlr documentation from grammar files."
-msgstr "Generate RI documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:332
 msgid "Generates files based on grammar files with Antlr tool."
@@ -43359,9 +40585,8 @@ msgid "Weaves all main classes."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:335
-#, fuzzy
 msgid "Create eclipse configuration of aspectJ"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:336
 msgid ""
@@ -43513,10 +40738,9 @@ msgid "Goal which creates Eclipse lauch configurations for GWT modules."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:364
-#, fuzzy
 msgid ""
 "'hbm2doc' generates html documentation a'la javadoc for the database schema."
-msgstr "Don't generate RI documentation for the gem on install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:365
 msgid ""
@@ -43745,24 +40969,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:399
-#, fuzzy
 msgid "Test goal implementation of the generate html mojo."
-msgstr "Fallback implementation of the seq command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:400
-#, fuzzy
 msgid "Main goal implementation of the generate html mojo."
-msgstr "Fallback implementation of the seq command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:401
-#, fuzzy
 msgid "Test goal implementation of the import mojo."
-msgstr "Fallback implementation of the seq command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:402
-#, fuzzy
 msgid "Main goal implementation of the import mojo."
-msgstr "Fallback implementation of the seq command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:403
 msgid ""
@@ -43952,9 +41172,8 @@ msgid "Create webstartable binaries for a 'nbm-application'."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:434
-#, fuzzy
 msgid "Generate a report from the Clirr output."
-msgstr "Generate XML formatted output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:435
 msgid "Check for compatibility between two arbitrary artifact sets."
@@ -44085,9 +41304,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:459
-#, fuzzy
 msgid "Create a CodeNarc Report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:460
 msgid ""
@@ -44194,9 +41412,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:477
-#, fuzzy
 msgid "Prints the configuration settings."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:478
 msgid "Creates the HTML report for a test run based on XSLT."
@@ -44343,9 +41560,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:500
-#, fuzzy
 msgid "Add more resource directories to the POM."
-msgstr "Add one or more new files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:501
 msgid "Store the maven core version in a property maven.version."
@@ -44356,9 +41572,8 @@ msgid "Attach additional artifacts to be installed and deployed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:503
-#, fuzzy
 msgid "Add test source directories to the POM."
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:504
 msgid ""
@@ -44389,14 +41604,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:508
-#, fuzzy
 msgid "Add more source directories to the POM."
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:509
-#, fuzzy
 msgid "Add more test resource directories to the POM."
-msgstr "Add one or more new files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:510
 msgid ""
@@ -44480,9 +41693,8 @@ msgid "Runs nodetool repair on a Cassandra instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:526
-#, fuzzy
 msgid "Executes cql statements from maven."
-msgstr "Execute argument as command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:528
 msgid "Runs nodetool flush on a Cassandra instance."
@@ -44706,9 +41918,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:567
-#, fuzzy
 msgid "Display all available licenses."
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:568
 msgid "Displays all the available comment style to box file headers."
@@ -44818,9 +42029,8 @@ msgid "Executes SQL against a database."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:585
-#, fuzzy
 msgid "List all files in the archive."
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:586
 msgid ""
@@ -44837,9 +42047,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:588
-#, fuzzy
 msgid "Remove a set of files from an existing archive."
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:589
 msgid "Copy a set of files in and out of an existing archive."
@@ -44886,9 +42095,8 @@ msgid "Displays any updates of the project's parent project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:598
-#, fuzzy
 msgid "Displays all plugins that have newer versions available."
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:599
 msgid ""
@@ -44953,9 +42161,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:610
-#, fuzzy
 msgid "Sets the parent version to the latest parent version."
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:611
 msgid "Sets properties to the latest versions of specific artifacts."
@@ -44979,9 +42186,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:615
 #: /tmp/fish/implicit/share/completions/mvn.fish:618
-#, fuzzy
 msgid "Replaces any version with the latest version."
-msgstr "Update dependencies to their latest versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:616
 msgid ""
@@ -45028,9 +42234,8 @@ msgid "Move files from a virtual file system to another"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:626
-#, fuzzy
 msgid "Remove files from a virtual file system"
-msgstr "Remove files from version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:627
 msgid ""
@@ -45059,9 +42264,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:631
 #: /tmp/fish/implicit/share/completions/mvn.fish:643
-#, fuzzy
 msgid "Closes a Nexus staging repository."
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:632
 msgid ""
@@ -45122,18 +42326,16 @@ msgid "Lists staging profiles accessible by current user available on Nexus."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:644
-#, fuzzy
 msgid "Delete unused indexes from application."
-msgstr "Check bundler requirements for your application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:645
 msgid "Starts the App Engine development server and does not wait."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:646
-#, fuzzy
 msgid "Start the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:647
 msgid "Stops the App Engine development server."
@@ -45144,9 +42346,8 @@ msgid "Roll back a previously in-progress update."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:649
-#, fuzzy
 msgid "Start the specified module version."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:650
 msgid "Change the default version, but more gently than set_default_version."
@@ -45165,9 +42366,8 @@ msgid "Debug the specified VM Runtime instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:654
-#, fuzzy
 msgid "Set the default serving version."
-msgstr "Set default file permission mask"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:655
 msgid "Runs the datanucleus enhancer."
@@ -45185,9 +42385,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:658
-#, fuzzy
 msgid "Configure the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:659
 msgid "Update application cron jobs."
@@ -45198,9 +42397,8 @@ msgid "Runs the App Engine development server."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:661
-#, fuzzy
 msgid "Delete the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:662
 msgid "Update the specified backend or all backends."
@@ -45215,9 +42413,8 @@ msgid "Update application task queue definitions."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:665
-#, fuzzy
 msgid "Stop the specified module version."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:666
 msgid "Rollback an in-progress update."
@@ -45232,9 +42429,8 @@ msgid "App Engine endpoints get-discovery-doc command."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:669
-#, fuzzy
 msgid "Stop the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:670
 msgid "Creates an Android Archive (aar) file. "
@@ -45608,9 +42804,8 @@ msgid "Finishes a hotfix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:728
-#, fuzzy
 msgid "Finishes a feature branch"
-msgstr "Lines after EOF are blank"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:729
 msgid ""
@@ -45618,9 +42813,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:730
-#, fuzzy
 msgid "Starts a release"
-msgstr "Start in easy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:731
 msgid "Starts a feature branch"
@@ -45645,70 +42839,60 @@ msgid "Run an executable archive application."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:1
-#, fuzzy
 msgid "displays this help text"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:3
 msgid "show mount point directories with a 'D'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:4
-#, fuzzy
 msgid "show the mode bits of each file"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:5
-#, fuzzy
 msgid "show owner and group name of each file"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:6
 msgid "use a long listing format (-m -o -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:7
-#, fuzzy
 msgid "don't follow symlinks"
-msgstr "Don't follow symlinks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:8
 msgid "vertical align of modes and owners"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:1
-#, fuzzy
 msgid "Perform the reverse operation"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:2
-#, fuzzy
 msgid "Specifies the name of the character encoding"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:3
 msgid "Pass \"option\" to JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:2
-#, fuzzy
 msgid "Quiet mode. Refresh interval 2 seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:4
-#, fuzzy
 msgid "Same filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:6
-#, fuzzy
 msgid "Exclude files that match any pattern in file"
-msgstr "Exclude files that match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
-#, fuzzy
 msgid "List all available profiles for automatic selection"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:4
 msgid "Start automatic profile selection on interface"
@@ -45735,57 +42919,48 @@ msgid "Enable all profiles for automatic selection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:10
-#, fuzzy
 msgid "Disable all profiles for automatic selection"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:11
-#, fuzzy
 msgid "Check whether specified profile is active"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:12
 msgid "Check whether specified profile is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:3
-#, fuzzy
 msgid "List available profiles"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:4
 msgid "Save which profiles are active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:5
-#, fuzzy
 msgid "Load saved profiles"
-msgstr "Load index from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:6
-#, fuzzy
 msgid "Stops all profiles"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:7
-#, fuzzy
 msgid "Start a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:8
-#, fuzzy
 msgid "Stop a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:9
-#, fuzzy
 msgid "Restart a profile"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:10
-#, fuzzy
 msgid "Switch to a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:11
 msgid "Show runtime status of a profile"
@@ -45808,9 +42983,8 @@ msgid "Check whether the unit is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:16
-#, fuzzy
 msgid "Open the specified profile in an editor"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nextd.fish:1
 #: /tmp/fish/implicit/share/completions/prevd.fish:1
@@ -45822,9 +42996,8 @@ msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
 msgid "specify build file [default=build.ninja]"
@@ -45839,9 +43012,8 @@ msgid "show all command lines while building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:5
-#, fuzzy
 msgid "number of jobs to run in parallel [default derived from CPUs]"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:6
 msgid "do not start if load average > N"
@@ -45860,9 +43032,8 @@ msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -45881,9 +43052,8 @@ msgid "use STYLE for numbering header lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:5
-#, fuzzy
 msgid "line number increment at each line"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:6
 msgid "group of NUMBER empty lines counted as one"
@@ -45914,47 +43084,40 @@ msgid "add STRING after (possible) line number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:13
-#, fuzzy
 msgid "first line number on each logical page"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:14
 msgid "use NUMBER columns for line numbers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:1
-#, fuzzy
 msgid "Output is terse"
-msgstr "Output trace"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:2
-#, fuzzy
 msgid "Output is pretty"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:3
 msgid "Switch between tabular and multiline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:4
-#, fuzzy
 msgid "Whether to use colors in output"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:5
-#, fuzzy
 msgid "Specify the output fields"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:6
-#, fuzzy
 msgid "Whether to escape \":\" and \"\\"
-msgstr "Whether to check hashes on disk"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:1
-#, fuzzy
 msgid "Display debugger-only symbols"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:2
 #: /tmp/fish/implicit/share/completions/nm.fish:10
@@ -45962,27 +43125,24 @@ msgid "Print name of the input file before every symbol"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:3
-#, fuzzy
 msgid "Do not demangle low-level symbol names"
-msgstr "Do not mangle From-field of email headers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:4
 msgid "Display dynamic symbols instead of normal symbols"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:5
-#, fuzzy
 msgid "Display only defined symbols"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:6
 msgid "Use the output format FORMAT. The default is \"bsd\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:7
-#, fuzzy
 msgid "Display only external symbols"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:8
 msgid ""
@@ -45990,47 +43150,40 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:9
-#, fuzzy
 msgid "Sort symbols numerically by address"
-msgstr "Numerical address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:11
-#, fuzzy
 msgid "Do not sort the symbols"
-msgstr "Do not use weak symbol support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:12
 msgid "Same as --format=posix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:13
-#, fuzzy
 msgid "Reverse the sense of the sort"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:14
-#, fuzzy
 msgid "Load the specified plugin"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:15
-#, fuzzy
 msgid "Print size of defined symbols"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:16
 msgid "Include index for symbols from archive members"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:17
-#, fuzzy
 msgid "Sort symbols by size"
-msgstr "Sort by size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:18
-#, fuzzy
 msgid "Include special symbols in the output"
-msgstr "Include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:19
 msgid "Display synthetic symbols as well"
@@ -46045,19 +43198,16 @@ msgid "Specify the target object format as BFDNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:22
-#, fuzzy
 msgid "Display only undefined symbols"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:23
-#, fuzzy
 msgid "Display this information"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:24
-#, fuzzy
 msgid "Display this program's version number"
-msgstr "display the gem format version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
 msgid "Print node's version"
@@ -46080,18 +43230,16 @@ msgid "Silence deprecation warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:6
-#, fuzzy
 msgid "Show stack traces on deprecations"
-msgstr "Show stack backtrace on errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:7
 msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "Print lpr options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -46840,18 +43988,16 @@ msgid "Minimal logging (no API, code, GC, suspect, or handles samples)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:175
-#, fuzzy
 msgid "Log all events to the log file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:176
 msgid "Activate runtime system %Log call"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:177
-#, fuzzy
 msgid "Log API events to the log file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:178
 msgid "Log code events to the log file without profiling"
@@ -46870,9 +44016,8 @@ msgid "log positions of (de)serialized objects in the snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:182
-#, fuzzy
 msgid "Log suspect operations"
-msgstr "Mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:183
 msgid "Log statistical profiling information (implies --log-code)"
@@ -46902,9 +44047,8 @@ msgid "Update sliding state window counters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:189
-#, fuzzy
 msgid "Specify the name of the log file"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:190
 msgid "Enable low-level linux profiler"
@@ -46915,76 +44059,63 @@ msgid "Complete the commandline using npm's 'completion' tool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:2
-#, fuzzy
 msgid "Manipulates package's cache"
-msgstr "Auto-gen package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:3
-#, fuzzy
 msgid "Add the specified package to the local cache"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:4
 msgid "Delete  data  out of the cache folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:5
-#, fuzzy
 msgid "Show the data in the cache"
-msgstr "Show packages in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:6
-#, fuzzy
 msgid "Manage the npm configuration files"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:7
 #: /tmp/fish/implicit/share/completions/npm.fish:14
-#, fuzzy
 msgid "Sets the config key to the value"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:8
 #: /tmp/fish/implicit/share/completions/npm.fish:13
-#, fuzzy
 msgid "Echo the config value to stdout"
-msgstr "Send the ownertrust values to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:9
-#, fuzzy
 msgid "Deletes the key from all configuration files"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:10
 #: /tmp/fish/implicit/share/completions/npm.fish:11
-#, fuzzy
 msgid "Show all the config settings"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:12
-#, fuzzy
 msgid "Opens the config file in an editor"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:15
-#, fuzzy
 msgid "install a package"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:16
-#, fuzzy
 msgid "Save to devDependencies in package.json"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:17
-#, fuzzy
 msgid "Save to dependencies in package.json"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:18
-#, fuzzy
 msgid "Install package globally"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:19
 #: /tmp/fish/implicit/share/completions/pkg.fish:25
@@ -46992,9 +44123,8 @@ msgstr "Install packages"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:24
 #: /tmp/fish/implicit/share/completions/prt-get.fish:84
 #: /tmp/fish/implicit/share/completions/yum.fish:29
-#, fuzzy
 msgid "List installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:20
 msgid ""
@@ -47002,58 +44132,48 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:21
-#, fuzzy
 msgid "Show information in JSON format"
-msgstr "Show information which is stored by darcs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:22
-#, fuzzy
 msgid "Show extended information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:23
 msgid "Show parseable output instead of tree view"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:24
-#, fuzzy
 msgid "Max display depth of the dependency tree"
-msgstr "display a dependency tree for package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:25
-#, fuzzy
 msgid "Manage package owners"
-msgstr "Ignore package Holds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:26
-#, fuzzy
 msgid "List package owners"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:27
-#, fuzzy
 msgid "Add a new owner to package"
-msgstr "Add a new service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:28
-#, fuzzy
 msgid "Remove an owner from package"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:29
-#, fuzzy
 msgid "remove package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:30
-#, fuzzy
 msgid "remove global package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:31
-#, fuzzy
 msgid "Package will be removed from your dependencies"
-msgstr "Generate a visual representation of your dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:32
 msgid "Package will be removed from your devDependencies"
@@ -47070,51 +44190,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:36
-#, fuzzy
 msgid "Update package(s)"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:37
-#, fuzzy
 msgid "Update global package(s)"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:38
 msgid "Add a registry user account"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:39
-#, fuzzy
 msgid "Display npm bin folder"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:40
 msgid "Bugs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:41
-#, fuzzy
 msgid "Reduce duplication"
-msgstr "Remove non-duplicate lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:42
-#, fuzzy
 msgid "Deprecate a version of a package"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:43
 msgid "Docs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:44
-#, fuzzy
 msgid "Edit an installed package"
-msgstr "Installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:45
-#, fuzzy
 msgid "Browse an installed package"
-msgstr "Show manually installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:46
 msgid "Frequently Asked Questions"
@@ -47129,97 +44242,80 @@ msgid "View registry info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:50
-#, fuzzy
 msgid "Symlink a package folder"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:51
-#, fuzzy
 msgid "Check for outdated packages"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:52
-#, fuzzy
 msgid "Create a tarball from a package"
-msgstr "Cancel a hold on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:53
-#, fuzzy
 msgid "Display NPM prefix"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:54
-#, fuzzy
 msgid "Remove extraneous packages"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:55
-#, fuzzy
 msgid "Publish a package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:57
-#, fuzzy
 msgid "Display npm root"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:58
 msgid "Run arbitrary package scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:59
-#, fuzzy
 msgid "Lock down dependency versions"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:60
-#, fuzzy
 msgid "Mark your favorite packages"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:61
 msgid "View packages marked as favorites"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:62
-#, fuzzy
 msgid "Start a package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:63
-#, fuzzy
 msgid "Stop a package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:64
-#, fuzzy
 msgid "Add a package as a git submodule"
-msgstr "Add a symbolic tag to a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:65
-#, fuzzy
 msgid "Test a package"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:66
-#, fuzzy
 msgid "Remove a package from the registry"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:67
-#, fuzzy
 msgid "Remove star from a package"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:68
-#, fuzzy
 msgid "Bump a package version"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:69
-#, fuzzy
 msgid "Display npm username"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nvram.fish:1
 msgid "Use  XML  format  for  reading  and  writing variables"
@@ -47242,121 +44338,100 @@ msgid "Delete all of the firmware variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:1
-#, fuzzy
 msgid "Display archive header information"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:2
-#, fuzzy
 msgid "Display contents of the overall file header"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:3
 msgid "Display object format specific file header contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:4
-#, fuzzy
 msgid "Display object format specific contents"
-msgstr "Display security context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:5
-#, fuzzy
 msgid "Display contents of section headers"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:6
-#, fuzzy
 msgid "Display content of section headers"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:7
-#, fuzzy
 msgid "Display the contents of all headers"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:8
-#, fuzzy
 msgid "Display assembler contents of executable sections"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:9
-#, fuzzy
 msgid "Display assembler contents of all sections"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:10
 msgid "Intermix source code with disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:11
-#, fuzzy
 msgid "Display full contents of all sections requested"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:12
-#, fuzzy
 msgid "Display debug information in object file"
-msgstr "Display status information on checked out files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:13
-#, fuzzy
 msgid "Display debug information using ctags style"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:14
-#, fuzzy
 msgid "Display (in raw form) any STABS info in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:15
-#, fuzzy
 msgid "Display DWARF info in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:16
-#, fuzzy
 msgid "Display contents of symbol table(s)"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:17
-#, fuzzy
 msgid "Display contents of dynamic symbol table"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:18
-#, fuzzy
 msgid "Display relocation entries in file"
-msgstr "Delete entries in zipfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:19
-#, fuzzy
 msgid "Display dynamic relocation entries in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:20
-#, fuzzy
 msgid "Display version number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:21
 msgid "List object formats and architectures supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:23
-#, fuzzy
 msgid "Specify target object format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:24
-#, fuzzy
 msgid "Specify target architecture"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:25
-#, fuzzy
 msgid "Only display information for given section"
-msgstr "Don't display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:26
 msgid "Pass given options on to disassembler"
@@ -47383,9 +44458,8 @@ msgid "Add given directory to search list from source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:32
-#, fuzzy
 msgid "Include line numbers and filenames in output"
-msgstr "Use label instead of filename in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:33
 msgid "Include file offsets when displaying information"
@@ -47424,9 +44498,8 @@ msgid "Don't display hex alongside symbolic disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:42
-#, fuzzy
 msgid "Display specified number of bytes on single line for -d"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:43
 msgid "Add offset to all displayed section address"
@@ -47441,73 +44514,60 @@ msgid "Add given prefix to absolute paths for -S"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:46
-#, fuzzy
 msgid "Strip initial directory names for -S"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:47
-#, fuzzy
 msgid "Do not display DIEs at given depth or greater"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:48
-#, fuzzy
 msgid "Display DIEs starting with given number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:49
 msgid "Make additional dwarf internal consistency checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:1
-#, fuzzy
 msgid "Add a key to the repository"
-msgstr "Adds an encryption key to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:2
-#, fuzzy
 msgid "Backup data to repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:3
-#, fuzzy
 msgid "List clients and their keys in the repository"
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:4
-#, fuzzy
 msgid "List clients using the repository"
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:5
-#, fuzzy
 msgid "Show difference between two generations"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:6
-#, fuzzy
 msgid "Dump (some) data structures from a repository"
-msgstr "Removes a client from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:7
-#, fuzzy
 msgid "Force a locked repository to be open"
-msgstr "Create a CVS repository if it doesn't exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:8
-#, fuzzy
 msgid "Forget (remove) specified backup generations"
-msgstr "Removes backup generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:9
-#, fuzzy
 msgid "Verify internal consistency of backup repository"
-msgstr "Checks the consistency of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:10
-#, fuzzy
 msgid "List backup generations for client"
-msgstr "Lists every backup generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:11
 msgid "List generation ids for client"
@@ -47518,57 +44578,48 @@ msgid "Print help, including hidden subcommands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:14
-#, fuzzy
 msgid "List contents of a generation in kdirstat cache format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:15
-#, fuzzy
 msgid "List error codes and explanations"
-msgstr "Do not print explanations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:16
-#, fuzzy
 msgid "List available repository formats"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:17
 msgid "List keys and repository toplevels they are used in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:18
-#, fuzzy
 msgid "List repository toplevel directories and their keys"
-msgstr "List directories, not their content"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:19
-#, fuzzy
 msgid "List contents of a generation"
-msgstr "Lists the contents of a given generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:20
 msgid "Mount a backup repository as a FUSE filesystem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:21
-#, fuzzy
 msgid "Check if the most recent generation is recent enough"
-msgstr "Locate the most recent version lacking an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:22
-#, fuzzy
 msgid "Remove client and its key from repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:23
-#, fuzzy
 msgid "Remove a key from the repository"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:24
-#, fuzzy
 msgid "Restore some or all files from a generation"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:25
 msgid "Verify that live data and backed up data match"
@@ -47583,9 +44634,8 @@ msgid "Do not restore setuid/setgid bits in restored files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:28
-#, fuzzy
 msgid "Use CHECKSUM algorithm"
-msgstr "MAC algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:29
 msgid "Name of client"
@@ -47628,9 +44678,8 @@ msgid "Wait TIMEOUT seconds for an existing lock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:39
-#, fuzzy
 msgid "Write output to FILE instead of STDOUT"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:40
 msgid "Do not actually change anything"
@@ -47649,14 +44698,12 @@ msgid "Show errors and progress updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:44
-#, fuzzy
 msgid "Name of backup repository"
-msgstr "Rename specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:45
-#, fuzzy
 msgid "Use FORMAT for new repositories"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:46
 msgid "Where to restore / mount to"
@@ -47701,9 +44748,8 @@ msgstr "Include directories tagged as cache"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:57
 #: /tmp/fish/implicit/share/completions/rsync.fish:77
-#, fuzzy
 msgid "Read exclude patterns from FILE"
-msgstr "Read a batched update from FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:58
 msgid "REGEXP for pathnames to include, even if matches --exclude"
@@ -47726,9 +44772,8 @@ msgid "Follow mount points"
 msgstr "Follow mount points"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:63
-#, fuzzy
 msgid "What to backup"
-msgstr "Go to background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:64
 msgid "Put small files directly into the B-tree"
@@ -47739,9 +44784,8 @@ msgid "No not put small files into the B-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:66
-#, fuzzy
 msgid "Add FILE to config files"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
 msgid "Write out the current configuration"
@@ -47784,9 +44828,8 @@ msgid "PGP key with which to encrypt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:77
-#, fuzzy
 msgid "Home directory for GPG"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:78
 msgid "Show additional user IDs"
@@ -47829,9 +44872,8 @@ msgid "Check chunks when checking integrity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:88
-#, fuzzy
 msgid "Do not check data for cient NAME"
-msgstr "Do not check directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
 msgid "Check only the last generation"
@@ -47844,19 +44886,16 @@ msgstr "Check all generations"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
-#, fuzzy
 msgid "fsck should remove unused chunks"
-msgstr "Remove unused locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:93
-#, fuzzy
 msgid "Do not check checksums of files"
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:94
-#, fuzzy
 msgid "Check checksums of files"
-msgstr "Check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:95
 msgid "Do not check directories"
@@ -47999,28 +45038,24 @@ msgid "FILENAME of the known_hosts file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:1
-#, fuzzy
 msgid "Produce no output to stderr"
-msgstr "Produce diff output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:2
-#, fuzzy
 msgid "Print this help text"
-msgstr "Get usage help text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:3
-#, fuzzy
 msgid "Print the version number"
-msgstr "Print line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:4
 msgid "Set bits/sample for raw input. Default is 16"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:5
-#, fuzzy
 msgid "Set number of channels for raw input"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:6
 msgid "Set samples/sec for raw input"
@@ -48039,9 +45074,8 @@ msgid "Enable the bitrate management engine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:10
-#, fuzzy
 msgid "Specify a minimum bitrate (in kbps)"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:11
 msgid "Specify a maximum bitrate in kbps"
@@ -48052,18 +45086,16 @@ msgid "option=value Sets an advanced encoder option to the given value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:13
-#, fuzzy
 msgid "Specify quality"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:14
 msgid "Resample input data to sampling rate n (Hz)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:15
-#, fuzzy
 msgid "Specify a serial number for the stream"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:16
 msgid ""
@@ -48080,9 +45112,8 @@ msgid "Produce filenames as this string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:19
-#, fuzzy
 msgid "Remove the specified characters from parameters"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:20
 msgid "Replace characters removed by --name-remove"
@@ -48093,57 +45124,49 @@ msgid "Add the given string as an extra comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:22
-#, fuzzy
 msgid "Date for track"
-msgstr "Set format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:23
-#, fuzzy
 msgid "Track number"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:24
 msgid "Title of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:25
-#, fuzzy
 msgid "Name of album"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:26
-#, fuzzy
 msgid "Name of artist"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:27
 msgid "Genre of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:1
-#, fuzzy
 msgid "Display the manual for an OPAM command."
-msgstr "Display help about darcs and darcs commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:2
 #: /tmp/fish/implicit/share/completions/opam.fish:58
-#, fuzzy
 msgid "Show version information."
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:4
 msgid "Compatibility mode with OPAM 1.0"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:5
-#, fuzzy
 msgid "Print debug message on stdout."
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:6
-#, fuzzy
 msgid "Print the git version if it exists and exit."
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:7
 msgid "Do not use the external aspcud solver, even if available."
@@ -48154,9 +45177,8 @@ msgid "Do not install base packages (useful for testing purposes)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:9
-#, fuzzy
 msgid "Be quiet when installing a new compiler."
-msgstr "Build and install a new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:10
 msgid "Use ROOT as the current root path."
@@ -48173,9 +45195,8 @@ msgid "Use SWITCH as the current compiler switch."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:13
-#, fuzzy
 msgid "Be more verbose."
-msgstr "Do not be verbose"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:14
 msgid ""
@@ -48184,23 +45205,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:15
-#, fuzzy
 msgid "Display configuration options for packages."
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:16
-#, fuzzy
 msgid "Enable all the global and user configuration options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:17
 msgid "Use csh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:18
-#, fuzzy
 msgid "Name of the configuration file to update instead of ~/."
-msgstr "Specify an initialization file to read instead of ~/.muttrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:19
 msgid "Backward-compatible option, equivalent to opam config env."
@@ -48211,14 +45229,12 @@ msgid "Use fish-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:21
-#, fuzzy
 msgid "Enable all the global configuration options."
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:22
-#, fuzzy
 msgid "List the current configuration."
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:23
 msgid "Do not load the auto-completion scripts in the environment."
@@ -48233,9 +45249,8 @@ msgid "Modify ~/. profile (or ~/."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:27
-#, fuzzy
 msgid "Recursive query."
-msgstr "Recursively copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:28
 msgid "Display environment variables as an s-expression."
@@ -48246,9 +45261,8 @@ msgid "Use sh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:30
-#, fuzzy
 msgid "Enable all the user configuration options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:31
 msgid "Use zsh-compatible mode for configuring OPAM.  DOMAINS."
@@ -48299,81 +45313,68 @@ msgid "returns assembly compile options."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:41
-#, fuzzy
 msgid "returns bytecode linking options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:42
 msgid "Prints a summary of your setup, useful for bug-reports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:43
-#, fuzzy
 msgid "Display help about OPAM and OPAM commands."
-msgstr "Display help about darcs and darcs commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:44
 msgid "Initialize OPAM state."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:45
-#, fuzzy
 msgid "Install a list of packages."
-msgstr "Install the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:46
-#, fuzzy
 msgid "Display the list of available packages."
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:47
-#, fuzzy
 msgid "Pin a given package to a specific version."
-msgstr "Print all source packages with version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:48
-#, fuzzy
 msgid "Reinstall a list of packages."
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:49
-#, fuzzy
 msgid "Remove a list of packages."
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:50
-#, fuzzy
 msgid "Manage OPAM repositories."
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:51
-#, fuzzy
 msgid "Search into the package list."
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:52
-#, fuzzy
 msgid "Display information about specific packages."
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:53
 msgid "Manage multiple installation of compilers."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:54
-#, fuzzy
 msgid "Update the list of available packages."
-msgstr "Update the list of down-loadable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:55
-#, fuzzy
 msgid "Upgrade the installed package to latest version."
-msgstr "Upgrade installed packages to their most recent version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:56
-#, fuzzy
 msgid "Administration tool for local repositories."
-msgstr "Query gem information in local or remote repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:57
 msgid "Show this help in format FMT (pager, plain or groff)."
@@ -48384,33 +45385,28 @@ msgid "Check a local repo for errors."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:60
-#, fuzzy
 msgid "Add external dependencies."
-msgstr "Ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:61
-#, fuzzy
 msgid "Initialize a repo for serving files."
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:62
-#, fuzzy
 msgid "Compute statistics."
-msgstr "Show cache statistics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:5
-#, fuzzy
 msgid "Prints the list of all defined branches on the server"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:6
 msgid "Lists perforce users suitable for list of completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:7
-#, fuzzy
 msgid "Lists current user's workspaces"
-msgstr "List current package locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:8
 msgid "Lists all changelists for current user"
@@ -48423,23 +45419,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:10
-#, fuzzy
 msgid "Lists all changelists with *shelved* files"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:11
-#, fuzzy
 msgid "Lists p4 commands"
-msgstr "List by columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:12
 msgid "Lists environment variables that can be consumed by perforce"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:13
-#, fuzzy
 msgid "Lists all of available file modes"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:17
 msgid "Values for --parallel option in various commands"
@@ -48540,21 +45533,18 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:43
-#, fuzzy
 msgid "Displays the version of the p4 application and exits."
-msgstr "Display version and supported algorithms, and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:44
-#, fuzzy
 msgid "Displays basic usage information and exits."
-msgstr "Display configuration and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:14
-#, fuzzy
 msgid "Manage .pac* files"
-msgstr "Handle sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:10
 #: /tmp/fish/implicit/share/completions/pacman.fish:9
@@ -48563,87 +45553,74 @@ msgid "Query the files database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:13
-#, fuzzy
 msgid "(AUR) Search for packages"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:14
-#, fuzzy
 msgid "(AUR) Show info for packages"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:15
 msgid "(AUR) Clone the packages' build files and build them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:16
-#, fuzzy
 msgid "(AUR) Clone build files, build and install packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:17
-#, fuzzy
 msgid "(AUR) Check foreign packages for updates"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:18
-#, fuzzy
 msgid "(AUR) Update foreign packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:19
 msgid "(AUR) Clone the packages' build files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:20
-#, fuzzy
 msgid "Download dependencies recursively"
-msgstr "Copy directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:29
 #: /tmp/fish/implicit/share/completions/pacman.fish:20
 #: /tmp/fish/implicit/share/completions/yaourt.fish:26
-#, fuzzy
 msgid "Hook file directory"
-msgstr "File is directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:32
 msgid "Apply only for AUR targets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:33
-#, fuzzy
 msgid "Apply only for specified repo"
-msgstr "Encrypt for specified user id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:34
-#, fuzzy
 msgid "Edit build files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:35
-#, fuzzy
 msgid "Do not edit build files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:36
-#, fuzzy
 msgid "Always rebuild packages"
-msgstr "Erase built packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:37
-#, fuzzy
 msgid "Redirect output to the log in the clone directory"
-msgstr "Redirect output to file if file does not exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:38
 msgid "Point at a domain other than the default aur.archlinux.org"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:39
-#, fuzzy
 msgid "Use devel packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:40
 msgid "Ignore all results marked as out of date"
@@ -48662,16 +45639,14 @@ msgid "Sort descending by key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:44
-#, fuzzy
 msgid "Search by field"
-msgstr "Select fields"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:81
 #: /tmp/fish/implicit/share/completions/pacman.fish:59
 #: /tmp/fish/implicit/share/completions/yaourt.fish:80
-#, fuzzy
 msgid "Also downgrade packages"
-msgstr "Bugs for downgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:86
 #: /tmp/fish/implicit/share/completions/pacman.fish:64
@@ -48688,9 +45663,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/yaourt.fish:94
 #: /tmp/fish/implicit/share/completions/yaourt.fish:95
 #: /tmp/fish/implicit/share/completions/yaourt.fish:99
-#, fuzzy
 msgid "List files owned by given packages"
-msgstr "list files owned by package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:90
@@ -48701,9 +45675,8 @@ msgstr "list files owned by package"
 #: /tmp/fish/implicit/share/completions/yaourt.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:97
 #: /tmp/fish/implicit/share/completions/yaourt.fish:100
-#, fuzzy
 msgid "Search packages for matching files"
-msgstr "Search for packages matching a pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:91
 #: /tmp/fish/implicit/share/completions/pacman.fish:69
@@ -48714,48 +45687,41 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:94
 #: /tmp/fish/implicit/share/completions/pacman.fish:72
 #: /tmp/fish/implicit/share/completions/yaourt.fish:101
-#, fuzzy
 msgid "Search for packages that include the given files"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:103
-#, fuzzy
 msgid "Show in machine readable format"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman.fish:74
 msgid "Show in machine readable format: repo\\0pkgname\\0pkgver\\0path\\n"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:1
-#, fuzzy
 msgid "Add or update keys from <file>"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:2
-#, fuzzy
 msgid "Use an alternate config <file>"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:3
-#, fuzzy
 msgid "Remove the <keys> from the keyring"
-msgstr "Remove key from the public keyring"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:4
-#, fuzzy
 msgid "Export <keys> to stdout"
-msgstr "Extract to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:5
 msgid "Present a menu on specified <keys>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:6
-#, fuzzy
 msgid "List a fingerprint for each specified <key>"
-msgstr "List all the files in each selected package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:7
 msgid "Alternate home <dir> for GnuPG"
@@ -48778,19 +45744,16 @@ msgid "Initialize the keyring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:12
-#, fuzzy
 msgid "Use the specified <keyserver>"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:13
-#, fuzzy
 msgid "Lists all or specified <keys> from the keyring"
-msgstr "Export all or the given keys from all keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:14
-#, fuzzy
 msgid "Same as --list-keys, but with signatures"
-msgstr "Same as --list-keys, but the signatures are listed too"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:15
 msgid "Locally sign the given <key>"
@@ -48817,9 +45780,8 @@ msgid "Verify the given <signature> file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:21
-#, fuzzy
 msgid "Displays the program version"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacmd.fish:1
 msgid "Resume"
@@ -48834,78 +45796,64 @@ msgid "Show statistics about memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:2
-#, fuzzy
 msgid "Show info about the daemon"
-msgstr "Show help about options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:3
-#, fuzzy
 msgid "Show all loaded things of the specified type"
-msgstr "Show file systems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:4
-#, fuzzy
 msgid "Show shorter output"
-msgstr "Stop from terminal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:5
 msgid "Ask the daemon to exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:6
-#, fuzzy
 msgid "Upload a file to the sample cache"
-msgstr "Select file to store source cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:7
-#, fuzzy
 msgid "Play a sample from the cache"
-msgstr "Do not remove stale gems from the cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:8
-#, fuzzy
 msgid "Remove a sample from the cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:10
-#, fuzzy
 msgid "Print help text and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:1
-#, fuzzy
 msgid "Set an alternate database location"
-msgstr "Set a state attribute for a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:2
-#, fuzzy
 msgid "Colorize output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:3
-#, fuzzy
 msgid "Limit the depth of recursion"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:4
-#, fuzzy
 msgid "Generate output for graphviz's dot"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:5
-#, fuzzy
 msgid "Display this help message"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:6
-#, fuzzy
 msgid "Enable linear output"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:7
-#, fuzzy
 msgid "Show reverse dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:8
 msgid "Search sync DBs instead of local"
@@ -48916,9 +45864,8 @@ msgid "Show dependencies with no duplicates (implies -l)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:10
-#, fuzzy
 msgid "Set an alternate configuration file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:1
 msgid ""
@@ -48953,9 +45900,8 @@ msgid "Change to the directory dir immediately"
 msgstr "Change to the directory dir immediately"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:8
-#, fuzzy
 msgid "Use the #ifdef…#endif construct to mark changes"
-msgstr "Use the #ifdef ... #endif construct to mark changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:9
 msgid ""
@@ -48994,9 +45940,8 @@ msgstr ""
 "or when a file is under ClearCase control and does not exist"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:16
-#, fuzzy
 msgid "Read the patch from patchfile"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:17
 msgid ""
@@ -49065,9 +46010,8 @@ msgid "Use method to determine backup file names"
 msgstr "Use method to determine backup file names"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:32
-#, fuzzy
 msgid "Output extra information about the work being done"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:33
 msgid "Set internal debugging flags of interest only to patch patchers"
@@ -49094,14 +46038,12 @@ msgstr ""
 "given in context diff headers, UTC, GMT"
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:1
-#, fuzzy
 msgid "Use the ABS tree"
-msgstr "Use no pristine tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:2
-#, fuzzy
 msgid "Set the desired package architecture"
-msgstr "Select file to store package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:3
 msgid "Search the AUR"
@@ -49112,19 +46054,16 @@ msgid "Only search the AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:5
-#, fuzzy
 msgid "Set the output directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:6
-#, fuzzy
 msgid "Display this message"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:7
-#, fuzzy
 msgid "Search for upgradable packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:8
 msgid "Search the ABS testing branches"
@@ -49171,9 +46110,8 @@ msgid "Keep text in content stream order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:11
-#, fuzzy
 msgid "Generate simple HTML file"
-msgstr "Generate a simple Gemfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:12
 msgid "Generate XHTML bounding boxes"
@@ -49184,9 +46122,8 @@ msgid "Sets encoding for the output [UTF-8]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:14
-#, fuzzy
 msgid "Lists the available encodings"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:15
 msgid "Sets the end-of-line convention"
@@ -49197,31 +46134,26 @@ msgid "Don't insert page breaks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:17
-#, fuzzy
 msgid "Specify owner password for the PDF"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:18
-#, fuzzy
 msgid "Specify user password for the PDF"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:19
 #: /tmp/fish/implicit/share/completions/xpdf.fish:28
-#, fuzzy
 msgid "Don't print any messages or errors"
-msgstr "Don't run any tag programs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:20
-#, fuzzy
 msgid "Print copyright and version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:21
 #: /tmp/fish/implicit/share/completions/xpdf.fish:31
-#, fuzzy
 msgid "Print usage information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:1
 #: /tmp/fish/implicit/share/completions/ruby.fish:1
@@ -49329,14 +46261,12 @@ msgid "Automatic line ending processing"
 msgstr "Automatic line ending processing"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:26
-#, fuzzy
 msgid "Require module"
-msgstr "Require file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:27
-#, fuzzy
 msgid "Use module"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:28
 #: /tmp/fish/implicit/share/completions/ruby.fish:12
@@ -49383,28 +46313,24 @@ msgstr "Disable warnings"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:41
 #: /tmp/fish/implicit/share/completions/ruby.fish:21
-#, fuzzy
 msgid "Extract script"
-msgstr "Evaluate script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:1
 msgid "Show a filter parameter by modifier"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:2
-#, fuzzy
 msgid "Flush filter params specified by mod"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "Help for this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
-#, fuzzy
 msgid "Output delimiter"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:2
 msgid "List the process name as well as the process ID"
@@ -49419,9 +46345,8 @@ msgid "Open file"
 msgstr "Open file"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:4
-#, fuzzy
 msgid "Start in folder index"
-msgstr "Start in foreground mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:5
 msgid "Initial set of keystrokes"
@@ -49448,9 +46373,8 @@ msgid "Set global configuration file"
 msgstr "Set global configuration file"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:12
-#, fuzzy
 msgid "Restricted mode"
-msgstr "Start in restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:13
 msgid "Enable suspension support"
@@ -49545,9 +46469,8 @@ msgstr ""
 "interface"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:19
-#, fuzzy
 msgid "Specifies the number of data bytes to be sent"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:20
 msgid "Set socket buffer size"
@@ -49582,14 +46505,12 @@ msgid "Time to wait for a response, in seconds"
 msgstr "Time to wait for a response, in seconds"
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:1
-#, fuzzy
 msgid "produce long format output for the specified USERs"
-msgstr "Write log output to the specified file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:2
-#, fuzzy
 msgid "omit the user's home directory and shell in long format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:3
 msgid "omit the user's project file in long format"
@@ -49620,58 +46541,49 @@ msgid "omit the user's full name, remote host and idle time in short format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:1
-#, fuzzy
 msgid "failsafe to overwrite"
-msgstr "Log to file, overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:2
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:3
-#, fuzzy
 msgid "Turn on stats"
-msgstr "Warning control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:3
-#, fuzzy
 msgid "Automated package installation"
-msgstr "Don't change the package installation order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:1
-#, fuzzy
 msgid "Upgrade"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:2
 msgid "Force installation, overwriting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:1
-#, fuzzy
 msgid "Print versions of the specified libraries"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:2
-#, fuzzy
 msgid "Display the version of pkg-config and quit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:3
-#, fuzzy
 msgid "Displays a help message and quit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:4
-#, fuzzy
 msgid "Print message when errors occur"
-msgstr "Work silently, unless an error occurs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:5
 msgid "Stay quiet when errors occur"
@@ -49690,9 +46602,8 @@ msgid "This prints the -I part of \"--cflags\"."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:10
-#, fuzzy
 msgid "Print link flags"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:11
 msgid "This prints the -L/-R part of \"--libs\"."
@@ -49715,14 +46626,12 @@ msgid "Returns a list of all variables defined in the package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:16
-#, fuzzy
 msgid "Return success if any -uninstalled packages are used"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:17
-#, fuzzy
 msgid "Test if a package has at most the specified version"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:18
 msgid "Test if a package has at least this version"
@@ -49733,9 +46642,8 @@ msgid "Test if a package has exactly this version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:20
-#, fuzzy
 msgid "Test if a package exists"
-msgstr "Verify package integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:21
 msgid "Output libraries suitable for static linking"
@@ -49746,23 +46654,20 @@ msgid "List all modules found in the pkg-config path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:23
-#, fuzzy
 msgid "List all modules the given packages provides"
-msgstr "List capabilities this package provides"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:24
-#, fuzzy
 msgid "List all modules the given packages requires"
-msgstr "List capabilities this package provides"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:25
 msgid "List all modules the given packages requires for static linking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:2
-#, fuzzy
 msgid "Delete unsed deps"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:3
 msgid "only show files in a {s}bin/ directory. Works with -s, -l"
@@ -49773,38 +46678,32 @@ msgid "make searches case sensitive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:5
-#, fuzzy
 msgid "allow the use of * and ? as wildcards"
-msgstr "Do not expand wildcards"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:6
-#, fuzzy
 msgid "allow the use of regex in searches"
-msgstr "Never allow the use of specified cipher algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:7
-#, fuzzy
 msgid "search only in the specified repository"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:8
-#, fuzzy
 msgid "enable verbose output"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:9
-#, fuzzy
 msgid "provides information about the package owning a file"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:10
 msgid "list files of a given package; similar to \"pacman -Ql\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:11
-#, fuzzy
 msgid "search which package owns a file"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:12
 msgid ""
@@ -49813,24 +46712,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:2
-#, fuzzy
 msgid "Show debug information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:3
-#, fuzzy
 msgid "List subcommands"
-msgstr "List by columns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:4
-#, fuzzy
 msgid "Set configuration option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:5
-#, fuzzy
 msgid "Run sanity test"
-msgstr "Run unit tests for gem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:6
 msgid "Run package manager within jail"
@@ -49841,14 +46736,12 @@ msgid "Run package manager within chroot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:8
-#, fuzzy
 msgid "Install packages in specified root"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:9
-#, fuzzy
 msgid "Use configuration file"
-msgstr "Configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:10
 msgid "Set repository configuration directory"
@@ -49863,64 +46756,53 @@ msgid "Use IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:13
-#, fuzzy
 msgid "Display help for command"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:14
-#, fuzzy
 msgid "Install package file"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:15
-#, fuzzy
 msgid "Modify annotations on packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:16
-#, fuzzy
 msgid "Audit installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:17
-#, fuzzy
 msgid "Delete unneeded packages"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:18
 msgid "Dump package database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:19
-#, fuzzy
 msgid "Check installed packages"
-msgstr "Check installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:20
-#, fuzzy
 msgid "Clean local cache"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:21
-#, fuzzy
 msgid "Convert package from pkg_add format"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:22
-#, fuzzy
 msgid "Create a package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:23
 #: /tmp/fish/implicit/share/completions/pkg.fish:31
-#, fuzzy
 msgid "Remove a package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:24
-#, fuzzy
 msgid "Download a remote package"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:26
 #: /tmp/fish/implicit/share/completions/zypper.fish:3
@@ -49929,14 +46811,12 @@ msgid "Install packages"
 msgstr "Install packages"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:27
-#, fuzzy
 msgid "Prevent package modification"
-msgstr "Print package name/distro"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:28
-#, fuzzy
 msgid "List package manager plugins"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:29
 #: /tmp/fish/implicit/share/completions/rpm.fish:95
@@ -49944,29 +46824,24 @@ msgid "Query installed packages"
 msgstr "Query installed packages"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:30
-#, fuzzy
 msgid "Register a package in a database"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:32
-#, fuzzy
 msgid "Create package repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:33
-#, fuzzy
 msgid "Query information for remote repositories"
-msgstr "Query gem information in local or remote repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:34
-#, fuzzy
 msgid "Find packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:35
-#, fuzzy
 msgid "Modify package information in database"
-msgstr "Look up file information via the mimedb database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:36
 msgid "Open a SQLite shell"
@@ -49977,36 +46852,32 @@ msgid "Display packages linking to shared library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:38
-#, fuzzy
 msgid "Display package statistics"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:39
 msgid "Stop preventing package modification"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:40
-#, fuzzy
 msgid "Update remote repositories"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:41
 msgid "Display UPDATING entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:43
-#, fuzzy
 msgid "Show package versions"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:44
 msgid "Check which package provides a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:45
-#, fuzzy
 msgid "Mark packages as automatic"
-msgstr "Mark packages as automatically installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:46
 msgid "Force installation even when installed"
@@ -50014,207 +46885,171 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:47
 #: /tmp/fish/implicit/share/completions/pkg.fish:61
-#, fuzzy
 msgid "Disable installation scripts"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:48
 #: /tmp/fish/implicit/share/completions/pkg.fish:62
-#, fuzzy
 msgid "Force installation with missing dependencies"
-msgstr "Force gem to install, bypassing dependency checks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:49
-#, fuzzy
 msgid "Force quiet output"
-msgstr "Forced quit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:50
-#, fuzzy
 msgid "Do not make changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:51
-#, fuzzy
 msgid "Assume yes when asked for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:52
-#, fuzzy
 msgid "Delete all cached packages"
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:53
-#, fuzzy
 msgid "Delete all installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:54
-#, fuzzy
 msgid "Case sensitive packages"
-msgstr "All base system packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:55
-#, fuzzy
 msgid "Disable deinstallation scripts"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:56
-#, fuzzy
 msgid "Force package removal"
-msgstr "Ignore package Holds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:57
 msgid "Treat the package name as shell glob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:58
-#, fuzzy
 msgid "Case insensitive packages"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:59
-#, fuzzy
 msgid "Remove recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:60
 msgid "Treat the package name as regular expression"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:63
-#, fuzzy
 msgid "Do not perform actual installation"
-msgstr "Don't run unit tests prior to installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:64
-#, fuzzy
 msgid "Reinstall packages required by this package"
-msgstr "list all packages depending on specified package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:65
-#, fuzzy
 msgid "Use only a given repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:66
-#, fuzzy
 msgid "Do not automatically update database"
-msgstr "Show automatically installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:67
-#, fuzzy
 msgid "Force a full download of a repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:2
-#, fuzzy
 msgid "Package whose files to list"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:3
-#, fuzzy
 msgid "Print the package owning file matching pattern"
-msgstr "list all packages matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:4
-#, fuzzy
 msgid "Print footprint for file"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:5
-#, fuzzy
 msgid "Specify alternative installation root"
-msgstr "Specify installroot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:6
-#, fuzzy
 msgid "Print version of pkgutils"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:1
-#, fuzzy
 msgid "Install with pkgadd after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:2
 msgid "Upgrade with pkgadd after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:3
-#, fuzzy
 msgid "Search and build packages recursively"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:4
-#, fuzzy
 msgid "Download the sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:5
-#, fuzzy
 msgid "Only download the sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:6
-#, fuzzy
 msgid "Check if the package is uptodate"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:39
 #: /tmp/fish/implicit/share/completions/prt-get.fish:98
-#, fuzzy
 msgid "Update footprint"
-msgstr "Update mirror list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:40
 #: /tmp/fish/implicit/share/completions/prt-get.fish:99
-#, fuzzy
 msgid "Ignore footprint"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:37
 #: /tmp/fish/implicit/share/completions/prt-get.fish:96
-#, fuzzy
 msgid "Update md5sum"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:38
 #: /tmp/fish/implicit/share/completions/prt-get.fish:97
-#, fuzzy
 msgid "Ignore md5sum"
-msgstr "Ignore case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:11
-#, fuzzy
 msgid "Do not strip executables"
-msgstr "Make scripts executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:36
 #: /tmp/fish/implicit/share/completions/prt-get.fish:95
-#, fuzzy
 msgid "Force rebuild"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:13
-#, fuzzy
 msgid "Remove package and sources"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:14
-#, fuzzy
 msgid "Keep working dir"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:15
-#, fuzzy
 msgid "Use another config"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgrm.fish:1
 msgid "Package to remove"
@@ -50244,14 +47079,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:6
-#, fuzzy
 msgid "Displays help information"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:7
-#, fuzzy
 msgid "Prints the version and exits"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:1
 msgid "run 'make config' for all ports (overrides -G)."
@@ -50294,9 +47127,8 @@ msgid "recurse dependencies thoroughly, using all-depends-list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:11
-#, fuzzy
 msgid "verbose output."
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:12
 msgid "save old shared libraries before deinstall [-R]… [See Man Page]"
@@ -50307,9 +47139,8 @@ msgid "interactive update mode -- ask whether to rebuild ports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:14
-#, fuzzy
 msgid "no cleaning of distfiles."
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:15
 msgid "always clean distfiles."
@@ -50344,9 +47175,8 @@ msgid "use the INDEX for status, but double-check with the port."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:23
-#, fuzzy
 msgid "do not try to use /usr/ports."
-msgstr "Do not try to use the GnuPG-Agent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:24
 msgid "delete ports that are build-only dependencies a… [See Man Page]"
@@ -50365,18 +47195,16 @@ msgid "fail if no package is available."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:28
-#, fuzzy
 msgid "use packages for all build dependencies."
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:29
 msgid "use package if newer than installed even if the… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:30
-#, fuzzy
 msgid "fetch package even if it already exists locally."
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:31
 msgid "where local packages can be found, will fall ba… [See Man Page]"
@@ -50423,9 +47251,8 @@ msgid "answer yes to all user prompts for the features… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:42
-#, fuzzy
 msgid "display help message."
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:43
 msgid "display the version number El ENVIRONMENT The d… [See Man Page]"
@@ -50440,14 +47267,12 @@ msgid "Installed Package"
 msgstr "Installed Package"
 
 #: /tmp/fish/implicit/share/completions/ports.fish:1
-#, fuzzy
 msgid "Update ports"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:2
-#, fuzzy
 msgid "List ports"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:3
 msgid "List version diffs between local and installed ports"
@@ -50474,14 +47299,12 @@ msgid "Just write wtmp record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:7
-#, fuzzy
 msgid "Don't write wtmp record"
-msgstr "Don't remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:8
-#, fuzzy
 msgid "Don't send wall message"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:2
 #: /tmp/fish/implicit/share/completions/prt-get.fish:62
@@ -50493,15 +47316,13 @@ msgstr "Port"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:3
 #: /tmp/fish/implicit/share/completions/prt-get.fish:64
-#, fuzzy
 msgid "Install listed ports"
-msgstr "Install needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:4
 #: /tmp/fish/implicit/share/completions/prt-get.fish:65
-#, fuzzy
 msgid "Install listed ports and their deps"
-msgstr "Install source packages and their build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:5
 #: /tmp/fish/implicit/share/completions/prt-get.fish:66
@@ -50510,33 +47331,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:6
 #: /tmp/fish/implicit/share/completions/prt-get.fish:67
-#, fuzzy
 msgid "Update listed packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:68
-#, fuzzy
 msgid "Remove listed packages"
-msgstr "Remove the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:69
-#, fuzzy
 msgid "Update all outdated installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:70
-#, fuzzy
 msgid "Do not update this in sysup"
-msgstr "Do not propagate times for matching symbols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:71
-#, fuzzy
 msgid "Remove this from lock"
-msgstr "Remove unused locks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:11
 #: /tmp/fish/implicit/share/completions/prt-get.fish:72
@@ -50545,9 +47361,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:73
-#, fuzzy
 msgid "Search for an expr in port names"
-msgstr "Prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:13
 #: /tmp/fish/implicit/share/completions/prt-get.fish:74
@@ -50556,22 +47371,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:14
 #: /tmp/fish/implicit/share/completions/prt-get.fish:75
-#, fuzzy
 msgid "Print info on a port"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:15
 #: /tmp/fish/implicit/share/completions/prt-get.fish:76
-#, fuzzy
 msgid "Search for a pattern in the footprints in the ports tree"
 msgstr ""
-"Searches for matches of the supplied string in the current local portage tree"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:16
 #: /tmp/fish/implicit/share/completions/prt-get.fish:77
-#, fuzzy
 msgid "Print the path of a port"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:17
 #: /tmp/fish/implicit/share/completions/prt-get.fish:78
@@ -50580,15 +47391,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:18
 #: /tmp/fish/implicit/share/completions/prt-get.fish:79
-#, fuzzy
 msgid "Print a list of deps for the listed ports"
-msgstr "Print a list of local users"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:19
 #: /tmp/fish/implicit/share/completions/prt-get.fish:80
-#, fuzzy
 msgid "Print a simple list of deps for the listed ports"
-msgstr "Print suppressions for detected errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:20
 #: /tmp/fish/implicit/share/completions/prt-get.fish:81
@@ -50596,56 +47405,47 @@ msgid "Print a deptree for the port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:21
-#, fuzzy
 msgid "List ports in multiple directories"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:22
 #: /tmp/fish/implicit/share/completions/prt-get.fish:82
-#, fuzzy
 msgid "List all the ports"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:23
 #: /tmp/fish/implicit/share/completions/prt-get.fish:83
-#, fuzzy
 msgid "Print formatted list of ports"
-msgstr "Prints formatted text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:25
 #: /tmp/fish/implicit/share/completions/prt-get.fish:85
-#, fuzzy
 msgid "List installed packages which have no dependent packages"
-msgstr "List packages on which this package depends"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:26
-#, fuzzy
 msgid "Check if a port is installed"
-msgstr "Check installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:27
 #: /tmp/fish/implicit/share/completions/prt-get.fish:86
-#, fuzzy
 msgid "Print the version of an installed package"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:28
 #: /tmp/fish/implicit/share/completions/prt-get.fish:87
-#, fuzzy
 msgid "Print the listing of the directory of a port"
-msgstr "Print the working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:29
 #: /tmp/fish/implicit/share/completions/prt-get.fish:88
-#, fuzzy
 msgid "Print a file in a port to stdout"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:30
 #: /tmp/fish/implicit/share/completions/prt-get.fish:89
-#, fuzzy
 msgid "Edit a file in a port"
-msgstr "Edit files in-place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:31
 #: /tmp/fish/implicit/share/completions/prt-get.fish:90
@@ -50654,44 +47454,37 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:32
 #: /tmp/fish/implicit/share/completions/prt-get.fish:91
-#, fuzzy
 msgid "Print the configuration of prt-get"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:33
 #: /tmp/fish/implicit/share/completions/prt-get.fish:92
-#, fuzzy
 msgid "Show the current version of prt-get"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:34
 #: /tmp/fish/implicit/share/completions/prt-get.fish:93
-#, fuzzy
 msgid "Create a cache for prt-get"
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:41
 #: /tmp/fish/implicit/share/completions/prt-get.fish:100
-#, fuzzy
 msgid "No stripping"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:42
 #: /tmp/fish/implicit/share/completions/prt-get.fish:101
-#, fuzzy
 msgid "Keep work directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:43
 #: /tmp/fish/implicit/share/completions/prt-get.fish:102
-#, fuzzy
 msgid "Ignore the listed ports"
-msgstr "Ignore first line of input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:44
-#, fuzzy
 msgid "Use cache"
-msgstr "Set cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:46
 #: /tmp/fish/implicit/share/completions/prt-get.fish:104
@@ -50710,27 +47503,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:49
 #: /tmp/fish/implicit/share/completions/prt-get.fish:107
-#, fuzzy
 msgid "Ignore default config file"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:50
 #: /tmp/fish/implicit/share/completions/prt-get.fish:108
-#, fuzzy
 msgid "Prepend string to config file"
-msgstr "Prepend string to relative links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:51
 #: /tmp/fish/implicit/share/completions/prt-get.fish:109
-#, fuzzy
 msgid "Append string to config file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:52
 #: /tmp/fish/implicit/share/completions/prt-get.fish:110
-#, fuzzy
 msgid "Overrirde config file with string"
-msgstr "Overwrite modified files with clean copies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:54
 #: /tmp/fish/implicit/share/completions/prt-get.fish:112
@@ -50749,33 +47538,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:57
 #: /tmp/fish/implicit/share/completions/prt-get.fish:115
-#, fuzzy
 msgid "Prefer higher version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:58
 #: /tmp/fish/implicit/share/completions/prt-get.fish:116
-#, fuzzy
 msgid "Override prefer-higher"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:59
 #: /tmp/fish/implicit/share/completions/prt-get.fish:117
-#, fuzzy
 msgid "Use alternative config file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:60
 #: /tmp/fish/implicit/share/completions/prt-get.fish:118
-#, fuzzy
 msgid "Use this alternative root for installation"
-msgstr "Run unit tests prior to installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:61
 #: /tmp/fish/implicit/share/completions/prt-get.fish:119
-#, fuzzy
 msgid "Write output to log file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:1
 #: /tmp/fish/implicit/share/completions/ps.fish:5
@@ -50846,9 +47630,8 @@ msgid "Add column for security data"
 msgstr "Add column for security data"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:19
-#, fuzzy
 msgid "Show different scheduler information for the -l option"
-msgstr "Show full information for specified patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:20
 msgid "Full format"
@@ -50875,9 +47658,8 @@ msgid "Wide output"
 msgstr "Wide output"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:29
-#, fuzzy
 msgid "Set screen width"
-msgstr "Assume screen width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:30
 msgid "Include dead child process data"
@@ -50888,34 +47670,28 @@ msgid "Repead header lines, one per page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:32
-#, fuzzy
 msgid "Print no headers"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:33
-#, fuzzy
 msgid "Set screen height"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:34
-#, fuzzy
 msgid "Spericy sorting order"
-msgstr "Set mail sort order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:35
-#, fuzzy
 msgid "Show threads. With LWP/NLWP"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:36
-#, fuzzy
 msgid "Show threads. With SPID"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:37
-#, fuzzy
 msgid "Show threads after processes"
-msgstr "Stop after preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:1
 msgid "database name to connect to"
@@ -50930,46 +47706,40 @@ msgid "execute commands from file, then exit"
 msgstr "execute commands from file, then exit"
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
-#, fuzzy
 msgid "list available databases, then exit"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:5
 msgid "do not read startup file (~/.psqlrc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:6
-#, fuzzy
 msgid "execute command file as a single transaction"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:7
-#, fuzzy
 msgid "show this help, then exit"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:8
-#, fuzzy
 msgid "output version information, then exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:9
 msgid "echo all input from script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:10
-#, fuzzy
 msgid "echo commands sent to server"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:11
 msgid "display queries that internal commands generate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:12
-#, fuzzy
 msgid "send session log to file"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:13
 msgid "disable enhanced command line editing (readline)"
@@ -50992,9 +47762,8 @@ msgid "single-line mode (end of line terminates SQL command)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:18
-#, fuzzy
 msgid "unaligned table output mode"
-msgstr "Give human readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:19
 msgid "HTML table output mode"
@@ -51005,18 +47774,16 @@ msgid "set printing option VAR to ARG (see \\pset command)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:21
-#, fuzzy
 msgid "print rows only"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:22
 msgid "set HTML table tag attributes (e.g., width, border)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:23
-#, fuzzy
 msgid "turn on expanded table output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:24
 msgid "set field separator (default: '|')"
@@ -51035,14 +47802,12 @@ msgid "database server port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:28
-#, fuzzy
 msgid "database user name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:29
-#, fuzzy
 msgid "never prompt for password"
-msgstr "Never prompt before removal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:30
 msgid "force password prompt (should happen automatically)"
@@ -51057,47 +47822,40 @@ msgid "Turn progress bar on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:2
-#, fuzzy
 msgid "Show timer"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:3
-#, fuzzy
 msgid "Show estimated time left"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:4
 msgid "Show estimated time of arrival"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:5
-#, fuzzy
 msgid "Show rate counter"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:6
-#, fuzzy
 msgid "Show average rate"
-msgstr "Show packages in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:7
-#, fuzzy
 msgid "Show total byte counter"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:8
 msgid "Show transfer buffer percentage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:9
-#, fuzzy
 msgid "Show the last NUM bytes written"
-msgstr "Print total bytes written"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:10
-#, fuzzy
 msgid "Set output format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:13
 msgid "Wait for first byte before showing progress"
@@ -51108,43 +47866,36 @@ msgid "Wait given time (in secs) before showing progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:15
-#, fuzzy
 msgid "Set total number of bytes to be transfered"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:16
 msgid "Count lines instead of bytes"
 msgstr "Count lines instead of bytes"
 
 #: /tmp/fish/implicit/share/completions/pv.fish:17
-#, fuzzy
 msgid "Count null-terminated lines"
-msgstr "-T has null-terminated names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:18
-#, fuzzy
 msgid "Wait given time (in secs) between updates"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:19
-#, fuzzy
 msgid "Set terminal width"
-msgstr "Stop from terminal input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:20
-#, fuzzy
 msgid "Set terminal height"
-msgstr "Stop from terminal input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:21
-#, fuzzy
 msgid "Prefix output with given name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:22
-#, fuzzy
 msgid "Force output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:23
 msgid "Use cursor positioning escape sequence instead of \\r"
@@ -51159,14 +47910,12 @@ msgid "Use transfer buffer size (in bytes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:26
-#, fuzzy
 msgid "Don't use slice"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:27
-#, fuzzy
 msgid "Ignore read errors"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:28
 msgid "Stop transfer after given number of bytes"
@@ -51189,20 +47938,17 @@ msgid "Report colourised filesystem disk space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:2
-#, fuzzy
 msgid "show this help message"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:3
 #: /tmp/fish/implicit/share/completions/quilt.fish:2
-#, fuzzy
 msgid "show version"
-msgstr "Show each gem version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:4
-#, fuzzy
 msgid "include filesystems having 0 blocks"
-msgstr "Exclude file systems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:5
 msgid "print sizes in human readable format (e.g., 1K 234M 2G)"
@@ -51217,14 +47963,12 @@ msgid "use BLOCKSIZE-byte blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:8
-#, fuzzy
 msgid "limit listing to local filesystems"
-msgstr "List only local filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:9
-#, fuzzy
 msgid "like --block-size=1024"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:10
 msgid "like --block-size=1048576"
@@ -51239,9 +47983,8 @@ msgid "use filesystem native block size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:13
-#, fuzzy
 msgid "do not use colours"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:14
 msgid ""
@@ -51256,53 +47999,44 @@ msgid "show 'mount --bind' mounts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:16
-#, fuzzy
 msgid "show inode instead of block usage"
-msgstr "show some examples of usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:1
-#, fuzzy
 msgid "Set output file"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:2
-#, fuzzy
 msgid "Read one line at a time"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:3
-#, fuzzy
 msgid "Set lexer"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:4
 msgid "Guess lexer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:5
-#, fuzzy
 msgid "Set formater"
-msgstr "Set format file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:6
-#, fuzzy
 msgid "Set coma-seperated options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:7
-#, fuzzy
 msgid "Set one option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:8
-#, fuzzy
 msgid "Set filter"
-msgstr "Set tag file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:9
-#, fuzzy
 msgid "Print style definition for given style"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:10
 msgid "List lexers, formaters, styles or filters"
@@ -51313,18 +48047,16 @@ msgid "Guess and print lexer name based on given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:12
-#, fuzzy
 msgid "Print detailed help"
-msgstr "Print help"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:13
 msgid "Print detailed traceback on unhandled exceptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:15
-#, fuzzy
 msgid "Print package version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:1
 #: /tmp/fish/implicit/share/completions/python3.fish:1
@@ -51401,9 +48133,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:16
 #: /tmp/fish/implicit/share/completions/python3.fish:16
 #: /tmp/fish/implicit/share/completions/python.fish:17
-#, fuzzy
 msgid "Read program from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:18
@@ -51428,15 +48159,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:21
-#, fuzzy
 msgid "Don't print version and copyright messages on interactive startup"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:22
-#, fuzzy
 msgid "Set implementation-specific option"
-msgstr "Edit command specific completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:23
@@ -51447,38 +48176,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:20
 #: /tmp/fish/implicit/share/completions/python.fish:24
-#, fuzzy
 msgid "Issue errors"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:3
-#, fuzzy
 msgid "specify the file to Run Control file to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:4
 msgid "Runs the command in bash trace mode (-x). For internal debugging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:5
-#, fuzzy
 msgid "Add one or more files to the topmost or named patch"
-msgstr "Add one or more new files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:6
-#, fuzzy
 msgid "Print an annotated listing of the specified file"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:7
-#, fuzzy
 msgid "Print a list of applied patches"
-msgstr "Print a list of local users"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:8
-#, fuzzy
 msgid "Remove the specified or topmost patch from the series file"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:9
 msgid ""
@@ -51486,14 +48209,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:10
-#, fuzzy
 msgid "Edit the specified file(s) in /usr/bin/vim"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:11
-#, fuzzy
 msgid "Print the list of files that the topmost or specified patch changes"
-msgstr "Set the list of default preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:12
 msgid ""
@@ -51543,9 +48264,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:21
-#, fuzzy
 msgid "Print the list of patches that modify the specified file"
-msgstr "Set the list of default preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:22
 msgid ""
@@ -51554,36 +48274,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:23
-#, fuzzy
 msgid "Apply patch(es) from the series file"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:24
 msgid "Refreshes the specified patch, or the topmost patch by default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:25
-#, fuzzy
 msgid "Remove one or more files from the topmost or named patch"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:26
 msgid "Rename the topmost or named patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:27
-#, fuzzy
 msgid "Print the names of all patches in the series file"
-msgstr "Prints the license of all gems in the bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:28
 msgid " Initializes a source tree from an rpm spec file or a quilt series file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:29
-#, fuzzy
 msgid " Take a snapshot of the current working state"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:30
 msgid ""
@@ -51603,24 +48319,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:1
-#, fuzzy
 msgid "Activate debug mode"
-msgstr "Sets debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:2
-#, fuzzy
 msgid "Activate clean mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:3
-#, fuzzy
 msgid "Change configuration directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:4
-#, fuzzy
 msgid "Create copies of the default configuration"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:5
 msgid "Pick file with ranger"
@@ -51631,9 +48343,8 @@ msgid "Pick multiple files with ranger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:7
-#, fuzzy
 msgid "Pick directory"
-msgstr "Check directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:8
 msgid "Open ranger with given file selected"
@@ -51652,24 +48363,20 @@ msgid "Print statistics of CPU usage on exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:12
-#, fuzzy
 msgid "Execute command after configuration file read"
-msgstr "Clear list of configuration files to read"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:1
-#, fuzzy
 msgid "List all rbenv commands"
-msgstr "list all “gem” commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:2
-#, fuzzy
 msgid "Set or show the global Ruby version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:3
-#, fuzzy
 msgid "Install a ruby version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:4
 msgid "Set or show the local directory-specific Ruby version"
@@ -51684,27 +48391,24 @@ msgid "Rehash rbenv shims (run this after installing binaries)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:7
-#, fuzzy
 msgid "rbenv root folder"
-msgstr "Open folder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:8
 msgid "Set or show the shell-specific Ruby version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:9
-#, fuzzy
 msgid "Show the current Ruby version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:10
 msgid "List all Ruby versions known by rbenv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:11
-#, fuzzy
 msgid "List all Ruby versions with the given command"
-msgstr "Run fish with this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:12
 msgid "Show the full path for the given Ruby command"
@@ -51715,33 +48419,28 @@ msgid "Tests if the service exists or not"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:2
-#, fuzzy
 msgid "List all available services"
-msgstr "List all available patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:3
-#, fuzzy
 msgid "Display the help output"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:5
-#, fuzzy
 msgid "Display software version"
-msgstr "display the package version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:6
-#, fuzzy
 msgid "Run verbosely"
-msgstr "Do not be verbose"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:7
 msgid "Run quietly (Does not affect errors)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:2
-#, fuzzy
 msgid "Set prompt command"
-msgstr "Select by command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:3
 #: /tmp/fish/implicit/share/completions/set.fish:4
@@ -51786,18 +48485,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:11
-#, fuzzy
 msgid "Read the specified number of characters"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:12
 msgid "Store the results as an array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:13
-#, fuzzy
 msgid "Set right-hand prompt command"
-msgstr "Set or get the commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:1
 msgid "Canonicalize, follow symlinks, last can be missing"
@@ -51816,18 +48513,16 @@ msgid "Do not output the trailing newline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:6
-#, fuzzy
 msgid "Report error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:1
 msgid "all components of the path must exist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:2
-#, fuzzy
 msgid "no components of the path need exist"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:3
 msgid "resolve '..' components before symlinks"
@@ -51838,9 +48533,8 @@ msgid "resolve symlinks as encountered (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:5
-#, fuzzy
 msgid "suppress most error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:6
 msgid "print the resolved path relative to FILE"
@@ -51851,9 +48545,8 @@ msgid "print absolute paths unless paths below FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:8
-#, fuzzy
 msgid "don't expand symlinks"
-msgstr "Don't follow symlinks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:9
 msgid "separate output with NUL rather than newline"
@@ -51896,23 +48589,20 @@ msgid "Remove each component of path"
 msgstr "Remove each component of path"
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
-#, fuzzy
 msgid "Prints the help text."
-msgstr "Prints formatted text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:2
 msgid "Send errors to syslog instead of standard error."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:3
-#, fuzzy
 msgid "Print messages about what the program is doing."
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:4
-#, fuzzy
 msgid "Show version of program and exit"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:5
 msgid ""
@@ -51921,38 +48611,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:2
-#, fuzzy
 msgid "Do not execute logon and logoff macros"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:3
-#, fuzzy
 msgid "Exit after processing commandline macro files"
-msgstr "Run command after processing of initialization files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:4
-#, fuzzy
 msgid "Do not show splashscreen"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:5
-#, fuzzy
 msgid "Exit on exception"
-msgstr "Exit on second EOF"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:7
-#, fuzzy
 msgid "Print ./configure options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:8
 msgid "Run with memory usage monitoring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:5
-#, fuzzy
 msgid "List of rpm configuration files"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:6
 msgid "Pipe output through specified command"
@@ -51963,9 +48647,8 @@ msgid "Specify directory for rpm database"
 msgstr "Specify directory for rpm database"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:8
-#, fuzzy
 msgid "Specify root directory for rpm operations"
-msgstr "Specify directory for rpm database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:9
 msgid "Add suggested packages to the transaction set when needed"
@@ -52359,9 +49042,8 @@ msgid "Erase package"
 msgstr "Erase package"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:2
-#, fuzzy
 msgid "Suppress non-error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:3
 msgid "Skip based on checksum, not mod-time & size"
@@ -52376,9 +49058,8 @@ msgid "Turn off an implied OPTION (e.g. --no-D)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:6
-#, fuzzy
 msgid "Recurse into directories"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:7
 msgid "Use relative path names"
@@ -52405,24 +49086,20 @@ msgid "Skip files that are newer on the receiver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:13
-#, fuzzy
 msgid "Update destination files in-place"
-msgstr "Edit files in-place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:14
-#, fuzzy
 msgid "Append data onto shorter files"
-msgstr "Append new files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:15
-#, fuzzy
 msgid "Transfer directories without recursing"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:16
-#, fuzzy
 msgid "Copy symlinks as symlinks"
-msgstr "Store symbolic links as links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:17
 msgid "Transform symlink into referent file/dir"
@@ -52445,14 +49122,12 @@ msgid "Treat symlinked dir on receiver as dir"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:22
-#, fuzzy
 msgid "Preserve hard links"
-msgstr "Dereference all symlinks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:23
-#, fuzzy
 msgid "Preserve permissions"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:24
 msgid "Preserve executability"
@@ -52467,50 +49142,44 @@ msgid "Preserve extended attrs (implies -p) [n.s.]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:27
-#, fuzzy
 msgid "Change destination permissions"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:28
 msgid "Preserve owner (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:29
-#, fuzzy
 msgid "Preserve group"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:30
 msgid "Preserve device files (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:31
-#, fuzzy
 msgid "Preserve special files"
-msgstr "Preserve file ownership"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:32
 msgid "Same as --devices --specials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:33
-#, fuzzy
 msgid "Preserve times"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:34
-#, fuzzy
 msgid "Omit directories when preserving times"
-msgstr "List directories, not their content"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:35
 msgid "Receiver attempts super-user activities"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:36
-#, fuzzy
 msgid "Handle sparse files efficiently"
-msgstr "Handle sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:37
 msgid "Show what would have been transferred"
@@ -52577,14 +49246,12 @@ msgid "Delete even if there are I/O errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:53
-#, fuzzy
 msgid "Force deletion of dirs even if not empty"
-msgstr "Forces clean even if --path is not set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:54
-#, fuzzy
 msgid "Don’t delete more than NUM files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:55
 msgid "Don’t transfer any file larger than SIZE"
@@ -52607,9 +49274,8 @@ msgid "Put all updated files into place at end"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:60
-#, fuzzy
 msgid "Prune empty directory chains from file-list"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:61
 msgid "Don’t map uid/gid values by user/group name"
@@ -52624,18 +49290,16 @@ msgid "Don’t skip files that match size and time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:64
-#, fuzzy
 msgid "Skip files that match in size"
-msgstr "Skip files matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:65
 msgid "Compare mod-times with reduced accuracy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:66
-#, fuzzy
 msgid "Create temporary files in directory DIR"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:67
 msgid "Find similar file for basis if no dest file"
@@ -52660,9 +49324,8 @@ msgid "Compress file data during the transfer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:72
-#, fuzzy
 msgid "Explicitly set compression level"
-msgstr "Compression level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:73
 msgid "Auto-ignore files in the same way CVS does"
@@ -52679,24 +49342,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:76
-#, fuzzy
 msgid "Exclude files matching PATTERN"
-msgstr "Skip files matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:78
-#, fuzzy
 msgid "Don’t exclude files matching PATTERN"
-msgstr "Search only files matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:79
-#, fuzzy
 msgid "Read include patterns from FILE"
-msgstr "Read a batched update from FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:80
-#, fuzzy
 msgid "Read list of source-file names from FILE"
-msgstr "Read filenames from pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:81
 msgid "All *from/filter files are delimited by 0s"
@@ -52707,19 +49366,16 @@ msgid "Bind address for outgoing socket to daemon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:83
-#, fuzzy
 msgid "Specify double-colon alternate port number"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:84
-#, fuzzy
 msgid "Specify custom TCP options"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:85
-#, fuzzy
 msgid "Use blocking I/O for the remote shell"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:86
 msgid "Give some file-transfer stats"
@@ -52734,9 +49390,8 @@ msgid "Output numbers in a human-readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:89
-#, fuzzy
 msgid "Show progress during transfer"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:90
 msgid "Same as --partial --progress"
@@ -52755,9 +49410,8 @@ msgid "Read password from FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:94
-#, fuzzy
 msgid "List the files instead of copying them"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:95
 msgid "Limit I/O bandwidth; KBytes per second"
@@ -52792,28 +49446,24 @@ msgid "Prefer IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:105
-#, fuzzy
 msgid "Remote path"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:1
-#, fuzzy
 msgid "Definition"
-msgstr "function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:2
-#, fuzzy
 msgid "Do not remove source tree after installation"
-msgstr "Don't run unit tests prior to installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:3
 msgid "Verbose mode: print compilation status to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:4
-#, fuzzy
 msgid "List all built-in definitions"
-msgstr "Disable some built-in functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby.fish:4
 msgid "Kanji code-set"
@@ -52832,14 +49482,12 @@ msgid "Compiler debug mode"
 msgstr "Compiler debug mode"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:1
-#, fuzzy
 msgid "Make bucket"
-msgstr "Mismatched brackets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:2
-#, fuzzy
 msgid "Remove bucket"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:3
 msgid "List objects or buckets"
@@ -52850,28 +49498,24 @@ msgid "List all object in all buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:5
-#, fuzzy
 msgid "Put file into bucket"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:6
-#, fuzzy
 msgid "Get file from bucket"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:7
-#, fuzzy
 msgid "Delete file from bucket"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:8
 msgid "Delete file from bucket (alias for del)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:9
-#, fuzzy
 msgid "Restore file from Glacier storage"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:10
 msgid "Synchronize a directory tree to S3"
@@ -52882,9 +49526,8 @@ msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -52935,14 +49578,12 @@ msgid "List parts of a multipart upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:25
-#, fuzzy
 msgid "Enable/disable bucket access logging"
-msgstr "Enables obsolets processing logic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:26
-#, fuzzy
 msgid "Sign arbitrary string using the secret key"
-msgstr "Sign a public key with your secret key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:27
 msgid "Sign an S3 URL to provide limited public access with expiry"
@@ -52957,9 +49598,8 @@ msgid "Create Website from bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:30
-#, fuzzy
 msgid "Delete Website"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:31
 msgid "Info about Website"
@@ -52974,9 +49614,8 @@ msgid "Upload a lifecycle policy for the bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:34
-#, fuzzy
 msgid "Remove a lifecycle policy for the bucket"
-msgstr "Removes a lock file for a client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:35
 msgid "List CloudFront distribution points"
@@ -52987,9 +49626,8 @@ msgid "Display CloudFront distribution point parameters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:37
-#, fuzzy
 msgid "Create CloudFront distribution point"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:38
 msgid "Delete CloudFront distribution point"
@@ -53004,19 +49642,16 @@ msgid "Display CloudFront invalidation request(s) status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:42
-#, fuzzy
 msgid "Run interactive (re)configuration tool"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
-#, fuzzy
 msgid "AWS Access Key"
-msgstr "Show access time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:46
 msgid "AWS Secret Key"
@@ -53031,39 +49666,32 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "(default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
-#, fuzzy
 msgid "Don't use HTTPS"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:51
-#, fuzzy
 msgid "Encrypt files before uploading"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:52
-#, fuzzy
 msgid "Don't encrypt files"
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:53
-#, fuzzy
 msgid "Force overwrite"
-msgstr "Don't overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:54
-#, fuzzy
 msgid "Resume partially downloaded file"
-msgstr "Continue getting a partially-downloaded file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:55
-#, fuzzy
 msgid "Resume partially uploaded files"
-msgstr "Continue getting a partially-downloaded file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:56
 msgid "Resume multipart upload by UploadId"
@@ -53074,9 +49702,8 @@ msgid "Skip existing files at destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
-#, fuzzy
 msgid "Upload/download/delete recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:59
 msgid "Check MD5 sums (default)"
@@ -53103,9 +49730,8 @@ msgid "Revoke permission to named user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:65
-#, fuzzy
 msgid "Days to keep restored file"
-msgstr "Do not save/restore filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:66
 msgid "S3 glacier restore priority"
@@ -53116,18 +49742,16 @@ msgid "Delete objects not found locally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:68
-#, fuzzy
 msgid "Don't delete dest objects"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:69
 msgid "Delete after upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:70
-#, fuzzy
 msgid "Delete no more than NUM files"
-msgstr "Delete entries in zipfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:71
 msgid "Max objects per response"
@@ -53138,24 +49762,20 @@ msgid "Additional parallel upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:73
-#, fuzzy
 msgid "Delete remotely after fetch"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:74
-#, fuzzy
 msgid "Preserve FS attributes"
-msgstr "Don't preserve the specified attributes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:75
-#, fuzzy
 msgid "Don't store FS attributes"
-msgstr "Don't verify md5 attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:76
-#, fuzzy
 msgid "Exclude GLOB matches"
-msgstr "Exclude file systems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:77
 msgid "--exclude GLOBs from FILE"
@@ -53174,9 +49794,8 @@ msgid "Include GLOB matches even if previously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:81
-#, fuzzy
 msgid "Read --include GLOBs from FILE"
-msgstr "Read a batched update from FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:82
 msgid "Include REGEXP matches even if preiously excluded"
@@ -53187,9 +49806,8 @@ msgid "Read --rinclude REGEXPs from FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:84
-#, fuzzy
 msgid "Read source-file names from FILE"
-msgstr "Read filenames from pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:85
 msgid "Create bucket in region"
@@ -53220,9 +49838,8 @@ msgid "Prefix for access logs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:92
-#, fuzzy
 msgid "Disable access logging"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:93
 msgid "Default MIME-type for objects"
@@ -53237,23 +49854,20 @@ msgid "Don't guess MIME-type, use default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:96
-#, fuzzy
 msgid "Don't use mime magic when guessing"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:97
-#, fuzzy
 msgid "Force MIME-type"
-msgstr "Force yes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:98
 msgid "Add HTTP header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:99
-#, fuzzy
 msgid "Remove HTTP header"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:100
 msgid "Use server-side encryption for upload"
@@ -53264,18 +49878,16 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:104
-#, fuzzy
 msgid "Use S3 name as-is"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:105
 msgid "No multipart on files larger than --multipart-chunk-size-mb"
@@ -53290,19 +49902,16 @@ msgid "Include MD5 sums in bucket listings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:108
-#, fuzzy
 msgid "Print sizes in human-readable form"
-msgstr "Give human-readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:109
-#, fuzzy
 msgid "Name of index-document"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:110
-#, fuzzy
 msgid "Name of error-document"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:111
 msgid "When expiration rule takes effect"
@@ -53325,19 +49934,16 @@ msgid "Don't show progress meter (default if non-TTY)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:116
-#, fuzzy
 msgid "Show file transfer stats"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:117
-#, fuzzy
 msgid "Enable CloudFront distribution"
-msgstr "Debian distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:118
-#, fuzzy
 msgid "Disable CloudFront distribution"
-msgstr "Debian distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:119
 msgid "Invalidate CloudFront file"
@@ -53372,24 +49978,20 @@ msgid "Cache FILE containing MD5 values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:131
-#, fuzzy
 msgid "Silence stdout output"
-msgstr "Video output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:132
-#, fuzzy
 msgid "Path to SSL CA certificate FILE"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:133
-#, fuzzy
 msgid "Validate SSL certificate"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:134
-#, fuzzy
 msgid "Don't validate SSL certificate"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:135
 msgid "Validate SSL hostname"
@@ -53404,23 +50006,20 @@ msgid "Use AWS Signature version 2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:138
-#, fuzzy
 msgid "Limit upload or download speed (bytes/sec)"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:139
 msgid "Set REQUESTER PAYS for operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:140
-#, fuzzy
 msgid "Produce long listing"
-msgstr "Process list pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:141
-#, fuzzy
 msgid "Stop on error in transfer"
-msgstr "Stop showing errors if too many"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:142
 msgid "Provide Content-Disposition for signed URLs"
@@ -53449,23 +50048,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:4
-#, fuzzy
 msgid "Convert all the files in a directory. Requires --from and --to."
-msgstr "Remove files and directories from version control."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:5
 #: /tmp/fish/implicit/share/completions/sass.fish:5
 #: /tmp/fish/implicit/share/completions/scss.fish:5
-#, fuzzy
 msgid "Show help message."
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:6
 #: /tmp/fish/implicit/share/completions/sass.fish:6
 #: /tmp/fish/implicit/share/completions/scss.fish:6
-#, fuzzy
 msgid "Print the Sass version."
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:7
 msgid "Convert underscores to dashes."
@@ -53492,9 +50088,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:11
 #: /tmp/fish/implicit/share/completions/sass.fish:14
 #: /tmp/fish/implicit/share/completions/scss.fish:15
-#, fuzzy
 msgid "Specify the default encoding for input files."
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:12
 #: /tmp/fish/implicit/share/completions/sass.fish:15
@@ -53509,22 +50104,19 @@ msgid "The path to save parsed Sass files. Defaults to .sass-cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:14
-#, fuzzy
 msgid "Don't cache to sassc files."
-msgstr "Do not check files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:15
 #: /tmp/fish/implicit/share/completions/sass.fish:23
 #: /tmp/fish/implicit/share/completions/scss.fish:24
-#, fuzzy
 msgid "Show a full Ruby stack trace on error."
-msgstr "Show stack backtrace on errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:1
 #: /tmp/fish/implicit/share/completions/scss.fish:1
-#, fuzzy
 msgid "Specify a Sass import path."
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:2
 #: /tmp/fish/implicit/share/completions/scss.fish:2
@@ -53599,9 +50191,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:18
 #: /tmp/fish/implicit/share/completions/scss.fish:19
-#, fuzzy
 msgid "Run an interactive SassScript shell."
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:19
 #: /tmp/fish/implicit/share/completions/scss.fish:20
@@ -53617,9 +50208,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:22
 #: /tmp/fish/implicit/share/completions/scss.fish:23
-#, fuzzy
 msgid "Don't cache parsed Sass files."
-msgstr "Delete cached package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:24
 #: /tmp/fish/implicit/share/completions/scss.fish:25
@@ -53627,83 +50217,72 @@ msgid "Silence warnings and status messages during compilation."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:1
-#, fuzzy
 msgid "Create a new sbt project from the given template"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:2
 msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "Print mounted devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
 msgid "Set log level to debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:6
-#, fuzzy
 msgid "Disable ANSI color codes"
-msgstr "Disable operator keywords"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:7
 msgid "Launch even if there's no sbt project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:8
-#, fuzzy
 msgid "Use all local caches"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:9
 msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
-#, fuzzy
 msgid "Specify path to local Ivy repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:16
-#, fuzzy
 msgid "Use specified version of sbt"
-msgstr "Use specified compression algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:17
-#, fuzzy
 msgid "Use specified jar as the sbt launcher"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:18
 msgid "Use an RC version of sbt"
@@ -53775,19 +50354,16 @@ msgid "Gamma-correction table [0..255, …]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:12
-#, fuzzy
 msgid "Scan mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:13
-#, fuzzy
 msgid "Device name to use"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:14
-#, fuzzy
 msgid "List devices"
-msgstr "List needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:15
 msgid "Print formatted device list [%d, %v, %m, %t, %i, %n]"
@@ -53802,9 +50378,8 @@ msgid "The filename of the image to be loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:18
-#, fuzzy
 msgid "Output image format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:19
 msgid "Include this ICC profile into TIFF file"
@@ -53825,14 +50400,12 @@ msgid "How many pages to scan in batch mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:23
-#, fuzzy
 msgid "Increase page number in filename by #"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:24
-#, fuzzy
 msgid "Increment page number by two"
-msgstr "Increment the misc debug level by one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:25
 msgid "Ask for pressing a key before scanning a page"
@@ -53843,33 +50416,28 @@ msgid "Only accept authorization requests using md5"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:27
-#, fuzzy
 msgid "Print progress messages"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:28
-#, fuzzy
 msgid "Only set options, don't actually scan"
-msgstr "Only print out changes, do not actually clean gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:29
 msgid "Test backend thoroughly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:30
-#, fuzzy
 msgid "List all available backend options"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:31
-#, fuzzy
 msgid "Display this help message and exit"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:32
-#, fuzzy
 msgid "Give even more status messages"
-msgstr "Receive new messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:33
 msgid "Change input buffer size (in kB, default 32)"
@@ -53926,9 +50494,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:9
-#, fuzzy
 msgid "Debug the build process"
-msgstr "Child process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:10
 msgid ""
@@ -53938,9 +50505,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:11
-#, fuzzy
 msgid "Use file as the initial SConscript file"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:12
 msgid ""
@@ -53954,37 +50520,32 @@ msgid "Print the standard help message about command-line options and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:14
-#, fuzzy
 msgid "Ignore all errors from commands executed to rebuild files"
-msgstr "Ignore errors from non-empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:15
 msgid "Specifies a directory to search for imported Python modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:16
-#, fuzzy
 msgid "Cache implicit dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:17
 msgid "Force SCons to ignore the cached implicit dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:18
-#, fuzzy
 msgid "Force SCons to ignore changes in the implicit dependencies"
-msgstr "Install source packages and their build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:19
-#, fuzzy
 msgid "Specifies the number of jobs (commands) to run simultaneously"
-msgstr "Specify the number of jobs to run in parallel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:20
-#, fuzzy
 msgid "Continue as much as possible after an error"
-msgstr "Continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:21
 msgid ""
@@ -53998,9 +50559,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:23
-#, fuzzy
 msgid "No execute"
-msgstr "Executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:24
 msgid ""
@@ -54009,9 +50569,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:25
-#, fuzzy
 msgid "Do not run any commands, or print anything"
-msgstr "Do not actually change anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:26
 msgid ""
@@ -54020,14 +50579,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:27
-#, fuzzy
 msgid "Build dependencies in a random order"
-msgstr "List dependencies of module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:28
-#, fuzzy
 msgid "Silent"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:29
 msgid ""
@@ -54048,16 +50605,14 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:33
-#, fuzzy
 msgid ""
 "Print a message containing the working directory before and after other "
 "processing"
-msgstr "Print the current working directory, shortened to fit the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:34
-#, fuzzy
 msgid "Enable or disable warnings"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:35
 msgid "Turn off -w, even if it was turned on implicitly"
@@ -54070,14 +50625,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:1
-#, fuzzy
 msgid "Local Path"
-msgstr "Logical and"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:2
-#, fuzzy
 msgid "Remote Path"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:4
 msgid "Bandwidth limit"
@@ -54094,51 +50647,44 @@ msgid "Recursively copy"
 msgstr "Recursively copy"
 
 #: /tmp/fish/implicit/share/completions/scp.fish:9
-#, fuzzy
 msgid "Encryption program"
-msgstr "Encyption program"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:1
 msgid "Detect which folder screen uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:2
-#, fuzzy
 msgid "Get the socket list on mac"
-msgstr "Get help on this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:3
-#, fuzzy
 msgid "Get the socket list"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:4
-#, fuzzy
 msgid "Print a list of detached screen sessions"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:5
-#, fuzzy
 msgid "Print a list of attached screen sessions"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:6
 msgid "Print a list of running screen sessions"
 msgstr "Print a list of running screen sessions"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:7
-#, fuzzy
 msgid "Include all capabilitys"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:8
 msgid "Adapt window size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:9
-#, fuzzy
 msgid "Specify init file"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:10
 #: /tmp/fish/implicit/share/completions/screen.fish:11
@@ -54163,9 +50709,8 @@ msgid "Escape character"
 msgstr "Escape character"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:16
-#, fuzzy
 msgid "Flow control on"
-msgstr "Follow mount points"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:17
 msgid "Flow control off"
@@ -54184,72 +50729,61 @@ msgid "Interrupt display on C-c"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:21
-#, fuzzy
 msgid "Login on"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:22
-#, fuzzy
 msgid "Login off"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:23
 #: /tmp/fish/implicit/share/completions/screen.fish:24
-#, fuzzy
 msgid "List sessions"
-msgstr "available sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:25
 msgid "Log on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:27
-#, fuzzy
 msgid "Optimal output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:28
-#, fuzzy
 msgid "Preselect window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
-#, fuzzy
 msgid "Set shell"
-msgstr "Set system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:31
-#, fuzzy
 msgid "Session name"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:32
-#, fuzzy
 msgid "Session title"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:33
 msgid "UTF-8 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:35
-#, fuzzy
 msgid "Wipe dead sessions"
-msgstr "available sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:36
 msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
-#, fuzzy
 msgid "Display version information and exit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:3
 msgid "When selecting a window, grab wm border too"
@@ -54260,9 +50794,8 @@ msgid "Display a countdown when used with delay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:5
-#, fuzzy
 msgid "Wait NUMBER of seconds before taking a shot"
-msgstr "Number of seconds before assuming http timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:6
 msgid "Execute APPLICATION on the saved image"
@@ -54273,14 +50806,12 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "Perform a set of commands multiple times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
-#, fuzzy
 msgid "Select a window or rectangle with the mouse"
-msgstr "Select a window by clicking on its frame"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:10
 msgid "Generate thumbnail PERCENT of original"
@@ -54307,9 +50838,8 @@ msgid "How to link generated output to the source files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/service.fish:1
-#, fuzzy
 msgid "Service name"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:1
 msgid "Color"
@@ -54334,18 +50864,16 @@ msgid "Dim text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:6
-#, fuzzy
 msgid "Reverse color text"
-msgstr "Reverse sort order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:7
 msgid "Underline text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:9
-#, fuzzy
 msgid "Print a list of all accepted color names"
-msgstr "Print a list of local users"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setfacl.fish:1
 msgid "Remove all extended ACL entries"
@@ -54376,9 +50904,8 @@ msgid "Test if We are specifying a locale value for the prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:3
-#, fuzzy
 msgid "Erase variable"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:8
 msgid "Share variable persistently across sessions"
@@ -54393,14 +50920,12 @@ msgid "List the names of the variables, but not their value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:14
-#, fuzzy
 msgid "Locale variable"
-msgstr "Redefine variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:15
-#, fuzzy
 msgid "Do not truncate long lines"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setsid.fish:2
 msgid "Set controlling terminal to current one"
@@ -54411,33 +50936,28 @@ msgid "Wait until program ends and return its exit value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:1
-#, fuzzy
 msgid "Print this message"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:2
 msgid "Specifies compatibility map component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:3
-#, fuzzy
 msgid "Specifies configuration file to use"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:4
-#, fuzzy
 msgid "Specifies the device ID to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:5
-#, fuzzy
 msgid "Specifies display to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:6
-#, fuzzy
 msgid "Specifies geometry component name"
-msgstr "Ignore specified number of directory components"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:7
 msgid "Add <dir> to list of directories to be used"
@@ -54448,9 +50968,8 @@ msgid "Specifies keycodes component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:9
-#, fuzzy
 msgid "Specifies name of keymap to load"
-msgstr "Specify version of gem to rdoc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:10
 msgid "Specifies layout used to choose component names"
@@ -54469,14 +50988,12 @@ msgid "Print a complete xkb_keymap description and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:14
-#, fuzzy
 msgid "Print the current layout settings and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:15
-#, fuzzy
 msgid "Name of rules file to use"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:16
 msgid "Specifies symbols component name"
@@ -54487,9 +51004,8 @@ msgid "Synchronize request w/X server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:18
-#, fuzzy
 msgid "Specifies types component name"
-msgstr "Specify the proxy username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:19
 msgid "Sets verbosity (1..10).  Higher values yield more messages"
@@ -54504,55 +51020,45 @@ msgid "Verify a signed checksum list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
-#, fuzzy
 msgid "Verify a signed message and sig"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:1
-#, fuzzy
 msgid "Test if snap has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:3
-#, fuzzy
 msgid "Test if snap command should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:4
-#, fuzzy
 msgid "Test if snap command should have files as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:5
 #: /tmp/fish/implicit/share/completions/snap.fish:6
-#, fuzzy
 msgid "List disabled snaps"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:7
-#, fuzzy
 msgid "List installed snaps"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "Stop interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
-#, fuzzy
 msgid "List change IDs"
-msgstr "No changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
 msgid "Check that no assertion type is used yet"
@@ -54563,14 +51069,12 @@ msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
-#, fuzzy
 msgid "Show this help message"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:16
 msgid "Snap"
@@ -54625,9 +51129,8 @@ msgid "Define key"
 msgstr "Define key"
 
 #: /tmp/fish/implicit/share/completions/sort.fish:14
-#, fuzzy
 msgid "Merge sorted files"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:16
 msgid "Stabilize sort"
@@ -54690,9 +51193,8 @@ msgid "MAC algorithm"
 msgstr "MAC algorithm"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:12
-#, fuzzy
 msgid "Prevent reading from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:13
 msgid "Do not execute remote command"
@@ -54703,9 +51205,8 @@ msgid "Subsystem"
 msgstr "Subsystem"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:17
-#, fuzzy
 msgid "Force pseudo-tty allocation"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:18
 msgid "Disable pseudo-tty allocation"
@@ -54748,14 +51249,12 @@ msgid "Disable multi-threaded operation"
 msgstr "Disable multi-threaded operation"
 
 #: /tmp/fish/implicit/share/completions/stack.fish:1
-#, fuzzy
 msgid "Show this help text"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:2
-#, fuzzy
 msgid "Show only version number"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:3
 msgid "Run 'stack --docker-help' for details"
@@ -54814,9 +51313,8 @@ msgid "Specialized GHC variant, e.g. integersimple (implies --no-system-ghc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:15
-#, fuzzy
 msgid "Number of concurrent jobs to run"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:16
 msgid "Extra directories to check for C header files"
@@ -54859,9 +51357,8 @@ msgid "Override resolver in project file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:26
-#, fuzzy
 msgid "Use the specified compiler"
-msgstr "Use specific conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:27
 msgid ""
@@ -54886,19 +51383,16 @@ msgid "Build the package(s) in this directory/configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:31
-#, fuzzy
 msgid "Shortcut for 'build --copy-bins'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:32
-#, fuzzy
 msgid "Shortcut for 'build --test'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:33
-#, fuzzy
 msgid "Shortcut for 'build --bench'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:34
 msgid "Shortcut for 'build --haddock'"
@@ -54927,42 +51421,36 @@ msgid "Get the appropriate GHC for your project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:40
-#, fuzzy
 msgid "Print out handy path information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:41
-#, fuzzy
 msgid "Unpack one or more packages locally"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:42
-#, fuzzy
 msgid "Update the package index"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:43
 msgid "Upgrade to the latest stack (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:44
-#, fuzzy
 msgid "Upload a package to Hackage"
-msgstr "Add a package lock"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:45
-#, fuzzy
 msgid "Create source distribution tarballs"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:46
 msgid "Visualize your project's dependency graph using Graphviz dot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:47
-#, fuzzy
 msgid "Execute a command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:48
 msgid "Run ghc"
@@ -54990,23 +51478,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:54
-#, fuzzy
 msgid "Clean the local packages"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:55
-#, fuzzy
 msgid "List the dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:56
 msgid "Query general build information (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:57
-#, fuzzy
 msgid "IDE-specific commands"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:58
 msgid "Subcommands specific to Docker use"
@@ -55045,9 +51530,8 @@ msgid "Test if a code block is currently evaluated"
 msgstr "Test if a code block is currently evaluated"
 
 #: /tmp/fish/implicit/share/completions/status.fish:6
-#, fuzzy
 msgid "Test if a breakpoint is currently in effect"
-msgstr "Test if a code block is currently evaluated"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:7
 msgid "Test if new jobs are never put under job control"
@@ -55062,14 +51546,12 @@ msgid "Test if all new jobs are put under job control"
 msgstr "Test if all new jobs are put under job control"
 
 #: /tmp/fish/implicit/share/completions/status.fish:10
-#, fuzzy
 msgid "Print the filename of the currently running script"
-msgstr "Print currently running jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:11
-#, fuzzy
 msgid "Print the line number of the currently running script"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:12
 msgid ""
@@ -55078,43 +51560,36 @@ msgstr ""
 "Print a list of all function calls leading up to running the current command"
 
 #: /tmp/fish/implicit/share/completions/status.fish:13
-#, fuzzy
 msgid "Set which jobs are under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:14
-#, fuzzy
 msgid "Set all jobs under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:15
-#, fuzzy
 msgid "Set only interactive jobs under job control"
-msgstr "Test if only interactive new jobs are put under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:16
-#, fuzzy
 msgid "Set no jobs under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:13
-#, fuzzy
 msgid "Components one or more pixel components"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:23
 msgid "Pixel storage type [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:1
-#, fuzzy
 msgid "Do not print output"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:2
-#, fuzzy
 msgid "Specify maximum number of splits"
-msgstr "Maximum number of log entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:3
 msgid "Split right-to-left"
@@ -55125,28 +51600,24 @@ msgid "Trim only leading characters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:5
-#, fuzzy
 msgid "Trim only trailing characters"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:6
 msgid "Specify the chars to trim (default: whitespace)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:7
-#, fuzzy
 msgid "Escape with \\ instead of quoting"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:8
-#, fuzzy
 msgid "Report index and length of the matches"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:9
-#, fuzzy
 msgid "Report only non-matching input"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:10
 msgid "Report all matches per line/string"
@@ -55165,42 +51636,36 @@ msgid "Repetition count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:14
-#, fuzzy
 msgid "Maximum number of printed char"
-msgstr "Maximum number of nested blocks reached."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:15
-#, fuzzy
 msgid "Remove newline"
-msgstr "No newline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "Run fish with this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
 msgid "Open a new window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:4
-#, fuzzy
 msgid "Add folders to the current window"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:5
 msgid "Wait for the files to be closed before returning"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:6
-#, fuzzy
 msgid "Don't activate the application"
-msgstr "Don't actually take the action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:7
 msgid "Keep the application activated after closing the file"
@@ -55217,44 +51682,36 @@ msgid "Preserve environment"
 msgstr "Preserve environment"
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:4
-#, fuzzy
 msgid "Set home"
-msgstr "Set time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:5
-#, fuzzy
 msgid "Remove the credential timestamp entirely"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:6
-#, fuzzy
 msgid "Preserve group vector"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:7
-#, fuzzy
 msgid "Read password from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:8
-#, fuzzy
 msgid "Run command in the background"
-msgstr "Run job in background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:9
-#, fuzzy
 msgid "Edit"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:10
-#, fuzzy
 msgid "Run command as group"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:12
-#, fuzzy
 msgid "Run a login shell"
-msgstr "Make login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:13
 msgid "Reset or ignore the credential timestamp"
@@ -55267,23 +51724,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:15
-#, fuzzy
 msgid "Do not prompt for a password - if one is needed, fail"
-msgstr "Do not prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:16
-#, fuzzy
 msgid "Specify a custom password prompt"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:17
 msgid "Run the given command in a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:18
-#, fuzzy
 msgid "Run command as user"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:19
 msgid "Validate the credentials, extending timeout"
@@ -55302,9 +51756,8 @@ msgid "Pass -f to the shell"
 msgstr "Pass -f to the shell"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:1
-#, fuzzy
 msgid "Make a completion for a subcommand"
-msgstr "Fallback implementation of the seq command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:2
 msgid ""
@@ -55433,9 +51886,8 @@ msgid "Remove conflicts on working copy files or directories."
 msgstr "Remove conflicts on working copy files or directories."
 
 #: /tmp/fish/implicit/share/completions/svn.fish:31
-#, fuzzy
 msgid "Remove 'conflicted' state on working copy files or directories."
-msgstr "Remove conflicted state on working copy files or directories."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:32
 msgid "Restore pristine working copy file (undo most local edits)."
@@ -55462,14 +51914,12 @@ msgid "Upgrade the metadata storage format for a working copy."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:38
-#, fuzzy
 msgid "Specify a username ARG"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:39
-#, fuzzy
 msgid "Specify a password ARG"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:40
 msgid "Do not cache authentication tokens"
@@ -55486,9 +51936,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:43
-#, fuzzy
 msgid "Read user configuration files from directory ARG"
-msgstr "Read user config files from named directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:44
 msgid ""
@@ -55610,23 +52059,20 @@ msgid "Total size of data to transfer (default: 100G)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:20
-#, fuzzy
 msgid "Type of memory operations"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:21
-#, fuzzy
 msgid "Number of files to create (default: 128)"
-msgstr "Make checked-out files read-write (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:22
 msgid "Block size to use in all I/O operations (default: 16K)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:23
-#, fuzzy
 msgid "Total size of files (default: 2G)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:24
 msgid "Type of workload to produce"
@@ -55689,11 +52135,8 @@ msgid "Number of point select queries in a single transaction (default: 10)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:38
-#, fuzzy
 msgid "Number of simple range queries in a single transaction (default: 1)"
 msgstr ""
-"Number of completely trusted users to introduce a new key signer (defaults "
-"to 1)"
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:39
 msgid "Number of SUM range queries in a single transaction (default: 1)"
@@ -55784,9 +52227,8 @@ msgid "MySQL database name (default: sbtest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:60
-#, fuzzy
 msgid "Type of the test table to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:61
 msgid "Use SSL connections. (default: no)"
@@ -55803,33 +52245,28 @@ msgid "Additional options passed to CREATE TABLE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:1
-#, fuzzy
 msgid "Start one or more units"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:2
-#, fuzzy
 msgid "Stop one or more units"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:3
-#, fuzzy
 msgid "Restart one or more units"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:4
 msgid "Runtime status about one or more units"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:5
-#, fuzzy
 msgid "Enable one or more units"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:6
-#, fuzzy
 msgid "Disable one or more units"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:7
 msgid "Start a unit and dependencies and disable all others"
@@ -55840,49 +52277,40 @@ msgid "Set the default target to boot into"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:9
-#, fuzzy
 msgid "List of unit types"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:10
-#, fuzzy
 msgid "List of unit states"
-msgstr "List config files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:11
-#, fuzzy
 msgid "Show all units or properties"
-msgstr "Show all options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:12
-#, fuzzy
 msgid "Show also units of local containers"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:13
-#, fuzzy
 msgid "Show reverse dependencies between units"
-msgstr "Include reverse dependencies in the output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:14
-#, fuzzy
 msgid "Show units ordered before specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:15
-#, fuzzy
 msgid "Show units ordered after specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:16
-#, fuzzy
 msgid "Do not ellipsize anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:17
-#, fuzzy
 msgid "Show the type of the socket"
-msgstr "Show help for the fish shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:18
 msgid "How to deal with queued jobs"
@@ -55893,9 +52321,8 @@ msgid "Ignore inhibitor locks on shutdown or sleep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:20
-#, fuzzy
 msgid "Suppress output to STDOUT"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:21
 msgid "Do not wait for the requested operation to finish"
@@ -55920,14 +52347,12 @@ msgid "Do not send wall message before halt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:27
-#, fuzzy
 msgid "Do not reload daemon configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:28
-#, fuzzy
 msgid "Disable asking for password"
-msgstr "Disable operator keywords"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:29
 msgid "Send signal to which process"
@@ -55938,9 +52363,8 @@ msgid "Which signal to send"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:31
-#, fuzzy
 msgid "Overwrite conflicting existing symlinks"
-msgstr "Overwrite existing binstubs if they exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:32
 msgid "Use alternative root path"
@@ -55951,18 +52375,16 @@ msgid "Make changes only temporarily"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:34
-#, fuzzy
 msgid "Number of journal lines to show"
-msgstr "Number nonblank lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:35
 msgid "Control journal formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:36
-#, fuzzy
 msgid "list-dependencies flat, not as tree"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:42
 msgid "Reboot to EFI setup"
@@ -55993,28 +52415,24 @@ msgid "Disk image to mount the root directory for the container from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:5
-#, fuzzy
 msgid "Invoke init in the container"
-msgstr "Show the exited containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:6
-#, fuzzy
 msgid "Change to user in the container"
-msgstr "Show the exited containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:7
 msgid "Sets the machine name for this container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:8
-#, fuzzy
 msgid "Set the specified UUID for the container."
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:9
-#, fuzzy
 msgid "Make the container part of the specified slice"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:10
 msgid "Set a unit property on the scope unit"
@@ -56045,19 +52463,16 @@ msgid "Create a virtual Ethernet link (\"veth\") between host and container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:17
-#, fuzzy
 msgid "Adds the host side of the Ethernet link created to the specified bridge"
-msgstr "Set the list of default preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:18
-#, fuzzy
 msgid "Map an ip port from the host to the container"
-msgstr "Copy and apply patches from another repository to this one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:19
-#, fuzzy
 msgid "Sets the SELinux security context"
-msgstr "Display security context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:20
 msgid "Sets the SELinux security context for files in the API filesystems"
@@ -56088,28 +52503,24 @@ msgid "Mount the root file system read-only for the container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:27
-#, fuzzy
 msgid "Bind mount a file or directory from the host in the container"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:28
-#, fuzzy
 msgid "Mount a tmpfs file system into the container"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:29
-#, fuzzy
 msgid "Mount directories as overlayfs in the container"
-msgstr "List directories, not their content"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:30
 msgid "Pass environment variables to init in the container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:31
-#, fuzzy
 msgid "Share the system with the host [See Man Page]"
-msgstr "Show or set the system's host name\r"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:32
 msgid "Register container with systemd-machined"
@@ -56350,9 +52761,8 @@ msgstr "Remove files after adding to archive"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
-#, fuzzy
 msgid "Do not sort file arguments"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:46
 msgid "Preserve file ownership"
@@ -56384,9 +52794,8 @@ msgid "Ask for confirmation"
 msgstr "Ask for confirmation"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:56
-#, fuzzy
 msgid "Verify archive"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:57
 msgid "Exclude file"
@@ -56411,9 +52820,8 @@ msgid "Filter through specified program"
 msgstr "Filter through specified program"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:64
-#, fuzzy
 msgid "Filter through xz"
-msgstr "Filter through gzip"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tee.fish:1
 msgid "append to the given FILEs, do not overwrite"
@@ -56424,9 +52832,8 @@ msgid "ignore interrupt signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:1
-#, fuzzy
 msgid "Display help message"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:3
 msgid "Tell termite start <cmd> instead of the shell"
@@ -56437,9 +52844,8 @@ msgid "The role to set the termite window to report itself with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:5
-#, fuzzy
 msgid "Set the termite window's title"
-msgstr "Set the terminal color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:6
 msgid "Tell termite to change to <dir> when launching"
@@ -56458,9 +52864,8 @@ msgid "Launch on <disp> X display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:10
-#, fuzzy
 msgid "Config file to use"
-msgstr "Change to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:11
 msgid "Set the windows name part of WM_CLASS property"
@@ -56480,9 +52885,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:101
 #: /tmp/fish/implicit/share/completions/terraform.fish:116
 #: /tmp/fish/implicit/share/completions/terraform.fish:125
-#, fuzzy
 msgid "Path to backup the existing state file"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:5
 #: /tmp/fish/implicit/share/completions/terraform.fish:23
@@ -56503,9 +52907,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:104
 #: /tmp/fish/implicit/share/completions/terraform.fish:118
 #: /tmp/fish/implicit/share/completions/terraform.fish:127
-#, fuzzy
 msgid "Duration to retry a state lock"
-msgstr "Print directory stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:7
 #: /tmp/fish/implicit/share/completions/terraform.fish:52
@@ -56534,16 +52937,14 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:9
 #: /tmp/fish/implicit/share/completions/terraform.fish:26
 #: /tmp/fish/implicit/share/completions/terraform.fish:84
-#, fuzzy
 msgid "Limit the number of concurrent operations"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:10
 #: /tmp/fish/implicit/share/completions/terraform.fish:27
 #: /tmp/fish/implicit/share/completions/terraform.fish:85
-#, fuzzy
 msgid "Update state prior to checking for differences"
-msgstr "Update the working copy to a different URL."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:11
 #: /tmp/fish/implicit/share/completions/terraform.fish:17
@@ -56562,17 +52963,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:107
 #: /tmp/fish/implicit/share/completions/terraform.fish:122
 #: /tmp/fish/implicit/share/completions/terraform.fish:131
-#, fuzzy
 msgid "Path to write state"
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:13
 #: /tmp/fish/implicit/share/completions/terraform.fish:30
 #: /tmp/fish/implicit/share/completions/terraform.fish:87
 #: /tmp/fish/implicit/share/completions/terraform.fish:108
-#, fuzzy
 msgid "Resource to target"
-msgstr "Resource name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:14
 #: /tmp/fish/implicit/share/completions/terraform.fish:18
@@ -56581,9 +52980,8 @@ msgstr "Resource name"
 #: /tmp/fish/implicit/share/completions/terraform.fish:88
 #: /tmp/fish/implicit/share/completions/terraform.fish:96
 #: /tmp/fish/implicit/share/completions/terraform.fish:109
-#, fuzzy
 msgid "Set a variable in the Terraform configuration"
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:15
 #: /tmp/fish/implicit/share/completions/terraform.fish:19
@@ -56592,9 +52990,8 @@ msgstr "save the current configuration"
 #: /tmp/fish/implicit/share/completions/terraform.fish:89
 #: /tmp/fish/implicit/share/completions/terraform.fish:97
 #: /tmp/fish/implicit/share/completions/terraform.fish:110
-#, fuzzy
 msgid "Set variables from a file"
-msgstr "Set format file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:16
 msgid "Interactive console for Terraform interpolations"
@@ -56605,67 +53002,56 @@ msgid "Destroy Terraform-managed infrastructure"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:22
-#, fuzzy
 msgid "Don't ask for input for destroy confirmation"
-msgstr "Don't print group information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:33
-#, fuzzy
 msgid "Environment management"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:34
-#, fuzzy
 msgid "List environments"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:35
-#, fuzzy
 msgid "Select an environment"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:36
-#, fuzzy
 msgid "Create a new environment"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:37
-#, fuzzy
 msgid "Delete an existing environment"
-msgstr "Assert freestanding environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:38
 msgid "Rewrite config files to canonical format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:39
-#, fuzzy
 msgid "List files whose formatting differs"
-msgstr "Specifies line formatting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:40
-#, fuzzy
 msgid "Write result to source file"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:41
-#, fuzzy
 msgid "Display diffs of formatting changes"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:42
 msgid "Download and install modules for the configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:43
-#, fuzzy
 msgid "Check modules for updates"
-msgstr "Check for patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:45
-#, fuzzy
 msgid "Create a visual graph of Terraform resources"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:46
 msgid "Highlight any cycles in the graph"
@@ -56680,9 +53066,8 @@ msgid "Import existing infrastructure into Terraform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:51
-#, fuzzy
 msgid "Path to a directory of configuration files"
-msgstr "Specify directory with configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:56
 msgid "Specific provider to use for import"
@@ -56697,14 +53082,12 @@ msgid "Configure the backend for this environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:63
-#, fuzzy
 msgid "Backend configuration"
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:64
-#, fuzzy
 msgid "Download modules for this configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:65
 msgid "Ask for input if necessary"
@@ -56715,32 +53098,28 @@ msgid "Suppress prompts about copying state data"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:70
-#, fuzzy
 msgid "Read an output from a state file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:71
 msgid "Path to the state file to read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:73
-#, fuzzy
 msgid "Return the outputs for a specific module"
-msgstr "Write output to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:74
-#, fuzzy
 msgid "Print output in JSON format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:75
 msgid "Generate and show an execution plan"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:76
-#, fuzzy
 msgid "Generate a plan to destroy all resources"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:77
 msgid "Return detailed exit codes"
@@ -56752,9 +53131,8 @@ msgid "Depth of modules to show in the output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:83
-#, fuzzy
 msgid "Write a plan file to the given path"
-msgstr "Prepend file to input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:90
 msgid "Upload this Terraform module to Atlas to run"
@@ -56769,9 +53147,8 @@ msgid "Lock modules and upload completely"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:93
-#, fuzzy
 msgid "Name of the configuration in Atlas"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:94
 msgid "Access token to use to upload"
@@ -56816,24 +53193,20 @@ msgid "Validate the Terraform files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:134
-#, fuzzy
 msgid "Print the Terraform version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:2
-#, fuzzy
 msgid "Negate expression"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:3
-#, fuzzy
 msgid "Logical AND"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:4
-#, fuzzy
 msgid "Logical OR"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:5
 msgid "String length is non-zero"
@@ -56900,24 +53273,20 @@ msgid "File is set-group-ID"
 msgstr "File is set-group-ID"
 
 #: /tmp/fish/implicit/share/completions/test.fish:21
-#, fuzzy
 msgid "File owned by our effective group ID"
-msgstr "File owned by effective group ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:22
-#, fuzzy
 msgid "File is a symlink"
-msgstr "File is symlink"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:23
-#, fuzzy
 msgid "File owned by our effective user ID"
-msgstr "File owned by effective user ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:24
-#, fuzzy
 msgid "File is a named pipe"
-msgstr "File is named pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:25
 msgid "File is readable"
@@ -56928,14 +53297,12 @@ msgid "File size is non-zero"
 msgstr "File size is non-zero"
 
 #: /tmp/fish/implicit/share/completions/test.fish:27
-#, fuzzy
 msgid "File is a socket"
-msgstr "File is socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:28
-#, fuzzy
 msgid "FD is a terminal"
-msgstr "FD is terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:29
 msgid "File set-user-ID bit is set"
@@ -56961,9 +53328,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tex.fish:7
 #: /tmp/fish/implicit/share/completions/tex.fish:8
 #: /tmp/fish/implicit/share/completions/tex.fish:9
-#, fuzzy
 msgid "Set interaction mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:11
 msgid "Enable \\write18{SHELL COMMAND}"
@@ -56974,9 +53340,8 @@ msgid "Disable \\write18{SHELL COMMAND}"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:13
-#, fuzzy
 msgid "Insert source specials into the DVI file"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:1
 msgid "Maintain RTC in local time"
@@ -57019,9 +53384,8 @@ msgid "Send a KILL signal after DURATION"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timeout.fish:3
-#, fuzzy
 msgid "Specify the signal to be sent"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:1
 msgid "Add an exclusion not to back up a file"
@@ -57034,9 +53398,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:3
 #: /tmp/fish/implicit/share/completions/tmutil.fish:37
-#, fuzzy
 msgid "Path exclusion"
-msgstr "PKZIP recursion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:4
 msgid "Bind a snapshot volume directory to the specified local disk"
@@ -57051,91 +53414,76 @@ msgid "Perform a backup diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:7
-#, fuzzy
 msgid "Compare all supported metadata"
-msgstr "Compress all data"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:8
 msgid "No metadata comparison"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:9
-#, fuzzy
 msgid "Compare extended attributes"
-msgstr "Compares two generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:10
-#, fuzzy
 msgid "Compare creation times"
-msgstr "Compare month names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:11
-#, fuzzy
 msgid "Compare file data forks"
-msgstr "Profile data format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:12
-#, fuzzy
 msgid "Compare ACLs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:13
-#, fuzzy
 msgid "Compare file flags"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:14
-#, fuzzy
 msgid "Compare GIDs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:15
-#, fuzzy
 msgid "Compare file modes"
-msgstr "Completly silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:16
-#, fuzzy
 msgid "Compare sizes"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:17
-#, fuzzy
 msgid "Compare modification times"
-msgstr "Change modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:18
-#, fuzzy
 msgid "Compare UIDs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:19
 msgid "Limit traversal depth to depth levels from the beginning of iteration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:20
-#, fuzzy
 msgid "Dont take exclusions into account"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:21
-#, fuzzy
 msgid "Ignore path"
-msgstr "Ignore case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:22
 msgid "Ignore logical volume identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:23
-#, fuzzy
 msgid "Delete one or more snapshots"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:24
-#, fuzzy
 msgid "Print information about destinations"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:25
 msgid "Turn off automatic backups"
@@ -57163,43 +53511,36 @@ msgid "Determine if a file, directory, or volume are excluded from backups"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:31
-#, fuzzy
 msgid "Print the path to the latest snapshot"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:32
-#, fuzzy
 msgid "Print paths for all snapshots"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
-#, fuzzy
 msgid "Removes a backup destination"
-msgstr "Removes backup generations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:35
-#, fuzzy
 msgid "Remove an exclusion"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:38
 msgid "Restore an item"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:39
-#, fuzzy
 msgid "Set a backup destination"
-msgstr "Lists every backup generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:40
-#, fuzzy
 msgid "Add to the list of destinations"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:41
 msgid "Enter the password at a non-echoing interactive prompt"
@@ -57214,23 +53555,20 @@ msgid "Begin a backup if one is not already running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:44
-#, fuzzy
 msgid "Automatic mode"
-msgstr "Cumulative mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:45
 msgid "Block until finished"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:46
-#, fuzzy
 msgid "Automatic rotation"
-msgstr "Attempt automatic login"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:47
-#, fuzzy
 msgid "Backup destination"
-msgstr "Back up the original version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:48
 msgid "Cancel a backup currently in progress"
@@ -57245,9 +53583,8 @@ msgid "Verify snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:52
-#, fuzzy
 msgid "Print as XML"
-msgstr "Print database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:1
 msgid "available sessions"
@@ -57270,62 +53607,52 @@ msgid "Like -2, but indicates that the terminal supports 88 colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:6
-#, fuzzy
 msgid "Behave as a login shell"
-msgstr "This is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:7
-#, fuzzy
 msgid "Set the quiet server option"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:8
 msgid "Flag explicitly informs tmux that UTF-8 is supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:9
-#, fuzzy
 msgid "Request verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:10
-#, fuzzy
 msgid "Report the tmux version"
-msgstr "Sort by version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:11
-#, fuzzy
 msgid "Execute command using the default shell"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:13
-#, fuzzy
 msgid "Specify the name of the server socket to use"
-msgstr "Specify the remote shell to use"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:14
 msgid "Full path to server socket. If set, -L is ignored."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:15
-#, fuzzy
 msgid "attach to existing session"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:16
-#, fuzzy
 msgid "detach other clients"
-msgstr "List or remove functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:17
-#, fuzzy
 msgid "attach in read-only mode"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:18
-#, fuzzy
 msgid "detach current client"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:19
 msgid "SIGHUP parent process of client, likely causing it to exit"
@@ -57346,29 +53673,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:23
-#, fuzzy
 msgid "list all attached clients"
-msgstr "Delete all cache contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:24
-#, fuzzy
 msgid "list syntax for all tmux commands"
-msgstr "list all “gem” commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:25
-#, fuzzy
 msgid "list all sessions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:26
-#, fuzzy
 msgid "lock client"
-msgstr "Block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:27
-#, fuzzy
 msgid "lock session"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:28
 msgid "create a new session with name session-name"
@@ -57379,47 +53701,40 @@ msgid "don't attach to current window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:30
-#, fuzzy
 msgid "window-name"
-msgstr "window panes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:31
-#, fuzzy
 msgid "session-name"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:32
-#, fuzzy
 msgid "width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:33
 msgid "height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:34
-#, fuzzy
 msgid "refresh client"
-msgstr "Name of client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:35
-#, fuzzy
 msgid "update client status bar"
-msgstr "Negate exit status of job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:36
-#, fuzzy
 msgid "rename session"
-msgstr "Rename stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:37
 msgid "save msgs in status bar in per-client msg log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:38
-#, fuzzy
 msgid "execute commands from path"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:39
 msgid "start tmux server if not running; do not create a session"
@@ -57434,51 +53749,43 @@ msgid "Switch the current session for client target-client to target-session"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:42
-#, fuzzy
 msgid "move client to the last session"
-msgstr "Removes a client from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:43
-#, fuzzy
 msgid "move client to the next session"
-msgstr "Removes a client from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:44
-#, fuzzy
 msgid "move client to the previous session"
-msgstr "Removes a client from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:45
-#, fuzzy
 msgid "toggle if client is read-only"
-msgstr "Open folder read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:46
 #: /tmp/fish/implicit/share/completions/tmux.fish:47
 #: /tmp/fish/implicit/share/completions/tmux.fish:73
 #: /tmp/fish/implicit/share/completions/tmux.fish:76
-#, fuzzy
 msgid "target-session"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:48
 #: /tmp/fish/implicit/share/completions/tmux.fish:49
 #: /tmp/fish/implicit/share/completions/tmux.fish:80
 #: /tmp/fish/implicit/share/completions/tmux.fish:84
-#, fuzzy
 msgid "target-client"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:50
-#, fuzzy
 msgid "format string"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:51
 #: /tmp/fish/implicit/share/completions/tmux.fish:74
-#, fuzzy
 msgid "bind key to command"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:52
 msgid "bind for command mode instead of normal mode"
@@ -57489,9 +53796,8 @@ msgid "make the binding work without using a prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:54
-#, fuzzy
 msgid "key may repeat"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:55
 msgid "choose key table for binding"
@@ -57499,15 +53805,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:56
 #: /tmp/fish/implicit/share/completions/tmux.fish:58
-#, fuzzy
 msgid "list all key bindings"
-msgstr "Handle fish key bindings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:57
 #: /tmp/fish/implicit/share/completions/tmux.fish:68
-#, fuzzy
 msgid "key table"
-msgstr "Executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:59
 msgid "reset terminal state"
@@ -57515,85 +53819,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:60
 #: /tmp/fish/implicit/share/completions/tmux.fish:63
-#, fuzzy
 msgid "target pane"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:61
 msgid "send the prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:62
-#, fuzzy
 msgid "use secondary prefix"
-msgstr "Set directory prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:64
 msgid "unbind the command bound to key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:65
-#, fuzzy
 msgid "remove all key bindings"
-msgstr "Unable to parse key binding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:66
-#, fuzzy
 msgid "binding for command mode"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:67
 msgid "command bound to key without a prefix (if any) removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:69
-#, fuzzy
 msgid "Set or unset an environment variable"
-msgstr "Help on environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:70
 #: /tmp/fish/implicit/share/completions/tmux.fish:75
-#, fuzzy
 msgid "global environment"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:71
 msgid "remove from environment before starting a new process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:72
-#, fuzzy
 msgid "unset variable"
-msgstr "set/list variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:77
 msgid "Open the command prompt in a client"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:78
-#, fuzzy
 msgid "Comma-separated list of initial text for each prompt"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:79
-#, fuzzy
 msgid "Comma-separated list of prompts"
-msgstr "Comma separated format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:81
-#, fuzzy
 msgid "Display a message"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:82
-#, fuzzy
 msgid "print to stdout"
-msgstr "Print file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:83
-#, fuzzy
 msgid "target-pane"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:2
 msgid "Toggle command line/program name"
@@ -57604,9 +53896,8 @@ msgid "Toggle idle processes"
 msgstr "Toggle idle processes"
 
 #: /tmp/fish/implicit/share/completions/top.fish:6
-#, fuzzy
 msgid "Maximum iterations"
-msgstr "Maximium iterations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:7
 msgid "Monitor effective UID"
@@ -57637,9 +53928,8 @@ msgid "Output  a longer help message then quit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:3
-#, fuzzy
 msgid "Output version information then quit"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:4
 msgid "Tell any running totem instance: Toggle between play and pause"
@@ -57698,33 +53988,28 @@ msgid "Add torrents to transmission"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:2
-#, fuzzy
 msgid "Enable debugging mode"
-msgstr "Debugging mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:3
 msgid "Use the alternate Limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:4
-#, fuzzy
 msgid "Don't use the alternate Limits"
-msgstr "Don't run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:5
-#, fuzzy
 msgid "Limit the alternate download speed"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:6
-#, fuzzy
 msgid "Limit the alternate upload speed"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:7
-#, fuzzy
 msgid "Use the scheduled on/off times"
-msgstr "Use this files times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:8
 msgid "Don't use the scheduled on/off times"
@@ -57739,9 +54024,8 @@ msgid "Time to stop using the alt speed limits (hhmm)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:11
-#, fuzzy
 msgid "Number of days to enable the speed scheduler"
-msgstr "Name of the darcs executable on the remote server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:12
 msgid "Script to run each time a torrent finishes"
@@ -57756,28 +54040,24 @@ msgid "Directory for incomplete downloads"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:15
-#, fuzzy
 msgid "Don't store incomplete torrents in a different directory"
-msgstr "Don't remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:16
-#, fuzzy
 msgid "Limit the maximum download speed to limit"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:17
-#, fuzzy
 msgid "Disable download speed limits"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:18
 msgid "Set the session's maximum memory cache size (MiB)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:19
-#, fuzzy
 msgid "Encrypt all peer connections"
-msgstr "Encrypt all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:20
 msgid "Prefer encrypted peer connections"
@@ -57792,9 +54072,8 @@ msgid "Tell the Transmission to initiate a shutdown"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:23
-#, fuzzy
 msgid "Get a file list for the current torrent(s)"
-msgstr "Sets an index list for the next track"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:24
 msgid "Mark file(s) for download"
@@ -57813,48 +54092,40 @@ msgid "All torrents should seed regardless of ratio"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:28
-#, fuzzy
 msgid "Print command-line option descriptions"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:29
-#, fuzzy
 msgid "Show details of the current torrent(s)"
-msgstr "Show all of the gems in the current bundle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:30
-#, fuzzy
 msgid "List session information from the server"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:31
-#, fuzzy
 msgid "List statistical information from the server"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:32
-#, fuzzy
 msgid "List all torrents"
-msgstr "List archive contents"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:33
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:34
-#, fuzzy
 msgid "Disable portmapping"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:35
-#, fuzzy
 msgid "Set the username:password for authentication"
-msgstr "Prompt for password for authenticating server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:37
-#, fuzzy
 msgid "Set authentication information from a netrc file"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:38
 msgid "Enable distributed hash table (DHT)"
@@ -57865,9 +54136,8 @@ msgid "Disable distribued hash table (DHT)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:40
-#, fuzzy
 msgid "Set the port to use when listening"
-msgstr "Specify umask to use when writing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:41
 msgid "Give this torrent high bandwidth"
@@ -57882,29 +54152,24 @@ msgid "Give this torrent low bandwidth"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:44
-#, fuzzy
 msgid "Try to download the specified files first"
-msgstr "Write log output to the specified file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:45
-#, fuzzy
 msgid "Try to download the specified files normally"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:46
-#, fuzzy
 msgid "Try to download the specified files last"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:47
-#, fuzzy
 msgid "Set the maximum number of peers"
-msgstr "Set the maximum fuzz factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:48
-#, fuzzy
 msgid "Remove the current torrents"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:49
 msgid "Remove the current torrents and delete data"
@@ -57939,19 +54204,16 @@ msgid "Add a tracker to a torrent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:57
-#, fuzzy
 msgid "Remove a tracker from a torrent"
-msgstr "Removes a lock file for a client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:58
-#, fuzzy
 msgid "Start the current torrents"
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:59
-#, fuzzy
 msgid "Stop the current torrents"
-msgstr "Stop the currently evaluated function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:60
 msgid "Start added torrents paused"
@@ -57982,9 +54244,8 @@ msgid "Make the current torrent(s) not honor the session limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:67
-#, fuzzy
 msgid "Limit the maximum upload speed (KiB/s)"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:68
 msgid "Disable upload speed limits"
@@ -57995,14 +54256,12 @@ msgid "Enable uTP for peer connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:70
-#, fuzzy
 msgid "Disable uTP for peer connections"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:71
-#, fuzzy
 msgid "Verify the current torrents"
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:73
 msgid "Use directory as default for new downloads"
@@ -58025,9 +54284,8 @@ msgid "Disable local peer discovery (LPD)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:78
-#, fuzzy
 msgid "List the current torrent's connected peers"
-msgstr "Test if current token is on Nth place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/trap.fish:1
 msgid "Display names of all signals"
@@ -58050,28 +54308,24 @@ msgid "Displays the most recent build for each branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:3
-#, fuzzy
 msgid "Lists or deletes repository caches"
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:4
 msgid "Cancels a job or build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:5
-#, fuzzy
 msgid "Interactive shell"
-msgstr "Test if this is an interactive shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:6
-#, fuzzy
 msgid "Disables a project"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:7
-#, fuzzy
 msgid "Enables a project"
-msgstr "Enable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:8
 msgid "Encrypts values for the .travis.yml"
@@ -58082,14 +54336,12 @@ msgid "Encrypts a file and adds decryption steps to .travis.yml"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:10
-#, fuzzy
 msgid "Displays or changes the API endpoint"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
-#, fuzzy
 msgid "Show or modify build environment variables"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:12
 msgid "Helps you out when in dire need of information"
@@ -58144,18 +54396,16 @@ msgid "Lists repositories the user has certain permissions on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:25
-#, fuzzy
 msgid "Lists recent requests"
-msgstr "Bytes per request"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:26
 msgid "Restarts a build or job"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:27
-#, fuzzy
 msgid "Access repository settings"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:28
 msgid "Sets up an addon or deploy target"
@@ -58182,18 +54432,16 @@ msgid "Outputs the secret API token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:34
-#, fuzzy
 msgid "Outputs the client version"
-msgstr "Back up the original version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:35
 msgid "Lists most recent builds"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:36
-#, fuzzy
 msgid "Outputs the current user"
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:38
 msgid "Be interactive and colorful"
@@ -58204,67 +54452,56 @@ msgid "Don't be interactive and colorful"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:40
-#, fuzzy
 msgid "Don't rescue exceptions"
-msgstr "Don't execute scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:41
-#, fuzzy
 msgid "Rescue exceptions"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:42
-#, fuzzy
 msgid "Don't check if travis client is up to date"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:43
 msgid "Don't check if auto-completion is set up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:1
-#, fuzzy
 msgid "All files are listed"
-msgstr "All bitfields are signed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:2
-#, fuzzy
 msgid "List directories only"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:3
-#, fuzzy
 msgid "Follow symbolic links like directories"
-msgstr "Symbolic link to directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:4
-#, fuzzy
 msgid "Print the full path prefix for each file"
-msgstr "print full path to ebuild for package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:5
-#, fuzzy
 msgid "Stay on current filesystem only"
-msgstr "Stay on this file system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:6
-#, fuzzy
 msgid "Descend only level directories deep"
-msgstr "Recursively remove subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:7
 msgid "Rerun tree when max dir level reached"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:8
-#, fuzzy
 msgid "List only those files that match the pattern given"
-msgstr "Exclude files that match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:9
-#, fuzzy
 msgid "Do not list files that match the given pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:10
 msgid "Turn off file/directory count at end of tree listing"
@@ -58283,43 +54520,36 @@ msgid "Print and format time according to the format <f>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:14
-#, fuzzy
 msgid "Output to file instead of stdout"
-msgstr "Use this config file instead of default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:15
-#, fuzzy
 msgid "Print non-printable characters as '?'"
-msgstr "Replace non-graphic characters with “?”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:16
-#, fuzzy
 msgid "Print non-printable characters as is"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:17
 msgid "Quote filenames with double quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:18
-#, fuzzy
 msgid "Print the protections for each file"
-msgstr "Launch default action for each file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:19
-#, fuzzy
 msgid "Displays file owner or UID number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:20
-#, fuzzy
 msgid "Displays file group owner or GID number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:21
-#, fuzzy
 msgid "Print the size in bytes of each file"
-msgstr "Print size of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:22
 msgid "Print the size in a more human readable way"
@@ -58338,14 +54568,12 @@ msgid "Appends '/', '=', '*', '@', '|' or '>' as per ls -F"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:26
-#, fuzzy
 msgid "Print inode number of each file"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:27
-#, fuzzy
 msgid "Print device ID number to which each file belongs"
-msgstr "Print inode number of files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:28
 msgid "Sort files alphanumerically by version"
@@ -58356,9 +54584,8 @@ msgid "Sort files in reverse alphanumeric order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:30
-#, fuzzy
 msgid "Sort files by last modification time"
-msgstr "Sort by modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:31
 msgid "Sort files by last status change time"
@@ -58373,9 +54600,8 @@ msgid "List directories before files (-U disables)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:34
-#, fuzzy
 msgid "Don't print indentation lines"
-msgstr "Do not print explanations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:35
 msgid "Print ANSI lines graphic indentation lines"
@@ -58410,9 +54636,8 @@ msgid "Turn off hyperlinks in HTML output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:44
-#, fuzzy
 msgid "Print usage and this help message and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:1
 msgid "use the complement of SET1"
@@ -58441,14 +54666,12 @@ msgid "all letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:9
-#, fuzzy
 msgid "all horizontal whitespace"
-msgstr "Ignore all white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:10
-#, fuzzy
 msgid "all control characters"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:11
 msgid "all digits"
@@ -58463,14 +54686,12 @@ msgid "all lower case letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:14
-#, fuzzy
 msgid "all printable characters, including space"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:15
-#, fuzzy
 msgid "all punctuation characters"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:16
 msgid "all horizontal or vertical whitespace"
@@ -58508,98 +54729,80 @@ msgid "Guarantee that any output is unbuffered."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:24
-#, fuzzy
 msgid "alphanumeric characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:25
-#, fuzzy
 msgid "alphabetic characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:26
-#, fuzzy
 msgid "whitespace characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:27
-#, fuzzy
 msgid "control characters"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:28
-#, fuzzy
 msgid "numeric characters"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:29
-#, fuzzy
 msgid "graphic characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:30
-#, fuzzy
 msgid "ideographic characters"
-msgstr "Replace non-graphic characters with “?”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:31
-#, fuzzy
 msgid "lower-case alphabetic characters"
-msgstr "Octal escapes for non graphic characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:32
-#, fuzzy
 msgid "phonographic characters"
-msgstr "Octal escapes for non graphic characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:33
-#, fuzzy
 msgid "printable characters"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:34
-#, fuzzy
 msgid "punctuation characters"
-msgstr "Output character range"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:35
-#, fuzzy
 msgid "valid characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:36
-#, fuzzy
 msgid "space characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:37
-#, fuzzy
 msgid "special characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:38
-#, fuzzy
 msgid "upper-case characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:39
-#, fuzzy
 msgid "hexadecimal characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:2
 msgid "Print all possible definitions of the specified name"
 msgstr "Print all possible definitions of the specified name"
 
 #: /tmp/fish/implicit/share/completions/type.fish:3
-#, fuzzy
 msgid "Suppress function and builtin lookup"
-msgstr "Supress function and builtin lookup"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:4
-#, fuzzy
 msgid "Print command type"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:5
 msgid "Print path to command, or nothing if name is not a command"
@@ -58610,108 +54813,90 @@ msgid "Print path to command"
 msgstr "Print path to command"
 
 #: /tmp/fish/implicit/share/completions/type.fish:7
-#, fuzzy
 msgid "Suppress output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:3
-#, fuzzy
 msgid "Shows information about an object"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:4
-#, fuzzy
 msgid "Shows information about all objects"
-msgstr "Display information about a local or remote item."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:5
 msgid "Shows high-level status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:6
-#, fuzzy
 msgid "Monitor changes to objects"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:7
 #: /tmp/fish/implicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Mount a filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:18
-#, fuzzy
 msgid "Unmount a filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:9
-#, fuzzy
 msgid "Unlock an encrypted device"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:10
 msgid "Lock an encrypted device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:11
-#, fuzzy
 msgid "Set-up a loop device"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:12
-#, fuzzy
 msgid "Delete a loop device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:13
 msgid "Safely power off a drive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:14
-#, fuzzy
 msgid "Set SMART data for a drive"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:15
-#, fuzzy
 msgid "Object to get information about"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:16
-#, fuzzy
 msgid "Block device to get information about"
-msgstr "Return status information about fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:17
-#, fuzzy
 msgid "Drive to get information about"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:18
-#, fuzzy
 msgid "Filesystem type to use"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:20
-#, fuzzy
 msgid "Force/layzy unmount"
-msgstr "Lazy unmount"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:22
-#, fuzzy
 msgid "Mounted block device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:23
-#, fuzzy
 msgid "File to set-up a loop device for"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:24
-#, fuzzy
 msgid "Setup read-only device"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:25
 msgid "Start at <num> bytes into file"
@@ -58734,37 +54919,32 @@ msgid "File with libatasmart blob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:30
-#, fuzzy
 msgid "Do not authenticate the user if needed"
-msgstr "Do not cache authentication tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:31
 msgid "Object to "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:32
-#, fuzzy
 msgid "Block device to "
-msgstr "Block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:33
 msgid "Object path for ATA device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:34
-#, fuzzy
 msgid "Block device for ATA device"
-msgstr "Block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:1
-#, fuzzy
 msgid "Set or get soft limit"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:2
-#, fuzzy
 msgid "Set or get hard limit"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:3
 msgid "Set or get all current limits"
@@ -58811,9 +54991,8 @@ msgid "Maximum amount of virtual memory available to the shell"
 msgstr "Maximum amount of virtual memory available to the shell"
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:15
-#, fuzzy
 msgid "New resource limit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/umount.fish:5
 msgid "Unmount without writing in /etc/mtab"
@@ -58866,38 +55045,32 @@ msgid "Behave as though all of the options mnrsv were specified."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:2
-#, fuzzy
 msgid "print the machine hardware name."
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:3
-#, fuzzy
 msgid "print the nodename"
-msgstr "Print kernel name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:4
 msgid "print the machine processor architecture name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:5
-#, fuzzy
 msgid "print the operating system release."
-msgstr "Print the target operating system ID string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:6
-#, fuzzy
 msgid "print the operating system name."
-msgstr "Print the target operating system ID string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:7
-#, fuzzy
 msgid "print the operating system version."
-msgstr "Print the target operating system ID string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:8
-#, fuzzy
 msgid "Print all information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:9
 msgid "Print kernel name"
@@ -58912,9 +55085,8 @@ msgid "Print kernel release"
 msgstr "Print kernel release"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:12
-#, fuzzy
 msgid "Print kernel version"
-msgstr "Print node's version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:13
 msgid "Print machine name"
@@ -58929,9 +55101,8 @@ msgid "Print hardware platform"
 msgstr "Print hardware platform"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:16
-#, fuzzy
 msgid "Print operating system"
-msgstr "Print the target operating system ID string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unexpand.fish:1
 msgid "convert all blanks, instead of just initial blanks"
@@ -58986,14 +55157,12 @@ msgid "Extract files with full path"
 msgstr "Extract files with full path"
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:1
-#, fuzzy
 msgid "Show a short help screen"
-msgstr "Show and sort by ctime"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:2
-#, fuzzy
 msgid "Show version string"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:3
 msgid "Show eixrc-variables"
@@ -59004,14 +55173,12 @@ msgid "Show default eixrc-variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:5
-#, fuzzy
 msgid "Produce no output"
-msgstr "Produce diff output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:6
-#, fuzzy
 msgid "Output to the given file"
-msgstr "Output to /dev/null"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:7
 msgid "Exclude the given overlay from the update-process"
@@ -59026,9 +55193,8 @@ msgid "Override cache method for a specified overlay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:2
-#, fuzzy
 msgid "Be verbose (default)"
-msgstr "(default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:3
 msgid "Call wget as the given USER"
@@ -59043,14 +55209,12 @@ msgid "A comment about this user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:2
-#, fuzzy
 msgid "Home directory for the new user"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:3
-#, fuzzy
 msgid "Supplementary groups"
-msgstr "Select by group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:5
 msgid "The user's home directory will be created if it does not exist"
@@ -59094,9 +55258,8 @@ msgid "The group name or ID for a new user's initial group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:15
-#, fuzzy
 msgid "Name of the new user's login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:1
 msgid "Append groups (use with -G)"
@@ -59107,9 +55270,8 @@ msgid "Change user's password file comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:3
-#, fuzzy
 msgid "Change user's login directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:4
 msgid "Date on which the user account will be disabled"
@@ -59128,9 +55290,8 @@ msgid "List of groups which the user is also a member of"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:8
-#, fuzzy
 msgid "Change user's name"
-msgstr "Change to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:9
 msgid "Lock user's password"
@@ -59145,23 +55306,20 @@ msgid "Allow non-unique UID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:13
-#, fuzzy
 msgid "Apply changes in this directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:14
-#, fuzzy
 msgid "The name of the user's new login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:15
 msgid "The new numerical value of the user's ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:16
-#, fuzzy
 msgid "Unlock a users password"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:17
 msgid "Add a range of subordinate uids to the user's account"
@@ -59192,38 +55350,32 @@ msgid "Lists all available Vagrant boxes"
 msgstr "Lists all available Vagrant boxes"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:4
-#, fuzzy
 msgid "Print the help and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:5
-#, fuzzy
 msgid "Manages boxes"
-msgstr "Manage abbreviations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:6
 msgid "Adds a box"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:7
-#, fuzzy
 msgid "Lists all the installed boxes"
-msgstr "Lists all available Vagrant boxes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:8
-#, fuzzy
 msgid "Removes a box from Vagrant"
-msgstr "Removes a lock file for a client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:9
-#, fuzzy
 msgid "Repackages the given box for redistribution"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:10
-#, fuzzy
 msgid "Verifies the box with the given provider"
-msgstr "Verifies files in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:11
 msgid "Connect to a remotely shared Vagrant environment"
@@ -59238,19 +55390,16 @@ msgid "Manually override static IP chosen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:14
-#, fuzzy
 msgid "SSH into the remote machine"
-msgstr "Specify the rsync to run on remote machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:15
-#, fuzzy
 msgid "Destroys the running machine"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:16
-#, fuzzy
 msgid "Destroy without confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:17
 msgid "Global status of Vagrant environments"
@@ -59265,14 +55414,12 @@ msgid "Install Vagrant plugins through ruby gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:20
-#, fuzzy
 msgid "Shuts down the running machine"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:21
-#, fuzzy
 msgid "Force shut down"
-msgstr "Forced stop"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:22
 msgid "Initializes the Vagrant environment"
@@ -59283,14 +55430,12 @@ msgid "Log in to Vagrant Cloud"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:24
-#, fuzzy
 msgid "Only checks if you're logged in"
-msgstr "Only check if sorted"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:25
-#, fuzzy
 msgid "Logs you out if you're logged in"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:26
 msgid "Packages a running machine into a reusable box"
@@ -59301,9 +55446,8 @@ msgid "Name or UUID of the virtual machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:28
-#, fuzzy
 msgid "Output file name"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:29
 msgid "Additional files to package with the box"
@@ -59318,18 +55462,16 @@ msgid "Manages plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:32
-#, fuzzy
 msgid "Installs a plugin"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:33
 msgid "Installs a license for a proprietary Vagrant plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:34
-#, fuzzy
 msgid "Lists installed plugins"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:35
 msgid "Uninstall the given plugin"
@@ -59341,18 +55483,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:37
 #: /tmp/fish/implicit/share/completions/vagrant.fish:41
-#, fuzzy
 msgid "Run only the given provisioners"
-msgstr "Send to the given KDE session"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:38
 msgid "Connects to machine via RDP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:39
-#, fuzzy
 msgid "Restarts the running machine"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:40
 msgid "Provisioners will not run"
@@ -59383,9 +55523,8 @@ msgid "Local HTTPS port to forward to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:48
-#, fuzzy
 msgid "Specific name for the share"
-msgstr "Specify filenames to be filtered"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:49
 msgid "Allow 'vagrant connect --ssh' access"
@@ -59396,62 +55535,52 @@ msgid "Key won't be encrypted with --ssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:51
-#, fuzzy
 msgid "Specific port for SSH when using --ssh"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:52
 msgid "Allow 'vagrant connect --ssh' only one time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:53
-#, fuzzy
 msgid "SSH into a running machine"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:54
-#, fuzzy
 msgid "Executes a single SSH command"
-msgstr "Execute argument as command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:55
-#, fuzzy
 msgid "Does not authenticate"
-msgstr "Do not cache authentication tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:56
-#, fuzzy
 msgid "Outputs configuration for an SSH config file"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:57
-#, fuzzy
 msgid "Name of the host for the outputted configuration"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:58
 msgid "Status of the machines Vagrant is managing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:59
-#, fuzzy
 msgid "Suspends the running machine"
-msgstr "Show the running containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:60
-#, fuzzy
 msgid "Creates and configures guest machines"
-msgstr "Creates a configuration profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:61
-#, fuzzy
 msgid "Enable provision"
-msgstr "Enable optimizations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:62
-#, fuzzy
 msgid "Disable provision"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:63
 msgid "Enable only certain provisioners, by type"
@@ -59462,27 +55591,24 @@ msgid "Skin"
 msgstr "Skin"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:3
-#, fuzzy
 msgid "Display help and debug options"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:7
 msgid "Valgrind-ise children"
 msgstr "Valgrind-ise children"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:8
-#, fuzzy
 msgid "Track file descriptors"
-msgstr "Redirect to file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:9
 msgid "Log to file descriptor"
 msgstr "Log to file descriptor"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:10
-#, fuzzy
 msgid "Log to file"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:11
 msgid "Log to socket"
@@ -59517,15 +55643,13 @@ msgid "Debugger command"
 msgstr "Debugger command"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:19
-#, fuzzy
 msgid "File descriptor for input"
-msgstr "Base directory for output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:20
 #: /tmp/fish/implicit/share/completions/valgrind.fish:26
-#, fuzzy
 msgid "Check for memory leaks"
-msgstr "Check for newer pre-release gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:21
 #: /tmp/fish/implicit/share/completions/valgrind.fish:27
@@ -59580,9 +55704,8 @@ msgid "Specify a function that allocates memory"
 msgstr "Specify a function that allocates memory"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:36
-#, fuzzy
 msgid "Profile heap usage"
-msgstr "Profile stack usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:37
 msgid "The number of bytes of heap overhead per allocation"
@@ -59601,40 +55724,34 @@ msgid "Profiling output format"
 msgstr "Profiling output format"
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:1
-#, fuzzy
 msgid "Start given VM"
-msgstr "Start in Ex mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:2
 msgid "Enable or disamble VRDE server or don't change setting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:3
-#, fuzzy
 msgid "Set VRDE property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:4
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:22
-#, fuzzy
 msgid "Specify settings password"
-msgstr "Specify the http password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:5
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:23
-#, fuzzy
 msgid "Specify file containing setting password"
-msgstr "Specify the http password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:6
-#, fuzzy
 msgid "Start VM in paused state"
-msgstr "Start in easy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:7
-#, fuzzy
 msgid "Record VM screen ouput to file"
-msgstr "Redirect output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:8
 msgid "Frame width when recording"
@@ -59661,39 +55778,32 @@ msgid "Run separate VM process or attach to a running VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:3
-#, fuzzy
 msgid "Set temporary first hard disk"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:4
-#, fuzzy
 msgid "Set temporary first floppy disk"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:5
-#, fuzzy
 msgid "Set temporary CDROM/DVD"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:6
-#, fuzzy
 msgid "Set temporary boot device"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:7
-#, fuzzy
 msgid "Set temporary memory size in MB"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:8
-#, fuzzy
 msgid "Set temporary video memory size in MB"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:9
-#, fuzzy
 msgid "Start VM in fullscreen mode"
-msgstr "Start in lisp mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:10
 msgid "Resize guest on fullscreen"
@@ -59712,14 +55822,12 @@ msgid "Make SDL frame non resizable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:14
-#, fuzzy
 msgid "Disable all hoskey combinations"
-msgstr "Disable file modification"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:15
-#, fuzzy
 msgid "Disable specific hostkey combinations"
-msgstr "Disables specified type of authentication"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:16
 msgid "Disable mouse/keyboard grabbing on mouse click w/o additions"
@@ -59747,38 +55855,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:24
-#, fuzzy
 msgid "Enable raw ring 3"
-msgstr "Enable X11 forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:25
-#, fuzzy
 msgid "Enable raw ring 0"
-msgstr "Enable X11 forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:26
-#, fuzzy
 msgid "Enable PATM"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:27
-#, fuzzy
 msgid "Enable CSAM"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:28
 msgid "Permit usage of VT-x/AMD-V"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:29
-#, fuzzy
 msgid "Disable raw ring 3"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:30
-#, fuzzy
 msgid "Disable raw ring 0"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:31
 msgid "Disable PATM"
@@ -59822,14 +55924,12 @@ msgid "Start in display editing state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:10
-#, fuzzy
 msgid "Recover file after crash"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:11
-#, fuzzy
 msgid "Edit the file containing a tag"
-msgstr "print size of files contained in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:12
 msgid "Begin editing by executing the specified  editor command"
@@ -59848,14 +55948,12 @@ msgid "show the status of the addons available in the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:4
-#, fuzzy
 msgid "install one or more addons under ~/.vim"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:5
-#, fuzzy
 msgid "remove one or more addons from ~/.vim"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:6
 msgid "disable  one  or more addons to be used by the current user"
@@ -59870,122 +55968,104 @@ msgid "list, one per line, the files composing the specified addons"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:9
-#, fuzzy
 msgid "displays detailed information about the specified addons"
-msgstr "Display detailed information about the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:10
-#, fuzzy
 msgid "show this usage message and exit"
-msgstr "Show this help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:11
 msgid "be quiet and make the output more parseable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:12
-#, fuzzy
 msgid "set the registry directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:13
-#, fuzzy
 msgid "set the addons source directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:14
-#, fuzzy
 msgid "set the addons target directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:15
 msgid "increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:16
-#, fuzzy
 msgid "set the system-wide target directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:17
-#, fuzzy
 msgid "set target directory to the system-wide one"
-msgstr "Gem repository directory to get installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:1
-#, fuzzy
 msgid "Execute Ex command after the first file has been read"
-msgstr "execute commands from file, then exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:2
 msgid "Source file after the first file has been read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:3
-#, fuzzy
 msgid "Execute Ex command before loading any vimrc"
-msgstr "Execute command if previous command failed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:4
-#, fuzzy
 msgid "Use device as terminal (Amiga only)"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:5
 msgid "Set the viminfo file location"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:6
-#, fuzzy
 msgid "Open stacked windows for each file"
-msgstr "Launch default action for each file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:7
 msgid "Open side by side windows for each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:8
-#, fuzzy
 msgid "Open tab pages for each file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:9
-#, fuzzy
 msgid "Start in quickFix mode"
-msgstr "Start in Ex mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:10
 msgid "Use swap files for recovery"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:11
-#, fuzzy
 msgid "Source and execute script file"
-msgstr "Don't execute scriplets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:12
-#, fuzzy
 msgid "Set the cursor to tag"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:13
-#, fuzzy
 msgid "Terminal name"
-msgstr "Print all names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:14
 msgid "Use alternative vimrc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:15
-#, fuzzy
 msgid "Use alternative vimrc in GUI mode"
-msgstr "Start in GUI mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:16
-#, fuzzy
 msgid "Record all typed characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:17
 msgid "Record all typed characters (overwrite file)"
@@ -60063,38 +56143,32 @@ msgid "Reset compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:35
-#, fuzzy
 msgid "Don't use swap files"
-msgstr "Don't skip boring files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:36
-#, fuzzy
 msgid "Read only mode"
-msgstr "Read-only mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:38
-#, fuzzy
 msgid "Start in silent mode"
-msgstr "Start in Farsi mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:39
-#, fuzzy
 msgid "Start in verbose mode"
-msgstr "Start in Hebrew mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:40
-#, fuzzy
 msgid "Start in vi mode"
-msgstr "Start in diff mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:41
 msgid "Use encryption when writing files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:42
-#, fuzzy
 msgid "Don't connect to X server"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:43
 msgid "Start in easy mode"
@@ -60176,28 +56250,24 @@ msgid "Trace the sequence of commands performed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:8
-#, fuzzy
 msgid "Assume yes for any questions asked."
-msgstr "Assume yes to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:9
-#, fuzzy
 msgid "Add a CD-ROM to the list of available sources of packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:10
 msgid "Mark the alternative to be auto set (using set priorities)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:11
-#, fuzzy
 msgid "Remove superseded deb files from the download cache"
-msgstr "Remove all downloaded .deb files from the package cache directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:12
-#, fuzzy
 msgid "Do an update followed by a download of all updated packages"
-msgstr "Update the list of down-loadable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:13
 msgid "Perform an install without asking questions (non-interactive)"
@@ -60212,24 +56282,20 @@ msgid "Check reported bugs in package using the Debian Bug Tracker"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:16
-#, fuzzy
 msgid "Retrieve/unpack sources and build .deb for the named packages"
-msgstr "Retrieve and unpack sources for the named packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:17
-#, fuzzy
 msgid "Retrieve packages required to build listed packages"
-msgstr "Retrieve and unpack sources for the named packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:18
-#, fuzzy
 msgid "Retrieve latest changelog for the package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:19
-#, fuzzy
 msgid "Remove all deb files from the download cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:20
 #: /tmp/fish/implicit/share/completions/wajig.fish:53
@@ -60237,23 +56303,20 @@ msgid "List all the JIG commands and one line descriptions for each"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:21
-#, fuzzy
 msgid "Perform an update then a dist-upgrade"
-msgstr "Perform a distribution upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:22
-#, fuzzy
 msgid "List of packages which depend/recommend/suggest the package"
-msgstr "list all packages depending on specified package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:23
 msgid "One line description of packages (-v and -vv for more detail)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:24
-#, fuzzy
 msgid "One line description of new packages"
-msgstr "Cancel any scheduled actions on the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:25
 msgid "Provide a detailed description of package (describe -vv)"
@@ -60264,38 +56327,32 @@ msgid "Provide a detailed description of new packages (describe -vv)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:27
-#, fuzzy
 msgid "Upgrade to new distribution (installed and new rqd packages)"
-msgstr "Upgrade or install newest packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:28
 msgid "Equivalent to help with -verbose=2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:29
-#, fuzzy
 msgid "Download package files ready for an install"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:30
-#, fuzzy
 msgid "Download packages listed in file ready for an install"
-msgstr "Download package missing from mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:31
-#, fuzzy
 msgid "Install packages listed in a file"
-msgstr "list all packages owning file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:32
-#, fuzzy
 msgid "Remove packages listed in a file"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:33
-#, fuzzy
 msgid "Search for a file within installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
@@ -60311,14 +56368,12 @@ msgid "Perform apt-get -f install (to fix broken dependencies)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:37
-#, fuzzy
 msgid "Perform apt-get --fix-missing upgrade"
-msgstr "Perform a distribution upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:38
-#, fuzzy
 msgid "Install packages and ignore file overwrites and depends"
-msgstr "Install source packages and their build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:39
 msgid "Print documentation (detail depends on --verbose)"
@@ -60334,9 +56389,8 @@ msgid "Initialise or reset the JIG archive files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:42
-#, fuzzy
 msgid "Install (or upgrade) one or more packages or .deb files"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:43
 #: /tmp/fish/implicit/share/completions/wajig.fish:82
@@ -60344,9 +56398,8 @@ msgid "Install package and associated recommended packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:44
-#, fuzzy
 msgid "Install package and recommended and suggested packages"
-msgstr "Install newly added packages recommended by installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:45
 #: /tmp/fish/implicit/share/completions/wajig.fish:111
@@ -60358,55 +56411,48 @@ msgid "Check the integrity of installed packages (through checksums)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:47
-#, fuzzy
 msgid "List size of all large (>10MB) installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:48
 msgid "Identify when an update was last performed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:49
-#, fuzzy
 msgid "List the status and description of installed packages"
-msgstr "List version and distribution of (all) packages."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:50
-#, fuzzy
 msgid "List a one line description of given or all packages"
-msgstr "List version and distribution of (all) packages."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:51
 msgid "List the objects that can have alternatives configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:52
-#, fuzzy
 msgid "List the contents of the download cache"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:54
 msgid "List the daemons that JIG can start/stop/restart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:55
-#, fuzzy
 msgid "List the files that are supplied by the named package"
-msgstr "List all the files in each selected package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:56
-#, fuzzy
 msgid "List those packages on hold"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:57
 msgid "List packages (with optional argument substring) installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:58
-#, fuzzy
 msgid "List the contents of the install/remove log file (filtered)"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:59
 msgid "List all known packages or those containing supplied string"
@@ -60414,24 +56460,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:60
 #: /tmp/fish/implicit/share/completions/wajig.fish:74
-#, fuzzy
 msgid "List libraries not required by any installed package"
-msgstr "Generate a .deb file for an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:61
-#, fuzzy
 msgid "List the control scripts of the package of deb file"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:62
-#, fuzzy
 msgid "List packages that belong to a specific section"
-msgstr "List packages providing specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:63
-#, fuzzy
 msgid "List the sections that are available"
-msgstr "Only perform operations that are trivial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:64
 msgid "Same as list but only prints first two columns, not truncated"
@@ -60442,43 +56484,36 @@ msgid "Same as list but avoids truncating package names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:66
-#, fuzzy
 msgid "Dist-upgrade using packages already downloaded"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:67
 msgid "Upgrade using packages already downloaded, but not any others"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:68
-#, fuzzy
 msgid "Runs the madison command of apt-cache."
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:69
-#, fuzzy
 msgid "Move packages in the download cache to a local Debian mirror"
-msgstr "Move packages from cache to local mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:70
-#, fuzzy
 msgid "List packages that became available since last update"
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:71
-#, fuzzy
 msgid "Obtain the latest news about the package"
-msgstr "List all the files in each selected package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:72
-#, fuzzy
 msgid "List packages newly available for upgrading"
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:73
-#, fuzzy
 msgid "List installed packages that do not meet the DFSG"
-msgstr "Update installed packages with newer versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:75
 #: /tmp/fish/implicit/share/completions/wajig.fish:89
@@ -60490,9 +56525,8 @@ msgid "From preferences file show priorities/policy (available)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:77
-#, fuzzy
 msgid "Remove one or more packages and configuration files"
-msgstr "Remove one or more packages (see also purge)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:78
 msgid "Purge package and those it depend on and not required by others"
@@ -60662,9 +56696,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:3
 #: /tmp/fish/implicit/share/completions/watch.fish:4
-#, fuzzy
 msgid "Highlight changes between updates"
-msgstr "Time between screen updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:5
 msgid "Exit if command has a non-zero exit"
@@ -60675,9 +56708,8 @@ msgid "Exit when output from command changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:7
-#, fuzzy
 msgid "Seconds to wait between updates"
-msgstr "Time to wait between requesting more peers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:8
 msgid "Attempt run command in precise intervals"
@@ -60688,9 +56720,8 @@ msgid "Turn off header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:10
-#, fuzzy
 msgid "Pass command to exec instead of \"sh -c\""
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:1
 msgid "Print byte counts"
@@ -60709,9 +56740,8 @@ msgid "Print length of longest line"
 msgstr "Print length of longest line"
 
 #: /tmp/fish/implicit/share/completions/wc.fish:5
-#, fuzzy
 msgid "Print word counts"
-msgstr "Print byte counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:1
 msgid "Number sets BitsPerPixel value"
@@ -60751,9 +56781,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:8
-#, fuzzy
 msgid "Savegame loads the file savegame from the standard save game directory"
-msgstr "Remove all downloaded .deb files from the package cache directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:9
 msgid "Set the severity level of debugging domains"
@@ -60772,23 +56801,20 @@ msgid "Runs the game without sounds and music"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:13
-#, fuzzy
 msgid "Prints the name of the game data directory and exits"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:14
-#, fuzzy
 msgid "XxY sets the screen resolution"
-msgstr "save the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:15
 msgid "Runs the game in a small test scenario"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:16
-#, fuzzy
 msgid "Shows the version number and exits"
-msgstr "Show version number and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:17
 msgid "Runs the game in windowed mode"
@@ -60860,9 +56886,8 @@ msgid "Go to background immediately after startup"
 msgstr "Go to background immediately after startup"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:4
-#, fuzzy
 msgid "Execute command as if part of .wgetrc"
-msgstr "Execute command if previous command failed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:5
 msgid "Log all messages to logfile"
@@ -61023,9 +57048,8 @@ msgid "Disable server-side cache"
 msgstr "Disable server-side cache"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:49
-#, fuzzy
 msgid "Disable the use of cookies"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:50
 msgid "Load cookies from file"
@@ -61081,43 +57105,36 @@ msgid "Turn off keep-alive for http downloads"
 msgstr "Turn off keep-alive for http downloads"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:63
-#, fuzzy
 msgid "Choose secure protocol"
-msgstr "Reject protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:64
-#, fuzzy
 msgid "Only follow secure HTTPS links"
-msgstr "Always follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:65
 msgid "Don't validate the server's certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:66
-#, fuzzy
 msgid "Client certificate file"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:67
-#, fuzzy
 msgid "Client certificate type"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:68
-#, fuzzy
 msgid "Private key file"
-msgstr "Write to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:69
-#, fuzzy
 msgid "Private key type"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:70
-#, fuzzy
 msgid "File with the bundle of CAs"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:71
 msgid "Directory where hash list of CAs is stored"
@@ -61140,9 +57157,8 @@ msgid "Disable HSTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:76
-#, fuzzy
 msgid "Path of HSTS database"
-msgstr "Print database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:77
 msgid "Don't remove the temporary .listing files generated"
@@ -61244,9 +57260,8 @@ msgstr "Specify a comma-separated list of directories you wish to exclude"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:100
 #: /tmp/fish/implicit/share/completions/wget.fish:101
-#, fuzzy
 msgid "Do not ever ascend to the parent directory"
-msgstr "Download the packages to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:1
 #: /tmp/fish/implicit/share/completions/which.fish:13
@@ -61258,9 +57273,8 @@ msgid "Read aliases from stdin, reporting matching ones on stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:3
-#, fuzzy
 msgid "Ignore option '--read-alias'"
-msgstr "Ignore option “--read-functions”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:4
 msgid ""
@@ -61308,9 +57322,8 @@ msgid "Print time of last boot"
 msgstr "Print time of last boot"
 
 #: /tmp/fish/implicit/share/completions/who.fish:3
-#, fuzzy
 msgid "Print dead processes"
-msgstr "Print processor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:4
 msgid "Print line of headings"
@@ -61374,9 +57387,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:3
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:3
-#, fuzzy
 msgid "Print this help information."
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:4
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:4
@@ -61389,19 +57401,16 @@ msgid "Don't display anything except notifications."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:2
-#, fuzzy
 msgid "Scan for networks"
-msgstr "add a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:3
-#, fuzzy
 msgid "List networks"
-msgstr "disable a network"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:4
-#, fuzzy
 msgid "Show network details"
-msgstr "get network variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:5
 msgid "Disconnect"
@@ -61412,47 +57421,40 @@ msgid "Connect"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:7
-#, fuzzy
 msgid "List encryption types"
-msgstr "List entries by lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:8
 msgid "Perform operation on wireless network"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:9
-#, fuzzy
 msgid "Perform operation on wired network"
-msgstr "Only perform operations that are trivial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:10
-#, fuzzy
 msgid "Save profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:11
-#, fuzzy
 msgid "Load profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:12
 msgid "Set name for profile to save/load"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:13
-#, fuzzy
 msgid "Get or set network property"
-msgstr "Retrieve revision property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:14
-#, fuzzy
 msgid "Set network property to"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:15
-#, fuzzy
 msgid "Set the network"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:1
 msgid "get current WPA/EAPOL/EAP status"
@@ -61615,9 +57617,8 @@ msgid "Run wvdial with alternative config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wvdial.fish:4
-#, fuzzy
 msgid "Don't output debug information"
-msgstr "Don't print group information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:1
 msgid ""
@@ -61680,14 +57681,12 @@ msgid "Run up to max-procs processes at a time"
 msgstr "Run up to max-procs processes at a time"
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:1
-#, fuzzy
 msgid "Query information"
-msgstr "Print extra information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:2
-#, fuzzy
 msgid "Query default application for type"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:3
 msgid "Query file's filetype"
@@ -61698,35 +57697,29 @@ msgid "Choose application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:5
-#, fuzzy
 msgid "Mimetype"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:6
-#, fuzzy
 msgid "Add filetype description"
-msgstr "Append filetype indicator"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:7
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:10
-#, fuzzy
 msgid "Set mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:8
-#, fuzzy
 msgid "Disable vendor check"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:9
-#, fuzzy
 msgid "Remove filetype description"
-msgstr "Redirect to file descriptor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:12
-#, fuzzy
 msgid "Diplay long help"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:1
 msgid "Get list of input files from FILE"
@@ -61760,9 +57753,8 @@ msgid "Encoding of input files (except for Python, Tcl, Glade)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:9
-#, fuzzy
 msgid "Join messages with existing file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:10
 msgid "Entries from FILE"
@@ -61809,9 +57801,8 @@ msgid "More detailed formatstring recognition result"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:19
-#, fuzzy
 msgid "Do not use C escapes in output (default)"
-msgstr "Don't use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:20
 msgid "Use C escapes in output, no extended chars"
@@ -61822,14 +57813,12 @@ msgid "Write PO file even if empty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:22
-#, fuzzy
 msgid "Write the"
-msgstr "Write to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:23
-#, fuzzy
 msgid "Do not write #: filename:line lines"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:24
 msgid "Generate #: filename:line lines (default)"
@@ -61840,18 +57829,16 @@ msgid "Write out strict Uniforum conforming"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:26
-#, fuzzy
 msgid "Write out a Java"
-msgstr "Write out setting names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:27
 msgid "Write out a NeXTstep/GNUstep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:28
-#, fuzzy
 msgid "Set output page width"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:29
 msgid ""
@@ -61860,23 +57847,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:30
-#, fuzzy
 msgid "Generate sorted output"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:31
-#, fuzzy
 msgid "Sort output by file location"
-msgstr "Sort by modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:32
 msgid "Dont write header with msgid \"\" entry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:33
-#, fuzzy
 msgid "Set copyright holder in output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:34
 msgid "Omit FSF copyright in output for foreign user"
@@ -61895,33 +57879,28 @@ msgid "Use STRING or \"\" as suffix for msgstr entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:1
-#, fuzzy
 msgid "Show summary of options"
-msgstr "Show all options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:2
-#, fuzzy
 msgid "Select XMMS session (Default: 0)"
-msgstr "Select by session ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:3
 msgid "Skip backwards in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:4
-#, fuzzy
 msgid "Start playing current playlist"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:5
-#, fuzzy
 msgid "Pause current song"
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:6
-#, fuzzy
 msgid "Stop current song"
-msgstr "Show current path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:7
 msgid "Pause if playing, play otherwise"
@@ -61936,19 +57915,16 @@ msgid "Don't clear the playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:10
-#, fuzzy
 msgid "Show the main window"
-msgstr "Show help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:1
-#, fuzzy
 msgid "Set the initial window geometry"
-msgstr "Set the terminal color"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
-#, fuzzy
 msgid "Set the window title"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:3
 msgid "Install a private colormap"
@@ -61959,28 +57935,24 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
-#, fuzzy
 msgid "Set reverse video mode"
-msgstr "Server mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
-#, fuzzy
 msgid "Set the background of the page display"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:7
 msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "Set the maximum fuzz factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
-#, fuzzy
 msgid "Start in continuous view mode"
-msgstr "Start in lisp mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:10
 msgid "Enable or disable t1lib (Default: yes)"
@@ -61999,9 +57971,8 @@ msgid "Set the default file name for PostScript output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:14
-#, fuzzy
 msgid "Set the paper size"
-msgstr "Set memory buffer size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:15
 msgid "Set the paper width, in points"
@@ -62012,29 +57983,24 @@ msgid "Set the paper height, in points"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:17
-#, fuzzy
 msgid "Generate Level 1 PostScript"
-msgstr "Generate dired output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:18
-#, fuzzy
 msgid "Sets the encoding to use for text output"
-msgstr "Neither verbose nor quiet output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:19
-#, fuzzy
 msgid "Sets the end-of-line convention to use"
-msgstr "Set the end of file string to eof-str"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:20
-#, fuzzy
 msgid "Specify the owner password for the PDF file"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:21
-#, fuzzy
 msgid "Specify the user password for the PDF file"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:22
 msgid "Open xpdf in full-screen mode"
@@ -62053,24 +58019,20 @@ msgid "Raise xpdf remote server window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:26
-#, fuzzy
 msgid "Kill xpdf remote server"
-msgstr "display the remote gem servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:27
-#, fuzzy
 msgid "Print commands as they're executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:29
-#, fuzzy
 msgid "Specify config file to use instead of ~/.xpdfrc"
-msgstr "Specify an initialization file to read instead of ~/.muttrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:30
-#, fuzzy
 msgid "Print copyright and version information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:2
 msgid "Display grammar and exit"
@@ -62125,9 +58087,8 @@ msgid "Examine property updates forever"
 msgstr "Examine property updates forever"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:15
-#, fuzzy
 msgid "Set format"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:2
 msgid "Make no changes"
@@ -62138,23 +58099,20 @@ msgid "Apply modifications without grabbing the screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:4
-#, fuzzy
 msgid "Print out a summary of the usage and exit"
-msgstr "Print help message and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:5
 msgid "Print out the RandR version reported by the X server and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:6
-#, fuzzy
 msgid "Display the current state of the system"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:7
-#, fuzzy
 msgid "Select X display to use"
-msgstr "Select how to display key IDs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:8
 msgid "Select which screen to manipulate"
@@ -62173,14 +58131,12 @@ msgid "Set the screen size (index or width x height)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:12
-#, fuzzy
 msgid "Set the refresh rate closest to the specified value"
-msgstr "Set the list of default preferences to the specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:13
-#, fuzzy
 msgid "Specify the orientation of the screen"
-msgstr "Specify the subject of the message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:14
 msgid "Reflect across the X axis"
@@ -62191,14 +58147,12 @@ msgid "Reflect across the Y axis"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:16
-#, fuzzy
 msgid "Display the contents of properties for each output"
-msgstr "Display the contents of the installed gems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:17
-#, fuzzy
 msgid "Set screen size"
-msgstr "Set context size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:18
 msgid "Set reported physical screen size"
@@ -62209,14 +58163,12 @@ msgid "Set dpi to calculate reported physical screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:20
-#, fuzzy
 msgid "Add new mode"
-msgstr "Add a new key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:21
-#, fuzzy
 msgid "Removes a mode from the server"
-msgstr "Removes a key from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:22
 msgid "Add a mode to the set of valid modes for an output"
@@ -62227,18 +58179,16 @@ msgid "Remove a mode from the set of valid modes for an output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:24
-#, fuzzy
 msgid "Selects an output to reconfigure"
-msgstr "Select an option profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:25
 msgid "Enable connected but disabled outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:26
-#, fuzzy
 msgid "This selects a mode"
-msgstr "Select a method"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:27
 msgid ""
@@ -62251,42 +58201,36 @@ msgid "Set output position within the secreen in pixels"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:29
-#, fuzzy
 msgid "Set refresh rate"
-msgstr "Set referer URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:30
-#, fuzzy
 msgid "Set reflection"
-msgstr "Invert selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:31
-#, fuzzy
 msgid "Set rotation"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:32
 #: /tmp/fish/implicit/share/completions/xrandr.fish:33
 #: /tmp/fish/implicit/share/completions/xrandr.fish:34
 #: /tmp/fish/implicit/share/completions/xrandr.fish:35
 #: /tmp/fish/implicit/share/completions/xrandr.fish:36
-#, fuzzy
 msgid "Set position relative to the output"
-msgstr "Set the verbose level of output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:37
 msgid "Set the property value: --set <prop> <value>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:38
-#, fuzzy
 msgid "Disables the output"
-msgstr "Add label to output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:39
-#, fuzzy
 msgid "Set the crtc"
-msgstr "Set quote char"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:40
 msgid "Set gamma correction [red:green:blue]"
@@ -62297,14 +58241,12 @@ msgid "Set brightness. Multiplies gamma galues by brightness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:42
-#, fuzzy
 msgid "Don't define a primary output"
-msgstr "Run adb devices and parse output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:43
-#, fuzzy
 msgid "Print current screen configuration"
-msgstr "Write out the current configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:44
 msgid ""
@@ -62319,18 +58261,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:46
-#, fuzzy
 msgid "Set scren scale"
-msgstr "Set server name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:47
 msgid "Set the output as primary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:1
-#, fuzzy
 msgid "display to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:2
 msgid "do all resources [default]"
@@ -62357,57 +58297,48 @@ msgid "preprocessor to use [/usr/bin/mcpp]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:8
-#, fuzzy
 msgid "do not use a preprocessor"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:9
-#, fuzzy
 msgid "query resources"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:10
-#, fuzzy
 msgid "load resources from file [default]"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:11
-#, fuzzy
 msgid "add in resources from file"
-msgstr "Load index from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:12
-#, fuzzy
 msgid "merge resources from file & sort"
-msgstr "Supress errors from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:13
-#, fuzzy
 msgid "edit resources into file"
-msgstr "Set sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:14
 msgid "backup suffix for -edit [.bak]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:15
-#, fuzzy
 msgid "show preprocessor symbols"
-msgstr "Preprocessors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:16
-#, fuzzy
 msgid "remove resources"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:17
 msgid "avoid server reset (avoid using this)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:18
-#, fuzzy
 msgid "don't warn about duplicates"
-msgstr "Only print duplicates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:1
 msgid "Append input to selection"
@@ -62478,18 +58409,16 @@ msgid "Never highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:2
-#, fuzzy
 msgid "Enable active icon support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:3
 msgid "Disallow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:4
-#, fuzzy
 msgid "Turn off cursor blinking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:5
 msgid "Enable the display of bold characters"
@@ -62516,9 +58445,8 @@ msgid "Don't workaround the bug in more(1)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:11
-#, fuzzy
 msgid "Disable dynamic color changing"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:12
 msgid "Don't ensure compatibility between normal and bold fonts bounding boxes"
@@ -62541,23 +58469,20 @@ msgid "Don't use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:17
-#, fuzzy
 msgid "Don't force insert mode"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:18
-#, fuzzy
 msgid "Don't use jump scrolling"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:19
 msgid "Don't treat C1 control characters as printable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:20
-#, fuzzy
 msgid "Turn off logging"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:21
 msgid "Turn off support for encodings according the locale setting"
@@ -62580,9 +58505,8 @@ msgid "Don't use builtin version for the wide-character calculation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:26
-#, fuzzy
 msgid "Enable underlining"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:27
 msgid "Disable PC style bold colors"
@@ -62601,18 +58525,16 @@ msgid "Disable reverse-wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:31
-#, fuzzy
 msgid "Turn off asynchronous scrolling"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:32
 msgid "Send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:33
-#, fuzzy
 msgid "Don't display scrollbar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:34
 msgid "Don't generate Sun Function Key escape codes for function keys"
@@ -62639,41 +58561,36 @@ msgid "VT102 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:40
-#, fuzzy
 msgid "Don't display toolbar or menubar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:41
-#, fuzzy
 msgid "Don't use UTF-8"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:42
 msgid "Display characters with underline attribute as color"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:43
-#, fuzzy
 msgid "Write to the system utmp log file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:44
 msgid "Don't use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:45
-#, fuzzy
 msgid "Don't use wide characters"
-msgstr "Do not use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:46
 msgid "Don't wait the first time for the window to be mapped"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:47
-#, fuzzy
 msgid "Print version number to the standard output"
-msgstr "Print version information and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:48
 msgid "Print out a verbose message describing the options"
@@ -62688,18 +58605,16 @@ msgid "Always highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:51
-#, fuzzy
 msgid "Disable active icon support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:52
 msgid "Allow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:53
-#, fuzzy
 msgid "Turn on cursor blinking"
-msgstr "Turn on recursive retrieving"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:54
 msgid "Disable the display of bold characters"
@@ -62710,9 +58625,8 @@ msgid "Set the vt100 resource cutToBeginningOfLine to 'false'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:56
-#, fuzzy
 msgid "Set character class"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:57
 msgid "Set the cjkWidth resource to 'true'"
@@ -62755,9 +58669,8 @@ msgid "Use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:67
-#, fuzzy
 msgid "Force insert mode"
-msgstr "Forced stop"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:68
 msgid "Treat C1 control characters as printable"
@@ -62772,9 +58685,8 @@ msgid "Force scrollbar to the left side"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:71
-#, fuzzy
 msgid "The shell in xterm's window will be login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:72
 msgid "Ring bell if the user types near the end of line"
@@ -62789,9 +58701,8 @@ msgid "Use builtin version for the wide-character calculation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:75
-#, fuzzy
 msgid "Disable underlining"
-msgstr "Disable warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:76
 msgid "Enable PC style bold colors"
@@ -62818,9 +58729,8 @@ msgid "Don't send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:82
-#, fuzzy
 msgid "Display scrollbar"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:83
 msgid "Generate Sun Function Key escape codes for function keys"
@@ -62843,9 +58753,8 @@ msgid "Assume Sun/PC keyboard"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:88
-#, fuzzy
 msgid "Display toolbar or menubar"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:89
 msgid "Use UTF-8"
@@ -62864,9 +58773,8 @@ msgid "Use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:93
-#, fuzzy
 msgid "Use wide characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:94
 msgid "Wait the first time for the window to be mapped"
@@ -62985,70 +58893,60 @@ msgid "Use jump scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:124
-#, fuzzy
 msgid "Turn on logging"
-msgstr "Turn on Ruby debugging"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:125
 msgid "Turn on asynchronous scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:126
-#, fuzzy
 msgid "Tektronix mode"
-msgstr "Question mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:127
 msgid "This window should receive console output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:1
-#, fuzzy
 msgid "Compress"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:2
-#, fuzzy
 msgid "Decompress"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:3
-#, fuzzy
 msgid "Test the integrity of compressed files"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:4
-#, fuzzy
 msgid "Print information about compressed files"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:5
-#, fuzzy
 msgid "Don't delete the input files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:6
-#, fuzzy
 msgid "Write to stdout instead of file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:7
 msgid "Decompress only the first .xz stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:8
-#, fuzzy
 msgid "Disable creation of sparse files"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:9
 msgid "Use SUFFIX as the suffix for target file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:10
-#, fuzzy
 msgid "Read the filenames to process from file"
-msgstr "Read the log message from file."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:11
 msgid "Identical to --files but filenames terminate with \\0"
@@ -63059,38 +58957,32 @@ msgid "Specify file format to compress/decompress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:13
-#, fuzzy
 msgid "Specify type of integrity check"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:14
-#, fuzzy
 msgid "Don't verify the integrity check"
-msgstr "Don't verify time attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:15
-#, fuzzy
 msgid "Select compression level"
-msgstr "Compression level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:16
 msgid "Use slower variant"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:17
-#, fuzzy
 msgid "Alias of -0"
-msgstr "Alias for atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:18
-#, fuzzy
 msgid "Alias of -9"
-msgstr "Alias for atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:20
-#, fuzzy
 msgid "Set block sizes list"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:21
 msgid "Force flush if encoder did not fush after TIMEOUT ms"
@@ -63113,9 +59005,8 @@ msgid "Display error and exit if exceed memory usage limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:26
-#, fuzzy
 msgid "Specify the number of worker threads to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:27
 msgid "Add LZMA1 filter to filter chain"
@@ -63134,28 +59025,24 @@ msgid "Add Delta filter to filter chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:31
-#, fuzzy
 msgid "Suppress warnings/notices"
-msgstr "Suppress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:33
-#, fuzzy
 msgid "Don't set the exit status to 2"
-msgstr "Negate exit status of job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:34
 msgid "Print messages in a machine-parsable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:35
-#, fuzzy
 msgid "Display memory informations (physical, usage limits)"
-msgstr "Display detailed information of gem(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:37
-#, fuzzy
 msgid "Display long help"
-msgstr "Display a help page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:13
 msgid "Backup or restore alpm local database"
@@ -63174,9 +59061,8 @@ msgid "Show some statistics about your packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:29
-#, fuzzy
 msgid "Force color"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:30
 msgid "Force installation or updates"
@@ -63187,48 +59073,40 @@ msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:32
-#, fuzzy
 msgid "Disable color"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:33
-#, fuzzy
 msgid "Always ask for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:35
 msgid "Export built packages and their sources to DIR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:36
-#, fuzzy
 msgid "Use DIR as temporary folder"
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:54
-#, fuzzy
 msgid "Show packages that conflict with one of the targets"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:55
-#, fuzzy
 msgid "Show packages that depend on one of the targets"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:56
-#, fuzzy
 msgid "Show packages that provide one of the targets"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:57
-#, fuzzy
 msgid "Show packages that replace one of the targets"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:58
-#, fuzzy
 msgid "Query the package names only"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:70
 msgid "Query FILE instead of alpm/aur"
@@ -63247,23 +59125,20 @@ msgid "Pass -A or --ignorearch option to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:85
-#, fuzzy
 msgid "Specify a custom AUR url"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:86
 msgid "Build from sources(AUR or ABS)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:87
-#, fuzzy
 msgid "Also build all dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:88
-#, fuzzy
 msgid "Search an update for devel packages"
-msgstr "Retrieve and unpack sources for the named packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:89
 msgid "Search packages by maintainer instead of name (AUR only)"
@@ -63274,19 +59149,16 @@ msgid "Pass additional options to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:106
-#, fuzzy
 msgid "Clean all these files"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:107
-#, fuzzy
 msgid "Also install the package"
-msgstr "Reinstall the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:1
-#, fuzzy
 msgid "output usage information"
-msgstr "Could not get user information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:3
 msgid "output verbose messages on internal operations"
@@ -63303,9 +59175,8 @@ msgid "use network only if dependencies are not available in local cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:6
-#, fuzzy
 msgid "don't run lifecycle scripts"
-msgstr "Don't run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:7
 msgid "save HAR output of network traffic"
@@ -63316,37 +59187,32 @@ msgid "ignore platform checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:9
-#, fuzzy
 msgid "ignore engines check"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:10
-#, fuzzy
 msgid "ignore optional dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:11
-#, fuzzy
 msgid "ignore all caches"
-msgstr "Search ignores all case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:12
 msgid "don't generate bin links when setting up packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:13
-#, fuzzy
 msgid "only allow one version of a package"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:14
 msgid "don't read or generate a lockfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:15
-#, fuzzy
 msgid "don't generate a lockfile"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:16
 msgid "don't generate a lockfile and fail if an update is needed"
@@ -63359,37 +59225,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:18
-#, fuzzy
 msgid "specify a custom folder to store the yarn cache"
-msgstr "Select file to store source cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:19
 msgid "use a mutex to ensure only one yarn instance is executing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:20
-#, fuzzy
 msgid "disable emoji in output"
-msgstr "Use colors in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:21
-#, fuzzy
 msgid "disable progress bar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:22
-#, fuzzy
 msgid "maximum number of concurrent network requests"
-msgstr "Minimum number of peers to not do requesting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:1
 msgid "Module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:3
-#, fuzzy
 msgid "List all available modules"
-msgstr "List all available products"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:4
 msgid "Use the QT graphical user interface"
@@ -63412,63 +59273,52 @@ msgid "No window manager border for main window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:9
-#, fuzzy
 msgid "Use full screen"
-msgstr "Full screen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:1
-#, fuzzy
 msgid "Install the latest version of a package"
-msgstr "Install the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:2
-#, fuzzy
 msgid "Update specified packages (defaults to all packages)"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:3
-#, fuzzy
 msgid "Print list of available updates"
-msgstr "List available updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:4
-#, fuzzy
 msgid "Remove the specified packages and packages that depend on them"
-msgstr "Download package and any packages it depends on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:5
-#, fuzzy
 msgid "List available packages"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:6
-#, fuzzy
 msgid "Describe available packages"
-msgstr "List all available packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:7
 msgid "Find package providing a feature or file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:8
-#, fuzzy
 msgid "find packages matching description regexp"
-msgstr "Ignore changes matching regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:9
-#, fuzzy
 msgid "Clean up cache directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:10
-#, fuzzy
 msgid "Generate rss changelog"
-msgstr "Generate man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:14
-#, fuzzy
 msgid "Set debug level"
-msgstr "change debug level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:15
 msgid "Set error level"
@@ -63491,14 +59341,12 @@ msgid "Specify installroot"
 msgstr "Specify installroot"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:21
-#, fuzzy
 msgid "Enable repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:22
-#, fuzzy
 msgid "Disable repository"
-msgstr "Dumps the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:23
 msgid "Enables obsolets processing logic"
@@ -63513,29 +59361,24 @@ msgid "Exclude specified package from updates"
 msgstr "Exclude specified package from updates"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:26
-#, fuzzy
 msgid "List all packages"
-msgstr "Install packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:27
-#, fuzzy
 msgid "List packages available for installation"
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:28
-#, fuzzy
 msgid "List packages with updates available"
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:30
-#, fuzzy
 msgid "List packages not available in repositories"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:31
-#, fuzzy
 msgid "List packages that are obsoleted by packages in repositories"
-msgstr "List packages that may serve as input to mirrorbin or mirrorsource"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:32
 msgid "Delete cached package files"
@@ -64175,9 +60018,8 @@ msgid "Move into zipfile (delete files)"
 msgstr "Move into zipfile (delete files)"
 
 #: /tmp/fish/implicit/share/completions/zip.fish:6
-#, fuzzy
 msgid "Do not store directory names"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:7
 msgid "Do not compress at all"
@@ -64895,68 +60737,56 @@ msgid "Download source rpms for all installed packages to a local directory"
 msgstr "Download source rpms for all installed packages to a local directory"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:48
-#, fuzzy
 msgid "Output the version number"
-msgstr "Version number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:49
-#, fuzzy
 msgid "Use specified config file instead of the default"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:50
-#, fuzzy
 msgid "Suppress normal output, print only error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:52
-#, fuzzy
 msgid "Do not abbreviate text in tables"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:53
-#, fuzzy
 msgid "Table style (integer)"
-msgstr "Test zipfile integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:54
-#, fuzzy
 msgid "Turn on rug compatibility"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:55
 msgid "Do not ask anything, use default answers automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:56
-#, fuzzy
 msgid "Switch to XML output"
-msgstr "Set width of output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:57
-#, fuzzy
 msgid "Ignore unknown packages"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:58
-#, fuzzy
 msgid "Use an additional repository"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:59
-#, fuzzy
 msgid "Use alternative repository definition file directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:60
-#, fuzzy
 msgid "Use alternative directory for all caches"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:61
-#, fuzzy
 msgid "Operate on a different root directory"
-msgstr "Create a diff between two versions of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:62
 msgid ""
@@ -64972,29 +60802,24 @@ msgid "Automatically trust and import new repository signing keys"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:65
-#, fuzzy
 msgid "Do not read meta-data from repositories"
-msgstr "Do not dump metadata about files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:66
-#, fuzzy
 msgid "Do not refresh the repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:67
-#, fuzzy
 msgid "Ignore CD/DVD repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:68
-#, fuzzy
 msgid "Ignore remote repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:69
-#, fuzzy
 msgid "Do not read installed packages"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:70
 msgid "Output a list of zypper user prompts"
@@ -65013,35 +60838,30 @@ msgid "Use alternative solv file cache directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:74
-#, fuzzy
 msgid "Use alternative package cache directory"
-msgstr "Remove all downloaded .deb files from the package cache directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:75
 msgid "Export all defined repositories as a single local .repo file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:76
-#, fuzzy
 msgid "Show also repository alias"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:77
-#, fuzzy
 msgid "Show also repository name"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:78
 #: /tmp/fish/implicit/share/completions/zypper.fish:121
-#, fuzzy
 msgid "Show also base URI of repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:79
 #: /tmp/fish/implicit/share/completions/zypper.fish:122
-#, fuzzy
 msgid "Show also repository priority"
-msgstr "Show repository access history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:80
 msgid "Show also the autorefresh flag"
@@ -65063,9 +60883,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:84
 #: /tmp/fish/implicit/share/completions/zypper.fish:125
-#, fuzzy
 msgid "Sort the list by repository priority"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:85
 msgid "Sort the list by alias"
@@ -65073,9 +60892,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:86
 #: /tmp/fish/implicit/share/completions/zypper.fish:127
-#, fuzzy
 msgid "Sort the list by name"
-msgstr "Show or set the system's host name\r"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:87
 msgid "Just another means to specify a .repo file to read"
@@ -65086,23 +60904,20 @@ msgid "Type of repository (yast2, rpm-md, plaindir)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:89
-#, fuzzy
 msgid "Add the repository as disabled"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:90
-#, fuzzy
 msgid "Probe URI"
-msgstr "Probe a CD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:91
 msgid "Don't probe URI, probe later during refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:92
-#, fuzzy
 msgid "Specify descriptive name for the repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:93
 #: /tmp/fish/implicit/share/completions/zypper.fish:106
@@ -65111,26 +60926,22 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:94
 #: /tmp/fish/implicit/share/completions/zypper.fish:107
-#, fuzzy
 msgid "Disable RPM files caching"
-msgstr "Disable file modification"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:95
 #: /tmp/fish/implicit/share/completions/zypper.fish:108
-#, fuzzy
 msgid "Enable GPG check for this repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:96
 #: /tmp/fish/implicit/share/completions/zypper.fish:109
-#, fuzzy
 msgid "Disable GPG check for this repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:97
-#, fuzzy
 msgid "Enable autorefresh of the repository"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:98
 #: /tmp/fish/implicit/share/completions/zypper.fish:146
@@ -65139,67 +60950,56 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:99
 #: /tmp/fish/implicit/share/completions/zypper.fish:147
-#, fuzzy
 msgid "Ignore query string in the URI"
-msgstr "Ignore files ending with ~"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:100
 msgid "Disable the repository (but don't remove it)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:101
-#, fuzzy
 msgid "Enable a disabled repository"
-msgstr "Rename specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:102
-#, fuzzy
 msgid "Enable auto-refresh of the repository"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:103
-#, fuzzy
 msgid "Disable auto-refresh of the repository"
-msgstr "Restore files from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:104
-#, fuzzy
 msgid "Set a descriptive name for the repository"
-msgstr "Adds an encryption key to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:105
-#, fuzzy
 msgid "Set priority of the repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:110
-#, fuzzy
 msgid "Apply changes to all repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:111
-#, fuzzy
 msgid "Apply changes to all local repositories"
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:112
-#, fuzzy
 msgid "Apply changes to all remote repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:113
-#, fuzzy
 msgid "Apply changes to repositories of specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:114
 msgid "Force a complete refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:115
-#, fuzzy
 msgid "Force rebuild of the database"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:116
 msgid "Force download of raw metadata"
@@ -65214,9 +61014,8 @@ msgid "Only download raw metadata, don't build the database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:119
-#, fuzzy
 msgid "Refresh only specified repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:120
 msgid "Refresh also services before refreshing repos"
@@ -65227,19 +61026,16 @@ msgid "Show also repositories belonging to the services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:128
-#, fuzzy
 msgid "Type of the service (ris)"
-msgstr "Number of top servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:129
-#, fuzzy
 msgid "Add the service as disabled"
-msgstr "Prints services installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:130
-#, fuzzy
 msgid "Specify descriptive name for the service"
-msgstr "Specify version for gem to view"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:131
 msgid "Disable the service (but don't remove it)"
@@ -65262,34 +61058,28 @@ msgid "Set a descriptive name for the service"
 msgstr "Set a descriptive name for the service"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:136
-#, fuzzy
 msgid "Add a RIS service repository to enable"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:137
-#, fuzzy
 msgid "Add a RIS service repository to disable"
-msgstr "Add a new repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:138
-#, fuzzy
 msgid "Remove a RIS service repository to enable"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:139
-#, fuzzy
 msgid "Remove a RIS service repository to disable"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:140
-#, fuzzy
 msgid "Clear the list of RIS repositories to enable"
-msgstr "Clear list of configuration files to read"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:141
-#, fuzzy
 msgid "Clear the list of RIS repositories to disable"
-msgstr "Clear list of configuration files to read"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:142
 msgid "Apply changes to all services"
@@ -65300,19 +61090,16 @@ msgid "Apply changes to all local services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:144
-#, fuzzy
 msgid "Apply changes to all remote services"
-msgstr "display the remote gem servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:145
-#, fuzzy
 msgid "Apply changes to services of specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:148
-#, fuzzy
 msgid "Refresh also repositories"
-msgstr "Refresh all repositories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:149
 #: /tmp/fish/implicit/share/completions/zypper.fish:165
@@ -65320,9 +61107,8 @@ msgstr "Refresh all repositories"
 #: /tmp/fish/implicit/share/completions/zypper.fish:190
 #: /tmp/fish/implicit/share/completions/zypper.fish:213
 #: /tmp/fish/implicit/share/completions/zypper.fish:276
-#, fuzzy
 msgid "Load only the specified repository"
-msgstr "Modify specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:150
 msgid ""
@@ -65337,9 +61123,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:152
 #: /tmp/fish/implicit/share/completions/zypper.fish:168
-#, fuzzy
 msgid "Select packages by capability"
-msgstr "List packages providing specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:153
 msgid ""
@@ -65371,9 +61156,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:194
 #: /tmp/fish/implicit/share/completions/zypper.fish:216
 #: /tmp/fish/implicit/share/completions/zypper.fish:278
-#, fuzzy
 msgid "Only download the packages, do not install"
-msgstr "Download the packages to the current directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:158
 msgid ""
@@ -65403,9 +61187,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:201
 #: /tmp/fish/implicit/share/completions/zypper.fish:219
 #: /tmp/fish/implicit/share/completions/zypper.fish:283
-#, fuzzy
 msgid "Install also recommended packages in addition to the required"
-msgstr "Install source packages and their build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:162
 #: /tmp/fish/implicit/share/completions/zypper.fish:174
@@ -65414,9 +61197,8 @@ msgid "Force the solver to find a solution (even an aggressive one)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:163
-#, fuzzy
 msgid "Select packages from the specified repository"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:164
 #: /tmp/fish/implicit/share/completions/zypper.fish:179
@@ -65436,14 +61218,12 @@ msgid "Type of package (package, patch, pattern, product). Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:170
-#, fuzzy
 msgid "Automatically remove unneeded dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:171
-#, fuzzy
 msgid "No automatic removal of unneeded dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:172
 msgid "Test the removal, do not actually remove"
@@ -65454,24 +61234,20 @@ msgid "Test the repair, do not actually do anything to the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:181
-#, fuzzy
 msgid "Install only build dependencies of specified packages"
-msgstr "list all packages depending on specified package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:182
-#, fuzzy
 msgid "Don't install build dependencies"
-msgstr "Don't pull in build time dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:183
-#, fuzzy
 msgid "Install packages only from specified repositories"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:184
-#, fuzzy
 msgid "Load only the specified repositories"
-msgstr "Modify specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:189
 msgid ""
@@ -65485,9 +61261,8 @@ msgid "Test the update, do not actually update"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:195
-#, fuzzy
 msgid "Skip interactive updates"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:198
 #: /tmp/fish/implicit/share/completions/zypper.fish:205
@@ -65497,59 +61272,50 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:203
-#, fuzzy
 msgid "List only updates from the specified repository"
-msgstr "Rename specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:204
-#, fuzzy
 msgid ""
 "List all packages for which newer versions are available, regardless whether "
 "they are installable or not"
-msgstr "List packages with newer versions available for upgrading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:206
-#, fuzzy
 msgid "List needed patches for Bugzilla issues"
-msgstr "List needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:207
-#, fuzzy
 msgid "List all patches in this category"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:208
-#, fuzzy
 msgid "List all patches, not only the needed ones"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:209
-#, fuzzy
 msgid "List only patches from the specified repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:210
 msgid "List patches issued up to the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:211
-#, fuzzy
 msgid "List needed patches for CVE issues"
-msgstr "List needed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:212
-#, fuzzy
 msgid "Look for issues matching the specified string"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:215
 msgid "Test the upgrade, do not actually upgrade"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:220
-#, fuzzy
 msgid "Restrict upgrade to specified repository"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:222
 msgid "Do not allow installed resolvables to be downgraded"
@@ -65584,9 +61350,8 @@ msgid "Allow installed resolvables to switch vendors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:230
-#, fuzzy
 msgid "Check for patches only in the specified repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:231
 msgid "Search also in package summaries and descriptions"
@@ -65597,126 +61362,107 @@ msgid "Perform case-sensitive search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:233
-#, fuzzy
 msgid "Show only packages that are already installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:234
-#, fuzzy
 msgid "Show only packages that are not currently installed"
-msgstr "Mark packages as manually installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:235
-#, fuzzy
 msgid "Search only for packages of the specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:236
-#, fuzzy
 msgid "Search only in the specified repository"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:237
 msgid "Show each available version in each repository on a separate line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:238
-#, fuzzy
 msgid "Sort packages by name (default)"
-msgstr "Print package name by prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:239
-#, fuzzy
 msgid "Sort packages by repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:240
 msgid "Search for a match with all search strings (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:241
-#, fuzzy
 msgid "Search for a match with any of the search strings"
-msgstr "Search for packages matching one of the patterns"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:242
 msgid "Search for a match to partial words (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:243
-#, fuzzy
 msgid "Search for a match to whole words only"
-msgstr "Search for packages matching a pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:244
-#, fuzzy
 msgid "Searches for an exact package name"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:245
-#, fuzzy
 msgid "Work only with the specified repository"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:247
 msgid "Show also requires and prerequires"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:248
-#, fuzzy
 msgid "Show also recommends"
-msgstr "Show all containers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:249
 #: /tmp/fish/implicit/share/completions/zypper.fish:250
 #: /tmp/fish/implicit/share/completions/zypper.fish:255
 #: /tmp/fish/implicit/share/completions/zypper.fish:258
-#, fuzzy
 msgid "Just another means to specify repository"
-msgstr "List patches in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:251
-#, fuzzy
 msgid "Show only installed packages"
-msgstr "Show manually installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:252
-#, fuzzy
 msgid "Show only packages which are not installed"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:253
-#, fuzzy
 msgid "Sort the list by package name"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:254
-#, fuzzy
 msgid "Sort the list by repository"
-msgstr "Lists the clients in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:256
-#, fuzzy
 msgid "Show only installed patterns"
-msgstr "Show manually installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:257
 msgid "Show only patterns which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:259
-#, fuzzy
 msgid "Show only installed products"
-msgstr "Show manually installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:260
 msgid "Show only products which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:261
-#, fuzzy
 msgid "Restrict the lock to the specified repository"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:262
 #: /tmp/fish/implicit/share/completions/zypper.fish:264
@@ -65724,76 +61470,64 @@ msgid "Type of package (package, patch, pattern, product).  Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:263
-#, fuzzy
 msgid "Remove only locks with specified repository"
-msgstr "Remove specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:265
-#, fuzzy
 msgid "Clean only duplicate locks"
-msgstr "Remove non-duplicate lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:266
 msgid "Clean only locks which doesn't lock anything"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:267
-#, fuzzy
 msgid "Takes missing release number as any release"
-msgstr "missing hexadecimal number in escape"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:268
 msgid "Show the operating system label"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:269
-#, fuzzy
 msgid "Clean only specified repositories"
-msgstr "Modify specified repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:270
-#, fuzzy
 msgid "Clean metadata cache"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:271
-#, fuzzy
 msgid "Clean raw metadata cache"
-msgstr "Clean local caches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:272
-#, fuzzy
 msgid "Clean both metadata and package caches"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:274
-#, fuzzy
 msgid "Install patch fixing the specified bugzilla issue"
-msgstr "Mount partition with specified label"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:275
-#, fuzzy
 msgid "Install all patches in this category"
-msgstr "Install a gem into the local repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:279
-#, fuzzy
 msgid "Install patch fixing the specified CVE issue"
-msgstr "list all packages with specified useflag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:280
 msgid "Install patches issued until the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:285
-#, fuzzy
 msgid "Skip interactive patches"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:286
-#, fuzzy
 msgid "Do not skip interactive patches"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:287
 msgid ""
@@ -65802,14 +61536,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:288
-#, fuzzy
 msgid "Delete extraneous source rpms in the local directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:289
-#, fuzzy
 msgid "Do not delete extraneous source rpms"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:290
 msgid ""
@@ -65826,18 +61558,16 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "End of command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
 msgstr "Return true if array contains a sequence"
 
 #: /tmp/fish/implicit/share/functions/dirh.fish:1
-#, fuzzy
 msgid "Print the current directory history (the prev and next lists)"
-msgstr "Print the current directory history (the back- and fwd- lists)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirs.fish:1
 msgid "Print directory stack"
@@ -65850,18 +61580,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/edit_command_buffer.fish:1
-#, fuzzy
 msgid "Edit the command buffer in an external editor"
-msgstr "Edit a property with an external editor."
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:1
 msgid "Alias for the gettext command"
 msgstr "Alias for the gettext command"
 
 #: /tmp/fish/implicit/share/functions/_.fish:2
-#, fuzzy
 msgid "Fallback alias for the gettext command"
-msgstr "Alias for the gettext command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_append.fish:1
 msgid "Internal completion function for appending string to the commandline"
@@ -65992,9 +61720,8 @@ msgid "Whether to inform the user that hash failures occur"
 msgstr "Whether to inform the user that hash failures occur"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_cd.fish:1
-#, fuzzy
 msgid "Completions for the cd command"
-msgstr "Alias for the gettext command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_command.fish:1
 msgid "Complete using all available commands"
@@ -66005,19 +61732,16 @@ msgid "Complete Convert options"
 msgstr "Complete Convert options"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
-#, fuzzy
 msgid "Complete directory prefixes"
-msgstr "Set directory prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:1
-#, fuzzy
 msgid "Complete ftp, pftp"
-msgstr "Complete lpr option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:2
-#, fuzzy
 msgid "Hostname"
-msgstr "name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:3
 msgid "Use only IPv4 to contact any host"
@@ -66048,9 +61772,8 @@ msgid "Disable command editing and history support"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:10
-#, fuzzy
 msgid "Disable file name globbing"
-msgstr "Disable file modification"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:11
 msgid "Do not explicitly bind data and control channels to same interface"
@@ -66061,32 +61784,28 @@ msgid "Verbose. Show all server responses and data transfer stats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:13
-#, fuzzy
 msgid "Enable debugging"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_groups.fish:1
 msgid "Print a list of local groups, with group members as the description"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_job_pids.fish:1
-#, fuzzy
 msgid "Print a list of job PIDs and their commands"
-msgstr "Print a list of documented fish commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:1
-#, fuzzy
 msgid "Complete lpr common options"
-msgstr "Complete lpr option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:2
 msgid "Forces encryption when connecting to the server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:3
-#, fuzzy
 msgid "Specifies an alternate username"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:4
 msgid "Specifies an alternate printer or class name"
@@ -66097,27 +61816,24 @@ msgid "Apply command to all printers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:7
-#, fuzzy
 msgid "Sets a job option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:8
 msgid "Send an email on job completion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:9
-#, fuzzy
 msgid "Landscape mode"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:10
 msgid "Media size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:11
-#, fuzzy
 msgid "Page ranges"
-msgstr "Pager"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:12
 msgid "Choose orientation (4-landscape)"
@@ -66140,14 +61856,12 @@ msgid "Scale image files to use up to number percent of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:17
-#, fuzzy
 msgid "Set the number of characters per inch to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:18
-#, fuzzy
 msgid "Set the number of lines per inch to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:19
 msgid "Set the page margins when printing text files"
@@ -66162,9 +61876,8 @@ msgid "Complete using path"
 msgstr "Complete using path"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:1
-#, fuzzy
 msgid "Complete pgrep/pkill"
-msgstr "Complete lpr option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:2
 msgid "Match pattern against full command line"
@@ -66181,14 +61894,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:5
-#, fuzzy
 msgid "Select only the newest process"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:6
-#, fuzzy
 msgid "Select only the oldest process"
-msgstr "Select the last NUMBER patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:7
 msgid "Only match processes whose parent process ID is listed"
@@ -66215,9 +61926,8 @@ msgid "Only match processes whose real user ID is listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:12
-#, fuzzy
 msgid "Negates the matching"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:13
 msgid ""
@@ -66238,9 +61948,8 @@ msgid "Complete by list of running processes"
 msgstr "Complete by list of running processes"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
-#, fuzzy
 msgid "common completions for ssh commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:2
 msgid "Protocol version 1 only"
@@ -66275,19 +61984,16 @@ msgid "Options"
 msgstr "Options"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_subcommand.fish:1
-#, fuzzy
 msgid "Complete subcommand"
-msgstr "Complete dd operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
-#, fuzzy
 msgid "Complete using files"
-msgstr "Complete using path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
-#, fuzzy
 msgid "Print list host-names with user@"
-msgstr "Print hostname and user for stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_users.fish:1
 msgid "Print a list of local users, with the real user name as a description"
@@ -66362,14 +62068,12 @@ msgid "Repaint screen when window changes size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_contains_opt.fish:1
-#, fuzzy
 msgid "Checks if a specific option has been given in the current commandline"
-msgstr "Test if adb has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#, fuzzy
 msgid "Obtain a list of installed packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_cursor_1337.fish:1
 msgid "Set cursor using OSC command 1337"
@@ -66384,19 +62088,16 @@ msgid "Set cursor (xterm)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_key_bindings.fish:1
-#, fuzzy
 msgid "Default (Emacs-like) key bindings for fish"
-msgstr "vi-like key bindings for fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_mode_prompt.fish:1
-#, fuzzy
 msgid "Display the default mode for the prompt"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_describe_command.fish:1
-#, fuzzy
 msgid "Command used to find descriptions for commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
 msgid "Helper function for fish_git_prompt"
@@ -66449,9 +62150,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_hg_prompt.fish:1
-#, fuzzy
 msgid "Write out the hg prompt"
-msgstr "Write out the git prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_hybrid_key_bindings.fish:1
 msgid "Vi-style bindings that inherit emacs-style bindings in all modes"
@@ -66462,9 +62162,8 @@ msgid "Test if no non-switch argument has been specified yet"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_git_repository.fish:1
-#, fuzzy
 msgid "Check if the current directory is a git repository"
-msgstr "Checks the consistency of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_token_n.fish:1
 msgid "Test if current token is on Nth place"
@@ -66489,14 +62188,12 @@ msgid "Make list of kill signals for completion"
 msgstr "Make list of kill signals for completion"
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:2
-#, fuzzy
 msgid "List names of available signals"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:3
-#, fuzzy
 msgid "List codes and names of available signals"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_mode_prompt.fish:1
 msgid "Displays the current mode"
@@ -66507,9 +62204,8 @@ msgid "Move the last element of a directory history from src to dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_no_arguments.fish:1
-#, fuzzy
 msgid "Internal fish function"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_not_contain_opt.fish:1
 msgid "Checks that a specific option is not in the current command line"
@@ -66532,9 +62228,8 @@ msgid "Complete using available character encodings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_filesystems.fish:1
-#, fuzzy
 msgid "Print a list of all known filesystem types"
-msgstr "Print a list of known network interfaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
 msgid "Print a list of local groups"
@@ -66545,9 +62240,8 @@ msgid "Print help message for the specified fish function or builtin"
 msgstr "Print help message for the specified fish function or builtin"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_hostnames.fish:1
-#, fuzzy
 msgid "Print a list of known hostnames"
-msgstr "Print a list of known network interfaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_interfaces.fish:1
 msgid "Print a list of known network interfaces"
@@ -66570,9 +62264,8 @@ msgid "Print the repositories configured for arch's pacman package manager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_service_names.fish:1
-#, fuzzy
 msgid "All services known to the system"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_svn_rev.fish:1
 msgid "Print svn revisions"
@@ -66620,9 +62313,8 @@ msgid "helper function that does pretty formatting on svn status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_svn_prompt.fish:2
-#, fuzzy
 msgid "Prompt function for svn"
-msgstr "Prompt function for Git"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_fish_systemctl.fish:1
 msgid "Call systemctl with some options from the current commandline"
@@ -66637,9 +62329,8 @@ msgid "Update man-page based completions"
 msgstr "Update man-page based completions"
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
-#, fuzzy
 msgid "Test if a non-switch argument has been given in the current commandline"
-msgstr "Test if vagrant has yet to be given the main command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_vcs_prompt.fish:1
 msgid "Print the prompts for all available vcsen"
@@ -66670,14 +62361,12 @@ msgid "display or manipulate interactive command history"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/hostname.fish:1
-#, fuzzy
 msgid "Show or set the system's host name"
-msgstr "Show or set the system's host name\r"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "Tests if a file descriptor is a tty"
-msgstr "Unspecified file descriptors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/la.fish:1
 msgid ""
@@ -66714,9 +62403,8 @@ msgid "Open file in default application"
 msgstr "Open file in default application"
 
 #: /tmp/fish/implicit/share/functions/popd.fish:1
-#, fuzzy
 msgid "Pop directory from the stack and cd to it"
-msgstr "Pop dir from stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/prevd.fish:1
 msgid "Move back in the directory history"
@@ -66739,14 +62427,12 @@ msgid "Push directory to stack"
 msgstr "Push directory to stack"
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:1
-#, fuzzy
 msgid "print the resolved path [command realpath]"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:2
-#, fuzzy
 msgid "print the resolved path [command grealpath]"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:3
 msgid "return an absolute path without symlinks"
@@ -66761,14 +62447,12 @@ msgid "Fallback implementation of the seq command"
 msgstr "Fallback implementation of the seq command"
 
 #: /tmp/fish/implicit/share/functions/setenv.fish:1
-#, fuzzy
 msgid "Set an env var for csh compatibility."
-msgstr "Set global variable. Alias for set -g, made for csh compatibility"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/suspend.fish:1
-#, fuzzy
 msgid "Suspend the current shell."
-msgstr "Displays the current mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__terlar_git_prompt.fish:1
 msgid "Write out the git prompt"
@@ -67199,7 +62883,6 @@ msgstr "Edit variable value"
 #~ msgid "%s: Expected one or two arguments, got %d\\n"
 #~ msgstr "%s: Expected one or two arguments, got %d\\n"
 
-#, fuzzy
 #~ msgid "Set global variable. Alias for set -g, made for bash compatibility"
 #~ msgstr "Set global variable. Alias for set -g, made for csh compatibility"
 
@@ -67319,55 +63002,42 @@ msgstr "Edit variable value"
 #~ msgstr ""
 #~ "Requested redirection to something that is not a file descriptor %ls"
 
-#, fuzzy
 #~ msgid "create an unversioned archive of a repository revision"
 #~ msgstr "Commit an unversioned file or tree into the repository"
 
-#, fuzzy
 #~ msgid "create a changegroup file"
 #~ msgstr "Read package from file"
 
-#, fuzzy
 #~ msgid "commit the specified files or all outstanding changes"
 #~ msgstr "Decrypt specified file or stdin"
 
-#, fuzzy
 #~ msgid "summarize working directory state"
 #~ msgstr "Print working directory"
 
-#, fuzzy
 #~ msgid "apply one or more changegroup files"
 #~ msgstr "Read package from file"
 
-#, fuzzy
 #~ msgid "update working directory (or switch revisions)"
 #~ msgstr "Change working directory"
 
-#, fuzzy
 #~ msgid "Configuration Files"
 #~ msgstr "Configuration file"
 
-#, fuzzy
 #~ msgid "Diff Formats"
 #~ msgstr "List format"
 
-#, fuzzy
 #~ msgid "Specifying File Sets"
 #~ msgstr "Specify config file"
 
-#, fuzzy
 #~ msgid "Configuring hgweb"
 #~ msgstr "Configuration file"
 
-#, fuzzy
 #~ msgid "Specifying Multiple Revisions"
 #~ msgstr "Specify revision"
 
-#, fuzzy
 #~ msgid "Specifying Single Revisions"
 #~ msgstr "Specify revision"
 
-#, fuzzy
 #~ msgid "[+]   exclude names matching the given patterns"
 #~ msgstr "List all modules matching the given wildcard"
 
@@ -67426,15 +63096,12 @@ msgstr "Edit variable value"
 #~ msgid "Tag the contents of the repository with a version name"
 #~ msgstr "Tag the contents of the repository with a version name"
 
-#, fuzzy
 #~ msgid "Gives a changelog-style summary of the repository history"
 #~ msgstr "Gives a changelog style summary of the repo history"
 
-#, fuzzy
 #~ msgid "Opposite of pull; unsafe if patch is not in remote repository"
 #~ msgstr "Opposite of pull; unsafe if the patch is not in remote repo"
 
-#, fuzzy
 #~ msgid "Use ARG as merge command"
 #~ msgstr "Specify merge command"
 
@@ -67444,7 +63111,6 @@ msgstr "Edit variable value"
 #~ msgid "Good bye\\n"
 #~ msgstr "Good bye\\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%sfunced%s "
 #~ "FUNCTION\\n"
diff --git a/po/fr.po b/po/fr.po
index 63accfb26..1d4368a09 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@
 # This file is distributed under the GNU General Public License, version 2 or later.
 # Xavier Douville <fish-fr@douville.org>, 2006, 2017.
 # David Guyot <david.guyot@europecamions-interactive.com>, 2017, 2018.
-# 
+#
 # Note aux traducteurs
 #
 # Les traductions qui suivent sont celles qui sont recommandées ; il ne s’agit pas d’un commandement, mais
@@ -1170,22 +1170,19 @@ msgid "Unable to open shared memory with path '%s': %s"
 msgstr "Impossible d’ouvrir la mémoire partagée avec le chemin '%s': %s"
 
 #: src/env_universal_common.cpp:980
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to fstat shared memory object with path '%s': %s"
 msgstr ""
-"Impossible d’utiliser fstat sur la mémoire partagée de l’objet avec le "
-"chemin '%s': %s"
 
 #: src/env_universal_common.cpp:991
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to truncate shared memory object with path '%s': %s"
-msgstr "Impossible de tronquer la mémoire partagée avec le chemin '%s': %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:1001
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to memory map shared memory object with path '%s': %s"
 msgstr ""
-"Impossible de mapper en mémoire partagée l’objet avec le chemin '%s': %s"
 
 #: src/env_universal_common.cpp:1396
 #, c-format
@@ -1321,9 +1318,9 @@ msgid "%s, version %s\n"
 msgstr "%s, version %s\n"
 
 #: src/fish.cpp:316 src/fish_indent.cpp:434
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag"
-msgstr "Valeur '%s' invalide pour l’option debug-stack-frames"
+msgstr ""
 
 #: src/fish.cpp:366
 msgid "Can not use the no-execute mode when running an interactive session"
@@ -1390,11 +1387,9 @@ msgstr ""
 "retour à la valeur par défaut `%ls`."
 
 #: src/io.cpp:57
-#, fuzzy, c-format
+#, c-format
 msgid "An error occured while reading output from code block on fd %d"
 msgstr ""
-"Une erreur est survenue lors de la lecture de la sortie du bloc de code sur "
-"le descripteur de fichier %d"
 
 #: src/output.cpp:559
 #, c-format
@@ -1480,9 +1475,8 @@ msgid "function invocation block"
 msgstr "bloc d’invocation de fonction"
 
 #: src/parser.cpp:48
-#, fuzzy
 msgid "function invocation block with no variable shadowing"
-msgstr "bloc d’invocation de fonction sans camouflage des variables"
+msgstr ""
 
 #: src/parser.cpp:51
 msgid "'switch' block"
@@ -2444,9 +2438,8 @@ msgid "Uninstall a gem from the local repository"
 msgstr "Désinstaller une gemme du dépôt courant"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:16
-#, fuzzy
 msgid "Unpack an installed gem to the current directory"
-msgstr "Déballer une gemme installée dans le répertoire courant"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:17
 msgid "Update the named gem (or all installed gems) in the local repository"
@@ -2483,9 +2476,8 @@ msgid "Disables an existing service"
 msgstr "Désactiver un service existant"
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:5
-#, fuzzy
 msgid "Removes the specified service name from the service cache"
-msgstr "Supprimer le service spécifié du cache service"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:6
 msgid "Forces an existing service to start"
@@ -2846,9 +2838,8 @@ msgid "Convert 0.90 metadata to 1.0"
 msgstr "Convertir les métadonnées 0.90 au format 1.0"
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:57
-#, fuzzy
 msgid "Reset preferred minor to current one"
-msgstr "Réinitialiser le mineur favori pour utiliser l’actuel"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:58
 msgid "Abort currently running actions"
@@ -2873,9 +2864,8 @@ msgstr "Paramètres régionaux"
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:1
 #: /tmp/fish/explicit/share/completions/telnet.fish:6
-#, fuzzy
 msgid "Specifies an 8-bit data path"
-msgstr "Spécifier un chemin de données 8-bit"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:2
 msgid "Do not try to negotiate TELNET BINARY option"
@@ -2918,9 +2908,8 @@ msgid "User login"
 msgstr "Identifiant utilisateur"
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:13
-#, fuzzy
 msgid "Log to tracefile"
-msgstr "Journaliser dans un fichier de trace"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:14
 msgid "Turn on encryption"
@@ -4041,9 +4030,8 @@ msgstr "Contenu de l’archive"
 
 #: /tmp/fish/implicit/share/completions/accept.fish:1
 #: /tmp/fish/implicit/share/completions/cupsaccept.fish:1
-#, fuzzy
 msgid "Accept reason"
-msgstr "Raison de l’acception"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:1
 #: /tmp/fish/implicit/share/completions/grep.fish:23
@@ -4219,9 +4207,8 @@ msgid "Sort the found files lexically"
 msgstr "Trier les fichiers correspondants par ordre lexicographique"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:43
-#, fuzzy
 msgid "Show which types each file has"
-msgstr "Afficher quels types chaque fichier possède"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:44
 msgid "Read the list of files to search from file"
@@ -4272,9 +4259,8 @@ msgid "Include only recognized files"
 msgstr "N’inclure que les fichiers reconnus"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:54
-#, fuzzy
 msgid "Include only X files"
-msgstr "N’inclure que X fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:55
 msgid "Replaces definition of type"
@@ -4537,9 +4523,8 @@ msgid "Output version information and exit"
 msgstr "Afficher les informations de version et quitter"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:1
-#, fuzzy
 msgid "Test if adb has yet to be given the subcommand"
-msgstr "Tester si adb doit encore se faire donner la sous-commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:2
 msgid "Run adb devices and parse output"
@@ -4690,9 +4675,8 @@ msgid "Run PPP over USB"
 msgstr "Exécuter PPP sur USB"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:38
-#, fuzzy
 msgid "Sideloads the given package"
-msgstr "Supprime les paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:39
 msgid "Kick current connection from host side and make it reconnect."
@@ -4728,9 +4712,8 @@ msgid "Keep the data and cache directories"
 msgstr "Conserver les dossiers de données et de cache"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:47
-#, fuzzy
 msgid "Also list device qualifiers"
-msgstr "Lister également les qualificateurs de périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:48
 msgid "Device to disconnect"
@@ -4786,9 +4769,8 @@ msgid "Package(s) to backup"
 msgstr "Paquet(s) à sauvegarder"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "Lister ou enlever des fonctions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4799,9 +4781,8 @@ msgid "Remove a specific forward socket connection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:63
-#, fuzzy
 msgid "Remove all forward socket connections"
-msgstr "Supprimer toutes les connexions sur socket de redirection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:64
 msgid "Kick current connection from device side and make it reconnect."
@@ -5373,9 +5354,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:50
 #: /tmp/fish/implicit/share/completions/montage.fish:40
 #: /tmp/fish/implicit/share/completions/stream.fish:14
-#, fuzzy
 msgid "Monitor progress "
-msgstr "Surveiller l'info sur l'état"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:28
 msgid "Seconds to pause before reanimating"
@@ -5823,9 +5803,8 @@ msgid "Print URL instead of opening"
 msgstr "Afficher l’URL au lieu de l’ouvrir"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:20
-#, fuzzy
 msgid "Output featured packages as JSON array"
-msgstr "Afficher les paquets inclus comme un tableau JSON"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:21
 #: /tmp/fish/implicit/share/completions/apm.fish:45
@@ -5840,9 +5819,8 @@ msgstr ""
 "spécifiée d’Atom"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:23
-#, fuzzy
 msgid "Generates code scaffolding for theme or package"
-msgstr "Reconstruire et installer un paquet installé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:24
 msgid "Path to the package or theme template"
@@ -5907,9 +5885,8 @@ msgid "Link to ~/.atom/dev/packages"
 msgstr "Lien vers ~/.atom/dev/packages"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:39
-#, fuzzy
 msgid "List all installed and bundled packages"
-msgstr "Réinstaller les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:40
 msgid "Print packages one per line with no formatting"
@@ -5920,9 +5897,8 @@ msgid "Include dev packages"
 msgstr "Inclure les paquets de développement"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:42
-#, fuzzy
 msgid "Only list installed packages/themes"
-msgstr "Reconstruire et installer un paquet installé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:43
 msgid "Output all packages as a JSON object"
@@ -5961,9 +5937,8 @@ msgid "List but don't install the outdated packages"
 msgstr "Lister les paquets obsolètes sans les installer"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:55
-#, fuzzy
 msgid "Publish new version of package in current working directory"
-msgstr "Changer le répertoire de travail"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:56
 msgid "Semantic version category for new version"
@@ -5986,23 +5961,20 @@ msgid "Rebuild module cache for installed packages"
 msgstr "Reconstruire le cache des modules pour les paquets installés"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:61
-#, fuzzy
 msgid "Search for Atom packages/themes in the atom.io registry"
-msgstr "Cherche les paquet contenant le motif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:62
 msgid "Output matching packages as JSON array"
 msgstr "Afficher les paquets correspondants comme un tableau JSON"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:63
-#, fuzzy
 msgid "Search only non-theme packages"
-msgstr "Installer un ou des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:64
-#, fuzzy
 msgid "Search only themes"
-msgstr "Rechercher un autre système"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:65
 msgid "View information about package/theme in the atom.io registry"
@@ -6022,32 +5994,28 @@ msgid "Star the given packages on https://atom.io"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:69
-#, fuzzy
 msgid "Star all packages in ~/.atom/packages"
-msgstr "Chercher le nom complet de paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:70
-#, fuzzy
 msgid "List or install starred Atom packages and themes"
-msgstr "Lister les paquets source installés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:71
 msgid "Output packages as JSON array"
 msgstr "Afficher tous les paquets comme un tableau JSON"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:72
-#, fuzzy
 msgid "Install the starred packages"
-msgstr "Installer des paquets source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:74
 msgid "GitHub username to show starred packages for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:75
-#, fuzzy
 msgid "Runs the package's tests contained within the spec directory"
-msgstr "Télécharger le paquet dans le répertoire courant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
 msgid "Path to atom command"
@@ -6663,9 +6631,8 @@ msgid "Perform contents generation"
 msgstr "Générer le contenu"
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:12
-#, fuzzy
 msgid "Use source override"
-msgstr "Outrepasser la source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:13
 msgid "Make caching db readonly"
@@ -6856,11 +6823,8 @@ msgid "Test if aptitude has yet to be given the subcommand"
 msgstr "Vérifier si apt doit se faire donner la sous-commande"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:2
-#, fuzzy
 msgid "Test if aptitude command should have packages as potential completion"
 msgstr ""
-"Tester si la commande apt devrait avoir les paquets comme complétion "
-"potentielle"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:4
 msgid "Display a brief help message. Identical to the help action"
@@ -7221,9 +7185,8 @@ msgid "Alias for 'get'"
 msgstr "Alias pour 'get'"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:3
-#, fuzzy
 msgid "Move packages to local tree"
-msgstr "Déplacer les paquets vers l’arbre local"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:4
 msgid "Delete obsolete package files"
@@ -7470,9 +7433,8 @@ msgid "Custom URL to get mirror list"
 msgstr "URL pour obtenir la liste des miroirs"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:14
-#, fuzzy
 msgid "Write top servers to file"
-msgstr "Écrire les meilleurs serveurs dans un fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:15
 msgid "Number of top servers"
@@ -7626,14 +7588,12 @@ msgid "Specify which libraies to load"
 msgstr "Spécifier les bibliothèques à charger"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:6
-#, fuzzy
 msgid "Specify the Conduit URI"
-msgstr "Spécifier l’URI Conduit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:7
-#, fuzzy
 msgid "Specify the Conduit token"
-msgstr "Spécifier le jeton Conduit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:8
 msgid "Force a version"
@@ -7648,9 +7608,8 @@ msgid "Sets a config"
 msgstr "Paramétrer une configuration"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:11
-#, fuzzy
 msgid "Skip the working copy configuration file"
-msgstr "Passer la copie fonctionnelle du fichier de configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:12
 msgid "Use provided file instead of ~/.arcrc"
@@ -7665,9 +7624,8 @@ msgid "Current term in the argument list being completed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:15
-#, fuzzy
 msgid "Reads an arc configuration option"
-msgstr "Lit une option de configuration arc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
 msgid "Show detailed information about options"
@@ -7711,9 +7669,8 @@ msgid "Never apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:26
-#, fuzzy
 msgid "Lint changes since a specific revision"
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:27
 msgid "Output the linter results to a file"
@@ -7729,9 +7686,8 @@ msgid "When linting git repositories, amend HEAD with all patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:30
-#, fuzzy
 msgid "Lint all files in the project"
-msgstr "Traiter tous les fichiers comme du texte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:31
 msgid "Specify how results will be displayed"
@@ -7767,9 +7723,8 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "Définir la couleur du terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
 msgid "Export the local changeset to a file"
@@ -7797,9 +7752,8 @@ msgid "Export from Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:46
-#, fuzzy
 msgid "Export from a Differential revision"
-msgstr "Fusionner les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:47
 msgid "Open a file or object in your web browser"
@@ -7834,9 +7788,8 @@ msgid "what they do and which versions are installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:55
-#, fuzzy
 msgid "Search for linters"
-msgstr "Rechercher un autre système"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:56
 msgid "Show detailed information, including options"
@@ -7928,18 +7881,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:78
 #: /tmp/fish/implicit/share/completions/arc.fish:86
-#, fuzzy
 msgid "Use the message from a specific revision"
-msgstr "Lire le journal depuis le fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:79
 msgid "Show which commits will be selected"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:80
-#, fuzzy
 msgid "Print base commit only and exit"
-msgstr "Afficher l'historique d'un module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:81
 #: /tmp/fish/implicit/share/completions/arc.fish:173
@@ -7947,9 +7898,8 @@ msgid "Additional rules for determining base revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:82
-#, fuzzy
 msgid "Specify the end of the commit range to select"
-msgstr "Spécifier le titre du rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:83
 msgid "Show committed and abandoned revisions"
@@ -7957,34 +7907,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:84
 #: /tmp/fish/implicit/share/completions/arc.fish:114
-#, fuzzy
 msgid "Alias for arc feature"
-msgstr "Alias pour atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "Changer le répertoire de travail"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
-#, fuzzy
 msgid "Show the amended commit message"
-msgstr "Afficher le temps"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:88
-#, fuzzy
 msgid "Upgrade arcanist and libphutil to the latest versions"
-msgstr "Afficher tous les paquets source avec version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:89
-#, fuzzy
 msgid "Shows the help"
-msgstr "Afficher le temps"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "Afficher l'état des fichiers extraits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
@@ -7999,37 +7943,32 @@ msgid "Output in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:94
-#, fuzzy
 msgid "Title for the paste"
-msgstr "Rechercher un autre système"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:95
 msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "Changer le répertoire de travail"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
-#, fuzzy
 msgid "Do not run any sanity checks"
-msgstr "Ne pas lancer de mise à jour"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:101
-#, fuzzy
 msgid "Do not commit the changes"
-msgstr "Ne pas modifier aucun fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:102
 msgid "Update the local working copy before applying the patch"
@@ -8044,18 +7983,16 @@ msgid "Apply changes from an arc bundlej"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:105
-#, fuzzy
 msgid "Do not apply dependencies"
-msgstr "Afficher les dépendances de construction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:106
 msgid "Apply changes from a Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:107
-#, fuzzy
 msgid "Do not create a branch"
-msgstr "Ne pas développer le motif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:108
 msgid "Apply changes from a Differential revision"
@@ -8090,14 +8027,12 @@ msgid "Show blame for the lines you changed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:117
-#, fuzzy
 msgid "Cover changes since a specific revision"
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:118
-#, fuzzy
 msgid "Close a revision"
-msgstr "Déverrouiller une révision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:119
 msgid "Do not print a success message"
@@ -8165,9 +8100,8 @@ msgid "Record a copy of the test results on the specified build target"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:135
-#, fuzzy
 msgid "Use uglier formatting"
-msgstr "Utiliser le format unifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:136
 msgid "Run unit tests covering changes since a specific revision"
@@ -8191,9 +8125,8 @@ msgid "Always disable coverage information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "Exécuter la commande si la précédente a échoué"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8220,9 +8153,8 @@ msgid "When creating a revision, add reviewers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:149
-#, fuzzy
 msgid "Do not copy changes to the staging area"
-msgstr "Ne pas modifier aucun fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:150
 msgid "Read diff from stdin"
@@ -8237,9 +8169,8 @@ msgid "Read revision information from file"
 msgstr "Lire l’information de révision depuis le fichier"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:153
-#, fuzzy
 msgid "Do not run lint"
-msgstr "Ne pas lancer de mise à jour"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:154
 msgid "Use the specified message when updating a revision"
@@ -8258,9 +8189,8 @@ msgid "Always create a new revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:158
-#, fuzzy
 msgid "Disable lint cache"
-msgstr "Construire la cache apt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:159
 msgid "Read revision information from a specific commit"
@@ -8283,9 +8213,8 @@ msgid "Apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:165
-#, fuzzy
 msgid "Specify the end of the commit range"
-msgstr "Spécifier le titre du rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:166
 msgid "When creating a revision, try to use the working copy commit"
@@ -8332,23 +8261,20 @@ msgid "Do not run unit tests"
 msgstr "Ne pas lancer les tests unitaires"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:179
-#, fuzzy
 msgid "Raise all lint warnings"
-msgstr "Désactiver le téléchargement de paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:181
 msgid "Only run lint and unit tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:182
-#, fuzzy
 msgid "Skip checks for untracked files in the working copy"
-msgstr "Changer le répertoire de travail"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:183
-#, fuzzy
 msgid "Display only new lint messages"
-msgstr "Afficher la page de manuel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:185
 msgid "Create or update a libphutil library"
@@ -8439,9 +8365,8 @@ msgid "Include macro expansions"
 msgstr "Inclure l’expansion des macros"
 
 #: /tmp/fish/implicit/share/completions/as.fish:7
-#, fuzzy
 msgid "Omit forms processing"
-msgstr "Afficher le processus de connexion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:8
 msgid "Include symbols"
@@ -8517,9 +8442,8 @@ msgstr ""
 "Générer les noms de section par fonction pour les informations de ligne DWARF"
 
 #: /tmp/fish/implicit/share/completions/as.fish:26
-#, fuzzy
 msgid "Set the hash table size close"
-msgstr "Paramétrer la taille du papier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
 msgid "Show help message and exit"
@@ -8554,9 +8478,8 @@ msgid "Write dependency information in given file"
 msgstr "Écrire les informations de dépendance dans le fichier spécifié"
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
-#, fuzzy
 msgid "Do not pad the end of sections to alignment boundaries"
-msgstr "Ne pas aligner la fin des sections sur les limites d’alignement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:36
 msgid "Set object-file output file name"
@@ -8697,9 +8620,8 @@ msgid "Strip all lock prefixes"
 msgstr "Retirer tous les verrous de préfixe"
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "Générer des déménagements lâches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -8714,9 +8636,8 @@ msgid "Optimize for given CPU"
 msgstr "Optimiser pour le processeur spécifié"
 
 #: /tmp/fish/implicit/share/completions/asp.fish:1
-#, fuzzy
 msgid "Checkout package"
-msgstr "Récupérer les paquets sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:2
 msgid "Show the full history of the target, with file diffs"
@@ -8819,9 +8740,8 @@ msgid "Print the jobs listed"
 msgstr "Afficher les travaux listés"
 
 #: /tmp/fish/implicit/share/completions/atom.fish:1
-#, fuzzy
 msgid "Run in development mode."
-msgstr "Exécuter en mode fictif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:2
 msgid "Keep the browser process in the foreground."
@@ -8840,9 +8760,8 @@ msgid "Open a new window."
 msgstr "Ouvrir une nouvelle fenêtre"
 
 #: /tmp/fish/implicit/share/completions/atom.fish:6
-#, fuzzy
 msgid "Create a profile of the startup execution time."
-msgstr "Profiler le démarrage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:7
 msgid "Set the path to the Atom source directory and enable dev-mode."
@@ -8990,9 +8909,8 @@ msgid "load configuration defaults from file"
 msgstr "charger la configuration par défaut depuis un fichier"
 
 #: /tmp/fish/implicit/share/completions/aura.fish:1
-#, fuzzy
 msgid "Synchronize AUR packages"
-msgstr "Afficher les paquets mis à niveau"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:2
 msgid "Save and restore package state"
@@ -9017,9 +8935,8 @@ msgid "Pacman log actions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:6
-#, fuzzy
 msgid "Build packages from ABS"
-msgstr "Lire le paquet depuis un fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:7
 msgid "Operate on orphan packages"
@@ -9307,9 +9224,8 @@ msgid "Search AUR by string matching"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:55
-#, fuzzy
 msgid "Upgrade all installed AUR packages"
-msgstr "Mettre à niveau ou installer les plus nouveaux paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:56
 msgid "Download the source tarball"
@@ -9398,9 +9314,8 @@ msgid "Download fresh copy of the package list"
 msgstr "Téléchargement une copie fraîche de la liste des paquets"
 
 #: /tmp/fish/implicit/share/completions/aura.fish:77
-#, fuzzy
 msgid "Sync the given to local ABS tree"
-msgstr "Déplacer les paquets dans l'arbre local"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:79
 msgid "Uninstall orphan packages"
@@ -9619,9 +9534,8 @@ msgstr ""
 "mesure de leur vérification"
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:11
-#, fuzzy
 msgid "Use write-mode test"
-msgstr "Tester en mode écriture"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:12
 msgid "Internal flag only to be used by e2fsck(8) and mke2fs(8)"
@@ -10404,9 +10318,8 @@ msgstr "Utiliser l’index rubygems moderne au lieu de l’API"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:24
 #: /tmp/fish/implicit/share/completions/bundle.fish:89
-#, fuzzy
 msgid "Do not remove stale gems from the cache"
-msgstr "Ne pas supprimer les gemmes partielles du cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:25
 msgid "Do not allow the Gemfile.lock to be updated after this install"
@@ -10458,9 +10371,8 @@ msgid "Binstub destination directory (default bin)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:36
-#, fuzzy
 msgid "Overwrite existing binstubs if they exist"
-msgstr "Outrepasser les binstubs le cas échéant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:37
 #: /tmp/fish/implicit/share/completions/bundle.fish:43
@@ -10567,9 +10479,8 @@ msgid "Check for newer pre-release gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:66
-#, fuzzy
 msgid "Check against a specific source"
-msgstr "Comparer à une source spécifique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:67
 msgid "Use cached gems instead of attempting to fetch gems remotely"
@@ -10912,9 +10823,8 @@ msgstr ""
 "celles d’une branche"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:40
-#, fuzzy
 msgid "Show base revision text in conflicts"
-msgstr "Afficher la dernière révision où chaque ligne a été modifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:41
 msgid "Instead of merging, show a diff of the merge"
@@ -10961,16 +10871,12 @@ msgid "Description of the new revision"
 msgstr "Description de la nouvelle révision"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:51
-#, fuzzy
 msgid "Set the author's name, if it's different from the commiter"
-msgstr "Paramétrer le nom de l’auteur, s’il diffère du validateur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:52
-#, fuzzy
 msgid "Manually set a commit time using commit date format"
 msgstr ""
-"Paramétrer manuellement une date de validation en utilisant le format de "
-"date de validation"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:53
 msgid "Commit even if nothing has changed"
@@ -11040,24 +10946,20 @@ msgid "Show history of changes"
 msgstr "Afficher l’historique des modifications"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:67
-#, fuzzy
 msgid "Validate storage"
-msgstr "Valider le stockage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:68
-#, fuzzy
 msgid "Check the working tree related to the current directory"
-msgstr "Vérifier la copie de travail relativement au dossier courant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:69
-#, fuzzy
 msgid "Check the repository related to the current directory"
-msgstr "Vérifier le dépôt relativement au dossier courant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:70
-#, fuzzy
 msgid "Check the branch related to the current directory"
-msgstr "Vérifier la branche relativement au dossier courant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:71
 msgid "Show usage message and options"
@@ -11221,9 +11123,8 @@ msgid "Show Help"
 msgstr "Afficher l’aide"
 
 #: /tmp/fish/implicit/share/completions/canto.fish:3
-#, fuzzy
 msgid "Update before running"
-msgstr "Mettre à jour avant de s’exécuter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:4
 msgid "List feeds"
@@ -11400,9 +11301,8 @@ msgid "List all files in directories recursively"
 msgstr "Lister le contenu des dossiers récursivement"
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:16
-#, fuzzy
 msgid "Set at which the volume changes"
-msgstr "Patcher les changements locaux"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:17
 msgid "Specify port to be used for serving local file"
@@ -11599,13 +11499,10 @@ msgid "Set driver specific options"
 msgstr "Paramétrer les options spécifiques au pilote"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
-#, fuzzy
 msgid ""
 "Set the driveropts specified by driveropts=option list, the speed of the "
 "drive and the dummy flag and exit"
 msgstr ""
-"Paramétrer les options du lecteur spécifiées par la liste driveopts=…, la "
-"vitesse du lecteur et le sémaphore inutile, puis quitter"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:39
 msgid "Checks if a driver for the current drive is present and exit"
@@ -12086,9 +11983,8 @@ msgid "Reset local repo to match remote"
 msgstr "Réinitialiser le dépôt local avec une copie distante"
 
 #: /tmp/fish/implicit/share/completions/climate.fish:42
-#, fuzzy
 msgid "Seset local repo to match remote"
-msgstr "Réinitialiser le dépôt local avec une copie distante"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:43
 msgid "List all branches"
@@ -12439,9 +12335,8 @@ msgstr "Diagnostiquer le système pour identifier les erreurs courantes"
 
 #: /tmp/fish/implicit/share/completions/composer.fish:11
 #: /tmp/fish/implicit/share/completions/composer.fish:12
-#, fuzzy
 msgid "Dumps the autoloader"
-msgstr "Mettre à jour le référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:13
 #, sh-format
@@ -12475,9 +12370,8 @@ msgid "Lists commands"
 msgstr "Lister les commandes"
 
 #: /tmp/fish/implicit/share/completions/composer.fish:20
-#, fuzzy
 msgid "Removes a package from the require or require-dev"
-msgstr "Supprimer un paquet des listes require ou require-dev"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:21
 msgid "Adds required packages to your composer.json and installs them"
@@ -12807,9 +12701,8 @@ msgid "Shows if the system is online or offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:2
-#, fuzzy
 msgid "Display technologies"
-msgstr "Afficher les technologies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:3
 msgid "Get System Clock Properties"
@@ -13310,9 +13203,8 @@ msgid "Do not execute anything that will change the disk."
 msgstr "Ne rien exécuter qui puisse modifier le disque"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:7
-#, fuzzy
 msgid "Show trace of program execution -- try with -n."
-msgstr "Afficher la pile d’exécution -- essayez avec -n"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:8
 msgid "Assume repository is read-only, such as CDROM"
@@ -13427,9 +13319,8 @@ msgid "List files available from CVS"
 msgstr "Lister les fichiers disponibles depuis CVS"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:37
-#, fuzzy
 msgid "Password server mode"
-msgstr "Mode serveur de mots de passe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:38
 msgid "Show last revision where each line of module was modified"
@@ -13525,9 +13416,8 @@ msgid "Run interactively."
 msgstr "Exécuter interactivement"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
-#, fuzzy
 msgid "Set keyword substitution mode:"
-msgstr "Définir la substitution de mots-clés par défaut"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:62
 msgid "[rev]    Lock revision (latest revision on branch,"
@@ -13719,9 +13609,8 @@ msgstr "Valider dans cette branche ou révision principale"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:104
 #: /tmp/fish/implicit/share/completions/cvs.fish:218
-#, fuzzy
 msgid "Specify keyword expansion mode."
-msgstr "Spécifier le type d'enregistrement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:105
 msgid "Diff revision for date against working file."
@@ -13764,9 +13653,8 @@ msgid "Binary  Read and write data in binary mode."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:115
-#, fuzzy
 msgid "--text  Treat all files as text."
-msgstr "Traiter tous les fichiers comme du texte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:116
 msgid ""
@@ -13787,23 +13675,20 @@ msgid "--label LABEL  Use LABEL instead of file name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:120
-#, fuzzy
 msgid "--show-c-function  Show which C function each change is in."
-msgstr "Identifier la fonction C contenant chaque changement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:121
 msgid "--show-function-line=RE  Show the most recent line matching RE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:122
-#, fuzzy
 msgid "Brief  Output only whether files differ."
-msgstr "Rapporter seulement si les fichiers diffèrent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:123
-#, fuzzy
 msgid "--ed  Output an ed script."
-msgstr "Faire de la sortie un script ed valide"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:124
 msgid "--forward-ed  Output something like an ed script in forward order."
@@ -13844,18 +13729,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:134
-#, fuzzy
 msgid "--expand-tabs  Expand tabs to spaces in output."
-msgstr "Remplacer les tabs par des espaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:135
 msgid "--initial-tab  Make tabs line up by prepending a tab."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:136
-#, fuzzy
 msgid "--new-file  Treat absent files as empty."
-msgstr "Traiter tous les fichiers comme du texte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:137
 msgid "--report-identical-files  Report when two files are the same."
@@ -13913,9 +13796,8 @@ msgid "Export tagged revisions."
 msgstr "Exporter les révisions étiquetées"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:154
-#, fuzzy
 msgid "Export revisions as of date."
-msgstr "Exporter les révisions à ce jour"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:155
 msgid "Export into dir instead of module name."
@@ -13926,9 +13808,8 @@ msgid "Use RCS kopt -k option on checkout."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:157
-#, fuzzy
 msgid "Produce report on all TAGs"
-msgstr "Faire un rapport sur toutes les étiquettes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:158
 msgid "Committed (Modified) files"
@@ -14005,16 +13886,12 @@ msgstr ""
 "Utiliser l’horodatage de modification du fichier comme le moment de l’import"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:176
-#, fuzzy
 msgid "When importing new files, mark their trunk revisions as dead."
 msgstr ""
-"Lors de l’import de nouveaux fichiers, marquer leurs révisions trunk comme "
-"inactives"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:177
-#, fuzzy
 msgid "Set default RCS keyword substitution mode."
-msgstr "Définir la substitution de mots-clés par défaut"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:178
 #: /tmp/fish/implicit/share/completions/cvs.fish:284
@@ -14136,9 +14013,8 @@ msgid "Context diffs (default)"
 msgstr "Diffs contextuels (par défaut)"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:214
-#, fuzzy
 msgid "Unidiff format."
-msgstr "Utiliser le format unifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:215
 msgid "Short patch - one liner per file."
@@ -14165,9 +14041,8 @@ msgid "Delete the given directory."
 msgstr "Supprimer le dossier spécifié"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
-#, fuzzy
 msgid "Delete the file before removing it."
-msgstr "Supprimer le fichier avant de le détruire"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:245
 msgid "Clear tag from removed files that would not otherwise be tagged."
@@ -14231,19 +14106,16 @@ msgid "Build directories, like checkout does."
 msgstr "Construire les dossiers, comme le fait checkout"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:279
-#, fuzzy
 msgid "Send updates to standard output (avoids stickiness)."
-msgstr "Envoyer les mises à jour sur la sortie standar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:281
-#, fuzzy
 msgid "Update using specified revision/tag (is sticky)."
-msgstr "Mettre à jour en utilisant la révision ou l’étiquette spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:282
-#, fuzzy
 msgid "Set date to update from (is sticky)."
-msgstr "Paramétrer la date à mettre à jour"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:288
 msgid "Specify what actions, one of: "
@@ -14457,9 +14329,8 @@ msgid "Send by email a bundle of one or more patches"
 msgstr "Envoyer par email un lot d’un ou plusieurs patchs"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:403
-#, fuzzy
 msgid "Path to a version-controlled boring file"
-msgstr "Chemin vers le fichier des binaires versionnés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:404
 msgid "Path to a version-controlled binaries file"
@@ -15111,9 +14982,8 @@ msgstr "Désactiver le pipelining HTTP"
 #: /tmp/fish/implicit/share/completions/darcs.fish:870
 #: /tmp/fish/implicit/share/completions/darcs.fish:905
 #: /tmp/fish/implicit/share/completions/darcs.fish:1023
-#, fuzzy
 msgid "Don't use patch caches"
-msgstr "Ne pas utiliser les caches de patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:480
 #: /tmp/fish/implicit/share/completions/darcs.fish:610
@@ -15396,9 +15266,8 @@ msgid "Specify output filename"
 msgstr "Spécifier le nom du fichier de sortie"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:763
-#, fuzzy
 msgid "Edit the patch bundle description"
-msgstr "Redirige vers un descripteur de fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:767
 #: /tmp/fish/implicit/share/completions/darcs.fish:827
@@ -15525,9 +15394,8 @@ msgid "Reorder the patches in the repository"
 msgstr "Ré-ordonner les patchs dans le dossier"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:938
-#, fuzzy
 msgid "Specify a sibling directory"
-msgstr "Spécifier un répertoire frère"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
@@ -15718,9 +15586,8 @@ msgstr ""
 "Utiliser le dernier bail, même expiré, si un nouveau ne peut être obtenu"
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "Supprimer la variable de l’environnement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
 msgid "Reapply configuration for each interface"
@@ -16534,18 +16401,16 @@ msgid "Use current default ("
 msgstr "Utiliser le réglage actuel ("
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:6
-#, fuzzy
 msgid "Show only unseen question"
-msgstr "N’afficher que les questions pour novices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:7
 msgid "Reconfigure also inconsistent packages"
 msgstr "Également reconfigurer les paquets incohérents"
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:8
-#, fuzzy
 msgid "Prevent reloading templates"
-msgstr "Empêcher le rechargement des patrons"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:1
 msgid "Get current status of the dropboxd"
@@ -16835,9 +16700,8 @@ msgid "Don't read unguessable slots of installed packages (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:7
-#, fuzzy
 msgid "Always read slots of installed packages"
-msgstr "Reconstruire et installer un paquet installé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:8
 msgid "(no) output (toggle)"
@@ -16908,9 +16772,8 @@ msgid "Match packages without best slotted version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:25
-#, fuzzy
 msgid "Match packages from overlays"
-msgstr "Récupérer le paquet de STDIN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:26
 msgid "Match packages with obsolete entries"
@@ -17150,9 +17013,8 @@ msgid "load neither ~/.emacs nor default.el"
 msgstr "Ne charger ni ~/.emacs ni default.el"
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:8
-#, fuzzy
 msgid "do not load loadup.el into bare Emacs"
-msgstr "Ne pas charger loadup.el de manière brute dans Emacs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:9
 msgid "do not load site-start.el"
@@ -17635,19 +17497,16 @@ msgid "Remove variable from the environment"
 msgstr "Supprimer la variable de l’environnement"
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:1
-#, fuzzy
 msgid "Print list of components"
-msgstr "Afficher le nombre de paquets compressés en entrée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:2
-#, fuzzy
 msgid "Print list of repositories"
-msgstr "Rafraîchir également les dépôt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:3
-#, fuzzy
 msgid "Component"
-msgstr "Compléter go"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:5
 #: /tmp/fish/implicit/share/completions/helm.fish:66
@@ -17663,25 +17522,20 @@ msgid "Keep bandwidth usage under specified KB's"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:8
-#, fuzzy
 msgid "Assume yes for all yes/no queries"
-msgstr "Présumer oui à toutes les questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:9
-#, fuzzy
 msgid "Detailed output"
-msgstr "Sortie large"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:10
-#, fuzzy
 msgid "Show debugging information"
-msgstr "Afficher les informations de débogage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eopkg.fish:12
-#, fuzzy
 msgid "Show program's version number and exit"
-msgstr "Afficher le numéro de version du programme et quitter"
-
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
 msgid ""
@@ -17877,9 +17731,8 @@ msgstr ""
 "exercism.io"
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:13
-#, fuzzy
 msgid "Skips a problem given a track ID and problem slug."
-msgstr "Sauter un problème d’après son ID et"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:14
 msgid "Fetches information about your progress with a given language track."
@@ -17956,11 +17809,8 @@ msgid "removes a jail from ezjail's config"
 msgstr "Supprimer un environnement jail de la configuration de ezjail"
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:10
-#, fuzzy
 msgid "dump diffs between jail initialisation and freeze time into a flavour"
 msgstr ""
-"Afficher le diff entre l’initialisation d’un environnement jail et un gel "
-"dans une saveur"
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:12
 msgid "create the basejail from binary packages"
@@ -18269,9 +18119,8 @@ msgid "Use style as background for transparent image parts"
 msgstr "Utiliser le style comme arrière-plan pour les parties transparentes"
 
 #: /tmp/fish/implicit/share/completions/feh.fish:19
-#, fuzzy
 msgid "Enable index mode"
-msgstr "Activer le mode index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:20
 msgid "Show image information based on given format"
@@ -18577,9 +18426,8 @@ msgid "Print version and copyright"
 msgstr "Afficher la version et les droits d’auteur"
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:22
-#, fuzzy
 msgid "Print information given infocode"
-msgstr "Afficher l'historique d'un module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:23
 msgid "Print left-to-right"
@@ -19040,11 +18888,8 @@ msgstr ""
 "débogage"
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:9
-#, fuzzy
 msgid "Dump information about parsed statements to stderr"
 msgstr ""
-"Afficher des informations sur les instructions parcourues sur la sortie "
-"d’erreur"
 
 #: /tmp/fish/implicit/share/completions/flac.fish:1
 msgid "Show the flac version number"
@@ -19130,11 +18975,8 @@ msgid "Continue decoding through stream errors"
 msgstr "Continuer le décodage en cas d’erreur de flux"
 
 #: /tmp/fish/implicit/share/completions/flac.fish:21
-#, fuzzy
 msgid "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
 msgstr ""
-"Paramétrer le début et la fin des points du fichier cue à décoder [#.#][-[#."
-"#]]"
 
 #: /tmp/fish/implicit/share/completions/flac.fish:22
 msgid "Verify a correct encoding"
@@ -19212,9 +19054,8 @@ msgid "Synonymous with -l 12 -b 4608 -m -e -r 6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:42
-#, fuzzy
 msgid "Specify blocksize in samples"
-msgstr "Spécifier la taille de bloc dans les échantillons"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:43
 msgid "Try mid-side coding for each frame"
@@ -19307,9 +19148,8 @@ msgid "Don't use Ogg as transport layer"
 msgstr "Ne pas utiliser Ogg comme couche de transport"
 
 #: /tmp/fish/implicit/share/completions/flac.fish:67
-#, fuzzy
 msgid "Don't write a PADDING block of length #"
-msgstr "Ne pas écrire de bloc de bourrage de la taille spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:68
 msgid "Don't exhaustively search LP coeff quantization"
@@ -20058,9 +19898,8 @@ msgid "Rebuild a repository"
 msgstr "Reconstruire un dépôt"
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:183
-#, fuzzy
 msgid "Compute clusters"
-msgstr "Calculer les grappes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:184
 msgid "Compress database"
@@ -20514,9 +20353,8 @@ msgid "Save function"
 msgstr "Enregistrer la fonction"
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
-#, fuzzy
 msgid "Open function in external editor"
-msgstr "Ouvrir la fonction dans un éditeur externe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
 msgid "Edit in interactive mode"
@@ -21663,22 +21501,16 @@ msgstr ""
 "incompatible"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:153
-#, fuzzy
 msgid ""
 "Warn about ISO C constructs that are outside of the common subset of ISO C "
 "and ISO C++, e"
 msgstr ""
-"Avertir lorsque des constructions C ISO sont hors du jeu commun à C ISO et C+"
-"+ ISO"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:154
-#, fuzzy
 msgid ""
 "Warn whenever a pointer is cast so as to remove a type qualifier from the "
 "target type"
 msgstr ""
-"Avertir lorsqu’un pointeur voit son type converti afin de supprimer un "
-"attribut de type du type cible"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:155
 msgid ""
@@ -22075,13 +21907,10 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:216
 #: /tmp/fish/implicit/share/completions/gcc.fish:217
-#, fuzzy
 msgid ""
 "(C++ only) Dump a representation of the tree structure for the entire "
 "translation unit to a file"
 msgstr ""
-"(C++ uniquement) Produire, dans un fichier, un dump représentant "
-"l’arborescence de l’intégralité de l’unité de traduction"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:218
 #: /tmp/fish/implicit/share/completions/gcc.fish:219
@@ -22203,9 +22032,8 @@ msgstr ""
 "exemple : « i686-pc-linux-gnu »"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:236
-#, fuzzy
 msgid "Print the compiler version (for example, 3"
-msgstr "Afficher la version du compilateur (par exemple, « 3"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:237
 msgid "Print the compiler’s built-in specs---and don’t do anything else"
@@ -22411,13 +22239,10 @@ msgstr ""
 "d’élimination des variables d’itération"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:267
-#, fuzzy
 msgid ""
 "Perform optimizations where we check to see if a jump branches to a location "
 "where another comparison subsumed by the first is found"
 msgstr ""
-"Effectuer des optimisations basées sur la vérification qu’un saut branche à "
-"un emplacement où se situe une autre comparaison dépendant de la première"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:268
 msgid ""
@@ -22454,14 +22279,10 @@ msgid "Perform a global common subexpression elimination pass"
 msgstr "Effectuer une passe globale de recherche de sous-expressions communes"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:273
-#, fuzzy
 msgid ""
 "When -fgcse-lm is enabled, global common subexpression elimination will "
 "attempt to move loads which are only killed by stores into themselves"
 msgstr ""
-"Lorsque -fgcse-lm est activée, la recherche de sous-expressions communes "
-"globale tentera de déplacer en eux-mêmes les chargements qui ne sont arrêtés "
-"que par des stockages"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:274
 msgid ""
@@ -22513,9 +22334,8 @@ msgstr ""
 "triviales ne sont pas infinies"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:280
-#, fuzzy
 msgid "Perform cross-jumping transformation"
-msgstr "Effectuer la transformation trans-saut"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:281
 msgid "Attempt to transform conditional jumps into branch-less equivalents"
@@ -22545,14 +22365,10 @@ msgstr "Effectuer plusieurs optimisations mineures relativement gourmandes"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:285
 #: /tmp/fish/implicit/share/completions/gcc.fish:286
-#, fuzzy
 msgid ""
 "Attempt to reassign register numbers in move instructions and as operands of "
 "other simple instructions in order to maximize the amount of register tying"
 msgstr ""
-"Essayer de réassigner les numéros de registre en instructions de déplacement "
-"et comme opérandes d’autres instructions simples afin de maximiser la "
-"ligature de registres"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:287
 msgid ""
@@ -22684,9 +22500,8 @@ msgid "Perform structural alias analysis on trees"
 msgstr "Effectuer l’analyse structurelle d’alias sur les arborescences"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:305
-#, fuzzy
 msgid "Perform forward store motion on trees"
-msgstr "Effectuer le déplacement des stockage sur les arborescences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:306
 #: /tmp/fish/implicit/share/completions/gcc.fish:307
@@ -22698,15 +22513,11 @@ msgid "Perform dead code elimination (DCE) on trees"
 msgstr "Effectuer la suppression du code mort sur les arborescences"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:309
-#, fuzzy
 msgid ""
 "Perform a variety of simple scalar cleanups (constant/copy propagation, "
 "redundancy elimination, range propagation and expression simplification) "
 "based on a dominator tree traversal"
 msgstr ""
-"Effectuer une série de nettoyage trivial des variables (propagation des "
-"constantes et des copies, élimination de redondances, propagation de portée "
-"et simplification d’expressions) basée sur un survol de l’arborescence"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:310
 msgid "Perform loop header copying on trees"
@@ -22745,22 +22556,16 @@ msgid "Perform scalar replacement of aggregates"
 msgstr "Effectuer le replacement des variables agrégées"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:317
-#, fuzzy
 msgid "Perform copy renaming on trees"
-msgstr "Effectuer le renommage des copies sur l’arborescence"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:318
-#, fuzzy
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
-"Effectuer le remplacement temporaire d’expressions pendant la phase SSA → "
-"normal"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:319
-#, fuzzy
 msgid "Perform live range splitting during the SSA->normal phase"
 msgstr ""
-"Effectuer le partage direct des intervalles pendant la phase SSA → normal"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:320
 msgid "Perform loop vectorization on trees"
@@ -22848,15 +22653,11 @@ msgstr ""
 "de branches empruntées et améliorer l’enchaînement des sections de code"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:333
-#, fuzzy
 msgid ""
 "In addition to reordering basic blocks in the compiled function, in order to "
 "reduce number of taken branches, partitions hot and cold basic blocks into "
 "separate sections of the assembly and "
 msgstr ""
-"En plus du réarrangement des blocs basiques de la fonction compilée pour "
-"réduire le nombre de branches empruntées, séparer les blocs basiques chauds "
-"et froids en section distinctes de l’assemblage et "
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:334
 msgid "Reorder functions in the object file in order to improve code locality"
@@ -23084,13 +22885,10 @@ msgstr ""
 "utilisant les registres laissés libres après leur allocation"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:368
-#, fuzzy
 msgid ""
 "Peels the loops for that there is enough information that they do not roll "
 "much (from profile feedback)"
 msgstr ""
-"Peler les boucles pour qu’elles laissent suffisamment d’informations pour un "
-"profil"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:369
 msgid "Enables the loop invariant motion pass in the new loop optimizer"
@@ -23315,13 +23113,10 @@ msgstr ""
 "les ajouter à la liste des dépendances sans générer d’erreur"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:405
-#, fuzzy
 msgid ""
 "This option instructs CPP to add a phony target for each dependency other "
 "than the main file, causing each to depend on nothing"
 msgstr ""
-"Demander à CPP l’ajout d’une dépendance contrefaite pour chaque dépendance "
-"issue d’ailleurs que du fichier principal, les changeant en dépendance nulle"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:406
 msgid "Change the target of the rule emitted by dependency generation"
@@ -23963,15 +23758,11 @@ msgstr ""
 "l’exécution du reste de la fonction"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:523
-#, fuzzy
 msgid ""
 "Allows calls via function pointers (including virtual functions) to execute "
 "correctly regardless of whether the target code has been compiled for "
 "interworking or not"
 msgstr ""
-"Autoriser les appels par des pointeurs de fonction, y compris virtuelles, "
-"afin que le code s’exécute correctement, que le code cible ait été compilé "
-"pour l’interworking ou non"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:524
 msgid "Specify the access model for the thread local storage pointer"
@@ -24645,13 +24436,10 @@ msgstr ""
 "représenter les pointeurs"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:706
-#, fuzzy
 msgid ""
 "Enable inlining of PLT entries in function calls to functions that are not "
 "known to bind locally"
 msgstr ""
-"Activer l’extension inline des entrées PLT dans les appels de fonction pour "
-"celles qui ne sont pas réputées se lier localement"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:707
 msgid "Assume a large TLS segment when generating thread-local code"
@@ -25131,15 +24919,11 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:819
 #: /tmp/fish/implicit/share/completions/gcc.fish:820
-#, fuzzy
 msgid ""
 "Controls whether TLS variables may be accessed with offsets from the TLS "
 "segment register (%gs for 32-bit, %fs for 64-bit), or whether the thread "
 "base pointer must be added"
 msgstr ""
-"Paramétrer si les variables TLS peuvent être accédées avec décalage depuis "
-"le registre de segment TLS (%gs pour du 32 bits, %fs pour du 64 bits), ou si "
-"le pointeur de thread de base doit être ajouté"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:821
 #: /tmp/fish/implicit/share/completions/gcc.fish:822
@@ -25413,14 +25197,10 @@ msgstr ""
 "référencer"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:875
-#, fuzzy
 msgid ""
 "Put global and static objects less than or equal to num bytes into the small "
 "data or bss sections instead of the normal data or bss sections"
 msgstr ""
-"Placer les objets globaux et statiques à environ le nombre d’octets spécifié "
-"dans les sections de petites données ou petites bss au lieu des sections des "
-"données normales ou bss normales"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:876
 msgid ""
@@ -25911,13 +25691,10 @@ msgstr ""
 "flottante, si elles sont disponibles"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1004
-#, fuzzy
 msgid ""
 "Tell the MIPS assembler to not run its preprocessor over user assembler "
 "files (with a "
 msgstr ""
-"Demander à l’assembleur MIPS de ne pas exécuter le préprocesseur sur les "
-"fichiers assembleur de l’utilisateur"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1005
 #: /tmp/fish/implicit/share/completions/gcc.fish:1006
@@ -26087,10 +25864,8 @@ msgstr ""
 "des processeurs MN10300"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1043
-#, fuzzy
 msgid "Generate code which uses features specific to the AM33 processor"
 msgstr ""
-"Générer du code utilisant les fonctionnalités spécifiques du processeur AM33"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1044
 msgid "Do not generate code which uses features specific to the AM33 processor"
@@ -26503,13 +26278,10 @@ msgstr ""
 "relogable, contrairement à ses références externes"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1157
-#, fuzzy
 msgid ""
 "=priority This option controls the priority that is assigned to dispatch-"
 "slot restricted instructions during the second scheduling pass"
 msgstr ""
-"Spécifier la priorité à accorder aux instructions restreintes pendant la "
-"deuxième passe de planification"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1158
 msgid ""
@@ -26672,9 +26444,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1206
 #: /tmp/fish/implicit/share/completions/gcc.fish:1207
-#, fuzzy
 msgid "Use (do not use) the packed stack layout"
-msgstr "(Ne pas) utiliser la structure de piles empaquetées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1208
 #: /tmp/fish/implicit/share/completions/gcc.fish:1209
@@ -27025,17 +26796,12 @@ msgstr ""
 "mémoire"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1292
-#, fuzzy
 msgid ""
 "=medmid Generate code for the Medium/Middle code model: 64-bit addresses, "
 "programs must be linked in the low 44 bits of memory, the text and data "
 "segments must be less than 2GB in size and the data segment must be located "
 "within 2GB of the text segment"
 msgstr ""
-"=medmid Générer du code selon le modèle de code Medium/Middle : adresses sur "
-"64 bits, les programmes doivent être liés sur les premiers 44 bits de "
-"mémoire, les segments de texte et de données doivent peser moins de 2 Gio et "
-"le segment de données doit pouvoir tenir dans le segment de texte"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1293
 msgid ""
@@ -27151,13 +26917,10 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1318
 #: /tmp/fish/implicit/share/completions/gcc.fish:1319
-#, fuzzy
 msgid ""
 "Enable (disable) generation of repeat block sequences using the RPTB "
 "instruction for zero overhead looping"
 msgstr ""
-"(Ne pas) générer de séquences de blocs répétitive utilisant l’instruction "
-"RPTB pour des boucles sans surcharge"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1320
 #: /tmp/fish/implicit/share/completions/gcc.fish:1321
@@ -27377,9 +27140,8 @@ msgid "Enable exception handling"
 msgstr "Activer la gestion des exceptions"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1366
-#, fuzzy
 msgid "Generate code that allows trapping instructions to throw exceptions"
-msgstr "Générer du code autorisant les instructions de génération d’exceptions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1367
 msgid ""
@@ -27862,15 +27624,13 @@ msgstr "Ne pas exécuter les tests unitaires avant l’installation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:44
 #: /tmp/fish/implicit/share/completions/gem.fish:93
-#, fuzzy
 msgid "Use bin wrappers for executables"
-msgstr "Utiliser des encapsuleurs binaires pour les exécutables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:45
 #: /tmp/fish/implicit/share/completions/gem.fish:94
-#, fuzzy
 msgid "Don't use bin wrappers for executables"
-msgstr "Ne pas utiliser des encapsuleurs binaires pour les exécutables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:46
 #: /tmp/fish/implicit/share/completions/gem.fish:95
@@ -27879,9 +27639,8 @@ msgstr "Spécifier la politique de confiance des gemmes"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:47
 #: /tmp/fish/implicit/share/completions/gem.fish:96
-#, fuzzy
 msgid "Do not install any required dependent gems"
-msgstr "N’installer aucune gemme de dépendance obligatoire"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:48
 #: /tmp/fish/implicit/share/completions/gem.fish:97
@@ -27901,9 +27660,8 @@ msgid "Don't display detailed information of gem(s)"
 msgstr "Ne pas afficher les informations détaillées sur la ou les gemmes"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:54
-#, fuzzy
 msgid "Name of gem(s) to query on matches the provided REGEXP"
-msgstr "Le nom de la ou des gemmes correspond à la REGEXP fournie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:60
 msgid "Generate RDoc/RI documentation for all installed gems"
@@ -28126,11 +27884,8 @@ msgid "This is the filter for rewriting the index."
 msgstr "Ceci est le filtre destiné à la ré-écriture de l’index."
 
 #: /tmp/fish/implicit/share/completions/git.fish:31
-#, fuzzy
 msgid "This is the filter for rewriting the commit\\(cqs parent list."
 msgstr ""
-"Ceci est le filtre destiné à la ré-écriture de la liste parente de la "
-"validation \\(cqs."
 
 #: /tmp/fish/implicit/share/completions/git.fish:32
 msgid "This is the filter for rewriting the commit messages."
@@ -28214,9 +27969,8 @@ msgid "Changes URLs for a remote"
 msgstr "Modifier les URL d’un hôte distant"
 
 #: /tmp/fish/implicit/share/completions/git.fish:50
-#, fuzzy
 msgid "Changes the list of branches tracked by a remote"
-msgstr "Change la liste des branches suivies par un serveur distant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:51
 msgid "Once the remote information is set up git fetch <name> is run"
@@ -28676,48 +28430,33 @@ msgid "Reverse meaning of ^ prefix"
 msgstr "Inverser la signification de ^"
 
 #: /tmp/fish/implicit/share/completions/git.fish:173
-#, fuzzy
 msgid ""
 "Pretend as if all refs in refs/ are listed on the command line as <commit>"
 msgstr ""
-"Prétendre que toutes les références dans refs/ sont listées sur la ligne de "
-"commande comme avec <commit>"
 
 #: /tmp/fish/implicit/share/completions/git.fish:174
-#, fuzzy
 msgid ""
 "Pretend as if all refs are in refs/heads are listed on the command line as "
 "<commit>"
 msgstr ""
-"Prétendre que toutes les références dans refs/heads sont listées sur la "
-"ligne de commande comme avec <commit>"
 
 #: /tmp/fish/implicit/share/completions/git.fish:175
-#, fuzzy
 msgid ""
 "Pretend as if all refs are in ref/tags are listed on the command line as "
 "<commit>"
 msgstr ""
-"Prétendre que toutes les références dans refs/tags sont listées sur la ligne "
-"de commande comme avec <commit>"
 
 #: /tmp/fish/implicit/share/completions/git.fish:176
-#, fuzzy
 msgid ""
 "Pretend as if all refs in refs/remotes  are listed on the command line as "
 "<commit>"
 msgstr ""
-"Prétendre que toutes les références dans refs/remotes sont listées sur la "
-"ligne de commande comme avec <commit>"
 
 #: /tmp/fish/implicit/share/completions/git.fish:177
-#, fuzzy
 msgid ""
 "Pretend as if all refs matching shell glob are listed on the command line as "
 "<commit>"
 msgstr ""
-"Prétendre que toutes les références correspondant au glob shell sont listées "
-"sur la ligne de commande comme avec <commit>"
 
 #: /tmp/fish/implicit/share/completions/git.fish:178
 msgid "Do not include refs matching given glob pattern"
@@ -28906,9 +28645,8 @@ msgid "Push all refs under refs/tags"
 msgstr "Pousser toutes les références de refs/tags"
 
 #: /tmp/fish/implicit/share/completions/git.fish:233
-#, fuzzy
 msgid "Push all usual refs plus the ones under refs/tags"
-msgstr "Pousser toutes les références de refs/tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:234
 msgid "Do everything except actually send the updates"
@@ -29308,13 +29046,10 @@ msgid "Don't fetch new objects from the remote"
 msgstr "Ne pas rapatrier de nouveaux objets depuis le serveur distant"
 
 #: /tmp/fish/implicit/share/completions/git.fish:350
-#, fuzzy
 msgid ""
 "Instead of using superproject's SHA-1, use the state of the submodule's "
 "remote-tracking branch"
 msgstr ""
-"Au lieu d’utiliser la somme SHA-1 du superprojet, utiliser l’état de la "
-"branche de suivi du sous-module"
 
 #: /tmp/fish/implicit/share/completions/git.fish:351
 msgid ""
@@ -29325,9 +29060,8 @@ msgstr ""
 "et toujours exécuter checkout"
 
 #: /tmp/fish/implicit/share/completions/git.fish:352
-#, fuzzy
 msgid "Also add ignored submodule path"
-msgstr "Ajouter également le chemin du sous-module ignoré"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:353
 msgid "Remove even with local changes"
@@ -29446,13 +29180,10 @@ msgid "Detect moved or copied lines within a file"
 msgstr "Détecter les lignes déplacées ou dupliquées dans un fichier"
 
 #: /tmp/fish/implicit/share/completions/git.fish:381
-#, fuzzy
 msgid ""
 "Detect lines moved or copied from other files that were modified in the same "
 "commit"
 msgstr ""
-"Détecter les lignes déplacées ou copiées depuis d’autres fichiers, eux-mêmes "
-"modifiés par la même validation"
 
 #: /tmp/fish/implicit/share/completions/git.fish:383
 msgid "Use the same output mode as git-annotate"
@@ -29612,9 +29343,8 @@ msgid "c compiler flags"
 msgstr "Sémaphores de compilation C"
 
 #: /tmp/fish/implicit/share/completions/go.fish:10
-#, fuzzy
 msgid "name of compiler to use, as in runtime"
-msgstr "Nom du compilateur à utiliser"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:11
 msgid "gccgo compiler/linker flags"
@@ -29781,9 +29511,8 @@ msgid "print Go version"
 msgstr "Afficher la version de Go"
 
 #: /tmp/fish/implicit/share/completions/go.fish:51
-#, fuzzy
 msgid "vet packages"
-msgstr "Supprime les paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:52
 msgid "print the command that would be executed"
@@ -30255,12 +29984,9 @@ msgstr ""
 "Ne pas demander de niveau de certification lors de la signature d’une clé"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:78
-#, fuzzy
 msgid ""
 "The default certification level to use for the level check when signing a key"
 msgstr ""
-"Le niveau de certification par défaut à utiliser pour la vérification de "
-"niveau lors de la signature d’une clé"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:79
 msgid ""
@@ -30953,14 +30679,12 @@ msgid "Get configuration value"
 msgstr "Obtenir une valeur de configuration"
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:28
-#, fuzzy
 msgid "Set configuration value or index in choices"
-msgstr "Paramétrer une valeur de configuration ou un index dans les choix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:29
-#, fuzzy
 msgid "Set configuration value index in choices"
-msgstr "Paramétrer un indice de valeur de configuration dans les choix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:30
 msgid "Set configuration value"
@@ -31299,9 +31023,8 @@ msgid "Set log level to info"
 msgstr "Paramétrer le niveau de journalisation à info"
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:16
-#, fuzzy
 msgid "Include specified build in composite"
-msgstr "Inclure la version spécifiée dans le composite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:17
 msgid "Runs build with all task actions disabled"
@@ -31867,9 +31590,8 @@ msgid "Print the version information"
 msgstr "Afficher les informations de version"
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
-#, fuzzy
 msgid "Specify a custom schemas directory"
-msgstr "Spécifier un dossier personnalisé de schémas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:3
 msgid "Get the value of a key"
@@ -32151,9 +31873,8 @@ msgid "Location of your Helm config"
 msgstr "Emplacement de votre configuration Helm"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:3
-#, fuzzy
 msgid "Address of tiller"
-msgstr "Erreur de frontière d'adresse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:4
 msgid "Name of the kubeconfig context to use"
@@ -32233,9 +31954,8 @@ msgstr "Vérifier la signature du paquet"
 #: /tmp/fish/implicit/share/completions/helm.fish:35
 #: /tmp/fish/implicit/share/completions/helm.fish:47
 #: /tmp/fish/implicit/share/completions/helm.fish:87
-#, fuzzy
 msgid "Chart version"
-msgstr "Afficher la version des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
@@ -32256,14 +31976,12 @@ msgid "Use the canary tiller image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:29
-#, fuzzy
 msgid "Do not install tiller"
-msgstr "Ne pas suppr. les fichiers construits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:30
-#, fuzzy
 msgid "Do not install local or remote"
-msgstr "Afficher l'état des fichiers extraits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:31
 msgid "Override tiller image"
@@ -32342,9 +32060,8 @@ msgid "Show deployed releases"
 msgstr "Afficher les versions déployées"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:54
-#, fuzzy
 msgid "Show failed releases"
-msgstr "Afficher les version échouées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:55
 msgid "Maximum number of releases to fetch"
@@ -32367,9 +32084,8 @@ msgid "Name of the key to use when signing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:61
-#, fuzzy
 msgid "Save packaged chart to local chart repository"
-msgstr "Déplacer les paquets dans l'arbre local"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:62
 msgid "Use a PGP private key to sign this package"
@@ -32590,9 +32306,8 @@ msgid "Input/Output (IO) redirection"
 msgstr "Redirection d’entrée/sortie (E/S)"
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "Afficher les avertissements"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
@@ -33124,9 +32839,8 @@ msgid "roll back to an older release"
 msgstr "Revenir à une version antérieure"
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:92
-#, fuzzy
 msgid "specify dyno size"
-msgstr "Spécifier le fichier de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:93
 msgid "open a remote console session (with optional COMMAND)"
@@ -33435,9 +33149,8 @@ msgid "merge with old dirstate parent after backout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:53
-#, fuzzy
 msgid "revision to backout"
-msgstr "Choisir l'affichage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:54
 #: /tmp/fish/implicit/share/completions/hg.fish:160
@@ -33819,9 +33532,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:259
 #: /tmp/fish/implicit/share/completions/hg.fish:282
 #: /tmp/fish/implicit/share/completions/hg.fish:290
-#, fuzzy
 msgid "display using template map file"
-msgstr "Afficher la page de manuel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:180
 #: /tmp/fish/implicit/share/completions/hg.fish:228
@@ -33844,9 +33556,8 @@ msgid "show topics matching keyword"
 msgstr "Afficher les sujets contenant un mot-clé"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:185
-#, fuzzy
 msgid "read history edits from the specified file"
-msgstr "Lire les éditions de l’historique depuis le fichier spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:186
 msgid "continue an edit already in progress"
@@ -33873,9 +33584,8 @@ msgid "first revision to be edited"
 msgstr "Première révision à éditer"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:193
-#, fuzzy
 msgid "identify the specified revision"
-msgstr "Identifier la révision spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:194
 msgid "show local revision number"
@@ -33898,9 +33608,8 @@ msgid "show bookmarks"
 msgstr "Afficher les marque-pages"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:203
-#, fuzzy
 msgid "directory strip option for patch"
-msgstr "Préfixe à sauter dans le patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
 msgid "don't commit, just update the working directory"
@@ -34137,9 +33846,8 @@ msgid "edit patch header"
 msgstr "Éditer l’en-tête du patch"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:342
-#, fuzzy
 msgid "keep folded patch files"
-msgstr "Supprimer les fichiers obsolètes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:345
 #: /tmp/fish/implicit/share/completions/hg.fish:369
@@ -34230,9 +33938,8 @@ msgid "apply on top of local changes"
 msgstr "Appliquer par dessus les changements locaux"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:375
-#, fuzzy
 msgid "apply the target patch to its recorded parent"
-msgstr "Appliquer le patch cible à son parent connu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:376
 msgid "list patch name in commit text"
@@ -34304,9 +34011,8 @@ msgid "disable all guards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:412
-#, fuzzy
 msgid "list all guards in series file"
-msgstr "Lister les dépendances inverses"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:413
 msgid "pop to before first guarded applied patch"
@@ -34363,9 +34069,8 @@ msgstr "Annuler toutes les modifications en cas d’arguments absents"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:457
 #: /tmp/fish/implicit/share/completions/hg.fish:521
-#, fuzzy
 msgid "tipmost revision matching date"
-msgstr "Voir qui surveille un fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:458
 msgid "revert to the specified revision"
@@ -34534,10 +34239,8 @@ msgid "discard uncommitted changes (no backup)"
 msgstr "Ignorer les modifications non validées (pas de sauvegarde)"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:520
-#, fuzzy
 msgid "update across branches if no uncommitted changes"
 msgstr ""
-"Mettre à jour sur toutes les branches si aucune modification n’a été validée"
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:1
 msgid "Output file in given format"
@@ -34897,9 +34600,8 @@ msgid "Style used for line numbers"
 msgstr "Style utilisé pour les numéros de ligne"
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:78
-#, fuzzy
 msgid "Highlighter style"
-msgstr "Style de surlignement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:79
 msgid "Generate Markdown documentation for the Hugo CLI"
@@ -35209,9 +34911,8 @@ msgid "Print out yes or no according to existence"
 msgstr "Répondre de l’existence par oui ou par non"
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:4
-#, fuzzy
 msgid "Print out the address"
-msgstr "Afficher l’adresse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
 msgid "Print netmask"
@@ -35489,9 +35190,8 @@ msgid "Destroy the specified set or all sets"
 msgstr "Détruire le jeu spécifié, ou tous les jeux"
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
-#, fuzzy
 msgid "a"
-msgstr "a"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:9
 msgid "Output format to the list command"
@@ -35690,9 +35390,8 @@ msgid "Alias for --color"
 msgstr "Alias pour « --color »"
 
 #: /tmp/fish/implicit/share/completions/jest.fish:15
-#, fuzzy
 msgid "The path to a jest config file"
-msgstr "Chemin vers un dossier contenant les fichiers de configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:16
 msgid ""
@@ -35705,9 +35404,8 @@ msgid "The directory where Jest should output its coverage files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:18
-#, fuzzy
 msgid "Pattern of files to ignore"
-msgstr "Fichier à ignorer durant l'import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:19
 msgid "A list of reporter names that Jest uses when writing coverage reports"
@@ -35720,25 +35418,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:21
-#, fuzzy
 msgid "Print debugging info about your jest config"
-msgstr "Afficher les informations de débogage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
-#, fuzzy
 msgid "The test environment used for all tests"
-msgstr "Paramétrer une variable d’environnement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
-#, fuzzy
 msgid "Use this flag to show full diffs instead of a patch"
-msgstr "Utiliser ce fichier de configuration au lieu de celui par défaut"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:24
-#, fuzzy
 msgid "Find related tests for a list of source files"
 msgstr ""
-"Utiliser un fichier tiers similaire si aucun fichier destination n’existe"
 
 #: /tmp/fish/implicit/share/completions/jest.fish:25
 msgid "Force Jest to exit after all tests have completed running"
@@ -35807,10 +35500,8 @@ msgid "Activates notifications for test results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:41
-#, fuzzy
 msgid "Run tests based on the changed files"
 msgstr ""
-"Mettre à jour l’archive si le fichier à mettre à jour y est plus ancien"
 
 #: /tmp/fish/implicit/share/completions/jest.fish:42
 msgid "A file where to write test results"
@@ -35829,9 +35520,8 @@ msgid "A list of custom reporters for the test suite"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:46
-#, fuzzy
 msgid "Automatically reset mock state between every test"
-msgstr "Supprimer automatiquement les dépendances inutiles"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:47
 msgid "Whatever to reset the module registry for every test"
@@ -35866,9 +35556,8 @@ msgid "Print your jest config and then exits"
 msgstr "Afficher votre configuration jest et quitter"
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
-#, fuzzy
 msgid "Prevent tests from printing messages through the console"
-msgstr "Afficher les messages dans la console"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:56
 msgid "Snapshot serializer modules Jest should use for snapshot testing"
@@ -35883,32 +35572,28 @@ msgid "The glob patterns Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:59
-#, fuzzy
 msgid "Run only tests with a name that matches the regex pattern"
-msgstr "Ne pas lister les fichiers correspondant au motif spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:60
 msgid "Paths to skip"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:61
-#, fuzzy
 msgid "Regex for test paths"
-msgstr "Chemin sur la destination"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:62
 msgid "The regexp pattern Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:63
-#, fuzzy
 msgid "Allows the use of a custom results processor"
-msgstr "Annuler la résolution de conflits en cours"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:64
-#, fuzzy
 msgid "Allows to specify a custom test runner"
-msgstr "Spécifier une URL AUR personnalisée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:65
 msgid "This option sets the URL for the jsdom environment"
@@ -35956,9 +35641,8 @@ msgid "Watch files for changes and rerun tests related to changed files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:75
-#, fuzzy
 msgid "Watch files for changes and rerun all tests"
-msgstr "Surveiller les modifications des fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:76
 msgid "Whether to use watchman for file crawling"
@@ -36165,9 +35849,8 @@ msgid "Generate a new 128 bit ID"
 msgstr "Générer un nouvel identifiant sur 128 bits"
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:23
-#, fuzzy
 msgid "Show internal header information"
-msgstr "Afficher les informations des en-têtes internes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:24
 msgid "Shows the current disk usage"
@@ -36198,9 +35881,8 @@ msgid "Use application/json-seq MIME type scheme"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:3
-#, fuzzy
 msgid "Parse input in streaming fasion"
-msgstr "Afficher la version des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:4
 msgid "Run filter just once in large array"
@@ -36477,9 +36159,8 @@ msgid "List names of available signals and exit"
 msgstr "Lister les noms des signaux disponibles et quitter"
 
 #: /tmp/fish/implicit/share/completions/killall.fish:12
-#, fuzzy
 msgid "Case sensitive argument match for processed"
-msgstr "Recherche insensible à la casse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:13
 msgid "Simulate, but do not send any signals"
@@ -36597,9 +36278,8 @@ msgid "generate dvi"
 msgstr "Générer le DVI"
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:18
-#, fuzzy
 msgid "turn off required dvi"
-msgstr "Ne pas passer obligatoirement par DVI"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:19
 msgid "Execute specified Perl code (as part of latexmk start-up code)"
@@ -36854,9 +36534,8 @@ msgid "Generate scaffolding for a new project based on a template."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:14
-#, fuzzy
 msgid "DEPRECATED. Please use the :user profile instead."
-msgstr "DÉPRÉCIÉ ; veuillez utiliser le profil :user à la place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:15
 msgid "Write a pom.xml file to disk for Maven interoperability."
@@ -37075,14 +36754,12 @@ msgid "Set tab stops"
 msgstr "Paramétrer la distance entre taquets de tabulation"
 
 #: /tmp/fish/implicit/share/completions/less.fish:45
-#, fuzzy
 msgid "No termcap init"
-msgstr "Ne pas altérer le terminal avant et après l’exécution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:46
-#, fuzzy
 msgid "No keypad init"
-msgstr "Ne pas altérer le pavé numérique avant et après l’exécution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:47
 msgid "Maximum forward scroll"
@@ -37322,9 +36999,8 @@ msgid "Set ouput LOGFILE"
 msgstr "Paramétrer le fichier de journal"
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:4
-#, fuzzy
 msgid "Use file as input KEYMAP"
-msgstr "Fichier d'entrée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:5
 msgid "Use DEVICE as keyboard input"
@@ -37549,9 +37225,8 @@ msgid "Sets the destination and instance for any options that follow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:5
-#, fuzzy
 msgid "Removes the specified option for the named destination"
-msgstr "Supprimer l’option spécifiée de la destination"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:6
 msgid "Removes the options for the named destination and instance"
@@ -37744,14 +37419,12 @@ msgid "Print both online and offline CPUs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:2
-#, fuzzy
 msgid "Print online CPUs only"
-msgstr "Afficher les processeurs connectés uniquement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:3
-#, fuzzy
 msgid "Print offline CPUs only"
-msgstr "Afficher les processeurs déconnectés uniquement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:4
 msgid "Print out an extended readable format"
@@ -37988,23 +37661,20 @@ msgid "Sort by extension"
 msgstr "Trier selon l’extension des entrées"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:61
-#, fuzzy
 msgid "Prevent -A from being automatically set for root"
-msgstr "Empêcher -A d’être automatiquement paramétré pour le superutilisateur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:63
 msgid "Show modification time"
 msgstr "Afficher l’horodatage de modification"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:64
-#, fuzzy
 msgid "Show whiteouts when scanning directories"
-msgstr "Afficher des blancs lors du parcours des répertoires"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:65
-#, fuzzy
 msgid "Display each file's MAC label"
-msgstr "Afficher l’étiquette MAX de chaque fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:66
 msgid "Include the file flags in a long (-l) output"
@@ -38045,9 +37715,8 @@ msgstr ""
 "l’affichage"
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:8
-#, fuzzy
 msgid "use of device cache file"
-msgstr "Utiliser le fichier de cache périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:9
 msgid "select by group (^ - negates)"
@@ -38125,9 +37794,8 @@ msgid "Execute stdin and stop handling options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:1
-#, fuzzy
 msgid "Show command executions"
-msgstr "Afficher les exécutions de commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:2
 msgid "Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents"
@@ -38163,9 +37831,8 @@ msgstr "Service"
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:10
 #: /tmp/fish/implicit/share/completions/lunchy.fish:12
-#, fuzzy
 msgid "Persist command"
-msgstr "Commande du processus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:11
 msgid "Force start (disabled) agents"
@@ -38485,9 +38152,8 @@ msgid "Create destination directory"
 msgstr "Créer un dossier de destination"
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
-#, fuzzy
 msgid "Apply read-only mount"
-msgstr "Monter en lecture seule"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:31
 msgid "Copy file or directory to a machine"
@@ -38598,28 +38264,24 @@ msgid "Lists all Magento modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:3
-#, fuzzy
 msgid "Lists all indexer modes"
-msgstr "Afficher tous les noms"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:4
-#, fuzzy
 msgid "Shows all available packing modes"
-msgstr "Réinstaller les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:5
 msgid "Shows all IDEs supported by magento"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:6
-#, fuzzy
 msgid "Shows all available magento tests"
-msgstr "Afficher la liste disponible"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:7
-#, fuzzy
 msgid "Shows all available magento theme areas"
-msgstr "Afficher la liste disponible"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:8
 msgid "Shows all existing magento languages"
@@ -38655,9 +38317,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:16
 #: /tmp/fish/implicit/share/completions/p4.fish:23
-#, fuzzy
 msgid "Checks if prompt is in a specific command"
-msgstr "Tester si apt doit se faire donner la sous-commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:17
 #: /tmp/fish/implicit/share/completions/p4.fish:24
@@ -38852,18 +38513,16 @@ msgid "Do not verify PGP signatures"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:12
-#, fuzzy
 msgid "Display syntax and command line options"
-msgstr "Afficher un sommaire des commandes et options disponibles"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:13
 msgid "No automatic bump of pkgver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:14
-#, fuzzy
 msgid "Install the package after build"
-msgstr "Installer après la construction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:15
 msgid "Enable makepkg build logging"
@@ -38882,9 +38541,8 @@ msgid "Use alternative <buildscript>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:19
-#, fuzzy
 msgid "Remove installed deps after build"
-msgstr "Installer après la construction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:20
 msgid "Repackage without rebuilding"
@@ -38903,9 +38561,8 @@ msgid "Display the version and exit"
 msgstr "Afficher la version et quitter"
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:24
-#, fuzzy
 msgid "Remove the srcdir before building the package"
-msgstr "Supprimer un ou des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:25
 msgid "Build a source-only GPL tarball for AUR"
@@ -38952,19 +38609,16 @@ msgid "Passed to pacman: Install as dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:36
-#, fuzzy
 msgid "Passed to pacman: Do not display a progress bar"
-msgstr "Ne pas afficher la barre de progression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:37
-#, fuzzy
 msgid "List all packages that would be built"
-msgstr "Lister le contenu d'un paquet correspondant au motif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:38
-#, fuzzy
 msgid "Print SRCINFO to stdout"
-msgstr "Envoyer les fichiers vers le tube stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:1
 msgid "Program section"
@@ -39047,27 +38701,24 @@ msgid "Debug and run"
 msgstr "Déboguer et exécuter"
 
 #: /tmp/fish/implicit/share/completions/man.fish:22
-#, fuzzy
 msgid "Show whatis information"
-msgstr "Afficher les entrées ARP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:23
 msgid "Format only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:25
-#, fuzzy
 msgid "Show apropos information"
-msgstr "Afficher les entrées ARP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:26
 msgid "Search in all man pages"
 msgstr "Rechercher dans toutes les pages de manuel"
 
 #: /tmp/fish/implicit/share/completions/man.fish:27
-#, fuzzy
 msgid "Set system"
-msgstr "Paramétrer le système"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:28
 msgid "Preprocessors"
@@ -39079,9 +38730,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:30
 #: /tmp/fish/implicit/share/completions/man.fish:31
-#, fuzzy
 msgid "Only print locations"
-msgstr "Afficher toutes les versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:1
 msgid "No graphic chars for line drawing"
@@ -39100,9 +38750,8 @@ msgid "Specify a different color set"
 msgstr "Spécifier un jeu de couleur différent"
 
 #: /tmp/fish/implicit/share/completions/mc.fish:5
-#, fuzzy
 msgid "Specify a name of skin"
-msgstr "Spécifier le titre du rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:6
 msgid "Disable mouse support"
@@ -39218,14 +38867,12 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "Créer un dossier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Select monitor mode"
-msgstr "Sélectionner le mode d’affichage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:5
 msgid "Change the size or shape of an active array"
@@ -39236,14 +38883,12 @@ msgid "Manage devices in array, and possibly start it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:7
-#, fuzzy
 msgid "Start all auto-detected arrays"
-msgstr "Démarrer toutes les applications enregistrées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:9
-#, fuzzy
 msgid "Display more detailed help"
-msgstr "Afficher une aide détaillée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:11
 #: /tmp/fish/implicit/share/completions/obnam.fish:47
@@ -39252,108 +38897,88 @@ msgid "Be more verbose"
 msgstr "Être plus verbeux"
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "Forcer la suppression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "Spécifier le fichier de configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "Afficher moins d’informations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
-#, fuzzy
 msgid "Set metadata style to use"
-msgstr "Envoyer un email à l’utilisateur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:17
 msgid "Provide home host identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:18
-#, fuzzy
 msgid "Give name format preference"
-msgstr "Le nom du fichier correspond au motif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:19
-#, fuzzy
 msgid "Give cluster name"
-msgstr "Nom d’utilisateur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "Spécifier le nombre de secteurs cachés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "Spécifier le nombre de secteurs réservés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
-#, fuzzy
 msgid "Specify the space to use from each drive"
-msgstr "Spécifier le chemin de l’exécutable rsync sur la destination"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:23
-#, fuzzy
 msgid "Specify the size made available on the array"
-msgstr "Liste des paquets à installer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:24
-#, fuzzy
 msgid "Specify the chunk size"
-msgstr "Spécifier le type de table FAT (bits)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "Spécifier un dossier de journaux"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
-#, fuzzy
 msgid "Specify RAID level"
-msgstr "Spécifier le serveur X"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "Spécifier la largeur des tabulations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Specify file for write-intent bitmap"
-msgstr "Spécifier le port pour l’interface web"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:29
-#, fuzzy
 msgid "Specify chunksize of bitmap"
-msgstr "Spécifier la taille de bloc dans les échantillons"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:30
-#, fuzzy
 msgid "Prefer reading from other devices than these"
-msgstr "Ne pas lire depuis l’entrée standard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:31
-#, fuzzy
 msgid "Enable writes on array or device"
-msgstr "Le fichier désigne un périphérique de caractère"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:32
-#, fuzzy
 msgid "Disable writes on array"
-msgstr "Désactiver le téléchargement de paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:33
-#, fuzzy
 msgid "Enable write-behind mode"
-msgstr "Activer le mode index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:34
 msgid "Assume the array is clean"
@@ -39364,52 +38989,44 @@ msgid "Use this file as a backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:36
-#, fuzzy
 msgid "Specify start of array data"
-msgstr "Spécifier le dossier de démarrage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:37
 msgid "Resume frozen --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Set array name"
-msgstr "Paramétrer le nom spécifié comme nom de serveur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:39
-#, fuzzy
 msgid "Run array despite warnings"
-msgstr "(Dés)activer les avertissements"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:40
-#, fuzzy
 msgid "Give instruction for device file"
-msgstr "Action à effectuer sur les fichiers de périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:41
-#, fuzzy
 msgid "Add devices to array"
-msgstr "Périphérique de blocs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Specify max nodes in the cluster"
-msgstr "Spécifier un système de gestion des versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
-#, fuzzy
 msgid "Specify journal device for RAID-4/5/6 array"
-msgstr "Spécifier un dossier de journaux"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:44
 msgid "UUID of array to assemble"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Minor number of array device"
-msgstr "Afficher le numéro de série du périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:46
 msgid "Refuse to start without all drives"
@@ -39420,38 +39037,32 @@ msgid "Do not ask for backup file, unavailable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update superblock properties"
-msgstr "Mettre à jour les sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Freeze --grow command"
-msgstr "Paramétrer la commande d’invite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
-#, fuzzy
 msgid "Test mode"
-msgstr "Paramétrer le mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:51
-#, fuzzy
 msgid "Hot-add listed devices"
-msgstr "Lister les périphériques"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:52
 msgid "Re-add a previously removed device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:53
-#, fuzzy
 msgid "Hot-add listed devices as spare"
-msgstr "Ajouter le service comme désactivé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Remove listed inactive devices"
-msgstr "Supprimer les ports listés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:55
 msgid "Mark listed devices as faulty"
@@ -39466,56 +39077,48 @@ msgid "Give devices as replacement"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Confirm existence of device"
-msgstr "Se connecter au périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:59
 msgid "Examine device for md use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:60
-#, fuzzy
 msgid "Print details on array"
-msgstr "Afficher une aide détaillée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Print details on platform capabilities"
-msgstr "Afficher des informations détaillées sur l’image"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:62
 msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "Afficher les périphériques"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:65
-#, fuzzy
 msgid "Print report about bitmap"
-msgstr "Afficher le nombre d’octets en sortie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
-#, fuzzy
 msgid "List recorded bad blocks"
-msgstr "Chercher les blocs défectueux avant la création"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "Boucle de liens symboliques"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "Ne pas lire les métadonnées des dépôts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -39526,28 +39129,24 @@ msgid "Erase possible superblock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:71
-#, fuzzy
 msgid "Delete subarray"
-msgstr "Supprimer la branche"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:72
-#, fuzzy
 msgid "Update subarray"
-msgstr "Mettre à jour les sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:73
-#, fuzzy
 msgid "Wait for pending operations"
-msgstr "Paramétrer les options de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:74
 msgid "Mark array as clean ASAP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:75
-#, fuzzy
 msgid "Set sync action for md devices"
-msgstr "Action à effectuer sur les fichiers de périphérique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:76
 msgid "Rebuild /run/mdadm/map"
@@ -39558,9 +39157,8 @@ msgid "Automatically add eventually appearing device to array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:78
-#, fuzzy
 msgid "Mail address to send alerts to"
-msgstr "Adresse d’écoute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:79
 msgid "Program to run in case of an event"
@@ -39595,9 +39193,8 @@ msgid "Do not move spares between arrays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:87
-#, fuzzy
 msgid "Be more concise"
-msgstr "Être plus verbeux"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:1
 #: /tmp/fish/implicit/share/completions/mdbook.fish:4
@@ -39669,14 +39266,12 @@ msgid "Minimal report"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:8
-#, fuzzy
 msgid "Evaluate indexing information for path"
-msgstr "Évaluer les permissions du chemin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "Évaluer les permissions du chemin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
 msgid "Write the diagnostic to the specified path"
@@ -39735,9 +39330,8 @@ msgid "Print out the list of all of the attributes and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:4
-#, fuzzy
 msgid "Print out the schema file and exit"
-msgstr "Afficher le fichier de schéma et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:5
 msgid "Ask the server to reimport files for UTIs claimed by the listed plugin"
@@ -40058,9 +39652,8 @@ msgstr "Installer une archive localement"
 
 #: /tmp/fish/implicit/share/completions/mix.fish:5
 #: /tmp/fish/implicit/share/completions/mix.fish:62
-#, fuzzy
 msgid "Uninstalls archives"
-msgstr "Désinstaller les archives"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:6
 #: /tmp/fish/implicit/share/completions/mix.fish:63
@@ -40512,9 +40105,8 @@ msgid "Increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:12
-#, fuzzy
 msgid "Suppress status output"
-msgstr "Effacer la sortie normale"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:13
 msgid "Force the translations for 'code' to be used"
@@ -40586,9 +40178,8 @@ msgid "<k=v,k2=v2,...>  reporter-specific options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:8
-#, fuzzy
 msgid "specify the reporter to use"
-msgstr "Spécifier le rapporteur à utiliser"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:9
 msgid "sort test files"
@@ -40698,9 +40289,8 @@ msgid "disables timeouts, given implicitly with --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:35
-#, fuzzy
 msgid "specify opts path"
-msgstr "Spécifier le chemin des options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:36
 msgid "enable perf linux profiler (basic support)"
@@ -40735,9 +40325,8 @@ msgid "trace function calls"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:44
-#, fuzzy
 msgid "show stack traces on deprecations"
-msgstr "Afficher les piles d’exécution lors des dépréciations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:45
 msgid "enforce strict mode"
@@ -40748,9 +40337,8 @@ msgid "additional extensions to monitor with --watch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:47
-#, fuzzy
 msgid "wait for async suite definition"
-msgstr "bloc de définition de fonction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:1
 msgid "Print program version and exit"
@@ -40958,9 +40546,8 @@ msgid "Ignore all version information"
 msgstr "Ignorer toutes les informations de version"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:11
-#, fuzzy
 msgid "Ignore version magic information"
-msgstr "Ignorer les informations « version magic »"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:12
 msgid "Ignore module interface version"
@@ -40975,9 +40562,8 @@ msgid "Insert modules matching the given wildcard"
 msgstr "Insérer tout les modules correspondant au motif spécifié"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:15
-#, fuzzy
 msgid "Restrict wildcards to specified directory"
-msgstr "Restreindre les motifs au dossier spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:16
 msgid "Send error messages through syslog"
@@ -41428,9 +41014,8 @@ msgid "Bypass the system configuration file"
 msgstr "Outrepasser le fichier de configuration système"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:6
-#, fuzzy
 msgid "Resume a postponed message"
-msgstr "Reprendre un message reporté"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:7
 msgid "Open a mailbox in read-only mode"
@@ -41535,9 +41120,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:3
-#, fuzzy
 msgid "Run in non-interactive (batch) mode"
-msgstr "Exécuter en mode noninteractif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:4
 msgid "The id of the build strategy to use."
@@ -41634,9 +41218,8 @@ msgid "Quiet output - only show errors"
 msgstr "Sortie silencieuse – n’afficher que les erreurs"
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:27
-#, fuzzy
 msgid "Resume reactor from specified project"
-msgstr "Afficher les versions complètes pour les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:28
 msgid "Alternate path for the user settings file"
@@ -41725,14 +41308,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:48
-#, fuzzy
 msgid "Installs the artifact in the remote repository."
-msgstr "Mettre à jour le référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:49
-#, fuzzy
 msgid "Deploys an artifact to remote repository."
-msgstr "Enlever un fichier du référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:50
 msgid ""
@@ -42606,9 +42187,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:198
-#, fuzzy
 msgid "Goal that resolves the project dependencies from the repository."
-msgstr "Enlever un fichier du référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:199
 msgid ""
@@ -43046,9 +42626,8 @@ msgid "Empty goal, provided only to set loose the lifecycle."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:276
-#, fuzzy
 msgid "Copies artifacts from one repository to another repository."
-msgstr "Ajouter un fichier/répertoire au référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:277
 msgid ""
@@ -43124,9 +42703,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:289
-#, fuzzy
 msgid "Removes the not-available marker files from the repository."
-msgstr "Appliquer les modifications au référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:290
 msgid ""
@@ -43762,24 +43340,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:399
-#, fuzzy
 msgid "Test goal implementation of the generate html mojo."
-msgstr "Afficher toutes les complétions pour la commande spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:400
-#, fuzzy
 msgid "Main goal implementation of the generate html mojo."
-msgstr "Afficher toutes les complétions pour la commande spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:401
-#, fuzzy
 msgid "Test goal implementation of the import mojo."
-msgstr "Afficher toutes les complétions pour la commande spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:402
-#, fuzzy
 msgid "Main goal implementation of the import mojo."
-msgstr "Afficher toutes les complétions pour la commande spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:403
 msgid ""
@@ -44357,9 +43931,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:500
-#, fuzzy
 msgid "Add more resource directories to the POM."
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:501
 msgid "Store the maven core version in a property maven.version."
@@ -44370,9 +43943,8 @@ msgid "Attach additional artifacts to be installed and deployed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:503
-#, fuzzy
 msgid "Add test source directories to the POM."
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:504
 msgid ""
@@ -44403,9 +43975,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:508
-#, fuzzy
 msgid "Add more source directories to the POM."
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:509
 msgid "Add more test resource directories to the POM."
@@ -45134,9 +44705,8 @@ msgid "Starts the App Engine development server and does not wait."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:646
-#, fuzzy
 msgid "Start the specified backend."
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:647
 msgid "Stops the App Engine development server."
@@ -45147,9 +44717,8 @@ msgid "Roll back a previously in-progress update."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:649
-#, fuzzy
 msgid "Start the specified module version."
-msgstr "Démarrer la version spécifiée du module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:650
 msgid "Change the default version, but more gently than set_default_version."
@@ -45215,9 +44784,8 @@ msgid "Update application task queue definitions."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:665
-#, fuzzy
 msgid "Stop the specified module version."
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:666
 msgid "Rollback an in-progress update."
@@ -45232,9 +44800,8 @@ msgid "App Engine endpoints get-discovery-doc command."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:669
-#, fuzzy
 msgid "Stop the specified backend."
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:670
 msgid "Creates an Android Archive (aar) file. "
@@ -45671,9 +45238,8 @@ msgid "vertical align of modes and owners"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:1
-#, fuzzy
 msgid "Perform the reverse operation"
-msgstr "Générer le contenu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:2
 msgid "Specifies the name of the character encoding"
@@ -45797,23 +45363,20 @@ msgid "Also print directory history"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:1
-#, fuzzy
 msgid "Save authtoken to configuration file"
-msgstr "Paramétrer l’emplacement du fichier de configuration alternatif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:2
-#, fuzzy
 msgid "Prints author and licensing information"
-msgstr "Afficher les droits d’auteur et les informations de version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:3
 msgid "Start an HTTP tunnel"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:4
-#, fuzzy
 msgid "Start tunnels by name from the configuration file"
-msgstr "Paramétrer l’emplacement du fichier de configuration alternatif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:5
 msgid "Start a TCP tunnel"
@@ -45824,19 +45387,16 @@ msgid "Start a TLS tunnel"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:7
-#, fuzzy
 msgid "Update ngrok to the latest version"
-msgstr "Mettre à jour vers la dernière version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:8
-#, fuzzy
 msgid "Print the version string"
-msgstr "Afficher la version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:9
-#, fuzzy
 msgid "Shows a list of commands or help for one command"
-msgstr "Afficher l’aide pour une commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:10
 msgid "ngrok.com authtoken identifying a user"
@@ -45883,9 +45443,8 @@ msgid "set Host header; if 'rewrite' use local address hostname"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:21
-#, fuzzy
 msgid "enable/disable http introspection"
-msgstr "(Dés)activer une session"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:22
 msgid "path to TLS certificate authority to verify client certs"
@@ -45900,37 +45459,32 @@ msgid "path to a TLS key for TLS termination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:25
-#, fuzzy
 msgid "start all tunnels in the configuration file"
-msgstr "Paramétrer l’emplacement du fichier de configuration alternatif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:26
-#, fuzzy
 msgid "start running no tunnels"
-msgstr "Redémarrer la machine en fonctionnement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:27
 msgid "bind remote address (requires you reserve an address)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ngrok.fish:28
-#, fuzzy
 msgid "update channel (stable, beta)"
-msgstr "Mettre à jour la barre d’état du client"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nice.fish:2
 msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "Extraire l’archive dans le dossier spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
-#, fuzzy
 msgid "specify build file [default=build.ninja]"
-msgstr "Spécifier le fichier build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:3
 msgid "dry run"
@@ -45941,9 +45495,8 @@ msgid "show all command lines while building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:5
-#, fuzzy
 msgid "number of jobs to run in parallel [default derived from CPUs]"
-msgstr "Spécifier le nombre de tâches à exécuter en parallèle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:6
 msgid "do not start if load average > N"
@@ -45954,18 +45507,16 @@ msgid "keep going until N jobs fail [default=1]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:9
-#, fuzzy
 msgid "enable debugging, specify debug mode"
-msgstr "Activer le mode débogage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:10
 msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "Afficher la version de Go"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -46057,9 +45608,8 @@ msgid "Print name of the input file before every symbol"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:3
-#, fuzzy
 msgid "Do not demangle low-level symbol names"
-msgstr "Ne pas déréférencer les liens symboliques"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:4
 msgid "Display dynamic symbols instead of normal symbols"
@@ -46143,9 +45693,8 @@ msgid "Display this program's version number"
 msgstr "Afficher le numéro de version de ce programme"
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
-#, fuzzy
 msgid "Print node's version"
-msgstr "Afficher la version des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:2
 msgid "Evaluate script"
@@ -46172,9 +45721,8 @@ msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "Afficher les options pour la ligne de commande v8"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -47041,14 +46589,12 @@ msgid "install a package"
 msgstr "Installer un paquet"
 
 #: /tmp/fish/implicit/share/completions/npm.fish:16
-#, fuzzy
 msgid "Save to devDependencies in package.json"
-msgstr "Lister les dépendances du paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:17
-#, fuzzy
 msgid "Save to dependencies in package.json"
-msgstr "Lister les dépendances du paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:18
 msgid "Install package globally"
@@ -47139,9 +46685,8 @@ msgid "Add a registry user account"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:39
-#, fuzzy
 msgid "Display npm bin folder"
-msgstr "Afficher les infos de débogage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:40
 msgid "Bugs for a package in a web browser maybe"
@@ -47244,14 +46789,12 @@ msgid "Remove a package from the registry"
 msgstr "Supprimer un paquet du registre"
 
 #: /tmp/fish/implicit/share/completions/npm.fish:67
-#, fuzzy
 msgid "Remove star from a package"
-msgstr "Supprime les paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:68
-#, fuzzy
 msgid "Bump a package version"
-msgstr "Afficher la fiche du paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:69
 msgid "Display npm username"
@@ -47290,19 +46833,16 @@ msgid "Display object format specific file header contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:4
-#, fuzzy
 msgid "Display object format specific contents"
-msgstr "Afficher les informations spécifiques de format de l’objet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:5
-#, fuzzy
 msgid "Display contents of section headers"
-msgstr "Afficher le contenu des en-têtes de section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:6
-#, fuzzy
 msgid "Display content of section headers"
-msgstr "Afficher le contenu des en-têtes de section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:7
 msgid "Display the contents of all headers"
@@ -47337,9 +46877,8 @@ msgid "Display (in raw form) any STABS info in file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:15
-#, fuzzy
 msgid "Display DWARF info in file"
-msgstr "Afficher $ à la fin du fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:16
 msgid "Display contents of symbol table(s)"
@@ -47462,9 +47001,8 @@ msgid "Strip initial directory names for -S"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:47
-#, fuzzy
 msgid "Do not display DIEs at given depth or greater"
-msgstr "Ne pas afficher la barre de progression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:48
 msgid "Display DIEs starting with given number"
@@ -47523,9 +47061,8 @@ msgid "Print help, including hidden subcommands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:14
-#, fuzzy
 msgid "List contents of a generation in kdirstat cache format"
-msgstr "Lister le contenu d'un paquet correspondant au motif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:15
 msgid "List error codes and explanations"
@@ -47600,9 +47137,8 @@ msgid "Dump metadata about files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:33
-#, fuzzy
 msgid "Do not dump metadata about files"
-msgstr "Ne pas suppr. les fichiers construits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
 msgid "Generate man page"
@@ -47731,9 +47267,8 @@ msgid "No not put small files into the B-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:66
-#, fuzzy
 msgid "Add FILE to config files"
-msgstr "Utiliser le fichier de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
 msgid "Write out the current configuration"
@@ -47812,9 +47347,8 @@ msgid "fsck should not try to fix problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:86
-#, fuzzy
 msgid "Ignore chunks when checking integrity"
-msgstr "Ignorer les fragments lors de la vérification de l’intégrité"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:87
 msgid "Check chunks when checking integrity"
@@ -47825,15 +47359,13 @@ msgid "Do not check data for cient NAME"
 msgstr "Ne pas vérifier les données pour le client spécifié"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
-#, fuzzy
 msgid "Check only the last generation"
-msgstr "Générer le contenu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:90
 #: /tmp/fish/implicit/share/completions/obnam.fish:100
-#, fuzzy
 msgid "Check all generations"
-msgstr "Réinstaller les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
@@ -48264,9 +47796,8 @@ msgid "returns assembly compile options."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:41
-#, fuzzy
 msgid "returns bytecode linking options."
-msgstr "Définir les options de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:42
 msgid "Prints a summary of your setup, useful for bug-reports."
@@ -48505,32 +48036,28 @@ msgid "Query the files database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:13
-#, fuzzy
 msgid "(AUR) Search for packages"
-msgstr "Chercher le nom complet de paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:14
-#, fuzzy
 msgid "(AUR) Show info for packages"
-msgstr "Afficher le paquet source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:15
 msgid "(AUR) Clone the packages' build files and build them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:16
-#, fuzzy
 msgid "(AUR) Clone build files, build and install packages"
-msgstr "Reconstruire et installer un paquet installé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:17
 msgid "(AUR) Check foreign packages for updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:18
-#, fuzzy
 msgid "(AUR) Update foreign packages"
-msgstr "Actualiser la liste des paquets source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:19
 msgid "(AUR) Clone the packages' build files"
@@ -48567,9 +48094,8 @@ msgid "Always rebuild packages"
 msgstr "Toujours reconstruire les paquets"
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:37
-#, fuzzy
 msgid "Redirect output to the log in the clone directory"
-msgstr "Redirige la sortie vers un fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:38
 msgid "Point at a domain other than the default aur.archlinux.org"
@@ -48757,9 +48283,8 @@ msgid "Show info about the daemon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:3
-#, fuzzy
 msgid "Show all loaded things of the specified type"
-msgstr "Afficher les différences entre les révisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:4
 msgid "Show shorter output"
@@ -48798,9 +48323,8 @@ msgid "Limit the depth of recursion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:4
-#, fuzzy
 msgid "Generate output for graphviz's dot"
-msgstr "Générer la sortie dotty pour les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:5
 msgid "Display this help message"
@@ -49263,14 +48787,12 @@ msgid "Show a filter parameter by modifier"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:2
-#, fuzzy
 msgid "Flush filter params specified by mod"
-msgstr "Le fichier est la cible de n liens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "Désactiver cette commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
 msgid "Output delimiter"
@@ -49289,9 +48811,8 @@ msgid "Open file"
 msgstr "Ouvrir le fichier"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:4
-#, fuzzy
 msgid "Start in folder index"
-msgstr "Démarrer dans l’index des dossiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:5
 msgid "Initial set of keystrokes"
@@ -49354,9 +48875,8 @@ msgid "Allow pinging a broadcast address"
 msgstr "Autoriser le ping sur une adresse de diffusion"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:4
-#, fuzzy
 msgid "Do not allow ping to change source address of probes"
-msgstr "Ne pas autoriser ping à changer l’adresse source des sondes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:5
 msgid "Stop after specified number of ECHO_REQUEST packets"
@@ -49389,9 +48909,8 @@ msgid "Send the specified number of packets without waiting for reply"
 msgstr "Envoyer le nombre spécifié de paquets sans délai entre eux"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:12
-#, fuzzy
 msgid "Suppress loopback of multicast packets"
-msgstr "Supprimer le retour pour les paquets diffusés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:13
 msgid "Numeric output only"
@@ -49406,18 +48925,14 @@ msgid "Set Quality of Service -related bits in ICMP datagrams"
 msgstr "Paramétrer les bits de qualité de service dans les datagrammes ICMP"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:17
-#, fuzzy
 msgid "Record route"
-msgstr "Enregistrer le chemin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:18
-#, fuzzy
 msgid ""
 "Bypass the normal routing tables and send directly to a host on an attached "
 "interface"
 msgstr ""
-"Outrepasser les tables de routage et envoyer directement à un hôte sur une "
-"interface connectée"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:19
 msgid "Specifies the number of data bytes to be sent"
@@ -49492,26 +49007,21 @@ msgid "omit the user's full name, remote host and idle time in short format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:1
-#, fuzzy
 msgid "failsafe to overwrite"
 msgstr ""
-"Journaliser les entrées dans le fichier spécifié, en écrasant son contenu"
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:2
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:3
-#, fuzzy
 msgid "Turn on stats"
-msgstr "Activer l’horodatage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:3
-#, fuzzy
 msgid "Automated package installation"
-msgstr "Emplacement secondaire du cache des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "Mettre à jour le ou les paquet(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
@@ -49558,9 +49068,8 @@ msgid "This prints the -I part of \"--cflags\"."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:10
-#, fuzzy
 msgid "Print link flags"
-msgstr "Afficher les drapeaux de lien"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:11
 msgid "This prints the -L/-R part of \"--libs\"."
@@ -49623,9 +49132,8 @@ msgid "List all modules the given packages requires for static linking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:2
-#, fuzzy
 msgid "Delete unsed deps"
-msgstr "Supprimer les fichiers trouvés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:3
 msgid "only show files in a {s}bin/ directory. Works with -s, -l"
@@ -49718,9 +49226,8 @@ msgid "Display help for command"
 msgstr "Afficher l’aide de la commande"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:14
-#, fuzzy
 msgid "Install package file"
-msgstr "Installer le fichier de paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:15
 msgid "Modify annotations on packages"
@@ -49827,9 +49334,8 @@ msgid "Display UPDATING entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:43
-#, fuzzy
 msgid "Show package versions"
-msgstr "Version de l'arbre source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:44
 msgid "Check which package provides a file"
@@ -49874,9 +49380,8 @@ msgid "Delete all installed packages"
 msgstr "Supprimer tous les paquets installés"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:54
-#, fuzzy
 msgid "Case sensitive packages"
-msgstr "Paquets sensibles à la casse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:55
 msgid "Disable deinstallation scripts"
@@ -49891,9 +49396,8 @@ msgid "Treat the package name as shell glob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:58
-#, fuzzy
 msgid "Case insensitive packages"
-msgstr "Paquets insensibles à la casse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:59
 msgid "Remove recursively"
@@ -50103,9 +49607,8 @@ msgid "interactive update mode -- ask whether to rebuild ports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:14
-#, fuzzy
 msgid "no cleaning of distfiles."
-msgstr "Ne pas créer de fichiers de sortie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:15
 msgid "always clean distfiles."
@@ -50160,9 +49663,8 @@ msgid "fail if no package is available."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:28
-#, fuzzy
 msgid "use packages for all build dependencies."
-msgstr "Installer/supprimer les dépendances de construction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:29
 msgid "use package if newer than installed even if the… [See Man Page]"
@@ -50372,9 +49874,8 @@ msgid "Print a deptree for the port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:21
-#, fuzzy
 msgid "List ports in multiple directories"
-msgstr "Lister les ports dans plusieurs dossiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:22
 #: /tmp/fish/implicit/share/completions/prt-get.fish:82
@@ -50730,9 +50231,8 @@ msgid "single-step mode (confirm each query)"
 msgstr "Confirmer chaque requête avant son envoi"
 
 #: /tmp/fish/implicit/share/completions/psql.fish:17
-#, fuzzy
 msgid "single-line mode (end of line terminates SQL command)"
-msgstr "Désactiver les requêtes multi-lignes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:18
 msgid "unaligned table output mode"
@@ -50807,19 +50307,16 @@ msgid "Show estimated time of arrival"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:5
-#, fuzzy
 msgid "Show rate counter"
-msgstr "Afficher le débit d’entrée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:6
-#, fuzzy
 msgid "Show average rate"
-msgstr "Afficher le débit moyen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:7
-#, fuzzy
 msgid "Show total byte counter"
-msgstr "Afficher le total d’octets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:8
 msgid "Show transfer buffer percentage"
@@ -50987,28 +50484,24 @@ msgid "Read one line at a time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:3
-#, fuzzy
 msgid "Set lexer"
-msgstr "Définir la sévérité"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:4
 msgid "Guess lexer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:5
-#, fuzzy
 msgid "Set formater"
-msgstr "Utiliser le format du contexte"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:6
-#, fuzzy
 msgid "Set coma-seperated options"
-msgstr "Définir les options de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:7
-#, fuzzy
 msgid "Set one option"
-msgstr "Définir les options de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:8
 msgid "Set filter"
@@ -51160,9 +50653,8 @@ msgid "Issue errors"
 msgstr "Afficher des erreurs"
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:3
-#, fuzzy
 msgid "specify the file to Run Control file to use"
-msgstr "Spécifier l'expiration de la cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:4
 msgid "Runs the command in bash trace mode (-x). For internal debugging"
@@ -51181,9 +50673,8 @@ msgid "Print a list of applied patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:8
-#, fuzzy
 msgid "Remove the specified or topmost patch from the series file"
-msgstr "Déplacer le fichier spécifier dans la ligne de commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:9
 msgid ""
@@ -51191,9 +50682,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:10
-#, fuzzy
 msgid "Edit the specified file(s) in /usr/bin/vim"
-msgstr "Ouvrir le profil spécifié dans un éditeur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:11
 msgid "Print the list of files that the topmost or specified patch changes"
@@ -51265,9 +50755,8 @@ msgid "Refreshes the specified patch, or the topmost patch by default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:25
-#, fuzzy
 msgid "Remove one or more files from the topmost or named patch"
-msgstr "Appliquer les modifications au référentiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:26
 msgid "Rename the topmost or named patch"
@@ -51423,9 +50912,8 @@ msgid "Run quietly (Does not affect errors)"
 msgstr "Exécuter silencieusement (ne concerne pas les erreurs)"
 
 #: /tmp/fish/implicit/share/completions/read.fish:2
-#, fuzzy
 msgid "Set prompt command"
-msgstr "Paramétrer la commande d’invite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:3
 #: /tmp/fish/implicit/share/completions/set.fish:4
@@ -51476,9 +50964,8 @@ msgid "Store the results as an array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:13
-#, fuzzy
 msgid "Set right-hand prompt command"
-msgstr "Définir ou obtenir la ligne de commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:1
 msgid "Canonicalize, follow symlinks, last can be missing"
@@ -52160,9 +51647,8 @@ msgid "Don’t cross filesystem boundaries"
 msgstr "Ne pas changer de système de fichiers lors de la récursion"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:40
-#, fuzzy
 msgid "Force a fixed checksum block-size"
-msgstr "Forcer une taille de bloc fixe pour la somme de contrôle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:41
 msgid "Specify the remote shell to use"
@@ -52311,13 +51797,10 @@ msgid "Add a file-filtering RULE"
 msgstr "Exclure les fichiers correspondant à RULE"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:75
-#, fuzzy
 msgid ""
 "Same as --filter=’dir-merge /.rsync-filter’ repeated: --filter='- .rsync-"
 "filter'"
 msgstr ""
-"Identique à --filter=’dir-merge /.rsync-filter’ répété: --filter='- .rsync-"
-"filter'"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:76
 msgid "Exclude files matching PATTERN"
@@ -52428,9 +51911,8 @@ msgid "Remote path"
 msgstr "Chemin sur la destination"
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:1
-#, fuzzy
 msgid "Definition"
-msgstr "Fonction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:2
 msgid "Do not remove source tree after installation"
@@ -52461,48 +51943,40 @@ msgid "Compiler debug mode"
 msgstr "Mode débogage du compilateur"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:1
-#, fuzzy
 msgid "Make bucket"
-msgstr "Les crochets ne concordent pas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:2
-#, fuzzy
 msgid "Remove bucket"
-msgstr "Supprimer le paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:3
-#, fuzzy
 msgid "List objects or buckets"
-msgstr "Lister le contenu des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:4
-#, fuzzy
 msgid "List all object in all buckets"
-msgstr "Lister toutes les boxes installées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:5
-#, fuzzy
 msgid "Put file into bucket"
-msgstr "Envoyer les fichiers sur la sortie standard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:6
-#, fuzzy
 msgid "Get file from bucket"
-msgstr "Obtenir tous les fichiers du dossier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:7
-#, fuzzy
 msgid "Delete file from bucket"
-msgstr "Supprimer du contenu de l’archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:8
 msgid "Delete file from bucket (alias for del)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:9
-#, fuzzy
 msgid "Restore file from Glacier storage"
-msgstr "Supprimer un fichier du dépôt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:10
 msgid "Synchronize a directory tree to S3"
@@ -52513,9 +51987,8 @@ msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "Afficher les informations sur les fichiers compressés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -52526,9 +51999,8 @@ msgid "Modify object metadata"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:15
-#, fuzzy
 msgid "Move object"
-msgstr "Supprimer les fichiers d’objet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:16
 msgid "Modify Access control list for Bucket or Files"
@@ -52555,28 +52027,24 @@ msgid "Modify Bucket Requester Pays policy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:22
-#, fuzzy
 msgid "Show multipart uploads"
-msgstr "Afficher les journaux des validations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:23
 msgid "Abort a multipart upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:24
-#, fuzzy
 msgid "List parts of a multipart upload"
-msgstr "Lister les ports dans plusieurs dossiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:25
-#, fuzzy
 msgid "Enable/disable bucket access logging"
-msgstr "(Dés)activer une session"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:26
-#, fuzzy
 msgid "Sign arbitrary string using the secret key"
-msgstr "Signer une clé publique avec votre clé privée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:27
 msgid "Sign an S3 URL to provide limited public access with expiry"
@@ -52587,14 +52055,12 @@ msgid "Fix invalid file names in a bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:29
-#, fuzzy
 msgid "Create Website from bucket"
-msgstr "Restaurer le périphérique depuis une sauvegarde"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:30
-#, fuzzy
 msgid "Delete Website"
-msgstr "Utiliser le fichier de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:31
 msgid "Info about Website"
@@ -52609,52 +52075,44 @@ msgid "Upload a lifecycle policy for the bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:34
-#, fuzzy
 msgid "Remove a lifecycle policy for the bucket"
-msgstr "Supprimer un échantillon du cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:35
-#, fuzzy
 msgid "List CloudFront distribution points"
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:36
 msgid "Display CloudFront distribution point parameters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:37
-#, fuzzy
 msgid "Create CloudFront distribution point"
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:38
-#, fuzzy
 msgid "Delete CloudFront distribution point"
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:39
-#, fuzzy
 msgid "Change CloudFront distribution point parameters"
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:40
 msgid "Display CloudFront invalidation request(s) status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:42
-#, fuzzy
 msgid "Run interactive (re)configuration tool"
-msgstr "Spécifier un fichier de configuration alternatif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "Sauvegarder la configuration actuelle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
-#, fuzzy
 msgid "AWS Access Key"
-msgstr "Afficher l’horodatage de dernier accès"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:46
 msgid "AWS Secret Key"
@@ -52669,58 +52127,48 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "Obtenir la valeur (par défaut)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
-#, fuzzy
 msgid "Don't use HTTPS"
-msgstr "Ne pas utiliser le démon"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:51
-#, fuzzy
 msgid "Encrypt files before uploading"
-msgstr "Afficher la taille du fichier avant les données"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:52
-#, fuzzy
 msgid "Don't encrypt files"
-msgstr "Ne pas utiliser de fichier d’échange"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:53
-#, fuzzy
 msgid "Force overwrite"
-msgstr "Ne pas remplacer les fichiers existants à l’extraction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:54
-#, fuzzy
 msgid "Resume partially downloaded file"
-msgstr "Compléter un téléchargement partiel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:55
-#, fuzzy
 msgid "Resume partially uploaded files"
-msgstr "Conserver les fichiers partiellement transférés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:56
 msgid "Resume multipart upload by UploadId"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:57
-#, fuzzy
 msgid "Skip existing files at destination"
-msgstr "Supprimer les fichiers de destination existants"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
-#, fuzzy
 msgid "Upload/download/delete recursively"
-msgstr "Télécharger récursivement les dépendances"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:59
-#, fuzzy
 msgid "Check MD5 sums (default)"
-msgstr "Luminosité (par défaut)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:60
 msgid "Skip MD5 sum check"
@@ -52743,32 +52191,28 @@ msgid "Revoke permission to named user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:65
-#, fuzzy
 msgid "Days to keep restored file"
-msgstr "Ne pas conserver le nom de fichier et son horodatage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:66
-#, fuzzy
 msgid "S3 glacier restore priority"
-msgstr "Afficher également la priorité du dépôt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:67
 msgid "Delete objects not found locally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:68
-#, fuzzy
 msgid "Don't delete dest objects"
-msgstr "Ne pas supprimer les fichiers en entrée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:69
 msgid "Delete after upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:70
-#, fuzzy
 msgid "Delete no more than NUM files"
-msgstr "Ne pas supprimer plus de NUM fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:71
 msgid "Max objects per response"
@@ -52779,66 +52223,56 @@ msgid "Additional parallel upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:73
-#, fuzzy
 msgid "Delete remotely after fetch"
-msgstr "Supprimer du contenu de l’archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:74
-#, fuzzy
 msgid "Preserve FS attributes"
-msgstr "Conserver les horodatages de modification des fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:75
-#, fuzzy
 msgid "Don't store FS attributes"
-msgstr "Ne pas remplacer les fichiers existants à l’extraction"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:76
-#, fuzzy
 msgid "Exclude GLOB matches"
-msgstr "Exclure certains systèmes de fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:77
-#, fuzzy
 msgid "--exclude GLOBs from FILE"
-msgstr "Lire les motifs d’inclusion depuis FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:78
 msgid "Exclude REGEXP matches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:79
-#, fuzzy
 msgid "Read --rexclude REGEXPs from FILE"
-msgstr "Lire les motifs d’inclusion depuis FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:80
 msgid "Include GLOB matches even if previously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:81
-#, fuzzy
 msgid "Read --include GLOBs from FILE"
-msgstr "Lire les motifs d’inclusion depuis FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:82
 msgid "Include REGEXP matches even if preiously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:83
-#, fuzzy
 msgid "Read --rinclude REGEXPs from FILE"
-msgstr "Lire les motifs d’inclusion depuis FILE"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:84
-#, fuzzy
 msgid "Read source-file names from FILE"
-msgstr "Lire la liste des fichiers à transférer depuis le fichier spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:85
-#, fuzzy
 msgid "Create bucket in region"
-msgstr "Créer une nouvelle révision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:86
 msgid "S3 endpoint (default: s3.amazonaws.com)"
@@ -52849,9 +52283,8 @@ msgid "DNS-style bucket+hostname:port template for bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:88
-#, fuzzy
 msgid "Store with reduced redundancy"
-msgstr "Comparer les horodatages de modification moins précisément"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:89
 msgid "Store without reduced redundancy"
@@ -52882,23 +52315,20 @@ msgid "Don't guess MIME-type, use default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:96
-#, fuzzy
 msgid "Don't use mime magic when guessing"
-msgstr "Ne pas utiliser de chaîne de commentaire"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:97
-#, fuzzy
 msgid "Force MIME-type"
-msgstr "Forcer oui"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:98
 msgid "Add HTTP header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:99
-#, fuzzy
 msgid "Remove HTTP header"
-msgstr "Supprimer un dossier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:100
 msgid "Use server-side encryption for upload"
@@ -52909,18 +52339,16 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "Convertir vers l’encodage spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:104
-#, fuzzy
 msgid "Use S3 name as-is"
-msgstr "Renommer un disque"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:105
 msgid "No multipart on files larger than --multipart-chunk-size-mb"
@@ -52935,18 +52363,16 @@ msgid "Include MD5 sums in bucket listings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:108
-#, fuzzy
 msgid "Print sizes in human-readable form"
-msgstr "Utiliser les préfixes SI pour les nombres"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:109
 msgid "Name of index-document"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:110
-#, fuzzy
 msgid "Name of error-document"
-msgstr "Nom de la version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:111
 msgid "When expiration rule takes effect"
@@ -52961,28 +52387,24 @@ msgid "Apply expiry to objects matching prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:114
-#, fuzzy
 msgid "Show progress (default on TTY)"
-msgstr "Afficher la progression des transferts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:115
 msgid "Don't show progress meter (default if non-TTY)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:116
-#, fuzzy
 msgid "Show file transfer stats"
-msgstr "Donner des statistiques sur les transferts individuels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:117
-#, fuzzy
 msgid "Enable CloudFront distribution"
-msgstr "Version de Debian"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:118
-#, fuzzy
 msgid "Disable CloudFront distribution"
-msgstr "Version de Debian"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:119
 msgid "Invalidate CloudFront file"
@@ -53009,68 +52431,56 @@ msgid "Set COMMENT for CloudFront distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:125
-#, fuzzy
 msgid "Set default root object"
-msgstr "Paramétrer la cible par défaut pour le démarrage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:130
-#, fuzzy
 msgid "Cache FILE containing MD5 values"
 msgstr ""
-"Copier les permissions du fichier spécifié au lieu de les interpréter depuis "
-"la ligne de commande"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:131
-#, fuzzy
 msgid "Silence stdout output"
-msgstr "Générer une sortie triée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:132
 msgid "Path to SSL CA certificate FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:133
-#, fuzzy
 msgid "Validate SSL certificate"
-msgstr "Ajouter un certificat de confiance"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:134
-#, fuzzy
 msgid "Don't validate SSL certificate"
-msgstr "Ne pas vérifier le certificat du serveur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:135
-#, fuzzy
 msgid "Validate SSL hostname"
-msgstr "Valider le stockage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:136
-#, fuzzy
 msgid "Don't validate SSL hostname"
-msgstr "Ne pas vérifier le certificat du serveur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:137
 msgid "Use AWS Signature version 2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:138
-#, fuzzy
 msgid "Limit upload or download speed (bytes/sec)"
-msgstr "Spécifier la limite du débit descendant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:139
 msgid "Set REQUESTER PAYS for operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:140
-#, fuzzy
 msgid "Produce long listing"
-msgstr "Afficher la liste longue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:141
-#, fuzzy
 msgid "Stop on error in transfer"
-msgstr "Afficher la progression des transferts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:142
 msgid "Provide Content-Disposition for signed URLs"
@@ -53268,93 +52678,80 @@ msgid "Silence warnings and status messages during compilation."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:1
-#, fuzzy
 msgid "Create a new sbt project from the given template"
-msgstr "Créer, dans le dossier spécifié, un nouveau projet depuis un paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:2
 msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "Afficher ce message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "Afficher les périphériques"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
-#, fuzzy
 msgid "Set log level to debug"
-msgstr "Réinitialiser à 0 le niveau de verbosité"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:6
-#, fuzzy
 msgid "Disable ANSI color codes"
-msgstr "Désactiver la couleur"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:7
 msgid "Launch even if there's no sbt project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:8
-#, fuzzy
 msgid "Use all local caches"
-msgstr "Nettoyer les caches locaux"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:9
 msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "Exécuter en mode noninteractif"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "Spécifier le dossier de démarrage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
-#, fuzzy
 msgid "Specify path to local Ivy repository"
-msgstr "Spécifier l’URL du dépôt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "Définir les options de config"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:16
-#, fuzzy
 msgid "Use specified version of sbt"
-msgstr "Utiliser l’algorithme de compression spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:17
-#, fuzzy
 msgid "Use specified jar as the sbt launcher"
-msgstr "Utiliser la clé spécifiée pour la signature"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:18
 msgid "Use an RC version of sbt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:19
-#, fuzzy
 msgid "Use a snapshot version of sbt"
-msgstr "Afficher une version concise et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:20
 msgid "Alternate JAVA_HOME"
@@ -53418,9 +52815,8 @@ msgid "Gamma-correction table [0..255, …]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:12
-#, fuzzy
 msgid "Scan mode"
-msgstr "Mode parcours"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:13
 msgid "Device name to use"
@@ -53443,9 +52839,8 @@ msgid "The filename of the image to be loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:18
-#, fuzzy
 msgid "Output image format"
-msgstr "Format de sortie de l’image"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:19
 msgid "Include this ICC profile into TIFF file"
@@ -53494,9 +52889,8 @@ msgid "Test backend thoroughly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:30
-#, fuzzy
 msgid "List all available backend options"
-msgstr "Réinstaller les paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:31
 msgid "Display this help message and exit"
@@ -53724,9 +53118,8 @@ msgid "Detect which folder screen uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:2
-#, fuzzy
 msgid "Get the socket list on mac"
-msgstr "Afficher la liste des sockets sur la MAC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:3
 msgid "Get the socket list"
@@ -53779,9 +53172,8 @@ msgid "Escape character"
 msgstr "Caractère d’échappement"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:16
-#, fuzzy
 msgid "Flow control on"
-msgstr "Contrôle du flux activé"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:17
 msgid "Flow control off"
@@ -53821,9 +53213,8 @@ msgid "Optimal output"
 msgstr "Sortie optimale"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:28
-#, fuzzy
 msgid "Preselect window"
-msgstr "Fenêtre de présélection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
 msgid "Set shell"
@@ -53842,18 +53233,16 @@ msgid "UTF-8 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:35
-#, fuzzy
 msgid "Wipe dead sessions"
-msgstr "Détruire les sessions mortes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:36
 msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "Envoyer la commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
 msgid "Display version information and exit"
@@ -53880,9 +53269,8 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "Exécuter un ensemble de commandes plusieurs fois"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
 msgid "Select a window or rectangle with the mouse"
@@ -54043,9 +53431,8 @@ msgid "Specifies keycodes component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:9
-#, fuzzy
 msgid "Specifies name of keymap to load"
-msgstr "Liste des paquets à installer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:10
 msgid "Specifies layout used to choose component names"
@@ -54064,9 +53451,8 @@ msgid "Print a complete xkb_keymap description and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:14
-#, fuzzy
 msgid "Print the current layout settings and exit"
-msgstr "Afficher les paramètres d’affichage actuels et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:15
 msgid "Name of rules file to use"
@@ -54093,88 +53479,69 @@ msgid "Specifies layout variant used to choose component names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:1
-#, fuzzy
 msgid "Verify a signed checksum list"
-msgstr "Forcer une taille de bloc fixe pour la somme de contrôle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "Utiliser le format unifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
-#, fuzzy
 msgid "Verify a signed message and sig"
-msgstr "Afficher un message d’utilisation et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:1
-#, fuzzy
 msgid "Test if snap has yet to be given the subcommand"
-msgstr "Vérifier si apt doit encore se faire donner la sous-commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:3
-#, fuzzy
 msgid "Test if snap command should have packages as potential completion"
 msgstr ""
-"Vérifier si la commande apt devrait avoir les paquets comme complétion "
-"potentielle"
 
 #: /tmp/fish/implicit/share/completions/snap.fish:4
-#, fuzzy
 msgid "Test if snap command should have files as potential completion"
 msgstr ""
-"Vérifier si la commande apt devrait avoir les paquets comme complétion "
-"potentielle"
 
 #: /tmp/fish/implicit/share/completions/snap.fish:5
 #: /tmp/fish/implicit/share/completions/snap.fish:6
-#, fuzzy
 msgid "List disabled snaps"
-msgstr "Lister les greffons installés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:7
-#, fuzzy
 msgid "List installed snaps"
-msgstr "Lister les greffons installés"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "Arrêter l’interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
-#, fuzzy
 msgid "List change IDs"
-msgstr "Lister les modifications"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "Lister tous les remisages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
-#, fuzzy
 msgid "Check that no assertion type is used yet"
-msgstr "Vérifiez que votre type de terminal est supporté sur ce système"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:12
 msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "Lister les types de chiffrement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
-#, fuzzy
 msgid "Show this help message"
-msgstr "Afficher ce message d’aide"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:16
-#, fuzzy
 msgid "Snap"
-msgstr "Instantanné"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:1
 msgid "Ignore leading blanks"
@@ -54269,9 +53636,8 @@ msgid "Go to background"
 msgstr "Mettre la tâche en arrière-plan"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:7
-#, fuzzy
 msgid "Allow remote host to connect to local forwarded ports"
-msgstr "Autoriser l’hôte distant à se connecter aux ports redirigés localement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:8
 msgid "Smartcard device"
@@ -54518,19 +53884,16 @@ msgid "Get the appropriate GHC for your project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:40
-#, fuzzy
 msgid "Print out handy path information"
-msgstr "Obtention des informations utilisateur impossible."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:41
-#, fuzzy
 msgid "Unpack one or more packages locally"
-msgstr "Installer un ou des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:42
-#, fuzzy
 msgid "Update the package index"
-msgstr "Mettre à jour la liste des paquets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:43
 msgid "Upgrade to the latest stack (experimental)"
@@ -54541,9 +53904,8 @@ msgid "Upload a package to Hackage"
 msgstr "Téléverser un paquet vers Hackage"
 
 #: /tmp/fish/implicit/share/completions/stack.fish:45
-#, fuzzy
 msgid "Create source distribution tarballs"
-msgstr "Nettoyer les répertoires source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:46
 msgid "Visualize your project's dependency graph using Graphviz dot"
@@ -54700,9 +54062,8 @@ msgid "Trim only leading characters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:5
-#, fuzzy
 msgid "Trim only trailing characters"
-msgstr "Dédoublonner seulement les derniers caractères"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:6
 msgid "Specify the chars to trim (default: whitespace)"
@@ -54745,33 +54106,28 @@ msgid "Remove newline"
 msgstr "Supprimer le saut de ligne"
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "Supprime les paquet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "Exécuter la commande spécifiée"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
-#, fuzzy
 msgid "Open a new window"
-msgstr "Paramétrer la fenêtre parente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:4
-#, fuzzy
 msgid "Add folders to the current window"
-msgstr "Ne pas s’attacher à la fenêtre courante"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:5
 msgid "Wait for the files to be closed before returning"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:6
-#, fuzzy
 msgid "Don't activate the application"
-msgstr "Ne pas effectuer l’action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:7
 msgid "Keep the application activated after closing the file"
@@ -54798,9 +54154,8 @@ msgid "Remove the credential timestamp entirely"
 msgstr "Supprimer totalement l’horodatage des identifiants"
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:6
-#, fuzzy
 msgid "Preserve group vector"
-msgstr "Préserver le vecteur de groupe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:7
 msgid "Read password from stdin"
@@ -55545,9 +54900,8 @@ msgid "Set the specified UUID for the container."
 msgstr "Paramétrer l’UUID du conteneur"
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:9
-#, fuzzy
 msgid "Make the container part of the specified slice"
-msgstr "Inclure le conteneur dans la tranche spécifiéeu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:10
 msgid "Set a unit property on the scope unit"
@@ -55737,12 +55091,9 @@ msgid "Like -f, but also follow renamed or rotated files"
 msgstr "Comme -f, mais suivre également les renommage et rotations"
 
 #: /tmp/fish/implicit/share/completions/tail.fish:17
-#, fuzzy
 msgid ""
 "output the last K lines, instead of the last 10 - or only K lines with -r"
 msgstr ""
-"Afficher les K dernières lignes, au lieu des 10 dernières ; vous pouvez "
-"aussi utiliser avec -r pour n’afficher que K lignes"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:1
 #: /tmp/fish/implicit/share/completions/tar.fish:2
@@ -55886,9 +55237,8 @@ msgstr ""
 "Préserver les permissions, et lister les fichiers dans l’ordre de l’archive"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:42
-#, fuzzy
 msgid "Show record number"
-msgstr "Afficher le numéro d’enregistrement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:43
 msgid "Remove files after adding to archive"
@@ -56107,9 +55457,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:30
 #: /tmp/fish/implicit/share/completions/terraform.fish:87
 #: /tmp/fish/implicit/share/completions/terraform.fish:108
-#, fuzzy
 msgid "Resource to target"
-msgstr "Ressource à viser"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:14
 #: /tmp/fish/implicit/share/completions/terraform.fish:18
@@ -56220,9 +55569,8 @@ msgid "Configure the backend for this environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:63
-#, fuzzy
 msgid "Backend configuration"
-msgstr "Recharger la configuration du service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:64
 msgid "Download modules for this configuration"
@@ -56237,9 +55585,8 @@ msgid "Suppress prompts about copying state data"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:70
-#, fuzzy
 msgid "Read an output from a state file"
-msgstr "Lire la tâche depuis le fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:71
 msgid "Path to the state file to read"
@@ -56258,9 +55605,8 @@ msgid "Generate and show an execution plan"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:76
-#, fuzzy
 msgid "Generate a plan to destroy all resources"
-msgstr "Générer un plan pour détruire toutes les ressources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:77
 msgid "Return detailed exit codes"
@@ -56574,9 +55920,8 @@ msgid "Compare creation times"
 msgstr "Comparer les horodatages de création"
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:11
-#, fuzzy
 msgid "Compare file data forks"
-msgstr "Comparer les forks fichiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:12
 msgid "Compare ACLs"
@@ -56664,9 +56009,8 @@ msgid "Print paths for all snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "Afficher le chemin du dossier machine actuel"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
 msgid "Removes a backup destination"
@@ -56709,9 +56053,8 @@ msgid "Block until finished"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:46
-#, fuzzy
 msgid "Automatic rotation"
-msgstr "Compression automatique"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:47
 msgid "Backup destination"
@@ -56782,11 +56125,8 @@ msgid "Specify the name of the server socket to use"
 msgstr "Spécifier le nom de la socket serveur à utiliser"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:14
-#, fuzzy
 msgid "Full path to server socket. If set, -L is ignored."
 msgstr ""
-"Spécifier le chemin complet de la socket serveur à utiliser ; si utilisé, -L "
-"est ignoré"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:15
 msgid "attach to existing session"
@@ -56849,14 +56189,12 @@ msgid "lock session"
 msgstr "Verrouiller la session"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:28
-#, fuzzy
 msgid "create a new session with name session-name"
-msgstr "Créer une nouvelle session au nom spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:29
-#, fuzzy
 msgid "don't attach to current window"
-msgstr "Ne pas s’attacher à la fenêtre courante"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:30
 msgid "window-name"
@@ -56875,9 +56213,8 @@ msgid "height"
 msgstr "hauteur"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:34
-#, fuzzy
 msgid "refresh client"
-msgstr "Rafraîchir le client courant"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:35
 msgid "update client status bar"
@@ -57504,9 +56841,8 @@ msgid "Encrypts a file and adds decryption steps to .travis.yml"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:10
-#, fuzzy
 msgid "Displays or changes the API endpoint"
-msgstr "Afficher ou modifier l’aboutissement de l’API"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
 msgid "Show or modify build environment variables"
@@ -57645,9 +56981,8 @@ msgid "List directories only"
 msgstr "Lister seulement les dossiers"
 
 #: /tmp/fish/implicit/share/completions/tree.fish:3
-#, fuzzy
 msgid "Follow symbolic links like directories"
-msgstr "Suivre les liens symboliques comme les dossiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:4
 msgid "Print the full path prefix for each file"
@@ -57806,9 +57141,8 @@ msgid "Turn off hyperlinks in HTML output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:44
-#, fuzzy
 msgid "Print usage and this help message and exit"
-msgstr "Charger le média et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:1
 msgid "use the complement of SET1"
@@ -57930,18 +57264,16 @@ msgid "graphic characters"
 msgstr "caractères graphiques"
 
 #: /tmp/fish/implicit/share/completions/tr.fish:30
-#, fuzzy
 msgid "ideographic characters"
-msgstr "idéogrammes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:31
 msgid "lower-case alphabetic characters"
 msgstr "lettres en minuscule"
 
 #: /tmp/fish/implicit/share/completions/tr.fish:32
-#, fuzzy
 msgid "phonographic characters"
-msgstr "phonogrammes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:33
 msgid "printable characters"
@@ -58106,9 +57438,8 @@ msgid "Object to "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:32
-#, fuzzy
 msgid "Block device to "
-msgstr "Périphérique de blocs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:33
 msgid "Object path for ATA device"
@@ -58556,9 +57887,8 @@ msgid "Adds a box"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:7
-#, fuzzy
 msgid "Lists all the installed boxes"
-msgstr "Lister toutes les boxes installées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:8
 msgid "Removes a box from Vagrant"
@@ -58569,9 +57899,8 @@ msgid "Repackages the given box for redistribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:10
-#, fuzzy
 msgid "Verifies the box with the given provider"
-msgstr "Vérifier la box du fournisseur spécifié"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:11
 msgid "Connect to a remotely shared Vagrant environment"
@@ -58751,9 +58080,8 @@ msgid "Does not authenticate"
 msgstr "Ne pas s’authentifier"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:56
-#, fuzzy
 msgid "Outputs configuration for an SSH config file"
-msgstr "Afficher la configuration pour un fichier de configuration SSH"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:57
 msgid "Name of the host for the outputted configuration"
@@ -58824,14 +58152,12 @@ msgid "Continue trace below main()"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:15
-#, fuzzy
 msgid "Supress errors from file"
-msgstr "Masquer les erreurs provenant du fichier"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:16
-#, fuzzy
 msgid "Print suppressions for detected errors"
-msgstr "Afficher le masquage des erreurs détectées"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:17
 msgid "Start debugger on error"
@@ -59251,9 +58577,8 @@ msgid "Source and execute script file"
 msgstr "Interpréter et exécuter le fichier de script"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:12
-#, fuzzy
 msgid "Set the cursor to tag"
-msgstr "Paramétrer le curseur pour un étiquetage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:13
 msgid "Terminal name"
@@ -60094,9 +59419,8 @@ msgid "Dont print header"
 msgstr "Ne pas afficher l’en-tête"
 
 #: /tmp/fish/implicit/share/completions/w.fish:2
-#, fuzzy
 msgid "Ignore username for time calculations"
-msgstr "Ignorer le nom d’utilisateur pour les calculs temporels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/w.fish:3
 msgid "Short format"
@@ -60570,14 +59894,12 @@ msgid "Print dead processes"
 msgstr "Afficher les processus morts"
 
 #: /tmp/fish/implicit/share/completions/who.fish:4
-#, fuzzy
 msgid "Print line of headings"
-msgstr "Afficher la ligne d’en-têtes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:5
-#, fuzzy
 msgid "Print idle time"
-msgstr "Afficher le temps d’inutilisation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:6
 msgid "Print login process"
@@ -60667,9 +59989,8 @@ msgid "Connect"
 msgstr "Se connecter"
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:7
-#, fuzzy
 msgid "List encryption types"
-msgstr "Lister les types de chiffrement"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:8
 msgid "Perform operation on wireless network"
@@ -61175,9 +60496,8 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
-#, fuzzy
 msgid "Set reverse video mode"
-msgstr "Paramétrer l’inversion de la vidéo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
 msgid "Set the background of the page display"
@@ -61188,9 +60508,8 @@ msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "Paramétrer le facteur d’agrandissement initial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
 msgid "Start in continuous view mode"
@@ -61277,9 +60596,8 @@ msgid "Print copyright and version information"
 msgstr "Afficher les droits d’auteur et les informations de version"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:2
-#, fuzzy
 msgid "Display grammar and exit"
-msgstr "Afficher la grammaire et quitter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:3
 msgid "Select window by id"
@@ -62771,9 +62089,8 @@ msgstr ""
 "ou un instantané antérieur"
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:30
-#, fuzzy
 msgid "Execute a ZFS Channel Program"
-msgstr "Exécuter un programme de canal ZFS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:31
 #: /tmp/fish/implicit/share/completions/zfs.fish:53
@@ -64196,9 +63513,8 @@ msgid "Add the repository as disabled"
 msgstr "Ajouter le dépôt désactivé"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:90
-#, fuzzy
 msgid "Probe URI"
-msgstr "Vérifier l’URI"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:91
 msgid "Don't probe URI, probe later during refresh"
@@ -64848,9 +64164,8 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "Envoyer la commande"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
@@ -64899,9 +64214,8 @@ msgid "Maximum uploads at once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:2
-#, fuzzy
 msgid "Number of seconds between keepalives"
-msgstr "Nombre de secondes entre les paquets de maintien de la connexion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:3
 msgid "Bytes per request"
@@ -64952,9 +64266,8 @@ msgid "Maximum outgoing slice length"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:15
-#, fuzzy
 msgid "Maximum time to guess rate"
-msgstr "Temps maximum pour deviner le débit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:16
 msgid "IP to bind to locally"
@@ -65021,9 +64334,8 @@ msgid "Complete using all available commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_convert_options.fish:1
-#, fuzzy
 msgid "Complete Convert options"
-msgstr "Compléter les options Convert"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
 msgid "Complete directory prefixes"
@@ -65286,9 +64598,8 @@ msgid "Complete using files"
 msgstr "Compléter en utilisant les fichiers"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
-#, fuzzy
 msgid "Print list host-names with user@"
-msgstr "Lister les noms d’hôtes connus"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_users.fish:1
 msgid "Print a list of local users, with the real user name as a description"
@@ -65400,11 +64711,6 @@ msgstr ""
 msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
-#, fuzzy
-msgid "Prompt function for Git"
-msgstr "Fonctions d’invite pour Git"
-
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
@@ -65531,9 +64837,8 @@ msgid "Print a list of all known filesystem types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
-#, fuzzy
 msgid "Print a list of local groups"
-msgstr "Lister les mises à jour disponibles"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
 msgid "Print help message for the specified fish function or builtin"
@@ -65576,9 +64881,8 @@ msgid "Print a list of local users"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_applications_directories.fish:1
-#, fuzzy
 msgid "Print directories where desktop files are stored"
-msgstr "Omettre les dossiers pour la préservation des horodatages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 msgid "Print XDG mime types"
@@ -65618,11 +64922,8 @@ msgid "Prompt function for svn"
 msgstr "Fonction d’invite pour svn"
 
 #: /tmp/fish/implicit/share/functions/_fish_systemctl.fish:1
-#, fuzzy
 msgid "Call systemctl with some options from the current commandline"
 msgstr ""
-"Vérifier si une option spécifique a été donnée sur la ligne de commande "
-"actuelle"
 
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
@@ -65782,7 +65083,6 @@ msgstr ""
 msgid "Edit variable value"
 msgstr ""
 
-#, fuzzy
 #~ msgid "%ls: --array option requires a single variable name.\n"
 #~ msgstr ""
 #~ "%ls: 'Erase' requiert un nom de variable\n"
@@ -65800,7 +65100,6 @@ msgstr ""
 #~ "%ls: Plusieurs noms de variable spécifiés dans un seul appel (%ls and %."
 #~ "*ls)\n"
 
-#, fuzzy
 #~ msgid "%ls: Values cannot be specfied with erase\n"
 #~ msgstr ""
 #~ "%ls: 'erase' ne peut pas spécifier des valeurs\n"
@@ -65813,11 +65112,9 @@ msgstr ""
 #~ "%ls: Attention: portée universelle selectionnée, mais une variable "
 #~ "globale '%ls' existe.\n"
 
-#, fuzzy
 #~ msgid "string: Expected subcommand\n"
 #~ msgstr "string: Argument attendu\n"
 
-#, fuzzy
 #~ msgid "string: Unknown subcommand '%ls'\n"
 #~ msgstr "string: Commande inconnue '%ls'\n"
 
diff --git a/po/nb.po b/po/nb.po
index afad29bb2..a8a029b4c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1543,13 +1543,10 @@ msgid "There are still jobs active:\n"
 msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   PID  Command\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -3272,9 +3269,8 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%s %s: Expected one argument\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
diff --git a/po/nn.po b/po/nn.po
index 9ffb4a1fb..bf097c764 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1543,13 +1543,10 @@ msgid "There are still jobs active:\n"
 msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   PID  Command\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -3272,9 +3269,8 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%s %s: Expected one argument\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
diff --git a/po/pl.po b/po/pl.po
index 70d0d8412..f4ca5da56 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -33,14 +33,14 @@ msgid "%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag string '%ls' is not valid\n"
-msgstr "%ls: maksymalna wartość '%ls' nie jest prawidłową liczbą\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag '%ls' is not valid\n"
-msgstr "%ls: maksymalna wartość '%ls' nie jest prawidłową liczbą\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:196
 #, c-format
@@ -79,14 +79,14 @@ msgid "%ls: No option specs were provided\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --min-args value '%ls'\n"
-msgstr "%ls: Nieprawidłową wartość początkowa '%ls'\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:401
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --max-args value '%ls'\n"
-msgstr "%ls: Nieprawidłową wartość początkowa '%ls'\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:23
 #, c-format
@@ -106,9 +106,9 @@ msgid "%ls: There are no suitable jobs\n"
 msgstr "%ls: Brak pasujących zadań\n"
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid job specifier\n"
-msgstr "%ls: '%ls' nie jest zadaniem\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:95 src/builtin_disown.cpp:89 src/builtin_wait.cpp:163
 #, c-format
@@ -191,29 +191,29 @@ msgid "%ls: Could not set PWD variable\n"
 msgstr "%ls: Nie można ustawić zmiennej PWD\n"
 
 #: src/builtin_commandline.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown input function '%ls'"
-msgstr "%ls: Nieznane wejście funkcji '%ls'"
+msgstr ""
 
 #: src/builtin_complete.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid token '%ls'\n"
-msgstr "%ls: Nieprawidłowa ścieżka: %ls\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:203
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -s requires a non-empty string\n"
-msgstr "%ls: Nazwa zmiennej nie może być pustym ciągiem znaków \n"
+msgstr ""
 
 #: src/builtin_complete.cpp:211
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -l requires a non-empty string\n"
-msgstr "%ls: Nazwa zmiennej nie może być pustym ciągiem znaków \n"
+msgstr ""
 
 #: src/builtin_complete.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -o requires a non-empty string\n"
-msgstr "%ls: Nazwa zmiennej nie może być pustym ciągiem znaków \n"
+msgstr ""
 
 #: src/builtin_contains.cpp:75
 #, c-format
@@ -492,9 +492,9 @@ msgid "%ls: Cannot find calling job for event handler"
 msgstr ""
 
 #: src/builtin_function.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid process id '%ls'"
-msgstr "%ls: Nieprawidłowy identyfikator procesu %ls"
+msgstr ""
 
 #: src/builtin_function.cpp:179
 #, c-format
@@ -516,9 +516,9 @@ msgstr ""
 "i nie może być wykorzystywana jako nazwa funkcji"
 
 #: src/builtin_function.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unexpected positional argument '%ls'"
-msgstr "%ls: Oczekiwano jeden argument, otrzymano %lu"
+msgstr ""
 
 #: src/builtin_functions.cpp:275 src/builtin.h:38
 #, c-format
@@ -536,9 +536,9 @@ msgid "%ls: Function '%ls' does not exist\n"
 msgstr "%ls: Funkcja '%ls' nie istnieje\n"
 
 #: src/builtin_functions.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
-msgstr "%ls: Oczekiwano dokładnie jednej nazwy funkcji\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:342
 #, c-format
@@ -619,9 +619,9 @@ msgid "%ls: There are no jobs\n"
 msgstr "%ls: Nie ma żadnych zadań\n"
 
 #: src/builtin_math.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid scale value\n"
-msgstr "%ls: '%ls' nie jest zadaniem\n"
+msgstr ""
 
 #: src/builtin_math.cpp:148
 #, c-format
@@ -634,9 +634,9 @@ msgid "More than %d var names in math expression."
 msgstr ""
 
 #: src/builtin_math.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid expression: %ls\n"
-msgstr "%ls: Nieprawidłowy identyfikator procesu %ls\n"
+msgstr ""
 
 #: src/builtin_printf.cpp:243
 msgid "Number out of range"
@@ -769,9 +769,9 @@ msgid "%ls: Invalid index starting at '%ls'\n"
 msgstr ""
 
 #: src/builtin_set.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: not set in %ls scope\n"
-msgstr "%ls: Nieznana opcja '%ls'\n"
+msgstr ""
 
 #: src/builtin_set.cpp:542
 msgid "exported"
@@ -792,9 +792,9 @@ msgid "$%ls[%d]: length=%d value=|%ls|\n"
 msgstr ""
 
 #: src/builtin_set.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: invalid var name\n"
-msgstr "%ls: Nieprawidłowy stan\n"
+msgstr ""
 
 #: src/builtin_set.cpp:584
 #, c-format
@@ -817,9 +817,9 @@ msgid "%ls: Error while reading file '%ls'\n"
 msgstr "%ls: Nie udało się odczytać '%ls'\n"
 
 #: src/builtin_status.cpp:155
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid level value '%ls'\n"
-msgstr "%ls: Nieprawidłowa wartość długości  '%ls'\n"
+msgstr ""
 
 #: src/builtin_status.cpp:276
 msgid "This is a login shell\n"
@@ -851,9 +851,8 @@ msgid "Standard input"
 msgstr "Standardowe wejście"
 
 #: src/builtin_status.cpp:320
-#, fuzzy
 msgid "Not a function"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: src/builtin_string.cpp:39
 #, c-format
@@ -861,9 +860,9 @@ msgid "%ls: Expected argument\n"
 msgstr "%ls: Oczekiwano argumentu\n"
 
 #: src/builtin_string.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid escape style '%ls'\n"
-msgstr "%ls: Nieprawidłową wartość początkowa '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:238
 #, c-format
@@ -871,14 +870,14 @@ msgid "%ls: Invalid length value '%ls'\n"
 msgstr "%ls: Nieprawidłowa wartość długości  '%ls'\n"
 
 #: src/builtin_string.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid max value '%ls'\n"
-msgstr "%ls: Nieprawidłową wartość początkowa '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:275
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid count value '%ls'\n"
-msgstr "%ls: Nieprawidłowa wartość długości  '%ls'\n"
+msgstr ""
 
 #: src/builtin_string.cpp:321
 #, c-format
@@ -910,19 +909,19 @@ msgid "%ls: Regular expression substitute error: %ls\n"
 msgstr ""
 
 #: src/builtin_test.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer '%ls'"
-msgstr "Nieprawidłowy cel przekierowania: %ls"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: New limit cannot be an empty string\n"
-msgstr "%ls: Nazwa zmiennej nie może być pustym ciągiem znaków \n"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid limit '%ls'\n"
-msgstr "%ls: Nieprawidłowa ścieżka: %ls\n"
+msgstr ""
 
 #: src/common.cpp:1551
 msgid "Current terminal parameters have rows and/or columns set to zero."
@@ -969,35 +968,31 @@ msgid "Tried to pop empty environment stack."
 msgstr ""
 
 #: src/env.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "Using fallback terminal type '%s'."
-msgstr "Używanie zapasowego typu terminala '%ls'"
+msgstr ""
 
 #: src/env.cpp:542
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set up terminal using the fallback terminal type '%s'."
 msgstr ""
-"Nie można skonfigurować terminala używając zapasowego typu terminala '%ls' - "
-"opuszczanie"
 
 #: src/env.cpp:574
-#, fuzzy
 msgid "Could not set up terminal."
-msgstr "Nie mozna skonfigurować terminala"
+msgstr ""
 
 #: src/env.cpp:576
 msgid "TERM environment variable not set."
 msgstr ""
 
 #: src/env.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "TERM environment variable set to '%ls'."
-msgstr "Zmienna środowiskowa TERM ustawiona jest do '%ls'"
+msgstr ""
 
 #: src/env.cpp:579
-#, fuzzy
 msgid "Check that this terminal type is supported on this system."
-msgstr "Sprawdź czy ten typ terminala jest obsługiwany przez ten system"
+msgstr ""
 
 #: src/env.cpp:673
 msgid ""
@@ -1561,13 +1556,10 @@ msgid "There are still jobs active:\n"
 msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   Komenda\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -1913,34 +1905,34 @@ msgid "%ls: Unknown option '%ls'\n"
 msgstr "%ls: Nieznana opcja '%ls'\n"
 
 #: src/builtin.h:54
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected %d args, got %d\n"
-msgstr "%ls: oczekiwano %d argumentów, otrzymano %d\n"
+msgstr ""
 
 #: src/builtin.h:55
-#, fuzzy, c-format
+#, c-format
 msgid "%ls %ls: Expected %d args, got %d\n"
-msgstr "%ls: %ls oczekiwał %d argumentów, otrzymał %d\n"
+msgstr ""
 
 #: src/builtin.h:56
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at least %d args, got only %d\n"
-msgstr "%ls: oczekiwano %d argumentów, otrzymano %d\n"
+msgstr ""
 
 #: src/builtin.h:57
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at most %d args, got %d\n"
-msgstr "%ls: oczekiwano %d argumentów, otrzymano %d\n"
+msgstr ""
 
 #: src/builtin.h:60
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: maksymalna wartość '%ls' nie jest prawidłową liczbą\n"
+msgstr ""
 
 #: src/builtin.h:63
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: mode name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: maksymalna wartość '%ls' nie jest prawidłową liczbą\n"
+msgstr ""
 
 #: src/builtin.h:66
 #, c-format
@@ -1953,14 +1945,14 @@ msgid "%ls: Argument '%ls' is not a number\n"
 msgstr "%ls: Argument '%ls' nie jest liczbą \n"
 
 #: src/builtin.h:72
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected a subcommand to follow the command\n"
-msgstr "%ls: Oczekiwano argumentu dla funkcji\n"
+msgstr ""
 
 #: src/builtin.h:73
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Subcommand '%ls' is not valid\n"
-msgstr "%ls: '%ls' nie jest plikiem\n"
+msgstr ""
 
 #: src/builtin.h:76
 #, c-format
@@ -2327,9 +2319,8 @@ msgid "Prints a description of a domain or service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:12
-#, fuzzy
 msgid "Prints information about the service cache"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:13
 msgid "Prints which services are disabled"
@@ -2342,14 +2333,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:15
-#, fuzzy
 msgid "Prints port information about a process"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:16
-#, fuzzy
 msgid "Prints port information about the host"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:17
 msgid "Resolves a port name from a process to an endpoint in launchd"
@@ -2401,9 +2390,8 @@ msgid "Unloads the specified service name"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:29
-#, fuzzy
 msgid "Lists information about services"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:30
 msgid "Starts the specified service"
@@ -2609,23 +2597,20 @@ msgid "Update array UUID"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:46
-#, fuzzy
 msgid "Update array name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:47
-#, fuzzy
 msgid "Update array nodes"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:48
 msgid "Update array homehost"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Update array cluster name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:50
 msgid "Mark the array as dirty, thus forcing resync"
@@ -2660,9 +2645,8 @@ msgid "Reset preferred minor to current one"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Abort currently running actions"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:59
 msgid "Abort currently running actions, prevent their restart"
@@ -2754,9 +2738,8 @@ msgid "ZFS filesystem snapshot"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "ZFS block storage device"
-msgstr "Nie określono bloków"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:4
 msgid "ZFS snapshot bookmark"
@@ -2783,9 +2766,8 @@ msgid "Value received by 'zfs receive'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "Value valid for the current mount"
-msgstr "Zatrzymaj obecnie używaną funkcję"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:11
 msgid "Read-only value"
@@ -2819,9 +2801,8 @@ msgid "Identity type"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Identity name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:18
 msgid "Space usage"
@@ -2964,9 +2945,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:51
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:14
-#, fuzzy
 msgid "Max number of snapshots"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:52
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:4
@@ -3022,9 +3002,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:62
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:25
-#, fuzzy
 msgid "Hide .zfs directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:63
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:26
@@ -3121,9 +3100,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:84
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:1
-#, fuzzy
 msgid "Unicode normalization"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:85
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:2
@@ -3143,14 +3121,12 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:89
 #: /tmp/fish/explicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Dataset name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:1
-#, fuzzy
 msgid "Pool full name"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:5
 msgid "Mirror of at least two devices"
@@ -3189,9 +3165,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zpool.fish:15
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:1
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:2
-#, fuzzy
 msgid "Available space"
-msgstr "Zmienna"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:16
 msgid "System boot partition size"
@@ -3202,9 +3177,8 @@ msgid "Usage percentage of pool"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Deduplication ratio"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:19
 msgid "Amount of uninitialized space within the pool"
@@ -3244,9 +3218,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:28
 #: /tmp/fish/explicit/share/completions/zpool.fish:29
-#, fuzzy
 msgid "Alternate root directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:30
 #: /tmp/fish/explicit/share/completions/zpool.fish:31
@@ -3268,9 +3241,8 @@ msgid "Default bootable dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:37
-#, fuzzy
 msgid "Pool configuration cache"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:38
 msgid "Comment about the pool"
@@ -3305,14 +3277,12 @@ msgid "All properties"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:1
-#, fuzzy
 msgid "%s: Could not figure out what to do!\\n"
-msgstr "%s: Nie można odnaleźć katalogu domowego\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:2
-#, fuzzy
 msgid "%s %s: Requires at least two arguments\\n"
-msgstr "%s: Opcja wymaga argumentu -- %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:3
 #: /tmp/fish/explicit/share/functions/abbr.fish:5
@@ -3322,9 +3292,8 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%s %s: Oczekiwano argumentu\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
@@ -3332,9 +3301,8 @@ msgid "%s %s: No abbreviation named %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:7
-#, fuzzy
 msgid "%s %s: Requires exactly two arguments\\n"
-msgstr "%s %s: Opcja wymaga argumentu\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:11
 msgid "%s %s: Abbreviation %s already exists, cannot rename %s\\n"
@@ -3342,14 +3310,12 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:12
 #: /tmp/fish/explicit/share/functions/abbr.fish:13
-#, fuzzy
 msgid "%s %s: Unexpected argument -- '%s'\\n"
-msgstr "%s %s: Oczekiwano argumentu -- '%s'\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
-#, fuzzy
 msgid "%s: Name cannot be empty\\n"
-msgstr "%s: Nazwa zmiennej nie może być pustym ciągiem znaków\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:2
 msgid "%s: Body cannot be empty\\n"
@@ -3360,9 +3326,8 @@ msgid "Too many args for cd command"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "cdh: Expected zero or one arguments"
-msgstr "cdh: Oczekiwano 0 lub 1 argument"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/cdh.fish:2
 msgid "No previous directories to select. You have to cd at least once."
@@ -3532,9 +3497,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:1
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:2
-#, fuzzy
 msgid "%s: Too many arguments %s\\n"
-msgstr "%s: Zbyt dużo argumentów %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_move_last.fish:1
 msgid "Hit end of history…\\n"
@@ -3581,19 +3545,16 @@ msgid "Cancelled function editing"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:1
-#, fuzzy
 msgid "%s: Could not create configuration directory\\n"
-msgstr "%s: Nie można odnaleźć katalogu domowego\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:2
-#, fuzzy
 msgid "%s: Unknown function '%s'\\n"
-msgstr "%s: Nieznana funkcja '%s'"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:1
-#, fuzzy
 msgid "%s: Could not find a web browser.\\n"
-msgstr "%s: Nie można odnaleźć katalogu domowego\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:3
 msgid "help: Help is being displayed in your default browser.\\n"
@@ -3604,14 +3565,12 @@ msgid "help: Help is being displayed in %s.\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:1
-#, fuzzy
 msgid "%ls: you cannot use any options with the %ls command\\n"
-msgstr "%ls: nie możesz używać opcji z komendą %ls\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:2
-#, fuzzy
 msgid "%ls: %ls expected %d args, got %d\\n"
-msgstr "%ls: %ls oczekiwał %d argumentów, otrzymał %d\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:3
 msgid "You must specify at least one search term when deleting entries\\n"
@@ -3631,9 +3590,8 @@ msgid "You did not say 'yes' so I will not clear your command history\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "%s: Too many arguments"
-msgstr "%ls: Zbyt dużo argumentów"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/nextd.fish:1
 #: /tmp/fish/explicit/share/functions/prevd.fish:1
@@ -3657,9 +3615,8 @@ msgid "%s: These flags are not allowed by fish realpath: '%s'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "%s: Expected 1, 2 or 3 arguments, got %d\\n"
-msgstr "%s: Oczekiwano 0 lub 1 argument, otrzymano %d\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:2
 msgid "%s: '%s' is not a number\\n"
@@ -3699,15 +3656,13 @@ msgid "file"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:7
-#, fuzzy
 msgid "%s: Could not find '%s'\\n"
-msgstr "%s: Nie można odnaleźć katalogu domowego '%s'\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/umask.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:2
-#, fuzzy
 msgid "%s: Invalid mask '%s'\\n"
-msgstr "%s: Nieprawidłowa ścieżka: '%s'\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:1
 msgid "%s: Value '%s' for flag '%s' is not an integer\\n"
@@ -3722,9 +3677,8 @@ msgid "%s: Value '%s' for flag '%s' greater than max allowed of '%s'\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:1
-#, fuzzy
 msgid "%s: Unknown option %s\\n"
-msgstr "%s: Nieznana opcja '%s'\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
 msgid ""
@@ -3891,9 +3845,8 @@ msgid "Output the part of line matching pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:12
-#, fuzzy
 msgid "Print all lines"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:13
 msgid "Specify pattern explicitly"
@@ -4031,9 +3984,8 @@ msgid "Read the list of files to search from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:46
-#, fuzzy
 msgid "Ignore directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:47
 msgid "Don't ignore directory"
@@ -4088,9 +4040,8 @@ msgid "Removes all filters associated with type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:58
-#, fuzzy
 msgid "Ignores environment variables and ackrc files"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:59
 msgid "Specifies location of ackrc file"
@@ -4412,9 +4363,8 @@ msgid "Port forwarding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:20
-#, fuzzy
 msgid "Return bugreport information"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:21
 msgid "Perform device backup"
@@ -4574,9 +4524,8 @@ msgid "Package(s) to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4635,9 +4584,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:8
-#, fuzzy
 msgid "Display brief instructions"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:9
 msgid "Use specified directory as the user's home directory"
@@ -4780,9 +4728,8 @@ msgid "Remove runstate file at first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:22
-#, fuzzy
 msgid "Set environment variable"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:23
 msgid "The configuration file for init"
@@ -4797,9 +4744,8 @@ msgid "The PID file to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:26
-#, fuzzy
 msgid "Run the task in background"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:27
 msgid "Use syslog for messages"
@@ -4881,9 +4827,8 @@ msgid "print version of this program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:7
-#, fuzzy
 msgid "be quiet"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:8
 msgid "show also inactive controls"
@@ -5288,9 +5233,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:80
 #: /tmp/fish/implicit/share/completions/montage.fish:68
 #: /tmp/fish/implicit/share/completions/stream.fish:27
-#, fuzzy
 msgid "Print detailed information about the image"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:42
 #: /tmp/fish/implicit/share/completions/display.fish:49
@@ -5435,9 +5379,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:53
 #: /tmp/fish/implicit/share/completions/montage.fish:101
 #: /tmp/fish/implicit/share/completions/stream.fish:30
-#, fuzzy
 msgid "Print program options"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:60
 #: /tmp/fish/implicit/share/completions/compare.fish:42
@@ -5801,9 +5744,8 @@ msgid "Runs the package's tests contained within the spec directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
-#, fuzzy
 msgid "Path to atom command"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:77
 msgid "Delete the symlink in ~/.atom/packages for the package"
@@ -6050,9 +5992,8 @@ msgid "Build source without install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:11
-#, fuzzy
 msgid "Clean source directories"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:12
 msgid "Update source and rebuild"
@@ -6220,9 +6161,8 @@ msgid "Auto-gen package cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:24
-#, fuzzy
 msgid "Print all names"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:25
 msgid "Dep and rdep recursive"
@@ -6332,9 +6272,8 @@ msgid "Pattern is regexp"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:12
-#, fuzzy
 msgid "Set arch"
-msgstr "wyszukiwanie:"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:13
 msgid "Set sources.list file"
@@ -6378,9 +6317,8 @@ msgid "Target release"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
-#, fuzzy
 msgid "Generate package from source"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:3
 msgid "Generate source index file"
@@ -6391,18 +6329,16 @@ msgid "Generate contents file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:5
-#, fuzzy
 msgid "Generate release file"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:6
 msgid "Remove records"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:7
-#, fuzzy
 msgid "Generate MD5 sums"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:8
 msgid "Use a binary db"
@@ -6545,9 +6481,8 @@ msgid "Do not upgrade packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:33
-#, fuzzy
 msgid "Force yes"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:34
 msgid "Print the URIs"
@@ -7015,18 +6950,16 @@ msgid "Fetch source package from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:17
-#, fuzzy
 msgid "Process all packages"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:18
 msgid "Use specific conffile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:19
-#, fuzzy
 msgid "Force deletion"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:20
 msgid "Suppresses normal output"
@@ -7061,9 +6994,8 @@ msgid "Show build dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:3
-#, fuzzy
 msgid "Generate a dotty graph"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:4
 msgid "Show state of dependencies"
@@ -7099,9 +7031,8 @@ msgid "Probe a CD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
-#, fuzzy
 msgid "Run in non-interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
@@ -7138,9 +7069,8 @@ msgid "Print only upgradeable packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:5
-#, fuzzy
 msgid "Print all versions"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:6
 msgid "Print package name/distro"
@@ -7163,9 +7093,8 @@ msgid "Specify conffile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:2
-#, fuzzy
 msgid "Debian distribution"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:3
 msgid "Servers in the areas"
@@ -7176,9 +7105,8 @@ msgid "Conf file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:5
-#, fuzzy
 msgid "Finish after number of servers"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:6
 msgid "File to grab servers"
@@ -7286,9 +7214,8 @@ msgid "Specify a dir"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:17
-#, fuzzy
 msgid "Run on current dir"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:18
 msgid "Omit debian version"
@@ -7377,9 +7304,8 @@ msgid "Specify the Conduit token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:8
-#, fuzzy
 msgid "Force a version"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:9
 msgid "Sets the timeout"
@@ -7410,9 +7336,8 @@ msgid "Reads an arc configuration option"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
-#, fuzzy
 msgid "Show detailed information about options"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:17
 msgid "Download a file to local disk"
@@ -7506,9 +7431,8 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
 msgid "Export the local changeset to a file"
@@ -7695,9 +7619,8 @@ msgid "Alias for arc feature"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
 msgid "Show the amended commit message"
@@ -7712,9 +7635,8 @@ msgid "Shows the help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
@@ -7737,18 +7659,16 @@ msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
 msgid "Do not run any sanity checks"
@@ -7913,9 +7833,8 @@ msgid "Always disable coverage information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8130,37 +8049,32 @@ msgid "Take addr from filename, default /etc/ethers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
-#, fuzzy
 msgid "Omit false conditionals"
-msgstr "blok warunkowy 'if'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:2
-#, fuzzy
 msgid "Omit debugging directives"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:3
-#, fuzzy
 msgid "Include general information"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:4
 msgid "Include high-level source"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:5
-#, fuzzy
 msgid "Include assembly"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:6
 msgid "Include macro expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:7
-#, fuzzy
 msgid "Omit forms processing"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:8
 msgid "Include symbols"
@@ -8183,14 +8097,12 @@ msgid "Produce assembler debugging messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:13
-#, fuzzy
 msgid "Remap debug information"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:14
-#, fuzzy
 msgid "Redefine symbols"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:15
 msgid "Require executable stack for this object"
@@ -8217,9 +8129,8 @@ msgid "Skip whitespace and comment preprocessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:21
-#, fuzzy
 msgid "Generate debugging information"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:22
 msgid "Generate STABS debugging information"
@@ -8238,19 +8149,16 @@ msgid "Generate per-function section names for DWARF line information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:26
-#, fuzzy
 msgid "Set the hash table size close"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
-#, fuzzy
 msgid "Show help message and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:28
-#, fuzzy
 msgid "Show target specific options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:29
 msgid "Add DIR to search list for .include directives"
@@ -8273,9 +8181,8 @@ msgid "Assemble in MRI compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:34
-#, fuzzy
 msgid "Write dependency information in given file"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
 msgid "Do not pad the end of sections to alignment boundaries"
@@ -8306,9 +8213,8 @@ msgid "Use same format as native assembler when possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:42
-#, fuzzy
 msgid "Print assembler version number and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:43
 #: /tmp/fish/implicit/share/completions/gunzip.fish:8
@@ -8317,9 +8223,8 @@ msgid "Suppress warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:44
-#, fuzzy
 msgid "Don't suppress warnings"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:45
 msgid "Treat warnings as errors"
@@ -8334,9 +8239,8 @@ msgid "Read option from given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:48
-#, fuzzy
 msgid "Print assembler version number"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:49
 msgid "Don't optimize code alignment"
@@ -8355,18 +8259,16 @@ msgid "Generate 64 bits code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:53
-#, fuzzy
 msgid "Generate x32 code"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:54
 msgid "Encode SSE instructions with VEX prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:55
-#, fuzzy
 msgid "Check SSE instructions"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:56
 msgid "Check operand combinations for validity"
@@ -8393,9 +8295,8 @@ msgid "Use specfied mnemonic"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:62
-#, fuzzy
 msgid "Use specfied syntax"
-msgstr "Sygnał zdefiniowany przez użytkownika 1"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:63
 msgid "Support pseudo index registers"
@@ -8422,9 +8323,8 @@ msgid "Strip all lock prefixes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -8447,9 +8347,8 @@ msgid "Show the full history of the target, with file diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:3
-#, fuzzy
 msgid "Put the source files in current directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:4
 msgid "Collect garbage"
@@ -8552,9 +8451,8 @@ msgid "Keep the browser process in the foreground."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:3
-#, fuzzy
 msgid "Print usage message."
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:4
 msgid "Log all output to file."
@@ -8787,9 +8685,8 @@ msgid "Show settings while running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:14
-#, fuzzy
 msgid "Do not use powerpill"
-msgstr "Nie mozna skonfigurować terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:15
 msgid "Show available languages"
@@ -9083,9 +8980,8 @@ msgid "Restores a record kept with -B"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:69
-#, fuzzy
 msgid "Backup to directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:70
 msgid "Save this many versions"
@@ -9344,9 +9240,8 @@ msgid "Wrap encoded line after given number of caracters (default 76)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:1
-#, fuzzy
 msgid "Force interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:2
 msgid "Define math library"
@@ -9405,9 +9300,8 @@ msgid "Change current bind mode to named mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:9
-#, fuzzy
 msgid "Key name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:10
 #: /tmp/fish/implicit/share/completions/commandline.fish:17
@@ -9659,9 +9553,8 @@ msgid "Open brew/formula's homepage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:43
-#, fuzzy
 msgid "Display information about formula"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:44
 msgid "Display info for all formulae"
@@ -9678,9 +9571,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/brew.fish:47
 #: /tmp/fish/implicit/share/completions/prt-get.fish:35
 #: /tmp/fish/implicit/share/completions/prt-get.fish:94
-#, fuzzy
 msgid "Force install"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:48
 msgid "If install fails, open shell in temp directory"
@@ -10340,9 +10232,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gunzip.fish:5
 #: /tmp/fish/implicit/share/completions/gzip.fish:5
 #: /tmp/fish/implicit/share/completions/zcat.fish:3
-#, fuzzy
 msgid "Print license"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
 msgid "Suppress message payload display"
@@ -10405,9 +10296,8 @@ msgid "List all help topics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:3
-#, fuzzy
 msgid "List all commands"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:4
 msgid "Help about supported formats"
@@ -10762,9 +10652,8 @@ msgid "Default port to use for HTTPS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:14
-#, fuzzy
 msgid "Process log file"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:15
 msgid "Path to write pid file"
@@ -10883,9 +10772,8 @@ msgid "Add feed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:11
-#, fuzzy
 msgid "Set configuration directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:12
 #: /tmp/fish/implicit/share/completions/pine.fish:10
@@ -10901,16 +10789,14 @@ msgid "Set feed directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:15
-#, fuzzy
 msgid "Set script directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:1
 #: /tmp/fish/implicit/share/completions/light.fish:2
 #: /tmp/fish/implicit/share/completions/rustc.fish:1
-#, fuzzy
 msgid "Print version info and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:2
 msgid "List installed commands"
@@ -11208,9 +11094,8 @@ msgid "Allows the user to manually select a driver for the device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-#, fuzzy
 msgid "Set driver specific options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
 msgid ""
@@ -11411,9 +11296,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:2
 #: /tmp/fish/implicit/share/completions/chown.fish:2
-#, fuzzy
 msgid "Dereference symbolic links"
-msgstr "Nawiązanie symboliczne"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:3
 #: /tmp/fish/implicit/share/completions/chown.fish:3
@@ -11482,18 +11366,16 @@ msgid "Username"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
-#, fuzzy
 msgid "Specify your login shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:2
 msgid "Display help and exit\t"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:4
-#, fuzzy
 msgid "List available shells and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:2
 msgid "Update your climate install"
@@ -11549,9 +11431,8 @@ msgid "Find the biggest files recursively"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:17
-#, fuzzy
 msgid "Find the biggest directories"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:18
 msgid "Find directory size"
@@ -11566,14 +11447,12 @@ msgid "Extract any given archive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:21
-#, fuzzy
 msgid "Report duplicate files in a directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:22
-#, fuzzy
 msgid "Count the number of occurences"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:23
 msgid "Monitor file for changes"
@@ -11612,9 +11491,8 @@ msgid "List open ports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:32
-#, fuzzy
 msgid "Edit the hosts file"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:33
 msgid "http-server serving the current directory"
@@ -11689,9 +11567,8 @@ msgid "Find the trash size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:51
-#, fuzzy
 msgid "Empty the trash"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:1
 msgid "Combine sets of lines from two files using boolean operations"
@@ -11726,9 +11603,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/setsid.fish:1
 #: /tmp/fish/implicit/share/completions/ssh.fish:1
 #: /tmp/fish/implicit/share/completions/sudo.fish:20
-#, fuzzy
 msgid "Command to run"
-msgstr "Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:2
 msgid "Add text to the end of the selected area"
@@ -11922,9 +11798,8 @@ msgid "Old style long option to complete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:6
-#, fuzzy
 msgid "Do not use file completion"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:7
 msgid "Require parameter"
@@ -11969,9 +11844,8 @@ msgid "User script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:2
-#, fuzzy
 msgid "Short information about Composer"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:3
 msgid "Create an archive of this composer package"
@@ -12330,9 +12204,8 @@ msgid "Do not create output files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:7
-#, fuzzy
 msgid "Set source directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:8
 msgid "Architecture-independent install directory"
@@ -12947,9 +12820,8 @@ msgid "Kerberos server mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:33
-#, fuzzy
 msgid "Print out history information for files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:34
 msgid "Prompt for password for authenticating server"
@@ -13000,18 +12872,16 @@ msgid "Server mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:46
-#, fuzzy
 msgid "Display status information on checked out files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:47
 msgid "Add a symbolic tag to checked out version of files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
-#, fuzzy
 msgid "Undo an edit command"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:49
 msgid "Bring work tree in sync with repository"
@@ -13022,9 +12892,8 @@ msgid "Show current CVS version(s)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:51
-#, fuzzy
 msgid "Set watches"
-msgstr "(brak pasujących wyników)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:52
 msgid "See who is watching a file"
@@ -13059,9 +12928,8 @@ msgid "[users]  Remove (comma-separated) user names from access list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:60
-#, fuzzy
 msgid "Run interactively."
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
 msgid "Set keyword substitution mode:"
@@ -13487,9 +13355,8 @@ msgid "Last modified (committed or modified report)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:165
-#, fuzzy
 msgid "Working directory must match"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
 msgid "Since date (Many formats)"
@@ -13681,9 +13548,8 @@ msgid "Revision - symbolic or numeric."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:221
-#, fuzzy
 msgid "Delete the given directory."
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
 msgid "Delete the file before removing it."
@@ -13784,9 +13650,8 @@ msgid "Download missing sources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:7
-#, fuzzy
 msgid "Prepare source directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:8
 msgid "Build software"
@@ -13849,9 +13714,8 @@ msgid "Send announcement email"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:23
-#, fuzzy
 msgid "Delete working directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:24
 msgid "Same as prep build inst pkg"
@@ -14227,9 +14091,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:978
 #: /tmp/fish/implicit/share/completions/darcs.fish:996
 #: /tmp/fish/implicit/share/completions/darcs.fish:1016
-#, fuzzy
 msgid "Suppress informational output"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:429
 #: /tmp/fish/implicit/share/completions/darcs.fish:473
@@ -14491,9 +14354,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:707
 #: /tmp/fish/implicit/share/completions/darcs.fish:760
 #: /tmp/fish/implicit/share/completions/darcs.fish:803
-#, fuzzy
 msgid "Generate XML formatted output"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:455
 #: /tmp/fish/implicit/share/completions/darcs.fish:493
@@ -14523,9 +14385,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:633
 #: /tmp/fish/implicit/share/completions/darcs.fish:709
 #: /tmp/fish/implicit/share/completions/darcs.fish:762
-#, fuzzy
 msgid "Don't summarize changes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:460
 msgid "Show changes in reverse order"
@@ -14996,9 +14857,8 @@ msgid "Reorder the patches in the repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:938
-#, fuzzy
 msgid "Specify a sibling directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
@@ -15017,9 +14877,8 @@ msgid "Optimize hashed pristine layout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:953
-#, fuzzy
 msgid "Uncompress patches"
-msgstr "(brak pasujących wyników)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:1
 msgid "Read the value of a key"
@@ -15188,14 +15047,12 @@ msgid "Use last acquired lease if cannot obtain one even if expired"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
-#, fuzzy
 msgid "Reapply configuration for each interface"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:9
 msgid "Request DHCP server to update DNS using FQDN instead of hostname"
@@ -15262,9 +15119,8 @@ msgid "Request given address in DHCP INFORM message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:25
-#, fuzzy
 msgid "Perform DHCPv6 Information Request"
-msgstr "Żądanie informacji"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:26
 msgid "Configure static DHCP value"
@@ -15451,17 +15307,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/lsof.fish:1
 #: /tmp/fish/implicit/share/completions/lua.fish:5
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:1
-#, fuzzy
 msgid "Print help and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:14
 #: /tmp/fish/implicit/share/completions/feh.fish:55
 #: /tmp/fish/implicit/share/completions/fuser.fish:12
 #: /tmp/fish/implicit/share/completions/tree.fish:43
-#, fuzzy
 msgid "Print version and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:15
 msgid "TCP mode"
@@ -15626,9 +15480,8 @@ msgid "Get detailed information about a specific whole disk or partition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:5
-#, fuzzy
 msgid "Process all disks"
-msgstr "Lista argumentów procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:6
 msgid "Continuously display system-wide disk manipulation activity"
@@ -16121,9 +15974,8 @@ msgid "Use 1kB block size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:10
-#, fuzzy
 msgid "Count hard links multiple times"
-msgstr "Wykonaj komendę wielokrotnie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:11
 msgid "Dereference all symlinks"
@@ -16487,9 +16339,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:1
 #: /tmp/fish/implicit/share/completions/iex.fish:1
-#, fuzzy
 msgid "Prints version and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:2
 #: /tmp/fish/implicit/share/completions/iex.fish:2
@@ -16565,9 +16416,8 @@ msgid "do not do interactive display; implies -q"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:2
-#, fuzzy
 msgid "change to directory DIR"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:3
 msgid "start a server in the background"
@@ -16661,9 +16511,8 @@ msgid "override color mode for character terminals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:28
-#, fuzzy
 msgid "window background color"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:29
 msgid "disable many display features; used for debugging Emacs"
@@ -16808,9 +16657,8 @@ msgid "WARNING: Delete all packages that are neither deps nor in world"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Process all meta-cache files"
-msgstr "Lista argumentów procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:13
 msgid "WARNING: Remove all but the latest version of package"
@@ -16965,9 +16813,8 @@ msgid "Unmount when idle for specified MINUTES"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:2
-#, fuzzy
 msgid "Run in the foreground"
-msgstr "Nie można przywrócić powłoki na pierwszy plan"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:3
 msgid "Verbose messages when run foreground"
@@ -16982,9 +16829,8 @@ msgid "Enables debugging within the FUSE library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:6
-#, fuzzy
 msgid "Return data even from corrupted files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:7
 msgid "Make files public to all other users"
@@ -17037,16 +16883,14 @@ msgid "Output version information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:1
-#, fuzzy
 msgid "Redefine variable"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:2
 #: /tmp/fish/implicit/share/completions/nice.fish:1
 #: /tmp/fish/implicit/share/completions/time.fish:1
-#, fuzzy
 msgid "Command"
-msgstr "Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:3
 msgid "Start with an empty environment"
@@ -17206,18 +17050,16 @@ msgid "show help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:5
-#, fuzzy
 msgid "print the version"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:6
 msgid "Writes config values to a JSON file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:7
-#, fuzzy
 msgid "Outputs useful debug information."
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:8
 msgid "Downloads a solution given the ID of the latest iteration."
@@ -17256,9 +17098,8 @@ msgid "Submits a new iteration to a problem on exercism.io."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:16
-#, fuzzy
 msgid "Lists the available language tracks."
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:17
 msgid "REMOVED"
@@ -17325,14 +17166,12 @@ msgid "dump diffs between jail initialisation and freeze time into a flavour"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:12
-#, fuzzy
 msgid "create the basejail from binary packages"
-msgstr "Stwórz blok kodu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:13
-#, fuzzy
 msgid "list all jails"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:14
 msgid "restart a running jail"
@@ -17359,9 +17198,8 @@ msgid "check for reasons for the jails to fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:24
-#, fuzzy
 msgid "create or update the basejail from source"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:1
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:2
@@ -17369,9 +17207,8 @@ msgid "show this help message and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:2
-#, fuzzy
 msgid "print detailed info about command NAME"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:3
 msgid "formats --list, choices: short, normal, nested"
@@ -17386,9 +17223,8 @@ msgid "Force sudo password prompt up-front"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:6
-#, fuzzy
 msgid "print list of possible commands and exit"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:7
 msgid "comma separated KEY=VALUE pairs to set Fab env vars"
@@ -17420,9 +17256,8 @@ msgid "specify location of config file to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:14
-#, fuzzy
 msgid "Color error output"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:15
 msgid "do not load user known_hosts file"
@@ -17701,9 +17536,8 @@ msgid "Disable Xinerama support"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:37
-#, fuzzy
 msgid "Save files to given directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:38
 msgid "Preload images"
@@ -17824,9 +17658,8 @@ msgid "Set font to print title on index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:69
-#, fuzzy
 msgid "Center file on background"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:70
 msgid "Fit file into background by zooming until image fits"
@@ -17855,9 +17688,8 @@ msgid "Select font"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:2
-#, fuzzy
 msgid "Change font directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:3
 msgid "Center output horizontally"
@@ -17876,9 +17708,8 @@ msgid "Set justification according to text direction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:7
-#, fuzzy
 msgid "Set output to terminal width"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:8
 msgid "Set output width"
@@ -17929,9 +17760,8 @@ msgid "Print right-to-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:25
-#, fuzzy
 msgid "Print with default text direction"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:1
 msgid "Do not prepend filenames to output lines"
@@ -18091,14 +17921,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:24
 #: /tmp/fish/implicit/share/completions/test.fish:31
-#, fuzzy
 msgid "File is executable"
-msgstr "Wykonywalny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
-msgstr "Zawsze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
 msgid "File is on filesystem of specified type"
@@ -18185,9 +18013,8 @@ msgid "File uses specified units of space"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
-msgstr "Zawsze"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
 msgid "File is of specified type"
@@ -18222,9 +18049,8 @@ msgid "Delete selected files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
@@ -18265,18 +18091,16 @@ msgid "Print null separated full file names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
-#, fuzzy
 msgid "Print formated data"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:66
 msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
 msgid "List file in ls -dils format"
@@ -18303,9 +18127,8 @@ msgid "Only parse input, do not execute"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:5
-#, fuzzy
 msgid "Run in interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:6
 msgid "Run in login mode"
@@ -18791,9 +18614,8 @@ msgid "Check all repositories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:14
-#, fuzzy
 msgid "List changes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:15
 #: /tmp/fish/implicit/share/completions/fossil.fish:16
@@ -18901,9 +18723,8 @@ msgid "Show all versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:47
-#, fuzzy
 msgid "Undo latest bad/good command."
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:48
 #: /tmp/fish/implicit/share/completions/git.fish:88
@@ -18919,9 +18740,8 @@ msgid "Make branch local"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:51
-#, fuzzy
 msgid "Set background color"
-msgstr "Ostatnie zadanie działające w tle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:52
 #: /tmp/fish/implicit/share/completions/fossil.fish:106
@@ -18959,9 +18779,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/fossil.fish:177
 #: /tmp/fish/implicit/share/completions/fossil.fish:180
 #: /tmp/fish/implicit/share/completions/fossil.fish:267
-#, fuzzy
 msgid "Run command on repository"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:61
 msgid "Print a file"
@@ -19422,18 +19241,16 @@ msgid "Display actions without runing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:203
-#, fuzzy
 msgid "Manage settings"
-msgstr "Zmień wartości ciągów znaków"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:204
 msgid "Log accesses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:205
-#, fuzzy
 msgid "Allow symbolic links"
-msgstr "Nawiązanie symboliczne"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:206
 msgid "Allow automatically filling CAPTCHA"
@@ -19468,9 +19285,8 @@ msgid "Allow binary files to be diffed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:217
-#, fuzzy
 msgid "External diff command"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:218
 msgid "Disallow pushing to the repository"
@@ -19607,9 +19423,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:252
 #: /tmp/fish/implicit/share/completions/fossil.fish:253
-#, fuzzy
 msgid "Show information about files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:254
 msgid "Show stash contents"
@@ -19689,9 +19504,8 @@ msgid "Find tag type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:279
-#, fuzzy
 msgid "Limit number of tags"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:281
 #: /tmp/fish/implicit/share/completions/git.fish:293
@@ -19759,9 +19573,8 @@ msgid "Use SCGI rather than HTTP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:297
-#, fuzzy
 msgid "Undo the changes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:299
 msgid "Update version"
@@ -19772,9 +19585,8 @@ msgid "Print debug information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:304
-#, fuzzy
 msgid "Print information about all files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:305
 msgid "Print fossil version"
@@ -19805,24 +19617,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
-#, fuzzy
 msgid "Save function"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
 msgid "Open function in external editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
-#, fuzzy
 msgid "Edit in interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:1
 #: /tmp/fish/implicit/share/completions/functions.fish:5
-#, fuzzy
 msgid "Set function description"
-msgstr "'return' poza definicją funkcji"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:2
 #: /tmp/fish/implicit/share/completions/functions.fish:2
@@ -19856,9 +19665,8 @@ msgid "Make the function a generic event handler"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:9
-#, fuzzy
 msgid "Specify named arguments"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:10
 msgid "Do not shadow variable scope of calling function"
@@ -19869,9 +19677,8 @@ msgid "Inherit completions from the given command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:1
-#, fuzzy
 msgid "Erase function"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:3
 msgid "Show hidden functions"
@@ -19890,14 +19697,12 @@ msgid "Copy the specified function to the specified new name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:9
-#, fuzzy
 msgid "Display information about the function"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:10
-#, fuzzy
 msgid "Print more output"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:1
 msgid "Show all files specified on the command line"
@@ -19968,9 +19773,8 @@ msgid "Lazy unmount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
-#, fuzzy
 msgid "Standard mode"
-msgstr "Standardowe wejście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:2
 msgid "Place output in file"
@@ -23011,9 +22815,8 @@ msgid "Do not use floating point double instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:701
-#, fuzzy
 msgid "Use media instructions"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:702
 msgid "Do not use media instructions"
@@ -23088,9 +22891,8 @@ msgid "Use all eight media accumulator registers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:717
-#, fuzzy
 msgid "Pack VLIW instructions"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:718
 msgid "Do not pack VLIW instructions"
@@ -23270,14 +23072,12 @@ msgid "Generate the predefine, \"_SIO\", for server IO"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:764
-#, fuzzy
 msgid "Use GNU ld specific options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:765
-#, fuzzy
 msgid "Use HP ld specific options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:766
 msgid "Generate code that uses long call sequences"
@@ -25480,18 +25280,16 @@ msgid "Use file file as a core dump to examine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:7
-#, fuzzy
 msgid "Execute GDB commands from file file"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:8
 msgid "Add directory to the path to search for source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:9
-#, fuzzy
 msgid "Do not execute commands from any .gdbinit files"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:11
 #: /tmp/fish/implicit/share/completions/root.fish:1
@@ -25527,14 +25325,12 @@ msgid "Run GDB using a text (console) user interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:1
-#, fuzzy
 msgid "Print usage informations and quit"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:2
-#, fuzzy
 msgid "Print the version and quit"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
 msgid "Use URL as the remote source for gems"
@@ -25934,9 +25730,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:276
 #: /tmp/fish/implicit/share/completions/mdadm.fish:12
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:1
-#, fuzzy
 msgid "Be quiet"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:24
 #: /tmp/fish/implicit/share/completions/git.fish:41
@@ -26135,9 +25930,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:259
-#, fuzzy
 msgid "Interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:73
 msgid "Interactively choose hunks to stage"
@@ -26195,9 +25989,8 @@ msgid "Track a new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:90
-#, fuzzy
 msgid "Keep staged changes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:91
 msgid "Keep unmerged changes"
@@ -26787,9 +26580,8 @@ msgid "Reset current HEAD to the specified state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:266
-#, fuzzy
 msgid "Reset files in working directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:270
 msgid "Reflog"
@@ -27056,9 +26848,8 @@ msgid "Show commit summary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:342
-#, fuzzy
 msgid "Run command on each submodule"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:343
 msgid "Sync submodules' URL with .gitmodules"
@@ -27126,9 +26917,8 @@ msgid "Remove untracked files from the working tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:359
-#, fuzzy
 msgid "Force run"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:360
 msgid "Show what would be done and clean files interactively"
@@ -27365,9 +27155,8 @@ msgid "print packages being built"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:7
-#, fuzzy
 msgid "print and preserve work directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:8
 msgid "print the commands"
@@ -27741,9 +27530,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
-#, fuzzy
 msgid "Generate a new key pair"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:23
 msgid "Present a menu which enables you to do all key related tasks"
@@ -28043,9 +27831,8 @@ msgid "Use specified file instead of the default trustdb"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:96
-#, fuzzy
 msgid "Set the home directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:97
 msgid "Set the native character set"
@@ -28645,9 +28432,8 @@ msgid "List files in folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:45
-#, fuzzy
 msgid "Create a directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:46
 msgid "Remove a directory"
@@ -28738,9 +28524,8 @@ msgid "Overwrite files without asking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:1
-#, fuzzy
 msgid "Print annotated source"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:2
 msgid "Do not print explanations"
@@ -28943,9 +28728,8 @@ msgid "Set project property for build script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:22
-#, fuzzy
 msgid "Specify start directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:23
 msgid "Build project in parallel"
@@ -29076,9 +28860,8 @@ msgid "Pattern is basic regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:19
-#, fuzzy
 msgid "Print filename"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
 msgid "Suppress printing filename"
@@ -29326,18 +29109,16 @@ msgid "Check if given file is BIOS bootsector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-file.fish:32
-#, fuzzy
 msgid "Display usage and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:1
 msgid "Compress GRUB files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:2
-#, fuzzy
 msgid "Use image and modules under given directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:3
 msgid "Install given fonts"
@@ -29352,9 +29133,8 @@ msgid "Embed given file as public key for signature checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:6
-#, fuzzy
 msgid "Use translations under given directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:7
 msgid "Install only given locales"
@@ -29409,9 +29189,8 @@ msgid "Use given color for label"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:21
-#, fuzzy
 msgid "Use given file for label"
-msgstr "Sygnał zdefiniowany przez użytkownika 2"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:22
 msgid "Use given directory for PPC Mac install"
@@ -29430,9 +29209,8 @@ msgid "Don't apply any reed-solomon codes when embedding core.img"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:26
-#, fuzzy
 msgid "Set product version"
-msgstr "'return' poza definicją funkcji"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:27
 msgid "Delete device map if it already exists"
@@ -29455,9 +29233,8 @@ msgid "Print the grunt version. Combine with --verbose for more info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:1
-#, fuzzy
 msgid "Print the version information"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
 msgid "Specify a custom schemas directory"
@@ -30024,9 +29801,8 @@ msgid "Autosuggestions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:2
-#, fuzzy
 msgid "Builtin commands"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:3
 msgid "Cartesian Products"
@@ -30053,33 +29829,28 @@ msgid "Writing your own completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:9
-#, fuzzy
 msgid "Where to put completions"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:10
 msgid "Debugging fish scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:12
-#, fuzzy
 msgid "Command line editor"
-msgstr "Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:13
-#, fuzzy
 msgid "Emacs mode commands"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:14
-#, fuzzy
 msgid "Escaping characters"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:15
-#, fuzzy
 msgid "Event handlers"
-msgstr "blok obsługi zdarzenia"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:16
 #: /tmp/fish/implicit/share/completions/help.fish:25
@@ -30091,14 +29862,12 @@ msgid "Brace expansion {a,b,c}"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:18
-#, fuzzy
 msgid "Command substitution"
-msgstr "w zastępstwie polecenia"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:19
-#, fuzzy
 msgid "Command substitution (SUBCOMMAND)"
-msgstr "w zastępstwie polecenia"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:20
 msgid "Home directory expansion ~USER"
@@ -30137,9 +29906,8 @@ msgid "Initialization files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:31
-#, fuzzy
 msgid "Introduction"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:32
 msgid "Common issues with fish"
@@ -30178,23 +29946,20 @@ msgid "Quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:41
-#, fuzzy
 msgid "Input/Output (IO) redirection"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "Steruj przypisaniami klawiszy fish'a"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:44
-#, fuzzy
 msgid "Background jobs"
-msgstr "Ostatnie zadanie działające w tle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:45
 msgid "Conditional execution of code and flow control"
@@ -30206,32 +29971,28 @@ msgid "Functions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:47
-#, fuzzy
 msgid "Autoloading functions"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:48
 msgid "Defining aliases"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:49
-#, fuzzy
 msgid "Job control"
-msgstr "Kontrola zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:50
-#, fuzzy
 msgid "Some common words"
-msgstr "Stan Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:51
 msgid "Programmable title"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:52
-#, fuzzy
 msgid "Shell variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:53
 msgid "Arrays"
@@ -30242,54 +30003,44 @@ msgid "Variables for changing highlighting colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:55
-#, fuzzy
 msgid "Exporting variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:56
-#, fuzzy
 msgid "Variable scope for functions"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:57
-#, fuzzy
 msgid "Locale variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:58
-#, fuzzy
 msgid "Variable scope"
-msgstr "Zmienna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:59
-#, fuzzy
 msgid "Special variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:60
-#, fuzzy
 msgid "The status variable"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:61
-#, fuzzy
 msgid "More on universal variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:62
-#, fuzzy
 msgid "Vi mode commands"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:63
-#, fuzzy
 msgid "Command mode"
-msgstr "Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:64
-#, fuzzy
 msgid "Insert mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:65
 msgid "Visual mode"
@@ -30308,18 +30059,16 @@ msgid "Combiners (And, Or, Not)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:70
-#, fuzzy
 msgid "Command Substitutions"
-msgstr "w zastępstwie polecenia"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:71
 msgid "Conditionals (If, Else, Switch)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:72
-#, fuzzy
 msgid "Exit Status"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:73
 msgid "Exports (Shell Variables)"
@@ -30346,18 +30095,16 @@ msgid "Ready for more?"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:81
-#, fuzzy
 msgid "Pipes and Redirections"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:82
 msgid "Prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:83
-#, fuzzy
 msgid "Running Commands"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:84
 msgid "Separating Commands (Semicolon)"
@@ -30376,14 +30123,12 @@ msgid "Tab Completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:88
-#, fuzzy
 msgid "Universal Variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:89
-#, fuzzy
 msgid "Variables"
-msgstr "Zmienna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:90
 msgid "Why fish?"
@@ -30669,9 +30414,8 @@ msgid "downloads database backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:73
-#, fuzzy
 msgid "get information about a specific backup"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:74
 msgid "restore a backup (default latest) to a database"
@@ -30760,9 +30504,8 @@ msgid "repository root directory or name of overlay bundle file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:2
-#, fuzzy
 msgid "change working directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:3
 msgid "do not prompt, automatically pick the first choice for all prompts"
@@ -31263,9 +31006,8 @@ msgid "mark a branch as closed, hiding it from the branch list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:108
-#, fuzzy
 msgid "amend the parent of the working directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:109
 #: /tmp/fish/implicit/share/completions/hg.fish:423
@@ -31490,14 +31232,12 @@ msgid "directory strip option for patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
-#, fuzzy
 msgid "don't commit, just update the working directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:206
-#, fuzzy
 msgid "apply patch without touching the working directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:207
 msgid "apply patch to the nodes from which it was generated"
@@ -31592,9 +31332,8 @@ msgid "include revisions where files were removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:250
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "Historia komend wykonanych przez użytkownika"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:251
 msgid "show changesets within the given named branch"
@@ -31697,9 +31436,8 @@ msgid "print first line of patch header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:321
-#, fuzzy
 msgid "do not update the new working directories"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:323
 msgid "location of source patch repository"
@@ -31753,9 +31491,8 @@ msgid "drop all guards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:350
-#, fuzzy
 msgid "import file in patch directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:351
 msgid "name of patch file"
@@ -31901,9 +31638,8 @@ msgid "print patches not in series"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:422
-#, fuzzy
 msgid "amend the parent of the working dir"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:436
 msgid "record delete for missing files"
@@ -31956,9 +31692,8 @@ msgid "name of access log file to write to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:466
-#, fuzzy
 msgid "run server in background"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:467
 msgid "used internally by daemon mode"
@@ -31994,9 +31729,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:475
 #: /tmp/fish/implicit/share/completions/hg.fish:476
-#, fuzzy
 msgid "for remote clients"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:477
 msgid "web templates to use"
@@ -32083,9 +31817,8 @@ msgid "check for push and pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:507
-#, fuzzy
 msgid "force tag"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:508
 msgid "make the tag local"
@@ -32134,9 +31867,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/highlight.fish:5
 #: /tmp/fish/implicit/share/completions/hugo.fish:57
 #: /tmp/fish/implicit/share/completions/tex.fish:10
-#, fuzzy
 msgid "Output directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:6
 msgid "Set type of the source code"
@@ -32179,14 +31911,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:127
-#, fuzzy
 msgid "Debug output"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:3
-#, fuzzy
 msgid "Enable logging"
-msgstr "Link wykonywalny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:4
 msgid "Log file"
@@ -32212,18 +31942,16 @@ msgid "Include content marked as draft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:10
-#, fuzzy
 msgid "Include expired content"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:11
 msgid "Include content with publishdate in the future"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:12
-#, fuzzy
 msgid "Cache directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:13
 msgid "Canonicalize all relative URLs using baseurl"
@@ -32234,14 +31962,12 @@ msgid "Remove files from destination not found in static directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:15
-#, fuzzy
 msgid "Content directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:16
-#, fuzzy
 msgid "Destination directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:17
 msgid "Do not build 404 page"
@@ -32276,14 +32002,12 @@ msgid "Print missing translations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:25
-#, fuzzy
 msgid "Ignore the cache directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:26
-#, fuzzy
 msgid "Layout directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:27
 msgid "Do not sync permission mode of files"
@@ -32310,9 +32034,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hugo.fish:58
 #: /tmp/fish/implicit/share/completions/hugo.fish:92
 #: /tmp/fish/implicit/share/completions/hugo.fish:103
-#, fuzzy
 msgid "Source directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:33
 #: /tmp/fish/implicit/share/completions/hugo.fish:46
@@ -32321,9 +32044,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:34
 #: /tmp/fish/implicit/share/completions/hugo.fish:47
-#, fuzzy
 msgid "Display metrics about template executions"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:35
 #: /tmp/fish/implicit/share/completions/hugo.fish:48
@@ -32335,9 +32057,8 @@ msgid "Theme to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:37
-#, fuzzy
 msgid "Themes directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:38
 msgid "Use /filename.html instead of /filename/"
@@ -32384,9 +32105,8 @@ msgid "Help for ulimit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:53
-#, fuzzy
 msgid "Print the site configuration"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:54
 msgid "Help for config"
@@ -32429,9 +32149,8 @@ msgid "Help for toYAML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:66
-#, fuzzy
 msgid "Print Hugo version and environment info"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:67
 msgid "Help for env"
@@ -32486,23 +32205,20 @@ msgid "Generate Markdown documentation for the Hugo CLI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:80
-#, fuzzy
 msgid "Doc directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:81
 msgid "Help for doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:82
-#, fuzzy
 msgid "Generate man pages for the Hugo CLI"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:83
-#, fuzzy
 msgid "Man pages directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:84
 msgid "Help for man"
@@ -32521,9 +32237,8 @@ msgid "Import from Jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:88
-#, fuzzy
 msgid "Allow import into non-empty target directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:89
 msgid "Help for jekyll"
@@ -32534,23 +32249,20 @@ msgid "List various types of content"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:91
-#, fuzzy
 msgid "Help for list"
-msgstr "Katalog domowy dla %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:93
-#, fuzzy
 msgid "List all drafts"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:94
 msgid "Help for drafts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:95
-#, fuzzy
 msgid "List all expired posts"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:96
 msgid "Help for expired"
@@ -32565,9 +32277,8 @@ msgid "Help for future"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:99
-#, fuzzy
 msgid "Create new content"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:100
 msgid "Editor to use"
@@ -32582,28 +32293,24 @@ msgid "Content type to create"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:104
-#, fuzzy
 msgid "Create a new site"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:105
-#, fuzzy
 msgid "Create site inside non-empty directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:106
 msgid "Config and front matter format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:107
-#, fuzzy
 msgid "Help for site"
-msgstr "Katalog domowy dla %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:108
-#, fuzzy
 msgid "Create a new theme"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:109
 msgid "Help for theme"
@@ -32658,9 +32365,8 @@ msgid "Port on which the server will listen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:122
-#, fuzzy
 msgid "Render to destination directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:123
 msgid "Reset the content draft status"
@@ -32671,14 +32377,12 @@ msgid "Help for undraft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:125
-#, fuzzy
 msgid "Print the version number of Hugo"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:126
-#, fuzzy
 msgid "Help for version"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:1
 msgid "Only send ipc message and suppress output"
@@ -32689,9 +32393,8 @@ msgid "Display version number and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:4
-#, fuzzy
 msgid "Set socket"
-msgstr "Gniazdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:5
 msgid "Specify ipc message type"
@@ -32804,32 +32507,28 @@ msgid "Print out the address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
-#, fuzzy
 msgid "Print netmask"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:6
-#, fuzzy
 msgid "Print network address"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:7
 msgid "Print broadcast"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:8
-#, fuzzy
 msgid "Print mtu"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:9
 msgid "Print out the hardware address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:10
-#, fuzzy
 msgid "Print flags"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:11
 msgid "Print all statistics on input"
@@ -32848,9 +32547,8 @@ msgid "Print # of in errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:15
-#, fuzzy
 msgid "Print # of in drops"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:16
 msgid "Print # of in fifo overruns"
@@ -33059,9 +32757,8 @@ msgid "Use specified network namespace"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:17
-#, fuzzy
 msgid "Execute command for all objects"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:1
 msgid "Create a set identified with SETNAME"
@@ -33081,9 +32778,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:5
 #: /tmp/fish/implicit/share/completions/ipset.fish:6
-#, fuzzy
 msgid "Destroy the specified set or all sets"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
 msgid "a"
@@ -33313,9 +33009,8 @@ msgid "Print debugging info about your jest config"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
-#, fuzzy
 msgid "The test environment used for all tests"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
 msgid "Use this flag to show full diffs instead of a patch"
@@ -33358,9 +33053,8 @@ msgid "Maps code coverage reports against original source code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:33
-#, fuzzy
 msgid "Specifies the maximum number of workers"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:34
 msgid "Directory names to be searched recursively up from the requiring module"
@@ -33433,9 +33127,8 @@ msgid "Paths to directories that Jest should use to search for files in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:51
-#, fuzzy
 msgid "Run all tests serially in the current process"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:52
 msgid "The paths to modules to configure the testing environment"
@@ -33446,9 +33139,8 @@ msgid "The path to a module to configure the testing framework"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:54
-#, fuzzy
 msgid "Print your jest config and then exits"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
 msgid "Prevent tests from printing messages through the console"
@@ -33528,9 +33220,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/jest.fish:73
 #: /tmp/fish/implicit/share/completions/snap.fish:15
 #: /tmp/fish/implicit/share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Print the version and exit"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:74
 msgid "Watch files for changes and rerun tests related to changed files"
@@ -33553,14 +33244,12 @@ msgid "Enable debugger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:2
-#, fuzzy
 msgid "Output usage information"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:3
-#, fuzzy
 msgid "Output version number"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:4
 msgid "Create a new JHipster application"
@@ -33607,9 +33296,8 @@ msgid "Create entities from the JDL file passed in argument"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:14
-#, fuzzy
 msgid "Display information about your current project and system"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:15
 msgid "Deploy the current application to Kubernetes"
@@ -33634,18 +33322,16 @@ msgid "Create a new JHipster server-side application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:20
-#, fuzzy
 msgid "Create a new Spring service bean"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:21
 msgid "Upgrade the JHipster version and the generated application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:22
-#, fuzzy
 msgid "Print command completion script"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:2
 msgid "Show the process id of each process in the job"
@@ -33672,9 +33358,8 @@ msgid "OR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:4
-#, fuzzy
 msgid "Prints a short help text and exits"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:5
 msgid "Prints a short version string and exits"
@@ -33689,9 +33374,8 @@ msgid "Show live tail of entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:9
-#, fuzzy
 msgid "Controls the number of journal lines"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:10
 msgid "Show all lines, even in follow mode"
@@ -33738,9 +33422,8 @@ msgid "Print all possible data values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:21
-#, fuzzy
 msgid "Specify journal directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:22
 msgid "Generate a new 128 bit ID"
@@ -33903,9 +33586,8 @@ msgid "Show help information and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:1
-#, fuzzy
 msgid "List all devices"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:2
 msgid "List available (paired and reachable) devices"
@@ -33962,47 +33644,40 @@ msgid "Phone number to send the message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:15
-#, fuzzy
 msgid "Device ID"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:16
-#, fuzzy
 msgid "Device Name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:17
-#, fuzzy
 msgid "Get encryption info about said device"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:18
 msgid "Lists remote commands and their ids"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:19
-#, fuzzy
 msgid "Executes a remote command by id"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:20
 msgid "Displays this help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:21
-#, fuzzy
 msgid "Displays version information."
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:22
-#, fuzzy
 msgid "Show author information."
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:23
-#, fuzzy
 msgid "Show license information."
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:24
 msgid "The base file name of the desktop entry for this application."
@@ -34084,9 +33759,8 @@ msgid "Describe available commands or one specific command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:4
-#, fuzzy
 msgid "Lists one or more instances"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:5
 msgid "List the name of each instance only, one per line"
@@ -34542,9 +34216,8 @@ msgid "Display status column"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
-#, fuzzy
 msgid "Specify key bindings file"
-msgstr "Steruj przypisaniami klawiszy fish'a"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:21
 msgid "Prompt with percentage"
@@ -34789,9 +34462,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/localectl.fish:4
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:37
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:7
-#, fuzzy
 msgid "Print a short help text and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:5
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:38
@@ -34833,9 +34505,8 @@ msgid "Ignore case distinctions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:10
-#, fuzzy
 msgid "Limit  the number of matches"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:11
 msgid "Use ASCII NUL as a separator"
@@ -35179,9 +34850,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:6
-#, fuzzy
 msgid "Shows the current default destination"
-msgstr "Zatrzymaj obecnie używaną funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:7
 msgid "Shows a long listing of printers, classes, or jobs"
@@ -35240,9 +34910,8 @@ msgid "output info about filesystems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:7
-#, fuzzy
 msgid "usage information (this)"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:8
 msgid "use ascii characters only"
@@ -35389,9 +35058,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:22
 #: /tmp/fish/implicit/share/completions/ls.fish:77
-#, fuzzy
 msgid "Print inode number of files"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:23
 #: /tmp/fish/implicit/share/completions/ls.fish:78
@@ -35429,9 +35097,8 @@ msgid "Display only security context and file name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:33
-#, fuzzy
 msgid "Print author"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:34
 #: /tmp/fish/implicit/share/completions/xz.fish:19
@@ -35448,9 +35115,8 @@ msgid "Use colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:37
-#, fuzzy
 msgid "Generate dired output"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
 msgid "List format"
@@ -35470,9 +35136,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:44
 #: /tmp/fish/implicit/share/completions/ls.fish:67
-#, fuzzy
 msgid "Print raw entry names"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:45
 msgid "Long format without groups"
@@ -35630,9 +35295,8 @@ msgid "Show usage and help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:1
-#, fuzzy
 msgid "Execute string"
-msgstr "Link wykonywalny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:2
 msgid "Require library"
@@ -35724,9 +35388,8 @@ msgid "Print help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:9
-#, fuzzy
 msgid "Manipulate container images."
-msgstr "Zmień wartości ciągów znaków"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:10
 msgid "List information on LXD servers and containers."
@@ -35898,9 +35561,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/machinectl.fish:3
 #: /tmp/fish/implicit/share/completions/systemctl.fish:39
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:3
-#, fuzzy
 msgid "Print a short help and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:4
 #: /tmp/fish/implicit/share/completions/pactl.fish:9
@@ -35931,9 +35593,8 @@ msgid "Also show machines starting with a '.'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:11
-#, fuzzy
 msgid "Show information about machine"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:12
 msgid "Do not ellipsize process tree entries"
@@ -36004,9 +35665,8 @@ msgid "Bind-mount a directory to a machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:29
-#, fuzzy
 msgid "Create destination directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
 msgid "Apply read-only mount"
@@ -36216,9 +35876,8 @@ msgid "Define"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:2
-#, fuzzy
 msgid "Include directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:3
 msgid "Replace include directories"
@@ -36267,9 +35926,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/make.fish:3
 #: /tmp/fish/implicit/share/completions/tar.fish:15
 #: /tmp/fish/implicit/share/functions/cd.fish:1
-#, fuzzy
 msgid "Change directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:5
 msgid "Environment before makefile"
@@ -36300,9 +35958,8 @@ msgid "Ignore specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:13
-#, fuzzy
 msgid "Print database"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:14
 msgid "Question mode"
@@ -36321,9 +35978,8 @@ msgid "Touch files, don't run commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
-#, fuzzy
 msgid "Print working directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:21
 msgid "Pretend file is modified"
@@ -36394,9 +36050,8 @@ msgid "Disable color in output messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:17
-#, fuzzy
 msgid "Only download and extract files"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:18
 msgid "Use alternative <buildscript>"
@@ -36495,9 +36150,8 @@ msgid "Library section"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:4
-#, fuzzy
 msgid "Device section"
-msgstr "Zdefiniuj nową funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:5
 msgid "File format section"
@@ -36584,9 +36238,8 @@ msgid "Set system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:28
-#, fuzzy
 msgid "Preprocessors"
-msgstr "Proces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:29
 msgid "Format for printing"
@@ -36654,9 +36307,8 @@ msgid "Save the ftpfs dialog with the server in FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:15
-#, fuzzy
 msgid "Print the last working directory to FILE"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:16
 msgid "Set alternative mode drawing of frameworks"
@@ -36727,9 +36379,8 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
 msgid "Select monitor mode"
@@ -36758,19 +36409,16 @@ msgid "Be more verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
 msgid "Set metadata style to use"
@@ -36789,14 +36437,12 @@ msgid "Give cluster name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
 msgid "Specify the space to use from each drive"
@@ -36811,18 +36457,16 @@ msgid "Specify the chunk size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
 msgid "Specify RAID level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
 msgid "Specify file for write-intent bitmap"
@@ -36857,18 +36501,16 @@ msgid "Use this file as a backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:36
-#, fuzzy
 msgid "Specify start of array data"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:37
 msgid "Resume frozen --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Set array name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:39
 msgid "Run array despite warnings"
@@ -36883,14 +36525,12 @@ msgid "Add devices to array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Specify max nodes in the cluster"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
-#, fuzzy
 msgid "Specify journal device for RAID-4/5/6 array"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:44
 msgid "UUID of array to assemble"
@@ -36917,9 +36557,8 @@ msgid "Freeze --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
-#, fuzzy
 msgid "Test mode"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:51
 msgid "Hot-add listed devices"
@@ -36962,41 +36601,36 @@ msgid "Print details on array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Print details on platform capabilities"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:62
 msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:65
-#, fuzzy
 msgid "Print report about bitmap"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
 msgid "List recorded bad blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -37116,9 +36750,8 @@ msgid "Test that code samples compile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:12
-#, fuzzy
 msgid "Watch file changes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:2
 msgid "Ignore unknown options"
@@ -37149,9 +36782,8 @@ msgid "Evaluate indexing information for path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
 msgid "Write the diagnostic to the specified path"
@@ -37303,9 +36935,8 @@ msgid "When logging hits line file:N, emit a stack trace (default :0)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:3
-#, fuzzy
 msgid "Write log files in this directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:4
 msgid "Log to standard error instead of files"
@@ -37320,9 +36951,8 @@ msgid "Logs at or above this threshold go to stderr (default 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:7
-#, fuzzy
 msgid "Log level for logs"
-msgstr "Katalog domowy dla"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:8
 msgid "Comma-separated list of pattern=N settings for file-filtered logging"
@@ -37396,18 +37026,16 @@ msgid "Display the kubernetes dashboard URL instead of opening it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:31
-#, fuzzy
 msgid "Add machine IP to NO_PROXY environment variable"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:32
 msgid "Force environment to be configured for a specified shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:33
-#, fuzzy
 msgid "Unset variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:35
 msgid "List the URLs for the services in local cluster"
@@ -37642,9 +37270,8 @@ msgid "Runs a project's tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:27
-#, fuzzy
 msgid "specify input directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:28
 msgid "specify output file name"
@@ -37970,9 +37597,8 @@ msgid "Extract timecodes of a track as timecode v2 file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:9
-#, fuzzy
 msgid "Extract cue information as text file"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:10
 msgid "Parse the whole file instead of relying on the index"
@@ -38110,9 +37736,8 @@ msgid "watch files for changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:21
-#, fuzzy
 msgid "check for global variable leaks"
-msgstr "obsługa zmiennej"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:22
 msgid "display the full stack trace"
@@ -38226,9 +37851,8 @@ msgid "Print program version and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:2
-#, fuzzy
 msgid "Print usage and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:3
 msgid "Turn on logging to a file"
@@ -38808,9 +38432,8 @@ msgid "Enable strict Uniforum mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:10
-#, fuzzy
 msgid "Resource name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:11
 msgid "Locale name, either language or language_COUNTRY"
@@ -38982,9 +38605,8 @@ msgid "Backup suffix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:7
-#, fuzzy
 msgid "Target directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:8
 msgid "Do not overwrite newer files"
@@ -39430,9 +39052,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:92
-#, fuzzy
 msgid "Generate a changelog report."
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:93
 msgid "Generate a file activity report."
@@ -43249,9 +42870,8 @@ msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
 msgid "specify build file [default=build.ninja]"
@@ -43286,9 +42906,8 @@ msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -43493,9 +43112,8 @@ msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -44506,9 +44124,8 @@ msgid "Check for outdated packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:52
-#, fuzzy
 msgid "Create a tarball from a package"
-msgstr "Stwórz blok kodu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:53
 msgid "Display NPM prefix"
@@ -44915,9 +44532,8 @@ msgid "Do not dump metadata about files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
-#, fuzzy
 msgid "Generate man page"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
 msgid "Which generation to restore"
@@ -45160,9 +44776,8 @@ msgid "Do not check directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
-#, fuzzy
 msgid "Check directories"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
 msgid "Do not check files"
@@ -45301,14 +44916,12 @@ msgid "Produce no output to stderr"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:2
-#, fuzzy
 msgid "Print this help text"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:3
-#, fuzzy
 msgid "Print the version number"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:4
 msgid "Set bits/sample for raw input. Default is 16"
@@ -45514,9 +45127,8 @@ msgid "Recursive query."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:28
-#, fuzzy
 msgid "Display environment variables as an s-expression."
-msgstr "Zmienna środowiskowa TERM ustawiona jest do"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:29
 msgid "Use sh-compatible mode for configuring OPAM."
@@ -45619,9 +45231,8 @@ msgid "Search into the package list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:52
-#, fuzzy
 msgid "Display information about specific packages."
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:53
 msgid "Manage multiple installation of compilers."
@@ -45850,9 +45461,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:29
 #: /tmp/fish/implicit/share/completions/pacman.fish:20
 #: /tmp/fish/implicit/share/completions/yaourt.fish:26
-#, fuzzy
 msgid "Hook file directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:32
 msgid "Apply only for AUR targets"
@@ -46301,9 +45911,8 @@ msgid "Only search the AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:5
-#, fuzzy
 msgid "Set the output directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:6
 msgid "Display this message"
@@ -46481,9 +46090,8 @@ msgid "Execute command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:19
-#, fuzzy
 msgid "Execute command, enable optional features"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
 msgid "Disable sitecustomize.pl"
@@ -46574,9 +46182,8 @@ msgid "Flush filter params specified by mod"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "Stan Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
 msgid "Output delimiter"
@@ -46787,9 +46394,8 @@ msgid "omit the user's full name, remote host and idle time in short format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:1
-#, fuzzy
 msgid "failsafe to overwrite"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:2
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:3
@@ -46801,9 +46407,8 @@ msgid "Automated package installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "Stwórz blok kodu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
@@ -47040,9 +46645,8 @@ msgid "Convert package from pkg_add format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:22
-#, fuzzy
 msgid "Create a package"
-msgstr "Stwórz blok kodu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:23
 #: /tmp/fish/implicit/share/completions/pkg.fish:31
@@ -47143,9 +46747,8 @@ msgid "Force installation with missing dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:49
-#, fuzzy
 msgid "Force quiet output"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:50
 msgid "Do not make changes"
@@ -47286,18 +46889,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:36
 #: /tmp/fish/implicit/share/completions/prt-get.fish:95
-#, fuzzy
 msgid "Force rebuild"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:13
 msgid "Remove package and sources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:14
-#, fuzzy
 msgid "Keep working dir"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:15
 msgid "Use another config"
@@ -47335,9 +46936,8 @@ msgid "Displays help information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:7
-#, fuzzy
 msgid "Prints the version and exits"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:1
 msgid "run 'make config' for all ports (overrides -G)."
@@ -47512,9 +47112,8 @@ msgid "display the version number El ENVIRONMENT The d… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:44
-#, fuzzy
 msgid "Ports Directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:45
 msgid "Installed Package"
@@ -47630,9 +47229,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:15
 #: /tmp/fish/implicit/share/completions/prt-get.fish:76
-#, fuzzy
 msgid "Search for a pattern in the footprints in the ports tree"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:16
 #: /tmp/fish/implicit/share/completions/prt-get.fish:77
@@ -47670,9 +47268,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:23
 #: /tmp/fish/implicit/share/completions/prt-get.fish:83
-#, fuzzy
 msgid "Print formatted list of ports"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:25
 #: /tmp/fish/implicit/share/completions/prt-get.fish:85
@@ -47690,9 +47287,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:28
 #: /tmp/fish/implicit/share/completions/prt-get.fish:87
-#, fuzzy
 msgid "Print the listing of the directory of a port"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:29
 #: /tmp/fish/implicit/share/completions/prt-get.fish:88
@@ -47731,9 +47327,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:42
 #: /tmp/fish/implicit/share/completions/prt-get.fish:101
-#, fuzzy
 msgid "Keep work directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:43
 #: /tmp/fish/implicit/share/completions/prt-get.fish:102
@@ -47879,9 +47474,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:17
 #: /tmp/fish/implicit/share/completions/ps.fish:23
-#, fuzzy
 msgid "User defined format"
-msgstr "Sygnał zdefiniowany przez użytkownika 2"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:18
 #: /tmp/fish/implicit/share/completions/ps.fish:25
@@ -47961,9 +47555,8 @@ msgid "run only single command (SQL or internal) and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
-#, fuzzy
 msgid "execute commands from file, then exit"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
 msgid "list available databases, then exit"
@@ -48142,23 +47735,20 @@ msgid "Wait given time (in secs) between updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:19
-#, fuzzy
 msgid "Set terminal width"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:20
-#, fuzzy
 msgid "Set terminal height"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:21
 msgid "Prefix output with given name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:22
-#, fuzzy
 msgid "Force output"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:23
 msgid "Use cursor positioning escape sequence instead of \\r"
@@ -48342,9 +47932,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:4
 #: /tmp/fish/implicit/share/completions/python3.fish:4
 #: /tmp/fish/implicit/share/completions/python.fish:4
-#, fuzzy
 msgid "Ignore environment variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:6
 #: /tmp/fish/implicit/share/completions/python3.fish:6
@@ -48428,9 +48017,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:22
-#, fuzzy
 msgid "Set implementation-specific option"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:23
@@ -48592,9 +48180,8 @@ msgid "Activate clean mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:3
-#, fuzzy
 msgid "Change configuration directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:4
 msgid "Create copies of the default configuration"
@@ -48609,9 +48196,8 @@ msgid "Pick multiple files with ranger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:7
-#, fuzzy
 msgid "Pick directory"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:8
 msgid "Open ranger with given file selected"
@@ -48630,9 +48216,8 @@ msgid "Print statistics of CPU usage on exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:12
-#, fuzzy
 msgid "Execute command after configuration file read"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:1
 msgid "List all rbenv commands"
@@ -48667,9 +48252,8 @@ msgid "Set or show the shell-specific Ruby version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:9
-#, fuzzy
 msgid "Show the current Ruby version"
-msgstr "Zatrzymaj obecnie używaną funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:10
 msgid "List all Ruby versions known by rbenv"
@@ -48856,9 +48440,8 @@ msgid "Remove each component of path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
-#, fuzzy
 msgid "Prints the help text."
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:2
 msgid "Send errors to syslog instead of standard error."
@@ -48903,9 +48486,8 @@ msgid "Run with memory usage monitoring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:5
-#, fuzzy
 msgid "List of rpm configuration files"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:6
 msgid "Pipe output through specified command"
@@ -49123,9 +48705,8 @@ msgid "List packages on which this package depends"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:53
-#, fuzzy
 msgid "List the package specific scriptlets"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:54
 msgid ""
@@ -49298,9 +48879,8 @@ msgid "Turn off an implied OPTION (e.g. --no-D)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:6
-#, fuzzy
 msgid "Recurse into directories"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:7
 msgid "Use relative path names"
@@ -49767,9 +49347,8 @@ msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -49888,9 +49467,8 @@ msgid "Run interactive (re)configuration tool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
 msgid "AWS Access Key"
@@ -49909,9 +49487,8 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "(domyślne)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
 msgid "Don't use HTTPS"
@@ -49926,9 +49503,8 @@ msgid "Don't encrypt files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:53
-#, fuzzy
 msgid "Force overwrite"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:54
 msgid "Resume partially downloaded file"
@@ -49943,9 +49519,8 @@ msgid "Resume multipart upload by UploadId"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:57
-#, fuzzy
 msgid "Skip existing files at destination"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
 msgid "Upload/download/delete recursively"
@@ -50104,9 +49679,8 @@ msgid "Don't use mime magic when guessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:97
-#, fuzzy
 msgid "Force MIME-type"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:98
 msgid "Add HTTP header"
@@ -50125,9 +49699,8 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
@@ -50186,14 +49759,12 @@ msgid "Show file transfer stats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:117
-#, fuzzy
 msgid "Enable CloudFront distribution"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:118
-#, fuzzy
 msgid "Disable CloudFront distribution"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:119
 msgid "Invalidate CloudFront file"
@@ -50228,9 +49799,8 @@ msgid "Cache FILE containing MD5 values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:131
-#, fuzzy
 msgid "Silence stdout output"
-msgstr "Przymusowe wyjście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:132
 msgid "Path to SSL CA certificate FILE"
@@ -50476,19 +50046,16 @@ msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
-#, fuzzy
 msgid "Set log level to debug"
-msgstr "Katalog domowy dla"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:6
 msgid "Disable ANSI color codes"
@@ -50507,27 +50074,24 @@ msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
 msgid "Specify path to local Ivy repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
@@ -50751,9 +50315,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:9
-#, fuzzy
 msgid "Debug the build process"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:10
 msgid ""
@@ -50817,9 +50380,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:23
-#, fuzzy
 msgid "No execute"
-msgstr "Wykonywalny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:24
 msgid ""
@@ -51012,14 +50574,12 @@ msgid "Preselect window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
-#, fuzzy
 msgid "Set shell"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:31
-#, fuzzy
 msgid "Session name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:32
 msgid "Session title"
@@ -51038,9 +50598,8 @@ msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "Stan Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
 msgid "Display version information and exit"
@@ -51067,9 +50626,8 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "Wykonaj zestaw komend wielokrotnie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
 msgid "Select a window or rectangle with the mouse"
@@ -51100,9 +50658,8 @@ msgid "How to link generated output to the source files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/service.fish:1
-#, fuzzy
 msgid "Service name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:1
 msgid "Color"
@@ -51110,9 +50667,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:2
 #: /tmp/fish/implicit/share/completions/set.fish:12
-#, fuzzy
 msgid "Change background color"
-msgstr "Ostatnie zadanie działające w tle"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:3
 #: /tmp/fish/implicit/share/completions/set.fish:13
@@ -51284,9 +50840,8 @@ msgid "Verify a signed checksum list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
 msgid "Verify a signed message and sig"
@@ -51314,33 +50869,28 @@ msgid "List installed snaps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
-#, fuzzy
 msgid "List change IDs"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
-#, fuzzy
 msgid "Check that no assertion type is used yet"
-msgstr "Sprawdź czy ten typ terminala jest obsługiwany przez ten system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:12
 msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "Wypisz lub usuń funkcje"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
 msgid "Show this help message"
@@ -51415,9 +50965,8 @@ msgid "Field separator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:19
-#, fuzzy
 msgid "Set temporary directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:20
 msgid "Output only first of equal lines"
@@ -51440,9 +50989,8 @@ msgid "Interface to transmit from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:6
-#, fuzzy
 msgid "Go to background"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:7
 msgid "Allow remote host to connect to local forwarded ports"
@@ -51786,14 +51334,12 @@ msgid "Subcommands specific to package signatures (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:2
-#, fuzzy
 msgid "Test if this is a login shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:3
-#, fuzzy
 msgid "Test if this is an interactive shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:4
 msgid "Test if a command substitution is currently evaluated"
@@ -51820,14 +51366,12 @@ msgid "Test if all new jobs are put under job control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:10
-#, fuzzy
 msgid "Print the filename of the currently running script"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:11
-#, fuzzy
 msgid "Print the line number of the currently running script"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:12
 msgid ""
@@ -51919,14 +51463,12 @@ msgid "Remove newline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "Przenieś zadanie w tło"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
 msgid "Open a new window"
@@ -51975,23 +51517,20 @@ msgid "Read password from stdin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:8
-#, fuzzy
 msgid "Run command in the background"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:9
 msgid "Edit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:10
-#, fuzzy
 msgid "Run command as group"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:12
-#, fuzzy
 msgid "Run a login shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:13
 msgid "Reset or ignore the credential timestamp"
@@ -52016,27 +51555,24 @@ msgid "Run the given command in a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:18
-#, fuzzy
 msgid "Run command as user"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:19
 msgid "Validate the credentials, extending timeout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:1
-#, fuzzy
 msgid "Make login shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:2
 msgid "Pass command to shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:3
-#, fuzzy
 msgid "Pass -f to the shell"
-msgstr "Opuść powłokę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:1
 msgid "Make a completion for a subcommand"
@@ -52172,9 +51708,8 @@ msgid "Restore pristine working copy file (undo most local edits)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
-#, fuzzy
 msgid "Print the status of working copy files and directories."
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
 msgid "Update the working copy to a different URL."
@@ -52205,9 +51740,8 @@ msgid "Do not cache authentication tokens"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:41
-#, fuzzy
 msgid "Do no interactive prompting"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:42
 msgid ""
@@ -52795,9 +52329,8 @@ msgid "Mount directories as overlayfs in the container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:30
-#, fuzzy
 msgid "Pass environment variables to init in the container"
-msgstr "Zmienna środowiskowa TERM ustawiona jest do"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:31
 msgid "Share the system with the host [See Man Page]"
@@ -52941,9 +52474,8 @@ msgid "Reblock while reading"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:16
-#, fuzzy
 msgid "Print directory names"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:17
 msgid "Archive file"
@@ -53043,9 +52575,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
-#, fuzzy
 msgid "Do not sort file arguments"
-msgstr "printf: brak wystarczających argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:46
 msgid "Preserve file ownership"
@@ -53127,9 +52658,8 @@ msgid "The role to set the termite window to report itself with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:5
-#, fuzzy
 msgid "Set the termite window's title"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:6
 msgid "Tell termite to change to <dir> when launching"
@@ -53221,9 +52751,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:9
 #: /tmp/fish/implicit/share/completions/terraform.fish:26
 #: /tmp/fish/implicit/share/completions/terraform.fish:84
-#, fuzzy
 msgid "Limit the number of concurrent operations"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:10
 #: /tmp/fish/implicit/share/completions/terraform.fish:27
@@ -53291,9 +52820,8 @@ msgid "Don't ask for input for destroy confirmation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:33
-#, fuzzy
 msgid "Environment management"
-msgstr "Zmienna środowiskowa TERM ustawiona jest do"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:34
 msgid "List environments"
@@ -53535,18 +53063,16 @@ msgid "Left integer not equal to right integer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:15
-#, fuzzy
 msgid "File is block device"
-msgstr "Nie określono bloków"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:16
 msgid "File is character device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:17
-#, fuzzy
 msgid "File is directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:18
 msgid "File exists"
@@ -53770,9 +53296,8 @@ msgid "Delete one or more snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:24
-#, fuzzy
 msgid "Print information about destinations"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:25
 msgid "Turn off automatic backups"
@@ -53808,9 +53333,8 @@ msgid "Print paths for all snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
 msgid "Removes a backup destination"
@@ -53885,9 +53409,8 @@ msgid "connected clients"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:3
-#, fuzzy
 msgid "window panes"
-msgstr "Zmiana rozmiaru okna"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:4
 msgid "Force tmux to assume the terminal supports 256 colours"
@@ -53898,9 +53421,8 @@ msgid "Like -2, but indicates that the terminal supports 88 colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:6
-#, fuzzy
 msgid "Behave as a login shell"
-msgstr "To jest powłoka logowania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:7
 msgid "Set the quiet server option"
@@ -53919,9 +53441,8 @@ msgid "Report the tmux version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:11
-#, fuzzy
 msgid "Execute command using the default shell"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:13
 msgid "Specify the name of the server socket to use"
@@ -54026,9 +53547,8 @@ msgid "save msgs in status bar in per-client msg log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:38
-#, fuzzy
 msgid "execute commands from path"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:39
 msgid "start tmux server if not running; do not create a session"
@@ -54078,9 +53598,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:51
 #: /tmp/fish/implicit/share/completions/tmux.fish:74
-#, fuzzy
 msgid "bind key to command"
-msgstr "Zakończ zestaw komend"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:52
 msgid "bind for command mode instead of normal mode"
@@ -54100,15 +53619,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:56
 #: /tmp/fish/implicit/share/completions/tmux.fish:58
-#, fuzzy
 msgid "list all key bindings"
-msgstr "Steruj przypisaniami klawiszy fish'a"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:57
 #: /tmp/fish/implicit/share/completions/tmux.fish:68
-#, fuzzy
 msgid "key table"
-msgstr "Wykonywalny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:59
 msgid "reset terminal state"
@@ -54132,9 +53649,8 @@ msgid "unbind the command bound to key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:65
-#, fuzzy
 msgid "remove all key bindings"
-msgstr "Steruj przypisaniami klawiszy fish'a"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:66
 msgid "binding for command mode"
@@ -54145,15 +53661,13 @@ msgid "command bound to key without a prefix (if any) removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:69
-#, fuzzy
 msgid "Set or unset an environment variable"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:70
 #: /tmp/fish/implicit/share/completions/tmux.fish:75
-#, fuzzy
 msgid "global environment"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:71
 msgid "remove from environment before starting a new process"
@@ -54404,9 +53918,8 @@ msgid "List session information from the server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:31
-#, fuzzy
 msgid "List statistical information from the server"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:32
 msgid "List all torrents"
@@ -54465,9 +53978,8 @@ msgid "Try to download the specified files last"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:47
-#, fuzzy
 msgid "Set the maximum number of peers"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:48
 msgid "Remove the current torrents"
@@ -54510,14 +54022,12 @@ msgid "Remove a tracker from a torrent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:58
-#, fuzzy
 msgid "Start the current torrents"
-msgstr "Zatrzymaj obecnie używaną funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:59
-#, fuzzy
 msgid "Stop the current torrents"
-msgstr "Zatrzymaj obecnie używaną funkcję"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:60
 msgid "Start added torrents paused"
@@ -54644,9 +54154,8 @@ msgid "Displays or changes the API endpoint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
-#, fuzzy
 msgid "Show or modify build environment variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:12
 msgid "Helps you out when in dire need of information"
@@ -54781,9 +54290,8 @@ msgid "List directories only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:3
-#, fuzzy
 msgid "Follow symbolic links like directories"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:4
 msgid "Print the full path prefix for each file"
@@ -55107,9 +54615,8 @@ msgid "Suppress function and builtin lookup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:4
-#, fuzzy
 msgid "Print command type"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:5
 msgid "Print path to command, or nothing if name is not a command"
@@ -55174,19 +54681,16 @@ msgid "Set SMART data for a drive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:15
-#, fuzzy
 msgid "Object to get information about"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:16
-#, fuzzy
 msgid "Block device to get information about"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:17
-#, fuzzy
 msgid "Drive to get information about"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:18
 msgid "Filesystem type to use"
@@ -55394,23 +54898,20 @@ msgid "Print kernel version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:13
-#, fuzzy
 msgid "Print machine name"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:14
-#, fuzzy
 msgid "Print processor"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:15
 msgid "Print hardware platform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:16
-#, fuzzy
 msgid "Print operating system"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unexpand.fish:1
 msgid "convert all blanks, instead of just initial blanks"
@@ -55501,9 +55002,8 @@ msgid "Override cache method for a specified overlay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:2
-#, fuzzy
 msgid "Be verbose (default)"
-msgstr "(domyślne)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:3
 msgid "Call wget as the given USER"
@@ -55579,9 +55079,8 @@ msgid "Change user's password file comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:3
-#, fuzzy
 msgid "Change user's login directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:4
 msgid "Date on which the user account will be disabled"
@@ -55616,9 +55115,8 @@ msgid "Allow non-unique UID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:13
-#, fuzzy
 msgid "Apply changes in this directory"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:14
 msgid "The name of the user's new login shell"
@@ -55729,9 +55227,8 @@ msgid "Shuts down the running machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:21
-#, fuzzy
 msgid "Force shut down"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:22
 msgid "Initializes the Vagrant environment"
@@ -56288,28 +55785,24 @@ msgid "be quiet and make the output more parseable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:12
-#, fuzzy
 msgid "set the registry directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:13
-#, fuzzy
 msgid "set the addons source directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:14
-#, fuzzy
 msgid "set the addons target directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:15
 msgid "increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:16
-#, fuzzy
 msgid "set the system-wide target directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:17
 msgid "set target directory to the system-wide one"
@@ -56324,9 +55817,8 @@ msgid "Source file after the first file has been read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:3
-#, fuzzy
 msgid "Execute Ex command before loading any vimrc"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:4
 msgid "Use device as terminal (Amiga only)"
@@ -56365,9 +55857,8 @@ msgid "Set the cursor to tag"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:13
-#, fuzzy
 msgid "Terminal name"
-msgstr "Terminal zawieszony"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:14
 msgid "Use alternative vimrc"
@@ -56532,9 +56023,8 @@ msgid "Set server name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
-#, fuzzy
 msgid "Print version information and exit"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
@@ -56666,9 +56156,8 @@ msgid "Remove packages listed in a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:33
-#, fuzzy
 msgid "Search for a file within installed packages"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
@@ -56897,9 +56386,8 @@ msgid "Convert a RedHat .rpm file to a Debian .deb file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
-#, fuzzy
 msgid "Search for packages containing listed words"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
 msgid "Find local Debian archives suitable for sources.list"
@@ -57041,14 +56529,12 @@ msgid "Pass command to exec instead of \"sh -c\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:1
-#, fuzzy
 msgid "Print byte counts"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:2
-#, fuzzy
 msgid "Print character counts"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:3
 msgid "Print newline counts"
@@ -57059,9 +56545,8 @@ msgid "Print length of longest line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:5
-#, fuzzy
 msgid "Print word counts"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:1
 msgid "Number sets BitsPerPixel value"
@@ -57206,9 +56691,8 @@ msgid "Go to background immediately after startup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:4
-#, fuzzy
 msgid "Execute command as if part of .wgetrc"
-msgstr "Wykonaj komendę jeżeli poprzednia komenda zakończy się niepowodzeniem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:5
 msgid "Log all messages to logfile"
@@ -57637,9 +57121,8 @@ msgid "Print time of last boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:3
-#, fuzzy
 msgid "Print dead processes"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:4
 msgid "Print line of headings"
@@ -57650,9 +57133,8 @@ msgid "Print idle time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:6
-#, fuzzy
 msgid "Print login process"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:7
 msgid "Canonicalize hostnames via DNS"
@@ -57671,9 +57153,8 @@ msgid "Print all login names and number of users logged on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:11
-#, fuzzy
 msgid "Print current runlevel"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:12
 msgid "Print name, line, and time"
@@ -57883,9 +57364,8 @@ msgid "set/list network variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
-#, fuzzy
 msgid "get network variables"
-msgstr "Operuj zmiennymi środowiskowymi"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
 msgid "save the current configuration"
@@ -57985,9 +57465,8 @@ msgid "Print the command line on the standard error output before executing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:15
-#, fuzzy
 msgid "Exit if the size is exceeded"
-msgstr "Przekroczony limit rozmiaru pliku"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:16
 msgid "Run up to max-procs processes at a time"
@@ -58232,9 +57711,8 @@ msgid "Show the main window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:1
-#, fuzzy
 msgid "Set the initial window geometry"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
 msgid "Set the window title"
@@ -58261,9 +57739,8 @@ msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "Ustaw kolor terminala"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
 msgid "Start in continuous view mode"
@@ -58560,9 +58037,8 @@ msgid "Don't define a primary output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:43
-#, fuzzy
 msgid "Print current screen configuration"
-msgstr "Wypisz obecnie uruchomione zadania"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:44
 msgid ""
@@ -58717,9 +58193,8 @@ msgid "Do not detach from the controlling terminal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:17
-#, fuzzy
 msgid "Print informative messages"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:1
 msgid "Never highlight the text cursor"
@@ -58986,9 +58461,8 @@ msgid "Use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:67
-#, fuzzy
 msgid "Force insert mode"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:68
 msgid "Treat C1 control characters as printable"
@@ -59239,9 +58713,8 @@ msgid "Test the integrity of compressed files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:4
-#, fuzzy
 msgid "Print information about compressed files"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:5
 msgid "Don't delete the input files"
@@ -59380,9 +58853,8 @@ msgid "Show some statistics about your packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:29
-#, fuzzy
 msgid "Force color"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:30
 msgid "Force installation or updates"
@@ -59653,9 +59125,8 @@ msgid "Set maximum delay between commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:18
-#, fuzzy
 msgid "Run commands from cache"
-msgstr "Uruchom komendę w obecnym procesie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:20
 msgid "Specify installroot"
@@ -59720,32 +59191,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:2
 #: /tmp/fish/implicit/share/completions/zpool.fish:2
-#, fuzzy
 msgid "Display a help message"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "Create a volume or filesystem"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:4
 msgid "Destroy a dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:5
-#, fuzzy
 msgid "Create a snapshot"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:6
 msgid "Roll back a filesystem to a previous snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Create a clone of a snapshot"
-msgstr "Stwórz blok kodu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:8
 msgid ""
@@ -59854,9 +59321,8 @@ msgid "Volume size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:35
-#, fuzzy
 msgid "Create a sparse volume"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:36
 msgid "Blocksize"
@@ -59871,14 +59337,12 @@ msgid "Recursively destroy all dependents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:39
-#, fuzzy
 msgid "Force unmounting"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:41
-#, fuzzy
 msgid "Print machine-parsable verbose information"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:43
 msgid "Defer snapshot deletion"
@@ -59974,9 +59438,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:80
 #: /tmp/fish/implicit/share/completions/zfs.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:66
-#, fuzzy
 msgid "Print parsable (exact) values for numbers"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:69
 #: /tmp/fish/implicit/share/completions/zfs.fish:97
@@ -60007,9 +59470,8 @@ msgid "Fields to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:79
-#, fuzzy
 msgid "Property source to display"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:82
 msgid "Property to get"
@@ -60032,9 +59494,8 @@ msgid "Upgrade all eligible filesystems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Upgrade to the specified version"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:91
 msgid "Filesystem to upgrade"
@@ -60070,9 +59531,8 @@ msgid "Temporary mount point property"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:104
-#, fuzzy
 msgid "Report progress"
-msgstr "Proces potomny"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:105
 msgid "Mount all available ZFS filesystems"
@@ -60130,9 +59590,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:119
 #: /tmp/fish/implicit/share/completions/zfs.fish:128
-#, fuzzy
 msgid "Generate a deduplicated stream"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:120
 #: /tmp/fish/implicit/share/completions/zfs.fish:129
@@ -60146,36 +59605,31 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:122
 #: /tmp/fish/implicit/share/completions/zfs.fish:131
-#, fuzzy
 msgid "Print verbose information about the stream in a machine-parsable format"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:123
-#, fuzzy
 msgid "Generate compressed stream"
-msgstr "Zwróć losową liczbę"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:125
 #: /tmp/fish/implicit/share/completions/zfs.fish:133
-#, fuzzy
 msgid "Include dataset properties"
-msgstr "Katalog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:126
 #: /tmp/fish/implicit/share/completions/zfs.fish:134
-#, fuzzy
 msgid "Print verbose information about the stream"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:135
 msgid "Dataset to send"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:136
-#, fuzzy
 msgid ""
 "Print verbose information about the stream and the time spent processing it"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:137
 msgid "Dry run: do not actually receive the stream"
@@ -60417,9 +59871,8 @@ msgid "Exclude extra file attributes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:26
-#, fuzzy
 msgid "Store symbolic links as links"
-msgstr "Pętla nawiązań symbolicznych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:27
 msgid "PKZIP recursion"
@@ -60451,9 +59904,8 @@ msgid "Clear devices errors in pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:6
-#, fuzzy
 msgid "Create a new storage pool"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:7
 msgid "Destroy a storage pool"
@@ -60476,9 +59928,8 @@ msgid "Get one or several pool properties"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "Display pool command history"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:13
 msgid "List importable pools, or import some"
@@ -60497,9 +59948,8 @@ msgid "List pools with health status and space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:17
-#, fuzzy
 msgid "Take the specified devices offline"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:18
 msgid "Bring the specified devices back online"
@@ -60566,9 +60016,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zpool.fish:101
 #: /tmp/fish/implicit/share/completions/zpool.fish:128
 #: /tmp/fish/implicit/share/completions/zpool.fish:136
-#, fuzzy
 msgid "Resolve device path symbolic links"
-msgstr "Nawiązanie symboliczne"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:32
 #: /tmp/fish/implicit/share/completions/zpool.fish:93
@@ -60605,9 +60054,8 @@ msgid "Virtual device to operate on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:40
-#, fuzzy
 msgid "Initiate recovery mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:41
 #: /tmp/fish/implicit/share/completions/zpool.fish:85
@@ -60668,9 +60116,8 @@ msgid "Physical device to detach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:58
-#, fuzzy
 msgid "Print verbose event information"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:60
 msgid "Output appended data as the log grows"
@@ -60705,23 +60152,20 @@ msgid "Also display internal events"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:72
-#, fuzzy
 msgid "Display log records using long format"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:73
 msgid "Pool to get command history of"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:74
-#, fuzzy
 msgid "Read configuration from specified cache file"
-msgstr "Zmień katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:75
-#, fuzzy
 msgid "Search for devices or files in specified directory"
-msgstr "Nawiązanie symboliczne do katalogu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:76
 msgid "List or import destroyed pools only (requires -f for importation)"
@@ -60737,14 +60181,12 @@ msgid "Properties of the imported pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:79
-#, fuzzy
 msgid "Force import"
-msgstr "Wymuszono zatrzymanie"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:80
-#, fuzzy
 msgid "Recovery mode"
-msgstr "Tylko dla zadań interaktywnych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:81
 msgid "Search for and import all pools found"
@@ -60786,9 +60228,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:104
-#, fuzzy
 msgid "Print verbose statistics"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:96
 msgid "Pool to retrieve I/O stats from"
@@ -60799,9 +60240,8 @@ msgid "Treat exported or foreign devices as inactive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:98
-#, fuzzy
 msgid "Device to clear ZFS label information from"
-msgstr "Zwróć informacje o fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:106
 msgid "Pool to list properties of"
@@ -60906,9 +60346,8 @@ msgid "Display upgradeable ZFS versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:146
-#, fuzzy
 msgid "Upgrade to the specified legacy version"
-msgstr "Szukaj określonego ciągu znaków w liście"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:2
 msgid "Repo"
@@ -61896,9 +61335,8 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "Stan Komenda"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
@@ -61909,9 +61347,8 @@ msgid "Print the current directory history (the prev and next lists)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirs.fish:1
-#, fuzzy
 msgid "Print directory stack"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/down-or-search.fish:1
 msgid ""
@@ -62080,9 +61517,8 @@ msgid "Complete ftp, pftp"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:2
-#, fuzzy
 msgid "Hostname"
-msgstr "Nazwa procesu"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:3
 msgid "Use only IPv4 to contact any host"
@@ -62197,9 +61633,8 @@ msgid "Scale image files to use up to number percent of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:17
-#, fuzzy
 msgid "Set the number of characters per inch to use"
-msgstr "Wylicz liczbę argumentów"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:18
 msgid "Set the number of lines per inch to use"
@@ -62542,9 +61977,8 @@ msgid "Move the last element of a directory history from src to dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_no_arguments.fish:1
-#, fuzzy
 msgid "Internal fish function"
-msgstr "Niedozwolona instrukcja"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_not_contain_opt.fish:1
 msgid "Checks that a specific option is not in the current command line"
@@ -62571,9 +62005,8 @@ msgid "Print a list of all known filesystem types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
-#, fuzzy
 msgid "Print a list of local groups"
-msgstr "Zwraca sformatowany tekst"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
 msgid "Print help message for the specified fish function or builtin"
@@ -62592,9 +62025,8 @@ msgid "Print lpr options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
-#, fuzzy
 msgid "Print lpr printers"
-msgstr "Wypisz argumenty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
@@ -62666,9 +62098,8 @@ msgid "Comment/uncomment the current command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "Update man-page based completions"
-msgstr "Edytuj sugestie do określonej komendy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
 msgid "Test if a non-switch argument has been given in the current commandline"
@@ -62687,9 +62118,8 @@ msgid "vi-like key bindings for fish"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/funced.fish:1
-#, fuzzy
 msgid "Edit function definition"
-msgstr "'return' poza definicją funkcji"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/funcsave.fish:1
 msgid "Save the current definition of all specified functions to file"
@@ -62724,9 +62154,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/functions/ls.fish:1
 #: /tmp/fish/implicit/share/functions/ls.fish:2
 #: /tmp/fish/implicit/share/functions/ls.fish:3
-#, fuzzy
 msgid "List contents of directory"
-msgstr "Zwróć katalog roboczy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/man.fish:1
 msgid "Format and display the on-line manual pages"
@@ -62775,9 +62204,8 @@ msgid "print the resolved path [command grealpath]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:3
-#, fuzzy
 msgid "return an absolute path without symlinks"
-msgstr "Zamień ścieżkę na ścieżkę bezwzględną bez nawiązań symbolicznych"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:1
 msgid "Print sequences of numbers"
@@ -62836,18 +62264,14 @@ msgstr ""
 #~ msgid "getopt_long() unexpectedly returned zero\n"
 #~ msgstr "getopt_long() nieoczekiwanie zwrócił 0\n"
 
-#, fuzzy
 #~ msgid "terminal_give_to_job(): Could not send job %d ('%ls') to foreground"
 #~ msgstr "Nie można przenieść zadania %d ('%ls') na pierwszy plan"
 
-#, fuzzy
 #~ msgid "funced: You must specify one function name"
 #~ msgstr "Oczekiwano dokładnie jednej nazwy funkcji"
 
-#, fuzzy
 #~ msgid "%s: Expected function name\\n"
 #~ msgstr "%s: Oczekiwano nazwy funkcji"
 
-#, fuzzy
 #~ msgid "%ls: Invalid combination of options,\\n%ls\\n"
 #~ msgstr "%ls: Nieprawidłowa kombinacja opcji,\\n%ls\\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8dd7bc8d1..bfc7b3c5f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,18 +20,16 @@ msgstr ""
 "X-Generator: Poedit 1.8.4\n"
 
 #: src/autoload.cpp:96
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not autoload item '%ls', it is already being autoloaded. This is a "
 "circular dependency in the autoloading scripts, please remove it."
 msgstr ""
-"Não foi possível carregar o item “%ls” automaticamente, ele já está sendo "
-"carregado automaticamente. "
 
 #: src/builtin_argparse.cpp:36
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid option spec '%ls' at char '%lc'\n"
-msgstr "%ls: Opção inválida '%ls' at char '%lc'\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:129
 #, c-format
@@ -39,14 +37,14 @@ msgid "%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag string '%ls' is not valid\n"
-msgstr "%ls: Valor semeado “%ls” não é um número válido\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag '%ls' is not valid\n"
-msgstr "%ls: Valor semeado “%ls” não é um número válido\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:196
 #, c-format
@@ -85,14 +83,14 @@ msgid "%ls: No option specs were provided\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --min-args value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:401
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --max-args value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:23
 #, c-format
@@ -114,9 +112,9 @@ msgid "%ls: There are no suitable jobs\n"
 msgstr "%ls: Não há tarefas adequadas\n"
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid job specifier\n"
-msgstr "%ls: “%ls” não é um nome válido para variável\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:95 src/builtin_disown.cpp:89 src/builtin_wait.cpp:163
 #, c-format
@@ -124,24 +122,24 @@ msgid "%ls: Could not find job '%d'\n"
 msgstr ""
 
 #: src/builtin_bind.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No key with name '%ls' found\n"
-msgstr "%ls: No key with name “%ls” found\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:143
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Key with name '%ls' does not have any mapping\n"
-msgstr "%ls: Key with name “%ls” does not have any mapping\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:146
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown error trying to bind to key named '%ls'\n"
-msgstr "%ls: Unknown error trying to bind to key named “%ls”\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No binding found for key '%ls'\n"
-msgstr "%s: No description for type %s\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:242
 #, c-format
@@ -199,29 +197,29 @@ msgid "%ls: Could not set PWD variable\n"
 msgstr "%ls: Não é possível modificar a variável PWD\n"
 
 #: src/builtin_commandline.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown input function '%ls'"
-msgstr "%ls: Unknown input function “%ls”"
+msgstr ""
 
 #: src/builtin_complete.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid token '%ls'\n"
-msgstr "%ls: Opção inválida -- %lc\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:203
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -s requires a non-empty string\n"
-msgstr "%ls: Nome da variável não pode ser a string vazia\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:211
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -l requires a non-empty string\n"
-msgstr "%ls: Nome da variável não pode ser a string vazia\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: -o requires a non-empty string\n"
-msgstr "%ls: Nome da variável não pode ser a string vazia\n"
+msgstr ""
 
 #: src/builtin_contains.cpp:75
 #, c-format
@@ -243,9 +241,9 @@ msgid "%ls: Not inside of loop\n"
 msgstr "%ls: Não está dentro de laço\n"
 
 #: src/builtin.cpp:372
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Command not valid at an interactive prompt\n"
-msgstr "%ls: Do no interactive prompting\n"
+msgstr ""
 
 #: src/builtin.cpp:410 src/builtin.cpp:460
 msgid "Test a condition"
@@ -323,9 +321,8 @@ msgid "Count the number of arguments"
 msgstr "Conta o número de argumentos"
 
 #: src/builtin.cpp:430
-#, fuzzy
 msgid "Remove job from job list"
-msgstr "Read job from file"
+msgstr ""
 
 #: src/builtin.cpp:431
 msgid "Print arguments"
@@ -384,9 +381,8 @@ msgid "Print currently running jobs"
 msgstr "Imprime as tarefas em execução"
 
 #: src/builtin.cpp:445
-#, fuzzy
 msgid "Evaluate math expressions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: src/builtin.cpp:446
 msgid "Negate exit status of job"
@@ -496,43 +492,41 @@ msgstr ""
 "está sob controle de tarefas\n"
 
 #: src/builtin_function.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown signal '%ls'"
-msgstr "%ls: Sinal desconhecido “%ls”"
+msgstr ""
 
 #: src/builtin_function.cpp:113
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Cannot find calling job for event handler"
-msgstr "%ls: Não é possível encontrar tarefa para o manipulador de eventos"
+msgstr ""
 
 #: src/builtin_function.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid process id '%ls'"
-msgstr "%ls: ID de processo inválido '%ls'"
+msgstr ""
 
 #: src/builtin_function.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected function name"
-msgstr "%ls: Esperava nome de função"
+msgstr ""
 
 #: src/builtin_function.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Illegal function name '%ls'"
-msgstr "%ls: Nome de função ilegal “%ls”"
+msgstr ""
 
 #: src/builtin_function.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: The name '%ls' is reserved,\n"
 "and can not be used as a function name"
 msgstr ""
-"%ls: O nome “%ls” é reservado,\n"
-"e não pode ser usado como um nome de função"
 
 #: src/builtin_function.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unexpected positional argument '%ls'"
-msgstr "%s: Esperava argumento -- %s\\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:275 src/builtin.h:38
 #, c-format
@@ -550,9 +544,9 @@ msgid "%ls: Function '%ls' does not exist\n"
 msgstr "%ls: Função “%ls” não existe\n"
 
 #: src/builtin_functions.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
-msgstr "%ls: Esperava exatamente um nome de função\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:342
 #, c-format
@@ -584,9 +578,9 @@ msgid "%ls: you cannot use any options with the %ls command\n"
 msgstr ""
 
 #: src/builtin_history.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: max value '%ls' is not a valid number\n"
-msgstr "%ls: Valor semeado “%ls” não é um número válido\n"
+msgstr ""
 
 #: src/builtin_history.cpp:261
 msgid "builtin history delete only supports --exact\n"
@@ -613,9 +607,8 @@ msgid "stopped"
 msgstr "parado"
 
 #: src/builtin_jobs.cpp:67
-#, fuzzy
 msgid "running"
-msgstr "running"
+msgstr ""
 
 #: src/builtin_jobs.cpp:76
 msgid "Group\n"
@@ -635,9 +628,9 @@ msgid "%ls: There are no jobs\n"
 msgstr "%ls: Não há tarefas\n"
 
 #: src/builtin_math.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid scale value\n"
-msgstr "%ls: “%ls” não é um nome válido para variável\n"
+msgstr ""
 
 #: src/builtin_math.cpp:148
 #, c-format
@@ -650,14 +643,13 @@ msgid "More than %d var names in math expression."
 msgstr ""
 
 #: src/builtin_math.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid expression: %ls\n"
-msgstr "%ls: ID de processo inválido '%ls'\n"
+msgstr ""
 
 #: src/builtin_printf.cpp:243
-#, fuzzy
 msgid "Number out of range"
-msgstr "Number of top servers"
+msgstr ""
 
 #: src/builtin_printf.cpp:249
 #, c-format
@@ -714,9 +706,9 @@ msgid "%ls: You can't specify both -p and -P\n"
 msgstr ""
 
 #: src/builtin_realpath.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid path: %ls\n"
-msgstr "%ls: Estado inválido: %ls\n"
+msgstr ""
 
 #: src/builtin_return.cpp:100
 #, c-format
@@ -734,9 +726,9 @@ msgid "%ls: Expected an argument\n"
 msgstr "%ls: Esperava um argumento\n"
 
 #: src/builtin_set.cpp:62
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Warning: $%ls entry \"%ls\" is not valid (%s)\n"
-msgstr "%ls: Valor semeado $%ls “%ls” não é um número válido (%s)\n"
+msgstr ""
 
 #: src/builtin_set.cpp:64
 #, c-format
@@ -749,14 +741,14 @@ msgid "%ls: You provided %d indexes but %d values\n"
 msgstr ""
 
 #: src/builtin_set.cpp:66
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Erase needs a variable name\n"
-msgstr "%ls: Erase needs a variable name\n"
+msgstr ""
 
 #: src/builtin_set.cpp:67
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Array index out of bounds\n"
-msgstr "%ls: Índice do array fora dos limites\n"
+msgstr ""
 
 #: src/builtin_set.cpp:69
 #, c-format
@@ -771,24 +763,24 @@ msgid "%ls: Tried to change the read-only variable '%ls'\n"
 msgstr "%ls: Tentou mudar a variável somente leitura “%ls”\n"
 
 #: src/builtin_set.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
-msgstr "%ls: Tentou mudar a variável somente leitura “%ls”\n"
+msgstr ""
 
 #: src/builtin_set.cpp:317
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
-msgstr "%ls: Tentou mudar a variável somente leitura “%ls”\n"
+msgstr ""
 
 #: src/builtin_set.cpp:355
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid index starting at '%ls'\n"
-msgstr "%ls: Invalid index starting at “%ls”\n"
+msgstr ""
 
 #: src/builtin_set.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: not set in %ls scope\n"
-msgstr "$%ls: Não está dentro de laço %ls\n"
+msgstr ""
 
 #: src/builtin_set.cpp:542
 msgid "exported"
@@ -804,14 +796,14 @@ msgid "$%ls: set in %ls scope, %ls, with %d elements\n"
 msgstr ""
 
 #: src/builtin_set.cpp:554
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls[%d]: length=%d value=|%ls|\n"
-msgstr "$%ls[%d]: length=%d value=|%ls|\n"
+msgstr ""
 
 #: src/builtin_set.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: invalid var name\n"
-msgstr "$%ls: Estado inválido\n"
+msgstr ""
 
 #: src/builtin_set.cpp:584
 #, c-format
@@ -834,9 +826,9 @@ msgid "%ls: Error while reading file '%ls'\n"
 msgstr "%ls: Erro ao ler o arquivo “%ls”\n"
 
 #: src/builtin_status.cpp:155
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid level value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_status.cpp:276
 msgid "This is a login shell\n"
@@ -868,9 +860,8 @@ msgid "Standard input"
 msgstr "Entrada padrão"
 
 #: src/builtin_status.cpp:320
-#, fuzzy
 msgid "Not a function"
-msgstr "função"
+msgstr ""
 
 #: src/builtin_string.cpp:39
 #, c-format
@@ -878,68 +869,68 @@ msgid "%ls: Expected argument\n"
 msgstr "%ls: Esperava argumento\n"
 
 #: src/builtin_string.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid escape style '%ls'\n"
-msgstr "%ls: Invalid index starting at “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:238
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid length value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid max value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:275
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid count value '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:321
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid start value '%ls'\n"
-msgstr "%ls: Invalid index starting at “%ls”\n"
+msgstr ""
 
 #: src/builtin_string.cpp:743
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression compile error: %ls\n"
-msgstr "%ls: Não é possível compilar a expressão regular com erro %ls\n"
+msgstr ""
 
 #: src/builtin_string.cpp:782
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression match error: %ls\n"
-msgstr "%ls: Não é possível compilar a expressão regular com erro %ls\n"
+msgstr ""
 
 #: src/builtin_string.cpp:787
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression internal error\n"
-msgstr "%ls: Não é possível compilar a expressão regular com erro\n"
+msgstr ""
 
 #: src/builtin_string.cpp:903
 msgid "--entire and --index are mutually exclusive"
 msgstr ""
 
 #: src/builtin_string.cpp:1055
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Regular expression substitute error: %ls\n"
-msgstr "%ls: Não é possível compilar a expressão regular com erro %ls\n"
+msgstr ""
 
 #: src/builtin_test.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer '%ls'"
-msgstr "precisão inválida: %ls"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:285
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: New limit cannot be an empty string\n"
-msgstr "%ls: Nome da variável não pode ser a string vazia\n"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid limit '%ls'\n"
-msgstr "%ls: Nome inválido de variável “%ls”\n"
+msgstr ""
 
 #: src/common.cpp:1551
 msgid "Current terminal parameters have rows and/or columns set to zero."
@@ -963,9 +954,9 @@ msgid "This is a bug. Break on bugreport to debug."
 msgstr ""
 
 #: src/common.cpp:1782
-#, fuzzy, c-format
+#, c-format
 msgid "If you can reproduce it, please send a bug report to %s."
-msgstr "If this error can be reproduced, please send a bug report to %s."
+msgstr ""
 
 #: src/common.cpp:1792
 msgid "empty"
@@ -982,9 +973,8 @@ msgid "Variable: %ls"
 msgstr "Variável: %ls"
 
 #: src/env.cpp:242
-#, fuzzy
 msgid "Tried to pop empty environment stack."
-msgstr "Tentou tirar de uma pilha de ambiente vazia."
+msgstr ""
 
 #: src/env.cpp:537
 #, c-format
@@ -997,35 +987,31 @@ msgid "Could not set up terminal using the fallback terminal type '%s'."
 msgstr ""
 
 #: src/env.cpp:574
-#, fuzzy
 msgid "Could not set up terminal."
-msgstr "Não foi possível preparar terminal"
+msgstr ""
 
 #: src/env.cpp:576
-#, fuzzy
 msgid "TERM environment variable not set."
-msgstr "Handle environment variables"
+msgstr ""
 
 #: src/env.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "TERM environment variable set to '%ls'."
-msgstr "TERM environment variable set to '%ls'."
+msgstr ""
 
 #: src/env.cpp:579
-#, fuzzy
 msgid "Check that this terminal type is supported on this system."
-msgstr "Verifique se seu tipo de terminal é suportado neste sistema"
+msgstr ""
 
 #: src/env.cpp:673
-#, fuzzy
 msgid ""
 "Could not determine current working directory. Is your locale set correctly?"
-msgstr "Print the current working directory, shortend to fit the prompt"
+msgstr ""
 
 #: src/env_universal_common.cpp:461
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to write to universal variables file '%ls': %s"
-msgstr "Incapaz de expandir o nome da variável “%ls”: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:481
 #, c-format
@@ -1033,9 +1019,9 @@ msgid "Unable to rename file from '%ls' to '%ls': %s"
 msgstr ""
 
 #: src/env_universal_common.cpp:533
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open temporary file '%ls': %s"
-msgstr "Incapaz de expandir o nome da variável “%ls”: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:543
 #, c-format
@@ -1043,9 +1029,9 @@ msgid "Locking the universal var file took too long (%.3f seconds)."
 msgstr ""
 
 #: src/env_universal_common.cpp:595
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open universal variable file '%ls': %s"
-msgstr "Incapaz de expandir o nome da variável “%ls”: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:970
 #, c-format
@@ -1068,59 +1054,58 @@ msgid "Unable to memory map shared memory object with path '%s': %s"
 msgstr ""
 
 #: src/env_universal_common.cpp:1396
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to make a pipe for universal variables using '%ls': %s"
-msgstr "Incapaz de expandir o nome da variável “%ls”: %s"
+msgstr ""
 
 #: src/env_universal_common.cpp:1405
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open a pipe for universal variables using '%ls': %s"
-msgstr "Incapaz de expandir o nome da variável “%ls”: %s"
+msgstr ""
 
 #: src/event.cpp:119
-#, fuzzy, c-format
+#, c-format
 msgid "signal handler for %ls (%ls)"
-msgstr "signal handler for %ls (%ls)"
+msgstr ""
 
 #: src/event.cpp:124
-#, fuzzy, c-format
+#, c-format
 msgid "handler for variable '%ls'"
-msgstr "handler for variable “%ls”"
+msgstr ""
 
 #: src/event.cpp:129
-#, fuzzy, c-format
+#, c-format
 msgid "exit handler for process %d"
-msgstr "exit handler for process %d"
+msgstr ""
 
 #: src/event.cpp:134 src/event.cpp:145
-#, fuzzy, c-format
+#, c-format
 msgid "exit handler for job %d, '%ls'"
-msgstr "exit handler for job %d, “%ls”"
+msgstr ""
 
 #: src/event.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "exit handler for job with process group %d"
-msgstr "exit handler for job with process group %d"
+msgstr ""
 
 #: src/event.cpp:148
-#, fuzzy, c-format
+#, c-format
 msgid "exit handler for job with job id %d"
-msgstr "exit handler for job with job id %d"
+msgstr ""
 
 #: src/event.cpp:153
-#, fuzzy, c-format
+#, c-format
 msgid "handler for generic event '%ls'"
-msgstr "handler for generic event “%ls”"
+msgstr ""
 
 #: src/event.cpp:157
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown event type '0x%x'"
-msgstr "Unknown event type '0x%x'"
+msgstr ""
 
 #: src/event.cpp:403
-#, fuzzy
 msgid "Signal list overflow. Signals have been ignored."
-msgstr "Signal list overflow. Signals have been ignored."
+msgstr ""
 
 #: src/exec.cpp:45
 #, c-format
@@ -1164,9 +1149,8 @@ msgid "Job: %ls"
 msgstr "Tarefa: %ls"
 
 #: src/expand.cpp:67
-#, fuzzy
 msgid "Shell process"
-msgstr "Processo shell"
+msgstr ""
 
 #: src/expand.cpp:70
 msgid "Last background job"
@@ -1178,18 +1162,17 @@ msgid "Unexpected failure to convert pid '%ls' to integer\n"
 msgstr ""
 
 #: src/expand.cpp:984
-#, fuzzy
 msgid "Mismatched brackets"
-msgstr "Erro de parênteses"
+msgstr ""
 
 #: src/expand.cpp:1063
 msgid "Too much data emitted by command substitution so it was discarded\n"
 msgstr ""
 
 #: src/fish.cpp:275 src/fish_indent.cpp:419
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-level flag"
-msgstr "Invalid value “%s” for debug level switch"
+msgstr ""
 
 #: src/fish.cpp:302
 #, c-format
@@ -1197,9 +1180,9 @@ msgid "%s, version %s\n"
 msgstr "%s, versão %s\n"
 
 #: src/fish.cpp:316 src/fish_indent.cpp:434
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag"
-msgstr "Invalid value “%s” for debug level switch"
+msgstr ""
 
 #: src/fish.cpp:366
 msgid "Can not use the no-execute mode when running an interactive session"
@@ -1229,9 +1212,8 @@ msgid "Opening \"%s\" failed: %s\n"
 msgstr ""
 
 #: src/fish_indent.cpp:469
-#, fuzzy
 msgid "Too many arguments\n"
-msgstr "Too many arguments\n"
+msgstr ""
 
 #: src/fish_key_reader.cpp:241
 #, c-format
@@ -1260,9 +1242,9 @@ msgid ""
 msgstr ""
 
 #: src/io.cpp:57
-#, fuzzy, c-format
+#, c-format
 msgid "An error occured while reading output from code block on fd %d"
-msgstr "Ocorreu um erro ao ler saída de bloco de código %d"
+msgstr ""
 
 #: src/output.cpp:559
 #, c-format
@@ -1343,9 +1325,8 @@ msgid "function invocation block"
 msgstr "bloco de chamada de função"
 
 #: src/parser.cpp:48
-#, fuzzy
 msgid "function invocation block with no variable shadowing"
-msgstr "bloco de chamada de função sem mascaramento de variáveis"
+msgstr ""
 
 #: src/parser.cpp:51
 msgid "'switch' block"
@@ -1368,27 +1349,26 @@ msgid "block created by the . builtin"
 msgstr "bloco criado pelo builtin ."
 
 #: src/parser.cpp:66
-#, fuzzy
 msgid "event handler block"
-msgstr "bloco gerenciador de evento"
+msgstr ""
 
 #: src/parser.cpp:69
 msgid "unknown/invalid block"
 msgstr "bloco desconhecido/inválido"
 
 #: src/parser.cpp:306
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write profiling information to file '%s'"
-msgstr "Could not write profiling information to file “%s”"
+msgstr ""
 
 #: src/parser.cpp:308
 msgid "Time\tSum\tCommand\n"
 msgstr "Tempo\tSoma\tComando\n"
 
 #: src/parser.cpp:366
-#, fuzzy, c-format
+#, c-format
 msgid "in event handler: %ls\n"
-msgstr "no gerenciador de evento: %ls\n"
+msgstr ""
 
 #: src/parser.cpp:385
 #, c-format
@@ -1451,14 +1431,13 @@ msgid "The '%ls' command can not be used in a pipeline"
 msgstr "O comand “%ls” não pode ser usado em pipe"
 
 #: src/parse_util.cpp:32
-#, fuzzy, c-format
+#, c-format
 msgid "The '%ls' command can not be used immediately after a backgrounded job"
-msgstr "O comand “%ls” não pode ser usado em pipe"
+msgstr ""
 
 #: src/parse_util.cpp:36
-#, fuzzy
 msgid "Backgrounded commands can not be used as conditionals"
-msgstr "This command can not be used in a pipeline"
+msgstr ""
 
 #: src/path.cpp:25
 #, c-format
@@ -1466,9 +1445,9 @@ msgid "Error while searching for command '%ls'"
 msgstr "Erro ao procurar por comando “%ls”"
 
 #: src/path.cpp:276
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to locate the %ls directory."
-msgstr "Unable to locate the %ls directory."
+msgstr ""
 
 #: src/path.cpp:277
 #, c-format
@@ -1481,9 +1460,9 @@ msgid "Unable to locate %ls directory derived from $%ls: '%ls'."
 msgstr ""
 
 #: src/path.cpp:283
-#, fuzzy, c-format
+#, c-format
 msgid "The error was '%s'."
-msgstr "Tokenizer error: “%ls”"
+msgstr ""
 
 #: src/path.cpp:284
 #, c-format
@@ -1504,9 +1483,9 @@ msgid "Job %d, "
 msgstr ""
 
 #: src/proc.cpp:587
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: %ls'%ls' terminated by signal %ls (%ls)"
-msgstr "%ls: Tarefa %d, “%ls” terminado pelo sinal %ls (%ls)"
+msgstr ""
 
 #: src/proc.cpp:595
 #, c-format
@@ -1518,9 +1497,9 @@ msgid "An error occured while reading output from code block"
 msgstr "Ocorreu um erro ao ler saída de bloco de código"
 
 #: src/proc.cpp:856
-#, fuzzy, c-format
+#, c-format
 msgid "Could not send job %d ('%ls') with pgid %d to foreground"
-msgstr "Não foi possível enviar tarefa %d (“%ls”) para primeiro plano pgid %d"
+msgstr ""
 
 #: src/proc.cpp:885
 #, c-format
@@ -1579,24 +1558,18 @@ msgid "Pop null reader block"
 msgstr ""
 
 #: src/reader.cpp:2160
-#, fuzzy
 msgid "There are still jobs active:\n"
-msgstr "Não há tarefas adequadas\n"
+msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   Comando\n"
 
 #: src/reader.cpp:2170
-#, fuzzy
 msgid "A second attempt to exit will terminate them.\n"
 msgstr ""
-"Há tarefas paradas. Uma segunda tentativa de sair forçará seu término.\n"
 
 #: src/reader.cpp:2171
 msgid ""
@@ -1800,9 +1773,8 @@ msgid "Unexpected end of string, square brackets do not match"
 msgstr "Final inesperado de string, colchetes não batem"
 
 #: src/tokenizer.cpp:35
-#, fuzzy
 msgid "Unexpected end of string, incomplete escape sequence"
-msgstr "Final inesperado de string, aspas não batem"
+msgstr ""
 
 #: src/tokenizer.cpp:38
 msgid "Invalid input/output redirection"
@@ -1915,9 +1887,9 @@ msgid "getcwd() failed with errno %d/%s"
 msgstr ""
 
 #: src/builtin.h:35
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected argument for option %ls\n"
-msgstr "%ls: Esperava um argumento, obteve %d\n"
+msgstr ""
 
 #: src/builtin.h:41
 #, c-format
@@ -1944,34 +1916,34 @@ msgid "%ls: Unknown option '%ls'\n"
 msgstr "%ls: Opção desconhecida “%ls”\n"
 
 #: src/builtin.h:54
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected %d args, got %d\n"
-msgstr "%ls: Esperava %d argumento, obteve %d\n"
+msgstr ""
 
 #: src/builtin.h:55
-#, fuzzy, c-format
+#, c-format
 msgid "%ls %ls: Expected %d args, got %d\n"
-msgstr "%ls %ls: Esperava %d argumento, obteve %d\n"
+msgstr ""
 
 #: src/builtin.h:56
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at least %d args, got only %d\n"
-msgstr "%ls: Esperava %d argumento, obteve %d\n"
+msgstr ""
 
 #: src/builtin.h:57
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at most %d args, got %d\n"
-msgstr "%ls: Esperava %d argumento, obteve %d\n"
+msgstr ""
 
 #: src/builtin.h:60
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: Valor semeado “%ls” não é um número válido\n"
+msgstr ""
 
 #: src/builtin.h:63
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: mode name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls: Valor semeado “%ls” não é um número válido\n"
+msgstr ""
 
 #: src/builtin.h:66
 #, c-format
@@ -1984,14 +1956,14 @@ msgid "%ls: Argument '%ls' is not a number\n"
 msgstr "%ls: Argumento “%ls” não é número\n"
 
 #: src/builtin.h:72
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected a subcommand to follow the command\n"
-msgstr "%ls: Esperava um argumento, obteve\n"
+msgstr ""
 
 #: src/builtin.h:73
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Subcommand '%ls' is not valid\n"
-msgstr "%ls: “%ls” não é um arquivo\n"
+msgstr ""
 
 #: src/builtin.h:76
 #, c-format
@@ -2044,24 +2016,21 @@ msgid "Illegal file descriptor in redirection '%ls'"
 msgstr "Descritor de arquivo ilegal na redireção “%ls”"
 
 #: src/parse_constants.h:248
-#, fuzzy, c-format
+#, c-format
 msgid "No matches for wildcard '%ls'. See `help expand`."
-msgstr "Não há combinações para curinga “%ls”."
+msgstr ""
 
 #: src/parse_constants.h:251
-#, fuzzy
 msgid "'break' while not inside of loop"
-msgstr "Comando break fora de loop"
+msgstr ""
 
 #: src/parse_constants.h:254
-#, fuzzy
 msgid "'continue' while not inside of loop"
-msgstr "Comando continue fora de loop"
+msgstr ""
 
 #: src/parse_constants.h:257
-#, fuzzy
 msgid "'return' outside of function definition"
-msgstr "Comando builtin “return” fora de definição de função"
+msgstr ""
 
 #: src/parse_constants.h:262
 #, c-format
@@ -2130,16 +2099,14 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:1
 #: /tmp/fish/explicit/share/completions/emerge.fish:4
-#, fuzzy
 msgid "All base system packages"
-msgstr "Erase built packages"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:2
 #: /tmp/fish/explicit/share/completions/emerge.fish:5
 #: /tmp/fish/explicit/share/completions/emerge.fish:6
-#, fuzzy
 msgid "All packages in world"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:3
 #: /tmp/fish/implicit/share/completions/aura.fish:90
@@ -2150,9 +2117,8 @@ msgstr "Sync packages installed"
 #: /tmp/fish/implicit/share/completions/pacman.fish:55
 #: /tmp/fish/implicit/share/completions/yaourt.fish:69
 #: /tmp/fish/implicit/share/completions/yaourt.fish:76
-#, fuzzy
 msgid "Installed package"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:7
 msgid "Packages that are linked to preserved libs"
@@ -2167,88 +2133,72 @@ msgid "Usage overview of emerge"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:10
-#, fuzzy
 msgid "Help on subject system"
-msgstr "Help section"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:11
-#, fuzzy
 msgid "Help on subject config"
-msgstr "Help section"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Help on subject sync"
-msgstr "Help section"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:13
-#, fuzzy
 msgid "Use colors in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:14
-#, fuzzy
 msgid "Don't use colors in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Pull in build time dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Don't pull in build time dependencies"
-msgstr "Don't automatically fulfill dependencies"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:1
-#, fuzzy
 msgid "list all packages owning file(s)"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:2
 msgid "check MD5sums and timestamps of package"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:3
-#, fuzzy
 msgid "list all packages depending on specified package"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:4
-#, fuzzy
 msgid "display a dependency tree for package"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:5
-#, fuzzy
 msgid "list files owned by package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:6
-#, fuzzy
 msgid "list all packages with specified useflag"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:7
-#, fuzzy
 msgid "list all packages matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:8
-#, fuzzy
 msgid "print size of files contained in package"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:9
-#, fuzzy
 msgid "display USE flags for package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/equery.fish:10
-#, fuzzy
 msgid "print full path to ebuild for package"
-msgstr "Print full path of source"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:1
 msgid "Build a gem from a gemspec"
@@ -2259,48 +2209,40 @@ msgid "Adjust RubyGems certificate settings"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:3
-#, fuzzy
 msgid "Check installed gems"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:4
-#, fuzzy
 msgid "Cleanup old versions of installed gems in the local repository"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:5
-#, fuzzy
 msgid "Display the contents of the installed gems"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:6
-#, fuzzy
 msgid "Show the dependencies of an installed gem"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:7
-#, fuzzy
 msgid "Display RubyGems environmental information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:8
-#, fuzzy
 msgid "Provide help on the 'gem' command"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:9
-#, fuzzy
 msgid "Install a gem into the local repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:10
 msgid "Display all gems whose name starts with STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:11
-#, fuzzy
 msgid "Query gem information in local or remote repositories"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:12
 msgid "Generates RDoc for pre-installed gems"
@@ -2311,28 +2253,24 @@ msgid "Display all gems whose name contains STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:14
-#, fuzzy
 msgid "Display gem specification (in yaml)"
-msgstr "Display the last modification time of file"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:15
-#, fuzzy
 msgid "Uninstall a gem from the local repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:16
-#, fuzzy
 msgid "Unpack an installed gem to the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:17
 msgid "Update the named gem (or all installed gems) in the local repository"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:18
-#, fuzzy
 msgid "display the remote gem servers"
-msgstr "File to grab servers"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:19
 msgid "show some examples of usage"
@@ -2355,14 +2293,12 @@ msgid "Enables an existing service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:4
-#, fuzzy
 msgid "Disables an existing service"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:5
-#, fuzzy
 msgid "Removes the specified service name from the service cache"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:6
 msgid "Forces an existing service to start"
@@ -2389,14 +2325,12 @@ msgid "Prints a description of a domain or service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:12
-#, fuzzy
 msgid "Prints information about the service cache"
-msgstr "Output extra information about the work being done"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:13
-#, fuzzy
 msgid "Prints which services are disabled"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:14
 msgid ""
@@ -2405,14 +2339,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:15
-#, fuzzy
 msgid "Prints port information about a process"
-msgstr "Give more information during processing"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:16
-#, fuzzy
 msgid "Prints port information about the host"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:17
 msgid "Resolves a port name from a process to an endpoint in launchd"
@@ -2423,9 +2355,8 @@ msgid "Reads or modifies launchd's resource limits"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:19
-#, fuzzy
 msgid "Prints performance statistics for a service"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:20
 msgid ""
@@ -2437,18 +2368,16 @@ msgid "Modifies persistent configuration parameters for launchd domains"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:22
-#, fuzzy
 msgid "Dumps launchd state to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:23
 msgid "Dumps the jetsam properties category for all services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:24
-#, fuzzy
 msgid "Initiates a system reboot of the specified type"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:25
 msgid "Brings the system up from single-user mode with a console shell"
@@ -2463,24 +2392,20 @@ msgid "Unloads a service or directory of services"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:28
-#, fuzzy
 msgid "Unloads the specified service name"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:29
-#, fuzzy
 msgid "Lists information about services"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:30
-#, fuzzy
 msgid "Starts the specified service"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:31
-#, fuzzy
 msgid "Stops the specified service if it is running"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:32
 msgid ""
@@ -2505,9 +2430,8 @@ msgid "Execute a program in the bootstrap context of a given user"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:37
-#, fuzzy
 msgid "Submit a basic job from the command line"
-msgstr "Obtém ou altera o buffer da linha de comando"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:38
 msgid "Prints the PID of the launchd controlling the session"
@@ -2518,28 +2442,24 @@ msgid "Prints the UID of the current launchd session"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:40
-#, fuzzy
 msgid "Prints the name of the current launchd session"
-msgstr "Pula o restante da iteração atual do laço mais interno"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:41
-#, fuzzy
 msgid "Prints a description of an error"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:42
 msgid "Prints the launchd variant"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:43
-#, fuzzy
 msgid "Prints the launchd version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:44
-#, fuzzy
 msgid "Prints the usage for a given subcommand"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:1
 #: /tmp/fish/explicit/share/completions/mdadm.fish:2
@@ -2548,9 +2468,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:3
 #: /tmp/fish/explicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Use last 1.x format superblock"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:5
 msgid "Use 1.0 format superblock"
@@ -2579,9 +2498,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/mdadm.fish:11
 #: /tmp/fish/explicit/share/completions/mdadm.fish:12
 #: /tmp/fish/explicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Stripped volume (RAID 0)"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:14
 #: /tmp/fish/explicit/share/completions/mdadm.fish:15
@@ -2619,9 +2537,8 @@ msgid "Pseudo RAID layer for single device (akin faulty RAID 1)"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Container"
-msgstr "Set context size"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:29
 msgid "Alias of left-asymmetric"
@@ -2644,9 +2561,8 @@ msgid "Alias of write-transient"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:34
-#, fuzzy
 msgid "Alias of read-transient"
-msgstr "Nome alternativo para atrm"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:35
 msgid "Alias of write-persistent"
@@ -2657,60 +2573,50 @@ msgid "Alias of read-persistent"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:37
-#, fuzzy
 msgid "Alias of read-fixable"
-msgstr "File is readable"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Use standard format (default)"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:39
-#, fuzzy
 msgid "Use a non-partitionable array"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:40
 #: /tmp/fish/explicit/share/completions/mdadm.fish:41
 #: /tmp/fish/explicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Use a partitionable array"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:43
 msgid "Remove superblock misalignement from SPARC kernel 2.2"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:44
-#, fuzzy
 msgid "Correct superblock summaries"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Update array UUID"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:46
-#, fuzzy
 msgid "Update array name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:47
-#, fuzzy
 msgid "Update array nodes"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update array homehost"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Update array cluster name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:50
 msgid "Mark the array as dirty, thus forcing resync"
@@ -2721,18 +2627,16 @@ msgid "Reverse superblock endianness"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:52
-#, fuzzy
 msgid "Refresh device size"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:53
 msgid "Assume bitmap absence"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Reserve space for bad block list"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:55
 msgid "Free reserved space for bad block list"
@@ -2747,9 +2651,8 @@ msgid "Reset preferred minor to current one"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Abort currently running actions"
-msgstr "Imprime as tarefas em execução"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:59
 msgid "Abort currently running actions, prevent their restart"
@@ -2760,108 +2663,89 @@ msgid "Scrub the array (i.e. check constistency)"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Check, then resync"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/set.fish:1
-#, fuzzy
 msgid "Locale"
-msgstr "Locale"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:1
 #: /tmp/fish/explicit/share/completions/telnet.fish:6
-#, fuzzy
 msgid "Specifies an 8-bit data path"
-msgstr "Specifies an 8-bit data path"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:2
-#, fuzzy
 msgid "Do not try to negotiate TELNET BINARY option"
-msgstr "Do not try to negotiate TELNET BINARY option"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:3
-#, fuzzy
 msgid "Stops any character from being recognized as an escape character"
-msgstr "Stops any character from being recognized as an escape character"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:4
-#, fuzzy
 msgid "Use local Kerberos authentication, if possible"
-msgstr "Use local Kerberos authentication, if possible"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:5
-#, fuzzy
 msgid "Specifies no automatic login to remote system"
-msgstr "Specifies no automatic login to remote system"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:7
-#, fuzzy
 msgid "Attempt automatic login"
-msgstr "Attempt automatic login"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:8
-#, fuzzy
 msgid "Disables reading user's .telnetrc"
-msgstr "Disables reading user's .telnetrc"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:9
-#, fuzzy
 msgid "Sets debug mode"
-msgstr "Sets debug mode"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:10
-#, fuzzy
 msgid "Sets IP TOS"
-msgstr "Sets IP TOS"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:11
-#, fuzzy
 msgid "Disables specified type of authentication"
-msgstr "Disables specified type of authentication"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:12
 msgid "User login"
 msgstr "Login do usuário"
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:13
-#, fuzzy
 msgid "Log to tracefile"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:14
-#, fuzzy
 msgid "Turn on encryption"
-msgstr "Turn on encryption"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:15
-#, fuzzy
 msgid "User interface similar to rlogin"
-msgstr "User interface similar to rlogin"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:16
-#, fuzzy
 msgid "Use Kerberos realm for authentication"
-msgstr "Use Kerberos realm for authentication"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/update-eix-remote.fish:1
 msgid "Remove all temporarily added virtual overlays from the eix database"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:1
-#, fuzzy
 msgid "ZFS filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:2
-#, fuzzy
 msgid "ZFS filesystem snapshot"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "ZFS block storage device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:4
 msgid "ZFS snapshot bookmark"
@@ -2872,14 +2756,12 @@ msgid "Any ZFS dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:6
-#, fuzzy
 msgid "Dataset-specific value"
-msgstr "Use specific conffile"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Default ZFS value"
-msgstr "Set date"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:8
 msgid "Value inherited from parent dataset"
@@ -2890,19 +2772,16 @@ msgid "Value received by 'zfs receive'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "Value valid for the current mount"
-msgstr "Sets an index list for the next track"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:11
-#, fuzzy
 msgid "Read-only value"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:12
-#, fuzzy
 msgid "Dataset full name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:13
 #: /tmp/fish/explicit/share/completions/zpool.fish:2
@@ -2910,15 +2789,13 @@ msgstr "Service name"
 #: /tmp/fish/implicit/share/completions/minikube.fish:26
 #: /tmp/fish/implicit/share/completions/minikube.fish:27
 #: /tmp/fish/implicit/share/completions/minikube.fish:28
-#, fuzzy
 msgid "Property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:14
 #: /tmp/fish/explicit/share/completions/zpool.fish:3
-#, fuzzy
 msgid "Property value"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:15
 #: /tmp/fish/explicit/share/completions/zpool.fish:4
@@ -2926,24 +2803,20 @@ msgid "Property value origin"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:16
-#, fuzzy
 msgid "Identity type"
-msgstr "Arquivo de identificação"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Identity name"
-msgstr "Arquivo de identificação"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:18
-#, fuzzy
 msgid "Space usage"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:19
-#, fuzzy
 msgid "Space quota"
-msgstr "Set quote char"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:20
 msgid "POSIX user"
@@ -2963,14 +2836,12 @@ msgid "POSIX group"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:24
-#, fuzzy
 msgid "Samba group"
-msgstr "Select by group"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:26
-#, fuzzy
 msgid "Also needs the permission to be allowed"
-msgstr "Selects how passphrases are mangled"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:27
 msgid ""
@@ -3007,9 +2878,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:37
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:26
-#, fuzzy
 msgid "Volume block size"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:38
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:1
@@ -3019,9 +2889,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:39
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:2
-#, fuzzy
 msgid "Update access time on read"
-msgstr "Keep access time"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:40
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:3
@@ -3030,27 +2899,23 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:41
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:4
-#, fuzzy
 msgid "Data checksum"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:42
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:5
-#, fuzzy
 msgid "Compression algorithm"
-msgstr "Use specified compression algorithm"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:43
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:6
-#, fuzzy
 msgid "Number of copies of data"
-msgstr "Number all lines"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:44
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:7
-#, fuzzy
 msgid "Deduplication"
-msgstr "Remove non-duplicate lines"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:45
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:2
@@ -3061,21 +2926,18 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:46
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:3
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:9
-#, fuzzy
 msgid "Can contained executables be executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:47
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:10
-#, fuzzy
 msgid "Max number of filesystems and volumes"
-msgstr "Maximum number of nested blocks reached."
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:48
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:11
-#, fuzzy
 msgid "Mountpoint"
-msgstr "Ponto de montagem"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:49
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:12
@@ -3089,22 +2951,19 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:51
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:14
-#, fuzzy
 msgid "Max number of snapshots"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:52
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:4
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:15
-#, fuzzy
 msgid "Read-only"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:53
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:16
-#, fuzzy
 msgid "Suggest block size"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:54
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:17
@@ -3149,9 +3008,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:62
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:25
-#, fuzzy
 msgid "Hide .zfs directory"
-msgstr "File is directory"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:63
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:26
@@ -3160,9 +3018,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:64
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:27
-#, fuzzy
 msgid "Volume logical size"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:65
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:38
@@ -3201,9 +3058,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:79
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:35
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:45
-#, fuzzy
 msgid "On-disk version of filesystem"
-msgstr "Armazenar apenas arquivos novos"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:71
 #: /tmp/fish/explicit/share/completions/zfs.fish:80
@@ -3218,9 +3074,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:10
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:37
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:47
-#, fuzzy
 msgid "Extended attributes"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:73
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:39
@@ -3235,9 +3090,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:78
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:44
-#, fuzzy
 msgid "Hide volume snapshots"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:82
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:30
@@ -3252,9 +3106,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:84
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:1
-#, fuzzy
 msgid "Unicode normalization"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:85
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:2
@@ -3265,30 +3118,25 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zfs.fish:87
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:8
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:9
-#, fuzzy
 msgid "Case sensitivity"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:88
-#, fuzzy
 msgid "Space properties"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:89
 #: /tmp/fish/explicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Dataset name"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:1
-#, fuzzy
 msgid "Pool full name"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:5
-#, fuzzy
 msgid "Mirror of at least two devices"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:6
 #: /tmp/fish/explicit/share/completions/zpool.fish:7
@@ -3308,14 +3156,12 @@ msgid "Pseudo vdev for pool hot spares"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:11
-#, fuzzy
 msgid "SLOG device"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "L2ARC device"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:13
 msgid "Physically allocated space"
@@ -3325,9 +3171,8 @@ msgstr ""
 #: /tmp/fish/explicit/share/completions/zpool.fish:15
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:1
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:2
-#, fuzzy
 msgid "Available space"
-msgstr "Variável"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:16
 msgid "System boot partition size"
@@ -3338,9 +3183,8 @@ msgid "Usage percentage of pool"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Deduplication ratio"
-msgstr "Read/Write mode"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:19
 msgid "Amount of uninitialized space within the pool"
@@ -3363,9 +3207,8 @@ msgid "Pool GUID"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:24
-#, fuzzy
 msgid "Current pool health"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:25
 msgid "Total pool space"
@@ -3381,21 +3224,18 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:28
 #: /tmp/fish/explicit/share/completions/zpool.fish:29
-#, fuzzy
 msgid "Alternate root directory"
-msgstr "Directory"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:30
 #: /tmp/fish/explicit/share/completions/zpool.fish:31
-#, fuzzy
 msgid "Import pool in read-only mode"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:32
 #: /tmp/fish/explicit/share/completions/zpool.fish:33
-#, fuzzy
 msgid "Automatic pool expansion on LUN growing"
-msgstr "Automatic line ending processing"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:34
 #: /tmp/fish/explicit/share/completions/zpool.fish:35
@@ -3407,9 +3247,8 @@ msgid "Default bootable dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:37
-#, fuzzy
 msgid "Pool configuration cache"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:38
 msgid "Comment about the pool"
@@ -3432,28 +3271,24 @@ msgid "Display snapshots even if 'zfs list' does not use '-t'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:43
-#, fuzzy
 msgid "On-disk version of pool"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:44
 msgid "%sEnable the %s feature\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:45
-#, fuzzy
 msgid "All properties"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:1
-#, fuzzy
 msgid "%s: Could not figure out what to do!\\n"
-msgstr "%ls: Não foi possível encontrar o diretório home"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:2
-#, fuzzy
 msgid "%s %s: Requires at least two arguments\\n"
-msgstr "%s: Opção requer argumento -- %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:3
 #: /tmp/fish/explicit/share/functions/abbr.fish:5
@@ -3463,36 +3298,30 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%s %s: Esperava um argumento\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
-#, fuzzy
 msgid "%s %s: No abbreviation named %s\\n"
-msgstr "%s %s: Unknown option “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:7
-#, fuzzy
 msgid "%s %s: Requires exactly two arguments\\n"
-msgstr "%s %s: Opção requer argumento\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:11
-#, fuzzy
 msgid "%s %s: Abbreviation %s already exists, cannot rename %s\\n"
-msgstr "%s %s: Função “%s” já existe. Não é possivel criar cópia “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:12
 #: /tmp/fish/explicit/share/functions/abbr.fish:13
-#, fuzzy
 msgid "%s %s: Unexpected argument -- '%s'\\n"
-msgstr "%s %s: Esperava argumento -- '%s'\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
-#, fuzzy
 msgid "%s: Name cannot be empty\\n"
-msgstr "%s: Nome da variável não pode ser a string vazia\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:2
 msgid "%s: Body cannot be empty\\n"
@@ -3536,19 +3365,16 @@ msgid "Ignoring the output of your editor since its exit status was non-zero"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/edit_command_buffer.fish:4
-#, fuzzy
 msgid "or the file was empty"
-msgstr "Treat absent files as empty"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:3
-#, fuzzy
 msgid "Achieved compression ratio"
-msgstr "Print compression ratios"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:4
-#, fuzzy
 msgid "Dataset creation time"
-msgstr "Compare month names"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:5
 msgid "Snapshot clones"
@@ -3564,9 +3390,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:8
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:9
-#, fuzzy
 msgid "Logical total space"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:10
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:11
@@ -3574,14 +3399,12 @@ msgid "Logical used space"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:12
-#, fuzzy
 msgid "Is currently mounted?"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:13
-#, fuzzy
 msgid "Source snapshot"
-msgstr "Force yes"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:14
 msgid "Token for interrupted reception resumption"
@@ -3589,19 +3412,16 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:15
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:16
-#, fuzzy
 msgid "Total space"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:17
-#, fuzzy
 msgid "Achieved compression ratio of referenced space"
-msgstr "Display the session key used for one message"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:18
-#, fuzzy
 msgid "Total lower-level snapshots"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_ro_properties.fish:19
 #: /tmp/fish/implicit/share/completions/zfs.fish:71
@@ -3658,24 +3478,20 @@ msgid "%sMax usage by group %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:3
-#, fuzzy
 msgid "Allow overlay mount"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:4
-#, fuzzy
 msgid "SELinux context for the child filesystem"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:5
-#, fuzzy
 msgid "SELinux context for the filesystem being mounted"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:6
-#, fuzzy
 msgid "SELinux context for unlabeled files"
-msgstr "Don't exit on unreadable files"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:7
 msgid "SELinux context for the root inode of the filesystem"
@@ -3687,14 +3503,12 @@ msgstr "Bem-vindo ao fish, o friendly interactive shell"
 
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:1
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:2
-#, fuzzy
 msgid "%s: Too many arguments %s\\n"
-msgstr "%s: Too many arguments %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_move_last.fish:1
-#, fuzzy
 msgid "Hit end of history…\\n"
-msgstr "Hit end of history…\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/fish_opt.fish:1
 msgid "%s: The --short flag is required and must be a single character\\n"
@@ -3717,9 +3531,8 @@ msgid "Package"
 msgstr "Pacote"
 
 #: /tmp/fish/explicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "python executable not found"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:2
 msgid "Editing failed or was cancelled"
@@ -3734,23 +3547,20 @@ msgid "Edit the file again\\? [Y/n]"
 msgstr "Editar o arquivo novamente\\? [S/n]"
 
 #: /tmp/fish/explicit/share/functions/funced.fish:5
-#, fuzzy
 msgid "Cancelled function editing"
-msgstr "Editar definição de função"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:1
 msgid "%s: Could not create configuration directory\\n"
 msgstr "%ls: Não foi possível encontrar o diretório home"
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:2
-#, fuzzy
 msgid "%s: Unknown function '%s'\\n"
-msgstr "%s: Unknown option “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:1
-#, fuzzy
 msgid "%s: Could not find a web browser.\\n"
-msgstr "%s: Could not find a web browser.\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:3
 msgid "help: Help is being displayed in your default browser.\\n"
@@ -3778,47 +3588,41 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:5
-#, fuzzy
 msgid "Command history cleared!"
-msgstr "Command to run"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:6
 msgid "You did not say 'yes' so I will not clear your command history\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "%s: Too many arguments"
-msgstr "%s: Too many arguments"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/nextd.fish:1
 #: /tmp/fish/explicit/share/functions/prevd.fish:1
-#, fuzzy
 msgid "%s: The number of positions to skip must be a non-negative integer\\n"
-msgstr "%s: The number of positions to skip must be a non-negative integer\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/open.fish:1
 msgid "No open utility found. Try installing \"xdg-open\" or \"xdg-utils\"."
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/popd.fish:1
-#, fuzzy
 msgid "%s: Directory stack is empty…\\n"
-msgstr "%s: Directory stack is empty..."
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/psub.fish:1
-#, fuzzy
 msgid "%s: Not inside of command substitution"
-msgstr "%s: na substituição de comando"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/realpath.fish:1
 msgid "%s: These flags are not allowed by fish realpath: '%s'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "%s: Expected 1, 2 or 3 arguments, got %d\\n"
-msgstr "%s: Expected 1, 2 or 3 arguments, got %d\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:2
 msgid "%s: '%s' is not a number\\n"
@@ -3826,57 +3630,49 @@ msgstr "%s: “%s” não é um número\\n"
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:3
-#, fuzzy
 msgid "%s: Too many arguments\\n"
-msgstr "%s: Too many arguments\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:2
 msgid "%s: Variable name must contain alphanumeric characters\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:1
-#, fuzzy
 msgid "%s is a function with definition\\n"
-msgstr "%ls: Missing function definition information."
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:2
 msgid "function"
 msgstr "função"
 
 #: /tmp/fish/explicit/share/functions/type.fish:3
-#, fuzzy
 msgid "%s is a builtin\\n"
-msgstr "%s is a builtin\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:4
-#, fuzzy
 msgid "builtin"
-msgstr "builtin\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:5
-#, fuzzy
 msgid "%s is %s\\n"
-msgstr "%s is %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/type.fish:6
 msgid "file"
 msgstr "arquivo"
 
 #: /tmp/fish/explicit/share/functions/type.fish:7
-#, fuzzy
 msgid "%s: Could not find '%s'\\n"
-msgstr "%s: Could not find “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/umask.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:2
-#, fuzzy
 msgid "%s: Invalid mask '%s'\\n"
-msgstr "%s: Invalid mask “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:1
-#, fuzzy
 msgid "%s: Value '%s' for flag '%s' is not an integer\\n"
-msgstr "%s: “%s” não é um número %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:2
 msgid "%s: Value '%s' for flag '%s' less than min allowed of '%s'\\n"
@@ -3891,22 +3687,16 @@ msgid "%s: Unknown option %s\\n"
 msgstr "%s: Opção desconhecida %s\\n"
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
-#, fuzzy
 msgid ""
 "%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
 "of %s\\n"
 msgstr ""
-"%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
-"of %s\\n"
 
 #: /tmp/fish/explicit/share/functions/vared.fish:3
-#, fuzzy
 msgid ""
 "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
 "VARIABLE\\n"
 msgstr ""
-"%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
-"VARIABLE\\n"
 
 #: /tmp/fish/implicit/share/config.fish:1
 msgid "Update PATH when fish_user_paths changes"
@@ -3922,9 +3712,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/a2enconf.fish:1
 #: /tmp/fish/implicit/share/completions/a2enmod.fish:1
 #: /tmp/fish/implicit/share/completions/a2ensite.fish:1
-#, fuzzy
 msgid "Don't show informative messages"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/a2disconf.fish:2
 #: /tmp/fish/implicit/share/completions/a2dismod.fish:2
@@ -3933,24 +3722,20 @@ msgid "Purge all traces of module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:1
-#, fuzzy
 msgid "Add abbreviation"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:2
-#, fuzzy
 msgid "Erase abbreviation"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:3
-#, fuzzy
 msgid "Print all abbreviations"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:4
-#, fuzzy
 msgid "Print all abbreviation names"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abbr.fish:5
 #: /tmp/fish/implicit/share/completions/help.fish:11
@@ -3961,24 +3746,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:1
 #: /tmp/fish/implicit/share/completions/grub-install.fish:32
-#, fuzzy
 msgid "Show usage"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:2
-#, fuzzy
 msgid "Use an alternative configuration file"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:3
-#, fuzzy
 msgid "Use an alternative addressbook file"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:4
-#, fuzzy
 msgid "Make a query for mutt"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:5
 msgid "Read email message from stdin and add the sender"
@@ -3993,138 +3774,113 @@ msgid "Convert address book files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:8
-#, fuzzy
 msgid "Input file format"
-msgstr "Extra full format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:9
-#, fuzzy
 msgid "Output file format"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:10
-#, fuzzy
 msgid "Input file (default: stdin)"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:11
-#, fuzzy
 msgid "Output file (default: stdout)"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/abook.fish:12
-#, fuzzy
 msgid "Print available formats"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acat.fish:1
 #: /tmp/fish/implicit/share/completions/als.fish:1
 #: /tmp/fish/implicit/share/completions/aunpack.fish:1
-#, fuzzy
 msgid "Archive content"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/accept.fish:1
 #: /tmp/fish/implicit/share/completions/cupsaccept.fish:1
-#, fuzzy
 msgid "Accept reason"
-msgstr "Accept protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:1
 #: /tmp/fish/implicit/share/completions/grep.fish:23
 #: /tmp/fish/implicit/share/completions/sort.fish:3
-#, fuzzy
 msgid "Ignore case"
-msgstr "Ignore case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:2
-#, fuzzy
 msgid "Ignore case when pattern contains no uppercase"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:3
-#, fuzzy
 msgid "Don't ignore case"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:4
-#, fuzzy
 msgid "Invert match"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:5
-#, fuzzy
 msgid "Match only whole words"
-msgstr "Only whole matching words"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:6
-#, fuzzy
 msgid "Quote all metacharacters"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:7
-#, fuzzy
 msgid "Only print line(s) NUM of each file"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:8
-#, fuzzy
 msgid "Only print filenames containing matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:9
-#, fuzzy
 msgid "Only print filenames with no matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:10
 msgid "Output the evaluation of Perl expression for each line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:11
-#, fuzzy
 msgid "Output the part of line matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:12
-#, fuzzy
 msgid "Print all lines"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:13
-#, fuzzy
 msgid "Specify pattern explicitly"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:14
-#, fuzzy
 msgid "Stop searching in each file after NUM matches"
-msgstr "Stop reading after NUM matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:15
-#, fuzzy
 msgid "Stop searching after first match"
-msgstr "Stop reading after NUM matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:16
-#, fuzzy
 msgid "Print the filename for each match"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:17
-#, fuzzy
 msgid "Suppress the prefixing filename on output"
-msgstr "Supress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:18
-#, fuzzy
 msgid "Show number of lines matching per file"
-msgstr "See who is watching a file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:19
-#, fuzzy
 msgid "Show column number of first match"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:20
 msgid "Don't show column number of first match"
@@ -4132,40 +3888,34 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:21
 #: /tmp/fish/implicit/share/completions/grep.fish:1
-#, fuzzy
 msgid "Print NUM lines of trailing context"
-msgstr "Print NUM lines of trailing context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:22
 #: /tmp/fish/implicit/share/completions/grep.fish:3
-#, fuzzy
 msgid "Print NUM lines of leading context"
-msgstr "Print NUM lines of leading context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:23
 #: /tmp/fish/implicit/share/completions/grep.fish:4
-#, fuzzy
 msgid "Print NUM lines of context"
-msgstr "Print NUM lines of context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:24
 msgid "Print null byte as separator between filenames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:25
-#, fuzzy
 msgid "Suppress error messages about file errors"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:26
-#, fuzzy
 msgid "Pipes all ack output through command"
-msgstr "Pipe output through specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:27
-#, fuzzy
 msgid "Do not send output through a pager"
-msgstr "Pass the output through “pr”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:28
 msgid "Prints a filename heading above file's results"
@@ -4176,9 +3926,8 @@ msgid "Don't print a filename heading above file's results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:30
-#, fuzzy
 msgid "Print a break between results"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:31
 msgid "Don't print a break between results"
@@ -4193,23 +3942,20 @@ msgid "No filename heading and no line breaks between results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:34
-#, fuzzy
 msgid "Highlight the matching text"
-msgstr "Hilight one search target"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:35
 msgid "Don't highlight the matching text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:36
-#, fuzzy
 msgid "Set the color for filenames"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:37
-#, fuzzy
 msgid "Set the color for matches"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:38
 msgid "Set the color for line numbers"
@@ -4220,14 +3966,12 @@ msgid "Flush output immediately"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:40
-#, fuzzy
 msgid "Only print the files selected"
-msgstr "Only print unique lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:41
-#, fuzzy
 msgid "Only select files matching pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:42
 msgid "Sort the found files lexically"
@@ -4238,38 +3982,32 @@ msgid "Show which types each file has"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:44
-#, fuzzy
 msgid "Read the list of files to search from file"
-msgstr "Read log message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:45
 msgid "Read the list of files to search from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:46
-#, fuzzy
 msgid "Ignore directory"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:47
-#, fuzzy
 msgid "Don't ignore directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:48
-#, fuzzy
 msgid "Add filter for ignoring files"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:49
-#, fuzzy
 msgid "Recurse into subdirectories"
-msgstr "Recurse into subdir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:50
-#, fuzzy
 msgid "No descending into subdirectories"
-msgstr "Add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:51
 #: /tmp/fish/implicit/share/completions/file.fish:7
@@ -4288,83 +4026,70 @@ msgid "Don't follow symlinks"
 msgstr "Não segue links simbólicos"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:53
-#, fuzzy
 msgid "Include only recognized files"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:54
-#, fuzzy
 msgid "Include only X files"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:55
 msgid "Replaces definition of type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:56
-#, fuzzy
 msgid "Specify definition of type"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:57
-#, fuzzy
 msgid "Removes all filters associated with type"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:58
-#, fuzzy
 msgid "Ignores environment variables and ackrc files"
-msgstr "Ignore environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:59
-#, fuzzy
 msgid "Specifies location of ackrc file"
-msgstr "Specifiy config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:60
-#, fuzzy
 msgid "Ignore default definitions ack includes"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:61
-#, fuzzy
 msgid "Outputs default ackrc"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:62
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:1
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:2
-#, fuzzy
 msgid "Shows help"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:63
-#, fuzzy
 msgid "Shows all known types"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:64
 msgid "Dump information on which options are loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:65
-#, fuzzy
 msgid "Forces ack to treat input as a pipe"
-msgstr "Expect to receive input from a pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:66
 msgid "Forces ack to treat input as tty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:67
-#, fuzzy
 msgid "Shows man page"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:68
-#, fuzzy
 msgid "Displays version and copyright"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:69
 msgid "Bill the Cat"
@@ -4375,34 +4100,28 @@ msgid "The warning admiral"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:1
-#, fuzzy
 msgid "Show battery information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:2
-#, fuzzy
 msgid "Suppress battery information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:3
-#, fuzzy
 msgid "Show thermal information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:4
-#, fuzzy
 msgid "Suppress thermal information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:5
-#, fuzzy
 msgid "Show ac adapter information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:6
-#, fuzzy
 msgid "Suppress ac-adapter information"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:7
 msgid "Show every device, overrides above options"
@@ -4558,9 +4277,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/yum.fish:11
 #: /tmp/fish/implicit/share/completions/zcat.fish:2
 #: /tmp/fish/implicit/share/completions/zip.fish:30
-#, fuzzy
 msgid "Display help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:15
 #: /tmp/fish/implicit/share/completions/dmesg.fish:17
@@ -4572,14 +4290,12 @@ msgstr "Display help and exit"
 #: /tmp/fish/implicit/share/completions/timeout.fish:5
 #: /tmp/fish/implicit/share/completions/watch.fish:12
 #: /tmp/fish/implicit/share/completions/xgettext.fish:39
-#, fuzzy
 msgid "Output version information and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:1
-#, fuzzy
 msgid "Test if adb has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:2
 msgid "Run adb devices and parse output"
@@ -4602,29 +4318,24 @@ msgid "Communicate with emulator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:7
-#, fuzzy
 msgid "Connect to device"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:8
-#, fuzzy
 msgid "Disconnect from device"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:9
-#, fuzzy
 msgid "List all connected devices"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:10
-#, fuzzy
 msgid "Copy file to device"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:11
-#, fuzzy
 msgid "Copy file from device"
-msgstr "Extrair arquivos do arquivo de lista"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:12
 msgid "Copy host->device only if changed"
@@ -4643,52 +4354,44 @@ msgid "View device log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:16
-#, fuzzy
 msgid "Install package"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:17
-#, fuzzy
 msgid "Uninstall package"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:18
 msgid "List PIDs of processes hosting a JDWP transport"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:19
-#, fuzzy
 msgid "Port forwarding"
-msgstr "Dynamic port forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:20
-#, fuzzy
 msgid "Return bugreport information"
-msgstr "Não mostra grupo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:21
-#, fuzzy
 msgid "Perform device backup"
-msgstr "Perform delinking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:22
-#, fuzzy
 msgid "Restore device from backup"
-msgstr "Forçar cópia completa de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:23
-#, fuzzy
 msgid "Show adb version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:24
 msgid "Show adb help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:25
-#, fuzzy
 msgid "Block until device is online"
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:26
 msgid "Ensure that there is a server running"
@@ -4707,24 +4410,20 @@ msgid "Reboots the device, optionally into the bootloader or recovery program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:30
-#, fuzzy
 msgid "Prints state of the device"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:31
-#, fuzzy
 msgid "Prints serial number of the device"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:32
-#, fuzzy
 msgid "Prints device path"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:33
-#, fuzzy
 msgid "Continuously print the device status"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:34
 msgid "Restart the adbd daemon with root permissions"
@@ -4743,9 +4442,8 @@ msgid "Run PPP over USB"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:38
-#, fuzzy
 msgid "Sideloads the given package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:39
 msgid "Kick current connection from host side and make it reconnect."
@@ -4756,46 +4454,40 @@ msgid "Forward-lock the app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:41
-#, fuzzy
 msgid "Reinstall the app keeping its data"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:42
 msgid "Install on SD card instead of internal storage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:43
-#, fuzzy
 msgid "Algorithm name"
-msgstr "MAC algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:44
 msgid "Hex-encoded key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:45
-#, fuzzy
 msgid "Hex-encoded iv"
-msgstr "Rename stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:46
-#, fuzzy
 msgid "Keep the data and cache directories"
-msgstr "Do not create a hierarchy of directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:47
 msgid "Also list device qualifiers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:48
-#, fuzzy
 msgid "Device to disconnect"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:49
-#, fuzzy
 msgid "File to write backup data to"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:50
 msgid "Enable backup of the .apks themselves"
@@ -4823,14 +4515,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:56
-#, fuzzy
 msgid "Back up all installed applications"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:57
-#, fuzzy
 msgid "Include system applications in -all (default)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:58
 msgid "Exclude system applications in -all"
@@ -4841,9 +4531,8 @@ msgid "Package(s) to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "Lista ou remove funções"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4854,9 +4543,8 @@ msgid "Remove a specific forward socket connection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:63
-#, fuzzy
 msgid "Remove all forward socket connections"
-msgstr "Remotely forwarded ports"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:64
 msgid "Kick current connection from device side and make it reconnect."
@@ -4866,9 +4554,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:28
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:11
 #: /tmp/fish/implicit/share/completions/apt-config.fish:5
-#, fuzzy
 msgid "Specify config file"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:2
 msgid "Do not run passwd to set the password"
@@ -4888,9 +4575,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:5
-#, fuzzy
 msgid "Set the gecos field for the new entry generated"
-msgstr "Set the pre-gap size for the next track"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:6
 msgid ""
@@ -4905,14 +4591,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:8
-#, fuzzy
 msgid "Display brief instructions"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:9
-#, fuzzy
 msgid "Use specified directory as the user's home directory"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:10
 msgid ""
@@ -4927,9 +4611,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:12
-#, fuzzy
 msgid "Do not create the home directory, even if it doesni't exist"
-msgstr "Do not create a hierarchy of directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:13
 msgid "Suppress informational messages, only show warnings and errors"
@@ -4944,9 +4627,8 @@ msgid "Create a system user or group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:16
-#, fuzzy
 msgid "Force the new userid to be the given number"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:17
 msgid ""
@@ -4965,9 +4647,8 @@ msgid "Add new user to extra groups defined in the configuration file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:20
-#, fuzzy
 msgid "Display version and copyright information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:1
 msgid "Save current driver state"
@@ -4986,18 +4667,16 @@ msgid "Try to restore control elements as much as possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:5
-#, fuzzy
 msgid "Ignore missing soundcards"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:6
 msgid "Do not restore mismatching control elements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:7
-#, fuzzy
 msgid "Do not init if restore fails"
-msgstr "Do not print lines without delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:8
 msgid "Initialize all devices to a default state"
@@ -5016,44 +4695,36 @@ msgid "Notify daemon to do an operation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:12
-#, fuzzy
 msgid "Monitor events"
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:13
-#, fuzzy
 msgid "Show available flags and commands"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:14
-#, fuzzy
 msgid "Make output a bit more verbose"
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:15
-#, fuzzy
 msgid "Print alsactl version number"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:16
-#, fuzzy
 msgid "Select the configuration file to use"
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:17
-#, fuzzy
 msgid "Use a lock file"
-msgstr "Use 1B block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:18
-#, fuzzy
 msgid "Do not use a lock file"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:19
-#, fuzzy
 msgid "Select the state lock file path"
-msgstr "Select the last NUMBER patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:20
 msgid "Save restore and init state to this file"
@@ -5064,33 +4735,28 @@ msgid "Remove runstate file at first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:22
-#, fuzzy
 msgid "Set environment variable"
-msgstr "Modifica variáveis de ambiente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:23
-#, fuzzy
 msgid "The configuration file for init"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:24
 msgid "The store period in seconds for the daemon command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:25
-#, fuzzy
 msgid "The PID file to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:26
-#, fuzzy
 msgid "Run the task in background"
-msgstr "Executar tarefa em segundo plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:27
-#, fuzzy
 msgid "Use syslog for messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:28
 msgid "Set the process priority (see 'man nice')"
@@ -5120,81 +4786,68 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/poweroff.fish:1
 #: /tmp/fish/implicit/share/completions/terraform.fish:2
 #: /tmp/fish/implicit/share/completions/yast2.fish:2
-#, fuzzy
 msgid "Show help"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:2
-#, fuzzy
 msgid "Soundcard number or id to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:3
-#, fuzzy
 msgid "Mixer device to control"
-msgstr "Division control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:4
-#, fuzzy
 msgid "Starting view mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:5
-#, fuzzy
 msgid "Toggle the using of colors"
-msgstr "Toggle printing of remote hostname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsamixer.fish:6
 msgid "Mixer abstraction level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:1
-#, fuzzy
 msgid "this help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:2
-#, fuzzy
 msgid "select the card"
-msgstr "Select by command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:3
 msgid "select the device, default 'default'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:4
-#, fuzzy
 msgid "debug mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:5
 msgid "do not perform range checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:6
-#, fuzzy
 msgid "print version of this program"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:7
-#, fuzzy
 msgid "be quiet"
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:8
-#, fuzzy
 msgid "show also inactive controls"
-msgstr "Force interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:9
-#, fuzzy
 msgid "select abstraction level"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/amixer.fish:10
-#, fuzzy
 msgid "Read and execute commands from stdin sequentially"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:1
 #: /tmp/fish/implicit/share/completions/compare.fish:1
@@ -5378,9 +5031,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:21
 #: /tmp/fish/implicit/share/completions/display.fish:23
-#, fuzzy
 msgid "Displayed image cannot be modified"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:22
 #: /tmp/fish/implicit/share/completions/compare.fish:18
@@ -5439,9 +5091,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:50
 #: /tmp/fish/implicit/share/completions/montage.fish:40
 #: /tmp/fish/implicit/share/completions/stream.fish:14
-#, fuzzy
 msgid "Monitor progress "
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:28
 msgid "Seconds to pause before reanimating"
@@ -5476,9 +5127,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:60
 #: /tmp/fish/implicit/share/completions/montage.fish:47
 #: /tmp/fish/implicit/share/completions/stream.fish:16
-#, fuzzy
 msgid "Suppress all warning messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:32
 #: /tmp/fish/implicit/share/completions/compare.fish:28
@@ -5590,9 +5240,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:80
 #: /tmp/fish/implicit/share/completions/montage.fish:68
 #: /tmp/fish/implicit/share/completions/stream.fish:27
-#, fuzzy
 msgid "Print detailed information about the image"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:42
 #: /tmp/fish/implicit/share/completions/display.fish:49
@@ -5640,9 +5289,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/identify.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:23
 #: /tmp/fish/implicit/share/completions/stream.fish:8
-#, fuzzy
 msgid "Extract area from image [geometry]"
-msgstr "Extrair arquivos do arquivo de lista"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:48
 #: /tmp/fish/implicit/share/completions/composite.fish:60
@@ -5707,17 +5355,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/animate.fish:56
 #: /tmp/fish/implicit/share/completions/display.fish:88
 #: /tmp/fish/implicit/share/completions/montage.fish:92
-#, fuzzy
 msgid "Merge a sequence of images"
-msgstr "Print name, not number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:57
 #: /tmp/fish/implicit/share/completions/display.fish:89
 #: /tmp/fish/implicit/share/completions/mogrify.fish:33
 #: /tmp/fish/implicit/share/completions/montage.fish:77
-#, fuzzy
 msgid "Flatten a sequence of images"
-msgstr "Print name, not number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:58
 #: /tmp/fish/implicit/share/completions/compare.fish:40
@@ -5728,9 +5374,8 @@ msgstr "Print name, not number"
 #: /tmp/fish/implicit/share/completions/import.fish:65
 #: /tmp/fish/implicit/share/completions/montage.fish:100
 #: /tmp/fish/implicit/share/completions/stream.fish:29
-#, fuzzy
 msgid "Display copious debugging information [events]"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:59
 #: /tmp/fish/implicit/share/completions/compare.fish:41
@@ -5741,9 +5386,8 @@ msgstr "Display update information"
 #: /tmp/fish/implicit/share/completions/import.fish:53
 #: /tmp/fish/implicit/share/completions/montage.fish:101
 #: /tmp/fish/implicit/share/completions/stream.fish:30
-#, fuzzy
 msgid "Print program options"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:60
 #: /tmp/fish/implicit/share/completions/compare.fish:42
@@ -5819,9 +5463,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:11
 #: /tmp/fish/implicit/share/completions/xz.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:12
-#, fuzzy
 msgid "Display help"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:4
 #: /tmp/fish/implicit/share/completions/base64.fish:5
@@ -5829,50 +5472,41 @@ msgstr "Display man page"
 #: /tmp/fish/implicit/share/completions/lscpu.fish:9
 #: /tmp/fish/implicit/share/completions/netctl.fish:2
 #: /tmp/fish/implicit/share/completions/xz.fish:38
-#, fuzzy
 msgid "Display version"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:5
-#, fuzzy
 msgid "Enable colored output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:6
 #: /tmp/fish/implicit/share/completions/magento.fish:25
-#, fuzzy
 msgid "Disable colored output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:7
-#, fuzzy
 msgid "Modify or list configuration items"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:8
-#, fuzzy
 msgid "Set config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:9
-#, fuzzy
 msgid "Get config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:10
-#, fuzzy
 msgid "Delete config item"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:11
-#, fuzzy
 msgid "List config items"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:12
-#, fuzzy
 msgid "Edit config items"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:13
 msgid "Reduce duplication in node_modules in current directory"
@@ -5901,9 +5535,8 @@ msgid "Open a package's homepage in the default browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:19
-#, fuzzy
 msgid "Print URL instead of opening"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:20
 msgid "Output featured packages as JSON array"
@@ -5912,37 +5545,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/apm.fish:21
 #: /tmp/fish/implicit/share/completions/apm.fish:45
 #: /tmp/fish/implicit/share/completions/apm.fish:73
-#, fuzzy
 msgid "Only list themes"
-msgstr "Lista as chaves"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:22
 msgid "Only list packages/themes compatible with specified Atom version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:23
-#, fuzzy
 msgid "Generates code scaffolding for theme or package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:24
 msgid "Path to the package or theme template"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:25
-#, fuzzy
 msgid "Generates a basic package"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:26
-#, fuzzy
 msgid "Generates a basic theme"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:27
-#, fuzzy
 msgid "Generates a basic language package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:28
 msgid "Convert TextMate bundle/theme"
@@ -5958,25 +5586,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:31
 #: /tmp/fish/implicit/share/completions/apm.fish:52
-#, fuzzy
 msgid "Show verbose debug information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:32
-#, fuzzy
 msgid "Specify text file containing packages to install"
-msgstr "List of packages to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:33
-#, fuzzy
 msgid "Do not install dev dependencies"
-msgstr "Don't automatically fulfill dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:34
 #: /tmp/fish/implicit/share/completions/apm.fish:51
-#, fuzzy
 msgid "Only install packages/themes compatible with specified Atom version"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:35
 msgid "Set npm log level to silent"
@@ -5995,51 +5619,44 @@ msgid "Link to ~/.atom/dev/packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:39
-#, fuzzy
 msgid "List all installed and bundled packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:40
 msgid "Print packages one per line with no formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:41
-#, fuzzy
 msgid "Include dev packages"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:42
-#, fuzzy
 msgid "Only list installed packages/themes"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:43
 msgid "Output all packages as a JSON object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:44
-#, fuzzy
 msgid "Include linked packages"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:46
-#, fuzzy
 msgid "Only list packages"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:47
 msgid "Save Atom API token to keychain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:48
-#, fuzzy
 msgid "Specify API token"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:49
-#, fuzzy
 msgid "Upgrade out of date packages"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:50
 msgid "Output outdated packages as JSON array"
@@ -6050,56 +5667,48 @@ msgid "Confirm before installing updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:54
-#, fuzzy
 msgid "List but don't install the outdated packages"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:55
-#, fuzzy
 msgid "Publish new version of package in current working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:56
 msgid "Semantic version category for new version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:57
-#, fuzzy
 msgid "Specify a tag to publish"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:58
-#, fuzzy
 msgid "Specify a new name for the package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:59
 msgid "Rebuild modules installed in node_modules in current working directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:60
-#, fuzzy
 msgid "Rebuild module cache for installed packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:61
-#, fuzzy
 msgid "Search for Atom packages/themes in the atom.io registry"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:62
 msgid "Output matching packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:63
-#, fuzzy
 msgid "Search only non-theme packages"
-msgstr "Search in all man pages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:64
-#, fuzzy
 msgid "Search only themes"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:65
 msgid "View information about package/theme in the atom.io registry"
@@ -6110,46 +5719,40 @@ msgid "Output as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:67
-#, fuzzy
 msgid "Show latest version compatible with specified Atom version"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:68
 msgid "Star the given packages on https://atom.io"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:69
-#, fuzzy
 msgid "Star all packages in ~/.atom/packages"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:70
-#, fuzzy
 msgid "List or install starred Atom packages and themes"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:71
 msgid "Output packages as JSON array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:72
-#, fuzzy
 msgid "Install the starred packages"
-msgstr "Instalar os pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:74
 msgid "GitHub username to show starred packages for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:75
-#, fuzzy
 msgid "Runs the package's tests contained within the spec directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
-#, fuzzy
 msgid "Path to atom command"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:77
 msgid "Delete the symlink in ~/.atom/packages for the package"
@@ -6164,9 +5767,8 @@ msgid "Remove published package or version from the atom.io registry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:82
-#, fuzzy
 msgid "Do not prompt for confirmation"
-msgstr "Do not prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:83
 msgid "Unstar given packages on https://atom.io"
@@ -6266,43 +5868,36 @@ msgid "Display version and exit"
 msgstr "Mostra a versão e sai"
 
 #: /tmp/fish/implicit/share/completions/apm.fish:85
-#, fuzzy
 msgid "Print APM info"
-msgstr "Print APM info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:86
-#, fuzzy
 msgid "Print time remaining"
-msgstr "Print time remaining"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:87
-#, fuzzy
 msgid "Monitor status info"
-msgstr "Monitor status info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:88
-#, fuzzy
 msgid "Request APM standby mode"
-msgstr "Request APM standby mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:89
-#, fuzzy
 msgid "Request APM suspend mode"
-msgstr "Request APM suspend mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:90
-#, fuzzy
 msgid "APM status debugging info"
-msgstr "APM status debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:1
 msgid "whatis entry"
 msgstr "whatis entry"
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:3
-#, fuzzy
 msgid "Print debugging info"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:4
 #: /tmp/fish/implicit/share/completions/apt-file.fish:7
@@ -6342,135 +5937,111 @@ msgid "Verbose mode"
 msgstr "Modo detalhado"
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:5
-#, fuzzy
 msgid "Keyword as regex"
-msgstr "Keyword as regex"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:6
-#, fuzzy
 msgid "Keyword as wildcards"
-msgstr "Keyword as wildcards"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:7
-#, fuzzy
 msgid "Keyword as exactly match"
-msgstr "Keyword as exactly match"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:8
-#, fuzzy
 msgid "Search for other system"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:9
-#, fuzzy
 msgid "Specify man path"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apropos.fish:10
-#, fuzzy
 msgid "Specify a configuration file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:2
-#, fuzzy
 msgid "Update list of packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:3
 #: /tmp/fish/implicit/share/completions/pkg.fish:42
-#, fuzzy
 msgid "Upgrade packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:4
-#, fuzzy
 msgid "Rebuild your system"
-msgstr "Rebuild your system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:5
-#, fuzzy
 msgid "Build and install a new package"
-msgstr "Build and install a new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:6
-#, fuzzy
 msgid "Download and extract a source"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:7
-#, fuzzy
 msgid "Info on a package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:8
 #: /tmp/fish/implicit/share/completions/zypper.fish:19
-#, fuzzy
 msgid "Remove packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:9
-#, fuzzy
 msgid "Erase built packages"
-msgstr "Erase built packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:10
-#, fuzzy
 msgid "Build source without install"
-msgstr "Build source without install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:11
-#, fuzzy
 msgid "Clean source directories"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:12
-#, fuzzy
 msgid "Update source and rebuild"
-msgstr "Update source and rebuild"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:13
 msgid "Update the repository"
 msgstr "Atualizar o repositório"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:14
-#, fuzzy
 msgid "Do not use gcc wrapper"
-msgstr "Do not use gcc wrapper"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:15
-#, fuzzy
 msgid "Remove build-dep"
-msgstr "Remove build-dep"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:16
-#, fuzzy
 msgid "Do not download source"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:17
-#, fuzzy
 msgid "Specify build-dir"
-msgstr "Specify build-dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:18
 #: /tmp/fish/implicit/share/completions/npm.fish:56
-#, fuzzy
 msgid "Rebuild a package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:19
-#, fuzzy
 msgid "Rebuild and install an installed package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:20
 msgid "Use <command> to build"
 msgstr "Use <command> to build"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:21
-#, fuzzy
 msgid "Apply <file> patch"
-msgstr "Apply <file> patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:22
 msgid "Prefix to strip on patch"
@@ -6479,113 +6050,93 @@ msgstr "Prefix to strip on patch"
 #: /tmp/fish/implicit/share/completions/apt-build.fish:23
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:20
 #: /tmp/fish/implicit/share/completions/yum.fish:12
-#, fuzzy
 msgid "Assume yes to all questions"
-msgstr "Assume yes to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:24
 #: /tmp/fish/implicit/share/completions/apt-get.fish:35
-#, fuzzy
 msgid "Use purge instead of remove"
-msgstr "Use label instead of filename in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:25
 msgid "Do not run update"
 msgstr "Do not run update"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:26
-#, fuzzy
 msgid "Specify sources.list file"
-msgstr "Specify sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:2
-#, fuzzy
 msgid "Build apt cache"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:3
-#, fuzzy
 msgid "Show package info"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:4
-#, fuzzy
 msgid "Show cache statistics"
-msgstr "Show cache statistics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:5
-#, fuzzy
 msgid "Show source package"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:6
-#, fuzzy
 msgid "Show packages in cache"
-msgstr "Show packages in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:7
-#, fuzzy
 msgid "Print available list"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:8
-#, fuzzy
 msgid "List unmet dependencies in cache"
-msgstr "List unmet dependencies in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:9
-#, fuzzy
 msgid "Display package record"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:10
-#, fuzzy
 msgid "Search packagename by REGEX"
-msgstr "Search packagename by REGEX"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:11
 msgid "Search full package name"
 msgstr "Search full package name"
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:12
-#, fuzzy
 msgid "Search packagename only"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:13
-#, fuzzy
 msgid "List dependencies for the package"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:14
-#, fuzzy
 msgid "List reverse dependencies for the package"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:15
-#, fuzzy
 msgid "Print package name by prefix"
-msgstr "Print package name by prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:16
-#, fuzzy
 msgid "Generate dotty output for packages"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:17
-#, fuzzy
 msgid "Debug preferences file"
-msgstr "Debug preferences file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:18
-#, fuzzy
 msgid "Select file to store package cache"
-msgstr "Select file to store package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:19
-#, fuzzy
 msgid "Select file to store source cache"
-msgstr "Select file to store source cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:20
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:9
@@ -6601,64 +6152,55 @@ msgstr "Select file to store source cache"
 #: /tmp/fish/implicit/share/completions/valgrind.fish:5
 #: /tmp/fish/implicit/share/completions/wget.fish:8
 #: /tmp/fish/implicit/share/completions/zip.fish:12
-#, fuzzy
 msgid "Quiet mode"
-msgstr "Quiet mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:21
-#, fuzzy
 msgid "Print important dependencies"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:22
-#, fuzzy
 msgid "Print full records"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:23
-#, fuzzy
 msgid "Auto-gen package cache"
-msgstr "Auto-gen package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:24
 msgid "Print all names"
 msgstr "Imprimir todos os nomes"
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:25
-#, fuzzy
 msgid "Dep and rdep recursive"
-msgstr "Dep and rdep recursive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:26
-#, fuzzy
 msgid "Limit to installed"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:29
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:12
 #: /tmp/fish/implicit/share/completions/apt-config.fish:6
 #: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:4
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:9
-#, fuzzy
 msgid "Specify options"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:30
 #: /tmp/fish/implicit/share/completions/apt.fish:2
 #: /tmp/fish/implicit/share/completions/apt-get.fish:2
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:2
-#, fuzzy
 msgid "Test if apt command should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:2
 msgid "Add new disc to source list"
 msgstr "Adicionar novo disco para a lista de fontes"
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:3
-#, fuzzy
 msgid "Report identity of disc"
-msgstr "Report identity of disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:4
 #: /tmp/fish/implicit/share/completions/fusermount.fish:1
@@ -6668,23 +6210,20 @@ msgid "Mount point"
 msgstr "Ponto de montagem"
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:5
-#, fuzzy
 msgid "Rename a disc"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:6
-#, fuzzy
 msgid "No mounting"
-msgstr "No mounting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:7
 msgid "Fast copy"
 msgstr "Cópia rápida"
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:8
-#, fuzzy
 msgid "Thorough package scan"
-msgstr "Thorough package scan"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cdrom.fish:9
 msgid "No changes"
@@ -6695,44 +6234,36 @@ msgid "Access config file from shell"
 msgstr "Access config file from shell"
 
 #: /tmp/fish/implicit/share/completions/apt-config.fish:3
-#, fuzzy
 msgid "Dump contents of config file"
-msgstr "Dump contents of config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:2
-#, fuzzy
 msgid "Set temp dir"
-msgstr "Set temp dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:3
-#, fuzzy
 msgid "Specifiy config file"
-msgstr "Specifiy config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:2
-#, fuzzy
 msgid "Resync package contents from source"
-msgstr "Resync package contents from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:3
-#, fuzzy
 msgid "Search package containing pattern"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:4
-#, fuzzy
 msgid "List contents of a package matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:5
-#, fuzzy
 msgid "Remove all gz files from cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:6
-#, fuzzy
 msgid "Set cache dir"
-msgstr "Set cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:8
 msgid "Use cdrom-mount-point"
@@ -6740,53 +6271,44 @@ msgstr "Use cdrom-mount-point"
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:9
 #: /tmp/fish/implicit/share/completions/apt-file.fish:15
-#, fuzzy
 msgid "Do not expand pattern"
-msgstr "Do not expand pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:10
-#, fuzzy
 msgid "Pattern is regexp"
-msgstr "Pattern is regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:12
-#, fuzzy
 msgid "Set arch"
-msgstr "Set arch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:13
-#, fuzzy
 msgid "Set sources.list file"
-msgstr "Set sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:14
-#, fuzzy
 msgid "Only display package name"
-msgstr "Only display package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-file.fish:16
-#, fuzzy
 msgid "Run in dummy mode"
-msgstr "Run in dummy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:1
 #: /tmp/fish/implicit/share/completions/apt-get.fish:1
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:1
-#, fuzzy
 msgid "Test if apt has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:3
 #: /tmp/fish/implicit/share/completions/snap.fish:2
-#, fuzzy
 msgid "Test if given subcommand is used"
-msgstr "Test if aptitude has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:7
 #: /tmp/fish/implicit/share/completions/git.fish:4
-#, fuzzy
 msgid "Set a configuration option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:8
 #: /tmp/fish/implicit/share/completions/hugo.fish:1
@@ -6798,149 +6320,122 @@ msgid "Configuration file"
 msgstr "Arquivo de configuração"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:9
-#, fuzzy
 msgid "Target release"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
-#, fuzzy
 msgid "Generate package from source"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:3
-#, fuzzy
 msgid "Generate source index file"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:4
-#, fuzzy
 msgid "Generate contents file"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:5
-#, fuzzy
 msgid "Generate release file"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:6
-#, fuzzy
 msgid "Remove records"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:7
-#, fuzzy
 msgid "Generate MD5 sums"
-msgstr "Generate MD5 sums"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:8
-#, fuzzy
 msgid "Use a binary db"
-msgstr "Use a binary db"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:10
-#, fuzzy
 msgid "Perform delinking"
-msgstr "Perform delinking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:11
-#, fuzzy
 msgid "Perform contents generation"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:12
 msgid "Use source override"
 msgstr "Use source override"
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:13
-#, fuzzy
 msgid "Make caching db readonly"
-msgstr "Make caching db readonly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:15
-#, fuzzy
 msgid "Use config file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:16
 #: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:5
 #: /tmp/fish/implicit/share/completions/composer.fish:7
-#, fuzzy
 msgid "Set config options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:5
-#, fuzzy
 msgid "Update sources"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:6
-#, fuzzy
 msgid "Upgrade or install newest packages"
-msgstr "Upgrade or install newest packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:7
-#, fuzzy
 msgid "Use with dselect front-end"
-msgstr "Use with dselect front-end"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:8
-#, fuzzy
 msgid "Distro upgrade"
-msgstr "Distro upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:9
 msgid "Install one or more packages"
 msgstr "Instalar um ou mais pacotes"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:10
-#, fuzzy
 msgid "Display changelog of one or more packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:11
-#, fuzzy
 msgid "Remove and purge one or more packages"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:12
-#, fuzzy
 msgid "Remove one or more packages"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:13
-#, fuzzy
 msgid "Fetch source packages"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:14
-#, fuzzy
 msgid "Install/remove packages for dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:15
-#, fuzzy
 msgid "Update cache and check dependencies"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:16
-#, fuzzy
 msgid "Clean local caches and packages"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:17
-#, fuzzy
 msgid "Clean packages no longer be downloaded"
-msgstr "Clean packages no longer be downloaded"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:18
-#, fuzzy
 msgid "Remove automatically installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:19
-#, fuzzy
 msgid "Do not install recommended packages"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:20
 #: /tmp/fish/implicit/share/completions/aptitude.fish:28
@@ -6961,32 +6456,28 @@ msgid "Disable downloading packages"
 msgstr "Disable downloading packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:25
-#, fuzzy
 msgid "Perform a simulation"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:26
 msgid "Automatic yes to prompts"
 msgstr "Automatic yes to prompts"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:27
-#, fuzzy
 msgid "Show upgraded packages"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:28
-#, fuzzy
 msgid "Show full versions for packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:29
 msgid "Compile source packages"
 msgstr "Compile source packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:30
-#, fuzzy
 msgid "Install recommended packages"
-msgstr "Install source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:31
 msgid "Ignore package Holds"
@@ -7001,14 +6492,12 @@ msgid "Force yes"
 msgstr "Force yes"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:34
-#, fuzzy
 msgid "Print the URIs"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:36
-#, fuzzy
 msgid "Reinstall packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:37
 msgid "Erase obsolete files"
@@ -7048,43 +6537,37 @@ msgstr "Ignore non-authenticated packages"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:47
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:13
-#, fuzzy
 msgid "Specify a config file"
-msgstr "Specify a config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:48
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:14
-#, fuzzy
 msgid "Set a config option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:1
-#, fuzzy
 msgid "Test if aptitude has yet to be given the subcommand"
-msgstr "Test if aptitude has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:2
-#, fuzzy
 msgid "Test if aptitude command should have packages as potential completion"
-msgstr "Test if aptitude command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:4
 msgid "Display a brief help message. Identical to the help action"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:5
-#, fuzzy
 msgid "Remove any cached packages which can no longer be downloaded"
-msgstr "Clean packages no longer be downloaded"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:6
 msgid "Remove all downloaded .deb files from the package cache directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:7
-#, fuzzy
 msgid "Forget all internal information about what packages are 'new'"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:8
 msgid "Cancel all scheduled actions on all packages"
@@ -7095,24 +6578,20 @@ msgid "Update the list of available packages from the apt sources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:10
-#, fuzzy
 msgid "Upgrade installed packages to their most recent version"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:11
-#, fuzzy
 msgid "Download and displays the Debian changelog for the packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:12
-#, fuzzy
 msgid "Upgrade, removing or installing packages as necessary"
-msgstr "Upgrade or install newest packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:13
-#, fuzzy
 msgid "Download the packages to the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:14
 msgid "Forbid the upgrade to a particular version"
@@ -7127,47 +6606,40 @@ msgid "Install the packages"
 msgstr "Instalar os pacotes"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:17
-#, fuzzy
 msgid "Cancel any scheduled actions on the packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:18
-#, fuzzy
 msgid "Mark packages as automatically installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:19
 msgid "Remove and delete all associated configuration and data files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:20
-#, fuzzy
 msgid "Reinstall the packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:21
-#, fuzzy
 msgid "Remove the packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:22
-#, fuzzy
 msgid "Display detailed information about the packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:23
 msgid "Consider the packages by future upgrade commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:24
-#, fuzzy
 msgid "Mark packages as manually installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:25
-#, fuzzy
 msgid "Search for packages matching one of the patterns"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:26
 msgid "Display brief summary of the available commands and options"
@@ -7178,23 +6650,20 @@ msgid "Show explanations of automatic installations and removals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:30
-#, fuzzy
 msgid "Purge packages that are not required by any installed package"
-msgstr "Query packages that are triggered by the specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:31
 msgid "Always display a prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:32
-#, fuzzy
 msgid "Do not treat recommendations as dependencies"
-msgstr "Don't ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:33
-#, fuzzy
 msgid "Treat recommendations as dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:34
 msgid "Don't perform the actions. Just show them"
@@ -7209,37 +6678,32 @@ msgid "Suppress incremental progress indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:37
-#, fuzzy
 msgid "Show which versions of packages will be installed"
-msgstr "List of packages to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:38
-#, fuzzy
 msgid "Display extra information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:39
-#, fuzzy
 msgid "Display the version of aptitude and compile information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:40
 msgid "Start up the visual interface and display its preview screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:41
-#, fuzzy
 msgid "Assume the answer yes for all question prompts"
-msgstr "Assume yes to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:42
 msgid "Show how much disk space will be used or freed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:43
-#, fuzzy
 msgid "Specify the format to be used by the search command"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:44
 msgid "Set the release from which packages should be installed"
@@ -7250,9 +6714,8 @@ msgid "Specify the order for the output from the search command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:46
-#, fuzzy
 msgid "Set a configuration file option directly"
-msgstr "Read user config files from named directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:47
 msgid "Specify the display width for the output from the search command"
@@ -7263,84 +6726,68 @@ msgid "Add a new key"
 msgstr "Adicionar uma nova chave"
 
 #: /tmp/fish/implicit/share/completions/apt-key.fish:2
-#, fuzzy
 msgid "Remove a key"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-key.fish:3
-#, fuzzy
 msgid "List trusted keys"
-msgstr "List trusted keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:2
-#, fuzzy
 msgid "Set severity"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:3
-#, fuzzy
 msgid "Tags you want to see"
-msgstr "Tags you want to see"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:4
-#, fuzzy
 msgid "Bug-status you want to see"
-msgstr "Bug-status you want to see"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:5
-#, fuzzy
 msgid "Ignore bugs in your system"
-msgstr "Ignore bugs in your system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:6
-#, fuzzy
 msgid "Ignore newer bugs than upgrade packages"
-msgstr "Ignore newer bugs than upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:7
-#, fuzzy
 msgid "Bugs for downgrade packages"
-msgstr "Bugs for downgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:8
-#, fuzzy
 msgid "Bug Tracking system"
-msgstr "Bug Tracking system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:9
-#, fuzzy
 msgid "Specify port for web interface"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:10
-#, fuzzy
 msgid "Use daily bug report"
-msgstr "Use daily bug report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:11
-#, fuzzy
 msgid "Use the raw index.db"
-msgstr "Use the raw index.db"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:12
-#, fuzzy
 msgid "Specify index dir"
-msgstr "Specify index dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:13
-#, fuzzy
 msgid "Specify Pin-Priority value"
-msgstr "Specify Pin-Priority value"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:14
-#, fuzzy
 msgid "Specify the title of rss"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:15
-#, fuzzy
 msgid "Retrieve fresh bugs"
-msgstr "Retrieve fresh bugs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:16
 #: /tmp/fish/implicit/share/completions/aura.fish:31
@@ -7348,33 +6795,28 @@ msgstr "Retrieve fresh bugs"
 #: /tmp/fish/implicit/share/completions/pacman.fish:25
 #: /tmp/fish/implicit/share/completions/scp.fish:7
 #: /tmp/fish/implicit/share/completions/yaourt.fish:39
-#, fuzzy
 msgid "Do not display progress bar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:17
-#, fuzzy
 msgid "Specify local cache dir"
-msgstr "Specify local cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:18
-#, fuzzy
 msgid "Specify the expire cache timer"
-msgstr "Specify the expire cache timer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:19
 msgid "Specify apt config file"
 msgstr "Specify apt config file"
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:21
-#, fuzzy
 msgid "Assume no to all questions"
-msgstr "Assume no to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:22
-#, fuzzy
 msgid "List bugs from packages"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:23
 msgid "List bugs in rss format"
@@ -7385,35 +6827,29 @@ msgid "Read filenames from pipe"
 msgstr "Read filenames from pipe"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:4
-#, fuzzy
 msgid "Select frontend interface"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:5
 #: /tmp/fish/implicit/share/completions/darcs.fish:749
-#, fuzzy
 msgid "Specify email address"
-msgstr "Specify email address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:6
-#, fuzzy
 msgid "Ask confirmation"
-msgstr "Ask confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:7
-#, fuzzy
 msgid "Display all changelogs"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:8
-#, fuzzy
 msgid "Avoid changelogs from db in named file"
-msgstr "Avoid changelogs from db in named file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:9
-#, fuzzy
 msgid "Select display"
-msgstr "X server display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:10
 msgid "Insert header"
@@ -7421,87 +6857,72 @@ msgstr "Inserir cabeçalho"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:11
 #: /tmp/fish/implicit/share/completions/ps.fish:40
-#, fuzzy
 msgid "Display debug info"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:12
-#, fuzzy
 msgid "Select an option profile"
-msgstr "Select an option profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:5
-#, fuzzy
 msgid "Mark a package as automatically installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:6
-#, fuzzy
 msgid "Mark a package as manually installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:7
 msgid "Hold a package, prevent automatic installation or removal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:8
-#, fuzzy
 msgid "Cancel a hold on a package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:9
-#, fuzzy
 msgid "Show automatically installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:10
-#, fuzzy
 msgid "Show manually installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:11
-#, fuzzy
 msgid "Show held packages"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:15
-#, fuzzy
 msgid "Write package statistics to a file"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:1
-#, fuzzy
 msgid "Generate master file"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:2
 msgid "Alias for 'get'"
 msgstr "Alias for “get”"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:3
-#, fuzzy
 msgid "Move packages to local tree"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:4
-#, fuzzy
 msgid "Delete obsolete package files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:5
-#, fuzzy
 msgid "Build new local files"
-msgstr "Build new local files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:6
-#, fuzzy
 msgid "Rebuild index files"
-msgstr "Rebuild index files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:7
-#, fuzzy
 msgid "Move packages from cache to local mirror"
-msgstr "Move packages from cache to local mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:8
 msgid "Alias for 'move delete packages'"
@@ -7512,112 +6933,92 @@ msgid "Alias for 'update'"
 msgstr "Nome alternativo para “update”"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:10
-#, fuzzy
 msgid "Download package missing from mirror"
-msgstr "Download package missing from mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:11
-#, fuzzy
 msgid "Sync packages installed"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:13
-#, fuzzy
 msgid "Move file specified on commandline"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:14
-#, fuzzy
 msgid "List packages that may serve as input to mirrorbin or mirrorsource"
-msgstr "List packages that may serve as input to mirrorbin or mirrorsource"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:15
-#, fuzzy
 msgid "Fetch package from STDIN"
-msgstr "Fetch package from STDIN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:16
-#, fuzzy
 msgid "Fetch source package from STDIN"
-msgstr "Fetch source package from STDIN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:17
-#, fuzzy
 msgid "Process all packages"
-msgstr "Process all packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:18
 msgid "Use specific conffile"
 msgstr "Use specific conffile"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:19
-#, fuzzy
 msgid "Force deletion"
-msgstr "Force deletion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:20
-#, fuzzy
 msgid "Suppresses normal output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:21
-#, fuzzy
 msgid "Test run"
-msgstr "Test run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:4
-#, fuzzy
 msgid "No message to STDOUT"
-msgstr "No message to STDOUT"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:5
-#, fuzzy
 msgid "Recurse into subdir"
-msgstr "Recurse into subdir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:6
-#, fuzzy
 msgid "Dir to import"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:7
 msgid "Change to user"
 msgstr "Alterar para usuário"
 
 #: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:8
-#, fuzzy
 msgid "Debug level[default 0]"
-msgstr "Debug level[default 0]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:2
-#, fuzzy
 msgid "Show build dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:3
-#, fuzzy
 msgid "Generate a dotty graph"
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:4
-#, fuzzy
 msgid "Show state of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:5
-#, fuzzy
 msgid "List packages depending on"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:6
-#, fuzzy
 msgid "Comma-separated list of dependency types to follow recursively"
-msgstr "Comma-separated list of dependancy types to follow recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:7
-#, fuzzy
 msgid "Comma-separated list of dependency types to show"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:8
 msgid ""
@@ -7630,114 +7031,94 @@ msgid "Comma-separated list of package installation states to show"
 msgstr "Comma-separated list of package installation states to show"
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:10
-#, fuzzy
 msgid "Display man page"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:1
 msgid "Probe a CD"
 msgstr "Probe a CD"
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
-#, fuzzy
 msgid "Run in non-interactive mode"
-msgstr "Run in noninteractive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:9
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:10
-#, fuzzy
 msgid "Read package from file"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:4
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:5
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:11
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:12
-#, fuzzy
 msgid "Specify APT list dir"
-msgstr "Specify APT list dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:6
-#, fuzzy
 msgid "List PKG info"
-msgstr "List PKG info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:8
-#, fuzzy
 msgid "Print all source packages with version"
-msgstr "Print all source packages with version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:2
-#, fuzzy
 msgid "Print PKG versions"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:3
-#, fuzzy
 msgid "Using regex"
-msgstr "Using regex"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:4
-#, fuzzy
 msgid "Print only upgradeable packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:5
-#, fuzzy
 msgid "Print all versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:6
-#, fuzzy
 msgid "Print package name/distro"
-msgstr "Print package name/distro"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:7
-#, fuzzy
 msgid "Print verbose info"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:8
-#, fuzzy
 msgid "Init or update cache only"
-msgstr "Init or update cache only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:2
-#, fuzzy
 msgid "Use source index field"
-msgstr "Use source index field"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:4
-#, fuzzy
 msgid "Specify conffile"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:2
-#, fuzzy
 msgid "Debian distribution"
-msgstr "Debian distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:3
-#, fuzzy
 msgid "Servers in the areas"
-msgstr "Servers in the areas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:4
-#, fuzzy
 msgid "Conf file"
-msgstr "Arquivo de configuração"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:5
-#, fuzzy
 msgid "Finish after number of servers"
-msgstr "Finish after number of servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:6
-#, fuzzy
 msgid "File to grab servers"
-msgstr "File for server response"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:7
 msgid "File as input"
@@ -7748,151 +7129,125 @@ msgid "Mirror-list file"
 msgstr "Mirror-list file"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:9
-#, fuzzy
 msgid "Output sources.list file"
-msgstr "Set sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:10
 msgid "Use proxy server"
 msgstr "Utilizar servidor proxy"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:11
-#, fuzzy
 msgid "Comma separated country list"
-msgstr "Comma separated country list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:12
-#, fuzzy
 msgid "How long in sec to download"
-msgstr "How long in sec to download"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:13
-#, fuzzy
 msgid "Custom URL to get mirror list"
-msgstr "Custom URL to get mirror list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:14
 msgid "Write top servers to file"
 msgstr "Write top servers to file"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:15
-#, fuzzy
 msgid "Number of top servers"
-msgstr "Number of top servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:16
-#, fuzzy
 msgid "Update mirror list"
-msgstr "Update mirror list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:17
 msgid "Version number"
 msgstr "Número da versão"
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:2
-#, fuzzy
 msgid "Update list of source packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:3
-#, fuzzy
 msgid "Install source packages"
-msgstr "Install source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:4
-#, fuzzy
 msgid "Upgrade source packages"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:5
-#, fuzzy
 msgid "Remove source packages"
-msgstr "Remove source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:6
 #: /tmp/fish/implicit/share/completions/apt-src.fish:13
-#, fuzzy
 msgid "Build source packages"
-msgstr "Build source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:7
-#, fuzzy
 msgid "Clean source packages"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:8
-#, fuzzy
 msgid "Detect known source tree"
-msgstr "Detect known source tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:9
-#, fuzzy
 msgid "List installed source package\\(s\\)"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:10
-#, fuzzy
 msgid "Root source tree"
-msgstr "Root source tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:11
-#, fuzzy
 msgid "Version of source package"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:12
-#, fuzzy
 msgid "Name of the source package"
-msgstr "Name of the source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:14
-#, fuzzy
 msgid "Install after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:15
-#, fuzzy
 msgid "Patch local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:16
-#, fuzzy
 msgid "Specify a dir"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:17
 msgid "Run on current dir"
 msgstr "Run on current dir"
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:18
-#, fuzzy
 msgid "Omit debian version"
-msgstr "Omit debian version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:19
-#, fuzzy
 msgid "Do not del built files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:20
-#, fuzzy
 msgid "Do not del source files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:21
-#, fuzzy
 msgid "Source tree version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:22
-#, fuzzy
 msgid "Output to /dev/null"
-msgstr "Output to /dev/null"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:23
-#, fuzzy
 msgid "Output trace"
-msgstr "Output trace"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:3
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:3
@@ -7901,21 +7256,18 @@ msgstr "Removable medium"
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:4
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:4
-#, fuzzy
 msgid "Select an action"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:5
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:5
-#, fuzzy
 msgid "List of packages to install"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:6
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:6
-#, fuzzy
 msgid "Fix broken option"
-msgstr "Fix broken option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:7
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:7
@@ -7935,79 +7287,65 @@ msgid "Reject protocols"
 msgstr "Reject protocols"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:1
-#, fuzzy
 msgid "Debugging command"
-msgstr "Debugger command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:2
 #: /tmp/fish/implicit/share/completions/arc.fish:4
-#, fuzzy
 msgid "Don't use color or style for output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:3
-#, fuzzy
 msgid "Always use fromatting"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:5
-#, fuzzy
 msgid "Specify which libraies to load"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:6
-#, fuzzy
 msgid "Specify the Conduit URI"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:7
-#, fuzzy
 msgid "Specify the Conduit token"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:8
-#, fuzzy
 msgid "Force a version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:9
-#, fuzzy
 msgid "Sets the timeout"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:10
-#, fuzzy
 msgid "Sets a config"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:11
-#, fuzzy
 msgid "Skip the working copy configuration file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:12
-#, fuzzy
 msgid "Use provided file instead of ~/.arcrc"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:13
-#, fuzzy
 msgid "Implements shell completion"
-msgstr "Do not use file completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:14
 msgid "Current term in the argument list being completed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:15
-#, fuzzy
 msgid "Reads an arc configuration option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
-#, fuzzy
 msgid "Show detailed information about options"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:17
 msgid "Download a file to local disk"
@@ -8018,9 +7356,8 @@ msgid "Save the file with a specific name rather than the default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:19
-#, fuzzy
 msgid "Write file to stdout instead of to disk"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:20
 msgid "List your open Differential revisions"
@@ -8035,14 +7372,12 @@ msgid "Override configured lint engine for this project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:23
-#, fuzzy
 msgid "Apply patches suggested by lint to the working copy"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:24
-#, fuzzy
 msgid "Set minimum message severity"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:25
 #: /tmp/fish/implicit/share/completions/arc.fish:176
@@ -8050,14 +7385,12 @@ msgid "Never apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:26
-#, fuzzy
 msgid "Lint changes since a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:27
-#, fuzzy
 msgid "Output the linter results to a file"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:28
 msgid "Show all lint warnings, not just those on changed lines"
@@ -8069,9 +7402,8 @@ msgid "When linting git repositories, amend HEAD with all patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:30
-#, fuzzy
 msgid "Lint all files in the project"
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:31
 msgid "Specify how results will be displayed"
@@ -8095,9 +7427,8 @@ msgid "In the first form, list objects you've flagged"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:36
-#, fuzzy
 msgid "Edit the flag on an object"
-msgstr "Edit the long comment by default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:37
 msgid "Set the color of a flag"
@@ -8108,14 +7439,12 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "Muda a cor do terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
-#, fuzzy
 msgid "Export the local changeset to a file"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:41
 msgid "Export change as a unified patch"
@@ -8139,9 +7468,8 @@ msgid "Export from Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:46
-#, fuzzy
 msgid "Export from a Differential revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:47
 msgid "Open a file or object in your web browser"
@@ -8176,9 +7504,8 @@ msgid "what they do and which versions are installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:55
-#, fuzzy
 msgid "Search for linters"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:56
 msgid "Show detailed information, including options"
@@ -8193,24 +7520,20 @@ msgid "Stop tracking work in Phrequent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:59
-#, fuzzy
 msgid "A note to attach to the tracked time"
-msgstr "IP to report to the tracker"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:60
-#, fuzzy
 msgid "Create an alias"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:61
-#, fuzzy
 msgid "Sets an arc configuration option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:62
-#, fuzzy
 msgid "Set a local config value instead of a user one"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:63
 msgid "Start tracking work in Phrequent"
@@ -8225,9 +7548,8 @@ msgid "Provide a comment with your status change"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:66
-#, fuzzy
 msgid "Show available status options and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:67
 msgid "Publish an accepted revision after review"
@@ -8250,9 +7572,8 @@ msgid "When updating the feature branch, use rebase instead of merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:72
-#, fuzzy
 msgid "Use squash strategy"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:73
 msgid "Keep the feature branch"
@@ -8276,18 +7597,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:78
 #: /tmp/fish/implicit/share/completions/arc.fish:86
-#, fuzzy
 msgid "Use the message from a specific revision"
-msgstr "Update the working copy to a different URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:79
 msgid "Show which commits will be selected"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:80
-#, fuzzy
 msgid "Print base commit only and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:81
 #: /tmp/fish/implicit/share/completions/arc.fish:173
@@ -8295,9 +7614,8 @@ msgid "Additional rules for determining base revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:82
-#, fuzzy
 msgid "Specify the end of the commit range to select"
-msgstr "Set the end of file string to eof-str"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:83
 msgid "Show committed and abandoned revisions"
@@ -8305,109 +7623,92 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:84
 #: /tmp/fish/implicit/share/completions/arc.fish:114
-#, fuzzy
 msgid "Alias for arc feature"
-msgstr "Nome alternativo para atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
-#, fuzzy
 msgid "Show the amended commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:88
-#, fuzzy
 msgid "Upgrade arcanist and libphutil to the latest versions"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:89
-#, fuzzy
 msgid "Shows the help"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:92
-#, fuzzy
 msgid "Language for syntax highlighting"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:93
-#, fuzzy
 msgid "Output in JSON format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:94
-#, fuzzy
 msgid "Title for the paste"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:95
 msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
-#, fuzzy
 msgid "Do not run any sanity checks"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:101
-#, fuzzy
 msgid "Do not commit the changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:102
-#, fuzzy
 msgid "Update the local working copy before applying the patch"
-msgstr "Update the working copy to a different URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:103
 msgid "Apply changes from a git patch file or unified patch file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:104
-#, fuzzy
 msgid "Apply changes from an arc bundlej"
-msgstr "Apply patches (from an email bundle) to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:105
-#, fuzzy
 msgid "Do not apply dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:106
 msgid "Apply changes from a Differential diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:107
-#, fuzzy
 msgid "Do not create a branch"
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:108
 msgid "Apply changes from a Differential revision"
@@ -8430,28 +7731,24 @@ msgid "Output upload information in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:113
-#, fuzzy
 msgid "Mark the file as temporary"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:115
 msgid "There's only one way to find out"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:116
-#, fuzzy
 msgid "Show blame for the lines you changed"
-msgstr "Show help for the fish shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:117
-#, fuzzy
 msgid "Cover changes since a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:118
-#, fuzzy
 msgid "Close a revision"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:119
 msgid "Do not print a success message"
@@ -8491,9 +7788,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:128
 #: /tmp/fish/implicit/share/completions/arc.fish:140
-#, fuzzy
 msgid "Specify the output format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:129
 msgid "Include closed and abandoned revisions"
@@ -8516,43 +7812,37 @@ msgid "Show a detailed coverage report on the CLI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:134
-#, fuzzy
 msgid "Record a copy of the test results on the specified build target"
-msgstr "Cache test results in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:135
-#, fuzzy
 msgid "Use uglier formatting"
-msgstr "Use unified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:136
 msgid "Run unit tests covering changes since a specific revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:137
-#, fuzzy
 msgid "Run every test"
-msgstr "Reverse results"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:138
 msgid "Report results in JSON format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:139
-#, fuzzy
 msgid "Always enable coverage information"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:141
 #: /tmp/fish/implicit/share/completions/arc.fish:184
-#, fuzzy
 msgid "Always disable coverage information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "Executa comando se o comando anterior falhou"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8563,9 +7853,8 @@ msgid "Generate a Differential diff or revision from local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:145
-#, fuzzy
 msgid "Generate diff by executing a specified command"
-msgstr "Interactive mode after executing commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:146
 msgid "Attempt to convert non UTF-8 hunks into specified encoding"
@@ -8580,33 +7869,28 @@ msgid "When creating a revision, add reviewers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:149
-#, fuzzy
 msgid "Do not copy changes to the staging area"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:150
-#, fuzzy
 msgid "Read diff from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:151
-#, fuzzy
 msgid "Suppress warning about uncommitted changes"
-msgstr "Suppress the warning about “using insecure memory”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:152
 msgid "Read revision information from file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:153
-#, fuzzy
 msgid "Do not run lint"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:154
-#, fuzzy
 msgid "Use the specified message when updating a revision"
-msgstr "Use specified message digest algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:155
 msgid "Create or update a revision without requesting a code review"
@@ -8617,14 +7901,12 @@ msgid "After creating a diff or revision, open it in a web browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:157
-#, fuzzy
 msgid "Always create a new revision"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:158
-#, fuzzy
 msgid "Disable lint cache"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:159
 msgid "Read revision information from a specific commit"
@@ -8635,9 +7917,8 @@ msgid "Only generate a diff, without running lint, unit tests, or other"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:161
-#, fuzzy
 msgid "Do not upload binaries"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:162
 msgid "only create a diff"
@@ -8648,19 +7929,16 @@ msgid "Apply patches suggested by lint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:165
-#, fuzzy
 msgid "Specify the end of the commit range"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:166
-#, fuzzy
 msgid "When creating a revision, try to use the working copy commit"
-msgstr "Bring changes from the repository into the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:167
-#, fuzzy
 msgid "Create a diff with a few lines of context."
-msgstr "Print NUM lines of context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:168
 msgid "Require excuse for lint advice in addition to lint warnings and errors"
@@ -8671,9 +7949,8 @@ msgid "Emit machine-readable JSON"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:170
-#, fuzzy
 msgid "Always update a specific revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:171
 msgid "Ignore unsound test failures without prompting"
@@ -8684,43 +7961,36 @@ msgid "Provide a prepared in advance excuse for any lints/tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:174
-#, fuzzy
 msgid "Never amend commits in the working copy with lint patches"
-msgstr "Save changes in the working copy to the repository as a patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:175
 msgid "Automatically add all unstaged and uncommitted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:177
-#, fuzzy
 msgid "Edit revision information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:178
-#, fuzzy
 msgid "Do not run unit tests"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:179
-#, fuzzy
 msgid "Raise all lint warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:181
-#, fuzzy
 msgid "Only run lint and unit tests"
-msgstr "Only print duplicates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:182
-#, fuzzy
 msgid "Skip checks for untracked files in the working copy"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:183
-#, fuzzy
 msgid "Display only new lint messages"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:185
 msgid "Create or update a libphutil library"
@@ -8747,90 +8017,76 @@ msgid "Force the library map to be updated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:191
-#, fuzzy
 msgid "Set the library name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:192
-#, fuzzy
 msgid "Shows the current version of arcanist"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:2
 msgid "Numerical address"
 msgstr "Numerical address"
 
 #: /tmp/fish/implicit/share/completions/arp.fish:3
-#, fuzzy
 msgid "Class of hw type"
-msgstr "Class of hw type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:4
-#, fuzzy
 msgid "Show arp entries"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:5
-#, fuzzy
 msgid "Remove an entry for hostname"
-msgstr "Remove an entry for hostname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:6
 msgid "Use hardware address"
 msgstr "Use hardware address"
 
 #: /tmp/fish/implicit/share/completions/arp.fish:7
-#, fuzzy
 msgid "Select interface"
-msgstr "Select interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:8
-#, fuzzy
 msgid "Manually create ARP address"
-msgstr "Manually create ARP address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arp.fish:9
-#, fuzzy
 msgid "Take addr from filename, default /etc/ethers"
-msgstr "Take addr from filename, default /etc/ethers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
-#, fuzzy
 msgid "Omit false conditionals"
-msgstr "Testa uma condição"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:2
-#, fuzzy
 msgid "Omit debugging directives"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:3
-#, fuzzy
 msgid "Include general information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:4
 msgid "Include high-level source"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:5
-#, fuzzy
 msgid "Include assembly"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:6
 msgid "Include macro expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:7
-#, fuzzy
 msgid "Omit forms processing"
-msgstr "Print login process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:8
-#, fuzzy
 msgid "Include symbols"
-msgstr "Exceto arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:9
 msgid "Initially turn on alternate macro syntax"
@@ -8841,24 +8097,20 @@ msgid "Compress DWARF debug sections using zlib"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:11
-#, fuzzy
 msgid "Don't compress DWARF debug sections"
-msgstr "Don't execute scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:12
-#, fuzzy
 msgid "Produce assembler debugging messages"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:13
-#, fuzzy
 msgid "Remap debug information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:14
-#, fuzzy
 msgid "Redefine symbols"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:15
 msgid "Require executable stack for this object"
@@ -8885,173 +8137,146 @@ msgid "Skip whitespace and comment preprocessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:21
-#, fuzzy
 msgid "Generate debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:22
-#, fuzzy
 msgid "Generate STABS debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:23
 msgid "Generate STABS debug info with GNU extensions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:24
-#, fuzzy
 msgid "Generate DWARF2 debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:25
 msgid "Generate per-function section names for DWARF line information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:26
-#, fuzzy
 msgid "Set the hash table size close"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
-#, fuzzy
 msgid "Show help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:28
-#, fuzzy
 msgid "Show target specific options"
-msgstr "Edita compleções específicas para um comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:29
-#, fuzzy
 msgid "Add DIR to search list for .include directives"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:30
-#, fuzzy
 msgid "Don't warn about signed overflow"
-msgstr "Only print duplicates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:31
 msgid "Warn when differences altered for long displacements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:32
-#, fuzzy
 msgid "Keep local symbols"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:33
 msgid "Assemble in MRI compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:34
-#, fuzzy
 msgid "Write dependency information in given file"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
-#, fuzzy
 msgid "Do not pad the end of sections to alignment boundaries"
-msgstr "Do not add the default keyrings to the list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:36
-#, fuzzy
 msgid "Set object-file output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:37
-#, fuzzy
 msgid "Fold data section into text section"
-msgstr "Exceção de ponto flutuante"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:38
 msgid "Prefer smaller memory use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:39
-#, fuzzy
 msgid "Print various measured statistics from execution"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:40
-#, fuzzy
 msgid "Strip local absolute symbols"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:41
 msgid "Use same format as native assembler when possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:42
-#, fuzzy
 msgid "Print assembler version number and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:43
 #: /tmp/fish/implicit/share/completions/gunzip.fish:8
 #: /tmp/fish/implicit/share/completions/gzip.fish:8
-#, fuzzy
 msgid "Suppress warnings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:44
-#, fuzzy
 msgid "Don't suppress warnings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:45
-#, fuzzy
 msgid "Treat warnings as errors"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:46
-#, fuzzy
 msgid "Generate object file even after errors"
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:47
-#, fuzzy
 msgid "Read option from given file"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:48
-#, fuzzy
 msgid "Print assembler version number"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:49
 msgid "Don't optimize code alignment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:50
-#, fuzzy
 msgid "Quieten some warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:51
-#, fuzzy
 msgid "Generate 32 bits code"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:52
-#, fuzzy
 msgid "Generate 64 bits code"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:53
-#, fuzzy
 msgid "Generate x32 code"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:54
 msgid "Encode SSE instructions with VEX prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:55
-#, fuzzy
 msgid "Check SSE instructions"
-msgstr "Instrução ilegal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:56
 msgid "Check operand combinations for validity"
@@ -9074,14 +8299,12 @@ msgid "Encode EVEX instructions with specific EVEX.RC"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:61
-#, fuzzy
 msgid "Use specfied mnemonic"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:62
-#, fuzzy
 msgid "Use specfied syntax"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:63
 msgid "Support pseudo index registers"
@@ -9100,19 +8323,16 @@ msgid "Add BND prefix for all valid branches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:67
-#, fuzzy
 msgid "Disable branch optimization for shared code"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:68
-#, fuzzy
 msgid "Strip all lock prefixes"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -9123,23 +8343,20 @@ msgid "Accept only Intel64 ISA"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:73
-#, fuzzy
 msgid "Optimize for given CPU"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:1
-#, fuzzy
 msgid "Checkout package"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:2
 msgid "Show the full history of the target, with file diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:3
-#, fuzzy
 msgid "Put the source files in current directory"
-msgstr "Read files under each directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:4
 msgid "Collect garbage"
@@ -9150,84 +8367,71 @@ msgid "Report approximate disk usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:7
-#, fuzzy
 msgid "List all known packages"
-msgstr "Instalar novo pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:8
 msgid "List the architectures the targets are available for"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:9
-#, fuzzy
 msgid "List locally tracked packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:10
 msgid "List repos the targets exist in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:11
-#, fuzzy
 msgid "Show revision history of the target"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:12
-#, fuzzy
 msgid "Show condensed revision history"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:13
 msgid "Show the target's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:14
-#, fuzzy
 msgid "Update given targets"
-msgstr "Update interval"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:15
-#, fuzzy
 msgid "Remove target from local repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:1
-#, fuzzy
 msgid "Limiting load factor"
-msgstr "Limiting load factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:2
-#, fuzzy
 msgid "Minimum interval in seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:3
 #: /tmp/fish/implicit/share/completions/make.fish:4
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:2
-#, fuzzy
 msgid "Debug mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atd.fish:4
-#, fuzzy
 msgid "Process at queue only once"
-msgstr "Process at queue only once"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/at.fish:2
 #: /tmp/fish/implicit/share/completions/atq.fish:2
-#, fuzzy
 msgid "Use specified queue"
-msgstr "Use specified queue"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/at.fish:3
-#, fuzzy
 msgid "Send mail to user"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/at.fish:4
-#, fuzzy
 msgid "Read job from file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/at.fish:5
 msgid "Alias for atq"
@@ -9239,33 +8443,28 @@ msgstr "Nome alternativo para atrm"
 
 #: /tmp/fish/implicit/share/completions/at.fish:7
 #: /tmp/fish/implicit/share/completions/climate.fish:11
-#, fuzzy
 msgid "Show the time"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/at.fish:8
-#, fuzzy
 msgid "Print the jobs listed"
-msgstr "Print the jobs listed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:1
-#, fuzzy
 msgid "Run in development mode."
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:2
 msgid "Keep the browser process in the foreground."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:3
-#, fuzzy
 msgid "Print usage message."
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:4
-#, fuzzy
 msgid "Log all output to file."
-msgstr "Log input to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:5
 msgid "Open a new window."
@@ -9294,9 +8493,8 @@ msgid "Run the specified specs and exit with error code on failures."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:11
-#, fuzzy
 msgid "Print the version."
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:12
 msgid "Wait for window to be closed before returning."
@@ -9307,34 +8505,28 @@ msgid "Manage file archives of various types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:2
-#, fuzzy
 msgid "list files in archive (als)"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:3
-#, fuzzy
 msgid "extract files from archive (aunpack)"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:4
-#, fuzzy
 msgid "extract archive to specified directory"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:5
-#, fuzzy
 msgid "create archive (apack)"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:6
-#, fuzzy
 msgid "extract file to standard out (acat)"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:7
-#, fuzzy
 msgid "generate a diff between two archives (adiff)"
-msgstr "Create a diff between two versions of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:8
 msgid "repack archives to a different format (arepack)"
@@ -9349,9 +8541,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tee.fish:3
 #: /tmp/fish/implicit/share/completions/tr.fish:5
 #: /tmp/fish/implicit/share/completions/unexpand.fish:5
-#, fuzzy
 msgid "display this help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:10
 #: /tmp/fish/implicit/share/completions/dd.fish:2
@@ -9366,14 +8557,12 @@ msgstr "Display help and exit"
 #: /tmp/fish/implicit/share/completions/tee.fish:4
 #: /tmp/fish/implicit/share/completions/tr.fish:6
 #: /tmp/fish/implicit/share/completions/unexpand.fish:6
-#, fuzzy
 msgid "output version information and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:11
-#, fuzzy
 msgid "execute command above for each file specified"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:12
 msgid "override archive format (see below)"
@@ -9388,66 +8577,56 @@ msgid "always create subdirectory when extracting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:15
-#, fuzzy
 msgid "allow overwriting of local files"
-msgstr "Build new local files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:16
-#, fuzzy
 msgid "decrease verbosity level by one"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:17
-#, fuzzy
 msgid "increase verbosity level by one"
-msgstr "Increment the misc debug level by one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:18
 msgid "specify verbosity (0, 1 or 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:19
-#, fuzzy
 msgid "send output through pager"
-msgstr "Pass the output through “pr”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:20
 msgid "filenames from standard in are null-byte separated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:21
-#, fuzzy
 msgid "explain what is being done by atool"
-msgstr "Explain what is done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:22
 msgid "simulation mode - no filesystem changes are made"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:23
-#, fuzzy
 msgid "override a configuration option (KEY=VALUE)"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atool.fish:24
-#, fuzzy
 msgid "load configuration defaults from file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:1
-#, fuzzy
 msgid "Synchronize AUR packages"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:2
-#, fuzzy
 msgid "Save and restore package state"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:3
-#, fuzzy
 msgid "Package cache actions"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:4
 #: /tmp/fish/implicit/share/completions/pacaur.fish:1
@@ -9456,23 +8635,20 @@ msgstr "Manual sections"
 #: /tmp/fish/implicit/share/completions/pacman.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:1
 #: /tmp/fish/implicit/share/completions/yaourt.fish:4
-#, fuzzy
 msgid "Modify the package database"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:5
 msgid "Pacman log actions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:6
-#, fuzzy
 msgid "Build packages from ABS"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:7
-#, fuzzy
 msgid "Operate on orphan packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:8
 #: /tmp/fish/implicit/share/completions/pacaur.fish:2
@@ -9481,55 +8657,48 @@ msgstr "Update list of packages"
 #: /tmp/fish/implicit/share/completions/pacman.fish:4
 #: /tmp/fish/implicit/share/completions/yaourt.fish:2
 #: /tmp/fish/implicit/share/completions/yaourt.fish:5
-#, fuzzy
 msgid "Query the package database"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:9
 #: /tmp/fish/implicit/share/completions/pacaur.fish:6
 #: /tmp/fish/implicit/share/completions/pacman.fish:5
 #: /tmp/fish/implicit/share/completions/yaourt.fish:6
-#, fuzzy
 msgid "Remove packages from the system"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:10
 #: /tmp/fish/implicit/share/completions/pacaur.fish:7
 #: /tmp/fish/implicit/share/completions/pacman.fish:6
 #: /tmp/fish/implicit/share/completions/yaourt.fish:7
-#, fuzzy
 msgid "Synchronize packages"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:11
 #: /tmp/fish/implicit/share/completions/pacaur.fish:8
 #: /tmp/fish/implicit/share/completions/pacman.fish:7
 #: /tmp/fish/implicit/share/completions/yaourt.fish:8
-#, fuzzy
 msgid "Check dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:12
 #: /tmp/fish/implicit/share/completions/pacaur.fish:9
 #: /tmp/fish/implicit/share/completions/pacman.fish:8
 #: /tmp/fish/implicit/share/completions/yaourt.fish:9
-#, fuzzy
 msgid "Upgrade or add a local package"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:13
 msgid "Show settings while running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:14
-#, fuzzy
 msgid "Do not use powerpill"
-msgstr "Do not use gcc wrapper"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:15
-#, fuzzy
 msgid "Show available languages"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:16
 msgid "View pacman.conf"
@@ -9555,58 +8724,51 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:23
 #: /tmp/fish/implicit/share/completions/pacman.fish:14
 #: /tmp/fish/implicit/share/completions/yaourt.fish:20
-#, fuzzy
 msgid "Output more status messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:22
 #: /tmp/fish/implicit/share/completions/pacaur.fish:24
 #: /tmp/fish/implicit/share/completions/pacman.fish:15
 #: /tmp/fish/implicit/share/completions/yaourt.fish:21
-#, fuzzy
 msgid "Alternate architecture"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:23
 #: /tmp/fish/implicit/share/completions/pacaur.fish:25
 #: /tmp/fish/implicit/share/completions/pacman.fish:16
 #: /tmp/fish/implicit/share/completions/yaourt.fish:22
-#, fuzzy
 msgid "Alternative package cache location"
-msgstr "Auto-gen package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:24
 #: /tmp/fish/implicit/share/completions/pacaur.fish:26
 #: /tmp/fish/implicit/share/completions/pacman.fish:17
 #: /tmp/fish/implicit/share/completions/tmux.fish:12
 #: /tmp/fish/implicit/share/completions/yaourt.fish:23
-#, fuzzy
 msgid "Alternate config file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:25
 #: /tmp/fish/implicit/share/completions/pacaur.fish:27
 #: /tmp/fish/implicit/share/completions/pacman.fish:18
 #: /tmp/fish/implicit/share/completions/yaourt.fish:24
-#, fuzzy
 msgid "Display debug messages"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:26
 #: /tmp/fish/implicit/share/completions/pacaur.fish:28
 #: /tmp/fish/implicit/share/completions/pacman.fish:19
 #: /tmp/fish/implicit/share/completions/yaourt.fish:25
-#, fuzzy
 msgid "GPG directory to verify signatures"
-msgstr "Options for verifying signatures"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:27
 #: /tmp/fish/implicit/share/completions/pacaur.fish:30
 #: /tmp/fish/implicit/share/completions/pacman.fish:21
 #: /tmp/fish/implicit/share/completions/yaourt.fish:27
-#, fuzzy
 msgid "Specify alternative log file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:28
 #: /tmp/fish/implicit/share/completions/pacaur.fish:31
@@ -9619,9 +8781,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:45
 #: /tmp/fish/implicit/share/completions/pacman.fish:23
 #: /tmp/fish/implicit/share/completions/yaourt.fish:37
-#, fuzzy
 msgid "Skip [all] dependency checks"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:30
 #: /tmp/fish/implicit/share/completions/pacaur.fish:46
@@ -9634,9 +8795,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:48
 #: /tmp/fish/implicit/share/completions/pacman.fish:26
 #: /tmp/fish/implicit/share/completions/yaourt.fish:40
-#, fuzzy
 msgid "Do not execute install script"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:33
 #: /tmp/fish/implicit/share/completions/pacaur.fish:49
@@ -9649,9 +8809,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:50
 #: /tmp/fish/implicit/share/completions/pacman.fish:28
 #: /tmp/fish/implicit/share/completions/yaourt.fish:42
-#, fuzzy
 msgid "Specify printf-like format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:35
 #: /tmp/fish/implicit/share/completions/pacaur.fish:51
@@ -9670,9 +8829,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacman.fish:63
 #: /tmp/fish/implicit/share/completions/yaourt.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:92
-#, fuzzy
 msgid "Mark PACKAGE as explicitly installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:37
 #: /tmp/fish/implicit/share/completions/pacaur.fish:53
@@ -9699,9 +8857,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:56
 #: /tmp/fish/implicit/share/completions/pacman.fish:34
 #: /tmp/fish/implicit/share/completions/yaourt.fish:48
-#, fuzzy
 msgid "Do not reinstall up-to-date targets"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:41
 #: /tmp/fish/implicit/share/completions/pacaur.fish:57
@@ -9714,17 +8871,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:58
 #: /tmp/fish/implicit/share/completions/pacman.fish:36
 #: /tmp/fish/implicit/share/completions/yaourt.fish:50
-#, fuzzy
 msgid "Display all packages in GROUP"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:43
 #: /tmp/fish/implicit/share/completions/pacaur.fish:59
 #: /tmp/fish/implicit/share/completions/pacman.fish:37
 #: /tmp/fish/implicit/share/completions/yaourt.fish:51
-#, fuzzy
 msgid "Display information on PACKAGE"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:44
 #: /tmp/fish/implicit/share/completions/aura.fish:53
@@ -9734,31 +8889,27 @@ msgstr "Display change information for the package"
 #: /tmp/fish/implicit/share/completions/pacman.fish:73
 #: /tmp/fish/implicit/share/completions/yaourt.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:102
-#, fuzzy
 msgid "Show less information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:45
 #: /tmp/fish/implicit/share/completions/pacaur.fish:61
 #: /tmp/fish/implicit/share/completions/pacman.fish:39
 #: /tmp/fish/implicit/share/completions/yaourt.fish:53
-#, fuzzy
 msgid "Search packages for regexp"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:46
 msgid "Remove packages only needed during installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:47
-#, fuzzy
 msgid "View package dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:48
-#, fuzzy
 msgid "View package information"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:49
 msgid "Show PKGBUILD diffs"
@@ -9769,63 +8920,52 @@ msgid "View the packages's PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:51
-#, fuzzy
 msgid "Show makepkg output"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:52
-#, fuzzy
 msgid "Build dependencies from ABS"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:54
-#, fuzzy
 msgid "Search AUR by string matching"
-msgstr "Recurse, search file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:55
-#, fuzzy
 msgid "Upgrade all installed AUR packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:56
-#, fuzzy
 msgid "Download the source tarball"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:57
-#, fuzzy
 msgid "Ignore given comma-separated packages"
-msgstr "Ignore non-authenticated packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:58
-#, fuzzy
 msgid "Specify a build location"
-msgstr "Specify debugging options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:59
-#, fuzzy
 msgid "User to build as"
-msgstr "Use <command> to build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:60
 msgid "Run customizepkg before build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:61
-#, fuzzy
 msgid "Include -git/-svn/etc packages"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:62
-#, fuzzy
 msgid "Prompt for PKGBUILD editing"
-msgstr "Prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:63
-#, fuzzy
 msgid "Ignore architecture checking"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:64
 msgid "Sort alphabetically"
@@ -9848,25 +8988,21 @@ msgid "Restores a record kept with -B"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:69
-#, fuzzy
 msgid "Backup to directory"
-msgstr "Target directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:70
-#, fuzzy
 msgid "Save this many versions"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:71
 #: /tmp/fish/implicit/share/completions/aura.fish:73
-#, fuzzy
 msgid "Search via regex"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:72
-#, fuzzy
 msgid "Show package history"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:74
 msgid "Search ABS by regex"
@@ -9886,14 +9022,12 @@ msgid "Download fresh copy of the package list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:77
-#, fuzzy
 msgid "Sync the given to local ABS tree"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:79
-#, fuzzy
 msgid "Uninstall orphan packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:80
 #: /tmp/fish/implicit/share/completions/pacaur.fish:62
@@ -9906,17 +9040,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:63
 #: /tmp/fish/implicit/share/completions/pacman.fish:41
 #: /tmp/fish/implicit/share/completions/yaourt.fish:60
-#, fuzzy
 msgid "List only non-explicit packages (dependencies)"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:82
 #: /tmp/fish/implicit/share/completions/pacaur.fish:64
 #: /tmp/fish/implicit/share/completions/pacman.fish:42
 #: /tmp/fish/implicit/share/completions/yaourt.fish:61
-#, fuzzy
 msgid "List only explicitly installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:83
 #: /tmp/fish/implicit/share/completions/pacaur.fish:65
@@ -9929,25 +9061,22 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:66
 #: /tmp/fish/implicit/share/completions/pacman.fish:44
 #: /tmp/fish/implicit/share/completions/yaourt.fish:63
-#, fuzzy
 msgid "List all files owned by PACKAGE"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:85
 #: /tmp/fish/implicit/share/completions/pacaur.fish:67
 #: /tmp/fish/implicit/share/completions/pacman.fish:45
 #: /tmp/fish/implicit/share/completions/yaourt.fish:64
-#, fuzzy
 msgid "List all packages not in the database"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:86
 #: /tmp/fish/implicit/share/completions/pacaur.fish:68
 #: /tmp/fish/implicit/share/completions/pacman.fish:46
 #: /tmp/fish/implicit/share/completions/yaourt.fish:65
-#, fuzzy
 msgid "Search for the package that owns FILE"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:87
 #: /tmp/fish/implicit/share/completions/pacaur.fish:69
@@ -9960,33 +9089,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:70
 #: /tmp/fish/implicit/share/completions/pacman.fish:48
 #: /tmp/fish/implicit/share/completions/yaourt.fish:67
-#, fuzzy
 msgid "List only unrequired packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:71
 #: /tmp/fish/implicit/share/completions/pacman.fish:49
 #: /tmp/fish/implicit/share/completions/yaourt.fish:68
-#, fuzzy
 msgid "List only out-of-date packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:91
 #: /tmp/fish/implicit/share/completions/pacaur.fish:73
 #: /tmp/fish/implicit/share/completions/pacman.fish:51
 #: /tmp/fish/implicit/share/completions/yaourt.fish:72
-#, fuzzy
 msgid "Also remove packages depending on PACKAGE"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:92
 #: /tmp/fish/implicit/share/completions/pacaur.fish:74
 #: /tmp/fish/implicit/share/completions/pacman.fish:52
 #: /tmp/fish/implicit/share/completions/yaourt.fish:73
-#, fuzzy
 msgid "Ignore file backup designations"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:93
 #: /tmp/fish/implicit/share/completions/pacaur.fish:75
@@ -10006,33 +9131,29 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:78
 #: /tmp/fish/implicit/share/completions/pacman.fish:56
 #: /tmp/fish/implicit/share/completions/yaourt.fish:77
-#, fuzzy
 msgid "Remove [all] packages from cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:97
 #: /tmp/fish/implicit/share/completions/pacaur.fish:79
 #: /tmp/fish/implicit/share/completions/pacman.fish:57
 #: /tmp/fish/implicit/share/completions/yaourt.fish:78
-#, fuzzy
 msgid "List all packages in REPOSITORY"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:98
 #: /tmp/fish/implicit/share/completions/pacaur.fish:80
 #: /tmp/fish/implicit/share/completions/pacman.fish:58
 #: /tmp/fish/implicit/share/completions/yaourt.fish:79
-#, fuzzy
 msgid "Upgrade all packages that are out of date"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:99
 #: /tmp/fish/implicit/share/completions/pacaur.fish:82
 #: /tmp/fish/implicit/share/completions/pacman.fish:60
 #: /tmp/fish/implicit/share/completions/yaourt.fish:81
-#, fuzzy
 msgid "Only download the target packages"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:101
 #: /tmp/fish/implicit/share/completions/aura.fish:102
@@ -10042,9 +9163,8 @@ msgstr "Disable downloading packages"
 #: /tmp/fish/implicit/share/completions/pacman.fish:76
 #: /tmp/fish/implicit/share/completions/yaourt.fish:104
 #: /tmp/fish/implicit/share/completions/yaourt.fish:105
-#, fuzzy
 msgid "Package file"
-msgstr "Pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/awk.fish:1
 msgid ""
@@ -10083,9 +9203,8 @@ msgid "Input_file Read a list of already existing known bad blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:5
-#, fuzzy
 msgid "Output_file Write the list of bad blocks to the specified file"
-msgstr "Define a lista de preferências padrão como a string especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/badblocks.fish:6
 msgid ""
@@ -10129,9 +9248,8 @@ msgid "Wrap encoded line after given number of caracters (default 76)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:1
-#, fuzzy
 msgid "Force interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:2
 msgid "Define math library"
@@ -10158,33 +9276,28 @@ msgid "Seems mode: goes back to the first directory containing string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bd.fish:3
-#, fuzzy
 msgid "Case insensitive move (implies seems mode)"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:1
 msgid "Show unavailable key bindings/erase all bindings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:2
-#, fuzzy
 msgid "Erase mode"
-msgstr "Modo detalhado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:3
-#, fuzzy
 msgid "Print names of available functions"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:5
-#, fuzzy
 msgid "Specify key name, not sequence"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:6
-#, fuzzy
 msgid "Print names of available keys"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:7
 msgid "Add to named bind mode"
@@ -10195,15 +9308,13 @@ msgid "Change current bind mode to named mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:9
-#, fuzzy
 msgid "Key name"
-msgstr "nome"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bind.fish:10
 #: /tmp/fish/implicit/share/completions/commandline.fish:17
-#, fuzzy
 msgid "Function name"
-msgstr "Function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:1
 msgid "Specify a prefix to use for all bison output file names"
@@ -10243,9 +9354,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:9
-#, fuzzy
 msgid "Specify the name outfile for the parser file"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:10
 msgid ""
@@ -10266,9 +9376,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:13
-#, fuzzy
 msgid "Print the version number of bison and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bison.fish:14
 msgid "Print a summary of the options to bison and exit"
@@ -10291,28 +9400,24 @@ msgid "Create a global (manually erased) event block"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:1
-#, fuzzy
 msgid "Check formula"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:2
-#, fuzzy
 msgid "Create a binary package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:3
-#, fuzzy
 msgid "Output developer debug information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:4
 msgid "Do not bump the bottle revision number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:5
-#, fuzzy
 msgid "Write bottle block to a Ruby source file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:6
 msgid "Write bottle block to formula file"
@@ -10323,14 +9428,12 @@ msgid "Merge multiple bottle outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:8
-#, fuzzy
 msgid "Display formula"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:9
-#, fuzzy
 msgid "Remove old installed versions"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:10
 msgid "Remove out-of-date keg-only brews as well"
@@ -10342,9 +9445,8 @@ msgid "Show what files would be removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:13
-#, fuzzy
 msgid "Scrub the cache"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:14
 msgid "Create new formula from URL"
@@ -10359,14 +9461,12 @@ msgid "Use template for Autotools-style build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:17
-#, fuzzy
 msgid "Don't download URL"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:18
-#, fuzzy
 msgid "Override name autodetection"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:19
 msgid "Override version autodetection"
@@ -10377,24 +9477,20 @@ msgid "Summarize specified formulae in one line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:21
-#, fuzzy
 msgid "Search names and descriptions"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:22
-#, fuzzy
 msgid "Search only names"
-msgstr "Search in all man pages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:23
-#, fuzzy
 msgid "Search only descriptions"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:24
-#, fuzzy
 msgid "Show a formula's dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:25
 msgid "Show only 1 level down"
@@ -10405,33 +9501,28 @@ msgid "Show in topological order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:27
-#, fuzzy
 msgid "Show dependencies as tree"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:28
-#, fuzzy
 msgid "Show dependencies for all formulae"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:29
-#, fuzzy
 msgid "Show dependencies for installed formulae"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:30
 msgid "Determine installation prefix for non-brew software"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:31
-#, fuzzy
 msgid "Set name of package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:32
-#, fuzzy
 msgid "Set version of package"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:33
 msgid "Check your system for problems"
@@ -10442,9 +9533,8 @@ msgid "Open brew/formula for editing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:35
-#, fuzzy
 msgid "Download source for formula"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:36
 msgid "Remove a previously cached version and re-fetch"
@@ -10455,48 +9545,42 @@ msgid "Download the HEAD version from a VCS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:38
-#, fuzzy
 msgid "Also download dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:39
 msgid "Make HEAD checkout verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:40
-#, fuzzy
 msgid "Fetch source package instead of bottle"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:42
 msgid "Open brew/formula's homepage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:43
-#, fuzzy
 msgid "Display information about formula"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:44
-#, fuzzy
 msgid "Display info for all formulae"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:45
 msgid "Open the GitHub History page for formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:46
-#, fuzzy
 msgid "Install formula"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:47
 #: /tmp/fish/implicit/share/completions/prt-get.fish:35
 #: /tmp/fish/implicit/share/completions/prt-get.fish:94
-#, fuzzy
 msgid "Force install"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:48
 msgid "If install fails, open shell in temp directory"
@@ -10507,9 +9591,8 @@ msgid "skip installing any dependencies of any kind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:50
-#, fuzzy
 msgid "Attempt to compile using the specified compiler"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:51
 msgid "Compile from source even if a bottle is provided"
@@ -10528,18 +9611,16 @@ msgid "Download and patch formula, then open a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:55
-#, fuzzy
 msgid "Force the specified build environment"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:56
 msgid "Optimize for a generic CPU architecture"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:57
-#, fuzzy
 msgid "Optimize for the specified CPU architecture"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:58
 msgid "Symlink installed formula"
@@ -10547,9 +9628,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:59
 #: /tmp/fish/implicit/share/completions/brew.fish:60
-#, fuzzy
 msgid "Overwrite existing files"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:61
 #: /tmp/fish/implicit/share/completions/brew.fish:62
@@ -10570,9 +9650,8 @@ msgid "Link .app bundles into ~/Applications instead"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:67
-#, fuzzy
 msgid "List all installed formula"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:68
 #: /tmp/fish/implicit/share/completions/brew.fish:71
@@ -10581,9 +9660,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:69
 #: /tmp/fish/implicit/share/completions/brew.fish:72
-#, fuzzy
 msgid "Show the version number"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:70
 #: /tmp/fish/implicit/share/completions/brew.fish:73
@@ -10591,9 +9669,8 @@ msgid "Show the versions of pinned formulae"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:74
-#, fuzzy
 msgid "Show log for formula"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:75
 #: /tmp/fish/implicit/share/completions/brew.fish:77
@@ -10605,9 +9682,8 @@ msgid "formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:76
-#, fuzzy
 msgid "Check formula for missing dependencies"
-msgstr "Ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:78
 msgid "Display install options for formula"
@@ -10622,33 +9698,28 @@ msgid "Show options for all formulae"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:81
-#, fuzzy
 msgid "Show options for all installed formulae"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:83
 msgid "Show formula that have updated versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:84
-#, fuzzy
 msgid "Display only names"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:85
-#, fuzzy
 msgid "Pin the specified formulae to their current versions"
-msgstr "Adiciona o arquivo especificado à lista atual de chaveiros"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:87
-#, fuzzy
 msgid "Remove dead symlinks"
-msgstr "Remove source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:88
-#, fuzzy
 msgid "Search for formula by name"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:89
 #: /tmp/fish/implicit/share/completions/brew.fish:91
@@ -10677,14 +9748,12 @@ msgid "Gracefully restart a service"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:97
-#, fuzzy
 msgid "Start a service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:98
-#, fuzzy
 msgid "Stop a service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:100
 msgid "All Services"
@@ -10695,9 +9764,8 @@ msgid "Instantiate a Homebrew build enviornment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:102
-#, fuzzy
 msgid "Use stdenv instead of superenv"
-msgstr "Use purge instead of remove"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:103
 msgid "Tap a new formula repository on GitHub"
@@ -10712,16 +9780,14 @@ msgid "Run tests for formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:107
-#, fuzzy
 msgid "Uninstall formula"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:108
 #: /tmp/fish/implicit/share/completions/brew.fish:109
 #: /tmp/fish/implicit/share/completions/brew.fish:110
-#, fuzzy
 msgid "Delete all installed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:111
 msgid "Unlink formula"
@@ -10736,19 +9802,16 @@ msgid "Remove links from ~/Applications created by brew linkapps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:114
-#, fuzzy
 msgid "Extract source code"
-msgstr "Specify record type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:115
-#, fuzzy
 msgid "Unpin specified formulae"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:116
-#, fuzzy
 msgid "Remove a tapped repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:117
 msgid "Fetch newest version of Homebrew and formulas"
@@ -10759,28 +9822,24 @@ msgid "Use git pull --rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:119
-#, fuzzy
 msgid "Upgrade outdated brews"
-msgstr "Upgrade source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:120
 msgid "Show formulas that depend on specified formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:121
-#, fuzzy
 msgid "List only installed formulae"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:122
-#, fuzzy
 msgid "Resolve more than one level of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:123
-#, fuzzy
 msgid "Print version number of brew"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:124
 msgid "Show Homebrew a summary of the build environment"
@@ -10791,75 +9850,64 @@ msgid "Display where Homebrew's .git directory is located"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:126
-#, fuzzy
 msgid "Show Homebrew and system configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:127
-#, fuzzy
 msgid "Display Homebrew's install path"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:128
-#, fuzzy
 msgid "Display formula's install path"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:129
-#, fuzzy
 msgid "Display Homebrew's download cache"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:130
 msgid "Display the file or directory used to cache formula"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:131
-#, fuzzy
 msgid "Display Homebrew's Cellar path"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:132
 msgid "Display formula's install path in Cellar"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/builtin.fish:2
-#, fuzzy
 msgid "Print names of all existing builtins"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:1
-#, fuzzy
 msgid "Test if bundle has been given no subcommand"
-msgstr "Test if aptitude has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:2
-#, fuzzy
 msgid "Test if bundle has been given a specific subcommand"
-msgstr "Test if aptitude has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:3
 msgid "Specify the number of times you wish to attempt network commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:4
-#, fuzzy
 msgid "Disable colorization in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:5
 msgid "Enable verbose output mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:6
-#, fuzzy
 msgid "Display a help page"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:7
-#, fuzzy
 msgid "Prints version information"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:8
 #: /tmp/fish/implicit/share/completions/bundle.fish:40
@@ -10868,19 +9916,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:9
 #: /tmp/fish/implicit/share/completions/bundle.fish:57
-#, fuzzy
 msgid "The location of the Gemfile bundler should use"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:10
-#, fuzzy
 msgid "The location to install the gems in the bundle to"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:11
-#, fuzzy
 msgid "Installs the gems in the bundle to the system location"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:12
 msgid "A space-separated list of groups to skip installing"
@@ -10921,14 +9966,12 @@ msgid "Do not update the cache in vendor/cache with the newly bundled gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:21
-#, fuzzy
 msgid "Do not print progress information to stdout"
-msgstr "Don't print group information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:22
-#, fuzzy
 msgid "Run bundle clean automatically after install"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:23
 #: /tmp/fish/implicit/share/completions/bundle.fish:30
@@ -10937,9 +9980,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:24
 #: /tmp/fish/implicit/share/completions/bundle.fish:89
-#, fuzzy
 msgid "Do not remove stale gems from the cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:25
 msgid "Do not allow the Gemfile.lock to be updated after this install"
@@ -10947,9 +9989,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:26
 #: /tmp/fish/implicit/share/completions/bundle.fish:41
-#, fuzzy
 msgid "Update dependencies to their latest versions"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:27
 msgid "The name of a :git or :path source used in the Gemfile"
@@ -10964,14 +10005,12 @@ msgid "Only output warnings and errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:31
-#, fuzzy
 msgid "Specify the number of jobs to run in parallel"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:32
-#, fuzzy
 msgid "Update a specific group"
-msgstr "Use a specified tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:33
 msgid ""
@@ -10980,14 +10019,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:34
-#, fuzzy
 msgid "Install the binstubs of the listed gem"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:35
-#, fuzzy
 msgid "Binstub destination directory (default bin)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:36
 msgid "Overwrite existing binstubs if they exist"
@@ -11007,28 +10044,24 @@ msgid "Describe available tasks or one specific task"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:42
-#, fuzzy
 msgid "Package .gem files into the vendor/cache directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:44
-#, fuzzy
 msgid "Specify and read configuration options for bundler"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:45
 msgid "Check bundler requirements for your application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:46
-#, fuzzy
 msgid "Show all of the gems in the current bundle"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:47
-#, fuzzy
 msgid "Show the source location of a particular gem in the bundle"
-msgstr "Show the process id of each process in the job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:48
 #: /tmp/fish/implicit/share/completions/bundle.fish:64
@@ -11046,9 +10079,8 @@ msgid "Generate a visual representation of your dependencies"
 msgstr "Gerar uma representação visual de suas dependências"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:52
-#, fuzzy
 msgid "Generate a simple Gemfile"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:53
 #: /tmp/fish/implicit/share/completions/bundle.fish:78
@@ -11057,9 +10089,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:54
 #: /tmp/fish/implicit/share/completions/bundle.fish:83
-#, fuzzy
 msgid "Displays platform compatibility information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:55
 #: /tmp/fish/implicit/share/completions/bundle.fish:85
@@ -11077,9 +10108,8 @@ msgid "Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:59
-#, fuzzy
 msgid "Lock the Gemfile"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:60
 #: /tmp/fish/implicit/share/completions/bundle.fish:62
@@ -11094,9 +10124,8 @@ msgid "List the paths of all gems required by your Gemfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:65
-#, fuzzy
 msgid "Check for newer pre-release gems"
-msgstr "Check for memory leaks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:66
 msgid "Check against a specific source"
@@ -11115,9 +10144,8 @@ msgid "The name to use for the generated file (see format option)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:73
-#, fuzzy
 msgid "Show each gem version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:74
 msgid "Show the version of each required dependency"
@@ -11128,9 +10156,8 @@ msgid "Output a specific format (png, jpg, svg, dot, …)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:76
-#, fuzzy
 msgid "Generate a simple Gemfile, placed in the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:77
 msgid "Use a specified .gemspec to create the Gemfile"
@@ -11145,18 +10172,16 @@ msgid "Generate a test directory for your library (rspec or minitest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:81
-#, fuzzy
 msgid "Path to your editor"
-msgstr "Set source directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:82
 msgid "Generate the boilerplate for C extension code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:84
-#, fuzzy
 msgid "Only display Ruby directive information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:86
 msgid "Only print out changes, do not actually clean gems"
@@ -11175,14 +10200,12 @@ msgid "Include all sources (including path and git)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:91
-#, fuzzy
 msgid "Prints the license of all gems in the bundle"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:92
-#, fuzzy
 msgid "Print information about the environment Bundler is running under"
-msgstr "Output extra information about the work being done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:1
 msgid "Decompress to stdout"
@@ -11198,9 +10221,8 @@ msgstr "Overwrite"
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:3
 #: /tmp/fish/implicit/share/completions/bzip2.fish:5
-#, fuzzy
 msgid "Do not overwrite"
-msgstr "Don't overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:4
 #: /tmp/fish/implicit/share/completions/bzcat.fish:1
@@ -11222,9 +10244,8 @@ msgid "Print license"
 msgstr "Print license"
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
-#, fuzzy
 msgid "Suppress message payload display"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:2
 msgid "Show a flat list instead of a tree"
@@ -11235,9 +10256,8 @@ msgid "Activate the peer if necessary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:4
-#, fuzzy
 msgid "Only show unique (:X.Y) names"
-msgstr "Only print unique lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:5
 msgid "Only show well-known names"
@@ -11254,9 +10274,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bzip2.fish:1
 #: /tmp/fish/implicit/share/completions/gunzip.fish:1
 #: /tmp/fish/implicit/share/completions/gzip.fish:1
-#, fuzzy
 msgid "Compress to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzip2.fish:2
 msgid "Compress file"
@@ -11281,28 +10300,24 @@ msgid "Large block size"
 msgstr "Large block size"
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:2
-#, fuzzy
 msgid "List all help topics"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:3
-#, fuzzy
 msgid "List all commands"
-msgstr "Disable this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:4
-#, fuzzy
 msgid "Help about supported formats"
-msgstr "Formato separado por vírgula"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:5
 msgid "Help about current supported formats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:6
-#, fuzzy
 msgid "How to specify revisions in bzr"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:7
 msgid "Show bug tracker settings in bzr"
@@ -11325,14 +10340,12 @@ msgid "Never change revnos or the existing log. Append revisions to it only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:12
-#, fuzzy
 msgid "Make a copy of another branch"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:13
-#, fuzzy
 msgid "Proceed even if directory exits"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:14
 msgid "Create a stacked branch referring to the source branch"
@@ -11347,9 +10360,8 @@ msgid "Switch the checkout in the current directory to the new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:17
-#, fuzzy
 msgid "Hard-link working tree files where possible"
-msgstr "Bring work tree in sync with repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:18
 msgid "Bind new branch to from location"
@@ -11360,33 +10372,28 @@ msgid "Create a branch without a working-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:20
-#, fuzzy
 msgid "Make files or directories versioned"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:21
-#, fuzzy
 msgid "Don't recursively add the contents of directories"
-msgstr "Don't add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:22
-#, fuzzy
 msgid "Ignore a file or pattern"
-msgstr "Ignorar todos os espaços em branco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:23
 msgid "Display the default ignore rules that bzr uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:24
-#, fuzzy
 msgid "Move or rename a versioned file"
-msgstr "Do not create file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:25
-#, fuzzy
 msgid "Automatically guess renames"
-msgstr "Automatic yes to prompts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:26
 msgid ""
@@ -11395,41 +10402,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:27
-#, fuzzy
 msgid "Summarize changes in working copy"
-msgstr "Recursively clean up the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:28
 msgid "Use short status indicators"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:29
-#, fuzzy
 msgid "Only show versioned files"
-msgstr "Armazenar apenas arquivos novos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:30
-#, fuzzy
 msgid "Don't show pending merges"
-msgstr "Don't strip leading /"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:31
 msgid "Do not mark object type using indicator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:32
-#, fuzzy
 msgid "Show internal object ids"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:33
 msgid "Show detailed diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:34
-#, fuzzy
 msgid "Pull in changes from another branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:35
 msgid ""
@@ -11438,9 +10440,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:36
-#, fuzzy
 msgid "Remember the specified location as a default"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:37
 msgid "Merge even if the destination tree has uncommitted changes"
@@ -11456,35 +10457,30 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:40
-#, fuzzy
 msgid "Show base revision text in conflicts"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:41
 msgid "Instead of merging, show a diff of the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:42
-#, fuzzy
 msgid "Select changes interactively"
-msgstr "Select interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:43
-#, fuzzy
 msgid ""
 "Branch to merge into, rather than the one containing the working directory"
-msgstr "Record an inverse patch without changing the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:44
 #: /tmp/fish/implicit/share/completions/bzr.fish:45
-#, fuzzy
 msgid "Select changes introduced by the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:46
-#, fuzzy
 msgid "Save some or all changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:47
 msgid ""
@@ -11493,18 +10489,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:48
-#, fuzzy
 msgid "Take commit message from this file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:49
 msgid "Do not consider changes made to a given path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:50
-#, fuzzy
 msgid "Description of the new revision"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:51
 msgid "Set the author's name, if it's different from the commiter"
@@ -11523,9 +10517,8 @@ msgid "Mark a bug as being fixed by this revision"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:55
-#, fuzzy
 msgid "Refuse to commit if there are unknown files in the working tree"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:56
 msgid ""
@@ -11556,14 +10549,12 @@ msgid "Mail the request to this address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:62
-#, fuzzy
 msgid "Use the specified output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:63
-#, fuzzy
 msgid "Do not include a bundle in the merge directive"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:64
 msgid ""
@@ -11576,50 +10567,41 @@ msgid "Do not include a preview patch in the merge directive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:66
-#, fuzzy
 msgid "Show history of changes"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:67
-#, fuzzy
 msgid "Validate storage"
-msgstr "Validate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:68
-#, fuzzy
 msgid "Check the working tree related to the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:69
-#, fuzzy
 msgid "Check the repository related to the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:70
-#, fuzzy
 msgid "Check the branch related to the current directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:71
-#, fuzzy
 msgid "Show usage message and options"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:382
-#, fuzzy
 msgid "Show help message"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:73
-#, fuzzy
 msgid "Only displays errors and warnings"
-msgstr "Downgrade some errors to warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:74
-#, fuzzy
 msgid "Display more information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:75
 msgid "Show what would be done"
@@ -11684,18 +10666,16 @@ msgstr ""
 # proc.cpp:1279
 # proc.cpp:1305
 #: /tmp/fish/implicit/share/completions/caddy.fish:14
-#, fuzzy
 msgid "Process log file"
-msgstr "Ponteiro de lista de processo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:15
 msgid "Path to write pid file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:16
-#, fuzzy
 msgid "List installed plugins"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:17
 msgid "Default port"
@@ -11714,14 +10694,12 @@ msgid "Hostname for which to revoke the certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:21
-#, fuzzy
 msgid "Root path of default site"
-msgstr "Don't set default repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:22
-#, fuzzy
 msgid "Type of server to run"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caddy.fish:23
 msgid "Parse the Caddyfile but do not start the server"
@@ -11736,9 +10714,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/modinfo.fish:10
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:128
-#, fuzzy
 msgid "Show version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:1
 msgid "Create an assertion to prevent the display from sleeping"
@@ -11761,9 +10738,8 @@ msgid "Create an assertion to declare that user is active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:6
-#, fuzzy
 msgid "Specifies the timeout value in seconds"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/caffeinate.fish:7
 msgid "Waits for the process with the specified PID to exit"
@@ -11774,29 +10750,24 @@ msgid "Cancel jobs owned by username"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:1
-#, fuzzy
 msgid "Show Help"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:3
-#, fuzzy
 msgid "Update before running"
-msgstr "Update source and rebuild"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:4
-#, fuzzy
 msgid "List feeds"
-msgstr "Lista as chaves"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:5
-#, fuzzy
 msgid "Show number of new items"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:6
-#, fuzzy
 msgid "Show number of new items for feed"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:7
 msgid "Feed"
@@ -11815,63 +10786,52 @@ msgid "Add feed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:11
-#, fuzzy
 msgid "Set configuration directory"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:12
 #: /tmp/fish/implicit/share/completions/pine.fish:10
-#, fuzzy
 msgid "Set configuration file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:13
-#, fuzzy
 msgid "Set client log file"
-msgstr "Set tag file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:14
-#, fuzzy
 msgid "Set feed directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:15
-#, fuzzy
 msgid "Set script directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:1
 #: /tmp/fish/implicit/share/completions/light.fish:2
 #: /tmp/fish/implicit/share/completions/rustc.fish:1
-#, fuzzy
 msgid "Print version info and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:2
-#, fuzzy
 msgid "List installed commands"
-msgstr "Disable this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:3
 #: /tmp/fish/implicit/share/completions/rustc.fish:2
-#, fuzzy
 msgid "Use verbose output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:4
-#, fuzzy
 msgid "No output printed to stdout"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:5
-#, fuzzy
 msgid "Don't build documentation for dependencies"
-msgstr "Don't automatically fulfill dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:6
-#, fuzzy
 msgid "Specify a vcs to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:7
 msgid "Opens the docs in a browser after the operation"
@@ -11886,9 +10846,8 @@ msgid "Login of a user to remove as an owner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:10
-#, fuzzy
 msgid "Don't verify the contents by building them"
-msgstr "Don't verify time attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:11
 msgid "Ignore warnings about a lack of human-usable metadata"
@@ -11927,9 +10886,8 @@ msgid "Path or URL to SRT or VTT file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:5
-#, fuzzy
 msgid "Set subtitles font scale"
-msgstr "Subtitle file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:6
 msgid "Set subtitles font RGBA color"
@@ -11940,15 +10898,13 @@ msgid "Specify port to be used for serving subtitles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:8
-#, fuzzy
 msgid "Set local IP"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:9
 #: /tmp/fish/implicit/share/completions/pv.fish:12
-#, fuzzy
 msgid "No output"
-msgstr "Saída de vídeo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:10
 msgid "Explicitly set the mime-type"
@@ -11972,37 +10928,32 @@ msgid "Play in random order"
 msgstr "Play in random order"
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:15
-#, fuzzy
 msgid "List all files in directories recursively"
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:16
-#, fuzzy
 msgid "Set at which the volume changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:17
 msgid "Specify port to be used for serving local file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:18
-#, fuzzy
 msgid "Specify port to be used for serving transcoded file"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:19
-#, fuzzy
 msgid "Specify port to be used for serving torrented file"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:20
 msgid "Specify port to be used for serving file read from stdin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:21
-#, fuzzy
 msgid "Execute key command(s)"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/castnow.fish:22
 msgid "Exit when playback begins or --command completes"
@@ -12064,9 +11015,8 @@ msgid "Set TAO (Track At Once) writing mode"
 msgstr "Set TAO (Track At Once) writing mode"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:14
-#, fuzzy
 msgid "Set RAW writing mode"
-msgstr "Set TAO (Track At Once) writing mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:15
 msgid "Select Set RAW writing, the preferred raw writing mode"
@@ -12119,9 +11069,8 @@ msgstr ""
 "the SCSI driver"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:25
-#, fuzzy
 msgid "Load the media and exit"
-msgstr "Load the media, lock the door and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:26
 msgid "Load the media, lock the door and exit"
@@ -12168,9 +11117,8 @@ msgid "Allows the user to manually select a driver for the device"
 msgstr "Allows the user to manually select a driver for the device"
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-#, fuzzy
 msgid "Set driver specific options"
-msgstr "Edita compleções específicas para um comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
 msgid ""
@@ -12399,9 +11347,8 @@ msgstr "Output diagnostic for changed files"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:2
 #: /tmp/fish/implicit/share/completions/chown.fish:2
-#, fuzzy
 msgid "Dereference symbolic links"
-msgstr "Dereferense symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:3
 #: /tmp/fish/implicit/share/completions/chown.fish:3
@@ -12415,9 +11362,8 @@ msgstr "Change from owner/group"
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:5
 #: /tmp/fish/implicit/share/completions/chown.fish:5
-#, fuzzy
 msgid "Suppress errors"
-msgstr "Supress errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chgrp.fish:6
 #: /tmp/fish/implicit/share/completions/chown.fish:6
@@ -12444,29 +11390,25 @@ msgid "Do not treat / specially (the default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:3
-#, fuzzy
 msgid "Fail to operate recursively on /"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:4
 #: /tmp/fish/implicit/share/completions/readlink.fish:5
-#, fuzzy
 msgid "Suppress most error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:5
-#, fuzzy
 msgid "Output a diagnostic for every file processed"
-msgstr "Output diagnostic for every file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:6
 msgid "Use RFILEs mode instead of MODE values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chmod.fish:7
-#, fuzzy
 msgid "Change files and directories recursively"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chown.fish:11
 #: /tmp/fish/implicit/share/completions/chown.fish:12
@@ -12475,34 +11417,28 @@ msgid "Username"
 msgstr "Nome do usuário"
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
-#, fuzzy
 msgid "Specify your login shell"
-msgstr "Specify email address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:2
-#, fuzzy
 msgid "Display help and exit\t"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:4
-#, fuzzy
 msgid "List available shells and exit"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:2
-#, fuzzy
 msgid "Update your climate install"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:3
-#, fuzzy
 msgid "uninstall climate"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:4
-#, fuzzy
 msgid "Show climate version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:5
 msgid "Get the weather"
@@ -12510,23 +11446,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:6
 #: /tmp/fish/implicit/share/completions/climate.fish:7
-#, fuzzy
 msgid "Display remaining battery"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:8
 msgid "Lock computer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:9
-#, fuzzy
 msgid "Shutdown the computer"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:10
-#, fuzzy
 msgid "Restart the computer"
-msgstr "Set start chapter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:12
 msgid "Put a console clock in the top right corner"
@@ -12541,68 +11474,56 @@ msgid "A stopwatch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:15
-#, fuzzy
 msgid "Pipe output to ix.io"
-msgstr "Acrescentar saída a arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:16
-#, fuzzy
 msgid "Find the biggest files recursively"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:17
-#, fuzzy
 msgid "Find the biggest directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:18
-#, fuzzy
 msgid "Find directory size"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:19
-#, fuzzy
 msgid "Remove empty directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:20
-#, fuzzy
 msgid "Extract any given archive"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:21
-#, fuzzy
 msgid "Report duplicate files in a directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:22
-#, fuzzy
 msgid "Count the number of occurences"
-msgstr "Print number of occurences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:23
-#, fuzzy
 msgid "Monitor file for changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:24
-#, fuzzy
 msgid "Search for the given pattern recursively"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:25
-#, fuzzy
 msgid "Replace all occurences"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:26
 msgid "Create a ramfs of size (in MB) at path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:27
-#, fuzzy
 msgid "Test your network speed"
-msgstr "Tags you want to see"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:28
 msgid "Retrieve your local ip address"
@@ -12617,52 +11538,44 @@ msgid "Retrieve your public ip address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:31
-#, fuzzy
 msgid "List open ports"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:32
-#, fuzzy
 msgid "Edit the hosts file"
-msgstr "Escreve para o arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:33
-#, fuzzy
 msgid "http-server serving the current directory"
-msgstr "Read files under each directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:34
 msgid "Determine if server is up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:35
-#, fuzzy
 msgid "Download file from server"
-msgstr "Edit files in place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:36
-#, fuzzy
 msgid "Download dir from server"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:37
-#, fuzzy
 msgid "Upload to server"
-msgstr "Utilizar servidor proxy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:38
-#, fuzzy
 msgid "Mount a remote path"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:39
 msgid "Unmount a ssh mount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:40
-#, fuzzy
 msgid "Undo the latest commit"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:41
 msgid "Reset local repo to match remote"
@@ -12673,28 +11586,24 @@ msgid "Seset local repo to match remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:43
-#, fuzzy
 msgid "List all branches"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:44
-#, fuzzy
 msgid "Calculate the repo size"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:45
 msgid "Calculate total contribution for a user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:46
-#, fuzzy
 msgid "Display a performance overview"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:47
-#, fuzzy
 msgid "Find memory used"
-msgstr "Reduce memory usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:48
 msgid "Find disk used"
@@ -12709,18 +11618,16 @@ msgid "Find the trash size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:51
-#, fuzzy
 msgid "Empty the trash"
-msgstr "Sai do shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:1
 msgid "Combine sets of lines from two files using boolean operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:2
-#, fuzzy
 msgid "Output lines that are in both files"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:3
 msgid "Output lines that are inf file1 but not in file2"
@@ -12735,9 +11642,8 @@ msgid "Output lines that are in either file1 or file2, but not in both files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:6
-#, fuzzy
 msgid "Read file from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/command.fish:2
 msgid "Print the file that would be executed"
@@ -12788,23 +11694,20 @@ msgid "Inject readline functions to reader"
 msgstr "Inject readline functions to reader"
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:11
-#, fuzzy
 msgid "Print each token on a separate line"
-msgstr "Print length of longest line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:12
-#, fuzzy
 msgid "Specify command to operate on"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:13
 msgid "Set/get cursor position, not buffer contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:14
-#, fuzzy
 msgid "Print the line that the cursor is on"
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:15
 msgid "Return true if performing a history search"
@@ -12863,9 +11766,8 @@ msgid "Measure differences between images with this metric [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:23
-#, fuzzy
 msgid "Get the passphrase from this file [filename]"
-msgstr "Lê senha a partir do descritor de arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:24
 #: /tmp/fish/implicit/share/completions/display.fish:32
@@ -12884,9 +11786,8 @@ msgid "JPEG/MIFF/PNG compression level [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:34
-#, fuzzy
 msgid "Search for subimage"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:36
 #: /tmp/fish/implicit/share/completions/composite.fish:74
@@ -12904,9 +11805,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/scanimage.fish:34
 #: /tmp/fish/implicit/share/completions/stream.fish:33
 #: /tmp/fish/implicit/share/completions/terraform.fish:1
-#, fuzzy
 msgid "Print version information"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/compare.fish:44
 #: /tmp/fish/implicit/share/completions/composite.fish:39
@@ -12925,14 +11825,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:73
 #: /tmp/fish/implicit/share/completions/montage.fish:59
 #: /tmp/fish/implicit/share/completions/stream.fish:25
-#, fuzzy
 msgid "Declare the image as modified"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:1
-#, fuzzy
 msgid "Command to add completion to"
-msgstr "Path to add completion to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:2
 msgid "Path to add completion to"
@@ -12975,14 +11873,12 @@ msgid "Option list is not complete"
 msgstr "Option list is not complete"
 
 #: /tmp/fish/implicit/share/completions/complete.fish:12
-#, fuzzy
 msgid "Remove completion"
-msgstr "Remove property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:14
-#, fuzzy
 msgid "Print all completions for the specified commandline"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:15
 msgid ""
@@ -12993,24 +11889,20 @@ msgstr ""
 "status"
 
 #: /tmp/fish/implicit/share/completions/complete.fish:16
-#, fuzzy
 msgid "Inherit completions from the specified command"
-msgstr "Pipe output through specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:1
-#, fuzzy
 msgid "User script"
-msgstr "Extract script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:2
-#, fuzzy
 msgid "Short information about Composer"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:3
-#, fuzzy
 msgid "Create an archive of this composer package"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:4
 #: /tmp/fish/implicit/share/completions/composer.fish:15
@@ -13023,14 +11915,12 @@ msgid "Clears composer's internal package cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:8
-#, fuzzy
 msgid "Create new project from a package into given directory."
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:9
-#, fuzzy
 msgid "Shows which packages depend on the given package"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:10
 msgid "Diagnoses the system to identify common errors."
@@ -13038,9 +11928,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:11
 #: /tmp/fish/implicit/share/completions/composer.fish:12
-#, fuzzy
 msgid "Dumps the autoloader"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:13
 #, sh-format
@@ -13048,14 +11937,12 @@ msgid "Allows running commands in the global composer dir ($COMPOSER_HOME)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:14
-#, fuzzy
 msgid "Displays help for a command"
-msgstr "Displays usage information for command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:16
-#, fuzzy
 msgid "Creates a basic composer.json file in current directory."
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:17
 msgid ""
@@ -13064,19 +11951,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:18
-#, fuzzy
 msgid "Show information about licenses of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:19
-#, fuzzy
 msgid "Lists commands"
-msgstr "Process command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:20
-#, fuzzy
 msgid "Removes a package from the require or require-dev"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:21
 msgid "Adds required packages to your composer.json and installs them"
@@ -13088,25 +11972,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:23
 #: /tmp/fish/implicit/share/completions/npm.fish:34
-#, fuzzy
 msgid "Search for packages"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:24
 #: /tmp/fish/implicit/share/completions/composer.fish:25
-#, fuzzy
 msgid "Updates composer.phar to the latest version."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:26
-#, fuzzy
 msgid "Show information about packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:27
-#, fuzzy
 msgid "Show a list of locally modified packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:28
 msgid ""
@@ -13119,23 +11999,20 @@ msgid "Validates a composer.json"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:30
-#, fuzzy
 msgid "Shows which packages cause the given package to be installed"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:31
-#, fuzzy
 msgid "Shows which packages prevent the given package from being installed"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:32
 msgid "Displays composer's help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:33
-#, fuzzy
 msgid "Do not output any message."
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:34
 msgid ""
@@ -13144,9 +12021,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:35
-#, fuzzy
 msgid "Display composer's application version."
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:36
 msgid "Force ANSI output."
@@ -13157,14 +12033,12 @@ msgid "Disable ANSI output."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:38
-#, fuzzy
 msgid "Do not ask any interactive question."
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:39
-#, fuzzy
 msgid "Display timing and memory usage information."
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:40
 msgid "If specified, use the given directory as working directory."
@@ -13190,15 +12064,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:5
 #: /tmp/fish/implicit/share/completions/mogrify.fish:15
 #: /tmp/fish/implicit/share/completions/montage.fish:11
-#, fuzzy
 msgid "Annotate image with comment [string]"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:8
 #: /tmp/fish/implicit/share/completions/montage.fish:12
-#, fuzzy
 msgid "Composite operator [operator]"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:13
 #: /tmp/fish/implicit/share/completions/convert.fish:24
@@ -13255,9 +12127,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:30
 #: /tmp/fish/implicit/share/completions/mogrify.fish:57
 #: /tmp/fish/implicit/share/completions/montage.fish:43
-#, fuzzy
 msgid "Font point size [value]"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:32
 #: /tmp/fish/implicit/share/completions/convert.fish:57
@@ -13270,9 +12141,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:62
 #: /tmp/fish/implicit/share/completions/import.fish:36
 #: /tmp/fish/implicit/share/completions/mogrify.fish:64
-#, fuzzy
 msgid "Image scene number [value]"
-msgstr "Compare general numeric value"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composite.fish:43
 msgid "Repeat composite operation across and down image"
@@ -13375,9 +12245,8 @@ msgid "Swap two images in the image sequence [indexes]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:4
-#, fuzzy
 msgid "Cache test results in specified file"
-msgstr "Cache test results in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:5
 msgid "Cache test results in file config.cache"
@@ -13388,9 +12257,8 @@ msgid "Do not create output files"
 msgstr "Do not create output files"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:7
-#, fuzzy
 msgid "Set source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:8
 msgid "Architecture-independent install directory"
@@ -13401,9 +12269,8 @@ msgid "Architecture-dependent install directory"
 msgstr "Architecture-dependent install directory"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:10
-#, fuzzy
 msgid "Configure for building on BUILD"
-msgstr "Configure for building compilers for TARGET"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:11
 msgid "Cross-compile to build programs to run on HOST"
@@ -13418,9 +12285,8 @@ msgid "Shows if the system is online or offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:2
-#, fuzzy
 msgid "Display technologies"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:3
 msgid "Get System Clock Properties"
@@ -13431,23 +12297,20 @@ msgid "Enables given technology or offline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:5
-#, fuzzy
 msgid "Disables given technology or offline mode"
-msgstr "Disable import of site module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:6
 msgid "Enable, disable tethering, set SSID and passphrase for wifi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:7
-#, fuzzy
 msgid "Display services"
-msgstr "Mostra contexto de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:8
-#, fuzzy
 msgid "Display peers"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:9
 msgid "Scans for new services for given technology"
@@ -13462,24 +12325,20 @@ msgid "Disconnect a given service or peer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:12
-#, fuzzy
 msgid "Set service configuration options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:13
-#, fuzzy
 msgid "Monitor signals from interfaces"
-msgstr "Do not use X interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:14
-#, fuzzy
 msgid "Display VPN connections"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:15
-#, fuzzy
 msgid "Enable or disable a session"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:16
 msgid "(Un)Register a Peer Service"
@@ -13509,9 +12368,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:7
 #: /tmp/fish/implicit/share/completions/mogrify.fish:5
-#, fuzzy
 msgid "Background color [color]"
-msgstr "Alterar cor de fundo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:8
 #: /tmp/fish/implicit/share/completions/mogrify.fish:6
@@ -13593,14 +12451,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/convert.fish:51
 #: /tmp/fish/implicit/share/completions/identify.fish:18
 #: /tmp/fish/implicit/share/completions/mogrify.fish:56
-#, fuzzy
 msgid "Efficiently determine image attributes"
-msgstr "Exclude extra file attributes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:53
-#, fuzzy
 msgid "Maximum number of significant digits to print [value]"
-msgstr "Maximum number of connections to allow"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/convert.fish:54
 #: /tmp/fish/implicit/share/completions/mogrify.fish:58
@@ -13768,39 +12624,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:1
 #: /tmp/fish/implicit/share/completions/cowthink.fish:1
-#, fuzzy
 msgid "Specify eye string"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:2
 #: /tmp/fish/implicit/share/completions/cowthink.fish:2
-#, fuzzy
 msgid "Specify cow file"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:4
 #: /tmp/fish/implicit/share/completions/cowthink.fish:4
-#, fuzzy
 msgid "List all cowfiles"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:5
 #: /tmp/fish/implicit/share/completions/cowthink.fish:5
-#, fuzzy
 msgid "No word wrapping"
-msgstr "Flood ping"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:6
 #: /tmp/fish/implicit/share/completions/cowthink.fish:6
-#, fuzzy
 msgid "Specify tounge string"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:7
 #: /tmp/fish/implicit/share/completions/cowthink.fish:7
-#, fuzzy
 msgid "Column width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cowsay.fish:8
 #: /tmp/fish/implicit/share/completions/cowthink.fish:8
@@ -13844,9 +12694,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:1
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:1
-#, fuzzy
 msgid "Cancels all jobs on the named destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:2
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:2
@@ -13859,9 +12708,8 @@ msgid "Releases pending jobs for printing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsdisable.fish:4
-#, fuzzy
 msgid "Disable reason"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsenable.fish:4
 msgid "Cancel reason"
@@ -13869,212 +12717,176 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cupsreject.fish:1
 #: /tmp/fish/implicit/share/completions/reject.fish:1
-#, fuzzy
 msgid "Reject reason"
-msgstr "Reject protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:1
-#, fuzzy
 msgid "Output byte range"
-msgstr "Output byte range"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:2
-#, fuzzy
 msgid "Output character range"
-msgstr "Output character range"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:3
-#, fuzzy
 msgid "Select field delimiter"
-msgstr "Select field delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:4
-#, fuzzy
 msgid "Select fields"
-msgstr "Select fields"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:5
-#, fuzzy
 msgid "Don't split multi byte characters"
-msgstr "Dont split mutibyte characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:6
-#, fuzzy
 msgid "Do not print lines without delimiter"
-msgstr "Do not print lines without delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cut.fish:7
 msgid "Select output delimiter"
 msgstr "Select output delimiter"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:1
-#, fuzzy
 msgid "Displays usage information for command."
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:2
-#, fuzzy
 msgid "Cause CVS to be really quiet."
-msgstr "Cause CVS to be really quiet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:3
-#, fuzzy
 msgid "Cause CVS to be somewhat quiet."
-msgstr "Cause CVS to be somewhat quiet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:4
-#, fuzzy
 msgid "Make checked-out files read-only."
-msgstr "Make checked-out files read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:5
-#, fuzzy
 msgid "Make checked-out files read-write (default)."
-msgstr "Make checked-out files read-write (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:6
 msgid "Do not execute anything that will change the disk."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:7
-#, fuzzy
 msgid "Show trace of program execution -- try with -n."
-msgstr "Show trace of program execution -- try with -n"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:8
 msgid "Assume repository is read-only, such as CDROM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:9
-#, fuzzy
 msgid "CVS version and copyright."
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:10
-#, fuzzy
 msgid "Use 'tmpdir' for temporary files."
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:11
-#, fuzzy
 msgid "Use 'editor' for editing log information."
-msgstr "Use editor for editing log information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:13
-#, fuzzy
 msgid "Do not use the ~/.cvsrc file."
-msgstr "Do not use the ~/.cvsrc file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:14
-#, fuzzy
 msgid "Request compression level '#' for net traffic."
-msgstr "Compression level for net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:15
-#, fuzzy
 msgid "Encrypt all net traffic."
-msgstr "Encrypt all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:16
-#, fuzzy
 msgid "Authenticate all net traffic."
-msgstr "Authenticate all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:17
-#, fuzzy
 msgid "Use IPv4 addresses only."
-msgstr "Somente endereços IPv4"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:18
-#, fuzzy
 msgid "Use IPv6 addresses only."
-msgstr "Somente endereços IPv6"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:19
-#, fuzzy
 msgid "Set CVS user variable."
-msgstr "Set CVS user variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:20
 msgid "Add a new file/directory to the repository"
 msgstr "Adicionar um novo arquivo/diretório ao repositório"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:21
-#, fuzzy
 msgid "Administration front end for rcs"
-msgstr "Administration front end for rcs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:22
-#, fuzzy
 msgid "Show last revision where each line was modified"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:23
-#, fuzzy
 msgid "Checkout sources for editing"
-msgstr "Checkout sources for editing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:24
 msgid "Check files into the repository"
 msgstr "Verificar arquivos no repositório"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:25
-#, fuzzy
 msgid "Show differences between revisions"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:26
-#, fuzzy
 msgid "Get ready to edit a watched file"
-msgstr "Get ready to edit a watched file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:27
-#, fuzzy
 msgid "See who is editing a watched file"
-msgstr "See who is editing a watched file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:28
-#, fuzzy
 msgid "Export sources from CVS, similar to checkout"
-msgstr "Export sources from CVS, similar to checkout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:29
-#, fuzzy
 msgid "Show repository access history"
-msgstr "Show repository access history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:30
-#, fuzzy
 msgid "Import sources into CVS, using vendor branches"
-msgstr "Import sources into CVS, using vendor branches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:31
-#, fuzzy
 msgid "Create a CVS repository if it doesn't exist"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:32
 msgid "Kerberos server mode"
 msgstr "Kerberos server mode"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:33
-#, fuzzy
 msgid "Print out history information for files"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:34
 msgid "Prompt for password for authenticating server"
 msgstr "Prompt for password for authenticating server"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:35
-#, fuzzy
 msgid "Removes entry in .cvspass for remote repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:36
-#, fuzzy
 msgid "List files available from CVS"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:37
 msgid "Password server mode"
@@ -14085,27 +12897,24 @@ msgid "Show last revision where each line of module was modified"
 msgstr "Show last revision where each line of module was modified"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:39
-#, fuzzy
 msgid "Create 'patch' format diffs between releases"
-msgstr "Create patch format diffs between releases"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:40
 msgid "Indicate that a Module is no longer in use"
 msgstr "Indicate that a Module is no longer in use"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:41
-#, fuzzy
 msgid "Remove an entry from the repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:42
 msgid "Print out history information for a module"
 msgstr "Print out history information for a module"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:43
-#, fuzzy
 msgid "List files in a module"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:44
 msgid "Add a symbolic tag to a module"
@@ -14124,23 +12933,20 @@ msgid "Add a symbolic tag to checked out version of files"
 msgstr "Add a symbolic tag to checked out version of files"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
-#, fuzzy
 msgid "Undo an edit command"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:49
 msgid "Bring work tree in sync with repository"
 msgstr "Bring work tree in sync with repository"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:50
-#, fuzzy
 msgid "Show current CVS version(s)"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:51
-#, fuzzy
 msgid "Set watches"
-msgstr "Set arch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:52
 msgid "See who is watching a file"
@@ -14159,9 +12965,8 @@ msgid "Append (comma-separated) user names to access list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:56
-#, fuzzy
 msgid "Append another file's access list."
-msgstr "Append new files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:57
 msgid "[rev]    Set default branch (highest branch on trunk if omitted)."
@@ -14176,14 +12981,12 @@ msgid "[users]  Remove (comma-separated) user names from access list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:60
-#, fuzzy
 msgid "Run interactively."
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
-#, fuzzy
 msgid "Set keyword substitution mode:"
-msgstr "Set the default keyword substitution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:62
 msgid "[rev]    Lock revision (latest revision on branch,"
@@ -14194,9 +12997,8 @@ msgid "Set strict locking."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:64
-#, fuzzy
 msgid "Replace revision's log message."
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:65
 msgid "Tag branch or revision.  If :rev is omitted,"
@@ -14207,28 +13009,24 @@ msgid "Same as -n except override existing tag."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:67
-#, fuzzy
 msgid "Delete (outdate) specified range of revisions:"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:68
-#, fuzzy
 msgid "Run quietly."
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:69
 msgid "Set revision state (latest revision on branch,"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:70
-#, fuzzy
 msgid "[file]   Get descriptive text from file (stdin if omitted)."
-msgstr "Write descriptive text from a file into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:71
-#, fuzzy
 msgid "-string  Set descriptive text."
-msgstr "Write descriptive text into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:72
 msgid "[rev]    Unlock the revision (latest revision on branch,"
@@ -14257,9 +13055,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:259
 #: /tmp/fish/implicit/share/completions/cvs.fish:267
 #: /tmp/fish/implicit/share/completions/cvs.fish:278
-#, fuzzy
 msgid "Process directories recursively."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:76
 #: /tmp/fish/implicit/share/completions/cvs.fish:205
@@ -14268,27 +13065,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:77
 #: /tmp/fish/implicit/share/completions/cvs.fish:206
-#, fuzzy
 msgid "Annotate binary files."
-msgstr "Annotate binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:78
 #: /tmp/fish/implicit/share/completions/cvs.fish:207
-#, fuzzy
 msgid "Annotate file as of specified revision/tag."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:79
 #: /tmp/fish/implicit/share/completions/cvs.fish:208
-#, fuzzy
 msgid "Annotate file as of specified date."
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:80
 #: /tmp/fish/implicit/share/completions/cvs.fish:272
-#, fuzzy
 msgid "Reset any sticky tags/date/kopts."
-msgstr "Reset sticky tags/dates/k-opts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:81
 #: /tmp/fish/implicit/share/completions/cvs.fish:148
@@ -14299,9 +13092,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:198
 #: /tmp/fish/implicit/share/completions/cvs.fish:241
 #: /tmp/fish/implicit/share/completions/cvs.fish:273
-#, fuzzy
 msgid "Prune empty directories."
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:84
 msgid "\"cat\" the module database."
@@ -14320,9 +13112,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:102
 #: /tmp/fish/implicit/share/completions/cvs.fish:150
 #: /tmp/fish/implicit/share/completions/cvs.fish:211
-#, fuzzy
 msgid "Local directory only, not recursive"
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:87
 #: /tmp/fish/implicit/share/completions/cvs.fish:152
@@ -14364,24 +13155,21 @@ msgid "Check for valid edits before committing."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:97
-#, fuzzy
 msgid "Local directory only (not recursive)."
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:98
 msgid "Force the file to be committed; disables recursion."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:99
-#, fuzzy
 msgid "Read the log message from file."
-msgstr "Read log message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:100
 #: /tmp/fish/implicit/share/completions/cvs.fish:180
-#, fuzzy
 msgid "Log message."
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:101
 msgid "Commit to this branch or trunk revision."
@@ -14389,9 +13177,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:104
 #: /tmp/fish/implicit/share/completions/cvs.fish:218
-#, fuzzy
 msgid "Specify keyword expansion mode."
-msgstr "Specify kernel version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:105
 msgid "Diff revision for date against working file."
@@ -14414,46 +13201,38 @@ msgid "--ignore-case  Consider upper- and lower-case to be the same."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:110
-#, fuzzy
 msgid "--ignore-all-space  Ignore all white space."
-msgstr "Ignorar todos os espaços em branco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:111
-#, fuzzy
 msgid "--ignore-space-change  Ignore changes in the amount of white space."
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:112
-#, fuzzy
 msgid "--ignore-blank-lines  Ignore changes whose lines are all blank."
-msgstr "Ignore changes whose lines match the REGEX"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:113
-#, fuzzy
 msgid "--ignore-matching-lines=RE  Ignore changes whose lines all match RE."
-msgstr "Ignore changes whose lines match the REGEX"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:114
-#, fuzzy
 msgid "Binary  Read and write data in binary mode."
-msgstr "Read and write all files in binary mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:115
-#, fuzzy
 msgid "--text  Treat all files as text."
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:116
-#, fuzzy
 msgid ""
 "-C NUM  --context[=NUM]  Output NUM (default 2) lines of copied context."
-msgstr "Output NUM lines of copied context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:117
-#, fuzzy
 msgid ""
 "-U NUM  --unified[=NUM]  Output NUM (default 2) lines of unified context."
-msgstr "Output NUM lines of unified context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:118
 msgid "UM  Use NUM context lines."
@@ -14464,37 +13243,32 @@ msgid "--label LABEL  Use LABEL instead of file name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:120
-#, fuzzy
 msgid "--show-c-function  Show which C function each change is in."
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:121
 msgid "--show-function-line=RE  Show the most recent line matching RE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:122
-#, fuzzy
 msgid "Brief  Output only whether files differ."
-msgstr "Output only whether the files differ"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:123
-#, fuzzy
 msgid "--ed  Output an ed script."
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:124
 msgid "--forward-ed  Output something like an ed script in forward order."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:125
-#, fuzzy
 msgid "--rcs  Output an RCS format diff."
-msgstr "Output a normal diff"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:126
-#, fuzzy
 msgid "--side-by-side  Output in two columns."
-msgstr "Saída em duas colunas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:127
 msgid "--width=NUM  Output at most NUM (default 130) characters per line."
@@ -14523,18 +13297,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:134
-#, fuzzy
 msgid "--expand-tabs  Expand tabs to spaces in output."
-msgstr "Expand tabs to spaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:135
 msgid "--initial-tab  Make tabs line up by prepending a tab."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:136
-#, fuzzy
 msgid "--new-file  Treat absent files as empty."
-msgstr "Treat absent files as empty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:137
 msgid "--report-identical-files  Report when two files are the same."
@@ -14545,9 +13317,8 @@ msgid "Horizon-lines=NUM  Keep NUM lines of the common prefix and suffix."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:139
-#, fuzzy
 msgid "--minimal  Try hard to find a smaller set of changes."
-msgstr "Try to find a smaller set of changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:140
 msgid ""
@@ -14559,18 +13330,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:266
 #: /tmp/fish/implicit/share/completions/cvs.fish:270
 #: /tmp/fish/implicit/share/completions/cvs.fish:286
-#, fuzzy
 msgid "Local directory only, not recursive."
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:142
 #: /tmp/fish/implicit/share/completions/cvs.fish:147
 #: /tmp/fish/implicit/share/completions/cvs.fish:151
 #: /tmp/fish/implicit/share/completions/cvs.fish:271
 #: /tmp/fish/implicit/share/completions/cvs.fish:287
-#, fuzzy
 msgid "Process directories recursively (default)."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:143
 msgid "Specify action to register for temporary watch, one of:"
@@ -14587,14 +13356,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:146
 #: /tmp/fish/implicit/share/completions/cvs.fish:223
 #: /tmp/fish/implicit/share/completions/cvs.fish:258
-#, fuzzy
 msgid "Process this directory only (not recursive)."
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:153
-#, fuzzy
 msgid "Export tagged revisions."
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:154
 msgid "Export revisions as of date."
@@ -14609,27 +13376,24 @@ msgid "Use RCS kopt -k option on checkout."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:157
-#, fuzzy
 msgid "Produce report on all TAGs"
-msgstr "Report on all tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:158
 msgid "Committed (Modified) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:159
-#, fuzzy
 msgid "Checked out modules"
-msgstr "Report on checked-out modules"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:160
 msgid "Look for specified module (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:161
-#, fuzzy
 msgid "Extract by record type"
-msgstr "Specify record type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:162
 msgid "Everything (same as -x, but all record types)"
@@ -14644,14 +13408,12 @@ msgid "Last modified (committed or modified report)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:165
-#, fuzzy
 msgid "Working directory must match"
-msgstr "Print directory stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
-#, fuzzy
 msgid "Since date (Many formats)"
-msgstr "Profile data format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:167
 msgid "Back to record with str in module/file/repos field"
@@ -14694,56 +13456,47 @@ msgid "When importing new files, mark their trunk revisions as dead."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:177
-#, fuzzy
 msgid "Set default RCS keyword substitution mode."
-msgstr "Set the default keyword substitution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:178
 #: /tmp/fish/implicit/share/completions/cvs.fish:284
-#, fuzzy
 msgid "More files to ignore (! to reset)."
-msgstr "Files to ignore during import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:179
-#, fuzzy
 msgid "Vendor branch id."
-msgstr "Multiple vendor branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:181
 #: /tmp/fish/implicit/share/completions/cvs.fish:285
-#, fuzzy
 msgid "Wrappers specification line."
-msgstr "Display the last modification time of file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:183
 #: /tmp/fish/implicit/share/completions/cvs.fish:226
-#, fuzzy
 msgid "Only list revisions on the default branch."
-msgstr "Print info about revision on default branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:184
 #: /tmp/fish/implicit/share/completions/cvs.fish:227
-#, fuzzy
 msgid "Only print header."
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:185
 #: /tmp/fish/implicit/share/completions/cvs.fish:228
-#, fuzzy
 msgid "Only print name of RCS file."
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:186
 #: /tmp/fish/implicit/share/completions/cvs.fish:229
-#, fuzzy
 msgid "Only print header and descriptive text."
-msgstr "Write descriptive text into RCS"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:187
 #: /tmp/fish/implicit/share/completions/cvs.fish:230
-#, fuzzy
 msgid "Do not list tags."
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:188
 #: /tmp/fish/implicit/share/completions/cvs.fish:231
@@ -14757,27 +13510,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:190
 #: /tmp/fish/implicit/share/completions/cvs.fish:233
-#, fuzzy
 msgid "This option."
-msgstr "Config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:191
 #: /tmp/fish/implicit/share/completions/cvs.fish:234
-#, fuzzy
 msgid "[revisions]"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:192
 #: /tmp/fish/implicit/share/completions/cvs.fish:235
-#, fuzzy
 msgid "A semicolon-separated list of dates"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:193
 #: /tmp/fish/implicit/share/completions/cvs.fish:236
-#, fuzzy
 msgid "Only list revisions with specified states."
-msgstr "Monta partição com etiqueta especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:194
 #: /tmp/fish/implicit/share/completions/cvs.fish:237
@@ -14786,9 +13535,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:195
 #: /tmp/fish/implicit/share/completions/cvs.fish:238
-#, fuzzy
 msgid "Show dead revisions (with tag when specified)."
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:196
 #: /tmp/fish/implicit/share/completions/cvs.fish:239
@@ -14797,21 +13545,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:197
 #: /tmp/fish/implicit/share/completions/cvs.fish:240
-#, fuzzy
 msgid "Display all details."
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:199
 #: /tmp/fish/implicit/share/completions/cvs.fish:242
-#, fuzzy
 msgid "List recursively."
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:200
 #: /tmp/fish/implicit/share/completions/cvs.fish:243
-#, fuzzy
 msgid "Show files with revision or tag."
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:201
 #: /tmp/fish/implicit/share/completions/cvs.fish:244
@@ -14828,14 +13573,12 @@ msgid "Date [-r rev2 | -D date2] modules…"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:213
-#, fuzzy
 msgid "Context diffs (default)"
-msgstr "Use context diff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:214
-#, fuzzy
 msgid "Unidiff format."
-msgstr "Use unidiff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:215
 msgid "Short patch - one liner per file."
@@ -14846,9 +13589,8 @@ msgid "Top two diffs - last change made to the file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:217
-#, fuzzy
 msgid "Use RCS Version vers for keyword expansion."
-msgstr "Specify kernel version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:219
 msgid "Date."
@@ -14859,14 +13601,12 @@ msgid "Revision - symbolic or numeric."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:221
-#, fuzzy
 msgid "Delete the given directory."
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
-#, fuzzy
 msgid "Delete the file before removing it."
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:245
 msgid "Clear tag from removed files that would not otherwise be tagged."
@@ -14893,15 +13633,13 @@ msgid "Move tag if it already exists."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:252
-#, fuzzy
 msgid "No execution of 'tag program'."
-msgstr "Don't run any tag programs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:254
 #: /tmp/fish/implicit/share/completions/cvs.fish:268
-#, fuzzy
 msgid "Existing revision/tag."
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:255
 #: /tmp/fish/implicit/share/completions/cvs.fish:269
@@ -14913,19 +13651,16 @@ msgid "Verbose format; includes tag information for the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:262
-#, fuzzy
 msgid "Check that working files are unmodified."
-msgstr "Check out a working copy from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:274
-#, fuzzy
 msgid "Overwrite locally modified files with clean repository copies."
-msgstr "Overwrite modified files with clean copies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:275
-#, fuzzy
 msgid "Build directories, like checkout does."
-msgstr "Lista diretórios, não seu conteúdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:279
 msgid "Send updates to standard output (avoids stickiness)."
@@ -14940,9 +13675,8 @@ msgid "Set date to update from (is sticky)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:288
-#, fuzzy
 msgid "Specify what actions, one of: "
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:1
 msgid "Build for 32-bit Cygwin"
@@ -14953,39 +13687,32 @@ msgid "Build for 64-bit Cygwin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:3
-#, fuzzy
 msgid "Enable debugging messages"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:4
-#, fuzzy
 msgid "Cygport file"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:5
-#, fuzzy
 msgid "Download all sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:6
-#, fuzzy
 msgid "Download missing sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:7
-#, fuzzy
 msgid "Prepare source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:8
-#, fuzzy
 msgid "Build software"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:9
-#, fuzzy
 msgid "Run test suite"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:10
 msgid "Install into DESTDIR and run post-installation steps"
@@ -14996,62 +13723,52 @@ msgid "Run post-installation steps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:12
-#, fuzzy
 msgid "List package files"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:13
-#, fuzzy
 msgid "List debug package files"
-msgstr "List bugs from packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:14
-#, fuzzy
 msgid "Show dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:15
-#, fuzzy
 msgid "Show packaging info"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:16
 msgid "Show project homepage URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:17
-#, fuzzy
 msgid "Create packages, marked as test"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:18
-#, fuzzy
 msgid "Create packages"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:19
-#, fuzzy
 msgid "Create source patches"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:20
-#, fuzzy
 msgid "Upload finished packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:21
-#, fuzzy
 msgid "Upload packages without marking !ready"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:22
 msgid "Send announcement email"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:23
-#, fuzzy
 msgid "Delete working directory"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:24
 msgid "Same as prep build inst pkg"
@@ -15062,110 +13779,92 @@ msgid "Darcs repo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:2
-#, fuzzy
 msgid "Set the specified option"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:3
-#, fuzzy
 msgid "Display help about darcs and darcs commands"
-msgstr "Displays usage information for command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:4
 msgid "Add one or more new files or directories"
 msgstr "Adicionar um ou mais novos arquivos ou diretórios"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:5
-#, fuzzy
 msgid "Remove files from version control"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:6
-#, fuzzy
 msgid "Move or rename files"
-msgstr "Do not create file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:7
 msgid "Substitute one word for another"
 msgstr "Substitue uma palavra por outra"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:8
-#, fuzzy
 msgid "Discard unrecorded changes"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:9
-#, fuzzy
 msgid "Undo the last revert (may fail if changes after the revert)"
-msgstr "Undo the last revert (may fail if changes after the revert)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:10
-#, fuzzy
 msgid "List unrecorded changes in the working tree"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:11
-#, fuzzy
 msgid "Create a patch from unrecorded changes"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:12
-#, fuzzy
 msgid "Remove recorded patches without changing the working copy"
-msgstr "Remove recorded patches without changing the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:13
-#, fuzzy
 msgid "Improve a patch before it leaves your repository"
-msgstr "Replace a recorded patch with a better version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:14
-#, fuzzy
 msgid "Mark unresolved conflicts in working tree, for manual resolution"
-msgstr "Mark any conflicts to the working copy for manual resolution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:15
 msgid "Name the current repository state for future reference"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:16
-#, fuzzy
 msgid "Set a preference (test, predist, boringfile or binariesfile)"
-msgstr "Set a value for a preference (test, predist, ...)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:17
-#, fuzzy
 msgid "Create a diff between two versions of the repository"
-msgstr "Create a diff between two versions of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:18
-#, fuzzy
 msgid "List patches in the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:19
-#, fuzzy
 msgid "Display which patch last modified something"
-msgstr "Display which patch last modified something"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:20
-#, fuzzy
 msgid "Create a distribution tarball"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:21
-#, fuzzy
 msgid "Locate the most recent version lacking an error"
-msgstr "Locate the most recent version lacking an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:22
 msgid "Show information which is stored by darcs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:23
-#, fuzzy
 msgid "Copy and apply patches from another repository to this one"
-msgstr "Copy and apply patches from another repository to this one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:24
 msgid "Delete selected patches from the repository. (UNSAFE!)"
@@ -15176,14 +13875,12 @@ msgid "Record a new patch reversing some recorded changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:26
-#, fuzzy
 msgid "Copy and apply patches from this repository to another one"
-msgstr "Copy and apply patches from this repository to another one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:27
-#, fuzzy
 msgid "Send by email a bundle of one or more patches"
-msgstr "Send by email a bundle of one or more patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:403
 msgid "Path to a version-controlled boring file"
@@ -15197,75 +13894,65 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:439
 #: /tmp/fish/implicit/share/completions/darcs.fish:847
 #: /tmp/fish/implicit/share/completions/darcs.fish:880
-#, fuzzy
 msgid "Select changes up to a patch matching PATTERN"
-msgstr "Select changes up to a patch matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:406
 #: /tmp/fish/implicit/share/completions/darcs.fish:440
 #: /tmp/fish/implicit/share/completions/darcs.fish:848
 #: /tmp/fish/implicit/share/completions/darcs.fish:881
-#, fuzzy
 msgid "Select changes up to a patch matching REGEXP"
-msgstr "Select changes up to a patch matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:407
 #: /tmp/fish/implicit/share/completions/darcs.fish:441
-#, fuzzy
 msgid "Select changes up to a tag matching REGEXP"
-msgstr "Select changes up to a tag matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:408
 #: /tmp/fish/implicit/share/completions/darcs.fish:442
 #: /tmp/fish/implicit/share/completions/darcs.fish:619
 #: /tmp/fish/implicit/share/completions/darcs.fish:657
-#, fuzzy
 msgid "Select changes starting with a patch matching PATTERN"
-msgstr "Select changes starting with a patch matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:409
 #: /tmp/fish/implicit/share/completions/darcs.fish:443
 #: /tmp/fish/implicit/share/completions/darcs.fish:620
 #: /tmp/fish/implicit/share/completions/darcs.fish:658
-#, fuzzy
 msgid "Select changes starting with a patch matching REGEXP"
-msgstr "Select changes starting with a patch matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:410
 #: /tmp/fish/implicit/share/completions/darcs.fish:444
 #: /tmp/fish/implicit/share/completions/darcs.fish:621
 #: /tmp/fish/implicit/share/completions/darcs.fish:659
-#, fuzzy
 msgid "Select changes starting with a tag matching REGEXP"
-msgstr "Select changes starting with a tag matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:411
 #: /tmp/fish/implicit/share/completions/darcs.fish:495
 #: /tmp/fish/implicit/share/completions/darcs.fish:520
-#, fuzzy
 msgid "Select a single patch matching PATTERN"
-msgstr "Select patch matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:412
 #: /tmp/fish/implicit/share/completions/darcs.fish:496
 #: /tmp/fish/implicit/share/completions/darcs.fish:521
-#, fuzzy
 msgid "Select a single patch matching REGEXP"
-msgstr "Select patch matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:413
 #: /tmp/fish/implicit/share/completions/darcs.fish:445
 #: /tmp/fish/implicit/share/completions/darcs.fish:622
 #: /tmp/fish/implicit/share/completions/darcs.fish:660
-#, fuzzy
 msgid "Select the last NUMBER patches"
-msgstr "Select the last NUMBER patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:414
 #: /tmp/fish/implicit/share/completions/darcs.fish:446
-#, fuzzy
 msgid "Select a range of patches"
-msgstr "Select the last NUMBER patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:415
 msgid "Specify diff command (ignores --diff-opts)"
@@ -15280,9 +13967,8 @@ msgid "Pass -u option to diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:418
-#, fuzzy
 msgid "Output patch in diff's dumb format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:419
 #: /tmp/fish/implicit/share/completions/darcs.fish:463
@@ -15300,9 +13986,8 @@ msgstr "Output in ISO 8601 format"
 #: /tmp/fish/implicit/share/completions/darcs.fish:936
 #: /tmp/fish/implicit/share/completions/darcs.fish:969
 #: /tmp/fish/implicit/share/completions/darcs.fish:989
-#, fuzzy
 msgid "Specify the repository directory in which to run"
-msgstr "Specify the repository directory in which to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:420
 #: /tmp/fish/implicit/share/completions/darcs.fish:524
@@ -15311,9 +13996,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:421
 #: /tmp/fish/implicit/share/completions/darcs.fish:525
-#, fuzzy
 msgid "Do patch application on disk [DEFAULT]"
-msgstr "Fail on patches that create conflicts [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:422
 #: /tmp/fish/implicit/share/completions/darcs.fish:466
@@ -15333,9 +14017,8 @@ msgstr "Fail on patches that create conflicts [DEFAULT]"
 #: /tmp/fish/implicit/share/completions/darcs.fish:972
 #: /tmp/fish/implicit/share/completions/darcs.fish:990
 #: /tmp/fish/implicit/share/completions/darcs.fish:1010
-#, fuzzy
 msgid "Disable this command"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:423
 #: /tmp/fish/implicit/share/completions/darcs.fish:467
@@ -15377,9 +14060,8 @@ msgstr "Shows brief description of command and its arguments"
 #: /tmp/fish/implicit/share/completions/darcs.fish:974
 #: /tmp/fish/implicit/share/completions/darcs.fish:992
 #: /tmp/fish/implicit/share/completions/darcs.fish:1012
-#, fuzzy
 msgid "Give only debug output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:425
 #: /tmp/fish/implicit/share/completions/darcs.fish:469
@@ -15399,9 +14081,8 @@ msgstr "Turn on debug output"
 #: /tmp/fish/implicit/share/completions/darcs.fish:975
 #: /tmp/fish/implicit/share/completions/darcs.fish:993
 #: /tmp/fish/implicit/share/completions/darcs.fish:1013
-#, fuzzy
 msgid "Give debug and verbose output"
-msgstr "Give human readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:426
 #: /tmp/fish/implicit/share/completions/darcs.fish:470
@@ -15442,9 +14123,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:977
 #: /tmp/fish/implicit/share/completions/darcs.fish:995
 #: /tmp/fish/implicit/share/completions/darcs.fish:1015
-#, fuzzy
 msgid "Give verbose output"
-msgstr "Neither verbose nor quiet output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:428
 #: /tmp/fish/implicit/share/completions/darcs.fish:472
@@ -15506,9 +14186,8 @@ msgstr "Neither verbose nor quiet output"
 #: /tmp/fish/implicit/share/completions/darcs.fish:980
 #: /tmp/fish/implicit/share/completions/darcs.fish:998
 #: /tmp/fish/implicit/share/completions/darcs.fish:1018
-#, fuzzy
 msgid "Provide debugging timings information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:431
 #: /tmp/fish/implicit/share/completions/darcs.fish:481
@@ -15549,9 +14228,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:982
 #: /tmp/fish/implicit/share/completions/darcs.fish:1001
 #: /tmp/fish/implicit/share/completions/darcs.fish:1026
-#, fuzzy
 msgid "Don't run posthook command"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:433
 #: /tmp/fish/implicit/share/completions/darcs.fish:483
@@ -15634,9 +14312,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:986
 #: /tmp/fish/implicit/share/completions/darcs.fish:1005
 #: /tmp/fish/implicit/share/completions/darcs.fish:1030
-#, fuzzy
 msgid "Don't run prehook command"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:437
 #: /tmp/fish/implicit/share/completions/darcs.fish:487
@@ -15686,9 +14363,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:661
 #: /tmp/fish/implicit/share/completions/darcs.fish:695
 #: /tmp/fish/implicit/share/completions/darcs.fish:741
-#, fuzzy
 msgid "Select patches matching PATTERN"
-msgstr "Select patches matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:448
 #: /tmp/fish/implicit/share/completions/darcs.fish:564
@@ -15696,9 +14372,8 @@ msgstr "Select patches matching PATTERN"
 #: /tmp/fish/implicit/share/completions/darcs.fish:662
 #: /tmp/fish/implicit/share/completions/darcs.fish:696
 #: /tmp/fish/implicit/share/completions/darcs.fish:742
-#, fuzzy
 msgid "Select patches matching REGEXP"
-msgstr "Select patches matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:449
 #: /tmp/fish/implicit/share/completions/darcs.fish:565
@@ -15706,18 +14381,16 @@ msgstr "Select patches matching REGEXP"
 #: /tmp/fish/implicit/share/completions/darcs.fish:663
 #: /tmp/fish/implicit/share/completions/darcs.fish:697
 #: /tmp/fish/implicit/share/completions/darcs.fish:743
-#, fuzzy
 msgid "Select tags matching REGEXP"
-msgstr "Select tags matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:450
 msgid "Return only NUMBER results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:451
-#, fuzzy
 msgid "Show only changes to specified files"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:452
 msgid "Show changes to all files [DEFAULT]"
@@ -15743,14 +14416,12 @@ msgid "Give human-readable output"
 msgstr "Give human-readable output"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:456
-#, fuzzy
 msgid "Number the changes"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:457
-#, fuzzy
 msgid "Output count of changes"
-msgstr "Output diagnostic for changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:458
 #: /tmp/fish/implicit/share/completions/darcs.fish:489
@@ -15758,9 +14429,8 @@ msgstr "Output diagnostic for changed files"
 #: /tmp/fish/implicit/share/completions/darcs.fish:632
 #: /tmp/fish/implicit/share/completions/darcs.fish:708
 #: /tmp/fish/implicit/share/completions/darcs.fish:761
-#, fuzzy
 msgid "Summarize changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:459
 #: /tmp/fish/implicit/share/completions/darcs.fish:490
@@ -15772,18 +14442,16 @@ msgid "Don't summarize changes"
 msgstr "Don't summarize changes"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:460
-#, fuzzy
 msgid "Show changes in reverse order"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:461
 msgid "Show changes in the usual order [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:462
-#, fuzzy
 msgid "Specify the repository URL"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:464
 #: /tmp/fish/implicit/share/completions/darcs.fish:566
@@ -15822,9 +14490,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:867
 #: /tmp/fish/implicit/share/completions/darcs.fish:902
 #: /tmp/fish/implicit/share/completions/darcs.fish:1020
-#, fuzzy
 msgid "Don't use SSH ControlMaster feature [DEFAULT]"
-msgstr "Don't use experimental date appending trick. [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:477
 #: /tmp/fish/implicit/share/completions/darcs.fish:607
@@ -15843,9 +14510,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:869
 #: /tmp/fish/implicit/share/completions/darcs.fish:904
 #: /tmp/fish/implicit/share/completions/darcs.fish:1022
-#, fuzzy
 msgid "Disable HTTP pipelining"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:479
 #: /tmp/fish/implicit/share/completions/darcs.fish:609
@@ -15854,9 +14520,8 @@ msgstr "Disable warnings about MFC"
 #: /tmp/fish/implicit/share/completions/darcs.fish:870
 #: /tmp/fish/implicit/share/completions/darcs.fish:905
 #: /tmp/fish/implicit/share/completions/darcs.fish:1023
-#, fuzzy
 msgid "Don't use patch caches"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:480
 #: /tmp/fish/implicit/share/completions/darcs.fish:610
@@ -15873,32 +14538,28 @@ msgid "Output patch in a darcs-specific format similar to diff -u"
 msgstr "Output patch in a darcs-specific format similar to diff -u"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:492
-#, fuzzy
 msgid "Output patch in darcs' usual format"
-msgstr "Output patch in a darcs-specific format similar to diff -u"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:497
 #: /tmp/fish/implicit/share/completions/darcs.fish:522
 #: /tmp/fish/implicit/share/completions/darcs.fish:849
 #: /tmp/fish/implicit/share/completions/darcs.fish:882
-#, fuzzy
 msgid "Select tag matching REGEXP"
-msgstr "Select tag matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:498
 #: /tmp/fish/implicit/share/completions/darcs.fish:523
-#, fuzzy
 msgid "Select one patch"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:499
 msgid "Specify hash of creator patch (see docs)"
 msgstr "Specify hash of creator patch (see docs)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:518
-#, fuzzy
 msgid "Name of version"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:553
 #: /tmp/fish/implicit/share/completions/darcs.fish:602
@@ -15910,9 +14571,8 @@ msgid "Make scripts executable"
 msgstr "Make scripts executable"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:568
-#, fuzzy
 msgid "Mark conflicts [DEFAULT]"
-msgstr "Mark conflicts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:569
 #: /tmp/fish/implicit/share/completions/darcs.fish:805
@@ -15921,15 +14581,13 @@ msgstr "Allow conflicts, but don't mark them"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:570
 #: /tmp/fish/implicit/share/completions/darcs.fish:807
-#, fuzzy
 msgid "Filter out any patches that would create conflicts"
-msgstr "Fail on patches that create conflicts [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:571
 #: /tmp/fish/implicit/share/completions/darcs.fish:808
-#, fuzzy
 msgid "Use external tool to merge conflicts"
-msgstr "Use external tool to merge conflicts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:572
 #: /tmp/fish/implicit/share/completions/darcs.fish:672
@@ -15957,9 +14615,8 @@ msgstr "Don't actually take the action"
 #: /tmp/fish/implicit/share/completions/darcs.fish:626
 #: /tmp/fish/implicit/share/completions/darcs.fish:698
 #: /tmp/fish/implicit/share/completions/darcs.fish:744
-#, fuzzy
 msgid "Don't automatically fulfill dependencies"
-msgstr "Don't automatically fulfill dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:579
 #: /tmp/fish/implicit/share/completions/darcs.fish:627
@@ -15996,19 +14653,16 @@ msgstr "Don't set default repository"
 #: /tmp/fish/implicit/share/completions/darcs.fish:584
 #: /tmp/fish/implicit/share/completions/darcs.fish:713
 #: /tmp/fish/implicit/share/completions/darcs.fish:768
-#, fuzzy
 msgid "Do not check if repositories are unrelated"
-msgstr "Do not store directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:594
-#, fuzzy
 msgid "Take intersection of all repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:595
-#, fuzzy
 msgid "Take union of all repositories [DEFAULT]"
-msgstr "Set default repository [DEFAULT]"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:596
 msgid "Take complement of repositories (in order listed)"
@@ -16019,9 +14673,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:685
 #: /tmp/fish/implicit/share/completions/darcs.fish:830
 #: /tmp/fish/implicit/share/completions/darcs.fish:952
-#, fuzzy
 msgid "Create compressed patches"
-msgstr "Don't create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:598
 #: /tmp/fish/implicit/share/completions/darcs.fish:725
@@ -16033,9 +14686,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:646
 #: /tmp/fish/implicit/share/completions/darcs.fish:828
 #: /tmp/fish/implicit/share/completions/darcs.fish:970
-#, fuzzy
 msgid "Don't trust the file modification times"
-msgstr "Don't extract modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:600
 #: /tmp/fish/implicit/share/completions/darcs.fish:647
@@ -16047,9 +14699,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:601
 #: /tmp/fish/implicit/share/completions/darcs.fish:726
 #: /tmp/fish/implicit/share/completions/darcs.fish:781
-#, fuzzy
 msgid "Specify the remote repository URL to work with"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:603
 #: /tmp/fish/implicit/share/completions/darcs.fish:648
@@ -16067,14 +14718,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:666
 #: /tmp/fish/implicit/share/completions/darcs.fish:750
-#, fuzzy
 msgid "Specify author id"
-msgstr "Specify author id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:667
-#, fuzzy
 msgid "Name of patch"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:668
 msgid "Edit the long comment by default"
@@ -16107,15 +14756,13 @@ msgstr "Sign the patch with your gpg key"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:704
 #: /tmp/fish/implicit/share/completions/darcs.fish:757
-#, fuzzy
 msgid "Sign the patch with a given keyid"
-msgstr "Sign the patch with a given keyid"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:705
 #: /tmp/fish/implicit/share/completions/darcs.fish:758
-#, fuzzy
 msgid "Sign the patch using openssl with a given private key"
-msgstr "Sign the patch using openssl with a given private key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:723
 #: /tmp/fish/implicit/share/completions/darcs.fish:899
@@ -16128,34 +14775,28 @@ msgid "Don't use sudo to apply as another user [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:751
-#, fuzzy
 msgid "Specify destination email"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:752
-#, fuzzy
 msgid "Mail results to additional EMAIL(s)"
-msgstr "Mail results to additional EMAIL(s). Requires --reply"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:753
-#, fuzzy
 msgid "Specify mail subject"
-msgstr "Specify makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:754
-#, fuzzy
 msgid "Specify in-reply-to header"
-msgstr "Specify index dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:755
-#, fuzzy
 msgid "Specify output filename"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:763
-#, fuzzy
 msgid "Edit the patch bundle description"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:767
 #: /tmp/fish/implicit/share/completions/darcs.fish:827
@@ -16167,9 +14808,8 @@ msgid "Give patch name and comment in file"
 msgstr "Give patch name and comment in file"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:779
-#, fuzzy
 msgid "Delete the logfile when done"
-msgstr "Delete the logfile when done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:780
 msgid "Keep the logfile when done [DEFAULT]"
@@ -16184,9 +14824,8 @@ msgid "Verify that the patch was signed by a key in PUBRING"
 msgstr "Verify that the patch was signed by a key in PUBRING"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:798
-#, fuzzy
 msgid "Verify using openSSL with authorized keys from file KEYS"
-msgstr "Verify using openSSL with authorized keys from specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:799
 msgid "Don't verify patch signature"
@@ -16201,23 +14840,20 @@ msgid "Equivalent to --dont-allow-conflicts, for backwards compatibility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:823
-#, fuzzy
 msgid "Reply to email-based patch using FROM address"
-msgstr "Reply to email-based patch using FROM address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:824
-#, fuzzy
 msgid "Mail results to additional EMAIL(s). Requires --reply"
-msgstr "Mail results to additional EMAIL(s). Requires --reply"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:825
 msgid "Forward unsigned messages without extra header"
 msgstr "Forward unsigned messages without extra header"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:826
-#, fuzzy
 msgid "Don't forward unsigned messages without extra header [DEFAULT]"
-msgstr "Forward unsigned messages without extra header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:842
 #: /tmp/fish/implicit/share/completions/darcs.fish:1008
@@ -16234,21 +14870,18 @@ msgid "Get patch files only as needed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:845
-#, fuzzy
 msgid "Don't save patch files in the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:846
 #: /tmp/fish/implicit/share/completions/darcs.fish:963
-#, fuzzy
 msgid "Get a complete copy of the repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:850
 #: /tmp/fish/implicit/share/completions/darcs.fish:883
-#, fuzzy
 msgid "Version specified by the context in FILENAME"
-msgstr "Send to context stored in FILENAME"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:855
 #: /tmp/fish/implicit/share/completions/darcs.fish:885
@@ -16273,14 +14906,12 @@ msgid "Minimal features. What older repos use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:937
-#, fuzzy
 msgid "Reorder the patches in the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:938
-#, fuzzy
 msgid "Specify a sibling directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
@@ -16299,9 +14930,8 @@ msgid "Optimize hashed pristine layout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:953
-#, fuzzy
 msgid "Uncompress patches"
-msgstr "Don't create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:1
 msgid "Read the value of a key"
@@ -16316,45 +14946,38 @@ msgid "Write a new value to a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:4
-#, fuzzy
 msgid "Delete a key or an entire directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:5
 msgid "Compile a binary database from keyfiles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:6
-#, fuzzy
 msgid "Update the system dconf databases"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:7
-#, fuzzy
 msgid "Watch a key or directory for changes"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:8
-#, fuzzy
 msgid "Dump an entire subpath to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dconf.fish:9
-#, fuzzy
 msgid "Populate a subpath from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:1
 #: /tmp/fish/implicit/share/completions/emacs.fish:52
 #: /tmp/fish/implicit/share/completions/hg.fish:15
-#, fuzzy
 msgid "display help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:3
-#, fuzzy
 msgid "Complete dd operands"
-msgstr "Compare FILE1 to all operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:1
 msgid "Restricts preferences operations to the current logged-in host"
@@ -16373,42 +14996,36 @@ msgid "Writes domain or or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:5
-#, fuzzy
 msgid "String as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:6
 msgid "Raw data bytes for given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:7
-#, fuzzy
 msgid "Integer as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:8
 msgid "Floating point number as the value for the given key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:9
-#, fuzzy
 msgid "Boolean as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:10
-#, fuzzy
 msgid "Date as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:11
-#, fuzzy
 msgid "Array as the value for the given key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:12
-#, fuzzy
 msgid "Add new elements to the end of an array"
-msgstr "Add text to the end of the selected area"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:13
 msgid "Add a dictionary to domain"
@@ -16419,9 +15036,8 @@ msgid "Add new key/value pairs to a dictionary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:15
-#, fuzzy
 msgid "Shows the type for the given domain, key"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:16
 msgid "Renames old_key to new_key"
@@ -16432,57 +15048,48 @@ msgid "Deletes domain or a key in the domain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:18
-#, fuzzy
 msgid "Prints the names of all domains in the users defaults system"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:19
 msgid "Searches for word in domain names, keys, and values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:20
-#, fuzzy
 msgid "Prints a list of possible command formats"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:1
-#, fuzzy
 msgid "Include empty file systems"
-msgstr "Include empty filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:2
-#, fuzzy
 msgid "Print file system type"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:3
-#, fuzzy
 msgid "Excluded file system type"
-msgstr "Excluded filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/df.fish:4
-#, fuzzy
 msgid "Show all file systems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:1
-#, fuzzy
 msgid "Background immediately"
-msgstr "Go to background immediately after startup"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:2
-#, fuzzy
 msgid "Use given script"
-msgstr "Update interval"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:3
 msgid "Generate an RFC 4361 compliant clientid"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:4
-#, fuzzy
 msgid "Echo debug messages to stderr & syslog"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:5
 msgid "Use last acquired lease if cannot obtain one"
@@ -16493,28 +15100,24 @@ msgid "Use last acquired lease if cannot obtain one even if expired"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
-#, fuzzy
 msgid "Reapply configuration for each interface"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:9
 msgid "Request DHCP server to update DNS using FQDN instead of hostname"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:10
-#, fuzzy
 msgid "Specify config to load instead of /etc/dhcpcd.conf"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:11
-#, fuzzy
 msgid "Send hostname to DHCP server"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:12
 msgid "Send given clientid"
@@ -16525,47 +15128,40 @@ msgid "Override DHCPv4 vendorclassid field sent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:14
-#, fuzzy
 msgid "Writes to specfied log file instead of syslog"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:15
 msgid "Release lease and de-configure interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:16
-#, fuzzy
 msgid "Request specific lease time in secs"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:17
-#, fuzzy
 msgid "Start dhcpcd in Master mode"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:18
 msgid "Set prefered interface based on given rank (lowest wins)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:19
-#, fuzzy
 msgid "Reload config and rebind specified interface"
-msgstr "Set source address to specified interface address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:20
-#, fuzzy
 msgid "Renew existing addresses on specified interface"
-msgstr "Set source address to specified interface address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:21
-#, fuzzy
 msgid "Request DHCP option"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:22
-#, fuzzy
 msgid "Keep configuration even when dhcpcd exits"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:23
 msgid "Request given address in DHCP DISCOVER message"
@@ -16576,19 +15172,16 @@ msgid "Request given address in DHCP INFORM message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:25
-#, fuzzy
 msgid "Perform DHCPv6 Information Request"
-msgstr "Requisição de informação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:26
-#, fuzzy
 msgid "Configure static DHCP value"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:27
-#, fuzzy
 msgid "Timeout after seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:28
 msgid "Tag DHCPv4 message with given userclass"
@@ -16603,9 +15196,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/htop.fish:8
 #: /tmp/fish/implicit/share/completions/pv.fish:33
 #: /tmp/fish/implicit/share/completions/subl.fish:9
-#, fuzzy
 msgid "Show version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:31
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:32
@@ -16621,29 +15213,24 @@ msgid "Allow reboot after secs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:1
-#, fuzzy
 msgid "Ignore case differences"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:2
-#, fuzzy
 msgid "Ignore case when comparing file names"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:3
-#, fuzzy
 msgid "Consider case when comparing file names"
-msgstr "Consider case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:4
-#, fuzzy
 msgid "Ignore changes due to tab expansion"
-msgstr "Ignore changes due to tab expansion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:5
-#, fuzzy
 msgid "Ignore changes in the amount of white space"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:6
 msgid "Ignore all white space"
@@ -16651,9 +15238,8 @@ msgstr "Ignorar todos os espaços em branco"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:7
 #: /tmp/fish/implicit/share/completions/git.fish:327
-#, fuzzy
 msgid "Ignore changes whose lines are all blank"
-msgstr "Ignore changes whose lines are all blank"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:8
 msgid "Ignore changes whose lines match the REGEX"
@@ -16661,47 +15247,40 @@ msgstr "Ignore changes whose lines match the REGEX"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:9
 #: /tmp/fish/implicit/share/completions/git.fish:323
-#, fuzzy
 msgid "Treat all files as text"
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:10
-#, fuzzy
 msgid "Recursively compare subdirectories"
-msgstr "Recursively compare subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:11
-#, fuzzy
 msgid "Treat absent files as empty"
-msgstr "Treat absent files as empty"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:12
 msgid "Output NUM lines of copied context"
 msgstr "Output NUM lines of copied context"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:13
-#, fuzzy
 msgid "Output 3 lines of copied context"
-msgstr "Output 3 lines of copied context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:14
 msgid "Output NUM lines of unified context"
 msgstr "Output NUM lines of unified context"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:15
-#, fuzzy
 msgid "Output 3 lines of unified context"
-msgstr "Output 3 lines of unified context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:16
-#, fuzzy
 msgid "Output only whether the files differ"
-msgstr "Output only whether the files differ"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:17
-#, fuzzy
 msgid "Output a normal diff"
-msgstr "Output a normal diff"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:18
 msgid "Output in two columns"
@@ -16712,23 +15291,20 @@ msgid "Output at most NUM print columns"
 msgstr "Output at most NUM print columns"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:20
-#, fuzzy
 msgid "Try to find a smaller set of changes"
-msgstr "Try to find a smaller set of changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:21
-#, fuzzy
 msgid "Compare FILE1 to all operands"
-msgstr "Compare FILE2 to all operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diff.fish:22
 msgid "Compare FILE2 to all operands"
 msgstr "Compare FILE2 to all operands"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:23
-#, fuzzy
 msgid "Pass the output through 'pr'"
-msgstr "Pass the output through “pr”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:1
 msgid "Use IPv4 query transport only"
@@ -16747,43 +15323,36 @@ msgid "Bind to source address/port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:5
-#, fuzzy
 msgid "Specify batch mode file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:6
-#, fuzzy
 msgid "Specify query class"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:7
-#, fuzzy
 msgid "Specify TSIG key file"
-msgstr "Specify makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:8
 msgid "specify named base64 TSIG key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:9
-#, fuzzy
 msgid "Specify port number"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:10
-#, fuzzy
 msgid "Specify query name"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:11
-#, fuzzy
 msgid "Specify query type"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:12
-#, fuzzy
 msgid "Reverse lookup"
-msgstr "Inverte a ordem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:13
 #: /tmp/fish/implicit/share/completions/killall.fish:10
@@ -16791,17 +15360,15 @@ msgstr "Inverte a ordem"
 #: /tmp/fish/implicit/share/completions/lsof.fish:1
 #: /tmp/fish/implicit/share/completions/lua.fish:5
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:1
-#, fuzzy
 msgid "Print help and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:14
 #: /tmp/fish/implicit/share/completions/feh.fish:55
 #: /tmp/fish/implicit/share/completions/fuser.fish:12
 #: /tmp/fish/implicit/share/completions/tree.fish:43
-#, fuzzy
 msgid "Print version and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:15
 msgid "TCP mode"
@@ -16824,9 +15391,8 @@ msgid "Deprecated, treated as a synonym for +[no]search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:20
-#, fuzzy
 msgid "Recursive mode"
-msgstr "Secure mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:21
 msgid "Dont revert to TCP for TC responses."
@@ -16869,9 +15435,8 @@ msgid "Control display of question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:31
-#, fuzzy
 msgid "Control display of answer"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:32
 msgid "Control display of authority"
@@ -16898,14 +15463,12 @@ msgid "Set or clear all display flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:38
-#, fuzzy
 msgid "Print question before sending"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:39
-#, fuzzy
 msgid "Search all authoritative nameservers"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:40
 msgid "ID responders in short answers"
@@ -16916,9 +15479,8 @@ msgid "Trace delegation down from root"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:42
-#, fuzzy
 msgid "Request DNSSEC records"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:43
 msgid "Request Name Server ID"
@@ -16933,19 +15495,16 @@ msgid "AXFR prints only one soa record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:46
-#, fuzzy
 msgid "Set number of UDP attempts"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:47
-#, fuzzy
 msgid "Set number of UDP retries"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:48
-#, fuzzy
 msgid "Set query timeout"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:49
 msgid "Set EDNS0 Max UDP packet size"
@@ -16956,9 +15515,8 @@ msgid "Set NDOTS value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:51
-#, fuzzy
 msgid "Set EDNS version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:1
 msgid "List disks"
@@ -16967,27 +15525,24 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/diskutil.fish:2
 #: /tmp/fish/implicit/share/completions/diskutil.fish:4
 #: /tmp/fish/implicit/share/completions/diskutil.fish:8
-#, fuzzy
 msgid "Return a property list"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:3
 msgid "Get detailed information about a specific whole disk or partition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:5
-#, fuzzy
 msgid "Process all disks"
-msgstr "Process all packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:6
 msgid "Continuously display system-wide disk manipulation activity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:7
-#, fuzzy
 msgid "Show the file system personalities available"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:9
 msgid "Unmount a single volume"
@@ -17006,18 +15561,16 @@ msgid "Mount a single volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:13
-#, fuzzy
 msgid "Specify mount point"
-msgstr "Specify a non-mountpoint dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:14
 msgid "Mount an entire disk (all mountable volumes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:15
-#, fuzzy
 msgid "Rename a volume"
-msgstr "Rename module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:16
 msgid "Enable journaling on an HFS+ volume"
@@ -17036,9 +15589,8 @@ msgid "Enable ownership of a volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:20
-#, fuzzy
 msgid "Disable ownership of a volume"
-msgstr "Disable import of site module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:21
 msgid "Verify the file system data structures of a volume"
@@ -17057,9 +15609,8 @@ msgid "Repair the partition map layout of a whole disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:25
-#, fuzzy
 msgid "Erase an existing disk"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/diskutil.fish:26
 msgid "Write out a new empty file system volume"
@@ -17133,15 +15684,13 @@ msgid "Exit program when this window id is destroyed [id]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:53
-#, fuzzy
 msgid "Write image to a file [filename]"
-msgstr "Write size for all files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:54
 #: /tmp/fish/implicit/share/completions/montage.fish:72
-#, fuzzy
 msgid "Automagically orient image"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:62
 msgid "Straighten an image [threshold]"
@@ -17170,9 +15719,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:69
 #: /tmp/fish/implicit/share/completions/montage.fish:79
-#, fuzzy
 msgid "Flop image in the horizontal direction"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/display.fish:70
 #: /tmp/fish/implicit/share/completions/montage.fish:80
@@ -17208,14 +15756,12 @@ msgid "Threshold the image [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:1
-#, fuzzy
 msgid "ls -ldF all files in the package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dlocate.fish:2
-#, fuzzy
 msgid "du -sck all files in the package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:1
 msgid "Clear the kernel ring buffer"
@@ -17238,15 +15784,12 @@ msgid "Enable printing messages to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:6
-#, fuzzy
 msgid "Use the file instead of the kernel log buffer"
 msgstr ""
-"Usa o arquivo especificado em vez do banco de dados de confiança padrão"
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:7
-#, fuzzy
 msgid "Restrict output to defined facilities"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:8
 #: /tmp/fish/implicit/share/completions/m4.fish:1
@@ -17254,124 +15797,104 @@ msgstr "Escreve a saída no arquivo especificado"
 #: /tmp/fish/implicit/share/completions/timeout.fish:4
 #: /tmp/fish/implicit/share/completions/watch.fish:11
 #: /tmp/fish/implicit/share/completions/xgettext.fish:38
-#, fuzzy
 msgid "Display this help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:9
-#, fuzzy
 msgid "Display kernel messages"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:10
-#, fuzzy
 msgid "Restrict output to defined levels"
-msgstr "Redirecionar saída para arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:11
 msgid "Set level of messages printed to console"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:12
-#, fuzzy
 msgid "Print the raw message buffer"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:13
 msgid "Buffer size to query the kernel ring buffer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:14
-#, fuzzy
 msgid "Show human readable timestamp "
-msgstr "Tamanhos entendíveis para humanos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:15
 msgid "Don't print messages timestamp"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:16
-#, fuzzy
 msgid "Display userspace messages"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dmesg.fish:18
 msgid "Decode facility and level to readable string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:1
-#, fuzzy
 msgid "Install .deb package"
-msgstr "Instalar novo pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:2
-#, fuzzy
 msgid "Unpack .deb package"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:3
-#, fuzzy
 msgid "Configure package"
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:4
-#, fuzzy
 msgid "Remove package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:5
-#, fuzzy
 msgid "Purge package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:6
-#, fuzzy
 msgid "Verify contents of package"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:7
 msgid "Continue on all problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:8
-#, fuzzy
 msgid "Build package from directory"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:9
-#, fuzzy
 msgid "List contents of .deb"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:10
-#, fuzzy
 msgid "Show .deb information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:11
-#, fuzzy
 msgid "List packages matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:12
-#, fuzzy
 msgid "List contents of packages"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:13
-#, fuzzy
 msgid "Print status of package"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:14
-#, fuzzy
 msgid "Search for packages containing file"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:3
-#, fuzzy
 msgid "Set configuration frontend"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:4
 msgid "Set priority threshold"
@@ -17386,24 +15909,20 @@ msgid "Show only unseen question"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:7
-#, fuzzy
 msgid "Reconfigure also inconsistent packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:8
-#, fuzzy
 msgid "Prevent reloading templates"
-msgstr "Prepend string to relative links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:1
-#, fuzzy
 msgid "Get current status of the dropboxd"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:2
-#, fuzzy
 msgid "Provide help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:3
 msgid "Return 1 if dropbox is running"
@@ -17430,14 +15949,12 @@ msgid "Get current sync status of one or more files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:9
-#, fuzzy
 msgid "List directory contents with current sync status"
-msgstr "List directory entries in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:10
-#, fuzzy
 msgid "Ignores/excludes a directory from syncing"
-msgstr "Ignore specified number of directory components"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:11
 msgid "Enables or disables LAN sync"
@@ -17454,24 +15971,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:14
-#, fuzzy
 msgid "Do not ignore entries starting with ."
-msgstr "Ignora arquivos terminados com ~"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:15
-#, fuzzy
 msgid "Prints a list of directories currently excluded from syncing"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:16
-#, fuzzy
 msgid "Adds one or more directories to the exclusion list"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:17
-#, fuzzy
 msgid "Removes one or more directories from the exclusion list"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:1
 msgid "Write size for all files"
@@ -17530,62 +16043,53 @@ msgid "Display only a total for each argument"
 msgstr "Display only a total for each argument"
 
 #: /tmp/fish/implicit/share/completions/du.fish:14
-#, fuzzy
 msgid "Skip other file systems"
-msgstr "Skip other filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:15
-#, fuzzy
 msgid "Exclude files that match pattern in file"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:16
 #: /tmp/fish/implicit/share/completions/ncdu.fish:5
-#, fuzzy
 msgid "Exclude files that match pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:17
-#, fuzzy
 msgid "Recursion limit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:1
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:13
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:14
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:15
 #: /tmp/fish/implicit/share/completions/netctl.fish:17
-#, fuzzy
 msgid "Profile"
-msgstr "Conf file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:2
 msgid "Get usage help text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:3
-#, fuzzy
 msgid "Creates a configuration profile"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:4
 msgid "Backup with pre/post script execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:5
-#, fuzzy
 msgid "Backup without executing pre/post scripts"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:6
-#, fuzzy
 msgid "Execute <profile>/pre script"
-msgstr "Don't execute pre scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:7
-#, fuzzy
 msgid "Execute <profile>/post script"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:8
 msgid "Force full backup"
@@ -17646,73 +16150,60 @@ msgid "Don"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:22
-#, fuzzy
 msgid "Output verbosity level"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:1
-#, fuzzy
 msgid "Do not output a newline"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:2
-#, fuzzy
 msgid "Do not separate arguments with spaces"
-msgstr "Do not export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:3
-#, fuzzy
 msgid "Disable backslash escapes"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/echo.fish:4
-#, fuzzy
 msgid "Enable backslash escapes"
-msgstr "Use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:1
-#, fuzzy
 msgid "Show a help screen and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:3
-#, fuzzy
 msgid "Dump variables to stdout"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:4
-#, fuzzy
 msgid "Dump default values of variables to stdout"
-msgstr "Copy module file to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:5
-#, fuzzy
 msgid "Print non-matching entries first"
-msgstr "Print first non-matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:6
 msgid "Don't read unguessable slots of installed packages (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:7
-#, fuzzy
 msgid "Always read slots of installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:8
-#, fuzzy
 msgid "(no) output (toggle)"
-msgstr "Acrescentar saída a arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:9
-#, fuzzy
 msgid "Don't use ANSI color codes"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:10
-#, fuzzy
 msgid "Force colorful output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:11
 msgid "Compact search results (toggle)"
@@ -17731,9 +16222,8 @@ msgid "Print available versions line-by-line (toggle)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:15
-#, fuzzy
 msgid "Format string for normal output"
-msgstr "Parada para saída de terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:16
 msgid "Format string for compact output"
@@ -17744,24 +16234,20 @@ msgid "Format string for verbose output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:18
-#, fuzzy
 msgid "Next expression only matches installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:19
-#, fuzzy
 msgid "Match packages installed in several versions"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:20
-#, fuzzy
 msgid "Match duplicated packages"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:21
-#, fuzzy
 msgid "Match packages with duplicated versions"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:22
 msgid "Match packages with a nontrivial slot"
@@ -17772,19 +16258,16 @@ msgid "Match packages with two different slots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:24
-#, fuzzy
 msgid "Match packages without best slotted version"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:25
-#, fuzzy
 msgid "Match packages from overlays"
-msgstr "Fetch package from STDIN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:26
-#, fuzzy
 msgid "Match packages with obsolete entries"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:27
 msgid "Invert the expression (toggle)"
@@ -17795,62 +16278,52 @@ msgid "Use input from pipe of emerge -pv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:29
-#, fuzzy
 msgid "Search the description field"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:30
-#, fuzzy
 msgid "Search the category and name fields"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:31
-#, fuzzy
 msgid "Search the category field"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:32
-#, fuzzy
 msgid "Search the name field (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:33
-#, fuzzy
 msgid "Search the homepage field"
-msgstr "Read log message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:34
-#, fuzzy
 msgid "Search the license field"
-msgstr "Use source index field"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:35
 msgid "Search the provides field"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:36
-#, fuzzy
 msgid "Pattern is a regexp (default)"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:37
-#, fuzzy
 msgid "Pattern is the exact string"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:38
-#, fuzzy
 msgid "Pattern is a wildcards-pattern"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix.fish:39
 msgid "Use fuzzy-search with the given max. levenshtein-distance (default: 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:1
-#, fuzzy
 msgid "Ignore all previous options"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:2
 msgid "Only show differences to the previously saved database and exit"
@@ -17870,9 +16343,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:6
-#, fuzzy
 msgid "Update database only and show differences"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:7
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
@@ -17911,26 +16383,22 @@ msgid "Really recreate the dep-cache (rm -rf /var/cache/edb/dep/*) (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:16
-#, fuzzy
 msgid "Do not really recreate the dep-cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/eix-sync.fish:17
-#, fuzzy
 msgid "Show a short help text and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:1
 #: /tmp/fish/implicit/share/completions/iex.fish:1
-#, fuzzy
 msgid "Prints version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:2
 #: /tmp/fish/implicit/share/completions/iex.fish:2
-#, fuzzy
 msgid "Evaluates the given command"
-msgstr "Evaluate parameters as a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:3
 #: /tmp/fish/implicit/share/completions/iex.fish:3
@@ -17939,9 +16407,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:4
 #: /tmp/fish/implicit/share/completions/iex.fish:4
-#, fuzzy
 msgid "Finds and executes the given script"
-msgstr "Don't execute preun scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:5
 #: /tmp/fish/implicit/share/completions/iex.fish:5
@@ -17960,9 +16427,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:8
 #: /tmp/fish/implicit/share/completions/iex.fish:8
-#, fuzzy
 msgid "Start the given app and its dependencies"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:9
 #: /tmp/fish/implicit/share/completions/iex.fish:9
@@ -17999,14 +16465,12 @@ msgid "Does not halt the Erlang VM after execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:1
-#, fuzzy
 msgid "do not do interactive display; implies -q"
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:2
-#, fuzzy
 msgid "change to directory DIR"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:3
 msgid "start a server in the background"
@@ -18033,9 +16497,8 @@ msgid "do not load loadup.el into bare Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:9
-#, fuzzy
 msgid "do not load site-start.el"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:10
 msgid "do not add site-lisp directories to load-path"
@@ -18071,9 +16534,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:18
 #: /tmp/fish/implicit/share/completions/emacs.fish:19
-#, fuzzy
 msgid "evaluate Emacs Lisp expression EXPR"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:20
 #: /tmp/fish/implicit/share/completions/emacs.fish:21
@@ -18086,14 +16548,12 @@ msgid "call Emacs Lisp function FUNC with no arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:23
-#, fuzzy
 msgid "insert contents of FILE into current buffer"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:24
-#, fuzzy
 msgid "exit without asking for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:25
 msgid "load Emacs Lisp FILE using the load function"
@@ -18104,23 +16564,20 @@ msgid "override color mode for character terminals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:28
-#, fuzzy
 msgid "window background color"
-msgstr "Alterar cor de fundo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:29
 msgid "disable many display features; used for debugging Emacs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:30
-#, fuzzy
 msgid "main border color"
-msgstr "Alterar cor de fundo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:31
-#, fuzzy
 msgid "width of main border"
-msgstr "Show changes in reverse order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:32
 msgid "color of the Emacs cursor indicating point"
@@ -18131,9 +16588,8 @@ msgid "default font; must be fixed-width"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:34
-#, fuzzy
 msgid "window foreground color"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:35
 msgid "make the first frame high as the screen"
@@ -18181,9 +16637,8 @@ msgid "title for initial Emacs frame"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:46
-#, fuzzy
 msgid "disable blinking cursor"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:47
 msgid "switch foreground and background"
@@ -18194,45 +16649,36 @@ msgid "enable vertical scroll bars"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:50
-#, fuzzy
 msgid "set additional X resources"
-msgstr "Requer um comando adicional"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:51
-#, fuzzy
 msgid "set parent window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:1
 #: /tmp/fish/implicit/share/completions/equery.fish:1
-#, fuzzy
 msgid ""
 "Prints completions for installed packages on the system from /var/db/pkg"
 msgstr ""
-"Prints completions for installed packages on the system from /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:2
 #: /tmp/fish/implicit/share/completions/equery.fish:2
-#, fuzzy
 msgid ""
 "Prints completions for all available packages on the system from /usr/portage"
 msgstr ""
-"Prints completions for installed packages on the system from /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:3
-#, fuzzy
 msgid ""
 "Tests if emerge command should have an installed package as potential "
 "completion"
-msgstr "Test if emerge command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:4
-#, fuzzy
 msgid ""
 "Print completions for all packages including the version compare if that is "
 "already typed"
 msgstr ""
-"Prints completions for installed packages on the system from /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:5
 msgid "Synchronize the portage tree"
@@ -18243,14 +16689,12 @@ msgid "Get informations to include in bug reports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:7
-#, fuzzy
 msgid "Displays the version number of emerge"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:8
-#, fuzzy
 msgid "Displays help information for emerge"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:9
 msgid "Remove packages that will not affect the functionality of the system"
@@ -18266,45 +16710,36 @@ msgid "WARNING: Delete all packages that are neither deps nor in world"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:12
-#, fuzzy
 msgid "Process all meta-cache files"
-msgstr "Process all packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:13
-#, fuzzy
 msgid "WARNING: Remove all but the latest version of package"
 msgstr ""
-"Removes all but the most recently installed version of a package from your "
-"system"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:14
 msgid "Check and update the dependency cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Resume the last merge operation"
-msgstr "Resumes the last merge operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Search for matches in the portage tree"
 msgstr ""
-"Searches for matches of the supplied string in the current local portage tree"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:17
 msgid "Search for matches in package names and descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:18
-#, fuzzy
 msgid "WARNING: Remove the given package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:19
-#, fuzzy
 msgid "Update the given package"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:20
 msgid "Sort flag lists alphabetically"
@@ -18319,41 +16754,36 @@ msgid "Build a binary package additionally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:23
-#, fuzzy
 msgid "Only build a binary package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:24
 msgid "Show changelog of package. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:25
-#, fuzzy
 msgid "Toggle colorized output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:26
 msgid "Align output. Use with --pretend"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:27
-#, fuzzy
 msgid "Run in debug mode"
-msgstr "Run in dummy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:28
 msgid "Consider the whole dependency tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:29
-#, fuzzy
 msgid "Reinstall all world packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:30
-#, fuzzy
 msgid "Only download the packages but don't install them"
-msgstr "Orders the package listing by install time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:31
 msgid "Same as --fetchonly and grab all potential files"
@@ -18372,118 +16802,100 @@ msgid "Ignore EMERGE_DEFAULT_OPTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:35
-#, fuzzy
 msgid "Include installed packages with changed USE flags"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:36
-#, fuzzy
 msgid "Disregard merge records"
-msgstr "Disregard ignores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:37
-#, fuzzy
 msgid "Don't merge dependencies"
-msgstr "Don't ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:38
-#, fuzzy
 msgid "Skip already installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:39
-#, fuzzy
 msgid "Disable the spinner"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:40
-#, fuzzy
 msgid "Don't add packages to world"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:41
-#, fuzzy
 msgid "Only merge dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:42
 msgid "Display what would be done without doing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:43
-#, fuzzy
 msgid "Use a condensed output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:44
 msgid "Remove the first package in the resume list. Use with --resume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:45
-#, fuzzy
 msgid "Show the dependency tree"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:46
-#, fuzzy
 msgid "Use binary package if available"
-msgstr "Build index if unavailable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:47
-#, fuzzy
 msgid "Only use binary packages"
-msgstr "Only accept source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:48
-#, fuzzy
 msgid "Run  in  verbose  mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:49
-#, fuzzy
 msgid "Toggle build time dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:1
 msgid "Unmount when idle for specified MINUTES"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:2
-#, fuzzy
 msgid "Run in the foreground"
-msgstr "Envia tarefa para primeiro plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:3
 msgid "Verbose messages when run foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:4
-#, fuzzy
 msgid "Run in single threaded mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:5
 msgid "Enables debugging within the FUSE library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:6
-#, fuzzy
 msgid "Return data even from corrupted files"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:7
 msgid "Make files public to all other users"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:8
-#, fuzzy
 msgid "Mount the filesystem on-demand"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:9
-#, fuzzy
 msgid "Produce encrypted view of plain files"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:10
 msgid "Use standard options when creating filesystem"
@@ -18494,23 +16906,20 @@ msgid "Pass on options to FUSE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:12
-#, fuzzy
 msgid "Don't use the default FUSE flags"
-msgstr "Don't set default repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:13
 msgid "Get password from an external program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:14
-#, fuzzy
 msgid "Read password from standard input"
-msgstr "Ler senha a partir do ARQUIVO"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:15
-#, fuzzy
 msgid "Turn off key validation checking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:1
 msgid ""
@@ -18523,14 +16932,12 @@ msgid "Clears the screen before running the utility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/entr.fish:4
-#, fuzzy
 msgid "Output version information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:1
-#, fuzzy
 msgid "Redefine variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:2
 #: /tmp/fish/implicit/share/completions/nice.fish:1
@@ -18539,22 +16946,18 @@ msgid "Command"
 msgstr "Command"
 
 #: /tmp/fish/implicit/share/completions/env.fish:3
-#, fuzzy
 msgid "Start with an empty environment"
-msgstr "Tentou tirar de uma pilha de ambiente vazia."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:4
-#, fuzzy
 msgid "Remove variable from the environment"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
-#, fuzzy
 msgid ""
 "Prints completions for all available categories on the system from /usr/"
 "portage"
 msgstr ""
-"Prints completions for installed packages on the system from /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/equery.fish:4
 msgid "causes minimal output to be emitted"
@@ -18565,14 +16968,12 @@ msgid "turns off colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:6
-#, fuzzy
 msgid "displays a help summary"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:7
-#, fuzzy
 msgid "displays the equery version"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:8
 msgid "turns off pipe detection"
@@ -18591,42 +16992,36 @@ msgid "stop when first match found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:12
-#, fuzzy
 msgid "search in all available packages (slow)"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:13
-#, fuzzy
 msgid "search direct dependencies only (default)"
-msgstr "List dependencies of module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:14
 msgid "search indirect dependencies (very slow)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:15
-#, fuzzy
 msgid "do not show USE flags"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:16
-#, fuzzy
 msgid "do not use fancy formatting"
-msgstr "Não pôde obter informação do usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:17
-#, fuzzy
 msgid "output the timestamp of each file"
-msgstr "Output content of files/URLs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:18
 msgid "output the md5sum of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:19
-#, fuzzy
 msgid "output the type of each file"
-msgstr "Output content of files/URLs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:20
 msgid "filter output based on files type or path (comma separated list)"
@@ -18634,15 +17029,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:21
 #: /tmp/fish/implicit/share/completions/equery.fish:25
-#, fuzzy
 msgid "search installed packages (default)"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:22
 #: /tmp/fish/implicit/share/completions/equery.fish:26
-#, fuzzy
 msgid "do not search installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:23
 #: /tmp/fish/implicit/share/completions/equery.fish:27
@@ -18663,89 +17056,75 @@ msgid "list only those packages that exactly match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:31
-#, fuzzy
 msgid "only list installed duplicate packages"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:32
-#, fuzzy
 msgid "report size in bytes"
-msgstr "Show sizes in gigabytes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/equery.fish:33
-#, fuzzy
 msgid "include non-installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:1
 msgid "The page of the document to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:2
-#, fuzzy
 msgid "Run evince in fullscreen mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:3
-#, fuzzy
 msgid "Run evince in presentation mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:4
 msgid "Run evince as a previewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/evince.fish:5
-#, fuzzy
 msgid "X display to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:1
-#, fuzzy
 msgid "Test if exercism has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:3
-#, fuzzy
 msgid "turn on verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:4
 #: /tmp/fish/implicit/share/completions/exercism.fish:19
 #: /tmp/fish/implicit/share/completions/ninja.fish:8
 #: /tmp/fish/implicit/share/completions/quilt.fish:1
-#, fuzzy
 msgid "show help"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:5
-#, fuzzy
 msgid "print the version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:6
-#, fuzzy
 msgid "Writes config values to a JSON file."
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:7
-#, fuzzy
 msgid "Outputs useful debug information."
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:8
-#, fuzzy
 msgid "Downloads a solution given the ID of the latest iteration."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:9
 msgid "Fetches the next unsubmitted problem in each track."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:10
-#, fuzzy
 msgid "Lists the available problems for a language track, given its ID."
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:11
 msgid ""
@@ -18772,18 +17151,16 @@ msgid "Submits a new iteration to a problem on exercism.io."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:16
-#, fuzzy
 msgid "Lists the available language tracks."
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:17
 msgid "REMOVED"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:18
-#, fuzzy
 msgid "Upgrades the CLI to the latest released version."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exit.fish:2
 msgid "Quit with normal exit status"
@@ -18802,9 +17179,8 @@ msgid "have tabs NUMBER characters apart, not 8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/expand.fish:3
-#, fuzzy
 msgid "use comma separated list of explicit tab positions"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:1
 msgid "create a backup of one or several jails"
@@ -18823,9 +17199,8 @@ msgid "jail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:3
-#, fuzzy
 msgid "manage specific jails"
-msgstr "Use specific conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:5
 msgid "attach your console to a running jail"
@@ -18844,19 +17219,16 @@ msgid "dump diffs between jail initialisation and freeze time into a flavour"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:12
-#, fuzzy
 msgid "create the basejail from binary packages"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:13
-#, fuzzy
 msgid "list all jails"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:14
-#, fuzzy
 msgid "restart a running jail"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:16
 msgid "create new jails from archived versions"
@@ -18867,34 +17239,29 @@ msgid "create a snapshot of a jail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:19
-#, fuzzy
 msgid "start a jail"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:21
-#, fuzzy
 msgid "stop a running jail"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:23
 msgid "check for reasons for the jails to fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:24
-#, fuzzy
 msgid "create or update the basejail from source"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:1
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:2
-#, fuzzy
 msgid "show this help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:2
-#, fuzzy
 msgid "print detailed info about command NAME"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:3
 msgid "formats --list, choices: short, normal, nested"
@@ -18909,9 +17276,8 @@ msgid "Force sudo password prompt up-front"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:6
-#, fuzzy
 msgid "print list of possible commands and exit"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:7
 msgid "comma separated KEY=VALUE pairs to set Fab env vars"
@@ -18923,14 +17289,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:9
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:1
-#, fuzzy
 msgid "show program's version number and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:10
-#, fuzzy
 msgid "don't user the running SSH agent"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:11
 msgid "forward local agent to remote end"
@@ -18941,14 +17305,12 @@ msgid "abort instead of prompting (for password, host, etc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:13
-#, fuzzy
 msgid "specify location of config file to use"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:14
-#, fuzzy
 msgid "Color error output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:15
 msgid "do not load user known_hosts file"
@@ -18967,9 +17329,8 @@ msgid "gateway host to connect through"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:19
-#, fuzzy
 msgid "Use GSS-API authentication"
-msgstr "Force pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:20
 msgid "Delegate GSS-API client credentials or not"
@@ -18980,14 +17341,12 @@ msgid "Perform GSS-API Key Exchange and user authentication"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:22
-#, fuzzy
 msgid "comma-separated list of output levels to hide"
-msgstr "Formato separado por vírgula"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:23
-#, fuzzy
 msgid "comma-separated list of hosts to operate on"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:24
 msgid "path to SSH private key file. May be repeated."
@@ -19010,14 +17369,12 @@ msgid "make M attempts to connect before giving up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:29
-#, fuzzy
 msgid "do not use pseudo-terminal in run/sudo"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:30
-#, fuzzy
 msgid "password for use with authentication and/or sudo"
-msgstr "Prompt for password for authenticating server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:31
 msgid "default to parallel execution method"
@@ -19028,9 +17385,8 @@ msgid "SSH connection port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:33
-#, fuzzy
 msgid "reject unknown hosts"
-msgstr "Opção desconhecida: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:34
 msgid "password for use with sudo only"
@@ -19041,42 +17397,36 @@ msgid "load system known_hosts file before reading user known_hosts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:36
-#, fuzzy
 msgid "comma-separated list of roles to operate on"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:37
 msgid "specify a new shell, defaults to '/bin/bash -l -c'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:38
-#, fuzzy
 msgid "comma-separated list of output levels to show"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:39
 msgid "skip over hosts that can't be reached"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:40
-#, fuzzy
 msgid "skip over unknown tasks"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:41
-#, fuzzy
 msgid "Path to SSH config file"
-msgstr "Prepend string to relative links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:42
-#, fuzzy
 msgid "set connection timeout to N seconds"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:43
-#, fuzzy
 msgid "set remote command timeout to N seconds"
-msgstr "Set the default SCSI command timeout value to # seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:44
 msgid "username to use when connecting to remote hosts"
@@ -19087,19 +17437,16 @@ msgid "warn, instead of abort, when commands fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:46
-#, fuzzy
 msgid "comma-separated list of hosts to exclude"
-msgstr "Formato separado por vírgula"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:47
-#, fuzzy
 msgid "number of concurrent processes to use in parallel mode"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:1
-#, fuzzy
 msgid "Specify a shell command as action to perform on the image"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:2
 msgid "Zoom pictures to screen size"
@@ -19126,33 +17473,28 @@ msgid "Exit feh after one loop through the slideshow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:8
-#, fuzzy
 msgid "Draw the defined actions"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:9
-#, fuzzy
 msgid "Display some EXIF information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:10
-#, fuzzy
 msgid "Draw filename"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:11
 msgid "Show overlay texts on semi-transparent background"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:12
-#, fuzzy
 msgid "Set global font"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:13
-#, fuzzy
 msgid "Add given path as directory to search fonts"
-msgstr "Display the session key used for one message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:14
 msgid "Disable antialiasing for zooming, bg settings, etc."
@@ -19167,32 +17509,28 @@ msgid "Limit window size. Format: [w x h] [+ x + y]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:17
-#, fuzzy
 msgid "Hide pointer"
-msgstr "Job list pointer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:18
 msgid "Use style as background for transparent image parts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:19
-#, fuzzy
 msgid "Enable index mode"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:20
-#, fuzzy
 msgid "Show image information based on given format"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:21
 msgid "Execute given command line and display its output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:22
-#, fuzzy
 msgid "Keep files fetched using HTTP"
-msgstr "Recurse, skip file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:23
 msgid "Disable strict hostname and peer checking with HTTPS"
@@ -19227,14 +17565,12 @@ msgid "Only show image which are larger then given size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:31
-#, fuzzy
 msgid "Enable montage mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:32
-#, fuzzy
 msgid "Disable slideshow mode"
-msgstr "Disable the use of cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:33
 msgid "Don't jump to first image after resorting filelist"
@@ -19249,37 +17585,32 @@ msgid "Don't limit window to screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:36
-#, fuzzy
 msgid "Disable Xinerama support"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:37
-#, fuzzy
 msgid "Save files to given directory"
-msgstr "Read files under each directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:38
 msgid "Preload images"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:39
-#, fuzzy
 msgid "Don't report non-fatal errors"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:40
 msgid "Randomize file list before displaying"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:41
-#, fuzzy
 msgid "Recursivly expand any directory"
-msgstr "Recursively compare subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:42
-#, fuzzy
 msgid "Don't recursively expand any directory (default)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:43
 msgid "Reload filelist after given time in second"
@@ -19308,23 +17639,20 @@ msgid "Sort file list with given parameter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:49
-#, fuzzy
 msgid "Start the filelist at given filename"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:50
-#, fuzzy
 msgid "Load options from given config file"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:51
 msgid "Set given title for window opended from thumbnail mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:52
-#, fuzzy
 msgid "Set window title"
-msgstr "Select window by id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:53
 msgid "Just print names of images that can't be loaded by imlib2"
@@ -19351,9 +17679,8 @@ msgid "Limit montage's height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:61
-#, fuzzy
 msgid "Limit montage's width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:62
 msgid "Save created montage to given file"
@@ -19384,9 +17711,8 @@ msgid "Set font to print title on index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:69
-#, fuzzy
 msgid "Center file on background"
-msgstr "Envia tarefa para segundo plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:70
 msgid "Fit file into background by zooming until image fits"
@@ -19407,47 +17733,40 @@ msgid "Tile image if too small for screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:74
-#, fuzzy
 msgid "Do not write a ~/.fehbg file"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:1
-#, fuzzy
 msgid "Select font"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:2
-#, fuzzy
 msgid "Change font directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:3
-#, fuzzy
 msgid "Center output horizontally"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:4
 msgid "Make output flush-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:5
-#, fuzzy
 msgid "Make output flush-right"
-msgstr "Make output a valid ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:6
 msgid "Set justification according to text direction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:7
-#, fuzzy
 msgid "Set output to terminal width"
-msgstr "Never write output to terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:8
-#, fuzzy
 msgid "Set output width"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:10
 msgid "Put FIGlet back to normal"
@@ -19458,9 +17777,8 @@ msgid "Switch to German (ISO 646-DE) character set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:12
-#, fuzzy
 msgid "Turns off German character set processing"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:13
 msgid "Add given control file"
@@ -19479,33 +17797,28 @@ msgid "Specify layout mode between 1 and 63"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:21
-#, fuzzy
 msgid "Print version and copyright"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:22
-#, fuzzy
 msgid "Print information given infocode"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:23
-#, fuzzy
 msgid "Print left-to-right"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:24
 msgid "Print right-to-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:25
-#, fuzzy
 msgid "Print with default text direction"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:1
-#, fuzzy
 msgid "Do not prepend filenames to output lines"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:2
 msgid "Print the parsed form of the magic file"
@@ -19516,18 +17829,16 @@ msgid "Write an output file containing a pre-parsed version of file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:4
-#, fuzzy
 msgid "Do not follow symlinks"
-msgstr "Não segue links simbólicos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:5
 msgid "Output mime type strings instead human readable strings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:6
-#, fuzzy
 msgid "Don't stop at the first match"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:8
 msgid "Flush stdout after checking each file"
@@ -19550,9 +17861,8 @@ msgid "Read block and character device files too"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:13
-#, fuzzy
 msgid "Print the version of the program and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:14
 msgid "Try to look inside compressed files"
@@ -19560,9 +17870,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:15
 #: /tmp/fish/implicit/share/completions/gv.fish:33
-#, fuzzy
 msgid "Print a help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:16
 msgid "Read  the  names of the files to be examined from a file"
@@ -19573,14 +17882,12 @@ msgid "Use other string as result field separator instead of :"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:18
-#, fuzzy
 msgid "Alternate list of files containing magic numbers"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:1
-#, fuzzy
 msgid "Never follow symlinks"
-msgstr "Never follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:3
 msgid ""
@@ -19593,9 +17900,8 @@ msgid "Measure from the beginning of today rather than  from  24  hours ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:5
-#, fuzzy
 msgid "Process subdirectories before the directory itself"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:7
 msgid ""
@@ -19605,9 +17911,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/find.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:66
 #: /tmp/fish/implicit/share/completions/zfs.fish:76
-#, fuzzy
 msgid "Maximum recursion depth"
-msgstr "Maximum resident set size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:9
 msgid "Do not apply any tests or actions at levels less than specified level"
@@ -19628,28 +17933,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:13
-#, fuzzy
 msgid "Specify regular expression type"
-msgstr "Specify kernel version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:15
-#, fuzzy
 msgid "Turn warnings on"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:16
-#, fuzzy
 msgid "Turn warnings off"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:17
 msgid "File last accessed specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:18
-#, fuzzy
 msgid "File last accessed more recently than file was modified"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:19
 msgid "File last accessed specified number of days ago"
@@ -19673,29 +17974,24 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:24
 #: /tmp/fish/implicit/share/completions/test.fish:31
-#, fuzzy
 msgid "File is executable"
-msgstr "File is writable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
-msgstr "Always reformat"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
-#, fuzzy
 msgid "File is on filesystem of specified type"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:27
-#, fuzzy
 msgid "Numeric group id of file"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:28
-#, fuzzy
 msgid "Group name of file"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 # Notas:
 # Adicionar nota
@@ -19703,19 +17999,16 @@ msgstr "Mostra inode dos arquivos"
 # Caminhos:
 # share/functions/__fish_complete_ls.fish:49
 #: /tmp/fish/implicit/share/completions/find.fish:29
-#, fuzzy
 msgid "File is symlink matching specified case insensitive pattern"
-msgstr "Não lista entradas com o padrão especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:30
-#, fuzzy
 msgid "File name matches case insensitive pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:31
-#, fuzzy
 msgid "File has specified inode number"
-msgstr "Filtrar pelo programa especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:32
 msgid "File path matches case insensitive pattern"
@@ -19726,32 +18019,28 @@ msgid "File name matches case insensetive regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:34
-#, fuzzy
 msgid "File has specified number of links"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:35
-#, fuzzy
 msgid "File is symlink matching specified pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:36
 msgid "File last modified specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:37
-#, fuzzy
 msgid "File last modified more recently than file was modified"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:38
 msgid "File last modified specified number of days ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:39
-#, fuzzy
 msgid "File name matches pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:40
 msgid "No user corresponds to file's numeric user ID"
@@ -19762,44 +18051,36 @@ msgid "No group corresponds to file's numeric group ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:42
-#, fuzzy
 msgid "File path matches pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:43
-#, fuzzy
 msgid "Files has specified permissions set"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:44
-#, fuzzy
 msgid "File name matches regex"
-msgstr "Ignore changes matching regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:45
-#, fuzzy
 msgid "File refers to the same inode as specified file"
-msgstr "Exceto arquivos listados no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:46
-#, fuzzy
 msgid "File uses specified units of space"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
-msgstr "Sempre"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
-#, fuzzy
 msgid "File is of specified type"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:49
-#, fuzzy
 msgid "File's owner has specified numeric user ID"
-msgstr "File owned by effective user ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:50
 msgid ""
@@ -19808,9 +18089,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:51
-#, fuzzy
 msgid "File's owner"
-msgstr "File is socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:52
 msgid ""
@@ -19819,51 +18099,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:53
-#, fuzzy
 msgid "File's security context matches specified pattern"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:54
-#, fuzzy
 msgid "Delete selected files"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
-msgstr "Executa comando se o comando anterior falhou"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:57
-#, fuzzy
 msgid "List file in ls -dils format, write to specified file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:58
-#, fuzzy
 msgid "Print full file names into specified file"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:59
 msgid "Print null separated full file names into specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:60
-#, fuzzy
 msgid "Print formated data into specified file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:61
 msgid "Execute specified command for each located file after asking user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:62
-#, fuzzy
 msgid "Print full file names"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:63
 msgid ""
@@ -19872,33 +18145,28 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:64
-#, fuzzy
 msgid "Print null separated full file names"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
-#, fuzzy
 msgid "Print formated data"
-msgstr "Imprime texto formatado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:66
 msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
-msgstr "Sai do shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
-#, fuzzy
 msgid "List file in ls -dils format"
-msgstr "List bugs in rss format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
-#, fuzzy
 msgid "Negate result of action"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -19929,9 +18197,8 @@ msgid "Output profiling information to specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:8
-#, fuzzy
 msgid "Run with the specified verbosity level"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:3
 msgid "Do not indent output, only reformat into one job per line"
@@ -19942,9 +18209,8 @@ msgid "Colorize the output using ANSI escape sequences"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:5
-#, fuzzy
 msgid "Output in HTML format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:6
 #: /tmp/fish/implicit/share/completions/sort.fish:15
@@ -19952,28 +18218,24 @@ msgid "Write to file"
 msgstr "Escreve para o arquivo"
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:7
-#, fuzzy
 msgid "Enable debug at specified verbosity level"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:8
 msgid "Specify how many stack frames to display in debug messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:9
-#, fuzzy
 msgid "Dump information about parsed statements to stderr"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:1
-#, fuzzy
 msgid "Show the flac version number"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:2
-#, fuzzy
 msgid "Show this screen"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:3
 msgid "Show detailed explanation of usage and options"
@@ -19992,28 +18254,24 @@ msgid "Same as -d except an analysis file is written"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:7
-#, fuzzy
 msgid "Write output to stdout"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:8
 msgid "Do not write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:9
-#, fuzzy
 msgid "Do not print anything including errors"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:10
-#, fuzzy
 msgid "Force overwriting of output files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:11
-#, fuzzy
 msgid "Force the output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:12
 msgid "Prepend STRING to output names"
@@ -20040,18 +18298,16 @@ msgid "Serial number to use for the FLAC stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:18
-#, fuzzy
 msgid "Include residual signal in text output"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:19
 msgid "Generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:20
-#, fuzzy
 msgid "Continue decoding through stream errors"
-msgstr "Continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:21
 msgid "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
@@ -20082,9 +18338,8 @@ msgid "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:28
-#, fuzzy
 msgid "Read tags from file"
-msgstr "Read URLs from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:29
 msgid "Add seek point(s) {#|X|#x|#s}"
@@ -20133,9 +18388,8 @@ msgid "Synonymous with -l 12 -b 4608 -m -e -r 6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:42
-#, fuzzy
 msgid "Specify blocksize in samples"
-msgstr "Specify sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:43
 msgid "Try mid-side coding for each frame"
@@ -20158,9 +18412,8 @@ msgid "Exhaustively search LP coeff quantization"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:48
-#, fuzzy
 msgid "Specify precision in bits"
-msgstr "Specify revision states"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:49
 msgid "Set [min,]max residual partition order"
@@ -20172,14 +18425,12 @@ msgid "Set byte order for samples"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:52
-#, fuzzy
 msgid "Number of channels"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:53
-#, fuzzy
 msgid "Number of bits per sample"
-msgstr "Number of top servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:54
 msgid "Sample rate in Hz"
@@ -20191,9 +18442,8 @@ msgid "Sign of samples"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:57
-#, fuzzy
 msgid "Size of the raw input in bytes"
-msgstr "Show changes in reverse order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:58
 msgid "Force decoding to AIFF format"
@@ -20208,9 +18458,8 @@ msgid "No adaptive mid-side coding for all frames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:61
-#, fuzzy
 msgid "Don't continue decoding through stream errors"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:62
 msgid "Don't delete after a successful encode/decode"
@@ -20249,9 +18498,8 @@ msgid "Don't generate gnuplot files of residual distribution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:71
-#, fuzzy
 msgid "Don't include residual signal in text output"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:72
 msgid "Don't align multiple files on sector boundaries"
@@ -20262,14 +18510,12 @@ msgid "Write runtime encode/decode statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:74
-#, fuzzy
 msgid "Don't force overwriting of output files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flac.fish:75
-#, fuzzy
 msgid "Don't verify a correct encoding"
-msgstr "Don't verify package or header digests when reading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:1
 msgid "Install an application or runtime from a remote"
@@ -20280,33 +18526,28 @@ msgid "Update an installed application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:3
-#, fuzzy
 msgid "Uninstall an installed application or runtime"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:4
-#, fuzzy
 msgid "List installed apps and/or runtimes"
-msgstr "List installed source package\\(s\\)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:5
 msgid "Show info for installed app or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:6
-#, fuzzy
 msgid "Run an application"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:7
-#, fuzzy
 msgid "Override permissions for an application"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:8
-#, fuzzy
 msgid "Specify default version to run"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:9
 msgid "Enter the namespace of a running application"
@@ -20321,57 +18562,48 @@ msgid "Revoke access to a specific file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:12
-#, fuzzy
 msgid "Show information about a specific file"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:13
-#, fuzzy
 msgid "List exported files"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:14
-#, fuzzy
 msgid "Add a new remote repository (by URL)"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:15
 msgid "Modify properties of a configured remote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:16
-#, fuzzy
 msgid "Delete a configured remote"
-msgstr "lista redes configuradas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:17
-#, fuzzy
 msgid "List all configured remotes"
-msgstr "lista redes configuradas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:18
-#, fuzzy
 msgid "List contents of a configured remote"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:19
-#, fuzzy
 msgid "Initialize a directory for building"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:20
-#, fuzzy
 msgid "Run a build command inside the build dir"
-msgstr "Executa um comando builtin em vez de uma função"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:21
 msgid "Finish a build dir for export"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:22
-#, fuzzy
 msgid "Export a build dir to a repository"
-msgstr "Adicionar um novo arquivo/diretório ao repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:23
 msgid "Create a bundle file from a build directory"
@@ -20386,14 +18618,12 @@ msgid "Sign an application or runtime"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:26
-#, fuzzy
 msgid "Update the summary file in a repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:1
-#, fuzzy
 msgid "Add files to checkout"
-msgstr "Append files to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:2
 #: /tmp/fish/implicit/share/completions/fossil.fish:8
@@ -20405,17 +18635,15 @@ msgstr "Append files to archive"
 #: /tmp/fish/implicit/share/completions/fossil.fish:202
 #: /tmp/fish/implicit/share/completions/fossil.fish:211
 #: /tmp/fish/implicit/share/completions/fossil.fish:300
-#, fuzzy
 msgid "Case insensitive file matching"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:3
 #: /tmp/fish/implicit/share/completions/fossil.fish:9
 #: /tmp/fish/implicit/share/completions/fossil.fish:78
 #: /tmp/fish/implicit/share/completions/fossil.fish:130
-#, fuzzy
 msgid "Include dotfiles"
-msgstr "Exceto arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:4
 #: /tmp/fish/implicit/share/completions/fossil.fish:5
@@ -20423,14 +18651,12 @@ msgstr "Exceto arquivo"
 #: /tmp/fish/implicit/share/completions/fossil.fish:11
 #: /tmp/fish/implicit/share/completions/fossil.fish:79
 #: /tmp/fish/implicit/share/completions/fossil.fish:131
-#, fuzzy
 msgid "Files to ignore"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:7
-#, fuzzy
 msgid "Remove and add files to checkout"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:12
 #: /tmp/fish/implicit/share/completions/fossil.fish:82
@@ -20442,80 +18668,66 @@ msgid "Display actions without running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:13
-#, fuzzy
 msgid "Check all repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:14
-#, fuzzy
 msgid "List changes"
-msgstr "Sem alterações"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:15
 #: /tmp/fish/implicit/share/completions/fossil.fish:16
-#, fuzzy
 msgid "Ignore repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:17
-#, fuzzy
 msgid "Display locations"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:18
-#, fuzzy
 msgid "Pull repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:19
-#, fuzzy
 msgid "Push repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:20
-#, fuzzy
 msgid "Rebuild repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:21
-#, fuzzy
 msgid "Sync repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:22
-#, fuzzy
 msgid "Shows file modifications"
-msgstr "Show last modification only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:23
-#, fuzzy
 msgid "Show file versions"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:24
-#, fuzzy
 msgid "List all analyzed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:25
 #: /tmp/fish/implicit/share/completions/fossil.fish:137
-#, fuzzy
 msgid "Limit analyzed versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:26
 msgid "Find regressions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:27
-#, fuzzy
 msgid "Identify version as not working"
-msgstr "Identify as agent-string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:28
-#, fuzzy
 msgid "Identify version as working"
-msgstr "Identify as agent-string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:29
 #: /tmp/fish/implicit/share/completions/fossil.fish:39
@@ -20528,14 +18740,12 @@ msgid "Show log of bisects in check-in order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:31
-#, fuzzy
 msgid "Skip version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:32
-#, fuzzy
 msgid "Show bisect options"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:33
 #: /tmp/fish/implicit/share/completions/fossil.fish:36
@@ -20557,9 +18767,8 @@ msgid "List versions between bad and good"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:41
-#, fuzzy
 msgid "Don't show anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:42
 msgid "Reinitialize bisect"
@@ -20568,69 +18777,57 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/fossil.fish:44
 #: /tmp/fish/implicit/share/completions/fossil.fish:45
 #: /tmp/fish/implicit/share/completions/fossil.fish:46
-#, fuzzy
 msgid "Show all versions"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:47
-#, fuzzy
 msgid "Undo latest bad/good command."
-msgstr "Finaliza um bloco de comandos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:48
 #: /tmp/fish/implicit/share/completions/git.fish:88
-#, fuzzy
 msgid "Create a new branch"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:49
-#, fuzzy
 msgid "Create new branch"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:50
-#, fuzzy
 msgid "Make branch local"
-msgstr "Make variable scope local"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:51
-#, fuzzy
 msgid "Set background color"
-msgstr "Alterar cor de fundo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:52
 #: /tmp/fish/implicit/share/completions/fossil.fish:106
-#, fuzzy
 msgid "Don't sign the branch with GPG"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:53
 #: /tmp/fish/implicit/share/completions/fossil.fish:155
-#, fuzzy
 msgid "Override date"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:54
-#, fuzzy
 msgid "Override user"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:55
-#, fuzzy
 msgid "List branches"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:56
 #: /tmp/fish/implicit/share/completions/fossil.fish:57
-#, fuzzy
 msgid "Show all branches"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:58
 #: /tmp/fish/implicit/share/completions/fossil.fish:59
-#, fuzzy
 msgid "Show closed branches"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:60
 #: /tmp/fish/implicit/share/completions/fossil.fish:62
@@ -20640,39 +18837,33 @@ msgstr "Show upgraded packages"
 #: /tmp/fish/implicit/share/completions/fossil.fish:177
 #: /tmp/fish/implicit/share/completions/fossil.fish:180
 #: /tmp/fish/implicit/share/completions/fossil.fish:267
-#, fuzzy
 msgid "Run command on repository"
-msgstr "Executa um comando como o processo atual"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:61
-#, fuzzy
 msgid "Print a file"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:63
 #: /tmp/fish/implicit/share/completions/fossil.fish:140
-#, fuzzy
 msgid "Print specific revision"
-msgstr "Print only given revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:64
-#, fuzzy
 msgid "List local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:65
 #: /tmp/fish/implicit/share/completions/fossil.fish:128
 #: /tmp/fish/implicit/share/completions/fossil.fish:263
-#, fuzzy
 msgid "Display absolute paths"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:66
 #: /tmp/fish/implicit/share/completions/fossil.fish:132
 #: /tmp/fish/implicit/share/completions/fossil.fish:264
-#, fuzzy
 msgid "Display relative paths"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:67
 #: /tmp/fish/implicit/share/completions/fossil.fish:265
@@ -20680,34 +18871,28 @@ msgid "Verify file status using SHA1"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:68
-#, fuzzy
 msgid "Identify the repository if there are changes"
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:69
-#, fuzzy
 msgid "Say (none) if there are no changes"
-msgstr "Try to find a smaller set of changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:70
-#, fuzzy
 msgid "Checkout version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:71
-#, fuzzy
 msgid "Version to check out"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:72
-#, fuzzy
 msgid "Ignore edited files"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:73
-#, fuzzy
 msgid "Ignore missing content"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:74
 msgid "Only update the manifest"
@@ -20715,14 +18900,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:75
 #: /tmp/fish/implicit/share/completions/fossil.fish:302
-#, fuzzy
 msgid "Update to latest version"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:76
-#, fuzzy
 msgid "Delete all extra files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:80
 #: /tmp/fish/implicit/share/completions/fossil.fish:212
@@ -20730,24 +18913,20 @@ msgid "Files to clean without prompting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:81
-#, fuzzy
 msgid "Remove without prompting"
-msgstr "Remove property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:83
-#, fuzzy
 msgid "Only remove Fossil temporary files"
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:84
-#, fuzzy
 msgid "Show removed files"
-msgstr "Do not create file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:85
-#, fuzzy
 msgid "Clone repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:86
 #: /tmp/fish/implicit/share/completions/fossil.fish:154
@@ -20763,9 +18942,8 @@ msgid "Use SSL identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:89
-#, fuzzy
 msgid "Create new revision"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:91
 msgid "Allow unresolved merge conflicts"
@@ -20808,38 +18986,32 @@ msgid "Use a delta manifest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:101
-#, fuzzy
 msgid "Commit comment"
-msgstr "Comentário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:102
-#, fuzzy
 msgid "Read commit comment from a file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:103
-#, fuzzy
 msgid "Mimetype of commit comment"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:105
-#, fuzzy
 msgid "Omit all warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:107
-#, fuzzy
 msgid "Don't sync the changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:108
 msgid "Assign a tag to the checkin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:109
-#, fuzzy
 msgid "Show differences"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:110
 #: /tmp/fish/implicit/share/completions/fossil.fish:165
@@ -20848,38 +19020,32 @@ msgid "Binary files glob pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:111
-#, fuzzy
 msgid "Show diff of branch"
-msgstr "Show hierarchy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:112
-#, fuzzy
 msgid "Show file names only"
-msgstr "Log to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:113
-#, fuzzy
 msgid "Context lines"
-msgstr "Set context size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:114
-#, fuzzy
 msgid "Include binary files"
-msgstr "Annotate binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:115
 msgid "Select revision to compare with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:116
-#, fuzzy
 msgid "Use internal diff logic"
-msgstr "Undo an edit command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:117
-#, fuzzy
 msgid "Side-by-side diff"
-msgstr "Use side-by-side format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:118
 msgid "Launch GUI"
@@ -20890,76 +19056,64 @@ msgid "Select revision to compare to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:120
-#, fuzzy
 msgid "Unified diff"
-msgstr "Use unified format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:121
-#, fuzzy
 msgid "Output complete text"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:122
-#, fuzzy
 msgid "Line width in side-by-side diff"
-msgstr "Set column width for side-by-side format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:123
-#, fuzzy
 msgid "Export repository to git"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:124
 msgid "Export rids of exported data to file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:125
-#, fuzzy
 msgid "Read rids of data to ignore from file"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:127
 msgid "Show files that aren't part of checkout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:133
-#, fuzzy
 msgid "Print complete file history"
-msgstr "Print only file info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:134
-#, fuzzy
 msgid "Display one-line summary"
-msgstr "Display summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:136
-#, fuzzy
 msgid "Select log mode (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:138
-#, fuzzy
 msgid "Skip changes"
-msgstr "Sem alterações"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:139
-#, fuzzy
 msgid "Select print mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:141
-#, fuzzy
 msgid "Select status mode"
-msgstr "Select a method"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:143
 msgid "Show main and auxiliary commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:144
-#, fuzzy
 msgid "Show test commands only"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:145
 msgid "Show auxilary commands only"
@@ -20970,44 +19124,37 @@ msgid "Show list of web UI pages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:147
-#, fuzzy
 msgid "Import repository from git"
-msgstr "Compress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:148
-#, fuzzy
 msgid "Allow importing into existing repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:149
-#, fuzzy
 msgid "Provide information about object"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:151
 #: /tmp/fish/implicit/share/completions/fossil.fish:170
-#, fuzzy
 msgid "Show extra information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:152
-#, fuzzy
 msgid "Create a repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:153
-#, fuzzy
 msgid "Copy settings from repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:156
 msgid "Make JSON request"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:158
-#, fuzzy
 msgid "List files"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:159
 #: /tmp/fish/implicit/share/completions/fossil.fish:163
@@ -21019,29 +19166,24 @@ msgstr "Listar arquivos swap"
 #: /tmp/fish/implicit/share/completions/git.fish:246
 #: /tmp/fish/implicit/share/completions/git.fish:295
 #: /tmp/fish/implicit/share/completions/git.fish:296
-#, fuzzy
 msgid "Tag"
-msgstr "Target"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:160
-#, fuzzy
 msgid "Show commit time"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:161
-#, fuzzy
 msgid "Provide extra information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:162
-#, fuzzy
 msgid "Merge commits"
-msgstr "Merge sorted files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:164
-#, fuzzy
 msgid "Use baseline"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:167
 msgid "Allow empty merge"
@@ -21052,14 +19194,12 @@ msgid "Close merged branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:171
-#, fuzzy
 msgid "Move file"
-msgstr "Arquivo tar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:173
-#, fuzzy
 msgid "Open repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:174
 msgid "Only modify manifest"
@@ -21070,55 +19210,45 @@ msgid "Allow opening inside an opened repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:176
-#, fuzzy
 msgid "Pull from a repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:178
 #: /tmp/fish/implicit/share/completions/fossil.fish:181
-#, fuzzy
 msgid "Pull private branches"
-msgstr "Multiple vendor branch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:179
-#, fuzzy
 msgid "Push into a repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:182
-#, fuzzy
 msgid "Rebuild a repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:183
-#, fuzzy
 msgid "Compute clusters"
-msgstr "Compress faster"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:184
-#, fuzzy
 msgid "Compress database"
-msgstr "Comprime dados"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:185
-#, fuzzy
 msgid "Force rebuild even with errors"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:186
-#, fuzzy
 msgid "Skip BLOB table verification"
-msgstr "Skip the signature verification step"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:187
-#, fuzzy
 msgid "Set the database pagesize"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:188
-#, fuzzy
 msgid "Scan in random order"
-msgstr "Play in random order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:189
 msgid "Run VACUUM"
@@ -21137,34 +19267,28 @@ msgid "Set Write-Ahead-Log journalling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:193
-#, fuzzy
 msgid "Show statistics"
-msgstr "Show cache statistics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:194
-#, fuzzy
 msgid "Default server URL"
-msgstr "Set referer URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:195
-#, fuzzy
 msgid "Revert a commit"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:197
-#, fuzzy
 msgid "Revert back to given revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:198
-#, fuzzy
 msgid "Remove a file from repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:199
-#, fuzzy
 msgid "Remove files from this checkout"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:200
 msgid "Skip removing files from this checkout"
@@ -21175,19 +19299,16 @@ msgid "Display actions without runing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:203
-#, fuzzy
 msgid "Manage settings"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:204
-#, fuzzy
 msgid "Log accesses"
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:205
-#, fuzzy
 msgid "Allow symbolic links"
-msgstr "Always follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:206
 msgid "Allow automatically filling CAPTCHA"
@@ -21202,9 +19323,8 @@ msgid "Pull list of shunned references from server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:209
-#, fuzzy
 msgid "Automatically sync the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:213
 msgid "Sign commits using GPG"
@@ -21223,23 +19343,20 @@ msgid "Allow binary files to be diffed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:217
-#, fuzzy
 msgid "External diff command"
-msgstr "Undo an edit command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:218
-#, fuzzy
 msgid "Disallow pushing to the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:219
 msgid "Text editor for writing check-in comments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:220
-#, fuzzy
 msgid "List of empty directories"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:221
 msgid "Non-UTF-8 files glob pattern"
@@ -21262,9 +19379,8 @@ msgid "Send login credentials using HTTPS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:226
-#, fuzzy
 msgid "Files to ignore glob pattern"
-msgstr "Files to ignore during import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:227
 msgid "Files to keep when cleaning"
@@ -21287,14 +19403,12 @@ msgid "HTTP request size limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:232
-#, fuzzy
 msgid "Use modification times"
-msgstr "Change modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:233
-#, fuzzy
 msgid "PGP command"
-msgstr "Job command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:234
 msgid "HTTP proxy URL"
@@ -21305,9 +19419,8 @@ msgid "Report relative paths"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:236
-#, fuzzy
 msgid "Compute checksums over all files"
-msgstr "Write size for all files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:237
 msgid "Allow users to register themselves"
@@ -21322,14 +19435,12 @@ msgid "Location of SSL CA root certificates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:240
-#, fuzzy
 msgid "SSL private certificate path"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:241
-#, fuzzy
 msgid "Allow Tcl scripting"
-msgstr "Tcl section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:242
 msgid "Tcl initialization script"
@@ -21340,49 +19451,42 @@ msgid "TH1 initialization script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:244
-#, fuzzy
 msgid "Web browser name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:245
 msgid "Set globally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:246
-#, fuzzy
 msgid "Run SQL commands"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:247
 msgid "Manage stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:248
-#, fuzzy
 msgid "Save current changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:249
 #: /tmp/fish/implicit/share/completions/fossil.fish:250
-#, fuzzy
 msgid "Stash comment"
-msgstr "Comentário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:251
-#, fuzzy
 msgid "List all stashes"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:252
 #: /tmp/fish/implicit/share/completions/fossil.fish:253
-#, fuzzy
 msgid "Show information about files"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:254
-#, fuzzy
 msgid "Show stash contents"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:255
 msgid "Pop last stash"
@@ -21406,19 +19510,16 @@ msgid "Forget ALL stashes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:261
-#, fuzzy
 msgid "Compare stash"
-msgstr "Compare month names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:262
-#, fuzzy
 msgid "Show status"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:266
-#, fuzzy
 msgid "Sync with a repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:268
 msgid "Sync private branches"
@@ -21429,9 +19530,8 @@ msgid "Manage tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:270
-#, fuzzy
 msgid "Add tag to check-in"
-msgstr "Taint checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:271
 msgid "Add raw tag"
@@ -21442,19 +19542,16 @@ msgid "Propagate tag"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:273
-#, fuzzy
 msgid "Remove tag from check-in"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:275
-#, fuzzy
 msgid "Remove raw tag"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:276
-#, fuzzy
 msgid "Find tag"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:277
 msgid "Find raw tag"
@@ -21465,70 +19562,57 @@ msgid "Find tag type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:279
-#, fuzzy
 msgid "Limit number of tags"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:281
 #: /tmp/fish/implicit/share/completions/git.fish:293
-#, fuzzy
 msgid "List tags"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:282
-#, fuzzy
 msgid "List raw tags"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:283
-#, fuzzy
 msgid "Show timeline"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:284
-#, fuzzy
 msgid "Limit timeline entries"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:285
-#, fuzzy
 msgid "Output only event type"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:286
-#, fuzzy
 msgid "Output list of files changed"
-msgstr "Output 3 lines of unified context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:287
-#, fuzzy
 msgid "Open web UI"
-msgstr "Open file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:288
-#, fuzzy
 msgid "Start web server"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:289
-#, fuzzy
 msgid "Enable automatic login for localhost"
-msgstr "Enable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:290
-#, fuzzy
 msgid "Only listen on localhost"
-msgstr "Only print locations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:291
-#, fuzzy
 msgid "Port to listen on"
-msgstr "Minimum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:292
-#, fuzzy
 msgid "Trace TH1 execution"
-msgstr "Force deletion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:293
 msgid "Use base URL"
@@ -21547,34 +19631,28 @@ msgid "Use SCGI rather than HTTP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:297
-#, fuzzy
 msgid "Undo the changes"
-msgstr "Mudança de tamanho de janela"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:299
-#, fuzzy
 msgid "Update version"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:301
-#, fuzzy
 msgid "Print debug information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:304
-#, fuzzy
 msgid "Print information about all files"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:305
-#, fuzzy
 msgid "Print fossil version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:306
-#, fuzzy
 msgid "Print version of optional features"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:307
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:3
@@ -21592,25 +19670,21 @@ msgstr "Ignore all version information"
 #: /tmp/fish/implicit/share/completions/rejmerge.fish:3
 #: /tmp/fish/implicit/share/completions/root.fish:6
 #: /tmp/fish/implicit/share/completions/zypper.fish:4
-#, fuzzy
 msgid "Print help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
-#, fuzzy
 msgid "Save function"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
-#, fuzzy
 msgid "Open function in external editor"
-msgstr "Specify external editor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
-#, fuzzy
 msgid "Edit in interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:1
 #: /tmp/fish/implicit/share/completions/functions.fish:5
@@ -21645,14 +19719,12 @@ msgid "Make the function a variable update event handler"
 msgstr "Make the function a variable update event handler"
 
 #: /tmp/fish/implicit/share/completions/function.fish:8
-#, fuzzy
 msgid "Make the function a generic event handler"
-msgstr "Make the function a signal event handler"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:9
-#, fuzzy
 msgid "Specify named arguments"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:10
 msgid "Do not shadow variable scope of calling function"
@@ -21667,9 +19739,8 @@ msgid "Erase function"
 msgstr "Erase function"
 
 #: /tmp/fish/implicit/share/completions/functions.fish:3
-#, fuzzy
 msgid "Show hidden functions"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:6
 msgid "Test if function is defined"
@@ -21680,24 +19751,20 @@ msgid "List the names of the functions, but not their definition"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:8
-#, fuzzy
 msgid "Copy the specified function to the specified new name"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:9
-#, fuzzy
 msgid "Display information about the function"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:10
-#, fuzzy
 msgid "Print more output"
-msgstr "Print word counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:1
-#, fuzzy
 msgid "Show all files specified on the command line"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:2
 msgid "Kill processes, accessing the file"
@@ -21724,14 +19791,12 @@ msgid "Kill only processes which have write access"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:8
-#, fuzzy
 msgid "Slect a different namespace"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:9
-#, fuzzy
 msgid "Silent operation"
-msgstr "Foreground operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:10
 msgid "Append the user name of the process owner to each PID"
@@ -21766,14 +19831,12 @@ msgid "Lazy unmount"
 msgstr "Lazy unmount"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
-#, fuzzy
 msgid "Standard mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:2
-#, fuzzy
 msgid "Place output in file"
-msgstr "Acrescentar saída a arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:3
 msgid ""
@@ -21783,9 +19846,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:4
-#, fuzzy
 msgid "Use specified version of the C++ ABI"
-msgstr "Use specified compression algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:5
 #: /tmp/fish/implicit/share/completions/gcc.fish:481
@@ -21861,20 +19923,18 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:18
-#, fuzzy
 msgid "Display the version number and copyrights of the invoked GCC"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:19
 msgid "In C mode, support all ISO C90 programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:20
-#, fuzzy
 msgid ""
 "Do not recognize \"asm\", \"inline\" or \"typeof\" as a keyword, so that "
 "code can use these words as identifiers"
-msgstr "Do not recognize asm, inline or typeof keywords"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:21
 #: /tmp/fish/implicit/share/completions/gcc.fish:22
@@ -21888,9 +19948,8 @@ msgid "Assert that compilation takes place in a hosted environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:24
-#, fuzzy
 msgid "Assert that compilation takes place in a freestanding environment"
-msgstr "Assert freestanding environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:25
 msgid "Accept some non-standard constructs used in Microsoft header files"
@@ -21935,9 +19994,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:37
-#, fuzzy
 msgid "Turn off all access checking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:38
 msgid ""
@@ -21992,9 +20050,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:48
-#, fuzzy
 msgid "Don’t emit code for implicit instantiations of inline templates, either"
-msgstr "Do not emit code for implicit inline templates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:49
 msgid ""
@@ -22026,10 +20083,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:54
-#, fuzzy
 msgid ""
 "Downgrade some diagnostics about nonconformant code from errors to warnings"
-msgstr "Downgrade some errors to warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:55
 msgid "Enable automatic template instantiation at link time"
@@ -22048,11 +20104,10 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:58
-#, fuzzy
 msgid ""
 "Do not emit the extra code to use the routines specified in the C++ ABI for "
 "thread-safe initialization of local statics"
-msgstr "Do not emit code for thread-safe initialization of local statics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:59
 msgid ""
@@ -22068,9 +20123,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:61
-#, fuzzy
 msgid "Do not use weak symbol support, even if it is provided by the linker"
-msgstr "Do not use weak symbol support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:62
 msgid ""
@@ -22238,9 +20292,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:92
-#, fuzzy
 msgid "Warn if a \"@selector("
-msgstr "Write selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:93
 msgid ""
@@ -22959,24 +21012,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:239
-#, fuzzy
 msgid "Optimize even more"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:240
-#, fuzzy
 msgid "Optimize yet more"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:241
-#, fuzzy
 msgid "Do not optimize"
-msgstr "Não ordena"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:242
-#, fuzzy
 msgid "Optimize for size"
-msgstr "Optimize the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:243
 msgid ""
@@ -23016,9 +21065,8 @@ msgid "Don’t pay attention to the \"inline\" keyword"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:250
-#, fuzzy
 msgid "Integrate all simple functions into their callers"
-msgstr "Inject readline functions to reader"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:251
 msgid ""
@@ -23179,9 +21227,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:280
-#, fuzzy
 msgid "Perform cross-jumping transformation"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:281
 msgid "Attempt to transform conditional jumps into branch-less equivalents"
@@ -23660,9 +21707,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:380
-#, fuzzy
 msgid "Pass option as an option to the preprocessor"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:381
 msgid "Predefine name as a macro, with definition 1"
@@ -23685,17 +21731,14 @@ msgid "Do not predefine any system-specific or GCC-specific macros"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:385
-#, fuzzy
 msgid ""
 "Add the directory dir to the list of directories to be searched for header "
 "files"
 msgstr ""
-"Sets a list of directories to search for photo viewers and keyserver helpers"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:386
-#, fuzzy
 msgid "Write output to file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:387
 msgid "Turns on all optional warnings which are desirable for normal code"
@@ -23832,9 +21875,8 @@ msgid "Specify the standard to which the code should conform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:419
-#, fuzzy
 msgid "Split the include path"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:420
 msgid "Do not search the standard system directories for header files"
@@ -23894,9 +21936,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:432
-#, fuzzy
 msgid "Accept universal character names in identifiers"
-msgstr "Accept $ in identifiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:433
 msgid ""
@@ -23955,9 +21996,8 @@ msgid "Inhibit generation of linemarkers in the output from the preprocessor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:445
-#, fuzzy
 msgid "Do not discard comments"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:446
 msgid "Do not discard comments, including during macro expansion"
@@ -23970,9 +22010,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:448
-#, fuzzy
 msgid "Process trigraph sequences"
-msgstr "Process at queue only once"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:449
 msgid ""
@@ -24126,9 +22165,8 @@ msgid "Compile code for little endian mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:486
-#, fuzzy
 msgid "Compile code for big endian mode"
-msgstr "Compiler debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:487
 msgid "Prepend the name of the cpu to all public symbol names"
@@ -24148,9 +22186,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:493
-#, fuzzy
 msgid "Generate code for the specified ABI"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:494
 msgid ""
@@ -24349,9 +22386,8 @@ msgid "Change only the low 8 bits of the stack pointer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:532
-#, fuzzy
 msgid "Assume int to be 8 bit integer"
-msgstr "Left integer not equal to right integer"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:533
 #: /tmp/fish/implicit/share/completions/gcc.fish:818
@@ -24387,9 +22423,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:539
-#, fuzzy
 msgid "Assume that the program is arbitrarily large"
-msgstr "Assume data type for binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:540
 #: /tmp/fish/implicit/share/completions/gcc.fish:909
@@ -24413,9 +22448,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:547
 #: /tmp/fish/implicit/share/completions/gcc.fish:743
 #: /tmp/fish/implicit/share/completions/gcc.fish:744
-#, fuzzy
 msgid "Generate code for the specified architecture"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:548
 #: /tmp/fish/implicit/share/completions/gcc.fish:549
@@ -24589,9 +22623,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:591
-#, fuzzy
 msgid "Produce a Mach-o bundle format file"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:592
 msgid ""
@@ -24828,38 +22861,32 @@ msgid "Change ABI to use double word insns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:698
-#, fuzzy
 msgid "Do not use double word instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:699
-#, fuzzy
 msgid "Use floating point double instructions"
-msgstr "Exceção de ponto flutuante"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:700
-#, fuzzy
 msgid "Do not use floating point double instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:701
-#, fuzzy
 msgid "Use media instructions"
-msgstr "Instrução ilegal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:702
-#, fuzzy
 msgid "Do not use media instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:703
 msgid "Use multiply and add/subtract instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:704
-#, fuzzy
 msgid "Do not use multiply and add/subtract instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:705
 msgid ""
@@ -24922,48 +22949,40 @@ msgid "Use all eight media accumulator registers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:717
-#, fuzzy
 msgid "Pack VLIW instructions"
-msgstr "Instrução ilegal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:718
-#, fuzzy
 msgid "Do not pack VLIW instructions"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:719
 msgid "Do not mark ABI switches in e_flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:720
-#, fuzzy
 msgid "Enable the use of conditional-move instructions (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:721
-#, fuzzy
 msgid "Disable the use of conditional-move instructions"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:722
-#, fuzzy
 msgid "Enable the use of conditional set instructions (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:723
-#, fuzzy
 msgid "Disable the use of conditional set instructions"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:724
-#, fuzzy
 msgid "Enable the use of conditional execution (default)"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:725
-#, fuzzy
 msgid "Disable the use of conditional execution"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:726
 msgid "Run a pass to pack branches into VLIW instructions (default)"
@@ -24987,9 +23006,8 @@ msgid "Enable nested conditional execution optimizations (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:731
-#, fuzzy
 msgid "Disable nested conditional execution optimizations"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:732
 msgid ""
@@ -25023,9 +23041,8 @@ msgid "Generate code for the H8/300H"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:738
-#, fuzzy
 msgid "Generate code for the H8S"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:739
 msgid "Generate code for the H8S and H8/300H in the normal mode"
@@ -25113,14 +23130,12 @@ msgid "Generate the predefine, \"_SIO\", for server IO"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:764
-#, fuzzy
 msgid "Use GNU ld specific options"
-msgstr "Edita compleções específicas para um comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:765
-#, fuzzy
 msgid "Use HP ld specific options"
-msgstr "Edita compleções específicas para um comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:766
 msgid "Generate code that uses long call sequences"
@@ -25162,9 +23177,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:776
 #: /tmp/fish/implicit/share/completions/gcc.fish:777
-#, fuzzy
 msgid "A deprecated synonym for -mtune"
-msgstr "Synonym for -i"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:778
 #: /tmp/fish/implicit/share/completions/gcc.fish:779
@@ -25336,16 +23350,14 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:828
-#, fuzzy
 msgid "Generate code for a big endian target"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:829
 #: /tmp/fish/implicit/share/completions/gcc.fish:939
 #: /tmp/fish/implicit/share/completions/gcc.fish:940
-#, fuzzy
 msgid "Generate code for a little endian target"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:830
 #: /tmp/fish/implicit/share/completions/gcc.fish:831
@@ -25384,9 +23396,8 @@ msgid "Generate code that uses a single constant global pointer value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:842
-#, fuzzy
 msgid "Generate code that is self-relocatable"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:843
 msgid ""
@@ -25469,19 +23480,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:866
-#, fuzzy
 msgid "Generate code for the M32R/2"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:867
-#, fuzzy
 msgid "Generate code for the M32R/X"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:868
-#, fuzzy
 msgid "Generate code for the M32R"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:869
 msgid ""
@@ -25569,39 +23577,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:885
 #: /tmp/fish/implicit/share/completions/gcc.fish:886
-#, fuzzy
 msgid "Generate output for a 68000"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:887
 #: /tmp/fish/implicit/share/completions/gcc.fish:888
-#, fuzzy
 msgid "Generate output for a 68020"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:889
 msgid "Generate output containing 68881 instructions for floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:890
-#, fuzzy
 msgid "Generate output for a 68030"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:891
-#, fuzzy
 msgid "Generate output for a 68040"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:892
-#, fuzzy
 msgid "Generate output for a 68060"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:893
-#, fuzzy
 msgid "Generate output for a CPU32"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:894
 msgid "Generate output for a 520X \"coldfire\" family cpu"
@@ -25621,14 +23623,12 @@ msgid "Consider type \"int\" to be 16 bits wide, like \"short int\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:899
-#, fuzzy
 msgid "Do not use the bit-field instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:900
-#, fuzzy
 msgid "Do use the bit-field instructions"
-msgstr "Do not use builtin functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:901
 msgid ""
@@ -25677,21 +23677,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:912
 #: /tmp/fish/implicit/share/completions/gcc.fish:913
-#, fuzzy
 msgid "Generate output for a 68HC11"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:914
 #: /tmp/fish/implicit/share/completions/gcc.fish:915
-#, fuzzy
 msgid "Generate output for a 68HC12"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:916
 #: /tmp/fish/implicit/share/completions/gcc.fish:917
-#, fuzzy
 msgid "Generate output for a 68HCS12"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:918
 msgid ""
@@ -25736,9 +23733,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:931
 #: /tmp/fish/implicit/share/completions/gcc.fish:932
-#, fuzzy
 msgid "Always treat bit-fields as int-sized"
-msgstr "All bitfields are unsigned"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:933
 #: /tmp/fish/implicit/share/completions/gcc.fish:934
@@ -25747,9 +23743,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:935
 #: /tmp/fish/implicit/share/completions/gcc.fish:936
-#, fuzzy
 msgid "Emit callgraph information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:937
 #: /tmp/fish/implicit/share/completions/gcc.fish:938
@@ -25762,9 +23757,8 @@ msgid "Generate code for the 210 processor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:943
-#, fuzzy
 msgid "Generate big-endian code"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:944
 msgid "Generate little-endian code"
@@ -25854,9 +23848,8 @@ msgid "Use floating-point coprocessor instructions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:970
-#, fuzzy
 msgid "Do not use floating-point coprocessor instructions"
-msgstr "Do not emit out-of-line code for inline functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:971
 msgid ""
@@ -25952,9 +23945,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:998
 #: /tmp/fish/implicit/share/completions/gcc.fish:999
-#, fuzzy
 msgid "Disable (do not disable) use of the \"jal\" instruction"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1000
 #: /tmp/fish/implicit/share/completions/gcc.fish:1001
@@ -26158,9 +24150,8 @@ msgid "Use hardware FPP floating point"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1055
-#, fuzzy
 msgid "Do not use hardware floating point"
-msgstr "Do not use file completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1056
 msgid "Return floating-point results in ac0 (fr0 in Unix assembler syntax)"
@@ -26215,9 +24206,8 @@ msgid "Use \"abshi2\" pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1072
-#, fuzzy
 msgid "Do not use \"abshi2\" pattern"
-msgstr "Do not expand pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1073
 msgid "Pretend that branches are expensive"
@@ -26232,9 +24222,8 @@ msgid "Generate code for a system with split I&D"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1076
-#, fuzzy
 msgid "Generate code for a system without split I&D"
-msgstr "Generate XML formatted output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1077
 msgid "Use Unix assembler syntax"
@@ -26443,9 +24432,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:1191
 #: /tmp/fish/implicit/share/completions/gcc.fish:1195
 #: /tmp/fish/implicit/share/completions/gcc.fish:1196
-#, fuzzy
 msgid "On System V"
-msgstr "Subsystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1146
 #: /tmp/fish/implicit/share/completions/gcc.fish:1147
@@ -26659,29 +24647,24 @@ msgid "These arguments always have to be used in conjunction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1231
-#, fuzzy
 msgid "Generate code for the SH1"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1232
-#, fuzzy
 msgid "Generate code for the SH2"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1233
-#, fuzzy
 msgid "Generate code for the SH2e"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1234
-#, fuzzy
 msgid "Generate code for the SH3"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1235
-#, fuzzy
 msgid "Generate code for the SH3e"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1236
 msgid "Generate code for the SH4 without a floating-point unit"
@@ -26700,9 +24683,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1239
-#, fuzzy
 msgid "Generate code for the SH4"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1240
 msgid ""
@@ -26723,9 +24705,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1243
-#, fuzzy
 msgid "Generate code for the SH4a"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1244
 msgid ""
@@ -26749,9 +24730,8 @@ msgid "Use 32-bit offsets in \"switch\" tables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1250
-#, fuzzy
 msgid "Enable the use of the instruction \"fmovd\""
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1251
 #: /tmp/fish/implicit/share/completions/gcc.fish:1252
@@ -26939,18 +24919,16 @@ msgid "This is a synonym for -pthreads"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1300
-#, fuzzy
 msgid "Create a shared object"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1301
 msgid "Identify the versions of each tool used by the compiler, in a \""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1302
-#, fuzzy
 msgid "Refrain from adding \""
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1304
 #: /tmp/fish/implicit/share/completions/gcc.fish:1305
@@ -27005,10 +24983,9 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1320
 #: /tmp/fish/implicit/share/completions/gcc.fish:1321
-#, fuzzy
 msgid ""
 "Enable (disable) the use of the single instruction repeat instruction RPTS"
-msgstr "Disable the use of the modification detection code"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1322
 #: /tmp/fish/implicit/share/completions/gcc.fish:1323
@@ -27141,9 +25118,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1356
 #: /tmp/fish/implicit/share/completions/gcc.fish:1357
-#, fuzzy
 msgid "Control the treatment of literal pools"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1358
 #: /tmp/fish/implicit/share/completions/gcc.fish:1359
@@ -27231,9 +25207,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1376
-#, fuzzy
 msgid "Ignore the #ident directive"
-msgstr "Ignore zero block in archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1377
 msgid "Don’t output a \""
@@ -27337,14 +25312,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:1
-#, fuzzy
 msgid "List all options, with brief explanations"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:2
-#, fuzzy
 msgid "Read symbol table from file file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:3
 msgid "Enable writing into executable and core files"
@@ -27365,24 +25338,21 @@ msgid "Use file file as a core dump to examine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:7
-#, fuzzy
 msgid "Execute GDB commands from file file"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:8
 msgid "Add directory to the path to search for source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:9
-#, fuzzy
 msgid "Do not execute commands from any .gdbinit files"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:11
 #: /tmp/fish/implicit/share/completions/root.fish:1
-#, fuzzy
 msgid "Run in batch mode"
-msgstr "Run in dummy mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:12
 msgid ""
@@ -27413,14 +25383,12 @@ msgid "Run GDB using a text (console) user interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:1
-#, fuzzy
 msgid "Print usage informations and quit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:2
-#, fuzzy
 msgid "Print the version and quit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
 msgid "Use URL as the remote source for gems"
@@ -27431,42 +25399,36 @@ msgid "Use the given HTTP proxy for remote operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:5
-#, fuzzy
 msgid "Use no HTTP proxy for remote operations"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:6
-#, fuzzy
 msgid "Get help on this command"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:7
-#, fuzzy
 msgid "Set the verbose level of output"
-msgstr "Reset verbose level to 0"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:8
-#, fuzzy
 msgid "Use this config file instead of default"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:9
 msgid "Show stack backtrace on errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:10
-#, fuzzy
 msgid "Turn on Ruby debugging"
-msgstr "Turn of demangling"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:11
 msgid "Add a trusted certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:12
-#, fuzzy
 msgid "List trusted certificates"
-msgstr "List trusted keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:13
 msgid "Remove trusted certificates containing STRING"
@@ -27481,9 +25443,8 @@ msgid "Certificate for --sign command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:16
-#, fuzzy
 msgid "Private key for --sign command"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:17
 msgid "Sign a certificate with my key and certificate"
@@ -27494,38 +25455,32 @@ msgid "Verify gem file against its internal checksum"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:19
-#, fuzzy
 msgid "Report 'unmanaged' or rogue files in the gem repository"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:20
 msgid "Run unit tests for gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:21
-#, fuzzy
 msgid "Specify version for which to run unit tests"
-msgstr "Specify the repository directory in which to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:22
-#, fuzzy
 msgid "Don't really cleanup"
-msgstr "Don't really uninstall anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:23
-#, fuzzy
 msgid "List the files inside a Gem"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:24
-#, fuzzy
 msgid "Specify version for gem to view"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:25
-#, fuzzy
 msgid "Search for gems under specific paths"
-msgstr "Set driver specific options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:26
 msgid "Be verbose when showing status"
@@ -27533,28 +25488,24 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:27
 #: /tmp/fish/implicit/share/completions/gem.fish:82
-#, fuzzy
 msgid "Specify version of gem to uninstall"
-msgstr "List of packages to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:28
-#, fuzzy
 msgid "Include reverse dependencies in the output"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:29
-#, fuzzy
 msgid "Don't include reverse dependencies in the output"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:30
 msgid "Pipe Format (name --version ver)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:31
-#, fuzzy
 msgid "Specify version of gem to install"
-msgstr "List of packages to install"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:32
 #: /tmp/fish/implicit/share/completions/gem.fish:51
@@ -27612,9 +25563,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:41
 #: /tmp/fish/implicit/share/completions/gem.fish:90
-#, fuzzy
 msgid "Don't force gem to install, bypassing dependency checks"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:42
 #: /tmp/fish/implicit/share/completions/gem.fish:91
@@ -27623,27 +25573,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:43
 #: /tmp/fish/implicit/share/completions/gem.fish:92
-#, fuzzy
 msgid "Don't run unit tests prior to installation"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:44
 #: /tmp/fish/implicit/share/completions/gem.fish:93
-#, fuzzy
 msgid "Use bin wrappers for executables"
-msgstr "File is executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:45
 #: /tmp/fish/implicit/share/completions/gem.fish:94
-#, fuzzy
 msgid "Don't use bin wrappers for executables"
-msgstr "Don't make scripts executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:46
 #: /tmp/fish/implicit/share/completions/gem.fish:95
-#, fuzzy
 msgid "Specify gem trust policy"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:47
 #: /tmp/fish/implicit/share/completions/gem.fish:96
@@ -27658,16 +25604,14 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:49
 #: /tmp/fish/implicit/share/completions/gem.fish:55
 #: /tmp/fish/implicit/share/completions/gem.fish:66
-#, fuzzy
 msgid "Display detailed information of gem(s)"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:50
 #: /tmp/fish/implicit/share/completions/gem.fish:56
 #: /tmp/fish/implicit/share/completions/gem.fish:67
-#, fuzzy
 msgid "Don't display detailed information of gem(s)"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:54
 msgid "Name of gem(s) to query on matches the provided REGEXP"
@@ -27694,37 +25638,32 @@ msgid "Don't include RI generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:65
-#, fuzzy
 msgid "Specify version of gem to rdoc"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:71
-#, fuzzy
 msgid "Specify version of gem to examine"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:75
 msgid "Output specifications for all versions of the gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:76
-#, fuzzy
 msgid "Uninstall all matching versions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:77
-#, fuzzy
 msgid "Don't uninstall all matching versions"
-msgstr "Don't really uninstall anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:78
 msgid "Ignore dependency requirements while uninstalling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:79
-#, fuzzy
 msgid "Don't ignore dependency requirements while uninstalling"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:80
 msgid "Uninstall applicable executables without confirmation"
@@ -27743,9 +25682,8 @@ msgid "Update the RubyGems system software"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:1
-#, fuzzy
 msgid "Display the manual of a git command"
-msgstr "Displays usage information for command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:3
 msgid "Run as if git was started in this directory"
@@ -27760,19 +25698,16 @@ msgid "Print the path to the html documentation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:7
-#, fuzzy
 msgid "Print the path to the man documentation"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:8
-#, fuzzy
 msgid "Print the path to the info documentation"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:9
-#, fuzzy
 msgid "Pipe output into a pager"
-msgstr "Acrescentar saída a arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:10
 #: /tmp/fish/implicit/share/completions/journalctl.fish:6
@@ -27781,29 +25716,24 @@ msgstr "Acrescentar saída a arquivo"
 #: /tmp/fish/implicit/share/completions/systemctl.fish:41
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:5
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:9
-#, fuzzy
 msgid "Do not pipe output into a pager"
-msgstr "Could not open tty for pager"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:11
-#, fuzzy
 msgid "Set the path to the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:12
-#, fuzzy
 msgid "Set the path to the working tree"
-msgstr "Set the speed factor of the writing process to #"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:13
-#, fuzzy
 msgid "Set the namespace"
-msgstr "Definir nome do volume"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:14
-#, fuzzy
 msgid "Treat the repository as bare"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:15
 msgid "Do not use replacement refs to replace git objects"
@@ -27822,14 +25752,12 @@ msgid "Don't treat pathspecs as globs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:19
-#, fuzzy
 msgid "Match pathspecs case-insensitively"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:20
-#, fuzzy
 msgid "Download objects and refs from another repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:21
 msgid "Remote"
@@ -27860,9 +25788,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:276
 #: /tmp/fish/implicit/share/completions/mdadm.fish:12
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:1
-#, fuzzy
 msgid "Be quiet"
-msgstr "Run quietly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:24
 #: /tmp/fish/implicit/share/completions/git.fish:41
@@ -27874,9 +25801,8 @@ msgstr "Run quietly"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:53
 #: /tmp/fish/implicit/share/completions/prt-get.fish:111
 #: /tmp/fish/implicit/share/completions/xz.fish:32
-#, fuzzy
 msgid "Be verbose"
-msgstr "Do not overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:25
 #: /tmp/fish/implicit/share/completions/git.fish:215
@@ -27935,10 +25861,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:38
-#, fuzzy
 msgid ""
 "Use this option to set the path to the temporary directory used for rewriting"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:39
 msgid ""
@@ -27947,44 +25872,36 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:40
-#, fuzzy
 msgid "Manage set of tracked repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:42
-#, fuzzy
 msgid "Adds a new remote"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:43
-#, fuzzy
 msgid "Removes a remote"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:44
-#, fuzzy
 msgid "Shows a remote"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:45
-#, fuzzy
 msgid "Deletes all stale tracking branches"
-msgstr "Delete the logfile when done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:46
-#, fuzzy
 msgid "Fetches updates"
-msgstr "Fetch source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:47
-#, fuzzy
 msgid "Renames a remote"
-msgstr "Rename module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:48
-#, fuzzy
 msgid "Sets the default branch for a remote"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:49
 msgid "Changes URLs for a remote"
@@ -28050,23 +25967,20 @@ msgid "Generate a diffstat, showing the number of changed lines of each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:66
-#, fuzzy
 msgid "Shows the commits on branches"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:67
 msgid "Rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:68
-#, fuzzy
 msgid "Add file contents to the index"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:69
-#, fuzzy
 msgid "Don't actually add the file(s)"
-msgstr "Don't actually take the action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:71
 msgid "Allow adding otherwise ignored files"
@@ -28074,23 +25988,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:259
-#, fuzzy
 msgid "Interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:73
 msgid "Interactively choose hunks to stage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:74
-#, fuzzy
 msgid "Manually create a patch"
-msgstr "Manually create ARP address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:75
-#, fuzzy
 msgid "Only match tracked files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:76
 msgid "Match files both in working tree and index"
@@ -28119,14 +26030,12 @@ msgid "Checkout and switch to a branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:82
-#, fuzzy
 msgid "Local Branch"
-msgstr "Logical and"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:83
-#, fuzzy
 msgid "Remote Branch"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:84
 #: /tmp/fish/implicit/share/completions/git.fish:245
@@ -28138,14 +26047,12 @@ msgid "Track a new branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:90
-#, fuzzy
 msgid "Keep staged changes"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:91
-#, fuzzy
 msgid "Keep unmerged changes"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:92
 msgid "Apply a patch on a git index file and a working tree"
@@ -28160,43 +26067,36 @@ msgid "Find the change that introduced a bug by binary search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:95
-#, fuzzy
 msgid "List, create, or delete branches"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:97
-#, fuzzy
 msgid "Delete branch"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:98
-#, fuzzy
 msgid "Force deletion of branch"
-msgstr "Force deletion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:99
-#, fuzzy
 msgid "Rename branch"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:100
-#, fuzzy
 msgid "Force renaming branch"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:101
-#, fuzzy
 msgid "Lists both local and remote branches"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:102
 msgid "Track remote branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:103
-#, fuzzy
 msgid "Do not track remote branch"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:104
 msgid "Set remote branch to track"
@@ -28236,67 +26136,56 @@ msgid "Fast-forward if possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:115
-#, fuzzy
 msgid "Clone a repository into a new directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:116
-#, fuzzy
 msgid "Copy files instead of using hardlinks"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:117
 msgid "Operate quietly and do not report progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:118
-#, fuzzy
 msgid "Provide more information on what is going on"
-msgstr "Give more information during processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:119
 msgid "No checkout of HEAD is performed after the clone is complete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:120
-#, fuzzy
 msgid "Make a bare Git repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:121
-#, fuzzy
 msgid "Set up a mirror of the source repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:122
-#, fuzzy
 msgid "Use a specific name of the remote instead of the default"
 msgstr ""
-"Usa o arquivo especificado em vez do banco de dados de confiança padrão"
 
 #: /tmp/fish/implicit/share/completions/git.fish:123
 msgid "Use a specific branch instead of the one used by the cloned repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:124
-#, fuzzy
 msgid "Truncate the history to a specified number of revisions"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:125
-#, fuzzy
 msgid "Initialize all submodules within the cloned repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:126
-#, fuzzy
 msgid "Record changes to the repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:127
-#, fuzzy
 msgid "Amend the log message of the last commit"
-msgstr "Read log message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:128
 msgid "Fixup commit to be used with rebase --autosquash"
@@ -28307,14 +26196,12 @@ msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:131
-#, fuzzy
 msgid "Show diff of changes in the index"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:132
-#, fuzzy
 msgid "Compare two paths on the filesystem"
-msgstr "Compare archive and filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:134
 msgid "Open diffs in a visual tool"
@@ -28325,9 +26212,8 @@ msgid "Visually show diff of changes in the index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:138
-#, fuzzy
 msgid "Print lines matching a pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:139
 msgid "Create an empty git repository or reinitialize an existing one"
@@ -28346,14 +26232,12 @@ msgid "Continue listing file history beyond renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:144
-#, fuzzy
 msgid "Don't print ref names"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:145
-#, fuzzy
 msgid "Print out ref names"
-msgstr "Print kernel name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:146
 msgid "Print ref name by which each commit was reached"
@@ -28364,9 +26248,8 @@ msgid "Limit the number of commits before starting to show the commit output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:148
-#, fuzzy
 msgid "Skip given number of commits"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:149
 #: /tmp/fish/implicit/share/completions/git.fish:150
@@ -28375,9 +26258,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:151
 #: /tmp/fish/implicit/share/completions/git.fish:152
-#, fuzzy
 msgid "Show commits older than specified date"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:153
 msgid "Limit commits from given author"
@@ -28392,9 +26274,8 @@ msgid "Limit commits to ones with reflog entries matching given pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:156
-#, fuzzy
 msgid "Limit commits with message that match given pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:157
 msgid "Limit commits to ones that match all given --grep"
@@ -28405,23 +26286,20 @@ msgid "Limit commits to ones with message that don't match --grep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:159
-#, fuzzy
 msgid "Case insensitive match"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:160
 msgid "Patterns are basic regular expressions (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:161
-#, fuzzy
 msgid "Patterns are extended regular expressions"
-msgstr "Pattern is extended regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:162
-#, fuzzy
 msgid "Patterns are fixed strings"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:163
 msgid "Patterns are Perl-compatible regular expressions"
@@ -28432,9 +26310,8 @@ msgid "Stop when given path disappears from tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:165
-#, fuzzy
 msgid "Print only merge commits"
-msgstr "Print only left column"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:166
 msgid "Don't print commits with more than one parent"
@@ -28494,9 +26371,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:178
-#, fuzzy
 msgid "Do not include refs matching given glob pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:179
 msgid ""
@@ -28505,14 +26381,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:180
-#, fuzzy
 msgid "Ignore invalid object names"
-msgstr "Ignore environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:181
-#, fuzzy
 msgid "Read commits from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:182
 msgid "Mark equivalent commits with = and inequivalent with +"
@@ -28531,9 +26405,8 @@ msgid "Autocommit the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:188
-#, fuzzy
 msgid "Don't autocommit the merge"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:189
 msgid "Edit auto-generated merge message"
@@ -28564,23 +26437,20 @@ msgid "Don't populate the log message with one-line descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:196
-#, fuzzy
 msgid "Show diffstat of the merge"
-msgstr "Mostra horário de modificação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:197
 msgid "Don't show diffstat of the merge"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:198
-#, fuzzy
 msgid "Squash changes from other branch as a single commit"
-msgstr "Bring changes from the repository into the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:199
-#, fuzzy
 msgid "Don't squash changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:202
 #: /tmp/fish/implicit/share/completions/git.fish:219
@@ -28593,23 +26463,20 @@ msgid "Force no progress status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:204
-#, fuzzy
 msgid "Set the commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:205
-#, fuzzy
 msgid "Abort the current conflict resolution process"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:206
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:207
-#, fuzzy
 msgid "Use specific merge resolution program"
-msgstr "Use specified message digest algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:209
 msgid "Move or rename a file, a directory, or a symlink"
@@ -28624,26 +26491,22 @@ msgid "Fetch from and merge with another repository or a local branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:214
-#, fuzzy
 msgid "Fetch all remotes"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:217
-#, fuzzy
 msgid "Keep downloaded pack"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:218
-#, fuzzy
 msgid "Disable automatic tag following"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:220
 #: /tmp/fish/implicit/share/completions/git.fish:223
 #: /tmp/fish/implicit/share/completions/git.fish:243
-#, fuzzy
 msgid "Remote alias"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:222
 msgid "Update remote refs along with associated objects"
@@ -28674,9 +26537,8 @@ msgid "Push all refs under refs/"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:231
-#, fuzzy
 msgid "Delete all listed refs from the remote repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:232
 msgid "Push all refs under refs/tags"
@@ -28691,9 +26553,8 @@ msgid "Do everything except actually send the updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:235
-#, fuzzy
 msgid "Produce machine-readable output"
-msgstr "Give human-readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:236
 msgid "Force update of remote refs"
@@ -28713,14 +26574,12 @@ msgid "Forward-port local commits to the updated upstream head"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:247
-#, fuzzy
 msgid "Restart the rebasing process"
-msgstr "Automatic line ending processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:248
-#, fuzzy
 msgid "Abort the rebase operation"
-msgstr "Force name/rev association"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:249
 msgid "Keep the commits that don't cahnge anything"
@@ -28735,9 +26594,8 @@ msgid "Use merging strategies to rebase"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:254
-#, fuzzy
 msgid "Show diffstat of the rebase"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:255
 msgid "Don't show diffstat of the rebase"
@@ -28752,18 +26610,16 @@ msgid "Don't allow the pre-rebase hook to run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:258
-#, fuzzy
 msgid "Force the rebase"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:260
 msgid "Try to recreate merges"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:261
-#, fuzzy
 msgid "Rebase all reachable commits"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:262
 msgid "Automatic squashing"
@@ -28774,38 +26630,32 @@ msgid "No automatic squashing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:264
-#, fuzzy
 msgid "No fast-forward"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:265
-#, fuzzy
 msgid "Reset current HEAD to the specified state"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:266
-#, fuzzy
 msgid "Reset files in working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:270
 msgid "Reflog"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:271
-#, fuzzy
 msgid "Revert an existing commit"
-msgstr "Report on each commit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:272
-#, fuzzy
 msgid "Remove files from the working tree and from the index"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:273
-#, fuzzy
 msgid "Keep local copies"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:274
 msgid "Exit with a zero status even if no files matched"
@@ -28829,14 +26679,12 @@ msgid "Dry run"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:279
-#, fuzzy
 msgid "Show the working tree status"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:280
-#, fuzzy
 msgid "Give the output in the short-format"
-msgstr "Give output suitable for get --context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:281
 msgid "Show the branch and tracking info even in short-format"
@@ -28855,9 +26703,8 @@ msgid "The untracked files handling mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:285
-#, fuzzy
 msgid "Ignore changes to submodules"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:286
 msgid "Create, list, delete or verify a tag object signed with GPG"
@@ -28868,14 +26715,12 @@ msgid "Make an unsigned, annotated tag object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:289
-#, fuzzy
 msgid "Make a GPG-signed tag"
-msgstr "Make a signature"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:290
-#, fuzzy
 msgid "Remove a tag"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:291
 msgid "Verify signature of a tag"
@@ -28890,19 +26735,16 @@ msgid "List tags that contain a commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:297
-#, fuzzy
 msgid "Stash away changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:298
-#, fuzzy
 msgid "List stashes"
-msgstr "Lista as chaves"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:299
-#, fuzzy
 msgid "Show the changes recorded in the stash"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:300
 msgid "Apply and remove a single stashed state"
@@ -28913,47 +26755,40 @@ msgid "Apply a single stashed state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:302
-#, fuzzy
 msgid "Remove all stashed states"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:303
-#, fuzzy
 msgid "Remove a single stashed state from the stash list"
-msgstr "Remove a given entry from the --group list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:304
-#, fuzzy
 msgid "Create a stash"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:305
 msgid "Save a new stash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:306
-#, fuzzy
 msgid "Create a new branch from a stash"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:307
-#, fuzzy
 msgid "Set and read git configuration variables"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:308
-#, fuzzy
 msgid "Generate patch series to send upstream"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:310
 msgid "Generate plain patches without diffstat"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:311
-#, fuzzy
 msgid "Suppress diff output"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:312
 msgid "Spend more time to create smaller diffs"
@@ -28976,18 +26811,16 @@ msgid "Show number of added/deleted lines in decimal notation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:317
-#, fuzzy
 msgid "Output only last line of the stat"
-msgstr "Output only first of equal lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:318
 msgid "Output a condensed summary of extended header information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:319
-#, fuzzy
 msgid "Disable rename detection"
-msgstr "Don't trust the file modification times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:320
 msgid "Show full blob object names"
@@ -29002,24 +26835,20 @@ msgid "Also inspect unmodified files as source for a copy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:324
-#, fuzzy
 msgid "Ignore changes in whitespace at EOL"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:325
-#, fuzzy
 msgid "Ignore changes in amount of whitespace"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:326
-#, fuzzy
 msgid "Ignore whitespace when comparing lines"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:328
-#, fuzzy
 msgid "Show whole surrounding functions of changes"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:329
 msgid "Allow an external diff helper to be executed"
@@ -29056,9 +26885,8 @@ msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:337
-#, fuzzy
 msgid "Add a submodule"
-msgstr "Add a symbolic tag to a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:338
 msgid "Show submodule status"
@@ -29070,28 +26898,24 @@ msgid "Initialize all submodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:340
-#, fuzzy
 msgid "Update all submodules"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:341
-#, fuzzy
 msgid "Show commit summary"
-msgstr "Print summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:342
-#, fuzzy
 msgid "Run command on each submodule"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:343
 msgid "Sync submodules' URL with .gitmodules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:344
-#, fuzzy
 msgid "Only print error messages"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:346
 msgid "Checkout the superproject's commit on a detached HEAD in the submodule"
@@ -29127,9 +26951,8 @@ msgid "Also add ignored submodule path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:353
-#, fuzzy
 msgid "Remove even with local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:354
 msgid "Use the commit stored in the index"
@@ -29140,23 +26963,20 @@ msgid "Compare the commit in the index with submodule HEAD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:356
-#, fuzzy
 msgid "Traverse submodules recursively"
-msgstr "Descend recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:357
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:358
-#, fuzzy
 msgid "Remove untracked files from the working tree"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:359
-#, fuzzy
 msgid "Force run"
-msgstr "Saída forçada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:360
 msgid "Show what would be done and clean files interactively"
@@ -29179,46 +26999,40 @@ msgid "Remove ignored files, as well"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:365
-#, fuzzy
 msgid "Remove only ignored files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:366
-#, fuzzy
 msgid "Show what revision and author last modified each line of a file"
-msgstr "Show last revision where each line was modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:367
 msgid "Show blank SHA-1 for boundary commits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:368
-#, fuzzy
 msgid "Do not treat root commits as boundaries"
-msgstr "Do not execute remote command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:369
 msgid "Include additional statistics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:370
-#, fuzzy
 msgid "Annotate only the given line range"
-msgstr "Annotate every line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:371
 msgid "Show long rev"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:372
-#, fuzzy
 msgid "Show raw timestamp"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:373
-#, fuzzy
 msgid "Use revisions from named file instead of calling rev-list"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:374
 msgid "Walk history forward instead of backward"
@@ -29229,23 +27043,20 @@ msgid "Show in a format designed for machine consumption"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:376
-#, fuzzy
 msgid "Show the porcelain format"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:377
-#, fuzzy
 msgid "Show the result incrementally"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:378
 msgid "Instead of working tree, use the contents of the named file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:379
-#, fuzzy
 msgid "Specifies the format used to output dates"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:380
 msgid "Detect moved or copied lines within a file"
@@ -29258,62 +27069,52 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:383
-#, fuzzy
 msgid "Use the same output mode as git-annotate"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:384
-#, fuzzy
 msgid "Show the filename in the original commit"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:385
 msgid "Show the line number in the original commit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:386
-#, fuzzy
 msgid "Suppress the author name and timestamp from the output"
-msgstr "Allow subkeys that have a timestamp from the future"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:387
 msgid "Show the author email instead of author name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:388
-#, fuzzy
 msgid "Ignore whitespace changes"
-msgstr "Ignore whitespace"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:389
-#, fuzzy
 msgid "Custom command"
-msgstr "Job command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:1
-#, fuzzy
 msgid "Comma-separated list of analyses to perform"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:2
-#, fuzzy
 msgid "Show examples in command line mode"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:3
-#, fuzzy
 msgid "Go root directory"
-msgstr "Directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:4
-#, fuzzy
 msgid "Print HTML in command-line mode"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:5
-#, fuzzy
 msgid "HTTP service address"
-msgstr "Numerical address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:6
 msgid "httptest.NewServer serves on this address and blocks"
@@ -29340,9 +27141,8 @@ msgid "Link identifiers to their declarations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:12
-#, fuzzy
 msgid "Maximum number of full text search results shown"
-msgstr "Maximum number of log entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:13
 msgid "Regular expression matching note markers to show"
@@ -29365,9 +27165,8 @@ msgid "Print (exported) source in command-line mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:18
-#, fuzzy
 msgid "Tab width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:19
 msgid "Directory containing alternate template files"
@@ -29382,52 +27181,44 @@ msgid "Print HTML for named URL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:23
-#, fuzzy
 msgid "Write index to a file"
-msgstr "Escreve para o arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:24
 msgid "Zip file providing the file system to serve"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:1
-#, fuzzy
 msgid "Complete go build commands"
-msgstr "Compare FILE1 to all operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:2
-#, fuzzy
 msgid "force rebuild"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:3
-#, fuzzy
 msgid "print the commands but do not run them"
-msgstr "Print quoted commands to stderr, do not run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:4
 msgid "number parallel builds (default=#cpus)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:5
-#, fuzzy
 msgid "enable data race detection"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:6
-#, fuzzy
 msgid "print packages being built"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:7
-#, fuzzy
 msgid "print and preserve work directory"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:8
-#, fuzzy
 msgid "print the commands"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:9
 msgid "c compiler flags"
@@ -29458,19 +27249,16 @@ msgid "build tags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:16
-#, fuzzy
 msgid "Complete go"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:17
-#, fuzzy
 msgid "compile packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:18
-#, fuzzy
 msgid "remove object files"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:19
 msgid ""
@@ -29479,9 +27267,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:20
-#, fuzzy
 msgid "print the remove commands it would execute, but not run them"
-msgstr "Print quoted commands to stderr, do not run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:21
 msgid ""
@@ -29499,100 +27286,83 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:24
 #: /tmp/fish/implicit/share/completions/go.fish:29
-#, fuzzy
 msgid "prints commands that would be executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:25
 #: /tmp/fish/implicit/share/completions/go.fish:30
 #: /tmp/fish/implicit/share/completions/go.fish:53
-#, fuzzy
 msgid "prints commands as they are executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:26
-#, fuzzy
 msgid "print Go environment information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:27
-#, fuzzy
 msgid "run go tool fix on packages"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:28
-#, fuzzy
 msgid "run gofmt on package sources"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:31
-#, fuzzy
 msgid "download and install packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:32
-#, fuzzy
 msgid "stop after downloading the packages; don't install"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:33
 msgid "run fix tool on packages before resolving dependencies or building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:34
-#, fuzzy
 msgid "update remote packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:35
-#, fuzzy
 msgid "get help on topic"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:36
 #: /tmp/fish/implicit/share/completions/go.fish:48
-#, fuzzy
 msgid "target tool"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:37
-#, fuzzy
 msgid "compile and install packages and dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:38
-#, fuzzy
 msgid "list packages"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:39
-#, fuzzy
 msgid "tolerate erroneous packages"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:40
-#, fuzzy
 msgid "pass in template for formatting"
-msgstr "Specifies line formatting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:41
-#, fuzzy
 msgid "print in JSON format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:42
-#, fuzzy
 msgid "list of build tags"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:43
 msgid "compile and run Go program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:44
-#, fuzzy
 msgid "test packages"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:45
 msgid "compile the test binary to pkg.test but do not run it"
@@ -29603,41 +27373,34 @@ msgid "install dependent packages, but don't run tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:47
-#, fuzzy
 msgid "run specified go tool"
-msgstr "Repair the corrupted repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:49
-#, fuzzy
 msgid "print the command that would be executed but not execute it"
 msgstr ""
-"Print the command line on the standard error output before executing it"
 
 #: /tmp/fish/implicit/share/completions/go.fish:50
-#, fuzzy
 msgid "print Go version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:51
-#, fuzzy
 msgid "vet packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:52
 msgid "print the command that would be executed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:1
-#, fuzzy
 msgid "Write cpu profile to this file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:2
 #: /tmp/fish/implicit/share/completions/goimports.fish:1
 #: /tmp/fish/implicit/share/completions/gorename.fish:1
-#, fuzzy
 msgid "Display diffs instead of rewriting files"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:3
 msgid "Report all errors (not just the first 10 on different lines)"
@@ -29652,9 +27415,8 @@ msgid "Rewrite rule (e.g., 'a[b:len(a)] -> a[b:]')"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:6
-#, fuzzy
 msgid "Simplify code"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gofmt.fish:7
 #: /tmp/fish/implicit/share/completions/goimports.fish:5
@@ -29662,9 +27424,8 @@ msgid "Write result to (source) file instead of stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:2
-#, fuzzy
 msgid "Report all errors"
-msgstr "Report on all tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/goimports.fish:3
 msgid "List files whose formatting differs from goimport's"
@@ -29695,43 +27456,36 @@ msgid "Identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:5
-#, fuzzy
 msgid "Show usage message"
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:6
 msgid "File and byte offset of identifier to be renamed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:7
-#, fuzzy
 msgid "Build tag"
-msgstr "Build apt cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:8
-#, fuzzy
 msgid "New name for identifier"
-msgstr "Accept $ in identifiers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gorename.fish:9
-#, fuzzy
 msgid "Print verbose information"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:1
-#, fuzzy
 msgid "Add user to group"
-msgstr "Add label to output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:2
-#, fuzzy
 msgid "Remove user from group"
-msgstr "Remove all entries from the --group list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:4
-#, fuzzy
 msgid "Remove the GROUP's password"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpasswd.fish:5
 msgid "Restrict access to GROUP to its members"
@@ -29746,14 +27500,12 @@ msgid "set the list of administrators for GROUP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:1
-#, fuzzy
 msgid "Complete using gpg user ids"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:2
-#, fuzzy
 msgid "Complete using gpg key ids"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:3
 msgid ""
@@ -29786,9 +27538,8 @@ msgid "Store only (make a simple RFC1991 packet)"
 msgstr "Store only (make a simple RFC1991 packet)"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:10
-#, fuzzy
 msgid "Decrypt specified file or stdin"
-msgstr "Criptografa para o id de usuário especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:11
 msgid "Assume specified file or stdin is sigfile and verify it"
@@ -29841,9 +27592,8 @@ msgstr "List all keys with their fingerprints"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
-#, fuzzy
 msgid "Generate a new key pair"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:23
 msgid "Present a menu which enables you to do all key related tasks"
@@ -30097,9 +27847,8 @@ msgstr ""
 "keys"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:81
-#, fuzzy
 msgid "Specify trust model"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:82
 msgid "Select how to display key IDs"
@@ -30134,11 +27883,9 @@ msgid "The command line that should be run to view a photo ID"
 msgstr "O comando para abrir uma fotografia"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:90
-#, fuzzy
 msgid ""
 "Sets a list of directories to search for photo viewers and keyserver helpers"
 msgstr ""
-"Sets a list of directories to search for photo viewers and keyserver helpers"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:91
 msgid ""
@@ -30477,9 +28224,8 @@ msgstr ""
 "Do not create an internal pool file for quicker generation of random numbers"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:165
-#, fuzzy
 msgid "Reset verbose level to 0"
-msgstr "Reset verbose level to 0"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:166
 msgid "Suppress the initial copyright message"
@@ -30560,9 +28306,8 @@ msgstr ""
 "Changes the behaviour of some commands. This is like --dry-run but different"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:181
-#, fuzzy
 msgid "Display the session key used for one message"
-msgstr "Display the session key used for one message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:182
 msgid "Don't use the public key but the specified session key"
@@ -30636,62 +28381,52 @@ msgid "Set the list of default preferences to the specified string"
 msgstr "Define a lista de preferências padrão como a string especificada"
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:1
-#, fuzzy
 msgid "Print complete help message on program usage"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:2
-#, fuzzy
 msgid "Print short message on program usage"
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:3
-#, fuzzy
 msgid "Turn on debugging"
-msgstr "Turn of demangling"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:4
-#, fuzzy
 msgid "Name of file to write debug info to"
-msgstr "Use *.inf files to overwrite audio options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:5
-#, fuzzy
 msgid "Quiet output (default=verbose)"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:6
 msgid "Hook script to call after downloads, captures, etc."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:7
-#, fuzzy
 msgid "Send file to stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:8
-#, fuzzy
 msgid "Print filesize before data"
-msgstr "Print file size, not disk usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:9
 msgid "List auto-detected cameras"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:10
-#, fuzzy
 msgid "Show EXIF information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:11
-#, fuzzy
 msgid "Show info"
-msgstr "Mostra tudo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:12
-#, fuzzy
 msgid "Show summary"
-msgstr "Print summary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:13
 msgid "Show camera driver manual"
@@ -30702,76 +28437,64 @@ msgid "About the camera driver manual"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:15
-#, fuzzy
 msgid "Show storage information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:16
-#, fuzzy
 msgid "gPhoto shell"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:18
-#, fuzzy
 msgid "List supported camera models"
-msgstr "List trusted keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:19
-#, fuzzy
 msgid "List supported port devices"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:20
 msgid "Display camera/driver abilities"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:21
-#, fuzzy
 msgid "Specify device port"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:22
-#, fuzzy
 msgid "Specify serial transfer speed"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:23
-#, fuzzy
 msgid "Specify camera model"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:24
 msgid "(expert only) Override USB IDs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:25
-#, fuzzy
 msgid "List configuration tree"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:26
-#, fuzzy
 msgid "Dump full configuration tree"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:27
-#, fuzzy
 msgid "Get configuration value"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:28
 msgid "Set configuration value or index in choices"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:29
-#, fuzzy
 msgid "Set configuration value index in choices"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:30
-#, fuzzy
 msgid "Set configuration value"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:31
 msgid "Wait for event(s) from camera"
@@ -30786,18 +28509,16 @@ msgid "Capture a quick preview"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:34
-#, fuzzy
 msgid "Set bulb exposure time in seconds"
-msgstr "Maximum amount of cpu time in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:35
 msgid "Set number of frames to capture (default=infinite)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:36
-#, fuzzy
 msgid "Set capture interval in seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:37
 msgid "Reset capture interval on signal (default=no)"
@@ -30812,9 +28533,8 @@ msgid "Capture an image and download it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:40
-#, fuzzy
 msgid "Capture a movie"
-msgstr "TV capture mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:41
 msgid "Capture an audio clip"
@@ -30825,39 +28545,32 @@ msgid "Wait for shutter release on the camera and download"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:43
-#, fuzzy
 msgid "List folders in folder"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:44
-#, fuzzy
 msgid "List files in folder"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:45
-#, fuzzy
 msgid "Create a directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:46
-#, fuzzy
 msgid "Remove a directory"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:47
-#, fuzzy
 msgid "Display number of files"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:48
-#, fuzzy
 msgid "Get files given in range"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:49
-#, fuzzy
 msgid "Get all files from folder"
-msgstr "Extrair arquivos do arquivo de lista"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:50
 msgid "Get thumbnails given in range"
@@ -30876,9 +28589,8 @@ msgid "Get all metadata from folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:54
-#, fuzzy
 msgid "Upload metadata for file"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:55
 msgid "Get raw data given in range"
@@ -30893,14 +28605,12 @@ msgid "Get audio data given in range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:58
-#, fuzzy
 msgid "Get all audio data from folder"
-msgstr "Play audio from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:59
-#, fuzzy
 msgid "Delete files given in range"
-msgstr "Create file with name as given in data"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:60
 msgid "Delete all files in folder (--no-recurse by default)"
@@ -30911,9 +28621,8 @@ msgid "Upload a file to camera"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:62
-#, fuzzy
 msgid "Specify a filename or filename pattern"
-msgstr "Specify filenames to be filtered"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:63
 msgid "Specify camera folder (default=\"/\")"
@@ -30928,14 +28637,12 @@ msgid "No recursion (default for deletion)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:66
-#, fuzzy
 msgid "Process new files only"
-msgstr "Process binary file as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:67
-#, fuzzy
 msgid "Overwrite files without asking"
-msgstr "Never overwrite files with same name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:1
 msgid "Print annotated source"
@@ -30954,23 +28661,20 @@ msgid "Display summary"
 msgstr "Display summary"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:5
-#, fuzzy
 msgid "Search directories for source"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:6
 msgid "No annotated source"
 msgstr "No annotated source"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:7
-#, fuzzy
 msgid "Print full path of source"
-msgstr "Print full path of source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:8
-#, fuzzy
 msgid "Print flat profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:9
 msgid "No flat profile"
@@ -31017,9 +28721,8 @@ msgid "Set demangling style"
 msgstr "Set demangling style"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:20
-#, fuzzy
 msgid "Turn of demangling"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:21
 msgid "Supress static functions"
@@ -31030,18 +28733,16 @@ msgid "Ignore symbols not known to be functions"
 msgstr "Ignore symbols not known to be functions"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:23
-#, fuzzy
 msgid "Delete arcs from callgraph"
-msgstr "Delete arcs from callgraph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:24
 msgid "Line by line profiling"
 msgstr "Line by line profiling"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:25
-#, fuzzy
 msgid "Supress output when executed less than specified times"
-msgstr "Supress output when executed less than specified times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:26
 msgid "Only propagate times for matching symbols"
@@ -31060,37 +28761,32 @@ msgid "Specify debugging options"
 msgstr "Specify debugging options"
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:32
-#, fuzzy
 msgid "Profile data format"
-msgstr "Profile data format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:33
 msgid "Print summary"
 msgstr "Print summary"
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:2
-#, fuzzy
 msgid "Don't rebuild dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:3
-#, fuzzy
 msgid "Specify build file"
-msgstr "Specify build-dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:4
-#, fuzzy
 msgid "Specify settings file"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:5
 msgid "Only relevent project are configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:6
-#, fuzzy
 msgid "Specify console output type"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:7
 msgid "Continue task execution after failure"
@@ -31101,9 +28797,8 @@ msgid "Set system property of the JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:9
-#, fuzzy
 msgid "Log in debug mode"
-msgstr "Compiler debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:10
 msgid "Uses Gradle Daemon to run build"
@@ -31114,56 +28809,48 @@ msgid "Uses Gradle Daemon in foreground"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:12
-#, fuzzy
 msgid "Specify gradle user home directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:13
 msgid "Launch Gradle GUI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:14
-#, fuzzy
 msgid "Specify an initialization script"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:15
-#, fuzzy
 msgid "Set log level to info"
-msgstr "Set error level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:16
-#, fuzzy
 msgid "Include specified build in composite"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:17
 msgid "Runs build with all task actions disabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:18
-#, fuzzy
 msgid "Configure number of concurrent workers"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:19
-#, fuzzy
 msgid "Don't use deamon"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:20
-#, fuzzy
 msgid "Don't use network resources"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:21
 msgid "Set project property for build script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:22
-#, fuzzy
 msgid "Specify start directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:23
 msgid "Build project in parallel"
@@ -31174,9 +28861,8 @@ msgid "Profile build execution time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:25
-#, fuzzy
 msgid "Specify project cache directory"
-msgstr "Specify local cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:26
 msgid "Only log erros"
@@ -31187,14 +28873,12 @@ msgid "Force build script recompiling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:28
-#, fuzzy
 msgid "Refresh state of dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:29
-#, fuzzy
 msgid "Ignore previously cached dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:30
 msgid "Print out full stacktrace for all exceptions"
@@ -31228,44 +28912,37 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/rfkill.fish:2
 #: /tmp/fish/implicit/share/completions/tmutil.fish:51
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:13
-#, fuzzy
 msgid "Print version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:36
 msgid "Specify task to be excluded from execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:2
-#, fuzzy
 msgid "Process binary file as text"
-msgstr "Process binary file as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:5
-#, fuzzy
 msgid "Print byte offset of matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:6
-#, fuzzy
 msgid "Assume data type for binary files"
-msgstr "Assume data type for binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:7
-#, fuzzy
 msgid "Colour output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:8
 #: /tmp/fish/implicit/share/completions/jq.fish:10
-#, fuzzy
 msgid "Color output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:9
-#, fuzzy
 msgid "Only print number of matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:10
 msgid "Action for devices"
@@ -31276,168 +28953,138 @@ msgid "Action for directories"
 msgstr "Action for directories"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:12
-#, fuzzy
 msgid "Pattern is extended regexp"
-msgstr "Pattern is extended regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:13
-#, fuzzy
 msgid "Pattern is a regexp"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:14
 msgid "Read pattern list from file. Skip files whose base name matches list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:15
-#, fuzzy
 msgid "Exclude matching directories from recursive searches"
-msgstr "Search directories for source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:16
-#, fuzzy
 msgid "Pattern is a fixed string"
-msgstr "Pattern is a fixed string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:17
-#, fuzzy
 msgid "Use patterns from a file"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:18
-#, fuzzy
 msgid "Pattern is basic regex"
-msgstr "Pattern is basic regex"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:19
-#, fuzzy
 msgid "Print filename"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
-#, fuzzy
 msgid "Suppress printing filename"
-msgstr "Supress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:22
-#, fuzzy
 msgid "Skip binary files"
-msgstr "Skip binary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:24
-#, fuzzy
 msgid "Print first non-matching file"
-msgstr "Print first non-matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:25
-#, fuzzy
 msgid "Print first matching file"
-msgstr "Print first matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:26
-#, fuzzy
 msgid "Stop reading after NUM matches"
-msgstr "Stop reading after NUM matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:27
-#, fuzzy
 msgid "Use the mmap system call to read input"
-msgstr "Use the mmap system call to read input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:28
-#, fuzzy
 msgid "Print line number"
-msgstr "Print linenumber"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:29
-#, fuzzy
 msgid "Show only matching part"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:30
-#, fuzzy
 msgid "Rename stdin"
-msgstr "Rename stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:31
-#, fuzzy
 msgid "Use line buffering"
-msgstr "Use line buffering"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:32
-#, fuzzy
 msgid "Pattern is a Perl regexp (PCRE) string"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:33
 #: /tmp/fish/implicit/share/completions/grep.fish:34
-#, fuzzy
 msgid "Do not write anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:35
 #: /tmp/fish/implicit/share/completions/grep.fish:36
-#, fuzzy
 msgid "Read files under each directory, recursively"
-msgstr "List subdirectory recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:37
-#, fuzzy
 msgid "Search only files matching PATTERN"
-msgstr "Recurse, search file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:38
-#, fuzzy
 msgid "Skip files matching PATTERN"
-msgstr "Recurse, skip file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:39
-#, fuzzy
 msgid "Suppress error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:40
 msgid "Ensure first character of actual line content lies on a tab stop"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:41
-#, fuzzy
 msgid "Treat files as binary"
-msgstr "Treat files as binary"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:42
-#, fuzzy
 msgid "Report Unix-style byte offsets"
-msgstr "Report Unix-style byte offsets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:44
-#, fuzzy
 msgid "Invert the sense of matching"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:45
-#, fuzzy
 msgid "Only whole matching words"
-msgstr "Only whole matching words"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:46
-#, fuzzy
 msgid "Only whole matching lines"
-msgstr "Only whole matching lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:47
-#, fuzzy
 msgid "Ignore case (deprecated: use -i instead)"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:48
 msgid "Treat input as a set of zero-terminated lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:49
-#, fuzzy
 msgid "Output a zero byte after filename"
-msgstr "Output a zero byte after filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:1
 msgid "Exit with success status if the specified group already exists"
@@ -31449,9 +29096,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:3
 #: /tmp/fish/implicit/share/completions/useradd.fish:4
-#, fuzzy
 msgid "Display help message and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:4
 #: /tmp/fish/implicit/share/completions/useradd.fish:7
@@ -31584,53 +29230,44 @@ msgid "Check if given file is BIOS bootsector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-file.fish:32
-#, fuzzy
 msgid "Display usage and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:1
-#, fuzzy
 msgid "Compress GRUB files"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:2
-#, fuzzy
 msgid "Use image and modules under given directory"
-msgstr "Read files under each directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:3
-#, fuzzy
 msgid "Install given fonts"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:4
-#, fuzzy
 msgid "Install only given modules and their dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:5
 msgid "Embed given file as public key for signature checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:6
-#, fuzzy
 msgid "Use translations under given directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:7
-#, fuzzy
 msgid "Install only given locales"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:8
-#, fuzzy
 msgid "Preload specfied modules"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:9
-#, fuzzy
 msgid "Install given theme"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:11
 msgid "Make drive also bootable as floppy"
@@ -31641,24 +29278,20 @@ msgid "Install GRUB images under DIR/grub"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:13
-#, fuzzy
 msgid "Set bootloader ID"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:14
-#, fuzzy
 msgid "Choose compression to use for core image"
-msgstr "Display the session key used for one message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:15
-#, fuzzy
 msgid "Set disk module to use"
-msgstr "Select how to display key IDs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:16
-#, fuzzy
 msgid "Use given directory as the EFI System Partition root"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:17
 msgid "Install even if problems are detected"
@@ -31673,24 +29306,20 @@ msgid "Use given color for label background"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:20
-#, fuzzy
 msgid "Use given color for label"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:21
-#, fuzzy
 msgid "Use given file for label"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:22
-#, fuzzy
 msgid "Use given directory for PPC Mac install"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:23
-#, fuzzy
 msgid "Do not install bootsector"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:24
 msgid "Don't update the boot-device/Boot* NVRAM variables"
@@ -31701,23 +29330,20 @@ msgid "Don't apply any reed-solomon codes when embedding core.img"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:26
-#, fuzzy
 msgid "Set product version"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:27
-#, fuzzy
 msgid "Delete device map if it already exists"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:28
 msgid "The installation is removable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:29
-#, fuzzy
 msgid "Do not probe for filesystems"
-msgstr "Stay in local filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:30
 msgid "Install GRUB for given platform"
@@ -31728,37 +29354,32 @@ msgid "Print the grunt version. Combine with --verbose for more info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:1
-#, fuzzy
 msgid "Print the version information"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
-#, fuzzy
 msgid "Specify a custom schemas directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:3
 msgid "Get the value of a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:4
-#, fuzzy
 msgid "Determine if a key is writable"
-msgstr "File is writable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:5
 msgid "Determine the valid value range of a key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:6
-#, fuzzy
 msgid "Print the description of a key"
-msgstr "Output description of mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:7
-#, fuzzy
 msgid "Set the value of a key"
-msgstr "Set the misc debug value to #"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:8
 msgid "Reset a key to its default value"
@@ -31773,24 +29394,20 @@ msgid "List all installed, non-relocatable schemas"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:11
-#, fuzzy
 msgid "List all installed, relocatable schemas"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:12
-#, fuzzy
 msgid "List all keys in a schema"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:13
-#, fuzzy
 msgid "List all children of a schema"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:14
-#, fuzzy
 msgid "List keys and values, recursively"
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:4
 #: /tmp/fish/implicit/share/completions/gzip.fish:4
@@ -31809,15 +29426,13 @@ msgstr "Save/restore filename"
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:9
 #: /tmp/fish/implicit/share/completions/gzip.fish:9
-#, fuzzy
 msgid "Recurse directories"
-msgstr "Recurse directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:10
 #: /tmp/fish/implicit/share/completions/gzip.fish:10
-#, fuzzy
 msgid "Suffix"
-msgstr "Suffix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gunzip.fish:12
 #: /tmp/fish/implicit/share/completions/gzip.fish:12
@@ -31829,19 +29444,16 @@ msgid "Display document using only black and white"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:2
-#, fuzzy
 msgid "Display document without colors"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:3
-#, fuzzy
 msgid "Display document as usual"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:4
-#, fuzzy
 msgid "Start ghostscript in safe mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:5
 msgid "Do not start ghostscript in safe mode"
@@ -31893,23 +29505,20 @@ msgid "The page should not be centered automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:17
-#, fuzzy
 msgid "Selects the paper size to be used"
-msgstr "Selects how passphrases are mangled"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:18
-#, fuzzy
 msgid "Sets the orientation of the page"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:19
 msgid "Selects the scale N, or arbitrary scale f.f"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:20
-#, fuzzy
 msgid "Selects the scale base N"
-msgstr "Select time style"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:21
 msgid "Interchange the meaning of the orientations landscape and seascape"
@@ -31921,14 +29530,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:23
-#, fuzzy
 msgid "Use antialiasing"
-msgstr "Use fast setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:24
-#, fuzzy
 msgid "Do not use antialiasing"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:25
 msgid "Dsc comments are respected"
@@ -31951,9 +29558,8 @@ msgid "Use backing pixmap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:30
-#, fuzzy
 msgid "Do not use backing pixmap"
-msgstr "Do not use gcc wrapper"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:31
 msgid "Watch the document file for changes"
@@ -31964,9 +29570,8 @@ msgid "Do not watch the document file for changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:34
-#, fuzzy
 msgid "Print a usage message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:35
 msgid "Fit the size of the window to the size of the page"
@@ -31977,9 +29582,8 @@ msgid "Do not fit the size of the window to the size of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:37
-#, fuzzy
 msgid "Set geometry"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:38
 msgid "Read and use additional resources from FILE (higher priority)"
@@ -32006,14 +29610,12 @@ msgid "Start in fullscreen mode (needs support from WM)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:44
-#, fuzzy
 msgid "Presentation mode "
-msgstr "Question mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gv.fish:45
-#, fuzzy
 msgid "Show gv version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gzip.fish:14
 msgid "Use fast setting"
@@ -32024,27 +29626,24 @@ msgid "Use high compression setting"
 msgstr "Use high compression setting"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:1
-#, fuzzy
 msgid "Enable verbose output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:2
 msgid "Location of your Helm config"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:3
-#, fuzzy
 msgid "Address of tiller"
-msgstr "Erro de fronteira de endereço (Falha de segmentação)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:4
 msgid "Name of the kubeconfig context to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:5
-#, fuzzy
 msgid "More information about a command"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:6
 msgid "The named Helm starter scaffold"
@@ -32068,9 +29667,8 @@ msgid "Prevent hooks from running during deletion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:10
-#, fuzzy
 msgid "Remove the release from the store"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:11
 #: /tmp/fish/implicit/share/completions/helm.fish:13
@@ -32083,9 +29681,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:12
 #: /tmp/fish/implicit/share/completions/helm.fish:14
-#, fuzzy
 msgid "Verify the packages against signatures"
-msgstr "Verificar a integridade do pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:15
 #: /tmp/fish/implicit/share/completions/helm.fish:32
@@ -32111,52 +29708,45 @@ msgid "Directory into which the chart is expanded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:21
-#, fuzzy
 msgid "Verify the package against its signature"
-msgstr "Verificar a integridade do pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:22
 #: /tmp/fish/implicit/share/completions/helm.fish:35
 #: /tmp/fish/implicit/share/completions/helm.fish:47
 #: /tmp/fish/implicit/share/completions/helm.fish:87
-#, fuzzy
 msgid "Chart version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
 #: /tmp/fish/implicit/share/completions/helm.fish:76
-#, fuzzy
 msgid "Revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:25
 msgid "Dump all (computed) values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:27
-#, fuzzy
 msgid "Maximum number of revision to include in history"
-msgstr "Maximum number of open file descriptors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:28
 msgid "Use the canary tiller image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:29
-#, fuzzy
 msgid "Do not install tiller"
-msgstr "Do not load init files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:30
-#, fuzzy
 msgid "Do not install local or remote"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:31
-#, fuzzy
 msgid "Override tiller image"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:33
 #: /tmp/fish/implicit/share/completions/helm.fish:38
@@ -32168,25 +29758,21 @@ msgid "Verify the provenance data for this chart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:37
-#, fuzzy
 msgid "Simulate an install"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:39
-#, fuzzy
 msgid "Release name"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:40
-#, fuzzy
 msgid "Specify template used to name the release"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:41
 #: /tmp/fish/implicit/share/completions/helm.fish:82
-#, fuzzy
 msgid "Namespace"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:42
 msgid "Prevent hooks from running during install"
@@ -32198,83 +29784,69 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:44
 #: /tmp/fish/implicit/share/completions/helm.fish:84
-#, fuzzy
 msgid "Set values on the command line"
-msgstr "Obtém ou altera o buffer da linha de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:45
 #: /tmp/fish/implicit/share/completions/helm.fish:85
-#, fuzzy
 msgid "Specify values in a YAML file"
-msgstr "Specify a config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:46
-#, fuzzy
 msgid "Verify the package before installing it"
-msgstr "Verificar a integridade do pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:48
-#, fuzzy
 msgid "Fail on lint warnings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:49
-#, fuzzy
 msgid "Show all releases"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:50
-#, fuzzy
 msgid "Sort by release date"
-msgstr "Ordena por tamanho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:51
-#, fuzzy
 msgid "Show deleted releases"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:52
-#, fuzzy
 msgid "Show releases that are currently being deleted"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:53
-#, fuzzy
 msgid "Show deployed releases"
-msgstr "Show upgraded packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:54
-#, fuzzy
 msgid "Show failed releases"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:55
-#, fuzzy
 msgid "Maximum number of releases to fetch"
-msgstr "Maximum number of nested blocks reached."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:56
 msgid "Next release name in the list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:57
-#, fuzzy
 msgid "Reverse the sort order"
-msgstr "Inverte a ordem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:58
-#, fuzzy
 msgid "Output short listing format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:59
 msgid "Name of the key to use when signing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:61
-#, fuzzy
 msgid "Save packaged chart to local chart repository"
-msgstr "Move packages to local tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:62
 msgid "Use a PGP private key to sign this package"
@@ -32285,19 +29857,16 @@ msgid "Raise error if repo is already registered"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:64
-#, fuzzy
 msgid "Merge the generated index into the given index"
-msgstr "Search the keyserver for the given names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:65
-#, fuzzy
 msgid "URL of chart repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:66
-#, fuzzy
 msgid "Repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:69
 msgid "Simulate a rollback"
@@ -32308,14 +29877,12 @@ msgid "Prevent hooks from running during rollback"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:71
-#, fuzzy
 msgid "Use regular expressions for searching"
-msgstr "Use high compression setting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:72
-#, fuzzy
 msgid "Show the long listing"
-msgstr "Show the time"
+msgstr ""
 
 # Notas:
 # Adicionar nota
@@ -32324,18 +29891,16 @@ msgstr "Show the time"
 # proc.cpp:1279
 # proc.cpp:1305
 #: /tmp/fish/implicit/share/completions/helm.fish:73
-#, fuzzy
 msgid "Address to listen on"
-msgstr "Ponteiro de lista de processo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:74
 msgid "Path from which to serve charts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:79
-#, fuzzy
 msgid "Simulate an upgrade"
-msgstr "Distro upgrade"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:80
 msgid "Run an install if the release don't exists"
@@ -32350,14 +29915,12 @@ msgid "Verify the provenance of the chart before upgrading"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:89
-#, fuzzy
 msgid "Show the client version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:90
-#, fuzzy
 msgid "Show the server version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:1
 #: /tmp/fish/implicit/share/completions/help.fish:68
@@ -32365,136 +29928,113 @@ msgid "Autosuggestions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:2
-#, fuzzy
 msgid "Builtin commands"
-msgstr "Process command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:3
 msgid "Cartesian Products"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:4
-#, fuzzy
 msgid "Setting syntax highlighting colors"
-msgstr "Help on setting syntax highlighting colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:5
 msgid "Combining different expansions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:6
-#, fuzzy
 msgid "How tab-completion works"
-msgstr "Help on how tab-completion works"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:7
-#, fuzzy
 msgid "Useful functions for writing completions"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:8
-#, fuzzy
 msgid "Writing your own completions"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:9
-#, fuzzy
 msgid "Where to put completions"
-msgstr "Description of this completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:10
 msgid "Debugging fish scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:12
-#, fuzzy
 msgid "Command line editor"
-msgstr "Command to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:13
-#, fuzzy
 msgid "Emacs mode commands"
-msgstr "Finaliza um bloco de comandos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:14
-#, fuzzy
 msgid "Escaping characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:15
-#, fuzzy
 msgid "Event handlers"
-msgstr "bloco gerenciador de evento"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:16
 #: /tmp/fish/implicit/share/completions/help.fish:25
-#, fuzzy
 msgid "Parameter expansion (Globbing)"
-msgstr "Help on parameter expansion (Globbing)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:17
-#, fuzzy
 msgid "Brace expansion {a,b,c}"
-msgstr "Help on brace expansion {a,b,c}"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:18
-#, fuzzy
 msgid "Command substitution"
-msgstr "na substituição de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:19
-#, fuzzy
 msgid "Command substitution (SUBCOMMAND)"
-msgstr "Help on command substitution (SUBCOMMAND)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:20
-#, fuzzy
 msgid "Home directory expansion ~USER"
-msgstr "Help on home directory expansion ~USER"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:21
-#, fuzzy
 msgid "Index range expansion"
-msgstr "Ignore changes due to tab expansion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:22
-#, fuzzy
 msgid "Process expansion %JOB"
-msgstr "Help on process expansion %JOB"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:24
-#, fuzzy
 msgid "Wildcard expansion *.*"
-msgstr "Help on wildcard expansion *.*"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:26
-#, fuzzy
 msgid "Configurable greeting"
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:27
 msgid "Help on how to reuse previously entered commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:28
-#, fuzzy
 msgid "Searchable history"
-msgstr "Show package info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:29
-#, fuzzy
 msgid "Shell variable and function names"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:30
-#, fuzzy
 msgid "Initialization files"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:31
-#, fuzzy
 msgid "Introduction"
-msgstr "Instrução ilegal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:32
 msgid "Common issues with fish"
@@ -32509,9 +30049,8 @@ msgid "Copy and paste (Kill Ring)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:35
-#, fuzzy
 msgid "Further help and development"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:36
 msgid "Multiline editing"
@@ -32526,136 +30065,113 @@ msgid "Piping"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:39
-#, fuzzy
 msgid "Programmable prompt"
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:40
 msgid "Quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:41
-#, fuzzy
 msgid "Input/Output (IO) redirection"
-msgstr "Redireção inválida de entrada/saída"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:44
-#, fuzzy
 msgid "Background jobs"
-msgstr "Última tarefa em segundo plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:45
-#, fuzzy
 msgid "Conditional execution of code and flow control"
-msgstr "Executa condicionalmente um bloco de comandos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:46
 #: /tmp/fish/implicit/share/completions/help.fish:74
-#, fuzzy
 msgid "Functions"
-msgstr "Function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:47
-#, fuzzy
 msgid "Autoloading functions"
-msgstr "função"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:48
 msgid "Defining aliases"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:49
-#, fuzzy
 msgid "Job control"
-msgstr "Controle de tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:50
-#, fuzzy
 msgid "Some common words"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:51
-#, fuzzy
 msgid "Programmable title"
-msgstr "Program section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:52
-#, fuzzy
 msgid "Shell variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:53
 msgid "Arrays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:54
-#, fuzzy
 msgid "Variables for changing highlighting colors"
-msgstr "Help on setting syntax highlighting colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:55
-#, fuzzy
 msgid "Exporting variables"
-msgstr "Export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:56
-#, fuzzy
 msgid "Variable scope for functions"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:57
-#, fuzzy
 msgid "Locale variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:58
-#, fuzzy
 msgid "Variable scope"
-msgstr "Variável"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:59
-#, fuzzy
 msgid "Special variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:60
-#, fuzzy
 msgid "The status variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:61
-#, fuzzy
 msgid "More on universal variables"
-msgstr "Help on environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:62
-#, fuzzy
 msgid "Vi mode commands"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:63
-#, fuzzy
 msgid "Command mode"
-msgstr "Command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:64
-#, fuzzy
 msgid "Insert mode"
-msgstr "Inserir cabeçalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:65
-#, fuzzy
 msgid "Visual mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:66
 msgid "Tutorial"
@@ -32670,23 +30186,20 @@ msgid "Combiners (And, Or, Not)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:70
-#, fuzzy
 msgid "Command Substitutions"
-msgstr "na substituição de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:71
 msgid "Conditionals (If, Else, Switch)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:72
-#, fuzzy
 msgid "Exit Status"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:73
-#, fuzzy
 msgid "Exports (Shell Variables)"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:75
 msgid "Getting Help"
@@ -32697,34 +30210,28 @@ msgid "Learning fish"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:77
-#, fuzzy
 msgid "Lists"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:78
-#, fuzzy
 msgid "Loops"
-msgstr "Loop script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:79
-#, fuzzy
 msgid "Ready for more?"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:81
-#, fuzzy
 msgid "Pipes and Redirections"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:82
-#, fuzzy
 msgid "Prompt"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:83
-#, fuzzy
 msgid "Running Commands"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:84
 msgid "Separating Commands (Semicolon)"
@@ -32735,24 +30242,20 @@ msgid "Startup (Where's .bashrc?)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:86
-#, fuzzy
 msgid "Syntax Highlighting"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:87
-#, fuzzy
 msgid "Tab Completions"
-msgstr "Remove property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:88
-#, fuzzy
 msgid "Universal Variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:89
-#, fuzzy
 msgid "Variables"
-msgstr "Variável"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:90
 msgid "Why fish?"
@@ -32763,9 +30266,8 @@ msgid "Wildcards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:1
-#, fuzzy
 msgid "list installed addons"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:2
 msgid "manage apps (create, destroy)"
@@ -32784,9 +30286,8 @@ msgid "manage custom domains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:6
-#, fuzzy
 msgid "display logs for an app"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:7
 msgid "manage dynos (dynos, workers)"
@@ -32826,9 +30327,8 @@ msgid "list commands and display help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:16
-#, fuzzy
 msgid "manage authentication keys"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:18
 msgid "manage maintenance mode for an app"
@@ -32851,9 +30351,8 @@ msgid "manage plugins to the heroku gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:23
-#, fuzzy
 msgid "list available regions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:24
 msgid "manage the stack for an app"
@@ -32864,14 +30363,12 @@ msgid "check status of heroku platform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:26
-#, fuzzy
 msgid "update the heroku client"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:27
-#, fuzzy
 msgid "display version"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:28
 msgid ""
@@ -32892,28 +30389,24 @@ msgid "open an addon's documentation in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:32
-#, fuzzy
 msgid "downgrade an existing addon"
-msgstr "Atualizar um pacote existente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:33
-#, fuzzy
 msgid "list all available addons"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:34
 msgid "open an addon's dashboard in your browser"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:35
-#, fuzzy
 msgid "uninstall one or more addons"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:36
-#, fuzzy
 msgid "upgrade an existing addon"
-msgstr "Atualizar um pacote existente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:37
 msgid "the org to list the apps for"
@@ -32936,9 +30429,8 @@ msgid " permanently destroy an app (--app APP)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:42
-#, fuzzy
 msgid "show detailed app information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:43
 msgid " add yourself to an organization app (--app APP)"
@@ -32969,18 +30461,16 @@ msgid "log in with your heroku credentials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:50
-#, fuzzy
 msgid "clear local authentication credentials"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:51
 msgid "display your api token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:52
-#, fuzzy
 msgid "display your heroku email address"
-msgstr "File to grab servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:53
 msgid "output config vars in shell format"
@@ -32988,9 +30478,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:54
 #: /tmp/fish/implicit/share/completions/heroku.fish:55
-#, fuzzy
 msgid "display a config value for an app"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:56
 #: /tmp/fish/implicit/share/completions/heroku.fish:57
@@ -32999,9 +30488,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:58
 #: /tmp/fish/implicit/share/completions/heroku.fish:59
-#, fuzzy
 msgid "unset one or more config vars"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:60
 msgid "add a custom domain to an app"
@@ -33017,18 +30505,16 @@ msgid "remove a custom domain from an app"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:64
-#, fuzzy
 msgid "the number of lines to display"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:65
 msgid "only display logs from the given process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:66
-#, fuzzy
 msgid "only display logs from the given source"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:67
 msgid "continually stream logs"
@@ -33043,29 +30529,24 @@ msgid "cancel an in-progress backup or restore (default newest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:70
-#, fuzzy
 msgid "capture a new backup"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:71
-#, fuzzy
 msgid "delete a backup"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:72
-#, fuzzy
 msgid "downloads database backup"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:73
-#, fuzzy
 msgid "get information about a specific backup"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:74
-#, fuzzy
 msgid "restore a backup (default latest) to a database"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:75
 msgid "schedule daily backups for given database"
@@ -33109,9 +30590,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:88
 #: /tmp/fish/implicit/share/completions/heroku.fish:89
-#, fuzzy
 msgid "view detailed information for a release"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:90
 #: /tmp/fish/implicit/share/completions/heroku.fish:91
@@ -33119,9 +30599,8 @@ msgid "roll back to an older release"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:92
-#, fuzzy
 msgid "specify dyno size"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:93
 msgid "open a remote console session (with optional COMMAND)"
@@ -33152,43 +30631,36 @@ msgid "repository root directory or name of overlay bundle file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:2
-#, fuzzy
 msgid "change working directory"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:3
 msgid "do not prompt, automatically pick the first choice for all prompts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:4
-#, fuzzy
 msgid "suppress output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:5
-#, fuzzy
 msgid "enable additional output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:6
-#, fuzzy
 msgid "set/override config option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:7
-#, fuzzy
 msgid "enable debugging output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:8
-#, fuzzy
 msgid "start debugger"
-msgstr "Start debugger on error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:9
-#, fuzzy
 msgid "set the charset encoding"
-msgstr "Force encoding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:10
 msgid "set the charset encoding mode"
@@ -33199,14 +30671,12 @@ msgid "always print a traceback on exception"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:12
-#, fuzzy
 msgid "time how long the command takes"
-msgstr "Obtém ou altera o buffer da linha de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:13
-#, fuzzy
 msgid "print command execution profile"
-msgstr "Select an option profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:16
 msgid "consider hidden changesets"
@@ -33243,9 +30713,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:453
 #: /tmp/fish/implicit/share/completions/hg.fish:460
 #: /tmp/fish/implicit/share/completions/hg.fish:495
-#, fuzzy
 msgid "include names matching the given patterns"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:20
 #: /tmp/fish/implicit/share/completions/hg.fish:26
@@ -33270,9 +30739,8 @@ msgstr "Insert modules matching the given wildcard"
 #: /tmp/fish/implicit/share/completions/hg.fish:454
 #: /tmp/fish/implicit/share/completions/hg.fish:461
 #: /tmp/fish/implicit/share/completions/hg.fish:496
-#, fuzzy
 msgid "exclude names matching the given patterns"
-msgstr "List all modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:21
 #: /tmp/fish/implicit/share/completions/hg.fish:48
@@ -33282,9 +30750,8 @@ msgstr "List all modules matching the given wildcard"
 #: /tmp/fish/implicit/share/completions/hg.fish:287
 #: /tmp/fish/implicit/share/completions/hg.fish:430
 #: /tmp/fish/implicit/share/completions/hg.fish:497
-#, fuzzy
 msgid "recurse into subrepositories"
-msgstr "Recurse into subdir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:22
 #: /tmp/fish/implicit/share/completions/hg.fish:27
@@ -33346,9 +30813,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:518
 #: /tmp/fish/implicit/share/completions/hg.fish:523
 #: /tmp/fish/implicit/share/completions/hg.fish:524
-#, fuzzy
 msgid "operate on patch repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:24
 #: /tmp/fish/implicit/share/completions/hg.fish:213
@@ -33356,23 +30822,20 @@ msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:29
-#, fuzzy
 msgid "annotate the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:30
-#, fuzzy
 msgid "don't follow copies and renames"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:31
 #: /tmp/fish/implicit/share/completions/hg.fish:128
 #: /tmp/fish/implicit/share/completions/hg.fish:145
 #: /tmp/fish/implicit/share/completions/hg.fish:165
 #: /tmp/fish/implicit/share/completions/hg.fish:328
-#, fuzzy
 msgid "treat all files as text"
-msgstr "Treat all files as text"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:32
 #: /tmp/fish/implicit/share/completions/hg.fish:171
@@ -33380,9 +30843,8 @@ msgid "list the author (long with -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:33
-#, fuzzy
 msgid "list the filename"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:34
 #: /tmp/fish/implicit/share/completions/hg.fish:172
@@ -33390,14 +30852,12 @@ msgid "list the date (short with -q)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:35
-#, fuzzy
 msgid "list the revision number (default)"
-msgstr "Edit the long comment by default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:36
-#, fuzzy
 msgid "list the changeset"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:37
 msgid "show line number at the first appearance"
@@ -33408,60 +30868,52 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:333
 #: /tmp/fish/implicit/share/completions/hg.fish:396
 #: /tmp/fish/implicit/share/completions/hg.fish:431
-#, fuzzy
 msgid "ignore white space when comparing lines"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:39
 #: /tmp/fish/implicit/share/completions/hg.fish:134
-#, fuzzy
 msgid "changes in the amount of white space"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:40
 #: /tmp/fish/implicit/share/completions/hg.fish:135
 #: /tmp/fish/implicit/share/completions/hg.fish:335
 #: /tmp/fish/implicit/share/completions/hg.fish:398
 #: /tmp/fish/implicit/share/completions/hg.fish:433
-#, fuzzy
 msgid "ignore changes whose lines are all blank"
-msgstr "Ignore changes whose lines are all blank"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:44
 msgid "do not pass files through decoders"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:45
-#, fuzzy
 msgid "directory prefix for files in archive"
-msgstr "Arquivo inicial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:46
-#, fuzzy
 msgid "revision to distribute"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:47
-#, fuzzy
 msgid "type of distribution to create"
-msgstr "Type of L1 instruction cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:52
 msgid "merge with old dirstate parent after backout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:53
-#, fuzzy
 msgid "revision to backout"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:54
 #: /tmp/fish/implicit/share/completions/hg.fish:160
 #: /tmp/fish/implicit/share/completions/hg.fish:269
 #: /tmp/fish/implicit/share/completions/hg.fish:452
-#, fuzzy
 msgid "specify merge tool"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:57
 #: /tmp/fish/implicit/share/completions/hg.fish:112
@@ -33471,9 +30923,8 @@ msgstr "Specify trust model"
 #: /tmp/fish/implicit/share/completions/hg.fish:394
 #: /tmp/fish/implicit/share/completions/hg.fish:408
 #: /tmp/fish/implicit/share/completions/hg.fish:426
-#, fuzzy
 msgid "use text as commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:58
 #: /tmp/fish/implicit/share/completions/hg.fish:113
@@ -33483,9 +30934,8 @@ msgstr "Read commit message from file"
 #: /tmp/fish/implicit/share/completions/hg.fish:395
 #: /tmp/fish/implicit/share/completions/hg.fish:409
 #: /tmp/fish/implicit/share/completions/hg.fish:427
-#, fuzzy
 msgid "read commit message from file"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:59
 #: /tmp/fish/implicit/share/completions/hg.fish:114
@@ -33493,9 +30943,8 @@ msgstr "Read commit message from file"
 #: /tmp/fish/implicit/share/completions/hg.fish:211
 #: /tmp/fish/implicit/share/completions/hg.fish:428
 #: /tmp/fish/implicit/share/completions/hg.fish:513
-#, fuzzy
 msgid "record the specified date as commit date"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:60
 #: /tmp/fish/implicit/share/completions/hg.fish:115
@@ -33503,9 +30952,8 @@ msgstr "Help for the specified command"
 #: /tmp/fish/implicit/share/completions/hg.fish:212
 #: /tmp/fish/implicit/share/completions/hg.fish:429
 #: /tmp/fish/implicit/share/completions/hg.fish:514
-#, fuzzy
 msgid "record the specified user as committer"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:62
 msgid "reset bisect state"
@@ -33516,9 +30964,8 @@ msgid "mark changeset good"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:64
-#, fuzzy
 msgid "mark changeset bad"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:65
 msgid "skip testing changeset"
@@ -33533,9 +30980,8 @@ msgid "use command to check changeset state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:68
-#, fuzzy
 msgid "do not update to target"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:70
 #: /tmp/fish/implicit/share/completions/ifdown.fish:2
@@ -33546,9 +30992,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:71
 #: /tmp/fish/implicit/share/completions/hg.fish:126
 #: /tmp/fish/implicit/share/completions/hg.fish:522
-#, fuzzy
 msgid "revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:72
 msgid "delete a given bookmark"
@@ -33580,23 +31025,20 @@ msgid "run even when the destination is unrelated"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:82
-#, fuzzy
 msgid "a changeset intended to be added to the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:83
 msgid "a specific branch you would like to bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:84
-#, fuzzy
 msgid "a base changeset assumed to be available at the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:85
-#, fuzzy
 msgid "bundle all changesets in the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:86
 msgid "bundle compression type to use (default: bzip2)"
@@ -33611,9 +31053,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:305
 #: /tmp/fish/implicit/share/completions/hg.fish:314
 #: /tmp/fish/implicit/share/completions/hg.fish:324
-#, fuzzy
 msgid "specify ssh command to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:88
 #: /tmp/fish/implicit/share/completions/hg.fish:104
@@ -33624,9 +31065,8 @@ msgstr "Pass command to shell"
 #: /tmp/fish/implicit/share/completions/hg.fish:306
 #: /tmp/fish/implicit/share/completions/hg.fish:315
 #: /tmp/fish/implicit/share/completions/hg.fish:325
-#, fuzzy
 msgid "specify hg command to run on the remote side"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:89
 msgid "do not verify server certificate (ignoring web.cacerts"
@@ -33634,37 +31074,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:91
 #: /tmp/fish/implicit/share/completions/hg.fish:142
-#, fuzzy
 msgid "print output to file with formatted name"
-msgstr "Redirecionar saída para arquivo se o arquivo não existe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:92
-#, fuzzy
 msgid "print the given revision"
-msgstr "Print only given revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:93
 msgid "apply any matching decode filter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:97
-#, fuzzy
 msgid "the clone will include an empty working copy (only a repository)"
-msgstr "Check out a working copy from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:98
 msgid "revision, tag or branch to check out"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:99
-#, fuzzy
 msgid "include the specified changeset"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:100
-#, fuzzy
 msgid "clone only the specified branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:101
 #: /tmp/fish/implicit/share/completions/hg.fish:320
@@ -33698,20 +31133,17 @@ msgid "mark a branch as closed, hiding it from the branch list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:108
-#, fuzzy
 msgid "amend the parent of the working directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:109
 #: /tmp/fish/implicit/share/completions/hg.fish:423
-#, fuzzy
 msgid "use the secret phase for committing"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:118
-#, fuzzy
 msgid "untrusted configuration options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:120
 msgid "record a copy that has already occurred"
@@ -33723,9 +31155,8 @@ msgid "forcibly copy over an existing managed file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:127
-#, fuzzy
 msgid "change made by revision"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:129
 #: /tmp/fish/implicit/share/completions/hg.fish:146
@@ -33737,9 +31168,8 @@ msgstr "Manual sections"
 #: /tmp/fish/implicit/share/completions/hg.fish:357
 #: /tmp/fish/implicit/share/completions/hg.fish:387
 #: /tmp/fish/implicit/share/completions/hg.fish:400
-#, fuzzy
 msgid "use git extended diff format"
-msgstr "Use context diff format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:130
 #: /tmp/fish/implicit/share/completions/hg.fish:147
@@ -33749,9 +31179,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:131
 #: /tmp/fish/implicit/share/completions/hg.fish:331
-#, fuzzy
 msgid "show which function each change is in"
-msgstr "Identify the C function each change is in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:132
 #: /tmp/fish/implicit/share/completions/hg.fish:332
@@ -33760,9 +31189,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:136
 #: /tmp/fish/implicit/share/completions/hg.fish:336
-#, fuzzy
 msgid "number of lines of context to show"
-msgstr "Print NUM lines of context"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:137
 #: /tmp/fish/implicit/share/completions/hg.fish:225
@@ -33777,14 +31205,12 @@ msgid "against the second parent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:144
-#, fuzzy
 msgid "revisions to export"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:152
-#, fuzzy
 msgid "revisions to graft"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:153
 msgid "resume interrupted graft"
@@ -33792,34 +31218,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:154
 #: /tmp/fish/implicit/share/completions/hg.fish:204
-#, fuzzy
 msgid "invoke editor on commit messages"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:155
-#, fuzzy
 msgid "append graft info to log message"
-msgstr "Specify email address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:156
-#, fuzzy
 msgid "the current date as commit date"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:157
-#, fuzzy
 msgid "the current user as committer"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:163
-#, fuzzy
 msgid "end fields with NUL"
-msgstr "tamanho de campo inválido"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:164
-#, fuzzy
 msgid "print all revisions that match"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:166
 #: /tmp/fish/implicit/share/completions/hg.fish:244
@@ -33827,18 +31247,16 @@ msgid "follow changeset history, or file history across copies and renames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:167
-#, fuzzy
 msgid "ignore case when matching"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:168
 msgid "print only filenames and revisions that match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:169
-#, fuzzy
 msgid "print matching line numbers"
-msgstr "Print linenumber"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:170
 msgid "only search files changed within revision range"
@@ -33861,38 +31279,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:259
 #: /tmp/fish/implicit/share/completions/hg.fish:282
 #: /tmp/fish/implicit/share/completions/hg.fish:290
-#, fuzzy
 msgid "display using template map file"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:180
 #: /tmp/fish/implicit/share/completions/hg.fish:228
 #: /tmp/fish/implicit/share/completions/hg.fish:260
 #: /tmp/fish/implicit/share/completions/hg.fish:283
 #: /tmp/fish/implicit/share/completions/hg.fish:291
-#, fuzzy
 msgid "display with template"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:182
-#, fuzzy
 msgid "only help for extensions"
-msgstr "Disable all GNU extensions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:183
-#, fuzzy
 msgid "show only help for commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:184
-#, fuzzy
 msgid "show topics matching keyword"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:185
-#, fuzzy
 msgid "read history edits from the specified file"
-msgstr "Lê entrada de usuário a partir do descritor de arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:186
 msgid "continue an edit already in progress"
@@ -33907,63 +31319,52 @@ msgid "abort an edit in progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:189
-#, fuzzy
 msgid "changesets not found in destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:190
-#, fuzzy
 msgid "force outgoing even for unrelated repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:191
-#, fuzzy
 msgid "first revision to be edited"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:193
-#, fuzzy
 msgid "identify the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:194
-#, fuzzy
 msgid "show local revision number"
-msgstr "Show record number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:195
-#, fuzzy
 msgid "show global revision id"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:196
-#, fuzzy
 msgid "show branch"
-msgstr "Show hierarchy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:197
-#, fuzzy
 msgid "show tags"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:198
 msgid "show bookmarks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:203
-#, fuzzy
 msgid "directory strip option for patch"
-msgstr "Prefix to strip on patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
-#, fuzzy
 msgid "don't commit, just update the working directory"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:206
-#, fuzzy
 msgid "apply patch without touching the working directory"
-msgstr "Record an inverse patch without changing the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:207
 msgid "apply patch to the nodes from which it was generated"
@@ -33983,9 +31384,8 @@ msgid "show newest record first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:217
-#, fuzzy
 msgid "file to store the bundles into"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:218
 msgid "a remote changeset intended to be added"
@@ -34004,35 +31404,30 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hg.fish:221
 #: /tmp/fish/implicit/share/completions/hg.fish:253
 #: /tmp/fish/implicit/share/completions/hg.fish:276
-#, fuzzy
 msgid "show patch"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:223
 #: /tmp/fish/implicit/share/completions/hg.fish:255
 #: /tmp/fish/implicit/share/completions/hg.fish:278
-#, fuzzy
 msgid "limit number of changes displayed"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:224
 #: /tmp/fish/implicit/share/completions/hg.fish:256
 #: /tmp/fish/implicit/share/completions/hg.fish:279
-#, fuzzy
 msgid "do not show merges"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:226
 #: /tmp/fish/implicit/share/completions/hg.fish:258
 #: /tmp/fish/implicit/share/completions/hg.fish:281
-#, fuzzy
 msgid "show the revision DAG"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:238
-#, fuzzy
 msgid "search the repository as it is in REV"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:239
 #: /tmp/fish/implicit/share/completions/hg.fish:492
@@ -34040,61 +31435,52 @@ msgid "end filenames with NUL, for use with xargs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:240
-#, fuzzy
 msgid "print complete paths from the filesystem root"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:245
-#, fuzzy
 msgid "show revisions matching date spec"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:246
-#, fuzzy
 msgid "show copied files"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:247
 msgid "do case-insensitive search for a given text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:248
-#, fuzzy
 msgid "show the specified revision or range"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:249
 msgid "include revisions where files were removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:250
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "Histórico de funções executadas pelo usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:251
-#, fuzzy
 msgid "show changesets within the given named branch"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:252
 msgid "do not display revision or any of its ancestors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:264
-#, fuzzy
 msgid "revision to display"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:265
-#, fuzzy
 msgid "list files from all revisions"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:267
-#, fuzzy
 msgid "revision to merge"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:268
 msgid "review revisions to merge (no merge is performed)"
@@ -34102,9 +31488,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:272
 #: /tmp/fish/implicit/share/completions/hg.fish:310
-#, fuzzy
 msgid "a changeset intended to be included in the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:275
 #: /tmp/fish/implicit/share/completions/hg.fish:312
@@ -34112,9 +31497,8 @@ msgid "a specific branch you would like to push"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:289
-#, fuzzy
 msgid "show parents of the specified revision"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:294
 msgid "set changeset phase to public"
@@ -34133,9 +31517,8 @@ msgid "allow to move boundary backward"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:298
-#, fuzzy
 msgid "target revision"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:300
 msgid "update to new branch head if changesets were pulled"
@@ -34154,9 +31537,8 @@ msgid "bookmark to pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:309
-#, fuzzy
 msgid "force push"
-msgstr "Force yes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:311
 msgid "bookmark to push"
@@ -34168,9 +31550,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:318
 #: /tmp/fish/implicit/share/completions/hg.fish:418
-#, fuzzy
 msgid "show only the preceding applied patch"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:319
 #: /tmp/fish/implicit/share/completions/hg.fish:367
@@ -34178,45 +31559,38 @@ msgstr "Show only matching part"
 #: /tmp/fish/implicit/share/completions/hg.fish:416
 #: /tmp/fish/implicit/share/completions/hg.fish:417
 #: /tmp/fish/implicit/share/completions/hg.fish:419
-#, fuzzy
 msgid "print first line of patch header"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:321
-#, fuzzy
 msgid "do not update the new working directories"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:323
-#, fuzzy
 msgid "location of source patch repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:327
-#, fuzzy
 msgid "keep patch file"
-msgstr "Archive file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:334
 #: /tmp/fish/implicit/share/completions/hg.fish:397
 #: /tmp/fish/implicit/share/completions/hg.fish:432
-#, fuzzy
 msgid "ignore changes in the amount of white space"
-msgstr "Ignore changes in the amount of white space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:340
 msgid "finish all applied changesets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:341
-#, fuzzy
 msgid "edit patch header"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:342
-#, fuzzy
 msgid "keep folded patch files"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:345
 #: /tmp/fish/implicit/share/completions/hg.fish:369
@@ -34225,58 +31599,50 @@ msgid "tolerate non-conflicting local changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:346
-#, fuzzy
 msgid "overwrite any local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:347
 #: /tmp/fish/implicit/share/completions/hg.fish:371
 #: /tmp/fish/implicit/share/completions/hg.fish:379
 #: /tmp/fish/implicit/share/completions/hg.fish:459
-#, fuzzy
 msgid "do not save backup copies of files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:348
-#, fuzzy
 msgid "all patches and guards"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:349
 msgid "drop all guards"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:350
-#, fuzzy
 msgid "import file in patch directory"
-msgstr "Link simbólico para diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:351
-#, fuzzy
 msgid "name of patch file"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:352
-#, fuzzy
 msgid "overwrite existing files"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:353
 msgid "place existing revisions under mq control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:355
-#, fuzzy
 msgid "qpush after importing"
-msgstr "Options for importing keys"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:356
 #: /tmp/fish/implicit/share/completions/hg.fish:386
 #: /tmp/fish/implicit/share/completions/hg.fish:399
 #: /tmp/fish/implicit/share/completions/hg.fish:511
-#, fuzzy
 msgid "edit commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:358
 #: /tmp/fish/implicit/share/completions/hg.fish:388
@@ -34303,53 +31669,44 @@ msgid "interactively record a new patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:368
-#, fuzzy
 msgid "pop all patches"
-msgstr "Answer yes to all patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:370
-#, fuzzy
 msgid "forget any local changes to patched files"
-msgstr "Get ready to edit a watched file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:374
-#, fuzzy
 msgid "apply on top of local changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:375
-#, fuzzy
 msgid "apply the target patch to its recorded parent"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:376
-#, fuzzy
 msgid "list patch name in commit text"
-msgstr "Give patch name and comment in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:377
-#, fuzzy
 msgid "apply all patches"
-msgstr "Apply <file> patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:378
 msgid "reorder patch series and apply only the patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:380
-#, fuzzy
 msgid "list all available queues"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:381
-#, fuzzy
 msgid "print name of active queue"
-msgstr "Print number of occurences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:382
-#, fuzzy
 msgid "create new queue"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:383
 msgid "rename active queue"
@@ -34388,14 +31745,12 @@ msgid "interactively select changes to refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:411
-#, fuzzy
 msgid "disable all guards"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:412
-#, fuzzy
 msgid "list all guards in series file"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:413
 msgid "pop to before first guarded applied patch"
@@ -34406,19 +31761,16 @@ msgid "pop, then reapply patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:415
-#, fuzzy
 msgid "print patches not in series"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:422
-#, fuzzy
 msgid "amend the parent of the working dir"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:436
-#, fuzzy
 msgid "record delete for missing files"
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:437
 msgid "remove (and delete) file even if added or modified"
@@ -34433,9 +31785,8 @@ msgid "select all unresolved files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:448
-#, fuzzy
 msgid "list state of files needing merge"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:449
 msgid "mark files as resolved"
@@ -34456,23 +31807,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:457
 #: /tmp/fish/implicit/share/completions/hg.fish:521
-#, fuzzy
 msgid "tipmost revision matching date"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:458
-#, fuzzy
 msgid "revert to the specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:465
 msgid "name of access log file to write to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:466
-#, fuzzy
 msgid "run server in background"
-msgstr "Executar tarefa em segundo plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:467
 msgid "used internally by daemon mode"
@@ -34495,9 +31843,8 @@ msgid "prefix path to serve from (default: server root)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:472
-#, fuzzy
 msgid "name to show in web pages (default: working directory)"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:473
 msgid "name of the hgweb config file (see \"hg help hgweb\")"
@@ -34509,9 +31856,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:475
 #: /tmp/fish/implicit/share/completions/hg.fish:476
-#, fuzzy
 msgid "for remote clients"
-msgstr "List or remove functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:477
 msgid "web templates to use"
@@ -34526,34 +31872,28 @@ msgid "use IPv6 in addition to IPv4"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:480
-#, fuzzy
 msgid "SSL certificate file"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:482
-#, fuzzy
 msgid "show status of all files"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:483
-#, fuzzy
 msgid "show only modified files"
-msgstr "Download only diff file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:484
-#, fuzzy
 msgid "show only added files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:485
-#, fuzzy
 msgid "show only removed files"
-msgstr "Do not create file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:486
-#, fuzzy
 msgid "show only deleted (but tracked) files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:487
 msgid "show only files without changes"
@@ -34564,29 +31904,24 @@ msgid "show only unknown (not tracked) files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:489
-#, fuzzy
 msgid "show only ignored files"
-msgstr "Freshen: only changed files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:491
-#, fuzzy
 msgid "show source of copied files"
-msgstr "Use source index field"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:493
-#, fuzzy
 msgid "show difference from revision"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:494
-#, fuzzy
 msgid "list the changed files of a revision"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:499
-#, fuzzy
 msgid "strip specified revision"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:500
 msgid "force removal of changesets, discard uncommitted changes"
@@ -34609,74 +31944,62 @@ msgid "check for push and pull"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:507
-#, fuzzy
 msgid "force tag"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:508
 msgid "make the tag local"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:509
-#, fuzzy
 msgid "revision to tag"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:510
-#, fuzzy
 msgid "remove a tag"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:512
-#, fuzzy
 msgid "use <text> as commit message"
-msgstr "Read commit message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:517
 msgid "update to new branch head if changesets were unbundled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:519
-#, fuzzy
 msgid "discard uncommitted changes (no backup)"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:520
-#, fuzzy
 msgid "update across branches if no uncommitted changes"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:1
-#, fuzzy
 msgid "Output file in given format"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:2
-#, fuzzy
 msgid "Specify tab length"
-msgstr "Specify line-length"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:3
-#, fuzzy
 msgid "Name of the input file"
-msgstr "Name of the source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:4
-#, fuzzy
 msgid "Name of the output file"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:5
 #: /tmp/fish/implicit/share/completions/hugo.fish:57
 #: /tmp/fish/implicit/share/completions/tex.fish:10
-#, fuzzy
 msgid "Output directory"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:6
-#, fuzzy
 msgid "Set type of the source code"
-msgstr "Name of the source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/highlight.fish:7
 msgid "Highlight style"
@@ -34689,9 +32012,8 @@ msgstr "Update interval"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:2
 #: /tmp/fish/implicit/share/completions/htop.fish:3
-#, fuzzy
 msgid "Start htop in monochrome mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:4
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:22
@@ -34699,117 +32021,96 @@ msgstr "Start in folder index"
 #: /tmp/fish/implicit/share/completions/pv.fish:32
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:41
 #: /tmp/fish/implicit/share/completions/subl.fish:8
-#, fuzzy
 msgid "Show help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:5
-#, fuzzy
 msgid "Show only given PIDs"
-msgstr "Show history for all users"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:6
-#, fuzzy
 msgid "Monitor given user"
-msgstr "Monitor user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/htop.fish:7
-#, fuzzy
 msgid "Sort column"
-msgstr "Lista por colunas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:2
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:127
-#, fuzzy
 msgid "Debug output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:3
-#, fuzzy
 msgid "Enable logging"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:4
-#, fuzzy
 msgid "Log file"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:6
 #: /tmp/fish/implicit/share/completions/iptables.fish:25
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:18
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:126
-#, fuzzy
 msgid "Verbose output"
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:7
-#, fuzzy
 msgid "Verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:8
-#, fuzzy
 msgid "Hostname and path to the root"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:9
-#, fuzzy
 msgid "Include content marked as draft"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:10
-#, fuzzy
 msgid "Include expired content"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:11
-#, fuzzy
 msgid "Include content with publishdate in the future"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:12
-#, fuzzy
 msgid "Cache directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:13
 msgid "Canonicalize all relative URLs using baseurl"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:14
-#, fuzzy
 msgid "Remove files from destination not found in static directories"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:15
-#, fuzzy
 msgid "Content directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:16
-#, fuzzy
 msgid "Destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:17
-#, fuzzy
 msgid "Do not build 404 page"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:18
-#, fuzzy
 msgid "Disable different kinds of pages"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:19
-#, fuzzy
 msgid "Do not build RSS files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:20
-#, fuzzy
 msgid "Do not build sitemap files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:21
 msgid "Add Git revision, date and author info to the pages"
@@ -34824,29 +32125,24 @@ msgid "Help for hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:24
-#, fuzzy
 msgid "Print missing translations"
-msgstr "Print compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:25
-#, fuzzy
 msgid "Ignore the cache directory"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:26
-#, fuzzy
 msgid "Layout directory"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:27
-#, fuzzy
 msgid "Do not sync permission mode of files"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:28
-#, fuzzy
 msgid "Do not sync modification time of files"
-msgstr "Ordena por hora de modificação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:29
 msgid "Pluralize titles in lists using inflect"
@@ -34858,29 +32154,25 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:31
 #: /tmp/fish/implicit/share/completions/hugo.fish:45
-#, fuzzy
 msgid "Render to memory"
-msgstr "Reduce memory usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:32
 #: /tmp/fish/implicit/share/completions/hugo.fish:58
 #: /tmp/fish/implicit/share/completions/hugo.fish:92
 #: /tmp/fish/implicit/share/completions/hugo.fish:103
-#, fuzzy
 msgid "Source directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:33
 #: /tmp/fish/implicit/share/completions/hugo.fish:46
-#, fuzzy
 msgid "Display memory and timing of different steps of the program"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:34
 #: /tmp/fish/implicit/share/completions/hugo.fish:47
-#, fuzzy
 msgid "Display metrics about template executions"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:35
 #: /tmp/fish/implicit/share/completions/hugo.fish:48
@@ -34888,24 +32180,20 @@ msgid "Calculate some improvement hints when combined with --templateMetrics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:36
-#, fuzzy
 msgid "Theme to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:37
-#, fuzzy
 msgid "Themes directory"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:38
-#, fuzzy
 msgid "Use /filename.html instead of /filename/"
-msgstr "Use purge instead of remove"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:39
-#, fuzzy
 msgid "Watch filesystem for changes and recreate as needed"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:40
 msgid "Benchmark Hugo by building the site a number of times"
@@ -34916,23 +32204,20 @@ msgid "Number of times to build the site"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:42
-#, fuzzy
 msgid "CPU profile file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:43
 msgid "Help for benchmark"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:44
-#, fuzzy
 msgid "Memory profile file"
-msgstr "Do not create file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:49
-#, fuzzy
 msgid "Perform some verification checks"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:50
 msgid "Help for check"
@@ -34943,34 +32228,28 @@ msgid "Check system ulimit settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:52
-#, fuzzy
 msgid "Help for ulimit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:53
-#, fuzzy
 msgid "Print the site configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:54
-#, fuzzy
 msgid "Help for config"
-msgstr "Help section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:55
-#, fuzzy
 msgid "Convert the content to different formats"
-msgstr "Don't add contents of subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:56
-#, fuzzy
 msgid "Help for convert"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:59
-#, fuzzy
 msgid "Enable less safe operations"
-msgstr "Disable multi-threaded operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:60
 msgid "Convert front matter to JSON"
@@ -34997,14 +32276,12 @@ msgid "Help for toYAML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:66
-#, fuzzy
 msgid "Print Hugo version and environment info"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:67
-#, fuzzy
 msgid "Help for env"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:68
 msgid "Collection of several useful generators"
@@ -35019,18 +32296,16 @@ msgid "Generate shell autocompletion script for Hugo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:71
-#, fuzzy
 msgid "Autocompletion file"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:72
 msgid "Help for autocomplete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:73
-#, fuzzy
 msgid "Autocompletion type"
-msgstr "Path to add completion to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:74
 msgid "Generate CSS stylesheet for the Chroma code highlighter"
@@ -35041,199 +32316,168 @@ msgid "Help for chromastyles"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:76
-#, fuzzy
 msgid "Style used for highlighting lines"
-msgstr "No search highlighting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:77
-#, fuzzy
 msgid "Style used for line numbers"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:78
 msgid "Highlighter style"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:79
-#, fuzzy
 msgid "Generate Markdown documentation for the Hugo CLI"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:80
-#, fuzzy
 msgid "Doc directory"
-msgstr "Diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:81
 msgid "Help for doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:82
-#, fuzzy
 msgid "Generate man pages for the Hugo CLI"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:83
-#, fuzzy
 msgid "Man pages directory"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:84
-#, fuzzy
 msgid "Help for man"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:85
-#, fuzzy
 msgid "Import your site from others"
-msgstr "Compress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:86
-#, fuzzy
 msgid "Help for import"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:87
 msgid "Import from Jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:88
-#, fuzzy
 msgid "Allow import into non-empty target directory"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:89
 msgid "Help for jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:90
-#, fuzzy
 msgid "List various types of content"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:91
-#, fuzzy
 msgid "Help for list"
-msgstr "Diretório de usuário para %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:93
-#, fuzzy
 msgid "List all drafts"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:94
 msgid "Help for drafts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:95
-#, fuzzy
 msgid "List all expired posts"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:96
-#, fuzzy
 msgid "Help for expired"
-msgstr "Temporizador expirado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:97
-#, fuzzy
 msgid "List all posts dated in the future"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:98
-#, fuzzy
 msgid "Help for future"
-msgstr "Nome alternativo para atrm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:99
-#, fuzzy
 msgid "Create new content"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:100
-#, fuzzy
 msgid "Editor to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:101
 msgid "Help for new"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:102
-#, fuzzy
 msgid "Content type to create"
-msgstr "Concatenate output to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:104
-#, fuzzy
 msgid "Create a new site"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:105
-#, fuzzy
 msgid "Create site inside non-empty directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:106
 msgid "Config and front matter format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:107
-#, fuzzy
 msgid "Help for site"
-msgstr "Diretório de usuário para %ls"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:108
-#, fuzzy
 msgid "Create a new theme"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:109
-#, fuzzy
 msgid "Help for theme"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:110
-#, fuzzy
 msgid "Start high performance web server"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:111
-#, fuzzy
 msgid "Append port to baseurl"
-msgstr "Append input to selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:112
 msgid "Interface to which the server will bind"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:113
-#, fuzzy
 msgid "Enable full re-renders on changes"
-msgstr "Make no changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:114
 msgid "Watch without enabling live browser reload on rebuild"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:115
-#, fuzzy
 msgid "Help for server"
-msgstr "Utilizar servidor proxy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:116
-#, fuzzy
 msgid "Port for live reloading"
-msgstr "Dynamic port forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:117
 msgid "Interval to poll memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:118
-#, fuzzy
 msgid "Memory usage log file"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:119
 msgid "Navigate to changed content file on live browser reload"
@@ -35248,9 +32492,8 @@ msgid "Port on which the server will listen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:122
-#, fuzzy
 msgid "Render to destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:123
 msgid "Reset the content draft status"
@@ -35261,57 +32504,48 @@ msgid "Help for undraft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:125
-#, fuzzy
 msgid "Print the version number of Hugo"
-msgstr "Print linenumber"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:126
-#, fuzzy
 msgid "Help for version"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:1
 msgid "Only send ipc message and suppress output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:2
-#, fuzzy
 msgid "Display version number and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:4
-#, fuzzy
 msgid "Set socket"
-msgstr "Soquete"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:5
-#, fuzzy
 msgid "Specify ipc message type"
-msgstr "Specify email address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:1
-#, fuzzy
 msgid "Convert from specified encoding"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:2
-#, fuzzy
 msgid "Convert to specified encoding"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:3
-#, fuzzy
 msgid "List known coded character sets"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:4
 msgid "Output file"
 msgstr "Output file"
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:5
-#, fuzzy
 msgid "Print progress information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:2
 #: /tmp/fish/implicit/share/completions/mogrify.fish:4
@@ -35332,9 +32566,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:26
-#, fuzzy
 msgid "Display the number of unique colors in the image"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/identify.fish:30
 msgid "Replace each pixel with its complementary color"
@@ -35349,9 +32582,8 @@ msgid "Print all group ids"
 msgstr "Print all group ids"
 
 #: /tmp/fish/implicit/share/completions/id.fish:3
-#, fuzzy
 msgid "Print name, not number"
-msgstr "Print linenumber"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/id.fish:4
 msgid "Print real ID, not effective"
@@ -35372,14 +32604,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifconfig.fish:1
-#, fuzzy
 msgid "Stop interface"
-msgstr "Stop interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifconfig.fish:2
-#, fuzzy
 msgid "Start interface"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifconfig.fish:3
 #: /tmp/fish/implicit/share/completions/ifdown.fish:1
@@ -35392,131 +32622,108 @@ msgid "Reports interface existence via return code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:2
-#, fuzzy
 msgid "Print out the whole config of iface"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:3
 msgid "Print out yes or no according to existence"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:4
-#, fuzzy
 msgid "Print out the address"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
-#, fuzzy
 msgid "Print netmask"
-msgstr "Print tally"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:6
-#, fuzzy
 msgid "Print network address"
-msgstr "Print network node hostname"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:7
-#, fuzzy
 msgid "Print broadcast"
-msgstr "Print processor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:8
-#, fuzzy
 msgid "Print mtu"
-msgstr "Print tally"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:9
-#, fuzzy
 msgid "Print out the hardware address"
-msgstr "Use hardware address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:10
-#, fuzzy
 msgid "Print flags"
-msgstr "Print filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:11
-#, fuzzy
 msgid "Print all statistics on input"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:12
-#, fuzzy
 msgid "Print # of in packets"
-msgstr "Print login process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:13
-#, fuzzy
 msgid "Print # of in bytes"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:14
-#, fuzzy
 msgid "Print # of in errors"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:15
-#, fuzzy
 msgid "Print # of in drops"
-msgstr "Print APM info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:16
-#, fuzzy
 msgid "Print # of in fifo overruns"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:17
-#, fuzzy
 msgid "Print # of in compress"
-msgstr "Print login process"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:18
-#, fuzzy
 msgid "Print # of in multicast"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:19
-#, fuzzy
 msgid "Print all statistics on output"
-msgstr "Print word counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:20
-#, fuzzy
 msgid "Print # of out packets"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:21
-#, fuzzy
 msgid "Print # of out bytes"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:22
-#, fuzzy
 msgid "Print # of out errors"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:23
-#, fuzzy
 msgid "Print # of out drops"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:24
 msgid "Print # of out fifo overruns"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:25
-#, fuzzy
 msgid "Print # of out collisions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:26
 msgid "Print # of out carrier loss"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:27
-#, fuzzy
 msgid "Print # of out multicast"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:28
 msgid "Print # of incoming bytes per second"
@@ -35527,9 +32734,8 @@ msgid "Print # of outgoing bytes per second"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:2
-#, fuzzy
 msgid "Include window border in the output image"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:10
 msgid "Obtain image by descending window hierarchy"
@@ -35561,27 +32767,24 @@ msgid "Seconds delay between snapshots [value]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:37
-#, fuzzy
 msgid "Select image from root window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:40
 msgid "Operate silently, i.e. don't ring any bells "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:41
-#, fuzzy
 msgid "Number of screen snapshots [value]"
-msgstr "Number all lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:47
 msgid "Constant, Edge, Mirror, or Tile [method]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:48
-#, fuzzy
 msgid "Select window with this id or name [id]"
-msgstr "Select window by name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/import.fish:52
 msgid "Preferred size or location of the image [geometry]"
@@ -35593,78 +32796,64 @@ msgid "Make this color transparent within the image [color]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:1
-#, fuzzy
 msgid "Start the service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:2
-#, fuzzy
 msgid "Stop the service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:3
-#, fuzzy
 msgid "Restart the service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:4
-#, fuzzy
 msgid "Reload Configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:5
-#, fuzzy
 msgid "Force reloading configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/invoke-rc.d.fish:6
-#, fuzzy
 msgid "Print the status of the service"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:1
-#, fuzzy
 msgid "Read commands from file or stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:2
-#, fuzzy
 msgid "Don't terminate on errors in batch mode"
-msgstr "Be tolerant of errors in commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:3
-#, fuzzy
 msgid "Print the version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:4
-#, fuzzy
 msgid "Output more information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:5
-#, fuzzy
 msgid "Output more detailed information"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:6
-#, fuzzy
 msgid "Specify maximum number of loops for 'ip addr flush'"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:7
 msgid "The protocol family to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:8
-#, fuzzy
 msgid "Short for --family inet"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:9
-#, fuzzy
 msgid "Short for --family inet6"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:10
 msgid "Short for --family bridge"
@@ -35683,23 +32872,20 @@ msgid "Short for --family link"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:14
-#, fuzzy
 msgid "Output on one line"
-msgstr "Output only first of equal lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:15
 msgid "Resolve names and print them instead of addresses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:16
-#, fuzzy
 msgid "Use specified network namespace"
-msgstr "Usa servidor de chaves especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:17
-#, fuzzy
 msgid "Execute command for all objects"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:1
 msgid "Create a set identified with SETNAME"
@@ -35710,9 +32896,8 @@ msgid "Add a given entry to a SET"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:3
-#, fuzzy
 msgid "Delete an entry from a SET"
-msgstr "Apaga um item do histórico"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:4
 msgid "Test whether an entry is in a set"
@@ -35720,87 +32905,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:5
 #: /tmp/fish/implicit/share/completions/ipset.fish:6
-#, fuzzy
 msgid "Destroy the specified set or all sets"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
 msgid "a"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:9
-#, fuzzy
 msgid "Output format to the list command"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:10
-#, fuzzy
 msgid "Suppress any output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:11
 msgid "Enforce name lookup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:12
-#, fuzzy
 msgid "List just the names of the sets"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:13
-#, fuzzy
 msgid "List the set names and headers"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:14
-#, fuzzy
 msgid "Filename instead of stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:1
-#, fuzzy
 msgid "Append rules to the end of a chain"
-msgstr "Append files to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:2
 msgid "Check whether a matching rule exists in a chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:3
-#, fuzzy
 msgid "Delete rules from a chain"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:4
 #: /tmp/fish/implicit/share/completions/iptables.fish:20
-#, fuzzy
 msgid "Specify the target of a rule"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:5
-#, fuzzy
 msgid "Specify a match to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:6
-#, fuzzy
 msgid "Insert rules in the beginning of a chain"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:7
-#, fuzzy
 msgid "Replace a rule in a chain"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:8
-#, fuzzy
 msgid "List all rules in a chain"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:9
-#, fuzzy
 msgid "Print all rules in a chain."
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:10
 msgid "Delete ALL rules in a chain"
@@ -35811,9 +32982,8 @@ msgid "Zero the packet and byte counters in chains"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:12
-#, fuzzy
 msgid "Create a new user-defined chain by the given name"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:13
 msgid "Delete the optional user-defined chain specified"
@@ -35832,14 +33002,12 @@ msgid "The protocol of the rule or of the packet to check"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:18
-#, fuzzy
 msgid "Source specification"
-msgstr "Force name/rev association"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:19
-#, fuzzy
 msgid "Destination specification"
-msgstr "especificação de conversão inválida"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:21
 msgid "Interface via which a packet was received"
@@ -35863,14 +33031,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:27
 #: /tmp/fish/implicit/share/completions/pv.fish:11
-#, fuzzy
 msgid "Numeric output"
-msgstr "Numeric output only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:28
-#, fuzzy
 msgid "Expand numbers"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:29
 msgid "When listing rules, add line numbers"
@@ -35881,9 +33047,8 @@ msgid "The table to operate on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:31
-#, fuzzy
 msgid "Use this command to load modules"
-msgstr "Use <command> to build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:2
 msgid "Automock all files by default"
@@ -35902,9 +33067,8 @@ msgid "Whether to use the transform cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:6
-#, fuzzy
 msgid "Disable the cache"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:7
 msgid "The directory where Jest should store its  dependency information"
@@ -35919,9 +33083,8 @@ msgid "Automatically clear mock calls and instances every test"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:10
-#, fuzzy
 msgid "Alias for --coverage"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:11
 msgid ""
@@ -35937,14 +33100,12 @@ msgid "Forces test results output color highlighting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:14
-#, fuzzy
 msgid "Alias for --color"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:15
-#, fuzzy
 msgid "The path to a jest config file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:16
 msgid ""
@@ -35957,9 +33118,8 @@ msgid "The directory where Jest should output its coverage files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:18
-#, fuzzy
 msgid "Pattern of files to ignore"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:19
 msgid "A list of reporter names that Jest uses when writing coverage reports"
@@ -35972,24 +33132,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:21
-#, fuzzy
 msgid "Print debugging info about your jest config"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
-#, fuzzy
 msgid "The test environment used for all tests"
-msgstr "Modifica variáveis de ambiente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
-#, fuzzy
 msgid "Use this flag to show full diffs instead of a patch"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:24
-#, fuzzy
 msgid "Find related tests for a list of source files"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:25
 msgid "Force Jest to exit after all tests have completed running"
@@ -36004,9 +33160,8 @@ msgid "A JSON string with map of variables for the haste module system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:28
-#, fuzzy
 msgid "Prints the test results in JSON"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:29
 msgid "Will run all tests affected by file changes in the last commit made"
@@ -36025,9 +33180,8 @@ msgid "Maps code coverage reports against original source code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:33
-#, fuzzy
 msgid "Specifies the maximum number of workers"
-msgstr "Set the maximum fuzz factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:34
 msgid "Directory names to be searched recursively up from the requiring module"
@@ -36044,27 +33198,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:37
-#, fuzzy
 msgid "Modules to ignore"
-msgstr "Specify files to ignore"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:38
 msgid "An alternative API to setting the NODE_PATH env variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:39
-#, fuzzy
 msgid "Disables stack trace in test results output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:40
 msgid "Activates notifications for test results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:41
-#, fuzzy
 msgid "Run tests based on the changed files"
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:42
 msgid "A file where to write test results"
@@ -36083,9 +33234,8 @@ msgid "A list of custom reporters for the test suite"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:46
-#, fuzzy
 msgid "Automatically reset mock state between every test"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:47
 msgid "Whatever to reset the module registry for every test"
@@ -36096,18 +33246,16 @@ msgid "A JSON string which allows the use of a custom resolver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:49
-#, fuzzy
 msgid "The root directory that Jest should scan for tests and modules within"
-msgstr "Specify the repository directory in which to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:50
 msgid "Paths to directories that Jest should use to search for files in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:51
-#, fuzzy
 msgid "Run all tests serially in the current process"
-msgstr "Executa um comando como o processo atual"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:52
 msgid "The paths to modules to configure the testing environment"
@@ -36118,55 +33266,48 @@ msgid "The path to a module to configure the testing framework"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:54
-#, fuzzy
 msgid "Print your jest config and then exits"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
-#, fuzzy
 msgid "Prevent tests from printing messages through the console"
-msgstr "Send error messages through syslog"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:56
 msgid "Snapshot serializer modules Jest should use for snapshot testing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:57
-#, fuzzy
 msgid "Alias for --env"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:58
 msgid "The glob patterns Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:59
-#, fuzzy
 msgid "Run only tests with a name that matches the regex pattern"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:60
 msgid "Paths to skip"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:61
-#, fuzzy
 msgid "Regex for test paths"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:62
 msgid "The regexp pattern Jest uses to detect test files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:63
-#, fuzzy
 msgid "Allows the use of a custom results processor"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:64
-#, fuzzy
 msgid "Allows to specify a custom test runner"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:65
 msgid "This option sets the URL for the jsdom environment"
@@ -36196,9 +33337,8 @@ msgid "Use this flag to re-record snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:71
-#, fuzzy
 msgid "Divert all output to stderr"
-msgstr "Audio output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:72
 msgid "Display individual test results with the test suite hierarchy"
@@ -36207,18 +33347,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/jest.fish:73
 #: /tmp/fish/implicit/share/completions/snap.fish:15
 #: /tmp/fish/implicit/share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Print the version and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:74
 msgid "Watch files for changes and rerun tests related to changed files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:75
-#, fuzzy
 msgid "Watch files for changes and rerun all tests"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:76
 msgid "Whether to use watchman for file crawling"
@@ -36229,29 +33367,24 @@ msgid "Disable using watchman for file crawling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:1
-#, fuzzy
 msgid "Enable debugger"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:2
-#, fuzzy
 msgid "Output usage information"
-msgstr "Não pôde obter informação do usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:3
-#, fuzzy
 msgid "Output version number"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:4
-#, fuzzy
 msgid "Create a new JHipster application"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:5
-#, fuzzy
 msgid "Deploy the current application to AWS"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:6
 msgid "Create pipeline scripts for popular CI tools"
@@ -36278,28 +33411,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:11
-#, fuzzy
 msgid "Create a JDL file from the existing entities"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:12
-#, fuzzy
 msgid "Deploy the current application to Heroku"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:13
 msgid "Create entities from the JDL file passed in argument"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:14
-#, fuzzy
 msgid "Display information about your current project and system"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:15
-#, fuzzy
 msgid "Deploy the current application to Kubernetes"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:16
 msgid ""
@@ -36308,38 +33437,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:17
-#, fuzzy
 msgid "Deploy the current application to OpenShift"
-msgstr "Display version and supported algorithms, and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:18
-#, fuzzy
 msgid "Deploy the current application to Rancher"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:19
-#, fuzzy
 msgid "Create a new JHipster server-side application"
-msgstr "Create a new directory under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:20
-#, fuzzy
 msgid "Create a new Spring service bean"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:21
 msgid "Upgrade the JHipster version and the generated application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:22
-#, fuzzy
 msgid "Print command completion script"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:2
-#, fuzzy
 msgid "Show the process id of each process in the job"
-msgstr "Show the process id of each process in the job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:3
 msgid "Show group id of job"
@@ -36362,43 +33485,36 @@ msgid "OR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:4
-#, fuzzy
 msgid "Prints a short help text and exits"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:5
-#, fuzzy
 msgid "Prints a short version string and exits"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:7
-#, fuzzy
 msgid "Show all fields in full"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:8
-#, fuzzy
 msgid "Show live tail of entries"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:9
-#, fuzzy
 msgid "Controls the number of journal lines"
-msgstr "Conta o número de argumentos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:10
 msgid "Show all lines, even in follow mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:11
-#, fuzzy
 msgid "Controls the formatting"
-msgstr "Não pôde obter informação do usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:12
-#, fuzzy
 msgid "Suppress warning about normal user"
-msgstr "Suppress the warning about “using insecure memory”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:13
 msgid "Show entries interleaved from all journals"
@@ -36409,9 +33525,8 @@ msgid "Show data only from a certain boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:15
-#, fuzzy
 msgid "Show data only of the specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:16
 msgid "Filter by priority"
@@ -36430,28 +33545,24 @@ msgid "Entries on or older than DATE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:20
-#, fuzzy
 msgid "Print all possible data values"
-msgstr "Print as little as possible"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:21
-#, fuzzy
 msgid "Specify journal directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:22
 msgid "Generate a new 128 bit ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:23
-#, fuzzy
 msgid "Show internal header information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:24
-#, fuzzy
 msgid "Shows the current disk usage"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:25
 msgid "Generate Forward Secure Sealing key pair"
@@ -36462,41 +33573,36 @@ msgid "Change interval for the sealing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:27
-#, fuzzy
 msgid "Check journal for internal consistency"
-msgstr "Check the repository for consistency"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:28
 msgid "Specifies FSS key for --verify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:1
-#, fuzzy
 msgid "Output version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:2
 msgid "Use application/json-seq MIME type scheme"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:3
-#, fuzzy
 msgid "Parse input in streaming fasion"
-msgstr "Print only given revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:4
 msgid "Run filter just once in large array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:5
-#, fuzzy
 msgid "Don't parse as JSON but as string"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:6
-#, fuzzy
 msgid "Ignore input and treat it as null"
-msgstr "Force input to be treated as HTML"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:7
 msgid "Don't pretty-print JSON"
@@ -36507,19 +33613,16 @@ msgid "Use a tab for indentation instead of 2 spaces"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:9
-#, fuzzy
 msgid "Use given number of spaces for indentation"
-msgstr "Use Kerberos realm for authentication"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:11
-#, fuzzy
 msgid "Don't color output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:12
-#, fuzzy
 msgid "Replace UTF-8 characters with escape sequences"
-msgstr "Mostra caracteres não imprimíveis com '?'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:13
 msgid "Flush output after each JSON object is printed"
@@ -36538,64 +33641,52 @@ msgid "Raw ouput without newlines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:17
-#, fuzzy
 msgid "Read filter from file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:18
-#, fuzzy
 msgid "Prepend given directory to search modules"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:19
-#, fuzzy
 msgid "Set exit status"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:20
-#, fuzzy
 msgid "Set variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:21
-#, fuzzy
 msgid "Set JSON-encoded variable"
-msgstr "Set CVS user variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:22
-#, fuzzy
 msgid "Read JSON in file and bind to given variable"
-msgstr "Lê uma linha de entrada e a coloca em variáveis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:23
-#, fuzzy
 msgid "Read JSON in file and bind to given variable [see man]"
-msgstr "Lê uma linha de entrada e a coloca em variáveis"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:24
-#, fuzzy
 msgid "Run tests in given file"
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:1
-#, fuzzy
 msgid "List available modules"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:2
-#, fuzzy
 msgid "Show author information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:3
-#, fuzzy
 msgid "Show license information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:4
-#, fuzzy
 msgid "Set a language"
-msgstr "Subtitle language"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:5
 msgid "Don't show main window"
@@ -36610,29 +33701,24 @@ msgid "Icon for the module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:8
-#, fuzzy
 msgid "Title for the window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:9
-#, fuzzy
 msgid "Show version information and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kcmshell5.fish:10
-#, fuzzy
 msgid "Show help information and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:1
-#, fuzzy
 msgid "List all devices"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:2
-#, fuzzy
 msgid "List available (paired and reachable) devices"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:3
 msgid ""
@@ -36653,9 +33739,8 @@ msgid "Find the said device by ringing it."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:7
-#, fuzzy
 msgid "Stop pairing to a said device"
-msgstr "Stop and then start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:8
 msgid "Sends a ping to said device"
@@ -36666,74 +33751,60 @@ msgid "Same as ping but you can set the message to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:10
-#, fuzzy
 msgid "Share a file to a said device"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:11
-#, fuzzy
 msgid "Display the notifications on a said device"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:12
-#, fuzzy
 msgid "Lock the specified device"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:13
-#, fuzzy
 msgid "Sends an SMS. Requires destination"
-msgstr "Remove completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:14
-#, fuzzy
 msgid "Phone number to send the message"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:15
-#, fuzzy
 msgid "Device ID"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:16
-#, fuzzy
 msgid "Device Name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:17
-#, fuzzy
 msgid "Get encryption info about said device"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:18
-#, fuzzy
 msgid "Lists remote commands and their ids"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:19
-#, fuzzy
 msgid "Executes a remote command by id"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:20
-#, fuzzy
 msgid "Displays this help."
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:21
-#, fuzzy
 msgid "Displays version information."
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:22
-#, fuzzy
 msgid "Show author information."
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:23
-#, fuzzy
 msgid "Show license information."
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:24
 msgid "The base file name of the desktop entry for this application."
@@ -36778,9 +33849,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:11
-#, fuzzy
 msgid "List names of available signals and exit"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:12
 msgid "Case sensitive argument match for processed"
@@ -36803,14 +33873,12 @@ msgid "Limit to processes matching specified PROCNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/killall.fish:18
-#, fuzzy
 msgid "Do not skip zombies"
-msgstr "Don't skip boring files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:1
-#, fuzzy
 msgid "Test if kitchen has yet to be given the main command"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:2
 #: /tmp/fish/implicit/share/completions/kitchen.fish:3
@@ -36818,9 +33886,8 @@ msgid "Describe available commands or one specific command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:4
-#, fuzzy
 msgid "Lists one or more instances"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:5
 msgid "List the name of each instance only, one per line"
@@ -36832,9 +33899,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:2
 #: /tmp/fish/implicit/share/completions/latexmk.fish:32
-#, fuzzy
 msgid "never use bibtex"
-msgstr "Don't verify user attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:3
 msgid "use bibtex when needed, but only if the bib files exist"
@@ -36849,9 +33915,8 @@ msgid "Set contrast or intensity of banner"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:6
-#, fuzzy
 msgid "Set scale for banner"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:7
 msgid "list commands used by latexmk for processing files"
@@ -36878,14 +33943,12 @@ msgid "Do NOT change to directory of source file when processing it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:13
-#, fuzzy
 msgid "Show list of dependent files after processing"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:14
-#, fuzzy
 msgid "Do not show list of dependent files"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:15
 msgid ""
@@ -36898,9 +33961,8 @@ msgid "Filter to apply to dvi file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:17
-#, fuzzy
 msgid "generate dvi"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:18
 msgid "turn off required dvi"
@@ -36911,9 +33973,8 @@ msgid "Execute specified Perl code (as part of latexmk start-up code)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:20
-#, fuzzy
 msgid "force continued processing past errors"
-msgstr "Force to continue on some errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:21
 msgid "turn off forced continuing processing past errors"
@@ -36928,23 +33989,20 @@ msgid "process regardless of file timestamps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:24
-#, fuzzy
 msgid "Turn off -g"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:25
-#, fuzzy
 msgid "print help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:26
 msgid "set basename of output file(s) to STRING"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:27
-#, fuzzy
 msgid "force landscape mode"
-msgstr "Use ansi mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:28
 msgid "turn off -l"
@@ -36971,9 +34029,8 @@ msgid "omit automatic reading of system, user and project rc files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:35
-#, fuzzy
 msgid "set name of directory for output files"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:36
 msgid "generate pdf by pdflatex"
@@ -36996,14 +34053,12 @@ msgid "turn off pdf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:41
-#, fuzzy
 msgid "generate postscript"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:42
-#, fuzzy
 msgid "turn off postscript"
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:43
 msgid "Filter to apply to postscript file"
@@ -37030,9 +34085,8 @@ msgid "preview document"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:49
-#, fuzzy
 msgid "turn off preview mode"
-msgstr "Turn on autosplit mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:50
 msgid "preview document and continuously update"
@@ -37048,9 +34102,8 @@ msgid "silence progress messages from called programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:53
-#, fuzzy
 msgid "Read custom RC file"
-msgstr "Read URLs from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:54
 msgid "Use -recorder option for (pdf)latex"
@@ -37065,14 +34118,12 @@ msgid "Show list of rules after processing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:57
-#, fuzzy
 msgid "Do not show list of rules after processing"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:59
-#, fuzzy
 msgid "show CPU time used"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:60
 msgid "don't show CPU time used"
@@ -37088,9 +34139,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:63
 #: /tmp/fish/implicit/share/completions/latexmk.fish:65
-#, fuzzy
 msgid "display program version"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/latexmk.fish:64
 msgid "display usual progress messages from called programs"
@@ -37125,23 +34175,20 @@ msgid "Write the classpath of the current project to output-file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:3
-#, fuzzy
 msgid "Remove all files from project's target-path."
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:4
 msgid "Compile Clojure source into .class files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:5
-#, fuzzy
 msgid "Build jar and deploy to remote repository."
-msgstr "Adicionar um novo arquivo/diretório ao repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:6
-#, fuzzy
 msgid "Show details about dependencies."
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:7
 msgid "Higher-order task to perform other tasks in succession."
@@ -37152,18 +34199,16 @@ msgid "Display a list of tasks or help for a given task or subtask."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:9
-#, fuzzy
 msgid "Install current project to the local repository."
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:10
 msgid "Package up all the project's files into a jar file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:11
-#, fuzzy
 msgid "Compile Java source files."
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:12
 msgid "Start a Light Table client for this project"
@@ -37202,9 +34247,8 @@ msgid "List all available profiles or display one if given an argument."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:21
-#, fuzzy
 msgid "Run the project's tests."
-msgstr "Run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:22
 msgid "Run a task without nesting the project's JVM inside Leiningen's."
@@ -37223,9 +34267,8 @@ msgid "Upgrade Leiningen to specified version or latest stable."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:26
-#, fuzzy
 msgid "Print version for Leiningen and the current JVM."
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lein.fish:27
 msgid "Apply the given task with the profile(s) specified."
@@ -37236,9 +34279,8 @@ msgid "Search after end of screen"
 msgstr "Search after end of screen"
 
 #: /tmp/fish/implicit/share/completions/less.fish:3
-#, fuzzy
 msgid "Buffer space"
-msgstr "Buffer space"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:4
 msgid "Disable automtic buffer allocation"
@@ -37301,14 +34343,12 @@ msgid "Display status column"
 msgstr "Display status column"
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
-#, fuzzy
 msgid "Specify key bindings file"
-msgstr "Specify a config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:21
-#, fuzzy
 msgid "Prompt with percentage"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:22
 msgid "Verbose prompt"
@@ -37361,9 +34401,8 @@ msgid "Multiple blank lines sqeezed"
 msgstr "Multiple blank lines sqeezed"
 
 #: /tmp/fish/implicit/share/completions/less.fish:36
-#, fuzzy
 msgid "Do not fold long lines"
-msgstr "Do not fold long lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:37
 msgid "Edit tag"
@@ -37422,14 +34461,12 @@ msgid "Characters to scroll on left/right arrows"
 msgstr "Characters to scroll on left/right arrows"
 
 #: /tmp/fish/implicit/share/completions/light.fish:3
-#, fuzzy
 msgid "Get value (default)"
-msgstr "(padrão)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:4
-#, fuzzy
 msgid "Set value"
-msgstr "Set date"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:5
 msgid "Add value"
@@ -37440,9 +34477,8 @@ msgid "Subtract value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:7
-#, fuzzy
 msgid "List controllers"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:8
 msgid "Restore brightness"
@@ -37453,100 +34489,85 @@ msgid "Save brightness"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:10
-#, fuzzy
 msgid "Brightness (default)"
-msgstr "(padrão)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:11
-#, fuzzy
 msgid "Maximum brightness"
-msgstr "Maximium iterations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:12
 msgid "Minimum cap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:13
-#, fuzzy
 msgid "Selects controller automatically (default)"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:14
-#, fuzzy
 msgid "Specify controller to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:15
-#, fuzzy
 msgid "Interpret & output values in percent"
-msgstr "Interpret the patch file as an ed script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:16
 msgid "Interpret & output values in raw mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:17
-#, fuzzy
 msgid "Sets the verbosity level"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:1
-#, fuzzy
 msgid "Make symbolic links instead of hard links"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:2
 #: /tmp/fish/implicit/share/completions/ln.fish:3
-#, fuzzy
 msgid "Make a backup of each existing destination file"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:4
 msgid "Allow superuser to attempt to hard link directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:5
-#, fuzzy
 msgid "Remove existing destination files"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:6
-#, fuzzy
 msgid "Prompt whether to remove destinations"
-msgstr "Prompt for whether to edit the long comment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:7
-#, fuzzy
 msgid "Dereference TARGETs that are symbolic links"
-msgstr "Dereferense symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:8
 msgid "Treat symlink to directory as if it were a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:9
-#, fuzzy
 msgid "Make hard links directly to symbolic links"
-msgstr "Never follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:10
-#, fuzzy
 msgid "Override the usual ~ backup suffix"
-msgstr "Use suffix as the simple backup suffix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:11
 msgid "Specify the DIRECTORY in which to create the links"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:12
-#, fuzzy
 msgid "Treat LINK_NAME as a normal file"
-msgstr "Treat DEST as a normal file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ln.fish:13
-#, fuzzy
 msgid "Print name of each linked file"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:1
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:4
@@ -37568,30 +34589,26 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/localectl.fish:4
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:37
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:7
-#, fuzzy
 msgid "Print a short help text and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:5
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:38
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:8
-#, fuzzy
 msgid "Print a short version string and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:1
 msgid "Match all non-option arguments"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:2
-#, fuzzy
 msgid "Match against the base name of the file"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:3
-#, fuzzy
 msgid "Print only the number of matches found"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:4
 msgid "Use different DATABASE file[s]"
@@ -37607,19 +34624,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:7
 #: /tmp/fish/implicit/share/completions/locate.fish:8
-#, fuzzy
 msgid "Treat broken symbolic links as if they were existing"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:9
-#, fuzzy
 msgid "Ignore case distinctions"
-msgstr "Ignore case differences"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:10
-#, fuzzy
 msgid "Limit  the number of matches"
-msgstr "Only print number of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:11
 msgid "Use ASCII NUL as a separator"
@@ -37634,20 +34648,17 @@ msgid "Match against the whole name of the file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:14
-#, fuzzy
 msgid "The pattern is a regular expression"
-msgstr "Pattern is a regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:15
-#, fuzzy
 msgid "Print a summary of the options and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:16
 #: /tmp/fish/implicit/share/completions/xmms.fish:11
-#, fuzzy
 msgid "Print the version number and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:1
 msgid "Starts the keylogging daemon"
@@ -37662,9 +34673,8 @@ msgid "Set ouput LOGFILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:4
-#, fuzzy
 msgid "Use file as input KEYMAP"
-msgstr "File as input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/logkeys.fish:5
 msgid "Use DEVICE as keyboard input"
@@ -37707,9 +34717,8 @@ msgid "Sets a standard System V interface script or PPD file "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:4
-#, fuzzy
 msgid "Deletes the named option from printer"
-msgstr "Apaga um item do histórico"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:5
 msgid ""
@@ -37730,9 +34739,8 @@ msgid "Enables the destination and accepts jobs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:9
-#, fuzzy
 msgid "Provides a textual location of the destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpadmin.fish:10
 msgid "Specifies a PostScript Printer Description file to use with the printer"
@@ -37800,18 +34808,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:1
-#, fuzzy
 msgid "Prints files to the named printer"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:2
 msgid "Specifies an existing job to modify"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:3
-#, fuzzy
 msgid "Sets the number of copies to print from 1 to 100"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:4
 msgid "Sets the job priority from 1 (lowest) to 100 (highest)"
@@ -37823,18 +34829,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:6
 #: /tmp/fish/implicit/share/completions/lpr.fish:2
-#, fuzzy
 msgid "Sets the job name"
-msgstr "Definir nome do volume"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:7
 msgid "Specifies  when the job should be printed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lp.fish:8
-#, fuzzy
 msgid "Specify the page ranges"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:1
 msgid "Shows a \"long\" listing of devices or drivers"
@@ -37847,18 +34851,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:3
-#, fuzzy
 msgid ""
 "Specifies  a  comma-separated  list  of  device  or  PPD  schemes that "
 "should be excluded from the results"
-msgstr "Specify a comma-separated list of directories you wish to exclude"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:4
-#, fuzzy
 msgid ""
 "Specifies a comma-separated list of device or PPD schemes that should be "
 "included in the  results"
-msgstr "Specify a comma-separated list of directories you wish to exclude"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpinfo.fish:5
 msgid "Specifies the language to match when listing drivers with the -m option"
@@ -37878,45 +34880,40 @@ msgid "Specifies the timeout when listing devices with the -v option (sec)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:1
-#, fuzzy
 msgid "Sets the user default printer"
-msgstr "Use the default key as default recipient"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:2
 msgid "Lists the printer specific options and their current settings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:3
-#, fuzzy
 msgid "Specifies a new option for the named destination"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:4
 msgid "Sets the destination and instance for any options that follow"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:5
-#, fuzzy
 msgid "Removes the specified option for the named destination"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpoptions.fish:6
 msgid "Removes the options for the named destination and instance"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:1
-#, fuzzy
 msgid "Change CUPS digest password"
-msgstr "Muda diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:2
 msgid "Add password"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:3
-#, fuzzy
 msgid "Remove password"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lppasswd.fish:4
 msgid "Specify the group other, than default system group"
@@ -37928,14 +34925,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:6
-#, fuzzy
 msgid "Specifies an alternate server"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:3
-#, fuzzy
 msgid "Disables banner printing"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:4
 msgid ""
@@ -37951,9 +34946,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:6
-#, fuzzy
 msgid "Hold job for printing"
-msgstr "Format for printing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpr.fish:7
 msgid ""
@@ -37965,14 +34959,12 @@ msgid "Show the server hostname and port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:2
-#, fuzzy
 msgid "Shows the ranking of print jobs"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:3
-#, fuzzy
 msgid "Specifies which jobs to show"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:4
 msgid "Shows the accepting state of selected printer queues"
@@ -37985,18 +34977,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:6
-#, fuzzy
 msgid "Shows the current default destination"
-msgstr "Pára a função em execução"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:7
 msgid "Shows a long listing of printers, classes, or jobs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:8
-#, fuzzy
 msgid "Shows the jobs queue on the specified destinations"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:9
 msgid "Shows the printers and whether or not they are enabled for printing"
@@ -38011,120 +35001,100 @@ msgid "Shows a status summary, including the default destination"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:12
-#, fuzzy
 msgid "Shows all status information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:13
-#, fuzzy
 msgid "Shows a list of print jobs queued by the specified users"
 msgstr ""
-"Define a lista de preferências de assinatura como a string especificada"
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:14
 msgid "Shows the printers and what device they are attached to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:1
-#, fuzzy
 msgid "print all devices"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:2
 msgid "print SIZE in bytes rather than in human readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:3
-#, fuzzy
 msgid "don't print slaves or holders"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:4
-#, fuzzy
 msgid "print discard capabilities"
-msgstr "Set playlist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:5
 msgid "exclude devices by major number (default: RAM disks)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:6
-#, fuzzy
 msgid "output info about filesystems"
-msgstr "Stay in local filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:7
-#, fuzzy
 msgid "usage information (this)"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:8
 msgid "use ascii characters only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:9
-#, fuzzy
 msgid "output info about permissions"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:10
-#, fuzzy
 msgid "don't print headings"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:11
-#, fuzzy
 msgid "output columns"
-msgstr "Saída em duas colunas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:12
-#, fuzzy
 msgid "use key='value' output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:13
-#, fuzzy
 msgid "use raw output format"
-msgstr "Use the portable output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:14
 msgid "output info about topology"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:15
-#, fuzzy
 msgid "use list format ouput"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:1
-#, fuzzy
 msgid "Print both online and offline CPUs"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:2
-#, fuzzy
 msgid "Print online CPUs only"
-msgstr "Print newline counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:3
-#, fuzzy
 msgid "Print offline CPUs only"
-msgstr "Print newline counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:4
-#, fuzzy
 msgid "Print out an extended readable format"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:5
-#, fuzzy
 msgid "Print out a parseble format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:6
-#, fuzzy
 msgid "Use specified directory as system root"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lscpu.fish:7
 msgid "Print hexadecimal masks rather thans lists of CPUs"
@@ -38194,9 +35164,8 @@ msgstr "Mostra tudo exceto . e .."
 #: /tmp/fish/implicit/share/completions/ls.fish:42
 #: /tmp/fish/implicit/share/completions/ls.fish:70
 #: /tmp/fish/implicit/share/completions/ls.fish:79
-#, fuzzy
 msgid "Append filetype indicator"
-msgstr "Adiciona indicador de tipo de arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:18
 #: /tmp/fish/implicit/share/completions/ls.fish:73
@@ -38235,9 +35204,8 @@ msgid "Print size of files"
 msgstr "Mostra tamanhos de arquivos"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:28
-#, fuzzy
 msgid "Group directories before files"
-msgstr "Copy directories recursively"
+msgstr ""
 
 # Notas:
 # Adicionar nota
@@ -38283,9 +35251,8 @@ msgid "Generate dired output"
 msgstr "Mostra saída com dired"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
-#, fuzzy
 msgid "List format"
-msgstr "Formato longo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:39
 msgid "Long format, full-iso time"
@@ -38296,9 +35263,8 @@ msgid "Don't print group information"
 msgstr "Não mostra grupo"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:43
-#, fuzzy
 msgid "Skip entries matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:44
 #: /tmp/fish/implicit/share/completions/ls.fish:67
@@ -38378,9 +35344,8 @@ msgid "Causes list selections to be ANDed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:3
-#, fuzzy
 msgid "Use alternative name list file"
-msgstr "Set namelist file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:4
 msgid "Avoid kernel functions that might block: lstat, readlink, stat"
@@ -38407,9 +35372,8 @@ msgid "use of device cache file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:9
-#, fuzzy
 msgid "select by group (^ - negates)"
-msgstr "Select by group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:10
 msgid "Convert UIDs to login names"
@@ -38420,18 +35384,16 @@ msgid "Select or exclude processes by pid"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:12
-#, fuzzy
 msgid "Print PPID"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:13
 msgid "Produce terse output (pids only, no header)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:14
-#, fuzzy
 msgid "select by user (^ - negates)"
-msgstr "Select by user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:1
 msgid "Increase verbosity (show descriptors)"
@@ -38461,52 +35423,44 @@ msgid "Show version of program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:7
-#, fuzzy
 msgid "Show usage and help"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:1
-#, fuzzy
 msgid "Execute string"
-msgstr "Link para executável"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:2
-#, fuzzy
 msgid "Require library"
-msgstr "Require parameter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:3
-#, fuzzy
 msgid "Enter interactive mode after executing script"
-msgstr "Interactive mode after executing commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lua.fish:6
 msgid "Execute stdin and stop handling options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:1
-#, fuzzy
 msgid "Show command executions"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:2
 msgid "Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:3
-#, fuzzy
 msgid "Show the list of installed agents"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:4
-#, fuzzy
 msgid "Start the first matching agent"
-msgstr "Print first matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:5
-#, fuzzy
 msgid "Stop the first matching agent"
-msgstr "Print first matching file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:6
 msgid "Stop and start the first matching agent"
@@ -38521,29 +35475,25 @@ msgid "Opens the launchctl daemon file in the default editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:9
-#, fuzzy
 msgid "Service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:10
 #: /tmp/fish/implicit/share/completions/lunchy.fish:12
-#, fuzzy
 msgid "Persist command"
-msgstr "Process command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lunchy.fish:11
 msgid "Force start (disabled) agents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:1
-#, fuzzy
 msgid "Test if lxc has yet to be given the command"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:2
-#, fuzzy
 msgid "Manage configuration."
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:3
 msgid "Copy containers within or in between lxd instances."
@@ -38554,9 +35504,8 @@ msgid "Delete containers or snapshots."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:5
-#, fuzzy
 msgid "Execute the specified command in a container."
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:6
 msgid "Manage files on a container."
@@ -38567,9 +35516,8 @@ msgid "Check if the LXD instance is up."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:8
-#, fuzzy
 msgid "Print help."
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:9
 msgid "Manipulate container images."
@@ -38588,14 +35536,12 @@ msgid "Launch a container from a particular image."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:13
-#, fuzzy
 msgid "Lists the available resources."
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:14
-#, fuzzy
 msgid "Prints all the subcommands help."
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:15
 msgid "Monitor activity on the LXD server."
@@ -38606,27 +35552,24 @@ msgid "Move containers within or in between lxd instances."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:17
-#, fuzzy
 msgid "Manage networks."
-msgstr "Adicionar uma rede"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:18
 msgid "Changes state of one or more containers to pause."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:19
-#, fuzzy
 msgid "Manage configuration profiles."
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:20
 msgid "Publish containers as images."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:21
-#, fuzzy
 msgid "Manage remote LXD servers."
-msgstr "File to grab servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:22
 msgid "Changes state of one or more containers to restart."
@@ -38649,24 +35592,20 @@ msgid "Changes state of one or more containers to stop."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxc.fish:27
-#, fuzzy
 msgid "Prints the version number of this client tool."
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:1
-#, fuzzy
 msgid "print this help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:2
-#, fuzzy
 msgid "print version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:3
-#, fuzzy
 msgid "use specified profile"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lxpanel.fish:4
 msgid "set log level 0-5. 0 - none 5 - chatty"
@@ -38685,9 +35624,8 @@ msgid "Force a 'm4_' prefix to all builtins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:6
-#, fuzzy
 msgid "Suppress some warnings for builtins"
-msgstr "Supress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:7
 msgid ""
@@ -38711,9 +35649,8 @@ msgid "Undefine NAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:12
-#, fuzzy
 msgid "Suppress all GNU extensions"
-msgstr "Disable all GNU extensions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:13
 msgid "Set symbol lookup hash table size [509]"
@@ -38728,9 +35665,8 @@ msgid "Produce a frozen state on FILE at end"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:16
-#, fuzzy
 msgid "Reload a frozen state from FILE at start"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:17
 msgid "Set debug level (no FLAGS implies 'aeq')"
@@ -38745,9 +35681,8 @@ msgid "Restrict macro tracing size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/m4.fish:20
-#, fuzzy
 msgid "Trace NAME when it is defined"
-msgstr "Test if function is defined"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:2
 #: /tmp/fish/implicit/share/completions/systemctl.fish:38
@@ -38758,46 +35693,40 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/machinectl.fish:3
 #: /tmp/fish/implicit/share/completions/systemctl.fish:39
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:3
-#, fuzzy
 msgid "Print a short help and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:4
 #: /tmp/fish/implicit/share/completions/pactl.fish:9
 #: /tmp/fish/implicit/share/completions/systemctl.fish:40
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:4
-#, fuzzy
 msgid "Print a short version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:6
 #: /tmp/fish/implicit/share/completions/systemctl.fish:22
-#, fuzzy
 msgid "Do not print header and footer"
-msgstr "Dont print header"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:7
 msgid "Don't ask for password for privileged operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:8
-#, fuzzy
 msgid "List running machines"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:9
-#, fuzzy
 msgid "List startable machine images"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:10
 msgid "Also show machines starting with a '.'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:11
-#, fuzzy
 msgid "Show information about machine"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:12
 msgid "Do not ellipsize process tree entries"
@@ -38812,28 +35741,24 @@ msgid "Formatting of journal output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:15
-#, fuzzy
 msgid "Show properties of machines"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:16
-#, fuzzy
 msgid "Limit to certain properties"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:17
 msgid "Show all properties, even if not set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:18
-#, fuzzy
 msgid "Start machine"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:19
-#, fuzzy
 msgid "Login to a machine"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:20
 msgid "Enable machine to start at boot"
@@ -38844,9 +35769,8 @@ msgid "Disable machine from starting at boot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:22
-#, fuzzy
 msgid "Poweroff machine"
-msgstr "Falha de energia"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:23
 msgid "Reboot machine"
@@ -38857,52 +35781,44 @@ msgid "Terminate machine (without shutting down)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:25
-#, fuzzy
 msgid "Send signal to process in a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:26
 msgid "Choose who to send the signal to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:27
-#, fuzzy
 msgid "Signal to send"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:28
-#, fuzzy
 msgid "Bind-mount a directory to a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:29
-#, fuzzy
 msgid "Create destination directory"
-msgstr "Create any missing directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
-#, fuzzy
 msgid "Apply read-only mount"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:31
 msgid "Copy file or directory to a machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:32
-#, fuzzy
 msgid "Copy file or directory from a machine"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:33
-#, fuzzy
 msgid "Open a shell on a machine"
-msgstr "Bind address on local machine"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:34
-#, fuzzy
 msgid "Show a list of locally installed machines"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:35
 msgid "Show information about machine images (human-readable)"
@@ -38913,43 +35829,36 @@ msgid "Show properties of machine images (machine-readable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:37
-#, fuzzy
 msgid "Clone a machine image"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:38
-#, fuzzy
 msgid "Rename a machine image"
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:39
-#, fuzzy
 msgid "Mark or unmark machine image as read-only"
-msgstr "Make caching db readonly"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:40
-#, fuzzy
 msgid "Remove machine images"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:41
 msgid "Set size limit for machine image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:42
-#, fuzzy
 msgid "Download a .tar container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:43
-#, fuzzy
 msgid "Download a .raw container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:44
-#, fuzzy
 msgid "Download a .dkr container image"
-msgstr "Download only tar file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:45
 msgid "Import a .tar container image"
@@ -38968,105 +35877,88 @@ msgid "Export a .raw container image"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:49
-#, fuzzy
 msgid "Specify compression format"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:50
-#, fuzzy
 msgid "Show running downloads, imports and exports"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:51
 msgid "Abort running downloads, imports or exports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:52
-#, fuzzy
 msgid "Verify image with specified method"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:53
 msgid "Verify image (not available for dkr)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:54
-#, fuzzy
 msgid "Specify index server"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:55
-#, fuzzy
 msgid "Overwrite existing machine image"
-msgstr "Atualizar um pacote existente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:1
-#, fuzzy
 msgid "Shows all available URL protocols"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:2
-#, fuzzy
 msgid "Lists all Magento modules"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:3
-#, fuzzy
 msgid "Lists all indexer modes"
-msgstr "Print raw entry names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:4
-#, fuzzy
 msgid "Shows all available packing modes"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:5
 msgid "Shows all IDEs supported by magento"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:6
-#, fuzzy
 msgid "Shows all available magento tests"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:7
-#, fuzzy
 msgid "Shows all available magento theme areas"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:8
 msgid "Shows all existing magento languages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:9
-#, fuzzy
 msgid "Shows all available source theme file types"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:10
-#, fuzzy
 msgid "Shows all available deploy modes"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:11
-#, fuzzy
 msgid "Shows all available cache types"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:12
-#, fuzzy
 msgid "Shows all available verbosity levels"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:13
-#, fuzzy
 msgid "Shows all available output formats"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:14
-#, fuzzy
 msgid "Lists magento commands"
-msgstr "Disable this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:15
 msgid "Checks that prompt is not inside of magento command"
@@ -39074,9 +35966,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:16
 #: /tmp/fish/implicit/share/completions/p4.fish:23
-#, fuzzy
 msgid "Checks if prompt is in a specific command"
-msgstr "Test if aptitude has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:17
 #: /tmp/fish/implicit/share/completions/p4.fish:24
@@ -39085,100 +35976,84 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:18
 #: /tmp/fish/implicit/share/completions/p4.fish:25
-#, fuzzy
 msgid "Adds a specific option for a command"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:19
 msgid "Checks if a parameter has been given already"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:20
-#, fuzzy
 msgid "Show help for a command"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:21
-#, fuzzy
 msgid "Do not output any message"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:22
 msgid "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:24
-#, fuzzy
 msgid "Force colored output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/magento.fish:26
-#, fuzzy
 msgid "Don't ask any interactive question"
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:1
-#, fuzzy
 msgid "Define"
-msgstr "Define"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:2
-#, fuzzy
 msgid "Include directory"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:3
-#, fuzzy
 msgid "Replace include directories"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:4
 msgid "Append dependencies to makefile"
 msgstr "Append dependencies to makefile"
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:5
-#, fuzzy
 msgid "Specify makefile"
-msgstr "Specify makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:6
-#, fuzzy
 msgid "Prepend file to input"
-msgstr "Prepend file to input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:7
-#, fuzzy
 msgid "Object file suffix"
-msgstr "Object file suffix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:8
-#, fuzzy
 msgid "Object file prefix"
-msgstr "Object file prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:9
-#, fuzzy
 msgid "Starting string delimiter"
-msgstr "Starting string delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:10
-#, fuzzy
 msgid "Line width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makedepend.fish:12
 msgid "Warn about multiple inclusion"
 msgstr "Warn about multiple inclusion"
 
 #: /tmp/fish/implicit/share/completions/make.fish:1
-#, fuzzy
 msgid "Target"
-msgstr "Target"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:2
-#, fuzzy
 msgid "Use file as makefile"
-msgstr "Use file as makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:3
 #: /tmp/fish/implicit/share/completions/tar.fish:15
@@ -39191,14 +36066,12 @@ msgid "Environment before makefile"
 msgstr "Environment before makefile"
 
 #: /tmp/fish/implicit/share/completions/make.fish:7
-#, fuzzy
 msgid "Search directory for makefile"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:8
-#, fuzzy
 msgid "Number of concurrent jobs"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:9
 msgid "Continue after an error"
@@ -39213,9 +36086,8 @@ msgid "Do not execute commands"
 msgstr "Do not execute commands"
 
 #: /tmp/fish/implicit/share/completions/make.fish:12
-#, fuzzy
 msgid "Ignore specified file"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:13
 msgid "Print database"
@@ -39238,127 +36110,108 @@ msgid "Touch files, don't run commands"
 msgstr "Touch files, don't run commands"
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
-#, fuzzy
 msgid "Print working directory"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:21
-#, fuzzy
 msgid "Pretend file is modified"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:1
-#, fuzzy
 msgid "Ignore missing or incomplete arch field"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:2
 msgid "Clean up work files after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:3
-#, fuzzy
 msgid "Use alternate config <file>"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:4
-#, fuzzy
 msgid "Do not perform dependency checks"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:5
-#, fuzzy
 msgid "Do not extract source files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:6
 msgid "Only perform integrity checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:7
-#, fuzzy
 msgid "Force rebuild of the package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:8
-#, fuzzy
 msgid "Generate integrity checks"
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:9
-#, fuzzy
 msgid "Do not perform integrity checks"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:10
-#, fuzzy
 msgid "Do not verify checksums"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:11
-#, fuzzy
 msgid "Do not verify PGP signatures"
-msgstr "Don't verify patch signature"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:12
-#, fuzzy
 msgid "Display syntax and command line options"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:13
 msgid "No automatic bump of pkgver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:14
-#, fuzzy
 msgid "Install the package after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:15
 msgid "Enable makepkg build logging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:16
-#, fuzzy
 msgid "Disable color in output messages"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:17
-#, fuzzy
 msgid "Only download and extract files"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:18
 msgid "Use alternative <buildscript>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:19
-#, fuzzy
 msgid "Remove installed deps after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:20
 msgid "Repackage without rebuilding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:21
-#, fuzzy
 msgid "Install missing dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:22
 msgid "Build a source-only tarball for AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:23
-#, fuzzy
 msgid "Display the version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:24
-#, fuzzy
 msgid "Remove the srcdir before building the package"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:25
 msgid "Build a source-only GPL tarball for AUR"
@@ -39373,23 +36226,20 @@ msgid "Run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:28
-#, fuzzy
 msgid "Do not create the archive"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:29
 msgid "Do not run the check function in the PKGBUILD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:30
-#, fuzzy
 msgid "Sign the resulting package with gpg"
-msgstr "Sign the patch with your gpg key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:31
-#, fuzzy
 msgid "Do not create a signature for the package"
-msgstr "Do not fail if signature is older than key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:32
 msgid "Specify a <key> to use when signing"
@@ -39408,19 +36258,16 @@ msgid "Passed to pacman: Install as dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:36
-#, fuzzy
 msgid "Passed to pacman: Do not display a progress bar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:37
-#, fuzzy
 msgid "List all packages that would be built"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:38
-#, fuzzy
 msgid "Print SRCINFO to stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:1
 msgid "Program section"
@@ -39483,14 +36330,12 @@ msgid "Pager"
 msgstr "Pager"
 
 #: /tmp/fish/implicit/share/completions/man.fish:17
-#, fuzzy
 msgid "Manual sections"
-msgstr "Local section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:18
-#, fuzzy
 msgid "Display all matches"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:19
 msgid "Always reformat"
@@ -39550,47 +36395,40 @@ msgid "Force color mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:4
-#, fuzzy
 msgid "Specify a different color set"
-msgstr "Specify record separator"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:5
-#, fuzzy
 msgid "Specify a name of skin"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:6
-#, fuzzy
 msgid "Disable mouse support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:7
 msgid "Start the internal editor with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:8
-#, fuzzy
 msgid "Display the compiled-in search paths"
-msgstr "Display compression ratios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:9
-#, fuzzy
 msgid "Display extended info about compiled-in paths"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:10
-#, fuzzy
 msgid "Display configure options"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:11
 msgid "Reset softkeys to their default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:12
-#, fuzzy
 msgid "Specify a keymap FILE"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:13
 msgid "Use default hardcoded keys"
@@ -39601,9 +36439,8 @@ msgid "Save the ftpfs dialog with the server in FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:15
-#, fuzzy
 msgid "Print the last working directory to FILE"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:16
 msgid "Set alternative mode drawing of frameworks"
@@ -39614,23 +36451,20 @@ msgid "Use the TERMCAP variable for terminal info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:18
-#, fuzzy
 msgid "Disable use of the concurrent shell"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:19
-#, fuzzy
 msgid "Enable use of the concurrent shell"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:20
 msgid "Start the internal viewer with FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:21
-#, fuzzy
 msgid "Display the version of the program"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:22
 msgid "Force xterm mode"
@@ -39645,18 +36479,16 @@ msgid "Compute and check message digest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:2
-#, fuzzy
 msgid "Read in binary mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:3
 msgid "Read sums from files and check them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:4
-#, fuzzy
 msgid "Read in text mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:7
 msgid "Warn about improperly formatted checksum lines"
@@ -39667,9 +36499,8 @@ msgid "With --check, exit non-zero for any invalid input"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/md5sum.fish:9
-#, fuzzy
 msgid "Display help text"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:1
 msgid "Assemble a pre-existing array"
@@ -39680,14 +36511,12 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
-#, fuzzy
 msgid "Select monitor mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:5
 msgid "Change the size or shape of an active array"
@@ -39698,14 +36527,12 @@ msgid "Manage devices in array, and possibly start it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:7
-#, fuzzy
 msgid "Start all auto-detected arrays"
-msgstr "Restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:9
-#, fuzzy
 msgid "Display more detailed help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:11
 #: /tmp/fish/implicit/share/completions/obnam.fish:47
@@ -39714,165 +36541,136 @@ msgid "Be more verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "Foreground operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
-#, fuzzy
 msgid "Set metadata style to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:17
 msgid "Provide home host identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:18
-#, fuzzy
 msgid "Give name format preference"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:19
-#, fuzzy
 msgid "Give cluster name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
-#, fuzzy
 msgid "Specify the space to use from each drive"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:23
-#, fuzzy
 msgid "Specify the size made available on the array"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:24
-#, fuzzy
 msgid "Specify the chunk size"
-msgstr "Specify APT list dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
-#, fuzzy
 msgid "Specify RAID level"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "Specify line-length"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
-#, fuzzy
 msgid "Specify file for write-intent bitmap"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:29
-#, fuzzy
 msgid "Specify chunksize of bitmap"
-msgstr "Specify sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:30
-#, fuzzy
 msgid "Prefer reading from other devices than these"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:31
-#, fuzzy
 msgid "Enable writes on array or device"
-msgstr "File is character device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:32
-#, fuzzy
 msgid "Disable writes on array"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:33
-#, fuzzy
 msgid "Enable write-behind mode"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:34
 msgid "Assume the array is clean"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:35
-#, fuzzy
 msgid "Use this file as a backup"
-msgstr "Use file as makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:36
-#, fuzzy
 msgid "Specify start of array data"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:37
 msgid "Resume frozen --grow command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:38
-#, fuzzy
 msgid "Set array name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:39
-#, fuzzy
 msgid "Run array despite warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:40
-#, fuzzy
 msgid "Give instruction for device file"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:41
-#, fuzzy
 msgid "Add devices to array"
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:42
-#, fuzzy
 msgid "Specify max nodes in the cluster"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
-#, fuzzy
 msgid "Specify journal device for RAID-4/5/6 array"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:44
 msgid "UUID of array to assemble"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:45
-#, fuzzy
 msgid "Minor number of array device"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:46
 msgid "Refuse to start without all drives"
@@ -39883,38 +36681,32 @@ msgid "Do not ask for backup file, unavailable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:48
-#, fuzzy
 msgid "Update superblock properties"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Freeze --grow command"
-msgstr "Select by command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
-#, fuzzy
 msgid "Test mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:51
-#, fuzzy
 msgid "Hot-add listed devices"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:52
 msgid "Re-add a previously removed device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:53
-#, fuzzy
 msgid "Hot-add listed devices as spare"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:54
-#, fuzzy
 msgid "Remove listed inactive devices"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:55
 msgid "Mark listed devices as faulty"
@@ -39929,56 +36721,48 @@ msgid "Give devices as replacement"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Confirm existence of device"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:59
 msgid "Examine device for md use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:60
-#, fuzzy
 msgid "Print details on array"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Print details on platform capabilities"
-msgstr "Set playlist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:62
 msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:65
-#, fuzzy
 msgid "Print report about bitmap"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
-#, fuzzy
 msgid "List recorded bad blocks"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "Target directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -39989,28 +36773,24 @@ msgid "Erase possible superblock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:71
-#, fuzzy
 msgid "Delete subarray"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:72
-#, fuzzy
 msgid "Update subarray"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:73
-#, fuzzy
 msgid "Wait for pending operations"
-msgstr "Foreground operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:74
 msgid "Mark array as clean ASAP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:75
-#, fuzzy
 msgid "Set sync action for md devices"
-msgstr "Action for devices"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:76
 msgid "Rebuild /run/mdadm/map"
@@ -40027,9 +36807,8 @@ msgstr ""
 # proc.cpp:1279
 # proc.cpp:1305
 #: /tmp/fish/implicit/share/completions/mdadm.fish:78
-#, fuzzy
 msgid "Mail address to send alerts to"
-msgstr "Ponteiro de lista de processo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:79
 msgid "Program to run in case of an event"
@@ -40060,25 +36839,21 @@ msgid "Check arrays only once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:86
-#, fuzzy
 msgid "Do not move spares between arrays"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:87
-#, fuzzy
 msgid "Be more concise"
-msgstr "Do not overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:1
 #: /tmp/fish/implicit/share/completions/mdbook.fish:4
-#, fuzzy
 msgid "Prints help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:2
-#, fuzzy
 msgid "Prints version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:3
 msgid "Build book from markdown files"
@@ -40089,9 +36864,8 @@ msgid "Create boilerplate structure and files in directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:6
-#, fuzzy
 msgid "Skip confirmation prompts"
-msgstr "Ask confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:7
 msgid "Copy default theme into source folder"
@@ -40114,85 +36888,72 @@ msgid "Test that code samples compile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdbook.fish:12
-#, fuzzy
 msgid "Watch file changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:2
-#, fuzzy
 msgid "Ignore unknown options"
-msgstr "Opção desconhecida: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:3
-#, fuzzy
 msgid "Do not reveal the resulting package in the Finder"
-msgstr "Do not pad the following tracks - the default"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:4
 msgid "Avoid restricted operations such as heap"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:5
-#, fuzzy
 msgid "Skip gathering system.log"
-msgstr "Skip other filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:6
-#, fuzzy
 msgid "Prints version of mddiagnose"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:7
 msgid "Minimal report"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:8
-#, fuzzy
 msgid "Evaluate indexing information for path"
-msgstr "List inode information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
-#, fuzzy
 msgid "Write the diagnostic to the specified path"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:1
-#, fuzzy
 msgid "Fetches the value of the specified attribute"
-msgstr "Don't preserve the specified attributes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:2
 msgid "Query only reports matching items count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:3
-#, fuzzy
 msgid "Search only within given directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:4
 msgid "Query should stay active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:5
-#, fuzzy
 msgid "Search on file name only"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:6
-#, fuzzy
 msgid "Reprint results on live update"
-msgstr "Print flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:7
-#, fuzzy
 msgid "Show contents of smart folder"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdfind.fish:8
 msgid "Use NUL (\\0) as a path separator, for use with xargs -0"
@@ -40211,53 +36972,45 @@ msgid "Import files using the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:2
-#, fuzzy
 msgid "Print timing information for this run"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:3
-#, fuzzy
 msgid "Print out the list of all of the attributes and exit"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:4
-#, fuzzy
 msgid "Print out the schema file and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:5
 msgid "Ask the server to reimport files for UTIs claimed by the listed plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:6
-#, fuzzy
 msgid "Print out performance information gathered during the run"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:7
-#, fuzzy
 msgid "Print the list of installed importers and exit"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:8
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:7
-#, fuzzy
 msgid "Print debugging information"
-msgstr "Print debugging info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:9
 msgid "Dont send the imported attributes to the data store"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:10
-#, fuzzy
 msgid "Wait for the specified interval between scanning files"
-msgstr "Wait specified interval of seconds between sending each packet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdimport.fish:11
-#, fuzzy
 msgid "Write the imported attributes to a file"
-msgstr "Write prototypes to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:1
 msgid "Print only the matching metadata attribute value"
@@ -40272,9 +37025,8 @@ msgid "Sets a marker string to be used when a requested attribute is null"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdls.fish:4
-#, fuzzy
 msgid "Output attributes in XML format to file"
-msgstr "Output rss-data to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:1
 msgid "Publish metadata"
@@ -40289,14 +37041,12 @@ msgid "Disable Spotlight activity for volume"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:4
-#, fuzzy
 msgid "Erase and rebuild index"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:5
-#, fuzzy
 msgid "Print indexing status"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:6
 msgid "Resolve files from file id with an optional volume path or device id"
@@ -40307,14 +37057,12 @@ msgid "Apply command to all volumes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:8
-#, fuzzy
 msgid "Apply command to all stores on the specified volume"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdutil.fish:9
-#, fuzzy
 msgid "Display verbose information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:1
 msgid "Log to standard error as well as files"
@@ -40325,9 +37073,8 @@ msgid "When logging hits line file:N, emit a stack trace (default :0)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:3
-#, fuzzy
 msgid "Write log files in this directory"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:4
 msgid "Log to standard error instead of files"
@@ -40342,15 +37089,12 @@ msgid "Logs at or above this threshold go to stderr (default 2)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:7
-#, fuzzy
 msgid "Log level for logs"
-msgstr "Diretório de usuário para"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:8
-#, fuzzy
 msgid "Comma-separated list of pattern=N settings for file-filtered logging"
 msgstr ""
-"Comma-separated list of package installation states to follow recursively"
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:9
 msgid "Disable the addon w/ADDON_NAME within minikube"
@@ -40408,9 +37152,8 @@ msgid "Unsets an individual value in a minikube config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:24
-#, fuzzy
 msgid "Display values currently set in the minikube config file"
-msgstr "Display all currently defined trap handlers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:29
 msgid "Go template format string for the config view output"
@@ -40421,18 +37164,16 @@ msgid "Display the kubernetes dashboard URL instead of opening it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:31
-#, fuzzy
 msgid "Add machine IP to NO_PROXY environment variable"
-msgstr "Modifica variáveis de ambiente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:32
 msgid "Force environment to be configured for a specified shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:33
-#, fuzzy
 msgid "Unset variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:35
 msgid "List the URLs for the services in local cluster"
@@ -40525,9 +37266,8 @@ msgid "The CIDR to be used for the VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:56
-#, fuzzy
 msgid "The KVM network name"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:57
 msgid "The hyperv virtual switch name"
@@ -40539,15 +37279,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:1
 #: /tmp/fish/implicit/share/completions/mix.fish:58
-#, fuzzy
 msgid "Starts all registered apps"
-msgstr "Restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:2
 #: /tmp/fish/implicit/share/completions/mix.fish:59
-#, fuzzy
 msgid "Lists all archives"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:3
 #: /tmp/fish/implicit/share/completions/mix.fish:60
@@ -40556,69 +37294,58 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:4
 #: /tmp/fish/implicit/share/completions/mix.fish:61
-#, fuzzy
 msgid "Installs an archive locally"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:5
 #: /tmp/fish/implicit/share/completions/mix.fish:62
-#, fuzzy
 msgid "Uninstalls archives"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:6
 #: /tmp/fish/implicit/share/completions/mix.fish:63
-#, fuzzy
 msgid "Deletes generated application files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:7
 #: /tmp/fish/implicit/share/completions/mix.fish:64
-#, fuzzy
 msgid "Executes the given command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:8
 #: /tmp/fish/implicit/share/completions/mix.fish:65
-#, fuzzy
 msgid "Compiles source files"
-msgstr "Compile source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:9
 #: /tmp/fish/implicit/share/completions/mix.fish:66
-#, fuzzy
 msgid "Lists dependencies and their status"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:10
 #: /tmp/fish/implicit/share/completions/mix.fish:67
-#, fuzzy
 msgid "Deletes the given dependencies' files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:11
 #: /tmp/fish/implicit/share/completions/mix.fish:68
-#, fuzzy
 msgid "Compiles dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:12
 #: /tmp/fish/implicit/share/completions/mix.fish:69
-#, fuzzy
 msgid "Gets all out of date dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:13
 #: /tmp/fish/implicit/share/completions/mix.fish:70
-#, fuzzy
 msgid "Unlocks the given dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:14
 #: /tmp/fish/implicit/share/completions/mix.fish:71
-#, fuzzy
 msgid "Updates the given dependencies"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:15
 #: /tmp/fish/implicit/share/completions/mix.fish:72
@@ -40632,15 +37359,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:17
 #: /tmp/fish/implicit/share/completions/mix.fish:74
-#, fuzzy
 msgid "Prints help information for tasks"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:18
 #: /tmp/fish/implicit/share/completions/mix.fish:75
-#, fuzzy
 msgid "Loads and persists the given configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:19
 #: /tmp/fish/implicit/share/completions/mix.fish:76
@@ -40649,9 +37374,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:20
 #: /tmp/fish/implicit/share/completions/mix.fish:77
-#, fuzzy
 msgid "Installs Hex locally"
-msgstr "Instalar novo pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:21
 #: /tmp/fish/implicit/share/completions/mix.fish:78
@@ -40665,9 +37389,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:23
 #: /tmp/fish/implicit/share/completions/mix.fish:80
-#, fuzzy
 msgid "Creates a new Elixir project"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:24
 #: /tmp/fish/implicit/share/completions/mix.fish:81
@@ -40676,9 +37399,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:25
 #: /tmp/fish/implicit/share/completions/mix.fish:82
-#, fuzzy
 msgid "Runs the given file or expression"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:26
 #: /tmp/fish/implicit/share/completions/mix.fish:83
@@ -40686,24 +37408,20 @@ msgid "Runs a project's tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:27
-#, fuzzy
 msgid "specify input directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:28
-#, fuzzy
 msgid "specify output file name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:29
-#, fuzzy
 msgid "skip compilation"
-msgstr "Ask confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:30
-#, fuzzy
 msgid "Clean everything, including dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:31
 #: /tmp/fish/implicit/share/completions/mix.fish:48
@@ -40734,9 +37452,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:37
-#, fuzzy
 msgid "loads the given configuration file"
-msgstr "Produce sample configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:38
 msgid "evaluates the given code"
@@ -40755,14 +37472,12 @@ msgid "does not compile even if files require compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:42
-#, fuzzy
 msgid "does not check dependencies"
-msgstr "Update cache and check dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:43
-#, fuzzy
 msgid "does not halt the system after running the command"
-msgstr "Do not fixate the disk after writing the tracks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:44
 msgid "does not start applications after compilation"
@@ -40785,29 +37500,24 @@ msgid "do not start applications after compilation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:51
-#, fuzzy
 msgid "disable color in the output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:52
-#, fuzzy
 msgid "enable color in the output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:53
-#, fuzzy
 msgid "include tests that match the filter"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:54
-#, fuzzy
 msgid "exclude tests that match the filter"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:55
-#, fuzzy
 msgid "run only tests that match the filter"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mix.fish:56
 msgid "seeds the random number generator used to randomize test order"
@@ -40818,9 +37528,8 @@ msgid "set the timeout for the tests"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:1
-#, fuzzy
 msgid "Output version"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:2
 #: /tmp/fish/implicit/share/completions/mkdir.fish:6
@@ -40834,9 +37543,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:4
 #: /tmp/fish/implicit/share/completions/mkdir.fish:8
-#, fuzzy
 msgid "Print a message for each created directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdir.fish:9
 msgid ""
@@ -40844,97 +37552,80 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:1
-#, fuzzy
 msgid "Disable alignment"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:2
-#, fuzzy
 msgid "Use Atari variation"
-msgstr "Use primary selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:3
 msgid "Select location of backup sector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:4
-#, fuzzy
 msgid "Check for bad blocks"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:5
-#, fuzzy
 msgid "Create file given as device"
-msgstr "Pretend file is modified"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:6
-#, fuzzy
 msgid "Specify drive number"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:7
-#, fuzzy
 msgid "Specify number of FATs"
-msgstr "Specify trust model"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:8
-#, fuzzy
 msgid "Specify FAT size"
-msgstr "Specify APT list dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:9
-#, fuzzy
 msgid "Specify number of hidden sectors"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:10
-#, fuzzy
 msgid "Specify volume ID"
-msgstr "Specify conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:11
 msgid "Force to use entire disk"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:12
-#, fuzzy
 msgid "Read bad blocks list from given file"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:13
-#, fuzzy
 msgid "Specify file containing non bootable message"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:14
-#, fuzzy
 msgid "Specify media type"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:15
-#, fuzzy
 msgid "Specify volume name"
-msgstr "Definir nome do volume"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:16
-#, fuzzy
 msgid "Specify number of entries available in root directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:17
-#, fuzzy
 msgid "Specify number of reserved sectors"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:18
-#, fuzzy
 msgid "Specify number of sector per cluster"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:19
-#, fuzzy
 msgid "Specify number of bytes per logical sector"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkdosfs.fish:21
 msgid "Use constants for randomly generated data"
@@ -40953,9 +37644,8 @@ msgid "Set directory as the location where the initramfs is built"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:4
-#, fuzzy
 msgid "Generate a CPIO image as filename"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:5
 msgid "Output help for a hook"
@@ -40970,9 +37660,8 @@ msgid "Use kernelversion, instead of the current running kernel"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:8
-#, fuzzy
 msgid "List all available hooks"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:9
 msgid "Display modules found via autodetection"
@@ -40980,9 +37669,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:10
 #: /tmp/fish/implicit/share/completions/rc-service.fish:4
-#, fuzzy
 msgid "Disable color output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:11
 msgid "Process all presets contained in /etc/mkinitcpio.d"
@@ -40993,9 +37681,8 @@ msgid "Build initramfs image(s) according to specified preset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:13
-#, fuzzy
 msgid "Specifies the root directory to find modules in"
-msgstr "Specify the repository directory in which to run"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:14
 msgid "Skip hooks when generating the image"
@@ -41012,37 +37699,32 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:17
 #: /tmp/fish/implicit/share/completions/mvn.fish:34
 #: /tmp/fish/implicit/share/completions/termite.fish:2
-#, fuzzy
 msgid "Display version information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkinitcpio.fish:19
 msgid "Override the compression method with the compress program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:1
-#, fuzzy
 msgid "Show version information"
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:3
 msgid "Extract tracks to external files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:4
-#, fuzzy
 msgid "Extract tags as XML"
-msgstr "Extract to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:5
-#, fuzzy
 msgid "Extract attachments"
-msgstr "Extract from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:6
-#, fuzzy
 msgid "Extract chapters as XML"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:7
 msgid "Extract chapters and tags as CUE sheet"
@@ -41053,14 +37735,12 @@ msgid "Extract timecodes of a track as timecode v2 file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:9
-#, fuzzy
 msgid "Extract cue information as text file"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:10
-#, fuzzy
 msgid "Parse the whole file instead of relying on the index"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:11
 #: /tmp/fish/implicit/share/completions/rsync.fish:1
@@ -41069,28 +37749,24 @@ msgid "Increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:12
-#, fuzzy
 msgid "Suppress status output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:13
 msgid "Force the translations for 'code' to be used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:14
-#, fuzzy
 msgid "Charset for strings on the command line"
-msgstr "Obtém ou altera o buffer da linha de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:15
-#, fuzzy
 msgid "Outputs messages in specified charset"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:16
-#, fuzzy
 msgid "Redirect all messages into a file"
-msgstr "Append all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:17
 msgid "Convert text subtitles to a charset"
@@ -41105,9 +37781,8 @@ msgid "Keep only the BlockAdditions up to the specified level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:20
-#, fuzzy
 msgid "Extract the data to a raw file"
-msgstr "Extrair arquivos do arquivo de lista"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:21
 msgid "Extract the data to a raw file including the CodecPrivate as header"
@@ -41118,15 +37793,13 @@ msgid "Exports the chapter information in a simple format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:23
-#, fuzzy
 msgid "Uses the chapter names of the specified language"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:2
 #: /tmp/fish/implicit/share/completions/yarn.fish:2
-#, fuzzy
 msgid "output the version number"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:3
 msgid "force all tests to take a callback (async) or return a promise"
@@ -41141,23 +37814,20 @@ msgid "force disabling of colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:6
-#, fuzzy
 msgid "enable growl notification support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:7
 msgid "<k=v,k2=v2,...>  reporter-specific options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:8
-#, fuzzy
 msgid "specify the reporter to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:9
-#, fuzzy
 msgid "sort test files"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:10
 msgid "bail after first test failure"
@@ -41168,18 +37838,16 @@ msgid "enable node's debugger, synonym for node --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:12
-#, fuzzy
 msgid "only run tests matching <pattern>"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:13
 msgid "only run tests containing <string>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:14
-#, fuzzy
 msgid "expose gc extension"
-msgstr "Ordena por extensão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:15
 msgid "inverts --grep and --fgrep matches"
@@ -41202,18 +37870,16 @@ msgid "specify user-interface (bdd|tdd|qunit|exports)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:20
-#, fuzzy
 msgid "watch files for changes"
-msgstr "Patch local changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:21
 msgid "check for global variable leaks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:22
-#, fuzzy
 msgid "display the full stack trace"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:23
 msgid "use the given module(s) to compile files"
@@ -41242,18 +37908,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:29
-#, fuzzy
 msgid "include ICU data"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:30
 msgid "display actual/expected differences inline within each string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:31
-#, fuzzy
 msgid "display available interfaces"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:32
 msgid "silence deprecation warnings"
@@ -41269,9 +37933,8 @@ msgid "disables timeouts, given implicitly with --debug"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:35
-#, fuzzy
 msgid "specify opts path"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:36
 msgid "enable perf linux profiler (basic support)"
@@ -41286,14 +37949,12 @@ msgid "Time events including external callbacks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:39
-#, fuzzy
 msgid "include sub directories"
-msgstr "Do not include subdirectory size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:40
-#, fuzzy
 msgid "display available reporters"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:41
 msgid "set numbers of time to retry a failed test case"
@@ -41304,62 +37965,52 @@ msgid "throw an exception anytime a deprecated function is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:43
-#, fuzzy
 msgid "trace function calls"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:44
-#, fuzzy
 msgid "show stack traces on deprecations"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:45
-#, fuzzy
 msgid "enforce strict mode"
-msgstr "Restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:46
 msgid "additional extensions to monitor with --watch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocha.fish:47
-#, fuzzy
 msgid "wait for async suite definition"
-msgstr "Editar definição de função"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:1
-#, fuzzy
 msgid "Print program version and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:2
-#, fuzzy
 msgid "Print usage and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:3
-#, fuzzy
 msgid "Turn on logging to a file"
-msgstr "Run in login mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:4
-#, fuzzy
 msgid "Run only the server"
-msgstr "Options for the keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:5
 msgid "Run server in foreground, log to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:6
-#, fuzzy
 msgid "Use the specified sound driver"
-msgstr "Usa servidor de chaves especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:7
-#, fuzzy
 msgid "Start in MusicDir"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:8
 msgid ""
@@ -41372,9 +38023,8 @@ msgid "Add the files given on command line to the queue"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:10
-#, fuzzy
 msgid "Clear the playlist and exit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:11
 msgid "Start playing from the first item on the playlist"
@@ -41397,9 +38047,8 @@ msgid "Play previous song"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:16
-#, fuzzy
 msgid "Shutdown the server"
-msgstr "Options for the keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:17
 msgid ""
@@ -41407,19 +38056,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:18
-#, fuzzy
 msgid "Use the specified config file instead of the default"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:19
 msgid "NAME=VALUE Override configuration option NAME with VALUE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:20
-#, fuzzy
 msgid "Use the specified MOC directory instead of the default"
 msgstr ""
-"Usa o arquivo especificado em vez do banco de dados de confiança padrão"
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:21
 msgid "Pause"
@@ -41450,18 +38096,16 @@ msgid "Use ASCII characters to draw lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:28
-#, fuzzy
 msgid "Print the information about the currently played file"
-msgstr "Output extra information about the work being done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:29
 msgid "Print the formatted information about the currently played file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:30
-#, fuzzy
 msgid "Alias for -a"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:31
 msgid "Seek by N seconds (can be negative)"
@@ -41472,53 +38116,44 @@ msgid "N{%,s} Jump to some position of the current track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:33
-#, fuzzy
 msgid "Turn on a control"
-msgstr "Warning control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:34
-#, fuzzy
 msgid "Turn off a control"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:35
-#, fuzzy
 msgid "Toggle a control"
-msgstr "Testa uma condição"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:1
-#, fuzzy
 msgid "Print only 'author'"
-msgstr "Mostra autor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:2
-#, fuzzy
 msgid "Print only 'description'"
-msgstr "Set function description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:3
-#, fuzzy
 msgid "Print only 'license'"
-msgstr "Print license"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:4
-#, fuzzy
 msgid "Print only 'parm'"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:5
-#, fuzzy
 msgid "Print only 'filename'"
-msgstr "Print only rcs filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:6
 msgid "Use \\0 instead of \\n"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:7
-#, fuzzy
 msgid "Print only provided FIELD"
-msgstr "Print only file info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:9
 msgid "Use DIR as filesystem root for /lib/modules"
@@ -41550,28 +38185,24 @@ msgid "Remove modules"
 msgstr "Remove modules"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:10
-#, fuzzy
 msgid "Ignore all version information"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:11
-#, fuzzy
 msgid "Ignore version magic information"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:12
 msgid "Ignore module interface version"
 msgstr "Ignore module interface version"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:13
-#, fuzzy
 msgid "List all modules matching the given wildcard"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:14
-#, fuzzy
 msgid "Insert modules matching the given wildcard"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:15
 msgid "Restrict wildcards to specified directory"
@@ -41582,9 +38213,8 @@ msgid "Send error messages through syslog"
 msgstr "Send error messages through syslog"
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:17
-#, fuzzy
 msgid "Specify kernel version"
-msgstr "Specify X server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modprobe.fish:18
 msgid "List dependencies of module"
@@ -41624,9 +38254,8 @@ msgid "Adaptively resize image with data dependent triangulation [geometry]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mogrify.fish:89
-#, fuzzy
 msgid "Automatically orient image"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:10
 msgid "Alternate image colorsapce [type]"
@@ -41671,9 +38300,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:76
-#, fuzzy
 msgid "Set the image size [geometry]"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/montage.fish:82
 msgid "Simulate a Polaroid picture [angle]"
@@ -41739,9 +38367,8 @@ msgid "Use a particular server-side UDP port or port range"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:4
-#, fuzzy
 msgid "Mount file systems in fstab"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:5
 msgid "Fork process for each mount"
@@ -41760,19 +38387,16 @@ msgid "Do not write mtab"
 msgstr "Do not write mtab"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:9
-#, fuzzy
 msgid "Tolerate sloppy mount options"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:10
-#, fuzzy
 msgid "Read only"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:11
-#, fuzzy
 msgid "Read/Write mode"
-msgstr "Read/Write mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mount.fish:12
 msgid "Mount partition with specified label"
@@ -41824,9 +38448,8 @@ msgid "Full screen"
 msgstr "Full screen"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:10
-#, fuzzy
 msgid "Set playlist"
-msgstr "Set system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:11
 msgid "Audio language"
@@ -41865,9 +38488,8 @@ msgid "Override framerate"
 msgstr "Override framerate"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:20
-#, fuzzy
 msgid "Build index if unavailable"
-msgstr "Rebuild index files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:21
 msgid "Load index from file"
@@ -41882,9 +38504,8 @@ msgid "Rebuild index and save to file"
 msgstr "Rebuild index and save to file"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:24
-#, fuzzy
 msgid "Seek to given time position"
-msgstr "Seek to given time position"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:25
 msgid "TV capture mode"
@@ -41917,56 +38538,48 @@ msgid "Audio output"
 msgstr "Saída de áudio"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:1
-#, fuzzy
 msgid "Add specified directory to list for input files search"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:2
-#, fuzzy
 msgid "Generate a Java ResourceBundle class"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:3
 msgid "Like --java, and assume Java2 (JDK 1.2 or higher)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:4
-#, fuzzy
 msgid "Generate a .NET .dll file"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:5
-#, fuzzy
 msgid "Generate a .NET .resources file"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:6
-#, fuzzy
 msgid "Generate a tcl/msgcat .msg file"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:7
-#, fuzzy
 msgid "Generate a Qt .qm file"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:9
 msgid "Enable strict Uniforum mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:10
-#, fuzzy
 msgid "Resource name"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:11
 msgid "Locale name, either language or language_COUNTRY"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:12
-#, fuzzy
 msgid "Base directory for output"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:13
 msgid "Input files are in Java .properties syntax"
@@ -42004,9 +38617,8 @@ msgid "Check presence of keyboard accelerators for menu items"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:21
-#, fuzzy
 msgid "Use fuzzy entries in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:22
 msgid "Alignment"
@@ -42021,9 +38633,8 @@ msgid "Print statistics about translations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:27
-#, fuzzy
 msgid "Increase verbosity level"
-msgstr "Output sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:1
 #: /tmp/fish/implicit/share/completions/mutt.fish:16
@@ -42036,24 +38647,20 @@ msgid "Specify a blind-carbon-copy (BCC) recipient"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:3
-#, fuzzy
 msgid "Print the value of all configuration options to stdout"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:5
-#, fuzzy
 msgid "Bypass the system configuration file"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:6
-#, fuzzy
 msgid "Resume a postponed message"
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:7
-#, fuzzy
 msgid "Open a mailbox in read-only mode"
-msgstr "Open folder read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:8
 msgid "Display the Mutt version number and compile-time definitions"
@@ -42088,9 +38695,8 @@ msgid "Run command after processing of initialization files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:18
-#, fuzzy
 msgid "Specify which mailbox to load"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:19
 msgid "Specify an initialization file to read instead of ~/.muttrc"
@@ -42105,19 +38711,16 @@ msgid "Specify a file to include into the body of a message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:22
-#, fuzzy
 msgid "Specify a default mailbox type"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:23
-#, fuzzy
 msgid "Query a configuration variables value"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:24
-#, fuzzy
 msgid "Specify the subject of the message"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:1
 msgid "Make backup of each existing destination file"
@@ -42128,18 +38731,16 @@ msgid "Do not prompt before overwriting"
 msgstr "Do not prompt before overwriting"
 
 #: /tmp/fish/implicit/share/completions/mv.fish:4
-#, fuzzy
 msgid "Answer for overwrite questions"
-msgstr "Answer for overwrite questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:5
 msgid "Remove trailing slashes from source"
 msgstr "Remove trailing slashes from source"
 
 #: /tmp/fish/implicit/share/completions/mv.fish:6
-#, fuzzy
 msgid "Backup suffix"
-msgstr "Backup suffix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:7
 msgid "Target directory"
@@ -42160,9 +38761,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:3
-#, fuzzy
 msgid "Run in non-interactive (batch) mode"
-msgstr "Run in noninteractive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:4
 msgid "The id of the build strategy to use."
@@ -42184,14 +38784,12 @@ msgid "Ineffective, only kept for backward compatibility"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:8
-#, fuzzy
 msgid "Define a system property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:9
-#, fuzzy
 msgid "Produce execution error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:10
 msgid "Encrypt master security password"
@@ -42224,9 +38822,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:17
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:5
-#, fuzzy
 msgid "Display help information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:18
 msgid "Log file to where all build output will go."
@@ -42239,9 +38836,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:20
-#, fuzzy
 msgid "Do not recurse into sub-projects"
-msgstr "Do not export variable to subprocess"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:23
 msgid "Suppress SNAPSHOT updates"
@@ -42259,14 +38855,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:26
-#, fuzzy
 msgid "Quiet output - only show errors"
-msgstr "Force to continue on some errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:27
-#, fuzzy
 msgid "Resume reactor from specified project"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:28
 msgid "Alternate path for the user settings file"
@@ -42291,9 +38885,8 @@ msgid "Display version information WITHOUT stopping build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:35
-#, fuzzy
 msgid "Produce execution debug output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:36
 msgid "Comma-delimited list of profiles to activate"
@@ -42316,9 +38909,8 @@ msgid "Run surefire tests with debugging on port 5005"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:41
-#, fuzzy
 msgid "Skip Javadoc generation"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:42
 msgid ""
@@ -42357,14 +38949,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:48
-#, fuzzy
 msgid "Installs the artifact in the remote repository."
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:49
-#, fuzzy
 msgid "Deploys an artifact to remote repository."
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:50
 msgid ""
@@ -42393,9 +38983,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:55
-#, fuzzy
 msgid "Installs a file in the local repository."
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:56
 msgid ""
@@ -42601,19 +39190,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:92
-#, fuzzy
 msgid "Generate a changelog report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:93
-#, fuzzy
 msgid "Generate a file activity report."
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:94
-#, fuzzy
 msgid "Generate a developer activity report."
-msgstr "Generate a dotty graph"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:95
 msgid ""
@@ -42870,9 +39456,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:139
-#, fuzzy
 msgid "Creates a PMD report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:140
 msgid "Generates the Project Continuous Integration System report."
@@ -42906,9 +39491,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:147
-#, fuzzy
 msgid "Generates the project index page."
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:148
 msgid "Generates the Project Issue Tracking report."
@@ -42971,9 +39555,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:161
-#, fuzzy
 msgid "Generate Ant build files."
-msgstr "Generate contents file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:162
 msgid "Clean all Ant build files."
@@ -43045,9 +39628,8 @@ msgid "Build a JAR from the current Archetype project."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:173
-#, fuzzy
 msgid "Updates the local catalog"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:174
 msgid ""
@@ -43222,9 +39804,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:194
-#, fuzzy
 msgid "Displays the list of dependencies for this project."
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:195
 msgid ""
@@ -43247,9 +39828,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:198
-#, fuzzy
 msgid "Goal that resolves the project dependencies from the repository."
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:199
 msgid ""
@@ -43257,14 +39837,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:200
-#, fuzzy
 msgid "Goal that resolves the project source dependencies from the repository."
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:201
-#, fuzzy
 msgid "Displays the dependency tree for this project."
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:202
 msgid ""
@@ -43418,9 +39996,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:228
-#, fuzzy
 msgid "Apply one or more patches to project sources."
-msgstr "Adicionar um ou mais novos arquivos ou diretórios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:229
 msgid ""
@@ -43467,9 +40044,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:237
-#, fuzzy
 msgid "Generates a HelpMojo class."
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:238
 msgid ""
@@ -43591,23 +40167,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:254
-#, fuzzy
 msgid "Display the modification status of the files in the configured scm url."
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:255
-#, fuzzy
 msgid "Branch the project."
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:256
 msgid "Validate scm connection string."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:257
-#, fuzzy
 msgid "Commit changes to the configured scm url."
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:258
 msgid ""
@@ -43622,9 +40195,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:260
-#, fuzzy
 msgid "Add a file set to the project."
-msgstr "Adicionar um novo arquivo/diretório ao repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:261
 msgid "Mark a set of files for deletion."
@@ -43645,14 +40217,12 @@ msgid "Get a fresh copy of the latest source from the configured scm url."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:265
-#, fuzzy
 msgid "Tag the project."
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:266
-#, fuzzy
 msgid "Edit/lock a set of files."
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:267
 msgid "This mojo will fail the build if there is any local modifications"
@@ -43697,9 +40267,8 @@ msgid "Empty goal, provided only to set loose the lifecycle."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:276
-#, fuzzy
 msgid "Copies artifacts from one repository to another repository."
-msgstr "Copy and apply patches from this repository to another one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:277
 msgid ""
@@ -43757,19 +40326,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:285
-#, fuzzy
 msgid "Generates MyEclipse configuration files"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:286
-#, fuzzy
 msgid "Deletes configuration files used by MyEclipse"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:287
-#, fuzzy
 msgid "Generates the rad-6 configuration files."
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:288
 msgid ""
@@ -43778,9 +40344,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:289
-#, fuzzy
 msgid "Removes the not-available marker files from the repository."
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:290
 msgid ""
@@ -44032,9 +40597,8 @@ msgid "Weaves all main classes."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:335
-#, fuzzy
 msgid "Create eclipse configuration of aspectJ"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:336
 msgid ""
@@ -44620,9 +41184,8 @@ msgid "Create webstartable binaries for a 'nbm-application'."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:434
-#, fuzzy
 msgid "Generate a report from the Clirr output."
-msgstr "Generate XML formatted output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:435
 msgid "Check for compatibility between two arbitrary artifact sets."
@@ -44753,9 +41316,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:459
-#, fuzzy
 msgid "Create a CodeNarc Report."
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:460
 msgid ""
@@ -44862,9 +41424,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:477
-#, fuzzy
 msgid "Prints the configuration settings."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:478
 msgid "Creates the HTML report for a test run based on XSLT."
@@ -45011,9 +41572,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:500
-#, fuzzy
 msgid "Add more resource directories to the POM."
-msgstr "Adicionar um ou mais novos arquivos ou diretórios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:501
 msgid "Store the maven core version in a property maven.version."
@@ -45024,9 +41584,8 @@ msgid "Attach additional artifacts to be installed and deployed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:503
-#, fuzzy
 msgid "Add test source directories to the POM."
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:504
 msgid ""
@@ -45057,14 +41616,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:508
-#, fuzzy
 msgid "Add more source directories to the POM."
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:509
-#, fuzzy
 msgid "Add more test resource directories to the POM."
-msgstr "Adicionar um ou mais novos arquivos ou diretórios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:510
 msgid ""
@@ -45148,9 +41705,8 @@ msgid "Runs nodetool repair on a Cassandra instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:526
-#, fuzzy
 msgid "Executes cql statements from maven."
-msgstr "Execute argument as command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:528
 msgid "Runs nodetool flush on a Cassandra instance."
@@ -45374,9 +41930,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:567
-#, fuzzy
 msgid "Display all available licenses."
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:568
 msgid "Displays all the available comment style to box file headers."
@@ -45486,9 +42041,8 @@ msgid "Executes SQL against a database."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:585
-#, fuzzy
 msgid "List all files in the archive."
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:586
 msgid ""
@@ -45505,9 +42059,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:588
-#, fuzzy
 msgid "Remove a set of files from an existing archive."
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:589
 msgid "Copy a set of files in and out of an existing archive."
@@ -45554,9 +42107,8 @@ msgid "Displays any updates of the project's parent project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:598
-#, fuzzy
 msgid "Displays all plugins that have newer versions available."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:599
 msgid ""
@@ -45621,9 +42173,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:610
-#, fuzzy
 msgid "Sets the parent version to the latest parent version."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:611
 msgid "Sets properties to the latest versions of specific artifacts."
@@ -45647,9 +42198,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:615
 #: /tmp/fish/implicit/share/completions/mvn.fish:618
-#, fuzzy
 msgid "Replaces any version with the latest version."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:616
 msgid ""
@@ -45696,9 +42246,8 @@ msgid "Move files from a virtual file system to another"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:626
-#, fuzzy
 msgid "Remove files from a virtual file system"
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:627
 msgid ""
@@ -45727,9 +42276,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:631
 #: /tmp/fish/implicit/share/completions/mvn.fish:643
-#, fuzzy
 msgid "Closes a Nexus staging repository."
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:632
 msgid ""
@@ -45798,9 +42346,8 @@ msgid "Starts the App Engine development server and does not wait."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:646
-#, fuzzy
 msgid "Start the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:647
 msgid "Stops the App Engine development server."
@@ -45811,9 +42358,8 @@ msgid "Roll back a previously in-progress update."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:649
-#, fuzzy
 msgid "Start the specified module version."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:650
 msgid "Change the default version, but more gently than set_default_version."
@@ -45832,9 +42378,8 @@ msgid "Debug the specified VM Runtime instance."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:654
-#, fuzzy
 msgid "Set the default serving version."
-msgstr "Set default file permission mask"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:655
 msgid "Runs the datanucleus enhancer."
@@ -45852,9 +42397,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:658
-#, fuzzy
 msgid "Configure the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:659
 msgid "Update application cron jobs."
@@ -45865,9 +42409,8 @@ msgid "Runs the App Engine development server."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:661
-#, fuzzy
 msgid "Delete the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:662
 msgid "Update the specified backend or all backends."
@@ -45882,9 +42425,8 @@ msgid "Update application task queue definitions."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:665
-#, fuzzy
 msgid "Stop the specified module version."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:666
 msgid "Rollback an in-progress update."
@@ -45899,9 +42441,8 @@ msgid "App Engine endpoints get-discovery-doc command."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:669
-#, fuzzy
 msgid "Stop the specified backend."
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:670
 msgid "Creates an Android Archive (aar) file. "
@@ -46275,9 +42816,8 @@ msgid "Finishes a hotfix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:728
-#, fuzzy
 msgid "Finishes a feature branch"
-msgstr "Lines after EOF are blank"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:729
 msgid ""
@@ -46285,9 +42825,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:730
-#, fuzzy
 msgid "Starts a release"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:731
 msgid "Starts a feature branch"
@@ -46312,70 +42851,60 @@ msgid "Run an executable archive application."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:1
-#, fuzzy
 msgid "displays this help text"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:3
 msgid "show mount point directories with a 'D'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:4
-#, fuzzy
 msgid "show the mode bits of each file"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:5
-#, fuzzy
 msgid "show owner and group name of each file"
-msgstr "Show commandname of each job"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:6
 msgid "use a long listing format (-m -o -v)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:7
-#, fuzzy
 msgid "don't follow symlinks"
-msgstr "Não segue links simbólicos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/namei.fish:8
 msgid "vertical align of modes and owners"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:1
-#, fuzzy
 msgid "Perform the reverse operation"
-msgstr "Perform contents generation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:2
-#, fuzzy
 msgid "Specifies the name of the character encoding"
-msgstr "Set the native character set"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/native2ascii.fish:3
 msgid "Pass \"option\" to JVM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:2
-#, fuzzy
 msgid "Quiet mode. Refresh interval 2 seconds"
-msgstr "Minimum interval in seconds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:4
-#, fuzzy
 msgid "Same filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ncdu.fish:6
-#, fuzzy
 msgid "Exclude files that match any pattern in file"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:3
-#, fuzzy
 msgid "List all available profiles for automatic selection"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:4
 msgid "Start automatic profile selection on interface"
@@ -46402,57 +42931,48 @@ msgid "Enable all profiles for automatic selection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:10
-#, fuzzy
 msgid "Disable all profiles for automatic selection"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:11
-#, fuzzy
 msgid "Check whether specified profile is active"
-msgstr "Use specified string as comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:12
 msgid "Check whether specified profile is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:3
-#, fuzzy
 msgid "List available profiles"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:4
 msgid "Save which profiles are active"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:5
-#, fuzzy
 msgid "Load saved profiles"
-msgstr "Load index from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:6
-#, fuzzy
 msgid "Stops all profiles"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:7
-#, fuzzy
 msgid "Start a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:8
-#, fuzzy
 msgid "Stop a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:9
-#, fuzzy
 msgid "Restart a profile"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:10
-#, fuzzy
 msgid "Switch to a profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:11
 msgid "Show runtime status of a profile"
@@ -46475,9 +42995,8 @@ msgid "Check whether the unit is enabled"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/netctl.fish:16
-#, fuzzy
 msgid "Open the specified profile in an editor"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nextd.fish:1
 #: /tmp/fish/implicit/share/completions/prevd.fish:1
@@ -46489,14 +43008,12 @@ msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
-#, fuzzy
 msgid "specify build file [default=build.ninja]"
-msgstr "Specify build-dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:3
 msgid "dry run"
@@ -46507,9 +43024,8 @@ msgid "show all command lines while building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:5
-#, fuzzy
 msgid "number of jobs to run in parallel [default derived from CPUs]"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:6
 msgid "do not start if load average > N"
@@ -46520,18 +43036,16 @@ msgid "keep going until N jobs fail [default=1]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:9
-#, fuzzy
 msgid "enable debugging, specify debug mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:10
 msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -46550,9 +43064,8 @@ msgid "use STYLE for numbering header lines"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:5
-#, fuzzy
 msgid "line number increment at each line"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:6
 msgid "group of NUMBER empty lines counted as one"
@@ -46583,47 +43096,40 @@ msgid "add STRING after (possible) line number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:13
-#, fuzzy
 msgid "first line number on each logical page"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:14
 msgid "use NUMBER columns for line numbers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:1
-#, fuzzy
 msgid "Output is terse"
-msgstr "Output trace"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:2
-#, fuzzy
 msgid "Output is pretty"
-msgstr "Output mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:3
 msgid "Switch between tabular and multiline mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:4
-#, fuzzy
 msgid "Whether to use colors in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:5
-#, fuzzy
 msgid "Specify the output fields"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nmcli.fish:6
-#, fuzzy
 msgid "Whether to escape \":\" and \"\\"
-msgstr "Whether to check hashes on disk"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:1
-#, fuzzy
 msgid "Display debugger-only symbols"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:2
 #: /tmp/fish/implicit/share/completions/nm.fish:10
@@ -46631,27 +43137,24 @@ msgid "Print name of the input file before every symbol"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:3
-#, fuzzy
 msgid "Do not demangle low-level symbol names"
-msgstr "Do not mangle From-field of email headers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:4
 msgid "Display dynamic symbols instead of normal symbols"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:5
-#, fuzzy
 msgid "Display only defined symbols"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:6
 msgid "Use the output format FORMAT. The default is \"bsd\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:7
-#, fuzzy
 msgid "Display only external symbols"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:8
 msgid ""
@@ -46659,47 +43162,40 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:9
-#, fuzzy
 msgid "Sort symbols numerically by address"
-msgstr "Numerical address"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:11
-#, fuzzy
 msgid "Do not sort the symbols"
-msgstr "Do not use weak symbol support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:12
 msgid "Same as --format=posix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:13
-#, fuzzy
 msgid "Reverse the sense of the sort"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:14
-#, fuzzy
 msgid "Load the specified plugin"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:15
-#, fuzzy
 msgid "Print size of defined symbols"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:16
 msgid "Include index for symbols from archive members"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:17
-#, fuzzy
 msgid "Sort symbols by size"
-msgstr "Ordena por tamanho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:18
-#, fuzzy
 msgid "Include special symbols in the output"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:19
 msgid "Display synthetic symbols as well"
@@ -46714,34 +43210,28 @@ msgid "Specify the target object format as BFDNAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:22
-#, fuzzy
 msgid "Display only undefined symbols"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:23
-#, fuzzy
 msgid "Display this information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nm.fish:24
-#, fuzzy
 msgid "Display this program's version number"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
-#, fuzzy
 msgid "Print node's version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:2
-#, fuzzy
 msgid "Evaluate script"
-msgstr "Extract script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:3
-#, fuzzy
 msgid "Print result of --eval"
-msgstr "Print flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:4
 msgid "Always enter the REPL even if stdin does not appear to be a terminal"
@@ -46752,18 +43242,16 @@ msgid "Silence deprecation warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:6
-#, fuzzy
 msgid "Show stack traces on deprecations"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:7
 msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -47512,18 +44000,16 @@ msgid "Minimal logging (no API, code, GC, suspect, or handles samples)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:175
-#, fuzzy
 msgid "Log all events to the log file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:176
 msgid "Activate runtime system %Log call"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:177
-#, fuzzy
 msgid "Log API events to the log file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:178
 msgid "Log code events to the log file without profiling"
@@ -47542,9 +44028,8 @@ msgid "log positions of (de)serialized objects in the snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:182
-#, fuzzy
 msgid "Log suspect operations"
-msgstr "Opções de montagem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:183
 msgid "Log statistical profiling information (implies --log-code)"
@@ -47574,9 +44059,8 @@ msgid "Update sliding state window counters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:189
-#, fuzzy
 msgid "Specify the name of the log file"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:190
 msgid "Enable low-level linux profiler"
@@ -47587,76 +44071,63 @@ msgid "Complete the commandline using npm's 'completion' tool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:2
-#, fuzzy
 msgid "Manipulates package's cache"
-msgstr "Auto-gen package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:3
-#, fuzzy
 msgid "Add the specified package to the local cache"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:4
 msgid "Delete  data  out of the cache folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:5
-#, fuzzy
 msgid "Show the data in the cache"
-msgstr "Show packages in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:6
-#, fuzzy
 msgid "Manage the npm configuration files"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:7
 #: /tmp/fish/implicit/share/completions/npm.fish:14
-#, fuzzy
 msgid "Sets the config key to the value"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:8
 #: /tmp/fish/implicit/share/completions/npm.fish:13
-#, fuzzy
 msgid "Echo the config value to stdout"
-msgstr "Send the ownertrust values to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:9
-#, fuzzy
 msgid "Deletes the key from all configuration files"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:10
 #: /tmp/fish/implicit/share/completions/npm.fish:11
-#, fuzzy
 msgid "Show all the config settings"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:12
-#, fuzzy
 msgid "Opens the config file in an editor"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:15
-#, fuzzy
 msgid "install a package"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:16
-#, fuzzy
 msgid "Save to devDependencies in package.json"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:17
-#, fuzzy
 msgid "Save to dependencies in package.json"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:18
-#, fuzzy
 msgid "Install package globally"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:19
 #: /tmp/fish/implicit/share/completions/pkg.fish:25
@@ -47664,9 +44135,8 @@ msgstr "Instalar pacotes"
 #: /tmp/fish/implicit/share/completions/prt-get.fish:24
 #: /tmp/fish/implicit/share/completions/prt-get.fish:84
 #: /tmp/fish/implicit/share/completions/yum.fish:29
-#, fuzzy
 msgid "List installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:20
 msgid ""
@@ -47674,58 +44144,48 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:21
-#, fuzzy
 msgid "Show information in JSON format"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:22
-#, fuzzy
 msgid "Show extended information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:23
 msgid "Show parseable output instead of tree view"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:24
-#, fuzzy
 msgid "Max display depth of the dependency tree"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:25
-#, fuzzy
 msgid "Manage package owners"
-msgstr "Ignore package Holds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:26
-#, fuzzy
 msgid "List package owners"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:27
-#, fuzzy
 msgid "Add a new owner to package"
-msgstr "Adicionar um novo serviço"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:28
-#, fuzzy
 msgid "Remove an owner from package"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:29
-#, fuzzy
 msgid "remove package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:30
-#, fuzzy
 msgid "remove global package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:31
-#, fuzzy
 msgid "Package will be removed from your dependencies"
-msgstr "Gerar uma representação visual de suas dependências"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:32
 msgid "Package will be removed from your devDependencies"
@@ -47742,51 +44202,44 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:36
-#, fuzzy
 msgid "Update package(s)"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:37
-#, fuzzy
 msgid "Update global package(s)"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:38
 msgid "Add a registry user account"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:39
-#, fuzzy
 msgid "Display npm bin folder"
-msgstr "Display debug info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:40
 msgid "Bugs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:41
-#, fuzzy
 msgid "Reduce duplication"
-msgstr "Remove non-duplicate lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:42
-#, fuzzy
 msgid "Deprecate a version of a package"
-msgstr "Version of source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:43
 msgid "Docs for a package in a web browser maybe"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:44
-#, fuzzy
 msgid "Edit an installed package"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:45
-#, fuzzy
 msgid "Browse an installed package"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:46
 msgid "Frequently Asked Questions"
@@ -47801,97 +44254,80 @@ msgid "View registry info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:50
-#, fuzzy
 msgid "Symlink a package folder"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:51
-#, fuzzy
 msgid "Check for outdated packages"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:52
-#, fuzzy
 msgid "Create a tarball from a package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:53
-#, fuzzy
 msgid "Display NPM prefix"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:54
-#, fuzzy
 msgid "Remove extraneous packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:55
-#, fuzzy
 msgid "Publish a package"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:57
-#, fuzzy
 msgid "Display npm root"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:58
 msgid "Run arbitrary package scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:59
-#, fuzzy
 msgid "Lock down dependency versions"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:60
-#, fuzzy
 msgid "Mark your favorite packages"
-msgstr "Clean source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:61
 msgid "View packages marked as favorites"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:62
-#, fuzzy
 msgid "Start a package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:63
-#, fuzzy
 msgid "Stop a package"
-msgstr "Info on a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:64
-#, fuzzy
 msgid "Add a package as a git submodule"
-msgstr "Add a symbolic tag to a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:65
-#, fuzzy
 msgid "Test a package"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:66
-#, fuzzy
 msgid "Remove a package from the registry"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:67
-#, fuzzy
 msgid "Remove star from a package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:68
-#, fuzzy
 msgid "Bump a package version"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:69
-#, fuzzy
 msgid "Display npm username"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nvram.fish:1
 msgid "Use  XML  format  for  reading  and  writing variables"
@@ -47914,121 +44350,100 @@ msgid "Delete all of the firmware variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:1
-#, fuzzy
 msgid "Display archive header information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:2
-#, fuzzy
 msgid "Display contents of the overall file header"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:3
 msgid "Display object format specific file header contents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:4
-#, fuzzy
 msgid "Display object format specific contents"
-msgstr "Mostra contexto de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:5
-#, fuzzy
 msgid "Display contents of section headers"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:6
-#, fuzzy
 msgid "Display content of section headers"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:7
-#, fuzzy
 msgid "Display the contents of all headers"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:8
-#, fuzzy
 msgid "Display assembler contents of executable sections"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:9
-#, fuzzy
 msgid "Display assembler contents of all sections"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:10
 msgid "Intermix source code with disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:11
-#, fuzzy
 msgid "Display full contents of all sections requested"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:12
-#, fuzzy
 msgid "Display debug information in object file"
-msgstr "Display status information on checked out files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:13
-#, fuzzy
 msgid "Display debug information using ctags style"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:14
-#, fuzzy
 msgid "Display (in raw form) any STABS info in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:15
-#, fuzzy
 msgid "Display DWARF info in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:16
-#, fuzzy
 msgid "Display contents of symbol table(s)"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:17
-#, fuzzy
 msgid "Display contents of dynamic symbol table"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:18
-#, fuzzy
 msgid "Display relocation entries in file"
-msgstr "Delete entries in zipfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:19
-#, fuzzy
 msgid "Display dynamic relocation entries in file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:20
-#, fuzzy
 msgid "Display version number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:21
 msgid "List object formats and architectures supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:23
-#, fuzzy
 msgid "Specify target object format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:24
-#, fuzzy
 msgid "Specify target architecture"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:25
-#, fuzzy
 msgid "Only display information for given section"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:26
 msgid "Pass given options on to disassembler"
@@ -48055,9 +44470,8 @@ msgid "Add given directory to search list from source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:32
-#, fuzzy
 msgid "Include line numbers and filenames in output"
-msgstr "Use label instead of filename in output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:33
 msgid "Include file offsets when displaying information"
@@ -48096,9 +44510,8 @@ msgid "Don't display hex alongside symbolic disassembly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:42
-#, fuzzy
 msgid "Display specified number of bytes on single line for -d"
-msgstr "Display line number for each line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:43
 msgid "Add offset to all displayed section address"
@@ -48113,73 +44526,60 @@ msgid "Add given prefix to absolute paths for -S"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:46
-#, fuzzy
 msgid "Strip initial directory names for -S"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:47
-#, fuzzy
 msgid "Do not display DIEs at given depth or greater"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:48
-#, fuzzy
 msgid "Display DIEs starting with given number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:49
 msgid "Make additional dwarf internal consistency checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:1
-#, fuzzy
 msgid "Add a key to the repository"
-msgstr "Adicionar uma chave criptografada ao repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:2
-#, fuzzy
 msgid "Backup data to repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:3
-#, fuzzy
 msgid "List clients and their keys in the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:4
-#, fuzzy
 msgid "List clients using the repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:5
-#, fuzzy
 msgid "Show difference between two generations"
-msgstr "Show differences between revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:6
-#, fuzzy
 msgid "Dump (some) data structures from a repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:7
-#, fuzzy
 msgid "Force a locked repository to be open"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:8
-#, fuzzy
 msgid "Forget (remove) specified backup generations"
-msgstr "Remove completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:9
-#, fuzzy
 msgid "Verify internal consistency of backup repository"
-msgstr "Check the entire repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:10
-#, fuzzy
 msgid "List backup generations for client"
-msgstr "Remove completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:11
 msgid "List generation ids for client"
@@ -48190,57 +44590,48 @@ msgid "Print help, including hidden subcommands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:14
-#, fuzzy
 msgid "List contents of a generation in kdirstat cache format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:15
-#, fuzzy
 msgid "List error codes and explanations"
-msgstr "Do not print explanations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:16
-#, fuzzy
 msgid "List available repository formats"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:17
 msgid "List keys and repository toplevels they are used in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:18
-#, fuzzy
 msgid "List repository toplevel directories and their keys"
-msgstr "Lista diretórios, não seu conteúdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:19
-#, fuzzy
 msgid "List contents of a generation"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:20
 msgid "Mount a backup repository as a FUSE filesystem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:21
-#, fuzzy
 msgid "Check if the most recent generation is recent enough"
-msgstr "Locate the most recent version lacking an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:22
-#, fuzzy
 msgid "Remove client and its key from repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:23
-#, fuzzy
 msgid "Remove a key from the repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:24
-#, fuzzy
 msgid "Restore some or all files from a generation"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:25
 msgid "Verify that live data and backed up data match"
@@ -48255,18 +44646,16 @@ msgid "Do not restore setuid/setgid bits in restored files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:28
-#, fuzzy
 msgid "Use CHECKSUM algorithm"
-msgstr "MAC algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:29
 msgid "Name of client"
 msgstr "Nome do cliente"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:30
-#, fuzzy
 msgid "Compress repository with"
-msgstr "Compress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:31
 msgid "For --nagios-last-backup-age: maximum age"
@@ -48277,23 +44666,20 @@ msgid "Dump metadata about files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:33
-#, fuzzy
 msgid "Do not dump metadata about files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
-#, fuzzy
 msgid "Generate man page"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
 msgid "Which generation to restore"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:36
-#, fuzzy
 msgid "Show this help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:37
 msgid "Policy for what generations to keep when forgetting."
@@ -48304,19 +44690,16 @@ msgid "Wait TIMEOUT seconds for an existing lock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:39
-#, fuzzy
 msgid "Write output to FILE instead of STDOUT"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:40
-#, fuzzy
 msgid "Do not actually change anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:41
-#, fuzzy
 msgid "Actually commit changes"
-msgstr "Summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:42
 msgid "Show only errors, no progress updates"
@@ -48327,23 +44710,20 @@ msgid "Show errors and progress updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:44
-#, fuzzy
 msgid "Name of backup repository"
-msgstr "Repair the corrupted repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:45
-#, fuzzy
 msgid "Use FORMAT for new repositories"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:46
 msgid "Where to restore / mount to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:48
-#, fuzzy
 msgid "Do not be verbose"
-msgstr "Do not overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:49
 msgid "Verify N files randomly from the backup"
@@ -48351,9 +44731,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:50
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:72
-#, fuzzy
 msgid "Show version number and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:51
 msgid "For nagios-last-backup-age: maximum age"
@@ -48364,29 +44743,25 @@ msgid "Make a checkpoint after a given SIZE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:53
-#, fuzzy
 msgid "Deduplicate mode"
-msgstr "Read/Write mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:54
 msgid "REGEXP for pathnames to exclude"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:55
-#, fuzzy
 msgid "Exclude directories tagged as cache"
-msgstr "Search directories for source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:56
-#, fuzzy
 msgid "Include directories tagged as cache"
-msgstr "Include directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:57
 #: /tmp/fish/implicit/share/completions/rsync.fish:77
-#, fuzzy
 msgid "Read exclude patterns from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:58
 msgid "REGEXP for pathnames to include, even if matches --exclude"
@@ -48401,19 +44776,16 @@ msgid "Omit checkpoint generations at the end of backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:61
-#, fuzzy
 msgid "Do not follow mount points"
-msgstr "Do not fold long lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:62
-#, fuzzy
 msgid "Follow mount points"
-msgstr "Mount point"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:63
-#, fuzzy
 msgid "What to backup"
-msgstr "Go to background"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:64
 msgid "Put small files directly into the B-tree"
@@ -48424,34 +44796,28 @@ msgid "No not put small files into the B-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:66
-#, fuzzy
 msgid "Add FILE to config files"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
-#, fuzzy
 msgid "Write out the current configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:68
-#, fuzzy
 msgid "Write out setting names"
-msgstr "Write out the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:69
-#, fuzzy
 msgid "Show all options"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:70
-#, fuzzy
 msgid "List config files"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:71
-#, fuzzy
 msgid "Clear list of configuration files to read"
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:72
 msgid "Artificially crash the program after COUNTER files"
@@ -48462,9 +44828,8 @@ msgid "Pretend it is TIMESTAMP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:74
-#, fuzzy
 msgid "Simulate failures for files that match REGEXP"
-msgstr "Select patch matching REGEXP"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:75
 msgid "FILENAME pattern for trace debugging"
@@ -48475,19 +44840,16 @@ msgid "PGP key with which to encrypt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:77
-#, fuzzy
 msgid "Home directory for GPG"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:78
-#, fuzzy
 msgid "Show additional user IDs"
-msgstr "Show history for all users"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:79
-#, fuzzy
 msgid "Do not show additional user IDs"
-msgstr "Do not store directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:80
 msgid "PGP key id"
@@ -48498,9 +44860,8 @@ msgid "Size of symmetric key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:82
-#, fuzzy
 msgid "Use /dev/urandom instead of /dev/random"
-msgstr "Use purge instead of remove"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:83
 msgid "Use default /dev/random"
@@ -48515,89 +44876,74 @@ msgid "fsck should not try to fix problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:86
-#, fuzzy
 msgid "Ignore chunks when checking integrity"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:87
 msgid "Check chunks when checking integrity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:88
-#, fuzzy
 msgid "Do not check data for cient NAME"
-msgstr "Do not store directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
-#, fuzzy
 msgid "Check only the last generation"
-msgstr "Resumes the last merge operation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:90
 #: /tmp/fish/implicit/share/completions/obnam.fish:100
-#, fuzzy
 msgid "Check all generations"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
-#, fuzzy
 msgid "fsck should remove unused chunks"
-msgstr "Remove source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:93
-#, fuzzy
 msgid "Do not check checksums of files"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:94
-#, fuzzy
 msgid "Check checksums of files"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:95
-#, fuzzy
 msgid "Do not check directories"
-msgstr "Do not store directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
-#, fuzzy
 msgid "Check directories"
-msgstr "Recurse directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
-#, fuzzy
 msgid "Do not check files"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:98
-#, fuzzy
 msgid "Check files"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:99
-#, fuzzy
 msgid "Do not check any generations"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:101
-#, fuzzy
 msgid "Do not check per-client B-trees"
-msgstr "Do not print tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:102
 msgid "Check per-client B-trees"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:103
-#, fuzzy
 msgid "Do not check shared B-trees"
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:104
-#, fuzzy
 msgid "Check shared B-trees"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:105
 msgid "Write log to FILE or syslog"
@@ -48644,9 +44990,8 @@ msgid "Chunk id level size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:116
-#, fuzzy
 msgid "Depth of chunk id mapping"
-msgstr "Depth of call chain"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:117
 msgid "Chunk id mapping lowest bits skip"
@@ -48657,9 +45002,8 @@ msgid "Size of LRU cache for B-tree nodes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:119
-#, fuzzy
 msgid "Size of B-tree nodes on disk"
-msgstr "Show changes in reverse order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:120
 msgid "Length of upload queue for B-tree nodes"
@@ -48686,9 +45030,8 @@ msgid "Use only paramiko, no openssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:126
-#, fuzzy
 msgid "Use openssh if available"
-msgstr "Build index if unavailable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:127
 msgid "Executable to be used instead of \"ssh\""
@@ -48707,28 +45050,24 @@ msgid "FILENAME of the known_hosts file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:1
-#, fuzzy
 msgid "Produce no output to stderr"
-msgstr "Audio output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:2
-#, fuzzy
 msgid "Print this help text"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:3
-#, fuzzy
 msgid "Print the version number"
-msgstr "Print linenumber"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:4
 msgid "Set bits/sample for raw input. Default is 16"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:5
-#, fuzzy
 msgid "Set number of channels for raw input"
-msgstr "Set number of audio channels"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:6
 msgid "Set samples/sec for raw input"
@@ -48747,9 +45086,8 @@ msgid "Enable the bitrate management engine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:10
-#, fuzzy
 msgid "Specify a minimum bitrate (in kbps)"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:11
 msgid "Specify a maximum bitrate in kbps"
@@ -48760,18 +45098,16 @@ msgid "option=value Sets an advanced encoder option to the given value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:13
-#, fuzzy
 msgid "Specify quality"
-msgstr "Specify a dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:14
 msgid "Resample input data to sampling rate n (Hz)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:15
-#, fuzzy
 msgid "Specify a serial number for the stream"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:16
 msgid ""
@@ -48788,9 +45124,8 @@ msgid "Produce filenames as this string"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:19
-#, fuzzy
 msgid "Remove the specified characters from parameters"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:20
 msgid "Replace characters removed by --name-remove"
@@ -48801,57 +45136,49 @@ msgid "Add the given string as an extra comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:22
-#, fuzzy
 msgid "Date for track"
-msgstr "Set format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:23
-#, fuzzy
 msgid "Track number"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:24
 msgid "Title of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:25
-#, fuzzy
 msgid "Name of album"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:26
-#, fuzzy
 msgid "Name of artist"
-msgstr "Name of patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:27
 msgid "Genre of track"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:1
-#, fuzzy
 msgid "Display the manual for an OPAM command."
-msgstr "Displays usage information for command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:2
 #: /tmp/fish/implicit/share/completions/opam.fish:58
-#, fuzzy
 msgid "Show version information."
-msgstr "Show apropos information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:4
 msgid "Compatibility mode with OPAM 1.0"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:5
-#, fuzzy
 msgid "Print debug message on stdout."
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:6
-#, fuzzy
 msgid "Print the git version if it exists and exit."
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:7
 msgid "Do not use the external aspcud solver, even if available."
@@ -48862,9 +45189,8 @@ msgid "Do not install base packages (useful for testing purposes)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:9
-#, fuzzy
 msgid "Be quiet when installing a new compiler."
-msgstr "Build and install a new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:10
 msgid "Use ROOT as the current root path."
@@ -48881,9 +45207,8 @@ msgid "Use SWITCH as the current compiler switch."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:13
-#, fuzzy
 msgid "Be more verbose."
-msgstr "Do not overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:14
 msgid ""
@@ -48892,23 +45217,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:15
-#, fuzzy
 msgid "Display configuration options for packages."
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:16
-#, fuzzy
 msgid "Enable all the global and user configuration options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:17
 msgid "Use csh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:18
-#, fuzzy
 msgid "Name of the configuration file to update instead of ~/."
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:19
 msgid "Backward-compatible option, equivalent to opam config env."
@@ -48919,14 +45241,12 @@ msgid "Use fish-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:21
-#, fuzzy
 msgid "Enable all the global configuration options."
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:22
-#, fuzzy
 msgid "List the current configuration."
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:23
 msgid "Do not load the auto-completion scripts in the environment."
@@ -48941,9 +45261,8 @@ msgid "Modify ~/. profile (or ~/."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:27
-#, fuzzy
 msgid "Recursive query."
-msgstr "Recursively copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:28
 msgid "Display environment variables as an s-expression."
@@ -48954,9 +45273,8 @@ msgid "Use sh-compatible mode for configuring OPAM."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:30
-#, fuzzy
 msgid "Enable all the user configuration options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:31
 msgid "Use zsh-compatible mode for configuring OPAM.  DOMAINS."
@@ -49007,81 +45325,68 @@ msgid "returns assembly compile options."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:41
-#, fuzzy
 msgid "returns bytecode linking options."
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:42
 msgid "Prints a summary of your setup, useful for bug-reports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:43
-#, fuzzy
 msgid "Display help about OPAM and OPAM commands."
-msgstr "Displays usage information for command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:44
 msgid "Initialize OPAM state."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:45
-#, fuzzy
 msgid "Install a list of packages."
-msgstr "Instalar os pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:46
-#, fuzzy
 msgid "Display the list of available packages."
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:47
-#, fuzzy
 msgid "Pin a given package to a specific version."
-msgstr "Print all source packages with version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:48
-#, fuzzy
 msgid "Reinstall a list of packages."
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:49
-#, fuzzy
 msgid "Remove a list of packages."
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:50
-#, fuzzy
 msgid "Manage OPAM repositories."
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:51
-#, fuzzy
 msgid "Search into the package list."
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:52
-#, fuzzy
 msgid "Display information about specific packages."
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:53
 msgid "Manage multiple installation of compilers."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:54
-#, fuzzy
 msgid "Update the list of available packages."
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:55
-#, fuzzy
 msgid "Upgrade the installed package to latest version."
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:56
-#, fuzzy
 msgid "Administration tool for local repositories."
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:57
 msgid "Show this help in format FMT (pager, plain or groff)."
@@ -49092,33 +45397,28 @@ msgid "Check a local repo for errors."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:60
-#, fuzzy
 msgid "Add external dependencies."
-msgstr "Ask for extra dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:61
-#, fuzzy
 msgid "Initialize a repo for serving files."
-msgstr "Name directory for working files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:62
-#, fuzzy
 msgid "Compute statistics."
-msgstr "Show cache statistics"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:5
-#, fuzzy
 msgid "Prints the list of all defined branches on the server"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:6
 msgid "Lists perforce users suitable for list of completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:7
-#, fuzzy
 msgid "Lists current user's workspaces"
-msgstr "List bugs from packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:8
 msgid "Lists all changelists for current user"
@@ -49131,23 +45431,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:10
-#, fuzzy
 msgid "Lists all changelists with *shelved* files"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:11
-#, fuzzy
 msgid "Lists p4 commands"
-msgstr "Lista por colunas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:12
 msgid "Lists environment variables that can be consumed by perforce"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:13
-#, fuzzy
 msgid "Lists all of available file modes"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:17
 msgid "Values for --parallel option in various commands"
@@ -49248,21 +45545,18 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:43
-#, fuzzy
 msgid "Displays the version of the p4 application and exits."
-msgstr "Display version and supported algorithms, and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/p4.fish:44
-#, fuzzy
 msgid "Displays basic usage information and exits."
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:3
 #: /tmp/fish/implicit/share/completions/yaourt.fish:14
-#, fuzzy
 msgid "Manage .pac* files"
-msgstr "Handle sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:10
 #: /tmp/fish/implicit/share/completions/pacman.fish:9
@@ -49271,87 +45565,74 @@ msgid "Query the files database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:13
-#, fuzzy
 msgid "(AUR) Search for packages"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:14
-#, fuzzy
 msgid "(AUR) Show info for packages"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:15
 msgid "(AUR) Clone the packages' build files and build them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:16
-#, fuzzy
 msgid "(AUR) Clone build files, build and install packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:17
-#, fuzzy
 msgid "(AUR) Check foreign packages for updates"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:18
-#, fuzzy
 msgid "(AUR) Update foreign packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:19
 msgid "(AUR) Clone the packages' build files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:20
-#, fuzzy
 msgid "Download dependencies recursively"
-msgstr "Copy directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:29
 #: /tmp/fish/implicit/share/completions/pacman.fish:20
 #: /tmp/fish/implicit/share/completions/yaourt.fish:26
-#, fuzzy
 msgid "Hook file directory"
-msgstr "File is directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:32
 msgid "Apply only for AUR targets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:33
-#, fuzzy
 msgid "Apply only for specified repo"
-msgstr "Criptografa para o id de usuário especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:34
-#, fuzzy
 msgid "Edit build files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:35
-#, fuzzy
 msgid "Do not edit build files"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:36
-#, fuzzy
 msgid "Always rebuild packages"
-msgstr "Erase built packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:37
-#, fuzzy
 msgid "Redirect output to the log in the clone directory"
-msgstr "Redirecionar saída para arquivo se o arquivo não existe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:38
 msgid "Point at a domain other than the default aur.archlinux.org"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:39
-#, fuzzy
 msgid "Use devel packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:40
 msgid "Ignore all results marked as out of date"
@@ -49370,16 +45651,14 @@ msgid "Sort descending by key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:44
-#, fuzzy
 msgid "Search by field"
-msgstr "Select fields"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:81
 #: /tmp/fish/implicit/share/completions/pacman.fish:59
 #: /tmp/fish/implicit/share/completions/yaourt.fish:80
-#, fuzzy
 msgid "Also downgrade packages"
-msgstr "Bugs for downgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:86
 #: /tmp/fish/implicit/share/completions/pacman.fish:64
@@ -49396,9 +45675,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/yaourt.fish:94
 #: /tmp/fish/implicit/share/completions/yaourt.fish:95
 #: /tmp/fish/implicit/share/completions/yaourt.fish:99
-#, fuzzy
 msgid "List files owned by given packages"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:89
 #: /tmp/fish/implicit/share/completions/pacaur.fish:90
@@ -49409,9 +45687,8 @@ msgstr "List files in package"
 #: /tmp/fish/implicit/share/completions/yaourt.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:97
 #: /tmp/fish/implicit/share/completions/yaourt.fish:100
-#, fuzzy
 msgid "Search packages for matching files"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:91
 #: /tmp/fish/implicit/share/completions/pacman.fish:69
@@ -49422,48 +45699,41 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:94
 #: /tmp/fish/implicit/share/completions/pacman.fish:72
 #: /tmp/fish/implicit/share/completions/yaourt.fish:101
-#, fuzzy
 msgid "Search for packages that include the given files"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:96
 #: /tmp/fish/implicit/share/completions/yaourt.fish:103
-#, fuzzy
 msgid "Show in machine readable format"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman.fish:74
 msgid "Show in machine readable format: repo\\0pkgname\\0pkgver\\0path\\n"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:1
-#, fuzzy
 msgid "Add or update keys from <file>"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:2
-#, fuzzy
 msgid "Use an alternate config <file>"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:3
-#, fuzzy
 msgid "Remove the <keys> from the keyring"
-msgstr "Remove key from the public keyring"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:4
-#, fuzzy
 msgid "Export <keys> to stdout"
-msgstr "Extract to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:5
 msgid "Present a menu on specified <keys>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:6
-#, fuzzy
 msgid "List a fingerprint for each specified <key>"
-msgstr "Listar todos os arquivos em cada pacote selecionado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:7
 msgid "Alternate home <dir> for GnuPG"
@@ -49486,19 +45756,16 @@ msgid "Initialize the keyring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:12
-#, fuzzy
 msgid "Use the specified <keyserver>"
-msgstr "Usa servidor de chaves especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:13
-#, fuzzy
 msgid "Lists all or specified <keys> from the keyring"
-msgstr "Export all or the given keys from all keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:14
-#, fuzzy
 msgid "Same as --list-keys, but with signatures"
-msgstr "Same as --list-keys, but the signatures are listed too"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:15
 msgid "Locally sign the given <key>"
@@ -49525,9 +45792,8 @@ msgid "Verify the given <signature> file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacman-key.fish:21
-#, fuzzy
 msgid "Displays the program version"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacmd.fish:1
 msgid "Resume"
@@ -49542,78 +45808,64 @@ msgid "Show statistics about memory usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:2
-#, fuzzy
 msgid "Show info about the daemon"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:3
-#, fuzzy
 msgid "Show all loaded things of the specified type"
-msgstr "Show filesystems of specified type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:4
-#, fuzzy
 msgid "Show shorter output"
-msgstr "Parada para saída de terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:5
 msgid "Ask the daemon to exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:6
-#, fuzzy
 msgid "Upload a file to the sample cache"
-msgstr "Select file to store source cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:7
-#, fuzzy
 msgid "Play a sample from the cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:8
-#, fuzzy
 msgid "Remove a sample from the cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactl.fish:10
-#, fuzzy
 msgid "Print help text and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:1
-#, fuzzy
 msgid "Set an alternate database location"
-msgstr "Set a state attribute for a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:2
-#, fuzzy
 msgid "Colorize output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:3
-#, fuzzy
 msgid "Limit the depth of recursion"
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:4
-#, fuzzy
 msgid "Generate output for graphviz's dot"
-msgstr "Generate dotty output for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:5
-#, fuzzy
 msgid "Display this help message"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:6
-#, fuzzy
 msgid "Enable linear output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:7
-#, fuzzy
 msgid "Show reverse dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:8
 msgid "Search sync DBs instead of local"
@@ -49624,9 +45876,8 @@ msgid "Show dependencies with no duplicates (implies -l)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pactree.fish:10
-#, fuzzy
 msgid "Set an alternate configuration file"
-msgstr "Set global configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:1
 msgid ""
@@ -49661,9 +45912,8 @@ msgid "Change to the directory dir immediately"
 msgstr "Change to the directory dir immediately"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:8
-#, fuzzy
 msgid "Use the #ifdef…#endif construct to mark changes"
-msgstr "Use the #ifdef ... #endif construct to mark changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:9
 msgid ""
@@ -49702,9 +45952,8 @@ msgstr ""
 "or when a file is under ClearCase control and does not exist"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:16
-#, fuzzy
 msgid "Read the patch from patchfile"
-msgstr "Read package from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:17
 msgid ""
@@ -49773,9 +46022,8 @@ msgid "Use method to determine backup file names"
 msgstr "Use method to determine backup file names"
 
 #: /tmp/fish/implicit/share/completions/patch.fish:32
-#, fuzzy
 msgid "Output extra information about the work being done"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/patch.fish:33
 msgid "Set internal debugging flags of interest only to patch patchers"
@@ -49802,14 +46050,12 @@ msgstr ""
 "given in context diff headers, UTC, GMT"
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:1
-#, fuzzy
 msgid "Use the ABS tree"
-msgstr "Use no pristine tree"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:2
-#, fuzzy
 msgid "Set the desired package architecture"
-msgstr "Select file to store package cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:3
 msgid "Search the AUR"
@@ -49820,19 +46066,16 @@ msgid "Only search the AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:5
-#, fuzzy
 msgid "Set the output directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:6
-#, fuzzy
 msgid "Display this message"
-msgstr "Display all matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:7
-#, fuzzy
 msgid "Search for upgradable packages"
-msgstr "Print only upgradeable packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:8
 msgid "Search the ABS testing branches"
@@ -49879,9 +46122,8 @@ msgid "Keep text in content stream order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:11
-#, fuzzy
 msgid "Generate simple HTML file"
-msgstr "Generate master file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:12
 msgid "Generate XHTML bounding boxes"
@@ -49892,9 +46134,8 @@ msgid "Sets encoding for the output [UTF-8]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:14
-#, fuzzy
 msgid "Lists the available encodings"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:15
 msgid "Sets the end-of-line convention"
@@ -49905,49 +46146,41 @@ msgid "Don't insert page breaks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:17
-#, fuzzy
 msgid "Specify owner password for the PDF"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:18
-#, fuzzy
 msgid "Specify user password for the PDF"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:19
 #: /tmp/fish/implicit/share/completions/xpdf.fish:28
-#, fuzzy
 msgid "Don't print any messages or errors"
-msgstr "Don't run any tag programs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:20
-#, fuzzy
 msgid "Print copyright and version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:21
 #: /tmp/fish/implicit/share/completions/xpdf.fish:31
-#, fuzzy
 msgid "Print usage information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:1
 #: /tmp/fish/implicit/share/completions/ruby.fish:1
-#, fuzzy
 msgid "Specify record separator"
-msgstr "Specify record separator"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:2
 #: /tmp/fish/implicit/share/completions/ruby.fish:2
-#, fuzzy
 msgid "Turn on autosplit mode"
-msgstr "Turn on autosplit mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:3
 #: /tmp/fish/implicit/share/completions/ruby.fish:3
-#, fuzzy
 msgid "Check syntax"
-msgstr "Check syntax"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:4
 msgid "Control Unicode features"
@@ -49995,9 +46228,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:15
 #: /tmp/fish/implicit/share/completions/ruby.fish:5
-#, fuzzy
 msgid "Debugger"
-msgstr "Debugger"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:16
 msgid "Debugger, with threads"
@@ -50009,18 +46241,16 @@ msgstr "Debug option"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:18
 #: /tmp/fish/implicit/share/completions/ruby.fish:6
-#, fuzzy
 msgid "Execute command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:19
 msgid "Execute command, enable optional features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
-#, fuzzy
 msgid "Disable sitecustomize.pl"
-msgstr "Disable the use of cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:21
 #: /tmp/fish/implicit/share/completions/ruby.fish:8
@@ -50039,31 +46269,26 @@ msgstr "Include path"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:25
 #: /tmp/fish/implicit/share/completions/ruby.fish:11
-#, fuzzy
 msgid "Automatic line ending processing"
-msgstr "Automatic line ending processing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:26
-#, fuzzy
 msgid "Require module"
-msgstr "Require file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:27
-#, fuzzy
 msgid "Use module"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:28
 #: /tmp/fish/implicit/share/completions/ruby.fish:12
-#, fuzzy
 msgid "Loop script"
-msgstr "Loop script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:30
 #: /tmp/fish/implicit/share/completions/ruby.fish:15
-#, fuzzy
 msgid "Define custom switches"
-msgstr "Define custom switches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:32
 msgid "Taint checking, but only with warnings"
@@ -50071,63 +46296,53 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:33
 #: /tmp/fish/implicit/share/completions/ruby.fish:17
-#, fuzzy
 msgid "Taint checking"
-msgstr "Taint checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:34
 msgid "Dump core"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:35
-#, fuzzy
 msgid "Unsafe mode"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:37
-#, fuzzy
 msgid "Display configuration and exit"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:38
-#, fuzzy
 msgid "Show warnings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:39
-#, fuzzy
 msgid "Force warnings"
-msgstr "Supress warnings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:40
-#, fuzzy
 msgid "Disable warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:41
 #: /tmp/fish/implicit/share/completions/ruby.fish:21
-#, fuzzy
 msgid "Extract script"
-msgstr "Extract script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:1
 msgid "Show a filter parameter by modifier"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:2
-#, fuzzy
 msgid "Flush filter params specified by mod"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
-#, fuzzy
 msgid "Output delimiter"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:2
 msgid "List the process name as well as the process ID"
@@ -50142,9 +46357,8 @@ msgid "Open file"
 msgstr "Open file"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:4
-#, fuzzy
 msgid "Start in folder index"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:5
 msgid "Initial set of keystrokes"
@@ -50171,9 +46385,8 @@ msgid "Set global configuration file"
 msgstr "Set global configuration file"
 
 #: /tmp/fish/implicit/share/completions/pine.fish:12
-#, fuzzy
 msgid "Restricted mode"
-msgstr "Restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pine.fish:13
 msgid "Enable suspension support"
@@ -50268,9 +46481,8 @@ msgstr ""
 "interface"
 
 #: /tmp/fish/implicit/share/completions/ping.fish:19
-#, fuzzy
 msgid "Specifies the number of data bytes to be sent"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ping.fish:20
 msgid "Set socket buffer size"
@@ -50305,14 +46517,12 @@ msgid "Time to wait for a response, in seconds"
 msgstr "Time to wait for a response, in seconds"
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:1
-#, fuzzy
 msgid "produce long format output for the specified USERs"
-msgstr "Escreve lo no descritor de arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:2
-#, fuzzy
 msgid "omit the user's home directory and shell in long format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pinky.fish:3
 msgid "omit the user's project file in long format"
@@ -50343,58 +46553,49 @@ msgid "omit the user's full name, remote host and idle time in short format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:1
-#, fuzzy
 msgid "failsafe to overwrite"
-msgstr "Log to file, overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:2
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:3
-#, fuzzy
 msgid "Turn on stats"
-msgstr "Warning control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:3
-#, fuzzy
 msgid "Automated package installation"
-msgstr "Don't change the package installation order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:1
-#, fuzzy
 msgid "Upgrade"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgadd.fish:2
 msgid "Force installation, overwriting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:1
-#, fuzzy
 msgid "Print versions of the specified libraries"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:2
-#, fuzzy
 msgid "Display the version of pkg-config and quit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:3
-#, fuzzy
 msgid "Displays a help message and quit"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:4
-#, fuzzy
 msgid "Print message when errors occur"
-msgstr "Work silently, unless an error occurs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:5
 msgid "Stay quiet when errors occur"
@@ -50413,9 +46614,8 @@ msgid "This prints the -I part of \"--cflags\"."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:10
-#, fuzzy
 msgid "Print link flags"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:11
 msgid "This prints the -L/-R part of \"--libs\"."
@@ -50438,14 +46638,12 @@ msgid "Returns a list of all variables defined in the package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:16
-#, fuzzy
 msgid "Return success if any -uninstalled packages are used"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:17
-#, fuzzy
 msgid "Test if a package has at most the specified version"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:18
 msgid "Test if a package has at least this version"
@@ -50456,9 +46654,8 @@ msgid "Test if a package has exactly this version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:20
-#, fuzzy
 msgid "Test if a package exists"
-msgstr "Verificar a integridade do pacote"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:21
 msgid "Output libraries suitable for static linking"
@@ -50469,23 +46666,20 @@ msgid "List all modules found in the pkg-config path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:23
-#, fuzzy
 msgid "List all modules the given packages provides"
-msgstr "List capabilities this package provides"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:24
-#, fuzzy
 msgid "List all modules the given packages requires"
-msgstr "List capabilities this package provides"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg-config.fish:25
 msgid "List all modules the given packages requires for static linking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_delete.fish:2
-#, fuzzy
 msgid "Delete unsed deps"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:3
 msgid "only show files in a {s}bin/ directory. Works with -s, -l"
@@ -50496,38 +46690,32 @@ msgid "make searches case sensitive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:5
-#, fuzzy
 msgid "allow the use of * and ? as wildcards"
-msgstr "Do not expand pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:6
-#, fuzzy
 msgid "allow the use of regex in searches"
-msgstr "Never allow the use of specified cipher algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:7
-#, fuzzy
 msgid "search only in the specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:8
-#, fuzzy
 msgid "enable verbose output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:9
-#, fuzzy
 msgid "provides information about the package owning a file"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:10
 msgid "list files of a given package; similar to \"pacman -Ql\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:11
-#, fuzzy
 msgid "search which package owns a file"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:12
 msgid ""
@@ -50536,19 +46724,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:2
-#, fuzzy
 msgid "Show debug information"
-msgstr "Show whatis information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:3
-#, fuzzy
 msgid "List subcommands"
-msgstr "Lista por colunas"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:4
-#, fuzzy
 msgid "Set configuration option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:5
 msgid "Run sanity test"
@@ -50563,19 +46748,16 @@ msgid "Run package manager within chroot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:8
-#, fuzzy
 msgid "Install packages in specified root"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:9
-#, fuzzy
 msgid "Use configuration file"
-msgstr "Arquivo de configuração"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:10
-#, fuzzy
 msgid "Set repository configuration directory"
-msgstr "Não foi possível encontrar o diretório home"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:11
 msgid "Use IPv4"
@@ -50586,64 +46768,53 @@ msgid "Use IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:13
-#, fuzzy
 msgid "Display help for command"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:14
-#, fuzzy
 msgid "Install package file"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:15
-#, fuzzy
 msgid "Modify annotations on packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:16
-#, fuzzy
 msgid "Audit installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:17
-#, fuzzy
 msgid "Delete unneeded packages"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:18
 msgid "Dump package database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:19
-#, fuzzy
 msgid "Check installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:20
-#, fuzzy
 msgid "Clean local cache"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:21
-#, fuzzy
 msgid "Convert package from pkg_add format"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:22
-#, fuzzy
 msgid "Create a package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:23
 #: /tmp/fish/implicit/share/completions/pkg.fish:31
-#, fuzzy
 msgid "Remove a package"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:24
-#, fuzzy
 msgid "Download a remote package"
-msgstr "Download and extract a source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:26
 #: /tmp/fish/implicit/share/completions/zypper.fish:3
@@ -50652,45 +46823,37 @@ msgid "Install packages"
 msgstr "Instalar pacotes"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:27
-#, fuzzy
 msgid "Prevent package modification"
-msgstr "Print package name/distro"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:28
-#, fuzzy
 msgid "List package manager plugins"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:29
 #: /tmp/fish/implicit/share/completions/rpm.fish:95
-#, fuzzy
 msgid "Query installed packages"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:30
-#, fuzzy
 msgid "Register a package in a database"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:32
-#, fuzzy
 msgid "Create package repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:33
-#, fuzzy
 msgid "Query information for remote repositories"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:34
-#, fuzzy
 msgid "Find packages"
-msgstr "Upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:35
-#, fuzzy
 msgid "Modify package information in database"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:36
 msgid "Open a SQLite shell"
@@ -50701,36 +46864,32 @@ msgid "Display packages linking to shared library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:38
-#, fuzzy
 msgid "Display package statistics"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:39
 msgid "Stop preventing package modification"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:40
-#, fuzzy
 msgid "Update remote repositories"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:41
 msgid "Display UPDATING entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:43
-#, fuzzy
 msgid "Show package versions"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:44
 msgid "Check which package provides a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:45
-#, fuzzy
 msgid "Mark packages as automatic"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:46
 msgid "Force installation even when installed"
@@ -50738,207 +46897,171 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:47
 #: /tmp/fish/implicit/share/completions/pkg.fish:61
-#, fuzzy
 msgid "Disable installation scripts"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:48
 #: /tmp/fish/implicit/share/completions/pkg.fish:62
-#, fuzzy
 msgid "Force installation with missing dependencies"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:49
-#, fuzzy
 msgid "Force quiet output"
-msgstr "Saída forçada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:50
-#, fuzzy
 msgid "Do not make changes"
-msgstr "Don't summarize changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:51
-#, fuzzy
 msgid "Assume yes when asked for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:52
-#, fuzzy
 msgid "Delete all cached packages"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:53
-#, fuzzy
 msgid "Delete all installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:54
-#, fuzzy
 msgid "Case sensitive packages"
-msgstr "Erase built packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:55
-#, fuzzy
 msgid "Disable deinstallation scripts"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:56
-#, fuzzy
 msgid "Force package removal"
-msgstr "Ignore package Holds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:57
 msgid "Treat the package name as shell glob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:58
-#, fuzzy
 msgid "Case insensitive packages"
-msgstr "Case insensitive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:59
-#, fuzzy
 msgid "Remove recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:60
 msgid "Treat the package name as regular expression"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:63
-#, fuzzy
 msgid "Do not perform actual installation"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:64
-#, fuzzy
 msgid "Reinstall packages required by this package"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:65
-#, fuzzy
 msgid "Use only a given repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:66
-#, fuzzy
 msgid "Do not automatically update database"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:67
-#, fuzzy
 msgid "Force a full download of a repository"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:2
-#, fuzzy
 msgid "Package whose files to list"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:3
-#, fuzzy
 msgid "Print the package owning file matching pattern"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:4
-#, fuzzy
 msgid "Print footprint for file"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:5
-#, fuzzy
 msgid "Specify alternative installation root"
-msgstr "Specify installroot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkginfo.fish:6
-#, fuzzy
 msgid "Print version of pkgutils"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:1
-#, fuzzy
 msgid "Install with pkgadd after build"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:2
 msgid "Upgrade with pkgadd after build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:3
-#, fuzzy
 msgid "Search and build packages recursively"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:4
-#, fuzzy
 msgid "Download the sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:5
-#, fuzzy
 msgid "Only download the sources"
-msgstr "Do not download source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:6
-#, fuzzy
 msgid "Check if the package is uptodate"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:39
 #: /tmp/fish/implicit/share/completions/prt-get.fish:98
-#, fuzzy
 msgid "Update footprint"
-msgstr "Update mirror list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:40
 #: /tmp/fish/implicit/share/completions/prt-get.fish:99
-#, fuzzy
 msgid "Ignore footprint"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:37
 #: /tmp/fish/implicit/share/completions/prt-get.fish:96
-#, fuzzy
 msgid "Update md5sum"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:38
 #: /tmp/fish/implicit/share/completions/prt-get.fish:97
-#, fuzzy
 msgid "Ignore md5sum"
-msgstr "Ignore case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:11
-#, fuzzy
 msgid "Do not strip executables"
-msgstr "Make scripts executable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:36
 #: /tmp/fish/implicit/share/completions/prt-get.fish:95
-#, fuzzy
 msgid "Force rebuild"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:13
-#, fuzzy
 msgid "Remove package and sources"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:14
-#, fuzzy
 msgid "Keep working dir"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:15
-#, fuzzy
 msgid "Use another config"
-msgstr "Use pattern from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgrm.fish:1
 msgid "Package to remove"
@@ -50968,14 +47091,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:6
-#, fuzzy
 msgid "Displays help information"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:7
-#, fuzzy
 msgid "Prints the version and exits"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:1
 msgid "run 'make config' for all ports (overrides -G)."
@@ -51018,9 +47139,8 @@ msgid "recurse dependencies thoroughly, using all-depends-list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:11
-#, fuzzy
 msgid "verbose output."
-msgstr "Verbose prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:12
 msgid "save old shared libraries before deinstall [-R]… [See Man Page]"
@@ -51031,9 +47151,8 @@ msgid "interactive update mode -- ask whether to rebuild ports."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:14
-#, fuzzy
 msgid "no cleaning of distfiles."
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:15
 msgid "always clean distfiles."
@@ -51068,9 +47187,8 @@ msgid "use the INDEX for status, but double-check with the port."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:23
-#, fuzzy
 msgid "do not try to use /usr/ports."
-msgstr "Do not try to use the GnuPG-Agent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:24
 msgid "delete ports that are build-only dependencies a… [See Man Page]"
@@ -51089,18 +47207,16 @@ msgid "fail if no package is available."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:28
-#, fuzzy
 msgid "use packages for all build dependencies."
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:29
 msgid "use package if newer than installed even if the… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:30
-#, fuzzy
 msgid "fetch package even if it already exists locally."
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:31
 msgid "where local packages can be found, will fall ba… [See Man Page]"
@@ -51147,32 +47263,28 @@ msgid "answer yes to all user prompts for the features… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:42
-#, fuzzy
 msgid "display help message."
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:43
 msgid "display the version number El ENVIRONMENT The d… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:44
-#, fuzzy
 msgid "Ports Directory"
-msgstr "Directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:45
 msgid "Installed Package"
 msgstr "Pacote instalado"
 
 #: /tmp/fish/implicit/share/completions/ports.fish:1
-#, fuzzy
 msgid "Update ports"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:2
-#, fuzzy
 msgid "List ports"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ports.fish:3
 msgid "List version diffs between local and installed ports"
@@ -51199,14 +47311,12 @@ msgid "Just write wtmp record"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:7
-#, fuzzy
 msgid "Don't write wtmp record"
-msgstr "Don't remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poweroff.fish:8
-#, fuzzy
 msgid "Don't send wall message"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:2
 #: /tmp/fish/implicit/share/completions/prt-get.fish:62
@@ -51218,15 +47328,13 @@ msgstr "Porta"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:3
 #: /tmp/fish/implicit/share/completions/prt-get.fish:64
-#, fuzzy
 msgid "Install listed ports"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:4
 #: /tmp/fish/implicit/share/completions/prt-get.fish:65
-#, fuzzy
 msgid "Install listed ports and their deps"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:5
 #: /tmp/fish/implicit/share/completions/prt-get.fish:66
@@ -51235,33 +47343,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:6
 #: /tmp/fish/implicit/share/completions/prt-get.fish:67
-#, fuzzy
 msgid "Update listed packages"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:7
 #: /tmp/fish/implicit/share/completions/prt-get.fish:68
-#, fuzzy
 msgid "Remove listed packages"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:8
 #: /tmp/fish/implicit/share/completions/prt-get.fish:69
-#, fuzzy
 msgid "Update all outdated installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:9
 #: /tmp/fish/implicit/share/completions/prt-get.fish:70
-#, fuzzy
 msgid "Do not update this in sysup"
-msgstr "Do not propagate times for matching symbols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:10
 #: /tmp/fish/implicit/share/completions/prt-get.fish:71
-#, fuzzy
 msgid "Remove this from lock"
-msgstr "Remove source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:11
 #: /tmp/fish/implicit/share/completions/prt-get.fish:72
@@ -51270,9 +47373,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:12
 #: /tmp/fish/implicit/share/completions/prt-get.fish:73
-#, fuzzy
 msgid "Search for an expr in port names"
-msgstr "Prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:13
 #: /tmp/fish/implicit/share/completions/prt-get.fish:74
@@ -51281,22 +47383,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:14
 #: /tmp/fish/implicit/share/completions/prt-get.fish:75
-#, fuzzy
 msgid "Print info on a port"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:15
 #: /tmp/fish/implicit/share/completions/prt-get.fish:76
-#, fuzzy
 msgid "Search for a pattern in the footprints in the ports tree"
 msgstr ""
-"Searches for matches of the supplied string in the current local portage tree"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:16
 #: /tmp/fish/implicit/share/completions/prt-get.fish:77
-#, fuzzy
 msgid "Print the path of a port"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:17
 #: /tmp/fish/implicit/share/completions/prt-get.fish:78
@@ -51305,15 +47403,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:18
 #: /tmp/fish/implicit/share/completions/prt-get.fish:79
-#, fuzzy
 msgid "Print a list of deps for the listed ports"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:19
 #: /tmp/fish/implicit/share/completions/prt-get.fish:80
-#, fuzzy
 msgid "Print a simple list of deps for the listed ports"
-msgstr "Print suppressions for detected errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:20
 #: /tmp/fish/implicit/share/completions/prt-get.fish:81
@@ -51321,56 +47417,47 @@ msgid "Print a deptree for the port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:21
-#, fuzzy
 msgid "List ports in multiple directories"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:22
 #: /tmp/fish/implicit/share/completions/prt-get.fish:82
-#, fuzzy
 msgid "List all the ports"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:23
 #: /tmp/fish/implicit/share/completions/prt-get.fish:83
-#, fuzzy
 msgid "Print formatted list of ports"
-msgstr "Imprime texto formatado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:25
 #: /tmp/fish/implicit/share/completions/prt-get.fish:85
-#, fuzzy
 msgid "List installed packages which have no dependent packages"
-msgstr "List packages on which this package depends"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:26
-#, fuzzy
 msgid "Check if a port is installed"
-msgstr "Query installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:27
 #: /tmp/fish/implicit/share/completions/prt-get.fish:86
-#, fuzzy
 msgid "Print the version of an installed package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:28
 #: /tmp/fish/implicit/share/completions/prt-get.fish:87
-#, fuzzy
 msgid "Print the listing of the directory of a port"
-msgstr "Imprime o diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:29
 #: /tmp/fish/implicit/share/completions/prt-get.fish:88
-#, fuzzy
 msgid "Print a file in a port to stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:30
 #: /tmp/fish/implicit/share/completions/prt-get.fish:89
-#, fuzzy
 msgid "Edit a file in a port"
-msgstr "Edit files in-place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:31
 #: /tmp/fish/implicit/share/completions/prt-get.fish:90
@@ -51379,44 +47466,37 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:32
 #: /tmp/fish/implicit/share/completions/prt-get.fish:91
-#, fuzzy
 msgid "Print the configuration of prt-get"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:33
 #: /tmp/fish/implicit/share/completions/prt-get.fish:92
-#, fuzzy
 msgid "Show the current version of prt-get"
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:34
 #: /tmp/fish/implicit/share/completions/prt-get.fish:93
-#, fuzzy
 msgid "Create a cache for prt-get"
-msgstr "Create summary change report"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:41
 #: /tmp/fish/implicit/share/completions/prt-get.fish:100
-#, fuzzy
 msgid "No stripping"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:42
 #: /tmp/fish/implicit/share/completions/prt-get.fish:101
-#, fuzzy
 msgid "Keep work directory"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:43
 #: /tmp/fish/implicit/share/completions/prt-get.fish:102
-#, fuzzy
 msgid "Ignore the listed ports"
-msgstr "Ignore first line of input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:44
-#, fuzzy
 msgid "Use cache"
-msgstr "Set cache dir"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:46
 #: /tmp/fish/implicit/share/completions/prt-get.fish:104
@@ -51435,27 +47515,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:49
 #: /tmp/fish/implicit/share/completions/prt-get.fish:107
-#, fuzzy
 msgid "Ignore default config file"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:50
 #: /tmp/fish/implicit/share/completions/prt-get.fish:108
-#, fuzzy
 msgid "Prepend string to config file"
-msgstr "Prepend string to relative links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:51
 #: /tmp/fish/implicit/share/completions/prt-get.fish:109
-#, fuzzy
 msgid "Append string to config file"
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:52
 #: /tmp/fish/implicit/share/completions/prt-get.fish:110
-#, fuzzy
 msgid "Overrirde config file with string"
-msgstr "Overwrite modified files with clean copies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:54
 #: /tmp/fish/implicit/share/completions/prt-get.fish:112
@@ -51474,21 +47550,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:57
 #: /tmp/fish/implicit/share/completions/prt-get.fish:115
-#, fuzzy
 msgid "Prefer higher version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:58
 #: /tmp/fish/implicit/share/completions/prt-get.fish:116
-#, fuzzy
 msgid "Override prefer-higher"
-msgstr "Override framerate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:59
 #: /tmp/fish/implicit/share/completions/prt-get.fish:117
-#, fuzzy
 msgid "Use alternative config file"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:60
 #: /tmp/fish/implicit/share/completions/prt-get.fish:118
@@ -51497,9 +47570,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:61
 #: /tmp/fish/implicit/share/completions/prt-get.fish:119
-#, fuzzy
 msgid "Write output to log file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:1
 #: /tmp/fish/implicit/share/completions/ps.fish:5
@@ -51570,9 +47642,8 @@ msgid "Add column for security data"
 msgstr "Add column for security data"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:19
-#, fuzzy
 msgid "Show different scheduler information for the -l option"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:20
 msgid "Full format"
@@ -51599,9 +47670,8 @@ msgid "Wide output"
 msgstr "Wide output"
 
 #: /tmp/fish/implicit/share/completions/ps.fish:29
-#, fuzzy
 msgid "Set screen width"
-msgstr "Assume screen width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:30
 msgid "Include dead child process data"
@@ -51612,34 +47682,28 @@ msgid "Repead header lines, one per page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:32
-#, fuzzy
 msgid "Print no headers"
-msgstr "Print line of headings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:33
-#, fuzzy
 msgid "Set screen height"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:34
-#, fuzzy
 msgid "Spericy sorting order"
-msgstr "Set mail sort order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:35
-#, fuzzy
 msgid "Show threads. With LWP/NLWP"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:36
-#, fuzzy
 msgid "Show threads. With SPID"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:37
-#, fuzzy
 msgid "Show threads after processes"
-msgstr "Stop after preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:1
 msgid "database name to connect to"
@@ -51650,51 +47714,44 @@ msgid "run only single command (SQL or internal) and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
-#, fuzzy
 msgid "execute commands from file, then exit"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
-#, fuzzy
 msgid "list available databases, then exit"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:5
 msgid "do not read startup file (~/.psqlrc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:6
-#, fuzzy
 msgid "execute command file as a single transaction"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:7
-#, fuzzy
 msgid "show this help, then exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:8
-#, fuzzy
 msgid "output version information, then exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:9
 msgid "echo all input from script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:10
-#, fuzzy
 msgid "echo commands sent to server"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:11
 msgid "display queries that internal commands generate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:12
-#, fuzzy
 msgid "send session log to file"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:13
 msgid "disable enhanced command line editing (readline)"
@@ -51717,9 +47774,8 @@ msgid "single-line mode (end of line terminates SQL command)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:18
-#, fuzzy
 msgid "unaligned table output mode"
-msgstr "Give human readable output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:19
 msgid "HTML table output mode"
@@ -51730,18 +47786,16 @@ msgid "set printing option VAR to ARG (see \\pset command)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:21
-#, fuzzy
 msgid "print rows only"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:22
 msgid "set HTML table tag attributes (e.g., width, border)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:23
-#, fuzzy
 msgid "turn on expanded table output"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:24
 msgid "set field separator (default: '|')"
@@ -51760,14 +47814,12 @@ msgid "database server port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:28
-#, fuzzy
 msgid "database user name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:29
-#, fuzzy
 msgid "never prompt for password"
-msgstr "Never prompt before removal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:30
 msgid "force password prompt (should happen automatically)"
@@ -51782,47 +47834,40 @@ msgid "Turn progress bar on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:2
-#, fuzzy
 msgid "Show timer"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:3
-#, fuzzy
 msgid "Show estimated time left"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:4
 msgid "Show estimated time of arrival"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:5
-#, fuzzy
 msgid "Show rate counter"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:6
-#, fuzzy
 msgid "Show average rate"
-msgstr "Show packages in cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:7
-#, fuzzy
 msgid "Show total byte counter"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:8
 msgid "Show transfer buffer percentage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:9
-#, fuzzy
 msgid "Show the last NUM bytes written"
-msgstr "Print total bytes written"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:10
-#, fuzzy
 msgid "Set output format"
-msgstr "Specify output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:13
 msgid "Wait for first byte before showing progress"
@@ -51833,43 +47878,36 @@ msgid "Wait given time (in secs) before showing progress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:15
-#, fuzzy
 msgid "Set total number of bytes to be transfered"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:16
 msgid "Count lines instead of bytes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:17
-#, fuzzy
 msgid "Count null-terminated lines"
-msgstr "-T has null-terminated names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:18
-#, fuzzy
 msgid "Wait given time (in secs) between updates"
-msgstr "Wait time between retries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:19
-#, fuzzy
 msgid "Set terminal width"
-msgstr "Parada para entrada de terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:20
-#, fuzzy
 msgid "Set terminal height"
-msgstr "Parada para entrada de terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:21
-#, fuzzy
 msgid "Prefix output with given name"
-msgstr "Specify output filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:22
-#, fuzzy
 msgid "Force output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:23
 msgid "Use cursor positioning escape sequence instead of \\r"
@@ -51884,14 +47922,12 @@ msgid "Use transfer buffer size (in bytes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:26
-#, fuzzy
 msgid "Don't use slice"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:27
-#, fuzzy
 msgid "Ignore read errors"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:28
 msgid "Stop transfer after given number of bytes"
@@ -51914,20 +47950,17 @@ msgid "Report colourised filesystem disk space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:2
-#, fuzzy
 msgid "show this help message"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:3
 #: /tmp/fish/implicit/share/completions/quilt.fish:2
-#, fuzzy
 msgid "show version"
-msgstr "Source tree version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:4
-#, fuzzy
 msgid "include filesystems having 0 blocks"
-msgstr "Exclui sistemas de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:5
 msgid "print sizes in human readable format (e.g., 1K 234M 2G)"
@@ -51942,14 +47975,12 @@ msgid "use BLOCKSIZE-byte blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:8
-#, fuzzy
 msgid "limit listing to local filesystems"
-msgstr "List only local filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:9
-#, fuzzy
 msgid "like --block-size=1024"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:10
 msgid "like --block-size=1048576"
@@ -51964,9 +47995,8 @@ msgid "use filesystem native block size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:13
-#, fuzzy
 msgid "do not use colours"
-msgstr "Usa cores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pydf.fish:14
 msgid ""
@@ -51985,48 +48015,40 @@ msgid "show inode instead of block usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:1
-#, fuzzy
 msgid "Set output file"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:2
-#, fuzzy
 msgid "Read one line at a time"
-msgstr "Print name, line, and time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:3
-#, fuzzy
 msgid "Set lexer"
-msgstr "Set severity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:4
 msgid "Guess lexer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:5
-#, fuzzy
 msgid "Set formater"
-msgstr "Set format file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:6
-#, fuzzy
 msgid "Set coma-seperated options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:7
-#, fuzzy
 msgid "Set one option"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:8
-#, fuzzy
 msgid "Set filter"
-msgstr "Set tag file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:9
-#, fuzzy
 msgid "Print style definition for given style"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:10
 msgid "List lexers, formaters, styles or filters"
@@ -52037,18 +48059,16 @@ msgid "Guess and print lexer name based on given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:12
-#, fuzzy
 msgid "Print detailed help"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:13
 msgid "Print detailed traceback on unhandled exceptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:15
-#, fuzzy
 msgid "Print package version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:1
 #: /tmp/fish/implicit/share/completions/python3.fish:1
@@ -52101,16 +48121,14 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:10
 #: /tmp/fish/implicit/share/completions/python3.fish:10
 #: /tmp/fish/implicit/share/completions/python.fish:11
-#, fuzzy
 msgid "Disable import of site module"
-msgstr "Disable import of site module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:11
 #: /tmp/fish/implicit/share/completions/python3.fish:11
 #: /tmp/fish/implicit/share/completions/python.fish:12
-#, fuzzy
 msgid "Unbuffered input and output"
-msgstr "Unbuffered input and output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:14
 #: /tmp/fish/implicit/share/completions/python3.fish:14
@@ -52127,9 +48145,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:16
 #: /tmp/fish/implicit/share/completions/python3.fish:16
 #: /tmp/fish/implicit/share/completions/python.fish:17
-#, fuzzy
 msgid "Read program from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:18
@@ -52138,9 +48155,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:19
-#, fuzzy
 msgid "Warn on mixed tabs and spaces"
-msgstr "Warn on mixed tabs and spaces"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:20
@@ -52155,15 +48171,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:17
 #: /tmp/fish/implicit/share/completions/python.fish:21
-#, fuzzy
 msgid "Don't print version and copyright messages on interactive startup"
-msgstr "Ignore version magic information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:22
-#, fuzzy
 msgid "Set implementation-specific option"
-msgstr "Edita compleções específicas para um comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:23
@@ -52174,38 +48188,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:20
 #: /tmp/fish/implicit/share/completions/python.fish:24
-#, fuzzy
 msgid "Issue errors"
-msgstr "Ignore errors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:3
-#, fuzzy
 msgid "specify the file to Run Control file to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:4
 msgid "Runs the command in bash trace mode (-x). For internal debugging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:5
-#, fuzzy
 msgid "Add one or more files to the topmost or named patch"
-msgstr "Adicionar um ou mais novos arquivos ou diretórios"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:6
-#, fuzzy
 msgid "Print an annotated listing of the specified file"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:7
-#, fuzzy
 msgid "Print a list of applied patches"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:8
-#, fuzzy
 msgid "Remove the specified or topmost patch from the series file"
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:9
 msgid ""
@@ -52213,14 +48221,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:10
-#, fuzzy
 msgid "Edit the specified file(s) in /usr/bin/vim"
-msgstr "Add specified file to the current list of keyrings"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:11
-#, fuzzy
 msgid "Print the list of files that the topmost or specified patch changes"
-msgstr "Define a lista de preferências padrão como a string especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:12
 msgid ""
@@ -52270,9 +48276,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:21
-#, fuzzy
 msgid "Print the list of patches that modify the specified file"
-msgstr "Define a lista de preferências padrão como a string especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:22
 msgid ""
@@ -52281,36 +48286,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:23
-#, fuzzy
 msgid "Apply patch(es) from the series file"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:24
 msgid "Refreshes the specified patch, or the topmost patch by default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:25
-#, fuzzy
 msgid "Remove one or more files from the topmost or named patch"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:26
 msgid "Rename the topmost or named patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:27
-#, fuzzy
 msgid "Print the names of all patches in the series file"
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:28
 msgid " Initializes a source tree from an rpm spec file or a quilt series file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:29
-#, fuzzy
 msgid " Take a snapshot of the current working state"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/quilt.fish:30
 msgid ""
@@ -52330,24 +48331,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:1
-#, fuzzy
 msgid "Activate debug mode"
-msgstr "Sets debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:2
-#, fuzzy
 msgid "Activate clean mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:3
-#, fuzzy
 msgid "Change configuration directory"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:4
-#, fuzzy
 msgid "Create copies of the default configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:5
 msgid "Pick file with ranger"
@@ -52358,9 +48355,8 @@ msgid "Pick multiple files with ranger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:7
-#, fuzzy
 msgid "Pick directory"
-msgstr "Recurse directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:8
 msgid "Open ranger with given file selected"
@@ -52379,24 +48375,20 @@ msgid "Print statistics of CPU usage on exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:12
-#, fuzzy
 msgid "Execute command after configuration file read"
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:1
-#, fuzzy
 msgid "List all rbenv commands"
-msgstr "Disable this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:2
-#, fuzzy
 msgid "Set or show the global Ruby version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:3
-#, fuzzy
 msgid "Install a ruby version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:4
 msgid "Set or show the local directory-specific Ruby version"
@@ -52411,27 +48403,24 @@ msgid "Rehash rbenv shims (run this after installing binaries)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:7
-#, fuzzy
 msgid "rbenv root folder"
-msgstr "Open folder"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:8
 msgid "Set or show the shell-specific Ruby version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:9
-#, fuzzy
 msgid "Show the current Ruby version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:10
 msgid "List all Ruby versions known by rbenv"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:11
-#, fuzzy
 msgid "List all Ruby versions with the given command"
-msgstr "Run fish with this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:12
 msgid "Show the full path for the given Ruby command"
@@ -52442,33 +48431,28 @@ msgid "Tests if the service exists or not"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:2
-#, fuzzy
 msgid "List all available services"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:3
-#, fuzzy
 msgid "Display the help output"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:5
-#, fuzzy
 msgid "Display software version"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:6
-#, fuzzy
 msgid "Run verbosely"
-msgstr "Do not overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rc-service.fish:7
 msgid "Run quietly (Does not affect errors)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:2
-#, fuzzy
 msgid "Set prompt command"
-msgstr "Select by command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:3
 #: /tmp/fish/implicit/share/completions/set.fish:4
@@ -52513,18 +48497,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:11
-#, fuzzy
 msgid "Read the specified number of characters"
-msgstr "Compare only specified number of characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:12
 msgid "Store the results as an array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:13
-#, fuzzy
 msgid "Set right-hand prompt command"
-msgstr "Obtém ou altera o buffer da linha de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:1
 msgid "Canonicalize, follow symlinks, last can be missing"
@@ -52543,18 +48525,16 @@ msgid "Do not output the trailing newline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:6
-#, fuzzy
 msgid "Report error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:1
 msgid "all components of the path must exist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:2
-#, fuzzy
 msgid "no components of the path need exist"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:3
 msgid "resolve '..' components before symlinks"
@@ -52565,9 +48545,8 @@ msgid "resolve symlinks as encountered (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:5
-#, fuzzy
 msgid "suppress most error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:6
 msgid "print the resolved path relative to FILE"
@@ -52578,9 +48557,8 @@ msgid "print absolute paths unless paths below FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:8
-#, fuzzy
 msgid "don't expand symlinks"
-msgstr "Não segue links simbólicos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/realpath.fish:9
 msgid "separate output with NUL rather than newline"
@@ -52623,23 +48601,20 @@ msgid "Remove each component of path"
 msgstr "Remove each component of path"
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
-#, fuzzy
 msgid "Prints the help text."
-msgstr "Imprime texto formatado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:2
 msgid "Send errors to syslog instead of standard error."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:3
-#, fuzzy
 msgid "Print messages about what the program is doing."
-msgstr "Print messages about what the program is doing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:4
-#, fuzzy
 msgid "Show version of program and exit"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:5
 msgid ""
@@ -52648,37 +48623,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:2
-#, fuzzy
 msgid "Do not execute logon and logoff macros"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:3
 msgid "Exit after processing commandline macro files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:4
-#, fuzzy
 msgid "Do not show splashscreen"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:5
-#, fuzzy
 msgid "Exit on exception"
-msgstr "Exit on second EOF"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:7
-#, fuzzy
 msgid "Print ./configure options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/root.fish:8
 msgid "Run with memory usage monitoring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:5
-#, fuzzy
 msgid "List of rpm configuration files"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:6
 msgid "Pipe output through specified command"
@@ -52689,183 +48659,141 @@ msgid "Specify directory for rpm database"
 msgstr "Specify directory for rpm database"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:8
-#, fuzzy
 msgid "Specify root directory for rpm operations"
-msgstr "Specify directory for rpm database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:9
-#, fuzzy
 msgid "Add suggested packages to the transaction set when needed"
-msgstr "Add suggested packages to the transaction set when needed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:10
-#, fuzzy
 msgid ""
 "Installs or upgrades all the files in the package, even if they aren't "
 "needed (missingok) and don't exist"
 msgstr ""
-"Installs or upgrades all the files in the package, even if they aren't "
-"needed (missingok) and don't exist"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:11
-#, fuzzy
 msgid ""
 "Used with --relocate, permit relocations on all file paths, not just those "
 "OLD-PATH's included in the binary package relocation hint(s)"
 msgstr ""
-"Used with --relocate, permit relocations on all file paths, not just those "
-"OLD-PATH's included in the binary package relocation hint(s)"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:12
-#, fuzzy
 msgid "Don't install files whose name begins with specified path"
-msgstr "Don't install files whose name begins with specified path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:13
-#, fuzzy
 msgid "Don't install any files which are marked as documentation"
-msgstr "Don't install any files which are marked as documentation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:14
-#, fuzzy
 msgid "Same as using --replacepkgs, --replacefiles, and --oldpackage"
-msgstr "Same as using --replacepkgs, --replacefiles, and --oldpackage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:15
-#, fuzzy
 msgid "Print 50 hash marks as the package archive is unpacked"
-msgstr "Print 50 hash marks as the package archive is unpacked"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:16
-#, fuzzy
 msgid "Don't check for sufficient disk space before installation"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:17
-#, fuzzy
 msgid ""
 "Allow installation or upgrading even if the architectures of the binary "
 "package and host don't match"
 msgstr ""
-"Allow installation or upgrading even if the architectures of the binary "
-"package and host don't match"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:18
-#, fuzzy
 msgid ""
 "Allow installation or upgrading even if the operating systems of the binary "
 "package and host don't match"
 msgstr ""
-"Allow installation or upgrading even if the operating systems of the binary "
-"package and host don't match"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:19
-#, fuzzy
 msgid "Install documentation files (default)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:20
-#, fuzzy
 msgid "Update only the database, not the filesystem"
-msgstr "Update only the database, not the filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:21
 #: /tmp/fish/implicit/share/completions/rpm.fish:70
-#, fuzzy
 msgid "Don't verify package or header digests when reading"
-msgstr "Don't verify package or header digests when reading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:22
 #: /tmp/fish/implicit/share/completions/rpm.fish:73
-#, fuzzy
 msgid "Don't verify package or header signatures when reading"
-msgstr "Don't verify package or header signatures when reading"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:23
-#, fuzzy
 msgid "Don't do a dependency check"
-msgstr "Don't do a dependency check"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:24
-#, fuzzy
 msgid "Don't suggest package(s) that provide a missing dependency"
-msgstr "Don't suggest package(s) that provide a missing dependency"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:25
-#, fuzzy
 msgid "Don't change the package installation order"
-msgstr "Don't change the package installation order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:26
-#, fuzzy
 msgid "Don't execute scripts"
-msgstr "Don't execute scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:27
-#, fuzzy
 msgid "Don't execute pre scripts"
-msgstr "Don't execute pre scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:28
-#, fuzzy
 msgid "Don't execute post scripts"
-msgstr "Don't execute post scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:29
-#, fuzzy
 msgid "Don't execute preun scripts"
-msgstr "Don't execute preun scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:30
-#, fuzzy
 msgid "Don't execute postun scripts"
-msgstr "Don't execute postun scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:31
 #: /tmp/fish/implicit/share/completions/rpm.fish:87
-#, fuzzy
 msgid "Don't execute trigger scriptlets"
-msgstr "Don't execute trigger scriptlets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:32
-#, fuzzy
 msgid "Don't execute triggerin scriptlets"
-msgstr "Don't execute triggerin scriptlets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:33
 #: /tmp/fish/implicit/share/completions/rpm.fish:88
-#, fuzzy
 msgid "Don't execute triggerun scriptlets"
-msgstr "Don't execute triggerun scriptlets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:34
 #: /tmp/fish/implicit/share/completions/rpm.fish:89
-#, fuzzy
 msgid "Don't execute triggerpostun scriptlets"
-msgstr "Don't execute triggerpostun scriptlets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:35
-#, fuzzy
 msgid "Allow an upgrade to replace a newer package with an older one"
-msgstr "Allow an upgrade to replace a newer package with an older one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:36
-#, fuzzy
 msgid ""
 "Print percentages as files are unpacked from the package archive. This is "
 "intended to make rpm easy to run from other tools"
 msgstr ""
-"Print percentages as files are unpacked from the package archive. This is "
-"intended to make rpm easy to run from other tools"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:37
-#, fuzzy
 msgid ""
 "For relocatable binary packages, translate all file paths that start with "
 "the installation prefix in the package relocation hint(s) to NEWPATH"
 msgstr ""
-"For relocatable binary packages, translate all file paths that start with "
-"the installation prefix in the package relocation hint(s) to NEWPATH"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:38
 msgid ""
@@ -52877,266 +48805,205 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:39
 #: /tmp/fish/implicit/share/completions/rpm.fish:90
-#, fuzzy
 msgid "Re-package the files before erasing"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:40
-#, fuzzy
 msgid ""
 "Install the packages even if they replace files from other, already "
 "installed, packages"
 msgstr ""
-"Install the packages even if they replace files from other, already "
-"installed, packages"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:41
-#, fuzzy
 msgid ""
 "Install the packages even if some of them are already installed on this "
 "system"
 msgstr ""
-"Install the packages even if some of them are already installed on this "
-"system"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:42
-#, fuzzy
 msgid ""
 "Don't install the package, simply check for and report potential conflicts"
 msgstr ""
-"Don't install the package, simply check for and report potential conflicts"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:43
-#, fuzzy
 msgid "Display change information for the package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:44
-#, fuzzy
 msgid "List only configuration files (implies -l)"
-msgstr "List only configuration files (implies -l)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:45
-#, fuzzy
 msgid "List only documentation files (implies -l)"
-msgstr "List only documentation files (implies -l)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:46
-#, fuzzy
 msgid "Dump file information. Must be used with at least one of -l, -c, -d"
-msgstr "Dump file information. Must be used with at least one of -l, -c, -d"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:47
 msgid "List all the files in each selected package"
 msgstr "Listar todos os arquivos em cada pacote selecionado"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:48
-#, fuzzy
 msgid ""
 "Display package information, including name, version, and description. Uses "
 "--queryformat if specified"
 msgstr ""
-"Display package information, including name, version, and description. Uses "
-"--queryformat if specified"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:49
-#, fuzzy
 msgid "Orders the package listing by install time"
-msgstr "Orders the package listing by install time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:50
-#, fuzzy
 msgid "List files in package"
-msgstr "List files in package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:51
-#, fuzzy
 msgid "List capabilities this package provides"
-msgstr "List capabilities this package provides"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:52
-#, fuzzy
 msgid "List packages on which this package depends"
-msgstr "List packages on which this package depends"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:53
-#, fuzzy
 msgid "List the package specific scriptlets"
-msgstr "List the package specific scriptlets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:54
-#, fuzzy
 msgid ""
 "Display the states of files in the package. The state of each file is one of "
 "normal, not installed, or replaced"
 msgstr ""
-"Display the states of files in the package. The state of each file is one of "
-"normal, not installed, or replaced"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:55
 #: /tmp/fish/implicit/share/completions/rpm.fish:56
-#, fuzzy
 msgid "Display the trigger scripts contained in the package"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:57
-#, fuzzy
 msgid "Query all installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:58
-#, fuzzy
 msgid "Query package owning specified file"
-msgstr "Query package owning specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:59
-#, fuzzy
 msgid ""
 "Query package that contains a given file identifier, i.e. the MD5 digest of "
 "the file contents"
 msgstr ""
-"Query package that contains a given file identifier, i.e. the MD5 digest of "
-"the file contents"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:60
-#, fuzzy
 msgid "Query packages with the specified group"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:61
-#, fuzzy
 msgid ""
 "Query package that contains a given header identifier, i.e. the SHA1 digest "
 "of the immutable header region"
 msgstr ""
-"Query package that contains a given header identifier, i.e. the SHA1 digest "
-"of the immutable header region"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:62
-#, fuzzy
 msgid "Query an (uninstalled) package in specified file"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:63
-#, fuzzy
 msgid ""
 "Query package that contains a given package identifier, i.e. the MD5 digest "
 "of the combined header and payload contents"
 msgstr ""
-"Query package that contains a given package identifier, i.e. the MD5 digest "
-"of the combined header and payload contents"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:64
-#, fuzzy
 msgid "Parse and query specified spec-file as if it were a package"
-msgstr "Parse and query specified spec-file as if it were a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:65
-#, fuzzy
 msgid "Query package(s) that have the specified TID (transaction identifier)"
-msgstr "Query package(s) that have the specified TID (transaction identifier)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:66
-#, fuzzy
 msgid "Query packages that are triggered by the specified packages"
-msgstr "Query packages that are triggered by the specified packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:67
-#, fuzzy
 msgid "Query all packages that provide the specified capability"
-msgstr "Query all packages that provide the specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:68
-#, fuzzy
 msgid ""
 "Query all packages that requires the specified capability for functioning"
 msgstr ""
-"Query all packages that requires the specified capability for functioning"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:69
-#, fuzzy
 msgid "Don't verify dependencies of packages"
-msgstr "Don't verify dependencies of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:71
-#, fuzzy
 msgid "Don't verify any attributes of package files"
-msgstr "Don't verify any attributes of package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:72
-#, fuzzy
 msgid "Don't execute the %verifyscript scriptlet"
-msgstr "Don't execute the %verifyscript scriptlet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:74
-#, fuzzy
 msgid "Don't verify linkto attribute"
-msgstr "Don't verify linkto attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:75
-#, fuzzy
 msgid "Don't verify md5 attribute"
-msgstr "Don't verify md5 attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:76
-#, fuzzy
 msgid "Don't verify size attribute"
-msgstr "Don't verify size attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:77
-#, fuzzy
 msgid "Don't verify user attribute"
-msgstr "Don't verify user attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:78
-#, fuzzy
 msgid "Don't verify group attribute"
-msgstr "Don't verify group attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:79
-#, fuzzy
 msgid "Don't verify time attribute"
-msgstr "Don't verify time attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:80
-#, fuzzy
 msgid "Don't verify mode attribute"
-msgstr "Don't verify mode attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:81
-#, fuzzy
 msgid "Don't verify dev attribute"
-msgstr "Don't verify dev attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:82
-#, fuzzy
 msgid "Remove all versions of the package which match specified string"
-msgstr "Remove all versions of the package which match specified string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:83
-#, fuzzy
 msgid "Don't check dependencies before uninstalling the packages"
-msgstr "Don't check dependencies before uninstalling the packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:84
-#, fuzzy
 msgid "Don't execute scriplets"
-msgstr "Don't execute scriplets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:85
-#, fuzzy
 msgid "Don't execute preun scriptlet"
-msgstr "Don't execute preun scriptlet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:86
-#, fuzzy
 msgid "Don't execute postun scriptlet"
-msgstr "Don't execute postun scriptlet"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:91
-#, fuzzy
 msgid "Don't really uninstall anything"
-msgstr "Don't really uninstall anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:92
 msgid "Install new package"
@@ -53147,23 +49014,20 @@ msgid "Upgrade existing package"
 msgstr "Atualizar um pacote existente"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:94
-#, fuzzy
 msgid "Upgrade package if already installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:96
 msgid "Verify package integrity"
 msgstr "Verificar a integridade do pacote"
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:97
-#, fuzzy
 msgid "Erase package"
-msgstr "Erase package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:2
-#, fuzzy
 msgid "Suppress non-error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:3
 msgid "Skip based on checksum, not mod-time & size"
@@ -53178,9 +49042,8 @@ msgid "Turn off an implied OPTION (e.g. --no-D)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:6
-#, fuzzy
 msgid "Recurse into directories"
-msgstr "Replace include directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:7
 msgid "Use relative path names"
@@ -53207,24 +49070,20 @@ msgid "Skip files that are newer on the receiver"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:13
-#, fuzzy
 msgid "Update destination files in-place"
-msgstr "Edit files in-place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:14
-#, fuzzy
 msgid "Append data onto shorter files"
-msgstr "Append new files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:15
-#, fuzzy
 msgid "Transfer directories without recursing"
-msgstr "Process directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:16
-#, fuzzy
 msgid "Copy symlinks as symlinks"
-msgstr "Store symbolic links as links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:17
 msgid "Transform symlink into referent file/dir"
@@ -53247,14 +49106,12 @@ msgid "Treat symlinked dir on receiver as dir"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:22
-#, fuzzy
 msgid "Preserve hard links"
-msgstr "Dereference all symlinks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:23
-#, fuzzy
 msgid "Preserve permissions"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:24
 msgid "Preserve executability"
@@ -53269,50 +49126,44 @@ msgid "Preserve extended attrs (implies -p) [n.s.]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:27
-#, fuzzy
 msgid "Change destination permissions"
-msgstr "Specify destination email"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:28
 msgid "Preserve owner (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:29
-#, fuzzy
 msgid "Preserve group"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:30
 msgid "Preserve device files (super-user only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:31
-#, fuzzy
 msgid "Preserve special files"
-msgstr "Preserve file ownership"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:32
 msgid "Same as --devices --specials"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:33
-#, fuzzy
 msgid "Preserve times"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:34
-#, fuzzy
 msgid "Omit directories when preserving times"
-msgstr "Lista diretórios, não seu conteúdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:35
 msgid "Receiver attempts super-user activities"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:36
-#, fuzzy
 msgid "Handle sparse files efficiently"
-msgstr "Handle sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:37
 msgid "Show what would have been transferred"
@@ -53331,14 +49182,12 @@ msgid "Force a fixed checksum block-size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:41
-#, fuzzy
 msgid "Specify the remote shell to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:42
-#, fuzzy
 msgid "Specify the rsync to run on remote machine"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:43
 msgid "Ignore non-existing files on receiving side"
@@ -53385,9 +49234,8 @@ msgid "Force deletion of dirs even if not empty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:54
-#, fuzzy
 msgid "Don’t delete more than NUM files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:55
 msgid "Don’t transfer any file larger than SIZE"
@@ -53410,9 +49258,8 @@ msgid "Put all updated files into place at end"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:60
-#, fuzzy
 msgid "Prune empty directory chains from file-list"
-msgstr "Prune empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:61
 msgid "Don’t map uid/gid values by user/group name"
@@ -53427,18 +49274,16 @@ msgid "Don’t skip files that match size and time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:64
-#, fuzzy
 msgid "Skip files that match in size"
-msgstr "Recurse, skip file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:65
 msgid "Compare mod-times with reduced accuracy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:66
-#, fuzzy
 msgid "Create temporary files in directory DIR"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:67
 msgid "Find similar file for basis if no dest file"
@@ -53463,9 +49308,8 @@ msgid "Compress file data during the transfer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:72
-#, fuzzy
 msgid "Explicitly set compression level"
-msgstr "Compression level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:73
 msgid "Auto-ignore files in the same way CVS does"
@@ -53482,24 +49326,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:76
-#, fuzzy
 msgid "Exclude files matching PATTERN"
-msgstr "Recurse, skip file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:78
-#, fuzzy
 msgid "Don’t exclude files matching PATTERN"
-msgstr "Recurse, search file matching PATTERN"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:79
-#, fuzzy
 msgid "Read include patterns from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:80
-#, fuzzy
 msgid "Read list of source-file names from FILE"
-msgstr "Read filenames from pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:81
 msgid "All *from/filter files are delimited by 0s"
@@ -53510,19 +49350,16 @@ msgid "Bind address for outgoing socket to daemon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:83
-#, fuzzy
 msgid "Specify double-colon alternate port number"
-msgstr "Specify date range for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:84
-#, fuzzy
 msgid "Specify custom TCP options"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:85
-#, fuzzy
 msgid "Use blocking I/O for the remote shell"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:86
 msgid "Give some file-transfer stats"
@@ -53537,9 +49374,8 @@ msgid "Output numbers in a human-readable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:89
-#, fuzzy
 msgid "Show progress during transfer"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:90
 msgid "Same as --partial --progress"
@@ -53550,18 +49386,16 @@ msgid "Output a change-summary for all updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:92
-#, fuzzy
 msgid "Output filenames using the specified format"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:93
 msgid "Read password from FILE"
 msgstr "Ler senha a partir do ARQUIVO"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:94
-#, fuzzy
 msgid "List the files instead of copying them"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:95
 msgid "Limit I/O bandwidth; KBytes per second"
@@ -53576,9 +49410,8 @@ msgid "Like --write-batch but w/o updating dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:98
-#, fuzzy
 msgid "Read a batched update from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:99
 msgid "Force an older protocol version to be used"
@@ -53597,37 +49430,32 @@ msgid "Prefer IPv6"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:105
-#, fuzzy
 msgid "Remote path"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:1
-#, fuzzy
 msgid "Definition"
-msgstr "função"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:2
-#, fuzzy
 msgid "Do not remove source tree after installation"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:3
 msgid "Verbose mode: print compilation status to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby-build.fish:4
-#, fuzzy
 msgid "List all built-in definitions"
-msgstr "Disable some built-in functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby.fish:4
 msgid "Kanji code-set"
 msgstr "Kanji code-set"
 
 #: /tmp/fish/implicit/share/completions/ruby.fish:14
-#, fuzzy
 msgid "Require file"
-msgstr "Require file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ruby.fish:19
 msgid "Verbose mode without message"
@@ -53638,62 +49466,52 @@ msgid "Compiler debug mode"
 msgstr "Compiler debug mode"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:1
-#, fuzzy
 msgid "Make bucket"
-msgstr "Erro de parênteses"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:2
-#, fuzzy
 msgid "Remove bucket"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:3
-#, fuzzy
 msgid "List objects or buckets"
-msgstr "List contents of a package matching pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:4
-#, fuzzy
 msgid "List all object in all buckets"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:5
-#, fuzzy
 msgid "Put file into bucket"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:6
-#, fuzzy
 msgid "Get file from bucket"
-msgstr "Extrair arquivos do arquivo de lista"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:7
-#, fuzzy
 msgid "Delete file from bucket"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:8
 msgid "Delete file from bucket (alias for del)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:9
-#, fuzzy
 msgid "Restore file from Glacier storage"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:10
-#, fuzzy
 msgid "Synchronize a directory tree to S3"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:11
 msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -53704,9 +49522,8 @@ msgid "Modify object metadata"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:15
-#, fuzzy
 msgid "Move object"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:16
 msgid "Modify Access control list for Bucket or Files"
@@ -53733,28 +49550,24 @@ msgid "Modify Bucket Requester Pays policy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:22
-#, fuzzy
 msgid "Show multipart uploads"
-msgstr "Show threads"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:23
 msgid "Abort a multipart upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:24
-#, fuzzy
 msgid "List parts of a multipart upload"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:25
-#, fuzzy
 msgid "Enable/disable bucket access logging"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:26
-#, fuzzy
 msgid "Sign arbitrary string using the secret key"
-msgstr "Sign a public key with your secret key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:27
 msgid "Sign an S3 URL to provide limited public access with expiry"
@@ -53765,14 +49578,12 @@ msgid "Fix invalid file names in a bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:29
-#, fuzzy
 msgid "Create Website from bucket"
-msgstr "Forçar cópia completa de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:30
-#, fuzzy
 msgid "Delete Website"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:31
 msgid "Info about Website"
@@ -53787,52 +49598,44 @@ msgid "Upload a lifecycle policy for the bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:34
-#, fuzzy
 msgid "Remove a lifecycle policy for the bucket"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:35
-#, fuzzy
 msgid "List CloudFront distribution points"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:36
 msgid "Display CloudFront distribution point parameters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:37
-#, fuzzy
 msgid "Create CloudFront distribution point"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:38
-#, fuzzy
 msgid "Delete CloudFront distribution point"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:39
-#, fuzzy
 msgid "Change CloudFront distribution point parameters"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:40
 msgid "Display CloudFront invalidation request(s) status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:42
-#, fuzzy
 msgid "Run interactive (re)configuration tool"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
-#, fuzzy
 msgid "AWS Access Key"
-msgstr "Mostra horário de acesso"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:46
 msgid "AWS Secret Key"
@@ -53847,58 +49650,48 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "(padrão)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
-#, fuzzy
 msgid "Don't use HTTPS"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:51
-#, fuzzy
 msgid "Encrypt files before uploading"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:52
-#, fuzzy
 msgid "Don't encrypt files"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:53
-#, fuzzy
 msgid "Force overwrite"
-msgstr "Don't overwrite"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:54
-#, fuzzy
 msgid "Resume partially downloaded file"
-msgstr "Continue getting a partially-downloaded file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:55
-#, fuzzy
 msgid "Resume partially uploaded files"
-msgstr "Continue getting a partially-downloaded file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:56
 msgid "Resume multipart upload by UploadId"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:57
-#, fuzzy
 msgid "Skip existing files at destination"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
-#, fuzzy
 msgid "Upload/download/delete recursively"
-msgstr "Copy directories recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:59
-#, fuzzy
 msgid "Check MD5 sums (default)"
-msgstr "(padrão)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:60
 msgid "Skip MD5 sum check"
@@ -53921,33 +49714,28 @@ msgid "Revoke permission to named user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:65
-#, fuzzy
 msgid "Days to keep restored file"
-msgstr "Do not save/restore filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:66
-#, fuzzy
 msgid "S3 glacier restore priority"
-msgstr "Show repository access history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:67
 msgid "Delete objects not found locally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:68
-#, fuzzy
 msgid "Don't delete dest objects"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:69
-#, fuzzy
 msgid "Delete after upload"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:70
-#, fuzzy
 msgid "Delete no more than NUM files"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:71
 msgid "Max objects per response"
@@ -53958,66 +49746,56 @@ msgid "Additional parallel upload"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:73
-#, fuzzy
 msgid "Delete remotely after fetch"
-msgstr "Delete from archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:74
-#, fuzzy
 msgid "Preserve FS attributes"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:75
-#, fuzzy
 msgid "Don't store FS attributes"
-msgstr "Don't verify md5 attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:76
-#, fuzzy
 msgid "Exclude GLOB matches"
-msgstr "Exclui sistemas de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:77
-#, fuzzy
 msgid "--exclude GLOBs from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:78
 msgid "Exclude REGEXP matches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:79
-#, fuzzy
 msgid "Read --rexclude REGEXPs from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:80
 msgid "Include GLOB matches even if previously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:81
-#, fuzzy
 msgid "Read --include GLOBs from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:82
 msgid "Include REGEXP matches even if preiously excluded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:83
-#, fuzzy
 msgid "Read --rinclude REGEXPs from FILE"
-msgstr "Read the patch from patchfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:84
-#, fuzzy
 msgid "Read source-file names from FILE"
-msgstr "Read filenames from pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:85
-#, fuzzy
 msgid "Create bucket in region"
-msgstr "Force new revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:86
 msgid "S3 endpoint (default: s3.amazonaws.com)"
@@ -54044,9 +49822,8 @@ msgid "Prefix for access logs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:92
-#, fuzzy
 msgid "Disable access logging"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:93
 msgid "Default MIME-type for objects"
@@ -54061,23 +49838,20 @@ msgid "Don't guess MIME-type, use default"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:96
-#, fuzzy
 msgid "Don't use mime magic when guessing"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:97
-#, fuzzy
 msgid "Force MIME-type"
-msgstr "Force yes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:98
 msgid "Add HTTP header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:99
-#, fuzzy
 msgid "Remove HTTP header"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:100
 msgid "Use server-side encryption for upload"
@@ -54088,18 +49862,16 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:104
-#, fuzzy
 msgid "Use S3 name as-is"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:105
 msgid "No multipart on files larger than --multipart-chunk-size-mb"
@@ -54114,19 +49886,16 @@ msgid "Include MD5 sums in bucket listings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:108
-#, fuzzy
 msgid "Print sizes in human-readable form"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:109
-#, fuzzy
 msgid "Name of index-document"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:110
-#, fuzzy
 msgid "Name of error-document"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:111
 msgid "When expiration rule takes effect"
@@ -54141,42 +49910,36 @@ msgid "Apply expiry to objects matching prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:114
-#, fuzzy
 msgid "Show progress (default on TTY)"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:115
 msgid "Don't show progress meter (default if non-TTY)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:116
-#, fuzzy
 msgid "Show file transfer stats"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:117
-#, fuzzy
 msgid "Enable CloudFront distribution"
-msgstr "Debian distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:118
-#, fuzzy
 msgid "Disable CloudFront distribution"
-msgstr "Debian distribution"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:119
-#, fuzzy
 msgid "Invalidate CloudFront file"
-msgstr "Exceto arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:120
 msgid "Invalidate default index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:121
-#, fuzzy
 msgid "Don't invalidate default index"
-msgstr "Do not print explanations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:122
 msgid "Add CNAME to CloudFront distribution"
@@ -54199,29 +49962,24 @@ msgid "Cache FILE containing MD5 values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:131
-#, fuzzy
 msgid "Silence stdout output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:132
-#, fuzzy
 msgid "Path to SSL CA certificate FILE"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:133
-#, fuzzy
 msgid "Validate SSL certificate"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:134
-#, fuzzy
 msgid "Don't validate SSL certificate"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:135
-#, fuzzy
 msgid "Validate SSL hostname"
-msgstr "Validate"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:136
 msgid "Don't validate SSL hostname"
@@ -54232,23 +49990,20 @@ msgid "Use AWS Signature version 2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:138
-#, fuzzy
 msgid "Limit upload or download speed (bytes/sec)"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:139
 msgid "Set REQUESTER PAYS for operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:140
-#, fuzzy
 msgid "Produce long listing"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:141
-#, fuzzy
 msgid "Stop on error in transfer"
-msgstr "Stop showing errors if too many"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:142
 msgid "Provide Content-Disposition for signed URLs"
@@ -54277,23 +50032,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:4
-#, fuzzy
 msgid "Convert all the files in a directory. Requires --from and --to."
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:5
 #: /tmp/fish/implicit/share/completions/sass.fish:5
 #: /tmp/fish/implicit/share/completions/scss.fish:5
-#, fuzzy
 msgid "Show help message."
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:6
 #: /tmp/fish/implicit/share/completions/sass.fish:6
 #: /tmp/fish/implicit/share/completions/scss.fish:6
-#, fuzzy
 msgid "Print the Sass version."
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:7
 msgid "Convert underscores to dashes."
@@ -54320,9 +50072,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:11
 #: /tmp/fish/implicit/share/completions/sass.fish:14
 #: /tmp/fish/implicit/share/completions/scss.fish:15
-#, fuzzy
 msgid "Specify the default encoding for input files."
-msgstr "Specify apt config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:12
 #: /tmp/fish/implicit/share/completions/sass.fish:15
@@ -54337,9 +50088,8 @@ msgid "The path to save parsed Sass files. Defaults to .sass-cache."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:14
-#, fuzzy
 msgid "Don't cache to sassc files."
-msgstr "Do not change any files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass-convert.fish:15
 #: /tmp/fish/implicit/share/completions/sass.fish:23
@@ -54349,9 +50099,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:1
 #: /tmp/fish/implicit/share/completions/scss.fish:1
-#, fuzzy
 msgid "Specify a Sass import path."
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:2
 #: /tmp/fish/implicit/share/completions/scss.fish:2
@@ -54426,9 +50175,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:18
 #: /tmp/fish/implicit/share/completions/scss.fish:19
-#, fuzzy
 msgid "Run an interactive SassScript shell."
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:19
 #: /tmp/fish/implicit/share/completions/scss.fish:20
@@ -54444,9 +50192,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:22
 #: /tmp/fish/implicit/share/completions/scss.fish:23
-#, fuzzy
 msgid "Don't cache parsed Sass files."
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sass.fish:24
 #: /tmp/fish/implicit/share/completions/scss.fish:25
@@ -54454,93 +50201,80 @@ msgid "Silence warnings and status messages during compilation."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:1
-#, fuzzy
 msgid "Create a new sbt project from the given template"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:2
 msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
-#, fuzzy
 msgid "Set log level to debug"
-msgstr "Set error level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:6
-#, fuzzy
 msgid "Disable ANSI color codes"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:7
 msgid "Launch even if there's no sbt project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:8
-#, fuzzy
 msgid "Use all local caches"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:9
 msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "Specify legal cvsroot directory."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
-#, fuzzy
 msgid "Specify path to local Ivy repository"
-msgstr "Atualizar o repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "Set config options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:16
-#, fuzzy
 msgid "Use specified version of sbt"
-msgstr "Use specified compression algorithm"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:17
-#, fuzzy
 msgid "Use specified jar as the sbt launcher"
-msgstr "Use specified key as the key to sign with"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:18
 msgid "Use an RC version of sbt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:19
-#, fuzzy
 msgid "Use a snapshot version of sbt"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:20
 msgid "Alternate JAVA_HOME"
@@ -54604,19 +50338,16 @@ msgid "Gamma-correction table [0..255, …]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:12
-#, fuzzy
 msgid "Scan mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:13
-#, fuzzy
 msgid "Device name to use"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:14
-#, fuzzy
 msgid "List devices"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:15
 msgid "Print formatted device list [%d, %v, %m, %t, %i, %n]"
@@ -54631,9 +50362,8 @@ msgid "The filename of the image to be loaded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:18
-#, fuzzy
 msgid "Output image format"
-msgstr "Output in ISO 8601 format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:19
 msgid "Include this ICC profile into TIFF file"
@@ -54654,14 +50384,12 @@ msgid "How many pages to scan in batch mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:23
-#, fuzzy
 msgid "Increase page number in filename by #"
-msgstr "Ignore case when comparing file names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:24
-#, fuzzy
 msgid "Increment page number by two"
-msgstr "Increment the misc debug level by one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:25
 msgid "Ask for pressing a key before scanning a page"
@@ -54672,9 +50400,8 @@ msgid "Only accept authorization requests using md5"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:27
-#, fuzzy
 msgid "Print progress messages"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:28
 msgid "Only set options, don't actually scan"
@@ -54685,19 +50412,16 @@ msgid "Test backend thoroughly"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:30
-#, fuzzy
 msgid "List all available backend options"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:31
-#, fuzzy
 msgid "Display this help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:32
-#, fuzzy
 msgid "Give even more status messages"
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scanimage.fish:33
 msgid "Change input buffer size (in kB, default 32)"
@@ -54754,9 +50478,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:9
-#, fuzzy
 msgid "Debug the build process"
-msgstr "Processo filho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:10
 msgid ""
@@ -54766,9 +50489,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:11
-#, fuzzy
 msgid "Use file as the initial SConscript file"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:12
 msgid ""
@@ -54782,37 +50504,32 @@ msgid "Print the standard help message about command-line options and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:14
-#, fuzzy
 msgid "Ignore all errors from commands executed to rebuild files"
-msgstr "Ignore errors from non-empty directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:15
 msgid "Specifies a directory to search for imported Python modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:16
-#, fuzzy
 msgid "Cache implicit dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:17
 msgid "Force SCons to ignore the cached implicit dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:18
-#, fuzzy
 msgid "Force SCons to ignore changes in the implicit dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:19
-#, fuzzy
 msgid "Specifies the number of jobs (commands) to run simultaneously"
-msgstr "Specifies the number of data bytes to be sent"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:20
-#, fuzzy
 msgid "Continue as much as possible after an error"
-msgstr "Continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:21
 msgid ""
@@ -54826,9 +50543,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:23
-#, fuzzy
 msgid "No execute"
-msgstr "Executável"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:24
 msgid ""
@@ -54837,9 +50553,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:25
-#, fuzzy
 msgid "Do not run any commands, or print anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:26
 msgid ""
@@ -54848,14 +50563,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:27
-#, fuzzy
 msgid "Build dependencies in a random order"
-msgstr "List dependencies of module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:28
-#, fuzzy
 msgid "Silent"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:29
 msgid ""
@@ -54876,16 +50589,14 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:33
-#, fuzzy
 msgid ""
 "Print a message containing the working directory before and after other "
 "processing"
-msgstr "Print the current working directory, shortend to fit the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:34
-#, fuzzy
 msgid "Enable or disable warnings"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scons.fish:35
 msgid "Turn off -w, even if it was turned on implicitly"
@@ -54898,14 +50609,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:1
-#, fuzzy
 msgid "Local Path"
-msgstr "Logical and"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:2
-#, fuzzy
 msgid "Remote Path"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scp.fish:4
 msgid "Bandwidth limit"
@@ -54922,52 +50631,44 @@ msgid "Recursively copy"
 msgstr "Recursively copy"
 
 #: /tmp/fish/implicit/share/completions/scp.fish:9
-#, fuzzy
 msgid "Encryption program"
-msgstr "Encyption program"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:1
 msgid "Detect which folder screen uses"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:2
-#, fuzzy
 msgid "Get the socket list on mac"
-msgstr "Set prompt command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:3
-#, fuzzy
 msgid "Get the socket list"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:4
-#, fuzzy
 msgid "Print a list of detached screen sessions"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:5
-#, fuzzy
 msgid "Print a list of attached screen sessions"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:6
-#, fuzzy
 msgid "Print a list of running screen sessions"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:7
-#, fuzzy
 msgid "Include all capabilitys"
-msgstr "Include path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:8
 msgid "Adapt window size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:9
-#, fuzzy
 msgid "Specify init file"
-msgstr "Specify config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:10
 #: /tmp/fish/implicit/share/completions/screen.fish:11
@@ -55012,72 +50713,61 @@ msgid "Interrupt display on C-c"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:21
-#, fuzzy
 msgid "Login on"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:22
-#, fuzzy
 msgid "Login off"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:23
 #: /tmp/fish/implicit/share/completions/screen.fish:24
-#, fuzzy
 msgid "List sessions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:25
 msgid "Log on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:27
-#, fuzzy
 msgid "Optimal output"
-msgstr "Wide output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:28
-#, fuzzy
 msgid "Preselect window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
-#, fuzzy
 msgid "Set shell"
-msgstr "Set system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:31
-#, fuzzy
 msgid "Session name"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:32
-#, fuzzy
 msgid "Session title"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:33
 msgid "UTF-8 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:35
-#, fuzzy
 msgid "Wipe dead sessions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:36
 msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
-#, fuzzy
 msgid "Display version information and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:3
 msgid "When selecting a window, grab wm border too"
@@ -55088,9 +50778,8 @@ msgid "Display a countdown when used with delay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:5
-#, fuzzy
 msgid "Wait NUMBER of seconds before taking a shot"
-msgstr "Number of seconds before assuming http timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:6
 msgid "Execute APPLICATION on the saved image"
@@ -55101,14 +50790,12 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "Executa um conjunto de comandos várias vezes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
-#, fuzzy
 msgid "Select a window or rectangle with the mouse"
-msgstr "Select a window by clicking on its frame"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:10
 msgid "Generate thumbnail PERCENT of original"
@@ -55135,9 +50822,8 @@ msgid "How to link generated output to the source files."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/service.fish:1
-#, fuzzy
 msgid "Service name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:1
 msgid "Color"
@@ -55162,18 +50848,16 @@ msgid "Dim text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:6
-#, fuzzy
 msgid "Reverse color text"
-msgstr "Inverte a ordem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:7
 msgid "Underline text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:9
-#, fuzzy
 msgid "Print a list of all accepted color names"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setfacl.fish:1
 msgid "Remove all extended ACL entries"
@@ -55204,9 +50888,8 @@ msgid "Test if We are specifying a locale value for the prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:3
-#, fuzzy
 msgid "Erase variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:8
 msgid "Share variable persistently across sessions"
@@ -55221,14 +50904,12 @@ msgid "List the names of the variables, but not their value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:14
-#, fuzzy
 msgid "Locale variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:15
-#, fuzzy
 msgid "Do not truncate long lines"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setsid.fish:2
 msgid "Set controlling terminal to current one"
@@ -55239,33 +50920,28 @@ msgid "Wait until program ends and return its exit value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:1
-#, fuzzy
 msgid "Print this message"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:2
 msgid "Specifies compatibility map component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:3
-#, fuzzy
 msgid "Specifies configuration file to use"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:4
-#, fuzzy
 msgid "Specifies the device ID to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:5
-#, fuzzy
 msgid "Specifies display to use"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:6
-#, fuzzy
 msgid "Specifies geometry component name"
-msgstr "Ignore specified number of directory components"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:7
 msgid "Add <dir> to list of directories to be used"
@@ -55276,9 +50952,8 @@ msgid "Specifies keycodes component name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:9
-#, fuzzy
 msgid "Specifies name of keymap to load"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:10
 msgid "Specifies layout used to choose component names"
@@ -55297,14 +50972,12 @@ msgid "Print a complete xkb_keymap description and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:14
-#, fuzzy
 msgid "Print the current layout settings and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:15
-#, fuzzy
 msgid "Name of rules file to use"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:16
 msgid "Specifies symbols component name"
@@ -55315,9 +50988,8 @@ msgid "Synchronize request w/X server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:18
-#, fuzzy
 msgid "Specifies types component name"
-msgstr "Specify the proxy username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/setxkbmap.fish:19
 msgid "Sets verbosity (1..10).  Higher values yield more messages"
@@ -55332,55 +51004,45 @@ msgid "Verify a signed checksum list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "Ignore specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
-#, fuzzy
 msgid "Verify a signed message and sig"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:1
-#, fuzzy
 msgid "Test if snap has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:3
-#, fuzzy
 msgid "Test if snap command should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:4
-#, fuzzy
 msgid "Test if snap command should have files as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:5
 #: /tmp/fish/implicit/share/completions/snap.fish:6
-#, fuzzy
 msgid "List disabled snaps"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:7
-#, fuzzy
 msgid "List installed snaps"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "Stop interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
-#, fuzzy
 msgid "List change IDs"
-msgstr "Sem alterações"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
 msgid "Check that no assertion type is used yet"
@@ -55391,14 +51053,12 @@ msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
-#, fuzzy
 msgid "Show this help message"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:16
 msgid "Snap"
@@ -55437,9 +51097,8 @@ msgid "Sort by random hash of keys"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:10
-#, fuzzy
 msgid "Get random bytes from FILE"
-msgstr "Ler senha a partir do ARQUIVO"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:11
 msgid "Reverse results"
@@ -55454,27 +51113,24 @@ msgid "Define key"
 msgstr "Define key"
 
 #: /tmp/fish/implicit/share/completions/sort.fish:14
-#, fuzzy
 msgid "Merge sorted files"
-msgstr "Erase obsolete files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:16
 msgid "Stabilize sort"
 msgstr "Stabilize sort"
 
 #: /tmp/fish/implicit/share/completions/sort.fish:17
-#, fuzzy
 msgid "Set memory buffer size"
-msgstr "Set memory buffer size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:18
 msgid "Field separator"
 msgstr "Field separator"
 
 #: /tmp/fish/implicit/share/completions/sort.fish:19
-#, fuzzy
 msgid "Set temporary directory"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:20
 msgid "Output only first of equal lines"
@@ -55493,9 +51149,8 @@ msgid "Enables forwarding of the authentication agent"
 msgstr "Enables forwarding of the authentication agent"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:4
-#, fuzzy
 msgid "Interface to transmit from"
-msgstr "Interface to transmit from"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:6
 msgid "Go to background"
@@ -55522,9 +51177,8 @@ msgid "MAC algorithm"
 msgstr "MAC algorithm"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:12
-#, fuzzy
 msgid "Prevent reading from stdin"
-msgstr "Read names from stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:13
 msgid "Do not execute remote command"
@@ -55535,9 +51189,8 @@ msgid "Subsystem"
 msgstr "Subsystem"
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:17
-#, fuzzy
 msgid "Force pseudo-tty allocation"
-msgstr "Disable pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:18
 msgid "Disable pseudo-tty allocation"
@@ -55580,14 +51233,12 @@ msgid "Disable multi-threaded operation"
 msgstr "Disable multi-threaded operation"
 
 #: /tmp/fish/implicit/share/completions/stack.fish:1
-#, fuzzy
 msgid "Show this help text"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:2
-#, fuzzy
 msgid "Show only version number"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:3
 msgid "Run 'stack --docker-help' for details"
@@ -55646,9 +51297,8 @@ msgid "Specialized GHC variant, e.g. integersimple (implies --no-system-ghc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:15
-#, fuzzy
 msgid "Number of concurrent jobs to run"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:16
 msgid "Extra directories to check for C header files"
@@ -55691,9 +51341,8 @@ msgid "Override resolver in project file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:26
-#, fuzzy
 msgid "Use the specified compiler"
-msgstr "Use specific conffile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:27
 msgid ""
@@ -55718,19 +51367,16 @@ msgid "Build the package(s) in this directory/configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:31
-#, fuzzy
 msgid "Shortcut for 'build --copy-bins'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:32
-#, fuzzy
 msgid "Shortcut for 'build --test'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:33
-#, fuzzy
 msgid "Shortcut for 'build --bench'"
-msgstr "Shortcut for '--options /dev/null'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:34
 msgid "Shortcut for 'build --haddock'"
@@ -55759,42 +51405,36 @@ msgid "Get the appropriate GHC for your project"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:40
-#, fuzzy
 msgid "Print out handy path information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:41
-#, fuzzy
 msgid "Unpack one or more packages locally"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:42
-#, fuzzy
 msgid "Update the package index"
-msgstr "Update list of packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:43
 msgid "Upgrade to the latest stack (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:44
-#, fuzzy
 msgid "Upload a package to Hackage"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:45
-#, fuzzy
 msgid "Create source distribution tarballs"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:46
 msgid "Visualize your project's dependency graph using Graphviz dot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:47
-#, fuzzy
 msgid "Execute a command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:48
 msgid "Run ghc"
@@ -55822,23 +51462,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:54
-#, fuzzy
 msgid "Clean the local packages"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:55
-#, fuzzy
 msgid "List the dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:56
 msgid "Query general build information (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:57
-#, fuzzy
 msgid "IDE-specific commands"
-msgstr "Specify sendmail command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stack.fish:58
 msgid "Subcommands specific to Docker use"
@@ -55877,9 +51514,8 @@ msgid "Test if a code block is currently evaluated"
 msgstr "Test if a code block is currently evaluated"
 
 #: /tmp/fish/implicit/share/completions/status.fish:6
-#, fuzzy
 msgid "Test if a breakpoint is currently in effect"
-msgstr "Test if a code block is currently evaluated"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:7
 msgid "Test if new jobs are never put under job control"
@@ -55894,14 +51530,12 @@ msgid "Test if all new jobs are put under job control"
 msgstr "Test if all new jobs are put under job control"
 
 #: /tmp/fish/implicit/share/completions/status.fish:10
-#, fuzzy
 msgid "Print the filename of the currently running script"
-msgstr "Imprime as tarefas em execução"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:11
-#, fuzzy
 msgid "Print the line number of the currently running script"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:12
 msgid ""
@@ -55910,43 +51544,36 @@ msgstr ""
 "Print a list of all function calls leading up to running the current command"
 
 #: /tmp/fish/implicit/share/completions/status.fish:13
-#, fuzzy
 msgid "Set which jobs are under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:14
-#, fuzzy
 msgid "Set all jobs under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:15
-#, fuzzy
 msgid "Set only interactive jobs under job control"
-msgstr "Test if only interactive new jobs are put under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:16
-#, fuzzy
 msgid "Set no jobs under job control"
-msgstr "Set which jobs are out under job control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:13
-#, fuzzy
 msgid "Components one or more pixel components"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/stream.fish:23
 msgid "Pixel storage type [type]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:1
-#, fuzzy
 msgid "Do not print output"
-msgstr "Do not run update"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:2
-#, fuzzy
 msgid "Specify maximum number of splits"
-msgstr "Maximum number of log entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:3
 msgid "Split right-to-left"
@@ -55957,28 +51584,24 @@ msgid "Trim only leading characters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:5
-#, fuzzy
 msgid "Trim only trailing characters"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:6
 msgid "Specify the chars to trim (default: whitespace)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:7
-#, fuzzy
 msgid "Escape with \\ instead of quoting"
-msgstr "Make symbolic links instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:8
-#, fuzzy
 msgid "Report index and length of the matches"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:9
-#, fuzzy
 msgid "Report only non-matching input"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:10
 msgid "Report all matches per line/string"
@@ -55997,43 +51620,36 @@ msgid "Repetition count"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:14
-#, fuzzy
 msgid "Maximum number of printed char"
-msgstr "Maximum number of nested blocks reached."
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/string.fish:15
-#, fuzzy
 msgid "Remove newline"
-msgstr "No newline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "Execute command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
-#, fuzzy
 msgid "Open a new window"
-msgstr "Select root window"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:4
-#, fuzzy
 msgid "Add folders to the current window"
-msgstr "Append files to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:5
 msgid "Wait for the files to be closed before returning"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:6
-#, fuzzy
 msgid "Don't activate the application"
-msgstr "Don't actually take the action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:7
 msgid "Keep the application activated after closing the file"
@@ -56050,44 +51666,36 @@ msgid "Preserve environment"
 msgstr "Preserve environment"
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:4
-#, fuzzy
 msgid "Set home"
-msgstr "Set time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:5
-#, fuzzy
 msgid "Remove the credential timestamp entirely"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:6
-#, fuzzy
 msgid "Preserve group vector"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:7
-#, fuzzy
 msgid "Read password from stdin"
-msgstr "Ler senha a partir do ARQUIVO"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:8
-#, fuzzy
 msgid "Run command in the background"
-msgstr "Executar tarefa em segundo plano"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:9
-#, fuzzy
 msgid "Edit"
-msgstr "Edit tag"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:10
-#, fuzzy
 msgid "Run command as group"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:12
-#, fuzzy
 msgid "Run a login shell"
-msgstr "Make login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:13
 msgid "Reset or ignore the credential timestamp"
@@ -56100,23 +51708,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:15
-#, fuzzy
 msgid "Do not prompt for a password - if one is needed, fail"
-msgstr "Do not prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:16
-#, fuzzy
 msgid "Specify a custom password prompt"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:17
 msgid "Run the given command in a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:18
-#, fuzzy
 msgid "Run command as user"
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:19
 msgid "Validate the credentials, extending timeout"
@@ -56127,9 +51732,8 @@ msgid "Make login shell"
 msgstr "Make login shell"
 
 #: /tmp/fish/implicit/share/completions/su.fish:2
-#, fuzzy
 msgid "Pass command to shell"
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:3
 msgid "Pass -f to the shell"
@@ -56147,21 +51751,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:3
 #: /tmp/fish/implicit/share/completions/svn.fish:5
-#, fuzzy
 msgid ""
 "Output the content of specified files or URLs with revision and author "
 "information in-line."
-msgstr "Output files/URLs with revision and author information inline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:4
-#, fuzzy
 msgid "Output the content of specified files or URLs."
-msgstr "Output content of files/URLs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:6
-#, fuzzy
 msgid "Check out a working copy from a repository."
-msgstr "Check out a working copy from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:7
 msgid ""
@@ -56170,174 +51771,142 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:8
-#, fuzzy
 msgid "Send changes from your working copy to the repository."
-msgstr "Send changes from your working copy to the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:9
-#, fuzzy
 msgid "Duplicate something in working copy or repository, remembering history."
-msgstr "Move and/or rename something in working copy or repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:10
-#, fuzzy
 msgid "Display the differences between two revisions or paths."
-msgstr "Apply the differences between two sources to a working copy path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:11
 msgid "Create an unversioned copy of a tree."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:12
-#, fuzzy
 msgid "Describe the usage of this program or its subcommands."
-msgstr "Describe the usage of this program or its subcommands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:13
-#, fuzzy
 msgid "Commit an unversioned file or tree into the repository."
-msgstr "Commit an unversioned file or tree into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:14
-#, fuzzy
 msgid "Display information about a local or remote item."
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:15
-#, fuzzy
 msgid "List directory entries in the repository."
-msgstr "List directory entries in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:16
-#, fuzzy
 msgid ""
 "Lock working copy paths or URLs in the repository, so that no other user can "
 "commit changes to them."
-msgstr "Lock working copy paths or URLs in the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:17
-#, fuzzy
 msgid "Show the log messages for a set of revision(s) and/or file(s)."
-msgstr "Show the log messages for a set of revision(s) and/or file(s)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:18
-#, fuzzy
 msgid "Apply the differences between two sources to a working copy path."
-msgstr "Apply the differences between two sources to a working copy path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:19
-#, fuzzy
 msgid "Display information related to merges"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:20
-#, fuzzy
 msgid "Create a new directory under version control."
-msgstr "Create a new directory under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:21
-#, fuzzy
 msgid "Move and/or rename something in working copy or repository."
-msgstr "Move and/or rename something in working copy or repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:22
-#, fuzzy
 msgid "Apply a unidiff patch to the working copy"
-msgstr "Display unrecorded changes in the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:23
-#, fuzzy
 msgid "Remove a property from files, dirs, or revisions."
-msgstr "Remove a property from files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:24
-#, fuzzy
 msgid "Edit a property with an external editor."
-msgstr "Edit a property with an external editor on targets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:25
-#, fuzzy
 msgid "Print the value of a property on files, dirs, or revisions."
-msgstr "Print value of a property on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:26
-#, fuzzy
 msgid "List all properties on files, dirs, or revisions."
-msgstr "List all properties on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:27
-#, fuzzy
 msgid "Set the value of a property on files, dirs, or revisions."
-msgstr "Print value of a property on files, dirs, or revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:28
-#, fuzzy
 msgid "Rewrite working copy url metadata"
-msgstr "Delete working copy if release succeeds"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:29
-#, fuzzy
 msgid "Remove files and directories from version control."
-msgstr "Place files or directories under version control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:30
-#, fuzzy
 msgid "Remove conflicts on working copy files or directories."
-msgstr "Remove conflicted state on working copy files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:31
-#, fuzzy
 msgid "Remove 'conflicted' state on working copy files or directories."
-msgstr "Remove conflicted state on working copy files or directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:32
-#, fuzzy
 msgid "Restore pristine working copy file (undo most local edits)."
-msgstr "Restore pristine working copy file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
-#, fuzzy
 msgid "Print the status of working copy files and directories."
-msgstr "Print the status of working copy files and directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
-#, fuzzy
 msgid "Update the working copy to a different URL."
-msgstr "Update the working copy to a different URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:35
-#, fuzzy
 msgid "Unlock working copy paths or URLs."
-msgstr "Unlock working copy paths or URLs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:36
-#, fuzzy
 msgid "Bring changes from the repository into the working copy."
-msgstr "Bring changes from the repository into the working copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:37
 msgid "Upgrade the metadata storage format for a working copy."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:38
-#, fuzzy
 msgid "Specify a username ARG"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:39
-#, fuzzy
 msgid "Specify a password ARG"
-msgstr "Specify a password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:40
-#, fuzzy
 msgid "Do not cache authentication tokens"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:41
-#, fuzzy
 msgid "Do no interactive prompting"
-msgstr "Do no interactive prompting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:42
 msgid ""
@@ -56346,9 +51915,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:43
-#, fuzzy
 msgid "Read user configuration files from directory ARG"
-msgstr "Read user config files from named directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:44
 msgid ""
@@ -56368,9 +51936,8 @@ msgid "Open composition window with attached files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:7
-#, fuzzy
 msgid "Receive new messages"
-msgstr "Replace a log message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:8
 msgid "Receive new messages of all accounts"
@@ -56389,9 +51956,8 @@ msgid "Show the total number of messages for each folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:12
-#, fuzzy
 msgid "Specify directory with configuration files"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:1
 msgid "The total number of worker threads to create (default: 1)"
@@ -56472,23 +52038,20 @@ msgid "Total size of data to transfer (default: 100G)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:20
-#, fuzzy
 msgid "Type of memory operations"
-msgstr "Specify options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:21
-#, fuzzy
 msgid "Number of files to create (default: 128)"
-msgstr "Make checked-out files read-write (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:22
 msgid "Block size to use in all I/O operations (default: 16K)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:23
-#, fuzzy
 msgid "Total size of files (default: 2G)"
-msgstr "Install documentation files (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:24
 msgid "Type of workload to produce"
@@ -56551,11 +52114,8 @@ msgid "Number of point select queries in a single transaction (default: 10)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:38
-#, fuzzy
 msgid "Number of simple range queries in a single transaction (default: 1)"
 msgstr ""
-"Número de usuários com confiança completa para introduzir novo assinador "
-"(padrão é 1)"
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:39
 msgid "Number of SUM range queries in a single transaction (default: 1)"
@@ -56646,9 +52206,8 @@ msgid "MySQL database name (default: sbtest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:60
-#, fuzzy
 msgid "Type of the test table to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:61
 msgid "Use SSL connections. (default: no)"
@@ -56665,33 +52224,28 @@ msgid "Additional options passed to CREATE TABLE."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:1
-#, fuzzy
 msgid "Start one or more units"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:2
-#, fuzzy
 msgid "Stop one or more units"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:3
-#, fuzzy
 msgid "Restart one or more units"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:4
 msgid "Runtime status about one or more units"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:5
-#, fuzzy
 msgid "Enable one or more units"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:6
-#, fuzzy
 msgid "Disable one or more units"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:7
 msgid "Start a unit and dependencies and disable all others"
@@ -56702,49 +52256,40 @@ msgid "Set the default target to boot into"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:9
-#, fuzzy
 msgid "List of unit types"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:10
-#, fuzzy
 msgid "List of unit states"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:11
-#, fuzzy
 msgid "Show all units or properties"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:12
-#, fuzzy
 msgid "Show also units of local containers"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:13
-#, fuzzy
 msgid "Show reverse dependencies between units"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:14
-#, fuzzy
 msgid "Show units ordered before specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:15
-#, fuzzy
 msgid "Show units ordered after specified unit"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:16
-#, fuzzy
 msgid "Do not ellipsize anything"
-msgstr "Do not write anything"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:17
-#, fuzzy
 msgid "Show the type of the socket"
-msgstr "Show help for the fish shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:18
 msgid "How to deal with queued jobs"
@@ -56755,9 +52300,8 @@ msgid "Ignore inhibitor locks on shutdown or sleep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:20
-#, fuzzy
 msgid "Suppress output to STDOUT"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:21
 msgid "Do not wait for the requested operation to finish"
@@ -56782,14 +52326,12 @@ msgid "Do not send wall message before halt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:27
-#, fuzzy
 msgid "Do not reload daemon configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:28
-#, fuzzy
 msgid "Disable asking for password"
-msgstr "Disable operator keywords"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:29
 msgid "Send signal to which process"
@@ -56812,18 +52354,16 @@ msgid "Make changes only temporarily"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:34
-#, fuzzy
 msgid "Number of journal lines to show"
-msgstr "Number nonblank lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:35
 msgid "Control journal formatting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:36
-#, fuzzy
 msgid "list-dependencies flat, not as tree"
-msgstr "List dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemctl.fish:42
 msgid "Reboot to EFI setup"
@@ -56854,28 +52394,24 @@ msgid "Disk image to mount the root directory for the container from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:5
-#, fuzzy
 msgid "Invoke init in the container"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:6
-#, fuzzy
 msgid "Change to user in the container"
-msgstr "Show the time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:7
 msgid "Sets the machine name for this container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:8
-#, fuzzy
 msgid "Set the specified UUID for the container."
-msgstr "Move file specified on commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:9
-#, fuzzy
 msgid "Make the container part of the specified slice"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:10
 msgid "Set a unit property on the scope unit"
@@ -56906,19 +52442,16 @@ msgid "Create a virtual Ethernet link (\"veth\") between host and container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:17
-#, fuzzy
 msgid "Adds the host side of the Ethernet link created to the specified bridge"
-msgstr "Define a lista de preferências padrão como a string especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:18
-#, fuzzy
 msgid "Map an ip port from the host to the container"
-msgstr "Copy and apply patches from another repository to this one"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:19
-#, fuzzy
 msgid "Sets the SELinux security context"
-msgstr "Mostra contexto de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:20
 msgid "Sets the SELinux security context for files in the API filesystems"
@@ -56949,19 +52482,16 @@ msgid "Mount the root file system read-only for the container"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:27
-#, fuzzy
 msgid "Bind mount a file or directory from the host in the container"
-msgstr "Remove one or more files or directories from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:28
-#, fuzzy
 msgid "Mount a tmpfs file system into the container"
-msgstr "Mount filesystems in fstab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:29
-#, fuzzy
 msgid "Mount directories as overlayfs in the container"
-msgstr "Lista diretórios, não seu conteúdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:30
 msgid "Pass environment variables to init in the container"
@@ -57088,9 +52618,8 @@ msgstr "Append files to archive"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:8
 #: /tmp/fish/implicit/share/completions/unrar.fish:2
-#, fuzzy
 msgid "List archive"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:9
 msgid "Append new files"
@@ -57211,9 +52740,8 @@ msgstr "Remove files after adding to archive"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
-#, fuzzy
 msgid "Do not sort file arguments"
-msgstr "Do not show flags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:46
 msgid "Preserve file ownership"
@@ -57245,9 +52773,8 @@ msgid "Ask for confirmation"
 msgstr "Ask for confirmation"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:56
-#, fuzzy
 msgid "Verify archive"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:57
 msgid "Exclude file"
@@ -57272,9 +52799,8 @@ msgid "Filter through specified program"
 msgstr "Filtrar pelo programa especificado"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:64
-#, fuzzy
 msgid "Filter through xz"
-msgstr "Filter through gzip"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tee.fish:1
 msgid "append to the given FILEs, do not overwrite"
@@ -57285,9 +52811,8 @@ msgid "ignore interrupt signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:1
-#, fuzzy
 msgid "Display help message"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:3
 msgid "Tell termite start <cmd> instead of the shell"
@@ -57298,9 +52823,8 @@ msgid "The role to set the termite window to report itself with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:5
-#, fuzzy
 msgid "Set the termite window's title"
-msgstr "Muda a cor do terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:6
 msgid "Tell termite to change to <dir> when launching"
@@ -57319,9 +52843,8 @@ msgid "Launch on <disp> X display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:10
-#, fuzzy
 msgid "Config file to use"
-msgstr "Alterar para usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:11
 msgid "Set the windows name part of WM_CLASS property"
@@ -57341,9 +52864,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:101
 #: /tmp/fish/implicit/share/completions/terraform.fish:116
 #: /tmp/fish/implicit/share/completions/terraform.fish:125
-#, fuzzy
 msgid "Path to backup the existing state file"
-msgstr "Make backup of each existing destination file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:5
 #: /tmp/fish/implicit/share/completions/terraform.fish:23
@@ -57364,9 +52886,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:104
 #: /tmp/fish/implicit/share/completions/terraform.fish:118
 #: /tmp/fish/implicit/share/completions/terraform.fish:127
-#, fuzzy
 msgid "Duration to retry a state lock"
-msgstr "Print directory stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:7
 #: /tmp/fish/implicit/share/completions/terraform.fish:52
@@ -57395,16 +52916,14 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:9
 #: /tmp/fish/implicit/share/completions/terraform.fish:26
 #: /tmp/fish/implicit/share/completions/terraform.fish:84
-#, fuzzy
 msgid "Limit the number of concurrent operations"
-msgstr "Number of concurrent jobs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:10
 #: /tmp/fish/implicit/share/completions/terraform.fish:27
 #: /tmp/fish/implicit/share/completions/terraform.fish:85
-#, fuzzy
 msgid "Update state prior to checking for differences"
-msgstr "Update the working copy to a different URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:11
 #: /tmp/fish/implicit/share/completions/terraform.fish:17
@@ -57423,17 +52942,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:107
 #: /tmp/fish/implicit/share/completions/terraform.fish:122
 #: /tmp/fish/implicit/share/completions/terraform.fish:131
-#, fuzzy
 msgid "Path to write state"
-msgstr "Do not write mtab"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:13
 #: /tmp/fish/implicit/share/completions/terraform.fish:30
 #: /tmp/fish/implicit/share/completions/terraform.fish:87
 #: /tmp/fish/implicit/share/completions/terraform.fish:108
-#, fuzzy
 msgid "Resource to target"
-msgstr "Set volume name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:14
 #: /tmp/fish/implicit/share/completions/terraform.fish:18
@@ -57442,9 +52959,8 @@ msgstr "Set volume name"
 #: /tmp/fish/implicit/share/completions/terraform.fish:88
 #: /tmp/fish/implicit/share/completions/terraform.fish:96
 #: /tmp/fish/implicit/share/completions/terraform.fish:109
-#, fuzzy
 msgid "Set a variable in the Terraform configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:15
 #: /tmp/fish/implicit/share/completions/terraform.fish:19
@@ -57453,9 +52969,8 @@ msgstr "Reload service configuration"
 #: /tmp/fish/implicit/share/completions/terraform.fish:89
 #: /tmp/fish/implicit/share/completions/terraform.fish:97
 #: /tmp/fish/implicit/share/completions/terraform.fish:110
-#, fuzzy
 msgid "Set variables from a file"
-msgstr "Set format file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:16
 msgid "Interactive console for Terraform interpolations"
@@ -57466,67 +52981,56 @@ msgid "Destroy Terraform-managed infrastructure"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:22
-#, fuzzy
 msgid "Don't ask for input for destroy confirmation"
-msgstr "Não mostra grupo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:33
-#, fuzzy
 msgid "Environment management"
-msgstr "Handle environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:34
-#, fuzzy
 msgid "List environments"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:35
-#, fuzzy
 msgid "Select an environment"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:36
-#, fuzzy
 msgid "Create a new environment"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:37
-#, fuzzy
 msgid "Delete an existing environment"
-msgstr "Assert freestanding environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:38
 msgid "Rewrite config files to canonical format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:39
-#, fuzzy
 msgid "List files whose formatting differs"
-msgstr "Specifies line formatting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:40
-#, fuzzy
 msgid "Write result to source file"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:41
-#, fuzzy
 msgid "Display diffs of formatting changes"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:42
 msgid "Download and install modules for the configuration"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:43
-#, fuzzy
 msgid "Check modules for updates"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:45
-#, fuzzy
 msgid "Create a visual graph of Terraform resources"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:46
 msgid "Highlight any cycles in the graph"
@@ -57541,9 +53045,8 @@ msgid "Import existing infrastructure into Terraform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:51
-#, fuzzy
 msgid "Path to a directory of configuration files"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:56
 msgid "Specific provider to use for import"
@@ -57558,14 +53061,12 @@ msgid "Configure the backend for this environment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:63
-#, fuzzy
 msgid "Backend configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:64
-#, fuzzy
 msgid "Download modules for this configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:65
 msgid "Ask for input if necessary"
@@ -57576,32 +53077,28 @@ msgid "Suppress prompts about copying state data"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:70
-#, fuzzy
 msgid "Read an output from a state file"
-msgstr "Read job from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:71
 msgid "Path to the state file to read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:73
-#, fuzzy
 msgid "Return the outputs for a specific module"
-msgstr "Escreve a saída no arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:74
-#, fuzzy
 msgid "Print output in JSON format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:75
 msgid "Generate and show an execution plan"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:76
-#, fuzzy
 msgid "Generate a plan to destroy all resources"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:77
 msgid "Return detailed exit codes"
@@ -57613,9 +53110,8 @@ msgid "Depth of modules to show in the output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:83
-#, fuzzy
 msgid "Write a plan file to the given path"
-msgstr "Prepend file to input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:90
 msgid "Upload this Terraform module to Atlas to run"
@@ -57630,9 +53126,8 @@ msgid "Lock modules and upload completely"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:93
-#, fuzzy
 msgid "Name of the configuration in Atlas"
-msgstr "Specify a configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:94
 msgid "Access token to use to upload"
@@ -57677,24 +53172,20 @@ msgid "Validate the Terraform files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:134
-#, fuzzy
 msgid "Print the Terraform version"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:2
-#, fuzzy
 msgid "Negate expression"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:3
-#, fuzzy
 msgid "Logical AND"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:4
-#, fuzzy
 msgid "Logical OR"
-msgstr "Logical or"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:5
 msgid "String length is non-zero"
@@ -57761,24 +53252,20 @@ msgid "File is set-group-ID"
 msgstr "File is set-group-ID"
 
 #: /tmp/fish/implicit/share/completions/test.fish:21
-#, fuzzy
 msgid "File owned by our effective group ID"
-msgstr "File owned by effective group ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:22
-#, fuzzy
 msgid "File is a symlink"
-msgstr "File is symlink"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:23
-#, fuzzy
 msgid "File owned by our effective user ID"
-msgstr "File owned by effective user ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:24
-#, fuzzy
 msgid "File is a named pipe"
-msgstr "File is named pipe"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:25
 msgid "File is readable"
@@ -57789,14 +53276,12 @@ msgid "File size is non-zero"
 msgstr "File size is non-zero"
 
 #: /tmp/fish/implicit/share/completions/test.fish:27
-#, fuzzy
 msgid "File is a socket"
-msgstr "File is socket"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:28
-#, fuzzy
 msgid "FD is a terminal"
-msgstr "FD is terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:29
 msgid "File set-user-ID bit is set"
@@ -57822,9 +53307,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/tex.fish:7
 #: /tmp/fish/implicit/share/completions/tex.fish:8
 #: /tmp/fish/implicit/share/completions/tex.fish:9
-#, fuzzy
 msgid "Set interaction mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:11
 msgid "Enable \\write18{SHELL COMMAND}"
@@ -57835,9 +53319,8 @@ msgid "Disable \\write18{SHELL COMMAND}"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tex.fish:13
-#, fuzzy
 msgid "Insert source specials into the DVI file"
-msgstr "Generate source index file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:1
 msgid "Maintain RTC in local time"
@@ -57880,9 +53363,8 @@ msgid "Send a KILL signal after DURATION"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/timeout.fish:3
-#, fuzzy
 msgid "Specify the signal to be sent"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:1
 msgid "Add an exclusion not to back up a file"
@@ -57895,9 +53377,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:3
 #: /tmp/fish/implicit/share/completions/tmutil.fish:37
-#, fuzzy
 msgid "Path exclusion"
-msgstr "PKZIP recursion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:4
 msgid "Bind a snapshot volume directory to the specified local disk"
@@ -57912,63 +53393,52 @@ msgid "Perform a backup diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:7
-#, fuzzy
 msgid "Compare all supported metadata"
-msgstr "Comprime dados"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:8
 msgid "No metadata comparison"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:9
-#, fuzzy
 msgid "Compare extended attributes"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:10
-#, fuzzy
 msgid "Compare creation times"
-msgstr "Compare month names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:11
-#, fuzzy
 msgid "Compare file data forks"
-msgstr "Profile data format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:12
-#, fuzzy
 msgid "Compare ACLs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:13
-#, fuzzy
 msgid "Compare file flags"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:14
-#, fuzzy
 msgid "Compare GIDs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:15
-#, fuzzy
 msgid "Compare file modes"
-msgstr "Completly silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:16
-#, fuzzy
 msgid "Compare sizes"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:17
-#, fuzzy
 msgid "Compare modification times"
-msgstr "Change modification time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:18
-#, fuzzy
 msgid "Compare UIDs"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:19
 msgid "Limit traversal depth to depth levels from the beginning of iteration"
@@ -57979,23 +53449,20 @@ msgid "Dont take exclusions into account"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:21
-#, fuzzy
 msgid "Ignore path"
-msgstr "Ignore case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:22
 msgid "Ignore logical volume identity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:23
-#, fuzzy
 msgid "Delete one or more snapshots"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:24
-#, fuzzy
 msgid "Print information about destinations"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:25
 msgid "Turn off automatic backups"
@@ -58023,43 +53490,36 @@ msgid "Determine if a file, directory, or volume are excluded from backups"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:31
-#, fuzzy
 msgid "Print the path to the latest snapshot"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:32
-#, fuzzy
 msgid "Print paths for all snapshots"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
-#, fuzzy
 msgid "Removes a backup destination"
-msgstr "Remove completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:35
-#, fuzzy
 msgid "Remove an exclusion"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:38
 msgid "Restore an item"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:39
-#, fuzzy
 msgid "Set a backup destination"
-msgstr "Remove completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:40
-#, fuzzy
 msgid "Add to the list of destinations"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:41
 msgid "Enter the password at a non-echoing interactive prompt"
@@ -58074,23 +53534,20 @@ msgid "Begin a backup if one is not already running"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:44
-#, fuzzy
 msgid "Automatic mode"
-msgstr "Cumulative mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:45
 msgid "Block until finished"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:46
-#, fuzzy
 msgid "Automatic rotation"
-msgstr "Attempt automatic login"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:47
-#, fuzzy
 msgid "Backup destination"
-msgstr "Back up the original version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:48
 msgid "Cancel a backup currently in progress"
@@ -58105,23 +53562,20 @@ msgid "Verify snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:52
-#, fuzzy
 msgid "Print as XML"
-msgstr "Print database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:1
-#, fuzzy
 msgid "available sessions"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:2
 msgid "connected clients"
 msgstr "clientes conectados"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:3
-#, fuzzy
 msgid "window panes"
-msgstr "Window size change"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:4
 msgid "Force tmux to assume the terminal supports 256 colours"
@@ -58132,62 +53586,52 @@ msgid "Like -2, but indicates that the terminal supports 88 colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:6
-#, fuzzy
 msgid "Behave as a login shell"
-msgstr "Este é um shell de login"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:7
-#, fuzzy
 msgid "Set the quiet server option"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:8
 msgid "Flag explicitly informs tmux that UTF-8 is supported"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:9
-#, fuzzy
 msgid "Request verbose logging"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:10
-#, fuzzy
 msgid "Report the tmux version"
-msgstr "Ordena por versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:11
-#, fuzzy
 msgid "Execute command using the default shell"
-msgstr "Select entire command line (default)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:13
-#, fuzzy
 msgid "Specify the name of the server socket to use"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:14
 msgid "Full path to server socket. If set, -L is ignored."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:15
-#, fuzzy
 msgid "attach to existing session"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:16
-#, fuzzy
 msgid "detach other clients"
-msgstr "clientes conectados"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:17
-#, fuzzy
 msgid "attach in read-only mode"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:18
-#, fuzzy
 msgid "detach current client"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:19
 msgid "SIGHUP parent process of client, likely causing it to exit"
@@ -58208,29 +53652,24 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:23
-#, fuzzy
 msgid "list all attached clients"
-msgstr "Delete the logfile when done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:24
-#, fuzzy
 msgid "list syntax for all tmux commands"
-msgstr "Disable this command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:25
-#, fuzzy
 msgid "list all sessions"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:26
-#, fuzzy
 msgid "lock client"
-msgstr "Tamanho do bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:27
-#, fuzzy
 msgid "lock session"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:28
 msgid "create a new session with name session-name"
@@ -58241,47 +53680,40 @@ msgid "don't attach to current window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:30
-#, fuzzy
 msgid "window-name"
-msgstr "Window size change"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:31
-#, fuzzy
 msgid "session-name"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:32
-#, fuzzy
 msgid "width"
-msgstr "Line width"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:33
 msgid "height"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:34
-#, fuzzy
 msgid "refresh client"
-msgstr "Nome do cliente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:35
-#, fuzzy
 msgid "update client status bar"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:36
-#, fuzzy
 msgid "rename session"
-msgstr "Rename stdin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:37
 msgid "save msgs in status bar in per-client msg log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:38
-#, fuzzy
 msgid "execute commands from path"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:39
 msgid "start tmux server if not running; do not create a session"
@@ -58296,51 +53728,43 @@ msgid "Switch the current session for client target-client to target-session"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:42
-#, fuzzy
 msgid "move client to the last session"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:43
-#, fuzzy
 msgid "move client to the next session"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:44
-#, fuzzy
 msgid "move client to the previous session"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:45
-#, fuzzy
 msgid "toggle if client is read-only"
-msgstr "Open folder read-only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:46
 #: /tmp/fish/implicit/share/completions/tmux.fish:47
 #: /tmp/fish/implicit/share/completions/tmux.fish:73
 #: /tmp/fish/implicit/share/completions/tmux.fish:76
-#, fuzzy
 msgid "target-session"
-msgstr "Merge revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:48
 #: /tmp/fish/implicit/share/completions/tmux.fish:49
 #: /tmp/fish/implicit/share/completions/tmux.fish:80
 #: /tmp/fish/implicit/share/completions/tmux.fish:84
-#, fuzzy
 msgid "target-client"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:50
-#, fuzzy
 msgid "format string"
-msgstr "Prompt string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:51
 #: /tmp/fish/implicit/share/completions/tmux.fish:74
-#, fuzzy
 msgid "bind key to command"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:52
 msgid "bind for command mode instead of normal mode"
@@ -58351,9 +53775,8 @@ msgid "make the binding work without using a prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:54
-#, fuzzy
 msgid "key may repeat"
-msgstr "Specify man path"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:55
 msgid "choose key table for binding"
@@ -58361,15 +53784,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:56
 #: /tmp/fish/implicit/share/completions/tmux.fish:58
-#, fuzzy
 msgid "list all key bindings"
-msgstr "Gerencia atalhos de teclado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:57
 #: /tmp/fish/implicit/share/completions/tmux.fish:68
-#, fuzzy
 msgid "key table"
-msgstr "Executável"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:59
 msgid "reset terminal state"
@@ -58377,85 +53798,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:60
 #: /tmp/fish/implicit/share/completions/tmux.fish:63
-#, fuzzy
 msgid "target pane"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:61
 msgid "send the prefix key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:62
-#, fuzzy
 msgid "use secondary prefix"
-msgstr "Set directory prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:64
 msgid "unbind the command bound to key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:65
-#, fuzzy
 msgid "remove all key bindings"
-msgstr "Unable to parse key binding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:66
-#, fuzzy
 msgid "binding for command mode"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:67
 msgid "command bound to key without a prefix (if any) removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:69
-#, fuzzy
 msgid "Set or unset an environment variable"
-msgstr "Help on environment variables"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:70
 #: /tmp/fish/implicit/share/completions/tmux.fish:75
-#, fuzzy
 msgid "global environment"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:71
 msgid "remove from environment before starting a new process"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:72
-#, fuzzy
 msgid "unset variable"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:77
 msgid "Open the command prompt in a client"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:78
-#, fuzzy
 msgid "Comma-separated list of initial text for each prompt"
-msgstr "Comma-separated list of dependancy types to show"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:79
-#, fuzzy
 msgid "Comma-separated list of prompts"
-msgstr "Formato separado por vírgula"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:81
-#, fuzzy
 msgid "Display a message"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:82
-#, fuzzy
 msgid "print to stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:83
-#, fuzzy
 msgid "target-pane"
-msgstr "Target line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:2
 msgid "Toggle command line/program name"
@@ -58466,9 +53875,8 @@ msgid "Toggle idle processes"
 msgstr "Toggle idle processes"
 
 #: /tmp/fish/implicit/share/completions/top.fish:6
-#, fuzzy
 msgid "Maximum iterations"
-msgstr "Maximium iterations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/top.fish:7
 msgid "Monitor effective UID"
@@ -58499,9 +53907,8 @@ msgid "Output  a longer help message then quit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:3
-#, fuzzy
 msgid "Output version information then quit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:4
 msgid "Tell any running totem instance: Toggle between play and pause"
@@ -58560,33 +53967,28 @@ msgid "Add torrents to transmission"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:2
-#, fuzzy
 msgid "Enable debugging mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:3
 msgid "Use the alternate Limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:4
-#, fuzzy
 msgid "Don't use the alternate Limits"
-msgstr "Don't run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:5
-#, fuzzy
 msgid "Limit the alternate download speed"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:6
-#, fuzzy
 msgid "Limit the alternate upload speed"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:7
-#, fuzzy
 msgid "Use the scheduled on/off times"
-msgstr "Use this files times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:8
 msgid "Don't use the scheduled on/off times"
@@ -58617,28 +54019,24 @@ msgid "Directory for incomplete downloads"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:15
-#, fuzzy
 msgid "Don't store incomplete torrents in a different directory"
-msgstr "Don't remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:16
-#, fuzzy
 msgid "Limit the maximum download speed to limit"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:17
-#, fuzzy
 msgid "Disable download speed limits"
-msgstr "Disable downloading packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:18
 msgid "Set the session's maximum memory cache size (MiB)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:19
-#, fuzzy
 msgid "Encrypt all peer connections"
-msgstr "Encrypt all net traffic"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:20
 msgid "Prefer encrypted peer connections"
@@ -58653,9 +54051,8 @@ msgid "Tell the Transmission to initiate a shutdown"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:23
-#, fuzzy
 msgid "Get a file list for the current torrent(s)"
-msgstr "Sets an index list for the next track"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:24
 msgid "Mark file(s) for download"
@@ -58674,48 +54071,40 @@ msgid "All torrents should seed regardless of ratio"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:28
-#, fuzzy
 msgid "Print command-line option descriptions"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:29
-#, fuzzy
 msgid "Show details of the current torrent(s)"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:30
-#, fuzzy
 msgid "List session information from the server"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:31
-#, fuzzy
 msgid "List statistical information from the server"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:32
-#, fuzzy
 msgid "List all torrents"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:33
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:34
-#, fuzzy
 msgid "Disable portmapping"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:35
-#, fuzzy
 msgid "Set the username:password for authentication"
-msgstr "Prompt for password for authenticating server"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:37
-#, fuzzy
 msgid "Set authentication information from a netrc file"
-msgstr "Print out history information for a module"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:38
 msgid "Enable distributed hash table (DHT)"
@@ -58742,29 +54131,24 @@ msgid "Give this torrent low bandwidth"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:44
-#, fuzzy
 msgid "Try to download the specified files first"
-msgstr "Escreve lo no descritor de arquivo especificado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:45
-#, fuzzy
 msgid "Try to download the specified files normally"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:46
-#, fuzzy
 msgid "Try to download the specified files last"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:47
-#, fuzzy
 msgid "Set the maximum number of peers"
-msgstr "Set the maximum fuzz factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:48
-#, fuzzy
 msgid "Remove the current torrents"
-msgstr "Remove the test directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:49
 msgid "Remove the current torrents and delete data"
@@ -58799,19 +54183,16 @@ msgid "Add a tracker to a torrent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:57
-#, fuzzy
 msgid "Remove a tracker from a torrent"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:58
-#, fuzzy
 msgid "Start the current torrents"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:59
-#, fuzzy
 msgid "Stop the current torrents"
-msgstr "Pára a função em execução"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:60
 msgid "Start added torrents paused"
@@ -58842,9 +54223,8 @@ msgid "Make the current torrent(s) not honor the session limits"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:67
-#, fuzzy
 msgid "Limit the maximum upload speed (KiB/s)"
-msgstr "Limit the download speed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:68
 msgid "Disable upload speed limits"
@@ -58855,14 +54235,12 @@ msgid "Enable uTP for peer connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:70
-#, fuzzy
 msgid "Disable uTP for peer connections"
-msgstr "Disable automtic buffer allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:71
-#, fuzzy
 msgid "Verify the current torrents"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:73
 msgid "Use directory as default for new downloads"
@@ -58909,28 +54287,24 @@ msgid "Displays the most recent build for each branch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:3
-#, fuzzy
 msgid "Lists or deletes repository caches"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:4
 msgid "Cancels a job or build"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:5
-#, fuzzy
 msgid "Interactive shell"
-msgstr "Test if this is an interactive shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:6
-#, fuzzy
 msgid "Disables a project"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:7
-#, fuzzy
 msgid "Enables a project"
-msgstr "Enable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:8
 msgid "Encrypts values for the .travis.yml"
@@ -58941,14 +54315,12 @@ msgid "Encrypts a file and adds decryption steps to .travis.yml"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:10
-#, fuzzy
 msgid "Displays or changes the API endpoint"
-msgstr "Display $ at end of line"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
-#, fuzzy
 msgid "Show or modify build environment variables"
-msgstr "Modifica variáveis de ambiente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:12
 msgid "Helps you out when in dire need of information"
@@ -59003,18 +54375,16 @@ msgid "Lists repositories the user has certain permissions on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:25
-#, fuzzy
 msgid "Lists recent requests"
-msgstr "Bytes per request"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:26
 msgid "Restarts a build or job"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:27
-#, fuzzy
 msgid "Access repository settings"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:28
 msgid "Sets up an addon or deploy target"
@@ -59041,18 +54411,16 @@ msgid "Outputs the secret API token"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:34
-#, fuzzy
 msgid "Outputs the client version"
-msgstr "Back up the original version"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:35
 msgid "Lists most recent builds"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:36
-#, fuzzy
 msgid "Outputs the current user"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:38
 msgid "Be interactive and colorful"
@@ -59063,67 +54431,56 @@ msgid "Don't be interactive and colorful"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:40
-#, fuzzy
 msgid "Don't rescue exceptions"
-msgstr "Don't execute scripts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:41
-#, fuzzy
 msgid "Rescue exceptions"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:42
-#, fuzzy
 msgid "Don't check if travis client is up to date"
-msgstr "Don't check for sufficient disk space before installation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:43
 msgid "Don't check if auto-completion is set up"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:1
-#, fuzzy
 msgid "All files are listed"
-msgstr "All bitfields are signed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:2
-#, fuzzy
 msgid "List directories only"
-msgstr "Lista subdiretórios recursivamente"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:3
-#, fuzzy
 msgid "Follow symbolic links like directories"
-msgstr "Link simbólico para diretório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:4
-#, fuzzy
 msgid "Print the full path prefix for each file"
-msgstr "Print full path of source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:5
-#, fuzzy
 msgid "Stay on current filesystem only"
-msgstr "Stay on this file system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:6
-#, fuzzy
 msgid "Descend only level directories deep"
-msgstr "Recursively remove subdirectories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:7
 msgid "Rerun tree when max dir level reached"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:8
-#, fuzzy
 msgid "List only those files that match the pattern given"
-msgstr "Exclude files thet match pattern in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:9
-#, fuzzy
 msgid "Do not list files that match the given pattern"
-msgstr "Insert modules matching the given wildcard"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:10
 msgid "Turn off file/directory count at end of tree listing"
@@ -59142,43 +54499,36 @@ msgid "Print and format time according to the format <f>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:14
-#, fuzzy
 msgid "Output to file instead of stdout"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:15
-#, fuzzy
 msgid "Print non-printable characters as '?'"
-msgstr "Mostra caracteres não imprimíveis com '?'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:16
-#, fuzzy
 msgid "Print non-printable characters as is"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:17
 msgid "Quote filenames with double quotes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:18
-#, fuzzy
 msgid "Print the protections for each file"
-msgstr "Launch default action for each file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:19
-#, fuzzy
 msgid "Displays file owner or UID number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:20
-#, fuzzy
 msgid "Displays file group owner or GID number"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:21
-#, fuzzy
 msgid "Print the size in bytes of each file"
-msgstr "Mostra tamanhos de arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:22
 msgid "Print the size in a more human readable way"
@@ -59197,14 +54547,12 @@ msgid "Appends '/', '=', '*', '@', '|' or '>' as per ls -F"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:26
-#, fuzzy
 msgid "Print inode number of each file"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:27
-#, fuzzy
 msgid "Print device ID number to which each file belongs"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:28
 msgid "Sort files alphanumerically by version"
@@ -59215,9 +54563,8 @@ msgid "Sort files in reverse alphanumeric order"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:30
-#, fuzzy
 msgid "Sort files by last modification time"
-msgstr "Ordena por hora de modificação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:31
 msgid "Sort files by last status change time"
@@ -59232,9 +54579,8 @@ msgid "List directories before files (-U disables)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:34
-#, fuzzy
 msgid "Don't print indentation lines"
-msgstr "Do not print explanations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:35
 msgid "Print ANSI lines graphic indentation lines"
@@ -59269,9 +54615,8 @@ msgid "Turn off hyperlinks in HTML output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tree.fish:44
-#, fuzzy
 msgid "Print usage and this help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:1
 msgid "use the complement of SET1"
@@ -59300,14 +54645,12 @@ msgid "all letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:9
-#, fuzzy
 msgid "all horizontal whitespace"
-msgstr "Ignorar todos os espaços em branco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:10
-#, fuzzy
 msgid "all control characters"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:11
 msgid "all digits"
@@ -59322,14 +54665,12 @@ msgid "all lower case letters"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:14
-#, fuzzy
 msgid "all printable characters, including space"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:15
-#, fuzzy
 msgid "all punctuation characters"
-msgstr "Escape all non-printing characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:16
 msgid "all horizontal or vertical whitespace"
@@ -59367,98 +54708,80 @@ msgid "Guarantee that any output is unbuffered."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:24
-#, fuzzy
 msgid "alphanumeric characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:25
-#, fuzzy
 msgid "alphabetic characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:26
-#, fuzzy
 msgid "whitespace characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:27
-#, fuzzy
 msgid "control characters"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:28
-#, fuzzy
 msgid "numeric characters"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:29
-#, fuzzy
 msgid "graphic characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:30
-#, fuzzy
 msgid "ideographic characters"
-msgstr "Mostra caracteres não imprimíveis com '?'"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:31
-#, fuzzy
 msgid "lower-case alphabetic characters"
-msgstr "Escapa caracteres não imprimíveis com octal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:32
-#, fuzzy
 msgid "phonographic characters"
-msgstr "Escapa caracteres não imprimíveis com octal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:33
-#, fuzzy
 msgid "printable characters"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:34
-#, fuzzy
 msgid "punctuation characters"
-msgstr "Output character range"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:35
-#, fuzzy
 msgid "valid characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:36
-#, fuzzy
 msgid "space characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:37
-#, fuzzy
 msgid "special characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:38
-#, fuzzy
 msgid "upper-case characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tr.fish:39
-#, fuzzy
 msgid "hexadecimal characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:2
 msgid "Print all possible definitions of the specified name"
 msgstr "Print all possible definitions of the specified name"
 
 #: /tmp/fish/implicit/share/completions/type.fish:3
-#, fuzzy
 msgid "Suppress function and builtin lookup"
-msgstr "Supress function and builtin lookup"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:4
-#, fuzzy
 msgid "Print command type"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:5
 msgid "Print path to command, or nothing if name is not a command"
@@ -59469,108 +54792,90 @@ msgid "Print path to command"
 msgstr "Print path to command"
 
 #: /tmp/fish/implicit/share/completions/type.fish:7
-#, fuzzy
 msgid "Suppress output"
-msgstr "Suppresses normal output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:3
-#, fuzzy
 msgid "Shows information about an object"
-msgstr "Suppress informational output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:4
-#, fuzzy
 msgid "Shows information about all objects"
-msgstr "Display information about a local or remote item"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:5
 msgid "Shows high-level status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:6
-#, fuzzy
 msgid "Monitor changes to objects"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:7
 #: /tmp/fish/implicit/share/completions/zfs.fish:17
-#, fuzzy
 msgid "Mount a filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:18
-#, fuzzy
 msgid "Unmount a filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:9
-#, fuzzy
 msgid "Unlock an encrypted device"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:10
 msgid "Lock an encrypted device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:11
-#, fuzzy
 msgid "Set-up a loop device"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:12
-#, fuzzy
 msgid "Delete a loop device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:13
 msgid "Safely power off a drive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:14
-#, fuzzy
 msgid "Set SMART data for a drive"
-msgstr "Set date forward"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:15
-#, fuzzy
 msgid "Object to get information about"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:16
-#, fuzzy
 msgid "Block device to get information about"
-msgstr "Retorna informação de estado do fish"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:17
-#, fuzzy
 msgid "Drive to get information about"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:18
-#, fuzzy
 msgid "Filesystem type to use"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:20
-#, fuzzy
 msgid "Force/layzy unmount"
-msgstr "Lazy unmount"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:22
-#, fuzzy
 msgid "Mounted block device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:23
-#, fuzzy
 msgid "File to set-up a loop device for"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:24
-#, fuzzy
 msgid "Setup read-only device"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:25
 msgid "Start at <num> bytes into file"
@@ -59593,37 +54898,32 @@ msgid "File with libatasmart blob"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:30
-#, fuzzy
 msgid "Do not authenticate the user if needed"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:31
 msgid "Object to "
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:32
-#, fuzzy
 msgid "Block device to "
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:33
 msgid "Object path for ATA device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:34
-#, fuzzy
 msgid "Block device for ATA device"
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:1
-#, fuzzy
 msgid "Set or get soft limit"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:2
-#, fuzzy
 msgid "Set or get hard limit"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:3
 msgid "Set or get all current limits"
@@ -59670,9 +54970,8 @@ msgid "Maximum amount of virtual memory available to the shell"
 msgstr "Maximum amount of virtual memory available to the shell"
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:15
-#, fuzzy
 msgid "New resource limit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/umount.fish:5
 msgid "Unmount without writing in /etc/mtab"
@@ -59725,38 +55024,32 @@ msgid "Behave as though all of the options mnrsv were specified."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:2
-#, fuzzy
 msgid "print the machine hardware name."
-msgstr "Print machine name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:3
-#, fuzzy
 msgid "print the nodename"
-msgstr "Print kernel name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:4
 msgid "print the machine processor architecture name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:5
-#, fuzzy
 msgid "print the operating system release."
-msgstr "Print operating system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:6
-#, fuzzy
 msgid "print the operating system name."
-msgstr "Print operating system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:7
-#, fuzzy
 msgid "print the operating system version."
-msgstr "Print operating system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:8
-#, fuzzy
 msgid "Print all information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:9
 msgid "Print kernel name"
@@ -59771,9 +55064,8 @@ msgid "Print kernel release"
 msgstr "Print kernel release"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:12
-#, fuzzy
 msgid "Print kernel version"
-msgstr "Print PKG versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:13
 msgid "Print machine name"
@@ -59788,9 +55080,8 @@ msgid "Print hardware platform"
 msgstr "Print hardware platform"
 
 #: /tmp/fish/implicit/share/completions/uname.fish:16
-#, fuzzy
 msgid "Print operating system"
-msgstr "Print operating system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unexpand.fish:1
 msgid "convert all blanks, instead of just initial blanks"
@@ -59809,34 +55100,28 @@ msgid "use comma separated LIST of tab positions (enables -a)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:1
-#, fuzzy
 msgid "Extract files to current directory"
-msgstr "Read files under each directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:3
-#, fuzzy
 msgid "List archive (technical)"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:4
-#, fuzzy
 msgid "List archive (bare)"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:5
-#, fuzzy
 msgid "Print file to stdout"
-msgstr "Pipe files to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:6
-#, fuzzy
 msgid "Test archive files"
-msgstr "Archive file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:7
-#, fuzzy
 msgid "Verbosely list archive"
-msgstr "Verify archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:8
 msgid "Verbosely list archive (technical)"
@@ -59847,19 +55132,16 @@ msgid "Verbosely list archive (bare)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:10
-#, fuzzy
 msgid "Extract files with full path"
-msgstr "Extract file from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:1
-#, fuzzy
 msgid "Show a short help screen"
-msgstr "Mostra e ordena por hora de criação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:2
-#, fuzzy
 msgid "Show version string"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:3
 msgid "Show eixrc-variables"
@@ -59870,14 +55152,12 @@ msgid "Show default eixrc-variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:5
-#, fuzzy
 msgid "Produce no output"
-msgstr "Audio output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:6
-#, fuzzy
 msgid "Output to the given file"
-msgstr "Output to /dev/null"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:7
 msgid "Exclude the given overlay from the update-process"
@@ -59892,9 +55172,8 @@ msgid "Override cache method for a specified overlay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:2
-#, fuzzy
 msgid "Be verbose (default)"
-msgstr "(padrão)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:3
 msgid "Call wget as the given USER"
@@ -59909,14 +55188,12 @@ msgid "A comment about this user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:2
-#, fuzzy
 msgid "Home directory for the new user"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:3
-#, fuzzy
 msgid "Supplementary groups"
-msgstr "Select by group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:5
 msgid "The user's home directory will be created if it does not exist"
@@ -59960,9 +55237,8 @@ msgid "The group name or ID for a new user's initial group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/useradd.fish:15
-#, fuzzy
 msgid "Name of the new user's login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:1
 msgid "Append groups (use with -G)"
@@ -59973,9 +55249,8 @@ msgid "Change user's password file comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:3
-#, fuzzy
 msgid "Change user's login directory"
-msgstr "Muda diretório de trabalho"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:4
 msgid "Date on which the user account will be disabled"
@@ -59994,9 +55269,8 @@ msgid "List of groups which the user is also a member of"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:8
-#, fuzzy
 msgid "Change user's name"
-msgstr "Alterar para usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:9
 msgid "Lock user's password"
@@ -60011,23 +55285,20 @@ msgid "Allow non-unique UID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:13
-#, fuzzy
 msgid "Apply changes in this directory"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:14
-#, fuzzy
 msgid "The name of the user's new login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:15
 msgid "The new numerical value of the user's ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:16
-#, fuzzy
 msgid "Unlock a users password"
-msgstr "Unlock a revision"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:17
 msgid "Add a range of subordinate uids to the user's account"
@@ -60050,48 +55321,40 @@ msgid "The new SELinux user for the user's login"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:1
-#, fuzzy
 msgid "Test if vagrant has yet to be given the main command"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:2
-#, fuzzy
 msgid "Lists all available Vagrant boxes"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:4
-#, fuzzy
 msgid "Print the help and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:5
-#, fuzzy
 msgid "Manages boxes"
-msgstr "Manual sections"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:6
 msgid "Adds a box"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:7
-#, fuzzy
 msgid "Lists all the installed boxes"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:8
-#, fuzzy
 msgid "Removes a box from Vagrant"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:9
-#, fuzzy
 msgid "Repackages the given box for redistribution"
-msgstr "Re-package the files before erasing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:10
-#, fuzzy
 msgid "Verifies the box with the given provider"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:11
 msgid "Connect to a remotely shared Vagrant environment"
@@ -60106,19 +55369,16 @@ msgid "Manually override static IP chosen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:14
-#, fuzzy
 msgid "SSH into the remote machine"
-msgstr "Specify root directory for rpm operations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:15
-#, fuzzy
 msgid "Destroys the running machine"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:16
-#, fuzzy
 msgid "Destroy without confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:17
 msgid "Global status of Vagrant environments"
@@ -60133,14 +55393,12 @@ msgid "Install Vagrant plugins through ruby gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:20
-#, fuzzy
 msgid "Shuts down the running machine"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:21
-#, fuzzy
 msgid "Force shut down"
-msgstr "Parada forçada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:22
 msgid "Initializes the Vagrant environment"
@@ -60151,14 +55409,12 @@ msgid "Log in to Vagrant Cloud"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:24
-#, fuzzy
 msgid "Only checks if you're logged in"
-msgstr "Only check if sorted"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:25
-#, fuzzy
 msgid "Logs you out if you're logged in"
-msgstr "List users logged in"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:26
 msgid "Packages a running machine into a reusable box"
@@ -60169,9 +55425,8 @@ msgid "Name or UUID of the virtual machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:28
-#, fuzzy
 msgid "Output file name"
-msgstr "Output file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:29
 msgid "Additional files to package with the box"
@@ -60186,18 +55441,16 @@ msgid "Manages plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:32
-#, fuzzy
 msgid "Installs a plugin"
-msgstr "Install after build"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:33
 msgid "Installs a license for a proprietary Vagrant plugin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:34
-#, fuzzy
 msgid "Lists installed plugins"
-msgstr "Limit to installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:35
 msgid "Uninstall the given plugin"
@@ -60209,18 +55462,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:37
 #: /tmp/fish/implicit/share/completions/vagrant.fish:41
-#, fuzzy
 msgid "Run only the given provisioners"
-msgstr "Seek to given time position"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:38
 msgid "Connects to machine via RDP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:39
-#, fuzzy
 msgid "Restarts the running machine"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:40
 msgid "Provisioners will not run"
@@ -60251,9 +55502,8 @@ msgid "Local HTTPS port to forward to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:48
-#, fuzzy
 msgid "Specific name for the share"
-msgstr "Specify filenames to be filtered"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:49
 msgid "Allow 'vagrant connect --ssh' access"
@@ -60264,94 +55514,80 @@ msgid "Key won't be encrypted with --ssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:51
-#, fuzzy
 msgid "Specific port for SSH when using --ssh"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:52
 msgid "Allow 'vagrant connect --ssh' only one time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:53
-#, fuzzy
 msgid "SSH into a running machine"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:54
-#, fuzzy
 msgid "Executes a single SSH command"
-msgstr "Execute argument as command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:55
-#, fuzzy
 msgid "Does not authenticate"
-msgstr "Don't cache auth tokens"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:56
-#, fuzzy
 msgid "Outputs configuration for an SSH config file"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:57
-#, fuzzy
 msgid "Name of the host for the outputted configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:58
 msgid "Status of the machines Vagrant is managing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:59
-#, fuzzy
 msgid "Suspends the running machine"
-msgstr "Show hidden functions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:60
-#, fuzzy
 msgid "Creates and configures guest machines"
-msgstr "Set configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:61
-#, fuzzy
 msgid "Enable provision"
-msgstr "Enable optimizations"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:62
-#, fuzzy
 msgid "Disable provision"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:63
 msgid "Enable only certain provisioners, by type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:1
-#, fuzzy
 msgid "Skin"
-msgstr "Skin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:3
-#, fuzzy
 msgid "Display help and debug options"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:7
 msgid "Valgrind-ise children"
 msgstr "Valgrind-ise children"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:8
-#, fuzzy
 msgid "Track file descriptors"
-msgstr "Redirecionar para descritor de arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:9
 msgid "Log to file descriptor"
 msgstr "Log to file descriptor"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:10
-#, fuzzy
 msgid "Log to file"
-msgstr "Log to tracefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:11
 msgid "Log to socket"
@@ -60386,15 +55622,13 @@ msgid "Debugger command"
 msgstr "Debugger command"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:19
-#, fuzzy
 msgid "File descriptor for input"
-msgstr "File descriptor for input"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:20
 #: /tmp/fish/implicit/share/completions/valgrind.fish:26
-#, fuzzy
 msgid "Check for memory leaks"
-msgstr "Check for memory leaks"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:21
 #: /tmp/fish/implicit/share/completions/valgrind.fish:27
@@ -60449,65 +55683,54 @@ msgid "Specify a function that allocates memory"
 msgstr "Specify a function that allocates memory"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:36
-#, fuzzy
 msgid "Profile heap usage"
-msgstr "Profile stack usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:37
-#, fuzzy
 msgid "The number of bytes of heap overhead per allocation"
-msgstr "The number of bytes of heap overhead per allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:38
-#, fuzzy
 msgid "Profile stack usage"
-msgstr "Profile stack usage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:39
-#, fuzzy
 msgid "Depth of call chain"
-msgstr "Depth of call chain"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:40
-#, fuzzy
 msgid "Profiling output format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:1
-#, fuzzy
 msgid "Start given VM"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:2
 msgid "Enable or disamble VRDE server or don't change setting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:3
-#, fuzzy
 msgid "Set VRDE property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:4
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:22
-#, fuzzy
 msgid "Specify settings password"
-msgstr "Specify the http password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:5
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:23
-#, fuzzy
 msgid "Specify file containing setting password"
-msgstr "Specify the http password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:6
-#, fuzzy
 msgid "Start VM in paused state"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:7
-#, fuzzy
 msgid "Record VM screen ouput to file"
-msgstr "Redirecionar saída para arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:8
 msgid "Frame width when recording"
@@ -60534,39 +55757,32 @@ msgid "Run separate VM process or attach to a running VM"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:3
-#, fuzzy
 msgid "Set temporary first hard disk"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:4
-#, fuzzy
 msgid "Set temporary first floppy disk"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:5
-#, fuzzy
 msgid "Set temporary CDROM/DVD"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:6
-#, fuzzy
 msgid "Set temporary boot device"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:7
-#, fuzzy
 msgid "Set temporary memory size in MB"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:8
-#, fuzzy
 msgid "Set temporary video memory size in MB"
-msgstr "Set temporary directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:9
-#, fuzzy
 msgid "Start VM in fullscreen mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:10
 msgid "Resize guest on fullscreen"
@@ -60585,14 +55801,12 @@ msgid "Make SDL frame non resizable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:14
-#, fuzzy
 msgid "Disable all hoskey combinations"
-msgstr "Don't trust the file modification times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:15
-#, fuzzy
 msgid "Disable specific hostkey combinations"
-msgstr "Disables specified type of authentication"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:16
 msgid "Disable mouse/keyboard grabbing on mouse click w/o additions"
@@ -60620,38 +55834,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:24
-#, fuzzy
 msgid "Enable raw ring 3"
-msgstr "Enable X11 forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:25
-#, fuzzy
 msgid "Enable raw ring 0"
-msgstr "Enable X11 forwarding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:26
-#, fuzzy
 msgid "Enable PATM"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:27
-#, fuzzy
 msgid "Enable CSAM"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:28
 msgid "Permit usage of VT-x/AMD-V"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:29
-#, fuzzy
 msgid "Disable raw ring 3"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:30
-#, fuzzy
 msgid "Disable raw ring 0"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/VBoxSDL.fish:31
 msgid "Disable PATM"
@@ -60683,9 +55891,8 @@ msgid "List saved file names after crash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:5
-#, fuzzy
 msgid "Read-only mode"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:6
 msgid "Use linear search for tags if tag file not sorted"
@@ -60696,23 +55903,20 @@ msgid "Start in display editing state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:10
-#, fuzzy
 msgid "Recover file after crash"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:11
-#, fuzzy
 msgid "Edit the file containing a tag"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:12
 msgid "Begin editing by executing the specified  editor command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:1
-#, fuzzy
 msgid "Test if vim-addons has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:2
 msgid "list the names of the addons available in the system"
@@ -60723,14 +55927,12 @@ msgid "show the status of the addons available in the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:4
-#, fuzzy
 msgid "install one or more addons under ~/.vim"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:5
-#, fuzzy
 msgid "remove one or more addons from ~/.vim"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:6
 msgid "disable  one  or more addons to be used by the current user"
@@ -60745,186 +55947,158 @@ msgid "list, one per line, the files composing the specified addons"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:9
-#, fuzzy
 msgid "displays detailed information about the specified addons"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:10
-#, fuzzy
 msgid "show this usage message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:11
 msgid "be quiet and make the output more parseable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:12
-#, fuzzy
 msgid "set the registry directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:13
-#, fuzzy
 msgid "set the addons source directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:14
-#, fuzzy
 msgid "set the addons target directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:15
 msgid "increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:16
-#, fuzzy
 msgid "set the system-wide target directory"
-msgstr "Set the home directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:17
 msgid "set target directory to the system-wide one"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:1
-#, fuzzy
 msgid "Execute Ex command after the first file has been read"
-msgstr "Execute command as if part of .wgetrc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:2
 msgid "Source file after the first file has been read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:3
-#, fuzzy
 msgid "Execute Ex command before loading any vimrc"
-msgstr "Executa comando se o comando anterior falhou"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:4
-#, fuzzy
 msgid "Use device as terminal (Amiga only)"
-msgstr "Use file as terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:5
 msgid "Set the viminfo file location"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:6
-#, fuzzy
 msgid "Open stacked windows for each file"
-msgstr "Launch default action for each file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:7
 msgid "Open side by side windows for each file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:8
-#, fuzzy
 msgid "Open tab pages for each file"
-msgstr "Display date for each line in file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:9
-#, fuzzy
 msgid "Start in quickFix mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:10
 msgid "Use swap files for recovery"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:11
-#, fuzzy
 msgid "Source and execute script file"
-msgstr "Don't execute scriplets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:12
-#, fuzzy
 msgid "Set the cursor to tag"
-msgstr "Set the connect timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:13
-#, fuzzy
 msgid "Terminal name"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:14
 msgid "Use alternative vimrc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:15
-#, fuzzy
 msgid "Use alternative vimrc in GUI mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:16
-#, fuzzy
 msgid "Record all typed characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:17
 msgid "Record all typed characters (overwrite file)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:18
-#, fuzzy
 msgid "Start in Arabic mode"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:19
-#, fuzzy
 msgid "Start in binary mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:20
 msgid "Behave mostly like vi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:21
-#, fuzzy
 msgid "Start in diff mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:22
-#, fuzzy
 msgid "Debugging mode"
-msgstr "Debug mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:23
-#, fuzzy
 msgid "Start in Ex mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:24
-#, fuzzy
 msgid "Start in improved Ex mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:25
 #: /tmp/fish/implicit/share/completions/vim.fish:46
-#, fuzzy
 msgid "Start in foreground mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:26
-#, fuzzy
 msgid "Start in Farsi mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:27
-#, fuzzy
 msgid "Start in GUI mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:28
 #: /tmp/fish/implicit/share/completions/vim.fish:48
-#, fuzzy
 msgid "Print help message and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:29
-#, fuzzy
 msgid "Start in Hebrew mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:30
 #: /tmp/fish/implicit/share/completions/vim.fish:37
@@ -60932,67 +56106,56 @@ msgid "List swap files"
 msgstr "Listar arquivos swap"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:31
-#, fuzzy
 msgid "Start in lisp mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:32
-#, fuzzy
 msgid "Disable file modification"
-msgstr "Don't trust the file modification times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:33
-#, fuzzy
 msgid "Disallow file modification"
-msgstr "Show last modification only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:34
 msgid "Reset compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:35
-#, fuzzy
 msgid "Don't use swap files"
-msgstr "Listar arquivos swap"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:36
-#, fuzzy
 msgid "Read only mode"
-msgstr "Read only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:38
-#, fuzzy
 msgid "Start in silent mode"
-msgstr "Standard mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:39
-#, fuzzy
 msgid "Start in verbose mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:40
-#, fuzzy
 msgid "Start in vi mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:41
 msgid "Use encryption when writing files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:42
-#, fuzzy
 msgid "Don't connect to X server"
-msgstr "Don't continue after an error"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:43
-#, fuzzy
 msgid "Start in easy mode"
-msgstr "Start interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:44
-#, fuzzy
 msgid "Start in restricted mode"
-msgstr "Restricted mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:45
 msgid "Become an editor server for NetBeans"
@@ -61003,9 +56166,8 @@ msgid "Echo the Window ID on stdout (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:49
-#, fuzzy
 msgid "Do not expand wildcards"
-msgstr "Do not expand pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:50
 msgid "Skip loading plugins"
@@ -61015,47 +56177,40 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/vim.fish:54
 #: /tmp/fish/implicit/share/completions/vim.fish:55
 #: /tmp/fish/implicit/share/completions/vim.fish:56
-#, fuzzy
 msgid "Edit files on Vim server"
-msgstr "Edit files in place"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:52
-#, fuzzy
 msgid "Evaluate expr on Vim server"
-msgstr "Evaluate expression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:53
-#, fuzzy
 msgid "Send keys to Vim server"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:57
 msgid "List all Vim servers that can be found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:58
-#, fuzzy
 msgid "Set server name"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
-#, fuzzy
 msgid "Print version information and exit"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:1
-#, fuzzy
 msgid "Test if wajig has yet to be given the subcommand"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:2
-#, fuzzy
 msgid "Test if wajig command should have packages as potential completion"
-msgstr "Test if apt command should have packages as potential completion"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:4
 msgid "Do system commands everything quietly."
@@ -61074,28 +56229,24 @@ msgid "Trace the sequence of commands performed."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:8
-#, fuzzy
 msgid "Assume yes for any questions asked."
-msgstr "Assume yes to all questions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:9
-#, fuzzy
 msgid "Add a CD-ROM to the list of available sources of packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:10
 msgid "Mark the alternative to be auto set (using set priorities)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:11
-#, fuzzy
 msgid "Remove superseded deb files from the download cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:12
-#, fuzzy
 msgid "Do an update followed by a download of all updated packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:13
 msgid "Perform an install without asking questions (non-interactive)"
@@ -61110,24 +56261,20 @@ msgid "Check reported bugs in package using the Debian Bug Tracker"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:16
-#, fuzzy
 msgid "Retrieve/unpack sources and build .deb for the named packages"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:17
-#, fuzzy
 msgid "Retrieve packages required to build listed packages"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:18
-#, fuzzy
 msgid "Retrieve latest changelog for the package"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:19
-#, fuzzy
 msgid "Remove all deb files from the download cache"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:20
 #: /tmp/fish/implicit/share/completions/wajig.fish:53
@@ -61135,23 +56282,20 @@ msgid "List all the JIG commands and one line descriptions for each"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:21
-#, fuzzy
 msgid "Perform an update then a dist-upgrade"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:22
-#, fuzzy
 msgid "List of packages which depend/recommend/suggest the package"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:23
 msgid "One line description of packages (-v and -vv for more detail)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:24
-#, fuzzy
 msgid "One line description of new packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:25
 msgid "Provide a detailed description of package (describe -vv)"
@@ -61162,38 +56306,32 @@ msgid "Provide a detailed description of new packages (describe -vv)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:27
-#, fuzzy
 msgid "Upgrade to new distribution (installed and new rqd packages)"
-msgstr "Upgrade or install newest packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:28
 msgid "Equivalent to help with -verbose=2"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:29
-#, fuzzy
 msgid "Download package files ready for an install"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:30
-#, fuzzy
 msgid "Download packages listed in file ready for an install"
-msgstr "Download package missing from mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:31
-#, fuzzy
 msgid "Install packages listed in a file"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:32
-#, fuzzy
 msgid "Remove packages listed in a file"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:33
-#, fuzzy
 msgid "Search for a file within installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
@@ -61209,14 +56347,12 @@ msgid "Perform apt-get -f install (to fix broken dependencies)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:37
-#, fuzzy
 msgid "Perform apt-get --fix-missing upgrade"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:38
-#, fuzzy
 msgid "Install packages and ignore file overwrites and depends"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:39
 msgid "Print documentation (detail depends on --verbose)"
@@ -61232,9 +56368,8 @@ msgid "Initialise or reset the JIG archive files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:42
-#, fuzzy
 msgid "Install (or upgrade) one or more packages or .deb files"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:43
 #: /tmp/fish/implicit/share/completions/wajig.fish:82
@@ -61242,11 +56377,8 @@ msgid "Install package and associated recommended packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:44
-#, fuzzy
 msgid "Install package and recommended and suggested packages"
 msgstr ""
-"Install the packages even if they replace files from other, already "
-"installed, packages"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:45
 #: /tmp/fish/implicit/share/completions/wajig.fish:111
@@ -61258,55 +56390,48 @@ msgid "Check the integrity of installed packages (through checksums)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:47
-#, fuzzy
 msgid "List size of all large (>10MB) installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:48
 msgid "Identify when an update was last performed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:49
-#, fuzzy
 msgid "List the status and description of installed packages"
-msgstr "Don't verify any attributes of package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:50
-#, fuzzy
 msgid "List a one line description of given or all packages"
-msgstr "Don't verify any attributes of package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:51
 msgid "List the objects that can have alternatives configured"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:52
-#, fuzzy
 msgid "List the contents of the download cache"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:54
 msgid "List the daemons that JIG can start/stop/restart"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:55
-#, fuzzy
 msgid "List the files that are supplied by the named package"
-msgstr "Listar todos os arquivos em cada pacote selecionado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:56
-#, fuzzy
 msgid "List those packages on hold"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:57
 msgid "List packages (with optional argument substring) installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:58
-#, fuzzy
 msgid "List the contents of the install/remove log file (filtered)"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:59
 msgid "List all known packages or those containing supplied string"
@@ -61314,24 +56439,20 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:60
 #: /tmp/fish/implicit/share/completions/wajig.fish:74
-#, fuzzy
 msgid "List libraries not required by any installed package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:61
-#, fuzzy
 msgid "List the control scripts of the package of deb file"
-msgstr "Display the trigger scripts contained in the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:62
-#, fuzzy
 msgid "List packages that belong to a specific section"
-msgstr "Query all packages that provide the specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:63
-#, fuzzy
 msgid "List the sections that are available"
-msgstr "Only perform operations that are trivial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:64
 msgid "Same as list but only prints first two columns, not truncated"
@@ -61342,58 +56463,49 @@ msgid "Same as list but avoids truncating package names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:66
-#, fuzzy
 msgid "Dist-upgrade using packages already downloaded"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:67
 msgid "Upgrade using packages already downloaded, but not any others"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:68
-#, fuzzy
 msgid "Runs the madison command of apt-cache."
-msgstr "Run commands from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:69
-#, fuzzy
 msgid "Move packages in the download cache to a local Debian mirror"
-msgstr "Move packages from cache to local mirror"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:70
-#, fuzzy
 msgid "List packages that became available since last update"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:71
-#, fuzzy
 msgid "Obtain the latest news about the package"
-msgstr "Listar todos os arquivos em cada pacote selecionado"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:72
-#, fuzzy
 msgid "List packages newly available for upgrading"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:73
-#, fuzzy
 msgid "List installed packages that do not meet the DFSG"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:75
 #: /tmp/fish/implicit/share/completions/wajig.fish:89
-#, fuzzy
 msgid "Generate a .deb file for an installed package"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:76
 msgid "From preferences file show priorities/policy (available)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:77
-#, fuzzy
 msgid "Remove one or more packages and configuration files"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:78
 msgid "Purge package and those it depend on and not required by others"
@@ -61408,27 +56520,24 @@ msgid "Display the package's README file from /usr/share/doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:81
-#, fuzzy
 msgid "Download package and any packages it depends on"
-msgstr "List packages on which this package depends"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:83
 msgid "Reconfigure the named installed packages or run gkdebconf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:84
-#, fuzzy
 msgid "Reinstall each of the named packages"
-msgstr "Install one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:85
 msgid "Reload daemon configs, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:86
-#, fuzzy
 msgid "Remove one or more packages (see also purge)"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:87
 msgid "Remove package and its dependees not required by others"
@@ -61451,9 +56560,8 @@ msgid "Convert a RedHat .rpm file to a Debian .deb file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
-#, fuzzy
 msgid "Search for packages containing listed words"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
 msgid "Find local Debian archives suitable for sources.list"
@@ -61493,18 +56601,16 @@ msgid "Generates list of package=version for all installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:105
-#, fuzzy
 msgid "Retrieve and unpack sources for the named packages"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:106
 msgid "Start a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:107
-#, fuzzy
 msgid "Show the version and available version of packages"
-msgstr "Show full versions for packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:108
 #: /tmp/fish/implicit/share/completions/wajig.fish:109
@@ -61520,18 +56626,16 @@ msgid "Run the Gnome task selector to install groups of packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:113
-#, fuzzy
 msgid "List packages with newer versions available for upgrading"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:114
 msgid "Remove listed packages from hold so they are again upgraded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:116
-#, fuzzy
 msgid "Update the list of down-loadable packages"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:117
 msgid "Update default alternative for things like x-window-manager"
@@ -61550,14 +56654,12 @@ msgid "Upgrade all of the installed packages or just those listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:121
-#, fuzzy
 msgid "List version and distribution of (all) packages."
-msgstr "Don't verify any attributes of package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:122
-#, fuzzy
 msgid "A synonym for describe"
-msgstr "Synonym for -i"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:123
 msgid "Find the package that supplies the given command or file"
@@ -61573,9 +56675,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:3
 #: /tmp/fish/implicit/share/completions/watch.fish:4
-#, fuzzy
 msgid "Highlight changes between updates"
-msgstr "Time between screen updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:5
 msgid "Exit if command has a non-zero exit"
@@ -61586,9 +56687,8 @@ msgid "Exit when output from command changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:7
-#, fuzzy
 msgid "Seconds to wait between updates"
-msgstr "Time to wait between requesting more peers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:8
 msgid "Attempt run command in precise intervals"
@@ -61599,9 +56699,8 @@ msgid "Turn off header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/watch.fish:10
-#, fuzzy
 msgid "Pass command to exec instead of \"sh -c\""
-msgstr "Pass command to shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:1
 msgid "Print byte counts"
@@ -61620,9 +56719,8 @@ msgid "Print length of longest line"
 msgstr "Print length of longest line"
 
 #: /tmp/fish/implicit/share/completions/wc.fish:5
-#, fuzzy
 msgid "Print word counts"
-msgstr "Print byte counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:1
 msgid "Number sets BitsPerPixel value"
@@ -61682,23 +56780,20 @@ msgid "Runs the game without sounds and music"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:13
-#, fuzzy
 msgid "Prints the name of the game data directory and exits"
-msgstr "Change working directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:14
-#, fuzzy
 msgid "XxY sets the screen resolution"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:15
 msgid "Runs the game in a small test scenario"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:16
-#, fuzzy
 msgid "Shows the version number and exits"
-msgstr "Mostra a versão e sai"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:17
 msgid "Runs the game in windowed mode"
@@ -61770,9 +56865,8 @@ msgid "Go to background immediately after startup"
 msgstr "Go to background immediately after startup"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:4
-#, fuzzy
 msgid "Execute command as if part of .wgetrc"
-msgstr "Executa comando se o comando anterior falhou"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:5
 msgid "Log all messages to logfile"
@@ -61933,9 +57027,8 @@ msgid "Disable server-side cache"
 msgstr "Disable server-side cache"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:49
-#, fuzzy
 msgid "Disable the use of cookies"
-msgstr "Save session cookies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:50
 msgid "Load cookies from file"
@@ -61991,43 +57084,36 @@ msgid "Turn off keep-alive for http downloads"
 msgstr "Turn off keep-alive for http downloads"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:63
-#, fuzzy
 msgid "Choose secure protocol"
-msgstr "Reject protocols"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:64
-#, fuzzy
 msgid "Only follow secure HTTPS links"
-msgstr "Always follow symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:65
 msgid "Don't validate the server's certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:66
-#, fuzzy
 msgid "Client certificate file"
-msgstr "Set certificate policy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:67
-#, fuzzy
 msgid "Client certificate type"
-msgstr "Define política de certificação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:68
-#, fuzzy
 msgid "Private key file"
-msgstr "Escreve para o arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:69
-#, fuzzy
 msgid "Private key type"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:70
-#, fuzzy
 msgid "File with the bundle of CAs"
-msgstr "Edit the patch bundle description"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:71
 msgid "Directory where hash list of CAs is stored"
@@ -62050,9 +57136,8 @@ msgid "Disable HSTS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:76
-#, fuzzy
 msgid "Path of HSTS database"
-msgstr "Print database"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:77
 msgid "Don't remove the temporary .listing files generated"
@@ -62154,9 +57239,8 @@ msgstr "Specify a comma-separated list of directories you wish to exclude"
 
 #: /tmp/fish/implicit/share/completions/wget.fish:100
 #: /tmp/fish/implicit/share/completions/wget.fish:101
-#, fuzzy
 msgid "Do not ever ascend to the parent directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:1
 #: /tmp/fish/implicit/share/completions/which.fish:13
@@ -62168,9 +57252,8 @@ msgid "Read aliases from stdin, reporting matching ones on stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:3
-#, fuzzy
 msgid "Ignore option '--read-alias'"
-msgstr "Ignore option “--read-functions”"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/which.fish:4
 msgid ""
@@ -62218,9 +57301,8 @@ msgid "Print time of last boot"
 msgstr "Print time of last boot"
 
 #: /tmp/fish/implicit/share/completions/who.fish:3
-#, fuzzy
 msgid "Print dead processes"
-msgstr "Print processor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:4
 msgid "Print line of headings"
@@ -62284,9 +57366,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:3
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:3
-#, fuzzy
 msgid "Print this help information."
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:4
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:4
@@ -62299,19 +57380,16 @@ msgid "Don't display anything except notifications."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:2
-#, fuzzy
 msgid "Scan for networks"
-msgstr "Adicionar uma rede"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:3
-#, fuzzy
 msgid "List networks"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:4
-#, fuzzy
 msgid "Show network details"
-msgstr "Set CVS user variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:5
 msgid "Disconnect"
@@ -62322,47 +57400,40 @@ msgid "Connect"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:7
-#, fuzzy
 msgid "List encryption types"
-msgstr "Use config file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:8
 msgid "Perform operation on wireless network"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:9
-#, fuzzy
 msgid "Perform operation on wired network"
-msgstr "Only perform operations that are trivial"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:10
-#, fuzzy
 msgid "Save profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:11
-#, fuzzy
 msgid "Load profile"
-msgstr "No flat profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:12
 msgid "Set name for profile to save/load"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:13
-#, fuzzy
 msgid "Get or set network property"
-msgstr "Operate on revision property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:14
-#, fuzzy
 msgid "Set network property to"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:15
-#, fuzzy
 msgid "Set the network"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:1
 msgid "get current WPA/EAPOL/EAP status"
@@ -62377,14 +57448,12 @@ msgid "show this usage help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:4
-#, fuzzy
 msgid "show interfaces/select interface"
-msgstr "Select interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:5
-#, fuzzy
 msgid "change debug level"
-msgstr "Set debug level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:6
 msgid "show full wpa_cli license"
@@ -62399,27 +57468,24 @@ msgid "IEEE 802.1X EAPOL state machine logon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:9
-#, fuzzy
 msgid "set/list variables"
-msgstr "Erase variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:10
 msgid "show PMKSA cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:11
-#, fuzzy
 msgid "force reassociation"
-msgstr "Force name/rev association"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:12
 msgid "force wpa_supplicant to re-read its config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:13
-#, fuzzy
 msgid "force preauthentication"
-msgstr "Force pseudo-tty allocation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:14
 msgid "configure identity for an SSID"
@@ -62434,9 +57500,8 @@ msgid "change password for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:17
-#, fuzzy
 msgid "configure pin for an SSID"
-msgstr "Configure for building on BUILD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:18
 msgid "configure one-time-password for an SSID"
@@ -62463,32 +57528,28 @@ msgid "enable a network"
 msgstr "habilita uma rede"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:24
-#, fuzzy
 msgid "disable a network"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:25
 msgid "add a network"
 msgstr "Adicionar uma rede"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:26
-#, fuzzy
 msgid "remove a network"
-msgstr "Remove a key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:27
 msgid "set/list network variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
-#, fuzzy
 msgid "get network variables"
-msgstr "Set CVS user variable"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
-#, fuzzy
 msgid "save the current configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:30
 msgid "disconnect and wait for reassociate command before connecting"
@@ -62503,9 +57564,8 @@ msgid "get latest scan results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:33
-#, fuzzy
 msgid "get capabilies"
-msgstr "Set playlist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:34
 msgid "request STAKey negotiation with <addr>"
@@ -62536,9 +57596,8 @@ msgid "Run wvdial with alternative config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wvdial.fish:4
-#, fuzzy
 msgid "Don't output debug information"
-msgstr "Não mostra grupo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:1
 msgid ""
@@ -62601,14 +57660,12 @@ msgid "Run up to max-procs processes at a time"
 msgstr "Run up to max-procs processes at a time"
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:1
-#, fuzzy
 msgid "Query information"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:2
-#, fuzzy
 msgid "Query default application for type"
-msgstr "Output default action for mimetype"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:3
 msgid "Query file's filetype"
@@ -62619,35 +57676,29 @@ msgid "Choose application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:5
-#, fuzzy
 msgid "Mimetype"
-msgstr "Show time type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:6
-#, fuzzy
 msgid "Add filetype description"
-msgstr "Adiciona indicador de tipo de arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:7
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:10
-#, fuzzy
 msgid "Set mode"
-msgstr "Silent mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:8
-#, fuzzy
 msgid "Disable vendor check"
-msgstr "Disable server-side cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:9
-#, fuzzy
 msgid "Remove filetype description"
-msgstr "Redirecionar para descritor de arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:12
-#, fuzzy
 msgid "Diplay long help"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:1
 msgid "Get list of input files from FILE"
@@ -62681,14 +57732,12 @@ msgid "Encoding of input files (except for Python, Tcl, Glade)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:9
-#, fuzzy
 msgid "Join messages with existing file"
-msgstr "Log all messages to logfile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:10
-#, fuzzy
 msgid "Entries from FILE"
-msgstr "Ler senha a partir do ARQUIVO"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:11
 msgid ""
@@ -62731,9 +57780,8 @@ msgid "More detailed formatstring recognition result"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:19
-#, fuzzy
 msgid "Do not use C escapes in output (default)"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:20
 msgid "Use C escapes in output, no extended chars"
@@ -62744,14 +57792,12 @@ msgid "Write PO file even if empty"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:22
-#, fuzzy
 msgid "Write the"
-msgstr "Escreve para o arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:23
-#, fuzzy
 msgid "Do not write #: filename:line lines"
-msgstr "Do not overwrite newer files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:24
 msgid "Generate #: filename:line lines (default)"
@@ -62762,18 +57808,16 @@ msgid "Write out strict Uniforum conforming"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:26
-#, fuzzy
 msgid "Write out a Java"
-msgstr "Write out the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:27
 msgid "Write out a NeXTstep/GNUstep"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:28
-#, fuzzy
 msgid "Set output page width"
-msgstr "Select output delimiter"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:29
 msgid ""
@@ -62782,23 +57826,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:30
-#, fuzzy
 msgid "Generate sorted output"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:31
-#, fuzzy
 msgid "Sort output by file location"
-msgstr "Ordena por hora de modificação"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:32
 msgid "Dont write header with msgid \"\" entry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:33
-#, fuzzy
 msgid "Set copyright holder in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xgettext.fish:34
 msgid "Omit FSF copyright in output for foreign user"
@@ -62817,33 +57858,28 @@ msgid "Use STRING or \"\" as suffix for msgstr entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:1
-#, fuzzy
 msgid "Show summary of options"
-msgstr "Display help and debug options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:2
-#, fuzzy
 msgid "Select XMMS session (Default: 0)"
-msgstr "Select by session ID"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:3
 msgid "Skip backwards in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:4
-#, fuzzy
 msgid "Start playing current playlist"
-msgstr "Set or get all current limits"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:5
-#, fuzzy
 msgid "Pause current song"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:6
-#, fuzzy
 msgid "Stop current song"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:7
 msgid "Pause if playing, play otherwise"
@@ -62858,19 +57894,16 @@ msgid "Don't clear the playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:10
-#, fuzzy
 msgid "Show the main window"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:1
-#, fuzzy
 msgid "Set the initial window geometry"
-msgstr "Muda a cor do terminal"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
-#, fuzzy
 msgid "Set the window title"
-msgstr "Set the network timeout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:3
 msgid "Install a private colormap"
@@ -62881,28 +57914,24 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
-#, fuzzy
 msgid "Set reverse video mode"
-msgstr "Server mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
-#, fuzzy
 msgid "Set the background of the page display"
-msgstr "Create window on the specified display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:7
 msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "Set the maximum fuzz factor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
-#, fuzzy
 msgid "Start in continuous view mode"
-msgstr "Start in folder index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:10
 msgid "Enable or disable t1lib (Default: yes)"
@@ -62921,9 +57950,8 @@ msgid "Set the default file name for PostScript output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:14
-#, fuzzy
 msgid "Set the paper size"
-msgstr "Set memory buffer size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:15
 msgid "Set the paper width, in points"
@@ -62934,29 +57962,24 @@ msgid "Set the paper height, in points"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:17
-#, fuzzy
 msgid "Generate Level 1 PostScript"
-msgstr "Mostra saída com dired"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:18
-#, fuzzy
 msgid "Sets the encoding to use for text output"
-msgstr "Neither verbose nor quiet output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:19
-#, fuzzy
 msgid "Sets the end-of-line convention to use"
-msgstr "Set the end of file string to eof-str"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:20
-#, fuzzy
 msgid "Specify the owner password for the PDF file"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:21
-#, fuzzy
 msgid "Specify the user password for the PDF file"
-msgstr "Specify the proxy password"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:22
 msgid "Open xpdf in full-screen mode"
@@ -62975,42 +57998,36 @@ msgid "Raise xpdf remote server window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:26
-#, fuzzy
 msgid "Kill xpdf remote server"
-msgstr "File to grab servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:27
-#, fuzzy
 msgid "Print commands as they're executed"
-msgstr "Print commands to stderr"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:29
-#, fuzzy
 msgid "Specify config file to use instead of ~/.xpdfrc"
-msgstr "Use specified file instead of the default trustdb"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:30
-#, fuzzy
 msgid "Print copyright and version information"
-msgstr "List compression information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:2
 msgid "Display grammar and exit"
 msgstr "Display grammar and exit"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:3
-#, fuzzy
 msgid "Select window by id"
-msgstr "Select window by id"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:4
 msgid "Select window by name"
 msgstr "Select window by name"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:5
-#, fuzzy
 msgid "Display font properties"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:6
 msgid "Select root window"
@@ -63021,18 +58038,16 @@ msgid "Specify X server"
 msgstr "Specify X server"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:8
-#, fuzzy
 msgid "Maximum display length"
-msgstr "Maximum display length"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:9
 msgid "Do not show property type"
 msgstr "Do not show property type"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:10
-#, fuzzy
 msgid "Set format file"
-msgstr "Set format file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:11
 msgid "Select a window by clicking on its frame"
@@ -63051,9 +58066,8 @@ msgid "Examine property updates forever"
 msgstr "Examine property updates forever"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:15
-#, fuzzy
 msgid "Set format"
-msgstr "Short format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:2
 msgid "Make no changes"
@@ -63064,23 +58078,20 @@ msgid "Apply modifications without grabbing the screen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:4
-#, fuzzy
 msgid "Print out a summary of the usage and exit"
-msgstr "Load the media and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:5
 msgid "Print out the RandR version reported by the X server and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:6
-#, fuzzy
 msgid "Display the current state of the system"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:7
-#, fuzzy
 msgid "Select X display to use"
-msgstr "Select how to display key IDs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:8
 msgid "Select which screen to manipulate"
@@ -63099,14 +58110,12 @@ msgid "Set the screen size (index or width x height)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:12
-#, fuzzy
 msgid "Set the refresh rate closest to the specified value"
-msgstr "Define a lista de preferências padrão como a string especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:13
-#, fuzzy
 msgid "Specify the orientation of the screen"
-msgstr "Specify commit message"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:14
 msgid "Reflect across the X axis"
@@ -63117,14 +58126,12 @@ msgid "Reflect across the Y axis"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:16
-#, fuzzy
 msgid "Display the contents of properties for each output"
-msgstr "Display the pretend output in a tabular form"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:17
-#, fuzzy
 msgid "Set screen size"
-msgstr "Set context size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:18
 msgid "Set reported physical screen size"
@@ -63135,14 +58142,12 @@ msgid "Set dpi to calculate reported physical screen size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:20
-#, fuzzy
 msgid "Add new mode"
-msgstr "Adicionar uma nova chave"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:21
-#, fuzzy
 msgid "Removes a mode from the server"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:22
 msgid "Add a mode to the set of valid modes for an output"
@@ -63153,18 +58158,16 @@ msgid "Remove a mode from the set of valid modes for an output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:24
-#, fuzzy
 msgid "Selects an output to reconfigure"
-msgstr "Select an option profile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:25
 msgid "Enable connected but disabled outputs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:26
-#, fuzzy
 msgid "This selects a mode"
-msgstr "Select a method"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:27
 msgid ""
@@ -63177,42 +58180,36 @@ msgid "Set output position within the secreen in pixels"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:29
-#, fuzzy
 msgid "Set refresh rate"
-msgstr "Set referer URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:30
-#, fuzzy
 msgid "Set reflection"
-msgstr "Invert selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:31
-#, fuzzy
 msgid "Set rotation"
-msgstr "Select an action"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:32
 #: /tmp/fish/implicit/share/completions/xrandr.fish:33
 #: /tmp/fish/implicit/share/completions/xrandr.fish:34
 #: /tmp/fish/implicit/share/completions/xrandr.fish:35
 #: /tmp/fish/implicit/share/completions/xrandr.fish:36
-#, fuzzy
 msgid "Set position relative to the output"
-msgstr "Reset verbose level to 0"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:37
 msgid "Set the property value: --set <prop> <value>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:38
-#, fuzzy
 msgid "Disables the output"
-msgstr "Add label to output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:39
-#, fuzzy
 msgid "Set the crtc"
-msgstr "Set quote char"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:40
 msgid "Set gamma correction [red:green:blue]"
@@ -63227,9 +58224,8 @@ msgid "Don't define a primary output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:43
-#, fuzzy
 msgid "Print current screen configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:44
 msgid ""
@@ -63244,18 +58240,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:46
-#, fuzzy
 msgid "Set scren scale"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:47
 msgid "Set the output as primary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:1
-#, fuzzy
 msgid "display to use"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:2
 msgid "do all resources [default]"
@@ -63282,57 +58276,48 @@ msgid "preprocessor to use [/usr/bin/mcpp]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:8
-#, fuzzy
 msgid "do not use a preprocessor"
-msgstr "Do not use integrated preprocessor"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:9
-#, fuzzy
 msgid "query resources"
-msgstr "Update sources"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:10
-#, fuzzy
 msgid "load resources from file [default]"
-msgstr "Load cookies from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:11
-#, fuzzy
 msgid "add in resources from file"
-msgstr "Load index from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:12
-#, fuzzy
 msgid "merge resources from file & sort"
-msgstr "Supress errors from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:13
-#, fuzzy
 msgid "edit resources into file"
-msgstr "Set sources.list file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:14
 msgid "backup suffix for -edit [.bak]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:15
-#, fuzzy
 msgid "show preprocessor symbols"
-msgstr "Preprocessors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:16
-#, fuzzy
 msgid "remove resources"
-msgstr "Remove records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:17
 msgid "avoid server reset (avoid using this)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrdb.fish:18
-#, fuzzy
 msgid "don't warn about duplicates"
-msgstr "Only print duplicates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:1
 msgid "Append input to selection"
@@ -63379,9 +58364,8 @@ msgid "Exchange primary and secondary selections"
 msgstr "Exchange primary and secondary selections"
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:12
-#, fuzzy
 msgid "X server display"
-msgstr "X server display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:13
 msgid "Timeout for retrieving selection"
@@ -63404,18 +58388,16 @@ msgid "Never highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:2
-#, fuzzy
 msgid "Enable active icon support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:3
 msgid "Disallow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:4
-#, fuzzy
 msgid "Turn off cursor blinking"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:5
 msgid "Enable the display of bold characters"
@@ -63442,9 +58424,8 @@ msgid "Don't workaround the bug in more(1)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:11
-#, fuzzy
 msgid "Disable dynamic color changing"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:12
 msgid "Don't ensure compatibility between normal and bold fonts bounding boxes"
@@ -63467,23 +58448,20 @@ msgid "Don't use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:17
-#, fuzzy
 msgid "Don't force insert mode"
-msgstr "Don't use batch mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:18
-#, fuzzy
 msgid "Don't use jump scrolling"
-msgstr "Don't use a comment string"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:19
 msgid "Don't treat C1 control characters as printable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:20
-#, fuzzy
 msgid "Turn off logging"
-msgstr "Turn off FTP globbing"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:21
 msgid "Turn off support for encodings according the locale setting"
@@ -63506,9 +58484,8 @@ msgid "Don't use builtin version for the wide-character calculation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:26
-#, fuzzy
 msgid "Enable underlining"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:27
 msgid "Disable PC style bold colors"
@@ -63527,18 +58504,16 @@ msgid "Disable reverse-wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:31
-#, fuzzy
 msgid "Turn off asynchronous scrolling"
-msgstr "Turn off access checking"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:32
 msgid "Send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:33
-#, fuzzy
 msgid "Don't display scrollbar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:34
 msgid "Don't generate Sun Function Key escape codes for function keys"
@@ -63565,41 +58540,36 @@ msgid "VT102 mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:40
-#, fuzzy
 msgid "Don't display toolbar or menubar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:41
-#, fuzzy
 msgid "Don't use UTF-8"
-msgstr "Don't recurse"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:42
 msgid "Display characters with underline attribute as color"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:43
-#, fuzzy
 msgid "Write to the system utmp log file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:44
 msgid "Don't use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:45
-#, fuzzy
 msgid "Don't use wide characters"
-msgstr "Do not use backslash escaped characters"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:46
 msgid "Don't wait the first time for the window to be mapped"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:47
-#, fuzzy
 msgid "Print version number to the standard output"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:48
 msgid "Print out a verbose message describing the options"
@@ -63614,18 +58584,16 @@ msgid "Always highlight the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:51
-#, fuzzy
 msgid "Disable active icon support"
-msgstr "Enable suspension support"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:52
 msgid "Allow auto wraparound"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:53
-#, fuzzy
 msgid "Turn on cursor blinking"
-msgstr "Turn on recursive retrieving"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:54
 msgid "Disable the display of bold characters"
@@ -63636,9 +58604,8 @@ msgid "Set the vt100 resource cutToBeginningOfLine to 'false'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:56
-#, fuzzy
 msgid "Set character class"
-msgstr "Print character counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:57
 msgid "Set the cjkWidth resource to 'true'"
@@ -63681,9 +58648,8 @@ msgid "Use pseudo-terminal's sense of the stty erase value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:67
-#, fuzzy
 msgid "Force insert mode"
-msgstr "Parada forçada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:68
 msgid "Treat C1 control characters as printable"
@@ -63698,9 +58664,8 @@ msgid "Force scrollbar to the left side"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:71
-#, fuzzy
 msgid "The shell in xterm's window will be login shell"
-msgstr "Test if this is a login shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:72
 msgid "Ring bell if the user types near the end of line"
@@ -63715,9 +58680,8 @@ msgid "Use builtin version for the wide-character calculation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:75
-#, fuzzy
 msgid "Disable underlining"
-msgstr "Disable warnings about MFC"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:76
 msgid "Enable PC style bold colors"
@@ -63744,9 +58708,8 @@ msgid "Don't send title/icon change requests always"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:82
-#, fuzzy
 msgid "Display scrollbar"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:83
 msgid "Generate Sun Function Key escape codes for function keys"
@@ -63769,14 +58732,12 @@ msgid "Assume Sun/PC keyboard"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:88
-#, fuzzy
 msgid "Display toolbar or menubar"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:89
-#, fuzzy
 msgid "Use UTF-8"
-msgstr "STDOUT é UTF-8"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:90
 msgid "Don't display characters with underline attribute as color"
@@ -63791,9 +58752,8 @@ msgid "Use visual bell insead of audio bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:93
-#, fuzzy
 msgid "Use wide characters"
-msgstr "Escape character"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:94
 msgid "Wait the first time for the window to be mapped"
@@ -63824,9 +58784,8 @@ msgid "Color for the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:101
-#, fuzzy
 msgid "xterm encoding"
-msgstr "Force encoding"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:102
 msgid "Bold font"
@@ -63841,9 +58800,8 @@ msgid "FreeType double-width font pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:105
-#, fuzzy
 msgid "Font for active icons"
-msgstr "Force interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:106
 msgid "Font size for FreeType font"
@@ -63870,18 +58828,16 @@ msgid "Embed xterm into window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:112
-#, fuzzy
 msgid "Set keyboard type"
-msgstr "Specify record type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:113
 msgid "File name for the encoding converter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:114
-#, fuzzy
 msgid "Log filename"
-msgstr "Log to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:115
 msgid "Maximum time in milliseconds between multi-click selections"
@@ -63896,94 +58852,80 @@ msgid "Distance from the right end for ringing the margin bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:118
-#, fuzzy
 msgid "Number of scrolled off lines"
-msgstr "Number all lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:119
-#, fuzzy
 msgid "Terminal identification"
-msgstr "Print all information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:121
-#, fuzzy
 msgid "zIconBeep percentage"
-msgstr "Prompt with percentage"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:122
-#, fuzzy
 msgid "Size of the inner border"
-msgstr "Show changes in reverse order"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:123
 msgid "Use jump scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:124
-#, fuzzy
 msgid "Turn on logging"
-msgstr "Turn of demangling"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:125
 msgid "Turn on asynchronous scrolling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:126
-#, fuzzy
 msgid "Tektronix mode"
-msgstr "Question mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:127
 msgid "This window should receive console output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:1
-#, fuzzy
 msgid "Compress"
-msgstr "Compression"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:2
-#, fuzzy
 msgid "Decompress"
-msgstr "Decompress to stdout"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:3
-#, fuzzy
 msgid "Test the integrity of compressed files"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:4
-#, fuzzy
 msgid "Print information about compressed files"
-msgstr "Print informative messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:5
-#, fuzzy
 msgid "Don't delete the input files"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:6
-#, fuzzy
 msgid "Write to stdout instead of file"
-msgstr "Write top servers to file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:7
 msgid "Decompress only the first .xz stream"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:8
-#, fuzzy
 msgid "Disable creation of sparse files"
-msgstr "Control creation of sparse files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:9
 msgid "Use SUFFIX as the suffix for target file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:10
-#, fuzzy
 msgid "Read the filenames to process from file"
-msgstr "Read log message from file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:11
 msgid "Identical to --files but filenames terminate with \\0"
@@ -63994,38 +58936,32 @@ msgid "Specify file format to compress/decompress"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:13
-#, fuzzy
 msgid "Specify type of integrity check"
-msgstr "Specify port for web interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:14
-#, fuzzy
 msgid "Don't verify the integrity check"
-msgstr "Don't verify time attribute"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:15
-#, fuzzy
 msgid "Select compression level"
-msgstr "Compression level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:16
 msgid "Use slower variant"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:17
-#, fuzzy
 msgid "Alias of -0"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:18
-#, fuzzy
 msgid "Alias of -9"
-msgstr "Nome alternativo para atq"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:20
-#, fuzzy
 msgid "Set block sizes list"
-msgstr "Set block size"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:21
 msgid "Force flush if encoder did not fush after TIMEOUT ms"
@@ -64048,9 +58984,8 @@ msgid "Display error and exit if exceed memory usage limit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:26
-#, fuzzy
 msgid "Specify the number of worker threads to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:27
 msgid "Add LZMA1 filter to filter chain"
@@ -64069,28 +59004,24 @@ msgid "Add Delta filter to filter chain"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:31
-#, fuzzy
 msgid "Suppress warnings/notices"
-msgstr "Supress printing filename"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:33
-#, fuzzy
 msgid "Don't set the exit status to 2"
-msgstr "Nega estado de saída da tarefa"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:34
 msgid "Print messages in a machine-parsable format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:35
-#, fuzzy
 msgid "Display memory informations (physical, usage limits)"
-msgstr "Display update information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:37
-#, fuzzy
 msgid "Display long help"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:13
 msgid "Backup or restore alpm local database"
@@ -64109,9 +59040,8 @@ msgid "Show some statistics about your packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:29
-#, fuzzy
 msgid "Force color"
-msgstr "Usa cores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:30
 msgid "Force installation or updates"
@@ -64122,48 +59052,40 @@ msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:32
-#, fuzzy
 msgid "Disable color"
-msgstr "Usa cores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:33
-#, fuzzy
 msgid "Always ask for confirmation"
-msgstr "Ask for confirmation"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:35
 msgid "Export built packages and their sources to DIR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:36
-#, fuzzy
 msgid "Use DIR as temporary folder"
-msgstr "Use tmpdir for temporary files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:54
-#, fuzzy
 msgid "Show packages that conflict with one of the targets"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:55
-#, fuzzy
 msgid "Show packages that depend on one of the targets"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:56
-#, fuzzy
 msgid "Show packages that provide one of the targets"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:57
-#, fuzzy
 msgid "Show packages that replace one of the targets"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:58
-#, fuzzy
 msgid "Query the package names only"
-msgstr "Search packagename only"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:70
 msgid "Query FILE instead of alpm/aur"
@@ -64182,23 +59104,20 @@ msgid "Pass -A or --ignorearch option to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:85
-#, fuzzy
 msgid "Specify a custom AUR url"
-msgstr "Specify a username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:86
 msgid "Build from sources(AUR or ABS)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:87
-#, fuzzy
 msgid "Also build all dependencies"
-msgstr "Show build dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:88
-#, fuzzy
 msgid "Search an update for devel packages"
-msgstr "List reverse dependencies for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:89
 msgid "Search packages by maintainer instead of name (AUR only)"
@@ -64209,19 +59128,16 @@ msgid "Pass additional options to makepkg"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:106
-#, fuzzy
 msgid "Clean all these files"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yaourt.fish:107
-#, fuzzy
 msgid "Also install the package"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:1
-#, fuzzy
 msgid "output usage information"
-msgstr "Não pôde obter informação do usuário"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:3
 msgid "output verbose messages on internal operations"
@@ -64238,9 +59154,8 @@ msgid "use network only if dependencies are not available in local cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:6
-#, fuzzy
 msgid "don't run lifecycle scripts"
-msgstr "Don't run the test script"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:7
 msgid "save HAR output of network traffic"
@@ -64251,37 +59166,32 @@ msgid "ignore platform checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:9
-#, fuzzy
 msgid "ignore engines check"
-msgstr "Ignore changes in case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:10
-#, fuzzy
 msgid "ignore optional dependencies"
-msgstr "Correct broken dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:11
-#, fuzzy
 msgid "ignore all caches"
-msgstr "Search ignores all case"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:12
 msgid "don't generate bin links when setting up packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:13
-#, fuzzy
 msgid "only allow one version of a package"
-msgstr "Instalar um ou mais pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:14
 msgid "don't read or generate a lockfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:15
-#, fuzzy
 msgid "don't generate a lockfile"
-msgstr "Generate release file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:16
 msgid "don't generate a lockfile and fail if an update is needed"
@@ -64294,37 +59204,32 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:18
-#, fuzzy
 msgid "specify a custom folder to store the yarn cache"
-msgstr "Select file to store source cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:19
 msgid "use a mutex to ensure only one yarn instance is executing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:20
-#, fuzzy
 msgid "disable emoji in output"
-msgstr "Use colors"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:21
-#, fuzzy
 msgid "disable progress bar"
-msgstr "Do not display progress bar"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yarn.fish:22
-#, fuzzy
 msgid "maximum number of concurrent network requests"
-msgstr "Minimum number of peers to not do requesting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:1
 msgid "Module"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:3
-#, fuzzy
 msgid "List all available modules"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:4
 msgid "Use the QT graphical user interface"
@@ -64347,63 +59252,52 @@ msgid "No window manager border for main window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yast2.fish:9
-#, fuzzy
 msgid "Use full screen"
-msgstr "Full screen"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:1
-#, fuzzy
 msgid "Install the latest version of a package"
-msgstr "Instalar os pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:2
-#, fuzzy
 msgid "Update specified packages (defaults to all packages)"
-msgstr "Exclude specified package from updates"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:3
-#, fuzzy
 msgid "Print list of available updates"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:4
-#, fuzzy
 msgid "Remove the specified packages and packages that depend on them"
-msgstr "List packages on which this package depends"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:5
-#, fuzzy
 msgid "List available packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:6
-#, fuzzy
 msgid "Describe available packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:7
 msgid "Find package providing a feature or file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:8
-#, fuzzy
 msgid "find packages matching description regexp"
-msgstr "Ignore changes matching regexp"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:9
-#, fuzzy
 msgid "Clean up cache directory"
-msgstr "Clean source directories"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:10
-#, fuzzy
 msgid "Generate rss changelog"
-msgstr "Generate a new key pair"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:14
-#, fuzzy
 msgid "Set debug level"
-msgstr "Set debug level"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:15
 msgid "Set error level"
@@ -64426,14 +59320,12 @@ msgid "Specify installroot"
 msgstr "Specify installroot"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:21
-#, fuzzy
 msgid "Enable repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:22
-#, fuzzy
 msgid "Disable repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:23
 msgid "Enables obsolets processing logic"
@@ -64448,79 +59340,66 @@ msgid "Exclude specified package from updates"
 msgstr "Exclude specified package from updates"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:26
-#, fuzzy
 msgid "List all packages"
-msgstr "Instalar pacotes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:27
-#, fuzzy
 msgid "List packages available for installation"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:28
-#, fuzzy
 msgid "List packages with updates available"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:30
-#, fuzzy
 msgid "List packages not available in repositories"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:31
-#, fuzzy
 msgid "List packages that are obsoleted by packages in repositories"
-msgstr "List packages that may serve as input to mirrorbin or mirrorsource"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:32
-#, fuzzy
 msgid "Delete cached package files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:33
-#, fuzzy
 msgid "Delete cached header files"
-msgstr "Delete obsolete package files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:34
-#, fuzzy
 msgid "Delete all cache contents"
-msgstr "Delete the logfile when done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:1
-#, fuzzy
 msgid ""
 "Internal completion function for appending string to the ZFS commandline"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:2
 #: /tmp/fish/implicit/share/completions/zpool.fish:2
-#, fuzzy
 msgid "Display a help message"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "Create a volume or filesystem"
-msgstr "Compare archive and filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:4
 msgid "Destroy a dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:5
-#, fuzzy
 msgid "Create a snapshot"
-msgstr "Create archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:6
 msgid "Roll back a filesystem to a previous snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Create a clone of a snapshot"
-msgstr "Remove one or more packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:8
 msgid ""
@@ -64529,24 +59408,20 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:9
-#, fuzzy
 msgid "Rename a dataset"
-msgstr "Rename a disc"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "List dataset properties"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:11
-#, fuzzy
 msgid "Set a dataset property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:12
-#, fuzzy
 msgid "Get one or several dataset properties"
-msgstr "Operate on revision property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:13
 msgid "Set a dataset property to be inherited"
@@ -64573,9 +59448,8 @@ msgid "Stop sharing a given filesystem, or all of them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:21
-#, fuzzy
 msgid "Create a bookmark for a snapshot"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:22
 msgid "Output a stream representation of a dataset"
@@ -64597,19 +59471,16 @@ msgid "Revoke delegations of rights on a dataset from (groups of) users"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:26
-#, fuzzy
 msgid "Put a named hold on a snapshot"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:27
-#, fuzzy
 msgid "List holds on a snapshot"
-msgstr "Print path to command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:28
-#, fuzzy
 msgid "Remove a named hold from a snapshot"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:29
 msgid ""
@@ -64624,70 +59495,58 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:31
 #: /tmp/fish/implicit/share/completions/zfs.fish:53
 #: /tmp/fish/implicit/share/completions/zfs.fish:58
-#, fuzzy
 msgid "Create all needed non-existing parent datasets"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:32
 #: /tmp/fish/implicit/share/completions/zfs.fish:33
-#, fuzzy
 msgid "Dataset property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:34
-#, fuzzy
 msgid "Volume size"
-msgstr "Compress file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:35
-#, fuzzy
 msgid "Create a sparse volume"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:36
-#, fuzzy
 msgid "Blocksize"
-msgstr "Tamanho do bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:37
-#, fuzzy
 msgid "Recursively destroy children"
-msgstr "Recursively copy"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:38
 msgid "Recursively destroy all dependents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:39
-#, fuzzy
 msgid "Force unmounting"
-msgstr "Fake mounting"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:41
-#, fuzzy
 msgid "Print machine-parsable verbose information"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:43
-#, fuzzy
 msgid "Defer snapshot deletion"
-msgstr "Delete selection"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:44
-#, fuzzy
 msgid "Dataset to destroy"
-msgstr "Initial set of keystrokes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:45
-#, fuzzy
 msgid "Recursively snapshot children"
-msgstr "Secure mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:46
 #: /tmp/fish/implicit/share/completions/zfs.fish:47
-#, fuzzy
 msgid "Snapshot property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:48
 msgid "Dataset to snapshot"
@@ -64702,9 +59561,8 @@ msgid "Recursively destroy later snapshot, bookmarks and clones"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:51
-#, fuzzy
 msgid "Force unmounting of clones"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:52
 msgid "Snapshot to roll back to"
@@ -64712,9 +59570,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:54
 #: /tmp/fish/implicit/share/completions/zfs.fish:55
-#, fuzzy
 msgid "Clone property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:56
 msgid "Snapshot to clone"
@@ -64731,19 +59588,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:60
 #: /tmp/fish/implicit/share/completions/zfs.fish:62
 #: /tmp/fish/implicit/share/completions/zfs.fish:108
-#, fuzzy
 msgid "Force unmounting if needed"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:61
-#, fuzzy
 msgid "Do not remount filesystems during rename"
-msgstr "Stay in local filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:63
-#, fuzzy
 msgid "Dataset to rename"
-msgstr "Service name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:64
 #: /tmp/fish/implicit/share/completions/zfs.fish:77
@@ -64752,31 +59606,27 @@ msgstr "Service name"
 #: /tmp/fish/implicit/share/completions/zpool.fish:59
 #: /tmp/fish/implicit/share/completions/zpool.fish:67
 #: /tmp/fish/implicit/share/completions/zpool.fish:99
-#, fuzzy
 msgid "Print output in a machine-parsable format"
-msgstr "Profiling output format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:65
 #: /tmp/fish/implicit/share/completions/zfs.fish:75
 #: /tmp/fish/implicit/share/completions/zfs.fish:84
 #: /tmp/fish/implicit/share/completions/zfs.fish:89
-#, fuzzy
 msgid "Operate recursively on datasets"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:67
 #: /tmp/fish/implicit/share/completions/zpool.fish:105
-#, fuzzy
 msgid "Property to list"
-msgstr "Minimum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:68
 #: /tmp/fish/implicit/share/completions/zfs.fish:80
 #: /tmp/fish/implicit/share/completions/zfs.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:66
-#, fuzzy
 msgid "Print parsable (exact) values for numbers"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:69
 #: /tmp/fish/implicit/share/completions/zfs.fish:97
@@ -64794,9 +59644,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:73
 #: /tmp/fish/implicit/share/completions/zpool.fish:125
-#, fuzzy
 msgid "Property to set"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:74
 msgid "Dataset which property is to be setted"
@@ -64804,68 +59653,57 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:78
 #: /tmp/fish/implicit/share/completions/zpool.fish:68
-#, fuzzy
 msgid "Fields to display"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:79
-#, fuzzy
 msgid "Property source to display"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:82
-#, fuzzy
 msgid "Property to get"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:83
 msgid "Dataset which properties is to be got"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:85
-#, fuzzy
 msgid "Revert to the received value if available"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:86
 msgid "Dataset which properties is to be inherited"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:88
-#, fuzzy
 msgid "Upgrade all eligible filesystems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Upgrade to the specified version"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:91
-#, fuzzy
 msgid "Filesystem to upgrade"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:92
-#, fuzzy
 msgid "Print UID instead of user name"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:93
-#, fuzzy
 msgid "Print GID instead of group name"
-msgstr "Link files instead of copying"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:96
-#, fuzzy
 msgid "Field to display"
-msgstr "X server display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:99
 #: /tmp/fish/implicit/share/completions/zfs.fish:100
-#, fuzzy
 msgid "Identity types to display"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:101
 msgid "Translate S(amba)ID to POSIX ID"
@@ -64880,63 +59718,52 @@ msgid "Temporary mount point property"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:104
-#, fuzzy
 msgid "Report progress"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:105
-#, fuzzy
 msgid "Mount all available ZFS filesystems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:106
-#, fuzzy
 msgid "Overlay mount"
-msgstr "Lazy unmount"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:107
-#, fuzzy
 msgid "Filesystem to mount"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:109
-#, fuzzy
 msgid "Unmount all available ZFS filesystems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:110
-#, fuzzy
 msgid "Filesystem to unmount"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:111
-#, fuzzy
 msgid "Share all eligible ZFS filesystems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:112
-#, fuzzy
 msgid "Filesystem to share"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:113
-#, fuzzy
 msgid "Unshare all shared ZFS filesystems"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:114
-#, fuzzy
 msgid "Filesystem to unshare"
-msgstr "Print filesystem type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:115
 msgid "Snapshot to bookmark"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:116
-#, fuzzy
 msgid "Generate incremental stream from snapshot"
-msgstr "Use new incremental GNU format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:117
 msgid ""
@@ -64950,9 +59777,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:119
 #: /tmp/fish/implicit/share/completions/zfs.fish:128
-#, fuzzy
 msgid "Generate a deduplicated stream"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:120
 #: /tmp/fish/implicit/share/completions/zfs.fish:129
@@ -64966,62 +59792,51 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:122
 #: /tmp/fish/implicit/share/completions/zfs.fish:131
-#, fuzzy
 msgid "Print verbose information about the stream in a machine-parsable format"
-msgstr "Output extra information about the work being done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:123
-#, fuzzy
 msgid "Generate compressed stream"
-msgstr "Generate package from source"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:125
 #: /tmp/fish/implicit/share/completions/zfs.fish:133
-#, fuzzy
 msgid "Include dataset properties"
-msgstr "Exceto arquivo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:126
 #: /tmp/fish/implicit/share/completions/zfs.fish:134
-#, fuzzy
 msgid "Print verbose information about the stream"
-msgstr "Ignore all version information"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:135
-#, fuzzy
 msgid "Dataset to send"
-msgstr "Send mail to user"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:136
-#, fuzzy
 msgid ""
 "Print verbose information about the stream and the time spent processing it"
-msgstr "Output extra information about the work being done"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:137
-#, fuzzy
 msgid "Dry run: do not actually receive the stream"
-msgstr "Remove all gz files from cache"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:138
-#, fuzzy
 msgid "Force rollback to the most recent snapshot"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:139
-#, fuzzy
 msgid "Unmount the target filesystem"
-msgstr "Show all filesystems"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:140
-#, fuzzy
 msgid "Discard the first element of the path of the sent snapshot"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:141
-#, fuzzy
 msgid "Discard all but the last element of the path of the sent snapshot"
-msgstr "Print time of last boot"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:142
 msgid "Force the stream to be received as a clone of the given snapshot"
@@ -65036,29 +59851,25 @@ msgid "Dataset to receive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:145
-#, fuzzy
 msgid "Delegate permissions only on the specified dataset"
-msgstr "Print all possible definitions of the specified name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:146
 msgid "Delegate permissions only on the descendents dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:147
-#, fuzzy
 msgid "User to delegate permissions to"
-msgstr "Set default file permission mask"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:148
-#, fuzzy
 msgid "Group to delegate permissions to"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:149
 #: /tmp/fish/implicit/share/completions/zfs.fish:150
-#, fuzzy
 msgid "Delegate permission to everyone"
-msgstr "Assert freestanding environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:151
 msgid "Delegate permissions only to the creator of later descendent datasets"
@@ -65073,71 +59884,62 @@ msgid "Dataset on which delegation is to be applied"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:154
-#, fuzzy
 msgid "Remove permissions only on the specified dataset"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:155
 msgid "Remove permissions only on the descendents dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:156
-#, fuzzy
 msgid "User to remove permissions from"
-msgstr "Preserve environment"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:157
-#, fuzzy
 msgid "Group to remove permissions from"
-msgstr "Extract all permissions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:158
 #: /tmp/fish/implicit/share/completions/zfs.fish:162
 #: /tmp/fish/implicit/share/completions/zfs.fish:163
-#, fuzzy
 msgid "Remove permission from everyone"
-msgstr "Remove all entries from the --group list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:159
 msgid "Remove permissions only on later created descendent datasets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:160
-#, fuzzy
 msgid "Remove a permission set or remove permissions from an existing one"
-msgstr "Remove files after adding to archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:161
-#, fuzzy
 msgid "Remove permissions recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:164
 msgid "Dataset on which delegation is to be removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:165
-#, fuzzy
 msgid "Apply hold recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:166
 msgid "Snapshot on which hold is to be applied"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:167
-#, fuzzy
 msgid "List holds recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:168
 msgid "Snapshot which holds are to be listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:169
-#, fuzzy
 msgid "Release hold recursively"
-msgstr "Operate recursively"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:170
 msgid "Snapshot from which hold is to be removed"
@@ -65148,23 +59950,20 @@ msgid "Display file type (à la ls -F)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:173
-#, fuzzy
 msgid "Display inode change time"
-msgstr "Display line number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:174
 msgid "Source snapshot for the diff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:175
-#, fuzzy
 msgid "Execution timeout"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:176
-#, fuzzy
 msgid "Execution memory limit"
-msgstr "Recursion limit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:177
 msgid "Pool which program will be executed on"
@@ -65187,9 +59986,8 @@ msgid "Move into zipfile (delete files)"
 msgstr "Move into zipfile (delete files)"
 
 #: /tmp/fish/implicit/share/completions/zip.fish:6
-#, fuzzy
 msgid "Do not store directory names"
-msgstr "Print directory names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:7
 msgid "Do not compress at all"
@@ -65228,14 +60026,12 @@ msgid "Make zipfile as old as the latest entry"
 msgstr "Make zipfile as old as the latest entry"
 
 #: /tmp/fish/implicit/share/completions/zip.fish:18
-#, fuzzy
 msgid "Exclude the following names"
-msgstr "Exclude the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:19
-#, fuzzy
 msgid "Include only the following names"
-msgstr "Include only the following names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zip.fish:20
 msgid "Fix zipfile"
@@ -65274,9 +60070,8 @@ msgid "Encrypt"
 msgstr "Encrypt"
 
 #: /tmp/fish/implicit/share/completions/zip.fish:29
-#, fuzzy
 msgid "Don't compress files with these suffixes"
-msgstr "Don't compress files with these suffixes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:1
 msgid ""
@@ -65296,9 +60091,8 @@ msgid "Clear devices errors in pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:6
-#, fuzzy
 msgid "Create a new storage pool"
-msgstr "Create new project"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:7
 msgid "Destroy a storage pool"
@@ -65309,89 +60103,76 @@ msgid "Detach virtual device from a mirroring pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:9
-#, fuzzy
 msgid "Display pool event log"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:10
 msgid "Export a pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:11
-#, fuzzy
 msgid "Get one or several pool properties"
-msgstr "Operate on revision property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "Display pool command history"
-msgstr "Display help and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:13
-#, fuzzy
 msgid "List importable pools, or import some"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:14
-#, fuzzy
 msgid "Display pool I/O stats"
-msgstr "Display control chars"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:15
-#, fuzzy
 msgid "Remove ZFS label information from the specified device"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:16
 msgid "List pools with health status and space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:17
-#, fuzzy
 msgid "Take the specified devices offline"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Bring the specified devices back online"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:19
 msgid "Reset pool GUID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:20
-#, fuzzy
 msgid "Remove virtual devices from pool"
-msgstr "Create a local copy of another repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:21
-#, fuzzy
 msgid "Reopen pool devices"
-msgstr "Imprimir todos os nomes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:22
-#, fuzzy
 msgid "Replace a pool virtual device"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:23
 msgid "Start or stop scrubbing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:24
-#, fuzzy
 msgid "Set a pool property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:25
 msgid "Create a pool by splitting an existing mirror one"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:26
-#, fuzzy
 msgid "Display detailed pool health status"
-msgstr "Print the URIs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:27
 msgid "List upgradeable pools, or upgrade one"
@@ -65401,15 +60182,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zpool.fish:36
 #: /tmp/fish/implicit/share/completions/zpool.fish:45
 #: /tmp/fish/implicit/share/completions/zpool.fish:117
-#, fuzzy
 msgid "Force use of virtual device"
-msgstr "Mostra inode dos arquivos"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:29
 #: /tmp/fish/implicit/share/completions/zpool.fish:130
-#, fuzzy
 msgid "Dry run: only display resulting configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:30
 #: /tmp/fish/implicit/share/completions/zpool.fish:91
@@ -65424,38 +60203,33 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zpool.fish:101
 #: /tmp/fish/implicit/share/completions/zpool.fish:128
 #: /tmp/fish/implicit/share/completions/zpool.fish:136
-#, fuzzy
 msgid "Resolve device path symbolic links"
-msgstr "Dereferense symbolic links"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:32
 #: /tmp/fish/implicit/share/completions/zpool.fish:93
 #: /tmp/fish/implicit/share/completions/zpool.fish:102
 #: /tmp/fish/implicit/share/completions/zpool.fish:129
 #: /tmp/fish/implicit/share/completions/zpool.fish:137
-#, fuzzy
 msgid "Display device full path"
-msgstr "Display man page"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:33
 #: /tmp/fish/implicit/share/completions/zpool.fish:37
 #: /tmp/fish/implicit/share/completions/zpool.fish:48
 #: /tmp/fish/implicit/share/completions/zpool.fish:118
 #: /tmp/fish/implicit/share/completions/zpool.fish:132
-#, fuzzy
 msgid "Pool property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:34
-#, fuzzy
 msgid "Pool to add virtual devices to"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:35
 #: /tmp/fish/implicit/share/completions/zpool.fish:53
-#, fuzzy
 msgid "Virtual device to add"
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:38
 msgid "Pool to attach virtual device to"
@@ -65463,14 +60237,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:39
 #: /tmp/fish/implicit/share/completions/zpool.fish:43
-#, fuzzy
 msgid "Virtual device to operate on"
-msgstr "Division control"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:40
-#, fuzzy
 msgid "Initiate recovery mode"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:41
 #: /tmp/fish/implicit/share/completions/zpool.fish:85
@@ -65489,19 +60261,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:46
-#, fuzzy
 msgid "Dry run, only display resulting configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:47
-#, fuzzy
 msgid "Do not enable any feature on the new pool"
-msgstr "Do not fail if signature is older than key"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:49
-#, fuzzy
 msgid "Root filesystem property"
-msgstr "Set property"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:50
 #: /tmp/fish/implicit/share/completions/zpool.fish:83
@@ -65509,14 +60278,12 @@ msgid "Equivalent to \"-o cachefile=none,altroot=ROOT\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:51
-#, fuzzy
 msgid "Root filesystem mountpoint"
-msgstr "Do not fold long lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:52
-#, fuzzy
 msgid "Set a different in-core pool name"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:54
 #: /tmp/fish/implicit/share/completions/zpool.fish:64
@@ -65528,74 +60295,64 @@ msgid "Pool to destroy"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:56
-#, fuzzy
 msgid "Pool to detach device from"
-msgstr "File is block device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:57
 msgid "Physical device to detach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:58
-#, fuzzy
 msgid "Print verbose event information"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:60
 msgid "Output appended data as the log grows"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:61
-#, fuzzy
 msgid "Clear all previous events"
-msgstr "Ignore externals definitions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:62
 msgid "Pool to read events from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:63
-#, fuzzy
 msgid "Export all pools"
-msgstr "Report on all tags"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:65
-#, fuzzy
 msgid "Pool to export"
-msgstr "Select display"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:69
 msgid "Properties to get"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:70
-#, fuzzy
 msgid "Pool to get properties of"
-msgstr "Disable automatic properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:71
 msgid "Also display internal events"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:72
-#, fuzzy
 msgid "Display log records using long format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:73
-#, fuzzy
 msgid "Pool to get command history of"
-msgstr "Do not execute commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:74
-#, fuzzy
 msgid "Read configuration from specified cache file"
-msgstr "Dump configuration file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:75
-#, fuzzy
 msgid "Search for devices or files in specified directory"
-msgstr "Verificar arquivos no repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:76
 msgid "List or import destroyed pools only (requires -f for importation)"
@@ -65603,38 +60360,32 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:77
 #: /tmp/fish/implicit/share/completions/zpool.fish:133
-#, fuzzy
 msgid "Mount properties for contained datasets"
-msgstr "Show only matching part"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:78
-#, fuzzy
 msgid "Properties of the imported pool"
-msgstr "Set size of freed memory pool"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:79
-#, fuzzy
 msgid "Force import"
-msgstr "Usa cores"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:80
-#, fuzzy
 msgid "Recovery mode"
-msgstr "Server mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:81
-#, fuzzy
 msgid "Search for and import all pools found"
-msgstr "Prompt for an expiration time"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:82
 msgid "Ignore missing log device (risk of loss of last changes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:84
-#, fuzzy
 msgid "Do not mount contained filesystems"
-msgstr "Stay in local filesystem"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:86
 msgid "Roll back to a previous TXG (hazardous)"
@@ -65645,32 +60396,27 @@ msgid "TXG to roll back to (implies -FX)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:88
-#, fuzzy
 msgid "Specify, as the last argument, a temporary pool name"
-msgstr "Specify the title of rss"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:89
-#, fuzzy
 msgid "Pool to import"
-msgstr "Dir to import"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:90
 #: /tmp/fish/implicit/share/completions/zpool.fish:103
 #: /tmp/fish/implicit/share/completions/zpool.fish:142
-#, fuzzy
 msgid "Display a timestamp using specified format"
-msgstr "Output profiling information to specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:94
-#, fuzzy
 msgid "Omit statistics since boot"
-msgstr "Print word counts"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:104
-#, fuzzy
 msgid "Print verbose statistics"
-msgstr "Print verbose info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:96
 msgid "Pool to retrieve I/O stats from"
@@ -65681,14 +60427,12 @@ msgid "Treat exported or foreign devices as inactive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:98
-#, fuzzy
 msgid "Device to clear ZFS label information from"
-msgstr "Print extra info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:106
-#, fuzzy
 msgid "Pool to list properties of"
-msgstr "Display font properties"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:107
 msgid "Temporarily offline"
@@ -65703,14 +60447,12 @@ msgid "Physical device to offline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:110
-#, fuzzy
 msgid "Expand the device to use all available space"
-msgstr "Update list of source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:111
-#, fuzzy
 msgid "Pool to bring device back online on"
-msgstr "Dispositivo bloco"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:112
 msgid "Physical device to bring back online"
@@ -65721,42 +60463,36 @@ msgid "Pool which GUID is to be changed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:114
-#, fuzzy
 msgid "Pool to remove device from"
-msgstr "Forçar cópia completa de segurança"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:115
 msgid "Physical device to remove"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:116
-#, fuzzy
 msgid "Pool which devices are to be reopened"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:119
-#, fuzzy
 msgid "Pool to replace device"
-msgstr "File is character device"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:120
 msgid "Pool device to be replaced"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:121
-#, fuzzy
 msgid "Device to use for replacement"
-msgstr "Device section"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:122
-#, fuzzy
 msgid "Stop scrubbing"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:123
-#, fuzzy
 msgid "Pause scrubbing"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:124
 msgid "Pool to start/stop scrubbing"
@@ -65771,15 +60507,13 @@ msgid "Set altroot for newpool and automatically import it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:134
-#, fuzzy
 msgid "Pool to split"
-msgstr "Minimum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:138
 #: /tmp/fish/implicit/share/completions/zpool.fish:139
-#, fuzzy
 msgid "Display deduplication histogram"
-msgstr "Display all changelogs"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:141
 msgid "Only display status for unhealthy or unavailable pools"
@@ -65795,14 +60529,12 @@ msgid "Upgrade all eligible pools, enabling all supported features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:145
-#, fuzzy
 msgid "Display upgradeable ZFS versions"
-msgstr "Display package record"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:146
-#, fuzzy
 msgid "Upgrade to the specified legacy version"
-msgstr "Help for the specified builtin"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:2
 msgid "Repo"
@@ -65821,29 +60553,24 @@ msgid "Add a new repository"
 msgstr "Adicionar um novo repositório"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:8
-#, fuzzy
 msgid "Remove specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:9
-#, fuzzy
 msgid "Rename specified repository"
-msgstr "Repair the corrupted repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:10
-#, fuzzy
 msgid "Modify specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:11
-#, fuzzy
 msgid "Refresh all repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:12
-#, fuzzy
 msgid "Clean local caches"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:13
 msgid "List all defined services"
@@ -65854,216 +60581,176 @@ msgid "Add a new service"
 msgstr "Adicionar um novo serviço"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:15
-#, fuzzy
 msgid "Modify specified service"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:16
-#, fuzzy
 msgid "Remove specified service"
-msgstr "Use specified keyserver"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:17
 msgid "Refresh all services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:20
-#, fuzzy
 msgid "Verify integrity of package dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:21
-#, fuzzy
 msgid "Install source packages and their build dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:22
-#, fuzzy
 msgid "Install newly added packages recommended by installed packages"
 msgstr ""
-"Install the packages even if they replace files from other, already "
-"installed, packages"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:23
-#, fuzzy
 msgid "Update installed packages with newer versions"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:24
-#, fuzzy
 msgid "List available updates"
-msgstr "Print available list"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:25
-#, fuzzy
 msgid "Install needed patches"
-msgstr "Install new package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:26
-#, fuzzy
 msgid "List needed patches"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:27
-#, fuzzy
 msgid "Perform a distribution upgrade"
-msgstr "Create a distribution tarball"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:28
-#, fuzzy
 msgid "Check for patches"
-msgstr "Create compressed patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:29
-#, fuzzy
 msgid "Search for packages matching a pattern"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:30
-#, fuzzy
 msgid "Show full information for specified packages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:31
 msgid "Show full information for specified patches"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:32
-#, fuzzy
 msgid "Show full information for specified patterns"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:33
 msgid "Show full information for specified products"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:34
-#, fuzzy
 msgid "List all available patches"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:35
-#, fuzzy
 msgid "List all available packages"
-msgstr "Reinstall packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:36
-#, fuzzy
 msgid "List all available patterns"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:37
-#, fuzzy
 msgid "List all available products"
-msgstr "List names of available signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:38
-#, fuzzy
 msgid "List packages providing specified capability"
-msgstr "Query all packages that provide the specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:39
-#, fuzzy
 msgid "Add a package lock"
-msgstr "Rebuild a package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:40
-#, fuzzy
 msgid "Remove a package lock"
-msgstr "Remove packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:41
-#, fuzzy
 msgid "List current package locks"
-msgstr "List bugs from packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:42
-#, fuzzy
 msgid "Remove unused locks"
-msgstr "Remove source packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:43
 msgid "Compare two version strings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:44
-#, fuzzy
 msgid "Print the target operating system ID string"
-msgstr "Print operating system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:45
 msgid "Print report about licenses and EULAs of installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:46
-#, fuzzy
 msgid "Download source rpms for all installed packages to a local directory"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:48
-#, fuzzy
 msgid "Output the version number"
-msgstr "Número da versão"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:49
-#, fuzzy
 msgid "Use specified config file instead of the default"
 msgstr ""
-"Usa o arquivo especificado em vez do banco de dados de confiança padrão"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:50
-#, fuzzy
 msgid "Suppress normal output, print only error messages"
-msgstr "Suppress error messages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:52
-#, fuzzy
 msgid "Do not abbreviate text in tables"
-msgstr "Do not create output files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:53
-#, fuzzy
 msgid "Table style (integer)"
-msgstr "Test zipfile integrity"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:54
-#, fuzzy
 msgid "Turn on rug compatibility"
-msgstr "Turn on debug output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:55
 msgid "Do not ask anything, use default answers automatically"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:56
-#, fuzzy
 msgid "Switch to XML output"
-msgstr "Set width of output"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:57
-#, fuzzy
 msgid "Ignore unknown packages"
-msgstr "Ignore missing packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:58
-#, fuzzy
 msgid "Use an additional repository"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:59
-#, fuzzy
 msgid "Use alternative repository definition file directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:60
-#, fuzzy
 msgid "Use alternative directory for all caches"
-msgstr "Search directory for makefile"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:61
-#, fuzzy
 msgid "Operate on a different root directory"
-msgstr "Create a diff between two versions of the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:62
 msgid ""
@@ -66079,29 +60766,24 @@ msgid "Automatically trust and import new repository signing keys"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:65
-#, fuzzy
 msgid "Do not read meta-data from repositories"
-msgstr "Do not del built files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:66
-#, fuzzy
 msgid "Do not refresh the repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:67
-#, fuzzy
 msgid "Ignore CD/DVD repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:68
-#, fuzzy
 msgid "Ignore remote repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:69
-#, fuzzy
 msgid "Do not read installed packages"
-msgstr "Do not upgrade packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:70
 msgid "Output a list of zypper user prompts"
@@ -66128,26 +60810,22 @@ msgid "Export all defined repositories as a single local .repo file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:76
-#, fuzzy
 msgid "Show also repository alias"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:77
-#, fuzzy
 msgid "Show also repository name"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:78
 #: /tmp/fish/implicit/share/completions/zypper.fish:121
-#, fuzzy
 msgid "Show also base URI of repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:79
 #: /tmp/fish/implicit/share/completions/zypper.fish:122
-#, fuzzy
 msgid "Show also repository priority"
-msgstr "Show repository access history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:80
 msgid "Show also the autorefresh flag"
@@ -66169,9 +60847,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:84
 #: /tmp/fish/implicit/share/completions/zypper.fish:125
-#, fuzzy
 msgid "Sort the list by repository priority"
-msgstr "Disable repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:85
 msgid "Sort the list by alias"
@@ -66191,23 +60868,20 @@ msgid "Type of repository (yast2, rpm-md, plaindir)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:89
-#, fuzzy
 msgid "Add the repository as disabled"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:90
-#, fuzzy
 msgid "Probe URI"
-msgstr "Probe a CD"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:91
 msgid "Don't probe URI, probe later during refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:92
-#, fuzzy
 msgid "Specify descriptive name for the repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:93
 #: /tmp/fish/implicit/share/completions/zypper.fish:106
@@ -66216,26 +60890,22 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:94
 #: /tmp/fish/implicit/share/completions/zypper.fish:107
-#, fuzzy
 msgid "Disable RPM files caching"
-msgstr "Don't trust the file modification times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:95
 #: /tmp/fish/implicit/share/completions/zypper.fish:108
-#, fuzzy
 msgid "Enable GPG check for this repository"
-msgstr "Verificar arquivos no repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:96
 #: /tmp/fish/implicit/share/completions/zypper.fish:109
-#, fuzzy
 msgid "Disable GPG check for this repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:97
-#, fuzzy
 msgid "Enable autorefresh of the repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:98
 #: /tmp/fish/implicit/share/completions/zypper.fish:146
@@ -66244,67 +60914,56 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:99
 #: /tmp/fish/implicit/share/completions/zypper.fish:147
-#, fuzzy
 msgid "Ignore query string in the URI"
-msgstr "Ignora arquivos terminados com ~"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:100
 msgid "Disable the repository (but don't remove it)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:101
-#, fuzzy
 msgid "Enable a disabled repository"
-msgstr "Repair the corrupted repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:102
-#, fuzzy
 msgid "Enable auto-refresh of the repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:103
-#, fuzzy
 msgid "Disable auto-refresh of the repository"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:104
-#, fuzzy
 msgid "Set a descriptive name for the repository"
-msgstr "Adicionar uma chave criptografada ao repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:105
-#, fuzzy
 msgid "Set priority of the repository"
-msgstr "Remove an entry from the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:110
-#, fuzzy
 msgid "Apply changes to all repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:111
-#, fuzzy
 msgid "Apply changes to all local repositories"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:112
-#, fuzzy
 msgid "Apply changes to all remote repositories"
-msgstr "Removes entry in .cvspass for remote repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:113
-#, fuzzy
 msgid "Apply changes to repositories of specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:114
 msgid "Force a complete refresh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:115
-#, fuzzy
 msgid "Force rebuild of the database"
-msgstr "Force rebuilding index"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:116
 msgid "Force download of raw metadata"
@@ -66319,9 +60978,8 @@ msgid "Only download raw metadata, don't build the database"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:119
-#, fuzzy
 msgid "Refresh only specified repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:120
 msgid "Refresh also services before refreshing repos"
@@ -66332,19 +60990,16 @@ msgid "Show also repositories belonging to the services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:128
-#, fuzzy
 msgid "Type of the service (ris)"
-msgstr "Number of top servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:129
-#, fuzzy
 msgid "Add the service as disabled"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:130
-#, fuzzy
 msgid "Specify descriptive name for the service"
-msgstr "Specify users for query"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:131
 msgid "Disable the service (but don't remove it)"
@@ -66367,34 +61022,28 @@ msgid "Set a descriptive name for the service"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:136
-#, fuzzy
 msgid "Add a RIS service repository to enable"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:137
-#, fuzzy
 msgid "Add a RIS service repository to disable"
-msgstr "Adicionar um novo repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:138
-#, fuzzy
 msgid "Remove a RIS service repository to enable"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:139
-#, fuzzy
 msgid "Remove a RIS service repository to disable"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:140
-#, fuzzy
 msgid "Clear the list of RIS repositories to enable"
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:141
-#, fuzzy
 msgid "Clear the list of RIS repositories to disable"
-msgstr "List of rpm configuration files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:142
 msgid "Apply changes to all services"
@@ -66405,19 +61054,16 @@ msgid "Apply changes to all local services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:144
-#, fuzzy
 msgid "Apply changes to all remote services"
-msgstr "File to grab servers"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:145
-#, fuzzy
 msgid "Apply changes to services of specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:148
-#, fuzzy
 msgid "Refresh also repositories"
-msgstr "Read-only repository mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:149
 #: /tmp/fish/implicit/share/completions/zypper.fish:165
@@ -66425,9 +61071,8 @@ msgstr "Read-only repository mode"
 #: /tmp/fish/implicit/share/completions/zypper.fish:190
 #: /tmp/fish/implicit/share/completions/zypper.fish:213
 #: /tmp/fish/implicit/share/completions/zypper.fish:276
-#, fuzzy
 msgid "Load only the specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:150
 msgid ""
@@ -66442,9 +61087,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:152
 #: /tmp/fish/implicit/share/completions/zypper.fish:168
-#, fuzzy
 msgid "Select packages by capability"
-msgstr "Query all packages that provide the specified capability"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:153
 msgid ""
@@ -66476,9 +61120,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:194
 #: /tmp/fish/implicit/share/completions/zypper.fish:216
 #: /tmp/fish/implicit/share/completions/zypper.fish:278
-#, fuzzy
 msgid "Only download the packages, do not install"
-msgstr "Do not ever ascend to the parent directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:158
 msgid ""
@@ -66508,9 +61151,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:201
 #: /tmp/fish/implicit/share/completions/zypper.fish:219
 #: /tmp/fish/implicit/share/completions/zypper.fish:283
-#, fuzzy
 msgid "Install also recommended packages in addition to the required"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:162
 #: /tmp/fish/implicit/share/completions/zypper.fish:174
@@ -66519,9 +61161,8 @@ msgid "Force the solver to find a solution (even an aggressive one)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:163
-#, fuzzy
 msgid "Select packages from the specified repository"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:164
 #: /tmp/fish/implicit/share/completions/zypper.fish:179
@@ -66541,14 +61182,12 @@ msgid "Type of package (package, patch, pattern, product). Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:170
-#, fuzzy
 msgid "Automatically remove unneeded dependencies"
-msgstr "Install/remove packages for dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:171
-#, fuzzy
 msgid "No automatic removal of unneeded dependencies"
-msgstr "Show state of dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:172
 msgid "Test the removal, do not actually remove"
@@ -66559,24 +61198,20 @@ msgid "Test the repair, do not actually do anything to the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:181
-#, fuzzy
 msgid "Install only build dependencies of specified packages"
-msgstr "List packages depending on"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:182
-#, fuzzy
 msgid "Don't install build dependencies"
-msgstr "Don't automatically fulfill dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:183
-#, fuzzy
 msgid "Install packages only from specified repositories"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:184
-#, fuzzy
 msgid "Load only the specified repositories"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:189
 msgid ""
@@ -66590,9 +61225,8 @@ msgid "Test the update, do not actually update"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:195
-#, fuzzy
 msgid "Skip interactive updates"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:198
 #: /tmp/fish/implicit/share/completions/zypper.fish:205
@@ -66602,59 +61236,50 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:203
-#, fuzzy
 msgid "List only updates from the specified repository"
-msgstr "Repair the corrupted repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:204
-#, fuzzy
 msgid ""
 "List all packages for which newer versions are available, regardless whether "
 "they are installable or not"
-msgstr "Updates packages to the best version available"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:206
-#, fuzzy
 msgid "List needed patches for Bugzilla issues"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:207
-#, fuzzy
 msgid "List all patches in this category"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:208
-#, fuzzy
 msgid "List all patches, not only the needed ones"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:209
-#, fuzzy
 msgid "List only patches from the specified repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:210
 msgid "List patches issued up to the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:211
-#, fuzzy
 msgid "List needed patches for CVE issues"
-msgstr "Print byte offset of matches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:212
-#, fuzzy
 msgid "Look for issues matching the specified string"
-msgstr "Exclude files that match pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:215
 msgid "Test the upgrade, do not actually upgrade"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:220
-#, fuzzy
 msgid "Restrict upgrade to specified repository"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:222
 msgid "Do not allow installed resolvables to be downgraded"
@@ -66689,9 +61314,8 @@ msgid "Allow installed resolvables to switch vendors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:230
-#, fuzzy
 msgid "Check for patches only in the specified repository"
-msgstr "Verificar arquivos no repositório"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:231
 msgid "Search also in package summaries and descriptions"
@@ -66702,126 +61326,107 @@ msgid "Perform case-sensitive search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:233
-#, fuzzy
 msgid "Show only packages that are already installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:234
-#, fuzzy
 msgid "Show only packages that are not currently installed"
-msgstr "Upgrade package if already installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:235
-#, fuzzy
 msgid "Search only for packages of the specified type"
-msgstr "Query packages with the specified group"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:236
-#, fuzzy
 msgid "Search only in the specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:237
 msgid "Show each available version in each repository on a separate line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:238
-#, fuzzy
 msgid "Sort packages by name (default)"
-msgstr "Print package name by prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:239
-#, fuzzy
 msgid "Sort packages by repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:240
 msgid "Search for a match with all search strings (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:241
-#, fuzzy
 msgid "Search for a match with any of the search strings"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:242
 msgid "Search for a match to partial words (default)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:243
-#, fuzzy
 msgid "Search for a match to whole words only"
-msgstr "Search package containing pattern"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:244
-#, fuzzy
 msgid "Searches for an exact package name"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:245
-#, fuzzy
 msgid "Work only with the specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:247
 msgid "Show also requires and prerequires"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:248
-#, fuzzy
 msgid "Show also recommends"
-msgstr "Show arp entries"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:249
 #: /tmp/fish/implicit/share/completions/zypper.fish:250
 #: /tmp/fish/implicit/share/completions/zypper.fish:255
 #: /tmp/fish/implicit/share/completions/zypper.fish:258
-#, fuzzy
 msgid "Just another means to specify repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:251
-#, fuzzy
 msgid "Show only installed packages"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:252
-#, fuzzy
 msgid "Show only packages which are not installed"
-msgstr "Sync packages installed"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:253
-#, fuzzy
 msgid "Sort the list by package name"
-msgstr "Search full package name"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:254
-#, fuzzy
 msgid "Sort the list by repository"
-msgstr "Update the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:256
-#, fuzzy
 msgid "Show only installed patterns"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:257
 msgid "Show only patterns which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:259
-#, fuzzy
 msgid "Show only installed products"
-msgstr "Query all installed packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:260
 msgid "Show only products which are not installed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:261
-#, fuzzy
 msgid "Restrict the lock to the specified repository"
-msgstr "Restrict wildcards to specified directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:262
 #: /tmp/fish/implicit/share/completions/zypper.fish:264
@@ -66829,76 +61434,64 @@ msgid "Type of package (package, patch, pattern, product).  Default: package"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:263
-#, fuzzy
 msgid "Remove only locks with specified repository"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:265
-#, fuzzy
 msgid "Clean only duplicate locks"
-msgstr "Remove non-duplicate lines"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:266
 msgid "Clean only locks which doesn't lock anything"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:267
-#, fuzzy
 msgid "Takes missing release number as any release"
-msgstr "falta número hexadecimal no escape"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:268
 msgid "Show the operating system label"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:269
-#, fuzzy
 msgid "Clean only specified repositories"
-msgstr "Specify the repository URL"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:270
-#, fuzzy
 msgid "Clean metadata cache"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:271
-#, fuzzy
 msgid "Clean raw metadata cache"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:272
-#, fuzzy
 msgid "Clean both metadata and package caches"
-msgstr "Clean local caches and packages"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:274
-#, fuzzy
 msgid "Install patch fixing the specified bugzilla issue"
-msgstr "Monta partição com etiqueta especificada"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:275
-#, fuzzy
 msgid "Install all patches in this category"
-msgstr "Check files into the repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:279
-#, fuzzy
 msgid "Install patch fixing the specified CVE issue"
-msgstr "Query an (uninstalled) package in specified file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:280
 msgid "Install patches issued until the specified date <YYYY-MM-DD>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:285
-#, fuzzy
 msgid "Skip interactive patches"
-msgstr "Run in interactive mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:286
-#, fuzzy
 msgid "Do not skip interactive patches"
-msgstr "Do not sign the patch"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:287
 msgid ""
@@ -66907,14 +61500,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:288
-#, fuzzy
 msgid "Delete extraneous source rpms in the local directory"
-msgstr "Create a CVS repository if it doesnt exist"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:289
-#, fuzzy
 msgid "Do not delete extraneous source rpms"
-msgstr "Do not del source files"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:290
 msgid ""
@@ -66931,23 +61522,20 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "Fim de comando"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirh.fish:1
-#, fuzzy
 msgid "Print the current directory history (the prev and next lists)"
-msgstr "Print the current directory history (the back- and fwd- lists)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirs.fish:1
-#, fuzzy
 msgid "Print directory stack"
-msgstr "Print directory stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/down-or-search.fish:1
 msgid ""
@@ -66956,19 +61544,16 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/edit_command_buffer.fish:1
-#, fuzzy
 msgid "Edit the command buffer in an external editor"
-msgstr "Edit a property with an external editor on targets"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:1
-#, fuzzy
 msgid "Alias for the gettext command"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:2
-#, fuzzy
 msgid "Fallback alias for the gettext command"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_append.fish:1
 msgid "Internal completion function for appending string to the commandline"
@@ -66979,9 +61564,8 @@ msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
-#, fuzzy
 msgid "List archive contents"
-msgstr "List archive"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:1
 msgid "Maximum uploads at once"
@@ -67004,19 +61588,16 @@ msgid "Maximum length prefix encoding"
 msgstr "Maximum length prefix encoding"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:6
-#, fuzzy
 msgid "IP to report to the tracker"
-msgstr "IP to report to the tracker"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:7
-#, fuzzy
 msgid "Minimum port to listen to"
-msgstr "Minimum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:8
-#, fuzzy
 msgid "Maximum port to listen to"
-msgstr "Maximum port to listen to"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:9
 msgid "File for server response"
@@ -67103,33 +61684,28 @@ msgid "Whether to inform the user that hash failures occur"
 msgstr "Whether to inform the user that hash failures occur"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_cd.fish:1
-#, fuzzy
 msgid "Completions for the cd command"
-msgstr "Help for the specified command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_command.fish:1
 msgid "Complete using all available commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_convert_options.fish:1
-#, fuzzy
 msgid "Complete Convert options"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
-#, fuzzy
 msgid "Complete directory prefixes"
-msgstr "Set directory prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:1
-#, fuzzy
 msgid "Complete ftp, pftp"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:2
-#, fuzzy
 msgid "Hostname"
-msgstr "nome"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:3
 msgid "Use only IPv4 to contact any host"
@@ -67160,9 +61736,8 @@ msgid "Disable command editing and history support"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:10
-#, fuzzy
 msgid "Disable file name globbing"
-msgstr "Don't trust the file modification times"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:11
 msgid "Do not explicitly bind data and control channels to same interface"
@@ -67173,32 +61748,28 @@ msgid "Verbose. Show all server responses and data transfer stats"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ftp.fish:13
-#, fuzzy
 msgid "Enable debugging"
-msgstr "Enable debug"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_groups.fish:1
 msgid "Print a list of local groups, with group members as the description"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_job_pids.fish:1
-#, fuzzy
 msgid "Print a list of job PIDs and their commands"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:1
-#, fuzzy
 msgid "Complete lpr common options"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:2
 msgid "Forces encryption when connecting to the server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:3
-#, fuzzy
 msgid "Specifies an alternate username"
-msgstr "Specify the http username"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:4
 msgid "Specifies an alternate printer or class name"
@@ -67209,27 +61780,24 @@ msgid "Apply command to all printers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:7
-#, fuzzy
 msgid "Sets a job option"
-msgstr "Set a config option"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:8
 msgid "Send an email on job completion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:9
-#, fuzzy
 msgid "Landscape mode"
-msgstr "Unsafe mode"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:10
 msgid "Media size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:11
-#, fuzzy
 msgid "Page ranges"
-msgstr "Pager"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:12
 msgid "Choose orientation (4-landscape)"
@@ -67252,33 +61820,28 @@ msgid "Scale image files to use up to number percent of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:17
-#, fuzzy
 msgid "Set the number of characters per inch to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:18
-#, fuzzy
 msgid "Set the number of lines per inch to use"
-msgstr "Set number of retries to number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:19
 msgid "Set the page margins when printing text files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr_option.fish:1
-#, fuzzy
 msgid "Complete lpr option"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_path.fish:1
-#, fuzzy
 msgid "Complete using path"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:1
-#, fuzzy
 msgid "Complete pgrep/pkill"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:2
 msgid "Match pattern against full command line"
@@ -67295,14 +61858,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:5
-#, fuzzy
 msgid "Select only the newest process"
-msgstr "Select frontend interface"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:6
-#, fuzzy
 msgid "Select only the oldest process"
-msgstr "Select the last NUMBER patches"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:7
 msgid "Only match processes whose parent process ID is listed"
@@ -67329,9 +61890,8 @@ msgid "Only match processes whose real user ID is listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:12
-#, fuzzy
 msgid "Negates the matching"
-msgstr "Invert the sense of matching"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:13
 msgid ""
@@ -67348,14 +61908,12 @@ msgid "Complete isp name for pon/poff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_proc.fish:1
-#, fuzzy
 msgid "Complete by list of running processes"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
-#, fuzzy
 msgid "common completions for ssh commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:2
 msgid "Protocol version 1 only"
@@ -67390,37 +61948,32 @@ msgid "Options"
 msgstr "Opções"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_subcommand.fish:1
-#, fuzzy
 msgid "Complete subcommand"
-msgstr "Compare FILE1 to all operands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_suffix.fish:1
-#, fuzzy
 msgid "Complete using files"
-msgstr "Tolerate sloppy mount options"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_user_at_hosts.fish:1
-#, fuzzy
 msgid "Print list host-names with user@"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_users.fish:1
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:1
-#, fuzzy
 msgid "Completes with ZFS mountpoint properties"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_pools.fish:1
 msgid "Completes with available ZFS pools"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_ro_properties.fish:1
-#, fuzzy
 msgid "Completes with ZFS read-only properties"
-msgstr "Set directory prefix"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_zfs_rw_properties.fish:1
 msgid "Completes with ZFS read-write properties"
@@ -67441,39 +61994,32 @@ msgid "Initializations that should be performed when entering interactive mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:2
-#, fuzzy
 msgid "Event handler, repaints the prompt when fish_color_cwd changes"
-msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:3
-#, fuzzy
 msgid "Event handler, repaints the prompt when fish_color_cwd_root changes"
-msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:4
-#, fuzzy
 msgid "Start service"
-msgstr "Start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:5
-#, fuzzy
 msgid "Stop service"
-msgstr "Stop service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:6
-#, fuzzy
 msgid "Print service status"
-msgstr "Print service status"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:7
-#, fuzzy
 msgid "Stop and then start service"
-msgstr "Stop and then start service"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:8
-#, fuzzy
 msgid "Reload service configuration"
-msgstr "Reload service configuration"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:9
 msgid "Reload key bindings when binding variable change"
@@ -67484,14 +62030,12 @@ msgid "Repaint screen when window changes size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_contains_opt.fish:1
-#, fuzzy
 msgid "Checks if a specific option has been given in the current commandline"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_crux_packages.fish:1
-#, fuzzy
 msgid "Obtain a list of installed packages"
-msgstr "Rebuild and install an installed package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_cursor_1337.fish:1
 msgid "Set cursor using OSC command 1337"
@@ -67506,29 +62050,21 @@ msgid "Set cursor (xterm)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_key_bindings.fish:1
-#, fuzzy
 msgid "Default (Emacs-like) key bindings for fish"
-msgstr "Specify key bindings file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_default_mode_prompt.fish:1
-#, fuzzy
 msgid "Display the default mode for the prompt"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_describe_command.fish:1
-#, fuzzy
 msgid "Command used to find descriptions for commands"
-msgstr "Use function keys for commands"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
 msgid "Helper function for fish_git_prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
-#, fuzzy
-msgid "Prompt function for Git"
-msgstr "Current functions are: "
-
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
@@ -67553,21 +62089,6 @@ msgstr ""
 msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
-#, fuzzy
-msgid "Event handler, repaints prompt when functionality changes"
-msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
-
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
-#, fuzzy
-msgid "Event handler, repaints prompt when any color changes"
-msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
-
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
-#, fuzzy
-msgid "Event handler, repaints prompt when any char changes"
-msgstr "Event handler, repaints the prompt when fish_color_cwd changes"
-
 #: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1
 msgid ""
 "Wrapper for the complete built-in. Skips the long completions on non-GNU "
@@ -67575,9 +62096,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_hg_prompt.fish:1
-#, fuzzy
 msgid "Write out the hg prompt"
-msgstr "Write out the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_hybrid_key_bindings.fish:1
 msgid "Vi-style bindings that inherit emacs-style bindings in all modes"
@@ -67588,9 +62108,8 @@ msgid "Test if no non-switch argument has been specified yet"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_git_repository.fish:1
-#, fuzzy
 msgid "Check if the current directory is a git repository"
-msgstr "Check the entire repository"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_token_n.fish:1
 msgid "Test if current token is on Nth place"
@@ -67613,28 +62132,24 @@ msgid "Make list of kill signals for completion"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:2
-#, fuzzy
 msgid "List names of available signals"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:3
-#, fuzzy
 msgid "List codes and names of available signals"
-msgstr "Display names of all signals"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_mode_prompt.fish:1
-#, fuzzy
 msgid "Displays the current mode"
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_move_last.fish:1
 msgid "Move the last element of a directory history from src to dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_no_arguments.fish:1
-#, fuzzy
 msgid "Internal fish function"
-msgstr "Erase function"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_not_contain_opt.fish:1
 msgid "Checks that a specific option is not in the current command line"
@@ -67645,108 +62160,89 @@ msgid "Paginate the current command using the users default pager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
-#, fuzzy
 msgid "Print a list of known network addresses"
-msgstr "Print a list of running screen sessions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
-#, fuzzy
 msgid "Print a list of documented fish commands"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_filesystems.fish:1
-#, fuzzy
 msgid "Print a list of all known filesystem types"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
-#, fuzzy
 msgid "Print a list of local groups"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
-#, fuzzy
 msgid "Print help message for the specified fish function or builtin"
-msgstr "Print all completions for the specified commandline"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_hostnames.fish:1
-#, fuzzy
 msgid "Print a list of known hostnames"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_interfaces.fish:1
-#, fuzzy
 msgid "Print a list of known network interfaces"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_options.fish:1
-#, fuzzy
 msgid "Print lpr options"
-msgstr "Print all versions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
-#, fuzzy
 msgid "Print lpr printers"
-msgstr "Print full records"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
-#, fuzzy
 msgid "Print mounted devices"
-msgstr "Print important dependencies"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_pacman_repos.fish:1
 msgid "Print the repositories configured for arch's pacman package manager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_service_names.fish:1
-#, fuzzy
 msgid "All services known to the system"
-msgstr "Search for other system"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_svn_rev.fish:1
-#, fuzzy
 msgid "Print svn revisions"
-msgstr "Print only given revisions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_users.fish:1
-#, fuzzy
 msgid "Print a list of local users"
-msgstr "Print a list of all accepted color names"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_applications_directories.fish:1
-#, fuzzy
 msgid "Print directories where desktop files are stored"
-msgstr "Lista diretórios, não seu conteúdo"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
-#, fuzzy
 msgid "Print XDG mime types"
-msgstr "Print command type"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
-#, fuzzy
 msgid "Print X windows"
-msgstr "Print APM info"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
-#, fuzzy
 msgid "Lists ZFS snapshots"
-msgstr "Lista as chaves"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
-#, fuzzy
 msgid "Write out the prompt"
-msgstr "Write out the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
-#, fuzzy
 msgid "Show current path"
-msgstr "Show source package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_shared_key_bindings.fish:1
 msgid "Bindings shared between emacs and vi mode"
@@ -67761,28 +62257,24 @@ msgid "helper function that does pretty formatting on svn status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_svn_prompt.fish:2
-#, fuzzy
 msgid "Prompt function for svn"
-msgstr "Current functions are: "
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_fish_systemctl.fish:1
-#, fuzzy
 msgid "Call systemctl with some options from the current commandline"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "Update man-page based completions"
-msgstr "Edit command specific completions"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
-#, fuzzy
 msgid "Test if a non-switch argument has been given in the current commandline"
-msgstr "Test if apt has yet to be given the subcommand"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_vcs_prompt.fish:1
 msgid "Print the prompts for all available vcsen"
@@ -67793,9 +62285,8 @@ msgid "Set cursor shape for different vi modes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_vi_key_bindings.fish:1
-#, fuzzy
 msgid "vi-like key bindings for fish"
-msgstr "Specify key bindings file"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/funced.fish:1
 msgid "Edit function definition"
@@ -67806,9 +62297,8 @@ msgid "Save the current definition of all specified functions to file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/help.fish:1
-#, fuzzy
 msgid "Show help for the fish shell"
-msgstr "Show help for the fish shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/history.fish:1
 msgid "display or manipulate interactive command history"
@@ -67819,97 +62309,78 @@ msgid "Show or set the system's host name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "Tests if a file descriptor is a tty"
-msgstr "Descritores de arquivos não especificados"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/la.fish:1
-#, fuzzy
 msgid ""
 "List contents of directory, including hidden files in directory using long "
 "format"
 msgstr ""
-"List contents of directory, including hidden files in directory using long "
-"format"
 
 #: /tmp/fish/implicit/share/functions/ll.fish:1
-#, fuzzy
 msgid "List contents of directory using long format"
-msgstr "List contents of directory using long format"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/ls.fish:1
 #: /tmp/fish/implicit/share/functions/ls.fish:2
 #: /tmp/fish/implicit/share/functions/ls.fish:3
-#, fuzzy
 msgid "List contents of directory"
-msgstr "List contents of directory"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/man.fish:1
-#, fuzzy
 msgid "Format and display the on-line manual pages"
-msgstr "Display change information for the package"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/nextd.fish:1
-#, fuzzy
 msgid "Move forward in the directory history"
-msgstr "Move forward in the directory history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/N_.fish:1
 msgid "No-op"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/open.fish:1
-#, fuzzy
 msgid "Open file in default application"
-msgstr "Open file in default application"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/popd.fish:1
-#, fuzzy
 msgid "Pop directory from the stack and cd to it"
-msgstr "Pop dir from stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/prevd.fish:1
-#, fuzzy
 msgid "Move back in the directory history"
-msgstr "Move back in the directory history"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/prompt_pwd.fish:1
-#, fuzzy
 msgid "Print the current working directory, shortened to fit the prompt"
-msgstr "Print the current working directory, shortend to fit the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/psub.fish:1
-#, fuzzy
 msgid ""
 "Read from stdin into a file and output the filename. Remove the file when "
 "the command that called psub exits."
 msgstr ""
-"Read from stdin into a file and output the filename. Remove the file when "
-"the command that called psub exits."
 
 #: /tmp/fish/implicit/share/functions/pushd.fish:1
-#, fuzzy
 msgid "Push directory to stack"
-msgstr "Push directory to stack"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:1
-#, fuzzy
 msgid "print the resolved path [command realpath]"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:2
-#, fuzzy
 msgid "print the resolved path [command grealpath]"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:3
 msgid "return an absolute path without symlinks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "Print sequences of numbers"
-msgstr "Print name, not number"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:2
 msgid "Fallback implementation of the seq command"
@@ -67920,28 +62391,24 @@ msgid "Set an env var for csh compatibility."
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/suspend.fish:1
-#, fuzzy
 msgid "Suspend the current shell."
-msgstr "Display version and exit"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__terlar_git_prompt.fish:1
-#, fuzzy
 msgid "Write out the git prompt"
-msgstr "Write out the prompt"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/trap.fish:1
 msgid "Perform an action when the shell receives a signal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/type.fish:1
-#, fuzzy
 msgid "Print the type of a command"
-msgstr "Print the type of a command"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/umask.fish:1
-#, fuzzy
 msgid "Set default file permission mask"
-msgstr "Set default file permission mask"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/up-or-search.fish:1
 msgid ""
@@ -67950,11 +62417,9 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/vared.fish:1
-#, fuzzy
 msgid "Edit variable value"
-msgstr "Erase variable"
+msgstr ""
 
-#, fuzzy
 #~ msgid "%ls: --array option requires a single variable name.\n"
 #~ msgstr ""
 #~ "%ls: Erase needs a variable name\n"
@@ -67972,19 +62437,15 @@ msgstr "Erase variable"
 #~ "%ls: Vários nomes de variáveis especificados em uma única chamada (%ls e "
 #~ "%.*ls)\n"
 
-#, fuzzy
 #~ msgid "%ls: Values cannot be specfied with erase\n"
 #~ msgstr "%ls: Values cannot be specfied with erase\n"
 
-#, fuzzy
 #~ msgid "string: Expected subcommand\n"
 #~ msgstr "string: Execute command\n"
 
-#, fuzzy
 #~ msgid "string: Unknown subcommand '%ls'\n"
 #~ msgstr "string: Comando desconhecido “%ls”\n"
 
-#, fuzzy
 #~ msgid "terminal_give_to_job(): Could not send job %d ('%ls') to foreground"
 #~ msgstr "Não foi possível enviar tarefa %d (“%ls”) para primeiro plano"
 
@@ -67994,70 +62455,53 @@ msgstr "Erase variable"
 #~ msgid "Couldn't grab control of terminal"
 #~ msgstr "Não foi possível pegar controle do terminal"
 
-#, fuzzy
 #~ msgid "funced: You must specify one function name"
 #~ msgstr "funced: Você deve especificar um nome de função"
 
-#, fuzzy
 #~ msgid "%s: Expected function name\\n"
 #~ msgstr "%s: Expected function name\\n"
 
-#, fuzzy
 #~ msgid "%ls: Invalid combination of options,\\n%ls\\n"
 #~ msgstr "%ls: Combinação inválida de opções,\\n%ls\\n"
 
-#, fuzzy
 #~ msgid "The number of positions to skip must be a non-negative integer\\n"
 #~ msgstr "The number of positions to skip must be a non-negative integer\\n"
 
-#, fuzzy
 #~ msgid "Evaluate contents of file (deprecated, see \"source\")"
 #~ msgstr "Executa conteúdo do arquivo"
 
-#, fuzzy
 #~ msgid "Help on how job control works"
 #~ msgstr "Help on how job control works"
 
-#, fuzzy
 #~ msgid "Summary on how fish differs from other shells"
 #~ msgstr "Summary on how fish differs from other shells"
 
-#, fuzzy
 #~ msgid "Help on how to set the prompt"
 #~ msgstr "Help on how to set the prompt"
 
-#, fuzzy
 #~ msgid "Help on how to set the titlebar message"
 #~ msgstr "Help on how to set the titlebar message"
 
-#, fuzzy
 #~ msgid "Help on how to copy and paste"
 #~ msgstr "Help on how to copy and paste"
 
-#, fuzzy
 #~ msgid "Help on editor shortcuts"
 #~ msgstr "Help on editor shortcuts"
 
-#, fuzzy
 #~ msgid "ignore chnages in the amount of white space"
 #~ msgstr "Ignore changes in the amount of white space"
 
-#, fuzzy
 #~ msgid "Change to DIR"
 #~ msgstr "Alterar para usuário"
 
-#, fuzzy
 #~ msgid "Show a unit"
 #~ msgstr "Show arp entries"
 
-#, fuzzy
 #~ msgid "Edit a unit"
 #~ msgstr "Emite um evento"
 
-#, fuzzy
 #~ msgid "Manage abbreviations"
 #~ msgstr "Manual sections"
 
-#, fuzzy
 #~ msgid "Perform math calculations in bc"
 #~ msgstr "Perform a simulation"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 897cb4574..1dde54a15 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,16 +11,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/autoload.cpp:96
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not autoload item '%ls', it is already being autoloaded. This is a "
 "circular dependency in the autoloading scripts, please remove it."
-msgstr "不能自动加载项目 “%ls”，它已经被自动加载了。"
+msgstr ""
 
 #: src/builtin_argparse.cpp:36
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid option spec '%ls' at char '%lc'\n"
-msgstr "%ls：进程id %ls 非法 '%lc'\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:129
 #, c-format
@@ -28,14 +28,14 @@ msgid "%ls: Mutually exclusive flags '%ls' and `%ls` seen\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag string '%ls' is not valid\n"
-msgstr "%ls：种子值 “%ls” 不是一个有效的数字\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: exclusive flag '%ls' is not valid\n"
-msgstr "%ls：种子值 “%ls” 不是一个有效的数字\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:196
 #, c-format
@@ -74,14 +74,14 @@ msgid "%ls: No option specs were provided\n"
 msgstr ""
 
 #: src/builtin_argparse.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --min-args value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_argparse.cpp:401
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid --max-args value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:23
 #, c-format
@@ -101,14 +101,14 @@ msgid "%ls: There are no suitable jobs\n"
 msgstr "%ls：没有匹配的任务\n"
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid job specifier\n"
-msgstr "%ls：“%ls” 不是一个任务\n"
+msgstr ""
 
 #: src/builtin_bg.cpp:95 src/builtin_disown.cpp:89 src/builtin_wait.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Could not find job '%d'\n"
-msgstr "%ls：找不到home目录 '%d'\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:141
 #, c-format
@@ -126,9 +126,9 @@ msgid "%ls: Unknown error trying to bind to key named '%ls'\n"
 msgstr "%ls：在尝试绑定名为 “%ls” 的键时发生未知错误\n"
 
 #: src/builtin_bind.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No binding found for key '%ls'\n"
-msgstr "%s: No description for type %s\n"
+msgstr ""
 
 #: src/builtin_bind.cpp:242
 #, c-format
@@ -186,14 +186,14 @@ msgid "%ls: Could not set PWD variable\n"
 msgstr "%ls：不能设置 PWD 变量\n"
 
 #: src/builtin_commandline.cpp:344
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown input function '%ls'"
-msgstr "%ls：未知的输入函数 “%ls”"
+msgstr ""
 
 #: src/builtin_complete.cpp:183
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid token '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_complete.cpp:203
 #, c-format
@@ -230,14 +230,13 @@ msgid "%ls: Not inside of loop\n"
 msgstr "%ls：不在循环体内部\n"
 
 #: src/builtin.cpp:372
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Command not valid at an interactive prompt\n"
-msgstr "%ls: 只在不活跃的进程上\n"
+msgstr ""
 
 #: src/builtin.cpp:410 src/builtin.cpp:460
-#, fuzzy
 msgid "Test a condition"
-msgstr "设置配置选项"
+msgstr ""
 
 #: src/builtin.cpp:411
 msgid "Execute command if previous command suceeded"
@@ -313,9 +312,8 @@ msgid "Remove job from job list"
 msgstr ""
 
 #: src/builtin.cpp:431
-#, fuzzy
 msgid "Print arguments"
-msgstr "打印单词计数"
+msgstr ""
 
 #: src/builtin.cpp:432
 msgid "Evaluate block if condition is false"
@@ -382,14 +380,12 @@ msgid "Execute command if previous command failed"
 msgstr "如果前一条命令失败执行命令"
 
 #: src/builtin.cpp:448
-#, fuzzy
 msgid "Prints formatted text"
-msgstr "显示命令类型"
+msgstr ""
 
 #: src/builtin.cpp:449
-#, fuzzy
 msgid "Print the working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: src/builtin.cpp:450
 msgid "Generate random number"
@@ -481,9 +477,9 @@ msgid ""
 msgstr "%ls：不能将任务 %d, “%ls” 带到前台，因为它不受到任务控制\n"
 
 #: src/builtin_function.cpp:68
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown signal '%ls'"
-msgstr "%ls：未知的信号 “%ls”"
+msgstr ""
 
 #: src/builtin_function.cpp:113
 #, c-format
@@ -491,33 +487,31 @@ msgid "%ls: Cannot find calling job for event handler"
 msgstr ""
 
 #: src/builtin_function.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid process id '%ls'"
-msgstr "%ls：进程id %ls 非法"
+msgstr ""
 
 #: src/builtin_function.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected function name"
-msgstr "%ls：应有函数名"
+msgstr ""
 
 #: src/builtin_function.cpp:185
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Illegal function name '%ls'"
-msgstr "%ls：函数名 “%ls” 非法"
+msgstr ""
 
 #: src/builtin_function.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: The name '%ls' is reserved,\n"
 "and can not be used as a function name"
 msgstr ""
-"%ls：名字 “%ls” 已经保留，\n"
-"不能作为函数名"
 
 #: src/builtin_function.cpp:239
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unexpected positional argument '%ls'"
-msgstr "%ls：应有一个参数，提供了 %ls 个"
+msgstr ""
 
 #: src/builtin_functions.cpp:275 src/builtin.h:38
 #, c-format
@@ -535,16 +529,16 @@ msgid "%ls: Function '%ls' does not exist\n"
 msgstr "%ls：函数 “%ls” 不存在\n"
 
 #: src/builtin_functions.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
-msgstr "%ls：应恰好有一个函数名\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:342
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: Expected exactly two names (current function name, and new function "
 "name)\n"
-msgstr "%ls：应恰好有一个函数名\n"
+msgstr ""
 
 #: src/builtin_functions.cpp:359
 #, c-format
@@ -552,9 +546,9 @@ msgid "%ls: Illegal function name '%ls'\n"
 msgstr "%ls：函数名 “%ls” 非法\n"
 
 #: src/builtin_functions.cpp:368
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
-msgstr "%ls：函数 “%ls” 不存在 '%ls'\n"
+msgstr ""
 
 #: src/builtin_history.cpp:71 src/builtin_status.cpp:117
 #, c-format
@@ -567,9 +561,9 @@ msgid "%ls: you cannot use any options with the %ls command\n"
 msgstr ""
 
 #: src/builtin_history.cpp:163
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: max value '%ls' is not a valid number\n"
-msgstr "%ls：种子值 “%ls” 不是一个有效的数字\n"
+msgstr ""
 
 #: src/builtin_history.cpp:261
 msgid "builtin history delete only supports --exact\n"
@@ -604,9 +598,8 @@ msgid "Group\n"
 msgstr "组\n"
 
 #: src/builtin_jobs.cpp:84
-#, fuzzy
 msgid "Process\n"
-msgstr "进程\n"
+msgstr ""
 
 #: src/builtin_jobs.cpp:95
 msgid "Command\n"
@@ -618,9 +611,9 @@ msgid "%ls: There are no jobs\n"
 msgstr "%ls：没有任务\n"
 
 #: src/builtin_math.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: '%ls' is not a valid scale value\n"
-msgstr "%ls：“%ls” 不是一个任务\n"
+msgstr ""
 
 #: src/builtin_math.cpp:148
 #, c-format
@@ -633,18 +626,18 @@ msgid "More than %d var names in math expression."
 msgstr ""
 
 #: src/builtin_math.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid expression: %ls\n"
-msgstr "%ls：进程id %ls 非法\n"
+msgstr ""
 
 #: src/builtin_printf.cpp:243
 msgid "Number out of range"
 msgstr ""
 
 #: src/builtin_printf.cpp:249
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: expected a numeric value"
-msgstr "%s：应有一个参数"
+msgstr ""
 
 #: src/builtin_printf.cpp:251
 #, c-format
@@ -670,14 +663,14 @@ msgid "invalid field width: %ls"
 msgstr ""
 
 #: src/builtin_printf.cpp:674
-#, fuzzy, c-format
+#, c-format
 msgid "invalid precision: %ls"
-msgstr "非法的进程ID: %ls"
+msgstr ""
 
 #: src/builtin_printf.cpp:699
-#, fuzzy, c-format
+#, c-format
 msgid "%.*ls: invalid conversion specification"
-msgstr "%.*ls：非法的选项组合"
+msgstr ""
 
 #: src/builtin_read.cpp:123
 #, c-format
@@ -686,9 +679,9 @@ msgid ""
 msgstr ""
 
 #: src/builtin_read.cpp:132
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Argument '%ls' is out of range\n"
-msgstr "%ls: Argument “%ls” is not a number\n"
+msgstr ""
 
 #: src/builtin_read.cpp:344
 #, c-format
@@ -696,9 +689,9 @@ msgid "%ls: You can't specify both -p and -P\n"
 msgstr ""
 
 #: src/builtin_realpath.cpp:44
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid path: %ls\n"
-msgstr "%ls：非法状态: %ls\n"
+msgstr ""
 
 #: src/builtin_return.cpp:100
 #, c-format
@@ -706,19 +699,19 @@ msgid "%ls: Not inside of function\n"
 msgstr "%ls：不在函数体之内\n"
 
 #: src/builtin_set_color.cpp:159 src/builtin_set_color.cpp:178
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown color '%ls'\n"
-msgstr "%ls：未知的任务 “%ls”\n"
+msgstr ""
 
 #: src/builtin_set_color.cpp:167
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected an argument\n"
-msgstr "%ls：应有一个参数，提供了 个\n"
+msgstr ""
 
 #: src/builtin_set.cpp:62
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Warning: $%ls entry \"%ls\" is not valid (%s)\n"
-msgstr "%ls：$ %ls 种子值 “%ls” 不是一个有效的数字 (%s)\n"
+msgstr ""
 
 #: src/builtin_set.cpp:64
 #, c-format
@@ -731,9 +724,9 @@ msgid "%ls: You provided %d indexes but %d values\n"
 msgstr ""
 
 #: src/builtin_set.cpp:66
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Erase needs a variable name\n"
-msgstr "%ls：Erase 需要一个变量名\n"
+msgstr ""
 
 #: src/builtin_set.cpp:67
 #, c-format
@@ -753,14 +746,14 @@ msgid "%ls: Tried to change the read-only variable '%ls'\n"
 msgstr "%ls：试图改变只读变量 “%ls” 的值\n"
 
 #: src/builtin_set.cpp:310
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
-msgstr "%ls：试图改变只读变量 “%ls” 的值\n"
+msgstr ""
 
 #: src/builtin_set.cpp:317
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
-msgstr "%ls：试图改变只读变量 “%ls” 的值\n"
+msgstr ""
 
 #: src/builtin_set.cpp:355
 #, c-format
@@ -768,9 +761,9 @@ msgid "%ls: Invalid index starting at '%ls'\n"
 msgstr "%ls：开始于 “%ls” 的索引非法\n"
 
 #: src/builtin_set.cpp:537
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: not set in %ls scope\n"
-msgstr "%ls：不在循环体内部 %ls\n"
+msgstr ""
 
 #: src/builtin_set.cpp:542
 msgid "exported"
@@ -786,14 +779,14 @@ msgid "$%ls: set in %ls scope, %ls, with %d elements\n"
 msgstr ""
 
 #: src/builtin_set.cpp:554
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls[%d]: length=%d value=|%ls|\n"
-msgstr "$%ls[%d]: length=%d value=|%ls|\n"
+msgstr ""
 
 #: src/builtin_set.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "$%ls: invalid var name\n"
-msgstr "%ls：非法状态\n"
+msgstr ""
 
 #: src/builtin_set.cpp:584
 #, c-format
@@ -816,9 +809,9 @@ msgid "%ls: Error while reading file '%ls'\n"
 msgstr "%ls：读取文件 “%ls” 时发生错误\n"
 
 #: src/builtin_status.cpp:155
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid level value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_status.cpp:276
 msgid "This is a login shell\n"
@@ -850,39 +843,38 @@ msgid "Standard input"
 msgstr "标准输入"
 
 #: src/builtin_status.cpp:320
-#, fuzzy
 msgid "Not a function"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: src/builtin_string.cpp:39
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected argument\n"
-msgstr "%ls：应有一个参数，提供了个\n"
+msgstr ""
 
 #: src/builtin_string.cpp:160
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid escape style '%ls'\n"
-msgstr "%ls：开始于 “%ls” 的索引非法\n"
+msgstr ""
 
 #: src/builtin_string.cpp:238
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid length value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_string.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid max value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_string.cpp:275
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid count value '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/builtin_string.cpp:321
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid start value '%ls'\n"
-msgstr "%ls：开始于 “%ls” 的索引非法\n"
+msgstr ""
 
 #: src/builtin_string.cpp:743
 #, c-format
@@ -909,9 +901,9 @@ msgid "%ls: Regular expression substitute error: %ls\n"
 msgstr ""
 
 #: src/builtin_test.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid integer '%ls'"
-msgstr "非法的进程ID: %ls"
+msgstr ""
 
 #: src/builtin_ulimit.cpp:285
 #, c-format
@@ -919,9 +911,9 @@ msgid "%ls: New limit cannot be an empty string\n"
 msgstr ""
 
 #: src/builtin_ulimit.cpp:297
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid limit '%ls'\n"
-msgstr "%ls：变量名 “%ls” 非法\n"
+msgstr ""
 
 #: src/common.cpp:1551
 msgid "Current terminal parameters have rows and/or columns set to zero."
@@ -982,14 +974,13 @@ msgid "Could not set up terminal."
 msgstr ""
 
 #: src/env.cpp:576
-#, fuzzy
 msgid "TERM environment variable not set."
-msgstr "处理环境变量"
+msgstr ""
 
 #: src/env.cpp:578
-#, fuzzy, c-format
+#, c-format
 msgid "TERM environment variable set to '%ls'."
-msgstr "处理环境变量 '%ls'"
+msgstr ""
 
 #: src/env.cpp:579
 msgid "Check that this terminal type is supported on this system."
@@ -1061,9 +1052,9 @@ msgid "signal handler for %ls (%ls)"
 msgstr ""
 
 #: src/event.cpp:124
-#, fuzzy, c-format
+#, c-format
 msgid "handler for variable '%ls'"
-msgstr "处理环境变量 '%ls'"
+msgstr ""
 
 #: src/event.cpp:129
 #, c-format
@@ -1114,9 +1105,9 @@ msgid "An error occurred while redirecting file '%s'"
 msgstr ""
 
 #: src/exec.cpp:714
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown function '%ls'"
-msgstr "未知的内置命令 “%ls”"
+msgstr ""
 
 #: src/exec.cpp:801
 #, c-format
@@ -1128,18 +1119,17 @@ msgid "Child process"
 msgstr ""
 
 #: src/expand.cpp:58
-#, fuzzy
 msgid "Process"
-msgstr "进程"
+msgstr ""
 
 #: src/expand.cpp:61
 msgid "Job"
 msgstr ""
 
 #: src/expand.cpp:64
-#, fuzzy, c-format
+#, c-format
 msgid "Job: %ls"
-msgstr "任务控制：%ls"
+msgstr ""
 
 #: src/expand.cpp:67
 msgid "Shell process"
@@ -1182,14 +1172,14 @@ msgid "Can not use the no-execute mode when running an interactive session"
 msgstr ""
 
 #: src/fish.cpp:431
-#, fuzzy, c-format
+#, c-format
 msgid "Error while reading file %ls\n"
-msgstr "读取文件 “%ls” 时发生错误\n"
+msgstr ""
 
 #: src/fish_indent.cpp:389
-#, fuzzy, c-format
+#, c-format
 msgid "%ls, version %s\n"
-msgstr "%ls：拒绝访问：“%s”\n"
+msgstr ""
 
 #: src/fish_indent.cpp:453
 #, c-format
@@ -1205,9 +1195,8 @@ msgid "Opening \"%s\" failed: %s\n"
 msgstr ""
 
 #: src/fish_indent.cpp:469
-#, fuzzy
 msgid "Too many arguments\n"
-msgstr "参数过多\n"
+msgstr ""
 
 #: src/fish_key_reader.cpp:241
 #, c-format
@@ -1266,9 +1255,9 @@ msgid "(no matches)"
 msgstr ""
 
 #: src/parse_execution.cpp:556
-#, fuzzy, c-format
+#, c-format
 msgid "switch: Expected exactly one argument, got %lu\n"
-msgstr "应有一个参数，提供了 %lu 个\n"
+msgstr ""
 
 #: src/parse_execution.cpp:791
 #, c-format
@@ -1283,9 +1272,9 @@ msgid "The file '%ls' is not executable by this user"
 msgstr ""
 
 #: src/parse_execution.cpp:1007
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid redirection target: %ls"
-msgstr "非法的进程ID: %ls"
+msgstr ""
 
 #: src/parse_execution.cpp:1021
 #, c-format
@@ -1355,9 +1344,8 @@ msgid "Could not write profiling information to file '%s'"
 msgstr ""
 
 #: src/parser.cpp:308
-#, fuzzy
 msgid "Time\tSum\tCommand\n"
-msgstr "状态\t命令\n"
+msgstr ""
 
 #: src/parser.cpp:366
 #, c-format
@@ -1370,9 +1358,9 @@ msgid "from sourcing file %ls\n"
 msgstr ""
 
 #: src/parser.cpp:392
-#, fuzzy, c-format
+#, c-format
 msgid "in function '%ls'\n"
-msgstr "未知的输入函数 “%ls”\n"
+msgstr ""
 
 #: src/parser.cpp:396
 msgid "in command substitution\n"
@@ -1388,9 +1376,8 @@ msgid "\tcalled during startup\n"
 msgstr ""
 
 #: src/parser.cpp:412
-#, fuzzy
 msgid "\tcalled on standard input\n"
-msgstr "\t标准输入\n"
+msgstr ""
 
 #: src/parser.cpp:425
 #, c-format
@@ -1492,14 +1479,14 @@ msgid "An error occured while reading output from code block"
 msgstr ""
 
 #: src/proc.cpp:856
-#, fuzzy, c-format
+#, c-format
 msgid "Could not send job %d ('%ls') with pgid %d to foreground"
-msgstr "将任务 %d，“%ls” 发送到前台 pgid %d"
+msgstr ""
 
 #: src/proc.cpp:885
-#, fuzzy, c-format
+#, c-format
 msgid "Could not send job %d ('%ls') to foreground"
-msgstr "将任务 %d，“%ls” 发送到前台"
+msgstr ""
 
 #: src/proc.cpp:909 src/proc.cpp:918 src/proc.cpp:932
 msgid "Could not return shell to foreground"
@@ -1511,14 +1498,12 @@ msgid "More than one job in foreground: job 1: '%ls' job 2: '%ls'"
 msgstr ""
 
 #: src/proc.cpp:1075
-#, fuzzy
 msgid "Process argument list"
-msgstr "打印单词计数"
+msgstr ""
 
 #: src/proc.cpp:1076
-#, fuzzy
 msgid "Process name"
-msgstr "进程"
+msgstr ""
 
 #: src/proc.cpp:1079
 #, c-format
@@ -1553,18 +1538,14 @@ msgid "Pop null reader block"
 msgstr ""
 
 #: src/reader.cpp:2160
-#, fuzzy
 msgid "There are still jobs active:\n"
-msgstr "没有匹配的任务\n"
+msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   命令\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -1576,9 +1557,9 @@ msgid ""
 msgstr ""
 
 #: src/reader.cpp:3205
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown key binding 0x%X"
-msgstr "未知的内置命令 “%ls”"
+msgstr ""
 
 #: src/reader.cpp:3294
 msgid "Error while reading from file descriptor"
@@ -1691,9 +1672,8 @@ msgid "Stop from terminal output"
 msgstr ""
 
 #: src/signal.cpp:99
-#, fuzzy
 msgid "Urgent socket condition"
-msgstr "设置配置选项"
+msgstr ""
 
 #: src/signal.cpp:102
 msgid "CPU time limit exceeded"
@@ -1780,44 +1760,44 @@ msgid "Cannot use stdin (fd 0) as pipe output"
 msgstr ""
 
 #: src/wgetopt.cpp:246
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Invalid option -- %lc\n"
-msgstr "%ls：进程id %ls 非法\n"
+msgstr ""
 
 #: src/wgetopt.cpp:277
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option requires an argument -- %lc\n"
-msgstr "%ls：应有一个参数，提供了 %d 个\n"
+msgstr ""
 
 #: src/wgetopt.cpp:304
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '--%ls' doesn't allow an argument\n"
-msgstr "%ls：函数 “%ls” 不存在\n"
+msgstr ""
 
 #: src/wgetopt.cpp:308
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%lc%ls' doesn't allow an argument\n"
-msgstr "%ls：函数 “%lc%ls” 不存在\n"
+msgstr ""
 
 #: src/wgetopt.cpp:320
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%ls' requires an argument\n"
-msgstr "%ls：函数 “%ls” 不存在\n"
+msgstr ""
 
 #: src/wgetopt.cpp:383
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Option '%ls' is ambiguous\n"
-msgstr "%ls：函数 “%ls” 不存在\n"
+msgstr ""
 
 #: src/wgetopt.cpp:402
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unrecognized option '--%ls'\n"
-msgstr "%ls：未知的输入函数 “%ls”\n"
+msgstr ""
 
 #: src/wgetopt.cpp:405
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unrecognized option '%lc%ls'\n"
-msgstr "%ls：未知的输入函数 “%lc%ls”\n"
+msgstr ""
 
 #: src/wildcard.cpp:27 /tmp/fish/implicit/share/completions/journalctl.fish:2
 msgid "Executable"
@@ -1882,18 +1862,16 @@ msgid "getcwd() failed with errno %d/%s"
 msgstr ""
 
 #: src/builtin.h:35
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected argument for option %ls\n"
-msgstr "%ls：应有一个参数，提供了 %d 个\n"
+msgstr ""
 
 #: src/builtin.h:41
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: Invalid combination of options,\n"
 "%ls\n"
 msgstr ""
-"%ls：非法的选项组合\n"
-"%ls\n"
 
 #: src/builtin.h:45
 #, c-format
@@ -1906,39 +1884,39 @@ msgid "%ls: Variable can't be both exported and unexported\n"
 msgstr ""
 
 #: src/builtin.h:51
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown option '%ls'\n"
-msgstr "%ls：未知的任务 “%ls”\n"
+msgstr ""
 
 #: src/builtin.h:54
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected %d args, got %d\n"
-msgstr "%ls：应有一个参数%d，提供了 %d 个\n"
+msgstr ""
 
 #: src/builtin.h:55
-#, fuzzy, c-format
+#, c-format
 msgid "%ls %ls: Expected %d args, got %d\n"
-msgstr "%ls %ls：应有一个参数%d，提供了 %d 个\n"
+msgstr ""
 
 #: src/builtin.h:56
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at least %d args, got only %d\n"
-msgstr "%ls：应有一个参数%d，提供了 %d 个\n"
+msgstr ""
 
 #: src/builtin.h:57
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected at most %d args, got %d\n"
-msgstr "%ls：应有一个参数%d，提供了 %d 个\n"
+msgstr ""
 
 #: src/builtin.h:60
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Variable name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls：种子值 “%ls” 不是一个有效的数字\n"
+msgstr ""
 
 #: src/builtin.h:63
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: mode name '%ls' is not valid. See `help identifiers`.\n"
-msgstr "%ls：种子值 “%ls” 不是一个有效的数字\n"
+msgstr ""
 
 #: src/builtin.h:66
 #, c-format
@@ -1946,19 +1924,19 @@ msgid "%ls: Too many arguments\n"
 msgstr "%ls：参数过多\n"
 
 #: src/builtin.h:69
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Argument '%ls' is not a number\n"
-msgstr "%ls: Argument “%ls” is not a number\n"
+msgstr ""
 
 #: src/builtin.h:72
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected a subcommand to follow the command\n"
-msgstr "%ls：应有一个参数，提供了个\n"
+msgstr ""
 
 #: src/builtin.h:73
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Subcommand '%ls' is not valid\n"
-msgstr "%ls：“%ls” 不是一个文件\n"
+msgstr ""
 
 #: src/builtin.h:76
 #, c-format
@@ -2317,9 +2295,8 @@ msgid "Prints a description of a domain or service"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:12
-#, fuzzy
 msgid "Prints information about the service cache"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:13
 msgid "Prints which services are disabled"
@@ -2332,14 +2309,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:15
-#, fuzzy
 msgid "Prints port information about a process"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:16
-#, fuzzy
 msgid "Prints port information about the host"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:17
 msgid "Resolves a port name from a process to an endpoint in launchd"
@@ -2391,9 +2366,8 @@ msgid "Unloads the specified service name"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:29
-#, fuzzy
 msgid "Lists information about services"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:30
 msgid "Starts the specified service"
@@ -2426,9 +2400,8 @@ msgid "Execute a program in the bootstrap context of a given user"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:37
-#, fuzzy
 msgid "Submit a basic job from the command line"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:38
 msgid "Prints the PID of the launchd controlling the session"
@@ -2439,9 +2412,8 @@ msgid "Prints the UID of the current launchd session"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:40
-#, fuzzy
 msgid "Prints the name of the current launchd session"
-msgstr "跳过最内层循环的当前一轮的剩余部分"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/launchctl.fish:41
 msgid "Prints a description of an error"
@@ -2649,9 +2621,8 @@ msgid "Reset preferred minor to current one"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:58
-#, fuzzy
 msgid "Abort currently running actions"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/mdadm.fish:59
 msgid "Abort currently running actions, prevent their restart"
@@ -2771,9 +2742,8 @@ msgid "Value received by 'zfs receive'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:10
-#, fuzzy
 msgid "Value valid for the current mount"
-msgstr "停止当前求值的函数"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:11
 msgid "Read-only value"
@@ -2951,9 +2921,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:51
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:14
-#, fuzzy
 msgid "Max number of snapshots"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:52
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_mountpoint_properties.fish:4
@@ -3009,9 +2978,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:62
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:25
-#, fuzzy
 msgid "Hide .zfs directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:63
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_rw_properties.fish:26
@@ -3108,9 +3076,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:84
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:1
-#, fuzzy
 msgid "Unicode normalization"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zfs.fish:85
 #: /tmp/fish/explicit/share/functions/__fish_complete_zfs_write_once_properties.fish:2
@@ -3134,9 +3101,8 @@ msgid "Dataset name"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:1
-#, fuzzy
 msgid "Pool full name"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:5
 msgid "Mirror of at least two devices"
@@ -3187,9 +3153,8 @@ msgid "Usage percentage of pool"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:18
-#, fuzzy
 msgid "Deduplication ratio"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:19
 msgid "Amount of uninitialized space within the pool"
@@ -3229,9 +3194,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:28
 #: /tmp/fish/explicit/share/completions/zpool.fish:29
-#, fuzzy
 msgid "Alternate root directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:30
 #: /tmp/fish/explicit/share/completions/zpool.fish:31
@@ -3253,9 +3217,8 @@ msgid "Default bootable dataset"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:37
-#, fuzzy
 msgid "Pool configuration cache"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/explicit/share/completions/zpool.fish:38
 msgid "Comment about the pool"
@@ -3290,14 +3253,12 @@ msgid "All properties"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:1
-#, fuzzy
 msgid "%s: Could not figure out what to do!\\n"
-msgstr "%s：找不到home目录\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:2
-#, fuzzy
 msgid "%s %s: Requires at least two arguments\\n"
-msgstr "%ls：函数 “%ls” 不存在\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:3
 #: /tmp/fish/explicit/share/functions/abbr.fish:5
@@ -3307,9 +3268,8 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%ls：应有一个参数，提供了 %d 个\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
@@ -3317,20 +3277,17 @@ msgid "%s %s: No abbreviation named %s\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:7
-#, fuzzy
 msgid "%s %s: Requires exactly two arguments\\n"
-msgstr "%ls：函数 “%ls” 不存在\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:11
-#, fuzzy
 msgid "%s %s: Abbreviation %s already exists, cannot rename %s\\n"
-msgstr "%s %s：函数 “%s” 不存在 %s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:12
 #: /tmp/fish/explicit/share/functions/abbr.fish:13
-#, fuzzy
 msgid "%s %s: Unexpected argument -- '%s'\\n"
-msgstr "%s %s：应有一个参数，提供了 %s 个\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 msgid "%s: Name cannot be empty\\n"
@@ -3345,9 +3302,8 @@ msgid "Too many args for cd command"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "cdh: Expected zero or one arguments"
-msgstr "cdh: 应有一个参数，提供了 个\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/cdh.fish:2
 msgid "No previous directories to select. You have to cd at least once."
@@ -3517,9 +3473,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:1
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:2
-#, fuzzy
 msgid "%s: Too many arguments %s\\n"
-msgstr "%s：参数过多%s\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/__fish_move_last.fish:1
 msgid "Hit end of history…\\n"
@@ -3546,9 +3501,8 @@ msgid "Package"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "python executable not found"
-msgstr "有条件地执行一个命令区块"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:2
 msgid "Editing failed or was cancelled"
@@ -3567,19 +3521,16 @@ msgid "Cancelled function editing"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:1
-#, fuzzy
 msgid "%s: Could not create configuration directory\\n"
-msgstr "%s：找不到home目录\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funcsave.fish:2
-#, fuzzy
 msgid "%s: Unknown function '%s'\\n"
-msgstr "%s：未知的输入函数 “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:1
-#, fuzzy
 msgid "%s: Could not find a web browser.\\n"
-msgstr "%ls：找不到home目录\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/help.fish:3
 msgid "help: Help is being displayed in your default browser.\\n"
@@ -3594,9 +3545,8 @@ msgid "%ls: you cannot use any options with the %ls command\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:2
-#, fuzzy
 msgid "%ls: %ls expected %d args, got %d\\n"
-msgstr "%ls：%ls 应有一个参数%d，提供了 %d 个\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/history.fish:3
 msgid "You must specify at least one search term when deleting entries\\n"
@@ -3616,9 +3566,8 @@ msgid "You did not say 'yes' so I will not clear your command history\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/isatty.fish:1
-#, fuzzy
 msgid "%s: Too many arguments"
-msgstr "%ls：参数过多"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/nextd.fish:1
 #: /tmp/fish/explicit/share/functions/prevd.fish:1
@@ -3634,29 +3583,25 @@ msgid "%s: Directory stack is empty…\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/psub.fish:1
-#, fuzzy
 msgid "%s: Not inside of command substitution"
-msgstr "%ls：不在函数体之内"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/realpath.fish:1
 msgid "%s: These flags are not allowed by fish realpath: '%s'"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:1
-#, fuzzy
 msgid "%s: Expected 1, 2 or 3 arguments, got %d\\n"
-msgstr "%ls：应有一个参数，提供了 %d 个\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/seq.fish:2
-#, fuzzy
 msgid "%s: '%s' is not a number\\n"
-msgstr "%ls：“%ls” 不是一个任务\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:3
-#, fuzzy
 msgid "%s: Too many arguments\\n"
-msgstr "%ls：参数过多\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:2
 msgid "%s: Variable name must contain alphanumeric characters\\n"
@@ -3692,14 +3637,12 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/umask.fish:1
 #: /tmp/fish/explicit/share/functions/umask.fish:2
-#, fuzzy
 msgid "%s: Invalid mask '%s'\\n"
-msgstr "%s：变量名 “%s” 非法\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:1
-#, fuzzy
 msgid "%s: Value '%s' for flag '%s' is not an integer\\n"
-msgstr "%s：“%s” 不是%s一个任务\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:2
 msgid "%s: Value '%s' for flag '%s' less than min allowed of '%s'\\n"
@@ -3710,9 +3653,8 @@ msgid "%s: Value '%s' for flag '%s' greater than max allowed of '%s'\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:1
-#, fuzzy
 msgid "%s: Unknown option %s\\n"
-msgstr "%s：未知的输入函数 “%s”\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
 msgid ""
@@ -3879,9 +3821,8 @@ msgid "Output the part of line matching pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:12
-#, fuzzy
 msgid "Print all lines"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:13
 msgid "Specify pattern explicitly"
@@ -4019,9 +3960,8 @@ msgid "Read the list of files to search from STDIN"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:46
-#, fuzzy
 msgid "Ignore directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:47
 msgid "Don't ignore directory"
@@ -4076,9 +4016,8 @@ msgid "Removes all filters associated with type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:58
-#, fuzzy
 msgid "Ignores environment variables and ackrc files"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ack.fish:59
 msgid "Specifies location of ackrc file"
@@ -4400,9 +4339,8 @@ msgid "Port forwarding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:20
-#, fuzzy
 msgid "Return bugreport information"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:21
 msgid "Perform device backup"
@@ -4562,9 +4500,8 @@ msgid "Package(s) to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:60
-#, fuzzy
 msgid "List all forward socket connections"
-msgstr "列出或移除函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:61
 msgid "Fails the forward if local is already forwarded"
@@ -4767,9 +4704,8 @@ msgid "Remove runstate file at first"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:22
-#, fuzzy
 msgid "Set environment variable"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:23
 msgid "The configuration file for init"
@@ -4784,9 +4720,8 @@ msgid "The PID file to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:26
-#, fuzzy
 msgid "Run the task in background"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/alsactl.fish:27
 msgid "Use syslog for messages"
@@ -5274,9 +5209,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mogrify.fish:80
 #: /tmp/fish/implicit/share/completions/montage.fish:68
 #: /tmp/fish/implicit/share/completions/stream.fish:27
-#, fuzzy
 msgid "Print detailed information about the image"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:42
 #: /tmp/fish/implicit/share/completions/display.fish:49
@@ -5421,9 +5355,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/import.fish:53
 #: /tmp/fish/implicit/share/completions/montage.fish:101
 #: /tmp/fish/implicit/share/completions/stream.fish:30
-#, fuzzy
 msgid "Print program options"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/animate.fish:60
 #: /tmp/fish/implicit/share/completions/compare.fish:42
@@ -5787,9 +5720,8 @@ msgid "Runs the package's tests contained within the spec directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:76
-#, fuzzy
 msgid "Path to atom command"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apm.fish:77
 msgid "Delete the symlink in ~/.atom/packages for the package"
@@ -6036,9 +5968,8 @@ msgid "Build source without install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:11
-#, fuzzy
 msgid "Clean source directories"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:12
 msgid "Update source and rebuild"
@@ -6206,9 +6137,8 @@ msgid "Auto-gen package cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:24
-#, fuzzy
 msgid "Print all names"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-cache.fish:25
 msgid "Dep and rdep recursive"
@@ -6273,9 +6203,8 @@ msgid "Access config file from shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-config.fish:3
-#, fuzzy
 msgid "Dump contents of config file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:2
 msgid "Set temp dir"
@@ -6347,9 +6276,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:7
 #: /tmp/fish/implicit/share/completions/git.fish:4
-#, fuzzy
 msgid "Set a configuration option"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt.fish:8
 #: /tmp/fish/implicit/share/completions/hugo.fish:1
@@ -6365,32 +6293,28 @@ msgid "Target release"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
-#, fuzzy
 msgid "Generate package from source"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:3
 msgid "Generate source index file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:4
-#, fuzzy
 msgid "Generate contents file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:5
-#, fuzzy
 msgid "Generate release file"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:6
 msgid "Remove records"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:7
-#, fuzzy
 msgid "Generate MD5 sums"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:8
 msgid "Use a binary db"
@@ -6419,9 +6343,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:16
 #: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:5
 #: /tmp/fish/implicit/share/completions/composer.fish:7
-#, fuzzy
 msgid "Set config options"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:5
 msgid "Update sources"
@@ -6588,9 +6511,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:48
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:14
-#, fuzzy
 msgid "Set a config option"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:1
 msgid "Test if aptitude has yet to be given the subcommand"
@@ -6883,9 +6805,8 @@ msgid "Specify email address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:6
-#, fuzzy
 msgid "Ask confirmation"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:7
 msgid "Display all changelogs"
@@ -7049,9 +6970,8 @@ msgid "Show build dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:3
-#, fuzzy
 msgid "Generate a dotty graph"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:4
 msgid "Show state of dependencies"
@@ -7087,9 +7007,8 @@ msgid "Probe a CD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
-#, fuzzy
 msgid "Run in non-interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
 #: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
@@ -7126,9 +7045,8 @@ msgid "Print only upgradeable packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:5
-#, fuzzy
 msgid "Print all versions"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-show-versions.fish:6
 msgid "Print package name/distro"
@@ -7163,9 +7081,8 @@ msgid "Conf file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:5
-#, fuzzy
 msgid "Finish after number of servers"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:6
 msgid "File to grab servers"
@@ -7273,14 +7190,12 @@ msgid "Specify a dir"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:17
-#, fuzzy
 msgid "Run on current dir"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:18
-#, fuzzy
 msgid "Omit debian version"
-msgstr "触发一个事件️"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-src.fish:19
 msgid "Do not del built files"
@@ -7309,9 +7224,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:4
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:4
-#, fuzzy
 msgid "Select an action"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:5
 #: /tmp/fish/implicit/share/completions/apt-zip-list.fish:5
@@ -7374,9 +7288,8 @@ msgid "Sets the timeout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:10
-#, fuzzy
 msgid "Sets a config"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:11
 msgid "Skip the working copy configuration file"
@@ -7399,9 +7312,8 @@ msgid "Reads an arc configuration option"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:16
-#, fuzzy
 msgid "Show detailed information about options"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:17
 msgid "Download a file to local disk"
@@ -7495,9 +7407,8 @@ msgid "Delete the flag on an object"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:39
-#, fuzzy
 msgid "Set the note on a flag"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:40
 msgid "Export the local changeset to a file"
@@ -7684,9 +7595,8 @@ msgid "Alias for arc feature"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:85
-#, fuzzy
 msgid "Amend the working copy"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:87
 msgid "Show the amended commit message"
@@ -7701,9 +7611,8 @@ msgid "Shows the help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:90
-#, fuzzy
 msgid "Print detailed information about each command"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:91
 msgid "Share and grab text using the Paste application"
@@ -7726,18 +7635,16 @@ msgid "Commit a revision which has been accepted by a reviewer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:96
-#, fuzzy
 msgid "Commit a specific revision"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:97
 msgid "Show the command which would be issued"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:98
-#, fuzzy
 msgid "Apply changes to the working copy"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:99
 msgid "Do not run any sanity checks"
@@ -7902,9 +7809,8 @@ msgid "Always disable coverage information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:142
-#, fuzzy
 msgid "Backouts on a previous commit"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/arc.fish:143
 msgid "Make a raw Conduit method call"
@@ -8119,19 +8025,16 @@ msgid "Take addr from filename, default /etc/ethers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
-#, fuzzy
 msgid "Omit false conditionals"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:2
-#, fuzzy
 msgid "Omit debugging directives"
-msgstr "触发一个事件️"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:3
-#, fuzzy
 msgid "Include general information"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:4
 msgid "Include high-level source"
@@ -8170,14 +8073,12 @@ msgid "Produce assembler debugging messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:13
-#, fuzzy
 msgid "Remap debug information"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:14
-#, fuzzy
 msgid "Redefine symbols"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:15
 msgid "Require executable stack for this object"
@@ -8204,9 +8105,8 @@ msgid "Skip whitespace and comment preprocessing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:21
-#, fuzzy
 msgid "Generate debugging information"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:22
 msgid "Generate STABS debugging information"
@@ -8225,19 +8125,16 @@ msgid "Generate per-function section names for DWARF line information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:26
-#, fuzzy
 msgid "Set the hash table size close"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:27
-#, fuzzy
 msgid "Show help message and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:28
-#, fuzzy
 msgid "Show target specific options"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:29
 msgid "Add DIR to search list for .include directives"
@@ -8260,9 +8157,8 @@ msgid "Assemble in MRI compatibility mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:34
-#, fuzzy
 msgid "Write dependency information in given file"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:35
 msgid "Do not pad the end of sections to alignment boundaries"
@@ -8293,9 +8189,8 @@ msgid "Use same format as native assembler when possible"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:42
-#, fuzzy
 msgid "Print assembler version number and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:43
 #: /tmp/fish/implicit/share/completions/gunzip.fish:8
@@ -8320,9 +8215,8 @@ msgid "Read option from given file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:48
-#, fuzzy
 msgid "Print assembler version number"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:49
 msgid "Don't optimize code alignment"
@@ -8333,28 +8227,24 @@ msgid "Quieten some warnings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:51
-#, fuzzy
 msgid "Generate 32 bits code"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:52
-#, fuzzy
 msgid "Generate 64 bits code"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:53
-#, fuzzy
 msgid "Generate x32 code"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:54
 msgid "Encode SSE instructions with VEX prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:55
-#, fuzzy
 msgid "Check SSE instructions"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:56
 msgid "Check operand combinations for validity"
@@ -8409,9 +8299,8 @@ msgid "Strip all lock prefixes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:70
-#, fuzzy
 msgid "Generate relax relocations"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/as.fish:71
 msgid "Accept only AMD64 ISA"
@@ -8434,9 +8323,8 @@ msgid "Show the full history of the target, with file diffs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:3
-#, fuzzy
 msgid "Put the source files in current directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/asp.fish:4
 msgid "Collect garbage"
@@ -8539,9 +8427,8 @@ msgid "Keep the browser process in the foreground."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:3
-#, fuzzy
 msgid "Print usage message."
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/atom.fish:4
 msgid "Log all output to file."
@@ -8827,9 +8714,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacman.fish:17
 #: /tmp/fish/implicit/share/completions/tmux.fish:12
 #: /tmp/fish/implicit/share/completions/yaourt.fish:23
-#, fuzzy
 msgid "Alternate config file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:25
 #: /tmp/fish/implicit/share/completions/pacaur.fish:27
@@ -9070,9 +8956,8 @@ msgid "Restores a record kept with -B"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:69
-#, fuzzy
 msgid "Backup to directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aura.fish:70
 msgid "Save this many versions"
@@ -9331,9 +9216,8 @@ msgid "Wrap encoded line after given number of caracters (default 76)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:1
-#, fuzzy
 msgid "Force interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bc.fish:2
 msgid "Define math library"
@@ -9645,9 +9529,8 @@ msgid "Open brew/formula's homepage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:43
-#, fuzzy
 msgid "Display information about formula"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/brew.fish:44
 msgid "Display info for all formulae"
@@ -10325,9 +10208,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gunzip.fish:5
 #: /tmp/fish/implicit/share/completions/gzip.fish:5
 #: /tmp/fish/implicit/share/completions/zcat.fish:3
-#, fuzzy
 msgid "Print license"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
 msgid "Suppress message payload display"
@@ -10390,9 +10272,8 @@ msgid "List all help topics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:3
-#, fuzzy
 msgid "List all commands"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bzr.fish:4
 msgid "Help about supported formats"
@@ -10867,9 +10748,8 @@ msgid "Add feed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:11
-#, fuzzy
 msgid "Set configuration directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:12
 #: /tmp/fish/implicit/share/completions/pine.fish:10
@@ -10885,16 +10765,14 @@ msgid "Set feed directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/canto.fish:15
-#, fuzzy
 msgid "Set script directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:1
 #: /tmp/fish/implicit/share/completions/light.fish:2
 #: /tmp/fish/implicit/share/completions/rustc.fish:1
-#, fuzzy
 msgid "Print version info and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cargo.fish:2
 msgid "List installed commands"
@@ -11192,9 +11070,8 @@ msgid "Allows the user to manually select a driver for the device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-#, fuzzy
 msgid "Set driver specific options"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:38
 msgid ""
@@ -11465,18 +11342,16 @@ msgid "Username"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
-#, fuzzy
 msgid "Specify your login shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:2
 msgid "Display help and exit\t"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:4
-#, fuzzy
 msgid "List available shells and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:2
 msgid "Update your climate install"
@@ -11532,9 +11407,8 @@ msgid "Find the biggest files recursively"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:17
-#, fuzzy
 msgid "Find the biggest directories"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:18
 msgid "Find directory size"
@@ -11553,9 +11427,8 @@ msgid "Report duplicate files in a directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:22
-#, fuzzy
 msgid "Count the number of occurences"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:23
 msgid "Monitor file for changes"
@@ -11594,9 +11467,8 @@ msgid "List open ports"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:32
-#, fuzzy
 msgid "Edit the hosts file"
-msgstr "退出这个 shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:33
 msgid "http-server serving the current directory"
@@ -11671,9 +11543,8 @@ msgid "Find the trash size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/climate.fish:51
-#, fuzzy
 msgid "Empty the trash"
-msgstr "退出这个 shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/combine.fish:1
 msgid "Combine sets of lines from two files using boolean operations"
@@ -11708,9 +11579,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/setsid.fish:1
 #: /tmp/fish/implicit/share/completions/ssh.fish:1
 #: /tmp/fish/implicit/share/completions/sudo.fish:20
-#, fuzzy
 msgid "Command to run"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:2
 msgid "Add text to the end of the selected area"
@@ -11737,9 +11607,8 @@ msgid "Select token under cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:8
-#, fuzzy
 msgid "Select entire command line (default)"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/commandline.fish:9
 msgid "Only return that part of the command line before the cursor"
@@ -11905,9 +11774,8 @@ msgid "Old style long option to complete"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:6
-#, fuzzy
 msgid "Do not use file completion"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/complete.fish:7
 msgid "Require parameter"
@@ -11952,9 +11820,8 @@ msgid "User script"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:2
-#, fuzzy
 msgid "Short information about Composer"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/composer.fish:3
 msgid "Create an archive of this composer package"
@@ -12313,9 +12180,8 @@ msgid "Do not create output files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:7
-#, fuzzy
 msgid "Set source directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/configure.fish:8
 msgid "Architecture-independent install directory"
@@ -12930,9 +12796,8 @@ msgid "Kerberos server mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:33
-#, fuzzy
 msgid "Print out history information for files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:34
 msgid "Prompt for password for authenticating server"
@@ -12983,18 +12848,16 @@ msgid "Server mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:46
-#, fuzzy
 msgid "Display status information on checked out files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:47
 msgid "Add a symbolic tag to checked out version of files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
-#, fuzzy
 msgid "Undo an edit command"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:49
 msgid "Bring work tree in sync with repository"
@@ -13041,9 +12904,8 @@ msgid "[users]  Remove (comma-separated) user names from access list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:60
-#, fuzzy
 msgid "Run interactively."
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
 msgid "Set keyword substitution mode:"
@@ -13469,9 +13331,8 @@ msgid "Last modified (committed or modified report)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:165
-#, fuzzy
 msgid "Working directory must match"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
 msgid "Since date (Many formats)"
@@ -13663,9 +13524,8 @@ msgid "Revision - symbolic or numeric."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:221
-#, fuzzy
 msgid "Delete the given directory."
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:222
 msgid "Delete the file before removing it."
@@ -13766,9 +13626,8 @@ msgid "Download missing sources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:7
-#, fuzzy
 msgid "Prepare source directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:8
 msgid "Build software"
@@ -13831,9 +13690,8 @@ msgid "Send announcement email"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:23
-#, fuzzy
 msgid "Delete working directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cygport.fish:24
 msgid "Same as prep build inst pkg"
@@ -14209,9 +14067,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:978
 #: /tmp/fish/implicit/share/completions/darcs.fish:996
 #: /tmp/fish/implicit/share/completions/darcs.fish:1016
-#, fuzzy
 msgid "Suppress informational output"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:429
 #: /tmp/fish/implicit/share/completions/darcs.fish:473
@@ -14473,9 +14330,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:707
 #: /tmp/fish/implicit/share/completions/darcs.fish:760
 #: /tmp/fish/implicit/share/completions/darcs.fish:803
-#, fuzzy
 msgid "Generate XML formatted output"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:455
 #: /tmp/fish/implicit/share/completions/darcs.fish:493
@@ -15167,14 +15023,12 @@ msgid "Use last acquired lease if cannot obtain one even if expired"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:7
-#, fuzzy
 msgid "Push given value the environment"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:8
-#, fuzzy
 msgid "Reapply configuration for each interface"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:9
 msgid "Request DHCP server to update DNS using FQDN instead of hostname"
@@ -15225,9 +15079,8 @@ msgid "Renew existing addresses on specified interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:21
-#, fuzzy
 msgid "Request DHCP option"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dhcpcd.fish:22
 msgid "Keep configuration even when dhcpcd exits"
@@ -15430,17 +15283,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/lsof.fish:1
 #: /tmp/fish/implicit/share/completions/lua.fish:5
 #: /tmp/fish/implicit/share/completions/wicd-cli.fish:1
-#, fuzzy
 msgid "Print help and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:14
 #: /tmp/fish/implicit/share/completions/feh.fish:55
 #: /tmp/fish/implicit/share/completions/fuser.fish:12
 #: /tmp/fish/implicit/share/completions/tree.fish:43
-#, fuzzy
 msgid "Print version and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dig.fish:15
 msgid "TCP mode"
@@ -15941,9 +15792,8 @@ msgid "Build package from directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:9
-#, fuzzy
 msgid "List contents of .deb"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:10
 msgid "Show .deb information"
@@ -15954,9 +15804,8 @@ msgid "List packages matching pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:12
-#, fuzzy
 msgid "List contents of packages"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dpkg.fish:13
 msgid "Print status of package"
@@ -15991,9 +15840,8 @@ msgid "Prevent reloading templates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:1
-#, fuzzy
 msgid "Get current status of the dropboxd"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dropbox.fish:2
 msgid "Provide help"
@@ -16102,9 +15950,8 @@ msgid "Use 1kB block size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:10
-#, fuzzy
 msgid "Count hard links multiple times"
-msgstr "多次执行一条命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:11
 msgid "Dereference all symlinks"
@@ -16468,9 +16315,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:1
 #: /tmp/fish/implicit/share/completions/iex.fish:1
-#, fuzzy
 msgid "Prints version and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/elixir.fish:2
 #: /tmp/fish/implicit/share/completions/iex.fish:2
@@ -16546,9 +16392,8 @@ msgid "do not do interactive display; implies -q"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:2
-#, fuzzy
 msgid "change to directory DIR"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:3
 msgid "start a server in the background"
@@ -16642,9 +16487,8 @@ msgid "override color mode for character terminals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:28
-#, fuzzy
 msgid "window background color"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:29
 msgid "disable many display features; used for debugging Emacs"
@@ -16667,9 +16511,8 @@ msgid "default font; must be fixed-width"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:34
-#, fuzzy
 msgid "window foreground color"
-msgstr "将任务带回到前台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emacs.fish:35
 msgid "make the first frame high as the screen"
@@ -16946,9 +16789,8 @@ msgid "Unmount when idle for specified MINUTES"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:2
-#, fuzzy
 msgid "Run in the foreground"
-msgstr "将任务带回到前台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:3
 msgid "Verbose messages when run foreground"
@@ -16963,9 +16805,8 @@ msgid "Enables debugging within the FUSE library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:6
-#, fuzzy
 msgid "Return data even from corrupted files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/encfs.fish:7
 msgid "Make files public to all other users"
@@ -17018,16 +16859,14 @@ msgid "Output version information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:1
-#, fuzzy
 msgid "Redefine variable"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:2
 #: /tmp/fish/implicit/share/completions/nice.fish:1
 #: /tmp/fish/implicit/share/completions/time.fish:1
-#, fuzzy
 msgid "Command"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/env.fish:3
 msgid "Start with an empty environment"
@@ -17187,18 +17026,16 @@ msgid "show help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:5
-#, fuzzy
 msgid "print the version"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:6
 msgid "Writes config values to a JSON file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:7
-#, fuzzy
 msgid "Outputs useful debug information."
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:8
 msgid "Downloads a solution given the ID of the latest iteration."
@@ -17237,9 +17074,8 @@ msgid "Submits a new iteration to a problem on exercism.io."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:16
-#, fuzzy
 msgid "Lists the available language tracks."
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/exercism.fish:17
 msgid "REMOVED"
@@ -17306,14 +17142,12 @@ msgid "dump diffs between jail initialisation and freeze time into a flavour"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:12
-#, fuzzy
 msgid "create the basejail from binary packages"
-msgstr "创建代码区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:13
-#, fuzzy
 msgid "list all jails"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:14
 msgid "restart a running jail"
@@ -17340,9 +17174,8 @@ msgid "check for reasons for the jails to fail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ezjail-admin.fish:24
-#, fuzzy
 msgid "create or update the basejail from source"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:1
 #: /tmp/fish/implicit/share/completions/pkgfile.fish:2
@@ -17350,9 +17183,8 @@ msgid "show this help message and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:2
-#, fuzzy
 msgid "print detailed info about command NAME"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:3
 msgid "formats --list, choices: short, normal, nested"
@@ -17367,9 +17199,8 @@ msgid "Force sudo password prompt up-front"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:6
-#, fuzzy
 msgid "print list of possible commands and exit"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:7
 msgid "comma separated KEY=VALUE pairs to set Fab env vars"
@@ -17397,14 +17228,12 @@ msgid "abort instead of prompting (for password, host, etc)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:13
-#, fuzzy
 msgid "specify location of config file to use"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:14
-#, fuzzy
 msgid "Color error output"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:15
 msgid "do not load user known_hosts file"
@@ -17511,9 +17340,8 @@ msgid "skip over unknown tasks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:41
-#, fuzzy
 msgid "Path to SSH config file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fab.fish:42
 msgid "set connection timeout to N seconds"
@@ -17684,9 +17512,8 @@ msgid "Disable Xinerama support"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:37
-#, fuzzy
 msgid "Save files to given directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:38
 msgid "Preload images"
@@ -17807,9 +17634,8 @@ msgid "Set font to print title on index"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:69
-#, fuzzy
 msgid "Center file on background"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/feh.fish:70
 msgid "Fit file into background by zooming until image fits"
@@ -17838,9 +17664,8 @@ msgid "Select font"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:2
-#, fuzzy
 msgid "Change font directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:3
 msgid "Center output horizontally"
@@ -17859,9 +17684,8 @@ msgid "Set justification according to text direction"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:7
-#, fuzzy
 msgid "Set output to terminal width"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:8
 msgid "Set output width"
@@ -17912,9 +17736,8 @@ msgid "Print right-to-left"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/figlet.fish:25
-#, fuzzy
 msgid "Print with default text direction"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/file.fish:1
 msgid "Do not prepend filenames to output lines"
@@ -18078,9 +17901,8 @@ msgid "File is executable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
-msgstr "总是"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
 msgid "File is on filesystem of specified type"
@@ -18167,9 +17989,8 @@ msgid "File uses specified units of space"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
-msgstr "总是"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
 msgid "File is of specified type"
@@ -18204,9 +18025,8 @@ msgid "Delete selected files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
@@ -18247,27 +18067,24 @@ msgid "Print null separated full file names"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
-#, fuzzy
 msgid "Print formated data"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:66
 msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
-msgstr "退出这个 shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
 msgid "List file in ls -dils format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
-#, fuzzy
 msgid "Negate result of action"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -18286,9 +18103,8 @@ msgid "Only parse input, do not execute"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:5
-#, fuzzy
 msgid "Run in interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fish.fish:6
 msgid "Run in login mode"
@@ -18696,9 +18512,8 @@ msgid "Initialize a directory for building"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:20
-#, fuzzy
 msgid "Run a build command inside the build dir"
-msgstr "执行内部命令而不是一个函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/flatpak.fish:21
 msgid "Finish a build dir for export"
@@ -18884,9 +18699,8 @@ msgid "Show all versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:47
-#, fuzzy
 msgid "Undo latest bad/good command."
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:48
 #: /tmp/fish/implicit/share/completions/git.fish:88
@@ -18902,9 +18716,8 @@ msgid "Make branch local"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:51
-#, fuzzy
 msgid "Set background color"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:52
 #: /tmp/fish/implicit/share/completions/fossil.fish:106
@@ -18942,9 +18755,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/fossil.fish:177
 #: /tmp/fish/implicit/share/completions/fossil.fish:180
 #: /tmp/fish/implicit/share/completions/fossil.fish:267
-#, fuzzy
 msgid "Run command on repository"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:61
 msgid "Print a file"
@@ -19449,9 +19261,8 @@ msgid "Allow binary files to be diffed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:217
-#, fuzzy
 msgid "External diff command"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:218
 msgid "Disallow pushing to the repository"
@@ -19514,9 +19325,8 @@ msgid "Use modification times"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:233
-#, fuzzy
 msgid "PGP command"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:234
 msgid "HTTP proxy URL"
@@ -19589,9 +19399,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:252
 #: /tmp/fish/implicit/share/completions/fossil.fish:253
-#, fuzzy
 msgid "Show information about files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:254
 msgid "Show stash contents"
@@ -19671,9 +19480,8 @@ msgid "Find tag type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:279
-#, fuzzy
 msgid "Limit number of tags"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:281
 #: /tmp/fish/implicit/share/completions/git.fish:293
@@ -19753,9 +19561,8 @@ msgid "Print debug information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:304
-#, fuzzy
 msgid "Print information about all files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:305
 msgid "Print fossil version"
@@ -19786,24 +19593,21 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
-#, fuzzy
 msgid "Save function"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:2
 msgid "Open function in external editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/funced.fish:3
-#, fuzzy
 msgid "Edit in interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:1
 #: /tmp/fish/implicit/share/completions/functions.fish:5
-#, fuzzy
 msgid "Set function description"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:2
 #: /tmp/fish/implicit/share/completions/functions.fish:2
@@ -19837,9 +19641,8 @@ msgid "Make the function a generic event handler"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:9
-#, fuzzy
 msgid "Specify named arguments"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/function.fish:10
 msgid "Do not shadow variable scope of calling function"
@@ -19850,9 +19653,8 @@ msgid "Inherit completions from the given command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:1
-#, fuzzy
 msgid "Erase function"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:3
 msgid "Show hidden functions"
@@ -19871,14 +19673,12 @@ msgid "Copy the specified function to the specified new name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:9
-#, fuzzy
 msgid "Display information about the function"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:10
-#, fuzzy
 msgid "Print more output"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/fuser.fish:1
 msgid "Show all files specified on the command line"
@@ -19949,9 +19749,8 @@ msgid "Lazy unmount"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
-#, fuzzy
 msgid "Standard mode"
-msgstr "标准输入"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:2
 msgid "Place output in file"
@@ -23249,14 +23048,12 @@ msgid "Generate the predefine, \"_SIO\", for server IO"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:764
-#, fuzzy
 msgid "Use GNU ld specific options"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:765
-#, fuzzy
 msgid "Use HP ld specific options"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:766
 msgid "Generate code that uses long call sequences"
@@ -25459,18 +25256,16 @@ msgid "Use file file as a core dump to examine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:7
-#, fuzzy
 msgid "Execute GDB commands from file file"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:8
 msgid "Add directory to the path to search for source files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:9
-#, fuzzy
 msgid "Do not execute commands from any .gdbinit files"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gdb.fish:11
 #: /tmp/fish/implicit/share/completions/root.fish:1
@@ -25506,14 +25301,12 @@ msgid "Run GDB using a text (console) user interface"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:1
-#, fuzzy
 msgid "Print usage informations and quit"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:2
-#, fuzzy
 msgid "Print the version and quit"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
 msgid "Use URL as the remote source for gems"
@@ -25528,9 +25321,8 @@ msgid "Use no HTTP proxy for remote operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:6
-#, fuzzy
 msgid "Get help on this command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:7
 msgid "Set the verbose level of output"
@@ -26114,9 +25906,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:72
 #: /tmp/fish/implicit/share/completions/git.fish:259
-#, fuzzy
 msgid "Interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:73
 msgid "Interactively choose hunks to stage"
@@ -26765,9 +26556,8 @@ msgid "Reset current HEAD to the specified state"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:266
-#, fuzzy
 msgid "Reset files in working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:270
 msgid "Reflog"
@@ -26903,9 +26693,8 @@ msgid "Create a new branch from a stash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:307
-#, fuzzy
 msgid "Set and read git configuration variables"
-msgstr "将输入的一行读入到变量中"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:308
 msgid "Generate patch series to send upstream"
@@ -27035,9 +26824,8 @@ msgid "Show commit summary"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:342
-#, fuzzy
 msgid "Run command on each submodule"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:343
 msgid "Sync submodules' URL with .gitmodules"
@@ -27223,9 +27011,8 @@ msgid "Ignore whitespace changes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/git.fish:389
-#, fuzzy
 msgid "Custom command"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/godoc.fish:1
 msgid "Comma-separated list of analyses to perform"
@@ -27344,14 +27131,12 @@ msgid "print packages being built"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:7
-#, fuzzy
 msgid "print and preserve work directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:8
-#, fuzzy
 msgid "print the commands"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/go.fish:9
 msgid "c compiler flags"
@@ -27721,9 +27506,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
-#, fuzzy
 msgid "Generate a new key pair"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:23
 msgid "Present a menu which enables you to do all key related tasks"
@@ -28023,9 +27807,8 @@ msgid "Use specified file instead of the default trustdb"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:96
-#, fuzzy
 msgid "Set the home directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:97
 msgid "Set the native character set"
@@ -28625,9 +28408,8 @@ msgid "List files in folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:45
-#, fuzzy
 msgid "Create a directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:46
 msgid "Remove a directory"
@@ -28718,9 +28500,8 @@ msgid "Overwrite files without asking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:1
-#, fuzzy
 msgid "Print annotated source"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gprof.fish:2
 msgid "Do not print explanations"
@@ -29055,9 +28836,8 @@ msgid "Pattern is basic regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:19
-#, fuzzy
 msgid "Print filename"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
 msgid "Suppress printing filename"
@@ -29305,18 +29085,16 @@ msgid "Check if given file is BIOS bootsector"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-file.fish:32
-#, fuzzy
 msgid "Display usage and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:1
 msgid "Compress GRUB files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:2
-#, fuzzy
 msgid "Use image and modules under given directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:3
 msgid "Install given fonts"
@@ -29331,9 +29109,8 @@ msgid "Embed given file as public key for signature checking"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:6
-#, fuzzy
 msgid "Use translations under given directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:7
 msgid "Install only given locales"
@@ -29408,9 +29185,8 @@ msgid "Don't apply any reed-solomon codes when embedding core.img"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:26
-#, fuzzy
 msgid "Set product version"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grub-install.fish:27
 msgid "Delete device map if it already exists"
@@ -29433,9 +29209,8 @@ msgid "Print the grunt version. Combine with --verbose for more info"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:1
-#, fuzzy
 msgid "Print the version information"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gsettings.fish:2
 msgid "Specify a custom schemas directory"
@@ -29864,9 +29639,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:44
 #: /tmp/fish/implicit/share/completions/helm.fish:84
-#, fuzzy
 msgid "Set values on the command line"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/helm.fish:45
 #: /tmp/fish/implicit/share/completions/helm.fish:85
@@ -30003,9 +29777,8 @@ msgid "Autosuggestions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:2
-#, fuzzy
 msgid "Builtin commands"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:3
 msgid "Cartesian Products"
@@ -30032,28 +29805,24 @@ msgid "Writing your own completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:9
-#, fuzzy
 msgid "Where to put completions"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:10
 msgid "Debugging fish scripts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:12
-#, fuzzy
 msgid "Command line editor"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:13
-#, fuzzy
 msgid "Emacs mode commands"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:14
-#, fuzzy
 msgid "Escaping characters"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:15
 msgid "Event handlers"
@@ -30069,9 +29838,8 @@ msgid "Brace expansion {a,b,c}"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:18
-#, fuzzy
 msgid "Command substitution"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:19
 msgid "Command substitution (SUBCOMMAND)"
@@ -30106,9 +29874,8 @@ msgid "Searchable history"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:29
-#, fuzzy
 msgid "Shell variable and function names"
-msgstr "函数名 非法"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:30
 msgid "Initialization files"
@@ -30159,57 +29926,49 @@ msgid "Input/Output (IO) redirection"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:42
-#, fuzzy
 msgid "Shared bindings"
-msgstr "处理 fish 键 绑定"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
 msgid "Introduction to the fish syntax"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:44
-#, fuzzy
 msgid "Background jobs"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:45
-#, fuzzy
 msgid "Conditional execution of code and flow control"
-msgstr "有条件地执行一个命令区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:46
 #: /tmp/fish/implicit/share/completions/help.fish:74
-#, fuzzy
 msgid "Functions"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:47
-#, fuzzy
 msgid "Autoloading functions"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:48
 msgid "Defining aliases"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:49
-#, fuzzy
 msgid "Job control"
-msgstr "任务控制"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:50
-#, fuzzy
 msgid "Some common words"
-msgstr "状态\t命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:51
 msgid "Programmable title"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:52
-#, fuzzy
 msgid "Shell variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:53
 msgid "Arrays"
@@ -30220,53 +29979,44 @@ msgid "Variables for changing highlighting colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:55
-#, fuzzy
 msgid "Exporting variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:56
-#, fuzzy
 msgid "Variable scope for functions"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:57
-#, fuzzy
 msgid "Locale variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:58
 msgid "Variable scope"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:59
-#, fuzzy
 msgid "Special variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:60
-#, fuzzy
 msgid "The status variable"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:61
-#, fuzzy
 msgid "More on universal variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:62
-#, fuzzy
 msgid "Vi mode commands"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:63
-#, fuzzy
 msgid "Command mode"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:64
-#, fuzzy
 msgid "Insert mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:65
 msgid "Visual mode"
@@ -30285,18 +30035,16 @@ msgid "Combiners (And, Or, Not)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:70
-#, fuzzy
 msgid "Command Substitutions"
-msgstr "命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:71
 msgid "Conditionals (If, Else, Switch)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:72
-#, fuzzy
 msgid "Exit Status"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:73
 msgid "Exports (Shell Variables)"
@@ -30323,18 +30071,16 @@ msgid "Ready for more?"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:81
-#, fuzzy
 msgid "Pipes and Redirections"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:82
 msgid "Prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:83
-#, fuzzy
 msgid "Running Commands"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:84
 msgid "Separating Commands (Semicolon)"
@@ -30353,14 +30099,12 @@ msgid "Tab Completions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:88
-#, fuzzy
 msgid "Universal Variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:89
-#, fuzzy
 msgid "Variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:90
 msgid "Why fish?"
@@ -30646,9 +30390,8 @@ msgid "downloads database backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:73
-#, fuzzy
 msgid "get information about a specific backup"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/heroku.fish:74
 msgid "restore a backup (default latest) to a database"
@@ -30737,9 +30480,8 @@ msgid "repository root directory or name of overlay bundle file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:2
-#, fuzzy
 msgid "change working directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:3
 msgid "do not prompt, automatically pick the first choice for all prompts"
@@ -30778,9 +30520,8 @@ msgid "always print a traceback on exception"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:12
-#, fuzzy
 msgid "time how long the command takes"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:13
 msgid "print command execution profile"
@@ -31241,9 +30982,8 @@ msgid "mark a branch as closed, hiding it from the branch list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:108
-#, fuzzy
 msgid "amend the parent of the working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:109
 #: /tmp/fish/implicit/share/completions/hg.fish:423
@@ -31468,14 +31208,12 @@ msgid "directory strip option for patch"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:205
-#, fuzzy
 msgid "don't commit, just update the working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:206
-#, fuzzy
 msgid "apply patch without touching the working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:207
 msgid "apply patch to the nodes from which it was generated"
@@ -31570,9 +31308,8 @@ msgid "include revisions where files were removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:250
-#, fuzzy
 msgid "revisions committed by user"
-msgstr "用户执行的历史命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:251
 msgid "show changesets within the given named branch"
@@ -31675,9 +31412,8 @@ msgid "print first line of patch header"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:321
-#, fuzzy
 msgid "do not update the new working directories"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:323
 msgid "location of source patch repository"
@@ -31878,9 +31614,8 @@ msgid "print patches not in series"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:422
-#, fuzzy
 msgid "amend the parent of the working dir"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:436
 msgid "record delete for missing files"
@@ -31933,9 +31668,8 @@ msgid "name of access log file to write to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:466
-#, fuzzy
 msgid "run server in background"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:467
 msgid "used internally by daemon mode"
@@ -31971,9 +31705,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:475
 #: /tmp/fish/implicit/share/completions/hg.fish:476
-#, fuzzy
 msgid "for remote clients"
-msgstr "列出或移除函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:477
 msgid "web templates to use"
@@ -32193,9 +31926,8 @@ msgid "Include content with publishdate in the future"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:12
-#, fuzzy
 msgid "Cache directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:13
 msgid "Canonicalize all relative URLs using baseurl"
@@ -32206,14 +31938,12 @@ msgid "Remove files from destination not found in static directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:15
-#, fuzzy
 msgid "Content directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:16
-#, fuzzy
 msgid "Destination directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:17
 msgid "Do not build 404 page"
@@ -32248,14 +31978,12 @@ msgid "Print missing translations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:25
-#, fuzzy
 msgid "Ignore the cache directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:26
-#, fuzzy
 msgid "Layout directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:27
 msgid "Do not sync permission mode of files"
@@ -32282,9 +32010,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/hugo.fish:58
 #: /tmp/fish/implicit/share/completions/hugo.fish:92
 #: /tmp/fish/implicit/share/completions/hugo.fish:103
-#, fuzzy
 msgid "Source directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:33
 #: /tmp/fish/implicit/share/completions/hugo.fish:46
@@ -32293,9 +32020,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:34
 #: /tmp/fish/implicit/share/completions/hugo.fish:47
-#, fuzzy
 msgid "Display metrics about template executions"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:35
 #: /tmp/fish/implicit/share/completions/hugo.fish:48
@@ -32307,9 +32033,8 @@ msgid "Theme to use"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:37
-#, fuzzy
 msgid "Themes directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:38
 msgid "Use /filename.html instead of /filename/"
@@ -32356,14 +32081,12 @@ msgid "Help for ulimit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:53
-#, fuzzy
 msgid "Print the site configuration"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:54
-#, fuzzy
 msgid "Help for config"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:55
 msgid "Convert the content to different formats"
@@ -32402,9 +32125,8 @@ msgid "Help for toYAML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:66
-#, fuzzy
 msgid "Print Hugo version and environment info"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:67
 msgid "Help for env"
@@ -32459,23 +32181,20 @@ msgid "Generate Markdown documentation for the Hugo CLI"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:80
-#, fuzzy
 msgid "Doc directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:81
 msgid "Help for doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:82
-#, fuzzy
 msgid "Generate man pages for the Hugo CLI"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:83
-#, fuzzy
 msgid "Man pages directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:84
 msgid "Help for man"
@@ -32494,9 +32213,8 @@ msgid "Import from Jekyll"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:88
-#, fuzzy
 msgid "Allow import into non-empty target directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:89
 msgid "Help for jekyll"
@@ -32511,18 +32229,16 @@ msgid "Help for list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:93
-#, fuzzy
 msgid "List all drafts"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:94
 msgid "Help for drafts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:95
-#, fuzzy
 msgid "List all expired posts"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:96
 msgid "Help for expired"
@@ -32537,9 +32253,8 @@ msgid "Help for future"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:99
-#, fuzzy
 msgid "Create new content"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:100
 msgid "Editor to use"
@@ -32554,14 +32269,12 @@ msgid "Content type to create"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:104
-#, fuzzy
 msgid "Create a new site"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:105
-#, fuzzy
 msgid "Create site inside non-empty directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:106
 msgid "Config and front matter format"
@@ -32572,9 +32285,8 @@ msgid "Help for site"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:108
-#, fuzzy
 msgid "Create a new theme"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:109
 msgid "Help for theme"
@@ -32629,9 +32341,8 @@ msgid "Port on which the server will listen"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:122
-#, fuzzy
 msgid "Render to destination directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:123
 msgid "Reset the content draft status"
@@ -32642,14 +32353,12 @@ msgid "Help for undraft"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:125
-#, fuzzy
 msgid "Print the version number of Hugo"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hugo.fish:126
-#, fuzzy
 msgid "Help for version"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/i3-msg.fish:1
 msgid "Only send ipc message and suppress output"
@@ -32774,32 +32483,28 @@ msgid "Print out the address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:5
-#, fuzzy
 msgid "Print netmask"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:6
-#, fuzzy
 msgid "Print network address"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:7
 msgid "Print broadcast"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:8
-#, fuzzy
 msgid "Print mtu"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:9
 msgid "Print out the hardware address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:10
-#, fuzzy
 msgid "Print flags"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:11
 msgid "Print all statistics on input"
@@ -32818,9 +32523,8 @@ msgid "Print # of in errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:15
-#, fuzzy
 msgid "Print # of in drops"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:16
 msgid "Print # of in fifo overruns"
@@ -33029,9 +32733,8 @@ msgid "Use specified network namespace"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ip.fish:17
-#, fuzzy
 msgid "Execute command for all objects"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:1
 msgid "Create a set identified with SETNAME"
@@ -33051,18 +32754,16 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:5
 #: /tmp/fish/implicit/share/completions/ipset.fish:6
-#, fuzzy
 msgid "Destroy the specified set or all sets"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:7
 msgid "a"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:9
-#, fuzzy
 msgid "Output format to the list command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ipset.fish:10
 msgid "Suppress any output"
@@ -33154,9 +32855,8 @@ msgid "Source specification"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:19
-#, fuzzy
 msgid "Destination specification"
-msgstr "非法的选项组合"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iptables.fish:21
 msgid "Interface via which a packet was received"
@@ -33253,9 +32953,8 @@ msgid "Alias for --color"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:15
-#, fuzzy
 msgid "The path to a jest config file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:16
 msgid ""
@@ -33286,9 +32985,8 @@ msgid "Print debugging info about your jest config"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:22
-#, fuzzy
 msgid "The test environment used for all tests"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:23
 msgid "Use this flag to show full diffs instead of a patch"
@@ -33331,9 +33029,8 @@ msgid "Maps code coverage reports against original source code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:33
-#, fuzzy
 msgid "Specifies the maximum number of workers"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:34
 msgid "Directory names to be searched recursively up from the requiring module"
@@ -33366,9 +33063,8 @@ msgid "Activates notifications for test results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:41
-#, fuzzy
 msgid "Run tests based on the changed files"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:42
 msgid "A file where to write test results"
@@ -33407,9 +33103,8 @@ msgid "Paths to directories that Jest should use to search for files in"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:51
-#, fuzzy
 msgid "Run all tests serially in the current process"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:52
 msgid "The paths to modules to configure the testing environment"
@@ -33420,9 +33115,8 @@ msgid "The path to a module to configure the testing framework"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:54
-#, fuzzy
 msgid "Print your jest config and then exits"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:55
 msgid "Prevent tests from printing messages through the console"
@@ -33502,9 +33196,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/jest.fish:73
 #: /tmp/fish/implicit/share/completions/snap.fish:15
 #: /tmp/fish/implicit/share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Print the version and exit"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jest.fish:74
 msgid "Watch files for changes and rerun tests related to changed files"
@@ -33527,14 +33220,12 @@ msgid "Enable debugger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:2
-#, fuzzy
 msgid "Output usage information"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:3
-#, fuzzy
 msgid "Output version number"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:4
 msgid "Create a new JHipster application"
@@ -33581,9 +33272,8 @@ msgid "Create entities from the JDL file passed in argument"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:14
-#, fuzzy
 msgid "Display information about your current project and system"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:15
 msgid "Deploy the current application to Kubernetes"
@@ -33608,18 +33298,16 @@ msgid "Create a new JHipster server-side application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:20
-#, fuzzy
 msgid "Create a new Spring service bean"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:21
 msgid "Upgrade the JHipster version and the generated application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jhipster.fish:22
-#, fuzzy
 msgid "Print command completion script"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jobs.fish:2
 msgid "Show the process id of each process in the job"
@@ -33646,9 +33334,8 @@ msgid "OR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:4
-#, fuzzy
 msgid "Prints a short help text and exits"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:5
 msgid "Prints a short version string and exits"
@@ -33663,9 +33350,8 @@ msgid "Show live tail of entries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:9
-#, fuzzy
 msgid "Controls the number of journal lines"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:10
 msgid "Show all lines, even in follow mode"
@@ -33712,9 +33398,8 @@ msgid "Print all possible data values"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:21
-#, fuzzy
 msgid "Specify journal directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/journalctl.fish:22
 msgid "Generate a new 128 bit ID"
@@ -33813,9 +33498,8 @@ msgid "Prepend given directory to search modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:19
-#, fuzzy
 msgid "Set exit status"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:20
 msgid "Set variable"
@@ -33826,14 +33510,12 @@ msgid "Set JSON-encoded variable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:22
-#, fuzzy
 msgid "Read JSON in file and bind to given variable"
-msgstr "将输入的一行读入到变量中"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:23
-#, fuzzy
 msgid "Read JSON in file and bind to given variable [see man]"
-msgstr "将输入的一行读入到变量中"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/jq.fish:24
 msgid "Run tests in given file"
@@ -33880,9 +33562,8 @@ msgid "Show help information and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:1
-#, fuzzy
 msgid "List all devices"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:2
 msgid "List available (paired and reachable) devices"
@@ -33923,65 +33604,56 @@ msgid "Share a file to a said device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:11
-#, fuzzy
 msgid "Display the notifications on a said device"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:12
 msgid "Lock the specified device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:13
-#, fuzzy
 msgid "Sends an SMS. Requires destination"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:14
 msgid "Phone number to send the message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:15
-#, fuzzy
 msgid "Device ID"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:16
-#, fuzzy
 msgid "Device Name"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:17
-#, fuzzy
 msgid "Get encryption info about said device"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:18
 msgid "Lists remote commands and their ids"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:19
-#, fuzzy
 msgid "Executes a remote command by id"
-msgstr "有条件地执行一个命令区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:20
 msgid "Displays this help."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:21
-#, fuzzy
 msgid "Displays version information."
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:22
-#, fuzzy
 msgid "Show author information."
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:23
-#, fuzzy
 msgid "Show license information."
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kdeconnect-cli.fish:24
 msgid "The base file name of the desktop entry for this application."
@@ -34063,9 +33735,8 @@ msgid "Describe available commands or one specific command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:4
-#, fuzzy
 msgid "Lists one or more instances"
-msgstr "列出或移除函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:5
 msgid "List the name of each instance only, one per line"
@@ -34521,9 +34192,8 @@ msgid "Display status column"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
-#, fuzzy
 msgid "Specify key bindings file"
-msgstr "处理 fish 键 绑定"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/less.fish:21
 msgid "Prompt with percentage"
@@ -34640,9 +34310,8 @@ msgid "Characters to scroll on left/right arrows"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:3
-#, fuzzy
 msgid "Get value (default)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:4
 msgid "Set value"
@@ -34669,9 +34338,8 @@ msgid "Save brightness"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:10
-#, fuzzy
 msgid "Brightness (default)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/light.fish:11
 msgid "Maximum brightness"
@@ -34770,9 +34438,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/localectl.fish:4
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:37
 #: /tmp/fish/implicit/share/completions/timedatectl.fish:7
-#, fuzzy
 msgid "Print a short help text and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/localectl.fish:5
 #: /tmp/fish/implicit/share/completions/systemd-nspawn.fish:38
@@ -34814,9 +34481,8 @@ msgid "Ignore case distinctions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:10
-#, fuzzy
 msgid "Limit  the number of matches"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/locate.fish:11
 msgid "Use ASCII NUL as a separator"
@@ -35160,9 +34826,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:6
-#, fuzzy
 msgid "Shows the current default destination"
-msgstr "停止当前求值的函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lpstat.fish:7
 msgid "Shows a long listing of printers, classes, or jobs"
@@ -35221,9 +34886,8 @@ msgid "output info about filesystems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:7
-#, fuzzy
 msgid "usage information (this)"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsblk.fish:8
 msgid "use ascii characters only"
@@ -35370,9 +35034,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:22
 #: /tmp/fish/implicit/share/completions/ls.fish:77
-#, fuzzy
 msgid "Print inode number of files"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:23
 #: /tmp/fish/implicit/share/completions/ls.fish:78
@@ -35410,9 +35073,8 @@ msgid "Display only security context and file name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:33
-#, fuzzy
 msgid "Print author"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:34
 #: /tmp/fish/implicit/share/completions/xz.fish:19
@@ -35429,9 +35091,8 @@ msgid "Use colors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:37
-#, fuzzy
 msgid "Generate dired output"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
 msgid "List format"
@@ -35451,9 +35112,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:44
 #: /tmp/fish/implicit/share/completions/ls.fish:67
-#, fuzzy
 msgid "Print raw entry names"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:45
 msgid "Long format without groups"
@@ -35877,9 +35537,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/machinectl.fish:3
 #: /tmp/fish/implicit/share/completions/systemctl.fish:39
 #: /tmp/fish/implicit/share/completions/systemd-analyze.fish:3
-#, fuzzy
 msgid "Print a short help and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:4
 #: /tmp/fish/implicit/share/completions/pactl.fish:9
@@ -35910,9 +35569,8 @@ msgid "Also show machines starting with a '.'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:11
-#, fuzzy
 msgid "Show information about machine"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:12
 msgid "Do not ellipsize process tree entries"
@@ -35983,9 +35641,8 @@ msgid "Bind-mount a directory to a machine"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:29
-#, fuzzy
 msgid "Create destination directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/machinectl.fish:30
 msgid "Apply read-only mount"
@@ -36245,9 +35902,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/make.fish:3
 #: /tmp/fish/implicit/share/completions/tar.fish:15
 #: /tmp/fish/implicit/share/functions/cd.fish:1
-#, fuzzy
 msgid "Change directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:5
 msgid "Environment before makefile"
@@ -36270,18 +35926,16 @@ msgid "Start when load drops"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:11
-#, fuzzy
 msgid "Do not execute commands"
-msgstr "有条件地执行一个命令区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:12
 msgid "Ignore specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:13
-#, fuzzy
 msgid "Print database"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:14
 msgid "Question mode"
@@ -36300,9 +35954,8 @@ msgid "Touch files, don't run commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
-#, fuzzy
 msgid "Print working directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/make.fish:21
 msgid "Pretend file is modified"
@@ -36373,9 +36026,8 @@ msgid "Disable color in output messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:17
-#, fuzzy
 msgid "Only download and extract files"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:18
 msgid "Use alternative <buildscript>"
@@ -36474,9 +36126,8 @@ msgid "Library section"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:4
-#, fuzzy
 msgid "Device section"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:5
 msgid "File format section"
@@ -36563,9 +36214,8 @@ msgid "Set system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:28
-#, fuzzy
 msgid "Preprocessors"
-msgstr "进程"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/man.fish:29
 msgid "Format for printing"
@@ -36633,9 +36283,8 @@ msgid "Save the ftpfs dialog with the server in FILE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:15
-#, fuzzy
 msgid "Print the last working directory to FILE"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mc.fish:16
 msgid "Set alternative mode drawing of frameworks"
@@ -36706,9 +36355,8 @@ msgid "Build a legacy array without superblocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:3
-#, fuzzy
 msgid "Create a new array"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:4
 msgid "Select monitor mode"
@@ -36737,24 +36385,20 @@ msgid "Be more verbose"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:13
-#, fuzzy
 msgid "Force operation"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:14
-#, fuzzy
 msgid "Specify config file or directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:15
-#, fuzzy
 msgid "Scan for missing information"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:16
-#, fuzzy
 msgid "Set metadata style to use"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:17
 msgid "Provide home host identity"
@@ -36769,14 +36413,12 @@ msgid "Give cluster name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:20
-#, fuzzy
 msgid "Specify the number of active devices"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:21
-#, fuzzy
 msgid "Specify the number of spare devices"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:22
 msgid "Specify the space to use from each drive"
@@ -36791,18 +36433,16 @@ msgid "Specify the chunk size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:25
-#, fuzzy
 msgid "Specify rounding factor"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:26
 msgid "Specify RAID level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:27
-#, fuzzy
 msgid "Specify data layout"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:28
 msgid "Specify file for write-intent bitmap"
@@ -36865,9 +36505,8 @@ msgid "Specify max nodes in the cluster"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:43
-#, fuzzy
 msgid "Specify journal device for RAID-4/5/6 array"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:44
 msgid "UUID of array to assemble"
@@ -36890,9 +36529,8 @@ msgid "Update superblock properties"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:49
-#, fuzzy
 msgid "Freeze --grow command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:50
 msgid "Test mode"
@@ -36939,41 +36577,36 @@ msgid "Print details on array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:61
-#, fuzzy
 msgid "Print details on platform capabilities"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:62
 msgid "Format data output as key=value pairs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:63
-#, fuzzy
 msgid "Print content of device metadata"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:64
 msgid "Fix examination for buggy SPARC 2.2 kernel RAID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:65
-#, fuzzy
 msgid "Print report about bitmap"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:66
 msgid "List recorded bad blocks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:67
-#, fuzzy
 msgid "Dump metadata to directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:68
-#, fuzzy
 msgid "Restore metadata from directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:69
 msgid "Deactivate array"
@@ -36992,9 +36625,8 @@ msgid "Update subarray"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:73
-#, fuzzy
 msgid "Wait for pending operations"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mdadm.fish:74
 msgid "Mark array as clean ASAP"
@@ -37126,9 +36758,8 @@ msgid "Evaluate indexing information for path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:9
-#, fuzzy
 msgid "Evaluate permissions information for path"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mddiagnose.fish:10
 msgid "Write the diagnostic to the specified path"
@@ -37280,9 +36911,8 @@ msgid "When logging hits line file:N, emit a stack trace (default :0)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:3
-#, fuzzy
 msgid "Write log files in this directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:4
 msgid "Log to standard error instead of files"
@@ -37372,18 +37002,16 @@ msgid "Display the kubernetes dashboard URL instead of opening it"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:31
-#, fuzzy
 msgid "Add machine IP to NO_PROXY environment variable"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:32
 msgid "Force environment to be configured for a specified shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:33
-#, fuzzy
 msgid "Unset variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/minikube.fish:35
 msgid "List the URLs for the services in local cluster"
@@ -37945,9 +37573,8 @@ msgid "Extract timecodes of a track as timecode v2 file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:9
-#, fuzzy
 msgid "Extract cue information as text file"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:10
 msgid "Parse the whole file instead of relying on the index"
@@ -37968,9 +37595,8 @@ msgid "Force the translations for 'code' to be used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:14
-#, fuzzy
 msgid "Charset for strings on the command line"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mkvextract.fish:15
 msgid "Outputs messages in specified charset"
@@ -38201,9 +37827,8 @@ msgid "Print program version and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:2
-#, fuzzy
 msgid "Print usage and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:3
 msgid "Turn on logging to a file"
@@ -38337,9 +37962,8 @@ msgid "Turn off a control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mocp.fish:35
-#, fuzzy
 msgid "Toggle a control"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/modinfo.fish:1
 msgid "Print only 'author'"
@@ -38957,9 +38581,8 @@ msgid "Backup suffix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:7
-#, fuzzy
 msgid "Target directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mv.fish:8
 msgid "Do not overwrite newer files"
@@ -39405,9 +39028,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:92
-#, fuzzy
 msgid "Generate a changelog report."
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:93
 msgid "Generate a file activity report."
@@ -43224,9 +42846,8 @@ msgid "Add specified amount to niceness value"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:1
-#, fuzzy
 msgid "change to specified directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:2
 msgid "specify build file [default=build.ninja]"
@@ -43261,9 +42882,8 @@ msgid "adjust warnings, specify flags"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ninja.fish:11
-#, fuzzy
 msgid "print ninja version"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/nl.fish:1
 msgid "use STYLE for numbering body lines"
@@ -43468,9 +43088,8 @@ msgid "Throw errors on deprecations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:8
-#, fuzzy
 msgid "Print v8 command line options"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:9
 msgid "Set max v8 stack size (bytes)"
@@ -44481,9 +44100,8 @@ msgid "Check for outdated packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:52
-#, fuzzy
 msgid "Create a tarball from a package"
-msgstr "创建代码区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/npm.fish:53
 msgid "Display NPM prefix"
@@ -44594,9 +44212,8 @@ msgid "Display content of section headers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:7
-#, fuzzy
 msgid "Display the contents of all headers"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/objdump.fish:8
 msgid "Display assembler contents of executable sections"
@@ -44891,9 +44508,8 @@ msgid "Do not dump metadata about files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
-#, fuzzy
 msgid "Generate man page"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
 msgid "Which generation to restore"
@@ -45136,9 +44752,8 @@ msgid "Do not check directories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
-#, fuzzy
 msgid "Check directories"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
 msgid "Do not check files"
@@ -45277,14 +44892,12 @@ msgid "Produce no output to stderr"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:2
-#, fuzzy
 msgid "Print this help text"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:3
-#, fuzzy
 msgid "Print the version number"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/oggenc.fish:4
 msgid "Set bits/sample for raw input. Default is 16"
@@ -45594,9 +45207,8 @@ msgid "Search into the package list."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:52
-#, fuzzy
 msgid "Display information about specific packages."
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/opam.fish:53
 msgid "Manage multiple installation of compilers."
@@ -45825,9 +45437,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pacaur.fish:29
 #: /tmp/fish/implicit/share/completions/pacman.fish:20
 #: /tmp/fish/implicit/share/completions/yaourt.fish:26
-#, fuzzy
 msgid "Hook file directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pacaur.fish:32
 msgid "Apply only for AUR targets"
@@ -46276,9 +45887,8 @@ msgid "Only search the AUR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:5
-#, fuzzy
 msgid "Set the output directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pbget.fish:6
 msgid "Display this message"
@@ -46456,9 +46066,8 @@ msgid "Execute command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:19
-#, fuzzy
 msgid "Execute command, enable optional features"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
 msgid "Disable sitecustomize.pl"
@@ -46549,9 +46158,8 @@ msgid "Flush filter params specified by mod"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pfctl.fish:3
-#, fuzzy
 msgid "Table command"
-msgstr "状态\t命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pgrep.fish:1
 msgid "Output delimiter"
@@ -46775,9 +46383,8 @@ msgid "Automated package installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:5
-#, fuzzy
 msgid "Update packages"
-msgstr "创建代码区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg_add.fish:6
 msgid "Fuzzy match"
@@ -47014,9 +46621,8 @@ msgid "Convert package from pkg_add format"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:22
-#, fuzzy
 msgid "Create a package"
-msgstr "创建代码区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:23
 #: /tmp/fish/implicit/share/completions/pkg.fish:31
@@ -47267,9 +46873,8 @@ msgid "Remove package and sources"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:14
-#, fuzzy
 msgid "Keep working dir"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pkgmk.fish:15
 msgid "Use another config"
@@ -47307,9 +46912,8 @@ msgid "Displays help information"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/poff.fish:7
-#, fuzzy
 msgid "Prints the version and exits"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:1
 msgid "run 'make config' for all ports (overrides -G)."
@@ -47601,9 +47205,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:15
 #: /tmp/fish/implicit/share/completions/prt-get.fish:76
-#, fuzzy
 msgid "Search for a pattern in the footprints in the ports tree"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:16
 #: /tmp/fish/implicit/share/completions/prt-get.fish:77
@@ -47641,9 +47244,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:23
 #: /tmp/fish/implicit/share/completions/prt-get.fish:83
-#, fuzzy
 msgid "Print formatted list of ports"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:25
 #: /tmp/fish/implicit/share/completions/prt-get.fish:85
@@ -47661,9 +47263,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:28
 #: /tmp/fish/implicit/share/completions/prt-get.fish:87
-#, fuzzy
 msgid "Print the listing of the directory of a port"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:29
 #: /tmp/fish/implicit/share/completions/prt-get.fish:88
@@ -47702,9 +47303,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:42
 #: /tmp/fish/implicit/share/completions/prt-get.fish:101
-#, fuzzy
 msgid "Keep work directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:43
 #: /tmp/fish/implicit/share/completions/prt-get.fish:102
@@ -47812,9 +47412,8 @@ msgid "Deselect all processes that do not fulfill conditions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:7
-#, fuzzy
 msgid "Select by command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ps.fish:8
 msgid "Select by group"
@@ -47932,9 +47531,8 @@ msgid "run only single command (SQL or internal) and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
-#, fuzzy
 msgid "execute commands from file, then exit"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
 msgid "list available databases, then exit"
@@ -48113,14 +47711,12 @@ msgid "Wait given time (in secs) between updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:19
-#, fuzzy
 msgid "Set terminal width"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:20
-#, fuzzy
 msgid "Set terminal height"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pv.fish:21
 msgid "Prefix output with given name"
@@ -48260,9 +47856,8 @@ msgid "Set coma-seperated options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:7
-#, fuzzy
 msgid "Set one option"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pygmentize.fish:8
 msgid "Set filter"
@@ -48301,9 +47896,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:2
 #: /tmp/fish/implicit/share/completions/python3.fish:2
 #: /tmp/fish/implicit/share/completions/python.fish:2
-#, fuzzy
 msgid "Execute argument as command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:3
 #: /tmp/fish/implicit/share/completions/python3.fish:3
@@ -48314,9 +47908,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/python2.fish:4
 #: /tmp/fish/implicit/share/completions/python3.fish:4
 #: /tmp/fish/implicit/share/completions/python.fish:4
-#, fuzzy
 msgid "Ignore environment variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python2.fish:6
 #: /tmp/fish/implicit/share/completions/python3.fish:6
@@ -48400,9 +47993,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:18
 #: /tmp/fish/implicit/share/completions/python.fish:22
-#, fuzzy
 msgid "Set implementation-specific option"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/python3.fish:19
 #: /tmp/fish/implicit/share/completions/python.fish:23
@@ -48564,9 +48156,8 @@ msgid "Activate clean mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:3
-#, fuzzy
 msgid "Change configuration directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:4
 msgid "Create copies of the default configuration"
@@ -48581,9 +48172,8 @@ msgid "Pick multiple files with ranger"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:7
-#, fuzzy
 msgid "Pick directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:8
 msgid "Open ranger with given file selected"
@@ -48602,9 +48192,8 @@ msgid "Print statistics of CPU usage on exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ranger.fish:12
-#, fuzzy
 msgid "Execute command after configuration file read"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:1
 msgid "List all rbenv commands"
@@ -48639,9 +48228,8 @@ msgid "Set or show the shell-specific Ruby version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:9
-#, fuzzy
 msgid "Show the current Ruby version"
-msgstr "停止当前求值的函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rbenv.fish:10
 msgid "List all Ruby versions known by rbenv"
@@ -48680,9 +48268,8 @@ msgid "Run quietly (Does not affect errors)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:2
-#, fuzzy
 msgid "Set prompt command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:3
 #: /tmp/fish/implicit/share/completions/set.fish:4
@@ -48733,9 +48320,8 @@ msgid "Store the results as an array"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/read.fish:13
-#, fuzzy
 msgid "Set right-hand prompt command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/readlink.fish:1
 msgid "Canonicalize, follow symlinks, last can be missing"
@@ -48830,9 +48416,8 @@ msgid "Remove each component of path"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
-#, fuzzy
 msgid "Prints the help text."
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rmmod.fish:2
 msgid "Send errors to syslog instead of standard error."
@@ -48877,9 +48462,8 @@ msgid "Run with memory usage monitoring"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:5
-#, fuzzy
 msgid "List of rpm configuration files"
-msgstr "列出或移除函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:6
 msgid "Pipe output through specified command"
@@ -49097,9 +48681,8 @@ msgid "List packages on which this package depends"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:53
-#, fuzzy
 msgid "List the package specific scriptlets"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rpm.fish:54
 msgid ""
@@ -49704,9 +49287,8 @@ msgid "Remove bucket"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:3
-#, fuzzy
 msgid "List objects or buckets"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:4
 msgid "List all object in all buckets"
@@ -49741,9 +49323,8 @@ msgid "Disk usage by buckets"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:12
-#, fuzzy
 msgid "Get various information about Buckets or Files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:13
 msgid "Copy object"
@@ -49862,9 +49443,8 @@ msgid "Run interactive (re)configuration tool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:44
-#, fuzzy
 msgid "Dump current configuration"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:45
 msgid "AWS Access Key"
@@ -49883,9 +49463,8 @@ msgid "Dry run, test only"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:49
-#, fuzzy
 msgid "Use HTTPS (default)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:50
 msgid "Don't use HTTPS"
@@ -49916,18 +49495,16 @@ msgid "Resume multipart upload by UploadId"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:57
-#, fuzzy
 msgid "Skip existing files at destination"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:58
 msgid "Upload/download/delete recursively"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:59
-#, fuzzy
 msgid "Check MD5 sums (default)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:60
 msgid "Skip MD5 sum check"
@@ -50098,9 +49675,8 @@ msgid "Encrypt with specified AWS KMS-managed key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:102
-#, fuzzy
 msgid "Use specified encoding"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:103
 msgid "Add encoding to CSV extension list"
@@ -50147,9 +49723,8 @@ msgid "Apply expiry to objects matching prefix"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:114
-#, fuzzy
 msgid "Show progress (default on TTY)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:115
 msgid "Don't show progress meter (default if non-TTY)"
@@ -50447,14 +50022,12 @@ msgid "Connect to a server with an interactive sbt prompt"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:3
-#, fuzzy
 msgid "Print options help message"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:4
-#, fuzzy
 msgid "Print more details"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:5
 msgid "Set log level to debug"
@@ -50477,27 +50050,24 @@ msgid "Use global caches, but not global ~/.sbt directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:10
-#, fuzzy
 msgid "Disable interactive mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:11
 msgid "Specify path to global settings/plugins"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:12
-#, fuzzy
 msgid "Specify path to shared boot directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:13
 msgid "Specify path to local Ivy repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:14
-#, fuzzy
 msgid "Set memory options"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sbt.fish:15
 msgid "Turn on JVM debugging, open at the given port"
@@ -50980,9 +50550,8 @@ msgid "Preselect window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:30
-#, fuzzy
 msgid "Set shell"
-msgstr "退出这个 shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:31
 msgid "Session name"
@@ -51005,9 +50574,8 @@ msgid "Multi attach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/screen.fish:37
-#, fuzzy
 msgid "Send command"
-msgstr "状态\t命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:2
 msgid "Display version information and exit"
@@ -51034,9 +50602,8 @@ msgid "Image quality [1-100]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:8
-#, fuzzy
 msgid "Grab shot from multiple heads"
-msgstr "多次执行一组指令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/scrot.fish:9
 msgid "Select a window or rectangle with the mouse"
@@ -51249,9 +50816,8 @@ msgid "Verify a signed checksum list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:3
-#, fuzzy
 msgid "Sign specified message"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/signify.fish:4
 msgid "Verify a signed message and sig"
@@ -51279,18 +50845,16 @@ msgid "List installed snaps"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:8
-#, fuzzy
 msgid "List of interfaces"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:9
 msgid "List change IDs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:10
-#, fuzzy
 msgid "List aliases"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:11
 msgid "Check that no assertion type is used yet"
@@ -51301,9 +50865,8 @@ msgid "Check if certain assertion type is used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:13
-#, fuzzy
 msgid "List assertion filters"
-msgstr "列出或移除函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/snap.fish:14
 msgid "Show this help message"
@@ -51322,9 +50885,8 @@ msgid "Consider only blanks and alphanumerics"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:4
-#, fuzzy
 msgid "Compare general numeric value"
-msgstr "应有一个参数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:5
 msgid "Consider only printable"
@@ -51379,9 +50941,8 @@ msgid "Field separator"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:19
-#, fuzzy
 msgid "Set temporary directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sort.fish:20
 msgid "Output only first of equal lines"
@@ -51404,9 +50965,8 @@ msgid "Interface to transmit from"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:6
-#, fuzzy
 msgid "Go to background"
-msgstr "将任务置于后台"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:7
 msgid "Allow remote host to connect to local forwarded ports"
@@ -51433,9 +50993,8 @@ msgid "Prevent reading from stdin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:13
-#, fuzzy
 msgid "Do not execute remote command"
-msgstr "有条件地执行一个命令区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ssh.fish:16
 msgid "Subsystem"
@@ -51751,14 +51310,12 @@ msgid "Subcommands specific to package signatures (experimental)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:2
-#, fuzzy
 msgid "Test if this is a login shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:3
-#, fuzzy
 msgid "Test if this is an interactive shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:4
 msgid "Test if a command substitution is currently evaluated"
@@ -51785,14 +51342,12 @@ msgid "Test if all new jobs are put under job control"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:10
-#, fuzzy
 msgid "Print the filename of the currently running script"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:11
-#, fuzzy
 msgid "Print the line number of the currently running script"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/status.fish:12
 msgid ""
@@ -51884,14 +51439,12 @@ msgid "Remove newline"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:1
-#, fuzzy
 msgid "Load the given project"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:2
-#, fuzzy
 msgid "Run the given command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/subl.fish:3
 msgid "Open a new window"
@@ -51940,23 +51493,20 @@ msgid "Read password from stdin"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:8
-#, fuzzy
 msgid "Run command in the background"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:9
 msgid "Edit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:10
-#, fuzzy
 msgid "Run command as group"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:12
-#, fuzzy
 msgid "Run a login shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:13
 msgid "Reset or ignore the credential timestamp"
@@ -51981,27 +51531,24 @@ msgid "Run the given command in a shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:18
-#, fuzzy
 msgid "Run command as user"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sudo.fish:19
 msgid "Validate the credentials, extending timeout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:1
-#, fuzzy
 msgid "Make login shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:2
 msgid "Pass command to shell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/su.fish:3
-#, fuzzy
 msgid "Pass -f to the shell"
-msgstr "退出这个 shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:1
 msgid "Make a completion for a subcommand"
@@ -52137,9 +51684,8 @@ msgid "Restore pristine working copy file (undo most local edits)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
-#, fuzzy
 msgid "Print the status of working copy files and directories."
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
 msgid "Update the working copy to a different URL."
@@ -52170,9 +51716,8 @@ msgid "Do not cache authentication tokens"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:41
-#, fuzzy
 msgid "Do no interactive prompting"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:42
 msgid ""
@@ -52905,9 +52450,8 @@ msgid "Reblock while reading"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:16
-#, fuzzy
 msgid "Print directory names"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:17
 msgid "Archive file"
@@ -53007,9 +52551,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
-#, fuzzy
 msgid "Do not sort file arguments"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:46
 msgid "Preserve file ownership"
@@ -53037,9 +52580,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:54
 #: /tmp/fish/implicit/share/completions/tar.fish:55
-#, fuzzy
 msgid "Ask for confirmation"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tar.fish:56
 msgid "Verify archive"
@@ -53092,9 +52634,8 @@ msgid "The role to set the termite window to report itself with"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:5
-#, fuzzy
 msgid "Set the termite window's title"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/termite.fish:6
 msgid "Tell termite to change to <dir> when launching"
@@ -53186,9 +52727,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/terraform.fish:9
 #: /tmp/fish/implicit/share/completions/terraform.fish:26
 #: /tmp/fish/implicit/share/completions/terraform.fish:84
-#, fuzzy
 msgid "Limit the number of concurrent operations"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/terraform.fish:10
 #: /tmp/fish/implicit/share/completions/terraform.fish:27
@@ -53507,9 +53047,8 @@ msgid "File is character device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:17
-#, fuzzy
 msgid "File is directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/test.fish:18
 msgid "File exists"
@@ -53733,9 +53272,8 @@ msgid "Delete one or more snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:24
-#, fuzzy
 msgid "Print information about destinations"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:25
 msgid "Turn off automatic backups"
@@ -53771,9 +53309,8 @@ msgid "Print paths for all snapshots"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:33
-#, fuzzy
 msgid "Print the path to the current machine directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:34
 msgid "Removes a backup destination"
@@ -53788,9 +53325,8 @@ msgid "Restore an item"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:39
-#, fuzzy
 msgid "Set a backup destination"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmutil.fish:40
 msgid "Add to the list of destinations"
@@ -53861,9 +53397,8 @@ msgid "Like -2, but indicates that the terminal supports 88 colours"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:6
-#, fuzzy
 msgid "Behave as a login shell"
-msgstr "这是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:7
 msgid "Set the quiet server option"
@@ -53882,9 +53417,8 @@ msgid "Report the tmux version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:11
-#, fuzzy
 msgid "Execute command using the default shell"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:13
 msgid "Specify the name of the server socket to use"
@@ -53977,9 +53511,8 @@ msgid "refresh client"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:35
-#, fuzzy
 msgid "update client status bar"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:36
 msgid "rename session"
@@ -53990,9 +53523,8 @@ msgid "save msgs in status bar in per-client msg log"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:38
-#, fuzzy
 msgid "execute commands from path"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:39
 msgid "start tmux server if not running; do not create a session"
@@ -54042,9 +53574,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:51
 #: /tmp/fish/implicit/share/completions/tmux.fish:74
-#, fuzzy
 msgid "bind key to command"
-msgstr "结束一个命令块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:52
 msgid "bind for command mode instead of normal mode"
@@ -54064,9 +53595,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:56
 #: /tmp/fish/implicit/share/completions/tmux.fish:58
-#, fuzzy
 msgid "list all key bindings"
-msgstr "处理 fish 键 绑定"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:57
 #: /tmp/fish/implicit/share/completions/tmux.fish:68
@@ -54095,9 +53625,8 @@ msgid "unbind the command bound to key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:65
-#, fuzzy
 msgid "remove all key bindings"
-msgstr "处理 fish 键 绑定"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:66
 msgid "binding for command mode"
@@ -54108,15 +53637,13 @@ msgid "command bound to key without a prefix (if any) removed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:69
-#, fuzzy
 msgid "Set or unset an environment variable"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:70
 #: /tmp/fish/implicit/share/completions/tmux.fish:75
-#, fuzzy
 msgid "global environment"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:71
 msgid "remove from environment before starting a new process"
@@ -54367,9 +53894,8 @@ msgid "List session information from the server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:31
-#, fuzzy
 msgid "List statistical information from the server"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:32
 msgid "List all torrents"
@@ -54428,9 +53954,8 @@ msgid "Try to download the specified files last"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:47
-#, fuzzy
 msgid "Set the maximum number of peers"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:48
 msgid "Remove the current torrents"
@@ -54473,14 +53998,12 @@ msgid "Remove a tracker from a torrent"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:58
-#, fuzzy
 msgid "Start the current torrents"
-msgstr "停止当前求值的函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:59
-#, fuzzy
 msgid "Stop the current torrents"
-msgstr "停止当前求值的函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:60
 msgid "Start added torrents paused"
@@ -54607,9 +54130,8 @@ msgid "Displays or changes the API endpoint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:11
-#, fuzzy
 msgid "Show or modify build environment variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/travis.fish:12
 msgid "Helps you out when in dire need of information"
@@ -55069,9 +54591,8 @@ msgid "Suppress function and builtin lookup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:4
-#, fuzzy
 msgid "Print command type"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/type.fish:5
 msgid "Print path to command, or nothing if name is not a command"
@@ -55136,19 +54657,16 @@ msgid "Set SMART data for a drive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:15
-#, fuzzy
 msgid "Object to get information about"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:16
-#, fuzzy
 msgid "Block device to get information about"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:17
-#, fuzzy
 msgid "Drive to get information about"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/udisksctl.fish:18
 msgid "Filesystem type to use"
@@ -55211,19 +54729,16 @@ msgid "Block device for ATA device"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:1
-#, fuzzy
 msgid "Set or get soft limit"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:2
-#, fuzzy
 msgid "Set or get hard limit"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:3
-#, fuzzy
 msgid "Set or get all current limits"
-msgstr "显示或设置 shell 资源使用限制"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ulimit.fish:4
 msgid "Maximum size of core files created"
@@ -55363,18 +54878,16 @@ msgid "Print machine name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:14
-#, fuzzy
 msgid "Print processor"
-msgstr "进程"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:15
 msgid "Print hardware platform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/uname.fish:16
-#, fuzzy
 msgid "Print operating system"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unexpand.fish:1
 msgid "convert all blanks, instead of just initial blanks"
@@ -55465,9 +54978,8 @@ msgid "Override cache method for a specified overlay"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:2
-#, fuzzy
 msgid "Be verbose (default)"
-msgstr "(默认)"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/update-eix-remote.fish:3
 msgid "Call wget as the given USER"
@@ -55543,9 +55055,8 @@ msgid "Change user's password file comment"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:3
-#, fuzzy
 msgid "Change user's login directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:4
 msgid "Date on which the user account will be disabled"
@@ -55580,9 +55091,8 @@ msgid "Allow non-unique UID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:13
-#, fuzzy
 msgid "Apply changes in this directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/usermod.fish:14
 msgid "The name of the user's new login shell"
@@ -56251,28 +55761,24 @@ msgid "be quiet and make the output more parseable"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:12
-#, fuzzy
 msgid "set the registry directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:13
-#, fuzzy
 msgid "set the addons source directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:14
-#, fuzzy
 msgid "set the addons target directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:15
 msgid "increase verbosity"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:16
-#, fuzzy
 msgid "set the system-wide target directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:17
 msgid "set target directory to the system-wide one"
@@ -56287,9 +55793,8 @@ msgid "Source file after the first file has been read"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:3
-#, fuzzy
 msgid "Execute Ex command before loading any vimrc"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:4
 msgid "Use device as terminal (Amiga only)"
@@ -56494,9 +55999,8 @@ msgid "Set server name"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
-#, fuzzy
 msgid "Print version information and exit"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
@@ -56628,9 +56132,8 @@ msgid "Remove packages listed in a file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:33
-#, fuzzy
 msgid "Search for a file within installed packages"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
@@ -56859,9 +56362,8 @@ msgid "Convert a RedHat .rpm file to a Debian .deb file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
-#, fuzzy
 msgid "Search for packages containing listed words"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
 msgid "Find local Debian archives suitable for sources.list"
@@ -57003,14 +56505,12 @@ msgid "Pass command to exec instead of \"sh -c\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:1
-#, fuzzy
 msgid "Print byte counts"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:2
-#, fuzzy
 msgid "Print character counts"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:3
 msgid "Print newline counts"
@@ -57021,9 +56521,8 @@ msgid "Print length of longest line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wc.fish:5
-#, fuzzy
 msgid "Print word counts"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wesnoth.fish:1
 msgid "Number sets BitsPerPixel value"
@@ -57168,9 +56667,8 @@ msgid "Go to background immediately after startup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:4
-#, fuzzy
 msgid "Execute command as if part of .wgetrc"
-msgstr "如果前一条命令失败执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:5
 msgid "Log all messages to logfile"
@@ -57338,9 +56836,8 @@ msgid "Load cookies from file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:51
-#, fuzzy
 msgid "Save cookies to file"
-msgstr "对文件内容求值"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wget.fish:52
 msgid "Save session cookies"
@@ -57632,9 +57129,8 @@ msgid "Print all login names and number of users logged on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:11
-#, fuzzy
 msgid "Print current runlevel"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/who.fish:12
 msgid "Print name, line, and time"
@@ -57844,9 +57340,8 @@ msgid "set/list network variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
-#, fuzzy
 msgid "get network variables"
-msgstr "处理环境变量"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
 msgid "save the current configuration"
@@ -57923,9 +57418,8 @@ msgid "Use at most max-lines nonblank input lines per command line"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:9
-#, fuzzy
 msgid "Use at most max-args arguments per command line"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xargs.fish:10
 msgid ""
@@ -58193,9 +57687,8 @@ msgid "Show the main window"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:1
-#, fuzzy
 msgid "Set the initial window geometry"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
 msgid "Set the window title"
@@ -58222,9 +57715,8 @@ msgid "Set the color for background outside the page area"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:8
-#, fuzzy
 msgid "Set the initial zoom factor"
-msgstr "设置终端颜色"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:9
 msgid "Start in continuous view mode"
@@ -58521,9 +58013,8 @@ msgid "Don't define a primary output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:43
-#, fuzzy
 msgid "Print current screen configuration"
-msgstr "列出当前运行的任务"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xrandr.fish:44
 msgid ""
@@ -58678,9 +58169,8 @@ msgid "Do not detach from the controlling terminal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xsel.fish:17
-#, fuzzy
 msgid "Print informative messages"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:1
 msgid "Never highlight the text cursor"
@@ -58963,9 +58453,8 @@ msgid "Force scrollbar to the left side"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:71
-#, fuzzy
 msgid "The shell in xterm's window will be login shell"
-msgstr "这不是登录shell"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:72
 msgid "Ring bell if the user types near the end of line"
@@ -59200,9 +58689,8 @@ msgid "Test the integrity of compressed files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:4
-#, fuzzy
 msgid "Print information about compressed files"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:5
 msgid "Don't delete the input files"
@@ -59309,9 +58797,8 @@ msgid "Suppress warnings/notices"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:33
-#, fuzzy
 msgid "Don't set the exit status to 2"
-msgstr "负的任务退出代码（exit status）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xz.fish:34
 msgid "Print messages in a machine-parsable format"
@@ -59606,18 +59093,16 @@ msgid "Set error level"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:16
-#, fuzzy
 msgid "Be tolerant of errors in commandline"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:17
 msgid "Set maximum delay between commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:18
-#, fuzzy
 msgid "Run commands from cache"
-msgstr "在当前进程下执行命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:20
 msgid "Specify installroot"
@@ -59682,32 +59167,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:2
 #: /tmp/fish/implicit/share/completions/zpool.fish:2
-#, fuzzy
 msgid "Display a help message"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:3
-#, fuzzy
 msgid "Create a volume or filesystem"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:4
 msgid "Destroy a dataset"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:5
-#, fuzzy
 msgid "Create a snapshot"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:6
 msgid "Roll back a filesystem to a previous snapshot"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:7
-#, fuzzy
 msgid "Create a clone of a snapshot"
-msgstr "创建代码区块"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:8
 msgid ""
@@ -59816,9 +59297,8 @@ msgid "Volume size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:35
-#, fuzzy
 msgid "Create a sparse volume"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:36
 msgid "Blocksize"
@@ -59833,14 +59313,12 @@ msgid "Recursively destroy all dependents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:39
-#, fuzzy
 msgid "Force unmounting"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:41
-#, fuzzy
 msgid "Print machine-parsable verbose information"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:43
 msgid "Defer snapshot deletion"
@@ -59936,9 +59414,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zfs.fish:80
 #: /tmp/fish/implicit/share/completions/zfs.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:66
-#, fuzzy
 msgid "Print parsable (exact) values for numbers"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:69
 #: /tmp/fish/implicit/share/completions/zfs.fish:97
@@ -59969,9 +59446,8 @@ msgid "Fields to display"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:79
-#, fuzzy
 msgid "Property source to display"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:82
 msgid "Property to get"
@@ -59994,9 +59470,8 @@ msgid "Upgrade all eligible filesystems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:90
-#, fuzzy
 msgid "Upgrade to the specified version"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:91
 msgid "Filesystem to upgrade"
@@ -60032,9 +59507,8 @@ msgid "Temporary mount point property"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:104
-#, fuzzy
 msgid "Report progress"
-msgstr "进程"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:105
 msgid "Mount all available ZFS filesystems"
@@ -60092,9 +59566,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:119
 #: /tmp/fish/implicit/share/completions/zfs.fish:128
-#, fuzzy
 msgid "Generate a deduplicated stream"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:120
 #: /tmp/fish/implicit/share/completions/zfs.fish:129
@@ -60108,14 +59581,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:122
 #: /tmp/fish/implicit/share/completions/zfs.fish:131
-#, fuzzy
 msgid "Print verbose information about the stream in a machine-parsable format"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:123
-#, fuzzy
 msgid "Generate compressed stream"
-msgstr "生成随机数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:125
 #: /tmp/fish/implicit/share/completions/zfs.fish:133
@@ -60124,19 +59595,17 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:126
 #: /tmp/fish/implicit/share/completions/zfs.fish:134
-#, fuzzy
 msgid "Print verbose information about the stream"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:135
 msgid "Dataset to send"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:136
-#, fuzzy
 msgid ""
 "Print verbose information about the stream and the time spent processing it"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:137
 msgid "Dry run: do not actually receive the stream"
@@ -60411,9 +59880,8 @@ msgid "Clear devices errors in pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:6
-#, fuzzy
 msgid "Create a new storage pool"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:7
 msgid "Destroy a storage pool"
@@ -60436,9 +59904,8 @@ msgid "Get one or several pool properties"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:12
-#, fuzzy
 msgid "Display pool command history"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:13
 msgid "List importable pools, or import some"
@@ -60457,9 +59924,8 @@ msgid "List pools with health status and space usage"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:17
-#, fuzzy
 msgid "Take the specified devices offline"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:18
 msgid "Bring the specified devices back online"
@@ -60564,9 +60030,8 @@ msgid "Virtual device to operate on"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:40
-#, fuzzy
 msgid "Initiate recovery mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:41
 #: /tmp/fish/implicit/share/completions/zpool.fish:85
@@ -60627,9 +60092,8 @@ msgid "Physical device to detach"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:58
-#, fuzzy
 msgid "Print verbose event information"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:60
 msgid "Output appended data as the log grows"
@@ -60664,23 +60128,20 @@ msgid "Also display internal events"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:72
-#, fuzzy
 msgid "Display log records using long format"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:73
 msgid "Pool to get command history of"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:74
-#, fuzzy
 msgid "Read configuration from specified cache file"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:75
-#, fuzzy
 msgid "Search for devices or files in specified directory"
-msgstr "改变工作目录（当前目录）"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:76
 msgid "List or import destroyed pools only (requires -f for importation)"
@@ -60696,14 +60157,12 @@ msgid "Properties of the imported pool"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:79
-#, fuzzy
 msgid "Force import"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:80
-#, fuzzy
 msgid "Recovery mode"
-msgstr "只在不活跃的进程上"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:81
 msgid "Search for and import all pools found"
@@ -60745,9 +60204,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:95
 #: /tmp/fish/implicit/share/completions/zpool.fish:104
-#, fuzzy
 msgid "Print verbose statistics"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:96
 msgid "Pool to retrieve I/O stats from"
@@ -60758,9 +60216,8 @@ msgid "Treat exported or foreign devices as inactive"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:98
-#, fuzzy
 msgid "Device to clear ZFS label information from"
-msgstr "返回 fish 的状态信息"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:106
 msgid "Pool to list properties of"
@@ -60865,9 +60322,8 @@ msgid "Display upgradeable ZFS versions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:146
-#, fuzzy
 msgid "Upgrade to the specified legacy version"
-msgstr "在指定列表中搜索一个特定的字符串"
+msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:2
 msgid "Repo"
@@ -61855,9 +61311,8 @@ msgid "Creates a function wrapping a command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/cdh.fish:1
-#, fuzzy
 msgid "Menu based cd command"
-msgstr "状态\t命令"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
@@ -61868,9 +61323,8 @@ msgid "Print the current directory history (the prev and next lists)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/dirs.fish:1
-#, fuzzy
 msgid "Print directory stack"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/down-or-search.fish:1
 msgid ""
@@ -61883,9 +61337,8 @@ msgid "Edit the command buffer in an external editor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:1
-#, fuzzy
 msgid "Alias for the gettext command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:2
 msgid "Fallback alias for the gettext command"
@@ -62020,9 +61473,8 @@ msgid "Whether to inform the user that hash failures occur"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_cd.fish:1
-#, fuzzy
 msgid "Completions for the cd command"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_command.fish:1
 msgid "Complete using all available commands"
@@ -62117,9 +61569,8 @@ msgid "Apply command to all printers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:7
-#, fuzzy
 msgid "Sets a job option"
-msgstr "设置配置选项"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:8
 msgid "Send an email on job completion"
@@ -62158,9 +61609,8 @@ msgid "Scale image files to use up to number percent of the page"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:17
-#, fuzzy
 msgid "Set the number of characters per inch to use"
-msgstr "参数的个数的计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr.fish:18
 msgid "Set the number of lines per inch to use"
@@ -62503,9 +61953,8 @@ msgid "Move the last element of a directory history from src to dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_no_arguments.fish:1
-#, fuzzy
 msgid "Internal fish function"
-msgstr "定义一个新函数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_not_contain_opt.fish:1
 msgid "Checks that a specific option is not in the current command line"
@@ -62532,9 +61981,8 @@ msgid "Print a list of all known filesystem types"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_groups.fish:1
-#, fuzzy
 msgid "Print a list of local groups"
-msgstr "显示命令类型"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
 msgid "Print help message for the specified fish function or builtin"
@@ -62553,9 +62001,8 @@ msgid "Print lpr options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
-#, fuzzy
 msgid "Print lpr printers"
-msgstr "打印单词计数"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 msgid "Print mounted devices"
@@ -62619,18 +62066,16 @@ msgid "Prompt function for svn"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_fish_systemctl.fish:1
-#, fuzzy
 msgid "Call systemctl with some options from the current commandline"
-msgstr "设置或取得命令行"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_toggle_comment_commandline.fish:1
 msgid "Comment/uncomment the current command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "Update man-page based completions"
-msgstr "编辑命令相关的补全"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
 msgid "Test if a non-switch argument has been given in the current commandline"
@@ -62685,9 +62130,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/functions/ls.fish:1
 #: /tmp/fish/implicit/share/functions/ls.fish:2
 #: /tmp/fish/implicit/share/functions/ls.fish:3
-#, fuzzy
 msgid "List contents of directory"
-msgstr "显示工作目录"
+msgstr ""
 
 #: /tmp/fish/implicit/share/functions/man.fish:1
 msgid "Format and display the on-line manual pages"
@@ -62781,7 +62225,6 @@ msgstr ""
 msgid "Edit variable value"
 msgstr ""
 
-#, fuzzy
 #~ msgid "%ls: --array option requires a single variable name.\n"
 #~ msgstr ""
 #~ "%ls：Erase 需要一个变量名\n"
@@ -62791,34 +62234,26 @@ msgstr ""
 #~ "%ls: Multiple variable names specified in single call (%ls and %.*ls)\n"
 #~ msgstr "%ls：在一个调用中指定了多个变量 (%ls and %.*ls)\n"
 
-#, fuzzy
 #~ msgid "%ls: Values cannot be specfied with erase\n"
 #~ msgstr "%ls：没有指定键\n"
 
-#, fuzzy
 #~ msgid "string: Expected subcommand\n"
 #~ msgstr "%ls：应有函数名\n"
 
-#, fuzzy
 #~ msgid "string: Unknown subcommand '%ls'\n"
 #~ msgstr "%ls：未知的任务 “%ls”\n"
 
-#, fuzzy
 #~ msgid "terminal_give_to_job(): Could not send job %d ('%ls') to foreground"
 #~ msgstr "将任务 %d，“%ls” 发送到前台"
 
-#, fuzzy
 #~ msgid "%s: Expected function name\\n"
 #~ msgstr "%s：应有函数名\\n"
 
-#, fuzzy
 #~ msgid "%ls: Invalid combination of options,\\n%ls\\n"
 #~ msgstr "%ls：非法的选项组合\\n%ls\\n"
 
-#, fuzzy
 #~ msgid "Evaluate contents of file (deprecated, see \"source\")"
 #~ msgstr "对文件内容求值"
 
-#, fuzzy
 #~ msgid "Edit a unit"
 #~ msgstr "触发一个事件️"

From 28d812f54333484b8580ba63633ccbacefe2578d Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Mon, 16 Dec 2019 22:43:11 +0900
Subject: [PATCH 1442/1732] Restore last good version of Swedish translations
 (08ff39c)

---
 po/sv.po | 18130 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 11233 insertions(+), 6897 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index ac78cd222..bce997ebf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,18 +1,17 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# fish - the friendly interactive shell
+# Copyright © 2006
+# This file is distributed under the same license as the fish package.
+# Axel Liljencrantz <liljencrantz@gmail.com>, 2006
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: fish 1.22.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-08 16:50+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2015-04-13 22:15+0800\n"
+"PO-Revision-Date: 2006-03-13 18:06+0100\n"
+"Last-Translator: Axel Liljencrantz <liljencrantz@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -90,22 +89,24 @@ msgstr ""
 msgid "%ls: Invalid --max-args value '%ls'\n"
 msgstr ""
 
-#: src/builtin_bg.cpp:23
+#: builtin.cpp:3639
 #, c-format
 msgid ""
 "%ls: Can't put job %d, '%ls' to background because it is not under job "
 "control\n"
 msgstr ""
+"Kan inte skicka jobb %d, '%ls' till bakgrunden eftersom det inte använder "
+"jobbkontrol\n"
 
-#: src/builtin_bg.cpp:29
+#: builtin.cpp:3649
 #, c-format
 msgid "Send job %d '%ls' to background\n"
-msgstr ""
+msgstr "Skicka jobb %d '%ls' till bakgrunden\n"
 
-#: src/builtin_bg.cpp:63 src/builtin_disown.cpp:69 src/builtin_fg.cpp:49
+#: builtin.cpp:3503 builtin.cpp:3682
 #, c-format
 msgid "%ls: There are no suitable jobs\n"
-msgstr ""
+msgstr "%ls: Det finns inga lämpliga jobb\n"
 
 #: src/builtin_bg.cpp:80 src/builtin_disown.cpp:82 src/builtin_wait.cpp:147
 #, c-format
@@ -117,80 +118,84 @@ msgstr ""
 msgid "%ls: Could not find job '%d'\n"
 msgstr ""
 
-#: src/builtin_bind.cpp:141
+#: builtin.cpp:531
 #, c-format
 msgid "%ls: No key with name '%ls' found\n"
-msgstr ""
+msgstr "%ls: Ingen tangent med namn '%ls' kunde hittas\n"
 
-#: src/builtin_bind.cpp:143
+#: builtin.cpp:537
 #, c-format
 msgid "%ls: Key with name '%ls' does not have any mapping\n"
-msgstr ""
+msgstr "%ls: Tangent med namn '%ls' har ingen mappning\n"
 
-#: src/builtin_bind.cpp:146
+#: builtin.cpp:543
 #, c-format
 msgid "%ls: Unknown error trying to bind to key named '%ls'\n"
 msgstr ""
+"%ls: Okänt fel inträffade vid försök att binda till tangent med namn '%ls'\n"
 
-#: src/builtin_bind.cpp:239
-#, c-format
+#: src/builtin_bind.cpp:239 builtin.cpp:794
+#, fuzzy, c-format
 msgid "%ls: No binding found for key '%ls'\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Beskrivning saknas för typ '%ls'\n"
 
-#: src/builtin_bind.cpp:242
+#: builtin.cpp:798
 #, c-format
 msgid "%ls: No binding found for sequence '%ls'\n"
-msgstr ""
+msgstr "%ls: Ingen bindning funnen för sekvens '%ls'\n"
 
-#: src/builtin_bind.cpp:406
+#: builtin.cpp:834
 #, c-format
 msgid "%ls: Invalid state\n"
-msgstr ""
+msgstr "%ls: Ogiltigt tillstånd\n"
 
-#: src/builtin_block.cpp:89
+#: builtin.cpp:939
 #, c-format
 msgid "%ls: Can not specify scope when removing block\n"
-msgstr ""
+msgstr "%ls: Kan inte ange definitionsområde vid blockradering\n"
 
-#: src/builtin_block.cpp:94
+#: builtin.cpp:945
 #, c-format
 msgid "%ls: No blocks defined\n"
-msgstr ""
+msgstr "%ls: Inga block definerade\n"
 
-#: src/builtin_cd.cpp:44
+#: builtin.cpp:3192
 #, c-format
 msgid "%ls: Could not find home directory\n"
-msgstr ""
+msgstr "%ls: Kunde inte hitta hemkatalogen\n"
 
-#: src/builtin_cd.cpp:52 src/builtin_cd.cpp:79
+#: builtin.cpp:3212 builtin.cpp:3266
 #, c-format
 msgid "%ls: '%ls' is not a directory\n"
-msgstr ""
+msgstr "%ls: '%ls' är inte en katalog\n"
 
-#: src/builtin_cd.cpp:55
+#: builtin.cpp:3219
 #, c-format
 msgid "%ls: The directory '%ls' does not exist\n"
-msgstr ""
+msgstr "%ls: Katalogen '%ls' existerar inte\n"
 
-#: src/builtin_cd.cpp:58
+#: builtin.cpp:3226
 #, c-format
 msgid "%ls: '%ls' is a rotten symlink\n"
-msgstr ""
+msgstr "%ls: '%ls' är en rutten symbolisk länk\n"
 
-#: src/builtin_cd.cpp:61
+#: builtin.cpp:3234
 #, c-format
 msgid "%ls: Unknown error trying to locate directory '%ls'\n"
-msgstr ""
+msgstr "%ls: Okänd fel inträffade under lokalisering av katalogen '%ls'\n"
 
-#: src/builtin_cd.cpp:76
+#: builtin.cpp:3257
 #, c-format
 msgid "%ls: Permission denied: '%ls'\n"
-msgstr ""
+msgstr "%ls: Åtkomst nekad till katalogen '%ls'\n"
 
-#: src/builtin_cd.cpp:90
+#: builtin.cpp:3281
 #, c-format
 msgid "%ls: Could not set PWD variable\n"
-msgstr ""
+msgstr "%ls: Kunde inte sätta variableln PWD\n"
 
 #: src/builtin_commandline.cpp:344
 #, c-format
@@ -217,269 +222,293 @@ msgstr ""
 msgid "%ls: -o requires a non-empty string\n"
 msgstr ""
 
-#: src/builtin_contains.cpp:75
+#: builtin.cpp:3368
 #, c-format
 msgid "%ls: Key not specified\n"
-msgstr ""
+msgstr "%ls: Ingen nyckel angiven\n"
 
-#: src/builtin.cpp:262
+#: builtin.cpp:352
 #, c-format
 msgid ""
 "%ls: Type 'help %ls' for related documentation\n"
 "\n"
 msgstr ""
+"%ls: Skriv 'help %ls' för relaterad dokumnetation\n"
+"\n"
 
-#: src/builtin.cpp:338
+#: builtin.cpp:3760
 #, c-format
 msgid "%ls: Not inside of loop\n"
-msgstr ""
+msgstr "%ls: Inte i en loop\n"
 
 #: src/builtin.cpp:372
 #, c-format
 msgid "%ls: Command not valid at an interactive prompt\n"
 msgstr ""
 
-#: src/builtin.cpp:410 src/builtin.cpp:460
+#: src/builtin.cpp:410 src/builtin.cpp:460 builtin.cpp:4069 builtin.cpp:4113
+#, fuzzy
 msgid "Test a condition"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa ett villkor"
 
-#: src/builtin.cpp:411
+#: builtin.cpp:4071
 msgid "Execute command if previous command suceeded"
-msgstr ""
+msgstr "Kör ett kommand om föregående kommando lyckades"
 
 #: src/builtin.cpp:412
 msgid "Parse options in fish script"
 msgstr ""
 
-#: src/builtin.cpp:413
+#: builtin.cpp:4072
 msgid "Create a block of code"
-msgstr ""
+msgstr "Skapa ett kodblock"
 
-#: src/builtin.cpp:414
+#: builtin.cpp:4073
 msgid "Send job to background"
-msgstr ""
+msgstr "Skicka jobb till bakgrunden"
 
-#: src/builtin.cpp:415
+#: builtin.cpp:4074
 msgid "Handle fish key bindings"
-msgstr ""
+msgstr "Hantera tangentbordsgenvägar för fish"
 
-#: src/builtin.cpp:416
+#: builtin.cpp:4075
 msgid "Temporarily block delivery of events"
-msgstr ""
+msgstr "Blockera tillfälligt leverans av händelser"
 
-#: src/builtin.cpp:417
+#: builtin.cpp:4076
 msgid "Stop the innermost loop"
-msgstr ""
+msgstr "Avbryt den innersta loopen"
 
-#: src/builtin.cpp:419
+#: builtin.cpp:4077
 msgid ""
 "Temporarily halt execution of a script and launch an interactive debug prompt"
-msgstr ""
+msgstr "Avbryt tillfälligt exekvering och starta en interaktiv debugprompt"
 
-#: src/builtin.cpp:420
+#: builtin.cpp:4078
 msgid "Run a builtin command instead of a function"
-msgstr ""
+msgstr "Kör ett inbyggt kommando istället för en funktion"
 
-#: src/builtin.cpp:421 src/builtin.cpp:459
+#: builtin.cpp:4079 builtin.cpp:4112
 msgid "Conditionally execute a block of commands"
-msgstr ""
+msgstr "Kör ett kommando om ett villkor är uppfyllt"
 
-#: src/builtin.cpp:422
+#: builtin.cpp:4080
 msgid "Change working directory"
-msgstr ""
+msgstr "Ändra arbetskatalog"
 
-#: src/builtin.cpp:423
+#: builtin.cpp:4081
 msgid "Run a program instead of a function or builtin"
-msgstr ""
+msgstr "Kör ett program istället för en funktion eller ett inbuggt kommando"
 
-#: src/builtin.cpp:424
+#: builtin.cpp:4082
 msgid "Set or get the commandline"
-msgstr ""
+msgstr "Ändra eller visa kommandoraden"
 
-#: src/builtin.cpp:425
+#: builtin.cpp:4083
 msgid "Edit command specific completions"
-msgstr ""
+msgstr "Redigera kommando-specifika kompletteringar"
 
-#: src/builtin.cpp:426
+#: builtin.cpp:4084
 msgid "Search for a specified string in a list"
-msgstr ""
+msgstr "Sök efter en angiven sträng i en lista"
 
-#: src/builtin.cpp:428
+#: builtin.cpp:4085
 msgid "Skip the rest of the current lap of the innermost loop"
-msgstr ""
+msgstr "Avbryt nuvarande varv i den innersta loopen"
 
-#: src/builtin.cpp:429
+#: builtin.cpp:4086
 msgid "Count the number of arguments"
-msgstr ""
+msgstr "Räkna antalet argument"
 
 #: src/builtin.cpp:430
 msgid "Remove job from job list"
 msgstr ""
 
-#: src/builtin.cpp:431
+#: src/builtin.cpp:431 builtin.cpp:4087
+#, fuzzy
 msgid "Print arguments"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa antal ord"
 
-#: src/builtin.cpp:432
+#: builtin.cpp:4088
 msgid "Evaluate block if condition is false"
-msgstr ""
+msgstr "Kör ett block om ett villkor inte är uppfyllt"
 
-#: src/builtin.cpp:433
+#: builtin.cpp:4089
 msgid "Emit an event"
-msgstr ""
+msgstr "Sänd en händelse"
 
-#: src/builtin.cpp:434
+#: builtin.cpp:4090
 msgid "End a block of commands"
-msgstr ""
+msgstr "Avsluta ett block av kommandon"
 
-#: src/builtin.cpp:435
+#: builtin.cpp:4091
 msgid "Run command in current process"
-msgstr ""
+msgstr "Kör ett kommando i den nuvarande processen"
 
-#: src/builtin.cpp:436
+#: builtin.cpp:4092
 msgid "Exit the shell"
-msgstr ""
+msgstr "Avsluta fish"
 
-#: src/builtin.cpp:437
+#: builtin.cpp:4093
 msgid "Return an unsuccessful result"
-msgstr ""
+msgstr "Returnera ett misslyckat resultat"
 
-#: src/builtin.cpp:438
+#: builtin.cpp:4094
 msgid "Send job to foreground"
-msgstr ""
+msgstr "Skick jobb till förgrunden"
 
-#: src/builtin.cpp:439
+#: builtin.cpp:4095
 msgid "Perform a set of commands multiple times"
-msgstr ""
+msgstr "Kör ett block flera gånger"
 
-#: src/builtin.cpp:440
+#: builtin.cpp:4096
 msgid "Define a new function"
-msgstr ""
+msgstr "Definera en ny funktion"
 
-#: src/builtin.cpp:441
+#: builtin.cpp:4097
 msgid "List or remove functions"
-msgstr ""
+msgstr "Visa eller ta bort funktioner"
 
-#: src/builtin.cpp:442
+#: builtin.cpp:4098
 msgid "History of commands executed by user"
-msgstr ""
+msgstr "Historik över användarens körda kommandon"
 
-#: src/builtin.cpp:443
+#: builtin.cpp:4099
 msgid "Evaluate block if condition is true"
-msgstr ""
+msgstr "Kör ett block om ett villkor är uppfyllt"
 
-#: src/builtin.cpp:444
+#: builtin.cpp:4100
 msgid "Print currently running jobs"
-msgstr ""
+msgstr "Visa nuvarande jobb"
 
 #: src/builtin.cpp:445
 msgid "Evaluate math expressions"
 msgstr ""
 
-#: src/builtin.cpp:446
+#: builtin.cpp:4101
 msgid "Negate exit status of job"
-msgstr ""
+msgstr "Negera resultatet av ett kommando"
 
-#: src/builtin.cpp:447
+#: builtin.cpp:4102
 msgid "Execute command if previous command failed"
-msgstr ""
+msgstr "Kör ett kommando om föregående kommando misslyckades"
 
-#: src/builtin.cpp:448
+#: src/builtin.cpp:448 builtin.cpp:4103
+#, fuzzy
 msgid "Prints formatted text"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriver ut formatterad text"
 
-#: src/builtin.cpp:449
+#: src/builtin.cpp:449 builtin.cpp:4104
+#, fuzzy
 msgid "Print the working directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa nuvarande katalog"
 
-#: src/builtin.cpp:450
+#: builtin.cpp:4105
 msgid "Generate random number"
-msgstr ""
+msgstr "Generera ett slumptal"
 
-#: src/builtin.cpp:451
+#: builtin.cpp:4106
 msgid "Read a line of input into variables"
-msgstr ""
+msgstr "Läs in en rad till variabler"
 
 #: src/builtin.cpp:452
 msgid "Convert path to absolute path without symlinks"
 msgstr ""
 
-#: src/builtin.cpp:453
+#: builtin.cpp:4107
 msgid "Stop the currently evaluated function"
-msgstr ""
+msgstr "Avbryt den nuvarande funktionen"
 
-#: src/builtin.cpp:454
+#: builtin.cpp:4108
 msgid "Handle environment variables"
-msgstr ""
+msgstr "Redigera miljövariabler"
 
-#: src/builtin.cpp:455
+#: src/builtin.cpp:455 builtin.cpp:4109
+#, fuzzy
 msgid "Set the terminal color"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sätt terminalens färg"
 
-#: src/builtin.cpp:456
+#: builtin.cpp:4110
 msgid "Evaluate contents of file"
-msgstr ""
+msgstr "Kör filinnehåll som kommandon"
 
-#: src/builtin.cpp:457
+#: builtin.cpp:4111
 msgid "Return status information about fish"
-msgstr ""
+msgstr "Visa statusinformation om fish"
 
 #: src/builtin.cpp:458
 msgid "Manipulate strings"
 msgstr ""
 
-#: src/builtin.cpp:461
+#: builtin.cpp:4114
 msgid "Return a successful result"
-msgstr ""
+msgstr "Returenra ett lyckat resultat"
 
-#: src/builtin.cpp:462
+#: builtin.cpp:4115
 msgid "Set or get the shells resource usage limits"
-msgstr ""
+msgstr "Redigera eller visa skalets resursanvändningsgränser"
 
 #: src/builtin.cpp:463
 msgid "Wait for background processes completed"
 msgstr ""
 
-#: src/builtin.cpp:464
+#: builtin.cpp:4116
 msgid "Perform a command multiple times"
-msgstr ""
+msgstr "Kör ett kommando upprepade gånger"
 
-#: src/builtin_disown.cpp:21
+#: builtin.cpp:3630
 #, c-format
 msgid "%ls: Unknown job '%ls'\n"
-msgstr ""
+msgstr "%ls: Okänt jobb '%ls'\n"
 
 #: src/builtin_disown.cpp:30
 #, c-format
 msgid "%ls: job %d ('%ls') was stopped and has been signalled to continue.\n"
 msgstr ""
 
-#: src/builtin_exit.cpp:85 src/builtin_read.cpp:138 src/builtin_return.cpp:85
+#: builtin.cpp:2601 builtin.cpp:3150 builtin.cpp:3817
 #, c-format
 msgid "%ls: Argument '%ls' must be an integer\n"
-msgstr ""
+msgstr "%ls: Argumentet '%ls' måste vara ett heltal\n"
 
-#: src/builtin_fg.cpp:65
+#: builtin.cpp:3531
 #, c-format
 msgid "%ls: Ambiguous job\n"
-msgstr ""
+msgstr "%ls: Mer än ett jobb matchar\n"
 
-#: src/builtin_fg.cpp:67 src/builtin_jobs.cpp:181
+#: builtin.cpp:3537 builtin.cpp:3705 builtin_jobs.cpp:301
 #, c-format
 msgid "%ls: '%ls' is not a job\n"
-msgstr ""
+msgstr "%ls: '%ls' är inte ett jobb\n"
 
-#: src/builtin_fg.cpp:81 src/builtin_jobs.cpp:191
+#: builtin.cpp:3568 builtin_jobs.cpp:316
 #, c-format
 msgid "%ls: No suitable job: %d\n"
-msgstr ""
+msgstr "%ls: Inget passande jobb: %d\n"
 
-#: src/builtin_fg.cpp:84
+#: builtin.cpp:3577
 #, c-format
 msgid ""
 "%ls: Can't put job %d, '%ls' to foreground because it is not under job "
 "control\n"
 msgstr ""
+"Kan inte skicka jobb %d, '%ls' till förgrunden eftersom det inte använder "
+"jobbkontroll\n"
 
 #: src/builtin_function.cpp:68
 #, c-format
@@ -518,42 +547,49 @@ msgstr ""
 msgid "%ls: Unexpected positional argument '%ls'"
 msgstr ""
 
-#: src/builtin_functions.cpp:275 src/builtin.h:38
+#: builtin.cpp:1556 builtin.h:32
 #, c-format
 msgid "%ls: Invalid combination of options\n"
-msgstr ""
+msgstr "%ls: Ogiltig kombination av flaggor\n"
 
-#: src/builtin_functions.cpp:289
+#: builtin.cpp:1578
 #, c-format
 msgid "%ls: Expected exactly one function name\n"
-msgstr ""
+msgstr "%ls: Förväntade exakt ett funktionsnamn\n"
 
-#: src/builtin_functions.cpp:296 src/builtin_functions.cpp:352
+#: builtin.cpp:1588 builtin.cpp:1650
 #, c-format
 msgid "%ls: Function '%ls' does not exist\n"
-msgstr ""
+msgstr "%ls: Funktionen '%ls' existerar inte\n"
 
 #: src/builtin_functions.cpp:307
 #, c-format
 msgid "%ls: Expected exactly one function name for --details\n"
 msgstr ""
 
-#: src/builtin_functions.cpp:342
-#, c-format
+#: src/builtin_functions.cpp:342 builtin.cpp:1638
+#, fuzzy, c-format
 msgid ""
 "%ls: Expected exactly two names (current function name, and new function "
 "name)\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Förväntade exakt två namn (nuvarande funktionsnamn, och nytt "
+"funktionsnamn)\n"
 
-#: src/builtin_functions.cpp:359
+#: builtin.cpp:1661 builtin.cpp:2230
 #, c-format
 msgid "%ls: Illegal function name '%ls'\n"
-msgstr ""
+msgstr "%ls: Ogiltigt funktionsnamn '%ls'\n"
 
-#: src/builtin_functions.cpp:368
-#, c-format
+#: src/builtin_functions.cpp:368 builtin.cpp:1672
+#, fuzzy, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Funktionen '%ls' existerar inte. Kan inte skapa kopia '%ls'\n"
 
 #: src/builtin_history.cpp:71 src/builtin_status.cpp:117
 #, c-format
@@ -578,42 +614,46 @@ msgstr ""
 msgid "builtin history delete only supports --case-sensitive\n"
 msgstr ""
 
-#: src/builtin_jobs.cpp:55
+#: builtin_jobs.cpp:87
 msgid "Job\tGroup\t"
-msgstr ""
+msgstr "Jobb\tGrupp\t"
 
-#: src/builtin_jobs.cpp:57
+#: builtin_jobs.cpp:89
 msgid "CPU\t"
-msgstr ""
+msgstr "CPU\t"
 
-#: src/builtin_jobs.cpp:59
+#: builtin_jobs.cpp:91
 msgid "State\tCommand\n"
-msgstr ""
+msgstr "Status\tKommando\n"
 
-#: src/builtin_jobs.cpp:67
+#: builtin_jobs.cpp:99 proc.cpp:843
 msgid "stopped"
-msgstr ""
+msgstr "stannat"
 
-#: src/builtin_jobs.cpp:67
+#: builtin_jobs.cpp:99
 msgid "running"
-msgstr ""
+msgstr "körande"
 
-#: src/builtin_jobs.cpp:76
+#: builtin_jobs.cpp:113
 msgid "Group\n"
-msgstr ""
+msgstr "Grupp\n"
 
-#: src/builtin_jobs.cpp:84
+#: src/builtin_jobs.cpp:84 builtin_jobs.cpp:126
+#, fuzzy
 msgid "Process\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Process\n"
 
-#: src/builtin_jobs.cpp:95
+#: builtin_jobs.cpp:143
 msgid "Command\n"
-msgstr ""
+msgstr "Kommando\n"
 
-#: src/builtin_jobs.cpp:211
+#: builtin_jobs.cpp:344
 #, c-format
 msgid "%ls: There are no jobs\n"
-msgstr ""
+msgstr "%ls: Det finns inga jobb\n"
 
 #: src/builtin_math.cpp:44
 #, c-format
@@ -639,43 +679,52 @@ msgstr ""
 msgid "Number out of range"
 msgstr ""
 
-#: src/builtin_printf.cpp:249
-#, c-format
+#: src/builtin_printf.cpp:249 builtin_printf.cpp:256
+#, fuzzy, c-format
 msgid "%ls: expected a numeric value"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: förväntade ett numeriskt värde"
 
-#: src/builtin_printf.cpp:251
+#: builtin_printf.cpp:258
 #, c-format
 msgid "%ls: value not completely converted"
-msgstr ""
+msgstr "%ls: värdet konverterades inte helt"
 
-#: src/builtin_printf.cpp:363
+#: builtin_printf.cpp:359
 msgid "missing hexadecimal number in escape"
-msgstr ""
+msgstr "saknad hexadecimalt nummer i escapesekvens"
 
-#: src/builtin_printf.cpp:383
+#: builtin_printf.cpp:388
 msgid "Missing hexadecimal number in Unicode escape"
-msgstr ""
+msgstr "Saknad hexadecimalt nummer i Unicodeescapesekvens"
 
-#: src/builtin_printf.cpp:400
+#: builtin_printf.cpp:402
 #, c-format
 msgid "Unicode character out of range: \\%c%0*x"
-msgstr ""
+msgstr "Unicodetecken utanför giltigt spann: \\%c%0+x"
 
-#: src/builtin_printf.cpp:647
+#: builtin_printf.cpp:670
 #, c-format
 msgid "invalid field width: %ls"
-msgstr ""
+msgstr "oglitig fältvidd: %ls"
 
-#: src/builtin_printf.cpp:674
-#, c-format
+#: src/builtin_printf.cpp:674 builtin_printf.cpp:708
+#, fuzzy, c-format
 msgid "invalid precision: %ls"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"ogiltig precision %ls"
 
-#: src/builtin_printf.cpp:699
-#, c-format
+#: src/builtin_printf.cpp:699 builtin_printf.cpp:739
+#, fuzzy, c-format
 msgid "%.*ls: invalid conversion specification"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%.*ls: Ogiltig kombination av flaggor"
 
 #: src/builtin_read.cpp:123
 #, c-format
@@ -683,10 +732,13 @@ msgid ""
 "%ls: flags '--mode-name' / '-m' are now ignored. Set fish_history instead.\n"
 msgstr ""
 
-#: src/builtin_read.cpp:132
-#, c-format
+#: src/builtin_read.cpp:132 builtin.cpp:2593
+#, fuzzy, c-format
 msgid "%ls: Argument '%ls' is out of range\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Argumentet '%ls' är utanför spannet\n"
 
 #: src/builtin_read.cpp:344
 #, c-format
@@ -698,20 +750,27 @@ msgstr ""
 msgid "%ls: Invalid path: %ls\n"
 msgstr ""
 
-#: src/builtin_return.cpp:100
+#: builtin.cpp:3845
 #, c-format
 msgid "%ls: Not inside of function\n"
-msgstr ""
+msgstr "%ls: Inte i en funktion\n"
 
 #: src/builtin_set_color.cpp:159 src/builtin_set_color.cpp:178
-#, c-format
+#: builtin_set_color.cpp:144 builtin_set_color.cpp:166
+#, fuzzy, c-format
 msgid "%ls: Unknown color '%ls'\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%s: Okänd färg '%s'\n"
 
-#: src/builtin_set_color.cpp:167
-#, c-format
+#: src/builtin_set_color.cpp:167 builtin_set_color.cpp:153
+#, fuzzy, c-format
 msgid "%ls: Expected an argument\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%s: Förväntade ett argument\n"
 
 #: src/builtin_set.cpp:62
 #, c-format
@@ -728,10 +787,13 @@ msgstr ""
 msgid "%ls: You provided %d indexes but %d values\n"
 msgstr ""
 
-#: src/builtin_set.cpp:66
-#, c-format
+#: src/builtin_set.cpp:66 builtin_set.cpp:647
+#, fuzzy, c-format
 msgid "%ls: Erase needs a variable name\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Radering kräver ett variabelnamn\n"
 
 #: src/builtin_set.cpp:67
 #, c-format
@@ -745,25 +807,31 @@ msgid ""
 "name.\n"
 msgstr ""
 
-#: src/builtin_set.cpp:303
+#: builtin_set.cpp:155
 #, c-format
 msgid "%ls: Tried to change the read-only variable '%ls'\n"
-msgstr ""
+msgstr "%ls: Försökte ändra den skrivskyddade variablen '%ls'\n"
 
-#: src/builtin_set.cpp:310
-#, c-format
+#: src/builtin_set.cpp:310 builtin_set.cpp:162
+#, fuzzy, c-format
 msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Försökte ändra den speciella variablen '%ls' med fel definitionsområde\n"
 
-#: src/builtin_set.cpp:317
-#, c-format
+#: src/builtin_set.cpp:317 builtin_set.cpp:169
+#, fuzzy, c-format
 msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Försökte ändra den speciella variablen '%ls' till ett ogiltigt värde\n"
 
-#: src/builtin_set.cpp:355
+#: builtin_set.cpp:248
 #, c-format
 msgid "%ls: Invalid index starting at '%ls'\n"
-msgstr ""
+msgstr "%ls: Ogiltigt index vid '%ls'\n"
 
 #: src/builtin_set.cpp:537
 #, c-format
@@ -798,63 +866,63 @@ msgstr ""
 msgid "%ls: `set --show` does not allow slices with the var names\n"
 msgstr ""
 
-#: src/builtin_source.cpp:49 src/builtin_source.cpp:57
+#: builtin.cpp:3412 builtin.cpp:3420
 #, c-format
 msgid "%ls: Error encountered while sourcing file '%ls':\n"
-msgstr ""
+msgstr "%ls: Ett fel uppstod medan filen '%ls' lästes in\n"
 
-#: src/builtin_source.cpp:65
+#: builtin.cpp:3428
 #, c-format
 msgid "%ls: '%ls' is not a file\n"
-msgstr ""
+msgstr "%ls: '%ls' är inte en fil\n"
 
-#: src/builtin_source.cpp:84
+#: builtin.cpp:3447
 #, c-format
 msgid "%ls: Error while reading file '%ls'\n"
-msgstr ""
+msgstr "%ls: Ett fel uppstod medan filen '%ls' lästes\n"
 
 #: src/builtin_status.cpp:155
 #, c-format
 msgid "%ls: Invalid level value '%ls'\n"
 msgstr ""
 
-#: src/builtin_status.cpp:276
+#: builtin.cpp:3108
 msgid "This is a login shell\n"
-msgstr ""
+msgstr "Detta är ett login-skal\n"
 
-#: src/builtin_status.cpp:278
+#: builtin.cpp:3110
 msgid "This is not a login shell\n"
-msgstr ""
+msgstr "Detta är inte ett login-skal\n"
 
-#: src/builtin_status.cpp:282
+#: builtin.cpp:3112
 #, c-format
 msgid "Job control: %ls\n"
-msgstr ""
+msgstr "Jobkontroll: %ls\n"
 
-#: src/builtin_status.cpp:284
+#: builtin.cpp:3113
 msgid "Only on interactive jobs"
-msgstr ""
+msgstr "Bara för interaktiva jobb"
 
-#: src/builtin_status.cpp:285
+#: builtin.cpp:3114
 msgid "Never"
-msgstr ""
+msgstr "Aldrig"
 
-#: src/builtin_status.cpp:285
+#: builtin.cpp:3114
 msgid "Always"
-msgstr ""
+msgstr "Alltid"
 
-#: src/builtin_status.cpp:312 src/fish.cpp:433 src/parser.cpp:552
+#: builtin.cpp:3065 fish.cpp:620 parser.cpp:764
 msgid "Standard input"
-msgstr ""
+msgstr "Standard in"
 
 #: src/builtin_status.cpp:320
 msgid "Not a function"
 msgstr ""
 
-#: src/builtin_string.cpp:39
+#: builtin.h:27
 #, c-format
 msgid "%ls: Expected argument\n"
-msgstr ""
+msgstr "%ls: Förväntade argument\n"
 
 #: src/builtin_string.cpp:160
 #, c-format
@@ -937,32 +1005,30 @@ msgstr ""
 msgid "Defaulting terminal size to 80x24."
 msgstr ""
 
-#: src/common.cpp:1781
+#: common.cpp:1917
 msgid "This is a bug. Break on bugreport to debug."
-msgstr ""
+msgstr "Detta är en bug. För att avlusa, sätt brytpunkten på bugreport."
 
-#: src/common.cpp:1782
-#, c-format
-msgid "If you can reproduce it, please send a bug report to %s."
-msgstr ""
-
-#: src/common.cpp:1792
+#: common.cpp:1936
 msgid "empty"
-msgstr ""
+msgstr "tom"
 
-#: src/complete.cpp:53
-#, c-format
+#: src/complete.cpp:53 complete.cpp:61
+#, fuzzy, c-format
 msgid "Home for %ls"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hemkatalog för %s"
 
-#: src/complete.cpp:56
+#: complete.cpp:66
 #, c-format
 msgid "Variable: %ls"
-msgstr ""
+msgstr "Variabel: %ls"
 
-#: src/env.cpp:242
+#: env.cpp:1180
 msgid "Tried to pop empty environment stack."
-msgstr ""
+msgstr "Försökte ta bort element från tom variabelstack"
 
 #: src/env.cpp:537
 #, c-format
@@ -1051,107 +1117,117 @@ msgstr ""
 msgid "Unable to open a pipe for universal variables using '%ls': %s"
 msgstr ""
 
-#: src/event.cpp:119
+#: event.cpp:178
 #, c-format
 msgid "signal handler for %ls (%ls)"
-msgstr ""
+msgstr "signalhanterare för %ls (%ls)"
 
-#: src/event.cpp:124
+#: event.cpp:182
 #, c-format
 msgid "handler for variable '%ls'"
-msgstr ""
+msgstr "hanterare för variabel '%ls'"
 
-#: src/event.cpp:129
+#: event.cpp:188
 #, c-format
 msgid "exit handler for process %d"
-msgstr ""
+msgstr "avslutshanterare för process %d"
 
-#: src/event.cpp:134 src/event.cpp:145
+#: event.cpp:194 event.cpp:205
 #, c-format
 msgid "exit handler for job %d, '%ls'"
-msgstr ""
+msgstr "avslutshanterare för jobb %d, '%ls'"
 
-#: src/event.cpp:137
+#: event.cpp:196
 #, c-format
 msgid "exit handler for job with process group %d"
-msgstr ""
+msgstr "avslutshanterare för jobb med processgrupp %d"
 
-#: src/event.cpp:148
+#: event.cpp:207
 #, c-format
 msgid "exit handler for job with job id %d"
-msgstr ""
+msgstr "avslutshanterare för jobb med jobid %d"
 
-#: src/event.cpp:153
+#: event.cpp:213
 #, c-format
 msgid "handler for generic event '%ls'"
-msgstr ""
+msgstr "hanterare för generisk händelse '%ls'"
 
-#: src/event.cpp:157
-#, c-format
+#: src/event.cpp:157 event.cpp:217
+#, fuzzy, c-format
 msgid "Unknown event type '0x%x'"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Okänd händelsetyp '0x%x'"
 
-#: src/event.cpp:403
+#: event.cpp:613
 msgid "Signal list overflow. Signals have been ignored."
-msgstr ""
+msgstr "Signallistan är full. Signaler har ignorerats."
 
-#: src/exec.cpp:45
+#: exec.cpp:57
 #, c-format
 msgid "An error occurred while redirecting file descriptor %d"
-msgstr ""
+msgstr "Ett fel inträffade vid IO dirigering av filidentifierare %d"
 
-#: src/exec.cpp:48
+#: src/exec.cpp:48 exec.cpp:62
+#, fuzzy
 msgid "An error occurred while writing output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ett fel inträffade under skrivandet av utdata"
 
-#: src/exec.cpp:51
-#, c-format
+#: src/exec.cpp:51 exec.cpp:67
+#, fuzzy, c-format
 msgid "An error occurred while redirecting file '%s'"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ett fel inträffade vid IO dirigering av filen '%ls'"
 
-#: src/exec.cpp:714
+#: exec.cpp:795
 #, c-format
 msgid "Unknown function '%ls'"
-msgstr ""
+msgstr "Okänd funktion '%ls'"
 
-#: src/exec.cpp:801
+#: exec.cpp:943
 #, c-format
 msgid "Unknown input redirection type %d"
-msgstr ""
+msgstr "Okänd dirigering av standard in av typ %d"
 
-#: src/expand.cpp:55
+#: expand.cpp:59
 msgid "Child process"
-msgstr ""
+msgstr "Barnprocess"
 
-#: src/expand.cpp:58
+#: expand.cpp:64
 msgid "Process"
-msgstr ""
+msgstr "Process"
 
-#: src/expand.cpp:61
+#: expand.cpp:69
 msgid "Job"
-msgstr ""
+msgstr "Jobb"
 
-#: src/expand.cpp:64
+#: expand.cpp:74
 #, c-format
 msgid "Job: %ls"
-msgstr ""
+msgstr "Jobb: %ls"
 
-#: src/expand.cpp:67
+#: expand.cpp:79
 msgid "Shell process"
-msgstr ""
+msgstr "Skalprocess"
 
-#: src/expand.cpp:70
+#: expand.cpp:84
 msgid "Last background job"
-msgstr ""
+msgstr "Senaste bakgrundsjobb"
 
 #: src/expand.cpp:398
 #, c-format
 msgid "Unexpected failure to convert pid '%ls' to integer\n"
 msgstr ""
 
-#: src/expand.cpp:984
+#: expand.cpp:1419
 msgid "Mismatched brackets"
-msgstr ""
+msgstr "Klammerparanteser matchar inte varandra"
 
 #: src/expand.cpp:1063
 msgid "Too much data emitted by command substitution so it was discarded\n"
@@ -1162,29 +1238,29 @@ msgstr ""
 msgid "Invalid value '%s' for debug-level flag"
 msgstr ""
 
-#: src/fish.cpp:302
+#: fish.cpp:461 mimedb.cpp:1343
 #, c-format
 msgid "%s, version %s\n"
-msgstr ""
+msgstr "%s, version %s\n"
 
 #: src/fish.cpp:316 src/fish_indent.cpp:434
 #, c-format
 msgid "Invalid value '%s' for debug-stack-frames flag"
 msgstr ""
 
-#: src/fish.cpp:366
+#: fish.cpp:516
 msgid "Can not use the no-execute mode when running an interactive session"
-msgstr ""
+msgstr "no-execute läget kan inte användas i en interaktiv session"
 
-#: src/fish.cpp:431
+#: fish.cpp:619
 #, c-format
 msgid "Error while reading file %ls\n"
-msgstr ""
+msgstr "Ett fel uppstod medan filen '%ls' lästes\n"
 
-#: src/fish_indent.cpp:389
+#: fish_indent.cpp:332
 #, c-format
 msgid "%ls, version %s\n"
-msgstr ""
+msgstr "%ls, version %s\n"
 
 #: src/fish_indent.cpp:453
 #, c-format
@@ -1234,35 +1310,53 @@ msgstr ""
 msgid "An error occured while reading output from code block on fd %d"
 msgstr ""
 
-#: src/output.cpp:559
-#, c-format
+#: src/output.cpp:559 output.cpp:608
+#, fuzzy, c-format
 msgid ""
 "Tried to use terminfo string %s on line %ld of %s, which is undefined in "
 "terminal of type \"%ls\". Please report this error to %s"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Försökte använda terminfosträng %s på rad %d av %s, vilken är odefinerad i "
+"terminaler av typen '%ls'. Vänligen rapportera detta fel till %s"
 
-#: src/pager.cpp:40
+#: src/pager.cpp:40 pager.cpp:24
+#, fuzzy
 msgid "search: "
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"sök: "
 
-#: src/pager.cpp:493
+#: pager.cpp:566
 #, c-format
 msgid "%lsand %lu more rows"
-msgstr ""
+msgstr "%lsoch %lu rader till"
 
-#: src/pager.cpp:500
-#, c-format
+#: src/pager.cpp:500 pager.cpp:571
+#, fuzzy, c-format
 msgid "rows %lu to %lu of %lu"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"rader %d till %d av %d"
 
-#: src/pager.cpp:503
+#: src/pager.cpp:503 pager.cpp:576
+#, fuzzy
 msgid "(no matches)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"(inga matchningar)"
 
-#: src/parse_execution.cpp:556
-#, c-format
+#: src/parse_execution.cpp:556 parse_execution.cpp:555
+#, fuzzy, c-format
 msgid "switch: Expected exactly one argument, got %lu\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"switch: Förväntade exakt ett argument, fick %lu\n"
 
 #: src/parse_execution.cpp:791
 #, c-format
@@ -1271,165 +1365,204 @@ msgid ""
 "use 'eval %ls'."
 msgstr ""
 
-#: src/parse_execution.cpp:796
-#, c-format
+#: src/parse_execution.cpp:796 parse_execution.cpp:848
+#, fuzzy, c-format
 msgid "The file '%ls' is not executable by this user"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Filen '%ls' existerar redan"
 
-#: src/parse_execution.cpp:1007
-#, c-format
+#: src/parse_execution.cpp:1007 parse_execution.cpp:1057
+#, fuzzy, c-format
 msgid "Invalid redirection target: %ls"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ogiltig IO omdirigering"
 
-#: src/parse_execution.cpp:1021
-#, c-format
+#: src/parse_execution.cpp:1021 parse_execution.cpp:1081
+#, fuzzy, c-format
 msgid "Requested redirection to '%ls', which is not a valid file descriptor"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"IO dirigering till någonting som inte är en filidentifierare"
 
-#: src/parser.cpp:30
+#: parser.cpp:57
 #, c-format
 msgid "Tried to evaluate commands using invalid block type '%ls'"
-msgstr ""
+msgstr "Försökte utföra kommandon i ogiltig blocktyp '%ls'"
 
-#: src/parser.cpp:33
+#: parser.cpp:67 parse_constants.h:255
 msgid "'while' block"
-msgstr ""
+msgstr "'while' block"
 
-#: src/parser.cpp:36
+#: parser.cpp:72 parse_constants.h:260
 msgid "'for' block"
-msgstr ""
+msgstr "'for' block"
 
-#: src/parser.cpp:39
+#: parser.cpp:77 parse_constants.h:265
 msgid "block created by breakpoint"
-msgstr ""
+msgstr "block skapat av det inbuggde kommandot breakpoint"
 
-#: src/parser.cpp:42
+#: parser.cpp:82 parse_constants.h:272
 msgid "'if' conditional block"
-msgstr ""
+msgstr "'if' villkorligt block"
 
-#: src/parser.cpp:45
+#: parser.cpp:92 parse_constants.h:284
 msgid "function invocation block"
-msgstr ""
+msgstr "funktionsanropp-block"
 
-#: src/parser.cpp:48
+#: parser.cpp:97 parse_constants.h:289
 msgid "function invocation block with no variable shadowing"
-msgstr ""
+msgstr "funktionsanroppsblock utan variabelskuggning"
 
-#: src/parser.cpp:51
+#: parser.cpp:102 parse_constants.h:295
 msgid "'switch' block"
-msgstr ""
+msgstr "'switch' block"
 
-#: src/parser.cpp:54
+#: parser.cpp:112 parse_constants.h:307
 msgid "global root block"
-msgstr ""
+msgstr "globalt rot-block"
 
-#: src/parser.cpp:57
+#: parser.cpp:117 parse_constants.h:313
 msgid "command substitution block"
-msgstr ""
+msgstr "kommandosubstitution-block"
 
-#: src/parser.cpp:60
+#: parser.cpp:122 parse_constants.h:319
 msgid "'begin' unconditional block"
-msgstr ""
+msgstr "'begin' ovillkorligen exekverat block"
 
-#: src/parser.cpp:63
+#: parser.cpp:127 parse_constants.h:325
 msgid "block created by the . builtin"
-msgstr ""
+msgstr "block skapat av det inbyggda kommandot '.'"
 
-#: src/parser.cpp:66
+#: parser.cpp:132 parse_constants.h:330
 msgid "event handler block"
-msgstr ""
+msgstr "händelsehanterarblock"
 
-#: src/parser.cpp:69
+#: parser.cpp:137 parse_constants.h:336
 msgid "unknown/invalid block"
-msgstr ""
+msgstr "okänt/ogiltigt block"
 
-#: src/parser.cpp:306
+#: parser.cpp:474
 #, c-format
 msgid "Could not write profiling information to file '%s'"
-msgstr ""
+msgstr "Kunde inte skriva profileringsinformation till filen '%s'"
 
-#: src/parser.cpp:308
+#: parser.cpp:480
 msgid "Time\tSum\tCommand\n"
-msgstr ""
+msgstr "Tid\tSumma\tKommando\n"
 
-#: src/parser.cpp:366
+#: parser.cpp:562
 #, c-format
 msgid "in event handler: %ls\n"
-msgstr ""
+msgstr "i händelsehanterare: %ls\n"
 
-#: src/parser.cpp:385
-#, c-format
+#: src/parser.cpp:385 parser.cpp:590
+#, fuzzy, c-format
 msgid "from sourcing file %ls\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ett fel uppstod medan filen '%ls' lästes\n"
 
-#: src/parser.cpp:392
-#, c-format
+#: src/parser.cpp:392 parser.cpp:597
+#, fuzzy, c-format
 msgid "in function '%ls'\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"i funktion '%ls',\n"
 
-#: src/parser.cpp:396
+#: parser.cpp:602
 msgid "in command substitution\n"
-msgstr ""
+msgstr "i kommandosubstitution\n"
 
-#: src/parser.cpp:407
-#, c-format
+#: src/parser.cpp:407 parser.cpp:615
+#, fuzzy, c-format
 msgid "\tcalled on line %d of file %ls\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"\tanropad på rad %d i fil '%ls',\n"
 
-#: src/parser.cpp:410
+#: src/parser.cpp:410 parser.cpp:621
+#, fuzzy
 msgid "\tcalled during startup\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"\tanropad från standard in,\n"
 
-#: src/parser.cpp:412
+#: src/parser.cpp:412 parser.cpp:625
+#, fuzzy
 msgid "\tcalled on standard input\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"\tanropad från standard in,\n"
 
-#: src/parser.cpp:425
+#: parser.cpp:642
 #, c-format
 msgid "\twith parameter list '%ls'\n"
-msgstr ""
+msgstr "\tmed parameterlista '%ls'\n"
 
-#: src/parser.cpp:547
+#: parser.cpp:756
 #, c-format
 msgid "%ls (line %d): "
-msgstr ""
+msgstr "%ls (rad %d): "
 
-#: src/parser.cpp:550
+#: src/parser.cpp:550 parser.cpp:760
 msgid "Startup"
 msgstr ""
 
-#: src/parser.cpp:588
+#: parser.cpp:803
 msgid "Job inconsistency"
-msgstr ""
+msgstr "Jobb i ogiltigt tillstånd"
 
-#: src/parser.cpp:797
-#, c-format
+#: src/parser.cpp:797 parser.cpp:1047
+#, fuzzy, c-format
 msgid "%ls (line %lu): "
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls (rad %d): "
 
-#: src/parser.cpp:800
+#: src/parser.cpp:800 parser.cpp:1051
 #, c-format
 msgid "%ls: "
 msgstr ""
 
-#: src/parse_util.cpp:28
-#, c-format
+#: src/parse_util.cpp:28 parse_util.cpp:46
+#, fuzzy, c-format
 msgid "The '%ls' command can not be used in a pipeline"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Detta kommando kan ej användas i ett rör"
 
-#: src/parse_util.cpp:32
-#, c-format
+#: src/parse_util.cpp:32 parse_util.cpp:49
+#, fuzzy, c-format
 msgid "The '%ls' command can not be used immediately after a backgrounded job"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Detta kommando kan ej användas i ett rör"
 
-#: src/parse_util.cpp:36
+#: src/parse_util.cpp:36 parse_util.cpp:52
+#, fuzzy
 msgid "Backgrounded commands can not be used as conditionals"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Detta kommando kan ej användas i ett rör"
 
-#: src/path.cpp:25
+#: path.cpp:24
 #, c-format
 msgid "Error while searching for command '%ls'"
-msgstr ""
+msgstr "Ett fel uppstod under sökning efter kommandot '%ls'"
 
 #: src/path.cpp:276
 #, c-format
@@ -1469,78 +1602,84 @@ msgstr ""
 msgid "Job %d, "
 msgstr ""
 
-#: src/proc.cpp:587
-#, c-format
+#: src/proc.cpp:587 proc.cpp:786
+#, fuzzy, c-format
 msgid "%ls: %ls'%ls' terminated by signal %ls (%ls)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Jobb %d, '%ls' avslutat av signal %ls (%ls)"
 
-#: src/proc.cpp:595
-#, c-format
+#: src/proc.cpp:595 proc.cpp:797
+#, fuzzy, c-format
 msgid "%ls: Process %d, '%ls' %ls'%ls' terminated by signal %ls (%ls)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%ls: Process %d, '%ls', från jobb %d, '%ls' avslutat av signal %ls (%ls)"
 
-#: src/proc.cpp:779
+#: proc.cpp:1065
 msgid "An error occured while reading output from code block"
-msgstr ""
+msgstr "Ett fel inträffade under läsandet av utdata från kodblock"
 
 #: src/proc.cpp:856
 #, c-format
 msgid "Could not send job %d ('%ls') with pgid %d to foreground"
 msgstr ""
 
-#: src/proc.cpp:885
+#: proc.cpp:1094 proc.cpp:1106
 #, c-format
 msgid "Could not send job %d ('%ls') to foreground"
-msgstr ""
+msgstr "Kunde inte skicka jobb %d ('%ls') till förgrunden"
 
-#: src/proc.cpp:909 src/proc.cpp:918 src/proc.cpp:932
+#: proc.cpp:1126 proc.cpp:1136 proc.cpp:1151
 msgid "Could not return shell to foreground"
-msgstr ""
+msgstr "Kunde inte återställa skalet till förgrunden"
 
-#: src/proc.cpp:1065
+#: proc.cpp:1365
 #, c-format
 msgid "More than one job in foreground: job 1: '%ls' job 2: '%ls'"
-msgstr ""
+msgstr "Mer än ett jobb i förgrunden: job 1: '%ls', jobb 2 '%ls'"
 
-#: src/proc.cpp:1075
+#: proc.cpp:1378
 msgid "Process argument list"
-msgstr ""
+msgstr "Processargumentlista"
 
-#: src/proc.cpp:1076
+#: proc.cpp:1379
 msgid "Process name"
-msgstr ""
+msgstr "Processnamn"
 
-#: src/proc.cpp:1079
+#: proc.cpp:1385
 #, c-format
 msgid "Job '%ls', process '%ls' has inconsistent state 'stopped'=%d"
-msgstr ""
+msgstr "Jobb '%ls', process '%ls' har ogiltigt tillstånd 'stopped'=%d"
 
-#: src/proc.cpp:1085
+#: proc.cpp:1395
 #, c-format
 msgid "Job '%ls', process '%ls' has inconsistent state 'completed'=%d"
-msgstr ""
+msgstr "Jobb '%ls', process '%ls' har ogiltigt tillstånd 'completed'=%d"
 
-#: src/reader.cpp:333
+#: reader.cpp:478
 msgid "Could not set terminal mode for new job"
-msgstr ""
+msgstr "Kunde inte återställa terminalen för nytt jobb"
 
-#: src/reader.cpp:362
+#: reader.cpp:525
 msgid "Could not set terminal mode for shell"
-msgstr ""
+msgstr "Kunde inte återställa terminalen till skalet"
 
-#: src/reader.cpp:1601
+#: src/reader.cpp:1601 reader.cpp:2059
 msgid "No TTY for interactive shell (tcgetpgrp failed)"
 msgstr ""
 
-#: src/reader.cpp:1611
+#: src/reader.cpp:1611 reader.cpp:2074
 #, c-format
 msgid ""
 "I appear to be an orphaned process, so I am quitting politely. My pid is %d."
 msgstr ""
 
-#: src/reader.cpp:1994
+#: reader.cpp:2616
 msgid "Pop null reader block"
-msgstr ""
+msgstr "Ta bort element från tomt läsarblock"
 
 #: src/reader.cpp:2160
 msgid "There are still jobs active:\n"
@@ -1564,305 +1703,310 @@ msgid ""
 "Use 'disown PID' to remove jobs from the list without terminating them.\n"
 msgstr ""
 
-#: src/reader.cpp:3205
+#: reader.cpp:4115
 #, c-format
 msgid "Unknown key binding 0x%X"
-msgstr ""
+msgstr "Okänd tangentbords binding 0x%X"
 
-#: src/reader.cpp:3294
+#: reader.cpp:4226
 msgid "Error while reading from file descriptor"
-msgstr ""
+msgstr "Ett fel uppstod under inläsning från filidentifierare"
 
-#: src/reader.cpp:3308
+#: reader.cpp:4243
 msgid "Error while closing input stream"
-msgstr ""
+msgstr "Ett fel inträffade medan indataström stängdes"
 
-#: src/reader.cpp:3329
+#: reader.cpp:4270
 msgid "Error while opening input stream"
-msgstr ""
+msgstr "Ett fel inträffade medan indataström öppnades"
 
-#: src/sanity.cpp:18
+#: src/sanity.cpp:18 sanity.cpp:37
+#, fuzzy
 msgid "Errors detected, shutting down. Break on sanity_lose() to debug."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fel har upptäckts, avslutar programmet"
 
-#: src/sanity.cpp:33
+#: sanity.cpp:65
 #, c-format
 msgid "The pointer '%ls' is invalid"
-msgstr ""
+msgstr "Pekaren '%ls' är ogiltig"
 
-#: src/sanity.cpp:38
+#: sanity.cpp:71
 #, c-format
 msgid "The pointer '%ls' is null"
-msgstr ""
+msgstr "Pekaren '%ls' är noll"
 
-#: src/signal.cpp:36
+#: signal.cpp:69
 msgid "Terminal hung up"
-msgstr ""
+msgstr "Terminalen bröt uppkopplingen"
 
-#: src/signal.cpp:39
+#: signal.cpp:77
 msgid "Quit request from job control (^C)"
-msgstr ""
+msgstr "Avslutning via jobbkontroll (^C)"
 
-#: src/signal.cpp:42
+#: signal.cpp:85
 msgid "Quit request from job control with core dump (^\\)"
-msgstr ""
+msgstr "Avslutning via jobbkontroll med minnesdump (^\\)"
 
-#: src/signal.cpp:45
+#: signal.cpp:93
 msgid "Illegal instruction"
-msgstr ""
+msgstr "Ogiltig instruktion"
 
-#: src/signal.cpp:48
+#: signal.cpp:101
 msgid "Trace or breakpoint trap"
-msgstr ""
+msgstr "Spårnings eller brytpunktsfälla utlöstes"
 
-#: src/signal.cpp:51
+#: signal.cpp:109
 msgid "Abort"
-msgstr ""
+msgstr "Avbrott"
 
-#: src/signal.cpp:54
+#: signal.cpp:117
 msgid "Misaligned address error"
-msgstr ""
+msgstr "Bussfel (Ogiltigt justerad minnesadress)"
 
-#: src/signal.cpp:57
+#: signal.cpp:125
 msgid "Floating point exception"
-msgstr ""
+msgstr "Flyttalsundantag"
 
-#: src/signal.cpp:60
+#: signal.cpp:133
 msgid "Forced quit"
-msgstr ""
+msgstr "Tvingad avslutning"
 
-#: src/signal.cpp:63
+#: signal.cpp:141
 msgid "User defined signal 1"
-msgstr ""
+msgstr "Användardefinerad signal 1"
 
-#: src/signal.cpp:66
+#: signal.cpp:148
 msgid "User defined signal 2"
-msgstr ""
+msgstr "Användardefinerad signal 2"
 
-#: src/signal.cpp:69
+#: signal.cpp:156
 msgid "Address boundary error"
-msgstr ""
+msgstr "Minnesadress korsar segmentgräns"
 
-#: src/signal.cpp:72
+#: signal.cpp:164
 msgid "Broken pipe"
-msgstr ""
+msgstr "Avbrutet rör"
 
-#: src/signal.cpp:75
+#: signal.cpp:172
 msgid "Timer expired"
-msgstr ""
+msgstr "Timer utlöstes"
 
-#: src/signal.cpp:78
+#: signal.cpp:180
 msgid "Polite quit request"
-msgstr ""
+msgstr "Artig avslutning"
 
-#: src/signal.cpp:81
+#: signal.cpp:188
 msgid "Child process status changed"
-msgstr ""
+msgstr "Barnprocess fick ändrad status"
 
-#: src/signal.cpp:84
+#: signal.cpp:196
 msgid "Continue previously stopped process"
-msgstr ""
+msgstr "Fortsätt tidigare stannad process"
 
-#: src/signal.cpp:87
+#: signal.cpp:204
 msgid "Forced stop"
-msgstr ""
+msgstr "Tvingad att stoppa"
 
-#: src/signal.cpp:90
+#: signal.cpp:212
 msgid "Stop request from job control (^Z)"
-msgstr ""
+msgstr "Stoppad genom jobbkontroll (^Z)"
 
-#: src/signal.cpp:93
+#: signal.cpp:220
 msgid "Stop from terminal input"
-msgstr ""
+msgstr "Stoppad från terminalläsning"
 
-#: src/signal.cpp:96
+#: signal.cpp:228
 msgid "Stop from terminal output"
-msgstr ""
+msgstr "Stoppad från terminalskrivning"
 
-#: src/signal.cpp:99
+#: signal.cpp:236
 msgid "Urgent socket condition"
-msgstr ""
+msgstr "Viktig socket-situation"
 
-#: src/signal.cpp:102
+#: signal.cpp:244
 msgid "CPU time limit exceeded"
-msgstr ""
+msgstr "Slut på processortid"
 
-#: src/signal.cpp:105
+#: signal.cpp:252
 msgid "File size limit exceeded"
-msgstr ""
+msgstr "Maximal filstorlek överskriden"
 
-#: src/signal.cpp:108
+#: signal.cpp:260
 msgid "Virtual timer expired"
-msgstr ""
+msgstr "Virtuell timer utlöst"
 
-#: src/signal.cpp:111
+#: signal.cpp:268
 msgid "Profiling timer expired"
-msgstr ""
+msgstr "Profileringstimer utlöst"
 
-#: src/signal.cpp:114 src/signal.cpp:117
+#: signal.cpp:276 signal.cpp:284
 msgid "Window size change"
-msgstr ""
+msgstr "Terminalfönstret ändrade storlek"
 
-#: src/signal.cpp:120
+#: signal.cpp:292
 msgid "I/O on asynchronous file descriptor is possible"
-msgstr ""
+msgstr "Läsning/skrivning på asynkron filidentifierare möjligt"
 
-#: src/signal.cpp:123
+#: signal.cpp:300
 msgid "Power failure"
-msgstr ""
+msgstr "Strömavbrott"
 
-#: src/signal.cpp:126
+#: signal.cpp:308
 msgid "Bad system call"
-msgstr ""
+msgstr "Felaktigt systemanrop"
 
-#: src/signal.cpp:129
+#: signal.cpp:316
 msgid "Information request"
-msgstr ""
+msgstr "Informationsbegäran"
 
-#: src/signal.cpp:132
+#: signal.cpp:324
 msgid "Stack fault"
-msgstr ""
+msgstr "Stackfel"
 
-#: src/signal.cpp:135
+#: signal.cpp:332
 msgid "Emulator trap"
-msgstr ""
+msgstr "Emulatorfälla"
 
-#: src/signal.cpp:138
+#: signal.cpp:340
 msgid "Abort (Alias for SIGABRT)"
-msgstr ""
+msgstr "Avbrott (Alias för SIGABRT)"
 
-#: src/signal.cpp:141
+#: signal.cpp:348
 msgid "Unused signal"
-msgstr ""
+msgstr "Oanvänd signal"
 
-#: src/signal.cpp:173 src/signal.cpp:185
+#: mimedb.cpp:1402 signal.cpp:407 signal.cpp:422
 msgid "Unknown"
-msgstr ""
+msgstr "Okänd"
 
-#: src/signal.cpp:413
+#: signal.cpp:684
 msgid "Signal block mismatch"
-msgstr ""
+msgstr "Signalblockeringar matchar inte varandra"
 
-#: src/tokenizer.cpp:26
+#: tokenizer.cpp:32
 msgid "Unexpected end of string, quotes are not balanced"
-msgstr ""
+msgstr "Oväntat slut på textsträng, citationstecknen är inte balanserade"
 
-#: src/tokenizer.cpp:29
+#: tokenizer.cpp:37
 msgid "Unexpected end of string, parenthesis do not match"
-msgstr ""
+msgstr "Oväntat slut på textsträng, paranteserna är inte balanserade"
 
-#: src/tokenizer.cpp:32
+#: src/tokenizer.cpp:32 tokenizer.cpp:42
+#, fuzzy
 msgid "Unexpected end of string, square brackets do not match"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Oväntat slut på textsträng, paranteserna är inte balanserade"
 
 #: src/tokenizer.cpp:35
 msgid "Unexpected end of string, incomplete escape sequence"
 msgstr ""
 
-#: src/tokenizer.cpp:38
+#: tokenizer.cpp:48
 msgid "Invalid input/output redirection"
-msgstr ""
+msgstr "Ogiltig IO dirigering"
 
-#: src/tokenizer.cpp:41
+#: src/tokenizer.cpp:41 tokenizer.cpp:53
+#, fuzzy
 msgid "Cannot use stdin (fd 0) as pipe output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kan inte skicka rördata till filidentifierare 0"
 
-#: src/wgetopt.cpp:246
+#: wgetopt.cpp:638
 #, c-format
 msgid "%ls: Invalid option -- %lc\n"
-msgstr ""
+msgstr "%ls: Ogiltigt flagga -- %lc\n"
 
-#: src/wgetopt.cpp:277
+#: wgetopt.cpp:676
 #, c-format
 msgid "%ls: Option requires an argument -- %lc\n"
-msgstr ""
+msgstr "%ls: Flaggan kräver ett argument -- %lc\n"
 
-#: src/wgetopt.cpp:304
+#: wgetopt.cpp:560
 #, c-format
 msgid "%ls: Option '--%ls' doesn't allow an argument\n"
-msgstr ""
+msgstr "%ls: Flaggan '--%ls' tar inget argument\n"
 
-#: src/wgetopt.cpp:308
+#: wgetopt.cpp:565
 #, c-format
 msgid "%ls: Option '%lc%ls' doesn't allow an argument\n"
-msgstr ""
+msgstr "%ls: Flaggan '%lc%ls' tar inget argument\n"
 
-#: src/wgetopt.cpp:320
+#: wgetopt.cpp:579
 #, c-format
 msgid "%ls: Option '%ls' requires an argument\n"
-msgstr ""
+msgstr "%ls: Flaggan '%ls' kräver ett argument\n"
 
-#: src/wgetopt.cpp:383
+#: wgetopt.cpp:536
 #, c-format
 msgid "%ls: Option '%ls' is ambiguous\n"
-msgstr ""
+msgstr "%ls: Flaggan '%ls' är tvetydig\n"
 
-#: src/wgetopt.cpp:402
+#: wgetopt.cpp:607
 #, c-format
 msgid "%ls: Unrecognized option '--%ls'\n"
-msgstr ""
+msgstr "%ls: Okänd flagga '--%ls'\n"
 
-#: src/wgetopt.cpp:405
+#: wgetopt.cpp:611
 #, c-format
 msgid "%ls: Unrecognized option '%lc%ls'\n"
-msgstr ""
+msgstr "%ls: Okänd flagga '%lc%ls'\n"
 
-#: src/wildcard.cpp:27 /tmp/fish/implicit/share/completions/journalctl.fish:2
+#: wildcard.cpp:58
 msgid "Executable"
-msgstr ""
+msgstr "Program"
 
-#: src/wildcard.cpp:29
+#: wildcard.cpp:62
 msgid "Executable link"
-msgstr ""
+msgstr "Länk till program"
 
-#: src/wildcard.cpp:31 /tmp/fish/implicit/share/completions/fossil.fish:6
-#: /tmp/fish/implicit/share/completions/fossil.fish:90
-#: /tmp/fish/implicit/share/completions/git.fish:87
-#: /tmp/fish/implicit/share/completions/git.fish:133
-#: /tmp/fish/implicit/share/completions/git.fish:137
-#: /tmp/fish/implicit/share/completions/git.fish:208
-#: /tmp/fish/implicit/share/completions/git.fish:268
-#: /tmp/fish/implicit/share/completions/git.fish:269
+#: wildcard.cpp:67 share/completions/git.fish:178
 msgid "File"
-msgstr ""
+msgstr "Fil"
 
-#: src/wildcard.cpp:33
+#: wildcard.cpp:71
 msgid "Character device"
-msgstr ""
+msgstr "Teckenenhet"
 
-#: src/wildcard.cpp:35
+#: wildcard.cpp:75
 msgid "Block device"
-msgstr ""
+msgstr "Blockenhet"
 
-#: src/wildcard.cpp:37
+#: wildcard.cpp:79
 msgid "Fifo"
-msgstr ""
+msgstr "Fifo"
 
-#: src/wildcard.cpp:39
+#: wildcard.cpp:83
 msgid "Symbolic link"
-msgstr ""
+msgstr "Symbolisk länk"
 
-#: src/wildcard.cpp:41
+#
+#: wildcard.cpp:87
 msgid "Symbolic link to directory"
-msgstr ""
+msgstr "Symboliska länk till katalog"
 
-#: src/wildcard.cpp:43
+#: wildcard.cpp:91
 msgid "Rotten symbolic link"
-msgstr ""
+msgstr "Rutten symbolisk länk"
 
-#: src/wildcard.cpp:45
+#: wildcard.cpp:95
 msgid "Symbolic link loop"
-msgstr ""
+msgstr "Slinga av symboliska länkar"
 
-#: src/wildcard.cpp:47
+#: wildcard.cpp:99
 msgid "Socket"
-msgstr ""
+msgstr "Uttag (socket)"
 
-#: src/wildcard.cpp:49
-#: /tmp/fish/explicit/share/functions/__fish_complete_directories.fish:1
-#: /tmp/fish/implicit/share/completions/ruby.fish:22
+#: wildcard.cpp:103 share/completions/ruby.fish:23
+#: share/functions/__fish_complete_directories.fish:8
 msgid "Directory"
-msgstr ""
+msgstr "Katalog"
 
 #: src/wutil.cpp:146
 #, c-format
@@ -1874,27 +2018,31 @@ msgstr ""
 msgid "%ls: Expected argument for option %ls\n"
 msgstr ""
 
-#: src/builtin.h:41
+#: builtin.h:37
 #, c-format
 msgid ""
 "%ls: Invalid combination of options,\n"
 "%ls\n"
 msgstr ""
+"%ls: Ogiltig kombination av flaggor,\n"
+"%ls\n"
 
-#: src/builtin.h:45
+#: builtin.h:42
 #, c-format
 msgid "%ls: Variable scope can only be one of universal, global and local\n"
 msgstr ""
+"%ls: En variabels definitionsområde kan bara vara en av universal, global "
+"och lokal\n"
 
-#: src/builtin.h:48
+#: builtin.h:47
 #, c-format
 msgid "%ls: Variable can't be both exported and unexported\n"
-msgstr ""
+msgstr "%ls: Variabel kan inte vara både exporterad och oexporterad\n"
 
-#: src/builtin.h:51
+#: builtin.h:52
 #, c-format
 msgid "%ls: Unknown option '%ls'\n"
-msgstr ""
+msgstr "%ls: Okänd flagga '%ls'\n"
 
 #: src/builtin.h:54
 #, c-format
@@ -1926,15 +2074,15 @@ msgstr ""
 msgid "%ls: mode name '%ls' is not valid. See `help identifiers`.\n"
 msgstr ""
 
-#: src/builtin.h:66
+#: builtin.cpp:3827 builtin_complete.cpp:551 builtin.h:83
 #, c-format
 msgid "%ls: Too many arguments\n"
-msgstr ""
+msgstr "%ls: För många argument\n"
 
-#: src/builtin.h:69
+#: builtin.h:95
 #, c-format
 msgid "%ls: Argument '%ls' is not a number\n"
-msgstr ""
+msgstr "%ls: Argumentet '%ls' är inte ett nummer\n"
 
 #: src/builtin.h:72
 #, c-format
@@ -1946,57 +2094,66 @@ msgstr ""
 msgid "%ls: Subcommand '%ls' is not valid\n"
 msgstr ""
 
-#: src/builtin.h:76
+#: builtin.cpp:84
 #, c-format
 msgid "Send job %d, '%ls' to foreground\n"
-msgstr ""
+msgstr "Skicka job %d, '%ls' till förgrunden\n"
 
-#: src/exec.h:12
+#: exec.h:21
 msgid "An error occurred while setting up pipe"
-msgstr ""
+msgstr "Ett fel inträffade under skapandet av ett rör"
 
-#: src/parse_constants.h:225
+#: src/parse_constants.h:225 parse_constants.h:185
 #, c-format
 msgid ""
 "The function '%ls' calls itself immediately, which would result in an "
 "infinite loop."
 msgstr ""
 
-#: src/parse_constants.h:229
+#: src/parse_constants.h:229 parse_constants.h:189
 msgid ""
 "The function call stack limit has been exceeded. Do you have an accidental "
 "infinite loop?"
 msgstr ""
 
-#: src/parse_constants.h:233
+#: parse_constants.h:198
 #, c-format
 msgid "Illegal command name '%ls'"
-msgstr ""
+msgstr "Ogiltigt kommandonamn '%ls'"
 
-#: src/parse_constants.h:236
+#: parse_constants.h:201
 #, c-format
 msgid "Unknown builtin '%ls'"
-msgstr ""
+msgstr "Okänt inbyggt kommando '%ls'"
 
-#: src/parse_constants.h:239
-#, c-format
+#: src/parse_constants.h:239 parse_constants.h:204
+#, fuzzy, c-format
 msgid "Unable to expand variable name '%ls'"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ogiltigt variabelnamn '%ls'"
 
-#: src/parse_constants.h:242
-#, c-format
+#: src/parse_constants.h:242 parse_constants.h:207
+#, fuzzy, c-format
 msgid "Unable to find a process '%ls'"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Misslyckades med att exekvera processen '%ls'"
 
-#: src/parse_constants.h:245
-#, c-format
+#: src/parse_constants.h:245 parse_constants.h:210
+#, fuzzy, c-format
 msgid "Illegal file descriptor in redirection '%ls'"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ogiltig filidentifierare '%ls'"
 
-#: src/parse_constants.h:248
+#: parse_constants.h:213
 #, c-format
 msgid "No matches for wildcard '%ls'. See `help expand`."
-msgstr ""
+msgstr "Ingen träff för jokerteckenmönster '%ls' Se `help expand`."
 
 #: src/parse_constants.h:251
 msgid "'break' while not inside of loop"
@@ -2075,29 +2232,6 @@ msgstr ""
 msgid "Unsupported use of '='. In fish, please use 'set %ls %ls'."
 msgstr ""
 
-#: /tmp/fish/explicit/share/completions/emerge.fish:1
-#: /tmp/fish/explicit/share/completions/emerge.fish:4
-msgid "All base system packages"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:2
-#: /tmp/fish/explicit/share/completions/emerge.fish:5
-#: /tmp/fish/explicit/share/completions/emerge.fish:6
-msgid "All packages in world"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:3
-#: /tmp/fish/implicit/share/completions/aura.fish:90
-#: /tmp/fish/implicit/share/completions/aura.fish:95
-#: /tmp/fish/implicit/share/completions/pacaur.fish:72
-#: /tmp/fish/implicit/share/completions/pacaur.fish:77
-#: /tmp/fish/implicit/share/completions/pacman.fish:50
-#: /tmp/fish/implicit/share/completions/pacman.fish:55
-#: /tmp/fish/implicit/share/completions/yaourt.fish:69
-#: /tmp/fish/implicit/share/completions/yaourt.fish:76
-msgid "Installed package"
-msgstr ""
-
 #: /tmp/fish/explicit/share/completions/emerge.fish:7
 msgid "Packages that are linked to preserved libs"
 msgstr ""
@@ -2106,151 +2240,247 @@ msgstr ""
 msgid "Packages that contain kernel modules"
 msgstr ""
 
-#: /tmp/fish/explicit/share/completions/emerge.fish:9
-msgid "Usage overview of emerge"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:10
-msgid "Help on subject system"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:11
-msgid "Help on subject config"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:12
-msgid "Help on subject sync"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:13
-msgid "Use colors in output"
-msgstr ""
-
-#: /tmp/fish/explicit/share/completions/emerge.fish:14
-msgid "Don't use colors in output"
-msgstr ""
-
 #: /tmp/fish/explicit/share/completions/emerge.fish:15
+#, fuzzy
 msgid "Pull in build time dependencies"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa byggberoenden"
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:16
+#, fuzzy
 msgid "Don't pull in build time dependencies"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga efter extra beroenden"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:1
+#: share/completions/equery.fish:38
+#, fuzzy
 msgid "list all packages owning file(s)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla paket som äger filer"
 
-#: /tmp/fish/explicit/share/completions/equery.fish:2
+#: share/completions/equery.fish:39
 msgid "check MD5sums and timestamps of package"
-msgstr ""
+msgstr "Kontrollera MD5-summor och tidsstämplar på paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:3
+#: share/completions/equery.fish:40
+#, fuzzy
 msgid "list all packages depending on specified package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paket som beror på"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:4
+#: share/completions/equery.fish:41
+#, fuzzy
 msgid "display a dependency tree for package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa beroenden för paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:5
+#: share/completions/equery.fish:42
+#, fuzzy
 msgid "list files owned by package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filer i paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:6
+#: share/completions/equery.fish:43
+#, fuzzy
 msgid "list all packages with specified useflag"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga ett (oinstallerat) paket i angiven fil"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:7
+#: share/completions/equery.fish:44
+#, fuzzy
 msgid "list all packages matching pattern"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista innehåll av paket som matchar mönster"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:8
+#: share/completions/equery.fish:45
+#, fuzzy
 msgid "print size of files contained in package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paketets triggerskript"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:9
+#: share/completions/equery.fish:46
+#, fuzzy
 msgid "display USE flags for package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:10
+#: share/completions/equery.fish:47
+#, fuzzy
 msgid "print full path to ebuild for package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa full sökväg till källkod"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:1
+#: share/completions/gem.fish:12
 msgid "Build a gem from a gemspec"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:2
+#: share/completions/gem.fish:13
 msgid "Adjust RubyGems certificate settings"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:3
+#: share/completions/gem.fish:14
+#, fuzzy
 msgid "Check installed gems"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga installerat paket"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:4
+#: share/completions/gem.fish:15
+#, fuzzy
 msgid "Cleanup old versions of installed gems in the local repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:5
+#: share/completions/gem.fish:16
+#, fuzzy
 msgid "Display the contents of the installed gems"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa låtsasinstallationsutdata i tabellform"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:6
+#: share/completions/gem.fish:17
+#, fuzzy
 msgid "Show the dependencies of an installed gem"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Verifiera inte beroenden före paketen avinstalleras"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:7
+#: share/completions/gem.fish:18
+#, fuzzy
 msgid "Display RubyGems environmental information"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppdateringsinformation"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:8
+#: share/completions/gem.fish:19
+#, fuzzy
 msgid "Provide help on the 'gem' command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hjälp för det angivna kommandot"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:9
+#: share/completions/gem.fish:20
+#, fuzzy
 msgid "Install a gem into the local repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Checka in filer till förråd"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:10
+#: share/completions/gem.fish:21
 msgid "Display all gems whose name starts with STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:11
+#: share/completions/gem.fish:22
+#, fuzzy
 msgid "Query gem information in local or remote repositories"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa information om lokal eller fjärrelement"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:12
+#: share/completions/gem.fish:23
 msgid "Generates RDoc for pre-installed gems"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:13
+#: share/completions/gem.fish:24
 msgid "Display all gems whose name contains STRING"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:14
+#: share/completions/gem.fish:25
+#, fuzzy
 msgid "Display gem specification (in yaml)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa senaste ändringsdatum för fil"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:15
+#: share/completions/gem.fish:26
+#, fuzzy
 msgid "Uninstall a gem from the local repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort ett inlägg från förråd"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:16
+#: share/completions/gem.fish:27
+#, fuzzy
 msgid "Unpack an installed gem to the current directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:17
+#: share/completions/gem.fish:28
 msgid "Update the named gem (or all installed gems) in the local repository"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:18
+#: share/completions/gem.fish:87
+#, fuzzy
 msgid "display the remote gem servers"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fil att hämta servrar från"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:19
+#: share/completions/gem.fish:92
 msgid "show some examples of usage"
 msgstr ""
 
@@ -2644,72 +2874,73 @@ msgstr ""
 msgid "Check, then resync"
 msgstr ""
 
-#: /tmp/fish/explicit/share/completions/set.fish:1
+#: share/completions/set.fish:79
 msgid "Locale"
-msgstr ""
+msgstr "Lokal"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:1
-#: /tmp/fish/explicit/share/completions/telnet.fish:6
+#: share/completions/telnet.fish:9 share/completions/telnet.fish:14
 msgid "Specifies an 8-bit data path"
-msgstr ""
+msgstr "Anger en 8-bitars dataväg"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:2
+#: share/completions/telnet.fish:10
 msgid "Do not try to negotiate TELNET BINARY option"
-msgstr ""
+msgstr "Försök inte förhandla TELNET BINARY-flaggan"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:3
+#: share/completions/telnet.fish:11
 msgid "Stops any character from being recognized as an escape character"
-msgstr ""
+msgstr "Hindra alla tecken från att kännas igen som specialsekvens"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:4
+#: share/completions/telnet.fish:12
 msgid "Use local Kerberos authentication, if possible"
-msgstr ""
+msgstr "Använd lokal kerberosautentisering, om möjligt"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:5
+#: share/completions/telnet.fish:13
 msgid "Specifies no automatic login to remote system"
-msgstr ""
+msgstr "Försök inte logga in automatiskt på fjärrsystem"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:7
+#: share/completions/telnet.fish:15
 msgid "Attempt automatic login"
-msgstr ""
+msgstr "Försök logga in automatiskt på fjärrsystem"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:8
+#: share/completions/telnet.fish:16
 msgid "Disables reading user's .telnetrc"
-msgstr ""
+msgstr "Inaktivera inläsning av användarens .telnetrc"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:9
+#: share/completions/telnet.fish:17
 msgid "Sets debug mode"
-msgstr ""
+msgstr "Väljer debugnivå"
 
 #: /tmp/fish/explicit/share/completions/telnet.fish:10
+#: share/completions/telnet.fish:18
 msgid "Sets IP TOS"
 msgstr ""
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:11
+#: share/completions/telnet.fish:19
 msgid "Disables specified type of authentication"
-msgstr ""
+msgstr "Inaktivera angivna autentiseringstypen"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:12
+#: share/completions/telnet.fish:20
 msgid "User login"
-msgstr ""
+msgstr "Användarinloggning"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:13
+#: share/completions/telnet.fish:21
 msgid "Log to tracefile"
-msgstr ""
+msgstr "Logga till spårfil"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:14
+#: share/completions/telnet.fish:22
 msgid "Turn on encryption"
-msgstr ""
+msgstr "Slå på kryptering"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:15
+#: share/completions/telnet.fish:23
 msgid "User interface similar to rlogin"
-msgstr ""
+msgstr "Användargränssnitt liknande rlogin"
 
-#: /tmp/fish/explicit/share/completions/telnet.fish:16
+#: share/completions/telnet.fish:24
 msgid "Use Kerberos realm for authentication"
-msgstr ""
+msgstr "Använd Kerberos-realm för autentisering"
 
 #: /tmp/fish/explicit/share/completions/update-eix-remote.fish:1
+#: share/completions/update-eix-remote.fish:16
 msgid "Remove all temporarily added virtual overlays from the eix database"
 msgstr ""
 
@@ -3299,10 +3530,16 @@ msgid "%s %s: Unexpected argument -- '%s'\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
+#: share/functions/alias.fish:42
+#, fuzzy
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%s: Den tomma strängen är inte ett tillåtet variabelnamn\\n"
 
 #: /tmp/fish/explicit/share/functions/alias.fish:2
+#: share/functions/alias.fish:45
 msgid "%s: Body cannot be empty\\n"
 msgstr ""
 
@@ -3476,9 +3713,10 @@ msgstr ""
 msgid "SELinux context for the root inode of the filesystem"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_config_interactive.fish:1
+#
+#: share/functions/__fish_config_interactive.fish:34
 msgid "Welcome to fish, the friendly interactive shell"
-msgstr ""
+msgstr "Välkommen till fish, det vänliga interaktiva skalet"
 
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:1
 #: /tmp/fish/explicit/share/functions/fish_md5.fish:2
@@ -3493,27 +3731,16 @@ msgstr ""
 msgid "%s: The --short flag is required and must be a single character\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/__fish_print_packages.fish:1
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:31
-#: /tmp/fish/implicit/share/completions/apt.fish:4
-#: /tmp/fish/implicit/share/completions/apt-get.fish:3
-#: /tmp/fish/implicit/share/completions/aptitude.fish:3
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:3
-#: /tmp/fish/implicit/share/completions/dpkg-reconfigure.fish:1
-#: /tmp/fish/implicit/share/completions/pkg_delete.fish:1
-#: /tmp/fish/implicit/share/completions/pkg_info.fish:1
-#: /tmp/fish/implicit/share/completions/prt-get.fish:1
-#: /tmp/fish/implicit/share/completions/prt-get.fish:63
-#: /tmp/fish/implicit/share/completions/wajig.fish:3
-#: /tmp/fish/implicit/share/completions/zypper.fish:1
+#: share/functions/__fish_print_packages.fish:13
 msgid "Package"
-msgstr ""
+msgstr "Paket"
 
 #: /tmp/fish/explicit/share/functions/fish_update_completions.fish:1
 msgid "python executable not found"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:2
+#: share/functions/funced.fish:96
 msgid "Editing failed or was cancelled"
 msgstr ""
 
@@ -3522,32 +3749,46 @@ msgid "Editor exited but the function was not modified"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:4
+#: share/functions/funced.fish:103
 msgid "Edit the file again\\? [Y/n]"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:5
+#: share/functions/funced.fish:110
+#, fuzzy
 msgid "Cancelled function editing"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"funktionsdefinition-block"
 
-#: /tmp/fish/explicit/share/functions/funcsave.fish:1
+#: share/functions/funcsave.fish:26
 msgid "%s: Could not create configuration directory\\n"
-msgstr ""
+msgstr "%s: Kunde inte skapa konfigurationskatalogen\\n"
 
-#: /tmp/fish/explicit/share/functions/funcsave.fish:2
+#: share/functions/funcsave.fish:36
 msgid "%s: Unknown function '%s'\\n"
-msgstr ""
+msgstr "%s: Okänd funktion '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/help.fish:1
+#: share/functions/help.fish:76
 msgid "%s: Could not find a web browser.\\n"
-msgstr ""
+msgstr "%s: Kunde inte hitta en webbrowser\\n"
 
-#: /tmp/fish/explicit/share/functions/help.fish:3
+#: /tmp/fish/explicit/share/functions/help.fish:3 share/functions/help.fish:129
+#, fuzzy
 msgid "help: Help is being displayed in your default browser.\\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"help: Hjälp visas i ditt standardsurfprogram"
 
-#: /tmp/fish/explicit/share/functions/help.fish:4
+#: /tmp/fish/explicit/share/functions/help.fish:4 share/functions/help.fish:132
+#, fuzzy
 msgid "help: Help is being displayed in %s.\\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"help: Hjälp visas i %s\\n"
 
 #: /tmp/fish/explicit/share/functions/history.fish:1
 msgid "%ls: you cannot use any options with the %ls command\\n"
@@ -3578,10 +3819,10 @@ msgstr ""
 msgid "%s: Too many arguments"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/nextd.fish:1
-#: /tmp/fish/explicit/share/functions/prevd.fish:1
+#: share/functions/nextd.fish:28
 msgid "%s: The number of positions to skip must be a non-negative integer\\n"
 msgstr ""
+"%s: Antalet positioner att hoppa över måste vara ett positivt heltal\\n"
 
 #: /tmp/fish/explicit/share/functions/open.fish:1
 msgid "No open utility found. Try installing \"xdg-open\" or \"xdg-utils\"."
@@ -3599,55 +3840,66 @@ msgstr ""
 msgid "%s: These flags are not allowed by fish realpath: '%s'"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/seq.fish:1
+#: share/functions/seq.fish:31
 msgid "%s: Expected 1, 2 or 3 arguments, got %d\\n"
-msgstr ""
+msgstr "%s: Förväntade 1, 2 eller 3 argument, fick %d\\n"
 
-#: /tmp/fish/explicit/share/functions/seq.fish:2
+#: share/functions/seq.fish:38
 msgid "%s: '%s' is not a number\\n"
-msgstr ""
+msgstr "%s: '%s' är inte ett nummer\\n"
 
-#: /tmp/fish/explicit/share/functions/setenv.fish:1
-#: /tmp/fish/explicit/share/functions/umask.fish:3
+#: share/functions/umask.fish:212
 msgid "%s: Too many arguments\\n"
-msgstr ""
+msgstr "%s: För många argument\\n"
 
 #: /tmp/fish/explicit/share/functions/setenv.fish:2
 msgid "%s: Variable name must contain alphanumeric characters\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/type.fish:1
+#: share/functions/type.fish:90
 msgid "%s is a function with definition\\n"
-msgstr ""
+msgstr "%s är en funktion med definitionen\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:2
+#: /tmp/fish/explicit/share/functions/type.fish:2 share/functions/type.fish:94
+#, fuzzy
 msgid "function"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"funktion\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:3
+#: share/functions/type.fish:107
 msgid "%s is a builtin\\n"
-msgstr ""
+msgstr "%s är ett inbyggt kommando\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:4
+#: /tmp/fish/explicit/share/functions/type.fish:4 share/functions/type.fish:110
+#, fuzzy
 msgid "builtin"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"inbyggt kommando\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:5
+#: share/functions/type.fish:130
 msgid "%s is %s\\n"
-msgstr ""
+msgstr "%s är %s\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:6
+#: /tmp/fish/explicit/share/functions/type.fish:6 share/functions/type.fish:133
+#, fuzzy
 msgid "file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"fil\\n"
 
-#: /tmp/fish/explicit/share/functions/type.fish:7
+#: share/functions/type.fish:144
 msgid "%s: Could not find '%s'\\n"
-msgstr ""
+msgstr "%s: Kunde inte hitta '%s'\\n"
 
-#: /tmp/fish/explicit/share/functions/umask.fish:1
-#: /tmp/fish/explicit/share/functions/umask.fish:2
+#: share/functions/umask.fish:11 share/functions/umask.fish:69
+#: share/functions/umask.fish:76
 msgid "%s: Invalid mask '%s'\\n"
-msgstr ""
+msgstr "%s: Ogiltigt mask '%s'\\n"
 
 #: /tmp/fish/explicit/share/functions/_validate_int.fish:1
 msgid "%s: Value '%s' for flag '%s' is not an integer\\n"
@@ -3661,21 +3913,30 @@ msgstr ""
 msgid "%s: Value '%s' for flag '%s' greater than max allowed of '%s'\\n"
 msgstr ""
 
-#: /tmp/fish/explicit/share/functions/vared.fish:1
+#: share/functions/funced.fish:24 share/functions/nextd.fish:22
+#: share/functions/prevd.fish:22 share/functions/vared.fish:15
 msgid "%s: Unknown option %s\\n"
-msgstr ""
+msgstr "%s: Okänd flagga '%s'\\n"
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
+#: share/functions/vared.fish:40
+#, fuzzy
 msgid ""
 "%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
 "of %s\\n"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"%s: %s är en arrayvariabel. Använd %svared%s %s[n] för att redigera det n:te "
+"elementet av %s\\n"
 
-#: /tmp/fish/explicit/share/functions/vared.fish:3
+#: share/functions/vared.fish:44
 msgid ""
 "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%svared%s "
 "VARIABLE\\n"
 msgstr ""
+"%s: Förväntade exakt ett argument, fick %s\\n\\nSynopsis:\\n\\t%svared%s "
+"VARIABEL\\n"
 
 #: /tmp/fish/implicit/share/config.fish:1
 msgid "Update PATH when fish_user_paths changes"
@@ -3783,11 +4044,9 @@ msgstr ""
 msgid "Accept reason"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ack.fish:1
-#: /tmp/fish/implicit/share/completions/grep.fish:23
-#: /tmp/fish/implicit/share/completions/sort.fish:3
+#: share/functions/__fish_complete_grep.fish:24
 msgid "Ignore case"
-msgstr ""
+msgstr "Ignorera skiftläge"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:2
 msgid "Ignore case when pattern contains no uppercase"
@@ -3865,20 +4124,17 @@ msgstr ""
 msgid "Don't show column number of first match"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ack.fish:21
-#: /tmp/fish/implicit/share/completions/grep.fish:1
+#: share/functions/__fish_complete_grep.fish:2
 msgid "Print NUM lines of trailing context"
-msgstr ""
+msgstr "Visa NUM rader av följande sammanhang"
 
-#: /tmp/fish/implicit/share/completions/ack.fish:22
-#: /tmp/fish/implicit/share/completions/grep.fish:3
+#: share/functions/__fish_complete_grep.fish:4
 msgid "Print NUM lines of leading context"
-msgstr ""
+msgstr "Visa NUM rader av inledande sammanhang"
 
-#: /tmp/fish/implicit/share/completions/ack.fish:23
-#: /tmp/fish/implicit/share/completions/grep.fish:4
+#: share/functions/__fish_complete_grep.fish:5
 msgid "Print NUM lines of context"
-msgstr ""
+msgstr "Visa NUM rader av sammanhang"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:24
 msgid "Print null byte as separator between filenames"
@@ -3988,21 +4244,14 @@ msgstr ""
 msgid "No descending into subdirectories"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ack.fish:51
-#: /tmp/fish/implicit/share/completions/file.fish:7
-#: /tmp/fish/implicit/share/completions/find.fish:2
-#: /tmp/fish/implicit/share/completions/ls.fish:16
-#: /tmp/fish/implicit/share/completions/ls.fish:17
-#: /tmp/fish/implicit/share/completions/ls.fish:71
-#: /tmp/fish/implicit/share/completions/ls.fish:72
-#: /tmp/fish/implicit/share/completions/s3cmd.fish:129
+#: share/functions/__fish_complete_ls.fish:19
+#: share/functions/__fish_complete_ls.fish:20
 msgid "Follow symlinks"
-msgstr ""
+msgstr "Följ symboliska länkar"
 
-#: /tmp/fish/implicit/share/completions/ack.fish:52
-#: /tmp/fish/implicit/share/completions/ls.fish:62
+#: share/functions/__fish_complete_ls.fish:105
 msgid "Don't follow symlinks"
-msgstr ""
+msgstr "Följ inte symboliska länkar"
 
 #: /tmp/fish/implicit/share/completions/ack.fish:53
 msgid "Include only recognized files"
@@ -4130,133 +4379,13 @@ msgstr ""
 msgid "<dir> path to ACPI info (/proc/acpi)"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/acpi.fish:14
-#: /tmp/fish/implicit/share/completions/and.fish:1
-#: /tmp/fish/implicit/share/completions/apropos.fish:2
-#: /tmp/fish/implicit/share/completions/apt-build.fish:1
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:1
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:1
-#: /tmp/fish/implicit/share/completions/apt-config.fish:1
-#: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:1
-#: /tmp/fish/implicit/share/completions/apt-file.fish:1
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:1
-#: /tmp/fish/implicit/share/completions/apt-get.fish:4
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:1
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:1
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:4
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:1
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:1
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:1
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:1
-#: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:1
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:1
-#: /tmp/fish/implicit/share/completions/apt-src.fish:1
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:1
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:1
-#: /tmp/fish/implicit/share/completions/asp.fish:6
-#: /tmp/fish/implicit/share/completions/bc.fish:7
-#: /tmp/fish/implicit/share/completions/bd.fish:4
-#: /tmp/fish/implicit/share/completions/bg.fish:1
-#: /tmp/fish/implicit/share/completions/bind.fish:4
-#: /tmp/fish/implicit/share/completions/block.fish:1
-#: /tmp/fish/implicit/share/completions/break.fish:1
-#: /tmp/fish/implicit/share/completions/builtin.fish:1
-#: /tmp/fish/implicit/share/completions/cd.fish:1
-#: /tmp/fish/implicit/share/completions/chgrp.fish:9
-#: /tmp/fish/implicit/share/completions/chmod.fish:8
-#: /tmp/fish/implicit/share/completions/chown.fish:9
-#: /tmp/fish/implicit/share/completions/command.fish:1
-#: /tmp/fish/implicit/share/completions/commandline.fish:1
-#: /tmp/fish/implicit/share/completions/complete.fish:13
-#: /tmp/fish/implicit/share/completions/configure.fish:1
-#: /tmp/fish/implicit/share/completions/continue.fish:1
-#: /tmp/fish/implicit/share/completions/cowsay.fish:3
-#: /tmp/fish/implicit/share/completions/cowthink.fish:3
-#: /tmp/fish/implicit/share/completions/cut.fish:8
-#: /tmp/fish/implicit/share/completions/dconf.fish:10
-#: /tmp/fish/implicit/share/completions/diff.fish:25
-#: /tmp/fish/implicit/share/completions/du.fish:18
-#: /tmp/fish/implicit/share/completions/echo.fish:5
-#: /tmp/fish/implicit/share/completions/entr.fish:3
-#: /tmp/fish/implicit/share/completions/env.fish:5
-#: /tmp/fish/implicit/share/completions/exec.fish:1
-#: /tmp/fish/implicit/share/completions/exit.fish:1
-#: /tmp/fish/implicit/share/completions/fg.fish:1
-#: /tmp/fish/implicit/share/completions/find.fish:6
-#: /tmp/fish/implicit/share/completions/fish.fish:2
-#: /tmp/fish/implicit/share/completions/fish_indent.fish:1
-#: /tmp/fish/implicit/share/completions/functions.fish:4
-#: /tmp/fish/implicit/share/completions/fusermount.fish:2
-#: /tmp/fish/implicit/share/completions/gpg.fish:50
-#: /tmp/fish/implicit/share/completions/gprof.fish:30
-#: /tmp/fish/implicit/share/completions/grep.fish:21
-#: /tmp/fish/implicit/share/completions/grub-file.fish:31
-#: /tmp/fish/implicit/share/completions/gunzip.fish:3
-#: /tmp/fish/implicit/share/completions/gzip.fish:3
-#: /tmp/fish/implicit/share/completions/i3-msg.fish:3
-#: /tmp/fish/implicit/share/completions/iconv.fish:7
-#: /tmp/fish/implicit/share/completions/id.fish:6
-#: /tmp/fish/implicit/share/completions/jobs.fish:1
-#: /tmp/fish/implicit/share/completions/less.fish:1
-#: /tmp/fish/implicit/share/completions/ln.fish:14
-#: /tmp/fish/implicit/share/completions/ls.fish:57
-#: /tmp/fish/implicit/share/completions/man.fish:24
-#: /tmp/fish/implicit/share/completions/mount.fish:2
-#: /tmp/fish/implicit/share/completions/mplayer.fish:4
-#: /tmp/fish/implicit/share/completions/mplayer.fish:8
-#: /tmp/fish/implicit/share/completions/mplayer.fish:34
-#: /tmp/fish/implicit/share/completions/msgfmt.fish:24
-#: /tmp/fish/implicit/share/completions/mv.fish:10
-#: /tmp/fish/implicit/share/completions/nice.fish:3
-#: /tmp/fish/implicit/share/completions/not.fish:1
-#: /tmp/fish/implicit/share/completions/or.fish:1
-#: /tmp/fish/implicit/share/completions/patch.fish:15
-#: /tmp/fish/implicit/share/completions/pine.fish:3
-#: /tmp/fish/implicit/share/completions/ps.fish:39
-#: /tmp/fish/implicit/share/completions/psub.fish:1
-#: /tmp/fish/implicit/share/completions/python2.fish:5
-#: /tmp/fish/implicit/share/completions/python3.fish:5
-#: /tmp/fish/implicit/share/completions/python.fish:5
-#: /tmp/fish/implicit/share/completions/random.fish:1
-#: /tmp/fish/implicit/share/completions/read.fish:1
-#: /tmp/fish/implicit/share/completions/return.fish:1
-#: /tmp/fish/implicit/share/completions/rmdir.fish:4
-#: /tmp/fish/implicit/share/completions/rpm.fish:1
-#: /tmp/fish/implicit/share/completions/rsync.fish:104
-#: /tmp/fish/implicit/share/completions/ruby.fish:7
-#: /tmp/fish/implicit/share/completions/scrot.fish:1
-#: /tmp/fish/implicit/share/completions/set_color.fish:8
-#: /tmp/fish/implicit/share/completions/set.fish:10
-#: /tmp/fish/implicit/share/completions/setsid.fish:5
-#: /tmp/fish/implicit/share/completions/sort.fish:22
-#: /tmp/fish/implicit/share/completions/sshfs.fish:9
-#: /tmp/fish/implicit/share/completions/status.fish:1
-#: /tmp/fish/implicit/share/completions/sudo.fish:11
-#: /tmp/fish/implicit/share/completions/su.fish:6
-#: /tmp/fish/implicit/share/completions/sylpheed.fish:3
-#: /tmp/fish/implicit/share/completions/test.fish:1
-#: /tmp/fish/implicit/share/completions/tex.fish:1
-#: /tmp/fish/implicit/share/completions/time.fish:7
-#: /tmp/fish/implicit/share/completions/top.fish:4
-#: /tmp/fish/implicit/share/completions/trap.fish:3
-#: /tmp/fish/implicit/share/completions/type.fish:1
-#: /tmp/fish/implicit/share/completions/ulimit.fish:14
-#: /tmp/fish/implicit/share/completions/umount.fish:3
-#: /tmp/fish/implicit/share/completions/uname.fish:17
-#: /tmp/fish/implicit/share/completions/valgrind.fish:2
-#: /tmp/fish/implicit/share/completions/vared.fish:1
-#: /tmp/fish/implicit/share/completions/wc.fish:6
-#: /tmp/fish/implicit/share/completions/wget.fish:2
-#: /tmp/fish/implicit/share/completions/which.fish:12
-#: /tmp/fish/implicit/share/completions/who.fish:18
-#: /tmp/fish/implicit/share/completions/xargs.fish:4
-#: /tmp/fish/implicit/share/completions/xprop.fish:1
-#: /tmp/fish/implicit/share/completions/xsel.fish:16
-#: /tmp/fish/implicit/share/completions/yum.fish:11
-#: /tmp/fish/implicit/share/completions/zcat.fish:2
-#: /tmp/fish/implicit/share/completions/zip.fish:30
+#: share/completions/configure.fish:1
+#: share/functions/__fish_complete_diff.fish:27
+#: share/functions/__fish_complete_grep.fish:22
+#: share/functions/__fish_complete_ls.fish:95
+#: share/functions/__fish_complete_tex.fish:4
 msgid "Display help and exit"
-msgstr ""
+msgstr "Visa hjälp och avsluta"
 
 #: /tmp/fish/implicit/share/completions/acpi.fish:15
 #: /tmp/fish/implicit/share/completions/dmesg.fish:17
@@ -4271,15 +4400,21 @@ msgstr ""
 msgid "Output version information and exit"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/adb.fish:1
+#: /tmp/fish/implicit/share/completions/adb.fish:1 share/completions/adb.fish:3
+#, fuzzy
 msgid "Test if adb has yet to be given the subcommand"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:2
+#: share/completions/adb.fish:12
 msgid "Run adb devices and parse output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:3
+#: share/completions/adb.fish:24
 msgid "Runs adb with any -s parameters already given on the command line"
 msgstr ""
 
@@ -4528,12 +4663,10 @@ msgstr ""
 msgid "Kick current connection from device side and make it reconnect."
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/adduser.fish:1
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:28
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:11
-#: /tmp/fish/implicit/share/completions/apt-config.fish:5
+#: share/completions/apt-cache.fish:29 share/completions/apt-cdrom.fish:12
+#: share/completions/apt-config.fish:6
 msgid "Specify config file"
-msgstr ""
+msgstr "Välj konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/adduser.fish:2
 msgid "Do not run passwd to set the password"
@@ -5752,531 +5885,373 @@ msgstr ""
 msgid "Unstar given packages on https://atom.io"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apm.fish:84
-#: /tmp/fish/implicit/share/completions/apropos.fish:11
-#: /tmp/fish/implicit/share/completions/apt-build.fish:27
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:27
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:10
-#: /tmp/fish/implicit/share/completions/apt-config.fish:4
-#: /tmp/fish/implicit/share/completions/apt-file.fish:11
-#: /tmp/fish/implicit/share/completions/apt.fish:6
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:14
-#: /tmp/fish/implicit/share/completions/apt-get.fish:46
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:12
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:2
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:11
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:7
-#: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:3
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:2
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:2
-#: /tmp/fish/implicit/share/completions/at.fish:1
-#: /tmp/fish/implicit/share/completions/atq.fish:1
-#: /tmp/fish/implicit/share/completions/atrm.fish:1
-#: /tmp/fish/implicit/share/completions/aura.fish:17
-#: /tmp/fish/implicit/share/completions/bc.fish:6
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:7
-#: /tmp/fish/implicit/share/completions/bzip2.fish:10
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:1
-#: /tmp/fish/implicit/share/completions/chgrp.fish:10
-#: /tmp/fish/implicit/share/completions/chmod.fish:9
-#: /tmp/fish/implicit/share/completions/chown.fish:10
-#: /tmp/fish/implicit/share/completions/chsh.fish:3
-#: /tmp/fish/implicit/share/completions/configure.fish:2
-#: /tmp/fish/implicit/share/completions/cut.fish:9
-#: /tmp/fish/implicit/share/completions/diff.fish:24
-#: /tmp/fish/implicit/share/completions/du.fish:19
-#: /tmp/fish/implicit/share/completions/env.fish:6
-#: /tmp/fish/implicit/share/completions/find.fish:14
-#: /tmp/fish/implicit/share/completions/fish.fish:3
-#: /tmp/fish/implicit/share/completions/fish_indent.fish:2
-#: /tmp/fish/implicit/share/completions/fusermount.fish:3
-#: /tmp/fish/implicit/share/completions/gphoto2.fish:17
-#: /tmp/fish/implicit/share/completions/gprof.fish:31
-#: /tmp/fish/implicit/share/completions/grep.fish:43
-#: /tmp/fish/implicit/share/completions/gunzip.fish:13
-#: /tmp/fish/implicit/share/completions/gzip.fish:13
-#: /tmp/fish/implicit/share/completions/iconv.fish:6
-#: /tmp/fish/implicit/share/completions/id.fish:7
-#: /tmp/fish/implicit/share/completions/less.fish:41
-#: /tmp/fish/implicit/share/completions/ls.fish:58
-#: /tmp/fish/implicit/share/completions/make.fish:19
-#: /tmp/fish/implicit/share/completions/modprobe.fish:9
-#: /tmp/fish/implicit/share/completions/mount.fish:1
-#: /tmp/fish/implicit/share/completions/mplayer.fish:35
-#: /tmp/fish/implicit/share/completions/msgfmt.fish:25
-#: /tmp/fish/implicit/share/completions/mv.fish:11
-#: /tmp/fish/implicit/share/completions/nice.fish:4
-#: /tmp/fish/implicit/share/completions/pacaur.fish:11
-#: /tmp/fish/implicit/share/completions/pacman.fish:10
-#: /tmp/fish/implicit/share/completions/patch.fish:30
-#: /tmp/fish/implicit/share/completions/perl.fish:36
-#: /tmp/fish/implicit/share/completions/ping.fish:26
-#: /tmp/fish/implicit/share/completions/pkg.fish:1
-#: /tmp/fish/implicit/share/completions/ps.fish:38
-#: /tmp/fish/implicit/share/completions/python2.fish:13
-#: /tmp/fish/implicit/share/completions/python3.fish:13
-#: /tmp/fish/implicit/share/completions/python.fish:14
-#: /tmp/fish/implicit/share/completions/rmdir.fish:5
-#: /tmp/fish/implicit/share/completions/rpm.fish:2
-#: /tmp/fish/implicit/share/completions/rsync.fish:103
-#: /tmp/fish/implicit/share/completions/ruby.fish:20
-#: /tmp/fish/implicit/share/completions/screen.fish:34
-#: /tmp/fish/implicit/share/completions/setsid.fish:4
-#: /tmp/fish/implicit/share/completions/sort.fish:23
-#: /tmp/fish/implicit/share/completions/sshfs.fish:1
-#: /tmp/fish/implicit/share/completions/su.fish:7
-#: /tmp/fish/implicit/share/completions/tar.fish:53
-#: /tmp/fish/implicit/share/completions/tex.fish:2
-#: /tmp/fish/implicit/share/completions/time.fish:8
-#: /tmp/fish/implicit/share/completions/top.fish:12
-#: /tmp/fish/implicit/share/completions/umount.fish:2
-#: /tmp/fish/implicit/share/completions/uname.fish:18
-#: /tmp/fish/implicit/share/completions/valgrind.fish:4
-#: /tmp/fish/implicit/share/completions/wc.fish:7
-#: /tmp/fish/implicit/share/completions/w.fish:5
-#: /tmp/fish/implicit/share/completions/wget.fish:1
-#: /tmp/fish/implicit/share/completions/which.fish:11
-#: /tmp/fish/implicit/share/completions/who.fish:19
-#: /tmp/fish/implicit/share/completions/xargs.fish:14
-#: /tmp/fish/implicit/share/completions/xsel.fish:18
-#: /tmp/fish/implicit/share/completions/yaourt.fish:11
-#: /tmp/fish/implicit/share/completions/yum.fish:19
-#: /tmp/fish/implicit/share/completions/zcat.fish:4
+#: share/completions/apm.fish:2 share/completions/apropos.fish:20
+#: share/completions/apt-build.fish:29 share/completions/apt-cache.fish:28
+#: share/completions/apt-cdrom.fish:11 share/completions/apt-config.fish:5
+#: share/completions/apt-file.fish:12 share/completions/apt-ftparchive.fish:15
+#: share/completions/apt-proxy-import.fish:3
+#: share/completions/apt-rdepends.fish:12
+#: share/completions/apt-show-source.fish:8
+#: share/completions/apt-sortpkgs.fish:4 share/completions/apt-zip-inst.fish:3
+#: share/completions/apt-zip-list.fish:3 share/completions/at.fish:2
+#: share/completions/atq.fish:2 share/completions/atrm.fish:2
+#: share/completions/perl.fish:41 share/functions/__fish_complete_diff.fish:26
+#: share/functions/__fish_complete_grep.fish:44
+#: share/functions/__fish_complete_ls.fish:96
+#: share/functions/__fish_complete_python.fish:15
+#: share/functions/__fish_complete_tex.fish:5
 msgid "Display version and exit"
-msgstr ""
+msgstr "Visa version och avsluta"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:85
+#: share/completions/apm.fish:3
 msgid "Print APM info"
-msgstr ""
+msgstr "Visa APM-information"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:86
+#: share/completions/apm.fish:4
 msgid "Print time remaining"
-msgstr ""
+msgstr "Visa kvarvarande tid"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:87
+#: share/completions/apm.fish:5
 msgid "Monitor status info"
-msgstr ""
+msgstr "Bevaka statusinformation"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:88
+#: share/completions/apm.fish:6
 msgid "Request APM standby mode"
-msgstr ""
+msgstr "Begär APM-standbyläge"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:89
+#: share/completions/apm.fish:7
 msgid "Request APM suspend mode"
-msgstr ""
+msgstr "Begär APM-suspendläge"
 
-#: /tmp/fish/implicit/share/completions/apm.fish:90
+#: share/completions/apm.fish:8
 msgid "APM status debugging info"
-msgstr ""
+msgstr "APM-status debuginformation"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:1
-msgid "whatis entry"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apropos.fish:3
+#: share/completions/apropos.fish:12
 msgid "Print debugging info"
-msgstr ""
+msgstr "Visa debuginformation"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:4
-#: /tmp/fish/implicit/share/completions/apt-file.fish:7
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:3
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:3
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:9
-#: /tmp/fish/implicit/share/completions/arp.fish:1
-#: /tmp/fish/implicit/share/completions/badblocks.fish:10
-#: /tmp/fish/implicit/share/completions/feh.fish:54
-#: /tmp/fish/implicit/share/completions/fuser.fish:11
-#: /tmp/fish/implicit/share/completions/gcc.fish:452
-#: /tmp/fish/implicit/share/completions/godoc.fish:22
-#: /tmp/fish/implicit/share/completions/grub-install.fish:10
-#: /tmp/fish/implicit/share/completions/makedepend.fish:11
-#: /tmp/fish/implicit/share/completions/mkdosfs.fish:20
-#: /tmp/fish/implicit/share/completions/mount.fish:3
-#: /tmp/fish/implicit/share/completions/mv.fish:9
-#: /tmp/fish/implicit/share/completions/ping.fish:25
-#: /tmp/fish/implicit/share/completions/python2.fish:12
-#: /tmp/fish/implicit/share/completions/python3.fish:12
-#: /tmp/fish/implicit/share/completions/python.fish:13
-#: /tmp/fish/implicit/share/completions/rmdir.fish:3
-#: /tmp/fish/implicit/share/completions/rpm.fish:4
-#: /tmp/fish/implicit/share/completions/ruby.fish:18
-#: /tmp/fish/implicit/share/completions/tar.fish:51
-#: /tmp/fish/implicit/share/completions/time.fish:6
-#: /tmp/fish/implicit/share/completions/umount.fish:4
-#: /tmp/fish/implicit/share/completions/valgrind.fish:6
-#: /tmp/fish/implicit/share/completions/vi.fish:8
-#: /tmp/fish/implicit/share/completions/wget.fish:9
-#: /tmp/fish/implicit/share/completions/zfs.fish:42
-#: /tmp/fish/implicit/share/completions/zfs.fish:87
-#: /tmp/fish/implicit/share/completions/zip.fish:13
-#: /tmp/fish/implicit/share/completions/zpool.fish:140
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:11
+#: share/completions/apropos.fish:13 share/completions/apt-file.fish:8
+#: share/completions/apt-listchanges.fish:4
+#: share/completions/apt-proxy-import.fish:4
+#: share/completions/apt-show-source.fish:10
+#: share/functions/__fish_complete_python.fish:14
+#: share/functions/__fish_complete_ssh.fish:59
+#: share/functions/__fish_complete_vi.fish:98
 msgid "Verbose mode"
-msgstr ""
+msgstr "Utförligt läge"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:5
+#: share/completions/apropos.fish:14
 msgid "Keyword as regex"
-msgstr ""
+msgstr "Nyckelord är ett reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:6
+#: share/completions/apropos.fish:15
 msgid "Keyword as wildcards"
-msgstr ""
+msgstr "Nyckelord har jokertecken"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:7
+#: share/completions/apropos.fish:16
 msgid "Keyword as exactly match"
-msgstr ""
+msgstr "Nyckelord är en exakt matchning"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:8
+#: share/completions/apropos.fish:17
 msgid "Search for other system"
-msgstr ""
+msgstr "Sök efter annat system"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:9
+#: share/completions/apropos.fish:18
 msgid "Specify man path"
-msgstr ""
+msgstr "Välj manualsökväg"
 
-#: /tmp/fish/implicit/share/completions/apropos.fish:10
+#: share/completions/apropos.fish:19
 msgid "Specify a configuration file"
-msgstr ""
+msgstr "Välj en konfigurationsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:2
+#: share/completions/apt-build.fish:4
 msgid "Update list of packages"
-msgstr ""
+msgstr "Updatera paketlista"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:3
-#: /tmp/fish/implicit/share/completions/pkg.fish:42
+#: share/completions/apt-build.fish:5
 msgid "Upgrade packages"
-msgstr ""
+msgstr "Upgradera paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:4
+#: share/completions/apt-build.fish:6
 msgid "Rebuild your system"
-msgstr ""
+msgstr "Återbygg systemet"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:5
+#: share/completions/apt-build.fish:7
 msgid "Build and install a new package"
-msgstr ""
+msgstr "Bygg och installera nytt paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:6
+#: share/completions/apt-build.fish:8
 msgid "Download and extract a source"
-msgstr ""
+msgstr "Nedladda och extrahera källkod"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:7
+#: share/completions/apt-build.fish:9
 msgid "Info on a package"
-msgstr ""
+msgstr "Visa info om paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:8
-#: /tmp/fish/implicit/share/completions/zypper.fish:19
+#: share/completions/apt-build.fish:10 share/completions/zypper.fish:45
 msgid "Remove packages"
-msgstr ""
+msgstr "Radera paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:9
+#: share/completions/apt-build.fish:11
 msgid "Erase built packages"
-msgstr ""
+msgstr "Radera byggda paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:10
+#: share/completions/apt-build.fish:12
 msgid "Build source without install"
-msgstr ""
+msgstr "Bygg källkod utan att installera"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:11
+#: share/completions/apt-build.fish:13
 msgid "Clean source directories"
-msgstr ""
+msgstr "Rengör källkodskataloger"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:12
+#: share/completions/apt-build.fish:14
 msgid "Update source and rebuild"
-msgstr ""
+msgstr "Uppdatera källkod och bygg om dem"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:13
+#: share/completions/apt-build.fish:15
 msgid "Update the repository"
-msgstr ""
+msgstr "Uppdatera förråd"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:14
+#: share/completions/apt-build.fish:16
 msgid "Do not use gcc wrapper"
-msgstr ""
+msgstr "Använd inte omslag (wrapper) kring gcc"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:15
+#: share/completions/apt-build.fish:17
 msgid "Remove build-dep"
-msgstr ""
+msgstr "Ta bort bygg-beroenden"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:16
+#: share/completions/apt-build.fish:18
 msgid "Do not download source"
-msgstr ""
+msgstr "Ladda inte ner källkod"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:17
+#: share/completions/apt-build.fish:19
 msgid "Specify build-dir"
-msgstr ""
+msgstr "Välj bygg-katalog"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:18
-#: /tmp/fish/implicit/share/completions/npm.fish:56
+#: share/completions/apt-build.fish:20
 msgid "Rebuild a package"
-msgstr ""
+msgstr "Bygg om paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:19
+#: share/completions/apt-build.fish:21
 msgid "Rebuild and install an installed package"
-msgstr ""
+msgstr "Bygg och installera ett installerat paket"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:20
-msgid "Use <command> to build"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-build.fish:21
+#: share/completions/apt-build.fish:23
 msgid "Apply <file> patch"
-msgstr ""
+msgstr "Applicera <fil> som fix"
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:22
-msgid "Prefix to strip on patch"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-build.fish:23
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:20
-#: /tmp/fish/implicit/share/completions/yum.fish:12
+#: share/completions/apt-listbugs.fish:21
 msgid "Assume yes to all questions"
-msgstr ""
+msgstr "Anta ja på alla frågor"
 
 #: /tmp/fish/implicit/share/completions/apt-build.fish:24
 #: /tmp/fish/implicit/share/completions/apt-get.fish:35
 msgid "Use purge instead of remove"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-build.fish:25
-msgid "Do not run update"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-build.fish:26
+#: share/completions/apt-build.fish:28
 msgid "Specify sources.list file"
-msgstr ""
+msgstr "Välj sources.list fil"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:2
+#: share/completions/apt-cache.fish:3
 msgid "Build apt cache"
-msgstr ""
+msgstr "Bygg aptcache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:3
+#: share/completions/apt-cache.fish:4
 msgid "Show package info"
-msgstr ""
+msgstr "Visa paketinfo"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:4
+#: share/completions/apt-cache.fish:5
 msgid "Show cache statistics"
-msgstr ""
+msgstr "Visa cachestatistik"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:5
+#: share/completions/apt-cache.fish:6
 msgid "Show source package"
-msgstr ""
+msgstr "Visa alla källkodspaket"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:6
+#: share/completions/apt-cache.fish:7
 msgid "Show packages in cache"
-msgstr ""
+msgstr "Visa paket i cache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:7
+#: share/completions/apt-cache.fish:8
 msgid "Print available list"
-msgstr ""
+msgstr "Visa tillgängliga paket"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:8
+#: share/completions/apt-cache.fish:9
 msgid "List unmet dependencies in cache"
-msgstr ""
+msgstr "Visa ouppklarade beroenden i cache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:9
+#: share/completions/apt-cache.fish:10
 msgid "Display package record"
-msgstr ""
+msgstr "Visa paketpost"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:10
+#: share/completions/apt-cache.fish:11
 msgid "Search packagename by REGEX"
-msgstr ""
+msgstr "Sök paketnamn som matchar reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:11
-msgid "Search full package name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:12
+#: share/completions/apt-cache.fish:13
 msgid "Search packagename only"
-msgstr ""
+msgstr "Sök enbart paketnamn"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:13
+#: share/completions/apt-cache.fish:14
 msgid "List dependencies for the package"
-msgstr ""
+msgstr "Visa beroenden för paket"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:14
+#: share/completions/apt-cache.fish:15
 msgid "List reverse dependencies for the package"
-msgstr ""
+msgstr "Visa paket som beror på det givna paketet"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:15
+#: share/completions/apt-cache.fish:16
 msgid "Print package name by prefix"
-msgstr ""
+msgstr "Visa paket som matchar det givna prefixet"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:16
+#: share/completions/apt-cache.fish:17
 msgid "Generate dotty output for packages"
-msgstr ""
+msgstr "Generera utdata för dotty"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:17
+#: share/completions/apt-cache.fish:18
 msgid "Debug preferences file"
-msgstr ""
+msgstr "Fil för debuginställningar"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:18
+#: share/completions/apt-cache.fish:19
 msgid "Select file to store package cache"
-msgstr ""
+msgstr "Välj paketcache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:19
+#: share/completions/apt-cache.fish:20
 msgid "Select file to store source cache"
-msgstr ""
+msgstr "Välj fil för källkodscache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:20
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:9
-#: /tmp/fish/implicit/share/completions/apt-get.fish:24
-#: /tmp/fish/implicit/share/completions/configure.fish:3
-#: /tmp/fish/implicit/share/completions/gpg.fish:62
-#: /tmp/fish/implicit/share/completions/hugo.fish:5
-#: /tmp/fish/implicit/share/completions/make.fish:16
-#: /tmp/fish/implicit/share/completions/ping.fish:16
-#: /tmp/fish/implicit/share/completions/rpm.fish:3
-#: /tmp/fish/implicit/share/completions/screen.fish:29
-#: /tmp/fish/implicit/share/completions/ssh.fish:15
-#: /tmp/fish/implicit/share/completions/valgrind.fish:5
-#: /tmp/fish/implicit/share/completions/wget.fish:8
-#: /tmp/fish/implicit/share/completions/zip.fish:12
+#: share/completions/apt-cache.fish:21 share/completions/apt-ftparchive.fish:10
 msgid "Quiet mode"
-msgstr ""
+msgstr "Tyst läge"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:21
+#: share/completions/apt-cache.fish:22
 msgid "Print important dependencies"
-msgstr ""
+msgstr "Visa viktiga beroenden"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:22
+#: share/completions/apt-cache.fish:23
 msgid "Print full records"
-msgstr ""
+msgstr "Visa fulla poster"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:23
+#: share/completions/apt-cache.fish:24
 msgid "Auto-gen package cache"
-msgstr ""
+msgstr "Autogenerera paketcache"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:24
+#: share/completions/apt-cache.fish:25
 msgid "Print all names"
-msgstr ""
+msgstr "Visa alla namn"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:25
+#: share/completions/apt-cache.fish:26
 msgid "Dep and rdep recursive"
-msgstr ""
+msgstr "Rekursiva beroendeberäkningar"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:26
+#: share/completions/apt-cache.fish:27
 msgid "Limit to installed"
-msgstr ""
+msgstr "Bara installerade paket"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:29
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:12
-#: /tmp/fish/implicit/share/completions/apt-config.fish:6
-#: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:4
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:9
+#: share/completions/apt-cache.fish:30 share/completions/apt-cdrom.fish:13
+#: share/completions/apt-config.fish:7
+#: share/completions/apt-extracttemplates.fish:6
 msgid "Specify options"
-msgstr ""
+msgstr "Välj inställningar"
 
-#: /tmp/fish/implicit/share/completions/apt-cache.fish:30
-#: /tmp/fish/implicit/share/completions/apt.fish:2
-#: /tmp/fish/implicit/share/completions/apt-get.fish:2
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:2
+#: share/completions/apt-cache.fish:32 share/completions/apt-get.fish:12
+#: share/completions/apt-mark.fish:12
 msgid "Test if apt command should have packages as potential completion"
-msgstr ""
+msgstr "Testa om aptkommando borde ha paket som potentiell komplettering"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:2
+#: share/completions/apt-cdrom.fish:3
 msgid "Add new disc to source list"
-msgstr ""
+msgstr "Lägg till skiva till källlista"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:3
+#: share/completions/apt-cdrom.fish:4
 msgid "Report identity of disc"
-msgstr ""
+msgstr "Visa skivas identitet"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:4
-#: /tmp/fish/implicit/share/completions/fusermount.fish:1
-#: /tmp/fish/implicit/share/completions/udisksctl.fish:21
-#: /tmp/fish/implicit/share/completions/umount.fish:1
+#: share/completions/apt-cdrom.fish:5 share/completions/mount.fish:7
 msgid "Mount point"
-msgstr ""
+msgstr "Monteringskatalog"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:5
+#: share/completions/apt-cdrom.fish:6
 msgid "Rename a disc"
-msgstr ""
+msgstr "Byt namn på skiva"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:6
+#: share/completions/apt-cdrom.fish:7
 msgid "No mounting"
-msgstr ""
+msgstr "Montera inte"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:7
+#: share/completions/apt-cdrom.fish:8
 msgid "Fast copy"
-msgstr ""
+msgstr "Snabb kopiering"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:8
+#: share/completions/apt-cdrom.fish:9
 msgid "Thorough package scan"
-msgstr ""
+msgstr "Nogrann paketskanning"
 
-#: /tmp/fish/implicit/share/completions/apt-cdrom.fish:9
+#: share/completions/apt-cdrom.fish:10
 msgid "No changes"
-msgstr ""
+msgstr "Inga förändringar"
 
-#: /tmp/fish/implicit/share/completions/apt-config.fish:2
-msgid "Access config file from shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-config.fish:3
+#: share/completions/apt-config.fish:4
 msgid "Dump contents of config file"
-msgstr ""
+msgstr "Skriv ut innehåll av konfigureringsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:2
+#: share/completions/apt-extracttemplates.fish:4
 msgid "Set temp dir"
-msgstr ""
+msgstr "Välj temporär katalog"
 
-#: /tmp/fish/implicit/share/completions/apt-extracttemplates.fish:3
+#: share/completions/apt-extracttemplates.fish:5
 msgid "Specifiy config file"
-msgstr ""
+msgstr "Välj konfigurationsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:2
+#: share/completions/apt-file.fish:3
 msgid "Resync package contents from source"
-msgstr ""
+msgstr "Återsynkronisera paketinnehåll från källkod"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:3
+#: share/completions/apt-file.fish:4
 msgid "Search package containing pattern"
-msgstr ""
+msgstr "Sök paket innehållande mönster"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:4
+#: share/completions/apt-file.fish:5
 msgid "List contents of a package matching pattern"
-msgstr ""
+msgstr "Lista innehåll av paket som matchar mönster"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:5
+#: share/completions/apt-file.fish:6
 msgid "Remove all gz files from cache"
-msgstr ""
+msgstr "Ta bort alla gz-filer från cache"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:6
+#: share/completions/apt-file.fish:7
 msgid "Set cache dir"
-msgstr ""
+msgstr "Välj cache katalog"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:8
-msgid "Use cdrom-mount-point"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-file.fish:9
-#: /tmp/fish/implicit/share/completions/apt-file.fish:15
+#: share/completions/apt-file.fish:10 share/completions/apt-file.fish:16
 msgid "Do not expand pattern"
-msgstr ""
+msgstr "Expandera inte mönster"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:10
+#: share/completions/apt-file.fish:11
 msgid "Pattern is regexp"
-msgstr ""
+msgstr "Mönster är ett reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:12
+#: share/completions/apt-file.fish:13
 msgid "Set arch"
-msgstr ""
+msgstr "Välj arkitektur"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:13
+#: share/completions/apt-file.fish:14
 msgid "Set sources.list file"
-msgstr ""
+msgstr "Välj sources.list fil"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:14
+#: share/completions/apt-file.fish:15
 msgid "Only display package name"
-msgstr ""
+msgstr "Visa bara paketnamn"
 
-#: /tmp/fish/implicit/share/completions/apt-file.fish:16
+#: share/completions/apt-file.fish:17
 msgid "Run in dummy mode"
-msgstr ""
+msgstr "Kör i dummyläge"
 
-#: /tmp/fish/implicit/share/completions/apt.fish:1
-#: /tmp/fish/implicit/share/completions/apt-get.fish:1
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:1
+#: share/completions/apt-get.fish:3 share/completions/apt-mark.fish:3
 msgid "Test if apt has yet to be given the subcommand"
-msgstr ""
+msgstr "Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:3
 #: /tmp/fish/implicit/share/completions/snap.fish:2
@@ -6288,159 +6263,136 @@ msgstr ""
 msgid "Set a configuration option"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt.fish:8
-#: /tmp/fish/implicit/share/completions/hugo.fish:1
-#: /tmp/fish/implicit/share/completions/man.fish:14
-#: /tmp/fish/implicit/share/completions/modprobe.fish:2
-#: /tmp/fish/implicit/share/completions/yum.fish:13
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:8
+#: share/functions/__fish_complete_ssh.fish:10
 msgid "Configuration file"
-msgstr ""
+msgstr "Konfigureringsfil"
 
 #: /tmp/fish/implicit/share/completions/apt.fish:9
 msgid "Target release"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:2
+#: share/completions/apt-ftparchive.fish:3
 msgid "Generate package from source"
-msgstr ""
+msgstr "Generera paket från källkod"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:3
+#: share/completions/apt-ftparchive.fish:4
 msgid "Generate source index file"
-msgstr ""
+msgstr "Generera källindexfil"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:4
+#: share/completions/apt-ftparchive.fish:5
 msgid "Generate contents file"
-msgstr ""
+msgstr "Generera filinnehåll"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:5
+#: share/completions/apt-ftparchive.fish:6
 msgid "Generate release file"
-msgstr ""
+msgstr "Skapa release-fil"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:6
+#: share/completions/apt-ftparchive.fish:7
 msgid "Remove records"
-msgstr ""
+msgstr "Ta bort poster"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:7
+#: share/completions/apt-ftparchive.fish:8
 msgid "Generate MD5 sums"
-msgstr ""
+msgstr "Generera MD5-summa"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:8
+#: share/completions/apt-ftparchive.fish:9
 msgid "Use a binary db"
-msgstr ""
+msgstr "Använd binär databas"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:10
+#: share/completions/apt-ftparchive.fish:11
 msgid "Perform delinking"
-msgstr ""
+msgstr "Utför avlinkning"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:11
+#: share/completions/apt-ftparchive.fish:12
 msgid "Perform contents generation"
-msgstr ""
+msgstr "Utför innehållsgenerering"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:12
-msgid "Use source override"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:13
+#: share/completions/apt-ftparchive.fish:14
 msgid "Make caching db readonly"
-msgstr ""
+msgstr "Gör cache skrivskyddad"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:15
+#: share/completions/apt-ftparchive.fish:16
 msgid "Use config file"
-msgstr ""
+msgstr "Välj konfigurationsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-ftparchive.fish:16
-#: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:5
-#: /tmp/fish/implicit/share/completions/composer.fish:7
+#: share/completions/apt-ftparchive.fish:17
 msgid "Set config options"
-msgstr ""
+msgstr "Välj konfigurationsinställningar"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:5
+#: share/completions/apt-get.fish:24
 msgid "Update sources"
-msgstr ""
+msgstr "Uppdatera källor"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:6
+#: share/completions/apt-get.fish:25
 msgid "Upgrade or install newest packages"
-msgstr ""
+msgstr "Bygg och installera nyaste paket"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:7
+#: share/completions/apt-get.fish:26
 msgid "Use with dselect front-end"
-msgstr ""
+msgstr "Använd med dselect-gränssnitt"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:8
+#: share/completions/apt-get.fish:27
 msgid "Distro upgrade"
-msgstr ""
+msgstr "Distibutionsuppgradering"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:9
+#: share/completions/apt-get.fish:28
 msgid "Install one or more packages"
-msgstr ""
+msgstr "Installera ett eller flera paket"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:10
 msgid "Display changelog of one or more packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:11
+#: share/completions/apt-get.fish:29
+#, fuzzy
 msgid "Remove and purge one or more packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera ett eller flera paket"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:12
+#: share/completions/apt-get.fish:30
 msgid "Remove one or more packages"
-msgstr ""
+msgstr "Radera ett eller flera paket"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:13
+#: share/completions/apt-get.fish:31
 msgid "Fetch source packages"
-msgstr ""
+msgstr "Hämta källkodspaket"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:14
+#: share/completions/apt-get.fish:32
 msgid "Install/remove packages for dependencies"
-msgstr ""
+msgstr "Installera/ta bort paket för beroenden"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:15
+#: share/completions/apt-get.fish:33
 msgid "Update cache and check dependencies"
-msgstr ""
+msgstr "Uppdatera källkod och verifiera beroenden"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:16
+#: share/completions/apt-get.fish:34
 msgid "Clean local caches and packages"
-msgstr ""
+msgstr "Rengör lokala cachear och paket"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:17
+#: share/completions/apt-get.fish:35
 msgid "Clean packages no longer be downloaded"
-msgstr ""
+msgstr "Rengör paket som inte längre skall nedladdas"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:18
+#: share/completions/apt-get.fish:36
+#, fuzzy
 msgid "Remove automatically installed packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:19
 msgid "Do not install recommended packages"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:20
-#: /tmp/fish/implicit/share/completions/aptitude.fish:28
-msgid "Download Only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:21
-#: /tmp/fish/implicit/share/completions/aptitude.fish:29
-msgid "Correct broken dependencies"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:22
-msgid "Ignore missing packages"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:23
-msgid "Disable downloading packages"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/apt-get.fish:25
 msgid "Perform a simulation"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:26
-msgid "Automatic yes to prompts"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/apt-get.fish:27
 msgid "Show upgraded packages"
 msgstr ""
@@ -6449,26 +6401,10 @@ msgstr ""
 msgid "Show full versions for packages"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:29
-msgid "Compile source packages"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/apt-get.fish:30
 msgid "Install recommended packages"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:31
-msgid "Ignore package Holds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:32
-msgid "Do not upgrade packages"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:33
-msgid "Force yes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/apt-get.fish:34
 msgid "Print the URIs"
 msgstr ""
@@ -6477,69 +6413,42 @@ msgstr ""
 msgid "Reinstall packages"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:37
-msgid "Erase obsolete files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:38
-msgid "Control default input to the policy engine"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:39
-msgid "Only perform operations that are trivial"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:40
-msgid "Abort if any packages are to be removed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:41
-msgid "Only accept source packages"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:42
-msgid "Download only diff file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:43
-msgid "Download only tar file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:44
-msgid "Only process arch-dependant build-dependencies"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:45
-msgid "Ignore non-authenticated packages"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-get.fish:47
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:13
+#: share/completions/apt-get.fish:65 share/completions/apt-mark.fish:32
 msgid "Specify a config file"
-msgstr ""
+msgstr "Välj en konfigurationsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-get.fish:48
-#: /tmp/fish/implicit/share/completions/apt-mark.fish:14
+#: share/completions/apt-get.fish:66 share/completions/apt-mark.fish:33
 msgid "Set a config option"
-msgstr ""
+msgstr "Välj en konfigurationsinställning"
 
-#: /tmp/fish/implicit/share/completions/aptitude.fish:1
+#: share/completions/aptitude.fish:3
 msgid "Test if aptitude has yet to be given the subcommand"
-msgstr ""
+msgstr "Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:2
+#: share/completions/aptitude.fish:12
+#, fuzzy
 msgid "Test if aptitude command should have packages as potential completion"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om aptkommando borde ha paket som potentiell komplettering"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:4
 msgid "Display a brief help message. Identical to the help action"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:5
+#: share/completions/aptitude.fish:24
+#, fuzzy
 msgid "Remove any cached packages which can no longer be downloaded"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Rengör paket som inte längre skall nedladdas"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:6
+#: share/completions/aptitude.fish:25
 msgid "Remove all downloaded .deb files from the package cache directory"
 msgstr ""
 
@@ -6548,78 +6457,149 @@ msgid "Forget all internal information about what packages are 'new'"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:8
+#: share/completions/aptitude.fish:27
 msgid "Cancel all scheduled actions on all packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:9
+#: share/completions/aptitude.fish:28
+#, fuzzy
 msgid "Update the list of available packages from the apt sources"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Updatera källkodpaketlista"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:10
+#: share/completions/aptitude.fish:29
+#, fuzzy
 msgid "Upgrade installed packages to their most recent version"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:11
+#: share/completions/aptitude.fish:30
+#, fuzzy
 msgid "Download and displays the Debian changelog for the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:12
+#: share/completions/aptitude.fish:31
+#, fuzzy
 msgid "Upgrade, removing or installing packages as necessary"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bygg och installera nyaste paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:13
+#: share/completions/aptitude.fish:32
+#, fuzzy
 msgid "Download the packages to the current directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:14
+#: share/completions/aptitude.fish:33
 msgid "Forbid the upgrade to a particular version"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:15
+#: share/completions/aptitude.fish:34
 msgid "Ignore the packages by future upgrade commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:16
+#: share/completions/aptitude.fish:35
+#, fuzzy
 msgid "Install the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:17
+#: share/completions/aptitude.fish:36
+#, fuzzy
 msgid "Cancel any scheduled actions on the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:18
+#: share/completions/aptitude.fish:37
+#, fuzzy
 msgid "Mark packages as automatically installed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:19
+#: share/completions/aptitude.fish:38
 msgid "Remove and delete all associated configuration and data files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:20
+#: share/completions/aptitude.fish:39
+#, fuzzy
 msgid "Reinstall the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ominstallera paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:21
+#: share/completions/aptitude.fish:40
+#, fuzzy
 msgid "Remove the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:22
+#: share/completions/aptitude.fish:41
+#, fuzzy
 msgid "Display detailed information about the packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:23
+#: share/completions/aptitude.fish:42
 msgid "Consider the packages by future upgrade commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:24
+#: share/completions/aptitude.fish:43
+#, fuzzy
 msgid "Mark packages as manually installed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:25
+#: share/completions/aptitude.fish:44
+#, fuzzy
 msgid "Search for packages matching one of the patterns"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:26
+#: share/completions/aptitude.fish:45
 msgid "Display brief summary of the available commands and options"
 msgstr ""
 
@@ -6699,296 +6679,305 @@ msgstr ""
 msgid "Specify the display width for the output from the search command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-key.fish:1
+#: share/completions/apt-key.fish:2
 msgid "Add a new key"
-msgstr ""
+msgstr "Lägg till ny nyckel"
 
-#: /tmp/fish/implicit/share/completions/apt-key.fish:2
+#: share/completions/apt-key.fish:3
 msgid "Remove a key"
-msgstr ""
+msgstr "Ta bort en nyckel"
 
-#: /tmp/fish/implicit/share/completions/apt-key.fish:3
+#: share/completions/apt-key.fish:4
 msgid "List trusted keys"
-msgstr ""
+msgstr "Visa pålitliga nycklar"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:2
+#: share/completions/apt-listbugs.fish:3
 msgid "Set severity"
-msgstr ""
+msgstr "Välj allvarlighetgrad"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:3
+#: share/completions/apt-listbugs.fish:4
 msgid "Tags you want to see"
-msgstr ""
+msgstr "Välj taggar du vill se"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:4
+#: share/completions/apt-listbugs.fish:5
 msgid "Bug-status you want to see"
-msgstr ""
+msgstr "Bugg-status du vill se"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:5
+#: share/completions/apt-listbugs.fish:6
 msgid "Ignore bugs in your system"
-msgstr ""
+msgstr "Ignorera buggar i ditt system"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:6
+#: share/completions/apt-listbugs.fish:7
 msgid "Ignore newer bugs than upgrade packages"
-msgstr ""
+msgstr "Ignorera nyare buggar än uppgraderade paket"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:7
+#: share/completions/apt-listbugs.fish:8
 msgid "Bugs for downgrade packages"
-msgstr ""
+msgstr "Buggar för nedgraderade paket"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:8
+#: share/completions/apt-listbugs.fish:9
 msgid "Bug Tracking system"
-msgstr ""
+msgstr "Buggtrackingsystem"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:9
+#: share/completions/apt-listbugs.fish:10
 msgid "Specify port for web interface"
-msgstr ""
+msgstr "Välj port för webbinterface"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:10
+#: share/completions/apt-listbugs.fish:11
 msgid "Use daily bug report"
-msgstr ""
+msgstr "Använd daglig buggrapport"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:11
+#: share/completions/apt-listbugs.fish:12
 msgid "Use the raw index.db"
-msgstr ""
+msgstr "Använd bar index.db"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:12
+#: share/completions/apt-listbugs.fish:13
 msgid "Specify index dir"
-msgstr ""
+msgstr "Välj indexkatalog"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:13
+#: share/completions/apt-listbugs.fish:14
 msgid "Specify Pin-Priority value"
-msgstr ""
+msgstr "Välj Pin-prioritetsvärde"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:14
+#: share/completions/apt-listbugs.fish:15
 msgid "Specify the title of rss"
-msgstr ""
+msgstr "Välj rss-titel"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:15
+#: share/completions/apt-listbugs.fish:16
 msgid "Retrieve fresh bugs"
-msgstr ""
+msgstr "Hämta färska buggar"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:16
-#: /tmp/fish/implicit/share/completions/aura.fish:31
-#: /tmp/fish/implicit/share/completions/pacaur.fish:47
-#: /tmp/fish/implicit/share/completions/pacman.fish:25
-#: /tmp/fish/implicit/share/completions/scp.fish:7
-#: /tmp/fish/implicit/share/completions/yaourt.fish:39
+#: share/completions/apt-listbugs.fish:17
 msgid "Do not display progress bar"
-msgstr ""
+msgstr "Visa inte förloppsindikator"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:17
+#: share/completions/apt-listbugs.fish:18
 msgid "Specify local cache dir"
-msgstr ""
+msgstr "Välj lokal cachekatalog"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:18
+#: share/completions/apt-listbugs.fish:19
 msgid "Specify the expire cache timer"
-msgstr ""
+msgstr "Välj cacheexpireringstimer"
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:19
-msgid "Specify apt config file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:21
+#: share/completions/apt-listbugs.fish:22
 msgid "Assume no to all questions"
-msgstr ""
+msgstr "Anta nej på alla frågor"
 
 #: /tmp/fish/implicit/share/completions/apt-listbugs.fish:22
 msgid "List bugs from packages"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-listbugs.fish:23
-msgid "List bugs in rss format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:2
-msgid "Read filenames from pipe"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:4
+#: share/completions/apt-listchanges.fish:5
 msgid "Select frontend interface"
-msgstr ""
+msgstr "Välj gränssnitt"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:5
-#: /tmp/fish/implicit/share/completions/darcs.fish:749
+#: share/completions/darcs.fish:915
 msgid "Specify email address"
-msgstr ""
+msgstr "Välj e-postkatalog"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:6
+#: share/completions/apt-listchanges.fish:7
 msgid "Ask confirmation"
-msgstr ""
+msgstr "Bekräfta val"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:7
+#: share/completions/apt-listchanges.fish:8
 msgid "Display all changelogs"
-msgstr ""
+msgstr "Visa alla händelseloggar"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:8
+#: share/completions/apt-listchanges.fish:9
 msgid "Avoid changelogs from db in named file"
-msgstr ""
+msgstr "Undvik händelseloggar från databas i fil"
 
 #: /tmp/fish/implicit/share/completions/apt-listchanges.fish:9
 msgid "Select display"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:10
+#: share/completions/apt-listchanges.fish:11
 msgid "Insert header"
-msgstr ""
+msgstr "Lägg till huvud"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:11
-#: /tmp/fish/implicit/share/completions/ps.fish:40
+#: share/completions/apt-listchanges.fish:12
 msgid "Display debug info"
-msgstr ""
+msgstr "Visa debuginformation"
 
-#: /tmp/fish/implicit/share/completions/apt-listchanges.fish:12
+#: share/completions/apt-listchanges.fish:13
 msgid "Select an option profile"
-msgstr ""
+msgstr "Välj än inställningsprofil"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:5
+#: share/completions/apt-mark.fish:24
+#, fuzzy
 msgid "Mark a package as automatically installed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:6
+#: share/completions/apt-mark.fish:25
+#, fuzzy
 msgid "Mark a package as manually installed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:7
+#: share/completions/apt-mark.fish:26
 msgid "Hold a package, prevent automatic installation or removal"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:8
+#: share/completions/apt-mark.fish:27
+#, fuzzy
 msgid "Cancel a hold on a package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa info om paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:9
+#: share/completions/apt-mark.fish:28
+#, fuzzy
 msgid "Show automatically installed packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:10
+#: share/completions/apt-mark.fish:29
+#, fuzzy
 msgid "Show manually installed packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:11
+#: share/completions/apt-mark.fish:30
+#, fuzzy
 msgid "Show held packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppgraderade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:15
+#: share/completions/apt-mark.fish:34
+#, fuzzy
 msgid "Write package statistics to a file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv prototyper till fil"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:1
 msgid "Generate master file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:2
-msgid "Alias for 'get'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-move.fish:3
+#: share/completions/apt-move.fish:4
 msgid "Move packages to local tree"
-msgstr ""
+msgstr "Flytta paket till lokalt träd"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:4
+#: share/completions/apt-move.fish:5
 msgid "Delete obsolete package files"
-msgstr ""
+msgstr "Radera obsoleta paketfiler"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:5
+#: share/completions/apt-move.fish:6
 msgid "Build new local files"
-msgstr ""
+msgstr "Bygg nya lokala filer"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:6
+#: share/completions/apt-move.fish:7
 msgid "Rebuild index files"
-msgstr ""
+msgstr "Bygg om indexfiler"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:7
+#: share/completions/apt-move.fish:8
 msgid "Move packages from cache to local mirror"
-msgstr ""
+msgstr "Flytta paket från cache till lokal spegel"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:8
+#: share/completions/apt-move.fish:9
 msgid "Alias for 'move delete packages'"
-msgstr ""
+msgstr "Alias för 'move delete packages'"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:9
+#: share/completions/apt-move.fish:10
 msgid "Alias for 'update'"
-msgstr ""
+msgstr "Alias för 'update'"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:10
+#: share/completions/apt-move.fish:11
 msgid "Download package missing from mirror"
-msgstr ""
+msgstr "Ladde ner paket som saknas från spegel"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:11
+#: share/completions/apt-move.fish:12
 msgid "Sync packages installed"
-msgstr ""
+msgstr "Synkronisera installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:13
 msgid "Move file specified on commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:14
+#: share/completions/apt-move.fish:15
 msgid "List packages that may serve as input to mirrorbin or mirrorsource"
-msgstr ""
+msgstr "Visa paket som kan användas som input till mirrorbin eller mirrorsrc"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:15
+#: share/completions/apt-move.fish:16
 msgid "Fetch package from STDIN"
-msgstr ""
+msgstr "Hämta paket från standard in"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:16
+#: share/completions/apt-move.fish:17
 msgid "Fetch source package from STDIN"
-msgstr ""
+msgstr "Hämta källkodspaket från standard in"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:17
+#: share/completions/apt-move.fish:18
 msgid "Process all packages"
-msgstr ""
+msgstr "Behandla alla paket"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:18
-msgid "Use specific conffile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-move.fish:19
+#: share/completions/apt-move.fish:20
 msgid "Force deletion"
-msgstr ""
+msgstr "Tvinga radering"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:20
+#: share/completions/apt-move.fish:21
 msgid "Suppresses normal output"
-msgstr ""
+msgstr "Tyst läge"
 
-#: /tmp/fish/implicit/share/completions/apt-move.fish:21
+#: share/completions/apt-move.fish:22
 msgid "Test run"
-msgstr ""
+msgstr "Testkörning"
 
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:4
+#: share/completions/apt-proxy-import.fish:5
 msgid "No message to STDOUT"
-msgstr ""
+msgstr "Inga meddelanden till standard ut"
 
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:5
+#: share/completions/apt-proxy-import.fish:6
 msgid "Recurse into subdir"
-msgstr ""
+msgstr "Rekursera till underkataloger"
 
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:6
+#: share/completions/apt-proxy-import.fish:7
 msgid "Dir to import"
-msgstr ""
+msgstr "Katalog att importera"
 
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:7
+#: share/completions/apt-proxy-import.fish:8
 msgid "Change to user"
-msgstr ""
+msgstr "Ändra till användare"
 
-#: /tmp/fish/implicit/share/completions/apt-proxy-import.fish:8
+#: share/completions/apt-proxy-import.fish:9
 msgid "Debug level[default 0]"
-msgstr ""
+msgstr "Debugnivå [Standard är 0]"
 
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:2
+#: share/completions/apt-rdepends.fish:3
 msgid "Show build dependencies"
-msgstr ""
+msgstr "Visa byggberoenden"
 
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:3
+#: share/completions/apt-rdepends.fish:4
 msgid "Generate a dotty graph"
-msgstr ""
+msgstr "Generera en dottygraf"
 
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:4
+#: share/completions/apt-rdepends.fish:5
 msgid "Show state of dependencies"
-msgstr ""
+msgstr "Visa beroendens tillstånd"
 
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:5
+#: share/completions/apt-rdepends.fish:6
 msgid "List packages depending on"
-msgstr ""
+msgstr "Visa paket som beror på"
 
 #: /tmp/fish/implicit/share/completions/apt-rdepends.fish:6
 msgid "Comma-separated list of dependency types to follow recursively"
@@ -6998,270 +6987,203 @@ msgstr ""
 msgid "Comma-separated list of dependency types to show"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:8
-msgid ""
-"Comma-separated list of package installation states to follow recursively"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:9
-msgid "Comma-separated list of package installation states to show"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-rdepends.fish:10
+#: share/completions/apt-rdepends.fish:11
 msgid "Display man page"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-setup.fish:1
-msgid "Probe a CD"
-msgstr ""
+msgstr "Visa manualsida"
 
 #: /tmp/fish/implicit/share/completions/apt-setup.fish:2
 msgid "Run in non-interactive mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:2
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:3
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:9
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:10
+#: share/completions/apt-show-source.fish:3
+#: share/completions/apt-show-source.fish:4
+#: share/completions/apt-show-versions.fish:10
+#: share/completions/apt-show-versions.fish:11
 msgid "Read package from file"
-msgstr ""
+msgstr "Läs paket från fil"
 
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:4
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:5
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:11
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:12
+#: share/completions/apt-show-source.fish:5
+#: share/completions/apt-show-source.fish:6
+#: share/completions/apt-show-versions.fish:12
+#: share/completions/apt-show-versions.fish:13
 msgid "Specify APT list dir"
-msgstr ""
+msgstr "Välj APT listningskatalog"
 
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:6
+#: share/completions/apt-show-source.fish:7
 msgid "List PKG info"
-msgstr ""
+msgstr "Lista paketinformation"
 
-#: /tmp/fish/implicit/share/completions/apt-show-source.fish:8
+#: share/completions/apt-show-source.fish:9
 msgid "Print all source packages with version"
-msgstr ""
+msgstr "Visa alla källkodspaket med version"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:2
+#: share/completions/apt-show-versions.fish:3
 msgid "Print PKG versions"
-msgstr ""
+msgstr "Visa paketversioner"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:3
+#: share/completions/apt-show-versions.fish:4
 msgid "Using regex"
-msgstr ""
+msgstr "Använd reguljära uttryck"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:4
+#: share/completions/apt-show-versions.fish:5
 msgid "Print only upgradeable packages"
-msgstr ""
+msgstr "Visa bara paket som kan uppgraderas"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:5
+#: share/completions/apt-show-versions.fish:6
 msgid "Print all versions"
-msgstr ""
+msgstr "Visa alla versioner"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:6
+#: share/completions/apt-show-versions.fish:7
 msgid "Print package name/distro"
-msgstr ""
+msgstr "Visa paketnamn/distribution"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:7
+#: share/completions/apt-show-versions.fish:8
 msgid "Print verbose info"
-msgstr ""
+msgstr "Visa utförlig information"
 
-#: /tmp/fish/implicit/share/completions/apt-show-versions.fish:8
+#: share/completions/apt-show-versions.fish:9
 msgid "Init or update cache only"
-msgstr ""
+msgstr "Bara initiera eller uppdatera cachen"
 
-#: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:2
+#: share/completions/apt-sortpkgs.fish:3
 msgid "Use source index field"
-msgstr ""
+msgstr "Använd köllindexfält"
 
-#: /tmp/fish/implicit/share/completions/apt-sortpkgs.fish:4
+#: share/completions/apt-sortpkgs.fish:5
 msgid "Specify conffile"
-msgstr ""
+msgstr "Välj konfigurationsfil"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:2
+#: share/completions/apt-spy.fish:3
 msgid "Debian distribution"
-msgstr ""
+msgstr "Debiandistribution"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:3
+#: share/completions/apt-spy.fish:4
 msgid "Servers in the areas"
-msgstr ""
+msgstr "Servrar i områden"
 
 #: /tmp/fish/implicit/share/completions/apt-spy.fish:4
 msgid "Conf file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:5
+#: share/completions/apt-spy.fish:6
 msgid "Finish after number of servers"
-msgstr ""
+msgstr "Avsluta efter antal servrar"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:6
-msgid "File to grab servers"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:7
-msgid "File as input"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:8
-msgid "Mirror-list file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:9
-msgid "Output sources.list file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:10
+#: share/completions/apt-spy.fish:11
 msgid "Use proxy server"
-msgstr ""
+msgstr "Använd proxyserver"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:11
+#: share/completions/apt-spy.fish:12
 msgid "Comma separated country list"
-msgstr ""
+msgstr "Kommasepararad landslista"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:12
+#: share/completions/apt-spy.fish:13
 msgid "How long in sec to download"
-msgstr ""
+msgstr "Hur länga i sekunder som nedladdning får ske"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:13
+#: share/completions/apt-spy.fish:14
 msgid "Custom URL to get mirror list"
-msgstr ""
+msgstr "Egen URL för att hämta lista av speglar"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:14
-msgid "Write top servers to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:15
+#: share/completions/apt-spy.fish:16
 msgid "Number of top servers"
-msgstr ""
+msgstr "Antal toppservrar"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:16
+#: share/completions/apt-spy.fish:17
 msgid "Update mirror list"
-msgstr ""
+msgstr "Uppdatera spegellista"
 
-#: /tmp/fish/implicit/share/completions/apt-spy.fish:17
+#: share/completions/apt-spy.fish:18
 msgid "Version number"
-msgstr ""
+msgstr "Visa versionsnummer"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:2
+#: share/completions/apt-src.fish:3
 msgid "Update list of source packages"
-msgstr ""
+msgstr "Updatera källkodpaketlista"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:3
+#: share/completions/apt-src.fish:4
 msgid "Install source packages"
-msgstr ""
+msgstr "Installera källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:4
+#: share/completions/apt-src.fish:5
 msgid "Upgrade source packages"
-msgstr ""
+msgstr "Upgradera källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:5
+#: share/completions/apt-src.fish:6
 msgid "Remove source packages"
-msgstr ""
+msgstr "Radera källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:6
-#: /tmp/fish/implicit/share/completions/apt-src.fish:13
+#: share/completions/apt-src.fish:7 share/completions/apt-src.fish:14
 msgid "Build source packages"
-msgstr ""
+msgstr "Bygg källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:7
+#: share/completions/apt-src.fish:8
 msgid "Clean source packages"
-msgstr ""
+msgstr "Rengör källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:8
+#: share/completions/apt-src.fish:9
 msgid "Detect known source tree"
-msgstr ""
+msgstr "Detektera känt källkodsträd"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:9
+#: share/completions/apt-src.fish:10
 msgid "List installed source package\\(s\\)"
-msgstr ""
+msgstr "Lista installerade källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:10
+#: share/completions/apt-src.fish:11
 msgid "Root source tree"
-msgstr ""
+msgstr "Rotkällträd"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:11
+#: share/completions/apt-src.fish:12
 msgid "Version of source package"
-msgstr ""
+msgstr "Version på källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:12
+#: share/completions/apt-src.fish:13
 msgid "Name of the source package"
-msgstr ""
+msgstr "Namn på källkodpaket"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:14
+#: share/completions/apt-src.fish:15
 msgid "Install after build"
-msgstr ""
+msgstr "Installera efter byggande"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:15
+#: share/completions/apt-src.fish:16
 msgid "Patch local changes"
-msgstr ""
+msgstr "Utför fixar för lokala ändringar"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:16
+#: share/completions/apt-src.fish:17
 msgid "Specify a dir"
-msgstr ""
+msgstr "Ange katalog"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:17
-msgid "Run on current dir"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-src.fish:18
+#: share/completions/apt-src.fish:19
 msgid "Omit debian version"
-msgstr ""
+msgstr "Ange inte Debian-version"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:19
+#: share/completions/apt-src.fish:20
 msgid "Do not del built files"
-msgstr ""
+msgstr "Radera inte byggda filer"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:20
+#: share/completions/apt-src.fish:21
 msgid "Do not del source files"
-msgstr ""
+msgstr "Radera inte källfiler"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:21
+#: share/completions/apt-src.fish:22
 msgid "Source tree version"
-msgstr ""
+msgstr "Källkodsträdsversion"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:22
+#: share/completions/apt-src.fish:23
 msgid "Output to /dev/null"
-msgstr ""
+msgstr "Skriv utdata till /dev/null"
 
-#: /tmp/fish/implicit/share/completions/apt-src.fish:23
+#: share/completions/apt-src.fish:24
 msgid "Output trace"
-msgstr ""
+msgstr "Utdataspår"
 
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:3
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:3
-msgid "Removable medium"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:4
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:4
+#: share/completions/apt-zip-inst.fish:5 share/completions/apt-zip-list.fish:5
 msgid "Select an action"
-msgstr ""
+msgstr "Välj en handling"
 
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:5
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:5
-msgid "List of packages to install"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:6
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:6
+#: share/completions/apt-zip-inst.fish:7 share/completions/apt-zip-list.fish:7
 msgid "Fix broken option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-inst.fish:7
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:7
-msgid "Specify a non-mountpoint dir"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:8
-msgid "Select a method"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:10
-msgid "Accept protocols"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/apt-zip-list.fish:11
-msgid "Reject protocols"
-msgstr ""
+msgstr "Fixa trasig flagga"
 
 #: /tmp/fish/implicit/share/completions/arc.fish:1
 msgid "Debugging command"
@@ -8001,37 +7923,29 @@ msgstr ""
 msgid "Shows the current version of arcanist"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/arp.fish:2
-msgid "Numerical address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/arp.fish:3
+#: share/completions/arp.fish:4
 msgid "Class of hw type"
-msgstr ""
+msgstr "Klass av hårdvara"
 
-#: /tmp/fish/implicit/share/completions/arp.fish:4
+#: share/completions/arp.fish:5
 msgid "Show arp entries"
-msgstr ""
+msgstr "Visa ARP-inlägg"
 
-#: /tmp/fish/implicit/share/completions/arp.fish:5
+#: share/completions/arp.fish:6
 msgid "Remove an entry for hostname"
-msgstr ""
+msgstr "Ta bort hostname-inlägg"
 
-#: /tmp/fish/implicit/share/completions/arp.fish:6
-msgid "Use hardware address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/arp.fish:7
+#: share/completions/arp.fish:8
 msgid "Select interface"
-msgstr ""
+msgstr "Välj gränssnitt"
 
-#: /tmp/fish/implicit/share/completions/arp.fish:8
+#: share/completions/arp.fish:9
 msgid "Manually create ARP address"
-msgstr ""
+msgstr "Skapa ARP adress manuellt"
 
-#: /tmp/fish/implicit/share/completions/arp.fish:9
+#: share/completions/arp.fish:10
 msgid "Take addr from filename, default /etc/ethers"
-msgstr ""
+msgstr "Hämta adress från filnamn, standard är /etc/ethers"
 
 #: /tmp/fish/implicit/share/completions/as.fish:1
 msgid "Omit false conditionals"
@@ -8379,53 +8293,49 @@ msgstr ""
 msgid "Remove target from local repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/atd.fish:1
+#: share/completions/atd.fish:2
 msgid "Limiting load factor"
-msgstr ""
+msgstr "Begränsande lastfaktor"
 
-#: /tmp/fish/implicit/share/completions/atd.fish:2
+#: share/completions/atd.fish:3
 msgid "Minimum interval in seconds"
-msgstr ""
+msgstr "Minimalt intervall i sekunder"
 
-#: /tmp/fish/implicit/share/completions/atd.fish:3
-#: /tmp/fish/implicit/share/completions/make.fish:4
-#: /tmp/fish/implicit/share/completions/sylpheed.fish:2
+#: share/completions/atd.fish:4
 msgid "Debug mode"
-msgstr ""
+msgstr "Debugläge"
 
-#: /tmp/fish/implicit/share/completions/atd.fish:4
+#: share/completions/atd.fish:5
 msgid "Process at queue only once"
-msgstr ""
+msgstr "Processa 'at'-kö bara en gång"
 
-#: /tmp/fish/implicit/share/completions/at.fish:2
-#: /tmp/fish/implicit/share/completions/atq.fish:2
+#: share/completions/at.fish:3 share/completions/atq.fish:3
 msgid "Use specified queue"
-msgstr ""
+msgstr "Använd angiven kö"
 
-#: /tmp/fish/implicit/share/completions/at.fish:3
+#: share/completions/at.fish:4
 msgid "Send mail to user"
-msgstr ""
+msgstr "Skicka e-post till användare"
 
-#: /tmp/fish/implicit/share/completions/at.fish:4
+#: share/completions/at.fish:5
 msgid "Read job from file"
-msgstr ""
+msgstr "Läs in jobb från fil"
 
-#: /tmp/fish/implicit/share/completions/at.fish:5
+#: share/completions/at.fish:6
 msgid "Alias for atq"
-msgstr ""
+msgstr "Alias för atq"
 
-#: /tmp/fish/implicit/share/completions/at.fish:6
+#: share/completions/at.fish:7
 msgid "Alias for atrm"
-msgstr ""
+msgstr "Alias för atrm"
 
-#: /tmp/fish/implicit/share/completions/at.fish:7
-#: /tmp/fish/implicit/share/completions/climate.fish:11
+#: share/completions/at.fish:8
 msgid "Show the time"
-msgstr ""
+msgstr "Visa tid"
 
-#: /tmp/fish/implicit/share/completions/at.fish:8
+#: share/completions/at.fish:9
 msgid "Print the jobs listed"
-msgstr ""
+msgstr "Visa listade jobb"
 
 #: /tmp/fish/implicit/share/completions/atom.fish:1
 msgid "Run in development mode."
@@ -9228,22 +9138,6 @@ msgstr ""
 msgid "Force interactive mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/bc.fish:2
-msgid "Define math library"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bc.fish:3
-msgid "Give warnings for extensions to POSIX bc"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bc.fish:4
-msgid "Process exactly POSIX bc"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bc.fish:5
-msgid "Do not print the GNU welcome"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/bd.fish:1
 msgid "Classic mode: goes back to the first directory named as the string"
 msgstr ""
@@ -9364,10 +9258,6 @@ msgstr ""
 msgid "Equivalent to -o y.tab.c"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/block.fish:2
-msgid "Remove the topmost global event block"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/block.fish:3
 msgid "Create a local (automatically erased) event block"
 msgstr ""
@@ -9854,17 +9744,23 @@ msgstr ""
 msgid "Display formula's install path in Cellar"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/builtin.fish:2
-msgid "Print names of all existing builtins"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/bundle.fish:1
+#: share/completions/bundle.fish:3
+#, fuzzy
 msgid "Test if bundle has been given no subcommand"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:2
+#: share/completions/bundle.fish:11
+#, fuzzy
 msgid "Test if bundle has been given a specific subcommand"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:3
 msgid "Specify the number of times you wish to attempt network commands"
@@ -9879,8 +9775,13 @@ msgid "Enable verbose output mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:6
+#: share/completions/bundle.fish:31
+#, fuzzy
 msgid "Display a help page"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa manualsida"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:7
 msgid "Prints version information"
@@ -9888,208 +9789,327 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:8
 #: /tmp/fish/implicit/share/completions/bundle.fish:40
+#: share/completions/bundle.fish:39 share/completions/bundle.fish:83
 msgid "Install the gems specified by the Gemfile or Gemfile.lock"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:9
 #: /tmp/fish/implicit/share/completions/bundle.fish:57
+#: share/completions/bundle.fish:40 share/completions/bundle.fish:106
+#, fuzzy
 msgid "The location of the Gemfile bundler should use"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:10
+#: share/completions/bundle.fish:41
+#, fuzzy
 msgid "The location to install the gems in the bundle to"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:11
+#: share/completions/bundle.fish:42
+#, fuzzy
 msgid "Installs the gems in the bundle to the system location"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:12
+#: share/completions/bundle.fish:43
 msgid "A space-separated list of groups to skip installing"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:13
+#: share/completions/bundle.fish:44
 msgid "Use cached gems instead of connecting to rubygems.org"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:14
+#: share/completions/bundle.fish:45
 msgid "Switches bundler's defaults into deployment mode."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:15
+#: share/completions/bundle.fish:46
 msgid ""
 "Create a directory containing executabes that run in the context of the "
 "bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:16
+#: share/completions/bundle.fish:47
 msgid "Specify a ruby executable to use with generated binstubs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:17
+#: share/completions/bundle.fish:48
 msgid "Make a bundle that can work without RubyGems or Bundler at run-time"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:18
+#: share/completions/bundle.fish:49
 msgid "Apply a RubyGems security policy: {High,Medium,Low,No}Security"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:19
+#: share/completions/bundle.fish:50
 msgid "Install  gems parallely by starting size number of parallel workers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:20
+#: share/completions/bundle.fish:51
 msgid "Do not update the cache in vendor/cache with the newly bundled gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:21
+#: share/completions/bundle.fish:52
+#, fuzzy
 msgid "Do not print progress information to stdout"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa all information"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:22
+#: share/completions/bundle.fish:53
+#, fuzzy
 msgid "Run bundle clean automatically after install"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:23
 #: /tmp/fish/implicit/share/completions/bundle.fish:30
+#: share/completions/bundle.fish:54 share/completions/bundle.fish:63
 msgid "Use the rubygems modern index instead of the API endpoint"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:24
 #: /tmp/fish/implicit/share/completions/bundle.fish:89
+#: share/completions/bundle.fish:55 share/completions/bundle.fish:164
+#, fuzzy
 msgid "Do not remove stale gems from the cache"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort alla gz-filer från cache"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:25
+#: share/completions/bundle.fish:56
 msgid "Do not allow the Gemfile.lock to be updated after this install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:26
 #: /tmp/fish/implicit/share/completions/bundle.fish:41
+#: share/completions/bundle.fish:59 share/completions/bundle.fish:84
+#, fuzzy
 msgid "Update dependencies to their latest versions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:27
+#: share/completions/bundle.fish:60
 msgid "The name of a :git or :path source used in the Gemfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:28
+#: share/completions/bundle.fish:61
 msgid "Do not attempt to fetch gems remotely and use the gem cache instead"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:29
+#: share/completions/bundle.fish:62
 msgid "Only output warnings and errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:31
+#: share/completions/bundle.fish:64
+#, fuzzy
 msgid "Specify the number of jobs to run in parallel"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange antalet bytes av data att sicka"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:32
+#: share/completions/bundle.fish:65
+#, fuzzy
 msgid "Update a specific group"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd angiven tagg"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:33
+#: share/completions/bundle.fish:69
 msgid ""
 "Package the .gem files required by your application into the vendor/cache "
 "directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:34
+#: share/completions/bundle.fish:72
+#, fuzzy
 msgid "Install the binstubs of the listed gem"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa låtsasinstallationsutdata i tabellform"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:35
+#: share/completions/bundle.fish:73
+#, fuzzy
 msgid "Binstub destination directory (default bin)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera dokumentation (standard)"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:36
+#: share/completions/bundle.fish:74
 msgid "Overwrite existing binstubs if they exist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:37
 #: /tmp/fish/implicit/share/completions/bundle.fish:43
+#: share/completions/bundle.fish:78 share/completions/bundle.fish:86
 msgid "Execute a script in the context of the current bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:38
+#: share/completions/bundle.fish:79
 msgid "Exec runs a command, providing it access to the gems in the bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:39
+#: share/completions/bundle.fish:82
 msgid "Describe available tasks or one specific task"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:42
+#: share/completions/bundle.fish:85
+#, fuzzy
 msgid "Package .gem files into the vendor/cache directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ändra arbetskatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:44
+#: share/completions/bundle.fish:87
+#, fuzzy
 msgid "Specify and read configuration options for bundler"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:45
+#: share/completions/bundle.fish:88
 msgid "Check bundler requirements for your application"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:46
+#: share/completions/bundle.fish:89
+#, fuzzy
 msgid "Show all of the gems in the current bundle"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:47
+#: share/completions/bundle.fish:90
+#, fuzzy
 msgid "Show the source location of a particular gem in the bundle"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa process-id för varje process i jobbet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:48
 #: /tmp/fish/implicit/share/completions/bundle.fish:64
+#: share/completions/bundle.fish:91 share/completions/bundle.fish:121
 msgid "Show all of the outdated gems in the current bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:49
 #: /tmp/fish/implicit/share/completions/bundle.fish:69
+#: share/completions/bundle.fish:92 share/completions/bundle.fish:129
 msgid "Start an IRB session in the context of the current bundle"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:51
 #: /tmp/fish/implicit/share/completions/bundle.fish:71
+#: share/completions/bundle.fish:94 share/completions/bundle.fish:136
 msgid "Generate a visual representation of your dependencies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:52
+#: share/completions/bundle.fish:95
+#, fuzzy
 msgid "Generate a simple Gemfile"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:53
 #: /tmp/fish/implicit/share/completions/bundle.fish:78
+#: share/completions/bundle.fish:96 share/completions/bundle.fish:147
 msgid "Create a simple gem, suitable for development with bundler"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:54
 #: /tmp/fish/implicit/share/completions/bundle.fish:83
+#: share/completions/bundle.fish:97 share/completions/bundle.fish:154
+#, fuzzy
 msgid "Displays platform compatibility information"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:55
 #: /tmp/fish/implicit/share/completions/bundle.fish:85
+#: share/completions/bundle.fish:98 share/completions/bundle.fish:158
 msgid "Cleans up unused gems in your bundler directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:56
+#: share/completions/bundle.fish:105
 msgid ""
 "Determine whether the requirements for your application are installed and "
 "available to bundler"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:58
+#: share/completions/bundle.fish:107
 msgid "Specify a path other than the system default (BUNDLE_PATH or GEM_HOME)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:59
+#: share/completions/bundle.fish:108
+#, fuzzy
 msgid "Lock the Gemfile"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Logga till spårfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:60
 #: /tmp/fish/implicit/share/completions/bundle.fish:62
+#: share/completions/bundle.fish:111 share/completions/bundle.fish:116
 msgid ""
 "Show lists the names and versions of all gems that are required by your "
 "Gemfile"
@@ -10097,34 +10117,50 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:61
 #: /tmp/fish/implicit/share/completions/bundle.fish:63
+#: share/completions/bundle.fish:112 share/completions/bundle.fish:117
 msgid "List the paths of all gems required by your Gemfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:65
+#: share/completions/bundle.fish:122
+#, fuzzy
 msgid "Check for newer pre-release gems"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kontrollera förekomst av minnesläckor"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:66
+#: share/completions/bundle.fish:123
 msgid "Check against a specific source"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:67
+#: share/completions/bundle.fish:124
 msgid "Use cached gems instead of attempting to fetch gems remotely"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:68
+#: share/completions/bundle.fish:125
 msgid "Only list newer versions allowed by your Gemfile requirements"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:72
+#: share/completions/bundle.fish:137
 msgid "The name to use for the generated file (see format option)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:73
+#: share/completions/bundle.fish:138
+#, fuzzy
 msgid "Show each gem version"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Källkodsträdsversion"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:74
+#: share/completions/bundle.fish:139
 msgid "Show the version of each required dependency"
 msgstr ""
 
@@ -10133,93 +10169,95 @@ msgid "Output a specific format (png, jpg, svg, dot, …)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:76
+#: share/completions/bundle.fish:143
+#, fuzzy
 msgid "Generate a simple Gemfile, placed in the current directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:77
+#: share/completions/bundle.fish:144
 msgid "Use a specified .gemspec to create the Gemfile"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:79
+#: share/completions/bundle.fish:148
 msgid "Generate a binary for your library"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:80
+#: share/completions/bundle.fish:149
 msgid "Generate a test directory for your library (rspec or minitest)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:81
+#: share/completions/bundle.fish:150
+#, fuzzy
 msgid "Path to your editor"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj källkatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:82
+#: share/completions/bundle.fish:151
 msgid "Generate the boilerplate for C extension code"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:84
+#: share/completions/bundle.fish:155
+#, fuzzy
 msgid "Only display Ruby directive information"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:86
+#: share/completions/bundle.fish:159
 msgid "Only print out changes, do not actually clean gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:87
+#: share/completions/bundle.fish:160
 msgid "Forces clean even if --path is not set"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:88
+#: share/completions/bundle.fish:163
 msgid "Cache all the gems to vendor/cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:90
+#: share/completions/bundle.fish:165
 msgid "Include all sources (including path and git)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:91
+#: share/completions/bundle.fish:168
+#, fuzzy
 msgid "Prints the license of all gems in the bundle"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:92
+#: share/completions/bundle.fish:171
+#, fuzzy
 msgid "Print information about the environment Bundler is running under"
 msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:1
-msgid "Decompress to stdout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:2
-#: /tmp/fish/implicit/share/completions/bzip2.fish:4
-#: /tmp/fish/implicit/share/completions/gunzip.fish:2
-#: /tmp/fish/implicit/share/completions/gzip.fish:2
-#: /tmp/fish/implicit/share/completions/zcat.fish:1
-msgid "Overwrite"
-msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hämta ändringar från förrådet till arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:3
 #: /tmp/fish/implicit/share/completions/bzip2.fish:5
 msgid "Do not overwrite"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:4
-#: /tmp/fish/implicit/share/completions/bzcat.fish:1
-#: /tmp/fish/implicit/share/completions/bzip2.fish:6
-msgid "Reduce memory usage"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:5
-#: /tmp/fish/implicit/share/completions/bzip2.fish:8
-msgid "Print compression ratios"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bunzip2.fish:6
-#: /tmp/fish/implicit/share/completions/bzip2.fish:9
-#: /tmp/fish/implicit/share/completions/gunzip.fish:5
-#: /tmp/fish/implicit/share/completions/gzip.fish:5
-#: /tmp/fish/implicit/share/completions/zcat.fish:3
-msgid "Print license"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/busctl.fish:1
 msgid "Suppress message payload display"
 msgstr ""
@@ -10254,28 +10292,6 @@ msgstr ""
 msgid "Compress to stdout"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/bzip2.fish:2
-msgid "Compress file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bzip2.fish:3
-#: /tmp/fish/implicit/share/completions/gunzip.fish:11
-#: /tmp/fish/implicit/share/completions/gzip.fish:11
-msgid "Check integrity"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bzip2.fish:7
-msgid "Supress errors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bzip2.fish:11
-msgid "Small block size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/bzip2.fish:12
-msgid "Large block size"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/bzr.fish:2
 msgid "List all help topics"
 msgstr ""
@@ -10893,11 +10909,6 @@ msgstr ""
 msgid "Loop over playlist, or file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/castnow.fish:14
-#: /tmp/fish/implicit/share/completions/mplayer.fish:7
-msgid "Play in random order"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/castnow.fish:15
 msgid "List all files in directories recursively"
 msgstr ""
@@ -10930,299 +10941,10 @@ msgstr ""
 msgid "Exit when playback begins or --command completes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:2
-msgid "Increment the level of general verbosity by one"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:3
-msgid "Increment the verbose level in respect of SCSI command transport by one"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:4
-msgid "Set the misc debug value to #"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:5
-msgid "Increment the misc debug level by one"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:6
-msgid "Do not print out a status report for failed SCSI commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:7
-msgid "Force to continue on some errors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:8
-msgid "Tell cdrecord to set the SCSI IMMED flag in certain commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:9
-msgid ""
-"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"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:10
-msgid "Complete CD/DVD-Recorder recording process with the laser turned off"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:11
-msgid "Tells cdrecord to handle images created by readcd -clone"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:12
-msgid "Set SAO (Session At Once) mode, usually called Disk At Once mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:13
-msgid "Set TAO (Track At Once) writing mode"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:14
 msgid "Set RAW writing mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:15
-msgid "Select Set RAW writing, the preferred raw writing mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:16
-msgid "Select Set RAW writing, the less preferred raw writing mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:17
-msgid ""
-"Select Set RAW writing, the preferred raw writing mode if raw96r is not "
-"supported"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:18
-msgid "Allow multi session CDs to be made"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:19
-msgid ""
-"Retrieve multi session info in a form suitable for mkisofs-1.10 or later"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:20
-msgid "Retrieve and print out the table of content or PMA of a CD"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:21
-msgid "Retrieve and print out the ATIP (absolute Time in Pre-groove) info"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:22
-msgid "The disk will only be fixated"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:23
-msgid "Do not fixate the disk after writing the tracks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:24
-msgid ""
-"Wait for input to become available on standard input before trying to open "
-"the SCSI driver"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:25
-msgid "Load the media and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:26
-msgid "Load the media, lock the door and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:27
-msgid "Eject disk after doing the work"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:28
-msgid "Set the speed factor of the writing process to #"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:29
-msgid "Blank a CD-RW and exit or blank a CD-RW before writing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:30
-msgid "Format a CD-RW/DVD-RW/DVD+RW disc"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:31
-msgid "Set the FIFO (ring buffer) size to #"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:32
-msgid "Set the maximum transfer size for a single SCSI command to #"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:33
-msgid "Sets the SCSI target for the CD/DVD-Recorder"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:34
-msgid "Set the grace time before starting to write to ># seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:35
-msgid "Set the default SCSI command timeout value to # seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:36
-msgid "Allows the user to manually select a driver for the device"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:37
-msgid "Set driver specific options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:38
-msgid ""
-"Set the driveropts specified by driveropts=option list, the speed of the "
-"drive and the dummy flag and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:39
-msgid "Checks if a driver for the current drive is present and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:40
-msgid ""
-"Print the drive capabilities for SCSI-3/mmc compliant drives as obtained "
-"from mode page 0x2A"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:41
-msgid "Do an inquiry for the drive, print the inquiry info and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:42
-msgid "Scan all SCSI devices on all SCSI busses and print the inquiry strings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:43
-msgid "Try to reset the SCSI bus where the CD recorder is located"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:44
-msgid "Try to send an abort sequence to the drive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:45
-msgid "Allow cdrecord to write more than the official size of a medium"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:46
-msgid "Ignore the known size of the medium, use for debugging only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:47
-msgid "Use *.inf files to overwrite audio options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:48
-msgid "Set the default pre-gap size for all tracks except track nr 1"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:49
-msgid "Set Packet writing mode (experimental interface)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:50
-msgid "Set the packet size to #, forces fixed packet mode (experimental)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:51
-msgid ""
-"Do not close the current track, only when in packet writing mode "
-"(experimental)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:52
-msgid "Set the Media Catalog Number of the CD"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:53
-msgid ""
-"Write CD-Text info based on info taken from a file that contains ascii info "
-"for the text strings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:54
-msgid "Write CD-Text based on info found in the binary file filename"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:55
-msgid "Take all recording related info from a CDRWIN compliant CUE sheet file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:56
-msgid "Set the International Standard Recording Number for the next track"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:57
-msgid "Sets an index list for the next track"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:58
-msgid "All subsequent tracks are written in CD-DA audio format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:59
-msgid "Audio data is assumed to be in byte-swapped (little-endian) order"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:60
-msgid "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:61
-msgid "All subsequent tracks are written in CD-ROM mode 2 format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:62
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:63
-msgid "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:64
-msgid "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:65
-msgid ""
-"All subsequent tracks are written in a way that allows a mix of CD-ROM XA "
-"mode 2 form 1/2 format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:66
-msgid "The TOC type for the disk is set to CDI, with XA only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:67
-msgid "Use the ISO-9660 file system size as the size of the next track"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:68
-msgid ""
-"15 sectors of zeroed data will be added to the end of this and each "
-"subsequent data track"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:69
-msgid "Set the amount of data to be appended as padding to the next track"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cdrecord.fish:70
-msgid "Do not pad the following tracks - the default"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cdrecord.fish:71
 msgid ""
 "Allow all subsequent tracks to violate the Red Book track length standard "
@@ -11274,47 +10996,16 @@ msgid ""
 "this option to specify the valid amount of data on this disk"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/chgrp.fish:1
-#: /tmp/fish/implicit/share/completions/chown.fish:1
-msgid "Output diagnostic for changed files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/chgrp.fish:2
 #: /tmp/fish/implicit/share/completions/chown.fish:2
 msgid "Dereference symbolic links"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/chgrp.fish:3
-#: /tmp/fish/implicit/share/completions/chown.fish:3
-msgid "Do not dereference symbolic links"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/chgrp.fish:4
-#: /tmp/fish/implicit/share/completions/chown.fish:4
-msgid "Change from owner/group"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/chgrp.fish:5
 #: /tmp/fish/implicit/share/completions/chown.fish:5
 msgid "Suppress errors"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/chgrp.fish:6
-#: /tmp/fish/implicit/share/completions/chown.fish:6
-msgid "Use same owner/group as file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/chgrp.fish:7
-#: /tmp/fish/implicit/share/completions/chown.fish:7
-#: /tmp/fish/implicit/share/completions/zip.fish:5
-msgid "Operate recursively"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/chgrp.fish:8
-#: /tmp/fish/implicit/share/completions/chown.fish:8
-msgid "Output diagnostic for every file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/chmod.fish:1
 msgid "Like verbose but report only when a change is made"
 msgstr ""
@@ -11344,11 +11035,9 @@ msgstr ""
 msgid "Change files and directories recursively"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/chown.fish:11
-#: /tmp/fish/implicit/share/completions/chown.fish:12
-#: /tmp/fish/implicit/share/completions/w.fish:6
+#: share/completions/w.fish:6
 msgid "Username"
-msgstr ""
+msgstr "Användarnamn"
 
 #: /tmp/fish/implicit/share/completions/chsh.fish:1
 msgid "Specify your login shell"
@@ -11583,50 +11272,6 @@ msgstr ""
 msgid "Print the file that would be executed"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/command.fish:3
-#: /tmp/fish/implicit/share/completions/mosh.fish:1
-#: /tmp/fish/implicit/share/completions/setsid.fish:1
-#: /tmp/fish/implicit/share/completions/ssh.fish:1
-#: /tmp/fish/implicit/share/completions/sudo.fish:20
-msgid "Command to run"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:2
-msgid "Add text to the end of the selected area"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:3
-msgid "Add text at cursor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:4
-msgid "Replace selected part"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:5
-msgid "Select job under cursor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:6
-msgid "Select process under cursor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:7
-msgid "Select token under cursor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:8
-msgid "Select entire command line (default)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:9
-msgid "Only return that part of the command line before the cursor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/commandline.fish:10
-msgid "Inject readline functions to reader"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/commandline.fish:11
 msgid "Print each token on a separate line"
 msgstr ""
@@ -11635,10 +11280,6 @@ msgstr ""
 msgid "Specify command to operate on"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/commandline.fish:13
-msgid "Set/get cursor position, not buffer contents"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/commandline.fish:14
 msgid "Print the line that the cursor is on"
 msgstr ""
@@ -11762,50 +11403,6 @@ msgstr ""
 msgid "Declare the image as modified"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/complete.fish:1
-msgid "Command to add completion to"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:2
-msgid "Path to add completion to"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:3
-msgid "Posix-style option to complete"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:4
-msgid "GNU-style option to complete"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:5
-msgid "Old style long option to complete"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:6
-msgid "Do not use file completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:7
-msgid "Require parameter"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:8
-msgid "Require parameter and do not use file completion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:9
-msgid "A list of possible arguments"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:10
-msgid "Description of this completions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/complete.fish:11
-msgid "Option list is not complete"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/complete.fish:12
 msgid "Remove completion"
 msgstr ""
@@ -11814,12 +11411,6 @@ msgstr ""
 msgid "Print all completions for the specified commandline"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/complete.fish:15
-msgid ""
-"The completion should only be used if the specified command has a zero exit "
-"status"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/complete.fish:16
 msgid "Inherit completions from the specified command"
 msgstr ""
@@ -12176,42 +11767,14 @@ msgstr ""
 msgid "Swap two images in the image sequence [indexes]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/configure.fish:4
+#: share/completions/configure.fish:4
 msgid "Cache test results in specified file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:5
-msgid "Cache test results in file config.cache"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:6
-msgid "Do not create output files"
-msgstr ""
+msgstr "Cache:a resultat i angiven fil"
 
 #: /tmp/fish/implicit/share/completions/configure.fish:7
 msgid "Set source directory"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/configure.fish:8
-msgid "Architecture-independent install directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:9
-msgid "Architecture-dependent install directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:10
-msgid "Configure for building on BUILD"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:11
-msgid "Cross-compile to build programs to run on HOST"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/configure.fish:12
-msgid "Configure for building compilers for TARGET"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/connmanctl.fish:1
 msgid "Shows if the system is online or offline"
 msgstr ""
@@ -12652,21 +12215,21 @@ msgstr ""
 msgid "Reject reason"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cut.fish:1
+#: share/completions/cut.fish:2
 msgid "Output byte range"
-msgstr ""
+msgstr "Välj bytsekvens"
 
-#: /tmp/fish/implicit/share/completions/cut.fish:2
+#: share/completions/cut.fish:3
 msgid "Output character range"
-msgstr ""
+msgstr "Välj teckensekvens"
 
-#: /tmp/fish/implicit/share/completions/cut.fish:3
+#: share/completions/cut.fish:4
 msgid "Select field delimiter"
-msgstr ""
+msgstr "Välj fältavgränsare"
 
-#: /tmp/fish/implicit/share/completions/cut.fish:4
+#: share/completions/cut.fish:5
 msgid "Select fields"
-msgstr ""
+msgstr "Välj fält"
 
 #: /tmp/fish/implicit/share/completions/cut.fish:5
 msgid "Don't split multi byte characters"
@@ -12676,10 +12239,6 @@ msgstr ""
 msgid "Do not print lines without delimiter"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cut.fish:7
-msgid "Select output delimiter"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:1
 msgid "Displays usage information for command."
 msgstr ""
@@ -12749,69 +12308,62 @@ msgid "Use IPv6 addresses only."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:19
+#: share/completions/cvs.fish:35
+#, fuzzy
 msgid "Set CVS user variable."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj CVS-användare"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:20
+#: share/completions/cvs.fish:41
 msgid "Add a new file/directory to the repository"
-msgstr ""
+msgstr "Lägg till fil/katalog till förråd"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:21
+#: share/completions/cvs.fish:42
 msgid "Administration front end for rcs"
-msgstr ""
+msgstr "Administrationsfrontend för rcs"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:22
+#: share/completions/cvs.fish:43
 msgid "Show last revision where each line was modified"
-msgstr ""
+msgstr "Visa senaste revision vid vilken vare rad ändrades"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:23
+#: share/completions/cvs.fish:44
 msgid "Checkout sources for editing"
-msgstr ""
+msgstr "Checka ut källkod för redigering"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:24
+#: share/completions/cvs.fish:45
 msgid "Check files into the repository"
-msgstr ""
+msgstr "Checka in filer till förråd"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:25
+#: share/completions/cvs.fish:46
 msgid "Show differences between revisions"
-msgstr ""
+msgstr "Visa skillnader mellan revisioner"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:26
+#: share/completions/cvs.fish:47
 msgid "Get ready to edit a watched file"
-msgstr ""
+msgstr "Förbered redigering av övervakad fil"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:27
+#: share/completions/cvs.fish:48
 msgid "See who is editing a watched file"
-msgstr ""
+msgstr "Se vem som redigerar övervakad fil"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:28
+#: share/completions/cvs.fish:49
 msgid "Export sources from CVS, similar to checkout"
-msgstr ""
+msgstr "Exportera källkod från CSV"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:29
+#: share/completions/cvs.fish:50
 msgid "Show repository access history"
-msgstr ""
+msgstr "Visa förrådets åtkomsthistorik"
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:30
+#: share/completions/cvs.fish:51
 msgid "Import sources into CVS, using vendor branches"
-msgstr ""
+msgstr "Importera källor till CVS"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:31
 msgid "Create a CVS repository if it doesn't exist"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:32
-msgid "Kerberos server mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:33
-msgid "Print out history information for files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:34
-msgid "Prompt for password for authenticating server"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:35
 msgid "Removes entry in .cvspass for remote repository"
 msgstr ""
@@ -12820,58 +12372,22 @@ msgstr ""
 msgid "List files available from CVS"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:37
-msgid "Password server mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:38
-msgid "Show last revision where each line of module was modified"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:39
 msgid "Create 'patch' format diffs between releases"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:40
-msgid "Indicate that a Module is no longer in use"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:41
 msgid "Remove an entry from the repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:42
-msgid "Print out history information for a module"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:43
 msgid "List files in a module"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:44
-msgid "Add a symbolic tag to a module"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:45
-msgid "Server mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:46
-msgid "Display status information on checked out files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/cvs.fish:47
-msgid "Add a symbolic tag to checked out version of files"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:48
 msgid "Undo an edit command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:49
-msgid "Bring work tree in sync with repository"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:50
 msgid "Show current CVS version(s)"
 msgstr ""
@@ -12880,10 +12396,6 @@ msgstr ""
 msgid "Set watches"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/cvs.fish:52
-msgid "See who is watching a file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/cvs.fish:53
 msgid "Use \"rcs-kflag\" to add the file with the specified"
 msgstr ""
@@ -12905,6 +12417,7 @@ msgid "[rev]    Set default branch (highest branch on trunk if omitted)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:58
+#: share/completions/cvs.fish:91
 msgid "Set comment leader."
 msgstr ""
 
@@ -12917,8 +12430,13 @@ msgid "Run interactively."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
+#: share/completions/cvs.fish:94
+#, fuzzy
 msgid "Set keyword substitution mode:"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange standardnyckelordssubstitution"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:62
 msgid "[rev]    Lock revision (latest revision on branch,"
@@ -13061,24 +12579,29 @@ msgid "Like -c, but include module status."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:90
+#: share/completions/cvs.fish:135
 msgid "Check out revision or tag. (implies -P) (is sticky)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:91
+#: share/completions/cvs.fish:136
 msgid "Check out revisions as of date. (implies -P) (is sticky)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:92
+#: share/completions/cvs.fish:137
 msgid "Check out into dir instead of module name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:93
 #: /tmp/fish/implicit/share/completions/cvs.fish:280
+#: share/completions/cvs.fish:138
 msgid "Use RCS kopt -k option on checkout. (is sticky)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:94
 #: /tmp/fish/implicit/share/completions/cvs.fish:283
+#: share/completions/cvs.fish:139
 msgid "Merge in changes made between current revision and rev."
 msgstr ""
 
@@ -13095,36 +12618,56 @@ msgid "Force the file to be committed; disables recursion."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:99
+#: share/completions/cvs.fish:150
+#, fuzzy
 msgid "Read the log message from file."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs loggmeddelande från fil"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:100
 #: /tmp/fish/implicit/share/completions/cvs.fish:180
+#: share/completions/cvs.fish:151
+#, fuzzy
 msgid "Log message."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ersätt ett loggmeddelande"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:101
+#: share/completions/cvs.fish:152
 msgid "Commit to this branch or trunk revision."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:104
 #: /tmp/fish/implicit/share/completions/cvs.fish:218
+#: share/completions/cvs.fish:161
+#, fuzzy
 msgid "Specify keyword expansion mode."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj kärnversion"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:105
+#: share/completions/cvs.fish:162
 msgid "Diff revision for date against working file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:106
+#: share/completions/cvs.fish:163
 msgid "Diff rev1/date1 against date2."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:107
+#: share/completions/cvs.fish:164
 msgid "Diff revision for rev1 against working file."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:108
+#: share/completions/cvs.fish:165
 msgid "Diff rev1/date1 against rev2."
 msgstr ""
 
@@ -13145,8 +12688,13 @@ msgid "--ignore-blank-lines  Ignore changes whose lines are all blank."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:113
+#: share/completions/cvs.fish:170
+#, fuzzy
 msgid "--ignore-matching-lines=RE  Ignore changes whose lines all match RE."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ignorera ändringar som matchar REGEX"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:114
 msgid "Binary  Read and write data in binary mode."
@@ -13171,6 +12719,7 @@ msgid "UM  Use NUM context lines."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:119
+#: share/completions/cvs.fish:176
 msgid "--label LABEL  Use LABEL instead of file name."
 msgstr ""
 
@@ -13179,6 +12728,7 @@ msgid "--show-c-function  Show which C function each change is in."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:121
+#: share/completions/cvs.fish:178
 msgid "--show-function-line=RE  Show the most recent line matching RE."
 msgstr ""
 
@@ -13203,6 +12753,7 @@ msgid "--side-by-side  Output in two columns."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:127
+#: share/completions/cvs.fish:184
 msgid "--width=NUM  Output at most NUM (default 130) characters per line."
 msgstr ""
 
@@ -13292,18 +12843,26 @@ msgid "Process this directory only (not recursive)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:153
+#: share/completions/cvs.fish:228
+#, fuzzy
 msgid "Export tagged revisions."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Slå ihop revisioner"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:154
+#: share/completions/cvs.fish:229
 msgid "Export revisions as of date."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:155
+#: share/completions/cvs.fish:230
 msgid "Export into dir instead of module name."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:156
+#: share/completions/cvs.fish:231
 msgid "Use RCS kopt -k option on checkout."
 msgstr ""
 
@@ -13320,12 +12879,18 @@ msgid "Checked out modules"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:160
+#: share/completions/cvs.fish:241
 msgid "Look for specified module (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:161
+#: share/completions/cvs.fish:242
+#, fuzzy
 msgid "Extract by record type"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange posttyp"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:162
 msgid "Everything (same as -x, but all record types)"
@@ -13344,38 +12909,51 @@ msgid "Working directory must match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
+#: share/completions/cvs.fish:247
+#, fuzzy
 msgid "Since date (Many formats)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Format för profileringsdata"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:167
+#: share/completions/cvs.fish:248
 msgid "Back to record with str in module/file/repos field"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:168
+#: share/completions/cvs.fish:249
 msgid "Specified file (same as command line) (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:169
+#: share/completions/cvs.fish:250
 msgid "In module (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:170
+#: share/completions/cvs.fish:251
 msgid "In repository (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:171
+#: share/completions/cvs.fish:252
 msgid "Since rev or tag (looks inside RCS files!)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:172
+#: share/completions/cvs.fish:253
 msgid "Since tag record placed in history file (by anyone)."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:173
+#: share/completions/cvs.fish:254
 msgid "For user name (repeatable)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:174
+#: share/completions/cvs.fish:255
 msgid "Output for time zone <tz> (e.g. -z -0700)"
 msgstr ""
 
@@ -13715,104 +13293,165 @@ msgid "Set the specified option"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:3
+#: share/completions/darcs.fish:19
+#, fuzzy
 msgid "Display help about darcs and darcs commands"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa användningsinformation för kommando"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:4
+#: share/completions/darcs.fish:20
 msgid "Add one or more new files or directories"
-msgstr ""
+msgstr "Lägg till filer eller kataloger till lagret"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:5
+#: share/completions/darcs.fish:21
+#, fuzzy
 msgid "Remove files from version control"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Placera filer och kataloger under versionskontroll"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:6
+#: share/completions/darcs.fish:22
+#, fuzzy
 msgid "Move or rename files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skapa inte fil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:7
+#: share/completions/darcs.fish:23
 msgid "Substitute one word for another"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:8
+#: share/completions/darcs.fish:24
+#, fuzzy
 msgid "Discard unrecorded changes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa olagrade ändringar i arbetskopian"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:9
+#: share/completions/darcs.fish:25
 msgid "Undo the last revert (may fail if changes after the revert)"
 msgstr ""
+"Ångra senaste revert-operation (kan misslyckas om ändringar har utförts "
+"efter revert-operationen)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:10
+#: share/completions/darcs.fish:26
+#, fuzzy
 msgid "List unrecorded changes in the working tree"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa olagrade ändringar i arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:11
+#: share/completions/darcs.fish:27
+#, fuzzy
 msgid "Create a patch from unrecorded changes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skapa komprimerade fixar"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:12
+#: share/completions/darcs.fish:28
 msgid "Remove recorded patches without changing the working copy"
-msgstr ""
+msgstr "Ta bort lagrade fixar utan att ändra arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:13
+#: share/completions/darcs.fish:29
+#, fuzzy
 msgid "Improve a patch before it leaves your repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ersätt den lagrade fixen med en bättre version"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:14
+#: share/completions/darcs.fish:30
+#, fuzzy
 msgid "Mark unresolved conflicts in working tree, for manual resolution"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Markera konflikter mot arketskopian för manuell lösning"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:15
+#: share/completions/darcs.fish:31
 msgid "Name the current repository state for future reference"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:16
+#: share/completions/darcs.fish:32
+#, fuzzy
 msgid "Set a preference (test, predist, boringfile or binariesfile)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj ett värde för en preferens (test, predisk, ...)"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:17
+#: share/completions/darcs.fish:33
 msgid "Create a diff between two versions of the repository"
-msgstr ""
+msgstr "Skappa en diff mellan två versioner i lagret"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:18
+#: share/completions/darcs.fish:34
+#, fuzzy
 msgid "List patches in the repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Uppdatera förråd"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:19
+#: share/completions/darcs.fish:35
 msgid "Display which patch last modified something"
-msgstr ""
+msgstr "Visa vilken fix som senast ändrade någonting"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:20
+#: share/completions/darcs.fish:36
 msgid "Create a distribution tarball"
-msgstr ""
+msgstr "Skapa distribuerbar tar-fil"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:21
+#: share/completions/darcs.fish:37
 msgid "Locate the most recent version lacking an error"
-msgstr ""
+msgstr "Hitta senaste version utan ett givet fel"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:22
+#: share/completions/darcs.fish:38
 msgid "Show information which is stored by darcs"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:23
+#: share/completions/darcs.fish:39
 msgid "Copy and apply patches from another repository to this one"
-msgstr ""
+msgstr "Kopiera och applicera fixar från ett annat förråd till detta"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:24
+#: share/completions/darcs.fish:40
+#, fuzzy
 msgid "Delete selected patches from the repository. (UNSAFE!)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ordna om fixarna i förrådet"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:25
+#: share/completions/darcs.fish:41
 msgid "Record a new patch reversing some recorded changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:26
+#: share/completions/darcs.fish:42
 msgid "Copy and apply patches from this repository to another one"
-msgstr ""
+msgstr "Kopiera och applicera fixar från detta förråd till ett annat"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:27
+#: share/completions/darcs.fish:43
 msgid "Send by email a bundle of one or more patches"
-msgstr ""
+msgstr "Skicka e-postpaket av en eller flera fixar"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:403
 msgid "Path to a version-controlled boring file"
@@ -13822,69 +13461,69 @@ msgstr ""
 msgid "Path to a version-controlled binaries file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:405
-#: /tmp/fish/implicit/share/completions/darcs.fish:439
-#: /tmp/fish/implicit/share/completions/darcs.fish:847
-#: /tmp/fish/implicit/share/completions/darcs.fish:880
+#: share/completions/darcs.fish:551 share/completions/darcs.fish:1025
 msgid "Select changes up to a patch matching PATTERN"
-msgstr ""
+msgstr "Välj ändringar fram till fix som matchar MÖNSTER"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:406
-#: /tmp/fish/implicit/share/completions/darcs.fish:440
-#: /tmp/fish/implicit/share/completions/darcs.fish:848
-#: /tmp/fish/implicit/share/completions/darcs.fish:881
+#: share/completions/darcs.fish:552 share/completions/darcs.fish:1026
 msgid "Select changes up to a patch matching REGEXP"
-msgstr ""
+msgstr "Välj ändringar fram till fix som matchar REGEXP"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:407
-#: /tmp/fish/implicit/share/completions/darcs.fish:441
+#: share/completions/darcs.fish:553
 msgid "Select changes up to a tag matching REGEXP"
-msgstr ""
+msgstr "Välj ändringar fram till tag som matchar REGEXP"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:408
-#: /tmp/fish/implicit/share/completions/darcs.fish:442
-#: /tmp/fish/implicit/share/completions/darcs.fish:619
-#: /tmp/fish/implicit/share/completions/darcs.fish:657
+#: share/completions/darcs.fish:340 share/completions/darcs.fish:554
+#: share/completions/darcs.fish:767
 msgid "Select changes starting with a patch matching PATTERN"
-msgstr ""
+msgstr "Välj ändringar som börjar med fix som matchar MÖNSTER"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:409
-#: /tmp/fish/implicit/share/completions/darcs.fish:443
-#: /tmp/fish/implicit/share/completions/darcs.fish:620
-#: /tmp/fish/implicit/share/completions/darcs.fish:658
+#: share/completions/darcs.fish:341 share/completions/darcs.fish:555
+#: share/completions/darcs.fish:768
 msgid "Select changes starting with a patch matching REGEXP"
-msgstr ""
+msgstr "Välj ändringar som börjar med fix som matchar REGEXP"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:410
-#: /tmp/fish/implicit/share/completions/darcs.fish:444
-#: /tmp/fish/implicit/share/completions/darcs.fish:621
-#: /tmp/fish/implicit/share/completions/darcs.fish:659
+#: share/completions/darcs.fish:342 share/completions/darcs.fish:556
+#: share/completions/darcs.fish:769
 msgid "Select changes starting with a tag matching REGEXP"
-msgstr ""
+msgstr "Välj ändringar som börjar med tagg som matchar REGEXP"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:411
 #: /tmp/fish/implicit/share/completions/darcs.fish:495
 #: /tmp/fish/implicit/share/completions/darcs.fish:520
+#: share/completions/darcs.fish:378
+#, fuzzy
 msgid "Select a single patch matching PATTERN"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj fix som matchar MÖNSTER"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:412
 #: /tmp/fish/implicit/share/completions/darcs.fish:496
 #: /tmp/fish/implicit/share/completions/darcs.fish:521
+#: share/completions/darcs.fish:379
+#, fuzzy
 msgid "Select a single patch matching REGEXP"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj fix som matchar REGEXP"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:413
-#: /tmp/fish/implicit/share/completions/darcs.fish:445
-#: /tmp/fish/implicit/share/completions/darcs.fish:622
-#: /tmp/fish/implicit/share/completions/darcs.fish:660
+#: share/completions/darcs.fish:343 share/completions/darcs.fish:557
+#: share/completions/darcs.fish:770
 msgid "Select the last NUMBER patches"
-msgstr ""
+msgstr "Välj angivet antal fixar av de senaste fixarna"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:414
 #: /tmp/fish/implicit/share/completions/darcs.fish:446
+#: share/completions/darcs.fish:558
+#, fuzzy
 msgid "Select a range of patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj angivet antal fixar av de senaste fixarna"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:415
 msgid "Specify diff command (ignores --diff-opts)"
@@ -13902,24 +13541,16 @@ msgstr ""
 msgid "Output patch in diff's dumb format"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:419
-#: /tmp/fish/implicit/share/completions/darcs.fish:463
-#: /tmp/fish/implicit/share/completions/darcs.fish:500
-#: /tmp/fish/implicit/share/completions/darcs.fish:519
-#: /tmp/fish/implicit/share/completions/darcs.fish:543
-#: /tmp/fish/implicit/share/completions/darcs.fish:583
-#: /tmp/fish/implicit/share/completions/darcs.fish:631
-#: /tmp/fish/implicit/share/completions/darcs.fish:675
-#: /tmp/fish/implicit/share/completions/darcs.fish:710
-#: /tmp/fish/implicit/share/completions/darcs.fish:766
-#: /tmp/fish/implicit/share/completions/darcs.fish:813
-#: /tmp/fish/implicit/share/completions/darcs.fish:889
-#: /tmp/fish/implicit/share/completions/darcs.fish:918
-#: /tmp/fish/implicit/share/completions/darcs.fish:936
-#: /tmp/fish/implicit/share/completions/darcs.fish:969
-#: /tmp/fish/implicit/share/completions/darcs.fish:989
+#: share/completions/darcs.fish:116 share/completions/darcs.fish:146
+#: share/completions/darcs.fish:203 share/completions/darcs.fish:234
+#: share/completions/darcs.fish:264 share/completions/darcs.fish:352
+#: share/completions/darcs.fish:456 share/completions/darcs.fish:482
+#: share/completions/darcs.fish:525 share/completions/darcs.fish:725
+#: share/completions/darcs.fish:779 share/completions/darcs.fish:829
+#: share/completions/darcs.fish:870 share/completions/darcs.fish:985
+#: share/completions/darcs.fish:1073 share/completions/darcs.fish:1197
 msgid "Specify the repository directory in which to run"
-msgstr ""
+msgstr "Välj vilket förråd som skall användas"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:420
 #: /tmp/fish/implicit/share/completions/darcs.fish:524
@@ -13931,49 +13562,6 @@ msgstr ""
 msgid "Do patch application on disk [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:422
-#: /tmp/fish/implicit/share/completions/darcs.fish:466
-#: /tmp/fish/implicit/share/completions/darcs.fish:501
-#: /tmp/fish/implicit/share/completions/darcs.fish:526
-#: /tmp/fish/implicit/share/completions/darcs.fish:544
-#: /tmp/fish/implicit/share/completions/darcs.fish:585
-#: /tmp/fish/implicit/share/completions/darcs.fish:636
-#: /tmp/fish/implicit/share/completions/darcs.fish:676
-#: /tmp/fish/implicit/share/completions/darcs.fish:714
-#: /tmp/fish/implicit/share/completions/darcs.fish:769
-#: /tmp/fish/implicit/share/completions/darcs.fish:814
-#: /tmp/fish/implicit/share/completions/darcs.fish:857
-#: /tmp/fish/implicit/share/completions/darcs.fish:890
-#: /tmp/fish/implicit/share/completions/darcs.fish:919
-#: /tmp/fish/implicit/share/completions/darcs.fish:943
-#: /tmp/fish/implicit/share/completions/darcs.fish:972
-#: /tmp/fish/implicit/share/completions/darcs.fish:990
-#: /tmp/fish/implicit/share/completions/darcs.fish:1010
-msgid "Disable this command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:423
-#: /tmp/fish/implicit/share/completions/darcs.fish:467
-#: /tmp/fish/implicit/share/completions/darcs.fish:502
-#: /tmp/fish/implicit/share/completions/darcs.fish:527
-#: /tmp/fish/implicit/share/completions/darcs.fish:545
-#: /tmp/fish/implicit/share/completions/darcs.fish:562
-#: /tmp/fish/implicit/share/completions/darcs.fish:586
-#: /tmp/fish/implicit/share/completions/darcs.fish:637
-#: /tmp/fish/implicit/share/completions/darcs.fish:677
-#: /tmp/fish/implicit/share/completions/darcs.fish:715
-#: /tmp/fish/implicit/share/completions/darcs.fish:770
-#: /tmp/fish/implicit/share/completions/darcs.fish:815
-#: /tmp/fish/implicit/share/completions/darcs.fish:858
-#: /tmp/fish/implicit/share/completions/darcs.fish:891
-#: /tmp/fish/implicit/share/completions/darcs.fish:920
-#: /tmp/fish/implicit/share/completions/darcs.fish:944
-#: /tmp/fish/implicit/share/completions/darcs.fish:973
-#: /tmp/fish/implicit/share/completions/darcs.fish:991
-#: /tmp/fish/implicit/share/completions/darcs.fish:1011
-msgid "Shows brief description of command and its arguments"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:424
 #: /tmp/fish/implicit/share/completions/darcs.fish:468
 #: /tmp/fish/implicit/share/completions/darcs.fish:503
@@ -14058,48 +13646,6 @@ msgstr ""
 msgid "Give verbose output"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:428
-#: /tmp/fish/implicit/share/completions/darcs.fish:472
-#: /tmp/fish/implicit/share/completions/darcs.fish:507
-#: /tmp/fish/implicit/share/completions/darcs.fish:532
-#: /tmp/fish/implicit/share/completions/darcs.fish:550
-#: /tmp/fish/implicit/share/completions/darcs.fish:591
-#: /tmp/fish/implicit/share/completions/darcs.fish:642
-#: /tmp/fish/implicit/share/completions/darcs.fish:682
-#: /tmp/fish/implicit/share/completions/darcs.fish:720
-#: /tmp/fish/implicit/share/completions/darcs.fish:775
-#: /tmp/fish/implicit/share/completions/darcs.fish:820
-#: /tmp/fish/implicit/share/completions/darcs.fish:863
-#: /tmp/fish/implicit/share/completions/darcs.fish:896
-#: /tmp/fish/implicit/share/completions/darcs.fish:925
-#: /tmp/fish/implicit/share/completions/darcs.fish:949
-#: /tmp/fish/implicit/share/completions/darcs.fish:978
-#: /tmp/fish/implicit/share/completions/darcs.fish:996
-#: /tmp/fish/implicit/share/completions/darcs.fish:1016
-msgid "Suppress informational output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:429
-#: /tmp/fish/implicit/share/completions/darcs.fish:473
-#: /tmp/fish/implicit/share/completions/darcs.fish:508
-#: /tmp/fish/implicit/share/completions/darcs.fish:533
-#: /tmp/fish/implicit/share/completions/darcs.fish:551
-#: /tmp/fish/implicit/share/completions/darcs.fish:592
-#: /tmp/fish/implicit/share/completions/darcs.fish:643
-#: /tmp/fish/implicit/share/completions/darcs.fish:683
-#: /tmp/fish/implicit/share/completions/darcs.fish:721
-#: /tmp/fish/implicit/share/completions/darcs.fish:776
-#: /tmp/fish/implicit/share/completions/darcs.fish:821
-#: /tmp/fish/implicit/share/completions/darcs.fish:864
-#: /tmp/fish/implicit/share/completions/darcs.fish:897
-#: /tmp/fish/implicit/share/completions/darcs.fish:926
-#: /tmp/fish/implicit/share/completions/darcs.fish:950
-#: /tmp/fish/implicit/share/completions/darcs.fish:979
-#: /tmp/fish/implicit/share/completions/darcs.fish:997
-#: /tmp/fish/implicit/share/completions/darcs.fish:1017
-msgid "Neither verbose nor quiet output"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:430
 #: /tmp/fish/implicit/share/completions/darcs.fish:474
 #: /tmp/fish/implicit/share/completions/darcs.fish:509
@@ -14139,8 +13685,21 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:981
 #: /tmp/fish/implicit/share/completions/darcs.fish:1000
 #: /tmp/fish/implicit/share/completions/darcs.fish:1025
+#: share/completions/darcs.fish:102 share/completions/darcs.fish:128
+#: share/completions/darcs.fish:157 share/completions/darcs.fish:187
+#: share/completions/darcs.fish:245 share/completions/darcs.fish:326
+#: share/completions/darcs.fish:364 share/completions/darcs.fish:408
+#: share/completions/darcs.fish:468 share/completions/darcs.fish:493
+#: share/completions/darcs.fish:537 share/completions/darcs.fish:753
+#: share/completions/darcs.fish:841 share/completions/darcs.fish:893
+#: share/completions/darcs.fish:1183 share/completions/darcs.fish:1208
+#: share/completions/darcs.fish:1239
+#, fuzzy
 msgid "Specify command to run after this darcs command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange kommando att köra efter detta darcs-kommando"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:432
 #: /tmp/fish/implicit/share/completions/darcs.fish:482
@@ -14223,8 +13782,20 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:985
 #: /tmp/fish/implicit/share/completions/darcs.fish:1004
 #: /tmp/fish/implicit/share/completions/darcs.fish:1029
+#: share/completions/darcs.fish:71 share/completions/darcs.fish:220
+#: share/completions/darcs.fish:283 share/completions/darcs.fish:439
+#: share/completions/darcs.fish:597 share/completions/darcs.fish:632
+#: share/completions/darcs.fish:663 share/completions/darcs.fish:688
+#: share/completions/darcs.fish:801 share/completions/darcs.fish:959
+#: share/completions/darcs.fish:1010 share/completions/darcs.fish:1054
+#: share/completions/darcs.fish:1095 share/completions/darcs.fish:1122
+#: share/completions/darcs.fish:1155
+#, fuzzy
 msgid "Specify command to run before this darcs command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange kommando att köra efter detta darcs-kommando"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:436
 #: /tmp/fish/implicit/share/completions/darcs.fish:486
@@ -14289,34 +13860,26 @@ msgstr ""
 msgid "Run prehook command without prompting"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:447
-#: /tmp/fish/implicit/share/completions/darcs.fish:563
-#: /tmp/fish/implicit/share/completions/darcs.fish:623
-#: /tmp/fish/implicit/share/completions/darcs.fish:661
-#: /tmp/fish/implicit/share/completions/darcs.fish:695
-#: /tmp/fish/implicit/share/completions/darcs.fish:741
+#: share/completions/darcs.fish:344 share/completions/darcs.fish:559
+#: share/completions/darcs.fish:771 share/completions/darcs.fish:855
+#: share/completions/darcs.fish:907
 msgid "Select patches matching PATTERN"
-msgstr ""
+msgstr "Välj fixar som matchar MÖNSTER"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:448
-#: /tmp/fish/implicit/share/completions/darcs.fish:564
-#: /tmp/fish/implicit/share/completions/darcs.fish:624
-#: /tmp/fish/implicit/share/completions/darcs.fish:662
-#: /tmp/fish/implicit/share/completions/darcs.fish:696
-#: /tmp/fish/implicit/share/completions/darcs.fish:742
+#: share/completions/darcs.fish:345 share/completions/darcs.fish:560
+#: share/completions/darcs.fish:772 share/completions/darcs.fish:856
+#: share/completions/darcs.fish:908
 msgid "Select patches matching REGEXP"
-msgstr ""
+msgstr "Välj fixar som matchar REGEXP"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:449
-#: /tmp/fish/implicit/share/completions/darcs.fish:565
-#: /tmp/fish/implicit/share/completions/darcs.fish:625
-#: /tmp/fish/implicit/share/completions/darcs.fish:663
-#: /tmp/fish/implicit/share/completions/darcs.fish:697
-#: /tmp/fish/implicit/share/completions/darcs.fish:743
+#: share/completions/darcs.fish:346 share/completions/darcs.fish:561
+#: share/completions/darcs.fish:773 share/completions/darcs.fish:857
+#: share/completions/darcs.fish:909
 msgid "Select tags matching REGEXP"
-msgstr ""
+msgstr "Välj taggar som matchar REGEXP"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:450
+#: share/completions/darcs.fish:562
 msgid "Return only NUMBER results"
 msgstr ""
 
@@ -14328,25 +13891,6 @@ msgstr ""
 msgid "Show changes to all files [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:453
-msgid "Give output suitable for get --context"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:454
-#: /tmp/fish/implicit/share/completions/darcs.fish:494
-#: /tmp/fish/implicit/share/completions/darcs.fish:575
-#: /tmp/fish/implicit/share/completions/darcs.fish:635
-#: /tmp/fish/implicit/share/completions/darcs.fish:707
-#: /tmp/fish/implicit/share/completions/darcs.fish:760
-#: /tmp/fish/implicit/share/completions/darcs.fish:803
-msgid "Generate XML formatted output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:455
-#: /tmp/fish/implicit/share/completions/darcs.fish:493
-msgid "Give human-readable output"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:456
 msgid "Number the changes"
 msgstr ""
@@ -14364,15 +13908,6 @@ msgstr ""
 msgid "Summarize changes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:459
-#: /tmp/fish/implicit/share/completions/darcs.fish:490
-#: /tmp/fish/implicit/share/completions/darcs.fish:577
-#: /tmp/fish/implicit/share/completions/darcs.fish:633
-#: /tmp/fish/implicit/share/completions/darcs.fish:709
-#: /tmp/fish/implicit/share/completions/darcs.fish:762
-msgid "Don't summarize changes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:460
 msgid "Show changes in reverse order"
 msgstr ""
@@ -14385,26 +13920,6 @@ msgstr ""
 msgid "Specify the repository URL"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:464
-#: /tmp/fish/implicit/share/completions/darcs.fish:566
-#: /tmp/fish/implicit/share/completions/darcs.fish:629
-#: /tmp/fish/implicit/share/completions/darcs.fish:664
-#: /tmp/fish/implicit/share/completions/darcs.fish:701
-#: /tmp/fish/implicit/share/completions/darcs.fish:747
-#: /tmp/fish/implicit/share/completions/darcs.fish:800
-msgid "Answer yes to all patches"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:465
-#: /tmp/fish/implicit/share/completions/darcs.fish:567
-#: /tmp/fish/implicit/share/completions/darcs.fish:630
-#: /tmp/fish/implicit/share/completions/darcs.fish:665
-#: /tmp/fish/implicit/share/completions/darcs.fish:702
-#: /tmp/fish/implicit/share/completions/darcs.fish:748
-#: /tmp/fish/implicit/share/completions/darcs.fish:801
-msgid "Prompt user interactively"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:475
 #: /tmp/fish/implicit/share/completions/darcs.fish:605
 #: /tmp/fish/implicit/share/completions/darcs.fish:727
@@ -14462,93 +13977,45 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:871
 #: /tmp/fish/implicit/share/completions/darcs.fish:906
 #: /tmp/fish/implicit/share/completions/darcs.fish:1024
+#: share/completions/darcs.fish:752 share/completions/darcs.fish:892
+#: share/completions/darcs.fish:1238
 msgid "Name of the darcs executable on the remote server"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:491
-msgid "Output patch in a darcs-specific format similar to diff -u"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:492
 msgid "Output patch in darcs' usual format"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:497
-#: /tmp/fish/implicit/share/completions/darcs.fish:522
-#: /tmp/fish/implicit/share/completions/darcs.fish:849
-#: /tmp/fish/implicit/share/completions/darcs.fish:882
+#: share/completions/darcs.fish:1027
 msgid "Select tag matching REGEXP"
-msgstr ""
+msgstr "Välj tagg som matchar REGEXP"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:498
 #: /tmp/fish/implicit/share/completions/darcs.fish:523
+#: share/completions/darcs.fish:380
+#, fuzzy
 msgid "Select one patch"
 msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:499
-msgid "Specify hash of creator patch (see docs)"
-msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj en handling"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:518
 msgid "Name of version"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:553
-#: /tmp/fish/implicit/share/completions/darcs.fish:602
-#: /tmp/fish/implicit/share/completions/darcs.fish:831
-#: /tmp/fish/implicit/share/completions/darcs.fish:853
-#: /tmp/fish/implicit/share/completions/darcs.fish:884
-#: /tmp/fish/implicit/share/completions/darcs.fish:1009
-msgid "Make scripts executable"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:568
 msgid "Mark conflicts [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:569
-#: /tmp/fish/implicit/share/completions/darcs.fish:805
-msgid "Allow conflicts, but don't mark them"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:570
 #: /tmp/fish/implicit/share/completions/darcs.fish:807
 msgid "Filter out any patches that would create conflicts"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:571
-#: /tmp/fish/implicit/share/completions/darcs.fish:808
+#: share/completions/darcs.fish:713 share/completions/darcs.fish:980
 msgid "Use external tool to merge conflicts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:572
-#: /tmp/fish/implicit/share/completions/darcs.fish:672
-#: /tmp/fish/implicit/share/completions/darcs.fish:810
-#: /tmp/fish/implicit/share/completions/darcs.fish:966
-msgid "Run the test script"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:573
-#: /tmp/fish/implicit/share/completions/darcs.fish:671
-#: /tmp/fish/implicit/share/completions/darcs.fish:809
-#: /tmp/fish/implicit/share/completions/darcs.fish:965
-msgid "Don't run the test script"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:574
-#: /tmp/fish/implicit/share/completions/darcs.fish:634
-#: /tmp/fish/implicit/share/completions/darcs.fish:706
-#: /tmp/fish/implicit/share/completions/darcs.fish:759
-#: /tmp/fish/implicit/share/completions/darcs.fish:802
-msgid "Don't actually take the action"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:578
-#: /tmp/fish/implicit/share/completions/darcs.fish:626
-#: /tmp/fish/implicit/share/completions/darcs.fish:698
-#: /tmp/fish/implicit/share/completions/darcs.fish:744
-msgid "Don't automatically fulfill dependencies"
-msgstr ""
+msgstr "Använd externt verktyg för att hantera sammanslagningskonflikter"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:579
 #: /tmp/fish/implicit/share/completions/darcs.fish:627
@@ -14566,22 +14033,6 @@ msgstr ""
 msgid "Prompt about patches that are depended on by matched patches [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:581
-#: /tmp/fish/implicit/share/completions/darcs.fish:711
-#: /tmp/fish/implicit/share/completions/darcs.fish:764
-#: /tmp/fish/implicit/share/completions/darcs.fish:851
-#: /tmp/fish/implicit/share/completions/darcs.fish:887
-msgid "Set default repository [DEFAULT]"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:582
-#: /tmp/fish/implicit/share/completions/darcs.fish:712
-#: /tmp/fish/implicit/share/completions/darcs.fish:765
-#: /tmp/fish/implicit/share/completions/darcs.fish:852
-#: /tmp/fish/implicit/share/completions/darcs.fish:888
-msgid "Don't set default repository"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:584
 #: /tmp/fish/implicit/share/completions/darcs.fish:713
 #: /tmp/fish/implicit/share/completions/darcs.fish:768
@@ -14631,8 +14082,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:601
 #: /tmp/fish/implicit/share/completions/darcs.fish:726
 #: /tmp/fish/implicit/share/completions/darcs.fish:781
+#: share/completions/darcs.fish:886
+#, fuzzy
 msgid "Specify the remote repository URL to work with"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:603
 #: /tmp/fish/implicit/share/completions/darcs.fish:648
@@ -14640,6 +14096,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:832
 #: /tmp/fish/implicit/share/completions/darcs.fish:954
 #: /tmp/fish/implicit/share/completions/darcs.fish:999
+#: share/completions/darcs.fish:101 share/completions/darcs.fish:127
+#: share/completions/darcs.fish:156 share/completions/darcs.fish:186
+#: share/completions/darcs.fish:244 share/completions/darcs.fish:324
+#: share/completions/darcs.fish:363 share/completions/darcs.fish:406
+#: share/completions/darcs.fish:467 share/completions/darcs.fish:492
+#: share/completions/darcs.fish:840 share/completions/darcs.fish:1004
+#: share/completions/darcs.fish:1207
 msgid "Specify umask to use when writing"
 msgstr ""
 
@@ -14648,56 +14111,25 @@ msgstr ""
 msgid "Don't allow darcs to touch external files or repo metadata"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:666
-#: /tmp/fish/implicit/share/completions/darcs.fish:750
+#: share/completions/darcs.fish:387 share/completions/darcs.fish:916
 msgid "Specify author id"
-msgstr ""
+msgstr "Ange författar-id"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:667
+#: share/completions/darcs.fish:388
 msgid "Name of patch"
-msgstr ""
+msgstr "Namn på fix"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:668
-msgid "Edit the long comment by default"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:669
-msgid "Don't give a long comment"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:670
-msgid "Prompt for whether to edit the long comment"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:673
-#: /tmp/fish/implicit/share/completions/darcs.fish:811
-#: /tmp/fish/implicit/share/completions/darcs.fish:967
-msgid "Don't remove the test directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:674
-#: /tmp/fish/implicit/share/completions/darcs.fish:812
-#: /tmp/fish/implicit/share/completions/darcs.fish:968
-msgid "Remove the test directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:703
-#: /tmp/fish/implicit/share/completions/darcs.fish:756
-msgid "Sign the patch with your gpg key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:704
-#: /tmp/fish/implicit/share/completions/darcs.fish:757
+#: share/completions/darcs.fish:864 share/completions/darcs.fish:923
 msgid "Sign the patch with a given keyid"
-msgstr ""
+msgstr "Signera fix med givet nyckelid"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:705
-#: /tmp/fish/implicit/share/completions/darcs.fish:758
+#: share/completions/darcs.fish:865 share/completions/darcs.fish:924
 msgid "Sign the patch using openssl with a given private key"
-msgstr ""
+msgstr "Signera fix via openssl med en given hemlig nyckel"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:723
 #: /tmp/fish/implicit/share/completions/darcs.fish:899
+#: share/completions/darcs.fish:1083
 msgid "Apply patch as another user using sudo"
 msgstr ""
 
@@ -14706,39 +14138,45 @@ msgstr ""
 msgid "Don't use sudo to apply as another user [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:751
+#: share/completions/darcs.fish:917
 msgid "Specify destination email"
-msgstr ""
+msgstr "Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:752
+#: share/completions/darcs.fish:918
+#, fuzzy
 msgid "Mail results to additional EMAIL(s)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Posta resultat till extra adresser. (Kräver --reply)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:753
+#: share/completions/darcs.fish:919
+#, fuzzy
 msgid "Specify mail subject"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange makefil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:754
+#: share/completions/darcs.fish:920
+#, fuzzy
 msgid "Specify in-reply-to header"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj indexkatalog"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:755
+#: share/completions/darcs.fish:921
 msgid "Specify output filename"
-msgstr ""
+msgstr "Välj utfil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:763
 msgid "Edit the patch bundle description"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:767
-#: /tmp/fish/implicit/share/completions/darcs.fish:827
-msgid "Specify sendmail command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:778
-msgid "Give patch name and comment in file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:779
 msgid "Delete the logfile when done"
 msgstr ""
@@ -14747,41 +14185,25 @@ msgstr ""
 msgid "Keep the logfile when done [DEFAULT]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:782
-msgid "Send to context stored in FILENAME"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:797
-msgid "Verify that the patch was signed by a key in PUBRING"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:798
+#, fuzzy
 msgid "Verify using openSSL with authorized keys from file KEYS"
 msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:799
-msgid "Don't verify patch signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:804
-msgid "Mark conflicts"
-msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Verifiera med openSSL med auktoriserade nycklar från angiven fil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:806
 msgid "Equivalent to --dont-allow-conflicts, for backwards compatibility"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:823
+#: share/completions/darcs.fish:995
 msgid "Reply to email-based patch using FROM address"
-msgstr ""
+msgstr "Svara på e-postbaserad fix från adress"
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:824
+#: share/completions/darcs.fish:996
 msgid "Mail results to additional EMAIL(s). Requires --reply"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/darcs.fish:825
-msgid "Forward unsigned messages without extra header"
-msgstr ""
+msgstr "Posta resultat till extra adresser. (Kräver --reply)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:826
 msgid "Don't forward unsigned messages without extra header [DEFAULT]"
@@ -14789,6 +14211,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:842
 #: /tmp/fish/implicit/share/completions/darcs.fish:1008
+#: share/completions/darcs.fish:1222
 msgid "--repodir=DIRECTORY"
 msgstr ""
 
@@ -14812,8 +14235,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:850
 #: /tmp/fish/implicit/share/completions/darcs.fish:883
+#: share/completions/darcs.fish:1028
+#, fuzzy
 msgid "Version specified by the context in FILENAME"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skicka till sammanhang lagrat i FILNAMN"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:855
 #: /tmp/fish/implicit/share/completions/darcs.fish:885
@@ -14841,18 +14269,10 @@ msgstr ""
 msgid "Reorder the patches in the repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:938
-msgid "Specify a sibling directory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:939
 msgid "Relink random internal data to a sibling"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/darcs.fish:940
-msgid "Relink pristine tree (not recommended)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/darcs.fish:941
 msgid "Upgrade repository to latest compatible format"
 msgstr ""
@@ -14907,9 +14327,13 @@ msgstr ""
 msgid "display help and exit"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/dd.fish:3
+#: /tmp/fish/implicit/share/completions/dd.fish:3 share/completions/dd.fish:5
+#, fuzzy
 msgid "Complete dd operands"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Jämför FIL1 med alla operander"
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:1
 msgid "Restricts preferences operations to the current logged-in host"
@@ -15144,99 +14568,77 @@ msgstr ""
 msgid "Allow reboot after secs"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/diff.fish:1
+#: share/functions/__fish_complete_diff.fish:3
 msgid "Ignore case differences"
-msgstr ""
+msgstr "Ignorera skiftläge"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:2
+#: share/functions/__fish_complete_diff.fish:4
 msgid "Ignore case when comparing file names"
-msgstr ""
+msgstr "Ignorera skiftläge på filnamn"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:3
+#: share/functions/__fish_complete_diff.fish:5
 msgid "Consider case when comparing file names"
-msgstr ""
+msgstr "Skilj på skiftläge på filnamn"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:4
+#: share/functions/__fish_complete_diff.fish:6
 msgid "Ignore changes due to tab expansion"
-msgstr ""
+msgstr "Ignorera ändringar på grund av tabbexpansion"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:5
+#: share/functions/__fish_complete_diff.fish:7
 msgid "Ignore changes in the amount of white space"
-msgstr ""
+msgstr "Ignorera skillnader i blanka tecken"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:6
+#: share/functions/__fish_complete_diff.fish:8
 msgid "Ignore all white space"
-msgstr ""
+msgstr "Ignorera blanka tecken"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:7
-#: /tmp/fish/implicit/share/completions/git.fish:327
+#: share/functions/__fish_complete_diff.fish:9
 msgid "Ignore changes whose lines are all blank"
-msgstr ""
+msgstr "Ignorera ändringar vars rader enbart består av blana tecken"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:8
-msgid "Ignore changes whose lines match the REGEX"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/diff.fish:9
-#: /tmp/fish/implicit/share/completions/git.fish:323
+#: share/functions/__fish_complete_diff.fish:11
 msgid "Treat all files as text"
-msgstr ""
+msgstr "Behandla alla filer som text"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:10
+#: share/functions/__fish_complete_diff.fish:12
 msgid "Recursively compare subdirectories"
-msgstr ""
+msgstr "Rekursera till underkataloger"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:11
+#: share/functions/__fish_complete_diff.fish:13
 msgid "Treat absent files as empty"
-msgstr ""
+msgstr "Behandla saknade filer som om de vore tomma"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:12
-msgid "Output NUM lines of copied context"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/diff.fish:13
+#: share/functions/__fish_complete_diff.fish:15
 msgid "Output 3 lines of copied context"
-msgstr ""
+msgstr "Skriv ut 3 rader av kopierad sammanhang"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:14
-msgid "Output NUM lines of unified context"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/diff.fish:15
+#: share/functions/__fish_complete_diff.fish:17
 msgid "Output 3 lines of unified context"
-msgstr ""
+msgstr "Skriv ut 3 rader av unifierat sammanhang"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:16
+#: share/functions/__fish_complete_diff.fish:18
 msgid "Output only whether the files differ"
-msgstr ""
+msgstr "Skriv bara ut huruvida filerna skiljer sig"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:17
+#: share/functions/__fish_complete_diff.fish:19
 msgid "Output a normal diff"
-msgstr ""
+msgstr "Skriv ut en vanlig diff"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:18
+#: share/functions/__fish_complete_diff.fish:20
 msgid "Output in two columns"
-msgstr ""
+msgstr "Skriv ut i två kolumner"
 
-#: /tmp/fish/implicit/share/completions/diff.fish:19
-msgid "Output at most NUM print columns"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/diff.fish:20
+#: share/functions/__fish_complete_diff.fish:22
 msgid "Try to find a smaller set of changes"
-msgstr ""
+msgstr "Försök hitta en mindre uppsättning ändringar"
 
 #: /tmp/fish/implicit/share/completions/diff.fish:21
 msgid "Compare FILE1 to all operands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/diff.fish:22
-msgid "Compare FILE2 to all operands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/diff.fish:23
+#: share/functions/__fish_complete_diff.fish:25
 msgid "Pass the output through 'pr'"
-msgstr ""
+msgstr "Skicka utdata genom 'pr'"
 
 #: /tmp/fish/implicit/share/completions/dig.fish:1
 msgid "Use IPv4 query transport only"
@@ -15918,156 +15320,154 @@ msgstr ""
 msgid "Removes one or more directories from the exclusion list"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/du.fish:1
-msgid "Write size for all files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:2
-msgid "Print file size, not disk usage"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:3
-#: /tmp/fish/implicit/share/completions/tar.fish:13
+#: share/completions/df.fish:22
 msgid "Block size"
-msgstr ""
+msgstr "Blockstorlek"
 
-#: /tmp/fish/implicit/share/completions/du.fish:4
-msgid "Use 1B block size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:5
-msgid "Produce grand total"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:6
-msgid "Dereference file symlinks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:7
-#: /tmp/fish/implicit/share/completions/ls.fish:21
-#: /tmp/fish/implicit/share/completions/ls.fish:76
+#: share/functions/__fish_complete_ls.fish:24
 msgid "Human readable sizes"
-msgstr ""
+msgstr "Människoanpassade storleksangivelser, bas 1024"
 
-#: /tmp/fish/implicit/share/completions/du.fish:8
-#: /tmp/fish/implicit/share/completions/ls.fish:41
+#: share/functions/__fish_complete_ls.fish:62
 msgid "Human readable sizes, powers of 1000"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:9
-msgid "Use 1kB block size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:10
-msgid "Count hard links multiple times"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:11
-msgid "Dereference all symlinks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:12
-msgid "Do not include subdirectory size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/du.fish:13
-msgid "Display only a total for each argument"
-msgstr ""
+msgstr "Människoanpassade storleksangivelser, bas 1000"
 
 #: /tmp/fish/implicit/share/completions/du.fish:14
 msgid "Skip other file systems"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/du.fish:15
+#: /tmp/fish/implicit/share/completions/du.fish:15 share/completions/du.fish:15
+#, fuzzy
 msgid "Exclude files that match pattern in file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Exkludera filer som matchar mönster från fil"
 
-#: /tmp/fish/implicit/share/completions/du.fish:16
-#: /tmp/fish/implicit/share/completions/ncdu.fish:5
+#: share/completions/du.fish:16
 msgid "Exclude files that match pattern"
-msgstr ""
+msgstr "Exkludera filer som matchar mönster"
 
-#: /tmp/fish/implicit/share/completions/du.fish:17
+#: share/completions/du.fish:17
 msgid "Recursion limit"
-msgstr ""
+msgstr "Rekursionsgräns"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:1
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:13
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:14
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:15
 #: /tmp/fish/implicit/share/completions/netctl.fish:17
+#: share/completions/duply.fish:3
+#, fuzzy
 msgid "Profile"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:2
+#: share/completions/duply.fish:4
 msgid "Get usage help text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:3
+#: share/completions/duply.fish:7
+#, fuzzy
 msgid "Creates a configuration profile"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:4
+#: share/completions/duply.fish:8
 msgid "Backup with pre/post script execution"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:5
+#: share/completions/duply.fish:9
+#, fuzzy
 msgid "Backup without executing pre/post scripts"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kör inte post-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:6
+#: share/completions/duply.fish:10
+#, fuzzy
 msgid "Execute <profile>/pre script"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kör inte pre-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:7
+#: share/completions/duply.fish:11
+#, fuzzy
 msgid "Execute <profile>/post script"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kör inte post-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:8
+#: share/completions/duply.fish:12
 msgid "Force full backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:9
+#: share/completions/duply.fish:13
 msgid "Force incremental backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:10
+#: share/completions/duply.fish:14
 msgid "List all files in backup (as it was at <age>, default: now)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:11
+#: share/completions/duply.fish:15
 msgid "Prints backup sets and chains currently in repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:12
+#: share/completions/duply.fish:16
 msgid "List files changed since latest backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:13
+#: share/completions/duply.fish:17
 msgid "Shows outdated backup archives [--force, delete these files]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:14
+#: share/completions/duply.fish:18
 msgid "Shows outdated backups [--force, delete these files]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:15
+#: share/completions/duply.fish:19
 msgid "Shows broken backup archives [--force, delete these files]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:16
+#: share/completions/duply.fish:20
 msgid "Restore the backup to <target_path> [as it was at <age>]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:17
+#: share/completions/duply.fish:21
 msgid "Restore single file/folder from backup [as it was at <age>]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:18
+#: share/completions/duply.fish:24
 msgid "Really execute the commands: purge, purge-full, cleanup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:19
+#: share/completions/duply.fish:25
 msgid "Do nothing but print out generated duplicity command lines"
 msgstr ""
 
@@ -16082,8 +15482,13 @@ msgid "Don"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:22
+#: share/completions/duply.fish:28
+#, fuzzy
 msgid "Output verbosity level"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Återställ felrapporteringsnivå till 0"
 
 #: /tmp/fish/implicit/share/completions/echo.fish:1
 msgid "Do not output a newline"
@@ -16588,29 +15993,37 @@ msgstr ""
 msgid "set parent window"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/emerge.fish:1
-#: /tmp/fish/implicit/share/completions/equery.fish:1
+#: share/completions/emerge.fish:5 share/completions/equery.fish:5
 msgid ""
 "Prints completions for installed packages on the system from /var/db/pkg"
 msgstr ""
+"Visa kompletteringar för installerade packet på systemet från /var/db/pkg"
 
-#: /tmp/fish/implicit/share/completions/emerge.fish:2
-#: /tmp/fish/implicit/share/completions/equery.fish:2
+#: share/completions/emerge.fish:13 share/completions/equery.fish:12
 msgid ""
 "Prints completions for all available packages on the system from /usr/portage"
 msgstr ""
+"Visa kompletteringar för alla tillgängliga packet på systemet från /usr/"
+"portage"
 
-#: /tmp/fish/implicit/share/completions/emerge.fish:3
+#: share/completions/emerge.fish:22
 msgid ""
 "Tests if emerge command should have an installed package as potential "
 "completion"
 msgstr ""
+"Testa om emergekommando borde ha ett installerat paket som potentiell "
+"komplettering"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:4
+#: share/completions/emerge.fish:32
+#, fuzzy
 msgid ""
 "Print completions for all packages including the version compare if that is "
 "already typed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa kompletteringar för installerade packet på systemet från /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:5
 msgid "Synchronize the portage tree"
@@ -16867,29 +16280,20 @@ msgstr ""
 msgid "Output version information"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/env.fish:1
+#: share/completions/env.fish:2
 msgid "Redefine variable"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/env.fish:2
-#: /tmp/fish/implicit/share/completions/nice.fish:1
-#: /tmp/fish/implicit/share/completions/time.fish:1
-msgid "Command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/env.fish:3
-msgid "Start with an empty environment"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/env.fish:4
-msgid "Remove variable from the environment"
-msgstr ""
+msgstr "Omdefinera variabel"
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
+#: share/completions/equery.fish:19
+#, fuzzy
 msgid ""
 "Prints completions for all available categories on the system from /usr/"
 "portage"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa kompletteringar för installerade packet på systemet från /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/equery.fish:4
 msgid "causes minimal output to be emitted"
@@ -17548,11 +16952,9 @@ msgstr ""
 msgid "Reload filelist after given time in second"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/feh.fish:44
-#: /tmp/fish/implicit/share/completions/ls.fish:26
-#: /tmp/fish/implicit/share/completions/ls.fish:81
+#: share/functions/__fish_complete_ls.fish:29
 msgid "Reverse sort order"
-msgstr ""
+msgstr "Omvänd sorteringsordning"
 
 #: /tmp/fish/implicit/share/completions/feh.fish:45
 msgid "Scale image to fit window geometry"
@@ -17818,8 +17220,12 @@ msgid "Alternate list of files containing magic numbers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:1
+#, fuzzy
 msgid "Never follow symlinks"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Följ aldrig symboliska länkar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:3
 msgid ""
@@ -17832,8 +17238,12 @@ msgid "Measure from the beginning of today rather than  from  24  hours ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:5
+#, fuzzy
 msgid "Process subdirectories before the directory itself"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Processa underkataloger rekursivt"
 
 #: /tmp/fish/implicit/share/completions/find.fish:7
 msgid ""
@@ -17843,8 +17253,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/find.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:66
 #: /tmp/fish/implicit/share/completions/zfs.fish:76
+#, fuzzy
 msgid "Maximum recursion depth"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Maximal 'resident set size'"
 
 #: /tmp/fish/implicit/share/completions/find.fish:9
 msgid "Do not apply any tests or actions at levels less than specified level"
@@ -17869,20 +17283,32 @@ msgid "Specify regular expression type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:15
+#, fuzzy
 msgid "Turn warnings on"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:16
+#, fuzzy
 msgid "Turn warnings off"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:17
 msgid "File last accessed specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:18
+#, fuzzy
 msgid "File last accessed more recently than file was modified"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa senaste revision vid vilken vare rad ändrades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:19
 msgid "File last accessed specified number of days ago"
@@ -17904,26 +17330,37 @@ msgstr ""
 msgid "File is empty and is either a regular file or a directory"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/find.fish:24
-#: /tmp/fish/implicit/share/completions/test.fish:31
-msgid "File is executable"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/find.fish:25
+#, fuzzy
 msgid "Always false"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Formatera alltid om"
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
+#, fuzzy
 msgid "File is on filesystem of specified type"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filsystem av angiven typ"
 
 #: /tmp/fish/implicit/share/completions/find.fish:27
+#, fuzzy
 msgid "Numeric group id of file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bara numerisk utdata"
 
 #: /tmp/fish/implicit/share/completions/find.fish:28
+#, fuzzy
 msgid "Group name of file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inod för filer"
 
 #: /tmp/fish/implicit/share/completions/find.fish:29
 msgid "File is symlink matching specified case insensitive pattern"
@@ -17934,8 +17371,12 @@ msgid "File name matches case insensitive pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:31
+#, fuzzy
 msgid "File has specified inode number"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Filtrera genom angivet program"
 
 #: /tmp/fish/implicit/share/completions/find.fish:32
 msgid "File path matches case insensitive pattern"
@@ -17946,8 +17387,12 @@ msgid "File name matches case insensetive regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:34
+#, fuzzy
 msgid "File has specified number of links"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Jämför bara angivet antal tecken"
 
 #: /tmp/fish/implicit/share/completions/find.fish:35
 msgid "File is symlink matching specified pattern"
@@ -17958,8 +17403,12 @@ msgid "File last modified specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:37
+#, fuzzy
 msgid "File last modified more recently than file was modified"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa senaste revision vid vilken vare rad ändrades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:38
 msgid "File last modified specified number of days ago"
@@ -17978,36 +17427,64 @@ msgid "No group corresponds to file's numeric group ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:42
+#, fuzzy
 msgid "File path matches pattern"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Exkludera filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/find.fish:43
+#, fuzzy
 msgid "Files has specified permissions set"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd angiven kompressionsalgoritm"
 
 #: /tmp/fish/implicit/share/completions/find.fish:44
+#, fuzzy
 msgid "File name matches regex"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ignorera ändringar som matchar reguljärt uttryck"
 
 #: /tmp/fish/implicit/share/completions/find.fish:45
+#, fuzzy
 msgid "File refers to the same inode as specified file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Exklidera filer listade i angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:46
 msgid "File uses specified units of space"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
+#, fuzzy
 msgid "Always true"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Alltid"
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
+#, fuzzy
 msgid "File is of specified type"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filsystem av angiven typ"
 
 #: /tmp/fish/implicit/share/completions/find.fish:49
+#, fuzzy
 msgid "File's owner has specified numeric user ID"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fil ägd av effektiv användar-id"
 
 #: /tmp/fish/implicit/share/completions/find.fish:50
 msgid ""
@@ -18016,8 +17493,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:51
+#, fuzzy
 msgid "File's owner"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fil är uttag (socket)"
 
 #: /tmp/fish/implicit/share/completions/find.fish:52
 msgid ""
@@ -18034,16 +17515,24 @@ msgid "Delete selected files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
+#, fuzzy
 msgid "Execute specified command for each located file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför  kommando om föregående kommando misslyckades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:57
+#, fuzzy
 msgid "List file in ls -dils format, write to specified file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:58
 msgid "Print full file names into specified file"
@@ -18054,16 +17543,24 @@ msgid "Print null separated full file names into specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:60
+#, fuzzy
 msgid "Print formated data into specified file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv utdata till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:61
 msgid "Execute specified command for each located file after asking user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:62
+#, fuzzy
 msgid "Print full file names"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filnamn"
 
 #: /tmp/fish/implicit/share/completions/find.fish:63
 msgid ""
@@ -18072,8 +17569,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:64
+#, fuzzy
 msgid "Print null separated full file names"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv bara RCS-filnamn"
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
 msgid "Print formated data"
@@ -18084,16 +17585,28 @@ msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
+#, fuzzy
 msgid "Exit at once"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Förklara vad som utförs"
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
+#, fuzzy
 msgid "List file in ls -dils format"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista information om inoder"
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
+#, fuzzy
 msgid "Negate result of action"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Negera uttryck"
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -18103,22 +17616,6 @@ msgstr ""
 msgid "Result is true if either previous or next action are true"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/fish.fish:1
-msgid "Run fish with this command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fish.fish:4
-msgid "Only parse input, do not execute"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fish.fish:5
-msgid "Run in interactive mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fish.fish:6
-msgid "Run in login mode"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/fish.fish:7
 msgid "Output profiling information to specified file"
 msgstr ""
@@ -18139,10 +17636,9 @@ msgstr ""
 msgid "Output in HTML format"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/fish_indent.fish:6
-#: /tmp/fish/implicit/share/completions/sort.fish:15
+#: share/completions/sort.fish:16
 msgid "Write to file"
-msgstr ""
+msgstr "Skriv till fil"
 
 #: /tmp/fish/implicit/share/completions/fish_indent.fish:7
 msgid "Enable debug at specified verbosity level"
@@ -19093,8 +18589,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:246
 #: /tmp/fish/implicit/share/completions/git.fish:295
 #: /tmp/fish/implicit/share/completions/git.fish:296
+#: share/completions/git.fish:177
+#, fuzzy
 msgid "Tag"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Mål"
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:160
 msgid "Show commit time"
@@ -19597,8 +19098,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/rejmerge.fish:3
 #: /tmp/fish/implicit/share/completions/root.fish:6
 #: /tmp/fish/implicit/share/completions/zypper.fish:4
+#: share/completions/zypper.fish:30
+#, fuzzy
 msgid "Print help"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa URIer"
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
@@ -19613,38 +19119,6 @@ msgstr ""
 msgid "Edit in interactive mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/function.fish:1
-#: /tmp/fish/implicit/share/completions/functions.fish:5
-msgid "Set function description"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:2
-#: /tmp/fish/implicit/share/completions/functions.fish:2
-#: /tmp/fish/implicit/share/completions/type.fish:9
-msgid "Function"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:3
-#: /tmp/fish/implicit/share/completions/type.fish:8
-msgid "Builtin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:4
-msgid "Make the function a job exit event handler"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:5
-msgid "Make the function a process exit event handler"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:6
-msgid "Make the function a signal event handler"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/function.fish:7
-msgid "Make the function a variable update event handler"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/function.fish:8
 msgid "Make the function a generic event handler"
 msgstr ""
@@ -19661,17 +19135,17 @@ msgstr ""
 msgid "Inherit completions from the given command"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/functions.fish:1
-msgid "Erase function"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/functions.fish:3
 msgid "Show hidden functions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:6
+#, fuzzy
 msgid "Test if function is defined"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om variabeln är definerad"
 
 #: /tmp/fish/implicit/share/completions/functions.fish:7
 msgid "List the names of the functions, but not their definition"
@@ -19737,25 +19211,9 @@ msgstr ""
 msgid "Search only for IPv6 sockets"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/fusermount.fish:4
-#: /tmp/fish/implicit/share/completions/sshfs.fish:4
-#: /tmp/fish/implicit/share/completions/sshfs.fish:8
-#: /tmp/fish/implicit/share/completions/udisksctl.fish:19
+#: share/completions/fusermount.fish:15 share/completions/sshfs.fish:27
 msgid "Mount options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fusermount.fish:5
-msgid "Unmount"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fusermount.fish:6
-#: /tmp/fish/implicit/share/completions/gdb.fish:10
-msgid "Quiet"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/fusermount.fish:7
-msgid "Lazy unmount"
-msgstr ""
+msgstr "Monteringsflagga"
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:1
 msgid "Standard mode"
@@ -19778,6 +19236,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:5
 #: /tmp/fish/implicit/share/completions/gcc.fish:481
+#: share/completions/gcc.fish:31 share/completions/gcc.fish:513
 msgid "Use dir as the logical root directory for headers and libraries"
 msgstr ""
 
@@ -20014,10 +19473,6 @@ msgid ""
 "Downgrade some diagnostics about nonconformant code from errors to warnings"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gcc.fish:55
-msgid "Enable automatic template instantiation at link time"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gcc.fish:56
 msgid ""
 "Disable generation of information about every class with virtual functions "
@@ -22069,6 +21524,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:480
+#: share/completions/gcc.fish:512
 msgid ""
 "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 "
@@ -22194,12 +21650,15 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gcc.fish:507
 #: /tmp/fish/implicit/share/completions/gcc.fish:508
 #: /tmp/fish/implicit/share/completions/gcc.fish:509
+#: share/completions/gcc.fish:539 share/completions/gcc.fish:540
+#: share/completions/gcc.fish:541
 msgid ""
 "This specifies what floating point hardware (or hardware emulation) is "
 "available on the target"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:510
+#: share/completions/gcc.fish:542
 msgid ""
 "The size of all structures and unions will be rounded up to a multiple of "
 "the number of bits set by this option"
@@ -22232,6 +21691,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:516
+#: share/completions/gcc.fish:548
 msgid "Specify the register to be used for PIC addressing"
 msgstr ""
 
@@ -22278,10 +21738,12 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:524
+#: share/completions/gcc.fish:556
 msgid "Specify the access model for the thread local storage pointer"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:525
+#: share/completions/gcc.fish:557
 msgid "Specify ATMEL AVR instruction set or MCU type"
 msgstr ""
 
@@ -22290,6 +21752,7 @@ msgid "Output instruction sizes to the asm file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:527
+#: share/completions/gcc.fish:559
 msgid ""
 "Specify the initial stack address, which may be a symbol or numeric value, "
 "__stack is the default"
@@ -22365,6 +21828,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gcc.fish:542
+#: share/completions/gcc.fish:574
 msgid ""
 "Specified the identification number of the ID based shared library being "
 "compiled"
@@ -25318,127 +24782,227 @@ msgid "Print the version and quit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:3
+#: share/completions/gem.fish:35
 msgid "Use URL as the remote source for gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:4
+#: share/completions/gem.fish:36
 msgid "Use the given HTTP proxy for remote operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:5
+#: share/completions/gem.fish:37
+#, fuzzy
 msgid "Use no HTTP proxy for remote operations"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj rot-katalog för rpm-operationer"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:6
+#: share/completions/gem.fish:38
+#, fuzzy
 msgid "Get help on this command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj promptkommando"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:7
+#: share/completions/gem.fish:39
+#, fuzzy
 msgid "Set the verbose level of output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Återställ felrapporteringsnivå till 0"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:8
+#: share/completions/gem.fish:40
+#, fuzzy
 msgid "Use this config file instead of default"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd angiven fil istället för standard-förtroendedatabasen"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:9
+#: share/completions/gem.fish:41
 msgid "Show stack backtrace on errors"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:10
+#: share/completions/gem.fish:42
+#, fuzzy
 msgid "Turn on Ruby debugging"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Slå av avmangling"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:11
+#: share/completions/gem.fish:47
 msgid "Add a trusted certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:12
+#: share/completions/gem.fish:48
+#, fuzzy
 msgid "List trusted certificates"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa pålitliga nycklar"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:13
+#: share/completions/gem.fish:49
 msgid "Remove trusted certificates containing STRING"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:14
+#: share/completions/gem.fish:50
 msgid "Build private key and self-signed certificate for EMAIL_ADDR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:15
+#: share/completions/gem.fish:51
 msgid "Certificate for --sign command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:16
+#: share/completions/gem.fish:52
+#, fuzzy
 msgid "Private key for --sign command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa typ av kommando"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:17
+#: share/completions/gem.fish:53
 msgid "Sign a certificate with my key and certificate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:18
+#: share/completions/gem.fish:58
 msgid "Verify gem file against its internal checksum"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:19
+#: share/completions/gem.fish:59
+#, fuzzy
 msgid "Report 'unmanaged' or rogue files in the gem repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort filer eller kataloger från lagret"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:20
+#: share/completions/gem.fish:60
 msgid "Run unit tests for gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:21
+#: share/completions/gem.fish:61
+#, fuzzy
 msgid "Specify version for which to run unit tests"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj vilket förråd som skall användas"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:22
+#: share/completions/gem.fish:66
+#, fuzzy
 msgid "Don't really cleanup"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Avinstallera ingenting på riktigt"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:23
+#: share/completions/gem.fish:71
+#, fuzzy
 msgid "List the files inside a Gem"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filer i paket"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:24
+#: share/completions/gem.fish:72
+#, fuzzy
 msgid "Specify version for gem to view"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange användare för fråga"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:25
+#: share/completions/gem.fish:73
+#, fuzzy
 msgid "Search for gems under specific paths"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj drivrutinsspecifika inställningar"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:26
+#: share/completions/gem.fish:74
 msgid "Be verbose when showing status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:27
 #: /tmp/fish/implicit/share/completions/gem.fish:82
+#: share/completions/gem.fish:79 share/completions/gem.fish:172
+#, fuzzy
 msgid "Specify version of gem to uninstall"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista av paket att installera"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:28
+#: share/completions/gem.fish:80
+#, fuzzy
 msgid "Include reverse dependencies in the output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:29
+#: share/completions/gem.fish:81
+#, fuzzy
 msgid "Don't include reverse dependencies in the output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:30
+#: share/completions/gem.fish:82
 msgid "Pipe Format (name --version ver)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:31
+#: share/completions/gem.fish:97
+#, fuzzy
 msgid "Specify version of gem to install"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista av paket att installera"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:32
 #: /tmp/fish/implicit/share/completions/gem.fish:51
 #: /tmp/fish/implicit/share/completions/gem.fish:57
 #: /tmp/fish/implicit/share/completions/gem.fish:68
 #: /tmp/fish/implicit/share/completions/gem.fish:72
+#: share/completions/gem.fish:98 share/completions/gem.fish:121
+#: share/completions/gem.fish:131 share/completions/gem.fish:150
+#: share/completions/gem.fish:158
 msgid "Restrict operations to the LOCAL domain (default)"
 msgstr ""
 
@@ -25447,6 +25011,9 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:58
 #: /tmp/fish/implicit/share/completions/gem.fish:69
 #: /tmp/fish/implicit/share/completions/gem.fish:73
+#: share/completions/gem.fish:99 share/completions/gem.fish:122
+#: share/completions/gem.fish:132 share/completions/gem.fish:151
+#: share/completions/gem.fish:159
 msgid "Restrict operations to the REMOTE domain"
 msgstr ""
 
@@ -25455,156 +25022,242 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:59
 #: /tmp/fish/implicit/share/completions/gem.fish:70
 #: /tmp/fish/implicit/share/completions/gem.fish:74
+#: share/completions/gem.fish:100 share/completions/gem.fish:123
+#: share/completions/gem.fish:133 share/completions/gem.fish:152
+#: share/completions/gem.fish:160
 msgid "Allow LOCAL and REMOTE operations"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:35
 #: /tmp/fish/implicit/share/completions/gem.fish:84
+#: share/completions/gem.fish:101 share/completions/gem.fish:182
 msgid "Gem repository directory to get installed gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:36
 #: /tmp/fish/implicit/share/completions/gem.fish:85
+#: share/completions/gem.fish:102 share/completions/gem.fish:183
 msgid "Generate RDoc documentation for the gem on install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:37
 #: /tmp/fish/implicit/share/completions/gem.fish:86
+#: share/completions/gem.fish:103 share/completions/gem.fish:184
 msgid "Don't generate RDoc documentation for the gem on install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:38
 #: /tmp/fish/implicit/share/completions/gem.fish:87
+#: share/completions/gem.fish:104 share/completions/gem.fish:185
 msgid "Generate RI documentation for the gem on install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:39
 #: /tmp/fish/implicit/share/completions/gem.fish:88
+#: share/completions/gem.fish:105 share/completions/gem.fish:186
 msgid "Don't generate RI documentation for the gem on install"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:40
 #: /tmp/fish/implicit/share/completions/gem.fish:89
+#: share/completions/gem.fish:106 share/completions/gem.fish:187
 msgid "Force gem to install, bypassing dependency checks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:41
 #: /tmp/fish/implicit/share/completions/gem.fish:90
+#: share/completions/gem.fish:107 share/completions/gem.fish:188
+#, fuzzy
 msgid "Don't force gem to install, bypassing dependency checks"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför inte beroendeverifiering"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:42
 #: /tmp/fish/implicit/share/completions/gem.fish:91
+#: share/completions/gem.fish:108 share/completions/gem.fish:189
 msgid "Run unit tests prior to installation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:43
 #: /tmp/fish/implicit/share/completions/gem.fish:92
+#: share/completions/gem.fish:109 share/completions/gem.fish:190
+#, fuzzy
 msgid "Don't run unit tests prior to installation"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kontrollera inte diskutrymme före installation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:44
 #: /tmp/fish/implicit/share/completions/gem.fish:93
+#: share/completions/gem.fish:110 share/completions/gem.fish:191
+#, fuzzy
 msgid "Use bin wrappers for executables"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fil är program"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:45
 #: /tmp/fish/implicit/share/completions/gem.fish:94
+#: share/completions/gem.fish:111 share/completions/gem.fish:192
+#, fuzzy
 msgid "Don't use bin wrappers for executables"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Gör inte skript exekverbara"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:46
 #: /tmp/fish/implicit/share/completions/gem.fish:95
+#: share/completions/gem.fish:112 share/completions/gem.fish:193
+#, fuzzy
 msgid "Specify gem trust policy"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange förtroendemodell"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:47
 #: /tmp/fish/implicit/share/completions/gem.fish:96
+#: share/completions/gem.fish:113 share/completions/gem.fish:194
 msgid "Do not install any required dependent gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:48
 #: /tmp/fish/implicit/share/completions/gem.fish:97
+#: share/completions/gem.fish:114 share/completions/gem.fish:195
 msgid "Unconditionally install the required dependent gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:49
 #: /tmp/fish/implicit/share/completions/gem.fish:55
 #: /tmp/fish/implicit/share/completions/gem.fish:66
+#: share/completions/gem.fish:119 share/completions/gem.fish:129
+#: share/completions/gem.fish:148
+#, fuzzy
 msgid "Display detailed information of gem(s)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:50
 #: /tmp/fish/implicit/share/completions/gem.fish:56
 #: /tmp/fish/implicit/share/completions/gem.fish:67
+#: share/completions/gem.fish:120 share/completions/gem.fish:130
+#: share/completions/gem.fish:149
+#, fuzzy
 msgid "Don't display detailed information of gem(s)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:54
+#: share/completions/gem.fish:128
 msgid "Name of gem(s) to query on matches the provided REGEXP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:60
+#: share/completions/gem.fish:138
 msgid "Generate RDoc/RI documentation for all installed gems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:61
+#: share/completions/gem.fish:139
 msgid "Include RDoc generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:62
+#: share/completions/gem.fish:140
 msgid "Don't include RDoc generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:63
+#: share/completions/gem.fish:141
 msgid "Include RI generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:64
+#: share/completions/gem.fish:142
 msgid "Don't include RI generated documents"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:65
+#: share/completions/gem.fish:143
+#, fuzzy
 msgid "Specify version of gem to rdoc"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange extern editor"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:71
+#: share/completions/gem.fish:157
+#, fuzzy
 msgid "Specify version of gem to examine"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:75
+#: share/completions/gem.fish:161
 msgid "Output specifications for all versions of the gem"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:76
+#: share/completions/gem.fish:166
+#, fuzzy
 msgid "Uninstall all matching versions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla versioner"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:77
+#: share/completions/gem.fish:167
+#, fuzzy
 msgid "Don't uninstall all matching versions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Avinstallera ingenting på riktigt"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:78
+#: share/completions/gem.fish:168
 msgid "Ignore dependency requirements while uninstalling"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:79
+#: share/completions/gem.fish:169
+#, fuzzy
 msgid "Don't ignore dependency requirements while uninstalling"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Verifiera inte beroenden före paketen avinstalleras"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:80
+#: share/completions/gem.fish:170
 msgid "Uninstall applicable executables without confirmation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:81
+#: share/completions/gem.fish:171
 msgid "Don't uninstall applicable executables without confirmation"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:83
+#: share/completions/gem.fish:177
 msgid "Specify version of gem to unpack"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:98
+#: share/completions/gem.fish:196
 msgid "Update the RubyGems system software"
 msgstr ""
 
@@ -25704,6 +25357,7 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:267
 #: /tmp/fish/implicit/share/completions/git.fish:287
 #: /tmp/fish/implicit/share/completions/git.fish:309
+#: share/completions/git.fish:153 share/completions/git.fish:176
 msgid "Branch"
 msgstr ""
 
@@ -25942,12 +25596,6 @@ msgstr ""
 msgid "Don't add the file(s), but only refresh their stat"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/git.fish:79
-#: /tmp/fish/implicit/share/completions/ipset.fish:8
-#: /tmp/fish/implicit/share/completions/make.fish:6
-msgid "Ignore errors"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/git.fish:80
 msgid "Check if any of the given files would be ignored"
 msgstr ""
@@ -27440,809 +27088,156 @@ msgid ""
 "gpg. argv[1] is a regexp"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:4
-msgid "Make a signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:5
-msgid "Make a clear text signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:6
-msgid "Make a detached signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:7
-msgid "Encrypt data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:8
-msgid "Encrypt with a symmetric cipher using a passphrase"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:9
-msgid "Store only (make a simple RFC1991 packet)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gpg.fish:10
 msgid "Decrypt specified file or stdin"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:11
-msgid "Assume specified file or stdin is sigfile and verify it"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:12
-msgid "Modify certain other commands to accept multiple files for processing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:13
-msgid "Identical to '--multifile --verify'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:14
-msgid "Identical to '--multifile --encrypt'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:15
-msgid "Identical to --multifile --decrypt"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:16
-#: /tmp/fish/implicit/share/completions/gpg.fish:17
-msgid ""
-"List all keys from the public keyrings, or just the ones given on the "
-"command line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:18
-msgid ""
-"List all keys from the secret keyrings, or just the ones given on the "
-"command line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:19
-msgid "Same as --list-keys, but the signatures are listed too"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:20
-msgid "Same as --list-keys, but the signatures are listed and verified"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:21
-msgid "List all keys with their fingerprints"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gpg.fish:22
 #: /tmp/fish/implicit/share/completions/signify.fish:2
 msgid "Generate a new key pair"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:23
-msgid "Present a menu which enables you to do all key related tasks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:24
-msgid "Sign a public key with your secret key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:25
-msgid "Sign a public key with your secret key but mark it as non exportable"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:26
-msgid "Remove key from the public keyring"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:27
-msgid "Remove key from the secret and public keyring"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:28
-msgid ""
-"Same as --delete-key, but if a secret key exists, it will be removed first"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:29
-msgid "Generate a revocation certificate for the complete key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:30
-msgid "Generate a designated revocation certificate for a key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:31
-msgid "Export all or the given keys from all keyrings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:32
-msgid "Same as --export but sends the keys to a keyserver"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:33
-#: /tmp/fish/implicit/share/completions/gpg.fish:34
-msgid "Same as --export, but exports the secret keys instead"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:35
-#: /tmp/fish/implicit/share/completions/gpg.fish:36
-msgid "Import/merge keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:37
-msgid "Import the keys with the given key IDs from a keyserver"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:38
-msgid ""
-"Request updates from a keyserver for keys that already exist on the local "
-"keyring"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:39
-msgid "Search the keyserver for the given names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:40
-msgid "Do trust database maintenance"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:41
-msgid "Do trust database maintenance without user interaction"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:42
-msgid "Send the ownertrust values to stdout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:43
-msgid ""
-"Update the trustdb with the ownertrust values stored in specified files or "
-"stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:44
-msgid "Create signature caches in the keyring"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:45
-msgid ""
-"Print message digest of specified algorithm for all given files or stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:46
-msgid "Print message digest of all algorithms for all given files or stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:47
-msgid "Emit specified number of random bytes of the given quality level"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:48
-msgid "Display version and supported algorithms, and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:49
-msgid "Display warranty and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:51
-msgid "Create ASCII armored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:52
-#: /tmp/fish/implicit/share/completions/msgfmt.fish:8
-#: /tmp/fish/implicit/share/completions/xgettext.fish:4
+#: share/completions/gpg.fish:116
 msgid "Write output to specified file"
-msgstr ""
+msgstr "Skriv utdata till angiven fil"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:53
-msgid ""
-"Sets a limit on the number of bytes that will be generated when processing a "
-"file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:54
-msgid "Use specified key as the key to sign with"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:55
-msgid "Use specified key as the default key to sign with"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:56
-msgid "Encrypt for specified user id"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:57
-msgid "Encrypt for specified user id, but hide the keyid of the key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:58
-msgid "Use specified user id as default recipient"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:59
-msgid "Use the default key as default recipient"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:60
-msgid "Reset --default-recipient and --default-recipient-self"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:61
-msgid "Give more information during processing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:63
-#: /tmp/fish/implicit/share/completions/gpg.fish:64
-#: /tmp/fish/implicit/share/completions/gpg.fish:65
-msgid "Compression level"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:66
-msgid "Use a different decompression method for BZIP2 compressed files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:67
-msgid ""
-"Treat input files as text and store them in the OpenPGP canonical text form "
-"with standard 'CRLF' line endings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:68
-msgid ""
-"Don't treat input files as text and store them in the OpenPGP canonical text "
-"form with standard 'CRLF' line endings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:69
-msgid "Don't make any changes (this is not completely implemented)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:70
-#: /tmp/fish/implicit/share/completions/mv.fish:3
-msgid "Prompt before overwrite"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:71
-#: /tmp/fish/implicit/share/completions/scp.fish:3
-#: /tmp/fish/implicit/share/completions/top.fish:1
-msgid "Batch mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:72
-msgid "Don't use batch mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:73
-msgid "Never write output to terminal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:74
-msgid "Assume yes on most questions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:75
-msgid "Assume no on most questions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:76
-msgid "Prompt for a certification level when making a key signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:77
-msgid "Don't prompt for a certification level when making a key signature"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:78
-msgid ""
-"The default certification level to use for the level check when signing a key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:79
-msgid ""
-"Disregard any signatures with a certification level below specified level "
-"when building the trust database"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:80
-msgid ""
-"Assume that the specified key is as trustworthy as one of your own secret "
-"keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:81
-msgid "Specify trust model"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:82
-msgid "Select how to display key IDs"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:83
+#: share/completions/gpg.fish:161
 msgid "Use specified keyserver"
-msgstr ""
+msgstr "Använd angiven nyckelserver"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:84
-msgid "Options for the keyserver"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:85
-msgid "Options for importing keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:86
-msgid "Options for exporting keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:87
-msgid "Options for listing keys and signatures"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:88
-msgid "Options for verifying signatures"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:89
+#: share/completions/gpg.fish:169
 msgid "The command line that should be run to view a photo ID"
-msgstr ""
+msgstr "Kommandoraden som skall köras för att visa ett fotoid"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:90
+#: share/completions/gpg.fish:170
 msgid ""
 "Sets a list of directories to search for photo viewers and keyserver helpers"
 msgstr ""
+"Sätt en lista av kataloger att söka efter fotovisare och nyckelserverhjälpare"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:91
-msgid ""
-"Display the keyring name at the head of key listings to show which keyring a "
-"given key resides on"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:92
+#: share/completions/gpg.fish:173
 msgid "Add specified file to the current list of keyrings"
-msgstr ""
+msgstr "Lägg till angiven fil fill den nuvarande listan av nyckelringar"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:93
+#: share/completions/gpg.fish:175
 msgid "Add specified file to the current list of secret keyrings"
 msgstr ""
+"Lägg till angiven fil fill den nuvarande listan av hemliga nyckelringar"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:94
+#: share/completions/gpg.fish:176
 msgid "Designate specified file as the primary public keyring"
-msgstr ""
+msgstr "Välj den angivna filen som den primära öppna nyckelring"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:95
+#: share/completions/gpg.fish:178
 msgid "Use specified file instead of the default trustdb"
-msgstr ""
+msgstr "Använd angiven fil istället för standard-förtroendedatabasen"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:96
-msgid "Set the home directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:97
-msgid "Set the native character set"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:98
-msgid "Assume that following command line arguments are given in UTF8"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:99
-msgid ""
-"Assume that following arguments are encoded in the character set specified "
-"by --display-charset"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:100
+#: share/completions/gpg.fish:184
 msgid "Read options from specified file, do not read the default options file"
-msgstr ""
+msgstr "Läs inställningar från angivan fil, läs inte standardinställningsfil"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:101
-msgid "Shortcut for '--options /dev/null'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:102
+#: share/completions/gpg.fish:186
 msgid "Load an extension module"
-msgstr ""
+msgstr "Ladda en förlängningsmodul"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:103
+#: share/completions/gpg.fish:188
 msgid "Write special status strings to the specified file descriptor"
-msgstr ""
+msgstr "Skriv speciella statussträngar till den angivna filidentifieraren"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:104
+#: share/completions/gpg.fish:189
 msgid "Write log output to the specified file descriptor"
-msgstr ""
+msgstr "Skriv loggdata till angiven filidentifierare"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:105
-msgid "Write attribute subpackets to the specified file descriptor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:106
-msgid "Include secret key comment packets when exporting secret keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:107
-msgid "Don't include secret key comment packets when exporting secret keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:108
+#: share/completions/gpg.fish:195
 msgid "Use specified string as comment string"
-msgstr ""
+msgstr "Använd angiven sträng som kommentarsträng"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:109
-msgid "Don't use a comment string"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:110
-msgid "Include the version string in ASCII armored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:111
-msgid "Don't include the version string in ASCII armored output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:112
+#: share/completions/gpg.fish:204
 msgid "Put the specified name value pair into the signature as notation data"
-msgstr ""
+msgstr "Lägg angivet namn/värde-par i signaturen som notationsdata"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:113
+#: share/completions/gpg.fish:205
 msgid "Set signature policy"
-msgstr ""
+msgstr "Välj signaturpolicy"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:114
+#: share/completions/gpg.fish:206
 msgid "Set certificate policy"
-msgstr ""
+msgstr "Välj certifikatpolicy"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:115
+#: share/completions/gpg.fish:207
 msgid "Set signature and certificate policy"
-msgstr ""
+msgstr "Välj signatur- och certifikatpolicy"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:116
+#: share/completions/gpg.fish:208
 msgid "Use specified URL as a preferred keyserver for data signatures"
-msgstr ""
+msgstr "Använd angiven URL som preferrerad nyckelserver för datasignaturer"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:117
+#: share/completions/gpg.fish:210
 msgid "Use specified string as the filename which is stored inside messages"
-msgstr ""
+msgstr "Använd angiven sträng som filnamn att lagra i meddelande"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:118
-msgid "Set the 'for your eyes only' flag in the message"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:119
-msgid "Clear the 'for your eyes only' flag in the message"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:120
-msgid "Create file with name as given in data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:121
-msgid "Don't create file with name as given in data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:122
+#: share/completions/gpg.fish:218
 msgid ""
 "Number of completely trusted users to introduce a new key signer (defaults "
 "to 1)"
 msgstr ""
+"Antal användare med fullt förtroende för att introducera nya "
+"nyckelunderskrivare (standard är 1)"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:123
+#: share/completions/gpg.fish:219
 msgid ""
 "Number of marginally trusted users to introduce a new key signer (defaults "
 "to 3)"
 msgstr ""
+"Antal användare med marginellt förtroende för att introducera nya "
+"nyckelunderskrivare (standard är 3)"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:124
+#: share/completions/gpg.fish:221
 msgid "Maximum depth of a certification chain (default is 5)"
-msgstr ""
+msgstr "MAximalt djup i certifieringskedjan (standard är 5)"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:125
-msgid "Use specified cipher algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:126
-msgid "Use specified message digest algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:127
-msgid "Use specified compression algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:128
-msgid "Use specified message digest algorithm when signing a key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:129
-msgid "Use specified cipher algorithm to protect secret keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:130
-msgid "Use specified digest algorithm to mangle the passphrases"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:131
-msgid "Selects how passphrases are mangled"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:132
-msgid "Integrity protect secret keys by using a SHA-1 checksum"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:133
-msgid "Never allow the use of specified cipher algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:134
-msgid "Never allow the use of specified public key algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:135
-msgid "Do not cache the verification status of key signatures"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:136
-msgid "Do not verify each signature right after creation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:137
-msgid "Automatically run the --check-trustdb command internally when needed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:138
-msgid "Never automatically run the --check-trustdb"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:139
-msgid "Do not put the recipient keyid into encrypted packets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:140
-msgid "Put the recipient keyid into encrypted packets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:141
-msgid ""
-"Change the behavior of cleartext signatures so that they can be used for "
-"patch files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:142
-msgid "Mangle From-field of email headers (default)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:143
-msgid "Do not mangle From-field of email headers"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:144
+#: share/completions/gpg.fish:249
 msgid "Read passphrase from specified file descriptor"
-msgstr ""
+msgstr "Läss passfras från angiven filidentifierare"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:145
+#: share/completions/gpg.fish:250
 msgid "Read user input from specified file descriptor"
-msgstr ""
+msgstr "Läs användarindata från angiven filidentifierare"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:146
-msgid "Try to use the GnuPG-Agent"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:147
-msgid "Do not try to use the GnuPG-Agent"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:148
+#: share/completions/gpg.fish:254
 msgid "Override value of GPG_AGENT_INFO environment variable"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:149
-msgid "Force v3 signatures for signatures on data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:150
-msgid "Do not force v3 signatures for signatures on data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:151
-msgid "Always use v4 key signatures even on v3 keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:152
-msgid "Don't use v4 key signatures on v3 keys"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:153
-msgid "Force the use of encryption with a modification detection code"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:154
-msgid "Disable the use of the modification detection code"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:155
-msgid ""
-"Allow the import and use of keys with user IDs which are not self-signed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:156
-msgid ""
-"Do not allow the import and use of keys with user IDs which are not self-"
-"signed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:157
-msgid ""
-"Disable all checks on the form of the user ID while generating a new one"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:158
-msgid "Do not fail if signature is older than key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:159
-msgid "Allow subkeys that have a timestamp from the future"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:160
-msgid "Ignore CRC errors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:161
-msgid "Do not fail on MDC integrity protection failure"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:162
-msgid ""
-"Lock the databases the first time a lock is requested and do not release the "
-"lock until the process terminates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:163
-msgid "Release the locks every time a lock is no longer needed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:164
-msgid ""
-"Do not create an internal pool file for quicker generation of random numbers"
-msgstr ""
+msgstr "Åsidosätt värdet på GPG_AGENT_INFO-miljövariablen"
 
 #: /tmp/fish/implicit/share/completions/gpg.fish:165
 msgid "Reset verbose level to 0"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:166
-msgid "Suppress the initial copyright message"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:167
-msgid "Suppress the warning about 'using insecure memory'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:168
-msgid ""
-"Suppress the warning about unsafe file and home directory (--homedir) "
-"permissions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:169
-msgid "Suppress the warning about missing MDC integrity protection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:170
-msgid "Refuse to run if GnuPG cannot get secure memory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:171
-msgid "Do not refuse to run if GnuPG cannot get secure memory (default)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:172
-msgid "Assume the input data is not in ASCII armored format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:173
-msgid "Do not add the default keyrings to the list of keyrings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:174
-msgid "Skip the signature verification step"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:175
-msgid "Print key listings delimited by colons"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:176
-msgid ""
-"Print key listings delimited by colons (like --with-colons) and print the "
-"public key data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:177
-msgid ""
-"Same as the command --fingerprint but changes only the format of the output "
-"and may be used together with another command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:178
-msgid "Changes the output of the list commands to work faster"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:179
-msgid ""
-"Do not merge primary user ID and primary key in --with-colon listing mode "
-"and print all timestamps as UNIX timestamps"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:180
-msgid ""
-"Changes the behaviour of some commands. This is like --dry-run but different"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:181
-msgid "Display the session key used for one message"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:182
+#: share/completions/gpg.fish:304
 msgid "Don't use the public key but the specified session key"
-msgstr ""
+msgstr "Använd inte den öppna nyckel utan den angivna sessionsnyckeln"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:183
-#: /tmp/fish/implicit/share/completions/gpg.fish:185
-msgid "Prompt for an expiration time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:184
-#: /tmp/fish/implicit/share/completions/gpg.fish:186
-msgid "Do not prompt for an expiration time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:187
-msgid ""
-"Don't look at the key ID as stored in the message but try all secret keys in "
-"turn to find the right decryption key"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:188
-msgid ""
-"Enable a mode in which filenames of the form -&n, where n is a non-negative "
-"decimal number, refer to the file descriptor n and not to a file with that "
-"name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:189
+#: share/completions/gpg.fish:315
 msgid "Sets up a named group, which is similar to aliases in email programs"
-msgstr ""
+msgstr "Skapa en namngiven grupp, liknande alias i e-postprogram"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:190
-msgid "Remove a given entry from the --group list"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:191
-msgid "Remove all entries from the --group list"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:192
-msgid ""
-"Don't change the permissions of a secret keyring back to user read/write only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gpg.fish:193
+#: share/completions/gpg.fish:321
 msgid "Set the list of personal cipher preferences to the specified string"
-msgstr ""
+msgstr "Sätt listan på personliga chifferpreferenser till den angivna strängen"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:194
+#: share/completions/gpg.fish:322
 msgid "Set the list of personal digest preferences to the specified string"
 msgstr ""
+"Sätt listan på personliga digestinställningar till den angivna strängen"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:195
+#: share/completions/gpg.fish:323
 msgid ""
 "Set the list of personal compression preferences to the specified string"
 msgstr ""
+"Sätt listan på personliga kompressionsinställningar till den angivna strängen"
 
-#: /tmp/fish/implicit/share/completions/gpg.fish:196
+#: share/completions/gpg.fish:324
 msgid "Set the list of default preferences to the specified string"
-msgstr ""
+msgstr "Sätt listan på standardinställningar till den angivna strängen"
 
 #: /tmp/fish/implicit/share/completions/gphoto2.fish:1
 msgid "Print complete help message on program usage"
@@ -28508,129 +27503,25 @@ msgstr ""
 msgid "Overwrite files without asking"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gprof.fish:1
-msgid "Print annotated source"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:2
-msgid "Do not print explanations"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:3
-msgid "Print tally"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:4
-msgid "Display summary"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gprof.fish:5
 msgid "Search directories for source"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gprof.fish:6
-msgid "No annotated source"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:7
-msgid "Print full path of source"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gprof.fish:8
 msgid "Print flat profile"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gprof.fish:9
-msgid "No flat profile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:10
-msgid "Print call graph"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:11
-msgid "No call graph"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:12
-msgid "Annotate to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:13
-msgid "No tally"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:14
-msgid "Suggest function ordering"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:15
-msgid "Suggest file ordering"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:16
-msgid "Traditional mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:17
-msgid "Set width of output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:18
-msgid "Annotate every line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:19
-msgid "Set demangling style"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:20
-msgid "Turn of demangling"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:21
-msgid "Supress static functions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:22
-msgid "Ignore symbols not known to be functions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:23
+#: share/completions/gprof.fish:24
 msgid "Delete arcs from callgraph"
-msgstr ""
+msgstr "Radera arker från anropsgraf"
 
-#: /tmp/fish/implicit/share/completions/gprof.fish:24
-msgid "Line by line profiling"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:25
+#: share/completions/gprof.fish:26
 msgid "Supress output when executed less than specified times"
-msgstr ""
+msgstr "Visa inte utdata för kod som exekverats färre gånger än angivet antal"
 
-#: /tmp/fish/implicit/share/completions/gprof.fish:26
-msgid "Only propagate times for matching symbols"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:27
-msgid "Do not propagate times for matching symbols"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:28
-msgid "Mention unused functions in flat profile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:29
-msgid "Specify debugging options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:32
+#: share/completions/gprof.fish:33
 msgid "Profile data format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gprof.fish:33
-msgid "Print summary"
-msgstr ""
+msgstr "Format för profileringsdata"
 
 #: /tmp/fish/implicit/share/completions/gradle.fish:2
 msgid "Don't rebuild dependencies"
@@ -28783,17 +27674,22 @@ msgstr ""
 msgid "Specify task to be excluded from execution"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/grep.fish:2
+#: share/functions/__fish_complete_grep.fish:3
 msgid "Process binary file as text"
-msgstr ""
+msgstr "Processa binär fil som text"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:5
+#: share/functions/__fish_complete_grep.fish:6
+#, fuzzy
 msgid "Print byte offset of matches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv bara ut angivet antal matchningar"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:6
+#: share/functions/__fish_complete_grep.fish:7
 msgid "Assume data type for binary files"
-msgstr ""
+msgstr "Antag följande datatyp för binära filer"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:7
 msgid "Colour output"
@@ -28805,138 +27701,173 @@ msgid "Color output"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:9
+#: share/functions/__fish_complete_grep.fish:10
+#, fuzzy
 msgid "Only print number of matches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv bara ut angivet antal matchningar"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:10
-msgid "Action for devices"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/grep.fish:11
-msgid "Action for directories"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/grep.fish:12
+#: share/functions/__fish_complete_grep.fish:13
 msgid "Pattern is extended regexp"
-msgstr ""
+msgstr "Mönster är ett förlängt reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:13
+#: share/functions/__fish_complete_grep.fish:14
 msgid "Pattern is a regexp"
-msgstr ""
+msgstr "Mönster är ett reguljärt uttryck"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:14
+#: share/functions/__fish_complete_grep.fish:15
 msgid "Read pattern list from file. Skip files whose base name matches list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:15
+#: share/functions/__fish_complete_grep.fish:16
+#, fuzzy
 msgid "Exclude matching directories from recursive searches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sök i angivna kataloger efter källkod"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:16
+#: share/functions/__fish_complete_grep.fish:17
 msgid "Pattern is a fixed string"
-msgstr ""
+msgstr "Mönster är en fixsträng"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:17
 msgid "Use patterns from a file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/grep.fish:18
+#: share/functions/__fish_complete_grep.fish:19
 msgid "Pattern is basic regex"
-msgstr ""
+msgstr "Mönster är ett grundläggande reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:19
+#: share/functions/__fish_complete_grep.fish:20
 msgid "Print filename"
-msgstr ""
+msgstr "Visa filnamn"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
+#: share/functions/__fish_complete_grep.fish:21
+#, fuzzy
 msgid "Suppress printing filename"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte filnamn"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:22
+#: share/functions/__fish_complete_grep.fish:23
 msgid "Skip binary files"
-msgstr ""
+msgstr "Skippa binära filer"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:24
+#: share/functions/__fish_complete_grep.fish:25
 msgid "Print first non-matching file"
-msgstr ""
+msgstr "Visa första icke-matchande fil"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:25
+#: share/functions/__fish_complete_grep.fish:26
 msgid "Print first matching file"
-msgstr ""
+msgstr "Visa första matchande fil"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:26
+#: share/functions/__fish_complete_grep.fish:27
 msgid "Stop reading after NUM matches"
-msgstr ""
+msgstr "Sluta läsa efter NUM matchningar"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:27
+#: share/functions/__fish_complete_grep.fish:28
 msgid "Use the mmap system call to read input"
-msgstr ""
+msgstr "Använd systemanroppet mmap för inläsning"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:28
+#: share/functions/__fish_complete_grep.fish:29
+#, fuzzy
 msgid "Print line number"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa radnummer"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:29
+#: share/functions/__fish_complete_grep.fish:30
 msgid "Show only matching part"
-msgstr ""
+msgstr "Visa bara matchande del"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:30
+#: share/functions/__fish_complete_grep.fish:31
 msgid "Rename stdin"
-msgstr ""
+msgstr "Byt namn på standard in"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:31
+#: share/functions/__fish_complete_grep.fish:32
 msgid "Use line buffering"
-msgstr ""
+msgstr "Använd radbuffring"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:32
+#: share/functions/__fish_complete_grep.fish:33
+#, fuzzy
 msgid "Pattern is a Perl regexp (PCRE) string"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Mönster är ett reguljärt uttryck"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:33
-#: /tmp/fish/implicit/share/completions/grep.fish:34
+#: share/functions/__fish_complete_grep.fish:34
+#: share/functions/__fish_complete_grep.fish:35
 msgid "Do not write anything"
-msgstr ""
+msgstr "Skriv ingenting"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:35
 #: /tmp/fish/implicit/share/completions/grep.fish:36
+#: share/functions/__fish_complete_grep.fish:36
+#: share/functions/__fish_complete_grep.fish:37
+#, fuzzy
 msgid "Read files under each directory, recursively"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs filer i varje katalog"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:37
+#: share/functions/__fish_complete_grep.fish:38
+#, fuzzy
 msgid "Search only files matching PATTERN"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Rekursera, sök i filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:38
+#: share/functions/__fish_complete_grep.fish:39
+#, fuzzy
 msgid "Skip files matching PATTERN"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Rekursera, skippa filer som matchar mönster"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:39
+#: share/functions/__fish_complete_grep.fish:40
 msgid "Suppress error messages"
-msgstr ""
+msgstr "Visa inte felmeddelanden"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:40
+#: share/functions/__fish_complete_grep.fish:41
 msgid "Ensure first character of actual line content lies on a tab stop"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/grep.fish:41
+#: share/functions/__fish_complete_grep.fish:42
 msgid "Treat files as binary"
-msgstr ""
+msgstr "Behandla filer som om de vore binära"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:42
+#: share/functions/__fish_complete_grep.fish:43
 msgid "Report Unix-style byte offsets"
-msgstr ""
+msgstr "Visa Unix-typ av byteavstånd"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:44
+#: share/functions/__fish_complete_grep.fish:45
 msgid "Invert the sense of matching"
-msgstr ""
+msgstr "Invertera matchning"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:45
+#: share/functions/__fish_complete_grep.fish:46
 msgid "Only whole matching words"
-msgstr ""
+msgstr "Matcha bara hela ord"
 
-#: /tmp/fish/implicit/share/completions/grep.fish:46
+#: share/functions/__fish_complete_grep.fish:47
 msgid "Only whole matching lines"
-msgstr ""
+msgstr "Matcha bara hela rader"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:47
 msgid "Ignore case (deprecated: use -i instead)"
@@ -28946,9 +27877,9 @@ msgstr ""
 msgid "Treat input as a set of zero-terminated lines"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/grep.fish:49
+#: share/functions/__fish_complete_grep.fish:50
 msgid "Output a zero byte after filename"
-msgstr ""
+msgstr "Skriv en nollad byte efter filnamn"
 
 #: /tmp/fish/implicit/share/completions/groupadd.fish:1
 msgid "Exit with success status if the specified group already exists"
@@ -29273,35 +28204,14 @@ msgstr ""
 msgid "List keys and values, recursively"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gunzip.fish:4
-#: /tmp/fish/implicit/share/completions/gzip.fish:4
-msgid "List compression information"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gunzip.fish:6
-#: /tmp/fish/implicit/share/completions/gzip.fish:6
-msgid "Do not save/restore filename"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gunzip.fish:7
-#: /tmp/fish/implicit/share/completions/gzip.fish:7
-msgid "Save/restore filename"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/gunzip.fish:9
 #: /tmp/fish/implicit/share/completions/gzip.fish:9
 msgid "Recurse directories"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gunzip.fish:10
-#: /tmp/fish/implicit/share/completions/gzip.fish:10
+#: share/completions/gunzip.fish:15 share/completions/gzip.fish:17
 msgid "Suffix"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gunzip.fish:12
-#: /tmp/fish/implicit/share/completions/gzip.fish:12
-msgid "Display compression ratios"
-msgstr ""
+msgstr "Suffix"
 
 #: /tmp/fish/implicit/share/completions/gv.fish:1
 msgid "Display document using only black and white"
@@ -29481,14 +28391,6 @@ msgstr ""
 msgid "Show gv version and exit"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/gzip.fish:14
-msgid "Use fast setting"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/gzip.fish:15
-msgid "Use high compression setting"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/helm.fish:1
 msgid "Enable verbose output"
 msgstr ""
@@ -29585,8 +28487,12 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
 #: /tmp/fish/implicit/share/completions/helm.fish:76
+#, fuzzy
 msgid "Revision"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Slå ihop revisioner"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:25
 msgid "Dump all (computed) values"
@@ -29875,6 +28781,7 @@ msgid "Configurable greeting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:27
+#: share/completions/help.fish:12
 msgid "Help on how to reuse previously entered commands"
 msgstr ""
 
@@ -29939,6 +28846,7 @@ msgid "Shared bindings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/help.fish:43
+#: share/completions/help.fish:9
 msgid "Introduction to the fish syntax"
 msgstr ""
 
@@ -31730,8 +30638,12 @@ msgid "use IPv6 in addition to IPv4"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:480
+#, fuzzy
 msgid "SSL certificate file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj certifikatpolicy"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:482
 msgid "show status of all files"
@@ -31863,11 +30775,6 @@ msgstr ""
 msgid "Highlight style"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/htop.fish:1
-#: /tmp/fish/implicit/share/completions/top.fish:3
-msgid "Update interval"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/htop.fish:2
 #: /tmp/fish/implicit/share/completions/htop.fish:3
 msgid "Start htop in monochrome mode"
@@ -31879,8 +30786,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pv.fish:32
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:41
 #: /tmp/fish/implicit/share/completions/subl.fish:8
+#: share/completions/perl.fish:27
+#, fuzzy
 msgid "Show help and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa hjälp och avsluta"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:5
 msgid "Show only given PIDs"
@@ -32394,12 +31306,12 @@ msgid "Convert to specified encoding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:3
+#, fuzzy
 msgid "List known coded character sets"
 msgstr ""
-
-#: /tmp/fish/implicit/share/completions/iconv.fish:4
-msgid "Output file"
-msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj den interna teckenuppsättningen"
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:5
 msgid "Print progress information"
@@ -32431,26 +31343,10 @@ msgstr ""
 msgid "Replace each pixel with its complementary color"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/id.fish:1
-msgid "Print effective group id"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/id.fish:2
-msgid "Print all group ids"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/id.fish:3
 msgid "Print name, not number"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/id.fish:4
-msgid "Print real ID, not effective"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/id.fish:5
-msgid "Print effective user ID"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/iex.fish:15
 msgid "Connects to a node using a remote shell"
 msgstr ""
@@ -32461,19 +31357,18 @@ msgid ""
 "no file will be loaded"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ifconfig.fish:1
+#: share/completions/ifconfig.fish:1
 msgid "Stop interface"
-msgstr ""
+msgstr "Stanna gränssnitt"
 
-#: /tmp/fish/implicit/share/completions/ifconfig.fish:2
+#: share/completions/ifconfig.fish:2
 msgid "Start interface"
-msgstr ""
+msgstr "Starta gränssnitt"
 
-#: /tmp/fish/implicit/share/completions/ifconfig.fish:3
-#: /tmp/fish/implicit/share/completions/ifdown.fish:1
-#: /tmp/fish/implicit/share/completions/ifup.fish:1
+#: share/completions/ifconfig.fish:25 share/completions/ifdown.fish:1
+#: share/completions/ifup.fish:1
 msgid "Network interface"
-msgstr ""
+msgstr "Nätverkgränssnitt"
 
 #: /tmp/fish/implicit/share/completions/ifdata.fish:1
 msgid "Reports interface existence via return code"
@@ -33322,18 +32217,6 @@ msgstr ""
 msgid "Show the process id of each process in the job"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/jobs.fish:3
-msgid "Show group id of job"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/jobs.fish:4
-msgid "Show commandname of each job"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/jobs.fish:5
-msgid "Only show status for last job to be started"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/journalctl.fish:1
 msgid "Journal field"
 msgstr ""
@@ -33735,8 +32618,13 @@ msgid "Do not skip zombies"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:1
+#: share/completions/kitchen.fish:3
+#, fuzzy
 msgid "Test if kitchen has yet to be given the main command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:2
 #: /tmp/fish/implicit/share/completions/kitchen.fish:3
@@ -34132,73 +33020,9 @@ msgstr ""
 msgid "Apply the given task with the profile(s) specified."
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/less.fish:2
-msgid "Search after end of screen"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:3
+#: share/completions/less.fish:3
 msgid "Buffer space"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:4
-msgid "Disable automtic buffer allocation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:5
-msgid "Repaint from top"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:6
-msgid "Clear and repaint from top"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:7
-msgid "Supress error for lacking terminal capability"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:8
-msgid "Exit on second EOF"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:9
-msgid "Exit on EOF"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:10
-msgid "Open non-regular files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:11
-msgid "Quit if file shorter than one screen"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:12
-msgid "Hilight one search target"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:13
-msgid "No search highlighting"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:14
-msgid "Maximum backward scroll"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:15
-msgid "Search ignores lowercase case"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:16
-msgid "Search ignores all case"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:17
-msgid "Target line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:18
-msgid "Display status column"
-msgstr ""
+msgstr "Buffert-utrymme"
 
 #: /tmp/fish/implicit/share/completions/less.fish:19
 msgid "Specify key bindings file"
@@ -34208,116 +33032,10 @@ msgstr ""
 msgid "Prompt with percentage"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/less.fish:22
-msgid "Verbose prompt"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:23
-msgid "Display line number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:24
-msgid "Display line number for each line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:25
-msgid "Log input to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:26
-msgid "Log to file, overwrite"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:27
-msgid "Start at first occurrence of pattern"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:28
-msgid "Prompt string"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:29
-#: /tmp/fish/implicit/share/completions/less.fish:30
-msgid "Silent mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:31
-#: /tmp/fish/implicit/share/completions/less.fish:32
-msgid "Completly silent mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:33
-msgid "Display control chars"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:34
-msgid "Display control chars, guess screen appearance"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:35
-msgid "Multiple blank lines sqeezed"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/less.fish:36
 msgid "Do not fold long lines"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/less.fish:37
-msgid "Edit tag"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:38
-msgid "Set tag file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:39
-msgid "Allow backspace and carriage return"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:40
-msgid "Allow backspace, tab and carriage return"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:42
-msgid "Highlight first unread line on new page"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:43
-msgid "Highlight first unread line on any movement"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:44
-msgid "Set tab stops"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:45
-msgid "No termcap init"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:46
-msgid "No keypad init"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:47
-msgid "Maximum forward scroll"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:48
-msgid "Max scroll window"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:49
-msgid "Set quote char"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:50
-msgid "Lines after EOF are blank"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/less.fish:51
-msgid "Characters to scroll on left/right arrows"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/light.fish:3
 msgid "Get value (default)"
 msgstr ""
@@ -34958,239 +33676,198 @@ msgstr ""
 msgid "Print hexadecimal masks rather thans lists of CPUs"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ls.fish:1
+#: share/functions/__fish_complete_ls.fish:32
 msgid "List by columns"
-msgstr ""
+msgstr "Visa kolumnvis"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:2
+#: share/functions/__fish_complete_ls.fish:33
 msgid "Sort by size"
-msgstr ""
+msgstr "Sortera på storlek"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:3
+#: share/functions/__fish_complete_ls.fish:34
 msgid "Show and sort by ctime"
-msgstr ""
+msgstr "Visa och sortera på skapelsetidpunkt"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:4
+#: share/functions/__fish_complete_ls.fish:35
 msgid "Don't sort"
-msgstr ""
+msgstr "Sortera ej filer"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:5
+#: share/functions/__fish_complete_ls.fish:36
 msgid "Long format without owner"
-msgstr ""
+msgstr "Långt format utan ägare"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:6
+#: share/functions/__fish_complete_ls.fish:37
 msgid "Set blocksize to 1kB"
-msgstr ""
+msgstr "Välj blockstorlek 1kB"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:7
-#: /tmp/fish/implicit/share/completions/ps.fish:22
+#: share/functions/__fish_complete_ls.fish:38
 msgid "Long format"
-msgstr ""
+msgstr "Långt format"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:8
+#: share/functions/__fish_complete_ls.fish:39
 msgid "Comma separated format"
-msgstr ""
+msgstr "Kommaseparerat format"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:9
+#: share/functions/__fish_complete_ls.fish:40
 msgid "Sort by modification time"
-msgstr ""
+msgstr "Sortera på ändringstid"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:10
+#: share/functions/__fish_complete_ls.fish:41
 msgid "Show access time"
-msgstr ""
+msgstr "Visa senaste åtkomsttid"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:11
+#: share/functions/__fish_complete_ls.fish:42
 msgid "List entries by lines"
-msgstr ""
+msgstr "Visa radvis"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:12
+#: share/functions/__fish_complete_ls.fish:43
 msgid "List one file per line"
-msgstr ""
+msgstr "Visa en fil per rad"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:13
-#: /tmp/fish/implicit/share/completions/ls.fish:68
+#: share/functions/__fish_complete_ls.fish:16
 msgid "Show hidden"
-msgstr ""
+msgstr "Visa dolda filer"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:14
-#: /tmp/fish/implicit/share/completions/ls.fish:69
+#: share/functions/__fish_complete_ls.fish:17
 msgid "Show hidden except . and .."
-msgstr ""
+msgstr "Visa dolda filer utom . och .."
 
-#: /tmp/fish/implicit/share/completions/ls.fish:15
-#: /tmp/fish/implicit/share/completions/ls.fish:24
-#: /tmp/fish/implicit/share/completions/ls.fish:42
-#: /tmp/fish/implicit/share/completions/ls.fish:70
-#: /tmp/fish/implicit/share/completions/ls.fish:79
+#: share/functions/__fish_complete_ls.fish:18
+#: share/functions/__fish_complete_ls.fish:27
 msgid "Append filetype indicator"
-msgstr ""
+msgstr "Lägg till filtypsindikator"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:18
-#: /tmp/fish/implicit/share/completions/ls.fish:73
+#: share/functions/__fish_complete_ls.fish:21
 msgid "List subdirectory recursively"
-msgstr ""
+msgstr "Visa underkataloger rekursivt"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:19
-#: /tmp/fish/implicit/share/completions/ls.fish:59
-#: /tmp/fish/implicit/share/completions/ls.fish:74
+#: share/functions/__fish_complete_ls.fish:22
+#: share/functions/__fish_complete_ls.fish:102
 msgid "Octal escapes for non graphic characters"
-msgstr ""
+msgstr "Använd oktala specialsekvenser för ickegrafiska tecken"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:20
-#: /tmp/fish/implicit/share/completions/ls.fish:75
+#: share/functions/__fish_complete_ls.fish:23
 msgid "List directories, not their content"
-msgstr ""
+msgstr "Visa kataloger, inte deras innehåll"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:22
-#: /tmp/fish/implicit/share/completions/ls.fish:77
+#: share/functions/__fish_complete_ls.fish:25
 msgid "Print inode number of files"
-msgstr ""
+msgstr "Visa inod för filer"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:23
-#: /tmp/fish/implicit/share/completions/ls.fish:78
+#: share/functions/__fish_complete_ls.fish:26
 msgid "Long format, numeric IDs"
-msgstr ""
+msgstr "Långt format, numeriska IDn"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:25
-#: /tmp/fish/implicit/share/completions/ls.fish:80
+#: share/functions/__fish_complete_ls.fish:28
 msgid "Replace non-graphic characters with '?'"
-msgstr ""
+msgstr "Ersätt ickegrafiska tecken med '?'"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:27
-#: /tmp/fish/implicit/share/completions/ls.fish:82
+#: share/functions/__fish_complete_ls.fish:30
 msgid "Print size of files"
-msgstr ""
+msgstr "Visa filstorlek"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:28
 msgid "Group directories before files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ls.fish:29
+#: share/functions/__fish_complete_ls.fish:49
 msgid "Do not list implied entries matching specified shell pattern"
-msgstr ""
+msgstr "Visa inte filer som matchar mönster"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:30
+#: share/functions/__fish_complete_ls.fish:50
 msgid "Display security context"
-msgstr ""
+msgstr "Visa säkerhetskontext"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:31
+#: share/functions/__fish_complete_ls.fish:51
 msgid "Display  security  context  so  it fits on most displays"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/ls.fish:32
+#: share/functions/__fish_complete_ls.fish:52
 msgid "Display only security context and file name"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ls.fish:33
+#: share/functions/__fish_complete_ls.fish:54
 msgid "Print author"
-msgstr ""
+msgstr "Visa författare"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:34
-#: /tmp/fish/implicit/share/completions/xz.fish:19
-msgid "Set block size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:35
+#: share/functions/__fish_complete_ls.fish:56
 msgid "Ignore files ending with ~"
-msgstr ""
+msgstr "Ignorera filer som slutar på ~"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:36
-#: /tmp/fish/implicit/share/completions/ls.fish:60
+#: share/functions/__fish_complete_ls.fish:103
 msgid "Use colors"
-msgstr ""
+msgstr "Använd färger"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:37
+#: share/functions/__fish_complete_ls.fish:58
 msgid "Generate dired output"
-msgstr ""
+msgstr "Generera utdata för dired"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:38
 msgid "List format"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ls.fish:39
+#: share/functions/__fish_complete_ls.fish:60
 msgid "Long format, full-iso time"
-msgstr ""
+msgstr "Långt format, full-iso-tid"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:40
+#: share/functions/__fish_complete_ls.fish:61
 msgid "Don't print group information"
-msgstr ""
+msgstr "Visa inte information om grupp"
 
 #: /tmp/fish/implicit/share/completions/ls.fish:43
 msgid "Skip entries matching pattern"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ls.fish:44
-#: /tmp/fish/implicit/share/completions/ls.fish:67
+#: share/functions/__fish_complete_ls.fish:66
+#: share/functions/__fish_complete_ls.fish:110
 msgid "Print raw entry names"
-msgstr ""
+msgstr "Skriv obehandlade filnamn"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:45
+#: share/functions/__fish_complete_ls.fish:67
 msgid "Long format without groups"
-msgstr ""
+msgstr "Långt fromat utan grupper"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:46
+#: share/functions/__fish_complete_ls.fish:68
 msgid "Non graphic as-is"
-msgstr ""
+msgstr "Ersätt inte icke-grafiska tecken"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:47
+#: share/functions/__fish_complete_ls.fish:69
 msgid "Enclose entry in quotes"
-msgstr ""
+msgstr "Omgärda namn med citattecken"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:48
-msgid "Select quoting style"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:49
-msgid "Sort criteria"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:50
-msgid "Show time type"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:51
-msgid "Select time style"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:52
-msgid "Assume tab stops at each COLS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:53
+#: share/functions/__fish_complete_ls.fish:91
 msgid "Do not sort"
-msgstr ""
+msgstr "Sortera ej filer"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:54
+#: share/functions/__fish_complete_ls.fish:92
 msgid "Sort by version"
-msgstr ""
+msgstr "Sortera på version"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:55
-msgid "Assume screen width"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ls.fish:56
+#: share/functions/__fish_complete_ls.fish:94
 msgid "Sort by extension"
-msgstr ""
+msgstr "Sortera på filändelse"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:61
+#: share/functions/__fish_complete_ls.fish:104
 msgid "Prevent -A from being automatically set for root"
-msgstr ""
+msgstr "Hindra -A från att automatiskt sättas för root"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:63
+#: share/functions/__fish_complete_ls.fish:106
 msgid "Show modification time"
-msgstr ""
+msgstr "Visa ändringstid"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:64
+#: share/functions/__fish_complete_ls.fish:107
 msgid "Show whiteouts when scanning directories"
-msgstr ""
+msgstr "Visa korrigeringstecken vid katalogskanning"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:65
+#: share/functions/__fish_complete_ls.fish:108
 msgid "Display each file's MAC label"
-msgstr ""
+msgstr "Visa varje file MAC-etikett"
 
-#: /tmp/fish/implicit/share/completions/ls.fish:66
+#: share/functions/__fish_complete_ls.fish:109
 msgid "Include the file flags in a long (-l) output"
-msgstr ""
+msgstr "Visa filflaggor vid långt (-l) formay"
 
 #: /tmp/fish/implicit/share/completions/lsof.fish:2
 msgid "Causes list selections to be ANDed"
@@ -35253,6 +33930,7 @@ msgid "Increase verbosity (show descriptors)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/lsusb.fish:2
+#: share/completions/lsusb.fish:2
 msgid "Show only devices with specified device and/or bus numbers (in decimal)"
 msgstr ""
 
@@ -35856,119 +34534,73 @@ msgstr ""
 msgid "Don't ask any interactive question"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:1
+#: share/completions/makedepend.fish:1
 msgid "Define"
-msgstr ""
+msgstr "Definering"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:2
+#: share/completions/makedepend.fish:2
 msgid "Include directory"
-msgstr ""
+msgstr "Inkluderingskatalog"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:3
+#: share/completions/makedepend.fish:3
 msgid "Replace include directories"
-msgstr ""
+msgstr "Ersätt inkluderingskataloger"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:4
-msgid "Append dependencies to makefile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/makedepend.fish:5
+#: share/completions/makedepend.fish:5
 msgid "Specify makefile"
-msgstr ""
+msgstr "Ange makefil"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:6
+#: share/completions/makedepend.fish:6
 msgid "Prepend file to input"
-msgstr ""
+msgstr "Lägg till fil före indata"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:7
+#: share/completions/makedepend.fish:7
 msgid "Object file suffix"
-msgstr ""
+msgstr "Objektfilsuffix"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:8
+#: share/completions/makedepend.fish:8
 msgid "Object file prefix"
-msgstr ""
+msgstr "Objektfilprefix"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:9
+#: share/completions/makedepend.fish:9
 msgid "Starting string delimiter"
-msgstr ""
+msgstr "Avdelare för start av sträng"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:10
+#: share/completions/makedepend.fish:10
 msgid "Line width"
-msgstr ""
+msgstr "Radbredd"
 
-#: /tmp/fish/implicit/share/completions/makedepend.fish:12
-msgid "Warn about multiple inclusion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:1
+#: share/completions/make.fish:12
 msgid "Target"
-msgstr ""
+msgstr "Mål"
 
-#: /tmp/fish/implicit/share/completions/make.fish:2
+#: share/completions/make.fish:13
 msgid "Use file as makefile"
-msgstr ""
+msgstr "Använd som make-fil"
 
-#: /tmp/fish/implicit/share/completions/make.fish:3
-#: /tmp/fish/implicit/share/completions/tar.fish:15
-#: /tmp/fish/implicit/share/functions/cd.fish:1
+#: share/completions/tar.fish:19 share/functions/cd.fish:5
 msgid "Change directory"
-msgstr ""
+msgstr "Ändra katalog"
 
-#: /tmp/fish/implicit/share/completions/make.fish:5
-msgid "Environment before makefile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:7
+#: share/completions/make.fish:18
 msgid "Search directory for makefile"
-msgstr ""
+msgstr "Sökkatalog för make-fil"
 
-#: /tmp/fish/implicit/share/completions/make.fish:8
+#: share/completions/make.fish:19
 msgid "Number of concurrent jobs"
-msgstr ""
+msgstr "Antal simultana jobb"
 
-#: /tmp/fish/implicit/share/completions/make.fish:9
-msgid "Continue after an error"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:10
-msgid "Start when load drops"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:11
-msgid "Do not execute commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:12
+#: share/completions/make.fish:23
 msgid "Ignore specified file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:13
-msgid "Print database"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:14
-msgid "Question mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:15
-msgid "Eliminate implicit rules"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:17
-msgid "Don't continue after an error"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/make.fish:18
-msgid "Touch files, don't run commands"
-msgstr ""
+msgstr "Ignorera angiven fil"
 
 #: /tmp/fish/implicit/share/completions/make.fish:20
 msgid "Print working directory"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/make.fish:21
+#: share/completions/make.fish:32
 msgid "Pretend file is modified"
-msgstr ""
+msgstr "Låtsas att fil modifierats"
 
 #: /tmp/fish/implicit/share/completions/makepkg.fish:1
 msgid "Ignore missing or incomplete arch field"
@@ -36122,66 +34754,6 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/man.fish:1
-msgid "Program section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:2
-msgid "Syscall section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:3
-msgid "Library section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:4
-msgid "Device section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:5
-msgid "File format section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:6
-msgid "Games section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:7
-msgid "Misc section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:8
-msgid "Admin section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:9
-msgid "Kernel section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:10
-msgid "Tcl section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:11
-msgid "New section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:12
-msgid "Local section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:13
-msgid "Old section"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:15
-msgid "Manpath"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:16
-msgid "Pager"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/man.fish:17
 msgid "Manual sections"
 msgstr ""
@@ -36190,51 +34762,6 @@ msgstr ""
 msgid "Display all matches"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/man.fish:19
-msgid "Always reformat"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:20
-msgid "Debug"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:21
-msgid "Debug and run"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:22
-msgid "Show whatis information"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:23
-msgid "Format only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:25
-msgid "Show apropos information"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:26
-msgid "Search in all man pages"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:27
-msgid "Set system"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:28
-msgid "Preprocessors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:29
-msgid "Format for printing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/man.fish:30
-#: /tmp/fish/implicit/share/completions/man.fish:31
-msgid "Only print locations"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/mc.fish:1
 msgid "No graphic chars for line drawing"
 msgstr ""
@@ -36390,6 +34917,7 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/mdadm.fish:11
 #: /tmp/fish/implicit/share/completions/obnam.fish:47
 #: /tmp/fish/implicit/share/completions/xrandr.fish:1
+#: share/completions/obnam.fish:52
 msgid "Be more verbose"
 msgstr ""
 
@@ -38006,75 +36534,14 @@ msgstr ""
 msgid "Use DIR as filesystem root for /lib/modules"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/modprobe.fish:1
-msgid "Print messages about what the program is doing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:3
-msgid "Dump configuration file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:4
-msgid "Do not actually insert/remove module"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:5
-#: /tmp/fish/implicit/share/completions/modprobe.fish:6
-msgid "Ignore install and remove commands in configuration file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:7
-msgid "Ignore bogus module names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:8
-msgid "Remove modules"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:10
-msgid "Ignore all version information"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/modprobe.fish:11
 msgid "Ignore version magic information"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/modprobe.fish:12
-msgid "Ignore module interface version"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/modprobe.fish:13
 msgid "List all modules matching the given wildcard"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/modprobe.fish:14
-msgid "Insert modules matching the given wildcard"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:15
-msgid "Restrict wildcards to specified directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:16
-msgid "Send error messages through syslog"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:17
-msgid "Specify kernel version"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:18
-msgid "List dependencies of module"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:19
-msgid "Rename module"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/modprobe.fish:20
-msgid "Fail if inserting already loaded module"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/mogrify.fish:35
 msgid "Image format type [type]"
 msgstr ""
@@ -38198,6 +36665,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mosh.fish:5
+#: share/completions/mosh.fish:20
 msgid "Controls use of speculative local echo"
 msgstr ""
 
@@ -38217,22 +36685,6 @@ msgstr ""
 msgid "Mount file systems in fstab"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/mount.fish:5
-msgid "Fork process for each mount"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mount.fish:6
-msgid "Fake mounting"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mount.fish:7
-msgid "Add label to output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mount.fish:8
-msgid "Do not write mtab"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/mount.fish:9
 msgid "Tolerate sloppy mount options"
 msgstr ""
@@ -38245,188 +36697,144 @@ msgstr ""
 msgid "Read/Write mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/mount.fish:12
+#: share/completions/mount.fish:19
 msgid "Mount partition with specified label"
-msgstr ""
+msgstr "Montera partitioner med angiven etikett"
 
-#: /tmp/fish/implicit/share/completions/mount.fish:13
+#: share/completions/mount.fish:20
 msgid "Mount partition with specified UID"
-msgstr ""
+msgstr "Montera partition med angivet UID"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:14
+#: share/completions/mount.fish:21
+#, fuzzy
 msgid "Exclude file systems"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Exkludera filsystem"
 
-#: /tmp/fish/implicit/share/completions/mount.fish:15
+#: share/completions/mount.fish:22
 msgid "Remount a subtree to a second position"
-msgstr ""
+msgstr "Montera om ett subträd till en andra plats"
 
-#: /tmp/fish/implicit/share/completions/mount.fish:16
+#: share/completions/mount.fish:23
 msgid "Move a subtree to a new position"
-msgstr ""
+msgstr "Flytta ett subträd till en ny plats"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:17
+#: share/completions/mount.fish:24
+#, fuzzy
 msgid "File system"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Filsystem"
 
-#: /tmp/fish/implicit/share/completions/mount.fish:18
+#: share/completions/mount.fish:26
 msgid "Mount option"
-msgstr ""
+msgstr "Monteringsflagga"
 
-#: /tmp/fish/implicit/share/completions/mplayer.fish:1
-msgid "Dynamically change postprocessing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:2
+#: share/completions/mplayer.fish:28
 msgid "A/V sync speed"
-msgstr ""
+msgstr "Ljud/bild synkroniseringshastighet"
 
-#: /tmp/fish/implicit/share/completions/mplayer.fish:3
-#: /tmp/fish/implicit/share/completions/mplayer.fish:5
-msgid "Skip frames to maintain A/V sync"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:6
+#: share/completions/mplayer.fish:32
 msgid "Loop playback"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:9
-msgid "Full screen"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:10
-msgid "Set playlist"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:11
-msgid "Audio language"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:12
-msgid "Play audio from file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:13
-msgid "Set default CD-ROM drive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:14
-msgid "Set number of audio channels"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:15
-msgid "Set start chapter"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:16
-msgid "Set default DVD-ROM drive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:17
-msgid "Set dvd viewing angle"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:18
-msgid "Force rebuilding index"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:19
-msgid "Override framerate"
-msgstr ""
+msgstr "Upprepa uppspelning"
 
 #: /tmp/fish/implicit/share/completions/mplayer.fish:20
 msgid "Build index if unavailable"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/mplayer.fish:21
-msgid "Load index from file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:22
-msgid "Force non-interleaved AVI parser"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:23
-msgid "Rebuild index and save to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:24
-msgid "Seek to given time position"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:25
-msgid "TV capture mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:26
-msgid "Subtitle language"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:27
-msgid "Subtitle file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:28
-msgid "Handle subtitlefile as unicode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:29
-msgid "Handle subtitlefile as utf8"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mplayer.fish:30
-#: /tmp/fish/implicit/share/completions/mplayer.fish:33
+#: share/completions/mplayer.fish:58 share/completions/mplayer.fish:76
 msgid "Video output"
-msgstr ""
+msgstr "Bildutdata"
 
-#: /tmp/fish/implicit/share/completions/mplayer.fish:31
-#: /tmp/fish/implicit/share/completions/mplayer.fish:32
+#: share/completions/mplayer.fish:64 share/completions/mplayer.fish:70
 msgid "Audio output"
-msgstr ""
+msgstr "Ljudutdata"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:1
 msgid "Add specified directory to list for input files search"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:2
+#: share/completions/msgfmt.fish:5
+#, fuzzy
 msgid "Generate a Java ResourceBundle class"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera källindexfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:3
+#: share/completions/msgfmt.fish:6
 msgid "Like --java, and assume Java2 (JDK 1.2 or higher)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:4
+#: share/completions/msgfmt.fish:7
+#, fuzzy
 msgid "Generate a .NET .dll file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:5
+#: share/completions/msgfmt.fish:8
+#, fuzzy
 msgid "Generate a .NET .resources file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera källindexfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:6
+#: share/completions/msgfmt.fish:9
+#, fuzzy
 msgid "Generate a tcl/msgcat .msg file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:7
+#: share/completions/msgfmt.fish:10
+#, fuzzy
 msgid "Generate a Qt .qm file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:9
 msgid "Enable strict Uniforum mode"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:10
+#: share/completions/msgfmt.fish:17
+#, fuzzy
 msgid "Resource name"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj volymnamn"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:11
+#: share/completions/msgfmt.fish:18
 msgid "Locale name, either language or language_COUNTRY"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:12
+#: share/completions/msgfmt.fish:19
+#, fuzzy
 msgid "Base directory for output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Filidentifierare för indata"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:13
 msgid "Input files are in Java .properties syntax"
@@ -38485,11 +36893,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:1
 #: /tmp/fish/implicit/share/completions/mutt.fish:16
+#: share/completions/mutt.fish:21
 msgid "Specify a carbon-copy (CC) recipient"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:2
 #: /tmp/fish/implicit/share/completions/mutt.fish:15
+#: share/completions/mutt.fish:20
 msgid "Specify a blind-carbon-copy (BCC) recipient"
 msgstr ""
 
@@ -38530,72 +36940,82 @@ msgid "Open the first mailbox which contains new mail"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:13
+#: share/completions/mutt.fish:18
 msgid "An expanded version of the given alias is passed to stdout"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:14
+#: share/completions/mutt.fish:19
 msgid "Attach a file to your message using MIME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:17
+#: share/completions/mutt.fish:22
 msgid "Run command after processing of initialization files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:18
+#: share/completions/mutt.fish:23
+#, fuzzy
 msgid "Specify which mailbox to load"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange sendmailkommando"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:19
+#: share/completions/mutt.fish:24
+#, fuzzy
 msgid "Specify an initialization file to read instead of ~/.muttrc"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange logmeddelande istället för att anropa editor"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:20
+#: share/completions/mutt.fish:25
 msgid "Specify a draft file containing header and body for the message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:21
+#: share/completions/mutt.fish:26
 msgid "Specify a file to include into the body of a message"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:22
+#: share/completions/mutt.fish:27
+#, fuzzy
 msgid "Specify a default mailbox type"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj kärnversion"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:23
+#: share/completions/mutt.fish:28
+#, fuzzy
 msgid "Query a configuration variables value"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:24
+#: share/completions/mutt.fish:29
+#, fuzzy
 msgid "Specify the subject of the message"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange meddelande för tillägg"
 
-#: /tmp/fish/implicit/share/completions/mv.fish:1
-msgid "Make backup of each existing destination file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mv.fish:2
-msgid "Do not prompt before overwriting"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mv.fish:4
+#: share/completions/mv.fish:4
 msgid "Answer for overwrite questions"
-msgstr ""
+msgstr "Svar till överskrivningsfrågor"
 
-#: /tmp/fish/implicit/share/completions/mv.fish:5
-msgid "Remove trailing slashes from source"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mv.fish:6
+#: share/completions/cp.fish:11 share/completions/mv.fish:6
 msgid "Backup suffix"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mv.fish:7
-msgid "Target directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/mv.fish:8
-msgid "Do not overwrite newer files"
-msgstr ""
+msgstr "Backup-ändelse"
 
 #: /tmp/fish/implicit/share/completions/mvn.fish:1
 msgid "If project list is specified, also build projects required by the list"
@@ -42845,11 +41265,6 @@ msgstr ""
 msgid "Open the specified profile in an editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/nextd.fish:1
-#: /tmp/fish/implicit/share/completions/prevd.fish:1
-msgid "Also print directory history"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/nice.fish:2
 msgid "Add specified amount to niceness value"
 msgstr ""
@@ -43069,16 +41484,31 @@ msgid "Display this program's version number"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
+#: share/completions/node.fish:9
+#, fuzzy
 msgid "Print node's version"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa kärnversion"
 
 #: /tmp/fish/implicit/share/completions/node.fish:2
+#: share/completions/node.fish:10
+#, fuzzy
 msgid "Evaluate script"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Extrahera skript"
 
 #: /tmp/fish/implicit/share/completions/node.fish:3
+#: share/completions/node.fish:11
+#, fuzzy
 msgid "Print result of --eval"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa platt profil"
 
 #: /tmp/fish/implicit/share/completions/node.fish:4
 msgid "Always enter the REPL even if stdin does not appear to be a terminal"
@@ -44485,10 +42915,12 @@ msgid "Verify that live data and backed up data match"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:26
+#: share/completions/obnam.fish:30
 msgid "Restore setuid/setgid bits in restored files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:27
+#: share/completions/obnam.fish:31
 msgid "Do not restore setuid/setgid bits in restored files"
 msgstr ""
 
@@ -44497,42 +42929,72 @@ msgid "Use CHECKSUM algorithm"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:29
+#: share/completions/obnam.fish:32
+#, fuzzy
 msgid "Name of client"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"NAmn på version at använda som kontrollpunkt"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:30
+#: share/completions/obnam.fish:33
+#, fuzzy
 msgid "Compress repository with"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Komprimera till standard ut"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:31
+#: share/completions/obnam.fish:34
 msgid "For --nagios-last-backup-age: maximum age"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:32
+#: share/completions/obnam.fish:35
 msgid "Dump metadata about files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:33
+#: share/completions/obnam.fish:36
+#, fuzzy
 msgid "Do not dump metadata about files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera inte byggda filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
+#: share/completions/obnam.fish:37
+#, fuzzy
 msgid "Generate man page"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera ett nytt nyckelpar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
+#: share/completions/obnam.fish:38
 msgid "Which generation to restore"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:36
+#: share/completions/obnam.fish:39
+#, fuzzy
 msgid "Show this help message and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:37
+#: share/completions/obnam.fish:40
 msgid "Policy for what generations to keep when forgetting."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:38
+#: share/completions/obnam.fish:41
 msgid "Wait TIMEOUT seconds for an existing lock"
 msgstr ""
 
@@ -44541,18 +43003,30 @@ msgid "Write output to FILE instead of STDOUT"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:40
+#: share/completions/obnam.fish:43
+#, fuzzy
 msgid "Do not actually change anything"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv ingenting"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:41
+#: share/completions/obnam.fish:44
+#, fuzzy
 msgid "Actually commit changes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Summera ändringar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:42
+#: share/completions/obnam.fish:45
 msgid "Show only errors, no progress updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:43
+#: share/completions/obnam.fish:46
 msgid "Show errors and progress updates"
 msgstr ""
 
@@ -44569,41 +43043,68 @@ msgid "Where to restore / mount to"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:48
+#: share/completions/obnam.fish:53
+#, fuzzy
 msgid "Do not be verbose"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv inte över"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:49
+#: share/completions/obnam.fish:54
 msgid "Verify N files randomly from the backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:50
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:72
+#: share/completions/obnam.fish:55
+#, fuzzy
 msgid "Show version number and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:51
 msgid "For nagios-last-backup-age: maximum age"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:52
+#: share/completions/obnam.fish:57
 msgid "Make a checkpoint after a given SIZE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:53
+#: share/completions/obnam.fish:58
+#, fuzzy
 msgid "Deduplicate mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs ock skrivbart läge"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:54
 msgid "REGEXP for pathnames to exclude"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:55
+#: share/completions/obnam.fish:60
+#, fuzzy
 msgid "Exclude directories tagged as cache"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sök i angivna kataloger efter källkod"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:56
+#: share/completions/obnam.fish:61
+#, fuzzy
 msgid "Include directories tagged as cache"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Inkluderingskatalog"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:57
 #: /tmp/fish/implicit/share/completions/rsync.fish:77
@@ -44615,30 +43116,44 @@ msgid "REGEXP for pathnames to include, even if matches --exclude"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:59
+#: share/completions/obnam.fish:63
 msgid "Leave checkpoint generations at the end of backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:60
+#: share/completions/obnam.fish:64
 msgid "Omit checkpoint generations at the end of backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:61
+#: share/completions/obnam.fish:65
+#, fuzzy
 msgid "Do not follow mount points"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radbryt inte långa rader"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:62
+#: share/completions/obnam.fish:66
+#, fuzzy
 msgid "Follow mount points"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Monteringskatalog"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:63
 msgid "What to backup"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:64
+#: share/completions/obnam.fish:67
 msgid "Put small files directly into the B-tree"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:65
+#: share/completions/obnam.fish:68
 msgid "No not put small files into the B-tree"
 msgstr ""
 
@@ -44647,24 +43162,49 @@ msgid "Add FILE to config files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
+#: share/completions/obnam.fish:70
+#, fuzzy
 msgid "Write out the current configuration"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ladda om konfiguration för tjänst"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:68
+#: share/completions/obnam.fish:71
+#, fuzzy
 msgid "Write out setting names"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv prompten"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:69
+#: share/completions/obnam.fish:72
+#, fuzzy
 msgid "Show all options"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa hjälp om flaggor"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:70
+#: share/completions/obnam.fish:73
+#, fuzzy
 msgid "List config files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:71
+#: share/completions/obnam.fish:74
+#, fuzzy
 msgid "Clear list of configuration files to read"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa rpmkonfigurationsfiler"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:72
 msgid "Artificially crash the program after COUNTER files"
@@ -44675,14 +43215,20 @@ msgid "Pretend it is TIMESTAMP"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:74
+#: share/completions/obnam.fish:49
+#, fuzzy
 msgid "Simulate failures for files that match REGEXP"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj fix som matchar REGEXP"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:75
 msgid "FILENAME pattern for trace debugging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:76
+#: share/completions/obnam.fish:75
 msgid "PGP key with which to encrypt"
 msgstr ""
 
@@ -44691,42 +43237,68 @@ msgid "Home directory for GPG"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:78
+#: share/completions/obnam.fish:76
+#, fuzzy
 msgid "Show additional user IDs"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa historik för alla användare"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:79
+#: share/completions/obnam.fish:77
+#, fuzzy
 msgid "Do not show additional user IDs"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lagra inte katalognamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:80
+#: share/completions/obnam.fish:78
 msgid "PGP key id"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:81
+#: share/completions/obnam.fish:79
 msgid "Size of symmetric key"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:82
+#: share/completions/obnam.fish:80
+#, fuzzy
 msgid "Use /dev/urandom instead of /dev/random"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd rensning istället för radering"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:83
+#: share/completions/obnam.fish:81
 msgid "Use default /dev/random"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:84
+#: share/completions/obnam.fish:83
 msgid "fsck should try to fix problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:85
+#: share/completions/obnam.fish:84
 msgid "fsck should not try to fix problems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:86
+#: share/completions/obnam.fish:85
+#, fuzzy
 msgid "Ignore chunks when checking integrity"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ignorera skiftläge på filnamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:87
+#: share/completions/obnam.fish:86
 msgid "Check chunks when checking integrity"
 msgstr ""
 
@@ -44735,13 +43307,23 @@ msgid "Do not check data for cient NAME"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
+#: share/completions/obnam.fish:88
+#, fuzzy
 msgid "Check only the last generation"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Återupta senaste installationsoperation"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:90
 #: /tmp/fish/implicit/share/completions/obnam.fish:100
+#: share/completions/obnam.fish:89 share/completions/obnam.fish:95
+#, fuzzy
 msgid "Check all generations"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
@@ -44757,102 +43339,166 @@ msgid "Check checksums of files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:95
+#: share/completions/obnam.fish:90
+#, fuzzy
 msgid "Do not check directories"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lagra inte katalognamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
+#: share/completions/obnam.fish:91
+#, fuzzy
 msgid "Check directories"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Rekursera till underkataloger"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
+#: share/completions/obnam.fish:92
+#, fuzzy
 msgid "Do not check files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:98
+#: share/completions/obnam.fish:93
+#, fuzzy
 msgid "Check files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:99
+#: share/completions/obnam.fish:94
+#, fuzzy
 msgid "Do not check any generations"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:101
+#: share/completions/obnam.fish:96
+#, fuzzy
 msgid "Do not check per-client B-trees"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv inte ut taggar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:102
+#: share/completions/obnam.fish:97
 msgid "Check per-client B-trees"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:103
+#: share/completions/obnam.fish:98
+#, fuzzy
 msgid "Do not check shared B-trees"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:104
+#: share/completions/obnam.fish:99
+#, fuzzy
 msgid "Check shared B-trees"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:105
 msgid "Write log to FILE or syslog"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:106
+#: share/completions/obnam.fish:102
 msgid "Keep last N logs (10)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:107
+#: share/completions/obnam.fish:103
 msgid "Log at LEVEL"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:108
+#: share/completions/obnam.fish:104
 msgid "Rotate logs larger than SIZE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:109
+#: share/completions/obnam.fish:105
 msgid "Set permissions of logfiles to MODE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:110
+#: share/completions/obnam.fish:106
 msgid "Options to pass to FUSE"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:111
+#: share/completions/obnam.fish:107
 msgid "Make memory profiling dumps using METHOD"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:112
+#: share/completions/obnam.fish:108
 msgid "Make memory profiling dumps at SECONDS"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:113
+#: share/completions/obnam.fish:109
 msgid "Size of chunks of file data"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:114
+#: share/completions/obnam.fish:110
 msgid "Encode NUM chunk ids per group"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:115
+#: share/completions/obnam.fish:111
 msgid "Chunk id level size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:116
+#: share/completions/obnam.fish:112
+#, fuzzy
 msgid "Depth of chunk id mapping"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Djup i anroppskedjan"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:117
+#: share/completions/obnam.fish:113
 msgid "Chunk id mapping lowest bits skip"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:118
+#: share/completions/obnam.fish:114
 msgid "Size of LRU cache for B-tree nodes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:119
+#: share/completions/obnam.fish:115
+#, fuzzy
 msgid "Size of B-tree nodes on disk"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringar i omvänd ordning"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:120
+#: share/completions/obnam.fish:116
 msgid "Length of upload queue for B-tree nodes"
 msgstr ""
 
@@ -44873,18 +43519,25 @@ msgid "In-memory cache SIZE for dir objects"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:125
+#: share/completions/obnam.fish:117
 msgid "Use only paramiko, no openssh"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:126
+#: share/completions/obnam.fish:118
+#, fuzzy
 msgid "Use openssh if available"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bygg index om inte tillgängligt"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:127
 msgid "Executable to be used instead of \"ssh\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:128
+#: share/completions/obnam.fish:120
 msgid "ssh host key check"
 msgstr ""
 
@@ -45726,20 +44379,6 @@ msgstr ""
 msgid "Set an alternate configuration file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/patch.fish:1
-msgid ""
-"Make backup files, when patching a file, rename or copy the original instead "
-"of removing it"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/patch.fish:2
-msgid "Back up a file if the patch does not match the file exactly"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/patch.fish:3
-msgid "Do not back up a file if the patch does not match the file exactly"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/patch.fish:4
 msgid "Prefix pref to a file name when generating its simple backup file name"
 msgstr ""
@@ -45765,10 +44404,6 @@ msgid ""
 "Print the results of applying the patches without actually changing any files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/patch.fish:10
-msgid "Interpret the patch file as an ed script"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/patch.fish:11
 msgid "Remove output files that are empty after the patches have been applied"
 msgstr ""
@@ -45779,10 +44414,6 @@ msgid ""
 "questions"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/patch.fish:13
-msgid "Set the maximum fuzz factor"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/patch.fish:14
 msgid ""
 "This option controls patch's actions when a file is under RCS or SCCS "
@@ -45821,22 +44452,6 @@ msgstr ""
 msgid "Conform more strictly to the POSIX standard"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/patch.fish:23
-msgid "Use style word to quote output names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/patch.fish:24
-msgid "Put rejects into rejectfile instead of the default .rej file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/patch.fish:25
-msgid "Assume that this patch was created with the old and new files swapped"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/patch.fish:26
-msgid "Work silently, unless an error occurs"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/patch.fish:27
 msgid "Suppress questions like -f, but make some different assumptions"
 msgstr ""
@@ -45847,10 +44462,6 @@ msgid ""
 "given in context diff headers, local time"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/patch.fish:29
-msgid "Interpret the patch file as a unified context diff"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/patch.fish:31
 msgid "Use method to determine backup file names"
 msgstr ""
@@ -45985,8 +44596,12 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:19
 #: /tmp/fish/implicit/share/completions/xpdf.fish:28
+#, fuzzy
 msgid "Don't print any messages or errors"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Kör inga taggningsprogram"
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:20
 msgid "Print copyright and version"
@@ -45997,110 +44612,101 @@ msgstr ""
 msgid "Print usage information"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:1
-#: /tmp/fish/implicit/share/completions/ruby.fish:1
+#: share/completions/perl.fish:6
 msgid "Specify record separator"
-msgstr ""
+msgstr "Ange postavdelare"
 
-#: /tmp/fish/implicit/share/completions/perl.fish:2
-#: /tmp/fish/implicit/share/completions/ruby.fish:2
+#: share/completions/perl.fish:7
 msgid "Turn on autosplit mode"
-msgstr ""
+msgstr "Slå på autosplitläge"
 
-#: /tmp/fish/implicit/share/completions/perl.fish:3
-#: /tmp/fish/implicit/share/completions/ruby.fish:3
+#: share/completions/perl.fish:8
 msgid "Check syntax"
-msgstr ""
+msgstr "Kontrollera syntax"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:4
+#: share/completions/perl.fish:9
 msgid "Control Unicode features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:5
+#: share/completions/perl.fish:10
 msgid "Debug UTF-8 cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:6
+#: share/completions/perl.fish:11
 msgid "ARGV uses UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:7
+#: share/completions/perl.fish:12
 msgid "Opened filehandles are UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:8
+#: share/completions/perl.fish:13
 msgid "STDERR is UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:9
+#: share/completions/perl.fish:14
 msgid "Filehandles that are read are UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:10
+#: share/completions/perl.fish:15
 msgid "STDIN is UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:11
+#: share/completions/perl.fish:16
 msgid "Enable Unicode conditionally"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:12
+#: share/completions/perl.fish:17
 msgid "Filehandles written to are UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:13
+#: share/completions/perl.fish:18
 msgid "STDOUT is UTF-8"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:14
+#: share/completions/perl.fish:19
 msgid "STDOUT, STDIN, and STDERR are UTF-8"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:15
-#: /tmp/fish/implicit/share/completions/ruby.fish:5
+#: share/completions/perl.fish:20
 msgid "Debugger"
-msgstr ""
+msgstr "Debugger"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:16
 msgid "Debugger, with threads"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:17
-msgid "Debug option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/perl.fish:18
-#: /tmp/fish/implicit/share/completions/ruby.fish:6
+#: share/completions/ruby.fish:7
 msgid "Execute command"
-msgstr ""
+msgstr "Utför kommando"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:19
 msgid "Execute command, enable optional features"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
+#: share/completions/perl.fish:25
+#, fuzzy
 msgid "Disable sitecustomize.pl"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Inaktivera användandet av kakor"
 
-#: /tmp/fish/implicit/share/completions/perl.fish:21
-#: /tmp/fish/implicit/share/completions/ruby.fish:8
-msgid "Set regexp used to split input"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/perl.fish:23
-#: /tmp/fish/implicit/share/completions/ruby.fish:9
-msgid "Edit files in-place"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/perl.fish:24
-#: /tmp/fish/implicit/share/completions/ruby.fish:10
-msgid "Include path"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/perl.fish:25
-#: /tmp/fish/implicit/share/completions/ruby.fish:11
+#: share/completions/perl.fish:30
 msgid "Automatic line ending processing"
-msgstr ""
+msgstr "Automatisk radslutprocessning"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:26
 msgid "Require module"
@@ -46110,48 +44716,67 @@ msgstr ""
 msgid "Use module"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:28
-#: /tmp/fish/implicit/share/completions/ruby.fish:12
+#: share/completions/perl.fish:33
 msgid "Loop script"
-msgstr ""
+msgstr "Upprepa skript"
 
-#: /tmp/fish/implicit/share/completions/perl.fish:30
-#: /tmp/fish/implicit/share/completions/ruby.fish:15
+#: share/completions/perl.fish:35
 msgid "Define custom switches"
-msgstr ""
+msgstr "Definera egna flaggor"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:32
+#: share/completions/perl.fish:37
 msgid "Taint checking, but only with warnings"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:33
-#: /tmp/fish/implicit/share/completions/ruby.fish:17
+#: share/completions/perl.fish:38
 msgid "Taint checking"
-msgstr ""
+msgstr "'taint'-verifiering"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:34
+#: share/completions/perl.fish:39
 msgid "Dump core"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/perl.fish:35
+#: share/completions/perl.fish:40
 msgid "Unsafe mode"
-msgstr ""
+msgstr "Osäkert läge"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:37
+#: share/completions/perl.fish:42
+#, fuzzy
 msgid "Display configuration and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:38
+#: share/completions/perl.fish:43
+#, fuzzy
 msgid "Show warnings"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:39
+#: share/completions/perl.fish:44
+#, fuzzy
 msgid "Force warnings"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:40
+#: share/completions/perl.fish:45
+#, fuzzy
 msgid "Disable warnings"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte varningar om MFC"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:41
 #: /tmp/fish/implicit/share/completions/ruby.fish:21
@@ -46178,170 +44803,18 @@ msgstr ""
 msgid "List the process name as well as the process ID"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/pine.fish:1
-msgid "Open folder"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:2
-msgid "Open file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/pine.fish:4
 msgid "Start in folder index"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/pine.fish:5
-msgid "Initial set of keystrokes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:6
-msgid "Use function keys for commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:7
-msgid "Expand collections in FOLDER LIST display"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:8
-msgid "Start with specified current message number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:9
-msgid "Open folder read-only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:11
-msgid "Set global configuration file"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/pine.fish:12
 msgid "Restricted mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/pine.fish:13
-msgid "Enable suspension support"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:14
-msgid "Produce a sample global configuration file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:15
-msgid "Produce sample configuration file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:16
-msgid "Set mail sort order"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/pine.fish:17
-msgid "Config option"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:1
-msgid "Audible ping"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:2
-msgid "Adaptive ping"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:3
-msgid "Allow pinging a broadcast address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:4
-msgid "Do not allow ping to change source address of probes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:5
-msgid "Stop after specified number of ECHO_REQUEST packets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:6
-msgid "Set the SO_DEBUG option on the socket being used"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:7
-msgid "Allocate and set 20 bit flow label on ECHO_REQUEST packets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:8
-msgid "Flood ping"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:9
-msgid "Wait specified interval of seconds between sending each packet"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:10
-msgid "Set source address to specified interface address"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:11
-msgid "Send the specified number of packets without waiting for reply"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:12
-msgid "Suppress loopback of multicast packets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:13
-msgid "Numeric output only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:14
-msgid "Pad packet with empty bytes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:15
-msgid "Set Quality of Service -related bits in ICMP datagrams"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:17
-msgid "Record route"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:18
-msgid ""
-"Bypass the normal routing tables and send directly to a host on an attached "
-"interface"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/ping.fish:19
 msgid "Specifies the number of data bytes to be sent"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ping.fish:20
-msgid "Set socket buffer size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:21
-msgid "Set the IP Time to Live"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:22
-msgid "Set special IP timestamp options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:23
-msgid "Select Path MTU Discovery strategy"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:24
-msgid "Print full user-to-user latency"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:27
-msgid ""
-"Specify  a timeout, in seconds, before ping exits regardless of how many "
-"packets have been sent or received"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ping.fish:28
-msgid "Time to wait for a response, in seconds"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/pinky.fish:1
 msgid "produce long format output for the specified USERs"
 msgstr ""
@@ -46645,8 +45118,13 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/pkg.fish:26
 #: /tmp/fish/implicit/share/completions/zypper.fish:3
 #: /tmp/fish/implicit/share/completions/zypper.fish:18
+#: share/completions/zypper.fish:44
+#, fuzzy
 msgid "Install packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installerade paket"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:27
 msgid "Prevent package modification"
@@ -46656,10 +45134,9 @@ msgstr ""
 msgid "List package manager plugins"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/pkg.fish:29
-#: /tmp/fish/implicit/share/completions/rpm.fish:95
+#: share/completions/rpm.fish:126
 msgid "Query installed packages"
-msgstr ""
+msgstr "Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:30
 msgid "Register a package in a database"
@@ -47097,12 +45574,22 @@ msgid "display the version number El ENVIRONMENT The d… [See Man Page]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:44
+#: share/completions/portmaster.fish:49
+#, fuzzy
 msgid "Ports Directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Katalog"
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:45
+#: share/completions/portmaster.fish:55
+#, fuzzy
 msgid "Installed Package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installerade paket"
 
 #: /tmp/fish/implicit/share/completions/ports.fish:1
 msgid "Update ports"
@@ -47144,13 +45631,10 @@ msgstr ""
 msgid "Don't send wall message"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/prt-get.fish:2
-#: /tmp/fish/implicit/share/completions/prt-get.fish:62
-#: /tmp/fish/implicit/share/completions/scp.fish:5
-#: /tmp/fish/implicit/share/completions/ssh.fish:14
-#: /tmp/fish/implicit/share/completions/sshfs.fish:2
+#: share/completions/scp.fish:41 share/completions/ssh.fish:39
+#: share/completions/sshfs.fish:25
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: /tmp/fish/implicit/share/completions/prt-get.fish:3
 #: /tmp/fish/implicit/share/completions/prt-get.fish:64
@@ -47399,102 +45883,10 @@ msgstr ""
 msgid "Write output to log file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ps.fish:1
-#: /tmp/fish/implicit/share/completions/ps.fish:5
-msgid "Select all"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:2
-msgid "Invert selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:3
-msgid "Select all processes except session leaders and terminal-less"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:4
-msgid "Select all processes except session leaders"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:6
-msgid "Deselect all processes that do not fulfill conditions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:7
-msgid "Select by command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:8
-msgid "Select by group"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:9
-#: /tmp/fish/implicit/share/completions/ps.fish:10
-msgid "Select by user"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:11
-msgid "Select by group/session"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:12
-msgid "Select by PID"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:13
-msgid "Select by parent PID"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:14
-msgid "Select by session ID"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:15
-msgid "Select by tty"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:16
-msgid "Extra full format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:17
-#: /tmp/fish/implicit/share/completions/ps.fish:23
-msgid "User defined format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:18
-#: /tmp/fish/implicit/share/completions/ps.fish:25
-msgid "Add column for security data"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/ps.fish:19
 msgid "Show different scheduler information for the -l option"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ps.fish:20
-msgid "Full format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:21
-msgid "Jobs format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:24
-msgid "Do not show flags"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:26
-msgid "Show hierarchy"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:27
-msgid "Set namelist file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ps.fish:28
-msgid "Wide output"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/ps.fish:29
 msgid "Set screen width"
 msgstr ""
@@ -47540,8 +45932,13 @@ msgid "run only single command (SQL or internal) and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
+#: share/completions/psql.fish:19
+#, fuzzy
 msgid "execute commands from file, then exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför kommando som om get vore en del av .wgetrc"
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
 msgid "list available databases, then exit"
@@ -47636,6 +46033,7 @@ msgid "database server host or socket directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:27
+#: share/completions/psql.fish:63
 msgid "database server port"
 msgstr ""
 
@@ -47902,36 +46300,6 @@ msgstr ""
 msgid "Don't write .py[co] files on import"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/python2.fish:2
-#: /tmp/fish/implicit/share/completions/python3.fish:2
-#: /tmp/fish/implicit/share/completions/python.fish:2
-msgid "Execute argument as command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:3
-#: /tmp/fish/implicit/share/completions/python3.fish:3
-#: /tmp/fish/implicit/share/completions/python.fish:3
-msgid "Debug on"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:4
-#: /tmp/fish/implicit/share/completions/python3.fish:4
-#: /tmp/fish/implicit/share/completions/python.fish:4
-msgid "Ignore environment variables"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:6
-#: /tmp/fish/implicit/share/completions/python3.fish:6
-#: /tmp/fish/implicit/share/completions/python.fish:6
-msgid "Interactive mode after executing commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:7
-#: /tmp/fish/implicit/share/completions/python3.fish:7
-#: /tmp/fish/implicit/share/completions/python.fish:8
-msgid "Enable optimizations"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/python2.fish:8
 #: /tmp/fish/implicit/share/completions/python3.fish:8
 #: /tmp/fish/implicit/share/completions/python.fish:9
@@ -47944,23 +46312,13 @@ msgstr ""
 msgid "Don't add user site directory to sys.path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/python2.fish:10
-#: /tmp/fish/implicit/share/completions/python3.fish:10
-#: /tmp/fish/implicit/share/completions/python.fish:11
+#: share/functions/__fish_complete_python.fish:12
 msgid "Disable import of site module"
-msgstr ""
+msgstr "Slå av importering av platsmodul"
 
-#: /tmp/fish/implicit/share/completions/python2.fish:11
-#: /tmp/fish/implicit/share/completions/python3.fish:11
-#: /tmp/fish/implicit/share/completions/python.fish:12
+#: share/functions/__fish_complete_python.fish:13
 msgid "Unbuffered input and output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:14
-#: /tmp/fish/implicit/share/completions/python3.fish:14
-#: /tmp/fish/implicit/share/completions/python.fish:15
-msgid "Warning control"
-msgstr ""
+msgstr "Buffra inte indata och utdata"
 
 #: /tmp/fish/implicit/share/completions/python2.fish:15
 #: /tmp/fish/implicit/share/completions/python3.fish:15
@@ -47979,15 +46337,9 @@ msgstr ""
 msgid "Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/python2.fish:18
-#: /tmp/fish/implicit/share/completions/python.fish:19
+#: share/functions/__fish_complete_python.fish:24
 msgid "Warn on mixed tabs and spaces"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/python2.fish:19
-#: /tmp/fish/implicit/share/completions/python.fish:20
-msgid "Division control"
-msgstr ""
+msgstr "Varna vid blandad användning av tabbar och mellanslag"
 
 #: /tmp/fish/implicit/share/completions/python2.fish:20
 #: /tmp/fish/implicit/share/completions/python3.fish:21
@@ -48276,36 +46628,6 @@ msgstr ""
 msgid "Run quietly (Does not affect errors)"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/read.fish:2
-msgid "Set prompt command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/read.fish:3
-#: /tmp/fish/implicit/share/completions/set.fish:4
-msgid "Export variable to subprocess"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/read.fish:4
-#: /tmp/fish/implicit/share/completions/set.fish:6
-msgid "Make variable scope global"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/read.fish:5
-#: /tmp/fish/implicit/share/completions/set.fish:7
-msgid "Make variable scope local"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/read.fish:6
-msgid ""
-"Make variable scope universal, i.e. share variable with all the users fish "
-"processes on this computer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/read.fish:7
-#: /tmp/fish/implicit/share/completions/set.fish:5
-msgid "Do not export variable to subprocess"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/read.fish:8
 msgid "Name to load/save history under"
 msgstr ""
@@ -48392,18 +46714,6 @@ msgstr ""
 msgid "Alternative root"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/renice.fish:1
-msgid "Force following parameters to be process ID's (The default)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/renice.fish:2
-msgid "Force following parameters to be interpreted as process group ID's"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/renice.fish:3
-msgid "Force following parameters to be interpreted as user names"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/return.fish:2
 msgid "Return from function with normal exit status"
 msgstr ""
@@ -48416,14 +46726,6 @@ msgstr ""
 msgid "device group"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rmdir.fish:1
-msgid "Ignore errors from non-empty directories"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rmdir.fish:2
-msgid "Remove each component of path"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/rmmod.fish:1
 msgid "Prints the help text."
 msgstr ""
@@ -48474,378 +46776,378 @@ msgstr ""
 msgid "List of rpm configuration files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:6
-msgid "Pipe output through specified command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rpm.fish:7
-msgid "Specify directory for rpm database"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rpm.fish:8
-msgid "Specify root directory for rpm operations"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rpm.fish:9
+#: share/completions/rpm.fish:22
 msgid "Add suggested packages to the transaction set when needed"
-msgstr ""
+msgstr "Lägg till föreslagna paket till transkation vid behov"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:10
+#: share/completions/rpm.fish:23
 msgid ""
 "Installs or upgrades all the files in the package, even if they aren't "
 "needed (missingok) and don't exist"
 msgstr ""
+"Installerar eller uppgraderar alla saknade filer i paketet, även om de inte "
+"behövs (missingok) och inte existerar"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:11
+#: share/completions/rpm.fish:24
 msgid ""
 "Used with --relocate, permit relocations on all file paths, not just those "
 "OLD-PATH's included in the binary package relocation hint(s)"
 msgstr ""
+"Använd tillsammans med --relocate, tillåter flyttning på alla fökvägar, inte "
+"bara de OLD_PATH inkluderade i de binära paketflyttningshintarna"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:12
+#: share/completions/rpm.fish:25
 msgid "Don't install files whose name begins with specified path"
-msgstr ""
+msgstr "Installera inte filer vars namn börjar med angiven sökväg"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:13
+#: share/completions/rpm.fish:26
 msgid "Don't install any files which are marked as documentation"
-msgstr ""
+msgstr "Installera inte filer som markerats som dokumentation"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:14
+#: share/completions/rpm.fish:27
 msgid "Same as using --replacepkgs, --replacefiles, and --oldpackage"
-msgstr ""
+msgstr "Samma sak som --replacepkgs, --replacefiles, och --oldpackage"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:15
+#: share/completions/rpm.fish:28
 msgid "Print 50 hash marks as the package archive is unpacked"
-msgstr ""
+msgstr "Visa 50 brädgårdstecken medan arkivet packas upp"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:16
+#: share/completions/rpm.fish:29
 msgid "Don't check for sufficient disk space before installation"
-msgstr ""
+msgstr "Kontrollera inte diskutrymme före installation"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:17
+#: share/completions/rpm.fish:30
 msgid ""
 "Allow installation or upgrading even if the architectures of the binary "
 "package and host don't match"
 msgstr ""
+"Tillåt installation eller uppgradering även om binärt pakets arkitetkur inte "
+"matchar värddatorns"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:18
+#: share/completions/rpm.fish:31
 msgid ""
 "Allow installation or upgrading even if the operating systems of the binary "
 "package and host don't match"
 msgstr ""
+"Tillåt installation eller uppgradering även om binärt pakets operativsystem "
+"inte matchar värddatorns"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:19
+#: share/completions/rpm.fish:32
 msgid "Install documentation files (default)"
-msgstr ""
+msgstr "Installera dokumentation (standard)"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:20
+#: share/completions/rpm.fish:33
 msgid "Update only the database, not the filesystem"
-msgstr ""
+msgstr "Uppdatera bara databasen, inte filsystemet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:21
-#: /tmp/fish/implicit/share/completions/rpm.fish:70
+#: share/completions/rpm.fish:34 share/completions/rpm.fish:94
 msgid "Don't verify package or header digests when reading"
-msgstr ""
+msgstr "Kontrollera inte paket- eller huvudsammanfattningar vid inläsning"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:22
-#: /tmp/fish/implicit/share/completions/rpm.fish:73
+#: share/completions/rpm.fish:35 share/completions/rpm.fish:97
 msgid "Don't verify package or header signatures when reading"
-msgstr ""
+msgstr "Kontrollera inte paket- eller huvudsignatur vid inläsning"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:23
+#: share/completions/rpm.fish:36
 msgid "Don't do a dependency check"
-msgstr ""
+msgstr "Utför inte beroendeverifiering"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:24
+#: share/completions/rpm.fish:37
 msgid "Don't suggest package(s) that provide a missing dependency"
-msgstr ""
+msgstr "Föreslå inte paket som upfyller ett ouppfyllt beroende"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:25
+#: share/completions/rpm.fish:38
 msgid "Don't change the package installation order"
-msgstr ""
+msgstr "Byt inte paketinstallationsordning "
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:26
+#: share/completions/rpm.fish:39
 msgid "Don't execute scripts"
-msgstr ""
+msgstr "Kör inte skript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:27
+#: share/completions/rpm.fish:40
 msgid "Don't execute pre scripts"
-msgstr ""
+msgstr "Kör inte pre-skript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:28
+#: share/completions/rpm.fish:41
 msgid "Don't execute post scripts"
-msgstr ""
+msgstr "Kör inte post-skript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:29
+#: share/completions/rpm.fish:42
 msgid "Don't execute preun scripts"
-msgstr ""
+msgstr "Kör inte preun-skript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:30
+#: share/completions/rpm.fish:43
 msgid "Don't execute postun scripts"
-msgstr ""
+msgstr "Kör inte postun-skript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:31
-#: /tmp/fish/implicit/share/completions/rpm.fish:87
+#: share/completions/rpm.fish:44 share/completions/rpm.fish:115
 msgid "Don't execute trigger scriptlets"
-msgstr ""
+msgstr "Kör inte trigger-skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:32
+#: share/completions/rpm.fish:45
 msgid "Don't execute triggerin scriptlets"
-msgstr ""
+msgstr "Kör inte triggerin-skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:33
-#: /tmp/fish/implicit/share/completions/rpm.fish:88
+#: share/completions/rpm.fish:46 share/completions/rpm.fish:116
 msgid "Don't execute triggerun scriptlets"
-msgstr ""
+msgstr "Kör inte triggerun-skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:34
-#: /tmp/fish/implicit/share/completions/rpm.fish:89
+#: share/completions/rpm.fish:47 share/completions/rpm.fish:117
 msgid "Don't execute triggerpostun scriptlets"
-msgstr ""
+msgstr "Kör inte triggerpostun-skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:35
+#: share/completions/rpm.fish:48
 msgid "Allow an upgrade to replace a newer package with an older one"
-msgstr ""
+msgstr "Tillåt en uppgradering att ersätta ett nyare paket med ett äldre"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:36
+#: share/completions/rpm.fish:49
 msgid ""
 "Print percentages as files are unpacked from the package archive. This is "
 "intended to make rpm easy to run from other tools"
 msgstr ""
+"Visa procentandel medan filer packas upp från paketarkiv. Detta är tänkt att "
+"användas för att göra rpm lättare att köra från andra verktyg"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:37
+#: share/completions/rpm.fish:50
 msgid ""
 "For relocatable binary packages, translate all file paths that start with "
 "the installation prefix in the package relocation hint(s) to NEWPATH"
 msgstr ""
+"För flyttbara binära paket, översätt alla sökvägar som startar med "
+"installationsprefixet i paketets flytthintar till den angivna sökvägen"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:38
-msgid ""
-"Translate all paths that start with first half of following parameter to "
-"second half of following parameter"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/rpm.fish:39
-#: /tmp/fish/implicit/share/completions/rpm.fish:90
+#: share/completions/rpm.fish:52 share/completions/rpm.fish:118
 msgid "Re-package the files before erasing"
-msgstr ""
+msgstr "Ompaketera paket inan radering"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:40
+#: share/completions/rpm.fish:53
 msgid ""
 "Install the packages even if they replace files from other, already "
 "installed, packages"
 msgstr ""
+"Installera paket även om de ersätter filer från andra, redan installerade "
+"paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:41
+#: share/completions/rpm.fish:54
 msgid ""
 "Install the packages even if some of them are already installed on this "
 "system"
-msgstr ""
+msgstr "Installera paket även om somliga redan är installerade"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:42
+#: share/completions/rpm.fish:55
 msgid ""
 "Don't install the package, simply check for and report potential conflicts"
 msgstr ""
+"Installera inte paket, kontrollera och rapportera potentiella konflikter"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:43
+#: share/completions/rpm.fish:59
 msgid "Display change information for the package"
-msgstr ""
+msgstr "Visa ändringsinformation för paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:44
+#: share/completions/rpm.fish:60
 msgid "List only configuration files (implies -l)"
-msgstr ""
+msgstr "Visa bara konfigurationsfiler (implicerar -l)"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:45
+#: share/completions/rpm.fish:61
 msgid "List only documentation files (implies -l)"
-msgstr ""
+msgstr "Visa bara dokumentationsfiler (implicerar -l)"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:46
+#: share/completions/rpm.fish:62
 msgid "Dump file information. Must be used with at least one of -l, -c, -d"
-msgstr ""
+msgstr "Dumpa filinformation. Kräver minst en av -l, -c, -d"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:47
+#: share/completions/rpm.fish:63
 msgid "List all the files in each selected package"
-msgstr ""
+msgstr "Visa alla filer i varje valt paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:48
+#: share/completions/rpm.fish:64
 msgid ""
 "Display package information, including name, version, and description. Uses "
 "--queryformat if specified"
 msgstr ""
+"Visa paketinformation, inklusive namn, version och beskrivning. Använder --"
+"queryfromet om angivet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:49
+#: share/completions/rpm.fish:65
 msgid "Orders the package listing by install time"
-msgstr ""
+msgstr "Sortera paketlistning efter installationstid"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:50
+#: share/completions/rpm.fish:66
 msgid "List files in package"
-msgstr ""
+msgstr "Visa filer i paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:51
+#: share/completions/rpm.fish:67
 msgid "List capabilities this package provides"
-msgstr ""
+msgstr "Visa förmågor som detta paket tillhandahåller"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:52
+#: share/completions/rpm.fish:68
 msgid "List packages on which this package depends"
-msgstr ""
+msgstr "Visa paket som detta paket beror på"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:53
+#: share/completions/rpm.fish:69
 msgid "List the package specific scriptlets"
-msgstr ""
+msgstr "Visa paket-specifika skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:54
+#: share/completions/rpm.fish:70
 msgid ""
 "Display the states of files in the package. The state of each file is one of "
 "normal, not installed, or replaced"
 msgstr ""
+"Visa tillstånd för paketets filer. Tillståndet är en av normal, inte "
+"installerad och ersatt"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:55
-#: /tmp/fish/implicit/share/completions/rpm.fish:56
+#: share/completions/rpm.fish:71 share/completions/rpm.fish:72
 msgid "Display the trigger scripts contained in the package"
-msgstr ""
+msgstr "Visa paketets triggerskript"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:57
+#: share/completions/rpm.fish:78
 msgid "Query all installed packages"
-msgstr ""
+msgstr "Fråga alla installerade paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:58
+#: share/completions/rpm.fish:79
 msgid "Query package owning specified file"
-msgstr ""
+msgstr "Fråga paket som äger angiven fil"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:59
+#: share/completions/rpm.fish:80
 msgid ""
 "Query package that contains a given file identifier, i.e. the MD5 digest of "
 "the file contents"
 msgstr ""
+"Fråga paket som innehåller en given filidentitet, dvs. MD5-summa av "
+"filinnehåll"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:60
+#: share/completions/rpm.fish:81
 msgid "Query packages with the specified group"
-msgstr ""
+msgstr "Fråga paket med angiven grupp"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:61
+#: share/completions/rpm.fish:82
 msgid ""
 "Query package that contains a given header identifier, i.e. the SHA1 digest "
 "of the immutable header region"
 msgstr ""
+"Fråga paket som innehåller en given huvudidentitet, dvs. SHA1-summa av den "
+"konstanta huvud-regionen"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:62
+#: share/completions/rpm.fish:83
 msgid "Query an (uninstalled) package in specified file"
-msgstr ""
+msgstr "Fråga ett (oinstallerat) paket i angiven fil"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:63
+#: share/completions/rpm.fish:84
 msgid ""
 "Query package that contains a given package identifier, i.e. the MD5 digest "
 "of the combined header and payload contents"
 msgstr ""
+"Fråga paket som innehåller en given paketidentitet, dvs. MD5-summa av den "
+"kombinerade huvud- och filinnehållet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:64
+#: share/completions/rpm.fish:85
 msgid "Parse and query specified spec-file as if it were a package"
-msgstr ""
+msgstr "Tolka och fråga angiven spec-fil som om det vore ett paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:65
+#: share/completions/rpm.fish:86
 msgid "Query package(s) that have the specified TID (transaction identifier)"
-msgstr ""
+msgstr "Fråga paket med angiven TID (transaktions-id)"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:66
+#: share/completions/rpm.fish:87
 msgid "Query packages that are triggered by the specified packages"
-msgstr ""
+msgstr "Fråga paket som triggas av angivna paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:67
+#: share/completions/rpm.fish:88
 msgid "Query all packages that provide the specified capability"
-msgstr ""
+msgstr "Fråga alla paket som tillhandahåller den angivna förmågan"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:68
+#: share/completions/rpm.fish:89
 msgid ""
 "Query all packages that requires the specified capability for functioning"
-msgstr ""
+msgstr "Fråga alla paket som kräver den angivna förmågan för att fungera"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:69
+#: share/completions/rpm.fish:93
 msgid "Don't verify dependencies of packages"
-msgstr ""
+msgstr "Verifiera inte paketens beroenden"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:71
+#: share/completions/rpm.fish:95
 msgid "Don't verify any attributes of package files"
-msgstr ""
+msgstr "Verifiera inga attribut i paketfiler"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:72
+#: share/completions/rpm.fish:96
 msgid "Don't execute the %verifyscript scriptlet"
-msgstr ""
+msgstr "Utför inte %verifyskriptlet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:74
+#: share/completions/rpm.fish:98
 msgid "Don't verify linkto attribute"
-msgstr ""
+msgstr "Verifiera inte linkto-attribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:75
+#: share/completions/rpm.fish:99
 msgid "Don't verify md5 attribute"
-msgstr ""
+msgstr "Verifiera inte md5-attribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:76
+#: share/completions/rpm.fish:100
 msgid "Don't verify size attribute"
-msgstr ""
+msgstr "Verifiera inte storleksattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:77
+#: share/completions/rpm.fish:101
 msgid "Don't verify user attribute"
-msgstr ""
+msgstr "Verifiera inte användarattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:78
+#: share/completions/rpm.fish:102
 msgid "Don't verify group attribute"
-msgstr ""
+msgstr "Verifiera inte gruppattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:79
+#: share/completions/rpm.fish:103
 msgid "Don't verify time attribute"
-msgstr ""
+msgstr "Verifiera inte tidsattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:80
+#: share/completions/rpm.fish:104
 msgid "Don't verify mode attribute"
-msgstr ""
+msgstr "Verifiera inte filrättighetsattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:81
+#: share/completions/rpm.fish:105
 msgid "Don't verify dev attribute"
-msgstr ""
+msgstr "Verifiera inte enhetsattribut"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:82
+#: share/completions/rpm.fish:110
 msgid "Remove all versions of the package which match specified string"
-msgstr ""
+msgstr "Ta bort alla version av paketet som matchar angiven sträng"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:83
+#: share/completions/rpm.fish:111
 msgid "Don't check dependencies before uninstalling the packages"
-msgstr ""
+msgstr "Verifiera inte beroenden före paketen avinstalleras"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:84
+#: share/completions/rpm.fish:112
 msgid "Don't execute scriplets"
-msgstr ""
+msgstr "Kör inte skriptlets"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:85
+#: share/completions/rpm.fish:113
 msgid "Don't execute preun scriptlet"
-msgstr ""
+msgstr "Kör inte preun-skriptlet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:86
+#: share/completions/rpm.fish:114
 msgid "Don't execute postun scriptlet"
-msgstr ""
+msgstr "Kör inte postun-skriptlet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:91
+#: share/completions/rpm.fish:119
 msgid "Don't really uninstall anything"
-msgstr ""
+msgstr "Avinstallera ingenting på riktigt"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:92
+#: share/completions/rpm.fish:123
 msgid "Install new package"
-msgstr ""
+msgstr "Installera nytt paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:93
+#: share/completions/rpm.fish:124
 msgid "Upgrade existing package"
-msgstr ""
+msgstr "Upgradera existerande paket"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:94
+#: share/completions/rpm.fish:125
 msgid "Upgrade package if already installed"
-msgstr ""
+msgstr "Upgradera paket om det är installerat"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:96
+#: share/completions/rpm.fish:127
 msgid "Verify package integrity"
-msgstr ""
+msgstr "Verifiera paketintegritet"
 
-#: /tmp/fish/implicit/share/completions/rpm.fish:97
+#: share/completions/rpm.fish:128
 msgid "Erase package"
-msgstr ""
+msgstr "Ta bort paket"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:2
 msgid "Suppress non-error messages"
@@ -49000,16 +47302,27 @@ msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:40
+#: share/completions/rsync.fish:41
 msgid "Force a fixed checksum block-size"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:41
+#: share/completions/rsync.fish:42
+#, fuzzy
 msgid "Specify the remote shell to use"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:42
+#: share/completions/rsync.fish:43
+#, fuzzy
 msgid "Specify the rsync to run on remote machine"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:43
 msgid "Ignore non-existing files on receiving side"
@@ -49112,10 +47425,12 @@ msgid "Find similar file for basis if no dest file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:68
+#: share/completions/rsync.fish:69
 msgid "Also compare received files relative to DIR"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:69
+#: share/completions/rsync.fish:70
 msgid ""
 "Also compare received files relative to DIR and include copies of unchanged "
 "files"
@@ -49208,10 +47523,16 @@ msgid "Output a change-summary for all updates"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:92
+#: share/completions/rsync.fish:93
+#, fuzzy
 msgid "Output filenames using the specified format"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Exklidera filer listade i angiven fil"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:93
+#: share/completions/rsync.fish:94
 msgid "Read password from FILE"
 msgstr ""
 
@@ -49220,10 +47541,12 @@ msgid "List the files instead of copying them"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:95
+#: share/completions/rsync.fish:96
 msgid "Limit I/O bandwidth; KBytes per second"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:96
+#: share/completions/rsync.fish:97
 msgid "Write a batched update to FILE"
 msgstr ""
 
@@ -49232,14 +47555,21 @@ msgid "Like --write-batch but w/o updating dest"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:98
+#: share/completions/rsync.fish:99
+#, fuzzy
 msgid "Read a batched update from FILE"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs fix från patchfil"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:99
+#: share/completions/rsync.fish:100
 msgid "Force an older protocol version to be used"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:100
+#: share/completions/rsync.fish:101
 msgid "Set block/file checksum seed (advanced)"
 msgstr ""
 
@@ -49271,21 +47601,9 @@ msgstr ""
 msgid "List all built-in definitions"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ruby.fish:4
-msgid "Kanji code-set"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ruby.fish:14
+#: share/completions/ruby.fish:15
 msgid "Require file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ruby.fish:19
-msgid "Verbose mode without message"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ruby.fish:23
-msgid "Compiler debug mode"
-msgstr ""
+msgstr "Kräv fil"
 
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:1
 msgid "Make bucket"
@@ -50438,18 +48756,9 @@ msgstr ""
 msgid "Remote Path"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/scp.fish:4
+#: share/completions/scp.fish:40
 msgid "Bandwidth limit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/scp.fish:6
-msgid ""
-"Preserves modification times, access times, and modes from the original file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/scp.fish:8
-msgid "Recursively copy"
-msgstr ""
+msgstr "Bandbreddsgräns"
 
 #: /tmp/fish/implicit/share/completions/scp.fish:9
 msgid "Encryption program"
@@ -50475,9 +48784,9 @@ msgstr ""
 msgid "Print a list of attached screen sessions"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/screen.fish:6
+#: share/completions/screen.fish:1
 msgid "Print a list of running screen sessions"
-msgstr ""
+msgstr "Visa lista på alla körande screen-sessioner"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:7
 msgid "Include all capabilitys"
@@ -50508,10 +48817,9 @@ msgstr ""
 msgid "Reattach/create any session"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/screen.fish:15
-#: /tmp/fish/implicit/share/completions/ssh.fish:5
+#: share/completions/ssh.fish:30
 msgid "Escape character"
-msgstr ""
+msgstr "Avbrottstecken"
 
 #: /tmp/fish/implicit/share/completions/screen.fish:16
 msgid "Flow control on"
@@ -50646,19 +48954,13 @@ msgstr ""
 msgid "Service name"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/set_color.fish:1
+#: share/completions/set.fish:73 share/completions/set_color.fish:1
 msgid "Color"
-msgstr ""
+msgstr "Färg"
 
-#: /tmp/fish/implicit/share/completions/set_color.fish:2
-#: /tmp/fish/implicit/share/completions/set.fish:12
+#: share/completions/set.fish:74 share/completions/set_color.fish:2
 msgid "Change background color"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/set_color.fish:3
-#: /tmp/fish/implicit/share/completions/set.fish:13
-msgid "Make font bold"
-msgstr ""
+msgstr "Byt bakgrundsfärg"
 
 #: /tmp/fish/implicit/share/completions/set_color.fish:4
 msgid "Italicise"
@@ -50708,21 +49010,17 @@ msgstr ""
 msgid "Test if We are specifying a locale value for the prompt"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/set.fish:3
-msgid "Erase variable"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/set.fish:8
 msgid "Share variable persistently across sessions"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/set.fish:9
-msgid "Test if variable is defined"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/set.fish:11
+#, fuzzy
 msgid "List the names of the variables, but not their value"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/set.fish:14
 msgid "Locale variable"
@@ -50885,34 +49183,10 @@ msgstr ""
 msgid "Snap"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/sort.fish:1
-msgid "Ignore leading blanks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:2
-msgid "Consider only blanks and alphanumerics"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:4
-msgid "Compare general numeric value"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:5
-msgid "Consider only printable"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/sort.fish:6
 msgid "Compare human readable numbers [2K 1G]"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/sort.fish:7
-msgid "Compare month names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:8
-msgid "Compare string numerical value"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/sort.fish:9
 msgid "Sort by random hash of keys"
 msgstr ""
@@ -50921,137 +49195,25 @@ msgstr ""
 msgid "Get random bytes from FILE"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/sort.fish:11
-msgid "Reverse results"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:12
-msgid "Only check if sorted"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:13
-msgid "Define key"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/sort.fish:14
 msgid "Merge sorted files"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/sort.fish:16
-msgid "Stabilize sort"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:17
+#: share/completions/sort.fish:18
 msgid "Set memory buffer size"
-msgstr ""
+msgstr "Välj minnesbuffertstorlek"
 
-#: /tmp/fish/implicit/share/completions/sort.fish:18
-msgid "Field separator"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:19
+#: share/completions/sort.fish:20
 msgid "Set temporary directory"
-msgstr ""
+msgstr "Välj katalog för tillfälligt lagringsutrymme"
 
-#: /tmp/fish/implicit/share/completions/sort.fish:20
-msgid "Output only first of equal lines"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sort.fish:21
-msgid "Lines end with 0 byte"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:2
-msgid "Disables forwarding of the authentication agent"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:3
-msgid "Enables forwarding of the authentication agent"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:4
+#: share/completions/ssh.fish:24
 msgid "Interface to transmit from"
-msgstr ""
+msgstr "Gränssnitt att skicka från"
 
-#: /tmp/fish/implicit/share/completions/ssh.fish:6
-msgid "Go to background"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:7
-msgid "Allow remote host to connect to local forwarded ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:8
-msgid "Smartcard device"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:9
-msgid "Disable forwarding of Kerberos tickets"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:10
+#: share/completions/ssh.fish:35
 msgid "User"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:11
-msgid "MAC algorithm"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:12
-msgid "Prevent reading from stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:13
-msgid "Do not execute remote command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:16
-msgid "Subsystem"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:17
-msgid "Force pseudo-tty allocation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:18
-msgid "Disable pseudo-tty allocation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:19
-msgid "Disable X11 forwarding"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:20
-msgid "Enable X11 forwarding"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:21
-msgid "Locally forwarded ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:22
-msgid "Remotely forwarded ports"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ssh.fish:23
-msgid "Dynamic port forwarding"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sshfs.fish:3
-msgid "Compression"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sshfs.fish:5
-msgid "Enable debug"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sshfs.fish:6
-msgid "Foreground operation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/sshfs.fish:7
-msgid "Disable multi-threaded operation"
-msgstr ""
+msgstr "Användare"
 
 #: /tmp/fish/implicit/share/completions/stack.fish:1
 msgid "Show this help text"
@@ -51318,38 +49480,10 @@ msgstr ""
 msgid "Subcommands specific to package signatures (experimental)"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/status.fish:2
-msgid "Test if this is a login shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/status.fish:3
-msgid "Test if this is an interactive shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/status.fish:4
-msgid "Test if a command substitution is currently evaluated"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/status.fish:5
-msgid "Test if a code block is currently evaluated"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/status.fish:6
 msgid "Test if a breakpoint is currently in effect"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/status.fish:7
-msgid "Test if new jobs are never put under job control"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/status.fish:8
-msgid "Test if only interactive new jobs are put under job control"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/status.fish:9
-msgid "Test if all new jobs are put under job control"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/status.fish:10
 msgid "Print the filename of the currently running script"
 msgstr ""
@@ -51358,11 +49492,6 @@ msgstr ""
 msgid "Print the line number of the currently running script"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/status.fish:12
-msgid ""
-"Print a list of all function calls leading up to running the current command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/status.fish:13
 msgid "Set which jobs are under job control"
 msgstr ""
@@ -51427,10 +49556,6 @@ msgstr ""
 msgid "Report all matches per line/string"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/string.fish:11
-msgid "Case insensitive"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/string.fish:12
 msgid "Use regex instead of globs"
 msgstr ""
@@ -51479,12 +49604,6 @@ msgstr ""
 msgid "Close all file descriptors greater or equal to the given number"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/sudo.fish:3
-#: /tmp/fish/implicit/share/completions/su.fish:4
-#: /tmp/fish/implicit/share/completions/su.fish:5
-msgid "Preserve environment"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/sudo.fish:4
 msgid "Set home"
 msgstr ""
@@ -51547,23 +49666,16 @@ msgstr ""
 msgid "Validate the credentials, extending timeout"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/su.fish:1
-msgid "Make login shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/su.fish:2
+#: share/completions/su.fish:5
 msgid "Pass command to shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/su.fish:3
-msgid "Pass -f to the shell"
-msgstr ""
+msgstr "Skicka kommando till skalet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:1
 msgid "Make a completion for a subcommand"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:2
+#: share/functions/__fish_complete_svn.fish:48
 msgid ""
 "Put files and directories under version control, scheduling them for "
 "addition to repository.  They will be added in next commit."
@@ -51571,172 +49683,344 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:3
 #: /tmp/fish/implicit/share/completions/svn.fish:5
+#: share/functions/__fish_complete_svn.fish:49
+#: share/functions/__fish_complete_svn.fish:51
+#, fuzzy
 msgid ""
 "Output the content of specified files or URLs with revision and author "
 "information in-line."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filer/URL:er med revisions- och författarinformation inbakat"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:4
+#: share/functions/__fish_complete_svn.fish:50
+#, fuzzy
 msgid "Output the content of specified files or URLs."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa innehåll av filer/URL:er"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:6
+#: share/functions/__fish_complete_svn.fish:52
+#, fuzzy
 msgid "Check out a working copy from a repository."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hämta ut en arbetskopia från förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:7
+#: share/functions/__fish_complete_svn.fish:53
 msgid ""
 "Recursively clean up the working copy, removing locks, resuming unfinished "
 "operations, etc."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:8
+#: share/functions/__fish_complete_svn.fish:54
+#, fuzzy
 msgid "Send changes from your working copy to the repository."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skicka ändringar i arbetskopian till lagret"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:9
+#: share/functions/__fish_complete_svn.fish:55
+#, fuzzy
 msgid "Duplicate something in working copy or repository, remembering history."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Flytta och/eller byt namn på någonting i arbetskopian eller förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:10
+#: share/functions/__fish_complete_svn.fish:56
+#, fuzzy
 msgid "Display the differences between two revisions or paths."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Applicera differensen mellan två källor till en arbetskopiesökväg"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:11
+#: share/functions/__fish_complete_svn.fish:57
 msgid "Create an unversioned copy of a tree."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:12
+#: share/functions/__fish_complete_svn.fish:58
+#, fuzzy
 msgid "Describe the usage of this program or its subcommands."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Beskriv användandet av detta program eller dess underkommandon"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:13
+#: share/functions/__fish_complete_svn.fish:59
+#, fuzzy
 msgid "Commit an unversioned file or tree into the repository."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:14
+#: share/functions/__fish_complete_svn.fish:60
+#, fuzzy
 msgid "Display information about a local or remote item."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa information om lokal eller fjärrelement"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:15
+#: share/functions/__fish_complete_svn.fish:61
+#, fuzzy
 msgid "List directory entries in the repository."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista kataloger i förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:16
+#: share/functions/__fish_complete_svn.fish:62
+#, fuzzy
 msgid ""
 "Lock working copy paths or URLs in the repository, so that no other user can "
 "commit changes to them."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs arbetskopiwsökvägar eller URL:er i förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:17
+#: share/functions/__fish_complete_svn.fish:63
+#, fuzzy
 msgid "Show the log messages for a set of revision(s) and/or file(s)."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:18
+#: share/functions/__fish_complete_svn.fish:64
+#, fuzzy
 msgid "Apply the differences between two sources to a working copy path."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Applicera differensen mellan två källor till en arbetskopiesökväg"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:19
+#: share/functions/__fish_complete_svn.fish:65
+#, fuzzy
 msgid "Display information related to merges"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:20
+#: share/functions/__fish_complete_svn.fish:66
+#, fuzzy
 msgid "Create a new directory under version control."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skapa ny katalog under revisionskontroll"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:21
+#: share/functions/__fish_complete_svn.fish:67
+#, fuzzy
 msgid "Move and/or rename something in working copy or repository."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Flytta och/eller byt namn på någonting i arbetskopian eller förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:22
+#: share/functions/__fish_complete_svn.fish:68
+#, fuzzy
 msgid "Apply a unidiff patch to the working copy"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa olagrade ändringar i arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:23
+#: share/functions/__fish_complete_svn.fish:69
+#, fuzzy
 msgid "Remove a property from files, dirs, or revisions."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort en egenskap från filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:24
+#: share/functions/__fish_complete_svn.fish:70
+#, fuzzy
 msgid "Edit a property with an external editor."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Redigera en egenskap med extern edito för mål"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:25
+#: share/functions/__fish_complete_svn.fish:71
+#, fuzzy
 msgid "Print the value of a property on files, dirs, or revisions."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv ut värde för en egenskap hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:26
+#: share/functions/__fish_complete_svn.fish:72
+#, fuzzy
 msgid "List all properties on files, dirs, or revisions."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla engenskaper hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:27
+#: share/functions/__fish_complete_svn.fish:73
+#, fuzzy
 msgid "Set the value of a property on files, dirs, or revisions."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv ut värde för en egenskap hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:28
+#: share/functions/__fish_complete_svn.fish:74
+#, fuzzy
 msgid "Rewrite working copy url metadata"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera arbetskopia om släppning lyckas"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:29
+#: share/functions/__fish_complete_svn.fish:75
+#, fuzzy
 msgid "Remove files and directories from version control."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Placera filer och kataloger under versionskontroll"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:30
+#: share/functions/__fish_complete_svn.fish:76
+#, fuzzy
 msgid "Remove conflicts on working copy files or directories."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort konflikttillstånd hos arbetskopiefiler eller kataloger"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:31
 msgid "Remove 'conflicted' state on working copy files or directories."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:32
+#: share/functions/__fish_complete_svn.fish:78
+#, fuzzy
 msgid "Restore pristine working copy file (undo most local edits)."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Återställ rensad arbetskopiefil"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
+#: share/functions/__fish_complete_svn.fish:79
+#, fuzzy
 msgid "Print the status of working copy files and directories."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa status för arbetskopians filer och kataloger"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
+#: share/functions/__fish_complete_svn.fish:80
+#, fuzzy
 msgid "Update the working copy to a different URL."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Uppdatera arbetskopian till en annan URL"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:35
+#: share/functions/__fish_complete_svn.fish:81
+#, fuzzy
 msgid "Unlock working copy paths or URLs."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lås upp arbetskopians sökvägar eller URL:er"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:36
+#: share/functions/__fish_complete_svn.fish:82
+#, fuzzy
 msgid "Bring changes from the repository into the working copy."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hämta ändringar från förrådet till arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:37
+#: share/functions/__fish_complete_svn.fish:83
 msgid "Upgrade the metadata storage format for a working copy."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:38
+#, fuzzy
 msgid "Specify a username ARG"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj användarnamn"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:39
+#, fuzzy
 msgid "Specify a password ARG"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj lösenord"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:40
+#: share/functions/__fish_complete_svn.fish:90
+#, fuzzy
 msgid "Do not cache authentication tokens"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Cacha inte autentiseringssymboler"
 
-#: /tmp/fish/implicit/share/completions/svn.fish:41
+#: share/functions/__fish_complete_svn.fish:91
 msgid "Do no interactive prompting"
-msgstr ""
+msgstr "Ställ inga interaktiva frågor"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:42
+#: share/functions/__fish_complete_svn.fish:92
 msgid ""
 "Accept SSL server certificates from unknown authorities (ony with --non-"
 "interactive)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:43
+#, fuzzy
 msgid "Read user configuration files from directory ARG"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs användarkonfigurationsfiler från angiven katalog"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:44
 msgid ""
@@ -51748,36 +50032,52 @@ msgid "Exit sylpheed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:5
+#: share/completions/sylpheed.fish:8
 msgid "Open composition window with address"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:6
+#: share/completions/sylpheed.fish:9
 msgid "Open composition window with attached files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:7
+#: share/completions/sylpheed.fish:10
+#, fuzzy
 msgid "Receive new messages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ersätt ett loggmeddelande"
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:8
+#: share/completions/sylpheed.fish:11
 msgid "Receive new messages of all accounts"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:9
+#: share/completions/sylpheed.fish:12
 msgid "Send all queued messages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:10
+#: share/completions/sylpheed.fish:13
 msgid "Show the total number of messages for folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:11
+#: share/completions/sylpheed.fish:14
 msgid "Show the total number of messages for each folder"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:12
+#: share/completions/sylpheed.fish:15
+#, fuzzy
 msgid "Specify directory with configuration files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:1
 msgid "The total number of worker threads to create (default: 1)"
@@ -52414,209 +50714,50 @@ msgid ""
 "output the last K lines, instead of the last 10 - or only K lines with -r"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/tar.fish:1
-#: /tmp/fish/implicit/share/completions/tar.fish:2
-msgid "Append archive to archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:3
-msgid "Create archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:4
-#: /tmp/fish/implicit/share/completions/tar.fish:5
-msgid "Compare archive and filesystem"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:6
-msgid "Delete from archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:7
-msgid "Append files to archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:8
-#: /tmp/fish/implicit/share/completions/unrar.fish:2
+#: share/completions/unrar.fish:6
 msgid "List archive"
-msgstr ""
+msgstr "Visa arkivinnehåll"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:9
-msgid "Append new files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:10
-#: /tmp/fish/implicit/share/completions/tar.fish:11
-msgid "Extract from archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:12
-msgid "Keep access time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:14
-msgid "Reblock while reading"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:16
-msgid "Print directory names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:17
+#: share/completions/tar.fish:21
 msgid "Archive file"
-msgstr ""
+msgstr "Arkivfil"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:18
-msgid "Archive is local"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:19
-msgid "Run script at end of tape"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:20
-msgid "Use old incremental GNU format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:21
-msgid "Use new incremental GNU format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:22
-msgid "Dereference symlinks"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:23
-msgid "Ignore zero block in archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:24
-msgid "Filter through bzip2"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:25
-msgid "Don't exit on unreadable files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:26
-msgid "Don't overwrite"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:27
+#: share/completions/tar.fish:31
 msgid "Starting file in archive"
-msgstr ""
+msgstr "Startfil i arkiv"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:28
-msgid "Stay in local filesystem"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:29
+#: share/completions/tar.fish:33
 msgid "Tape length"
-msgstr ""
+msgstr "Bandlängd"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:30
-#: /tmp/fish/implicit/share/completions/tar.fish:31
-msgid "Don't extract modification time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:32
-msgid "Multi volume archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:33
-#: /tmp/fish/implicit/share/completions/tar.fish:34
+#: share/completions/tar.fish:36
 msgid "Only store newer files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:35
-#: /tmp/fish/implicit/share/completions/tar.fish:36
-msgid "Use V7 format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:37
-msgid "Extract to stdout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:38
-#: /tmp/fish/implicit/share/completions/tar.fish:39
-msgid "Extract all permissions"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:40
-msgid "Don't strip leading /"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:41
-msgid "Preserve all permissions and do not sort file arguments"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:42
-msgid "Show record number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:43
-msgid "Remove files after adding to archive"
-msgstr ""
+msgstr "Lagra bara nyare filer"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:44
 #: /tmp/fish/implicit/share/completions/tar.fish:45
 msgid "Do not sort file arguments"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/tar.fish:46
-msgid "Preserve file ownership"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:47
-msgid "Handle sparse files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:48
+#: share/completions/tar.fish:50
 msgid "Extract file from file"
-msgstr ""
+msgstr "Axtrahera fil från fil"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:49
-msgid "-T has null-terminated names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:50
-msgid "Print total bytes written"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:52
+#: share/completions/tar.fish:54
 msgid "Set volume name"
-msgstr ""
+msgstr "Välj volymnamn"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:54
-#: /tmp/fish/implicit/share/completions/tar.fish:55
-msgid "Ask for confirmation"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:56
-msgid "Verify archive"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:57
+#: share/completions/tar.fish:59
 msgid "Exclude file"
-msgstr ""
+msgstr "Exkludera fil"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:58
+#: share/completions/tar.fish:60
 msgid "Exclude files listed in specified file"
-msgstr ""
+msgstr "Exklidera filer listade i angiven fil"
 
-#: /tmp/fish/implicit/share/completions/tar.fish:59
-#: /tmp/fish/implicit/share/completions/tar.fish:60
-msgid "Filter through compress"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:61
-#: /tmp/fish/implicit/share/completions/tar.fish:62
-msgid "Filter through gzip"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/tar.fish:63
+#: share/completions/tar.fish:65
 msgid "Filter through specified program"
-msgstr ""
+msgstr "Filtrera genom angivet program"
 
 #: /tmp/fish/implicit/share/completions/tar.fish:64
 msgid "Filter through xz"
@@ -52995,10 +51136,6 @@ msgstr ""
 msgid "Print the Terraform version"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/test.fish:2
-msgid "Negate expression"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/test.fish:3
 msgid "Logical AND"
 msgstr ""
@@ -53007,70 +51144,6 @@ msgstr ""
 msgid "Logical OR"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/test.fish:5
-msgid "String length is non-zero"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:6
-msgid "String length is zero"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:7
-msgid "Strings are equal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:8
-msgid "Strings are not equal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:9
-msgid "Integers are equal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:10
-msgid "Left integer larger than or equal to right integer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:11
-msgid "Left integer larger than right integer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:12
-msgid "Left integer less than or equal to right integer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:13
-msgid "Left integer less than right integer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:14
-msgid "Left integer not equal to right integer"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:15
-msgid "File is block device"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:16
-msgid "File is character device"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:17
-msgid "File is directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:18
-msgid "File exists"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:19
-msgid "File is regular"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:20
-msgid "File is set-group-ID"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/test.fish:21
 msgid "File owned by our effective group ID"
 msgstr ""
@@ -53087,14 +51160,6 @@ msgstr ""
 msgid "File is a named pipe"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/test.fish:25
-msgid "File is readable"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:26
-msgid "File size is non-zero"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/test.fish:27
 msgid "File is a socket"
 msgstr ""
@@ -53103,14 +51168,6 @@ msgstr ""
 msgid "FD is a terminal"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/test.fish:29
-msgid "File set-user-ID bit is set"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/test.fish:30
-msgid "File is writable"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/tex.fish:3
 msgid "Show errors in style file:line"
 msgstr ""
@@ -53158,22 +51215,6 @@ msgstr ""
 msgid "Execute operation on a local container"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/time.fish:2
-msgid "Specify output format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/time.fish:3
-msgid "Use the portable output format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/time.fish:4
-msgid "Do not send the results to stderr, but overwrite the specified file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/time.fish:5
-msgid "(Used together with -o) Do not overwrite but append"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/timeout.fish:1
 msgid "Run COMMAND in the foreground"
 msgstr ""
@@ -53386,16 +51427,27 @@ msgid "Print as XML"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:1
+#: share/completions/tmux.fish:1
+#, fuzzy
 msgid "available sessions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför argument som kommandon"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:2
+#: share/completions/tmux.fish:5
 msgid "connected clients"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:3
+#: share/completions/tmux.fish:9
+#, fuzzy
 msgid "window panes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Terminalfönstret ändrade storlek"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:4
 msgid "Force tmux to assume the terminal supports 256 colours"
@@ -53686,38 +51738,10 @@ msgstr ""
 msgid "target-pane"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/top.fish:2
-msgid "Toggle command line/program name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/top.fish:5
-msgid "Toggle idle processes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/top.fish:6
 msgid "Maximum iterations"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/top.fish:7
-msgid "Monitor effective UID"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/top.fish:8
-msgid "Monitor user"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/top.fish:9
-msgid "Monitor PID"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/top.fish:10
-msgid "Secure mode"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/top.fish:11
-msgid "Cumulative mode"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/totem.fish:1
 msgid "Output a brief synopsis of command options then quit"
 msgstr ""
@@ -53775,10 +51799,12 @@ msgid "Tell any running totem instance: Quit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:15
+#: share/completions/totem.fish:18
 msgid "Tell any running totem instance: Add to playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/totem.fish:16
+#: share/completions/totem.fish:19
 msgid "Tell any running totem instance: Play from playlist"
 msgstr ""
 
@@ -54086,14 +52112,6 @@ msgstr ""
 msgid "List the current torrent's connected peers"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/trap.fish:1
-msgid "Display names of all signals"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/trap.fish:2
-msgid "Display all currently defined trap handlers"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/trap.fish:4
 msgid "Signal"
 msgstr ""
@@ -54591,10 +52609,6 @@ msgstr ""
 msgid "hexadecimal characters"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/type.fish:2
-msgid "Print all possible definitions of the specified name"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/type.fish:3
 msgid "Suppress function and builtin lookup"
 msgstr ""
@@ -54603,14 +52617,6 @@ msgstr ""
 msgid "Print command type"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/type.fish:5
-msgid "Print path to command, or nothing if name is not a command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/type.fish:6
-msgid "Print path to command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/type.fish:7
 msgid "Suppress output"
 msgstr ""
@@ -54745,95 +52751,10 @@ msgstr ""
 msgid "Set or get hard limit"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/ulimit.fish:3
-msgid "Set or get all current limits"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:4
-msgid "Maximum size of core files created"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:5
-msgid "Maximum size of a process's data segment"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:6
-msgid "Maximum size of files created by the shell"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:7
-msgid "Maximum size that may be locked into memory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:8
-msgid "Maximum resident set size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:9
-msgid "Maximum number of open file descriptors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:10
-msgid "Maximum stack size"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:11
-msgid "Maximum amount of cpu time in seconds"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:12
-msgid "Maximum number of processes available to a single user"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/ulimit.fish:13
-msgid "Maximum amount of virtual memory available to the shell"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/ulimit.fish:15
 msgid "New resource limit"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/umount.fish:5
-msgid "Unmount without writing in /etc/mtab"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:6
-msgid "In case unmounting fails, try to remount read-only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:7
-msgid ""
-"In case the unmounted device was a loop device, also free this loop device"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:8
-msgid "Don't call the /sbin/umount.<filesystem> helper even if it exists"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:9
-msgid "Unmount all of the file systems described in /etc/mtab"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:10
-msgid "Actions should only be taken on file systems of the specified type"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:11
-msgid ""
-"Actions should only be taken on file systems with the specified options in /"
-"etc/fstab"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:12
-msgid "Force unmount (in case of an unreachable NFS system)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/umount.fish:13
-msgid ""
-"Detach the filesystem from the filesystem hierarchy now, and cleanup all "
-"references to the filesystem as soon as it is not busy"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/uname.fish:1
 msgid "Behave as though all of the options mnrsv were specified."
 msgstr ""
@@ -54866,34 +52787,10 @@ msgstr ""
 msgid "Print all information"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/uname.fish:9
-msgid "Print kernel name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/uname.fish:10
-msgid "Print network node hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/uname.fish:11
-msgid "Print kernel release"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/uname.fish:12
 msgid "Print kernel version"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/uname.fish:13
-msgid "Print machine name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/uname.fish:14
-msgid "Print processor"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/uname.fish:15
-msgid "Print hardware platform"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/uname.fish:16
 msgid "Print operating system"
 msgstr ""
@@ -54915,40 +52812,77 @@ msgid "use comma separated LIST of tab positions (enables -a)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:1
+#: share/completions/unrar.fish:5
+#, fuzzy
 msgid "Extract files to current directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Läs filer i varje katalog"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:3
+#: share/completions/unrar.fish:7
+#, fuzzy
 msgid "List archive (technical)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa arkivinnehåll"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:4
+#: share/completions/unrar.fish:8
+#, fuzzy
 msgid "List archive (bare)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa arkivinnehåll"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:5
+#: share/completions/unrar.fish:9
+#, fuzzy
 msgid "Print file to stdout"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skicka filer till standard ut"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:6
+#: share/completions/unrar.fish:10
+#, fuzzy
 msgid "Test archive files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Arkivfil"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:7
+#: share/completions/unrar.fish:11
+#, fuzzy
 msgid "Verbosely list archive"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Verifiera arkiv"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:8
+#: share/completions/unrar.fish:12
 msgid "Verbosely list archive (technical)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:9
+#: share/completions/unrar.fish:13
 msgid "Verbosely list archive (bare)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:10
+#: share/completions/unrar.fish:14
+#, fuzzy
 msgid "Extract files with full path"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Axtrahera fil från fil"
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:1
 msgid "Show a short help screen"
@@ -55136,12 +53070,22 @@ msgid "The new SELinux user for the user's login"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:1
+#: share/completions/vagrant.fish:3
+#, fuzzy
 msgid "Test if vagrant has yet to be given the main command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:2
+#: share/completions/vagrant.fish:23
+#, fuzzy
 msgid "Lists all available Vagrant boxes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:4
 msgid "Print the help and exit"
@@ -55380,62 +53324,18 @@ msgstr ""
 msgid "Enable only certain provisioners, by type"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:1
+#: share/completions/valgrind.fish:12
 msgid "Skin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:3
-msgid "Display help and debug options"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:7
-msgid "Valgrind-ise children"
-msgstr ""
+msgstr "Verktyg"
 
 #: /tmp/fish/implicit/share/completions/valgrind.fish:8
 msgid "Track file descriptors"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:9
-msgid "Log to file descriptor"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/valgrind.fish:10
 msgid "Log to file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:11
-msgid "Log to socket"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:12
-msgid "Callers in stack trace"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:13
-msgid "Stop showing errors if too many"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:14
-msgid "Continue trace below main()"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:15
-msgid "Supress errors from file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:16
-msgid "Print suppressions for detected errors"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:17
-msgid "Start debugger on error"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:18
-msgid "Debugger command"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/valgrind.fish:19
 msgid "File descriptor for input"
 msgstr ""
@@ -55445,22 +53345,6 @@ msgstr ""
 msgid "Check for memory leaks"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:21
-#: /tmp/fish/implicit/share/completions/valgrind.fish:27
-msgid "Show reachable leaked memory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:22
-msgid ""
-"Determines how willing Memcheck is to consider different backtraces to be "
-"the same"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:23
-#: /tmp/fish/implicit/share/completions/valgrind.fish:29
-msgid "Set size of freed memory pool"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/valgrind.fish:24
 #: /tmp/fish/implicit/share/completions/valgrind.fish:30
 msgid "How to handle loads of words that are partially addressible"
@@ -55471,47 +53355,25 @@ msgstr ""
 msgid "Whether to skip error reporting for the strlen function"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:28
-msgid ""
-"Determines how willing Addrcheck is to consider different backtraces to be "
-"the same"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:32
-msgid "Type of L1 instruction cache"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:33
-msgid "Type of L1 data cache"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:34
-msgid "Type of L2 cache"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/valgrind.fish:35
-msgid "Specify a function that allocates memory"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/valgrind.fish:36
 msgid "Profile heap usage"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:37
+#: share/completions/valgrind.fish:78
 msgid "The number of bytes of heap overhead per allocation"
-msgstr ""
+msgstr "Antalet bytes av extra heap-utrymme som används per allokering"
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:38
+#: share/completions/valgrind.fish:79
 msgid "Profile stack usage"
-msgstr ""
+msgstr "Profilera stackanvändning"
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:39
+#: share/completions/valgrind.fish:80
 msgid "Depth of call chain"
-msgstr ""
+msgstr "Djup i anroppskedjan"
 
-#: /tmp/fish/implicit/share/completions/valgrind.fish:40
+#: share/completions/valgrind.fish:81
 msgid "Profiling output format"
-msgstr ""
+msgstr "Utdataformat för profilering"
 
 #: /tmp/fish/implicit/share/completions/VBoxHeadless.fish:1
 msgid "Start given VM"
@@ -55685,31 +53547,43 @@ msgid "Deny usage of VT-x/AMD-V"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:1
+#: share/functions/__fish_complete_vi.fish:91
 msgid "Suppress all interactive user feedback"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:2
 #: /tmp/fish/implicit/share/completions/vi.fish:9
+#: share/functions/__fish_complete_vi.fish:92
+#: share/functions/__fish_complete_vi.fish:99
 msgid "Encrypt/decrypt text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:3
+#: share/functions/__fish_complete_vi.fish:93
 msgid "Set up for editing LISP programs"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:4
+#: share/functions/__fish_complete_vi.fish:94
 msgid "List saved file names after crash"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:5
+#: share/functions/__fish_complete_vi.fish:95
+#, fuzzy
 msgid "Read-only mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skrivskyddad"
 
 #: /tmp/fish/implicit/share/completions/vi.fish:6
+#: share/functions/__fish_complete_vi.fish:96
 msgid "Use linear search for tags if tag file not sorted"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:7
+#: share/functions/__fish_complete_vi.fish:97
 msgid "Start in display editing state"
 msgstr ""
 
@@ -55726,8 +53600,13 @@ msgid "Begin editing by executing the specified  editor command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:1
+#: share/completions/vim-addons.fish:8
+#, fuzzy
 msgid "Test if vim-addons has yet to be given the subcommand"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:2
 msgid "list the names of the addons available in the system"
@@ -55862,73 +53741,152 @@ msgid "Record all typed characters (overwrite file)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:18
+#: share/functions/__fish_complete_vi.fish:37
+#, fuzzy
 msgid "Start in Arabic mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Starta gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:19
+#: share/functions/__fish_complete_vi.fish:38
+#, fuzzy
 msgid "Start in binary mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Standardläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:20
+#: share/functions/__fish_complete_vi.fish:39
 msgid "Behave mostly like vi"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:21
+#: share/functions/__fish_complete_vi.fish:40
+#, fuzzy
 msgid "Start in diff mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:22
+#: share/functions/__fish_complete_vi.fish:41
+#, fuzzy
 msgid "Debugging mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Debugläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:23
+#: share/functions/__fish_complete_vi.fish:42
+#, fuzzy
 msgid "Start in Ex mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:24
+#: share/functions/__fish_complete_vi.fish:43
+#, fuzzy
 msgid "Start in improved Ex mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:25
 #: /tmp/fish/implicit/share/completions/vim.fish:46
+#: share/functions/__fish_complete_vi.fish:44
+#: share/functions/__fish_complete_vi.fish:67
+#, fuzzy
 msgid "Start in foreground mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:26
+#: share/functions/__fish_complete_vi.fish:45
+#, fuzzy
 msgid "Start in Farsi mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Standardläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:27
+#: share/functions/__fish_complete_vi.fish:46
+#, fuzzy
 msgid "Start in GUI mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:28
 #: /tmp/fish/implicit/share/completions/vim.fish:48
+#: share/functions/__fish_complete_vi.fish:47
+#: share/functions/__fish_complete_vi.fish:69
+#, fuzzy
 msgid "Print help message and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:29
+#: share/functions/__fish_complete_vi.fish:48
+#, fuzzy
 msgid "Start in Hebrew mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:30
 #: /tmp/fish/implicit/share/completions/vim.fish:37
+#: share/functions/__fish_complete_vi.fish:49
+#, fuzzy
 msgid "List swap files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Arkivfil"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:31
+#: share/functions/__fish_complete_vi.fish:50
+#, fuzzy
 msgid "Start in lisp mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:32
+#: share/functions/__fish_complete_vi.fish:51
+#, fuzzy
 msgid "Disable file modification"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lita inte på filändringstid"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:33
+#: share/functions/__fish_complete_vi.fish:52
+#, fuzzy
 msgid "Disallow file modification"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa bara senaste modifiering"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:34
+#: share/functions/__fish_complete_vi.fish:53
 msgid "Reset compatibility mode"
 msgstr ""
 
@@ -55961,26 +53919,44 @@ msgid "Don't connect to X server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:43
+#: share/functions/__fish_complete_vi.fish:62
+#, fuzzy
 msgid "Start in easy mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Starta gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:44
+#: share/functions/__fish_complete_vi.fish:63
+#, fuzzy
 msgid "Start in restricted mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Inskränkt läge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:45
+#: share/functions/__fish_complete_vi.fish:65
 msgid "Become an editor server for NetBeans"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:47
+#: share/functions/__fish_complete_vi.fish:68
 msgid "Echo the Window ID on stdout (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:49
+#: share/functions/__fish_complete_vi.fish:70
+#, fuzzy
 msgid "Do not expand wildcards"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Expandera inte mönster"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:50
+#: share/functions/__fish_complete_vi.fish:71
 msgid "Skip loading plugins"
 msgstr ""
 
@@ -55988,40 +53964,79 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/vim.fish:54
 #: /tmp/fish/implicit/share/completions/vim.fish:55
 #: /tmp/fish/implicit/share/completions/vim.fish:56
+#: share/functions/__fish_complete_vi.fish:72
+#: share/functions/__fish_complete_vi.fish:75
+#: share/functions/__fish_complete_vi.fish:76
+#: share/functions/__fish_complete_vi.fish:77
+#, fuzzy
 msgid "Edit files on Vim server"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Redigera filer på plats"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:52
+#: share/functions/__fish_complete_vi.fish:73
+#, fuzzy
 msgid "Evaluate expr on Vim server"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför argument som kommandon"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:53
+#: share/functions/__fish_complete_vi.fish:74
+#, fuzzy
 msgid "Send keys to Vim server"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skicka e-post till användare"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:57
+#: share/functions/__fish_complete_vi.fish:78
 msgid "List all Vim servers that can be found"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:58
+#: share/functions/__fish_complete_vi.fish:79
+#, fuzzy
 msgid "Set server name"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Namn på tjänst"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
+#: share/functions/__fish_complete_vi.fish:80
+#, fuzzy
 msgid "Print version information and exit"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:1
+#: share/completions/wajig.fish:1
+#, fuzzy
 msgid "Test if wajig has yet to be given the subcommand"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:2
+#: share/completions/wajig.fish:10
+#, fuzzy
 msgid "Test if wajig command should have packages as potential completion"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Testa om aptkommando borde ha paket som potentiell komplettering"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:4
 msgid "Do system commands everything quietly."
@@ -56146,6 +54161,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:34
 #: /tmp/fish/implicit/share/completions/wajig.fish:115
+#: share/completions/wajig.fish:131
 msgid "Search for an unofficial Debian package at apt-get.org"
 msgstr ""
 
@@ -56175,6 +54191,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:41
 #: /tmp/fish/implicit/share/completions/wajig.fish:90
+#: share/completions/wajig.fish:106
 msgid "Initialise or reset the JIG archive files"
 msgstr ""
 
@@ -56184,6 +54201,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:43
 #: /tmp/fish/implicit/share/completions/wajig.fish:82
+#: share/completions/wajig.fish:98
 msgid "Install package and associated recommended packages"
 msgstr ""
 
@@ -56193,6 +54211,7 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:45
 #: /tmp/fish/implicit/share/completions/wajig.fish:111
+#: share/completions/wajig.fish:127
 msgid "Install package and associated suggested packages"
 msgstr ""
 
@@ -56307,8 +54326,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:75
 #: /tmp/fish/implicit/share/completions/wajig.fish:89
+#: share/completions/wajig.fish:105
+#, fuzzy
 msgid "Generate a .deb file for an installed package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bygg och installera ett installerat paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:76
 msgid "From preferences file show priorities/policy (available)"
@@ -56331,148 +54355,228 @@ msgid "Display the package's README file from /usr/share/doc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:81
+#: share/completions/wajig.fish:97
+#, fuzzy
 msgid "Download package and any packages it depends on"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paket som detta paket beror på"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:83
+#: share/completions/wajig.fish:99
 msgid "Reconfigure the named installed packages or run gkdebconf"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:84
+#: share/completions/wajig.fish:100
+#, fuzzy
 msgid "Reinstall each of the named packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera ett eller flera paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:85
+#: share/completions/wajig.fish:101
 msgid "Reload daemon configs, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:86
+#: share/completions/wajig.fish:102
+#, fuzzy
 msgid "Remove one or more packages (see also purge)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera ett eller flera paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:87
+#: share/completions/wajig.fish:103
 msgid "Remove package and its dependees not required by others"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:88
+#: share/completions/wajig.fish:104
 msgid "Remove orphaned libraries (not required by installed packages)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:91
+#: share/completions/wajig.fish:107
 msgid "Stop then start a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:92
+#: share/completions/wajig.fish:108
+#, fuzzy
 msgid "Install a RedHat .rpm package"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:93
+#: share/completions/wajig.fish:109
 msgid "Convert a RedHat .rpm file to a Debian .deb file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
+#: share/completions/wajig.fish:110
+#, fuzzy
 msgid "Search for packages containing listed words"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
+#: share/completions/wajig.fish:111
 msgid "Find local Debian archives suitable for sources.list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:96
+#: share/completions/wajig.fish:112
 msgid "Configure the sources.list file which locates Debian archives"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:97
+#: share/completions/wajig.fish:113
 msgid "Provide a detailed description of package [same as detail]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:98
+#: share/completions/wajig.fish:114
 msgid "Trace the steps that a dist-upgrade would perform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:99
+#: share/completions/wajig.fish:115
 msgid "Trace the steps that an install would perform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:100
+#: share/completions/wajig.fish:116
 msgid "Trace the steps that a remove would perform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:101
+#: share/completions/wajig.fish:117
 msgid "Trace the steps that an upgrade would perform"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:102
 #: /tmp/fish/implicit/share/completions/wajig.fish:103
+#: share/completions/wajig.fish:118 share/completions/wajig.fish:119
 msgid "Print out the size (in K) of all, or listed, installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:104
+#: share/completions/wajig.fish:120
 msgid "Generates list of package=version for all installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:105
+#: share/completions/wajig.fish:121
+#, fuzzy
 msgid "Retrieve and unpack sources for the named packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:106
+#: share/completions/wajig.fish:122
 msgid "Start a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:107
+#: share/completions/wajig.fish:123
+#, fuzzy
 msgid "Show the version and available version of packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa fulla versioner för paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:108
 #: /tmp/fish/implicit/share/completions/wajig.fish:109
+#: share/completions/wajig.fish:124 share/completions/wajig.fish:125
 msgid "Show the version and available version of matching packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:110
+#: share/completions/wajig.fish:126
 msgid "Stop a daemon, e.g., gdm, apache (see list-daemons)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:112
+#: share/completions/wajig.fish:128
 msgid "Run the Gnome task selector to install groups of packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:113
+#: share/completions/wajig.fish:129
+#, fuzzy
 msgid "List packages with newer versions available for upgrading"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Uppdaterar till den bästa tillgängliga versionen"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:114
+#: share/completions/wajig.fish:130
 msgid "Remove listed packages from hold so they are again upgraded"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:116
+#: share/completions/wajig.fish:132
+#, fuzzy
 msgid "Update the list of down-loadable packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Updatera källkodpaketlista"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:117
+#: share/completions/wajig.fish:133
 msgid "Update default alternative for things like x-window-manager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:118
+#: share/completions/wajig.fish:134
 msgid "Updates the local list of PCI ids from the internet master list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:119
+#: share/completions/wajig.fish:135
 msgid "Updates the local list of USB ids from the internet master list"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:120
+#: share/completions/wajig.fish:136
 msgid "Upgrade all of the installed packages or just those listed"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:121
+#: share/completions/wajig.fish:137
+#, fuzzy
 msgid "List version and distribution of (all) packages."
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Verifiera inga attribut i paketfiler"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:122
+#: share/completions/wajig.fish:138
+#, fuzzy
 msgid "A synonym for describe"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Synonym för -i"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:123
+#: share/completions/wajig.fish:139
 msgid "Find the package that supplies the given command or file"
 msgstr ""
 
@@ -56513,22 +54617,6 @@ msgstr ""
 msgid "Pass command to exec instead of \"sh -c\""
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/wc.fish:1
-msgid "Print byte counts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wc.fish:2
-msgid "Print character counts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wc.fish:3
-msgid "Print newline counts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wc.fish:4
-msgid "Print length of longest line"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wc.fish:5
 msgid "Print word counts"
 msgstr ""
@@ -56655,242 +54743,14 @@ msgstr ""
 msgid "Sets the number of turns for the chosen scenario"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/w.fish:1
-msgid "Dont print header"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/w.fish:2
-msgid "Ignore username for time calculations"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/w.fish:3
-msgid "Short format"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/w.fish:4
-msgid "Toggle printing of remote hostname"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:3
-msgid "Go to background immediately after startup"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wget.fish:4
 msgid "Execute command as if part of .wgetrc"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/wget.fish:5
-msgid "Log all messages to logfile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:6
-msgid "Append all messages to logfile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:7
-msgid "Turn on debug output"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:10
-#: /tmp/fish/implicit/share/completions/wget.fish:11
-msgid "Turn off verbose without being completely quiet"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:12
-msgid "Read URLs from file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:13
-msgid "Force input to be treated as HTML"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:14
-msgid "Prepend string to relative links"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:15
-msgid "Bind address on local machine"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:16
-msgid "Set number of retries to number"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:17
-msgid "Concatenate output to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:18
-#: /tmp/fish/implicit/share/completions/wget.fish:19
-msgid "Never overwrite files with same name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:20
-msgid "Continue getting a partially-downloaded file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:21
-msgid "Select progress meter type"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:22
-msgid "Turn on time-stamping"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:23
-msgid "Print the headers/responses sent by servers"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:24
-msgid "Do not download the pages, just check that they are there"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:25
-msgid "Set the network timeout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:26
-msgid "Set the DNS lookup timeout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:27
-msgid "Set the connect timeout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:28
-msgid "Set the read (and write) timeout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:29
-msgid "Limit the download speed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:30
-msgid "Wait the specified number of seconds between the retrievals"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:31
-msgid "Wait time between retries"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:32
-msgid "Wait random amount of time between retrievals"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:33
-msgid "Toggle proxy support"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:34
-msgid "Specify download quota for automatic retrievals"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:35
-msgid "Turn off caching of DNS lookups"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:36
-msgid ""
-"Change which characters found in remote URLs may show up in local file names"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:37
-#: /tmp/fish/implicit/share/completions/wget.fish:38
-msgid "Do not create a hierarchy of directories"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:39
-msgid "Force creation of a hierarchy of directories"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:40
-#: /tmp/fish/implicit/share/completions/wget.fish:41
-msgid "Disable generation of host-prefixed directories"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:42
-msgid "Use the protocol name as a directory component"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:43
-msgid "Ignore specified number of directory components"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:44
-msgid "Set directory prefix"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:45
-msgid "Force html files to have html extension"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:46
-msgid "Specify the http username"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:47
-msgid "Specify the http password"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:48
-msgid "Disable server-side cache"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wget.fish:49
 msgid "Disable the use of cookies"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/wget.fish:50
-msgid "Load cookies from file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:51
-msgid "Save cookies to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:52
-msgid "Save session cookies"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:53
-msgid "Ignore 'Content-Length' header"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:54
-msgid "Define an additional-header to be passed to the HTTP servers"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:55
-msgid "Specify the proxy username"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:56
-msgid "Specify the proxy password"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:57
-msgid "Set referer URL"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:58
-msgid "Save the headers sent by the HTTP server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:59
-msgid "Identify as agent-string"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:60
-#: /tmp/fish/implicit/share/completions/wget.fish:61
-msgid ""
-"Use POST as the method for all HTTP requests and send the specified data in "
-"the request body"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:62
-msgid "Turn off keep-alive for http downloads"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wget.fish:63
 msgid "Choose secure protocol"
 msgstr ""
@@ -56947,218 +54807,19 @@ msgstr ""
 msgid "Path of HSTS database"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/wget.fish:77
-msgid "Don't remove the temporary .listing files generated"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:78
-msgid "Turn off FTP globbing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:79
-msgid "Use the passive FTP retrieval scheme"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:80
-msgid "Traverse symlinks and retrieve pointed-to files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:81
-msgid "Turn on recursive retrieving"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:82
-msgid "Specify recursion maximum depth"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:83
-msgid "Delete every single file downloaded"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:84
-msgid ""
-"Convert the links in the document to make them suitable for local viewing"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:85
-msgid "Back up the original version"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:86
-msgid "Turn on options suitable for mirroring"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:87
-msgid ""
-"Download all the files that are necessary to properly display a given HTML "
-"page"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:88
-msgid "Turn on strict parsing of HTML comments"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:89
-msgid "Comma-separated lists of file name suffixes or patterns to accept"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:90
-msgid "Comma-separated lists of file name suffixes or patterns to reject"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:91
-msgid "Set domains to be followed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:92
-msgid "Specify the domains that are not to be followed"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:93
-msgid "Follow FTP links from HTML documents"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:94
-msgid "HTML tags to follow"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:95
-msgid "HTML tags to ignore"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:96
-msgid "Enable spanning across hosts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:97
-msgid "Follow relative links only"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:98
-msgid "Specify a comma-separated list of directories you wish to follow"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/wget.fish:99
-msgid "Specify a comma-separated list of directories you wish to exclude"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wget.fish:100
 #: /tmp/fish/implicit/share/completions/wget.fish:101
 msgid "Do not ever ascend to the parent directory"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/which.fish:1
-#: /tmp/fish/implicit/share/completions/which.fish:13
-msgid "Print all matching executables in PATH, not just the first"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:2
-msgid "Read aliases from stdin, reporting matching ones on stdout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:3
-msgid "Ignore option '--read-alias'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:4
-msgid ""
-"Read shell function definitions from stdin, reporting matching ones on stdout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:5
-msgid "Ignore option '--read-functions'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:6
-msgid "Skip directories in PATH that start with a dot"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:7
-msgid ""
-"Skip directories in PATH that start with a tilde and executables which "
-"reside in the HOME directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:8
-msgid ""
-"If a directory in PATH starts with a dot and a matching executable was found "
-"for that path, then print './programname'"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:9
-msgid "Output a tilde when a directory matches the HOME directory"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/which.fish:10
-msgid "Stop processing options on the right if not on tty"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/which.fish:14
 msgid "Print no output, only return 0 if found"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/who.fish:1
-msgid "Same as -b -d --login -p -r -t -T -u"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:2
-msgid "Print time of last boot"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/who.fish:3
 msgid "Print dead processes"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/who.fish:4
-msgid "Print line of headings"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:5
-msgid "Print idle time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:6
-msgid "Print login process"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:7
-msgid "Canonicalize hostnames via DNS"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:8
-msgid "Print hostname and user for stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:9
-msgid "Print active processes spawned by init"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:10
-msgid "Print all login names and number of users logged on"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:11
-msgid "Print current runlevel"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:12
-msgid "Print name, line, and time"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:13
-msgid "Print last system clock change"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:14
-#: /tmp/fish/implicit/share/completions/who.fish:15
-#: /tmp/fish/implicit/share/completions/who.fish:16
-msgid "Print users message status as +, - or ?"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/who.fish:17
-msgid "List users logged in"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/wicd-client.fish:1
 #: /tmp/fish/implicit/share/completions/wicd-gtk.fish:1
 msgid "Run the wicd tray icon only."
@@ -57241,150 +54902,239 @@ msgid "Set the network"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:1
+#: share/completions/wpa_cli.fish:3
 msgid "get current WPA/EAPOL/EAP status"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:2
+#: share/completions/wpa_cli.fish:4
 msgid "get MIB variables (dot1x, dot11)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:3
+#: share/completions/wpa_cli.fish:5
 msgid "show this usage help"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:4
+#: share/completions/wpa_cli.fish:6
+#, fuzzy
 msgid "show interfaces/select interface"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:5
+#: share/completions/wpa_cli.fish:7
+#, fuzzy
 msgid "change debug level"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj debugnivå"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:6
+#: share/completions/wpa_cli.fish:8
 msgid "show full wpa_cli license"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:7
+#: share/completions/wpa_cli.fish:9
 msgid "IEEE 802.1X EAPOL state machine logoff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:8
+#: share/completions/wpa_cli.fish:10
 msgid "IEEE 802.1X EAPOL state machine logon"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:9
+#: share/completions/wpa_cli.fish:11
+#, fuzzy
 msgid "set/list variables"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera variabel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:10
+#: share/completions/wpa_cli.fish:12
 msgid "show PMKSA cache"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:11
+#: share/completions/wpa_cli.fish:13
+#, fuzzy
 msgid "force reassociation"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tvinga namn/revision-association"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:12
+#: share/completions/wpa_cli.fish:14
 msgid "force wpa_supplicant to re-read its config file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:13
+#: share/completions/wpa_cli.fish:15
+#, fuzzy
 msgid "force preauthentication"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tvinga pseudo-tty-allokering"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:14
+#: share/completions/wpa_cli.fish:16
 msgid "configure identity for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:15
+#: share/completions/wpa_cli.fish:17
 msgid "configure password for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:16
+#: share/completions/wpa_cli.fish:18
 msgid "change password for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:17
+#: share/completions/wpa_cli.fish:19
+#, fuzzy
 msgid "configure pin for an SSID"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Konfiurera för att bygga på given målarkitektur"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:18
+#: share/completions/wpa_cli.fish:20
 msgid "configure one-time-password for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:19
+#: share/completions/wpa_cli.fish:21
 msgid "configure private key passphrase for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:20
+#: share/completions/wpa_cli.fish:22
 msgid "set preferred BSSID for an SSID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:21
+#: share/completions/wpa_cli.fish:23
 msgid "list configured networks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:22
+#: share/completions/wpa_cli.fish:24
 msgid "select a network (disable others)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:23
+#: share/completions/wpa_cli.fish:25
+#, fuzzy
 msgid "enable a network"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Aktivera förråd"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:24
+#: share/completions/wpa_cli.fish:26
+#, fuzzy
 msgid "disable a network"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Inaktivera förråd"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:25
+#: share/completions/wpa_cli.fish:27
+#, fuzzy
 msgid "add a network"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till ny nyckel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:26
+#: share/completions/wpa_cli.fish:28
+#, fuzzy
 msgid "remove a network"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ta bort en nyckel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:27
+#: share/completions/wpa_cli.fish:29
 msgid "set/list network variables"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
+#: share/completions/wpa_cli.fish:30
+#, fuzzy
 msgid "get network variables"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj CVS-användare"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
+#: share/completions/wpa_cli.fish:31
+#, fuzzy
 msgid "save the current configuration"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ladda om konfiguration för tjänst"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:30
+#: share/completions/wpa_cli.fish:32
 msgid "disconnect and wait for reassociate command before connecting"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:31
+#: share/completions/wpa_cli.fish:33
 msgid "request new BSS scan"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:32
+#: share/completions/wpa_cli.fish:34
 msgid "get latest scan results"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:33
+#: share/completions/wpa_cli.fish:35
+#, fuzzy
 msgid "get capabilies"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj spellista"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:34
+#: share/completions/wpa_cli.fish:36
 msgid "request STAKey negotiation with <addr>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:35
+#: share/completions/wpa_cli.fish:37
 msgid "set ap_scan parameter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:36
+#: share/completions/wpa_cli.fish:38
 msgid "request STK negotiation with <addr>"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:37
+#: share/completions/wpa_cli.fish:39
 msgid "terminate wpa_supplicant"
 msgstr ""
 
@@ -57404,59 +55154,6 @@ msgstr ""
 msgid "Don't output debug information"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/xargs.fish:1
-msgid ""
-"Input filenames are terminated by a null character instead of by whitespace, "
-"and the quotes and backslash are not special"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:2
-#: /tmp/fish/implicit/share/completions/xargs.fish:3
-msgid "Set the end of file string to eof-str"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:5
-#: /tmp/fish/implicit/share/completions/xargs.fish:6
-msgid ""
-"Replace replace-str in the initial arguments with names from standard input"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:7
-#: /tmp/fish/implicit/share/completions/xargs.fish:8
-msgid "Use at most max-lines nonblank input lines per command line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:9
-msgid "Use at most max-args arguments per command line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:10
-msgid ""
-"Prompt the user about whether to run each command line and read a line from "
-"the terminal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:11
-msgid ""
-"If the standard input does not contain any nonblanks, do not run the command"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:12
-msgid "Use at most max-chars characters per command line"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:13
-msgid "Print the command line on the standard error output before executing it"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:15
-msgid "Exit if the size is exceeded"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xargs.fish:16
-msgid "Run up to max-procs processes at a time"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/xdg-mime.fish:1
 msgid "Query information"
 msgstr ""
@@ -57660,16 +55357,24 @@ msgid "Show summary of options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:2
+#, fuzzy
 msgid "Select XMMS session (Default: 0)"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj via sessions-id"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:3
 msgid "Skip backwards in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:4
+#, fuzzy
 msgid "Start playing current playlist"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa eller redigera alla resursanvändningsgränser"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:5
 msgid "Pause current song"
@@ -57688,8 +55393,12 @@ msgid "Skip forward in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:9
+#, fuzzy
 msgid "Don't clear the playlist"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj spellista"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:10
 msgid "Show the main window"
@@ -57700,8 +55409,12 @@ msgid "Set the initial window geometry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
+#, fuzzy
 msgid "Set the window title"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj nätverkstimeout"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:3
 msgid "Install a private colormap"
@@ -57712,12 +55425,20 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
+#, fuzzy
 msgid "Set reverse video mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Serverläge"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
+#, fuzzy
 msgid "Set the background of the page display"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skapa fönster på angiven skärm"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:7
 msgid "Set the color for background outside the page area"
@@ -57744,12 +55465,20 @@ msgid "Enable or disable font anti-aliasing (Default: yes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:13
+#, fuzzy
 msgid "Set the default file name for PostScript output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange standardnyckelordssubstitution"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:14
+#, fuzzy
 msgid "Set the paper size"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj uttags (socket) buffertstorlek"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:15
 msgid "Set the paper width, in points"
@@ -57760,24 +55489,44 @@ msgid "Set the paper height, in points"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:17
+#, fuzzy
 msgid "Generate Level 1 PostScript"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Generera utdata för dired"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:18
+#, fuzzy
 msgid "Sets the encoding to use for text output"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Varken tyst eller utförligt läge"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:19
+#, fuzzy
 msgid "Sets the end-of-line convention to use"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sätt slut-på-fil-strängen till angiven sträng"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:20
+#, fuzzy
 msgid "Specify the owner password for the PDF file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj proxylösenord"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:21
+#, fuzzy
 msgid "Specify the user password for the PDF file"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj proxylösenord"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:22
 msgid "Open xpdf in full-screen mode"
@@ -57800,77 +55549,45 @@ msgid "Kill xpdf remote server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:27
+#, fuzzy
 msgid "Print commands as they're executed"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv kommandon till standard fel"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:29
 msgid "Specify config file to use instead of ~/.xpdfrc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:30
+#, fuzzy
 msgid "Print copyright and version information"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ignorera all versionsinformation"
 
-#: /tmp/fish/implicit/share/completions/xprop.fish:2
-msgid "Display grammar and exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:3
+#: share/completions/xprop.fish:4
 msgid "Select window by id"
-msgstr ""
+msgstr "Välj fönster via id"
 
-#: /tmp/fish/implicit/share/completions/xprop.fish:4
-msgid "Select window by name"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:5
+#: share/completions/xprop.fish:6
 msgid "Display font properties"
-msgstr ""
+msgstr "Visa fontegenskaper"
 
-#: /tmp/fish/implicit/share/completions/xprop.fish:6
-msgid "Select root window"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:7
-msgid "Specify X server"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:8
+#: share/completions/xprop.fish:9
 msgid "Maximum display length"
-msgstr ""
+msgstr "Maximal displaylängd"
 
-#: /tmp/fish/implicit/share/completions/xprop.fish:9
-msgid "Do not show property type"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:10
+#: share/completions/xprop.fish:11
 msgid "Set format file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:11
-msgid "Select a window by clicking on its frame"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:12
-msgid "Remove property"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:13
-msgid "Set property"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xprop.fish:14
-msgid "Examine property updates forever"
-msgstr ""
+msgstr "Välj formatfil"
 
 #: /tmp/fish/implicit/share/completions/xprop.fish:15
 msgid "Set format"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/xrandr.fish:2
-msgid "Make no changes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/xrandr.fish:3
 msgid "Apply modifications without grabbing the screen"
 msgstr ""
@@ -58117,69 +55834,13 @@ msgstr ""
 msgid "don't warn about duplicates"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/xsel.fish:1
-msgid "Append input to selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:2
-msgid "Append to selection as input grows"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:3
-msgid "Read into selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:4
-msgid "Write selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:5
-msgid "Clear selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:6
-msgid "Delete selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:7
-msgid "Use primary selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:8
-msgid "Use secondary selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:9
-msgid "Use clipboard selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:10
-msgid "Make current selections persistent after program exit"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:11
-msgid "Exchange primary and secondary selections"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:12
+#: share/completions/xsel.fish:12
 msgid "X server display"
-msgstr ""
+msgstr "X-serverdisplay"
 
-#: /tmp/fish/implicit/share/completions/xsel.fish:13
-msgid "Timeout for retrieving selection"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:14
+#: share/completions/xsel.fish:14
 msgid "Error log"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:15
-msgid "Do not detach from the controlling terminal"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/xsel.fish:17
-msgid "Print informative messages"
-msgstr ""
+msgstr "Fellogg"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:1
 msgid "Never highlight the text cursor"
@@ -58562,108 +56223,170 @@ msgid "Use as input/output channel for an existing program"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:96
+#: share/completions/xterm.fish:101
 msgid "Run program in xterm"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:97
+#: share/completions/xterm.fish:103
 msgid "Blinking cursor will be off for that many milliseconds"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:98
+#: share/completions/xterm.fish:104
 msgid "Blinking cursor will be on for that many milliseconds"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:99
+#: share/completions/xterm.fish:105
 msgid "Override xterm resource class"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:100
+#: share/completions/xterm.fish:106
 msgid "Color for the text cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:101
+#: share/completions/xterm.fish:107
+#, fuzzy
 msgid "xterm encoding"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tvinga kodning"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:102
+#: share/completions/xterm.fish:108
 msgid "Bold font"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:103
+#: share/completions/xterm.fish:109
 msgid "FreeType font pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:104
+#: share/completions/xterm.fish:110
 msgid "FreeType double-width font pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:105
+#: share/completions/xterm.fish:111
+#, fuzzy
 msgid "Font for active icons"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tvinga interaktivt läge"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:106
+#: share/completions/xterm.fish:112
 msgid "Font size for FreeType font"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:107
+#: share/completions/xterm.fish:113
 msgid "Font for displaying wide text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:108
+#: share/completions/xterm.fish:114
 msgid "Font for displaying bold wide text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:109
+#: share/completions/xterm.fish:115
 msgid "Font for the preedit string in \"OverTheSpot\""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:110
+#: share/completions/xterm.fish:116
 msgid "Color for highlighted text"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:111
+#: share/completions/xterm.fish:117
+#, fuzzy
 msgid "Embed xterm into window"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa trådar"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:112
+#: share/completions/xterm.fish:118
+#, fuzzy
 msgid "Set keyboard type"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange posttyp"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:113
+#: share/completions/xterm.fish:119
 msgid "File name for the encoding converter"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:114
+#: share/completions/xterm.fish:120
+#, fuzzy
 msgid "Log filename"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Logga till fil"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:115
+#: share/completions/xterm.fish:121
 msgid "Maximum time in milliseconds between multi-click selections"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:116
+#: share/completions/xterm.fish:122
 msgid "Color for the pointer cursor"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:117
+#: share/completions/xterm.fish:123
 msgid "Distance from the right end for ringing the margin bell"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:118
+#: share/completions/xterm.fish:124
+#, fuzzy
 msgid "Number of scrolled off lines"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Numrera alla rader"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:119
+#: share/completions/xterm.fish:125
+#, fuzzy
 msgid "Terminal identification"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa all information"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:121
+#: share/completions/xterm.fish:127
+#, fuzzy
 msgid "zIconBeep percentage"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa filposition i procent i prompten"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:122
+#: share/completions/xterm.fish:129
+#, fuzzy
 msgid "Size of the inner border"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringar i omvänd ordning"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:123
 msgid "Use jump scrolling"
@@ -59093,30 +56816,6 @@ msgstr ""
 msgid "Generate rss changelog"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/yum.fish:14
-msgid "Set debug level"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:15
-msgid "Set error level"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:16
-msgid "Be tolerant of errors in commandline"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:17
-msgid "Set maximum delay between commands"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:18
-msgid "Run commands from cache"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:20
-msgid "Specify installroot"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/yum.fish:21
 msgid "Enable repository"
 msgstr ""
@@ -59125,18 +56824,6 @@ msgstr ""
 msgid "Disable repository"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/yum.fish:23
-msgid "Enables obsolets processing logic"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:24
-msgid "Output rss-data to file"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/yum.fish:25
-msgid "Exclude specified package from updates"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/yum.fish:26
 msgid "List all packages"
 msgstr ""
@@ -59158,16 +56845,31 @@ msgid "List packages that are obsoleted by packages in repositories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:32
+#: share/completions/yum.fish:53
+#, fuzzy
 msgid "Delete cached package files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera obsoleta paketfiler"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:33
+#: share/completions/yum.fish:54
+#, fuzzy
 msgid "Delete cached header files"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera urval"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:34
+#: share/completions/yum.fish:55
+#, fuzzy
 msgid "Delete all cache contents"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera logfil"
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:1
 msgid ""
@@ -59767,109 +57469,21 @@ msgstr ""
 msgid "Pool which program will be executed on"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/zip.fish:1
-msgid "Freshen: only changed files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:2
-msgid "Delete entries in zipfile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:3
-msgid "Update: only changed or newer files"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:4
-msgid "Move into zipfile (delete files)"
-msgstr ""
-
 #: /tmp/fish/implicit/share/completions/zip.fish:6
 msgid "Do not store directory names"
 msgstr ""
 
-#: /tmp/fish/implicit/share/completions/zip.fish:7
-msgid "Do not compress at all"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:8
-msgid "Convert LF to CR LF"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:9
-msgid "Convert CR LF to LF"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:10
-msgid "Compress faster"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:11
-msgid "Compress better"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:14
-msgid "Add one-line comments"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:15
-msgid "Add zipfile comments"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:16
-msgid "Read names from stdin"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:17
-msgid "Make zipfile as old as the latest entry"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:18
+#: share/completions/zip.fish:19
 msgid "Exclude the following names"
-msgstr ""
+msgstr "Exkludera följande namn"
 
-#: /tmp/fish/implicit/share/completions/zip.fish:19
+#: share/completions/zip.fish:20
 msgid "Include only the following names"
-msgstr ""
+msgstr "Inkludera bara följande namn"
 
-#: /tmp/fish/implicit/share/completions/zip.fish:20
-msgid "Fix zipfile"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:21
-msgid "Fix zipfile (try harder)"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:22
-msgid "Adjust offsets to suit self-extracting exe"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:23
-msgid "Strip prepended data"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:24
-msgid "Test zipfile integrity"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:25
-msgid "Exclude extra file attributes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:26
-msgid "Store symbolic links as links"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:27
-msgid "PKZIP recursion"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:28
-msgid "Encrypt"
-msgstr ""
-
-#: /tmp/fish/implicit/share/completions/zip.fish:29
+#: share/completions/zip.fish:30
 msgid "Don't compress files with these suffixes"
-msgstr ""
+msgstr "Komprimera inte filer med dessa ändelser"
 
 #: /tmp/fish/implicit/share/completions/zpool.fish:1
 msgid ""
@@ -60339,164 +57953,341 @@ msgid "Repo"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:5
+#: share/completions/zypper.fish:31
 msgid "Accept multiple commands at once"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:6
+#: share/completions/zypper.fish:32
 msgid "List all defined repositories"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:7
+#: share/completions/zypper.fish:33
+#, fuzzy
 msgid "Add a new repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Uppdatera förråd"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:8
+#: share/completions/zypper.fish:34
+#, fuzzy
 msgid "Remove specified repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:9
+#: share/completions/zypper.fish:35
+#, fuzzy
 msgid "Rename specified repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Reparera trasigt förråd"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:10
+#: share/completions/zypper.fish:36
+#, fuzzy
 msgid "Modify specified repository"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:11
+#: share/completions/zypper.fish:37
+#, fuzzy
 msgid "Refresh all repositories"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skrivskyddat förråd-läge"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:12
+#: share/completions/zypper.fish:38
+#, fuzzy
 msgid "Clean local caches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Rengör lokala cachear och paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:13
+#: share/completions/zypper.fish:39
 msgid "List all defined services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:14
+#: share/completions/zypper.fish:40
+#, fuzzy
 msgid "Add a new service"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lägg till ny nyckel"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:15
+#: share/completions/zypper.fish:41
+#, fuzzy
 msgid "Modify specified service"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd angiven nyckelserver"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:16
+#: share/completions/zypper.fish:42
+#, fuzzy
 msgid "Remove specified service"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Använd angiven nyckelserver"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:17
+#: share/completions/zypper.fish:43
 msgid "Refresh all services"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:20
+#: share/completions/zypper.fish:46
+#, fuzzy
 msgid "Verify integrity of package dependencies"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera/ta bort paket för beroenden"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:21
+#: share/completions/zypper.fish:47
+#, fuzzy
 msgid "Install source packages and their build dependencies"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera/ta bort paket för beroenden"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:22
+#: share/completions/zypper.fish:48
+#, fuzzy
 msgid "Install newly added packages recommended by installed packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera paket även om de ersätter filer från andra, redan installerade "
+"paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:23
+#: share/completions/zypper.fish:49
+#, fuzzy
 msgid "Update installed packages with newer versions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:24
+#: share/completions/zypper.fish:50
+#, fuzzy
 msgid "List available updates"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa tillgängliga paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:25
+#: share/completions/zypper.fish:51
+#, fuzzy
 msgid "Install needed patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:26
+#: share/completions/zypper.fish:52
+#, fuzzy
 msgid "List needed patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa byteavstånd för matchningar"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:27
+#: share/completions/zypper.fish:53
+#, fuzzy
 msgid "Perform a distribution upgrade"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Utför en simulering"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:28
+#: share/completions/zypper.fish:54
+#, fuzzy
 msgid "Check for patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Dekomprimera fixar"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:29
+#: share/completions/zypper.fish:55
+#, fuzzy
 msgid "Search for packages matching a pattern"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:30
+#: share/completions/zypper.fish:56
+#, fuzzy
 msgid "Show full information for specified packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa fulla versioner för paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:31
+#: share/completions/zypper.fish:57
+#, fuzzy
 msgid "Show full information for specified patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:32
+#: share/completions/zypper.fish:58
+#, fuzzy
 msgid "Show full information for specified patterns"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa inte filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:33
+#: share/completions/zypper.fish:59
+#, fuzzy
 msgid "Show full information for specified products"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:34
+#: share/completions/zypper.fish:60
+#, fuzzy
 msgid "List all available patches"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:35
+#: share/completions/zypper.fish:61
+#, fuzzy
 msgid "List all available packages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Ominstallera paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:36
+#: share/completions/zypper.fish:62
+#, fuzzy
 msgid "List all available patterns"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:37
+#: share/completions/zypper.fish:63
+#, fuzzy
 msgid "List all available products"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:38
+#: share/completions/zypper.fish:64
+#, fuzzy
 msgid "List packages providing specified capability"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Fråga alla paket som tillhandahåller den angivna förmågan"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:39
+#: share/completions/zypper.fish:65
+#, fuzzy
 msgid "Add a package lock"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bygg om paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:40
+#: share/completions/zypper.fish:66
+#, fuzzy
 msgid "Remove a package lock"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:41
+#: share/completions/zypper.fish:67
+#, fuzzy
 msgid "List current package locks"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Lista buggar från paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:42
+#: share/completions/zypper.fish:68
+#, fuzzy
 msgid "Remove unused locks"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Radera källkodpaket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:43
+#: share/completions/zypper.fish:69
 msgid "Compare two version strings"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:44
+#: share/completions/zypper.fish:70
+#, fuzzy
 msgid "Print the target operating system ID string"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa operativsystem"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:45
+#: share/completions/zypper.fish:71
 msgid "Print report about licenses and EULAs of installed packages"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:46
+#: share/completions/zypper.fish:72
+#, fuzzy
 msgid "Download source rpms for all installed packages to a local directory"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:48
 msgid "Output the version number"
@@ -61324,6 +59115,7 @@ msgid "Menu based cd command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/contains_seq.fish:1
+#: share/functions/contains_seq.fish:1
 msgid "Return true if array contains a sequence"
 msgstr ""
 
@@ -61331,9 +59123,9 @@ msgstr ""
 msgid "Print the current directory history (the prev and next lists)"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/dirs.fish:1
+#: share/functions/dirs.fish:1
 msgid "Print directory stack"
-msgstr ""
+msgstr "Visa katalogstack"
 
 #: /tmp/fish/implicit/share/functions/down-or-search.fish:1
 msgid ""
@@ -61345,9 +59137,14 @@ msgstr ""
 msgid "Edit the command buffer in an external editor"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/_.fish:1
+#: /tmp/fish/implicit/share/functions/_.fish:1 share/functions/_.fish:8
+#: share/functions/_.fish:12
+#, fuzzy
 msgid "Alias for the gettext command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Hjälp för det angivna kommandot"
 
 #: /tmp/fish/implicit/share/functions/_.fish:2
 msgid "Fallback alias for the gettext command"
@@ -61362,136 +59159,43 @@ msgid "Return 0 if the current token has an open single-quote"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
+#: share/functions/__fish_complete_atool_archive_contents.fish:1
+#, fuzzy
 msgid "List archive contents"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa arkivinnehåll"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:1
-msgid "Maximum uploads at once"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:2
-msgid "Number of seconds between keepalives"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:3
-msgid "Bytes per request"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:4
-msgid "Requests per pipe"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:5
-msgid "Maximum length prefix encoding"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:6
+#: share/functions/__fish_complete_bittorrent.fish:9
 msgid "IP to report to the tracker"
-msgstr ""
+msgstr "IP adress att rapportera till tracker"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:7
+#: share/functions/__fish_complete_bittorrent.fish:10
 msgid "Minimum port to listen to"
-msgstr ""
+msgstr "Lägsta portnummer att lyssna på"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:8
+#: share/functions/__fish_complete_bittorrent.fish:11
 msgid "Maximum port to listen to"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:9
-msgid "File for server response"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:10
-msgid "URL to get file from"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:11
-msgid "Local file target"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:12
-msgid "Time to close inactive socket"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:13
-msgid "Time between checking timeouts"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:14
-msgid "Maximum outgoing slice length"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:15
-msgid "Maximum time to guess rate"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:16
-msgid "IP to bind to locally"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:17
-msgid "Time between screen updates"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:18
-msgid "Time to wait between requesting more peers"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:19
-msgid "Minimum number of peers to not do requesting"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:20
-msgid "Number of seconds before assuming http timeout"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:21
-msgid "Number of peers at which to stop initiating new connections"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:22
-msgid "Maximum number of connections to allow"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:23
-msgid "Whether to check hashes on disk"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:24
-msgid "Maximum kB/s to upload at"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:25
-msgid "Seconds to wait for data to come in before assuming choking"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:26
-msgid "Whether to display diagnostic info"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:27
-msgid "Number of downloads at which to switch from random to rarest first"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:28
-msgid "Number of uploads to fill out to with optimistic unchokes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_complete_bittorrent.fish:29
-msgid "Whether to inform the user that hash failures occur"
-msgstr ""
+msgstr "Högsta portnummer att lyssna på"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_cd.fish:1
 msgid "Completions for the cd command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_command.fish:1
+#: share/functions/__fish_complete_command.fish:1
 msgid "Complete using all available commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_convert_options.fish:1
+#: share/functions/__fish_complete_convert_options.fish:1
+#, fuzzy
 msgid "Complete Convert options"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
 msgid "Complete directory prefixes"
@@ -61550,6 +59254,7 @@ msgid "Enable debugging"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_groups.fish:1
+#: share/functions/__fish_complete_groups.fish:2
 msgid "Print a list of local groups, with group members as the description"
 msgstr ""
 
@@ -61630,12 +59335,22 @@ msgid "Set the page margins when printing text files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr_option.fish:1
+#: share/functions/__fish_complete_lpr_option.fish:1
+#, fuzzy
 msgid "Complete lpr option"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_path.fish:1
+#: share/functions/__fish_complete_path.fish:1
+#, fuzzy
 msgid "Complete using path"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:1
 msgid "Complete pgrep/pkill"
@@ -61702,48 +59417,64 @@ msgid "Print a list of process identifiers along with brief descriptions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ppp_peer.fish:1
+#: share/functions/__fish_complete_ppp_peer.fish:1
 msgid "Complete isp name for pon/poff"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_proc.fish:1
+#: share/functions/__fish_complete_proc.fish:1
+#, fuzzy
 msgid "Complete by list of running processes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa lista på alla körande screen-sessioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:2
+#: share/functions/__fish_complete_ssh.fish:4
+#, fuzzy
 msgid "Protocol version 1 only"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bara protokoll version 1"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:3
+#: share/functions/__fish_complete_ssh.fish:5
+#, fuzzy
 msgid "Protocol version 2 only"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Bara protokoll version 2"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:4
+#: share/functions/__fish_complete_ssh.fish:6
 msgid "IPv4 addresses only"
-msgstr ""
+msgstr "Bara IPv4-adresser"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:5
+#: share/functions/__fish_complete_ssh.fish:7
 msgid "IPv6 addresses only"
-msgstr ""
+msgstr "Bara IPv6-adresser"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:6
+#: share/functions/__fish_complete_ssh.fish:8
 msgid "Compress all data"
-msgstr ""
+msgstr "Komprimera all data"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:7
+#: share/functions/__fish_complete_ssh.fish:9
 msgid "Encryption algorithm"
-msgstr ""
+msgstr "Krypteringsalgoritm"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:9
+#: share/functions/__fish_complete_ssh.fish:11
 msgid "Identity file"
-msgstr ""
+msgstr "Identitetsfil"
 
-#: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:10
+#: share/functions/__fish_complete_ssh.fish:12
 msgid "Options"
-msgstr ""
+msgstr "Flaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_subcommand.fish:1
 msgid "Complete subcommand"
@@ -61758,6 +59489,7 @@ msgid "Print list host-names with user@"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_users.fish:1
+#: share/functions/__fish_complete_users.fish:2
 msgid "Print a list of local users, with the real user name as a description"
 msgstr ""
 
@@ -61784,6 +59516,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_config.fish:1
+#: share/functions/fish_config.fish:1
 msgid "Launch fish's web based configuration"
 msgstr ""
 
@@ -61791,33 +59524,38 @@ msgstr ""
 msgid "Initializations that should be performed when entering interactive mode"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:2
+#: share/functions/__fish_config_interactive.fish:130
 msgid "Event handler, repaints the prompt when fish_color_cwd changes"
-msgstr ""
+msgstr "Händelsehanterare, ritar om prompten när fish_color_cwd ändras"
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:3
+#: share/functions/__fish_config_interactive.fish:137
+#, fuzzy
 msgid "Event handler, repaints the prompt when fish_color_cwd_root changes"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Händelsehanterare, ritar om prompten när fish_color_cwd ändras"
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:4
+#: share/functions/__fish_config_interactive.fish:149
 msgid "Start service"
-msgstr ""
+msgstr "Starta tjänst"
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:5
+#: share/functions/__fish_config_interactive.fish:150
 msgid "Stop service"
-msgstr ""
+msgstr "Stanna tjänst"
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:6
+#: share/functions/__fish_config_interactive.fish:151
 msgid "Print service status"
-msgstr ""
+msgstr "Visa status för tjänst"
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:7
+#: share/functions/__fish_config_interactive.fish:152
 msgid "Stop and then start service"
-msgstr ""
+msgstr "Stanna och starta tjänst"
 
-#: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:8
+#: share/functions/__fish_config_interactive.fish:153
 msgid "Reload service configuration"
-msgstr ""
+msgstr "Ladda om konfiguration för tjänst"
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:9
 msgid "Reload key bindings when binding variable change"
@@ -61859,14 +59597,6 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:1
-msgid "Helper function for fish_git_prompt"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:2
-msgid "Prompt function for Git"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
@@ -61891,18 +59621,6 @@ msgstr ""
 msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:8
-msgid "Event handler, repaints prompt when functionality changes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:9
-msgid "Event handler, repaints prompt when any color changes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:10
-msgid "Event handler, repaints prompt when any char changes"
-msgstr ""
-
 #: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1
 msgid ""
 "Wrapper for the complete built-in. Skips the long completions on non-GNU "
@@ -61910,8 +59628,13 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_hg_prompt.fish:1
+#: share/functions/__fish_hg_prompt.fish:23
+#, fuzzy
 msgid "Write out the hg prompt"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv prompten"
 
 #: /tmp/fish/implicit/share/functions/fish_hybrid_key_bindings.fish:1
 msgid "Vi-style bindings that inherit emacs-style bindings in all modes"
@@ -61926,6 +59649,7 @@ msgid "Check if the current directory is a git repository"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_is_token_n.fish:1
+#: share/functions/__fish_is_token_n.fish:1
 msgid "Test if current token is on Nth place"
 msgstr ""
 
@@ -61942,6 +59666,7 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:1
+#: share/functions/__fish_make_completion_signals.fish:1
 msgid "Make list of kill signals for completion"
 msgstr ""
 
@@ -61950,12 +59675,21 @@ msgid "List names of available signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:3
+#, fuzzy
 msgid "List codes and names of available signals"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/functions/fish_mode_prompt.fish:1
+#: share/functions/fish_vi_prompt.fish:1
+#, fuzzy
 msgid "Displays the current mode"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa säkerhetskontext"
 
 #: /tmp/fish/implicit/share/functions/__fish_move_last.fish:1
 msgid "Move the last element of a directory history from src to dest"
@@ -61974,12 +59708,22 @@ msgid "Paginate the current command using the users default pager"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
+#: share/functions/__fish_print_addresses.fish:1
+#, fuzzy
 msgid "Print a list of known network addresses"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa lista på alla körande screen-sessioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
+#: share/functions/__fish_print_commands.fish:1
+#, fuzzy
 msgid "Print a list of documented fish commands"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
@@ -61993,29 +59737,50 @@ msgstr ""
 msgid "Print a list of local groups"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/__fish_print_help.fish:1
+#: share/functions/__fish_print_help.fish:1
 msgid "Print help message for the specified fish function or builtin"
 msgstr ""
+"Visa hjälpmeddelande för specificerad fish-funktion eller inbyggt kommando"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_hostnames.fish:1
 msgid "Print a list of known hostnames"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_interfaces.fish:1
+#: share/functions/__fish_print_interfaces.fish:1
+#, fuzzy
 msgid "Print a list of known network interfaces"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_options.fish:1
+#: share/functions/__fish_print_lpr_options.fish:1
+#, fuzzy
 msgid "Print lpr options"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla versioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
+#: share/functions/__fish_print_lpr_printers.fish:1
+#, fuzzy
 msgid "Print lpr printers"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa fulla poster"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
+#: share/functions/__fish_print_mounted.fish:1
+#, fuzzy
 msgid "Print mounted devices"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa viktiga beroenden"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_pacman_repos.fish:1
 msgid "Print the repositories configured for arch's pacman package manager"
@@ -62026,37 +59791,62 @@ msgid "All services known to the system"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_svn_rev.fish:1
+#: share/functions/__fish_print_svn_rev.fish:1
+#, fuzzy
 msgid "Print svn revisions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv bara ut angiven revision"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_users.fish:1
+#: share/functions/__fish_print_users.fish:2
+#, fuzzy
 msgid "Print a list of local users"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_applications_directories.fish:1
 msgid "Print directories where desktop files are stored"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
+#: share/functions/__fish_print_xdg_mimetypes.fish:1
+#, fuzzy
 msgid "Print XDG mime types"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv ut kommandotyp"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
+#: share/functions/__fish_print_xwindows.fish:1
+#, fuzzy
 msgid "Print X windows"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa APM-information"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/fish_prompt.fish:1
+#: share/functions/fish_prompt.fish:5
 msgid "Write out the prompt"
-msgstr ""
+msgstr "Skriv prompten"
 
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
+#: share/functions/__fish_pwd.fish:3 share/functions/__fish_pwd.fish:7
+#, fuzzy
 msgid "Show current path"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla källkodspaket"
 
 #: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
 msgid "Call grep without honoring GREP_OPTIONS settings"
@@ -62087,8 +59877,13 @@ msgid "Comment/uncomment the current command"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
+#: share/functions/fish_update_completions.fish:1
+#, fuzzy
 msgid "Update man-page based completions"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Redigera kommando-specifika kompletteringar"
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
 msgid "Test if a non-switch argument has been given in the current commandline"
@@ -62103,20 +59898,31 @@ msgid "Set cursor shape for different vi modes"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_vi_key_bindings.fish:1
+#: share/functions/fish_vi_key_bindings.fish:1
+#, fuzzy
 msgid "vi-like key bindings for fish"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Välj fil med tangentbordsgenvägar"
 
 #: /tmp/fish/implicit/share/functions/funced.fish:1
+#: share/functions/funced.fish:1
+#, fuzzy
 msgid "Edit function definition"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"funktionsdefinition-block"
 
 #: /tmp/fish/implicit/share/functions/funcsave.fish:1
+#: share/functions/funcsave.fish:2
 msgid "Save the current definition of all specified functions to file"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/help.fish:1
+#: share/functions/help.fish:1
 msgid "Show help for the fish shell"
-msgstr ""
+msgstr "Visa hjälp för fish-skalet"
 
 #: /tmp/fish/implicit/share/functions/history.fish:1
 msgid "display or manipulate interactive command history"
@@ -62130,59 +59936,68 @@ msgstr ""
 msgid "Tests if a file descriptor is a tty"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/la.fish:1
+#: share/functions/la.fish:4
 msgid ""
 "List contents of directory, including hidden files in directory using long "
 "format"
-msgstr ""
+msgstr "Visa kataloginnehåll, inklusive dolda filer i långt format"
 
-#: /tmp/fish/implicit/share/functions/ll.fish:1
+#: share/functions/ll.fish:4
 msgid "List contents of directory using long format"
-msgstr ""
+msgstr "Visa kataloginnehåll i långt format"
 
-#: /tmp/fish/implicit/share/functions/ls.fish:1
-#: /tmp/fish/implicit/share/functions/ls.fish:2
-#: /tmp/fish/implicit/share/functions/ls.fish:3
+#: share/functions/ls.fish:7 share/functions/ls.fish:32
 msgid "List contents of directory"
-msgstr ""
+msgstr "Visa kataloginnehåll"
 
-#: /tmp/fish/implicit/share/functions/man.fish:1
+#: /tmp/fish/implicit/share/functions/man.fish:1 share/functions/man.fish:1
+#, fuzzy
 msgid "Format and display the on-line manual pages"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa ändringsinformation för paket"
 
-#: /tmp/fish/implicit/share/functions/nextd.fish:1
+#: share/functions/nextd.fish:2
 msgid "Move forward in the directory history"
-msgstr ""
+msgstr "Gå frammåt i kataloghistorik"
 
-#: /tmp/fish/implicit/share/functions/N_.fish:1
+#: /tmp/fish/implicit/share/functions/N_.fish:1 share/functions/N_.fish:3
 msgid "No-op"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/open.fish:1
+#: share/functions/open.fish:8
 msgid "Open file in default application"
-msgstr ""
+msgstr "Öppna fil i standardprogram"
 
 #: /tmp/fish/implicit/share/functions/popd.fish:1
 msgid "Pop directory from the stack and cd to it"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/prevd.fish:1
+#: share/functions/prevd.fish:2
 msgid "Move back in the directory history"
-msgstr ""
+msgstr "Gå bakåt i kataloghistorik"
 
 #: /tmp/fish/implicit/share/functions/prompt_pwd.fish:1
+#: share/functions/prompt_pwd.fish:11
+#, fuzzy
 msgid "Print the current working directory, shortened to fit the prompt"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa aktuell arbetskatalog, förkortad till att passa i kommandoraden"
 
-#: /tmp/fish/implicit/share/functions/psub.fish:1
+#: share/functions/psub.fish:3
 msgid ""
 "Read from stdin into a file and output the filename. Remove the file when "
 "the command that called psub exits."
 msgstr ""
+"Läs från standard in och skriv till fil. Skriv filnamnet på standard ut. "
+"Radera filen när det anropande programmet avslutar."
 
-#: /tmp/fish/implicit/share/functions/pushd.fish:1
+#: share/functions/pushd.fish:3
 msgid "Push directory to stack"
-msgstr ""
+msgstr "Lägg till katalog till stack"
 
 #: /tmp/fish/implicit/share/functions/realpath.fish:1
 msgid "print the resolved path [command realpath]"
@@ -62196,13 +60011,21 @@ msgstr ""
 msgid "return an absolute path without symlinks"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/seq.fish:1
+#: /tmp/fish/implicit/share/functions/seq.fish:1 share/functions/seq.fish:7
+#, fuzzy
 msgid "Print sequences of numbers"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa namn, inte nummer"
 
-#: /tmp/fish/implicit/share/functions/seq.fish:2
+#: /tmp/fish/implicit/share/functions/seq.fish:2 share/functions/seq.fish:11
+#, fuzzy
 msgid "Fallback implementation of the seq command"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Visa alla möjliga kompletteringar för det angivna commandot"
 
 #: /tmp/fish/implicit/share/functions/setenv.fish:1
 msgid "Set an env var for csh compatibility."
@@ -62213,20 +60036,25 @@ msgid "Suspend the current shell."
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__terlar_git_prompt.fish:1
+#: share/functions/__terlar_git_prompt.fish:23
+#, fuzzy
 msgid "Write out the git prompt"
 msgstr ""
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
+"Skriv prompten"
 
 #: /tmp/fish/implicit/share/functions/trap.fish:1
 msgid "Perform an action when the shell receives a signal"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/type.fish:1
+#: share/functions/type.fish:2
 msgid "Print the type of a command"
-msgstr ""
+msgstr "Visa typ av kommando"
 
-#: /tmp/fish/implicit/share/functions/umask.fish:1
+#: share/functions/umask.fish:137
 msgid "Set default file permission mask"
-msgstr ""
+msgstr "Välj standardfilrättighetsmask"
 
 #: /tmp/fish/implicit/share/functions/up-or-search.fish:1
 msgid ""
@@ -62234,6 +60062,6514 @@ msgid ""
 "move up one line"
 msgstr ""
 
-#: /tmp/fish/implicit/share/functions/vared.fish:1
+#: share/functions/vared.fish:6
 msgid "Edit variable value"
+msgstr "Redigera variabelvärde"
+
+#: autoload.cpp:113
+#, c-format
+msgid "Could not autoload item '%ls', it is already being autoloaded. "
 msgstr ""
+"Kunde inte automatiskt ladda elementet '%ls', det laddas automatiskt redan. "
+
+#: builtin.cpp:2070
+#, c-format
+msgid "%ls: Unknown signal '%ls'\n"
+msgstr "%ls: Okänd signal '%ls'\n"
+
+#: builtin.cpp:2085 builtin.cpp:2195 builtin.cpp:2263
+#, c-format
+msgid "%ls: Invalid variable name '%ls'\n"
+msgstr "%ls: Ogiltigt variabelnamn '%ls'\n"
+
+#: builtin.cpp:2138
+#, c-format
+msgid "%ls: Cannot find calling job for event handler\n"
+msgstr "%ls: Kan inte hitta anropande job för händelsehanterare\n"
+
+#: builtin.cpp:2156
+#, c-format
+msgid "%ls: Invalid process id %ls\n"
+msgstr "%ls: Ogiltigt processid %ls\n"
+
+#: builtin.cpp:2223
+#, c-format
+msgid "%ls: Expected function name\n"
+msgstr "%ls: Förväntade ett funktionsnamn\n"
+
+#: builtin.cpp:2240
+#, c-format
+msgid ""
+"%ls: The name '%ls' is reserved,\n"
+"and can not be used as a function name\n"
+msgstr ""
+"%ls: Namnet '%ls' är reserverat,\n"
+"och kan inte användas som funktionsnamn\n"
+
+#: builtin.cpp:2248
+#, fuzzy, c-format
+msgid "%ls: No function name given\n"
+msgstr "%ls: Inget funktionsnamn givet\n"
+
+#: builtin.cpp:2276
+#, c-format
+msgid "%ls: Expected one argument, got %d\n"
+msgstr "%ls: Förväntade ett argument, fick %d\n"
+
+#: builtin.cpp:2412
+#, c-format
+msgid "%ls: Seed value '%ls' is not a valid number\n"
+msgstr "%ls: Slumpfröet '%ls' är inte ett giltigt nummer\n"
+
+#: builtin.cpp:2426
+#, c-format
+msgid "%ls: Expected zero or one argument, got %d\n"
+msgstr "%ls: Förväntade noll eller ett argument, fick %d\n"
+
+#: builtin.cpp:2656
+#, fuzzy, c-format
+msgid "%ls: --array option requires a single variable name.\n"
+msgstr "%ls: --array flaggan kräver ett enskilt variablenamn.\n"
+
+#: builtin.cpp:3688
+msgid "(default)"
+msgstr "(standard)"
+
+#: builtin.cpp:4070
+msgid "Try out the new parser"
+msgstr "Testa den nya parsern"
+
+#: builtin_commandline.cpp:466
+#, c-format
+msgid "%ls: Unknown input function '%ls'\n"
+msgstr "%ls: Okänd inläsnings-funktion '%ls'\n"
+
+#: builtin_printf.cpp:175
+#, c-format
+msgid ""
+"warning: %ls: character(s) following character constant have been ignored"
+msgstr "varning: %ls: tecken(s) efterföljande teckenskonstant ignorerades"
+
+#: builtin_printf.cpp:771
+msgid "printf: not enough arguments"
+msgstr "printf: inte tillräckligt med argument"
+
+#: builtin_set.cpp:221
+#, c-format
+msgid "%ls: Multiple variable names specified in single call (%ls and %.*ls)\n"
+msgstr "%ls: Flera variabelnamn angivna i ett anrop (%ls och %.*ls)\n"
+
+#: builtin_set.cpp:791
+#, c-format
+msgid "%ls: Values cannot be specfied with erase\n"
+msgstr "%ls: Värden kan inte anges vid radering\n"
+
+#: builtin_set.cpp:817
+#, c-format
+msgid ""
+"%ls: Warning: universal scope selected, but a global variable '%ls' exists.\n"
+msgstr ""
+"Varning: universellt definitionsområde valt, men global variable "
+"'%ls'existerar readn.\n"
+
+#: builtin_set_color.cpp:173
+#, fuzzy, c-format
+msgid "%ls: Could not set up terminal\n"
+msgstr "%ls: Kunde inte initiera terminalen\n"
+
+#: complete.cpp:901 complete.cpp:919
+msgid "Unknown option: "
+msgstr "Okänd flagga: "
+
+#: complete.cpp:923
+msgid "Multiple matches for option: "
+msgstr "Mer än en flagga matchar: "
+
+#: env.cpp:315
+msgid "Changing language to English"
+msgstr "Byter språk till svenska"
+
+#: env_universal_common.cpp:617 path.cpp:279
+msgid ""
+"Unable to create a configuration directory for fish. Your personal settings "
+"will not be saved. Please set the $XDG_CONFIG_HOME variable to a directory "
+"where the current user has write access."
+msgstr ""
+"Kunde inte skapa en konfigurationskatalog för fish. Dina personliga "
+"inställningar kommer inte sparas. Var vänlig sätt variabeln $XDH_CONFIG_HOME "
+"till en katalog där den nuvarande användaren har skrivrättigheter."
+
+#: fish.cpp:330
+msgid ""
+"Old versions of fish appear to be running. You will not be able to share "
+"variable values between old and new fish sessions. For best results, restart "
+"all running instances of fish."
+msgstr ""
+"Gammal version av fish verkar köra. Du kommer inte kunna dela variabler "
+"mellanden gammla och den nya fish sessionen. För bästa resultat, starta om "
+"allakörande instanser av fish."
+
+#: fish.cpp:420
+#, c-format
+msgid "Invalid value '%s' for debug level switch"
+msgstr "Ogiltigt värde '%s' för debugnivåflagga"
+
+#: input.cpp:483 input.cpp:493
+msgid "Could not set up terminal"
+msgstr "Kunde inte initiera terminalen"
+
+#: input.cpp:486
+#, c-format
+msgid "Check that your terminal type, '%ls', is supported on this system"
+msgstr "Säkerställa att din terminaltyp, '%ls', stöds av det här systemet"
+
+#: input.cpp:488
+#, c-format
+msgid "Attempting to use '%ls' instead"
+msgstr "Försöker använda '%ls' istället"
+
+#: input.cpp:535
+msgid "Error while closing terminfo"
+msgstr "Ett fel inträffade medan terminfo stängdes"
+
+#: io.cpp:112
+#, c-format
+msgid ""
+"An error occured while reading output from code block on file descriptor %d"
+msgstr ""
+"Ett fel inträffade under inläsning av utdata från kodblock på "
+"filidentifierare %d"
+
+#: mimedb.cpp:174 mimedb.cpp:188 mimedb.cpp:1179
+#, c-format
+msgid "%s: Out of memory\n"
+msgstr "%s: Slut på minne\n"
+
+#: mimedb.cpp:463
+#, c-format
+msgid "%s: Unknown error in munge()\n"
+msgstr "%s: Okänt fel i munge()\n"
+
+#: mimedb.cpp:481
+#, c-format
+msgid "%s: Locale string too long\n"
+msgstr "%s: Lokalsträng för lång\n"
+
+#: mimedb.cpp:551 mimedb.cpp:559
+#, c-format
+msgid "%s: Could not compile regular expressions %s with error %s\n"
+msgstr "%s: Kunde inte kompilera reguljärt uttryck %s med fel %s\n"
+
+#: mimedb.cpp:676
+#, c-format
+msgid "%s: No description for type %s\n"
+msgstr "%s: Beskrivning saknas för typ %s\n"
+
+#: mimedb.cpp:744
+#, c-format
+msgid "%s: Could not parse launcher string '%s'\n"
+msgstr "%s: Kunde inte tolka körsträng '%ls'\n"
+
+#: mimedb.cpp:780
+#, c-format
+msgid "%s: Default launcher '%s' does not specify how to start\n"
+msgstr "%s: Standardkörsträng '%s' anger inte hur programmet ska startas\n"
+
+#: mimedb.cpp:1158
+#, c-format
+msgid "%s: Unsupported switch '%c' in launch string '%s'\n"
+msgstr "%s: Flaggan '%c' i körsträng '%s' stöds inte\n"
+
+#: mimedb.cpp:1354
+#, c-format
+msgid "%s: Can not launch a mimetype\n"
+msgstr "%s: Kan inte köra en mimetyp\n"
+
+#: mimedb.cpp:1382
+#, c-format
+msgid "%s: Could not parse mimetype from argument '%s'\n"
+msgstr "%s: Kunde inte tolka mimetyp från argument '%s'\n"
+
+#: pager.cpp:562
+#, c-format
+msgid "%lsand 1 more row"
+msgstr "%lsoch 1 rad till"
+
+#: parse_execution.cpp:799
+#, fuzzy, c-format
+msgid ""
+"Unknown command '%ls'. Did you mean to run %ls with a modified environment? "
+"Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing "
+"'help set'."
+msgstr ""
+"Okänt kommando '%ls'. Menade du 'set %ls %ls'? För mer information om hur "
+"man tilldelar variabler, se hjälpsektionen om det inbyggda kommandot 'set' "
+"genom att skriva 'help set'."
+
+#: parse_execution.cpp:824
+#, fuzzy, c-format
+msgid ""
+"Variables may not be used as commands. Instead, define a function like "
+"'function %ls; %ls $argv; end' or use the eval builtin instead, like 'eval "
+"%ls'. See the help section for the function command by typing 'help "
+"function'."
+msgstr ""
+"Variabler får inte användas som kommandon. Definera istället en funktion, t."
+"ex. 'function %ls; %ls $argv; end'. Se hjälpsektionen för function-kommandot "
+"genom att skriva 'help function'"
+
+#: parse_execution.cpp:833
+#, fuzzy, c-format
+msgid ""
+"Variables may not be used as commands. Instead, define a function or use the "
+"eval builtin instead, like 'eval %ls'. See the help section for the function "
+"command by typing 'help function'."
+msgstr ""
+"Variabler får inte användas som kommandon. Definera istället en funktion. Se "
+"hjälpsektionen för function-kommandot genom att skriva 'help function'"
+
+#: parse_execution.cpp:841
+#, c-format
+msgid ""
+"Commands may not contain variables. Use the eval builtin instead, like 'eval "
+"%ls'. See the help section for the eval command by typing 'help eval'."
+msgstr ""
+"Okänt kommando '%ls'. Menade du 'set VARIABEL VÄRDE'? Se hjälpsektionen om "
+"det inbyggda kommandot 'set' genom att skriva 'help set'."
+
+#: parser.cpp:52
+#, c-format
+msgid "Tokenizer error: '%ls'"
+msgstr "Ett fel inträffade vid symboluppdelning: '%ls'"
+
+#: parser.cpp:62
+#, c-format
+msgid "Unexpected token of type '%ls'"
+msgstr "Oväntad symbol av typ '%ls'"
+
+#: parser.cpp:87 parse_constants.h:278
+msgid "function definition block"
+msgstr "funktionsdefinition-block"
+
+#: parser.cpp:107 parse_constants.h:301
+msgid "unexecutable block"
+msgstr "oexekverbart block"
+
+#: parser.cpp:956
+msgid "End of block mismatch. Program terminating."
+msgstr "Blockslut matchar inte. Programmet avslutas."
+
+#: proc.cpp:690
+#, fuzzy, c-format
+msgid "'%ls' has %ls"
+msgstr "Jobb %d, '%ls' har %ls"
+
+#: proc.cpp:694
+#, c-format
+msgid "Job %d, '%ls' has %ls"
+msgstr "Jobb %d, '%ls' har %ls"
+
+#: proc.cpp:828
+msgid "ended"
+msgstr "avslutat"
+
+#: proc.cpp:1354 proc.cpp:1380
+msgid "Process list pointer"
+msgstr "Processlistepekare"
+
+#: reader.cpp:2105
+msgid "Couldn't put the shell in its own process group"
+msgstr "Kunde inte skicka skalet till sin egen processgrupp"
+
+#: reader.cpp:2115
+msgid "Couldn't grab control of terminal"
+msgstr "Kunde inte ta kontroll över terminalen"
+
+#: reader.cpp:2882
+msgid ""
+"There are stopped jobs. A second attempt to exit will enforce their "
+"termination.\n"
+msgstr ""
+
+#: tokenizer.cpp:65
+msgid "Tokenizer not yet initialized"
+msgstr "Symbolavdelaren inte initierad"
+
+#: tokenizer.cpp:66
+msgid "Tokenizer error"
+msgstr "Symbolavdelarfel"
+
+#: tokenizer.cpp:67
+msgid "String"
+msgstr "Textsträng"
+
+#: tokenizer.cpp:68
+msgid "Pipe"
+msgstr "Rör"
+
+#: tokenizer.cpp:69
+msgid "End of command"
+msgstr "Slut av kommando"
+
+#: tokenizer.cpp:70
+msgid "Redirect output to file"
+msgstr "IO dirigering av utdata till fil"
+
+#: tokenizer.cpp:71
+msgid "Append output to file"
+msgstr "IO dirigering av utdata till slutet av fil"
+
+#: tokenizer.cpp:72
+msgid "Redirect input to file"
+msgstr "IO dirigering av indata till fil"
+
+#: tokenizer.cpp:73
+msgid "Redirect to file descriptor"
+msgstr "IO dirigering till filidentifierare"
+
+#: tokenizer.cpp:74
+msgid "Redirect output to file if file does not exist"
+msgstr "IO dirigering av utdata till fil om filen inte existerar"
+
+#: tokenizer.cpp:75
+msgid "Run job in background"
+msgstr "Kör jobb i bakgrunden"
+
+#: tokenizer.cpp:76
+msgid "Comment"
+msgstr "Kommentar"
+
+#: tokenizer.cpp:561
+msgid "Invalid token type"
+msgstr "Ogiltig symboltyp"
+
+#: wgetopt.cpp:636
+#, c-format
+msgid "%ls: Illegal option -- %lc\n"
+msgstr "%ls: Ogiltig flagga -- '%lc'\n"
+
+#: builtin.h:57
+#, c-format
+msgid ""
+"%ls: Invalid character '%lc' in variable name. Only alphanumerical "
+"characters and underscores are valid in a variable name.\n"
+msgstr ""
+"%ls: Ogiltigt tecken '%lc' i variabelnamn. Bara alfanumeriska tecken och "
+"understreck är tillåtna i variabelnamn.\n"
+
+#: builtin.h:62
+#, c-format
+msgid "%ls: Variable name can not be the empty string\n"
+msgstr "%ls: Den tomma strängen är inte ett tillåtet variabelnamn\n"
+
+#: builtin.h:67
+#, c-format
+msgid "%ls: Second argument must be 'in'\n"
+msgstr "%ls: Andra argumentet måste vara 'in'\n"
+
+#: builtin.h:72
+#, c-format
+msgid "%ls: Expected at least two arguments, got %d\n"
+msgstr "%ls: Förväntade minst två argument, fick %d\n"
+
+#: builtin.h:74
+#, c-format
+msgid "%ls: '%ls' is not a valid variable name\n"
+msgstr "%ls: '%ls' är ett ogiltigt variabelnamn\n"
+
+#: builtin.h:77
+#, c-format
+msgid "%ls: can only take 'if' and then another command as an argument\n"
+msgstr ""
+
+#: builtin.h:78
+#, fuzzy, c-format
+msgid "%ls: any second argument must be 'if'\n"
+msgstr "%ls: Andra argumentet måste vara 'in'\n"
+
+#: builtin.h:88
+#, c-format
+msgid "%ls: Block mismatch: '%ls' vs. '%ls'\n"
+msgstr "%ls: Blockmismatchning: '%ls' mot '%ls'\n"
+
+#: builtin.h:93
+#, c-format
+msgid "%ls: Unknown block type '%ls'\n"
+msgstr "%ls: Okänd blocktyp '%ls'\n"
+
+#: expand.h:135
+msgid "Array index out of bounds"
+msgstr "Arrayindexet är otållåtet"
+
+#: parse_constants.h:192
+#, fuzzy
+msgid ""
+"Expected a command, but instead found a pipe. Did you mean 'COMMAND; or "
+"COMMAND'? See the help section for the 'or' builtin command by typing 'help "
+"or'."
+msgstr ""
+"Förväntade att hitta ett kommandonamn, hittade en symbol av typen '%ls'. "
+"Menade du 'KOMMANDO; or KOMMANDO'? Se hjälpsektionen om 'or' genom att "
+"skriva 'help or'."
+
+#: parse_constants.h:195
+#, fuzzy
+msgid ""
+"Expected a command, but instead found an '&'. Did you mean 'COMMAND; and "
+"COMMAND'? See the help section for the 'and' builtin command by typing 'help "
+"and'."
+msgstr ""
+"Förväntade att hitta ett kommandonamn, hittade en symbol av typen '%ls'. "
+"Menade du 'KOMMANDO; and KOMMANDO'? Se hjälpsektionen om 'and' genom att "
+"skriva 'help and'."
+
+#: parse_constants.h:216
+#, fuzzy
+msgid "break command while not inside of loop"
+msgstr "Loopstyrningskommandon får bara användas i loopar."
+
+#: parse_constants.h:219
+#, fuzzy
+msgid "continue command while not inside of loop"
+msgstr "Loopstyrningskommandon får bara användas i loopar."
+
+#: parse_constants.h:222
+msgid "'return' builtin command outside of function definition"
+msgstr ""
+"Det inbyggda kommandot 'return' påträffades utanför en funktionsdefinition"
+
+#: parse_constants.h:225
+#, fuzzy, c-format
+msgid ""
+"Unknown command '%ls'. Did you mean 'set %ls %ls'? See the help section on "
+"the set command by typing 'help set'."
+msgstr ""
+"Okänt kommando '%ls'. Menade du 'set %ls %ls'? För mer information om hur "
+"man tilldelar variabler, se hjälpsektionen om det inbyggda kommandot 'set' "
+"genom att skriva 'help set'."
+
+#: parse_constants.h:230
+#, c-format
+msgid ""
+"The '$' character begins a variable name. The character '%lc', which "
+"directly followed a '$', is not allowed as a part of a variable name, and "
+"variable names may not be zero characters long. To learn more about variable "
+"expansion in fish, type 'help expand-variable'."
+msgstr ""
+"Tecknet '$' börjar ett variabelnamn. Tecknet '%lc', som direkt följde ett "
+"'$', är inte tillåtet som del av ett variabelnamn, och variabelnamn får inte "
+"vara noll tecken långa. För mer information om variabelexpansion i fish, "
+"skriv 'help expand-variable'."
+
+#: parse_constants.h:235
+msgid ""
+"$? is not a valid variable in fish. If you want the exit status of the last "
+"command, try $status."
+msgstr ""
+
+#: parse_constants.h:240
+msgid ""
+"The '$' begins a variable name. It was given at the end of an argument. "
+"Variable names may not be zero characters long. To learn more about variable "
+"expansion in fish, type 'help expand-variable'."
+msgstr ""
+"Tecknet '$' börjar ett variabelnamn. Det påträffades som det sista tecknet i "
+"ett argument. Variabelnamn får inte vara noll tecken långa. För mer "
+"information om variabelexpansion i fish, skriv 'help expand-variable'."
+
+#: parse_constants.h:245
+#, c-format
+msgid ""
+"Did you mean %ls{$%ls}%ls? The '$' character begins a variable name. A "
+"bracket, which directly followed a '$', is not allowed as a part of a "
+"variable name, and variable names may not be zero characters long. To learn "
+"more about variable expansion in fish, type 'help expand-variable'."
+msgstr ""
+"Menade du %ls{$%ls}%ls? Tecknet '$' börjar ett variabelnamn. En "
+"klammerparantes, som direkt följde ett '$', är inte tillåtet som del av ett "
+"variabelnamn, och variabelnamn får inte vara noll tecken långa. För mer "
+"information om variabelexpansion i fish, skriv 'help expand-variable'."
+
+#: parse_constants.h:250
+msgid ""
+"Did you mean (COMMAND)? In fish, the '$' character is only used for "
+"accessing variables. To learn more about command substitution in fish, type "
+"'help expand-command-substitution'."
+msgstr ""
+"Menade du (KOMMANDO)? I fish används tecknet '$' bara för att komma åt "
+"variabler. För att lära dig mer om kommandosubstitutionm skriv 'help expand-"
+"command-substitution'."
+
+#: share/completions/aptitude.fish:26
+msgid "Forget all internal information about what packages are \\new"
+msgstr ""
+
+#: share/completions/bundle.fish:93 share/completions/bundle.fish:132
+#, sh-format
+msgid "Open an installed gem in your $EDITOR"
+msgstr ""
+
+#: share/completions/bundle.fish:140
+msgid "Output a specific format (png, jpg, svg, dot, ...)"
+msgstr ""
+
+#: share/completions/cp.fish:20
+msgid "Preserve ATTRIBUTES if possible"
+msgstr ""
+
+#: share/completions/cp.fish:29
+msgid "Set security context of copy to CONTEXT"
+msgstr "Ange säkerhetskontext för kopia"
+
+#: share/completions/cvs.fish:26
+#, fuzzy
+msgid "Use \\tmpdir for temporary files."
+msgstr "Välj temporär katalog"
+
+#: share/completions/cvs.fish:27
+#, fuzzy
+msgid "Use \\editor for editing log information."
+msgstr "Välj editor för loginformationsredigering"
+
+#: share/completions/cvs.fish:28
+#, sh-format
+msgid "Overrides $CVSROOT as the root of the CVS tree."
+msgstr ""
+
+#: share/completions/cvs.fish:30
+#, fuzzy
+msgid "Request compression level \\# for net traffic."
+msgstr "Kompressionsnivå för nätverkstrafik"
+
+#: share/completions/cvs.fish:52
+#, fuzzy
+msgid "Create a CVS repository if it doesn\\t"
+msgstr "Skapa förråd om det inte redan existerar"
+
+#: share/completions/cvs.fish:97
+#, fuzzy
+msgid "Replace revision\\s"
+msgstr "Slå ihop revisioner"
+
+#: share/completions/darcs.fish:44
+msgid ""
+"Apply a patch bundle created by `darcs send\\\n"
+"complete -c darcs -n __fish_use_subcommand -x -a get --description Create"
+msgstr ""
+
+#: share/completions/darcs.fish:171
+#, fuzzy
+msgid "Define token to contain these characters"
+msgstr "Dela inte multibytesekvenser"
+
+#: share/completions/darcs.fish:501
+msgid "Shell command that runs regression tests"
+msgstr ""
+
+#: share/completions/darcs.fish:502
+msgid ""
+"Shell command to run before `darcs dist\\\n"
+"complete -c darcs -n contains"
+msgstr ""
+
+#: share/completions/dcop.fish:34
+msgid "Show help about options"
+msgstr "Visa hjälp om flaggor"
+
+#: share/completions/dcop.fish:35
+msgid "Connect to the given user's DCOP server"
+msgstr "Koppla till den angivna användarens DCOP-server"
+
+#: share/completions/dcop.fish:36
+msgid "Send the same DCOP call to all users with a running DCOP server"
+msgstr ""
+"Skicka samma DCOP-signal till alla användare med en körande DCOP-server"
+
+#: share/completions/dcop.fish:37
+msgid "List all active KDE session for a user or all users"
+msgstr "Visa alla aktiva KDE-sessioner för en användare eller alla användare"
+
+#: share/completions/dcop.fish:38
+msgid "Send to the given KDE session"
+msgstr "Skicka till den angivna KDE-sessionen"
+
+#: share/completions/dcop.fish:39
+msgid "Don't update the user activity timestamp in the called application"
+msgstr ""
+"Uppdatera inte tidsstämpeln för användaraktivitet i det anropade programmet"
+
+#: share/completions/dcop.fish:40
+msgid "Call DCOP for each line read from stdin"
+msgstr "Anropa DCOP för varje rad läst från standard in"
+
+#: share/completions/df.fish:17
+#, fuzzy
+msgid "Show file systems of specified type"
+msgstr "Visa filsystem av angiven typ"
+
+#: share/completions/docker.fish:19
+#, fuzzy
+msgid "Show all containers"
+msgstr "Visa ARP-inlägg"
+
+#: share/completions/docker.fish:24
+#, fuzzy
+msgid "Show the running containers"
+msgstr "Visa dolda funktioner"
+
+#: share/completions/docker.fish:28
+#, fuzzy
+msgid "Show the exited containers"
+msgstr "Visa tid"
+
+#: share/completions/docker.fish:70 share/completions/docker.fish:92
+msgid "Docker container"
+msgstr ""
+
+#: share/completions/docker.fish:82
+msgid "Stopped container"
+msgstr ""
+
+#: share/completions/docker.fish:87
+msgid "Container running"
+msgstr ""
+
+#: share/completions/duply.fish:26
+msgid "Calculate what would be done, but dont perform any actions"
+msgstr ""
+
+#: share/completions/duply.fish:27
+msgid "Dont abort when backup different dirs to the same backend"
+msgstr ""
+
+#: share/completions/gcc.fish:25
+msgid "Set maximum template depth"
+msgstr "Sätt maximalt malldjup"
+
+#: share/completions/gcc.fish:261
+msgid ""
+"Print the full absolute name of the library file library that would be used "
+"when linking---and don\\t"
+msgstr ""
+
+#: share/completions/gem.fish:87
+#, fuzzy
+msgid "display the package version"
+msgstr "Visa paketpost"
+
+#: share/completions/gem.fish:87
+msgid "display the path where gems are installed"
+msgstr ""
+
+#: share/completions/gem.fish:87
+#, fuzzy
+msgid "display path used to search for gems"
+msgstr "Visa sessionsnyckel som används för ett meddelande"
+
+#: share/completions/gem.fish:87
+#, fuzzy
+msgid "display the gem format version"
+msgstr "Visa uppdateringsinformation"
+
+#: share/completions/gem.fish:92
+#, fuzzy
+msgid "list all 'gem' commands"
+msgstr "Inaktivera kommando"
+
+#: share/completions/git.fish:98
+#, fuzzy
+msgid "name"
+msgstr "Användarnamn"
+
+#: share/completions/help.fish:6
+#, fuzzy
+msgid "Help for this command"
+msgstr "Välj promptkommando"
+
+#: share/completions/help.fish:10
+msgid "Incomplete aspects of fish"
+msgstr ""
+
+#: share/completions/help.fish:11
+msgid "Known fish bugs"
+msgstr ""
+
+#: share/completions/help.fish:14
+msgid "Help on how tab-completion works"
+msgstr "Hjälp om hur tabbkomplettering fungerar"
+
+#: share/completions/help.fish:15
+msgid "Help on how job control works"
+msgstr "Hjälp om hur jobbkontroll fungerar"
+
+#: share/completions/help.fish:16
+msgid "Summary on how fish differs from other shells"
+msgstr "Summera hur fish skiljer sig från andra skal"
+
+#: share/completions/help.fish:18
+msgid "Help on how to set the prompt"
+msgstr "Hjälp om hur man ändrar prompten"
+
+#: share/completions/help.fish:19
+msgid "Help on how to set the titlebar message"
+msgstr "Hjälp om hur man ändrar titelradsmeddelandet"
+
+#: share/completions/help.fish:20
+msgid "Help on how to copy and paste"
+msgstr "Hjälp om hur man kopierar och klistrar in"
+
+#: share/completions/help.fish:21
+msgid "Help on editor shortcuts"
+msgstr "Hjälp om tangentbordsgenvägar"
+
+#: share/completions/help.fish:22
+msgid "Help on environment variables"
+msgstr "Hjälp om miljövariabler"
+
+#: share/completions/help.fish:23
+msgid "Help on setting syntax highlighting colors"
+msgstr "Hjälp om syntaxfärgläggningsfärger"
+
+#: share/completions/help.fish:25 share/completions/help.fish:26
+msgid "Help on parameter expansion (Globbing)"
+msgstr "Hjälp om parameterexpansion (Globbing)"
+
+#: share/completions/help.fish:27
+#, sh-format
+msgid "Help on variable expansion $VARNAME"
+msgstr "Hjälp om variabelexpansion $VARIABEL"
+
+#: share/completions/help.fish:28
+msgid "Help on home directory expansion ~USER"
+msgstr "Hjälp om hemkatalogexpansion ~ANVÄNDARE"
+
+#: share/completions/help.fish:29
+msgid "Help on brace expansion {a,b,c}"
+msgstr "Hjälp om klammerparantesexpansion {a,b,c}"
+
+#: share/completions/help.fish:30
+msgid "Help on wildcard expansion *.*"
+msgstr "Hjälp om jokertecken *.*"
+
+#: share/completions/help.fish:31
+msgid "Help on command substitution (SUBCOMMAND)"
+msgstr "Hjälp om kommandosubstitution (UNDERKOMMANDO)"
+
+#: share/completions/help.fish:32
+msgid "Help on process expansion %JOB"
+msgstr "Hjälp om processexpansion %JOB"
+
+#: share/completions/history.fish:1
+msgid "Match history items that start with the given prefix"
+msgstr ""
+
+#: share/completions/history.fish:2
+msgid "Match history items that contain the given string"
+msgstr ""
+
+#: share/completions/obnam.fish:9
+#, fuzzy
+msgid "Adds an encryption key to the repository"
+msgstr "Lägg till fil/katalog till förråd"
+
+#: share/completions/obnam.fish:11
+msgid "Lists the keys associated with each client"
+msgstr ""
+
+#: share/completions/obnam.fish:12
+#, fuzzy
+msgid "Lists the clients in the repository"
+msgstr "Uppdatera förråd"
+
+#: share/completions/obnam.fish:13
+#, fuzzy
+msgid "Compares two generations"
+msgstr "Tolerera slarviga monteringsflaggor"
+
+#: share/completions/obnam.fish:14
+#, fuzzy
+msgid "Dumps the repository"
+msgstr "Uppdatera förråd"
+
+#: share/completions/obnam.fish:15
+#, fuzzy
+msgid "Removes a lock file for a client"
+msgstr "Ta bort alla gz-filer från cache"
+
+#: share/completions/obnam.fish:16
+#, fuzzy
+msgid "Removes backup generations"
+msgstr "Ta bort komplettering"
+
+#: share/completions/obnam.fish:17
+#, fuzzy
+msgid "Checks the consistency of the repository"
+msgstr "Kontrollera hela lagret"
+
+#: share/completions/obnam.fish:18
+msgid "Lists every backup generation"
+msgstr ""
+
+#: share/completions/obnam.fish:19
+msgid "Lists the identifier for every generation"
+msgstr ""
+
+#: share/completions/obnam.fish:20
+#, fuzzy
+msgid "Lists the keys"
+msgstr "Visa pålitliga nycklar"
+
+#: share/completions/obnam.fish:21
+#, fuzzy
+msgid "Lists the toplevel keys"
+msgstr "Visa pålitliga nycklar"
+
+#: share/completions/obnam.fish:22
+#, fuzzy
+msgid "Lists the contents of a given generation"
+msgstr "Visa kataloginnehåll"
+
+#: share/completions/obnam.fish:23
+#, fuzzy
+msgid "Makes the repository available via FUSE"
+msgstr "Uppdatera förråd"
+
+#: share/completions/obnam.fish:24
+msgid "Check if a backup age exceeds a threshold"
+msgstr ""
+
+#: share/completions/obnam.fish:25
+#, fuzzy
+msgid "Removes a client from the repository"
+msgstr "Ange förråd-URL"
+
+#: share/completions/obnam.fish:26
+#, fuzzy
+msgid "Removes a key from the repository"
+msgstr "Skapa lokal kopia av förråd"
+
+#: share/completions/obnam.fish:27
+#, fuzzy
+msgid "Restore files from the repository"
+msgstr "Checka in filer till förråd"
+
+#: share/completions/obnam.fish:28
+#, fuzzy
+msgid "Verifies files in the repository"
+msgstr "Checka in filer till förråd"
+
+#: share/completions/obnam.fish:87
+msgid "Do not check data for cient NAME."
+msgstr ""
+
+#: share/completions/perl.fish:34
+#, sh-format
+msgid "Loop script, print $_"
+msgstr "Upprepa skript, skriv $_"
+
+#: share/completions/perl.fish:36
+#, sh-format
+msgid "Search $PATH for script"
+msgstr "Genomsök $PATH efter skript"
+
+#: share/completions/sed.fish:13
+msgid "Evaluate expression"
+msgstr "Utför argument som kommandon"
+
+#: share/completions/sed.fish:14
+msgid "Evalute file"
+msgstr "Utför filinnehåll som kommandon"
+
+#: share/completions/sed.fish:22
+msgid "Specify line-length"
+msgstr "Välj radlängd"
+
+#: share/completions/touch.fish:2
+msgid "Set date back"
+msgstr "Sätt tillbaka datum"
+
+#: share/completions/touch.fish:4
+msgid "Set date"
+msgstr "Välj datum"
+
+#: share/completions/touch.fish:5
+msgid "Set date forward"
+msgstr "Sätt fram datum"
+
+#: share/completions/touch.fish:9
+msgid "Set time"
+msgstr "Välj tid"
+
+#: share/completions/update-eix-remote.fish:16
+msgid ""
+"Fetch the eix-caches of some layman overlays into a temporary file resp. "
+"into FILE and add them to the eix database"
+msgstr ""
+
+#: share/completions/update-eix-remote.fish:16
+msgid "Only fetch the overlays into FILE"
+msgstr ""
+
+#: share/completions/update-eix-remote.fish:16
+msgid "Only add the overlays from FILE to the eix database"
+msgstr ""
+
+#: share/completions/xterm.fish:126
+#, sh-format
+msgid "Terminal name for $TERM"
+msgstr ""
+
+#: share/functions/_.fish:9
+msgid "fish"
+msgstr ""
+
+#: share/functions/__fish_complete_abook_formats.fish:1
+msgid "Complete abook formats"
+msgstr ""
+
+#: share/functions/__fish_complete_atool.fish:1
+msgid "Complete atool"
+msgstr ""
+
+#: share/functions/__fish_complete_grep.fish:48
+#, fuzzy
+msgid "Obsolete synonym for -i"
+msgstr "Synonym för -i"
+
+#: share/functions/__fish_complete_grep.fish:49
+msgid "treat input as a set of lines each terminated by a zero byte"
+msgstr ""
+
+#: share/functions/__fish_complete_python.fish:2
+#: share/functions/__fish_complete_python.fish:28
+#: share/functions/__fish_complete_vi.fish:54
+msgid "Don\\t"
+msgstr ""
+
+#: share/functions/__fish_complete_setxkbmap.fish:1
+#, fuzzy
+msgid "Complete setxkb options"
+msgstr "Tolerera slarviga monteringsflaggor"
+
+#: share/functions/__fish_complete_svn.fish:77
+#, fuzzy
+msgid "Remove \\conflicted state on working copy files or directories."
+msgstr "Ta bort konflikttillstånd hos arbetskopiefiler eller kataloger"
+
+#: share/functions/__fish_complete_svn.fish:103
+#, fuzzy
+msgid "Specify log message"
+msgstr "Välj e-postkatalog"
+
+#: share/functions/__fish_complete_svn.fish:105
+#, fuzzy
+msgid "Read log message from file"
+msgstr "Läs loggmeddelande från fil"
+
+#: share/functions/__fish_complete_svn.fish:106
+#, fuzzy
+msgid "Force validity of log message source"
+msgstr "Tvinga validitet av loggmeddelandes källa"
+
+#: share/functions/__fish_complete_svn.fish:118
+#, fuzzy
+msgid "Print nothing, or only summary information"
+msgstr "Visa all information"
+
+#: share/functions/__fish_complete_svn.fish:122
+msgid "Force operation to run"
+msgstr "Tvinga operationen att utföras"
+
+#: share/functions/__fish_complete_svn.fish:126
+#, fuzzy
+msgid "Process contents of file ARG as additional args"
+msgstr "Skicka filinnehåll som extra argument"
+
+#: share/functions/__fish_complete_svn.fish:130
+msgid "Operate only on members of changelist"
+msgstr ""
+
+#: share/functions/__fish_complete_svn.fish:134
+#, fuzzy
+msgid "Output in xml"
+msgstr "Utadata i XML-format"
+
+#: share/functions/__fish_complete_svn.fish:138
+#, fuzzy
+msgid "Retrieve revision property"
+msgstr "Utför på revisionsegenskap"
+
+#: share/functions/__fish_complete_svn.fish:150
+msgid "Ignore externals definitions"
+msgstr "Ignorera definitioner av externals"
+
+#: share/functions/__fish_complete_svn.fish:154
+#, fuzzy
+msgid "Print extra information"
+msgstr "Visa all information"
+
+#: share/functions/__fish_complete_svn.fish:158
+#, fuzzy
+msgid "Operate on a revision property (use with -r)"
+msgstr "Utför på revisionsegenskap"
+
+#: share/functions/__fish_complete_svn.fish:162
+msgid "Add intermediate parents"
+msgstr ""
+
+#: share/functions/__fish_complete_svn.fish:189
+#, fuzzy
+msgid "Try operation but make no changes"
+msgstr "Försök hitta en mindre uppsättning ändringar"
+
+#: share/functions/__fish_complete_svn.fish:193
+#, fuzzy
+msgid "Ignore ancestry when calculating merges"
+msgstr "Ignorera ursprung vid beräknandet av sammanslagning"
+
+#: share/functions/__fish_complete_svn.fish:197
+#, fuzzy
+msgid "Override diff-cmd specified in config file"
+msgstr "Flytta filen angiven på kommandoraden"
+
+#: share/functions/__fish_complete_svn.fish:198
+#, fuzzy
+msgid "Use external diff command"
+msgstr "Ångra ett redigeringskommando"
+
+#: share/functions/__fish_complete_svn.fish:202
+msgid "Disable automatic properties"
+msgstr "Inaktivera automatiska egenskaper"
+
+#: share/functions/__fish_complete_svn.fish:206
+#, fuzzy
+msgid "Set new working copy depth"
+msgstr "Välj RAW-skrivläge"
+
+#: share/functions/__fish_complete_svn.fish:230
+msgid "don\\t"
+msgstr ""
+
+#: share/functions/__fish_complete_svn.fish:241
+msgid "Use ARG as the older target"
+msgstr ""
+
+#: share/functions/__fish_complete_svn.fish:242
+msgid "Use ARG as the newer target"
+msgstr ""
+
+#: share/functions/__fish_complete_svn.fish:243
+#, fuzzy
+msgid "Do not print differences for deleted files"
+msgstr "Skriv inte ut rader utan fältavgränsare"
+
+#: share/functions/__fish_complete_svn.fish:244
+#, fuzzy
+msgid "Notice ancestry when calculating differences"
+msgstr "Ignorera ursprung vid beräknandet av sammanslagning"
+
+#: share/functions/__fish_complete_svn.fish:245
+#, fuzzy
+msgid "Show a summary of the results"
+msgstr "Välj en konfigurationsinställning"
+
+#: share/functions/__fish_complete_svn.fish:257
+#, fuzzy
+msgid "Do not cross copies while traversing history"
+msgstr "Korsa inte kopior"
+
+#: share/functions/__fish_complete_svn.fish:259
+#, fuzzy
+msgid "Produce diff output"
+msgstr "Ljudutdata"
+
+#: share/functions/__fish_complete_svn.fish:279
+msgid "Use strict semantics"
+msgstr "Använd strikt semantik"
+
+#: share/functions/__fish_complete_svn.fish:306
+#, fuzzy
+msgid "Relocate via URL-rewriting"
+msgstr "Relokera via URL-omskrivning"
+
+#: share/functions/__fish_complete_svn_diff.fish:1
+#, fuzzy
+msgid "Complete \"svn diff\" arguments"
+msgstr "Räkna antalet argument"
+
+#: share/functions/__fish_complete_tar.fish:14
+#: share/functions/__fish_complete_tar.fish:21
+#: share/functions/__fish_complete_tar.fish:28
+#: share/functions/__fish_complete_unrar.fish:14
+msgid "%s\\tArchived file\\n"
+msgstr "%s\\tArkivfil\\n"
+
+#: share/functions/__fish_complete_wvdial_peers.fish:1
+msgid "Complete wvdial peers"
+msgstr ""
+
+#: share/functions/__fish_complete_xsum.fish:1
+msgid "Complete md5sum sha1 etc"
+msgstr ""
+
+#
+#: share/functions/__fish_config_interactive.fish:35
+msgid "Type %shelp%s for instructions on how to use fish"
+msgstr "Skriv %shelp%s för instruktioner om hur man använder fish"
+
+#: share/functions/__fish_config_interactive.fish:193
+#, sh-format
+msgid "Notify VTE of change to $PWD"
+msgstr ""
+
+#: share/functions/__fish_move_last.fish:9
+msgid "Hit end of history...\\n"
+msgstr "Slut på kataloghistorik...\\n"
+
+#: share/functions/__fish_print_abook_emails.fish:1
+#, fuzzy
+msgid "Print email addresses (abook)"
+msgstr "Visa döda processer"
+
+#: share/functions/__fish_print_arch_daemons.fish:1
+#, fuzzy
+msgid "Print arch daemons"
+msgstr "Visa alla namn"
+
+#: share/functions/__fish_print_debian_services.fish:1
+#, fuzzy
+msgid "Prints services installed"
+msgstr "Visa status för tjänst"
+
+#: share/functions/__fish_print_lsblk_columns.fish:1
+#, fuzzy
+msgid "Print available lsblk columns"
+msgstr "Visa tillgängliga paket"
+
+#: share/functions/__fish_print_xdg_mimeapps.fish:1
+#, fuzzy
+msgid "Print xdg mime applications"
+msgstr "Visa all information"
+
+#: share/functions/__fish_print_xrandr_modes.fish:1
+#, fuzzy
+msgid "Print xrandr modes"
+msgstr "Skriv obehandlade filnamn"
+
+#: share/functions/__fish_print_xrandr_outputs.fish:1
+#, fuzzy
+msgid "Print xrandr outputs"
+msgstr "Visa antal ord"
+
+#: share/functions/__fish_test_arg.fish:2
+msgid "Test if the token under the cursor matches the specified wildcard"
+msgstr ""
+
+#: share/functions/__fish_urlencode.fish:1
+#, fuzzy
+msgid "URL-encode stdin"
+msgstr "Byt namn på standard in"
+
+#: share/functions/abbr.fish:1
+#, fuzzy
+msgid "Manage abbreviations"
+msgstr "Manualsektion"
+
+#: share/functions/abbr.fish:40
+#, fuzzy
+msgid "%s: invalid option -- %s\\n"
+msgstr "%s: Ogiltigt flagga -- %s\\n"
+
+#: share/functions/abbr.fish:47
+#, fuzzy
+msgid "%s: %s cannot be specified along with %s\\n"
+msgstr "%s: Värden kan inte anges vid radering %s\\n"
+
+#: share/functions/abbr.fish:56
+#, fuzzy
+msgid "%s: option requires an argument -- %s\\n"
+msgstr "%s: Flaggan kräver ett argument -- %s\\n"
+
+#: share/functions/abbr.fish:62
+#, fuzzy
+msgid "%s: Unexpected argument -- %s\\n"
+msgstr "%ls: Förväntade argument\\n"
+
+#: share/functions/abbr.fish:75
+msgid "%s: abbreviation must have a non-empty key\\n"
+msgstr ""
+
+#: share/functions/abbr.fish:79
+msgid "%s: abbreviation must have a value\\n"
+msgstr ""
+
+#: share/functions/abbr.fish:101
+#, fuzzy
+msgid "%s: no such abbreviation '%s'\\n"
+msgstr "%s: Okänd funktion '%s'\\n"
+
+#: share/functions/alias.fish:2
+msgid ""
+"Legacy function for creating shellscript functions using an alias-like syntax"
+msgstr ""
+"Bakåtkompatibilitetsfunktion för att skapa skalfunktioner med en alias-"
+"liknande syntax"
+
+#: share/functions/alias.fish:36
+#, fuzzy
+msgid "%s: Expected one or two arguments, got %d\\n"
+msgstr "%ls: Förväntade ett eller två argument, fick %d"
+
+#: share/functions/dirh.fish:2
+msgid "Print the current directory history (the back- and fwd- lists)"
+msgstr "Visa arbetskatalogshistorik (bakåt och frammåt)"
+
+#: share/functions/export.fish:1
+msgid "Set global variable. Alias for set -g, made for bash compatibility"
+msgstr ""
+
+#: share/functions/fish_indent.fish:1
+msgid "Indenter and prettifier for fish code"
+msgstr ""
+
+#: share/functions/fish_vi_prompt.fish:17
+msgid "Simple vi prompt"
+msgstr ""
+
+#: share/functions/funced.fish:36
+#, fuzzy
+msgid "funced: You must specify one function name\n"
+msgstr "%ls: Förväntade exakt ett funktionsnamn\n"
+
+#: share/functions/funcsave.fish:11
+#, fuzzy
+msgid "%s: Expected function name\\n"
+msgstr "%s: Förväntade ett funktionsnamn\\n"
+
+#: share/functions/help.fish:77
+#, fuzzy, sh-format
+msgid ""
+"Please set the variable $BROWSER to a suitable browser and try again.\\n\\n"
+msgstr ""
+"Var vänlig sätt variablen $BROWSER så den anger en lämplig browser och "
+"försök igen\\n\\n"
+
+#: share/functions/history.fish:5
+msgid "Deletes an item from history"
+msgstr ""
+
+#: share/functions/hostname.fish:7
+msgid "Show or set the system's host name"
+msgstr ""
+
+#: share/functions/math.fish:2
+msgid "Perform math calculations in bc"
+msgstr "Utför matematiska beräkningar i bc"
+
+#: share/functions/mimedb.fish:8
+msgid "Look up file information via the mimedb database"
+msgstr ""
+
+#: share/functions/popd.fish:2
+msgid "Pop dir from stack"
+msgstr "Ta bort katalog från stack"
+
+#
+#: share/functions/popd.fish:14
+msgid "%s: Directory stack is empty...\\n"
+msgstr "%s: Katalogstacken är tom...\\n"
+
+#: share/functions/prevd.fish:28
+msgid "The number of positions to skip must be a non-negative integer\\n"
+msgstr "Antalet positioner att hoppa över måste vara ett positivt heltal"
+
+#: share/functions/setenv.fish:2
+msgid "Set global variable. Alias for set -g, made for csh compatibility"
+msgstr ""
+
+#~ msgid "If you can reproduce it, please send a bug report to %s."
+#~ msgstr ""
+#~ "Om du kan reproducera det, var vänlig skicka en buggrapport till %s."
+
+#~ msgid "All base system packages"
+#~ msgstr "Alla bassystempaket"
+
+#~ msgid "All packages in world"
+#~ msgstr "Alla paket i världen"
+
+#~ msgid "Installed package"
+#~ msgstr "Installerade paket"
+
+#~ msgid "Usage overview of emerge"
+#~ msgstr "Användningsöversikt av emerge"
+
+#~ msgid "Help on subject system"
+#~ msgstr "Hjälp för ämnet system"
+
+#~ msgid "Help on subject config"
+#~ msgstr "Hjäl för ämnet konfiguration"
+
+#~ msgid "Help on subject sync"
+#~ msgstr "Hjälp för ämnet sync"
+
+#~ msgid "Use colors in output"
+#~ msgstr "Använd färger"
+
+#~ msgid "Don't use colors in output"
+#~ msgstr "Använd inte färger"
+
+#~ msgid "whatis entry"
+#~ msgstr "'whatis'-inlägg"
+
+#~ msgid "Use <command> to build"
+#~ msgstr "Använd <kommando> för att bygga"
+
+#~ msgid "Prefix to strip on patch"
+#~ msgstr "Ta bort <prefix> på fix"
+
+#~ msgid "Do not run update"
+#~ msgstr "Kör inte uppdatering"
+
+#~ msgid "Search full package name"
+#~ msgstr "Sök fullt paketnamn"
+
+#~ msgid "Access config file from shell"
+#~ msgstr "Hitta konfigurationsfil via skalet"
+
+#~ msgid "Use cdrom-mount-point"
+#~ msgstr "Välj cdrom-monteringsplats"
+
+#~ msgid "Use source override"
+#~ msgstr "Använd källkodsåsidosättning"
+
+#~ msgid "Download Only"
+#~ msgstr "Bara nedladdning"
+
+#~ msgid "Correct broken dependencies"
+#~ msgstr "Korrigera trasiga beroenden"
+
+#~ msgid "Ignore missing packages"
+#~ msgstr "Ignorera saknade paket"
+
+#~ msgid "Disable downloading packages"
+#~ msgstr "Inaktivera paketnedladdning"
+
+#~ msgid "Automatic yes to prompts"
+#~ msgstr "Svara automatiskt ja på alla frågor"
+
+#~ msgid "Compile source packages"
+#~ msgstr "Kompilera källkodspaket"
+
+#~ msgid "Ignore package Holds"
+#~ msgstr "Ignorera paketblockar"
+
+#~ msgid "Do not upgrade packages"
+#~ msgstr "Upgradera inte paket"
+
+#~ msgid "Force yes"
+#~ msgstr "Tvinga ja"
+
+#~ msgid "Erase obsolete files"
+#~ msgstr "Radera förlegade filer"
+
+#~ msgid "Control default input to the policy engine"
+#~ msgstr "Kontrollera standardindata till policymotorn"
+
+#~ msgid "Only perform operations that are trivial"
+#~ msgstr "Utför bara triviala operationer"
+
+#~ msgid "Abort if any packages are to be removed"
+#~ msgstr "Avbryt om paket ska tas bort"
+
+#~ msgid "Only accept source packages"
+#~ msgstr "Acceptera bara källkodpaket"
+
+#~ msgid "Download only diff file"
+#~ msgstr "Ladda bara ner difffiler"
+
+#~ msgid "Download only tar file"
+#~ msgstr "Ladda bara tar-fil"
+
+#~ msgid "Only process arch-dependant build-dependencies"
+#~ msgstr "Processa bara arkitekturberoende byggberoenden"
+
+#~ msgid "Ignore non-authenticated packages"
+#~ msgstr "Ignorera oautentiserande paket"
+
+#~ msgid "Specify apt config file"
+#~ msgstr "Välj apt-konfigurationsfil"
+
+#~ msgid "List bugs in rss format"
+#~ msgstr "Lista information om inoder"
+
+#~ msgid "Read filenames from pipe"
+#~ msgstr "Läs filnamn från rör"
+
+#~ msgid "Alias for 'get'"
+#~ msgstr "Alias för 'get'"
+
+#~ msgid "Use specific conffile"
+#~ msgstr "Välj konfigurationsfil"
+
+#~ msgid ""
+#~ "Comma-separated list of package installation states to follow recursively"
+#~ msgstr ""
+#~ "Komma-separarad lista av paketinstallationstillstånd att följa rekursivt"
+
+#~ msgid "Comma-separated list of package installation states to show"
+#~ msgstr "Komma-separarad lista av paketinstallationstillstånd att visa"
+
+#~ msgid "Probe a CD"
+#~ msgstr "Sondera en CD"
+
+#~ msgid "File to grab servers"
+#~ msgstr "Fil att hämta servrar från"
+
+#~ msgid "File as input"
+#~ msgstr "Fil som indata"
+
+#~ msgid "Mirror-list file"
+#~ msgstr "Spegel-listefil"
+
+#~ msgid "Output sources.list file"
+#~ msgstr "Skriv en sources.list fil"
+
+#~ msgid "Write top servers to file"
+#~ msgstr "Skriv top-servrar till fil"
+
+#~ msgid "Run on current dir"
+#~ msgstr "Kör i den nuvarande katalogen"
+
+#~ msgid "Removable medium"
+#~ msgstr "Löstagbart medium"
+
+#~ msgid "List of packages to install"
+#~ msgstr "Lista av paket att installera"
+
+#~ msgid "Specify a non-mountpoint dir"
+#~ msgstr "Välj katalog som inte är monteringsplats"
+
+#~ msgid "Select a method"
+#~ msgstr "Välj metod"
+
+#~ msgid "Accept protocols"
+#~ msgstr "Acceptera angivna protokoll"
+
+#~ msgid "Reject protocols"
+#~ msgstr "Vägra använda angivna protokoll"
+
+#~ msgid "Numerical address"
+#~ msgstr "Numerisk adress"
+
+#~ msgid "Use hardware address"
+#~ msgstr "Använd hårdvaruadress"
+
+#~ msgid "Define math library"
+#~ msgstr "Definera matematikbibliotek"
+
+#~ msgid "Give warnings for extensions to POSIX bc"
+#~ msgstr "Varna vid användning av Posix-förlängningar"
+
+#~ msgid "Process exactly POSIX bc"
+#~ msgstr "Använd exakt Posix bc"
+
+#~ msgid "Do not print the GNU welcome"
+#~ msgstr "Visa inte GNUs välkomstmeddelande"
+
+#~ msgid "Remove the topmost global event block"
+#~ msgstr "Ta bort den översta globala händelseblockeraren"
+
+#~ msgid "Print names of all existing builtins"
+#~ msgstr "Visa namnen på alla tillgängliga inbbyggda kommandon"
+
+#~ msgid "Decompress to stdout"
+#~ msgstr "Dekomprimera till standard ut"
+
+#~ msgid "Overwrite"
+#~ msgstr "Skiv över"
+
+#~ msgid "Reduce memory usage"
+#~ msgstr "Minska minnesanvändning"
+
+#~ msgid "Print compression ratios"
+#~ msgstr "Skriv ut kompressionsfaktor"
+
+#~ msgid "Print license"
+#~ msgstr "Skriv ut licens"
+
+#~ msgid "Compress file"
+#~ msgstr "Komprimera fil"
+
+#~ msgid "Check integrity"
+#~ msgstr "Verifiera integritet"
+
+#~ msgid "Supress errors"
+#~ msgstr "Visa inte fel"
+
+#~ msgid "Small block size"
+#~ msgstr "Liten blockstorlek"
+
+#~ msgid "Large block size"
+#~ msgstr "Stor blockstorlek"
+
+#~ msgid "Play in random order"
+#~ msgstr "Spela i slumpmässig ordning"
+
+#~ msgid "Increment the level of general verbosity by one"
+#~ msgstr "Öka pratigheten ett steg"
+
+#~ msgid ""
+#~ "Increment the verbose level in respect of SCSI command transport by one"
+#~ msgstr "Öka pratighet om SCSI-kommandotransporten ett steg"
+
+#~ msgid "Set the misc debug value to #"
+#~ msgstr "Välj den allmänna debugnivån"
+
+#~ msgid "Increment the misc debug level by one"
+#~ msgstr "Öka den allmänna debugnivån ett steg"
+
+#~ msgid "Do not print out a status report for failed SCSI commands"
+#~ msgstr "Skriv inte ut en statusrapport för misslyckade SCSI-kommandon"
+
+#~ msgid "Force to continue on some errors"
+#~ msgstr "Tvinga att fortsätt vid fel"
+
+#~ msgid "Tell cdrecord to set the SCSI IMMED flag in certain commands"
+#~ msgstr "Instruera cdrecord att sätta SCSI IMMED-flaggan i vissa kommandon"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "Definerar den minsta enhetsbufferfyllnadshastigheten för det "
+#~ "experimentella ATAPI-vänteläget som är menat att underlätta för IDE-"
+#~ "bussen att låta hårddisk och CD/DVD-skrivare befinna sig på samma IDE-"
+#~ "kabel"
+
+#~ msgid "Complete CD/DVD-Recorder recording process with the laser turned off"
+#~ msgstr "Fullfölj CD/DVD-brännarens inspelningsprocess med lasern avstängd"
+
+#~ msgid "Tells cdrecord to handle images created by readcd -clone"
+#~ msgstr "Ange att cdrecord ska hantera bilder skapade av readcd -clone"
+
+#~ msgid "Set SAO (Session At Once) mode, usually called Disk At Once mode"
+#~ msgstr ""
+#~ "Välj SAO- (Session At Once) skrivläge, vanligtvis kallat Disk At Once-"
+#~ "skrivläge"
+
+#~ msgid "Set TAO (Track At Once) writing mode"
+#~ msgstr "Välj TAO- (Track At Once) skrivläge"
+
+#~ msgid "Select Set RAW writing, the preferred raw writing mode"
+#~ msgstr "Välj det bättre RAW-skrivläget"
+
+#~ msgid "Select Set RAW writing, the less preferred raw writing mode"
+#~ msgstr "Välj det mindre bra RAW-skrivläget"
+
+#~ msgid ""
+#~ "Select Set RAW writing, the preferred raw writing mode if raw96r is not "
+#~ "supported"
+#~ msgstr "Välj det RAW-skrivläget som är bäst om stöd saknas för raw96r"
+
+#~ msgid "Allow multi session CDs to be made"
+#~ msgstr "Tillåt skapandet av multisessions-CD"
+
+#~ msgid ""
+#~ "Retrieve multi session info in a form suitable for mkisofs-1.10 or later"
+#~ msgstr ""
+#~ "Hämta multisessionsinfo i ett format lämpligt för mkisofs-1.10 och senare"
+
+#~ msgid "Retrieve and print out the table of content or PMA of a CD"
+#~ msgstr "Hämta och skriv ut innehållsförteckningen eller PMA för en CD"
+
+#~ msgid "Retrieve and print out the ATIP (absolute Time in Pre-groove) info"
+#~ msgstr "Hämta och skriv ut ATIP (absolute Time in Pre-groove) info"
+
+#~ msgid "The disk will only be fixated"
+#~ msgstr "Fixera endast skivan"
+
+#~ msgid "Do not fixate the disk after writing the tracks"
+#~ msgstr "Fixera inte skivan efter stt spåren skrivits"
+
+#~ msgid ""
+#~ "Wait for input to become available on standard input before trying to "
+#~ "open the SCSI driver"
+#~ msgstr ""
+#~ "Vänta på att indata ska bli tillgängligt från standard in innan försök "
+#~ "rill att öppna SCSI-enheten"
+
+#~ msgid "Load the media and exit"
+#~ msgstr "Ladda mediet och avsluta"
+
+#~ msgid "Load the media, lock the door and exit"
+#~ msgstr "Ladda mediet, lås luckan och avsluta"
+
+#~ msgid "Eject disk after doing the work"
+#~ msgstr "Skicka ut skivan efter arbetets utförande"
+
+#~ msgid "Set the speed factor of the writing process to #"
+#~ msgstr "Sätt hastighetsfaktorn för skrivprocessen"
+
+#~ msgid "Blank a CD-RW and exit or blank a CD-RW before writing"
+#~ msgstr "Töm en CD-RW och avsluta eller töm en CD-RW för skrivning"
+
+#~ msgid "Format a CD-RW/DVD-RW/DVD+RW disc"
+#~ msgstr "Formatera en CD-RW/DVD-RW/DVD+RW-skiva"
+
+#~ msgid "Set the FIFO (ring buffer) size to #"
+#~ msgstr "Välj FIFO- (ringbuffert) storlek"
+
+#~ msgid "Set the maximum transfer size for a single SCSI command to #"
+#~ msgstr "Välj maximal överföringshastighet för ett enkilt SCSI-kommando"
+
+#~ msgid "Sets the SCSI target for the CD/DVD-Recorder"
+#~ msgstr "Välj SCSI-målet för CD/DVD-brännaren"
+
+#~ msgid "Set the grace time before starting to write to ># seconds"
+#~ msgstr "Välj väntetiden i sekunder innan skrivning till skivan påbörjas"
+
+#~ msgid "Set the default SCSI command timeout value to # seconds"
+#~ msgstr "Välj standard-SCSI-timeoutvärdet i sekunder"
+
+#~ msgid "Allows the user to manually select a driver for the device"
+#~ msgstr "Låter användaren manuellt välja en drivrutin för enheten"
+
+#~ msgid "Set driver specific options"
+#~ msgstr "Välj drivrutinsspecifika inställningar"
+
+#~ msgid ""
+#~ "Set the driveropts specified by driveropts=option list, the speed of the "
+#~ "drive and the dummy flag and exit"
+#~ msgstr ""
+#~ "Välj drivrutinsinställningar angivna av listandriveropt=inställning, "
+#~ "hastigheten på enheten och dunny-flaggan och avsluta"
+
+#~ msgid "Checks if a driver for the current drive is present and exit"
+#~ msgstr ""
+#~ "Kontrollerar om en drivrutin för den nuvarande enheten finns tillgänglig "
+#~ "och avsluta"
+
+#~ msgid ""
+#~ "Print the drive capabilities for SCSI-3/mmc compliant drives as obtained "
+#~ "from mode page 0x2A"
+#~ msgstr ""
+#~ "Visa enhetsförmågor för SCSI-3/mmc-anpassade enheter hämtade från "
+#~ "lägessida 0x2A"
+
+#~ msgid "Do an inquiry for the drive, print the inquiry info and exit"
+#~ msgstr ""
+#~ "Utför en föffrågan på enheten, visa förfrågningsinformationen och avsluta"
+
+#~ msgid ""
+#~ "Scan all SCSI devices on all SCSI busses and print the inquiry strings"
+#~ msgstr ""
+#~ "Genomsök alla SCSI-enheter på alla SCSI-bussar och skriv ut "
+#~ "förfrågningssträngarna"
+
+#~ msgid "Try to reset the SCSI bus where the CD recorder is located"
+#~ msgstr "Försök att återställa SCSI-bussen som CD-brännaren befinner sig på"
+
+#~ msgid "Try to send an abort sequence to the drive"
+#~ msgstr "Försök skicka en avbrottssekvens till enheten"
+
+#~ msgid "Allow cdrecord to write more than the official size of a medium"
+#~ msgstr ""
+#~ "Tillåt cdrecord att skriva mer än den officiella storleken på ett medium"
+
+#~ msgid "Ignore the known size of the medium, use for debugging only"
+#~ msgstr ""
+#~ "Ignorera den kända storleken på ett medium, använd endast vid debuggning"
+
+#~ msgid "Use *.inf files to overwrite audio options"
+#~ msgstr "Använd *.inf-filer för att skriva över ljudinställningar"
+
+#~ msgid "Set the default pre-gap size for all tracks except track nr 1"
+#~ msgstr "Välj standard-pre-gap-storlek för alla spår utom spår 1"
+
+#~ msgid "Set Packet writing mode (experimental interface)"
+#~ msgstr "Välj paketskrivningsläge (experimentellt gränssnitt)"
+
+#~ msgid "Set the packet size to #, forces fixed packet mode (experimental)"
+#~ msgstr "Ange paketstorlek, tvingar fast paket-läge (experimentell)"
+
+#~ msgid ""
+#~ "Do not close the current track, only when in packet writing mode "
+#~ "(experimental)"
+#~ msgstr ""
+#~ "Avsluta inte det nuvarande spåret, bara i paketskrivningsläge "
+#~ "(experimentell)"
+
+#~ msgid "Set the Media Catalog Number of the CD"
+#~ msgstr "Välj Mediakatalog-nummer för CD:n"
+
+#~ msgid ""
+#~ "Write CD-Text info based on info taken from a file that contains ascii "
+#~ "info for the text strings"
+#~ msgstr ""
+#~ "Skriv CD-Text-infromation baserat på information tagen från fil i ascii-"
+#~ "format"
+
+#~ msgid "Write CD-Text based on info found in the binary file filename"
+#~ msgstr ""
+#~ "Skriv CD-Text-infromation baserat på information tagen från fil i binärt "
+#~ "format"
+
+#~ msgid ""
+#~ "Take all recording related info from a CDRWIN compliant CUE sheet file"
+#~ msgstr ""
+#~ "Ta all inspelningrelaterad information från en CDRWIN-anpassad CUE-"
+#~ "bladsfil"
+
+#~ msgid "Set the International Standard Recording Number for the next track"
+#~ msgstr "Ange det internationella standardinspelningsnumret för nästa spår"
+
+#~ msgid "Sets an index list for the next track"
+#~ msgstr "Ange en indexlista för nästa spår"
+
+#~ msgid "All subsequent tracks are written in CD-DA audio format"
+#~ msgstr "Alla följande spår är skrivna i CD-DA-ljudformatet"
+
+#~ msgid "Audio data is assumed to be in byte-swapped (little-endian) order"
+#~ msgstr "Ljuddata antas vara i omvänd byteordning"
+
+#~ msgid ""
+#~ "All subsequent tracks are written in CD-ROM mode 1 (Yellow Book) format"
+#~ msgstr ""
+#~ "Alla följande spår är skrivna i CD-ROM läge 1 (Yellow book) formatet"
+
+#~ msgid "All subsequent tracks are written in CD-ROM mode 2 format"
+#~ msgstr "Alla följande spår är skrivna i CD-ROM läge 2 formatet"
+
+#~ msgid "All subsequent tracks are written in CD-ROM XA mode 2 form 1 format"
+#~ msgstr "Alla följande spår är skrivna i CD-ROM XA läge 2 form 1 formatet"
+
+#~ msgid "All subsequent tracks are written in CD-ROM XA mode 2 form 2 format"
+#~ msgstr "Alla följande spår är skrivna i CD-ROM XA läge 2 form 2 formatet"
+
+#~ msgid ""
+#~ "All subsequent tracks are written in a way that allows a mix of CD-ROM XA "
+#~ "mode 2 form 1/2 format"
+#~ msgstr ""
+#~ "Alla följande spår är skrivna på ett sätt som fillåter en blandning av CD-"
+#~ "ROM XA läge 2 form 1/2 formaten"
+
+#~ msgid "The TOC type for the disk is set to CDI, with XA only"
+#~ msgstr "Innehållsförteckningen är satt till CDI, med enbart XA"
+
+#~ msgid "Use the ISO-9660 file system size as the size of the next track"
+#~ msgstr "Använd ISO-9660-filsystemets storlek som storlek på nästa spår"
+
+#~ msgid ""
+#~ "15 sectors of zeroed data will be added to the end of this and each "
+#~ "subsequent data track"
+#~ msgstr ""
+#~ "Lägg till 15 sektorer av nolldata till slutet av varje efterföljande "
+#~ "dataspår"
+
+#~ msgid "Set the amount of data to be appended as padding to the next track"
+#~ msgstr ""
+#~ "Ange mängden data som skall läggas till som paddning till nästa spår"
+
+#~ msgid "Do not pad the following tracks - the default"
+#~ msgstr "Lägg inte till paddning till de följande spåren - standard"
+
+#~ msgid "Output diagnostic for changed files"
+#~ msgstr "Visa information om ändrade filer"
+
+#~ msgid "Do not dereference symbolic links"
+#~ msgstr "Följ ej symboliska länkar"
+
+#~ msgid "Change from owner/group"
+#~ msgstr "Byt från ägare/grupp"
+
+#~ msgid "Use same owner/group as file"
+#~ msgstr "Använd samma ägargrupp som angiven fil"
+
+#~ msgid "Operate recursively"
+#~ msgstr "Rekurivt läge"
+
+#~ msgid "Output diagnostic for every file"
+#~ msgstr "Visa information om alla filer"
+
+#~ msgid "Command to run"
+#~ msgstr "Kommando att utföra"
+
+#~ msgid "Add text to the end of the selected area"
+#~ msgstr "Lägg till text till slutet av valt område"
+
+#~ msgid "Add text at cursor"
+#~ msgstr "Lägg till text vid markören"
+
+#~ msgid "Replace selected part"
+#~ msgstr "Ersätt valt område"
+
+#~ msgid "Select job under cursor"
+#~ msgstr "Välj jobb under markören"
+
+#~ msgid "Select process under cursor"
+#~ msgstr "Välj process under markören"
+
+#~ msgid "Select token under cursor"
+#~ msgstr "Välj symbol under markören"
+
+#~ msgid "Select entire command line (default)"
+#~ msgstr "Välj hela kommandoraden (standard)"
+
+#~ msgid "Only return that part of the command line before the cursor"
+#~ msgstr "Visa bara den del av kommandoraden som är före markören"
+
+#~ msgid "Inject readline functions to reader"
+#~ msgstr "Skicka readline-funktion till läsaren"
+
+#~ msgid "Set/get cursor position, not buffer contents"
+#~ msgstr "Sätt/hämta markörposition, inte bufferinnehåll"
+
+#~ msgid "Command to add completion to"
+#~ msgstr "Kommando att komplettera"
+
+#~ msgid "Path to add completion to"
+#~ msgstr "Sökväg att komplettera"
+
+#~ msgid "Posix-style option to complete"
+#~ msgstr "Posix-typ av flagga att komplettera"
+
+#~ msgid "GNU-style option to complete"
+#~ msgstr "GNU-typ av flagga att komplettera"
+
+#~ msgid "Old style long option to complete"
+#~ msgstr "Gammal typ av lång flagga att komplettera"
+
+#~ msgid "Do not use file completion"
+#~ msgstr "Använd inte fil-komplettering"
+
+#~ msgid "Require parameter"
+#~ msgstr "Kräv parameter"
+
+#~ msgid "Require parameter and do not use file completion"
+#~ msgstr "Kräv parameter, använd inte filkomplettering"
+
+#~ msgid "A list of possible arguments"
+#~ msgstr "Parametrar specifikt för denna flagga för flagga"
+
+#~ msgid "Description of this completions"
+#~ msgstr "Beskrivning av denna komplettering"
+
+#~ msgid "Option list is not complete"
+#~ msgstr "Detta kommando accepterar andra flaggor än de här angivna"
+
+#~ msgid ""
+#~ "The completion should only be used if the specified command has a zero "
+#~ "exit status"
+#~ msgstr ""
+#~ "Completteringen skall bara användas om det angivna kommandot har "
+#~ "nollskild avslutningstatus"
+
+#~ msgid "Cache test results in file config.cache"
+#~ msgstr "Cachea test resultat i filen config.cache"
+
+#~ msgid "Do not create output files"
+#~ msgstr "Skapa inte utfiler"
+
+#~ msgid "Architecture-independent install directory"
+#~ msgstr "Arkitekturoberoende installationskatalog"
+
+#~ msgid "Architecture-dependent install directory"
+#~ msgstr "Arkitekturberoende installationskatalog"
+
+#~ msgid "Configure for building on BUILD"
+#~ msgstr "Konfiurera för att bygga på given målarkitektur"
+
+#~ msgid "Cross-compile to build programs to run on HOST"
+#~ msgstr "Korskompilera för angiven värd"
+
+#~ msgid "Configure for building compilers for TARGET"
+#~ msgstr "Konfigurera för att bygga kompilator för angivet mål"
+
+#~ msgid "Select output delimiter"
+#~ msgstr "Välj utdataavgränsare"
+
+#~ msgid "Kerberos server mode"
+#~ msgstr "Kerberosserverläge"
+
+#~ msgid "Print out history information for files"
+#~ msgstr "Visa historikinformation för filer"
+
+#~ msgid "Prompt for password for authenticating server"
+#~ msgstr "Be om lösenord för autentisering"
+
+#~ msgid "Password server mode"
+#~ msgstr "Serverlösenordsläge"
+
+#~ msgid "Show last revision where each line of module was modified"
+#~ msgstr "Visa senaste revision vid vilken vare rad i modul ändrades"
+
+#~ msgid "Indicate that a Module is no longer in use"
+#~ msgstr "Indikera att modul inte längre används"
+
+#~ msgid "Print out history information for a module"
+#~ msgstr "Skriv ut historik för modul"
+
+#~ msgid "Add a symbolic tag to a module"
+#~ msgstr "Lägg till symbolisk tagg till modul"
+
+#~ msgid "Server mode"
+#~ msgstr "Serverläge"
+
+#~ msgid "Display status information on checked out files"
+#~ msgstr "Visa status för utcheckade files"
+
+#~ msgid "Add a symbolic tag to checked out version of files"
+#~ msgstr "Lägg till symbolisk tagg till utcheckad version av filer"
+
+#~ msgid "Bring work tree in sync with repository"
+#~ msgstr "Synkronisera arbetsträd med förråd"
+
+#~ msgid "See who is watching a file"
+#~ msgstr "Visa övervakningar på fil"
+
+#~ msgid "Disable this command"
+#~ msgstr "Inaktivera kommando"
+
+#~ msgid "Shows brief description of command and its arguments"
+#~ msgstr "Visa kort beskrivning av underkommandon"
+
+#~ msgid "Suppress informational output"
+#~ msgstr "Tyst läge"
+
+#~ msgid "Neither verbose nor quiet output"
+#~ msgstr "Varken tyst eller utförligt läge"
+
+#~ msgid "Give output suitable for get --context"
+#~ msgstr "Formatera utdata lämpligt för get --context"
+
+#~ msgid "Generate XML formatted output"
+#~ msgstr "Generera XML-formaterad utdata"
+
+#~ msgid "Give human-readable output"
+#~ msgstr "Människoanpassad formatering av utdata"
+
+#~ msgid "Don't summarize changes"
+#~ msgstr "Summera inte ändringar"
+
+#~ msgid "Answer yes to all patches"
+#~ msgstr "Svara ja på alla fixar"
+
+#~ msgid "Prompt user interactively"
+#~ msgstr "Fråga användaren interaktivt"
+
+#~ msgid "Output patch in a darcs-specific format similar to diff -u"
+#~ msgstr "Skriv fix i darcs-specifikt format som liknar diff -u"
+
+#~ msgid "Specify hash of creator patch (see docs)"
+#~ msgstr "Ange hash av skaparfix (se dokumentationen)"
+
+#~ msgid "Make scripts executable"
+#~ msgstr "Gör skript exekverbara"
+
+#~ msgid "Allow conflicts, but don't mark them"
+#~ msgstr "Tillåt konflikter, men markera dem inte"
+
+#~ msgid "Run the test script"
+#~ msgstr "Kör testskript"
+
+#~ msgid "Don't run the test script"
+#~ msgstr "Kör inte testskript"
+
+#~ msgid "Don't actually take the action"
+#~ msgstr "Gör ingenting"
+
+#~ msgid "Don't automatically fulfill dependencies"
+#~ msgstr "Fråga efter extra beroenden"
+
+#~ msgid "Set default repository [DEFAULT]"
+#~ msgstr "Välj standardförråd"
+
+#~ msgid "Don't set default repository"
+#~ msgstr "Välj inte standardförråd"
+
+#~ msgid "Edit the long comment by default"
+#~ msgstr "Redigera långa kommentarer som standard"
+
+#~ msgid "Don't give a long comment"
+#~ msgstr "Redigera inte lång kommentar"
+
+#~ msgid "Prompt for whether to edit the long comment"
+#~ msgstr "Fråga om den långa kommentaren skall redigeras"
+
+#~ msgid "Don't remove the test directory"
+#~ msgstr "Ta inte bort testkatalog"
+
+#~ msgid "Remove the test directory"
+#~ msgstr "Ta bort testkatalog"
+
+#~ msgid "Sign the patch with your gpg key"
+#~ msgstr "Signera fix med din gpg-nyckel"
+
+#~ msgid "Specify sendmail command"
+#~ msgstr "Ange sendmailkommando"
+
+#~ msgid "Give patch name and comment in file"
+#~ msgstr "Välj fixnamn och kommentar via fil"
+
+#~ msgid "Send to context stored in FILENAME"
+#~ msgstr "Skicka till sammanhang lagrat i FILNAMN"
+
+#~ msgid "Verify that the patch was signed by a key in PUBRING"
+#~ msgstr "Verifiera att fix är signerad från nyckel i angiven nyckelring"
+
+#~ msgid "Don't verify patch signature"
+#~ msgstr "Verifiera inte fix-signaturer"
+
+#~ msgid "Mark conflicts"
+#~ msgstr "Markera konflikter"
+
+#~ msgid "Forward unsigned messages without extra header"
+#~ msgstr "Skicka vidare osignerade meddelanden utan extra huvud"
+
+#~ msgid "Specify a sibling directory"
+#~ msgstr "Ange en syskonkatalog"
+
+#~ msgid "Relink pristine tree (not recommended)"
+#~ msgstr "Linka om till det orörda trädet (inte rekommenderat)"
+
+#~ msgid "Ignore changes whose lines match the REGEX"
+#~ msgstr "Ignorera ändringar som matchar REGEX"
+
+#~ msgid "Output NUM lines of copied context"
+#~ msgstr "Skriv ut NUM rader av kopierad sammanhang"
+
+#~ msgid "Output NUM lines of unified context"
+#~ msgstr "Skriv ut NUM rader av unifieradt sammanhang"
+
+#~ msgid "Output at most NUM print columns"
+#~ msgstr "Skriv ut som mest NUM kolumner"
+
+#~ msgid "Compare FILE2 to all operands"
+#~ msgstr "Jämför FIL2 med alla operander"
+
+#~ msgid "Write size for all files"
+#~ msgstr "Skriv ut storlek för alla filer"
+
+#~ msgid "Print file size, not disk usage"
+#~ msgstr "Skriv ut filstorlek, inte använt diskutrymme"
+
+#~ msgid "Use 1B block size"
+#~ msgstr "Använd 1B som blockstorlek"
+
+#~ msgid "Produce grand total"
+#~ msgstr "Visa totalsumma"
+
+#~ msgid "Dereference file symlinks"
+#~ msgstr "Följ symboliska länkar till filer"
+
+#~ msgid "Use 1kB block size"
+#~ msgstr "Använd 1kB blockstorlek"
+
+#~ msgid "Count hard links multiple times"
+#~ msgstr "Räkna hårda länkar alla gånger de förekommer"
+
+#~ msgid "Dereference all symlinks"
+#~ msgstr "Följ alla symboliska länkar"
+
+#~ msgid "Do not include subdirectory size"
+#~ msgstr "Inkludera inte underkatalogers storlek"
+
+#~ msgid "Display only a total for each argument"
+#~ msgstr "Visa bara en totalsumma för varje argument"
+
+#~ msgid "Command"
+#~ msgstr "Kommando"
+
+#~ msgid "Start with an empty environment"
+#~ msgstr "Starta med tom miljö"
+
+#~ msgid "Remove variable from the environment"
+#~ msgstr "Ta bort variabel från variablestacken"
+
+#~ msgid "File is executable"
+#~ msgstr "Fil är program"
+
+#~ msgid "Run fish with this command"
+#~ msgstr "Utför detta kommando i fish"
+
+#~ msgid "Only parse input, do not execute"
+#~ msgstr "Verifiera bara kommandon, utför dem inte"
+
+#~ msgid "Run in interactive mode"
+#~ msgstr "Kör i interaktivt läge"
+
+#~ msgid "Run in login mode"
+#~ msgstr "Kör i loginläge"
+
+#~ msgid "Set function description"
+#~ msgstr "Välj funktionsbeskrivning"
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Builtin"
+#~ msgstr "Inbyggt kommando"
+
+#~ msgid "Make the function a job exit event handler"
+#~ msgstr "Gör funktionen till en händelsehanterare för avslutade jobb"
+
+#~ msgid "Make the function a process exit event handler"
+#~ msgstr "Gör funktionen till en händelsehanterare för avslutade processer"
+
+#~ msgid "Make the function a signal event handler"
+#~ msgstr "Gör funktionen till en händelsehanterare för signaler"
+
+#~ msgid "Make the function a variable update event handler"
+#~ msgstr "Gör funktionen till en händelsehanterare för variabeluppdateringar"
+
+#~ msgid "Erase function"
+#~ msgstr "Radera funktion"
+
+#~ msgid "Unmount"
+#~ msgstr "Avmontera"
+
+#~ msgid "Quiet"
+#~ msgstr "Tyst läge"
+
+#~ msgid "Lazy unmount"
+#~ msgstr "Lat avmontering"
+
+#~ msgid "Enable automatic template instantiation at link time"
+#~ msgstr "Slå på automatisk templateinstantiering vid länktillfälle"
+
+#~ msgid "Ignore errors"
+#~ msgstr "Ignorera fel"
+
+#~ msgid "Make a signature"
+#~ msgstr "Skapa signatur"
+
+#~ msgid "Make a clear text signature"
+#~ msgstr "Skapa klartextsignatur"
+
+#~ msgid "Make a detached signature"
+#~ msgstr "Skapa bortkopplad signatur"
+
+#~ msgid "Encrypt data"
+#~ msgstr "Kryptera data"
+
+#~ msgid "Encrypt with a symmetric cipher using a passphrase"
+#~ msgstr "Kryptera med symmetriskt chiffer och passfras"
+
+#~ msgid "Store only (make a simple RFC1991 packet)"
+#~ msgstr "Endast lagring (skapa ett enkelt RFC1991-paket)"
+
+#~ msgid "Assume specified file or stdin is sigfile and verify it"
+#~ msgstr ""
+#~ "Antag att angiven fil eller standard in är signatur och verifiera den"
+
+#~ msgid ""
+#~ "Modify certain other commands to accept multiple files for processing"
+#~ msgstr "Ändra vissa andra kommandon so de behandlar multipla filer"
+
+#~ msgid "Identical to '--multifile --verify'"
+#~ msgstr "Identiskt med '--multifile --verify'"
+
+#~ msgid "Identical to '--multifile --encrypt'"
+#~ msgstr "Identiskt med '--multifile --encrypt'"
+
+#~ msgid "Identical to --multifile --decrypt"
+#~ msgstr "Identiskt med --multifile --decrypt"
+
+#~ msgid ""
+#~ "List all keys from the public keyrings, or just the ones given on the "
+#~ "command line"
+#~ msgstr ""
+#~ "Visa alla nycklar från den öppna nyckelringen, eller de angivna på "
+#~ "kommandoraden"
+
+#~ msgid ""
+#~ "List all keys from the secret keyrings, or just the ones given on the "
+#~ "command line"
+#~ msgstr ""
+#~ "Visa alla nycklar från den hemliga nyckelringen, eller de angivna på "
+#~ "kommandoraden"
+
+#~ msgid "Same as --list-keys, but the signatures are listed too"
+#~ msgstr "Samma som --list-keys, men visa även signaturer"
+
+#~ msgid "Same as --list-keys, but the signatures are listed and verified"
+#~ msgstr "Samma som --list-keys, men visa och verifiera även signaturer"
+
+#~ msgid "List all keys with their fingerprints"
+#~ msgstr "Visa alla nycklar och deras fingeravtryck"
+
+#~ msgid "Present a menu which enables you to do all key related tasks"
+#~ msgstr "Visa en meny som låter dig utföra alla nyckelrelaterade aktiviteter"
+
+#~ msgid "Sign a public key with your secret key"
+#~ msgstr "Signera en öppen nyckel med din hemliga nyckel"
+
+#~ msgid "Sign a public key with your secret key but mark it as non exportable"
+#~ msgstr ""
+#~ "Signera en öppen nyckel med din hemliga nyckel men markera den som icke-"
+#~ "exporterbar"
+
+#~ msgid "Remove key from the public keyring"
+#~ msgstr "Ta bort en nyckel från den öppna nyckelringen"
+
+#~ msgid "Remove key from the secret and public keyring"
+#~ msgstr "Ta bort en nyckel från den öppna och den hemliga nyckelringen"
+
+#~ msgid ""
+#~ "Same as --delete-key, but if a secret key exists, it will be removed first"
+#~ msgstr ""
+#~ "Samma som --delete-key, men om en hemlig nyckel existerar, ta bort den "
+#~ "först"
+
+#~ msgid "Generate a revocation certificate for the complete key"
+#~ msgstr "Generera ett återkallelsecertifikat för hela nyckeln"
+
+#~ msgid "Generate a designated revocation certificate for a key"
+#~ msgstr "Generera ett utsett återkallelsecertifikat för en nyckel"
+
+#~ msgid "Export all or the given keys from all keyrings"
+#~ msgstr "Exportera alla eller alla angivna nycklar från alla nyckelringar"
+
+#~ msgid "Same as --export but sends the keys to a keyserver"
+#~ msgstr "Samma som --export, men skicka nycklar till en nyckelserver"
+
+#~ msgid "Same as --export, but exports the secret keys instead"
+#~ msgstr "Samma som --export, men exportera hemliga nycklar istället"
+
+#~ msgid "Import/merge keys"
+#~ msgstr "Importera/sammanslå mycklar"
+
+#~ msgid "Import the keys with the given key IDs from a keyserver"
+#~ msgstr "Importera nycklarna med givet nyckel-id från nyckelserver"
+
+#~ msgid ""
+#~ "Request updates from a keyserver for keys that already exist on the local "
+#~ "keyring"
+#~ msgstr ""
+#~ "Begär uppdateringar från en nyckelserver för nycklar som redan existerar "
+#~ "i den lokala nyckelringen"
+
+#~ msgid "Search the keyserver for the given names"
+#~ msgstr "Sök nyckelservern efter de angivna namnen"
+
+#~ msgid "Do trust database maintenance"
+#~ msgstr "Utför underhåll på förtroendedatabasen"
+
+#~ msgid "Do trust database maintenance without user interaction"
+#~ msgstr "Utför underhåll på förtroendedatabasen utan användarinteraktion"
+
+#~ msgid "Send the ownertrust values to stdout"
+#~ msgstr "Visa ögarförtroendevärdena på standard ut"
+
+#~ msgid ""
+#~ "Update the trustdb with the ownertrust values stored in specified files "
+#~ "or stdin"
+#~ msgstr ""
+#~ "Uppdatera förtroendedatabasen med ägarförtroendevärdena lagrade i den "
+#~ "angivna filen eller standard in"
+
+#~ msgid "Create signature caches in the keyring"
+#~ msgstr "Skapa signarurcache i nyckelringen"
+
+#~ msgid ""
+#~ "Print message digest of specified algorithm for all given files or stdin"
+#~ msgstr ""
+#~ "Visa meddelandedigest med given algoritm för alla angivna filer eller "
+#~ "standard in"
+
+#~ msgid "Print message digest of all algorithms for all given files or stdin"
+#~ msgstr ""
+#~ "Visa meddelandedigest med given algoritm för alla angivna filer eller "
+#~ "standard in"
+
+#~ msgid "Emit specified number of random bytes of the given quality level"
+#~ msgstr ""
+#~ "Skapa det angivna antalet slumpmässiga bytes med den angivna kvaliteten"
+
+#~ msgid "Display version and supported algorithms, and exit"
+#~ msgstr "Visa version och stödda algoritmer och avsluta"
+
+#~ msgid "Display warranty and exit"
+#~ msgstr "Visa garanti och avsluta"
+
+#~ msgid "Create ASCII armored output"
+#~ msgstr "Skapa ASCII-skyddad utdata"
+
+#~ msgid ""
+#~ "Sets a limit on the number of bytes that will be generated when "
+#~ "processing a file"
+#~ msgstr ""
+#~ "Sätt gräns på antal bytes som kommer genereras vid behandlande av en fil"
+
+#~ msgid "Use specified key as the key to sign with"
+#~ msgstr "Använd angiven nyckel som nyckel för signering"
+
+#~ msgid "Use specified key as the default key to sign with"
+#~ msgstr "Använd angiven nyckel som standardnyckel för signering"
+
+#~ msgid "Encrypt for specified user id"
+#~ msgstr "Kryptera för angivet användarid"
+
+#~ msgid "Encrypt for specified user id, but hide the keyid of the key"
+#~ msgstr "Kryptera för angivet användarid, men dölj nyckelid hos nyckel"
+
+#~ msgid "Use specified user id as default recipient"
+#~ msgstr "Använd angiven användarid som standardmottagare"
+
+#~ msgid "Use the default key as default recipient"
+#~ msgstr "Använd standardnyckel som standardmottagare"
+
+#~ msgid "Reset --default-recipient and --default-recipient-self"
+#~ msgstr "Återställ --default-recipient och --default-recipient-self"
+
+#~ msgid "Give more information during processing"
+#~ msgstr "Ge mer information under behandling"
+
+#~ msgid "Compression level"
+#~ msgstr "Kompressionsnivå"
+
+#~ msgid "Use a different decompression method for BZIP2 compressed files"
+#~ msgstr "Använd alternativ dekompressionsmetod för BZIP2-komprimerade filer"
+
+#~ msgid ""
+#~ "Treat input files as text and store them in the OpenPGP canonical text "
+#~ "form with standard 'CRLF' line endings"
+#~ msgstr ""
+#~ "Behandla indatafiler som text och lagra dem i det kanoniska OpenPGP-"
+#~ "textformatet med standard 'CRLF' radavslut"
+
+#~ msgid ""
+#~ "Don't treat input files as text and store them in the OpenPGP canonical "
+#~ "text form with standard 'CRLF' line endings"
+#~ msgstr ""
+#~ "Behandla inte indatafiler som text och lagra dem inte i det kanoniska "
+#~ "OpenPGP-textformatet med standard 'CRLF' radavslut"
+
+#~ msgid "Don't make any changes (this is not completely implemented)"
+#~ msgstr "Gör inga ändringar (inte helt implementerat)"
+
+#~ msgid "Prompt before overwrite"
+#~ msgstr "Fråga före överskrivning"
+
+#~ msgid "Batch mode"
+#~ msgstr "Satsvis-läge"
+
+#~ msgid "Don't use batch mode"
+#~ msgstr "Använd inte satsvis-läge"
+
+#~ msgid "Never write output to terminal"
+#~ msgstr "Skriv aldrig utdata till terminalen"
+
+#~ msgid "Assume yes on most questions"
+#~ msgstr "Anta ja på de flesta frågor"
+
+#~ msgid "Assume no on most questions"
+#~ msgstr "Anta nej på de flesta frågor"
+
+#~ msgid "Prompt for a certification level when making a key signature"
+#~ msgstr "Fråga efter certifieringsnivå vid nyckelsignaturskapande"
+
+#~ msgid "Don't prompt for a certification level when making a key signature"
+#~ msgstr "Fråga inte efter certifieringsnivå vid nyckelsignaturskapande"
+
+#~ msgid ""
+#~ "The default certification level to use for the level check when signing a "
+#~ "key"
+#~ msgstr ""
+#~ "Standardcertifieringsnivå att använda för nivåkontroll vid nyckelsignering"
+
+#~ msgid ""
+#~ "Disregard any signatures with a certification level below specified level "
+#~ "when building the trust database"
+#~ msgstr ""
+#~ "Ignorera alla signaturer med signaturnivå under angiven nivå vid "
+#~ "byggandet av förtroendedatabasen"
+
+#~ msgid ""
+#~ "Assume that the specified key is as trustworthy as one of your own secret "
+#~ "keys"
+#~ msgstr ""
+#~ "Anta att den angivna nyckeln är lika pålitlig som en av dina egna hemliga "
+#~ "nycklar"
+
+#~ msgid "Specify trust model"
+#~ msgstr "Ange förtroendemodell"
+
+#~ msgid "Select how to display key IDs"
+#~ msgstr "Välj hur nyckelid ska visas"
+
+#~ msgid "Options for the keyserver"
+#~ msgstr "Inställningar till nyckelservern"
+
+#~ msgid "Options for importing keys"
+#~ msgstr "Inställningar för att importera nycklar"
+
+#~ msgid "Options for exporting keys"
+#~ msgstr "Inställningar för att exportera nycklar"
+
+#~ msgid "Options for listing keys and signatures"
+#~ msgstr "Inställningar för visning av nycklar och signaturer"
+
+#~ msgid "Options for verifying signatures"
+#~ msgstr "Inställningar för verifiering av signaturer"
+
+#~ msgid ""
+#~ "Display the keyring name at the head of key listings to show which "
+#~ "keyring a given key resides on"
+#~ msgstr ""
+#~ "Visa nyckelringnamnet vid toppen av nyckellistan för att visa vilken "
+#~ "nyckelring en given nyckel ligger i"
+
+#~ msgid "Set the home directory"
+#~ msgstr "Välj hemkatalog"
+
+#~ msgid "Set the native character set"
+#~ msgstr "Välj den interna teckenuppsättningen"
+
+#~ msgid "Assume that following command line arguments are given in UTF8"
+#~ msgstr "Antag att efterföljande argument är lagrade i UTF8"
+
+#~ msgid ""
+#~ "Assume that following arguments are encoded in the character set "
+#~ "specified by --display-charset"
+#~ msgstr ""
+#~ "Antag att efterföljande argument är lagrade i teckenuppsättningen angiven "
+#~ "av --display-charset"
+
+#~ msgid "Shortcut for '--options /dev/null'"
+#~ msgstr "Genväg för '--options /dev/null'"
+
+#~ msgid "Write attribute subpackets to the specified file descriptor"
+#~ msgstr "Skriv attributunderpaket till angiven filidentifierare"
+
+#~ msgid "Include secret key comment packets when exporting secret keys"
+#~ msgstr ""
+#~ "Inkludera hemliga nyckel-kommentarpaket vid exportering av hemliga nycklar"
+
+#~ msgid "Don't include secret key comment packets when exporting secret keys"
+#~ msgstr ""
+#~ "Inkludera inte hemliga nyckel-kommentarpaket vid exportering av hemliga "
+#~ "nycklar (standard)"
+
+#~ msgid "Don't use a comment string"
+#~ msgstr "Använd inte en kommentarsträng"
+
+#~ msgid "Include the version string in ASCII armored output"
+#~ msgstr "Inkludera versionssträng i ASCII-skyddat utdata"
+
+#~ msgid "Don't include the version string in ASCII armored output"
+#~ msgstr "Inkludera inte versionssträng i ASCII-skyddat utdata (standard)"
+
+#~ msgid "Set the 'for your eyes only' flag in the message"
+#~ msgstr "Sätt 'for your eyes only'-flaggan i meddelandet"
+
+#~ msgid "Clear the 'for your eyes only' flag in the message"
+#~ msgstr "Töm 'for your eyes only'-flaggan i meddelandet"
+
+#~ msgid "Create file with name as given in data"
+#~ msgstr "Skapa fil med namn angivet i data"
+
+#~ msgid "Don't create file with name as given in data"
+#~ msgstr "Skapa inte fil med namn angivet i data"
+
+#~ msgid "Use specified cipher algorithm"
+#~ msgstr "Använd angiven chiffer-algoritm"
+
+#~ msgid "Use specified message digest algorithm"
+#~ msgstr "Använd angiven meddelandedigestalgoritm"
+
+#~ msgid "Use specified compression algorithm"
+#~ msgstr "Använd angiven kompressionsalgoritm"
+
+#~ msgid "Use specified message digest algorithm when signing a key"
+#~ msgstr "Använd angiven meddelandedigestalgoritm vid nyckelsignering"
+
+#~ msgid "Use specified cipher algorithm to protect secret keys"
+#~ msgstr "Använd angiven chifferalgoritm för att skydda hemliga nycklar"
+
+#~ msgid "Use specified digest algorithm to mangle the passphrases"
+#~ msgstr "Använd angiven digestalgoritm för passfrasmangling"
+
+#~ msgid "Selects how passphrases are mangled"
+#~ msgstr "Välj hur passfrasmangling"
+
+#~ msgid "Integrity protect secret keys by using a SHA-1 checksum"
+#~ msgstr ""
+#~ "Sködda hemliga nycklars integritet genom att använda en SHA-1-"
+#~ "kontrollsumma"
+
+#~ msgid "Never allow the use of specified cipher algorithm"
+#~ msgstr "Tilåt aldrig användandet av angiven chifferalgoritm"
+
+#~ msgid "Never allow the use of specified public key algorithm"
+#~ msgstr "Tillåt aldrig användandet av angiven öppen nyckel-algoritm"
+
+#~ msgid "Do not cache the verification status of key signatures"
+#~ msgstr "Cache:a inte verifieringsstatus av nyckelsignaturer"
+
+#~ msgid "Do not verify each signature right after creation"
+#~ msgstr "Kontrollera inte varje signatur direkt efter skapande"
+
+#~ msgid "Automatically run the --check-trustdb command internally when needed"
+#~ msgstr "Utför automatiskt '--check-trustdb'-kommandot internt vid behov"
+
+#~ msgid "Never automatically run the --check-trustdb"
+#~ msgstr "Utför aldrig automatiskt '--check-trustdb'-kommandot"
+
+#~ msgid "Do not put the recipient keyid into encrypted packets"
+#~ msgstr "Lägg inte in mottagarens nyckelid i krypterade paket"
+
+#~ msgid "Put the recipient keyid into encrypted packets"
+#~ msgstr "Lägg in mottagarens nyckelid i krypterade paket"
+
+#~ msgid ""
+#~ "Change the behavior of cleartext signatures so that they can be used for "
+#~ "patch files"
+#~ msgstr ""
+#~ "Ändra beteendet av klartextsignaturer så att de kan användas för fix-filer"
+
+#~ msgid "Mangle From-field of email headers (default)"
+#~ msgstr "Mangla 'From'-fält i e-posthuvuden (standard)"
+
+#~ msgid "Do not mangle From-field of email headers"
+#~ msgstr "Mangla inte 'From'-fält i e-posthuvuden (standard)"
+
+#~ msgid "Try to use the GnuPG-Agent"
+#~ msgstr "Försök använda GnuPG-Agent"
+
+#~ msgid "Do not try to use the GnuPG-Agent"
+#~ msgstr "Försök inte använda GnuPG-Agent"
+
+#~ msgid "Force v3 signatures for signatures on data"
+#~ msgstr "Tvinga v3-signaturer för signering av data"
+
+#~ msgid "Do not force v3 signatures for signatures on data"
+#~ msgstr "Tvinga inte v3-signaturer för signering av data"
+
+#~ msgid "Always use v4 key signatures even on v3 keys"
+#~ msgstr "Använd alltid v4-nyckelsignaturer även på v3-nycklar"
+
+#~ msgid "Don't use v4 key signatures on v3 keys"
+#~ msgstr "Använd inte v4-nyckelsignaturer på v3-nycklar"
+
+#~ msgid "Force the use of encryption with a modification detection code"
+#~ msgstr "Tvinga användandet av kryptering med en modifieringsdetekteringskod"
+
+#~ msgid "Disable the use of the modification detection code"
+#~ msgstr "Avaktivera användandet av ändringsdetekteringskod"
+
+#~ msgid ""
+#~ "Allow the import and use of keys with user IDs which are not self-signed"
+#~ msgstr ""
+#~ "Tillåt importering och användning av nycklar med användarid som inte är "
+#~ "självsignerade"
+
+#~ msgid ""
+#~ "Do not allow the import and use of keys with user IDs which are not self-"
+#~ "signed"
+#~ msgstr ""
+#~ "Tillåt inte importering och användning av nycklar med användarid som inte "
+#~ "är självsignerade"
+
+#~ msgid ""
+#~ "Disable all checks on the form of the user ID while generating a new one"
+#~ msgstr ""
+#~ "Avaktivera alla kontroller på formatet av användarid vid generering av "
+#~ "nya användarid"
+
+#~ msgid "Do not fail if signature is older than key"
+#~ msgstr "Misslyckas inte om signatur är äldre än nyckel"
+
+#~ msgid "Allow subkeys that have a timestamp from the future"
+#~ msgstr "Tillåt undernycklar som har tidsstämpel från framtiden"
+
+#~ msgid "Ignore CRC errors"
+#~ msgstr "Ignorera CRC-fel"
+
+#~ msgid "Do not fail on MDC integrity protection failure"
+#~ msgstr "Misslyckas inte vid MDC-integritetsskyddsmisslyckande"
+
+#~ msgid ""
+#~ "Lock the databases the first time a lock is requested and do not release "
+#~ "the lock until the process terminates"
+#~ msgstr ""
+#~ "Lås databaser vid första läsförfrågan och släpp inte låset före processen "
+#~ "avslutar"
+
+#~ msgid "Release the locks every time a lock is no longer needed"
+#~ msgstr "Släpp lås varje gång det inte längre behövs"
+
+#~ msgid ""
+#~ "Do not create an internal pool file for quicker generation of random "
+#~ "numbers"
+#~ msgstr "Skapa inte en intern pool-fil för snabbare generering av slumptal"
+
+#~ msgid "Suppress the initial copyright message"
+#~ msgstr "Visa inte initialt copyrightmeddelande"
+
+#~ msgid "Suppress the warning about 'using insecure memory'"
+#~ msgstr "Undertryck varningen om 'använder osäkert minne'"
+
+#~ msgid ""
+#~ "Suppress the warning about unsafe file and home directory (--homedir) "
+#~ "permissions"
+#~ msgstr ""
+#~ "Undertryck varningen om osäkra fil- och hemkatalogrättigheter (--homedir) "
+
+#~ msgid "Suppress the warning about missing MDC integrity protection"
+#~ msgstr "Undertryck varningen om saknat MDCintegritetsskydd"
+
+#~ msgid "Refuse to run if GnuPG cannot get secure memory"
+#~ msgstr "Vägra köra om GnuPG inte kan få säkert minne"
+
+#~ msgid "Do not refuse to run if GnuPG cannot get secure memory (default)"
+#~ msgstr "Vägra inte köra om GnuPG inte kan få säkert minne"
+
+#~ msgid "Assume the input data is not in ASCII armored format"
+#~ msgstr "Antag att indata inte är i ASCII-skyddat format"
+
+#~ msgid "Do not add the default keyrings to the list of keyrings"
+#~ msgstr "Lägg inte standardnyckelringar till listan på nyckelringar"
+
+#~ msgid "Skip the signature verification step"
+#~ msgstr "Skippa signaturverifieringssteg"
+
+#~ msgid "Print key listings delimited by colons"
+#~ msgstr "Visa nyckellistning separerad av kolon"
+
+#~ msgid ""
+#~ "Print key listings delimited by colons (like --with-colons) and print the "
+#~ "public key data"
+#~ msgstr ""
+#~ "Visa nyckellistning separerad av kolon (som --with-colons) och visa öppen "
+#~ "nyckel data"
+
+#~ msgid ""
+#~ "Same as the command --fingerprint but changes only the format of the "
+#~ "output and may be used together with another command"
+#~ msgstr ""
+#~ "Samma som kommandot --fingerprint men byter bara formatet på utdata och "
+#~ "kan användas med andra kommandon"
+
+#~ msgid "Changes the output of the list commands to work faster"
+#~ msgstr "Ändrar utdata av listningskommandon så det fungerar snabbare"
+
+#~ msgid ""
+#~ "Do not merge primary user ID and primary key in --with-colon listing mode "
+#~ "and print all timestamps as UNIX timestamps"
+#~ msgstr ""
+#~ "Sammanställ inte primära användarid i '--with-colon'-listningsläge och "
+#~ "skriv alla tidsstämplar som UNIX-tidsstämplar"
+
+#~ msgid ""
+#~ "Changes the behaviour of some commands. This is like --dry-run but "
+#~ "different"
+#~ msgstr "Ändrar beteendet av vissa kommandon. Som --dry-run men annorlunda"
+
+#~ msgid "Display the session key used for one message"
+#~ msgstr "Visa sessionsnyckel som används för ett meddelande"
+
+#~ msgid "Prompt for an expiration time"
+#~ msgstr "Fråga efter utgångsdatum"
+
+#~ msgid "Do not prompt for an expiration time"
+#~ msgstr "Fråga inte efter utgångsdatum"
+
+#~ msgid ""
+#~ "Don't look at the key ID as stored in the message but try all secret keys "
+#~ "in turn to find the right decryption key"
+#~ msgstr ""
+#~ "Undersök inte nyckelid lagrat i meddelande, försök alla hemliga nycklar i "
+#~ "turordningför att hitta rätt dekrypteringsnyckel"
+
+#~ msgid ""
+#~ "Enable a mode in which filenames of the form -&n, where n is a non-"
+#~ "negative decimal number, refer to the file descriptor n and not to a file "
+#~ "with that name"
+#~ msgstr ""
+#~ "Aktivera ett läge i vilket filnamn på formen -&n, där n är ett positivt "
+#~ "heltal, refererar  till filidentifierare n, och inte till filen med det "
+#~ "angivna namnet"
+
+#~ msgid "Remove a given entry from the --group list"
+#~ msgstr "Ta bort ett inlägg från ---group'-listan"
+
+#~ msgid "Remove all entries from the --group list"
+#~ msgstr "Ta bort alla inlägg från förråd från '--group'-listan"
+
+#~ msgid ""
+#~ "Don't change the permissions of a secret keyring back to user read/write "
+#~ "only"
+#~ msgstr ""
+#~ "Ändra inte rättigheterna på en hemlig nyckel tillbaka till läs/skriv "
+#~ "endast för användaren"
+
+#~ msgid "Print annotated source"
+#~ msgstr "Skriv ut kommenterad källkod"
+
+#~ msgid "Do not print explanations"
+#~ msgstr "Skriv inte ut förklaringar"
+
+#~ msgid "Print tally"
+#~ msgstr "Visa sammanställning av antal funktionanrop"
+
+#~ msgid "Display summary"
+#~ msgstr "Visa sammanställning"
+
+#~ msgid "No annotated source"
+#~ msgstr "Visa inte kommenterad källkod"
+
+#~ msgid "Print full path of source"
+#~ msgstr "Visa full sökväg till källkod"
+
+#~ msgid "No flat profile"
+#~ msgstr "Visa inte platt profil"
+
+#~ msgid "Print call graph"
+#~ msgstr "Visa anropsgraf"
+
+#~ msgid "No call graph"
+#~ msgstr "Visa inte anropsgraf"
+
+#~ msgid "Annotate to file"
+#~ msgstr "Skriv kommentarer till fil"
+
+#~ msgid "No tally"
+#~ msgstr "Visa inte sammanställning av antal funktionanrop"
+
+#~ msgid "Suggest function ordering"
+#~ msgstr "Föreslå funktionsordning"
+
+#~ msgid "Suggest file ordering"
+#~ msgstr "Föreslå filordning"
+
+#~ msgid "Traditional mode"
+#~ msgstr "Traditionellt läge"
+
+#~ msgid "Set width of output"
+#~ msgstr "Välj bredd på utdata"
+
+#~ msgid "Annotate every line"
+#~ msgstr "Kommentera varje rad"
+
+#~ msgid "Set demangling style"
+#~ msgstr "Välj avmanglingsstil"
+
+#~ msgid "Turn of demangling"
+#~ msgstr "Slå av avmangling"
+
+#~ msgid "Supress static functions"
+#~ msgstr "Visa inte statiska funktioner"
+
+#~ msgid "Ignore symbols not known to be functions"
+#~ msgstr "Ignorera symboler som inte är kända funktioner"
+
+#~ msgid "Line by line profiling"
+#~ msgstr "Profilera radvis"
+
+#~ msgid "Only propagate times for matching symbols"
+#~ msgstr "Propagera bara tider för matchande symboler"
+
+#~ msgid "Do not propagate times for matching symbols"
+#~ msgstr "Skicka inte vidare tider för matchande symboler"
+
+#~ msgid "Mention unused functions in flat profile"
+#~ msgstr "Nämn oanvända funktioner i platt profil"
+
+#~ msgid "Specify debugging options"
+#~ msgstr "Välj debuginställningar"
+
+#~ msgid "Print summary"
+#~ msgstr "Visa sammanfattning"
+
+#~ msgid "Action for devices"
+#~ msgstr "Handling för enheter"
+
+#~ msgid "Action for directories"
+#~ msgstr "Handling för kataloger"
+
+#~ msgid "List compression information"
+#~ msgstr "Visa kompressionsinformation"
+
+#~ msgid "Do not save/restore filename"
+#~ msgstr "Spara/återställ inte filnamn"
+
+#~ msgid "Save/restore filename"
+#~ msgstr "Spara/återställ filnamn"
+
+#~ msgid "Display compression ratios"
+#~ msgstr "Visa kompressionsgrad"
+
+#~ msgid "Use fast setting"
+#~ msgstr "Använd inställningar för hög fart"
+
+#~ msgid "Use high compression setting"
+#~ msgstr "Använd inställningar för hög kompressionsnivå"
+
+#~ msgid "Update interval"
+#~ msgstr "Uppdateringsintervall"
+
+#~ msgid "Output file"
+#~ msgstr "Utdatafil"
+
+#~ msgid "Print effective group id"
+#~ msgstr "Visa effektivt grupp-id"
+
+#~ msgid "Print all group ids"
+#~ msgstr "Visa alla grupp-id"
+
+#~ msgid "Print real ID, not effective"
+#~ msgstr "Visa verkligt id, inte effektivt"
+
+#~ msgid "Print effective user ID"
+#~ msgstr "Visa effektivt användar-id"
+
+#~ msgid "Show group id of job"
+#~ msgstr "Visa grupp-id för jobb"
+
+#~ msgid "Show commandname of each job"
+#~ msgstr "Visa kommandonamn för varje jobb"
+
+#~ msgid "Only show status for last job to be started"
+#~ msgstr "Visa bara status för det senast startade jobbet"
+
+#~ msgid "Search after end of screen"
+#~ msgstr "Sök förbi slut på skärmen"
+
+#~ msgid "Disable automtic buffer allocation"
+#~ msgstr "Inaktivera automatisk buffert-allokering"
+
+#~ msgid "Repaint from top"
+#~ msgstr "Rita om från toppen"
+
+#~ msgid "Clear and repaint from top"
+#~ msgstr "Töm och rita om från toppen"
+
+#~ msgid "Supress error for lacking terminal capability"
+#~ msgstr "Visa inte felmeddelanden för saknade terminalförmågor"
+
+#~ msgid "Exit on second EOF"
+#~ msgstr "Avsluta andra gången filslut påträffas"
+
+#~ msgid "Exit on EOF"
+#~ msgstr "Avsluta vid filslut"
+
+#~ msgid "Open non-regular files"
+#~ msgstr "Öppna icke-reguljär fil"
+
+#~ msgid "Quit if file shorter than one screen"
+#~ msgstr "Avsluta om filen är kortare än en skärmfull"
+
+#~ msgid "Hilight one search target"
+#~ msgstr "Markera ett sökmål"
+
+#~ msgid "No search highlighting"
+#~ msgstr "Markera inte sökmål"
+
+#~ msgid "Maximum backward scroll"
+#~ msgstr "MAximal bakåtrullning"
+
+#~ msgid "Search ignores lowercase case"
+#~ msgstr "Sökning ignorerar gemener"
+
+#~ msgid "Search ignores all case"
+#~ msgstr "Sökning ignorerar skiftläge"
+
+#~ msgid "Target line"
+#~ msgstr "Målrad"
+
+#~ msgid "Display status column"
+#~ msgstr "Visa statuskolumn"
+
+#~ msgid "Verbose prompt"
+#~ msgstr "Utförlig prompt"
+
+#~ msgid "Display line number"
+#~ msgstr "Visa radnummer"
+
+#~ msgid "Display line number for each line"
+#~ msgstr "Visa radnummer för varje rad"
+
+#~ msgid "Log input to file"
+#~ msgstr "Logga indata till fil"
+
+#~ msgid "Log to file, overwrite"
+#~ msgstr "Logga til fil, skriv över tidigare information"
+
+#~ msgid "Start at first occurrence of pattern"
+#~ msgstr "Starta vid första matchningen av angivet mönster"
+
+#~ msgid "Prompt string"
+#~ msgstr "Promptsträng"
+
+#~ msgid "Silent mode"
+#~ msgstr "Tyst läge"
+
+#~ msgid "Completly silent mode"
+#~ msgstr "Fullständigt tyst läge"
+
+#~ msgid "Display control chars"
+#~ msgstr "Visa kontrolltecken"
+
+#~ msgid "Display control chars, guess screen appearance"
+#~ msgstr "Visa kontrolltecken, försök gissa skärmutseende"
+
+#~ msgid "Multiple blank lines sqeezed"
+#~ msgstr "Slå ihop multipla tomma rader"
+
+#~ msgid "Edit tag"
+#~ msgstr "Redigera markering"
+
+#~ msgid "Set tag file"
+#~ msgstr "Välj markeringsfil"
+
+#~ msgid "Allow backspace and carriage return"
+#~ msgstr "Tillåt backsteg och vagnretur"
+
+#~ msgid "Allow backspace, tab and carriage return"
+#~ msgstr "Tillåt backsteg, tabb och vagnretur"
+
+#~ msgid "Highlight first unread line on new page"
+#~ msgstr "Markera den första olästa raden på ny sida"
+
+#~ msgid "Highlight first unread line on any movement"
+#~ msgstr "Markera den första olästa radenvid alla rörelser"
+
+#~ msgid "Set tab stops"
+#~ msgstr "Välj tabbstorlek"
+
+#~ msgid "No termcap init"
+#~ msgstr "Initiera inte med termcap"
+
+#~ msgid "No keypad init"
+#~ msgstr "Initiera inte numeriskt tangentbord"
+
+#~ msgid "Maximum forward scroll"
+#~ msgstr "Maximal framrullning"
+
+#~ msgid "Max scroll window"
+#~ msgstr "Maximalt rullningsfönster"
+
+#~ msgid "Set quote char"
+#~ msgstr "Välj citat-tecken"
+
+#~ msgid "Lines after EOF are blank"
+#~ msgstr "Gör rader efter filslut tomma"
+
+#~ msgid "Characters to scroll on left/right arrows"
+#~ msgstr "Tecken att rulla på vänster/högerpil"
+
+#~ msgid "Set block size"
+#~ msgstr "Välj blockstorlek"
+
+#~ msgid "Select quoting style"
+#~ msgstr "Välj citatstil"
+
+#~ msgid "Sort criteria"
+#~ msgstr "Sorteringskriterium"
+
+#~ msgid "Show time type"
+#~ msgstr "Visa tidtyp"
+
+#~ msgid "Select time style"
+#~ msgstr "Välj tidformat"
+
+#~ msgid "Assume tab stops at each COLS"
+#~ msgstr "Antag tabbavstånd"
+
+#~ msgid "Assume screen width"
+#~ msgstr "Antag skärmbredd"
+
+#~ msgid "Append dependencies to makefile"
+#~ msgstr "Lägg till beroenden till makefil"
+
+#~ msgid "Warn about multiple inclusion"
+#~ msgstr "Varna vid upprapad inkudering"
+
+#~ msgid "Environment before makefile"
+#~ msgstr "Använd värden från miljövariabler före värden från make-fil"
+
+#~ msgid "Continue after an error"
+#~ msgstr "Fortsätt vid fel"
+
+#~ msgid "Start when load drops"
+#~ msgstr "Starta när belastningen minstar"
+
+#~ msgid "Do not execute commands"
+#~ msgstr "Utför inte kommandon"
+
+#~ msgid "Print database"
+#~ msgstr "Visa databas"
+
+#~ msgid "Question mode"
+#~ msgstr "Frågeläge"
+
+#~ msgid "Eliminate implicit rules"
+#~ msgstr "Ta bort implicita regler"
+
+#~ msgid "Don't continue after an error"
+#~ msgstr "Fortsätt inte vid fel"
+
+#~ msgid "Touch files, don't run commands"
+#~ msgstr "Ändra ändringstid på filer, utför inte kommandon"
+
+#~ msgid "Program section"
+#~ msgstr "Programsektion"
+
+#~ msgid "Syscall section"
+#~ msgstr "Systemanroppssektion"
+
+#~ msgid "Library section"
+#~ msgstr "Bibliotekssektion"
+
+#~ msgid "Device section"
+#~ msgstr "Enhetssektion"
+
+#~ msgid "File format section"
+#~ msgstr "Filformatssektion"
+
+#~ msgid "Games section"
+#~ msgstr "Spelsektion"
+
+#~ msgid "Misc section"
+#~ msgstr "Övrig sektion"
+
+#~ msgid "Admin section"
+#~ msgstr "Administartionssektion"
+
+#~ msgid "Kernel section"
+#~ msgstr "Kärnsektion"
+
+#~ msgid "Tcl section"
+#~ msgstr "Tclsektion"
+
+#~ msgid "New section"
+#~ msgstr "Ny sektion"
+
+#~ msgid "Local section"
+#~ msgstr "Lokal sektion"
+
+#~ msgid "Old section"
+#~ msgstr "Gammal sektion"
+
+#~ msgid "Manpath"
+#~ msgstr "Manualsökväg"
+
+#~ msgid "Pager"
+#~ msgstr "Visare"
+
+#~ msgid "Always reformat"
+#~ msgstr "Formatera alltid om"
+
+#~ msgid "Debug"
+#~ msgstr "Debug-läge"
+
+#~ msgid "Debug and run"
+#~ msgstr "Debugga och kör"
+
+#~ msgid "Show whatis information"
+#~ msgstr "Visa whatis-information"
+
+#~ msgid "Format only"
+#~ msgstr "Formatera bara, visa inte"
+
+#~ msgid "Show apropos information"
+#~ msgstr "Visa apropos-information"
+
+#~ msgid "Search in all man pages"
+#~ msgstr "Sök i alla manualsidor"
+
+#~ msgid "Set system"
+#~ msgstr "Välj system"
+
+#~ msgid "Preprocessors"
+#~ msgstr "Förprocessorer"
+
+#~ msgid "Format for printing"
+#~ msgstr "Formatera för utskrift"
+
+#~ msgid "Only print locations"
+#~ msgstr "Visa bara platser"
+
+#~ msgid "Print messages about what the program is doing"
+#~ msgstr "Visa meddelanden om vad programmet gör"
+
+#~ msgid "Dump configuration file"
+#~ msgstr "Dumpa konfigurationsfil"
+
+#~ msgid "Do not actually insert/remove module"
+#~ msgstr "Utför inte insättning/borttagning av modul"
+
+#~ msgid "Ignore install and remove commands in configuration file"
+#~ msgstr ""
+#~ "Ignorera installations- och borttagningskommandon i konfigurationsfil"
+
+#~ msgid "Ignore bogus module names"
+#~ msgstr "Ignorera felaktiga modulnamn"
+
+#~ msgid "Remove modules"
+#~ msgstr "Ta bort moduler"
+
+#~ msgid "Ignore all version information"
+#~ msgstr "Ignorera all versionsinformation"
+
+#~ msgid "Ignore module interface version"
+#~ msgstr "Ignorera modulinterfaceversion"
+
+#~ msgid "Insert modules matching the given wildcard"
+#~ msgstr "Ligg till alla moduler som matchar parameter med jokertecken"
+
+#~ msgid "Restrict wildcards to specified directory"
+#~ msgstr "Begränsa jokertecken till den angivna katalogen"
+
+#~ msgid "Send error messages through syslog"
+#~ msgstr "Skicka felmeddelanden genom syslog"
+
+#~ msgid "Specify kernel version"
+#~ msgstr "Välj kärnversion"
+
+#~ msgid "List dependencies of module"
+#~ msgstr "Visa beroenden för modul"
+
+#~ msgid "Rename module"
+#~ msgstr "Byt namn på modul"
+
+#~ msgid "Fail if inserting already loaded module"
+#~ msgstr "Misslyckas vid insättning av redan laddad modul"
+
+#~ msgid "Fork process for each mount"
+#~ msgstr "Starta underprocess för varje montering"
+
+#~ msgid "Fake mounting"
+#~ msgstr "Falsk montering"
+
+#~ msgid "Add label to output"
+#~ msgstr "Lägg till etikett till utdata"
+
+#~ msgid "Do not write mtab"
+#~ msgstr "Skriv inte till mtab"
+
+#~ msgid "Dynamically change postprocessing"
+#~ msgstr "Ändra efterbehyandling dynamiskt"
+
+#~ msgid "Skip frames to maintain A/V sync"
+#~ msgstr "Hoppa över bilder för att behålla ljud/bild synkronisering"
+
+#~ msgid "Full screen"
+#~ msgstr "Fullskärmsläge"
+
+#~ msgid "Set playlist"
+#~ msgstr "Välj spellista"
+
+#~ msgid "Audio language"
+#~ msgstr "Ljudspråk"
+
+#~ msgid "Play audio from file"
+#~ msgstr "Spela ljud från fil"
+
+#~ msgid "Set default CD-ROM drive"
+#~ msgstr "Välj normal CD-ROM-enhet"
+
+#~ msgid "Set number of audio channels"
+#~ msgstr "Välj antal ljudkanaler"
+
+#~ msgid "Set start chapter"
+#~ msgstr "Välj startkapitel"
+
+#~ msgid "Set default DVD-ROM drive"
+#~ msgstr "Välj normal DVD-ROM-enhet"
+
+#~ msgid "Set dvd viewing angle"
+#~ msgstr "Välj dvd-betraktningsvinkel"
+
+#~ msgid "Force rebuilding index"
+#~ msgstr "Tvinga ombyggning av index"
+
+#~ msgid "Override framerate"
+#~ msgstr "Åsidosätt bildfrekvens"
+
+#~ msgid "Load index from file"
+#~ msgstr "Ladda index från fil"
+
+#~ msgid "Force non-interleaved AVI parser"
+#~ msgstr "Tvinga icke-sammanflätat AVI-tolk"
+
+#~ msgid "Rebuild index and save to file"
+#~ msgstr "Bygg om index och spara till fil"
+
+#~ msgid "Seek to given time position"
+#~ msgstr "Sök till angiven tidsposition"
+
+#~ msgid "TV capture mode"
+#~ msgstr "TV-inspelningsläge"
+
+#~ msgid "Subtitle language"
+#~ msgstr "Textningsspråk"
+
+#~ msgid "Subtitle file"
+#~ msgstr "Textningsfil"
+
+#~ msgid "Handle subtitlefile as unicode"
+#~ msgstr "Hantera textningsfil som unicode"
+
+#~ msgid "Handle subtitlefile as utf8"
+#~ msgstr "Hantera textningsfil som utf8"
+
+#~ msgid "Make backup of each existing destination file"
+#~ msgstr "Gör backup av varje existerande destinationsfil"
+
+#~ msgid "Do not prompt before overwriting"
+#~ msgstr "Fråga inte före överskrivning"
+
+#~ msgid "Remove trailing slashes from source"
+#~ msgstr "Ta bort snedstreck i slutet på källangivelser"
+
+#~ msgid "Target directory"
+#~ msgstr "Målkatalog"
+
+#~ msgid "Do not overwrite newer files"
+#~ msgstr "Skriv inte över nyare filer"
+
+#~ msgid "Also print directory history"
+#~ msgstr "Skriv även ut kataloghistorik"
+
+#~ msgid ""
+#~ "Make backup files, when patching a file, rename or copy the original "
+#~ "instead of removing it"
+#~ msgstr ""
+#~ "Skapa backupfiler, vid fixning av fil, byt namn eller kopiera orginalet "
+#~ "istället för att ta bort det"
+
+#~ msgid "Back up a file if the patch does not match the file exactly"
+#~ msgstr "Skapa backup av fil om fix inte matchar filen exakt"
+
+#~ msgid "Do not back up a file if the patch does not match the file exactly"
+#~ msgstr "Skapa inte backup av fil om fix inte matchar filen exakt"
+
+#~ msgid "Interpret the patch file as an ed script"
+#~ msgstr "Tolka fixfil som ett ed-skript"
+
+#~ msgid "Set the maximum fuzz factor"
+#~ msgstr "Sätt maximal fuzzfaktor"
+
+#~ msgid "Use style word to quote output names"
+#~ msgstr "Använd angiven stil vid citering av utdatanamn"
+
+#~ msgid "Put rejects into rejectfile instead of the default .rej file"
+#~ msgstr ""
+#~ "Lägg till misslyckade fixar till angiven fil istället för standard-.rej-"
+#~ "fil"
+
+#~ msgid ""
+#~ "Assume that this patch was created with the old and new files swapped"
+#~ msgstr "Antag att denna fix skapades med ombytta gamla och nya filer"
+
+#~ msgid "Work silently, unless an error occurs"
+#~ msgstr "Arbeta tyst, om inte ett fel uppstår"
+
+#~ msgid "Interpret the patch file as a unified context diff"
+#~ msgstr "Tolka fixfil som unifierad kontextdiff"
+
+#~ msgid "Debug option"
+#~ msgstr "Debugflagga"
+
+#~ msgid "Set regexp used to split input"
+#~ msgstr "Välj reguljärt uttryck för att avdela indata"
+
+#~ msgid "Edit files in-place"
+#~ msgstr "Redigera filer på plats"
+
+#~ msgid "Include path"
+#~ msgstr "Inkluderingssökväg"
+
+#~ msgid "Open folder"
+#~ msgstr "Öppna katalog"
+
+#~ msgid "Open file"
+#~ msgstr "Öppna fil"
+
+#~ msgid "Initial set of keystrokes"
+#~ msgstr "Initiala tangenttryckningar"
+
+#~ msgid "Use function keys for commands"
+#~ msgstr "Använd funktionstangenter för kommandon"
+
+#~ msgid "Expand collections in FOLDER LIST display"
+#~ msgstr "Expandera samlingar i sidan 'FOLDER LIST'"
+
+#~ msgid "Start with specified current message number"
+#~ msgstr "Starta vid angivet meddelandenummer"
+
+#~ msgid "Open folder read-only"
+#~ msgstr "Öppna folder i skrivskyddat läge"
+
+#~ msgid "Set global configuration file"
+#~ msgstr "Välj global konfigurationsfil"
+
+#~ msgid "Enable suspension support"
+#~ msgstr "Aktivera stöd för programpausning (^Z)"
+
+#~ msgid "Produce a sample global configuration file"
+#~ msgstr "Skapa global exempelkonfigurationsfil"
+
+#~ msgid "Produce sample configuration file"
+#~ msgstr "Skapa exempelkonfigurationsfil"
+
+#~ msgid "Set mail sort order"
+#~ msgstr "Välj brevsorteringsordning"
+
+#~ msgid "Config option"
+#~ msgstr "Konfigurationsinställning"
+
+#~ msgid "Audible ping"
+#~ msgstr "Hörbart ping"
+
+#~ msgid "Adaptive ping"
+#~ msgstr "Adaptiv ping"
+
+#~ msgid "Allow pinging a broadcast address"
+#~ msgstr "Tillåt pingning till broadcast-adress"
+
+#~ msgid "Do not allow ping to change source address of probes"
+#~ msgstr "Tillåt inte ping att ändra källadress på sonder"
+
+#~ msgid "Stop after specified number of ECHO_REQUEST packets"
+#~ msgstr "Stoppa efter angivet antal ECHO_REQUEST-paket"
+
+#~ msgid "Set the SO_DEBUG option on the socket being used"
+#~ msgstr "Sätt SO_DEBUG-flaggan på uttaget (socket) som används"
+
+#~ msgid "Allocate and set 20 bit flow label on ECHO_REQUEST packets"
+#~ msgstr "Allokera och sätt 20 bitars flödesetikett på ECHO_REQUEST-paket"
+
+#~ msgid "Flood ping"
+#~ msgstr "Översvämmningsping"
+
+#~ msgid "Wait specified interval of seconds between sending each packet"
+#~ msgstr "Vänta angivet antal sekunder mellan skickande av paket"
+
+#~ msgid "Set source address to specified interface address"
+#~ msgstr "Välj källadress till angiven gränssnittsadress"
+
+#~ msgid "Send the specified number of packets without waiting for reply"
+#~ msgstr "Skicka angivet antal paket utan att vänta på svar"
+
+#~ msgid "Suppress loopback of multicast packets"
+#~ msgstr "Undertryck vändslinga (loopback) för multicastpaket"
+
+#~ msgid "Numeric output only"
+#~ msgstr "Bara numerisk utdata"
+
+#~ msgid "Pad packet with empty bytes"
+#~ msgstr "Lägg till tomma bytes till paket"
+
+#~ msgid "Set Quality of Service -related bits in ICMP datagrams"
+#~ msgstr "Sätt Tjänstekvalitets-relaterade bitar i ICMP-datagram"
+
+#~ msgid "Record route"
+#~ msgstr "Spela in rutt"
+
+#~ msgid ""
+#~ "Bypass the normal routing tables and send directly to a host on an "
+#~ "attached interface"
+#~ msgstr ""
+#~ "Gå förbi de vanliga rutt-tabellerna och skicka direkt till en värd på ett "
+#~ "inkopplat gränssnitt"
+
+#~ msgid "Set socket buffer size"
+#~ msgstr "Välj uttags (socket) buffertstorlek"
+
+#~ msgid "Set the IP Time to Live"
+#~ msgstr "Välj paketlivstid på IP-protokollnivå"
+
+#~ msgid "Set special IP timestamp options"
+#~ msgstr "Välj särskilda inställningar för IP-protokoll-tidsstämpel"
+
+#~ msgid "Select Path MTU Discovery strategy"
+#~ msgstr "Välj MTU-väghittarstrategi"
+
+#~ msgid "Print full user-to-user latency"
+#~ msgstr "Visa full användare-tilöl-användare-latens"
+
+#~ msgid ""
+#~ "Specify  a timeout, in seconds, before ping exits regardless of how many "
+#~ "packets have been sent or received"
+#~ msgstr ""
+#~ "Ange en timeout, i sekunder, innan ping avslutar oavsett hur många paket "
+#~ "som skickats eller tagits emot"
+
+#~ msgid "Time to wait for a response, in seconds"
+#~ msgstr "Tid att vänta på ett svar, i sekunder"
+
+#~ msgid "Select all"
+#~ msgstr "Välj alla"
+
+#~ msgid "Invert selection"
+#~ msgstr "Invertera val"
+
+#~ msgid "Select all processes except session leaders and terminal-less"
+#~ msgstr "Välj alla processer utom sessionsledare och terminal-lösa"
+
+#~ msgid "Select all processes except session leaders"
+#~ msgstr "Välj alla processer utom sessionsledare"
+
+#~ msgid "Deselect all processes that do not fulfill conditions"
+#~ msgstr "Avmarkera alla processer som inte uppfyller villkor"
+
+#~ msgid "Select by command"
+#~ msgstr "Välj via kommando"
+
+#~ msgid "Select by group"
+#~ msgstr "Välj via grupp"
+
+#~ msgid "Select by user"
+#~ msgstr "Välj via användare"
+
+#~ msgid "Select by group/session"
+#~ msgstr "Väljvia användare/session"
+
+#~ msgid "Select by PID"
+#~ msgstr "Välj via process-id"
+
+#~ msgid "Select by parent PID"
+#~ msgstr "Välj via förälders process-id"
+
+#~ msgid "Select by session ID"
+#~ msgstr "Välj via sessions-id"
+
+#~ msgid "Select by tty"
+#~ msgstr "Välj via tty"
+
+#~ msgid "Extra full format"
+#~ msgstr "Extra utförligt format"
+
+#~ msgid "User defined format"
+#~ msgstr "Användardefinerat format"
+
+#~ msgid "Add column for security data"
+#~ msgstr "Lägg till kolumn med säkerhetsinformation"
+
+#~ msgid "Full format"
+#~ msgstr "Fullt format"
+
+#~ msgid "Jobs format"
+#~ msgstr "Jobbformat"
+
+#~ msgid "Do not show flags"
+#~ msgstr "Visa inte flaggor"
+
+#~ msgid "Show hierarchy"
+#~ msgstr "Visa hierarki"
+
+#~ msgid "Set namelist file"
+#~ msgstr "Visa namnlistfil"
+
+#~ msgid "Wide output"
+#~ msgstr "Bred utdata"
+
+#~ msgid "Execute argument as command"
+#~ msgstr "Utför parameter som kommando"
+
+#~ msgid "Debug on"
+#~ msgstr "Debugläge på"
+
+#~ msgid "Ignore environment variables"
+#~ msgstr "Ignorera miljövariabler"
+
+#~ msgid "Interactive mode after executing commands"
+#~ msgstr "Interaktivt läge efter att komandon utförts"
+
+#~ msgid "Enable optimizations"
+#~ msgstr "Slå på optimeringar"
+
+#~ msgid "Warning control"
+#~ msgstr "Varningsläge"
+
+#~ msgid "Division control"
+#~ msgstr "Divisionskontroll"
+
+#~ msgid "Set prompt command"
+#~ msgstr "Välj promptkommando"
+
+#~ msgid "Export variable to subprocess"
+#~ msgstr "Exportera variabel till underprocess"
+
+#~ msgid "Make variable scope global"
+#~ msgstr "Globalt definitionsområde"
+
+#~ msgid "Make variable scope local"
+#~ msgstr "Lokalt defintionsområde"
+
+#~ msgid ""
+#~ "Make variable scope universal, i.e. share variable with all the users "
+#~ "fish processes on this computer"
+#~ msgstr ""
+#~ "Gör variabelns definitionsområde universellt, dvs. dela variabel med alla "
+#~ "användarens fish-processer på denna dator"
+
+#~ msgid "Do not export variable to subprocess"
+#~ msgstr "Exportera inte variabel till barnprocesser"
+
+#~ msgid "Force following parameters to be process ID's (The default)"
+#~ msgstr ""
+#~ "Tvinga efterföljande parametrar att tolkas som process-id (standard)"
+
+#~ msgid "Force following parameters to be interpreted as process group ID's"
+#~ msgstr "Tvinga efterföljande parametrar att tolkas som grupp-id"
+
+#~ msgid "Force following parameters to be interpreted as user names"
+#~ msgstr "Tvinga efterföljande parametrar att tolkas som användarnamn"
+
+#~ msgid "Ignore errors from non-empty directories"
+#~ msgstr "Ignorera fel från icke-tomma kataloger"
+
+#~ msgid "Remove each component of path"
+#~ msgstr "Ta bort alla sökvägskomponenter"
+
+#~ msgid "Pipe output through specified command"
+#~ msgstr "Filtrera utdata genom angivet kommando"
+
+#~ msgid "Specify directory for rpm database"
+#~ msgstr "Välj katalog för rpm-databas"
+
+#~ msgid "Specify root directory for rpm operations"
+#~ msgstr "Välj rot-katalog för rpm-operationer"
+
+#~ msgid ""
+#~ "Translate all paths that start with first half of following parameter to "
+#~ "second half of following parameter"
+#~ msgstr ""
+#~ "Översätt alla sökvägar som börjar med första halvan av följande parameter "
+#~ "till sista halvan av följande parameter"
+
+#~ msgid "Kanji code-set"
+#~ msgstr "Använd Kanji-tecken"
+
+#~ msgid "Verbose mode without message"
+#~ msgstr "Utförligt läge utan meddelande"
+
+#~ msgid "Compiler debug mode"
+#~ msgstr "Kompliatordebugläge"
+
+#~ msgid ""
+#~ "Preserves modification times, access times, and modes from the original "
+#~ "file"
+#~ msgstr "Bevara ändringstid, åtkomsttid och rättigheter från orginalfil"
+
+#~ msgid "Recursively copy"
+#~ msgstr "Rekursiv kopiering"
+
+#~ msgid "Make font bold"
+#~ msgstr "Använd fetstil"
+
+#~ msgid "Erase variable"
+#~ msgstr "Radera variabel"
+
+#~ msgid "Test if variable is defined"
+#~ msgstr "Testa om variabeln är definerad"
+
+#~ msgid "Ignore leading blanks"
+#~ msgstr "Ignorera inledande mellanslag"
+
+#~ msgid "Consider only blanks and alphanumerics"
+#~ msgstr "Ta endast hänsyn till mellanslag och alfanumeriska tecken"
+
+#~ msgid "Compare general numeric value"
+#~ msgstr "Jämför generellt numeriskt värde"
+
+#~ msgid "Consider only printable"
+#~ msgstr "Ta endast hänsyn till skrivbara tecken"
+
+#~ msgid "Compare month names"
+#~ msgstr "Jämför månadsnamn"
+
+#~ msgid "Compare string numerical value"
+#~ msgstr "Jämför strängars numeriska värde"
+
+#~ msgid "Reverse results"
+#~ msgstr "Omvända resultat"
+
+#~ msgid "Only check if sorted"
+#~ msgstr "Verifiera bara sortering"
+
+#~ msgid "Define key"
+#~ msgstr "Definera nyckel"
+
+#~ msgid "Stabilize sort"
+#~ msgstr "Stabilisera sortering"
+
+#~ msgid "Field separator"
+#~ msgstr "Fältavdelare"
+
+#~ msgid "Output only first of equal lines"
+#~ msgstr "Visa bara först raden vid dubletter"
+
+#~ msgid "Lines end with 0 byte"
+#~ msgstr "Rader slutar ned nolltecken"
+
+#~ msgid "Disables forwarding of the authentication agent"
+#~ msgstr "Inaktivera vidareskickning av autentiseringsagent"
+
+#~ msgid "Enables forwarding of the authentication agent"
+#~ msgstr "Aktivera vidareskickning av autentiseringsagent"
+
+#~ msgid "Go to background"
+#~ msgstr "Gå till bakgrunden"
+
+#~ msgid "Allow remote host to connect to local forwarded ports"
+#~ msgstr "Tillåt fjärrvärd att koppla in sig på lokala vidareskickade portar"
+
+#~ msgid "Smartcard device"
+#~ msgstr "Smartcardenhet"
+
+#~ msgid "Disable forwarding of Kerberos tickets"
+#~ msgstr "Inaktivera vidareskickning av Kerberosbiljetter"
+
+#~ msgid "MAC algorithm"
+#~ msgstr "MAC-algoritm"
+
+#~ msgid "Prevent reading from stdin"
+#~ msgstr "Förhindra läsning från standard in"
+
+#~ msgid "Do not execute remote command"
+#~ msgstr "Utför inte fjärrkommando"
+
+#~ msgid "Subsystem"
+#~ msgstr "Subsystem"
+
+#~ msgid "Force pseudo-tty allocation"
+#~ msgstr "Tvinga pseudo-tty-allokering"
+
+#~ msgid "Disable pseudo-tty allocation"
+#~ msgstr "Inaktivera pseudo-tty-allokering"
+
+#~ msgid "Disable X11 forwarding"
+#~ msgstr "Inaktivera X11-vidareskickning"
+
+#~ msgid "Enable X11 forwarding"
+#~ msgstr "Aktivera X11-vidareskickning"
+
+#~ msgid "Locally forwarded ports"
+#~ msgstr "Lokalt vidareskickade portar"
+
+#~ msgid "Remotely forwarded ports"
+#~ msgstr "Vidareskickade portar på fjärrdatorn"
+
+#~ msgid "Dynamic port forwarding"
+#~ msgstr "Dynamisk portvidareskickning"
+
+#~ msgid "Compression"
+#~ msgstr "Kompression"
+
+#~ msgid "Enable debug"
+#~ msgstr "Slå på debugning"
+
+#~ msgid "Foreground operation"
+#~ msgstr "Förgrundsoperation"
+
+#~ msgid "Disable multi-threaded operation"
+#~ msgstr "Inaktivera flertrådat läge"
+
+#~ msgid "Test if this is a login shell"
+#~ msgstr "Testa om detta är ett login-skal"
+
+#~ msgid "Test if this is an interactive shell"
+#~ msgstr "Testa om detta är ett interaktivt skal"
+
+#~ msgid "Test if a command substitution is currently evaluated"
+#~ msgstr "Testa om en kommandosubstitution utförs för tillfället"
+
+#~ msgid "Test if a code block is currently evaluated"
+#~ msgstr "Testa om ett kodblock utförs för tillfället"
+
+#~ msgid "Test if new jobs are never put under job control"
+#~ msgstr "Testa om inga nya job ställs unde jobbkontroll"
+
+#~ msgid "Test if only interactive new jobs are put under job control"
+#~ msgstr "Testa om bara interaktiva nya job ställs unde jobbkontroll"
+
+#~ msgid "Test if all new jobs are put under job control"
+#~ msgstr "Testa om alla nya job ställs unde jobbkontroll"
+
+#~ msgid ""
+#~ "Print a list of all function calls leading up to running the current "
+#~ "command"
+#~ msgstr ""
+#~ "Visa en lista av alla funktionsanropp som lett fram till anropet på det "
+#~ "nu körande kommandot"
+
+#~ msgid "Case insensitive"
+#~ msgstr "Ignorera skiftläge"
+
+#~ msgid "Preserve environment"
+#~ msgstr "Bevara miljövariabler"
+
+#~ msgid "Make login shell"
+#~ msgstr "Skapa login-skal"
+
+#~ msgid "Pass -f to the shell"
+#~ msgstr "Skicka -f till skalet"
+
+#~ msgid "Append archive to archive"
+#~ msgstr "Lägg till arkiv till annat arkiv"
+
+#~ msgid "Create archive"
+#~ msgstr "Skapa arkiv"
+
+#~ msgid "Compare archive and filesystem"
+#~ msgstr "Jämför arkiv med filsystem"
+
+#~ msgid "Delete from archive"
+#~ msgstr "Radera från arkiv"
+
+#~ msgid "Append files to archive"
+#~ msgstr "Lägg till filer till arkiv"
+
+#~ msgid "Append new files"
+#~ msgstr "Lägg till nya filer"
+
+#~ msgid "Extract from archive"
+#~ msgstr "Hämta från arkiv"
+
+#~ msgid "Keep access time"
+#~ msgstr "Behåll åtkomsttid"
+
+#~ msgid "Reblock while reading"
+#~ msgstr "Gör om block-indelning under inläsning"
+
+#~ msgid "Print directory names"
+#~ msgstr "Visa katalognamn"
+
+#~ msgid "Archive is local"
+#~ msgstr "Arkiv är lokalt"
+
+#~ msgid "Run script at end of tape"
+#~ msgstr "Utför skript vid slut på band"
+
+#~ msgid "Use old incremental GNU format"
+#~ msgstr "Använd gammalt inkrementellt GNU-format"
+
+#~ msgid "Use new incremental GNU format"
+#~ msgstr "Använd nytt inkrementellt GNU-format"
+
+#~ msgid "Dereference symlinks"
+#~ msgstr "Följ symboliska länkar"
+
+#~ msgid "Ignore zero block in archive"
+#~ msgstr "Ignorera nollblock i arkiv"
+
+#~ msgid "Filter through bzip2"
+#~ msgstr "Filtrera genom bzip2"
+
+#~ msgid "Don't exit on unreadable files"
+#~ msgstr "Avsluta inte vid oläsbara filer"
+
+#~ msgid "Don't overwrite"
+#~ msgstr "Skriv inte över"
+
+#~ msgid "Stay in local filesystem"
+#~ msgstr "Stanna på lokala filsystem"
+
+#~ msgid "Don't extract modification time"
+#~ msgstr "Hämta inte ändringstider"
+
+#~ msgid "Multi volume archive"
+#~ msgstr "Flervolymsarkiv"
+
+#~ msgid "Use V7 format"
+#~ msgstr "Använd V7-format"
+
+#~ msgid "Extract to stdout"
+#~ msgstr "Hämta till standard ut"
+
+#~ msgid "Extract all permissions"
+#~ msgstr "Hämta alla rättigheter"
+
+#~ msgid "Don't strip leading /"
+#~ msgstr "Ta inte bort inledande /"
+
+#~ msgid "Preserve all permissions and do not sort file arguments"
+#~ msgstr "Bevara alla rättigheter, och sortera inte filargument"
+
+#~ msgid "Show record number"
+#~ msgstr "Visa paketnummer"
+
+#~ msgid "Remove files after adding to archive"
+#~ msgstr "Ta bort filer efter att de lagts till arkivet"
+
+#~ msgid "Preserve file ownership"
+#~ msgstr "Bevara filägare"
+
+#~ msgid "Handle sparse files"
+#~ msgstr "Hantera glesa filer"
+
+#~ msgid "-T has null-terminated names"
+#~ msgstr "-T har noll-terminerade namn"
+
+#~ msgid "Print total bytes written"
+#~ msgstr "Visa totalt anta skrivna bytes"
+
+#~ msgid "Ask for confirmation"
+#~ msgstr "Be om bekräftelse"
+
+#~ msgid "Verify archive"
+#~ msgstr "Verifiera arkiv"
+
+#~ msgid "Filter through compress"
+#~ msgstr "Filtrera genom compress"
+
+#~ msgid "Filter through gzip"
+#~ msgstr "Filtrera genom gzip"
+
+#~ msgid "Negate expression"
+#~ msgstr "Negera uttryck"
+
+#~ msgid "String length is non-zero"
+#~ msgstr "Strängens längd är nollskild"
+
+#~ msgid "String length is zero"
+#~ msgstr "Strängens längd är noll"
+
+#~ msgid "Strings are equal"
+#~ msgstr "Strängar är identiska"
+
+#~ msgid "Strings are not equal"
+#~ msgstr "Strängar skiljer sig"
+
+#~ msgid "Integers are equal"
+#~ msgstr "Heltal är identiska"
+
+#~ msgid "Left integer larger than or equal to right integer"
+#~ msgstr "Vänster tal är större än eller lika med höger tal"
+
+#~ msgid "Left integer larger than right integer"
+#~ msgstr "Vänster tal är större än höger tal"
+
+#~ msgid "Left integer less than or equal to right integer"
+#~ msgstr "Vänster tal är mindre än eller lika med höger tal"
+
+#~ msgid "Left integer less than right integer"
+#~ msgstr "Vänster tal är mindre än höger tal"
+
+#~ msgid "Left integer not equal to right integer"
+#~ msgstr "Vänster tal skilt från höger tal"
+
+#~ msgid "File is block device"
+#~ msgstr "Fil är blockenhet"
+
+#~ msgid "File is character device"
+#~ msgstr "Fil är teckenenhet"
+
+#~ msgid "File is directory"
+#~ msgstr "Fil är katalog"
+
+#~ msgid "File exists"
+#~ msgstr "Fil existerar"
+
+#~ msgid "File is regular"
+#~ msgstr "Fil är vanlig fil"
+
+#~ msgid "File is set-group-ID"
+#~ msgstr "Fil har kör-som-grupp-bit satt"
+
+#~ msgid "File is readable"
+#~ msgstr "Fil är läsbar"
+
+#~ msgid "File size is non-zero"
+#~ msgstr "Filstorlek är nollskild"
+
+#~ msgid "File set-user-ID bit is set"
+#~ msgstr "Fil har hör-som-användare-bit satt"
+
+#~ msgid "File is writable"
+#~ msgstr "Fil är skrivbar"
+
+#~ msgid "Specify output format"
+#~ msgstr "Välj utdataformat"
+
+#~ msgid "Use the portable output format"
+#~ msgstr "Använd portabelt utdataformat"
+
+#~ msgid "Do not send the results to stderr, but overwrite the specified file"
+#~ msgstr ""
+#~ "Skicka inte utdata till standard fel, skriv istället över angiven fil"
+
+#~ msgid "(Used together with -o) Do not overwrite but append"
+#~ msgstr "(Används tillsamans med -o) Skriv inte över utan lägg till"
+
+#~ msgid "Toggle command line/program name"
+#~ msgstr "Växla visning av kommandorad/programnamn"
+
+#~ msgid "Toggle idle processes"
+#~ msgstr "Växla visning av overksamma processer"
+
+#~ msgid "Monitor effective UID"
+#~ msgstr "Bevaka effektivt användarid"
+
+#~ msgid "Monitor user"
+#~ msgstr "Bevaka användare"
+
+#~ msgid "Monitor PID"
+#~ msgstr "Bevaka process-id"
+
+#~ msgid "Secure mode"
+#~ msgstr "Säkert läge"
+
+#~ msgid "Cumulative mode"
+#~ msgstr "Ackumulerande läge"
+
+#~ msgid "Display names of all signals"
+#~ msgstr "Visa namn på alla signaler"
+
+#~ msgid "Display all currently defined trap handlers"
+#~ msgstr "Visa all för tillfället definerade trap-hanterare"
+
+#~ msgid "Print all possible definitions of the specified name"
+#~ msgstr "Visa alla möjliga definitioner av det angivna namnet"
+
+#~ msgid "Print path to command, or nothing if name is not a command"
+#~ msgstr ""
+#~ "Visa sökväg till kommando, eller ingenting om namn inte är ett kommando"
+
+#~ msgid "Print path to command"
+#~ msgstr "Visa sökväg till kommando"
+
+#~ msgid "Set or get all current limits"
+#~ msgstr "Visa eller redigera alla resursanvändningsgränser"
+
+#~ msgid "Maximum size of core files created"
+#~ msgstr "Maximal storlek på skapade corefiler"
+
+#~ msgid "Maximum size of a process's data segment"
+#~ msgstr "Maximal storlek på på en process datasegment"
+
+#~ msgid "Maximum size of files created by the shell"
+#~ msgstr "Maximal storlek på filer skapade av skalet"
+
+#~ msgid "Maximum size that may be locked into memory"
+#~ msgstr "Maximal  storlek som kan låsas i minnet"
+
+#~ msgid "Maximum resident set size"
+#~ msgstr "Maximal 'resident set size'"
+
+#~ msgid "Maximum number of open file descriptors"
+#~ msgstr "Maximalt antal öppna filidentifierare"
+
+#~ msgid "Maximum stack size"
+#~ msgstr "Maximal stackstorlek"
+
+#~ msgid "Maximum amount of cpu time in seconds"
+#~ msgstr "Maximal cpu-tid i sekunder"
+
+#~ msgid "Maximum number of processes available to a single user"
+#~ msgstr "Maximalt antal processer tillgängliga för en enskild användare"
+
+#~ msgid "Maximum amount of virtual memory available to the shell"
+#~ msgstr "Maximal mängd virtuellt minne tillgängligt för skalet"
+
+#~ msgid "Unmount without writing in /etc/mtab"
+#~ msgstr "Avmontera utan stt skriva till /etc/mtab"
+
+#~ msgid "In case unmounting fails, try to remount read-only"
+#~ msgstr "Om avmontering misslyckas, försök att ommontera i skrivskyddat läge"
+
+#~ msgid ""
+#~ "In case the unmounted device was a loop device, also free this loop device"
+#~ msgstr ""
+#~ "Om den avmonterade enheten var en vändslinga, återlämna också denna enhet"
+
+#~ msgid "Don't call the /sbin/umount.<filesystem> helper even if it exists"
+#~ msgstr ""
+#~ "Anropa inte /sbin/umount.<filsystem>-hjälparen, även om den existerar"
+
+#~ msgid "Unmount all of the file systems described in /etc/mtab"
+#~ msgstr "Avmontera all a filsystem i /etc/mtab"
+
+#~ msgid "Actions should only be taken on file systems of the specified type"
+#~ msgstr "Utför bara handlingar på filsystem av angiven typ"
+
+#~ msgid ""
+#~ "Actions should only be taken on file systems with the specified options "
+#~ "in /etc/fstab"
+#~ msgstr ""
+#~ "Utför bara handlingar på filsystem med de angivna flaggorna i /etc/fstab"
+
+#~ msgid "Force unmount (in case of an unreachable NFS system)"
+#~ msgstr "Tvinga avmontering (vid onåbart NFS-filsystem)"
+
+#~ msgid ""
+#~ "Detach the filesystem from the filesystem hierarchy now, and cleanup all "
+#~ "references to the filesystem as soon as it is not busy"
+#~ msgstr ""
+#~ "Koppla bort filsystemet från hierarkin nu, och rensa upp alla referenser "
+#~ "till filsystemet så fort som det inte är upptaget"
+
+#~ msgid "Print kernel name"
+#~ msgstr "Visa kärnnamn"
+
+#~ msgid "Print network node hostname"
+#~ msgstr "Visa värdnamn på nätverksnod"
+
+#~ msgid "Print kernel release"
+#~ msgstr "Visa kärnrelese"
+
+#~ msgid "Print machine name"
+#~ msgstr "Visa maskinnamn"
+
+#~ msgid "Print processor"
+#~ msgstr "Visa processor"
+
+#~ msgid "Print hardware platform"
+#~ msgstr "Visa hårdvaruplattoform"
+
+#~ msgid "Display help and debug options"
+#~ msgstr "Visa hjälp och debug-val"
+
+#~ msgid "Valgrind-ise children"
+#~ msgstr "Kör barnprocesser i valgrind"
+
+#~ msgid "Log to file descriptor"
+#~ msgstr "Logga fill filidentifierare"
+
+#~ msgid "Log to socket"
+#~ msgstr "Logga till uttag (socket)"
+
+#~ msgid "Callers in stack trace"
+#~ msgstr "Antal visade anrop i stack-spår"
+
+#~ msgid "Stop showing errors if too many"
+#~ msgstr "Sluta visa fel om för många"
+
+#~ msgid "Continue trace below main()"
+#~ msgstr "Fortsätt spåra under main()-anroppet"
+
+#~ msgid "Supress errors from file"
+#~ msgstr "Undertryck fel från fil"
+
+#~ msgid "Print suppressions for detected errors"
+#~ msgstr "Visa undertryckningar för detekterade fel"
+
+#~ msgid "Start debugger on error"
+#~ msgstr "Starta debugger vid fel"
+
+#~ msgid "Debugger command"
+#~ msgstr "Debuggerkommando"
+
+#~ msgid "Show reachable leaked memory"
+#~ msgstr "Visa nåbart läckt minne"
+
+#~ msgid ""
+#~ "Determines how willing Memcheck is to consider different backtraces to be "
+#~ "the same"
+#~ msgstr ""
+#~ "Bestämmer hur villig Memcheck är att betrakta olika stack-spår som lika"
+
+#~ msgid "Set size of freed memory pool"
+#~ msgstr "Välj storlek på pool av återlämnat minne"
+
+#~ msgid ""
+#~ "Determines how willing Addrcheck is to consider different backtraces to "
+#~ "be the same"
+#~ msgstr ""
+#~ "Bestämmer hur villig Addrcheck är att betrakta olika stack-spår som lika"
+
+#~ msgid "Type of L1 instruction cache"
+#~ msgstr "Typ av L1-instruktionscache"
+
+#~ msgid "Type of L1 data cache"
+#~ msgstr "Typ av L1-datacache"
+
+#~ msgid "Type of L2 cache"
+#~ msgstr "Typ av L2-cache"
+
+#~ msgid "Specify a function that allocates memory"
+#~ msgstr "Ange en minnesallokeringsfunktion"
+
+#~ msgid "Print byte counts"
+#~ msgstr "Visa antal bytes"
+
+#~ msgid "Print character counts"
+#~ msgstr "Visa antal tecken"
+
+#~ msgid "Print newline counts"
+#~ msgstr "Visa antal radbrytningar"
+
+#~ msgid "Print length of longest line"
+#~ msgstr "Visa längd av längsta rad"
+
+#~ msgid "Dont print header"
+#~ msgstr "Visa inte huvud"
+
+#~ msgid "Ignore username for time calculations"
+#~ msgstr "Ignorera användarnamn vid tidsberäkningar"
+
+#~ msgid "Short format"
+#~ msgstr "Kort format"
+
+#~ msgid "Toggle printing of remote hostname"
+#~ msgstr "Växla utskrift av värdnamn för andra datorer"
+
+#~ msgid "Go to background immediately after startup"
+#~ msgstr "Gå till bakgrunden omedelbart efter uppstart"
+
+#~ msgid "Log all messages to logfile"
+#~ msgstr "Logga alla meddelanden till loggfil"
+
+#~ msgid "Append all messages to logfile"
+#~ msgstr "Lägg till alla meddelanden till loggfil"
+
+#~ msgid "Turn on debug output"
+#~ msgstr "Slå på visning av debuginformation"
+
+#~ msgid "Turn off verbose without being completely quiet"
+#~ msgstr "Slå av utförligt läge utan att vara helt tyst"
+
+#~ msgid "Read URLs from file"
+#~ msgstr "Läs URLer från fil"
+
+#~ msgid "Force input to be treated as HTML"
+#~ msgstr "Tvinga indata att behandlas som HTML"
+
+#~ msgid "Prepend string to relative links"
+#~ msgstr "Lägg till sträng före relativa länkar"
+
+#~ msgid "Bind address on local machine"
+#~ msgstr "Bind till adress på lokal maskin"
+
+#~ msgid "Set number of retries to number"
+#~ msgstr "Välj antal gånger att försöka igen"
+
+#~ msgid "Concatenate output to file"
+#~ msgstr "Sammanlägg utdata till fil"
+
+#~ msgid "Never overwrite files with same name"
+#~ msgstr "Skriv aldrig över filer med samma namn"
+
+#~ msgid "Continue getting a partially-downloaded file"
+#~ msgstr "Fortsätt hämta partiellt nedladdad fil"
+
+#~ msgid "Select progress meter type"
+#~ msgstr "Välj förloppsindikatortyp"
+
+#~ msgid "Turn on time-stamping"
+#~ msgstr "Slå på tidsstämpling"
+
+#~ msgid "Print the headers/responses sent by servers"
+#~ msgstr "Visa huvuden/svar skickade från servrar"
+
+#~ msgid "Do not download the pages, just check that they are there"
+#~ msgstr "Ladda inte ner sidorna, kontrollera bara att de är där"
+
+#~ msgid "Set the network timeout"
+#~ msgstr "Välj nätverkstimeout"
+
+#~ msgid "Set the DNS lookup timeout"
+#~ msgstr "Välj DNS-lookuptimeout"
+
+#~ msgid "Set the connect timeout"
+#~ msgstr "Välj uppkopplingstimeout"
+
+#~ msgid "Set the read (and write) timeout"
+#~ msgstr "Välj läs (och skriv) timeout"
+
+#~ msgid "Limit the download speed"
+#~ msgstr "Begränsa nedladdningshastigheten"
+
+#~ msgid "Wait the specified number of seconds between the retrievals"
+#~ msgstr "Vänta det angivna antalet sekunder mellan hämtningar"
+
+#~ msgid "Wait time between retries"
+#~ msgstr "Vänta tid mellan nytt hämtförsök"
+
+#~ msgid "Wait random amount of time between retrievals"
+#~ msgstr "Vänta en slumpvald tid mellan hämtningar"
+
+#~ msgid "Toggle proxy support"
+#~ msgstr "Slå på proxystöd"
+
+#~ msgid "Specify download quota for automatic retrievals"
+#~ msgstr "Ange nedladdningskvot för automatiska hämtningar"
+
+#~ msgid "Turn off caching of DNS lookups"
+#~ msgstr "Slå av cachning av DNS-frågor"
+
+#~ msgid ""
+#~ "Change which characters found in remote URLs may show up in local file "
+#~ "names"
+#~ msgstr "Ändra vilka tecken i fjärr-URL som får förekomma i lokala filnamn"
+
+#~ msgid "Do not create a hierarchy of directories"
+#~ msgstr "Skapa inte en kataloghierarki"
+
+#~ msgid "Force creation of a hierarchy of directories"
+#~ msgstr "Tvinga skapande av kataloghierarki"
+
+#~ msgid "Disable generation of host-prefixed directories"
+#~ msgstr "Inaktivera generering av värd-prefixkatalogkomponenter"
+
+#~ msgid "Use the protocol name as a directory component"
+#~ msgstr "Använd protokollnamn som katalogkomponent"
+
+#~ msgid "Ignore specified number of directory components"
+#~ msgstr "Ignorera angivet antal katalogkomponenter"
+
+#~ msgid "Set directory prefix"
+#~ msgstr "Välj katalogprefix"
+
+#~ msgid "Force html files to have html extension"
+#~ msgstr "Tvinga html-filer att få html-suffix"
+
+#~ msgid "Specify the http username"
+#~ msgstr "Välj httpanvändarnamn"
+
+#~ msgid "Specify the http password"
+#~ msgstr "Välj httplösenord"
+
+#~ msgid "Disable server-side cache"
+#~ msgstr "Inaktivera cache på serversidan"
+
+#~ msgid "Load cookies from file"
+#~ msgstr "Ladda kakor från fil"
+
+#~ msgid "Save cookies to file"
+#~ msgstr "Spara kakor till fil"
+
+#~ msgid "Save session cookies"
+#~ msgstr "Spara sessionskakor"
+
+#~ msgid "Ignore 'Content-Length' header"
+#~ msgstr "Ignorera 'Content-Length' huvud"
+
+#~ msgid "Define an additional-header to be passed to the HTTP servers"
+#~ msgstr "Definera ett extra huvud att skicka till HTTP-servern"
+
+#~ msgid "Specify the proxy username"
+#~ msgstr "Välj proxyanvändarnamn"
+
+#~ msgid "Specify the proxy password"
+#~ msgstr "Välj proxylösenord"
+
+#~ msgid "Set referer URL"
+#~ msgstr "Välj referens-URL"
+
+#~ msgid "Save the headers sent by the HTTP server"
+#~ msgstr "Spara headers skickade av HTTP-servern"
+
+#~ msgid "Identify as agent-string"
+#~ msgstr "Identifiera som följande agent"
+
+#~ msgid ""
+#~ "Use POST as the method for all HTTP requests and send the specified data "
+#~ "in the request body"
+#~ msgstr ""
+#~ "Använd POST som metod för atta HTTP-anropp och skicka den angivna datan i "
+#~ "anroppskroppen"
+
+#~ msgid "Turn off keep-alive for http downloads"
+#~ msgstr "Slå av keep-alive för http-nedladdningar"
+
+#~ msgid "Don't remove the temporary .listing files generated"
+#~ msgstr "Radera inte de tillfälliga .listing filerna som genererats"
+
+#~ msgid "Turn off FTP globbing"
+#~ msgstr "Använd inte filmatchning i FTP"
+
+#~ msgid "Use the passive FTP retrieval scheme"
+#~ msgstr "Använd passiv FTP"
+
+#~ msgid "Traverse symlinks and retrieve pointed-to files"
+#~ msgstr "Följ symboliska länkar och hämta pekade filer"
+
+#~ msgid "Turn on recursive retrieving"
+#~ msgstr "Använd rekursiv hämtning"
+
+#~ msgid "Specify recursion maximum depth"
+#~ msgstr "Maximalt rekursionsdjup"
+
+#~ msgid "Delete every single file downloaded"
+#~ msgstr "Radera alla nedladdade filer"
+
+#~ msgid ""
+#~ "Convert the links in the document to make them suitable for local viewing"
+#~ msgstr ""
+#~ "Konvertera länkarna i dokumentet så att de passar för att titta på lokalt"
+
+#~ msgid "Back up the original version"
+#~ msgstr "Backa upp orginalversionen"
+
+#~ msgid "Turn on options suitable for mirroring"
+#~ msgstr "Slå på passande flaggor för spegling"
+
+#~ msgid ""
+#~ "Download all the files that are necessary to properly display a given "
+#~ "HTML page"
+#~ msgstr ""
+#~ "Ladda ner alla filer som behövs för att visa en given HTML-sida korrekt"
+
+#~ msgid "Turn on strict parsing of HTML comments"
+#~ msgstr "Slå på strikt tolkning av HTML-kommentarer"
+
+#~ msgid "Comma-separated lists of file name suffixes or patterns to accept"
+#~ msgstr "Kommaseparerad lista av filnamns-suffix eller mönster att ladda ner"
+
+#~ msgid "Comma-separated lists of file name suffixes or patterns to reject"
+#~ msgstr ""
+#~ "Kommaseparerad lista av filnamns-suffix eller mönster att inte ladda ner"
+
+#~ msgid "Set domains to be followed"
+#~ msgstr "Välj domäner att följa"
+
+#~ msgid "Specify the domains that are not to be followed"
+#~ msgstr "Välj domäner som inte skall följas"
+
+#~ msgid "Follow FTP links from HTML documents"
+#~ msgstr "Följ FTP-länkar från HTML-dokument"
+
+#~ msgid "HTML tags to follow"
+#~ msgstr "Följ angivna HTML-taggar"
+
+#~ msgid "HTML tags to ignore"
+#~ msgstr "Ignorera angivna HTML-taggar"
+
+#~ msgid "Enable spanning across hosts"
+#~ msgstr "Följ länkar mellan olika värdar"
+
+#~ msgid "Follow relative links only"
+#~ msgstr "Följ bara relativa länkar"
+
+#~ msgid "Specify a comma-separated list of directories you wish to follow"
+#~ msgstr "Välj en kommaseparerad lista av kataloger som skall följas"
+
+#~ msgid "Specify a comma-separated list of directories you wish to exclude"
+#~ msgstr "Välj en kommaseparerad lista av kataloger som skall exkluderas"
+
+#~ msgid "Print all matching executables in PATH, not just the first"
+#~ msgstr "Visa alla matchande program i PATH, inte bara den första"
+
+#~ msgid "Read aliases from stdin, reporting matching ones on stdout"
+#~ msgstr "Läs alias från standard in, raportera matchningar på standard ut"
+
+#~ msgid "Ignore option '--read-alias'"
+#~ msgstr "Ignorera flaggan '--read-alias'"
+
+#~ msgid ""
+#~ "Read shell function definitions from stdin, reporting matching ones on "
+#~ "stdout"
+#~ msgstr ""
+#~ "Läs funktionsdefinitioner från standard in, raportera matchningar på "
+#~ "standard ut"
+
+#~ msgid "Ignore option '--read-functions'"
+#~ msgstr "Ignorera flaggan '--read-functions'"
+
+#~ msgid "Skip directories in PATH that start with a dot"
+#~ msgstr "Hoppa över kataloger i PATH som börjar med en punkt"
+
+#~ msgid ""
+#~ "Skip directories in PATH that start with a tilde and executables which "
+#~ "reside in the HOME directory"
+#~ msgstr ""
+#~ "Hoppa över kataloger i PATH som börjar med ett tilde och program som "
+#~ "ligger i HOME-katalogen"
+
+#~ msgid ""
+#~ "If a directory in PATH starts with a dot and a matching executable was "
+#~ "found for that path, then print './programname'"
+#~ msgstr ""
+#~ "Om en katalog i PATH börjar med en punkt och ett matchande program hittas "
+#~ "i den katalogen, skriv ut './programnamn'"
+
+#~ msgid "Output a tilde when a directory matches the HOME directory"
+#~ msgstr "Skriv ut ett tilde när en katalog matcher HOME-katalogen"
+
+#~ msgid "Stop processing options on the right if not on tty"
+#~ msgstr "Sluta processa flaggor till höger om inte på en tty"
+
+#~ msgid "Same as -b -d --login -p -r -t -T -u"
+#~ msgstr "Synonymt med -b -d --login -p -r -t -T -u"
+
+#~ msgid "Print time of last boot"
+#~ msgstr "Visa tidpunkt för senaste uppstart"
+
+#~ msgid "Print line of headings"
+#~ msgstr "Skriv ut rad av överskrifter"
+
+#~ msgid "Print idle time"
+#~ msgstr "Visa overksam tid"
+
+#~ msgid "Print login process"
+#~ msgstr "Visa inloggningsprocess"
+
+#~ msgid "Canonicalize hostnames via DNS"
+#~ msgstr "Gör värdnamn kanoniska via DNS"
+
+#~ msgid "Print hostname and user for stdin"
+#~ msgstr "Visa värdnamn och användare för standard in"
+
+#~ msgid "Print active processes spawned by init"
+#~ msgstr "Visa aktiva processer skapade av init"
+
+#~ msgid "Print all login names and number of users logged on"
+#~ msgstr "Skriv ut alla inloggningsnamn och antal inloggade användare"
+
+#~ msgid "Print current runlevel"
+#~ msgstr "Skriv ut nuvarande körnivå"
+
+#~ msgid "Print name, line, and time"
+#~ msgstr "Visa namn, rad och tid"
+
+#~ msgid "Print last system clock change"
+#~ msgstr "Visa senaste systemklockändring"
+
+#~ msgid "Print users message status as +, - or ?"
+#~ msgstr "Visa användarstatus som +, - eller ?"
+
+#~ msgid "List users logged in"
+#~ msgstr "Visa inloggade användare"
+
+#~ msgid ""
+#~ "Input filenames are terminated by a null character instead of by "
+#~ "whitespace, and the quotes and backslash are not special"
+#~ msgstr ""
+#~ "Indatafilnamn avslutas av ett nulltecken istället för ett blanktecken, "
+#~ "och citationstecken samt omvänt snedstreck är inte speciella"
+
+#~ msgid "Set the end of file string to eof-str"
+#~ msgstr "Sätt slut-på-fil-strängen till angiven sträng"
+
+#~ msgid ""
+#~ "Replace replace-str in the initial arguments with names from standard "
+#~ "input"
+#~ msgstr ""
+#~ "Ersätt angiven sträng i ursprungsargumenten med namn från standard in"
+
+#~ msgid "Use at most max-lines nonblank input lines per command line"
+#~ msgstr "Använd som mest angivet antal icke-tomma indatarader per kommando"
+
+#~ msgid "Use at most max-args arguments per command line"
+#~ msgstr "Använd som mest angivet antal argument per kommando"
+
+#~ msgid ""
+#~ "Prompt the user about whether to run each command line and read a line "
+#~ "from the terminal"
+#~ msgstr ""
+#~ "Fråga användaren om varje kommando ska utföras och läs en rad från "
+#~ "terminalen"
+
+#~ msgid ""
+#~ "If the standard input does not contain any nonblanks, do not run the "
+#~ "command"
+#~ msgstr ""
+#~ "Om inte standard in innehåller icke-tomma tecken, utför inte kommandot"
+
+#~ msgid "Use at most max-chars characters per command line"
+#~ msgstr "Använd som mest angivet antal tecken per kommandorad"
+
+#~ msgid ""
+#~ "Print the command line on the standard error output before executing it"
+#~ msgstr "Skriv ut kommandoraden på standard fel före exekvering"
+
+#~ msgid "Exit if the size is exceeded"
+#~ msgstr "Avsluta om storleken överskrids"
+
+#~ msgid "Run up to max-procs processes at a time"
+#~ msgstr "Kör upp till angivet antal processer i taget"
+
+#~ msgid "Display grammar and exit"
+#~ msgstr "Visa grammatik och avsluta"
+
+#~ msgid "Select window by name"
+#~ msgstr "Välj fönster via namn"
+
+#~ msgid "Select root window"
+#~ msgstr "Välj rotfönster"
+
+#~ msgid "Specify X server"
+#~ msgstr "Välj X-server"
+
+#~ msgid "Do not show property type"
+#~ msgstr "Visa inte egenskapstyp"
+
+#~ msgid "Select a window by clicking on its frame"
+#~ msgstr "Välj ett fönster genom att klicka på dess ram"
+
+#~ msgid "Remove property"
+#~ msgstr "Ta bort egenskap"
+
+#~ msgid "Set property"
+#~ msgstr "Sätt egenskap"
+
+#~ msgid "Examine property updates forever"
+#~ msgstr "Lyssna efter uppdateringar för alltid"
+
+#~ msgid "Make no changes"
+#~ msgstr "Gör inga förändringar"
+
+#~ msgid "Append input to selection"
+#~ msgstr "Lägg till indata till slutet at urval"
+
+#~ msgid "Append to selection as input grows"
+#~ msgstr "Lägg till till urval när indata växer"
+
+#~ msgid "Read into selection"
+#~ msgstr "Läs in i urval"
+
+#~ msgid "Write selection"
+#~ msgstr "Visa urval"
+
+#~ msgid "Clear selection"
+#~ msgstr "Töm urval"
+
+#~ msgid "Delete selection"
+#~ msgstr "Radera urval"
+
+#~ msgid "Use primary selection"
+#~ msgstr "Använd primärt urval"
+
+#~ msgid "Use secondary selection"
+#~ msgstr "Använd sekundärt urval"
+
+#~ msgid "Use clipboard selection"
+#~ msgstr "Använd urklipp (clipboard) istället för urval"
+
+#~ msgid "Make current selections persistent after program exit"
+#~ msgstr "Gör så nuvarande urval finns kvar efter programavslut"
+
+#~ msgid "Exchange primary and secondary selections"
+#~ msgstr "Växla primärt och sekundärt urval"
+
+#~ msgid "Timeout for retrieving selection"
+#~ msgstr "Timeout under hämtning"
+
+#~ msgid "Do not detach from the controlling terminal"
+#~ msgstr "Frikoppla inte från terminalen"
+
+#~ msgid "Print informative messages"
+#~ msgstr "Visa informativa meddelanden"
+
+#~ msgid "Set debug level"
+#~ msgstr "Välj debugnivå"
+
+#~ msgid "Set error level"
+#~ msgstr "Välj felrapporteringsnivå"
+
+#~ msgid "Be tolerant of errors in commandline"
+#~ msgstr "Tolerera fel i kommandoraden"
+
+#~ msgid "Set maximum delay between commands"
+#~ msgstr "Välj maximal fördröjning mellan kommandon"
+
+#~ msgid "Run commands from cache"
+#~ msgstr "Kör ett kommando från cache"
+
+#~ msgid "Specify installroot"
+#~ msgstr "Välj installationsrot"
+
+#~ msgid "Enables obsolets processing logic"
+#~ msgstr "Slå på hantering av obsoleta paket"
+
+#~ msgid "Output rss-data to file"
+#~ msgstr "Skriv rss-data till fil"
+
+#~ msgid "Exclude specified package from updates"
+#~ msgstr "Exkludera angivna paket från uppdateringar"
+
+#~ msgid "Freshen: only changed files"
+#~ msgstr "Uppdatera: Lägg till ändrade filer"
+
+#~ msgid "Delete entries in zipfile"
+#~ msgstr "Radera filer från zipfil"
+
+#~ msgid "Update: only changed or newer files"
+#~ msgstr "Uppdatera: Lägg bara till ändrade och nya filer"
+
+#~ msgid "Move into zipfile (delete files)"
+#~ msgstr "Radera de filer som läggs till arkivet"
+
+#~ msgid "Do not compress at all"
+#~ msgstr "Komprimera inte alls"
+
+#~ msgid "Convert LF to CR LF"
+#~ msgstr "Konvertera LF (Unixradbrytning) till CR LF (Windowsradbrytning)"
+
+#~ msgid "Convert CR LF to LF"
+#~ msgstr "Konvertera CR LF (Windowsradbrytning) till LF (Unixradbrytning)"
+
+#~ msgid "Compress faster"
+#~ msgstr "Snabb komprimering"
+
+#~ msgid "Compress better"
+#~ msgstr "Högre kompressionsgrad"
+
+#~ msgid "Add one-line comments"
+#~ msgstr "Lägg till enradskommentar"
+
+#~ msgid "Add zipfile comments"
+#~ msgstr "Lägg till kommentar till zipfil"
+
+#~ msgid "Read names from stdin"
+#~ msgstr "Läs namn från standard in"
+
+#~ msgid "Make zipfile as old as the latest entry"
+#~ msgstr "Sätt filens ändringsdatum till ändringsdatum av senaste fil"
+
+#~ msgid "Fix zipfile"
+#~ msgstr "Reparera zip-fil"
+
+#~ msgid "Fix zipfile (try harder)"
+#~ msgstr "Reparera zip-fil (försök mer)"
+
+#~ msgid "Adjust offsets to suit self-extracting exe"
+#~ msgstr ""
+#~ "Justera förskjutningar för att lämna plats för att skapa ett "
+#~ "självextraherande arkiv"
+
+#~ msgid "Strip prepended data"
+#~ msgstr "Ta bort datablock före arkivet"
+
+#~ msgid "Test zipfile integrity"
+#~ msgstr "Testa zipfilintegritet"
+
+#~ msgid "Exclude extra file attributes"
+#~ msgstr "Exkludera extra filattribut"
+
+#~ msgid "Store symbolic links as links"
+#~ msgstr "Lagra symboliska länkar som länkar"
+
+#~ msgid "PKZIP recursion"
+#~ msgstr "PKZIP-rekursion"
+
+#~ msgid "Encrypt"
+#~ msgstr "Kryptera"
+
+#~ msgid "Maximum uploads at once"
+#~ msgstr "Maximalt antal samtidiga uppladningar"
+
+#~ msgid "Number of seconds between keepalives"
+#~ msgstr "Sekunder mellan keepalives"
+
+#~ msgid "Bytes per request"
+#~ msgstr "Bytes per förfrågan"
+
+#~ msgid "Requests per pipe"
+#~ msgstr "Förfrågningar per rör"
+
+#~ msgid "Maximum length prefix encoding"
+#~ msgstr "Maximal längd på prefixkod"
+
+#~ msgid "File for server response"
+#~ msgstr "Fil att lagra serversvar i"
+
+#~ msgid "URL to get file from"
+#~ msgstr "URL att hämta fil från"
+
+#~ msgid "Local file target"
+#~ msgstr "Lokal fil att hämta till"
+
+#~ msgid "Time to close inactive socket"
+#~ msgstr "Fördröjning innan inaktivt uttag (socket) stängs"
+
+#~ msgid "Time between checking timeouts"
+#~ msgstr "Intervall mellan kontroller av timeouts"
+
+#~ msgid "Maximum outgoing slice length"
+#~ msgstr "Längsta slice-storlek"
+
+#~ msgid "Maximum time to guess rate"
+#~ msgstr "Maximalt tid att gissa kvot"
+
+#~ msgid "IP to bind to locally"
+#~ msgstr "Lokal IP-adress att binda till"
+
+#~ msgid "Time between screen updates"
+#~ msgstr "Tid mellan skärmuppdateringar"
+
+#~ msgid "Time to wait between requesting more peers"
+#~ msgstr "Tidsintevall mellan förfrågningar efter nya fränder"
+
+#~ msgid "Minimum number of peers to not do requesting"
+#~ msgstr "Minimalt antal fränder för att inte skicka förfrågan"
+
+#~ msgid "Number of seconds before assuming http timeout"
+#~ msgstr "Sekunder innan http-timeout"
+
+#~ msgid "Number of peers at which to stop initiating new connections"
+#~ msgstr "Antal fränder för att inte skapa nya uppkopplingar"
+
+#~ msgid "Maximum number of connections to allow"
+#~ msgstr "Maximalt antal tillåtna uppkopplingar"
+
+#~ msgid "Whether to check hashes on disk"
+#~ msgstr "Om disk-hashar skall verifieras"
+
+#~ msgid "Maximum kB/s to upload at"
+#~ msgstr "Maximal uppladdningstakt i kB/s"
+
+#~ msgid "Seconds to wait for data to come in before assuming choking"
+#~ msgstr "Antal sekunder att vänta innan antagande om strypning"
+
+#~ msgid "Whether to display diagnostic info"
+#~ msgstr "Visa debuginfo"
+
+#~ msgid "Number of downloads at which to switch from random to rarest first"
+#~ msgstr ""
+#~ "Antal nedladdningar för att byta från slumpmässig slice till ovanligaste "
+#~ "slice först"
+
+#~ msgid "Number of uploads to fill out to with optimistic unchokes"
+#~ msgstr "Antalet uppladningar att fylla med optimistisk avstrypning"
+
+#~ msgid "Whether to inform the user that hash failures occur"
+#~ msgstr "Om användaren skall informeras om hashfel"
+
+#, fuzzy
+#~ msgid "%ls: Expected zero or two parameters, got %d\n"
+#~ msgstr "%ls: Förväntade noll eller två argument, fick %d"
+
+#~ msgid "Current functions are: "
+#~ msgstr "Nuvarande funktioner är: "
+
+#~ msgid "%ls: Not inside of block\n"
+#~ msgstr "%ls: Inte i ett block\n"
+
+#~ msgid "%ls: Not inside of 'if' block\n"
+#~ msgstr "%ls: Inte i ett 'if' block\n"
+
+#~ msgid "%ls: Expected exactly one argument, got %d\n"
+#~ msgstr "%ls: Förväntade exakt ett argument, fick %d\n"
+
+#~ msgid "%ls: 'case' command while not in switch block\n"
+#~ msgstr "%ls: 'case' kommandot kan bara användas i ett 'switch'-block\n"
+
+#~ msgid "%ls: Unknown error"
+#~ msgstr "%ls: Okänt fel"
+
+#~ msgid "%ls: Can not specify scope when erasing array slice\n"
+#~ msgstr "%ls: Kan inte ange definitionsområde vid radering av arraydel\n"
+
+#~ msgid "Could not get user information"
+#~ msgstr "Kunde inte hitta information om användare"
+
+#~ msgid "Could not convert message '%s' to wide character string"
+#~ msgstr "Kunde inte konvertera meddelandet '%s' till en bred teckensträng"
+
+#~ msgid "%ls: Argument '%s' is not a valid file descriptor\n"
+#~ msgstr "%ls: Argumentet '%s' är inte en giltig filidentifierare\n"
+
+#~ msgid "Could not set up output file descriptors for pager"
+#~ msgstr "Kunde inte initiera utdata-filidentifierare för visare"
+
+#~ msgid "Could not set up input file descriptors for pager"
+#~ msgstr "Kunde inte initiera indata-filidentifierare för visare"
+
+#~ msgid "Could not open tty for pager"
+#~ msgstr "Kunde inte öppna tty för visare"
+
+#~ msgid "Could not initialize result pipe"
+#~ msgstr "Kunde inte initiera rör för utskrift av resultat"
+
+#
+#~ msgid "Unspecified file descriptors"
+#~ msgstr "Ospecificerad filidentifierare"
+
+#
+#~ msgid "Could not read completions"
+#~ msgstr "Kunde inte läsa kompletteringar"
+
+#~ msgid "Could not expand string '%ls'"
+#~ msgstr "Kunde inte expandera strängen '%ls'"
+
+#~ msgid "An additional command is required"
+#~ msgstr "Ett till kommand krävs"
+
+#~ msgid ""
+#~ "Could not locate end of block. The 'end' command is missing, misspelled "
+#~ "or a ';' is missing."
+#~ msgstr ""
+#~ "Kunde inte hitta slutet på kodblock. Kommandot 'end' saknas, är felstavat "
+#~ "eller ett ';' saknas."
+
+#~ msgid "Expected a command name, got token of type '%ls'"
+#~ msgstr ""
+#~ "Förväntade att hitta ett kommandonamn, hittade en symbol av typen '%ls'"
+
+#~ msgid "'case' builtin not inside of switch block"
+#~ msgstr ""
+#~ "Det inbyggda kommandot 'case' får bara användas i ett 'switch'-block."
+
+#~ msgid "Loop control command while not inside of loop"
+#~ msgstr "Loopstyrningskommandon får bara användas i loopar."
+
+#, fuzzy
+#~ msgid "'%ls' builtin not inside of if block"
+#~ msgstr "Det inbyggda kommandot 'else' får bara användas i ett if-block"
+
+#~ msgid "'end' command outside of block"
+#~ msgstr "Det inbyggda kommandot 'end' får bara användas i ett block"
+
+#~ msgid "Expected redirection specification, got token of type '%ls'"
+#~ msgstr "Förväntade en IO dirigering, hittade en symbol av typen '%ls'"
+
+#~ msgid ""
+#~ "Encountered redirection when expecting a command name. Fish does not "
+#~ "allow a redirection operation before a command."
+#~ msgstr ""
+#~ "Förväntade ett kommandonamn, hittade en IO dirigering. Fish tillåter into "
+#~ "IO dirigeringar före kommandonamn"
+
+#~ msgid "Invalid IO redirection"
+#~ msgstr "Ogiltig IO omdirigering"
+
+#~ msgid "Requested redirection to something that is not a file descriptor %ls"
+#~ msgstr "IO dirigering till någonting som inte är en filidentifierare"
+
+#~ msgid "Don't preserve the specified attributes"
+#~ msgstr "Behåll inte de angivna attributen"
+
+#~ msgid "Control creation of sparse files"
+#~ msgstr "Kontrollera skapandet av glesa filer"
+
+#, fuzzy
+#~ msgid "add the specified files on the next commit"
+#~ msgstr "Lägg till angiven fil fill den nuvarande listan av nyckelringar"
+
+#, fuzzy
+#~ msgid "show changeset information by line for each file"
+#~ msgstr "Visa ändringsinformation för paket"
+
+#, fuzzy
+#~ msgid "create an unversioned archive of a repository revision"
+#~ msgstr "Lägg till fil eller träd utan version till förrådet"
+
+#, fuzzy
+#~ msgid "list repository named branches"
+#~ msgstr "Inaktivera förråd"
+
+#, fuzzy
+#~ msgid "create a changegroup file"
+#~ msgstr "Skapa en kontrollpunktfil"
+
+#, fuzzy
+#~ msgid "output the current or given revision of files"
+#~ msgstr "Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
+
+#, fuzzy
+#~ msgid "make a copy of an existing repository"
+#~ msgstr "Skapa lokal kopia av förråd"
+
+#, fuzzy
+#~ msgid "commit the specified files or all outstanding changes"
+#~ msgstr "Dekryptera angiven fil eller standard in"
+
+#, fuzzy
+#~ msgid "diff repository (or selected files)"
+#~ msgstr "Radera urval"
+
+#, fuzzy
+#~ msgid "forget the specified files on the next commit"
+#~ msgstr "Flytta filen angiven på kommandoraden"
+
+#, fuzzy
+#~ msgid "copy changes from other branches onto the current branch"
+#~ msgstr "Hämta ändringar från förrådet till arbetskopian"
+
+#, fuzzy
+#~ msgid "identify the working copy or specified revision"
+#~ msgstr "Uppdatera arbetskopian till en annan URL"
+
+#, fuzzy
+#~ msgid "import an ordered set of patches"
+#~ msgstr "Visa byteavstånd för matchningar"
+
+#, fuzzy
+#~ msgid "create a new repository in the given directory"
+#~ msgstr "Skapa förråd om det inte redan existerar"
+
+#, fuzzy
+#~ msgid "locate files matching specific patterns"
+#~ msgstr "Visa inte filer som matchar mönster"
+
+#, fuzzy
+#~ msgid "output the current or given revision of the project manifest"
+#~ msgstr "Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
+
+#, fuzzy
+#~ msgid "show changesets not found in the destination"
+#~ msgstr "Fråga paket med angiven grupp"
+
+#, fuzzy
+#~ msgid "show the parents of the working directory or revision"
+#~ msgstr "Ändra arbetskatalog"
+
+#, fuzzy
+#~ msgid "show aliases for remote repositories"
+#~ msgstr "Ta bort inlägg i .cvspass för fjärrförråd"
+
+#, fuzzy
+#~ msgid "pull changes from the specified source"
+#~ msgstr "Fråga paket med angiven grupp"
+
+#, fuzzy
+#~ msgid "push changes to the specified destination"
+#~ msgstr "Fråga paket med angiven grupp"
+
+#, fuzzy
+#~ msgid "remove the specified files on the next commit"
+#~ msgstr "Flytta filen angiven på kommandoraden"
+
+#, fuzzy
+#~ msgid "roll back the last transaction (dangerous)"
+#~ msgstr "Ordna om fixarna i förrådet"
+
+#, fuzzy
+#~ msgid "print the root (top) of the current working directory"
+#~ msgstr "Ändra arbetskatalog"
+
+#, fuzzy
+#~ msgid "show changed files in the working directory"
+#~ msgstr "Ändra arbetskatalog"
+
+#, fuzzy
+#~ msgid "summarize working directory state"
+#~ msgstr "Visa nuvarande katalog"
+
+#, fuzzy
+#~ msgid "list repository tags"
+#~ msgstr "Inaktivera förråd"
+
+#, fuzzy
+#~ msgid "show the tip revision"
+#~ msgstr "Visa tid"
+
+#, fuzzy
+#~ msgid "apply one or more changegroup files"
+#~ msgstr "Läs paket från fil"
+
+#, fuzzy
+#~ msgid "update working directory (or switch revisions)"
+#~ msgstr "Ändra arbetskatalog"
+
+#, fuzzy
+#~ msgid "verify the integrity of the repository"
+#~ msgstr "Ta bort ett inlägg från förråd"
+
+#, fuzzy
+#~ msgid "output version and copyright information"
+#~ msgstr "Ignorera versionsmagiinformation"
+
+#, fuzzy
+#~ msgid "Configuration Files"
+#~ msgstr "Konfigureringsfil"
+
+#, fuzzy
+#~ msgid "Date Formats"
+#~ msgstr "Välj format"
+
+#, fuzzy
+#~ msgid "Diff Formats"
+#~ msgstr "Listformat"
+
+#, fuzzy
+#~ msgid "Environment Variables"
+#~ msgstr "Redigera miljövariabler"
+
+#, fuzzy
+#~ msgid "Specifying File Sets"
+#~ msgstr "Välj konfigurationsfil"
+
+#, fuzzy
+#~ msgid "Configuring hgweb"
+#~ msgstr "Konfigureringsfil"
+
+#, fuzzy
+#~ msgid "Merge Tools"
+#~ msgstr "Sammanslå sorterade filer"
+
+#, fuzzy
+#~ msgid "Specifying Multiple Revisions"
+#~ msgstr "Ange revision"
+
+#, fuzzy
+#~ msgid "File Name Patterns"
+#~ msgstr "Visa inte filer som matchar mönster"
+
+#, fuzzy
+#~ msgid "Specifying Single Revisions"
+#~ msgstr "Ange revision"
+
+#, fuzzy
+#~ msgid "Specifying Revision Sets"
+#~ msgstr "Ange revisionstiollstånd"
+
+#, fuzzy
+#~ msgid "Subrepositories"
+#~ msgstr "Aktivera förråd"
+
+#, fuzzy
+#~ msgid "[+] include names matching the given patterns"
+#~ msgstr "Visa inte filer som matchar mönster"
+
+#, fuzzy
+#~ msgid "[+] exclude names matching the given patterns"
+#~ msgstr "Lista alla moduler som matchar parameter med jokertecken"
+
+#, fuzzy
+#~ msgid "[+]   include names matching the given patterns"
+#~ msgstr "Visa inte filer som matchar mönster"
+
+#, fuzzy
+#~ msgid "[+]   exclude names matching the given patterns"
+#~ msgstr "Lista alla moduler som matchar parameter med jokertecken"
+
+#, fuzzy
+#~ msgid "Annotate the specified revision"
+#~ msgstr "Hjälp för det angivna inbyggda kommandot"
+
+#, fuzzy
+#~ msgid "Use text as commit message"
+#~ msgstr "Läs meddelande för tillägg från fil"
+
+#~ msgid "Read commit message from file"
+#~ msgstr "Läs meddelande för tillägg från fil"
+
+#, fuzzy
+#~ msgid "Record the specified date as commit date"
+#~ msgstr "Hjälp för det angivna kommandot"
+
+#, fuzzy
+#~ msgid "Record the specified user as committer"
+#~ msgstr "Använd angiven sträng som kommentarsträng"
+
+#, fuzzy
+#~ msgid "File to store the bundles into"
+#~ msgstr "Redigera fix-paketbeskrivning"
+
+#, fuzzy
+#~ msgid "Limit number of changes displayed"
+#~ msgstr "Skriv bara ut angivet antal matchningar"
+
+#, fuzzy
+#~ msgid "Display with template"
+#~ msgstr "Visa alla matchningar"
+
+#, fuzzy
+#~ msgid "Specify ssh command to use"
+#~ msgstr "Ange kommando att operera på"
+
+#, fuzzy
+#~ msgid "Specify hg command to run on the remote side"
+#~ msgstr "Välj destinationsadress"
+
+#, fuzzy
+#~ msgid "Search the repository as it is in REV"
+#~ msgstr "Ange förråd-URL"
+
+#, fuzzy
+#~ msgid "Show revisions matching date spec"
+#~ msgstr "Visa bara matchande del"
+
+#, fuzzy
+#~ msgid "Revision to display"
+#~ msgstr "Välj display"
+
+#, fuzzy
+#~ msgid "Specify merge tool"
+#~ msgstr "Ange förtroendemodell"
+
+#, fuzzy
+#~ msgid "Show parents of the specified revision"
+#~ msgstr "Fråga paket med angiven grupp"
+
+#, fuzzy
+#~ msgid "[+] target revision"
+#~ msgstr "Slå ihop revisioner"
+
+#, fuzzy
+#~ msgid "Tipmost revision matching date"
+#~ msgstr "Visa inte filer som matchar mönster"
+
+#, fuzzy
+#~ msgid "Revert to the specified revision"
+#~ msgstr "Flytta filen angiven på kommandoraden"
+
+#, fuzzy
+#~ msgid "For remote clients"
+#~ msgstr "Visa eller ta bort funktioner"
+
+#, fuzzy
+#~ msgid "Untrusted configuration options"
+#~ msgstr "Välj konfigurationsinställningar"
+
+#, fuzzy
+#~ msgid "List the changed files of a revision"
+#~ msgstr "Visa alla engenskaper hos filer, kataloger eller revisioner"
+
+#~ msgid ""
+#~ "\\nWARNING\\n\\nThe location for fish configuration files has changed to "
+#~ "%s.\\nYour old files have been moved to this location.\\nYou can change "
+#~ "to a different location by changing the value of the variable "
+#~ "$XDG_CONFIG_HOME.\\n\\n"
+#~ msgstr ""
+#~ "\\nVARNING\\n\\nLagringsplatsen för fish-konfigureringsfiler har ändrats "
+#~ "till %s. Dina gamla filer har flyttats till denna plats.\\nDu kan ändra "
+#~ "denna plats genom att byta värde på variabeln $XDG_CONFIG_HOME.\\n\\n"
+
+#~ msgid "%ls: Missing function definition information."
+#~ msgstr "%ls: Funktionsdefinition saknas."
+
+#~ msgid "%ls: Command only available in interactive sessions"
+#~ msgstr "%ls: Kommandot finns bara tillgängligt under interaktiva sessioner"
+
+#~ msgid "Procces\n"
+#~ msgstr "Process\n"
+
+#~ msgid "This is a bug. "
+#~ msgstr "Detta är en bug. "
+
+#~ msgid "Could not create child process - exiting"
+#~ msgstr "Kunde inte skapa barnprocess - avslutar programmet"
+
+#~ msgid "Failed to close file descriptor %d"
+#~ msgstr "Misslyckades med att stänga filidentifierare %d"
+
+#~ msgid ""
+#~ "Could not send process %d, '%ls' in job %d, '%ls' from group %d to group "
+#~ "%d"
+#~ msgstr ""
+#~ "Kunde inte skicka process %d, '%ls', i jobb %d, '%ls' från grupp %d till "
+#~ "grupp %d"
+
+#~ msgid "%s: Unknown error\n"
+#~ msgstr "%s: Okänt fel\n"
+
+#~ msgid "Maximum recursion depth reached. Accidental infinite loop?"
+#~ msgstr "Maximalt rekursionsdjup uppnått. Oavsiktlig oändlig upprepning?"
+
+#~ msgid "Maximum number of nested blocks reached."
+#~ msgstr "Maximalt antal nästade block har uppnåtts."
+
+#~ msgid ""
+#~ "Warning: No match for wildcard '%ls'. The command will not be executed."
+#~ msgstr ""
+#~ "Varning: Inga matchningar för jokertecknen i '%ls'. Kommandot kommer inte "
+#~ "utföras."
+
+#~ msgid "Tried to evaluate null pointer."
+#~ msgstr "Försökte evaluera nollpekare."
+
+#~ msgid "in . (source) call of file '%ls',\n"
+#~ msgstr "i '.'-anrop av fil '%ls',\n"
+
+#~ msgid "Unknown command '%ls'"
+#~ msgstr "Okänt kommando '%ls'"
+
+#~ msgid "Job command"
+#~ msgstr "Jobb kommando"
+
+#~ msgid "Job list pointer"
+#~ msgstr "Jobblistepekare"
+
+#~ msgid "Process command"
+#~ msgstr "Processkommando"
+
+#~ msgid "There are stopped jobs\n"
+#~ msgstr "Det finns stannade jobb\n"
+
+#~ msgid "Could not convert input. Read %d bytes."
+#~ msgstr "Kunde inte konvertera indata. Läste %d bytes."
+
+#~ msgid "Could not read input stream"
+#~ msgstr "Kunde inte läsa från indataström"
+
+#~ msgid "%s: Too many arguments\n"
+#~ msgstr "%s: För många argument\n"
+
+#~ msgid "Invalid token"
+#~ msgstr "Ogiltig symbol"
+
+#~ msgid "function %s called with null value for argument %s. "
+#~ msgstr "funktionen %s anropades med nollvärde som argument %s. "
+
+#~ msgid "function %s called while blocking signals. "
+#~ msgstr "funktionen %s anropades medan signaler var blockerade. "
+
+#~ msgid "Remove one or more files or directories from the repository"
+#~ msgstr "Ta bort filer eller kataloger från lagret"
+
+#~ msgid "Move/rename one or more files or directories"
+#~ msgstr "Flytta/byt namn på en eller flera filer eller kataloger"
+
+#~ msgid "Replace a token with a new value for that token"
+#~ msgstr "Ersätt en symbol med ett nytt värde för den symbolen"
+
+#~ msgid "Revert to the recorded version (safe the first time only)"
+#~ msgstr "Backa till senaste lagrade version (Är bara säkert en gång)"
+
+#~ msgid "Save changes in the working copy to the repository as a patch"
+#~ msgstr "Spara ändringar i arbetskopian till lagret som en fix"
+
+#~ msgid "Tag the contents of the repository with a version name"
+#~ msgstr "Tagga innehållet i lagret med ett versionsnummer"
+
+#, fuzzy
+#~ msgid "Record an inverse patch without changing the working directory"
+#~ msgstr "Lagra en omvänd fix utan att ändra arbetskopian"
+
+#, fuzzy
+#~ msgid "Gives a changelog-style summary of the repository history"
+#~ msgstr "Ge en changelog-formaterad summering av förrådhistorik"
+
+#, fuzzy
+#~ msgid "Opposite of pull; unsafe if patch is not in remote repository"
+#~ msgstr "Motsatsen till pull, osäker om fixen inte finns i fjärrlagret"
+
+#~ msgid "Apply patches (from an email bundle) to the repository"
+#~ msgstr "Applicera fixar (från e-postpaket) till lagret"
+
+#~ msgid "Create a local copy of another repository"
+#~ msgstr "Skapa lokal kopia av förråd"
+
+#, fuzzy
+#~ msgid "Initialize a new source tree as a darcs repository"
+#~ msgstr "Checka in filer till förråd"
+
+#~ msgid "Optimize the repository"
+#~ msgstr "Optimera förråd"
+
+#~ msgid "Check the repository for consistency"
+#~ msgstr "Kontrollera lagrets konsistens"
+
+#~ msgid "Name of version to checkpoint"
+#~ msgstr "NAmn på version at använda som kontrollpunkt"
+
+#~ msgid "Use pattern from file"
+#~ msgstr "Använd mönster från fil"
+
+#, fuzzy
+#~ msgid "Use ARG as merge command"
+#~ msgstr "Ange sammanslagningskommando"
+
+#, fuzzy
+#~ msgid "Use ARG as external editor"
+#~ msgstr "Ange extern editor"
+
+#~ msgid "Maximum number of log entries"
+#~ msgstr "Maximalt antal logginlägg"
+
+#~ msgid "Commands to execute when fish exits"
+#~ msgstr "Kommandon som utförs när fish avslutas"
+
+#~ msgid "Good bye\\n"
+#~ msgstr "Hej då\\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%sfunced%s "
+#~ "FUNCTION\\n"
+#~ msgstr ""
+#~ "%s: Förväntade exakt ett argument, fick %s\\n\\nSynopsis:\\n\\t%svared%s "
+#~ "VARIABEL\\n"
+
+#~ msgid ""
+#~ "%ls: '%ls' is not a directory or you do not have permission to enter it\n"
+#~ msgstr ""
+#~ "%ls: '%ls' är inte en katalog eller så har du inte rättigheter att läsa "
+#~ "denna katalog\n"
+
+#~ msgid "%ls: Expected at least one argument, got %d\n"
+#~ msgstr "%ls: Förväntade minst ett argument, fick %d\n"
+
+#~ msgid "Evaluate parameters as a command"
+#~ msgstr "Utför argument som kommando"
+
+#~ msgid "User home"
+#~ msgstr "Hemkatalog"
+
+#~ msgid "Invalid Control sequence"
+#~ msgstr "Ogiltig kontroll-sekvens"
+
+#~ msgid "Could not parse sequence '%ls'"
+#~ msgstr "Kunde inte tolka sekvens '%ls'"
+
+#~ msgid "Invalid sequence - no dash after control\n"
+#~ msgstr "Ogiltig sekvens - inget bindestreck efter 'control'\n"
+
+#~ msgid "Invalid sequence - Control-nothing?\n"
+#~ msgstr "Ogiltig sekvens - Kontroll-ingenting?\n"
+
+#~ msgid "Invalid sequence - no dash after meta\n"
+#~ msgstr "Ogiltig sekvens - inget bindestreck efter 'meta'\n"
+
+#~ msgid "Invalid sequence - Meta-nothing?"
+#~ msgstr "Ogiltig sekvens - Meta-ingenting?"
+
+#~ msgid "Invalid sequence - '%ls' expanded to zero characters"
+#~ msgstr "Ogiltig sekvens - '%ls' expanderades till en tom sträng"
+
+#~ msgid "Mismatched $endif in inputrc file"
+#~ msgstr "$endif matchade inte i inputrc-fil"
+
+#~ msgid "Mismatched quote"
+#~ msgstr "Citat-tecknen matchar inte varandra"
+
+#~ msgid "Expected a ':'"
+#~ msgstr "Förväntade ett ':'"
+
+#~ msgid "I don't know what '%ls' means"
+#~ msgstr "Vet inte vad '%ls' betyder"
+
+#~ msgid "Expected end of line, got '%ls'"
+#~ msgstr "Förväntade radslut, fick '%ls'"
+
+#~ msgid "Syntax: set KEY VALUE"
+#~ msgstr "Syntax: set NAMN VÄRDE"
+
+#~ msgid "Unable to parse key binding"
+#~ msgstr "Kunde inte tolka tangentbordsgenväg"
+
+#~ msgid "I don't know what %ls means"
+#~ msgstr "Vet inte vad '%ls' betyder"
+
+#~ msgid "Error while reading input information from file '%ls'"
+#~ msgstr "Ett fel uppstod under inläsning av filen '%ls'"
+
+#~ msgid ""
+#~ "This is a circular dependency in the autoloading scripts, please remove "
+#~ "it."
+#~ msgstr ""
+#~ "Detta är ett cirkulärt beroende i de automatiskt laddade filerna, var "
+#~ "vänlig ta bort det."
+
+#~ msgid "Error while reading commands"
+#~ msgstr "Ett fel inträffade medan kommandon lästes in"
+
+#~ msgid ""
+#~ "%s: Warning: The directory %s has been removed from your PATH because it "
+#~ "does not exist\\n"
+#~ msgstr ""
+#~ "%s: Varning: Katalogen %s har tagits bort från din PATH eftersom den inte "
+#~ "existerar\\n"
+
+#~ msgid "Comma-separated list of dependancy types to follow recursively"
+#~ msgstr "Komma-separarad lista av beroendetyper att följa rekursivt"
+
+#~ msgid "Comma-separated list of dependancy types to show"
+#~ msgstr "Komma-separarad lista av beroendetyper att visa"
+
+#~ msgid "Run in noninteractive mode"
+#~ msgstr "Kör i icke-interaktivt läge"
+
+#
+#~ msgid "Change input mode"
+#~ msgstr "Ändra inmatningsläge"
+
+#~ msgid "Escape all non-printing characters"
+#~ msgstr "Ersätt oskrivbara tecken med specialsekvenser"
+
+#~ msgid "Number nonblank lines"
+#~ msgstr "Numrera icke-tomma rader"
+
+#~ msgid "Escape non-printing characters except tab"
+#~ msgstr "Erätt oskrivbarta tecken utom tab med specialsekvenser"
+
+#~ msgid "Display $ at end of line"
+#~ msgstr "Visa $ vid radslut"
+
+#~ msgid "Never more than single blank line"
+#~ msgstr "Visa maximalt en tom rad i följd"
+
+#~ msgid "Escape non-printing characters except newline"
+#~ msgstr "Erätt oskrivbarta tecken utom radbrytning med specialsekvenser"
+
+#~ msgid "Escape tab"
+#~ msgstr "Ersätt tab med specialsekvens"
+
+#~ msgid "Escape non-printing except newline and tab"
+#~ msgstr ""
+#~ "Erätt oskrivbarta tecken utom tab och radbrytning med specialsekvenser"
+
+#~ msgid "Dereferense symbolic links"
+#~ msgstr "Följ symboliska länkar"
+
+#~ msgid "Same as -dpR"
+#~ msgstr "Samma sak som -dpR"
+
+#~ msgid "Copy contents of special files when recursive"
+#~ msgstr "Kopiera innehåll i specialla filer i rekursivt läge"
+
+#~ msgid "Same as --no-dereference --preserve=link"
+#~ msgstr "Samma sak som --no-dereference --preserve=link"
+
+#~ msgid "Follow command-line symbolic links"
+#~ msgstr "Följ symboliska länkar från kommandoraden"
+
+#~ msgid "Link files instead of copying"
+#~ msgstr "Länka filer istället för att kopiera dem"
+
+#~ msgid "Always follow symbolic links"
+#~ msgstr "Följ alltid symboliska länkar"
+
+#~ msgid "Never follow symbolic links"
+#~ msgstr "Följ aldrig symboliska länkar"
+
+#~ msgid "Use full source file name under DIRECTORY"
+#~ msgstr "Använd fullt källfilsnamn under KATALOG"
+
+#~ msgid "Copy directories recursively"
+#~ msgstr "Kopiera kataloger rekursivt"
+
+#~ msgid ""
+#~ "Remove each existing destination file before attempting to open it "
+#~ "(contrast with --force)"
+#~ msgstr ""
+#~ "Ta bort varje existerande målfil innan försök att öppna den (jämför med --"
+#~ "force)"
+
+#~ msgid "Make symbolic links instead of copying"
+#~ msgstr "Skapa symboliska länkar istället för att kopiera"
+
+#~ msgid "Treat DEST as a normal file"
+#~ msgstr "Behandla DEST som en vanlig fil"
+
+#~ msgid "Stay on this file system"
+#~ msgstr "Stanna på detta filsystem"
+
+#~ msgid "Create patch format diffs between releases"
+#~ msgstr "Skapa differens mellan versioner i \"patch\"-format"
+
+#~ msgid "Specify legal cvsroot directory."
+#~ msgstr "Välj laglig cvsroot-katalog"
+
+#~ msgid "Authenticate all net traffic"
+#~ msgstr "Autentisera all nätverkstrafik"
+
+#~ msgid "Do not use the ~/.cvsrc file"
+#~ msgstr "Ignorera ~/.cvsrc"
+
+#~ msgid "Cause CVS to be really quiet"
+#~ msgstr "Gör CVS mycket tyst läge"
+
+#~ msgid "Cause CVS to be somewhat quiet"
+#~ msgstr "Gör CVS något tystare"
+
+#~ msgid "Make checked-out files read-only"
+#~ msgstr "Gör utcheckade filer skrivskyddade"
+
+#~ msgid "Show trace of program execution -- try with -n"
+#~ msgstr "Visa spår av programexekvering -- använd med -n"
+
+#~ msgid "Make checked-out files read-write (default)"
+#~ msgstr "Gör utcheckade filer läs och skrivbara"
+
+#~ msgid "Encrypt all net traffic"
+#~ msgstr "Kryptera all nätverkstrafik"
+
+#~ msgid "Use the most recent revision no later than date"
+#~ msgstr "Använd den senaste revisionen som ej är nyare än angivet datum"
+
+#~ msgid "Retrieve files even when no match for tag/date"
+#~ msgstr "Hämta filer även när ingen matchning finns för tagg/datum"
+
+#~ msgid "Alter default keyword processing"
+#~ msgstr "Ändra standardnyckelordsprocessning"
+
+#~ msgid "Don't recurse"
+#~ msgstr "Rekursera inte"
+
+#~ msgid "Specify log message instead of invoking editor"
+#~ msgstr "Ange logmeddelande istället för att anropa editor"
+
+#~ msgid "Don't run any tag programs"
+#~ msgstr "Kör inga taggningsprogram"
+
+#~ msgid "Prune empty directories"
+#~ msgstr "Rensa bort tomma kataloger"
+
+#~ msgid "Pipe files to stdout"
+#~ msgstr "Skicka filer till standard ut"
+
+#~ msgid "Process directories recursively"
+#~ msgstr "Processa underkataloger rekursivt"
+
+#~ msgid "Specify filenames to be filtered"
+#~ msgstr "Ange filnamn att filtrera"
+
+#~ msgid "Lock a revision"
+#~ msgstr "Lås en revision"
+
+#~ msgid "Force name/rev association"
+#~ msgstr "Tvinga namn/revision-association"
+
+#~ msgid "Make a name/rev association"
+#~ msgstr "Skapa namn/revision-association"
+
+#~ msgid "Run quietly"
+#~ msgstr "Tyst läge"
+
+#~ msgid "Set a state attribute for a revision"
+#~ msgstr "Välj ett tillståndsattribut för en revision"
+
+#~ msgid "Write descriptive text from a file into RCS"
+#~ msgstr "Skriv beskrivande text från en fil till RCS"
+
+#~ msgid "Write descriptive text into RCS"
+#~ msgstr "Skriv beskrivande text till RCS"
+
+#~ msgid "Unlock a revision"
+#~ msgstr "Lås upp revision"
+
+#~ msgid "Annotate binary files"
+#~ msgstr "Annotera binära filer"
+
+#~ msgid "Reset sticky tags/dates/k-opts"
+#~ msgstr "Återställ fasta tagg/datum/k-opts"
+
+#~ msgid "Copy module file to stdout"
+#~ msgstr "Kopiera modulfil till standard ut"
+
+#~ msgid "Name directory for working files"
+#~ msgstr "Ange katalog för arbetsfiler"
+
+#~ msgid "For -d. Don't shorten paths"
+#~ msgstr "För -d. Förkorta inte sökvägar"
+
+#~ msgid "Force new revision"
+#~ msgstr "Tvinga ny revision"
+
+#~ msgid "Treat all whitespace as one space"
+#~ msgstr "Behandla alla blanktecken som ett mellanslag"
+
+#~ msgid "Ignore blank line only changes"
+#~ msgstr "Ignorera ändringar som bara består av ändringar i tomma rader"
+
+#~ msgid "Binary mode"
+#~ msgstr "Binärt läge"
+
+#~ msgid "Report only whether files differ"
+#~ msgstr "Skriv bara ut huruvida filerna skiljer sig"
+
+#~ msgid "Use context format"
+#~ msgstr "Använd kontext-format"
+
+#~ msgid "Set context size"
+#~ msgstr "Välj kontextstorlek"
+
+#~ msgid "Set context format and, optionally, size"
+#~ msgstr "Välj kontextformat och eventuellt storlek"
+
+#~ msgid "Set line group format"
+#~ msgstr "Välj radgruppsformat"
+
+#~ msgid "Make output a valid ed script"
+#~ msgstr "Gör utdata till ett giltigt ed-skript"
+
+#~ msgid "Expand tabs to spaces"
+#~ msgstr "Expandera tabbar till mellanslag"
+
+#~ msgid "Output that looks like an ed script"
+#~ msgstr "Utdata ser ut som ett ed-skript"
+
+#~ msgid "Set regexp for context, unified formats"
+#~ msgstr "Välj reguljärt uttryck för kontext, unifierade format"
+
+#~ msgid "Speed handling of large files with small changes"
+#~ msgstr "Snabb hantering av stora filer med små ändringar"
+
+#~ msgid "Set horizon lines"
+#~ msgstr "Välj horisontlinjer"
+
+#~ msgid "Ignore changes in case"
+#~ msgstr "Ignorera ändringar i skiftläge"
+
+#~ msgid "Ignore changes matching regexp"
+#~ msgstr "Ignorera ändringar som matchar reguljärt uttryck"
+
+#~ msgid "Make ifdef from diff"
+#~ msgstr "Skapa ifdef från differens"
+
+#~ msgid "Ignore whitespace"
+#~ msgstr "Ignorera blanktecken"
+
+#~ msgid "Start lines with a tab"
+#~ msgstr "Starta rader med en tabb"
+
+#~ msgid "Use label instead of filename in output"
+#~ msgstr "Använd etikett istället för filnamn i utdata"
+
+#~ msgid "Print only left column"
+#~ msgstr "Visa bara vänster kolumn"
+
+#~ msgid "Use format to produce if-then-else output"
+#~ msgstr "Använd format för att producera if-then-else utdata"
+
+#~ msgid "Produce RCS-style diffs"
+#~ msgstr "Producera differenser i RCS-stil"
+
+#~ msgid "Treat files absent from one dir as empty"
+#~ msgstr "Behandla saknade filer från katalog som om de vore tomma"
+
+#~ msgid "Specifies line formatting"
+#~ msgstr "Ange radformatering"
+
+#~ msgid "Identify the C function each change is in"
+#~ msgstr "Identifiera vilken C-funktion varje ändring är i"
+
+#~ msgid "Report identical files"
+#~ msgstr "Rapportera identiska filer"
+
+#~ msgid "Use side-by-side format"
+#~ msgstr "Använd sida-vid-sida-format"
+
+#~ msgid "Suppress common lines in side-by-side"
+#~ msgstr "Undertryck vanliga rader i sida-vid-sida"
+
+#~ msgid "Use unified format"
+#~ msgstr "Använd unifierat format"
+
+#~ msgid "Set context size in unified"
+#~ msgstr "Välj kontextstorlek i unifierat format"
+
+#~ msgid "Set column width for side-by-side format"
+#~ msgstr "Välj kolumnbredd för sida-vis-sida-format"
+
+#~ msgid "Report on each commit"
+#~ msgstr "Rapport för varje tillägg"
+
+#~ msgid "Report on everything"
+#~ msgstr "Rapport för allt"
+
+#~ msgid "Report on a module"
+#~ msgstr "Rapport för modul"
+
+#~ msgid "Report on checked-out modules"
+#~ msgstr "Rapport för ut-checkade moduler"
+
+#~ msgid "Report on all tags"
+#~ msgstr "Rapport för alla taggar"
+
+#~ msgid "Show only records for this directory"
+#~ msgstr "Visa bara poster för angiven katalog"
+
+#~ msgid "Multiple vendor branch"
+#~ msgstr "Multipel distributör-gren"
+
+#~ msgid "Files to ignore during import"
+#~ msgstr "Filer att ignorera vid import"
+
+#~ msgid "Print info about revision on default branch"
+#~ msgstr "Visa information om revision i standardgren"
+
+#~ msgid "Specify date range for query"
+#~ msgstr "Ange dataspann för fråga"
+
+#~ msgid "Print only file info"
+#~ msgstr "Visa utförlig information"
+
+#~ msgid "Print only rcs filename"
+#~ msgstr "Skriv bara RCS-filnamn"
+
+#~ msgid "Suppress header if no revisions found"
+#~ msgstr "Visa inte huvud om inga revisioner hittas"
+
+#~ msgid "Same as -h, plus descriptive text"
+#~ msgstr "Samma som -h, men med beskrivande text"
+
+#~ msgid "Specify users for query"
+#~ msgstr "Ange användare för fråga"
+
+#~ msgid "Use context diff format"
+#~ msgstr "Användar kontextdifferensformat"
+
+#~ msgid "Create summary change report"
+#~ msgstr "Skapa översiktilig ändringsrapport"
+
+#~ msgid "diff top two revisions"
+#~ msgstr "Visa differens mellan två senaste revisioner"
+
+#~ msgid "Use unidiff format"
+#~ msgstr "Använd unidiff-format"
+
+#~ msgid "Reset sticky tags, dates, and k-opts"
+#~ msgstr "Återställ fasta taggar, datum och k-opts"
+
+#~ msgid "Overwrite modified files with clean copies"
+#~ msgstr "Skriv över ändrade filer med rena kopior"
+
+#~ msgid "Create any missing directories"
+#~ msgstr "Skapa saknade kataloger"
+
+#~ msgid "Specify files to ignore"
+#~ msgstr "Ange filer att ignorera"
+
+#~ msgid "Create new project"
+#~ msgstr "Skapa nytt projekt"
+
+#~ msgid ""
+#~ "In addition to modifications, look for files that are not boring, and "
+#~ "thus are potentially pending addition"
+#~ msgstr ""
+#~ "Förutom att lägga till ändringar, sök efter interessanta filer att lägga "
+#~ "till lagret"
+
+#~ msgid "Don't create compressed patches"
+#~ msgstr "Skapa inte komprimerade fixar"
+
+#~ msgid "Expect to receive input from a pipe"
+#~ msgstr "Förvänta indata från rör"
+
+#~ msgid "Ask for extra dependencies"
+#~ msgstr "Fråga efter extra beroenden"
+
+#~ msgid "Don't ask for extra dependencies"
+#~ msgstr "Fråga inte efter extra beroenden"
+
+#~ msgid ""
+#~ "Don't look for any files or directories that could be added, and don't "
+#~ "add them automatically"
+#~ msgstr ""
+#~ "Leta inte efter filer eller kataloger att lägga till, och lägg inte till "
+#~ "dem automatiskt"
+
+#~ msgid "Don't make scripts executable"
+#~ msgstr "Gör inte skript exekverbara"
+
+#~ msgid "Fail on patches that create conflicts [DEFAULT]"
+#~ msgstr "Misslyckas på fixar som skapar konflikter [STANDARD]"
+
+#~ msgid "Check patches since latest checkpoint"
+#~ msgstr "Kontrollera fixar sedan senaste kontrollpunkt"
+
+#~ msgid "Don't refuse to add files differing only in case"
+#~ msgstr "Vägra inte lägga till filer som bara skiljer i skiftläge"
+
+#~ msgid "Do not sign the patch"
+#~ msgstr "Signera inte fixen"
+
+#~ msgid "Use a plain pristine tree [DEFAULT]"
+#~ msgstr "Använd enkelt pristint träd [DEFAULT]"
+
+#~ msgid "Use no pristine tree"
+#~ msgstr "Använd inte pristint träd"
+
+#~ msgid "Give human readable output"
+#~ msgstr "Människoanpassad formatering av utdata"
+
+#~ msgid "Don't skip boring files"
+#~ msgstr "Skippa inte tråkiga filer"
+
+#~ msgid "Add contents of subdirectories"
+#~ msgstr "Lägg till innehåll i underkataloger"
+
+#~ msgid "Don't add contents of subdirectories"
+#~ msgstr "Lägg inte till innehåll i underkataloger"
+
+#~ msgid "Add files with date appended to avoid conflict. [EXPERIMENTAL]"
+#~ msgstr ""
+#~ "Lägg till filer med datum efter för att undvika konflikter. "
+#~ "[EEXPERIMENTELLT]"
+
+#~ msgid "Don't use experimental date appending trick. [DEFAULT]"
+#~ msgstr "Använd inte experimentellt datum-tillläggningstrick. [STANDARD]"
+
+#~ msgid "Rewrite all patches in current darcs format"
+#~ msgstr "Skriv om alla fixar till nuvarande darcs-format"
+
+#~ msgid "Do not run posthook command."
+#~ msgstr "Utför inte posthook-kommando"
+
+#~ msgid "Display date described by string"
+#~ msgstr "Visa datum angivet i textsträng"
+
+#~ msgid "Display date for each line in file"
+#~ msgstr "Visa datum för varje rad i fil"
+
+#~ msgid "Output in ISO 8601 format"
+#~ msgstr "Visa datum i ISO 8601-format"
+
+#~ msgid "Output RFC-2822 compliant date string"
+#~ msgstr "Visa datum i RFC-2822-format"
+
+#~ msgid "Display the last modification time of file"
+#~ msgstr "Visa senaste ändringsdatum för fil"
+
+#~ msgid "Print or set Coordinated Universal Time"
+#~ msgstr "Visa eller välj Koordinerad universaltid (UCT)"
+
+#~ msgid "List inode information"
+#~ msgstr "Lista information om inoder"
+
+#~ msgid "List only local filesystems"
+#~ msgstr "Lista bara lokala filsystem"
+
+#~ msgid "Use Posix format"
+#~ msgstr "Använd Posix-format"
+
+#~ msgid "Include empty filesystems"
+#~ msgstr "Inkludera tomma filsystem"
+
+#~ msgid "Do not sync before getting usage info"
+#~ msgstr "Synkronisera inte filsystem innan användningsinformation hämtas"
+
+#~ msgid "Sync before getting usage info"
+#~ msgstr "Synkronisera filsystem innan användningsinformation hämtas"
+
+#~ msgid "Print filesystem type"
+#~ msgstr "Visa filsystemtyp"
+
+#~ msgid "Excluded filesystem type"
+#~ msgstr "Exkludera filsystemtyp"
+
+#~ msgid "Show all filesystems"
+#~ msgstr "Visa alla filsystem"
+
+#~ msgid "Show sizes in gigabytes"
+#~ msgstr "Visa storlekar i gigabyte"
+
+#~ msgid "Show sizes in megabytes"
+#~ msgstr "Visa storlekar i megabyte"
+
+#~ msgid "Print out the previously obtained statistics from the file systems"
+#~ msgstr "Visa tidigare hämtad statistik från filsystemet"
+
+#~ msgid "Skip other filesystems"
+#~ msgstr "Skippa andra filsystem"
+
+#~ msgid "No newline"
+#~ msgstr "Skriv ingen radbrytning"
+
+#~ msgid "Use backslash escaped characters"
+#~ msgstr "Använd omvänt snedstreck-specialsekvenser"
+
+#~ msgid "Do not use backslash escaped characters"
+#~ msgstr "Använd inte omvänt snedstreck-specialsekvenser"
+
+#~ msgid "Do not load init files"
+#~ msgstr "Ladda inte initieringsfiler"
+
+#~ msgid "Load users init file"
+#~ msgstr "Ladda användarens initieringsfiler"
+
+#~ msgid "Use file as terminal"
+#~ msgstr "Användard fil som terminal"
+
+#~ msgid "Execute Lisp function"
+#~ msgstr "Utför lispfunktion"
+
+#~ msgid "Load Lisp code from file"
+#~ msgstr "Ladda lispfunktion från fil"
+
+#~ msgid "Do not use X interface"
+#~ msgstr "Använd inte X-användargränssnittet"
+
+#~ msgid "Create window on the specified display"
+#~ msgstr "Skapa fönster på angiven skärm"
+
+#~ msgid "Allow dash (-) in function name"
+#~ msgstr "Tillåt bindestreck (-) i funktionsnamn"
+
+#~ msgid "Language"
+#~ msgstr "Språk"
+
+#~ msgid "Pass program exit codes"
+#~ msgstr "Skicka vidare slutstatus"
+
+#~ msgid "Stop after assembler"
+#~ msgstr "Stanna efter assembler"
+
+#~ msgid "Stop after compile"
+#~ msgstr "Stanna efter kompilering"
+
+#~ msgid "Stop after preprocessor"
+#~ msgstr "Stanna efter förprocessor"
+
+#~ msgid "Print commands to stderr"
+#~ msgstr "Skriv kommandon till standard fel"
+
+#~ msgid "Print quoted commands to stderr, do not run"
+#~ msgstr "Skriv citerade kommandon till standard fel, utför dem inte"
+
+#~ msgid "Use pipes"
+#~ msgstr "Använd rör"
+
+#~ msgid "Use ansi mode"
+#~ msgstr "Använd ansiläge"
+
+#~ msgid "Do not recognize asm, inline or typeof keywords"
+#~ msgstr "Känn inte igen asm, inline och typeof nyckelorden"
+
+#~ msgid "Do not use builtin functions"
+#~ msgstr "Använd inte inbyggda funktioner"
+
+#~ msgid "Assert hosted environment"
+#~ msgstr "Försäkra värdmiljö"
+
+#~ msgid "Assert freestanding environment"
+#~ msgstr "Försäkra självständig miljö"
+
+#~ msgid "Use Microsoft extensions"
+#~ msgstr "Använd Microsoftförlängningar"
+
+#~ msgid "Use ANSI trigraphs"
+#~ msgstr "Använd ANSI-trigrafer"
+
+#~ msgid "Do not use integrated preprocessor"
+#~ msgstr "Använd inte inbyggd förprocessor"
+
+#~ msgid "char is unsigned"
+#~ msgstr "char har inte tecken"
+
+#~ msgid "char is signed"
+#~ msgstr "char har tecken"
+
+#~ msgid "bitfield is unsigned"
+#~ msgstr "bitfield har inte tecken"
+
+#~ msgid "bitfield is signed"
+#~ msgstr "bitfield har tecken"
+
+#~ msgid "All bitfields are signed"
+#~ msgstr "Alla bitfield har tecken"
+
+#~ msgid "All bitfields are unsigned"
+#~ msgstr "Inga bitfield har tecken"
+
+#~ msgid "String constants are not const"
+#~ msgstr "Strängkonstanter är inte konstanta"
+
+#~ msgid "C++ ABI version"
+#~ msgstr "C++ ABI-version"
+
+#~ msgid "Turn off access checking"
+#~ msgstr "Slå av rättighetskontroll"
+
+#~ msgid "Check pointer returned by new"
+#~ msgstr "Kontrollera pekare från 'new'"
+
+#~ msgid "Put globals in the common segment"
+#~ msgstr "Lägg globaler i det gemensamma segmentet"
+
+#~ msgid "Accept $ in identifiers"
+#~ msgstr "Acceptera $ i identifierare"
+
+#~ msgid "Reject $ in identifiers"
+#~ msgstr "Acceptera inte $ i identifierare"
+
+#~ msgid "Do not omit unneeded temporarys"
+#~ msgstr "Ta into bort onödiga tillfälliga variabler"
+
+#~ msgid "Allow exception violations"
+#~ msgstr "Tillåt brott mot undantag"
+
+#~ msgid "Do not extend for-loop scope"
+#~ msgstr "Utöka inte definitionsområde för for-loop"
+
+#~ msgid "Extend for-loop scope"
+#~ msgstr "Utöka definitionsområde för for-loop"
+
+#~ msgid "Do not recognize typeof as keyword"
+#~ msgstr "Känn inte igen typeof som nyckelord"
+
+#~ msgid "Do not emit code for implicit templates"
+#~ msgstr "Skapa inte kod for implicita mallar"
+
+#~ msgid "Do not emit code for implicit inline templates"
+#~ msgstr "Skapa inte kod för implicita inlinemallar"
+
+#~ msgid "Do not emit out-of-line code for inline functions"
+#~ msgstr "Skapa inte icke-inlinekod for inline-funktioner"
+
+#~ msgid "Disable some built-in functions"
+#~ msgstr "Inaktivera somliga inbyggda funktioner"
+
+#~ msgid "Disable operator keywords"
+#~ msgstr "Inaktivera operator-nyckelord"
+
+#~ msgid "Disable optional diagnostics"
+#~ msgstr "Inaktivera frivillig diagnostik"
+
+#~ msgid "Downgrade some errors to warnings"
+#~ msgstr "Nedgradera vissa fel till varningar"
+
+#~ msgid "Disable generation of C++ runtime type information"
+#~ msgstr ""
+#~ "Inaktivera generering av C++-typinformation under körning av program"
+
+#~ msgid "Do not emit code for thread-safe initialization of local statics"
+#~ msgstr ""
+#~ "Skapa inte kod för tråd-säker initiering av lokala statiska variabler"
+
+#~ msgid "Use __cxa_atexit for destructors"
+#~ msgstr "Använd __cxa_atexit för destruktorer"
+
+#~ msgid "Hides inline methods from export table"
+#~ msgstr "Dölj inline-metoder från exporttabeller"
+
+#~ msgid "Do not use weak symbol support"
+#~ msgstr "Stöd inte svaga symboler"
+
+#, fuzzy
+#~ msgid "Match only the base name against the specified patterns"
+#~ msgstr "Installera inte filer vars namn börjar med angiven sökväg"
+
+#, fuzzy
+#~ msgid "Ignore case distinctions when matching patterns"
+#~ msgstr "Ignorera skiftläge på filnamn"
+
+#, fuzzy
+#~ msgid "Ignored"
+#~ msgstr "Ignorera skiftläge"
+
+#, fuzzy
+#~ msgid "Write no messages about errors encountered"
+#~ msgstr "Visa meddelanden om vad programmet gör"
+
+#, fuzzy
+#~ msgid "Interpret all patterns as extended regexps"
+#~ msgstr "Mönster är ett förlängt reguljärt uttryck"
+
+#, fuzzy
+#~ msgid "Match only the whole path name against the specified patterns"
+#~ msgstr "Installera inte filer vars namn börjar med angiven sökväg"
+
+#~ msgid "Input is a file, use name and contents to determine mimetype"
+#~ msgstr ""
+#~ "Indata är en fil, använd namn och innehåll för att bestämma mime-typ"
+
+#~ msgid "Input is a file, use name to determine mimetype"
+#~ msgstr "Indata är en fil, använd namn för att bestämma mime-typ"
+
+#~ msgid "Input is a mimetype"
+#~ msgstr "Indata är en mime-typ"
+
+#~ msgid "Output mimetype"
+#~ msgstr "Utdata är mimetyp"
+
+#~ msgid "Output description of mimetype"
+#~ msgstr "Utdata är beskrivning av mimetyp"
+
+#~ msgid "Output default action for mimetype"
+#~ msgstr "Utdata är standardkommando för filtyp"
+
+#~ msgid "Launch default action for each file"
+#~ msgstr "Utför standardkommando för varje fil"
+
+#~ msgid "Mount filesystems in fstab"
+#~ msgstr "Montera filsystemen i fstab"
+
+#~ msgid "Invoke CPP"
+#~ msgstr "Kör C-förprocessorn"
+
+#~ msgid "Show threads"
+#~ msgstr "Visa trådar"
+
+#~ msgid "Ignore first line of input"
+#~ msgstr "Ignorera första raden indata"
+
+#~ msgid "Unlink directory (Only by superuser)"
+#~ msgstr "Avlänka katalog (Kan bara utföras av administratör)"
+
+#~ msgid "Never prompt before removal"
+#~ msgstr "Fråga inte före borttagning"
+
+#~ msgid "Prompt before removal"
+#~ msgstr "Fråga före borttagning"
+
+#~ msgid "Recursively remove subdirectories"
+#~ msgstr "Ta bort underkataloger rekursivt"
+
+#~ msgid "Explain what is done"
+#~ msgstr "Förklara vad som utförs"
+
+#~ msgid "Encyption program"
+#~ msgstr "Krypteringsprogram"
+
+#~ msgid "Disable all GNU extensions"
+#~ msgstr "Inaktivera alla GNU-förlängningar"
+
+#~ msgid "Use extended regexp"
+#~ msgstr "Använd utökade reguljära uttryck"
+
+#~ msgid "Consider files as separate"
+#~ msgstr "Betrakta filer separat"
+
+#~ msgid "Use minimal IO buffers"
+#~ msgstr "Minimera användning av IO-buffrar"
+
+#~ msgid ""
+#~ "Delay opening files until a command containing the related 'w' function "
+#~ "is applied"
+#~ msgstr ""
+#~ "Fördröj filöppnande till ett kommando inehållande den relaterade 'w' "
+#~ "functionen appliceras"
+
+#~ msgid "Set which jobs are out under job control"
+#~ msgstr "Välj vilka jobb som ställs under jobbkontroll"
+
+#~ msgid "Validate"
+#~ msgstr "Verifiera"
+
+#~ msgid "Place files or directories under version control"
+#~ msgstr "Placera filer och kataloger under versionskontroll"
+
+#~ msgid "Recursively clean up the working copy"
+#~ msgstr "Rensa arbetskopian rekursivt"
+
+#~ msgid "Pass contents of file as additional args"
+#~ msgstr "Skicka filinnehåll som extra argument"
+
+#~ msgid "Print as little as possible"
+#~ msgstr "Skriv ut så lite som möjligt"
+
+#~ msgid "Enable automatic properties"
+#~ msgstr "Aktivera automatiska egenskaper"
+
+#~ msgid "Print extra info"
+#~ msgstr "Visa utförlig information"
+
+#~ msgid "Don't unlock targets"
+#~ msgstr "Lås inte upp mål"
+
+#~ msgid "Descend recursively"
+#~ msgstr "Rekurivt läge"
+
+#~ msgid "Give output suitable for concatenation"
+#~ msgstr "Formatera utdata lämpligt för sammanslagning"
+
+#~ msgid "Disregard ignores"
+#~ msgstr "Strunta i ignores"
+
+#~ msgid "Print client version info"
+#~ msgstr "Visa klientversion"
+
+#, fuzzy
+#~ msgid "force operation to run"
+#~ msgstr "Tvinga operationen att utföras"
+
+#, fuzzy
+#~ msgid "print as little as possible"
+#~ msgstr "Skriv ut så lite som möjligt"
+
+#~ msgid "Logical and"
+#~ msgstr "Logisk 'och'"
+
+#~ msgid "Logical or"
+#~ msgstr "Logisk 'eller'"
+
+#~ msgid "Left file equal to right file"
+#~ msgstr "Vänster fil identisk med höger fil"
+
+#~ msgid "Left file newer than right file"
+#~ msgstr "Vänster fil nyare än höger fil"
+
+#~ msgid "Left file older than right file"
+#~ msgstr "Vänster fil är äldre än höger fil"
+
+#~ msgid "File is symlink"
+#~ msgstr "Fil är symbolisk länk"
+
+#~ msgid "File owned by effective group ID"
+#~ msgstr "Fil ägs av effektiv grupp-id"
+
+#~ msgid "File has sticky bit set"
+#~ msgstr "Fils fastbit är satt"
+
+#~ msgid "File owned by effective user ID"
+#~ msgstr "Fil ägd av effektiv användar-id"
+
+#~ msgid "File is named pipe"
+#~ msgstr "Fil är namngivet rör"
+
+#~ msgid "File is socket"
+#~ msgstr "Fil är uttag (socket)"
+
+#~ msgid "FD is terminal"
+#~ msgstr "Filidentifierare är terminal"
+
+#~ msgid "Maximium iterations"
+#~ msgstr "Maximalt antal step"
+
+#~ msgid "Change access time"
+#~ msgstr "Visa åtkomsttid"
+
+#~ msgid "Change modification time"
+#~ msgstr "Ändra ändringstid"
+
+#~ msgid "Use this files times"
+#~ msgstr "Använd denna fils tider"
+
+#~ msgid "Supress function and builtin lookup"
+#~ msgstr "Undertryck kontroll av funktioner och inbyggda kommandon"
+
+#~ msgid "Print number of occurences"
+#~ msgstr "Visa antal händelser"
+
+#~ msgid "Only print duplicates"
+#~ msgstr "Visa bara dubletter"
+
+#~ msgid "Remove non-duplicate lines"
+#~ msgstr "Ta bort rader som saknar dubletter"
+
+#~ msgid "Avoid comparing first N fields"
+#~ msgstr "Jämför inte första N fält"
+
+#~ msgid "Avoid comparing first N characters"
+#~ msgstr "Jämför inte de första N tecken"
+
+#~ msgid "Only print unique lines"
+#~ msgstr "Visa bara unika rader"
+
+#~ msgid "Compare only specified number of characters"
+#~ msgstr "Jämför bara angivet antal tecken"
+
+#~ msgid "Test if a key is contained in a set of values"
+#~ msgstr "Testa om en nyckel finns med i en uppsättning av värden"
+
+#~ msgid "%s: Unknown option '%s'\\n"
+#~ msgstr "%s: Okänd flagga '%s'\\n"
+
+#~ msgid "%s: Unknown argument '%s'\\n"
+#~ msgstr "%s: Okänt argument '%s'\\n"
+
+#~ msgid ""
+#~ "Current function definitions are:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Nuvarande funktionsdefinitioner är:\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Sent null command to subshell. This is a fish bug. If it can be "
+#~ "reproduced, please send a bug report to %s."
+#~ msgstr ""
+#~ "Skickade noll-kommando till subskal. Detta är en fish-bug. Om den kan "
+#~ "reproduceras, skicka en rapport till %s."
+
+#~ msgid "Parenthesis mismatch"
+#~ msgstr "Paranteser matchar inte varandra"
+
+#~ msgid "Invalid input"
+#~ msgstr "Ogiltig indata"
+
+#~ msgid ""
+#~ "Tests if emerge command should have package as potential completion for "
+#~ "removal"
+#~ msgstr ""
+#~ "Testa om emergekommando borde ha paket som potentiell komplettering för "
+#~ "borttagning"
+
+#~ msgid "Cleans the system by removing outdated packages"
+#~ msgstr "Rensa systemet genom att ta bort inaktuella paket"
+
+#~ msgid ""
+#~ "Cleans the system by removing packages that are not associated with "
+#~ "explicitly merged packages"
+#~ msgstr ""
+#~ "Rensa systemet genom att ta bort paket som int är associerade med "
+#~ "explicit installerade paket"
+
+#~ msgid ""
+#~ "Displays important portage variables that will be exported to ebuild.sh "
+#~ "when performing merges"
+#~ msgstr ""
+#~ "Visa viktiga portage-variabler som kommer esporteras till ebuild.sh vid "
+#~ "installationer"
+
+#~ msgid ""
+#~ "Causes portage to process all the metacache files as is normally done on "
+#~ "the tail end of an rsync update using emerge --sync"
+#~ msgstr ""
+#~ "Får portage att behandla alla metacache-filer som vanligtvis görs vid "
+#~ "slutet av en rsync-uppdatering vid användande av emerge --sync"
+
+#~ msgid ""
+#~ "Removes all but the most recently installed version of a package from "
+#~ "your system"
+#~ msgstr ""
+#~ "Tar bort alla utom den senast installerade versionen av ett paket från "
+#~ "ditt system"
+
+#~ msgid ""
+#~ "Causes portage to check and update the dependency cache of all ebuilds in "
+#~ "the portage tree"
+#~ msgstr ""
+#~ "Får portage att kontrollera och uppdatera beroendecachen av alla abuilds "
+#~ "i partageträdet"
+
+#~ msgid ""
+#~ "Searches for matches of the supplied string in the current local portage "
+#~ "tree"
+#~ msgstr ""
+#~ "Söker efter matchar till den angivna strängen i det nuvarande lokala "
+#~ "portageträdet"
+
+#~ msgid "Removes all matching packages completely from your system"
+#~ msgstr "Ta bort alla matchande paket helt från ditt system"
+
+#~ msgid ""
+#~ "Before performing the merge, display what ebuilds and tbz2s will be "
+#~ "installed, in the same format as when using --pretend"
+#~ msgstr ""
+#~ "Före installationen utförs, visa vilka ebuilds och tbz2:or som kommer "
+#~ "installeras, i samma format som vid --pretend"
+
+#~ msgid ""
+#~ "Tell emerge to build binary packages for all ebuilds processed in "
+#~ "addition to actually merging the packages"
+#~ msgstr ""
+#~ "Bygg binära paket för alla ebuilds som behandlats förutom att installera "
+#~ "paketen"
+
+#~ msgid "Creates a binary package, but does not merge it to the system"
+#~ msgstr "Skapa ett binärt paket, men installera dem inte"
+
+#~ msgid ""
+#~ "When pretending, also display the ChangeLog entries for packages that "
+#~ "will be upgraded"
+#~ msgstr ""
+#~ "Vid låtsasinstallation, visa också ChangeLog-filen för paketet som kommer "
+#~ "uppgraderas"
+
+#~ msgid "Tell emerge to run the ebuild command in --debug mode"
+#~ msgstr "Utför ebuild-kmmandot i '--debug'-läge"
+
+#~ msgid ""
+#~ "When used in conjunction with --update, this flag forces emerge to "
+#~ "consider the entire dependency tree of packages, instead of checking only "
+#~ "the immediate dependencies of the packages"
+#~ msgstr ""
+#~ "Vid användning med --update tvingar denna flagga emerge att betrakta hela "
+#~ "beroendeträdet av paket, istället för att bara kontrollera omedelbara "
+#~ "beroenden"
+
+#~ msgid "Virtually tweaks the tree of installed packages to contain nothing"
+#~ msgstr "Ändrar virtuellt trädet av installerade paket till att vara tomt"
+
+#~ msgid ""
+#~ "Instead of doing any package building, just perform fetches for all "
+#~ "packages (main package as well as all dependencies)"
+#~ msgstr ""
+#~ "Istället för att bygga paket, utför bara hämtning för alla paket "
+#~ "(huvudpaket och alla beroenden)"
+
+#~ msgid ""
+#~ "Same as --fetchonly except that all package files, including those not "
+#~ "required to build the package, will be processed"
+#~ msgstr ""
+#~ "Samma som --fetchonly utom att alla paketfiler, inklusive de som inte "
+#~ "krävs för att bygga paketet, processas"
+
+#~ msgid ""
+#~ "Using the server and location defined in PORTAGE_BINHOST, portage will "
+#~ "download the information from each binary file there and it will use that "
+#~ "information to help build the dependency list"
+#~ msgstr ""
+#~ "Portage laddar ner informationen från varje binär fil från servern och "
+#~ "platsen angivna i PORTAGE_BINHOST, och använder den informationen vid "
+#~ "konstruktionen av beroendeträdet"
+
+#~ msgid ""
+#~ "This option is identical to -g, except it will not use ANY information "
+#~ "from the local machine"
+#~ msgstr ""
+#~ "Samma sak som -g, utom at det kommer inte använda NÅGON information från "
+#~ "den lokala maskinen"
+
+#~ msgid ""
+#~ "Tells emerge to include installed packages where USE flags have changed "
+#~ "since installation"
+#~ msgstr ""
+#~ "Instruera emerge att inkludera installerade paket där USE-flaggor har "
+#~ "ändrats sedan senaste installation"
+
+#~ msgid ""
+#~ "Merge files in CONFIG_PROTECT to the live fs instead of silently dropping "
+#~ "them"
+#~ msgstr ""
+#~ "Installera filer i CONFIG_PROTECT till filsystemet istället för att tyst "
+#~ "ignorera dem"
+
+#~ msgid "Merge specified packages, but don't merge any dependencies"
+#~ msgstr "Installera angivna paket, men installera inga beroenden"
+
+#~ msgid ""
+#~ "Skip the packages specified on the command-line that have already been "
+#~ "installed"
+#~ msgstr "Skippa angivna paket som redan har installerats"
+
+#~ msgid "Disables the spinner regardless of terminal type"
+#~ msgstr "Avaktivera statusuppdateraren, oavsett terminaltyp"
+
+#~ msgid "Emerge as normal, but don't add packages to the world profile"
+#~ msgstr ""
+#~ "Kör emerge som vanligt, men lägg inte till paket till världsprofilen"
+
+#~ msgid ""
+#~ "Only merge (or pretend to merge) the dependencies of the specified "
+#~ "packages, not the packages themselves"
+#~ msgstr ""
+#~ "Installera (eller låtsas installera) bara beroendena till de angivna "
+#~ "paketen, inte själva paketen"
+
+#~ msgid ""
+#~ "Do not merge, display what ebuilds and tbz2s would have been installed"
+#~ msgstr ""
+#~ "Installera inte, visa vilka ebuilds och tbz2:or som skulle ha installerats"
+
+#~ msgid "Reduced output from portage's displays"
+#~ msgstr "Reducerad utdata från portage"
+
+#~ msgid ""
+#~ "Matches the search string against the description field as well the "
+#~ "package's name"
+#~ msgstr "Matchar söksträngen mot beskrivningsfältet samt paketets namn"
+
+#~ msgid ""
+#~ "Remove the first package in the resume list so that a merge may continue "
+#~ "in the presence of an uncorrectable or inconsequential error"
+#~ msgstr ""
+#~ "Ta bort det första paketet i resume-listan så att en installation kan "
+#~ "fortsätta vid irreparabelt eller oviktigt fel"
+
+#~ msgid "Shows the dependency tree using indentation for dependencies"
+#~ msgstr "Visa beroendeträdet med indentering för beroenden"
+
+#~ msgid ""
+#~ "Like --usepkg, except this only allows the use of binary packages, and it "
+#~ "will abort the emerge if the package is not available at the time of "
+#~ "dependency calculation"
+#~ msgstr ""
+#~ "Som --usepkg, men tillåter bara binära paket, och avbryter installationen "
+#~ "om paketet inte finns tillgängligt vid beroendeberäkningarna"
+
+#~ msgid "Increased or expanded display of content in portage's displays"
+#~ msgstr "Utökat utdata från portage"
+
+#~ msgid ""
+#~ "Displays the currently installed version of portage along with other "
+#~ "information useful for quick reference on a system"
+#~ msgstr ""
+#~ "Visar den för tillfället installerade versionen av portage och annan "
+#~ "information som är användbar som en snabbreferens för systemet"
+
+#~ msgid "A short summary of all builtin commands"
+#~ msgstr "En kort sammanfattning om alla inbyggda kommandon"
+
+#~ msgid "Increment priority by specified number first"
+#~ msgstr "Öka prioritet med angivet nummer först"
+
+#~ msgid "Pipe or short circuit command requires additional command"
+#~ msgstr "Pipa eller kortslutningkommando kräver ett efterföljande kommandon"
+
+#, fuzzy
+#~ msgid "%ls: Argument must be a number: %ls\n"
+#~ msgstr "%ls: Argumentet '%ls' måste vara ett heltal\n"
+
+#~ msgid "Could not set exit function"
+#~ msgstr "Kunde inte sätta avslutningsfunktionen"
+
+#~ msgid "No history item at index %d\n"
+#~ msgstr "Ingen historieinformation vid index %d\n"
+
+#~ msgid "%ls: Expected at least two arguments\n"
+#~ msgstr "%ls: Förväntade minst två argument\n"

From 126e37ab2607827d73fc66296c0568c61d524378 Mon Sep 17 00:00:00 2001
From: Jason <jason@kayoway.com>
Date: Mon, 16 Dec 2019 23:00:04 +0900
Subject: [PATCH 1443/1732] Remove all fuzzy translations (see also #6418)

---
 po/sv.po | 2471 ++++--------------------------------------------------
 1 file changed, 155 insertions(+), 2316 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index bce997ebf..a86545b46 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,4 +1,3 @@
-# fish - the friendly interactive shell
 # Copyright © 2006
 # This file is distributed under the same license as the fish package.
 # Axel Liljencrantz <liljencrantz@gmail.com>, 2006
@@ -135,12 +134,9 @@ msgstr ""
 "%ls: Okänt fel inträffade vid försök att binda till tangent med namn '%ls'\n"
 
 #: src/builtin_bind.cpp:239 builtin.cpp:794
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No binding found for key '%ls'\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Beskrivning saknas för typ '%ls'\n"
 
 #: builtin.cpp:798
 #, c-format
@@ -247,12 +243,8 @@ msgid "%ls: Command not valid at an interactive prompt\n"
 msgstr ""
 
 #: src/builtin.cpp:410 src/builtin.cpp:460 builtin.cpp:4069 builtin.cpp:4113
-#, fuzzy
 msgid "Test a condition"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa ett villkor"
 
 #: builtin.cpp:4071
 msgid "Execute command if previous command suceeded"
@@ -328,12 +320,8 @@ msgid "Remove job from job list"
 msgstr ""
 
 #: src/builtin.cpp:431 builtin.cpp:4087
-#, fuzzy
 msgid "Print arguments"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa antal ord"
 
 #: builtin.cpp:4088
 msgid "Evaluate block if condition is false"
@@ -400,20 +388,12 @@ msgid "Execute command if previous command failed"
 msgstr "Kör ett kommando om föregående kommando misslyckades"
 
 #: src/builtin.cpp:448 builtin.cpp:4103
-#, fuzzy
 msgid "Prints formatted text"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriver ut formatterad text"
 
 #: src/builtin.cpp:449 builtin.cpp:4104
-#, fuzzy
 msgid "Print the working directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa nuvarande katalog"
 
 #: builtin.cpp:4105
 msgid "Generate random number"
@@ -436,12 +416,8 @@ msgid "Handle environment variables"
 msgstr "Redigera miljövariabler"
 
 #: src/builtin.cpp:455 builtin.cpp:4109
-#, fuzzy
 msgid "Set the terminal color"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sätt terminalens färg"
 
 #: builtin.cpp:4110
 msgid "Evaluate contents of file"
@@ -568,15 +544,11 @@ msgid "%ls: Expected exactly one function name for --details\n"
 msgstr ""
 
 #: src/builtin_functions.cpp:342 builtin.cpp:1638
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%ls: Expected exactly two names (current function name, and new function "
 "name)\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Förväntade exakt två namn (nuvarande funktionsnamn, och nytt "
-"funktionsnamn)\n"
 
 #: builtin.cpp:1661 builtin.cpp:2230
 #, c-format
@@ -584,12 +556,9 @@ msgid "%ls: Illegal function name '%ls'\n"
 msgstr "%ls: Ogiltigt funktionsnamn '%ls'\n"
 
 #: src/builtin_functions.cpp:368 builtin.cpp:1672
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Funktionen '%ls' existerar inte. Kan inte skapa kopia '%ls'\n"
 
 #: src/builtin_history.cpp:71 src/builtin_status.cpp:117
 #, c-format
@@ -639,12 +608,8 @@ msgid "Group\n"
 msgstr "Grupp\n"
 
 #: src/builtin_jobs.cpp:84 builtin_jobs.cpp:126
-#, fuzzy
 msgid "Process\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Process\n"
 
 #: builtin_jobs.cpp:143
 msgid "Command\n"
@@ -680,12 +645,9 @@ msgid "Number out of range"
 msgstr ""
 
 #: src/builtin_printf.cpp:249 builtin_printf.cpp:256
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: expected a numeric value"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: förväntade ett numeriskt värde"
 
 #: builtin_printf.cpp:258
 #, c-format
@@ -711,20 +673,14 @@ msgid "invalid field width: %ls"
 msgstr "oglitig fältvidd: %ls"
 
 #: src/builtin_printf.cpp:674 builtin_printf.cpp:708
-#, fuzzy, c-format
+#, c-format
 msgid "invalid precision: %ls"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"ogiltig precision %ls"
 
 #: src/builtin_printf.cpp:699 builtin_printf.cpp:739
-#, fuzzy, c-format
+#, c-format
 msgid "%.*ls: invalid conversion specification"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%.*ls: Ogiltig kombination av flaggor"
 
 #: src/builtin_read.cpp:123
 #, c-format
@@ -733,12 +689,9 @@ msgid ""
 msgstr ""
 
 #: src/builtin_read.cpp:132 builtin.cpp:2593
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Argument '%ls' is out of range\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Argumentet '%ls' är utanför spannet\n"
 
 #: src/builtin_read.cpp:344
 #, c-format
@@ -757,20 +710,14 @@ msgstr "%ls: Inte i en funktion\n"
 
 #: src/builtin_set_color.cpp:159 src/builtin_set_color.cpp:178
 #: builtin_set_color.cpp:144 builtin_set_color.cpp:166
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Unknown color '%ls'\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%s: Okänd färg '%s'\n"
 
 #: src/builtin_set_color.cpp:167 builtin_set_color.cpp:153
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Expected an argument\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%s: Förväntade ett argument\n"
 
 #: src/builtin_set.cpp:62
 #, c-format
@@ -788,12 +735,9 @@ msgid "%ls: You provided %d indexes but %d values\n"
 msgstr ""
 
 #: src/builtin_set.cpp:66 builtin_set.cpp:647
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Erase needs a variable name\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Radering kräver ett variabelnamn\n"
 
 #: src/builtin_set.cpp:67
 #, c-format
@@ -813,20 +757,14 @@ msgid "%ls: Tried to change the read-only variable '%ls'\n"
 msgstr "%ls: Försökte ändra den skrivskyddade variablen '%ls'\n"
 
 #: src/builtin_set.cpp:310 builtin_set.cpp:162
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' with the wrong scope\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Försökte ändra den speciella variablen '%ls' med fel definitionsområde\n"
 
 #: src/builtin_set.cpp:317 builtin_set.cpp:169
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Tried to set the special variable '%ls' to an invalid value\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Försökte ändra den speciella variablen '%ls' till ett ogiltigt värde\n"
 
 #: builtin_set.cpp:248
 #, c-format
@@ -1014,12 +952,9 @@ msgid "empty"
 msgstr "tom"
 
 #: src/complete.cpp:53 complete.cpp:61
-#, fuzzy, c-format
+#, c-format
 msgid "Home for %ls"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hemkatalog för %s"
 
 #: complete.cpp:66
 #, c-format
@@ -1153,12 +1088,9 @@ msgid "handler for generic event '%ls'"
 msgstr "hanterare för generisk händelse '%ls'"
 
 #: src/event.cpp:157 event.cpp:217
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown event type '0x%x'"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Okänd händelsetyp '0x%x'"
 
 #: event.cpp:613
 msgid "Signal list overflow. Signals have been ignored."
@@ -1170,20 +1102,13 @@ msgid "An error occurred while redirecting file descriptor %d"
 msgstr "Ett fel inträffade vid IO dirigering av filidentifierare %d"
 
 #: src/exec.cpp:48 exec.cpp:62
-#, fuzzy
 msgid "An error occurred while writing output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ett fel inträffade under skrivandet av utdata"
 
 #: src/exec.cpp:51 exec.cpp:67
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred while redirecting file '%s'"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ett fel inträffade vid IO dirigering av filen '%ls'"
 
 #: exec.cpp:795
 #, c-format
@@ -1311,23 +1236,15 @@ msgid "An error occured while reading output from code block on fd %d"
 msgstr ""
 
 #: src/output.cpp:559 output.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Tried to use terminfo string %s on line %ld of %s, which is undefined in "
 "terminal of type \"%ls\". Please report this error to %s"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Försökte använda terminfosträng %s på rad %d av %s, vilken är odefinerad i "
-"terminaler av typen '%ls'. Vänligen rapportera detta fel till %s"
 
 #: src/pager.cpp:40 pager.cpp:24
-#, fuzzy
 msgid "search: "
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"sök: "
 
 #: pager.cpp:566
 #, c-format
@@ -1335,28 +1252,18 @@ msgid "%lsand %lu more rows"
 msgstr "%lsoch %lu rader till"
 
 #: src/pager.cpp:500 pager.cpp:571
-#, fuzzy, c-format
+#, c-format
 msgid "rows %lu to %lu of %lu"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"rader %d till %d av %d"
 
 #: src/pager.cpp:503 pager.cpp:576
-#, fuzzy
 msgid "(no matches)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"(inga matchningar)"
 
 #: src/parse_execution.cpp:556 parse_execution.cpp:555
-#, fuzzy, c-format
+#, c-format
 msgid "switch: Expected exactly one argument, got %lu\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"switch: Förväntade exakt ett argument, fick %lu\n"
 
 #: src/parse_execution.cpp:791
 #, c-format
@@ -1366,28 +1273,19 @@ msgid ""
 msgstr ""
 
 #: src/parse_execution.cpp:796 parse_execution.cpp:848
-#, fuzzy, c-format
+#, c-format
 msgid "The file '%ls' is not executable by this user"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Filen '%ls' existerar redan"
 
 #: src/parse_execution.cpp:1007 parse_execution.cpp:1057
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid redirection target: %ls"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ogiltig IO omdirigering"
 
 #: src/parse_execution.cpp:1021 parse_execution.cpp:1081
-#, fuzzy, c-format
+#, c-format
 msgid "Requested redirection to '%ls', which is not a valid file descriptor"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"IO dirigering till någonting som inte är en filidentifierare"
 
 #: parser.cpp:57
 #, c-format
@@ -1461,48 +1359,31 @@ msgid "in event handler: %ls\n"
 msgstr "i händelsehanterare: %ls\n"
 
 #: src/parser.cpp:385 parser.cpp:590
-#, fuzzy, c-format
+#, c-format
 msgid "from sourcing file %ls\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ett fel uppstod medan filen '%ls' lästes\n"
 
 #: src/parser.cpp:392 parser.cpp:597
-#, fuzzy, c-format
+#, c-format
 msgid "in function '%ls'\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"i funktion '%ls',\n"
 
 #: parser.cpp:602
 msgid "in command substitution\n"
 msgstr "i kommandosubstitution\n"
 
 #: src/parser.cpp:407 parser.cpp:615
-#, fuzzy, c-format
+#, c-format
 msgid "\tcalled on line %d of file %ls\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"\tanropad på rad %d i fil '%ls',\n"
 
 #: src/parser.cpp:410 parser.cpp:621
-#, fuzzy
 msgid "\tcalled during startup\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"\tanropad från standard in,\n"
 
 #: src/parser.cpp:412 parser.cpp:625
-#, fuzzy
 msgid "\tcalled on standard input\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"\tanropad från standard in,\n"
 
 #: parser.cpp:642
 #, c-format
@@ -1523,12 +1404,9 @@ msgid "Job inconsistency"
 msgstr "Jobb i ogiltigt tillstånd"
 
 #: src/parser.cpp:797 parser.cpp:1047
-#, fuzzy, c-format
+#, c-format
 msgid "%ls (line %lu): "
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls (rad %d): "
 
 #: src/parser.cpp:800 parser.cpp:1051
 #, c-format
@@ -1536,28 +1414,18 @@ msgid "%ls: "
 msgstr ""
 
 #: src/parse_util.cpp:28 parse_util.cpp:46
-#, fuzzy, c-format
+#, c-format
 msgid "The '%ls' command can not be used in a pipeline"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Detta kommando kan ej användas i ett rör"
 
 #: src/parse_util.cpp:32 parse_util.cpp:49
-#, fuzzy, c-format
+#, c-format
 msgid "The '%ls' command can not be used immediately after a backgrounded job"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Detta kommando kan ej användas i ett rör"
 
 #: src/parse_util.cpp:36 parse_util.cpp:52
-#, fuzzy
 msgid "Backgrounded commands can not be used as conditionals"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Detta kommando kan ej användas i ett rör"
 
 #: path.cpp:24
 #, c-format
@@ -1603,20 +1471,14 @@ msgid "Job %d, "
 msgstr ""
 
 #: src/proc.cpp:587 proc.cpp:786
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: %ls'%ls' terminated by signal %ls (%ls)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Jobb %d, '%ls' avslutat av signal %ls (%ls)"
 
 #: src/proc.cpp:595 proc.cpp:797
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Process %d, '%ls' %ls'%ls' terminated by signal %ls (%ls)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%ls: Process %d, '%ls', från jobb %d, '%ls' avslutat av signal %ls (%ls)"
 
 #: proc.cpp:1065
 msgid "An error occured while reading output from code block"
@@ -1686,13 +1548,10 @@ msgid "There are still jobs active:\n"
 msgstr ""
 
 #: src/reader.cpp:2161
-#, fuzzy
 msgid ""
 "\n"
 "   PID  Command\n"
 msgstr ""
-"\n"
-"   PID  Command\n"
 
 #: src/reader.cpp:2170
 msgid "A second attempt to exit will terminate them.\n"
@@ -1721,12 +1580,8 @@ msgid "Error while opening input stream"
 msgstr "Ett fel inträffade medan indataström öppnades"
 
 #: src/sanity.cpp:18 sanity.cpp:37
-#, fuzzy
 msgid "Errors detected, shutting down. Break on sanity_lose() to debug."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fel har upptäckts, avslutar programmet"
 
 #: sanity.cpp:65
 #, c-format
@@ -1895,12 +1750,8 @@ msgid "Unexpected end of string, parenthesis do not match"
 msgstr "Oväntat slut på textsträng, paranteserna är inte balanserade"
 
 #: src/tokenizer.cpp:32 tokenizer.cpp:42
-#, fuzzy
 msgid "Unexpected end of string, square brackets do not match"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Oväntat slut på textsträng, paranteserna är inte balanserade"
 
 #: src/tokenizer.cpp:35
 msgid "Unexpected end of string, incomplete escape sequence"
@@ -1911,12 +1762,8 @@ msgid "Invalid input/output redirection"
 msgstr "Ogiltig IO dirigering"
 
 #: src/tokenizer.cpp:41 tokenizer.cpp:53
-#, fuzzy
 msgid "Cannot use stdin (fd 0) as pipe output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kan inte skicka rördata till filidentifierare 0"
 
 #: wgetopt.cpp:638
 #, c-format
@@ -2127,28 +1974,19 @@ msgid "Unknown builtin '%ls'"
 msgstr "Okänt inbyggt kommando '%ls'"
 
 #: src/parse_constants.h:239 parse_constants.h:204
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to expand variable name '%ls'"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ogiltigt variabelnamn '%ls'"
 
 #: src/parse_constants.h:242 parse_constants.h:207
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to find a process '%ls'"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Misslyckades med att exekvera processen '%ls'"
 
 #: src/parse_constants.h:245 parse_constants.h:210
-#, fuzzy, c-format
+#, c-format
 msgid "Illegal file descriptor in redirection '%ls'"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ogiltig filidentifierare '%ls'"
 
 #: parse_constants.h:213
 #, c-format
@@ -2241,29 +2079,17 @@ msgid "Packages that contain kernel modules"
 msgstr ""
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:15
-#, fuzzy
 msgid "Pull in build time dependencies"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa byggberoenden"
 
 #: /tmp/fish/explicit/share/completions/emerge.fish:16
-#, fuzzy
 msgid "Don't pull in build time dependencies"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga efter extra beroenden"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:1
 #: share/completions/equery.fish:38
-#, fuzzy
 msgid "list all packages owning file(s)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla paket som äger filer"
 
 #: share/completions/equery.fish:39
 msgid "check MD5sums and timestamps of package"
@@ -2271,75 +2097,43 @@ msgstr "Kontrollera MD5-summor och tidsstämplar på paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:3
 #: share/completions/equery.fish:40
-#, fuzzy
 msgid "list all packages depending on specified package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paket som beror på"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:4
 #: share/completions/equery.fish:41
-#, fuzzy
 msgid "display a dependency tree for package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa beroenden för paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:5
 #: share/completions/equery.fish:42
-#, fuzzy
 msgid "list files owned by package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filer i paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:6
 #: share/completions/equery.fish:43
-#, fuzzy
 msgid "list all packages with specified useflag"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga ett (oinstallerat) paket i angiven fil"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:7
 #: share/completions/equery.fish:44
-#, fuzzy
 msgid "list all packages matching pattern"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista innehåll av paket som matchar mönster"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:8
 #: share/completions/equery.fish:45
-#, fuzzy
 msgid "print size of files contained in package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paketets triggerskript"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:9
 #: share/completions/equery.fish:46
-#, fuzzy
 msgid "display USE flags for package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: /tmp/fish/explicit/share/completions/equery.fish:10
 #: share/completions/equery.fish:47
-#, fuzzy
 msgid "print full path to ebuild for package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa full sökväg till källkod"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:1
 #: share/completions/gem.fish:12
@@ -2353,66 +2147,38 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:3
 #: share/completions/gem.fish:14
-#, fuzzy
 msgid "Check installed gems"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga installerat paket"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:4
 #: share/completions/gem.fish:15
-#, fuzzy
 msgid "Cleanup old versions of installed gems in the local repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:5
 #: share/completions/gem.fish:16
-#, fuzzy
 msgid "Display the contents of the installed gems"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa låtsasinstallationsutdata i tabellform"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:6
 #: share/completions/gem.fish:17
-#, fuzzy
 msgid "Show the dependencies of an installed gem"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Verifiera inte beroenden före paketen avinstalleras"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:7
 #: share/completions/gem.fish:18
-#, fuzzy
 msgid "Display RubyGems environmental information"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppdateringsinformation"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:8
 #: share/completions/gem.fish:19
-#, fuzzy
 msgid "Provide help on the 'gem' command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hjälp för det angivna kommandot"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:9
 #: share/completions/gem.fish:20
-#, fuzzy
 msgid "Install a gem into the local repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Checka in filer till förråd"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:10
 #: share/completions/gem.fish:21
@@ -2421,12 +2187,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:11
 #: share/completions/gem.fish:22
-#, fuzzy
 msgid "Query gem information in local or remote repositories"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa information om lokal eller fjärrelement"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:12
 #: share/completions/gem.fish:23
@@ -2440,30 +2202,18 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:14
 #: share/completions/gem.fish:25
-#, fuzzy
 msgid "Display gem specification (in yaml)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa senaste ändringsdatum för fil"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:15
 #: share/completions/gem.fish:26
-#, fuzzy
 msgid "Uninstall a gem from the local repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort ett inlägg från förråd"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:16
 #: share/completions/gem.fish:27
-#, fuzzy
 msgid "Unpack an installed gem to the current directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:17
 #: share/completions/gem.fish:28
@@ -2472,12 +2222,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/completions/gem.fish:18
 #: share/completions/gem.fish:87
-#, fuzzy
 msgid "display the remote gem servers"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fil att hämta servrar från"
 
 #: /tmp/fish/explicit/share/completions/gem.fish:19
 #: share/completions/gem.fish:92
@@ -3507,9 +3253,8 @@ msgid "%s %s: Abbreviation %s cannot have spaces in the word\\n"
 msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:4
-#, fuzzy
 msgid "%s %s: Expected one argument\\n"
-msgstr "%s %s: Expected one argument\\n"
+msgstr ""
 
 #: /tmp/fish/explicit/share/functions/abbr.fish:6
 #: /tmp/fish/explicit/share/functions/abbr.fish:10
@@ -3531,12 +3276,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/alias.fish:1
 #: share/functions/alias.fish:42
-#, fuzzy
 msgid "%s: Name cannot be empty\\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%s: Den tomma strängen är inte ett tillåtet variabelnamn\\n"
 
 #: /tmp/fish/explicit/share/functions/alias.fish:2
 #: share/functions/alias.fish:45
@@ -3755,12 +3496,8 @@ msgstr ""
 
 #: /tmp/fish/explicit/share/functions/funced.fish:5
 #: share/functions/funced.fish:110
-#, fuzzy
 msgid "Cancelled function editing"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"funktionsdefinition-block"
 
 #: share/functions/funcsave.fish:26
 msgid "%s: Could not create configuration directory\\n"
@@ -3775,20 +3512,12 @@ msgid "%s: Could not find a web browser.\\n"
 msgstr "%s: Kunde inte hitta en webbrowser\\n"
 
 #: /tmp/fish/explicit/share/functions/help.fish:3 share/functions/help.fish:129
-#, fuzzy
 msgid "help: Help is being displayed in your default browser.\\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"help: Hjälp visas i ditt standardsurfprogram"
 
 #: /tmp/fish/explicit/share/functions/help.fish:4 share/functions/help.fish:132
-#, fuzzy
 msgid "help: Help is being displayed in %s.\\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"help: Hjälp visas i %s\\n"
 
 #: /tmp/fish/explicit/share/functions/history.fish:1
 msgid "%ls: you cannot use any options with the %ls command\\n"
@@ -3861,36 +3590,24 @@ msgid "%s is a function with definition\\n"
 msgstr "%s är en funktion med definitionen\\n"
 
 #: /tmp/fish/explicit/share/functions/type.fish:2 share/functions/type.fish:94
-#, fuzzy
 msgid "function"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"funktion\\n"
 
 #: share/functions/type.fish:107
 msgid "%s is a builtin\\n"
 msgstr "%s är ett inbyggt kommando\\n"
 
 #: /tmp/fish/explicit/share/functions/type.fish:4 share/functions/type.fish:110
-#, fuzzy
 msgid "builtin"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"inbyggt kommando\\n"
 
 #: share/functions/type.fish:130
 msgid "%s is %s\\n"
 msgstr "%s är %s\\n"
 
 #: /tmp/fish/explicit/share/functions/type.fish:6 share/functions/type.fish:133
-#, fuzzy
 msgid "file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"fil\\n"
 
 #: share/functions/type.fish:144
 msgid "%s: Could not find '%s'\\n"
@@ -3920,15 +3637,10 @@ msgstr "%s: Okänd flagga '%s'\\n"
 
 #: /tmp/fish/explicit/share/functions/vared.fish:2
 #: share/functions/vared.fish:40
-#, fuzzy
 msgid ""
 "%s: %s is an array variable. Use %svared%s %s[n]%s to edit the n:th element "
 "of %s\\n"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"%s: %s är en arrayvariabel. Använd %svared%s %s[n] för att redigera det n:te "
-"elementet av %s\\n"
 
 #: share/functions/vared.fish:44
 msgid ""
@@ -4401,12 +4113,8 @@ msgid "Output version information and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/adb.fish:1 share/completions/adb.fish:3
-#, fuzzy
 msgid "Test if adb has yet to be given the subcommand"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/adb.fish:2
 #: share/completions/adb.fish:12
@@ -6345,12 +6053,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:11
 #: share/completions/apt-get.fish:29
-#, fuzzy
 msgid "Remove and purge one or more packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera ett eller flera paket"
 
 #: share/completions/apt-get.fish:30
 msgid "Remove one or more packages"
@@ -6378,12 +6082,8 @@ msgstr "Rengör paket som inte längre skall nedladdas"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:18
 #: share/completions/apt-get.fish:36
-#, fuzzy
 msgid "Remove automatically installed packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-get.fish:19
 msgid "Do not install recommended packages"
@@ -6427,12 +6127,8 @@ msgstr "Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:2
 #: share/completions/aptitude.fish:12
-#, fuzzy
 msgid "Test if aptitude command should have packages as potential completion"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om aptkommando borde ha paket som potentiell komplettering"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:4
 msgid "Display a brief help message. Identical to the help action"
@@ -6440,12 +6136,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:5
 #: share/completions/aptitude.fish:24
-#, fuzzy
 msgid "Remove any cached packages which can no longer be downloaded"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Rengör paket som inte längre skall nedladdas"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:6
 #: share/completions/aptitude.fish:25
@@ -6463,48 +6155,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:9
 #: share/completions/aptitude.fish:28
-#, fuzzy
 msgid "Update the list of available packages from the apt sources"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Updatera källkodpaketlista"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:10
 #: share/completions/aptitude.fish:29
-#, fuzzy
 msgid "Upgrade installed packages to their most recent version"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:11
 #: share/completions/aptitude.fish:30
-#, fuzzy
 msgid "Download and displays the Debian changelog for the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:12
 #: share/completions/aptitude.fish:31
-#, fuzzy
 msgid "Upgrade, removing or installing packages as necessary"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bygg och installera nyaste paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:13
 #: share/completions/aptitude.fish:32
-#, fuzzy
 msgid "Download the packages to the current directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:14
 #: share/completions/aptitude.fish:33
@@ -6518,30 +6190,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:16
 #: share/completions/aptitude.fish:35
-#, fuzzy
 msgid "Install the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:17
 #: share/completions/aptitude.fish:36
-#, fuzzy
 msgid "Cancel any scheduled actions on the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:18
 #: share/completions/aptitude.fish:37
-#, fuzzy
 msgid "Mark packages as automatically installed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:19
 #: share/completions/aptitude.fish:38
@@ -6550,30 +6210,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:20
 #: share/completions/aptitude.fish:39
-#, fuzzy
 msgid "Reinstall the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ominstallera paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:21
 #: share/completions/aptitude.fish:40
-#, fuzzy
 msgid "Remove the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:22
 #: share/completions/aptitude.fish:41
-#, fuzzy
 msgid "Display detailed information about the packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:23
 #: share/completions/aptitude.fish:42
@@ -6582,21 +6230,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:24
 #: share/completions/aptitude.fish:43
-#, fuzzy
 msgid "Mark packages as manually installed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:25
 #: share/completions/aptitude.fish:44
-#, fuzzy
 msgid "Search for packages matching one of the patterns"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/aptitude.fish:26
 #: share/completions/aptitude.fish:45
@@ -6805,21 +6445,13 @@ msgstr "Välj än inställningsprofil"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:5
 #: share/completions/apt-mark.fish:24
-#, fuzzy
 msgid "Mark a package as automatically installed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:6
 #: share/completions/apt-mark.fish:25
-#, fuzzy
 msgid "Mark a package as manually installed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:7
 #: share/completions/apt-mark.fish:26
@@ -6828,48 +6460,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:8
 #: share/completions/apt-mark.fish:27
-#, fuzzy
 msgid "Cancel a hold on a package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa info om paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:9
 #: share/completions/apt-mark.fish:28
-#, fuzzy
 msgid "Show automatically installed packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:10
 #: share/completions/apt-mark.fish:29
-#, fuzzy
 msgid "Show manually installed packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga alla installerade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:11
 #: share/completions/apt-mark.fish:30
-#, fuzzy
 msgid "Show held packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppgraderade paket"
 
 #: /tmp/fish/implicit/share/completions/apt-mark.fish:15
 #: share/completions/apt-mark.fish:34
-#, fuzzy
 msgid "Write package statistics to a file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv prototyper till fil"
 
 #: /tmp/fish/implicit/share/completions/apt-move.fish:1
 msgid "Generate master file"
@@ -9746,21 +9358,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:1
 #: share/completions/bundle.fish:3
-#, fuzzy
 msgid "Test if bundle has been given no subcommand"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:2
 #: share/completions/bundle.fish:11
-#, fuzzy
 msgid "Test if bundle has been given a specific subcommand"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om aptitude har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:3
 msgid "Specify the number of times you wish to attempt network commands"
@@ -9776,12 +9380,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:6
 #: share/completions/bundle.fish:31
-#, fuzzy
 msgid "Display a help page"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa manualsida"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:7
 msgid "Prints version information"
@@ -9796,30 +9396,18 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bundle.fish:9
 #: /tmp/fish/implicit/share/completions/bundle.fish:57
 #: share/completions/bundle.fish:40 share/completions/bundle.fish:106
-#, fuzzy
 msgid "The location of the Gemfile bundler should use"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:10
 #: share/completions/bundle.fish:41
-#, fuzzy
 msgid "The location to install the gems in the bundle to"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:11
 #: share/completions/bundle.fish:42
-#, fuzzy
 msgid "Installs the gems in the bundle to the system location"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:12
 #: share/completions/bundle.fish:43
@@ -9870,21 +9458,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:21
 #: share/completions/bundle.fish:52
-#, fuzzy
 msgid "Do not print progress information to stdout"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa all information"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:22
 #: share/completions/bundle.fish:53
-#, fuzzy
 msgid "Run bundle clean automatically after install"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Upgradera paket om det är installerat"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:23
 #: /tmp/fish/implicit/share/completions/bundle.fish:30
@@ -9895,12 +9475,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bundle.fish:24
 #: /tmp/fish/implicit/share/completions/bundle.fish:89
 #: share/completions/bundle.fish:55 share/completions/bundle.fish:164
-#, fuzzy
 msgid "Do not remove stale gems from the cache"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort alla gz-filer från cache"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:25
 #: share/completions/bundle.fish:56
@@ -9910,12 +9486,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bundle.fish:26
 #: /tmp/fish/implicit/share/completions/bundle.fish:41
 #: share/completions/bundle.fish:59 share/completions/bundle.fish:84
-#, fuzzy
 msgid "Update dependencies to their latest versions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:27
 #: share/completions/bundle.fish:60
@@ -9934,21 +9506,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:31
 #: share/completions/bundle.fish:64
-#, fuzzy
 msgid "Specify the number of jobs to run in parallel"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange antalet bytes av data att sicka"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:32
 #: share/completions/bundle.fish:65
-#, fuzzy
 msgid "Update a specific group"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd angiven tagg"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:33
 #: share/completions/bundle.fish:69
@@ -9959,21 +9523,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:34
 #: share/completions/bundle.fish:72
-#, fuzzy
 msgid "Install the binstubs of the listed gem"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa låtsasinstallationsutdata i tabellform"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:35
 #: share/completions/bundle.fish:73
-#, fuzzy
 msgid "Binstub destination directory (default bin)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera dokumentation (standard)"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:36
 #: share/completions/bundle.fish:74
@@ -9998,21 +9554,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:42
 #: share/completions/bundle.fish:85
-#, fuzzy
 msgid "Package .gem files into the vendor/cache directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ändra arbetskatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:44
 #: share/completions/bundle.fish:87
-#, fuzzy
 msgid "Specify and read configuration options for bundler"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:45
 #: share/completions/bundle.fish:88
@@ -10021,21 +9569,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:46
 #: share/completions/bundle.fish:89
-#, fuzzy
 msgid "Show all of the gems in the current bundle"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:47
 #: share/completions/bundle.fish:90
-#, fuzzy
 msgid "Show the source location of a particular gem in the bundle"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa process-id för varje process i jobbet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:48
 #: /tmp/fish/implicit/share/completions/bundle.fish:64
@@ -10057,12 +9597,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:52
 #: share/completions/bundle.fish:95
-#, fuzzy
 msgid "Generate a simple Gemfile"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:53
 #: /tmp/fish/implicit/share/completions/bundle.fish:78
@@ -10073,12 +9609,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/bundle.fish:54
 #: /tmp/fish/implicit/share/completions/bundle.fish:83
 #: share/completions/bundle.fish:97 share/completions/bundle.fish:154
-#, fuzzy
 msgid "Displays platform compatibility information"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:55
 #: /tmp/fish/implicit/share/completions/bundle.fish:85
@@ -10100,12 +9632,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:59
 #: share/completions/bundle.fish:108
-#, fuzzy
 msgid "Lock the Gemfile"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Logga till spårfil"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:60
 #: /tmp/fish/implicit/share/completions/bundle.fish:62
@@ -10123,12 +9651,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:65
 #: share/completions/bundle.fish:122
-#, fuzzy
 msgid "Check for newer pre-release gems"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kontrollera förekomst av minnesläckor"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:66
 #: share/completions/bundle.fish:123
@@ -10152,12 +9676,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:73
 #: share/completions/bundle.fish:138
-#, fuzzy
 msgid "Show each gem version"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Källkodsträdsversion"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:74
 #: share/completions/bundle.fish:139
@@ -10170,12 +9690,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:76
 #: share/completions/bundle.fish:143
-#, fuzzy
 msgid "Generate a simple Gemfile, placed in the current directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:77
 #: share/completions/bundle.fish:144
@@ -10194,12 +9710,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:81
 #: share/completions/bundle.fish:150
-#, fuzzy
 msgid "Path to your editor"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj källkatalog"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:82
 #: share/completions/bundle.fish:151
@@ -10208,12 +9720,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:84
 #: share/completions/bundle.fish:155
-#, fuzzy
 msgid "Only display Ruby directive information"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:86
 #: share/completions/bundle.fish:159
@@ -10237,21 +9745,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:91
 #: share/completions/bundle.fish:168
-#, fuzzy
 msgid "Prints the license of all gems in the bundle"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/bundle.fish:92
 #: share/completions/bundle.fish:171
-#, fuzzy
 msgid "Print information about the environment Bundler is running under"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hämta ändringar från förrådet till arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/bunzip2.fish:3
 #: /tmp/fish/implicit/share/completions/bzip2.fish:5
@@ -12309,12 +11809,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:19
 #: share/completions/cvs.fish:35
-#, fuzzy
 msgid "Set CVS user variable."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj CVS-användare"
 
 #: share/completions/cvs.fish:41
 msgid "Add a new file/directory to the repository"
@@ -12431,12 +11927,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:61
 #: share/completions/cvs.fish:94
-#, fuzzy
 msgid "Set keyword substitution mode:"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange standardnyckelordssubstitution"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:62
 msgid "[rev]    Lock revision (latest revision on branch,"
@@ -12619,22 +12111,14 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:99
 #: share/completions/cvs.fish:150
-#, fuzzy
 msgid "Read the log message from file."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs loggmeddelande från fil"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:100
 #: /tmp/fish/implicit/share/completions/cvs.fish:180
 #: share/completions/cvs.fish:151
-#, fuzzy
 msgid "Log message."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ersätt ett loggmeddelande"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:101
 #: share/completions/cvs.fish:152
@@ -12644,12 +12128,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/cvs.fish:104
 #: /tmp/fish/implicit/share/completions/cvs.fish:218
 #: share/completions/cvs.fish:161
-#, fuzzy
 msgid "Specify keyword expansion mode."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj kärnversion"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:105
 #: share/completions/cvs.fish:162
@@ -12689,12 +12169,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:113
 #: share/completions/cvs.fish:170
-#, fuzzy
 msgid "--ignore-matching-lines=RE  Ignore changes whose lines all match RE."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ignorera ändringar som matchar REGEX"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:114
 msgid "Binary  Read and write data in binary mode."
@@ -12844,12 +12320,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:153
 #: share/completions/cvs.fish:228
-#, fuzzy
 msgid "Export tagged revisions."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Slå ihop revisioner"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:154
 #: share/completions/cvs.fish:229
@@ -12885,12 +12357,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:161
 #: share/completions/cvs.fish:242
-#, fuzzy
 msgid "Extract by record type"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange posttyp"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:162
 msgid "Everything (same as -x, but all record types)"
@@ -12910,12 +12378,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:166
 #: share/completions/cvs.fish:247
-#, fuzzy
 msgid "Since date (Many formats)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Format för profileringsdata"
 
 #: /tmp/fish/implicit/share/completions/cvs.fish:167
 #: share/completions/cvs.fish:248
@@ -13294,12 +12758,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:3
 #: share/completions/darcs.fish:19
-#, fuzzy
 msgid "Display help about darcs and darcs commands"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa användningsinformation för kommando"
 
 #: share/completions/darcs.fish:20
 msgid "Add one or more new files or directories"
@@ -13307,21 +12767,13 @@ msgstr "Lägg till filer eller kataloger till lagret"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:5
 #: share/completions/darcs.fish:21
-#, fuzzy
 msgid "Remove files from version control"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Placera filer och kataloger under versionskontroll"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:6
 #: share/completions/darcs.fish:22
-#, fuzzy
 msgid "Move or rename files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skapa inte fil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:7
 #: share/completions/darcs.fish:23
@@ -13330,12 +12782,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:8
 #: share/completions/darcs.fish:24
-#, fuzzy
 msgid "Discard unrecorded changes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa olagrade ändringar i arbetskopian"
 
 #: share/completions/darcs.fish:25
 msgid "Undo the last revert (may fail if changes after the revert)"
@@ -13345,21 +12793,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:10
 #: share/completions/darcs.fish:26
-#, fuzzy
 msgid "List unrecorded changes in the working tree"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa olagrade ändringar i arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:11
 #: share/completions/darcs.fish:27
-#, fuzzy
 msgid "Create a patch from unrecorded changes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skapa komprimerade fixar"
 
 #: share/completions/darcs.fish:28
 msgid "Remove recorded patches without changing the working copy"
@@ -13367,21 +12807,13 @@ msgstr "Ta bort lagrade fixar utan att ändra arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:13
 #: share/completions/darcs.fish:29
-#, fuzzy
 msgid "Improve a patch before it leaves your repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ersätt den lagrade fixen med en bättre version"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:14
 #: share/completions/darcs.fish:30
-#, fuzzy
 msgid "Mark unresolved conflicts in working tree, for manual resolution"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Markera konflikter mot arketskopian för manuell lösning"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:15
 #: share/completions/darcs.fish:31
@@ -13390,12 +12822,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:16
 #: share/completions/darcs.fish:32
-#, fuzzy
 msgid "Set a preference (test, predist, boringfile or binariesfile)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj ett värde för en preferens (test, predisk, ...)"
 
 #: share/completions/darcs.fish:33
 msgid "Create a diff between two versions of the repository"
@@ -13403,12 +12831,8 @@ msgstr "Skappa en diff mellan två versioner i lagret"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:18
 #: share/completions/darcs.fish:34
-#, fuzzy
 msgid "List patches in the repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Uppdatera förråd"
 
 #: share/completions/darcs.fish:35
 msgid "Display which patch last modified something"
@@ -13433,12 +12857,8 @@ msgstr "Kopiera och applicera fixar från ett annat förråd till detta"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:24
 #: share/completions/darcs.fish:40
-#, fuzzy
 msgid "Delete selected patches from the repository. (UNSAFE!)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ordna om fixarna i förrådet"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:25
 #: share/completions/darcs.fish:41
@@ -13492,23 +12912,15 @@ msgstr "Välj ändringar som börjar med tagg som matchar REGEXP"
 #: /tmp/fish/implicit/share/completions/darcs.fish:495
 #: /tmp/fish/implicit/share/completions/darcs.fish:520
 #: share/completions/darcs.fish:378
-#, fuzzy
 msgid "Select a single patch matching PATTERN"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj fix som matchar MÖNSTER"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:412
 #: /tmp/fish/implicit/share/completions/darcs.fish:496
 #: /tmp/fish/implicit/share/completions/darcs.fish:521
 #: share/completions/darcs.fish:379
-#, fuzzy
 msgid "Select a single patch matching REGEXP"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj fix som matchar REGEXP"
 
 #: share/completions/darcs.fish:343 share/completions/darcs.fish:557
 #: share/completions/darcs.fish:770
@@ -13518,12 +12930,8 @@ msgstr "Välj angivet antal fixar av de senaste fixarna"
 #: /tmp/fish/implicit/share/completions/darcs.fish:414
 #: /tmp/fish/implicit/share/completions/darcs.fish:446
 #: share/completions/darcs.fish:558
-#, fuzzy
 msgid "Select a range of patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj angivet antal fixar av de senaste fixarna"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:415
 msgid "Specify diff command (ignores --diff-opts)"
@@ -13694,12 +13102,8 @@ msgstr ""
 #: share/completions/darcs.fish:841 share/completions/darcs.fish:893
 #: share/completions/darcs.fish:1183 share/completions/darcs.fish:1208
 #: share/completions/darcs.fish:1239
-#, fuzzy
 msgid "Specify command to run after this darcs command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange kommando att köra efter detta darcs-kommando"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:432
 #: /tmp/fish/implicit/share/completions/darcs.fish:482
@@ -13790,12 +13194,8 @@ msgstr ""
 #: share/completions/darcs.fish:1010 share/completions/darcs.fish:1054
 #: share/completions/darcs.fish:1095 share/completions/darcs.fish:1122
 #: share/completions/darcs.fish:1155
-#, fuzzy
 msgid "Specify command to run before this darcs command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange kommando att köra efter detta darcs-kommando"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:436
 #: /tmp/fish/implicit/share/completions/darcs.fish:486
@@ -13993,12 +13393,8 @@ msgstr "Välj tagg som matchar REGEXP"
 #: /tmp/fish/implicit/share/completions/darcs.fish:498
 #: /tmp/fish/implicit/share/completions/darcs.fish:523
 #: share/completions/darcs.fish:380
-#, fuzzy
 msgid "Select one patch"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj en handling"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:518
 msgid "Name of version"
@@ -14083,12 +13479,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:726
 #: /tmp/fish/implicit/share/completions/darcs.fish:781
 #: share/completions/darcs.fish:886
-#, fuzzy
 msgid "Specify the remote repository URL to work with"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:603
 #: /tmp/fish/implicit/share/completions/darcs.fish:648
@@ -14144,30 +13536,18 @@ msgstr "Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:752
 #: share/completions/darcs.fish:918
-#, fuzzy
 msgid "Mail results to additional EMAIL(s)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Posta resultat till extra adresser. (Kräver --reply)"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:753
 #: share/completions/darcs.fish:919
-#, fuzzy
 msgid "Specify mail subject"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange makefil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:754
 #: share/completions/darcs.fish:920
-#, fuzzy
 msgid "Specify in-reply-to header"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj indexkatalog"
 
 #: share/completions/darcs.fish:921
 msgid "Specify output filename"
@@ -14186,12 +13566,8 @@ msgid "Keep the logfile when done [DEFAULT]"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:798
-#, fuzzy
 msgid "Verify using openSSL with authorized keys from file KEYS"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Verifiera med openSSL med auktoriserade nycklar från angiven fil"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:806
 msgid "Equivalent to --dont-allow-conflicts, for backwards compatibility"
@@ -14236,12 +13612,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/darcs.fish:850
 #: /tmp/fish/implicit/share/completions/darcs.fish:883
 #: share/completions/darcs.fish:1028
-#, fuzzy
 msgid "Version specified by the context in FILENAME"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skicka till sammanhang lagrat i FILNAMN"
 
 #: /tmp/fish/implicit/share/completions/darcs.fish:855
 #: /tmp/fish/implicit/share/completions/darcs.fish:885
@@ -14328,12 +13700,8 @@ msgid "display help and exit"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/dd.fish:3 share/completions/dd.fish:5
-#, fuzzy
 msgid "Complete dd operands"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Jämför FIL1 med alla operander"
 
 #: /tmp/fish/implicit/share/completions/defaults.fish:1
 msgid "Restricts preferences operations to the current logged-in host"
@@ -15337,12 +14705,8 @@ msgid "Skip other file systems"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/du.fish:15 share/completions/du.fish:15
-#, fuzzy
 msgid "Exclude files that match pattern in file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Exkludera filer som matchar mönster från fil"
 
 #: share/completions/du.fish:16
 msgid "Exclude files that match pattern"
@@ -15358,12 +14722,8 @@ msgstr "Rekursionsgräns"
 #: /tmp/fish/implicit/share/completions/netctl-auto.fish:15
 #: /tmp/fish/implicit/share/completions/netctl.fish:17
 #: share/completions/duply.fish:3
-#, fuzzy
 msgid "Profile"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:2
 #: share/completions/duply.fish:4
@@ -15372,12 +14732,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:3
 #: share/completions/duply.fish:7
-#, fuzzy
 msgid "Creates a configuration profile"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:4
 #: share/completions/duply.fish:8
@@ -15386,30 +14742,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:5
 #: share/completions/duply.fish:9
-#, fuzzy
 msgid "Backup without executing pre/post scripts"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kör inte post-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:6
 #: share/completions/duply.fish:10
-#, fuzzy
 msgid "Execute <profile>/pre script"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kör inte pre-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:7
 #: share/completions/duply.fish:11
-#, fuzzy
 msgid "Execute <profile>/post script"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kör inte post-skript"
 
 #: /tmp/fish/implicit/share/completions/duply.fish:8
 #: share/completions/duply.fish:12
@@ -15483,12 +14827,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/duply.fish:22
 #: share/completions/duply.fish:28
-#, fuzzy
 msgid "Output verbosity level"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Återställ felrapporteringsnivå till 0"
 
 #: /tmp/fish/implicit/share/completions/echo.fish:1
 msgid "Do not output a newline"
@@ -16016,14 +15356,10 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:4
 #: share/completions/emerge.fish:32
-#, fuzzy
 msgid ""
 "Print completions for all packages including the version compare if that is "
 "already typed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa kompletteringar för installerade packet på systemet från /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/emerge.fish:5
 msgid "Synchronize the portage tree"
@@ -16286,14 +15622,10 @@ msgstr "Omdefinera variabel"
 
 #: /tmp/fish/implicit/share/completions/equery.fish:3
 #: share/completions/equery.fish:19
-#, fuzzy
 msgid ""
 "Prints completions for all available categories on the system from /usr/"
 "portage"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa kompletteringar för installerade packet på systemet från /var/db/pkg"
 
 #: /tmp/fish/implicit/share/completions/equery.fish:4
 msgid "causes minimal output to be emitted"
@@ -17220,12 +16552,8 @@ msgid "Alternate list of files containing magic numbers"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:1
-#, fuzzy
 msgid "Never follow symlinks"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Följ aldrig symboliska länkar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:3
 msgid ""
@@ -17238,12 +16566,8 @@ msgid "Measure from the beginning of today rather than  from  24  hours ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:5
-#, fuzzy
 msgid "Process subdirectories before the directory itself"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Processa underkataloger rekursivt"
 
 #: /tmp/fish/implicit/share/completions/find.fish:7
 msgid ""
@@ -17253,12 +16577,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/find.fish:8
 #: /tmp/fish/implicit/share/completions/zfs.fish:66
 #: /tmp/fish/implicit/share/completions/zfs.fish:76
-#, fuzzy
 msgid "Maximum recursion depth"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Maximal 'resident set size'"
 
 #: /tmp/fish/implicit/share/completions/find.fish:9
 msgid "Do not apply any tests or actions at levels less than specified level"
@@ -17283,32 +16603,20 @@ msgid "Specify regular expression type"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:15
-#, fuzzy
 msgid "Turn warnings on"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:16
-#, fuzzy
 msgid "Turn warnings off"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/find.fish:17
 msgid "File last accessed specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:18
-#, fuzzy
 msgid "File last accessed more recently than file was modified"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa senaste revision vid vilken vare rad ändrades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:19
 msgid "File last accessed specified number of days ago"
@@ -17331,36 +16639,20 @@ msgid "File is empty and is either a regular file or a directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:25
-#, fuzzy
 msgid "Always false"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Formatera alltid om"
 
 #: /tmp/fish/implicit/share/completions/find.fish:26
-#, fuzzy
 msgid "File is on filesystem of specified type"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filsystem av angiven typ"
 
 #: /tmp/fish/implicit/share/completions/find.fish:27
-#, fuzzy
 msgid "Numeric group id of file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bara numerisk utdata"
 
 #: /tmp/fish/implicit/share/completions/find.fish:28
-#, fuzzy
 msgid "Group name of file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inod för filer"
 
 #: /tmp/fish/implicit/share/completions/find.fish:29
 msgid "File is symlink matching specified case insensitive pattern"
@@ -17371,12 +16663,8 @@ msgid "File name matches case insensitive pattern"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:31
-#, fuzzy
 msgid "File has specified inode number"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Filtrera genom angivet program"
 
 #: /tmp/fish/implicit/share/completions/find.fish:32
 msgid "File path matches case insensitive pattern"
@@ -17387,12 +16675,8 @@ msgid "File name matches case insensetive regex"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:34
-#, fuzzy
 msgid "File has specified number of links"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Jämför bara angivet antal tecken"
 
 #: /tmp/fish/implicit/share/completions/find.fish:35
 msgid "File is symlink matching specified pattern"
@@ -17403,12 +16687,8 @@ msgid "File last modified specified number of minutes ago"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:37
-#, fuzzy
 msgid "File last modified more recently than file was modified"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa senaste revision vid vilken vare rad ändrades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:38
 msgid "File last modified specified number of days ago"
@@ -17427,64 +16707,36 @@ msgid "No group corresponds to file's numeric group ID"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:42
-#, fuzzy
 msgid "File path matches pattern"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Exkludera filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/find.fish:43
-#, fuzzy
 msgid "Files has specified permissions set"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd angiven kompressionsalgoritm"
 
 #: /tmp/fish/implicit/share/completions/find.fish:44
-#, fuzzy
 msgid "File name matches regex"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ignorera ändringar som matchar reguljärt uttryck"
 
 #: /tmp/fish/implicit/share/completions/find.fish:45
-#, fuzzy
 msgid "File refers to the same inode as specified file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Exklidera filer listade i angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:46
 msgid "File uses specified units of space"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:47
-#, fuzzy
 msgid "Always true"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Alltid"
 
 #: /tmp/fish/implicit/share/completions/find.fish:48
-#, fuzzy
 msgid "File is of specified type"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filsystem av angiven typ"
 
 #: /tmp/fish/implicit/share/completions/find.fish:49
-#, fuzzy
 msgid "File's owner has specified numeric user ID"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fil ägd av effektiv användar-id"
 
 #: /tmp/fish/implicit/share/completions/find.fish:50
 msgid ""
@@ -17493,12 +16745,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:51
-#, fuzzy
 msgid "File's owner"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fil är uttag (socket)"
 
 #: /tmp/fish/implicit/share/completions/find.fish:52
 msgid ""
@@ -17515,24 +16763,16 @@ msgid "Delete selected files"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:55
-#, fuzzy
 msgid "Execute specified command for each located file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför  kommando om föregående kommando misslyckades"
 
 #: /tmp/fish/implicit/share/completions/find.fish:56
 msgid "Execute specified command for each located file, in the files directory"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:57
-#, fuzzy
 msgid "List file in ls -dils format, write to specified file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:58
 msgid "Print full file names into specified file"
@@ -17543,24 +16783,16 @@ msgid "Print null separated full file names into specified file"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:60
-#, fuzzy
 msgid "Print formated data into specified file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv utdata till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/find.fish:61
 msgid "Execute specified command for each located file after asking user"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:62
-#, fuzzy
 msgid "Print full file names"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filnamn"
 
 #: /tmp/fish/implicit/share/completions/find.fish:63
 msgid ""
@@ -17569,12 +16801,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:64
-#, fuzzy
 msgid "Print null separated full file names"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv bara RCS-filnamn"
 
 #: /tmp/fish/implicit/share/completions/find.fish:65
 msgid "Print formated data"
@@ -17585,28 +16813,16 @@ msgid "Do not recurse unless -depth is specified"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/find.fish:67
-#, fuzzy
 msgid "Exit at once"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Förklara vad som utförs"
 
 #: /tmp/fish/implicit/share/completions/find.fish:68
-#, fuzzy
 msgid "List file in ls -dils format"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista information om inoder"
 
 #: /tmp/fish/implicit/share/completions/find.fish:69
-#, fuzzy
 msgid "Negate result of action"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Negera uttryck"
 
 #: /tmp/fish/implicit/share/completions/find.fish:70
 msgid "Result is only true if both previous and next action are true"
@@ -18590,12 +17806,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/git.fish:295
 #: /tmp/fish/implicit/share/completions/git.fish:296
 #: share/completions/git.fish:177
-#, fuzzy
 msgid "Tag"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Mål"
 
 #: /tmp/fish/implicit/share/completions/fossil.fish:160
 msgid "Show commit time"
@@ -19099,12 +18311,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/root.fish:6
 #: /tmp/fish/implicit/share/completions/zypper.fish:4
 #: share/completions/zypper.fish:30
-#, fuzzy
 msgid "Print help"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa URIer"
 
 #: /tmp/fish/implicit/share/completions/funced.fish:1
 #: /tmp/fish/implicit/share/completions/funcsave.fish:1
@@ -19140,12 +18348,8 @@ msgid "Show hidden functions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/functions.fish:6
-#, fuzzy
 msgid "Test if function is defined"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om variabeln är definerad"
 
 #: /tmp/fish/implicit/share/completions/functions.fish:7
 msgid "List the names of the functions, but not their definition"
@@ -24793,39 +23997,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:5
 #: share/completions/gem.fish:37
-#, fuzzy
 msgid "Use no HTTP proxy for remote operations"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj rot-katalog för rpm-operationer"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:6
 #: share/completions/gem.fish:38
-#, fuzzy
 msgid "Get help on this command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj promptkommando"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:7
 #: share/completions/gem.fish:39
-#, fuzzy
 msgid "Set the verbose level of output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Återställ felrapporteringsnivå till 0"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:8
 #: share/completions/gem.fish:40
-#, fuzzy
 msgid "Use this config file instead of default"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd angiven fil istället för standard-förtroendedatabasen"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:9
 #: share/completions/gem.fish:41
@@ -24834,12 +24022,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:10
 #: share/completions/gem.fish:42
-#, fuzzy
 msgid "Turn on Ruby debugging"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Slå av avmangling"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:11
 #: share/completions/gem.fish:47
@@ -24848,12 +24032,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:12
 #: share/completions/gem.fish:48
-#, fuzzy
 msgid "List trusted certificates"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa pålitliga nycklar"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:13
 #: share/completions/gem.fish:49
@@ -24872,12 +24052,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:16
 #: share/completions/gem.fish:52
-#, fuzzy
 msgid "Private key for --sign command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa typ av kommando"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:17
 #: share/completions/gem.fish:53
@@ -24891,12 +24067,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:19
 #: share/completions/gem.fish:59
-#, fuzzy
 msgid "Report 'unmanaged' or rogue files in the gem repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort filer eller kataloger från lagret"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:20
 #: share/completions/gem.fish:60
@@ -24905,48 +24077,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:21
 #: share/completions/gem.fish:61
-#, fuzzy
 msgid "Specify version for which to run unit tests"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj vilket förråd som skall användas"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:22
 #: share/completions/gem.fish:66
-#, fuzzy
 msgid "Don't really cleanup"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Avinstallera ingenting på riktigt"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:23
 #: share/completions/gem.fish:71
-#, fuzzy
 msgid "List the files inside a Gem"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filer i paket"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:24
 #: share/completions/gem.fish:72
-#, fuzzy
 msgid "Specify version for gem to view"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange användare för fråga"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:25
 #: share/completions/gem.fish:73
-#, fuzzy
 msgid "Search for gems under specific paths"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj drivrutinsspecifika inställningar"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:26
 #: share/completions/gem.fish:74
@@ -24956,30 +24108,18 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:27
 #: /tmp/fish/implicit/share/completions/gem.fish:82
 #: share/completions/gem.fish:79 share/completions/gem.fish:172
-#, fuzzy
 msgid "Specify version of gem to uninstall"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista av paket att installera"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:28
 #: share/completions/gem.fish:80
-#, fuzzy
 msgid "Include reverse dependencies in the output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:29
 #: share/completions/gem.fish:81
-#, fuzzy
 msgid "Don't include reverse dependencies in the output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:30
 #: share/completions/gem.fish:82
@@ -24988,12 +24128,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:31
 #: share/completions/gem.fish:97
-#, fuzzy
 msgid "Specify version of gem to install"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista av paket att installera"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:32
 #: /tmp/fish/implicit/share/completions/gem.fish:51
@@ -25067,12 +24203,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:41
 #: /tmp/fish/implicit/share/completions/gem.fish:90
 #: share/completions/gem.fish:107 share/completions/gem.fish:188
-#, fuzzy
 msgid "Don't force gem to install, bypassing dependency checks"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför inte beroendeverifiering"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:42
 #: /tmp/fish/implicit/share/completions/gem.fish:91
@@ -25083,42 +24215,26 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:43
 #: /tmp/fish/implicit/share/completions/gem.fish:92
 #: share/completions/gem.fish:109 share/completions/gem.fish:190
-#, fuzzy
 msgid "Don't run unit tests prior to installation"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kontrollera inte diskutrymme före installation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:44
 #: /tmp/fish/implicit/share/completions/gem.fish:93
 #: share/completions/gem.fish:110 share/completions/gem.fish:191
-#, fuzzy
 msgid "Use bin wrappers for executables"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fil är program"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:45
 #: /tmp/fish/implicit/share/completions/gem.fish:94
 #: share/completions/gem.fish:111 share/completions/gem.fish:192
-#, fuzzy
 msgid "Don't use bin wrappers for executables"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Gör inte skript exekverbara"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:46
 #: /tmp/fish/implicit/share/completions/gem.fish:95
 #: share/completions/gem.fish:112 share/completions/gem.fish:193
-#, fuzzy
 msgid "Specify gem trust policy"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange förtroendemodell"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:47
 #: /tmp/fish/implicit/share/completions/gem.fish:96
@@ -25137,24 +24253,16 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/gem.fish:66
 #: share/completions/gem.fish:119 share/completions/gem.fish:129
 #: share/completions/gem.fish:148
-#, fuzzy
 msgid "Display detailed information of gem(s)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:50
 #: /tmp/fish/implicit/share/completions/gem.fish:56
 #: /tmp/fish/implicit/share/completions/gem.fish:67
 #: share/completions/gem.fish:120 share/completions/gem.fish:130
 #: share/completions/gem.fish:149
-#, fuzzy
 msgid "Don't display detailed information of gem(s)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa uppdateringsinformation"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:54
 #: share/completions/gem.fish:128
@@ -25188,21 +24296,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:65
 #: share/completions/gem.fish:143
-#, fuzzy
 msgid "Specify version of gem to rdoc"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange extern editor"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:71
 #: share/completions/gem.fish:157
-#, fuzzy
 msgid "Specify version of gem to examine"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:75
 #: share/completions/gem.fish:161
@@ -25211,21 +24311,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:76
 #: share/completions/gem.fish:166
-#, fuzzy
 msgid "Uninstall all matching versions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla versioner"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:77
 #: share/completions/gem.fish:167
-#, fuzzy
 msgid "Don't uninstall all matching versions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Avinstallera ingenting på riktigt"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:78
 #: share/completions/gem.fish:168
@@ -25234,12 +24326,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/gem.fish:79
 #: share/completions/gem.fish:169
-#, fuzzy
 msgid "Don't ignore dependency requirements while uninstalling"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Verifiera inte beroenden före paketen avinstalleras"
 
 #: /tmp/fish/implicit/share/completions/gem.fish:80
 #: share/completions/gem.fish:170
@@ -27680,12 +26768,8 @@ msgstr "Processa binär fil som text"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:5
 #: share/functions/__fish_complete_grep.fish:6
-#, fuzzy
 msgid "Print byte offset of matches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv bara ut angivet antal matchningar"
 
 #: share/functions/__fish_complete_grep.fish:7
 msgid "Assume data type for binary files"
@@ -27702,12 +26786,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:9
 #: share/functions/__fish_complete_grep.fish:10
-#, fuzzy
 msgid "Only print number of matches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv bara ut angivet antal matchningar"
 
 #: share/functions/__fish_complete_grep.fish:13
 msgid "Pattern is extended regexp"
@@ -27724,12 +26804,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/grep.fish:15
 #: share/functions/__fish_complete_grep.fish:16
-#, fuzzy
 msgid "Exclude matching directories from recursive searches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sök i angivna kataloger efter källkod"
 
 #: share/functions/__fish_complete_grep.fish:17
 msgid "Pattern is a fixed string"
@@ -27749,12 +26825,8 @@ msgstr "Visa filnamn"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:20
 #: share/functions/__fish_complete_grep.fish:21
-#, fuzzy
 msgid "Suppress printing filename"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte filnamn"
 
 #: share/functions/__fish_complete_grep.fish:23
 msgid "Skip binary files"
@@ -27778,12 +26850,8 @@ msgstr "Använd systemanroppet mmap för inläsning"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:28
 #: share/functions/__fish_complete_grep.fish:29
-#, fuzzy
 msgid "Print line number"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa radnummer"
 
 #: share/functions/__fish_complete_grep.fish:30
 msgid "Show only matching part"
@@ -27799,12 +26867,8 @@ msgstr "Använd radbuffring"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:32
 #: share/functions/__fish_complete_grep.fish:33
-#, fuzzy
 msgid "Pattern is a Perl regexp (PCRE) string"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Mönster är ett reguljärt uttryck"
 
 #: share/functions/__fish_complete_grep.fish:34
 #: share/functions/__fish_complete_grep.fish:35
@@ -27815,30 +26879,18 @@ msgstr "Skriv ingenting"
 #: /tmp/fish/implicit/share/completions/grep.fish:36
 #: share/functions/__fish_complete_grep.fish:36
 #: share/functions/__fish_complete_grep.fish:37
-#, fuzzy
 msgid "Read files under each directory, recursively"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs filer i varje katalog"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:37
 #: share/functions/__fish_complete_grep.fish:38
-#, fuzzy
 msgid "Search only files matching PATTERN"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Rekursera, sök i filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/grep.fish:38
 #: share/functions/__fish_complete_grep.fish:39
-#, fuzzy
 msgid "Skip files matching PATTERN"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Rekursera, skippa filer som matchar mönster"
 
 #: share/functions/__fish_complete_grep.fish:40
 msgid "Suppress error messages"
@@ -28487,12 +27539,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/helm.fish:24
 #: /tmp/fish/implicit/share/completions/helm.fish:68
 #: /tmp/fish/implicit/share/completions/helm.fish:76
-#, fuzzy
 msgid "Revision"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Slå ihop revisioner"
 
 #: /tmp/fish/implicit/share/completions/helm.fish:25
 msgid "Dump all (computed) values"
@@ -30638,12 +29686,8 @@ msgid "use IPv6 in addition to IPv4"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/hg.fish:480
-#, fuzzy
 msgid "SSL certificate file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj certifikatpolicy"
 
 #: /tmp/fish/implicit/share/completions/hg.fish:482
 msgid "show status of all files"
@@ -30787,12 +29831,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/s3cmd.fish:41
 #: /tmp/fish/implicit/share/completions/subl.fish:8
 #: share/completions/perl.fish:27
-#, fuzzy
 msgid "Show help and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa hjälp och avsluta"
 
 #: /tmp/fish/implicit/share/completions/htop.fish:5
 msgid "Show only given PIDs"
@@ -31306,12 +30346,8 @@ msgid "Convert to specified encoding"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:3
-#, fuzzy
 msgid "List known coded character sets"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj den interna teckenuppsättningen"
 
 #: /tmp/fish/implicit/share/completions/iconv.fish:5
 msgid "Print progress information"
@@ -32619,12 +31655,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:1
 #: share/completions/kitchen.fish:3
-#, fuzzy
 msgid "Test if kitchen has yet to be given the main command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/kitchen.fish:2
 #: /tmp/fish/implicit/share/completions/kitchen.fish:3
@@ -36707,12 +35739,8 @@ msgstr "Montera partition med angivet UID"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:14
 #: share/completions/mount.fish:21
-#, fuzzy
 msgid "Exclude file systems"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Exkludera filsystem"
 
 #: share/completions/mount.fish:22
 msgid "Remount a subtree to a second position"
@@ -36724,12 +35752,8 @@ msgstr "Flytta ett subträd till en ny plats"
 
 #: /tmp/fish/implicit/share/completions/mount.fish:17
 #: share/completions/mount.fish:24
-#, fuzzy
 msgid "File system"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Filsystem"
 
 #: share/completions/mount.fish:26
 msgid "Mount option"
@@ -36761,12 +35785,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:2
 #: share/completions/msgfmt.fish:5
-#, fuzzy
 msgid "Generate a Java ResourceBundle class"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera källindexfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:3
 #: share/completions/msgfmt.fish:6
@@ -36775,39 +35795,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:4
 #: share/completions/msgfmt.fish:7
-#, fuzzy
 msgid "Generate a .NET .dll file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:5
 #: share/completions/msgfmt.fish:8
-#, fuzzy
 msgid "Generate a .NET .resources file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera källindexfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:6
 #: share/completions/msgfmt.fish:9
-#, fuzzy
 msgid "Generate a tcl/msgcat .msg file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:7
 #: share/completions/msgfmt.fish:10
-#, fuzzy
 msgid "Generate a Qt .qm file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera huvudfil"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:9
 msgid "Enable strict Uniforum mode"
@@ -36815,12 +35819,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:10
 #: share/completions/msgfmt.fish:17
-#, fuzzy
 msgid "Resource name"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj volymnamn"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:11
 #: share/completions/msgfmt.fish:18
@@ -36829,12 +35829,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:12
 #: share/completions/msgfmt.fish:19
-#, fuzzy
 msgid "Base directory for output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Filidentifierare för indata"
 
 #: /tmp/fish/implicit/share/completions/msgfmt.fish:13
 msgid "Input files are in Java .properties syntax"
@@ -36956,21 +35952,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:18
 #: share/completions/mutt.fish:23
-#, fuzzy
 msgid "Specify which mailbox to load"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange sendmailkommando"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:19
 #: share/completions/mutt.fish:24
-#, fuzzy
 msgid "Specify an initialization file to read instead of ~/.muttrc"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange logmeddelande istället för att anropa editor"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:20
 #: share/completions/mutt.fish:25
@@ -36984,30 +35972,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:22
 #: share/completions/mutt.fish:27
-#, fuzzy
 msgid "Specify a default mailbox type"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj kärnversion"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:23
 #: share/completions/mutt.fish:28
-#, fuzzy
 msgid "Query a configuration variables value"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/mutt.fish:24
 #: share/completions/mutt.fish:29
-#, fuzzy
 msgid "Specify the subject of the message"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange meddelande för tillägg"
 
 #: share/completions/mv.fish:4
 msgid "Answer for overwrite questions"
@@ -41485,30 +40461,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/node.fish:1
 #: share/completions/node.fish:9
-#, fuzzy
 msgid "Print node's version"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa kärnversion"
 
 #: /tmp/fish/implicit/share/completions/node.fish:2
 #: share/completions/node.fish:10
-#, fuzzy
 msgid "Evaluate script"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Extrahera skript"
 
 #: /tmp/fish/implicit/share/completions/node.fish:3
 #: share/completions/node.fish:11
-#, fuzzy
 msgid "Print result of --eval"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa platt profil"
 
 #: /tmp/fish/implicit/share/completions/node.fish:4
 msgid "Always enter the REPL even if stdin does not appear to be a terminal"
@@ -42930,21 +41894,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:29
 #: share/completions/obnam.fish:32
-#, fuzzy
 msgid "Name of client"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"NAmn på version at använda som kontrollpunkt"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:30
 #: share/completions/obnam.fish:33
-#, fuzzy
 msgid "Compress repository with"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Komprimera till standard ut"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:31
 #: share/completions/obnam.fish:34
@@ -42958,21 +41914,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:33
 #: share/completions/obnam.fish:36
-#, fuzzy
 msgid "Do not dump metadata about files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera inte byggda filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:34
 #: share/completions/obnam.fish:37
-#, fuzzy
 msgid "Generate man page"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera ett nytt nyckelpar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:35
 #: share/completions/obnam.fish:38
@@ -42981,12 +41929,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:36
 #: share/completions/obnam.fish:39
-#, fuzzy
 msgid "Show this help message and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:37
 #: share/completions/obnam.fish:40
@@ -43004,21 +41948,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:40
 #: share/completions/obnam.fish:43
-#, fuzzy
 msgid "Do not actually change anything"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv ingenting"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:41
 #: share/completions/obnam.fish:44
-#, fuzzy
 msgid "Actually commit changes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Summera ändringar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:42
 #: share/completions/obnam.fish:45
@@ -43044,12 +41980,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:48
 #: share/completions/obnam.fish:53
-#, fuzzy
 msgid "Do not be verbose"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv inte över"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:49
 #: share/completions/obnam.fish:54
@@ -43059,12 +41991,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/obnam.fish:50
 #: /tmp/fish/implicit/share/completions/transmission-remote.fish:72
 #: share/completions/obnam.fish:55
-#, fuzzy
 msgid "Show version number and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:51
 msgid "For nagios-last-backup-age: maximum age"
@@ -43077,12 +42005,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:53
 #: share/completions/obnam.fish:58
-#, fuzzy
 msgid "Deduplicate mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs ock skrivbart läge"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:54
 msgid "REGEXP for pathnames to exclude"
@@ -43090,21 +42014,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:55
 #: share/completions/obnam.fish:60
-#, fuzzy
 msgid "Exclude directories tagged as cache"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sök i angivna kataloger efter källkod"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:56
 #: share/completions/obnam.fish:61
-#, fuzzy
 msgid "Include directories tagged as cache"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Inkluderingskatalog"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:57
 #: /tmp/fish/implicit/share/completions/rsync.fish:77
@@ -43127,21 +42043,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:61
 #: share/completions/obnam.fish:65
-#, fuzzy
 msgid "Do not follow mount points"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radbryt inte långa rader"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:62
 #: share/completions/obnam.fish:66
-#, fuzzy
 msgid "Follow mount points"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Monteringskatalog"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:63
 msgid "What to backup"
@@ -43163,48 +42071,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:67
 #: share/completions/obnam.fish:70
-#, fuzzy
 msgid "Write out the current configuration"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ladda om konfiguration för tjänst"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:68
 #: share/completions/obnam.fish:71
-#, fuzzy
 msgid "Write out setting names"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv prompten"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:69
 #: share/completions/obnam.fish:72
-#, fuzzy
 msgid "Show all options"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa hjälp om flaggor"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:70
 #: share/completions/obnam.fish:73
-#, fuzzy
 msgid "List config files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:71
 #: share/completions/obnam.fish:74
-#, fuzzy
 msgid "Clear list of configuration files to read"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa rpmkonfigurationsfiler"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:72
 msgid "Artificially crash the program after COUNTER files"
@@ -43216,12 +42104,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:74
 #: share/completions/obnam.fish:49
-#, fuzzy
 msgid "Simulate failures for files that match REGEXP"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj fix som matchar REGEXP"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:75
 msgid "FILENAME pattern for trace debugging"
@@ -43238,21 +42122,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:78
 #: share/completions/obnam.fish:76
-#, fuzzy
 msgid "Show additional user IDs"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa historik för alla användare"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:79
 #: share/completions/obnam.fish:77
-#, fuzzy
 msgid "Do not show additional user IDs"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lagra inte katalognamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:80
 #: share/completions/obnam.fish:78
@@ -43266,12 +42142,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:82
 #: share/completions/obnam.fish:80
-#, fuzzy
 msgid "Use /dev/urandom instead of /dev/random"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd rensning istället för radering"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:83
 #: share/completions/obnam.fish:81
@@ -43290,12 +42162,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:86
 #: share/completions/obnam.fish:85
-#, fuzzy
 msgid "Ignore chunks when checking integrity"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ignorera skiftläge på filnamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:87
 #: share/completions/obnam.fish:86
@@ -43308,22 +42176,14 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:89
 #: share/completions/obnam.fish:88
-#, fuzzy
 msgid "Check only the last generation"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Återupta senaste installationsoperation"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:90
 #: /tmp/fish/implicit/share/completions/obnam.fish:100
 #: share/completions/obnam.fish:89 share/completions/obnam.fish:95
-#, fuzzy
 msgid "Check all generations"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:91
 #: /tmp/fish/implicit/share/completions/obnam.fish:92
@@ -43340,57 +42200,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:95
 #: share/completions/obnam.fish:90
-#, fuzzy
 msgid "Do not check directories"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lagra inte katalognamn"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:96
 #: share/completions/obnam.fish:91
-#, fuzzy
 msgid "Check directories"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Rekursera till underkataloger"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:97
 #: share/completions/obnam.fish:92
-#, fuzzy
 msgid "Do not check files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:98
 #: share/completions/obnam.fish:93
-#, fuzzy
 msgid "Check files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:99
 #: share/completions/obnam.fish:94
-#, fuzzy
 msgid "Do not check any generations"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:101
 #: share/completions/obnam.fish:96
-#, fuzzy
 msgid "Do not check per-client B-trees"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv inte ut taggar"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:102
 #: share/completions/obnam.fish:97
@@ -43399,21 +42235,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:103
 #: share/completions/obnam.fish:98
-#, fuzzy
 msgid "Do not check shared B-trees"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ändra inga filer"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:104
 #: share/completions/obnam.fish:99
-#, fuzzy
 msgid "Check shared B-trees"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga installerat paket"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:105
 msgid "Write log to FILE or syslog"
@@ -43471,12 +42299,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:116
 #: share/completions/obnam.fish:112
-#, fuzzy
 msgid "Depth of chunk id mapping"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Djup i anroppskedjan"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:117
 #: share/completions/obnam.fish:113
@@ -43490,12 +42314,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:119
 #: share/completions/obnam.fish:115
-#, fuzzy
 msgid "Size of B-tree nodes on disk"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringar i omvänd ordning"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:120
 #: share/completions/obnam.fish:116
@@ -43525,12 +42345,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:126
 #: share/completions/obnam.fish:118
-#, fuzzy
 msgid "Use openssh if available"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bygg index om inte tillgängligt"
 
 #: /tmp/fish/implicit/share/completions/obnam.fish:127
 msgid "Executable to be used instead of \"ssh\""
@@ -44596,12 +43412,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:19
 #: /tmp/fish/implicit/share/completions/xpdf.fish:28
-#, fuzzy
 msgid "Don't print any messages or errors"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Kör inga taggningsprogram"
 
 #: /tmp/fish/implicit/share/completions/pdftotext.fish:20
 msgid "Print copyright and version"
@@ -44697,12 +43509,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/perl.fish:20
 #: share/completions/perl.fish:25
-#, fuzzy
 msgid "Disable sitecustomize.pl"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Inaktivera användandet av kakor"
 
 #: share/completions/perl.fish:30
 msgid "Automatic line ending processing"
@@ -44744,39 +43552,23 @@ msgstr "Osäkert läge"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:37
 #: share/completions/perl.fish:42
-#, fuzzy
 msgid "Display configuration and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:38
 #: share/completions/perl.fish:43
-#, fuzzy
 msgid "Show warnings"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:39
 #: share/completions/perl.fish:44
-#, fuzzy
 msgid "Force warnings"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte varningar"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:40
 #: share/completions/perl.fish:45
-#, fuzzy
 msgid "Disable warnings"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte varningar om MFC"
 
 #: /tmp/fish/implicit/share/completions/perl.fish:41
 #: /tmp/fish/implicit/share/completions/ruby.fish:21
@@ -45119,12 +43911,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/zypper.fish:3
 #: /tmp/fish/implicit/share/completions/zypper.fish:18
 #: share/completions/zypper.fish:44
-#, fuzzy
 msgid "Install packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installerade paket"
 
 #: /tmp/fish/implicit/share/completions/pkg.fish:27
 msgid "Prevent package modification"
@@ -45575,21 +44363,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:44
 #: share/completions/portmaster.fish:49
-#, fuzzy
 msgid "Ports Directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Katalog"
 
 #: /tmp/fish/implicit/share/completions/portmaster.fish:45
 #: share/completions/portmaster.fish:55
-#, fuzzy
 msgid "Installed Package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installerade paket"
 
 #: /tmp/fish/implicit/share/completions/ports.fish:1
 msgid "Update ports"
@@ -45933,12 +44713,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/psql.fish:3
 #: share/completions/psql.fish:19
-#, fuzzy
 msgid "execute commands from file, then exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför kommando som om get vore en del av .wgetrc"
 
 #: /tmp/fish/implicit/share/completions/psql.fish:4
 msgid "list available databases, then exit"
@@ -47308,21 +46084,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:41
 #: share/completions/rsync.fish:42
-#, fuzzy
 msgid "Specify the remote shell to use"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:42
 #: share/completions/rsync.fish:43
-#, fuzzy
 msgid "Specify the rsync to run on remote machine"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj destinationsadress"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:43
 msgid "Ignore non-existing files on receiving side"
@@ -47524,12 +46292,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:92
 #: share/completions/rsync.fish:93
-#, fuzzy
 msgid "Output filenames using the specified format"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Exklidera filer listade i angiven fil"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:93
 #: share/completions/rsync.fish:94
@@ -47556,12 +46320,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:98
 #: share/completions/rsync.fish:99
-#, fuzzy
 msgid "Read a batched update from FILE"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs fix från patchfil"
 
 #: /tmp/fish/implicit/share/completions/rsync.fish:99
 #: share/completions/rsync.fish:100
@@ -49015,12 +47775,8 @@ msgid "Share variable persistently across sessions"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/set.fish:11
-#, fuzzy
 msgid "List the names of the variables, but not their value"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/set.fish:14
 msgid "Locale variable"
@@ -49685,32 +48441,20 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/svn.fish:5
 #: share/functions/__fish_complete_svn.fish:49
 #: share/functions/__fish_complete_svn.fish:51
-#, fuzzy
 msgid ""
 "Output the content of specified files or URLs with revision and author "
 "information in-line."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filer/URL:er med revisions- och författarinformation inbakat"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:4
 #: share/functions/__fish_complete_svn.fish:50
-#, fuzzy
 msgid "Output the content of specified files or URLs."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa innehåll av filer/URL:er"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:6
 #: share/functions/__fish_complete_svn.fish:52
-#, fuzzy
 msgid "Check out a working copy from a repository."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hämta ut en arbetskopia från förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:7
 #: share/functions/__fish_complete_svn.fish:53
@@ -49721,30 +48465,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:8
 #: share/functions/__fish_complete_svn.fish:54
-#, fuzzy
 msgid "Send changes from your working copy to the repository."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skicka ändringar i arbetskopian till lagret"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:9
 #: share/functions/__fish_complete_svn.fish:55
-#, fuzzy
 msgid "Duplicate something in working copy or repository, remembering history."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Flytta och/eller byt namn på någonting i arbetskopian eller förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:10
 #: share/functions/__fish_complete_svn.fish:56
-#, fuzzy
 msgid "Display the differences between two revisions or paths."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Applicera differensen mellan två källor till en arbetskopiesökväg"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:11
 #: share/functions/__fish_complete_svn.fish:57
@@ -49753,176 +48485,100 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:12
 #: share/functions/__fish_complete_svn.fish:58
-#, fuzzy
 msgid "Describe the usage of this program or its subcommands."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Beskriv användandet av detta program eller dess underkommandon"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:13
 #: share/functions/__fish_complete_svn.fish:59
-#, fuzzy
 msgid "Commit an unversioned file or tree into the repository."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till fil eller träd utan version till förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:14
 #: share/functions/__fish_complete_svn.fish:60
-#, fuzzy
 msgid "Display information about a local or remote item."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa information om lokal eller fjärrelement"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:15
 #: share/functions/__fish_complete_svn.fish:61
-#, fuzzy
 msgid "List directory entries in the repository."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista kataloger i förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:16
 #: share/functions/__fish_complete_svn.fish:62
-#, fuzzy
 msgid ""
 "Lock working copy paths or URLs in the repository, so that no other user can "
 "commit changes to them."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs arbetskopiwsökvägar eller URL:er i förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:17
 #: share/functions/__fish_complete_svn.fish:63
-#, fuzzy
 msgid "Show the log messages for a set of revision(s) and/or file(s)."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:18
 #: share/functions/__fish_complete_svn.fish:64
-#, fuzzy
 msgid "Apply the differences between two sources to a working copy path."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Applicera differensen mellan två källor till en arbetskopiesökväg"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:19
 #: share/functions/__fish_complete_svn.fish:65
-#, fuzzy
 msgid "Display information related to merges"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:20
 #: share/functions/__fish_complete_svn.fish:66
-#, fuzzy
 msgid "Create a new directory under version control."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skapa ny katalog under revisionskontroll"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:21
 #: share/functions/__fish_complete_svn.fish:67
-#, fuzzy
 msgid "Move and/or rename something in working copy or repository."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Flytta och/eller byt namn på någonting i arbetskopian eller förrådet"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:22
 #: share/functions/__fish_complete_svn.fish:68
-#, fuzzy
 msgid "Apply a unidiff patch to the working copy"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa olagrade ändringar i arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:23
 #: share/functions/__fish_complete_svn.fish:69
-#, fuzzy
 msgid "Remove a property from files, dirs, or revisions."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort en egenskap från filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:24
 #: share/functions/__fish_complete_svn.fish:70
-#, fuzzy
 msgid "Edit a property with an external editor."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Redigera en egenskap med extern edito för mål"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:25
 #: share/functions/__fish_complete_svn.fish:71
-#, fuzzy
 msgid "Print the value of a property on files, dirs, or revisions."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv ut värde för en egenskap hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:26
 #: share/functions/__fish_complete_svn.fish:72
-#, fuzzy
 msgid "List all properties on files, dirs, or revisions."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla engenskaper hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:27
 #: share/functions/__fish_complete_svn.fish:73
-#, fuzzy
 msgid "Set the value of a property on files, dirs, or revisions."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv ut värde för en egenskap hos filer, kataloger eller revisioner"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:28
 #: share/functions/__fish_complete_svn.fish:74
-#, fuzzy
 msgid "Rewrite working copy url metadata"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera arbetskopia om släppning lyckas"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:29
 #: share/functions/__fish_complete_svn.fish:75
-#, fuzzy
 msgid "Remove files and directories from version control."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Placera filer och kataloger under versionskontroll"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:30
 #: share/functions/__fish_complete_svn.fish:76
-#, fuzzy
 msgid "Remove conflicts on working copy files or directories."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort konflikttillstånd hos arbetskopiefiler eller kataloger"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:31
 msgid "Remove 'conflicted' state on working copy files or directories."
@@ -49930,48 +48586,28 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:32
 #: share/functions/__fish_complete_svn.fish:78
-#, fuzzy
 msgid "Restore pristine working copy file (undo most local edits)."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Återställ rensad arbetskopiefil"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:33
 #: share/functions/__fish_complete_svn.fish:79
-#, fuzzy
 msgid "Print the status of working copy files and directories."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa status för arbetskopians filer och kataloger"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:34
 #: share/functions/__fish_complete_svn.fish:80
-#, fuzzy
 msgid "Update the working copy to a different URL."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Uppdatera arbetskopian till en annan URL"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:35
 #: share/functions/__fish_complete_svn.fish:81
-#, fuzzy
 msgid "Unlock working copy paths or URLs."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lås upp arbetskopians sökvägar eller URL:er"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:36
 #: share/functions/__fish_complete_svn.fish:82
-#, fuzzy
 msgid "Bring changes from the repository into the working copy."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hämta ändringar från förrådet till arbetskopian"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:37
 #: share/functions/__fish_complete_svn.fish:83
@@ -49979,29 +48615,17 @@ msgid "Upgrade the metadata storage format for a working copy."
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:38
-#, fuzzy
 msgid "Specify a username ARG"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj användarnamn"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:39
-#, fuzzy
 msgid "Specify a password ARG"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj lösenord"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:40
 #: share/functions/__fish_complete_svn.fish:90
-#, fuzzy
 msgid "Do not cache authentication tokens"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Cacha inte autentiseringssymboler"
 
 #: share/functions/__fish_complete_svn.fish:91
 msgid "Do no interactive prompting"
@@ -50015,12 +48639,8 @@ msgid ""
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/svn.fish:43
-#, fuzzy
 msgid "Read user configuration files from directory ARG"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs användarkonfigurationsfiler från angiven katalog"
 
 #: /tmp/fish/implicit/share/completions/svn.fish:44
 msgid ""
@@ -50043,12 +48663,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:7
 #: share/completions/sylpheed.fish:10
-#, fuzzy
 msgid "Receive new messages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ersätt ett loggmeddelande"
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:8
 #: share/completions/sylpheed.fish:11
@@ -50072,12 +48688,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/sylpheed.fish:12
 #: share/completions/sylpheed.fish:15
-#, fuzzy
 msgid "Specify directory with configuration files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj en konfigurationsfil"
 
 #: /tmp/fish/implicit/share/completions/sysbench.fish:1
 msgid "The total number of worker threads to create (default: 1)"
@@ -51428,12 +50040,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:1
 #: share/completions/tmux.fish:1
-#, fuzzy
 msgid "available sessions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför argument som kommandon"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:2
 #: share/completions/tmux.fish:5
@@ -51442,12 +50050,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:3
 #: share/completions/tmux.fish:9
-#, fuzzy
 msgid "window panes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Terminalfönstret ändrade storlek"
 
 #: /tmp/fish/implicit/share/completions/tmux.fish:4
 msgid "Force tmux to assume the terminal supports 256 colours"
@@ -52813,57 +51417,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:1
 #: share/completions/unrar.fish:5
-#, fuzzy
 msgid "Extract files to current directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Läs filer i varje katalog"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:3
 #: share/completions/unrar.fish:7
-#, fuzzy
 msgid "List archive (technical)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa arkivinnehåll"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:4
 #: share/completions/unrar.fish:8
-#, fuzzy
 msgid "List archive (bare)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa arkivinnehåll"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:5
 #: share/completions/unrar.fish:9
-#, fuzzy
 msgid "Print file to stdout"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skicka filer till standard ut"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:6
 #: share/completions/unrar.fish:10
-#, fuzzy
 msgid "Test archive files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Arkivfil"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:7
 #: share/completions/unrar.fish:11
-#, fuzzy
 msgid "Verbosely list archive"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Verifiera arkiv"
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:8
 #: share/completions/unrar.fish:12
@@ -52877,12 +51457,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/unrar.fish:10
 #: share/completions/unrar.fish:14
-#, fuzzy
 msgid "Extract files with full path"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Axtrahera fil från fil"
 
 #: /tmp/fish/implicit/share/completions/update-eix.fish:1
 msgid "Show a short help screen"
@@ -53071,21 +51647,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:1
 #: share/completions/vagrant.fish:3
-#, fuzzy
 msgid "Test if vagrant has yet to be given the main command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:2
 #: share/completions/vagrant.fish:23
-#, fuzzy
 msgid "Lists all available Vagrant boxes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/vagrant.fish:4
 msgid "Print the help and exit"
@@ -53570,12 +52138,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vi.fish:5
 #: share/functions/__fish_complete_vi.fish:95
-#, fuzzy
 msgid "Read-only mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skrivskyddad"
 
 #: /tmp/fish/implicit/share/completions/vi.fish:6
 #: share/functions/__fish_complete_vi.fish:96
@@ -53601,12 +52165,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:1
 #: share/completions/vim-addons.fish:8
-#, fuzzy
 msgid "Test if vim-addons has yet to be given the subcommand"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/vim-addons.fish:2
 msgid "list the names of the addons available in the system"
@@ -53742,21 +52302,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:18
 #: share/functions/__fish_complete_vi.fish:37
-#, fuzzy
 msgid "Start in Arabic mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Starta gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:19
 #: share/functions/__fish_complete_vi.fish:38
-#, fuzzy
 msgid "Start in binary mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Standardläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:20
 #: share/functions/__fish_complete_vi.fish:39
@@ -53765,125 +52317,73 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:21
 #: share/functions/__fish_complete_vi.fish:40
-#, fuzzy
 msgid "Start in diff mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:22
 #: share/functions/__fish_complete_vi.fish:41
-#, fuzzy
 msgid "Debugging mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Debugläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:23
 #: share/functions/__fish_complete_vi.fish:42
-#, fuzzy
 msgid "Start in Ex mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:24
 #: share/functions/__fish_complete_vi.fish:43
-#, fuzzy
 msgid "Start in improved Ex mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:25
 #: /tmp/fish/implicit/share/completions/vim.fish:46
 #: share/functions/__fish_complete_vi.fish:44
 #: share/functions/__fish_complete_vi.fish:67
-#, fuzzy
 msgid "Start in foreground mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:26
 #: share/functions/__fish_complete_vi.fish:45
-#, fuzzy
 msgid "Start in Farsi mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Standardläge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:27
 #: share/functions/__fish_complete_vi.fish:46
-#, fuzzy
 msgid "Start in GUI mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:28
 #: /tmp/fish/implicit/share/completions/vim.fish:48
 #: share/functions/__fish_complete_vi.fish:47
 #: share/functions/__fish_complete_vi.fish:69
-#, fuzzy
 msgid "Print help message and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:29
 #: share/functions/__fish_complete_vi.fish:48
-#, fuzzy
 msgid "Start in Hebrew mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:30
 #: /tmp/fish/implicit/share/completions/vim.fish:37
 #: share/functions/__fish_complete_vi.fish:49
-#, fuzzy
 msgid "List swap files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Arkivfil"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:31
 #: share/functions/__fish_complete_vi.fish:50
-#, fuzzy
 msgid "Start in lisp mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Börja i folderindex"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:32
 #: share/functions/__fish_complete_vi.fish:51
-#, fuzzy
 msgid "Disable file modification"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lita inte på filändringstid"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:33
 #: share/functions/__fish_complete_vi.fish:52
-#, fuzzy
 msgid "Disallow file modification"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa bara senaste modifiering"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:34
 #: share/functions/__fish_complete_vi.fish:53
@@ -53920,21 +52420,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:43
 #: share/functions/__fish_complete_vi.fish:62
-#, fuzzy
 msgid "Start in easy mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Starta gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:44
 #: share/functions/__fish_complete_vi.fish:63
-#, fuzzy
 msgid "Start in restricted mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Inskränkt läge"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:45
 #: share/functions/__fish_complete_vi.fish:65
@@ -53948,12 +52440,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:49
 #: share/functions/__fish_complete_vi.fish:70
-#, fuzzy
 msgid "Do not expand wildcards"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Expandera inte mönster"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:50
 #: share/functions/__fish_complete_vi.fish:71
@@ -53968,30 +52456,18 @@ msgstr ""
 #: share/functions/__fish_complete_vi.fish:75
 #: share/functions/__fish_complete_vi.fish:76
 #: share/functions/__fish_complete_vi.fish:77
-#, fuzzy
 msgid "Edit files on Vim server"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Redigera filer på plats"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:52
 #: share/functions/__fish_complete_vi.fish:73
-#, fuzzy
 msgid "Evaluate expr on Vim server"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför argument som kommandon"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:53
 #: share/functions/__fish_complete_vi.fish:74
-#, fuzzy
 msgid "Send keys to Vim server"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skicka e-post till användare"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:57
 #: share/functions/__fish_complete_vi.fish:78
@@ -54000,21 +52476,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/vim.fish:58
 #: share/functions/__fish_complete_vi.fish:79
-#, fuzzy
 msgid "Set server name"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Namn på tjänst"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:59
 #: share/functions/__fish_complete_vi.fish:80
-#, fuzzy
 msgid "Print version information and exit"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa version och avsluta"
 
 #: /tmp/fish/implicit/share/completions/vim.fish:60
 msgid "Run gvim in another window (GTK GUI only)"
@@ -54022,21 +52490,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:1
 #: share/completions/wajig.fish:1
-#, fuzzy
 msgid "Test if wajig has yet to be given the subcommand"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om apt har tagit emot ett underkommando"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:2
 #: share/completions/wajig.fish:10
-#, fuzzy
 msgid "Test if wajig command should have packages as potential completion"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Testa om aptkommando borde ha paket som potentiell komplettering"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:4
 msgid "Do system commands everything quietly."
@@ -54327,12 +52787,8 @@ msgstr ""
 #: /tmp/fish/implicit/share/completions/wajig.fish:75
 #: /tmp/fish/implicit/share/completions/wajig.fish:89
 #: share/completions/wajig.fish:105
-#, fuzzy
 msgid "Generate a .deb file for an installed package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bygg och installera ett installerat paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:76
 msgid "From preferences file show priorities/policy (available)"
@@ -54356,12 +52812,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:81
 #: share/completions/wajig.fish:97
-#, fuzzy
 msgid "Download package and any packages it depends on"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paket som detta paket beror på"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:83
 #: share/completions/wajig.fish:99
@@ -54370,12 +52822,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:84
 #: share/completions/wajig.fish:100
-#, fuzzy
 msgid "Reinstall each of the named packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera ett eller flera paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:85
 #: share/completions/wajig.fish:101
@@ -54384,12 +52832,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:86
 #: share/completions/wajig.fish:102
-#, fuzzy
 msgid "Remove one or more packages (see also purge)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera ett eller flera paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:87
 #: share/completions/wajig.fish:103
@@ -54408,12 +52852,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:92
 #: share/completions/wajig.fish:108
-#, fuzzy
 msgid "Install a RedHat .rpm package"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:93
 #: share/completions/wajig.fish:109
@@ -54422,12 +52862,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:94
 #: share/completions/wajig.fish:110
-#, fuzzy
 msgid "Search for packages containing listed words"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:95
 #: share/completions/wajig.fish:111
@@ -54477,12 +52913,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:105
 #: share/completions/wajig.fish:121
-#, fuzzy
 msgid "Retrieve and unpack sources for the named packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa paket som beror på det givna paketet"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:106
 #: share/completions/wajig.fish:122
@@ -54491,12 +52923,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:107
 #: share/completions/wajig.fish:123
-#, fuzzy
 msgid "Show the version and available version of packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa fulla versioner för paket"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:108
 #: /tmp/fish/implicit/share/completions/wajig.fish:109
@@ -54516,12 +52944,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:113
 #: share/completions/wajig.fish:129
-#, fuzzy
 msgid "List packages with newer versions available for upgrading"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Uppdaterar till den bästa tillgängliga versionen"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:114
 #: share/completions/wajig.fish:130
@@ -54530,12 +52954,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:116
 #: share/completions/wajig.fish:132
-#, fuzzy
 msgid "Update the list of down-loadable packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Updatera källkodpaketlista"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:117
 #: share/completions/wajig.fish:133
@@ -54559,21 +52979,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:121
 #: share/completions/wajig.fish:137
-#, fuzzy
 msgid "List version and distribution of (all) packages."
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Verifiera inga attribut i paketfiler"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:122
 #: share/completions/wajig.fish:138
-#, fuzzy
 msgid "A synonym for describe"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Synonym för -i"
 
 #: /tmp/fish/implicit/share/completions/wajig.fish:123
 #: share/completions/wajig.fish:139
@@ -54918,21 +53330,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:4
 #: share/completions/wpa_cli.fish:6
-#, fuzzy
 msgid "show interfaces/select interface"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj gränssnitt"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:5
 #: share/completions/wpa_cli.fish:7
-#, fuzzy
 msgid "change debug level"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj debugnivå"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:6
 #: share/completions/wpa_cli.fish:8
@@ -54951,12 +53355,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:9
 #: share/completions/wpa_cli.fish:11
-#, fuzzy
 msgid "set/list variables"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera variabel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:10
 #: share/completions/wpa_cli.fish:12
@@ -54965,12 +53365,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:11
 #: share/completions/wpa_cli.fish:13
-#, fuzzy
 msgid "force reassociation"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tvinga namn/revision-association"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:12
 #: share/completions/wpa_cli.fish:14
@@ -54979,12 +53375,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:13
 #: share/completions/wpa_cli.fish:15
-#, fuzzy
 msgid "force preauthentication"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tvinga pseudo-tty-allokering"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:14
 #: share/completions/wpa_cli.fish:16
@@ -55003,12 +53395,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:17
 #: share/completions/wpa_cli.fish:19
-#, fuzzy
 msgid "configure pin for an SSID"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Konfiurera för att bygga på given målarkitektur"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:18
 #: share/completions/wpa_cli.fish:20
@@ -55037,39 +53425,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:23
 #: share/completions/wpa_cli.fish:25
-#, fuzzy
 msgid "enable a network"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Aktivera förråd"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:24
 #: share/completions/wpa_cli.fish:26
-#, fuzzy
 msgid "disable a network"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Inaktivera förråd"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:25
 #: share/completions/wpa_cli.fish:27
-#, fuzzy
 msgid "add a network"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till ny nyckel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:26
 #: share/completions/wpa_cli.fish:28
-#, fuzzy
 msgid "remove a network"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ta bort en nyckel"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:27
 #: share/completions/wpa_cli.fish:29
@@ -55078,21 +53450,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:28
 #: share/completions/wpa_cli.fish:30
-#, fuzzy
 msgid "get network variables"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj CVS-användare"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:29
 #: share/completions/wpa_cli.fish:31
-#, fuzzy
 msgid "save the current configuration"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ladda om konfiguration för tjänst"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:30
 #: share/completions/wpa_cli.fish:32
@@ -55111,12 +53475,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:33
 #: share/completions/wpa_cli.fish:35
-#, fuzzy
 msgid "get capabilies"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj spellista"
 
 #: /tmp/fish/implicit/share/completions/wpa_cli.fish:34
 #: share/completions/wpa_cli.fish:36
@@ -55357,24 +53717,16 @@ msgid "Show summary of options"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:2
-#, fuzzy
 msgid "Select XMMS session (Default: 0)"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj via sessions-id"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:3
 msgid "Skip backwards in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:4
-#, fuzzy
 msgid "Start playing current playlist"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa eller redigera alla resursanvändningsgränser"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:5
 msgid "Pause current song"
@@ -55393,12 +53745,8 @@ msgid "Skip forward in playlist"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:9
-#, fuzzy
 msgid "Don't clear the playlist"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj spellista"
 
 #: /tmp/fish/implicit/share/completions/xmms.fish:10
 msgid "Show the main window"
@@ -55409,12 +53757,8 @@ msgid "Set the initial window geometry"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:2
-#, fuzzy
 msgid "Set the window title"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj nätverkstimeout"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:3
 msgid "Install a private colormap"
@@ -55425,20 +53769,12 @@ msgid "Set the size of the largest RGB cube xpdf will try to allocate"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:5
-#, fuzzy
 msgid "Set reverse video mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Serverläge"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:6
-#, fuzzy
 msgid "Set the background of the page display"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skapa fönster på angiven skärm"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:7
 msgid "Set the color for background outside the page area"
@@ -55465,20 +53801,12 @@ msgid "Enable or disable font anti-aliasing (Default: yes)"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:13
-#, fuzzy
 msgid "Set the default file name for PostScript output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange standardnyckelordssubstitution"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:14
-#, fuzzy
 msgid "Set the paper size"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj uttags (socket) buffertstorlek"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:15
 msgid "Set the paper width, in points"
@@ -55489,44 +53817,24 @@ msgid "Set the paper height, in points"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:17
-#, fuzzy
 msgid "Generate Level 1 PostScript"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Generera utdata för dired"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:18
-#, fuzzy
 msgid "Sets the encoding to use for text output"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Varken tyst eller utförligt läge"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:19
-#, fuzzy
 msgid "Sets the end-of-line convention to use"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sätt slut-på-fil-strängen till angiven sträng"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:20
-#, fuzzy
 msgid "Specify the owner password for the PDF file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj proxylösenord"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:21
-#, fuzzy
 msgid "Specify the user password for the PDF file"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj proxylösenord"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:22
 msgid "Open xpdf in full-screen mode"
@@ -55549,24 +53857,16 @@ msgid "Kill xpdf remote server"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:27
-#, fuzzy
 msgid "Print commands as they're executed"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv kommandon till standard fel"
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:29
 msgid "Specify config file to use instead of ~/.xpdfrc"
 msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xpdf.fish:30
-#, fuzzy
 msgid "Print copyright and version information"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ignorera all versionsinformation"
 
 #: share/completions/xprop.fish:4
 msgid "Select window by id"
@@ -56249,12 +54549,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:101
 #: share/completions/xterm.fish:107
-#, fuzzy
 msgid "xterm encoding"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tvinga kodning"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:102
 #: share/completions/xterm.fish:108
@@ -56273,12 +54569,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:105
 #: share/completions/xterm.fish:111
-#, fuzzy
 msgid "Font for active icons"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tvinga interaktivt läge"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:106
 #: share/completions/xterm.fish:112
@@ -56307,21 +54599,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:111
 #: share/completions/xterm.fish:117
-#, fuzzy
 msgid "Embed xterm into window"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa trådar"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:112
 #: share/completions/xterm.fish:118
-#, fuzzy
 msgid "Set keyboard type"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange posttyp"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:113
 #: share/completions/xterm.fish:119
@@ -56330,12 +54614,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:114
 #: share/completions/xterm.fish:120
-#, fuzzy
 msgid "Log filename"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Logga till fil"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:115
 #: share/completions/xterm.fish:121
@@ -56354,39 +54634,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:118
 #: share/completions/xterm.fish:124
-#, fuzzy
 msgid "Number of scrolled off lines"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Numrera alla rader"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:119
 #: share/completions/xterm.fish:125
-#, fuzzy
 msgid "Terminal identification"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa all information"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:121
 #: share/completions/xterm.fish:127
-#, fuzzy
 msgid "zIconBeep percentage"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa filposition i procent i prompten"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:122
 #: share/completions/xterm.fish:129
-#, fuzzy
 msgid "Size of the inner border"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringar i omvänd ordning"
 
 #: /tmp/fish/implicit/share/completions/xterm.fish:123
 msgid "Use jump scrolling"
@@ -56846,30 +55110,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/yum.fish:32
 #: share/completions/yum.fish:53
-#, fuzzy
 msgid "Delete cached package files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera obsoleta paketfiler"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:33
 #: share/completions/yum.fish:54
-#, fuzzy
 msgid "Delete cached header files"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera urval"
 
 #: /tmp/fish/implicit/share/completions/yum.fish:34
 #: share/completions/yum.fish:55
-#, fuzzy
 msgid "Delete all cache contents"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera logfil"
 
 #: /tmp/fish/implicit/share/completions/zfs.fish:1
 msgid ""
@@ -57964,57 +56216,33 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:7
 #: share/completions/zypper.fish:33
-#, fuzzy
 msgid "Add a new repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Uppdatera förråd"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:8
 #: share/completions/zypper.fish:34
-#, fuzzy
 msgid "Remove specified repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:9
 #: share/completions/zypper.fish:35
-#, fuzzy
 msgid "Rename specified repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Reparera trasigt förråd"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:10
 #: share/completions/zypper.fish:36
-#, fuzzy
 msgid "Modify specified repository"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ange förråd-URL"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:11
 #: share/completions/zypper.fish:37
-#, fuzzy
 msgid "Refresh all repositories"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skrivskyddat förråd-läge"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:12
 #: share/completions/zypper.fish:38
-#, fuzzy
 msgid "Clean local caches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Rengör lokala cachear och paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:13
 #: share/completions/zypper.fish:39
@@ -58023,30 +56251,18 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:14
 #: share/completions/zypper.fish:40
-#, fuzzy
 msgid "Add a new service"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lägg till ny nyckel"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:15
 #: share/completions/zypper.fish:41
-#, fuzzy
 msgid "Modify specified service"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd angiven nyckelserver"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:16
 #: share/completions/zypper.fish:42
-#, fuzzy
 msgid "Remove specified service"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Använd angiven nyckelserver"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:17
 #: share/completions/zypper.fish:43
@@ -58055,211 +56271,118 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:20
 #: share/completions/zypper.fish:46
-#, fuzzy
 msgid "Verify integrity of package dependencies"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera/ta bort paket för beroenden"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:21
 #: share/completions/zypper.fish:47
-#, fuzzy
 msgid "Install source packages and their build dependencies"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera/ta bort paket för beroenden"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:22
 #: share/completions/zypper.fish:48
-#, fuzzy
 msgid "Install newly added packages recommended by installed packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera paket även om de ersätter filer från andra, redan installerade "
-"paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:23
 #: share/completions/zypper.fish:49
-#, fuzzy
 msgid "Update installed packages with newer versions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla källkodspaket med version"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:24
 #: share/completions/zypper.fish:50
-#, fuzzy
 msgid "List available updates"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa tillgängliga paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:25
 #: share/completions/zypper.fish:51
-#, fuzzy
 msgid "Install needed patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Installera nytt paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:26
 #: share/completions/zypper.fish:52
-#, fuzzy
 msgid "List needed patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa byteavstånd för matchningar"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:27
 #: share/completions/zypper.fish:53
-#, fuzzy
 msgid "Perform a distribution upgrade"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Utför en simulering"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:28
 #: share/completions/zypper.fish:54
-#, fuzzy
 msgid "Check for patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Dekomprimera fixar"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:29
 #: share/completions/zypper.fish:55
-#, fuzzy
 msgid "Search for packages matching a pattern"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Sök paket innehållande mönster"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:30
 #: share/completions/zypper.fish:56
-#, fuzzy
 msgid "Show full information for specified packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa fulla versioner för paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:31
 #: share/completions/zypper.fish:57
-#, fuzzy
 msgid "Show full information for specified patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:32
 #: share/completions/zypper.fish:58
-#, fuzzy
 msgid "Show full information for specified patterns"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa inte filer som matchar mönster"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:33
 #: share/completions/zypper.fish:59
-#, fuzzy
 msgid "Show full information for specified products"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv profileringsinformation till angiven fil"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:34
 #: share/completions/zypper.fish:60
-#, fuzzy
 msgid "List all available patches"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:35
 #: share/completions/zypper.fish:61
-#, fuzzy
 msgid "List all available packages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Ominstallera paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:36
 #: share/completions/zypper.fish:62
-#, fuzzy
 msgid "List all available patterns"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:37
 #: share/completions/zypper.fish:63
-#, fuzzy
 msgid "List all available products"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:38
 #: share/completions/zypper.fish:64
-#, fuzzy
 msgid "List packages providing specified capability"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Fråga alla paket som tillhandahåller den angivna förmågan"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:39
 #: share/completions/zypper.fish:65
-#, fuzzy
 msgid "Add a package lock"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bygg om paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:40
 #: share/completions/zypper.fish:66
-#, fuzzy
 msgid "Remove a package lock"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:41
 #: share/completions/zypper.fish:67
-#, fuzzy
 msgid "List current package locks"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Lista buggar från paket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:42
 #: share/completions/zypper.fish:68
-#, fuzzy
 msgid "Remove unused locks"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Radera källkodpaket"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:43
 #: share/completions/zypper.fish:69
@@ -58268,12 +56391,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:44
 #: share/completions/zypper.fish:70
-#, fuzzy
 msgid "Print the target operating system ID string"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa operativsystem"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:45
 #: share/completions/zypper.fish:71
@@ -58282,12 +56401,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:46
 #: share/completions/zypper.fish:72
-#, fuzzy
 msgid "Download source rpms for all installed packages to a local directory"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Nedstig aldrig i föräldrakatalog"
 
 #: /tmp/fish/implicit/share/completions/zypper.fish:48
 msgid "Output the version number"
@@ -59139,12 +57254,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/_.fish:1 share/functions/_.fish:8
 #: share/functions/_.fish:12
-#, fuzzy
 msgid "Alias for the gettext command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Hjälp för det angivna kommandot"
 
 #: /tmp/fish/implicit/share/functions/_.fish:2
 msgid "Fallback alias for the gettext command"
@@ -59160,12 +57271,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_atool_archive_contents.fish:1
 #: share/functions/__fish_complete_atool_archive_contents.fish:1
-#, fuzzy
 msgid "List archive contents"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa arkivinnehåll"
 
 #: share/functions/__fish_complete_bittorrent.fish:9
 msgid "IP to report to the tracker"
@@ -59190,12 +57297,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_convert_options.fish:1
 #: share/functions/__fish_complete_convert_options.fish:1
-#, fuzzy
 msgid "Complete Convert options"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_directories.fish:1
 msgid "Complete directory prefixes"
@@ -59336,21 +57439,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_lpr_option.fish:1
 #: share/functions/__fish_complete_lpr_option.fish:1
-#, fuzzy
 msgid "Complete lpr option"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_path.fish:1
 #: share/functions/__fish_complete_path.fish:1
-#, fuzzy
 msgid "Complete using path"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Tolerera slarviga monteringsflaggor"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_pgrep.fish:1
 msgid "Complete pgrep/pkill"
@@ -59423,12 +57518,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_proc.fish:1
 #: share/functions/__fish_complete_proc.fish:1
-#, fuzzy
 msgid "Complete by list of running processes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa lista på alla körande screen-sessioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:1
 msgid "common completions for ssh commands"
@@ -59436,21 +57527,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:2
 #: share/functions/__fish_complete_ssh.fish:4
-#, fuzzy
 msgid "Protocol version 1 only"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bara protokoll version 1"
 
 #: /tmp/fish/implicit/share/functions/__fish_complete_ssh.fish:3
 #: share/functions/__fish_complete_ssh.fish:5
-#, fuzzy
 msgid "Protocol version 2 only"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Bara protokoll version 2"
 
 #: share/functions/__fish_complete_ssh.fish:6
 msgid "IPv4 addresses only"
@@ -59530,12 +57613,8 @@ msgstr "Händelsehanterare, ritar om prompten när fish_color_cwd ändras"
 
 #: /tmp/fish/implicit/share/functions/__fish_config_interactive.fish:3
 #: share/functions/__fish_config_interactive.fish:137
-#, fuzzy
 msgid "Event handler, repaints the prompt when fish_color_cwd_root changes"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Händelsehanterare, ritar om prompten när fish_color_cwd ändras"
 
 #: share/functions/__fish_config_interactive.fish:149
 msgid "Start service"
@@ -59597,7 +57676,22 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
+<<<<<<< HEAD
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
+=======
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
+#: share/functions/__fish_git_prompt.fish:173
+msgid "Helper function for __fish_git_prompt"
+msgstr ""
+
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
+#: share/functions/__fish_git_prompt.fish:348
+msgid "Prompt function for Git"
+msgstr ""
+
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
+#: share/functions/__fish_git_prompt.fish:458
+>>>>>>> Remove all fuzzy translations (see also #6418)
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
@@ -59621,6 +57715,24 @@ msgstr ""
 msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
+<<<<<<< HEAD
+=======
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
+#: share/functions/__fish_git_prompt.fish:730
+msgid "Event handler, repaints prompt when functionality changes"
+msgstr ""
+
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
+#: share/functions/__fish_git_prompt.fish:748
+msgid "Event handler, repaints prompt when any color changes"
+msgstr ""
+
+#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
+#: share/functions/__fish_git_prompt.fish:768
+msgid "Event handler, repaints prompt when any char changes"
+msgstr ""
+
+>>>>>>> Remove all fuzzy translations (see also #6418)
 #: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1
 msgid ""
 "Wrapper for the complete built-in. Skips the long completions on non-GNU "
@@ -59629,12 +57741,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_hg_prompt.fish:1
 #: share/functions/__fish_hg_prompt.fish:23
-#, fuzzy
 msgid "Write out the hg prompt"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv prompten"
 
 #: /tmp/fish/implicit/share/functions/fish_hybrid_key_bindings.fish:1
 msgid "Vi-style bindings that inherit emacs-style bindings in all modes"
@@ -59675,21 +57783,13 @@ msgid "List names of available signals"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_make_completion_signals.fish:3
-#, fuzzy
 msgid "List codes and names of available signals"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namnen på alla tillgängliga signaler"
 
 #: /tmp/fish/implicit/share/functions/fish_mode_prompt.fish:1
 #: share/functions/fish_vi_prompt.fish:1
-#, fuzzy
 msgid "Displays the current mode"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa säkerhetskontext"
 
 #: /tmp/fish/implicit/share/functions/__fish_move_last.fish:1
 msgid "Move the last element of a directory history from src to dest"
@@ -59709,21 +57809,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_addresses.fish:1
 #: share/functions/__fish_print_addresses.fish:1
-#, fuzzy
 msgid "Print a list of known network addresses"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa lista på alla körande screen-sessioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_commands.fish:1
 #: share/functions/__fish_print_commands.fish:1
-#, fuzzy
 msgid "Print a list of documented fish commands"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_encodings.fish:1
 msgid "Complete using available character encodings"
@@ -59748,39 +57840,23 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_interfaces.fish:1
 #: share/functions/__fish_print_interfaces.fish:1
-#, fuzzy
 msgid "Print a list of known network interfaces"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_options.fish:1
 #: share/functions/__fish_print_lpr_options.fish:1
-#, fuzzy
 msgid "Print lpr options"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla versioner"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_lpr_printers.fish:1
 #: share/functions/__fish_print_lpr_printers.fish:1
-#, fuzzy
 msgid "Print lpr printers"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa fulla poster"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_mounted.fish:1
 #: share/functions/__fish_print_mounted.fish:1
-#, fuzzy
 msgid "Print mounted devices"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa viktiga beroenden"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_pacman_repos.fish:1
 msgid "Print the repositories configured for arch's pacman package manager"
@@ -59792,21 +57868,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_svn_rev.fish:1
 #: share/functions/__fish_print_svn_rev.fish:1
-#, fuzzy
 msgid "Print svn revisions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv bara ut angiven revision"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_users.fish:1
 #: share/functions/__fish_print_users.fish:2
-#, fuzzy
 msgid "Print a list of local users"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa en lista på alla tillåtna färgnamn"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_applications_directories.fish:1
 msgid "Print directories where desktop files are stored"
@@ -59814,21 +57882,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xdg_mimetypes.fish:1
 #: share/functions/__fish_print_xdg_mimetypes.fish:1
-#, fuzzy
 msgid "Print XDG mime types"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv ut kommandotyp"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_xwindows.fish:1
 #: share/functions/__fish_print_xwindows.fish:1
-#, fuzzy
 msgid "Print X windows"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa APM-information"
 
 #: /tmp/fish/implicit/share/functions/__fish_print_zfs_snapshots.fish:1
 msgid "Lists ZFS snapshots"
@@ -59841,12 +57901,8 @@ msgstr "Skriv prompten"
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:1
 #: /tmp/fish/implicit/share/functions/__fish_pwd.fish:2
 #: share/functions/__fish_pwd.fish:3 share/functions/__fish_pwd.fish:7
-#, fuzzy
 msgid "Show current path"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla källkodspaket"
 
 #: /tmp/fish/implicit/share/functions/__fish_sgrep.fish:1
 msgid "Call grep without honoring GREP_OPTIONS settings"
@@ -59878,12 +57934,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_update_completions.fish:1
 #: share/functions/fish_update_completions.fish:1
-#, fuzzy
 msgid "Update man-page based completions"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Redigera kommando-specifika kompletteringar"
 
 #: /tmp/fish/implicit/share/functions/__fish_use_subcommand.fish:1
 msgid "Test if a non-switch argument has been given in the current commandline"
@@ -59899,21 +57951,13 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/fish_vi_key_bindings.fish:1
 #: share/functions/fish_vi_key_bindings.fish:1
-#, fuzzy
 msgid "vi-like key bindings for fish"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Välj fil med tangentbordsgenvägar"
 
 #: /tmp/fish/implicit/share/functions/funced.fish:1
 #: share/functions/funced.fish:1
-#, fuzzy
 msgid "Edit function definition"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"funktionsdefinition-block"
 
 #: /tmp/fish/implicit/share/functions/funcsave.fish:1
 #: share/functions/funcsave.fish:2
@@ -59951,12 +57995,8 @@ msgid "List contents of directory"
 msgstr "Visa kataloginnehåll"
 
 #: /tmp/fish/implicit/share/functions/man.fish:1 share/functions/man.fish:1
-#, fuzzy
 msgid "Format and display the on-line manual pages"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa ändringsinformation för paket"
 
 #: share/functions/nextd.fish:2
 msgid "Move forward in the directory history"
@@ -59980,12 +58020,8 @@ msgstr "Gå bakåt i kataloghistorik"
 
 #: /tmp/fish/implicit/share/functions/prompt_pwd.fish:1
 #: share/functions/prompt_pwd.fish:11
-#, fuzzy
 msgid "Print the current working directory, shortened to fit the prompt"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa aktuell arbetskatalog, förkortad till att passa i kommandoraden"
 
 #: share/functions/psub.fish:3
 msgid ""
@@ -60012,20 +58048,12 @@ msgid "return an absolute path without symlinks"
 msgstr ""
 
 #: /tmp/fish/implicit/share/functions/seq.fish:1 share/functions/seq.fish:7
-#, fuzzy
 msgid "Print sequences of numbers"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa namn, inte nummer"
 
 #: /tmp/fish/implicit/share/functions/seq.fish:2 share/functions/seq.fish:11
-#, fuzzy
 msgid "Fallback implementation of the seq command"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Visa alla möjliga kompletteringar för det angivna commandot"
 
 #: /tmp/fish/implicit/share/functions/setenv.fish:1
 msgid "Set an env var for csh compatibility."
@@ -60037,12 +58065,8 @@ msgstr ""
 
 #: /tmp/fish/implicit/share/functions/__terlar_git_prompt.fish:1
 #: share/functions/__terlar_git_prompt.fish:23
-#, fuzzy
 msgid "Write out the git prompt"
 msgstr ""
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"#-#-#-#-#  sv.po (fish 1.22.3)  #-#-#-#-#\n"
-"Skriv prompten"
 
 #: /tmp/fish/implicit/share/functions/trap.fish:1
 msgid "Perform an action when the shell receives a signal"
@@ -60107,9 +58131,9 @@ msgstr ""
 "och kan inte användas som funktionsnamn\n"
 
 #: builtin.cpp:2248
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: No function name given\n"
-msgstr "%ls: Inget funktionsnamn givet\n"
+msgstr ""
 
 #: builtin.cpp:2276
 #, c-format
@@ -60127,9 +58151,9 @@ msgid "%ls: Expected zero or one argument, got %d\n"
 msgstr "%ls: Förväntade noll eller ett argument, fick %d\n"
 
 #: builtin.cpp:2656
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: --array option requires a single variable name.\n"
-msgstr "%ls: --array flaggan kräver ett enskilt variablenamn.\n"
+msgstr ""
 
 #: builtin.cpp:3688
 msgid "(default)"
@@ -60173,9 +58197,9 @@ msgstr ""
 "'%ls'existerar readn.\n"
 
 #: builtin_set_color.cpp:173
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: Could not set up terminal\n"
-msgstr "%ls: Kunde inte initiera terminalen\n"
+msgstr ""
 
 #: complete.cpp:901 complete.cpp:919
 msgid "Unknown option: "
@@ -60296,37 +58320,29 @@ msgid "%lsand 1 more row"
 msgstr "%lsoch 1 rad till"
 
 #: parse_execution.cpp:799
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unknown command '%ls'. Did you mean to run %ls with a modified environment? "
 "Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing "
 "'help set'."
 msgstr ""
-"Okänt kommando '%ls'. Menade du 'set %ls %ls'? För mer information om hur "
-"man tilldelar variabler, se hjälpsektionen om det inbyggda kommandot 'set' "
-"genom att skriva 'help set'."
 
 #: parse_execution.cpp:824
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Variables may not be used as commands. Instead, define a function like "
 "'function %ls; %ls $argv; end' or use the eval builtin instead, like 'eval "
 "%ls'. See the help section for the function command by typing 'help "
 "function'."
 msgstr ""
-"Variabler får inte användas som kommandon. Definera istället en funktion, t."
-"ex. 'function %ls; %ls $argv; end'. Se hjälpsektionen för function-kommandot "
-"genom att skriva 'help function'"
 
 #: parse_execution.cpp:833
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Variables may not be used as commands. Instead, define a function or use the "
 "eval builtin instead, like 'eval %ls'. See the help section for the function "
 "command by typing 'help function'."
 msgstr ""
-"Variabler får inte användas som kommandon. Definera istället en funktion. Se "
-"hjälpsektionen för function-kommandot genom att skriva 'help function'"
 
 #: parse_execution.cpp:841
 #, c-format
@@ -60360,9 +58376,9 @@ msgid "End of block mismatch. Program terminating."
 msgstr "Blockslut matchar inte. Programmet avslutas."
 
 #: proc.cpp:690
-#, fuzzy, c-format
+#, c-format
 msgid "'%ls' has %ls"
-msgstr "Jobb %d, '%ls' har %ls"
+msgstr ""
 
 #: proc.cpp:694
 #, c-format
@@ -60483,9 +58499,9 @@ msgid "%ls: can only take 'if' and then another command as an argument\n"
 msgstr ""
 
 #: builtin.h:78
-#, fuzzy, c-format
+#, c-format
 msgid "%ls: any second argument must be 'if'\n"
-msgstr "%ls: Andra argumentet måste vara 'in'\n"
+msgstr ""
 
 #: builtin.h:88
 #, c-format
@@ -60502,36 +58518,26 @@ msgid "Array index out of bounds"
 msgstr "Arrayindexet är otållåtet"
 
 #: parse_constants.h:192
-#, fuzzy
 msgid ""
 "Expected a command, but instead found a pipe. Did you mean 'COMMAND; or "
 "COMMAND'? See the help section for the 'or' builtin command by typing 'help "
 "or'."
 msgstr ""
-"Förväntade att hitta ett kommandonamn, hittade en symbol av typen '%ls'. "
-"Menade du 'KOMMANDO; or KOMMANDO'? Se hjälpsektionen om 'or' genom att "
-"skriva 'help or'."
 
 #: parse_constants.h:195
-#, fuzzy
 msgid ""
 "Expected a command, but instead found an '&'. Did you mean 'COMMAND; and "
 "COMMAND'? See the help section for the 'and' builtin command by typing 'help "
 "and'."
 msgstr ""
-"Förväntade att hitta ett kommandonamn, hittade en symbol av typen '%ls'. "
-"Menade du 'KOMMANDO; and KOMMANDO'? Se hjälpsektionen om 'and' genom att "
-"skriva 'help and'."
 
 #: parse_constants.h:216
-#, fuzzy
 msgid "break command while not inside of loop"
-msgstr "Loopstyrningskommandon får bara användas i loopar."
+msgstr ""
 
 #: parse_constants.h:219
-#, fuzzy
 msgid "continue command while not inside of loop"
-msgstr "Loopstyrningskommandon får bara användas i loopar."
+msgstr ""
 
 #: parse_constants.h:222
 msgid "'return' builtin command outside of function definition"
@@ -60539,14 +58545,11 @@ msgstr ""
 "Det inbyggda kommandot 'return' påträffades utanför en funktionsdefinition"
 
 #: parse_constants.h:225
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unknown command '%ls'. Did you mean 'set %ls %ls'? See the help section on "
 "the set command by typing 'help set'."
 msgstr ""
-"Okänt kommando '%ls'. Menade du 'set %ls %ls'? För mer information om hur "
-"man tilldelar variabler, se hjälpsektionen om det inbyggda kommandot 'set' "
-"genom att skriva 'help set'."
 
 #: parse_constants.h:230
 #, c-format
@@ -60622,14 +58625,12 @@ msgid "Set security context of copy to CONTEXT"
 msgstr "Ange säkerhetskontext för kopia"
 
 #: share/completions/cvs.fish:26
-#, fuzzy
 msgid "Use \\tmpdir for temporary files."
-msgstr "Välj temporär katalog"
+msgstr ""
 
 #: share/completions/cvs.fish:27
-#, fuzzy
 msgid "Use \\editor for editing log information."
-msgstr "Välj editor för loginformationsredigering"
+msgstr ""
 
 #: share/completions/cvs.fish:28
 #, sh-format
@@ -60637,19 +58638,16 @@ msgid "Overrides $CVSROOT as the root of the CVS tree."
 msgstr ""
 
 #: share/completions/cvs.fish:30
-#, fuzzy
 msgid "Request compression level \\# for net traffic."
-msgstr "Kompressionsnivå för nätverkstrafik"
+msgstr ""
 
 #: share/completions/cvs.fish:52
-#, fuzzy
 msgid "Create a CVS repository if it doesn\\t"
-msgstr "Skapa förråd om det inte redan existerar"
+msgstr ""
 
 #: share/completions/cvs.fish:97
-#, fuzzy
 msgid "Replace revision\\s"
-msgstr "Slå ihop revisioner"
+msgstr ""
 
 #: share/completions/darcs.fish:44
 msgid ""
@@ -60658,9 +58656,8 @@ msgid ""
 msgstr ""
 
 #: share/completions/darcs.fish:171
-#, fuzzy
 msgid "Define token to contain these characters"
-msgstr "Dela inte multibytesekvenser"
+msgstr ""
 
 #: share/completions/darcs.fish:501
 msgid "Shell command that runs regression tests"
@@ -60703,24 +58700,20 @@ msgid "Call DCOP for each line read from stdin"
 msgstr "Anropa DCOP för varje rad läst från standard in"
 
 #: share/completions/df.fish:17
-#, fuzzy
 msgid "Show file systems of specified type"
-msgstr "Visa filsystem av angiven typ"
+msgstr ""
 
 #: share/completions/docker.fish:19
-#, fuzzy
 msgid "Show all containers"
-msgstr "Visa ARP-inlägg"
+msgstr ""
 
 #: share/completions/docker.fish:24
-#, fuzzy
 msgid "Show the running containers"
-msgstr "Visa dolda funktioner"
+msgstr ""
 
 #: share/completions/docker.fish:28
-#, fuzzy
 msgid "Show the exited containers"
-msgstr "Visa tid"
+msgstr ""
 
 #: share/completions/docker.fish:70 share/completions/docker.fish:92
 msgid "Docker container"
@@ -60753,38 +58746,32 @@ msgid ""
 msgstr ""
 
 #: share/completions/gem.fish:87
-#, fuzzy
 msgid "display the package version"
-msgstr "Visa paketpost"
+msgstr ""
 
 #: share/completions/gem.fish:87
 msgid "display the path where gems are installed"
 msgstr ""
 
 #: share/completions/gem.fish:87
-#, fuzzy
 msgid "display path used to search for gems"
-msgstr "Visa sessionsnyckel som används för ett meddelande"
+msgstr ""
 
 #: share/completions/gem.fish:87
-#, fuzzy
 msgid "display the gem format version"
-msgstr "Visa uppdateringsinformation"
+msgstr ""
 
 #: share/completions/gem.fish:92
-#, fuzzy
 msgid "list all 'gem' commands"
-msgstr "Inaktivera kommando"
+msgstr ""
 
 #: share/completions/git.fish:98
-#, fuzzy
 msgid "name"
-msgstr "Användarnamn"
+msgstr ""
 
 #: share/completions/help.fish:6
-#, fuzzy
 msgid "Help for this command"
-msgstr "Välj promptkommando"
+msgstr ""
 
 #: share/completions/help.fish:10
 msgid "Incomplete aspects of fish"
@@ -60868,43 +58855,36 @@ msgid "Match history items that contain the given string"
 msgstr ""
 
 #: share/completions/obnam.fish:9
-#, fuzzy
 msgid "Adds an encryption key to the repository"
-msgstr "Lägg till fil/katalog till förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:11
 msgid "Lists the keys associated with each client"
 msgstr ""
 
 #: share/completions/obnam.fish:12
-#, fuzzy
 msgid "Lists the clients in the repository"
-msgstr "Uppdatera förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:13
-#, fuzzy
 msgid "Compares two generations"
-msgstr "Tolerera slarviga monteringsflaggor"
+msgstr ""
 
 #: share/completions/obnam.fish:14
-#, fuzzy
 msgid "Dumps the repository"
-msgstr "Uppdatera förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:15
-#, fuzzy
 msgid "Removes a lock file for a client"
-msgstr "Ta bort alla gz-filer från cache"
+msgstr ""
 
 #: share/completions/obnam.fish:16
-#, fuzzy
 msgid "Removes backup generations"
-msgstr "Ta bort komplettering"
+msgstr ""
 
 #: share/completions/obnam.fish:17
-#, fuzzy
 msgid "Checks the consistency of the repository"
-msgstr "Kontrollera hela lagret"
+msgstr ""
 
 #: share/completions/obnam.fish:18
 msgid "Lists every backup generation"
@@ -60915,48 +58895,40 @@ msgid "Lists the identifier for every generation"
 msgstr ""
 
 #: share/completions/obnam.fish:20
-#, fuzzy
 msgid "Lists the keys"
-msgstr "Visa pålitliga nycklar"
+msgstr ""
 
 #: share/completions/obnam.fish:21
-#, fuzzy
 msgid "Lists the toplevel keys"
-msgstr "Visa pålitliga nycklar"
+msgstr ""
 
 #: share/completions/obnam.fish:22
-#, fuzzy
 msgid "Lists the contents of a given generation"
-msgstr "Visa kataloginnehåll"
+msgstr ""
 
 #: share/completions/obnam.fish:23
-#, fuzzy
 msgid "Makes the repository available via FUSE"
-msgstr "Uppdatera förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:24
 msgid "Check if a backup age exceeds a threshold"
 msgstr ""
 
 #: share/completions/obnam.fish:25
-#, fuzzy
 msgid "Removes a client from the repository"
-msgstr "Ange förråd-URL"
+msgstr ""
 
 #: share/completions/obnam.fish:26
-#, fuzzy
 msgid "Removes a key from the repository"
-msgstr "Skapa lokal kopia av förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:27
-#, fuzzy
 msgid "Restore files from the repository"
-msgstr "Checka in filer till förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:28
-#, fuzzy
 msgid "Verifies files in the repository"
-msgstr "Checka in filer till förråd"
+msgstr ""
 
 #: share/completions/obnam.fish:87
 msgid "Do not check data for cient NAME."
@@ -61032,9 +59004,8 @@ msgid "Complete atool"
 msgstr ""
 
 #: share/functions/__fish_complete_grep.fish:48
-#, fuzzy
 msgid "Obsolete synonym for -i"
-msgstr "Synonym för -i"
+msgstr ""
 
 #: share/functions/__fish_complete_grep.fish:49
 msgid "treat input as a set of lines each terminated by a zero byte"
@@ -61047,104 +59018,88 @@ msgid "Don\\t"
 msgstr ""
 
 #: share/functions/__fish_complete_setxkbmap.fish:1
-#, fuzzy
 msgid "Complete setxkb options"
-msgstr "Tolerera slarviga monteringsflaggor"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:77
-#, fuzzy
 msgid "Remove \\conflicted state on working copy files or directories."
-msgstr "Ta bort konflikttillstånd hos arbetskopiefiler eller kataloger"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:103
-#, fuzzy
 msgid "Specify log message"
-msgstr "Välj e-postkatalog"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:105
-#, fuzzy
 msgid "Read log message from file"
-msgstr "Läs loggmeddelande från fil"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:106
-#, fuzzy
 msgid "Force validity of log message source"
-msgstr "Tvinga validitet av loggmeddelandes källa"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:118
-#, fuzzy
 msgid "Print nothing, or only summary information"
-msgstr "Visa all information"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:122
 msgid "Force operation to run"
 msgstr "Tvinga operationen att utföras"
 
 #: share/functions/__fish_complete_svn.fish:126
-#, fuzzy
 msgid "Process contents of file ARG as additional args"
-msgstr "Skicka filinnehåll som extra argument"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:130
 msgid "Operate only on members of changelist"
 msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:134
-#, fuzzy
 msgid "Output in xml"
-msgstr "Utadata i XML-format"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:138
-#, fuzzy
 msgid "Retrieve revision property"
-msgstr "Utför på revisionsegenskap"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:150
 msgid "Ignore externals definitions"
 msgstr "Ignorera definitioner av externals"
 
 #: share/functions/__fish_complete_svn.fish:154
-#, fuzzy
 msgid "Print extra information"
-msgstr "Visa all information"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:158
-#, fuzzy
 msgid "Operate on a revision property (use with -r)"
-msgstr "Utför på revisionsegenskap"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:162
 msgid "Add intermediate parents"
 msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:189
-#, fuzzy
 msgid "Try operation but make no changes"
-msgstr "Försök hitta en mindre uppsättning ändringar"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:193
-#, fuzzy
 msgid "Ignore ancestry when calculating merges"
-msgstr "Ignorera ursprung vid beräknandet av sammanslagning"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:197
-#, fuzzy
 msgid "Override diff-cmd specified in config file"
-msgstr "Flytta filen angiven på kommandoraden"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:198
-#, fuzzy
 msgid "Use external diff command"
-msgstr "Ångra ett redigeringskommando"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:202
 msgid "Disable automatic properties"
 msgstr "Inaktivera automatiska egenskaper"
 
 #: share/functions/__fish_complete_svn.fish:206
-#, fuzzy
 msgid "Set new working copy depth"
-msgstr "Välj RAW-skrivläge"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:230
 msgid "don\\t"
@@ -61159,43 +59114,36 @@ msgid "Use ARG as the newer target"
 msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:243
-#, fuzzy
 msgid "Do not print differences for deleted files"
-msgstr "Skriv inte ut rader utan fältavgränsare"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:244
-#, fuzzy
 msgid "Notice ancestry when calculating differences"
-msgstr "Ignorera ursprung vid beräknandet av sammanslagning"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:245
-#, fuzzy
 msgid "Show a summary of the results"
-msgstr "Välj en konfigurationsinställning"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:257
-#, fuzzy
 msgid "Do not cross copies while traversing history"
-msgstr "Korsa inte kopior"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:259
-#, fuzzy
 msgid "Produce diff output"
-msgstr "Ljudutdata"
+msgstr ""
 
 #: share/functions/__fish_complete_svn.fish:279
 msgid "Use strict semantics"
 msgstr "Använd strikt semantik"
 
 #: share/functions/__fish_complete_svn.fish:306
-#, fuzzy
 msgid "Relocate via URL-rewriting"
-msgstr "Relokera via URL-omskrivning"
+msgstr ""
 
 #: share/functions/__fish_complete_svn_diff.fish:1
-#, fuzzy
 msgid "Complete \"svn diff\" arguments"
-msgstr "Räkna antalet argument"
+msgstr ""
 
 #: share/functions/__fish_complete_tar.fish:14
 #: share/functions/__fish_complete_tar.fish:21
@@ -61227,73 +59175,60 @@ msgid "Hit end of history...\\n"
 msgstr "Slut på kataloghistorik...\\n"
 
 #: share/functions/__fish_print_abook_emails.fish:1
-#, fuzzy
 msgid "Print email addresses (abook)"
-msgstr "Visa döda processer"
+msgstr ""
 
 #: share/functions/__fish_print_arch_daemons.fish:1
-#, fuzzy
 msgid "Print arch daemons"
-msgstr "Visa alla namn"
+msgstr ""
 
 #: share/functions/__fish_print_debian_services.fish:1
-#, fuzzy
 msgid "Prints services installed"
-msgstr "Visa status för tjänst"
+msgstr ""
 
 #: share/functions/__fish_print_lsblk_columns.fish:1
-#, fuzzy
 msgid "Print available lsblk columns"
-msgstr "Visa tillgängliga paket"
+msgstr ""
 
 #: share/functions/__fish_print_xdg_mimeapps.fish:1
-#, fuzzy
 msgid "Print xdg mime applications"
-msgstr "Visa all information"
+msgstr ""
 
 #: share/functions/__fish_print_xrandr_modes.fish:1
-#, fuzzy
 msgid "Print xrandr modes"
-msgstr "Skriv obehandlade filnamn"
+msgstr ""
 
 #: share/functions/__fish_print_xrandr_outputs.fish:1
-#, fuzzy
 msgid "Print xrandr outputs"
-msgstr "Visa antal ord"
+msgstr ""
 
 #: share/functions/__fish_test_arg.fish:2
 msgid "Test if the token under the cursor matches the specified wildcard"
 msgstr ""
 
 #: share/functions/__fish_urlencode.fish:1
-#, fuzzy
 msgid "URL-encode stdin"
-msgstr "Byt namn på standard in"
+msgstr ""
 
 #: share/functions/abbr.fish:1
-#, fuzzy
 msgid "Manage abbreviations"
-msgstr "Manualsektion"
+msgstr ""
 
 #: share/functions/abbr.fish:40
-#, fuzzy
 msgid "%s: invalid option -- %s\\n"
-msgstr "%s: Ogiltigt flagga -- %s\\n"
+msgstr ""
 
 #: share/functions/abbr.fish:47
-#, fuzzy
 msgid "%s: %s cannot be specified along with %s\\n"
-msgstr "%s: Värden kan inte anges vid radering %s\\n"
+msgstr ""
 
 #: share/functions/abbr.fish:56
-#, fuzzy
 msgid "%s: option requires an argument -- %s\\n"
-msgstr "%s: Flaggan kräver ett argument -- %s\\n"
+msgstr ""
 
 #: share/functions/abbr.fish:62
-#, fuzzy
 msgid "%s: Unexpected argument -- %s\\n"
-msgstr "%ls: Förväntade argument\\n"
+msgstr ""
 
 #: share/functions/abbr.fish:75
 msgid "%s: abbreviation must have a non-empty key\\n"
@@ -61304,9 +59239,8 @@ msgid "%s: abbreviation must have a value\\n"
 msgstr ""
 
 #: share/functions/abbr.fish:101
-#, fuzzy
 msgid "%s: no such abbreviation '%s'\\n"
-msgstr "%s: Okänd funktion '%s'\\n"
+msgstr ""
 
 #: share/functions/alias.fish:2
 msgid ""
@@ -61316,9 +59250,8 @@ msgstr ""
 "liknande syntax"
 
 #: share/functions/alias.fish:36
-#, fuzzy
 msgid "%s: Expected one or two arguments, got %d\\n"
-msgstr "%ls: Förväntade ett eller två argument, fick %d"
+msgstr ""
 
 #: share/functions/dirh.fish:2
 msgid "Print the current directory history (the back- and fwd- lists)"
@@ -61337,31 +59270,23 @@ msgid "Simple vi prompt"
 msgstr ""
 
 #: share/functions/funced.fish:36
-#, fuzzy
 msgid "funced: You must specify one function name\n"
-msgstr "%ls: Förväntade exakt ett funktionsnamn\n"
+msgstr ""
 
 #: share/functions/funcsave.fish:11
-#, fuzzy
 msgid "%s: Expected function name\\n"
-msgstr "%s: Förväntade ett funktionsnamn\\n"
+msgstr ""
 
 #: share/functions/help.fish:77
-#, fuzzy, sh-format
+#, sh-format
 msgid ""
 "Please set the variable $BROWSER to a suitable browser and try again.\\n\\n"
 msgstr ""
-"Var vänlig sätt variablen $BROWSER så den anger en lämplig browser och "
-"försök igen\\n\\n"
 
 #: share/functions/history.fish:5
 msgid "Deletes an item from history"
 msgstr ""
 
-#: share/functions/hostname.fish:7
-msgid "Show or set the system's host name"
-msgstr ""
-
 #: share/functions/math.fish:2
 msgid "Perform math calculations in bc"
 msgstr "Utför matematiska beräkningar i bc"
@@ -64823,7 +62748,6 @@ msgstr ""
 #~ msgid "Whether to inform the user that hash failures occur"
 #~ msgstr "Om användaren skall informeras om hashfel"
 
-#, fuzzy
 #~ msgid "%ls: Expected zero or two parameters, got %d\n"
 #~ msgstr "%ls: Förväntade noll eller två argument, fick %d"
 
@@ -64901,7 +62825,6 @@ msgstr ""
 #~ msgid "Loop control command while not inside of loop"
 #~ msgstr "Loopstyrningskommandon får bara användas i loopar."
 
-#, fuzzy
 #~ msgid "'%ls' builtin not inside of if block"
 #~ msgstr "Det inbyggda kommandot 'else' får bara användas i ett if-block"
 
@@ -64930,278 +62853,210 @@ msgstr ""
 #~ msgid "Control creation of sparse files"
 #~ msgstr "Kontrollera skapandet av glesa filer"
 
-#, fuzzy
 #~ msgid "add the specified files on the next commit"
 #~ msgstr "Lägg till angiven fil fill den nuvarande listan av nyckelringar"
 
-#, fuzzy
 #~ msgid "show changeset information by line for each file"
 #~ msgstr "Visa ändringsinformation för paket"
 
-#, fuzzy
 #~ msgid "create an unversioned archive of a repository revision"
 #~ msgstr "Lägg till fil eller träd utan version till förrådet"
 
-#, fuzzy
 #~ msgid "list repository named branches"
 #~ msgstr "Inaktivera förråd"
 
-#, fuzzy
 #~ msgid "create a changegroup file"
 #~ msgstr "Skapa en kontrollpunktfil"
 
-#, fuzzy
 #~ msgid "output the current or given revision of files"
 #~ msgstr "Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
 
-#, fuzzy
 #~ msgid "make a copy of an existing repository"
 #~ msgstr "Skapa lokal kopia av förråd"
 
-#, fuzzy
 #~ msgid "commit the specified files or all outstanding changes"
 #~ msgstr "Dekryptera angiven fil eller standard in"
 
-#, fuzzy
 #~ msgid "diff repository (or selected files)"
 #~ msgstr "Radera urval"
 
-#, fuzzy
 #~ msgid "forget the specified files on the next commit"
 #~ msgstr "Flytta filen angiven på kommandoraden"
 
-#, fuzzy
 #~ msgid "copy changes from other branches onto the current branch"
 #~ msgstr "Hämta ändringar från förrådet till arbetskopian"
 
-#, fuzzy
 #~ msgid "identify the working copy or specified revision"
 #~ msgstr "Uppdatera arbetskopian till en annan URL"
 
-#, fuzzy
 #~ msgid "import an ordered set of patches"
 #~ msgstr "Visa byteavstånd för matchningar"
 
-#, fuzzy
 #~ msgid "create a new repository in the given directory"
 #~ msgstr "Skapa förråd om det inte redan existerar"
 
-#, fuzzy
 #~ msgid "locate files matching specific patterns"
 #~ msgstr "Visa inte filer som matchar mönster"
 
-#, fuzzy
 #~ msgid "output the current or given revision of the project manifest"
 #~ msgstr "Visa loggmeddelanden för en uppsättning revisioner och/eller filer"
 
-#, fuzzy
 #~ msgid "show changesets not found in the destination"
 #~ msgstr "Fråga paket med angiven grupp"
 
-#, fuzzy
 #~ msgid "show the parents of the working directory or revision"
 #~ msgstr "Ändra arbetskatalog"
 
-#, fuzzy
 #~ msgid "show aliases for remote repositories"
 #~ msgstr "Ta bort inlägg i .cvspass för fjärrförråd"
 
-#, fuzzy
 #~ msgid "pull changes from the specified source"
 #~ msgstr "Fråga paket med angiven grupp"
 
-#, fuzzy
 #~ msgid "push changes to the specified destination"
 #~ msgstr "Fråga paket med angiven grupp"
 
-#, fuzzy
 #~ msgid "remove the specified files on the next commit"
 #~ msgstr "Flytta filen angiven på kommandoraden"
 
-#, fuzzy
 #~ msgid "roll back the last transaction (dangerous)"
 #~ msgstr "Ordna om fixarna i förrådet"
 
-#, fuzzy
 #~ msgid "print the root (top) of the current working directory"
 #~ msgstr "Ändra arbetskatalog"
 
-#, fuzzy
 #~ msgid "show changed files in the working directory"
 #~ msgstr "Ändra arbetskatalog"
 
-#, fuzzy
 #~ msgid "summarize working directory state"
 #~ msgstr "Visa nuvarande katalog"
 
-#, fuzzy
 #~ msgid "list repository tags"
 #~ msgstr "Inaktivera förråd"
 
-#, fuzzy
 #~ msgid "show the tip revision"
 #~ msgstr "Visa tid"
 
-#, fuzzy
 #~ msgid "apply one or more changegroup files"
 #~ msgstr "Läs paket från fil"
 
-#, fuzzy
 #~ msgid "update working directory (or switch revisions)"
 #~ msgstr "Ändra arbetskatalog"
 
-#, fuzzy
 #~ msgid "verify the integrity of the repository"
 #~ msgstr "Ta bort ett inlägg från förråd"
 
-#, fuzzy
 #~ msgid "output version and copyright information"
 #~ msgstr "Ignorera versionsmagiinformation"
 
-#, fuzzy
 #~ msgid "Configuration Files"
 #~ msgstr "Konfigureringsfil"
 
-#, fuzzy
 #~ msgid "Date Formats"
 #~ msgstr "Välj format"
 
-#, fuzzy
 #~ msgid "Diff Formats"
 #~ msgstr "Listformat"
 
-#, fuzzy
 #~ msgid "Environment Variables"
 #~ msgstr "Redigera miljövariabler"
 
-#, fuzzy
 #~ msgid "Specifying File Sets"
 #~ msgstr "Välj konfigurationsfil"
 
-#, fuzzy
 #~ msgid "Configuring hgweb"
 #~ msgstr "Konfigureringsfil"
 
-#, fuzzy
 #~ msgid "Merge Tools"
 #~ msgstr "Sammanslå sorterade filer"
 
-#, fuzzy
 #~ msgid "Specifying Multiple Revisions"
 #~ msgstr "Ange revision"
 
-#, fuzzy
 #~ msgid "File Name Patterns"
 #~ msgstr "Visa inte filer som matchar mönster"
 
-#, fuzzy
 #~ msgid "Specifying Single Revisions"
 #~ msgstr "Ange revision"
 
-#, fuzzy
 #~ msgid "Specifying Revision Sets"
 #~ msgstr "Ange revisionstiollstånd"
 
-#, fuzzy
 #~ msgid "Subrepositories"
 #~ msgstr "Aktivera förråd"
 
-#, fuzzy
 #~ msgid "[+] include names matching the given patterns"
 #~ msgstr "Visa inte filer som matchar mönster"
 
-#, fuzzy
 #~ msgid "[+] exclude names matching the given patterns"
 #~ msgstr "Lista alla moduler som matchar parameter med jokertecken"
 
-#, fuzzy
 #~ msgid "[+]   include names matching the given patterns"
 #~ msgstr "Visa inte filer som matchar mönster"
 
-#, fuzzy
 #~ msgid "[+]   exclude names matching the given patterns"
 #~ msgstr "Lista alla moduler som matchar parameter med jokertecken"
 
-#, fuzzy
 #~ msgid "Annotate the specified revision"
 #~ msgstr "Hjälp för det angivna inbyggda kommandot"
 
-#, fuzzy
 #~ msgid "Use text as commit message"
 #~ msgstr "Läs meddelande för tillägg från fil"
 
 #~ msgid "Read commit message from file"
 #~ msgstr "Läs meddelande för tillägg från fil"
 
-#, fuzzy
 #~ msgid "Record the specified date as commit date"
 #~ msgstr "Hjälp för det angivna kommandot"
 
-#, fuzzy
 #~ msgid "Record the specified user as committer"
 #~ msgstr "Använd angiven sträng som kommentarsträng"
 
-#, fuzzy
 #~ msgid "File to store the bundles into"
 #~ msgstr "Redigera fix-paketbeskrivning"
 
-#, fuzzy
 #~ msgid "Limit number of changes displayed"
 #~ msgstr "Skriv bara ut angivet antal matchningar"
 
-#, fuzzy
 #~ msgid "Display with template"
 #~ msgstr "Visa alla matchningar"
 
-#, fuzzy
 #~ msgid "Specify ssh command to use"
 #~ msgstr "Ange kommando att operera på"
 
-#, fuzzy
 #~ msgid "Specify hg command to run on the remote side"
 #~ msgstr "Välj destinationsadress"
 
-#, fuzzy
 #~ msgid "Search the repository as it is in REV"
 #~ msgstr "Ange förråd-URL"
 
-#, fuzzy
 #~ msgid "Show revisions matching date spec"
 #~ msgstr "Visa bara matchande del"
 
-#, fuzzy
 #~ msgid "Revision to display"
 #~ msgstr "Välj display"
 
-#, fuzzy
 #~ msgid "Specify merge tool"
 #~ msgstr "Ange förtroendemodell"
 
-#, fuzzy
 #~ msgid "Show parents of the specified revision"
 #~ msgstr "Fråga paket med angiven grupp"
 
-#, fuzzy
 #~ msgid "[+] target revision"
 #~ msgstr "Slå ihop revisioner"
 
-#, fuzzy
 #~ msgid "Tipmost revision matching date"
 #~ msgstr "Visa inte filer som matchar mönster"
 
-#, fuzzy
 #~ msgid "Revert to the specified revision"
 #~ msgstr "Flytta filen angiven på kommandoraden"
 
-#, fuzzy
 #~ msgid "For remote clients"
 #~ msgstr "Visa eller ta bort funktioner"
 
-#, fuzzy
 #~ msgid "Untrusted configuration options"
 #~ msgstr "Välj konfigurationsinställningar"
 
-#, fuzzy
 #~ msgid "List the changed files of a revision"
 #~ msgstr "Visa alla engenskaper hos filer, kataloger eller revisioner"
 
@@ -65312,15 +63167,12 @@ msgstr ""
 #~ msgid "Tag the contents of the repository with a version name"
 #~ msgstr "Tagga innehållet i lagret med ett versionsnummer"
 
-#, fuzzy
 #~ msgid "Record an inverse patch without changing the working directory"
 #~ msgstr "Lagra en omvänd fix utan att ändra arbetskopian"
 
-#, fuzzy
 #~ msgid "Gives a changelog-style summary of the repository history"
 #~ msgstr "Ge en changelog-formaterad summering av förrådhistorik"
 
-#, fuzzy
 #~ msgid "Opposite of pull; unsafe if patch is not in remote repository"
 #~ msgstr "Motsatsen till pull, osäker om fixen inte finns i fjärrlagret"
 
@@ -65330,7 +63182,6 @@ msgstr ""
 #~ msgid "Create a local copy of another repository"
 #~ msgstr "Skapa lokal kopia av förråd"
 
-#, fuzzy
 #~ msgid "Initialize a new source tree as a darcs repository"
 #~ msgstr "Checka in filer till förråd"
 
@@ -65346,11 +63197,9 @@ msgstr ""
 #~ msgid "Use pattern from file"
 #~ msgstr "Använd mönster från fil"
 
-#, fuzzy
 #~ msgid "Use ARG as merge command"
 #~ msgstr "Ange sammanslagningskommando"
 
-#, fuzzy
 #~ msgid "Use ARG as external editor"
 #~ msgstr "Ange extern editor"
 
@@ -65363,7 +63212,6 @@ msgstr ""
 #~ msgid "Good bye\\n"
 #~ msgstr "Hej då\\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "%s: Expected exactly one argument, got %s.\\n\\nSynopsis:\\n\\t%sfunced%s "
 #~ "FUNCTION\\n"
@@ -66108,27 +63956,21 @@ msgstr ""
 #~ msgid "Do not use weak symbol support"
 #~ msgstr "Stöd inte svaga symboler"
 
-#, fuzzy
 #~ msgid "Match only the base name against the specified patterns"
 #~ msgstr "Installera inte filer vars namn börjar med angiven sökväg"
 
-#, fuzzy
 #~ msgid "Ignore case distinctions when matching patterns"
 #~ msgstr "Ignorera skiftläge på filnamn"
 
-#, fuzzy
 #~ msgid "Ignored"
 #~ msgstr "Ignorera skiftläge"
 
-#, fuzzy
 #~ msgid "Write no messages about errors encountered"
 #~ msgstr "Visa meddelanden om vad programmet gör"
 
-#, fuzzy
 #~ msgid "Interpret all patterns as extended regexps"
 #~ msgstr "Mönster är ett förlängt reguljärt uttryck"
 
-#, fuzzy
 #~ msgid "Match only the whole path name against the specified patterns"
 #~ msgstr "Installera inte filer vars namn börjar med angiven sökväg"
 
@@ -66242,11 +64084,9 @@ msgstr ""
 #~ msgid "Print client version info"
 #~ msgstr "Visa klientversion"
 
-#, fuzzy
 #~ msgid "force operation to run"
 #~ msgstr "Tvinga operationen att utföras"
 
-#, fuzzy
 #~ msgid "print as little as possible"
 #~ msgstr "Skriv ut så lite som möjligt"
 
@@ -66561,7 +64401,6 @@ msgstr ""
 #~ msgid "Pipe or short circuit command requires additional command"
 #~ msgstr "Pipa eller kortslutningkommando kräver ett efterföljande kommandon"
 
-#, fuzzy
 #~ msgid "%ls: Argument must be a number: %ls\n"
 #~ msgstr "%ls: Argumentet '%ls' måste vara ett heltal\n"
 

From f0df211f4ca728ca1d8e9f5717c07669c3524a9b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 21 Dec 2019 11:07:35 +0100
Subject: [PATCH 1444/1732] Solve remaining conflicts sv.po

Sorry!
---
 po/sv.po | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index a86545b46..f74d3ca67 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -57676,22 +57676,7 @@ msgstr ""
 msgid "Command used to find descriptions for commands"
 msgstr ""
 
-<<<<<<< HEAD
 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
-=======
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
-#: share/functions/__fish_git_prompt.fish:173
-msgid "Helper function for __fish_git_prompt"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
-#: share/functions/__fish_git_prompt.fish:348
-msgid "Prompt function for Git"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
-#: share/functions/__fish_git_prompt.fish:458
->>>>>>> Remove all fuzzy translations (see also #6418)
 msgid ""
 "fish_git_prompt helper, tells whether or not the current branch has staged "
 "files"
@@ -57715,24 +57700,6 @@ msgstr ""
 msgid "fish_git_prompt helper, checks color variables"
 msgstr ""
 
-<<<<<<< HEAD
-=======
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
-#: share/functions/__fish_git_prompt.fish:730
-msgid "Event handler, repaints prompt when functionality changes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
-#: share/functions/__fish_git_prompt.fish:748
-msgid "Event handler, repaints prompt when any color changes"
-msgstr ""
-
-#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
-#: share/functions/__fish_git_prompt.fish:768
-msgid "Event handler, repaints prompt when any char changes"
-msgstr ""
-
->>>>>>> Remove all fuzzy translations (see also #6418)
 #: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1
 msgid ""
 "Wrapper for the complete built-in. Skips the long completions on non-GNU "

From 6dd9e50f82f49dc136b22f658144a954255c30ad Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 21 Dec 2019 11:50:31 +0100
Subject: [PATCH 1445/1732] time: complete external time options only if
 available

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

diff --git a/share/completions/time.fish b/share/completions/time.fish
index fa4bba835..77891f435 100644
--- a/share/completions/time.fish
+++ b/share/completions/time.fish
@@ -1,3 +1,7 @@
+if not command -q time
+    complete -c time -a "(__fish_complete_subcommand)" -d "Command"
+    exit
+end
 
 complete -c time -a "(__fish_complete_subcommand -- -o --output -f --format)" -d "Command"
 

From 45633f4a54f9d04d33406e97e48613066c072d81 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 21 Dec 2019 21:58:45 +0800
Subject: [PATCH 1446/1732] cmake: force C++11 in CHECK_CXX_SOURCE_COMPILES for
 atomic

GCC 4.8 requires the use of `-std=gnu++11` or similar to enable atomic
features. However, older versions of CMake don't pick up the
project-wide target for C++11 when building the configure check targets.
Although CMake policy 0067 could be set to NEW to enable this, it only
exists on CMake 3.8 and newer, while many of our supported platforms are
on an older version.
---
 cmake/ConfigureChecks.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 59d48140e..901c743ba 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -189,6 +189,13 @@ int main () {
 FIND_PROGRAM(SED sed)
 
 # https://github.com/fish-shell/fish-shell/issues/5865
+CMAKE_PUSH_CHECK_STATE()
+# Needed until CMP0067 is set to NEW
+# g++ 4.8 needs -std=gnu+11 set to enable atomic features, but CMake < 3.8 does not add that
+# flag to TRY_COMPILE targets even when set for the project
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    LIST(APPEND CMAKE_REQUIRED_FLAGS "-std=gnu++11")
+ENDIF()
 CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 #include <cstdint>
@@ -200,3 +207,4 @@ LIBATOMIC_NOT_NEEDED)
 IF (NOT LIBATOMIC_NOT_NEEDED)
     SET(ATOMIC_LIBRARY "atomic")
 ENDIF()
+CMAKE_POP_CHECK_STATE()

From 624e76ae89676f0038efbcfff9df6622299fce8b Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Fri, 20 Dec 2019 16:57:00 -0800
Subject: [PATCH 1447/1732] Added the --cleanup option completion for the git
 commit command

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

diff --git a/share/completions/git.fish b/share/completions/git.fish
index 83586f6a1..5c340a421 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -1016,6 +1016,11 @@ complete -f -c git -n '__fish_git_using_command commit' -l fixup -d 'Fixup commi
 complete -f -c git -n '__fish_git_using_command commit' -l squash -d 'Squash commit to be used with rebase --autosquash'
 complete -c git -n '__fish_git_using_command commit' -l reset-author -d 'When amending, reset author of commit to the committer'
 complete -x -c git -n '__fish_git_using_command commit' -l author -d 'Override the commit author'
+complete -x -c git -n '__fish_git_using_command commit' -l cleanup -a "strip\t'Leading/trailing whitespace/empty lines, #commentary'
+ whitespace\t'Like strip but keep #commentary'
+ verbatim\t'Do not change the message'
+ scissors\t'Like whitespace but also remove after scissor lines'
+ default\t'Like strip if the message is to be edited, whitespace otherwise'" -d 'How to clean up the commit message'
 complete -x -c git -n '__fish_git_using_command commit' -l date -d 'Override the author date'
 complete -x -c git -n '__fish_git_using_command commit' -s m -l message -d 'Use the given message as the commit message'
 complete -f -c git -n '__fish_git_using_command commit' -l no-edit -d 'Use the selected commit message without launching an editor'

From 10ac83ae3259af4be8ba6c1288805bdcbb840818 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Dec 2019 17:09:21 -0800
Subject: [PATCH 1448/1732] lru to use std::map, not std::unordered_map

We depend on pointer stability here and it just seems easier
to think about it with std::map.
---
 src/lru.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lru.h b/src/lru.h
index 97b19de2e..1ed1412bb 100644
--- a/src/lru.h
+++ b/src/lru.h
@@ -44,8 +44,6 @@ class lru_cache_t {
         explicit lru_node_t(Contents &&v) : value(std::move(v)) {}
     };
 
-    typedef typename std::unordered_map<wcstring, lru_node_t>::iterator node_iter_t;
-
     // Max node count. This may be (transiently) exceeded by add_node_without_eviction, which is
     // used from background threads.
     const size_t max_node_count;
@@ -53,7 +51,7 @@ class lru_cache_t {
     // All of our nodes
     // Note that our linked list contains pointers to these nodes in the map
     // We are dependent on the iterator-noninvalidation guarantees of std::map
-    std::unordered_map<wcstring, lru_node_t> node_map;
+    std::map<wcstring, lru_node_t> node_map;
 
     // Head of the linked list
     // The list is circular!
@@ -227,7 +225,7 @@ class lru_cache_t {
         }
 
         // Tell the node where it is in the map
-        node_iter_t iter = iter_inserted.first;
+        auto iter = iter_inserted.first;
         lru_node_t *node = &iter->second;
         node->key = &iter->first;
 

From 87854c81f51d112aee0b04525bb1b84e0eab8ed5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Dec 2019 16:19:22 -0800
Subject: [PATCH 1449/1732] Allow C++ standard to be passed to
 CHECK_CXX_SOURCE_COMPILES

Work around the issue in CMake where C++ standard doesn't get propagated
to CHECK_CXX_SOURCE_COMPILES. Also correctly check for std::make_unique;
the define was missing from the config.h header.
---
 cmake/ConfigureChecks.cmake | 6 ++++++
 config_cmake.h.in           | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 901c743ba..4d1de9cad 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -4,6 +4,12 @@
 # `wcstod_l` is a GNU-extension, sometimes hidden behind GNU-related defines.
 # This is the case for at least Cygwin and Newlib.
 LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1)
+
+
+# Work around the fact that cmake does not propagate the language standard flag into
+# the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
+LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
+
 IF(APPLE)
     INCLUDE(CheckCXXCompilerFlag)
     CHECK_CXX_COMPILER_FLAG("-Werror=unguarded-availability" REQUIRES_UNGUARDED_AVAILABILITY)
diff --git a/config_cmake.h.in b/config_cmake.h.in
index ea7e90820..471094269 100644
--- a/config_cmake.h.in
+++ b/config_cmake.h.in
@@ -127,6 +127,9 @@
 /* Define to 1 if the _nl_msg_cat_cntr symbol is exported. */
 #cmakedefine HAVE__NL_MSG_CAT_CNTR 1
 
+/* Define to 1 if std::make_unique is available. */
+#cmakedefine HAVE_STD__MAKE_UNIQUE 1
+
 /* Define to 1 if the _sys_errs array is available. */
 #cmakedefine HAVE__SYS__ERRS 1
 

From 82baf747855174956b65be64a3c460da57f535bf Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Dec 2019 12:31:14 -0800
Subject: [PATCH 1450/1732] Attempt to fix the build

Move the CMake changes down in the file after the FIND_PACKAGE calls.
---
 cmake/ConfigureChecks.cmake | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 4d1de9cad..70ed8e5da 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -5,11 +5,6 @@
 # This is the case for at least Cygwin and Newlib.
 LIST(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE=1)
 
-
-# Work around the fact that cmake does not propagate the language standard flag into
-# the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
-LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
-
 IF(APPLE)
     INCLUDE(CheckCXXCompilerFlag)
     CHECK_CXX_COMPILER_FLAG("-Werror=unguarded-availability" REQUIRES_UNGUARDED_AVAILABILITY)
@@ -182,6 +177,12 @@ int main () {
 ENDIF()
 CMAKE_POP_CHECK_STATE()
 
+# Work around the fact that cmake does not propagate the language standard flag into
+# the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
+# Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++
+# standards flag.
+LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
+
 CHECK_CXX_SOURCE_COMPILES("
 #include <memory>
 

From 4529e7d1836bbd3e85301123ad7506c792602e0c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Dec 2019 15:07:41 -0800
Subject: [PATCH 1451/1732] Reverse the order of the block stack

Previously, the block stack was a true stack. However in most cases, you
want to traverse the stack from the topmost frame down. This is awkward
to do with range-based for loops.

Switch it to pushing new blocks to the front of the block list.
This simplifies some traversals.
---
 src/builtin.cpp        |  10 +-
 src/builtin_block.cpp  |   2 +-
 src/builtin_return.cpp |  12 ++-
 src/parser.cpp         | 239 +++++++++++++++++++----------------------
 src/parser.h           |  20 ++--
 src/reader.cpp         |   4 +-
 src/trace.cpp          |   2 +-
 7 files changed, 141 insertions(+), 148 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 0a09fca33..b727fba4c 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -264,10 +264,12 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
 
     // Paranoia: ensure we have a real loop.
     bool has_loop = false;
-    for (size_t loop_idx = 0; loop_idx < parser.block_count() && !has_loop; loop_idx++) {
-        const block_t *b = parser.block_at_index(loop_idx);
-        if (b->type() == WHILE || b->type() == FOR) has_loop = true;
-        if (b->type() == FUNCTION_CALL) break;
+    for (const auto &b : parser.blocks()) {
+        if (b.type() == WHILE || b.type() == FOR) {
+            has_loop = true;
+            break;
+        }
+        if (b.is_function()) break;
     }
     if (!has_loop) {
         wcstring error_message = format_string(_(L"%ls: Not inside of loop\n"), argv[0]);
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index d97ceecf2..73509e8cb 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -107,7 +107,7 @@ int builtin_block(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     switch (opts.scope) {
         case LOCAL: {
             // If this is the outermost block, then we're global
-            if (block_idx + 1 >= parser.block_count()) {
+            if (block_idx + 1 >= parser.blocks().size()) {
                 block = nullptr;
             }
             break;
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 579ca5835..7ef2e5f7f 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -91,13 +91,15 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     // Find the function block.
-    size_t function_block_idx;
-    for (function_block_idx = 0; function_block_idx < parser.block_count(); function_block_idx++) {
-        const block_t *b = parser.block_at_index(function_block_idx);
-        if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) break;
+    bool has_function_block = false;
+    for (const auto &b : parser.blocks()) {
+        if (b.is_function()) {
+            has_function_block = true;
+            break;
+        }
     }
 
-    if (function_block_idx >= parser.block_count()) {
+    if (!has_function_block) {
         streams.err.append_format(_(L"%ls: Not inside of function\n"), cmd);
         builtin_print_error_trailer(parser, streams.err, cmd);
         return STATUS_CMD_ERROR;
diff --git a/src/parser.cpp b/src/parser.cpp
index 20fa4e01e..d4c700db6 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -16,6 +16,7 @@
 #include "event.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "function.h"
 #include "intern.h"
 #include "parse_constants.h"
@@ -134,12 +135,14 @@ void parser_t::skip_all_blocks() {
     principal->cancellation_requested = true;
 }
 
-// Given a new-allocated block, push it onto our block stack, acquiring ownership
+// Given a new-allocated block, push it onto our block list, acquiring ownership.
 block_t *parser_t::push_block(block_t &&block) {
     block_t new_current{std::move(block)};
     const enum block_type_t type = new_current.type();
     new_current.src_lineno = parser_t::get_lineno();
 
+    wcstring func = new_current.function_name;
+
     const wchar_t *filename = parser_t::current_filename();
     if (filename != nullptr) {
         new_current.src_filename = intern(filename);
@@ -159,31 +162,26 @@ block_t *parser_t::push_block(block_t &&block) {
         new_current.wants_pop_env = true;
     }
 
-    // Push it onto our stack and return a pointer to it.
+    // Push it onto our list and return a pointer to it.
     // Note that deques do not move their contents so this is safe.
-    this->block_stack.push_back(std::move(new_current));
-    return &this->block_stack.back();
+    this->block_list.push_front(std::move(new_current));
+    return &this->block_list.front();
 }
 
 void parser_t::pop_block(const block_t *expected) {
     assert(expected == this->current_block());
-    if (block_stack.empty()) {
-        debug(1, L"function %s called on empty block stack.", __func__);
-        bugreport();
-        return;
-    }
+    assert(!block_list.empty() && "empty block list");
 
-    // Acquire ownership out of the block stack.
-    block_t old = std::move(block_stack.back());
-    block_stack.pop_back();
+    // Acquire ownership out of the block list.
+    block_t old = std::move(block_list.front());
+    block_list.pop_front();
 
     if (old.wants_pop_env) vars().pop();
 
     // Figure out if `status is-block` should consider us to be in a block now.
     bool new_is_block = false;
-    for (const auto &b : block_stack) {
-        const enum block_type_t type = b.type();
-        if (type != TOP && type != SUBST) {
+    for (const auto &b : block_list) {
+        if (b.type() != TOP && b.type() != SUBST) {
             new_is_block = true;
             break;
         }
@@ -192,9 +190,8 @@ void parser_t::pop_block(const block_t *expected) {
 
     // Are we still in a breakpoint?
     bool new_is_breakpoint = false;
-    for (const auto &b : block_stack) {
-        const enum block_type_t type = b.type();
-        if (type == BREAKPOINT) {
+    for (const auto &b : block_list) {
+        if (b.type() == BREAKPOINT) {
             new_is_breakpoint = true;
             break;
         }
@@ -232,17 +229,14 @@ wcstring parser_t::block_stack_description() const {
 #endif
 
 const block_t *parser_t::block_at_index(size_t idx) const {
-    // Zero corresponds to the last element in our vector.
-    size_t count = block_stack.size();
-    return idx < count ? &block_stack.at(count - idx - 1) : nullptr;
+    return idx < block_list.size() ? &block_list[idx] : nullptr;
 }
 
 block_t *parser_t::block_at_index(size_t idx) {
-    size_t count = block_stack.size();
-    return idx < count ? &block_stack.at(count - idx - 1) : nullptr;
+    return idx < block_list.size() ? &block_list[idx] : nullptr;
 }
 
-block_t *parser_t::current_block() { return block_stack.empty() ? nullptr : &block_stack.back(); }
+block_t *parser_t::current_block() { return block_at_index(0); }
 
 /// Print profiling information to the specified stream.
 static void print_profile(const std::vector<std::unique_ptr<profile_item_t>> &items, FILE *out) {
@@ -340,90 +334,82 @@ std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_lis
     return result;
 }
 
-wcstring parser_t::stack_trace() const {
-    wcstring trace;
-    this->stack_trace_internal(0, &trace);
-    return trace;
-}
-
 std::shared_ptr<parser_t> parser_t::shared() { return shared_from_this(); }
 
-void parser_t::stack_trace_internal(size_t block_idx, wcstring *buff) const {
-    // Check if we should end the recursion.
-    if (block_idx >= this->block_count()) return;
+wcstring parser_t::stack_trace() const {
+    wcstring trace;
+    for (const auto &b : blocks()) {
+        if (b.type() == EVENT) {
+            // This is an event handler.
+            assert(b.event && "Should have an event");
+            wcstring description = event_get_desc(*b.event);
+            append_format(trace, _(L"in event handler: %ls\n"), description.c_str());
 
-    const block_t *b = this->block_at_index(block_idx);
+            // Stop at event handler. No reason to believe that any other code is relevant.
+            //
+            // It might make sense in the future to continue printing the stack trace of the code
+            // that invoked the event, if this is a programmatic event, but we can't currently
+            // detect that.
+            break;
+        }
 
-    if (b->type() == EVENT) {
-        // This is an event handler.
-        assert(b->event && "Should have an event");
-        wcstring description = event_get_desc(*b->event);
-        append_format(*buff, _(L"in event handler: %ls\n"), description.c_str());
-
-        // Stop recursing at event handler. No reason to believe that any other code is relevant.
-        //
-        // It might make sense in the future to continue printing the stack trace of the code that
-        // invoked the event, if this is a programmatic event, but we can't currently detect that.
-        return;
-    }
-
-    if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW || b->type() == SOURCE ||
-        b->type() == SUBST) {
-        // These types of blocks should be printed.
-        switch (b->type()) {
-            case SOURCE: {
-                const wchar_t *source_dest = b->sourced_file;
-                append_format(*buff, _(L"from sourcing file %ls\n"),
-                              user_presentable_path(source_dest).c_str());
-                break;
-            }
-            case FUNCTION_CALL:
-            case FUNCTION_CALL_NO_SHADOW: {
-                append_format(*buff, _(L"in function '%ls'"), b->function_name.c_str());
-                // Print arguments on the same line.
-                wcstring args_str;
-                for (const wcstring &arg : b->function_args) {
-                    if (!args_str.empty()) args_str.push_back(L' ');
-                    // We can't quote the arguments because we print this in quotes.
-                    // As a special-case, add the empty argument as "".
-                    if (!arg.empty()) {
-                        args_str.append(escape_string(arg, ESCAPE_ALL | ESCAPE_NO_QUOTED));
-                    } else {
-                        args_str.append(L"\"\"");
+        if (b.type() == FUNCTION_CALL || b.type() == FUNCTION_CALL_NO_SHADOW ||
+            b.type() == SOURCE || b.type() == SUBST) {
+            // These types of blocks should be printed.
+            switch (b.type()) {
+                case SOURCE: {
+                    const wchar_t *source_dest = b.sourced_file;
+                    append_format(trace, _(L"from sourcing file %ls\n"),
+                                  user_presentable_path(source_dest).c_str());
+                    break;
+                }
+                case FUNCTION_CALL:
+                case FUNCTION_CALL_NO_SHADOW: {
+                    append_format(trace, _(L"in function '%ls'"), b.function_name.c_str());
+                    // Print arguments on the same line.
+                    wcstring args_str;
+                    for (const wcstring &arg : b.function_args) {
+                        if (!args_str.empty()) args_str.push_back(L' ');
+                        // We can't quote the arguments because we print this in quotes.
+                        // As a special-case, add the empty argument as "".
+                        if (!arg.empty()) {
+                            args_str.append(escape_string(arg, ESCAPE_ALL | ESCAPE_NO_QUOTED));
+                        } else {
+                            args_str.append(L"\"\"");
+                        }
                     }
+                    if (!args_str.empty()) {
+                        // TODO: Escape these.
+                        append_format(trace, _(L" with arguments '%ls'"), args_str.c_str());
+                    }
+                    trace.push_back('\n');
+                    break;
                 }
-                if (!args_str.empty()) {
-                    // TODO: Escape these.
-                    append_format(*buff, _(L" with arguments '%ls'"), args_str.c_str());
+                case SUBST: {
+                    append_format(trace, _(L"in command substitution\n"));
+                    break;
+                }
+                default: {
+                    break;  // can't get here
                 }
-                buff->push_back('\n');
-                break;
             }
-            case SUBST: {
-                append_format(*buff, _(L"in command substitution\n"));
-                break;
-            }
-            default: {
-                break;  // can't get here
-            }
-        }
 
-        // Print where the function is called.
-        const wchar_t *file = b->src_filename;
+            // Print where the function is called.
+            const wchar_t *file = b.src_filename;
 
-        if (file) {
-            append_format(*buff, _(L"\tcalled on line %d of file %ls\n"), b->src_lineno,
-                          user_presentable_path(file).c_str());
-        } else if (is_within_fish_initialization()) {
-            append_format(*buff, _(L"\tcalled during startup\n"));
-        } else {
-            // This one is way too noisy
-            // append_format(*buff, _(L"\tcalled on standard input\n"));
+            if (file) {
+                append_format(trace, _(L"\tcalled on line %d of file %ls\n"), b.src_lineno,
+                              user_presentable_path(file).c_str());
+            } else if (is_within_fish_initialization()) {
+                append_format(trace, _(L"\tcalled during startup\n"));
+            } else {
+                // This one is way too noisy
+                // append_format(*buff, _(L"\tcalled on standard input\n"));
+            }
         }
     }
 
-    // Recursively print the next block.
-    parser_t::stack_trace_internal(block_idx + 1, buff);
+    return trace;
 }
 
 /// Returns the name of the currently evaluated function if we are currently evaluating a function,
@@ -434,18 +420,17 @@ const wchar_t *parser_t::is_function(size_t idx) const {
     // PCA: Have to make this a string somehow.
     ASSERT_IS_MAIN_THREAD();
 
-    const wchar_t *result = nullptr;
-    for (size_t block_idx = idx; block_idx < this->block_count(); block_idx++) {
-        const block_t *b = this->block_at_index(block_idx);
-        if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
-            result = b->function_name.c_str();
-            break;
-        } else if (b->type() == SOURCE) {
-            // If a function sources a file, obviously that function's offset doesn't contribute.
+    for (size_t block_idx = idx; block_idx < block_list.size(); block_idx++) {
+        const block_t &b = block_list[block_idx];
+        if (b.is_function()) {
+            return b.function_name.c_str();
+        } else if (b.type() == SOURCE) {
+            // If a function sources a file, obviously that function's offset doesn't
+            // contribute.
             break;
         }
     }
-    return result;
+    return nullptr;
 }
 
 /// Return the function name for the specified stack frame. Default is zero (current frame).
@@ -454,13 +439,14 @@ const wchar_t *parser_t::get_function_name(int level) {
     if (level == 0) {
         // Return the function name for the level preceding the most recent breakpoint. If there
         // isn't one return the function name for the current level.
-        int idx = 0;
-        for (const auto &b : block_stack) {
-            const enum block_type_t type = b.type();
-            if (type == BREAKPOINT) {
-                return this->is_function(idx);
+        // Walk until we find a breakpoint, then take the next function.
+        bool found_breakpoint = false;
+        for (const auto &b : block_list) {
+            if (b.type() == BREAKPOINT) {
+                found_breakpoint = true;
+            } else if (found_breakpoint && b.is_function()) {
+                return b.function_name.c_str();
             }
-            idx++;
         }
         return nullptr;  // couldn't find a breakpoint frame
     } else if (level == 1) {
@@ -468,14 +454,15 @@ const wchar_t *parser_t::get_function_name(int level) {
         return this->is_function();
     }
 
-    // Return the function name for the specific function stack frame.
-    int idx = 0;
-    for (const auto &b : block_stack) {
-        const enum block_type_t type = b.type();
-        if (type == FUNCTION_CALL || type == FUNCTION_CALL_NO_SHADOW) {
-            if (--level == 0) return this->is_function(idx);
+    // Level 1 is the topmost function call. Level 2 is its caller. Etc.
+    int funcs_seen = 0;
+    for (const auto &b : block_list) {
+        if (b.is_function()) {
+            funcs_seen++;
+            if (funcs_seen == level) {
+                return b.function_name.c_str();
+            }
         }
-        idx++;
     }
     return nullptr;  // couldn't find that function level
 }
@@ -491,15 +478,13 @@ int parser_t::get_lineno() const {
 const wchar_t *parser_t::current_filename() const {
     ASSERT_IS_MAIN_THREAD();
 
-    for (size_t i = 0; i < this->block_count(); i++) {
-        const block_t *b = this->block_at_index(i);
-        if (b->type() == FUNCTION_CALL || b->type() == FUNCTION_CALL_NO_SHADOW) {
-            return function_get_definition_file(b->function_name);
-        } else if (b->type() == SOURCE) {
-            return b->sourced_file;
+    for (const auto &b : block_list) {
+        if (b.is_function()) {
+            return function_get_definition_file(b.function_name);
+        } else if (b.type() == SOURCE) {
+            return b.sourced_file;
         }
     }
-
     // Fall back to the file being sourced.
     return libdata().current_filename;
 }
@@ -513,8 +498,8 @@ bool parser_t::function_stack_is_overflowing() const {
     }
     // Count the functions.
     int depth = 0;
-    for (const auto &b : block_stack) {
-        depth += (b.type() == FUNCTION_CALL || b.type() == FUNCTION_CALL_NO_SHADOW);
+    for (const auto &b : block_list) {
+        depth += b.is_function();
     }
     return depth > FISH_MAX_STACK_DEPTH;
 }
@@ -656,7 +641,7 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
     // successfully cancel (or there was nothing to cancel); clear the flag. If our block stack is
     // not empty, we are still in the process of cancelling; refuse to evaluate anything.
     if (this->cancellation_requested) {
-        if (!block_stack.empty()) {
+        if (!block_list.empty()) {
             return eval_result_t::cancelled;
         }
         this->cancellation_requested = false;
diff --git a/src/parser.h b/src/parser.h
index 41aff1176..41fdb8999 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -90,6 +90,11 @@ class block_t {
     /// Description of the block, for debugging.
     wcstring description() const;
 
+    /// \return if we are a function call (with or without shadowing).
+    bool is_function() const {
+        return type() == FUNCTION_CALL || type() == FUNCTION_CALL_NO_SHADOW;
+    }
+
     /// Entry points for creating blocks.
     static block_t if_block();
     static block_t event_block(event_t evt);
@@ -203,7 +208,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     job_list_t job_list;
     /// The list of blocks. This is a deque because we give out raw pointers to callers, who hold
     /// them across manipulating this stack.
-    std::deque<block_t> block_stack;
+    /// This is in "reverse" order: the topmost block is at the front. This enables iteration from
+    /// top down using range-based for loops.
+    std::deque<block_t> block_list;
     /// The 'depth' of the fish call stack.
     int eval_level = -1;
     /// Set of variables for the parser.
@@ -232,9 +239,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     // Given a file path, return something nicer. Currently we just "unexpand" tildes.
     wcstring user_presentable_path(const wcstring &path) const;
 
-    /// Helper for stack_trace().
-    void stack_trace_internal(size_t block_idx, wcstring *buff) const;
-
     /// Create a parser.
     parser_t();
     parser_t(std::shared_ptr<env_stack_t> vars);
@@ -289,17 +293,17 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Returns the current line number.
     int get_lineno() const;
 
-    /// Returns the block at the given index. 0 corresponds to the innermost block. Returns NULL
+    /// Returns the block at the given index. 0 corresponds to the innermost block. Returns nullptr
     /// when idx is at or equal to the number of blocks.
     const block_t *block_at_index(size_t idx) const;
     block_t *block_at_index(size_t idx);
 
+    /// Return the list of blocks. The first block is at the top.
+    const std::deque<block_t> &blocks() const { return block_list; }
+
     /// Returns the current (innermost) block.
     block_t *current_block();
 
-    /// Count of blocks.
-    size_t block_count() const { return block_stack.size(); }
-
     /// Get the list of jobs.
     job_list_t &jobs() { return job_list; }
     const job_list_t &jobs() const { return job_list; }
diff --git a/src/reader.cpp b/src/reader.cpp
index 15e915f57..517c94d13 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2204,8 +2204,8 @@ void reader_bg_job_warning(const parser_t &parser) {
 /// interactive mode. It checks if it is ok to exit.
 static void handle_end_loop(const parser_t &parser) {
     if (!reader_exit_forced()) {
-        for (size_t i = 0; i < parser.block_count(); i++) {
-            if (parser.block_at_index(i)->type() == BREAKPOINT) {
+        for (const auto &b : parser.blocks()) {
+            if (b.type() == BREAKPOINT) {
                 // We're executing within a breakpoint so we do not want to terminate the shell and
                 // kill background jobs.
                 return;
diff --git a/src/trace.cpp b/src/trace.cpp
index d7968c9c4..f247ac5f8 100644
--- a/src/trace.cpp
+++ b/src/trace.cpp
@@ -19,7 +19,7 @@ bool trace_enabled(const parser_t &parser) {
 void trace_argv(const parser_t &parser, const wchar_t *command, const wcstring_list_t &argv) {
     // Format into a string to prevent interleaving with flog in other threads.
     // Add the + prefix.
-    wcstring trace_text(parser.block_count(), '+');
+    wcstring trace_text(parser.blocks().size(), '+');
 
     if (command && command[0]) {
         trace_text.push_back(L' ');

From a59f35a378e381747efdb616baf2e321007e54b0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Dec 2019 15:37:14 -0800
Subject: [PATCH 1452/1732] Make block_type_t an enum class

---
 src/builtin.cpp         |   8 +-
 src/builtin_block.cpp   |   3 +-
 src/builtin_eval.cpp    |   2 +-
 src/builtin_return.cpp  |   2 +-
 src/event.cpp           |   2 +-
 src/exec.cpp            |   7 +-
 src/fish.cpp            |   4 +-
 src/fish_tests.cpp      |  14 ++--
 src/input.cpp           |   2 +-
 src/parse_execution.cpp |   8 +-
 src/parser.cpp          | 160 ++++++++++++++++++++--------------------
 src/parser.h            |  35 ++++-----
 src/reader.cpp          |   6 +-
 13 files changed, 129 insertions(+), 124 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index b727fba4c..7af538e95 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -165,7 +165,7 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *
         // If it's an error, redirect the output of __fish_print_help to stderr
         ios.push_back(std::make_shared<io_fd_t>(STDOUT_FILENO, STDERR_FILENO));
     }
-    parser.eval(cmd, ios, TOP);
+    parser.eval(cmd, ios, block_type_t::top);
     // ignore the exit status of __fish_print_help
 }
 
@@ -265,11 +265,11 @@ static int builtin_break_continue(parser_t &parser, io_streams_t &streams, wchar
     // Paranoia: ensure we have a real loop.
     bool has_loop = false;
     for (const auto &b : parser.blocks()) {
-        if (b.type() == WHILE || b.type() == FOR) {
+        if (b.type() == block_type_t::while_block || b.type() == block_type_t::for_block) {
             has_loop = true;
             break;
         }
-        if (b.is_function()) break;
+        if (b.is_function_call()) break;
     }
     if (!has_loop) {
         wcstring error_message = format_string(_(L"%ls: Not inside of loop\n"), argv[0]);
@@ -298,7 +298,7 @@ static int builtin_breakpoint(parser_t &parser, io_streams_t &streams, wchar_t *
     // Ensure we don't allow creating a breakpoint at an interactive prompt. There may be a simpler
     // or clearer way to do this but this works.
     const block_t *block1 = parser.block_at_index(1);
-    if (!block1 || block1->type() == BREAKPOINT) {
+    if (!block1 || block1->type() == block_type_t::breakpoint) {
         streams.err.append_format(_(L"%ls: Command not valid at an interactive prompt\n"), cmd);
         return STATUS_ILLEGAL_CMD;
     }
diff --git a/src/builtin_block.cpp b/src/builtin_block.cpp
index 73509e8cb..f1f566553 100644
--- a/src/builtin_block.cpp
+++ b/src/builtin_block.cpp
@@ -117,8 +117,7 @@ int builtin_block(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             break;
         }
         case UNSET: {
-            while (block != nullptr && block->type() != FUNCTION_CALL &&
-                   block->type() != FUNCTION_CALL_NO_SHADOW) {
+            while (block && !block->is_function_call()) {
                 // Set it in function scope
                 block = parser.block_at_index(++block_idx);
             }
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 1cbb0d262..f53b5be1b 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -27,7 +27,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::TOP) !=
+        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::top) !=
             eval_result_t::ok) {
             status = STATUS_CMD_ERROR;
         } else if (cached_exec_count == parser.libdata().exec_count) {
diff --git a/src/builtin_return.cpp b/src/builtin_return.cpp
index 7ef2e5f7f..767f503cb 100644
--- a/src/builtin_return.cpp
+++ b/src/builtin_return.cpp
@@ -93,7 +93,7 @@ int builtin_return(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // Find the function block.
     bool has_function_block = false;
     for (const auto &b : parser.blocks()) {
-        if (b.is_function()) {
+        if (b.is_function_call()) {
             has_function_block = true;
             break;
         }
diff --git a/src/event.cpp b/src/event.cpp
index b78da1f15..011c3e007 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -286,7 +286,7 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
         auto prev_statuses = parser.get_last_statuses();
 
         block_t *b = parser.push_block(block_t::event_block(event));
-        parser.eval(buffer, io_chain_t(), TOP);
+        parser.eval(buffer, io_chain_t(), block_type_t::top);
         parser.pop_block(b);
         parser.set_last_statuses(std::move(prev_statuses));
     }
diff --git a/src/exec.cpp b/src/exec.cpp
index 3b1505ee9..664afcc5c 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -733,7 +733,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
         return [=](parser_t &parser) {
-            eval_result_t res = parser.eval_node(source, node, TOP, lineage);
+            eval_result_t res = parser.eval_node(source, node, block_type_t::top, lineage);
             switch (res) {
                 case eval_result_t::ok:
                 case eval_result_t::error:
@@ -758,7 +758,8 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            auto res = parser.eval_node(props->parsed_source, props->body_node, TOP, lineage);
+            auto res = parser.eval_node(props->parsed_source, props->body_node, block_type_t::top,
+                                        lineage);
             function_restore_environment(parser, fb);
 
             switch (res) {
@@ -1175,7 +1176,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // be null.
     std::shared_ptr<io_buffer_t> buffer;
     if (auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit)) {
-        if (parser.eval(cmd, io_chain_t{bufferfill}, SUBST) == eval_result_t::ok) {
+        if (parser.eval(cmd, io_chain_t{bufferfill}, block_type_t::subst) == eval_result_t::ok) {
             subcommand_statuses = parser.get_last_statuses();
         }
         buffer = io_bufferfill_t::finish(std::move(bufferfill));
diff --git a/src/fish.cpp b/src/fish.cpp
index 33bc0e198..80ca51949 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -228,7 +228,7 @@ static void source_config_in_directory(const wcstring &dir) {
     const wcstring cmd = L"builtin source " + escaped_pathname;
     parser_t &parser = parser_t::principal_parser();
     set_is_within_fish_initialization(true);
-    parser.eval(cmd, io_chain_t(), TOP);
+    parser.eval(cmd, io_chain_t(), block_type_t::top);
     set_is_within_fish_initialization(false);
 }
 
@@ -254,7 +254,7 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
 
     for (const auto &cmd : *cmds) {
         const wcstring cmd_wcs = str2wcstring(cmd);
-        eval_result_t eval_res = parser.eval(cmd_wcs, io, TOP);
+        eval_result_t eval_res = parser.eval(cmd_wcs, io, block_type_t::top);
         res = (eval_res == eval_result_t::ok ? 0 : 1);
     }
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 55cf42eae..3720f7315 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1003,16 +1003,17 @@ static void test_parser() {
     // Ensure that we don't crash on infinite self recursion and mutual recursion. These must use
     // the principal parser because we cannot yet execute jobs on other parsers.
     say(L"Testing recursion detection");
-    parser->eval(L"function recursive ; recursive ; end ; recursive; ", io_chain_t(), TOP);
+    parser->eval(L"function recursive ; recursive ; end ; recursive; ", io_chain_t(),
+                 block_type_t::top);
 #if 0
     // This is disabled since it produces a long backtrace. We should find a way to either visually
     // compress the backtrace, or disable error spewing.
     parser->.eval(L"function recursive1 ; recursive2 ; end ; "
-            L"function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t(), TOP);
+            L"function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t(), block_type_t::top);
 #endif
 
     say(L"Testing empty function name");
-    parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(), TOP);
+    parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(), block_type_t::top);
 
     say(L"Testing eval_args");
     completion_list_t comps = parser_t::expand_argument_list(
@@ -1032,7 +1033,8 @@ static void test_1_cancellation(const wchar_t *src) {
         usleep(delay * 1E6);
         pthread_kill(thread, SIGINT);
     });
-    eval_result_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler}, TOP);
+    eval_result_t ret =
+        parser_t::principal_parser().eval(src, io_chain_t{filler}, block_type_t::top);
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
@@ -1074,7 +1076,7 @@ static void test_cancellation() {
     bool iis = is_interactive_session();
     set_interactive_session(true);
     const wchar_t *child_self_destructor = L"while true ; sh -c 'sleep .25; kill -s INT $$' ; end";
-    parser_t::principal_parser().eval(child_self_destructor, io_chain_t(), TOP);
+    parser_t::principal_parser().eval(child_self_destructor, io_chain_t(), block_type_t::top);
     set_interactive_session(iis);
 
     // Restore signal handling.
@@ -5198,7 +5200,7 @@ static void test_illegal_command_exit_code() {
     parser_t &parser = parser_t::principal_parser();
 
     for (const auto &test : tests) {
-        parser.eval(test.txt, empty_ios, TOP);
+        parser.eval(test.txt, empty_ios, block_type_t::top);
 
         int exit_status = parser.get_last_status();
         if (exit_status != test.result) {
diff --git a/src/input.cpp b/src/input.cpp
index 404cbce71..a194fab2a 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -389,7 +389,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
         // see that until all other commands have also been run.
         auto last_statuses = parser_->get_last_statuses();
         for (const wcstring &cmd : m.commands) {
-            parser_->eval(cmd, io_chain_t(), TOP);
+            parser_->eval(cmd, io_chain_t(), block_type_t::top);
         }
         parser_->set_last_statuses(std::move(last_statuses));
         event_queue_.push_front(char_event_type_t::check_exit);
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 7403e6d9e..c292e7208 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -105,7 +105,7 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
     // on function invocation changes, then this check will break.
     const block_t *current = parser->block_at_index(0), *parent = parser->block_at_index(1);
     bool is_within_function_call =
-        (current && parent && current->type() == TOP && parent->type() == FUNCTION_CALL);
+        (current && parent && current->type() == block_type_t::top && parent->is_function_call());
     if (!is_within_function_call) {
         return {};
     }
@@ -322,7 +322,7 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
 eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
     trace_if_enabled(*parser, L"begin");
-    block_t *sb = parser->push_block(block_t::scope_block(BEGIN));
+    block_t *sb = parser->push_block(block_t::scope_block(block_type_t::begin));
     eval_result_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
     trace_if_enabled(*parser, L"end begin");
@@ -380,7 +380,7 @@ bool parse_execution_context_t::is_function_context() const {
     const block_t *current = parser->block_at_index(0);
     const block_t *parent = parser->block_at_index(1);
     bool is_within_function_call =
-        (current && parent && current->type() == TOP && parent->type() == FUNCTION_CALL);
+        (current && parent && current->type() == block_type_t::top && parent->is_function_call());
     return is_within_function_call;
 }
 
@@ -1461,7 +1461,7 @@ eval_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list
     }
 
     // Check for stack overflow. The TOP check ensures we only do this for function calls.
-    if (associated_block->type() == TOP && parser->function_stack_is_overflowing()) {
+    if (associated_block->type() == block_type_t::top && parser->function_stack_is_overflowing()) {
         return this->report_error(job_list, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
     }
     return this->run_job_list(job_list, associated_block);
diff --git a/src/parser.cpp b/src/parser.cpp
index d4c700db6..3c95491e2 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -75,33 +75,6 @@ class io_chain_t;
 /// Unknown block description.
 #define UNKNOWN_BLOCK N_(L"unknown/invalid block")
 
-/// Data structure to describe a block type, like while blocks, command substitution blocks, etc.
-struct block_lookup_entry {
-    // The block type id. The legal values are defined in parser.h.
-    block_type_t type;
-    // The name of the builtin that creates this type of block, if any.
-    const wchar_t *name;
-    // A description of this block type.
-    const wchar_t *desc;
-};
-
-/// List of all legal block types.
-static const struct block_lookup_entry block_lookup[] = {
-    {WHILE, L"while", WHILE_BLOCK},
-    {FOR, L"for", FOR_BLOCK},
-    {IF, L"if", IF_BLOCK},
-    {FUNCTION_CALL, nullptr, FUNCTION_CALL_BLOCK},
-    {FUNCTION_CALL_NO_SHADOW, nullptr, FUNCTION_CALL_NO_SHADOW_BLOCK},
-    {SWITCH, L"switch", SWITCH_BLOCK},
-    {TOP, nullptr, TOP_BLOCK},
-    {SUBST, nullptr, SUBST_BLOCK},
-    {BEGIN, L"begin", BEGIN_BLOCK},
-    {SOURCE, L"source", SOURCE_BLOCK},
-    {EVENT, nullptr, EVENT_BLOCK},
-    {BREAKPOINT, L"breakpoint", BREAKPOINT_BLOCK},
-    {VARIABLE_ASSIGNMENT, L"variable assignment", VARIABLE_ASSIGNMENT_BLOCK},
-    {static_cast<block_type_t>(0), nullptr, nullptr}};
-
 // Given a file path, return something nicer. Currently we just "unexpand" tildes.
 wcstring parser_t::user_presentable_path(const wcstring &path) const {
     return replace_home_directory_with_tilde(path, vars());
@@ -148,17 +121,18 @@ block_t *parser_t::push_block(block_t &&block) {
         new_current.src_filename = intern(filename);
     }
 
-    // Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
-    if (type != TOP && type != SUBST) {
+    // Types top and subst are not considered blocks for the purposes of `status is-block`.
+    if (type != block_type_t::top && type != block_type_t::subst) {
         libdata().is_block = true;
     }
 
-    if (type == BREAKPOINT) {
+    if (type == block_type_t::breakpoint) {
         libdata().is_breakpoint = true;
     }
 
-    if (new_current.type() != TOP) {
-        vars().push(type == FUNCTION_CALL);
+    if (new_current.type() != block_type_t::top) {
+        bool shadow = (type == block_type_t::function_call);
+        vars().push(shadow);
         new_current.wants_pop_env = true;
     }
 
@@ -181,7 +155,7 @@ void parser_t::pop_block(const block_t *expected) {
     // Figure out if `status is-block` should consider us to be in a block now.
     bool new_is_block = false;
     for (const auto &b : block_list) {
-        if (b.type() != TOP && b.type() != SUBST) {
+        if (b.type() != block_type_t::top && b.type() != block_type_t::subst) {
             new_is_block = true;
             break;
         }
@@ -191,7 +165,7 @@ void parser_t::pop_block(const block_t *expected) {
     // Are we still in a breakpoint?
     bool new_is_breakpoint = false;
     for (const auto &b : block_list) {
-        if (b.type() == BREAKPOINT) {
+        if (b.type() == block_type_t::breakpoint) {
             new_is_breakpoint = true;
             break;
         }
@@ -199,11 +173,35 @@ void parser_t::pop_block(const block_t *expected) {
     libdata().is_breakpoint = new_is_breakpoint;
 }
 
-const wchar_t *parser_t::get_block_desc(int block) const {
-    for (size_t i = 0; block_lookup[i].desc; i++) {
-        if (block_lookup[i].type == block) {
-            return _(block_lookup[i].desc);
-        }
+const wchar_t *parser_t::get_block_desc(block_type_t block) {
+    switch (block) {
+        case block_type_t::while_block:
+            return WHILE_BLOCK;
+        case block_type_t::for_block:
+            return FOR_BLOCK;
+        case block_type_t::if_block:
+            return IF_BLOCK;
+        case block_type_t::function_call:
+            return FUNCTION_CALL_BLOCK;
+
+        case block_type_t::function_call_no_shadow:
+            return FUNCTION_CALL_NO_SHADOW_BLOCK;
+        case block_type_t::switch_block:
+            return SWITCH_BLOCK;
+        case block_type_t::subst:
+            return SUBST_BLOCK;
+        case block_type_t::top:
+            return TOP_BLOCK;
+        case block_type_t::begin:
+            return BEGIN_BLOCK;
+        case block_type_t::source:
+            return SOURCE_BLOCK;
+        case block_type_t::event:
+            return EVENT_BLOCK;
+        case block_type_t::breakpoint:
+            return BREAKPOINT_BLOCK;
+        case block_type_t::variable_assignment:
+            return VARIABLE_ASSIGNMENT_BLOCK;
     }
     return _(UNKNOWN_BLOCK);
 }
@@ -339,7 +337,7 @@ std::shared_ptr<parser_t> parser_t::shared() { return shared_from_this(); }
 wcstring parser_t::stack_trace() const {
     wcstring trace;
     for (const auto &b : blocks()) {
-        if (b.type() == EVENT) {
+        if (b.type() == block_type_t::event) {
             // This is an event handler.
             assert(b.event && "Should have an event");
             wcstring description = event_get_desc(*b.event);
@@ -353,18 +351,19 @@ wcstring parser_t::stack_trace() const {
             break;
         }
 
-        if (b.type() == FUNCTION_CALL || b.type() == FUNCTION_CALL_NO_SHADOW ||
-            b.type() == SOURCE || b.type() == SUBST) {
+        if (b.type() == block_type_t::function_call ||
+            b.type() == block_type_t::function_call_no_shadow || b.type() == block_type_t::source ||
+            b.type() == block_type_t::subst) {
             // These types of blocks should be printed.
             switch (b.type()) {
-                case SOURCE: {
+                case block_type_t::source: {
                     const wchar_t *source_dest = b.sourced_file;
                     append_format(trace, _(L"from sourcing file %ls\n"),
                                   user_presentable_path(source_dest).c_str());
                     break;
                 }
-                case FUNCTION_CALL:
-                case FUNCTION_CALL_NO_SHADOW: {
+                case block_type_t::function_call:
+                case block_type_t::function_call_no_shadow: {
                     append_format(trace, _(L"in function '%ls'"), b.function_name.c_str());
                     // Print arguments on the same line.
                     wcstring args_str;
@@ -385,7 +384,7 @@ wcstring parser_t::stack_trace() const {
                     trace.push_back('\n');
                     break;
                 }
-                case SUBST: {
+                case block_type_t::subst: {
                     append_format(trace, _(L"in command substitution\n"));
                     break;
                 }
@@ -422,9 +421,9 @@ const wchar_t *parser_t::is_function(size_t idx) const {
 
     for (size_t block_idx = idx; block_idx < block_list.size(); block_idx++) {
         const block_t &b = block_list[block_idx];
-        if (b.is_function()) {
+        if (b.is_function_call()) {
             return b.function_name.c_str();
-        } else if (b.type() == SOURCE) {
+        } else if (b.type() == block_type_t::source) {
             // If a function sources a file, obviously that function's offset doesn't
             // contribute.
             break;
@@ -442,9 +441,9 @@ const wchar_t *parser_t::get_function_name(int level) {
         // Walk until we find a breakpoint, then take the next function.
         bool found_breakpoint = false;
         for (const auto &b : block_list) {
-            if (b.type() == BREAKPOINT) {
+            if (b.type() == block_type_t::breakpoint) {
                 found_breakpoint = true;
-            } else if (found_breakpoint && b.is_function()) {
+            } else if (found_breakpoint && b.is_function_call()) {
                 return b.function_name.c_str();
             }
         }
@@ -457,7 +456,7 @@ const wchar_t *parser_t::get_function_name(int level) {
     // Level 1 is the topmost function call. Level 2 is its caller. Etc.
     int funcs_seen = 0;
     for (const auto &b : block_list) {
-        if (b.is_function()) {
+        if (b.is_function_call()) {
             funcs_seen++;
             if (funcs_seen == level) {
                 return b.function_name.c_str();
@@ -479,9 +478,9 @@ const wchar_t *parser_t::current_filename() const {
     ASSERT_IS_MAIN_THREAD();
 
     for (const auto &b : block_list) {
-        if (b.is_function()) {
+        if (b.is_function_call()) {
             return function_get_definition_file(b.function_name);
-        } else if (b.type() == SOURCE) {
+        } else if (b.type() == block_type_t::source) {
             return b.sourced_file;
         }
     }
@@ -499,7 +498,7 @@ bool parser_t::function_stack_is_overflowing() const {
     // Count the functions.
     int depth = 0;
     for (const auto &b : block_list) {
-        depth += b.is_function();
+        depth += b.is_function_call();
     }
     return depth > FISH_MAX_STACK_DEPTH;
 }
@@ -620,7 +619,7 @@ eval_result_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
 
 eval_result_t parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io,
                              enum block_type_t block_type) {
-    assert(block_type == TOP || block_type == SUBST);
+    assert(block_type == block_type_t::top || block_type == block_type_t::subst);
     if (!ps->tree.empty()) {
         job_lineage_t lineage;
         lineage.block_io = io;
@@ -648,7 +647,8 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
     }
 
     // Only certain blocks are allowed.
-    assert((block_type == TOP || block_type == SUBST) && "Invalid block type");
+    assert((block_type == block_type_t::top || block_type == block_type_t::subst) &&
+           "Invalid block type");
 
     job_reap(*this, false);  // not sure why we reap jobs here
 
@@ -728,55 +728,55 @@ block_t::~block_t() = default;
 wcstring block_t::description() const {
     wcstring result;
     switch (this->type()) {
-        case WHILE: {
+        case block_type_t::while_block: {
             result.append(L"while");
             break;
         }
-        case FOR: {
+        case block_type_t::for_block: {
             result.append(L"for");
             break;
         }
-        case IF: {
+        case block_type_t::if_block: {
             result.append(L"if");
             break;
         }
-        case FUNCTION_CALL: {
+        case block_type_t::function_call: {
             result.append(L"function_call");
             break;
         }
-        case FUNCTION_CALL_NO_SHADOW: {
+        case block_type_t::function_call_no_shadow: {
             result.append(L"function_call_no_shadow");
             break;
         }
-        case SWITCH: {
+        case block_type_t::switch_block: {
             result.append(L"switch");
             break;
         }
-        case SUBST: {
+        case block_type_t::subst: {
             result.append(L"substitution");
             break;
         }
-        case TOP: {
+        case block_type_t::top: {
             result.append(L"top");
             break;
         }
-        case BEGIN: {
+        case block_type_t::begin: {
             result.append(L"begin");
             break;
         }
-        case SOURCE: {
+        case block_type_t::source: {
             result.append(L"source");
             break;
         }
-        case EVENT: {
+        case block_type_t::event: {
             result.append(L"event");
             break;
         }
-        case BREAKPOINT: {
+        case block_type_t::breakpoint: {
             result.append(L"breakpoint");
             break;
         }
-        case VARIABLE_ASSIGNMENT: {
+        case block_type_t::variable_assignment: {
             result.append(L"variable_assignment");
             break;
         }
@@ -793,33 +793,35 @@ wcstring block_t::description() const {
 
 // Various block constructors.
 
-block_t block_t::if_block() { return block_t(IF); }
+block_t block_t::if_block() { return block_t(block_type_t::if_block); }
 
 block_t block_t::event_block(event_t evt) {
-    block_t b{EVENT};
+    block_t b{block_type_t::event};
     b.event = std::move(evt);
     return b;
 }
 
 block_t block_t::function_block(wcstring name, wcstring_list_t args, bool shadows) {
-    block_t b{shadows ? FUNCTION_CALL : FUNCTION_CALL_NO_SHADOW};
+    block_t b{shadows ? block_type_t::function_call : block_type_t::function_call_no_shadow};
     b.function_name = std::move(name);
     b.function_args = std::move(args);
     return b;
 }
 
 block_t block_t::source_block(const wchar_t *src) {
-    block_t b{SOURCE};
+    block_t b{block_type_t::source};
     b.sourced_file = src;
     return b;
 }
 
-block_t block_t::for_block() { return block_t{FOR}; }
-block_t block_t::while_block() { return block_t{WHILE}; }
-block_t block_t::switch_block() { return block_t{SWITCH}; }
+block_t block_t::for_block() { return block_t{block_type_t::for_block}; }
+block_t block_t::while_block() { return block_t{block_type_t::while_block}; }
+block_t block_t::switch_block() { return block_t{block_type_t::switch_block}; }
 block_t block_t::scope_block(block_type_t type) {
-    assert((type == BEGIN || type == TOP || type == SUBST) && "Invalid scope type");
+    assert(
+        (type == block_type_t::begin || type == block_type_t::top || type == block_type_t::subst) &&
+        "Invalid scope type");
     return block_t(type);
 }
-block_t block_t::breakpoint_block() { return block_t(BREAKPOINT); }
-block_t block_t::variable_assignment_block() { return block_t(VARIABLE_ASSIGNMENT); }
+block_t block_t::breakpoint_block() { return block_t(block_type_t::breakpoint); }
+block_t block_t::variable_assignment_block() { return block_t(block_type_t::variable_assignment); }
diff --git a/src/parser.h b/src/parser.h
index 41fdb8999..697f520d6 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -31,20 +31,20 @@ inline bool event_block_list_blocks_type(const event_blockage_list_t &ebls) {
 }
 
 /// Types of blocks.
-enum block_type_t {
-    WHILE,                    /// While loop block
-    FOR,                      /// For loop block
-    IF,                       /// If block
-    FUNCTION_CALL,            /// Function invocation block
-    FUNCTION_CALL_NO_SHADOW,  /// Function invocation block with no variable shadowing
-    SWITCH,                   /// Switch block
-    SUBST,                    /// Command substitution scope
-    TOP,                      /// Outermost block
-    BEGIN,                    /// Unconditional block
-    SOURCE,                   /// Block created by the . (source) builtin
-    EVENT,                    /// Block created on event notifier invocation
-    BREAKPOINT,               /// Breakpoint block
-    VARIABLE_ASSIGNMENT,      /// Variable assignment before a command
+enum class block_type_t {
+    while_block,              /// While loop block
+    for_block,                /// For loop block
+    if_block,                 /// If block
+    function_call,            /// Function invocation block
+    function_call_no_shadow,  /// Function invocation block with no variable shadowing
+    switch_block,             /// Switch block
+    subst,                    /// Command substitution scope
+    top,                      /// Outermost block
+    begin,                    /// Unconditional block
+    source,                   /// Block created by the . (source) builtin
+    event,                    /// Block created on event notifier invocation
+    breakpoint,               /// Breakpoint block
+    variable_assignment,      /// Variable assignment before a command
 };
 
 /// Possible states for a loop.
@@ -91,8 +91,9 @@ class block_t {
     wcstring description() const;
 
     /// \return if we are a function call (with or without shadowing).
-    bool is_function() const {
-        return type() == FUNCTION_CALL || type() == FUNCTION_CALL_NO_SHADOW;
+    bool is_function_call() const {
+        return type() == block_type_t::function_call ||
+               type() == block_type_t::function_call_no_shadow;
     }
 
     /// Entry points for creating blocks.
@@ -329,7 +330,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     void pop_block(const block_t *expected);
 
     /// Return a description of the given blocktype.
-    const wchar_t *get_block_desc(int block) const;
+    static const wchar_t *get_block_desc(block_type_t block);
 
     /// Return the function name for the specified stack frame. Default is one (current frame).
     const wchar_t *get_function_name(int level = 1);
diff --git a/src/reader.cpp b/src/reader.cpp
index 517c94d13..6a857aa9b 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1952,7 +1952,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
 
     gettimeofday(&time_before, nullptr);
 
-    parser.eval(cmd, io_chain_t(), TOP);
+    parser.eval(cmd, io_chain_t(), block_type_t::top);
     job_reap(parser, true);
 
     gettimeofday(&time_after, nullptr);
@@ -2205,7 +2205,7 @@ void reader_bg_job_warning(const parser_t &parser) {
 static void handle_end_loop(const parser_t &parser) {
     if (!reader_exit_forced()) {
         for (const auto &b : parser.blocks()) {
-            if (b.type() == BREAKPOINT) {
+            if (b.type() == block_type_t::breakpoint) {
                 // We're executing within a breakpoint so we do not want to terminate the shell and
                 // kill background jobs.
                 return;
@@ -3551,7 +3551,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
         parsed_source_ref_t pstree;
         if (!parse_util_detect_errors(str, &errors, false /* do not accept incomplete */,
                                       &pstree)) {
-            parser.eval(pstree, io, TOP);
+            parser.eval(pstree, io, block_type_t::top);
         } else {
             wcstring sb;
             parser.get_backtrace(str, errors, sb);

From 0c49dce75d57fd5e0158ee76a8939678106cb025 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Dec 2019 16:22:20 -0800
Subject: [PATCH 1453/1732] Factor block description part of stack traces into
 a new function

---
 src/parser.cpp | 154 ++++++++++++++++++++++++++-----------------------
 src/parser.h   |   3 -
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 3c95491e2..3f721dcbb 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -76,8 +76,8 @@ class io_chain_t;
 #define UNKNOWN_BLOCK N_(L"unknown/invalid block")
 
 // Given a file path, return something nicer. Currently we just "unexpand" tildes.
-wcstring parser_t::user_presentable_path(const wcstring &path) const {
-    return replace_home_directory_with_tilde(path, vars());
+static wcstring user_presentable_path(const wcstring &path, const environment_t &vars) {
+    return replace_home_directory_with_tilde(path, vars);
 }
 
 parser_t::parser_t(std::shared_ptr<env_stack_t> vars) : variables(std::move(vars)) {
@@ -334,80 +334,89 @@ std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_lis
 
 std::shared_ptr<parser_t> parser_t::shared() { return shared_from_this(); }
 
-wcstring parser_t::stack_trace() const {
-    wcstring trace;
-    for (const auto &b : blocks()) {
-        if (b.type() == block_type_t::event) {
-            // This is an event handler.
+/// Append stack trace info for the block \p b to \p trace.
+static void append_block_description_to_stack_trace(const block_t &b, wcstring &trace,
+                                                    const environment_t &vars) {
+    bool print_call_site = false;
+    switch (b.type()) {
+        case block_type_t::function_call:
+        case block_type_t::function_call_no_shadow: {
+            append_format(trace, _(L"in function '%ls'"), b.function_name.c_str());
+            // Print arguments on the same line.
+            wcstring args_str;
+            for (const wcstring &arg : b.function_args) {
+                if (!args_str.empty()) args_str.push_back(L' ');
+                // We can't quote the arguments because we print this in quotes.
+                // As a special-case, add the empty argument as "".
+                if (!arg.empty()) {
+                    args_str.append(escape_string(arg, ESCAPE_ALL | ESCAPE_NO_QUOTED));
+                } else {
+                    args_str.append(L"\"\"");
+                }
+            }
+            if (!args_str.empty()) {
+                // TODO: Escape these.
+                append_format(trace, _(L" with arguments '%ls'"), args_str.c_str());
+            }
+            trace.push_back('\n');
+            print_call_site = true;
+            break;
+        }
+        case block_type_t::subst: {
+            append_format(trace, _(L"in command substitution\n"));
+            print_call_site = true;
+            break;
+        }
+        case block_type_t::source: {
+            const wchar_t *source_dest = b.sourced_file;
+            append_format(trace, _(L"from sourcing file %ls\n"),
+                          user_presentable_path(source_dest, vars).c_str());
+            print_call_site = true;
+            break;
+        }
+        case block_type_t::event: {
             assert(b.event && "Should have an event");
             wcstring description = event_get_desc(*b.event);
             append_format(trace, _(L"in event handler: %ls\n"), description.c_str());
-
-            // Stop at event handler. No reason to believe that any other code is relevant.
-            //
-            // It might make sense in the future to continue printing the stack trace of the code
-            // that invoked the event, if this is a programmatic event, but we can't currently
-            // detect that.
+            print_call_site = true;
             break;
         }
 
-        if (b.type() == block_type_t::function_call ||
-            b.type() == block_type_t::function_call_no_shadow || b.type() == block_type_t::source ||
-            b.type() == block_type_t::subst) {
-            // These types of blocks should be printed.
-            switch (b.type()) {
-                case block_type_t::source: {
-                    const wchar_t *source_dest = b.sourced_file;
-                    append_format(trace, _(L"from sourcing file %ls\n"),
-                                  user_presentable_path(source_dest).c_str());
-                    break;
-                }
-                case block_type_t::function_call:
-                case block_type_t::function_call_no_shadow: {
-                    append_format(trace, _(L"in function '%ls'"), b.function_name.c_str());
-                    // Print arguments on the same line.
-                    wcstring args_str;
-                    for (const wcstring &arg : b.function_args) {
-                        if (!args_str.empty()) args_str.push_back(L' ');
-                        // We can't quote the arguments because we print this in quotes.
-                        // As a special-case, add the empty argument as "".
-                        if (!arg.empty()) {
-                            args_str.append(escape_string(arg, ESCAPE_ALL | ESCAPE_NO_QUOTED));
-                        } else {
-                            args_str.append(L"\"\"");
-                        }
-                    }
-                    if (!args_str.empty()) {
-                        // TODO: Escape these.
-                        append_format(trace, _(L" with arguments '%ls'"), args_str.c_str());
-                    }
-                    trace.push_back('\n');
-                    break;
-                }
-                case block_type_t::subst: {
-                    append_format(trace, _(L"in command substitution\n"));
-                    break;
-                }
-                default: {
-                    break;  // can't get here
-                }
-            }
-
-            // Print where the function is called.
-            const wchar_t *file = b.src_filename;
-
-            if (file) {
-                append_format(trace, _(L"\tcalled on line %d of file %ls\n"), b.src_lineno,
-                              user_presentable_path(file).c_str());
-            } else if (is_within_fish_initialization()) {
-                append_format(trace, _(L"\tcalled during startup\n"));
-            } else {
-                // This one is way too noisy
-                // append_format(*buff, _(L"\tcalled on standard input\n"));
-            }
-        }
+        case block_type_t::top:
+        case block_type_t::begin:
+        case block_type_t::switch_block:
+        case block_type_t::while_block:
+        case block_type_t::for_block:
+        case block_type_t::if_block:
+        case block_type_t::breakpoint:
+        case block_type_t::variable_assignment:
+            break;
     }
 
+    if (print_call_site) {
+        // Print where the function is called.
+        const wchar_t *file = b.src_filename;
+        if (file) {
+            append_format(trace, _(L"\tcalled on line %d of file %ls\n"), b.src_lineno,
+                          user_presentable_path(file, vars).c_str());
+        } else if (is_within_fish_initialization()) {
+            append_format(trace, _(L"\tcalled during startup\n"));
+        }
+    }
+}
+
+wcstring parser_t::stack_trace() const {
+    wcstring trace;
+    for (const auto &b : blocks()) {
+        append_block_description_to_stack_trace(b, trace, vars());
+
+        // Stop at event handler. No reason to believe that any other code is relevant.
+        //
+        // It might make sense in the future to continue printing the stack trace of the code
+        // that invoked the event, if this is a programmatic event, but we can't currently
+        // detect that.
+        if (b.type() == block_type_t::event) break;
+    }
     return trace;
 }
 
@@ -520,8 +529,8 @@ wcstring parser_t::current_line() {
     // If we are not going to print a stack trace, at least print the line number and filename.
     if (!is_interactive() || is_function()) {
         if (file) {
-            append_format(prefix, _(L"%ls (line %d): "), user_presentable_path(file).c_str(),
-                          lineno);
+            append_format(prefix, _(L"%ls (line %d): "),
+                          user_presentable_path(file, vars()).c_str(), lineno);
         } else if (is_within_fish_initialization()) {
             append_format(prefix, L"%ls (line %d): ", _(L"Startup"), lineno);
         } else {
@@ -703,9 +712,10 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
         if (filename) {
             if (which_line > 0) {
                 prefix = format_string(_(L"%ls (line %lu): "),
-                                       user_presentable_path(filename).c_str(), which_line);
+                                       user_presentable_path(filename, vars()).c_str(), which_line);
             } else {
-                prefix = format_string(_(L"%ls: "), user_presentable_path(filename).c_str());
+                prefix =
+                    format_string(_(L"%ls: "), user_presentable_path(filename, vars()).c_str());
             }
         } else {
             prefix = L"fish: ";
diff --git a/src/parser.h b/src/parser.h
index 697f520d6..e45372c89 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -237,9 +237,6 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// every block if it is of type FUNCTION_CALL.
     const wchar_t *is_function(size_t idx = 0) const;
 
-    // Given a file path, return something nicer. Currently we just "unexpand" tildes.
-    wcstring user_presentable_path(const wcstring &path) const;
-
     /// Create a parser.
     parser_t();
     parser_t(std::shared_ptr<env_stack_t> vars);

From c19407ab0f694431d99b0af89270d8aa90647261 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 22 Dec 2019 16:27:03 -0800
Subject: [PATCH 1454/1732] Default parser_t::eval()'s block type to top

This is the parameter value at every call site except one. Just make it the
default.
---
 src/builtin.cpp      |  2 +-
 src/builtin_eval.cpp |  3 +--
 src/event.cpp        |  2 +-
 src/exec.cpp         |  5 ++---
 src/fish.cpp         |  4 ++--
 src/fish_tests.cpp   | 14 ++++++--------
 src/input.cpp        |  2 +-
 src/parser.cpp       | 10 +++++-----
 src/parser.h         | 13 ++++++++-----
 src/reader.cpp       |  4 ++--
 10 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 7af538e95..469feb416 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -165,7 +165,7 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t *
         // If it's an error, redirect the output of __fish_print_help to stderr
         ios.push_back(std::make_shared<io_fd_t>(STDOUT_FILENO, STDERR_FILENO));
     }
-    parser.eval(cmd, ios, block_type_t::top);
+    parser.eval(cmd, ios);
     // ignore the exit status of __fish_print_help
 }
 
diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index f53b5be1b..7a3acc9b9 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -27,8 +27,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(std::move(new_cmd), *streams.io_chain, block_type_t::top) !=
-            eval_result_t::ok) {
+        if (parser.eval(std::move(new_cmd), *streams.io_chain) != eval_result_t::ok) {
             status = STATUS_CMD_ERROR;
         } else if (cached_exec_count == parser.libdata().exec_count) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
diff --git a/src/event.cpp b/src/event.cpp
index 011c3e007..3382fa2a9 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -286,7 +286,7 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
         auto prev_statuses = parser.get_last_statuses();
 
         block_t *b = parser.push_block(block_t::event_block(event));
-        parser.eval(buffer, io_chain_t(), block_type_t::top);
+        parser.eval(buffer, io_chain_t());
         parser.pop_block(b);
         parser.set_last_statuses(std::move(prev_statuses));
     }
diff --git a/src/exec.cpp b/src/exec.cpp
index 664afcc5c..c5d4a414e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -733,7 +733,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
         return [=](parser_t &parser) {
-            eval_result_t res = parser.eval_node(source, node, block_type_t::top, lineage);
+            eval_result_t res = parser.eval_node(source, node, lineage);
             switch (res) {
                 case eval_result_t::ok:
                 case eval_result_t::error:
@@ -758,8 +758,7 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            auto res = parser.eval_node(props->parsed_source, props->body_node, block_type_t::top,
-                                        lineage);
+            auto res = parser.eval_node(props->parsed_source, props->body_node, lineage);
             function_restore_environment(parser, fb);
 
             switch (res) {
diff --git a/src/fish.cpp b/src/fish.cpp
index 80ca51949..82ff5387e 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -228,7 +228,7 @@ static void source_config_in_directory(const wcstring &dir) {
     const wcstring cmd = L"builtin source " + escaped_pathname;
     parser_t &parser = parser_t::principal_parser();
     set_is_within_fish_initialization(true);
-    parser.eval(cmd, io_chain_t(), block_type_t::top);
+    parser.eval(cmd, io_chain_t());
     set_is_within_fish_initialization(false);
 }
 
@@ -254,7 +254,7 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
 
     for (const auto &cmd : *cmds) {
         const wcstring cmd_wcs = str2wcstring(cmd);
-        eval_result_t eval_res = parser.eval(cmd_wcs, io, block_type_t::top);
+        eval_result_t eval_res = parser.eval(cmd_wcs, io);
         res = (eval_res == eval_result_t::ok ? 0 : 1);
     }
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 3720f7315..b1597bb61 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1003,17 +1003,16 @@ static void test_parser() {
     // Ensure that we don't crash on infinite self recursion and mutual recursion. These must use
     // the principal parser because we cannot yet execute jobs on other parsers.
     say(L"Testing recursion detection");
-    parser->eval(L"function recursive ; recursive ; end ; recursive; ", io_chain_t(),
-                 block_type_t::top);
+    parser->eval(L"function recursive ; recursive ; end ; recursive; ", io_chain_t());
 #if 0
     // This is disabled since it produces a long backtrace. We should find a way to either visually
     // compress the backtrace, or disable error spewing.
     parser->.eval(L"function recursive1 ; recursive2 ; end ; "
-            L"function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t(), block_type_t::top);
+            L"function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t());
 #endif
 
     say(L"Testing empty function name");
-    parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(), block_type_t::top);
+    parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t());
 
     say(L"Testing eval_args");
     completion_list_t comps = parser_t::expand_argument_list(
@@ -1033,8 +1032,7 @@ static void test_1_cancellation(const wchar_t *src) {
         usleep(delay * 1E6);
         pthread_kill(thread, SIGINT);
     });
-    eval_result_t ret =
-        parser_t::principal_parser().eval(src, io_chain_t{filler}, block_type_t::top);
+    eval_result_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler});
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
@@ -1076,7 +1074,7 @@ static void test_cancellation() {
     bool iis = is_interactive_session();
     set_interactive_session(true);
     const wchar_t *child_self_destructor = L"while true ; sh -c 'sleep .25; kill -s INT $$' ; end";
-    parser_t::principal_parser().eval(child_self_destructor, io_chain_t(), block_type_t::top);
+    parser_t::principal_parser().eval(child_self_destructor, io_chain_t());
     set_interactive_session(iis);
 
     // Restore signal handling.
@@ -5200,7 +5198,7 @@ static void test_illegal_command_exit_code() {
     parser_t &parser = parser_t::principal_parser();
 
     for (const auto &test : tests) {
-        parser.eval(test.txt, empty_ios, block_type_t::top);
+        parser.eval(test.txt, empty_ios);
 
         int exit_status = parser.get_last_status();
         if (exit_status != test.result) {
diff --git a/src/input.cpp b/src/input.cpp
index a194fab2a..9eba49675 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -389,7 +389,7 @@ void inputter_t::mapping_execute(const input_mapping_t &m, bool allow_commands)
         // see that until all other commands have also been run.
         auto last_statuses = parser_->get_last_statuses();
         for (const wcstring &cmd : m.commands) {
-            parser_->eval(cmd, io_chain_t(), block_type_t::top);
+            parser_->eval(cmd, io_chain_t{});
         }
         parser_->set_last_statuses(std::move(last_statuses));
         event_queue_.push_front(char_event_type_t::check_exit);
diff --git a/src/parser.cpp b/src/parser.cpp
index 3f721dcbb..e901b61d6 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -634,14 +634,14 @@ eval_result_t parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io,
         lineage.block_io = io;
         // Execute the first node.
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
-        return this->eval_node(ps, start, block_type, std::move(lineage));
+        return this->eval_node(ps, start, std::move(lineage), block_type);
     }
     return eval_result_t::ok;
 }
 
 template <typename T>
-eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
-                                  job_lineage_t lineage) {
+eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, job_lineage_t lineage,
+                                  block_type_t block_type) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -684,9 +684,9 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, block
 
 // Explicit instantiations. TODO: use overloads instead?
 template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::statement>,
-                                           enum block_type_t, job_lineage_t lineage);
+                                           job_lineage_t, block_type_t);
 template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>,
-                                           enum block_type_t, job_lineage_t lineage);
+                                           job_lineage_t, block_type_t);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                              wcstring &output) const {
diff --git a/src/parser.h b/src/parser.h
index e45372c89..6357643bf 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -259,20 +259,23 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     ///
     /// \param cmd the string to evaluate
     /// \param io io redirections to perform on all started jobs
-    /// \param block_type The type of block to push on the block stack
+    /// \param block_type The type of block to push on the block stack, which must be either 'top'
+    /// or 'subst'.
     ///
     /// \return the eval result,
-    eval_result_t eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type);
+    eval_result_t eval(const wcstring &cmd, const io_chain_t &io,
+                       block_type_t block_type = block_type_t::top);
 
     /// Evaluate the parsed source ps.
     /// Because the source has been parsed, a syntax error is impossible.
-    eval_result_t eval(parsed_source_ref_t ps, const io_chain_t &io, enum block_type_t block_type);
+    eval_result_t eval(parsed_source_ref_t ps, const io_chain_t &io,
+                       block_type_t block_type = block_type_t::top);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    eval_result_t eval_node(parsed_source_ref_t ps, tnode_t<T> node, block_type_t block_type,
-                            job_lineage_t lineage);
+    eval_result_t eval_node(parsed_source_ref_t ps, tnode_t<T> node, job_lineage_t lineage,
+                            block_type_t block_type = block_type_t::top);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
diff --git a/src/reader.cpp b/src/reader.cpp
index 6a857aa9b..a9be240d2 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1952,7 +1952,7 @@ void reader_run_command(parser_t &parser, const wcstring &cmd) {
 
     gettimeofday(&time_before, nullptr);
 
-    parser.eval(cmd, io_chain_t(), block_type_t::top);
+    parser.eval(cmd, io_chain_t{});
     job_reap(parser, true);
 
     gettimeofday(&time_after, nullptr);
@@ -3551,7 +3551,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
         parsed_source_ref_t pstree;
         if (!parse_util_detect_errors(str, &errors, false /* do not accept incomplete */,
                                       &pstree)) {
-            parser.eval(pstree, io, block_type_t::top);
+            parser.eval(pstree, io);
         } else {
             wcstring sb;
             parser.get_backtrace(str, errors, sb);

From 15c1b3ed4b45e076b0573815292fb302a4220c9c Mon Sep 17 00:00:00 2001
From: Mathieu Duponchelle <mathieu@centricular.com>
Date: Thu, 12 Dec 2019 13:50:33 +0100
Subject: [PATCH 1455/1732] Place fish in its own process group when launched
 with -i

Fixes #5909
---
 src/builtin.cpp             |  3 ++-
 src/builtin_commandline.cpp |  2 +-
 src/builtin_status.cpp      |  2 +-
 src/env_dispatch.cpp        |  7 ++++---
 src/fish.cpp                |  6 +++---
 src/fish_key_reader.cpp     |  3 ++-
 src/fish_tests.cpp          |  6 +++---
 src/proc.cpp                |  9 +++++----
 src/proc.h                  |  5 +++--
 src/reader.cpp              | 10 ++++++----
 10 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 469feb416..d27f4f8af 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -449,7 +449,8 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
     if (const builtin_data_t *data = builtin_lookup(argv[0])) {
         // If we are interactive, save the foreground pgroup and restore it after in case the
         // builtin needs to read from the terminal. See #4540.
-        bool grab_tty = is_interactive_session() && isatty(streams.stdin_fd);
+        bool grab_tty = session_interactivity() != session_interactivity_t::not_interactive &&
+                        isatty(streams.stdin_fd);
         pid_t pgroup_to_restore = grab_tty ? terminal_acquire_before_builtin(job_pgid) : -1;
         int ret = data->func(parser, streams, argv);
         if (pgroup_to_restore >= 0) {
diff --git a/src/builtin_commandline.cpp b/src/builtin_commandline.cpp
index f91db88b0..e8cf67f7f 100644
--- a/src/builtin_commandline.cpp
+++ b/src/builtin_commandline.cpp
@@ -160,7 +160,7 @@ int builtin_commandline(parser_t &parser, io_streams_t &streams, wchar_t **argv)
     }
 
     if (!current_buffer) {
-        if (is_interactive_session()) {
+        if (session_interactivity() != session_interactivity_t::not_interactive) {
             // Prompt change requested while we don't have a prompt, most probably while reading the
             // init files. Just ignore it.
             return STATUS_CMD_ERROR;
diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 2fcbce962..34765bb21 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -384,7 +384,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         case STATUS_IS_INTERACTIVE: {
             CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd)
-            retval = !is_interactive_session();
+            retval = session_interactivity() == session_interactivity_t::not_interactive ? 1 : 0;
             break;
         }
         case STATUS_IS_COMMAND_SUB: {
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 1a747c677..41ce0cf62 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -394,11 +394,12 @@ static bool initialize_curses_using_fallback(const char *term) {
     auto term_env = wcs2string(term_var->as_string());
     if (term_env == DEFAULT_TERM1 || term_env == DEFAULT_TERM2) return false;
 
-    if (is_interactive_session()) debug(1, _(L"Using fallback terminal type '%s'."), term);
+    if (session_interactivity() != session_interactivity_t::not_interactive)
+        debug(1, _(L"Using fallback terminal type '%s'."), term);
 
     int err_ret;
     if (setupterm(const_cast<char *>(term), STDOUT_FILENO, &err_ret) == OK) return true;
-    if (is_interactive_session()) {
+    if (session_interactivity() != session_interactivity_t::not_interactive) {
         debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
     }
     return false;
@@ -457,7 +458,7 @@ static void init_curses(const environment_t &vars) {
     int err_ret;
     if (setupterm(nullptr, STDOUT_FILENO, &err_ret) == ERR) {
         auto term = vars.get(L"TERM");
-        if (is_interactive_session()) {
+        if (session_interactivity() != session_interactivity_t::not_interactive) {
             debug(1, _(L"Could not set up terminal."));
             if (term.missing_or_empty()) {
                 debug(1, _(L"TERM environment variable not set."));
diff --git a/src/fish.cpp b/src/fish.cpp
index 82ff5387e..8b013c52e 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -396,7 +396,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
     // command or file to execute and stdin is a tty. Note that the -i or
     // --interactive options also force interactive mode.
     if (opts->batch_cmds.empty() && optind == argc && isatty(STDIN_FILENO)) {
-        set_interactive_session(true);
+        set_interactive_session(session_interactivity_t::implied);
     }
 
     return optind;
@@ -446,11 +446,11 @@ int main(int argc, char **argv) {
     // Apply our options.
     if (opts.is_login) mark_login();
     if (opts.no_exec) mark_no_exec();
-    if (opts.is_interactive_session) set_interactive_session(true);
+    if (opts.is_interactive_session) set_interactive_session(session_interactivity_t::explicit_);
 
     // Only save (and therefore restore) the fg process group if we are interactive. See issues
     // #197 and #1002.
-    if (is_interactive_session()) {
+    if (session_interactivity() != session_interactivity_t::not_interactive) {
         save_term_foreground_process_group();
     }
 
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index ef556df71..8f6a04969 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -287,7 +287,8 @@ static void install_our_signal_handlers() {
 
 /// Setup our environment (e.g., tty modes), process key strokes, then reset the environment.
 static void setup_and_process_keys(bool continuous_mode) {
-    set_interactive_session(true);  // by definition this program is interactive
+    set_interactive_session(
+        session_interactivity_t::implied);  // by definition this program is interactive
     set_main_thread();
     setup_fork_guards();
     env_init();
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index b1597bb61..2ab4f7bc1 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1069,10 +1069,10 @@ static void test_cancellation() {
 
     // Ensure that if child processes SIGINT, we exit our loops
     // Test for #3780
-    // Ugly hack - temporarily set is_interactive_session
+    // Ugly hack - temporarily fake an interactive session
     // else we will SIGINT ourselves in response to our child death
-    bool iis = is_interactive_session();
-    set_interactive_session(true);
+    session_interactivity_t iis = session_interactivity();
+    set_interactive_session(session_interactivity_t::implied);
     const wchar_t *child_self_destructor = L"while true ; sh -c 'sleep .25; kill -s INT $$' ; end";
     parser_t::principal_parser().eval(child_self_destructor, io_chain_t());
     set_interactive_session(iis);
diff --git a/src/proc.cpp b/src/proc.cpp
index 71b17d3e2..4ac9c1ec8 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -54,9 +54,10 @@
 /// The signals that signify crashes to us.
 static const int crashsignals[] = {SIGABRT, SIGBUS, SIGFPE, SIGILL, SIGSEGV, SIGSYS};
 
-static relaxed_atomic_bool_t s_is_interactive_session{false};
-bool is_interactive_session() { return s_is_interactive_session; }
-void set_interactive_session(bool flag) { s_is_interactive_session = flag; }
+static relaxed_atomic_t<session_interactivity_t> s_is_interactive_session{
+    session_interactivity_t::not_interactive};
+session_interactivity_t session_interactivity() { return s_is_interactive_session; }
+void set_interactive_session(session_interactivity_t flag) { s_is_interactive_session = flag; }
 
 static relaxed_atomic_bool_t s_is_login{false};
 bool get_login() { return s_is_login; }
@@ -245,7 +246,7 @@ static void handle_child_status(process_t *proc, proc_status_t status) {
     if (status.signal_exited()) {
         int sig = status.signal_code();
         if (sig == SIGINT || sig == SIGQUIT) {
-            if (is_interactive_session()) {
+            if (session_interactivity() != session_interactivity_t::not_interactive) {
                 // In an interactive session, tell the principal parser to skip all blocks we're
                 // executing so control-C returns control to the user.
                 parser_t::skip_all_blocks();
diff --git a/src/proc.h b/src/proc.h
index c209007b3..5042f35c7 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -475,8 +475,9 @@ class job_t {
 };
 
 /// Whether this shell is attached to the keyboard at all.
-bool is_interactive_session();
-void set_interactive_session(bool flag);
+enum class session_interactivity_t { not_interactive, implied, explicit_ };
+session_interactivity_t session_interactivity();
+void set_interactive_session(session_interactivity_t flag);
 
 /// Whether we are a login shell.
 bool get_login();
diff --git a/src/reader.cpp b/src/reader.cpp
index a9be240d2..38d33a0a3 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1734,7 +1734,7 @@ static void reader_interactive_init(parser_t &parser) {
                 owner = tcgetpgrp(STDIN_FILENO);
             }
             if (owner == -1 && errno == ENOTTY) {
-                if (!is_interactive_session()) {
+                if (session_interactivity() == session_interactivity_t::not_interactive) {
                     // It's OK if we're not able to take control of the terminal. We handle
                     // the fallout from this in a few other places.
                     break;
@@ -1772,7 +1772,8 @@ static void reader_interactive_init(parser_t &parser) {
     // It shouldn't be necessary to place fish in its own process group and force control
     // of the terminal, but that works around fish being started with an invalid pgroup,
     // such as when launched via firejail (#5295)
-    if (shell_pgid == 0) {
+    // Also become the process group leader if flag -i/--interactive was given (#5909).
+    if (shell_pgid == 0 || session_interactivity() == session_interactivity_t::explicit_) {
         shell_pgid = getpid();
         if (setpgid(shell_pgid, shell_pgid) < 0) {
             FLOG(error, _(L"Failed to assign shell to its own process group"));
@@ -3239,7 +3240,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         // This check is required to work around certain issues with fish's approach to
         // terminal control when launching interactive processes while in non-interactive
         // mode. See #4178 for one such example.
-        if (err != ENOTTY || is_interactive_session()) {
+        if (err != ENOTTY || session_interactivity() != session_interactivity_t::not_interactive) {
             wperror(L"tcsetattr");
         }
     }
@@ -3342,7 +3343,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
     if (!reader_exit_forced()) {
         // The order of the two conditions below is important. Try to restore the mode
         // in all cases, but only complain if interactive.
-        if (tcsetattr(0, TCSANOW, &old_modes) == -1 && is_interactive_session()) {
+        if (tcsetattr(0, TCSANOW, &old_modes) == -1 &&
+            session_interactivity() != session_interactivity_t::not_interactive) {
             if (errno == EIO) redirect_tty_output();
             wperror(L"tcsetattr");  // return to previous mode
         }

From 74ab9e72ac187a4e8bf9b5047856b894fbbf957b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 23 Dec 2019 22:26:49 +0800
Subject: [PATCH 1456/1732] cmake: pass C++ standard compiler options to tests

Enables CMake policy 0067.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f1560ecf..46cf4cad8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ IF(POLICY CMP0066)
   CMAKE_POLICY(SET CMP0066 OLD)
 ENDIF()
 IF(POLICY CMP0067)
-  CMAKE_POLICY(SET CMP0067 OLD)
+  CMAKE_POLICY(SET CMP0067 NEW)
 ENDIF()
 
 PROJECT(fish)

From 4d325dcd7abcfd132989306b9399e69a34877d8e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 23 Dec 2019 22:10:30 +0800
Subject: [PATCH 1457/1732] cmake: tidy up adding C++11 compile flags

Two blocks of code were trying to do the same thing in different ways;
standardise on one, and only add the compile flags if CMake won't do it
itself (policy CMP0067).
---
 cmake/ConfigureChecks.cmake | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 70ed8e5da..665fd5935 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -181,7 +181,10 @@ CMAKE_POP_CHECK_STATE()
 # the CHECK_CXX_SOURCE_COMPILES function. See CMake issue #16456.
 # Ensure we do this after the FIND_PACKAGE calls which use C, and will error on a C++
 # standards flag.
-LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
+# Also see https://github.com/fish-shell/fish-shell/issues/5865
+IF(NOT POLICY CMP0067)
+  LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
+ENDIF()
 
 CHECK_CXX_SOURCE_COMPILES("
 #include <memory>
@@ -195,14 +198,6 @@ int main () {
 
 FIND_PROGRAM(SED sed)
 
-# https://github.com/fish-shell/fish-shell/issues/5865
-CMAKE_PUSH_CHECK_STATE()
-# Needed until CMP0067 is set to NEW
-# g++ 4.8 needs -std=gnu+11 set to enable atomic features, but CMake < 3.8 does not add that
-# flag to TRY_COMPILE targets even when set for the project
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    LIST(APPEND CMAKE_REQUIRED_FLAGS "-std=gnu++11")
-ENDIF()
 CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 #include <cstdint>
@@ -214,4 +209,3 @@ LIBATOMIC_NOT_NEEDED)
 IF (NOT LIBATOMIC_NOT_NEEDED)
     SET(ATOMIC_LIBRARY "atomic")
 ENDIF()
-CMAKE_POP_CHECK_STATE()

From 8ca936aea644c91b5ed913fb5eb036627748bd1f Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 23 Dec 2019 22:18:51 +0800
Subject: [PATCH 1458/1732] cmake: use C++ extension options when checking
 features

This matches the CMake default of extensions turned on.
---
 cmake/ConfigureChecks.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 665fd5935..5f09ee1b5 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -183,7 +183,7 @@ CMAKE_POP_CHECK_STATE()
 # standards flag.
 # Also see https://github.com/fish-shell/fish-shell/issues/5865
 IF(NOT POLICY CMP0067)
-  LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION}")
+  LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_EXTENSION}_STANDARD_COMPILE_OPTION}")
 ENDIF()
 
 CHECK_CXX_SOURCE_COMPILES("

From 9f48fc6285c265daa42c875b39185969d1f702e7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 23 Dec 2019 13:49:40 +0100
Subject: [PATCH 1459/1732] Fix status when function/block evaluation is
 cancelled

It looks like the last status already contains the signal that cancelled
execution.

Also make `fish -c something` always return the last exit status of
"something", instead of hardcoded 127 if exited or signalled.

Fixes #6444
---
 src/exec.cpp             |  9 ++-------
 src/fish.cpp             |  6 ++----
 tests/checks/signal.fish | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index c5d4a414e..02b510bad 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -737,10 +737,8 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
             switch (res) {
                 case eval_result_t::ok:
                 case eval_result_t::error:
-                    return proc_status_t::from_exit_code(parser.get_last_status());
                 case eval_result_t::cancelled:
-                    // TODO: we should reflect the actual signal which was received.
-                    return proc_status_t::from_signal(SIGINT);
+                    return proc_status_t::from_exit_code(parser.get_last_status());
                 case eval_result_t::control_flow:
                 default:
                     DIE("eval_result_t::control_flow should not be returned from eval_node");
@@ -768,11 +766,8 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
                                                              ? EXIT_SUCCESS
                                                              : parser.get_last_status());
                 case eval_result_t::error:
-                    return proc_status_t::from_exit_code(parser.get_last_status());
-
                 case eval_result_t::cancelled:
-                    // TODO: we should reflect the actual signal which was received.
-                    return proc_status_t::from_signal(SIGINT);
+                    return proc_status_t::from_exit_code(parser.get_last_status());
                 default:
                 case eval_result_t::control_flow:
                     DIE("eval_result_t::control_flow should not be returned from eval_node");
diff --git a/src/fish.cpp b/src/fish.cpp
index 8b013c52e..f9d7e2f38 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -249,16 +249,14 @@ static int read_init(const struct config_paths_t &paths) {
 }
 
 int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
-    int res = 1;
     parser_t &parser = parser_t::principal_parser();
 
     for (const auto &cmd : *cmds) {
         const wcstring cmd_wcs = str2wcstring(cmd);
-        eval_result_t eval_res = parser.eval(cmd_wcs, io);
-        res = (eval_res == eval_result_t::ok ? 0 : 1);
+        parser.eval(cmd_wcs, io);
     }
 
-    return res;
+    return 0;
 }
 
 /// Parse the argument list, return the index of the first non-flag arguments.
diff --git a/tests/checks/signal.fish b/tests/checks/signal.fish
index 00bd45ac7..504fff97d 100644
--- a/tests/checks/signal.fish
+++ b/tests/checks/signal.fish
@@ -1,4 +1,16 @@
-# RUN: %fish %s
+# RUN: %fish -C 'set -l fish %fish' %s
+
+$fish -c 'function main; exit 4; true; end; main'; echo $status
+#CHECK: 4
+
+$fish -c 'begin; exit 5; true; end'; echo $status
+#CHECK: 5
+
+$fish -c 'kill -SIGHUP %self'; echo $status
+#CHECK: 129
+
+$fish -c 'function main; kill -SIGTERM %self; true; end; main'; echo $status
+#CHECK: 143
 
 function alarm --on-signal ALRM
   echo ALRM received

From c0f2e842ada1b1dcb50921bd165f54945093ac9a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 25 Dec 2019 10:26:03 +0100
Subject: [PATCH 1460/1732] Document missing bind functions

Turns out we never documented the "jump" ones.

That means the still-undocumented bind functions are

- vi-arg-digit
- vi-delete-to
- and

Mostly because I'd have to look up what they actually *do*, and
possibly rename them to be generic.

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 59f589266..4089b099d 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -90,6 +90,8 @@ The following special input functions are available:
 
 - ``begin-selection``, start selecting text
 
+- ``cancel``, cancel the current commandline and replace it with a new empty one
+
 - ``capitalize-word``, make the current word begin with a capital letter
 
 - ``complete``, guess the remainder of the current token
@@ -114,6 +116,8 @@ The following special input functions are available:
 
 - ``expand-abbr`` expands any abbreviation currently under the cursor
 
+- ``execute`` run the current commandline
+
 - ``forward-bigword``, move one whitespace-delimited word to the right
 
 - ``forward-char``, move one character to the right
@@ -132,6 +136,12 @@ The following special input functions are available:
 
 - ``history-token-search-forward``, search the history for the next matching argument
 
+- ``forward-jump`` and ``backward-jump``, read another character and jump to its next occurence after/before the cursor
+
+- ``forward-jump-till`` and ``backward-jump-till``, jump to right *before* the next occurence
+
+- ``repeat-jump`` and ``repeat-jump-reverse``, redo the last jump in the same/opposite direction
+
 - ``kill-bigword``, move the next whitespace-delimited word to the killring
 
 - ``kill-line``, move everything from the cursor to the end of the line to the killring
@@ -148,6 +158,8 @@ The following special input functions are available:
 
 - ``repaint-mode`` reexecutes the fish_mode_prompt function and redraws the prompt. This is useful for vi-mode. If no fish_mode_prompt exists, it acts like a normal repaint.
 
+- ``force-repaint`` reexecute the prompt functions without coalescing.
+
 - ``suppress-autosuggestion``, remove the current autosuggestion
 
 - ``swap-selection-start-stop``, go to the other end of the highlighted text without changing the selection
@@ -164,7 +176,6 @@ The following special input functions are available:
 
 - ``yank-pop``, rotate to the previous entry of the killring
 
-
 Examples
 --------
 

From e986970f4d13b8280556dec15d464063984faa84 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 25 Dec 2019 10:44:27 +0100
Subject: [PATCH 1461/1732] Remove vi_arg_digit and vi_delete_to

They don't do anything anymore.
---
 src/input.cpp      | 2 --
 src/input_common.h | 2 --
 src/reader.cpp     | 7 -------
 3 files changed, 11 deletions(-)

diff --git a/src/input.cpp b/src/input.cpp
index 9eba49675..6aec246b3 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -121,8 +121,6 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::upcase_word, L"upcase-word"},
     {readline_cmd_t::downcase_word, L"downcase-word"},
     {readline_cmd_t::capitalize_word, L"capitalize-word"},
-    {readline_cmd_t::vi_arg_digit, L"vi-arg-digit"},
-    {readline_cmd_t::vi_delete_to, L"vi-delete-to"},
     {readline_cmd_t::execute, L"execute"},
     {readline_cmd_t::beginning_of_buffer, L"beginning-of-buffer"},
     {readline_cmd_t::end_of_buffer, L"end-of-buffer"},
diff --git a/src/input_common.h b/src/input_common.h
index 9d3ecd6ca..f9182fd33 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -47,8 +47,6 @@ enum class readline_cmd_t {
     upcase_word,
     downcase_word,
     capitalize_word,
-    vi_arg_digit,
-    vi_delete_to,
     execute,
     beginning_of_buffer,
     end_of_buffer,
diff --git a/src/reader.cpp b/src/reader.cpp
index 38d33a0a3..a20163a99 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1065,8 +1065,6 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
         case rl::upcase_word:
         case rl::downcase_word:
         case rl::capitalize_word:
-        case rl::vi_arg_digit:
-        case rl::vi_delete_to:
         case rl::beginning_of_buffer:
         case rl::end_of_buffer:
             // These commands operate on the search field if that's where the focus is.
@@ -3192,11 +3190,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::func_and: {
             DIE("self-insert should have been handled by inputter_t::readch");
         }
-        case rl::vi_arg_digit:
-        case rl::vi_delete_to: {
-            // TODO: what needs to happen with these?
-            break;
-        }
     }
 }
 

From bd8fd9fd0d7db740859ee23f0be1315162570c6d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 25 Dec 2019 10:46:46 +0100
Subject: [PATCH 1462/1732] docs/bind: Document `and`

[ci skip]
---
 sphinx_doc_src/cmds/bind.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 4089b099d..662e89b4c 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -64,6 +64,8 @@ Special input functions
 -----------------------
 The following special input functions are available:
 
+- ``and``, only execute the next function if the previous succeeded (note: only some functions report success)
+
 - ``accept-autosuggestion``, accept the current autosuggestion completely
 
 - ``backward-char``, moves one character to the left

From aba5beaeb45b53dbdcbc7b6fb52e5651e5befb93 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 25 Dec 2019 16:16:08 +0100
Subject: [PATCH 1463/1732] completions/pipenv: Force it to print fish
 completions

This checks $SHELL to determine which completions to print, and $SHELL
is typically set by your login program.

So if the login shell isn't fish, this will print the wrong
completions.

Fixes #6454

[ci skip]
---
 share/completions/pipenv.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/completions/pipenv.fish b/share/completions/pipenv.fish
index 943b44d2b..7d5c2941d 100644
--- a/share/completions/pipenv.fish
+++ b/share/completions/pipenv.fish
@@ -1,3 +1,4 @@
 if command -sq pipenv
-    pipenv --completion 2>/dev/null | source
+    # pipenv determines which completions to print via $SHELL, so override it for this.
+    SHELL=(status fish-path) pipenv --completion 2>/dev/null | source
 end

From 0e0d63c0df9a8718835297434d861312c3bb1e8c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 25 Dec 2019 16:29:10 +0100
Subject: [PATCH 1464/1732] completions/pipenv: Really force it to print fish
 completions

"To assume" and such.

It doesn't check $SHELL, so it might have some other automagic that
can fail (probably still because of the login shell, but I have no
idea).

Override the special variable that
click-completion (https://github.com/click-contrib/click-completion)
uses to force it instead.

Really fixes #6454.

[ci skip]
---
 share/completions/pipenv.fish | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/completions/pipenv.fish b/share/completions/pipenv.fish
index 7d5c2941d..45ae4ed25 100644
--- a/share/completions/pipenv.fish
+++ b/share/completions/pipenv.fish
@@ -1,4 +1,5 @@
 if command -sq pipenv
-    # pipenv determines which completions to print via $SHELL, so override it for this.
-    SHELL=(status fish-path) pipenv --completion 2>/dev/null | source
+    # pipenv determines which completions to print via some automagic that might not be perfect.
+    # Force it to be correct.
+    _PIPENV_COMPLETE=source-fish  pipenv --completion 2>/dev/null | source
 end

From 126e6a929fce77f40fddbca8a768258e7f09b9d9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 26 Dec 2019 13:17:34 -0800
Subject: [PATCH 1465/1732] Remove the ARRAY_SEP define

It's unused.
---
 src/env.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/env.h b/src/env.h
index 190ef08bf..b33a5e143 100644
--- a/src/env.h
+++ b/src/env.h
@@ -18,10 +18,6 @@ extern bool curses_initialized;
 
 struct event_t;
 
-/// Character for separating two array elements. We use 30, i.e. the ascii record separator since
-/// that seems logical.
-#define ARRAY_SEP (wchar_t)0x1e
-
 // Flags that may be passed as the 'mode' in env_stack_t::set() / environment_t::get().
 enum {
     /// Default mode. Used with `env_stack_t::get()` to indicate the caller doesn't care what scope

From df0681d393b01b152bda92dcbf06248b848749e0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 26 Dec 2019 13:33:14 -0800
Subject: [PATCH 1466/1732] Remove process_generation_count_t

It was unused.
---
 src/proc.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 4ac9c1ec8..0a418936a 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -281,8 +281,6 @@ void job_t::mark_constructed() {
     *constructed = true;
 }
 
-using process_generation_count_t = unsigned int;
-
 /// A list of pids/pgids that have been disowned. They are kept around until either they exit or
 /// we exit. Poll these from time-to-time to prevent zombie processes from happening (#5342).
 static owning_lock<std::vector<pid_t>> s_disowned_pids;

From d1e82b59bb737f97f85ee15be5f4d57fc2803544 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 12:36:22 -0800
Subject: [PATCH 1467/1732] [clang-tidy] Switch from size to empty check

Found with readability-container-size-empty
---
 src/builtin_status.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp
index 34765bb21..012a18f54 100644
--- a/src/builtin_status.cpp
+++ b/src/builtin_status.cpp
@@ -65,7 +65,7 @@ const enum_map<status_cmd_t> status_enum_map[] = {
 #define status_enum_map_len (sizeof status_enum_map / sizeof *status_enum_map)
 
 #define CHECK_FOR_UNEXPECTED_STATUS_ARGS(status_cmd)                                        \
-    if (args.size() != 0) {                                                                 \
+    if (!args.empty()) {                                                                    \
         const wchar_t *subcmd_str = enum_to_str(status_cmd, status_enum_map);               \
         if (!subcmd_str) subcmd_str = L"default";                                           \
         streams.err.append_format(BUILTIN_ERR_ARG_COUNT2, cmd, subcmd_str, 0, args.size()); \

From 2ecc3861212d5ca48a3b227d7338754bc7e4d8a1 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 12:40:06 -0800
Subject: [PATCH 1468/1732] [clang-tidy] Remove redundant c_str

Found with readability-redundant-string-cstr
---
 src/reader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index a20163a99..b90d99ee7 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2754,7 +2754,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 if (abbreviation_expanded) {
                     // It's our reponsibility to rehighlight and repaint. But everything we do
                     // below triggers a repaint.
-                    command_test_result = test_func(parser(), el->text.c_str());
+                    command_test_result = test_func(parser(), el->text);
 
                     // If the command is OK, then we're going to execute it. We still want to do
                     // syntax highlighting, but a synchronous variant that performs no I/O, so

From 9e42b0100ad44bfb8f5bb7f8dbfb47a1e699c2ea Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 12:42:12 -0800
Subject: [PATCH 1469/1732] [clang-tidy] Remove redudant .get on smart pointer

Found with readability-redundant-smartptr-get
---
 src/builtin_test.cpp | 4 ++--
 src/io.cpp           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index a3c9b640d..96080af99 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -311,7 +311,7 @@ unique_ptr<expression> test_parser::parse_unary_expression(unsigned int start, u
     token_t tok = token_for_string(arg(start))->tok;
     if (tok == test_bang) {
         unique_ptr<expression> subject(parse_unary_expression(start + 1, end));
-        if (subject.get()) {
+        if (subject) {
             return make_unique<unary_operator>(tok, range_t(start, subject->range.end),
                                                move(subject));
         }
@@ -496,7 +496,7 @@ unique_ptr<expression> test_parser::parse_4_arg_expression(unsigned int start, u
     token_t first_token = token_for_string(arg(start))->tok;
     if (first_token == test_bang) {
         unique_ptr<expression> subject(parse_3_arg_expression(start + 1, end));
-        if (subject.get()) {
+        if (subject) {
             result = make_unique<unary_operator>(first_token, range_t(start, subject->range.end),
                                                  move(subject));
         }
diff --git a/src/io.cpp b/src/io.cpp
index 54a8218da..8841da732 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -284,7 +284,7 @@ void io_chain_t::print() const {
     std::fwprintf(stderr, L"Chain %p (%ld items):\n", this, (long)this->size());
     for (size_t i = 0; i < this->size(); i++) {
         const auto &io = this->at(i);
-        if (io.get() == nullptr) {
+        if (io == nullptr) {
             std::fwprintf(stderr, L"\t(null)\n");
         } else {
             std::fwprintf(stderr, L"\t%lu: fd:%d, ", (unsigned long)i, io->fd);

From 668f73c0d68233c5fec0a1ff4f69c071170b162b Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 13:24:08 -0800
Subject: [PATCH 1470/1732] [clang-tidy] Fix wrong declaration

Found with readability-inconsistent-declaration-parameter-name
---
 src/parse_execution.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parse_execution.h b/src/parse_execution.h
index b9c7a4d90..52a8ff2f1 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -123,7 +123,7 @@ class parse_execution_context_t {
     // Determines the list of redirections for a node. Returns none() on failure, for example, an
     // invalid fd.
     bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
-                                redirection_spec_list_t *out_redirs);
+                                redirection_spec_list_t *out_redirections);
 
     eval_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
     eval_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,

From f2e7def6672eef8077ab3683b933aa2921ad933f Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 12:45:44 -0800
Subject: [PATCH 1471/1732] [clang-tidy] Remove const from strings

Found with readability-const-return-type
---
 src/common.cpp   | 3 +--
 src/complete.cpp | 2 +-
 src/wutil.cpp    | 2 +-
 src/wutil.h      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 96873f17a..06192c7fc 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -205,8 +205,7 @@ bool is_windows_subsystem_for_linux() {
 #ifdef HAVE_BACKTRACE_SYMBOLS
 // This function produces a stack backtrace with demangled function & method names. It is based on
 // https://gist.github.com/fmela/591333 but adapted to the style of the fish project.
-[[gnu::noinline]] static const wcstring_list_t demangled_backtrace(int max_frames,
-                                                                   int skip_levels) {
+[[gnu::noinline]] static wcstring_list_t demangled_backtrace(int max_frames, int skip_levels) {
     void *callstack[128];
     const int n_max_frames = sizeof(callstack) / sizeof(callstack[0]);
     int n_frames = backtrace(callstack, n_max_frames);
diff --git a/src/complete.cpp b/src/complete.cpp
index 2707931fd..ed144cca5 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -104,7 +104,7 @@ typedef struct complete_entry_opt {
     // Completion flags.
     complete_flags_t flags;
 
-    const wcstring localized_desc() const { return C_(desc); }
+    wcstring localized_desc() const { return C_(desc); }
 
     size_t expected_dash_count() const {
         switch (this->type) {
diff --git a/src/wutil.cpp b/src/wutil.cpp
index 9f21f3131..ea7bdf694 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -130,7 +130,7 @@ bool wreaddir_for_dirs(DIR *dir, wcstring *out_name) {
     return result != nullptr;
 }
 
-const wcstring wgetcwd() {
+wcstring wgetcwd() {
     char cwd[PATH_MAX];
     char *res = getcwd(cwd, sizeof(cwd));
     if (res) {
diff --git a/src/wutil.h b/src/wutil.h
index 8a3b74cd4..636eff347 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -71,7 +71,7 @@ void safe_perror(const char *message);
 const char *safe_strerror(int err);
 
 /// Wide character version of getcwd().
-const wcstring wgetcwd();
+wcstring wgetcwd();
 
 /// Wide character version of realpath function.
 /// \returns the canonicalized path, or none if the path is invalid.

From 856fa0ca42d326887cfc950babdf9f816b38b442 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 13:47:58 -0800
Subject: [PATCH 1472/1732] [clang-tidy] Use override instead of virtual

Found with modernize-use-override
---
 src/env.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/env.cpp b/src/env.cpp
index 831c42c4a..c44f574fa 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -848,7 +848,7 @@ class env_stack_impl_t final : public env_scoped_impl_t {
         return make_unique<env_stack_impl_t>(std::move(local), s_global_node);
     }
 
-    virtual ~env_stack_impl_t() = default;
+    ~env_stack_impl_t() override = default;
 
    private:
     /// The scopes of caller functions, which are currently shadowed.

From 49fbca8a8bb50b9e26eec682fd104f7101afebb9 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 13:03:28 -0800
Subject: [PATCH 1473/1732] [clang-tidy] Remove redundant const in function
 declarations

Found with readability-avoid-const-params-in-decls
---
 src/common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common.cpp b/src/common.cpp
index 06192c7fc..6f36c6dff 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -108,7 +108,7 @@ static owning_lock<struct winsize> s_termsize{k_invalid_termsize};
 static relaxed_atomic_bool_t s_termsize_valid{false};
 
 static char *wcs2str_internal(const wchar_t *in, char *out);
-static void debug_shared(const wchar_t msg_level, const wcstring &msg);
+static void debug_shared(wchar_t msg_level, const wcstring &msg);
 
 #if defined(OS_IS_CYGWIN) || defined(WSL)
 // MS Windows tty devices do not currently have either a read or write timestamp. Those

From 5d1ad8de9141e864479e02d54dc93b3e46a26536 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 13:50:58 -0800
Subject: [PATCH 1474/1732] [clang-tidy] Use std::move

Found with modernize-pass-by-value
---
 src/builtin_string.cpp | 4 ++--
 src/builtin_test.cpp   | 2 +-
 src/complete.cpp       | 4 ++--
 src/expand.cpp         | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 7dbf58e58..67f4c38b6 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -901,10 +901,10 @@ class literal_replacer_t : public string_replacer_t {
     size_t patlen;
 
    public:
-    literal_replacer_t(const wchar_t *argv0, const wcstring &pattern_, const wchar_t *replacement_,
+    literal_replacer_t(const wchar_t *argv0, wcstring pattern_, const wchar_t *replacement_,
                        const options_t &opts, io_streams_t &streams)
         : string_replacer_t(argv0, opts, streams),
-          pattern(pattern_),
+          pattern(std::move(pattern_)),
           replacement(replacement_),
           patlen(pattern.length()) {}
 
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 96080af99..3c7485a25 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -266,7 +266,7 @@ class combining_expression : public expression {
     const std::vector<token_t> combiners;
 
     combining_expression(token_t tok, range_t where, std::vector<unique_ptr<expression>> exprs,
-                         const std::vector<token_t> &combs)
+                         std::vector<token_t> combs)
         : expression(tok, where), subjects(std::move(exprs)), combiners(std::move(combs)) {
         // We should have one more subject than combiner.
         assert(subjects.size() == combiners.size() + 1);
diff --git a/src/complete.cpp b/src/complete.cpp
index ed144cca5..440dba2e8 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -389,9 +389,9 @@ class completer_t {
                                                 const std::vector<tok_t> &args);
 
    public:
-    completer_t(const environment_t &vars, const std::shared_ptr<parser_t> &parser, wcstring c,
+    completer_t(const environment_t &vars, std::shared_ptr<parser_t> parser, wcstring c,
                 completion_request_flags_t f)
-        : vars(vars), parser(parser), cmd(std::move(c)), flags(f) {}
+        : vars(vars), parser(std::move(parser)), cmd(std::move(c)), flags(f) {}
 
     void perform();
 
diff --git a/src/expand.cpp b/src/expand.cpp
index f1334cb41..60ec9c613 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -860,9 +860,9 @@ class expander_t {
     expand_result_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
     expand_result_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
 
-    expander_t(const environment_t &vars, const std::shared_ptr<parser_t> &parser,
-               expand_flags_t flags, parse_error_list_t *errors)
-        : vars(vars), parser(parser), flags(flags), errors(errors) {}
+    expander_t(const environment_t &vars, std::shared_ptr<parser_t> parser, expand_flags_t flags,
+               parse_error_list_t *errors)
+        : vars(vars), parser(std::move(parser)), flags(flags), errors(errors) {}
 
    public:
     static expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,

From b1349f44f64275204c0a559dd9e08cd7c72b3316 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 13:53:48 -0800
Subject: [PATCH 1475/1732] [clang-tidy] Add const to reference

Found with performance-unnecessary-copy-initialization
---
 src/builtin_eval.cpp         | 2 +-
 src/builtin_string.cpp       | 4 ++--
 src/builtin_test.cpp         | 2 +-
 src/complete.cpp             | 2 +-
 src/env_universal_common.cpp | 2 +-
 src/parse_execution.cpp      | 6 +++---
 src/parser.cpp               | 4 ++--
 src/reader.cpp               | 2 +-
 src/screen.cpp               | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 7a3acc9b9..589525dad 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -27,7 +27,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(std::move(new_cmd), *streams.io_chain) != eval_result_t::ok) {
+        if (parser.eval(new_cmd, *streams.io_chain) != eval_result_t::ok) {
             status = STATUS_CMD_ERROR;
         } else if (cached_exec_count == parser.libdata().exec_count) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 67f4c38b6..36a1b7042 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -615,7 +615,7 @@ class string_matcher_t {
 
    public:
     string_matcher_t(options_t opts_, io_streams_t &streams_)
-        : opts(std::move(opts_)), streams(streams_), total_matched(0) {}
+        : opts(opts_), streams(streams_), total_matched(0) {}
 
     virtual ~string_matcher_t() = default;
     virtual bool report_matches(const wcstring &arg) = 0;
@@ -888,7 +888,7 @@ class string_replacer_t {
 
    public:
     string_replacer_t(const wchar_t *argv0_, options_t opts_, io_streams_t &streams_)
-        : argv0(argv0_), opts(std::move(opts_)), total_replaced(0), streams(streams_) {}
+        : argv0(argv0_), opts(opts_), total_replaced(0), streams(streams_) {}
 
     virtual ~string_replacer_t() = default;
     int replace_count() const { return total_replaced; }
diff --git a/src/builtin_test.cpp b/src/builtin_test.cpp
index 3c7485a25..2814a3046 100644
--- a/src/builtin_test.cpp
+++ b/src/builtin_test.cpp
@@ -217,7 +217,7 @@ struct range_t {
 /// Base class for expressions.
 class expression {
    protected:
-    expression(token_t what, range_t where) : token(what), range(std::move(where)) {}
+    expression(token_t what, range_t where) : token(what), range(where) {}
 
    public:
     const token_t token;
diff --git a/src/complete.cpp b/src/complete.cpp
index 440dba2e8..b1214c2fe 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -209,7 +209,7 @@ completion_t::completion_t(wcstring comp, wcstring desc, string_fuzzy_match_t ma
                            complete_flags_t flags_val)
     : completion(std::move(comp)),
       description(std::move(desc)),
-      match(std::move(mat)),
+      match(mat),
       flags(resolve_auto_space(completion, flags_val)) {}
 
 completion_t::completion_t(const completion_t &) = default;
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 2f6b23d21..acb7bc783 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -279,7 +279,7 @@ void env_universal_t::set_internal(const wcstring &key, const env_var_t &var) {
 
 void env_universal_t::set(const wcstring &key, env_var_t var) {
     scoped_lock locker(lock);
-    this->set_internal(key, std::move(var));
+    this->set_internal(key, var);
 }
 
 bool env_universal_t::remove_internal(const wcstring &key) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c292e7208..f103be7b5 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1049,7 +1049,7 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
             vals.emplace_back(std::move(completion.completion));
         }
         if (proc) proc->variable_assignments.push_back({variable_name, vals});
-        parser->vars().set(std::move(variable_name), ENV_LOCAL | ENV_EXPORT, std::move(vals));
+        parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals));
     }
     return eval_result_t::ok;
 }
@@ -1409,13 +1409,13 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
             result = this->run_job_conjunction(job_conj, associated_block);
         }
         if (timer_started) {
-            auto t1 = std::move(active_timers.back());
+            auto t1 = active_timers.back();
             active_timers.pop_back();
             auto t2 = timer_snapshot_t::take();
 
             // Well, this is awkward. By defining `time` as a decorator and not a built-in, there's
             // no associated stream for its output!
-            auto output = timer_snapshot_t::print_delta(std::move(t1), std::move(t2), true);
+            auto output = timer_snapshot_t::print_delta(t1, t2, true);
             std::fwprintf(stderr, L"%S\n", output.c_str());
         }
     }
diff --git a/src/parser.cpp b/src/parser.cpp
index e901b61d6..0a6b7f4d5 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -110,7 +110,7 @@ void parser_t::skip_all_blocks() {
 
 // Given a new-allocated block, push it onto our block list, acquiring ownership.
 block_t *parser_t::push_block(block_t &&block) {
-    block_t new_current{std::move(block)};
+    block_t new_current{block};
     const enum block_type_t type = new_current.type();
     new_current.src_lineno = parser_t::get_lineno();
 
@@ -147,7 +147,7 @@ void parser_t::pop_block(const block_t *expected) {
     assert(!block_list.empty() && "empty block list");
 
     // Acquire ownership out of the block list.
-    block_t old = std::move(block_list.front());
+    block_t old = block_list.front();
     block_list.pop_front();
 
     if (old.wants_pop_env) vars().pop();
diff --git a/src/reader.cpp b/src/reader.cpp
index b90d99ee7..eb406f35e 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1299,7 +1299,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
 
         history_search_t searcher(*history, search_string, history_search_type_t::prefix);
         while (!reader_test_should_cancel() && searcher.go_backwards()) {
-            history_item_t item = searcher.current_item();
+            const history_item_t &item = searcher.current_item();
 
             // Skip items with newlines because they make terrible autosuggestions.
             if (item.str().find(L'\n') != wcstring::npos) continue;
diff --git a/src/screen.cpp b/src/screen.cpp
index ed8668fa7..bda1996e9 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -278,7 +278,7 @@ maybe_t<prompt_layout_t> layout_cache_t::find_prompt_layout(const wcstring &inpu
 
 void layout_cache_t::add_prompt_layout(wcstring input, prompt_layout_t layout) {
     assert(!find_prompt_layout(input) && "Should not have a prompt layout for this input");
-    prompt_cache_.emplace_front(std::move(input), std::move(layout));
+    prompt_cache_.emplace_front(std::move(input), layout);
     if (prompt_cache_.size() > prompt_cache_max_size) {
         prompt_cache_.pop_back();
     }

From 5501953c077c7e081df7f69de26c33ba01e26c54 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 21 Dec 2019 15:52:38 -0800
Subject: [PATCH 1476/1732] [clang-tidy] Add ending namespace comment

Found with llvm-namespace-comment
---
 src/tokenizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 450cbc6e9..872518be7 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -136,7 +136,7 @@ enum {
     curly_braces = 1 << 2,
     char_escape = 1 << 3,
 };
-}
+}  // namespace tok_modes
 using tok_mode_t = uint32_t;
 
 /// Read the next token as a string.

From 06cb0bbe9a927026b6f1f887ddbe761967ab9b3f Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 26 Dec 2019 21:54:21 -0800
Subject: [PATCH 1477/1732] [clang-tidy] Add several references

Found with performance-unnecessary-value-param

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/complete.cpp             |  6 +++---
 src/env.cpp                  |  8 ++++----
 src/env_universal_common.cpp |  2 +-
 src/env_universal_common.h   |  2 +-
 src/exec.cpp                 | 10 +++++-----
 src/exec.h                   |  2 +-
 src/function.cpp             |  3 ++-
 src/input.cpp                |  5 +++--
 src/input.h                  |  4 ++--
 src/input_common.cpp         |  4 ++--
 src/input_common.h           |  4 ++--
 src/parser.cpp               | 10 +++++-----
 src/parser.h                 |  4 ++--
 src/proc.cpp                 |  2 +-
 src/proc.h                   |  2 +-
 15 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index b1214c2fe..a448366fd 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1643,16 +1643,16 @@ void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_c
 
 /// Print the short switch \c opt, and the argument \c arg to the specified
 /// wcstring, but only if \c argument isn't an empty string.
-static void append_switch(wcstring &out, wchar_t opt, const wcstring arg) {
+static void append_switch(wcstring &out, wchar_t opt, const wcstring &arg) {
     if (arg.empty()) return;
     append_format(out, L" -%lc %ls", opt, escape_string(arg, ESCAPE_ALL).c_str());
 }
-static void append_switch(wcstring &out, const wcstring opt, const wcstring arg) {
+static void append_switch(wcstring &out, const wcstring &opt, const wcstring &arg) {
     if (arg.empty()) return;
     append_format(out, L" --%ls %ls", opt.c_str(), escape_string(arg, ESCAPE_ALL).c_str());
 }
 static void append_switch(wcstring &out, wchar_t opt) { append_format(out, L" -%lc", opt); }
-static void append_switch(wcstring &out, const wcstring opt) {
+static void append_switch(wcstring &out, const wcstring &opt) {
     append_format(out, L" --%ls", opt.c_str());
 }
 
diff --git a/src/env.cpp b/src/env.cpp
index c44f574fa..7ed5426b2 100644
--- a/src/env.cpp
+++ b/src/env.cpp
@@ -878,7 +878,7 @@ class env_stack_impl_t final : public env_scoped_impl_t {
 
     /// Remove a variable from the chain \p node.
     /// \return true if the variable was found and removed.
-    bool remove_from_chain(env_node_ref_t node, const wcstring &key) const {
+    bool remove_from_chain(const env_node_ref_t &node, const wcstring &key) const {
         for (auto cursor = node; cursor; cursor = cursor->next) {
             auto iter = cursor->env.find(key);
             if (iter != cursor->env.end()) {
@@ -901,7 +901,7 @@ class env_stack_impl_t final : public env_scoped_impl_t {
     void set_universal(const wcstring &key, wcstring_list_t val, const query_t &query);
 
     /// Set a variable in a given node \p node.
-    void set_in_node(env_node_ref_t node, const wcstring &key, wcstring_list_t &&val,
+    void set_in_node(const env_node_ref_t &node, const wcstring &key, wcstring_list_t &&val,
                      const var_flags_t &flags);
 
     // Implement the default behavior of 'set' by finding the node for an unspecified scope.
@@ -970,8 +970,8 @@ static wcstring_list_t colon_split(const wcstring_list_t &val) {
     return split_val;
 }
 
-void env_stack_impl_t::set_in_node(env_node_ref_t node, const wcstring &key, wcstring_list_t &&val,
-                                   const var_flags_t &flags) {
+void env_stack_impl_t::set_in_node(const env_node_ref_t &node, const wcstring &key,
+                                   wcstring_list_t &&val, const var_flags_t &flags) {
     env_var_t &var = node->env[key];
 
     // Use an explicit exports, or inherit from the existing variable.
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index acb7bc783..8e71c301a 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -277,7 +277,7 @@ void env_universal_t::set_internal(const wcstring &key, const env_var_t &var) {
     }
 }
 
-void env_universal_t::set(const wcstring &key, env_var_t var) {
+void env_universal_t::set(const wcstring &key, const env_var_t &var) {
     scoped_lock locker(lock);
     this->set_internal(key, var);
 }
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index 12d12d3c2..ae4bd3691 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -103,7 +103,7 @@ class env_universal_t {
     maybe_t<env_var_t::env_var_flags_t> get_flags(const wcstring &name) const;
 
     // Sets a variable.
-    void set(const wcstring &key, env_var_t var);
+    void set(const wcstring &key, const env_var_t &var);
 
     // Removes a variable. Returns true if it was found, false if not.
     bool remove(const wcstring &key);
diff --git a/src/exec.cpp b/src/exec.cpp
index 02b510bad..32c7099e7 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -241,7 +241,7 @@ static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid)
 /// (stdout), and there is a dup2 3->1, then we need to write to fd 3. Then exit the internal
 /// process.
 static bool run_internal_process(process_t *p, std::string outdata, std::string errdata,
-                                 io_chain_t ios) {
+                                 const io_chain_t &ios) {
     p->check_generations_before_launch();
 
     // We want both the dup2s and the io_chain_ts to be kept alive by the background thread, because
@@ -780,8 +780,8 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
 /// \p conflicts contains the list of fds which pipes should avoid.
 /// \p allow_buffering if true, permit buffering the output.
 /// \return true on success, false on error.
-static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t> j, process_t *p,
-                                       const fd_set_t &conflicts, io_chain_t io_chain,
+static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<job_t> &j,
+                                       process_t *p, const fd_set_t &conflicts, io_chain_t io_chain,
                                        bool allow_buffering) {
     // Create an output buffer if we're piping to another process.
     shared_ptr<io_bufferfill_t> block_output_bufferfill{};
@@ -839,7 +839,7 @@ static bool exec_block_or_func_process(parser_t &parser, std::shared_ptr<job_t>
 /// \p deferred_pipes represents the pipes from our deferred process; if set ensure they get closed
 /// in any child. If \p is_deferred_run is true, then this is a deferred run; this affects how
 /// certain buffering works. \returns true on success, false on exec error.
-static bool exec_process_in_job(parser_t &parser, process_t *p, std::shared_ptr<job_t> j,
+static bool exec_process_in_job(parser_t &parser, process_t *p, const std::shared_ptr<job_t> &j,
                                 const io_chain_t &block_io, autoclose_pipes_t pipes,
                                 const fd_set_t &conflicts, const autoclose_pipes_t &deferred_pipes,
                                 size_t stdout_read_limit, bool is_deferred_run = false) {
@@ -1027,7 +1027,7 @@ static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
     DIE("unreachable");
 }
 
-bool exec_job(parser_t &parser, shared_ptr<job_t> j, const job_lineage_t &lineage) {
+bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t &lineage) {
     assert(j && "null job_t passed to exec_job!");
 
     // Set to true if something goes wrong while executing the job, in which case the cleanup
diff --git a/src/exec.h b/src/exec.h
index 37fee0b25..af3f1481b 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -15,7 +15,7 @@
 class job_t;
 struct job_lineage_t;
 class parser_t;
-bool exec_job(parser_t &parser, std::shared_ptr<job_t> j, const job_lineage_t &lineage);
+bool exec_job(parser_t &parser, const std::shared_ptr<job_t> &j, const job_lineage_t &lineage);
 
 /// Evaluate the expression cmd in a subshell, add the outputs into the list l. On return, the
 /// status flag as returned bu \c proc_gfet_last_status will not be changed.
diff --git a/src/function.cpp b/src/function.cpp
index f659239e0..283d79d89 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -166,7 +166,8 @@ void function_add(wcstring name, wcstring description, function_properties_ref_t
 
     // Create and store a new function.
     auto ins = funcset->funcs.emplace(
-        std::move(name), function_info_t(props, std::move(description), filename, is_autoload));
+        std::move(name),
+        function_info_t(std::move(props), std::move(description), filename, is_autoload));
     assert(ins.second && "Function should not already be present in the table");
     (void)ins;
 }
diff --git a/src/input.cpp b/src/input.cpp
index 6aec246b3..e2600656d 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -17,6 +17,7 @@
 #include <atomic>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "common.h"
@@ -427,9 +428,9 @@ bool inputter_t::mapping_is_match(const input_mapping_t &m) {
     return true;
 }
 
-void inputter_t::queue_ch(char_event_t ch) { event_queue_.push_back(ch); }
+void inputter_t::queue_ch(const char_event_t &ch) { event_queue_.push_back(std::move(ch)); }
 
-void inputter_t::push_front(char_event_t ch) { event_queue_.push_front(ch); }
+void inputter_t::push_front(const char_event_t &ch) { event_queue_.push_front(std::move(ch)); }
 
 /// \return the first mapping that matches, walking first over the user's mapping list, then the
 /// preset list. \return null if nothing matches.
diff --git a/src/input.h b/src/input.h
index 63e4e4533..45b714a12 100644
--- a/src/input.h
+++ b/src/input.h
@@ -57,10 +57,10 @@ class inputter_t {
 
     /// Enqueue a char event to the queue of unread characters that input_readch will return before
     /// actually reading from fd 0.
-    void queue_ch(char_event_t ch);
+    void queue_ch(const char_event_t &ch);
 
     /// Enqueue a char event to the front of the queue; this will be the next event returned.
-    void push_front(char_event_t ch);
+    void push_front(const char_event_t &ch);
 
     /// Sets the return status of the most recently executed input function.
     void function_set_status(bool status) { function_status_ = status; }
diff --git a/src/input_common.cpp b/src/input_common.cpp
index a333a5627..d877257bf 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -225,6 +225,6 @@ char_event_t input_event_queue_t::readch_timed(bool dequeue_timeouts) {
     return result;
 }
 
-void input_event_queue_t::push_back(char_event_t ch) { queue_.push_back(ch); }
+void input_event_queue_t::push_back(const char_event_t& ch) { queue_.push_back(ch); }
 
-void input_event_queue_t::push_front(char_event_t ch) { queue_.push_front(ch); }
+void input_event_queue_t::push_front(const char_event_t& ch) { queue_.push_front(ch); }
diff --git a/src/input_common.h b/src/input_common.h
index f9182fd33..2c5786717 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -186,11 +186,11 @@ class input_event_queue_t {
 
     /// Enqueue a character or a readline function to the queue of unread characters that
     /// readch will return before actually reading from fd 0.
-    void push_back(char_event_t ch);
+    void push_back(const char_event_t& ch);
 
     /// Add a character or a readline function to the front of the queue of unread characters.  This
     /// will be the next character returned by readch.
-    void push_front(char_event_t ch);
+    void push_front(const char_event_t& ch);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 0a6b7f4d5..e0ee0bb1b 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -626,7 +626,7 @@ eval_result_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
     }
 }
 
-eval_result_t parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io,
+eval_result_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io,
                              enum block_type_t block_type) {
     assert(block_type == block_type_t::top || block_type == block_type_t::subst);
     if (!ps->tree.empty()) {
@@ -640,8 +640,8 @@ eval_result_t parser_t::eval(parsed_source_ref_t ps, const io_chain_t &io,
 }
 
 template <typename T>
-eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, job_lineage_t lineage,
-                                  block_type_t block_type) {
+eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
+                                  job_lineage_t lineage, block_type_t block_type) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -683,9 +683,9 @@ eval_result_t parser_t::eval_node(parsed_source_ref_t ps, tnode_t<T> node, job_l
 }
 
 // Explicit instantiations. TODO: use overloads instead?
-template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::statement>,
+template eval_result_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::statement>,
                                            job_lineage_t, block_type_t);
-template eval_result_t parser_t::eval_node(parsed_source_ref_t, tnode_t<grammar::job_list>,
+template eval_result_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::job_list>,
                                            job_lineage_t, block_type_t);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
diff --git a/src/parser.h b/src/parser.h
index 6357643bf..599f93299 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -268,13 +268,13 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
 
     /// Evaluate the parsed source ps.
     /// Because the source has been parsed, a syntax error is impossible.
-    eval_result_t eval(parsed_source_ref_t ps, const io_chain_t &io,
+    eval_result_t eval(const parsed_source_ref_t &ps, const io_chain_t &io,
                        block_type_t block_type = block_type_t::top);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    eval_result_t eval_node(parsed_source_ref_t ps, tnode_t<T> node, job_lineage_t lineage,
+    eval_result_t eval_node(const parsed_source_ref_t &ps, tnode_t<T> node, job_lineage_t lineage,
                             block_type_t block_type = block_type_t::top);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
diff --git a/src/proc.cpp b/src/proc.cpp
index 0a418936a..60d779afb 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -269,7 +269,7 @@ void process_t::check_generations_before_launch() {
     gens_ = topic_monitor_t::principal().current_generations();
 }
 
-job_t::job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage)
+job_t::job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage)
     : properties(props),
       job_id(job_id),
       root_constructed(lineage.root_constructed ? lineage.root_constructed : this->constructed) {}
diff --git a/src/proc.h b/src/proc.h
index 5042f35c7..63772b434 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -320,7 +320,7 @@ class job_t {
     void operator=(const job_t &) = delete;
 
    public:
-    job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage);
+    job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage);
     ~job_t();
 
     /// Returns the command as a wchar_t *. */

From 0866013280d38b9e361dd5183114eb90db86115d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 28 Dec 2019 17:00:48 +0100
Subject: [PATCH 1478/1732] Stop using __fish_complete_suffix with a braced
 argument

__fish_complete_suffix accepts a first argument containing a
brace-expansion, like

    __fish_complete_suffix '.{c,cpp,py}'

We're gonna be removing the `eval` that does that shortly, so let's
remove all uses in our code.
---
 share/completions/clang++.fish | 2 +-
 share/completions/clang.fish   | 5 +++--
 share/completions/hjson.fish   | 2 +-
 share/completions/optipng.fish | 3 ++-
 share/completions/pacaur.fish  | 2 +-
 share/completions/pacman.fish  | 2 +-
 share/completions/phpunit.fish | 2 +-
 share/completions/ttx.fish     | 8 ++++----
 share/completions/yaourt.fish  | 2 +-
 9 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/share/completions/clang++.fish b/share/completions/clang++.fish
index 783ddf7a1..904d56ea8 100644
--- a/share/completions/clang++.fish
+++ b/share/completions/clang++.fish
@@ -4,4 +4,4 @@
 
 complete -p '*clang++*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -p '*clang++*' -n 'not __fish_should_complete_switches' \
-    -xa '(__fish_complete_suffix \'{.o,.out,.c,.cpp,.so,.dylib}\')'
+    -xa "(__fish_complete_suffix .o; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
diff --git a/share/completions/clang.fish b/share/completions/clang.fish
index 020454f3a..3eec3575d 100644
--- a/share/completions/clang.fish
+++ b/share/completions/clang.fish
@@ -5,7 +5,8 @@
 # This pattern unfortunately matches clang-format, etc. as well.
 complete -p '*clang*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -c 'clang' -n 'not __fish_should_complete_switches' \
-    -xa "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -xa "(__fish_complete_suffix .o; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
+
 # again but without the -x this time for the pattern-matched completion
 complete -p '*clang*' -n 'not __fish_should_complete_switches' \
-    -a "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -a "(__fish_complete_suffix .o; __fish_complete_suffix .out; __fish_complete_suffix .c; __fish_complete_suffix .cpp; __fish_complete_suffix .so; __fish_complete_suffix .dylib)"
diff --git a/share/completions/hjson.fish b/share/completions/hjson.fish
index 8cd433fb7..8ed109ae2 100644
--- a/share/completions/hjson.fish
+++ b/share/completions/hjson.fish
@@ -11,4 +11,4 @@ complete -c hjson -n '__fish_should_complete_switches' -a "-rt" -d "round trip c
 complete -c hjson -n '__fish_should_complete_switches' -a "-nocol" -d "disable color output"
 complete -c hjson -n '__fish_should_complete_switches' -a "-cond=" -d "set condense option [default 60]"
 
-complete -c hjson -k -xa "(__fish_complete_suffix '.{hjson,json}')"
+complete -c hjson -k -xa "(__fish_complete_suffix .hjson; __fish_complete_suffix .json)"
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index 406d6117a..027fdecf0 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -37,5 +37,6 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-dir\t"write out
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-log\t"log messages to <file>"'
 
 complete -x -c optipng -n 'not __fish_prev_arg_in -out -dir -log' \
-    -a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
+    -a '(__fish_complete_suffix .png;  __fish_complete_suffix .pnm;  __fish_complete_suffix .tiff;  __fish_complete_suffix .bmp)
+
 complete -x -c optipng -n '__fish_prev_arg_in -dir' -a '(__fish_complete_directories)'
diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index 1b5870d8a..9e7166aff 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -163,4 +163,4 @@ complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readabl
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar.xz or tar.gz
 # Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix .pkg.tar\{,.xz,.gz\})' -d 'Package file'
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index 188c1c344..a0d2264e3 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -142,4 +142,4 @@ complete -c $progname -n "$sync" -xa "$listall $listgroups"
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar.xz, tar.gz or tar.zst
 # Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -d 'Package file' -xa "(__fish_complete_suffix .pkg.tar\{,.xz,.gz,.zst\})"
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
diff --git a/share/completions/phpunit.fish b/share/completions/phpunit.fish
index 70db34109..1fb82a632 100644
--- a/share/completions/phpunit.fish
+++ b/share/completions/phpunit.fish
@@ -95,7 +95,7 @@ complete -f -c phpunit -l do-not-cache-result -d 'Do not write test results to c
 # Configuration Options:
 complete -x -c phpunit -l prepend -d 'A PHP script that is included as early as possible'
 complete -x -c phpunit -l bootstrap -d 'A PHP script that is included before the tests run'
-complete -x -c phpunit -s c -l configuration -a '(__fish_complete_suffix ".xml{,.dist}")' -d 'Read configuration from XML file'
+complete -x -c phpunit -s c -l configuration -a '(__fish_complete_suffix .xml; __fish_complete_suffix .xml.dist)' -d 'Read configuration from XML file'
 complete -f -c phpunit -l no-configuration -d 'Ignore default configuration file (phpunit.xml)'
 complete -f -c phpunit -l no-logging -d 'Ignore logging configuration'
 complete -f -c phpunit -l no-extensions -d 'Do not load PHPUnit extensions'
diff --git a/share/completions/ttx.fish b/share/completions/ttx.fish
index 8fc70c017..959c51e70 100644
--- a/share/completions/ttx.fish
+++ b/share/completions/ttx.fish
@@ -8,14 +8,14 @@ set -l formats raw row bitwise extfile
 set -l line_endings LF CR CRLF
 set -l woff_fmts woff woff2
 
-complete -f -c ttx -a '(__fish_complete_suffix .{otf,ttf,ttx,ttc})'
-complete -c ttx -f -n '__fish_is_first_token' -a '(__fish_complete_suffix .{otf,ttf,ttx})'
+complete -f -c ttx -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx; __fish_complete_suffix .ttc)'
+complete -c ttx -f -n '__fish_is_first_token' -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'
 complete -c ttx -f -l 'version' -d'Show version info'
 complete -c ttx -x -s 'd' -d'Set output folder' -a '(__fish_complete_directories)'
-complete -c ttx -r -s 'o' -d'Set output filename' -a '(__fish_complete_suffix .{otf,ttf,ttx})'
+complete -c ttx -r -s 'o' -d'Set output filename' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf; __fish_complete_suffix .ttx)'
 complete -c ttx -f -s 'f' -d'Force output overwrite'
 complete -c ttx -f -s 'v' -d'Verbose output'
 complete -c ttx -f -s 'q' -d'Quiet mode'
@@ -35,7 +35,7 @@ complete -c ttx -x -l 'unicodedata' -d'Custom database for character names [Unic
 complete -c ttx -x -l 'newline' -d'Set EOL format' -a "$line_endings"
 
 # Compile options
-complete -c ttx -x -s 'm' -d'Merge named TTF/OTF with SINGLE .ttx input' -a '(__fish_complete_suffix .{otf,ttf})'
+complete -c ttx -x -s 'm' -d'Merge named TTF/OTF with SINGLE .ttx input' -a '(__fish_complete_suffix .otf; __fish_complete_suffix .ttf)'
 complete -c ttx -f -s 'b' -d'Don\'t recalculate glyph bounding boxes'
 complete -c ttx -f -l 'recalc-timestamp' -d'Set font modified timestamp to current time'
 complete -c ttx -x -l 'flavor' -d'Set WOFF flavor' -a "$woff_fmts"
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index b76de0e99..a99ea01a0 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -174,7 +174,7 @@ complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readabl
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar, tar.xz or tar.gz
 # Using "pkg.tar*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar\{,.xz,.gz\})' -d 'Package file'
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
 
 ## Yaourt only stuff
 # Clean options

From b0e3cc4b5c75bf0a43edfbd818a00eb370db9fc2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 28 Dec 2019 17:02:31 +0100
Subject: [PATCH 1479/1732] __fish_complete_suffix: Remove `eval`

This use of eval is unsafe, not really all that useful and can spew
errors that can't be suppressed. So let's remove it, and in future add
a thing that can do expansions in a safe manner

Fixes #6456.
---
 share/functions/__fish_complete_suffix.fish | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/share/functions/__fish_complete_suffix.fish b/share/functions/__fish_complete_suffix.fish
index 4a9deb7a2..0b2596800 100644
--- a/share/functions/__fish_complete_suffix.fish
+++ b/share/functions/__fish_complete_suffix.fish
@@ -51,8 +51,6 @@ function __fish_complete_suffix -d "Complete using files"
     # Strip leading ./ as it confuses the detection of base and suffix
     # It is conditionally re-added below.
     set base $prefix(string replace -r '^("\')?\\./' '' -- $comp | string trim -c '\'"') # " make emacs syntax highlighting happy
-    # echo "base: $base" > /dev/tty
-    # echo "suffix: $suff" > /dev/tty
 
     set -l all
     set -l dirs
@@ -61,11 +59,10 @@ function __fish_complete_suffix -d "Complete using files"
     # correct form.
 
     # Also do directory completion, since there might be files with the correct
-    # suffix in a subdirectory. `eval` is used since $suff may be passed in
-    # as {.foo,.bar} and we want to expand that.
-    eval "set all $base*$suff"
+    # suffix in a subdirectory.
+    set all $base*$suff
     if not string match -qr '/$' -- $suff
-        eval "set dirs $base*/"
+        set dirs $base*/
 
         # The problem is that we now have each directory included twice in the output,
         # once as `dir` and once as `dir/`. The runtime here is O(n) for n directories
@@ -86,15 +83,6 @@ function __fish_complete_suffix -d "Complete using files"
         set files (string replace -r -- "^-" "./-" $files)
     end
 
-    # Another problem is that expanded paths are not matched, either.
-    # So an expression like $HOME/foo*.zip will expand to /home/rdahl/foo-bar.zip
-    # but that no longer matches the expression at the command line.
-    if string match -qr '[${}*~]' -- $comp
-        set -l expanded
-        eval "set expanded $comp"
-        set files (string replace -- $expanded $comp $files)
-    end
-
     if set -q files[1]
         if string match -qr -- . "$desc"
             set desc "\t$desc"
@@ -104,7 +92,7 @@ function __fish_complete_suffix -d "Complete using files"
             # way of doing a pcre2 escape so we can use a regex replace instead
             set files (string replace $prefix "" $files)
         end
-        printf "%s$desc\n" $files #| sort -u
+        printf "%s$desc\n" $files
     end
 
 end

From d0edd984d52ceb223649f11e965701fbc53a94c3 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 28 Dec 2019 17:08:29 +0100
Subject: [PATCH 1480/1732] Let pacman-derived tools complete zst as well

Arch is switching to zst as the default compression method
---
 share/completions/pacaur.fish | 5 ++---
 share/completions/pacman.fish | 1 -
 share/completions/yaourt.fish | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index 9e7166aff..b2700d029 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -161,6 +161,5 @@ complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readabl
 
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
-# In practice, it's going to be tar.xz or tar.gz
-# Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
+# In practice, it's going to be tar.xz or tar.gz or tar.zst
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
diff --git a/share/completions/pacman.fish b/share/completions/pacman.fish
index a0d2264e3..177ddbe50 100644
--- a/share/completions/pacman.fish
+++ b/share/completions/pacman.fish
@@ -141,5 +141,4 @@ complete -c $progname -n "$sync" -xa "$listall $listgroups"
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
 # In practice, it's going to be tar.xz, tar.gz or tar.zst
-# Using "pkg.tar.*" here would change __fish_complete_suffix's descriptions to "unknown"
 complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index a99ea01a0..6d930c54a 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -172,9 +172,8 @@ complete -c $progname -n "$files" -l machinereadable -d 'Show in machine readabl
 
 # Upgrade options
 # Theoretically, pacman reads packages in all formats that libarchive supports
-# In practice, it's going to be tar, tar.xz or tar.gz
-# Using "pkg.tar*" here would change __fish_complete_suffix's descriptions to "unknown"
-complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
+# In practice, it's going to be tar.xz, tar.gz or tar.zst
+complete -c $progname -n "$upgrade" -xa '(__fish_complete_suffix pkg.tar.zst; __fish_complete_suffix pkg.tar.xz; __fish_complete_suffix pkg.tar.gz)' -d 'Package file'
 
 ## Yaourt only stuff
 # Clean options

From 3d9c0d3c6982180d9900a17359cf16f476cb9d35 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 29 Dec 2019 17:43:05 +0100
Subject: [PATCH 1481/1732] Show the first few history entries in set | grep
 history

As before, but do so efficiently. See #6290
---
 src/builtin_set.cpp |  8 ++++++--
 src/complete.cpp    |  8 ++++++--
 src/expand.cpp      | 13 +++++++++++++
 src/expand.h        |  4 ++++
 src/history.h       |  4 ----
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index a179da5da..c21c886d8 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -482,8 +482,12 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
 
         if (!names_only) {
             wcstring val;
-            if (key == L"history") {
-                val = history_variable_description;
+            if (opts.shorten_ok && key == L"history") {
+                history_t *history = &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                for (size_t i = 1; i < history->size() && val.size() < 64; i++) {
+                    if (i > 1) val += L' ';
+                    val += expand_escape_string(history->item_at_index(i).str());
+                }
             } else {
                 auto var = parser.vars().get(key, compute_scope(opts));
                 if (!var.missing_or_empty()) {
diff --git a/src/complete.cpp b/src/complete.cpp
index 2707931fd..7a7c3dbc1 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1193,9 +1193,13 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
         wcstring desc;
         if (this->wants_descriptions()) {
             if (this->type() != COMPLETE_AUTOSUGGEST) {
-                // $history can be huge, don't put it in the completion description; see #6288.
+                // $history can be huge, don't put all of it in the completion description; see #6288.
                 if (env_name == L"history") {
-                    desc = history_variable_description;
+                    history_t *history = &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                    for (size_t i = 1; i < history->size() && desc.size() < 64; i++) {
+                        if (i > 1) desc += L' ';
+                        desc += expand_escape_string(history->item_at_index(i).str());
+                    }
                 } else {
                     // Can't use this->vars here, it could be any variable.
                     auto var = vars.get(env_name);
diff --git a/src/expand.cpp b/src/expand.cpp
index f1334cb41..a13b02da1 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -145,6 +145,19 @@ wcstring expand_escape_variable(const env_var_t &var) {
     return buff;
 }
 
+wcstring expand_escape_string(const wcstring &el) {
+    wcstring buff;
+    bool prefer_quotes = el.find(L' ') != wcstring::npos;
+    if (prefer_quotes && is_quotable(el)) {
+        buff.append(L"'");
+        buff.append(el);
+        buff.append(L"'");
+    } else {
+        buff.append(escape_string(el, 1));
+    }
+    return buff;
+}
+
 /// Parse an array slicing specification Returns 0 on success. If a parse error occurs, returns the
 /// index of the bad token. Note that 0 can never be a bad index because the string always starts
 /// with [.
diff --git a/src/expand.h b/src/expand.h
index be08676b3..8a0380dea 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -164,6 +164,10 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
 /// Suitable for pretty-printing.
 wcstring expand_escape_variable(const env_var_t &var);
 
+/// Convert a string value to a human readable form, i.e. escape things, handle arrays, etc.
+/// Suitable for pretty-printing.
+wcstring expand_escape_string(const wcstring &str);
+
 /// Perform tilde expansion and nothing else on the specified string, which is modified in place.
 ///
 /// \param input the string to tilde expand
diff --git a/src/history.h b/src/history.h
index 17410e8f7..6f7e30590 100644
--- a/src/history.h
+++ b/src/history.h
@@ -294,8 +294,4 @@ void start_private_mode();
 /// Queries private mode status.
 bool in_private_mode();
 
-/// The description of the $history environment variable, as offered in completions and
-/// the output of builtin set.
-constexpr const wchar_t *history_variable_description = L"Full history of interactive commands";
-
 #endif

From 9f7972a08b8f6e933e7dbb53c60e0436ad1ade98 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 14:25:42 -0800
Subject: [PATCH 1482/1732] clang-format C++ files

---
 src/builtin_read.cpp    | 11 +++--
 src/builtin_set.cpp     |  3 +-
 src/complete.cpp        |  8 ++--
 src/io.h                |  1 -
 src/parse_execution.cpp |  3 +-
 src/parser_keywords.cpp |  5 +--
 src/timer.cpp           | 97 ++++++++++++++++++++++-------------------
 src/timer.h             | 11 ++---
 src/tnode.h             |  3 +-
 src/topic_monitor.cpp   |  3 +-
 10 files changed, 76 insertions(+), 69 deletions(-)

diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index 052678143..c3880cac7 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -2,6 +2,7 @@
 #include "config.h"  // IWYU pragma: keep
 
 #include "builtin_read.h"
+
 #include <unistd.h>
 
 #include <algorithm>
@@ -403,16 +404,14 @@ static int validate_read_args(const wchar_t *cmd, read_cmd_opts_t &opts, int arg
     }
 
     if (opts.tokenize && opts.have_delimiter) {
-        streams.err.append_format(
-            BUILTIN_ERR_COMBO2, cmd,
-            L"--delimiter and --tokenize can not be used together");
+        streams.err.append_format(BUILTIN_ERR_COMBO2, cmd,
+                                  L"--delimiter and --tokenize can not be used together");
         return STATUS_INVALID_ARGS;
     }
 
     if (opts.tokenize && opts.one_line) {
-        streams.err.append_format(
-            BUILTIN_ERR_COMBO2, cmd,
-            L"--line and --tokenize can not be used together");
+        streams.err.append_format(BUILTIN_ERR_COMBO2, cmd,
+                                  L"--line and --tokenize can not be used together");
         return STATUS_INVALID_ARGS;
     }
 
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index c21c886d8..1c2631038 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -483,7 +483,8 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
         if (!names_only) {
             wcstring val;
             if (opts.shorten_ok && key == L"history") {
-                history_t *history = &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                history_t *history =
+                    &history_t::history_with_name(history_session_id(env_stack_t::principal()));
                 for (size_t i = 1; i < history->size() && val.size() < 64; i++) {
                     if (i > 1) val += L' ';
                     val += expand_escape_string(history->item_at_index(i).str());
diff --git a/src/complete.cpp b/src/complete.cpp
index 7a7c3dbc1..2b0056905 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -39,9 +39,9 @@
 #include "history.h"
 #include "iothread.h"
 #include "parse_constants.h"
-#include "parser_keywords.h"
 #include "parse_util.h"
 #include "parser.h"
+#include "parser_keywords.h"
 #include "path.h"
 #include "proc.h"
 #include "reader.h"
@@ -1193,9 +1193,11 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
         wcstring desc;
         if (this->wants_descriptions()) {
             if (this->type() != COMPLETE_AUTOSUGGEST) {
-                // $history can be huge, don't put all of it in the completion description; see #6288.
+                // $history can be huge, don't put all of it in the completion description; see
+                // #6288.
                 if (env_name == L"history") {
-                    history_t *history = &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                    history_t *history =
+                        &history_t::history_with_name(history_session_id(env_stack_t::principal()));
                     for (size_t i = 1; i < history->size() && desc.size() < 64; i++) {
                         if (i > 1) desc += L' ';
                         desc += expand_escape_string(history->item_at_index(i).str());
diff --git a/src/io.h b/src/io.h
index c43b70896..b5dd366cb 100644
--- a/src/io.h
+++ b/src/io.h
@@ -457,5 +457,4 @@ struct io_streams_t {
     explicit io_streams_t(size_t read_limit) : out(read_limit), err(read_limit), stdin_fd(-1) {}
 };
 
-
 #endif
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index c292e7208..8654b6bd1 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1356,7 +1356,8 @@ eval_result_t parse_execution_context_t::run_job_conjunction(
         if (continuation) {
             // Check the conjunction type.
             parse_job_decoration_t conj = bool_statement_type(continuation);
-            assert((conj == parse_job_decoration_and || conj == parse_job_decoration_or) && "Unexpected conjunction");
+            assert((conj == parse_job_decoration_and || conj == parse_job_decoration_or) &&
+                   "Unexpected conjunction");
             skip = should_skip(conj);
         }
         if (!skip) {
diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp
index aae7b91b2..6f4fe1eff 100644
--- a/src/parser_keywords.cpp
+++ b/src/parser_keywords.cpp
@@ -16,9 +16,8 @@ static const wcstring skip_keywords[]{
     L"begin",
 };
 
-static const wcstring subcommand_keywords[]{L"command", L"builtin", L"while", L"exec",
-                                            L"if",      L"and",     L"or",    L"not",
-                                            L"time",    L"begin"};
+static const wcstring subcommand_keywords[]{L"command", L"builtin", L"while", L"exec", L"if",
+                                            L"and",     L"or",      L"not",   L"time", L"begin"};
 
 static const string_set_t block_keywords = {L"for",      L"while",  L"if",
                                             L"function", L"switch", L"begin"};
diff --git a/src/timer.cpp b/src/timer.cpp
index 08b7deb02..d4289a766 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,25 +1,26 @@
 // Functions for executing the time builtin.
 #include "config.h"  // IWYU pragma: keep
 
+#include "timer.h"
+
+#include <string.h>
+
+#include <algorithm>
 #include <cerrno>
-#include <ctime>
 #include <chrono>
 #include <cstddef>
+#include <ctime>
 
-#include "common.h"
 #include "builtin.h"
+#include "common.h"
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
 #include "parser.h"
 #include "proc.h"
-#include "timer.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-#include <algorithm>
-#include <string.h>
-
 // Measuring time is always complicated with many caveats. Quite apart from the typical
 // gotchas faced by developers attempting to choose between monotonic vs non-monotonic and system vs
 // cpu clocks, the fact that we are executing as a shell further complicates matters: we can't just
@@ -60,7 +61,6 @@ static int64_t micros(const std::chrono::duration<D1, D2> &d) {
     return std::chrono::duration_cast<std::chrono::microseconds>(d).count();
 };
 
-
 timer_snapshot_t timer_snapshot_t::take() {
     timer_snapshot_t snapshot;
 
@@ -71,8 +71,8 @@ timer_snapshot_t timer_snapshot_t::take() {
     return snapshot;
 }
 
-wcstring
-timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool verbose /* = true */) {
+wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
+                                       bool verbose /* = true */) {
     int64_t fish_sys_micros = micros(t2.cpu_fish.ru_stime) - micros(t1.cpu_fish.ru_stime);
     int64_t fish_usr_micros = micros(t2.cpu_fish.ru_utime) - micros(t1.cpu_fish.ru_utime);
     int64_t child_sys_micros = micros(t2.cpu_children.ru_stime) - micros(t1.cpu_children.ru_stime);
@@ -112,10 +112,14 @@ timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool ver
 
     auto unit_name = [](tunit unit) {
         switch (unit) {
-            case tunit::minutes: return "minutes";
-            case tunit::seconds: return "seconds";
-            case tunit::milliseconds: return "milliseconds";
-            case tunit::microseconds: return "microseconds";
+            case tunit::minutes:
+                return "minutes";
+            case tunit::seconds:
+                return "seconds";
+            case tunit::milliseconds:
+                return "milliseconds";
+            case tunit::microseconds:
+                return "microseconds";
         }
         // GCC does not recognize the exhaustive switch above
         return "";
@@ -123,10 +127,14 @@ timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool ver
 
     auto unit_short_name = [](tunit unit) {
         switch (unit) {
-            case tunit::minutes: return "mins";
-            case tunit::seconds: return "secs";
-            case tunit::milliseconds: return "millis";
-            case tunit::microseconds: return "micros";
+            case tunit::minutes:
+                return "mins";
+            case tunit::seconds:
+                return "secs";
+            case tunit::milliseconds:
+                return "millis";
+            case tunit::microseconds:
+                return "micros";
         }
         // GCC does not recognize the exhaustive switch above
         return "";
@@ -134,10 +142,14 @@ timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool ver
 
     auto convert = [](int64_t micros, tunit unit) {
         switch (unit) {
-            case tunit::minutes: return micros / 1.0E6 / 60.0;
-            case tunit::seconds: return micros / 1.0E6;
-            case tunit::milliseconds: return micros / 1.0E3;
-            case tunit::microseconds: return micros / 1.0;
+            case tunit::minutes:
+                return micros / 1.0E6 / 60.0;
+            case tunit::seconds:
+                return micros / 1.0E6;
+            case tunit::milliseconds:
+                return micros / 1.0E3;
+            case tunit::microseconds:
+                return micros / 1.0;
         }
         // GCC does not recognize the exhaustive switch above
         return 0.0;
@@ -152,15 +164,13 @@ timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool ver
     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"              \
-            L"\n",
-            wall_time, unit_name(wall_unit),
-            usr_time, unit_name(cpu_unit),
-            sys_time, unit_name(cpu_unit)
-        );
+                      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), sys_time,
+                      unit_name(cpu_unit));
     } else {
         auto fish_unit = get_unit((fish_sys_micros + fish_usr_micros) / 2);
         auto child_unit = get_unit((child_sys_micros + child_usr_micros) / 2);
@@ -170,22 +180,17 @@ timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool ver
         auto child_sys_time = convert(child_sys_micros, child_unit);
 
         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"\n",
-            wall_time, unit_short_name(wall_unit),
-            strlen(unit_short_name(wall_unit)) - 1, "fish",
-            strlen(unit_short_name(fish_unit)) - 1, "external",
-            usr_time, unit_short_name(cpu_unit),
-            fish_usr_time, unit_short_name(fish_unit),
-            child_usr_time, unit_short_name(child_unit),
-            sys_time, unit_short_name(cpu_unit),
-            fish_sys_time, unit_short_name(fish_unit),
-            child_sys_time, unit_short_name(child_unit)
-        );
-
+                      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, unit_short_name(wall_unit), strlen(unit_short_name(wall_unit)) - 1,
+                      "fish", strlen(unit_short_name(fish_unit)) - 1, "external", usr_time,
+                      unit_short_name(cpu_unit), fish_usr_time, unit_short_name(fish_unit),
+                      child_usr_time, unit_short_name(child_unit), sys_time,
+                      unit_short_name(cpu_unit), fish_sys_time, unit_short_name(fish_unit),
+                      child_sys_time, unit_short_name(child_unit));
     }
 
     return output;
diff --git a/src/timer.h b/src/timer.h
index 8ed1a2d7d..bdc34bc2e 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -2,10 +2,11 @@
 #ifndef FISH_TIMER_H
 #define FISH_TIMER_H
 
-#include <chrono>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <chrono>
 
 #include "common.h"
 
@@ -13,7 +14,7 @@ class parser_t;
 struct io_streams_t;
 
 struct timer_snapshot_t {
-public:
+   public:
     struct rusage cpu_fish;
     struct rusage cpu_children;
     std::chrono::time_point<std::chrono::steady_clock> wall;
@@ -21,7 +22,7 @@ struct timer_snapshot_t {
     static timer_snapshot_t take();
     static wcstring print_delta(timer_snapshot_t t1, timer_snapshot_t t2, bool verbose = false);
 
-private:
+   private:
     timer_snapshot_t() {}
 };
 
diff --git a/src/tnode.h b/src/tnode.h
index 0ec725f41..cfe3fd17b 100644
--- a/src/tnode.h
+++ b/src/tnode.h
@@ -235,8 +235,7 @@ parse_statement_decoration_t get_decoration(tnode_t<grammar::plain_statement> st
 /// Return the type for a boolean statement.
 parse_job_decoration_t bool_statement_type(tnode_t<grammar::job_decorator> stmt);
 
-parse_job_decoration_t bool_statement_type(
-    tnode_t<grammar::job_conjunction_continuation> cont);
+parse_job_decoration_t bool_statement_type(tnode_t<grammar::job_conjunction_continuation> cont);
 
 /// Given a redirection node, get the parsed redirection and target of the redirection (file path,
 /// or fd).
diff --git a/src/topic_monitor.cpp b/src/topic_monitor.cpp
index 57763ae7a..779c5bffb 100644
--- a/src/topic_monitor.cpp
+++ b/src/topic_monitor.cpp
@@ -155,7 +155,8 @@ generation_list_t topic_monitor_t::await_gens(const generation_list_t &input_gen
 #endif
             uint8_t ignored[PIPE_BUF];
             auto unused = read(fd, ignored, sizeof ignored);
-            if (unused) {}
+            if (unused) {
+            }
 
             // We are finished reading. We must stop being the reader, and post on the condition
             // variable to wake up any other threads waiting for us to finish reading.

From 94dcd1cc071760a3d2b983550565546aa396ad23 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 14:21:29 -0800
Subject: [PATCH 1483/1732] Use the given parser when fetching certain
 histories

---
 src/builtin_set.cpp | 2 +-
 src/complete.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 1c2631038..06af7b60b 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -484,7 +484,7 @@ static int builtin_set_list(const wchar_t *cmd, set_cmd_opts_t &opts, int argc,
             wcstring val;
             if (opts.shorten_ok && key == L"history") {
                 history_t *history =
-                    &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                    &history_t::history_with_name(history_session_id(parser.vars()));
                 for (size_t i = 1; i < history->size() && val.size() < 64; i++) {
                     if (i > 1) val += L' ';
                     val += expand_escape_string(history->item_at_index(i).str());
diff --git a/src/complete.cpp b/src/complete.cpp
index 2b0056905..691c470ba 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1197,7 +1197,7 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
                 // #6288.
                 if (env_name == L"history") {
                     history_t *history =
-                        &history_t::history_with_name(history_session_id(env_stack_t::principal()));
+                        &history_t::history_with_name(history_session_id(parser->vars()));
                     for (size_t i = 1; i < history->size() && desc.size() < 64; i++) {
                         if (i > 1) desc += L' ';
                         desc += expand_escape_string(history->item_at_index(i).str());

From b784a0caa3cf33f46298120e0fe4be280f1526b2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 14:49:05 -0800
Subject: [PATCH 1484/1732] dup2_list_t::resolve_chain to stop returning maybe

It can no longer fail.
---
 src/exec.cpp        | 14 +++++---------
 src/fish_tests.cpp  | 28 +++++++++++++---------------
 src/redirection.cpp |  4 ++--
 src/redirection.h   |  2 +-
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 02b510bad..6cbbe49ab 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -201,8 +201,8 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
     }
 
     // child_setup_process makes sure signals are properly set up.
-    auto redirs = dup2_list_t::resolve_chain(all_ios);
-    if (redirs && !child_setup_process(INVALID_PID, false, *redirs)) {
+    dup2_list_t redirs = dup2_list_t::resolve_chain(all_ios);
+    if (!child_setup_process(INVALID_PID, false, redirs)) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -282,9 +282,6 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
     // asked to truncate a file (e.g. `echo -n '' > /tmp/truncateme.txt'). The open() in the dup2
     // list resolution will ensure this happens.
     f->dup2s = dup2_list_t::resolve_chain(ios);
-    if (!f->dup2s) {
-        return false;
-    }
 
     // Figure out which source fds to write to. If they are closed (unlikely) we just exit
     // successfully.
@@ -565,7 +562,6 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
     // Convert our IO chain to a dup2 sequence.
     auto dup2s = dup2_list_t::resolve_chain(proc_io_chain);
-    if (!dup2s) return false;
 
     // Ensure that stdin is blocking before we hand it off (see issue #176). It's a
     // little strange that we only do this with stdin and not with stdout or stderr.
@@ -584,14 +580,14 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
 #if FISH_USE_POSIX_SPAWN
     // Prefer to use posix_spawn, since it's faster on some systems like OS X.
-    bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j, *dup2s);
+    bool use_posix_spawn = g_use_posix_spawn && can_use_posix_spawn_for_job(j, dup2s);
     if (use_posix_spawn) {
         s_fork_count++;  // spawn counts as a fork+exec
         // Create posix spawn attributes and actions.
         pid_t pid = 0;
         posix_spawnattr_t attr = posix_spawnattr_t();
         posix_spawn_file_actions_t actions = posix_spawn_file_actions_t();
-        bool made_it = fork_actions_make_spawn_properties(&attr, &actions, j.get(), *dup2s);
+        bool made_it = fork_actions_make_spawn_properties(&attr, &actions, j.get(), dup2s);
         if (made_it) {
             // We successfully made the attributes and actions; actually call
             // posix_spawn.
@@ -653,7 +649,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
     } else
 #endif
     {
-        if (!fork_child_for_process(j, p, *dup2s, "external command",
+        if (!fork_child_for_process(j, p, dup2s, "external command",
                                     [&] { safe_launch_process(p, actual_cmd, argv, envv); })) {
             return false;
         }
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 2ab4f7bc1..19776b426 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2462,14 +2462,13 @@ static void test_dup2s() {
     chain.push_back(make_shared<io_close_t>(17));
     chain.push_back(make_shared<io_fd_t>(3, 19));
     auto list = dup2_list_t::resolve_chain(chain);
-    do_test(list.has_value());
-    do_test(list->get_actions().size() == 2);
+    do_test(list.get_actions().size() == 2);
 
-    auto act1 = list->get_actions().at(0);
+    auto act1 = list.get_actions().at(0);
     do_test(act1.src == 17);
     do_test(act1.target == -1);
 
-    auto act2 = list->get_actions().at(1);
+    auto act2 = list.get_actions().at(1);
     do_test(act2.src == 19);
     do_test(act2.target == 3);
 }
@@ -2485,17 +2484,16 @@ static void test_dup2s_fd_for_target_fd() {
     chain.push_back(make_shared<io_fd_t>(3, 5));
     auto list = dup2_list_t::resolve_chain(chain);
 
-    do_test(list.has_value());
-    do_test(list->fd_for_target_fd(3) == 8);
-    do_test(list->fd_for_target_fd(5) == 8);
-    do_test(list->fd_for_target_fd(8) == 8);
-    do_test(list->fd_for_target_fd(1) == 4);
-    do_test(list->fd_for_target_fd(4) == 4);
-    do_test(list->fd_for_target_fd(100) == 100);
-    do_test(list->fd_for_target_fd(0) == 0);
-    do_test(list->fd_for_target_fd(-1) == -1);
-    do_test(list->fd_for_target_fd(9) == -1);
-    do_test(list->fd_for_target_fd(10) == -1);
+    do_test(list.fd_for_target_fd(3) == 8);
+    do_test(list.fd_for_target_fd(5) == 8);
+    do_test(list.fd_for_target_fd(8) == 8);
+    do_test(list.fd_for_target_fd(1) == 4);
+    do_test(list.fd_for_target_fd(4) == 4);
+    do_test(list.fd_for_target_fd(100) == 100);
+    do_test(list.fd_for_target_fd(0) == 0);
+    do_test(list.fd_for_target_fd(-1) == -1);
+    do_test(list.fd_for_target_fd(9) == -1);
+    do_test(list.fd_for_target_fd(10) == -1);
 }
 
 /// Testing colors.
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 4ae858f74..7d991fff1 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -32,7 +32,7 @@ int redirection_spec_t::oflags() const {
     }
 }
 
-maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
+dup2_list_t dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
     ASSERT_IS_NOT_FORKED_CHILD();
     dup2_list_t result;
     for (const auto &io_ref : io_chain) {
@@ -70,7 +70,7 @@ maybe_t<dup2_list_t> dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
             }
         }
     }
-    return {std::move(result)};
+    return result;
 }
 
 int dup2_list_t::fd_for_target_fd(int target) const {
diff --git a/src/redirection.h b/src/redirection.h
index 7bde368c4..b5c1ba10d 100644
--- a/src/redirection.h
+++ b/src/redirection.h
@@ -95,7 +95,7 @@ class dup2_list_t {
     /// Produce a dup_fd_list_t from an io_chain. This may not be called before fork().
     /// The result contains the list of fd actions (dup2 and close), as well as the list
     /// of fds opened.
-    static maybe_t<dup2_list_t> resolve_chain(const io_chain_t &);
+    static dup2_list_t resolve_chain(const io_chain_t &);
 
     /// \return the fd ultimately dup'd to a target fd, or -1 if the target is closed.
     /// For example, if target fd is 1, and we have a dup2 chain 5->3 and 3->1, then we will

From d0cefe8b65a418cc3e84457f943e6d5a983b7b8d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 14:57:16 -0800
Subject: [PATCH 1485/1732] Always mark pipes as cloexec

There is never a reason to keep these open in exec.
---
 src/io.cpp | 10 +++++-----
 src/io.h   |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 54a8218da..8ca1da89f 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -301,7 +301,7 @@ fd_set_t io_chain_t::fd_set() const {
     return result;
 }
 
-autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset, bool cloexec) {
+autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset) {
     if (!fd.valid() || !fdset.contains(fd.fd())) {
         return fd;
     }
@@ -319,8 +319,8 @@ autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset, bool
         return autoclose_fd_t{};
     }
     // Ok, we have a new candidate fd. Recurse.
-    if (cloexec) set_cloexec(tmp_fd);
-    return move_fd_to_unused(autoclose_fd_t{tmp_fd}, fdset, cloexec);
+    set_cloexec(tmp_fd);
+    return move_fd_to_unused(autoclose_fd_t{tmp_fd}, fdset);
 }
 
 maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset) {
@@ -334,10 +334,10 @@ maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset) {
     set_cloexec(pipes[0]);
     set_cloexec(pipes[1]);
 
-    auto read = move_fd_to_unused(autoclose_fd_t{pipes[0]}, fdset, true);
+    auto read = move_fd_to_unused(autoclose_fd_t{pipes[0]}, fdset);
     if (!read.valid()) return none();
 
-    auto write = move_fd_to_unused(autoclose_fd_t{pipes[1]}, fdset, true);
+    auto write = move_fd_to_unused(autoclose_fd_t{pipes[1]}, fdset);
     if (!write.valid()) return none();
 
     return autoclose_pipes_t(std::move(read), std::move(write));
diff --git a/src/io.h b/src/io.h
index b5dd366cb..3af5934d2 100644
--- a/src/io.h
+++ b/src/io.h
@@ -387,10 +387,9 @@ struct autoclose_pipes_t {
 maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset);
 
 /// If the given fd is present in \p fdset, duplicates it repeatedly until an fd not used in the set
-/// is found or we run out. If we return a new fd or an error, closes the old one. If \p cloexec is
-/// set, any fd created is marked close-on-exec. \returns -1 on failure (in which case the given fd
-/// is still closed).
-autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset, bool cloexec = true);
+/// is found or we run out. If we return a new fd or an error, closes the old one. Marks the fd as
+/// cloexec. \returns invalid fd on failure (in which case the given fd is still closed).
+autoclose_fd_t move_fd_to_unused(autoclose_fd_t fd, const fd_set_t &fdset);
 
 /// Class representing the output that a builtin can generate.
 class output_stream_t {

From 5d550048416f3dcc4c3734aff7f00b8108509817 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 14:59:53 -0800
Subject: [PATCH 1486/1732] Stop adding close actions in pipe and bufferfills

Now that all pipes are marked CLOEXEC, there is no reason to add explicit
close calls here.
---
 src/redirection.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/redirection.cpp b/src/redirection.cpp
index 7d991fff1..3c1a8ad8f 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -58,14 +58,12 @@ dup2_list_t dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
             case io_mode_t::pipe: {
                 const io_pipe_t *io = static_cast<const io_pipe_t *>(io_ref.get());
                 result.add_dup2(io->pipe_fd(), io->fd);
-                result.add_close(io->pipe_fd());
                 break;
             }
 
             case io_mode_t::bufferfill: {
                 const io_bufferfill_t *io = static_cast<const io_bufferfill_t *>(io_ref.get());
                 result.add_dup2(io->write_fd(), io->fd);
-                result.add_close(io->write_fd());
                 break;
             }
         }

From 0af5608ce8fd00e0836106fbf99a2853d39b71ce Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 15:14:08 -0800
Subject: [PATCH 1487/1732] io_data_t to store the source_fd directly

Now that all io_data_ts know their source fd, just store it directly in
the base class. This will simplify some uses of io_data_t.
---
 src/exec.cpp        |  4 ++--
 src/io.cpp          |  4 ++--
 src/io.h            | 27 ++++++++++++++++-----------
 src/redirection.cpp |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 6cbbe49ab..5325e872a 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -392,8 +392,8 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
                 // which is internal to fish. We still respect this redirection in
                 // that we pass it on as a block IO to the code that source runs,
                 // and therefore this is not an error.
-                if (in_fd->old_fd >= 0 && in_fd->old_fd < 3) {
-                    local_builtin_stdin = in_fd->old_fd;
+                if (in_fd->source_fd >= 0 && in_fd->source_fd < 3) {
+                    local_builtin_stdin = in_fd->source_fd;
                 }
                 break;
             }
diff --git a/src/io.cpp b/src/io.cpp
index 8ca1da89f..b00800c0d 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -30,13 +30,13 @@
 io_data_t::~io_data_t() = default;
 
 io_file_t::io_file_t(int f, autoclose_fd_t file)
-    : io_data_t(io_mode_t::file, f), file_fd_(std::move(file)) {
+    : io_data_t(io_mode_t::file, f, file_fd_.fd()), file_fd_(std::move(file)) {
     assert(file_fd_.valid() && "File is not valid");
 }
 
 void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
 
-void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", old_fd, fd); }
+void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", source_fd, fd); }
 
 void io_file_t::print() const { std::fwprintf(stderr, L"file (%d)\n", file_fd_.fd()); }
 
diff --git a/src/io.h b/src/io.h
index 3af5934d2..b5319e70a 100644
--- a/src/io.h
+++ b/src/io.h
@@ -169,27 +169,31 @@ enum class io_mode_t { file, pipe, fd, close, bufferfill };
 
 /// Represents an FD redirection.
 class io_data_t {
-   private:
     // No assignment or copying allowed.
-    io_data_t(const io_data_t &rhs);
-    void operator=(const io_data_t &rhs);
+    io_data_t(const io_data_t &rhs) = delete;
+    void operator=(const io_data_t &rhs) = delete;
 
    protected:
-    io_data_t(io_mode_t m, int f) : io_mode(m), fd(f) {}
+    io_data_t(io_mode_t m, int fd, int source_fd) : io_mode(m), fd(fd), source_fd(source_fd) {}
 
    public:
     /// Type of redirect.
     const io_mode_t io_mode;
+
     /// FD to redirect.
     const int fd;
 
+    /// Source fd. This is dup2'd to fd, or if it is -1, then fd is closed.
+    /// That is, we call dup2(source_fd, fd).
+    const int source_fd;
+
     virtual void print() const = 0;
     virtual ~io_data_t() = 0;
 };
 
 class io_close_t : public io_data_t {
    public:
-    explicit io_close_t(int f) : io_data_t(io_mode_t::close, f) {}
+    explicit io_close_t(int f) : io_data_t(io_mode_t::close, f, -1) {}
 
     void print() const override;
     ~io_close_t() override;
@@ -197,14 +201,13 @@ class io_close_t : public io_data_t {
 
 class io_fd_t : public io_data_t {
    public:
-    /// fd to redirect specified fd to. For example, in 2>&1, old_fd is 1, and io_data_t::fd is 2.
-    const int old_fd;
-
     void print() const override;
 
     ~io_fd_t() override;
 
-    io_fd_t(int f, int old) : io_data_t(io_mode_t::fd, f), old_fd(old) {}
+    /// fd to redirect specified fd to. For example, in 2>&1, source_fd is 1, and io_data_t::fd
+    /// is 2.
+    io_fd_t(int f, int source_fd) : io_data_t(io_mode_t::fd, f, source_fd) {}
 };
 
 /// Represents a redirection to or from an opened file.
@@ -235,7 +238,9 @@ class io_pipe_t : public io_data_t {
     void print() const override;
 
     io_pipe_t(int fd, bool is_input, autoclose_fd_t pipe_fd)
-        : io_data_t(io_mode_t::pipe, fd), pipe_fd_(std::move(pipe_fd)), is_input_(is_input) {}
+        : io_data_t(io_mode_t::pipe, fd, pipe_fd.fd()),
+          pipe_fd_(std::move(pipe_fd)),
+          is_input_(is_input) {}
 
     ~io_pipe_t() override;
 
@@ -260,7 +265,7 @@ class io_bufferfill_t : public io_data_t {
     // The ctor is public to support make_shared() in the static create function below.
     // Do not invoke this directly.
     io_bufferfill_t(autoclose_fd_t write_fd, std::shared_ptr<io_buffer_t> buffer)
-        : io_data_t(io_mode_t::bufferfill, STDOUT_FILENO),
+        : io_data_t(io_mode_t::bufferfill, STDOUT_FILENO, write_fd.fd()),
           write_fd_(std::move(write_fd)),
           buffer_(std::move(buffer)) {}
 
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 3c1a8ad8f..059dd65a4 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -51,7 +51,7 @@ dup2_list_t dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
 
             case io_mode_t::fd: {
                 const io_fd_t *io = static_cast<const io_fd_t *>(io_ref.get());
-                result.add_dup2(io->old_fd, io->fd);
+                result.add_dup2(io->source_fd, io->fd);
                 break;
             }
 

From c963442999f1513eae2026551f273998cbbcbdeb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 29 Dec 2019 15:51:22 -0800
Subject: [PATCH 1488/1732] Collapse io_data switch statements

Now that each io_data knows its source and target fd, we don't need to switch
on its types any more.
---
 src/exec.cpp        | 48 ++++++++++-----------------------------------
 src/io.cpp          | 18 ++++++-----------
 src/io.h            | 20 +++++++++----------
 src/redirection.cpp | 36 +++++-----------------------------
 4 files changed, 31 insertions(+), 91 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 5325e872a..5c6f36f68 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -382,45 +382,17 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     // If this is the first process, check the io redirections and see where we should
     // be reading from.
     if (pipe_read) {
-        local_builtin_stdin = pipe_read->pipe_fd();
+        local_builtin_stdin = pipe_read->source_fd;
     } else if (const auto in = proc_io_chain.io_for_fd(STDIN_FILENO)) {
-        switch (in->io_mode) {
-            case io_mode_t::fd: {
-                const io_fd_t *in_fd = static_cast<const io_fd_t *>(in.get());
-                // Ignore fd redirections from an fd other than the
-                // standard ones. e.g. in source <&3 don't actually read from fd 3,
-                // which is internal to fish. We still respect this redirection in
-                // that we pass it on as a block IO to the code that source runs,
-                // and therefore this is not an error.
-                if (in_fd->source_fd >= 0 && in_fd->source_fd < 3) {
-                    local_builtin_stdin = in_fd->source_fd;
-                }
-                break;
-            }
-            case io_mode_t::pipe: {
-                const io_pipe_t *in_pipe = static_cast<const io_pipe_t *>(in.get());
-                if (in_pipe->fd == STDIN_FILENO) {
-                    local_builtin_stdin = in_pipe->pipe_fd();
-                }
-                break;
-            }
-            case io_mode_t::file: {
-                const io_file_t *in_file = static_cast<const io_file_t *>(in.get());
-                local_builtin_stdin = in_file->file_fd();
-                break;
-            }
-            case io_mode_t::close: {
-                // FIXME: When requesting that stdin be closed, we really don't do
-                // anything. How should this be handled?
-                local_builtin_stdin = -1;
-
-                break;
-            }
-            default: {
-                local_builtin_stdin = -1;
-                debug(1, _(L"Unknown input redirection type %d"), in->io_mode);
-                break;
-            }
+        // Ignore fd redirections from an fd other than the
+        // standard ones. e.g. in source <&3 don't actually read from fd 3,
+        // which is internal to fish. We still respect this redirection in
+        // that we pass it on as a block IO to the code that source runs,
+        // and therefore this is not an error.
+        bool ignore_redirect =
+            in->io_mode == io_mode_t::fd && in->source_fd >= 0 && in->source_fd < 3;
+        if (!ignore_redirect) {
+            local_builtin_stdin = in->source_fd;
         }
     }
 
diff --git a/src/io.cpp b/src/io.cpp
index b00800c0d..9fa759f0d 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -28,11 +28,11 @@
 #define OPEN_MASK 0666
 
 io_data_t::~io_data_t() = default;
-
-io_file_t::io_file_t(int f, autoclose_fd_t file)
-    : io_data_t(io_mode_t::file, f, file_fd_.fd()), file_fd_(std::move(file)) {
-    assert(file_fd_.valid() && "File is not valid");
-}
+io_pipe_t::~io_pipe_t() = default;
+io_fd_t::~io_fd_t() = default;
+io_close_t::~io_close_t() = default;
+io_file_t::~io_file_t() = default;
+io_bufferfill_t::~io_bufferfill_t() = default;
 
 void io_close_t::print() const { std::fwprintf(stderr, L"close %d\n", fd); }
 
@@ -41,7 +41,7 @@ void io_fd_t::print() const { std::fwprintf(stderr, L"FD map %d -> %d\n", source
 void io_file_t::print() const { std::fwprintf(stderr, L"file (%d)\n", file_fd_.fd()); }
 
 void io_pipe_t::print() const {
-    std::fwprintf(stderr, L"pipe {%d} (input: %s)\n", pipe_fd(), is_input_ ? "yes" : "no");
+    std::fwprintf(stderr, L"pipe {%d} (input: %s)\n", source_fd, is_input_ ? "yes" : "no");
 }
 
 void io_bufferfill_t::print() const { std::fwprintf(stderr, L"bufferfill {%d}\n", write_fd_.fd()); }
@@ -207,12 +207,6 @@ std::shared_ptr<io_buffer_t> io_bufferfill_t::finish(std::shared_ptr<io_bufferfi
     return buffer;
 }
 
-io_pipe_t::~io_pipe_t() = default;
-io_fd_t::~io_fd_t() = default;
-io_close_t::~io_close_t() = default;
-io_file_t::~io_file_t() = default;
-io_bufferfill_t::~io_bufferfill_t() = default;
-
 io_buffer_t::~io_buffer_t() {
     assert(!fillthread_running() && "io_buffer_t destroyed with outstanding fillthread");
 }
diff --git a/src/io.h b/src/io.h
index b5319e70a..7503b664e 100644
--- a/src/io.h
+++ b/src/io.h
@@ -215,12 +215,13 @@ class io_file_t : public io_data_t {
    public:
     void print() const override;
 
-    io_file_t(int f, autoclose_fd_t file);
+    io_file_t(int fd, autoclose_fd_t file)
+        : io_data_t(io_mode_t::file, fd, file.fd()), file_fd_(std::move(file)) {
+        assert(file_fd_.valid() && "File is not valid");
+    }
 
     ~io_file_t() override;
 
-    int file_fd() const { return file_fd_.fd(); }
-
    private:
     // The fd for the file which we are writing to or reading from.
     autoclose_fd_t file_fd_;
@@ -240,11 +241,11 @@ class io_pipe_t : public io_data_t {
     io_pipe_t(int fd, bool is_input, autoclose_fd_t pipe_fd)
         : io_data_t(io_mode_t::pipe, fd, pipe_fd.fd()),
           pipe_fd_(std::move(pipe_fd)),
-          is_input_(is_input) {}
+          is_input_(is_input) {
+        assert(pipe_fd_.valid() && "Pipe is not valid");
+    }
 
     ~io_pipe_t() override;
-
-    int pipe_fd() const { return pipe_fd_.fd(); }
 };
 
 class io_buffer_t;
@@ -267,15 +268,14 @@ class io_bufferfill_t : public io_data_t {
     io_bufferfill_t(autoclose_fd_t write_fd, std::shared_ptr<io_buffer_t> buffer)
         : io_data_t(io_mode_t::bufferfill, STDOUT_FILENO, write_fd.fd()),
           write_fd_(std::move(write_fd)),
-          buffer_(std::move(buffer)) {}
+          buffer_(std::move(buffer)) {
+        assert(write_fd_.valid() && "fd is not valid");
+    }
 
     ~io_bufferfill_t() override;
 
     std::shared_ptr<io_buffer_t> buffer() const { return buffer_; }
 
-    /// \return the fd that, when written to, fills the buffer.
-    int write_fd() const { return write_fd_.fd(); }
-
     /// Create an io_bufferfill_t which, when written from, fills a buffer with the contents.
     /// \returns nullptr on failure, e.g. too many open fds.
     ///
diff --git a/src/redirection.cpp b/src/redirection.cpp
index 059dd65a4..92a01d04a 100644
--- a/src/redirection.cpp
+++ b/src/redirection.cpp
@@ -35,37 +35,11 @@ int redirection_spec_t::oflags() const {
 dup2_list_t dup2_list_t::resolve_chain(const io_chain_t &io_chain) {
     ASSERT_IS_NOT_FORKED_CHILD();
     dup2_list_t result;
-    for (const auto &io_ref : io_chain) {
-        switch (io_ref->io_mode) {
-            case io_mode_t::file: {
-                const io_file_t *io = static_cast<const io_file_t *>(io_ref.get());
-                result.add_dup2(io->file_fd(), io->fd);
-                break;
-            }
-
-            case io_mode_t::close: {
-                const io_close_t *io = static_cast<const io_close_t *>(io_ref.get());
-                result.add_close(io->fd);
-                break;
-            }
-
-            case io_mode_t::fd: {
-                const io_fd_t *io = static_cast<const io_fd_t *>(io_ref.get());
-                result.add_dup2(io->source_fd, io->fd);
-                break;
-            }
-
-            case io_mode_t::pipe: {
-                const io_pipe_t *io = static_cast<const io_pipe_t *>(io_ref.get());
-                result.add_dup2(io->pipe_fd(), io->fd);
-                break;
-            }
-
-            case io_mode_t::bufferfill: {
-                const io_bufferfill_t *io = static_cast<const io_bufferfill_t *>(io_ref.get());
-                result.add_dup2(io->write_fd(), io->fd);
-                break;
-            }
+    for (const auto &io : io_chain) {
+        if (io->source_fd < 0) {
+            result.add_close(io->fd);
+        } else {
+            result.add_dup2(io->source_fd, io->fd);
         }
     }
     return result;

From 0afc5258cf7550bbb26e781cb620f7d349817a21 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 13 Dec 2019 12:26:40 +0100
Subject: [PATCH 1489/1732] Unify detection of fish version upgrade with
 $__fish_initialized

This variable holds an integer that resembles the fish version up to
that initializations were performed. It should be incremented whenever
some new initialization is required after upgrading fish.  This should
not change the behavior for existing fish installations, except for a
minor message on installations that upgrade from fish<2.3.0.

[ci skip]
---
 share/config.fish                              | 13 +++++++++++--
 share/functions/__fish_config_interactive.fish | 15 +++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index cecdeceb0..388cc018d 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -8,6 +8,16 @@ set -g IFS \n\ \t
 set -qg __fish_added_user_paths
 or set -g __fish_added_user_paths
 
+# For one-off upgrades of the fish version, see __fish_config_interactive.fish
+if not set -q __fish_initialized
+    set -U __fish_initialized 0
+    if set -q __fish_init_2_39_8
+        set __fish_initialized 2398
+    else if set -q __fish_init_2_3_0
+        set __fish_initialized 2300
+    end
+end
+
 #
 # Create the default command_not_found handler
 #
@@ -154,7 +164,7 @@ end
 # Upgrade pre-existing abbreviations from the old "key=value" to the new "key value" syntax.
 # This needs to be in share/config.fish because __fish_config_interactive is called after sourcing
 # config.fish, which might contain abbr calls.
-if not set -q __fish_init_2_3_0
+if test $__fish_initialized -lt 2300
     if set -q fish_user_abbreviations
         set -l fab
         for abbr in $fish_user_abbreviations
@@ -162,7 +172,6 @@ if not set -q __fish_init_2_3_0
         end
         set fish_user_abbreviations $fab
     end
-    set -U __fish_init_2_3_0
 end
 
 #
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 55a524b62..15adeac68 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -4,13 +4,11 @@
 # This function is called by the __fish_on_interactive function, which is defined in config.fish.
 #
 function __fish_config_interactive -d "Initializations that should be performed when entering interactive mode"
-    if not set -q __fish_init_3_x
+    if test $__fish_initialized -lt 3000
         # Perform transitions relevant to going from fish 2.x to 3.x.
 
         # Migrate old universal abbreviations to the new scheme.
         __fish_abbr_old | source
-
-        set -U __fish_init_3_x
     end
 
     # Make sure this function is only run once.
@@ -24,7 +22,7 @@ function __fish_config_interactive -d "Initializations that should be performed
     if not set -q fish_greeting
         set -l line1 (_ 'Welcome to fish, the friendly interactive shell')
         set -l line2 ''
-        if not set -q __fish_init_2_3_0
+        if test $__fish_initialized -lt 2300
             set line2 \n(_ 'Type `help` for instructions on how to use fish')
         end
         set -U fish_greeting "$line1$line2"
@@ -44,7 +42,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
     #
     # If we are starting up for the first time, set various defaults.
-    if not set -q __fish_init_3_1_0
+    if test $__fish_initialized -lt 3100
 
         # Regular syntax highlighting colors
         __init_uvar fish_color_normal normal
@@ -89,9 +87,6 @@ function __fish_config_interactive -d "Initializations that should be performed
         # Directory history colors
         #
         __init_uvar fish_color_history_current --bold
-
-        set -e __fish_init_2_39_8
-        set -U __fish_init_3_1_0
     end
 
     #
@@ -341,4 +336,8 @@ function __fish_config_interactive -d "Initializations that should be performed
             end
         end
     end
+
+    # 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
 end

From 4a47e212f8662e2dd2605ef3b8942f6bae8b1b3b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 30 Dec 2019 14:03:36 +0100
Subject: [PATCH 1490/1732] Color the default prompt host if running via SSH

This is part of our (well, my) quest to spice up the default prompt.

In this case we color the host if $SSH_TTY is set, which is easy to
detect and helps draw attention to the host.

See #6398.
See #6375.
---
 share/functions/__fish_config_interactive.fish         |  1 +
 share/functions/fish_prompt.fish                       |  8 +++++++-
 share/tools/web_config/sample_prompts/classic_vcs.fish | 10 ++++++++--
 sphinx_doc_src/index.rst                               |  2 ++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 15adeac68..70d1ecd64 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -58,6 +58,7 @@ function __fish_config_interactive -d "Initializations that should be performed
         __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
 
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 71a668643..1297008c2 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -16,8 +16,14 @@ function fish_prompt --description 'Write out the prompt'
             set suffix '#'
     end
 
+    # If we're running via SSH, change the host color.
+    set -l color_host $fish_color_host
+    if set -q SSH_TTY
+        set color_host $fish_color_host_remote
+    end
+
     # Write pipestatus
     set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
-    echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
+    echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 7203b7320..bb8a98d06 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -1,4 +1,4 @@
-# name: Classic + Vcs
+# name: Classic + Vcs (the default)
 # author: Lily Ballard
 
 function fish_prompt --description 'Write out the prompt'
@@ -17,8 +17,14 @@ function fish_prompt --description 'Write out the prompt'
             set suffix '#'
     end
 
+    # If we're running via SSH, change the host color.
+    set -l color_host $fish_color_host
+    if set -q SSH_TTY
+        set color_host $fish_color_host_remote
+    end
+
     # Write pipestatus
     set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
-    echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $fish_color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
+    echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d856384ac..04c5d1f4d 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1096,6 +1096,8 @@ The following variables are available to change the highlighting colors in fish:
 
 - ``fish_color_host``, the color used to print the current host system in some of fish default prompts
 
+- ``fish_color_host_remote``, the color used to print the current host system in some of fish default prompts, if fish is running remotely (via ssh or similar)
+
 - ``fish_color_cancel``, the color for the '^C' indicator on a canceled command
 
 Additionally, the following variables are available to change the highlighting in the completion pager:

From 9f61512e67fe4f1c2038bc1f15c1f6caf251b4e6 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 30 Dec 2019 14:07:10 +0100
Subject: [PATCH 1491/1732] CHANGELOG prompt improvements

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f7477bb0..c9f047ab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,7 @@
 #### Improved prompts
 - The git prompt in informative mode now shows the number of stashes if enabled.
 - The git prompt now has an option (`$__fish_git_prompt_use_informative_chars`) to use the (more modern) informative characters without enabling informative mode.
+- The default prompt now also features VCS integration and will color the host if running via SSH (#6375).
 
 #### Improved terminal output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).

From 8e17d29e04eeef27471eb682a06f8d9116cb26ca Mon Sep 17 00:00:00 2001
From: Dan Zimmerman <daniel.zimmerman@me.com>
Date: Sun, 29 Dec 2019 10:46:07 -0500
Subject: [PATCH 1492/1732] Introduce the internal jobs for functions

This PR is aimed at improving how job ids are assigned. In particular,
previous to this commit, a job id would be consumed by functions (and
thus aliases). Since it's usual to use functions as command wrappers
this results in awkward job id assignments.

For example if the user is like me and just made the jump from vim -> neovim
then the user might create the following alias:
```
alias vim=nvim
```
Previous to this commit if the user ran `vim` after setting up this
alias, backgrounded (^Z) and ran `jobs` then the output might be:
```
Job	Group	State	Command
2	60267	stopped	nvim  $argv
```
If the user subsequently opened another vim (nvim) session, backgrounded
and ran jobs then they might see what follows:
```
Job	Group	State	Command
4	70542	stopped	nvim  $argv
2	60267	stopped	nvim  $argv
```
These job ids feel unnatural, especially when transitioning away from
e.g. bash where job ids are sequentially incremented (and aliases/functions
don't consume a job id).

See #6053 for more details.

As @ridiculousfish pointed out in
https://github.com/fish-shell/fish-shell/issues/6053#issuecomment-559899400,
we want to elide a job's job id if it corresponds to a single function in the
foreground. This translates to the following prerequisites:

- A job must correspond to a single process (i.e. the job continuation
    must be empty)
- A job must be in the foreground (i.e. `&` wasn't appended)
- The job's single process must resolve to a function invocation

If all of these conditions are true then we should mark a job as
"internal" and somehow remove it from consideration when any
infrastructure tries to interact with jobs / job ids.

I saw two paths to implement these requirements:

- At the time of job creation calculate whether or not a job is
  "internal" and use a separate list of job ids to track their ids.
  Additionally introduce a new flag denoting that a job is internal so
  that e.g. `jobs` doesn't list internal jobs
  - I started implementing this route but quickly realized I was
    computing the same information that would be computed later on (e.g.
    "is this job a single process" and "is this jobs statement a
    function"). Specifically I was computing data that populate_job_process
    would end up computing later anyway. Additionally this added some
    weird complexities to the job system (after the change there were two
    job id lists AND an additional flag that had to be taken into
    consideration)
- Once a function is about to be executed we release the current jobs
  job id if the prerequisites are satisfied (which at this point have
  been fully computed).
  - I opted for this solution since it seems cleaner. In this
  implementation "releasing a job id" is done by both calling
  `release_job_id` and by marking the internal job_id member variable to
  -1. The former operation allows subsequent child jobs to reuse that
  same job id (so e.g. the situation described in Motivation doesn't
  occur), and the latter ensures that no other job / job id
  infrastructure will interact with these jobs because valid jobs have
  positive job ids. The second operation causes job_id to become
  non-const which leads to the list of code changes outside of `exec.c`
  (i.e. a codemod from `job_t::job_id` -> `job_t::job_id()` and moving the
   old member variable to a non-const private `job_t::job_id_`)

Note: Its very possible I missed something and setting the job id to -1
will break some other infrastructure, please let me know if so!

I tried to run `make/ninja lint`, but a bunch of non-relevant issues
appeared (e.g. `fatal error: 'config.h' file not found`). I did
successfully clang-format (`git clang-format -f`) and run tests, though.
This PR closes #6053.
---
 src/builtin_bg.cpp      |  4 ++--
 src/builtin_disown.cpp  |  2 +-
 src/builtin_fg.cpp      |  4 ++--
 src/builtin_jobs.cpp    |  2 +-
 src/builtin_wait.cpp    | 12 ++++++------
 src/event.cpp           |  4 ++--
 src/exec.cpp            | 13 ++++++++++---
 src/parse_execution.cpp |  4 ++--
 src/parser.cpp          |  2 +-
 src/postfork.cpp        |  2 +-
 src/proc.cpp            | 22 ++++++++++++----------
 src/proc.h              | 13 ++++++++++++-
 12 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 4858e0c8e..0b3b146b1 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -22,12 +22,12 @@ static int send_to_bg(parser_t &parser, io_streams_t &streams, job_t *j) {
     if (!j->wants_job_control()) {
         wcstring error_message = format_string(
             _(L"%ls: Can't put job %d, '%ls' to background because it is not under job control\n"),
-            L"bg", j->job_id, j->command_wcstr());
+            L"bg", j->job_id(), j->command_wcstr());
         builtin_print_help(parser, streams, L"bg", &error_message);
         return STATUS_CMD_ERROR;
     }
 
-    streams.err.append_format(_(L"Send job %d '%ls' to background\n"), j->job_id,
+    streams.err.append_format(_(L"Send job %d '%ls' to background\n"), j->job_id(),
                               j->command_wcstr());
     parser.job_promote(j);
     j->mut_flags().foreground = false;
diff --git a/src/builtin_disown.cpp b/src/builtin_disown.cpp
index bdf2f4373..70a91baa0 100644
--- a/src/builtin_disown.cpp
+++ b/src/builtin_disown.cpp
@@ -28,7 +28,7 @@ static int disown_job(const wchar_t *cmd, parser_t &parser, io_streams_t &stream
         killpg(j->pgid, SIGCONT);
         const wchar_t *fmt =
             _(L"%ls: job %d ('%ls') was stopped and has been signalled to continue.\n");
-        streams.err.append_format(fmt, cmd, j->job_id, j->command_wcstr());
+        streams.err.append_format(fmt, cmd, j->job_id(), j->command_wcstr());
     }
 
     // We cannot directly remove the job from the jobs() list as `disown` might be called
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 231d435fd..628e76470 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -91,11 +91,11 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     }
 
     if (streams.err_is_redirected) {
-        streams.err.append_format(FG_MSG, job->job_id, job->command_wcstr());
+        streams.err.append_format(FG_MSG, job->job_id(), job->command_wcstr());
     } else {
         // If we aren't redirecting, send output to real stderr, since stuff in sb_err won't get
         // printed until the command finishes.
-        std::fwprintf(stderr, FG_MSG, job->job_id, job->command_wcstr());
+        std::fwprintf(stderr, FG_MSG, job->job_id(), job->command_wcstr());
     }
 
     const wcstring ft = tok_first(job->command());
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 3b2530ae7..fe82b7704 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -61,7 +61,7 @@ static void builtin_jobs_print(const job_t *j, int mode, int header, io_streams_
                 streams.out.append(_(L"State\tCommand\n"));
             }
 
-            streams.out.append_format(L"%d\t%d\t", j->job_id, j->pgid);
+            streams.out.append_format(L"%d\t%d\t", j->job_id(), j->pgid);
 
             if (have_proc_stat()) {
                 streams.out.append_format(L"%d%%\t", cpu_use(j));
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 678caf32e..3d21d04f8 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -20,12 +20,12 @@
 static job_id_t get_job_id_from_pid(pid_t pid, const parser_t &parser) {
     for (const auto &j : parser.jobs()) {
         if (j->pgid == pid) {
-            return j->job_id;
+            return j->job_id();
         }
         // Check if the specified pid is a child process of the job.
         for (const process_ptr_t &p : j->processes) {
             if (p->pid == pid) {
-                return j->job_id;
+                return j->job_id();
             }
         }
     }
@@ -146,9 +146,9 @@ static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids,
         if (j->command().empty()) continue;
 
         if (match_pid(j->command(), proc)) {
-            if (!contains(ids, j->job_id)) {
+            if (!contains(ids, j->job_id())) {
                 // If pids doesn't already have the pgid, add it.
-                ids.push_back(j->job_id);
+                ids.push_back(j->job_id());
             }
             found = true;
         }
@@ -158,9 +158,9 @@ static bool find_job_by_name(const wchar_t *proc, std::vector<job_id_t> &ids,
             if (p->actual_cmd.empty()) continue;
 
             if (match_pid(p->actual_cmd, proc)) {
-                if (!contains(ids, j->job_id)) {
+                if (!contains(ids, j->job_id())) {
                     // If pids doesn't already have the pgid, add it.
-                    ids.push_back(j->job_id);
+                    ids.push_back(j->job_id());
                 }
                 found = true;
             }
diff --git a/src/event.cpp b/src/event.cpp
index 3382fa2a9..f3bae6d13 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -157,7 +157,7 @@ wcstring event_get_desc(const event_t &evt) {
                 // In events, PGIDs are stored as negative PIDs
                 job_t *j = job_t::from_pid(-ed.param1.pid);
                 if (j) {
-                    return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id,
+                    return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id(),
                                          j->command_wcstr());
                 } else {
                     return format_string(_(L"exit handler for job with process group %d"),
@@ -170,7 +170,7 @@ wcstring event_get_desc(const event_t &evt) {
         case event_type_t::job_exit: {
             job_t *j = job_t::from_job_id(ed.param1.job_id);
             if (j) {
-                return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id,
+                return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id(),
                                      j->command_wcstr());
             } else {
                 return format_string(_(L"exit handler for job with job id %d"), ed.param1.job_id);
diff --git a/src/exec.cpp b/src/exec.cpp
index d486517fb..3ef1288ab 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -511,7 +511,7 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         p->completed = true;
         if (p->is_last_in_job) {
             FLOGF(exec_job_status, L"Set status of job %d (%ls) to %d using short circuit",
-                  j->job_id, j->preview().c_str(), p->status);
+                  j->job_id(), j->preview().c_str(), p->status);
             parser.set_last_statuses(j->get_statuses());
         }
         return true;
@@ -686,7 +686,7 @@ using proc_performer_t = std::function<proc_status_t(parser_t &parser)>;
 // exists. This is just a dumb artifact of the fact that we only capture the functions name, not its
 // properties, when creating the job; thus a race could delete the function before we fetch its
 // properties.
-static proc_performer_t get_performer_for_process(process_t *p, const job_t *job,
+static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
                                                   const io_chain_t &io_chain) {
     assert((p->type == process_type_t::function || p->type == process_type_t::block_node) &&
            "Unexpected process type");
@@ -714,6 +714,13 @@ static proc_performer_t get_performer_for_process(process_t *p, const job_t *job
         };
     } else {
         assert(p->type == process_type_t::function);
+        // If this function is the only process in the current job
+        // and that job is in the foreground then mark this job as internal
+        // so it doesn't increment the job id for any jobs created within this
+        // function.
+        if (p->is_first_in_job && p->is_last_in_job && job->flags().foreground) {
+            job->mark_internal();
+        }
         auto props = function_get_properties(p->argv0());
         if (!props) {
             FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
@@ -1099,7 +1106,7 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         }
     }
 
-    FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id,
+    FLOGF(exec_job_exec, L"Executed job %d from command '%ls' with pgrp %d", j->job_id(),
           j->command_wcstr(), j->pgid);
 
     j->mark_constructed();
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index d2e4b294c..b07dc3b01 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1287,14 +1287,14 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     // the job ID here.
     auto &libdata = parser->libdata();
     const auto saved_caller_jid = libdata.caller_job_id;
-    libdata.caller_job_id = job->job_id;
+    libdata.caller_job_id = job->job_id();
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
     eval_result_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
-    assert(libdata.caller_job_id == job->job_id && "Caller job ID unexpectedly changed");
+    assert(libdata.caller_job_id == job->job_id() && "Caller job ID unexpectedly changed");
     parser->libdata().caller_job_id = saved_caller_jid;
 
     // Store time it took to 'parse' the command.
diff --git a/src/parser.cpp b/src/parser.cpp
index e0ee0bb1b..24544e41b 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -576,7 +576,7 @@ void parser_t::job_promote(job_t *job) {
 
 job_t *parser_t::job_get(job_id_t id) {
     for (const auto &job : job_list) {
-        if (id <= 0 || job->job_id == id) return job.get();
+        if (id <= 0 || job->job_id() == id) return job.get();
     }
     return nullptr;
 }
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 9d939a83d..dcdb78a08 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -75,7 +75,7 @@ bool child_set_group(job_t *j, process_t *p) {
             char command[64];
 
             format_long_safe(pid_buff, p->pid);
-            format_long_safe(job_id_buff, j->job_id);
+            format_long_safe(job_id_buff, j->job_id());
             format_long_safe(getpgid_buff, getpgid(p->pid));
             format_long_safe(job_pgid_buff, j->pgid);
             narrow_string_safe(argv0, p->argv0());
diff --git a/src/proc.cpp b/src/proc.cpp
index 60d779afb..b3ceabf6c 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -271,10 +271,12 @@ void process_t::check_generations_before_launch() {
 
 job_t::job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage)
     : properties(props),
-      job_id(job_id),
+      job_id_(job_id),
       root_constructed(lineage.root_constructed ? lineage.root_constructed : this->constructed) {}
 
-job_t::~job_t() { release_job_id(job_id); }
+job_t::~job_t() {
+    if (job_id_ != -1) release_job_id(job_id_);
+}
 
 void job_t::mark_constructed() {
     assert(!is_constructed() && "Job was already constructed");
@@ -415,7 +417,7 @@ static void print_job_status(const job_t *j, job_status_t status) {
     if (status == JOB_STOPPED) msg = L"Job %d, '%ls' has stopped";
     outputter_t outp;
     outp.writestr("\r");
-    outp.writestr(format_string(_(msg), j->job_id, truncate_command(j->command()).c_str()));
+    outp.writestr(format_string(_(msg), j->job_id(), truncate_command(j->command()).c_str()));
     if (clr_eol) outp.term_puts(clr_eol, 1);
     outp.writestr(L"\n");
     fflush(stdout);
@@ -492,14 +494,14 @@ static bool try_clean_process_in_job(process_t *p, job_t *j, std::vector<event_t
             // We want to report the job number, unless it's the only job, in which case
             // we don't need to.
             const wcstring job_number_desc =
-                only_one_job ? wcstring() : format_string(_(L"Job %d, "), j->job_id);
+                only_one_job ? wcstring() : format_string(_(L"Job %d, "), j->job_id());
             std::fwprintf(stdout, _(L"%ls: %ls\'%ls\' terminated by signal %ls (%ls)"),
                           program_name, job_number_desc.c_str(),
                           truncate_command(j->command()).c_str(), sig2wcs(s.signal_code()),
                           signal_get_desc(s.signal_code()));
         } else {
             const wcstring job_number_desc =
-                only_one_job ? wcstring() : format_string(L"from job %d, ", j->job_id);
+                only_one_job ? wcstring() : format_string(L"from job %d, ", j->job_id());
             const wchar_t *fmt =
                 _(L"%ls: Process %d, \'%ls\' %ls\'%ls\' terminated by signal %ls (%ls)");
             std::fwprintf(stdout, fmt, program_name, p->pid, p->argv0(), job_number_desc.c_str(),
@@ -595,7 +597,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
                     proc_create_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0));
             }
             exit_events.push_back(
-                proc_create_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id, 0));
+                proc_create_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id(), 0));
         }
     }
 
@@ -757,8 +759,8 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 if (errno == ENOTTY) {
                     redirect_tty_output();
                 }
-                debug(1, _(L"Could not send job %d ('%ls') with pgid %d to foreground"), j->job_id,
-                      j->command_wcstr(), j->pgid);
+                debug(1, _(L"Could not send job %d ('%ls') with pgid %d to foreground"),
+                      j->job_id(), j->command_wcstr(), j->pgid);
                 wperror(L"tcsetpgrp");
                 return error;
             }
@@ -785,7 +787,7 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 redirect_tty_output();
             }
 
-            debug(1, _(L"Could not send job %d ('%ls') to foreground"), j->job_id,
+            debug(1, _(L"Could not send job %d ('%ls') to foreground"), j->job_id(),
                   j->preview().c_str());
             wperror(L"tcsetattr");
             return error;
@@ -852,7 +854,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
     mut_flags().notified = false;
 
     FLOGF(proc_job_run, L"%ls job %d, gid %d (%ls), %ls, %ls",
-          send_sigcont ? L"Continue" : L"Start", job_id, pgid, command_wcstr(),
+          send_sigcont ? L"Continue" : L"Start", job_id_, pgid, command_wcstr(),
           is_completed() ? L"COMPLETED" : L"UNCOMPLETED",
           parser.libdata().is_interactive ? L"INTERACTIVE" : L"NON-INTERACTIVE");
 
diff --git a/src/proc.h b/src/proc.h
index 63772b434..341dc028e 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -315,6 +315,9 @@ class job_t {
     /// messages about job status on the terminal.
     wcstring command_str;
 
+    /// The job_id for this job.
+    job_id_t job_id_;
+
     // No copying.
     job_t(const job_t &rhs) = delete;
     void operator=(const job_t &) = delete;
@@ -378,7 +381,15 @@ class job_t {
     pid_t pgid{INVALID_PID};
 
     /// The id of this job.
-    const job_id_t job_id;
+    job_id_t job_id() const { return job_id_; }
+
+    /// Mark this job as internal. Internal jobs' job_ids are removed from the
+    /// list of jobs so that, among other things, they don't take a job_id
+    /// entry.
+    void mark_internal() {
+        release_job_id(job_id_);
+        job_id_ = -1;
+    }
 
     /// The saved terminal modes of this job. This needs to be saved so that we can restore the
     /// terminal to the same state after temporarily taking control over the terminal when a job

From a6e5583b5bebd44cd27f373d32d2f602ae5efdc8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 12:41:11 -0800
Subject: [PATCH 1493/1732] Correct reordering of jobs in job_promote

job_promote attempts to bring the most recently "touched" job to the front
of the job list. It did this via:

    std::rotate(begin, job, end)

However this has the effect of pushing job-1 to the end. That is,
promoting '2' in [1, 2, 3] would result in [2, 3, 1].

Correct this by replacing it with:

    std::rotate(begin, job, job+1);

now we get the desired [2, 1, 3].

Also add a test.
---
 src/parser.cpp            |  2 +-
 tests/checks/job_ids.fish | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/checks/job_ids.fish

diff --git a/src/parser.cpp b/src/parser.cpp
index 24544e41b..5417c0a07 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -571,7 +571,7 @@ void parser_t::job_promote(job_t *job) {
     assert(loc != job_list.end());
 
     // Move the job to the beginning.
-    std::rotate(job_list.begin(), loc, job_list.end());
+    std::rotate(job_list.begin(), loc, std::next(loc));
 }
 
 job_t *parser_t::job_get(job_id_t id) {
diff --git a/tests/checks/job_ids.fish b/tests/checks/job_ids.fish
new file mode 100644
index 000000000..df4d8a16a
--- /dev/null
+++ b/tests/checks/job_ids.fish
@@ -0,0 +1,37 @@
+# RUN: %fish %s
+
+# Ensure that job IDs are sequential.
+
+status job-control full
+
+set -g tokill
+
+function func100
+    sleep 100 &
+    set -g tokill $tokill $last_pid
+end
+
+function func200
+    sleep 200 &
+    set -g tokill $tokill $last_pid
+end
+
+
+func100
+func200
+
+sleep 300 &
+set -g tokill $tokill $last_pid
+
+jobs
+
+#CHECK: Job	Group	CPU	State	Command
+#CHECK: 3{{.*\t}}sleep 300 &
+#CHECK: 2{{.*\t}}sleep 200 &
+#CHECK: 1{{.*\t}}sleep 100 &
+
+status job-control interactive
+
+for pid in $tokill
+    command kill -9 $pid
+end

From b691d3130e96c59a9c11568b3caec73359e2308c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 13:12:24 -0800
Subject: [PATCH 1494/1732] Don't give job IDs to block processes either

Extend the commit 8e17d29e04ee to block processes, for example:

    begin ; stuff ; end

or if/while blocks as well.

Note there's an existing optimization where we do not create a job for a
block if it has no redirections.
---
 src/exec.cpp              | 15 ++++++++-------
 tests/checks/job_ids.fish |  9 ++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 3ef1288ab..0b6e23593 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -714,13 +714,6 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
         };
     } else {
         assert(p->type == process_type_t::function);
-        // If this function is the only process in the current job
-        // and that job is in the foreground then mark this job as internal
-        // so it doesn't increment the job id for any jobs created within this
-        // function.
-        if (p->is_first_in_job && p->is_last_in_job && job->flags().foreground) {
-            job->mark_internal();
-        }
         auto props = function_get_properties(p->argv0());
         if (!props) {
             FLOGF(error, _(L"Unknown function '%ls'"), p->argv0());
@@ -771,6 +764,14 @@ static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<j
         io_chain.push_back(block_output_bufferfill);
     }
 
+    // If this function is the only process in the current job
+    // and that job is in the foreground then mark this job as internal
+    // so it doesn't increment the job id for any jobs created within this
+    // function.
+    if (p->is_first_in_job && p->is_last_in_job && j->flags().foreground) {
+        j->mark_internal();
+    }
+
     // Get the process performer, and just execute it directly.
     // Do it in this scoped way so that the performer function can be eagerly deallocating releasing
     // its captured io chain.
diff --git a/tests/checks/job_ids.fish b/tests/checks/job_ids.fish
index df4d8a16a..ccf761131 100644
--- a/tests/checks/job_ids.fish
+++ b/tests/checks/job_ids.fish
@@ -10,16 +10,15 @@ function func100
     sleep 100 &
     set -g tokill $tokill $last_pid
 end
+func100
 
-function func200
+# The redirection ensures this becomes a real job.
+begin
     sleep 200 &
     set -g tokill $tokill $last_pid
-end
+end </dev/null
 
 
-func100
-func200
-
 sleep 300 &
 set -g tokill $tokill $last_pid
 

From 9a11c03097f40e169ce5d7da716077e067429eca Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 13:17:26 -0800
Subject: [PATCH 1495/1732] Correct the job_ids test on the Mac

The Mac doesn't provide CPU percentages so the column is omitted, causing
the test to fail. Use a regex to cover both cases.
---
 tests/checks/job_ids.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/job_ids.fish b/tests/checks/job_ids.fish
index ccf761131..f0dd0bd81 100644
--- a/tests/checks/job_ids.fish
+++ b/tests/checks/job_ids.fish
@@ -24,7 +24,7 @@ set -g tokill $tokill $last_pid
 
 jobs
 
-#CHECK: Job	Group	CPU	State	Command
+#CHECK: Job	Group{{.*}}
 #CHECK: 3{{.*\t}}sleep 300 &
 #CHECK: 2{{.*\t}}sleep 200 &
 #CHECK: 1{{.*\t}}sleep 100 &

From 91404f17629e8e5e7360d92a6c555383669af31d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 13:32:04 -0800
Subject: [PATCH 1496/1732] Rename job_ids check to job-ids

Other tests use a dash.
---
 tests/checks/{job_ids.fish => job-ids.fish} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/checks/{job_ids.fish => job-ids.fish} (100%)

diff --git a/tests/checks/job_ids.fish b/tests/checks/job-ids.fish
similarity index 100%
rename from tests/checks/job_ids.fish
rename to tests/checks/job-ids.fish

From efa9d5dd6a1a4f90e5a6d9372cddf539634be27e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 31 Dec 2019 14:16:20 -0800
Subject: [PATCH 1497/1732] Port cd tests to littlecheck

---
 tests/cd.err         |  18 ------
 tests/cd.in          | 115 --------------------------------
 tests/cd.out         |  39 -----------
 tests/checks/cd.fish | 151 ++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 148 insertions(+), 175 deletions(-)
 delete mode 100644 tests/cd.err
 delete mode 100644 tests/cd.in
 delete mode 100644 tests/cd.out

diff --git a/tests/cd.err b/tests/cd.err
deleted file mode 100644
index ebc6ea138..000000000
--- a/tests/cd.err
+++ /dev/null
@@ -1,18 +0,0 @@
-
-####################
-# cd symlink non-resolution
-
-####################
-# cd symlink completion
-
-####################
-# Virtual PWD inheritance
-
-####################
-# CDPATH
-
-####################
-# on-variable PWD
-
-####################
-# cd concurrency
diff --git a/tests/cd.in b/tests/cd.in
deleted file mode 100644
index 1e84835fc..000000000
--- a/tests/cd.in
+++ /dev/null
@@ -1,115 +0,0 @@
-# Store pwd to later go back before cleaning up
-set -l oldpwd (pwd)
-# Create a test directory to store our stuff.
-set -l base /tmp/cdcomp_test
-rm -Rf $base
-mkdir -p $base
-logmsg cd symlink non-resolution
-set real (mktemp -d)
-set link $base/link
-ln -s $real $link
-cd $link
-prevd
-nextd
-test "$PWD" = "$link" || echo "\$PWD != \$link:"\n   "\$PWD: $PWD"\n   "\$link: $link"\n
-test (pwd) = "$link" || echo "(pwd) != \$link:"\n   "\$PWD: "(pwd)\n   "\$link: $link"\n
-test (pwd -P) = "$real" || echo "(pwd -P) != \$real:"\n   "\$PWD: $PWD"\n   "\$real: $real"\n
-test (pwd -P -L) = "$link" || echo "(pwd -P -L) != \$link:"\n   "\$PWD: $PWD"\n   "\$link: $link"\n
-
-logmsg cd symlink completion
-
-# Create a symlink and verify logical completion.
-# create directory $base/through/the/looking/glass
-# symlink $base/somewhere/teleport -> $base/through/the/looking/glass
-# verify that .. completions work
-cd $base
-mkdir -p $base/through/the/looking/glass
-
-mkdir -p $base/somewhere
-mkdir $base/somewhere/a1
-mkdir $base/somewhere/a2
-mkdir $base/somewhere/a3
-touch $base/through/the/looking/b(seq 1 3)
-mkdir $base/through/the/looking/d1
-mkdir $base/through/the/looking/d2
-mkdir $base/through/the/looking/d3
-ln -s $base/through/the/looking/glass $base/somewhere/rabbithole
-
-cd $base/somewhere/rabbithole
-echo "ls:"
-complete -C'ls ../'
-echo "cd:"
-complete -C'cd ../'
-
-logmsg Virtual PWD inheritance
-# PWD should be imported and respected by fish
-
-cd $oldpwd
-mkdir -p $base/realhome
-set fish_path $PWD/../test/root/bin/fish
-ln -s $base/realhome $base/linkhome
-cd $base/linkhome
-set -l real_getcwd (pwd -P)
-env HOME=$base/linkhome $fish_path -c 'echo PWD is $PWD'
-
-# Do not inherit a virtual PWD that fails to resolve to getcwd (#5647)
-
-env HOME=$base/linkhome PWD=/tmp $fish_path -c 'echo $PWD' | read output_pwd
-test (realpath $output_pwd) = $real_getcwd
-and echo "BogusPWD test 1 succeeded"
-or echo "BogusPWD test 1 failed: $output_pwd vs $real_getcwd"
-
-env HOME=$base/linkhome PWD=/path/to/nowhere $fish_path -c 'echo $PWD' | read output_pwd
-test (realpath $output_pwd) = $real_getcwd
-and echo "BogusPWD test 2 succeeded"
-or echo "BogusPWD test 2 failed: $output_pwd vs $real_getcwd"
-
-# $CDPATH
-logmsg CDPATH
-set -g CDPATH $base
-cd linkhome
-test $PWD = $base/linkhome; and echo Gone to linkhome via CDPATH
-set -g CDPATH /tmp
-cd $base
-test $PWD = $base; and echo Gone to base
-cd linkhome
-test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
-set -g CDPATH ./
-cd $base
-test $PWD = $base; and echo No crash with ./ CDPATH
-
-# test for directories beginning with a hyphen
-mkdir $base/-testdir
-cd $base
-cd -- -testdir
-test $PWD = $base/-testdir
-
-# cd back before removing the test directory again.
-cd $oldpwd
-rm -Rf $base
-
-logmsg on-variable PWD
-# Verify that PWD on-variable events are sent
-function __fish_test_changed_pwd --on-variable PWD
-   echo "Changed to $PWD"
-end
-cd /
-functions --erase __fish_test_changed_pwd
-
-logmsg cd concurrency
-# Verify that cds don't stomp on each other.
-function __fish_test_thrash_cd
-   set -l dir (mktemp -d)
-   cd $dir
-   for i in (seq 50)
-       test (/bin/pwd) = $dir
-       and test $PWD = $dir
-       or echo "cd test failed" 1>&2
-       sleep .002
-   end
-end
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd |
-__fish_test_thrash_cd
diff --git a/tests/cd.out b/tests/cd.out
deleted file mode 100644
index d6098ed9d..000000000
--- a/tests/cd.out
+++ /dev/null
@@ -1,39 +0,0 @@
-
-####################
-# cd symlink non-resolution
-
-####################
-# cd symlink completion
-ls:
-../b1
-../b2
-../b3
-../d1/
-../d2/
-../d3/
-../glass/
-cd:
-../a1/
-../a2/
-../a3/
-../rabbithole/
-
-####################
-# Virtual PWD inheritance
-PWD is /tmp/cdcomp_test/linkhome
-BogusPWD test 1 succeeded
-BogusPWD test 2 succeeded
-
-####################
-# CDPATH
-Gone to linkhome via CDPATH
-Gone to base
-Gone to linkhome via implicit . in CDPATH
-No crash with ./ CDPATH
-
-####################
-# on-variable PWD
-Changed to /
-
-####################
-# cd concurrency
diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 7be303541..3232e11f1 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -1,13 +1,158 @@
-# RUN: %fish %s
+# RUN: %fish -C 'set -g fish %fish' %s
+
+set -g fish (realpath $fish)
+
+# Store pwd to later go back before cleaning up
+set -l oldpwd (pwd)
+
 set -l tmp (mktemp -d)
 cd $tmp
 # resolve CDPATH (issue 6220)
 begin
     mkdir -p x
     # CHECK: /{{.*}}/x
-    cd x; pwd
+    cd x
+    pwd
 
     # CHECK: /{{.*}}/x
-    set -lx CDPATH ..; cd x; pwd
+    set -lx CDPATH ..
+    cd x
+    pwd
 end
 rm -rf $tmp
+cd $oldpwd
+
+# Create a test directory to store our stuff.
+set -l base /tmp/cdcomp_test
+rm -Rf $base
+mkdir -p $base
+set real (mktemp -d)
+set link $base/link
+ln -s $real $link
+cd $link
+prevd
+nextd
+test "$PWD" = "$link" || echo "\$PWD != \$link:"\n "\$PWD: $PWD"\n "\$link: $link"\n
+test (pwd) = "$link" || echo "(pwd) != \$link:"\n "\$PWD: "(pwd)\n "\$link: $link"\n
+test (pwd -P) = "$real" || echo "(pwd -P) != \$real:"\n "\$PWD: $PWD"\n "\$real: $real"\n
+test (pwd -P -L) = "$link" || echo "(pwd -P -L) != \$link:"\n "\$PWD: $PWD"\n "\$link: $link"\n
+# Expect no output on success.
+
+# Create a symlink and verify logical completion.
+# create directory $base/through/the/looking/glass
+# symlink $base/somewhere/teleport -> $base/through/the/looking/glass
+# verify that .. completions work
+cd $base
+mkdir -p $base/through/the/looking/glass
+
+mkdir -p $base/somewhere
+mkdir $base/somewhere/a1
+mkdir $base/somewhere/a2
+mkdir $base/somewhere/a3
+touch $base/through/the/looking/b(seq 1 3)
+mkdir $base/through/the/looking/d1
+mkdir $base/through/the/looking/d2
+mkdir $base/through/the/looking/d3
+ln -s $base/through/the/looking/glass $base/somewhere/rabbithole
+
+cd $base/somewhere/rabbithole
+echo "ls:"
+complete -C'ls ../'
+#CHECK: ls:
+#CHECK: ../b1
+#CHECK: ../b2
+#CHECK: ../b3
+#CHECK: ../d1/
+#CHECK: ../d2/
+#CHECK: ../d3/
+#CHECK: ../glass/
+
+echo "cd:"
+complete -C'cd ../'
+#CHECK: cd:
+#CHECK: ../a1/
+#CHECK: ../a2/
+#CHECK: ../a3/
+#CHECK: ../rabbithole/
+
+
+# PWD should be imported and respected by fish
+cd $oldpwd
+mkdir -p $base/realhome
+ln -s $base/realhome $base/linkhome
+cd $base/linkhome
+set -l real_getcwd (pwd -P)
+env HOME=$base/linkhome $fish -c 'echo PWD is $PWD'
+#CHECK: PWD is /tmp/cdcomp_test/linkhome
+
+
+# Do not inherit a virtual PWD that fails to resolve to getcwd (#5647)
+env HOME=$base/linkhome PWD=/tmp $fish -c 'echo $PWD' | read output_pwd
+test (realpath $output_pwd) = $real_getcwd
+and echo "BogusPWD test 1 succeeded"
+or echo "BogusPWD test 1 failed: $output_pwd vs $real_getcwd"
+#CHECK: BogusPWD test 1 succeeded
+
+env HOME=$base/linkhome PWD=/path/to/nowhere $fish -c 'echo $PWD' | read output_pwd
+test (realpath $output_pwd) = $real_getcwd
+and echo "BogusPWD test 2 succeeded"
+or echo "BogusPWD test 2 failed: $output_pwd vs $real_getcwd"
+#CHECK: BogusPWD test 2 succeeded
+
+# $CDPATH
+set -g CDPATH $base
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via CDPATH
+#CHECK: Gone to linkhome via CDPATH
+
+set -g CDPATH /tmp
+cd $base
+test $PWD = $base; and echo Gone to base
+#CHECK: Gone to base
+
+cd linkhome
+test $PWD = $base/linkhome; and echo Gone to linkhome via implicit . in CDPATH
+#CHECK: Gone to linkhome via implicit . in CDPATH
+
+set -g CDPATH ./
+cd $base
+test $PWD = $base; and echo No crash with ./ CDPATH
+#CHECK: No crash with ./ CDPATH
+
+# test for directories beginning with a hyphen
+mkdir $base/-testdir
+cd $base
+cd -- -testdir
+test $PWD = $base/-testdir
+echo $status
+#CHECK: 0
+
+
+# cd back before removing the test directory again.
+cd $oldpwd
+rm -Rf $base
+
+# Verify that PWD on-variable events are sent
+function __fish_test_changed_pwd --on-variable PWD
+    echo "Changed to $PWD"
+end
+cd /
+functions --erase __fish_test_changed_pwd
+#CHECK: Changed to /
+
+# Verify that cds don't stomp on each other.
+function __fish_test_thrash_cd
+    set -l dir (mktemp -d)
+    cd $dir
+    for i in (seq 50)
+        test (/bin/pwd) = $dir
+        and test $PWD = $dir
+        or echo "cd test failed" 1>&2
+        sleep .002
+    end
+end
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd |
+__fish_test_thrash_cd

From 5aa22adccc921fb0a761fe29514194805a99520b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 Jan 2020 12:34:42 -0800
Subject: [PATCH 1498/1732] Make history_filename return a maybe_t<wcstring>

This function can fail, so rather than forcing clients to check the return
value as empty, allow it to return none().
---
 src/history.cpp | 75 +++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index 4b6f165d6..bae5bc685 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -106,6 +106,21 @@ class time_profiler_t {
     }
 };
 
+/// \return the path for the history file for the given \p session_id, or none() if it could not be
+/// loaded. If suffix is provided, append that suffix to the path; this is used for temporary files.
+static maybe_t<wcstring> history_filename(const wcstring &session_id, const wcstring &suffix = {}) {
+    if (session_id.empty()) return none();
+
+    wcstring result;
+    if (!path_get_data(result)) return none();
+
+    result.append(L"/");
+    result.append(session_id);
+    result.append(L"_history");
+    result.append(suffix);
+    return result;
+}
+
 /// Lock the history file.
 /// Returns true on success, false on failure.
 static bool history_file_lock(int fd, int lock_type) {
@@ -153,8 +168,6 @@ class history_lru_cache_t : public lru_cache_t<history_lru_cache_t, history_item
     }
 };
 
-static wcstring history_filename(const wcstring &session_id, const wcstring &suffix);
-
 /// We can merge two items if they are the same command. We use the more recent timestamp, more
 /// recent identifier, and the longer list of required paths.
 bool history_item_t::merge(const history_item_t &item) {
@@ -554,9 +567,8 @@ void history_impl_t::load_old_if_needed() {
     loaded_old = true;
 
     time_profiler_t profiler("load_old");  //!OCLINT(side-effect)
-    wcstring filename = history_filename(name, L"");
-    if (!filename.empty()) {
-        int fd = wopen_cloexec(filename, O_RDONLY);
+    if (maybe_t<wcstring> filename = history_filename(name)) {
+        int fd = wopen_cloexec(*filename, O_RDONLY);
         if (fd >= 0) {
             // Take a read lock to guard against someone else appending. This is released when the
             // file is closed (below). We will read the file after releasing the lock, but that's
@@ -624,19 +636,6 @@ const history_item_t &history_search_t::current_item() const {
 
 const wcstring &history_search_t::current_string() const { return this->current_item().str(); }
 
-static wcstring history_filename(const wcstring &session_id, const wcstring &suffix) {
-    if (session_id.empty()) return L"";
-
-    wcstring result;
-    if (!path_get_data(result)) return L"";
-
-    result.append(L"/");
-    result.append(session_id);
-    result.append(L"_history");
-    result.append(suffix);
-    return result;
-}
-
 void history_impl_t::clear_file_state() {
     // Erase everything we know about our file.
     file_contents.reset();
@@ -748,16 +747,16 @@ bool history_impl_t::save_internal_via_rewrite() {
     // We want to rewrite the file, while holding the lock for as briefly as possible
     // To do this, we speculatively write a file, and then lock and see if our original file changed
     // Repeat until we succeed or give up
-    const wcstring target_name = history_filename(name, wcstring());
-    const wcstring tmp_name_template = history_filename(name, L".XXXXXX");
-    if (target_name.empty() || tmp_name_template.empty()) {
+    const maybe_t<wcstring> target_name = history_filename(name);
+    const maybe_t<wcstring> tmp_name_template = history_filename(name, L".XXXXXX");
+    if (!target_name.has_value() || !tmp_name_template.has_value()) {
         return false;
     }
 
     // Make our temporary file
     // Remember that we have to close this fd!
     wcstring tmp_name;
-    int tmp_fd = create_temporary_file(tmp_name_template, &tmp_name);
+    int tmp_fd = create_temporary_file(*tmp_name_template, &tmp_name);
     if (tmp_fd < 0) {
         return false;
     }
@@ -765,7 +764,7 @@ bool history_impl_t::save_internal_via_rewrite() {
     bool done = false;
     for (int i = 0; i < max_save_tries && !done; i++) {
         // Open any target file, but do not lock it right away
-        int target_fd_before = wopen_cloexec(target_name, O_RDONLY | O_CREAT, history_file_mode);
+        int target_fd_before = wopen_cloexec(*target_name, O_RDONLY | O_CREAT, history_file_mode);
         file_id_t orig_file_id = file_id_for_fd(target_fd_before);  // possibly invalid
         bool wrote = this->rewrite_to_temporary_file(target_fd_before, tmp_fd);
         if (target_fd_before >= 0) {
@@ -780,14 +779,14 @@ bool history_impl_t::save_internal_via_rewrite() {
         // were rewriting it. Make an effort to take the lock before checking, to avoid racing.
         // If the open fails, then proceed; this may be because there is no current history
         file_id_t new_file_id = kInvalidFileID;
-        int target_fd_after = wopen_cloexec(target_name, O_RDONLY);
+        int target_fd_after = wopen_cloexec(*target_name, O_RDONLY);
         if (target_fd_after >= 0) {
             // critical to take the lock before checking file IDs,
             // and hold it until after we are done replacing
             // Also critical to check the file at the path, NOT based on our fd
             // It's only OK to replace the file while holding the lock
             history_file_lock(target_fd_after, LOCK_EX);
-            new_file_id = file_id_for_path(target_name);
+            new_file_id = file_id_for_path(*target_name);
         }
         bool can_replace_file = (new_file_id == orig_file_id || new_file_id == kInvalidFileID);
         if (!can_replace_file) {
@@ -816,7 +815,7 @@ bool history_impl_t::save_internal_via_rewrite() {
             }
 
             // Slide it into place
-            if (wrename(tmp_name, target_name) == -1) {
+            if (wrename(tmp_name, *target_name) == -1) {
                 debug(2, L"Error %d when renaming history file", errno);
             }
 
@@ -862,10 +861,11 @@ bool history_impl_t::save_internal_via_appending() {
     bool file_changed = false;
 
     // Get the path to the real history file.
-    wcstring history_path = history_filename(name, wcstring());
-    if (history_path.empty()) {
+    maybe_t<wcstring> maybe_history_path = history_filename(name);
+    if (!maybe_history_path) {
         return true;
     }
+    wcstring history_path = maybe_history_path.acquire();
 
     // We are going to open the file, lock it, append to it, and then close it
     // After locking it, we need to stat the file at the path; if there is a new file there, it
@@ -964,7 +964,7 @@ void history_impl_t::save(bool vacuum) {
     // Nothing to do if there's no new items.
     if (first_unwritten_new_item_index >= new_items.size() && deleted_items.empty()) return;
 
-    if (history_filename(name, L"").empty()) {
+    if (!history_filename(name).has_value()) {
         // We're in the "incognito" mode. Pretend we've saved the history.
         this->first_unwritten_new_item_index = new_items.size();
         this->deleted_items.clear();
@@ -1030,8 +1030,9 @@ void history_impl_t::clear() {
     deleted_items.clear();
     first_unwritten_new_item_index = 0;
     old_item_offsets.clear();
-    wcstring filename = history_filename(name, L"");
-    if (!filename.empty()) wunlink(filename);
+    if (maybe_t<wcstring> filename = history_filename(name)) {
+        wunlink(*filename);
+    }
     this->clear_file_state();
 }
 
@@ -1048,13 +1049,13 @@ bool history_impl_t::is_empty() {
     } else {
         // If we have not loaded old items, don't actually load them (which may be expensive); just
         // stat the file and see if it exists and is nonempty.
-        const wcstring where = history_filename(name, L"");
-        if (where.empty()) {
+        const maybe_t<wcstring> where = history_filename(name);
+        if (!where.has_value()) {
             return true;
         }
 
         struct stat buf = {};
-        if (wstat(where, &buf) != 0) {
+        if (wstat(*where, &buf) != 0) {
             // Access failed, assume missing.
             empty = true;
         } else {
@@ -1069,8 +1070,8 @@ bool history_impl_t::is_empty() {
 /// clearing ourselves, and copying the contents of the old history file to the new history file.
 /// The new contents will automatically be re-mapped later.
 void history_impl_t::populate_from_config_path() {
-    wcstring new_file = history_filename(name, wcstring());
-    if (new_file.empty()) {
+    maybe_t<wcstring> new_file = history_filename(name);
+    if (!new_file.has_value()) {
         return;
     }
 
@@ -1085,7 +1086,7 @@ void history_impl_t::populate_from_config_path() {
             // destination file descriptor, since it destroys the name and the file.
             this->clear();
 
-            int dst_fd = wopen_cloexec(new_file, O_WRONLY | O_CREAT, history_file_mode);
+            int dst_fd = wopen_cloexec(*new_file, O_WRONLY | O_CREAT, history_file_mode);
             char buf[BUFSIZ];
             ssize_t size;
             while ((size = read(src_fd, buf, BUFSIZ)) > 0) {

From 65e9f31c7a0881ae95adcd707850d22e9f563b06 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 Jan 2020 13:49:10 -0800
Subject: [PATCH 1499/1732] Use autoclose_fd_t more pervasively in history

---
 src/history.cpp | 98 +++++++++++++++++++++----------------------------
 1 file changed, 41 insertions(+), 57 deletions(-)

diff --git a/src/history.cpp b/src/history.cpp
index bae5bc685..fbf6806b9 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -568,7 +568,8 @@ void history_impl_t::load_old_if_needed() {
 
     time_profiler_t profiler("load_old");  //!OCLINT(side-effect)
     if (maybe_t<wcstring> filename = history_filename(name)) {
-        int fd = wopen_cloexec(*filename, O_RDONLY);
+        autoclose_fd_t file{wopen_cloexec(*filename, O_RDONLY)};
+        int fd = file.fd();
         if (fd >= 0) {
             // Take a read lock to guard against someone else appending. This is released when the
             // file is closed (below). We will read the file after releasing the lock, but that's
@@ -584,7 +585,6 @@ void history_impl_t::load_old_if_needed() {
             file_contents = history_file_contents_t::create(fd);
             this->history_file_id = file_contents ? file_id_for_fd(fd) : kInvalidFileID;
             if (!history_t::chaos_mode) history_file_lock(fd, LOCK_UN);
-            close(fd);
 
             time_profiler_t profiler("populate_from_file_contents");  //!OCLINT(side-effect)
             this->populate_from_file_contents();
@@ -723,20 +723,17 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
     return err == 0;
 }
 
-// Returns the fd of an opened temporary file, or -1 on failure
-static int create_temporary_file(const wcstring &name_template, wcstring *out_path) {
-    int out_fd = -1;
-    char *narrow_str = nullptr;
-    for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) {
-        narrow_str = wcs2str(name_template);
-        out_fd = fish_mkstemp_cloexec(narrow_str);
+// Returns the fd of an opened temporary file, or an invalid fd on failure.
+static autoclose_fd_t create_temporary_file(const wcstring &name_template, wcstring *out_path) {
+    for (int attempt = 0; attempt < 10; attempt++) {
+        std::string narrow_str = wcs2string(name_template);
+        autoclose_fd_t out_fd{fish_mkstemp_cloexec(&narrow_str[0])};
+        if (out_fd.valid()) {
+            *out_path = str2wcstring(narrow_str);
+            return out_fd;
+        }
     }
-
-    if (out_fd >= 0) {
-        *out_path = str2wcstring(narrow_str);
-    }
-    free(narrow_str);
-    return out_fd;
+    return autoclose_fd_t{};
 }
 
 bool history_impl_t::save_internal_via_rewrite() {
@@ -756,20 +753,19 @@ bool history_impl_t::save_internal_via_rewrite() {
     // Make our temporary file
     // Remember that we have to close this fd!
     wcstring tmp_name;
-    int tmp_fd = create_temporary_file(*tmp_name_template, &tmp_name);
-    if (tmp_fd < 0) {
+    autoclose_fd_t tmp_file = create_temporary_file(*tmp_name_template, &tmp_name);
+    if (!tmp_file.valid()) {
         return false;
     }
-
+    const int tmp_fd = tmp_file.fd();
     bool done = false;
     for (int i = 0; i < max_save_tries && !done; i++) {
         // Open any target file, but do not lock it right away
-        int target_fd_before = wopen_cloexec(*target_name, O_RDONLY | O_CREAT, history_file_mode);
-        file_id_t orig_file_id = file_id_for_fd(target_fd_before);  // possibly invalid
-        bool wrote = this->rewrite_to_temporary_file(target_fd_before, tmp_fd);
-        if (target_fd_before >= 0) {
-            close(target_fd_before);
-        }
+        autoclose_fd_t target_fd_before{
+            wopen_cloexec(*target_name, O_RDONLY | O_CREAT, history_file_mode)};
+        file_id_t orig_file_id = file_id_for_fd(target_fd_before.fd());  // possibly invalid
+        bool wrote = this->rewrite_to_temporary_file(target_fd_before.fd(), tmp_fd);
+        target_fd_before.close();
         if (!wrote) {
             // Failed to write, no good
             break;
@@ -779,13 +775,13 @@ bool history_impl_t::save_internal_via_rewrite() {
         // were rewriting it. Make an effort to take the lock before checking, to avoid racing.
         // If the open fails, then proceed; this may be because there is no current history
         file_id_t new_file_id = kInvalidFileID;
-        int target_fd_after = wopen_cloexec(*target_name, O_RDONLY);
-        if (target_fd_after >= 0) {
+        autoclose_fd_t target_fd_after{wopen_cloexec(*target_name, O_RDONLY)};
+        if (target_fd_after.valid()) {
             // critical to take the lock before checking file IDs,
             // and hold it until after we are done replacing
             // Also critical to check the file at the path, NOT based on our fd
             // It's only OK to replace the file while holding the lock
-            history_file_lock(target_fd_after, LOCK_EX);
+            history_file_lock(target_fd_after.fd(), LOCK_EX);
             new_file_id = file_id_for_path(*target_name);
         }
         bool can_replace_file = (new_file_id == orig_file_id || new_file_id == kInvalidFileID);
@@ -805,7 +801,7 @@ bool history_impl_t::save_internal_via_rewrite() {
             // did, it would be tricky to set the permissions correctly. (bash doesn't get this
             // case right either).
             struct stat sbuf;
-            if (target_fd_after >= 0 && fstat(target_fd_after, &sbuf) >= 0) {
+            if (target_fd_after.valid() && fstat(target_fd_after.fd(), &sbuf) >= 0) {
                 if (fchown(tmp_fd, sbuf.st_uid, sbuf.st_gid) == -1) {
                     debug(2, L"Error %d when changing ownership of history file", errno);
                 }
@@ -822,15 +818,10 @@ bool history_impl_t::save_internal_via_rewrite() {
             // We did it
             done = true;
         }
-
-        if (target_fd_after >= 0) {
-            close(target_fd_after);
-        }
     }
 
     // Ensure we never leave the old file around
     wunlink(tmp_name);
-    close(tmp_fd);
 
     if (done) {
         // We've saved everything, so we have no more unsaved items.
@@ -871,10 +862,10 @@ bool history_impl_t::save_internal_via_appending() {
     // After locking it, we need to stat the file at the path; if there is a new file there, it
     // means the file was replaced and we have to try again.
     // Limit our max tries so we don't do this forever.
-    int history_fd = -1;
+    autoclose_fd_t history_fd{};
     for (int i = 0; i < max_save_tries; i++) {
-        int fd = wopen_cloexec(history_path, O_WRONLY | O_APPEND);
-        if (fd < 0) {
+        autoclose_fd_t fd{wopen_cloexec(history_path, O_WRONLY | O_APPEND)};
+        if (!fd.valid()) {
             // can't open, we're hosed
             break;
         }
@@ -885,23 +876,20 @@ bool history_impl_t::save_internal_via_appending() {
         // by writing with O_APPEND.
         //
         // Simulate a failing lock in chaos_mode
-        if (!history_t::chaos_mode) history_file_lock(fd, LOCK_EX);
-        const file_id_t file_id = file_id_for_fd(fd);
-        if (file_id_for_path(history_path) != file_id) {
-            // The file has changed, we're going to retry
-            close(fd);
-        } else {
+        if (!history_t::chaos_mode) history_file_lock(fd.fd(), LOCK_EX);
+        const file_id_t file_id = file_id_for_fd(fd.fd());
+        if (file_id_for_path(history_path) == file_id) {
             // File IDs match, so the file we opened is still at that path
             // We're going to use this fd
             if (file_id != this->history_file_id) {
                 file_changed = true;
             }
-            history_fd = fd;
+            history_fd = std::move(fd);
             break;
         }
     }
 
-    if (history_fd >= 0) {
+    if (history_fd.valid()) {
         // We (hopefully successfully) took the exclusive lock. Append to the file.
         // Note that this is sketchy for a few reasons:
         //   - Another shell may have appended its own items with a later timestamp, so our file may
@@ -929,14 +917,14 @@ bool history_impl_t::save_internal_via_appending() {
         while (first_unwritten_new_item_index < new_items.size()) {
             const history_item_t &item = new_items.at(first_unwritten_new_item_index);
             append_history_item_to_buffer(item, &buffer);
-            err = flush_to_fd(&buffer, history_fd, HISTORY_OUTPUT_BUFFER_SIZE);
+            err = flush_to_fd(&buffer, history_fd.fd(), HISTORY_OUTPUT_BUFFER_SIZE);
             if (err) break;
             // We wrote this item, hooray.
             first_unwritten_new_item_index++;
         }
 
         if (!err) {
-            err = flush_to_fd(&buffer, history_fd, 0);
+            err = flush_to_fd(&buffer, history_fd.fd(), 0);
         }
 
         // Since we just modified the file, update our mmap_file_id to match its current state
@@ -944,12 +932,11 @@ bool history_impl_t::save_internal_via_appending() {
         // write.
         // We don't update the mapping since we only appended to the file, and everything we
         // appended remains in our new_items
-        this->history_file_id = file_id_for_fd(history_fd);
-
-        close(history_fd);
+        this->history_file_id = file_id_for_fd(history_fd.fd());
 
         ok = (err == 0);
     }
+    history_fd.close();
 
     // If someone has replaced the file, forget our file state.
     if (file_changed) {
@@ -1080,26 +1067,23 @@ void history_impl_t::populate_from_config_path() {
         old_file.append(L"/");
         old_file.append(name);
         old_file.append(L"_history");
-        int src_fd = wopen_cloexec(old_file, O_RDONLY, 0);
-        if (src_fd != -1) {
+        autoclose_fd_t src_fd{wopen_cloexec(old_file, O_RDONLY, 0)};
+        if (src_fd.valid()) {
             // Clear must come after we've retrieved the new_file name, and before we open
             // destination file descriptor, since it destroys the name and the file.
             this->clear();
 
-            int dst_fd = wopen_cloexec(*new_file, O_WRONLY | O_CREAT, history_file_mode);
+            autoclose_fd_t dst_fd{wopen_cloexec(*new_file, O_WRONLY | O_CREAT, history_file_mode)};
             char buf[BUFSIZ];
             ssize_t size;
-            while ((size = read(src_fd, buf, BUFSIZ)) > 0) {
-                ssize_t written = write(dst_fd, buf, static_cast<size_t>(size));
+            while ((size = read(src_fd.fd(), buf, BUFSIZ)) > 0) {
+                ssize_t written = write(dst_fd.fd(), buf, static_cast<size_t>(size));
                 if (written < 0) {
                     // This message does not have high enough priority to be shown by default.
                     debug(2, L"Error when writing history file");
                     break;
                 }
             }
-
-            close(src_fd);
-            close(dst_fd);
         }
     }
 }

From cca57a7a87fd1071cfb09f7f31950b86e052ac5b Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 Jan 2020 15:32:40 -0800
Subject: [PATCH 1500/1732] fish_tests to set HOME and other variables to
 temporary dir

Rather than placing files in the user's home directory, have fish_tests
manipulate HOME to be a temporary directory.
---
 src/fish_tests.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 19776b426..988b5bb81 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5416,9 +5416,55 @@ static void test_topic_monitor_torture() {
     for (auto &t : threads) t.join();
 }
 
+// Set up some HOME directory variables.
+// \return the HOME path.
+static wcstring setup_tests_home() {
+    char home_template[] = "/tmp/fish_tests_home.XXXXXX";
+    if (!mkdtemp(home_template)) {
+        wperror(L"mkdtemp");
+        exit(EXIT_FAILURE);
+    }
+    std::string home_path = home_template;
+
+    if (setenv("HOME", home_path.c_str(), 1 /* overwrite */)) {
+        wperror(L"setenv");
+        exit(EXIT_FAILURE);
+    }
+
+    struct {
+        const char *name;
+        const char *dir;
+    } vars[] = {
+        {"XDG_DATA_HOME", "data"},
+        {"XDG_CONFIG_HOME", "config"},
+        {"XDG_RUNTIME_DIR", "runtime"},
+        {"XDG_CACHE_HOME", "cache"},
+    };
+    for (const auto &var : vars) {
+        // Only set the var if it's already set.
+        // This prevents setting unnatural vars on e.g. Mac.
+        if (!getenv(var.name)) continue;
+
+        std::string path = home_path + "/" + var.dir;
+        if (mkdir(path.c_str(), 0755)) {
+            wperror(L"mkdir");
+            exit(EXIT_FAILURE);
+        }
+        if (setenv(var.name, path.c_str(), 1 /* overwrite */)) {
+            wperror(L"setenv");
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    return str2wcstring(home_path);
+}
+
 /// Main test.
 int main(int argc, char **argv) {
     UNUSED(argc);
+
+    wcstring home = setup_tests_home();
+
     // Look for the file tests/test.fish. We expect to run in a directory containing that file.
     // If we don't find it, walk up the directory hierarchy until we do, or error.
     while (access("./tests/test.fish", F_OK) != 0) {
@@ -5448,7 +5494,7 @@ int main(int argc, char **argv) {
     struct utsname uname_info;
     uname(&uname_info);
 
-    say(L"Testing low-level functionality");
+    say(L"Testing low-level functionality. HOME=%ls", home.c_str());
     set_main_thread();
     setup_fork_guards();
     proc_init();
@@ -5546,7 +5592,11 @@ int main(int argc, char **argv) {
     say(L"Encountered %d errors in low-level tests", err_count);
     if (s_test_run_count == 0) say(L"*** No Tests Were Actually Run! ***");
 
-    if (err_count != 0) {
-        return 1;
+    if (err_count == 0) {
+        say(L"All tests passed, deleting temporary home %ls", home.c_str());
+        char command[512];
+        snprintf(command, sizeof command, "rm -Rf %ls", home.c_str());
+        system(command);
     }
+    return err_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }

From 89880891d071e067c548c6b748f4e7dbe20254ba Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 1 Jan 2020 17:24:14 -0800
Subject: [PATCH 1501/1732] Revert "fish_tests to set HOME and other variables
 to temporary dir"

This reverts commit cca57a7a87fd1071cfb09f7f31950b86e052ac5b.

The tests target already sets some variables - backing this out.
---
 src/fish_tests.cpp | 56 +++-------------------------------------------
 1 file changed, 3 insertions(+), 53 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 988b5bb81..19776b426 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -5416,55 +5416,9 @@ static void test_topic_monitor_torture() {
     for (auto &t : threads) t.join();
 }
 
-// Set up some HOME directory variables.
-// \return the HOME path.
-static wcstring setup_tests_home() {
-    char home_template[] = "/tmp/fish_tests_home.XXXXXX";
-    if (!mkdtemp(home_template)) {
-        wperror(L"mkdtemp");
-        exit(EXIT_FAILURE);
-    }
-    std::string home_path = home_template;
-
-    if (setenv("HOME", home_path.c_str(), 1 /* overwrite */)) {
-        wperror(L"setenv");
-        exit(EXIT_FAILURE);
-    }
-
-    struct {
-        const char *name;
-        const char *dir;
-    } vars[] = {
-        {"XDG_DATA_HOME", "data"},
-        {"XDG_CONFIG_HOME", "config"},
-        {"XDG_RUNTIME_DIR", "runtime"},
-        {"XDG_CACHE_HOME", "cache"},
-    };
-    for (const auto &var : vars) {
-        // Only set the var if it's already set.
-        // This prevents setting unnatural vars on e.g. Mac.
-        if (!getenv(var.name)) continue;
-
-        std::string path = home_path + "/" + var.dir;
-        if (mkdir(path.c_str(), 0755)) {
-            wperror(L"mkdir");
-            exit(EXIT_FAILURE);
-        }
-        if (setenv(var.name, path.c_str(), 1 /* overwrite */)) {
-            wperror(L"setenv");
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    return str2wcstring(home_path);
-}
-
 /// Main test.
 int main(int argc, char **argv) {
     UNUSED(argc);
-
-    wcstring home = setup_tests_home();
-
     // Look for the file tests/test.fish. We expect to run in a directory containing that file.
     // If we don't find it, walk up the directory hierarchy until we do, or error.
     while (access("./tests/test.fish", F_OK) != 0) {
@@ -5494,7 +5448,7 @@ int main(int argc, char **argv) {
     struct utsname uname_info;
     uname(&uname_info);
 
-    say(L"Testing low-level functionality. HOME=%ls", home.c_str());
+    say(L"Testing low-level functionality");
     set_main_thread();
     setup_fork_guards();
     proc_init();
@@ -5592,11 +5546,7 @@ int main(int argc, char **argv) {
     say(L"Encountered %d errors in low-level tests", err_count);
     if (s_test_run_count == 0) say(L"*** No Tests Were Actually Run! ***");
 
-    if (err_count == 0) {
-        say(L"All tests passed, deleting temporary home %ls", home.c_str());
-        char command[512];
-        snprintf(command, sizeof command, "rm -Rf %ls", home.c_str());
-        system(command);
+    if (err_count != 0) {
+        return 1;
     }
-    return err_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }

From 5df84c1998a59bc9f8a678ee54b6757e5400f566 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 2 Jan 2020 22:05:45 +0800
Subject: [PATCH 1502/1732] cmake: use correct variable for C++ compiler flags

Broken in 8ca936aea644c91b5ed913fb5eb036627748bd1f
---
 cmake/ConfigureChecks.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 5f09ee1b5..be696da71 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -183,7 +183,7 @@ CMAKE_POP_CHECK_STATE()
 # standards flag.
 # Also see https://github.com/fish-shell/fish-shell/issues/5865
 IF(NOT POLICY CMP0067)
-  LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_EXTENSION}_STANDARD_COMPILE_OPTION}")
+  LIST(APPEND CMAKE_REQUIRED_FLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION}")
 ENDIF()
 
 CHECK_CXX_SOURCE_COMPILES("

From 4ccd33a9d07964525f788eafca5da9dcb2fc447b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 2 Jan 2020 22:37:35 +0800
Subject: [PATCH 1503/1732] debian packaging: slight bump in Debian standards
 version

No changes required between 3.9.4 and 3.9.7 for fish packages.

[ci skip]
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 941edc38b..7c809d417 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9.0.0), libncurses5-dev, cmake3 (>= 3.2.0) | cmake
 # Test dependencies
  locales-all
 # When libpcre2-dev is available on all supported Debian versions, add a dependency on that.
-Standards-Version: 3.9.4
+Standards-Version: 3.9.7
 Homepage: https://fishshell.com/
 Vcs-Git: https://github.com/fish-shell/fish-shell.git
 Vcs-Browser: https://github.com/fish-shell/fish-shell

From c1140bc43695e9dd8ab041fbde7e4ad1c1c13c23 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Thu, 2 Jan 2020 22:42:17 -0800
Subject: [PATCH 1504/1732] Improve `kill` completions

Use string split instead of cut - which we'd fork for 2*signal
count times in a loop when tab was first pressed. Noticably faster

If giving a signal num, what works everywhere is -NUM, if giving
a signal name, what works everywhere is -s NAME - don't show -sNUM
or -NAME completions; that only works on GNU and it's redundant
anyhow as we show the signal number in the description field for -s
or the signal name for the -NUM case in the pager.

Sort -sNAME completions by the signal number not alphabetical

Shorten descriptions
---
 share/completions/kill.fish | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/share/completions/kill.fish b/share/completions/kill.fish
index c38a6926f..40361a75f 100644
--- a/share/completions/kill.fish
+++ b/share/completions/kill.fish
@@ -1,24 +1,23 @@
 __fish_make_completion_signals
 
-for i in $__kill_signals
-    set number (echo $i | cut -d " " -f 1)
-    set name (echo $i | cut -d " " -f 2)
+for sig in $__kill_signals[-1..1]
+    set number (string split ' ' $sig)[1]
+    set name (string split ' ' $sig)[2]
     complete -c kill -o $number -d $name
-    complete -c kill -o $name
-    complete -c kill -s s -x -a "$number $name"
+    complete -c kill -k -s s -x -a "$name\t$number"
 end
 
 complete -c kill -xa '(__fish_complete_pids)'
 
 if kill -L >/dev/null 2>/dev/null
     complete -c kill -s s -l signal -d "Signal to send"
-    complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
-    complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
-    complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
-    complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
-    complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2).  The value argument is an integer that is sent along with the signal."
-    complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
-else # OS X
+    complete -c kill -s l -l list -d "List signal names"
+    complete -c kill -s L -l table -d "List signal names and their #s"
+    complete -c kill -s a -l all -d "Resolve PIDs from other users' too"
+    complete -c kill -s p -l pid -d "Show resolved PID, don't send signal"
+    complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2)"
+    complete -c kill -l verbose -d "Print PIDs and signals sent"
+else # non-GNU
     complete -c kill -s s -d "Signal to send"
-    complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
-end
\ No newline at end of file
+    complete -c kill -s l -d "List signal names"
+end

From 3de95038b0a848e07dd10377c87e8e3ad5026408 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 21 Dec 2019 11:45:07 +0100
Subject: [PATCH 1505/1732] Make "time" a job prefix

In particular, this allows `true && time true`, or `true; and time true`,
and both `time not true` as well as `not time true` (like bash).

time is valid only as job _prefix_, so `true | time true` could call
`/bin/time` (same in bash)

See discussion in #6442
---
 src/exec.cpp                   |  2 ++
 src/highlight.cpp              |  4 +++
 src/parse_constants.h          |  5 +++-
 src/parse_execution.cpp        | 49 ++++++++++++++--------------------
 src/parse_grammar.h            | 17 ++++++++----
 src/parse_grammar_elements.inc |  1 +
 src/parse_productions.cpp      | 17 +++++++++---
 src/parse_tree.cpp             |  2 +-
 src/proc.h                     |  3 +++
 src/timer.cpp                  | 19 +++++++++++++
 src/timer.h                    |  2 ++
 src/tnode.cpp                  |  4 +--
 tests/checks/time.fish         | 18 +++++++++++++
 13 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0b6e23593..351a67a18 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -44,6 +44,7 @@
 #include "reader.h"
 #include "redirection.h"
 #include "signal.h"
+#include "timer.h"
 #include "trace.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -1049,6 +1050,7 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         parser.set_last_statuses(statuses_t::just(status));
         return false;
     }
+    cleanup_t timer = push_timer(j->flags().has_time_prefix);
 
     // Get the deferred process, if any. We will have to remember its pipes.
     autoclose_pipes_t deferred_pipes;
diff --git a/src/highlight.cpp b/src/highlight.cpp
index a9e0550bd..a4a230797 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -1211,6 +1211,10 @@ highlighter_t::color_array_t highlighter_t::highlight() {
                 this->color_node(node, highlight_role_t::statement_terminator);
                 break;
             }
+            case symbol_optional_time: {
+                this->color_node(node, highlight_role_t::operat);
+                break;
+            }
             case symbol_plain_statement: {
                 tnode_t<g::plain_statement> stmt(&parse_tree, &node);
                 // Get the decoration from the parent.
diff --git a/src/parse_constants.h b/src/parse_constants.h
index 441436a88..5d6ded51b 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -52,6 +52,7 @@ enum parse_token_type_t : uint8_t {
     symbol_redirection,
     symbol_optional_background,
     symbol_optional_newlines,
+    symbol_optional_time,
     symbol_end_command,
     // Terminal types.
     parse_token_type_string,
@@ -157,12 +158,14 @@ enum parse_job_decoration_t {
     parse_job_decoration_none,
     parse_job_decoration_and,
     parse_job_decoration_or,
-    parse_job_decoration_time,
 };
 
 // Whether a statement is backgrounded.
 enum parse_optional_background_t { parse_no_background, parse_background };
 
+// Whether a job is prefixed with "time".
+enum parse_optional_time_t { parse_optional_time_no_time, parse_optional_time_time };
+
 // Parse error code list.
 enum parse_error_code_t {
     parse_error_none,
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index b07dc3b01..bc7401315 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -122,13 +122,14 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
     // Here's the statement node we find that's infinite recursive.
     tnode_t<grammar::plain_statement> infinite_recursive_statement;
 
-    // Get the list of plain statements.
-    // Ignore statements with decorations like 'builtin' or 'command', since those
-    // are not infinite recursion. In particular that is what enables 'wrapper functions'.
-    tnode_t<g::statement> statement = first_job.child<1>();
-    tnode_t<g::job_continuation> continuation = first_job.child<2>();
+    // Ignore the jobs variable assigment and "time" prefixes.
+    tnode_t<g::statement> statement = first_job.child<2>();
+    tnode_t<g::job_continuation> continuation = first_job.child<3>();
     const null_environment_t nullenv{};
     while (statement) {
+        // Get the list of plain statements.
+        // Ignore statements with decorations like 'builtin' or 'command', since those
+        // are not infinite recursion. In particular that is what enables 'wrapper functions'.
         tnode_t<g::plain_statement> plain_statement =
             statement.try_get_child<g::decorated_statement, 0>()
                 .try_get_child<g::plain_statement, 0>();
@@ -203,10 +204,10 @@ maybe_t<eval_result_t> parse_execution_context_t::check_end_execution() const {
 
 /// Return whether the job contains a single statement, of block type, with no redirections.
 bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) const {
-    tnode_t<g::statement> statement = job_node.child<1>();
+    tnode_t<g::statement> statement = job_node.child<2>();
 
     // Must be no pipes.
-    if (job_node.child<2>().try_get_child<g::tok_pipe, 0>()) {
+    if (job_node.child<3>().try_get_child<g::tok_pipe, 0>()) {
         return false;
     }
 
@@ -975,8 +976,10 @@ eval_result_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
+    auto optional_time = not_statement.require_get_child<g::optional_time, 2>();
+    if (optional_time.tag() == parse_optional_time_time) flags.has_time_prefix = true;
     return this->populate_job_process(
-        job, proc, not_statement.require_get_child<g::statement, 2>(),
+        job, proc, not_statement.require_get_child<g::statement, 3>(),
         not_statement.require_get_child<g::variable_assignments, 1>());
 }
 
@@ -1111,18 +1114,20 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
 
     // We are going to construct process_t structures for every statement in the job. Get the first
     // statement.
-    tnode_t<g::statement> statement = job_node.child<1>();
-    tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
+    tnode_t<g::optional_time> optional_time = job_node.child<0>();
+    tnode_t<g::variable_assignments> variable_assignments = job_node.child<1>();
+    tnode_t<g::statement> statement = job_node.child<2>();
 
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
+    if (optional_time.tag() == parse_optional_time_time) j->mut_flags().has_time_prefix = true;
     eval_result_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
     // terminal (empty) job continuation.
-    tnode_t<g::job_continuation> job_cont = job_node.child<2>();
+    tnode_t<g::job_continuation> job_cont = job_node.child<3>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
         if (result != eval_result_t::ok) {
@@ -1212,7 +1217,9 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     // However, if there are no redirections, then we can just jump into the block directly, which
     // is significantly faster.
     if (job_is_simple_block(job_node)) {
-        tnode_t<g::variable_assignments> variable_assignments = job_node.child<0>();
+        tnode_t<g::optional_time> optional_time = job_node.child<0>();
+        cleanup_t timer = push_timer(optional_time.tag() == parse_optional_time_time);
+        tnode_t<g::variable_assignments> variable_assignments = job_node.child<1>();
         const block_t *block = nullptr;
         eval_result_t result =
             this->apply_variable_assignments(nullptr, variable_assignments, &block);
@@ -1220,7 +1227,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
             if (block) parser->pop_block(block);
         });
 
-        tnode_t<g::statement> statement = job_node.child<1>();
+        tnode_t<g::statement> statement = job_node.child<2>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
         if (result == eval_result_t::ok) {
@@ -1389,7 +1396,6 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
-    static std::vector<timer_snapshot_t> active_timers;
     eval_result_t result = eval_result_t::ok;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
         if (auto reason = check_end_execution()) {
@@ -1399,26 +1405,11 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
 
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
-        bool timer_started = false;
-        if (get_decorator(job_conj) == parse_job_decoration_time) {
-            active_timers.emplace_back(timer_snapshot_t::take());
-            timer_started = true;
-        }
         if (should_skip(get_decorator(job_conj))) {
             result = eval_result_t::ok;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
-        if (timer_started) {
-            auto t1 = active_timers.back();
-            active_timers.pop_back();
-            auto t2 = timer_snapshot_t::take();
-
-            // Well, this is awkward. By defining `time` as a decorator and not a built-in, there's
-            // no associated stream for its output!
-            auto output = timer_snapshot_t::print_delta(t1, t2, true);
-            std::fwprintf(stderr, L"%S\n", output.c_str());
-        }
     }
 
     // Returns the result of the last job executed or skipped.
diff --git a/src/parse_grammar.h b/src/parse_grammar.h
index 7c3062693..0373e6ece 100644
--- a/src/parse_grammar.h
+++ b/src/parse_grammar.h
@@ -210,7 +210,6 @@ DEF_ALT(job_list) {
 DEF_ALT(job_decorator) {
     using ands = single<keyword<parse_keyword_and>>;
     using ors = single<keyword<parse_keyword_or>>;
-    using times = single<keyword<parse_keyword_time>>;
     using empty = grammar::empty;
     ALT_BODY(job_decorator, ands, ors, empty);
 };
@@ -225,13 +224,20 @@ DEF_ALT(job_conjunction_continuation) {
     ALT_BODY(job_conjunction_continuation, andands, orors, empty);
 };
 
+/// The time builtin.
+DEF_ALT(optional_time) {
+    using empty = grammar::empty;
+    using time = single<keyword<parse_keyword_time>>;
+    ALT_BODY(optional_time, empty, time);
+};
+
 // A job is a non-empty list of statements, separated by pipes. (Non-empty is useful for cases
 // like if statements, where we require a command). To represent "non-empty", we require a
 // statement, followed by a possibly empty job_continuation, and then optionally a background
 // specifier '&'
 DEF(job)
-produces_sequence<variable_assignments, statement, job_continuation, optional_background>{
-    BODY(job)};
+produces_sequence<optional_time, variable_assignments, statement, job_continuation,
+                  optional_background>{BODY(job)};
 
 DEF_ALT(job_continuation) {
     using piped =
@@ -322,8 +328,9 @@ produces_sequence<keyword<parse_keyword_function>, argument, argument_list, tok_
     BODY(function_header)};
 
 DEF_ALT(not_statement) {
-    using nots = seq<keyword<parse_keyword_not>, variable_assignments, statement>;
-    using exclams = seq<keyword<parse_keyword_exclam>, variable_assignments, statement>;
+    using nots = seq<keyword<parse_keyword_not>, variable_assignments, optional_time, statement>;
+    using exclams =
+        seq<keyword<parse_keyword_exclam>, variable_assignments, optional_time, statement>;
     ALT_BODY(not_statement, nots, exclams);
 };
 
diff --git a/src/parse_grammar_elements.inc b/src/parse_grammar_elements.inc
index 4c88d7f82..343af206e 100644
--- a/src/parse_grammar_elements.inc
+++ b/src/parse_grammar_elements.inc
@@ -31,6 +31,7 @@ ELEM(argument)
 ELEM(redirection)
 ELEM(optional_background)
 ELEM(optional_newlines)
+ELEM(optional_time)
 ELEM(end_command)
 ELEM(freestanding_argument_list)
 #undef ELEM
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 3f56f7ca6..9584ee096 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -82,10 +82,6 @@ RESOLVE(job_decorator) {
             *out_tag = parse_job_decoration_or;
             return production_for<ors>();
         }
-        case parse_keyword_time: {
-            *out_tag = parse_job_decoration_time;
-            return production_for<times>();
-        }
         default: {
             *out_tag = parse_job_decoration_none;
             return production_for<empty>();
@@ -400,6 +396,19 @@ RESOLVE(optional_background) {
     }
 }
 
+RESOLVE(optional_time) {
+    UNUSED(token2);
+
+    switch (token1.keyword) {
+        case parse_keyword_time:
+            *out_tag = parse_optional_time_time;
+            return production_for<time>();
+        default:
+            *out_tag = parse_optional_time_no_time;
+            return production_for<empty>();
+    }
+}
+
 const production_element_t *parse_productions::production_for_token(parse_token_type_t node_type,
                                                                     const parse_token_t &input1,
                                                                     const parse_token_t &input2,
diff --git a/src/parse_tree.cpp b/src/parse_tree.cpp
index fce988a01..0427f48c4 100644
--- a/src/parse_tree.cpp
+++ b/src/parse_tree.cpp
@@ -955,7 +955,7 @@ void parse_ll_t::accept_tokens(parse_token_t token1, parse_token_t token2) {
                     case symbol_job:
                         variable_assignments =
                             tnode_t<grammar::job>(&nodes, parent)
-                                .try_get_child<grammar::variable_assignments, 0>();
+                                .try_get_child<grammar::variable_assignments, 1>();
                         break;
                     case symbol_job_continuation:
                         variable_assignments =
diff --git a/src/proc.h b/src/proc.h
index 341dc028e..ea8ab09ec 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -421,6 +421,9 @@ class job_t {
 
         /// This job is disowned, and should be removed from the active jobs list.
         bool disown_requested{false};
+
+        /// Whether to print timing for this job.
+        bool has_time_prefix{false};
     } job_flags{};
 
     /// Access the job flags.
diff --git a/src/timer.cpp b/src/timer.cpp
index d4289a766..454696385 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -195,3 +195,22 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
 
     return output;
 };
+
+static std::vector<timer_snapshot_t> active_timers;
+
+static void pop_timer() {
+    auto t1 = std::move(active_timers.back());
+    active_timers.pop_back();
+    auto t2 = timer_snapshot_t::take();
+
+    // Well, this is awkward. By defining `time` as a decorator and not a built-in, there's
+    // no associated stream for its output!
+    auto output = timer_snapshot_t::print_delta(std::move(t1), std::move(t2), true);
+    std::fwprintf(stderr, L"%S\n", output.c_str());
+}
+
+cleanup_t push_timer(bool enabled) {
+    if (!enabled) return {[]() {}};
+    active_timers.emplace_back(timer_snapshot_t::take());
+    return {[]() { pop_timer(); }};
+}
diff --git a/src/timer.h b/src/timer.h
index bdc34bc2e..997e98c11 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -13,6 +13,8 @@
 class parser_t;
 struct io_streams_t;
 
+cleanup_t push_timer(bool enabled);
+
 struct timer_snapshot_t {
    public:
     struct rusage cpu_fish;
diff --git a/src/tnode.cpp b/src/tnode.cpp
index 450098f69..ed64dcda5 100644
--- a/src/tnode.cpp
+++ b/src/tnode.cpp
@@ -114,7 +114,7 @@ arguments_node_list_t get_argument_nodes(tnode_t<grammar::arguments_or_redirecti
 }
 
 bool job_node_is_background(tnode_t<grammar::job> job) {
-    tnode_t<grammar::optional_background> bg = job.child<3>();
+    tnode_t<grammar::optional_background> bg = job.child<4>();
     return bg.tag() == parse_background;
 }
 
@@ -144,7 +144,7 @@ pipeline_position_t get_pipeline_position(tnode_t<grammar::statement> st) {
 
     // Check if we're the beginning of a job, and if so, whether that job
     // has a non-empty continuation.
-    tnode_t<job_continuation> jc = st.try_get_parent<job>().child<2>();
+    tnode_t<job_continuation> jc = st.try_get_parent<job>().child<3>();
     if (jc.try_get_child<statement, 3>()) {
         return pipeline_position_t::first;
     }
diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index dc50d1c4f..38c13dc8e 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -25,3 +25,21 @@ time echo 'foo -s   bar'
 #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: {{.*}}
+
+PATH= time true
+#CHECKERR: fish: Unknown command: time
+#CHECKERR: {{.*}}
+#CHECKERR: PATH= time true
+#CHECKERR:       ^
+
+not time true
+#CHECKERR: ___{{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}
+#CHECKERR: {{.*}}

From c3374edc59f1679be254b69e63360808e7cfeb99 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 23 Dec 2019 11:45:55 +0100
Subject: [PATCH 1506/1732] Reject time with background jobs

This check could probably done earlier in the parser but it works.
---
 src/parse_constants.h   |  4 ++++
 src/parse_execution.cpp | 16 ++++++++++++++--
 tests/checks/time.fish  | 14 ++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/parse_constants.h b/src/parse_constants.h
index 5d6ded51b..1df7cde39 100644
--- a/src/parse_constants.h
+++ b/src/parse_constants.h
@@ -295,4 +295,8 @@ void parse_error_offset_source_start(parse_error_list_t *errors, size_t amt);
 #define ERROR_BAD_COMMAND_ASSIGN_ERR_MSG \
     _(L"Unsupported use of '='. In fish, please use 'set %ls %ls'.")
 
+/// Error message for a command like `time foo &`.
+#define ERROR_TIME_BACKGROUND \
+    _(L"'time' is not supported for background jobs. Consider using 'command time'.")
+
 #endif
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index bc7401315..6fe1b8409 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -977,7 +977,13 @@ eval_result_t parse_execution_context_t::populate_not_process(
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
     auto optional_time = not_statement.require_get_child<g::optional_time, 2>();
-    if (optional_time.tag() == parse_optional_time_time) flags.has_time_prefix = true;
+    if (optional_time.tag() == parse_optional_time_time) {
+        flags.has_time_prefix = true;
+        if (!job->mut_flags().foreground) {
+            this->report_error(not_statement, ERROR_TIME_BACKGROUND);
+            return eval_result_t::error;
+        }
+    }
     return this->populate_job_process(
         job, proc, not_statement.require_get_child<g::statement, 3>(),
         not_statement.require_get_child<g::variable_assignments, 1>());
@@ -1121,7 +1127,13 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     // Create processes. Each one may fail.
     process_list_t processes;
     processes.emplace_back(new process_t());
-    if (optional_time.tag() == parse_optional_time_time) j->mut_flags().has_time_prefix = true;
+    if (optional_time.tag() == parse_optional_time_time) {
+        j->mut_flags().has_time_prefix = true;
+        if (job_node_is_background(job_node)) {
+            this->report_error(job_node, ERROR_TIME_BACKGROUND);
+            return eval_result_t::error;
+        }
+    }
     eval_result_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index 38c13dc8e..e42ae9e24 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -1,5 +1,5 @@
-#RUN: %fish %s
-time sleep 1s
+#RUN: %fish -C 'set -l fish %fish' %s
+time sleep 0s
 
 # These are a tad awkward because it picks the correct unit and adapts whitespace.
 # The idea is that it's a table.
@@ -43,3 +43,13 @@ not time true
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
 #CHECKERR: {{.*}}
+
+$fish -c 'time true&'
+#CHECKERR: fish: {{.*}}
+#CHECKERR: time true&
+#CHECKERR: ^
+
+$fish -c 'not time true&'
+#CHECKERR: fish: {{.*}}
+#CHECKERR: not time true&
+#CHECKERR: ^

From 62302ee17242ccc19b343874dce0f52f5233d976 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 3 Jan 2020 14:40:28 -0800
Subject: [PATCH 1507/1732] Properly print leading comments and indentation in
 `functions`

Store the entire function declaration, not just its job list.
This allows us to extract the body of the function complete with any
leading comments and indents.

Fixes #5285
---
 src/builtin_function.cpp              |  5 ++--
 src/builtin_function.h                |  2 +-
 src/builtin_functions.cpp             |  5 ++--
 src/exec.cpp                          |  4 ++-
 src/function.cpp                      | 27 +++++++++++++--------
 src/function.h                        |  6 +++--
 src/parse_execution.cpp               |  8 +++---
 src/parse_execution.h                 |  4 +--
 tests/checks/function-definition.fish | 35 +++++++++++++++++++++++++++
 9 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 tests/checks/function-definition.fish

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index b1a6655f5..cc4bf816c 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -207,7 +207,8 @@ static int validate_function_name(int argc, const wchar_t *const *argv, wcstring
 /// Define a function. Calls into `function.cpp` to perform the heavy lifting of defining a
 /// function.
 int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_list_t &c_args,
-                     const parsed_source_ref_t &source, tnode_t<grammar::job_list> body) {
+                     const parsed_source_ref_t &source,
+                     tnode_t<grammar::block_statement> func_node) {
     assert(source && "Missing source in builtin_function");
     // The wgetopt function expects 'function' as the first argument. Make a new wcstring_list with
     // that property. This is needed because this builtin has a different signature than the other
@@ -258,7 +259,7 @@ int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_lis
     props->shadow_scope = opts.shadow_scope;
     props->named_arguments = std::move(opts.named_arguments);
     props->parsed_source = source;
-    props->body_node = body;
+    props->func_node = func_node;
 
     // Populate inherit_vars.
     for (const wcstring &name : opts.inherit_vars) {
diff --git a/src/builtin_function.h b/src/builtin_function.h
index 650f7254e..be69f8485 100644
--- a/src/builtin_function.h
+++ b/src/builtin_function.h
@@ -9,5 +9,5 @@ class parser_t;
 struct io_streams_t;
 
 int builtin_function(parser_t &parser, io_streams_t &streams, const wcstring_list_t &c_args,
-                     const parsed_source_ref_t &source, tnode_t<grammar::job_list> body);
+                     const parsed_source_ref_t &source, tnode_t<grammar::block_statement> body);
 #endif
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index f189bd3e2..c3f5404c0 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -223,9 +223,8 @@ static wcstring functions_def(const wcstring &name) {
             out.append(earg);
         }
     }
-
-    // More forced indentation.
-    append_format(out, L"\n    %ls", def.c_str());
+    out.push_back('\n');
+    out.append(def);
 
     // Append a newline before the 'end', unless there already is one there.
     if (!string_suffixes_string(L"\n", def)) {
diff --git a/src/exec.cpp b/src/exec.cpp
index 351a67a18..523cc87dd 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -722,10 +722,12 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
         }
         auto argv = move_to_sharedptr(p->get_argv_array().to_list());
         return [=](parser_t &parser) {
+            // Pull out the job list from the function.
+            tnode_t<grammar::job_list> body = props->func_node.child<1>();
             const auto &ld = parser.libdata();
             auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
-            auto res = parser.eval_node(props->parsed_source, props->body_node, lineage);
+            auto res = parser.eval_node(props->parsed_source, body, lineage);
             function_restore_environment(parser, fb);
 
             switch (res) {
diff --git a/src/function.cpp b/src/function.cpp
index 283d79d89..56e5fb2c5 100644
--- a/src/function.cpp
+++ b/src/function.cpp
@@ -221,14 +221,23 @@ void function_remove(const wcstring &name) {
 
 bool function_get_definition(const wcstring &name, wcstring &out_definition) {
     const auto funcset = function_set.acquire();
-    if (const function_info_t *func = funcset->get_info(name)) {
-        auto props = func->props;
-        if (props && props->parsed_source) {
-            out_definition = props->body_node.get_source(props->parsed_source->src);
-        }
-        return true;
+    const function_info_t *func = funcset->get_info(name);
+    if (!func || !func->props) return false;
+    // We want to preserve comments that the AST attaches to the header (#5285).
+    // Take everything from the end of the header to the end of the body.
+    const auto &props = func->props;
+    namespace g = grammar;
+    tnode_t<g::block_header> header = props->func_node.child<0>();
+    tnode_t<g::job_list> jobs = props->func_node.child<1>();
+    auto header_src = header.source_range();
+    auto jobs_src = jobs.source_range();
+    if (header_src && jobs_src) {
+        uint32_t body_start = header_src->start + header_src->length;
+        uint32_t body_end = jobs_src->start + jobs_src->length;
+        assert(body_start <= jobs_src->start && "job list must come after header");
+        out_definition = wcstring(props->parsed_source->src, body_start, body_end - body_start);
     }
-    return false;
+    return true;
 }
 
 bool function_get_desc(const wcstring &name, wcstring &out_desc) {
@@ -304,9 +313,7 @@ int function_get_definition_lineno(const wcstring &name) {
     // return one plus the number of newlines at offsets less than the start of our function's
     // statement (which includes the header).
     // TODO: merge with line_offset_of_character_at_offset?
-    auto block_stat = func->props->body_node.try_get_parent<grammar::block_statement>();
-    assert(block_stat && "Function body is not part of block statement");
-    auto source_range = block_stat.source_range();
+    auto source_range = func->props->func_node.source_range();
     assert(source_range && "Function has no source range");
     uint32_t func_start = source_range->start;
     const wcstring &source = func->props->parsed_source->src;
diff --git a/src/function.h b/src/function.h
index b777f7539..3f612efab 100644
--- a/src/function.h
+++ b/src/function.h
@@ -20,8 +20,10 @@ struct function_properties_t {
     /// Parsed source containing the function.
     parsed_source_ref_t parsed_source;
 
-    /// Node containing the function body, pointing into parsed_source.
-    tnode_t<grammar::job_list> body_node;
+    /// Node containing the function statement, pointing into parsed_source.
+    /// We store block_statement, not job_list, so that comments attached to the header are
+    /// preserved.
+    tnode_t<grammar::block_statement> func_node;
 
     /// List of all named arguments for this function.
     wcstring_list_t named_arguments;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 6fe1b8409..638044cac 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -331,8 +331,8 @@ eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list
 }
 
 // Define a function.
-eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::function_header> header,
-                                                                tnode_t<g::job_list> body) {
+eval_result_t parse_execution_context_t::run_function_statement(
+    tnode_t<grammar::block_statement> statement, tnode_t<grammar::function_header> header) {
     // Get arguments.
     wcstring_list_t arguments;
     argument_node_list_t arg_nodes = header.descendants<g::argument>();
@@ -343,7 +343,7 @@ eval_result_t parse_execution_context_t::run_function_statement(tnode_t<g::funct
     }
     trace_if_enabled(*parser, L"function", arguments);
     io_streams_t streams(0);  // no limit on the amount of output from builtin_function()
-    int err = builtin_function(*parser, streams, arguments, pstree, body);
+    int err = builtin_function(*parser, streams, arguments, pstree, statement);
     parser->set_last_statuses(statuses_t::just(err));
 
     wcstring errtext = streams.err.contents();
@@ -366,7 +366,7 @@ eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_st
     } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
         ret = run_while_statement(header, contents, associated_block);
     } else if (auto header = bheader.try_get_child<g::function_header, 0>()) {
-        ret = run_function_statement(header, contents);
+        ret = run_function_statement(statement, header);
     } else if (auto header = bheader.try_get_child<g::begin_header, 0>()) {
         ret = run_begin_statement(contents);
     } else {
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 52a8ff2f1..887c44d42 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -110,8 +110,8 @@ class parse_execution_context_t {
     eval_result_t run_while_statement(tnode_t<grammar::while_header> header,
                                       tnode_t<grammar::job_list> contents,
                                       const block_t *associated_block);
-    eval_result_t run_function_statement(tnode_t<grammar::function_header> header,
-                                         tnode_t<grammar::job_list> body);
+    eval_result_t run_function_statement(tnode_t<grammar::block_statement> statement,
+                                         tnode_t<grammar::function_header> header);
     eval_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
 
     enum globspec_t { failglob, nullglob };
diff --git a/tests/checks/function-definition.fish b/tests/checks/function-definition.fish
new file mode 100644
index 000000000..9ee933f05
--- /dev/null
+++ b/tests/checks/function-definition.fish
@@ -0,0 +1,35 @@
+#RUN: %fish %s
+
+function stuff --argument a b c
+    # This is a comment
+    echo stuff
+    # This is another comment
+end
+
+functions stuff
+#CHECK: # Defined in {{.*}}
+#CHECK: function stuff --argument a b c
+#CHECK:    # This is a comment
+#CHECK:    echo stuff
+#CHECK:    # This is another comment
+#CHECK: end
+
+function commenting
+
+    # line 2
+
+    # line 4
+
+    echo Bye bye says line 6
+end
+
+functions commenting
+#CHECK: # Defined in {{.*}}
+#CHECK: function commenting
+#CHECK:     
+#CHECK:     # line 2
+#CHECK:     
+#CHECK:     # line 4
+#CHECK:     
+#CHECK:     echo Bye bye says line 6
+#CHECK: end

From 038084b8bf82f37b15ebeba64cc1bfe330608a7f Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Fri, 3 Jan 2020 17:53:31 -0600
Subject: [PATCH 1508/1732] Optimize generation, filtering, and sort of
 completions

---
 src/complete.cpp | 76 +++++++++++++++++++++++++++---------------------
 src/complete.h   |  2 +-
 src/expand.cpp   |  2 +-
 src/wildcard.cpp |  2 +-
 4 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index bba9adb7c..272d63869 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -218,7 +218,8 @@ completion_t &completion_t::operator=(const completion_t &) = default;
 completion_t &completion_t::operator=(completion_t &&) = default;
 completion_t::~completion_t() = default;
 
-bool completion_t::is_naturally_less_than(const completion_t &a, const completion_t &b) {
+__attribute__((always_inline)) static inline bool natural_compare_completions(
+    const completion_t &a, const completion_t &b) {
     // For this to work, stable_sort must be used because results aren't interchangeable.
     if (a.flags & b.flags & COMPLETE_DONT_SORT) {
         // Both completions are from a source with the --keep-order flag.
@@ -227,30 +228,30 @@ bool completion_t::is_naturally_less_than(const completion_t &a, const completio
     return wcsfilecmp(a.completion.c_str(), b.completion.c_str()) < 0;
 }
 
+bool completion_t::is_naturally_less_than(const completion_t &a, const completion_t &b) {
+    return natural_compare_completions(a, b);
+}
+
 void completion_t::prepend_token_prefix(const wcstring &prefix) {
     if (this->flags & COMPLETE_REPLACES_TOKEN) {
         this->completion.insert(0, prefix);
     }
 }
 
-static bool compare_completions_by_match_type(const completion_t &a, const completion_t &b) {
-    return a.match.type < b.match.type;
-}
-
-static bool compare_completions_by_duplicate_arguments(const completion_t &a,
-                                                       const completion_t &b) {
+// If these functions aren't force inlined, it is actually faster to call
+// stable_sort twice rather than to iterate once performing all comparisons in one go!
+__attribute__((always_inline)) static inline bool compare_completions_by_duplicate_arguments(
+    const completion_t &a, const completion_t &b) {
     bool ad = a.flags & COMPLETE_DUPLICATES_ARGUMENT;
     bool bd = b.flags & COMPLETE_DUPLICATES_ARGUMENT;
     return ad < bd;
 }
 
-static bool compare_completions_by_tilde(const completion_t &a, const completion_t &b) {
-    if (a.completion.empty()) {
+__attribute__((always_inline)) static inline bool compare_completions_by_tilde(
+    const completion_t &a, const completion_t &b) {
+    if (a.completion.empty() || b.completion.empty()) {
         return false;
     }
-    if (b.completion.empty()) {
-        return true;
-    }
     return ((a.completion.back() == L'~') < (b.completion.back() == L'~'));
 }
 
@@ -272,6 +273,10 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
     fuzzy_match_type_t best_type = fuzzy_match_none;
     for (const auto &comp : *comps) {
         best_type = std::min(best_type, comp.match.type);
+        if (best_type <= fuzzy_match_prefix) {
+            // We can't get better than this (see below)
+            break;
+        }
     }
     // If the best type is an exact match, reduce it to prefix match. Otherwise a tab completion
     // will only show one match if it matches a file exactly. (see issue #959).
@@ -285,21 +290,23 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
                        [&](const completion_t &comp) { return comp.match.type > best_type; }),
         comps->end());
 
-    // Sort, provided COMPLETE_DONT_SORT isn't set.
-    stable_sort(comps->begin(), comps->end(), completion_t::is_naturally_less_than);
-
     // Deduplicate both sorted and unsorted results.
     unique_completions_retaining_order(comps);
 
-    // Sort the remainder by match type. They're already sorted alphabetically.
-    stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);
+    // Sort, provided COMPLETE_DONT_SORT isn't set.
+    stable_sort(comps->begin(), comps->end(), [](const completion_t &a, const completion_t &b) {
+        return a.match.type < b.match.type || natural_compare_completions(a, b);
+    });
 
     // Lastly, if this is for an autosuggestion, prefer to avoid completions that duplicate
     // arguments, and penalize files that end in tilde - they're frequently autosave files from e.g.
     // emacs.
     if (flags & completion_request_t::autosuggestion) {
-        stable_sort(comps->begin(), comps->end(), compare_completions_by_duplicate_arguments);
-        stable_sort(comps->begin(), comps->end(), compare_completions_by_tilde);
+        stable_sort(comps->begin(), comps->end(),
+                    [](const completion_t &a, const completion_t &b) {
+                        return compare_completions_by_duplicate_arguments(a, b) ||
+                               compare_completions_by_tilde(a, b);
+                    });
     }
 }
 
@@ -403,9 +410,8 @@ static owning_lock<autoload_t> completion_autoloader{autoload_t(L"fish_complete_
 
 /// Create a new completion entry.
 void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
-                       complete_flags_t flags, string_fuzzy_match_t match) {
-    completion_t completion{std::move(comp), std::move(desc), match, flags};
-    completions->push_back(std::move(completion));
+                       complete_flags_t flags, string_fuzzy_match_t &&match) {
+    completions->emplace_back(std::move(comp), std::move(desc), match, flags);
 }
 
 /// Test if the specified script returns zero. The result is cached, so that if multiple completions
@@ -437,7 +443,7 @@ bool completer_t::condition_test(const wcstring &condition) {
 /// Locate the specified entry. Create it if it doesn't exist. Must be called while locked.
 static completion_entry_t &complete_get_exact_entry(completion_entry_set_t &completion_set,
                                                     const wcstring &cmd, bool cmd_is_path) {
-    auto ins = completion_set.emplace(completion_entry_t(cmd, cmd_is_path));
+    auto ins = completion_set.emplace(cmd, cmd_is_path);
 
     // NOTE SET_ELEMENTS_ARE_IMMUTABLE: Exposing mutable access here is only okay as long as callers
     // do not change any field that matters to ordering - affecting order without telling std::set
@@ -606,14 +612,16 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     wcstring lookup_cmd(L"__fish_describe_command ");
     lookup_cmd.append(escape_string(cmd, ESCAPE_ALL));
 
+    // See the ASSERT_IS_MAIN_THREAD() above, making it safe to make this a static variable.
+    // This lets us reuse the heap-allocated memory across calls.
+    static std::unordered_map<wcstring, wcstring> lookup;
+    static wcstring_list_t list;
     // First locate a list of possible descriptions using a single call to apropos or a direct
     // search if we know the location of the whatis database. This can take some time on slower
     // systems with a large set of manuals, but it should be ok since apropos is only called once.
-    wcstring_list_t list;
+    lookup.clear();
+    list.clear();
     if (exec_subshell(lookup_cmd, *parser, list, false /* don't apply exit status */) != -1) {
-        std::unordered_map<wcstring, wcstring> lookup;
-        lookup.reserve(list.size());
-
         // Then discard anything that is not a possible completion and put the result into a
         // hashtable with the completion as key and the description as value.
         //
@@ -1214,7 +1222,8 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
         }
 
         // Append matching environment variables
-        append_completion(&this->completions, std::move(comp), desc, flags, match);
+        append_completion(&this->completions, std::move(comp), std::move(desc), flags,
+                          std::move(match));
 
         res = true;
     }
@@ -1318,13 +1327,14 @@ bool completer_t::try_complete_user(const wcstring &str) {
         if (std::wcsncmp(user_name, pw_name, name_len) == 0) {
             wcstring desc = format_string(COMPLETE_USER_DESC, pw_name);
             // Append a user name
-            append_completion(&this->completions, &pw_name[name_len], desc, COMPLETE_NO_SPACE);
+            append_completion(&this->completions, &pw_name[name_len], std::move(desc),
+                              COMPLETE_NO_SPACE);
             result = true;
         } else if (wcsncasecmp(user_name, pw_name, name_len) == 0) {
             wcstring name = format_string(L"~%ls", pw_name);
             wcstring desc = format_string(COMPLETE_USER_DESC, pw_name);
             // Append a user name
-            append_completion(&this->completions, name, desc,
+            append_completion(&this->completions, std::move(name), std::move(desc),
                               COMPLETE_REPLACES_TOKEN | COMPLETE_DONT_ESCAPE | COMPLETE_NO_SPACE);
             result = true;
         }
@@ -1665,13 +1675,13 @@ static void append_switch(wcstring &out, const wcstring &opt) {
 /// Use by the bare `complete`, loaded completions are printed out as commands
 wcstring complete_print() {
     wcstring out;
+    out.reserve(40);  // just a guess
     auto completion_set = s_completion_set.acquire();
 
     // Get a list of all completions in a vector, then sort it by order.
     std::vector<std::reference_wrapper<const completion_entry_t>> all_completions;
-    for (const completion_entry_t &i : *completion_set) {
-        all_completions.emplace_back(i);
-    }
+    all_completions.insert(all_completions.cbegin(), completion_set->cbegin(),
+                           completion_set->cend());
     sort(all_completions.begin(), all_completions.end(), compare_completions_by_order);
 
     for (const completion_entry_t &e : all_completions) {
diff --git a/src/complete.h b/src/complete.h
index 32e63b813..8ba5373b3 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -193,7 +193,7 @@ bool complete_is_valid_argument(const wcstring &str, const wcstring &opt, const
 /// \param flags completion flags
 void append_completion(std::vector<completion_t> *completions, wcstring comp,
                        wcstring desc = wcstring(), int flags = 0,
-                       string_fuzzy_match_t match = string_fuzzy_match_t(fuzzy_match_exact));
+                       string_fuzzy_match_t &&match = string_fuzzy_match_t(fuzzy_match_exact));
 
 /// Support for "wrap targets." A wrap target is a command that completes like another command.
 bool complete_add_wrapper(const wcstring &command, const wcstring &new_target);
diff --git a/src/expand.cpp b/src/expand.cpp
index d46b28fad..565913931 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -680,7 +680,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
             whole_item.append(tail_item);
 
             // al_push( out, whole_item.buff );
-            append_completion(out_list, whole_item);
+            append_completion(out_list, std::move(whole_item));
         }
     }
 
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 952fb42e0..1f4f9db4e 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -244,7 +244,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
         // Note: out_completion may be empty if the completion really is empty, e.g. tab-completing
         // 'foo' when a file 'foo' exists.
         complete_flags_t local_flags = flags | (full_replacement ? COMPLETE_REPLACES_TOKEN : 0);
-        append_completion(out, out_completion, out_desc, local_flags, match);
+        append_completion(out, out_completion, out_desc, local_flags, std::move(match));
         return match_acceptable;
     } else if (next_wc_char_pos > 0) {
         // Here we have a non-wildcard prefix. Note that we don't do fuzzy matching for stuff before

From 5281aca6591fcf6f142ed8421be5cae81d4d5a30 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Fri, 3 Jan 2020 15:33:44 -0800
Subject: [PATCH 1509/1732] builtin_string.cpp: remove effectively dead
 variable

---
 src/builtin_string.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 36a1b7042..12edbeabc 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -790,8 +790,6 @@ class pcre2_matcher_t : public string_matcher_t {
             return false;
         }
 
-        int matched = 0;
-
         // See pcre2demo.c for an explanation of this logic.
         PCRE2_SIZE arglen = arg.length();
         int rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, 0, 0,
@@ -801,7 +799,6 @@ class pcre2_matcher_t : public string_matcher_t {
         } else if (rc == 0) {  // no match
             return true;
         }
-        matched++;
         total_matched++;
 
         if (opts.invert_match) {
@@ -810,7 +807,7 @@ class pcre2_matcher_t : public string_matcher_t {
 
         // Report any additional matches.
         PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(regex.match);
-        while (opts.all || matched == 0) {
+        while (opts.all) {
             uint32_t options = 0;
             PCRE2_SIZE offset = ovector[1];  // start at end of previous match
 
@@ -833,7 +830,6 @@ class pcre2_matcher_t : public string_matcher_t {
                 ovector[1] = offset + 1;
                 continue;
             }
-            matched++;
             total_matched++;
         }
         return true;
@@ -1008,7 +1004,7 @@ bool regex_replacer_t::replace_matches(const wcstring &arg) {
         pcre2_rc = pcre2_substitute(regex.code, PCRE2_SPTR(arg.c_str()), arglen,
                                     0,  // start offset
                                     options, regex.match,
-                                    nullptr,  // match context
+                                    nullptr,  // match_data
                                     PCRE2_SPTR(replacement->c_str()), replacement->length(),
                                     reinterpret_cast<PCRE2_UCHAR *>(output), &outlen);
 

From d0b0c9a77ec29365d70ecacca700ef2369b89c76 Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Fri, 3 Jan 2020 16:14:09 -0800
Subject: [PATCH 1510/1732] minor pcre2_matcher_t cleanup

---
 src/builtin_string.cpp | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 12edbeabc..ea73085a6 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -794,43 +794,32 @@ class pcre2_matcher_t : public string_matcher_t {
         PCRE2_SIZE arglen = arg.length();
         int rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, 0, 0,
                                                regex.match, nullptr));
-        if (rc < 0) {  // pcre2 match error.
-            return false;
-        } else if (rc == 0) {  // no match
-            return true;
-        }
-        total_matched++;
 
-        if (opts.invert_match) {
-            return true;
-        }
+        if (rc < 0 /* pcre2 error */) return false;
+        else if (rc == 0 /* no match */) return true;
+        else total_matched++;
+
+        if (opts.invert_match) return true;
 
         // Report any additional matches.
-        PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(regex.match);
-        while (opts.all) {
+        for (auto *ovector = pcre2_get_ovector_pointer(regex.match); opts.all; total_matched++) {
             uint32_t options = 0;
             PCRE2_SIZE offset = ovector[1];  // start at end of previous match
 
             if (ovector[0] == ovector[1]) {
-                if (ovector[0] == arglen) {
-                    break;
-                }
+                if (ovector[0] == arglen) break;
                 options = PCRE2_NOTEMPTY_ATSTART | PCRE2_ANCHORED;
             }
 
             rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, offset,
                                                options, regex.match, nullptr));
-            if (rc < 0) {
-                return false;
-            }
-            if (rc == 0) {
-                if (options == 0) {  // all matches found
-                    break;
-                }
+
+            if (rc < 0 /* pcre2 error */) return false;
+            else if (rc == 0 /* no matches */) {
+                if (options == 0 /* all matches found now */) break;
                 ovector[1] = offset + 1;
                 continue;
             }
-            total_matched++;
         }
         return true;
     }

From 0a379135a4be1897b761d9eec46f32cb5e909f76 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 4 Jan 2020 23:53:26 +0100
Subject: [PATCH 1511/1732] exec_job: Only call getpgrp() once

This reduces the syscall count for `fish -c exit` from 651 to 566.

We don't attempt to *cache* the pgrp or anything, we just call it once
when we're about to execute the job to see if we are in foreground and
to assign it to the job, instead of once for checking foreground and
once to give it to the job.

Caching it with a simple `static` would get the count down to 480, but
it's possible for fish to have its pgroup changed.
---
 src/exec.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 523cc87dd..00d47bde6 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1018,9 +1018,6 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         return true;
     }
 
-    // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
-    const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == getpgrp());
-
     // If our lineage indicates a pgid, share it.
     if (lineage.parent_pgid.has_value()) {
         assert(*lineage.parent_pgid != INVALID_PID &&
@@ -1029,8 +1026,12 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         j->mut_flags().job_control = true;
     }
 
+    pid_t pgrp = getpgrp();
+    // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
+    const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == pgrp);
+
     if (j->pgid == INVALID_PID && should_claim_process_group_for_job(j)) {
-        j->pgid = getpgrp();
+        j->pgid = pgrp;
     }
 
     const size_t stdout_read_limit = parser.libdata().read_limit;

From f3dbede2a58023bbf22b2362dca0df5fd51066d2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 14:44:48 +0100
Subject: [PATCH 1512/1732] Document variable overrides

[ci skip]
---
 sphinx_doc_src/index.rst | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 04c5d1f4d..fb8c20d16 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -455,7 +455,7 @@ Examples:
 
 - ``**`` matches any files and directories in the current directory and all of its subdirectories.
 
-Note that for most commands, if any wildcard fails to expand, the command is not executed, :ref:`$status <variables-status>` is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 3 exceptions, namely :ref:`set <cmd-set>`, :ref:`count <cmd-count>` and :ref:`for <cmd-for>`. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
+Note that for most commands, if any wildcard fails to expand, the command is not executed, :ref:`$status <variables-status>` is set to nonzero, and a warning is printed. This behavior is consistent with setting ``shopt -s failglob`` in bash. There are exactly 4 exceptions, namely :ref:`set <cmd-set>`, overriding variables in :ref:`overrides <variables-override>`, :ref:`count <cmd-count>` and :ref:`for <cmd-for>`. Their globs are permitted to expand to zero arguments, as with ``shopt -s nullglob`` in bash.
 
 Examples::
 
@@ -815,6 +815,28 @@ The following code will not output anything::
     echo $pirate
     # This will not output anything, since the pirate was local
 
+.. _variables-override:
+
+Overriding variables for a single command
+-----------------------------------------
+
+If you want to override a variable for a single command, you can use "var=val" statements before the command::
+
+  # Call git status on another directory (can also be done via `git -C somerepo status`)
+  GIT_DIR=somerepo git status
+
+Note that, unlike other shells, fish will first set the variable and then perform other expansions on the line, so::
+
+  set foo banana
+  foo=gagaga echo $foo # prints gagaga, while in other shells it might print "banana"
+
+Multiple elements can be given in a :ref:`brace expansion<expand-brace>`::
+
+  # Call bash with a reasonable default path.
+  PATH={/usr,}/{s,}bin bash
+
+This syntax is supported since fish 3.1.
+
 .. _variables-universal:
 
 More on universal variables

From 23bf9661b254cfdc442103cff90597d9c7afee2f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 14:50:54 +0100
Subject: [PATCH 1513/1732] Document time

This is a bit barebones, but `time` isn't super complicated to use and
it should explain the basics.

Fixes #6442

[ci skip]
---
 sphinx_doc_src/cmds/time.rst | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 sphinx_doc_src/cmds/time.rst

diff --git a/sphinx_doc_src/cmds/time.rst b/sphinx_doc_src/cmds/time.rst
new file mode 100644
index 000000000..5e13ec6b2
--- /dev/null
+++ b/sphinx_doc_src/cmds/time.rst
@@ -0,0 +1,39 @@
+.. _cmd-time:
+
+time - measure how long a command or block takes
+================================================
+
+Synopsis
+--------
+
+::
+
+   time COMMAND
+
+Description
+-----------
+
+``time`` causes fish to measure how long a command takes and print the results afterwards. The command can be a simple fish command or a block. The results can not currently be redirected.
+
+For checking timing after a command has completed, check :ref:`$CMD_DURATION <variables-special>`.
+
+Example
+-------
+
+(for obvious reasons exact results will vary on your system)
+
+::
+
+   >_ time sleep 1s
+   
+   ________________________________________________________
+   Executed in    1,01 secs   fish           external
+      usr time    2,32 millis    0,00 micros    2,32 millis
+      sys time    0,88 millis  877,00 micros    0,00 millis
+
+   >_ time for i in 1 2 3; sleep 1s; end
+
+   ________________________________________________________
+   Executed in    3,01 secs   fish           external
+      usr time    9,16 millis    2,94 millis    6,23 millis
+      sys time    0,23 millis    0,00 millis    0,23 millis

From 0f362b4bb28bc53324aa613096098a53a044e5bb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 15:44:05 +0100
Subject: [PATCH 1514/1732] Change c{begin,end} to begin,end

Unfortunately old distributions are old.

Fixes build failures on GCC 4.8 (RHEL6/7).
---
 src/complete.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 272d63869..128e591b0 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1680,8 +1680,9 @@ wcstring complete_print() {
 
     // Get a list of all completions in a vector, then sort it by order.
     std::vector<std::reference_wrapper<const completion_entry_t>> all_completions;
-    all_completions.insert(all_completions.cbegin(), completion_set->cbegin(),
-                           completion_set->cend());
+    // These should be "c"begin/end, but then gcc from ~~the dark ages~~ RHEL 7 would complain.
+    all_completions.insert(all_completions.begin(), completion_set->begin(),
+                           completion_set->end());
     sort(all_completions.begin(), all_completions.end(), compare_completions_by_order);
 
     for (const completion_entry_t &e : all_completions) {

From 611a6589ea56d66c12464a009c1116ed1b3a4837 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 18:35:59 +0100
Subject: [PATCH 1515/1732] Disable command descriptions on macOS 10.15.X

We just do a cheesy version check and hope it works out.

If this is fixed in 10.15.4, we have to reenable it. If it still isn't
fixed in 10.16, we need to adjust it.

Fixes #6270
---
 share/functions/__fish_describe_command.fish | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 7fb334d78..68b2f2802 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -2,6 +2,22 @@
 # This function is used internally by the fish command completion code
 #
 
+# macOS 10.15 "Catalina" has some major issues.
+# The whatis database is non-existent, so apropos tries (and fails) to create it every time,
+# which takes about half a second.
+#
+# So we disable this entirely in that case.
+if test (uname) = Darwin
+    set -l darwin_version (uname -r | string split .)
+    # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3.
+    # If this is fixed in later versions uncomment the second check.
+    if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
+        function __fish_describe_command; end
+        # (remember: exit when `source`ing only exits the file, not the shell)
+        exit
+    end
+end
+
 function __fish_describe_command -d "Command used to find descriptions for commands"
     # We're going to try to build a regex out of $argv inside awk.
     # Make sure $argv has no special characters.

From 24970bb549b4ef4f24b55dc45bc543b7dbb9bba5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 18:41:56 +0100
Subject: [PATCH 1516/1732] checks: Use "sleep" without "s" suffix

FreeBSD's sleep doesn't accept it.
---
 tests/checks/time.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/time.fish b/tests/checks/time.fish
index e42ae9e24..486108911 100644
--- a/tests/checks/time.fish
+++ b/tests/checks/time.fish
@@ -1,5 +1,5 @@
 #RUN: %fish -C 'set -l fish %fish' %s
-time sleep 0s
+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.

From f1ce967dfa08098d9b382080daeff49ce37f452f Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 5 Jan 2020 12:38:49 -0800
Subject: [PATCH 1517/1732] Do not allow empty items to be added to history

Empty items are used as sentinels to indicate that we've reached the end of
history, so they should not be added as actual items. Enforce this.

Fixes #6032
---
 src/fish_tests.cpp |  4 ++++
 src/history.cpp    | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 19776b426..b791fb5bd 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3654,6 +3654,10 @@ void history_tests_t::test_history() {
     }
     history.save();
 
+    // Empty items should just be dropped (#6032).
+    history.add(L"");
+    do_test(!history.item_at_index(1).contents.empty());
+
     // Read items back in reverse order and ensure they're the same.
     for (i = 100; i >= 1; i--) {
         history_item_t item = history.item_at_index(i);
diff --git a/src/history.cpp b/src/history.cpp
index fbf6806b9..822b0316d 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -366,6 +366,11 @@ struct history_impl_t {
 };
 
 void history_impl_t::add(const history_item_t &item, bool pending, bool do_save) {
+    // We use empty items as sentinels to indicate the end of history.
+    // Do not allow them to be added (#6032).
+    if (item.contents.empty()) {
+        return;
+    }
     // Try merging with the last item.
     if (!new_items.empty() && new_items.back().merge(item)) {
         // We merged, so we don't have to add anything. Maybe this item was pending, but it just got
@@ -1256,6 +1261,12 @@ void history_t::remove(const wcstring &str) { impl()->remove(str); }
 
 void history_t::add_pending_with_file_detection(const wcstring &str,
                                                 const wcstring &working_dir_slash) {
+    // We use empty items as sentinels to indicate the end of history.
+    // Do not allow them to be added (#6032).
+    if (str.empty()) {
+        return;
+    }
+
     // Find all arguments that look like they could be file paths.
     bool needs_sync_write = false;
     parse_node_tree_t tree;

From 484e590b7ba15d36cdb43f7eb07f4d637be0644b Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 18:51:33 +0100
Subject: [PATCH 1518/1732] Readd unconst cast to `tparm` calls

Removed in 0dfa7421f3, breaks build with NetBSD curses.
---
 src/screen.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index bda1996e9..9a604edb1 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1153,7 +1153,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
         if (screen_width > non_space_width) {
             bool justgrey = true;
             if (cur_term && enter_dim_mode) {
-                std::string dim = tparm(enter_dim_mode);
+                std::string dim = tparm((char *)enter_dim_mode);
                 if (!dim.empty()) {
                     // Use dim if they have it, so the color will be based on their actual normal
                     // color and the background of the termianl.
@@ -1164,14 +1164,14 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
             if (cur_term && justgrey && set_a_foreground) {
                 if (max_colors >= 238) {
                     // draw the string in a particular grey
-                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 237)));
+                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 237)));
                 } else if (max_colors >= 9) {
                     // bright black (the ninth color, looks grey)
-                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 8)));
+                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 8)));
                 } else if (max_colors >= 2 && enter_bold_mode) {
                     // we might still get that color by setting black and going bold for bright
-                    abandon_line_string.append(str2wcstring(tparm(enter_bold_mode)));
-                    abandon_line_string.append(str2wcstring(tparm(set_a_foreground, 0)));
+                    abandon_line_string.append(str2wcstring(tparm((char *)enter_bold_mode)));
+                    abandon_line_string.append(str2wcstring(tparm((char *)set_a_foreground, 0)));
                 }
             }
 
@@ -1179,7 +1179,7 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
 
             if (cur_term && exit_attribute_mode) {
                 abandon_line_string.append(
-                    str2wcstring(tparm(exit_attribute_mode)));  // normal text ANSI escape sequence
+                                           str2wcstring(tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
             }
 
             int newline_glitch_width = term_has_xn ? 0 : 1;

From 4bfc7318e9f96c3f1caee080e89ee6dd25e15275 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 5 Jan 2020 22:28:20 +0100
Subject: [PATCH 1519/1732] docs/time: Add a note about time command

[ci skip]
---
 sphinx_doc_src/cmds/time.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sphinx_doc_src/cmds/time.rst b/sphinx_doc_src/cmds/time.rst
index 5e13ec6b2..f6e8778bb 100644
--- a/sphinx_doc_src/cmds/time.rst
+++ b/sphinx_doc_src/cmds/time.rst
@@ -17,6 +17,8 @@ Description
 
 For checking timing after a command has completed, check :ref:`$CMD_DURATION <variables-special>`.
 
+Your system most likely also has a `time` command. To use that use something like `command time`, as in `command time sleep 10`. Because it's not inside fish, it won't have access to fish functions and won't be able to time blocks and such.
+
 Example
 -------
 

From 9910ee26cd41a1b1d633ac44b2986ccd70df8a64 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 6 Jan 2020 12:39:09 +0100
Subject: [PATCH 1520/1732] disable virtualenv prompt update in nim prompt

As this information is already wrapped into a _nim_prompt_wrapper
---
 share/tools/web_config/sample_prompts/nim.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/tools/web_config/sample_prompts/nim.fish b/share/tools/web_config/sample_prompts/nim.fish
index 95aaab56e..9d861e27b 100644
--- a/share/tools/web_config/sample_prompts/nim.fish
+++ b/share/tools/web_config/sample_prompts/nim.fish
@@ -76,6 +76,8 @@ function fish_prompt
     _nim_prompt_wrapper $retc '' (date +%X)
 
     # Virtual Environment
+    set -q VIRTUAL_ENV_DISABLE_PROMPT
+    or set -g VIRTUAL_ENV_DISABLE_PROMPT true
     set -q VIRTUAL_ENV
     and _nim_prompt_wrapper $retc V (basename "$VIRTUAL_ENV")
 

From f637b81fb60c22076d7a26eae77b004eda9c96fe Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 6 Jan 2020 18:16:34 +0100
Subject: [PATCH 1521/1732] sample_prompts/acidhub: Use prompt_pwd

This removes a call to `sed` and allows the user to specify shortening
via the variable.

We still default to disabling shortening because this prompt never
did.

[ci skip]
---
 share/tools/web_config/sample_prompts/acidhub.fish | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/tools/web_config/sample_prompts/acidhub.fish b/share/tools/web_config/sample_prompts/acidhub.fish
index a2b04c5d6..bbf90436d 100644
--- a/share/tools/web_config/sample_prompts/acidhub.fish
+++ b/share/tools/web_config/sample_prompts/acidhub.fish
@@ -38,8 +38,12 @@ function fish_prompt -d "Write out the prompt"
         set git_info "(git$git_status$git_branch"(set_color white)")"
     end
 
+    # Disable PWD shortening by default.
+    set -q fish_prompt_pwd_dir_length
+    or set -lx fish_prompt_pwd_dir_length 0
+
     set_color -b black
-    printf '%s%s%s%s%s%s%s%s%s%s%s%s%s' (set_color -o white) '❰' (set_color green) $USER (set_color white) '❙' (set_color yellow) (echo $PWD | sed -e "s|^$HOME|~|") (set_color white) $git_info (set_color white) '❱' (set_color white)
+    printf '%s%s%s%s%s%s%s%s%s%s%s%s%s' (set_color -o white) '❰' (set_color green) $USER (set_color white) '❙' (set_color yellow) (prompt_pwd) (set_color white) $git_info (set_color white) '❱' (set_color white)
     if test $laststatus -eq 0
         printf "%s✔%s≻%s " (set_color -o green) (set_color white) (set_color normal)
     else

From b7a0031174a37065255e1f8f55f0ea6dbc02d3fb Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 6 Jan 2020 21:48:35 +0100
Subject: [PATCH 1522/1732] docs/faq: Some minor extensions

[ci skip]
---
 sphinx_doc_src/faq.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index ea601c131..dd1eb5c2e 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -13,7 +13,7 @@ Since fish 3.1 you can set an environment variable for just one command using th
     key=value echo $key
     begin; set -lx key value; echo $key; end
 
-How do I run a command every login? What's fish's equivalent to .bashrc?
+How do I run a command every login? What's fish's equivalent to .bashrc or .profile?
 ------------------------------------------------------------------------
 Edit the file ``~/.config/fish/config.fish``, creating it if it does not exist (Note the leading period).
 
@@ -58,7 +58,7 @@ That means if you run
     echo x(printf '%s ' a b c)x
 
 
-It will print ``xa b c x``. But if you do
+It will print ``xa b c x``, because the "a b c " is used in one piece. But if you do
 
 ::
 
@@ -97,6 +97,11 @@ If you are just interested in success or failure, you can run the command direct
     end
 
 
+Or if you just want to do one command in case the first succeeded or failed, use ``and`` or ``or``::
+
+    somecommand
+    or someothercommand
+
 See the documentation for :ref:`test <cmd-test>` and :ref:`if <cmd-if>` for more information.
 
 How do I check whether a variable is defined?
@@ -108,7 +113,7 @@ Use ``set -q var``.  For example, ``if set -q var; echo variable defined; end``.
         echo either variable defined
     end
 
-Keep in mind that a defined variabled could be empty. Both of these commands define an empty variable: ``set var`` and ``set var ""``.
+Keep in mind that a defined variabled could also be empty, either by having no elements (if set like ``set var``) or only empty elements (if set like ``set var ""``). Read on for how to deal with those.
 
 
 How do I check whether a variable is not empty?
@@ -127,6 +132,9 @@ Alternatively, use ``test -n "$var"``, but remember that **the variable must be
     end
 
 
+If you want to know if a variable has *no elements*, use ``set -q var[1]``.
+
+
 Why doesn't ``set -Ux`` (exported universal variables) seem to work?
 --------------------------------------------------------------------
 A global variable of the same name already exists.

From cc7618985a490b7521af231b50d292327fd324cc Mon Sep 17 00:00:00 2001
From: Norio Nomura <norio.nomura@gmail.com>
Date: Tue, 7 Jan 2020 21:48:57 +0900
Subject: [PATCH 1523/1732] Don't override exit status when stderr is closed by
 `2>&-`

fixes #6470
---
 src/exec.cpp                                      | 2 +-
 tests/checks/exit-status-with-closing-stderr.fish | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/checks/exit-status-with-closing-stderr.fish

diff --git a/src/exec.cpp b/src/exec.cpp
index 00d47bde6..ba4910565 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -292,7 +292,7 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
     // If we have nothing to write we can elide the thread.
     // TODO: support eliding output to /dev/null.
     if (f->skip_out() && f->skip_err()) {
-        f->internal_proc->mark_exited(proc_status_t::from_exit_code(EXIT_SUCCESS));
+        f->internal_proc->mark_exited(p->status);
         return true;
     }
 
diff --git a/tests/checks/exit-status-with-closing-stderr.fish b/tests/checks/exit-status-with-closing-stderr.fish
new file mode 100644
index 000000000..149a59f42
--- /dev/null
+++ b/tests/checks/exit-status-with-closing-stderr.fish
@@ -0,0 +1,5 @@
+# RUN: %fish %s
+argparse r-require= -- --require 2>/dev/null ; echo $status
+# CHECK: 2
+argparse r-require= -- --require 2>&- ; echo $status
+# CHECK: 2

From e0cdea9bb64245ce1692ef14d19138dc8cc9c4f2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 7 Jan 2020 17:02:04 -0800
Subject: [PATCH 1524/1732] Correct the usleep calculation in fish_test_helper

'fish_test_helper print_pid_then_sleep' tried to sleep for .5 seconds,
but instead it divided by .5 so it actually slept for 2 seconds.

This exceeds the maximum value on NetBSD so it wasn't sleeping at all
there.

Fixes #6476
---
 src/fish_test_helper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fish_test_helper.cpp b/src/fish_test_helper.cpp
index a1590487d..b434d93a1 100644
--- a/src/fish_test_helper.cpp
+++ b/src/fish_test_helper.cpp
@@ -50,7 +50,7 @@ static void print_stdout_stderr() {
 static void print_pid_then_sleep() {
     fprintf(stdout, "%d\n", getpid());
     fflush(nullptr);
-    usleep(1000000 / .5);  //.5 secs
+    usleep(1000000 / 2);  //.5 secs
 }
 
 static void print_pgrp() { fprintf(stdout, "%d\n", getpgrp()); }

From 992c864f263dddb04fdb9fcf15b287d7a4eccdf5 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 09:03:34 +0100
Subject: [PATCH 1525/1732] Don't overwrite unrelated variables with
 for-loop-variables

for-loops that were not inside a function could overwrite global
and universal variables with the loop variable.  Avoid this by making
for-loop-variables local variables in their enclosing scope.

This means that if someone does:

    set a global
    for a in local; end
    echo $a

The local $a will shadow the global one (but not be visible in child
scopes). Which is surprising, but less dangerous than the previous
behavior.

The detection whether the loop is running inside a function was failing
inside command substitutions. Remove this special handling of functions
alltogether, it's not needed anymore.

Fixes #6480
---
 src/parse_execution.cpp | 31 ++++++++++++-------------------
 src/parse_execution.h   |  1 -
 tests/checks/for.fish   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 tests/checks/for.fish

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 638044cac..f53e8909d 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -376,15 +376,6 @@ eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_st
     return ret;
 }
 
-/// Return true if the current execution context is within a function block, else false.
-bool parse_execution_context_t::is_function_context() const {
-    const block_t *current = parser->block_at_index(0);
-    const block_t *parent = parser->block_at_index(1);
-    bool is_within_function_call =
-        (current && parent && current->type() == block_type_t::top && parent->is_function_call());
-    return is_within_function_call;
-}
-
 eval_result_t parse_execution_context_t::run_for_statement(
     tnode_t<grammar::for_header> header, tnode_t<grammar::job_list> block_contents) {
     // Get the variable name: `for var_name in ...`. We expand the variable name. It better result
@@ -404,17 +395,19 @@ eval_result_t parse_execution_context_t::run_for_statement(
         return ret;
     }
 
-    auto &vars = parser->vars();
-    auto var = vars.get(for_var_name, ENV_LOCAL);
-    if (!var && !is_function_context()) var = vars.get(for_var_name, ENV_DEFAULT);
-    if (!var || var->read_only()) {
-        int retval = parser->vars().set_empty(for_var_name, ENV_LOCAL | ENV_USER);
-        if (retval != ENV_OK) {
-            report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
-                         for_var_name.c_str());
-            return eval_result_t::error;
-        }
+    auto var = parser->vars().get(for_var_name, ENV_DEFAULT);
+    if (var && var->read_only()) {
+        report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
+                     for_var_name.c_str());
+        return eval_result_t::error;
     }
+    int retval;
+    if (var) {
+        retval = parser->vars().set(for_var_name, ENV_LOCAL | ENV_USER, var->as_list());
+    } else {
+        retval = parser->vars().set_empty(for_var_name, ENV_LOCAL | ENV_USER);
+    }
+    assert(retval == ENV_OK);
 
     if (!valid_var_name(for_var_name)) {
         report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 887c44d42..ea4be2f63 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -66,7 +66,6 @@ class parse_execution_context_t {
     wcstring get_source(const parse_node_t &node) const;
     tnode_t<grammar::plain_statement> infinite_recursive_statement_in_job_list(
         tnode_t<grammar::job_list> job_list, wcstring *out_func_name) const;
-    bool is_function_context() const;
 
     // Expand a command which may contain variables, producing an expand command and possibly
     // arguments. Prints an error message on error.
diff --git a/tests/checks/for.fish b/tests/checks/for.fish
new file mode 100644
index 000000000..590aefeb1
--- /dev/null
+++ b/tests/checks/for.fish
@@ -0,0 +1,34 @@
+# RUN: %fish %s
+
+# A for-loop-variable is a local variable in the enclosing scope.
+set -g i global
+# implicit set -l i $i
+for i in local
+end
+set -ql i && echo $i
+# CHECK: local
+
+# The loop variable is initialized with any previous value.
+set -g j global
+for j in
+end
+set -ql j && echo $j
+# CHECK: global
+
+# Loop variables exist only locally in the enclosing local scope.
+# They do not modify other local/global/universal variables.
+set -g k global
+begin
+    for k in local1
+        echo $k
+        # CHECK: local1
+        for k in local2
+        end
+        echo $k
+        # CHECK: local2
+    end
+    echo $k
+    # CHECK: local1
+end
+echo $k
+# CHECK: global

From d8e93a5956bd69fc84ffe79672d10ca580cebd81 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 09:38:54 +0100
Subject: [PATCH 1526/1732] fix sphinx warning

[ci skip]
---
 sphinx_doc_src/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index dd1eb5c2e..454dd2514 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -14,7 +14,7 @@ Since fish 3.1 you can set an environment variable for just one command using th
     begin; set -lx key value; echo $key; end
 
 How do I run a command every login? What's fish's equivalent to .bashrc or .profile?
-------------------------------------------------------------------------
+------------------------------------------------------------------------------------
 Edit the file ``~/.config/fish/config.fish``, creating it if it does not exist (Note the leading period).
 
 

From 0e707b88f0e82a92d3370b803a4a189662971655 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 14:37:04 +0100
Subject: [PATCH 1527/1732] argparse: fix error message for missing option
 argument

case #1 in #6483
---
 src/builtin_argparse.cpp   | 4 ++--
 tests/checks/argparse.fish | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index befb98722..1858242fa 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -550,7 +550,7 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
     wgetopter_t w;
     while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, &long_idx)) != -1) {
         if (opt == ':') {
-            builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1]);
+            streams.err.append_format(BUILTIN_ERR_MISSING, cmd, argv[w.woptind - 1]);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             // It's not a recognized flag. See if it's an implicit int flag.
@@ -611,7 +611,7 @@ static int argparse_parse_args(argparse_cmd_opts_t &opts, const wcstring_list_t
 
     // "+" means stop at nonopt, "-" means give nonoptions the option character code `1`, and don't
     // reorder.
-    wcstring short_options = opts.stop_nonopt ? L"+:" : L"-";
+    wcstring short_options = opts.stop_nonopt ? L"+:" : L"-:";
     std::vector<woption> long_options;
     populate_option_strings(opts, &short_options, &long_options);
 
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index 62352b7ae..ad628a51c 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -1,5 +1,8 @@
 #RUN: %fish %s
 ##########
+
+set -g LANG C
+
 # Start by verifying a bunch of error conditions.
 
 # No args is an error
@@ -300,3 +303,7 @@ begin
     # CHECK: argv
     # CHECK: saved_status 57
 end
+
+# #6483 - error messages for missing arguments
+argparse -n foo r/required= -- foo -r
+# CHECKERR: foo: Expected argument for option -r

From fdf398e435d4f37095dc22bae97f171e75d95ab7 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 14:59:26 +0100
Subject: [PATCH 1528/1732] show missing argument error only for last flag

closes #6483
---
 src/builtin.cpp            | 2 +-
 src/builtin_argparse.cpp   | 3 ++-
 src/builtin_string.cpp     | 3 ++-
 tests/checks/argparse.fish | 4 ++--
 tests/checks/string.fish   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index d27f4f8af..0a0057eb2 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -179,7 +179,7 @@ void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar
 /// Perform error reporting for encounter with missing argument.
 void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
                               const wchar_t *opt) {
-    streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt);
+    streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt + std::wcslen(opt) - 1);
     builtin_print_error_trailer(parser, streams.err, cmd);
 }
 
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 1858242fa..d93c0a090 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -550,7 +550,8 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
     wgetopter_t w;
     while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, &long_idx)) != -1) {
         if (opt == ':') {
-            streams.err.append_format(BUILTIN_ERR_MISSING, cmd, argv[w.woptind - 1]);
+            const wchar_t *arg = argv[w.woptind - 1];
+            streams.err.append_format(BUILTIN_ERR_MISSING, cmd, arg + std::wcslen(arg) - 1);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             // It's not a recognized flag. See if it's an implicit int flag.
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index ea73085a6..ca592e984 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -458,7 +458,8 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
             int retval = fn->second(argv, parser, streams, w, opts);
             if (retval != STATUS_CMD_OK) return retval;
         } else if (opt == ':') {
-            string_error(streams, BUILTIN_ERR_MISSING, cmd, argv[w.woptind - 1]);
+            const wchar_t *arg = argv[w.woptind - 1];
+            string_error(streams, BUILTIN_ERR_MISSING, cmd, arg + std::wcslen(arg) - 1);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             string_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index ad628a51c..e2f3f3a21 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -305,5 +305,5 @@ begin
 end
 
 # #6483 - error messages for missing arguments
-argparse -n foo r/required= -- foo -r
-# CHECKERR: foo: Expected argument for option -r
+argparse -n foo q r/required= -- foo -qr
+# CHECKERR: foo: Expected argument for option r
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index dc3eb6e84..11464baa9 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -330,7 +330,7 @@ echo "stdin" | string repeat -n1 "and arg"; and echo "exit 0"
 # CHECKERR: string repeat: Too many arguments
 
 string repeat -n; and echo "exit 0"
-# CHECKERR: string repeat: Expected argument for option -n
+# CHECKERR: string repeat: Expected argument for option n
 
 # FIXME: Also triggers usage
 # string repeat -l fakearg

From 75fa3b6baec324cfc6a3922aeb3013f02c4c6986 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 17:33:36 +0100
Subject: [PATCH 1529/1732] unbreak missing argument error on long option

---
 src/builtin.cpp            | 11 ++++++++---
 src/builtin.h              |  2 +-
 src/builtin_argparse.cpp   |  4 ++--
 src/builtin_string.cpp     |  4 ++--
 tests/checks/argparse.fish |  3 +++
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index 0a0057eb2..c41dc09d9 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -178,9 +178,14 @@ void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar
 
 /// Perform error reporting for encounter with missing argument.
 void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
-                              const wchar_t *opt) {
-    streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt + std::wcslen(opt) - 1);
-    builtin_print_error_trailer(parser, streams.err, cmd);
+                              const wchar_t *opt, bool print_hints) {
+    if (opt[0] == L'-' && opt[1] != L'-') {
+        opt += std::wcslen(opt) - 1;
+    }
+    streams.err.append_format(BUILTIN_ERR_MISSING, cmd, opt);
+    if (print_hints) {
+        builtin_print_error_trailer(parser, streams.err, cmd);
+    }
 }
 
 /// Print the backtrace and call for help that we use at the end of error messages.
diff --git a/src/builtin.h b/src/builtin.h
index d6774088c..2d37cbff1 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -96,7 +96,7 @@ void builtin_unknown_option(parser_t &parser, io_streams_t &streams, const wchar
                             const wchar_t *opt);
 
 void builtin_missing_argument(parser_t &parser, io_streams_t &streams, const wchar_t *cmd,
-                              const wchar_t *opt);
+                              const wchar_t *opt, bool print_hints = true);
 
 void builtin_print_error_trailer(parser_t &parser, output_stream_t &b, const wchar_t *cmd);
 
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index d93c0a090..3f3c1c43f 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -550,8 +550,8 @@ static int argparse_parse_flags(parser_t &parser, argparse_cmd_opts_t &opts,
     wgetopter_t w;
     while ((opt = w.wgetopt_long(argc, argv, short_options, long_options, &long_idx)) != -1) {
         if (opt == ':') {
-            const wchar_t *arg = argv[w.woptind - 1];
-            streams.err.append_format(BUILTIN_ERR_MISSING, cmd, arg + std::wcslen(arg) - 1);
+            builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1],
+                                     false /* print_hints */);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             // It's not a recognized flag. See if it's an implicit int flag.
diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index ca592e984..3bf7df9f2 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -458,8 +458,8 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
             int retval = fn->second(argv, parser, streams, w, opts);
             if (retval != STATUS_CMD_OK) return retval;
         } else if (opt == ':') {
-            const wchar_t *arg = argv[w.woptind - 1];
-            string_error(streams, BUILTIN_ERR_MISSING, cmd, arg + std::wcslen(arg) - 1);
+            streams.err.append(L"string ");  // clone of string_error
+            builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1], false /* print_hints */);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             string_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index e2f3f3a21..5c9ca8ec6 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -307,3 +307,6 @@ end
 # #6483 - error messages for missing arguments
 argparse -n foo q r/required= -- foo -qr
 # CHECKERR: foo: Expected argument for option r
+
+argparse r/required= -- foo --required
+# CHECKERR: argparse: Expected argument for option --required

From 9a355d54827c75bd43f33168b5ef54c579668989 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Wed, 8 Jan 2020 17:53:46 +0100
Subject: [PATCH 1530/1732] complete: replace confusing comment with test case

---
 src/complete.cpp           | 7 +------
 tests/checks/complete.fish | 8 ++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 128e591b0..d496dc689 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -665,12 +665,7 @@ static wcstring complete_function_desc(const wcstring &fn) {
     bool has_description = function_get_desc(fn, result);
     if (!has_description) {
         function_get_definition(fn, result);
-        // Consider complete -a '(complete -C "prefix")':
-        // If some functions whose name starts with prefix and whose
-        // definition includes a line that starts with prefix, this line
-        // would be suggested as completion.
-        // Replace newlines by spaces to avoid these excess lines.
-        // The completion description will be shown in one line regardless.
+        // A completion description is a single line.
         for (wchar_t &c : result) {
             if (c == L'\n') c = L' ';
         }
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 2f4469626..2e6a953f2 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -153,3 +153,11 @@ complete -C'function : --arg'
 
 complete -C'echo > /' | string length -q && echo ok
 # CHECK: ok
+
+function some_function
+     echo line1
+     echo line2
+end
+complete -c complete_test_function_desc -xa '(complete -Csome_function)'
+complete -C'complete_test_function_desc ' | count
+# CHECK: 1

From eb7172458b628b81a3f70f38a0e58c7c23202f05 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 8 Jan 2020 19:49:14 +0100
Subject: [PATCH 1531/1732] Add .desktop file and logo for appimage

The logo is actually extracted from the site, but since it's just for
the appimage (I don't even know where it shows it, tbh) it's okay for
now.

Progress towards #6475.

[ci skip]
---
 fish.desktop |  12 ++++++++++++
 fish.png     | Bin 0 -> 8431 bytes
 2 files changed, 12 insertions(+)
 create mode 100644 fish.desktop
 create mode 100644 fish.png

diff --git a/fish.desktop b/fish.desktop
new file mode 100644
index 000000000..62a8cc6e0
--- /dev/null
+++ b/fish.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=true
+# This file is for use in appimages, which rewrite the path.
+# Other uses would have to replace these with the correct path.
+Exec=fish
+Name=fish
+Icon=fish
+# "Shell" would be the proper category, but it's reserved so we can't use it.
+Categories=ConsoleOnly;System;
diff --git a/fish.png b/fish.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bfcd3ad2c90e587bb383011112d714b8188bf9f
GIT binary patch
literal 8431
zcmV<LAQ0b)P)<h;3K|Lk000e1NJLTq009#K009#S0{{R3B6kvs0002JP)t-sOlffd
z00000000000RaIM6B92lF9!z)0s;a+KtNepS$}_jgM)*KiHVJkjdyo<aBy&GX=zbW
zQAS2aoSdAgsj0BAu(r0gyu7@>zrVu5!lR_4FfcJ39Ue<dOAQSTEGsKHIXOc^Ll6)U
zCMPH~H8qoylRZ5>J3BjtE-|1kGiWX_Ju@y(FfY?DHMKA`Y*jE+L@=UkGsuB8xOp|h
zGB$)|G47N$&95)>&@il)FxiVZl7ce9tToxbG#8AOFaQ7mCUjCxQveAUEkTdYYFPjO
z|NsC0|NsBy|NsC0|NsC0|Nr^_w*UYC_W%BNpe!N)03W+aL_t(|0qoTQ0RR990wDc=
zx*rB7$e=a=00000000000I;S30Pz64cg&TCa)meyMHhIT>QF*`ZPWh$3s>T@Xt2_O
znH&jOlxb&V^Cgb!y50nr=vVaL!=Xf>_y+%=@PdZ>zwt|PHrw3_Y<sZ&kUa`roD>8V
z;c)PrRh8_ICqD?oFbX4r3Ng9s-^mBm;}O0Jh7OMdJmN0!gCL*>eewCu=imn@e(V$R
zxKIiS7sE|Ly+KJ515OXy&5BMAX`JPXA}`+Mk>g#;PpGPrVxZ<=u#7$4Oej$(xs<dF
z6q$KAtfs`>nI>;2b4txeYLppq!=b1q)bn}t)2+AGm>i>~Cns2qP*6$$49eIDB_)Co
zD-}X%!LZDsG;Ozv70211vIam1s#p;n0(>Af@WPh>FP4;<UZS%(b(e#)ypydFBYIAT
z3o!}-FjA;}LrXcN_yCJ;pXO`=|8%|V-G!aFZ~`zV6qc3u=LA;tkidza6OIWrVulmn
z4+3-Rw(g>1;$9Ll^4>{XKny0uHUl{Tl$->1k4y?syJrqLJ7Fuy{ok#(pc7A=yt{)~
zi0GIcwWu;H`mlY}b3)xRg90ZYh|k?+v)I=0E~c5lN^niJU{VBVdCy9T3L_fzQ?6z?
z0fB#dTIRTQ*h!*|2zo*QWN7q3g4;z;6XgU}%yYMQ7n_r85JKHc_QGU+U>O;{%libP
zu&~k6>>VYp%DSv!>9<aBusm<)JF({^e)t0z3Q8<k#|SI!L<r1fz7jc4vc8;-cMeL#
zKuVdOZBlxcj@(C%;FWk|ZvXRqd*%e~b1PiiYtIvhMb}?LT$?YPIL;z_2R`8BZjl0D
zDM1C`uEanM$+7GRt;JO_5%jXU6YQNV(@q3!MMx<TpJ*ARsF?vWGopp#eJ$6ooVbuO
zd+%g~cJd7?kiuvy+KDK^sE8Nx@NCZt7cHe*-3jI-YdEx%uXm83t%w#f@hnWV2rUP=
za#2>kIVYaGgcFmIlK+@F7bUlCqzhN>VXjX3-+L<yXbBS_0TGZyNTb{PKi1!;Aj*PG
zL}olQyN96$9%!bDUru)eO=?)z99z)c<z`sMz?n`g6=d2wb=E4GM^M=;Br=tmi~^Hq
ziX8yKIWj3yxs8D$$M8X7NkpKgGp4)AnHEqUQ7L)lReb^?WhSF4=bXmLg9`uPGYx<&
zQ+jX1k~Cf*t9C0#N*2=XBd@%?Pevwy0xXZ2w0++joIGf=LD#@4cV4LszN>xEGWb9`
z1iRjBwm}T0W+u>my8T42Jo3rnd1B{HTDRkP_rn957?$I+!=Sq#IK6zEg;Ry^y13f~
zy?;80xI0?EUaxK4Cnk`bpaLZMaxSCte;@Qua=lqRpHHC2u~SuLpE$M5YjR}<_KEf0
zDjx#{@8Ofp=#!?rUb%+?uatfAvP^(vl1YW7#VDyr)FKxlPw;=T;e2|xeAN;&EF~3A
z3`Jcdp9rP(#M&0e9hEySI9|&qU)(VPl6Ut^a9vtDb1$ntl9ZYyJM*C&=5X!fstqAR
zWQ-uGGbn`>znV(6?;bPxOekYM8Pn|V)m@3{I>T!3<#3Tn)q8Q&EKT3uY3SR&lTAh#
zXqbStq?}2=D97?}y+Wf;im~(Sf4+xLo{0&R`J`#vZdeUnO?Q&IDlA==&Hd%HrY6<k
z`<Mk1JsN>nwl_4=9icp~K@VdGOltHXpDoAc`J{4#L+sadw;b0^Rb28T^^B7I!=$V0
zw*lB64u@0RZr5?W-9|ElRX4|#YtV#O-aYV%QsVQdd{OjCrA;dYm?)ivNogOH|3kKh
zV3TFspO@9)ath2O#_f8|^?2*+Ze@{_nc|EH5}(9GOC`|7e=eWAyX6zugov4t1c;(?
zD7Q^e)eTOA3Hu}H(;@ovd4Iy1Ep9iPSa*XZ-IRCD3dhuXMLo(VZ0gUW0w&+y`($KN
zHKr$09W&8oB;`)R+om_F!7oC@X{mGw!CL1WPAl40C|yBCuiObxKADM@Bb8_I37Ayl
z>dc{JI;+5B1ckHW$(%_>=4KS*Iu>7SDmYm~&GsEBOk`9ZtXDo_@~;w;k;<2U3dzSz
zSh)PgI@C+aSelVjh>i4KYd&)-&Q*7IxkAxgkcYObs%!PR>q1Irh!B&1Ohrw2<<oqU
zsF3>Zi$Cv^cXv!6X5xn4Dg0l)tuvbKmg3XXf#NY_P%6{kmLfMQZ<lB$x!&lJ781AC
z4X(Kw3}W(e-!|Vfs~JoZm2bZXmHGLEnJ|rvNd+cd4SQ?TD_H?a*m<$v$ERR-o|=0m
z{9eX~uo~@>pm0%UTvgf|GU<4V(MLY1?MaTQ>!!yw=n<2jeqDgc9hKRIdCajOQeuJu
zatfF@x}5A&s5k38^J>$Q>w9AmD5JoEK@6Q-V(d?+<zc@+$Ia##1=nI#O*U?!vR8`v
zWYmJRyqBJxR=!9~K!cA-CY3TRAvC~5><<A<)<WJh;Ws;H+QG<XWHOqiGOdJBs?*ax
zoX)&R*>1P729xH|oe!Nuna^ZQE8jn}Pb$q9i~(Y2aeBJ!1;<X#q*84wh^&(ENe+d7
zPs%7E$ap%PLR_zX-S$H9dnc$ouu36z%1l57R+*bm-lZdFf*h+cQpP9@<aR4;JlTam
zTFR3wxRFw6H}p1BlYV-MO}4tOMad3^U>|7GD$rzJk+YdV>f5ho#SWN^KKbQ66WtkR
z0v6gjiLW}uv}gC8RFjxoU!8SUIfv~~4u!2yb!bGH3Ke}^v^rzetsWJ;Qn*Vtp9!SY
zSF@SGBYfPLz#c?hD>X_FURhElFD64kRoekW)f-aXfa<eM%65hw)Vt)1bm4uc?o!W;
z8>;eOGxJH3R^QB8vw;cz%kl|G$W(Hw3Pi4pu52&Zbc2&9N!aE(voe%6yWo_sN~G)!
z*B@NH_kJncmJ*Y)SEjL4^O+?5`-|DJlc<b7fv~zrB?rnD61Ozc8=hw-*efcx>Ou@5
zL>~hDa=ThU1-|Aj<A|62<wOjT5oPz8ALNw@Cja+#29s~O*EEAkLXzc^B#DxvC%Xir
zO-NQ(Cd5qEo8vKVj=L!DlkLb)`KPCdMhey^c~3j1l4BX$*`MbVg`VUrCio9$&ZJRo
zGRh>DszDmjS0>JwRVM^?zcyGf$*JgWu#NY@@6Y=vu08<}nB@_b_fQ@&sl_xCExrPi
zPu}l<1`hb7$(YErHkpP}C7XbW>4oiwRtO?etoPfWTLe|MH>tNlf>hs<29puT!wAyQ
zXE2fC>lsYo69`@bliVns!v*HK6~Yd$>lADPCLL(hf`ME+^&j?E5NVx)eUQ9e>r@4s
zjCbKb6-&nCFSC4t=JlM|fnb!6m}q5<)4J>Qhg2$OENXIUKq18%el;fR*55$^i>~AM
z8>8`yE7$}?9z6t>LCJkGm&q6Nn7}2OPev%PyfTB6Ih0Dbt-AKCv3Dlb^(#YW)guAj
zlsSdp#y`=mx(43@j06RSd0c}Mlt1kg`fd)BH(-*u{PH$uf|SC!G2MH}Cy;4IOWbO4
zE!tj$p!G8FTf$P0R2agwr=aa%6g+aLj}uF2cc?R;Ow?lWJWNuKO-yp1Kw2>m>Uyj0
zr;;_Umt5Uyab34<I373geA%B*m&^Vn@1fv_B=~Aj$e@hJg9y@Z^VoSoCS&yEJ{i+&
z52JKhOf=Qdjhmjt#C9AM&h@PgJ_hek{1Q*$qn^UJ{{xCl3CN?u{PscYh`Pk&o7qf~
zCYV%g_Kpa)koqQNdNJPRfN2JH$*LFa3h_gNMyY)NtV|0#VOKrzv>?t0tGLAEA4Q-1
zL?tF_9+NDeOc})x*|u}tdpXnHg^tFpQ0GK#ovj5{A*0}=%qXn|U67i7h7w2am82V!
zzktR|GZ}L%p#02C5|ykTE9VqD<xZ_7WZ3j{g_8_PSm&&8&gFF{SEVI>mvj}NOi@WZ
z%6TR8$=i8MzWh`sU*E?Lm_Qj5hGLLXG9@HX)3&PRxal}<M8EoQGmvA!Z<CsRB>^R)
zlA$R^&=NiYmDxV|H<--#37Cw^pddG@Oj3_XFlXCd2-F=O)aj`csdZ|+FrthKEA<$_
zq~w)iUP0`DNMT?6lbX-uagLpWqLCX@nizGPmZlXXOfTwdEq0r2^y_1c@p3rD!=C%~
z%|{`W?wppNSjRC%1x$dXlurswpl@d~`6c&BQq^R8L6Xg#?t9t75;L*PL<nXQ*Bg&V
z2>j`A_NUYN#E$upN!QzClmeAv4PqwvIMjS5Y95m;b~3#;O4|y=%SV!?Co;pTbwj^$
zZND;gE%Jwp(mEznWBV={WtvLnlZ?vme+83r?8rsYCtuBC@(UjmOrWtIyWZJJ^&OEj
z#){6k+L_J@WSdN|Nv?`frh;6elCc?e#{^j5lNV!xOft;`N=9*}pHhqDEAJj*ML|j`
zmt;hbv$`3hr|cB~$*BCmOj!IfU5oWIF#!>r1ttxcRO{eat#KcS8K`(-FzDOUT|p`m
zfjC9^HK3HK<eh|^2{i4KrpQFijh#dVOs1vc7MVeGy{Pf^daxLR^p`-=8Lm5N1CaVZ
zO*+xVpHQ<rdZd(jR5B)0`J{R-CJ73^{8V6~!_n7Rp-|u5KlFEf09Kw4q!jx0YxM17
z2p)qI58^5K<)l;OdQ0ODu}CHBuY3*@t<~3ab1ZzqOqL~^Y?33eq9s@%p-Okd8s#r`
z?AveRc5}qJJ)QR#F2|R1&{I&Fa11cYV=4(s(#V9xu`|ObbD03iFMKi+J!uoWVVl4b
z5_JXxWEt%*Ug?SlbUwKju~S=yV}m7u69WoXO){y}I(uZ}Ar&0UjLC#gmPIClnSAld
z`yJrGQDh?H(WZK$VHB0pD1ZAYkh~hjwSyV^_UXJ0<a9>SFiL^R<eoYC<R6(&UWmz?
zUsx%ACYflhyr=Z=yp|TNX}AQaPJ)yMDI0Aq&?eA#;)$!HCYe++hTK9AsPG9U<6k_O
z%qMRb&2#xAL78NNqDhP-oV1k9!Pm}!4rapI+S5`>ABpTKS*e=R6cRvDG3tEs0hOG|
z?=zT4@%?<Cl$faP7A8^Q5=pAVSvYj3S&V7t#Q8)NFU(^fk%cpZl|3>-*>0?^=6s$R
zOcE6M<jqSlNj@pXj;?mTCTk_dGZDonTbowcwr^X@Olp)IyN`mWEd_6_#_draXzc^X
z&O;`$%mkWX0+nLt_j2saX97(zk+^WX*+sG!FUUWI8k=Op5}4wWQ&Zd%rfG|w{qcC@
zzWwEVxLht#B`9Skf>4ihC^?rhliy#S$-4rRP}>*-iPKpK&pr`sk$xC@_=LZ+hf%!X
zX$sDJ=Wb72_!yW8RA%BrZj`cDawdN-_~bwO8JQIFiB{V+R`aCbg!-`OAsfY7VQVm9
z9w#9pg9$vHKJGT2ByJtb0+aP_x3y}rpFK?_F@fNdH!s8lId;^@Brn8UA_Y;5bjBKA
znXbmgg9%YQ5!pi!JS~uo?}dC)hEg@ySbA23#yvop3Yh$T)IZ-X-@LF-pdTlEB5fq}
z+N+?5Y_zynp%Nr_^ujA<6L=;~2Q~HKxDu91E3#WoK>N#nk3B#stw0|#K|YzmguZ*W
z9IMrOBd~Z4M^6fYgnbV-RZNSSoFh?WC+SV#>CGAo+oC3%qNTR1y(deQesxp!O3vi%
z3o-fXkA0%0KE@ii0%^TPpzN>*Obb-yceX|*VO*FdMgEB0%^zusic;cms0AJ=_BeG_
z3Zd6w0-yZ+bCF4^J6MvCI|d@Zb6^5Ba8Qj34P0qDU>Zi5;}yoD!X<G2-XG$AzmL?E
zVrY5C<R4S9^TVq#A#~>juAG?&bz^cALd3Hmdkj3i7FQ;KGLs6iQBF4|#kFnD<n4<x
z`MJ!*a_kVnDB<X8?2vCv00<R2;R+1KV;XgJu2;~j^D+7mu@suB;IHiysE|)Ip`S#q
zcO=$PY#5N#Bd$#pM5hDu*aV_9Z5>PMd0wd+bvV^5!6${Qmf4c!^L_H=^Dsdz_Essf
z*77MlcE9743W2oZnQ@xD6$T%9v$C0Gm1-%q)e0?cB<icym9GAf$(t8t0!=f~3Xwz9
z4VJ%%`^~S$>LQSc>trOdy{X4;zSP%0{8F~e9g=fk!=04!=b-fd<XqgaQMO)Y@Ny>a
zUYrS_{8;5o5)`T2;DlSbzD<q!I}@P<Ba;xdh8SKi2y$KL`0Si#Y5mA8RdYTNaY_LX
zqPVYXPTMu7sSnd_#$@?&Onx3U<r6^B)V8%9%+S?zj|5IZW+iNiZXeQCQdw*f5kzKl
zJZ?FV9za2gwL}N-NL$Lfjwx-cW|9en{mu*~-^^!H@(G~8D0SQSu4bF$bF^O9A{;G@
zA`%m=ZQHh{<CkvDqCZ~7r4)NU2})b+DCo3jyjTckMj4s>E%V7sGx>Fr2|}bbwORFx
z+u9^IieRH4;fQXPYVms}+wGbjEm@XTrLMgxLT?K7oyMqC)jXfbXJ&%fDH+Auwo7$5
zlO*u)M@Q6~nqv$Aq!RU=h}6f*Q?It?F>ubz<8)40ie0E+l-wtLlzj3Vn7oEhuqElN
z5VxX}8^sfmw?xhf;{=#!spuvf*Ha1#&3}NwneGi(Z__S2c%>*f4Dwqc<+_vficGXr
z5Q@%3t?mp7*YX!IQ8N7iEA5_jWUYsFOd5vt)klRp^HN40EKdwVAI?$4{lT7?vWlCv
zU1P7kj<Wj5CveJtm&tgIT2Fguu#`%5+k;6ihDNpMyG30KA<)fT@SsMjP@HU3L<zn`
zQaWDt!XKV2M~;$yv$H%cRXkc*6>{thCbMhtPYDW`l%PO`3~YOYc0z9!s5^3knxd{p
z=&@)pH3ozniaa!C5+%i9&#a!T#d8Yecc^E$V-l#jV>12?XZYmhn1D#mWR|qTBN!;v
zi&Tpzurap|-KYc*0~9QxZ4{JBju*sCYA{(G4uY5o)!RtQ?fh7f!30E-QC{6AGo*3B
zDAl4aFafvpbb6yL`vh;%iN_H<B3ceM`u#pc+(8PL;QgAJU^;xr1bPjh{Pa0Yv@(Nm
zt9DUiZ7-+q!=qP+R&M&6b-3}4z_A-FNnn(VKRrEpe|b8P5Ql@`?bbDc8|Race8Mj;
z>k|M06)>4kBpJmx;cQK9$4p8AX1cC34*N-&%5MxLLKI|AJcv;QyQnP>iNZ-ZS7Q)q
z?Q4Y}0Fo;A$!{~5i0@}I!7<+_SrUbm<+HfNarltFA;MeIQ@74~Z?PUxfd`J6F$tdb
z-qp?r!nAOmBWJE3DI0wPqfGTro{tF&M#+3K4@&+tR{@H(1R|21bbTs49Cwj32@258
zo7JlC2FHLlyKNnJJBw*fR0E!YQh+l01XwtBKK99*0u!yi{dy)70Lf!#p7foXl9-rM
zfR>P`)c9VDOC(fWzc46YEkm=LZ7uxH3U`dPFoO_%Z{^5@d9awt@1M*>EA>4;<2Q>5
zG&gn%Y#!JNZvc`?qbVckxL%;kO^L~(b}$NUwu?IKs3vAoGn2YqSr`ROMw=kVej*c1
z-+uS?3?}O86F~X3c@+T(o=O)sIA(%fa7avQf!<VLpIFO2adsDlHDEGW(j$|k$y)sD
zBojvR{nxX6^3y2z<kgr|Ls#454tI}EXU7AF*dg?$HoKkYbh5#;<1EwGqHjgU1V;H~
z`AJOhho*o8&&STnCpf_5HHb7gb=P7$9YZZBoC5|TJ(b;dA^O_-XzRe=wOuC=Q9?Bz
z`s9<C;IB-5|9#OWh1hv*pCoC;2*?US*5Z|T;7Fo8*_uHK>=@Iw5%pM*tmei}j$|&A
zSM<p!Y<$QKD<jssjqn^U!n9Zfvr`PZ-8|nr)0@@~9s6X0Nj1epeV9rZ$=8USgk-i)
z-n=H0Zso{!gQ?wiM>g(!%}kW$88cXF2hq1fXZp4mtB%K?>J#-*DglzwC9`tutNR3d
zBtd9cF5*tqj_XdB{#vNUmXc904#!MdF?5S|xUa=YzZ89v$IXajHj`KPi9+R_WP+*M
zfXVQl$;uK>WlSFWgj7l;Ba-<{etvBxgRp(O>f-jevD?iqBqj|uLPOWBcnTkyGCXjL
zz85zpBbMp9qq4Y}fu!V<=JkXN7lv&Tw%Z`q+bC+oOk{Ii_M6r$9Ghfe+HT=ErKsE|
zWhQytAiDy|d?rb+$waHJL!o^yabqH_!vxM+;BZC|X21kT$|n=|i+^3vSZ~Huk|CMT
z<k#jEB^435)*2&PXKcq`Or4nUTqcQASEEmWrIcgAWPaR~Yw>IPBy9;*-`0IARtBHL
zMeM*0fHLl|(+mE|-yeNa&av=GId1;<nE;AINomDkP+_iJ|B5yFFll1K8hx^y^ocIT
z&Hp|VNW0a@L}W}#YJLL|0GVO}ElACbn*x&`|7%R(lisYlmFe5WME@a_--<pNnbc`f
zk|UYV<j0Z9t2049aXokZ&1!JypL~)}SkvoRFo8*C#Z7?;>-CvH%C)w(uC8nM|J2=U
zbDB&T#_?$*;SdsKZ2G2x%3_l5{|TS{vvSQnk!>agmFL=%nioxfE(>@FhfeP{|HUM%
zC$y1$F{vYmuHQGI-ou3Vl1<F#7XCg@*m@%KB(eLO2_^)S>gFcLPYEO>YJv!f%#&2x
z%~X@S%o9+2Vy|#VOti{A=c6XtZl;<Lj$@A>{j<fuXGf?M>Xl+me2K@JkjQ=~6Ujsq
zT|T?`YZ_`Z+-`gd8a1BCpN>-6c1z(#h%TY*6FNQKt~F1hCL)=~B$nq;FY-ct`F7rX
zUa04eM|6)d3?q4a{jH3yv1O;XKqr|znS8Q{YkbQ2KWXzTl*{}v*H({Ro}T>nH5%3v
zt+D#$tE1!V=5w1ojm;5?I6^fUo?cWWBA0#yXN*QN3Nn|Gg>Gq$H6kaMWDm2OjEab(
zjLj6WPz?(WkD;?96kNvU3q|n`ba+Ta`(h)qb4i-5W;Y?FCW}-UDDn`BOempKBojPF
zSbT+MY@!H72_S~$x!st(!vT?O9+O8*lyYoQp#_pMs$!N$tHGcWTUvbj?v=_&p?;bw
zh|pxR9)9WKP$L2fOYCHmB05imV%HSqWpt_#sR(9l^U($r*?j0k5}HK%thej4NQa1C
zMVf5#@YsAYPc&D2N}A@$2udF-qEVZVIA}(NrU0NtMJhpr8>DK2NR5ak`7zZb`9RyU
zMAsCF1dp+WmU=l+C~^rXf}vUtyZO+pidGf!rzv`oy%o`k&LorUu`wuRZ1)q{dY;8W
zCl*?4qKs}mQjrTHR7HCqs?WOJteZh(HHU~yR_SA28I|bKig=>OZ^DV~d#Kh!!^km;
zI7C8}*Rp9O0th0IOb#YlvOk^j?bcVHhC(eGGK>Y4t|(|<r>cCV<K|d4=WavUY}S=;
zA;b7Y@$rKnONtLu**{R6I_KsUkqIbilI)4%PR&TRw7!#G--Wb1MC-ej2ini4d3I<o
z2cO7KwxQc~$Nb2j>fN0V-Klw;T|^ttD$BAo^;M~>;TiI=&)50hxf0#b9ooFn?CJ92
z9OhW@IJ<}@3Me5d)fcyU`YL5uZ5V0X&>dQc9{p~#o~`{R#n`9ALMit1ipT_%hZQVC
z^>OQ`MWpH%FyB>AWPM>`_cb%45cXzNeClPGG)39(k>1ut(VNtmC{3c*qUT0I1s7k>
z$?8Rr6qVm86F*d-Y-&rgX%dmlj)IEKL)Mjxm?m$KoWp@-Wlf4!9~Zxp3XSwW>247w
z#YQHtzr0CV$z)S(Pf4ba0bhy5Zc0hM2$OYF{W>4dzOkT`g-qI0lEz;bnB4}GW)UXk
zx@ZbNJ)Sm2Q*poPg2?u?w=W-EJ(%o^$f;l?SDY#p=Mv{#ak=dz(v#fOq$XW=AiRq^
zT+Xf4Wpi{qscgtvv8GdG&5z2wlgLd;FyRd7bN0^FT}`F+ahIuwbfG8E23HTum9VYr
zh^$aAY>su)i=-1iUozpe&?mL=Ca2bCJD%Z^Dd%^6?G=Z2<UqO*xe3yZN4}`S>fC<%
zizQP|3vJTG)p`4`*?y6hGIEtS@49n!Vq)gVtw?0zQO*gcK#4oF_esu+t><_TKyED}
z6wlHZlCj;~Eju<C<qjgm9_mAqICpICn2*}4Fk{KhMT8<1Kc;S%xAzUJiq|0b5zz?{
z#V2vw_TI@mm;J=!J1-yoyoyYZles#-yUNz3KRgKe&aZ#91vhoByZ_dc3FO{kVPU`H
z>fOg(SJ~uY5hB_zbEsc)Xn%ZfZyc_Vy>o7#=w*S$m~bS!-#c7(H-vdV9%_e(zD2%-
z=)Df!{z<$`?U3OM&{y7EPP>kOtKM@&zc3R}P$6k57{a&3`!n4clY5L4vjYx1QhlWW
zlLetj1s9Td8rjq}I;W3+^vT=z{M}3JIAeCwfCCTnxsv6eNX5E{#@m3S)ChqzTob`l
z`I3L+zCZdBzTbDmfNww6PT7-yArGDOEr~>j`VY8}Of*(UJ`mOJiwJNZAV_LYfaS3=
z2lUHQfdv=A1Q+3?ktC4_KmmdpqBA}~jL0%sfFY|(8v$tsaf|M<5dB2)79K+!0$HGl
zSma`4DB}5k1R;x+H1Jrkh+yoDkquc%=zDqS+aMu~<$D+sy_E`$aKxkZM58ry3J^hJ
z;0PGOWBDkuq1lB03`Ih8(dg%LU}7k;_`fDRtDlTuiU$CiW$3&A+KmGg009sNfQ|nD
z=NJeD^?~G0-CQEi?2P{1d{27Kk%{fnoq8Vt%K!iXkm(y|j^6+P00000051Hz5CSlx
RJud(N002ovPDHLkV1np9=?wq?

literal 0
HcmV?d00001


From 19a320caa845fb0a3e57a1f03ae7e399be445985 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <gladhorn@kde.org>
Date: Thu, 9 Jan 2020 16:18:26 +0100
Subject: [PATCH 1532/1732] Clarify how to redirect stderr into stdout in
 tutorial

---
 sphinx_doc_src/tutorial.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sphinx_doc_src/tutorial.rst b/sphinx_doc_src/tutorial.rst
index 72f387aac..8e3e6227f 100644
--- a/sphinx_doc_src/tutorial.rst
+++ b/sphinx_doc_src/tutorial.rst
@@ -148,6 +148,10 @@ stdin and stdout can be redirected via the familiar `<` and `<`. stderr is redir
     > grep fish < /etc/shells > ~/output.txt 2> ~/errors.txt
 
 
+To redirect stdout and stderr into one file, you need to first redirect stdout, and then stderr into stdout::
+
+    > make > make_output.txt 2>&1
+
 
 Autosuggestions
 ---------------

From 0acaf766a2a984f3507ee75f57420e1ad0bcba67 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Fri, 10 Jan 2020 17:12:12 +0100
Subject: [PATCH 1533/1732] Update Keybase completions (#6479)

* Update Keybase completions

* Apply suggested change for filtering options
---
 CHANGELOG.md                   |   2 +-
 share/completions/keybase.fish | 182 ++++++++++++++++++++++++---------
 2 files changed, 133 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9f047ab5..ebce1b3fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,7 +114,7 @@
   - `irb` (#6260)
   - `iw` (#6232)
   - `kak`
-  - `keybase`
+  - `keybase` (#6410)
   - `lz4`, `lz4c` and `lz4cat` (#6364)
   - `mariner` (#5718)
   - `nethack` (#6240)
diff --git a/share/completions/keybase.fish b/share/completions/keybase.fish
index d2059ae15..4fa7660df 100644
--- a/share/completions/keybase.fish
+++ b/share/completions/keybase.fish
@@ -1,70 +1,152 @@
-#Keybase 5.0.0
+#Keybase 5.1.1
 
-function __fish_keybase_commandline_ends_with
-    set -l line (commandline -poc)
+function __fish_keybase_line_ends_with
+    set -l line (commandline -poc | string match -v -r '^-')
     for i in (seq -1 -1 -(count $argv))
         if test "$line[$i]" != "$argv[$i]"; return 1; end
     end
 end
 
 #variables
-set -l ends __fish_keybase_commandline_ends_with
+set -l ends __fish_keybase_line_ends_with
 set -l seen __fish_seen_subcommand_from
-#L0
-set -l c_keybase account blocks bot chat ctl currency decrypt deprovision device encrypt follow fs git h help id list-followers list-following log login logout oneshot paperkey passphrase pgp ping prove rekey selfprovision service sign signup sigs status team track unfollow untrack update verify version wallet
 #L1
-set -l c_keybase_account delete email h help lockdown recover-username upload-avatar
-set -l c_keybase_blocks h help list-users
-set -l c_keybase_bot h help signup token
-set -l c_keybase_chat add-to-channel api api-listen create-channel delete-channel delete-history download h help hide join-channel leave-channel list list-channels list-members list-unread ls lsur min-writer-role mute notification-settings read readd-member rename-channel report retention-policy search search-regexp send upload
-set -l c_keybase_ctl app-exit autostart h help init log-rotate redirector reload restart start stop watchdog watchdog2
-set -l c_keybase_currency add h help
-set -l c_keybase_device add h help list remove
-set -l c_keybase_fs clear-conflicts cp debug finish-resolving-conflicts get-status h help history kill ln ls mkdir mv ps quota read recover reset rm set-debug-level stat sync uploads write			
-set -l c_keybase_git create delete gc h help list settings
-set -l c_keybase_help advanced gpg keyring tor
-set -l c_keybase_log h help send
-set -l c_keybase_passphrase change check h help recover remember set
-set -l c_keybase_pgp decrypt drop encrypt export gen h help import list pull pull-private purge push-private select sign update verify
-set -l c_keybase_rekey h help paper status
-set -l c_keybase_sigs h help list revoke
-set -l c_keybase_team accept-invite add-member add-members-bulk api create delete edit-member h help ignore-request leave list-members list-memberships list-requests remove-member rename request-access settings show-tree
-set -l c_keybase_update check check-in-use notify
-set -l c_keybase_wallet accounts add-trustline api asset-search balances cancel cancel-request change-trustline-limit delete-trustline detail details export get-inflation get-started h help history import list lookup merge popular-assets reclaim rename request send send-path-payment set-currency set-inflation set-primary sign
+set -l keybase account blocks bot chat ctl currency decrypt deprovision device encrypt follow fs git h help id list-followers list-following log login logout oneshot paperkey passphrase pgp ping prove rekey selfprovision service sign signup sigs status team track unfollow untrack update verify version wallet
 #L2
-set -l c_keybase_fs_sync disable enable h help show
+set -l keybase_account delete email h help lockdown recover-username upload-avatar
+set -l keybase_blocks h help list-users
+set -l keybase_bot h help signup token
+set -l keybase_chat add-to-channel api api-listen create-channel delete-channel delete-history download h help hide join-channel leave-channel list list-channels list-members list-unread ls lsur min-writer-role mute notification-settings read readd-member rename-channel report retention-policy search search-regexp send upload
+set -l keybase_ctl app-exit autostart h help init log-rotate redirector reload restart start stop watchdog watchdog2
+set -l keybase_currency add h help
+set -l keybase_device add h help list remove
+set -l keybase_fs clear-conflicts cp debug finish-resolving-conflicts get-status h help history kill ln ls mkdir mv ps quota read recover reset rm set-debug-level stat sync uploads write
+set -l keybase_git create delete gc h help list settings
+set -l keybase_help advanced gpg keyring tor
+set -l keybase_log h help send
+set -l keybase_passphrase change check h help recover remember set
+set -l keybase_pgp decrypt drop encrypt export gen h help import list pull pull-private purge push-private select sign update verify
+set -l keybase_rekey h help paper status
+set -l keybase_sigs h help list revoke
+set -l keybase_team accept-invite add-member add-members-bulk api create delete edit-member h help ignore-request leave list-members list-memberships list-requests remove-member rename request-access settings show-tree
+set -l keybase_update check check-in-use notify
+set -l keybase_wallet accounts add-trustline api asset-search balances cancel cancel-request change-trustline-limit delete-trustline detail details export get-inflation get-started h help history import list lookup merge popular-assets reclaim rename request send send-path-payment set-currency set-inflation set-primary sign
+#L3
+set -l keybase_account_email add delete edit h help list send-verification-email set-primary set-visibility
+set -l keybase_fs_debug deobfuscate dump h help obfuscate
+set -l keybase_fs_sync disable enable h help show
 #...
 
 #global options
-complete -c keybase -f -n "not $seen $c_keybase" -s h -l help -d "Show help"
-#...
+complete -c keybase -f -n "$ends keybase" -l api-dump-unsafe
+complete -c keybase -f -n "$ends keybase" -l api-timeout
+complete -c keybase -f -n "$ends keybase" -l api-uri-path-prefix
+complete -c keybase -f -n "$ends keybase" -l app-start-mode
+complete -c keybase -f -n "$ends keybase" -l auto-fork
+complete -c keybase -f -n "$ends keybase" -l bg-identifier-disabled
+complete -c keybase -f -n "$ends keybase" -l chat-db
+complete -c keybase -f -n "$ends keybase" -l code-signing-kids
+complete -c keybase -f -n "$ends keybase" -l config-file
+complete -c keybase -f -n "$ends keybase" -s c -d "--config-file"
+complete -c keybase -f -n "$ends keybase" -l db
+complete -c keybase -f -n "$ends keybase" -l debug
+complete -c keybase -f -n "$ends keybase" -s d -d "--debug"
+complete -c keybase -f -n "$ends keybase" -l debug-journeycard
+complete -c keybase -f -n "$ends keybase" -l disable-bg-conv-loader
+complete -c keybase -f -n "$ends keybase" -l disable-cert-pinning
+complete -c keybase -f -n "$ends keybase" -l disable-merkle-auditor
+complete -c keybase -f -n "$ends keybase" -l disable-search-indexer
+complete -c keybase -f -n "$ends keybase" -l disable-team-auditor
+complete -c keybase -f -n "$ends keybase" -l disable-team-box-auditor
+complete -c keybase -f -n "$ends keybase" -l display-raw-untrusted-output
+complete -c keybase -f -n "$ends keybase" -l ek-log-file
+complete -c keybase -f -n "$ends keybase" -l enable-bot-lite-mode
+complete -c keybase -f -n "$ends keybase" -l extra-net-logging
+complete -c keybase -f -n "$ends keybase" -l features
+complete -c keybase -f -n "$ends keybase" -l force-linux-keyring
+complete -c keybase -f -n "$ends keybase" -l generate-bash-completion
+complete -c keybase -f -n "$ends keybase" -l gpg
+complete -c keybase -f -n "$ends keybase" -l gpg-options
+complete -c keybase -f -n "$ends keybase" -l gpgdir
+complete -c keybase -f -n "$ends keybase" -l gui-config-file
+complete -c keybase -f -n "$ends keybase" -l help
+complete -c keybase -f -n "$ends keybase" -s h -d "--help"
+complete -c keybase -f -n "$ends keybase" -l home
+complete -c keybase -f -n "$ends keybase" -s H -d "--home"
+complete -c keybase -f -n "$ends keybase" -l leveldb-num-files
+complete -c keybase -f -n "$ends keybase" -l local-rpc-debug-unsafe
+complete -c keybase -f -n "$ends keybase" -l log-file
+complete -c keybase -f -n "$ends keybase" -l log-format
+complete -c keybase -f -n "$ends keybase" -l log-prefix
+complete -c keybase -f -n "$ends keybase" -l merkle-kids
+complete -c keybase -f -n "$ends keybase" -l no-auto-fork
+complete -c keybase -f -n "$ends keybase" -s F -d "--no-auto-fork"
+complete -c keybase -f -n "$ends keybase" -l no-debug
+complete -c keybase -f -n "$ends keybase" -l paramproof-kit
+complete -c keybase -f -n "$ends keybase" -l pgpdir
+complete -c keybase -f -n "$ends keybase" -l pid-file
+complete -c keybase -f -n "$ends keybase" -l pinentry
+complete -c keybase -f -n "$ends keybase" -l proof-cache-size
+complete -c keybase -f -n "$ends keybase" -l prove-bypass
+complete -c keybase -f -n "$ends keybase" -l proxy
+complete -c keybase -f -n "$ends keybase" -l proxy-type
+complete -c keybase -f -n "$ends keybase" -l push-disabled
+complete -c keybase -f -n "$ends keybase" -l push-save-interval
+complete -c keybase -f -n "$ends keybase" -l push-server-uri
+complete -c keybase -f -n "$ends keybase" -l pvl-kit
+complete -c keybase -f -n "$ends keybase" -l read-deleted-sigchain
+complete -c keybase -f -n "$ends keybase" -l remember-passphrase
+complete -c keybase -f -n "$ends keybase" -l run-mode
+complete -c keybase -f -n "$ends keybase" -l scraper-timeout
+complete -c keybase -f -n "$ends keybase" -l secret-keyring
+complete -c keybase -f -n "$ends keybase" -l server
+complete -c keybase -f -n "$ends keybase" -s s -d "--server"
+complete -c keybase -f -n "$ends keybase" -l session-file
+complete -c keybase -f -n "$ends keybase" -l slow-gregor-conn
+complete -c keybase -f -n "$ends keybase" -l socket-file
+complete -c keybase -f -n "$ends keybase" -l standalone
+complete -c keybase -f -n "$ends keybase" -l timers
+complete -c keybase -f -n "$ends keybase" -l tor-hidden-address
+complete -c keybase -f -n "$ends keybase" -l tor-mode
+complete -c keybase -f -n "$ends keybase" -l tor-proxy
+complete -c keybase -f -n "$ends keybase" -l updater-config-file
+complete -c keybase -f -n "$ends keybase" -l use-default-log-file
+complete -c keybase -f -n "$ends keybase" -l use-root-config-file
+complete -c keybase -f -n "$ends keybase" -l user-cache-size
+complete -c keybase -f -n "$ends keybase" -l vdebug
+complete -c keybase -f -n "$ends keybase" -l version
+complete -c keybase -f -n "$ends keybase" -s v -d "--version"
 
 #commands
-#L0
-complete -c keybase -f -n "$ends keybase" -a "$c_keybase"
 #L1
-complete -c keybase -f -n "$ends keybase account" -a "$c_keybase_account"
-complete -c keybase -f -n "$ends keybase blocks" -a "$c_keybase_blocks"
-complete -c keybase -f -n "$ends keybase bot" -a "$c_keybase_bot"
-complete -c keybase -f -n "$ends keybase chat" -a "$c_keybase_chat"
-complete -c keybase -f -n "$ends keybase ctl" -a "$c_keybase_ctl"
-complete -c keybase -f -n "$ends keybase currency" -a "$c_keybase_currency"
-complete -c keybase -f -n "$ends keybase device" -a "$c_keybase_device"
-complete -c keybase -f -n "$ends keybase fs" -a "$c_keybase_fs"
-complete -c keybase -f -n "$ends keybase git" -a "$c_keybase_git"
-complete -c keybase -f -n "$ends keybase h" -a "$c_keybase_help"
-complete -c keybase -f -n "$ends keybase help" -a "$c_keybase_help"
-complete -c keybase -f -n "$ends keybase log" -a "$c_keybase_log"
-complete -c keybase -f -n "$ends keybase passphrase" -a "$c_keybase_passphrase"
-complete -c keybase -f -n "$ends keybase pgp" -a "$c_keybase_pgp"
-complete -c keybase -f -n "$ends keybase rekey" -a "$c_keybase_rekey"
-complete -c keybase -f -n "$ends keybase sigs" -a "$c_keybase_sigs"
-complete -c keybase -f -n "$ends keybase team" -a "$c_keybase_team"
-complete -c keybase -f -n "$ends keybase update" -a "$c_keybase_update"
-complete -c keybase -f -n "$ends keybase wallet" -a "$c_keybase_wallet"
+complete -c keybase -f -n "$ends keybase" -a "$keybase"
 #L2
-complete -c keybase -f -n "$ends keybase fs sync" -a "$c_keybase_fs_sync"
-
+complete -c keybase -f -n "$ends keybase account" -a "$keybase_account"
+complete -c keybase -f -n "$ends keybase blocks" -a "$keybase_blocks"
+complete -c keybase -f -n "$ends keybase bot" -a "$keybase_bot"
+complete -c keybase -f -n "$ends keybase chat" -a "$keybase_chat"
+complete -c keybase -f -n "$ends keybase ctl" -a "$keybase_ctl"
+complete -c keybase -f -n "$ends keybase currency" -a "$keybase_currency"
+complete -c keybase -f -n "$ends keybase device" -a "$keybase_device"
+complete -c keybase -f -n "$ends keybase fs" -a "$keybase_fs"
+complete -c keybase -f -n "$ends keybase git" -a "$keybase_git"
+complete -c keybase -f -n "$ends keybase h" -a "$keybase_help"
+complete -c keybase -f -n "$ends keybase help" -a "$keybase_help"
+complete -c keybase -f -n "$ends keybase log" -a "$keybase_log"
+complete -c keybase -f -n "$ends keybase passphrase" -a "$keybase_passphrase"
+complete -c keybase -f -n "$ends keybase pgp" -a "$keybase_pgp"
+complete -c keybase -f -n "$ends keybase rekey" -a "$keybase_rekey"
+complete -c keybase -f -n "$ends keybase sigs" -a "$keybase_sigs"
+complete -c keybase -f -n "$ends keybase team" -a "$keybase_team"
+complete -c keybase -f -n "$ends keybase update" -a "$keybase_update"
+complete -c keybase -f -n "$ends keybase wallet" -a "$keybase_wallet"
+#L3
+complete -c keybase -f -n "$ends keybase account email" -a "$keybase_account_email"
+complete -c keybase -f -n "$ends keybase fs debug" -a "$keybase_fs_debug"
+complete -c keybase -f -n "$ends keybase fs sync" -a "$keybase_fs_sync"
+#...
 
 #command options
+complete -c keybase -f -n "$ends keybase account upload-avatar" -l skip-chat-message -s s
+complete -c keybase -f -n "$ends keybase account upload-avatar" -l team
 #...

From 577dd1ccf16f564ddcb6118458ea5d345c6d986e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 26 Nov 2019 22:47:05 +0800
Subject: [PATCH 1534/1732] CHANGELOG: work on 3.1.0

Updates to f136d634eb875b86f719d7d9dc5b6c08abd3d343
---
 CHANGELOG.md | 83 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebce1b3fb..0ae88fca1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,16 +7,21 @@
 - fish's debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
 - `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
+- The default prompt is now the "classic + VCS" prompt, providing a better experience for new users (#6375).
 - Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
-- fish now correctly handles CDPATH entries that starts with `..` (#6220).
-- The `fish_trace` variable may be set to trace execution. This performs a similar role as `set -x`.
+- fish now correctly handles `CDPATH` entries that start with `..` (#6220) or contain `./` (#5887).
+- The `fish_trace` variable may be set to trace execution (#3427). This performs a similar role as `set -x` in other shells.
 - fish uses the temporary directory determined by the system, rather than relying on `/tmp` (#3845).
+- The fish Web configuration tool (`fish_config`) prints a list of commands it is executing, to help understanding and debugging (#5584).
+- Major performance improvements when pasting (#5866), executing lots of commands (#5905), importing history from bash (#6295), and when completing variables that might match `$history` (#6288).
 
 ### Syntax changes and new commands
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
 - New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The `VAR=val cmd` syntax can now be used to run a command in a modified environment (#6287).
+- `and` is no longer recognised as a command, so that nonsensical constructs like `and and and` produce a syntax error (#6089).
+- `math`'s exponent operator, '`^`', was previously left-associative, but now uses the more commonly-used right-associative behaviour (#6280). This means that `math '3^0.5^2'` was previously calculated as '(3^0.5)^2', but is now calculated as '3^(0.5^2)'.
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
@@ -27,15 +32,21 @@
 - `complete --do-complete` now also does fuzzy matches (#5467).
 - `complete --do-complete` can be used inside completions, allowing limited recursion (#3474).
 - `count` now also counts lines fed on standard input (#5744).
+- `eval` produces an exit status of 0 when given no arguments, like other shells (#5692).
 - `printf` prints what it can when input hasn't been fully converted to a number, but still prints an error (#5532).
 - `complete -C foo` now works as expected, rather than requiring `complete -Cfoo`.
 - `complete` has a new `--force-files` option, to re-enable file completions. This allows `sudo -E` and `pacman -Qo` to complete correctly (#5646).
 - `argparse` now defaults to showing the current function name (instead of `argparse`) in its errors, making `--name` often superfluous (#5835).
 - `argparse` has a new `--ignore-unknown` option to keep unrecognized options, allowing multiple argparse passes to parse options (#5367).
+- `argparse` correctly handles flag value validation of options that only have short names (#5864).
 - `read -S` (short option of `--shell`) is recognised correctly (#5660).
-- `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line.
+- `read` understands `--list`, which acts like `--array` in reading all arguments into a list inside a single variable, but is better named (#5846).
+- `read` has a new option, `--tokenize`, which splits a string into variables according to the shell's tokenization rules, considering quoting, escaping, and so on (#3823).
+- `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line (#5859).
+- `fish_indent --write` now supports multiple file arguments, indenting them in turn.
 - The default read limit has been increased to 100MiB (#5267).
 - `math` now also understands `x` for multiplication, provided it is followed by whitespace (#5906).
+- `math` reports the right error when incorrect syntax is used inside parentheses (#6063), and warns when unsupported logical operations are used (#6096).
 - `functions --erase` now also prevents fish from autoloading a function for the first time (#5951).
 - `jobs --last` returns 0 to indicate success when a job is found (#6104).
 - `commandline -p` and `commandline -j` now split on `&&` and `||` in addition to `;` and `&` (#6214).
@@ -43,39 +54,63 @@
 - `eval` no long creates a new local variable scope, but affects variables in the scope it is called from (#4443). `source` still creates a new local scope.
 - `abbr` has a new `--query` option to check for the existence of an abbreviation.
 - Local values for `fish_complete_path` and `fish_function_path` are now ignored; only their global values are respected.
+- Syntax error reports now display a marker in the correct position (#5812).
 - Empty universal variables may now be exported (#5992).
 - Exported universal variables are no longer imported into the global scope, preventing shadowing. This makes it easier to change such variables for all fish sessions and avoids breakage when the value is a list of multiple elements (#5258).
+- A bug where `for` could use invalid variable names has been fixed (#5800).
 - A bug where local variables would not be exported to functions has been fixed (#6153).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
+- The output of `functions FUNCTION` starts with spaces, not a tab, matching `fish_indent` (#1472), and correctly includes any `--wraps` flags (#1625).
 - `type --path` with a function argument will now output the path to the file containing the definition of that function, if it exists.
+- The `$hostname` variable is no longer truncated to 32 characters (#5758).
+- Line numbers in function backtraces are calculated correctly (#6350).
 
 ### Interactive improvements
-- fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456).
+- fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456). It now ignores blank lines like the bash implementation (#5809).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
-- Completion of subcommands to builtins like `and` or `not` has been fixed (#6249).
-- `dirh` outputs its stack in the correct order (#5477).
+- `dirh` outputs its stack in the correct order (#5477), and behaves as documented when universal variables are used for its stack (#5797).
 - `funced` and the edit-commandline-in-buffer bindings did not work in fish 3.0 when the `$EDITOR` variable contained spaces; this has been corrected (#5625).
-- vi mode supports R to enter replace mode (#6342).
 - Builtins now pipe their help output to a pager automatically (#6227).
-- `set_color` now colors the `--print-colors` output in the matching colors if it is going to a terminal
+- `set_color` now colors the `--print-colors` output in the matching colors if it is going to a terminal.
+- fish now underlines every valid entered path instead of just the last one (#5872).
+- When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+- Syntax highlighting works correctly with variables as commands (#5658) and redirections to close file descriptors (#6092).
+- `help` works properly on Windows Subsytem for Linux (#5759, #6338).
+- A bug where `disown` could crash the shell has been fixed (#5720).
+- fish will not autosuggest files ending with `~` unless there are no other candidates, as these are generally backup files (#985).
+- Escape in the pager works correctly (#5818).
+- Key bindings that call `fg` no longer leave the terminal in a broken state (#2114).
+- Brackets (#5831) and filenames containing `$` (#6060) are completed with appropriate escaping.
+- The output of `complete` and `functions` is now colorized in interactive terminals.
+- The Web-based configuration handles aliases that include single quotes correctly (#6120), and launches correctly under Termux (#6248).
+- `function` now correctly validates parameters for `--argument-names` as valid variable names (#6147) and correctly parses options following `--argument-names`, as in "`--argument-names foo --description bar`" (#6186).
+- History newly imported from bash includes command lines using `&&` or `||`.
+- The automatic generation of completions from manual pages is better described in job and process listings (#6269).
+- In private mode, setting `$fish_greeting` to an empty string before starting the private session will prevent the warning about history not being saved from being printed (#6299).
+- In the interactive editor, a line break (Enter) inside unclosed brackets will insert a new line, rather than executing the command and producing an error (#6316).
+- Ctrl-C always repaints the prompt (#6394).
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
 - Shift-Left and Shift-Right now default to moving backwards and forwards by one bigword (words separated by whitespace) (#1505).
-- The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for vi-mode (#3904).
-- The `forward-bigword` binding now interacts correctly with autosuggestions (#5336)
+- The default escape delay (to differentiate between the escape key and an alt-combination) has been reduced to 30ms, down from 300ms for the default mode and 100ms for Vi mode (#3904).
+- The `forward-bigword` binding now interacts correctly with autosuggestions (#5336).
 - The `fish_clipboard_*` functions support Wayland by using [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) (#5450).
-- The nextd and prevd functions no longer print "Hit end of history", instead using a bell.
-- If fish_mode_prompt exists, vi-mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
-- The path-component bindings (like ctrl-w) now also stop at ":" and "@" because those are used to denote user and host in ssh-likes (#5841).
+- The `nextd` and `prevd` functions no longer print "Hit end of history", instead using a bell. They correctly store working directories containing symbolic links (#6395).
+- If a `fish_mode_prompt` function exists, Vi mode will only execute it on mode-switch instead of the entire prompt. This should make it much more responsive with slow prompts (#5783).
+- The path-component bindings (like Ctrl-w) now also stop at ":" and "@", because those are used to denote user and host in commands such as `ssh` (#5841).
 - The NULL character can now be bound via `bind -k nul`. Terminals often generate this character via control-space. (#3189).
 - A new readline command `expand-abbr` can be used to trigger abbreviation expansion (#5762).
+- A new readline command, `delete-or-exit`, removes a character to the right of the cursor or exits the shell if the command line is empty (moving this functionality out of the `delete-or-exit` function).
 - The `self-insert` readline command will now insert the binding sequence, if not empty.
 - A new binding to prepend `sudo`, bound to Alt-S by default (#6140).
 - The Alt-W binding to describe a command should now work better with multiline prompts (#6110)
 - The Alt-H binding to open a command's man page now tries to ignore `sudo` (#6122).
-- A new pair of bind functions, `history-prefix-search-backward` (and forward) was introduced (#6143).
+- A new pair of bind functions, `history-prefix-search-backward` (and `forward`), was introduced (#6143).
+- Vi mode now supports R to enter replace mode (#6342), and `d0` to delete the current line (#6292).
+- In Vi mode, hitting Enter in replace-one mode no longer erases the prompt (#6298).
+- Selections in Vi mode are inclusive, matching the actual behaviour of Vi (#5770).
 
 #### Improved prompts
 - The git prompt in informative mode now shows the number of stashes if enabled.
@@ -84,13 +119,13 @@
 
 #### Improved terminal output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).
-- Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552 and others).
+- Better detection and support for using fish from various system consoles, where limited colors and special characters are supported (#5552).
 - fish now tries to guess if the system supports Unicode 9 (and displays emoji as wide), eliminating the need to set `$fish_emoji_width` in most cases (#5722).
-- fish now underlines every valid entered path instead of just the last one (#5872).
-- When syntax highlighting a string with an unclosed quote, only the quote itself will be shown as an error, instead of the whole argument.
+- Improvements to the display of wide characters, particularly Korean characters and emoji (#5583, #5729).
 - The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
+- Variables that control background colors (such as `fish_pager_color_search_match`) can now use `--reverse`.
 
-#### New or improved completions
+#### Completions
 - Added completions for
   - `aws`
   - `bat` (#6052)
@@ -136,17 +171,27 @@
   - `zpaq` (#6245)
   - `zstd`, `zstdcat`, `zstdgrep`, `zstdless` and `zstdmt` (#6364)
 - Lots of improvements to completions.
+- Selecting short options which also have a long name from the completion pager is possible (#5634).
+- Tab completion will no longer add trailing spaces if they already exist (#6107).
+- Completion of subcommands to builtins like `and` or `not` now works correctly (#6249).
+- Completion of arguments to short options works correctly when multiple short options are used together (#332).
+- Activating completion in the middle of an invalid completion does not move the cursor any more, making it easier to fix a mistake (#4124).
+- Completion in empty commandlines now lists all available commands.
+- Functions listed as completions could previously leak parts of the function as other completions; this has been fixed.
 
-### Deprecations
+### Deprecations and removed features
 - The vcs-prompt functions have been promoted to names without double-underscore, so __fish_git_prompt is now fish_git_prompt, __fish_vcs_prompt is now fish_vcs_prompt, __fish_hg_prompt is now fish_hg_prompt and __fish_svn_prompt is now fish_svn_prompt. Shims at the old names have been added, and the variables have kept their old names (#5586).
 - `string replace` has an additional round of escaping in the replacement expression, so escaping backslashes requires many escapes (eg `string replace -ra '([ab])' '\\\\\\\$1' a`). The new feature flag `regex-easyesc` can be used to disable this, so that the same effect can be achieved with `string replace -ra '([ab])' '\\\\$1' a` (#5556). As a reminder, the intention behind feature flags is that this will eventually become the default and then only option, so scripts should be updated.
+- The `fish_vi_mode` function, deprecated in fish 2.3, has been removed. Use `fish_vi_key_bindings` instead (#6372).
 
 ### For distributors and developers
 - fish 3.0 introduced a CMake-based build system. In fish 3.1, both the Autotools-based build and legacy Xcode build system have been removed, leaving only the CMake build system. All distributors and developers must install CMake.
+- fish now depends on the common `tee` external command, for the `psub` process substitution function.
 - The documentation is now built with Sphinx. The old Doxygen-based documentation system has been removed. Developers, and distributors who wish to rebuild the documentation, must install Sphinx.
 - The `INTERNAL_WCWIDTH` build option has been removed, as fish now always uses an internal `wcwidth` function. It has a number of configuration options that make it more suitable for general use (#5777).
 - mandoc can now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
 - Some bugs preventing building on Solaris-derived systems such as Illumos were fixed (#5458, #5461, #5611).
+- Completions for `npm`, `bower` and `yarn` no longer require the `jq` utility for full functionality, but will use Python instead if it is available.
 
 ---
 

From e3782603ec4695bec6544b40817e66db006d0627 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 12 Dec 2019 16:52:28 +0100
Subject: [PATCH 1535/1732] Load vendor configuration from
 $XDG_DATA_DIRS/vendor_*.d

$XDG_DATA_DIRS/vendor_{completions,conf,functions}.d
Additionally, CMake variables extra_{completions,conf,functions}dir are
appended, if they are not already contained in $XDG_DATA_DIRS.

If XDG_DATA_DIRS is not defined, we fall back to

$__fish_datadir/vendor_completions.d:${extra_completionsdir}

for completions. Same for conf and functions.
---
 CHANGELOG.md        |  1 +
 cmake/Install.cmake |  2 +-
 share/config.fish   | 31 ++++++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ae88fca1..17201fc40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -192,6 +192,7 @@
 - mandoc can now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
 - Some bugs preventing building on Solaris-derived systems such as Illumos were fixed (#5458, #5461, #5611).
 - Completions for `npm`, `bower` and `yarn` no longer require the `jq` utility for full functionality, but will use Python instead if it is available.
+- Third-party completions are sourced first from `$XDG_DATA_DIRS/share/fish/vendor_completions.d` in addition to `(pkg-config fish --variable completionsdir)` which defaults to `$PREFIX/share/fish/vendor_completions.d`. Same for vendor_functions.d and vendor_conf.d (#5029).
 
 ---
 
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index d3bb7556d..045dc37e6 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -30,7 +30,7 @@ SET(extra_completionsdir
 
 SET(extra_functionsdir
     ${datadir}/fish/vendor_functions.d
-    CACHE STRING "Path for extra completions")
+    CACHE STRING "Path for extra functions")
 
 SET(extra_confdir
     ${datadir}/fish/vendor_conf.d
diff --git a/share/config.fish b/share/config.fish
index 388cc018d..15fded78b 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -66,17 +66,42 @@ if test -f $__fish_data_dir/__fish_build_paths.fish
     source $__fish_data_dir/__fish_build_paths.fish
 end
 
+# Compute the directories for vendor configuration.  We want to include
+# all of XDG_DATA_DIRS, as well as the __extra_* dirs defined above.
+set -l xdg_data_dirs
+if set -q XDG_DATA_DIRS
+    set --path xdg_data_dirs $XDG_DATA_DIRS
+    set xdg_data_dirs (string replace -r '([^/])/$' '$1' -- $xdg_data_dirs)
+else
+    set xdg_data_dirs $__fish_data_dir
+end
+
+set -l vendor_completionsdirs $xdg_data_dirs/fish/vendor_completions.d
+set -l vendor_functionsdirs $xdg_data_dirs/fish/vendor_functions.d
+set -l vendor_confdirs $xdg_data_dirs/fish/vendor_conf.d
+
+# Ensure that extra directories are always included.
+if not contains -- $__extra_completionsdir $vendor_completionsdirs
+    set -a vendor_completionsdirs $__extra_completionsdir
+end
+if not contains -- $__extra_functionsdir $vendor_functionsdirs
+    set -a vendor_functionsdirs $__extra_functionsdir
+end
+if not contains -- $__extra_confdir $vendor_confdirs
+    set -a vendor_confdirs $__extra_confdir
+end
+
 # Set up function and completion paths. Make sure that the fish
 # default functions/completions are included in the respective path.
 
 if not set -q fish_function_path
-    set fish_function_path $__fish_config_dir/functions $__fish_sysconf_dir/functions $__extra_functionsdir $__fish_data_dir/functions
+    set fish_function_path $__fish_config_dir/functions $__fish_sysconf_dir/functions $vendor_functionsdirs $__fish_data_dir/functions
 else if not contains -- $__fish_data_dir/functions $fish_function_path
     set -a fish_function_path $__fish_data_dir/functions
 end
 
 if not set -q fish_complete_path
-    set fish_complete_path $__fish_config_dir/completions $__fish_sysconf_dir/completions $__extra_completionsdir $__fish_data_dir/completions $__fish_user_data_dir/generated_completions
+    set fish_complete_path $__fish_config_dir/completions $__fish_sysconf_dir/completions $vendor_completionsdirs $__fish_data_dir/completions $__fish_user_data_dir/generated_completions
 else if not contains -- $__fish_data_dir/completions $fish_complete_path
     set -a fish_complete_path $__fish_data_dir/completions
 end
@@ -258,7 +283,7 @@ end
 # As last part of initialization, source the conf directories.
 # Implement precedence (User > Admin > Extra (e.g. vendors) > Fish) by basically doing "basename".
 set -l sourcelist
-for file in $__fish_config_dir/conf.d/*.fish $__fish_sysconf_dir/conf.d/*.fish $__extra_confdir/*.fish
+for file in $__fish_config_dir/conf.d/*.fish $__fish_sysconf_dir/conf.d/*.fish $vendor_confdirs/*.fish
     set -l basename (string replace -r '^.*/' '' -- $file)
     contains -- $basename $sourcelist
     and continue

From 0c92c7d8acc591dbb9222a90696966adfc6a1cf3 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 13 Jan 2020 10:18:43 +0100
Subject: [PATCH 1536/1732] Fix remote path escaping for rsync and scp
 completions

They need to be escaped twice, for the local and the remote shell.
Also don't suggest local files as rsync remote paths (-a -> -xa) and
fix completion for remote paths containing multiple consecutive spaces.

Fixes #1872
[ci skip]
---
 share/completions/rsync.fish | 8 +++++---
 share/completions/scp.fish   | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/completions/rsync.fish b/share/completions/rsync.fish
index d270c0dfb..39aeff3f6 100644
--- a/share/completions/rsync.fish
+++ b/share/completions/rsync.fish
@@ -1,5 +1,5 @@
 function __rsync_remote_target
-    commandline -ct | string match -r '.*::?(?:.*/)?'
+    commandline -ct | string match -r '.*::?(?:.*/)?' | string unescape
 end
 
 complete -c rsync -s v -l verbose -d "Increase verbosity"
@@ -125,12 +125,14 @@ complete -c rsync -d Hostname -a "
 #
 # Remote path
 #
-complete -c rsync -d "Remote path" -n "commandline -ct | string match -q '*:*'" -a "
+complete -c rsync -d "Remote path" -n "commandline -ct | string match -q '*:*'" -xa "
 (
 	# Prepend any user@host:/path information supplied before the remote completion.
         __rsync_remote_target
 )(
 	# Get the list of remote files from the specified rsync server.
-        rsync --list-only (__rsync_remote_target) 2>/dev/null | string replace -r '^d.*' '\$0/' | tr -s ' ' | cut -d' ' -f 5-
+        rsync --list-only (__rsync_remote_target) 2>/dev/null | string replace -r '^d.*' '\$0/' |
+        string replace -r '(\S+\s+){4}' '' | # drop the first four columns
+        string escape -n
 )
 "
diff --git a/share/completions/scp.fish b/share/completions/scp.fish
index c7b05ac3f..41a659906 100644
--- a/share/completions/scp.fish
+++ b/share/completions/scp.fish
@@ -54,7 +54,8 @@ complete -c scp -d "Local Path" -n "not string match @ -- (commandline -ct)"
 # Get the list of remote files from the scp target.
 complete -c scp -d "Remote Path" -f -n "commandline -ct | string match -e ':'" -a "
 (__scp_remote_target):( \
-        command ssh (__scp2ssh_port_number) -o 'BatchMode yes' (__scp_remote_target) /bin/ls\ -dp\ (__scp_remote_path_prefix)\* 2>/dev/null
+        command ssh (__scp2ssh_port_number) -o 'BatchMode yes' (__scp_remote_target) /bin/ls\ -dp\ (__scp_remote_path_prefix | string unescape)\* 2>/dev/null |
+        string escape -n
 )
 "
 complete -c scp -s B -d "Batch mode"

From 56f52bc693cb8ca6f40f6bddceb9fcf1b45cb327 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Mon, 13 Jan 2020 10:47:52 +0100
Subject: [PATCH 1537/1732] Add completions for cryptsetup (#6488)

---
 CHANGELOG.md                      |  1 +
 share/completions/cryptsetup.fish | 92 +++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 share/completions/cryptsetup.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17201fc40..e1e0bfbbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
   - `camcontrol`
   - `cf` (#5700)
   - `code` (#6205)
+  - `cryptsetup` (#6488)
   - `csc` and `csi` (#6016)
   - `cwebp` (#6034)
   - `cygpath` and `cygstart` (#6239)
diff --git a/share/completions/cryptsetup.fish b/share/completions/cryptsetup.fish
new file mode 100644
index 000000000..fb8f22045
--- /dev/null
+++ b/share/completions/cryptsetup.fish
@@ -0,0 +1,92 @@
+#cryptsetup 2.2.2
+
+#variables
+set -l seen __fish_seen_subcommand_from
+set -l actions benchmark close config convert erase isLuks luksAddKey luksChangeKey luksConvertKey luksDump luksFormat luksHeaderBackup luksHeaderRestore luksKillSlot luksRemoveKey luksResume luksSuspend luksUUID open reencrypt repair resize status tcryptDump token
+
+#actions
+complete -c cryptsetup -x -n "not $seen $actions" -a "$actions"
+
+#options
+complete -c cryptsetup -l active-name -d "Override device autodetection of dm device to be reencrypted"
+complete -c cryptsetup -l align-payload -d "Align payload at <n> sector boundaries - for luksFormat"
+complete -c cryptsetup -l allow-discards -d "Allow discards (aka TRIM) requests for device"
+complete -c cryptsetup -l batch-mode -s q -d "Do not ask for confirmation"
+complete -c cryptsetup -l cipher -s c -d "The cipher used to encrypt the disk (see /proc/crypto)"
+complete -c cryptsetup -l debug -d "Show debug messages"
+complete -c cryptsetup -l debug-json -d "Show debug messages including JSON metadata"
+complete -c cryptsetup -l decrypt -d "Decrypt LUKS2 device (remove encryption)"
+complete -c cryptsetup -l deferred -d "Device removal is deferred until the last user closes it"
+complete -c cryptsetup -l device-size -d "Use only specified device size (ignore rest of device). DANGEROUS!"
+complete -c cryptsetup -l disable-keyring -d "Disable loading volume keys via kernel keyring"
+complete -c cryptsetup -l disable-locks -d "Disable locking of on-disk metadata"
+complete -c cryptsetup -l dump-master-key -d "Dump volume (master) key instead of keyslots info"
+complete -c cryptsetup -l encrypt -d "Encrypt LUKS2 device (in-place encryption)"
+complete -c cryptsetup -l force-password -d "Disable password quality check (if enabled)"
+complete -c cryptsetup -l hash -s h -d "The hash used to create the encryption key from the passphrase"
+complete -c cryptsetup -l header -d "Device or file with separated LUKS header"
+complete -c cryptsetup -l header-backup-file -d "File with LUKS header and keyslots backup"
+complete -c cryptsetup -l help -s '?' -d "Show help message"
+complete -c cryptsetup -l hotzone-size -d "Maximal reencryption hotzone size"
+complete -c cryptsetup -l init-only -d "Initialize LUKS2 reencryption in metadata only"
+complete -c cryptsetup -l integrity -s I -d "Data integrity algorithm (LUKS2 only)"
+complete -c cryptsetup -l integrity-no-journal -d "Disable journal for integrity device"
+complete -c cryptsetup -l integrity-no-wipe -d "Do not wipe device after format"
+complete -c cryptsetup -l iter-time -s i -d "PBKDF iteration time for LUKS (in ms)"
+complete -c cryptsetup -l json-file -d "Read or write the json from or to a file"
+complete -c cryptsetup -l key-description -d "Key description"
+complete -c cryptsetup -l key-file -s d -d "Read the key from a file"
+complete -c cryptsetup -l key-size -s s -d "The size of the encryption key"
+complete -c cryptsetup -l key-slot -s S -d "Slot number for new key (default is first free)"
+complete -c cryptsetup -l keyfile-offset -d "Number of bytes to skip in keyfile"
+complete -c cryptsetup -l keyfile-size -s l -d "Limits the read from keyfile"
+complete -c cryptsetup -l keyslot-cipher -d "LUKS2 keyslot: The cipher used for keyslot encryption"
+complete -c cryptsetup -l keyslot-key-size -d "LUKS2 keyslot: The size of the encryption key"
+complete -c cryptsetup -l label -d "Set label for the LUKS2 device"
+complete -c cryptsetup -l luks2-keyslots-size -d "LUKS2 header keyslots area size"
+complete -c cryptsetup -l luks2-metadata-size -d "LUKS2 header metadata area size"
+complete -c cryptsetup -l master-key-file -d "Read the volume (master) key from file"
+complete -c cryptsetup -l new-keyfile-offset -d "Number of bytes to skip in newly added keyfile"
+complete -c cryptsetup -l new-keyfile-size -d "Limits the read from newly added keyfile"
+complete -c cryptsetup -l offset -s o -d "The start offset in the backend device"
+complete -c cryptsetup -l pbkdf -d "PBKDF algorithm (for LUKS2): argon2i, argon2id, pbkdf2"
+complete -c cryptsetup -l pbkdf-force-iterations -d "PBKDF iterations cost (forced, disables benchmark)"
+complete -c cryptsetup -l pbkdf-memory -d "PBKDF memory cost limit"
+complete -c cryptsetup -l pbkdf-parallel -d "PBKDF parallel cost"
+complete -c cryptsetup -l perf-same_cpu_crypt -d "Use dm-crypt same_cpu_crypt performance compatibility option"
+complete -c cryptsetup -l perf-submit_from_crypt_cpus -d "Use dm-crypt submit_from_crypt_cpus performance compatibility option"
+complete -c cryptsetup -l persistent -d "Set activation flags persistent for device"
+complete -c cryptsetup -l priority -d "Keyslot priority: ignore, normal, prefer"
+complete -c cryptsetup -l progress-frequency -d "Progress line update (in seconds)"
+complete -c cryptsetup -l readonly -s r -d "Create a readonly mapping"
+complete -c cryptsetup -l reduce-device-size -d "Reduce data device size (move data offset). DANGEROUS!"
+complete -c cryptsetup -l refresh -d "Refresh (reactivate) device with new parameters"
+complete -c cryptsetup -l resilience -d "Reencryption hotzone resilience type (checksum,journal,none)"
+complete -c cryptsetup -l resilience-hash -d "Reencryption hotzone checksums hash"
+complete -c cryptsetup -l resume-only -d "Resume initialized LUKS2 reencryption only"
+complete -c cryptsetup -l sector-size -d "Encryption sector size (default: 512 bytes)"
+complete -c cryptsetup -l serialize-memory-hard-pbkdf -d "Use global lock to serialize memory hard PBKDF (OOM workaround)"
+complete -c cryptsetup -l shared -d "Share device with another non-overlapping crypt segment"
+complete -c cryptsetup -l size -s b -d "The size of the device"
+complete -c cryptsetup -l skip -s p -d "How many sectors of the encrypted data to skip at the beginning"
+complete -c cryptsetup -l subsystem -d "Set subsystem label for the LUKS2 device"
+complete -c cryptsetup -l tcrypt-backup -d "Use backup (secondary) TCRYPT header"
+complete -c cryptsetup -l tcrypt-hidden -d "Use hidden header (hidden TCRYPT device)"
+complete -c cryptsetup -l tcrypt-system -d "Device is system TCRYPT drive (with bootloader)"
+complete -c cryptsetup -l test-passphrase -d "Do not activate device, just check passphrase"
+complete -c cryptsetup -l timeout -s t -d "Timeout for interactive passphrase prompt (in seconds)"
+complete -c cryptsetup -l token-id -d "Token number (default: any)"
+complete -c cryptsetup -l token-only -d "Do not ask for passphrase if activation by token fails"
+complete -c cryptsetup -l tries -s T -d "How often the input of the passphrase can be retried"
+complete -c cryptsetup -l type -s M -d "Type of device metadata: luks, luks1, luks2, plain, loopaes, tcrypt"
+complete -c cryptsetup -l unbound -d "Create unbound (no assigned data segment) LUKS2 keyslot"
+complete -c cryptsetup -l usage -d "Display brief usage"
+complete -c cryptsetup -l use-random -d "Use /dev/random for generating volume key"
+complete -c cryptsetup -l use-urandom -d "Use /dev/urandom for generating volume key"
+complete -c cryptsetup -l uuid -d "UUID for device to use"
+complete -c cryptsetup -l veracrypt -d "Scan also for VeraCrypt compatible device"
+complete -c cryptsetup -l veracrypt-pim -d "Personal Iteration Multiplier for VeraCrypt compatible device"
+complete -c cryptsetup -l veracrypt-query-pim -d "Query Personal Iteration Multiplier for VeraCrypt compatible device"
+complete -c cryptsetup -l verbose -s v -d "Shows more detailed error messages"
+complete -c cryptsetup -l verify-passphrase -s y -d "Verifies the passphrase by asking for it twice"
+complete -c cryptsetup -l version -s V -d "Print package version"

From 759d5a1fb3a434595fb64412bc6daf2c589e77db Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 Jan 2020 17:47:40 +0100
Subject: [PATCH 1538/1732] Fix uvar error message

This used a wstring format when it was a narrow string.
---
 src/env_universal_common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 8e71c301a..8c5885b96 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -606,7 +606,7 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
             }
 #endif
             const char *error = std::strerror(errno);
-            FLOGF(error, _(L"Unable to open universal variable file '%ls': %s"), path.c_str(),
+            FLOGF(error, _(L"Unable to open universal variable file '%s': %s"), path.c_str(),
                   error);
             break;
         }

From 31e6ae0099ce2bc6082b3f844011352980cee33f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 Jan 2020 18:56:23 +0100
Subject: [PATCH 1539/1732] Ignore EPERM for setpgid

In case we are a session leader, we get a harmless EPERM, yet we used
to quit. Stop doing that.

Fixes #6499.
---
 src/reader.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index eb406f35e..f5c09082a 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1774,9 +1774,14 @@ static void reader_interactive_init(parser_t &parser) {
     if (shell_pgid == 0 || session_interactivity() == session_interactivity_t::explicit_) {
         shell_pgid = getpid();
         if (setpgid(shell_pgid, shell_pgid) < 0) {
-            FLOG(error, _(L"Failed to assign shell to its own process group"));
-            wperror(L"setpgid");
-            exit_without_destructors(1);
+            // If we're session leader setpgid returns EPERM. The other cases where we'd get EPERM don't apply as we passed our own pid.
+            //
+            // This should be harmless, so we ignore it.
+            if (errno != EPERM) {
+                FLOG(error, _(L"Failed to assign shell to its own process group"));
+                wperror(L"setpgid");
+                exit_without_destructors(1);
+            }
         }
 
         // Take control of the terminal

From 69b464bc373d2dbd9d103720b94aaafc6ca5ec21 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 13 Jan 2020 20:34:22 +0100
Subject: [PATCH 1540/1732] Run fish_indent on all our fish scripts

It's now good enough to do so.

We don't allow grid-alignment:

```fish
complete -c foo -s b -l barnanana -a '(something)'
complete -c foo -s z              -a '(something)'
```

becomes

```fish
complete -c foo -s b -l barnanana -a '(something)'
complete -c foo -s z -a '(something)'
```

It's just more trouble than it is worth.

The one part I'd change:

We align and/or'd parts of an if-condition with the in-block code:

```fish
if true
   and false
    dosomething
end
```

becomes

```fish
if true
    and false
    dosomething
end
```

but it's not used terribly much and if we ever fix it we can just
reindent.
---
 build_tools/diff_profiles.fish                |   50 +-
 share/completions/bat.fish                    |   58 +-
 share/completions/cwebp.fish                  |   80 +-
 share/completions/env.fish                    |    2 +-
 share/completions/fzf.fish                    |    6 +-
 share/completions/go.fish                     |   80 +-
 share/completions/hledger.fish                |  200 +--
 share/completions/keybase.fish                |    4 +-
 share/completions/pipenv.fish                 |    2 +-
 share/completions/setxkbmap.fish              |    2 +-
 share/completions/sfdx.fish                   | 1178 ++++++++---------
 share/completions/src.fish                    |   90 +-
 share/completions/tokei.fish                  |   30 +-
 share/completions/zpaq.fish                   |    2 +-
 share/completions/zypper.fish                 |  490 +++----
 share/functions/__fish_describe_command.fish  |    3 +-
 share/functions/fish_prompt.fish              |    8 +-
 share/functions/help.fish                     |   19 +-
 .../sample_prompts/classic_status.fish        |    4 +-
 .../sample_prompts/classic_vcs.fish           |    8 +-
 tests/checks/andandoror.fish                  |   54 +-
 tests/checks/complete.fish                    |   12 +-
 tests/checks/directory-redirect.fish          |    4 +-
 tests/checks/empty.fish                       |   18 +-
 tests/checks/eval.fish                        |   28 +-
 .../exit-status-with-closing-stderr.fish      |    6 +-
 tests/checks/math.fish                        |    8 +-
 tests/checks/pipeline-pgroup.fish             |   19 +-
 tests/checks/printf.fish                      |    8 +-
 tests/checks/read.fish                        |    6 +-
 tests/checks/set.fish                         |   12 +-
 tests/checks/sigint.fish                      |    3 +-
 tests/checks/signal.fish                      |   24 +-
 tests/checks/string.fish                      |   18 +-
 tests/checks/variable-assignment.fish         |   13 +-
 tests/test.fish                               |    6 +-
 36 files changed, 1322 insertions(+), 1233 deletions(-)

diff --git a/build_tools/diff_profiles.fish b/build_tools/diff_profiles.fish
index d96af3063..c58c3ced4 100644
--- a/build_tools/diff_profiles.fish
+++ b/build_tools/diff_profiles.fish
@@ -10,37 +10,37 @@ set profile2 (cat $argv[2])
 
 set line_no 0
 while set next_line_no (math $line_no + 1) && set -q profile1[$next_line_no] && set -q profile2[$next_line_no]
-	set line_no $next_line_no
+    set line_no $next_line_no
 
-	set line1 $profile1[$line_no]
-	set line2 $profile2[$line_no]
+    set line1 $profile1[$line_no]
+    set line2 $profile2[$line_no]
 
-	if not string match -qr '^\d+\t\d+' $line1
-		echo $line1
-		continue
-	end
+    if not string match -qr '^\d+\t\d+' $line1
+        echo $line1
+        continue
+    end
 
-	set results1 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line1)
-	set results2 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line2)
+    set results1 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line1)
+    set results2 (string match -r '^(\d+)\t(\d+)\s+(.*)' $line2)
 
-	# times from both files
-	set time1 $results1[2..3]
-	set time2 $results2[2..3]
+    # times from both files
+    set time1 $results1[2..3]
+    set time2 $results2[2..3]
 
-	# leftover from both files
-	set remainder1 $results1[4]
-	set remainder2 $results2[4]
+    # leftover from both files
+    set remainder1 $results1[4]
+    set remainder2 $results2[4]
 
-	if not string match -q -- $remainder1 $remainder2
-		echo Mismatch on line $line_no:
-		echo - $remainder1
-		echo + $remainder2
-		exit 1
-	end
+    if not string match -q -- $remainder1 $remainder2
+        echo Mismatch on line $line_no:
+        echo - $remainder1
+        echo + $remainder2
+        exit 1
+    end
 
-	set -l diff
-	set diff[1] (math $time1[1] - $time2[1])
-	set diff[2] (math $time1[2] - $time2[2])
+    set -l diff
+    set diff[1] (math $time1[1] - $time2[1])
+    set diff[2] (math $time1[2] - $time2[2])
 
-	echo $diff[1] $diff[2] $remainder1
+    echo $diff[1] $diff[2] $remainder1
 end
diff --git a/share/completions/bat.fish b/share/completions/bat.fish
index 78741480d..036543fac 100644
--- a/share/completions/bat.fish
+++ b/share/completions/bat.fish
@@ -38,7 +38,7 @@ set -l italic_text_opts '
 '
 
 set -l decorations_opts "$color_opts"
-set -l paging_opts      "$color_opts"
+set -l paging_opts "$color_opts"
 
 set -l wrap_opts '
     auto\tdefault
@@ -55,34 +55,34 @@ set -l tabs_opts '
     8\t
 '
 
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language       -a  '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -s L -l list-language                                                  -d 'List supported languages for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax                                                     -d 'Map file name/extension to existing syntax'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l theme          -a  '(__bat_complete_themes)'                   -d 'Set theme for syntax highlighting'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -f      -l list-themes                                                    -d 'List syntax-highlighting themes'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l style          -a  "$style_opts"                               -d 'Choose what to add to the file contents'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s p -l plain                                                          -d 'Show no decorations; -pp disables paging too'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s n -l number                                                         -d 'Only show line numbers and no other decorations'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s A -l show-all                                                       -d 'Show non-printable characters'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s r -l line-range                                                     -d 'Only print lines from [M]:[N] (either optional)'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s H -l highlight-line                                                 -d 'Highlight the given line'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l color          -ka "$color_opts"                               -d 'Specify when to use colors'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l italic-text    -ka "$italic_text_opts"                         -d 'Specify when to use ANSI italic-text sequences'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l decorations    -ka "$decorations_opts"                         -d 'Specify when to use --style decorations'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l paging         -ka "$paging_opts"                              -d 'Specify when to use a pager'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l pager                                                          -d 'Specify what pager to use'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l wrap           -ka "$wrap_opts"                                -d 'Specify text-wrapping mode'
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l tabs           -a  "$tabs_opts"                                -d 'Sets tab width to N spaces'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s l -l language -a '(__bat_complete_languages_and_extensions)' -d 'Set language for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -s L -l list-language -d 'List supported languages for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s m -l map-syntax -d 'Map file name/extension to existing syntax'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l theme -a '(__bat_complete_themes)' -d 'Set theme for syntax highlighting'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -f -l list-themes -d 'List syntax-highlighting themes'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l style -a "$style_opts" -d 'Choose what to add to the file contents'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s p -l plain -d 'Show no decorations; -pp disables paging too'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s n -l number -d 'Only show line numbers and no other decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s A -l show-all -d 'Show non-printable characters'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s r -l line-range -d 'Only print lines from [M]:[N] (either optional)'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -s H -l highlight-line -d 'Highlight the given line'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l color -ka "$color_opts" -d 'Specify when to use colors'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l italic-text -ka "$italic_text_opts" -d 'Specify when to use ANSI italic-text sequences'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l decorations -ka "$decorations_opts" -d 'Specify when to use --style decorations'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l paging -ka "$paging_opts" -d 'Specify when to use a pager'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l pager -d 'Specify what pager to use'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l wrap -ka "$wrap_opts" -d 'Specify text-wrapping mode'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l tabs -a "$tabs_opts" -d 'Sets tab width to N spaces'
 # Don’t suggest the always-ignored added-only-for-POSIX-compliance -u/--unbuffered. Output is always unbuffered.
-complete -c bat -n 'not __fish_seen_subcommand_from cache' -x      -l terminal-width                                                 -d 'Explicitly set terminal width, optionally prefixed with +/-'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s h -l help                                                           -d 'Print help'
-complete -c bat -n 'not __fish_seen_subcommand_from cache'    -s V -l version                                                        -d 'Show version information'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -x -l terminal-width -d 'Explicitly set terminal width, optionally prefixed with +/-'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s h -l help -d 'Print help'
+complete -c bat -n 'not __fish_seen_subcommand_from cache' -s V -l version -d 'Show version information'
 
 # cache things
-complete -c bat -n '__fish_use_subcommand'   -a cache                    -d 'Manage syntax-definition and theme cache'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s b -l build  -d 'Initialize/update cache from the source directory'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s c -l clear  -d 'Remove cached definitions and themes'
-complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l source -d 'Specify directory to load syntaxes/themes from'
-complete -c bat -n '__fish_seen_subcommand_from cache' -r      -l target -d 'Specify directory to store cached syntaxes/themes'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f      -l blank  -d 'Create completely new syntax/theme sets instead of appending to the defaults'
-complete -c bat -n '__fish_seen_subcommand_from cache' -f -s h -l help   -d 'Print help about cache management'
+complete -c bat -n '__fish_use_subcommand' -a cache -d 'Manage syntax-definition and theme cache'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s b -l build -d 'Initialize/update cache from the source directory'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s c -l clear -d 'Remove cached definitions and themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r -l source -d 'Specify directory to load syntaxes/themes from'
+complete -c bat -n '__fish_seen_subcommand_from cache' -r -l target -d 'Specify directory to store cached syntaxes/themes'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -l blank -d 'Create completely new syntax/theme sets instead of appending to the defaults'
+complete -c bat -n '__fish_seen_subcommand_from cache' -f -s h -l help -d 'Print help about cache management'
diff --git a/share/completions/cwebp.fish b/share/completions/cwebp.fish
index a7434af83..3ce394730 100644
--- a/share/completions/cwebp.fish
+++ b/share/completions/cwebp.fish
@@ -89,58 +89,58 @@ function __fish_cwebp_is_first_arg_or_its_value -a 'arg' -d 'Like __fish_is_firs
     end
 end
 
-complete -c cwebp -f -o h -o help             -d 'Help (short)'
+complete -c cwebp -f -o h -o help -d 'Help (short)'
 complete -c cwebp -f -o H -o longhelp -l help -d 'Help (long)'
 
-complete -c cwebp -x -o q       -d 'Quality (float; 0…100; default: 75)'
+complete -c cwebp -x -o q -d 'Quality (float; 0…100; default: 75)'
 complete -c cwebp -x -o alpha_q -d 'Transparency-compression quality (integer 0…100; default: 100)'
 
 complete -c cwebp -x -n '__fish_cwebp_is_first_arg_or_its_value -preset' -o preset -a $preset_opts -d 'Preset setting'
 
-complete -c cwebp -x -o z        -a "$z_opts"        -d 'Lossless preset of level'
-complete -c cwebp -x -o m        -a "$m_opts"        -d 'Compression method'
+complete -c cwebp -x -o z -a "$z_opts" -d 'Lossless preset of level'
+complete -c cwebp -x -o m -a "$m_opts" -d 'Compression method'
 complete -c cwebp -x -o segments -a "$segments_opts" -d 'Number of segments to use'
-complete -c cwebp -x -o size                         -d 'Target size (in bytes)'
-complete -c cwebp -x -o psnr                         -d 'Target PSNR (in dB; typically: 42)'
+complete -c cwebp -x -o size -d 'Target size (in bytes)'
+complete -c cwebp -x -o psnr -d 'Target PSNR (in dB; typically: 42)'
 
-complete -c cwebp -x -o s                                       -d 'Input size (width x height) for YUV'
-complete -c cwebp -x -o sns                                     -d 'Spatial noise shaping (integer 0…100; default: 50)'
-complete -c cwebp -x -o f                                       -d 'Filter strength (integer 0…100; default: 60)'
-complete -c cwebp -x -o sharpness -a "$sharpness_opts"          -d 'Filter sharpness'
-complete -c cwebp    -o strong                                  -d 'Use strong filter'
-complete -c cwebp    -o simple                                  -d 'Use simple filter'
-complete -c cwebp    -o sharp_yuv                               -d 'Use sharper (and slower) RGB->YUV conversion'
-complete -c cwebp -x -o partition_limit                         -d 'Limit quality to fit the 512k limit on the first partition (integer 0:no degradation…100:full degradation)'
-complete -c cwebp -x -o pass -a '(__fish_cwebp_pass_opts)'      -d 'Analysis pass number'
-complete -c cwebp -x -o crop                                    -d 'Crop picture with <x> <y> <v> <h> rectangle'
-complete -c cwebp -x -o resize                                  -d 'Resize picture to <w> <h> after any cropping'
-complete -c cwebp    -o mt                                      -d 'Use multi-threading if available'
-complete -c cwebp    -o low_memory                              -d 'Reduce memory usage (slows encoding)'
-complete -c cwebp -x -o map                                     -d 'Print map of extra info'
-complete -c cwebp    -o print_psnr                              -d 'Print averaged PSNR distortion'
-complete -c cwebp    -o print_ssim                              -d 'Print averaged SSIM distortion'
-complete -c cwebp    -o print_lsim                              -d 'Print local-similarity distortion'
-complete -c cwebp -r -o d -a '(__fish_complete_suffix .pgm)'    -d 'Dump compressed output to given PGM file'
-complete -c cwebp -x -o alpha_method -a "$alpha_method_opts"    -d 'Transparency-compression method'
+complete -c cwebp -x -o s -d 'Input size (width x height) for YUV'
+complete -c cwebp -x -o sns -d 'Spatial noise shaping (integer 0…100; default: 50)'
+complete -c cwebp -x -o f -d 'Filter strength (integer 0…100; default: 60)'
+complete -c cwebp -x -o sharpness -a "$sharpness_opts" -d 'Filter sharpness'
+complete -c cwebp -o strong -d 'Use strong filter'
+complete -c cwebp -o simple -d 'Use simple filter'
+complete -c cwebp -o sharp_yuv -d 'Use sharper (and slower) RGB->YUV conversion'
+complete -c cwebp -x -o partition_limit -d 'Limit quality to fit the 512k limit on the first partition (integer 0:no degradation…100:full degradation)'
+complete -c cwebp -x -o pass -a '(__fish_cwebp_pass_opts)' -d 'Analysis pass number'
+complete -c cwebp -x -o crop -d 'Crop picture with <x> <y> <v> <h> rectangle'
+complete -c cwebp -x -o resize -d 'Resize picture to <w> <h> after any cropping'
+complete -c cwebp -o mt -d 'Use multi-threading if available'
+complete -c cwebp -o low_memory -d 'Reduce memory usage (slows encoding)'
+complete -c cwebp -x -o map -d 'Print map of extra info'
+complete -c cwebp -o print_psnr -d 'Print averaged PSNR distortion'
+complete -c cwebp -o print_ssim -d 'Print averaged SSIM distortion'
+complete -c cwebp -o print_lsim -d 'Print local-similarity distortion'
+complete -c cwebp -r -o d -a '(__fish_complete_suffix .pgm)' -d 'Dump compressed output to given PGM file'
+complete -c cwebp -x -o alpha_method -a "$alpha_method_opts" -d 'Transparency-compression method'
 complete -c cwebp -x -o alpha_filter -a "$alpha_filter_opts" -k -d 'Predictive filtering for alpha plane'
-complete -c cwebp -x -o exact                                   -d 'Preserve RGB values in transparent area'
-complete -c cwebp -x -o blend_alpha                             -d 'Blend colors against background color (e.g. 0xc0e0d0)'
-complete -c cwebp    -o noalpha                                 -d 'Discard any transparency information'
-complete -c cwebp    -o lossless                                -d 'Encode image losslessly'
-complete -c cwebp -x -o near_lossless                           -d 'Use near-lossless image preprocessing (integer 0…100:off; default: 100)'
-complete -c cwebp -x -o hint -a 'photo picture graph'           -d 'Specify image-characteristics hint'
+complete -c cwebp -x -o exact -d 'Preserve RGB values in transparent area'
+complete -c cwebp -x -o blend_alpha -d 'Blend colors against background color (e.g. 0xc0e0d0)'
+complete -c cwebp -o noalpha -d 'Discard any transparency information'
+complete -c cwebp -o lossless -d 'Encode image losslessly'
+complete -c cwebp -x -o near_lossless -d 'Use near-lossless image preprocessing (integer 0…100:off; default: 100)'
+complete -c cwebp -x -o hint -a 'photo picture graph' -d 'Specify image-characteristics hint'
 
-complete -c cwebp -x -o metadata -a "$metadata_opts"  -k -d 'Comma-separated list of metadata to copy, if present'
+complete -c cwebp -x -o metadata -a "$metadata_opts" -k -d 'Comma-separated list of metadata to copy, if present'
 
-complete -c cwebp -o short    -d 'Condense printed messages'
-complete -c cwebp -o quiet    -d 'Don\'t print anything'
-complete -c cwebp -o version  -d 'Print version number and exit'
-complete -c cwebp -o noasm    -d 'Disable all assembly optimizations'
-complete -c cwebp -o v        -d 'Be verbose (print encoding/decoding times)'
+complete -c cwebp -o short -d 'Condense printed messages'
+complete -c cwebp -o quiet -d 'Don\'t print anything'
+complete -c cwebp -o version -d 'Print version number and exit'
+complete -c cwebp -o noasm -d 'Disable all assembly optimizations'
+complete -c cwebp -o v -d 'Be verbose (print encoding/decoding times)'
 complete -c cwebp -o progress -d 'Report encoding progress'
 
-complete -c cwebp    -o jpeg_like -d 'Roughly match expected JPEG size'
-complete -c cwebp    -o af        -d 'Auto-adjust filter strength'
-complete -c cwebp -x -o pre       -d 'Pre-processing filter (integer)'
+complete -c cwebp -o jpeg_like -d 'Roughly match expected JPEG size'
+complete -c cwebp -o af -d 'Auto-adjust filter strength'
+complete -c cwebp -x -o pre -d 'Pre-processing filter (integer)'
 
 complete -c cwebp -r -o o -a '(__fish_complete_suffix .webp)' -d 'Output to file'
diff --git a/share/completions/env.fish b/share/completions/env.fish
index adcff27f9..3e231cc66 100644
--- a/share/completions/env.fish
+++ b/share/completions/env.fish
@@ -8,7 +8,7 @@ function __fish_complete_env_subcommand
     # Remove all VAR=VAL arguments up to the first that isn't
     while set -q argv[1]
         if string match -q '*=*' -- $argv[1]
-        or string match -q -- '-*' $argv[1]
+            or string match -q -- '-*' $argv[1]
             set -e argv[1]
         else
             break
diff --git a/share/completions/fzf.fish b/share/completions/fzf.fish
index bfdd62795..cf1327c90 100644
--- a/share/completions/fzf.fish
+++ b/share/completions/fzf.fish
@@ -22,13 +22,13 @@ complete -c fzf -l tiebreak -d 'Comma-separated list of sort criteria to apply w
 complete -c fzf -s m -l multi -d 'Enable multi-select with tab/shift-tab'
 complete -c fzf -l no-multi -d 'Disable multi-select'
 complete -c fzf -n 'string match "+*" -- (commandline -ct)' -a +m -d 'Disable multi-select'
-complete -c fzf -l no-mouse -d  'Disable mouse'
-complete -c fzf -l bind -d  'Comma-separated list of custom key bindings' -x
+complete -c fzf -l no-mouse -d 'Disable mouse'
+complete -c fzf -l bind -d 'Comma-separated list of custom key bindings' -x
 complete -c fzf -l cycle -d 'Enable cyclic scroll'
 complete -c fzf -l no-hscroll -d 'Disable horizontal scroll'
 complete -c fzf -l hscroll-off -d 'Number of screen columns to keep to the right of the highlighted substring' -x
 complete -c fzf -l filepath-word -d 'Make word-wise movements and actions respect path separators'
-complete -c fzf -l jump-labels  -d 'Make word-wise movements and actions respect path separators' -x
+complete -c fzf -l jump-labels -d 'Make word-wise movements and actions respect path separators' -x
 
 # layout
 complete -c fzf -l height -d 'Display fzf window below the cursor with the given height instead of using the full screen' -x
diff --git a/share/completions/go.fish b/share/completions/go.fish
index 7523214ef..b7be9ea36 100644
--- a/share/completions/go.fish
+++ b/share/completions/go.fish
@@ -75,40 +75,40 @@ complete -c go -n '__fish_seen_subcommand_from get' -o run -d "prints the names
 
 # help
 complete -c go -n '__fish_use_subcommand' -a help -d 'get help on topic'
-complete -c go -n '__fish_seen_subcommand_from help' -xa bug            -d "start a bug report"
-complete -c go -n '__fish_seen_subcommand_from help' -xa build          -d "compile packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa clean          -d "remove object files and cached files"
-complete -c go -n '__fish_seen_subcommand_from help' -xa doc            -d "show documentation for package or symbol"
-complete -c go -n '__fish_seen_subcommand_from help' -xa env            -d "print Go environment information"
-complete -c go -n '__fish_seen_subcommand_from help' -xa fix            -d "update packages to use new APIs"
-complete -c go -n '__fish_seen_subcommand_from help' -xa fmt            -d "gofmt (reformat) package sources"
-complete -c go -n '__fish_seen_subcommand_from help' -xa generate       -d "generate Go files by processing source"
-complete -c go -n '__fish_seen_subcommand_from help' -xa get            -d "download and install packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa install        -d "compile and install packages and dependencies"
-complete -c go -n '__fish_seen_subcommand_from help' -xa list           -d "list packages or modules"
-complete -c go -n '__fish_seen_subcommand_from help' -xa mod            -d "module maintenance"
-complete -c go -n '__fish_seen_subcommand_from help' -xa run            -d "compile and run Go program"
-complete -c go -n '__fish_seen_subcommand_from help' -xa test           -d "test packages"
-complete -c go -n '__fish_seen_subcommand_from help' -xa tool           -d "run specified go tool"
-complete -c go -n '__fish_seen_subcommand_from help' -xa version        -d "print Go version"
-complete -c go -n '__fish_seen_subcommand_from help' -xa vet            -d "report likely mistakes in packages"
-complete -c go -n '__fish_seen_subcommand_from help' -xa buildmode      -d "build modes"
-complete -c go -n '__fish_seen_subcommand_from help' -xa c              -d "calling between Go and C"
-complete -c go -n '__fish_seen_subcommand_from help' -xa cache          -d "build and test caching"
-complete -c go -n '__fish_seen_subcommand_from help' -xa environment    -d "environment variables"
-complete -c go -n '__fish_seen_subcommand_from help' -xa filetype       -d "file types"
-complete -c go -n '__fish_seen_subcommand_from help' -xa go.mod         -d "the go.mod file"
-complete -c go -n '__fish_seen_subcommand_from help' -xa gopath         -d "GOPATH environment variable"
-complete -c go -n '__fish_seen_subcommand_from help' -xa gopath-get     -d "legacy GOPATH go get"
-complete -c go -n '__fish_seen_subcommand_from help' -xa goproxy        -d "module proxy protocol"
-complete -c go -n '__fish_seen_subcommand_from help' -xa importpath     -d "import path syntax"
-complete -c go -n '__fish_seen_subcommand_from help' -xa modules        -d "modules, module versions, and more"
-complete -c go -n '__fish_seen_subcommand_from help' -xa module-get     -d "module-aware go get"
-complete -c go -n '__fish_seen_subcommand_from help' -xa module-auth    -d "module authentication using go.sum"
+complete -c go -n '__fish_seen_subcommand_from help' -xa bug -d "start a bug report"
+complete -c go -n '__fish_seen_subcommand_from help' -xa build -d "compile packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa clean -d "remove object files and cached files"
+complete -c go -n '__fish_seen_subcommand_from help' -xa doc -d "show documentation for package or symbol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa env -d "print Go environment information"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fix -d "update packages to use new APIs"
+complete -c go -n '__fish_seen_subcommand_from help' -xa fmt -d "gofmt (reformat) package sources"
+complete -c go -n '__fish_seen_subcommand_from help' -xa generate -d "generate Go files by processing source"
+complete -c go -n '__fish_seen_subcommand_from help' -xa get -d "download and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa install -d "compile and install packages and dependencies"
+complete -c go -n '__fish_seen_subcommand_from help' -xa list -d "list packages or modules"
+complete -c go -n '__fish_seen_subcommand_from help' -xa mod -d "module maintenance"
+complete -c go -n '__fish_seen_subcommand_from help' -xa run -d "compile and run Go program"
+complete -c go -n '__fish_seen_subcommand_from help' -xa test -d "test packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa tool -d "run specified go tool"
+complete -c go -n '__fish_seen_subcommand_from help' -xa version -d "print Go version"
+complete -c go -n '__fish_seen_subcommand_from help' -xa vet -d "report likely mistakes in packages"
+complete -c go -n '__fish_seen_subcommand_from help' -xa buildmode -d "build modes"
+complete -c go -n '__fish_seen_subcommand_from help' -xa c -d "calling between Go and C"
+complete -c go -n '__fish_seen_subcommand_from help' -xa cache -d "build and test caching"
+complete -c go -n '__fish_seen_subcommand_from help' -xa environment -d "environment variables"
+complete -c go -n '__fish_seen_subcommand_from help' -xa filetype -d "file types"
+complete -c go -n '__fish_seen_subcommand_from help' -xa go.mod -d "the go.mod file"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath -d "GOPATH environment variable"
+complete -c go -n '__fish_seen_subcommand_from help' -xa gopath-get -d "legacy GOPATH go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa goproxy -d "module proxy protocol"
+complete -c go -n '__fish_seen_subcommand_from help' -xa importpath -d "import path syntax"
+complete -c go -n '__fish_seen_subcommand_from help' -xa modules -d "modules, module versions, and more"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-get -d "module-aware go get"
+complete -c go -n '__fish_seen_subcommand_from help' -xa module-auth -d "module authentication using go.sum"
 complete -c go -n '__fish_seen_subcommand_from help' -xa module-private -d "module configuration for non-public modules"
-complete -c go -n '__fish_seen_subcommand_from help' -xa packages       -d "package lists and patterns"
-complete -c go -n '__fish_seen_subcommand_from help' -xa testflag       -d "testing flags"
-complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc       -d "testing functions"
+complete -c go -n '__fish_seen_subcommand_from help' -xa packages -d "package lists and patterns"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testflag -d "testing flags"
+complete -c go -n '__fish_seen_subcommand_from help' -xa testfunc -d "testing functions"
 
 # install
 complete -c go -n '__fish_use_subcommand' -a install -d 'compile and install packages and dependencies'
@@ -146,10 +146,10 @@ complete -c go -n '__fish_seen_subcommand_from vet' -s x -d "prints commands as
 # mod
 complete -c go -n '__fish_use_subcommand' -a mod -d 'module maintenance'
 complete -c go -f -n '__fish_seen_subcommand_from mod' -a download -d "download modules to local cache"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit     -d "edit go.mod from tools or scripts"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph    -d "print module requirement graph"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a init     -d "initialize new module in current directory"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a tidy     -d "add missing and remove unused modules"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a vendor   -d "make vendored copy of dependencies"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a verify   -d "verify dependencies have expected content"
-complete -c go -f -n '__fish_seen_subcommand_from mod' -a why      -d "explain why packages or modules are needed"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a edit -d "edit go.mod from tools or scripts"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a graph -d "print module requirement graph"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a init -d "initialize new module in current directory"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a tidy -d "add missing and remove unused modules"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a vendor -d "make vendored copy of dependencies"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a verify -d "verify dependencies have expected content"
+complete -c go -f -n '__fish_seen_subcommand_from mod' -a why -d "explain why packages or modules are needed"
diff --git a/share/completions/hledger.fish b/share/completions/hledger.fish
index ec33a6cae..be74055d9 100644
--- a/share/completions/hledger.fish
+++ b/share/completions/hledger.fish
@@ -14,153 +14,153 @@ set -l debug_opts '
     9\t
 '
 
-set -l takes_general_input_flags     'add commodities files'
+set -l takes_general_input_flags 'add commodities files'
 set -l takes_general_reporting_flags 'import check-dates check-dupes close equity rewrite balancesheet bs balancesheetequity bse cashflow cf incomestatement is roi accounts a activity balance bal b prices print txns p print-unique register reg r register-match stats tags'
 
 # General input flags
-complete -c hledger -r -s f -l file              -d 'Input file'                                 -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -r      -l rules-file        -d 'CSV-conversion-rules file'                  -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x      -l separator         -d 'CSV separator'                              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -r      -l alias             -d 'Rename account'                             -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -f      -l anon              -d 'Anonymize accounts and payees'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x      -l pivot             -d 'Use some other field/tag for account names' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
-complete -c hledger -x -s I -l ignore-assertions -d 'Ignore any balance assertions'              -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -s f -l file -d 'Input file' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -l rules-file -d 'CSV-conversion-rules file' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -l separator -d 'CSV separator' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -r -l alias -d 'Rename account' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -f -l anon -d 'Anonymize accounts and payees' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -l pivot -d 'Use some other field/tag for account names' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
+complete -c hledger -x -s I -l ignore-assertions -d 'Ignore any balance assertions' -n "__fish_seen_subcommand_from $takes_general_input_flags $takes_general_reporting_flags"
 
 # General reporting flags
-complete -c hledger -x -s b -l begin     -d 'Include postings/txns on or after this date'               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x -s e -l end       -d 'Include postings/txns before this date'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s D -l daily     -d 'Multiperiod/multicolumn report by day'                     -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s W -l weekly    -d 'Multiperiod/multicolumn report by week'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s M -l monthly   -d 'Multiperiod/multicolumn report by month'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s Q -l quarterly -d 'Multiperiod/multicolumn report by quarter'                 -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s Y -l yearly    -d 'Multiperiod/multicolumn report by year'                    -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x -s p -l period    -d 'Set start date, end date, and report interval'             -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l date2     -d 'Match secondary date instead'                              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s U -l unmarked  -d 'Include only unmarked postings/txns'                       -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s P -l pending   -d 'Include only pending (“!”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s C -l cleared   -d 'Include only cleared (“*”) postings/txns'                  -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s R -l real      -d 'Include only non-virtual postings'                         -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -x      -l depth     -d 'Hide accounts/postings deeper than this'                   -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s E -l empty     -d 'Show items with zero amount'                               -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s B -l cost      -d 'Converts amounts to their cost at txn time'                -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f -s V -l value     -d 'Converts amounts to their market value on report end date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l auto      -d 'Apply automated posting rules to modify txns'              -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
-complete -c hledger -f      -l forecast  -d 'Apply periodic txn rules to generate future txns'          -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s b -l begin -d 'Include postings/txns on or after this date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s e -l end -d 'Include postings/txns before this date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s D -l daily -d 'Multiperiod/multicolumn report by day' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s W -l weekly -d 'Multiperiod/multicolumn report by week' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s M -l monthly -d 'Multiperiod/multicolumn report by month' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Q -l quarterly -d 'Multiperiod/multicolumn report by quarter' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s Y -l yearly -d 'Multiperiod/multicolumn report by year' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -s p -l period -d 'Set start date, end date, and report interval' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l date2 -d 'Match secondary date instead' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s U -l unmarked -d 'Include only unmarked postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s P -l pending -d 'Include only pending (“!”) postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s C -l cleared -d 'Include only cleared (“*”) postings/txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s R -l real -d 'Include only non-virtual postings' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -x -l depth -d 'Hide accounts/postings deeper than this' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s E -l empty -d 'Show items with zero amount' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s B -l cost -d 'Converts amounts to their cost at txn time' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -s V -l value -d 'Converts amounts to their market value on report end date' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l auto -d 'Apply automated posting rules to modify txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
+complete -c hledger -f -l forecast -d 'Apply periodic txn rules to generate future txns' -n "__fish_seen_subcommand_from $takes_general_reporting_flags"
 
 # General help flags
-complete -c hledger -x -s h -l help                   -d 'Show help for this command'
-complete -c hledger -x      -l debug -a "$debug_opts" -d 'Show debug output'
-complete -c hledger -x      -l version                -d 'Show version information'
+complete -c hledger -x -s h -l help -d 'Show help for this command'
+complete -c hledger -x -l debug -a "$debug_opts" -d 'Show debug output'
+complete -c hledger -x -l version -d 'Show version information'
 
 # Commands
 
 # Data entry
-complete -c hledger -f -n '__fish_use_subcommand'   -a add                     -d 'Add transactions using guided prompts'
+complete -c hledger -f -n '__fish_use_subcommand' -a add -d 'Add transactions using guided prompts'
 complete -c hledger -f -n '__fish_seen_subcommand_from add' -l no-new-accounts -d 'Don’t allow creating new accounts'
 
-complete -c hledger    -n '__fish_use_subcommand'   -a import             -d 'Add new transactions from other files'
+complete -c hledger -n '__fish_use_subcommand' -a import -d 'Add new transactions from other files'
 complete -c hledger -f -n '__fish_seen_subcommand_from import' -l dry-run -d 'Just show the transactions to be imported'
 
 # Data management
-complete -c hledger -f -n '__fish_use_subcommand'   -a check-dates            -d 'Ensure transactions are ordered by date'
+complete -c hledger -f -n '__fish_use_subcommand' -a check-dates -d 'Ensure transactions are ordered by date'
 complete -c hledger -f -n '__fish_seen_subcommand_from check-dates' -l strict -d 'Makes date comparing strict'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes    -d 'Ensure accounts have different leaf names'
+complete -c hledger -f -n '__fish_use_subcommand' -a check-dupes -d 'Ensure accounts have different leaf names'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a  'close equity'     -d 'Generate balance-resetting transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'close equity' -d 'Generate balance-resetting transactions'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l opening -d 'Show just opening transaction'
 complete -c hledger -f -n '__fish_seen_subcommand_from close' -l closing -d 'Show just closing transaction'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a rewrite                 -d 'Generate automated postings/diffs'
+complete -c hledger -f -n '__fish_use_subcommand' -a rewrite -d 'Generate automated postings/diffs'
 complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l add-posting -d 'Add a posting to account'
-complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff        -d 'Generate diff suitable for patch(1)'
+complete -c hledger -f -n '__fish_seen_subcommand_from rewrite' -l diff -d 'Generate diff suitable for patch(1)'
 
 # Financial reports
 set -l financial_reports_commands 'balancesheet bs balancesheetequity bse cashflow cf incomestatement is' # these four (but not roi!) use the same commands
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs'                                                -d 'Show assets, liabilities, and net worth'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse'                                               -d 'Show assets, liabilities, and equity'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf'                                                -d 'Show changes in liquid assets'
-complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is'                                                -d 'Show revenues and expenses'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l change                          -d 'Show balance change in each period'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l cumulative                      -d 'Show balance change accumulated across periods'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical                      -d 'Show historical ending balance in each period'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l flat                            -d 'Show accounts as a list'
-complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l drop                            -d 'Omit N leading account-name parts (in flat mode)'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s N -l no-total                        -d 'Omit the final total row'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l tree                            -d 'Show accounts as a tree; amounts include subaccounts'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s A -l average                         -d 'Show a row average column in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
-complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands"      -l format                          -d 'Use a custom line format in multicolumn reports'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands"      -l pretty-tables                   -d 'Use Unicode when displaying tables'
-complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheet       bs' -d 'Show assets, liabilities, and net worth'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'balancesheetequity bse' -d 'Show assets, liabilities, and equity'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'cashflow           cf' -d 'Show changes in liquid assets'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'incomestatement    is' -d 'Show revenues and expenses'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l change -d 'Show balance change in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l cumulative -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s H -l historical -d 'Show historical ending balance in each period'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l flat -d 'Show accounts as a list'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands" -l drop -d 'Omit N leading account-name parts (in flat mode)'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s N -l no-total -d 'Omit the final total row'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l tree -d 'Show accounts as a tree; amounts include subaccounts'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s A -l average -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s T -l row-total -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l no-elide -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n "__fish_seen_subcommand_from $financial_reports_commands" -l format -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -l pretty-tables -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s S -l sort-amount -d 'Sort by amount instead of account code/name'
 complete -c hledger -f -n "__fish_seen_subcommand_from $financial_reports_commands" -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n "__fish_seen_subcommand_from $financial_reports_commands" -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a roi                        -d 'Show return on investments'
-complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow           -d 'Show all amounts that were used to compute returns'
-complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment         -d 'Query to select investment transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a roi -d 'Show return on investments'
+complete -c hledger -f -n '__fish_seen_subcommand_from roi' -l cashflow -d 'Show all amounts that were used to compute returns'
+complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l investment -d 'Query to select investment transactions'
 complete -c hledger -x -n '__fish_seen_subcommand_from roi' -l profit-loss -l pnl -d 'Query to select profit-and-loss or appreciation/valuation transactions'
 
 # Low-level reports
-complete -c hledger -f -n '__fish_use_subcommand'   -a accounts              -d 'Show account names'
+complete -c hledger -f -n '__fish_use_subcommand' -a accounts -d 'Show account names'
 complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l declared -d 'Show account names declared with account directives'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used     -d 'Show account names referenced by transactions'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree     -d 'Show short account names as a tree'
-complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat     -d 'Show short account names as a list'
-complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop     -d 'Omit N leading account name parts in flat mode'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l used -d 'Show account names referenced by transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l tree -d 'Show short account names as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from accounts' -l flat -d 'Show short account names as a list'
+complete -c hledger -x -n '__fish_seen_subcommand_from accounts' -l drop -d 'Omit N leading account name parts in flat mode'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a activity -d 'Show postings-per-interval bar charts'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a balance                                          -d 'Show balance changes/end balances/budgets in accounts'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l change                          -d 'Show balance change in each period'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l cumulative                      -d 'Show balance change accumulated across periods'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical                      -d 'Show historical ending balance in each period'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l tree                            -d 'Show accounts as a tree'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l flat                            -d 'Show accounts as a list'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s A -l average                         -d 'Show a row average column in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s T -l row-total                       -d 'Show a row total column in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s N -l no-total                        -d 'Omit the final row'
-complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l drop                            -d 'Omit N leading account name parts in flat mode'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l no-elide                        -d 'Don’t squash boring parent accounts in tree mode'
-complete -c hledger -x -n '__fish_seen_subcommand_from balance'      -l format                          -d 'Use a custom line format in multicolumn reports'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l pretty-tables                   -d 'Use Unicode when displaying tables'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s S -l sort-amount                     -d 'Sort by amount instead of account code/name'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l budget                          -d 'Show performance compared to budget goals defined by periodic transactions'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l invert                          -d 'Display all amounts with reversed sign'
-complete -c hledger -f -n '__fish_seen_subcommand_from balance'      -l transpose                       -d 'Transpose rows and columns'
+complete -c hledger -f -n '__fish_use_subcommand' -a balance -d 'Show balance changes/end balances/budgets in accounts'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l change -d 'Show balance change in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l cumulative -d 'Show balance change accumulated across periods'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s H -l historical -d 'Show historical ending balance in each period'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l tree -d 'Show accounts as a tree'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l flat -d 'Show accounts as a list'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s A -l average -d 'Show a row average column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s T -l row-total -d 'Show a row total column in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s N -l no-total -d 'Omit the final row'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance' -l drop -d 'Omit N leading account name parts in flat mode'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l no-elide -d 'Don’t squash boring parent accounts in tree mode'
+complete -c hledger -x -n '__fish_seen_subcommand_from balance' -l format -d 'Use a custom line format in multicolumn reports'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l pretty-tables -d 'Use Unicode when displaying tables'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -s S -l sort-amount -d 'Sort by amount instead of account code/name'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l budget -d 'Show performance compared to budget goals defined by periodic transactions'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l invert -d 'Display all amounts with reversed sign'
+complete -c hledger -f -n '__fish_seen_subcommand_from balance' -l transpose -d 'Transpose rows and columns'
 complete -c hledger -x -n '__fish_seen_subcommand_from balance' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from balance' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a commodities    -d 'Show commodity/currency symbols'
+complete -c hledger -f -n '__fish_use_subcommand' -a commodities -d 'Show commodity/currency symbols'
 
-complete -c hledger -f -n '__fish_use_subcommand' -a files          -d 'Show input file paths'
+complete -c hledger -f -n '__fish_use_subcommand' -a files -d 'Show input file paths'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a prices                    -d 'Show market-price records'
-complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs          -d 'Print transaction prices from postings'
+complete -c hledger -f -n '__fish_use_subcommand' -a prices -d 'Show market-price records'
+complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l costs -d 'Print transaction prices from postings'
 complete -c hledger -f -n '__fish_seen_subcommand_from prices' -l inverted-costs -d 'Print transaction inverted prices from postings also'
 
-complete -c hledger -f -n '__fish_use_subcommand'  -a 'print txns'                                                      -d 'Show transactions'
-complete -c hledger -f -n '__fish_use_subcommand'  -a            'print-unique'                                         -d 'Show only transactions with unique descriptions'
-complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match                           -d 'Show the most-recent transaction most similar to STR'
-complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit                        -d 'Show all amounts explicitly'
-complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique'      -l new                             -d 'Show only newer-dated transactions added in each file since last run'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'print txns' -d 'Show transactions'
+complete -c hledger -f -n '__fish_use_subcommand' -a 'print-unique' -d 'Show only transactions with unique descriptions'
+complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s m -l match -d 'Show the most-recent transaction most similar to STR'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -s x -l explicit -d 'Show all amounts explicitly'
+complete -c hledger -f -n '__fish_seen_subcommand_from print txns print-unique' -l new -d 'Show only newer-dated transactions added in each file since last run'
 complete -c hledger -x -n '__fish_seen_subcommand_from print txns print-unique' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from print txns print-unique' -s o -l output-file -d 'Write output to given file; extension selects format'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a register                                          -d 'Show postings in one or more accounts & running total'
-complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l cumulative                      -d 'Show running total from report start date'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical                      -d 'Show historical running total/balance'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average                         -d 'Show running average of posting amounts instead of total (implies --empty)'
-complete -c hledger -f -n '__fish_seen_subcommand_from register' -s r -l related                         -d 'Show postings’ siblings instead'
-complete -c hledger -f -n '__fish_seen_subcommand_from register'      -l invert                          -d 'Display all amounts with reversed sign'
-complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width                           -d 'Set output width (defaults to terminal width or $COLUMNS)'
+complete -c hledger -f -n '__fish_use_subcommand' -a register -d 'Show postings in one or more accounts & running total'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -l cumulative -d 'Show running total from report start date'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s H -l historical -d 'Show historical running total/balance'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s A -l average -d 'Show running average of posting amounts instead of total (implies --empty)'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -s r -l related -d 'Show postings’ siblings instead'
+complete -c hledger -f -n '__fish_seen_subcommand_from register' -l invert -d 'Display all amounts with reversed sign'
+complete -c hledger -x -n '__fish_seen_subcommand_from register' -s w -l width -d 'Set output width (defaults to terminal width or $COLUMNS)'
 complete -c hledger -x -n '__fish_seen_subcommand_from register' -s O -l output-format -a 'txt csv html' -d 'Select an output format'
-complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file                     -d 'Write output to given file; extension selects format'
+complete -c hledger -r -n '__fish_seen_subcommand_from register' -s o -l output-file -d 'Write output to given file; extension selects format'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a register-match -d 'Show a recent posting that best matches a description'
 
-complete -c hledger -f -n '__fish_use_subcommand'   -a stats                      -d 'Show journal statistics'
+complete -c hledger -f -n '__fish_use_subcommand' -a stats -d 'Show journal statistics'
 complete -c hledger -r -n '__fish_seen_subcommand_from stats' -s o -l output-file -d 'Write output to given file; extension selects format'
 
 complete -c hledger -f -n '__fish_use_subcommand' -a tags -d 'Show tag names'
diff --git a/share/completions/keybase.fish b/share/completions/keybase.fish
index 4fa7660df..7d35f70bd 100644
--- a/share/completions/keybase.fish
+++ b/share/completions/keybase.fish
@@ -3,7 +3,9 @@
 function __fish_keybase_line_ends_with
     set -l line (commandline -poc | string match -v -r '^-')
     for i in (seq -1 -1 -(count $argv))
-        if test "$line[$i]" != "$argv[$i]"; return 1; end
+        if test "$line[$i]" != "$argv[$i]"
+            return 1
+        end
     end
 end
 
diff --git a/share/completions/pipenv.fish b/share/completions/pipenv.fish
index 45ae4ed25..cb05df286 100644
--- a/share/completions/pipenv.fish
+++ b/share/completions/pipenv.fish
@@ -1,5 +1,5 @@
 if command -sq pipenv
     # pipenv determines which completions to print via some automagic that might not be perfect.
     # Force it to be correct.
-    _PIPENV_COMPLETE=source-fish  pipenv --completion 2>/dev/null | source
+    _PIPENV_COMPLETE=source-fish pipenv --completion 2>/dev/null | source
 end
diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 3ef699ce1..4076f6d5a 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -1,5 +1,5 @@
 function __fish_complete_setxkbmap --description 'Complete setxkb options' --argument-names what
-     sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
+    sed -e "1,/! $what/d" -e '/^\s*$/,$d' /usr/share/X11/xkb/rules/xorg.lst | sed -r 's/\s+(\S+)\s+(.+)/\1\t\2/'
 end
 
 set -l filter '"s/\S+\s\S+\s(.+)\((.+)\)/\1\t\2/;"'
diff --git a/share/completions/sfdx.fish b/share/completions/sfdx.fish
index 84f274a78..b5c98cffa 100644
--- a/share/completions/sfdx.fish
+++ b/share/completions/sfdx.fish
@@ -23,380 +23,380 @@ set -l sfdx_loglevels 'trace debug info warn error fatal TRACE DEBUG INFO WARN E
 # commands
 #
 complete $sfdx_looking -xa commands -d 'list all the commands'
-complete -c sfdx -n '__fish_sfdx_using_command commands' -s h -l help   -d 'show CLI help'
-complete -c sfdx -n '__fish_sfdx_using_command commands' -s j -l json   -d 'output in json format'
-complete -c sfdx -n '__fish_sfdx_using_command commands'      -l hidden -d 'also show hidden commands'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s h -l help -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -s j -l json -d 'output in json format'
+complete -c sfdx -n '__fish_sfdx_using_command commands' -l hidden -d 'also show hidden commands'
 
 #
 # force
 #
 complete $sfdx_looking -xa force -d 'tools for the Salesforce developer'
-complete -c sfdx -n '__fish_sfdx_using_command force' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:alias -d 'manage username aliases'
 
 complete $sfdx_looking -xa force:alias:list -d 'list username aliases for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:alias:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
-complete $sfdx_looking -xa force:alias:set  -d 'set username aliases for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l json     -d 'format output as json'
+complete $sfdx_looking -xa force:alias:set -d 'set username aliases for the Salesforce CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:alias:set' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex -d 'work with Apex code'
 
 complete $sfdx_looking -xa force:apex:execute -d 'execute anonymous Apex code'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s f -l apexcodefile   -d 'path to a local file containing Apex code'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s f -l apexcodefile -d 'path to a local file containing Apex code'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:execute' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:class -d 'create an Apex class'
 
 complete $sfdx_looking -xa force:apex:class:create -d 'create an Apex class'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s n -l classname  -d '(required) name of the generated Apex class'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s t -l template   -d '[default: DefaultApexClass] template to use for file creation' -xa 'DefaultApexClass ApexException ApexUnitTest InboundEmailService'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s n -l classname -d '(required) name of the generated Apex class'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -s t -l template -d '[default: DefaultApexClass] template to use for file creation' -xa 'DefaultApexClass ApexException ApexUnitTest InboundEmailService'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:class:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log -d 'work with Apex logs'
 
 complete $sfdx_looking -xa force:apex:log:get -d 'fetch the last debug log'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s c -l color          -d 'colorize noteworthy log lines'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s i -l logid          -d 'ID of the log to display'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s n -l number         -d 'number of most recent logs to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s c -l color -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s i -l logid -d 'ID of the log to display'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s n -l number -d 'number of most recent logs to display'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log:list -d 'list debug logs'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:log:tail -d 'start debug logging and display logs'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s c -l color          -d 'colorize noteworthy log lines'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s d -l debuglevel     -d 'debug level for trace flag'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s s -l skiptraceflag  -d 'skip trace flag setup'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s c -l color -d 'colorize noteworthy log lines'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s d -l debuglevel -d 'debug level for trace flag'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s s -l skiptraceflag -d 'skip trace flag setup'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:log:tail' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:apex:test -d 'work with Apex tests'
 
 complete $sfdx_looking -xa force:apex:test:report -d 'display test results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s c -l codecoverage   -d 'retrieve code coverage results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s d -l outputdir      -d 'directory to store test run files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s i -l testrunid      -d '(required) ID of test run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s c -l codecoverage -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s d -l outputdir -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s i -l testrunid -d '(required) ID of test run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s w -l wait           -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report'      -l verbose        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:report' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:apex:test:run -d 'invoke Apex tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s c -l codecoverage   -d 'retrieve code coverage results'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s d -l outputdir      -d 'directory to store test run files'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s l -l testlevel      -d 'testlevel enum value' -xa 'RunLocalTests RunAllTestsInOrg RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s n -l classnames     -d 'comma-separated list of Apex test class names to run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s r -l resultformat   -d 'result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s s -l suitenames     -d 'comma-separated list of Apex test suite names to run'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s t -l tests          -d 'comma-separated list of Apex test class names or IDs and, if applicable, test methods to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s c -l codecoverage -d 'retrieve code coverage results'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s d -l outputdir -d 'directory to store test run files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s l -l testlevel -d 'testlevel enum value' -xa 'RunLocalTests RunAllTestsInOrg RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s n -l classnames -d 'comma-separated list of Apex test class names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s r -l resultformat -d 'result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s s -l suitenames -d 'comma-separated list of Apex test suite names to run'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s t -l tests -d 'comma-separated list of Apex test class names or IDs and, if applicable, test methods to run'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s w -l wait           -d 'the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s y -l synchronous    -d 'run tests from a single class synchronously'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run'      -l verbose        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s w -l wait -d 'the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -s y -l synchronous -d 'run tests from a single class synchronously'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:test:run' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:apex:trigger -d 'create an Apex trigger'
 
 complete $sfdx_looking -xa force:apex:trigger:create -d 'create an Apex trigger'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s e -l triggerevents -d '[default: before insert] events that fire the trigger (before insert|before update|before delete|after insert|after update|after delete|after undelete)'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s n -l triggername   -d '(required) name of the generated Apex trigger'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s s -l sobject       -d '[default: SOBJECT] sObject to create a trigger on'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s t -l template      -d '[default: ApexTrigger] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s n -l triggername -d '(required) name of the generated Apex trigger'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s s -l sobject -d '[default: SOBJECT] sObject to create a trigger on'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -s t -l template -d '[default: ApexTrigger] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:apex:trigger:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth -d 'authorize an org for use with the Salesforce'
 
 complete $sfdx_looking -xa force:auth:list -d 'list auth connection information'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:logout -d 'log out from authorized orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s a -l all            -d 'include all authenticated orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s a -l all -d 'include all authenticated orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s p -l noprompt -d 'do not prompt for confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:logout' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:jwt -d 'authorize an org using JWT'
 
 complete $sfdx_looking -xa force:auth:jwt:grant -d 'authorize an org using the JWT flow'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s f -l jwtkeyfile               -d '(required) path to a file containing the private key'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s u -l username                 -d '(required) authentication username'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s f -l jwtkeyfile -d '(required) path to a file containing the private key'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s i -l clientid -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s r -l instanceurl -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -s u -l username -d '(required) authentication username'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:jwt:grant' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:sfdxurl -d 'authorize an org using sfdxurl'
 
 complete $sfdx_looking -xa force:auth:sfdxurl:store -d 'authorize an org using an SFDX auth URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s f -l sfdxurlfile              -d '(required) path to a file containing the sfdx url'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s f -l sfdxurlfile -d '(required) path to a file containing the sfdx url'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:sfdxurl:store' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:auth:web -d 'authorize an org using a web browser'
 
 complete $sfdx_looking -xa force:auth:web:login -d 'authorize an org using the web login flow'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s a -l setalias                 -d 'set an alias for the authenticated org'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s a -l setalias -d 'set an alias for the authenticated org'
 complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s d -l setdefaultdevhubusername -d 'set the authenticated org as the default dev hub org for scratch org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s i -l clientid                 -d '(required) OAuth client ID (sometimes called the consumer key)'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s r -l instanceurl              -d 'the login URL of the instance the org lives on'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s s -l setdefaultusername       -d 'set the authenticated org as the default username that all commands run against'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s i -l clientid -d '(required) OAuth client ID (sometimes called the consumer key)'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s r -l instanceurl -d 'the login URL of the instance the org lives on'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -s s -l setdefaultusername -d 'set the authenticated org as the default username that all commands run against'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:auth:web:login' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:config -d 'configure the Salesforce CLI'
 
 complete $sfdx_looking -xa force:config:get -d 'get config var values for given names'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l verbose  -d 'emit additional command output to stdout'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:get' -l verbose -d 'emit additional command output to stdout'
 
 complete $sfdx_looking -xa force:config:list -d 'list config vars for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:config:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:config:set -d 'set config vars for the Salesforce CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -s g -l global   -d 'set config var globally (to be used from any directory)'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:config:set'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -s g -l global -d 'set config var globally (to be used from any directory)'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:config:set' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data -d 'manipulate records in your org'
 
 complete $sfdx_looking -xa force:data:bulk -d 'manipulate records using the bulk API'
 
 complete $sfdx_looking -xa force:data:bulk:delete -d 'bulk delete records from a csv file'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile        -d '(required) the path to the CSV file containing the ids of the records to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype    -d '(required) the sObject type of the records you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s f -l csvfile -d '(required) the path to the CSV file containing the ids of the records to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s s -l sobjecttype -d '(required) the sObject type of the records you’re deleting'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:bulk:status -d 'view the status of a bulk data load job or batch'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s b -l batchid        -d 'the ID of the batch whose status you want to view'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s i -l jobid          -d '(required) the ID of the job you want to view or of the job whose batch you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s b -l batchid -d 'the ID of the batch whose status you want to view'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s i -l jobid -d '(required) the ID of the job you want to view or of the job whose batch you want to view'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:bulk:upsert -d 'bulk upsert records from a CSV file'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l csvfile        -d '(required) the path to the CSV file that defines the records to upsert'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid     -d '(required) the column name of the external ID'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype    -d '(required) the sObject type of the records you want to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s f -l csvfile -d '(required) the path to the CSV file that defines the records to upsert'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s i -l externalid -d '(required) the column name of the external ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s s -l sobjecttype -d '(required) the sObject type of the records you want to upsert'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait           -d 'the number of minutes to wait for the command to complete before displaying the results'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -s w -l wait -d 'the number of minutes to wait for the command to complete before displaying the results'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:bulk:upsert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:record -d 'manipulate records using the enterprise API'
 
 complete $sfdx_looking -xa force:data:record:create -d 'create a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s v -l values         -d '(required) the <fieldName>=<value> pairs you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -s v -l values -d '(required) the <fieldName>=<value> pairs you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:create' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:delete -d 'delete a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:delete' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:get -d 'view a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:get' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:record:update -d 'update a record'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s i -l sobjectid      -d 'the ID of the record you’re deleting'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s s -l sobjecttype    -d '(required) the type of the record you’re creating'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s t -l usetoolingapi  -d 'create the record with tooling api'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s i -l sobjectid -d 'the ID of the record you’re deleting'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s s -l sobjecttype -d '(required) the type of the record you’re creating'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s t -l usetoolingapi -d 'create the record with tooling api'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s w -l where          -d 'a list of <fieldName>=<value> pairs to search for'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -s w -l where -d 'a list of <fieldName>=<value> pairs to search for'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:record:update' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:soql -d 'fetch records using SOQL'
 
 complete $sfdx_looking -xa force:data:soql:query -d 'execute a SOQL query'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s q -l query          -d '(required) SOQL query to execute'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s r -l resultformat   -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human csv json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s t -l usetoolingapi  -d 'execute query with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s q -l query -d '(required) SOQL query to execute'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human csv json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s t -l usetoolingapi -d 'execute query with Tooling API'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query'      -l perflog        -d 'get API performance data'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:soql:query' -l perflog -d 'get API performance data'
 
 complete $sfdx_looking -xa force:data:tree -d 'manipulate records using the tree API'
 
 complete $sfdx_looking -xa force:data:tree:export -d 'export data from an org into sObject tree format for force:data:tree:import consumption'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir      -d 'directory to store files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan           -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query          -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s d -l outputdir -d 'directory to store files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s p -l plan -d 'generate multiple sobject tree files and a plan definition file for aggregated import'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s q -l query -d '(required) soql query, or filepath of file containing a soql query, to retrieve records'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix         -d 'prefix of generated files'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -s x -l prefix -d 'prefix of generated files'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:export' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:data:tree:import -d 'import data into an org using SObject Tree Save API'
 complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s f -l sobjecttreefiles -d 'comma-delimited, ordered paths of json files containing collection of record trees to insert'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s p -l plan             -d 'path to plan to insert multiple data files that have master-detail relationships'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l confighelp       -d 'display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s p -l plan -d 'path to plan to insert multiple data files that have master-detail relationships'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l confighelp -d 'display schema information for the --plan configuration file to stdout; if you use this option, all other options except --json are ignored'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:data:tree:import' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:doc -d 'display help for force commands'
 
 complete $sfdx_looking -xa force:doc:commands -d 'display help for force commands'
 
 complete $sfdx_looking -xa force:doc:commands:display -d 'display help for force commands'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:doc:commands:list -d 'list the force commands'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -s u -l usage    -d 'list only docopt usage strings'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -s u -l usage -d 'list only docopt usage strings'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:doc:commands:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning -d 'create Aura components and Lightning web'
 
 complete $sfdx_looking -xa force:lightning:lint -d 'analyze (lint) Aura component code'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -s i -l ignore   -d 'pattern used to ignore some folders'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l config   -d 'path to a custom ESLint configuration file'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l exit     -d 'exit with error code 1 if there are lint issues'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l files    -d 'pattern used to include specific files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint'      -l verbose  -d 'report warnings in addition to errors'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -s i -l ignore -d 'pattern used to ignore some folders'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l config -d 'path to a custom ESLint configuration file'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l exit -d 'exit with error code 1 if there are lint issues'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l files -d 'pattern used to include specific files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:lint' -l verbose -d 'report warnings in addition to errors'
 
 complete $sfdx_looking -xa force:lightning:app -d 'create a Lightning app'
 
 complete $sfdx_looking -xa force:lightning:app:create -d 'create a Lightning app'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s n -l appname    -d '(required) name of the generated Lightning app'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s t -l template   -d '[default: DefaultLightningApp] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s n -l appname -d '(required) name of the generated Lightning app'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -s t -l template -d '[default: DefaultLightningApp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:app:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:component -d 'create a bundle for an Aura component or a Lightning web component'
 
 complete $sfdx_looking -xa force:lightning:component:create -d 'create a bundle for an Aura component or a Lightning web component'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s n -l componentname -d '(required) name of the generated Lightning component'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s t -l template      -d '[default: DefaultLightningCmp] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create'      -l type          -d '[default: aura] type of the Lightning component' -xa 'aura lwc'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -s t -l template -d '[default: DefaultLightningCmp] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:component:create' -l type -d '[default: aura] type of the Lightning component' -xa 'aura lwc'
 
 complete $sfdx_looking -xa force:lightning:event -d 'create a Lightning event'
 
 complete $sfdx_looking -xa force:lightning:event:create -d 'create a Lightning event'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s a -l apiversion -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s d -l outputdir  -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s n -l eventname  -d '(required) name of the generated Lightning event'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s t -l template   -d '[default: DefaultLightningEvt] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l json       -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create'      -l loglevel   -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s n -l eventname -d '(required) name of the generated Lightning event'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -s t -l template -d '[default: DefaultLightningEvt] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:event:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:interface -d 'create a Lightning interface'
 
 complete $sfdx_looking -xa force:lightning:interface:create -d 'create a Lightning interface'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s d -l outputdir     -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s d -l outputdir -d 'folder for saving the created files'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s n -l interfacename -d '(required) name of the generated Lightning interface'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s t -l template      -d '[default: DefaultLightningIntf] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -s t -l template -d '[default: DefaultLightningIntf] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:interface:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test -d 'test Aura components'
 
 complete $sfdx_looking -xa force:lightning:test:create -d 'create a Lightning test'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s d -l outputdir -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s n -l testname  -d '(required) name of the generated Lightning test'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s t -l template  -d '[default: DefaultLightningTest] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l json      -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s n -l testname -d '(required) name of the generated Lightning test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -s t -l template -d '[default: DefaultLightningTest] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test:install -d 'install Lightning Testing Service unmanaged package in your org'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s r -l releaseversion -d '[default: latest] release version of Lightning Testing Service'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype    -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s t -l packagetype -d '[default: full] type of unmanaged package. \'full\' option contains both jasmine and mocha, plus examples' -xa 'jasmine mocha full'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait           -d '[default: 2 minutes] number of minutes to wait for installation status'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -s w -l wait -d '[default: 2 minutes] number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:install' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:lightning:test:run -d 'invoke Aura component tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s a -l appname          -d 'name of your Lightning test application'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s d -l outputdir        -d 'directory path to store test run artifacts: for example, log files and test results'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s f -l configfile       -d 'path to config file for the test'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s a -l appname -d 'name of your Lightning test application'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s d -l outputdir -d 'directory path to store test run artifacts: for example, log files and test results'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s f -l configfile -d 'path to config file for the test'
 complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s o -l leavebrowseropen -d 'leave browser open'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s r -l resultformat     -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s t -l timeout          -d '[default: 60000] time (ms) to wait for results element in dom'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s r -l resultformat -d '[default: human] result format emitted to stdout; --json flag overrides this parameter' -xa 'human tap junit json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s t -l timeout -d '[default: 60000] time (ms) to wait for results element in dom'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:lightning:test:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:limits -d 'view your org’s limits'
 
@@ -404,324 +404,324 @@ complete $sfdx_looking -xa force:limits:api -d 'view your org’s API limits'
 
 complete $sfdx_looking -xa force:limits:api:display -d 'display current org’s limits'
 complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:limits:api:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi -d 'retrieve and deploy metadata using Metadata'
 
 complete $sfdx_looking -xa force:mdapi:convert -d 'convert metadata from the Metadata API format into the source format'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s d -l outputdir -d 'the output directory to store the source–formatted files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s r -l rootdir   -d '(required) the root directory containing the Metadata API–formatted metadata'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l json      -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert'      -l loglevel  -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -s r -l rootdir -d '(required) the root directory containing the Metadata API–formatted metadata'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:convert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:deploy -d 'deploy metadata using Metadata API'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s c -l checkonly                -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s d -l deploydir                -d 'root of directory tree of files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s f -l zipfile                  -d 'path to .zip file of metadata to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s g -l ignorewarnings           -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s l -l testlevel                -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s o -l ignoreerrors             -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s d -l deploydir -d 'root of directory tree of files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s f -l zipfile -d 'path to .zip file of metadata to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s r -l runtests                 -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s u -l targetusername           -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s w -l wait                     -d 'wait time for command to finish in minutes (default: 0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l apiversion               -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l json                     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l loglevel                 -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy'      -l verbose                  -d 'verbose output of deploy results'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -s w -l wait -d 'wait time for command to finish in minutes (default: 0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy' -l verbose -d 'verbose output of deploy results'
 
 complete $sfdx_looking -xa force:mdapi:deploy:cancel -d 'cancel a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:cancel' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:deploy:report -d 'check the status of a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report'      -l verbose        -d 'verbose output of deploy results'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:deploy:report' -l verbose -d 'verbose output of deploy results'
 
 complete $sfdx_looking -xa force:mdapi:describemetadata -d 'display the metadata types enabled for your org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s a -l apiversion     -d 'API version to use (the default is 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s f -l resultfile     -d 'filter metadata known by the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s a -l apiversion -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s f -l resultfile -d 'filter metadata known by the CLI'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:describemetadata' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:listmetadata -d 'display properties of metadata components of a specified type'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion      -d 'API version to use (the default is 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile      -d 'path to the file where results are stored'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype    -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l folder          -d 'folder associated with the component; required for components that use folders; folder names are case-sensitive'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s a -l apiversion -d 'API version to use (the default is 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s f -l resultfile -d 'path to the file where results are stored'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s m -l metadatatype -d '(required) metadata type to be retrieved, such as CustomObject; metadata type value is case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l folder -d 'folder associated with the component; required for components that use folders; folder names are case-sensitive'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:listmetadata' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:mdapi:retrieve -d 'retrieve metadata using Metadata API'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s a -l apiversion        -d 'target API version for the retrieve (default 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s d -l sourcedir         -d 'source dir to use instead of the default package dir in sfdx-project.json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s k -l unpackaged        -d 'file path of manifest of components to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s p -l packagenames      -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s a -l apiversion -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s d -l sourcedir -d 'source dir to use instead of the default package dir in sfdx-project.json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s k -l unpackaged -d 'file path of manifest of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s p -l packagenames -d 'a comma-separated list of packages to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s r -l retrievetargetdir -d '(required) directory root for the retrieved files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s s -l singlepackage     -d 'a single-package retrieve (default: false)'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l json              -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve'      -l verbose           -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s s -l singlepackage -d 'a single-package retrieve (default: false)'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -s w -l wait -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:mdapi:retrieve:report -d 'check the status of a metadata retrieval'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s i -l jobid             -d 'job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s i -l jobid -d 'job ID of the retrieve you want to check; defaults to your most recent CLI retrieval if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s r -l retrievetargetdir -d 'directory root for the retrieved files'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s u -l targetusername    -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s w -l wait              -d 'wait time for command to finish in minutes (default: -1 (no limit))'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l apiversion        -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l json              -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l loglevel          -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report'      -l verbose           -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -s w -l wait -d 'wait time for command to finish in minutes (default: -1 (no limit))'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:mdapi:retrieve:report' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:org -d 'manage your orgs'
 
 complete $sfdx_looking -xa force:org:clone -d 'clone a sandbox org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias           -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile     -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s f -l definitionfile -d 'path to an org definition file'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s s -l setdefaultusername -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type               -d '(required) type of org to create' -xa 'sandbox'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait               -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l apiversion         -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l json               -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:clone'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s t -l type -d '(required) type of org to create' -xa 'sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:clone' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:create -d 'create a scratch or sandbox org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s a -l setalias             -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s c -l noancestors          -d 'do not include second-generation package ancestors in the scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s d -l durationdays         -d 'duration of the scratch org (in days) (default:7, min:1, max:30)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s f -l definitionfile       -d 'path to an org definition file'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s i -l clientid             -d 'connected app consumer key; not supported for sandbox org creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s n -l nonamespace          -d 'create the scratch org with no namespace'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s s -l setdefaultusername   -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s t -l type                 -d '[default: scratch] type of org to create; sandbox org creation is in beta' -xa 'scratch sandbox'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s c -l noancestors -d 'do not include second-generation package ancestors in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s d -l durationdays -d 'duration of the scratch org (in days) (default:7, min:1, max:30)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s f -l definitionfile -d 'path to an org definition file'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s i -l clientid -d 'connected app consumer key; not supported for sandbox org creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s n -l nonamespace -d 'create the scratch org with no namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s s -l setdefaultusername -d 'set the created org as the default username'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s t -l type -d '[default: scratch] type of org to create; sandbox org creation is in beta' -xa 'scratch sandbox'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s w -l wait                 -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -s w -l wait -d '[default: 6 minutes] the streaming client socket timeout (in minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:delete -d 'mark a scratch org for deletion'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s p -l noprompt             -d 'no prompt to confirm deletion'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s p -l noprompt -d 'no prompt to confirm deletion'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:display -d 'get org description'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:display'      -l verbose        -d 'emit additional command output to stdout'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:display' -l verbose -d 'emit additional command output to stdout'
 
 complete $sfdx_looking -xa force:org:list -d 'list all orgs you’ve created or authenticated to'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -s p -l noprompt -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l all      -d 'include expired, deleted, and unknown-status scratch orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l clean    -d 'remove all local org authorizations for non-active orgs'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:list'      -l verbose  -d 'list more information about each org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l all -d 'include expired, deleted, and unknown-status scratch orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l clean -d 'remove all local org authorizations for non-active orgs'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:list' -l verbose -d 'list more information about each org'
 
 complete $sfdx_looking -xa force:org:open -d 'open an org in your browser'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s p -l path           -d 'navigation URL path'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s r -l urlonly        -d 'display navigation URL, but don’t launch browser'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s p -l path -d 'navigation URL path'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s r -l urlonly -d 'display navigation URL, but don’t launch browser'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:open' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:status -d 'report sandbox org creation status and headlessly authenticate to org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalias           -d 'alias for the created org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname        -d '(required) name of the sandbox org to check status for'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s a -l setalias -d 'alias for the created org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s n -l sandboxname -d '(required) name of the sandbox org to check status for'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s s -l setdefaultusername -d 'set the created org as the default username'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername     -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait               -d '[default: 6 minutes] number of minutes to wait while polling for status'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l apiversion         -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l json               -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:status'      -l loglevel           -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -s w -l wait -d '[default: 6 minutes] number of minutes to wait while polling for status'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape -d 'manage org shape'
 
 complete $sfdx_looking -xa force:org:shape:create -d 'create a snapshot of org edition, features, and licenses'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape:delete -d 'delete all org shapes for a target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s p -l noprompt       -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s p -l noprompt -d 'do not prompt for confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:shape:list -d 'list all org shapes you’ve created'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l json     -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l json -d 'format output as json'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l verbose  -d 'list more information about each org shape'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:shape:list' -l verbose -d 'list more information about each org shape'
 
 complete $sfdx_looking -xa force:org:snapshot -d 'snapshot a scratch org'
 
 complete $sfdx_looking -xa force:org:snapshot:create -d 'snapshot a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s d -l description          -d 'description of snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s n -l snapshotname         -d '(required) unique name of snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s o -l sourceorg            -d '(required) ID or locally authenticated username or alias of scratch org to snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s d -l description -d 'description of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s n -l snapshotname -d '(required) unique name of snapshot'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s o -l sourceorg -d '(required) ID or locally authenticated username or alias of scratch org to snapshot'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:delete -d 'delete a scratch org snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s s -l snapshot             -d '(required) name or ID of snapshot to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s s -l snapshot -d '(required) name or ID of snapshot to delete'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:get -d 'get details about a scratch org snapshot'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s s -l snapshot             -d '(required) name or ID of snapshot to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s s -l snapshot -d '(required) name or ID of snapshot to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:org:snapshot:list -d 'list scratch org snapshots'
 complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:org:snapshot:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package -d 'develop and install packages'
 
 complete $sfdx_looking -xa force:package:create -d 'create a package'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s d -l description -d 'package description'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s e -l nonamespace -d 'creates the package with no namespace; available only for unlocked packages.'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s n -l name        -d '(required) package name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l path        -d '(required) path to directory that contains the contents of the package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s n -l name -d '(required) package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l path -d '(required) path to directory that contains the contents of the package'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l packagetype -d '(required) package type' -xa 'Managed Unlocked'
 
 complete $sfdx_looking -xa force:package:install -d 'install packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt        -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s w -l wait            -d 'number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s r -l noprompt -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s s -l securitytype -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s t -l upgradetype -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:create' -s w -l wait -d 'number of minutes to wait for installation status'
 
 complete $sfdx_looking -xa force:package:list -d 'list all packages in the Dev Hub org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:package:list'      -l verbose              -d 'display extended package detail'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:list' -l verbose -d 'display extended package detail'
 
 complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package -d 'ID (starts with 04t) or alias of the package version to uninstall'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:update -d 'update package details'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s d -l description          -d 'new package description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s n -l name                 -d 'new package name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s p -l package              -d '(required) ID (starts with 0Ho) or alias of the package to update'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s d -l description -d 'new package description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s n -l name -d 'new package name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s p -l package -d '(required) ID (starts with 0Ho) or alias of the package to update'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:update'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:update' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest -d 'run ISV Hammer tests'
 
 complete $sfdx_looking -xa force:package:hammertest:list -d 'list the statuses of running and completed ISV Hammer tests'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s i -l packageversionid     -d 'ID of the package version to list results for'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s i -l packageversionid -d 'ID of the package version to list results for'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest:report -d 'display the status or results of a ISV Hammer test'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s i -l requestid      -d '(required) ID of the hammer request to report on'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s s -l summary        -d 'report only a results summary (hide Apex test failures)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s i -l requestid -d '(required) ID of the hammer request to report on'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s s -l summary -d 'report only a results summary (hide Apex test failures)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:hammertest:run -d 'run ISV Hammer'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s d -l scheduledrundatetime -d 'earliest date/time to run the package upgrade test (YYYY-MM-DD HH:mm:ss, in GMT)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s f -l subscriberfile       -d 'file with list of subscriber orgs IDs, one per line'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s i -l packageversionids    -d '(required) comma-separated list of package version IDs to test'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s p -l preview              -d 'run the package hammer test in the Salesforce preview version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s s -l subscriberorgs       -d 'comma-separated list of subscriber org IDs'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s t -l apextests            -d 'after package upgrade validation, run the package\'s Apex tests in the subscriber org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s f -l subscriberfile -d 'file with list of subscriber orgs IDs, one per line'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s i -l packageversionids -d '(required) comma-separated list of package version IDs to test'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s p -l preview -d 'run the package hammer test in the Salesforce preview version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s s -l subscriberorgs -d 'comma-separated list of subscriber org IDs'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s t -l apextests -d 'after package upgrade validation, run the package\'s Apex tests in the subscriber org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:hammertest:run' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:install -d 'install packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile     -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait     -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s a -l apexcompile -d '[default: all] compile all Apex in the org and package, or only Apex in the package' -xa 'all package'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s b -l publishwait -d 'number of minutes to wait for subscriber package version ID to become available in the target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package         -d 'ID (starts with 04t) or alias of the package version to install'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt        -d 'do not prompt for confirmation'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s s -l securitytype    -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s t -l upgradetype     -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s w -l wait            -d 'number of minutes to wait for installation status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s p -l package -d 'ID (starts with 04t) or alias of the package version to install'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s r -l noprompt -d 'do not prompt for confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s s -l securitytype -d '[default: AllUsers] security access type for the installed package (deprecation notice: The default --securitytype value will change from AllUsers to AdminsOnly in v47.0 or later.)' -xa 'AllUsers AdminsOnly'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s t -l upgradetype -d '[default: Mixed] the upgrade type for the package installation' -xa 'DeprecateOnly Mixed Delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install' -s w -l wait -d 'number of minutes to wait for installation status'
 
 complete $sfdx_looking -xa force:package:install:report -d 'retrieve the status of a package installation request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s i -l requestid      -d '(required) ID of the package install request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s i -l requestid -d '(required) ID of the package install request you want to check'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:install:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:installed -d 'list installed packages'
 
 complete $sfdx_looking -xa force:package:installed:list -d 'list the org’s installed packages'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:installed:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:uninstall -d 'uninstall packages'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package        -d 'ID (starts with 04t) or alias of the package version to uninstall'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s p -l package -d 'ID (starts with 04t) or alias of the package version to uninstall'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait           -d 'number of minutes to wait for uninstall status'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -s w -l wait -d 'number of minutes to wait for uninstall status'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:uninstall:report -d 'retrieve status of package uninstall request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s i -l requestid      -d '(required) ID of the package uninstall request you want to check'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s i -l requestid -d '(required) ID of the package uninstall request you want to check'
 complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package:uninstall:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package:version -d 'develop package versions'
 
@@ -730,278 +730,278 @@ complete $sfdx_looking -xa force:package1 -d 'develop first-generation managed a
 complete $sfdx_looking -xa force:package1:version -d 'develop package versions'
 
 complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name            -d '(required) package version name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl -d 'post install URL'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:display -d 'display details about a first-generation package version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s i -l packageversionid -d '(required) metadata package version ID (starts with 04t)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s u -l targetusername   -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l apiversion       -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l json             -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display'      -l loglevel         -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:list -d 'list package versions for the specified first-generation package or for the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s i -l packageid      -d 'metadata package ID (starts with 033)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s i -l packageid -d 'metadata package ID (starts with 033)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:create -d 'report on created package versions'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description     -d 'package version description'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid       -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s d -l description -d 'package version description'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s i -l packageid -d '(required) ID of the metadata package (starts with 033) of which you’re creating a new version'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s k -l installationkey -d 'installation key for key-protected package (default: null)'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s m -l managedreleased -d 'create a managed package version'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name=name       -d '(required) package version name'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl  -d 'post install URL'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s n -l name=name -d '(required) package version name'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s p -l postinstallurl -d 'post install URL'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s r -l releasenotesurl -d 'release notes URL'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername  -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version         -d 'package version in major.minor format, for example, 3.2'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait            -d 'minutes to wait for the package version to be created (default: 2 minutes)'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l apiversion      -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l json            -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create'      -l loglevel        -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s v -l version -d 'package version in major.minor format, for example, 3.2'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -s w -l wait -d 'minutes to wait for the package version to be created (default: 2 minutes)'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:package1:version:create:get -d 'retrieve the status of a package version creation request'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s i -l requestid      -d '(required) PackageUploadRequest ID'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s i -l requestid -d '(required) PackageUploadRequest ID'
 complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:package1:version:create:get' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:project -d 'set up a Salesforce DX project'
 
 complete $sfdx_looking -xa force:project:create -d 'create a Salesforce DX project'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s d -l outputdir                      -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s n -l projectname                    -d '(required) name of the generated project'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s p -l defaultpackagedir              -d '[default: force-app] default package directory name'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s s -l namespace                      -d 'project associated namespace'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s t -l template                       -d '[default: standard] template to use for project creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s x -l manifest                       -d 'generate a manifest (package.xml) for change-set-based development'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s n -l projectname -d '(required) name of the generated project'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s p -l defaultpackagedir -d '[default: force-app] default package directory name'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s s -l namespace -d 'project associated namespace'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s t -l template -d '[default: standard] template to use for project creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -s x -l manifest -d 'generate a manifest (package.xml) for change-set-based development'
 complete -c sfdx -n '__fish_sfdx_using_command force:project:create; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:create'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:project:upgrade -d 'update project config files to the latest format'
 complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -s f -l forceupgrade -d 'run all upgrades even if project has already been upgraded'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l json         -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade'      -l loglevel     -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:project:upgrade' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:schema -d 'view standard and custom objects'
 
 complete $sfdx_looking -xa force:schema:sobject -d 'view standard and custom objects'
 
 complete $sfdx_looking -xa force:schema:sobject:describe -d 'describe an object'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s s -l sobjecttype    -d '(required) the API name of the object to describe'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s t -l usetoolingapi  -d 'execute with Tooling API'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s s -l sobjecttype -d '(required) the API name of the object to describe'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s t -l usetoolingapi -d 'execute with Tooling API'
 complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:describe' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:schema:sobject:list -d 'list all objects of a specified category'
 complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s c -l sobjecttypecategory -d '(required) the type of objects to list (all|custom|standard)'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s u -l targetusername      -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l apiversion          -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l json                -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list'      -l loglevel            -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:sobject:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source -d 'sync your project with your orgs'
 
 complete $sfdx_looking -xa force:source:convert -d 'convert source into Metadata API format'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s d -l outputdir   -d 'output directory to store the Metadata API–formatted files in'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s d -l outputdir -d 'output directory to store the Metadata API–formatted files in'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s n -l packagename -d 'name of the package to associate with the metadata-formatted files'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s r -l rootdir     -d 'a source directory other than the default package to convert'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l json        -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert'      -l loglevel    -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:conevrt' -s r -l rootdir -d 'a source directory other than the default package to convert'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:schema:convert' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:delete -d 'delete source from your project and from a non-source-tracked org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s m -l metadata       -d 'comma-separated list of names of metadata components to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s p -l sourcepath     -d 'comma-separated list of paths to the local metadata to delete'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s r -l noprompt       -d 'do not prompt for delete confirmation'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s m -l metadata -d 'comma-separated list of names of metadata components to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s p -l sourcepath -d 'comma-separated list of paths to the local metadata to delete'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s r -l noprompt -d 'do not prompt for delete confirmation'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:delete'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:delete' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest -d 'file path for manifest (package.xml) of components to deploy'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_sfdx_find_packagexml)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:source:open -d 'edit a Lightning Page with Lightning App Builder'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s f -l sourcefile     -d  '(required) file to edit'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s r -l urlonly        -d  'generate a navigation URL; don’t launch the editor'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s f -l sourcefile -d '(required) file to edit'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s r -l urlonly -d 'generate a navigation URL; don’t launch the editor'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:open'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:open' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:pull -d 'pull source from the scratch org to the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:pull'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:pull' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:push -d 'push source to a scratch org from the project'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s f -l forceoverwrite -d 'ignore conflict warnings and overwrite changes to scratch org'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s g -l ignorewarnings -d 'deploy changes even if warnings are generated'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:push'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes (default: 33)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:push' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:retrieve -d 'retrieve source from an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s a -l apiversion                     -d 'target API version for the retrieve (default 46.0)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s n -l packagenames                   -d 'a comma-separated list of packages to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s p -l sourcepath                     -d 'comma-separated list of source file paths to retrieve'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s a -l apiversion -d 'target API version for the retrieve (default 46.0)'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s n -l packagenames -d 'a comma-separated list of packages to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s p -l sourcepath -d 'comma-separated list of source file paths to retrieve'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -s x -l manifest -d 'file path for manifest (package.xml) of components to retrieve'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve'      -l verbose                        -d 'verbose output of retrieve result'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:retrieve' -l verbose -d 'verbose output of retrieve result'
 
 complete $sfdx_looking -xa force:source:status -d 'list local changes and/or changes in a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s a -l all            -d 'list all the changes that have been made'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s l -l local          -d 'list the changes that have been made locally'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s r -l remote         -d 'list the changes that have been made in the scratch org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s a -l all -d 'list all the changes that have been made'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s l -l local -d 'list the changes that have been made locally'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s r -l remote -d 'list the changes that have been made in the scratch org'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:status'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:status' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy -d 'deploy source to an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly                      -d 'validate deploy but don’t save to the org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings                 -d 'whether a warning will allow a deployment to complete successfully'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel                      -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata                       -d 'comma-separated list of metadata component names'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors                   -d 'ignore any errors and do not roll back deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath                     -d 'comma-separated list of paths to the local source files to deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid       -d 'request ID of the validated deployment to run a Quick Deploy'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests                       -d 'tests to run if --testlevel RunSpecifiedTests'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername                 -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait                           -d '[default: 33 minutes] wait time for command to finish in minutes'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest                       -d 'file path for manifest (package.xml) of components to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s c -l checkonly -d 'validate deploy but don’t save to the org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s g -l ignorewarnings -d 'whether a warning will allow a deployment to complete successfully'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s l -l testlevel -d 'deployment testing level' -xa 'NoTestRun RunSpecifiedTests RunLocalTests RunAllTestsInOrg'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s m -l metadata -d 'comma-separated list of metadata component names'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s o -l ignoreerrors -d 'ignore any errors and do not roll back deployment'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s p -l sourcepath -d 'comma-separated list of paths to the local source files to deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s q -l validateddeployrequestid -d 'request ID of the validated deployment to run a Quick Deploy'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s r -l runtests -d 'tests to run if --testlevel RunSpecifiedTests'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -s x -l manifest -d 'file path for manifest (package.xml) of components to deploy'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy; and __fish_contains_opt -s x manifest' -xa '(__fish_use_subcommand)'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l apiversion                     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l json                           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l loglevel                       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy'      -l verbose                        -d 'display Apex test processing details'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy' -l verbose -d 'display Apex test processing details'
 
 complete $sfdx_looking -xa force:source:deploy:cancel -d 'cancel a source deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s i -l jobid          -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s i -l jobid -d 'job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:cancel' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:source:deploy:report -d 'check the status of a metadata deployment'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s i -l jobid          -d 'job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s i -l jobid -d 'job ID of the deployment you want to check; defaults to your most recent CLI deployment if not specified'
 complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s w -l wait           -d '[default: 33 minutes] wait time for command to finish in minutes 33'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -s w -l wait -d '[default: 33 minutes] wait time for command to finish in minutes 33'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:source:deploy:report' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user -d 'perform user-related admin tasks'
 
 complete $sfdx_looking -xa force:user:create -d 'create a user for a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s a -l setalias             -d 'set an alias for the created username to reference within the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s f -l definitionfile       -d 'file path to a user definition'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s a -l setalias -d 'set an alias for the created username to reference within the CLI'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s f -l definitionfile -d 'file path to a user definition'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:create'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:display -d 'displays information about a user of a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:display'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:display' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:list -d 'lists all users of a scratch org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:list'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:list' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:password -d 'perform password-related admin tasks'
 
 complete $sfdx_looking -xa force:user:password:generate -d 'generate a password for scratch org users'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s o -l onbehalfof           -d 'comma-separated list of usernames for which to generate passwords'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s u -l targetusername       -d 'username or alias for the target org; overrides default target org'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s o -l onbehalfof -d 'comma-separated list of usernames for which to generate passwords'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -s v -l targetdevhubusername -d 'username or alias for the dev hub org; overrides default dev hub org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l apiversion           -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l json                 -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate'      -l loglevel             -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:password:generate' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:user:permset -d 'perform permset-related admin tasks'
 
 complete $sfdx_looking -xa force:user:permset:assign -d 'assign a permission set to one or more users of an org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s n -l permsetname    -d '(required) the name of the permission set to assign'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s o -l onbehalfof     -d 'comma-separated list of usernames or aliases to assign the permission set to'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s n -l permsetname -d '(required) the name of the permission set to assign'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s o -l onbehalfof -d 'comma-separated list of usernames or aliases to assign the permission set to'
 complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -s u -l targetusername -d 'username or alias for the target org; overrides default target org'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l apiversion     -d 'override the api version used for api requests made by this command'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l apiversion -d 'override the api version used for api requests made by this command'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:user:permset:assign' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:visualforce -d 'create and edit Visualforce files'
 
 complete $sfdx_looking -xa force:visualforce:component -d 'create a Visualforce component'
 
 complete $sfdx_looking -xa force:visualforce:component:create -d 'create a Visualforce component'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p d -l outputdir     -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p l -l label         -d '(required) Visualforce component label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p l -l label -d '(required) Visualforce component label'
 complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p n -l componentname -d '(required) name of the generated Visualforce component'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p t -l template      -d '[default: DefaultVFComponent] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -p t -l template -d '[default: DefaultVFComponent] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:component:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa force:visualforce:page -d 'create a Visualforce page'
 
 complete $sfdx_looking -xa force:visualforce:page:create -d 'create a Visualforce page'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p a -l apiversion    -d '[default: 46.0] API version number'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p d -l outputdir     -d 'folder for saving the created files'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p l -l label         -d '(required) Visualforce page label'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p a -l apiversion -d '[default: 46.0] API version number'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p d -l outputdir -d 'folder for saving the created files'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p l -l label -d '(required) Visualforce page label'
 complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p n -l componentname -d '(required) name of the generated Visualforce page'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p t -l template      -d '[default: DefaultVFPage] template to use for file creation'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l json          -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create'      -l loglevel      -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -p t -l template -d '[default: DefaultVFPage] template to use for file creation'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command force:visualforce:page:create' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 #
 # help
@@ -1015,41 +1015,41 @@ complete $sfdx_looking -xa plugins -d 'add/remove/create CLI plug-ins'
 complete -c sfdx -n '__fish_sfdx_using_command plugins' -l core -d 'show core plugins'
 
 complete $sfdx_looking -xa plugins:install -d 'installs a plugin into the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s f -l force   -d 'yarn install with force flag'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s f -l force -d 'yarn install with force flag'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:install' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:link -d 'links a plugin into the CLI for development'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:link' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:uninstall -d 'removes a plugin from the CLI'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:uninstall' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:update -d 'update installed plugins'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s h -l help    -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s h -l help -d 'show CLI help'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:update' -s v -l verbose
 
 complete $sfdx_looking -xa plugins:generate -d 'create a new sfdx-cli plugin'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -s h -l help     -d 'show CLI help'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l defaults -d 'use defaults for every setting'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:generate'      -l force    -d 'overwrite existing files'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -s h -l help -d 'show CLI help'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -l defaults -d 'use defaults for every setting'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:generate' -l force -d 'overwrite existing files'
 
 complete $sfdx_looking -xa plugins:trust -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
 
 complete $sfdx_looking -xa plugins:trust:sign -d 'pack an npm package and produce a tgz file along with a corresponding digital signature'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s k -l privatekeypath -d '(required) the local file path for the private key.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s p -l publickeyurl   -d '(required) the url where the public key/certificate will be hosted.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s s -l signatureurl   -d '(required) the url location where the signature will be hosted minus the name of the actual signature file.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l json           -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign'      -l loglevel       -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s p -l publickeyurl -d '(required) the url where the public key/certificate will be hosted.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -s s -l signatureurl -d '(required) the url location where the signature will be hosted minus the name of the actual signature file.'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:sign' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 complete $sfdx_looking -xa plugins:trust:verify -d 'For an npm validate the associated digital signature if it exits.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s n -l npm      -d '(required) Specify the npm name. This can include a tag/version'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s n -l npm -d '(required) Specify the npm name. This can include a tag/version'
 complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -s r -l registry -d 'The registry name. the behavior is the same as npm.'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l json     -d 'format output as json'
-complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify'      -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -l json -d 'format output as json'
+complete -c sfdx -n '__fish_sfdx_using_command plugins:trust:verify' -l loglevel -d '[default: warn] logging level for this command invocation' -xa $sfdx_loglevels
 
 #
 # update
diff --git a/share/completions/src.fish b/share/completions/src.fish
index fe62d1301..469201204 100644
--- a/share/completions/src.fish
+++ b/share/completions/src.fish
@@ -3,83 +3,83 @@
 # TODO?: add short synonyms like ci, am
 # TODO: extract tag/branch names and feed to -a for tag delete, branch delete, rename
 
-complete -c src -f -n '__fish_use_subcommand'   -a help  -d 'Displays help for commands'
+complete -c src -f -n '__fish_use_subcommand' -a help -d 'Displays help for commands'
 complete -c src -f -n '__fish_seen_subcommand_from help' -a 'intro revisions commands commit amend checkout cat status log list diff fast-export fast-import ignores'
 
-complete -c src    -n '__fish_use_subcommand'   -a commit       -d 'Enters a commit for the specified files'
+complete -c src -n '__fish_use_subcommand' -a commit -d 'Enters a commit for the specified files'
 complete -c src -x -n '__fish_seen_subcommand_from commit' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from commit' -s f -d 'Enter file containing commit message'
-complete -c src    -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
+complete -c src -n '__fish_seen_subcommand_from commit' -s e -d 'Further edit commit message'
 
-complete -c src -r -n '__fish_use_subcommand'   -a amend       -d 'Amends the stored comment for a specified revision'
+complete -c src -r -n '__fish_use_subcommand' -a amend -d 'Amends the stored comment for a specified revision'
 complete -c src -x -n '__fish_seen_subcommand_from amend' -s m -d 'Enter commit message as a string'
 complete -c src -r -n '__fish_seen_subcommand_from amend' -s f -d 'Enter file containing commit message'
-complete -c src    -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
+complete -c src -n '__fish_seen_subcommand_from amend' -s e -d 'Further edit commit message'
 
 complete -c src -r -n '__fish_use_subcommand' -a checkout -d 'Refresh working copy from history'
 
 complete -c src -r -n '__fish_use_subcommand' -a cat -d 'Send the specified revision of the files to standard output'
 
-complete -c src -r -n '__fish_use_subcommand'   -a status       -d 'Show status of files'
-complete -c src    -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
+complete -c src -r -n '__fish_use_subcommand' -a status -d 'Show status of files'
+complete -c src -n '__fish_seen_subcommand_from status' -s a -d 'Show all files'
 
-complete -c src -r -n '__fish_use_subcommand'   -a tag            -d 'List/create/delete tags'
-complete -c src    -n '__fish_seen_subcommand_from tag' -a list   -d 'List tags'
-complete -c src    -n '__fish_seen_subcommand_from tag' -s l      -d 'List tags'
+complete -c src -r -n '__fish_use_subcommand' -a tag -d 'List/create/delete tags'
+complete -c src -n '__fish_seen_subcommand_from tag' -a list -d 'List tags'
+complete -c src -n '__fish_seen_subcommand_from tag' -s l -d 'List tags'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a create -d 'Create tag'
-complete -c src -r -n '__fish_seen_subcommand_from tag' -s c      -d 'Create tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s c -d 'Create tag'
 complete -c src -r -n '__fish_seen_subcommand_from tag' -a delete -d 'Delete tag'
-complete -c src -r -n '__fish_seen_subcommand_from tag' -s d      -d 'Delete tag'
+complete -c src -r -n '__fish_seen_subcommand_from tag' -s d -d 'Delete tag'
 
-complete -c src -r -n '__fish_use_subcommand'   -a branch            -d 'List/create/delete branches'
-complete -c src    -n '__fish_seen_subcommand_from branch' -a list   -d 'List branches'
-complete -c src    -n '__fish_seen_subcommand_from branch' -s l      -d 'List branches'
+complete -c src -r -n '__fish_use_subcommand' -a branch -d 'List/create/delete branches'
+complete -c src -n '__fish_seen_subcommand_from branch' -a list -d 'List branches'
+complete -c src -n '__fish_seen_subcommand_from branch' -s l -d 'List branches'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a create -d 'Create branch'
-complete -c src -r -n '__fish_seen_subcommand_from branch' -s c      -d 'Create branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s c -d 'Create branch'
 complete -c src -r -n '__fish_seen_subcommand_from branch' -a delete -d 'Delete branch'
-complete -c src -r -n '__fish_seen_subcommand_from branch' -s d      -d 'Delete branch'
+complete -c src -r -n '__fish_seen_subcommand_from branch' -s d -d 'Delete branch'
 
-complete -c src -r -n '__fish_use_subcommand'   -a rename            -d 'Rename tag/branch'
+complete -c src -r -n '__fish_use_subcommand' -a rename -d 'Rename tag/branch'
 
-complete -c src -r -n '__fish_use_subcommand'   -a list              -d 'List information about commits'
+complete -c src -r -n '__fish_use_subcommand' -a list -d 'List information about commits'
 # TODO: support `src list -<n>`
-complete -c src -x -n '__fish_seen_subcommand_from list' -s l        -d 'Limit per-file commit count'
-complete -c src -x -n '__fish_seen_subcommand_from list' -s f        -d 'Specify format string'
+complete -c src -x -n '__fish_seen_subcommand_from list' -s l -d 'Limit per-file commit count'
+complete -c src -x -n '__fish_seen_subcommand_from list' -s f -d 'Specify format string'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand'   -a log                                           -d 'List information about commits'
-complete -c src -x -n '__fish_seen_subcommand_from log' -s v                                     -d 'Be more verbose'
+complete -c src -r -n '__fish_use_subcommand' -a log -d 'List information about commits'
+complete -c src -x -n '__fish_seen_subcommand_from log' -s v -d 'Be more verbose'
 # TODO: support `src log -<n>`
-complete -c src -x -n '__fish_seen_subcommand_from log' -s l                                     -d 'Limit per-file log entries'
-complete -c src    -n '__fish_seen_subcommand_from log' -s p -l patch -s u                       -d 'Print unified-format diff'
-complete -c src    -n '__fish_seen_subcommand_from log' -s c                                     -d 'Print context diff'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o w -d 'Ignore all whitespace'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u'       -o w -d 'Ignore all whitespace'
+complete -c src -x -n '__fish_seen_subcommand_from log' -s l -d 'Limit per-file log entries'
+complete -c src -n '__fish_seen_subcommand_from log' -s p -l patch -s u -d 'Print unified-format diff'
+complete -c src -n '__fish_seen_subcommand_from log' -s c -d 'Print context diff'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s p patch' -o w -d 'Ignore all whitespace'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from log' -n '__fish_contains_opt -s u' -o w -d 'Ignore all whitespace'
 
 # NOTE: pretending -b and -w are old-style options means they won’t be suggested as, say, “-pb” (which src can’t handle)
-complete -c src -r -n '__fish_use_subcommand'   -a diff       -d 'Print diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
-complete -c src    -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
-complete -c src    -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
+complete -c src -r -n '__fish_use_subcommand' -a diff -d 'Print diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -s u -d 'Print unified-format diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -s c -d 'Print context diff'
+complete -c src -n '__fish_seen_subcommand_from diff' -o b -d 'Ignore whitespace changes'
+complete -c src -n '__fish_seen_subcommand_from diff' -o w -d 'Ignore all whitespace'
 
-complete -c src -r -n '__fish_use_subcommand'   -a ls          -d 'List all registered files'
+complete -c src -r -n '__fish_use_subcommand' -a ls -d 'List all registered files'
 
-complete -c src -r -n '__fish_use_subcommand'   -a visualize   -d 'Emit DOT visualization'
+complete -c src -r -n '__fish_use_subcommand' -a visualize -d 'Emit DOT visualization'
 
-complete -c src -r -n '__fish_use_subcommand'   -a move        -d 'Rename a workfile and its history'
+complete -c src -r -n '__fish_use_subcommand' -a move -d 'Rename a workfile and its history'
 
-complete -c src -r -n '__fish_use_subcommand'   -a copy        -d 'Copy a file and its master'
+complete -c src -r -n '__fish_use_subcommand' -a copy -d 'Copy a file and its master'
 
-complete -c src -r -n '__fish_use_subcommand'   -a fast-export -d 'Export as a Git fast-import stream'
+complete -c src -r -n '__fish_use_subcommand' -a fast-export -d 'Export as a Git fast-import stream'
 
-complete -c src -r -n '__fish_use_subcommand'   -a fast-import       -d 'Parse a git-fast-import stream from stdin'
-complete -c src    -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
+complete -c src -r -n '__fish_use_subcommand' -a fast-import -d 'Parse a git-fast-import stream from stdin'
+complete -c src -n '__fish_seen_subcommand_from fast-import' -s p -d 'Discards metadata'
 
-complete -c src -r -n '__fish_use_subcommand'   -a release           -d 'Release locks on files'
+complete -c src -r -n '__fish_use_subcommand' -a release -d 'Release locks on files'
 
-complete -c src    -s d -d 'Enable debugging output'
+complete -c src -s d -d 'Enable debugging output'
 complete -c src -r -s S -d 'Set repository directory'
-complete -c src    -s T -d 'Set up for fast-export tests'
+complete -c src -s T -d 'Set up for fast-export tests'
diff --git a/share/completions/tokei.fish b/share/completions/tokei.fish
index 47653e825..48b82e3b1 100644
--- a/share/completions/tokei.fish
+++ b/share/completions/tokei.fish
@@ -6,20 +6,20 @@ function __fish_tokei_supported_serializations
     command tokei --help | grep 'with serialization support' | cut -d : -f 2 | string trim | string split ', '
 end
 
-complete -c tokei    -s f -l files            -d 'Print out statistics for individual files'
-complete -c tokei -f -s h -l help             -d 'Print help information'
-complete -c tokei         -l hidden           -d 'Count hidden files, too'
-complete -c tokei -f -s l -l languages        -d 'Print out supported languages'
-complete -c tokei         -l no-ignore        -d 'Don’t respect ignore files'
-complete -c tokei         -l no-ignore-parent -d 'Don’t respect ignore files in parent directories'
-complete -c tokei         -l no-ignore-vcs    -d 'Don’t respect version-control ignore files'
-complete -c tokei -f -s V -l version          -d 'Print version information'
-complete -c tokei    -s v -l verbose          -d 'Increase log output level'
+complete -c tokei -s f -l files -d 'Print out statistics for individual files'
+complete -c tokei -f -s h -l help -d 'Print help information'
+complete -c tokei -l hidden -d 'Count hidden files, too'
+complete -c tokei -f -s l -l languages -d 'Print out supported languages'
+complete -c tokei -l no-ignore -d 'Don’t respect ignore files'
+complete -c tokei -l no-ignore-parent -d 'Don’t respect ignore files in parent directories'
+complete -c tokei -l no-ignore-vcs -d 'Don’t respect version-control ignore files'
+complete -c tokei -f -s V -l version -d 'Print version information'
+complete -c tokei -s v -l verbose -d 'Increase log output level'
 
 # Options
-complete -c tokei -x -s c -l columns                                               -d 'Set column width for terminal output'
-complete -c tokei -x -s e -l exclude                                               -d 'Ignore all files and directories containing this word'
-complete -c tokei -r -s i -l input                                                 -d 'Gives statistics from a previous Tokei run'
-complete -c tokei -x -s o -l output  -a  '(__fish_tokei_supported_serializations)' -d 'Choose output format'
-complete -c tokei -x -s s -l sort    -ka 'files lines code comments blanks'        -d 'Sort languages based on column'
-complete -c tokei -x -s t -l type    -a  '(command tokei --languages)'             -d 'Filters output by language type, comma-separated'
+complete -c tokei -x -s c -l columns -d 'Set column width for terminal output'
+complete -c tokei -x -s e -l exclude -d 'Ignore all files and directories containing this word'
+complete -c tokei -r -s i -l input -d 'Gives statistics from a previous Tokei run'
+complete -c tokei -x -s o -l output -a '(__fish_tokei_supported_serializations)' -d 'Choose output format'
+complete -c tokei -x -s s -l sort -ka 'files lines code comments blanks' -d 'Sort languages based on column'
+complete -c tokei -x -s t -l type -a '(command tokei --languages)' -d 'Filters output by language type, comma-separated'
diff --git a/share/completions/zpaq.fish b/share/completions/zpaq.fish
index 95402f738..77728ade4 100644
--- a/share/completions/zpaq.fish
+++ b/share/completions/zpaq.fish
@@ -17,7 +17,7 @@ complete -c zpaq -f -n "not $seen $commands" -a l -d "list"
 complete -c zpaq -f -n "not $seen $commands" -a list -d "List or compare external files to archive"
 
 #options
-complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories" 
+complete -c zpaq -x -n "$seen $commands" -o all -a N -d "Extract/list versions in N [4] digit directories"
 complete -c zpaq -f -n "$seen $commands" -s f -d "-force"
 complete -c zpaq -f -n "$seen $command1" -o force -d "Append files if contents have changed"
 complete -c zpaq -f -n "$seen $command2" -o force -d "Compare file contents instead of dates"
diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index bdda36602..be8365b99 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -92,71 +92,71 @@ complete -f -n '__fish_zypper_not_use_file' -c zypper
 
 # Commands:
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?'   -d 'Print help'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
 
 #  Repository Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr'      -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar'    -d 'Add a new repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref'   -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc'      -d 'Clean local caches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
 
 #  Service Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls'      -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as'    -d 'Add a new service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
 
 #  Software Management:
-complete    -n '__fish_zypper_no_subcommand' -c zypper -a 'install in'        -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm'         -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve'         -d 'Verify integrity of package dependencies'
+complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
 
 #  Update Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up'        -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu'  -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch'            -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp'  -d 'List needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
 
 #  Querying:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se'        -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if'          -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info'       -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info'     -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info'     -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch'      -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa'      -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt'      -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd'      -d 'List all available products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
 
 #  Package Locks:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al'    -d 'Add a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll'      -d 'List current package locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
 
 #  Locale Management:
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc'      -d 'List requested locales (languages codes)'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc'    -d 'Add locale(s) to requested locales'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locales lloc' -d 'List requested locales (languages codes)'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlocale aloc' -d 'Add locale(s) to requested locales'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelocale rloc' -d 'Remove locale(s) from requested locales'
 
 #  Other Commands:
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos'    -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses'        -d 'Print report about licenses and EULAs of installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download'        -d 'Download rpms specified on the commandline to a local directory'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'download' -d 'Download rpms specified on the commandline to a local directory'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'needs-rebooting' -d 'Check if the needs-reboot flag was set'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps'              -d 'List running processes which might still use files and libraries deleted by recent upgrades'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'ps' -d 'List running processes which might still use files and libraries deleted by recent upgrades'
 
 #  Subcommands:
 
@@ -164,175 +164,175 @@ complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'subcommand' -d 'Lists
 
 # Global Options:
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help            -s h -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version         -s V -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids            -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config       -r -s c -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata             -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet           -s q -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose         -s v -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev       -s A -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style     -s s -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible  -s r -d 'Turn on rug compatibility'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l config -r -s c -d 'Use specified config file instead of the default'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout          -s x -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown  -s i -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l terse           -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l terse -s t -d 'Terse output for machine consumption. Implies --no-abbrev and --no-color'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D  -r -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir  -s C  -r -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir    -r -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir   -r -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir    -r -d 'Use alternative package cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 #  Repository Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks        -d 'Ignore GPG check failures and continue'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo    -s p -rf -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -rf -d 'Use an additional repository'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-content -s p -rf -d 'Additionally use disabled repositories providing a specific keyword'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh           -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote            -d 'Ignore remote repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever           -d 'Set the value of $releasever in all .repo files'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l releasever -d 'Set the value of $releasever in all .repo files'
 
 #  Target Options
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root               -s R -r -d 'Operate on a different root directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot             -r -d 'Operate on a different root directory, but share repositories with the host'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l installroot -r -d 'Operate on a different root directory, but share repositories with the host'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
 
 function __fish_zypper_is_subcommand_lr
     __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export         -r -s e -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias             -s a -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name              -s n -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh           -s r -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri               -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority          -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details           -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service           -s s -d 'Show also alias of parent service'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -r -s e -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
 complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri       -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name      -s N -d 'Sort the list by name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias     -s A -d 'Sort the list by alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
 
 function __fish_zypper_is_subcommand_ar
     __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo           -r -s r -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check             -s c -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check          -s C -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority          -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages     -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages  -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -r -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name           -r -s n -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable            -s d -d 'Add the repository as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable           -s d -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh           -s f -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh        -s F -d 'Disable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -r -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l enable -s d -d 'Add the repository as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_rr
     __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth          -d 'Ignore user authentication data in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query         -d 'Ignore query string in the URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all            -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local          -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote         -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l remote -s t -d 'Apply changes to all remote repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_mr
     __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name           -r -s n -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable           -s d -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable            -s e -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh           -s f -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh        -s F -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority       -r -s p -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages     -s k -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages  -s K -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck          -s g -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict        -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -r -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -r -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck       -s G -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck       -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all               -s a -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local             -s l -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote            -s t -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type    -r -s m -d 'Apply changes to repositories of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l default-gpgcheck -d 'Use the global GPG check setting defined in /etc/zypp/zypp.conf'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -r -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
     __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force            -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build      -s b -d 'Force rebuild of the database'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download   -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only       -s B -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only    -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services         -s s -d 'Refresh also services before refreshing repos'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
     __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri               -s u -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority          -s p -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details           -s d -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos        -s r -d 'Show also repositories belonging to the services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
 complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority  -s P -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri       -s U -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name      -s N -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
     __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name    -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable     -s d -d 'Add the service as enabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable    -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh    -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l enable -s d -d 'Add the service as enabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l refresh -s f -d 'Enable autorefresh of the repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_as' -l no-refresh -s F -d 'Disable autorefresh of the repository'
 
 function __fish_zypper_is_subcommand_ms
     __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name       -r -s n -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable        -s e -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable       -s d -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh       -s r -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh    -s R -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all           -s a -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local         -s l -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote        -s t -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type   -s m -d 'Apply changes to services of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -r -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable  -r -s i -d 'Add a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -r -s i -d 'Add a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -r -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable  -r -s j -d 'Remove a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -r -s j -d 'Remove a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -r -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable     -s k -d 'Clear the list of RIS repositories to enable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable    -s K -d 'Clear the list of RIS repositories to disable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
 
 function __fish_zypper_is_subcommand_rs
     __fish_zypper_cmd_in_array removeservice rs
@@ -345,24 +345,24 @@ function __fish_zypper_is_subcommand_refs
     __fish_zypper_cmd_in_array refresh-services refs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force          -s f -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos     -s r -d 'Refresh also repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l restore-status -s R -d 'Also restore service repositories enabled/disabled state'
 
 function __fish_zypper_subcommand_has_solver_expert_options
     __fish_zypper_cmd_in_array install in verify ve source-install si install-new-recommends inr update up dist-upgrade dup patch
 end
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver      -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution  -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution   -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l solver-focus -rf -a "$__fish_zypper_solver_focus_modes" -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends        -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends     -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l no-recommends -d 'Do not install recommended packages, only required'
 
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
 complete -c zypper -n '__fish_zypper_subcommand_has_solver_expert_options' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_in
@@ -370,17 +370,17 @@ function __fish_zypper_is_subcommand_in
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name          -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability    -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage         -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l allow-unsigned-rpm -d 'Silently install unsigned rpm packages given as commandline parameters'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force         -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run       -s D -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
@@ -390,13 +390,13 @@ function __fish_zypper_is_subcommand_rm
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name          -s n -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability    -s C -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details            -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l details -d 'Show the detailed installation summary'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run       -s D -d 'Test the removal, do not actually remove'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps    -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
 
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
@@ -408,22 +408,22 @@ function __fish_zypper_is_subcommand_ve
     __fish_zypper_cmd_in_array verify ve
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run       -s D -d 'Test the repair, do not actually do anything to the system'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-confirm -s y -d 'Don\'t require user interaction'
 
 function __fish_zypper_is_subcommand_si
     __fish_zypper_cmd_in_array source-install si
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only   -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps     -s D -d "Don't install build dependencies"
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only     -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l download-only -s d -d 'Only download the packages, do not install'
 
 function __fish_zypper_is_subcommand_inr
     __fish_zypper_cmd_in_array install-new-recommends inr
@@ -440,15 +440,15 @@ function __fish_zypper_is_subcommand_up
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort        -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm    -s y -d 'Don\'t require user interaction'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive   -d 'Do not skip interactive updates'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive   -d 'Skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-confirm -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l with-interactive -d 'Do not skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run       -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -458,12 +458,12 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all    -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade     -l no-allow-downgrade     -d 'Whether to allow downgrading installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change   -l no-allow-name-change   -d 'Whether to allow changing the names of installed resolvables'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change   -l no-allow-arch-change   -d 'Whether to allow changing the architecture of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-downgrade -l no-allow-downgrade -d 'Whether to allow downgrading installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-name-change -l no-allow-name-change -d 'Whether to allow changing the names of installed resolvables'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-arch-change -l no-allow-arch-change -d 'Whether to allow changing the architecture of installed resolvables'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l allow-vendor-change -l no-allow-vendor-change -d 'Whether to allow changing the vendor of installed resolvables'
 
 function __fish_zypper_is_subcommand_lp
@@ -473,14 +473,14 @@ end
 set -g __fish_zypper_patch_category security recommended optional feature document yast
 set -g __fish_zypper_patch_severity critical important moderate low unspecified
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all      -s a -d 'List all patches, not only the needed ones'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date       -rf -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -rf -d 'Select patches issued up to, but not including, the specified date'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues        -d 'Select issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issues -d 'Select issues matching the specified string'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
 
 function __fish_zypper_is_subcommand_dup
@@ -488,12 +488,12 @@ function __fish_zypper_is_subcommand_dup
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -rf -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run       -s D -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-confirm -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -509,28 +509,28 @@ function __fish_zypper_is_subcommand_se
     __fish_zypper_cmd_in_array search se
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings         -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words              -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x         -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides                 -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires                 -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends               -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements              -d 'Search for packages which supplements the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -s x -d 'Searches for an exact package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l supplements -d 'Search for packages which supplements the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name                -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list           -s f -d 'Search for a match in the file list of packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l name -s n -d 'Useful together with dependency options, otherwise searching in package name is default'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l file-list -s f -d 'Search for a match in the file list of packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive      -s C -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details             -s s -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose             -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l verbose -s s -d 'Like --details, with additional information where the search has matched (useful for search in dependencies)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only      -s i -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only  -s u -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l not-installed-only -s u -d 'Show only packages that are not currently installed'
 
 function __fish_zypper_is_subcommand_if
     __fish_zypper_cmd_in_array info if
@@ -538,13 +538,13 @@ end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l match-substrings -s s -d 'Print information for packages partially matching name'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -rf -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides              -d 'Show provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires              -d 'Show requires and prerequires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts             -d 'Show conflicts'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes             -d 'Show obsoletes'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends            -d 'Show recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements           -d 'Show supplements'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests              -d 'Show suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show provides'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show requires and prerequires'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show conflicts'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show obsoletes'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show recommends'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l supplements -d 'Show supplements'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show suggests'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 
 function __fish_zypper_is_subcommand_pch
@@ -557,14 +557,14 @@ function __fish_zypper_is_subcommand_pa
     __fish_zypper_cmd_in_array packages pa
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned                -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested               -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended             -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded                -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name       -s N -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo       -s R -d 'Sort the list by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only     -s i -d 'Show only installed packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l not-installed-only -s u -d 'Show only packages which are not installed'
 
 function __fish_zypper_is_subcommand_pt
@@ -572,16 +572,16 @@ function __fish_zypper_is_subcommand_pt
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only     -s i -d 'Show only installed patterns'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l not-installed-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
     __fish_zypper_cmd_in_array products pd
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd               -r -d 'XML output only: Literally forward the XML tags found in a product file'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l xmlfwd -r -d 'XML output only: Literally forward the XML tags found in a product file'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only     -s i -d 'Show only installed products'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l not-installed-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
@@ -603,14 +603,14 @@ function __fish_zypper_is_subcommand_cl
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty      -s e -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_lloc
     __fish_zypper_cmd_in_array locales lloc
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l packages -s p -d 'Show corresponding packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all      -s a -d 'List all available locales'
+complete -c zypper -n '__fish_zypper_is_subcommand_lloc' -l all -s a -d 'List all available locales'
 
 function __fish_zypper_is_subcommand_aloc
     __fish_zypper_cmd_in_array addlocale aloc
@@ -641,30 +641,30 @@ function __fish_zypper_is_subcommand_clean
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -rf -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata     -s m -d 'Clean metadata cache'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all          -s a -d 'Clean both metadata and package caches'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
     __fish_zypper_cmd_in_array patch
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only   -d 'Consider only patches which affect the package management itself'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update        -d 'Additionally try to update all packages not covered by patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details            -d 'Show the detailed installation summary'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles       -d 'Install the packages even if they replace files from other, already installed, packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo    -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l updatestack-only -d 'Consider only patches which affect the package management itself'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-update -d 'Additionally try to update all packages not covered by patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l details -d 'Show the detailed installation summary'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l replacefiles -d 'Install the packages even if they replace files from other, already installed, packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -rf -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -rf -a "$__fish_zypper_patch_category" -d 'Select patches with the specified category'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity      -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date            -r -d 'Select patches issued up to, but not including, the specified date'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla      -s b -d 'Select applicable patches for the specified Bugzilla issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                -d 'Select applicable patches for the specified CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm    -s y -d 'Don\'t require user interaction'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l severity -rf -a "$__fish_zypper_patch_severity" -d 'Select patches with the specified severity'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -r -d 'Select patches issued up to, but not including, the specified date'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Select applicable patches for the specified Bugzilla issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Select applicable patches for the specified CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-confirm -s y -d 'Don\'t require user interaction'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-optional -l without-optional -d 'Whether applicable optional patches should be treated as needed or be excluded'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive   -d 'Do not skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive   -d 'Skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run       -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -rf -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
 
@@ -673,16 +673,16 @@ function __fish_zypper_is_subcommand_sourcedownload
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -r -s d -d 'Download all source rpms to this directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete            -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete         -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status            -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
 
 function __fish_zypper_is_subcommand_download
     __fish_zypper_cmd_in_array download
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches  -d 'Download all versions matching the commandline arguments'
-complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from      -r -d 'Select packages from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l all-matches -d 'Download all versions matching the commandline arguments'
+complete -c zypper -n '__fish_zypper_is_subcommand_download' -l from -r -d 'Select packages from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_download' -l dry-run -s D -d 'Don\'t change anything, just report what would be done'
 complete -c zypper -n '__fish_zypper_is_subcommand_download' -l repo -r -s r -d 'Work only with the specified repository'
 
@@ -690,6 +690,6 @@ function __fish_zypper_is_subcommand_ps
     __fish_zypper_cmd_in_array ps
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short        -s s -d 'Create a short table not showing the deleted files'
-complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print        -rf  -d 'For each associated system service print <format> on the standard output, followed by a newline'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l short -s s -d 'Create a short table not showing the deleted files'
+complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l print -rf -d 'For each associated system service print <format> on the standard output, followed by a newline'
 complete -c zypper -n '__fish_zypper_is_subcommand_ps' -l debugFile -r -s d -d 'Write debug output to file'
diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 68b2f2802..d41598b4d 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -12,7 +12,8 @@ if test (uname) = Darwin
     # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3.
     # If this is fixed in later versions uncomment the second check.
     if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
-        function __fish_describe_command; end
+        function __fish_describe_command
+        end
         # (remember: exit when `source`ing only exits the file, not the shell)
         exit
     end
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 1297008c2..91f43655c 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -10,10 +10,10 @@ function fish_prompt --description 'Write out the prompt'
     set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            end
-            set suffix '#'
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        end
+        set suffix '#'
     end
 
     # If we're running via SSH, change the host color.
diff --git a/share/functions/help.fish b/share/functions/help.fish
index 1835430d9..59cd5bacf 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -67,8 +67,8 @@ function help --description 'Show help for the fish shell'
             # If the OS appears to be Windows (graphical), try to use cygstart
             if type -q cygstart
                 set fish_browser cygstart
-            # If xdg-open is available, just use that
-            # but only if an X session is running
+                # If xdg-open is available, just use that
+                # but only if an X session is running
             else if type -q xdg-open; and set -q -x DISPLAY
                 set fish_browser xdg-open
             end
@@ -78,7 +78,7 @@ function help --description 'Show help for the fish shell'
             # We use this instead of xdg-open because that's useless without a backend
             # like wsl-open which we'll check in a minute.
             if not type -q cygstart
-            and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
+                and set -l cmd (command -s cmd.exe /mnt/c/Windows/System32/cmd.exe)
                 # Use the first of these.
                 set fish_browser $cmd[1]
             end
@@ -99,7 +99,7 @@ function help --description 'Show help for the fish shell'
     # only if a Windows browser is to be used.
     if type -q cygstart
         if test $fish_browser != "cygstart"
-        and not command -sq $fish_browser[1]
+            and not command -sq $fish_browser[1]
             # Escaped quotes are necessary to work with spaces in the path
             # when the command is finally eval'd.
             set fish_browser cygstart $fish_browser
@@ -145,10 +145,10 @@ function help --description 'Show help for the fish shell'
         # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
         # but only if a Windows browser is being used
         if type -q cygpath
-        and string match -qr "cygstart" $fish_browser[1]
+            and string match -qr "cygstart" $fish_browser[1]
             set page_url file://(cygpath -m $__fish_help_dir)/$fish_help_page
         else if type -q wslpath
-        and string match -qr '.exe' $fish_browser[1]
+            and string match -qr '.exe' $fish_browser[1]
             set page_url file://(wslpath -w $__fish_help_dir)/$fish_help_page
         end
     else
@@ -174,10 +174,10 @@ function help --description 'Show help for the fish shell'
             # For Windows (Cygwin and WSL), we need to convert the base help dir to a Windows path before converting it to a file URL
             # but only if a Windows browser is being used
             if type -q cygpath
-            and string match -qr "cygstart" $fish_browser[1]
+                and string match -qr "cygstart" $fish_browser[1]
                 set page_url file://(cygpath -m $tmpname)
             else if type -q wslpath
-            and string match -qr '.exe' $fish_browser[1]
+                and string match -qr '.exe' $fish_browser[1]
                 set page_url file://(wslpath -w $tmpname)
             end
         end
@@ -194,7 +194,8 @@ function help --description 'Show help for the fish shell'
             case '*'
                 printf (_ 'help: Help is being displayed in %s.\n') $fish_browser[1]
         end
-        $fish_browser $page_url &; disown
+        $fish_browser $page_url &
+        disown
     else
         # Work around lynx bug where <div class="contents"> always has the same formatting as links (unreadable)
         # by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index 3322926c0..fab56aef2 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -21,6 +21,6 @@ function fish_prompt --description "Write out the prompt"
     end
 
     echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) \
-    (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
-    (set_color normal) "$suffix "
+        (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
+        (set_color normal) "$suffix "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index bb8a98d06..f99d6e8ca 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -11,10 +11,10 @@ function fish_prompt --description 'Write out the prompt'
     set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            end
-            set suffix '#'
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        end
+        set suffix '#'
     end
 
     # If we're running via SSH, change the host color.
diff --git a/tests/checks/andandoror.fish b/tests/checks/andandoror.fish
index 1242fd259..4c4473019 100644
--- a/tests/checks/andandoror.fish
+++ b/tests/checks/andandoror.fish
@@ -3,9 +3,12 @@
 
 echo first && echo second
 echo third || echo fourth
-true && false ; echo "true && false: $status"
-true || false ; echo "true || false: $status"
-true && false || true ; echo "true && false || true: $status"
+true && false
+echo "true && false: $status"
+true || false
+echo "true || false: $status"
+true && false || true
+echo "true && false || true: $status"
 # CHECK: first
 # CHECK: second
 # CHECK: third
@@ -15,10 +18,19 @@ true && false || true ; echo "true && false || true: $status"
 
 # "&& and || in if statements"
 
-if true || false ; echo "if test 1 ok" ; end
-if true && false ; else; echo "if test 2 ok" ; end
-if true && false ; or true ; echo "if test 3 ok" ; end
-if [ 0 = 1 ] || [ 5 -ge 3 ] ; echo "if test 4 ok"; end
+if true || false
+    echo "if test 1 ok"
+end
+if true && false
+else
+    echo "if test 2 ok"
+end
+if true && false; or true
+    echo "if test 3 ok"
+end
+if [ 0 = 1 ] || [ 5 -ge 3 ]
+    echo "if test 4 ok"
+end
 # CHECK: if test 1 ok
 # CHECK: if test 2 ok
 # CHECK: if test 3 ok
@@ -31,7 +43,7 @@ set beta 0
 set gamma 0
 set delta 0
 while [ $alpha -lt 2 ] && [ $beta -lt 3 ]
-      or [ $gamma -lt 4 ] || [ $delta -lt 5 ]
+    or [ $gamma -lt 4 ] || [ $delta -lt 5 ]
     echo $alpha $beta $gamma
     set alpha ( math $alpha + 1 )
     set beta ( math $beta + 1 )
@@ -46,11 +58,16 @@ end
 
 # "Nots"
 
-true && ! false ; echo $status
-not true && ! false ; echo $status
-not not not true ; echo $status
-not ! ! not true ; echo $status
-not ! echo not ! ; echo $status
+true && ! false
+echo $status
+not true && ! false
+echo $status
+not not not true
+echo $status
+not ! ! not true
+echo $status
+not ! echo not !
+echo $status
 # CHECK: 0
 # CHECK: 1
 # CHECK: 1
@@ -60,11 +77,16 @@ not ! echo not ! ; echo $status
 
 # "Complex scenarios"
 
-begin; echo 1 ; false ; end || begin ; echo 2 && echo 3 ; end
+begin
+    echo 1
+    false
+end || begin
+    echo 2 && echo 3
+end
 
 if false && true
-   or not false
-   echo 4
+    or not false
+    echo 4
 end
 # CHECK: 1
 # CHECK: 2
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 2e6a953f2..28b1a3261 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -1,5 +1,7 @@
 # RUN: %fish %s
-function complete_test_alpha1; echo $argv; end
+function complete_test_alpha1
+    echo $argv
+end
 
 complete -c complete_test_alpha1 --no-files -a '(commandline)'
 complete -c complete_test_alpha2 --no-files -w 'complete_test_alpha1 extra1'
@@ -29,7 +31,9 @@ complete -C'myalias2 call3 '
 
 # Ensure that commands can't wrap themselves - if this did,
 # the completion would be executed a bunch of times.
-function t --wraps t; echo t; end
+function t --wraps t
+    echo t
+end
 complete -c t -fa '(t)'
 complete -C't '
 # CHECK: t
@@ -155,8 +159,8 @@ complete -C'echo > /' | string length -q && echo ok
 # CHECK: ok
 
 function some_function
-     echo line1
-     echo line2
+    echo line1
+    echo line2
 end
 complete -c complete_test_function_desc -xa '(complete -Csome_function)'
 complete -C'complete_test_function_desc ' | count
diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish
index ead426055..003bb7666 100644
--- a/tests/checks/directory-redirect.fish
+++ b/tests/checks/directory-redirect.fish
@@ -1,5 +1,7 @@
 #RUN: %fish %s
-begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"
+begin
+end >.
+status -b; and echo "status -b returned true after bad redirect on a begin block"
 # Note that we sometimes get fancy quotation marks here, so let's match three characters
 #CHECKERR: <W> fish: An error occurred while redirecting file {{...}}
 #CHECKERR: {{open: Is a directory|open: Invalid argument}}
diff --git a/tests/checks/empty.fish b/tests/checks/empty.fish
index c5c598fca..aa25cdb60 100644
--- a/tests/checks/empty.fish
+++ b/tests/checks/empty.fish
@@ -6,13 +6,23 @@ function empty
 end
 
 # functions should not preserve $status
-false; empty; echo $status
+false
+empty
+echo $status
 # CHECK: 0
-true; empty; echo $status
+true
+empty
+echo $status
 # CHECK: 0
 
 # blocks should preserve $status
-false; begin; end; echo $status
+false
+begin
+end
+echo $status
 # CHECK: 1
-true; begin; end; echo $status
+true
+begin
+end
+echo $status
 # CHECK: 0
diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
index 3017be4c7..e33050de8 100644
--- a/tests/checks/eval.fish
+++ b/tests/checks/eval.fish
@@ -8,18 +8,26 @@ echo $previously_undefined
 eval "echo you can\\'t see this 1>&2" 2>/dev/null
 
 # Test return statuses
-false; eval true; echo $status
+false
+eval true
+echo $status
 # CHECK: 0
-false; eval false; echo $status
+false
+eval false
+echo $status
 # CHECK: 1
 
 # Test return status in case of parsing error
-false; eval "("; echo $status
+false
+eval "("
+echo $status
 # CHECK: 1
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
 # CHECKERR: (
 # CHECKERR: ^
-false; eval '""'; echo $status
+false
+eval '""'
+echo $status
 # CHECK: 1
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): The expanded command was empty.
 # CHECKERR: ""
@@ -29,18 +37,22 @@ function empty
 end
 
 # Regression tests for issue #5692
-false; eval;
+false
+eval
 echo blank eval: $status # 0
 # CHECK: blank eval: 0
 
-false; eval "";
+false
+eval ""
 echo empty arg eval: $status # 0
 # CHECK: empty arg eval: 0
 
-false; eval empty;
+false
+eval empty
 echo empty function eval $status # 0
 # CHECK: empty function eval 0
 
-false; eval "begin; end;";
+false
+eval "begin; end;"
 echo empty block eval: $status # 0
 # CHECK: empty block eval: 0
diff --git a/tests/checks/exit-status-with-closing-stderr.fish b/tests/checks/exit-status-with-closing-stderr.fish
index 149a59f42..98266f1f3 100644
--- a/tests/checks/exit-status-with-closing-stderr.fish
+++ b/tests/checks/exit-status-with-closing-stderr.fish
@@ -1,5 +1,7 @@
 # RUN: %fish %s
-argparse r-require= -- --require 2>/dev/null ; echo $status
+argparse r-require= -- --require 2>/dev/null
+echo $status
 # CHECK: 2
-argparse r-require= -- --require 2>&- ; echo $status
+argparse r-require= -- --require 2>&-
+echo $status
 # CHECK: 2
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index 321a03a15..381a26bed 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -34,11 +34,15 @@ math -- '-4 * 2'
 # CHECK: -8
 
 # Validate some rounding functions
-math 'round(3/2)' ; math 'floor(3/2)' ; math 'ceil(3/2)'
+math 'round(3/2)'
+math 'floor(3/2)'
+math 'ceil(3/2)'
 # CHECK: 2
 # CHECK: 1
 # CHECK: 2
-math 'round(-3/2)' ; math 'floor(-3/2)' ; math 'ceil(-3/2)'
+math 'round(-3/2)'
+math 'floor(-3/2)'
+math 'ceil(-3/2)'
 # CHECK: -2
 # CHECK: -2
 # CHECK: -1
diff --git a/tests/checks/pipeline-pgroup.fish b/tests/checks/pipeline-pgroup.fish
index 7939adb45..a604b3bd8 100644
--- a/tests/checks/pipeline-pgroup.fish
+++ b/tests/checks/pipeline-pgroup.fish
@@ -7,7 +7,9 @@ function save_pgroup -a var_name
 end
 
 # Here everything should live in the pgroup of the first fish_test_helper.
-$fth print_pgrp | read -g global_group | save_pgroup g1 | begin; save_pgroup g2; end
+$fth print_pgrp | read -g global_group | save_pgroup g1 | begin
+    save_pgroup g2
+end
 
 [ "$global_group" -eq "$g1" ] && [ "$g1" -eq "$g2" ]
 and echo "All pgroups agreed"
@@ -18,13 +20,18 @@ or echo "Pgroups disagreed. Should be in $global_group but found $g1 and $g2"
 # Unfortunately we don't know what fish's pgroup is (it may not be fish's pid).
 # So run it twice and verify that everything agrees; this implies that it could
 # not have used any of the pids of the child procs.
-function nothing ; end
-nothing | $fth print_pgrp | read -g a0 | save_pgroup a1 | begin; save_pgroup a2; end
-nothing | $fth print_pgrp | read -g b0 | save_pgroup b1 | begin; save_pgroup b2; end
+function nothing
+end
+nothing | $fth print_pgrp | read -g a0 | save_pgroup a1 | begin
+    save_pgroup a2
+end
+nothing | $fth print_pgrp | read -g b0 | save_pgroup b1 | begin
+    save_pgroup b2
+end
 
 [ "$a0" -eq "$a1" ] && [ "$a1" -eq "$a2" ] \
-  && [ "$b0" -eq "$b1" ] && [ "$b1" -eq "$b2" ] \
-  && [ "$a0" -eq "$b0" ]
+    && [ "$b0" -eq "$b1" ] && [ "$b1" -eq "$b2" ] \
+    && [ "$a0" -eq "$b0" ]
 and echo "All pgroups agreed"
 or echo "Pgroups disagreed. Found $a0 $a1 $a2, and $b0 $b1 $b2"
 # CHECK: All pgroups agreed
diff --git a/tests/checks/printf.fish b/tests/checks/printf.fish
index c2696c7b1..3e255a92c 100644
--- a/tests/checks/printf.fish
+++ b/tests/checks/printf.fish
@@ -61,10 +61,10 @@ printf '\376' | display_bytes
 # Verify that floating point conversions and output work correctly with
 # different combinations of locales and floating point strings. See issue
 # #3334. This starts by assuming an locale using english conventions.
-printf '%e\n' "1.23"  # should succeed, output should be 1.230000e+00
+printf '%e\n' "1.23" # should succeed, output should be 1.230000e+00
 # CHECK: 1.230000e+00
 
-printf '%e\n' "2,34"  # should fail
+printf '%e\n' "2,34" # should fail
 # CHECK: 2.000000e+00
 # CHECKERR: 2,34: value not completely converted
 
@@ -86,8 +86,8 @@ end
 # OpenBSD's wcstod does not honor LC_NUMERIC, meaning this feature is broken there.
 if set -q numeric_locale[1]; and test (uname) != "OpenBSD"
     set -x LC_NUMERIC $numeric_locale
-    printf '%e\n' "3,45"  # should succeed, output should be 3,450000e+00
-    printf '%e\n' "4.56"  # should succeed, output should be 4,560000e+00
+    printf '%e\n' "3,45" # should succeed, output should be 3,450000e+00
+    printf '%e\n' "4.56" # should succeed, output should be 4,560000e+00
 else
     echo '3,450000e+00'
     echo '4,560000e+00'
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index 210f6022c..205824430 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -13,10 +13,12 @@ set -l
 # CHECK: b
 # CHECK: c
 
-echo "a  b b" | read a b; string escape $a $b
+echo "a  b b" | read a b
+string escape $a $b
 # CHECK: a
 # CHECK: 'b b'
 
-echo 'a<><>b<>b' | read -d '<>' a b; printf %s\n $a $b
+echo 'a<><>b<>b' | read -d '<>' a b
+printf %s\n $a $b
 # CHECK: a
 # CHECK: <>b<>b
diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 260a582af..070fda35d 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -449,7 +449,9 @@ echo "global-vs-universal 5: $__fish_test_global_vs_universal"
 # CHECK: global-vs-universal 5: 
 
 # Export local variables from all parent scopes (issue #6153).
-function func; echo $local; end
+function func
+    echo $local
+end
 set -lx local outer
 func
 # CHECK: outer
@@ -458,12 +460,16 @@ begin
     # CHECK: outer
 
     set -lx local inner
-    begin; func; end
+    begin
+        func
+    end
     # CHECK: inner
 end
 
 # Skip importing universal variables (#5258)
-while set -q EDITOR; set -e EDITOR; end
+while set -q EDITOR
+    set -e EDITOR
+end
 set -Ux EDITOR emacs -nw
 # CHECK: $EDITOR: not set in global scope
 # CHECK: $EDITOR: set in universal scope, exported, with 2 elements
diff --git a/tests/checks/sigint.fish b/tests/checks/sigint.fish
index 07f03b1cd..17916d6c2 100644
--- a/tests/checks/sigint.fish
+++ b/tests/checks/sigint.fish
@@ -4,7 +4,8 @@
 
 echo About to sigint
 $helper sigint_parent &
-while true ; end
+while true
+end
 echo I should not be printed because I got sigint
 
 #CHECK: About to sigint
diff --git a/tests/checks/signal.fish b/tests/checks/signal.fish
index 504fff97d..f4e55e926 100644
--- a/tests/checks/signal.fish
+++ b/tests/checks/signal.fish
@@ -1,27 +1,31 @@
 # RUN: %fish -C 'set -l fish %fish' %s
 
-$fish -c 'function main; exit 4; true; end; main'; echo $status
+$fish -c 'function main; exit 4; true; end; main'
+echo $status
 #CHECK: 4
 
-$fish -c 'begin; exit 5; true; end'; echo $status
+$fish -c 'begin; exit 5; true; end'
+echo $status
 #CHECK: 5
 
-$fish -c 'kill -SIGHUP %self'; echo $status
+$fish -c 'kill -SIGHUP %self'
+echo $status
 #CHECK: 129
 
-$fish -c 'function main; kill -SIGTERM %self; true; end; main'; echo $status
+$fish -c 'function main; kill -SIGTERM %self; true; end; main'
+echo $status
 #CHECK: 143
 
 function alarm --on-signal ALRM
-  echo ALRM received
+    echo ALRM received
 end
 
 kill -s ALRM $fish_pid
 # CHECK: ALRM received
 
 function anychild --on-process-exit 0
-  # Type and exit status
-  echo $argv[1] $argv[3]
+    # Type and exit status
+    echo $argv[1] $argv[3]
 end
 
 echo "command false:"
@@ -44,9 +48,9 @@ command false | command true
 # CHECK: JOB_EXIT 0
 
 function test_blocks
-  block -l
-  command echo "This is the process whose exit event shuld be blocked"
-  echo "This should come before the event handler"
+    block -l
+    command echo "This is the process whose exit event shuld be blocked"
+    echo "This should come before the event handler"
 end
 test_blocks
 # CHECK: This is the process whose exit event shuld be blocked
diff --git a/tests/checks/string.fish b/tests/checks/string.fish
index 11464baa9..be2b77e76 100644
--- a/tests/checks/string.fish
+++ b/tests/checks/string.fish
@@ -296,10 +296,12 @@ string repeat -n0; or echo "exit 1"
 string repeat -m0; or echo "exit 1"
 # CHECK: exit 1
 
-string repeat -n1 -N "there is "; echo "no newline"
+string repeat -n1 -N "there is "
+echo "no newline"
 # CHECK: there is no newline
 
-string repeat -n1 --no-newline "there is "; echo "no newline"
+string repeat -n1 --no-newline "there is "
+echo "no newline"
 # CHECK: there is no newline
 
 string repeat -n10 -m4 "foo"
@@ -491,9 +493,9 @@ count (string join0 $tmp | string split0)
 # This function outputs some newline-separated content, and some
 # explicitly separated content.
 function dualsplit
-  echo alpha
-  echo beta
-  echo -ne 'gamma\x00delta' | string split0
+    echo alpha
+    echo beta
+    echo -ne 'gamma\x00delta' | string split0
 end
 count (dualsplit)
 # CHECK: 4
@@ -553,9 +555,9 @@ string collect \n\n >/dev/null; and echo unexpected success; or echo expected fa
 # This function outputs some newline-separated content, and some
 # explicitly un-separated content.
 function dualcollect
-  echo alpha
-  echo beta
-  echo gamma\ndelta\nomega | string collect
+    echo alpha
+    echo beta
+    echo gamma\ndelta\nomega | string collect
 end
 count (dualcollect)
 # CHECK: 3
diff --git a/tests/checks/variable-assignment.fish b/tests/checks/variable-assignment.fish
index a683a6b3c..590e6fac9 100644
--- a/tests/checks/variable-assignment.fish
+++ b/tests/checks/variable-assignment.fish
@@ -58,13 +58,20 @@ xPATH={/usr,}/bin sh -c 'echo $xPATH'
 yPATH=/usr/bin:/bin count $yPATH
 
 # CHECK: b
-a=b begin; true | echo $a; end
+a=b begin
+    true | echo $a
+end
 
 # CHECK: b
-a=b if true; echo $a; end
+a=b if true
+    echo $a
+end
 
 # CHECK: b
-a=b switch x; case x; echo $a; end
+a=b switch x
+    case x
+        echo $a
+end
 
 complete -c x --erase
 complete -c x -xa arg
diff --git a/tests/test.fish b/tests/test.fish
index 3ee1da1b5..fa471f357 100644
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -76,9 +76,9 @@ function test_littlecheck_file
     echo -n "Testing file $file ... "
     set starttime (timestamp)
     $python ../littlecheck.py \
-      -s fish=../test/root/bin/fish \
-      -s fish_test_helper=../test/root/bin/fish_test_helper \
-      $file
+        -s fish=../test/root/bin/fish \
+        -s fish_test_helper=../test/root/bin/fish_test_helper \
+        $file
     set -l exit_status $status
     set -l res ok
     set test_duration (delta $starttime)

From 8d598dcffc793ece9bff244dec7b260fbf9db224 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:12:05 -0800
Subject: [PATCH 1541/1732] Use handle_child_status when reaping internal procs

This reduces the number of distinct locations where we mark a process as
completed.
---
 src/proc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index b3ceabf6c..c69da24f0 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -358,8 +358,7 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
                     if (proc->internal_proc_) {
                         // Try reaping an internal process.
                         if (proc->internal_proc_->exited()) {
-                            proc->status = proc->internal_proc_->get_status();
-                            proc->completed = true;
+                            handle_child_status(proc.get(), proc->internal_proc_->get_status());
                             FLOGF(proc_reap_internal,
                                   "Reaped internal process '%ls' (id %llu, status %d)",
                                   proc->argv0(), proc->internal_proc_->get_id(),

From 399062c2197c1f969d8ff259ef6bc6e8c2926cef Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:18:43 -0800
Subject: [PATCH 1542/1732] Rationalize a bit of how failed exec() works

We don't need to mark the job as completed in this case, because the
caller will remove the job.
---
 src/exec.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index ba4910565..af1819a71 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -193,7 +193,7 @@ static bool can_use_posix_spawn_for_job(const std::shared_ptr<job_t> &job,
     return true;
 }
 
-void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
+static void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
     // Do a regular launch -  but without forking first...
     process_t *p = j->processes.front().get();
     io_chain_t all_ios = block_io;
@@ -203,7 +203,7 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
 
     // child_setup_process makes sure signals are properly set up.
     dup2_list_t redirs = dup2_list_t::resolve_chain(all_ios);
-    if (!child_setup_process(INVALID_PID, false, redirs)) {
+    if (child_setup_process(INVALID_PID, false, redirs) == 0) {
         // Decrement SHLVL as we're removing ourselves from the shell "stack".
         auto shlvl_var = vars.get(L"SHLVL", ENV_GLOBAL | ENV_EXPORT);
         wcstring shlvl_str = L"0";
@@ -217,10 +217,6 @@ void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_io) {
 
         // launch_process _never_ returns.
         launch_process_nofork(vars, p);
-    } else {
-        j->mark_constructed();
-        j->processes.front()->completed = true;
-        return;
     }
 }
 
@@ -1049,8 +1045,10 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         internal_exec(parser.vars(), j.get(), lineage.block_io);
         // internal_exec only returns if it failed to set up redirections.
         // In case of an successful exec, this code is not reached.
-        bool status = !j->flags().negate;
+        int status = j->flags().negate ? 0 : 1;
         parser.set_last_statuses(statuses_t::just(status));
+
+        // A false return tells the caller to remove the job from the list.
         return false;
     }
     cleanup_t timer = push_timer(j->flags().has_time_prefix);

From 7b25787e526ed35e9816097afc98f92bf47c6708 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:28:28 -0800
Subject: [PATCH 1543/1732] Mild refactoring of exec_block_or_func_process

Reduce some code duplication.
---
 src/exec.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index af1819a71..79ab177cd 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -781,23 +781,15 @@ static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<j
     }
 
     // If we have a block output buffer, populate it now.
-    if (!block_output_bufferfill) {
-        // No buffer, so we exit directly. This means we have to manually set the exit
-        // status.
-        p->completed = true;
-        if (p->is_last_in_job) {
-            parser.set_last_statuses(j->get_statuses());
-        }
-        return true;
+    std::string buffer_contents;
+    if (block_output_bufferfill) {
+        // Remove our write pipe and forget it. This may close the pipe, unless another thread has
+        // claimed it (background write) or another process has inherited it.
+        io_chain.remove(block_output_bufferfill);
+        auto block_output_buffer = io_bufferfill_t::finish(std::move(block_output_bufferfill));
+        buffer_contents = block_output_buffer->buffer().newline_serialized();
     }
-    assert(block_output_bufferfill && "Must have a block output bufferfiller");
 
-    // Remove our write pipe and forget it. This may close the pipe, unless another thread has
-    // claimed it (background write) or another process has inherited it.
-    io_chain.remove(block_output_bufferfill);
-    auto block_output_buffer = io_bufferfill_t::finish(std::move(block_output_bufferfill));
-
-    std::string buffer_contents = block_output_buffer->buffer().newline_serialized();
     if (!buffer_contents.empty()) {
         return run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
     } else {

From 1efa641105c99fcc184191e71ec1fcc41aaa0dfe Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:29:58 -0800
Subject: [PATCH 1544/1732] Move some fflushes around in handle_builtin_output

---
 src/exec.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 79ab177cd..bdebca6f0 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -502,6 +502,10 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         errbuff.clear();
     }
 
+    // Some historical behavior.
+    if (!outbuff.empty()) fflush(stdout);
+    if (!errbuff.empty()) fflush(stderr);
+
     if (outbuff.empty() && errbuff.empty()) {
         // We do not need to construct a background process.
         // TODO: factor this job-status-setting stuff into a single place.
@@ -514,8 +518,6 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
         return true;
     } else {
         // Construct and run our background process.
-        fflush(stdout);
-        fflush(stderr);
         return run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain);
     }
 }

From fe4f7fea5ca32b5f18d127a155ee0a0a2b5b0bff Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:40:24 -0800
Subject: [PATCH 1545/1732] run_internal_process can no longer fail, remove its
 bool return

---
 src/exec.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index bdebca6f0..67c152b0d 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -237,7 +237,7 @@ static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid)
 /// stdout and \p errdata to stderr, respecting the io chain \p ios. For example if target_fd is 1
 /// (stdout), and there is a dup2 3->1, then we need to write to fd 3. Then exit the internal
 /// process.
-static bool run_internal_process(process_t *p, std::string outdata, std::string errdata,
+static void run_internal_process(process_t *p, std::string outdata, std::string errdata,
                                  const io_chain_t &ios) {
     p->check_generations_before_launch();
 
@@ -289,7 +289,7 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
     // TODO: support eliding output to /dev/null.
     if (f->skip_out() && f->skip_err()) {
         f->internal_proc->mark_exited(p->status);
-        return true;
+        return;
     }
 
     // Ensure that ios stays alive, it may own fds.
@@ -326,7 +326,6 @@ static bool run_internal_process(process_t *p, std::string outdata, std::string
         }
         f->internal_proc->mark_exited(status);
     });
-    return true;
 }
 
 /// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the
@@ -515,11 +514,11 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
                   j->job_id(), j->preview().c_str(), p->status);
             parser.set_last_statuses(j->get_statuses());
         }
-        return true;
     } else {
         // Construct and run our background process.
-        return run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain);
+        run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain);
     }
+    return true;
 }
 
 /// Executes an external command.
@@ -793,7 +792,7 @@ static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<j
     }
 
     if (!buffer_contents.empty()) {
-        return run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
+        run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
     } else {
         if (p->is_last_in_job) {
             parser.set_last_statuses(j->get_statuses());

From 47b87dbeb7ca9c77c72d97daf03e02335e8d709e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 13 Jan 2020 14:46:31 -0800
Subject: [PATCH 1546/1732] Factor internal process short-circuiting together

When executing a buffered block or builtin, the usual approach is to
execute, collect output in a string, and then output that string to
stdout or whatever the redirections say. Similarly for stderr.

If we get no output, then we can elide the outputting which means
skipping the background thread. In this case we just mark the process as
finished immediately.

We do this in multiple locations which is confusing. Factor them all
together into a new function run_internal_process_or_short_circuit.
---
 src/exec.cpp | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 67c152b0d..953b8bc2d 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -237,7 +237,7 @@ static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid)
 /// stdout and \p errdata to stderr, respecting the io chain \p ios. For example if target_fd is 1
 /// (stdout), and there is a dup2 3->1, then we need to write to fd 3. Then exit the internal
 /// process.
-static void run_internal_process(process_t *p, std::string outdata, std::string errdata,
+static void run_internal_process(process_t *p, std::string &&outdata, std::string &&errdata,
                                  const io_chain_t &ios) {
     p->check_generations_before_launch();
 
@@ -328,6 +328,23 @@ static void run_internal_process(process_t *p, std::string outdata, std::string
     });
 }
 
+/// If \p outdata or \p errdata are both empty, then mark the process as completed immediately.
+/// Otherwise, run an internal process.
+static void run_internal_process_or_short_circuit(parser_t &parser, const std::shared_ptr<job_t> &j,
+                                                  process_t *p, std::string &&outdata,
+                                                  std::string &&errdata, const io_chain_t &ios) {
+    if (outdata.empty() && errdata.empty()) {
+        p->completed = true;
+        if (p->is_last_in_job) {
+            FLOGF(exec_job_status, L"Set status of job %d (%ls) to %d using short circuit",
+                  j->job_id(), j->preview().c_str(), p->status);
+            parser.set_last_statuses(j->get_statuses());
+        }
+    } else {
+        run_internal_process(p, std::move(outdata), std::move(errdata), ios);
+    }
+}
+
 /// Call fork() as part of executing a process \p p in a job \j. Execute \p child_action in the
 /// context of the child. Returns true if fork succeeded, false if fork failed.
 static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t *p,
@@ -505,19 +522,9 @@ static bool handle_builtin_output(parser_t &parser, const std::shared_ptr<job_t>
     if (!outbuff.empty()) fflush(stdout);
     if (!errbuff.empty()) fflush(stderr);
 
-    if (outbuff.empty() && errbuff.empty()) {
-        // We do not need to construct a background process.
-        // TODO: factor this job-status-setting stuff into a single place.
-        p->completed = true;
-        if (p->is_last_in_job) {
-            FLOGF(exec_job_status, L"Set status of job %d (%ls) to %d using short circuit",
-                  j->job_id(), j->preview().c_str(), p->status);
-            parser.set_last_statuses(j->get_statuses());
-        }
-    } else {
-        // Construct and run our background process.
-        run_internal_process(p, std::move(outbuff), std::move(errbuff), *io_chain);
-    }
+    // Construct and run our background process.
+    run_internal_process_or_short_circuit(parser, j, p, std::move(outbuff), std::move(errbuff),
+                                          *io_chain);
     return true;
 }
 
@@ -791,14 +798,8 @@ static bool exec_block_or_func_process(parser_t &parser, const std::shared_ptr<j
         buffer_contents = block_output_buffer->buffer().newline_serialized();
     }
 
-    if (!buffer_contents.empty()) {
-        run_internal_process(p, std::move(buffer_contents), {} /*errdata*/, io_chain);
-    } else {
-        if (p->is_last_in_job) {
-            parser.set_last_statuses(j->get_statuses());
-        }
-        p->completed = true;
-    }
+    run_internal_process_or_short_circuit(parser, j, p, std::move(buffer_contents),
+                                          {} /* errdata */, io_chain);
     return true;
 }
 

From 316bb88ee7fc96a719de0b1206ccae4f48cd398f Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 13 Jan 2020 14:15:15 +0900
Subject: [PATCH 1547/1732] Add `hwinfo` completions

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

diff --git a/share/completions/hwinfo.fish b/share/completions/hwinfo.fish
new file mode 100644
index 000000000..552f864e6
--- /dev/null
+++ b/share/completions/hwinfo.fish
@@ -0,0 +1,25 @@
+# Completions for hwinfo
+
+set -l hardware_items all arch bios block bluetooth braille bridge camera \
+    cdrom chipcard cpu disk dsl dvb fingerprint floppy framebuffer gfxcard \
+    hub ide isapnp isdn joystick keyboard memory mmc-ctrl modem monitor mouse \
+    netcard network partition pci pcmcia pcmcia-ctrl pppoe printer redasd \
+    reallyall scanner scsi smp sound storage-ctrl sys tape tv uml usb \
+    usb-ctrl vbe wlan xen zip
+
+for i in $hardware_items
+    complete -f -c hwinfo -l $i -d "Probe the specified HARDWARE_ITEM"
+end
+
+complete -f -c hwinfo -l short -d "Show only a summary"
+complete -f -c hwinfo -l listmd -d "Report RAID devices"
+complete -f -c hwinfo -l only -d "Show only entries in the device list matching DEVNAME"
+complete -f -c hwinfo -l save-config -d "Store config for a particular device"
+complete -f -c hwinfo -l show-config -d "Show saved config data"
+complete -f -c hwinfo -l map -d "Prints a list of disk name mappings"
+complete -f -c hwinfo -l debug -d "Set debug level"
+complete -f -c hwinfo -l verbose -d "Increase verbosity"
+complete -f -c hwinfo -l log -d "Write log"
+complete -f -c hwinfo -l dump-db -d "Dump hardware database"
+complete -f -c hwinfo -l version -d "Show libhd version"
+complete -f -c hwinfo -l help -d "Show help message"

From 8c725c7d541832cdfbfbea0ce3859744caecc45d Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 13 Jan 2020 18:01:40 +0900
Subject: [PATCH 1548/1732] Add `chronyc` completions

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

diff --git a/share/completions/chronyc.fish b/share/completions/chronyc.fish
new file mode 100644
index 000000000..cdc5496fc
--- /dev/null
+++ b/share/completions/chronyc.fish
@@ -0,0 +1,99 @@
+# Completions for chronyc
+
+# Global options
+complete -f -c chronyc -s 4 -d "Use only IPv4 address for hostname resolution"
+complete -f -c chronyc -s 6 -d "Use only IPv6 address for hostname resolution"
+complete -f -c chronyc -s n -d "Disable resolving of IP address to hostname"
+complete -f -c chronyc -s c -d "Print the report in CSV format"
+complete -f -c chronyc -s d -d "Enable print of debugging message"
+complete -f -c chronyc -s m -d "Allow multiple commands to be specified"
+complete -f -c chronyc -s h -d "Specify the host to connect"
+complete -f -c chronyc -s p -d "Specify the UDP port number used by the target to monitor connections"
+complete -f -c chronyc -s f -d "Option for compatibility"
+complete -f -c chronyc -s a -d "Option for compatibility"
+complete -f -c chronyc -s v -d "Show version number"
+
+# Commands
+## System clock
+complete -f -c chronyc -n "__fish_use_subcommand" -a tracking -d "Show system time info"
+complete -f -c chronyc -n "__fish_use_subcommand" -a makestep -d "Correct the clock by stepping"
+complete -f -c chronyc -n "__fish_use_subcommand" -a maxupdateskew -d "Modify max valid skew to update frequency"
+complete -f -c chronyc -n "__fish_use_subcommand" -a waitsync -d "Wait until synced in specified limits"
+
+## Time sources
+complete -f -c chronyc -n "__fish_use_subcommand" -a sources -d "Show info about current sources"
+complete -x -c chronyc -n "__fish_seen_subcommand_from sources" -s v -d "Be verbose"
+complete -f -c chronyc -n "__fish_use_subcommand" -a sourcestats -d "Show statistics about collected measurements"
+complete -x -c chronyc -n "__fish_seen_subcommand_from sourcestats" -s v -d "Be verbose"
+complete -f -c chronyc -n "__fish_use_subcommand" -a reselect -d "Force reselecting sync source"
+complete -f -c chronyc -n "__fish_use_subcommand" -a reselectdist -d "Modify reselection distance"
+
+## NTP sources
+complete -f -c chronyc -n "__fish_use_subcommand" -a activity -d "Check how many NTP sources are online/offline"
+complete -f -c chronyc -n "__fish_use_subcommand" -a ntpdata -d "Show info about last valid measurement"
+complete -f -c chronyc -n "__fish_use_subcommand" -a add
+complete -f -c chronyc -n "__fish_seen_subcommand_from add" -a peer -d "Add new NTP peer"
+complete -f -c chronyc -n "__fish_seen_subcommand_from add" -a server -d "Add new NTP server"
+complete -f -c chronyc -n "__fish_use_subcommand" -a delete -d "Remove server/peer"
+complete -f -c chronyc -n "__fish_use_subcommand" -a burst -d "Start rapid set of measurements"
+complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelay -d "Modify max valid sample delay"
+complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelaydevratio -d "Modify max valid delay/deviation ratio"
+complete -f -c chronyc -n "__fish_use_subcommand" -a maxdelayratio -d "Modify max valid delay/min ratio"
+complete -f -c chronyc -n "__fish_use_subcommand" -a maxpoll -d "Modify max polling interval"
+complete -f -c chronyc -n "__fish_use_subcommand" -a minpoll -d "Modify min polling interval"
+complete -f -c chronyc -n "__fish_use_subcommand" -a minstratum -d "Modify min stratum"
+complete -f -c chronyc -n "__fish_use_subcommand" -a offline -d "Set sources in subnet to offline status"
+complete -f -c chronyc -n "__fish_use_subcommand" -a online -d "Set sources in subnet to online status"
+complete -f -c chronyc -n "__fish_use_subcommand" -a onoffline -d "Set all sources to online/offline status according to network config"
+complete -f -c chronyc -n "__fish_use_subcommand" -a polltarget -d "Modify poll target"
+complete -f -c chronyc -n "__fish_use_subcommand" -a refresh -d "Refresh IP address"
+
+## Manual time input
+complete -f -c chronyc -n "__fish_use_subcommand" -a manual
+complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a on -d "Enable settime command"
+complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a off -d "Disable settime command"
+complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a delete -d "Delete previous settime entry"
+complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a list -d "Show previous settime entries"
+complete -f -c chronyc -n "__fish_seen_subcommand_from manual" -a reset -d "Reset settime command"
+complete -f -c chronyc -n "__fish_use_subcommand" -a settime -d "Set daemon time"
+
+## NTP access
+complete -f -c chronyc -n "__fish_use_subcommand" -a accheck -d "Check whether address is allowed"
+complete -f -c chronyc -n "__fish_use_subcommand" -a clients -d "Report on clients that have accessed the server"
+complete -f -c chronyc -n "__fish_use_subcommand" -a serverstats -d "Show statistics of the server"
+complete -f -c chronyc -n "__fish_use_subcommand" -a allow -d "Allow access to subnet as a default"
+complete -f -c chronyc -n "__fish_seen_subcommand_from allow" -a all -d "Allow access to subnet and all children"
+complete -f -c chronyc -n "__fish_use_subcommand" -a deny -d "Deny access to subnet as a default"
+complete -f -c chronyc -n "__fish_seen_subcommand_from deny" -a all -d "Deny access to subnet and all children"
+complete -f -c chronyc -n "__fish_use_subcommand" -a local -d "Serve time even when not synced"
+complete -f -c chronyc -n "__fish_seen_subcommand_from local" -a off -d "Don't serve time when not synced"
+complete -f -c chronyc -n "__fish_use_subcommand" -a smoothing -d "Show current time smoothing state"
+complete -f -c chronyc -n "__fish_use_subcommand" -a smoothtime
+complete -f -c chronyc -n "__fish_seen_subcommand_from smoothtime" -a activate -d "Activate time smoothing"
+complete -f -c chronyc -n "__fish_seen_subcommand_from smoothtime" -a reset -d "Reset time smoothing"
+
+## Monitoring access
+complete -f -c chronyc -n "__fish_use_subcommand" -a cmdaccheck -d "Check whether address is allowed"
+complete -f -c chronyc -n "__fish_use_subcommand" -a cmdallow -d "Allow access to subnet as a default"
+complete -f -c chronyc -n "__fish_seen_subcommand_from cmdallow" -a all -d "Allow access to subnet and all children"
+complete -f -c chronyc -n "__fish_use_subcommand" -a cmddeny -d "Deny access to subnet as a default"
+complete -f -c chronyc -n "__fish_seen_subcommand_from cmddeny" -a all -d "Deny access to subnet and all children"
+
+## RTC
+complete -f -c chronyc -n "__fish_use_subcommand" -a rtcdata -d "Print current RTC performance parameters"
+complete -f -c chronyc -n "__fish_use_subcommand" -a trimrtc -d "Correct RTC relative to system clock"
+complete -f -c chronyc -n "__fish_use_subcommand" -a writertc -d "Save RTC performance parameters to file"
+
+## Other daemon commands
+complete -f -c chronyc -n "__fish_use_subcommand" -a cyclelogs -d "Close and reopen log files"
+complete -f -c chronyc -n "__fish_use_subcommand" -a dump -d "Dump all measurements to save files"
+complete -f -c chronyc -n "__fish_use_subcommand" -a rekey -d "Reread keys from key file"
+complete -f -c chronyc -n "__fish_use_subcommand" -a shutdown -d "Stop daemon"
+
+## Client commands
+complete -f -c chronyc -n "__fish_use_subcommand" -a dns -d "Configure how hostname and IP address are resolved"
+complete -f -c chronyc -n "__fish_use_subcommand" -a timeout -d "Set initial response timeout"
+complete -f -c chronyc -n "__fish_use_subcommand" -a retries -d "Set max number of retries"
+complete -f -c chronyc -n "__fish_use_subcommand" -a keygen -d "Generate key for key file"
+complete -f -c chronyc -n "__fish_use_subcommand" -a "exit quit" -d "Leave the program"
+complete -f -c chronyc -n "__fish_use_subcommand" -a help -d "Show help message"

From a7442207c2b030ae28283d928431a7f9acd6da42 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Mon, 13 Jan 2020 18:23:09 +0900
Subject: [PATCH 1549/1732] CHANGELOG: add hwinfo and chronyc completions

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1e0bfbbf..8ebad5197 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -133,6 +133,7 @@
   - `btrfs`
   - `camcontrol`
   - `cf` (#5700)
+  - `chronyc` (#6496)
   - `code` (#6205)
   - `cryptsetup` (#6488)
   - `csc` and `csi` (#6016)
@@ -147,6 +148,7 @@
   - `gpg2` (#6062)
   - `grub-mkrescue` (#6182)
   - `hledger` (#6043)
+  - `hwinfo` (#6496)
   - `irb` (#6260)
   - `iw` (#6232)
   - `kak`

From 7e1270ae70c541b2549e64b3673eaec13aebfbf0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 14 Jan 2020 15:20:04 -0800
Subject: [PATCH 1550/1732] Be more disciplined about cancellation signals

Rather than storing a "should cancel" flag in the parser, store the
actual signal which triggered cancellation.
---
 src/parse_execution.cpp |  4 ++--
 src/parser.cpp          | 11 +++++------
 src/parser.h            |  9 ++++-----
 src/proc.cpp            |  2 +-
 src/reader.cpp          | 12 ++++++------
 src/reader.h            |  4 ++--
 6 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index f53e8909d..f5849651a 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -189,7 +189,7 @@ maybe_t<eval_result_t> parse_execution_context_t::check_end_execution() const {
     if (shell_is_exiting()) {
         return eval_result_t::cancelled;
     }
-    if (parser && parser->cancellation_requested) {
+    if (parser && parser->cancellation_signal) {
         return eval_result_t::cancelled;
     }
     const auto &ld = parser->libdata();
@@ -643,7 +643,7 @@ eval_result_t parse_execution_context_t::report_error(const parse_node_t &node,
 }
 
 eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const {
-    if (!parser->cancellation_requested) {
+    if (!parser->cancellation_signal) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
         }
diff --git a/src/parser.cpp b/src/parser.cpp
index 5417c0a07..c989e888c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -102,10 +102,9 @@ parser_t &parser_t::principal_parser() {
     return *principal;
 }
 
-void parser_t::skip_all_blocks() {
-    // Tell all blocks to skip.
-    // This may be called from a signal handler!
-    principal->cancellation_requested = true;
+void parser_t::cancel_requested(int sig) {
+    assert(sig != 0 && "Signal must not be 0");
+    principal->cancellation_signal = sig;
 }
 
 // Given a new-allocated block, push it onto our block list, acquiring ownership.
@@ -648,11 +647,11 @@ eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node
     // Handle cancellation requests. If our block stack is currently empty, then we already did
     // successfully cancel (or there was nothing to cancel); clear the flag. If our block stack is
     // not empty, we are still in the process of cancelling; refuse to evaluate anything.
-    if (this->cancellation_requested) {
+    if (this->cancellation_signal) {
         if (!block_list.empty()) {
             return eval_result_t::cancelled;
         }
-        this->cancellation_requested = false;
+        this->cancellation_signal = 0;
     }
 
     // Only certain blocks are allowed.
diff --git a/src/parser.h b/src/parser.h
index 599f93299..43d42ec42 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -201,8 +201,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     friend class parse_execution_context_t;
 
    private:
-    /// Indication that we should skip all blocks.
-    volatile sig_atomic_t cancellation_requested = false;
+    /// If not zero, the signal triggering cancellation.
+    volatile sig_atomic_t cancellation_signal = 0;
     /// The current execution context.
     std::unique_ptr<parse_execution_context_t> execution_context;
     /// The jobs associated with this parser.
@@ -248,9 +248,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Get the "principal" parser, whatever that is.
     static parser_t &principal_parser();
 
-    /// Indicates that execution of all blocks in the principal parser should stop. This is called
-    /// from signal handlers!
-    static void skip_all_blocks();
+    /// Indicates that we should stop execution due to the given signal.
+    static void cancel_requested(int sig);
 
     /// Global event blocks.
     event_blockage_list_t global_event_blocks;
diff --git a/src/proc.cpp b/src/proc.cpp
index c69da24f0..e46658382 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -249,7 +249,7 @@ static void handle_child_status(process_t *proc, proc_status_t status) {
             if (session_interactivity() != session_interactivity_t::not_interactive) {
                 // In an interactive session, tell the principal parser to skip all blocks we're
                 // executing so control-C returns control to the user.
-                parser_t::skip_all_blocks();
+                parser_t::cancel_requested(sig);
             } else {
                 // Deliver the SIGINT or SIGQUIT signal to ourself since we're not interactive.
                 struct sigaction act;
diff --git a/src/reader.cpp b/src/reader.cpp
index f5c09082a..e891a6220 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -489,7 +489,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     void remove_backward();
 };
 
-/// This variable is set to true by the signal handler when ^C is pressed.
+/// This variable is set to a signal by the signal handler when ^C is pressed.
 static volatile sig_atomic_t interrupted = 0;
 
 // Prototypes for a bunch of functions defined later on.
@@ -686,8 +686,8 @@ void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, i
 
 // This is called from a signal handler!
 void reader_handle_sigint() {
-    parser_t::skip_all_blocks();
-    interrupted = 1;
+    parser_t::cancel_requested(SIGINT);
+    interrupted = SIGINT;
 }
 
 /// Make sure buffers are large enough to hold the current string length.
@@ -849,12 +849,12 @@ bool reader_test_should_cancel() {
     }
 }
 
-bool reader_test_and_clear_interrupted() {
+int reader_test_and_clear_interrupted() {
     int res = interrupted;
     if (res) {
         interrupted = 0;
     }
-    return res != 0;
+    return res;
 }
 
 void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor_position) {
@@ -3411,7 +3411,7 @@ int reader_reading_interrupted() {
     reader_data_t *data = current_data_or_null();
     if (res && data && data->exit_on_interrupt) {
         reader_set_end_loop(true);
-        parser_t::skip_all_blocks();
+        parser_t::cancel_requested(res);
         // We handled the interrupt ourselves, our caller doesn't need to handle it.
         return 0;
     }
diff --git a/src/reader.h b/src/reader.h
index 11f1646bf..ee90940c1 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -121,8 +121,8 @@ bool reader_get_selection(size_t *start, size_t *len);
 bool reader_test_should_cancel();
 
 /// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it
-/// was set.
-bool reader_test_and_clear_interrupted();
+/// was set. In practice this will return 0 or SIGINT.
+int reader_test_and_clear_interrupted();
 
 /// Clear the interrupted flag unconditionally without handling anything. The flag could have been
 /// set e.g. when an interrupt arrived just as we were ending an earlier \c reader_readline

From 607b40f4c6d21f7f6e49db97cfcb8fb9376ad61b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 16 Jan 2020 00:32:41 +0800
Subject: [PATCH 1551/1732] CHANGELOG: further work on 3.1.0

[ci skip]
---
 CHANGELOG.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ebad5197..ef14858b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,12 @@
 # fish 3.1.0
 
 ## Notable improvements and fixes
-- A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632)
+- A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632).
 - fish no longer buffers pipes to the last function in a pipeline, improving many cases where pipes appeared to block or hang (#1396).
 - An overhaul of error messages for builtin commands, including a removal of the overwhelming usage summary, more readable stack traces (#3404, #5434), and stack traces for `test` (aka `[`) (#5771).
 - fish's debugging arguments have been significantly improved. The `--debug-level` option has been removed, and a new `--debug` option replaces it. This option accepts various categories, which may be listed via `fish --print-debug-categories` (#5879). A new `--debug-output` option allows for redirection of debug output.
 - `string` has a new `collect` subcommand for use in command substitutions, producing a single output instead of splitting on new lines (similar to `"$(cmd)"` in other shells) (#159).
 - The fish manual, tutorial and FAQ are now available in `man` format as `fish-doc`, `fish-tutorial` and `fish-faq` respectively (#5521).
-- The default prompt is now the "classic + VCS" prompt, providing a better experience for new users (#6375).
 - Like other shells, `cd` now always looks for its argument in the current directory as a last resort, even if the `CDPATH` variable does not include it or "." (#4484).
 - fish now correctly handles `CDPATH` entries that start with `..` (#6220) or contain `./` (#5887).
 - The `fish_trace` variable may be set to trace execution (#3427). This performs a similar role as `set -x` in other shells.
@@ -16,12 +15,14 @@
 - Major performance improvements when pasting (#5866), executing lots of commands (#5905), importing history from bash (#6295), and when completing variables that might match `$history` (#6288).
 
 ### Syntax changes and new commands
+- A new builtin command, `time`, which allows timing of fish functions and builtins as well as external commands (#117).
 - Brace expansion now only takes place if the braces include a "," or a variable expansion, meaning common commands such as `git reset HEAD@{0}` do not require escaping (#5869).
 - New redirections `&>` and `&|` may be used to redirect or pipe stdout, and also redirect stderr to stdout (#6192).
 - `switch` now allows arguments that expand to nothing, like empty variables (#5677).
 - The `VAR=val cmd` syntax can now be used to run a command in a modified environment (#6287).
 - `and` is no longer recognised as a command, so that nonsensical constructs like `and and and` produce a syntax error (#6089).
 - `math`'s exponent operator, '`^`', was previously left-associative, but now uses the more commonly-used right-associative behaviour (#6280). This means that `math '3^0.5^2'` was previously calculated as '(3^0.5)^2', but is now calculated as '3^(0.5^2)'.
+- In fish 3.0, the variable used with `for` loops inside command substitutions could leak into enclosing scopes; this was an inadvertent behaviour change and has been reverted (#6480).
 
 ### Scripting improvements
 - `string split0` now returns 0 if it split something (#5701).
@@ -42,6 +43,7 @@
 - `read -S` (short option of `--shell`) is recognised correctly (#5660).
 - `read` understands `--list`, which acts like `--array` in reading all arguments into a list inside a single variable, but is better named (#5846).
 - `read` has a new option, `--tokenize`, which splits a string into variables according to the shell's tokenization rules, considering quoting, escaping, and so on (#3823).
+- `read` interacts more correctly with the deprecated `$IFS` variable, in particular removing multiple separators when splitting a variable into a list (#6406), matching other shells.
 - `fish_indent` now handles semicolons better, including leaving them in place for `; and` and `; or` instead of breaking the line (#5859).
 - `fish_indent --write` now supports multiple file arguments, indenting them in turn.
 - The default read limit has been increased to 100MiB (#5267).
@@ -60,10 +62,13 @@
 - A bug where `for` could use invalid variable names has been fixed (#5800).
 - A bug where local variables would not be exported to functions has been fixed (#6153).
 - The null command (`:`) now always exits successfully, rather than passing through the previous exit status (#6022).
-- The output of `functions FUNCTION` starts with spaces, not a tab, matching `fish_indent` (#1472), and correctly includes any `--wraps` flags (#1625).
+- The output of `functions FUNCTION` matches the declaration of the function, correctly including comments or blank lines (#5285), and correctly includes any `--wraps` flags (#1625).
+- `type` supports a new option, `--short`, which suppress function expansion (#6403).
 - `type --path` with a function argument will now output the path to the file containing the definition of that function, if it exists.
+- `type --force-path` with an argument that cannot be found now correctly outputs nothing, as documented (#6411).
 - The `$hostname` variable is no longer truncated to 32 characters (#5758).
 - Line numbers in function backtraces are calculated correctly (#6350).
+- A new `fish_cancel` event is emitted when the command line is cancelled, which is useful for terminal integration (#5973).
 
 ### Interactive improvements
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456). It now ignores blank lines like the bash implementation (#5809).
@@ -86,10 +91,13 @@
 - The Web-based configuration handles aliases that include single quotes correctly (#6120), and launches correctly under Termux (#6248).
 - `function` now correctly validates parameters for `--argument-names` as valid variable names (#6147) and correctly parses options following `--argument-names`, as in "`--argument-names foo --description bar`" (#6186).
 - History newly imported from bash includes command lines using `&&` or `||`.
-- The automatic generation of completions from manual pages is better described in job and process listings (#6269).
+- The automatic generation of completions from manual pages is better described in job and process listings, and no longer produces a warning when exiting fish (#6269).
 - In private mode, setting `$fish_greeting` to an empty string before starting the private session will prevent the warning about history not being saved from being printed (#6299).
 - In the interactive editor, a line break (Enter) inside unclosed brackets will insert a new line, rather than executing the command and producing an error (#6316).
 - Ctrl-C always repaints the prompt (#6394).
+- When run interactively from another program (such as Python), fish will correctly start a new process group, like other shells (#5909).
+- Job identifiers (for example, for background jobs) are assigned more logically (#6053).
+- A bug where history would appear truncated if an empty command was executed was fixed (#6032).
 
 #### New or improved bindings
 - Pasting strips leading spaces to avoid pasted commands being omitted from the history (#4327).
@@ -113,9 +121,11 @@
 - Selections in Vi mode are inclusive, matching the actual behaviour of Vi (#5770).
 
 #### Improved prompts
-- The git prompt in informative mode now shows the number of stashes if enabled.
-- The git prompt now has an option (`$__fish_git_prompt_use_informative_chars`) to use the (more modern) informative characters without enabling informative mode.
+- The Git prompt in informative mode now shows the number of stashes if enabled.
+- The Git prompt now has an option (`$__fish_git_prompt_use_informative_chars`) to use the (more modern) informative characters without enabling informative mode.
 - The default prompt now also features VCS integration and will color the host if running via SSH (#6375).
+- The default and example prompts print the pipe status if an earlier command in the pipe fails.
+- The default and example prompts try to resolve exit statuses to signal names when appropriate.
 
 #### Improved terminal output
 - New `fish_pager_color_` options have been added to control more elements of the pager's colors (#5524).

From 5f130c2d6d17d8e84b86438cf9c2d1e0d623b052 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 11:09:09 -0800
Subject: [PATCH 1552/1732] Give wildcard_expand_result_t a real return value

Use an enum instead of an int.
---
 src/expand.cpp   | 19 +++++++++++--------
 src/wildcard.cpp | 14 ++++++++------
 src/wildcard.h   | 12 +++++++++---
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 565913931..1f677e5a7 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1010,15 +1010,18 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
         result = expand_result_t::wildcard_no_match;
         std::vector<completion_t> expanded;
         for (const auto &effective_working_dir : effective_working_dirs) {
-            int local_wc_res =
+            wildcard_expand_result_t expand_res =
                 wildcard_expand_string(path_to_expand, effective_working_dir, flags, &expanded);
-            if (local_wc_res > 0) {
-                // Something matched,so overall we matched.
-                result = expand_result_t::wildcard_match;
-            } else if (local_wc_res < 0) {
-                // Cancellation
-                result = expand_result_t::error;
-                break;
+            switch (expand_res) {
+                case wildcard_expand_result_t::match:
+                    // Something matched,so overall we matched.
+                    result = expand_result_t::wildcard_match;
+                    break;
+                case wildcard_expand_result_t::no_match:
+                    break;
+                case wildcard_expand_result_t::cancel:
+                    result = expand_result_t::error;
+                    break;
             }
         }
 
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 1f4f9db4e..d1b2eb649 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -645,11 +645,11 @@ class wildcard_expander_t {
     // Do wildcard expansion. This is recursive.
     void expand(const wcstring &base_dir, const wchar_t *wc, const wcstring &prefix);
 
-    int status_code() const {
+    wildcard_expand_result_t status_code() const {
         if (this->did_interrupt) {
-            return -1;
+            return wildcard_expand_result_t::cancel;
         }
-        return this->did_add ? 1 : 0;
+        return this->did_add ? wildcard_expand_result_t::match : wildcard_expand_result_t::no_match;
     }
 };
 
@@ -898,8 +898,10 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
     }
 }
 
-int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory,
-                           expand_flags_t flags, std::vector<completion_t> *output) {
+wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
+                                                const wcstring &working_directory,
+                                                expand_flags_t flags,
+                                                std::vector<completion_t> *output) {
     assert(output != nullptr);
     // Fuzzy matching only if we're doing completions.
     assert(flags.get(expand_flag::for_completions) || !flags.get(expand_flag::fuzzy_match));
@@ -916,7 +918,7 @@ int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory
     // embedded nulls are never allowed in a filename, so we just check for them and return 0 (no
     // matches) if there is an embedded null.
     if (wc.find(L'\0') != wcstring::npos) {
-        return 0;
+        return wildcard_expand_result_t::no_match;
     }
 
     // Compute the prefix and base dir. The prefix is what we prepend for filesystem operations
diff --git a/src/wildcard.h b/src/wildcard.h
index dd4b7827e..506e8a4a7 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -41,9 +41,15 @@ enum {
 /// executables_only
 /// \param out The list in which to put the output
 ///
-/// \return 1 if matches where found, 0 otherwise. Return -1 on abort (I.e. ^C was pressed).
-int wildcard_expand_string(const wcstring &wc, const wcstring &working_directory,
-                           expand_flags_t flags, std::vector<completion_t> *out);
+enum class wildcard_expand_result_t {
+    no_match,  /// The wildcard did not match.
+    match,     /// The wildcard did match.
+    cancel,    /// Expansion was cancelled (e.g. control-C).
+};
+wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
+                                                const wcstring &working_directory,
+                                                expand_flags_t flags,
+                                                std::vector<completion_t> *out);
 
 /// Test whether the given wildcard matches the string. Does not perform any I/O.
 ///

From 4f01eef88dd38be2da76fa3c3fc565849aab563d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 11:43:10 -0800
Subject: [PATCH 1553/1732] Default some ivars in wildcard_expander_t

---
 src/wildcard.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index d1b2eb649..692342bc6 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -465,13 +465,13 @@ class wildcard_expander_t {
     // Resolved items get inserted into here. This is transient of course.
     std::vector<completion_t> *resolved_completions;
     // Whether we have been interrupted.
-    bool did_interrupt;
+    bool did_interrupt{false};
     // Whether we have successfully added any completions.
-    bool did_add;
+    bool did_add{false};
     // Whether some parent expansion is fuzzy, and therefore completions always prepend their prefix
     // This variable is a little suspicious - it should be passed along, not stored here
     // If we ever try to do parallel wildcard expansion we'll have to remove this
-    bool has_fuzzy_ancestor;
+    bool has_fuzzy_ancestor{false};
 
     /// We are a trailing slash - expand at the end.
     void expand_trailing_slash(const wcstring &base_dir, const wcstring &prefix);
@@ -628,12 +628,7 @@ class wildcard_expander_t {
 
    public:
     wildcard_expander_t(wcstring wd, expand_flags_t f, std::vector<completion_t> *r)
-        : working_directory(std::move(wd)),
-          flags(f),
-          resolved_completions(r),
-          did_interrupt(false),
-          did_add(false),
-          has_fuzzy_ancestor(false) {
+        : working_directory(std::move(wd)), flags(f), resolved_completions(r) {
         assert(resolved_completions != nullptr);
 
         // Insert initial completions into our set to avoid duplicates.

From 273afca3da0417fa0818194fb2850dfe17e48e68 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 11:59:40 -0800
Subject: [PATCH 1554/1732] Remove some dead code

---
 src/cancellable.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++
 src/common.cpp    | 32 ----------------------------
 src/common.h      | 14 -------------
 3 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 src/cancellable.h

diff --git a/src/cancellable.h b/src/cancellable.h
new file mode 100644
index 000000000..5cd03f510
--- /dev/null
+++ b/src/cancellable.h
@@ -0,0 +1,53 @@
+#ifndef FISH_CANCELLABLE_H
+#define FISH_CANCELLABLE_H
+
+#include "maybe.h"
+
+/// A simple value type representing cancellation via a signal.
+struct cancellation_t {
+    int signal;
+
+    explicit cancellation_t(int sig) : signal(sig) {}
+};
+
+/// A cancellable_t<T> is a wrapper around T which may be cancelled, for example by a signal.
+template <typename T>
+class cancellable_t : private maybe_t<T> {
+    using super = maybe_t<T>;
+
+   public:
+    /// Construct from a T.
+    /* implicit */ cancellable_t(T &&v) : super(v) {}
+    /* implicit */ cancellable_t(const T &v) : super(v) {}
+
+    /// Construct from a cancellation.
+    /* implicit */ cancellable_t(cancellation_t c) : super(none()), signal_(c.signal) {}
+
+    cancellable_t(const cancellable_t &) = default;
+    cancellable_t(cancellable_t &&) = default;
+
+    /// Access the cancellation signal, if this was cancelled.
+    int signal() const {
+        assert(!has_value() && "Not cancelled");
+        return signal_;
+    }
+
+    /// \return whether this was cancelled.
+    bool is_cancelled() const { return !has_value(); }
+
+    // Expose maybe_t<T>::value and dereferencing.
+    using super::has_value;
+    using super::value;
+    using super::operator->;
+    using super::operator*;
+
+    /// Notice we don't compare signals when checking for equality.
+    bool operator==(const cancellable_t &rhs) const { super::operator==(rhs); }
+    bool operator!=(const cancellable_t &rhs) const { super::operator!=(rhs); }
+
+   private:
+    // The cancellation signal.
+    int signal_{0};
+};
+
+#endif
diff --git a/src/common.cpp b/src/common.cpp
index 6f36c6dff..6e43badc4 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -250,38 +250,6 @@ bool is_windows_subsystem_for_linux() {
 }
 #endif  // HAVE_BACKTRACE_SYMBOLS
 
-int fgetws2(wcstring *s, FILE *f) {
-    int i = 0;
-    wint_t c;
-
-    while (true) {
-        errno = 0;
-
-        c = std::fgetwc(f);
-        if (errno == EILSEQ || errno == EINTR) {
-            continue;
-        }
-
-        switch (c) {
-            // End of line.
-            case WEOF:
-            case L'\n':
-            case L'\0': {
-                return i;
-            }
-            // Ignore carriage returns.
-            case L'\r': {
-                break;
-            }
-            default: {
-                i++;
-                s->push_back(static_cast<wchar_t>(c));
-                break;
-            }
-        }
-    }
-}
-
 /// Converts the narrow character string \c in into its wide equivalent, and return it.
 ///
 /// The string may contain embedded nulls.
diff --git a/src/common.h b/src/common.h
index 67b788405..d3d1939d3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -269,14 +269,6 @@ std::shared_ptr<T> move_to_sharedptr(T &&v) {
 /// Print a stack trace to stderr.
 void show_stackframe(const wchar_t msg_level, int frame_count = 100, int skip_levels = 0);
 
-/// Read a line from the stream f into the string. Returns the number of bytes read or -1 on
-/// failure.
-///
-/// If the carriage return character is encountered, it is ignored. fgetws() considers the line to
-/// end if reading the file results in either a newline (L'\n') character, the null (L'\\0')
-/// character or the end of file (WEOF) character.
-int fgetws2(wcstring *s, FILE *f);
-
 /// Returns a  wide character string equivalent of the specified multibyte character string.
 ///
 /// This function encodes illegal character sequences in a reversible way using the private use
@@ -768,12 +760,6 @@ std::unique_ptr<T> make_unique(Args &&... args) {
 /// \param in the position of the opening quote.
 wchar_t *quote_end(const wchar_t *pos);
 
-/// A call to this function will reset the error counter. Some functions print out non-critical
-/// error messages. These should check the error_count before, and skip printing the message if
-/// MAX_ERROR_COUNT messages have been printed. The error_reset() should be called after each
-/// interactive command executes, to allow new messages to be printed.
-void error_reset();
-
 /// This function should be called after calling `setlocale()` to perform fish specific locale
 /// initialization.
 void fish_setlocale();

From 6705a2efc6af31fb509559be2e253447c6a4e533 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 13:16:43 -0800
Subject: [PATCH 1555/1732] Migrate a bunch of code out of common.h

Put it into wcstringutil, path, or a new file null_terminated_array.
---
 CMakeLists.txt                |   2 +-
 src/builtin_argparse.cpp      |   1 +
 src/builtin_complete.cpp      |   1 +
 src/builtin_functions.cpp     |   1 +
 src/builtin_printf.cpp        |   1 +
 src/builtin_set.cpp           |   1 +
 src/common.cpp                | 218 +---------------------------------
 src/common.h                  | 174 ---------------------------
 src/complete.cpp              |   1 +
 src/env.h                     |   1 +
 src/exec.cpp                  |   1 +
 src/fish.cpp                  |   1 +
 src/flog.cpp                  |   1 +
 src/flog.h                    |   1 +
 src/future_feature_flags.cpp  |   2 +
 src/highlight.cpp             |   1 +
 src/null_terminated_array.cpp |  73 ++++++++++++
 src/null_terminated_array.h   |  87 ++++++++++++++
 src/output.cpp                |   1 +
 src/path.cpp                  |  18 +++
 src/path.h                    |   3 +
 src/screen.h                  |   1 +
 src/wcstringutil.cpp          | 129 +++++++++++++++++++-
 src/wcstringutil.h            |  97 +++++++++++++++
 src/wildcard.cpp              |   2 +
 25 files changed, 425 insertions(+), 394 deletions(-)
 create mode 100644 src/null_terminated_array.cpp
 create mode 100644 src/null_terminated_array.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46cf4cad8..ee3834c70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ SET(FISH_SRCS
     src/signal.cpp src/tinyexpr.cpp src/tnode.cpp src/tokenizer.cpp src/utf8.cpp src/util.cpp
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
-    src/flog.cpp src/trace.cpp src/timer.cpp
+    src/flog.cpp src/trace.cpp src/timer.cpp src/null_terminated_array.cpp
 )
 
 # Header files are just globbed.
diff --git a/src/builtin_argparse.cpp b/src/builtin_argparse.cpp
index 3f3c1c43f..0483e79c3 100644
--- a/src/builtin_argparse.cpp
+++ b/src/builtin_argparse.cpp
@@ -23,6 +23,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "io.h"
 #include "parser.h"
+#include "wcstringutil.h"
 #include "wgetopt.h"  // IWYU pragma: keep
 #include "wutil.h"    // IWYU pragma: keep
 
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index cbcd7f96a..3e2372826 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -19,6 +19,7 @@
 #include "parse_util.h"
 #include "parser.h"
 #include "reader.h"
+#include "wcstringutil.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index c3f5404c0..c1d936351 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -26,6 +26,7 @@
 #include "parser_keywords.h"
 #include "proc.h"
 #include "signal.h"
+#include "wcstringutil.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
index e8a208b12..bda9d974b 100644
--- a/src/builtin_printf.cpp
+++ b/src/builtin_printf.cpp
@@ -66,6 +66,7 @@
 #include "builtin.h"
 #include "common.h"
 #include "io.h"
+#include "wcstringutil.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 class parser_t;
diff --git a/src/builtin_set.cpp b/src/builtin_set.cpp
index 06af7b60b..d6082ef2b 100644
--- a/src/builtin_set.cpp
+++ b/src/builtin_set.cpp
@@ -25,6 +25,7 @@
 #include "io.h"
 #include "parser.h"
 #include "proc.h"
+#include "wcstringutil.h"
 #include "wgetopt.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/common.cpp b/src/common.cpp
index 6e43badc4..3fd2da590 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -48,7 +48,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <locale>
 #include <memory>  // IWYU pragma: keep
 #include <type_traits>
 
@@ -63,6 +62,7 @@
 #include "parser.h"
 #include "proc.h"
 #include "signal.h"
+#include "wcstringutil.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
@@ -1870,62 +1870,6 @@ int common_get_width() { return get_current_winsize().ws_col; }
 
 int common_get_height() { return get_current_winsize().ws_row; }
 
-bool string_prefixes_string(const wchar_t *proposed_prefix, const wcstring &value) {
-    return string_prefixes_string(proposed_prefix, value.c_str());
-}
-
-bool string_prefixes_string(const wcstring &proposed_prefix, const wcstring &value) {
-    size_t prefix_size = proposed_prefix.size();
-    return prefix_size <= value.size() && value.compare(0, prefix_size, proposed_prefix) == 0;
-}
-
-bool string_prefixes_string(const wchar_t *proposed_prefix, const wchar_t *value) {
-    for (size_t idx = 0; proposed_prefix[idx] != L'\0'; idx++) {
-        // Note if the prefix is longer than value, then we will compare a nonzero prefix character
-        // against a zero value character, and so we'll return false;
-        if (proposed_prefix[idx] != value[idx]) return false;
-    }
-    // We must have that proposed_prefix[idx] == L'\0', so we have a prefix match.
-    return true;
-}
-
-bool string_prefixes_string(const char *proposed_prefix, const std::string &value) {
-    return string_prefixes_string(proposed_prefix, value.c_str());
-}
-
-bool string_prefixes_string(const char *proposed_prefix, const char *value) {
-    for (size_t idx = 0; proposed_prefix[idx] != L'\0'; idx++) {
-        if (proposed_prefix[idx] != value[idx]) return false;
-    }
-    return true;
-}
-
-bool string_prefixes_string_case_insensitive(const wcstring &proposed_prefix,
-                                             const wcstring &value) {
-    size_t prefix_size = proposed_prefix.size();
-    return prefix_size <= value.size() &&
-           wcsncasecmp(proposed_prefix.c_str(), value.c_str(), prefix_size) == 0;
-}
-
-bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &value) {
-    size_t suffix_size = proposed_suffix.size();
-    return suffix_size <= value.size() &&
-           value.compare(value.size() - suffix_size, suffix_size, proposed_suffix) == 0;
-}
-
-bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value) {
-    size_t suffix_size = std::wcslen(proposed_suffix);
-    return suffix_size <= value.size() &&
-           value.compare(value.size() - suffix_size, suffix_size, proposed_suffix) == 0;
-}
-
-bool string_suffixes_string_case_insensitive(const wcstring &proposed_suffix,
-                                             const wcstring &value) {
-    size_t suffix_size = proposed_suffix.size();
-    return suffix_size <= value.size() && wcsncasecmp(value.c_str() + (value.size() - suffix_size),
-                                                      proposed_suffix.c_str(), suffix_size) == 0;
-}
-
 /// Returns true if seq, represented as a subsequence, is contained within string.
 static bool subsequence_in_string(const wcstring &seq, const wcstring &str) {
     // Impossible if seq is larger than string.
@@ -2021,74 +1965,6 @@ int string_fuzzy_match_t::compare(const string_fuzzy_match_t &rhs) const {
     return 0;  // equal
 }
 
-template <bool Fuzzy, typename T>
-size_t ifind_impl(const T &haystack, const T &needle) {
-    using char_t = typename T::value_type;
-    std::locale locale;
-
-    auto ieq = [&locale](char_t c1, char_t c2) {
-        if (c1 == c2 || std::toupper(c1, locale) == std::toupper(c2, locale)) return true;
-
-        // In fuzzy matching treat treat `-` and `_` as equal (#3584).
-        if (Fuzzy) {
-            if ((c1 == '-' || c1 == '_') && (c2 == '-' || c2 == '_')) return true;
-        }
-        return false;
-    };
-
-    auto result = std::search(haystack.begin(), haystack.end(), needle.begin(), needle.end(), ieq);
-    if (result != haystack.end()) {
-        return result - haystack.begin();
-    }
-    return T::npos;
-}
-
-size_t ifind(const wcstring &haystack, const wcstring &needle, bool fuzzy) {
-    return fuzzy ? ifind_impl<true>(haystack, needle) : ifind_impl<false>(haystack, needle);
-}
-
-size_t ifind(const std::string &haystack, const std::string &needle, bool fuzzy) {
-    return fuzzy ? ifind_impl<true>(haystack, needle) : ifind_impl<false>(haystack, needle);
-}
-
-wcstring_list_t split_string(const wcstring &val, wchar_t sep) {
-    wcstring_list_t out;
-    size_t pos = 0, end = val.size();
-    while (pos <= end) {
-        size_t next_pos = val.find(sep, pos);
-        if (next_pos == wcstring::npos) {
-            next_pos = end;
-        }
-        out.emplace_back(val, pos, next_pos - pos);
-        pos = next_pos + 1;  // skip the separator, or skip past the end
-    }
-    return out;
-}
-
-wcstring join_strings(const wcstring_list_t &vals, wchar_t sep) {
-    if (vals.empty()) return wcstring{};
-
-    // Reserve the size we will need.
-    // count-1 separators, plus the length of all strings.
-    size_t size = vals.size() - 1;
-    for (const wcstring &s : vals) {
-        size += s.size();
-    }
-
-    // Construct the string.
-    wcstring result;
-    result.reserve(size);
-    bool first = true;
-    for (const wcstring &s : vals) {
-        if (!first) {
-            result.push_back(sep);
-        }
-        result.append(s);
-        first = false;
-    }
-    return result;
-}
-
 int create_directory(const wcstring &d) {
     bool ok = false;
     struct stat buf;
@@ -2212,23 +2088,6 @@ double timef() {
 
 void exit_without_destructors(int code) { _exit(code); }
 
-/// Helper function to convert from a null_terminated_array_t<wchar_t> to a
-/// null_terminated_array_t<char_t>.
-void convert_wide_array_to_narrow(const null_terminated_array_t<wchar_t> &wide_arr,
-                                  null_terminated_array_t<char> *output) {
-    const wchar_t *const *arr = wide_arr.get();
-    if (!arr) {
-        output->clear();
-        return;
-    }
-
-    std::vector<std::string> list;
-    for (size_t i = 0; arr[i]; i++) {
-        list.push_back(wcs2string(arr[i]));
-    }
-    output->set(list);
-}
-
 void autoclose_fd_t::close() {
     if (fd_ < 0) return;
     if (::close(fd_) == -1) {
@@ -2237,24 +2096,6 @@ void autoclose_fd_t::close() {
     fd_ = -1;
 }
 
-void append_path_component(wcstring &path, const wcstring &component) {
-    if (path.empty() || component.empty()) {
-        path.append(component);
-    } else {
-        size_t path_len = path.size();
-        bool path_slash = path.at(path_len - 1) == L'/';
-        bool comp_slash = component.at(0) == L'/';
-        if (!path_slash && !comp_slash) {
-            // Need a slash
-            path.push_back(L'/');
-        } else if (path_slash && comp_slash) {
-            // Too many slashes.
-            path.erase(path_len - 1, 1);
-        }
-        path.append(component);
-    }
-}
-
 extern "C" {
 [[gnu::noinline]] void debug_thread_error(void) {
     // Wait for a SIGINT. We can't use sigsuspend() because the signal may be delivered on another
@@ -2335,63 +2176,6 @@ void assert_is_locked(void *vmutex, const char *who, const char *caller) {
     }
 }
 
-template <typename CharType_t>
-static CharType_t **make_null_terminated_array_helper(
-    const std::vector<std::basic_string<CharType_t> > &argv) {
-    size_t count = argv.size();
-
-    // We allocate everything in one giant block. First compute how much space we need.
-    // N + 1 pointers.
-    size_t pointers_allocation_len = (count + 1) * sizeof(CharType_t *);
-
-    // In the very unlikely event that CharType_t has stricter alignment requirements than does a
-    // pointer, round us up to the size of a CharType_t.
-    pointers_allocation_len += sizeof(CharType_t) - 1;
-    pointers_allocation_len -= pointers_allocation_len % sizeof(CharType_t);
-
-    // N null terminated strings.
-    size_t strings_allocation_len = 0;
-    for (size_t i = 0; i < count; i++) {
-        // The size of the string, plus a null terminator.
-        strings_allocation_len += (argv.at(i).size() + 1) * sizeof(CharType_t);
-    }
-
-    // Now allocate their sum.
-    unsigned char *base =
-        static_cast<unsigned char *>(malloc(pointers_allocation_len + strings_allocation_len));
-    if (!base) return nullptr;
-
-    // Divvy it up into the pointers and strings.
-    CharType_t **pointers = reinterpret_cast<CharType_t **>(base);
-    CharType_t *strings = reinterpret_cast<CharType_t *>(base + pointers_allocation_len);
-
-    // Start copying.
-    for (size_t i = 0; i < count; i++) {
-        const std::basic_string<CharType_t> &str = argv.at(i);
-        *pointers++ = strings;  // store the current string pointer into self
-        strings = std::copy(str.begin(), str.end(), strings);  // copy the string into strings
-        *strings++ = (CharType_t)(0);  // each string needs a null terminator
-    }
-    *pointers++ = nullptr;  // array of pointers needs a null terminator
-
-    // Make sure we know what we're doing.
-    assert((unsigned char *)pointers - base == (std::ptrdiff_t)pointers_allocation_len);
-    assert((unsigned char *)strings - (unsigned char *)pointers ==
-           (std::ptrdiff_t)strings_allocation_len);
-    assert((unsigned char *)strings - base ==
-           (std::ptrdiff_t)(pointers_allocation_len + strings_allocation_len));
-
-    return reinterpret_cast<CharType_t **>(base);
-}
-
-wchar_t **make_null_terminated_array(const wcstring_list_t &lst) {
-    return make_null_terminated_array_helper(lst);
-}
-
-char **make_null_terminated_array(const std::vector<std::string> &lst) {
-    return make_null_terminated_array_helper(lst);
-}
-
 /// Test if the specified character is in a range that fish uses interally to store special tokens.
 ///
 /// NOTE: This is used when tokenizing the input. It is also used when reading input, before
diff --git a/src/common.h b/src/common.h
index d3d1939d3..988d5b55b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -287,69 +287,6 @@ char *wcs2str(const wchar_t *in);
 char *wcs2str(const wcstring &in);
 std::string wcs2string(const wcstring &input);
 
-/// Test if a string prefixes another. Returns true if a is a prefix of b.
-bool string_prefixes_string(const wcstring &proposed_prefix, const wcstring &value);
-bool string_prefixes_string(const wchar_t *proposed_prefix, const wcstring &value);
-bool string_prefixes_string(const wchar_t *proposed_prefix, const wchar_t *value);
-bool string_prefixes_string(const char *proposed_prefix, const std::string &value);
-bool string_prefixes_string(const char *proposed_prefix, const char *value);
-
-/// Test if a string is a suffix of another.
-bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &value);
-bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value);
-bool string_suffixes_string_case_insensitive(const wcstring &proposed_suffix,
-                                             const wcstring &value);
-
-/// Test if a string prefixes another without regard to case. Returns true if a is a prefix of b.
-bool string_prefixes_string_case_insensitive(const wcstring &proposed_prefix,
-                                             const wcstring &value);
-
-/// Case-insensitive string search, modeled after std::string::find().
-/// \param fuzzy indicates this is being used for fuzzy matching and case insensitivity is
-/// expanded to include symbolic characters (#3584).
-/// \return the offset of the first case-insensitive matching instance of `needle` within
-/// `haystack`, or `string::npos()` if no results were found.
-size_t ifind(const wcstring &haystack, const wcstring &needle, bool fuzzy = false);
-size_t ifind(const std::string &haystack, const std::string &needle, bool fuzzy = false);
-
-/// Split a string by a separator character.
-wcstring_list_t split_string(const wcstring &val, wchar_t sep);
-
-/// Join a list of strings by a separator character.
-wcstring join_strings(const wcstring_list_t &vals, wchar_t sep);
-
-/// Support for iterating over a newline-separated string.
-template <typename Collection>
-class line_iterator_t {
-    // Storage for each line.
-    Collection storage;
-
-    // The collection we're iterating. Note we hold this by reference.
-    const Collection &coll;
-
-    // The current location in the iteration.
-    typename Collection::const_iterator current;
-
-   public:
-    /// Construct from a collection (presumably std::string or std::wcstring).
-    line_iterator_t(const Collection &coll) : coll(coll), current(coll.cbegin()) {}
-
-    /// Access the storage in which the last line was stored.
-    const Collection &line() const { return storage; }
-
-    /// Advances to the next line. \return true on success, false if we have exhausted the string.
-    bool next() {
-        if (current == coll.end()) return false;
-        auto newline_or_end = std::find(current, coll.cend(), '\n');
-        storage.assign(current, newline_or_end);
-        current = newline_or_end;
-
-        // Skip the newline.
-        if (current != coll.cend()) ++current;
-        return true;
-    }
-};
-
 enum fuzzy_match_type_t {
     // We match the string exactly: FOOBAR matches FOOBAR.
     fuzzy_match_exact = 0,
@@ -483,114 +420,6 @@ void format_ullong_safe(wchar_t buff[64], unsigned long long val);
 /// "Narrows" a wide character string. This just grabs any ASCII characters and trunactes.
 void narrow_string_safe(char buff[64], const wchar_t *s);
 
-inline wcstring to_string(long x) {
-    wchar_t buff[64];
-    format_long_safe(buff, x);
-    return wcstring(buff);
-}
-
-inline wcstring to_string(unsigned long long x) {
-    wchar_t buff[64];
-    format_ullong_safe(buff, x);
-    return wcstring(buff);
-}
-
-inline wcstring to_string(int x) { return to_string(static_cast<long>(x)); }
-
-inline wcstring to_string(size_t x) { return to_string(static_cast<unsigned long long>(x)); }
-
-inline bool bool_from_string(const std::string &x) {
-    if (x.empty()) return false;
-    switch (x.front()) {
-        case 'Y':
-        case 'T':
-        case 'y':
-        case 't':
-        case '1':
-            return true;
-        default:
-            return false;
-    }
-}
-
-inline bool bool_from_string(const wcstring &x) {
-    return !x.empty() && std::wcschr(L"YTyt1", x.at(0));
-}
-
-wchar_t **make_null_terminated_array(const wcstring_list_t &lst);
-char **make_null_terminated_array(const std::vector<std::string> &lst);
-
-// Helper class for managing a null-terminated array of null-terminated strings (of some char type).
-template <typename CharType_t>
-class null_terminated_array_t {
-    CharType_t **array{nullptr};
-
-    // No assignment or copying.
-    void operator=(null_terminated_array_t rhs) = delete;
-    null_terminated_array_t(const null_terminated_array_t &) = delete;
-
-    typedef std::vector<std::basic_string<CharType_t>> string_list_t;
-
-    size_t size() const {
-        size_t len = 0;
-        if (array != nullptr) {
-            while (array[len] != nullptr) {
-                len++;
-            }
-        }
-        return len;
-    }
-
-    void free(void) {
-        ::free((void *)array);
-        array = nullptr;
-    }
-
-   public:
-    null_terminated_array_t() = default;
-
-    explicit null_terminated_array_t(const string_list_t &argv)
-        : array(make_null_terminated_array(argv)) {}
-
-    ~null_terminated_array_t() { this->free(); }
-
-    null_terminated_array_t(null_terminated_array_t &&rhs) : array(rhs.array) {
-        rhs.array = nullptr;
-    }
-
-    null_terminated_array_t operator=(null_terminated_array_t &&rhs) {
-        free();
-        array = rhs.array;
-        rhs.array = nullptr;
-    }
-
-    void set(const string_list_t &argv) {
-        this->free();
-        this->array = make_null_terminated_array(argv);
-    }
-
-    /// Convert from a null terminated list to a vector of strings.
-    static string_list_t to_list(const CharType_t *const *arr) {
-        string_list_t result;
-        for (const auto *cursor = arr; cursor && *cursor; cursor++) {
-            result.push_back(*cursor);
-        }
-        return result;
-    }
-
-    /// Instance method.
-    string_list_t to_list() const { return to_list(array); }
-
-    const CharType_t *const *get() const { return array; }
-    CharType_t **get() { return array; }
-
-    void clear() { this->free(); }
-};
-
-// Helper function to convert from a null_terminated_array_t<wchar_t> to a
-// null_terminated_array_t<char_t>.
-void convert_wide_array_to_narrow(const null_terminated_array_t<wchar_t> &arr,
-                                  null_terminated_array_t<char> *output);
 typedef std::lock_guard<std::mutex> scoped_lock;
 typedef std::lock_guard<std::recursive_mutex> scoped_rlock;
 
@@ -736,9 +565,6 @@ class autoclose_fd_t {
     ~autoclose_fd_t() { close(); }
 };
 
-/// Appends a path component, with a / if necessary.
-void append_path_component(wcstring &path, const wcstring &component);
-
 wcstring format_string(const wchar_t *format, ...);
 wcstring vformat_string(const wchar_t *format, va_list va_orig);
 void append_format(wcstring &str, const wchar_t *format, ...);
diff --git a/src/complete.cpp b/src/complete.cpp
index d496dc689..038becaba 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -47,6 +47,7 @@
 #include "reader.h"
 #include "tnode.h"
 #include "util.h"
+#include "wcstringutil.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/env.h b/src/env.h
index b33a5e143..4b0b6421f 100644
--- a/src/env.h
+++ b/src/env.h
@@ -12,6 +12,7 @@
 
 #include "common.h"
 #include "maybe.h"
+#include "null_terminated_array.h"
 
 extern size_t read_byte_limit;
 extern bool curses_initialized;
diff --git a/src/exec.cpp b/src/exec.cpp
index 953b8bc2d..0841c7fdd 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -36,6 +36,7 @@
 #include "function.h"
 #include "io.h"
 #include "iothread.h"
+#include "null_terminated_array.h"
 #include "parse_tree.h"
 #include "parser.h"
 #include "path.h"
diff --git a/src/fish.cpp b/src/fish.cpp
index f9d7e2f38..57573a25d 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -55,6 +55,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include "proc.h"
 #include "reader.h"
 #include "signal.h"
+#include "wcstringutil.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 // container to hold the options specified within the command line
diff --git a/src/flog.cpp b/src/flog.cpp
index 477a295dd..5686fb487 100644
--- a/src/flog.cpp
+++ b/src/flog.cpp
@@ -9,6 +9,7 @@
 #include "enum_set.h"
 #include "global_safety.h"
 #include "parse_util.h"
+#include "wcstringutil.h"
 #include "wildcard.h"
 
 namespace flog_details {
diff --git a/src/flog.h b/src/flog.h
index 29677935f..9c478fe28 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -11,6 +11,7 @@
 #include <utility>
 
 #include "global_safety.h"
+#include "wcstringutil.h"
 
 using wcstring = std::wstring;
 using wcstring_list_t = std::vector<wcstring>;
diff --git a/src/future_feature_flags.cpp b/src/future_feature_flags.cpp
index fd90cd5eb..b50ea03e3 100644
--- a/src/future_feature_flags.cpp
+++ b/src/future_feature_flags.cpp
@@ -4,6 +4,8 @@
 
 #include <cwchar>
 
+#include "wcstringutil.h"
+
 /// The set of features applying to this instance.
 static features_t global_features;
 
diff --git a/src/highlight.cpp b/src/highlight.cpp
index a4a230797..102648ecf 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -32,6 +32,7 @@
 #include "path.h"
 #include "tnode.h"
 #include "tokenizer.h"
+#include "wcstringutil.h"
 #include "wildcard.h"
 #include "wutil.h"  // IWYU pragma: keep
 
diff --git a/src/null_terminated_array.cpp b/src/null_terminated_array.cpp
new file mode 100644
index 000000000..368584d7f
--- /dev/null
+++ b/src/null_terminated_array.cpp
@@ -0,0 +1,73 @@
+#include "null_terminated_array.h"
+
+template <typename CharT>
+static CharT **make_null_terminated_array_helper(
+    const std::vector<std::basic_string<CharT> > &argv) {
+    size_t count = argv.size();
+
+    // We allocate everything in one giant block. First compute how much space we need.
+    // N + 1 pointers.
+    size_t pointers_allocation_len = (count + 1) * sizeof(CharT *);
+
+    // In the very unlikely event that CharT has stricter alignment requirements than does a
+    // pointer, round us up to the size of a CharT.
+    pointers_allocation_len += sizeof(CharT) - 1;
+    pointers_allocation_len -= pointers_allocation_len % sizeof(CharT);
+
+    // N null terminated strings.
+    size_t strings_allocation_len = 0;
+    for (size_t i = 0; i < count; i++) {
+        // The size of the string, plus a null terminator.
+        strings_allocation_len += (argv.at(i).size() + 1) * sizeof(CharT);
+    }
+
+    // Now allocate their sum.
+    unsigned char *base =
+        static_cast<unsigned char *>(malloc(pointers_allocation_len + strings_allocation_len));
+    if (!base) return nullptr;
+
+    // Divvy it up into the pointers and strings.
+    CharT **pointers = reinterpret_cast<CharT **>(base);
+    CharT *strings = reinterpret_cast<CharT *>(base + pointers_allocation_len);
+
+    // Start copying.
+    for (size_t i = 0; i < count; i++) {
+        const std::basic_string<CharT> &str = argv.at(i);
+        *pointers++ = strings;  // store the current string pointer into self
+        strings = std::copy(str.begin(), str.end(), strings);  // copy the string into strings
+        *strings++ = (CharT)(0);  // each string needs a null terminator
+    }
+    *pointers++ = nullptr;  // array of pointers needs a null terminator
+
+    // Make sure we know what we're doing.
+    assert((unsigned char *)pointers - base == (std::ptrdiff_t)pointers_allocation_len);
+    assert((unsigned char *)strings - (unsigned char *)pointers ==
+           (std::ptrdiff_t)strings_allocation_len);
+    assert((unsigned char *)strings - base ==
+           (std::ptrdiff_t)(pointers_allocation_len + strings_allocation_len));
+
+    return reinterpret_cast<CharT **>(base);
+}
+
+wchar_t **make_null_terminated_array(const wcstring_list_t &lst) {
+    return make_null_terminated_array_helper(lst);
+}
+
+char **make_null_terminated_array(const std::vector<std::string> &lst) {
+    return make_null_terminated_array_helper(lst);
+}
+
+void convert_wide_array_to_narrow(const null_terminated_array_t<wchar_t> &wide_arr,
+                                  null_terminated_array_t<char> *output) {
+    const wchar_t *const *arr = wide_arr.get();
+    if (!arr) {
+        output->clear();
+        return;
+    }
+
+    std::vector<std::string> list;
+    for (size_t i = 0; arr[i]; i++) {
+        list.push_back(wcs2string(arr[i]));
+    }
+    output->set(list);
+}
diff --git a/src/null_terminated_array.h b/src/null_terminated_array.h
new file mode 100644
index 000000000..59950be75
--- /dev/null
+++ b/src/null_terminated_array.h
@@ -0,0 +1,87 @@
+// Support for null-terminated arrays like char**.
+#ifndef FISH_NULL_TERMINATED_ARRAY_H
+#define FISH_NULL_TERMINATED_ARRAY_H
+
+#include "config.h"  // IWYU pragma: keep
+
+#include <string>
+#include <vector>
+
+#include "common.h"
+
+wchar_t **make_null_terminated_array(const wcstring_list_t &lst);
+char **make_null_terminated_array(const std::vector<std::string> &lst);
+
+// Helper class for managing a null-terminated array of null-terminated strings (of some char type).
+template <typename CharT>
+class null_terminated_array_t {
+    using string_list_t = std::vector<std::basic_string<CharT>>;
+
+    CharT **array{nullptr};
+
+    // No assignment or copying.
+    void operator=(null_terminated_array_t rhs) = delete;
+    null_terminated_array_t(const null_terminated_array_t &) = delete;
+
+    size_t size() const {
+        size_t len = 0;
+        if (array != nullptr) {
+            while (array[len] != nullptr) {
+                len++;
+            }
+        }
+        return len;
+    }
+
+    void free(void) {
+        ::free((void *)array);
+        array = nullptr;
+    }
+
+   public:
+    null_terminated_array_t() = default;
+
+    explicit null_terminated_array_t(const string_list_t &argv)
+        : array(make_null_terminated_array(argv)) {}
+
+    ~null_terminated_array_t() { this->free(); }
+
+    null_terminated_array_t(null_terminated_array_t &&rhs) : array(rhs.array) {
+        rhs.array = nullptr;
+    }
+
+    null_terminated_array_t operator=(null_terminated_array_t &&rhs) {
+        free();
+        array = rhs.array;
+        rhs.array = nullptr;
+    }
+
+    void set(const string_list_t &argv) {
+        this->free();
+        this->array = make_null_terminated_array(argv);
+    }
+
+    /// Convert from a null terminated list to a vector of strings.
+    static string_list_t to_list(const CharT *const *arr) {
+        string_list_t result;
+        for (const auto *cursor = arr; cursor && *cursor; cursor++) {
+            result.push_back(*cursor);
+        }
+        return result;
+    }
+
+    /// Instance method.
+    string_list_t to_list() const { return to_list(array); }
+
+    const CharT *const *get() const { return array; }
+    CharT **get() { return array; }
+
+    void clear() { this->free(); }
+};
+
+// Helper function to convert from a null_terminated_array_t<wchar_t> to a
+// null_terminated_array_t<char_t>.
+void convert_wide_array_to_narrow(const null_terminated_array_t<wchar_t> &arr,
+                                  null_terminated_array_t<char> *output);
+
+#endif  // FISH_NULL_TERMINATED_ARRAY_H
diff --git a/src/output.cpp b/src/output.cpp
index 69ce26297..501d3ecd3 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -30,6 +30,7 @@
 #include "fallback.h"  // IWYU pragma: keep
 #include "flog.h"
 #include "output.h"
+#include "wcstringutil.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// Whether term256 and term24bit are supported.
diff --git a/src/path.cpp b/src/path.cpp
index 976103df2..3e2995103 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -442,3 +442,21 @@ bool paths_are_same_file(const wcstring &path1, const wcstring &path2) {
 
     return false;
 }
+
+void append_path_component(wcstring &path, const wcstring &component) {
+    if (path.empty() || component.empty()) {
+        path.append(component);
+    } else {
+        size_t path_len = path.size();
+        bool path_slash = path.at(path_len - 1) == L'/';
+        bool comp_slash = component.at(0) == L'/';
+        if (!path_slash && !comp_slash) {
+            // Need a slash
+            path.push_back(L'/');
+        } else if (path_slash && comp_slash) {
+            // Too many slashes.
+            path.erase(path_len - 1, 1);
+        }
+        path.append(component);
+    }
+}
diff --git a/src/path.h b/src/path.h
index 1bf64cb4b..475be6100 100644
--- a/src/path.h
+++ b/src/path.h
@@ -86,4 +86,7 @@ bool paths_are_same_file(const wcstring &path1, const wcstring &path2);
 /// directory. This operates on unescaped paths only (so a ~ means a literal ~).
 wcstring path_apply_working_directory(const wcstring &path, const wcstring &working_directory);
 
+/// Appends a path component, with a / if necessary.
+void append_path_component(wcstring &path, const wcstring &component);
+
 #endif
diff --git a/src/screen.h b/src/screen.h
index d4f3e277c..0394845ef 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -24,6 +24,7 @@
 
 #include "common.h"
 #include "highlight.h"
+#include "wcstringutil.h"
 
 class page_rendering_t;
 
diff --git a/src/wcstringutil.cpp b/src/wcstringutil.cpp
index f5a5658ae..9a75132c2 100644
--- a/src/wcstringutil.cpp
+++ b/src/wcstringutil.cpp
@@ -5,11 +5,12 @@
 
 #include <wctype.h>
 
+#include <locale>
+
 #include "common.h"
 
-using size_type = wcstring::size_type;
-
 wcstring_range wcstring_tok(wcstring &str, const wcstring &needle, wcstring_range last) {
+    using size_type = wcstring::size_type;
     size_type pos = last.second == wcstring::npos ? wcstring::npos : last.first;
     if (pos != wcstring::npos && last.second != wcstring::npos) pos += last.second;
     if (pos != wcstring::npos && pos != 0) ++pos;
@@ -71,3 +72,127 @@ wcstring wcstolower(wcstring input) {
     std::transform(result.begin(), result.end(), result.begin(), towlower);
     return result;
 }
+
+bool string_prefixes_string(const wchar_t *proposed_prefix, const wcstring &value) {
+    return string_prefixes_string(proposed_prefix, value.c_str());
+}
+
+bool string_prefixes_string(const wcstring &proposed_prefix, const wcstring &value) {
+    size_t prefix_size = proposed_prefix.size();
+    return prefix_size <= value.size() && value.compare(0, prefix_size, proposed_prefix) == 0;
+}
+
+bool string_prefixes_string(const wchar_t *proposed_prefix, const wchar_t *value) {
+    for (size_t idx = 0; proposed_prefix[idx] != L'\0'; idx++) {
+        // Note if the prefix is longer than value, then we will compare a nonzero prefix character
+        // against a zero value character, and so we'll return false;
+        if (proposed_prefix[idx] != value[idx]) return false;
+    }
+    // We must have that proposed_prefix[idx] == L'\0', so we have a prefix match.
+    return true;
+}
+
+bool string_prefixes_string(const char *proposed_prefix, const std::string &value) {
+    return string_prefixes_string(proposed_prefix, value.c_str());
+}
+
+bool string_prefixes_string(const char *proposed_prefix, const char *value) {
+    for (size_t idx = 0; proposed_prefix[idx] != L'\0'; idx++) {
+        if (proposed_prefix[idx] != value[idx]) return false;
+    }
+    return true;
+}
+
+bool string_prefixes_string_case_insensitive(const wcstring &proposed_prefix,
+                                             const wcstring &value) {
+    size_t prefix_size = proposed_prefix.size();
+    return prefix_size <= value.size() &&
+           wcsncasecmp(proposed_prefix.c_str(), value.c_str(), prefix_size) == 0;
+}
+
+bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &value) {
+    size_t suffix_size = proposed_suffix.size();
+    return suffix_size <= value.size() &&
+           value.compare(value.size() - suffix_size, suffix_size, proposed_suffix) == 0;
+}
+
+bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value) {
+    size_t suffix_size = std::wcslen(proposed_suffix);
+    return suffix_size <= value.size() &&
+           value.compare(value.size() - suffix_size, suffix_size, proposed_suffix) == 0;
+}
+
+bool string_suffixes_string_case_insensitive(const wcstring &proposed_suffix,
+                                             const wcstring &value) {
+    size_t suffix_size = proposed_suffix.size();
+    return suffix_size <= value.size() && wcsncasecmp(value.c_str() + (value.size() - suffix_size),
+                                                      proposed_suffix.c_str(), suffix_size) == 0;
+}
+
+template <bool Fuzzy, typename T>
+size_t ifind_impl(const T &haystack, const T &needle) {
+    using char_t = typename T::value_type;
+    std::locale locale;
+
+    auto ieq = [&locale](char_t c1, char_t c2) {
+        if (c1 == c2 || std::toupper(c1, locale) == std::toupper(c2, locale)) return true;
+
+        // In fuzzy matching treat treat `-` and `_` as equal (#3584).
+        if (Fuzzy) {
+            if ((c1 == '-' || c1 == '_') && (c2 == '-' || c2 == '_')) return true;
+        }
+        return false;
+    };
+
+    auto result = std::search(haystack.begin(), haystack.end(), needle.begin(), needle.end(), ieq);
+    if (result != haystack.end()) {
+        return result - haystack.begin();
+    }
+    return T::npos;
+}
+
+size_t ifind(const wcstring &haystack, const wcstring &needle, bool fuzzy) {
+    return fuzzy ? ifind_impl<true>(haystack, needle) : ifind_impl<false>(haystack, needle);
+}
+
+size_t ifind(const std::string &haystack, const std::string &needle, bool fuzzy) {
+    return fuzzy ? ifind_impl<true>(haystack, needle) : ifind_impl<false>(haystack, needle);
+}
+
+wcstring_list_t split_string(const wcstring &val, wchar_t sep) {
+    wcstring_list_t out;
+    size_t pos = 0, end = val.size();
+    while (pos <= end) {
+        size_t next_pos = val.find(sep, pos);
+        if (next_pos == wcstring::npos) {
+            next_pos = end;
+        }
+        out.emplace_back(val, pos, next_pos - pos);
+        pos = next_pos + 1;  // skip the separator, or skip past the end
+    }
+    return out;
+}
+
+wcstring join_strings(const wcstring_list_t &vals, wchar_t sep) {
+    if (vals.empty()) return wcstring{};
+
+    // Reserve the size we will need.
+    // count-1 separators, plus the length of all strings.
+    size_t size = vals.size() - 1;
+    for (const wcstring &s : vals) {
+        size += s.size();
+    }
+
+    // Construct the string.
+    wcstring result;
+    result.reserve(size);
+    bool first = true;
+    for (const wcstring &s : vals) {
+        if (!first) {
+            result.push_back(sep);
+        }
+        result.append(s);
+        first = false;
+    }
+    return result;
+}
diff --git a/src/wcstringutil.h b/src/wcstringutil.h
index 54ce9ba2a..e18e6cee5 100644
--- a/src/wcstringutil.h
+++ b/src/wcstringutil.h
@@ -8,6 +8,71 @@
 
 #include "common.h"
 
+/// Test if a string prefixes another. Returns true if a is a prefix of b.
+bool string_prefixes_string(const wcstring &proposed_prefix, const wcstring &value);
+bool string_prefixes_string(const wchar_t *proposed_prefix, const wcstring &value);
+bool string_prefixes_string(const wchar_t *proposed_prefix, const wchar_t *value);
+bool string_prefixes_string(const char *proposed_prefix, const std::string &value);
+bool string_prefixes_string(const char *proposed_prefix, const char *value);
+
+/// Test if a string is a suffix of another.
+bool string_suffixes_string(const wcstring &proposed_suffix, const wcstring &value);
+bool string_suffixes_string(const wchar_t *proposed_suffix, const wcstring &value);
+bool string_suffixes_string_case_insensitive(const wcstring &proposed_suffix,
+                                             const wcstring &value);
+
+/// Test if a string prefixes another without regard to case. Returns true if a is a prefix of b.
+bool string_prefixes_string_case_insensitive(const wcstring &proposed_prefix,
+                                             const wcstring &value);
+
+/// Case-insensitive string search, modeled after std::string::find().
+/// \param fuzzy indicates this is being used for fuzzy matching and case insensitivity is
+/// expanded to include symbolic characters (#3584).
+/// \return the offset of the first case-insensitive matching instance of `needle` within
+/// `haystack`, or `string::npos()` if no results were found.
+size_t ifind(const wcstring &haystack, const wcstring &needle, bool fuzzy = false);
+size_t ifind(const std::string &haystack, const std::string &needle, bool fuzzy = false);
+
+/// Split a string by a separator character.
+wcstring_list_t split_string(const wcstring &val, wchar_t sep);
+
+/// Join a list of strings by a separator character.
+wcstring join_strings(const wcstring_list_t &vals, wchar_t sep);
+
+inline wcstring to_string(long x) {
+    wchar_t buff[64];
+    format_long_safe(buff, x);
+    return wcstring(buff);
+}
+
+inline wcstring to_string(unsigned long long x) {
+    wchar_t buff[64];
+    format_ullong_safe(buff, x);
+    return wcstring(buff);
+}
+
+inline wcstring to_string(int x) { return to_string(static_cast<long>(x)); }
+
+inline wcstring to_string(size_t x) { return to_string(static_cast<unsigned long long>(x)); }
+
+inline bool bool_from_string(const std::string &x) {
+    if (x.empty()) return false;
+    switch (x.front()) {
+        case 'Y':
+        case 'T':
+        case 'y':
+        case 't':
+        case '1':
+            return true;
+        default:
+            return false;
+    }
+}
+
+inline bool bool_from_string(const wcstring &x) {
+    return !x.empty() && std::wcschr(L"YTyt1", x.at(0));
+}
+
 /// @typedef wcstring_range represents a range in a wcstring.
 /// The first element is the location, the second is the count.
 typedef std::pair<wcstring::size_type, wcstring::size_type> wcstring_range;
@@ -71,4 +136,36 @@ wcstring trim(wcstring input, const wchar_t *any_of);
 /// Converts a string to lowercase.
 wcstring wcstolower(wcstring input);
 
+/// Support for iterating over a newline-separated string.
+template <typename Collection>
+class line_iterator_t {
+    // Storage for each line.
+    Collection storage;
+
+    // The collection we're iterating. Note we hold this by reference.
+    const Collection &coll;
+
+    // The current location in the iteration.
+    typename Collection::const_iterator current;
+
+   public:
+    /// Construct from a collection (presumably std::string or std::wcstring).
+    line_iterator_t(const Collection &coll) : coll(coll), current(coll.cbegin()) {}
+
+    /// Access the storage in which the last line was stored.
+    const Collection &line() const { return storage; }
+
+    /// Advances to the next line. \return true on success, false if we have exhausted the string.
+    bool next() {
+        if (current == coll.end()) return false;
+        auto newline_or_end = std::find(current, coll.cend(), '\n');
+        storage.assign(current, newline_or_end);
+        current = newline_or_end;
+
+        // Skip the newline.
+        if (current != coll.cend()) ++current;
+        return true;
+    }
+};
+
 #endif
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 692342bc6..d3c7ad12b 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -22,7 +22,9 @@
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
 #include "future_feature_flags.h"
+#include "path.h"
 #include "reader.h"
+#include "wcstringutil.h"
 #include "wutil.h"  // IWYU pragma: keep
 
 /// Description for generic executable.

From 98e714f98f580bacdec9a693d3a0530402bd7fb7 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 16 Jan 2020 15:14:21 -0800
Subject: [PATCH 1556/1732] clang-format .cpp and .h files

---
 src/builtin_string.cpp | 15 ++++++++++-----
 src/complete.cpp       | 12 +++++-------
 src/input_common.cpp   |  4 ++--
 src/input_common.h     |  2 +-
 src/reader.cpp         |  3 ++-
 src/screen.cpp         |  4 ++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp
index 3bf7df9f2..3367befbc 100644
--- a/src/builtin_string.cpp
+++ b/src/builtin_string.cpp
@@ -459,7 +459,8 @@ static int parse_opts(options_t *opts, int *optind, int n_req_args, int argc, wc
             if (retval != STATUS_CMD_OK) return retval;
         } else if (opt == ':') {
             streams.err.append(L"string ");  // clone of string_error
-            builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1], false /* print_hints */);
+            builtin_missing_argument(parser, streams, cmd, argv[w.woptind - 1],
+                                     false /* print_hints */);
             return STATUS_INVALID_ARGS;
         } else if (opt == '?') {
             string_unknown_option(parser, streams, cmd, argv[w.woptind - 1]);
@@ -796,9 +797,12 @@ class pcre2_matcher_t : public string_matcher_t {
         int rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, 0, 0,
                                                regex.match, nullptr));
 
-        if (rc < 0 /* pcre2 error */) return false;
-        else if (rc == 0 /* no match */) return true;
-        else total_matched++;
+        if (rc < 0 /* pcre2 error */)
+            return false;
+        else if (rc == 0 /* no match */)
+            return true;
+        else
+            total_matched++;
 
         if (opts.invert_match) return true;
 
@@ -815,7 +819,8 @@ class pcre2_matcher_t : public string_matcher_t {
             rc = report_match(arg, pcre2_match(regex.code, PCRE2_SPTR(arg.c_str()), arglen, offset,
                                                options, regex.match, nullptr));
 
-            if (rc < 0 /* pcre2 error */) return false;
+            if (rc < 0 /* pcre2 error */)
+                return false;
             else if (rc == 0 /* no matches */) {
                 if (options == 0 /* all matches found now */) break;
                 ovector[1] = offset + 1;
diff --git a/src/complete.cpp b/src/complete.cpp
index 038becaba..c67284ee4 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -303,11 +303,10 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps,
     // arguments, and penalize files that end in tilde - they're frequently autosave files from e.g.
     // emacs.
     if (flags & completion_request_t::autosuggestion) {
-        stable_sort(comps->begin(), comps->end(),
-                    [](const completion_t &a, const completion_t &b) {
-                        return compare_completions_by_duplicate_arguments(a, b) ||
-                               compare_completions_by_tilde(a, b);
-                    });
+        stable_sort(comps->begin(), comps->end(), [](const completion_t &a, const completion_t &b) {
+            return compare_completions_by_duplicate_arguments(a, b) ||
+                   compare_completions_by_tilde(a, b);
+        });
     }
 }
 
@@ -1677,8 +1676,7 @@ wcstring complete_print() {
     // Get a list of all completions in a vector, then sort it by order.
     std::vector<std::reference_wrapper<const completion_entry_t>> all_completions;
     // These should be "c"begin/end, but then gcc from ~~the dark ages~~ RHEL 7 would complain.
-    all_completions.insert(all_completions.begin(), completion_set->begin(),
-                           completion_set->end());
+    all_completions.insert(all_completions.begin(), completion_set->begin(), completion_set->end());
     sort(all_completions.begin(), all_completions.end(), compare_completions_by_order);
 
     for (const completion_entry_t &e : all_completions) {
diff --git a/src/input_common.cpp b/src/input_common.cpp
index d877257bf..4767a0be0 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -57,7 +57,7 @@ char_event_t input_event_queue_t::readb() {
         }
 
         // Get our uvar notifier.
-        universal_notifier_t &notifier = universal_notifier_t::default_notifier();
+        universal_notifier_t& notifier = universal_notifier_t::default_notifier();
 
         // Get the notification fd (possibly none).
         int notifier_fd = notifier.notification_fd();
@@ -130,7 +130,7 @@ char_event_t input_event_queue_t::readb() {
 
 // Update the wait_on_escape_ms value in response to the fish_escape_delay_ms user variable being
 // set.
-void update_wait_on_escape_ms(const environment_t &vars) {
+void update_wait_on_escape_ms(const environment_t& vars) {
     auto escape_time_ms = vars.get(L"fish_escape_delay_ms");
     if (escape_time_ms.missing_or_empty()) {
         wait_on_escape_ms = WAIT_ON_ESCAPE_DEFAULT;
diff --git a/src/input_common.h b/src/input_common.h
index 2c5786717..583886579 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -155,7 +155,7 @@ void input_common_init(interrupt_func_t func);
 
 /// Adjust the escape timeout.
 class environment_t;
-void update_wait_on_escape_ms(const environment_t &vars);
+void update_wait_on_escape_ms(const environment_t& vars);
 
 /// A class which knows how to produce a stream of input events.
 class input_event_queue_t {
diff --git a/src/reader.cpp b/src/reader.cpp
index e891a6220..61136d032 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1774,7 +1774,8 @@ static void reader_interactive_init(parser_t &parser) {
     if (shell_pgid == 0 || session_interactivity() == session_interactivity_t::explicit_) {
         shell_pgid = getpid();
         if (setpgid(shell_pgid, shell_pgid) < 0) {
-            // If we're session leader setpgid returns EPERM. The other cases where we'd get EPERM don't apply as we passed our own pid.
+            // If we're session leader setpgid returns EPERM. The other cases where we'd get EPERM
+            // don't apply as we passed our own pid.
             //
             // This should be harmless, so we ignore it.
             if (errno != EPERM) {
diff --git a/src/screen.cpp b/src/screen.cpp
index 9a604edb1..0a4cac0b4 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1178,8 +1178,8 @@ void s_reset(screen_t *s, screen_reset_mode_t mode) {
             abandon_line_string.append(get_omitted_newline_str());
 
             if (cur_term && exit_attribute_mode) {
-                abandon_line_string.append(
-                                           str2wcstring(tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
+                abandon_line_string.append(str2wcstring(
+                    tparm((char *)exit_attribute_mode)));  // normal text ANSI escape sequence
             }
 
             int newline_glitch_width = term_has_xn ? 0 : 1;

From 4bb18eaf4225ce98b9100bc17da0bef9f2229b62 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 16:13:41 -0800
Subject: [PATCH 1557/1732] Use completion_list_t naming everywhere

std::vector<completion_t> -> completion_list_t
---
 src/builtin.cpp          |  2 +-
 src/builtin.h            |  3 ++-
 src/builtin_complete.cpp |  2 +-
 src/complete.cpp         | 29 +++++++++++-------------
 src/complete.h           | 13 ++++++-----
 src/expand.cpp           | 48 +++++++++++++++++++---------------------
 src/expand.h             |  3 ++-
 src/fish_tests.cpp       | 10 ++++-----
 src/pager.cpp            |  2 +-
 src/pager.h              |  2 --
 src/parse_execution.cpp  |  6 ++---
 src/parser.cpp           |  9 ++++----
 src/parser.h             |  7 +++---
 src/reader.cpp           | 14 ++++++------
 src/reader.h             |  2 +-
 src/wildcard.cpp         | 15 ++++++-------
 src/wildcard.h           |  6 ++---
 17 files changed, 82 insertions(+), 91 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index c41dc09d9..cf4bb57ec 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -479,7 +479,7 @@ wcstring_list_t builtin_get_names() {
 }
 
 /// Insert all builtin names into list.
-void builtin_get_names(std::vector<completion_t> *list) {
+void builtin_get_names(completion_list_t *list) {
     assert(list != nullptr);
     list->reserve(list->size() + BUILTIN_COUNT);
     for (const auto &builtin_data : builtin_datas) {
diff --git a/src/builtin.h b/src/builtin.h
index 2d37cbff1..9b89cdee6 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -13,6 +13,7 @@ class parser_t;
 class proc_status_t;
 class output_stream_t;
 struct io_streams_t;
+using completion_list_t = std::vector<completion_t>;
 
 /// Data structure to describe a builtin.
 struct builtin_data_t {
@@ -83,7 +84,7 @@ bool builtin_exists(const wcstring &cmd);
 proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_streams_t &streams);
 
 wcstring_list_t builtin_get_names();
-void builtin_get_names(std::vector<completion_t> *list);
+void builtin_get_names(completion_list_t *list);
 const wchar_t *builtin_get_desc(const wcstring &name);
 
 wcstring builtin_help_get(parser_t &parser, const wchar_t *cmd);
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index 3e2372826..bdabbd98c 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -347,7 +347,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             if (!have_do_complete_param)
                 parser.libdata().builtin_complete_current_commandline = true;
 
-            std::vector<completion_t> comp;
+            completion_list_t comp;
             complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
                      parser.shared());
 
diff --git a/src/complete.cpp b/src/complete.cpp
index c67284ee4..83f25f07a 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -257,7 +257,7 @@ __attribute__((always_inline)) static inline bool compare_completions_by_tilde(
 }
 
 /// Unique the list of completions, without perturbing their order.
-static void unique_completions_retaining_order(std::vector<completion_t> *comps) {
+static void unique_completions_retaining_order(completion_list_t *comps) {
     std::unordered_set<wcstring> seen;
     seen.reserve(comps->size());
     auto pred = [&seen](const completion_t &c) {
@@ -268,8 +268,7 @@ static void unique_completions_retaining_order(std::vector<completion_t> *comps)
     comps->erase(std::remove_if(comps->begin(), comps->end(), pred), comps->end());
 }
 
-void completions_sort_and_prioritize(std::vector<completion_t> *comps,
-                                     completion_request_flags_t flags) {
+void completions_sort_and_prioritize(completion_list_t *comps, completion_request_flags_t flags) {
     // Find the best match type.
     fuzzy_match_type_t best_type = fuzzy_match_none;
     for (const auto &comp : *comps) {
@@ -326,7 +325,7 @@ class completer_t {
     const completion_request_flags_t flags;
 
     /// The output completions.
-    std::vector<completion_t> completions;
+    completion_list_t completions;
 
     /// Table of completions conditions that have already been tested and the corresponding test
     /// results.
@@ -374,7 +373,7 @@ class completer_t {
     bool condition_test(const wcstring &condition);
 
     void complete_strings(const wcstring &wc_escaped, const description_func_t &desc_func,
-                          const std::vector<completion_t> &possible_comp, complete_flags_t flags);
+                          const completion_list_t &possible_comp, complete_flags_t flags);
 
     expand_flags_t expand_flags() const {
         // Never do command substitution in autosuggestions. Sadly, we also can't yet do job
@@ -402,14 +401,14 @@ class completer_t {
 
     void perform();
 
-    std::vector<completion_t> acquire_completions() { return std::move(completions); }
+    completion_list_t acquire_completions() { return std::move(completions); }
 };
 
 // Autoloader for completions.
 static owning_lock<autoload_t> completion_autoloader{autoload_t(L"fish_complete_path")};
 
 /// Create a new completion entry.
-void append_completion(std::vector<completion_t> *completions, wcstring comp, wcstring desc,
+void append_completion(completion_list_t *completions, wcstring comp, wcstring desc,
                        complete_flags_t flags, string_fuzzy_match_t &&match) {
     completions->emplace_back(std::move(comp), std::move(desc), match, flags);
 }
@@ -555,8 +554,7 @@ static void parse_cmd_string(const wcstring &str, wcstring *path, wcstring *cmd,
 /// @param  flags
 ///    The flags
 void completer_t::complete_strings(const wcstring &wc_escaped, const description_func_t &desc_func,
-                                   const std::vector<completion_t> &possible_comp,
-                                   complete_flags_t flags) {
+                                   const completion_list_t &possible_comp, complete_flags_t flags) {
     wcstring tmp = wc_escaped;
     if (!expand_one(tmp,
                     this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::skip_wildcards,
@@ -678,7 +676,7 @@ static wcstring complete_function_desc(const wcstring &fn) {
 ///
 /// \param str_cmd the command string to find completions for
 void completer_t::complete_cmd(const wcstring &str_cmd) {
-    std::vector<completion_t> possible_comp;
+    completion_list_t possible_comp;
 
     // Append all possible executables
     expand_result_t result =
@@ -720,7 +718,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
 
 void completer_t::complete_abbr(const wcstring &cmd) {
     std::map<wcstring, wcstring> abbrs = get_abbreviations(vars);
-    std::vector<completion_t> possible_comp;
+    completion_list_t possible_comp;
     possible_comp.reserve(abbrs.size());
     for (const auto &kv : abbrs) {
         possible_comp.emplace_back(kv.first);
@@ -765,8 +763,7 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
         eflags |= expand_flag::skip_cmdsubst;
     }
 
-    std::vector<completion_t> possible_comp =
-        parser_t::expand_argument_list(args, eflags, vars, parser);
+    completion_list_t possible_comp = parser_t::expand_argument_list(args, eflags, vars, parser);
 
     if (parser) {
         parser->libdata().is_interactive = saved_interactive;
@@ -1139,7 +1136,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // so any quoting or braces gets lost.
         // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
-        std::vector<completion_t> local_completions;
+        completion_list_t local_completions;
         if (expand_string(sep_string, &local_completions, flags, vars, parser, nullptr) ==
             expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
@@ -1598,7 +1595,7 @@ void completer_t::perform() {
                     parser->libdata().transient_commandlines.push_back(unaliased_cmd);
                     cleanup_t remove_transient(
                         [&] { parser->libdata().transient_commandlines.pop_back(); });
-                    std::vector<completion_t> comp;
+                    completion_list_t comp;
                     complete(unaliased_cmd, &comp, completion_request_t::fuzzy_match,
                              parser->vars(), parser->shared());
                     this->completions.insert(completions.end(), comp.begin(), comp.end());
@@ -1638,7 +1635,7 @@ void completer_t::perform() {
     mark_completions_duplicating_arguments(current_token, tokens);
 }
 
-void complete(const wcstring &cmd_with_subcmds, std::vector<completion_t> *out_comps,
+void complete(const wcstring &cmd_with_subcmds, completion_list_t *out_comps,
               completion_request_flags_t flags, const environment_t &vars,
               const std::shared_ptr<parser_t> &parser) {
     // Determine the innermost subcommand.
diff --git a/src/complete.h b/src/complete.h
index 8ba5373b3..03c0147df 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -101,6 +101,8 @@ class completion_t {
     void prepend_token_prefix(const wcstring &prefix);
 };
 
+using completion_list_t = std::vector<completion_t>;
+
 enum class completion_request_t {
     autosuggestion,  // indicates the completion is for an autosuggestion
     descriptions,    // indicates that we want descriptions
@@ -124,7 +126,7 @@ enum complete_option_type_t {
 
 /// Sorts and remove any duplicate completions in the completion list, then puts them in priority
 /// order.
-void completions_sort_and_prioritize(std::vector<completion_t> *comps,
+void completions_sort_and_prioritize(completion_list_t *comps,
                                      completion_request_flags_t flags = {});
 
 /// Add a completion.
@@ -171,9 +173,8 @@ void complete_remove_all(const wcstring &cmd, bool cmd_is_path);
 
 /// Find all completions of the command cmd, insert them into out.
 class parser_t;
-void complete(const wcstring &cmd, std::vector<completion_t> *out_comps,
-              completion_request_flags_t flags, const environment_t &vars,
-              const std::shared_ptr<parser_t> &parser);
+void complete(const wcstring &cmd, completion_list_t *out_comps, completion_request_flags_t flags,
+              const environment_t &vars, const std::shared_ptr<parser_t> &parser);
 
 /// Return a list of all current completions.
 wcstring complete_print();
@@ -191,8 +192,8 @@ bool complete_is_valid_argument(const wcstring &str, const wcstring &opt, const
 /// \param comp The completion string
 /// \param desc The description of the completion
 /// \param flags completion flags
-void append_completion(std::vector<completion_t> *completions, wcstring comp,
-                       wcstring desc = wcstring(), int flags = 0,
+void append_completion(completion_list_t *completions, wcstring comp, wcstring desc = wcstring(),
+                       int flags = 0,
                        string_fuzzy_match_t &&match = string_fuzzy_match_t(fuzzy_match_exact));
 
 /// Support for "wrap targets." A wrap target is a command that completes like another command.
diff --git a/src/expand.cpp b/src/expand.cpp
index 1f677e5a7..ee342e29f 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -268,7 +268,7 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
 /// Note: last_idx is considered to be where it previously finished procesisng. This means it
 /// actually starts operating on last_idx-1. As such, to process a string fully, pass string.size()
 /// as last_idx instead of string.size()-1.
-static bool expand_variables(wcstring instr, std::vector<completion_t> *out, size_t last_idx,
+static bool expand_variables(wcstring instr, completion_list_t *out, size_t last_idx,
                              const environment_t &vars, parse_error_list_t *errors) {
     const size_t insize = instr.size();
 
@@ -466,7 +466,7 @@ static bool expand_variables(wcstring instr, std::vector<completion_t> *out, siz
 
 /// Perform brace expansion.
 static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags,
-                                     std::vector<completion_t> *out, parse_error_list_t *errors) {
+                                     completion_list_t *out, parse_error_list_t *errors) {
     bool syntax_error = false;
     int brace_count = 0;
 
@@ -575,7 +575,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
 }
 
 /// Perform cmdsubst expansion.
-static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<completion_t> *out_list,
+static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t *out_list,
                             parse_error_list_t *errors) {
     wchar_t *paren_begin = nullptr, *paren_end = nullptr;
     wchar_t *tail_begin = nullptr;
@@ -649,7 +649,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, std::vector<comple
 
     // Recursively call ourselves to expand any remaining command substitutions. The result of this
     // recursive call using the tail of the string is inserted into the tail_expand array list
-    std::vector<completion_t> tail_expand;
+    completion_list_t tail_expand;
     expand_cmdsubst(tail_begin, parser, &tail_expand, errors);  // TODO: offset error locations
 
     // Combine the result of the current command substitution with the result of the recursive tail
@@ -761,7 +761,7 @@ void expand_tilde(wcstring &input, const environment_t &vars) {
 }
 
 static void unexpand_tildes(const wcstring &input, const environment_t &vars,
-                            std::vector<completion_t> *completions) {
+                            completion_list_t *completions) {
     // If input begins with tilde, then try to replace the corresponding string in each completion
     // with the tilde. If it does not, there's nothing to do.
     if (input.empty() || input.at(0) != L'~') return;
@@ -865,26 +865,26 @@ class expander_t {
     /// An expansion stage is a member function pointer.
     /// It accepts the input string (transferring ownership) and returns the list of output
     /// completions by reference. It may return an error, which halts expansion.
-    using stage_t = expand_result_t (expander_t::*)(wcstring, std::vector<completion_t> *);
+    using stage_t = expand_result_t (expander_t::*)(wcstring, completion_list_t *);
 
-    expand_result_t stage_cmdsubst(wcstring input, std::vector<completion_t> *out);
-    expand_result_t stage_variables(wcstring input, std::vector<completion_t> *out);
-    expand_result_t stage_braces(wcstring input, std::vector<completion_t> *out);
-    expand_result_t stage_home_and_self(wcstring input, std::vector<completion_t> *out);
-    expand_result_t stage_wildcards(wcstring path_to_expand, std::vector<completion_t> *out);
+    expand_result_t stage_cmdsubst(wcstring input, completion_list_t *out);
+    expand_result_t stage_variables(wcstring input, completion_list_t *out);
+    expand_result_t stage_braces(wcstring input, completion_list_t *out);
+    expand_result_t stage_home_and_self(wcstring input, completion_list_t *out);
+    expand_result_t stage_wildcards(wcstring path_to_expand, completion_list_t *out);
 
     expander_t(const environment_t &vars, std::shared_ptr<parser_t> parser, expand_flags_t flags,
                parse_error_list_t *errors)
         : vars(vars), parser(std::move(parser)), flags(flags), errors(errors) {}
 
    public:
-    static expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+    static expand_result_t expand_string(wcstring input, completion_list_t *out_completions,
                                          expand_flags_t flags, const environment_t &vars,
                                          const std::shared_ptr<parser_t> &parser,
                                          parse_error_list_t *errors);
 };
 
-expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_cmdsubst(wcstring input, completion_list_t *out) {
     if (flags & expand_flag::skip_cmdsubst) {
         size_t cur = 0, start = 0, end;
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
@@ -907,7 +907,7 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, std::vector<completio
     return expand_result_t::ok;
 }
 
-expand_result_t expander_t::stage_variables(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *out) {
     // We accept incomplete strings here, since complete uses expand_string to expand incomplete
     // strings from the commandline.
     wcstring next;
@@ -929,12 +929,12 @@ expand_result_t expander_t::stage_variables(wcstring input, std::vector<completi
     return expand_result_t::ok;
 }
 
-expand_result_t expander_t::stage_braces(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_braces(wcstring input, completion_list_t *out) {
     UNUSED(vars);
     return expand_braces(input, flags, out, errors);
 }
 
-expand_result_t expander_t::stage_home_and_self(wcstring input, std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_home_and_self(wcstring input, completion_list_t *out) {
     if (!(flags & expand_flag::skip_home_directories)) {
         expand_home_directory(input, vars);
     }
@@ -943,8 +943,7 @@ expand_result_t expander_t::stage_home_and_self(wcstring input, std::vector<comp
     return expand_result_t::ok;
 }
 
-expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
-                                            std::vector<completion_t> *out) {
+expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_list_t *out) {
     expand_result_t result = expand_result_t::ok;
 
     remove_internal_separator(&path_to_expand, flags & expand_flag::skip_wildcards);
@@ -1008,7 +1007,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
         }
 
         result = expand_result_t::wildcard_no_match;
-        std::vector<completion_t> expanded;
+        completion_list_t expanded;
         for (const auto &effective_working_dir : effective_working_dirs) {
             wildcard_expand_result_t expand_res =
                 wildcard_expand_string(path_to_expand, effective_working_dir, flags, &expanded);
@@ -1038,8 +1037,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand,
     return result;
 }
 
-expand_result_t expander_t::expand_string(wcstring input,
-                                          std::vector<completion_t> *out_completions,
+expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out_completions,
                                           expand_flags_t flags, const environment_t &vars,
                                           const std::shared_ptr<parser_t> &parser,
                                           parse_error_list_t *errors) {
@@ -1059,7 +1057,7 @@ expand_result_t expander_t::expand_string(wcstring input,
                               &expander_t::stage_wildcards};
 
     // Load up our single initial completion.
-    std::vector<completion_t> completions, output_storage;
+    completion_list_t completions, output_storage;
     append_completion(&completions, input);
 
     expand_result_t total_result = expand_result_t::ok;
@@ -1099,7 +1097,7 @@ expand_result_t expander_t::expand_string(wcstring input,
 }
 }  // namespace
 
-expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_completions,
+expand_result_t expand_string(wcstring input, completion_list_t *out_completions,
                               expand_flags_t flags, const environment_t &vars,
                               const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
     return expander_t::expand_string(std::move(input), out_completions, flags, vars, parser,
@@ -1108,7 +1106,7 @@ expand_result_t expand_string(wcstring input, std::vector<completion_t> *out_com
 
 bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
                 const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
-    std::vector<completion_t> completions;
+    completion_list_t completions;
 
     if (!flags.get(expand_flag::for_completions) && expand_is_clean(string)) {
         return true;
@@ -1132,7 +1130,7 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
         return expand_result_t::ok;
     }
 
-    std::vector<completion_t> completions;
+    completion_list_t completions;
     expand_result_t expand_err = expand_string(
         instr, &completions,
         {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, vars,
diff --git a/src/expand.h b/src/expand.h
index 8a0380dea..6f7e56e27 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -69,6 +69,7 @@ struct enum_info_t<expand_flag> {
 using expand_flags_t = enum_set_t<expand_flag>;
 
 class completion_t;
+using completion_list_t = std::vector<completion_t>;
 
 enum : wchar_t {
     /// Character representing a home directory.
@@ -132,7 +133,7 @@ enum class expand_result_t {
 /// wildcard_no_match and wildcard_match are normal exit conditions used only on
 /// strings containing wildcards to tell if the wildcard produced any matches.
 class parser_t;
-__warn_unused expand_result_t expand_string(wcstring input, std::vector<completion_t> *output,
+__warn_unused expand_result_t expand_string(wcstring input, completion_list_t *output,
                                             expand_flags_t flags, const environment_t &vars,
                                             const std::shared_ptr<parser_t> &parser,
                                             parse_error_list_t *errors);
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index b791fb5bd..a73aa6e52 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1639,7 +1639,7 @@ struct pwd_environment_t : public environment_t {
 /// After the zero terminator comes one more arg, a string, which is the error
 /// message to print if the test fails.
 static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
-    std::vector<completion_t> output;
+    completion_list_t output;
     va_list va;
     bool res = true;
     wchar_t *arg;
@@ -1665,7 +1665,7 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
     va_end(va);
 
     std::set<wcstring> remaining(expected.begin(), expected.end());
-    std::vector<completion_t>::const_iterator out_it = output.begin(), out_end = output.end();
+    completion_list_t::const_iterator out_it = output.begin(), out_end = output.end();
     for (; out_it != out_end; ++out_it) {
         if (!remaining.erase(out_it->completion)) {
             res = false;
@@ -1690,7 +1690,7 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
             }
             msg += L"], found [";
             first = true;
-            for (std::vector<completion_t>::const_iterator it = output.begin(), end = output.end();
+            for (completion_list_t::const_iterator it = output.begin(), end = output.end();
                  it != end; ++it) {
                 if (!first) msg += L", ";
                 first = false;
@@ -2898,7 +2898,7 @@ static void test_completion_insertions() {
 
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,
                                                const environment_t &vars, long line) {
-    std::vector<completion_t> comps;
+    completion_list_t comps;
     complete(command, &comps, completion_request_t::autosuggestion, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
@@ -2934,7 +2934,7 @@ 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) {
-    std::vector<completion_t> comps;
+    completion_list_t comps;
     complete(command, &comps, {}, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
diff --git a/src/pager.cpp b/src/pager.cpp
index a26711a41..327bb3cac 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -21,7 +21,7 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 using comp_t = pager_t::comp_t;
-using completion_list_t = std::vector<completion_t>;
+using completion_list_t = completion_list_t;
 using comp_info_list_t = std::vector<comp_t>;
 
 /// The minimum width (in characters) the terminal must to show completions at all.
diff --git a/src/pager.h b/src/pager.h
index 943f2ff47..2b60efef7 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -60,8 +60,6 @@ enum class selection_motion_t {
 // How many rows we will show in the "initial" pager.
 #define PAGER_UNDISCLOSED_MAX_ROWS 4
 
-typedef std::vector<completion_t> completion_list_t;
-
 class pager_t {
     size_t available_term_width;
     size_t available_term_height;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index f5849651a..56bcfcf0d 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -456,7 +456,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     const wcstring switch_value = get_source(switch_value_n);
 
     // Expand it. We need to offset any errors by the position of the string.
-    std::vector<completion_t> switch_values_expanded;
+    completion_list_t switch_values_expanded;
     parse_error_list_t errors;
     auto expand_ret =
         expand_string(switch_value, &switch_values_expanded, expand_flag::no_descriptions,
@@ -868,7 +868,7 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
     // Get all argument nodes underneath the statement. We guess we'll have that many arguments (but
     // may have more or fewer, if there are wildcards involved).
     out_arguments->reserve(out_arguments->size() + argument_nodes.size());
-    std::vector<completion_t> arg_expanded;
+    completion_list_t arg_expanded;
     for (const auto &arg_node : argument_nodes) {
         // Expect all arguments to have source.
         assert(arg_node.has_source());
@@ -1023,7 +1023,7 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         assert(equals_pos);
         const wcstring &variable_name = source.substr(0, *equals_pos);
         const wcstring expression = source.substr(*equals_pos + 1);
-        std::vector<completion_t> expression_expanded;
+        completion_list_t expression_expanded;
         parse_error_list_t errors;
         // TODO this is mostly copied from expand_arguments_from_nodes, maybe extract to function
         auto expand_ret =
diff --git a/src/parser.cpp b/src/parser.cpp
index c989e888c..1ebb6a2ea 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -305,10 +305,9 @@ void parser_t::emit_profiling(const char *path) const {
     }
 }
 
-std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_list_src,
-                                                         expand_flags_t eflags,
-                                                         const environment_t &vars,
-                                                         const std::shared_ptr<parser_t> &parser) {
+completion_list_t parser_t::expand_argument_list(const wcstring &arg_list_src,
+                                                 expand_flags_t eflags, const environment_t &vars,
+                                                 const std::shared_ptr<parser_t> &parser) {
     // Parse the string as an argument list.
     parse_node_tree_t tree;
     if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, nullptr /* errors */,
@@ -318,7 +317,7 @@ std::vector<completion_t> parser_t::expand_argument_list(const wcstring &arg_lis
     }
 
     // Get the root argument list and extract arguments from it.
-    std::vector<completion_t> result;
+    completion_list_t result;
     assert(!tree.empty());
     tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
     while (auto arg = arg_list.next_in_list<grammar::argument>()) {
diff --git a/src/parser.h b/src/parser.h
index 43d42ec42..c5863927e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -279,10 +279,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
     /// for command substitution expansion.
-    static std::vector<completion_t> expand_argument_list(const wcstring &arg_list_src,
-                                                          expand_flags_t flags,
-                                                          const environment_t &vars,
-                                                          const std::shared_ptr<parser_t> &parser);
+    static completion_list_t expand_argument_list(const wcstring &arg_list_src,
+                                                  expand_flags_t flags, const environment_t &vars,
+                                                  const std::shared_ptr<parser_t> &parser);
 
     /// Returns a string describing the current parser position in the format 'FILENAME (line
     /// LINE_NUMBER): LINE'. Example:
diff --git a/src/reader.cpp b/src/reader.cpp
index 61136d032..b67d34d51 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -478,8 +478,8 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     bool jump(jump_direction_t dir, jump_precision_t precision, editable_line_t *el,
               wchar_t target);
 
-    bool handle_completions(const std::vector<completion_t> &comp, size_t token_begin,
-                            size_t token_end, bool cont_after_prefix_insertion);
+    bool handle_completions(const completion_list_t &comp, size_t token_begin, size_t token_end,
+                            bool cont_after_prefix_insertion);
 
     void sanity_check() const;
     void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, size_t pos);
@@ -1325,7 +1325,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
 
         // Try normal completions.
         completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
-        std::vector<completion_t> completions;
+        completion_list_t completions;
         complete(search_string, &completions, complete_flags, *vars, nullptr);
         completions_sort_and_prioritize(&completions, complete_flags);
         if (!completions.empty()) {
@@ -1466,7 +1466,7 @@ static bool reader_can_replace(const wcstring &in, int flags) {
 }
 
 /// Determine the best match type for a set of completions.
-static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &comp) {
+static fuzzy_match_type_t get_best_match_type(const completion_list_t &comp) {
     fuzzy_match_type_t best_type = fuzzy_match_none;
     for (const auto &i : comp) {
         best_type = std::min(best_type, i.match.type);
@@ -1497,7 +1497,7 @@ static fuzzy_match_type_t get_best_match_type(const std::vector<completion_t> &c
 /// completions after inserting it.
 ///
 /// Return true if we inserted text into the command line, false if we did not.
-bool reader_data_t::handle_completions(const std::vector<completion_t> &comp, size_t token_begin,
+bool reader_data_t::handle_completions(const completion_list_t &comp, size_t token_begin,
                                        size_t token_end, bool cont_after_prefix_insertion) {
     bool done = false;
     bool success = false;
@@ -1543,7 +1543,7 @@ bool reader_data_t::handle_completions(const std::vector<completion_t> &comp, si
 
     // Decide which completions survived. There may be a lot of them; it would be nice if we could
     // figure out how to avoid copying them here.
-    std::vector<completion_t> surviving_completions;
+    completion_list_t surviving_completions;
     for (const completion_t &el : comp) {
         // Ignore completions with a less suitable match type than the best.
         if (el.match.type > best_match_type) continue;
@@ -2381,7 +2381,7 @@ struct readline_loop_state_t {
     bool comp_empty{true};
 
     /// List of completions.
-    std::vector<completion_t> comp;
+    completion_list_t comp;
 
     /// Whether we are skipping redundant repaints.
     bool coalescing_repaints = false;
diff --git a/src/reader.h b/src/reader.h
index ee90940c1..39eec1ba2 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -147,7 +147,7 @@ void reader_push(parser_t &parser, const wcstring &name);
 void reader_pop();
 
 /// Specify function to use for finding possible tab completions.
-typedef void (*complete_function_t)(const wcstring &, std::vector<completion_t> *,
+typedef void (*complete_function_t)(const wcstring &, completion_list_t *,
                                     completion_request_flags_t, const environment_t &,
                                     const std::shared_ptr<parser_t> &parser);
 void reader_set_complete_function(complete_function_t);
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index d3c7ad12b..52c33ad0c 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -184,7 +184,7 @@ struct wc_complete_pack_t {
 };
 
 // Weirdly specific and non-reusable helper function that makes its one call site much clearer.
-static bool has_prefix_match(const std::vector<completion_t> *comps, size_t first) {
+static bool has_prefix_match(const completion_list_t *comps, size_t first) {
     if (comps != nullptr) {
         const size_t after_count = comps->size();
         for (size_t j = first; j < after_count; j++) {
@@ -203,7 +203,7 @@ static bool has_prefix_match(const std::vector<completion_t> *comps, size_t firs
 /// wildcards. This is historic behavior.
 static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
                                        const wc_complete_pack_t &params, complete_flags_t flags,
-                                       std::vector<completion_t> *out, bool is_first_call = false) {
+                                       completion_list_t *out, bool is_first_call = false) {
     assert(str != nullptr);
     assert(wc != nullptr);
 
@@ -315,7 +315,7 @@ static bool wildcard_complete_internal(const wchar_t *str, const wchar_t *wc,
 
 bool wildcard_complete(const wcstring &str, const wchar_t *wc,
                        const std::function<wcstring(const wcstring &)> &desc_func,
-                       std::vector<completion_t> *out, expand_flags_t expand_flags,
+                       completion_list_t *out, expand_flags_t expand_flags,
                        complete_flags_t flags) {
     // Note out may be NULL.
     assert(wc != nullptr);
@@ -390,7 +390,7 @@ static const wchar_t *file_get_desc(const wcstring &filename, int lstat_res,
 /// up. Note that the filename came from a readdir() call, so we know it exists.
 static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wcstring &filename,
                                               const wchar_t *wc, expand_flags_t expand_flags,
-                                              std::vector<completion_t> *out) {
+                                              completion_list_t *out) {
     // Check if it will match before stat().
     if (!wildcard_complete(filename, wc, {}, nullptr, expand_flags, 0)) {
         return false;
@@ -465,7 +465,7 @@ class wildcard_expander_t {
     // Flags controlling expansion.
     const expand_flags_t flags;
     // Resolved items get inserted into here. This is transient of course.
-    std::vector<completion_t> *resolved_completions;
+    completion_list_t *resolved_completions;
     // Whether we have been interrupted.
     bool did_interrupt{false};
     // Whether we have successfully added any completions.
@@ -629,7 +629,7 @@ class wildcard_expander_t {
     }
 
    public:
-    wildcard_expander_t(wcstring wd, expand_flags_t f, std::vector<completion_t> *r)
+    wildcard_expander_t(wcstring wd, expand_flags_t f, completion_list_t *r)
         : working_directory(std::move(wd)), flags(f), resolved_completions(r) {
         assert(resolved_completions != nullptr);
 
@@ -897,8 +897,7 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
 
 wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
                                                 const wcstring &working_directory,
-                                                expand_flags_t flags,
-                                                std::vector<completion_t> *output) {
+                                                expand_flags_t flags, completion_list_t *output) {
     assert(output != nullptr);
     // Fuzzy matching only if we're doing completions.
     assert(flags.get(expand_flag::for_completions) || !flags.get(expand_flag::fuzzy_match));
diff --git a/src/wildcard.h b/src/wildcard.h
index 506e8a4a7..1b03e6e2f 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -48,8 +48,7 @@ enum class wildcard_expand_result_t {
 };
 wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
                                                 const wcstring &working_directory,
-                                                expand_flags_t flags,
-                                                std::vector<completion_t> *out);
+                                                expand_flags_t flags, completion_list_t *out);
 
 /// Test whether the given wildcard matches the string. Does not perform any I/O.
 ///
@@ -68,7 +67,6 @@ bool wildcard_has(const wchar_t *, bool internal);
 
 /// Test wildcard completion.
 bool wildcard_complete(const wcstring &str, const wchar_t *wc, const description_func_t &desc_func,
-                       std::vector<completion_t> *out, expand_flags_t expand_flags,
-                       complete_flags_t flags);
+                       completion_list_t *out, expand_flags_t expand_flags, complete_flags_t flags);
 
 #endif

From db98ee13a9e95689e6d2141559b5017c97295862 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 16:41:30 -0800
Subject: [PATCH 1558/1732] Make complete() return the completion list directly

Returning it through a pointer was a remnant of pre C++-11 days.
---
 src/builtin_complete.cpp |   5 +-
 src/complete.cpp         |  13 ++---
 src/complete.h           |   6 +-
 src/fish_tests.cpp       | 116 +++++++++++++++------------------------
 src/reader.cpp           |   5 +-
 src/reader.h             |   7 ++-
 6 files changed, 61 insertions(+), 91 deletions(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index bdabbd98c..d12fd0da0 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -347,9 +347,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             if (!have_do_complete_param)
                 parser.libdata().builtin_complete_current_commandline = true;
 
-            completion_list_t comp;
-            complete(do_complete_param, &comp, completion_request_t::fuzzy_match, parser.vars(),
-                     parser.shared());
+            completion_list_t comp = complete(do_complete_param, completion_request_t::fuzzy_match,
+                                              parser.vars(), parser.shared());
 
             for (const auto &next : comp) {
                 // Make a fake commandline, and then apply the completion to it.
diff --git a/src/complete.cpp b/src/complete.cpp
index 83f25f07a..1858a8973 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1595,9 +1595,9 @@ void completer_t::perform() {
                     parser->libdata().transient_commandlines.push_back(unaliased_cmd);
                     cleanup_t remove_transient(
                         [&] { parser->libdata().transient_commandlines.pop_back(); });
-                    completion_list_t comp;
-                    complete(unaliased_cmd, &comp, completion_request_t::fuzzy_match,
-                             parser->vars(), parser->shared());
+                    completion_list_t comp =
+                        complete(unaliased_cmd, completion_request_t::fuzzy_match, parser->vars(),
+                                 parser->shared());
                     this->completions.insert(completions.end(), comp.begin(), comp.end());
                     do_file = false;
                 } else if (!complete_param(
@@ -1635,9 +1635,8 @@ void completer_t::perform() {
     mark_completions_duplicating_arguments(current_token, tokens);
 }
 
-void complete(const wcstring &cmd_with_subcmds, completion_list_t *out_comps,
-              completion_request_flags_t flags, const environment_t &vars,
-              const std::shared_ptr<parser_t> &parser) {
+completion_list_t complete(const wcstring &cmd_with_subcmds, completion_request_flags_t flags,
+                           const environment_t &vars, const std::shared_ptr<parser_t> &parser) {
     // Determine the innermost subcommand.
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(cmd_with_subcmds.c_str(), cmd_with_subcmds.size(), &cmdsubst_begin,
@@ -1646,7 +1645,7 @@ void complete(const wcstring &cmd_with_subcmds, completion_list_t *out_comps,
     wcstring cmd = wcstring(cmdsubst_begin, cmdsubst_end - cmdsubst_begin);
     completer_t completer(vars, parser, std::move(cmd), flags);
     completer.perform();
-    *out_comps = completer.acquire_completions();
+    return completer.acquire_completions();
 }
 
 /// Print the short switch \c opt, and the argument \c arg to the specified
diff --git a/src/complete.h b/src/complete.h
index 03c0147df..7a1e69bfe 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -171,10 +171,10 @@ void complete_remove(const wcstring &cmd, bool cmd_is_path, const wcstring &opti
 /// Removes all completions for a given command.
 void complete_remove_all(const wcstring &cmd, bool cmd_is_path);
 
-/// Find all completions of the command cmd, insert them into out.
+/// \return all completions of the command cmd.
 class parser_t;
-void complete(const wcstring &cmd, completion_list_t *out_comps, completion_request_flags_t flags,
-              const environment_t &vars, const std::shared_ptr<parser_t> &parser);
+completion_list_t complete(const wcstring &cmd, completion_request_flags_t flags,
+                           const environment_t &vars, const std::shared_ptr<parser_t> &parser);
 
 /// Return a list of all current completions.
 wcstring complete_print();
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index a73aa6e52..c9e265d0f 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2612,8 +2612,13 @@ static void test_complete() {
 
     auto parser = parser_t::principal_parser().shared();
 
+    auto do_complete = [&](const wcstring &cmd, completion_request_flags_t flags) {
+        return complete(cmd, flags, vars, parser);
+    };
+
     completion_list_t completions;
-    complete(L"$", &completions, {}, vars, parser);
+
+    completions = do_complete(L"$", {});
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 6);
     do_test(completions.at(0).completion == L"Bar1");
@@ -2623,21 +2628,18 @@ static void test_complete() {
     do_test(completions.at(4).completion == L"Foo2");
     do_test(completions.at(5).completion == L"Foo3");
 
-    completions.clear();
-    complete(L"$F", &completions, {}, vars, parser);
+    completions = do_complete(L"$F", {});
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 3);
     do_test(completions.at(0).completion == L"oo1");
     do_test(completions.at(1).completion == L"oo2");
     do_test(completions.at(2).completion == L"oo3");
 
-    completions.clear();
-    complete(L"$1", &completions, {}, vars, parser);
+    completions = do_complete(L"$1", {});
     completions_sort_and_prioritize(&completions);
     do_test(completions.empty());
 
-    completions.clear();
-    complete(L"$1", &completions, completion_request_t::fuzzy_match, vars, parser);
+    completions = do_complete(L"$1", completion_request_t::fuzzy_match);
     completions_sort_and_prioritize(&completions);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"$Bar1");
@@ -2650,36 +2652,30 @@ static void test_complete() {
     if (system("touch 'test/complete_test/testfile'")) err(L"touch failed");
     if (system("chmod 700 'test/complete_test/testfile'")) err(L"chmod failed");
 
-    completions.clear();
-    complete(L"echo (test/complete_test/testfil", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (test/complete_test/testfil", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
-    completions.clear();
-    complete(L"echo (ls test/complete_test/testfil", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (ls test/complete_test/testfil", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
-    completions.clear();
-    complete(L"echo (command ls test/complete_test/testfil", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (command ls test/complete_test/testfil", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"e");
 
     // Completing after spaces - see #2447
-    completions.clear();
-    complete(L"echo (ls test/complete_test/has\\ ", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (ls test/complete_test/has\\ ", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"space");
 
     // Brackets - see #5831
-    completions.clear();
-    complete(L"echo (ls test/complete_test/bracket[", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (ls test/complete_test/bracket[", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"test/complete_test/bracket[abc]");
 
     wcstring cmdline = L"touch test/complete_test/bracket[";
-    completions.clear();
-    complete(cmdline, &completions, {}, vars, parser);
+    completions = do_complete(cmdline, {});
     do_test(completions.size() == 1);
     do_test(completions.front().completion == L"test/complete_test/bracket[abc]");
     size_t where = cmdline.size();
@@ -2687,9 +2683,8 @@ static void test_complete() {
         completions.front().completion, completions.front().flags, cmdline, &where, false);
     do_test(newcmdline == L"touch test/complete_test/bracket\\[abc\\] ");
 
-    completions.clear();
     cmdline = LR"(touch test/complete_test/gnarlybracket\\[)";
-    complete(cmdline, &completions, {}, vars, parser);
+    completions = do_complete(cmdline, {});
     do_test(completions.size() == 1);
     do_test(completions.front().completion == LR"(test/complete_test/gnarlybracket\[abc])");
     where = cmdline.size();
@@ -2703,24 +2698,20 @@ static void test_complete() {
     function_add(L"scuttlebutt", {}, nullptr, {});
 
     // Complete a function name.
-    completions.clear();
-    complete(L"echo (scuttlebut", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (scuttlebut", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"t");
 
     // But not with the command prefix.
-    completions.clear();
-    complete(L"echo (command scuttlebut", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (command scuttlebut", {});
     do_test(completions.size() == 0);
 
     // Not with the builtin prefix.
-    completions.clear();
-    complete(L"echo (builtin scuttlebut", &completions, {}, vars, parser);
+    completions = do_complete(L"echo (builtin scuttlebut", {});
     do_test(completions.size() == 0);
 
     // Not after a redirection.
-    completions.clear();
-    complete(L"echo hi > scuttlebut", &completions, {}, vars, parser);
+    completions = do_complete(L"echo hi > scuttlebut", {});
     do_test(completions.size() == 0);
 
     // Trailing spaces (#1261).
@@ -2728,83 +2719,65 @@ static void test_complete() {
     no_files.no_files = true;
     complete_add(L"foobarbaz", false, wcstring(), option_type_args_only, no_files, NULL, L"qux",
                  NULL, COMPLETE_AUTO_SPACE);
-    completions.clear();
-    complete(L"foobarbaz ", &completions, {}, vars, parser);
+    completions = do_complete(L"foobarbaz ", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"qux");
 
     // Don't complete variable names in single quotes (#1023).
-    completions.clear();
-    complete(L"echo '$Foo", &completions, {}, vars, parser);
+    completions = do_complete(L"echo '$Foo", {});
     do_test(completions.empty());
-    completions.clear();
-    complete(L"echo \\$Foo", &completions, {}, vars, parser);
+    completions = do_complete(L"echo \\$Foo", {});
     do_test(completions.empty());
 
     // File completions.
-    completions.clear();
-    complete(L"cat test/complete_test/te", &completions, {}, vars, parser);
+    completions = do_complete(L"cat test/complete_test/te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
-    completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, {}, vars, parser);
+    completions = do_complete(L"echo sup > test/complete_test/te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
-    completions.clear();
-    complete(L"echo sup > test/complete_test/te", &completions, {}, vars, parser);
+    completions = do_complete(L"echo sup > test/complete_test/te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
 
     if (!pushd("test/complete_test")) return;
-    complete(L"cat te", &completions, {}, vars, parser);
+    completions = do_complete(L"cat te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(!(completions.at(0).flags & COMPLETE_REPLACES_TOKEN));
     do_test(!(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT));
-    completions.clear();
-    complete(L"cat testfile te", &completions, {}, vars, parser);
+    completions = do_complete(L"cat testfile te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
-    completions.clear();
-    complete(L"cat testfile TE", &completions, {}, vars, parser);
+    completions = do_complete(L"cat testfile TE", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"testfile");
     do_test(completions.at(0).flags & COMPLETE_REPLACES_TOKEN);
     do_test(completions.at(0).flags & COMPLETE_DUPLICATES_ARGUMENT);
-    completions.clear();
-    complete(L"something --abc=te", &completions, {}, vars, parser);
+    completions = do_complete(L"something --abc=te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
-    completions.clear();
-    complete(L"something -abc=te", &completions, {}, vars, parser);
+    completions = do_complete(L"something -abc=te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
-    completions.clear();
-    complete(L"something abc=te", &completions, {}, vars, parser);
+    completions = do_complete(L"something abc=te", {});
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"stfile");
-    completions.clear();
-    complete(L"something abc=stfile", &completions, {}, vars, parser);
+    completions = do_complete(L"something abc=stfile", {});
     do_test(completions.size() == 0);
-    completions.clear();
-    complete(L"something abc=stfile", &completions, completion_request_t::fuzzy_match, vars,
-             parser);
+    completions = do_complete(L"something abc=stfile", completion_request_t::fuzzy_match);
     do_test(completions.size() == 1);
     do_test(completions.at(0).completion == L"abc=testfile");
 
     // Zero escapes can cause problems. See issue #1631.
-    completions.clear();
-    complete(L"cat foo\\0", &completions, {}, vars, parser);
+    completions = do_complete(L"cat foo\\0", {});
     do_test(completions.empty());
-    completions.clear();
-    complete(L"cat foo\\0bar", &completions, {}, vars, parser);
+    completions = do_complete(L"cat foo\\0bar", {});
     do_test(completions.empty());
-    completions.clear();
-    complete(L"cat \\0", &completions, {}, vars, parser);
+    completions = do_complete(L"cat \\0", {});
     do_test(completions.empty());
-    completions.clear();
-    complete(L"cat te\\0", &completions, {}, vars, parser);
+    completions = do_complete(L"cat te\\0", {});
     do_test(completions.empty());
 
     popd();
@@ -2814,7 +2787,7 @@ static void test_complete() {
     auto &pvars = parser_t::principal_parser().vars();
     function_add(L"testabbrsonetwothreefour", {}, nullptr, {});
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
-    complete(L"testabbrsonetwothree", &completions, {}, pvars, parser);
+    completions = complete(L"testabbrsonetwothree", {}, pvars, parser);
     do_test(ret == 0);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"four");
@@ -2898,8 +2871,8 @@ static void test_completion_insertions() {
 
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,
                                                const environment_t &vars, long line) {
-    completion_list_t comps;
-    complete(command, &comps, completion_request_t::autosuggestion, vars, nullptr);
+    completion_list_t comps =
+        complete(command, completion_request_t::autosuggestion, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
 
@@ -2934,8 +2907,7 @@ 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, &comps, {}, vars, nullptr);
+    completion_list_t comps = complete(command, {}, vars, nullptr);
 
     bool expects_error = (expected == L"<error>");
 
@@ -3074,8 +3046,8 @@ static void test_autosuggest_suggest_special() {
 }
 
 static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {
-    completion_list_t comps;
-    complete(command, &comps, completion_request_t::autosuggestion, null_environment_t{}, nullptr);
+    completion_list_t comps =
+        complete(command, completion_request_t::autosuggestion, null_environment_t{}, nullptr);
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
diff --git a/src/reader.cpp b/src/reader.cpp
index b67d34d51..d4ae22743 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1325,8 +1325,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
 
         // Try normal completions.
         completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
-        completion_list_t completions;
-        complete(search_string, &completions, complete_flags, *vars, nullptr);
+        completion_list_t completions = complete(search_string, complete_flags, *vars, nullptr);
         completions_sort_and_prioritize(&completions, complete_flags);
         if (!completions.empty()) {
             const completion_t &comp = completions.at(0);
@@ -2567,7 +2566,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
                 completion_request_flags_t complete_flags = {completion_request_t::descriptions,
                                                              completion_request_t::fuzzy_match};
-                complete_func(buffcpy, &rls.comp, complete_flags, vars, parser_ref);
+                rls.comp = complete_func(buffcpy, complete_flags, vars, parser_ref);
 
                 // User-supplied completions may have changed the commandline - prevent buffer
                 // overflow.
diff --git a/src/reader.h b/src/reader.h
index 39eec1ba2..3d8d722a5 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -147,9 +147,10 @@ void reader_push(parser_t &parser, const wcstring &name);
 void reader_pop();
 
 /// Specify function to use for finding possible tab completions.
-typedef void (*complete_function_t)(const wcstring &, completion_list_t *,
-                                    completion_request_flags_t, const environment_t &,
-                                    const std::shared_ptr<parser_t> &parser);
+typedef completion_list_t (*complete_function_t)(const wcstring &, completion_request_flags_t,
+                                                 const environment_t &,
+                                                 const std::shared_ptr<parser_t> &parser);
+
 void reader_set_complete_function(complete_function_t);
 
 /// The type of a highlight function.

From 0f7bba5f0e96f0535f6dc932b121eb482f2462a2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 15 Jan 2020 17:14:47 -0800
Subject: [PATCH 1559/1732] Introduce operation_context_t

This commit recognizes an existing pattern: many operations need some
combination of a set of variables, a way to detect cancellation, and
sometimes a parser. For example, tab completion needs a parser to execute
custom completions, the variable set, should cancel on SIGINT. Background
autosuggestions don't need a parser, but they do need the variables and
should cancel if the user types something new. Etc.

This introduces a new triple operation_context_t that wraps these concepts
up. This simplifies many method signatures and argument passing.
---
 CMakeLists.txt            |   1 +
 src/builtin_complete.cpp  |   6 +--
 src/builtin_functions.cpp |   8 +--
 src/builtin_read.cpp      |   2 +-
 src/common.h              |   4 ++
 src/complete.cpp          | 100 ++++++++++++++++++--------------------
 src/complete.h            |   7 ++-
 src/expand.cpp            |  60 ++++++++++-------------
 src/expand.h              |  22 ++++-----
 src/fish_indent.cpp       |   7 +--
 src/fish_tests.cpp        |  31 ++++++------
 src/highlight.cpp         |  71 ++++++++++++---------------
 src/highlight.h           |  15 +++---
 src/operation_context.cpp |  23 +++++++++
 src/operation_context.h   |  56 +++++++++++++++++++++
 src/parse_execution.cpp   |  27 +++++-----
 src/parse_execution.h     |   5 +-
 src/parse_util.cpp        |   6 +--
 src/parser.cpp            |  20 +++++---
 src/parser.h              |  16 +++++-
 src/reader.cpp            |  54 ++++++++++----------
 src/reader.h              |  12 ++---
 src/wildcard.cpp          |  18 +++++--
 src/wildcard.h            |   4 +-
 24 files changed, 337 insertions(+), 238 deletions(-)
 create mode 100644 src/operation_context.cpp
 create mode 100644 src/operation_context.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee3834c70..7fdfe9eaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@ SET(FISH_SRCS
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
     src/flog.cpp src/trace.cpp src/timer.cpp src/null_terminated_array.cpp
+    src/operation_context.cpp
 )
 
 # Header files are just globbed.
diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index d12fd0da0..831c3fa51 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -347,8 +347,8 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             if (!have_do_complete_param)
                 parser.libdata().builtin_complete_current_commandline = true;
 
-            completion_list_t comp = complete(do_complete_param, completion_request_t::fuzzy_match,
-                                              parser.vars(), parser.shared());
+            completion_list_t comp =
+                complete(do_complete_param, completion_request_t::fuzzy_match, parser.context());
 
             for (const auto &next : comp) {
                 // Make a fake commandline, and then apply the completion to it.
@@ -392,7 +392,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
             std::vector<highlight_spec_t> colors;
             size_t len = repr.size();
-            highlight_shell_no_io(repr, colors, len, nullptr, env_stack_t::globals());
+            highlight_shell_no_io(repr, colors, len, operation_context_t::globals());
             streams.out.append(str2wcstring(colorize(repr, colors)));
         } else {
             streams.out.append(repr);
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index c1d936351..951a1d5b0 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -23,6 +23,7 @@
 #include "function.h"
 #include "highlight.h"
 #include "io.h"
+#include "parser.h"
 #include "parser_keywords.h"
 #include "proc.h"
 #include "signal.h"
@@ -263,8 +264,9 @@ static int report_function_metadata(const wchar_t *funcname, bool verbose, io_st
             append_format(comment, L"# Defined in %ls @ line %d\n", path, line_number);
             if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
                 std::vector<highlight_spec_t> colors;
-                highlight_shell_no_io(comment, colors, comment.size(), nullptr,
-                                      env_stack_t::globals());
+                highlight_shell_no_io(
+                    comment, colors, comment.size(),
+                    operation_context_t{nullptr, env_stack_t::globals(), no_cancel});
                 streams.out.append(str2wcstring(colorize(comment, colors)));
             } else {
                 streams.out.append(comment);
@@ -437,7 +439,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
 
                 if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
                     std::vector<highlight_spec_t> colors;
-                    highlight_shell_no_io(def, colors, def.size(), nullptr, env_stack_t::globals());
+                    highlight_shell_no_io(def, colors, def.size(), operation_context_t::globals());
                     streams.out.append(str2wcstring(colorize(def, colors)));
                 } else {
                     streams.out.append(def);
diff --git a/src/builtin_read.cpp b/src/builtin_read.cpp
index c3880cac7..67ac9afe8 100644
--- a/src/builtin_read.cpp
+++ b/src/builtin_read.cpp
@@ -208,7 +208,7 @@ static int read_interactive(parser_t &parser, wcstring &buff, int nchars, bool s
     reader_set_left_prompt(prompt);
     reader_set_right_prompt(right_prompt);
     if (shell) {
-        reader_set_complete_function(&complete);
+        reader_set_complete_ok(true);
         reader_set_highlight_function(&highlight_shell);
         reader_set_test_function(&reader_shell_test);
     }
diff --git a/src/common.h b/src/common.h
index 988d5b55b..d453e4b1d 100644
--- a/src/common.h
+++ b/src/common.h
@@ -266,6 +266,10 @@ std::shared_ptr<T> move_to_sharedptr(T &&v) {
     return std::make_shared<T>(std::move(v));
 }
 
+/// A function type to check for cancellation.
+/// \return true if execution should cancel.
+using cancel_checker_t = std::function<bool()>;
+
 /// Print a stack trace to stderr.
 void show_stackframe(const wchar_t msg_level, int frame_count = 100, int skip_levels = 0);
 
diff --git a/src/complete.cpp b/src/complete.cpp
index 1858a8973..d4058368f 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -311,12 +311,8 @@ void completions_sort_and_prioritize(completion_list_t *comps, completion_reques
 
 /// Class representing an attempt to compute completions.
 class completer_t {
-    /// Environment inside which we are completing.
-    const environment_t &vars;
-
-    /// The parser used for condition testing and subshell expansion.
-    /// If null, these features are disabled.
-    std::shared_ptr<parser_t> parser;
+    /// The operation context for this completion.
+    const operation_context_t &ctx;
 
     /// The command to complete.
     const wcstring cmd;
@@ -395,9 +391,8 @@ class completer_t {
                                                 const std::vector<tok_t> &args);
 
    public:
-    completer_t(const environment_t &vars, std::shared_ptr<parser_t> parser, wcstring c,
-                completion_request_flags_t f)
-        : vars(vars), parser(std::move(parser)), cmd(std::move(c)), flags(f) {}
+    completer_t(const operation_context_t &ctx, wcstring c, completion_request_flags_t f)
+        : ctx(ctx), cmd(std::move(c)), flags(f) {}
 
     void perform();
 
@@ -421,7 +416,7 @@ bool completer_t::condition_test(const wcstring &condition) {
         // std::fwprintf( stderr, L"No condition specified\n" );
         return true;
     }
-    if (!parser) {
+    if (!ctx.parser) {
         return false;
     }
 
@@ -430,7 +425,8 @@ bool completer_t::condition_test(const wcstring &condition) {
     condition_cache_t::iterator cached_entry = condition_cache.find(condition);
     if (cached_entry == condition_cache.end()) {
         // Compute new value and reinsert it.
-        test_res = (0 == exec_subshell(condition, *parser, false /* don't apply exit status */));
+        test_res =
+            (0 == exec_subshell(condition, *ctx.parser, false /* don't apply exit status */));
         condition_cache[condition] = test_res;
     } else {
         // Use the old value.
@@ -558,7 +554,7 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
     wcstring tmp = wc_escaped;
     if (!expand_one(tmp,
                     this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::skip_wildcards,
-                    vars, parser))
+                    ctx))
         return;
 
     const wcstring wc = parse_util_unescape_wildcards(tmp);
@@ -576,7 +572,7 @@ void completer_t::complete_strings(const wcstring &wc_escaped, const description
 /// for the executable.
 void completer_t::complete_cmd_desc(const wcstring &str) {
     ASSERT_IS_MAIN_THREAD();
-    if (!parser) return;
+    if (!ctx.parser) return;
 
     wcstring cmd;
     size_t pos = str.find_last_of(L'/');
@@ -619,7 +615,7 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     // systems with a large set of manuals, but it should be ok since apropos is only called once.
     lookup.clear();
     list.clear();
-    if (exec_subshell(lookup_cmd, *parser, list, false /* don't apply exit status */) != -1) {
+    if (exec_subshell(lookup_cmd, *ctx.parser, list, false /* don't apply exit status */) != -1) {
         // Then discard anything that is not a possible completion and put the result into a
         // hashtable with the completion as key and the description as value.
         //
@@ -683,7 +679,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
         expand_string(str_cmd, &this->completions,
                       this->expand_flags() | expand_flag::special_for_command |
                           expand_flag::for_completions | expand_flag::executables_only,
-                      vars, parser, nullptr);
+                      ctx);
     if (result != expand_result_t::error && this->wants_descriptions()) {
         this->complete_cmd_desc(str_cmd);
     }
@@ -695,7 +691,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
         expand_string(
             str_cmd, &this->completions,
             this->expand_flags() | expand_flag::for_completions | expand_flag::directories_only,
-            vars, parser, nullptr);
+            ctx);
     UNUSED(ignore);
 
     if (str_cmd.empty() || (str_cmd.find(L'/') == wcstring::npos && str_cmd.at(0) != L'~')) {
@@ -717,7 +713,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
 }
 
 void completer_t::complete_abbr(const wcstring &cmd) {
-    std::map<wcstring, wcstring> abbrs = get_abbreviations(vars);
+    std::map<wcstring, wcstring> abbrs = get_abbreviations(ctx.vars);
     completion_list_t possible_comp;
     possible_comp.reserve(abbrs.size());
     for (const auto &kv : abbrs) {
@@ -752,9 +748,9 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
     bool is_autosuggest = (this->type() == COMPLETE_AUTOSUGGEST);
 
     bool saved_interactive = false;
-    if (parser) {
-        saved_interactive = parser->libdata().is_interactive;
-        parser->libdata().is_interactive = false;
+    if (ctx.parser) {
+        saved_interactive = ctx.parser->libdata().is_interactive;
+        ctx.parser->libdata().is_interactive = false;
     }
 
     expand_flags_t eflags{};
@@ -763,10 +759,10 @@ void completer_t::complete_from_args(const wcstring &str, const wcstring &args,
         eflags |= expand_flag::skip_cmdsubst;
     }
 
-    completion_list_t possible_comp = parser_t::expand_argument_list(args, eflags, vars, parser);
+    completion_list_t possible_comp = parser_t::expand_argument_list(args, eflags, ctx);
 
-    if (parser) {
-        parser->libdata().is_interactive = saved_interactive;
+    if (ctx.parser) {
+        ctx.parser->libdata().is_interactive = saved_interactive;
     }
 
     this->complete_strings(escape_string(str, ESCAPE_ALL), const_desc(desc), possible_comp, flags);
@@ -883,7 +879,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
     bool use_common = true, use_files = true, has_force = false;
 
     wcstring cmd, path;
-    parse_cmd_string(cmd_orig, &path, &cmd, vars);
+    parse_cmd_string(cmd_orig, &path, &cmd, ctx.vars);
 
     // mqudsi: run_on_main_thread() already just runs `func` if we're on the main thread,
     // but it makes a kcall to get the current thread id to ascertain that. Perhaps even
@@ -909,7 +905,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         // may be faster, path_get_path can potentially do a lot of FS/IO access, so env.get() +
         // function_exists() should still be faster.
         // Use cmd_orig here as it is potentially pathed.
-        head_exists = head_exists || path_get_path(cmd_orig, nullptr, vars);
+        head_exists = head_exists || path_get_path(cmd_orig, nullptr, ctx.vars);
     }
 
     if (!head_exists) {
@@ -1103,7 +1099,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
 /// Perform generic (not command-specific) expansions on the specified string.
 void completer_t::complete_param_expand(const wcstring &str, bool do_file,
                                         bool handle_as_special_cd) {
-    if (reader_test_should_cancel()) return;
+    if (ctx.check_cancel()) return;
     expand_flags_t flags =
         this->expand_flags() | expand_flag::skip_cmdsubst | expand_flag::for_completions;
 
@@ -1137,8 +1133,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // See #4954.
         const wcstring sep_string = wcstring(str, sep_index + 1);
         completion_list_t local_completions;
-        if (expand_string(sep_string, &local_completions, flags, vars, parser, nullptr) ==
-            expand_result_t::error) {
+        if (expand_string(sep_string, &local_completions, flags, ctx) == expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
         }
 
@@ -1157,8 +1152,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         // consider relaxing this if there was a preceding double-dash argument.
         if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::fuzzy_match);
 
-        if (expand_string(str, &this->completions, flags, vars, parser, nullptr) ==
-            expand_result_t::error) {
+        if (expand_string(str, &this->completions, flags, ctx) == expand_result_t::error) {
             debug(3, L"Error while expanding string '%ls'", str.c_str());
         }
     }
@@ -1171,7 +1165,7 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
     size_t varlen = str.length() - start_offset;
     bool res = false;
 
-    for (const wcstring &env_name : vars.get_names(0)) {
+    for (const wcstring &env_name : ctx.vars.get_names(0)) {
         string_fuzzy_match_t match =
             string_fuzzy_match_string(var, env_name, this->max_fuzzy_match_type());
         if (match.type == fuzzy_match_none) {
@@ -1197,14 +1191,14 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
                 // #6288.
                 if (env_name == L"history") {
                     history_t *history =
-                        &history_t::history_with_name(history_session_id(parser->vars()));
+                        &history_t::history_with_name(history_session_id(ctx.vars));
                     for (size_t i = 1; i < history->size() && desc.size() < 64; i++) {
                         if (i > 1) desc += L' ';
                         desc += expand_escape_string(history->item_at_index(i).str());
                     }
                 } else {
-                    // Can't use this->vars here, it could be any variable.
-                    auto var = vars.get(env_name);
+                    // Can't use ctx.vars here, it could be any variable.
+                    auto var = ctx.vars.get(env_name);
                     if (!var) continue;
 
                     wcstring value = expand_escape_variable(*var);
@@ -1311,7 +1305,7 @@ bool completer_t::try_complete_user(const wcstring &str) {
     setpwent();
     // cppcheck-suppress getpwentCalled
     while (struct passwd *pw = getpwent()) {
-        if (reader_test_should_cancel()) {
+        if (ctx.check_cancel()) {
             break;
         }
         const wcstring pw_name_str = str2wcstring(pw->pw_name);
@@ -1349,6 +1343,7 @@ using wrap_chain_visited_set_t = std::set<std::pair<wcstring, wcstring>>;
 // Recursive implementation of walk_wrap_chain().
 static void walk_wrap_chain_recursive(const wcstring &command_line, source_range_t command_range,
                                       const wrap_chain_visitor_t &visitor,
+                                      const cancel_checker_t &cancel_checker,
                                       wrap_chain_visited_set_t *visited, size_t depth) {
     // Limit our recursion depth. This prevents cycles in the wrap chain graph from overflowing.
     if (depth > 24) return;
@@ -1377,8 +1372,8 @@ static void walk_wrap_chain_recursive(const wcstring &command_line, source_range
                     // Recurse with our new command and command line.
                     source_range_t faux_source_range{uint32_t(where),
                                                      uint32_t(wrapped_command.size())};
-                    walk_wrap_chain_recursive(faux_commandline, faux_source_range, visitor, visited,
-                                              depth + 1);
+                    walk_wrap_chain_recursive(faux_commandline, faux_source_range, visitor,
+                                              cancel_checker, visited, depth + 1);
                 }
             }
         }
@@ -1391,9 +1386,10 @@ static void walk_wrap_chain_recursive(const wcstring &command_line, source_range
 // target wrapped by the given command, update the command line with that target and invoke this
 // recursively.
 static void walk_wrap_chain(const wcstring &command_line, source_range_t command_range,
-                            const wrap_chain_visitor_t &visitor) {
+                            const wrap_chain_visitor_t &visitor,
+                            const cancel_checker_t &cancel_checker) {
     wrap_chain_visited_set_t visited;
-    walk_wrap_chain_recursive(command_line, command_range, visitor, &visited, 0);
+    walk_wrap_chain_recursive(command_line, command_range, visitor, cancel_checker, &visited, 0);
 }
 
 /// If the argument contains a '[' typed by the user, completion by appending to the argument might
@@ -1574,31 +1570,29 @@ void completer_t::perform() {
                 // we're doing autosuggestions.
                 bool wants_transient = depth > 0 && !(flags & completion_request_t::autosuggestion);
                 if (wants_transient) {
-                    parser->libdata().transient_commandlines.push_back(cmdline);
+                    ctx.parser->libdata().transient_commandlines.push_back(cmdline);
                 }
                 bool is_variable_assignment = bool(variable_assignment_equals_pos(cmd));
-                if (is_variable_assignment && parser) {
+                if (is_variable_assignment && ctx.parser) {
                     // To avoid issues like #2705 we complete commands starting with variable
                     // assignments by recursively calling complete for the command suffix
                     // without the first variable assignment token.
                     wcstring unaliased_cmd;
-                    if (parser->libdata().transient_commandlines.empty()) {
+                    if (ctx.parser->libdata().transient_commandlines.empty()) {
                         unaliased_cmd = cmdline;
                     } else {
-                        unaliased_cmd = parser->libdata().transient_commandlines.back();
+                        unaliased_cmd = ctx.parser->libdata().transient_commandlines.back();
                     }
                     tokenizer_t tok(unaliased_cmd.c_str(), TOK_ACCEPT_UNFINISHED);
                     maybe_t<tok_t> cmd_tok = tok.next();
                     assert(cmd_tok);
                     unaliased_cmd =
                         unaliased_cmd.replace(0, cmd_tok->offset + cmd_tok->length, L"");
-                    parser->libdata().transient_commandlines.push_back(unaliased_cmd);
+                    ctx.parser->libdata().transient_commandlines.push_back(unaliased_cmd);
                     cleanup_t remove_transient(
-                        [&] { parser->libdata().transient_commandlines.pop_back(); });
-                    completion_list_t comp =
-                        complete(unaliased_cmd, completion_request_t::fuzzy_match, parser->vars(),
-                                 parser->shared());
-                    this->completions.insert(completions.end(), comp.begin(), comp.end());
+                        [&] { ctx.parser->libdata().transient_commandlines.pop_back(); });
+                    vec_append(this->completions,
+                               complete(unaliased_cmd, completion_request_t::fuzzy_match, ctx));
                     do_file = false;
                 } else if (!complete_param(
                                cmd, previous_argument_unescape, current_argument_unescape,
@@ -1606,14 +1600,14 @@ void completer_t::perform() {
                     do_file = false;
                 }
                 if (wants_transient) {
-                    parser->libdata().transient_commandlines.pop_back();
+                    ctx.parser->libdata().transient_commandlines.pop_back();
                 }
             };
             assert(cmd_tok.offset < std::numeric_limits<uint32_t>::max());
             assert(cmd_tok.length < std::numeric_limits<uint32_t>::max());
             source_range_t range = {static_cast<uint32_t>(cmd_tok.offset),
                                     static_cast<uint32_t>(cmd_tok.length)};
-            walk_wrap_chain(cmd, range, receiver);
+            walk_wrap_chain(cmd, range, receiver, ctx.cancel_checker);
         }
 
         // Hack. If we're cd, handle it specially (issue #1059, others).
@@ -1636,14 +1630,14 @@ void completer_t::perform() {
 }
 
 completion_list_t complete(const wcstring &cmd_with_subcmds, completion_request_flags_t flags,
-                           const environment_t &vars, const std::shared_ptr<parser_t> &parser) {
+                           const operation_context_t &ctx) {
     // Determine the innermost subcommand.
     const wchar_t *cmdsubst_begin, *cmdsubst_end;
     parse_util_cmdsubst_extent(cmd_with_subcmds.c_str(), cmd_with_subcmds.size(), &cmdsubst_begin,
                                &cmdsubst_end);
     assert(cmdsubst_begin != nullptr && cmdsubst_end != nullptr && cmdsubst_end >= cmdsubst_begin);
     wcstring cmd = wcstring(cmdsubst_begin, cmdsubst_end - cmdsubst_begin);
-    completer_t completer(vars, parser, std::move(cmd), flags);
+    completer_t completer(ctx, std::move(cmd), flags);
     completer.perform();
     return completer.acquire_completions();
 }
diff --git a/src/complete.h b/src/complete.h
index 7a1e69bfe..d7849eeba 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -117,6 +117,9 @@ struct enum_info_t<completion_request_t> {
 
 using completion_request_flags_t = enum_set_t<completion_request_t>;
 
+class completion_t;
+using completion_list_t = std::vector<completion_t>;
+
 enum complete_option_type_t {
     option_type_args_only,    // no option
     option_type_short,        // -x
@@ -172,9 +175,9 @@ void complete_remove(const wcstring &cmd, bool cmd_is_path, const wcstring &opti
 void complete_remove_all(const wcstring &cmd, bool cmd_is_path);
 
 /// \return all completions of the command cmd.
-class parser_t;
+class operation_context_t;
 completion_list_t complete(const wcstring &cmd, completion_request_flags_t flags,
-                           const environment_t &vars, const std::shared_ptr<parser_t> &parser);
+                           const operation_context_t &ctx);
 
 /// Return a list of all current completions.
 wcstring complete_print();
diff --git a/src/expand.cpp b/src/expand.cpp
index ee342e29f..e76227e10 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -850,11 +850,8 @@ static void remove_internal_separator(wcstring *str, bool conv) {
 namespace {
 /// A type that knows how to perform expansions.
 class expander_t {
-    /// Variables to use in expansion.
-    const environment_t &vars;
-
-    /// The parser for expanding command substitutions, or nullptr if not enabled.
-    std::shared_ptr<parser_t> parser;
+    /// Operation context for this expansion.
+    const operation_context_t &ctx;
 
     /// Flags to use during expansion.
     const expand_flags_t flags;
@@ -873,14 +870,12 @@ class expander_t {
     expand_result_t stage_home_and_self(wcstring input, completion_list_t *out);
     expand_result_t stage_wildcards(wcstring path_to_expand, completion_list_t *out);
 
-    expander_t(const environment_t &vars, std::shared_ptr<parser_t> parser, expand_flags_t flags,
-               parse_error_list_t *errors)
-        : vars(vars), parser(std::move(parser)), flags(flags), errors(errors) {}
+    expander_t(const operation_context_t &ctx, expand_flags_t flags, parse_error_list_t *errors)
+        : ctx(ctx), flags(flags), errors(errors) {}
 
    public:
     static expand_result_t expand_string(wcstring input, completion_list_t *out_completions,
-                                         expand_flags_t flags, const environment_t &vars,
-                                         const std::shared_ptr<parser_t> &parser,
+                                         expand_flags_t flags, const operation_context_t &ctx,
                                          parse_error_list_t *errors);
 };
 
@@ -899,8 +894,8 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, completion_list_t *ou
                 return expand_result_t::error;
         }
     } else {
-        assert(parser && "Must have a parser to expand command substitutions");
-        bool cmdsubst_ok = expand_cmdsubst(std::move(input), *parser, out, errors);
+        assert(ctx.parser && "Must have a parser to expand command substitutions");
+        bool cmdsubst_ok = expand_cmdsubst(std::move(input), *ctx.parser, out, errors);
         if (!cmdsubst_ok) return expand_result_t::error;
     }
 
@@ -922,7 +917,7 @@ expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *o
         append_completion(out, std::move(next));
     } else {
         size_t size = next.size();
-        if (!expand_variables(std::move(next), out, size, vars, errors)) {
+        if (!expand_variables(std::move(next), out, size, ctx.vars, errors)) {
             return expand_result_t::error;
         }
     }
@@ -930,13 +925,12 @@ expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *o
 }
 
 expand_result_t expander_t::stage_braces(wcstring input, completion_list_t *out) {
-    UNUSED(vars);
     return expand_braces(input, flags, out, errors);
 }
 
 expand_result_t expander_t::stage_home_and_self(wcstring input, completion_list_t *out) {
     if (!(flags & expand_flag::skip_home_directories)) {
-        expand_home_directory(input, vars);
+        expand_home_directory(input, ctx.vars);
     }
     expand_percent_self(input);
     append_completion(out, std::move(input));
@@ -961,7 +955,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
         //
         // So we're going to treat this input as a file path. Compute the "working directories",
         // which may be CDPATH if the special flag is set.
-        const wcstring working_dir = vars.get_pwd_slash();
+        const wcstring working_dir = ctx.vars.get_pwd_slash();
         wcstring_list_t effective_working_dirs;
         bool for_cd = flags & expand_flag::special_for_cd;
         bool for_command = flags & expand_flag::special_for_command;
@@ -993,7 +987,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
                 // Get the PATH/CDPATH and CWD. Perhaps these should be passed in. An empty CDPATH
                 // implies just the current directory, while an empty PATH is left empty.
                 wcstring_list_t paths;
-                if (auto paths_var = vars.get(for_cd ? L"CDPATH" : L"PATH")) {
+                if (auto paths_var = ctx.vars.get(for_cd ? L"CDPATH" : L"PATH")) {
                     paths = paths_var->as_list();
                 }
                 if (paths.empty()) {
@@ -1009,8 +1003,8 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
         result = expand_result_t::wildcard_no_match;
         completion_list_t expanded;
         for (const auto &effective_working_dir : effective_working_dirs) {
-            wildcard_expand_result_t expand_res =
-                wildcard_expand_string(path_to_expand, effective_working_dir, flags, &expanded);
+            wildcard_expand_result_t expand_res = wildcard_expand_string(
+                path_to_expand, effective_working_dir, flags, ctx.cancel_checker, &expanded);
             switch (expand_res) {
                 case wildcard_expand_result_t::match:
                     // Something matched,so overall we matched.
@@ -1038,10 +1032,9 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
 }
 
 expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out_completions,
-                                          expand_flags_t flags, const environment_t &vars,
-                                          const std::shared_ptr<parser_t> &parser,
+                                          expand_flags_t flags, const operation_context_t &ctx,
                                           parse_error_list_t *errors) {
-    assert(((flags & expand_flag::skip_cmdsubst) || parser) &&
+    assert(((flags & expand_flag::skip_cmdsubst) || ctx.parser) &&
            "Must have a parser if not skipping command substitutions");
     // Early out. If we're not completing, and there's no magic in the input, we're done.
     if (!(flags & expand_flag::for_completions) && expand_is_clean(input)) {
@@ -1049,7 +1042,7 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
         return expand_result_t::ok;
     }
 
-    expander_t expand(vars, parser, flags, errors);
+    expander_t expand(ctx, flags, errors);
 
     // Our expansion stages.
     const stage_t stages[] = {&expander_t::stage_cmdsubst, &expander_t::stage_variables,
@@ -1087,7 +1080,7 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
     if (total_result != expand_result_t::error) {
         // Hack to un-expand tildes (see #647).
         if (!(flags & expand_flag::skip_home_directories)) {
-            unexpand_tildes(input, vars, &completions);
+            unexpand_tildes(input, ctx.vars, &completions);
         }
         out_completions->insert(out_completions->end(),
                                 std::make_move_iterator(completions.begin()),
@@ -1098,21 +1091,20 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
 }  // namespace
 
 expand_result_t expand_string(wcstring input, completion_list_t *out_completions,
-                              expand_flags_t flags, const environment_t &vars,
-                              const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
-    return expander_t::expand_string(std::move(input), out_completions, flags, vars, parser,
-                                     errors);
+                              expand_flags_t flags, const operation_context_t &ctx,
+                              parse_error_list_t *errors) {
+    return expander_t::expand_string(std::move(input), out_completions, flags, ctx, errors);
 }
 
-bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
-                const shared_ptr<parser_t> &parser, parse_error_list_t *errors) {
+bool expand_one(wcstring &string, expand_flags_t flags, const operation_context_t &ctx,
+                parse_error_list_t *errors) {
     completion_list_t completions;
 
     if (!flags.get(expand_flag::for_completions) && expand_is_clean(string)) {
         return true;
     }
 
-    if (expand_string(string, &completions, flags | expand_flag::no_descriptions, vars, parser,
+    if (expand_string(std::move(string), &completions, flags | expand_flag::no_descriptions, ctx,
                       errors) != expand_result_t::error &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
@@ -1121,7 +1113,7 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
     return false;
 }
 
-expand_result_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
+expand_result_t expand_to_command_and_args(const wcstring &instr, const operation_context_t &ctx,
                                            wcstring *out_cmd, wcstring_list_t *out_args,
                                            parse_error_list_t *errors) {
     // Fast path.
@@ -1133,8 +1125,8 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const environm
     completion_list_t completions;
     expand_result_t expand_err = expand_string(
         instr, &completions,
-        {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, vars,
-        nullptr, errors);
+        {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, ctx,
+        errors);
     if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
diff --git a/src/expand.h b/src/expand.h
index 6f7e56e27..221bffec9 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -21,6 +21,7 @@
 class environment_t;
 class env_var_t;
 class environment_t;
+class operation_context_t;
 
 /// Set of flags controlling expansions.
 enum class expand_flag {
@@ -125,18 +126,15 @@ enum class expand_result_t {
 /// \param output The list to which the result will be appended.
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
 /// of skip_cmdsubst skip_variables and skip_wildcards
-/// \param vars variables used during expansion.
-/// \param parser the parser to use for command substitutions, or nullptr to disable.
-/// \param errors Resulting errors, or NULL to ignore
+/// \param ctx The parser, variables, and cancellation checker for this operation.  The parser may
+/// be null. \param errors Resulting errors, or nullptr to ignore
 ///
 /// \return An expand_result_t.
 /// wildcard_no_match and wildcard_match are normal exit conditions used only on
 /// strings containing wildcards to tell if the wildcard produced any matches.
-class parser_t;
 __warn_unused expand_result_t expand_string(wcstring input, completion_list_t *output,
-                                            expand_flags_t flags, const environment_t &vars,
-                                            const std::shared_ptr<parser_t> &parser,
-                                            parse_error_list_t *errors);
+                                            expand_flags_t flags, const operation_context_t &ctx,
+                                            parse_error_list_t *errors = nullptr);
 
 /// expand_one is identical to expand_string, except it will fail if in expands to more than one
 /// string. This is used for expanding command names.
@@ -144,12 +142,12 @@ __warn_unused expand_result_t expand_string(wcstring input, completion_list_t *o
 /// \param inout_str The parameter to expand in-place
 /// \param flags Specifies if any expansion pass should be skipped. Legal values are any combination
 /// of skip_cmdsubst skip_variables and skip_wildcards
-/// \param parser the parser to use for command substitutions, or nullptr to disable.
-/// \param errors Resulting errors, or NULL to ignore
+/// \param ctx The parser, variables, and cancellation checker for this operation. The parser may be
+/// null. \param errors Resulting errors, or nullptr to ignore
 ///
 /// \return Whether expansion succeeded.
-bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &vars,
-                const std::shared_ptr<parser_t> &parser, parse_error_list_t *errors = nullptr);
+bool expand_one(wcstring &string, expand_flags_t flags, const operation_context_t &ctx,
+                parse_error_list_t *errors = nullptr);
 
 /// Expand a command string like $HOME/bin/cmd into a command and list of arguments.
 /// Return the command and arguments by reference.
@@ -157,7 +155,7 @@ bool expand_one(wcstring &string, expand_flags_t flags, const environment_t &var
 /// that API does not distinguish between expansion resulting in an empty command (''), and
 /// expansion resulting in no command (e.g. unset variable).
 // \return an expand error.
-expand_result_t expand_to_command_and_args(const wcstring &instr, const environment_t &vars,
+expand_result_t expand_to_command_and_args(const wcstring &instr, const operation_context_t &ctx,
                                            wcstring *out_cmd, wcstring_list_t *out_args,
                                            parse_error_list_t *errors = nullptr);
 
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 8d23f8142..35a2546b0 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include "env.h"
 #include "fish_version.h"
 #include "highlight.h"
+#include "operation_context.h"
 #include "output.h"
 #include "parse_constants.h"
 #include "print_help.h"
@@ -313,7 +314,7 @@ static const char *highlight_role_to_string(highlight_role_t role) {
 static std::string make_pygments_csv(const wcstring &src) {
     const size_t len = src.size();
     std::vector<highlight_spec_t> colors;
-    highlight_shell_no_io(src, colors, src.size(), nullptr, env_stack_t::globals());
+    highlight_shell_no_io(src, colors, src.size(), operation_context_t::globals());
     assert(colors.size() == len && "Colors and src should have same size");
 
     struct token_range_t {
@@ -633,8 +634,8 @@ int main(int argc, char *argv[]) {
         // Maybe colorize.
         std::vector<highlight_spec_t> colors;
         if (output_type != output_type_plain_text) {
-            highlight_shell_no_io(output_wtext, colors, output_wtext.size(), nullptr,
-                                  env_stack_t::globals());
+            highlight_shell_no_io(output_wtext, colors, output_wtext.size(),
+                                  operation_context_t::globals());
         }
 
         std::string colored_output;
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index c9e265d0f..d3ecdfaf6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -59,6 +59,7 @@
 #include "iothread.h"
 #include "lru.h"
 #include "maybe.h"
+#include "operation_context.h"
 #include "pager.h"
 #include "parse_constants.h"
 #include "parse_tree.h"
@@ -1015,8 +1016,8 @@ static void test_parser() {
     parser->eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t());
 
     say(L"Testing eval_args");
-    completion_list_t comps = parser_t::expand_argument_list(
-        L"alpha 'beta gamma' delta", expand_flags_t{}, parser->vars(), parser);
+    completion_list_t comps = parser_t::expand_argument_list(L"alpha 'beta gamma' delta",
+                                                             expand_flags_t{}, parser->context());
     do_test(comps.size() == 3);
     do_test(comps.at(0).completion == L"alpha");
     do_test(comps.at(1).completion == L"beta gamma");
@@ -1083,6 +1084,7 @@ static void test_cancellation() {
 
     // Ensure that we don't think we should cancel.
     reader_reset_interrupted();
+    parser.clear_cancel();
 }
 
 static void test_indents() {
@@ -1644,14 +1646,14 @@ static bool expand_test(const wchar_t *in, expand_flags_t flags, ...) {
     bool res = true;
     wchar_t *arg;
     parse_error_list_t errors;
-    auto parser = parser_t::principal_parser().shared();
+    pwd_environment_t pwd{};
+    operation_context_t ctx{parser_t::principal_parser().shared(), pwd, no_cancel};
 
-    if (expand_string(in, &output, flags, pwd_environment_t{}, parser, &errors) ==
-        expand_result_t::error) {
+    if (expand_string(in, &output, flags, ctx, &errors) == expand_result_t::error) {
         if (errors.empty()) {
             err(L"Bug: Parse error reported but no error text found.");
         } else {
-            err(L"%ls", errors.at(0).describe(in, parser->is_interactive()).c_str());
+            err(L"%ls", errors.at(0).describe(in, ctx.parser->is_interactive()).c_str());
         }
         return false;
     }
@@ -2311,8 +2313,9 @@ static bool run_test_test(int expected, const wcstring &str) {
     // We need to tokenize the string in the same manner a normal shell would do. This is because we
     // need to test things like quoted strings that have leading and trailing whitespace.
     auto parser = parser_t::principal_parser().shared();
-    completion_list_t comps =
-        parser_t::expand_argument_list(str, expand_flags_t{}, null_environment_t{}, parser);
+    null_environment_t nullenv{};
+    operation_context_t ctx{parser, nullenv, no_cancel};
+    completion_list_t comps = parser_t::expand_argument_list(str, expand_flags_t{}, ctx);
 
     wcstring_list_t argv;
     for (const auto &c : comps) {
@@ -2613,7 +2616,7 @@ static void test_complete() {
     auto parser = parser_t::principal_parser().shared();
 
     auto do_complete = [&](const wcstring &cmd, completion_request_flags_t flags) {
-        return complete(cmd, flags, vars, parser);
+        return complete(cmd, flags, operation_context_t{parser, vars, no_cancel});
     };
 
     completion_list_t completions;
@@ -2787,7 +2790,7 @@ static void test_complete() {
     auto &pvars = parser_t::principal_parser().vars();
     function_add(L"testabbrsonetwothreefour", {}, nullptr, {});
     int ret = pvars.set_one(L"_fish_abbr_testabbrsonetwothreezero", ENV_LOCAL, L"expansion");
-    completions = complete(L"testabbrsonetwothree", {}, pvars, parser);
+    completions = complete(L"testabbrsonetwothree", {}, parser->context());
     do_test(ret == 0);
     do_test(completions.size() == 2);
     do_test(completions.at(0).completion == L"four");
@@ -2872,7 +2875,7 @@ static void test_completion_insertions() {
 static void perform_one_autosuggestion_cd_test(const wcstring &command, const wcstring &expected,
                                                const environment_t &vars, long line) {
     completion_list_t comps =
-        complete(command, completion_request_t::autosuggestion, vars, nullptr);
+        complete(command, completion_request_t::autosuggestion, operation_context_t{vars});
 
     bool expects_error = (expected == L"<error>");
 
@@ -2907,7 +2910,7 @@ 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, {}, vars, nullptr);
+    completion_list_t comps = complete(command, {}, operation_context_t{vars});
 
     bool expects_error = (expected == L"<error>");
 
@@ -3047,7 +3050,7 @@ static void test_autosuggest_suggest_special() {
 
 static void perform_one_autosuggestion_should_ignore_test(const wcstring &command, long line) {
     completion_list_t comps =
-        complete(command, completion_request_t::autosuggestion, null_environment_t{}, nullptr);
+        complete(command, completion_request_t::autosuggestion, operation_context_t::empty());
     do_test(comps.empty());
     if (!comps.empty()) {
         const wcstring &suggestion = comps.front().completion;
@@ -4647,7 +4650,7 @@ static void test_highlighting() {
         do_test(expected_colors.size() == text.size());
 
         std::vector<highlight_spec_t> colors(text.size());
-        highlight_shell(text, colors, 20, NULL, vars);
+        highlight_shell(text, colors, 20, operation_context_t{vars});
 
         if (expected_colors.size() != colors.size()) {
             err(L"Color vector has wrong size! Expected %lu, actual %lu", expected_colors.size(),
diff --git a/src/highlight.cpp b/src/highlight.cpp
index 102648ecf..a15fb732d 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -29,6 +29,7 @@
 #include "output.h"
 #include "parse_constants.h"
 #include "parse_util.h"
+#include "parser.h"
 #include "path.h"
 #include "tnode.h"
 #include "tokenizer.h"
@@ -340,11 +341,12 @@ static bool is_potential_cd_path(const wcstring &path, const wcstring &working_d
 // appropriately for commands. If we succeed, return true.
 static bool plain_statement_get_expanded_command(const wcstring &src,
                                                  tnode_t<g::plain_statement> stmt,
-                                                 const environment_t &vars, wcstring *out_cmd) {
+                                                 const operation_context_t &ctx,
+                                                 wcstring *out_cmd) {
     // Get the command. Try expanding it. If we cannot, it's an error.
     maybe_t<wcstring> cmd = command_for_plain_statement(stmt, src);
     if (!cmd) return false;
-    expand_result_t err = expand_to_command_and_args(*cmd, vars, out_cmd, nullptr);
+    expand_result_t err = expand_to_command_and_args(*cmd, ctx, out_cmd, nullptr);
     return err == expand_result_t::ok || err == expand_result_t::wildcard_match;
 }
 
@@ -396,7 +398,7 @@ static bool has_expand_reserved(const wcstring &str) {
 
 // Parse a command line. Return by reference the first command, and the first argument to that
 // command (as a string), if any. This is used to validate autosuggestions.
-static bool autosuggest_parse_command(const wcstring &buff, const environment_t &vars,
+static bool autosuggest_parse_command(const wcstring &buff, const operation_context_t &ctx,
                                       wcstring *out_expanded_command, wcstring *out_arg) {
     // Parse the buffer.
     parse_node_tree_t parse_tree;
@@ -414,7 +416,7 @@ static bool autosuggest_parse_command(const wcstring &buff, const environment_t
     }
 
     if (first_statement &&
-        plain_statement_get_expanded_command(buff, first_statement, vars, out_expanded_command)) {
+        plain_statement_get_expanded_command(buff, first_statement, ctx, out_expanded_command)) {
         // Find the first argument.
         auto args_and_redirs = first_statement.child<1>();
         if (auto arg = args_and_redirs.next_in_list<grammar::argument>()) {
@@ -427,7 +429,7 @@ static bool autosuggest_parse_command(const wcstring &buff, const environment_t
 
 bool autosuggest_validate_from_history(const history_item_t &item,
                                        const wcstring &working_directory,
-                                       const environment_t &vars) {
+                                       const operation_context_t &ctx) {
     ASSERT_IS_BACKGROUND_THREAD();
 
     bool handled = false, suggestionOK = false;
@@ -435,16 +437,16 @@ bool autosuggest_validate_from_history(const history_item_t &item,
     // Parse the string.
     wcstring parsed_command;
     wcstring cd_dir;
-    if (!autosuggest_parse_command(item.str(), vars, &parsed_command, &cd_dir)) return false;
+    if (!autosuggest_parse_command(item.str(), ctx, &parsed_command, &cd_dir)) return false;
 
     if (parsed_command == L"cd" && !cd_dir.empty()) {
         // We can possibly handle this specially.
-        if (expand_one(cd_dir, expand_flag::skip_cmdsubst, vars, nullptr)) {
+        if (expand_one(cd_dir, expand_flag::skip_cmdsubst, ctx)) {
             handled = true;
             bool is_help =
                 string_prefixes_string(cd_dir, L"--help") || string_prefixes_string(cd_dir, L"-h");
             if (!is_help) {
-                auto path = path_get_cdpath(cd_dir, working_directory, vars);
+                auto path = path_get_cdpath(cd_dir, working_directory, ctx.vars);
                 if (path && !paths_are_same_file(working_directory, *path)) {
                     suggestionOK = true;
                 }
@@ -458,7 +460,7 @@ bool autosuggest_validate_from_history(const history_item_t &item,
 
     // Not handled specially so handle it here.
     bool cmd_ok = false;
-    if (path_get_path(parsed_command, nullptr, vars)) {
+    if (path_get_path(parsed_command, nullptr, ctx.vars)) {
         cmd_ok = true;
     } else if (builtin_exists(parsed_command) || function_exists_no_autoload(parsed_command)) {
         cmd_ok = true;
@@ -768,8 +770,8 @@ class highlighter_t {
     const wcstring &buff;
     // Cursor position.
     const size_t cursor_pos;
-    // Environment variables. Again, a reference member variable!
-    const environment_t &vars;
+    // The operation context. Again, a reference member variable!
+    const operation_context_t &ctx;
     // Whether it's OK to do I/O.
     const bool io_ok;
     // Working directory.
@@ -800,11 +802,11 @@ class highlighter_t {
 
    public:
     // Constructor
-    highlighter_t(const wcstring &str, size_t pos, const environment_t &ev, wcstring wd,
+    highlighter_t(const wcstring &str, size_t pos, const operation_context_t &ctx, wcstring wd,
                   bool can_do_io)
         : buff(str),
           cursor_pos(pos),
-          vars(ev),
+          ctx(ctx),
           io_ok(can_do_io),
           working_directory(std::move(wd)),
           color_array(str.size()) {
@@ -891,7 +893,7 @@ void highlighter_t::color_argument(tnode_t<g::tok_string> node) {
         }
 
         // Highlight it recursively.
-        highlighter_t cmdsub_highlighter(cmdsub_contents, cursor_subpos, this->vars,
+        highlighter_t cmdsub_highlighter(cmdsub_contents, cursor_subpos, this->ctx,
                                          this->working_directory, this->io_ok);
         const color_array_t &subcolors = cmdsub_highlighter.highlight();
 
@@ -927,7 +929,7 @@ bool highlighter_t::is_cd(tnode_t<g::plain_statement> stmt) const {
     bool cmd_is_cd = false;
     if (this->io_ok && stmt.has_source()) {
         wcstring cmd_str;
-        if (plain_statement_get_expanded_command(this->buff, stmt, vars, &cmd_str)) {
+        if (plain_statement_get_expanded_command(this->buff, stmt, ctx, &cmd_str)) {
             cmd_is_cd = (cmd_str == L"cd");
         }
     }
@@ -944,11 +946,11 @@ void highlighter_t::color_arguments(const std::vector<tnode_t<g::argument>> &arg
         if (cmd_is_cd) {
             // Mark this as an error if it's not 'help' and not a valid cd path.
             wcstring param = arg.get_source(this->buff);
-            if (expand_one(param, expand_flag::skip_cmdsubst, vars, nullptr)) {
+            if (expand_one(param, expand_flag::skip_cmdsubst, ctx)) {
                 bool is_help = string_prefixes_string(param, L"--help") ||
                                string_prefixes_string(param, L"-h");
                 if (!is_help && this->io_ok &&
-                    !is_potential_cd_path(param, working_directory, vars, PATH_EXPAND_TILDE)) {
+                    !is_potential_cd_path(param, working_directory, ctx.vars, PATH_EXPAND_TILDE)) {
                     this->color_node(arg, highlight_role_t::error);
                 }
             }
@@ -988,7 +990,7 @@ void highlighter_t::color_redirection(tnode_t<g::redirection> redirection_node)
                 // I/O is disallowed, so we don't have much hope of catching anything but gross
                 // errors. Assume it's valid.
                 target_is_valid = true;
-            } else if (!expand_one(target, expand_flag::skip_cmdsubst, vars, nullptr)) {
+            } else if (!expand_one(target, expand_flag::skip_cmdsubst, ctx)) {
                 // Could not be expanded.
                 target_is_valid = false;
             } else {
@@ -1239,10 +1241,10 @@ highlighter_t::color_array_t highlighter_t::highlight() {
                     // Check to see if the command is valid.
                     // Try expanding it. If we cannot, it's an error.
                     bool expanded =
-                        plain_statement_get_expanded_command(buff, stmt, vars, &expanded_cmd);
+                        plain_statement_get_expanded_command(buff, stmt, ctx, &expanded_cmd);
                     if (expanded && !has_expand_reserved(expanded_cmd)) {
                         is_valid_cmd =
-                            command_is_valid(expanded_cmd, decoration, working_directory, vars);
+                            command_is_valid(expanded_cmd, decoration, working_directory, ctx.vars);
                     }
                 }
                 if (!is_valid_cmd) {
@@ -1298,7 +1300,7 @@ highlighter_t::color_array_t highlighter_t::highlight() {
         if (node.type != symbol_argument || !node.has_source()) continue;
 
         // Underline every valid path.
-        if (node_is_potential_path(buff, node, vars, working_directory)) {
+        if (node_is_potential_path(buff, node, ctx.vars, working_directory)) {
             // It is, underline it.
             for (size_t i = node.source_start; i < node.source_start + node.source_length; i++) {
                 // Don't color highlight_role_t::error because it looks dorky. For example,
@@ -1333,26 +1335,16 @@ std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &
 }
 
 void highlight_shell(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,
-                     wcstring_list_t *error, const environment_t &vars) {
-    UNUSED(error);
-    // Do something sucky and get the current working directory on this background thread. This
-    // should really be passed in.
-    const wcstring working_directory = vars.get_pwd_slash();
-
-    // Highlight it!
-    highlighter_t highlighter(buff, pos, vars, working_directory, true /* can do IO */);
+                     const operation_context_t &ctx) {
+    const wcstring working_directory = ctx.vars.get_pwd_slash();
+    highlighter_t highlighter(buff, pos, ctx, working_directory, true /* can do IO */);
     color = highlighter.highlight();
 }
 
 void highlight_shell_no_io(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,
-                           wcstring_list_t *error, const environment_t &vars) {
-    UNUSED(error);
-    // Do something sucky and get the current working directory on this background thread. This
-    // should really be passed in.
-    const wcstring working_directory = vars.get_pwd_slash();
-
-    // Highlight it!
-    highlighter_t highlighter(buff, pos, vars, working_directory, false /* no IO allowed */);
+                           const operation_context_t &ctx) {
+    const wcstring working_directory = ctx.vars.get_pwd_slash();
+    highlighter_t highlighter(buff, pos, ctx, working_directory, false /* no IO allowed */);
     color = highlighter.highlight();
 }
 
@@ -1442,9 +1434,8 @@ static void highlight_universal_internal(const wcstring &buffstr,
 }
 
 void highlight_universal(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,
-                         wcstring_list_t *error, const environment_t &vars) {
-    UNUSED(error);
-    UNUSED(vars);
+                         const operation_context_t &ctx) {
+    UNUSED(ctx);
     assert(buff.size() == color.size());
     std::fill(color.begin(), color.end(), highlight_spec_t{});
     highlight_universal_internal(buff, color, pos);
diff --git a/src/highlight.h b/src/highlight.h
index 79cc2e846..43c5588da 100644
--- a/src/highlight.h
+++ b/src/highlight.h
@@ -71,6 +71,7 @@ struct highlight_spec_t {
 };
 
 class history_item_t;
+class operation_context_t;
 
 std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &colors);
 
@@ -81,15 +82,14 @@ std::string colorize(const wcstring &text, const std::vector<highlight_spec_t> &
 /// \param color The array in which to store the color codes. The first 8 bits are used for fg
 /// color, the next 8 bits for bg color.
 /// \param pos the cursor position. Used for quote matching, etc.
-/// \param error a list in which a description of each error will be inserted. May be 0, in whcich
-/// case no error descriptions will be generated.
+/// \param ctx The variables and cancellation check for this operation.
 void highlight_shell(const wcstring &buffstr, std::vector<highlight_spec_t> &color, size_t pos,
-                     wcstring_list_t *error, const environment_t &vars);
+                     const operation_context_t &ctx);
 
 /// Perform a non-blocking shell highlighting. The function will not do any I/O that may block. As a
 /// result, invalid commands may not be detected, etc.
 void highlight_shell_no_io(const wcstring &buffstr, std::vector<highlight_spec_t> &color,
-                           size_t pos, wcstring_list_t *error, const environment_t &vars);
+                           size_t pos, const operation_context_t &ctx);
 
 /// Perform syntax highlighting for the text in buff. Matching quotes and parenthesis are
 /// highlighted. The result is stored in the color array as a color_code from the HIGHLIGHT_ enum
@@ -99,10 +99,9 @@ void highlight_shell_no_io(const wcstring &buffstr, std::vector<highlight_spec_t
 /// \param color The array in which to store the color codes. The first 8 bits are used for fg
 /// color, the next 8 bits for bg color.
 /// \param pos the cursor position. Used for quote matching, etc.
-/// \param error a list in which a description of each error will be inserted. May be 0, in whcich
-/// case no error descriptions will be generated.
+/// \param ctx The cancellation and other environment for this operation. This is unused.
 void highlight_universal(const wcstring &buffstr, std::vector<highlight_spec_t> &color, size_t pos,
-                         wcstring_list_t *error, const environment_t &vars);
+                         const operation_context_t &ctx);
 
 /// \return an RGB color for a given highlight spec.
 rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_background);
@@ -112,7 +111,7 @@ rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_backg
 /// reference whether the suggestion is valid or not.
 bool autosuggest_validate_from_history(const history_item_t &item,
                                        const wcstring &working_directory,
-                                       const environment_t &vars);
+                                       const operation_context_t &ctx);
 
 // Tests whether the specified string cpath is the prefix of anything we could cd to. directories is
 // a list of possible parent directories (typically either the working directory, or the cdpath).
diff --git a/src/operation_context.cpp b/src/operation_context.cpp
new file mode 100644
index 000000000..3440fd884
--- /dev/null
+++ b/src/operation_context.cpp
@@ -0,0 +1,23 @@
+// Utilities for io redirection.
+#include "config.h"  // IWYU pragma: keep
+
+#include "operation_context.h"
+
+#include "env.h"
+
+bool no_cancel() { return false; }
+
+operation_context_t::operation_context_t(std::shared_ptr<parser_t> parser,
+                                         const environment_t &vars, cancel_checker_t cancel_checker)
+    : parser(std::move(parser)), vars(vars), cancel_checker(std::move(cancel_checker)) {}
+
+operation_context_t operation_context_t::empty() {
+    static const null_environment_t nullenv{};
+    return operation_context_t{nullenv};
+}
+
+operation_context_t operation_context_t::globals() {
+    return operation_context_t{env_stack_t::globals()};
+}
+
+operation_context_t::~operation_context_t() = default;
diff --git a/src/operation_context.h b/src/operation_context.h
new file mode 100644
index 000000000..a230596a8
--- /dev/null
+++ b/src/operation_context.h
@@ -0,0 +1,56 @@
+#ifndef FISH_OPERATION_CONTEXT_H
+#define FISH_OPERATION_CONTEXT_H
+
+#include <memory>
+
+#include "common.h"
+
+class environment_t;
+class parser_t;
+
+/// A common helper which always returns false.
+bool no_cancel();
+
+/// A operation_context_t is a simple property bag which wraps up data needed for highlighting,
+/// expansion, completion, and more.
+/// It contains the following triple:
+///   1. A parser. This is often null. If not null, it may be used to execute fish script. If null,
+///   then this is a background operation and fish script must not be executed.
+///   2. A variable set. This is never null. This may differ from the variables in the parser.
+///   3. A cancellation checker. This is a function which you may call to detect that the operation
+///   is no longer necessary and should be cancelled.
+class operation_context_t {
+   public:
+    // The parser, if this is a foreground operation. If this is a background operation, this may be
+    // nullptr.
+    std::shared_ptr<parser_t> parser;
+
+    // The set of variables. It is the creator's responsibility to ensure this lives as log as the
+    // context itself.
+    const environment_t &vars;
+
+    // A function which may be used to poll for cancellation.
+    cancel_checker_t cancel_checker;
+
+    // Invoke the cancel checker. \return if we should cancel.
+    bool check_cancel() const { return cancel_checker(); }
+
+    // \return an "empty" context which contains no variables, no parser, and never cancels.
+    static operation_context_t empty();
+
+    // \return an operation context that contains only global variables, no parser, and never
+    // cancels.
+    static operation_context_t globals();
+
+    /// Construct from the full triple of a parser, vars, and cancel checker.
+    operation_context_t(std::shared_ptr<parser_t> parser, const environment_t &vars,
+                        cancel_checker_t cancel_checker);
+
+    /// Construct from vars alone.
+    explicit operation_context_t(const environment_t &vars)
+        : operation_context_t(nullptr, vars, no_cancel) {}
+
+    ~operation_context_t();
+};
+
+#endif
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 56bcfcf0d..faec8ff0a 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -89,8 +89,9 @@ static redirection_spec_t get_stderr_merge() {
 }
 
 parse_execution_context_t::parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
+                                                     const operation_context_t &ctx,
                                                      job_lineage_t lineage)
-    : pstree(std::move(pstree)), parser(p), lineage(std::move(lineage)) {}
+    : pstree(std::move(pstree)), parser(p), ctx(ctx), lineage(std::move(lineage)) {}
 
 // Utilities
 
@@ -136,8 +137,7 @@ tnode_t<g::plain_statement> parse_execution_context_t::infinite_recursive_statem
         if (plain_statement) {
             maybe_t<wcstring> cmd = command_for_plain_statement(plain_statement, pstree->src);
             if (cmd &&
-                expand_one(*cmd, {expand_flag::skip_cmdsubst, expand_flag::skip_variables}, nullenv,
-                           nullptr) &&
+                expand_one(*cmd, {expand_flag::skip_cmdsubst, expand_flag::skip_variables}, ctx) &&
                 cmd == forbidden_function_name) {
                 // This is it.
                 infinite_recursive_statement = plain_statement;
@@ -382,7 +382,7 @@ eval_result_t parse_execution_context_t::run_for_statement(
     // in just one.
     tnode_t<g::tok_string> var_name_node = header.child<1>();
     wcstring for_var_name = get_source(var_name_node);
-    if (!expand_one(for_var_name, expand_flags_t{}, parser->vars(), parser->shared())) {
+    if (!expand_one(for_var_name, expand_flags_t{}, ctx)) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
         return eval_result_t::error;
     }
@@ -458,9 +458,8 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     // Expand it. We need to offset any errors by the position of the string.
     completion_list_t switch_values_expanded;
     parse_error_list_t errors;
-    auto expand_ret =
-        expand_string(switch_value, &switch_values_expanded, expand_flag::no_descriptions,
-                      parser->vars(), parser->shared(), &errors);
+    auto expand_ret = expand_string(switch_value, &switch_values_expanded,
+                                    expand_flag::no_descriptions, ctx, &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
@@ -720,7 +719,7 @@ eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_s
 
     // Expand the string to produce completions, and report errors.
     expand_result_t expand_err =
-        expand_to_command_and_args(unexp_cmd, parser->vars(), out_cmd, out_args, &errors);
+        expand_to_command_and_args(unexp_cmd, ctx, out_cmd, out_args, &errors);
     if (expand_err == expand_result_t::error) {
         parser->set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
         // Issue #5812 - the expansions were done on the command token,
@@ -877,8 +876,8 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
         // Expand this string.
         parse_error_list_t errors;
         arg_expanded.clear();
-        auto expand_ret = expand_string(arg_str, &arg_expanded, expand_flag::no_descriptions,
-                                        parser->vars(), parser->shared(), &errors);
+        auto expand_ret =
+            expand_string(arg_str, &arg_expanded, expand_flag::no_descriptions, ctx, &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
         switch (expand_ret) {
             case expand_result_t::error: {
@@ -934,8 +933,7 @@ bool parse_execution_context_t::determine_redirections(
 
         // PCA: I can't justify this skip_variables flag. It was like this when I got here.
         bool target_expanded =
-            expand_one(target, no_exec() ? expand_flag::skip_variables : expand_flags_t{},
-                       parser->vars(), parser->shared());
+            expand_one(target, no_exec() ? expand_flag::skip_variables : expand_flags_t{}, ctx);
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
             report_error(redirect_node, _(L"Invalid redirection target: %ls"), target.c_str());
@@ -1026,9 +1024,8 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         completion_list_t expression_expanded;
         parse_error_list_t errors;
         // TODO this is mostly copied from expand_arguments_from_nodes, maybe extract to function
-        auto expand_ret =
-            expand_string(expression, &expression_expanded, expand_flag::no_descriptions,
-                          parser->vars(), parser->shared(), &errors);
+        auto expand_ret = expand_string(expression, &expression_expanded,
+                                        expand_flag::no_descriptions, ctx, &errors);
         parse_error_offset_source_start(
             &errors, variable_assignment.source_range()->start + *equals_pos + 1);
         switch (expand_ret) {
diff --git a/src/parse_execution.h b/src/parse_execution.h
index ea4be2f63..8a87b0305 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -11,6 +11,7 @@
 #include "proc.h"
 
 class block_t;
+class operation_context_t;
 class parser_t;
 
 /// An eval_result represents evaluation errors including wildcards which failed to match, syntax
@@ -34,6 +35,7 @@ class parse_execution_context_t {
    private:
     parsed_source_ref_t pstree;
     parser_t *const parser;
+    const operation_context_t &ctx;
     // The currently executing job node, used to indicate the line number.
     tnode_t<grammar::job> executing_job_node{};
     // Cached line number information.
@@ -137,7 +139,8 @@ class parse_execution_context_t {
     int line_offset_of_character_at_offset(size_t offset);
 
    public:
-    parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p, job_lineage_t lineage);
+    parse_execution_context_t(parsed_source_ref_t pstree, parser_t *p,
+                              const operation_context_t &ctx, job_lineage_t lineage);
 
     /// Returns the current line number, indexed from 1. Not const since it touches
     /// cached_lineno_offset.
diff --git a/src/parse_util.cpp b/src/parse_util.cpp
index 1b9ec383d..794b981ea 100644
--- a/src/parse_util.cpp
+++ b/src/parse_util.cpp
@@ -1129,8 +1129,8 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
     if (maybe_t<wcstring> unexp_command = command_for_plain_statement(pst, buff_src)) {
         wcstring command;
         // Check that we can expand the command.
-        if (expand_to_command_and_args(*unexp_command, null_environment_t{}, &command, nullptr,
-                                       parse_errors) == expand_result_t::error) {
+        if (expand_to_command_and_args(*unexp_command, operation_context_t::empty(), &command,
+                                       nullptr, parse_errors) == expand_result_t::error) {
             errored = true;
             parse_error_offset_source_start(parse_errors, source_start);
         }
@@ -1193,7 +1193,7 @@ static bool detect_errors_in_plain_statement(const wcstring &buff_src,
 
         // Check that we don't do an invalid builtin (issue #1252).
         if (!errored && decoration == parse_statement_decoration_builtin &&
-            expand_one(*unexp_command, expand_flag::skip_cmdsubst, null_environment_t{}, nullptr,
+            expand_one(*unexp_command, expand_flag::skip_cmdsubst, operation_context_t::empty(),
                        parse_errors) &&
             !builtin_exists(*unexp_command)) {
             errored = append_syntax_error(parse_errors, source_start, UNKNOWN_BUILTIN_ERR_MSG,
diff --git a/src/parser.cpp b/src/parser.cpp
index 1ebb6a2ea..381b8ac06 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -306,8 +306,8 @@ void parser_t::emit_profiling(const char *path) const {
 }
 
 completion_list_t parser_t::expand_argument_list(const wcstring &arg_list_src,
-                                                 expand_flags_t eflags, const environment_t &vars,
-                                                 const std::shared_ptr<parser_t> &parser) {
+                                                 expand_flags_t eflags,
+                                                 const operation_context_t &ctx) {
     // Parse the string as an argument list.
     parse_node_tree_t tree;
     if (!parse_tree_from_string(arg_list_src, parse_flag_none, &tree, nullptr /* errors */,
@@ -322,8 +322,7 @@ completion_list_t parser_t::expand_argument_list(const wcstring &arg_list_src,
     tnode_t<grammar::freestanding_argument_list> arg_list(&tree, &tree.at(0));
     while (auto arg = arg_list.next_in_list<grammar::argument>()) {
         const wcstring arg_src = arg.get_source(arg_list_src);
-        if (expand_string(arg_src, &result, eflags, vars, parser, nullptr /* errors */) ==
-            expand_result_t::error) {
+        if (expand_string(arg_src, &result, eflags, ctx) == expand_result_t::error) {
             break;  // failed to expand a string
         }
     }
@@ -332,6 +331,14 @@ completion_list_t parser_t::expand_argument_list(const wcstring &arg_list_src,
 
 std::shared_ptr<parser_t> parser_t::shared() { return shared_from_this(); }
 
+cancel_checker_t parser_t::cancel_checker() const {
+    return [this]() { return this->cancellation_signal != 0; };
+}
+
+operation_context_t parser_t::context() {
+    return operation_context_t{this->shared(), this->vars(), this->cancel_checker()};
+}
+
 /// Append stack trace info for the block \p b to \p trace.
 static void append_block_description_to_stack_trace(const block_t &b, wcstring &trace,
                                                     const environment_t &vars) {
@@ -660,12 +667,13 @@ eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node
     job_reap(*this, false);  // not sure why we reap jobs here
 
     // Start it up
+    operation_context_t op_ctx = this->context();
     block_t *scope_block = this->push_block(block_t::scope_block(block_type));
 
     // Create and set a new execution context.
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
-    scoped_push<exc_ctx_ref_t> exc(
-        &execution_context, make_unique<parse_execution_context_t>(ps, this, std::move(lineage)));
+    scoped_push<exc_ctx_ref_t> exc(&execution_context, make_unique<parse_execution_context_t>(
+                                                           ps, this, op_ctx, std::move(lineage)));
     eval_result_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
diff --git a/src/parser.h b/src/parser.h
index c5863927e..4ae3cc920 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -14,6 +14,7 @@
 #include "common.h"
 #include "event.h"
 #include "expand.h"
+#include "operation_context.h"
 #include "parse_constants.h"
 #include "parse_execution.h"
 #include "parse_tree.h"
@@ -197,6 +198,8 @@ struct library_data_t {
     std::shared_ptr<const autoclose_fd_t> cwd_fd{};
 };
 
+class operation_context_t;
+
 class parser_t : public std::enable_shared_from_this<parser_t> {
     friend class parse_execution_context_t;
 
@@ -251,6 +254,9 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// Indicates that we should stop execution due to the given signal.
     static void cancel_requested(int sig);
 
+    /// Clear any cancel.
+    void clear_cancel() { cancellation_signal = 0; }
+
     /// Global event blocks.
     event_blockage_list_t global_event_blocks;
 
@@ -280,8 +286,8 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
     /// for command substitution expansion.
     static completion_list_t expand_argument_list(const wcstring &arg_list_src,
-                                                  expand_flags_t flags, const environment_t &vars,
-                                                  const std::shared_ptr<parser_t> &parser);
+                                                  expand_flags_t flags,
+                                                  const operation_context_t &ctx);
 
     /// Returns a string describing the current parser position in the format 'FILENAME (line
     /// LINE_NUMBER): LINE'. Example:
@@ -370,6 +376,12 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// \return a shared pointer reference to this parser.
     std::shared_ptr<parser_t> shared();
 
+    /// \return a cancel poller for checking if this parser has been signalled.
+    cancel_checker_t cancel_checker() const;
+
+    /// \return the operation context for this parser.
+    operation_context_t context();
+
     ~parser_t();
 };
 
diff --git a/src/reader.cpp b/src/reader.cpp
index d4ae22743..86b98ccec 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -136,6 +136,18 @@ static inline unsigned read_generation_count() {
     return s_generation.load(std::memory_order_relaxed);
 }
 
+/// \return an operation context for a background operation..
+/// Crucially the operation context itself does not contain a parser.
+/// It is the caller's responsibility to ensure the environment lives as long as the result.
+operation_context_t get_bg_context(const std::shared_ptr<environment_t> &env,
+                                   unsigned int generation_count) {
+    cancel_checker_t cancel_checker = [generation_count] {
+        // Cancel if the generation count changed.
+        return generation_count != read_generation_count();
+    };
+    return operation_context_t{nullptr, *env, std::move(cancel_checker)};
+}
+
 void editable_line_t::insert_string(const wcstring &str, size_t start, size_t len) {
     // Clamp the range to something valid.
     size_t string_length = str.size();
@@ -380,8 +392,8 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     std::vector<highlight_spec_t> colors;
     /// An array defining the block level at each character.
     std::vector<int> indents;
-    /// Function for tab completion.
-    complete_function_t complete_func{nullptr};
+    /// Whether tab completion is allowed.
+    bool complete_ok{false};
     /// Function for syntax highlighting.
     highlight_function_t highlight_func{highlight_universal};
     /// Function for testing if the string can be returned.
@@ -1283,11 +1295,9 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
     // this should use shared_ptr
     return [=]() -> autosuggestion_result_t {
         ASSERT_IS_BACKGROUND_THREAD();
-
         const autosuggestion_result_t nothing = {};
-        // If the main thread has moved on, skip all the work.
-        // Otherwise record the generation.
-        if (generation_count != read_generation_count()) {
+        operation_context_t ctx = get_bg_context(vars, generation_count);
+        if (ctx.check_cancel()) {
             return nothing;
         }
         s_thread_generation = generation_count;
@@ -1297,21 +1307,22 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
             return nothing;
         }
 
-        history_search_t searcher(*history, search_string, history_search_type_t::prefix);
-        while (!reader_test_should_cancel() && searcher.go_backwards()) {
+        history_search_t searcher(*history, search_string, history_search_type_t::prefix,
+                                  history_search_flags_t{});
+        while (!ctx.check_cancel() && searcher.go_backwards()) {
             const history_item_t &item = searcher.current_item();
 
             // Skip items with newlines because they make terrible autosuggestions.
             if (item.str().find(L'\n') != wcstring::npos) continue;
 
-            if (autosuggest_validate_from_history(item, working_directory, *vars)) {
+            if (autosuggest_validate_from_history(item, working_directory, ctx)) {
                 // The command autosuggestion was handled specially, so we're done.
                 return {searcher.current_string(), search_string};
             }
         }
 
         // Maybe cancel here.
-        if (reader_test_should_cancel()) return nothing;
+        if (ctx.check_cancel()) return nothing;
 
         // Here we do something a little funny. If the line ends with a space, and the cursor is not
         // at the end, don't use completion autosuggestions. It ends up being pretty weird seeing
@@ -1325,7 +1336,7 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
 
         // Try normal completions.
         completion_request_flags_t complete_flags = completion_request_t::autosuggestion;
-        completion_list_t completions = complete(search_string, complete_flags, *vars, nullptr);
+        completion_list_t completions = complete(search_string, complete_flags, ctx);
         completions_sort_and_prioritize(&completions, complete_flags);
         if (!completions.empty()) {
             const completion_t &comp = completions.at(0);
@@ -2036,16 +2047,12 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
     parser_t &parser, const wcstring &text, long match_highlight_pos,
     highlight_function_t highlight_func) {
     auto vars = parser.vars().snapshot();
-    unsigned int generation_count = read_generation_count();
+    unsigned generation_count = read_generation_count();
     return [=]() -> highlight_result_t {
         if (text.empty()) return {};
-        if (generation_count != read_generation_count()) {
-            // The gen count has changed, so don't do anything.
-            return {};
-        }
-        s_thread_generation = generation_count;
+        operation_context_t ctx = get_bg_context(vars, generation_count);
         std::vector<highlight_spec_t> colors(text.size(), highlight_spec_t{});
-        highlight_func(text, colors, match_highlight_pos, nullptr /* error */, *vars);
+        highlight_func(text, colors, match_highlight_pos, ctx);
         return {std::move(colors), text};
     };
 }
@@ -2152,7 +2159,7 @@ void reader_set_allow_autosuggesting(bool flag) { current_data()->allow_autosugg
 
 void reader_set_expand_abbreviations(bool flag) { current_data()->expand_abbreviations = flag; }
 
-void reader_set_complete_function(complete_function_t f) { current_data()->complete_func = f; }
+void reader_set_complete_ok(bool flag) { current_data()->complete_ok = flag; }
 
 void reader_set_highlight_function(highlight_function_t func) {
     current_data()->highlight_func = func;
@@ -2255,7 +2262,7 @@ uint64_t reader_run_count() { return run_count; }
 /// Read interactively. Read input from stdin while providing editing facilities.
 static int read_i(parser_t &parser) {
     reader_push(parser, history_session_id(parser.vars()));
-    reader_set_complete_function(&complete);
+    reader_set_complete_ok(true);
     reader_set_highlight_function(&highlight_shell);
     reader_set_test_function(&reader_shell_test);
     reader_set_allow_autosuggesting(true);
@@ -2514,7 +2521,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::complete:
         case rl::complete_and_search: {
-            if (!complete_func) break;
+            if (!complete_ok) break;
 
             // Use the command line only; it doesn't make sense to complete in any other line.
             editable_line_t *el = &command_line;
@@ -2540,9 +2547,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Get the string; we have to do this after removing any trailing backslash.
                 const wchar_t *const buff = el->text.c_str();
 
-                // Clear the completion list.
-                rls.comp.clear();
-
                 // Figure out the extent of the command substitution surrounding the cursor.
                 // This is because we only look at the current command substitution to form
                 // completions - stuff happening outside of it is not interesting.
@@ -2566,7 +2570,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // std::fwprintf(stderr, L"Complete (%ls)\n", buffcpy.c_str());
                 completion_request_flags_t complete_flags = {completion_request_t::descriptions,
                                                              completion_request_t::fuzzy_match};
-                rls.comp = complete_func(buffcpy, complete_flags, vars, parser_ref);
+                rls.comp = complete(buffcpy, complete_flags, parser_ref->context());
 
                 // User-supplied completions may have changed the commandline - prevent buffer
                 // overflow.
diff --git a/src/reader.h b/src/reader.h
index 3d8d722a5..b09e9a1fb 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -17,6 +17,8 @@
 class environment_t;
 class history_t;
 class io_chain_t;
+class operation_context_t;
+class parser_t;
 
 /// Helper class for storing a command line.
 class editable_line_t {
@@ -146,16 +148,12 @@ void reader_push(parser_t &parser, const wcstring &name);
 /// Return to previous reader environment.
 void reader_pop();
 
-/// Specify function to use for finding possible tab completions.
-typedef completion_list_t (*complete_function_t)(const wcstring &, completion_request_flags_t,
-                                                 const environment_t &,
-                                                 const std::shared_ptr<parser_t> &parser);
-
-void reader_set_complete_function(complete_function_t);
+/// Mark whether tab completion is enabled.
+void reader_set_complete_ok(bool flag);
 
 /// The type of a highlight function.
 using highlight_function_t = void (*)(const wcstring &, std::vector<highlight_spec_t> &, size_t,
-                                      wcstring_list_t *, const environment_t &vars);
+                                      const operation_context_t &ctx);
 
 /// Function type for testing if a string is valid for the reader to return.
 using test_function_t = parser_test_error_bits_t (*)(parser_t &, const wcstring &);
diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 52c33ad0c..147f08af7 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -456,6 +456,8 @@ static bool wildcard_test_flags_then_complete(const wcstring &filepath, const wc
 }
 
 class wildcard_expander_t {
+    // A function to call to check cancellation.
+    cancel_checker_t cancel_checker;
     // The working directory to resolve paths against
     const wcstring working_directory;
     // The set of items we have resolved, used to efficiently avoid duplication.
@@ -502,7 +504,7 @@ class wildcard_expander_t {
 
     /// Indicate whether we should cancel wildcard expansion. This latches 'interrupt'.
     bool interrupted() {
-        did_interrupt = did_interrupt || reader_test_should_cancel();
+        did_interrupt = did_interrupt || cancel_checker();
         return did_interrupt;
     }
 
@@ -629,8 +631,12 @@ class wildcard_expander_t {
     }
 
    public:
-    wildcard_expander_t(wcstring wd, expand_flags_t f, completion_list_t *r)
-        : working_directory(std::move(wd)), flags(f), resolved_completions(r) {
+    wildcard_expander_t(wcstring wd, expand_flags_t f, const cancel_checker_t &cancel_checker,
+                        completion_list_t *r)
+        : cancel_checker(cancel_checker),
+          working_directory(std::move(wd)),
+          flags(f),
+          resolved_completions(r) {
         assert(resolved_completions != nullptr);
 
         // Insert initial completions into our set to avoid duplicates.
@@ -897,7 +903,9 @@ void wildcard_expander_t::expand(const wcstring &base_dir, const wchar_t *wc,
 
 wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
                                                 const wcstring &working_directory,
-                                                expand_flags_t flags, completion_list_t *output) {
+                                                expand_flags_t flags,
+                                                const cancel_checker_t &cancel_checker,
+                                                completion_list_t *output) {
     assert(output != nullptr);
     // Fuzzy matching only if we're doing completions.
     assert(flags.get(expand_flag::for_completions) || !flags.get(expand_flag::fuzzy_match));
@@ -934,7 +942,7 @@ wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
         effective_wc = wc;
     }
 
-    wildcard_expander_t expander(prefix, flags, output);
+    wildcard_expander_t expander(prefix, flags, cancel_checker, output);
     expander.expand(base_dir, effective_wc.c_str(), base_dir);
     return expander.status_code();
 }
diff --git a/src/wildcard.h b/src/wildcard.h
index 1b03e6e2f..eb95cd4d4 100644
--- a/src/wildcard.h
+++ b/src/wildcard.h
@@ -48,7 +48,9 @@ enum class wildcard_expand_result_t {
 };
 wildcard_expand_result_t wildcard_expand_string(const wcstring &wc,
                                                 const wcstring &working_directory,
-                                                expand_flags_t flags, completion_list_t *out);
+                                                expand_flags_t flags,
+                                                const cancel_checker_t &cancel_checker,
+                                                completion_list_t *out);
 
 /// Test whether the given wildcard matches the string. Does not perform any I/O.
 ///

From 1978ac87a1ccdcec8581d03eda8c54d182e5a7e2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 16 Jan 2020 15:11:24 -0800
Subject: [PATCH 1560/1732] Remove reader_test_should_cancel

Use cancel_checker more pervasively.
---
 src/builtin_history.cpp |  3 ++-
 src/complete.cpp        |  2 +-
 src/history.cpp         | 18 +++++++++---------
 src/history.h           |  3 ++-
 src/reader.cpp          | 13 -------------
 src/reader.h            |  5 -----
 6 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/src/builtin_history.cpp b/src/builtin_history.cpp
index 4df5e30f4..6facf2bbb 100644
--- a/src/builtin_history.cpp
+++ b/src/builtin_history.cpp
@@ -249,7 +249,8 @@ int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     switch (opts.hist_cmd) {
         case HIST_SEARCH: {
             if (!history->search(opts.search_type, args, opts.show_time_format, opts.max_items,
-                                 opts.case_sensitive, opts.null_terminate, opts.reverse, streams)) {
+                                 opts.case_sensitive, opts.null_terminate, opts.reverse,
+                                 parser.cancel_checker(), streams)) {
                 status = STATUS_CMD_ERROR;
             }
             break;
diff --git a/src/complete.cpp b/src/complete.cpp
index d4058368f..6133a15ff 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1347,7 +1347,7 @@ static void walk_wrap_chain_recursive(const wcstring &command_line, source_range
                                       wrap_chain_visited_set_t *visited, size_t depth) {
     // Limit our recursion depth. This prevents cycles in the wrap chain graph from overflowing.
     if (depth > 24) return;
-    if (reader_test_should_cancel()) return;
+    if (cancel_checker()) return;
 
     // Extract command from the command line and invoke the receiver with it.
     wcstring command(command_line, command_range.start, command_range.length);
diff --git a/src/history.cpp b/src/history.cpp
index 822b0316d..9c53de01a 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -605,10 +605,6 @@ bool history_search_t::go_backwards() {
 
     size_t index = current_index_;
     while (++index < max_index) {
-        if (reader_test_should_cancel()) {
-            return false;
-        }
-
         history_item_t item = history_->item_at_index(index);
 
         // We're done if it's empty or we cancelled.
@@ -1344,10 +1340,11 @@ void history_t::save() { impl()->save(); }
 /// \p func returns true, continue the search; else stop it.
 static void do_1_history_search(history_t &hist, history_search_type_t search_type,
                                 const wcstring &search_string, bool case_sensitive,
-                                const std::function<bool(const history_item_t &item)> &func) {
+                                const std::function<bool(const history_item_t &item)> &func,
+                                const cancel_checker_t &cancel_check) {
     history_search_t searcher = history_search_t(hist, search_string, search_type,
                                                  case_sensitive ? 0 : history_search_ignore_case);
-    while (searcher.go_backwards()) {
+    while (!cancel_check() && searcher.go_backwards()) {
         if (!func(searcher.current_item())) {
             break;
         }
@@ -1357,7 +1354,8 @@ static void do_1_history_search(history_t &hist, history_search_type_t search_ty
 // Searches history.
 bool history_t::search(history_search_type_t search_type, const wcstring_list_t &search_args,
                        const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
-                       bool null_terminate, bool reverse, io_streams_t &streams) {
+                       bool null_terminate, bool reverse, const cancel_checker_t &cancel_check,
+                       io_streams_t &streams) {
     wcstring_list_t collected;
     wcstring formatted_record;
     size_t remaining = max_items;
@@ -1379,14 +1377,16 @@ bool history_t::search(history_search_type_t search_type, const wcstring_list_t
 
     if (search_args.empty()) {
         // The user had no search terms; just append everything.
-        do_1_history_search(*this, history_search_type_t::match_everything, {}, false, func);
+        do_1_history_search(*this, history_search_type_t::match_everything, {}, false, func,
+                            cancel_check);
     } else {
         for (const wcstring &search_string : search_args) {
             if (search_string.empty()) {
                 streams.err.append_format(L"Searching for the empty string isn't allowed");
                 return false;
             }
-            do_1_history_search(*this, search_type, search_string, case_sensitive, func);
+            do_1_history_search(*this, search_type, search_string, case_sensitive, func,
+                                cancel_check);
         }
     }
 
diff --git a/src/history.h b/src/history.h
index 6f7e30590..66aa52aea 100644
--- a/src/history.h
+++ b/src/history.h
@@ -172,7 +172,8 @@ class history_t {
     // Searches history.
     bool search(history_search_type_t search_type, const wcstring_list_t &search_args,
                 const wchar_t *show_time_format, size_t max_items, bool case_sensitive,
-                bool null_terminate, bool reverse, io_streams_t &streams);
+                bool null_terminate, bool reverse, const cancel_checker_t &cancel_check,
+                io_streams_t &streams);
 
     // Irreversibly clears history.
     void clear();
diff --git a/src/reader.cpp b/src/reader.cpp
index 86b98ccec..62c7d4938 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -127,10 +127,6 @@ enum class jump_precision_t { till, to };
 /// background threads to notice it and skip doing work that they would otherwise have to do.
 static std::atomic<unsigned> s_generation;
 
-/// This pthreads generation count is set when an autosuggestion background thread starts up, so it
-/// can easily check if the work it is doing is no longer useful.
-static thread_local unsigned s_thread_generation;
-
 /// Helper to get the generation count
 static inline unsigned read_generation_count() {
     return s_generation.load(std::memory_order_relaxed);
@@ -853,14 +849,6 @@ void reader_data_t::repaint_if_needed() {
 
 void reader_reset_interrupted() { interrupted = 0; }
 
-bool reader_test_should_cancel() {
-    if (is_main_thread()) {
-        return interrupted;
-    } else {
-        return read_generation_count() != s_thread_generation;
-    }
-}
-
 int reader_test_and_clear_interrupted() {
     int res = interrupted;
     if (res) {
@@ -1300,7 +1288,6 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
         if (ctx.check_cancel()) {
             return nothing;
         }
-        s_thread_generation = generation_count;
 
         // Let's make sure we aren't using the empty string.
         if (search_string.empty()) {
diff --git a/src/reader.h b/src/reader.h
index b09e9a1fb..5f3127d56 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -117,11 +117,6 @@ size_t reader_get_cursor_pos();
 /// selection, true otherwise.
 bool reader_get_selection(size_t *start, size_t *len);
 
-/// Return whether we have been interrupted and should cancel the current operation.
-/// This may be because we received a sigint, or because we are in a background thread
-/// and the job is now stale.
-bool reader_test_should_cancel();
-
 /// Return the value of the interrupted flag, which is set by the sigint handler, and clear it if it
 /// was set. In practice this will return 0 or SIGINT.
 int reader_test_and_clear_interrupted();

From 1da09f2c525a55b0282d464d011e2cd4fdb9d7a3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 16 Jan 2020 15:59:10 -0800
Subject: [PATCH 1561/1732] Ensure new job IDs are never smaller than existing
 running jobs

This makes job IDs "monotone" in the sense that newly spawned jobs
always have larger IDs than existing jobs, as requested in #6053
---
 src/proc.cpp              | 37 +++++++++++--------------------------
 tests/checks/job-ids.fish | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index e46658382..c20e543a3 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -81,42 +81,27 @@ void set_job_control_mode(job_control_t mode) { job_control_mode = mode; }
 
 void proc_init() { signal_set_handlers_once(false); }
 
-// Basic thread safe job IDs. The vector consumed_job_ids has a true value wherever the job ID
-// corresponding to that slot is in use. The job ID corresponding to slot 0 is 1.
-static owning_lock<std::vector<bool>> locked_consumed_job_ids;
+// Basic thread safe sorted vector of job IDs in use.
+static owning_lock<std::vector<job_id_t>> locked_consumed_job_ids;
 
 job_id_t acquire_job_id() {
     auto consumed_job_ids = locked_consumed_job_ids.acquire();
 
-    // Find the index of the first 0 slot.
-    auto slot = std::find(consumed_job_ids->begin(), consumed_job_ids->end(), false);
-    if (slot != consumed_job_ids->end()) {
-        // We found a slot. Note that slot 0 corresponds to job ID 1.
-        *slot = true;
-        return static_cast<job_id_t>(slot - consumed_job_ids->begin() + 1);
-    }
-
-    // We did not find a slot; create a new slot. The size of the vector is now the job ID
-    // (since it is one larger than the slot).
-    consumed_job_ids->push_back(true);
-    return static_cast<job_id_t>(consumed_job_ids->size());
+    // The new job ID should be larger than the largest currently used ID (#6053).
+    job_id_t jid = consumed_job_ids->empty() ? 1 : consumed_job_ids->back() + 1;
+    consumed_job_ids->push_back(jid);
+    return jid;
 }
 
 void release_job_id(job_id_t jid) {
     assert(jid > 0);
     auto consumed_job_ids = locked_consumed_job_ids.acquire();
-    size_t slot = static_cast<size_t>(jid - 1), count = consumed_job_ids->size();
 
-    // Make sure this slot is within our vector and is currently set to consumed.
-    assert(slot < count);
-    assert(consumed_job_ids->at(slot) == true);
-
-    // Clear it and then resize the vector to eliminate unused trailing job IDs.
-    consumed_job_ids->at(slot) = false;
-    while (count--) {
-        if (consumed_job_ids->at(count)) break;
-    }
-    consumed_job_ids->resize(count + 1);
+    // Our job ID vector is sorted, but the number of jobs is typically 1 or 2 so a binary search
+    // isn't worth it.
+    auto where = std::find(consumed_job_ids->begin(), consumed_job_ids->end(), jid);
+    assert(where != consumed_job_ids->end() && "JobID was not in use");
+    consumed_job_ids->erase(where);
 }
 
 job_t *job_t::from_job_id(job_id_t id) {
diff --git a/tests/checks/job-ids.fish b/tests/checks/job-ids.fish
index f0dd0bd81..ecd8ad2c6 100644
--- a/tests/checks/job-ids.fish
+++ b/tests/checks/job-ids.fish
@@ -29,6 +29,23 @@ jobs
 #CHECK: 2{{.*\t}}sleep 200 &
 #CHECK: 1{{.*\t}}sleep 100 &
 
+# Kill job 2; the next job should have job ID 4 because 3 is still in use (#6053).
+
+status job-control interactive
+command kill -9 $tokill[2]
+set -e tokill[2]
+status job-control full
+sleep 400 &
+set -g tokill $tokill $last_pid
+
+jobs
+
+#CHECK: Job	Group{{.*}}
+#CHECK: 4{{.*\t}}sleep 400 &
+#CHECK: 3{{.*\t}}sleep 300 &
+#CHECK: 1{{.*\t}}sleep 100 &
+
+
 status job-control interactive
 
 for pid in $tokill

From c513724d7bfa9b92b20200e4c3c6f138ed4a194c Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 17 Jan 2020 13:40:56 +0100
Subject: [PATCH 1562/1732] Do not store reference to a temporary

Seems to have worked by accident. I could swear that I had fixed this..
---
 src/parse_execution.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index faec8ff0a..0a1a0aa64 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1019,7 +1019,7 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         const wcstring &source = variable_assignment.get_source(pstree->src);
         auto equals_pos = variable_assignment_equals_pos(source);
         assert(equals_pos);
-        const wcstring &variable_name = source.substr(0, *equals_pos);
+        const wcstring variable_name = source.substr(0, *equals_pos);
         const wcstring expression = source.substr(*equals_pos + 1);
         completion_list_t expression_expanded;
         parse_error_list_t errors;

From 05ddda9155738754c3d9163d7bcee1e421f527fd Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 17 Jan 2020 14:14:06 +0100
Subject: [PATCH 1563/1732] use variable assignments on commandline in
 completions

Fixes #6507

To do: If a variable assignment uses a command substitution that errors,
the error is printed, but without a proper location.
---
 src/complete.cpp                      | 24 +++++++++++++++++++++++-
 tests/checks/variable-assignment.fish |  4 ++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 6133a15ff..03005cba0 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1572,8 +1572,30 @@ void completer_t::perform() {
                 if (wants_transient) {
                     ctx.parser->libdata().transient_commandlines.push_back(cmdline);
                 }
-                bool is_variable_assignment = bool(variable_assignment_equals_pos(cmd));
+                maybe_t<size_t> equals_pos = variable_assignment_equals_pos(cmd);
+                bool is_variable_assignment = bool(equals_pos);
                 if (is_variable_assignment && ctx.parser) {
+                    // clone of parse_execution_context_t::apply_variable_assignments
+                    // but this is not smart enough to report correct error locations, so we ignore
+                    // errors and this create one scope for each assignment instead of just one;
+                    // that should hardly matter
+                    const block_t *block = block =
+                        ctx.parser->push_block(block_t::variable_assignment_block());
+                    const wcstring variable_name = cmd.substr(0, *equals_pos);
+                    const wcstring expression = cmd.substr(*equals_pos + 1);
+                    completion_list_t expression_expanded;
+                    auto expand_ret = expand_string(expression, &expression_expanded,
+                                                    expand_flag::no_descriptions, ctx);
+                    wcstring_list_t vals;
+                    if (expand_ret != expand_result_t::error) {
+                        for (auto &completion : expression_expanded)
+                            vals.emplace_back(std::move(completion.completion));
+                        ctx.parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT,
+                                               std::move(vals));
+                    }
+                    cleanup_t scope([&] {
+                        if (block) ctx.parser->pop_block(block);
+                    });
                     // To avoid issues like #2705 we complete commands starting with variable
                     // assignments by recursively calling complete for the command suffix
                     // without the first variable assignment token.
diff --git a/tests/checks/variable-assignment.fish b/tests/checks/variable-assignment.fish
index 590e6fac9..7071f96a3 100644
--- a/tests/checks/variable-assignment.fish
+++ b/tests/checks/variable-assignment.fish
@@ -91,3 +91,7 @@ eval ': | a=b'
 # CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.
 eval 'not a=b'
 # CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.
+
+complete -c foo -xa '$a'
+a=b complete -C'foo '
+#CHECK: b

From 4170e8cff2a7efb4215d1a640640759cf95d65a1 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 17 Jan 2020 17:27:18 +0100
Subject: [PATCH 1564/1732] typo

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

diff --git a/src/complete.cpp b/src/complete.cpp
index 03005cba0..3898a0f81 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1579,7 +1579,7 @@ void completer_t::perform() {
                     // but this is not smart enough to report correct error locations, so we ignore
                     // errors and this create one scope for each assignment instead of just one;
                     // that should hardly matter
-                    const block_t *block = block =
+                    const block_t *block =
                         ctx.parser->push_block(block_t::variable_assignment_block());
                     const wcstring variable_name = cmd.substr(0, *equals_pos);
                     const wcstring expression = cmd.substr(*equals_pos + 1);

From b62fa53807a3154c8b596ffa42245e552cf62a23 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 17 Jan 2020 15:08:14 +0100
Subject: [PATCH 1565/1732] set error code on failed command substitution to
 255 instead of -1

the exit status ought to be in 0-255, e.g. exit -1
---
 src/exec.cpp                 | 7 ++++++-
 tests/checks/invocation.fish | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0841c7fdd..0d509a64f 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -1157,7 +1157,12 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // If the caller asked us to preserve the exit status, restore the old status. Otherwise set the
     // status of the subcommand.
     if (apply_exit_status) {
-        parser.set_last_statuses(subcommand_statuses);
+        // Hack: If the evaluation failed, avoid returning -1 to the user.
+        if (subcommand_statuses.status == -1) {
+            parser.set_last_statuses(statuses_t::just(255));
+        } else {
+            parser.set_last_statuses(subcommand_statuses);
+        }
     } else {
         parser.set_last_statuses(std::move(prev_statuses));
     }
diff --git a/tests/checks/invocation.fish b/tests/checks/invocation.fish
index d8ca460e5..89f41fb04 100644
--- a/tests/checks/invocation.fish
+++ b/tests/checks/invocation.fish
@@ -1,2 +1,8 @@
-#RUN: %fish -c "echo 1.2.3.4."
+#RUN: %fish -C 'set -l fish %fish' %s
+
+$fish -c "echo 1.2.3.4."
 # CHECK: 1.2.3.4.
+
+PATH= $fish -c "echo (command a)" 2>/dev/null
+echo $status
+# CHECK: 255

From ca08cc331bbcaac521e051dac1614f726535d70d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 Jan 2020 09:06:12 +0100
Subject: [PATCH 1566/1732] Use PTHREAD_THREADS_MAX if available

Stops us deadlocking on OpenBSD if we need more than 4 threads.

Fixes #6503
---
 src/iothread.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 746a2dbac..5600a5b19 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -21,11 +21,17 @@
 #include "global_safety.h"
 #include "wutil.h"
 
+#ifdef PTHREAD_THREADS_MAX
+#if PTHREAD_THREADS_MAX < 64
+#define IO_MAX_THREADS PTHREAD_THREADS_MAX
+#endif
+#else
 #ifdef _POSIX_THREAD_THREADS_MAX
 #if _POSIX_THREAD_THREADS_MAX < 64
 #define IO_MAX_THREADS _POSIX_THREAD_THREADS_MAX
 #endif
 #endif
+#endif
 
 #ifndef IO_MAX_THREADS
 #define IO_MAX_THREADS 64

From 018e51c9354211e65a7b166c2dc79572339152a5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 Jan 2020 09:26:59 +0100
Subject: [PATCH 1567/1732] Just hardcode a thread limit of 1024

64 is too low (it's actually reachable), and every sensible system should have a limit above
this.

On OpenBSD and FreeBSD it's ULONG_MAX, on my linux system it's 61990.

Plus we currently fail by hanging if our limit is reached, so this
should improve things regardless.

On my linux system _POSIX_THREAD_THREADS_MAX works out to 64 here,
which is just too low, even tho the system can handle more.

Fixes #6503 harder.
---
 src/iothread.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 5600a5b19..df015681d 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -21,21 +21,11 @@
 #include "global_safety.h"
 #include "wutil.h"
 
-#ifdef PTHREAD_THREADS_MAX
-#if PTHREAD_THREADS_MAX < 64
-#define IO_MAX_THREADS PTHREAD_THREADS_MAX
-#endif
-#else
-#ifdef _POSIX_THREAD_THREADS_MAX
-#if _POSIX_THREAD_THREADS_MAX < 64
-#define IO_MAX_THREADS _POSIX_THREAD_THREADS_MAX
-#endif
-#endif
-#endif
-
-#ifndef IO_MAX_THREADS
-#define IO_MAX_THREADS 64
-#endif
+// 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.
+#define IO_MAX_THREADS 1024
 
 // Values for the wakeup bytes sent to the ioport.
 #define IO_SERVICE_MAIN_THREAD_REQUEST_QUEUE 99

From 14fd4570d56d0c5d14ac25c67a998c0df34dde35 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 Jan 2020 10:43:59 +0100
Subject: [PATCH 1568/1732] Test using more than 64 threads

See #6503
---
 tests/checks/threads.fish | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tests/checks/threads.fish

diff --git a/tests/checks/threads.fish b/tests/checks/threads.fish
new file mode 100644
index 000000000..dc54253e6
--- /dev/null
+++ b/tests/checks/threads.fish
@@ -0,0 +1,3 @@
+#RUN: %fish %s
+# Check we can handle more than 64 threads (if not this HANGS!):
+true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true  (true )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))

From 1643df0d23483f84c79c0c45b014b6d4b8ca8ab4 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 18 Jan 2020 18:45:53 +0100
Subject: [PATCH 1569/1732] Docs: Clean up set_color

The wording should now be a bit nicer.

[ci skip]
---
 sphinx_doc_src/cmds/set_color.rst | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/sphinx_doc_src/cmds/set_color.rst b/sphinx_doc_src/cmds/set_color.rst
index 1653efb50..eb69a56fe 100644
--- a/sphinx_doc_src/cmds/set_color.rst
+++ b/sphinx_doc_src/cmds/set_color.rst
@@ -13,14 +13,18 @@ Synopsis
 Description
 -----------
 
-``set_color`` is used to control the color and styling of text in the terminal. ``VALUE`` corresponds to a reserved color name such as *red* or a RGB color value given as 3 or 6 hexadecimal digits. 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. 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. It's 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*
 
-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.
+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.
+
+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:
 
@@ -38,7 +42,7 @@ Notes
 -----
 
 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.
+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.
 
@@ -46,7 +50,6 @@ Examples
 --------
 
 
-
 ::
 
     set_color red; echo "Roses are red"
@@ -58,12 +61,19 @@ Examples
 Terminal Capability Detection
 -----------------------------
 
-Fish uses a heuristic to decide if a terminal supports the 256-color palette as opposed to the more limited 16 color palette of older terminals. Support can be forced on by setting ``fish_term256`` to *1*. If ``$TERM`` contains "256color" (e.g., *xterm-256color*), 256-color support is enabled. If ``$TERM`` contains *xterm*, 256 color support is enabled (except for MacOS: ``$TERM_PROGRAM`` and ``$TERM_PROGRAM_VERSION`` are used to detect Terminal.app from MacOS 10.6; support is disabled here it because it is known that it reports ``xterm`` and only supports 16 colors.
+Fish uses some heuristics to determine what colors a terminal supports to avoid sending sequences that it won't understand.
 
-If terminfo reports 256 color support for a terminal, support will always be enabled. 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.
+In particular it will:
 
-Many terminals support 24-bit (i.e., true-color) color escape sequences. This includes modern xterm, Gnome Terminal, Konsole, and iTerm2. Fish attempts to detect such terminals through various means in ``config.fish`` You can explicitly force that support via ``set fish_term24bit 1``.
+- Enable 256 colors if $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.
 
-The ``set_color`` command uses the terminfo database to look up how to change terminal colors on whatever terminal is in use. Some systems have old and incomplete terminfo databases, and may lack color information for terminals that support it. Fish will assume that all terminals can use the [ANSI X3.64](https://en.wikipedia.org/wiki/ANSI_escape_code) escape sequences if the terminfo definition indicates a color below 16 is not supported.
+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 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.
+
+The ``set_color`` command uses the terminfo database to look up how to change terminal colors on whatever terminal is in use. Some systems have old and incomplete terminfo databases, and lack color information for terminals that support it. Fish assumes that all terminals can use the [ANSI X3.64](https://en.wikipedia.org/wiki/ANSI_escape_code) escape sequences if the terminfo definition indicates a color below 16 is not supported.
 
-Support for italics, dim, reverse, and other modes is not guaranteed in all terminal emulators. Fish attempts to determine if the terminal supports these modes even if the terminfo database may not be up-to-date.

From b18f605e4fe65f665915f62c45bf80f325f904af Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 18 Jan 2020 20:20:22 +0100
Subject: [PATCH 1570/1732] Fix completions if previous arg is a variable

complete -C'echo $HOM ' would complete $HOM instead of a new token.
Fixes another regression introduced in
6fb7f9b6b - Fix completion for builtins with subcommands
---
 src/complete.cpp           | 6 ++++--
 tests/checks/complete.fish | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 3898a0f81..67d1522d2 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1502,8 +1502,10 @@ void completer_t::perform() {
     // If we are completing a variable name or a tilde expansion user name, we do that and return.
     // No need for any other completions.
     const wcstring current_token = cur_tok.get_source(cmd);
-    if (try_complete_variable(current_token) || try_complete_user(current_token)) {
-        return;
+    if (cur_tok.location_in_or_at_end_of_source_range(cursor_pos)) {
+        if (try_complete_variable(current_token) || try_complete_user(current_token)) {
+            return;
+        }
     }
 
     if (cmd_tok.location_in_or_at_end_of_source_range(cursor_pos)) {
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 28b1a3261..8ecb9f24f 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -165,3 +165,6 @@ end
 complete -c complete_test_function_desc -xa '(complete -Csome_function)'
 complete -C'complete_test_function_desc ' | count
 # CHECK: 1
+
+complete -c prev-arg-variable -f
+complete -C'prev-arg-variable $HOME '

From d38db1bc610cbc9cf32585e914aa05ce077c627c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 Jan 2020 11:50:50 -0800
Subject: [PATCH 1571/1732] Add a test for deep command substitutions

---
 tests/checks/deep-cmdsub.fish | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 tests/checks/deep-cmdsub.fish

diff --git a/tests/checks/deep-cmdsub.fish b/tests/checks/deep-cmdsub.fish
new file mode 100644
index 000000000..5a6ac7966
--- /dev/null
+++ b/tests/checks/deep-cmdsub.fish
@@ -0,0 +1,11 @@
+# RUN: %fish %s
+
+# Ensure we don't hang on deep command substitutions - see #6503.
+
+set s "echo hooray"
+for i in (seq 63)
+    set s "echo ($s)"
+end
+eval $s
+#CHECK: hooray
+

From c14d54032fb12e6b08617aefe95156c4ae809381 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 Jan 2020 11:32:44 -0800
Subject: [PATCH 1572/1732] Add a cant_wait parameter to iothread_perform

Sometimes we must spawn a new thread, to avoid the risk of deadlock.
Ensure we always spawn a thread in those cases. In particular this
includes the fillthread.
---
 src/exec.cpp     |  2 +-
 src/io.cpp       |  2 +-
 src/iothread.cpp | 14 ++++++++------
 src/iothread.h   |  9 ++++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0d509a64f..304b5a287 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -301,7 +301,7 @@ static void run_internal_process(process_t *p, std::string &&outdata, std::strin
     // builtin_run provide this directly, rather than setting it in the process.
     f->success_status = p->status;
 
-    iothread_perform([f]() {
+    iothread_perform_cantwait([f]() {
         proc_status_t status = f->success_status;
         if (!f->skip_out()) {
             ssize_t ret = write_loop(f->src_outfd, f->outdata.data(), f->outdata.size());
diff --git a/src/io.cpp b/src/io.cpp
index 38c088f67..a28f61010 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -157,7 +157,7 @@ void io_buffer_t::begin_background_fillthread(autoclose_fd_t fd) {
     // Run our function to read until the receiver is closed.
     // It's OK to capture 'this' by value because 'this' owns the background thread and waits for it
     // before dtor.
-    iothread_perform([this, promise, fdref]() {
+    iothread_perform_cantwait([this, promise, fdref]() {
         this->run_background_fillthread(std::move(*fdref));
         promise->set_value();
     });
diff --git a/src/iothread.cpp b/src/iothread.cpp
index df015681d..5f40fe5bc 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -101,7 +101,9 @@ struct thread_pool_t {
     /// Enqueue a new work item onto the thread pool.
     /// The function \p func will execute in one of the pool's threads.
     /// \p completion will run on the main thread, if it is not missing.
-    int perform(void_function_t &&func, void_function_t &&completion);
+    /// If \p cant_wait is set, disrespect the thread limit, because extant threads may
+    ///want to wait for new threads.
+    int perform(void_function_t &&func, void_function_t &&completion, bool cant_wait);
 
    private:
     /// The worker loop for this thread.
@@ -229,7 +231,7 @@ bool thread_pool_t::spawn() {
     return make_detached_pthread(&run_trampoline, static_cast<void *>(this));
 }
 
-int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion) {
+int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion, bool cant_wait) {
     assert(func && "Missing function");
     // Note we permit an empty completion.
     struct work_request_t req(std::move(func), std::move(completion));
@@ -247,8 +249,8 @@ int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion)
         } else if (data->waiting_threads >= data->request_queue.size()) {
             // There's enough waiting threads, wake one up.
             wakeup_thread = true;
-        } else if (data->total_threads < pool.max_threads) {
-            // No threads are waiting but we can spawn a new thread.
+        } else if (cant_wait || data->total_threads < pool.max_threads) {
+            // No threads are waiting but we can or must spawn a new thread.
             data->total_threads += 1;
             spawn_new_thread = true;
         }
@@ -274,10 +276,10 @@ int thread_pool_t::perform(void_function_t &&func, void_function_t &&completion)
     return local_thread_count;
 }
 
-int iothread_perform_impl(void_function_t &&func, void_function_t &&completion) {
+int iothread_perform_impl(void_function_t &&func, void_function_t &&completion, bool cant_wait) {
     ASSERT_IS_MAIN_THREAD();
     ASSERT_IS_NOT_FORKED_CHILD();
-    return s_io_thread_pool.perform(std::move(func), std::move(completion));
+    return s_io_thread_pool.perform(std::move(func), std::move(completion), cant_wait);
 }
 
 int iothread_port() { return get_notify_pipes().read; }
diff --git a/src/iothread.h b/src/iothread.h
index ad55b0996..4dd646a78 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -31,7 +31,7 @@ void iothread_service_completion(void);
 int iothread_drain_all(void);
 
 // Internal implementation
-int iothread_perform_impl(std::function<void(void)> &&func, std::function<void(void)> &&completion);
+int iothread_perform_impl(std::function<void(void)> &&func, std::function<void(void)> &&completion, bool cant_wait = false);
 
 // Template helpers
 // This is the glue part of the handler-completion handoff
@@ -75,6 +75,13 @@ inline int iothread_perform(std::function<void(void)> &&func) {
     return iothread_perform_impl(std::move(func), {});
 }
 
+/// Variant of iothread_perform that disrespects the thread limit.
+/// It does its best to spawn a new thread if all other threads are occupied.
+/// This is for cases where deferring a new thread might lead to deadlock.
+inline int iothread_perform_cantwait(std::function<void(void)> &&func) {
+    return iothread_perform_impl(std::move(func), {}, true);
+}
+
 /// Performs a function on the main thread, blocking until it completes.
 void iothread_perform_on_main(std::function<void(void)> &&func);
 

From 1331b32cce4f7f3761f8bfd8f5c91a2a17e99a9e Mon Sep 17 00:00:00 2001
From: Greg Anders <greg@gpanders.com>
Date: Wed, 15 Jan 2020 21:03:05 -0700
Subject: [PATCH 1573/1732] Add Base16 color options to fish_config

---
 CHANGELOG.md                             |  1 +
 share/tools/web_config/js/colorutils.js  | 44 +++++++++++++++++++++++-
 share/tools/web_config/js/controllers.js |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef14858b4..182f7951f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
 - Improvements to the display of wide characters, particularly Korean characters and emoji (#5583, #5729).
 - The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
 - Variables that control background colors (such as `fish_pager_color_search_match`) can now use `--reverse`.
+- Added Base16 color options to `fish_config`
 
 #### Completions
 - Added completions for
diff --git a/share/tools/web_config/js/colorutils.js b/share/tools/web_config/js/colorutils.js
index 4eaf3a6f8..3e7731225 100644
--- a/share/tools/web_config/js/colorutils.js
+++ b/share/tools/web_config/js/colorutils.js
@@ -279,6 +279,28 @@ var TomorrowTheme = {
     }
 }
 
+var Base16Theme = {
+    base16_default_dark: { base00: '181818', base01: '282828', base02: '383838', base03: '585858', base04: 'b8b8b8', base05: 'd8d8d8', base06: 'e8e8e8', base07: 'f8f8f8', base08: 'ab4642', base09: 'dc9656', base0A: 'f7ca88', base0B: 'a1b56c', base0C: '86c1b9', base0D: '7cafc2', base0E: 'ba8baf', base0F: 'a16946' },
+
+    base16_default_light: { base00: 'f8f8f8', base01: 'e8e8e8', base02: 'd8d8d8', base03: 'b8b8b8', base04: '585858', base05: '383838', base06: '282828', base07: '181818', base08: 'ab4642', base09: 'dc9656', base0A: 'f7ca88', base0B: 'a1b56c', base0C: '86c1b9', base0D: '7cafc2', base0E: 'ba8baf', base0F: 'a16946' },
+
+    base16_eighties: { base00: '2d2d2d', base01: '393939', base02: '515151', base03: '747369', base04: 'a09f93', base05: 'd3d0c8', base06: 'e8e6df', base07: 'f2f0ec', base08: 'f2777a', base09: 'f99157', base0A: 'ffcc66', base0B: '99cc99', base0C: '66cccc', base0D: '6699cc', base0E: 'cc99cc', base0F: 'd27b53' },
+
+    apply: function(theme, receiver) {
+        receiver['autosuggestion'] = theme.base03
+        receiver['command'] = theme.base0B
+        receiver['comment'] = theme.base0A
+        receiver['end'] = theme.base0E
+        receiver['error'] = theme.base08
+        receiver['param'] = theme.base05
+        receiver['quote'] = theme.base0A
+        receiver['redirection'] = theme.base05
+
+        receiver['colors'] = []
+        for (var key in theme) receiver['colors'].push(theme[key])
+    },
+}
+
 var nord = {
     nord0: '2e3440',
     nord1: '3b4252',
@@ -384,10 +406,30 @@ var color_scheme_tomorrow_night_bright = {
     'name': 'Tomorrow Night Bright',
     'preferred_background': 'black',
     'url': 'https://github.com/chriskempson/tomorrow-theme',
-
 }
 TomorrowTheme.apply(TomorrowTheme.tomorrow_night_bright, color_scheme_tomorrow_night_bright)
 
+var color_scheme_base16_default_dark = {
+    name: 'Base16 Default Dark',
+    preferred_background: Base16Theme.base16_default_dark.base00,
+    url: 'https://github.com/chriskempson/base16-default-schemes',
+}
+Base16Theme.apply(Base16Theme.base16_default_dark, color_scheme_base16_default_dark)
+
+var color_scheme_base16_default_light = {
+    name: 'Base16 Default Light',
+    preferred_background: Base16Theme.base16_default_light.base00,
+    url: 'https://github.com/chriskempson/base16-default-schemes',
+}
+Base16Theme.apply(Base16Theme.base16_default_light, color_scheme_base16_default_light)
+
+var color_scheme_base16_eighties = {
+    name: 'Base16 Eighties',
+    preferred_background: Base16Theme.base16_eighties.base00,
+    url: 'https://github.com/chriskempson/base16-default-schemes',
+}
+Base16Theme.apply(Base16Theme.base16_eighties, color_scheme_base16_eighties)
+
 function construct_scheme_analogous(label, background, color_list) {
     return {
         name: label,
diff --git a/share/tools/web_config/js/controllers.js b/share/tools/web_config/js/controllers.js
index f1efb7d39..c11fc6ff6 100644
--- a/share/tools/web_config/js/controllers.js
+++ b/share/tools/web_config/js/controllers.js
@@ -77,7 +77,7 @@ controllers.controller("colorsController", function($scope, $http) {
     $scope.sampleTerminalBackgroundColors = ['white', '#' + solarized.base3, '#300', '#003', '#' + solarized.base03, '#232323', '#'+nord.nord0, 'black'];
 
     /* Array of FishColorSchemes */
-    $scope.colorSchemes = [color_scheme_fish_default, color_scheme_solarized_light, color_scheme_solarized_dark, color_scheme_tomorrow, color_scheme_tomorrow_night, color_scheme_tomorrow_night_bright, color_scheme_nord];
+    $scope.colorSchemes = [color_scheme_fish_default, color_scheme_solarized_light, color_scheme_solarized_dark, color_scheme_tomorrow, color_scheme_tomorrow_night, color_scheme_tomorrow_night_bright, color_scheme_nord, color_scheme_base16_default_dark, color_scheme_base16_default_light, color_scheme_base16_eighties];
     for (var i=0; i < additional_color_schemes.length; i++)
         $scope.colorSchemes.push(additional_color_schemes[i])
 

From e143618aefc6b60f69ad87279711d6e97ca0edc4 Mon Sep 17 00:00:00 2001
From: Greg Anders <greg@gpanders.com>
Date: Wed, 15 Jan 2020 21:28:24 -0700
Subject: [PATCH 1574/1732] Set base16 colors for operator, escape, and match

---
 share/tools/web_config/js/colorutils.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/tools/web_config/js/colorutils.js b/share/tools/web_config/js/colorutils.js
index 3e7731225..bdcb17081 100644
--- a/share/tools/web_config/js/colorutils.js
+++ b/share/tools/web_config/js/colorutils.js
@@ -293,8 +293,11 @@ var Base16Theme = {
         receiver['end'] = theme.base0E
         receiver['error'] = theme.base08
         receiver['param'] = theme.base05
+        receiver['operator'] = theme.base0D
+        receiver['escape'] = theme.base0C
         receiver['quote'] = theme.base0A
         receiver['redirection'] = theme.base05
+        receiver['match'] = theme.base0D
 
         receiver['colors'] = []
         for (var key in theme) receiver['colors'].push(theme[key])

From e34e5d88db715029fd1330a5086c79101f46b554 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 18 Jan 2020 12:26:25 -0800
Subject: [PATCH 1575/1732] Remove Base16 mention from CHANGELOG

It's not in 3.1.0.
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 182f7951f..ef14858b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,7 +134,6 @@
 - Improvements to the display of wide characters, particularly Korean characters and emoji (#5583, #5729).
 - The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
 - Variables that control background colors (such as `fish_pager_color_search_match`) can now use `--reverse`.
-- Added Base16 color options to `fish_config`
 
 #### Completions
 - Added completions for

From f04536637dc20324dfa87088fd453f9af025cb02 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Thu, 16 Jan 2020 15:09:19 +0900
Subject: [PATCH 1576/1732] Add `keepassxc-cli` completions

---
 share/completions/keepassxc-cli.fish | 87 ++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 share/completions/keepassxc-cli.fish

diff --git a/share/completions/keepassxc-cli.fish b/share/completions/keepassxc-cli.fish
new file mode 100644
index 000000000..57e01bb95
--- /dev/null
+++ b/share/completions/keepassxc-cli.fish
@@ -0,0 +1,87 @@
+# Completions for keepassxc-cli
+
+# General options
+complete -c keepassxc-cli -l debug-info -d "Show debug info"
+complete -r -c keepassxc-cli -s k -l key-file -d "Specify a key file"
+complete -c keepassxc-cli -l no-password -d "Deactivate the password key"
+complete -r -c keepassxc-cli -s y -l yubikey -d "Specify a yubikey slot"
+complete -r -c keepassxc-cli -s q -l quiet -d "Be quiet"
+complete -c keepassxc-cli -s h -l help -d "Show help info"
+complete -c keepassxc-cli -s v -l version -d "Show version info"
+
+# Commands
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a add -d "Add a new entry"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a analyze -d "Analyze password for weakness and problem"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a clip -d "Copy an entry's password to the clipboard"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a close -d "Close the currently opened database"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a create -d "Create new database"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a diceware -d "Generate a new random diceware passphrase"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a edit -d "Edit an entry"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a estimate -d "Estimate the entropy of a password"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a exit -d "Exit interactive mode"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a export -d "Export the contents to stdout"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a generate -d "Generate a new password"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a help -d "Show command help"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a import -d "Import the contents"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a locate -d "Find entries quickly"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a ls -d "List database entries"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a merge -d "Merge two databases"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a mkdir -d "Add a new group"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a mv -d "Move an entry"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a open -d "Open a database"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a quit -d "Exit interactive mode"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a rm -d "Remove an entry"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a rmdir -d "Remove a group"
+complete -f -c keepassxc-cli -n "__fish_use_subcommand" -a show -d "Show an entry's info"
+
+## Merge options
+complete -r -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -s d -l dry-run -d "Dry run"
+complete -r -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -l key-file-from -d "Key file to merge from"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -l no-password-from -d "Deactivate the password key to merge from"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -l yubikey-from -d "Yubikey slot for the second database"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from merge" -s s -l same-credentials -d "Use the same credentials for both databases"
+
+## Add and edit options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from add edit" -s u -l username -d "Username for the entry"
+complete -f -c keepassxc-cli -n "__fish_seen_subcommand_from add edit" -l url -d "URL for the entry"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from add edit" -p u -l password-prompt -d "Prompt for the entry's password"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from add edit" -s g -l generate -d "Generate a password for the entry"
+
+## Edit options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from edit" -s t -l title -d "Title for the entry"
+
+## Estimate options
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from estimate" -s a -l advanced -d "Perform advanced analysis on the password"
+
+## Analyze options
+complete -r -c keepassxc-cli -n "__fish_seen_subcommand_from analyze" -s H -l hibp -d "Check if any passwords have been publicly leaked"
+
+## Clip options
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from clip" -s t -l totp -d "Copy the current TOTP to the clipboard"
+
+## Show options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from show" -s a -l attributes -d "Names of the attributes to show"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from show" -s s -l show-protected -d "Show the protected attributes in clear text"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from show" -s t -l totp -d "Show the entry's current TOTP"
+
+## Diceware options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from diceware" -s W -l words -d "Word count for the diceware passphrase"
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from diceware" -s w -l word-list -d "Wordlist for the diceware generator"
+
+## Export options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from export" -s f -l format -a "xml csv" -d "Format to use when exporting"
+
+## List options
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from ls" -s R -l recursive -d "Recursively list the elements of the group"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from ls" -s f -l flatten -d "Flattens the output to single line"
+
+## Generate options
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s L -l length -d "Length of the generated password"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s l -l lower -d "Use lowercase chars"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s U -l upper -d "Use uppercase chars"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s n -l numeric -d "Use numbers"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s s -l special -d "Use special chars"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s e -l extended -d "Use extended ASCII"
+complete -x -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -s x -l exclude -d "Exclude char set"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -l exclude-similar -d "Exclude similar looking chars"
+complete -c keepassxc-cli -n "__fish_seen_subcommand_from generate" -l every-group -d "Include chars from every selected group"

From d972623191e9e55fa8cbdaaafe288370cdbbad7c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 09:21:53 +0100
Subject: [PATCH 1577/1732] Fix vendor paths without $XDG_DATA_DIRS

We'd use $__fish_data_dir, but that already had the "/fish" component,
and then we'd add it again later, so we would try to find vendor
functions in places like

/usr/share/fish/fish/vendor_functions.d

which obviously don't exist.

Instead let's add the "/fish" component to the xdg dirs early, which
also saves us from having to repeat it later.

Fixes #6428
See #6508

[ci skip]
---
 share/config.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index 15fded78b..400556832 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -71,14 +71,14 @@ end
 set -l xdg_data_dirs
 if set -q XDG_DATA_DIRS
     set --path xdg_data_dirs $XDG_DATA_DIRS
-    set xdg_data_dirs (string replace -r '([^/])/$' '$1' -- $xdg_data_dirs)
+    set xdg_data_dirs (string replace -r '([^/])/$' '$1' -- $xdg_data_dirs)/fish
 else
     set xdg_data_dirs $__fish_data_dir
 end
 
-set -l vendor_completionsdirs $xdg_data_dirs/fish/vendor_completions.d
-set -l vendor_functionsdirs $xdg_data_dirs/fish/vendor_functions.d
-set -l vendor_confdirs $xdg_data_dirs/fish/vendor_conf.d
+set -l vendor_completionsdirs $xdg_data_dirs/vendor_completions.d
+set -l vendor_functionsdirs $xdg_data_dirs/vendor_functions.d
+set -l vendor_confdirs $xdg_data_dirs/vendor_conf.d
 
 # Ensure that extra directories are always included.
 if not contains -- $__extra_completionsdir $vendor_completionsdirs

From 0e5846ee38a4b25d844bb29d828f4ad965f990f1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:28:21 +0100
Subject: [PATCH 1578/1732] completions/fish: Rename debug-level

This was renamed to just "--debug", but missed in the completions.

See #5910

[ci skip]
---
 share/completions/fish.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/fish.fish b/share/completions/fish.fish
index 603aadfe2..e70d2ad05 100644
--- a/share/completions/fish.fish
+++ b/share/completions/fish.fish
@@ -6,7 +6,7 @@ complete -c fish -s n -l no-execute -d "Only parse input, do not execute"
 complete -c fish -s i -l interactive -d "Run in interactive mode"
 complete -c fish -s l -l login -d "Run as a login shell"
 complete -c fish -s p -l profile -d "Output profiling information to specified file" -r
-complete -c fish -s d -l debug-level -d "Specify verbosity level" -x -a "0\t'Warnings silenced'
+complete -c fish -s d -l debug -d "Specify verbosity level" -x -a "0\t'Warnings silenced'
 1\t'Default'
 2\t'Basic debug output'
 3\t'More debug output'

From 384f18a51c138a6786349637de89902d7ee8a270 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:31:25 +0100
Subject: [PATCH 1579/1732] Remove last remaining debug(0)

Replace with FLOGF.
---
 src/common.cpp | 2 +-
 src/reader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 3fd2da590..3ede77e2c 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -184,7 +184,7 @@ bool is_windows_subsystem_for_linux() {
                 // is bypassed. We intentionally do not include this in the error message because
                 // it'll only allow fish to run but not to actually work. Here be dragons!
                 if (getenv("FISH_NO_WSL_CHECK") == nullptr) {
-                    debug(0,
+                    FLOGF(error,
                           "This version of WSL has known bugs that prevent fish from working."
                           "Please upgrade to Windows 10 1809 (17763) or higher to use fish!");
                 }
diff --git a/src/reader.cpp b/src/reader.cpp
index 62c7d4938..3cf7a7654 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3514,7 +3514,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
                     clearerr(in_stream);
                 } else {
                     // Fatal error.
-                    debug(0, _(L"Unable to read input file: %s"), strerror(errno));
+                    FLOGF(error, _(L"Unable to read input file: %s"), strerror(errno));
                     // Reset buffer on error. We won't evaluate incomplete files.
                     acc.clear();
                     break;

From 024e03ab1e2757e41146fdbac7ddab94a55dea3e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:38:47 +0100
Subject: [PATCH 1580/1732] Replace debug(1) with FLOGF(warning)

---
 src/common.cpp               |  8 ++++----
 src/env_dispatch.cpp         | 14 +++++++-------
 src/env_universal_common.cpp | 16 ++++++++--------
 src/exec.cpp                 |  6 +++---
 src/fish.cpp                 |  4 ++--
 src/fish_indent.cpp          |  3 ++-
 src/flog.h                   |  2 ++
 src/history.cpp              |  2 +-
 src/io.cpp                   |  8 ++++----
 src/io.h                     |  1 +
 src/output.cpp               |  2 +-
 src/parser.cpp               |  2 +-
 src/path.cpp                 |  2 +-
 src/proc.cpp                 | 10 +++++-----
 src/reader.cpp               | 14 +++++++-------
 15 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 3ede77e2c..1e3feac5b 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1777,8 +1777,8 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
 #ifdef HAVE_WINSIZE
         // Highly hackish. This seems like it should be moved.
         if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
-            debug(1, _(L"Current terminal parameters have rows and/or columns set to zero."));
-            debug(1, _(L"The stty command can be used to correct this "
+            FLOGF(warning, _(L"Current terminal parameters have rows and/or columns set to zero."));
+            FLOGF(warning, _(L"The stty command can be used to correct this "
                        L"(e.g., stty rows 80 columns 24)."));
         }
 #endif
@@ -1801,8 +1801,8 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
     if (new_termsize->ws_col < MIN_TERM_COL || new_termsize->ws_row < MIN_TERM_ROW) {
         // Also highly hackisk.
         if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
-            debug(1, _(L"Current terminal parameters set terminal size to unreasonable value."));
-            debug(1, _(L"Defaulting terminal size to 80x24."));
+            FLOGF(warning, _(L"Current terminal parameters set terminal size to unreasonable value."));
+            FLOGF(warning, _(L"Defaulting terminal size to 80x24."));
         }
         new_termsize->ws_col = DFLT_TERM_COL;
         new_termsize->ws_row = DFLT_TERM_ROW;
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 41ce0cf62..5d26a6b41 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -277,7 +277,7 @@ static void handle_read_limit_change(const environment_t &vars) {
     if (!read_byte_limit_var.missing_or_empty()) {
         size_t limit = fish_wcstoull(read_byte_limit_var->as_string().c_str());
         if (errno) {
-            debug(1, "Ignoring fish_read_limit since it is not valid");
+            FLOGF(warning, "Ignoring fish_read_limit since it is not valid");
         } else {
             read_byte_limit = limit;
         }
@@ -395,12 +395,12 @@ static bool initialize_curses_using_fallback(const char *term) {
     if (term_env == DEFAULT_TERM1 || term_env == DEFAULT_TERM2) return false;
 
     if (session_interactivity() != session_interactivity_t::not_interactive)
-        debug(1, _(L"Using fallback terminal type '%s'."), term);
+        FLOGF(warning, _(L"Using fallback terminal type '%s'."), term);
 
     int err_ret;
     if (setupterm(const_cast<char *>(term), STDOUT_FILENO, &err_ret) == OK) return true;
     if (session_interactivity() != session_interactivity_t::not_interactive) {
-        debug(1, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
+        FLOGF(warning, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
     }
     return false;
 }
@@ -459,12 +459,12 @@ static void init_curses(const environment_t &vars) {
     if (setupterm(nullptr, STDOUT_FILENO, &err_ret) == ERR) {
         auto term = vars.get(L"TERM");
         if (session_interactivity() != session_interactivity_t::not_interactive) {
-            debug(1, _(L"Could not set up terminal."));
+            FLOGF(warning, _(L"Could not set up terminal."));
             if (term.missing_or_empty()) {
-                debug(1, _(L"TERM environment variable not set."));
+                FLOGF(warning, _(L"TERM environment variable not set."));
             } else {
-                debug(1, _(L"TERM environment variable set to '%ls'."), term->as_string().c_str());
-                debug(1, _(L"Check that this terminal type is supported on this system."));
+                FLOGF(warning, _(L"TERM environment variable set to '%ls'."), term->as_string().c_str());
+                FLOGF(warning, _(L"Check that this terminal type is supported on this system."));
             }
         }
 
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 8c5885b96..d8860cbd6 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -554,7 +554,7 @@ bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *o
 static bool check_duration(double start_time) {
     double duration = timef() - start_time;
     if (duration > 0.25) {
-        debug(1, _(L"Locking the universal var file took too long (%.3f seconds)."), duration);
+        FLOGF(warning, _(L"Locking the universal var file took too long (%.3f seconds)."), duration);
         return false;
     }
     return true;
@@ -902,7 +902,7 @@ void env_universal_t::parse_message_30_internal(const wcstring &msgstr, var_tabl
 
     const wchar_t *cursor = msg;
     if (!match(&cursor, f3::SETUVAR)) {
-        debug(1, PARSE_ERR, msg);
+        FLOGF(warning, PARSE_ERR, msg);
         return;
     }
     // Parse out flags.
@@ -922,7 +922,7 @@ void env_universal_t::parse_message_30_internal(const wcstring &msgstr, var_tabl
 
     // Populate the variable with these flags.
     if (!populate_1_variable(cursor, flags, vars, storage)) {
-        debug(1, PARSE_ERR, msg);
+        FLOGF(warning, PARSE_ERR, msg);
     }
 }
 
@@ -942,12 +942,12 @@ void env_universal_t::parse_message_2x_internal(const wcstring &msgstr, var_tabl
     } else if (match(&cursor, f2x::SET)) {
         flags |= 0;
     } else {
-        debug(1, PARSE_ERR, msg);
+        FLOGF(warning, PARSE_ERR, msg);
         return;
     }
 
     if (!populate_1_variable(cursor, flags, vars, storage)) {
-        debug(1, PARSE_ERR, msg);
+        FLOGF(warning, PARSE_ERR, msg);
     }
 }
 
@@ -1216,8 +1216,8 @@ class universal_notifier_notifyd_t : public universal_notifier_t {
         uint32_t status =
             notify_register_file_descriptor(name.c_str(), &this->notify_fd, 0, &this->token);
         if (status != NOTIFY_STATUS_OK) {
-            debug(1, "notify_register_file_descriptor() failed with status %u.", status);
-            debug(1, "Universal variable notifications may not be received.");
+            FLOGF(warning, "notify_register_file_descriptor() failed with status %u.", status);
+            FLOGF(warning, "Universal variable notifications may not be received.");
         }
         if (this->notify_fd >= 0) {
             // Mark us for non-blocking reads, and CLO_EXEC.
@@ -1265,7 +1265,7 @@ class universal_notifier_notifyd_t : public universal_notifier_t {
     void post_notification() {
         uint32_t status = notify_post(name.c_str());
         if (status != NOTIFY_STATUS_OK) {
-            debug(1, "notify_post() failed with status %u. Uvar notifications may not be sent.",
+            FLOGF(warning, "notify_post() failed with status %u. Uvar notifications may not be sent.",
                   status);
         }
     }
diff --git a/src/exec.cpp b/src/exec.cpp
index 304b5a287..026bfa4ef 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -66,7 +66,7 @@ void exec_close(int fd) {
 
     while (close(fd) == -1) {
         if (errno != EINTR) {
-            debug(1, FD_ERROR, fd);
+            FLOGF(warning, FD_ERROR, fd);
             wperror(L"close");
             break;
         }
@@ -364,7 +364,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
     }
 
     if (pid < 0) {
-        debug(1, L"Failed to fork %s!\n", fork_type);
+        FLOGF(warning, L"Failed to fork %s!\n", fork_type);
         job_mark_process_as_failed(job, p);
         return false;
     }
@@ -1073,7 +1073,7 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         if (!p->is_last_in_job) {
             auto pipes = make_autoclose_pipes(conflicts);
             if (!pipes) {
-                debug(1, PIPE_ERROR);
+                FLOGF(warning, PIPE_ERROR);
                 wperror(L"pipe");
                 job_mark_process_as_failed(j, p.get());
                 exec_error = true;
diff --git a/src/fish.cpp b/src/fish.cpp
index 57573a25d..72965610f 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -438,7 +438,7 @@ int main(int argc, char **argv) {
 
     // No-exec is prohibited when in interactive mode.
     if (opts.is_interactive_session && opts.no_exec) {
-        debug(1, _(L"Can not use the no-execute mode when running an interactive session"));
+        FLOGF(warning, _(L"Can not use the no-execute mode when running an interactive session"));
         opts.no_exec = false;
     }
 
@@ -513,7 +513,7 @@ int main(int argc, char **argv) {
                                                            intern(rel_filename.c_str())};
                 res = reader_read(parser, fd, {});
                 if (res) {
-                    debug(1, _(L"Error while reading file %ls\n"),
+                    FLOGF(warning, _(L"Error while reading file %ls\n"),
                           ld.current_filename ? ld.current_filename : _(L"Standard input"));
                 }
             }
diff --git a/src/fish_indent.cpp b/src/fish_indent.cpp
index 35a2546b0..dbf496cc7 100644
--- a/src/fish_indent.cpp
+++ b/src/fish_indent.cpp
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #include "common.h"
 #include "env.h"
 #include "fish_version.h"
+#include "flog.h"
 #include "highlight.h"
 #include "operation_context.h"
 #include "output.h"
@@ -64,7 +65,7 @@ static wcstring read_file(FILE *f) {
                     // Illegal byte sequence. Try to skip past it.
                     clearerr(f);
                     int ch = fgetc(f);  // for printing the warning, and seeks forward 1 byte.
-                    debug(1, "%s (byte=%X)", std::strerror(errno), ch);
+                    FLOGF(warning, "%s (byte=%X)", std::strerror(errno), ch);
                     ret = 1;
                     continue;
                 } else {
diff --git a/src/flog.h b/src/flog.h
index 9c478fe28..7f61d2988 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -51,6 +51,8 @@ class category_list_t {
 
     category_t debug{L"debug", L"Debugging aid (on by default)", true};
 
+    category_t warning{L"warning", L"Warnings (on by default)", true};
+
     category_t exec_job_status{L"exec-job-status", L"Jobs changing status"};
 
     category_t exec_job_exec{L"exec-job-exec", L"Jobs being executed"};
diff --git a/src/history.cpp b/src/history.cpp
index 9c53de01a..89fbd199f 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -131,7 +131,7 @@ static bool history_file_lock(int fd, int lock_type) {
     int retval = flock(fd, lock_type);
     double duration = timef() - start_time;
     if (duration > 0.25) {
-        debug(1, _(L"Locking the history file took too long (%.3f seconds)."), duration);
+        FLOGF(warning, _(L"Locking the history file took too long (%.3f seconds)."), duration);
         // we've decided to stop doing any locking behavior
         // but make sure we don't leave the file locked!
         if (retval == 0 && lock_type != LOCK_UN) {
diff --git a/src/io.cpp b/src/io.cpp
index a28f61010..ed241237b 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -185,7 +185,7 @@ shared_ptr<io_bufferfill_t> io_bufferfill_t::create(const fd_set_t &conflicts,
     // because our fillthread needs to poll to decide if it should shut down, and also accept input
     // from direct buffer transfers.
     if (make_fd_nonblocking(pipes->read.fd())) {
-        debug(1, PIPE_ERROR);
+        FLOGF(warning, PIPE_ERROR);
         wperror(L"fcntl");
         return nullptr;
     }
@@ -254,9 +254,9 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
                 autoclose_fd_t file{wopen_cloexec(path, oflags, OPEN_MASK)};
                 if (!file.valid()) {
                     if ((oflags & O_EXCL) && (errno == EEXIST)) {
-                        debug(1, NOCLOB_ERROR, spec.target.c_str());
+                        FLOGF(warning, NOCLOB_ERROR, spec.target.c_str());
                     } else {
-                        debug(1, FILE_ERROR, spec.target.c_str());
+                        FLOGF(warning, FILE_ERROR, spec.target.c_str());
                         if (should_debug(1)) wperror(L"open");
                     }
                     return false;
@@ -321,7 +321,7 @@ maybe_t<autoclose_pipes_t> make_autoclose_pipes(const fd_set_t &fdset) {
     int pipes[2] = {-1, -1};
 
     if (pipe(pipes) < 0) {
-        debug(1, PIPE_ERROR);
+        FLOGF(warning, PIPE_ERROR);
         wperror(L"pipe");
         return none();
     }
diff --git a/src/io.h b/src/io.h
index 7503b664e..51c996d6a 100644
--- a/src/io.h
+++ b/src/io.h
@@ -14,6 +14,7 @@
 
 #include "common.h"
 #include "env.h"
+#include "flog.h"
 #include "global_safety.h"
 #include "maybe.h"
 #include "redirection.h"
diff --git a/src/output.cpp b/src/output.cpp
index 501d3ecd3..b646b3076 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -404,7 +404,7 @@ void outputter_t::writestr(const wchar_t *str) {
 
     size_t len = wcstombs(nullptr, str, 0);  // figure amount of space needed
     if (len == static_cast<size_t>(-1)) {
-        debug(1, L"Tried to print invalid wide character string");
+        FLOGF(warning, L"Tried to print invalid wide character string");
         return;
     }
 
diff --git a/src/parser.cpp b/src/parser.cpp
index 381b8ac06..c55d54dd8 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -291,7 +291,7 @@ void parser_t::emit_profiling(const char *path) const {
     // dying (and hence will not fork).
     FILE *f = fopen(path, "w");
     if (!f) {
-        debug(1, _(L"Could not write profiling information to file '%s'"), path);
+        FLOGF(warning, _(L"Could not write profiling information to file '%s'"), path);
     } else {
         if (std::fwprintf(f, _(L"Time\tSum\tCommand\n"), profile_items.size()) < 0) {
             wperror(L"fwprintf");
diff --git a/src/path.cpp b/src/path.cpp
index 3e2995103..a6271adaa 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -107,7 +107,7 @@ static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
                     break;
                 }
                 default: {
-                    debug(1, MISSING_COMMAND_ERR_MSG, next_path.c_str());
+                    FLOGF(warning, MISSING_COMMAND_ERR_MSG, next_path.c_str());
                     wperror(L"access");
                     break;
                 }
diff --git a/src/proc.cpp b/src/proc.cpp
index c20e543a3..c018dbae1 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -743,7 +743,7 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 if (errno == ENOTTY) {
                     redirect_tty_output();
                 }
-                debug(1, _(L"Could not send job %d ('%ls') with pgid %d to foreground"),
+                FLOGF(warning, _(L"Could not send job %d ('%ls') with pgid %d to foreground"),
                       j->job_id(), j->command_wcstr(), j->pgid);
                 wperror(L"tcsetpgrp");
                 return error;
@@ -771,7 +771,7 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 redirect_tty_output();
             }
 
-            debug(1, _(L"Could not send job %d ('%ls') to foreground"), j->job_id(),
+            FLOGF(warning, _(L"Could not send job %d ('%ls') to foreground"), j->job_id(),
                   j->preview().c_str());
             wperror(L"tcsetattr");
             return error;
@@ -804,7 +804,7 @@ static bool terminal_return_from_job(job_t *j, int restore_attrs) {
 
     if (tcsetpgrp(STDIN_FILENO, getpgrp()) == -1) {
         if (errno == ENOTTY) redirect_tty_output();
-        debug(1, _(L"Could not return shell to foreground"));
+        FLOGF(warning, _(L"Could not return shell to foreground"));
         wperror(L"tcsetpgrp");
         return false;
     }
@@ -812,7 +812,7 @@ static bool terminal_return_from_job(job_t *j, int restore_attrs) {
     // Save jobs terminal modes.
     if (tcgetattr(STDIN_FILENO, &j->tmodes)) {
         if (errno == EIO) redirect_tty_output();
-        debug(1, _(L"Could not return shell to foreground"));
+        FLOGF(warning, _(L"Could not return shell to foreground"));
         wperror(L"tcgetattr");
         return false;
     }
@@ -823,7 +823,7 @@ static bool terminal_return_from_job(job_t *j, int restore_attrs) {
     if (restore_attrs) {
         if (tcsetattr(STDIN_FILENO, TCSADRAIN, &shell_modes) == -1) {
             if (errno == EIO) redirect_tty_output();
-            debug(1, _(L"Could not return shell to foreground"));
+            FLOGF(warning, _(L"Could not return shell to foreground"));
             wperror(L"tcsetattr");
             return false;
         }
diff --git a/src/reader.cpp b/src/reader.cpp
index 3cf7a7654..a7b0468ff 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -529,7 +529,7 @@ static void term_donate(outputter_t &outp) {
         if (tcsetattr(STDIN_FILENO, TCSANOW, &tty_modes_for_external_cmds) == -1) {
             if (errno == EIO) redirect_tty_output();
             if (errno != EINTR) {
-                debug(1, _(L"Could not set terminal mode for new job"));
+                FLOGF(warning, _(L"Could not set terminal mode for new job"));
                 wperror(L"tcsetattr");
                 break;
             }
@@ -544,7 +544,7 @@ static void term_steal() {
         if (tcsetattr(STDIN_FILENO, TCSANOW, &shell_modes) == -1) {
             if (errno == EIO) redirect_tty_output();
             if (errno != EINTR) {
-                debug(1, _(L"Could not set terminal mode for shell"));
+                FLOGF(warning, _(L"Could not set terminal mode for shell"));
                 perror("tcsetattr");
                 break;
             }
@@ -1736,7 +1736,7 @@ static void reader_interactive_init(parser_t &parser) {
                 }
                 // No TTY, cannot be interactive?
                 redirect_tty_output();
-                debug(1, _(L"No TTY for interactive shell (tcgetpgrp failed)"));
+                FLOGF(warning, _(L"No TTY for interactive shell (tcgetpgrp failed)"));
                 wperror(L"setpgid");
                 exit_without_destructors(1);
             }
@@ -1748,7 +1748,7 @@ static void reader_interactive_init(parser_t &parser) {
                     const wchar_t *fmt =
                         _(L"I appear to be an orphaned process, so I am quitting politely. "
                           L"My pid is %d.");
-                    debug(1, fmt, (int)getpid());
+                    FLOGF(warning, fmt, (int)getpid());
                     exit_without_destructors(1);
                 }
 
@@ -1797,7 +1797,7 @@ static void reader_interactive_init(parser_t &parser) {
             if (errno == EIO) {
                 redirect_tty_output();
             }
-            debug(1, _(L"Failed to set startup terminal mode!"));
+            FLOGF(warning, _(L"Failed to set startup terminal mode!"));
             wperror(L"tcsetattr");
         }
     }
@@ -3528,7 +3528,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
         acc.clear();
 
         if (fclose(in_stream)) {
-            debug(1, _(L"Error while closing input stream"));
+            FLOGF(warning, _(L"Error while closing input stream"));
             wperror(L"fclose");
             res = 1;
         }
@@ -3550,7 +3550,7 @@ static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
             res = 1;
         }
     } else {
-        debug(1, _(L"Error while opening input stream"));
+        FLOGF(warning, _(L"Error while opening input stream"));
         wperror(L"fdopen");
         res = 1;
     }

From 4e0ec080e33d3a00212430501f643c8db1cbcce0 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:39:23 +0100
Subject: [PATCH 1581/1732] Add flog category for terminal support

This is meant to show messages related to what a terminal supports.

In particular which color or emoji it can handle.
---
 src/env_dispatch.cpp | 24 ++++++++++++------------
 src/flog.h           |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 5d26a6b41..25927e2c5 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -152,7 +152,7 @@ static void guess_emoji_width(const environment_t &vars) {
     if (auto width_str = vars.get(L"fish_emoji_width")) {
         int new_width = fish_wcstol(width_str->as_string().c_str());
         g_fish_emoji_width = std::max(0, new_width);
-        debug(2, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
+        FLOGF(term_support, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
         return;
     }
 
@@ -170,18 +170,18 @@ static void guess_emoji_width(const environment_t &vars) {
     if (term == L"Apple_Terminal" && version >= 400) {
         // Apple Terminal on High Sierra
         g_guessed_fish_emoji_width = 2;
-        debug(2, "default emoji width: 2 for %ls", term.c_str());
+        FLOGF(term_support, "default emoji width: 2 for %ls", term.c_str());
     } else if (term == L"iTerm.app") {
         // iTerm2 defaults to Unicode 8 sizes.
         // See https://gitlab.com/gnachman/iterm2/wikis/unicodeversionswitching
         g_guessed_fish_emoji_width = 1;
-        debug(2, "default emoji width: 1");
+        FLOGF(term_support, "default emoji width: 1");
     } else {
         // Default to whatever system wcwidth says to U+1F603,
         // but only if it's at least 1.
         int w = wcwidth(L'😃');
         g_guessed_fish_emoji_width = w > 0 ? w : 1;
-        debug(2, "default emoji width: %d", g_guessed_fish_emoji_width);
+        FLOGF(term_support, "default emoji width: %d", g_guessed_fish_emoji_width);
     }
 }
 
@@ -338,11 +338,11 @@ static void update_fish_color_support(const environment_t &vars) {
     if (auto fish_term256 = vars.get(L"fish_term256")) {
         // $fish_term256
         support_term256 = bool_from_string(fish_term256->as_string());
-        debug(2, L"256 color support determined by '$fish_term256'");
+        FLOGF(term_support, L"256 color support determined by '$fish_term256'");
     } else if (term.find(L"256color") != wcstring::npos) {
         // TERM is *256color*: 256 colors explicitly supported
         support_term256 = true;
-        debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
+        FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
     } else if (term.find(L"xterm") != wcstring::npos) {
         // Assume that all 'xterm's can handle 256, except for Terminal.app from Snow Leopard
         wcstring term_program;
@@ -352,23 +352,23 @@ static void update_fish_color_support(const environment_t &vars) {
                 fish_wcstod(tpv->as_string().c_str(), nullptr) > 299) {
                 // OS X Lion is version 299+, it has 256 color support (see github Wiki)
                 support_term256 = true;
-                debug(2, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
+                FLOGF(term_support, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
             } else {
                 support_term256 = true;
-                debug(2, L"256 color support enabled for TERM=%ls", term.c_str());
+                FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
             }
         }
     } else if (cur_term != nullptr) {
         // See if terminfo happens to identify 256 colors
         support_term256 = (max_colors >= 256);
-        debug(2, L"256 color support: %d colors per terminfo entry for %ls", max_colors,
+        FLOGF(term_support, L"256 color support: %d colors per terminfo entry for %ls", max_colors,
               term.c_str());
     }
 
     // Handle $fish_term24bit
     if (auto fish_term24bit = vars.get(L"fish_term24bit")) {
         support_term24bit = bool_from_string(fish_term24bit->as_string());
-        debug(2, L"'fish_term24bit' preference: 24-bit color %ls",
+        FLOGF(term_support, L"'fish_term24bit' preference: 24-bit color %ls",
               support_term24bit ? L"enabled" : L"disabled");
     } else {
         // We don't attempt to infer term24 bit support yet.
@@ -446,11 +446,11 @@ static void init_curses(const environment_t &vars) {
         std::string name = wcs2string(var_name);
         const auto var = vars.get(var_name, ENV_EXPORT);
         if (var.missing_or_empty()) {
-            debug(2, L"curses var %s missing or empty", name.c_str());
+            FLOGF(term_support, L"curses var %s missing or empty", name.c_str());
             unsetenv_lock(name.c_str());
         } else {
             std::string value = wcs2string(var->as_string());
-            debug(2, L"curses var %s='%s'", name.c_str(), value.c_str());
+            FLOGF(term_support, L"curses var %s='%s'", name.c_str(), value.c_str());
             setenv_lock(name.c_str(), value.c_str(), 1);
         }
     }
diff --git a/src/flog.h b/src/flog.h
index 7f61d2988..960d21d77 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -82,6 +82,8 @@ class category_list_t {
     category_t profile_history{L"profile-history", L"History performance measurements"};
 
     category_t iothread{L"iothread", L"Background IO thread events"};
+
+    category_t term_support{L"term-support", L"Terminal feature detection"};
 };
 
 /// The class responsible for logging.

From 14c2c623b4e4d63b0830bad0328725c69627fc3f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:43:33 +0100
Subject: [PATCH 1582/1732] Add flog category for uvar file

This used debug level 5, which means it was basically unusable.
---
 src/env_universal_common.cpp | 27 +++++++++++++--------------
 src/flog.h                   |  2 ++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index d8860cbd6..66155c178 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -382,7 +382,7 @@ void env_universal_t::load_from_fd(int fd, callback_data_list_t &callbacks) {
     // Get the dev / inode.
     const file_id_t current_file = file_id_for_fd(fd);
     if (current_file == last_read_file) {
-        debug(5, L"universal log sync elided based on fstat()");
+        FLOGF(uvar_file, L"universal log sync elided based on fstat()");
     } else {
         // Read a variables table from the file.
         var_table_t new_vars;
@@ -409,14 +409,14 @@ bool env_universal_t::load_from_path(const std::string &path, callback_data_list
     // Check to see if the file is unchanged. We do this again in load_from_fd, but this avoids
     // opening the file unnecessarily.
     if (last_read_file != kInvalidFileID && file_id_for_path(path) == last_read_file) {
-        debug(5, L"universal log sync elided based on fast stat()");
+        FLOGF(uvar_file, L"universal log sync elided based on fast stat()");
         return true;
     }
 
     bool result = false;
     int fd = open_cloexec(path, O_RDONLY);
     if (fd >= 0) {
-        debug(5, L"universal log reading from file");
+        FLOGF(uvar_file, L"universal log reading from file");
         this->load_from_fd(fd, callbacks);
         close(fd);
         result = true;
@@ -638,7 +638,7 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
 // Returns true if modified variables were written, false if not. (There may still be variable
 // changes due to other processes on a false return).
 bool env_universal_t::sync(callback_data_list_t &callbacks) {
-    debug(5, L"universal log sync");
+    FLOGF(uvar_file, L"universal log sync");
     scoped_lock locker(lock);
     // Our saving strategy:
     //
@@ -676,7 +676,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
         // FIXME: Why don't we initialize()?
         auto def_vars_path = default_vars_path();
         if (!def_vars_path) {
-            debug(2, L"No universal variable path available");
+            FLOG(uvar_file, L"No universal variable path available");
             return false;
         }
         explicit_vars_path = *def_vars_path;
@@ -686,7 +686,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
     // If we have no changes, just load.
     if (modified.empty()) {
         this->load_from_path(narrow_vars_path, callbacks);
-        debug(5, L"universal log no modifications");
+        FLOGF(uvar_file, L"universal log no modifications");
         return false;
     }
 
@@ -694,12 +694,12 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
     bool success = true;
     int vars_fd = -1;
 
-    debug(5, L"universal log performing full sync");
+    FLOGF(uvar_file, L"universal log performing full sync");
 
     // Open the file.
     if (success) {
         success = this->open_and_acquire_lock(narrow_vars_path, &vars_fd);
-        if (!success) debug(5, L"universal log open_and_acquire_lock() failed");
+        if (!success) FLOGF(uvar_file, L"universal log open_and_acquire_lock() failed");
     }
 
     // Read from it.
@@ -730,13 +730,13 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
 
     // Open adjacent temporary file.
     bool success = this->open_temporary_file(directory, &private_file_path, &private_fd);
-    if (!success) debug(5, L"universal log open_temporary_file() failed");
+    if (!success) FLOGF(uvar_file, L"universal log open_temporary_file() failed");
 
     // Write to it.
     if (success) {
         assert(private_fd >= 0);
         success = this->write_to_fd(private_fd, private_file_path);
-        if (!success) debug(5, L"universal log write_to_fd() failed");
+        if (!success) FLOGF(uvar_file, L"universal log write_to_fd() failed");
     }
 
     if (success) {
@@ -744,8 +744,8 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
         struct stat sbuf;
         if (wstat(vars_path, &sbuf) >= 0) {
             if (fchown(private_fd, sbuf.st_uid, sbuf.st_gid) == -1)
-                debug(5, L"universal log fchown() failed");
-            if (fchmod(private_fd, sbuf.st_mode) == -1) debug(5, L"universal log fchmod() failed");
+                FLOGF(uvar_file, L"universal log fchown() failed");
+            if (fchmod(private_fd, sbuf.st_mode) == -1) FLOGF(uvar_file, L"universal log fchmod() failed");
         }
 
         // Linux by default stores the mtime with low precision, low enough that updates that occur
@@ -766,7 +766,7 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
 
         // Apply new file.
         success = this->move_new_vars_file_into_place(private_file_path, vars_path);
-        if (!success) debug(5, L"universal log move_new_vars_file_into_place() failed");
+        if (!success) FLOGF(uvar_file, L"universal log move_new_vars_file_into_place() failed");
     }
 
     if (success) {
@@ -933,7 +933,6 @@ void env_universal_t::parse_message_2x_internal(const wcstring &msgstr, var_tabl
     const wchar_t *const msg = msgstr.c_str();
     const wchar_t *cursor = msg;
 
-    // debug(3, L"parse_message( %ls );", msg);
     if (cursor[0] == L'#') return;
 
     env_var_t::env_var_flags_t flags = 0;
diff --git a/src/flog.h b/src/flog.h
index 960d21d77..88ade97df 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -74,6 +74,8 @@ class category_list_t {
 
     category_t env_export{L"env-export", L"Changes to exported variables"};
 
+    category_t uvar_file{L"uvar-file", L"Writing/reading the universal variable store"};
+
     category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};
     category_t char_encoding{L"char-encoding", L"Character encoding issues"};
 

From 6793d3534040d66a0125208544559657f646360c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:47:37 +0100
Subject: [PATCH 1583/1732] Add flog categories for parse-productions

One for usable messages, another for the chatty ones.

Use like `--debug=parse-productions'*'`.
---
 src/flog.h                | 3 +++
 src/parse_productions.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index 88ade97df..bd0bc3b3b 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -59,6 +59,9 @@ class category_list_t {
 
     category_t exec_fork{L"exec-fork", L"Calls to fork()"};
 
+    category_t parse_productions{L"parse-productions", L"Resolving tokens"};
+    category_t parse_productions_chatty{L"parse-productions-chatty", L"Resolving tokens (chatty messages)"};
+
     category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
 
     category_t proc_termowner{L"proc-termowner", L"Terminal ownership events"};
diff --git a/src/parse_productions.cpp b/src/parse_productions.cpp
index 9584ee096..905d67108 100644
--- a/src/parse_productions.cpp
+++ b/src/parse_productions.cpp
@@ -414,7 +414,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
                                                                     const parse_token_t &input2,
                                                                     parse_node_tag_t *out_tag) {
     // this is **extremely** chatty
-    debug(6, L"Resolving production for %ls with input token <%ls>",
+    FLOGF(parse_productions_chatty, L"Resolving production for %ls with input token <%ls>",
           token_type_description(node_type), input1.describe().c_str());
 
     // Fetch the function to resolve the list of productions.
@@ -462,7 +462,7 @@ const production_element_t *parse_productions::production_for_token(parse_token_
 
     const production_element_t *result = resolver(input1, input2, out_tag);
     if (result == nullptr) {
-        debug(5, L"Node type '%ls' has no production for input '%ls' (in %s)",
+        FLOGF(parse_productions, L"Node type '%ls' has no production for input '%ls' (in %s)",
               token_type_description(node_type), input1.describe().c_str(), __FUNCTION__);
     }
 

From 123676075f4f4534ac99cd4e43317c1b6f27c897 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:49:56 +0100
Subject: [PATCH 1584/1732] Add flog category for history *file*

---
 src/flog.h      |  1 +
 src/history.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index bd0bc3b3b..52be62a56 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -83,6 +83,7 @@ class category_list_t {
     category_t char_encoding{L"char-encoding", L"Character encoding issues"};
 
     category_t history{L"history", L"Command history events"};
+    category_t history_file{L"history-file", L"Reading/Writing the history file"};
 
     category_t profile_history{L"profile-history", L"History performance measurements"};
 
diff --git a/src/history.cpp b/src/history.cpp
index 89fbd199f..d9e1600bf 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -718,7 +718,7 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
         err = flush_to_fd(&buffer, dst_fd, 0);
     }
     if (err) {
-        debug(2, L"Error %d when writing to temporary history file", err);
+        FLOGF(history_file, L"Error %d when writing to temporary history file", err);
     }
 
     return err == 0;
@@ -790,7 +790,7 @@ bool history_impl_t::save_internal_via_rewrite() {
             // The file has changed, so we're going to re-read it
             // Truncate our tmp_fd so we can reuse it
             if (ftruncate(tmp_fd, 0) == -1 || lseek(tmp_fd, 0, SEEK_SET) == -1) {
-                debug(2, L"Error %d when truncating temporary history file", errno);
+                FLOGF(history_file, L"Error %d when truncating temporary history file", errno);
             }
         } else {
             // The file is unchanged, or the new file doesn't exist or we can't read it
@@ -804,16 +804,16 @@ bool history_impl_t::save_internal_via_rewrite() {
             struct stat sbuf;
             if (target_fd_after.valid() && fstat(target_fd_after.fd(), &sbuf) >= 0) {
                 if (fchown(tmp_fd, sbuf.st_uid, sbuf.st_gid) == -1) {
-                    debug(2, L"Error %d when changing ownership of history file", errno);
+                    FLOGF(history_file, L"Error %d when changing ownership of history file", errno);
                 }
                 if (fchmod(tmp_fd, sbuf.st_mode) == -1) {
-                    debug(2, L"Error %d when changing mode of history file", errno);
+                    FLOGF(history_file, L"Error %d when changing mode of history file", errno);
                 }
             }
 
             // Slide it into place
             if (wrename(tmp_name, *target_name) == -1) {
-                debug(2, L"Error %d when renaming history file", errno);
+                FLOGF(history_file, L"Error %d when renaming history file", errno);
             }
 
             // We did it
@@ -1081,7 +1081,7 @@ void history_impl_t::populate_from_config_path() {
                 ssize_t written = write(dst_fd.fd(), buf, static_cast<size_t>(size));
                 if (written < 0) {
                     // This message does not have high enough priority to be shown by default.
-                    debug(2, L"Error when writing history file");
+                    FLOGF(history_file, L"Error when writing history file");
                     break;
                 }
             }

From 5da4f7e7c5e2c11b3aac1a8f14d5368bd6c2474a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:53:23 +0100
Subject: [PATCH 1585/1732] Add flog category for config reading

---
 src/fish.cpp | 14 +++++++-------
 src/flog.h   |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 72965610f..7db3ade1d 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -136,13 +136,13 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
     bool done = false;
     std::string exec_path = get_executable_path(argv0);
     if (get_realpath(exec_path)) {
-        debug(2, L"exec_path: '%s', argv[0]: '%s'", exec_path.c_str(), argv0);
+        FLOGF(config, L"exec_path: '%s', argv[0]: '%s'", exec_path.c_str(), argv0);
         // TODO: we should determine program_name from argv0 somewhere in this file
 
 #ifdef CMAKE_BINARY_DIR
         // Detect if we're running right out of the CMAKE build directory
         if (string_prefixes_string(CMAKE_BINARY_DIR, exec_path.c_str())) {
-            debug(2,
+            FLOGF(config,
                   "Running out of build directory, using paths relative to CMAKE_SOURCE_DIR:\n %s",
                   CMAKE_SOURCE_DIR);
 
@@ -163,7 +163,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
             if (has_suffix(exec_path, installed_suffix, false)) {
                 suffix = installed_suffix;
             } else if (has_suffix(exec_path, just_a_fish, false)) {
-                debug(2, L"'fish' not in a 'bin/', trying paths relative to source tree");
+                FLOGF(config, L"'fish' not in a 'bin/', trying paths relative to source tree");
                 suffix = just_a_fish;
             }
 
@@ -194,14 +194,14 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
 
     if (!done) {
         // Fall back to what got compiled in.
-        debug(2, L"Using compiled in paths:");
+        FLOGF(config, L"Using compiled in paths:");
         paths.data = L"" DATADIR "/fish";
         paths.sysconf = L"" SYSCONFDIR "/fish";
         paths.doc = L"" DOCDIR;
         paths.bin = L"" BINDIR;
     }
 
-    debug(2,
+    FLOGF(config,
           L"determine_config_directory_paths() results:\npaths.data: %ls\npaths.sysconf: "
           L"%ls\npaths.doc: %ls\npaths.bin: %ls",
           paths.data.c_str(), paths.sysconf.c_str(), paths.doc.c_str(), paths.bin.c_str());
@@ -221,10 +221,10 @@ static void source_config_in_directory(const wcstring &dir) {
     const wcstring escaped_dir = escape_string(dir, ESCAPE_ALL);
     const wcstring escaped_pathname = escaped_dir + L"/config.fish";
     if (waccess(config_pathname, R_OK) != 0) {
-        debug(2, L"not sourcing %ls (not readable or does not exist)", escaped_pathname.c_str());
+        FLOGF(config, L"not sourcing %ls (not readable or does not exist)", escaped_pathname.c_str());
         return;
     }
-    debug(2, L"sourcing %ls", escaped_pathname.c_str());
+    FLOGF(config, L"sourcing %ls", escaped_pathname.c_str());
 
     const wcstring cmd = L"builtin source " + escaped_pathname;
     parser_t &parser = parser_t::principal_parser();
diff --git a/src/flog.h b/src/flog.h
index 52be62a56..178016af7 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -53,6 +53,8 @@ class category_list_t {
 
     category_t warning{L"warning", L"Warnings (on by default)", true};
 
+    category_t config{L"config", L"Finding and reading configuration"};
+
     category_t exec_job_status{L"exec-job-status", L"Jobs changing status"};
 
     category_t exec_job_exec{L"exec-job-exec", L"Jobs being executed"};

From b09ae82ecf6e84f087d28cce28bb7f360b6c7731 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:54:00 +0100
Subject: [PATCH 1586/1732] Remove a few less useful debug messages

These were level 5, so I'd bet nobody ever saw them
---
 src/intern.cpp | 1 -
 src/path.cpp   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/intern.cpp b/src/intern.cpp
index 53dc61214..07d1d5561 100644
--- a/src/intern.cpp
+++ b/src/intern.cpp
@@ -21,7 +21,6 @@ owning_lock<std::vector<const wchar_t *>> string_table;
 static const wchar_t *intern_with_dup(const wchar_t *in, bool dup) {
     if (!in) return nullptr;
 
-    debug(5, L"intern %ls", in);
     auto table = string_table.acquire();
 
     const wchar_t *result;
diff --git a/src/path.cpp b/src/path.cpp
index a6271adaa..f4b778249 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -35,8 +35,6 @@ const wcstring_list_t dflt_pathsv({L"/bin", L"/usr/bin", PREFIX L"/bin"});
 
 static bool path_get_path_core(const wcstring &cmd, wcstring *out_path,
                                const maybe_t<env_var_t> &bin_path_var) {
-    debug(5, L"path_get_path( '%ls' )", cmd.c_str());
-
     // If the command has a slash, it must be an absolute or relative path and thus we don't bother
     // looking for a matching command.
     if (cmd.find(L'/') != wcstring::npos) {

From 349b9e9dee0f41f03140aaf3a00673ec728e366c Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 13:55:03 +0100
Subject: [PATCH 1587/1732] Remove commented out debugs

---
 src/event.cpp     | 2 --
 src/exec.cpp      | 1 -
 src/expand.cpp    | 7 -------
 src/highlight.cpp | 2 --
 src/postfork.cpp  | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/src/event.cpp b/src/event.cpp
index f3bae6d13..e20d4567e 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -278,8 +278,6 @@ static void event_fire_internal(parser_t &parser, const event_t &event) {
             buffer.append(escape_string(arg, ESCAPE_ALL));
         }
 
-        // debug( 1, L"Event handler fires command '%ls'", buffer.c_str() );
-
         // Event handlers are not part of the main flow of code, so they are marked as
         // non-interactive.
         scoped_push<bool> interactive{&ld.is_interactive, false};
diff --git a/src/exec.cpp b/src/exec.cpp
index 026bfa4ef..06b7237c0 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -107,7 +107,6 @@ static void safe_launch_process(process_t *p, const char *actual_cmd, const char
                                 const char *const *cenvv) {
     UNUSED(p);
     int err;
-    //  debug( 1, L"exec '%ls'", p->argv[0] );
 
     // This function never returns, so we take certain liberties with constness.
     char *const *envv = const_cast<char *const *>(cenvv);
diff --git a/src/expand.cpp b/src/expand.cpp
index e76227e10..03bb97e69 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -194,7 +194,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
         if (errno > 0) {
             return pos;
         }
-        // debug( 0, L"Push idx %d", tmp );
 
         long i1 = tmp > -1 ? tmp : size + tmp + 1;
         pos = end - in;
@@ -210,7 +209,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             }
             pos = end - in;
 
-            // debug( 0, L"Push range %d %d", tmp, tmp1 );
             long i2 = tmp1 > -1 ? tmp1 : size + tmp1 + 1;
             // Skip sequences that are entirely outside.
             // This means "17..18" expands to nothing if there are less than 17 elements.
@@ -229,7 +227,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
                 i1 = i1 < size ? i1 : size;
                 i2 = i2 < size ? i2 : size;
             }
-            // debug( 0, L"Push range idx %d %d", i1, i2 );
             for (long jjj = i1; jjj * direction <= i2 * direction; jjj += direction) {
                 // FLOGF(error, L"Expand range [subst]: %i\n", jjj);
                 idx.push_back(jjj);
@@ -237,7 +234,6 @@ static size_t parse_slice(const wchar_t *in, wchar_t **end_ptr, std::vector<long
             continue;
         }
 
-        // debug( 0, L"Push idx %d", tmp );
         literal_zero_index = literal_zero_index && tmp == 0;
         idx.push_back(i1);
     }
@@ -640,9 +636,6 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t
             idx = idx - 1;
 
             sub_res2.push_back(sub_res.at(idx));
-            // debug( 0, L"Pushing item '%ls' with index %d onto sliced result", al_get(
-            // sub_res, idx ), idx );
-            // sub_res[idx] = 0; // ??
         }
         sub_res = std::move(sub_res2);
     }
diff --git a/src/highlight.cpp b/src/highlight.cpp
index a15fb732d..6add8fce7 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -215,8 +215,6 @@ bool is_potential_path(const wcstring &potential_path_fragment, const wcstring_l
     wcstring path_with_magic(potential_path_fragment);
     if (flags & PATH_EXPAND_TILDE) expand_tilde(path_with_magic, vars);
 
-    // debug( 1, L"%ls -> %ls ->%ls", path, tilde, unescaped );
-
     for (auto c : path_with_magic) {
         switch (c) {
             case PROCESS_EXPAND_SELF:
diff --git a/src/postfork.cpp b/src/postfork.cpp
index dcdb78a08..c3e0a77b2 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -374,9 +374,6 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
         default: {
             const char *err = safe_strerror(errno);
             debug_safe(0, "exec: %s", err);
-
-            // FLOGF(error, L"The file '%ls' is marked as an executable but could not be run by the
-            // operating system.", p->actual_cmd);
             break;
         }
     }

From a48926dee55b18b91744282cb8f0fac9246b7f7f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:19:34 +0100
Subject: [PATCH 1588/1732] Add and use "should_flog" macro

Useful to figure out if a flog category is enabled.

We only use it in one place, but it seems like the sort of thing that
should exist.
---
 src/flog.h | 3 +++
 src/io.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/flog.h b/src/flog.h
index 178016af7..5a4acf5a2 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -182,3 +182,6 @@ void log_extra_to_flog_file(const wcstring &s);
     } while (0)
 
 #endif
+
+#define should_flog(wht) \
+    (flog_details::category_list_t::g_instance->wht.enabled)
diff --git a/src/io.cpp b/src/io.cpp
index ed241237b..afdc8ec0a 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -257,7 +257,7 @@ bool io_chain_t::append_from_specs(const redirection_spec_list_t &specs, const w
                         FLOGF(warning, NOCLOB_ERROR, spec.target.c_str());
                     } else {
                         FLOGF(warning, FILE_ERROR, spec.target.c_str());
-                        if (should_debug(1)) wperror(L"open");
+                        if (should_flog(warning)) wperror(L"open");
                     }
                     return false;
                 }

From 8b1ac0912ba0f1572427a088db976f9c9287cefa Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:27:23 +0100
Subject: [PATCH 1589/1732] Add reader flog category

For both input and reader, because the "reader" term is more general
and we don't have enough messages to justify multiple categories
---
 src/flog.h           | 2 ++
 src/input.cpp        | 2 +-
 src/input_common.cpp | 3 ++-
 src/reader.cpp       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index 5a4acf5a2..111f0476e 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -92,6 +92,8 @@ class category_list_t {
     category_t iothread{L"iothread", L"Background IO thread events"};
 
     category_t term_support{L"term-support", L"Terminal feature detection"};
+
+    category_t reader{L"reader", L"The interactive reader/input system"};
 };
 
 /// The class responsible for logging.
diff --git a/src/input.cpp b/src/input.cpp
index e2600656d..df0322bbf 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -458,7 +458,7 @@ void inputter_t::mapping_execute_matching_or_generic(bool allow_commands) {
     if (auto mapping = find_mapping()) {
         mapping_execute(*mapping, allow_commands);
     } else {
-        debug(2, L"no generic found, ignoring char...");
+        FLOGF(reader, L"no generic found, ignoring char...");
         auto evt = event_queue_.readch();
         if (evt.is_eof()) {
             event_queue_.push_front(evt);
diff --git a/src/input_common.cpp b/src/input_common.cpp
index 4767a0be0..a7897008f 100644
--- a/src/input_common.cpp
+++ b/src/input_common.cpp
@@ -24,6 +24,7 @@
 #include "env.h"
 #include "env_universal_common.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "flog.h"
 #include "global_safety.h"
 #include "input_common.h"
 #include "iothread.h"
@@ -188,7 +189,7 @@ char_event_t input_event_queue_t::readch() {
         switch (sz) {
             case static_cast<size_t>(-1): {
                 std::memset(&state, '\0', sizeof(state));
-                debug(2, L"Illegal input");
+                FLOG(reader, L"Illegal input");
                 return char_event_type_t::check_exit;
             }
             case static_cast<size_t>(-2): {
diff --git a/src/reader.cpp b/src/reader.cpp
index a7b0468ff..ecd38b263 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3311,7 +3311,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             } else {
                 // This can happen if the user presses a control char we don't recognize. No
                 // reason to report this to the user unless they've enabled debugging output.
-                debug(2, _(L"Unknown key binding 0x%X"), c);
+                FLOGF(reader, _(L"Unknown key binding 0x%X"), c);
             }
             rls.last_cmd = none();
         }

From fe931aeea70d05c36de687540672943858ed5d8d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:27:55 +0100
Subject: [PATCH 1590/1732] Add more messages to termowner flog category

---
 src/proc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index c018dbae1..03ce28c47 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -736,7 +736,7 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 } else {
                     // Debug the original tcsetpgrp error (not the waitpid errno) to the log, and
                     // then retry until not EPERM or the process group has exited.
-                    debug(2, L"terminal_give_to_job(): EPERM.\n", j->pgid);
+                    FLOGF(proc_termowner, L"terminal_give_to_job(): EPERM.\n", j->pgid);
                     continue;
                 }
             } else {
@@ -755,7 +755,7 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 // job/group have been started, the only way this can happen is if the very last
                 // process in the group terminated and didn't need to access the terminal, otherwise
                 // it would have hung waiting for terminal IO (SIGTTIN). We can safely ignore this.
-                debug(3, L"tcsetpgrp called but process group %d has terminated.\n", j->pgid);
+                FLOGF(proc_termowner, L"tcsetpgrp called but process group %d has terminated.\n", j->pgid);
                 return notneeded;
             }
 

From 0c49f4502826edae29ba7c1ceb9aa0f074979871 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:29:56 +0100
Subject: [PATCH 1591/1732] fish_key_reader: Remove debug messages

These are related to *signal handlers* in fish_key_reader, and I don't
think this code needed to be touched since it was added.
---
 src/fish_key_reader.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index 8f6a04969..1e0f90c84 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -274,13 +274,6 @@ static void install_our_signal_handlers() {
     for (int signo = 1; signo < 32; signo++) {
         if (sigaction(signo, &new_sa, &old_sa) != -1) {
             std::memcpy(&old_sigactions[signo], &old_sa, sizeof(old_sa));
-            if (old_sa.sa_handler == SIG_IGN) {
-                debug(3, "signal #%d (%ls) was being ignored", signo, sig2wcs(signo));
-            }
-            if (old_sa.sa_flags && ~SA_SIGINFO != 0) {
-                debug(3, L"signal #%d (%ls) handler had flags 0x%X", signo, sig2wcs(signo),
-                      old_sa.sa_flags);
-            }
         }
     }
 }

From 246882b52d1d4b645266cbfbf61cbd9c5f7813ec Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:32:41 +0100
Subject: [PATCH 1592/1732] Add proc-pgroup flog category

I'm not *super*-happy with this, because pgroups and terminal
ownership and such are quite entertwined.

But hey, if all fails just use `proc'*'`
---
 src/flog.h       | 1 +
 src/postfork.cpp | 2 +-
 src/proc.cpp     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/flog.h b/src/flog.h
index 111f0476e..cba1d4aac 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -74,6 +74,7 @@ class category_list_t {
                                   L"Reaping internal (non-forked) processes"};
 
     category_t proc_reap_external{L"proc-reap-external", L"Reaping external (forked) processes"};
+    category_t proc_pgroup{L"proc-pgroup", L"Process groups"};
 
     category_t env_locale{L"env-locale", L"Changes to locale variables"};
 
diff --git a/src/postfork.cpp b/src/postfork.cpp
index c3e0a77b2..4dfad691f 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -124,7 +124,7 @@ bool set_child_group(job_t *j, pid_t child_pid) {
                 // ever leads to a terminal hang due if both this setpgid call AND posix_spawn's
                 // internal setpgid calls failed), write to the debug log so a future developer
                 // doesn't go crazy trying to track this down.
-                debug(2, "Error %d while calling setpgid for child %d (probably harmless)", errno,
+                FLOGF(proc_pgroup, "Error %d while calling setpgid for child %d (probably harmless)", errno,
                       child_pid);
             }
         }
diff --git a/src/proc.cpp b/src/proc.cpp
index 03ce28c47..324ea3fa4 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -798,7 +798,7 @@ pid_t terminal_acquire_before_builtin(int job_pgid) {
 static bool terminal_return_from_job(job_t *j, int restore_attrs) {
     errno = 0;
     if (j->pgid == 0) {
-        debug(2, "terminal_return_from_job() returning early due to no process group");
+        FLOG(proc_pgroup, "terminal_return_from_job() returning early due to no process group");
         return true;
     }
 
@@ -868,7 +868,7 @@ void job_t::continue_job(parser_t &parser, bool reclaim_foreground_pgrp, bool se
             // signal individually. job_t::signal() does the same, but uses the shell's own pgroup
             // to make that distinction.
             if (!signal(SIGCONT)) {
-                debug(2, "Failed to send SIGCONT to any processes in pgroup %d!", pgid);
+                FLOGF(proc_pgroup, "Failed to send SIGCONT to any processes in pgroup %d!", pgid);
                 // This returns without bubbling up the error. Presumably that is OK.
                 return;
             }

From 483018222db22242d4bdb17eeee7659a190cb64a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:39:17 +0100
Subject: [PATCH 1593/1732] Add complete flog category

---
 src/complete.cpp | 6 +++---
 src/flog.h       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 67d1522d2..696023b2c 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -913,7 +913,7 @@ bool completer_t::complete_param(const wcstring &cmd_orig, const wcstring &popt,
         // This prevents errors caused during the execution of completion providers for
         // tools that do not exist. Applies to both manual completions ("cm<TAB>", "cmd <TAB>")
         // and automatic completions ("gi" autosuggestion provider -> git)
-        debug(4, "Skipping completions for non-existent head\n");
+        FLOG(complete, "Skipping completions for non-existent head");
     } else {
         run_on_main_thread([&]() { complete_load(cmd); });
     }
@@ -1134,7 +1134,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         const wcstring sep_string = wcstring(str, sep_index + 1);
         completion_list_t local_completions;
         if (expand_string(sep_string, &local_completions, flags, ctx) == expand_result_t::error) {
-            debug(3, L"Error while expanding string '%ls'", sep_string.c_str());
+            FLOGF(complete, L"Error while expanding string '%ls'", sep_string.c_str());
         }
 
         // Any COMPLETE_REPLACES_TOKEN will also stomp the separator. We need to "repair" them by
@@ -1153,7 +1153,7 @@ void completer_t::complete_param_expand(const wcstring &str, bool do_file,
         if (string_prefixes_string(L"-", str)) flags.clear(expand_flag::fuzzy_match);
 
         if (expand_string(str, &this->completions, flags, ctx) == expand_result_t::error) {
-            debug(3, L"Error while expanding string '%ls'", str.c_str());
+            FLOGF(complete, L"Error while expanding string '%ls'", str.c_str());
         }
     }
 }
diff --git a/src/flog.h b/src/flog.h
index cba1d4aac..aa2574e37 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -95,6 +95,7 @@ class category_list_t {
     category_t term_support{L"term-support", L"Terminal feature detection"};
 
     category_t reader{L"reader", L"The interactive reader/input system"};
+    category_t complete{L"complete", L"The completion system"};
 };
 
 /// The class responsible for logging.

From 4cb3ce03143cdff12da478840eaabbd0919a43fe Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:41:17 +0100
Subject: [PATCH 1594/1732] Add a 5 debug to the iothread flog

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

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 5f40fe5bc..374d7e855 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -449,7 +449,7 @@ bool make_detached_pthread(void *(*func)(void *), void *param) {
     int err = pthread_create(&thread, nullptr, func, param);
     if (err == 0) {
         // Success, return the thread.
-        debug(5, "pthread %p spawned", (void *)(intptr_t)thread);
+        FLOGF(iothread, "pthread %p spawned", (void *)(intptr_t)thread);
         DIE_ON_FAILURE(pthread_detach(thread));
     } else {
         perror("pthread_create");

From f632a9e9989fa933c4410ac34e8d00a96322c9fd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:42:12 +0100
Subject: [PATCH 1595/1732] Add env-dispatch flog category

---
 src/env_dispatch.cpp | 2 +-
 src/flog.h           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 25927e2c5..6b43dd2d8 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -135,7 +135,7 @@ void env_dispatch_init(const environment_t &vars) {
 /// Properly sets all timezone information.
 static void handle_timezone(const wchar_t *env_var_name, const environment_t &vars) {
     const auto var = vars.get(env_var_name, ENV_DEFAULT);
-    debug(2, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
+    FLOGF(env_dispatch, L"handle_timezone() current timezone var: |%ls| => |%ls|", env_var_name,
           !var ? L"MISSING" : var->as_string().c_str());
     const std::string &name = wcs2string(env_var_name);
     if (var.missing_or_empty()) {
diff --git a/src/flog.h b/src/flog.h
index aa2574e37..7fa7421c9 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -80,6 +80,8 @@ class category_list_t {
 
     category_t env_export{L"env-export", L"Changes to exported variables"};
 
+    category_t env_dispatch{L"env-dispatch", L"Reacting to variables"};
+
     category_t uvar_file{L"uvar-file", L"Writing/reading the universal variable store"};
 
     category_t topic_monitor{L"topic-monitor", L"Internal details of the topic monitor"};

From 26fa774f44cf4efb5f1d11450869009527e2f112 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 14:44:30 +0100
Subject: [PATCH 1596/1732] Add path flog category

---
 src/flog.h   | 1 +
 src/path.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/flog.h b/src/flog.h
index 7fa7421c9..ed9988cb8 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -98,6 +98,7 @@ class category_list_t {
 
     category_t reader{L"reader", L"The interactive reader/input system"};
     category_t complete{L"complete", L"The completion system"};
+    category_t path{L"path", L"Searching/using paths"};
 };
 
 /// The class responsible for logging.
diff --git a/src/path.cpp b/src/path.cpp
index f4b778249..cc5e87618 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -122,7 +122,7 @@ bool path_get_path(const wcstring &cmd, wcstring *out_path, const environment_t
 }
 
 wcstring_list_t path_get_paths(const wcstring &cmd, const environment_t &vars) {
-    debug(3, L"path_get_paths('%ls')", cmd.c_str());
+    FLOGF(path, L"path_get_paths('%ls')", cmd.c_str());
     wcstring_list_t paths;
 
     // If the command has a slash, it must be an absolute or relative path and thus we don't bother

From 65397d4f5efd74e09dd59f574ac3acb87f1fc755 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 19 Jan 2020 15:07:06 +0100
Subject: [PATCH 1597/1732] Fix tests

By changing to flog I inadvertently changed the warning text from "<W>
fish:" to "warning:".

Since that's also okay, let's leave it.
---
 tests/checks/directory-redirect.fish | 2 +-
 tests/test_exec_fail.err             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish
index 003bb7666..b3219b6fb 100644
--- a/tests/checks/directory-redirect.fish
+++ b/tests/checks/directory-redirect.fish
@@ -3,7 +3,7 @@ begin
 end >.
 status -b; and echo "status -b returned true after bad redirect on a begin block"
 # Note that we sometimes get fancy quotation marks here, so let's match three characters
-#CHECKERR: <W> fish: An error occurred while redirecting file {{...}}
+#CHECKERR: warning: An error occurred while redirecting file {{...}}
 #CHECKERR: {{open: Is a directory|open: Invalid argument}}
 echo $status
 #CHECK: 1
diff --git a/tests/test_exec_fail.err b/tests/test_exec_fail.err
index 6a3453fce..e2c8dd99f 100644
--- a/tests/test_exec_fail.err
+++ b/tests/test_exec_fail.err
@@ -1,4 +1,4 @@
-<W> fish: An error occurred while redirecting file 'nosuchfile'
+warning: An error occurred while redirecting file 'nosuchfile'
 open: No such file or directory
-<W> fish: An error occurred while redirecting file 'nosuchfile'
+warning: An error occurred while redirecting file 'nosuchfile'
 open: No such file or directory

From f63ae0fb4df47c4b4a4817c2c918865a6361a5c2 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Mon, 20 Jan 2020 13:02:27 +0900
Subject: [PATCH 1598/1732] Add missing comment to bower.fish

Same comment found in yarn.fish
---
 share/completions/bower.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index d61f657e1..a32226738 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -51,6 +51,7 @@ function __bower_list_installed
     end
 
     if set -l python (__fish_anypython)
+        # Warning: That weird indentation is necessary, because python.
         $python -c 'import json, sys; data = json.load(sys.stdin);
 for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' bower.json 2>/dev/null
         return

From 2035b90bfe724a7c104a15e4fa4bc1627d0dbbb3 Mon Sep 17 00:00:00 2001
From: Shun Sakai <sorairolake@protonmail.ch>
Date: Thu, 16 Jan 2020 15:17:16 +0900
Subject: [PATCH 1599/1732] CHANGELOG: Add `keepassxc-cli` completions

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef14858b4..e9d233736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -162,6 +162,7 @@
   - `irb` (#6260)
   - `iw` (#6232)
   - `kak`
+  - `keepassxc-cli` (#6505)
   - `keybase` (#6410)
   - `lz4`, `lz4c` and `lz4cat` (#6364)
   - `mariner` (#5718)

From 26f744037ac05df5dedc213fb528d1a66bc456a6 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 20 Jan 2020 20:13:59 +0800
Subject: [PATCH 1600/1732] Revert "Remove Base16 mention from CHANGELOG"

Will be in 3.1.0.
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9d233736..bbdd7c0e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -134,6 +134,7 @@
 - Improvements to the display of wide characters, particularly Korean characters and emoji (#5583, #5729).
 - The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
 - Variables that control background colors (such as `fish_pager_color_search_match`) can now use `--reverse`.
+- Added Base16 color options to `fish_config`
 
 #### Completions
 - Added completions for

From acefa61e8bd87e5d178bf8789b530319aafd29b5 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 20 Jan 2020 17:28:28 +0100
Subject: [PATCH 1601/1732] Hardcode signal names/numbers on cygwin

Work around weirdness in Cygwin's kill implementation.

Fixes #6469.
---
 share/functions/__fish_make_completion_signals.fish | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/share/functions/__fish_make_completion_signals.fish b/share/functions/__fish_make_completion_signals.fish
index 8c6c930c0..9a86a3165 100644
--- a/share/functions/__fish_make_completion_signals.fish
+++ b/share/functions/__fish_make_completion_signals.fish
@@ -4,6 +4,18 @@ function __fish_make_completion_signals --description 'Make list of kill signals
 
     set -g __kill_signals
 
+    # Cygwin's kill is special, and the documentation lies.
+    # Just hardcode the signals.
+    if uname | string match -q 'CYGWIN*'
+        set -a __kill_signals "1 HUP" "2 INT" "3 QUIT" "4 ILL" "5 TRAP" "6 ABRT" \
+        "6 IOT" "7 BUS" "8 FPE" "9 KILL" "10 USR1" "11 SEGV" \
+        "12 USR2" "13 PIPE" "14 ALRM" "15 TERM" "16 STKFLT" "17 CHLD" \
+        "17 CLD" "18 CONT" "19 STOP" "20 TSTP" "21 TTIN" "22 TTOU" \
+        "23 URG" "24 XCPU" "25 XFSZ" "26 VTALRM" "27 PROF" "28 WINC" \
+        "29 IO" "29 POLL" "30 PWR" "31 SYS" "34 RTMIN" "64 RTMA"
+        return
+    end
+
     # Some systems use the GNU coreutils kill command where `kill -L` produces an extended table
     # format that looks like this:
     #

From 1480865d52ecce4c8cb06d1ea9d43138fff1f329 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 20 Jan 2020 17:37:37 +0100
Subject: [PATCH 1602/1732] Stringify make_completion_signals

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

diff --git a/share/functions/__fish_make_completion_signals.fish b/share/functions/__fish_make_completion_signals.fish
index 9a86a3165..8a00de8ea 100644
--- a/share/functions/__fish_make_completion_signals.fish
+++ b/share/functions/__fish_make_completion_signals.fish
@@ -30,16 +30,13 @@ function __fish_make_completion_signals --description 'Make list of kill signals
         # Posix systems print out the name of a signal using 'kill -l SIGNUM'.
         complete -c kill -s l --description "List names of available signals"
         for i in (seq 31)
-            set -a __kill_signals $i" "(kill -l $i | tr '[:lower:]' '[:upper:]')
+            set -a __kill_signals $i" "(kill -l $i | string upper)
         end
     else
-        # Debian and some related systems use 'kill -L' to write out a numbered list
+        # util-linux (on Arch) and procps-ng (on Debian) kill use 'kill -L' to write out a numbered list
         # of signals. Use this to complete on both number _and_ on signal name.
         complete -c kill -s L --description "List codes and names of available signals"
-        kill -L | sed -e 's/^ //; s/  */ /g; y/ /\n/' | while read -l signo
-            test -z "$signo"
-            and break # the sed above produces one blank line at the end
-            read -l signame
+        kill -L | string trim | string replace -ra '   *' \n | while read -l signo signame
             set -a __kill_signals "$signo $signame"
         end
     end

From 4e931fd967373b0d35676d673c17b4a6d9076f90 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 20 Jan 2020 17:37:47 +0100
Subject: [PATCH 1603/1732] completions/kill: Offer -SIGNAME

E.g. "kill -HUP".
---
 share/completions/kill.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/completions/kill.fish b/share/completions/kill.fish
index 40361a75f..ea11bb0f5 100644
--- a/share/completions/kill.fish
+++ b/share/completions/kill.fish
@@ -4,6 +4,7 @@ for sig in $__kill_signals[-1..1]
     set number (string split ' ' $sig)[1]
     set name (string split ' ' $sig)[2]
     complete -c kill -o $number -d $name
+    complete -c kill -o $name -d $number
     complete -c kill -k -s s -x -a "$name\t$number"
 end
 

From 103a26ffb17819ca561b20adba9de9c2ae48dc6c Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 22 Jan 2020 00:00:28 +0900
Subject: [PATCH 1604/1732] Fix function output on FreeBSD/Cygwin systems

---
 share/functions/__fish_print_encodings.fish | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_print_encodings.fish b/share/functions/__fish_print_encodings.fish
index f5507d882..3cdd5d530 100644
--- a/share/functions/__fish_print_encodings.fish
+++ b/share/functions/__fish_print_encodings.fish
@@ -1,3 +1,8 @@
 function __fish_print_encodings -d "Complete using available character encodings"
-    iconv --list | sed -e 's|//||'
+    if iconv --usage &>/dev/null  # only GNU has this flag
+        # Note: GNU iconv changes its output to contain the forward slashes below when stdout is not a tty.
+        iconv --list | string replace -ra '//' ''
+    else # non-GNU
+        iconv --list | string replace -ra '\s+' '\n'
+    end
 end

From 13a26a1c6550ebe764b7a872d4bd7f992e1d288f Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Tue, 21 Jan 2020 23:07:02 +0900
Subject: [PATCH 1605/1732] Remove `dropbox` completions

---
 share/completions/dropbox.fish | 39 ----------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 share/completions/dropbox.fish

diff --git a/share/completions/dropbox.fish b/share/completions/dropbox.fish
deleted file mode 100644
index ecb0bcc50..000000000
--- a/share/completions/dropbox.fish
+++ /dev/null
@@ -1,39 +0,0 @@
-
-function __dropbox_needs_argument
-    set -l cmd (commandline -opc)
-    if set -q cmd[2]
-        switch "$cmd[2]"
-            case '-*'
-            case '*'
-                return 1
-        end
-    end
-end
-
-complete -c dropbox -x
-complete -c dropbox -n __dropbox_needs_argument -a status -d "Get current status of the dropboxd"
-complete -c dropbox -n __dropbox_needs_argument -a help -d "Provide help"
-complete -c dropbox -n __dropbox_needs_argument -a running -d "Return 1 if dropbox is running"
-complete -c dropbox -n __dropbox_needs_argument -a autostart -d "Ubuntu: automatically start dropbox at login"
-complete -c dropbox -n "__dropbox_needs_argument; and dropbox running" -a start -d "Start dropboxd"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a puburl -d "Get public url of a file in your dropbox"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a stop -d "Stop dropboxd"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a 'stat filestatus' -d "Get current sync status of one or more files"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a ls -d "List directory contents with current sync status"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a exclude -d "Ignores/excludes a directory from syncing"
-complete -c dropbox -n "__dropbox_needs_argument; and not dropbox running" -a lansync -d "Enables or disables LAN sync"
-
-set -l subcommands help puburl stop running start file status ls autostart exclude lansync stat
-complete -c dropbox -n "__fish_seen_subcommand_from help" -xa "$subcommands"
-complete -c dropbox -n "__fish_seen_subcommand_from start" -s i -l install -d "Auto install dropboxd if not available on the system"
-complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat" -s l -l list -d "Prints out information in a format similar to ls. works best when your console supports color :)"
-complete -c dropbox -n "__fish_seen_subcommand_from filestatus stat ls" -s a -l all -d "Do not ignore entries starting with ."
-complete -c dropbox -n "__fish_seen_subcommand_from autostart lansync" -xa '(echo -e "y\tEnable\nn\tDisable")'
-
-set -l needs_excl_arg "__fish_seen_subcommand_from exclude; and not __fish_seen_subcommand_from list add remove"
-complete -c dropbox -n $needs_excl_arg -xa list -d "Prints a list of directories currently excluded from syncing"
-complete -c dropbox -n $needs_excl_arg -xa add -d "Adds one or more directories to the exclusion list"
-complete -c dropbox -n $needs_excl_arg -xa remove -d "Removes one or more directories from the exclusion list"
-complete -c dropbox -n "__fish_seen_subcommand_from exclude; and __fish_seen_subcommand_from remove" -xa '(dropbox exclude list | sed -e "1d")'
-complete -c dropbox -n "__fish_seen_subcommand_from exclude; and __fish_seen_subcommand_from add" -xa '(set -l CDPATH; __fish_complete_cd)'
-

From 6fb545cf9bf9560c9a16f061507ec8bcd5a3f132 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 22 Jan 2020 01:11:36 +0900
Subject: [PATCH 1606/1732] Stringify gpg completions

---
 share/functions/__fish_complete_gpg_key_id.fish | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/share/functions/__fish_complete_gpg_key_id.fish b/share/functions/__fish_complete_gpg_key_id.fish
index da9c042d1..102928783 100644
--- a/share/functions/__fish_complete_gpg_key_id.fish
+++ b/share/functions/__fish_complete_gpg_key_id.fish
@@ -5,13 +5,15 @@ function __fish_complete_gpg_key_id -d 'Complete using gpg key ids' -a __fish_co
     set -l keyid
     $__fish_complete_gpg_command --list-keys --with-colons | while read garbage
         switch $garbage
-            # Extract user ids
+            # Extract user ids (note: gpg escapes colons as '\x3a')
             case "uid*"
-                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read uid
+                set -l __uid (string split ":" -- $garbage)
+                set uid (string replace -a '\x3a' ':' -- $__uuid[10])
                 printf "%s\t%s\n" $keyid $uid
-                # Extract key fingerprints (no subkeys)
+            # Extract key fingerprints (no subkeys)
             case "pub*"
-                echo $garbage | cut -d ":" -f 5 | read keyid
+                set -l __pub (string split ":" -- $garbage)
+                set keyid $__pub[5]
         end
     end
 end

From e398f667728543219eb648a084355d4b3e254f61 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 21 Jan 2020 14:43:17 -0800
Subject: [PATCH 1607/1732] Run clang-format

---
 src/iothread.cpp | 2 +-
 src/iothread.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index 5f40fe5bc..c62226aad 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -102,7 +102,7 @@ struct thread_pool_t {
     /// The function \p func will execute in one of the pool's threads.
     /// \p completion will run on the main thread, if it is not missing.
     /// If \p cant_wait is set, disrespect the thread limit, because extant threads may
-    ///want to wait for new threads.
+    /// want to wait for new threads.
     int perform(void_function_t &&func, void_function_t &&completion, bool cant_wait);
 
    private:
diff --git a/src/iothread.h b/src/iothread.h
index 4dd646a78..5d91b2b34 100644
--- a/src/iothread.h
+++ b/src/iothread.h
@@ -31,7 +31,8 @@ void iothread_service_completion(void);
 int iothread_drain_all(void);
 
 // Internal implementation
-int iothread_perform_impl(std::function<void(void)> &&func, std::function<void(void)> &&completion, bool cant_wait = false);
+int iothread_perform_impl(std::function<void(void)> &&func, std::function<void(void)> &&completion,
+                          bool cant_wait = false);
 
 // Template helpers
 // This is the glue part of the handler-completion handoff

From d61c188c3cf172038e80310f9118dcf01850ae31 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 22 Jan 2020 16:23:36 +0100
Subject: [PATCH 1608/1732] Fix xdg mimetype completion

This hung when no file existed, and failed to properly find the
directories if they didn't end in a "/".

Fixes #6525

[good for 3.1.0]
---
 .../functions/__fish_print_xdg_applications_directories.fish | 4 ++--
 share/functions/__fish_print_xdg_mimetypes.fish              | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/functions/__fish_print_xdg_applications_directories.fish b/share/functions/__fish_print_xdg_applications_directories.fish
index c4a102aca..d7a71532c 100644
--- a/share/functions/__fish_print_xdg_applications_directories.fish
+++ b/share/functions/__fish_print_xdg_applications_directories.fish
@@ -11,8 +11,8 @@ function __fish_print_xdg_applications_directories --description 'Print director
 
     set data_dirs $data_home:$data_dirs
 
-    for path in (string split : $data_dirs)
-        set path $path"applications"
+    # We don't know if the dir ended in a "/" or not, but duplicate slashes are okay.
+    for path in (string split : $data_dirs)/applications
         if test -d $path
             echo $path
         end
diff --git a/share/functions/__fish_print_xdg_mimetypes.fish b/share/functions/__fish_print_xdg_mimetypes.fish
index 97070e042..047f2cea4 100644
--- a/share/functions/__fish_print_xdg_mimetypes.fish
+++ b/share/functions/__fish_print_xdg_mimetypes.fish
@@ -1,3 +1,6 @@
 function __fish_print_xdg_mimetypes --description 'Print XDG mime types'
-    cat (__fish_print_xdg_applications_directories)/mimeinfo.cache 2>/dev/null | string match -v '[MIME Cache]' | string replace = \t
+    set -l files (__fish_print_xdg_applications_directories)/mimeinfo.cache
+    # If we have no file, don't run `cat` without arguments!
+    set -q files[1] || return 1
+    cat $files 2>/dev/null | string match -v '[MIME Cache]' | string replace = \t
 end

From 0918b537ac3ba36a19fab63369abf8419e86bd8b Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 21 Jan 2020 16:37:32 -0700
Subject: [PATCH 1609/1732] Get the list of VMs in a less fragile way.

---
 share/completions/vmctl.fish | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/share/completions/vmctl.fish b/share/completions/vmctl.fish
index 6591d24ef..ff0c3144b 100644
--- a/share/completions/vmctl.fish
+++ b/share/completions/vmctl.fish
@@ -1,4 +1,11 @@
 
+function __fish_get_vmctl_vms
+	for line in (vmctl status | string match -e -v "MAXMEM");
+		set a (string split " " $line)
+		and printf "%s " $a[-1]
+	end
+end
+
 complete -c vmctl -xa 'console create load log reload reset start status stop pause unpause send receive' -n 'not __fish_seen_subcommand_from list console create load log reload reset start status stop pause unpause send receive'
-complete -c vmctl -n '__fish_seen_subcommand_from console reload reset start status stop pause unpause send receive' -xa '(vmctl status | string match -e -v "MAXMEM" | string replace -r "^(\s+\S+\s+){7}" "")'
+complete -c vmctl -n '__fish_seen_subcommand_from console reload reset start status stop pause unpause send receive' -xa (__fish_get_vmctl_vms)
 

From 1cafc4eff622ba8ca84e39348bc2114d346faf75 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Tue, 21 Jan 2020 22:55:41 +0900
Subject: [PATCH 1610/1732] Amend comments incorrectly referring to `sed`

---
 share/completions/df.fish        | 2 +-
 tests/test_functions/mktemp.fish | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/completions/df.fish b/share/completions/df.fish
index 833e87e21..1f77d036f 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -3,7 +3,7 @@
 #
 
 #
-# Test if we are using GNU sed
+# Test if we are using GNU df
 #
 
 set -l is_gnu
diff --git a/tests/test_functions/mktemp.fish b/tests/test_functions/mktemp.fish
index bb4cf41e4..d99d48b8f 100644
--- a/tests/test_functions/mktemp.fish
+++ b/tests/test_functions/mktemp.fish
@@ -47,10 +47,10 @@ function mktemp
         exit 1
     end
 
-    # GNU sed treats the final occurrence of a sequence of X's as the template token.
-    # BSD sed only treats X's as the template token if they suffix the string.
+    # GNU mktemp treats the final occurrence of a sequence of X's as the template token.
+    # BSD mktemp only treats X's as the template token if they suffix the string.
     # So let's outlaw them anywhere besides the end.
-    # Similarly GNU sed requires at least 3 X's, BSD sed requires none. Let's require 3.
+    # Similarly GNU mktemp requires at least 3 X's, BSD mktemp requires none. Let's require 3.
     begin
         set -l chars (string split '' -- $template)
         set -l found_x

From 2323a5629c431d22dcdba4d4fea564c750112521 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 22 Jan 2020 01:20:42 +0900
Subject: [PATCH 1611/1732] Stringify netctl completions

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

diff --git a/share/completions/netctl.fish b/share/completions/netctl.fish
index 46aafb9e9..9af298620 100644
--- a/share/completions/netctl.fish
+++ b/share/completions/netctl.fish
@@ -1,7 +1,7 @@
 set -l cmds list store restore stop-all start stop restart switch-to status enable disable reenable is-enabled edit
 
 function __fish_netctl_get_profiles
-    command netctl list | sed -e 's/^[ \t*]*//'
+    command netctl list | string trim -l -c ' *'\t
 end
 
 complete -f -c netctl -l help -d 'Display help'

From a5d625d389e9c6c9bdc83a17fb366dfc72d54654 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 22 Jan 2020 18:54:52 +0900
Subject: [PATCH 1612/1732] Stringify j.fish

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

diff --git a/share/completions/j.fish b/share/completions/j.fish
index a44f90987..be799ee48 100644
--- a/share/completions/j.fish
+++ b/share/completions/j.fish
@@ -1,5 +1,5 @@
 function __history_completions --argument limit
-    if echo $limit | string match -q ""
+    if string match -q "" -- "$limit"
         set limit 25
     end
 

From 2af710f7c03c094a79b2b2848de7258d7f6a56e8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 Jan 2020 11:46:02 -0800
Subject: [PATCH 1613/1732] Eliminate expand_result_t::wildcard_match

This was an internal implementation detail that all callers had to deal
with. Just get rid of it.
---
 src/expand.cpp             | 22 ++++++++++-------
 src/expand.h               |  2 --
 src/highlight.cpp          |  2 +-
 src/parse_execution.cpp    | 49 +++++++++++++++-----------------------
 tests/checks/wildcard.fish | 15 ++++++++++++
 5 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 tests/checks/wildcard.fish

diff --git a/src/expand.cpp b/src/expand.cpp
index e76227e10..3cb203e6e 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1007,8 +1007,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
                 path_to_expand, effective_working_dir, flags, ctx.cancel_checker, &expanded);
             switch (expand_res) {
                 case wildcard_expand_result_t::match:
-                    // Something matched,so overall we matched.
-                    result = expand_result_t::wildcard_match;
+                    result = expand_result_t::ok;
                     break;
                 case wildcard_expand_result_t::no_match:
                     break;
@@ -1058,12 +1057,7 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
         for (completion_t &comp : completions) {
             expand_result_t this_result =
                 (expand.*stage)(std::move(comp.completion), &output_storage);
-            // If this_result was no match, but total_result is that we have a match, then don't
-            // change it.
-            if (!(this_result == expand_result_t::wildcard_no_match &&
-                  total_result == expand_result_t::wildcard_match)) {
-                total_result = this_result;
-            }
+            total_result = this_result;
             if (total_result == expand_result_t::error) {
                 break;
             }
@@ -1077,6 +1071,16 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
         }
     }
 
+    // This is a little tricky: if one wildcard failed to match but we still got output, it
+    // means that a previous expansion resulted in multiple strings. For example:
+    //   set dirs ./a ./b
+    //   echo $dirs/*.txt
+    // Here if ./a/*.txt matches and ./b/*.txt does not, then we don't want to report a failed
+    // wildcard. So swallow failed-wildcard errors if we got any output.
+    if (total_result == expand_result_t::wildcard_no_match && !completions.empty()) {
+        total_result = expand_result_t::ok;
+    }
+
     if (total_result != expand_result_t::error) {
         // Hack to un-expand tildes (see #647).
         if (!(flags & expand_flag::skip_home_directories)) {
@@ -1127,7 +1131,7 @@ expand_result_t expand_to_command_and_args(const wcstring &instr, const operatio
         instr, &completions,
         {expand_flag::skip_cmdsubst, expand_flag::no_descriptions, expand_flag::skip_jobs}, ctx,
         errors);
-    if (expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match) {
+    if (expand_err == expand_result_t::ok) {
         // The first completion is the command, any remaning are arguments.
         bool first = true;
         for (auto &comp : completions) {
diff --git a/src/expand.h b/src/expand.h
index 221bffec9..678afd1af 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -107,8 +107,6 @@ enum class expand_result_t {
     ok,
     /// Ok, a wildcard in the string matched no files.
     wildcard_no_match,
-    /// Ok, a wildcard in the string matched a file.
-    wildcard_match,
 };
 
 /// The string represented by PROCESS_EXPAND_SELF
diff --git a/src/highlight.cpp b/src/highlight.cpp
index a15fb732d..177bfffb1 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -347,7 +347,7 @@ static bool plain_statement_get_expanded_command(const wcstring &src,
     maybe_t<wcstring> cmd = command_for_plain_statement(stmt, src);
     if (!cmd) return false;
     expand_result_t err = expand_to_command_and_args(*cmd, ctx, out_cmd, nullptr);
-    return err == expand_result_t::ok || err == expand_result_t::wildcard_match;
+    return err == expand_result_t::ok;
 }
 
 rgb_color_t highlight_get_color(const highlight_spec_t &highlight, bool is_background) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 0a1a0aa64..5f0de0765 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -449,7 +449,6 @@ eval_result_t parse_execution_context_t::run_for_statement(
 
 eval_result_t parse_execution_context_t::run_switch_statement(
     tnode_t<grammar::switch_statement> statement) {
-    eval_result_t result = eval_result_t::ok;
 
     // Get the switch variable.
     tnode_t<grammar::argument> switch_value_n = statement.child<1>();
@@ -463,37 +462,29 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
     switch (expand_ret) {
-        case expand_result_t::error: {
-            result = report_errors(errors);
+        case expand_result_t::error:
+            return report_errors(errors);
+
+        case expand_result_t::wildcard_no_match:
+            return report_unmatched_wildcard_error(switch_value_n);
+
+        case expand_result_t::ok:
+            if (switch_values_expanded.size() > 1) {
+                return report_error(switch_value_n,
+                                    _(L"switch: Expected at most one argument, got %lu\n"),
+                                    switch_values_expanded.size());
+            }
             break;
-        }
-        case expand_result_t::wildcard_no_match: {
-            result = report_unmatched_wildcard_error(switch_value_n);
-            break;
-        }
-        case expand_result_t::wildcard_match:
-        case expand_result_t::ok: {
-            break;
-        }
-        default: {
-            DIE("unexpected expand_string() return value");
-            break;
-        }
     }
 
-    if (result == eval_result_t::ok && switch_values_expanded.size() > 1) {
-        result =
-            report_error(switch_value_n, _(L"switch: Expected at most one argument, got %lu\n"),
-                         switch_values_expanded.size());
+    // If we expanded to nothing, match the empty string.
+    assert(switch_values_expanded.size() <= 1 && "Should have at most one expansion");
+    wcstring switch_value_expanded = L"";
+    if (!switch_values_expanded.empty()) {
+        switch_value_expanded = std::move(switch_values_expanded.front().completion);
     }
 
-    if (result != eval_result_t::ok) {
-        return result;
-    }
-
-    const wcstring &switch_value_expanded =
-        switch_values_expanded.size() == 1 ? switch_values_expanded.at(0).completion : L"";
-
+    eval_result_t result = eval_result_t::ok;
     block_t *sb = parser->push_block(block_t::switch_block());
 
     // Expand case statements.
@@ -731,7 +722,7 @@ eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_s
     } else if (expand_err == expand_result_t::wildcard_no_match) {
         return report_unmatched_wildcard_error(statement);
     }
-    assert(expand_err == expand_result_t::ok || expand_err == expand_result_t::wildcard_match);
+    assert(expand_err == expand_result_t::ok);
 
     // Complain if the resulting expansion was empty, or expanded to an empty string.
     if (out_cmd->empty()) {
@@ -891,7 +882,6 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
                 }
                 break;
             }
-            case expand_result_t::wildcard_match:
             case expand_result_t::ok: {
                 break;
             }
@@ -1034,7 +1024,6 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
                 return eval_result_t::error;
             }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
-            case expand_result_t::wildcard_match:
             case expand_result_t::ok: {
                 break;
             }
diff --git a/tests/checks/wildcard.fish b/tests/checks/wildcard.fish
new file mode 100644
index 000000000..2758d6b2e
--- /dev/null
+++ b/tests/checks/wildcard.fish
@@ -0,0 +1,15 @@
+# RUN: %fish %s
+
+# Ensure that, if variable expansion results in multiple strings
+# and one of them fails a glob, that we don't fail the entire expansion.
+set dir (mktemp -d)
+cd $dir
+mkdir a
+mkdir b
+touch ./b/file.txt
+
+set dirs ./a ./b
+echo $dirs/*.txt
+# CHECK: ./b/file.txt
+
+rm -Rf $dir

From dbbe8a2da5865711381b6ebe4b51b3e1844234bd Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 Jan 2020 11:51:40 -0800
Subject: [PATCH 1614/1732] Clarify expand_result_t comments

---
 src/expand.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/expand.h b/src/expand.h
index 678afd1af..5b396c711 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -99,13 +99,14 @@ enum : wchar_t {
     EXPAND_SENTINAL
 };
 
-/// These are the possible return values for expand_string. Note how zero value is the only error.
+/// These are the possible return values for expand_string.
 enum class expand_result_t {
-    /// Error
+    /// There was a syntax error, for example, unmatched braces.
     error,
-    /// Ok
+    /// Expansion succeeded.
     ok,
-    /// Ok, a wildcard in the string matched no files.
+    /// Expansion succeeded, but a wildcard in the string matched no files,
+    /// so the output is empty.
     wildcard_no_match,
 };
 

From 903fe9de489af8dfb629627178ec918eb6ef4447 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 23 Jan 2020 11:52:26 -0700
Subject: [PATCH 1615/1732] webconfig: Use tempfile instead of ~/.cache (#6522)

OpenBSD uses [unveil(2)](https://man.openbsd.org/unveil) in chromium and
firefox. This means that things outside of directories like ~/Downloads or /tmp are not visible to the
browsers.

Change webconfig so it uses tempfile.NamedTemporaryFile to create our temp file.
---
 share/tools/web_config/webconfig.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 793f5848b..702774c91 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -21,6 +21,7 @@ import socket
 import string
 import subprocess
 import sys
+import tempfile
 from itertools import chain
 
 FISH_BIN_PATH = False  # will be set later
@@ -1477,32 +1478,14 @@ url = "http://localhost:%d/%s/%s" % (PORT, authkey, initial_tab)
 # Create temporary file to hold redirect to real server. This prevents exposing
 # the URL containing the authentication key on the command line (see
 # CVE-2014-2914 or https://github.com/fish-shell/fish-shell/issues/1438).
-if "XDG_CACHE_HOME" in os.environ:
-    dirname = os.path.expanduser(os.path.expandvars("$XDG_CACHE_HOME/fish/"))
-else:
-    dirname = os.path.expanduser("~/.cache/fish/")
+f = tempfile.NamedTemporaryFile(prefix='web_config', suffix='.html', mode='w')
 
-os.umask(0o0077)
-try:
-    os.makedirs(dirname, 0o0700)
-except OSError as e:
-    if e.errno == 17:
-        pass
-    else:
-        raise e
-
-randtoken = "".join(
-    random.choice(string.ascii_uppercase + string.digits) for _ in range(6)
-)
-filename = dirname + "web_config-%s.html" % randtoken
-
-f = open(filename, "w")
 f.write(redirect_template_html % (url, url))
-f.close()
+f.flush()
 
 # Open temporary file as URL
 # Use open on macOS >= 10.12.5 to work around #4035.
-fileurl = "file://" + filename
+fileurl = "file://" + f.name
 
 esc = get_special_ansi_escapes()
 print(
@@ -1536,4 +1519,4 @@ except KeyboardInterrupt:
     print("\nShutting down.")
 
 # Clean up temporary file
-os.remove(filename)
+f.close()

From 3e08083d493ceff5be1a4ecd0fae6a5b67ef9423 Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Fri, 24 Jan 2020 18:27:47 +0100
Subject: [PATCH 1616/1732] Add completions for loginctl and resolvectl (#6501)

* Add completions for loginctl and resolvectl

* Add #6501

* Fix optional arguments

* Remove placeholder arguments
Fix expected arguments
---
 CHANGELOG.md                      |  2 ++
 share/completions/loginctl.fish   | 26 ++++++++++++++++++++++++++
 share/completions/resolvectl.fish | 25 +++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 share/completions/loginctl.fish
 create mode 100644 share/completions/resolvectl.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbdd7c0e5..d6f9a3182 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -165,6 +165,7 @@
   - `kak`
   - `keepassxc-cli` (#6505)
   - `keybase` (#6410)
+  - `loginctl` (#6501)
   - `lz4`, `lz4c` and `lz4cat` (#6364)
   - `mariner` (#5718)
   - `nethack` (#6240)
@@ -173,6 +174,7 @@
   - `plutil` (#6301)
   - `pzstd` (#6364)
   - `qubes-gpg-client` (#6067)
+  - `resolvectl` (#6501)
   - `rg`
   - `rustup`
   - `sfdx` (#6149)
diff --git a/share/completions/loginctl.fish b/share/completions/loginctl.fish
new file mode 100644
index 000000000..a5aec2d68
--- /dev/null
+++ b/share/completions/loginctl.fish
@@ -0,0 +1,26 @@
+#loginctl (systemd 244)
+
+#variables
+set -l seen __fish_seen_subcommand_from
+set -l commands activate attach disable-linger enable-linger flush-devices kill-session kill-user list-seats list-sessions list-users lock-session lock-sessions seat-status session-status show-seat show-session show-user terminate-seat terminate-session terminate-user unlock-session unlock-sessions user-status
+set -l output cat export json json-pretty json-seq json-sse short short-full short-iso short-iso-precise short-monotonic short-precise short-unix verbose with-unit
+
+#commands
+complete -c loginctl -x -n "not $seen $commands" -a "$commands"
+
+#options
+complete -c loginctl -f -n "not $seen $commands" -l all -s a -d "Show all properties, including empty ones"
+complete -c loginctl -f -n "not $seen $commands" -l full -s l -d "Do not ellipsize output"
+complete -c loginctl -f -n "not $seen $commands" -l help -s h -d "Show this help"
+complete -c loginctl -x -n "not $seen $commands" -l host -s H -d "Operate on remote host"
+complete -c loginctl -x -n "not $seen $commands" -l kill-who -d "Who to send signal to"
+complete -c loginctl -x -n "not $seen $commands" -l lines -s n -d "Number of journal entries to show"
+complete -c loginctl -x -n "not $seen $commands" -l machine -s M -d "Operate on local container"
+complete -c loginctl -f -n "not $seen $commands" -l no-ask-password -d "Don't prompt for password"
+complete -c loginctl -f -n "not $seen $commands" -l no-legend -d "Do not show the headers and footers"
+complete -c loginctl -f -n "not $seen $commands" -l no-pager -d "Do not pipe output into a pager"
+complete -c loginctl -x -n "not $seen $commands" -l output -a "$output" -s o -d "Change journal output mode"
+complete -c loginctl -x -n "not $seen $commands" -l property -s p -d "Show only properties by this name"
+complete -c loginctl -x -n "not $seen $commands" -l signal -s s -d "Which signal to send"
+complete -c loginctl -f -n "not $seen $commands" -l value -d "When showing properties, only print the value"
+complete -c loginctl -f -n "not $seen $commands" -l version -d "Show package version"
diff --git a/share/completions/resolvectl.fish b/share/completions/resolvectl.fish
new file mode 100644
index 000000000..db1b02604
--- /dev/null
+++ b/share/completions/resolvectl.fish
@@ -0,0 +1,25 @@
+#resolvectl (systemd 244)
+
+#variables
+set -l seen __fish_seen_subcommand_from
+set -l commands default-route dns dnsovertls dnssec domain flush-caches llmnr mdns nta openpgp query reset-server-features reset-statistics revert service statistics status tlsa
+
+#commands
+complete -c resolvectl -x -n "not $seen $commands" -a "$commands"
+
+#options
+complete -c resolvectl -x -n "not $seen $commands" -l class -s c -d "Query RR with DNS class"
+complete -c resolvectl -x -n "not $seen $commands" -l cname -d "Follow CNAME redirects"
+complete -c resolvectl -f -n "not $seen $commands" -l help -s h -d "Show this help"
+complete -c resolvectl -x -n "not $seen $commands" -l interface -s i -d "Look on interface"
+complete -c resolvectl -x -n "not $seen $commands" -l legend -d "Print headers and additional info"
+complete -c resolvectl -f -n "not $seen $commands" -l no-pager -d "Do not pipe output into a pager"
+complete -c resolvectl -x -n "not $seen $commands" -l protocol -s p -d "Look via protocol"
+complete -c resolvectl -f -n "not $seen $commands" -l raw -d "Dump the answer as binary data"
+complete -c resolvectl -x -n "not $seen $commands" -l search -d "Use search domains for single-label names"
+complete -c resolvectl -x -n "not $seen $commands" -l service-address -d "Resolve address for services"
+complete -c resolvectl -x -n "not $seen $commands" -l service-txt -d "Resolve TXT records for services"
+complete -c resolvectl -x -n "not $seen $commands" -l type -s t -d "Query RR with DNS type"
+complete -c resolvectl -f -n "not $seen $commands" -l version -d "Show package version"
+complete -c resolvectl -f -n "not $seen $commands" -s 4 -d "Resolve IPv4 addresses"
+complete -c resolvectl -f -n "not $seen $commands" -s 6 -d "Resolve IPv6 addresses"

From 2a247c7fe576c40c63ac847361abbcd75823e3ec Mon Sep 17 00:00:00 2001
From: Jason <ammgws@users.noreply.github.com>
Date: Sat, 25 Jan 2020 02:29:17 +0900
Subject: [PATCH 1617/1732] Stringify ssh completions (#6529)

* Stringify ssh completions

* Fix completions for `-b` option

* Fix completions for `-b` option
---
 share/completions/ssh.fish | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index 6bbc57118..4f4011b2a 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -17,10 +17,8 @@ complete -c ssh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command
 
 complete -c ssh -s a -d "Disables forwarding of the authentication agent"
 complete -c ssh -s A -d "Enables forwarding of the authentication agent"
-# TODO: Improve this since /proc/net/arp is not POSIX compliant.
-complete -x -c ssh -s b -d "Interface to transmit from" -a "
-(cut -d ' ' -f 1 /proc/net/arp 2>/dev/null | string match -r -v '^IP')
-"
+
+complete -x -c ssh -s b -d "Local address to bind to" -a "(__fish_print_addresses)"
 
 complete -x -c ssh -s e -d "Escape character" -a "\^ none"
 complete -c ssh -s f -d "Go to background"
@@ -43,13 +41,13 @@ complete -c ssh -s R -d "Remotely forwarded ports"
 complete -c ssh -s D -d "Dynamic port forwarding"
 complete -c ssh -s c -d "Encryption cipher" -xa "(ssh -Q cipher)"
 
-# Also look up hosts from the history
+# Also retrieve `user@host` entries from history
 function __ssh_history_completions --argument limit
     if string match -q ""
         set limit 100
     end
 
-    history --prefix ssh | sed -n "s/.* \([A-Za-z0-9._:-]\+@[A-Za-z0-9._:-]\+\).*/\1/p" | head -n $limit
+    history --prefix ssh | string replace -rf '.* ([A-Za-z0-9._:-]+@[A-Za-z0-9._:-]+).*' '$1' | head -n $limit
 end
 
 complete -k -c ssh -a '(__ssh_history_completions 100)' -f -d "Remote"

From 5bfb6fef7613e68bda90db6fd39b4470959a54c0 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 22 Jan 2020 18:33:24 +0900
Subject: [PATCH 1618/1732] Stringify __fish_pwd.fish

---
 share/functions/__fish_pwd.fish | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/share/functions/__fish_pwd.fish b/share/functions/__fish_pwd.fish
index 1f8afee81..699eee8d5 100644
--- a/share/functions/__fish_pwd.fish
+++ b/share/functions/__fish_pwd.fish
@@ -1,10 +1,15 @@
 switch (uname)
     case 'CYGWIN_*'
         function __fish_pwd --description "Show current path"
-            pwd | sed -e 's-^/cygdrive/\(.\)/\?-\u\1:/-'
+            if status test-feature regex-easyesc
+                pwd | string replace -r '^/cygdrive/(.)?' '\U$1:'
+            else
+                # TODO: Remove this once regex-easyesc becomes the default
+                pwd | string replace -r '^/cygdrive/(.)?' '\\\U$1:'
+            end
         end
     case '*'
         function __fish_pwd --description "Show current path"
             pwd
         end
-end
\ No newline at end of file
+end

From b99546e7a006ddfa609acbdf2a682cdb552ec445 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 Jan 2020 15:03:59 -0800
Subject: [PATCH 1619/1732] Port cmdsub tests to littlecheck

---
 tests/checks/cmdsub-limit.fish | 67 ++++++++++++++++++++++++++++++++++
 tests/test_cmdsub.err          | 29 ---------------
 tests/test_cmdsub.in           | 33 -----------------
 tests/test_cmdsub.out          | 30 ---------------
 4 files changed, 67 insertions(+), 92 deletions(-)
 create mode 100644 tests/checks/cmdsub-limit.fish
 delete mode 100644 tests/test_cmdsub.err
 delete mode 100644 tests/test_cmdsub.in
 delete mode 100644 tests/test_cmdsub.out

diff --git a/tests/checks/cmdsub-limit.fish b/tests/checks/cmdsub-limit.fish
new file mode 100644
index 000000000..6fa25d233
--- /dev/null
+++ b/tests/checks/cmdsub-limit.fish
@@ -0,0 +1,67 @@
+# RUN: %fish %s
+
+# This tests various corner cases involving command substitution. Most
+# importantly the limits on the amount of data we'll substitute.
+
+set fish_read_limit 512
+
+function subme
+    set -l x (string repeat -n $argv x)
+    echo $x
+end
+
+# Command sub just under the limit should succeed
+set a (subme 511)
+set --show a
+#CHECK: $a: not set in local scope
+#CHECK: $a: set in global scope, unexported, with 1 elements
+#CHECK: $a[1]: length=511 value=|{{x{510}x}}|
+#CHECK: $a: not set in universal scope
+
+# Command sub at the limit should fail
+set b (string repeat -n 512 x)
+set saved_status $status
+test $saved_status -eq 122
+or echo expected status 122, saw $saved_status >&2
+set --show b
+
+#CHECK: $b: not set in local scope
+#CHECK: $b: not set in global scope
+#CHECK: $b: not set in universal scope
+#CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
+#CHECKERR: 
+#CHECKERR: set b (string repeat -n 512 x)
+#CHECKERR:       ^
+
+
+# Command sub over the limit should fail
+set c (subme 513)
+set --show c
+
+#CHECK: $c: not set in local scope
+#CHECK: $c: set in global scope, unexported, with 1 elements
+#CHECK: $c[1]: length=0 value=||
+#CHECK: $c: not set in universal scope
+#CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
+#CHECKERR: 
+#CHECKERR:     set -l x (string repeat -n $argv x)
+#CHECKERR:              ^
+#CHECKERR: in function 'subme' with arguments '513'
+#CHECKERR: called on line {{.*}}
+#CHECKERR: in command substitution
+#CHECKERR: called on line {{.*}}
+
+# Make sure output from builtins outside of command substitution is not affected
+string repeat --max 513 a
+#CHECK: {{a{512}a}}
+
+# Same builtin in a command substitution is affected
+echo this will fail (string repeat --max 513 b) to output anything
+set saved_status $status
+test $saved_status -eq 122
+or echo expected status 122, saw $saved_status >&2
+
+#CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
+#CHECKERR: 
+#CHECKERR: echo this will fail (string repeat --max 513 b) to output anything
+#CHECKERR:                     ^
diff --git a/tests/test_cmdsub.err b/tests/test_cmdsub.err
deleted file mode 100644
index 62819c597..000000000
--- a/tests/test_cmdsub.err
+++ /dev/null
@@ -1,29 +0,0 @@
-
-####################
-# Command sub just under the limit should succeed
-
-####################
-# Command sub at the limit should fail
-fish: Too much data emitted by command substitution so it was discarded
-
-set b (string repeat -n 512 x)
-      ^
-
-####################
-# Command sub over the limit should fail
-fish: Too much data emitted by command substitution so it was discarded
-
-    set -l x (string repeat -n $argv x)
-             ^
-in function 'subme' with arguments '513'
-in command substitution
-
-####################
-# Make sure output from builtins outside of command substitution is not affected
-
-####################
-# Same builtin in a command substitution is affected
-fish: Too much data emitted by command substitution so it was discarded
-
-echo this will fail (string repeat --max 513 b) to output anything
-                    ^
diff --git a/tests/test_cmdsub.in b/tests/test_cmdsub.in
deleted file mode 100644
index 4ce23173c..000000000
--- a/tests/test_cmdsub.in
+++ /dev/null
@@ -1,33 +0,0 @@
-# This tests various corner cases involving command substitution. Most
-# importantly the limits on the amount of data we'll substitute.
-
-set fish_read_limit 512
-
-function subme
-    set -l x (string repeat -n $argv x)
-    echo $x
-end
-
-logmsg Command sub just under the limit should succeed
-set a (subme 511)
-set --show a
-
-logmsg Command sub at the limit should fail
-set b (string repeat -n 512 x)
-set saved_status $status
-test $saved_status -eq 122
-or echo expected status 122, saw $saved_status >&2
-set --show b
-
-logmsg Command sub over the limit should fail
-set c (subme 513)
-set --show c
-
-logmsg Make sure output from builtins outside of command substitution is not affected
-string repeat --max 513 a
-
-logmsg Same builtin in a command substitution is affected
-echo this will fail (string repeat --max 513 b) to output anything
-set saved_status $status
-test $saved_status -eq 122
-or echo expected status 122, saw $saved_status >&2
diff --git a/tests/test_cmdsub.out b/tests/test_cmdsub.out
deleted file mode 100644
index 53872dc00..000000000
--- a/tests/test_cmdsub.out
+++ /dev/null
@@ -1,30 +0,0 @@
-
-####################
-# Command sub just under the limit should succeed
-$a: not set in local scope
-$a: set in global scope, unexported, with 1 elements
-$a[1]: length=511 value=|xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|
-$a: not set in universal scope
-
-
-####################
-# Command sub at the limit should fail
-$b: not set in local scope
-$b: not set in global scope
-$b: not set in universal scope
-
-
-####################
-# Command sub over the limit should fail
-$c: not set in local scope
-$c: set in global scope, unexported, with 1 elements
-$c[1]: length=0 value=||
-$c: not set in universal scope
-
-
-####################
-# Make sure output from builtins outside of command substitution is not affected
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-####################
-# Same builtin in a command substitution is affected

From 4f205f38b46529d9c0a4375ac919337618544409 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 24 Jan 2020 16:08:56 -0800
Subject: [PATCH 1620/1732] Clean up a few bits about discarding buffers

We weren't properly propagating the 'discarded' stuff from output
streams to buffers. Fix that.
---
 src/io.cpp | 2 +-
 src/io.h   | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index a28f61010..7de1bbae5 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -48,7 +48,7 @@ void io_bufferfill_t::print() const { std::fwprintf(stderr, L"bufferfill {%d}\n"
 
 void io_buffer_t::append_from_stream(const output_stream_t &stream) {
     const separated_buffer_t<wcstring> &input = stream.buffer();
-    if (input.elements().empty()) return;
+    if (input.elements().empty() && !input.discarded()) return;
     scoped_lock locker(append_lock_);
     if (buffer_.discarded()) return;
     if (input.discarded()) {
diff --git a/src/io.h b/src/io.h
index 7503b664e..b0ba6890d 100644
--- a/src/io.h
+++ b/src/io.h
@@ -117,8 +117,6 @@ class separated_buffer_t {
         discard = true;
     }
 
-    void reset_discard() { discard = false; }
-
     /// Serialize the contents to a single string, where explicitly separated elements have a
     /// newline appended.
     StringType newline_serialized() const {
@@ -322,10 +320,7 @@ class io_buffer_t {
     bool fillthread_running() const { return fillthread_waiter_.valid(); }
 
    public:
-    explicit io_buffer_t(size_t limit) : buffer_(limit) {
-        // Explicitly reset the discard flag because we share this buffer.
-        buffer_.reset_discard();
-    }
+    explicit io_buffer_t(size_t limit) : buffer_(limit) {}
 
     ~io_buffer_t();
 

From b2969f4dfb7bd22912691d8d287f32eb303c60a2 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Sat, 25 Jan 2020 16:05:32 +0900
Subject: [PATCH 1621/1732] Fix typo in mplayer completions

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

diff --git a/share/completions/mplayer.fish b/share/completions/mplayer.fish
index 581739407..9eee41158 100644
--- a/share/completions/mplayer.fish
+++ b/share/completions/mplayer.fish
@@ -21,7 +21,7 @@ set mplayer_lang "
 	hu\tHungarian
 	pl\tPolish
 	pt\tPortugese
-	se\Swedish
+	se\tSwedish
 "
 
 complete -c mplayer -o autoq -d "Dynamically change postprocessing" -x

From 81306d3b300c732a70a15ba5e5a90a817cbfc5fa Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 18 Jan 2020 23:22:25 +0800
Subject: [PATCH 1622/1732] vendor_*.d: include /usr/local by default as
 "extra" directory

Closes #5029.
---
 CHANGELOG.md             |  2 +-
 cmake/Install.cmake      |  6 +++---
 sphinx_doc_src/index.rst | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f9a3182..77fb3b5ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -209,7 +209,7 @@
 - mandoc can now be used to format the output from `--help` if `nroff` is not installed, reducing the number of external dependencies on systems with `mandoc` installed (#5489).
 - Some bugs preventing building on Solaris-derived systems such as Illumos were fixed (#5458, #5461, #5611).
 - Completions for `npm`, `bower` and `yarn` no longer require the `jq` utility for full functionality, but will use Python instead if it is available.
-- Third-party completions are sourced first from `$XDG_DATA_DIRS/share/fish/vendor_completions.d` in addition to `(pkg-config fish --variable completionsdir)` which defaults to `$PREFIX/share/fish/vendor_completions.d`. Same for vendor_functions.d and vendor_conf.d (#5029).
+- The paths for completions, functions and configuration snippets have been extended. On systems that define `XDG_DATA_DIRS`, each of the directories in this variable are searched in the subdirectories `fish/vendor_completions.d`, `fish/vendor_functions.d`, and `fish/vendor_conf.d` respectively. On systems that do not define this variable in the environment, the vendor directories are searched for in both the installation prefix and the default "extra" directory, which now defaults to `/usr/local` (#5029).
 
 ---
 
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 045dc37e6..256e67360 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -25,15 +25,15 @@ SET(configure_input
  DO NOT MANUALLY EDIT THIS FILE!")
 
 SET(extra_completionsdir
-    ${datadir}/fish/vendor_completions.d
+    /usr/local/share/fish/vendor_completions.d
     CACHE STRING "Path for extra completions")
 
 SET(extra_functionsdir
-    ${datadir}/fish/vendor_functions.d
+    /usr/local/share/fish/vendor_functions.d
     CACHE STRING "Path for extra functions")
 
 SET(extra_confdir
-    ${datadir}/fish/vendor_conf.d
+    /usr/local/share/fish/vendor_conf.d
     CACHE STRING "Path for extra configuration")
 
 # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index fb8c20d16..7e1fa3ebb 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -383,7 +383,7 @@ By default ``$fish_function_path`` contains the following:
 
 - A directory for end-users to keep their own functions, usually ``~/.config/fish/functions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable).
 - A directory for systems administrators to install functions for all users on the system, usually ``/etc/fish/functions`` (really ``$__fish_sysconfdir/functions``).
-- A directory for third-party software vendors to ship their own functions for their software, usually ``/usr/share/fish/vendor_functions.d``. (set at compile time; by default, ``$__fish_data_dir/vendor_functions.d``)
+- Directories for third-party software vendors to ship their own functions for their software. Fish searches the directories in the ``XDG_DATA_DIRS`` environment variable for a ``fish/vendor_functions.d`` directory; if this variable is not defined, the default is usually to search ``/usr/share/fish/vendor_functions.d`` and ``/usr/local/share/fish/vendor_functions.d``.
 - The functions shipped with fish, usually installed in ``/usr/share/fish/functions`` (really ``$__fish_data_dir/functions``).
 
 These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
@@ -396,7 +396,7 @@ Autoloading also won't work for `event handlers <#event>`_, since fish cannot kn
 
 Autoloading is not applicable to functions created by the ``alias`` command. For functions simple enough that you prefer to use the ``alias`` command to define them you'll need to put those commands in your ``~/.config/fish/config.fish`` script or some other script run when the shell starts.
 
-If you are developing another program, you may wish to install functions which are available for all users of the fish shell on a system. They can be installed to the "vendor" functions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable functionsdir fish``.
+If you are developing another program, you may wish to install functions which are available for all users of the fish shell on a system. They can be installed to the "vendor" functions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable functionsdir fish``. Your installation system should support a custom path to override the pkgconfig path, as other distributors may need to alter it easily.
 
 .. _syntax-conditional:
 
@@ -1340,9 +1340,9 @@ By default, Fish searches the following for completions, using the first availab
 
 - A directory for end-users to keep their own completions, usually ``~/.config/fish/completions`` (controlled by the ``XDG_CONFIG_HOME`` environment variable);
 - A directory for systems administrators to install completions for all users on the system, usually ``/etc/fish/completions``;
-- A directory for third-party software vendors to ship their own completions for their software, usually ``/usr/share/fish/vendor_completions.d``;
+- Directories for third-party software vendors to ship their own completions for their software. Fish searches the directories in the ``XDG_DATA_DIRS`` environment variable for a ``fish/vendor_completions.d`` directory; if this variable is not defined, the default is usually to search ``/usr/share/fish/vendor_completions.d`` and ``/usr/local/share/fish/vendor_completions.d``;
 - The completions shipped with fish, usually installed in ``/usr/share/fish/completions``; and
-- Completions automatically generated from the operating system's manual, usually stored in ``~/.local/share/fish/generated_completions``.
+- Completions automatically generated from the operating system's manuals, usually stored in ``~/.local/share/fish/generated_completions``.
 
 These paths are controlled by parameters set at build, install, or run time, and may vary from the defaults listed above.
 
@@ -1350,7 +1350,7 @@ This wide search may be confusing. If you are unsure, your completions probably
 
 If you have written new completions for a common Unix command, please consider sharing your work by submitting it via the instructions in `Further help and development <#more-help>`_.
 
-If you are developing another program and would like to ship completions with your program, install them to the "vendor" completions directory. As this path may vary from system to system, the ``pkgconfig`` framework should be used to discover this path with the output of ``pkg-config --variable completionsdir fish``.
+If you are developing another program and would like to ship completions with your program, install them to the "vendor" completions directory. As this path may vary from system to system, the pkgconfig framework should be used to discover this path with the output of ``pkg-config --variable completionsdir fish``. Your installation system should support a custom path to override the pkgconfig path, as other distributors may need to alter it easily.
 
 
 .. _editor:
@@ -1623,7 +1623,7 @@ Configuration files are evaluated in the following order:
 
   - ``$__fish_config_dir/conf.d`` (by default, ``~/.config/fish/conf.d/``)
   - ``$__fish_sysconf_dir/conf.d`` (by default, ``/etc/fish/conf.d/``)
-  - ``/usr/share/fish/vendor_conf.d`` (set at compile time; by default, ``$__fish_data_dir/vendor_conf.d/``)
+  - Directories for third-party software vendors to ship their own configuration snippets for their software. Fish searches the directories in the ``XDG_DATA_DIRS`` environment variable for a ``fish/vendor_conf.d`` directory; if this variable is not defined, the default is usually to search ``/usr/share/fish/vendor_conf.d`` and ``/usr/local/share/fish/vendor_conf.d``
 
   If there are multiple files with the same name in these directories, only the first will be executed.
   They are executed in order of their filename, sorted (like globs) in a natural order (i.e. "01" sorts before "2").

From 8ff0c351a92e528029d1d237f7c2fd53ee6decb1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 20 Jan 2020 20:52:58 +0800
Subject: [PATCH 1623/1732] vendor_*.d: also create these directories in the
 prefix

---
 cmake/Install.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 256e67360..0f6570c89 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -113,13 +113,13 @@ INSTALL(FILES share/config.fish
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir)
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir)
 # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir)
-# Don't try too hard to create these directories as they may be outside our writeable area
-# https://github.com/Homebrew/homebrew-core/pull/2813
-FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
-FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir})
+# Create only the vendor directories inside the prefix (#5029 / #6508)
+FISH_CREATE_DIRS(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
+    ${rel_datadir}/fish/vendor_conf.d)
 
 # @echo "Installing pkgconfig file"
 # $v $(INSTALL) -m 644 fish.pc $(DESTDIR)$(datadir)/pkgconfig
+FISH_TRY_CREATE_DIRS(${rel_datadir}/pkgconfig)
 CONFIGURE_FILE(fish.pc.in fish.pc.noversion)
 
 ADD_CUSTOM_COMMAND(OUTPUT fish.pc

From f36a391f260f9bfd1ae85b25a029db907a62193b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 14:03:12 +0800
Subject: [PATCH 1624/1732] fish.desktop: install .desktop and icon

---
 cmake/Install.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 0f6570c89..cc2e234cb 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -216,6 +216,9 @@ IF(GETTEXT_FOUND)
   ENDFOREACH()
 ENDIF()
 
+INSTALL(FILES fish.desktop DESTINATION ${rel_datadir}/applications)
+INSTALL(FILES fish.png DESTINATION ${rel_datadir}/pixmaps)
+
 # Group install targets into a InstallTargets folder
 SET_PROPERTY(TARGET build_fish_pc CHECK-FISH-BUILD-VERSION-FILE
                     test_fishscript

From d910bada8229948b04982288c617822de12f04ab Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 18:04:14 +0800
Subject: [PATCH 1625/1732] fish.spec: include FreeDesktop entry in file lists

---
 fish.spec.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fish.spec.in b/fish.spec.in
index d9ce6a7a0..c94ef1c1e 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -121,3 +121,7 @@ fi
 
 # pkgconfig
 %{_datadir}/pkgconfig/fish.pc
+
+# FreeDesktop entry
+%{_datadir}/applications/fish.desktop
+%{_datadir}/pixmaps/fish.png

From 25810b70f25190d20c46b2c2f5bfb4d37b55c63a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 Jan 2020 11:37:10 +0100
Subject: [PATCH 1626/1732] Update littlecheck

This allows:

- Running scripts via shebang (not important here)
- Progress output (so we can ditch more of our run script)
- Context (only after, for now) - this is important if there is a test failure
---
 build_tools/littlecheck.py | 63 +++++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/build_tools/littlecheck.py b/build_tools/littlecheck.py
index 19759745c..f6a3f0c01 100755
--- a/build_tools/littlecheck.py
+++ b/build_tools/littlecheck.py
@@ -27,6 +27,10 @@ class Config(object):
         self.verbose = False
         # Whether output gets ANSI colorization.
         self.colorize = False
+        # Whether to show which file was tested.
+        self.progress = False
+        # How many after lines to print
+        self.after = 5
 
     def colors(self):
         """ Return a dictionary mapping color names to ANSI escapes """
@@ -112,13 +116,16 @@ class RunCmd(object):
 
 
 class TestFailure(object):
-    def __init__(self, line, check, testrun):
+    def __init__(self, line, check, testrun, after = None):
         self.line = line
         self.check = check
         self.testrun = testrun
         self.error_annotation_line = None
+        # The output that comes *after* the failure.
+        self.after = after
 
     def message(self):
+        afterlines = self.testrun.config.after
         fields = self.testrun.config.colors()
         fields["name"] = self.testrun.name
         fields["subbed_command"] = self.testrun.subbed_command
@@ -139,7 +146,8 @@ class TestFailure(object):
                     "check_type": self.check.type,
                 }
             )
-        fmtstrs = ["{RED}Failure{RESET} in {name}:", ""]
+        filemsg = "" if self.testrun.config.progress else " in {name}"
+        fmtstrs = ["{RED}Failure{RESET}" + filemsg + ":", ""]
         if self.line and self.check:
             fmtstrs += [
                 "  The {check_type} on line {input_lineno} wants:",
@@ -171,6 +179,12 @@ class TestFailure(object):
                 "  additional output on stderr:{error_annotation_lineno}:",
                 "    {BOLD}{error_annotation}{RESET}",
             ]
+        if self.after:
+            fields["additional_output"] = "    ".join(self.after[:afterlines])
+            fmtstrs += [
+                "  additional output:",
+                "    {BOLD}{additional_output}{RESET}",
+                ]
         fmtstrs += ["  when running command:", "    {subbed_command}"]
         return "\n".join(fmtstrs).format(**fields)
 
@@ -194,7 +208,9 @@ def perform_substitution(input_str, subs):
         for key, replacement in subs_ordered:
             if text.startswith(key):
                 return replacement + text[len(key) :]
-        raise CheckerError("Unknown substitution: " + m.group(0))
+        # No substitution found, so we default to running it as-is,
+        # which will end up running it via $PATH.
+        return text
 
     return re.sub(r"%(%|[a-zA-Z0-9_-]+)", subber, input_str)
 
@@ -224,7 +240,9 @@ class TestRun(object):
                 lineq.pop()
             else:
                 # Failed to match.
-                return TestFailure(line, check, self)
+                lineq.pop()
+                # Add context, ignoring empty lines.
+                return TestFailure(line, check, self, after = [line.text for line in lineq[::-1] if not line.is_empty_space()])
         # Drain empties.
         while lineq and lineq[-1].is_empty_space():
             lineq.pop()
@@ -258,6 +276,13 @@ class TestRun(object):
             close_fds=True,  # For Python 2.6 as shipped on RHEL 6
         )
         stdout, stderr = proc.communicate()
+        # HACK: This is quite cheesy: POSIX specifies that sh should return 127 for a missing command.
+        # Technically it's also possible to return it in other conditions.
+        # Practically, that's *probably* not going to happen.
+        status = proc.returncode
+        if status == 127:
+            raise CheckerError("Command could not be found: " + self.subbed_command)
+
         outlines = [
             Line(text, idx + 1, "stdout")
             for idx, text in enumerate(split_by_newlines(stdout))
@@ -343,7 +368,12 @@ class Checker(object):
         # Find run commands.
         self.runcmds = [RunCmd.parse(sl) for sl in group1s(RUN_RE)]
         if not self.runcmds:
-            raise CheckerError("No runlines ('# RUN') found")
+            # If no RUN command has been given, fall back to the shebang.
+            if lines[0].text.startswith("#!"):
+                # Remove the "#!" at the beginning, and the newline at the end.
+                self.runcmds = [RunCmd(lines[0].text[2:-1] + " %s", lines[0])]
+            else:
+                raise CheckerError("No runlines ('# RUN') found")
 
         # Find check cmds.
         self.outchecks = [
@@ -406,7 +436,22 @@ def get_argparse():
         action="append",
         default=[],
     )
+    parser.add_argument(
+        "-p",
+        "--progress",
+        action='store_true',
+        dest='progress',
+        help="Show the files to be checked",
+        default=False,
+    )
     parser.add_argument("file", nargs="+", help="File to check")
+    parser.add_argument(
+        "-A", "--after",
+        type=int,
+        help="How many non-empty lines of output after a failure to print (default: 5)",
+        action="store",
+        default=5,
+    )
     return parser
 
 
@@ -419,11 +464,19 @@ def main():
     success = True
     config = Config()
     config.colorize = sys.stdout.isatty()
+    config.progress = args.progress
+    fields = config.colors()
+    config.after = args.after
     for path in args.file:
+        fields["path"] = path
+        if config.progress:
+            print("Testing file {path} ... ".format(**fields), end='')
         subs = def_subs.copy()
         subs["s"] = path
         if not check_path(path, subs, config, TestFailure.print_message):
             success = False
+        elif config.progress:
+            print("{GREEN}ok{RESET}".format(**fields))
     sys.exit(0 if success else 1)
 
 

From cf508ee2283d3d1b710279bc3d2688a6685dc96f Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 Jan 2020 14:06:34 +0100
Subject: [PATCH 1627/1732] tests/job-ids: Wait for job to die

It was possible to start the new job and execute `jobs` again before
the job died (or we noticed it did), so the test would fail.

To properly test, we need to ensure the job has been removed. `wait`
should do it.
---
 tests/checks/job-ids.fish | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/checks/job-ids.fish b/tests/checks/job-ids.fish
index ecd8ad2c6..e94d2d800 100644
--- a/tests/checks/job-ids.fish
+++ b/tests/checks/job-ids.fish
@@ -33,6 +33,8 @@ jobs
 
 status job-control interactive
 command kill -9 $tokill[2]
+# Wait for the job to die - the signal needs to be delivered.
+wait $tokill[2] 2>/dev/null
 set -e tokill[2]
 status job-control full
 sleep 400 &

From 927f4f64ce0187ca8dea83e1486269a35044cb8e Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 17:09:24 +0800
Subject: [PATCH 1628/1732] debian packaging: drop menu entry as FreeDesktop
 menu now installed

---
 debian/menu | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 debian/menu

diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index ff443fd11..000000000
--- a/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(fish):needs="text" section="Applications/Shells"\
-  title="fish" command="/usr/bin/fish"

From 001ae861fb325224c54c8ae1e5bc923558355834 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 20:49:43 +0800
Subject: [PATCH 1629/1732] debian packaging: change priority from deprecated
 "extra" to "optional"

---
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7c809d417..aa4e9ec7e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: fish
 Section: shells
-Priority: extra
+Priority: optional
 Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
 Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
 Build-Depends: debhelper (>= 9.0.0), libncurses5-dev, cmake3 (>= 3.2.0) | cmake (>= 3.2.0), gettext,
@@ -37,7 +37,6 @@ Description: friendly interactive shell (architecture-independent files)
 Package: fish-dbg
 Architecture: any
 Section: debug
-Priority: extra
 Depends: fish (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for friendly interactive shell
  Fish is a command-line shell for modern systems, focusing on user-friendliness,

From 567aa1f4e37116cc2ef36d3cd9e4766da6cb12d0 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 20:58:46 +0800
Subject: [PATCH 1630/1732] debian packaging: bump in Debian standards
 versioning

Previous commits bring current packaging into line with version 4.1.5.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index aa4e9ec7e..95ae47843 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9.0.0), libncurses5-dev, cmake3 (>= 3.2.0) | cmake
 # Test dependencies
  locales-all
 # When libpcre2-dev is available on all supported Debian versions, add a dependency on that.
-Standards-Version: 3.9.7
+Standards-Version: 4.1.5
 Homepage: https://fishshell.com/
 Vcs-Git: https://github.com/fish-shell/fish-shell.git
 Vcs-Browser: https://github.com/fish-shell/fish-shell

From f5a3a259dc27121346c10dc51491572ba76bf918 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 25 Jan 2020 15:14:47 +0100
Subject: [PATCH 1631/1732] Fix littlecheck on python 2

---
 build_tools/littlecheck.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_tools/littlecheck.py b/build_tools/littlecheck.py
index f6a3f0c01..106478f0f 100755
--- a/build_tools/littlecheck.py
+++ b/build_tools/littlecheck.py
@@ -3,6 +3,7 @@
 """ Command line test driver. """
 
 from __future__ import unicode_literals
+from __future__ import print_function
 
 import argparse
 import io

From dc1ed1abf98c81dee8369628cc7cd995488d2f62 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 22:34:33 +0800
Subject: [PATCH 1632/1732] fish.spec: add overrides for FreeDesktop file on
 SUSE

---
 fish.spec.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fish.spec.in b/fish.spec.in
index c94ef1c1e..f805897cc 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -17,6 +17,10 @@ BuildRequires: cmake3
 BuildRequires: cmake pcre2-devel
 %endif
 
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
 %if 0%{?opensuse_bs} && 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires: gcc48 gcc48-c++ python-argparse
 %endif
@@ -73,6 +77,10 @@ make %{?_smp_mflags}
 %make_install
 %endif
 %find_lang %{name}
+# OpenSUSE has strong opinions about categories which do not apply to other systems
+%if 0%{?suse_version}
+%suse_update_desktop_file fish "System;TerminalEmulator;Shell"
+%endif
 
 %check
 # OpenSUSE does out-of-tree builds and defines __builddir

From 9b6a5b99a94c46afa5c6d575cc06edc2ccec1afc Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 25 Jan 2020 22:42:08 +0800
Subject: [PATCH 1633/1732] CHANGELOG: final work towards 3.1b1

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77fb3b5ad..b13ba82c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# fish 3.1.0
+# fish 3.1b1
 
 ## Notable improvements and fixes
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632).
@@ -71,6 +71,7 @@
 - A new `fish_cancel` event is emitted when the command line is cancelled, which is useful for terminal integration (#5973).
 
 ### Interactive improvements
+- New Base16 color options are available through the Web-based configuration (#6504).
 - fish only parses `/etc/paths` on macOS in login shells, matching the bash implementation (#5637) and avoiding changes to path ordering in child shells (#5456). It now ignores blank lines like the bash implementation (#5809).
 - The locale is now reloaded when the `LOCPATH` variable is changed (#5815).
 - `read` no longer keeps a history, making it suitable for operations that shouldn't end up there, like password entry (#5904).
@@ -88,7 +89,7 @@
 - Key bindings that call `fg` no longer leave the terminal in a broken state (#2114).
 - Brackets (#5831) and filenames containing `$` (#6060) are completed with appropriate escaping.
 - The output of `complete` and `functions` is now colorized in interactive terminals.
-- The Web-based configuration handles aliases that include single quotes correctly (#6120), and launches correctly under Termux (#6248).
+- The Web-based configuration handles aliases that include single quotes correctly (#6120), and launches correctly under Termux (#6248) and OpenBSD (#6522).
 - `function` now correctly validates parameters for `--argument-names` as valid variable names (#6147) and correctly parses options following `--argument-names`, as in "`--argument-names foo --description bar`" (#6186).
 - History newly imported from bash includes command lines using `&&` or `||`.
 - The automatic generation of completions from manual pages is better described in job and process listings, and no longer produces a warning when exiting fish (#6269).
@@ -134,7 +135,6 @@
 - Improvements to the display of wide characters, particularly Korean characters and emoji (#5583, #5729).
 - The Vi mode cursor is correctly redrawn when regaining focus under terminals that report focus (eg tmux) (#4788).
 - Variables that control background colors (such as `fish_pager_color_search_match`) can now use `--reverse`.
-- Added Base16 color options to `fish_config`
 
 #### Completions
 - Added completions for

From 788f359cda72b012c091580f3f20a391fd12cf06 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 Jan 2020 12:59:18 -0800
Subject: [PATCH 1634/1732] Make the cd check more robust on macOS

macOS `mktemp -d` likes to return symlinks. Guard against that possibility.
That allows the test to succeed when run directly, instead of through the
build target.
---
 tests/checks/cd.fish | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 3232e11f1..07d3d0a92 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -23,10 +23,9 @@ rm -rf $tmp
 cd $oldpwd
 
 # Create a test directory to store our stuff.
-set -l base /tmp/cdcomp_test
-rm -Rf $base
-mkdir -p $base
-set real (mktemp -d)
+# macOS likes to return symlinks from (mktemp -d), make sure it does not.
+set -l base (realpath (mktemp -d))
+set real (realpath (mktemp -d))
 set link $base/link
 ln -s $real $link
 cd $link
@@ -83,7 +82,7 @@ ln -s $base/realhome $base/linkhome
 cd $base/linkhome
 set -l real_getcwd (pwd -P)
 env HOME=$base/linkhome $fish -c 'echo PWD is $PWD'
-#CHECK: PWD is /tmp/cdcomp_test/linkhome
+#CHECK: PWD is {{.*}}/linkhome
 
 
 # Do not inherit a virtual PWD that fails to resolve to getcwd (#5647)

From 8a9c39d433fa32538f3a5c99dbf13df5f96d0843 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 Jan 2020 14:10:45 -0800
Subject: [PATCH 1635/1732] Add a test for some 'status' subcommands

---
 tests/checks/status-command.fish | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/checks/status-command.fish

diff --git a/tests/checks/status-command.fish b/tests/checks/status-command.fish
new file mode 100644
index 000000000..e13c2af88
--- /dev/null
+++ b/tests/checks/status-command.fish
@@ -0,0 +1,33 @@
+#RUN: env FISH_PATH=%fish FILE_PATH=%s %fish %s
+
+status line-number
+# CHECK: 3
+
+# Check status fish-path
+# No output expected on success
+set status_fish_path (realpath (status fish-path))
+set env_fish_path (realpath $FISH_PATH)
+test "$status_fish_path" = "$env_fish_path"
+or echo "Fish path disagreement: $status_fish_path vs $env_fish_path"
+
+# Check is-block
+status is-block ; echo $status
+begin ; status is-block ; echo $status ; end
+# CHECK: 1
+# CHECK: 0
+
+# Check filename
+set status_filename (status filename)
+test (status filename) = "$FILE_PATH"
+or echo "File path disagreement: $status_filename vs $FILE_PATH"
+
+function print_my_name
+    status function
+end
+print_my_name
+# CHECK: print_my_name
+
+status is-command-substitution; echo $status
+echo (status is-command-substitution; echo $status)
+# CHECK: 1
+# CHECK: 0

From e640a01ea5a1789e8ea69110e93073dabd786622 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 22 Jan 2020 11:58:10 -0800
Subject: [PATCH 1636/1732] Express cancellation as a possible result of
 expand_string

This allows us to properly thread control-C signals from command
substitutions into the expanding string.
---
 src/complete.cpp        | 3 +++
 src/expand.cpp          | 6 +++++-
 src/expand.h            | 2 ++
 src/parse_execution.cpp | 9 +++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 67d1522d2..088c0ec47 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -680,6 +680,9 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
                       this->expand_flags() | expand_flag::special_for_command |
                           expand_flag::for_completions | expand_flag::executables_only,
                       ctx);
+    if (result == expand_result_t::cancel) {
+        return;
+    }
     if (result != expand_result_t::error && this->wants_descriptions()) {
         this->complete_cmd_desc(str_cmd);
     }
diff --git a/src/expand.cpp b/src/expand.cpp
index 3cb203e6e..990295037 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -1012,7 +1012,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
                 case wildcard_expand_result_t::no_match:
                     break;
                 case wildcard_expand_result_t::cancel:
-                    result = expand_result_t::error;
+                    result = expand_result_t::cancel;
                     break;
             }
         }
@@ -1055,6 +1055,10 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
     expand_result_t total_result = expand_result_t::ok;
     for (stage_t stage : stages) {
         for (completion_t &comp : completions) {
+            if (ctx.check_cancel()) {
+                total_result = expand_result_t::cancel;
+                break;
+            }
             expand_result_t this_result =
                 (expand.*stage)(std::move(comp.completion), &output_storage);
             total_result = this_result;
diff --git a/src/expand.h b/src/expand.h
index 5b396c711..8aa2915cc 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -105,6 +105,8 @@ enum class expand_result_t {
     error,
     /// Expansion succeeded.
     ok,
+    /// Expansion was cancelled (e.g. control-C).
+    cancel,
     /// Expansion succeeded, but a wildcard in the string matched no files,
     /// so the output is empty.
     wildcard_no_match,
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 5f0de0765..f60d9d61f 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -465,6 +465,9 @@ eval_result_t parse_execution_context_t::run_switch_statement(
         case expand_result_t::error:
             return report_errors(errors);
 
+        case expand_result_t::cancel:
+            return eval_result_t::cancelled;
+
         case expand_result_t::wildcard_no_match:
             return report_unmatched_wildcard_error(switch_value_n);
 
@@ -874,6 +877,9 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
             case expand_result_t::error: {
                 return this->report_errors(errors);
             }
+            case expand_result_t::cancel: {
+                return eval_result_t::cancelled;
+            }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
@@ -1023,6 +1029,9 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
                 this->report_errors(errors);
                 return eval_result_t::error;
             }
+            case expand_result_t::cancel: {
+                return eval_result_t::cancelled;
+            }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
             case expand_result_t::ok: {
                 break;

From 81e78c78aad708b7289ebe1d011bcaf05798f74e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 23 Jan 2020 16:45:00 -0800
Subject: [PATCH 1637/1732] Rename eval_result_t to end_execution_reason_t

We're getting ready to stop returning eval_result_t from parser_t::eval
---
 src/builtin_eval.cpp    |   2 +-
 src/exec.cpp            |  24 ++---
 src/fish_tests.cpp      |   4 +-
 src/parse_execution.cpp | 226 ++++++++++++++++++++--------------------
 src/parse_execution.h   |  98 ++++++++---------
 src/parser.cpp          |  28 ++---
 src/parser.h            |  13 +--
 7 files changed, 202 insertions(+), 193 deletions(-)

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 589525dad..289024874 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -27,7 +27,7 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(new_cmd, *streams.io_chain) != eval_result_t::ok) {
+        if (parser.eval(new_cmd, *streams.io_chain) != end_execution_reason_t::ok) {
             status = STATUS_CMD_ERROR;
         } else if (cached_exec_count == parser.libdata().exec_count) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
diff --git a/src/exec.cpp b/src/exec.cpp
index 304b5a287..89550712c 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -707,15 +707,15 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
         return [=](parser_t &parser) {
-            eval_result_t res = parser.eval_node(source, node, lineage);
+            end_execution_reason_t res = parser.eval_node(source, node, lineage);
             switch (res) {
-                case eval_result_t::ok:
-                case eval_result_t::error:
-                case eval_result_t::cancelled:
+                case end_execution_reason_t::ok:
+                case end_execution_reason_t::error:
+                case end_execution_reason_t::cancelled:
                     return proc_status_t::from_exit_code(parser.get_last_status());
-                case eval_result_t::control_flow:
+                case end_execution_reason_t::control_flow:
                 default:
-                    DIE("eval_result_t::control_flow should not be returned from eval_node");
+                    DIE("end_execution_reason_t::control_flow should not be returned from eval_node");
             }
         };
     } else {
@@ -736,17 +736,17 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
             function_restore_environment(parser, fb);
 
             switch (res) {
-                case eval_result_t::ok:
+                case end_execution_reason_t::ok:
                     // If the function did not execute anything, treat it as success.
                     return proc_status_t::from_exit_code(saved_exec_count == ld.exec_count
                                                              ? EXIT_SUCCESS
                                                              : parser.get_last_status());
-                case eval_result_t::error:
-                case eval_result_t::cancelled:
+                case end_execution_reason_t::error:
+                case end_execution_reason_t::cancelled:
                     return proc_status_t::from_exit_code(parser.get_last_status());
                 default:
-                case eval_result_t::control_flow:
-                    DIE("eval_result_t::control_flow should not be returned from eval_node");
+                case end_execution_reason_t::control_flow:
+                    DIE("end_execution_reason_t::control_flow should not be returned from eval_node");
             }
         };
     }
@@ -1144,7 +1144,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
     // be null.
     std::shared_ptr<io_buffer_t> buffer;
     if (auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit)) {
-        if (parser.eval(cmd, io_chain_t{bufferfill}, block_type_t::subst) == eval_result_t::ok) {
+        if (parser.eval(cmd, io_chain_t{bufferfill}, block_type_t::subst) == end_execution_reason_t::ok) {
             subcommand_statuses = parser.get_last_statuses();
         }
         buffer = io_bufferfill_t::finish(std::move(bufferfill));
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index d3ecdfaf6..998cf9e36 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1033,7 +1033,7 @@ static void test_1_cancellation(const wchar_t *src) {
         usleep(delay * 1E6);
         pthread_kill(thread, SIGINT);
     });
-    eval_result_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler});
+    end_execution_reason_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler});
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
@@ -1041,7 +1041,7 @@ static void test_1_cancellation(const wchar_t *src) {
     }
     // TODO: cancelling out of command substitutions is currently reported as an error, not a
     // cancellation.
-    // do_test(ret == eval_result_t::cancelled);
+    // do_test(ret == end_execution_reason_t::cancelled);
     (void)ret;
     iothread_drain_all();
 }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index f60d9d61f..6dc3e81f7 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -185,19 +185,19 @@ process_type_t parse_execution_context_t::process_type_for_command(
     return process_type;
 }
 
-maybe_t<eval_result_t> parse_execution_context_t::check_end_execution() const {
+maybe_t<end_execution_reason_t> parse_execution_context_t::check_end_execution() const {
     if (shell_is_exiting()) {
-        return eval_result_t::cancelled;
+        return end_execution_reason_t::cancelled;
     }
     if (parser && parser->cancellation_signal) {
-        return eval_result_t::cancelled;
+        return end_execution_reason_t::cancelled;
     }
     const auto &ld = parser->libdata();
     if (ld.returning) {
-        return eval_result_t::control_flow;
+        return end_execution_reason_t::control_flow;
     }
     if (ld.loop_status != loop_status_t::normals) {
-        return eval_result_t::control_flow;
+        return end_execution_reason_t::control_flow;
     }
     return none();
 }
@@ -236,9 +236,9 @@ bool parse_execution_context_t::job_is_simple_block(tnode_t<g::job> job_node) co
     }
 }
 
-eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statement> statement,
-                                                          const block_t *associated_block) {
-    eval_result_t result = eval_result_t::ok;
+end_execution_reason_t parse_execution_context_t::run_if_statement(
+    tnode_t<g::if_statement> statement, const block_t *associated_block) {
+    end_execution_reason_t result = end_execution_reason_t::ok;
 
     // We have a sequence of if clauses, with a final else, resulting in a single job list that we
     // execute.
@@ -259,14 +259,14 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
         tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
         tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
 
-        // Check the condition and the tail. We treat eval_result_t::error here as failure, in
+        // Check the condition and the tail. We treat end_execution_reason_t::error here as failure, in
         // accordance with historic behavior.
-        eval_result_t cond_ret = run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == eval_result_t::ok) {
+        end_execution_reason_t cond_ret = run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == end_execution_reason_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
         const bool take_branch =
-            (cond_ret == eval_result_t::ok) && parser->get_last_status() == EXIT_SUCCESS;
+            (cond_ret == end_execution_reason_t::ok) && parser->get_last_status() == EXIT_SUCCESS;
 
         if (take_branch) {
             // Condition succeeded.
@@ -320,25 +320,27 @@ eval_result_t parse_execution_context_t::run_if_statement(tnode_t<g::if_statemen
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_begin_statement(tnode_t<g::job_list> contents) {
+end_execution_reason_t parse_execution_context_t::run_begin_statement(
+    tnode_t<g::job_list> contents) {
     // Basic begin/end block. Push a scope block, run jobs, pop it
     trace_if_enabled(*parser, L"begin");
     block_t *sb = parser->push_block(block_t::scope_block(block_type_t::begin));
-    eval_result_t ret = run_job_list(contents, sb);
+    end_execution_reason_t ret = run_job_list(contents, sb);
     parser->pop_block(sb);
     trace_if_enabled(*parser, L"end begin");
     return ret;
 }
 
 // Define a function.
-eval_result_t parse_execution_context_t::run_function_statement(
+end_execution_reason_t parse_execution_context_t::run_function_statement(
     tnode_t<grammar::block_statement> statement, tnode_t<grammar::function_header> header) {
     // Get arguments.
     wcstring_list_t arguments;
     argument_node_list_t arg_nodes = header.descendants<g::argument>();
-    eval_result_t result = this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
+    end_execution_reason_t result =
+        this->expand_arguments_from_nodes(arg_nodes, &arguments, failglob);
 
-    if (result != eval_result_t::ok) {
+    if (result != end_execution_reason_t::ok) {
         return result;
     }
     trace_if_enabled(*parser, L"function", arguments);
@@ -349,18 +351,18 @@ eval_result_t parse_execution_context_t::run_function_statement(
     wcstring errtext = streams.err.contents();
     if (!errtext.empty()) {
         this->report_error(header, L"%ls", errtext.c_str());
-        result = eval_result_t::error;
+        result = end_execution_reason_t::error;
     }
 
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_statement> statement,
-                                                             const block_t *associated_block) {
+end_execution_reason_t parse_execution_context_t::run_block_statement(
+    tnode_t<g::block_statement> statement, const block_t *associated_block) {
     tnode_t<g::block_header> bheader = statement.child<0>();
     tnode_t<g::job_list> contents = statement.child<1>();
 
-    eval_result_t ret = eval_result_t::ok;
+    end_execution_reason_t ret = end_execution_reason_t::ok;
     if (auto header = bheader.try_get_child<g::for_header, 0>()) {
         ret = run_for_statement(header, contents);
     } else if (auto header = bheader.try_get_child<g::while_header, 0>()) {
@@ -376,7 +378,7 @@ eval_result_t parse_execution_context_t::run_block_statement(tnode_t<g::block_st
     return ret;
 }
 
-eval_result_t parse_execution_context_t::run_for_statement(
+end_execution_reason_t parse_execution_context_t::run_for_statement(
     tnode_t<grammar::for_header> header, tnode_t<grammar::job_list> block_contents) {
     // Get the variable name: `for var_name in ...`. We expand the variable name. It better result
     // in just one.
@@ -384,14 +386,14 @@ eval_result_t parse_execution_context_t::run_for_statement(
     wcstring for_var_name = get_source(var_name_node);
     if (!expand_one(for_var_name, expand_flags_t{}, ctx)) {
         report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
 
     // Get the contents to iterate over.
     wcstring_list_t arguments;
-    eval_result_t ret = this->expand_arguments_from_nodes(get_argument_nodes(header.child<3>()),
-                                                          &arguments, nullglob);
-    if (ret != eval_result_t::ok) {
+    end_execution_reason_t ret = this->expand_arguments_from_nodes(
+        get_argument_nodes(header.child<3>()), &arguments, nullglob);
+    if (ret != end_execution_reason_t::ok) {
         return ret;
     }
 
@@ -399,7 +401,7 @@ eval_result_t parse_execution_context_t::run_for_statement(
     if (var && var->read_only()) {
         report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
                      for_var_name.c_str());
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
     int retval;
     if (var) {
@@ -411,7 +413,7 @@ eval_result_t parse_execution_context_t::run_for_statement(
 
     if (!valid_var_name(for_var_name)) {
         report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
 
     trace_if_enabled(*parser, L"for", arguments);
@@ -432,7 +434,7 @@ eval_result_t parse_execution_context_t::run_for_statement(
         ld.loop_status = loop_status_t::normals;
         this->run_job_list(block_contents, fb);
 
-        if (check_end_execution() == eval_result_t::control_flow) {
+        if (check_end_execution() == end_execution_reason_t::control_flow) {
             // Handle break or continue.
             bool do_break = (ld.loop_status == loop_status_t::breaks);
             ld.loop_status = loop_status_t::normals;
@@ -447,9 +449,8 @@ eval_result_t parse_execution_context_t::run_for_statement(
     return ret;
 }
 
-eval_result_t parse_execution_context_t::run_switch_statement(
+end_execution_reason_t parse_execution_context_t::run_switch_statement(
     tnode_t<grammar::switch_statement> statement) {
-
     // Get the switch variable.
     tnode_t<grammar::argument> switch_value_n = statement.child<1>();
     const wcstring switch_value = get_source(switch_value_n);
@@ -466,7 +467,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
             return report_errors(errors);
 
         case expand_result_t::cancel:
-            return eval_result_t::cancelled;
+            return end_execution_reason_t::cancelled;
 
         case expand_result_t::wildcard_no_match:
             return report_unmatched_wildcard_error(switch_value_n);
@@ -487,7 +488,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
         switch_value_expanded = std::move(switch_values_expanded.front().completion);
     }
 
-    eval_result_t result = eval_result_t::ok;
+    end_execution_reason_t result = end_execution_reason_t::ok;
     block_t *sb = parser->push_block(block_t::switch_block());
 
     // Expand case statements.
@@ -504,9 +505,9 @@ eval_result_t parse_execution_context_t::run_switch_statement(
         // contains an unexpandable process will report and then fail to match.
         auto arg_nodes = get_argument_nodes(case_item.child<1>());
         wcstring_list_t case_args;
-        eval_result_t case_result =
+        end_execution_reason_t case_result =
             this->expand_arguments_from_nodes(arg_nodes, &case_args, failglob);
-        if (case_result == eval_result_t::ok) {
+        if (case_result == end_execution_reason_t::ok) {
             for (const wcstring &arg : case_args) {
                 // Unescape wildcards so they can be expanded again.
                 wcstring unescaped_arg = parse_util_unescape_wildcards(arg);
@@ -524,7 +525,7 @@ eval_result_t parse_execution_context_t::run_switch_statement(
 
     if (matching_case_item) {
         // Success, evaluate the job list.
-        assert(result == eval_result_t::ok && "Expected success");
+        assert(result == end_execution_reason_t::ok && "Expected success");
         auto job_list = matching_case_item.child<3>();
         result = this->run_job_list(job_list, sb);
     }
@@ -533,10 +534,10 @@ eval_result_t parse_execution_context_t::run_switch_statement(
     return result;
 }
 
-eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::while_header> header,
-                                                             tnode_t<grammar::job_list> contents,
-                                                             const block_t *associated_block) {
-    eval_result_t ret = eval_result_t::ok;
+end_execution_reason_t parse_execution_context_t::run_while_statement(
+    tnode_t<grammar::while_header> header, tnode_t<grammar::job_list> contents,
+    const block_t *associated_block) {
+    end_execution_reason_t ret = end_execution_reason_t::ok;
 
     // "The exit status of the while loop shall be the exit status of the last compound-list-2
     // executed, or zero if none was executed."
@@ -564,15 +565,16 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
         first_cond_check = false;
 
         // Check the condition.
-        eval_result_t cond_ret = this->run_job_conjunction(condition_head, associated_block);
-        if (cond_ret == eval_result_t::ok) {
+        end_execution_reason_t cond_ret =
+            this->run_job_conjunction(condition_head, associated_block);
+        if (cond_ret == end_execution_reason_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
         }
 
         // If the loop condition failed to execute, then exit the loop without modifying the exit
         // status. If the loop condition executed with a failure status, restore the status and then
         // exit the loop.
-        if (cond_ret != eval_result_t::ok) {
+        if (cond_ret != end_execution_reason_t::ok) {
             break;
         } else if (parser->get_last_status() != EXIT_SUCCESS) {
             parser->set_last_statuses(cond_saved_status);
@@ -594,7 +596,7 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
         auto cancel_reason = this->check_end_execution();
         parser->pop_block(wb);
 
-        if (cancel_reason == eval_result_t::control_flow) {
+        if (cancel_reason == end_execution_reason_t::control_flow) {
             // Handle break or continue.
             bool do_break = (ld.loop_status == loop_status_t::breaks);
             ld.loop_status = loop_status_t::normals;
@@ -615,10 +617,10 @@ eval_result_t parse_execution_context_t::run_while_statement(tnode_t<grammar::wh
     return ret;
 }
 
-// Reports an error. Always returns eval_result_t::error, so you can assign the result to an
+// Reports an error. Always returns end_execution_reason_t::error, so you can assign the result to an
 // 'errored' variable.
-eval_result_t parse_execution_context_t::report_error(const parse_node_t &node, const wchar_t *fmt,
-                                                      ...) const {
+end_execution_reason_t parse_execution_context_t::report_error(const parse_node_t &node,
+                                                               const wchar_t *fmt, ...) const {
     // Create an error.
     parse_error_list_t error_list = parse_error_list_t(1);
     parse_error_t *error = &error_list.at(0);
@@ -632,10 +634,11 @@ eval_result_t parse_execution_context_t::report_error(const parse_node_t &node,
     va_end(va);
 
     this->report_errors(error_list);
-    return eval_result_t::error;
+    return end_execution_reason_t::error;
 }
 
-eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t &error_list) const {
+end_execution_reason_t parse_execution_context_t::report_errors(
+    const parse_error_list_t &error_list) const {
     if (!parser->cancellation_signal) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
@@ -650,19 +653,19 @@ eval_result_t parse_execution_context_t::report_errors(const parse_error_list_t
             std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
     }
-    return eval_result_t::error;
+    return end_execution_reason_t::error;
 }
 
-/// Reports an unmatched wildcard error and returns eval_result_t::error.
-eval_result_t parse_execution_context_t::report_unmatched_wildcard_error(
+/// Reports an unmatched wildcard error and returns end_execution_reason_t::error.
+end_execution_reason_t parse_execution_context_t::report_unmatched_wildcard_error(
     const parse_node_t &unmatched_wildcard) const {
     parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
     report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
-    return eval_result_t::error;
+    return end_execution_reason_t::error;
 }
 
 /// Handle the case of command not found.
-eval_result_t parse_execution_context_t::handle_command_not_found(
+end_execution_reason_t parse_execution_context_t::handle_command_not_found(
     const wcstring &cmd_str, tnode_t<g::plain_statement> statement, int err_code) {
     // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
     // status to 127, which is the standard number used by other shells like bash and zsh.
@@ -676,10 +679,10 @@ eval_result_t parse_execution_context_t::handle_command_not_found(
         wcstring_list_t event_args;
         {
             auto args = get_argument_nodes(statement.child<1>());
-            eval_result_t arg_result =
+            end_execution_reason_t arg_result =
                 this->expand_arguments_from_nodes(args, &event_args, failglob);
 
-            if (arg_result != eval_result_t::ok) {
+            if (arg_result != end_execution_reason_t::ok) {
                 return arg_result;
             }
 
@@ -696,12 +699,12 @@ eval_result_t parse_execution_context_t::handle_command_not_found(
     int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
     parser->set_last_statuses(statuses_t::just(status));
 
-    return eval_result_t::error;
+    return end_execution_reason_t::error;
 }
 
-eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_statement> statement,
-                                                        wcstring *out_cmd,
-                                                        wcstring_list_t *out_args) const {
+end_execution_reason_t parse_execution_context_t::expand_command(
+    tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
+    wcstring_list_t *out_args) const {
     // Here we're expanding a command, for example $HOME/bin/stuff or $randomthing. The first
     // completion becomes the command itself, everything after becomes arguments. Command
     // substitutions are not supported.
@@ -731,11 +734,11 @@ eval_result_t parse_execution_context_t::expand_command(tnode_t<grammar::plain_s
     if (out_cmd->empty()) {
         return this->report_error(statement, _(L"The expanded command was empty."));
     }
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
 /// Creates a 'normal' (non-block) process.
-eval_result_t parse_execution_context_t::populate_plain_process(
+end_execution_reason_t parse_execution_context_t::populate_plain_process(
     job_t *job, process_t *proc, tnode_t<grammar::plain_statement> statement) {
     assert(job != nullptr);
     assert(proc != nullptr);
@@ -747,7 +750,7 @@ eval_result_t parse_execution_context_t::populate_plain_process(
     wcstring cmd;
     wcstring_list_t args_from_cmd_expansion;
     auto ret = expand_command(statement, &cmd, &args_from_cmd_expansion);
-    if (ret != eval_result_t::ok) {
+    if (ret != end_execution_reason_t::ok) {
         return ret;
     }
     assert(!cmd.empty() && "expand_command should not produce an empty command");
@@ -774,7 +777,7 @@ eval_result_t parse_execution_context_t::populate_plain_process(
             if (isatty(STDIN_FILENO) && current_run_count - 1 != last_exec_run_count) {
                 reader_bg_job_warning(*parser);
                 last_exec_run_count = current_run_count;
-                return eval_result_t::error;
+                return end_execution_reason_t::error;
             } else {
                 hup_background_jobs(*parser);
             }
@@ -830,15 +833,15 @@ eval_result_t parse_execution_context_t::populate_plain_process(
         cmd_args.insert(cmd_args.end(), args_from_cmd_expansion.begin(),
                         args_from_cmd_expansion.end());
         argument_node_list_t arg_nodes = statement.descendants<g::argument>();
-        eval_result_t arg_result =
+        end_execution_reason_t arg_result =
             this->expand_arguments_from_nodes(arg_nodes, &cmd_args, glob_behavior);
-        if (arg_result != eval_result_t::ok) {
+        if (arg_result != end_execution_reason_t::ok) {
             return arg_result;
         }
 
         // The set of IO redirections that we construct for the process.
         if (!this->determine_redirections(statement.child<1>(), &redirections)) {
-            return eval_result_t::error;
+            return end_execution_reason_t::error;
         }
 
         // Determine the process type.
@@ -850,12 +853,12 @@ eval_result_t parse_execution_context_t::populate_plain_process(
     proc->set_argv(cmd_args);
     proc->set_redirection_specs(std::move(redirections));
     proc->actual_cmd = std::move(path_to_external_command);
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
 // Determine the list of arguments, expanding stuff. Reports any errors caused by expansion. If we
 // have a wildcard that could not be expanded, report the error and continue.
-eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
+end_execution_reason_t parse_execution_context_t::expand_arguments_from_nodes(
     const argument_node_list_t &argument_nodes, wcstring_list_t *out_arguments,
     globspec_t glob_behavior) {
     // Get all argument nodes underneath the statement. We guess we'll have that many arguments (but
@@ -878,13 +881,13 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
                 return this->report_errors(errors);
             }
             case expand_result_t::cancel: {
-                return eval_result_t::cancelled;
+                return end_execution_reason_t::cancelled;
             }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
                     report_unmatched_wildcard_error(arg_node);
-                    return eval_result_t::error;
+                    return end_execution_reason_t::error;
                 }
                 break;
             }
@@ -910,7 +913,7 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
         return *ret;
     }
 
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
 bool parse_execution_context_t::determine_redirections(
@@ -959,7 +962,7 @@ bool parse_execution_context_t::determine_redirections(
     return true;
 }
 
-eval_result_t parse_execution_context_t::populate_not_process(
+end_execution_reason_t parse_execution_context_t::populate_not_process(
     job_t *job, process_t *proc, tnode_t<g::not_statement> not_statement) {
     auto &flags = job->mut_flags();
     flags.negate = !flags.negate;
@@ -968,7 +971,7 @@ eval_result_t parse_execution_context_t::populate_not_process(
         flags.has_time_prefix = true;
         if (!job->mut_flags().foreground) {
             this->report_error(not_statement, ERROR_TIME_BACKGROUND);
-            return eval_result_t::error;
+            return end_execution_reason_t::error;
         }
     }
     return this->populate_job_process(
@@ -977,9 +980,9 @@ eval_result_t parse_execution_context_t::populate_not_process(
 }
 
 template <typename Type>
-eval_result_t parse_execution_context_t::populate_block_process(job_t *job, process_t *proc,
-                                                                tnode_t<g::statement> statement,
-                                                                tnode_t<Type> specific_statement) {
+end_execution_reason_t parse_execution_context_t::populate_block_process(
+    job_t *job, process_t *proc, tnode_t<g::statement> statement,
+    tnode_t<Type> specific_statement) {
     // We handle block statements by creating process_type_t::block_node, that will bounce back to
     // us when it's time to execute them.
     UNUSED(job);
@@ -994,22 +997,22 @@ eval_result_t parse_execution_context_t::populate_block_process(job_t *job, proc
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
     redirection_spec_list_t redirections;
     if (!this->determine_redirections(arguments, &redirections)) {
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
 
     proc->type = process_type_t::block_node;
     proc->block_node_source = pstree;
     proc->internal_block_node = statement;
     proc->set_redirection_specs(std::move(redirections));
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
-eval_result_t parse_execution_context_t::apply_variable_assignments(
+end_execution_reason_t parse_execution_context_t::apply_variable_assignments(
     process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
     const block_t **block) {
     variable_assignment_node_list_t assignment_list =
         get_variable_assignment_nodes(variable_assignments);
-    if (assignment_list.empty()) return eval_result_t::ok;
+    if (assignment_list.empty()) return end_execution_reason_t::ok;
     *block = parser->push_block(block_t::variable_assignment_block());
     for (const auto &variable_assignment : assignment_list) {
         const wcstring &source = variable_assignment.get_source(pstree->src);
@@ -1027,10 +1030,10 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         switch (expand_ret) {
             case expand_result_t::error: {
                 this->report_errors(errors);
-                return eval_result_t::error;
+                return end_execution_reason_t::error;
             }
             case expand_result_t::cancel: {
-                return eval_result_t::cancelled;
+                return end_execution_reason_t::cancelled;
             }
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
             case expand_result_t::ok: {
@@ -1048,21 +1051,22 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
         if (proc) proc->variable_assignments.push_back({variable_name, vals});
         parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals));
     }
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
-eval_result_t parse_execution_context_t::populate_job_process(
+end_execution_reason_t parse_execution_context_t::populate_job_process(
     job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
     tnode_t<grammar::variable_assignments> variable_assignments) {
     // Get the "specific statement" which is boolean / block / if / switch / decorated.
     const parse_node_t &specific_statement = statement.get_child_node<0>();
 
     const block_t *block = nullptr;
-    eval_result_t result = this->apply_variable_assignments(proc, variable_assignments, &block);
+    end_execution_reason_t result =
+        this->apply_variable_assignments(proc, variable_assignments, &block);
     cleanup_t scope([&]() {
         if (block) parser->pop_block(block);
     });
-    if (result != eval_result_t::ok) return eval_result_t::error;
+    if (result != end_execution_reason_t::ok) return end_execution_reason_t::error;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1099,7 +1103,7 @@ eval_result_t parse_execution_context_t::populate_job_process(
     return result;
 }
 
-eval_result_t parse_execution_context_t::populate_job_from_job_node(
+end_execution_reason_t parse_execution_context_t::populate_job_from_job_node(
     job_t *j, tnode_t<grammar::job> job_node, const block_t *associated_block) {
     UNUSED(associated_block);
 
@@ -1119,10 +1123,10 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
         j->mut_flags().has_time_prefix = true;
         if (job_node_is_background(job_node)) {
             this->report_error(job_node, ERROR_TIME_BACKGROUND);
-            return eval_result_t::error;
+            return end_execution_reason_t::error;
         }
     }
-    eval_result_t result =
+    end_execution_reason_t result =
         this->populate_job_process(j, processes.back().get(), statement, variable_assignments);
 
     // Construct process_ts for job continuations (pipelines), by walking the list until we hit the
@@ -1130,7 +1134,7 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     tnode_t<g::job_continuation> job_cont = job_node.child<3>();
     assert(job_cont);
     while (auto pipe = job_cont.try_get_child<g::tok_pipe, 0>()) {
-        if (result != eval_result_t::ok) {
+        if (result != end_execution_reason_t::ok) {
             break;
         }
         auto variable_assignments = job_cont.require_get_child<g::variable_assignments, 2>();
@@ -1167,7 +1171,7 @@ eval_result_t parse_execution_context_t::populate_job_from_job_node(
     processes.back()->is_last_in_job = true;
 
     // Return what happened.
-    if (result == eval_result_t::ok) {
+    if (result == end_execution_reason_t::ok) {
         // Link up the processes.
         assert(!processes.empty());  //!OCLINT(multiple unary operator)
         j->processes = std::move(processes);
@@ -1185,8 +1189,8 @@ static bool remove_job(parser_t &parser, job_t *job) {
     return false;
 }
 
-eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
-                                                   const block_t *associated_block) {
+end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
+                                                            const block_t *associated_block) {
     if (auto ret = check_end_execution()) {
         return *ret;
     }
@@ -1196,7 +1200,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
 
     // Increment the eval_level for the duration of this command.
@@ -1221,7 +1225,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
         cleanup_t timer = push_timer(optional_time.tag() == parse_optional_time_time);
         tnode_t<g::variable_assignments> variable_assignments = job_node.child<1>();
         const block_t *block = nullptr;
-        eval_result_t result =
+        end_execution_reason_t result =
             this->apply_variable_assignments(nullptr, variable_assignments, &block);
         cleanup_t scope([&]() {
             if (block) parser->pop_block(block);
@@ -1230,7 +1234,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
         tnode_t<g::statement> statement = job_node.child<2>();
         const parse_node_t &specific_statement = statement.get_child_node<0>();
         assert(specific_statement_type_is_redirectable_block(specific_statement));
-        if (result == eval_result_t::ok) {
+        if (result == end_execution_reason_t::ok) {
             switch (specific_statement.type) {
                 case symbol_block_statement: {
                     result =
@@ -1298,7 +1302,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
-    eval_result_t pop_result =
+    end_execution_reason_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
 
     assert(libdata.caller_job_id == job->job_id() && "Caller job ID unexpectedly changed");
@@ -1310,7 +1314,7 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
     }
 
     // Clean up the job on failure or cancellation.
-    if (pop_result == eval_result_t::ok) {
+    if (pop_result == end_execution_reason_t::ok) {
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
 
@@ -1341,16 +1345,16 @@ eval_result_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_node,
         profile_item->parse = static_cast<int>(parse_time - start_time);
         profile_item->exec = static_cast<int>(exec_time - parse_time);
         profile_item->cmd = job ? job->command() : wcstring();
-        profile_item->skipped = (pop_result != eval_result_t::ok);
+        profile_item->skipped = (pop_result != end_execution_reason_t::ok);
     }
 
     job_reap(*parser, false);  // clean up jobs
     return pop_result;
 }
 
-eval_result_t parse_execution_context_t::run_job_conjunction(
+end_execution_reason_t parse_execution_context_t::run_job_conjunction(
     tnode_t<grammar::job_conjunction> job_expr, const block_t *associated_block) {
-    eval_result_t result = eval_result_t::ok;
+    end_execution_reason_t result = end_execution_reason_t::ok;
     tnode_t<g::job_conjunction> cursor = job_expr;
     // continuation is the parent of the cursor
     tnode_t<g::job_conjunction_continuation> continuation;
@@ -1390,13 +1394,13 @@ bool parse_execution_context_t::should_skip(parse_job_decoration_t type) const {
 }
 
 template <typename Type>
-eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
-                                                      const block_t *associated_block) {
+end_execution_reason_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
+                                                               const block_t *associated_block) {
     // We handle both job_list and andor_job_list uniformly.
     static_assert(Type::token == symbol_job_list || Type::token == symbol_andor_job_list,
                   "Not a job list");
 
-    eval_result_t result = eval_result_t::ok;
+    end_execution_reason_t result = end_execution_reason_t::ok;
     while (auto job_conj = job_list.template next_in_list<g::job_conjunction>()) {
         if (auto reason = check_end_execution()) {
             result = *reason;
@@ -1406,7 +1410,7 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
         // Maybe skip the job if it has a leading and/or.
         // Skipping is treated as success.
         if (should_skip(get_decorator(job_conj))) {
-            result = eval_result_t::ok;
+            result = end_execution_reason_t::ok;
         } else {
             result = this->run_job_conjunction(job_conj, associated_block);
         }
@@ -1416,11 +1420,11 @@ eval_result_t parse_execution_context_t::run_job_list(tnode_t<Type> job_list,
     return result;
 }
 
-eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
-                                                   const block_t *associated_block) {
+end_execution_reason_t parse_execution_context_t::eval_node(tnode_t<g::statement> statement,
+                                                            const block_t *associated_block) {
     assert(statement && "Empty node in eval_node");
     assert(statement.matches_node_tree(tree()) && "statement has unexpected tree");
-    enum eval_result_t status = eval_result_t::ok;
+    enum end_execution_reason_t status = end_execution_reason_t::ok;
     if (auto block = statement.try_get_child<g::block_statement, 0>()) {
         status = this->run_block_statement(block, associated_block);
     } else if (auto ifstat = statement.try_get_child<g::if_statement, 0>()) {
@@ -1435,8 +1439,8 @@ eval_result_t parse_execution_context_t::eval_node(tnode_t<g::statement> stateme
     return status;
 }
 
-eval_result_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
-                                                   const block_t *associated_block) {
+end_execution_reason_t parse_execution_context_t::eval_node(tnode_t<g::job_list> job_list,
+                                                            const block_t *associated_block) {
     // Apply this block IO for the duration of this function.
     assert(job_list && "Empty node in eval_node");
     assert(job_list.matches_node_tree(tree()) && "job_list has unexpected tree");
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 8a87b0305..436bbe6ec 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -17,7 +17,7 @@ class parser_t;
 /// An eval_result represents evaluation errors including wildcards which failed to match, syntax
 /// errors, or other expansion errors. It also tracks when evaluation was skipped due to signal
 /// cancellation. Note it does not track the exit status of commands.
-enum class eval_result_t {
+enum class end_execution_reason_t {
     /// Evaluation was successfull.
     ok,
 
@@ -49,20 +49,21 @@ class parse_execution_context_t {
 
     // Check to see if we should end execution.
     // \return the eval result to end with, or none() to continue on.
-    // This will never return eval_result_t::ok.
-    maybe_t<eval_result_t> check_end_execution() const;
+    // This will never return end_execution_reason_t::ok.
+    maybe_t<end_execution_reason_t> check_end_execution() const;
 
-    // Report an error. Always returns 'eval_result_t::error'.
-    eval_result_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    eval_result_t report_errors(const parse_error_list_t &error_list) const;
+    // Report an error. Always returns 'end_execution_reason_t::error'.
+    end_execution_reason_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
+    end_execution_reason_t report_errors(const parse_error_list_t &error_list) const;
 
     // Wildcard error helper.
-    eval_result_t report_unmatched_wildcard_error(const parse_node_t &unmatched_wildcard) const;
+    end_execution_reason_t report_unmatched_wildcard_error(
+        const parse_node_t &unmatched_wildcard) const;
 
     /// Command not found support.
-    eval_result_t handle_command_not_found(const wcstring &cmd,
-                                           tnode_t<grammar::plain_statement> statement,
-                                           int err_code);
+    end_execution_reason_t handle_command_not_found(const wcstring &cmd,
+                                                    tnode_t<grammar::plain_statement> statement,
+                                                    int err_code);
 
     // Utilities
     wcstring get_source(const parse_node_t &node) const;
@@ -71,8 +72,8 @@ class parse_execution_context_t {
 
     // Expand a command which may contain variables, producing an expand command and possibly
     // arguments. Prints an error message on error.
-    eval_result_t expand_command(tnode_t<grammar::plain_statement> statement, wcstring *out_cmd,
-                                 wcstring_list_t *out_args) const;
+    end_execution_reason_t expand_command(tnode_t<grammar::plain_statement> statement,
+                                          wcstring *out_cmd, wcstring_list_t *out_args) const;
 
     /// Return whether we should skip a job with the given bool statement type.
     bool should_skip(parse_job_decoration_t type) const;
@@ -82,57 +83,58 @@ class parse_execution_context_t {
 
     enum process_type_t process_type_for_command(tnode_t<grammar::plain_statement> statement,
                                                  const wcstring &cmd) const;
-    eval_result_t apply_variable_assignments(
+    end_execution_reason_t apply_variable_assignments(
         process_t *proc, tnode_t<grammar::variable_assignments> variable_assignments,
         const block_t **block);
 
     // These create process_t structures from statements.
-    eval_result_t populate_job_process(job_t *job, process_t *proc,
-                                       tnode_t<grammar::statement> statement,
-                                       tnode_t<grammar::variable_assignments> variable_assignments);
-    eval_result_t populate_not_process(job_t *job, process_t *proc,
-                                       tnode_t<grammar::not_statement> not_statement);
-    eval_result_t populate_plain_process(job_t *job, process_t *proc,
-                                         tnode_t<grammar::plain_statement> statement);
+    end_execution_reason_t populate_job_process(
+        job_t *job, process_t *proc, tnode_t<grammar::statement> statement,
+        tnode_t<grammar::variable_assignments> variable_assignments);
+    end_execution_reason_t populate_not_process(job_t *job, process_t *proc,
+                                                tnode_t<grammar::not_statement> not_statement);
+    end_execution_reason_t populate_plain_process(job_t *job, process_t *proc,
+                                                  tnode_t<grammar::plain_statement> statement);
 
     template <typename Type>
-    eval_result_t populate_block_process(job_t *job, process_t *proc,
-                                         tnode_t<grammar::statement> statement,
-                                         tnode_t<Type> specific_statement);
+    end_execution_reason_t populate_block_process(job_t *job, process_t *proc,
+                                                  tnode_t<grammar::statement> statement,
+                                                  tnode_t<Type> specific_statement);
 
     // These encapsulate the actual logic of various (block) statements.
-    eval_result_t run_block_statement(tnode_t<grammar::block_statement> statement,
-                                      const block_t *associated_block);
-    eval_result_t run_for_statement(tnode_t<grammar::for_header> header,
-                                    tnode_t<grammar::job_list> contents);
-    eval_result_t run_if_statement(tnode_t<grammar::if_statement> statement,
-                                   const block_t *associated_block);
-    eval_result_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
-    eval_result_t run_while_statement(tnode_t<grammar::while_header> header,
-                                      tnode_t<grammar::job_list> contents,
-                                      const block_t *associated_block);
-    eval_result_t run_function_statement(tnode_t<grammar::block_statement> statement,
-                                         tnode_t<grammar::function_header> header);
-    eval_result_t run_begin_statement(tnode_t<grammar::job_list> contents);
+    end_execution_reason_t run_block_statement(tnode_t<grammar::block_statement> statement,
+                                               const block_t *associated_block);
+    end_execution_reason_t run_for_statement(tnode_t<grammar::for_header> header,
+                                             tnode_t<grammar::job_list> contents);
+    end_execution_reason_t run_if_statement(tnode_t<grammar::if_statement> statement,
+                                            const block_t *associated_block);
+    end_execution_reason_t run_switch_statement(tnode_t<grammar::switch_statement> statement);
+    end_execution_reason_t run_while_statement(tnode_t<grammar::while_header> header,
+                                               tnode_t<grammar::job_list> contents,
+                                               const block_t *associated_block);
+    end_execution_reason_t run_function_statement(tnode_t<grammar::block_statement> statement,
+                                                  tnode_t<grammar::function_header> header);
+    end_execution_reason_t run_begin_statement(tnode_t<grammar::job_list> contents);
 
     enum globspec_t { failglob, nullglob };
     using argument_node_list_t = std::vector<tnode_t<grammar::argument>>;
-    eval_result_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
-                                              wcstring_list_t *out_arguments,
-                                              globspec_t glob_behavior);
+    end_execution_reason_t expand_arguments_from_nodes(const argument_node_list_t &argument_nodes,
+                                                       wcstring_list_t *out_arguments,
+                                                       globspec_t glob_behavior);
 
     // Determines the list of redirections for a node. Returns none() on failure, for example, an
     // invalid fd.
     bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
                                 redirection_spec_list_t *out_redirections);
 
-    eval_result_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
-    eval_result_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
-                                      const block_t *associated_block);
+    end_execution_reason_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
+    end_execution_reason_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
+                                               const block_t *associated_block);
     template <typename Type>
-    eval_result_t run_job_list(tnode_t<Type> job_list_node, const block_t *associated_block);
-    eval_result_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
-                                             const block_t *associated_block);
+    end_execution_reason_t run_job_list(tnode_t<Type> job_list_node,
+                                        const block_t *associated_block);
+    end_execution_reason_t populate_job_from_job_node(job_t *j, tnode_t<grammar::job> job_node,
+                                                      const block_t *associated_block);
 
     // Returns the line number of the node. Not const since it touches cached_lineno_offset.
     int line_offset_of_node(tnode_t<grammar::job> node);
@@ -157,8 +159,10 @@ class parse_execution_context_t {
 
     /// Start executing at the given node. Returns 0 if there was no error, 1 if there was an
     /// error.
-    eval_result_t eval_node(tnode_t<grammar::statement> statement, const block_t *associated_block);
-    eval_result_t eval_node(tnode_t<grammar::job_list> job_list, const block_t *associated_block);
+    end_execution_reason_t eval_node(tnode_t<grammar::statement> statement,
+                                     const block_t *associated_block);
+    end_execution_reason_t eval_node(tnode_t<grammar::job_list> job_list,
+                                     const block_t *associated_block);
 };
 
 #endif
diff --git a/src/parser.cpp b/src/parser.cpp
index 381b8ac06..ab5644761 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -614,8 +614,8 @@ profile_item_t *parser_t::create_profile_item() {
     return result;
 }
 
-eval_result_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
-                             enum block_type_t block_type) {
+end_execution_reason_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
+                                      enum block_type_t block_type) {
     // Parse the source into a tree, if we can.
     parse_error_list_t error_list;
     if (parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list)) {
@@ -627,12 +627,12 @@ eval_result_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
 
         // Print it.
         std::fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
-        return eval_result_t::error;
+        return end_execution_reason_t::error;
     }
 }
 
-eval_result_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io,
-                             enum block_type_t block_type) {
+end_execution_reason_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io,
+                                      enum block_type_t block_type) {
     assert(block_type == block_type_t::top || block_type == block_type_t::subst);
     if (!ps->tree.empty()) {
         job_lineage_t lineage;
@@ -641,12 +641,12 @@ eval_result_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
         return this->eval_node(ps, start, std::move(lineage), block_type);
     }
-    return eval_result_t::ok;
+    return end_execution_reason_t::ok;
 }
 
 template <typename T>
-eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
-                                  job_lineage_t lineage, block_type_t block_type) {
+end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
+                                           job_lineage_t lineage, block_type_t block_type) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -655,7 +655,7 @@ eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node
     // not empty, we are still in the process of cancelling; refuse to evaluate anything.
     if (this->cancellation_signal) {
         if (!block_list.empty()) {
-            return eval_result_t::cancelled;
+            return end_execution_reason_t::cancelled;
         }
         this->cancellation_signal = 0;
     }
@@ -674,7 +674,7 @@ eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(&execution_context, make_unique<parse_execution_context_t>(
                                                            ps, this, op_ctx, std::move(lineage)));
-    eval_result_t res = execution_context->eval_node(node, scope_block);
+    end_execution_reason_t res = execution_context->eval_node(node, scope_block);
     exc.restore();
     this->pop_block(scope_block);
 
@@ -682,16 +682,16 @@ eval_result_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node
 
     // control_flow is used internally to react to break and return.
     // Here we treat that as success.
-    if (res == eval_result_t::control_flow) {
-        res = eval_result_t::ok;
+    if (res == end_execution_reason_t::control_flow) {
+        res = end_execution_reason_t::ok;
     }
     return res;
 }
 
 // Explicit instantiations. TODO: use overloads instead?
-template eval_result_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::statement>,
+template end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::statement>,
                                            job_lineage_t, block_type_t);
-template eval_result_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::job_list>,
+template end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::job_list>,
                                            job_lineage_t, block_type_t);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
diff --git a/src/parser.h b/src/parser.h
index 4ae3cc920..494fe7164 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -268,19 +268,20 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// or 'subst'.
     ///
     /// \return the eval result,
-    eval_result_t eval(const wcstring &cmd, const io_chain_t &io,
-                       block_type_t block_type = block_type_t::top);
+    end_execution_reason_t eval(const wcstring &cmd, const io_chain_t &io,
+                                block_type_t block_type = block_type_t::top);
 
     /// Evaluate the parsed source ps.
     /// Because the source has been parsed, a syntax error is impossible.
-    eval_result_t eval(const parsed_source_ref_t &ps, const io_chain_t &io,
-                       block_type_t block_type = block_type_t::top);
+    end_execution_reason_t eval(const parsed_source_ref_t &ps, const io_chain_t &io,
+                                block_type_t block_type = block_type_t::top);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    eval_result_t eval_node(const parsed_source_ref_t &ps, tnode_t<T> node, job_lineage_t lineage,
-                            block_type_t block_type = block_type_t::top);
+    end_execution_reason_t eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
+                                     job_lineage_t lineage,
+                                     block_type_t block_type = block_type_t::top);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used

From 38f43306832d3f2cc5ed54ae892ee48fa20fdf13 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 23 Jan 2020 17:34:46 -0800
Subject: [PATCH 1638/1732] Rationalize $status and errors

Prior to this fix, fish was rather inconsistent in when $status gets set
in response to an error. For example, a failed expansion like "$foo["
would not modify $status.

This makes the following inter-related changes:

1. String expansion now directly returns the value to set for $status on
error. The value is always used.

2. parser_t::eval() now directly returns the proc_status_t, which cleans
up a lot of call sites.

3. We expose a new function exec_subshell_for_expand() which ignores
$status but returns errors specifically related to subshell expansion.

4. We reify the notion of "expansion breaking" errors. These include
command-not-found, expand syntax errors, and others.

The upshot is we are more consistent about always setting $status on
errors.
---
 src/builtin_eval.cpp           |   9 +-
 src/common.h                   |   2 +
 src/complete.cpp               |  63 +++++++------
 src/exec.cpp                   | 165 +++++++++++++++------------------
 src/exec.h                     |  19 ++--
 src/expand.cpp                 |  61 ++++++------
 src/expand.h                   |  43 +++++++--
 src/fish_tests.cpp             |   7 +-
 src/parse_execution.cpp        | 152 ++++++++++++++----------------
 src/parse_execution.h          |  20 ++--
 src/parser.cpp                 |  53 +++++++----
 src/parser.h                   |  35 +++++--
 src/reader.cpp                 |   4 +-
 tests/checks/cmdsub-limit.fish |   3 -
 tests/checks/eval.fish         |   4 +-
 tests/checks/invocation.fish   |   6 +-
 tests/checks/status-value.fish |  26 ++++++
 17 files changed, 364 insertions(+), 308 deletions(-)
 create mode 100644 tests/checks/status-value.fish

diff --git a/src/builtin_eval.cpp b/src/builtin_eval.cpp
index 289024874..41512e63f 100644
--- a/src/builtin_eval.cpp
+++ b/src/builtin_eval.cpp
@@ -24,19 +24,16 @@ int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         new_cmd += argv[i];
     }
 
-    const auto cached_exec_count = parser.libdata().exec_count;
     int status = STATUS_CMD_OK;
     if (argc > 1) {
-        if (parser.eval(new_cmd, *streams.io_chain) != end_execution_reason_t::ok) {
-            status = STATUS_CMD_ERROR;
-        } else if (cached_exec_count == parser.libdata().exec_count) {
+        auto res = parser.eval(new_cmd, *streams.io_chain);
+        if (res.was_empty) {
             // Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
             // where we have an argument but nothing is executed.
             status = STATUS_CMD_OK;
         } else {
-            status = parser.get_last_status();
+            status = res.status.status_value();
         }
     }
-
     return status;
 }
diff --git a/src/common.h b/src/common.h
index d453e4b1d..6a0dcc656 100644
--- a/src/common.h
+++ b/src/common.h
@@ -817,6 +817,8 @@ enum {
     STATUS_ILLEGAL_CMD = 123,
     /// The status code used when `read` is asked to consume too much data.
     STATUS_READ_TOO_MUCH = 122,
+    /// The status code when an expansion fails, for example, "$foo["
+    STATUS_EXPAND_ERROR = 121,
 };
 
 /* Normally casting an expression to void discards its value, but GCC
diff --git a/src/complete.cpp b/src/complete.cpp
index 088c0ec47..507c1e9b6 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -615,41 +615,40 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     // systems with a large set of manuals, but it should be ok since apropos is only called once.
     lookup.clear();
     list.clear();
-    if (exec_subshell(lookup_cmd, *ctx.parser, list, false /* don't apply exit status */) != -1) {
-        // Then discard anything that is not a possible completion and put the result into a
-        // hashtable with the completion as key and the description as value.
-        //
-        // Should be reasonably fast, since no memory allocations are needed.
-        // mqudsi: I don't know if the above were ever true, but it's certainly not any more.
-        // Plenty of allocations below.
-        for (const wcstring &elstr : list) {
-            if (elstr.length() < cmd.length()) continue;
-            const wcstring fullkey(elstr, cmd.length());
+    (void)exec_subshell(lookup_cmd, *ctx.parser, list, false /* don't apply exit status */);
+    // Then discard anything that is not a possible completion and put the result into a
+    // hashtable with the completion as key and the description as value.
+    //
+    // Should be reasonably fast, since no memory allocations are needed.
+    // mqudsi: I don't know if the above were ever true, but it's certainly not any more.
+    // Plenty of allocations below.
+    for (const wcstring &elstr : list) {
+        if (elstr.length() < cmd.length()) continue;
+        const wcstring fullkey(elstr, cmd.length());
 
-            size_t tab_idx = fullkey.find(L'\t');
-            if (tab_idx == wcstring::npos) continue;
+        size_t tab_idx = fullkey.find(L'\t');
+        if (tab_idx == wcstring::npos) continue;
 
-            const wcstring key(fullkey, 0, tab_idx);
-            wcstring val(fullkey, tab_idx + 1);
+        const wcstring key(fullkey, 0, tab_idx);
+        wcstring val(fullkey, tab_idx + 1);
 
-            // And once again I make sure the first character is uppercased because I like it that
-            // way, and I get to decide these things.
-            if (!val.empty()) val[0] = towupper(val[0]);
-            lookup[key] = val;
-        }
+        // And once again I make sure the first character is uppercased because I like it that
+        // way, and I get to decide these things.
+        if (!val.empty()) val[0] = towupper(val[0]);
+        lookup[key] = val;
+    }
 
-        // Then do a lookup on every completion and if a match is found, change to the new
-        // description.
-        //
-        // This needs to do a reallocation for every description added, but there shouldn't be that
-        // many completions, so it should be ok.
-        for (auto &completion : completions) {
-            const wcstring &el = completion.completion;
-            if (el.empty()) continue;
+    // Then do a lookup on every completion and if a match is found, change to the new
+    // description.
+    //
+    // This needs to do a reallocation for every description added, but there shouldn't be that
+    // many completions, so it should be ok.
+    for (auto &completion : completions) {
+        const wcstring &el = completion.completion;
+        if (el.empty()) continue;
 
-            auto new_desc_iter = lookup.find(el);
-            if (new_desc_iter != lookup.end()) completion.description = new_desc_iter->second;
-        }
+        auto new_desc_iter = lookup.find(el);
+        if (new_desc_iter != lookup.end()) completion.description = new_desc_iter->second;
     }
 }
 
@@ -683,7 +682,7 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
     if (result == expand_result_t::cancel) {
         return;
     }
-    if (result != expand_result_t::error && this->wants_descriptions()) {
+    if (result == expand_result_t::ok && this->wants_descriptions()) {
         this->complete_cmd_desc(str_cmd);
     }
 
@@ -1592,7 +1591,7 @@ void completer_t::perform() {
                     auto expand_ret = expand_string(expression, &expression_expanded,
                                                     expand_flag::no_descriptions, ctx);
                     wcstring_list_t vals;
-                    if (expand_ret != expand_result_t::error) {
+                    if (expand_ret == expand_result_t::ok) {
                         for (auto &completion : expression_expanded)
                             vals.emplace_back(std::move(completion.completion));
                         ctx.parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT,
diff --git a/src/exec.cpp b/src/exec.cpp
index 89550712c..0076d4262 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -706,18 +706,7 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
         const parsed_source_ref_t &source = p->block_node_source;
         tnode_t<grammar::statement> node = p->internal_block_node;
         assert(source && node && "Process is missing node info");
-        return [=](parser_t &parser) {
-            end_execution_reason_t res = parser.eval_node(source, node, lineage);
-            switch (res) {
-                case end_execution_reason_t::ok:
-                case end_execution_reason_t::error:
-                case end_execution_reason_t::cancelled:
-                    return proc_status_t::from_exit_code(parser.get_last_status());
-                case end_execution_reason_t::control_flow:
-                default:
-                    DIE("end_execution_reason_t::control_flow should not be returned from eval_node");
-            }
-        };
+        return [=](parser_t &parser) { return parser.eval_node(source, node, lineage).status; };
     } else {
         assert(p->type == process_type_t::function);
         auto props = function_get_properties(p->argv0());
@@ -729,25 +718,15 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
         return [=](parser_t &parser) {
             // Pull out the job list from the function.
             tnode_t<grammar::job_list> body = props->func_node.child<1>();
-            const auto &ld = parser.libdata();
-            auto saved_exec_count = ld.exec_count;
             const block_t *fb = function_prepare_environment(parser, *argv, *props);
             auto res = parser.eval_node(props->parsed_source, body, lineage);
             function_restore_environment(parser, fb);
 
-            switch (res) {
-                case end_execution_reason_t::ok:
-                    // If the function did not execute anything, treat it as success.
-                    return proc_status_t::from_exit_code(saved_exec_count == ld.exec_count
-                                                             ? EXIT_SUCCESS
-                                                             : parser.get_last_status());
-                case end_execution_reason_t::error:
-                case end_execution_reason_t::cancelled:
-                    return proc_status_t::from_exit_code(parser.get_last_status());
-                default:
-                case end_execution_reason_t::control_flow:
-                    DIE("end_execution_reason_t::control_flow should not be returned from eval_node");
+            // If the function did not execute anything, treat it as success.
+            if (res.was_empty) {
+                res = proc_status_t::from_exit_code(EXIT_SUCCESS);
             }
+            return res.status;
         };
     }
 }
@@ -879,7 +858,7 @@ static bool exec_process_in_job(parser_t &parser, process_t *p, const std::share
     }
 
     if (p->type != process_type_t::block_node) {
-        // An simple `begin ... end` should not be considered an execution of a command.
+        // A simple `begin ... end` should not be considered an execution of a command.
         parser.libdata().exec_count++;
     }
 
@@ -1121,60 +1100,10 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
     return true;
 }
 
-static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstring_list_t *lst,
-                                  bool apply_exit_status, bool is_subcmd) {
-    ASSERT_IS_MAIN_THREAD();
-    auto &ld = parser.libdata();
-    bool prev_subshell = ld.is_subshell;
-    auto prev_statuses = parser.get_last_statuses();
-    bool split_output = false;
-
-    auto prev_read_limit = ld.read_limit;
-    ld.read_limit = is_subcmd ? read_byte_limit : 0;
-
-    const auto ifs = parser.vars().get(L"IFS");
-    if (!ifs.missing_or_empty()) {
-        split_output = true;
-    }
-
-    ld.is_subshell = true;
-    auto subcommand_statuses = statuses_t::just(-1);  // assume the worst
-
-    // IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
-    // be null.
-    std::shared_ptr<io_buffer_t> buffer;
-    if (auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit)) {
-        if (parser.eval(cmd, io_chain_t{bufferfill}, block_type_t::subst) == end_execution_reason_t::ok) {
-            subcommand_statuses = parser.get_last_statuses();
-        }
-        buffer = io_bufferfill_t::finish(std::move(bufferfill));
-    }
-
-    if (buffer && buffer->buffer().discarded()) {
-        subcommand_statuses = statuses_t::just(STATUS_READ_TOO_MUCH);
-    }
-
-    // If the caller asked us to preserve the exit status, restore the old status. Otherwise set the
-    // status of the subcommand.
-    if (apply_exit_status) {
-        // Hack: If the evaluation failed, avoid returning -1 to the user.
-        if (subcommand_statuses.status == -1) {
-            parser.set_last_statuses(statuses_t::just(255));
-        } else {
-            parser.set_last_statuses(subcommand_statuses);
-        }
-    } else {
-        parser.set_last_statuses(std::move(prev_statuses));
-    }
-
-    ld.is_subshell = prev_subshell;
-    ld.read_limit = prev_read_limit;
-
-    if (lst == nullptr || !buffer) {
-        return subcommand_statuses.status;
-    }
+/// Populate \p lst with the output of \p buffer, perhaps splitting lines according to \p split.
+static void populate_subshell_output(wcstring_list_t *lst, const io_buffer_t &buffer, bool split) {
     // Walk over all the elements.
-    for (const auto &elem : buffer->buffer().elements()) {
+    for (const auto &elem : buffer.buffer().elements()) {
         if (elem.is_explicitly_separated()) {
             // Just append this one.
             lst->push_back(str2wcstring(elem.contents));
@@ -1185,7 +1114,7 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
         assert(!elem.is_explicitly_separated() && "should not be explicitly separated");
         const char *begin = elem.contents.data();
         const char *end = begin + elem.contents.size();
-        if (split_output) {
+        if (split) {
             const char *cursor = begin;
             while (cursor < end) {
                 // Look for the next separator.
@@ -1210,17 +1139,73 @@ static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstrin
             lst->push_back(str2wcstring(begin, end - begin));
         }
     }
+}
 
-    return subcommand_statuses.status;
+/// Execute \p cmd in a subshell in \p parser. If \p lst is not null, populate it with the output.
+/// Return $status in \p out_status.
+/// If \p apply_exit_status is false, then reset $status back to its original value.
+/// \p is_subcmd controls whether we apply a read limit.
+/// \p break_expand is used to propagate whether the result should be "expansion breaking" in the
+/// sense that subshells used during string expansion should halt that expansion. \return the value
+/// of $status.
+static int exec_subshell_internal(const wcstring &cmd, parser_t &parser, wcstring_list_t *lst,
+                                  bool *break_expand, bool apply_exit_status, bool is_subcmd) {
+    ASSERT_IS_MAIN_THREAD();
+    auto &ld = parser.libdata();
+
+    scoped_push<bool> is_subshell(&ld.is_subshell, true);
+    scoped_push<size_t> read_limit(&ld.read_limit, is_subcmd ? read_byte_limit : 0);
+
+    auto prev_statuses = parser.get_last_statuses();
+    const cleanup_t put_back([&] {
+        if (!apply_exit_status) {
+            parser.set_last_statuses(prev_statuses);
+        }
+    });
+
+    const bool split_output = !parser.vars().get(L"IFS").missing_or_empty();
+
+    // IO buffer creation may fail (e.g. if we have too many open files to make a pipe), so this may
+    // be null.
+    auto bufferfill = io_bufferfill_t::create(fd_set_t{}, ld.read_limit);
+    if (!bufferfill) {
+        *break_expand = true;
+        return STATUS_CMD_ERROR;
+    }
+    eval_res_t eval_res = parser.eval(cmd, io_chain_t{bufferfill}, block_type_t::subst);
+    std::shared_ptr<io_buffer_t> buffer = io_bufferfill_t::finish(std::move(bufferfill));
+    if (buffer->buffer().discarded()) {
+        *break_expand = true;
+        return STATUS_READ_TOO_MUCH;
+    }
+
+    if (eval_res.break_expand) {
+        *break_expand = true;
+        return eval_res.status.status_value();
+    }
+
+    if (lst) {
+        populate_subshell_output(lst, *buffer, split_output);
+    }
+    *break_expand = false;
+    return eval_res.status.status_value();
+}
+
+int exec_subshell_for_expand(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs) {
+    ASSERT_IS_MAIN_THREAD();
+    bool break_expand = false;
+    int ret = exec_subshell_internal(cmd, parser, &outputs, &break_expand, true, true);
+    // Only return an error code if we should break expansion.
+    return break_expand ? ret : STATUS_CMD_OK;
+}
+
+int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status) {
+    bool break_expand = false;
+    return exec_subshell_internal(cmd, parser, nullptr, &break_expand, apply_exit_status, false);
 }
 
 int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs,
-                  bool apply_exit_status, bool is_subcmd) {
-    ASSERT_IS_MAIN_THREAD();
-    return exec_subshell_internal(cmd, parser, &outputs, apply_exit_status, is_subcmd);
-}
-
-int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status, bool is_subcmd) {
-    ASSERT_IS_MAIN_THREAD();
-    return exec_subshell_internal(cmd, parser, nullptr, apply_exit_status, is_subcmd);
+                  bool apply_exit_status) {
+    bool break_expand = false;
+    return exec_subshell_internal(cmd, parser, &outputs, &break_expand, apply_exit_status, false);
 }
diff --git a/src/exec.h b/src/exec.h
index af3f1481b..7f9b03fab 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -17,17 +17,22 @@ struct job_lineage_t;
 class parser_t;
 bool exec_job(parser_t &parser, const std::shared_ptr<job_t> &j, const job_lineage_t &lineage);
 
-/// Evaluate the expression cmd in a subshell, add the outputs into the list l. On return, the
-/// status flag as returned bu \c proc_gfet_last_status will not be changed.
+/// Evaluate a command.
 ///
 /// \param cmd the command to execute
-/// \param outputs The list to insert output into.
+/// \param parser the parser with which to execute code
+/// \param outputs the list to insert output into.
+/// \param apply_exit_status if set, update $status within the parser, otherwise do not.
 ///
-/// \return the status of the last job to exit, or -1 if en error was encountered.
+/// \return a value appropriate for populating $status.
+int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status);
 int exec_subshell(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs,
-                  bool apply_exit_status, bool is_subcmd = false);
-int exec_subshell(const wcstring &cmd, parser_t &parser, bool apply_exit_status,
-                  bool is_subcmd = false);
+                  bool apply_exit_status);
+
+/// Like exec_subshell, but only returns expansion-breaking errors. That is, a zero return means
+/// "success" (even though the command may have failed), a non-zero return means that we should
+/// halt expansion.
+int exec_subshell_for_expand(const wcstring &cmd, parser_t &parser, wcstring_list_t &outputs);
 
 /// Loops over close until the syscall was run without being interrupted.
 void exec_close(int fd);
diff --git a/src/expand.cpp b/src/expand.cpp
index 990295037..c175180de 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -528,7 +528,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
 
     if (syntax_error) {
         append_syntax_error(errors, SOURCE_LOCATION_UNKNOWN, _(L"Mismatched braces"));
-        return expand_result_t::error;
+        return expand_result_t::make_error(STATUS_EXPAND_ERROR);
     }
 
     if (brace_begin == nullptr) {
@@ -574,9 +574,10 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     return expand_result_t::ok;
 }
 
-/// Perform cmdsubst expansion.
-static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t *out_list,
-                            parse_error_list_t *errors) {
+/// Expand a command substitution \p input, executing on \p parser, and inserting the results into
+/// \p out_list, or any errors into \p errors. \return an expand result.
+static expand_result_t expand_cmdsubst(wcstring input, parser_t &parser,
+                                       completion_list_t *out_list, parse_error_list_t *errors) {
     wchar_t *paren_begin = nullptr, *paren_end = nullptr;
     wchar_t *tail_begin = nullptr;
     size_t i, j;
@@ -586,11 +587,11 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t
     switch (parse_util_locate_cmdsubst(in, &paren_begin, &paren_end, false)) {
         case -1: {
             append_syntax_error(errors, SOURCE_LOCATION_UNKNOWN, L"Mismatched parenthesis");
-            return false;
+            return expand_result_t::make_error(STATUS_EXPAND_ERROR);
         }
         case 0: {
             append_completion(out_list, std::move(input));
-            return true;
+            return expand_result_t::ok;
         }
         case 1: {
             break;
@@ -603,18 +604,23 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t
 
     wcstring_list_t sub_res;
     const wcstring subcmd(paren_begin + 1, paren_end - paren_begin - 1);
-    if (exec_subshell(subcmd, parser, sub_res, true /* apply_exit_status */,
-                      true /* is_subcmd */) == -1) {
-        append_cmdsub_error(errors, SOURCE_LOCATION_UNKNOWN,
-                            L"Unknown error while evaluating command substitution");
-        return false;
-    }
-
-    if (parser.get_last_status() == STATUS_READ_TOO_MUCH) {
-        append_cmdsub_error(
-            errors, in - paren_begin,
-            _(L"Too much data emitted by command substitution so it was discarded\n"));
-        return false;
+    int subshell_status = exec_subshell_for_expand(subcmd, parser, sub_res);
+    if (subshell_status != 0) {
+        // TODO: Ad-hoc switch, how can we enumerate the possible errors more safely?
+        const wchar_t *err;
+        switch (subshell_status) {
+            case STATUS_READ_TOO_MUCH:
+                err = L"Too much data emitted by command substitution so it was discarded";
+                break;
+            case STATUS_CMD_ERROR:
+                err = L"Too many active file descriptors";
+                break;
+            default:
+                err = L"Unknown error while evaluating command substitution";
+                break;
+        }
+        append_cmdsub_error(errors, in - paren_begin, _(err));
+        return expand_result_t::make_error(subshell_status);
     }
 
     tail_begin = paren_end + 1;
@@ -627,7 +633,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t
         bad_pos = parse_slice(slice_begin, &slice_end, slice_idx, sub_res.size());
         if (bad_pos != 0) {
             append_syntax_error(errors, slice_begin - in + bad_pos, L"Invalid index value");
-            return false;
+            return expand_result_t::make_error(STATUS_EXPAND_ERROR);
         }
 
         wcstring_list_t sub_res2;
@@ -684,7 +690,7 @@ static bool expand_cmdsubst(wcstring input, parser_t &parser, completion_list_t
         }
     }
 
-    return parser.get_last_status() != STATUS_READ_TOO_MUCH;
+    return expand_result_t::ok;
 }
 
 // Given that input[0] is HOME_DIRECTORY or tilde (ugh), return the user's name. Return the empty
@@ -885,21 +891,18 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, completion_list_t *ou
         switch (parse_util_locate_cmdsubst_range(input, &cur, nullptr, &start, &end, true)) {
             case 0:
                 append_completion(out, std::move(input));
-                break;
+                return expand_result_t::ok;
             case 1:
                 append_cmdsub_error(errors, start, L"Command substitutions not allowed");
                 /* intentionally falls through */
             case -1:
             default:
-                return expand_result_t::error;
+                return expand_result_t::make_error(STATUS_EXPAND_ERROR);
         }
     } else {
         assert(ctx.parser && "Must have a parser to expand command substitutions");
-        bool cmdsubst_ok = expand_cmdsubst(std::move(input), *ctx.parser, out, errors);
-        if (!cmdsubst_ok) return expand_result_t::error;
+        return expand_cmdsubst(std::move(input), *ctx.parser, out, errors);
     }
-
-    return expand_result_t::ok;
 }
 
 expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *out) {
@@ -918,7 +921,7 @@ expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *o
     } else {
         size_t size = next.size();
         if (!expand_variables(std::move(next), out, size, ctx.vars, errors)) {
-            return expand_result_t::error;
+            return expand_result_t::make_error(STATUS_EXPAND_ERROR);
         }
     }
     return expand_result_t::ok;
@@ -1085,7 +1088,7 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
         total_result = expand_result_t::ok;
     }
 
-    if (total_result != expand_result_t::error) {
+    if (total_result == expand_result_t::ok) {
         // Hack to un-expand tildes (see #647).
         if (!(flags & expand_flag::skip_home_directories)) {
             unexpand_tildes(input, ctx.vars, &completions);
@@ -1113,7 +1116,7 @@ bool expand_one(wcstring &string, expand_flags_t flags, const operation_context_
     }
 
     if (expand_string(std::move(string), &completions, flags | expand_flag::no_descriptions, ctx,
-                      errors) != expand_result_t::error &&
+                      errors) == expand_result_t::ok &&
         completions.size() == 1) {
         string = std::move(completions.at(0).completion);
         return true;
diff --git a/src/expand.h b/src/expand.h
index 8aa2915cc..c4cf99a04 100644
--- a/src/expand.h
+++ b/src/expand.h
@@ -100,16 +100,39 @@ enum : wchar_t {
 };
 
 /// These are the possible return values for expand_string.
-enum class expand_result_t {
-    /// There was a syntax error, for example, unmatched braces.
-    error,
-    /// Expansion succeeded.
-    ok,
-    /// Expansion was cancelled (e.g. control-C).
-    cancel,
-    /// Expansion succeeded, but a wildcard in the string matched no files,
-    /// so the output is empty.
-    wildcard_no_match,
+struct expand_result_t {
+    enum result_t {
+        /// There was an error, for example, unmatched braces.
+        error,
+        /// Expansion succeeded.
+        ok,
+        /// Expansion was cancelled (e.g. control-C).
+        cancel,
+        /// Expansion succeeded, but a wildcard in the string matched no files,
+        /// so the output is empty.
+        wildcard_no_match,
+    };
+
+    /// The result of expansion.
+    result_t result;
+
+    /// If expansion resulted in an error, this is an appropriate value with which to populate
+    /// $status.
+    int status{0};
+
+    /* implicit */ expand_result_t(result_t result) : result(result) {}
+
+    /// operator== allows for comparison against result_t values.
+    bool operator==(result_t rhs) const { return result == rhs; }
+    bool operator!=(result_t rhs) const { return !(*this == rhs); }
+
+    /// Make an error value with the given status.
+    static expand_result_t make_error(int status) {
+        assert(status != 0 && "status cannot be 0 for an error result");
+        expand_result_t result(error);
+        result.status = status;
+        return result;
+    }
 };
 
 /// The string represented by PROCESS_EXPAND_SELF
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 998cf9e36..904bc93bd 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1033,16 +1033,13 @@ static void test_1_cancellation(const wchar_t *src) {
         usleep(delay * 1E6);
         pthread_kill(thread, SIGINT);
     });
-    end_execution_reason_t ret = parser_t::principal_parser().eval(src, io_chain_t{filler});
+    eval_res_t res = parser_t::principal_parser().eval(src, io_chain_t{filler});
     auto buffer = io_bufferfill_t::finish(std::move(filler));
     if (buffer->buffer().size() != 0) {
         err(L"Expected 0 bytes in out_buff, but instead found %lu bytes, for command %ls\n",
             buffer->buffer().size(), src);
     }
-    // TODO: cancelling out of command substitutions is currently reported as an error, not a
-    // cancellation.
-    // do_test(ret == end_execution_reason_t::cancelled);
-    (void)ret;
+    do_test(res.status.signal_exited() && res.status.signal_code() == SIGINT);
     iothread_drain_all();
 }
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 6dc3e81f7..6bc339ef8 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -259,8 +259,8 @@ end_execution_reason_t parse_execution_context_t::run_if_statement(
         tnode_t<g::job_conjunction> condition_head = if_clause.child<1>();
         tnode_t<g::andor_job_list> condition_boolean_tail = if_clause.child<3>();
 
-        // Check the condition and the tail. We treat end_execution_reason_t::error here as failure, in
-        // accordance with historic behavior.
+        // Check the condition and the tail. We treat end_execution_reason_t::error here as failure,
+        // in accordance with historic behavior.
         end_execution_reason_t cond_ret = run_job_conjunction(condition_head, associated_block);
         if (cond_ret == end_execution_reason_t::ok) {
             cond_ret = run_job_list(condition_boolean_tail, associated_block);
@@ -350,10 +350,8 @@ end_execution_reason_t parse_execution_context_t::run_function_statement(
 
     wcstring errtext = streams.err.contents();
     if (!errtext.empty()) {
-        this->report_error(header, L"%ls", errtext.c_str());
-        result = end_execution_reason_t::error;
+        return this->report_error(err, header, L"%ls", errtext.c_str());
     }
-
     return result;
 }
 
@@ -385,8 +383,8 @@ end_execution_reason_t parse_execution_context_t::run_for_statement(
     tnode_t<g::tok_string> var_name_node = header.child<1>();
     wcstring for_var_name = get_source(var_name_node);
     if (!expand_one(for_var_name, expand_flags_t{}, ctx)) {
-        report_error(var_name_node, FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
-        return end_execution_reason_t::error;
+        return report_error(STATUS_EXPAND_ERROR, var_name_node,
+                            FAILED_EXPANSION_VARIABLE_NAME_ERR_MSG, for_var_name.c_str());
     }
 
     // Get the contents to iterate over.
@@ -399,9 +397,9 @@ end_execution_reason_t parse_execution_context_t::run_for_statement(
 
     auto var = parser->vars().get(for_var_name, ENV_DEFAULT);
     if (var && var->read_only()) {
-        report_error(var_name_node, L"You cannot use read-only variable '%ls' in a for loop",
-                     for_var_name.c_str());
-        return end_execution_reason_t::error;
+        return report_error(STATUS_INVALID_ARGS, var_name_node,
+                            L"You cannot use read-only variable '%ls' in a for loop",
+                            for_var_name.c_str());
     }
     int retval;
     if (var) {
@@ -412,8 +410,8 @@ end_execution_reason_t parse_execution_context_t::run_for_statement(
     assert(retval == ENV_OK);
 
     if (!valid_var_name(for_var_name)) {
-        report_error(var_name_node, BUILTIN_ERR_VARNAME, L"for", for_var_name.c_str());
-        return end_execution_reason_t::error;
+        return report_error(STATUS_INVALID_ARGS, var_name_node, BUILTIN_ERR_VARNAME, L"for",
+                            for_var_name.c_str());
     }
 
     trace_if_enabled(*parser, L"for", arguments);
@@ -462,19 +460,20 @@ end_execution_reason_t parse_execution_context_t::run_switch_statement(
                                     expand_flag::no_descriptions, ctx, &errors);
     parse_error_offset_source_start(&errors, switch_value_n.source_range()->start);
 
-    switch (expand_ret) {
+    switch (expand_ret.result) {
         case expand_result_t::error:
-            return report_errors(errors);
+            return report_errors(expand_ret.status, errors);
 
         case expand_result_t::cancel:
             return end_execution_reason_t::cancelled;
 
         case expand_result_t::wildcard_no_match:
-            return report_unmatched_wildcard_error(switch_value_n);
+            return report_error(STATUS_UNMATCHED_WILDCARD, switch_value_n, WILDCARD_ERR_MSG,
+                                get_source(switch_value_n).c_str());
 
         case expand_result_t::ok:
             if (switch_values_expanded.size() > 1) {
-                return report_error(switch_value_n,
+                return report_error(STATUS_INVALID_ARGS, switch_value_n,
                                     _(L"switch: Expected at most one argument, got %lu\n"),
                                     switch_values_expanded.size());
             }
@@ -617,9 +616,8 @@ end_execution_reason_t parse_execution_context_t::run_while_statement(
     return ret;
 }
 
-// Reports an error. Always returns end_execution_reason_t::error, so you can assign the result to an
-// 'errored' variable.
-end_execution_reason_t parse_execution_context_t::report_error(const parse_node_t &node,
+// Reports an error. Always returns end_execution_reason_t::error.
+end_execution_reason_t parse_execution_context_t::report_error(int status, const parse_node_t &node,
                                                                const wchar_t *fmt, ...) const {
     // Create an error.
     parse_error_list_t error_list = parse_error_list_t(1);
@@ -633,12 +631,11 @@ end_execution_reason_t parse_execution_context_t::report_error(const parse_node_
     error->text = vformat_string(fmt, va);
     va_end(va);
 
-    this->report_errors(error_list);
-    return end_execution_reason_t::error;
+    return this->report_errors(status, error_list);
 }
 
 end_execution_reason_t parse_execution_context_t::report_errors(
-    const parse_error_list_t &error_list) const {
+    int status, const parse_error_list_t &error_list) const {
     if (!parser->cancellation_signal) {
         if (error_list.empty()) {
             FLOG(error, L"Error reported but no error text found.");
@@ -652,15 +649,10 @@ end_execution_reason_t parse_execution_context_t::report_errors(
         if (!should_suppress_stderr_for_tests()) {
             std::fwprintf(stderr, L"%ls", backtrace_and_desc.c_str());
         }
-    }
-    return end_execution_reason_t::error;
-}
 
-/// Reports an unmatched wildcard error and returns end_execution_reason_t::error.
-end_execution_reason_t parse_execution_context_t::report_unmatched_wildcard_error(
-    const parse_node_t &unmatched_wildcard) const {
-    parser->set_last_statuses(statuses_t::just(STATUS_UNMATCHED_WILDCARD));
-    report_error(unmatched_wildcard, WILDCARD_ERR_MSG, get_source(unmatched_wildcard).c_str());
+        // Mark status.
+        parser->set_last_statuses(statuses_t::just(status));
+    }
     return end_execution_reason_t::error;
 }
 
@@ -672,7 +664,8 @@ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
 
     const wchar_t *const cmd = cmd_str.c_str();
     if (err_code != ENOENT) {
-        this->report_error(statement, _(L"The file '%ls' is not executable by this user"), cmd);
+        return this->report_error(STATUS_NOT_EXECUTABLE, statement,
+                                  _(L"The file '%ls' is not executable by this user"), cmd);
     } else {
         // Handle unrecognized commands with standard command not found handler that can make better
         // error messages.
@@ -692,14 +685,8 @@ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
         event_fire_generic(*parser, L"fish_command_not_found", &event_args);
 
         // Here we want to report an error (so it shows a backtrace), but with no text.
-        this->report_error(statement, L"");
+        return this->report_error(STATUS_CMD_UNKNOWN, statement, L"");
     }
-
-    // Set the last proc status appropriately.
-    int status = err_code == ENOENT ? STATUS_CMD_UNKNOWN : STATUS_NOT_EXECUTABLE;
-    parser->set_last_statuses(statuses_t::just(status));
-
-    return end_execution_reason_t::error;
 }
 
 end_execution_reason_t parse_execution_context_t::expand_command(
@@ -718,21 +705,22 @@ end_execution_reason_t parse_execution_context_t::expand_command(
     expand_result_t expand_err =
         expand_to_command_and_args(unexp_cmd, ctx, out_cmd, out_args, &errors);
     if (expand_err == expand_result_t::error) {
-        parser->set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
         // Issue #5812 - the expansions were done on the command token,
         // excluding prefixes such as " " or "if ".
         // This means that the error positions are relative to the beginning
         // of the token; we need to make them relative to the original source.
         for (auto &error : errors) error.source_start += pos_of_command_token;
-        return report_errors(errors);
+        return report_errors(STATUS_ILLEGAL_CMD, errors);
     } else if (expand_err == expand_result_t::wildcard_no_match) {
-        return report_unmatched_wildcard_error(statement);
+        return report_error(STATUS_UNMATCHED_WILDCARD, statement, WILDCARD_ERR_MSG,
+                            get_source(statement).c_str());
     }
     assert(expand_err == expand_result_t::ok);
 
     // Complain if the resulting expansion was empty, or expanded to an empty string.
     if (out_cmd->empty()) {
-        return this->report_error(statement, _(L"The expanded command was empty."));
+        return this->report_error(STATUS_ILLEGAL_CMD, statement,
+                                  _(L"The expanded command was empty."));
     }
     return end_execution_reason_t::ok;
 }
@@ -840,8 +828,9 @@ end_execution_reason_t parse_execution_context_t::populate_plain_process(
         }
 
         // The set of IO redirections that we construct for the process.
-        if (!this->determine_redirections(statement.child<1>(), &redirections)) {
-            return end_execution_reason_t::error;
+        auto reason = this->determine_redirections(statement.child<1>(), &redirections);
+        if (reason != end_execution_reason_t::ok) {
+            return reason;
         }
 
         // Determine the process type.
@@ -876,18 +865,19 @@ end_execution_reason_t parse_execution_context_t::expand_arguments_from_nodes(
         auto expand_ret =
             expand_string(arg_str, &arg_expanded, expand_flag::no_descriptions, ctx, &errors);
         parse_error_offset_source_start(&errors, arg_node.source_range()->start);
-        switch (expand_ret) {
+        switch (expand_ret.result) {
             case expand_result_t::error: {
-                return this->report_errors(errors);
+                return this->report_errors(expand_ret.status, errors);
             }
+
             case expand_result_t::cancel: {
                 return end_execution_reason_t::cancelled;
             }
             case expand_result_t::wildcard_no_match: {
                 if (glob_behavior == failglob) {
                     // Report the unmatched wildcard error and stop processing.
-                    report_unmatched_wildcard_error(arg_node);
-                    return end_execution_reason_t::error;
+                    return report_error(STATUS_UNMATCHED_WILDCARD, arg_node, WILDCARD_ERR_MSG,
+                                        get_source(arg_node).c_str());
                 }
                 break;
             }
@@ -916,7 +906,7 @@ end_execution_reason_t parse_execution_context_t::expand_arguments_from_nodes(
     return end_execution_reason_t::ok;
 }
 
-bool parse_execution_context_t::determine_redirections(
+end_execution_reason_t parse_execution_context_t::determine_redirections(
     tnode_t<g::arguments_or_redirections_list> node, redirection_spec_list_t *out_redirections) {
     // Get all redirection nodes underneath the statement.
     while (auto redirect_node = node.next_in_list<g::redirection>()) {
@@ -925,9 +915,8 @@ bool parse_execution_context_t::determine_redirections(
 
         if (!redirect || !redirect->is_valid()) {
             // TODO: figure out if this can ever happen. If so, improve this error message.
-            report_error(redirect_node, _(L"Invalid redirection: %ls"),
-                         redirect_node.get_source(pstree->src).c_str());
-            return false;
+            return report_error(STATUS_INVALID_ARGS, redirect_node, _(L"Invalid redirection: %ls"),
+                                redirect_node.get_source(pstree->src).c_str());
         }
 
         // PCA: I can't justify this skip_variables flag. It was like this when I got here.
@@ -935,8 +924,8 @@ bool parse_execution_context_t::determine_redirections(
             expand_one(target, no_exec() ? expand_flag::skip_variables : expand_flags_t{}, ctx);
         if (!target_expanded || target.empty()) {
             // TODO: Improve this error message.
-            report_error(redirect_node, _(L"Invalid redirection target: %ls"), target.c_str());
-            return false;
+            return report_error(STATUS_INVALID_ARGS, redirect_node,
+                                _(L"Invalid redirection target: %ls"), target.c_str());
         }
 
         // Make a redirection spec from the redirect token.
@@ -948,8 +937,7 @@ bool parse_execution_context_t::determine_redirections(
         if (spec.mode == redirection_mode_t::fd && !spec.is_close() && !spec.get_target_as_fd()) {
             const wchar_t *fmt =
                 _(L"Requested redirection to '%ls', which is not a valid file descriptor");
-            report_error(redirect_node, fmt, spec.target.c_str());
-            return false;
+            return report_error(STATUS_INVALID_ARGS, redirect_node, fmt, spec.target.c_str());
         }
         out_redirections->push_back(std::move(spec));
 
@@ -959,7 +947,7 @@ bool parse_execution_context_t::determine_redirections(
             out_redirections->push_back(get_stderr_merge());
         }
     }
-    return true;
+    return end_execution_reason_t::ok;
 }
 
 end_execution_reason_t parse_execution_context_t::populate_not_process(
@@ -970,8 +958,7 @@ end_execution_reason_t parse_execution_context_t::populate_not_process(
     if (optional_time.tag() == parse_optional_time_time) {
         flags.has_time_prefix = true;
         if (!job->mut_flags().foreground) {
-            this->report_error(not_statement, ERROR_TIME_BACKGROUND);
-            return end_execution_reason_t::error;
+            return this->report_error(STATUS_INVALID_ARGS, not_statement, ERROR_TIME_BACKGROUND);
         }
     }
     return this->populate_job_process(
@@ -996,15 +983,14 @@ end_execution_reason_t parse_execution_context_t::populate_block_process(
     // TODO: fix this ugly find_child.
     auto arguments = specific_statement.template find_child<g::arguments_or_redirections_list>();
     redirection_spec_list_t redirections;
-    if (!this->determine_redirections(arguments, &redirections)) {
-        return end_execution_reason_t::error;
+    auto reason = this->determine_redirections(arguments, &redirections);
+    if (reason == end_execution_reason_t::ok) {
+        proc->type = process_type_t::block_node;
+        proc->block_node_source = pstree;
+        proc->internal_block_node = statement;
+        proc->set_redirection_specs(std::move(redirections));
     }
-
-    proc->type = process_type_t::block_node;
-    proc->block_node_source = pstree;
-    proc->internal_block_node = statement;
-    proc->set_redirection_specs(std::move(redirections));
-    return end_execution_reason_t::ok;
+    return reason;
 }
 
 end_execution_reason_t parse_execution_context_t::apply_variable_assignments(
@@ -1027,18 +1013,17 @@ end_execution_reason_t parse_execution_context_t::apply_variable_assignments(
                                         expand_flag::no_descriptions, ctx, &errors);
         parse_error_offset_source_start(
             &errors, variable_assignment.source_range()->start + *equals_pos + 1);
-        switch (expand_ret) {
-            case expand_result_t::error: {
-                this->report_errors(errors);
-                return end_execution_reason_t::error;
-            }
-            case expand_result_t::cancel: {
+        switch (expand_ret.result) {
+            case expand_result_t::error:
+                return this->report_errors(expand_ret.status, errors);
+
+            case expand_result_t::cancel:
                 return end_execution_reason_t::cancelled;
-            }
+
             case expand_result_t::wildcard_no_match:  // nullglob (equivalent to set)
-            case expand_result_t::ok: {
+            case expand_result_t::ok:
                 break;
-            }
+
             default: {
                 DIE("unexpected expand_string() return value");
                 break;
@@ -1066,7 +1051,7 @@ end_execution_reason_t parse_execution_context_t::populate_job_process(
     cleanup_t scope([&]() {
         if (block) parser->pop_block(block);
     });
-    if (result != end_execution_reason_t::ok) return end_execution_reason_t::error;
+    if (result != end_execution_reason_t::ok) return result;
 
     switch (specific_statement.type) {
         case symbol_not_statement: {
@@ -1122,8 +1107,7 @@ end_execution_reason_t parse_execution_context_t::populate_job_from_job_node(
     if (optional_time.tag() == parse_optional_time_time) {
         j->mut_flags().has_time_prefix = true;
         if (job_node_is_background(job_node)) {
-            this->report_error(job_node, ERROR_TIME_BACKGROUND);
-            return end_execution_reason_t::error;
+            return this->report_error(STATUS_INVALID_ARGS, job_node, ERROR_TIME_BACKGROUND);
         }
     }
     end_execution_reason_t result =
@@ -1144,7 +1128,8 @@ end_execution_reason_t parse_execution_context_t::populate_job_from_job_node(
         auto parsed_pipe = pipe_or_redir_t::from_string(get_source(pipe));
         assert(parsed_pipe.has_value() && parsed_pipe->is_pipe && "Failed to parse valid pipe");
         if (!parsed_pipe->is_valid()) {
-            result = report_error(pipe, ILLEGAL_FD_ERR_MSG, get_source(pipe).c_str());
+            result = report_error(STATUS_INVALID_ARGS, pipe, ILLEGAL_FD_ERR_MSG,
+                                  get_source(pipe).c_str());
             break;
         }
         processes.back()->pipe_write_fd = parsed_pipe->fd;
@@ -1200,6 +1185,7 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
     if (parser->is_interactive() && tcgetattr(STDIN_FILENO, &tmodes)) {
         // Need real error handling here.
         wperror(L"tcgetattr");
+        parser->set_last_statuses(statuses_t::just(STATUS_CMD_ERROR));
         return end_execution_reason_t::error;
     }
 
@@ -1452,13 +1438,13 @@ end_execution_reason_t parse_execution_context_t::eval_node(tnode_t<g::job_list>
         this->infinite_recursive_statement_in_job_list(job_list, &func_name);
     if (infinite_recursive_node) {
         // We have an infinite recursion.
-        return this->report_error(infinite_recursive_node, INFINITE_FUNC_RECURSION_ERR_MSG,
-                                  func_name.c_str());
+        return this->report_error(STATUS_CMD_ERROR, infinite_recursive_node,
+                                  INFINITE_FUNC_RECURSION_ERR_MSG, func_name.c_str());
     }
 
     // Check for stack overflow. The TOP check ensures we only do this for function calls.
     if (associated_block->type() == block_type_t::top && parser->function_stack_is_overflowing()) {
-        return this->report_error(job_list, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
+        return this->report_error(STATUS_CMD_ERROR, job_list, CALL_STACK_LIMIT_EXCEEDED_ERR_MSG);
     }
     return this->run_job_list(job_list, associated_block);
 }
diff --git a/src/parse_execution.h b/src/parse_execution.h
index 436bbe6ec..35b6fd4b6 100644
--- a/src/parse_execution.h
+++ b/src/parse_execution.h
@@ -52,13 +52,11 @@ class parse_execution_context_t {
     // This will never return end_execution_reason_t::ok.
     maybe_t<end_execution_reason_t> check_end_execution() const;
 
-    // Report an error. Always returns 'end_execution_reason_t::error'.
-    end_execution_reason_t report_error(const parse_node_t &node, const wchar_t *fmt, ...) const;
-    end_execution_reason_t report_errors(const parse_error_list_t &error_list) const;
-
-    // Wildcard error helper.
-    end_execution_reason_t report_unmatched_wildcard_error(
-        const parse_node_t &unmatched_wildcard) const;
+    // Report an error, setting $status to \p status. Always returns
+    // 'end_execution_reason_t::error'.
+    end_execution_reason_t report_error(int status, const parse_node_t &node, const wchar_t *fmt,
+                                        ...) const;
+    end_execution_reason_t report_errors(int status, const parse_error_list_t &error_list) const;
 
     /// Command not found support.
     end_execution_reason_t handle_command_not_found(const wcstring &cmd,
@@ -122,10 +120,10 @@ class parse_execution_context_t {
                                                        wcstring_list_t *out_arguments,
                                                        globspec_t glob_behavior);
 
-    // Determines the list of redirections for a node. Returns none() on failure, for example, an
-    // invalid fd.
-    bool determine_redirections(tnode_t<grammar::arguments_or_redirections_list> node,
-                                redirection_spec_list_t *out_redirections);
+    // Determines the list of redirections for a node.
+    end_execution_reason_t determine_redirections(
+        tnode_t<grammar::arguments_or_redirections_list> node,
+        redirection_spec_list_t *out_redirections);
 
     end_execution_reason_t run_1_job(tnode_t<grammar::job> job, const block_t *associated_block);
     end_execution_reason_t run_job_conjunction(tnode_t<grammar::job_conjunction> job_expr,
diff --git a/src/parser.cpp b/src/parser.cpp
index ab5644761..f5a564b88 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -614,8 +614,7 @@ profile_item_t *parser_t::create_profile_item() {
     return result;
 }
 
-end_execution_reason_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
-                                      enum block_type_t block_type) {
+eval_res_t parser_t::eval(const wcstring &cmd, const io_chain_t &io, enum block_type_t block_type) {
     // Parse the source into a tree, if we can.
     parse_error_list_t error_list;
     if (parsed_source_ref_t ps = parse_source(cmd, parse_flag_none, &error_list)) {
@@ -627,12 +626,16 @@ end_execution_reason_t parser_t::eval(const wcstring &cmd, const io_chain_t &io,
 
         // Print it.
         std::fwprintf(stderr, L"%ls\n", backtrace_and_desc.c_str());
-        return end_execution_reason_t::error;
+
+        // Set a valid status.
+        this->set_last_statuses(statuses_t::just(STATUS_ILLEGAL_CMD));
+        bool break_expand = true;
+        return eval_res_t{proc_status_t::from_exit_code(STATUS_ILLEGAL_CMD), break_expand};
     }
 }
 
-end_execution_reason_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io,
-                                      enum block_type_t block_type) {
+eval_res_t parser_t::eval(const parsed_source_ref_t &ps, const io_chain_t &io,
+                          enum block_type_t block_type) {
     assert(block_type == block_type_t::top || block_type == block_type_t::subst);
     if (!ps->tree.empty()) {
         job_lineage_t lineage;
@@ -640,13 +643,17 @@ end_execution_reason_t parser_t::eval(const parsed_source_ref_t &ps, const io_ch
         // Execute the first node.
         tnode_t<grammar::job_list> start{&ps->tree, &ps->tree.front()};
         return this->eval_node(ps, start, std::move(lineage), block_type);
+    } else {
+        auto status = proc_status_t::from_exit_code(get_last_status());
+        bool break_expand = false;
+        bool was_empty = true;
+        return eval_res_t{status, break_expand, was_empty};
     }
-    return end_execution_reason_t::ok;
 }
 
 template <typename T>
-end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
-                                           job_lineage_t lineage, block_type_t block_type) {
+eval_res_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
+                               job_lineage_t lineage, block_type_t block_type) {
     static_assert(
         std::is_same<T, grammar::statement>::value || std::is_same<T, grammar::job_list>::value,
         "Unexpected node type");
@@ -655,7 +662,7 @@ end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_
     // not empty, we are still in the process of cancelling; refuse to evaluate anything.
     if (this->cancellation_signal) {
         if (!block_list.empty()) {
-            return end_execution_reason_t::cancelled;
+            return proc_status_t::from_signal(this->cancellation_signal);
         }
         this->cancellation_signal = 0;
     }
@@ -674,25 +681,33 @@ end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &ps, tnode_
     using exc_ctx_ref_t = std::unique_ptr<parse_execution_context_t>;
     scoped_push<exc_ctx_ref_t> exc(&execution_context, make_unique<parse_execution_context_t>(
                                                            ps, this, op_ctx, std::move(lineage)));
-    end_execution_reason_t res = execution_context->eval_node(node, scope_block);
+
+    // Check the exec count so we know if anything got executed.
+    const size_t prev_exec_count = libdata().exec_count;
+    end_execution_reason_t reason = execution_context->eval_node(node, scope_block);
+    const size_t new_exec_count = libdata().exec_count;
+
     exc.restore();
     this->pop_block(scope_block);
 
     job_reap(*this, false);  // reap again
 
-    // control_flow is used internally to react to break and return.
-    // Here we treat that as success.
-    if (res == end_execution_reason_t::control_flow) {
-        res = end_execution_reason_t::ok;
+    if (this->cancellation_signal) {
+        // We were signalled.
+        return proc_status_t::from_signal(this->cancellation_signal);
+    } else {
+        auto status = proc_status_t::from_exit_code(this->get_last_status());
+        bool break_expand = (reason == end_execution_reason_t::error);
+        bool was_empty = !break_expand && prev_exec_count == new_exec_count;
+        return eval_res_t{status, break_expand, was_empty};
     }
-    return res;
 }
 
 // Explicit instantiations. TODO: use overloads instead?
-template end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::statement>,
-                                           job_lineage_t, block_type_t);
-template end_execution_reason_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::job_list>,
-                                           job_lineage_t, block_type_t);
+template eval_res_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::statement>,
+                                        job_lineage_t, block_type_t);
+template eval_res_t parser_t::eval_node(const parsed_source_ref_t &, tnode_t<grammar::job_list>,
+                                        job_lineage_t, block_type_t);
 
 void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &errors,
                              wcstring &output) const {
diff --git a/src/parser.h b/src/parser.h
index 494fe7164..2cb261235 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -200,6 +200,24 @@ struct library_data_t {
 
 class operation_context_t;
 
+/// The result of parser_t::eval family.
+struct eval_res_t {
+    /// The value for $status.
+    proc_status_t status;
+
+    /// If set, there was an error that should be considered a failed expansion, such as
+    /// command-not-found. For example, `touch (not-a-command)` will not invoke 'touch' because
+    /// command-not-found will mark break_expand.
+    bool break_expand;
+
+    /// If set, no commands were executed and there we no errors.
+    bool was_empty{false};
+
+    /* implicit */ eval_res_t(proc_status_t status, bool break_expand = false,
+                              bool was_empty = false)
+        : status(status), break_expand(break_expand), was_empty(was_empty) {}
+};
+
 class parser_t : public std::enable_shared_from_this<parser_t> {
     friend class parse_execution_context_t;
 
@@ -266,22 +284,23 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
     /// \param io io redirections to perform on all started jobs
     /// \param block_type The type of block to push on the block stack, which must be either 'top'
     /// or 'subst'.
+    /// \param break_expand If not null, return by reference whether the error ought to be an expand
+    /// error. This includes nested expand errors, and command-not-found.
     ///
-    /// \return the eval result,
-    end_execution_reason_t eval(const wcstring &cmd, const io_chain_t &io,
-                                block_type_t block_type = block_type_t::top);
+    /// \return the result of evaluation.
+    eval_res_t eval(const wcstring &cmd, const io_chain_t &io,
+                    block_type_t block_type = block_type_t::top);
 
     /// Evaluate the parsed source ps.
     /// Because the source has been parsed, a syntax error is impossible.
-    end_execution_reason_t eval(const parsed_source_ref_t &ps, const io_chain_t &io,
-                                block_type_t block_type = block_type_t::top);
+    eval_res_t eval(const parsed_source_ref_t &ps, const io_chain_t &io,
+                    block_type_t block_type = block_type_t::top);
 
     /// Evaluates a node.
     /// The node type must be grammar::statement or grammar::job_list.
     template <typename T>
-    end_execution_reason_t eval_node(const parsed_source_ref_t &ps, tnode_t<T> node,
-                                     job_lineage_t lineage,
-                                     block_type_t block_type = block_type_t::top);
+    eval_res_t eval_node(const parsed_source_ref_t &ps, tnode_t<T> node, job_lineage_t lineage,
+                         block_type_t block_type = block_type_t::top);
 
     /// Evaluate line as a list of parameters, i.e. tokenize it and perform parameter expansion and
     /// cmdsubst execution on the tokens. Errors are ignored. If a parser is provided, it is used
diff --git a/src/reader.cpp b/src/reader.cpp
index 62c7d4938..f7eb97ecc 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -874,8 +874,8 @@ void reader_write_title(const wcstring &cmd, parser_t &parser, bool reset_cursor
     }
 
     wcstring_list_t lst;
-    if (exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */) != -1 &&
-        !lst.empty()) {
+    (void)exec_subshell(fish_title_command, parser, lst, false /* ignore exit status */);
+    if (!lst.empty()) {
         std::fputws(L"\x1B]0;", stdout);
         for (const auto &i : lst) {
             std::fputws(i.c_str(), stdout);
diff --git a/tests/checks/cmdsub-limit.fish b/tests/checks/cmdsub-limit.fish
index 6fa25d233..1f5bca97f 100644
--- a/tests/checks/cmdsub-limit.fish
+++ b/tests/checks/cmdsub-limit.fish
@@ -29,7 +29,6 @@ set --show b
 #CHECK: $b: not set in global scope
 #CHECK: $b: not set in universal scope
 #CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
-#CHECKERR: 
 #CHECKERR: set b (string repeat -n 512 x)
 #CHECKERR:       ^
 
@@ -43,7 +42,6 @@ set --show c
 #CHECK: $c[1]: length=0 value=||
 #CHECK: $c: not set in universal scope
 #CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
-#CHECKERR: 
 #CHECKERR:     set -l x (string repeat -n $argv x)
 #CHECKERR:              ^
 #CHECKERR: in function 'subme' with arguments '513'
@@ -62,6 +60,5 @@ test $saved_status -eq 122
 or echo expected status 122, saw $saved_status >&2
 
 #CHECKERR: {{.*}}: Too much data emitted by command substitution so it was discarded
-#CHECKERR: 
 #CHECKERR: echo this will fail (string repeat --max 513 b) to output anything
 #CHECKERR:                     ^
diff --git a/tests/checks/eval.fish b/tests/checks/eval.fish
index e33050de8..e484f0aed 100644
--- a/tests/checks/eval.fish
+++ b/tests/checks/eval.fish
@@ -21,14 +21,14 @@ echo $status
 false
 eval "("
 echo $status
-# CHECK: 1
+# CHECK: 123
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): Unexpected end of string, expecting ')'
 # CHECKERR: (
 # CHECKERR: ^
 false
 eval '""'
 echo $status
-# CHECK: 1
+# CHECK: 123
 # CHECKERR: {{.*}}checks/eval.fish (line {{\d+}}): The expanded command was empty.
 # CHECKERR: ""
 # CHECKERR: ^
diff --git a/tests/checks/invocation.fish b/tests/checks/invocation.fish
index 89f41fb04..f10809118 100644
--- a/tests/checks/invocation.fish
+++ b/tests/checks/invocation.fish
@@ -3,6 +3,10 @@
 $fish -c "echo 1.2.3.4."
 # CHECK: 1.2.3.4.
 
+PATH= $fish -c "command a" 2>/dev/null
+echo $status
+# CHECK: 127
+
 PATH= $fish -c "echo (command a)" 2>/dev/null
 echo $status
-# CHECK: 255
+# CHECK: 127
diff --git a/tests/checks/status-value.fish b/tests/checks/status-value.fish
new file mode 100644
index 000000000..7ca2ac73d
--- /dev/null
+++ b/tests/checks/status-value.fish
@@ -0,0 +1,26 @@
+# RUN: %fish %s
+
+# Empty commands should be 123
+set empty_var
+$empty_var
+echo $status
+# CHECK: 123
+# CHECKERR: {{.*}} The expanded command was empty.
+# CHECKERR: $empty_var
+# CHECKERR: ^
+
+# Failed expansions
+echo "$abc["
+echo $status
+# CHECK: 121
+# CHECKERR: {{.*}} Invalid index value
+# CHECKERR: echo "$abc["
+# CHECKERR:             ^
+
+# Failed wildcards
+echo *gibberishgibberishgibberish*
+echo $status
+# CHECK: 124
+# CHECKERR: {{.*}} No matches for wildcard '*gibberishgibberishgibberish*'. {{.*}}
+# CHECKERR: echo *gibberishgibberishgibberish*
+# CHECKERR:      ^

From 86897cafd6c5908430e73667a6dbab219b2cf883 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 Jan 2020 18:14:38 -0800
Subject: [PATCH 1639/1732] Clean up, debug, optimize some command description
 generation

Use some more move semantics to reduce allocations.

Correctly handle the case where the completion is empty. For example, if
you type:

    ls<tab>

we get an empty completion (since ls is already a valid command), but we
still want to show its description.

Remove some unsafe statics - these are unsafe today in weird cases where
completions might invoke complete recursively, and also will soon be
unsafe with concurrent execution.
---
 src/complete.cpp | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 507c1e9b6..754cc2a21 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -606,47 +606,46 @@ void completer_t::complete_cmd_desc(const wcstring &str) {
     wcstring lookup_cmd(L"__fish_describe_command ");
     lookup_cmd.append(escape_string(cmd, ESCAPE_ALL));
 
-    // See the ASSERT_IS_MAIN_THREAD() above, making it safe to make this a static variable.
-    // This lets us reuse the heap-allocated memory across calls.
-    static std::unordered_map<wcstring, wcstring> lookup;
-    static wcstring_list_t list;
     // First locate a list of possible descriptions using a single call to apropos or a direct
     // search if we know the location of the whatis database. This can take some time on slower
     // systems with a large set of manuals, but it should be ok since apropos is only called once.
-    lookup.clear();
-    list.clear();
+    wcstring_list_t list;
     (void)exec_subshell(lookup_cmd, *ctx.parser, list, false /* don't apply exit status */);
+
     // Then discard anything that is not a possible completion and put the result into a
     // hashtable with the completion as key and the description as value.
-    //
-    // Should be reasonably fast, since no memory allocations are needed.
-    // mqudsi: I don't know if the above were ever true, but it's certainly not any more.
-    // Plenty of allocations below.
+    std::unordered_map<wcstring, wcstring> lookup;
+    // A typical entry is the command name, followed by a tab, followed by a description.
     for (const wcstring &elstr : list) {
-        if (elstr.length() < cmd.length()) continue;
-        const wcstring fullkey(elstr, cmd.length());
+        // Skip keys that are too short.
+        if (elstr.size() < cmd.size()) continue;
 
-        size_t tab_idx = fullkey.find(L'\t');
-        if (tab_idx == wcstring::npos) continue;
+        // Skip cases without a tab, or without a description, or bizarre cases where the tab is
+        // part of the command.
+        size_t tab_idx = elstr.find(L'\t');
+        if (tab_idx == wcstring::npos || tab_idx + 1 >= elstr.size() || tab_idx < cmd.size())
+            continue;
 
-        const wcstring key(fullkey, 0, tab_idx);
-        wcstring val(fullkey, tab_idx + 1);
+        // Make the key. This is the stuff after the command.
+        // For example:
+        //  elstr = lsmod
+        //  cmd = ls
+        //  key = mod
+        // Note an empty key is common and natural, if 'cmd' were already valid.
+        wcstring key(elstr, cmd.size(), tab_idx - cmd.size());
+        wcstring val(elstr, tab_idx + 1);
+        assert(!val.empty() && "tab index should not have been at the end.");
 
         // And once again I make sure the first character is uppercased because I like it that
         // way, and I get to decide these things.
-        if (!val.empty()) val[0] = towupper(val[0]);
-        lookup[key] = val;
+        val.at(0) = towupper(val.at(0));
+        lookup.insert(std::make_pair(std::move(key), std::move(val)));
     }
 
     // Then do a lookup on every completion and if a match is found, change to the new
     // description.
-    //
-    // This needs to do a reallocation for every description added, but there shouldn't be that
-    // many completions, so it should be ok.
     for (auto &completion : completions) {
         const wcstring &el = completion.completion;
-        if (el.empty()) continue;
-
         auto new_desc_iter = lookup.find(el);
         if (new_desc_iter != lookup.end()) completion.description = new_desc_iter->second;
     }

From d29bc720cdd6135816fec8530bb5055924b74f4e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 25 Jan 2020 19:08:30 -0800
Subject: [PATCH 1640/1732] Remove some nonsense in exec_close

exec_close should assert that the fd is valid, then loop while EINTR.
Nothing else is needed.
---
 src/exec.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0076d4262..3088e48fb 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -56,14 +56,7 @@
 static relaxed_atomic_t<int> s_fork_count{0};
 
 void exec_close(int fd) {
-    ASSERT_IS_MAIN_THREAD();
-
-    // This may be called in a child of fork(), so don't allocate memory.
-    if (fd < 0) {
-        FLOG(error, L"Called close on invalid file descriptor ");
-        return;
-    }
-
+    assert(fd >= 0 && "Invalid fd");
     while (close(fd) == -1) {
         if (errno != EINTR) {
             debug(1, FD_ERROR, fd);

From 3142ef6dbc10afa33beee9d838e55074e70e0946 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Sat, 25 Jan 2020 15:54:49 +0900
Subject: [PATCH 1641/1732] Add interface label/name to the completions for -b

---
 share/completions/ssh.fish | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index 4f4011b2a..ff3876737 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -18,7 +18,19 @@ complete -c ssh -n 'test (__fish_number_of_cmd_args_wo_opts) -ge 2' -d "Command
 complete -c ssh -s a -d "Disables forwarding of the authentication agent"
 complete -c ssh -s A -d "Enables forwarding of the authentication agent"
 
-complete -x -c ssh -s b -d "Local address to bind to" -a "(__fish_print_addresses)"
+
+function __ssh_print_local_addresses_with_labels
+    if command -sq ip
+        command ip --oneline address | string replace -r '\d+:\s+(\S+)\s+\S+\s+(.+)/.*' '$2\t$1'
+    else if command -sq ifconfig
+        # This is for OSX/BSD/anything else that doesn't have `ip` installed.
+        # Since ifconfig output is not guaranteed to be the same on these systems,
+        # for now we will limit the completions to just the IP address.
+        # TODO: check ifconfig output on each system and rework below to include label.
+        ifconfig | awk '/^\tinet/ { print $2 } '
+    end
+end
+complete -x -c ssh -s b -d "Local address to bind to" -a '(__ssh_print_local_addresses_with_labels)'
 
 complete -x -c ssh -s e -d "Escape character" -a "\^ none"
 complete -c ssh -s f -d "Go to background"

From bcf2e2cdbd7f699c8744f5abbe452becb135c6a8 Mon Sep 17 00:00:00 2001
From: Jason <ammgws@users.noreply.github.com>
Date: Sun, 26 Jan 2020 20:22:02 +0900
Subject: [PATCH 1642/1732] Remove unused variable

---
 share/functions/fish_prompt.fish | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 91f43655c..890c035bc 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -7,7 +7,6 @@ function fish_prompt --description 'Write out the prompt'
 
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
-    set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
         if set -q fish_color_cwd_root

From 23042b6a43c8d08d94b0cc553546dccf0a7e5408 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sun, 26 Jan 2020 12:29:06 +0100
Subject: [PATCH 1643/1732] Remove unused "prefix" variable in prompt presets

[ci skip]
---
 share/tools/web_config/sample_prompts/classic_vcs.fish     | 1 -
 share/tools/web_config/sample_prompts/informative_vcs.fish | 1 -
 2 files changed, 2 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index f99d6e8ca..2feb97a70 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -8,7 +8,6 @@ function fish_prompt --description 'Write out the prompt'
 
     # Color the prompt differently when we're root
     set -l color_cwd $fish_color_cwd
-    set -l prefix
     set -l suffix '>'
     if contains -- $USER root toor
         if set -q fish_color_cwd_root
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index 30f042dfd..b05bfa24e 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -57,7 +57,6 @@ function fish_prompt --description 'Write out the prompt'
     end
 
     set -l color_cwd
-    set -l prefix
     set -l suffix
     switch "$USER"
         case root toor

From 7d89cadd583ef36b21ae6c9dc9247fc83cf1b0cc Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Sun, 26 Jan 2020 21:17:22 +0900
Subject: [PATCH 1644/1732] Stringify vared completions

---
 share/completions/vared.fish | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/completions/vared.fish b/share/completions/vared.fish
index 34c55c773..74c4c1420 100644
--- a/share/completions/vared.fish
+++ b/share/completions/vared.fish
@@ -1,3 +1,2 @@
-complete -c vared -x -a "(set|sed -e 's/ /'\t'Variable: /')"
+complete -c vared -x -a "(set | string replace -r ' ' '\tVariable: ')"
 complete -c vared -s h -l help -d "Display help and exit"
-

From aabc208318eba67e4c5f791283e453c40a5bf3e1 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 26 Jan 2020 21:21:05 +0800
Subject: [PATCH 1645/1732] Release 3.1b1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b13ba82c6..b77aa5c0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# fish 3.1b1
+# fish 3.1b1 (released January 26, 2020)
 
 ## Notable improvements and fixes
 - A new `$pipestatus` variable contains a list of exit statuses of the previous job, for each of the separate commands in a pipeline (#5632).

From 1aa0dfe91bc5382220ba2f170bff525501d13908 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 26 Jan 2020 21:36:00 +0800
Subject: [PATCH 1646/1732] fish.spec: remove "Shell" FreeDesktop category,
 even from OpenSUSE

It's reserved and causes errors trying to build the AppImage.
---
 fish.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fish.spec.in b/fish.spec.in
index f805897cc..7fd41c0c9 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -79,7 +79,7 @@ make %{?_smp_mflags}
 %find_lang %{name}
 # OpenSUSE has strong opinions about categories which do not apply to other systems
 %if 0%{?suse_version}
-%suse_update_desktop_file fish "System;TerminalEmulator;Shell"
+%suse_update_desktop_file fish "System;TerminalEmulator"
 %endif
 
 %check

From 89f5ae3e6a5a4a6f2f019441a4f3ba01024e98f2 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 Jan 2020 20:20:56 -0800
Subject: [PATCH 1647/1732] Add noexcept to completion_t definitions as well as
 declarations

This is required if we want to compile with exceptions enabled (which we
currently do not).
---
 src/complete.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index d67fea1e6..8199abf8c 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -214,9 +214,9 @@ completion_t::completion_t(wcstring comp, wcstring desc, string_fuzzy_match_t ma
       flags(resolve_auto_space(completion, flags_val)) {}
 
 completion_t::completion_t(const completion_t &) = default;
-completion_t::completion_t(completion_t &&) = default;
+completion_t::completion_t(completion_t &&) noexcept = default;
 completion_t &completion_t::operator=(const completion_t &) = default;
-completion_t &completion_t::operator=(completion_t &&) = default;
+completion_t &completion_t::operator=(completion_t &&) noexcept = default;
 completion_t::~completion_t() = default;
 
 __attribute__((always_inline)) static inline bool natural_compare_completions(

From ae77f1b1632ecc232e97d358f442fd9568be4776 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 Jan 2020 20:32:54 -0800
Subject: [PATCH 1648/1732] Make locked_consumed_job_ids heap allocated rather
 than static

This prevents its destructor from running during normal exit.
Fixes #6539
---
 src/proc.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/proc.cpp b/src/proc.cpp
index 324ea3fa4..6550d43e2 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -82,10 +82,11 @@ void set_job_control_mode(job_control_t mode) { job_control_mode = mode; }
 void proc_init() { signal_set_handlers_once(false); }
 
 // Basic thread safe sorted vector of job IDs in use.
-static owning_lock<std::vector<job_id_t>> locked_consumed_job_ids;
+// This is deliberately leaked to avoid dtor ordering issues - see #6539.
+static auto *const locked_consumed_job_ids = new owning_lock<std::vector<job_id_t>>();
 
 job_id_t acquire_job_id() {
-    auto consumed_job_ids = locked_consumed_job_ids.acquire();
+    auto consumed_job_ids = locked_consumed_job_ids->acquire();
 
     // The new job ID should be larger than the largest currently used ID (#6053).
     job_id_t jid = consumed_job_ids->empty() ? 1 : consumed_job_ids->back() + 1;
@@ -95,7 +96,7 @@ job_id_t acquire_job_id() {
 
 void release_job_id(job_id_t jid) {
     assert(jid > 0);
-    auto consumed_job_ids = locked_consumed_job_ids.acquire();
+    auto consumed_job_ids = locked_consumed_job_ids->acquire();
 
     // Our job ID vector is sorted, but the number of jobs is typically 1 or 2 so a binary search
     // isn't worth it.

From 7a2a6d76f3fbd7acf4c6338987c18eab07438580 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 Jan 2020 20:46:47 -0800
Subject: [PATCH 1649/1732] Migrate a test from C++ to littlecheck

This eliminates noisy warnings about tcsetpgrp when the tests are run
without a tty, as reported in #6539
---
 src/fish_tests.cpp        | 12 ------------
 tests/checks/sigint2.fish | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 tests/checks/sigint2.fish

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 904bc93bd..be17c407f 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1065,18 +1065,6 @@ static void test_cancellation() {
     test_1_cancellation(L"while true ; echo nothing > /dev/null; end");
     test_1_cancellation(L"for i in (while true ; end) ; end");
 
-    // Ensure that if child processes SIGINT, we exit our loops
-    // Test for #3780
-    // Ugly hack - temporarily fake an interactive session
-    // else we will SIGINT ourselves in response to our child death
-    session_interactivity_t iis = session_interactivity();
-    set_interactive_session(session_interactivity_t::implied);
-    const wchar_t *child_self_destructor = L"while true ; sh -c 'sleep .25; kill -s INT $$' ; end";
-    parser_t::principal_parser().eval(child_self_destructor, io_chain_t());
-    set_interactive_session(iis);
-
-    // Restore signal handling.
-    interactive.restore();
     signal_reset_handlers();
 
     // Ensure that we don't think we should cancel.
diff --git a/tests/checks/sigint2.fish b/tests/checks/sigint2.fish
new file mode 100644
index 000000000..a8b1d18e8
--- /dev/null
+++ b/tests/checks/sigint2.fish
@@ -0,0 +1,14 @@
+#RUN: %fish -C "set helper %fish_test_helper" %s
+
+# Ensure that if child processes SIGINT, we exit our loops
+# Test for #3780
+
+echo About to sigint
+#CHECK: About to sigint
+
+while true
+  sh -c 'echo Here we go; sleep .25; kill -s INT $$'
+end
+#CHECK: Here we go
+
+echo I should not be printed because of the SIGINT.

From 7d486c121ab6bda59bcefd9ffd365576c40e7484 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 26 Jan 2020 20:59:58 -0800
Subject: [PATCH 1650/1732] Revert "Add noexcept to completion_t definitions as
 well as declarations"

This reverts commit 89f5ae3e6a5a4a6f2f019441a4f3ba01024e98f2.

Apparently that broke gcc.
---
 src/complete.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/complete.cpp b/src/complete.cpp
index 8199abf8c..d67fea1e6 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -214,9 +214,9 @@ completion_t::completion_t(wcstring comp, wcstring desc, string_fuzzy_match_t ma
       flags(resolve_auto_space(completion, flags_val)) {}
 
 completion_t::completion_t(const completion_t &) = default;
-completion_t::completion_t(completion_t &&) noexcept = default;
+completion_t::completion_t(completion_t &&) = default;
 completion_t &completion_t::operator=(const completion_t &) = default;
-completion_t &completion_t::operator=(completion_t &&) noexcept = default;
+completion_t &completion_t::operator=(completion_t &&) = default;
 completion_t::~completion_t() = default;
 
 __attribute__((always_inline)) static inline bool natural_compare_completions(

From af22d6b732fa54dc994f7be9aba364cd11356e63 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Mon, 27 Jan 2020 12:09:58 -0800
Subject: [PATCH 1651/1732] Stop pretending to be interactive during the
 cancellation tests

Prior to this fix, the cancellation C++ test would mark the parser as
interactive in an effort to install interactive signal handling (so that,
for example, SIGINT would stop the job and return control to the user).

However this flag would also cause fish to attempt to save and restore tty modes
across the job. This would fail since there is no tty, and so the job would fail
with an unexpected error code.

We don't need to mark the parser as interactive, we can just remove that line.

Fixes #6539.
---
 src/fish_tests.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index be17c407f..920228890 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1049,7 +1049,6 @@ static void test_cancellation() {
     // Enable fish's signal handling here. We need to make this interactive for fish to install its
     // signal handlers.
     parser_t &parser = parser_t::principal_parser();
-    scoped_push<bool> interactive{&parser.libdata().is_interactive, true};
     signal_set_handlers(true);
 
     // This tests that we can correctly ctrl-C out of certain loop constructs, and that nothing gets

From dd1e526017c83d7a2b7801b5747f1ffc4cc5cbd9 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 Jan 2020 16:54:29 +0800
Subject: [PATCH 1652/1732] tests: remove an outdated comment

Code removed in af22d6b732fa54dc9
---
 src/fish_tests.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 920228890..a1a6cbad6 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1046,8 +1046,7 @@ static void test_1_cancellation(const wchar_t *src) {
 static void test_cancellation() {
     say(L"Testing Ctrl-C cancellation. If this hangs, that's a bug!");
 
-    // Enable fish's signal handling here. We need to make this interactive for fish to install its
-    // signal handlers.
+    // Enable fish's signal handling here.
     parser_t &parser = parser_t::principal_parser();
     signal_set_handlers(true);
 

From 0e75bcc61f3619c06a692f8a10885e71b6fa8b46 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Tue, 28 Jan 2020 16:55:05 +0800
Subject: [PATCH 1653/1732] fish.spec/debian packaging: add build dependency on
 Python

For littlecheck etc.
---
 debian/control | 2 +-
 fish.spec.in   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 95ae47843..ef9a72cf0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
 Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>
 Build-Depends: debhelper (>= 9.0.0), libncurses5-dev, cmake3 (>= 3.2.0) | cmake (>= 3.2.0), gettext,
 # Test dependencies
- locales-all
+ locales-all, python3
 # When libpcre2-dev is available on all supported Debian versions, add a dependency on that.
 Standards-Version: 4.1.5
 Homepage: https://fishshell.com/
diff --git a/fish.spec.in b/fish.spec.in
index 7fd41c0c9..d45fb6775 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -30,7 +30,9 @@ BuildRequires: gcc48 gcc48-c++ python-argparse
 # Need the en_US.utf-8 locale at a minimum
 BuildRequires: glibc-langpack-en
 %endif
-%if 0%{?rhel} && 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} < 8
+BuildRequires: python
+%else
 BuildRequires: python3
 %endif
 

From f27958ef4d571401aee991028a5373205c45c7ed Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 Jan 2020 10:25:49 -0800
Subject: [PATCH 1654/1732] Clean up the open_cloexec interface

Remove the ability to make it non-cloexec - nobody was using it.
---
 src/env_universal_common.cpp |  2 +-
 src/wutil.cpp                | 16 ++++++++--------
 src/wutil.h                  |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 66155c178..6e9ae8620 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -414,7 +414,7 @@ bool env_universal_t::load_from_path(const std::string &path, callback_data_list
     }
 
     bool result = false;
-    int fd = open_cloexec(path, O_RDONLY);
+    int fd = open_cloexec(path.c_str(), O_RDONLY);
     if (fd >= 0) {
         FLOGF(uvar_file, L"universal log reading from file");
         this->load_from_fd(fd, callbacks);
diff --git a/src/wutil.cpp b/src/wutil.cpp
index ea7bdf694..2f709770b 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -197,19 +197,19 @@ int set_cloexec(int fd, bool should_set) {
     }
 }
 
-int open_cloexec(const std::string &cstring, int flags, mode_t mode, bool cloexec) {
+int open_cloexec(const std::string &path, int flags, mode_t mode) {
+    return open_cloexec(path.c_str(), flags, mode);
+}
+
+int open_cloexec(const char *path, int flags, mode_t mode) {
     ASSERT_IS_NOT_FORKED_CHILD();
     int fd;
 
 #ifdef O_CLOEXEC
     // Prefer to use O_CLOEXEC. It has to both be defined and nonzero.
-    if (cloexec) {
-        fd = open(cstring.c_str(), flags | O_CLOEXEC, mode);
-    } else {
-        fd = open(cstring.c_str(), flags, mode);
-    }
+    fd = open(path, flags | O_CLOEXEC, mode);
 #else
-    fd = open(cstring.c_str(), flags, mode);
+    fd = open(path, flags, mode);
     if (fd >= 0 && !set_cloexec(fd)) {
         close(fd);
         fd = -1;
@@ -225,7 +225,7 @@ int wopen(const wcstring &pathname, int flags, mode_t mode) {
 
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode) {
     cstring tmp = wcs2string(pathname);
-    return open_cloexec(tmp, flags, mode, true);
+    return open_cloexec(tmp, flags, mode);
 }
 
 DIR *wopendir(const wcstring &name) {
diff --git a/src/wutil.h b/src/wutil.h
index 636eff347..cc892663f 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -32,8 +32,9 @@ int wopen(const wcstring &pathname, int flags, mode_t mode = 0);
 /// possible).
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode = 0);
 
-/// Narrow version of wopen_cloexec.
-int open_cloexec(const std::string &cstring, int flags, mode_t mode = 0, bool cloexec = true);
+/// Narrow versions of wopen_cloexec.
+int open_cloexec(const std::string &path, int flags, mode_t mode = 0);
+int open_cloexec(const char *path, int flags, mode_t mode = 0);
 
 /// Mark an fd as nonblocking; returns errno or 0 on success.
 int make_fd_nonblocking(int fd);

From 1bbfb7044b6621a702a3b7975e45b4efde47abc1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 Jan 2020 10:26:31 -0800
Subject: [PATCH 1655/1732] Remove wopen

It was unused
---
 src/wutil.cpp | 5 -----
 src/wutil.h   | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/src/wutil.cpp b/src/wutil.cpp
index 2f709770b..a136ce0ff 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -218,11 +218,6 @@ int open_cloexec(const char *path, int flags, mode_t mode) {
     return fd;
 }
 
-int wopen(const wcstring &pathname, int flags, mode_t mode) {
-    cstring tmp = wcs2string(pathname);
-    return open(tmp.c_str(), flags, mode);
-}
-
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode) {
     cstring tmp = wcs2string(pathname);
     return open_cloexec(tmp, flags, mode);
diff --git a/src/wutil.h b/src/wutil.h
index cc892663f..7e9c7ca2c 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -25,9 +25,6 @@ FILE *wfopen(const wcstring &path, const char *mode);
 /// Sets CLO_EXEC on a given fd according to the value of \p should_set.
 int set_cloexec(int fd, bool should_set = true);
 
-/// Wide character version of open().
-int wopen(const wcstring &pathname, int flags, mode_t mode = 0);
-
 /// Wide character version of open() that also sets the close-on-exec flag (atomically when
 /// possible).
 int wopen_cloexec(const wcstring &pathname, int flags, mode_t mode = 0);

From af2265b4b08266755e619457f621773b665e2a28 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 Jan 2020 10:30:51 -0800
Subject: [PATCH 1656/1732] Migrate create_directory inside path.cpp

It is not used outside of path.cpp
---
 src/common.cpp | 19 -------------------
 src/common.h   |  6 ------
 src/path.cpp   | 23 +++++++++++++++++++++++
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index 1e3feac5b..a23880e3e 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1965,25 +1965,6 @@ int string_fuzzy_match_t::compare(const string_fuzzy_match_t &rhs) const {
     return 0;  // equal
 }
 
-int create_directory(const wcstring &d) {
-    bool ok = false;
-    struct stat buf;
-    int stat_res = 0;
-
-    while ((stat_res = wstat(d, &buf)) != 0) {
-        if (errno != EAGAIN) break;
-    }
-
-    if (stat_res == 0) {
-        if (S_ISDIR(buf.st_mode)) ok = true;
-    } else if (errno == ENOENT) {
-        wcstring dir = wdirname(d);
-        if (!create_directory(dir) && !wmkdir(d, 0700)) ok = true;
-    }
-
-    return ok ? 0 : -1;
-}
-
 [[gnu::noinline]] void bugreport() {
     FLOG(error, _(L"This is a bug. Break on 'bugreport' to debug."));
     FLOG(error, _(L"If you can reproduce it, please report: "), PACKAGE_BUGREPORT, L'.');
diff --git a/src/common.h b/src/common.h
index 6a0dcc656..f476f1d76 100644
--- a/src/common.h
+++ b/src/common.h
@@ -661,12 +661,6 @@ void common_handle_winch(int signal);
 /// Write the given paragraph of output, redoing linebreaks to fit the current screen.
 wcstring reformat_for_screen(const wcstring &msg);
 
-/// Make sure the specified directory exists. If needed, try to create it and any currently not
-/// existing parent directories.
-///
-/// \return 0 if, at the time of function return the directory exists, -1 otherwise.
-int create_directory(const wcstring &d);
-
 /// Print a short message about how to file a bug report to stderr.
 void bugreport();
 
diff --git a/src/path.cpp b/src/path.cpp
index cc5e87618..f406f8f61 100644
--- a/src/path.cpp
+++ b/src/path.cpp
@@ -285,6 +285,29 @@ static void maybe_issue_path_warning(const wcstring &which_dir, const wcstring &
     ignore_result(write(STDERR_FILENO, "\n", 1));
 }
 
+/// Make sure the specified directory exists. If needed, try to create it and any currently not
+/// existing parent directories, like mkdir -p,.
+///
+/// \return 0 if, at the time of function return the directory exists, -1 otherwise.
+static int create_directory(const wcstring &d) {
+    bool ok = false;
+    struct stat buf;
+    int stat_res = 0;
+
+    while ((stat_res = wstat(d, &buf)) != 0) {
+        if (errno != EAGAIN) break;
+    }
+
+    if (stat_res == 0) {
+        if (S_ISDIR(buf.st_mode)) ok = true;
+    } else if (errno == ENOENT) {
+        wcstring dir = wdirname(d);
+        if (!create_directory(dir) && !wmkdir(d, 0700)) ok = true;
+    }
+
+    return ok ? 0 : -1;
+}
+
 /// The following type wraps up a user's "base" directories, corresponding (conceptually if not
 /// actually) to XDG spec.
 struct base_directory_t {

From fc4557c78494f5bfc94d34b13bf93b91f152e3f8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 Jan 2020 10:43:37 -0800
Subject: [PATCH 1657/1732] Eliminate wopen()

It was large and mostly unnecessary. Prefer wopen() followed by
fdopen().
---
 src/fish_tests.cpp |  2 +-
 src/proc.cpp       | 16 +++++++++-------
 src/reader.cpp     |  5 +++--
 src/wutil.cpp      | 36 ------------------------------------
 src/wutil.h        |  3 ---
 5 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index a1a6cbad6..2c3236983 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -3369,7 +3369,7 @@ static void test_universal_ok_to_save() {
     say(L"Testing universal Ok to save");
     if (system("mkdir -p test/fish_uvars_test/")) err(L"mkdir failed");
     const char *contents = "# VERSION: 99999.99\n";
-    FILE *fp = wfopen(UVARS_TEST_PATH, "w");
+    FILE *fp = fopen(wcs2string(UVARS_TEST_PATH).c_str(), "w");
     assert(fp && "Failed to open UVARS_TEST_PATH for writing");
     fwrite(contents, std::strlen(contents), 1, fp);
     fclose(fp);
diff --git a/src/proc.cpp b/src/proc.cpp
index 6550d43e2..d4e501add 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -620,15 +621,11 @@ bool job_reap(parser_t &parser, bool allow_interactive) {
     return printed;
 }
 
-/// Maximum length of a /proc/[PID]/stat filename.
-#define FN_SIZE 256
-
 /// Get the CPU time for the specified process.
 unsigned long proc_get_jiffies(process_t *p) {
     if (!have_proc_stat()) return 0;
     if (p->pid <= 0) return 0;
 
-    wchar_t fn[FN_SIZE];
     char state;
     int pid, ppid, pgrp, session, tty_nr, tpgid, exit_signal, processor;
     long int cutime, cstime, priority, nice, placeholder, itrealvalue, rss;
@@ -637,11 +634,16 @@ unsigned long proc_get_jiffies(process_t *p) {
         wchan, nswap, cnswap;
     char comm[1024];
 
-    std::swprintf(fn, FN_SIZE, L"/proc/%d/stat", p->pid);
-    FILE *f = wfopen(fn, "r");
-    if (!f) return 0;
+    /// Maximum length of a /proc/[PID]/stat filename.
+    constexpr size_t FN_SIZE = 256;
+    char fn[FN_SIZE];
+    std::snprintf(fn, FN_SIZE, "/proc/%d/stat", p->pid);
+    // Don't use autoclose_fd here, we will fdopen() and then fclose() instead.
+    int fd = open_cloexec(fn, O_RDONLY);
+    if (fd < 0) return 0;
 
     // TODO: replace the use of fscanf() as it is brittle and should never be used.
+    FILE *f = fdopen(fd, "r");
     int count = fscanf(f,
                        "%9d %1023s %c %9d %9d %9d %9d %9d %9lu "
                        "%9lu %9lu %9lu %9lu %9lu %9lu %9ld %9ld %9ld "
diff --git a/src/reader.cpp b/src/reader.cpp
index f4d3fe1a4..7e563b096 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -2174,8 +2174,9 @@ void reader_import_history_if_necessary() {
         const auto var = data->vars().get(L"HISTFILE");
         wcstring path = (var ? var->as_string() : L"~/.bash_history");
         expand_tilde(path, data->vars());
-        FILE *f = wfopen(path, "r");
-        if (f) {
+        int fd = wopen_cloexec(path, O_RDONLY);
+        if (fd >= 0) {
+            FILE *f = fdopen(fd, "r");
             data->history->populate_from_bash(f);
             fclose(f);
         }
diff --git a/src/wutil.cpp b/src/wutil.cpp
index a136ce0ff..ce47bff8f 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -141,42 +141,6 @@ wcstring wgetcwd() {
     return wcstring();
 }
 
-FILE *wfopen(const wcstring &path, const char *mode) {
-    int permissions = 0, options = 0;
-    size_t idx = 0;
-    switch (mode[idx++]) {
-        case 'r': {
-            permissions = O_RDONLY;
-            break;
-        }
-        case 'w': {
-            permissions = O_WRONLY;
-            options = O_CREAT | O_TRUNC;
-            break;
-        }
-        case 'a': {
-            permissions = O_WRONLY;
-            options = O_CREAT | O_APPEND;
-            break;
-        }
-        default: {
-            errno = EINVAL;
-            return nullptr;
-        }
-    }
-    // Skip binary.
-    if (mode[idx] == 'b') idx++;
-
-    // Consider append option.
-    if (mode[idx] == '+') permissions = O_RDWR;
-
-    int fd = wopen_cloexec(path, permissions | options, 0666);
-    if (fd < 0) return nullptr;
-    FILE *result = fdopen(fd, mode);
-    if (result == nullptr) close(fd);
-    return result;
-}
-
 int set_cloexec(int fd, bool should_set) {
     // Note we don't want to overwrite existing flags like O_NONBLOCK which may be set. So fetch the
     // existing flags and modify them.
diff --git a/src/wutil.h b/src/wutil.h
index 7e9c7ca2c..c142e6853 100644
--- a/src/wutil.h
+++ b/src/wutil.h
@@ -19,9 +19,6 @@
 #include "common.h"
 #include "maybe.h"
 
-/// Wide character version of fopen(). This sets CLO_EXEC.
-FILE *wfopen(const wcstring &path, const char *mode);
-
 /// Sets CLO_EXEC on a given fd according to the value of \p should_set.
 int set_cloexec(int fd, bool should_set = true);
 

From 376529a46d6ba84caf8f429310cf8f5b8b0e8fd5 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 28 Jan 2020 11:39:26 -0800
Subject: [PATCH 1658/1732] Clean up reader_read

Stop having reader_read close the input file descriptor. Make other
modernizations.
---
 src/builtin_source.cpp |  16 ++++--
 src/fish.cpp           |  11 ++--
 src/reader.cpp         | 112 +++++++++++++++++------------------------
 src/reader.h           |   1 +
 4 files changed, 62 insertions(+), 78 deletions(-)

diff --git a/src/builtin_source.cpp b/src/builtin_source.cpp
index 0765053fb..633487e90 100644
--- a/src/builtin_source.cpp
+++ b/src/builtin_source.cpp
@@ -37,7 +37,12 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         return STATUS_CMD_OK;
     }
 
-    int fd;
+    // If we open a file, this ensures we close it.
+    autoclose_fd_t opened_fd;
+
+    // The fd that we read from, either from opened_fd or stdin.
+    int fd = -1;
+
     struct stat buf;
     const wchar_t *fn, *fn_intern;
 
@@ -49,17 +54,18 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
         fn = L"-";
         fn_intern = fn;
-        fd = dup(streams.stdin_fd);
+        fd = streams.stdin_fd;
     } else {
-        if ((fd = wopen_cloexec(argv[optind], O_RDONLY)) == -1) {
+        opened_fd = autoclose_fd_t(wopen_cloexec(argv[optind], O_RDONLY));
+        if (!opened_fd.valid()) {
             streams.err.append_format(_(L"%ls: Error encountered while sourcing file '%ls':\n"),
                                       cmd, argv[optind]);
             builtin_wperror(cmd, streams);
             return STATUS_CMD_ERROR;
         }
 
+        fd = opened_fd.fd();
         if (fstat(fd, &buf) == -1) {
-            close(fd);
             streams.err.append_format(_(L"%ls: Error encountered while sourcing file '%ls':\n"),
                                       cmd, argv[optind]);
             builtin_wperror(L"source", streams);
@@ -67,13 +73,13 @@ int builtin_source(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         }
 
         if (!S_ISREG(buf.st_mode)) {
-            close(fd);
             streams.err.append_format(_(L"%ls: '%ls' is not a file\n"), cmd, argv[optind]);
             return STATUS_CMD_ERROR;
         }
 
         fn_intern = intern(argv[optind]);
     }
+    assert(fd >= 0 && "Should have a valid fd");
 
     const block_t *sb = parser.push_block(block_t::source_block(fn_intern));
     auto &ld = parser.libdata();
diff --git a/src/fish.cpp b/src/fish.cpp
index 7db3ade1d..f4b07f8fa 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -493,14 +493,11 @@ int main(int argc, char **argv) {
             // Implicitly interactive mode.
             res = reader_read(parser, STDIN_FILENO, {});
         } else {
-            char *file = *(argv + (my_optind++));
-            int fd = open(file, O_RDONLY);
-            if (fd == -1) {
+            const char *file = *(argv + (my_optind++));
+            autoclose_fd_t fd(open_cloexec(file, O_RDONLY));
+            if (!fd.valid()) {
                 perror(file);
             } else {
-                // OK to not do this atomically since we cannot have gone multithreaded yet.
-                set_cloexec(fd);
-
                 wcstring_list_t list;
                 for (char **ptr = argv + my_optind; *ptr; ptr++) {
                     list.push_back(str2wcstring(*ptr));
@@ -511,7 +508,7 @@ int main(int argc, char **argv) {
                 wcstring rel_filename = str2wcstring(file);
                 scoped_push<const wchar_t *> filename_push{&ld.current_filename,
                                                            intern(rel_filename.c_str())};
-                res = reader_read(parser, fd, {});
+                res = reader_read(parser, fd.fd(), {});
                 if (res) {
                     FLOGF(warning, _(L"Error while reading file %ls\n"),
                           ld.current_filename ? ld.current_filename : _(L"Standard input"));
diff --git a/src/reader.cpp b/src/reader.cpp
index 7e563b096..fe33f8031 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -3486,76 +3486,56 @@ bool reader_get_selection(size_t *start, size_t *len) {
 
 /// Read non-interactively.  Read input from stdin without displaying the prompt, using syntax
 /// highlighting. This is used for reading scripts and init files.
+/// The file is not closed.
 static int read_ni(parser_t &parser, int fd, const io_chain_t &io) {
-    FILE *in_stream;
-    std::vector<char> acc;
+    // Read all data into a std::string.
+    std::string fd_contents;
+    for (;;) {
+        char buff[4096];
+        size_t amt = read(fd, buff, sizeof buff);
+        if (amt > 0) {
+            fd_contents.append(buff, amt);
+        } else if (amt == 0) {
+            // EOF.
+            break;
+        } else {
+            int err = errno;
+            if (err == EINTR) {
+                continue;
+            } else if ((err == EAGAIN || err == EWOULDBLOCK) && make_fd_blocking(fd)) {
+                // We succeeded in making the fd blocking, keep going.
+                continue;
+            } else {
+                // Fatal error.
+                FLOGF(error, _(L"Unable to read input file: %s"), strerror(err));
+                // Reset buffer on error. We won't evaluate incomplete files.
+                fd_contents.clear();
+            }
+        }
+    }
 
-    int des = (fd == STDIN_FILENO ? dup(STDIN_FILENO) : fd);
-    int res = 0;
+    wcstring str = str2wcstring(fd_contents);
 
-    if (des == -1) {
-        wperror(L"dup");
+    // Eagerly deallocate to save memory.
+    fd_contents.clear();
+    fd_contents.shrink_to_fit();
+
+    // Swallow a BOM (issue #1518).
+    if (!str.empty() && str.at(0) == UTF8_BOM_WCHAR) {
+        str.erase(0, 1);
+    }
+
+    parse_error_list_t errors;
+    parsed_source_ref_t pstree;
+    if (!parse_util_detect_errors(str, &errors, false /* do not accept incomplete */, &pstree)) {
+        parser.eval(pstree, io);
+        return 0;
+    } else {
+        wcstring sb;
+        parser.get_backtrace(str, errors, sb);
+        std::fwprintf(stderr, L"%ls", sb.c_str());
         return 1;
     }
-
-    in_stream = fdopen(des, "r");
-    if (in_stream != nullptr) {
-        while (!feof(in_stream)) {
-            char buff[4096];
-            size_t c = fread(buff, 1, 4096, in_stream);
-
-            if (ferror(in_stream)) {
-                if (errno == EINTR) {
-                    // We got a signal, just keep going. Be sure that we call insert() below because
-                    // we may get data as well as EINTR.
-                    clearerr(in_stream);
-                } else if ((errno == EAGAIN || errno == EWOULDBLOCK) &&
-                           make_fd_blocking(des) == 0) {
-                    // We succeeded in making the fd blocking, keep going.
-                    clearerr(in_stream);
-                } else {
-                    // Fatal error.
-                    FLOGF(error, _(L"Unable to read input file: %s"), strerror(errno));
-                    // Reset buffer on error. We won't evaluate incomplete files.
-                    acc.clear();
-                    break;
-                }
-            }
-
-            acc.insert(acc.end(), buff, buff + c);
-        }
-
-        wcstring str = acc.empty() ? wcstring() : str2wcstring(&acc.at(0), acc.size());
-        acc.clear();
-
-        if (fclose(in_stream)) {
-            FLOGF(warning, _(L"Error while closing input stream"));
-            wperror(L"fclose");
-            res = 1;
-        }
-
-        // Swallow a BOM (issue #1518).
-        if (!str.empty() && str.at(0) == UTF8_BOM_WCHAR) {
-            str.erase(0, 1);
-        }
-
-        parse_error_list_t errors;
-        parsed_source_ref_t pstree;
-        if (!parse_util_detect_errors(str, &errors, false /* do not accept incomplete */,
-                                      &pstree)) {
-            parser.eval(pstree, io);
-        } else {
-            wcstring sb;
-            parser.get_backtrace(str, errors, sb);
-            std::fwprintf(stderr, L"%ls", sb.c_str());
-            res = 1;
-        }
-    } else {
-        FLOGF(warning, _(L"Error while opening input stream"));
-        wperror(L"fdopen");
-        res = 1;
-    }
-    return res;
 }
 
 int reader_read(parser_t &parser, int fd, const io_chain_t &io) {
@@ -3582,7 +3562,7 @@ int reader_read(parser_t &parser, int fd, const io_chain_t &io) {
     scoped_push<bool> interactive_push{&parser.libdata().is_interactive, interactive};
     signal_set_handlers_once(interactive);
 
-    res = parser.is_interactive() ? read_i(parser) : read_ni(parser, fd, io);
+    res = interactive ? read_i(parser) : read_ni(parser, fd, io);
 
     // If the exit command was called in a script, only exit the script, not the program.
     reader_set_end_loop(false);
diff --git a/src/reader.h b/src/reader.h
index 5f3127d56..a60883711 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -49,6 +49,7 @@ class editable_line_t {
 };
 
 /// Read commands from \c fd until encountering EOF.
+/// The fd is not closed.
 int reader_read(parser_t &parser, int fd, const io_chain_t &io);
 
 /// Tell the shell whether it should exit after the currently running command finishes.

From 8e8a3846fb8bc7dd0dffaf0adce8dae3f78c5bdd Mon Sep 17 00:00:00 2001
From: Johannes Sasongko <sasongko@gmail.com>
Date: Mon, 27 Jan 2020 20:32:50 +1000
Subject: [PATCH 1659/1732] __fish_prepend_sudo: Don't move the relative
 position of the cursor

At the moment the "prepend sudo" functionality always sets the cursor to
the end of the line. This changes it to restore the relative position of
the cursor.
---
 share/functions/__fish_prepend_sudo.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/share/functions/__fish_prepend_sudo.fish b/share/functions/__fish_prepend_sudo.fish
index aaca6c37a..b681d1ca0 100644
--- a/share/functions/__fish_prepend_sudo.fish
+++ b/share/functions/__fish_prepend_sudo.fish
@@ -1,8 +1,9 @@
 function __fish_prepend_sudo -d "Prepend 'sudo ' to the beginning of the current commandline"
     set -l cmd (commandline -poc)
     if test "$cmd[1]" != "sudo"
+        set -l cursor (commandline -C)
         commandline -C 0
         commandline -i "sudo "
-        commandline -f end-of-line
+        commandline -C (math $cursor + 5)
     end
 end

From 29af84d7333780a2ed5dbcf4bfcf984331b7fbad Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 13:40:17 -0800
Subject: [PATCH 1660/1732] Migrate get_interpreter into postfork.cpp

It's only used after fork.
---
 src/exec.cpp     | 27 ---------------------------
 src/exec.h       |  3 ---
 src/postfork.cpp | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index d83591fc2..c20c32cd2 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -66,33 +66,6 @@ void exec_close(int fd) {
     }
 }
 
-/// Returns the interpreter for the specified script. Returns NULL if file is not a script with a
-/// shebang.
-char *get_interpreter(const char *command, char *interpreter, size_t buff_size) {
-    // OK to not use CLO_EXEC here because this is only called after fork.
-    int fd = open(command, O_RDONLY);
-    if (fd >= 0) {
-        size_t idx = 0;
-        while (idx + 1 < buff_size) {
-            char ch;
-            ssize_t amt = read(fd, &ch, sizeof ch);
-            if (amt <= 0) break;
-            if (ch == '\n') break;
-            interpreter[idx++] = ch;
-        }
-        interpreter[idx++] = '\0';
-        close(fd);
-    }
-
-    if (std::strncmp(interpreter, "#! /", 4) == 0) {
-        return interpreter + 3;
-    } else if (std::strncmp(interpreter, "#!/", 3) == 0) {
-        return interpreter + 2;
-    }
-
-    return nullptr;
-}
-
 /// This function is executed by the child process created by a call to fork(). It should be called
 /// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
diff --git a/src/exec.h b/src/exec.h
index 7f9b03fab..e2bd6f907 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -37,7 +37,4 @@ int exec_subshell_for_expand(const wcstring &cmd, parser_t &parser, wcstring_lis
 /// Loops over close until the syscall was run without being interrupted.
 void exec_close(int fd);
 
-/// Gets the interpreter for a given command.
-char *get_interpreter(const char *command, char *interpreter, size_t buff_size);
-
 #endif
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 4dfad691f..7ae3e13d7 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -38,6 +38,8 @@
 /// Fork error message.
 #define FORK_ERROR "Could not create child process - exiting"
 
+static char *get_interpreter(const char *command, char *buffer, size_t buff_size);
+
 /// Called only by the child to set its own process group (possibly creating a new group in the
 /// process if it is the first in a JOB_CONTROL job.
 /// Returns true on success, false on failure.
@@ -353,8 +355,9 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
             // an open file action fails. These cases appear to be impossible to distinguish. We
             // address this by not using posix_spawn for file redirections, so all the ENOENTs we
             // find must be errors from exec().
-            char interpreter_buff[128] = {}, *interpreter;
-            interpreter = get_interpreter(actual_cmd, interpreter_buff, sizeof interpreter_buff);
+            char interpreter_buff[128] = {};
+            const char *interpreter =
+                get_interpreter(actual_cmd, interpreter_buff, sizeof interpreter_buff);
             if (interpreter && 0 != access(interpreter, X_OK)) {
                 debug_safe(0,
                            "The file '%s' specified the interpreter '%s', which is not an "
@@ -378,3 +381,29 @@ void safe_report_exec_error(int err, const char *actual_cmd, const char *const *
         }
     }
 }
+
+/// Returns the interpreter for the specified script. Returns NULL if file is not a script with a
+/// shebang.
+static char *get_interpreter(const char *command, char *buffer, size_t buff_size) {
+    // OK to not use CLO_EXEC here because this is only called after fork.
+    int fd = open(command, O_RDONLY);
+    if (fd >= 0) {
+        size_t idx = 0;
+        while (idx + 1 < buff_size) {
+            char ch;
+            ssize_t amt = read(fd, &ch, sizeof ch);
+            if (amt <= 0) break;
+            if (ch == '\n') break;
+            buffer[idx++] = ch;
+        }
+        buffer[idx++] = '\0';
+        close(fd);
+    }
+
+    if (std::strncmp(buffer, "#! /", 4) == 0) {
+        return buffer + 3;
+    } else if (std::strncmp(buffer, "#!/", 3) == 0) {
+        return buffer + 2;
+    }
+    return nullptr;
+}

From 3d47f042ac59156e64f14056ea14c826ab45cee1 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 13:55:10 -0800
Subject: [PATCH 1661/1732] Be more consistent about using autoclose_fd_t and
 exec_close

Simplifying and improving file descriptor handling discipline.
---
 src/common.cpp               | 14 +++++++++---
 src/common.h                 |  3 +++
 src/env_universal_common.cpp | 42 +++++++++++++++---------------------
 src/env_universal_common.h   |  2 +-
 src/exec.cpp                 | 14 ------------
 5 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index a23880e3e..aeab343a8 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -2071,12 +2071,20 @@ void exit_without_destructors(int code) { _exit(code); }
 
 void autoclose_fd_t::close() {
     if (fd_ < 0) return;
-    if (::close(fd_) == -1) {
-        wperror(L"close");
-    }
+    exec_close(fd_);
     fd_ = -1;
 }
 
+void exec_close(int fd) {
+    assert(fd >= 0 && "Invalid fd");
+    while (close(fd) == -1) {
+        if (errno != EINTR) {
+            wperror(L"close");
+            break;
+        }
+    }
+}
+
 extern "C" {
 [[gnu::noinline]] void debug_thread_error(void) {
     // Wait for a SIGINT. We can't use sigsuspend() because the signal may be delivered on another
diff --git a/src/common.h b/src/common.h
index f476f1d76..a3fc728c6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -569,6 +569,9 @@ class autoclose_fd_t {
     ~autoclose_fd_t() { close(); }
 };
 
+/// Close a file descriptor \p fd, retrying on EINTR.
+void exec_close(int fd);
+
 wcstring format_string(const wchar_t *format, ...);
 wcstring vformat_string(const wchar_t *format, va_list va_orig);
 void append_format(wcstring &str, const wchar_t *format, ...);
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 6e9ae8620..8c29894b3 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -414,11 +414,10 @@ bool env_universal_t::load_from_path(const std::string &path, callback_data_list
     }
 
     bool result = false;
-    int fd = open_cloexec(path.c_str(), O_RDONLY);
-    if (fd >= 0) {
+    autoclose_fd_t fd{open_cloexec(path.c_str(), O_RDONLY)};
+    if (fd.valid()) {
         FLOGF(uvar_file, L"universal log reading from file");
-        this->load_from_fd(fd, callbacks);
-        close(fd);
+        this->load_from_fd(fd.fd(), callbacks);
         result = true;
     }
     return result;
@@ -571,7 +570,7 @@ static bool lock_uvar_file(int fd) {
     return check_duration(start_time);
 }
 
-bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd) {
+bool env_universal_t::open_and_acquire_lock(const std::string &path, autoclose_fd_t *out_fd) {
     // Attempt to open the file for reading at the given path, atomically acquiring a lock. On BSD,
     // we can use O_EXLOCK. On Linux, we open the file, take a lock, and then compare fstat() to
     // stat(); if they match, it means that the file was not replaced before we acquired the lock.
@@ -589,11 +588,11 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
     }
 #endif
 
-    int fd = -1;
-    while (fd == -1) {
+    autoclose_fd_t fd{};
+    while (!fd.valid()) {
         double start_time = timef();
-        fd = open_cloexec(path, flags, 0644);
-        if (fd == -1) {
+        fd = autoclose_fd_t{open_cloexec(path, flags, 0644)};
+        if (!fd.valid()) {
             if (errno == EINTR) continue;  // signaled; try again
 #ifdef O_EXLOCK
             if (do_locking && (errno == ENOTSUP || errno == EOPNOTSUPP)) {
@@ -611,7 +610,7 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
             break;
         }
 
-        assert(fd >= 0);  // if we get here, we must have a valid fd
+        assert(fd.valid() && "Should have a valid fd here");
         if (!needs_lock && do_locking) {
             do_locking = check_duration(start_time);
         }
@@ -619,20 +618,19 @@ bool env_universal_t::open_and_acquire_lock(const std::string &path, int *out_fd
         // Try taking the lock, if necessary. If we failed, we may be on lockless NFS, etc.; in that
         // case we pretend we succeeded. See the comment in save_to_path for the rationale.
         if (needs_lock && do_locking) {
-            do_locking = lock_uvar_file(fd);
+            do_locking = lock_uvar_file(fd.fd());
         }
 
         // Hopefully we got the lock. However, it's possible the file changed out from under us
         // while we were waiting for the lock. Make sure that didn't happen.
-        if (file_id_for_fd(fd) != file_id_for_path(path)) {
+        if (file_id_for_fd(fd.fd()) != file_id_for_path(path)) {
             // Oops, it changed! Try again.
-            close(fd);
-            fd = -1;
+            fd.close();
         }
     }
 
-    *out_fd = fd;
-    return fd >= 0;
+    *out_fd = std::move(fd);
+    return out_fd->valid();
 }
 
 // Returns true if modified variables were written, false if not. (There may still be variable
@@ -692,7 +690,7 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
 
     const wcstring directory = wdirname(explicit_vars_path);
     bool success = true;
-    int vars_fd = -1;
+    autoclose_fd_t vars_fd{};
 
     FLOGF(uvar_file, L"universal log performing full sync");
 
@@ -704,19 +702,13 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
 
     // Read from it.
     if (success) {
-        assert(vars_fd >= 0);
-        this->load_from_fd(vars_fd, callbacks);
+        assert(vars_fd.valid());
+        this->load_from_fd(vars_fd.fd(), callbacks);
     }
 
     if (success && ok_to_save) {
         success = this->save(directory, explicit_vars_path);
     }
-
-    // Clean up.
-    if (vars_fd >= 0) {
-        close(vars_fd);
-    }
-
     return success;
 }
 
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index ae4bd3691..f7441e9dd 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -65,7 +65,7 @@ class env_universal_t {
     bool remove_internal(const wcstring &key);
 
     // Functions concerned with saving.
-    bool open_and_acquire_lock(const std::string &path, int *out_fd);
+    bool open_and_acquire_lock(const std::string &path, autoclose_fd_t *out_fd);
     bool open_temporary_file(const wcstring &directory, wcstring *out_path, int *out_fd);
     bool write_to_fd(int fd, const wcstring &path);
     bool move_new_vars_file_into_place(const wcstring &src, const wcstring &dst);
diff --git a/src/exec.cpp b/src/exec.cpp
index c20c32cd2..5273adaf4 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -49,23 +49,9 @@
 #include "trace.h"
 #include "wutil.h"  // IWYU pragma: keep
 
-/// File descriptor redirection error message.
-#define FD_ERROR _(L"An error occurred while redirecting file descriptor %d")
-
 /// Number of calls to fork() or posix_spawn().
 static relaxed_atomic_t<int> s_fork_count{0};
 
-void exec_close(int fd) {
-    assert(fd >= 0 && "Invalid fd");
-    while (close(fd) == -1) {
-        if (errno != EINTR) {
-            FLOGF(warning, FD_ERROR, fd);
-            wperror(L"close");
-            break;
-        }
-    }
-}
-
 /// This function is executed by the child process created by a call to fork(). It should be called
 /// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.

From 28a8d0dbf72e48fb515606601a3d7df6e25d0a47 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 14:01:55 -0800
Subject: [PATCH 1662/1732] Continued adoption of autoclose_fd_t and exec_close

---
 src/env_universal_common.cpp | 46 +++++++++++++++---------------------
 src/env_universal_common.h   |  2 +-
 src/reader.cpp               |  8 +++----
 src/wutil.cpp                |  2 +-
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 8c29894b3..0a107d9e8 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -518,34 +518,29 @@ bool env_universal_t::initialize(callback_data_list_t &callbacks) {
     return success;
 }
 
-bool env_universal_t::open_temporary_file(const wcstring &directory, wcstring *out_path,
-                                          int *out_fd) {
+autoclose_fd_t env_universal_t::open_temporary_file(const wcstring &directory, wcstring *out_path) {
     // Create and open a temporary file for writing within the given directory. Try to create a
     // temporary file, up to 10 times. We don't use mkstemps because we want to open it CLO_EXEC.
     // This should almost always succeed on the first try.
     assert(!string_suffixes_string(L"/", directory));  //!OCLINT(multiple unary operator)
 
-    bool success = false;
     int saved_errno;
     const wcstring tmp_name_template = directory + L"/fishd.tmp.XXXXXX";
-
+    autoclose_fd_t result;
     char *narrow_str = nullptr;
-    for (size_t attempt = 0; attempt < 10 && !success; attempt++) {
+    for (size_t attempt = 0; attempt < 10 && !result.valid(); attempt++) {
         narrow_str = wcs2str(tmp_name_template);
-        int result_fd = fish_mkstemp_cloexec(narrow_str);
+        result.reset(fish_mkstemp_cloexec(narrow_str));
         saved_errno = errno;
-        success = result_fd != -1;
-        *out_fd = result_fd;
     }
-
     *out_path = str2wcstring(narrow_str);
     free(narrow_str);
 
-    if (!success) {
+    if (!result.valid()) {
         const char *error = std::strerror(saved_errno);
         FLOGF(error, _(L"Unable to open temporary file '%ls': %s"), out_path->c_str(), error);
     }
-    return success;
+    return result;
 }
 
 /// Check how long the operation took and print a message if it took too long.
@@ -717,17 +712,18 @@ bool env_universal_t::sync(callback_data_list_t &callbacks) {
 bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path) {
     assert(ok_to_save && "It's not OK to save");
 
-    int private_fd = -1;
     wcstring private_file_path;
 
     // Open adjacent temporary file.
-    bool success = this->open_temporary_file(directory, &private_file_path, &private_fd);
+    autoclose_fd_t private_fd = this->open_temporary_file(directory, &private_file_path);
+    bool success = private_fd.valid();
+
     if (!success) FLOGF(uvar_file, L"universal log open_temporary_file() failed");
 
     // Write to it.
     if (success) {
-        assert(private_fd >= 0);
-        success = this->write_to_fd(private_fd, private_file_path);
+        assert(private_fd.valid());
+        success = this->write_to_fd(private_fd.fd(), private_file_path);
         if (!success) FLOGF(uvar_file, L"universal log write_to_fd() failed");
     }
 
@@ -735,9 +731,10 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
         // Ensure we maintain ownership and permissions (#2176).
         struct stat sbuf;
         if (wstat(vars_path, &sbuf) >= 0) {
-            if (fchown(private_fd, sbuf.st_uid, sbuf.st_gid) == -1)
+            if (fchown(private_fd.fd(), sbuf.st_uid, sbuf.st_gid) == -1)
                 FLOGF(uvar_file, L"universal log fchown() failed");
-            if (fchmod(private_fd, sbuf.st_mode) == -1) FLOGF(uvar_file, L"universal log fchmod() failed");
+            if (fchmod(private_fd.fd(), sbuf.st_mode) == -1)
+                FLOGF(uvar_file, L"universal log fchmod() failed");
         }
 
         // Linux by default stores the mtime with low precision, low enough that updates that occur
@@ -752,7 +749,7 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
         struct timespec times[2] = {};
         times[0].tv_nsec = UTIME_OMIT;  // don't change ctime
         if (0 == clock_gettime(CLOCK_REALTIME, &times[1])) {
-            futimens(private_fd, times);
+            futimens(private_fd.fd(), times);
         }
 #endif
 
@@ -767,9 +764,6 @@ bool env_universal_t::save(const wcstring &directory, const wcstring &vars_path)
     }
 
     // Clean up.
-    if (private_fd >= 0) {
-        close(private_fd);
-    }
     if (!private_file_path.empty()) {
         wunlink(private_file_path);
     }
@@ -1069,8 +1063,8 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
                  getuid());
 
         bool errored = false;
-        int fd = shm_open(path, O_RDWR | O_CREAT, 0600);
-        if (fd < 0) {
+        autoclose_fd_t fd{shm_open(path, O_RDWR | O_CREAT, 0600)};
+        if (!fd.valid()) {
             const char *error = std::strerror(errno);
             FLOGF(error, _(L"Unable to open shared memory with path '%s': %s"), path, error);
             errored = true;
@@ -1080,7 +1074,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         off_t size = 0;
         if (!errored) {
             struct stat buf = {};
-            if (fstat(fd, &buf) < 0) {
+            if (fstat(fd.fd(), &buf) < 0) {
                 const char *error = std::strerror(errno);
                 FLOGF(error, _(L"Unable to fstat shared memory object with path '%s': %s"), path,
                       error);
@@ -1113,9 +1107,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         }
 
         // Close the fd, even if the mapping succeeded.
-        if (fd >= 0) {
-            close(fd);
-        }
+        fd.close();
 
         // Read the current seed.
         this->poll();
diff --git a/src/env_universal_common.h b/src/env_universal_common.h
index f7441e9dd..4c0cacfd7 100644
--- a/src/env_universal_common.h
+++ b/src/env_universal_common.h
@@ -66,7 +66,7 @@ class env_universal_t {
 
     // Functions concerned with saving.
     bool open_and_acquire_lock(const std::string &path, autoclose_fd_t *out_fd);
-    bool open_temporary_file(const wcstring &directory, wcstring *out_path, int *out_fd);
+    autoclose_fd_t open_temporary_file(const wcstring &directory, wcstring *out_path);
     bool write_to_fd(int fd, const wcstring &path);
     bool move_new_vars_file_into_place(const wcstring &src, const wcstring &dst);
 
diff --git a/src/reader.cpp b/src/reader.cpp
index fe33f8031..484e5860d 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1663,18 +1663,16 @@ static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgi
         }
 
         // Open the tty. Presumably this is stdin, but maybe not?
-        int tty_fd = open(tty, O_RDONLY | O_NONBLOCK);
-        if (tty_fd < 0) {
+        autoclose_fd_t tty_fd{open(tty, O_RDONLY | O_NONBLOCK)};
+        if (!tty_fd.valid()) {
             wperror(L"open");
             exit_without_destructors(1);
         }
 
         char tmp;
-        if (read(tty_fd, &tmp, 1) < 0 && errno == EIO) {
+        if (read(tty_fd.fd(), &tmp, 1) < 0 && errno == EIO) {
             we_think_we_are_orphaned = true;
         }
-
-        close(tty_fd);
     }
 
     // Just give up if we've done it a lot times.
diff --git a/src/wutil.cpp b/src/wutil.cpp
index ce47bff8f..4971e0d63 100644
--- a/src/wutil.cpp
+++ b/src/wutil.cpp
@@ -175,7 +175,7 @@ int open_cloexec(const char *path, int flags, mode_t mode) {
 #else
     fd = open(path, flags, mode);
     if (fd >= 0 && !set_cloexec(fd)) {
-        close(fd);
+        exec_close(fd);
         fd = -1;
     }
 #endif

From 40ff4215a8b68babe6a8fc7b12612bf85335d919 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 16:08:10 -0800
Subject: [PATCH 1663/1732] Express the "nested job control" idea directly

Prior to this fix, we would infer that nested jobs need job control.
Just pass that along explicitly in the job lineage.
---
 src/exec.cpp            | 8 +++++++-
 src/parse_execution.cpp | 3 ++-
 src/proc.h              | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 5273adaf4..cf322f0d3 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -652,6 +652,7 @@ static proc_performer_t get_performer_for_process(process_t *p, job_t *job,
     lineage.parent_pgid = (job->pgid == INVALID_PID ? none() : maybe_t<pid_t>(job->pgid));
     lineage.block_io = io_chain;
     lineage.root_constructed = job->root_constructed;
+    lineage.root_has_job_control = job->wants_job_control();
 
     if (p->type == process_type_t::block_node) {
         const parsed_source_ref_t &source = p->block_node_source;
@@ -944,13 +945,18 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         assert(*lineage.parent_pgid != INVALID_PID &&
                "parent pgid should be none, not INVALID_PID");
         j->pgid = *lineage.parent_pgid;
-        j->mut_flags().job_control = true;
     }
 
     pid_t pgrp = getpgrp();
     // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
     const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == pgrp);
 
+    // If we are running nested inside a function or block with job control, then we need job
+    // control too.
+    if (lineage.root_has_job_control) {
+        j->mut_flags().job_control = true;
+    }
+
     if (j->pgid == INVALID_PID && should_claim_process_group_for_job(j)) {
         j->pgid = pgrp;
     }
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 6bc339ef8..465d6ab6c 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1265,7 +1265,8 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
     auto job_control_mode = get_job_control_mode();
     bool wants_job_control =
         (job_control_mode == job_control_t::all) ||
-        ((job_control_mode == job_control_t::interactive) && parser->is_interactive());
+        ((job_control_mode == job_control_t::interactive) && parser->is_interactive()) ||
+        lineage.root_has_job_control;
 
     job_t::properties_t props{};
     props.wants_terminal = wants_job_control && !ld.is_event;
diff --git a/src/proc.h b/src/proc.h
index ea8ab09ec..718fb17bb 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -280,6 +280,10 @@ struct job_lineage_t {
     /// is part of a pipeline, then this may be set.
     maybe_t<pid_t> parent_pgid{};
 
+    /// Whether job control is on for the root.
+    /// This is set if our job is nested as part of a function or block execution.
+    bool root_has_job_control{false};
+
     /// The IO chain associated with any block containing this job.
     /// For example, in `begin; foo ; end < file.txt` this would have the 'file.txt' IO.
     io_chain_t block_io{};

From b313ba555afc2c42f0c46cfd15bed2cbee490986 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 30 Jan 2020 17:21:15 +0800
Subject: [PATCH 1664/1732] iothread: add missing #include

Closes #6553.
---
 src/iothread.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/iothread.cpp b/src/iothread.cpp
index c62226aad..21017fbe7 100644
--- a/src/iothread.cpp
+++ b/src/iothread.cpp
@@ -6,6 +6,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>

From f4d0bafbd49ef18016aa3182558ed47fbe2179cb Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 27 Jan 2020 09:11:23 +0100
Subject: [PATCH 1665/1732] remove stale typedef

---
 src/pager.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pager.cpp b/src/pager.cpp
index 327bb3cac..4c6d4219f 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -21,7 +21,6 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 using comp_t = pager_t::comp_t;
-using completion_list_t = completion_list_t;
 using comp_info_list_t = std::vector<comp_t>;
 
 /// The minimum width (in characters) the terminal must to show completions at all.

From 50e08dc3a0e40073811daf498d47fdbc779f4aff Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 27 Jan 2020 16:43:56 +0100
Subject: [PATCH 1666/1732] add completions for wireshark/tshark/dumpcap

---
 CHANGELOG.md                                  |   6 +
 share/completions/dumpcap.fish                |  11 ++
 share/completions/tshark.fish                 |  57 +++++++++
 share/completions/wireshark.fish              |  15 +++
 .../functions/__fish_complete_wireshark.fish  | 114 ++++++++++++++++++
 5 files changed, 203 insertions(+)
 create mode 100644 share/completions/dumpcap.fish
 create mode 100644 share/completions/tshark.fish
 create mode 100644 share/completions/wireshark.fish
 create mode 100644 share/functions/__fish_complete_wireshark.fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b77aa5c0a..a00934b77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# fish next-minor
+
+#### Completions
+- Added completions for
+  - `wireshark`, `tshark`, and `dumpcap`
+
 # fish 3.1b1 (released January 26, 2020)
 
 ## Notable improvements and fixes
diff --git a/share/completions/dumpcap.fish b/share/completions/dumpcap.fish
new file mode 100644
index 000000000..c6ad50f8f
--- /dev/null
+++ b/share/completions/dumpcap.fish
@@ -0,0 +1,11 @@
+# dumpcap - Dump network traffic
+
+__fish_complete_wireshark dumpcap
+
+complete -c dumpcap -s C -d 'Limit the amount of memory in bytes for storing captured packets in memory' -x
+complete -c dumpcap -s d -d 'Dump the code generated for the capture filter in a human-readable form, and exit'
+complete -c dumpcap -s M -d 'When used with -D, -L, -S or --list-time-stamp-types print machine-readable output'
+complete -c dumpcap -s N -d 'Limit the number of packets used for storing captured packets in memory' -x
+complete -c dumpcap -s P -d 'Save files as pcap instead of the default pcapng'
+complete -c dumpcap -s S -d 'Print statistics for each interface once every second'
+complete -c dumpcap -s t -d 'Use a separate thread per interface'
diff --git a/share/completions/tshark.fish b/share/completions/tshark.fish
new file mode 100644
index 000000000..daa05dc38
--- /dev/null
+++ b/share/completions/tshark.fish
@@ -0,0 +1,57 @@
+# tshark - Dump and analyze network traffic
+
+__fish_complete_wireshark tshark
+
+function __fish_tshark_protocols
+    set -l tok (commandline -ct | string collect)
+    set -l tok_param (string replace -r -- '^-O' '' $tok)
+    command tshark -G protocols | while read -d \t name shortname identifier
+        printf "%s%s\t%s\n" (string replace -r -- '(.+),[^,]*$' '$1,' $tok_param) $tok_no_comma $identifier $name
+    end
+end
+
+complete -c tshark -s 2 -d 'Perform a two-pass analysis'
+# This is fairly expensive, but only done upon the user pressing tab.
+complete -c tshark -s e -d 'Add a field to the list of fields to display' -xa '(command tshark -G fields | awk -F\t \'{print $3"\t"$2}\')'
+complete -c tshark -s E -d 'Set an option controlling the printing of fields' -xa '
+bom=y\t"Prepend output with the UTF-8 byte order mark"
+header=y\t"Print a list of the selected field names"
+separator=\t"Set the separator character to use for fields"
+occurrence=\t"Select which occurrence to use for fields that have multiple: f=first, l=last, a=all"
+aggregator=\t"Set the aggregator character to use for fields that have multiple occurrences"
+quote=\t"Set the quote character to use to surround fields d=\", s=\', n=no quotes"'
+
+complete -c tshark -s F -d 'Set the output capture file format' -xa '(command tshark -F 2>| string replace -rf "\s+(\S+) - (.*)" \'$1\t$2\')'
+complete -c tshark -s G -d 'Print a glossary' -xa '(
+printf "help\tList available report types\n"
+command tshark -G help | string replace -rf "\s+-G (\S+)\s+(.*)" \'$1\t$2\'
+)'
+complete -c tshark -s H -d 'Read a list of entries from a "hosts" file' -r
+complete -c tshark -s j -d 'Protocol match filter used for ek|json|jsonraw|pdml output file types' -x
+complete -c tshark -s J -d 'Protocol match filter used, includes all child protocols' -x
+complete -c tshark -s l -d 'Flush the standard output after the information for each packet is printed'
+complete -c tshark -s O -d 'Show a detailed view of the comma-separated list of protocols' -xa '(__fish_tshark_protocols)'
+complete -c tshark -s P -l print -d 'Decode and display packet summary or details'
+complete -c tshark -s Q -d "When capturing packets, don't display, on the standard error, the initial message"
+complete -c tshark -s S -d 'Set the line separator to be printed between packets' -x
+complete -c tshark -s T -d 'Set the format of the output when viewing decoded packet data' -xa '
+ek\t"Newline delimited JSON for bulk import into Elasticsearch"
+fields\t"The values of fields specified with the -e option, in a form specified by the -E option"
+json\t"JSON file format"
+jsonraw\t"JSON file format including only raw hex-encoded packet data"
+pdml\t"Packet Details Markup Language, an XML-based format for the details of a decoded packet"
+ps\t"PostScript for a human-readable summary of each of the packets"
+psml\t"Packet Summary Markup Language"
+tabs\t"Tab-separated human-readable one-line packet summaries"
+text\t"Default"'
+
+complete -c tshark -s U -d "PDUs export according to given tap name" -xa '(
+    printf "%s\tTap name\n" (command tshark -U "" 2>| string replace -rf "^tshark:\s*" "")[2..-1])'
+complete -c tshark -s V -d 'Causes TShark to print a view of packet details'
+complete -c tshark -s W -d 'Save extra information in the capture file if the format supports it' -xa "n"
+complete -c tshark -s x -d 'Print hex and ASCII dumps of packet data'
+complete -c tshark -s M -d 'Automatically reset internal session when reaching N packets' -x
+complete -c tshark -l color -d 'Enable coloring of packets according to standard Wireshark color filters'
+complete -c tshark -l no-duplicate-keys -d 'Merge duplicate keys in json output'
+complete -c tshark -l elastic-mapping-filter -d 'Only put specified protocols in an ElasticSearch mapping file' -x # TODO
+complete -c tshark -l export-objects -d 'Export all objects within a protocol into directory given destination directory' -x # TODO
diff --git a/share/completions/wireshark.fish b/share/completions/wireshark.fish
new file mode 100644
index 000000000..f0c21223f
--- /dev/null
+++ b/share/completions/wireshark.fish
@@ -0,0 +1,15 @@
+# Wireshark - Interactively dump and analyze network traffic
+
+__fish_complete_wireshark wireshark
+
+complete -c wireshark -l display -d 'Specifies the X display to use' -x
+complete -c wireshark -l fullscreen -d 'Start Wireshark in full screen' -x
+complete -c wireshark -s g -d 'After reading in a capture file using th e-r flag, go to the given packet number' -x
+complete -c wireshark -s H -d 'Hide the capture info dialog during live packet capture'
+complete -c wireshark -s j -d 'When no exact match is found by a -J filter, select the first package before'
+complete -c wireshark -s J -d 'Jump to packet matching filter (display filter syntax)' -x
+complete -c wireshark -s k -d 'Start the capture session immediately'
+complete -c wireshark -s l -d 'Turn on automatic scrolling'
+complete -c wireshark -s m -d 'Set the font name used for most text' -x
+complete -c wireshark -s P -d 'Override a configuration or data path' -x # TODO
+complete -c wireshark -s S -d 'Automatically update the packet display as packets are coming in'
diff --git a/share/functions/__fish_complete_wireshark.fish b/share/functions/__fish_complete_wireshark.fish
new file mode 100644
index 000000000..e208d3e81
--- /dev/null
+++ b/share/functions/__fish_complete_wireshark.fish
@@ -0,0 +1,114 @@
+# Helper functions for wireshark/tshark/dumpcap completion
+
+function __fish_wireshark_choices
+    string replace -rf -- '^\s*(\S+) \(?([^)]*)\)?$' '$1\t$2' $argv
+end
+
+function __fish_wireshark_interface
+    # no remote capture yet
+    command tshark -D | string replace -r ".*\. (\S+)\s*\(?([^)]*)\)?\$" '$1\t$2'
+end
+
+function __fish_wireshark_protocol
+    command tshark -G protocols | awk -F\t '{print $3"\t"$1}'
+end
+
+function __fish_wireshark_heuristic
+    command tshark -G heuristic-decodes | awk -F\t '{print $2"\t"$1}'
+end
+
+function __fish_tshark_name_resolving_flags
+    printf -- (commandline -ct | string replace -r -- '^-N' '')%s\n \
+        d\t"enable resolution from captured DNS packets" \
+        m\t"enable MAC address resolution" \
+        n\t"enable network address resolution" \
+        N\t"enable using external resolvers (such as DNS) for network address resolution" \
+        t\t"enable transport-layer port number resolution" \
+        v\t"enable VLAN IDs to names resolution"
+end
+
+function __fish_tshark_decode_as
+    set -l tok (commandline -ct | string collect)
+    if string match -rq -- '==$' $tok
+        return
+    else if string match -rq -- '(==|,)' $tok
+        set -l tok_no_comma (string replace -r -- ',.*$' '' $tok)
+        command tshark -d (string replace -r -- '^-d' '' $tok) 2>|
+        string replace -rf -- "^\t(\S+) \(?([^\)]*)\)?\$" "$tok_no_comma,\$1\t\$2"
+    else
+        command tshark -d . 2>| string replace -rf -- "^\t(\S+) \(?([^\)]*)\)?\$" '$1==\t$2'
+    end
+end
+
+
+function __fish_complete_wireshark
+    set -l shark $argv
+    complete -c $shark -s a -l autostop -d 'Specify a criterion to stop writing the capture file' -xa '
+duration:\t"Stop writing to capture files after N seconds have elapsed"
+files:\t"Stop writing to capture files after N files were written"
+filesize:\t"Stop writing a capture file after it reaches a size of N kB"
+packets:\t"Stop writing a capture file after it contains N packets"'
+    complete -c $shark -s b -l ring-buffer -d 'Write multiple capture files' -xa '
+duration:\t"Switch to the next file after N seconds have elapsed"
+files:\t"Begin again with the first file after N files were written"
+filesize:\t"Switch to the next file after it reaches a size of N kB"
+interval:\t"Switch to the next file when the time is an exact multiple of N seconds"
+packets:\t"Switch to the next file after it contains N packets"'
+    complete -c $shark -s B -l buffer-size -d 'Set capture buffer size (in MiB, default is 2 MiB)' -x
+    complete -c $shark -s c -d 'Set the maximum number of packets to read' -x
+    complete -c $shark -l capture-comment -d 'Add a capture comment to the output file' -x
+    complete -c $shark -s D -l list-interfaces -d "Print a list of interfaces on which $shark can capture and exit"
+    complete -c $shark -s f -d 'Set a capture filter expression' -x
+    complete -c $shark -s i -ra '(__fish_wireshark_interface)'
+    complete -c $shark -s i -ra '-\t"Capture from standard input"' \
+        -d 'Network interface or pipe to use for live packet capture'
+    complete -c $shark -s I -l monitor-mode -d 'Put the interface in "monitor mode"' -xa '(__fish_wireshark_interface)'
+    complete -c $shark -s L -l list-data-link-types -d 'List the data link types supported by the interface and exit'
+    complete -c $shark -l list-time-stamp-types -d 'List time stamp types supported for the interface'
+    complete -c $shark -s p -l no-promiscuous-mode -d "Don't put the interface into promiscuous mode"
+    complete -c $shark -s s -l snapshot-length -d 'Set the default snapshot length in bytes to use when capturing live data' -x
+    complete -c $shark -l time-stamp-type -d "Change the interface's timestamp method" -xa '(__fish_wireshark_choices (command tshark --list-time-stamp-types))'
+    complete -c $shark -s v -l version -d 'Print the version and exit'
+    complete -c $shark -s w -d 'Write raw packet data to the given file ("-" means stdout)' -r
+    complete -c $shark -s y -l linktype -d 'Set the data link type to use while capturing packets' -xa '(__fish_wireshark_choices (command tshark -L))'
+
+    switch $shark
+        case dumpcap tshark
+            complete -c tshark -s q -d "Don't display the continuous count of packets captured"
+            complete -c tshark -s g -d 'Create output files with greoup-read permissions'
+    end
+
+    switch $shark
+        case wireshark tshark
+            complete -c $shark -s C -d 'Run with the given configuration profile' -xa '(
+set -l folders (tshark -G folders | awk \'/Personal configuration/{ print $NF}\')/profiles/*
+string match -r "[^/]*\\$" -- $folders)'
+            complete -c $shark -s d -d 'Specify how a layer type should be dissected' -xa '(__fish_tshark_decode_as)'
+            complete -c $shark -l enable-protocol -d 'Enable dissection of the given protocol' -xa '(__fish_wireshark_protocol)'
+            complete -c $shark -l disable-protocol -d 'Disable dissection of the given protocol' -xa '(__fish_wireshark_protocol)'
+            complete -c $shark -l enable-heuristic -d 'Enable dissection of heuristic protocol' -xa '(__fish_wireshark_heuristic)'
+            complete -c $shark -l disable-heuristic -d 'Disable dissection of heuristic protocol' -xa '(__fish_wireshark_heuristic)'
+            complete -c $shark -s K -d 'Load kerberos crypt keys from the specified keytab file' -r
+            complete -c $shark -s n -d 'Disable network object name resolution (hostname, TCP and UDP port names)'
+            complete -c $shark -s N -d 'Turn on name resolution only for particular types of addresses and port numbers' -xa '( __fish_tshark_name_resolving_flags)'
+            complete -c $shark -s o -d 'Override a preference value' -xa '(
+    command tshark -G defaultprefs | string replace -rf -- \'^#([a-z].*):.*\' \'$1:\')'
+            complete -c $shark -s r -l read-file -d 'Read packet data from the given file' -r
+            complete -c $shark -s R -l read-filter -d 'Apply the given read filter' -x
+            complete -c $shark -s t -d 'Set the format of the packet timestamp printed in summary lines' -xa '
+a\t"absolute time"
+ad\t"absolute time with date"
+adoy\t"absolute time with date using day of year"
+d\t"delta: time since the previous packet was captured"
+dd\t"delta displayed: time since the previous displayed packet was captured"
+e\t"epoch: time in seconds since Jan 1, 1970"
+r\t"relative time elapsed between the first packet and the current packet"
+u\t"absolute UTC time"
+ud\t"absolute UTC time with date"
+udoy\t"absolute UTC time with date using day of year"'
+            complete -c $shark -s u -d "Specifies the seconds type" -xa 's\t"seconds" hms\t"hours, minutes and seconds"'
+            complete -c $shark -s X -d "Specify an extension to be passed to a $shark module" -x # TODO
+            complete -c $shark -s Y -l display-filter -d 'Apply the given display filter' -x
+            complete -c $shark -s z -d 'Collect various types of statistics' -x # TODO
+    end
+end

From cc7d9cc2edb0d325d2d17c49726dcf8c249b5783 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 29 Jan 2020 15:57:03 +0100
Subject: [PATCH 1667/1732] flog: Save & restore errno

In some cases on some platforms this could clobber errno, so doing something like

    aThingThatFailsWithErrno();
    FLOG(category, "Some message");
    wperror("something");

would print the wrong error (presumably if that category was enabled).

In our case it was our (very) old friend RHEL6 returning ESPIPE instead of EISDIR.

Fixes #6545.
---
 src/flog.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/flog.h b/src/flog.h
index ed9988cb8..358afc7be 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -171,11 +171,14 @@ std::vector<const flog_details::category_t *> get_flog_categories();
 void log_extra_to_flog_file(const wcstring &s);
 
 /// Output to the fish log a sequence of arguments, separated by spaces, and ending with a newline.
+/// We save and restore errno because we don't want this to affect other code.
 #define FLOG(wht, ...)                                                        \
     do {                                                                      \
         if (flog_details::category_list_t::g_instance->wht.enabled) {         \
+            auto old_errno = errno;                                           \
             flog_details::g_logger.acquire()->log_args(                       \
                 flog_details::category_list_t::g_instance->wht, __VA_ARGS__); \
+            errno = old_errno;                                                \
         }                                                                     \
     } while (0)
 
@@ -183,8 +186,10 @@ void log_extra_to_flog_file(const wcstring &s);
 #define FLOGF(wht, ...)                                                       \
     do {                                                                      \
         if (flog_details::category_list_t::g_instance->wht.enabled) {         \
+            auto old_errno = errno;                                           \
             flog_details::g_logger.acquire()->log_fmt(                        \
                 flog_details::category_list_t::g_instance->wht, __VA_ARGS__); \
+            errno = old_errno;                                                \
         }                                                                     \
     } while (0)
 

From 9cbd3d57a01ba8f4813febff83210f595518cea1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 Jan 2020 17:34:48 +0100
Subject: [PATCH 1668/1732] Tests: Don't remove a parent of $PWD

Solaris/OpenIndiana/Illumos `rm` checks that and errors out.

In these cases we don't actually need it to be a part of $PWD as
it's just for cleanup, so we `cd` out before.

See #5472
See 1ee57e92447781b5ff79aaa7c55f6468fc84a37d
Fixes #6555
Fixes #6558
---
 tests/checks/cd.fish       | 2 +-
 tests/checks/wildcard.fish | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/checks/cd.fish b/tests/checks/cd.fish
index 07d3d0a92..88cb84da6 100644
--- a/tests/checks/cd.fish
+++ b/tests/checks/cd.fish
@@ -19,8 +19,8 @@ begin
     cd x
     pwd
 end
-rm -rf $tmp
 cd $oldpwd
+rm -rf $tmp
 
 # Create a test directory to store our stuff.
 # macOS likes to return symlinks from (mktemp -d), make sure it does not.
diff --git a/tests/checks/wildcard.fish b/tests/checks/wildcard.fish
index 2758d6b2e..0384c63de 100644
--- a/tests/checks/wildcard.fish
+++ b/tests/checks/wildcard.fish
@@ -2,6 +2,7 @@
 
 # Ensure that, if variable expansion results in multiple strings
 # and one of them fails a glob, that we don't fail the entire expansion.
+set -l oldpwd (pwd)
 set dir (mktemp -d)
 cd $dir
 mkdir a
@@ -12,4 +13,5 @@ set dirs ./a ./b
 echo $dirs/*.txt
 # CHECK: ./b/file.txt
 
+cd $oldpwd
 rm -Rf $dir

From e8000cfea9d2abde4acf07e759e18706a1f8010a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 Jan 2020 17:36:51 +0100
Subject: [PATCH 1669/1732] Add Solaris' error message to a test

Just another version of the error. We still want to get a bug if it
ever triggers a *wrong* error, so we still list all the options
instead of going for `.*option:.*Z.*`.

Fixes #6554
---
 tests/checks/bad-option.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/bad-option.fish b/tests/checks/bad-option.fish
index 8d7509c4b..6a1140944 100644
--- a/tests/checks/bad-option.fish
+++ b/tests/checks/bad-option.fish
@@ -1,2 +1,2 @@
 #RUN: %fish -Z
-#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?|unknown option -- Z}}
+#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?|unknown option -- Z}|illegal option -- Z}}

From d22c6af7a3ba771f537d5c3af15e6ce05f77971d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 17:06:11 -0800
Subject: [PATCH 1670/1732] clang-format all C++ files

---
 src/common.cpp               |  5 +++--
 src/env_dispatch.cpp         | 12 ++++++++----
 src/env_universal_common.cpp |  6 ++++--
 src/fish.cpp                 |  3 ++-
 src/flog.h                   |  6 +++---
 src/postfork.cpp             |  3 ++-
 src/proc.cpp                 |  3 ++-
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/common.cpp b/src/common.cpp
index aeab343a8..330614eac 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1779,7 +1779,7 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
         if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
             FLOGF(warning, _(L"Current terminal parameters have rows and/or columns set to zero."));
             FLOGF(warning, _(L"The stty command can be used to correct this "
-                       L"(e.g., stty rows 80 columns 24)."));
+                             L"(e.g., stty rows 80 columns 24)."));
         }
 #endif
         // Fallback to the environment vars.
@@ -1801,7 +1801,8 @@ static void validate_new_termsize(struct winsize *new_termsize, const environmen
     if (new_termsize->ws_col < MIN_TERM_COL || new_termsize->ws_row < MIN_TERM_ROW) {
         // Also highly hackisk.
         if (is_main_thread() && parser_t::principal_parser().is_interactive()) {
-            FLOGF(warning, _(L"Current terminal parameters set terminal size to unreasonable value."));
+            FLOGF(warning,
+                  _(L"Current terminal parameters set terminal size to unreasonable value."));
             FLOGF(warning, _(L"Defaulting terminal size to 80x24."));
         }
         new_termsize->ws_col = DFLT_TERM_COL;
diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp
index 6b43dd2d8..4a44b1525 100644
--- a/src/env_dispatch.cpp
+++ b/src/env_dispatch.cpp
@@ -152,7 +152,8 @@ static void guess_emoji_width(const environment_t &vars) {
     if (auto width_str = vars.get(L"fish_emoji_width")) {
         int new_width = fish_wcstol(width_str->as_string().c_str());
         g_fish_emoji_width = std::max(0, new_width);
-        FLOGF(term_support, "'fish_emoji_width' preference: %d, overwriting default", g_fish_emoji_width);
+        FLOGF(term_support, "'fish_emoji_width' preference: %d, overwriting default",
+              g_fish_emoji_width);
         return;
     }
 
@@ -352,7 +353,8 @@ static void update_fish_color_support(const environment_t &vars) {
                 fish_wcstod(tpv->as_string().c_str(), nullptr) > 299) {
                 // OS X Lion is version 299+, it has 256 color support (see github Wiki)
                 support_term256 = true;
-                FLOGF(term_support, L"256 color support enabled for TERM=%ls on Terminal.app", term.c_str());
+                FLOGF(term_support, L"256 color support enabled for TERM=%ls on Terminal.app",
+                      term.c_str());
             } else {
                 support_term256 = true;
                 FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
@@ -400,7 +402,8 @@ static bool initialize_curses_using_fallback(const char *term) {
     int err_ret;
     if (setupterm(const_cast<char *>(term), STDOUT_FILENO, &err_ret) == OK) return true;
     if (session_interactivity() != session_interactivity_t::not_interactive) {
-        FLOGF(warning, _(L"Could not set up terminal using the fallback terminal type '%s'."), term);
+        FLOGF(warning, _(L"Could not set up terminal using the fallback terminal type '%s'."),
+              term);
     }
     return false;
 }
@@ -463,7 +466,8 @@ static void init_curses(const environment_t &vars) {
             if (term.missing_or_empty()) {
                 FLOGF(warning, _(L"TERM environment variable not set."));
             } else {
-                FLOGF(warning, _(L"TERM environment variable set to '%ls'."), term->as_string().c_str());
+                FLOGF(warning, _(L"TERM environment variable set to '%ls'."),
+                      term->as_string().c_str());
                 FLOGF(warning, _(L"Check that this terminal type is supported on this system."));
             }
         }
diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 0a107d9e8..07fba0eb1 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -548,7 +548,8 @@ autoclose_fd_t env_universal_t::open_temporary_file(const wcstring &directory, w
 static bool check_duration(double start_time) {
     double duration = timef() - start_time;
     if (duration > 0.25) {
-        FLOGF(warning, _(L"Locking the universal var file took too long (%.3f seconds)."), duration);
+        FLOGF(warning, _(L"Locking the universal var file took too long (%.3f seconds)."),
+              duration);
         return false;
     }
     return true;
@@ -1248,7 +1249,8 @@ class universal_notifier_notifyd_t : public universal_notifier_t {
     void post_notification() {
         uint32_t status = notify_post(name.c_str());
         if (status != NOTIFY_STATUS_OK) {
-            FLOGF(warning, "notify_post() failed with status %u. Uvar notifications may not be sent.",
+            FLOGF(warning,
+                  "notify_post() failed with status %u. Uvar notifications may not be sent.",
                   status);
         }
     }
diff --git a/src/fish.cpp b/src/fish.cpp
index f4b07f8fa..45776143f 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -221,7 +221,8 @@ static void source_config_in_directory(const wcstring &dir) {
     const wcstring escaped_dir = escape_string(dir, ESCAPE_ALL);
     const wcstring escaped_pathname = escaped_dir + L"/config.fish";
     if (waccess(config_pathname, R_OK) != 0) {
-        FLOGF(config, L"not sourcing %ls (not readable or does not exist)", escaped_pathname.c_str());
+        FLOGF(config, L"not sourcing %ls (not readable or does not exist)",
+              escaped_pathname.c_str());
         return;
     }
     FLOGF(config, L"sourcing %ls", escaped_pathname.c_str());
diff --git a/src/flog.h b/src/flog.h
index 358afc7be..5919e6c3a 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -62,7 +62,8 @@ class category_list_t {
     category_t exec_fork{L"exec-fork", L"Calls to fork()"};
 
     category_t parse_productions{L"parse-productions", L"Resolving tokens"};
-    category_t parse_productions_chatty{L"parse-productions-chatty", L"Resolving tokens (chatty messages)"};
+    category_t parse_productions_chatty{L"parse-productions-chatty",
+                                        L"Resolving tokens (chatty messages)"};
 
     category_t proc_job_run{L"proc-job-run", L"Jobs getting started or continued"};
 
@@ -195,5 +196,4 @@ void log_extra_to_flog_file(const wcstring &s);
 
 #endif
 
-#define should_flog(wht) \
-    (flog_details::category_list_t::g_instance->wht.enabled)
+#define should_flog(wht) (flog_details::category_list_t::g_instance->wht.enabled)
diff --git a/src/postfork.cpp b/src/postfork.cpp
index 7ae3e13d7..fb08f2def 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -126,7 +126,8 @@ bool set_child_group(job_t *j, pid_t child_pid) {
                 // ever leads to a terminal hang due if both this setpgid call AND posix_spawn's
                 // internal setpgid calls failed), write to the debug log so a future developer
                 // doesn't go crazy trying to track this down.
-                FLOGF(proc_pgroup, "Error %d while calling setpgid for child %d (probably harmless)", errno,
+                FLOGF(proc_pgroup,
+                      "Error %d while calling setpgid for child %d (probably harmless)", errno,
                       child_pid);
             }
         }
diff --git a/src/proc.cpp b/src/proc.cpp
index d4e501add..6073ddf3c 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -758,7 +758,8 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
                 // job/group have been started, the only way this can happen is if the very last
                 // process in the group terminated and didn't need to access the terminal, otherwise
                 // it would have hung waiting for terminal IO (SIGTTIN). We can safely ignore this.
-                FLOGF(proc_termowner, L"tcsetpgrp called but process group %d has terminated.\n", j->pgid);
+                FLOGF(proc_termowner, L"tcsetpgrp called but process group %d has terminated.\n",
+                      j->pgid);
                 return notneeded;
             }
 

From 10da6df506149cc1ae3ae03316d7c2b260c1c418 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Wed, 29 Jan 2020 16:39:44 -0800
Subject: [PATCH 1671/1732] Factor out logic about how pgroups are assigned

Introduce pgroup_provenance_t, a type which captures "where the pgroup
comes from." This centralizes some logic around how pgroups are
assigned, and it anticipates concurrent execution.
---
 src/exec.cpp            | 115 ++++++++++++++++++----------------------
 src/exec.h              |   8 +--
 src/parse_execution.cpp |   3 ++
 src/proc.cpp            |  26 +++++++++
 src/proc.h              |  30 +++++++++++
 5 files changed, 117 insertions(+), 65 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index cf322f0d3..748a36fbb 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -52,6 +52,37 @@
 /// Number of calls to fork() or posix_spawn().
 static relaxed_atomic_t<int> s_fork_count{0};
 
+pgroup_provenance_t get_pgroup_provenance(const shared_ptr<job_t> &j,
+                                          const job_lineage_t &lineage) {
+    bool first_proc_is_internal = j->processes.front()->is_internal();
+    bool has_internal = j->has_internal_proc();
+    bool has_external = j->has_external_proc();
+    assert(first_proc_is_internal ? has_internal : has_external);
+
+    if (lineage.parent_pgid.has_value()) {
+        // Our lineage indicates a pgid. This means the job is "nested" as a function or block
+        // inside another job, which has a real pgroup. We're going to use that.
+        return pgroup_provenance_t::lineage;
+    } else if (!j->wants_job_control()) {
+        // This job doesn't need job control, it can just live in the fish pgroup.
+        return pgroup_provenance_t::fish_itself;
+    } else if (has_external && !first_proc_is_internal) {
+        // The first process is external, it will own the pgroup.
+        return pgroup_provenance_t::first_external_proc;
+    } else if (has_external && first_proc_is_internal) {
+        // The terminal owner has to be the process which is permitted to read from stdin.
+        // This is the first process in the pipeline. When executing, a process in the job will
+        // claim the pgrp if it's not set; therefore set it according to the first process.
+        // Only do this if there's an external process - see #6011.
+        return pgroup_provenance_t::fish_itself;
+    } else {
+        assert(has_internal && !has_external && "Should be internal only");
+        // This job consists of only internal functions or builtins; we do not need to assign a
+        // pgroup (yet).
+        return pgroup_provenance_t::unassigned;
+    }
+}
+
 /// This function is executed by the child process created by a call to fork(). It should be called
 /// after \c child_setup_process. It calls execve to replace the fish process image with the command
 /// specified in \c p. It never returns. Called in a forked child! Do not allocate memory, etc.
@@ -172,16 +203,11 @@ static void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_i
     }
 }
 
-static void on_process_created(const std::shared_ptr<job_t> &j, pid_t child_pid) {
-    // We only need to do this the first time a child is forked/spawned
-    if (j->pgid != INVALID_PID) {
-        return;
-    }
-
-    if (j->wants_job_control()) {
+/// If our pgroup assignment mode wants us to use the first external proc, then apply it here.
+static void maybe_assign_pgid_from_child(const std::shared_ptr<job_t> &j, pid_t child_pid) {
+    // If our assignment mode is the first process, then assign it.
+    if (j->pgid == INVALID_PID && j->pgroup_mode == pgroup_provenance_t::first_external_proc) {
         j->pgid = child_pid;
-    } else {
-        j->pgid = getpgrp();
     }
 }
 
@@ -327,7 +353,7 @@ static bool fork_child_for_process(const std::shared_ptr<job_t> &job, process_t
           p->argv0());
 
     p->pid = pid;
-    on_process_created(job, p->pid);
+    maybe_assign_pgid_from_child(job, p->pid);
     set_child_group(job.get(), p->pid);
     terminal_maybe_give_to_job(job.get(), false);
     return true;
@@ -550,7 +576,7 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
 
         // these are all things do_fork() takes care of normally (for forked processes):
         p->pid = pid;
-        on_process_created(j, p->pid);
+        maybe_assign_pgid_from_child(j, p->pid);
 
         // We explicitly don't call set_child_group() for spawned processes because that
         // a) isn't necessary, and b) causes issues like fish-shell/fish-shell#4715
@@ -565,13 +591,6 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
         if (j->wants_job_control() && getpgid(p->pid) != j->pgid) {
             set_child_group(j.get(), p->pid);
         }
-#else
-        // In do_fork, the pid of the child process is used as the group leader if j->pgid
-        // invalid, posix_spawn assigned the new group a pgid equal to its own id if
-        // j->pgid was invalid, so this is what we do instead of calling set_child_group
-        if (j->pgid == INVALID_PID) {
-            j->pgid = pid;
-        }
 #endif
 
         terminal_maybe_give_to_job(j.get(), false);
@@ -893,41 +912,6 @@ static process_t *get_deferred_process(const shared_ptr<job_t> &j) {
     return nullptr;
 }
 
-/// \return true if fish should claim the process group for this job.
-/// This is true if there is at least one external process and if the first process is fish code.
-static bool should_claim_process_group_for_job(const shared_ptr<job_t> &j) {
-    // Check if there's an external process.
-    // See #6011.
-    bool has_external = false;
-    for (const auto &p : j->processes) {
-        if (p->type == process_type_t::external) {
-            has_external = true;
-            break;
-        }
-    }
-    if (!has_external) {
-        return false;
-    }
-
-    // Check the first process.
-    // The terminal owner has to be the process which is permitted to read from stdin.
-    // This is the first process in the pipeline. When executing, a process in the job will
-    // claim the pgrp if it's not set; therefore set it according to the first process.
-    switch (j->processes.front()->type) {
-        case process_type_t::builtin:
-        case process_type_t::function:
-        case process_type_t::block_node:
-            // These are run internal to fish.
-            return true;
-        case process_type_t::external:
-        case process_type_t::exec:
-            // External will get its own pgroup after fork.
-            // exec will retain the pgroup.
-            return false;
-    }
-    DIE("unreachable");
-}
-
 bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t &lineage) {
     assert(j && "null job_t passed to exec_job!");
 
@@ -940,13 +924,6 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         return true;
     }
 
-    // If our lineage indicates a pgid, share it.
-    if (lineage.parent_pgid.has_value()) {
-        assert(*lineage.parent_pgid != INVALID_PID &&
-               "parent pgid should be none, not INVALID_PID");
-        j->pgid = *lineage.parent_pgid;
-    }
-
     pid_t pgrp = getpgrp();
     // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
     const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == pgrp);
@@ -957,8 +934,22 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
         j->mut_flags().job_control = true;
     }
 
-    if (j->pgid == INVALID_PID && should_claim_process_group_for_job(j)) {
-        j->pgid = pgrp;
+    // Perhaps we know our pgroup already.
+    assert(j->pgid == INVALID_PID && "Should not yet have a pid.");
+    switch (j->pgroup_mode) {
+        case pgroup_provenance_t::lineage:
+            assert(*lineage.parent_pgid != INVALID_PID && "pgid should be none, not INVALID_PID");
+            j->pgid = *lineage.parent_pgid;
+            break;
+
+        case pgroup_provenance_t::fish_itself:
+            j->pgid = pgrp;
+            break;
+
+        // The remaining cases are all deferred until later.
+        case pgroup_provenance_t::unassigned:
+        case pgroup_provenance_t::first_external_proc:
+            break;
     }
 
     const size_t stdout_read_limit = parser.libdata().read_limit;
diff --git a/src/exec.h b/src/exec.h
index e2bd6f907..640b65bbf 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -7,14 +7,12 @@
 #include <vector>
 
 #include "common.h"
+#include "proc.h"
 
 /// Pipe redirection error message.
 #define PIPE_ERROR _(L"An error occurred while setting up pipe")
 
 /// Execute the processes specified by \p j in the parser \p.
-class job_t;
-struct job_lineage_t;
-class parser_t;
 bool exec_job(parser_t &parser, const std::shared_ptr<job_t> &j, const job_lineage_t &lineage);
 
 /// Evaluate a command.
@@ -37,4 +35,8 @@ int exec_subshell_for_expand(const wcstring &cmd, parser_t &parser, wcstring_lis
 /// Loops over close until the syscall was run without being interrupted.
 void exec_close(int fd);
 
+/// Compute the "pgroup provenance" for a job. This is a description of how the pgroup is
+/// assigned. It's factored out because the logic has subtleties, and this centralizes it.
+pgroup_provenance_t get_pgroup_provenance(const std::shared_ptr<job_t> &j,
+                                          const job_lineage_t &lineage);
 #endif
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 465d6ab6c..2d3dc761b 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1302,6 +1302,9 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
 
     // Clean up the job on failure or cancellation.
     if (pop_result == end_execution_reason_t::ok) {
+        // Set the pgroup assignment mode, now that the job is populated.
+        job->pgroup_mode = get_pgroup_provenance(job, lineage);
+
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
 
diff --git a/src/proc.cpp b/src/proc.cpp
index 6073ddf3c..3e2911179 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -256,6 +256,18 @@ void process_t::check_generations_before_launch() {
     gens_ = topic_monitor_t::principal().current_generations();
 }
 
+bool process_t::is_internal() const {
+    switch (type) {
+        case process_type_t::builtin:
+        case process_type_t::function:
+        case process_type_t::block_node:
+            return true;
+        case process_type_t::external:
+        case process_type_t::exec:
+            return false;
+    }
+}
+
 job_t::job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage)
     : properties(props),
       job_id_(job_id),
@@ -270,6 +282,20 @@ void job_t::mark_constructed() {
     *constructed = true;
 }
 
+bool job_t::has_internal_proc() const {
+    for (const auto &p : processes) {
+        if (p->is_internal()) return true;
+    }
+    return false;
+}
+
+bool job_t::has_external_proc() const {
+    for (const auto &p : processes) {
+        if (!p->is_internal()) return true;
+    }
+    return false;
+}
+
 /// A list of pids/pgids that have been disowned. They are kept around until either they exit or
 /// we exit. Poll these from time-to-time to prevent zombie processes from happening (#5342).
 static owning_lock<std::vector<pid_t>> s_disowned_pids;
diff --git a/src/proc.h b/src/proc.h
index 718fb17bb..6d28861aa 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -237,6 +237,9 @@ class process_t {
     /// launch. This helps us avoid spurious waitpid calls.
     void check_generations_before_launch();
 
+    /// \return whether this process type is internal (block, function, or builtin).
+    bool is_internal() const;
+
     /// Actual command to pass to exec in case of process_type_t::external or process_type_t::exec.
     wcstring actual_cmd;
 
@@ -293,6 +296,24 @@ struct job_lineage_t {
     std::shared_ptr<relaxed_atomic_bool_t> root_constructed{};
 };
 
+/// A job has a mode which describes how its pgroup is assigned (before the value is known).
+/// This is a constant property of the job.
+enum class pgroup_provenance_t {
+    /// The job has no pgroup assignment. This is used for e.g. a simple function invocation with no
+    /// pipeline.
+    unassigned,
+
+    /// The job's pgroup is fish's pgroup. This is used when fish needs to read from the terminal,
+    /// or if job control is disabled.
+    fish_itself,
+
+    /// The job's pgroup will come from its first external process.
+    first_external_proc,
+
+    /// The job's pgroup will come from its lineage. This is used for jobs that are run nested.
+    lineage,
+};
+
 /// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
 /// of flags.
 class job_t {
@@ -384,6 +405,9 @@ class job_t {
     /// Set to a nonexistent, non-return-value of getpgid() integer by the constructor
     pid_t pgid{INVALID_PID};
 
+    /// How the above pgroup is assigned. This should be set at construction and not modified after.
+    pgroup_provenance_t pgroup_mode{};
+
     /// The id of this job.
     job_id_t job_id() const { return job_id_; }
 
@@ -445,6 +469,12 @@ class job_t {
     /// Mark this job as constructed. The job must not have previously been marked as constructed.
     void mark_constructed();
 
+    /// \return whether we have internal or external procs, respectively.
+    /// Internal procs are builtins, blocks, and functions.
+    /// External procs include exec and external.
+    bool has_internal_proc() const;
+    bool has_external_proc() const;
+
     // Helper functions to check presence of flags on instances of jobs
     /// The job has been fully constructed, i.e. all its member processes have been launched
     bool is_constructed() const { return *constructed; }

From aaaca9773a7d8cf4133e852f78ca2e5dc86eb8c6 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 11:07:28 -0800
Subject: [PATCH 1672/1732] Unconditionally call set_child_group() after
 posix_spawn

Previously we did this conditionally only if GLIBC is defined, but
it looks harmless to do this unconditionally. Let's do it.
---
 src/exec.cpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 748a36fbb..0bfdd1d1e 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -578,21 +578,10 @@ static bool exec_external_command(parser_t &parser, const std::shared_ptr<job_t>
         p->pid = pid;
         maybe_assign_pgid_from_child(j, p->pid);
 
-        // We explicitly don't call set_child_group() for spawned processes because that
-        // a) isn't necessary, and b) causes issues like fish-shell/fish-shell#4715
-
-#if defined(__GLIBC__)
-        // Unfortunately, using posix_spawn() is not the panacea it would appear to be,
-        // glibc has a penchant for using fork() instead of vfork() when posix_spawn() is
-        // called, meaning that atomicity is not guaranteed and we can get here before the
-        // child group has been set. See discussion here:
-        // https://github.com/Microsoft/WSL/issues/2997 And confirmation that this persists
-        // past glibc 2.24+ here: https://github.com/fish-shell/fish-shell/issues/4715
-        if (j->wants_job_control() && getpgid(p->pid) != j->pgid) {
-            set_child_group(j.get(), p->pid);
-        }
-#endif
-
+        // In glibc, posix_spawn uses fork() and the pgid group is set on the child side;
+        // therefore the parent may not have seen it be set yet.
+        // Ensure it gets set. See #4715, also https://github.com/Microsoft/WSL/issues/2997.
+        set_child_group(j.get(), p->pid);
         terminal_maybe_give_to_job(j.get(), false);
     } else
 #endif

From a243e659399199f7c696d07dd3b3fdcc102162f9 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 11:14:31 -0800
Subject: [PATCH 1673/1732] Rename pgroup_mode to pgroup_provenance

---
 src/exec.cpp            | 5 +++--
 src/parse_execution.cpp | 2 +-
 src/proc.h              | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 0bfdd1d1e..a9ac8d910 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -206,7 +206,8 @@ static void internal_exec(env_stack_t &vars, job_t *j, const io_chain_t &block_i
 /// If our pgroup assignment mode wants us to use the first external proc, then apply it here.
 static void maybe_assign_pgid_from_child(const std::shared_ptr<job_t> &j, pid_t child_pid) {
     // If our assignment mode is the first process, then assign it.
-    if (j->pgid == INVALID_PID && j->pgroup_mode == pgroup_provenance_t::first_external_proc) {
+    if (j->pgid == INVALID_PID &&
+        j->pgroup_provenance == pgroup_provenance_t::first_external_proc) {
         j->pgid = child_pid;
     }
 }
@@ -925,7 +926,7 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
 
     // Perhaps we know our pgroup already.
     assert(j->pgid == INVALID_PID && "Should not yet have a pid.");
-    switch (j->pgroup_mode) {
+    switch (j->pgroup_provenance) {
         case pgroup_provenance_t::lineage:
             assert(*lineage.parent_pgid != INVALID_PID && "pgid should be none, not INVALID_PID");
             j->pgid = *lineage.parent_pgid;
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2d3dc761b..d4594c9d4 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1303,7 +1303,7 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
     // Clean up the job on failure or cancellation.
     if (pop_result == end_execution_reason_t::ok) {
         // Set the pgroup assignment mode, now that the job is populated.
-        job->pgroup_mode = get_pgroup_provenance(job, lineage);
+        job->pgroup_provenance = get_pgroup_provenance(job, lineage);
 
         // Success. Give the job to the parser - it will clean it up.
         parser->job_add(job);
diff --git a/src/proc.h b/src/proc.h
index 6d28861aa..9d8e175c7 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -406,7 +406,7 @@ class job_t {
     pid_t pgid{INVALID_PID};
 
     /// How the above pgroup is assigned. This should be set at construction and not modified after.
-    pgroup_provenance_t pgroup_mode{};
+    pgroup_provenance_t pgroup_provenance{};
 
     /// The id of this job.
     job_id_t job_id() const { return job_id_; }

From 70195164d435c5da5f5e69993048e045bdaed810 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 11:24:02 -0800
Subject: [PATCH 1674/1732] Refactor child_set_group

---
 src/postfork.cpp | 111 +++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/src/postfork.cpp b/src/postfork.cpp
index fb08f2def..c98bcd65e 100644
--- a/src/postfork.cpp
+++ b/src/postfork.cpp
@@ -40,68 +40,65 @@
 
 static char *get_interpreter(const char *command, char *buffer, size_t buff_size);
 
+/// Report the error code \p err for a failed setpgid call.
+static void report_setpgid_error(int err, const job_t *j, const process_t *p) {
+    char pid_buff[128];
+    char job_id_buff[128];
+    char getpgid_buff[128];
+    char job_pgid_buff[128];
+    char argv0[64];
+    char command[64];
+
+    format_long_safe(pid_buff, p->pid);
+    format_long_safe(job_id_buff, j->job_id());
+    format_long_safe(getpgid_buff, getpgid(p->pid));
+    format_long_safe(job_pgid_buff, j->pgid);
+    narrow_string_safe(argv0, p->argv0());
+    narrow_string_safe(command, j->command_wcstr());
+
+    debug_safe(1, "Could not send own process %s, '%s' in job %s, '%s' from group %s to group %s",
+               pid_buff, argv0, job_id_buff, command, getpgid_buff, job_pgid_buff);
+
+    if (is_windows_subsystem_for_linux() && errno == EPERM) {
+        debug_safe(1,
+                   "Please update to Windows 10 1809/17763 or higher to address known issues "
+                   "with process groups and zombie processes.");
+    }
+
+    errno = err;
+    safe_perror("setpgid");
+}
+
 /// Called only by the child to set its own process group (possibly creating a new group in the
 /// process if it is the first in a JOB_CONTROL job.
 /// Returns true on success, false on failure.
 bool child_set_group(job_t *j, process_t *p) {
-    if (j->wants_job_control()) {
-        if (j->pgid == INVALID_PID) {
-            j->pgid = p->pid;
-        }
-
-        for (int i = 0; setpgid(p->pid, j->pgid) != 0; ++i) {
-            // Put a cap on how many times we retry so we are never stuck here
-            if (i < 100) {
-                if (errno == EPERM) {
-                    // The setpgid(2) man page says that EPERM is returned only if attempts are made
-                    // to move processes into groups across session boundaries (which can never be
-                    // the case in fish, anywhere) or to change the process group ID of a session
-                    // leader (again, can never be the case). I'm pretty sure this is a WSL bug, as
-                    // we see the same with tcsetpgrp(2) in other places and it disappears on retry.
-                    debug_safe(2, "setpgid(2) returned EPERM. Retrying");
-                    continue;
-                } else if (errno == EINTR) {
-                    // I don't think signals are blocked here. The parent (fish) redirected the
-                    // signal handlers and `child_setup_process()` calls `signal_reset_handlers()`
-                    // after we're done here (and not `signal_unblock()`). We're already in a loop,
-                    // so let's just handle EINTR just in case.
-                    continue;
-                }
-            }
-
-            char pid_buff[128];
-            char job_id_buff[128];
-            char getpgid_buff[128];
-            char job_pgid_buff[128];
-            char argv0[64];
-            char command[64];
-
-            format_long_safe(pid_buff, p->pid);
-            format_long_safe(job_id_buff, j->job_id());
-            format_long_safe(getpgid_buff, getpgid(p->pid));
-            format_long_safe(job_pgid_buff, j->pgid);
-            narrow_string_safe(argv0, p->argv0());
-            narrow_string_safe(command, j->command_wcstr());
-
-            debug_safe(
-                1, "Could not send own process %s, '%s' in job %s, '%s' from group %s to group %s",
-                pid_buff, argv0, job_id_buff, command, getpgid_buff, job_pgid_buff);
-
-            if (is_windows_subsystem_for_linux() && errno == EPERM) {
-                debug_safe(
-                    1,
-                    "Please update to Windows 10 1809/17763 or higher to address known issues "
-                    "with process groups and zombie processes.");
-            }
-
-            safe_perror("setpgid");
-
-            return false;
-        }
-    } else {
-        j->pgid = getpgrp();
+    if (j->pgid == INVALID_PID) {
+        assert(j->pgroup_provenance == pgroup_provenance_t::first_external_proc &&
+               "pgroup should only be unset if we need to become the leader");
+        j->pgid = p->pid;
     }
-    return true;
+    // Put a cap on how many times we retry so we are never stuck here.
+    for (int i = 0; i < 100; i++) {
+        if (setpgid(p->pid, j->pgid) == 0) {
+            return true;
+        } else if (errno == EPERM) {
+            // The setpgid(2) man page says that EPERM is returned only if attempts are made
+            // to move processes into groups across session boundaries (which can never be
+            // the case in fish, anywhere) or to change the process group ID of a session
+            // leader (again, can never be the case). I'm pretty sure this is a WSL bug, as
+            // we see the same with tcsetpgrp(2) in other places and it disappears on retry.
+            debug_safe(2, "setpgid(2) returned EPERM. Retrying");
+            continue;
+        } else if (errno == EINTR) {
+            // Retry on EINTR.
+            continue;
+        } else {
+            break;
+        }
+    }
+    report_setpgid_error(errno, j, p);
+    return false;
 }
 
 /// Called only by the parent only after a child forks and successfully calls child_set_group,

From 9735a18addd6cc4a3d4f4dc7f573a726f25f2a61 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 Jan 2020 20:39:42 +0100
Subject: [PATCH 1675/1732] Always return a value, even in unreachable code

To placate dumb compilers, we sometimes have to include code that will
never be executed.

Should fix the build when -Werror=return-type is in effect.
---
 src/proc.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/proc.cpp b/src/proc.cpp
index 3e2911179..fda626234 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -265,7 +265,12 @@ bool process_t::is_internal() const {
         case process_type_t::external:
         case process_type_t::exec:
             return false;
+        default:
+            assert(false && "The fish developers forgot to include a process_t. Please report a bug");
+            return true;
     }
+    assert(false && "process_t::is_internal: Total logic failure, universe is broken. Please replace universe and retry.");
+    return true;
 }
 
 job_t::job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage)

From 97c456a986ca3b20fb7173c25cec6c1e37d2af08 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 15:16:03 -0800
Subject: [PATCH 1676/1732] Improve support for job control in non-interactive
 scenarios

Avoid complaining about ENOTTY results from tcsetpgrp, and ensure we
ignore SIGTTOU the first time job control is enabled.
---
 src/proc.cpp                                 | 21 ++++++++++++++++----
 tests/checks/job-control-noninteractive.fish | 14 +++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 tests/checks/job-control-noninteractive.fish

diff --git a/src/proc.cpp b/src/proc.cpp
index fda626234..151f56971 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -78,7 +78,19 @@ static relaxed_atomic_t<job_control_t> job_control_mode{job_control_t::interacti
 
 job_control_t get_job_control_mode() { return job_control_mode; }
 
-void set_job_control_mode(job_control_t mode) { job_control_mode = mode; }
+void set_job_control_mode(job_control_t mode) {
+    job_control_mode = mode;
+
+    // HACK: when fish (or any shell) launches a job with job control, it will put the job into its
+    // own pgroup and call tcsetpgrp() to allow that pgroup to own the terminal (making fish a
+    // background process). When the job finishes, fish will try to reclaim the terminal via
+    // tcsetpgrp(), but as fish is now a background process it will receive SIGTTOU and stop! Ensure
+    // that doesn't happen by ignoring SIGTTOU.
+    // Note that if we become interactive, we also ignore SIGTTOU.
+    if (mode == job_control_t::all) {
+        signal(SIGTTOU, SIG_IGN);
+    }
+}
 
 void proc_init() { signal_set_handlers_once(false); }
 
@@ -776,10 +788,11 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
             } else {
                 if (errno == ENOTTY) {
                     redirect_tty_output();
+                } else {
+                    FLOGF(warning, _(L"Could not send job %d ('%ls') with pgid %d to foreground"),
+                          j->job_id(), j->command_wcstr(), j->pgid);
+                    wperror(L"tcsetpgrp");
                 }
-                FLOGF(warning, _(L"Could not send job %d ('%ls') with pgid %d to foreground"),
-                      j->job_id(), j->command_wcstr(), j->pgid);
-                wperror(L"tcsetpgrp");
                 return error;
             }
 
diff --git a/tests/checks/job-control-noninteractive.fish b/tests/checks/job-control-noninteractive.fish
new file mode 100644
index 000000000..a19dd5738
--- /dev/null
+++ b/tests/checks/job-control-noninteractive.fish
@@ -0,0 +1,14 @@
+#RUN: env fth=%fish_test_helper %fish %s
+
+# Ensure job control works in non-interactive environments.
+
+status job-control full
+/bin/echo hello
+#CHECK: hello
+
+$fth print_pgrp | read first
+$fth print_pgrp | read second
+test $first -ne $second
+and echo "pgroups differed, meaning job control worked"
+or echo "pgroups were the same, job control did not work"
+#CHECK: pgroups differed, meaning job control worked

From 2c4e15e267612a833522f6198cfd9d6c32cce74e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 20:43:30 -0800
Subject: [PATCH 1677/1732] Fix the Cygwin build for uvar notifiers

---
 src/env_universal_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/env_universal_common.cpp b/src/env_universal_common.cpp
index 07fba0eb1..6f50b0488 100644
--- a/src/env_universal_common.cpp
+++ b/src/env_universal_common.cpp
@@ -1086,7 +1086,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
 
         // Set the size, if it's too small.
         bool set_size = !errored && size < (off_t)sizeof(universal_notifier_shmem_t);
-        if (set_size && ftruncate(fd, sizeof(universal_notifier_shmem_t)) < 0) {
+        if (set_size && ftruncate(fd.fd(), sizeof(universal_notifier_shmem_t)) < 0) {
             const char *error = std::strerror(errno);
             FLOGF(error, _(L"Unable to truncate shared memory object with path '%s': %s"), path,
                   error);
@@ -1096,7 +1096,7 @@ class universal_notifier_shmem_poller_t : public universal_notifier_t {
         // Memory map the region.
         if (!errored) {
             void *addr = mmap(nullptr, sizeof(universal_notifier_shmem_t), PROT_READ | PROT_WRITE,
-                              MAP_SHARED, fd, 0);
+                              MAP_SHARED, fd.fd(), 0);
             if (addr == MAP_FAILED) {
                 const char *error = std::strerror(errno);
                 FLOGF(error, _(L"Unable to memory map shared memory object with path '%s': %s"),

From 73106198c8f36adb26c7dab906119d51023329eb Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 30 Jan 2020 20:50:08 -0800
Subject: [PATCH 1678/1732] Update to latest widecharwidth

Fixes a Cygwin incompatibility. Fixes #6549
---
 src/widecharwidth/widechar_width.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/widecharwidth/widechar_width.h b/src/widecharwidth/widechar_width.h
index 3e63ffbd0..402bc4407 100644
--- a/src/widecharwidth/widechar_width.h
+++ b/src/widecharwidth/widechar_width.h
@@ -1,5 +1,5 @@
 /**
- * widechar_width.h, generated on 2019-05-14.
+ * widechar_width.h, generated on 2020-01-30.
  * See https://github.com/ridiculousfish/widecharwidth/
  *
  * SHA1 file hashes:
@@ -30,8 +30,8 @@ enum {
 
 /* An inclusive range of characters. */
 struct widechar_range {
-  wchar_t lo;
-  wchar_t hi;
+  uint32_t lo;
+  uint32_t hi;
 };
 
 /* Simple ASCII characters - used a lot, so we check them first. */
@@ -506,14 +506,14 @@ static const struct widechar_range widechar_widened_table[] = {
 };
 
 template<typename Collection>
-bool widechar_in_table(const Collection &arr, wchar_t c) {
+bool widechar_in_table(const Collection &arr, uint32_t c) {
     auto where = std::lower_bound(std::begin(arr), std::end(arr), c,
-        [](widechar_range p, wchar_t c) { return p.hi < c; });
+        [](widechar_range p, uint32_t c) { return p.hi < c; });
     return where != std::end(arr) && where->lo <= c;
 }
 
 /* Return the width of character c, or a special negative value. */
-int widechar_wcwidth(wchar_t c) {
+int widechar_wcwidth(uint32_t c) {
     if (widechar_in_table(widechar_ascii_table, c))
         return 1;
     if (widechar_in_table(widechar_private_table, c))

From 5c8ef19ff8b0eecfa86dd79c6143984ec858227f Mon Sep 17 00:00:00 2001
From: Michael Sanders <michael.sanders@fastmail.com>
Date: Tue, 28 Jan 2020 13:58:58 -0800
Subject: [PATCH 1679/1732] Bring rbenv completions up-to-date

---
 share/completions/rbenv.fish | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/share/completions/rbenv.fish b/share/completions/rbenv.fish
index dec9fd175..90d8f2421 100644
--- a/share/completions/rbenv.fish
+++ b/share/completions/rbenv.fish
@@ -42,8 +42,8 @@ function __fish_rbenv_prefixes
 end
 
 ### commands
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a commands -d 'List all rbenv commands'
-complete -f -c rbenv -n '__fish_rbenv_using_command commands' -a '--complete --sh --no-sh'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a commands -d 'List all available rbenv commands'
+complete -f -c rbenv -n '__fish_rbenv_using_command commands' -a '--sh --no-sh'
 
 ### completions
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a completions
@@ -60,42 +60,42 @@ complete -f -c rbenv -n '__fish_rbenv_using_command global' -a '(__fish_rbenv_in
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a help
 
 ### hooks
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a hooks
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a hooks -d 'List hook scripts for a given rbenv command'
 
 ### init
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a init
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a init -d 'Configure the shell environment for rbenv'
 
 ### install
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a install -d 'Install a ruby version'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a install -d 'Install a Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command install' -a '(__fish_rbenv_official_rubies)'
 
 ### local
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a local -d 'Set or show the local directory-specific Ruby version'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a local -d 'Set or show the local application-specific Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command local' -a '(__fish_rbenv_installed_rubies)'
 
 ### prefix
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a prefix -d 'Shows a ruby version installed folder'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a prefix -d 'Display the directory where a Ruby version is installed'
 complete -f -c rbenv -n '__fish_rbenv_using_command prefix' -a '(__fish_rbenv_prefixes)'
 
 ### rehash
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a rehash -d 'Rehash rbenv shims (run this after installing binaries)'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a rehash -d 'Rehash rbenv shims (run this after installing executables)'
 
 ### root
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a root -d 'rbenv root folder'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a root -d 'Display the root directory where versions and shims are kept'
 
 ### shell
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shell -d 'Set or show the shell-specific Ruby version'
 complete -f -c rbenv -n '__fish_rbenv_using_command shell' -a '--unset (__fish_rbenv_installed_rubies)'
 
 ### shims
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shims
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shims -d 'List existing rbenv shims'
 complete -f -c rbenv -n '__fish_rbenv_using_command shims' -a '--short'
 
 ### version
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version -d 'Show the current Ruby version'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version -d 'Show the current Ruby version & how it was selected'
 
 ### version-file
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file 'Detect the file that sets the current rbenv version'
 
 ### version-file-read
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file-read
@@ -104,18 +104,18 @@ complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file-read
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file-write
 
 ### version-name
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-name
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-name -d 'Show the current Ruby version'
 
 ### version-origin
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-origin
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-origin -d 'Explain how the current Ruby version is set'
 
 ### versions
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a versions -d 'List all Ruby versions known by rbenv'
 
 ### whence
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a whence -d 'List all Ruby versions with the given command'
-complete -f -c rbenv -n '__fish_rbenv_using_command whence' -a '--complete --path'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a whence -d 'List all Ruby versions that contain the given executable'
+complete -f -c rbenv -n '__fish_rbenv_using_command whence' -a '--path'
 
 ### which
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a which -d 'Show the full path for the given Ruby command'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a which -d 'Show the full path for the given Ruby executable'
 complete -f -c rbenv -n '__fish_rbenv_using_command which' -a '(__fish_rbenv_executables)'

From 3f8907d7cfc52421aeb3ab4e611fa58197f7b0c7 Mon Sep 17 00:00:00 2001
From: Michael Sanders <michael.sanders@fastmail.com>
Date: Tue, 28 Jan 2020 14:03:29 -0800
Subject: [PATCH 1680/1732] Add pyenv completions

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

diff --git a/share/completions/pyenv.fish b/share/completions/pyenv.fish
new file mode 100644
index 000000000..6a0858d15
--- /dev/null
+++ b/share/completions/pyenv.fish
@@ -0,0 +1,116 @@
+# fish completion for pyenv
+
+function __fish_pyenv_needs_command
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
+end
+
+function __fish_pyenv_using_command
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
+    end
+    return 1
+end
+
+function __fish_pyenv_executables
+    pyenv exec --complete
+end
+
+function __fish_pyenv_installed_versions
+    pyenv versions --bare
+end
+
+function __fish_pyenv_available_versions
+    # Remove trailing spaces, otherwise completion options appear like
+    # "\ \ option"
+    pyenv install --list | sed "s/^[[:space:]]*//"
+end
+
+function __fish_pyenv_prefixes
+    pyenv prefix --complete
+end
+
+### commands
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a commands -d 'List all available pyenv commands'
+complete -f -c pyenv -n '__fish_pyenv_using_command commands' -a '--sh --no-sh'
+
+### completions
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a completions
+
+### exec
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a exec
+complete -f -c pyenv -n '__fish_pyenv_using_command exec' -a '(__fish_pyenv_executables)'
+
+### global
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a global -d 'Set or show the global Python version'
+complete -f -c pyenv -n '__fish_pyenv_using_command global' -a '(__fish_pyenv_installed_versions)'
+
+### help
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a help
+
+### hooks
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a hooks -d 'List hook scripts for a given pyenv command'
+
+### init
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a init -d 'Configure the shell environment for pyenv'
+
+### install
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a install -d 'Install a Python version'
+complete -f -c pyenv -n '__fish_pyenv_using_command install' -a '(__fish_pyenv_available_versions)'
+
+### local
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a local -d 'Set or show the local application-specific Python version'
+complete -f -c pyenv -n '__fish_pyenv_using_command local' -a '(__fish_pyenv_installed_versions)'
+
+### prefix
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a prefix -d 'Display the directory where a Python version is installed'
+complete -f -c pyenv -n '__fish_pyenv_using_command prefix' -a '(__fish_pyenv_prefixes)'
+
+### rehash
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a rehash -d 'Rehash pyenv shims (run this after installing executables)'
+
+### root
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a root -d 'Display the root directory where versions and shims are kept'
+
+### shell
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a shell -d 'Set or show the shell-specific Python version'
+complete -f -c pyenv -n '__fish_pyenv_using_command shell' -a '--unset (__fish_pyenv_installed_versions)'
+
+### shims
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a shims -d 'List existing pyenv shims'
+complete -f -c pyenv -n '__fish_pyenv_using_command shims' -a '--short'
+
+### version
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version -d 'Show the current Python version & how it was selected'
+
+### version-file
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file -d 'Detect the file that sets the current pyenv version'
+
+### version-file-read
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file-read
+
+### version-file-write
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-file-write
+
+### version-name
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-name -d 'Show the current Python version'
+
+### version-origin
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a version-origin -d 'Explain how the current Python version is set'
+
+### versions
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a versions -d 'List all Python versions known by pyenv'
+
+### whence
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a whence -d 'List all Python versions that contain the given executable'
+complete -f -c pyenv -n '__fish_pyenv_using_command whence' -a '--path'
+
+### which
+complete -f -c pyenv -n '__fish_pyenv_needs_command' -a which -d 'Show the full path for the given Python executable'
+complete -f -c pyenv -n '__fish_pyenv_using_command which' -a '(__fish_pyenv_executables)'

From bc3b64bb508e5a14850296ad49c4e0be6b80cdc6 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Fri, 31 Jan 2020 12:38:56 +0900
Subject: [PATCH 1681/1732] Fix broken links to index.html in cmd docs

---
 sphinx_doc_src/cmds/and.rst                    | 2 +-
 sphinx_doc_src/cmds/bg.rst                     | 2 +-
 sphinx_doc_src/cmds/bind.rst                   | 4 ++--
 sphinx_doc_src/cmds/breakpoint.rst             | 2 +-
 sphinx_doc_src/cmds/disown.rst                 | 2 +-
 sphinx_doc_src/cmds/fg.rst                     | 2 +-
 sphinx_doc_src/cmds/fish_breakpoint_prompt.rst | 2 +-
 sphinx_doc_src/cmds/fish_prompt.rst            | 2 +-
 sphinx_doc_src/cmds/function.rst               | 2 +-
 sphinx_doc_src/cmds/jobs.rst                   | 2 +-
 sphinx_doc_src/faq.rst                         | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sphinx_doc_src/cmds/and.rst b/sphinx_doc_src/cmds/and.rst
index 7fef3296f..e5644f4c9 100644
--- a/sphinx_doc_src/cmds/and.rst
+++ b/sphinx_doc_src/cmds/and.rst
@@ -18,7 +18,7 @@ Description
 
 ``and`` statements may be used as part of the condition in an :ref:`while <cmd-while>` or :ref:`if <cmd-if>` block.
 
-``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 `$status <index.html#variables-status>`__ variable.
+``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.
 
 Example
 -------
diff --git a/sphinx_doc_src/cmds/bg.rst b/sphinx_doc_src/cmds/bg.rst
index d40efc573..b14049f50 100644
--- a/sphinx_doc_src/cmds/bg.rst
+++ b/sphinx_doc_src/cmds/bg.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``bg`` sends `jobs <index.html#syntax-job-control>`__ to the background, resuming them if they are stopped.
+``bg`` sends :ref:`jobs <syntax-job-control>` to the background, resuming them if they are stopped.
 
 A background job is executed simultaneously with fish, and does not have access to the keyboard. If no job is specified, the last job to be used is put in the background. If PID is specified, the jobs with the specified process group IDs are put in the background.
 
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index 662e89b4c..dd0e590cb 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -20,7 +20,7 @@ Description
 
 ``bind`` adds a binding for the specified key sequence to the specified command.
 
-SEQUENCE is the character sequence to bind to. These should be written as `fish escape sequences <index.html#escapes>`__. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
+SEQUENCE is the character sequence to bind to. These should be written as :ref:`fish escape sequences <escapes>`. For example, because pressing the Alt key and another character sends that character prefixed with an escape character, Alt-based key bindings can be written using the ``\e`` escape. For example, :kbd:`Alt+w` can be written as ``\ew``. The control character can be written in much the same way using the ``\c`` escape, for example :kbd:`Control+X` (^X) can be written as ``\cx``. Note that Alt-based key bindings are case sensitive and Control-based key bindings are not. This is a constraint of text-based terminals, not ``fish``.
 
 The default key binding can be set by specifying a ``SEQUENCE`` of the empty string (that is, ``''`` ). It will be used whenever no other binding matches. For most key bindings, it makes sense to use the ``self-insert`` function (i.e. ``bind '' self-insert``) as the default keybinding. This will insert any keystrokes not specifically bound to into the editor. Non- printable characters are ignored by the editor, so this will not result in control sequences being printable.
 
@@ -36,7 +36,7 @@ When multiple ``COMMAND``\s are provided, they are all run in the specified orde
 
 If no ``SEQUENCE`` is provided, all bindings (or just the bindings in the specified ``MODE``) are printed. If ``SEQUENCE`` is provided without ``COMMAND``, just the binding matching that sequence is printed.
 
-To save custom keybindings, put the ``bind`` statements into `config.fish <index.html#initialization>`__. Alternatively, fish also automatically executes a function called ``fish_user_key_bindings`` if it exists.
+To save custom keybindings, put the ``bind`` statements into :ref:`config.fish <initialization>`. Alternatively, fish also automatically executes a function called ``fish_user_key_bindings`` if it exists.
 
 Key bindings may use "modes", which mimics Vi's modal input behavior. The default mode is "default", and every bind applies to a single mode. The mode can be viewed/changed with the ``$fish_bind_mode`` variable.
 
diff --git a/sphinx_doc_src/cmds/breakpoint.rst b/sphinx_doc_src/cmds/breakpoint.rst
index aa465be6a..6fe19088b 100644
--- a/sphinx_doc_src/cmds/breakpoint.rst
+++ b/sphinx_doc_src/cmds/breakpoint.rst
@@ -16,6 +16,6 @@ Description
 
 ``breakpoint`` is used to halt a running script and launch an interactive debugging prompt.
 
-For more details, see `Debugging fish scripts <index.html#debugging>`__ in the ``fish`` manual.
+For more details, see :ref:`Debugging fish scripts <debugging>` in the ``fish`` manual.
 
 There are no parameters for ``breakpoint``.
diff --git a/sphinx_doc_src/cmds/disown.rst b/sphinx_doc_src/cmds/disown.rst
index 2cc3607aa..94078a3ee 100644
--- a/sphinx_doc_src/cmds/disown.rst
+++ b/sphinx_doc_src/cmds/disown.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``disown`` removes the specified `job <index.html#syntax-job-control>`__ from the list of jobs. The job itself continues to exist, but fish does not keep track of it any longer.
+``disown`` removes the specified :ref:`job <syntax-job-control>` from the list of jobs. The job itself continues to exist, but fish does not keep track of it any longer.
 
 Jobs in the list of jobs are sent a hang-up signal when fish terminates, which usually causes the job to terminate; ``disown`` allows these processes to continue regardless.
 
diff --git a/sphinx_doc_src/cmds/fg.rst b/sphinx_doc_src/cmds/fg.rst
index 3cbb4acf2..3d0d2e0f7 100644
--- a/sphinx_doc_src/cmds/fg.rst
+++ b/sphinx_doc_src/cmds/fg.rst
@@ -13,7 +13,7 @@ Synopsis
 Description
 -----------
 
-``fg`` brings the specified `job <index.html#syntax-job-control>`__ to the foreground, resuming it if it is stopped. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group ID is put in the foreground.
+``fg`` brings the specified :ref:`job <syntax-job-control>` to the foreground, resuming it if it is stopped. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group ID is put in the foreground.
 
 
 Example
diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
index 200bee6e7..6203a3ea0 100644
--- a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst
@@ -18,7 +18,7 @@ Description
 
 By defining the ``fish_breakpoint_prompt`` function, the user can choose a custom prompt when asking for input in response to a :ref:`breakpoint <cmd-breakpoint>` command. The ``fish_breakpoint_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
 
-The exit status of commands within ``fish_breakpoint_prompt`` will not modify the value of `$status <index.html#variables-status>`__ outside of the ``fish_breakpoint_prompt`` function.
+The exit status of commands within ``fish_breakpoint_prompt`` will not modify the value of :ref:`$status <variables-status>` outside of the ``fish_breakpoint_prompt`` function.
 
 ``fish`` ships with a default version of this function that displays the function name and line number of the current execution context.
 
diff --git a/sphinx_doc_src/cmds/fish_prompt.rst b/sphinx_doc_src/cmds/fish_prompt.rst
index f11c6036d..773d5d0d3 100644
--- a/sphinx_doc_src/cmds/fish_prompt.rst
+++ b/sphinx_doc_src/cmds/fish_prompt.rst
@@ -18,7 +18,7 @@ Description
 
 By defining the ``fish_prompt`` function, the user can choose a custom prompt. The ``fish_prompt`` function is executed when the prompt is to be shown, and the output is used as a prompt.
 
-The exit status of commands within ``fish_prompt`` will not modify the value of `$status <index.html#variables-status>`__ outside of the ``fish_prompt`` function.
+The exit status of commands within ``fish_prompt`` will not modify the value of :ref:`$status <variables-status>` outside of the ``fish_prompt`` function.
 
 ``fish`` ships with a number of example prompts that can be chosen with the ``fish_config`` command.
 
diff --git a/sphinx_doc_src/cmds/function.rst b/sphinx_doc_src/cmds/function.rst
index 52724cf8a..16d3a84eb 100644
--- a/sphinx_doc_src/cmds/function.rst
+++ b/sphinx_doc_src/cmds/function.rst
@@ -44,7 +44,7 @@ The following options are available:
 
 - ``-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 `variable list <index.html#variables-lists>`__ ``$argv``. If the ``--argument-names`` option is provided, the arguments are also assigned to names specified in that option.
+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.
 
 By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the :ref:`emit <cmd-emit>` builtin. Fish generates the following named events:
 
diff --git a/sphinx_doc_src/cmds/jobs.rst b/sphinx_doc_src/cmds/jobs.rst
index 949f10704..278e2acc5 100644
--- a/sphinx_doc_src/cmds/jobs.rst
+++ b/sphinx_doc_src/cmds/jobs.rst
@@ -14,7 +14,7 @@ Synopsis
 Description
 -----------
 
-``jobs`` prints a list of the currently running `jobs <index.html#syntax-job-control>`__ and their status.
+``jobs`` prints a list of the currently running :ref:`jobs <syntax-job-control>` and their status.
 
 jobs accepts the following switches:
 
diff --git a/sphinx_doc_src/faq.rst b/sphinx_doc_src/faq.rst
index 454dd2514..b8b0dc35d 100644
--- a/sphinx_doc_src/faq.rst
+++ b/sphinx_doc_src/faq.rst
@@ -233,7 +233,7 @@ Fish history recall is very simple yet effective:
 
   - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (:kbd:`Alt+D` and :kbd:`Alt+Backspace` are your friends).
 
-See `documentation <index.html#editor>`__ for more details about line editing in fish.
+See :ref:`documentation <editor>` for more details about line editing in fish.
 
 
 How can I use ``-`` as a shortcut for ``cd -``?

From ce61c745a5c90d2d5632e0340344e948f78ffee3 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Fri, 31 Jan 2020 12:53:14 +0900
Subject: [PATCH 1682/1732] Remove explicit .html links

See commit 1711636
---
 sphinx_doc_src/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index 7e1fa3ebb..d174cdd01 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -77,7 +77,7 @@ You can make fish your default shell by adding fish's  executable in two places:
 - add ``/usr/local/bin/fish``  to  ``/etc/shells``
 - change your default shell with ``chsh -s`` to ``/usr/local/bin/fish``
 
-For for detailed instructions see `Switching to fish <tutorial.html#tut_switching_to_fish>`_.
+For for detailed instructions see :ref:`Switching to fish <switching-to-fish>`.
 
 Uninstalling
 ------------

From 8d8bcb7d8af7e41cd94da46d5d4bf98709eb45c3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 31 Jan 2020 10:42:21 -0800
Subject: [PATCH 1683/1732] Stop acquiring the terminal before running builtins

fish has some unprincipled code that attempts to tcsetpgrp() to own the
terminal before running a builtin; this was added because 'read' might
want to read from the terminal. I added this code before fully
understanding how process groups and terminals work. A better fix would
be to ensure that fish is marked as the pgroup leader in the job when
the builtin is the first process in the job, and we do that now.

Courageously back out the changes to grab the terminal; see #5147 and
also #5133.
---
 src/builtin.cpp | 10 +---------
 src/builtin.h   |  2 +-
 src/exec.cpp    |  2 +-
 src/proc.cpp    | 12 ------------
 src/proc.h      |  4 ----
 5 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/builtin.cpp b/src/builtin.cpp
index cf4bb57ec..e3e0c7170 100644
--- a/src/builtin.cpp
+++ b/src/builtin.cpp
@@ -437,7 +437,7 @@ static const wchar_t *const help_builtins[] = {L"for", L"while",  L"function", L
 static bool cmd_needs_help(const wchar_t *cmd) { return contains(help_builtins, cmd); }
 
 /// Execute a builtin command
-proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_streams_t &streams) {
+proc_status_t builtin_run(parser_t &parser, wchar_t **argv, io_streams_t &streams) {
     UNUSED(parser);
     UNUSED(streams);
     if (argv == nullptr || argv[0] == nullptr)
@@ -452,15 +452,7 @@ proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_str
     }
 
     if (const builtin_data_t *data = builtin_lookup(argv[0])) {
-        // If we are interactive, save the foreground pgroup and restore it after in case the
-        // builtin needs to read from the terminal. See #4540.
-        bool grab_tty = session_interactivity() != session_interactivity_t::not_interactive &&
-                        isatty(streams.stdin_fd);
-        pid_t pgroup_to_restore = grab_tty ? terminal_acquire_before_builtin(job_pgid) : -1;
         int ret = data->func(parser, streams, argv);
-        if (pgroup_to_restore >= 0) {
-            tcsetpgrp(STDIN_FILENO, pgroup_to_restore);
-        }
         return proc_status_t::from_exit_code(ret);
     }
 
diff --git a/src/builtin.h b/src/builtin.h
index 9b89cdee6..7f10b505e 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -81,7 +81,7 @@ enum { COMMAND_NOT_BUILTIN, BUILTIN_REGULAR, BUILTIN_FUNCTION };
 void builtin_init();
 bool builtin_exists(const wcstring &cmd);
 
-proc_status_t builtin_run(parser_t &parser, int job_pgid, wchar_t **argv, io_streams_t &streams);
+proc_status_t builtin_run(parser_t &parser, wchar_t **argv, io_streams_t &streams);
 
 wcstring_list_t builtin_get_names();
 void builtin_get_names(completion_list_t *list);
diff --git a/src/exec.cpp b/src/exec.cpp
index a9ac8d910..4d6914810 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -424,7 +424,7 @@ static bool exec_internal_builtin_proc(parser_t &parser, const std::shared_ptr<j
     j->mut_flags().foreground = false;
 
     // Note this call may block for a long time, while the builtin performs I/O.
-    p->status = builtin_run(parser, j->pgid, p->get_argv(), streams);
+    p->status = builtin_run(parser, p->get_argv(), streams);
 
     // Restore the fg flag, which is temporarily set to false during builtin
     // execution so as not to confuse some job-handling builtins.
diff --git a/src/proc.cpp b/src/proc.cpp
index 151f56971..1da651a4c 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -829,18 +829,6 @@ int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped) {
     return success;
 }
 
-pid_t terminal_acquire_before_builtin(int job_pgid) {
-    pid_t selfpgid = getpgrp();
-
-    pid_t current_owner = tcgetpgrp(STDIN_FILENO);
-    if (current_owner >= 0 && current_owner != selfpgid && current_owner == job_pgid) {
-        if (tcsetpgrp(STDIN_FILENO, selfpgid) == 0) {
-            return current_owner;
-        }
-    }
-    return -1;
-}
-
 /// Returns control of the terminal to the shell, and saves the terminal attribute state to the job,
 /// so that we can restore the terminal ownership to the job at a later time.
 static bool terminal_return_from_job(job_t *j, int restore_attrs) {
diff --git a/src/proc.h b/src/proc.h
index 9d8e175c7..aea7220f7 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -594,10 +594,6 @@ void hup_background_jobs(const parser_t &parser);
 /// \return 1 if transferred, 0 if no transfer was necessary, -1 on error.
 int terminal_maybe_give_to_job(const job_t *j, bool continuing_from_stopped);
 
-/// Given that we are about to run a builtin, acquire the terminal if it is owned by the given job.
-/// Returns the pid to restore after running the builtin, or -1 if there is no pid to restore.
-pid_t terminal_acquire_before_builtin(int job_pgid);
-
 /// Add a pid to the list of pids we wait on even though they are not associated with any jobs.
 /// Used to avoid zombie processes after disown.
 void add_disowned_pgid(pid_t pgid);

From 1101cff566f2dac1d421243e6048b0063b169181 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Fri, 31 Jan 2020 11:11:03 -0800
Subject: [PATCH 1684/1732] Factor out some of the crazy logic in
 reader_interactive_init

---
 src/reader.cpp | 147 +++++++++++++++++++++++++++----------------------
 1 file changed, 80 insertions(+), 67 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index 484e5860d..42203746a 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1683,84 +1683,97 @@ static bool check_for_orphaned_process(unsigned long loop_count, pid_t shell_pgi
     return we_think_we_are_orphaned;
 }
 
-/// Initialize data for interactive use.
-static void reader_interactive_init(parser_t &parser) {
-    // See if we are running interactively.
-    pid_t shell_pgid;
-
-    init_input();
-    shell_pgid = getpgrp();
-
-    // This should enable job control on fish, even if our parent process did not enable it for us.
+// Ensure that fish owns the terminal, possibly waiting. If we cannot acquire the terminal, then
+// report an error and exit.
+static void acquire_tty_or_exit(pid_t shell_pgid) {
+    ASSERT_IS_MAIN_THREAD();
 
     // Check if we are in control of the terminal, so that we don't do semi-expensive things like
     // reset signal handlers unless we really have to, which we often don't.
-    if (tcgetpgrp(STDIN_FILENO) != shell_pgid) {
-        // Bummer, we are not in control of the terminal. Stop until parent has given us control of
-        // it.
-        //
-        // In theory, reseting signal handlers could cause us to miss signal deliveries. In
-        // practice, this code should only be run during startup, when we're not waiting for any
-        // signals.
-        signal_reset_handlers();
+    // Common case.
+    if (tcgetpgrp(STDIN_FILENO) == shell_pgid) {
+        return;
+    }
 
-        // Ok, signal handlers are taken out of the picture. Stop ourself in a loop until we are in
-        // control of the terminal. However, the call to signal(SIGTTIN) may silently not do
-        // anything if we are orphaned.
-        //
-        // As far as I can tell there's no really good way to detect that we are orphaned. One way
-        // is to just detect if the group leader exited, via kill(shell_pgid, 0). Another
-        // possibility is that read() from the tty fails with EIO - this is more reliable but it's
-        // harder, because it may succeed or block. So we loop for a while, trying those strategies.
-        // Eventually we just give up and assume we're orphaend.
-        for (unsigned long loop_count = 0;; loop_count++) {
-            pid_t owner = tcgetpgrp(STDIN_FILENO);
-            // 0 is a valid return code from `tcgetpgrp()` under at least FreeBSD and testing
-            // indicates that a subsequent call to `tcsetpgrp()` will succeed. 0 is the
-            // pid of the top-level kernel process, so I'm not sure if this means ownership
-            // of the terminal has gone back to the kernel (i.e. it's not owned) or if it is
-            // just an "invalid" pid for all intents and purposes.
-            if (owner == 0) {
-                tcsetpgrp(STDIN_FILENO, shell_pgid);
-                // Since we expect the above to work, call `tcgetpgrp()` immediately to
-                // avoid a second pass through this loop.
-                owner = tcgetpgrp(STDIN_FILENO);
+    // Bummer, we are not in control of the terminal. Stop until parent has given us control of
+    // it.
+    //
+    // In theory, reseting signal handlers could cause us to miss signal deliveries. In
+    // practice, this code should only be run during startup, when we're not waiting for any
+    // signals.
+    signal_reset_handlers();
+    cleanup_t restore_sigs([] { signal_set_handlers(true); });
+
+    // Ok, signal handlers are taken out of the picture. Stop ourself in a loop until we are in
+    // control of the terminal. However, the call to signal(SIGTTIN) may silently not do
+    // anything if we are orphaned.
+    //
+    // As far as I can tell there's no really good way to detect that we are orphaned. One way
+    // is to just detect if the group leader exited, via kill(shell_pgid, 0). Another
+    // possibility is that read() from the tty fails with EIO - this is more reliable but it's
+    // harder, because it may succeed or block. So we loop for a while, trying those strategies.
+    // Eventually we just give up and assume we're orphaend.
+    for (unsigned loop_count = 0;; loop_count++) {
+        pid_t owner = tcgetpgrp(STDIN_FILENO);
+        // 0 is a valid return code from `tcgetpgrp()` under at least FreeBSD and testing
+        // indicates that a subsequent call to `tcsetpgrp()` will succeed. 0 is the
+        // pid of the top-level kernel process, so I'm not sure if this means ownership
+        // of the terminal has gone back to the kernel (i.e. it's not owned) or if it is
+        // just an "invalid" pid for all intents and purposes.
+        if (owner == 0) {
+            tcsetpgrp(STDIN_FILENO, shell_pgid);
+            // Since we expect the above to work, call `tcgetpgrp()` immediately to
+            // avoid a second pass through this loop.
+            owner = tcgetpgrp(STDIN_FILENO);
+        }
+        if (owner == -1 && errno == ENOTTY) {
+            if (session_interactivity() == session_interactivity_t::not_interactive) {
+                // It's OK if we're not able to take control of the terminal. We handle
+                // the fallout from this in a few other places.
+                break;
             }
-            if (owner == -1 && errno == ENOTTY) {
-                if (session_interactivity() == session_interactivity_t::not_interactive) {
-                    // It's OK if we're not able to take control of the terminal. We handle
-                    // the fallout from this in a few other places.
-                    break;
-                }
-                // No TTY, cannot be interactive?
-                redirect_tty_output();
-                FLOGF(warning, _(L"No TTY for interactive shell (tcgetpgrp failed)"));
-                wperror(L"setpgid");
+            // No TTY, cannot be interactive?
+            redirect_tty_output();
+            FLOGF(warning, _(L"No TTY for interactive shell (tcgetpgrp failed)"));
+            wperror(L"setpgid");
+            exit_without_destructors(1);
+        }
+        if (owner == shell_pgid) {
+            break;  // success
+        } else {
+            if (check_for_orphaned_process(loop_count, shell_pgid)) {
+                // We're orphaned, so we just die. Another sad statistic.
+                const wchar_t *fmt =
+                    _(L"I appear to be an orphaned process, so I am quitting politely. "
+                      L"My pid is %d.");
+                FLOGF(warning, fmt, (int)getpid());
                 exit_without_destructors(1);
             }
-            if (owner == shell_pgid) {
-                break;  // success
-            } else {
-                if (check_for_orphaned_process(loop_count, shell_pgid)) {
-                    // We're orphaned, so we just die. Another sad statistic.
-                    const wchar_t *fmt =
-                        _(L"I appear to be an orphaned process, so I am quitting politely. "
-                          L"My pid is %d.");
-                    FLOGF(warning, fmt, (int)getpid());
-                    exit_without_destructors(1);
-                }
 
-                // Try stopping us.
-                int ret = killpg(shell_pgid, SIGTTIN);
-                if (ret < 0) {
-                    wperror(L"killpg(shell_pgid, SIGTTIN)");
-                    exit_without_destructors(1);
-                }
+            // Try stopping us.
+            int ret = killpg(shell_pgid, SIGTTIN);
+            if (ret < 0) {
+                wperror(L"killpg(shell_pgid, SIGTTIN)");
+                exit_without_destructors(1);
             }
         }
-
-        signal_set_handlers(parser.is_interactive());
     }
+}
+
+/// Initialize data for interactive use.
+static void reader_interactive_init(parser_t &parser) {
+    ASSERT_IS_MAIN_THREAD();
+
+    pid_t shell_pgid = getpgrp();
+
+    // Set up key bindings.
+    init_input();
+
+    // Ensure interactive signal handling is enabled.
+    signal_set_handlers_once(true);
+
+    // Wait until we own the terminal.
+    acquire_tty_or_exit(shell_pgid);
 
     // It shouldn't be necessary to place fish in its own process group and force control
     // of the terminal, but that works around fish being started with an invalid pgroup,

From c6f85238b9a8c1f89743825f02609074d6969396 Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Fri, 31 Jan 2020 13:34:15 +0900
Subject: [PATCH 1685/1732] docs: Reword description for -D

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

diff --git a/sphinx_doc_src/cmds/functions.rst b/sphinx_doc_src/cmds/functions.rst
index f439f02d9..267334f51 100644
--- a/sphinx_doc_src/cmds/functions.rst
+++ b/sphinx_doc_src/cmds/functions.rst
@@ -29,7 +29,7 @@ The following options are available:
 
 - ``-e`` or ``--erase`` causes the specified functions to be erased. This also means that it is prevented from autoloading.
 
-- ``-D`` or ``--details`` reports the path name where each 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 ``source``, and ``n/a`` if the function isn't available. (Functions created via ``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 stdin, ``-`` if the function was created via ``source``, and ``n/a`` if the function isn't available. (Functions created via ``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``,

From 8f4797a38bf154f03f3ea5ca858d99cdee306442 Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Mon, 3 Feb 2020 13:47:15 -0600
Subject: [PATCH 1686/1732] Update `cargo` completions to use dynamic
 `--example` options

[ci skip]
---
 share/completions/cargo.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index fa224265d..bd0736d4e 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -35,7 +35,7 @@ end
 
 for x in bench build run rustc test
     complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -d 'Only the specified example'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -a "(cargo run --example 2>&1 | string replace -rf '^\s+' '')"
 end
 
 for x in build run rustc test

From bd06a9aa6ccdbf72e5d36c3c5c3d2a830c186541 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 2 Feb 2020 17:51:04 -0800
Subject: [PATCH 1687/1732] Retain leading spaces in non-expanding braces

This makes two changes:

1. Remove the 'brace_text_start' idea. The idea of 'brace_text_start' was
to prevent emitting `BRACE_SPACE` at the beginning or end of an item. But
we later strip these off anyways, so there is no apparent benefit. If we
are not doing brace expansion, this prevented emitting whitespace at the
beginning or end of an item, leading to #6564.

2. When performing brace expansion, only stomp the space character with
`BRACE_SPACE`; do not stomp newlines and tabs. This is because the fix in
came from a newline or tab literal, then we would have effectively
replaced a newline or tab with a space, so this is important for #6564 as
well. Moreover, it is not easy to place a literal newline or tab inside a
brace expansion, and users who do probably do not mean for it to be
stripped, so I believe this is a good change in general.

Fixes #6564
---
 src/common.cpp                | 11 +-------
 tests/checks/braces.fish      | 50 +++++++++++++++++++++++++++++++++++
 tests/parameter_expansion.in  |  6 -----
 tests/parameter_expansion.out |  2 --
 tests/test1.err               |  3 ---
 tests/test1.in                | 15 -----------
 tests/test1.out               | 14 ----------
 7 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 tests/checks/braces.fish

diff --git a/src/common.cpp b/src/common.cpp
index 330614eac..90b13a632 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -1435,7 +1435,6 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
     // The positions of variable expansions or brace ","s.
     // We only read braces as expanders if there's a variable expansion or "," in them.
     std::vector<size_t> vars_or_seps;
-    bool brace_text_start = false;
     int brace_count = 0;
 
     bool errored = false;
@@ -1531,7 +1530,6 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                         // assert(brace_count > 0 && "imbalanced brackets are a tokenizer error, we
                         // shouldn't be able to get here");
                         brace_count--;
-                        brace_text_start = brace_text_start && brace_count > 0;
                         to_append_or_none = BRACE_END;
                         if (!braces.empty()) {
                             // If we didn't have a var or separator since the last '{',
@@ -1559,17 +1557,13 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                 case L',': {
                     if (unescape_special && brace_count > 0) {
                         to_append_or_none = BRACE_SEP;
-                        brace_text_start = false;
                         vars_or_seps.push_back(input_position);
                     }
                     break;
                 }
-                case L'\n':
-                case L'\t':
                 case L' ': {
                     if (unescape_special && brace_count > 0) {
-                        to_append_or_none =
-                            brace_text_start ? maybe_t<wchar_t>(BRACE_SPACE) : none();
+                        to_append_or_none = BRACE_SPACE;
                     }
                     break;
                 }
@@ -1586,9 +1580,6 @@ static bool unescape_string_internal(const wchar_t *const input, const size_t in
                     break;
                 }
                 default: {
-                    if (unescape_special && brace_count > 0) {
-                        brace_text_start = true;
-                    }
                     break;
                 }
             }
diff --git a/tests/checks/braces.fish b/tests/checks/braces.fish
new file mode 100644
index 000000000..c42fd8e76
--- /dev/null
+++ b/tests/checks/braces.fish
@@ -0,0 +1,50 @@
+#RUN: %fish %s
+
+echo x-{1}
+#CHECK: x-{1}
+
+echo x-{1,2}
+#CHECK: x-1 x-2
+
+echo foo-{1,2{3,4}}
+#CHECK: foo-1 foo-23 foo-24
+
+echo foo-{} # literal "{}" expands to itself
+#CHECK: foo-{}
+
+echo foo-{{},{}} # the inner "{}" expand to themselves, the outer pair expands normally.
+#CHECK: foo-{} foo-{}
+
+echo foo-{{a},{}} # also works with something in the braces.
+#CHECK: foo-{a} foo-{}
+
+echo foo-{""} # still expands to foo-{}
+#CHECK: foo-{}
+
+echo foo-{$undefinedvar} # still expands to nothing
+#CHECK: 
+
+echo foo-{,,,} # four empty items in the braces.
+#CHECK: foo- foo- foo- foo-
+
+echo foo-{,\,,} # an empty item, a "," and an empty item.
+#CHECK: foo- foo-, foo-
+
+echo .{  foo  bar  }. # see 6564
+#CHECK: .{  foo  bar  }.
+
+# whitespace within entries is retained
+for foo in {a, hello
+wo  rld }
+    echo \'$foo\'
+end
+# CHECK: 'a'
+# CHECK: 'hello
+# CHECK: wo  rld'
+
+for foo in {hello
+world}
+   echo \'$foo\'
+end
+#CHECK: '{hello
+#CHECK: world}'
diff --git a/tests/parameter_expansion.in b/tests/parameter_expansion.in
index 7804adf5d..31c89a690 100644
--- a/tests/parameter_expansion.in
+++ b/tests/parameter_expansion.in
@@ -14,12 +14,6 @@ echo \'{ hello , world }\'
 for phrase in {good\,,   beautiful ,morning}; echo -n "$phrase "; end | string trim;
 for phrase in {goodbye\,,\ cruel\ ,world\n}; echo -n $phrase; end;
 
-# whitespace within entries converted to spaces in a single entry
-for foo in {a, hello
-world }
-	echo \'$foo\'
-end
-
 # dual expansion cartesian product
 echo { alpha, beta }\ {lambda, gamma }, |  string replace -r ',$' ''
 
diff --git a/tests/parameter_expansion.out b/tests/parameter_expansion.out
index d541621e0..4717848c7 100644
--- a/tests/parameter_expansion.out
+++ b/tests/parameter_expansion.out
@@ -6,8 +6,6 @@ apple orange banana
 'hello' 'world'
 good, beautiful morning
 goodbye, cruel world
-'a'
-'hello world'
 alpha lambda, beta lambda, alpha gamma, beta gamma
 Meg
 Jo
diff --git a/tests/test1.err b/tests/test1.err
index c425878af..ee269e5a2 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -2,9 +2,6 @@
 ####################
 # Comments in odd places don't cause problems
 
-####################
-# Brace expansion
-
 ####################
 # Escaped newlines
 
diff --git a/tests/test1.in b/tests/test1.in
index 6657a19eb..2d1b81009 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -11,21 +11,6 @@ for i in 1 2 # Comment on same line as command
 	end;
 end
 
-logmsg Brace expansion
-echo x-{1}
-echo x-{1,2}
-echo foo-{1,2{3,4}}
-
-echo foo-{} # literal "{}" expands to itself
-echo foo-{{},{}} # the inner "{}" expand to themselves, the outer pair expands normally.
-echo foo-{{a},{}} # also works with something in the braces.
-echo foo-{""} # still expands to foo-{}
-echo banana # just as a marker
-echo foo-{$undefinedvar} # still expands to nothing
-
-echo foo-{,,,} # four empty items in the braces.
-echo foo-{,\,,} # an empty item, a "," and an empty item.
-
 logmsg Escaped newlines
 echo foo\ bar
 echo foo\
diff --git a/tests/test1.out b/tests/test1.out
index 5868a7a02..7e01503c8 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -6,20 +6,6 @@
 2a
 2b
 
-####################
-# Brace expansion
-x-{1}
-x-1 x-2
-foo-1 foo-23 foo-24
-foo-{}
-foo-{} foo-{}
-foo-{a} foo-{}
-foo-{}
-banana
-
-foo- foo- foo- foo-
-foo- foo-, foo-
-
 ####################
 # Escaped newlines
 foo bar

From 9bf5dfd73884b9f1b5a1bd2a15200cc1a567dc3c Mon Sep 17 00:00:00 2001
From: Mahmoud Al-Qudsi <mqudsi@neosmart.net>
Date: Tue, 4 Feb 2020 18:12:02 -0600
Subject: [PATCH 1688/1732] Further enrich `cargo` completions

* Replace multiple calls to `tail` and `string` with a single `string
  replace` execution
* Dynamically generate list of available benches, bins, and tests for
  `--bench`, `--bin`, and `--test` switches

[ci skip]
---
 share/completions/cargo.fish | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index bd0736d4e..2f0114342 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -7,7 +7,7 @@ complete -c cargo -l list -d 'List installed commands'
 complete -c cargo -s v -l verbose -d 'Use verbose output'
 complete -c cargo -s q -l quiet -d 'No output printed to stdout'
 
-set __fish_cargo_subcommands (cargo --list | tail -n +2 | string trim | string replace -r '\s+' '\t')
+set __fish_cargo_subcommands (cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s+(.*)' '$1\t$2')
 
 complete -c cargo -f -c cargo -n '__fish_use_subcommand' -a '$__fish_cargo_subcommands'
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a '$__fish_cargo_subcommands'
@@ -28,13 +28,13 @@ for x in bench build clean doc run rustc test
 end
 
 for x in bench build rustc test
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -d 'Only the specified benchmark'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -a "(cargo bench --bench 2>&1 | string replace -rf '^\s+' '')"
     complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -d 'Only the specified test'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -a "(cargo test --test 2>&1 | string replace -rf '^\s+' '')"
 end
 
 for x in bench build run rustc test
-    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -a "(cargo run --bin 2>&1 | string replace -rf '^\s+' '')"
     complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -a "(cargo run --example 2>&1 | string replace -rf '^\s+' '')"
 end
 

From 057c3a9e7507e1363c5f88064a041bc725be2746 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 4 Feb 2020 16:09:56 -0800
Subject: [PATCH 1689/1732] Introduce fd_monitor

fd_monitor is a new class which can monitor a set of fds, waiting for them
to become readable. When an fd becomes readable, a callback is invoked.
Timeouts are also supported.

This is intended to replace the "bufferfill" threads. Rather than one
thread per bufferfill, we will have a single fd_monitor which can service
multiple bufferfills. This helps today with nested command substitutions,
and will help in the future with concurrent execution.
---
 CMakeLists.txt     |   2 +-
 src/fd_monitor.cpp | 193 +++++++++++++++++++++++++++++++++++++++++++++
 src/fd_monitor.h   | 104 ++++++++++++++++++++++++
 src/fish_tests.cpp | 103 ++++++++++++++++++++++++
 src/flog.h         |   1 +
 5 files changed, 402 insertions(+), 1 deletion(-)
 create mode 100644 src/fd_monitor.cpp
 create mode 100644 src/fd_monitor.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fdfe9eaf..6072dfe59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ SET(FISH_SRCS
     src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp src/wutil.cpp
     src/future_feature_flags.cpp src/redirection.cpp src/topic_monitor.cpp
     src/flog.cpp src/trace.cpp src/timer.cpp src/null_terminated_array.cpp
-    src/operation_context.cpp
+    src/operation_context.cpp src/fd_monitor.cpp
 )
 
 # Header files are just globbed.
diff --git a/src/fd_monitor.cpp b/src/fd_monitor.cpp
new file mode 100644
index 000000000..d02ebad1b
--- /dev/null
+++ b/src/fd_monitor.cpp
@@ -0,0 +1,193 @@
+// Support for monitoring a set of fds.
+#include "config.h"  // IWYU pragma: keep
+
+#include "fd_monitor.h"
+
+#include "flog.h"
+#include "io.h"
+#include "iothread.h"
+#include "wutil.h"
+
+static constexpr uint64_t kUsecPerMsec = 1000;
+static constexpr uint64_t kUsecPerSec = 1000 * kUsecPerMsec;
+
+fd_monitor_t::fd_monitor_t() {
+    auto self_pipe = make_autoclose_pipes({});
+    if (!self_pipe) {
+        DIE("Unable to create pipes");
+    }
+
+    // Ensure the write side is nonblocking to avoid deadlock.
+    notify_write_fd_ = std::move(self_pipe->write);
+    if (make_fd_nonblocking(notify_write_fd_.fd())) {
+        wperror(L"fcntl");
+    }
+
+    // Add an item for ourselves.
+    // We don't need to go through 'pending' because we have not yet launched the thread, and don't
+    // want to yet.
+    auto callback = [this](autoclose_fd_t &fd, bool timed_out) {
+        ASSERT_IS_BACKGROUND_THREAD();
+        assert(!timed_out && "Should not time out with kNoTimeout");
+        (void)timed_out;
+        // Read some to take data off of the notifier.
+        char buff[4096];
+        ssize_t amt = read(fd.fd(), buff, sizeof buff);
+        if (amt > 0) {
+            this->has_pending_ = true;
+        } else if (amt == 0) {
+            this->terminate_ = true;
+        } else {
+            wperror(L"read");
+        }
+    };
+    items_.push_back(fd_monitor_item_t(std::move(self_pipe->read), std::move(callback)));
+}
+
+// Extremely hacky destructor to clean up.
+// This is used in the tests to not leave stale fds around.
+// In fish shell, we never invoke the dtor so it doesn't matter that this is very dumb.
+fd_monitor_t::~fd_monitor_t() {
+    notify_write_fd_.close();
+    while (data_.acquire()->running) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(5));
+    }
+}
+
+void fd_monitor_t::add(fd_monitor_item_t &&item) {
+    assert(item.fd.valid() && "Invalid fd");
+    assert(item.timeout_usec != 0 && "Invalid timeout");
+    bool start_thread = add_pending_get_start_thread(std::move(item));
+    if (start_thread) {
+        void *(*trampoline)(void *) = [](void *self) -> void * {
+            static_cast<fd_monitor_t *>(self)->run_in_background();
+            return nullptr;
+        };
+        bool made_thread = make_detached_pthread(trampoline, this);
+        if (!made_thread) {
+            DIE("Unable to create a new pthread");
+        }
+    }
+    // Tickle our notifier.
+    char byte = 0;
+    (void)write_loop(notify_write_fd_.fd(), &byte, 1);
+}
+
+bool fd_monitor_t::add_pending_get_start_thread(fd_monitor_item_t &&item) {
+    auto data = data_.acquire();
+    data->pending.push_back(std::move(item));
+    if (!data->running) {
+        FLOG(fd_monitor, "Thread starting");
+        data->running = true;
+        return true;
+    }
+    return false;
+}
+
+// Given a usec count, populate and return a timeval.
+// If the usec count is kNoTimeout, return nullptr.
+static struct timeval *usec_to_tv_or_null(uint64_t usec, struct timeval *timeout) {
+    if (usec == fd_monitor_item_t::kNoTimeout) return nullptr;
+    timeout->tv_sec = usec / kUsecPerSec;
+    timeout->tv_usec = usec % kUsecPerSec;
+    return timeout;
+}
+
+uint64_t fd_monitor_item_t::usec_remaining(const time_point_t &now) const {
+    assert(last_time.has_value() && "Should always have a last_time");
+    if (timeout_usec == kNoTimeout) return kNoTimeout;
+    assert(now >= *last_time && "steady clock went backwards!");
+    uint64_t since = static_cast<uint64_t>(
+        std::chrono::duration_cast<std::chrono::microseconds>(now - *last_time).count());
+    return since >= timeout_usec ? 0 : timeout_usec - since;
+}
+
+bool fd_monitor_item_t::service_item(const fd_set *fds, const time_point_t &now) {
+    bool should_retain = true;
+    bool readable = FD_ISSET(fd.fd(), fds);
+    bool timed_out = !readable && usec_remaining(now) == 0;
+    if (readable || timed_out) {
+        last_time = now;
+        callback(fd, timed_out);
+        should_retain = fd.valid();
+    }
+    return should_retain;
+}
+
+void fd_monitor_t::run_in_background() {
+    ASSERT_IS_BACKGROUND_THREAD();
+    for (;;) {
+        uint64_t timeout_usec = fd_monitor_item_t::kNoTimeout;
+        int max_fd = -1;
+        fd_set fds;
+        FD_ZERO(&fds);
+        auto now = std::chrono::steady_clock::now();
+
+        for (auto &item : items_) {
+            FD_SET(item.fd.fd(), &fds);
+            if (!item.last_time.has_value()) item.last_time = now;
+            timeout_usec = std::min(timeout_usec, item.usec_remaining(now));
+            max_fd = std::max(max_fd, item.fd.fd());
+        }
+
+        // If we have only one item, it means that we are not actively monitoring any fds other than
+        // our self-pipe. In this case we wish to allow the thread to exit, but after a time, so we
+        // aren't spinning up and tearing down the thread repeatedly.
+        // Set a timeout of 16 msec; if nothing becomes readable by then we will exit.
+        // We refer to this as the wait-lap.
+        bool is_wait_lap = (items_.size() == 1);
+        if (is_wait_lap) {
+            assert(timeout_usec == fd_monitor_item_t::kNoTimeout &&
+                   "Should not have a timeout on wait-lap");
+            timeout_usec = 16 * kUsecPerMsec;
+        }
+
+        // Call select().
+        struct timeval tv;
+        int ret = select(max_fd + 1, &fds, nullptr, nullptr, usec_to_tv_or_null(timeout_usec, &tv));
+        if (ret < 0 && errno != EINTR) {
+            // Surprising error.
+            wperror(L"select");
+        }
+
+        // A predicate which services each item in turn, returning true if it should be removed.
+        auto servicer = [&fds, &now](fd_monitor_item_t &item) {
+            int fd = item.fd.fd();
+            bool remove = !item.service_item(&fds, now);
+            if (remove) FLOG(fd_monitor, "Removing fd", fd);
+            return remove;
+        };
+
+        // Service all items that are either readable or timed our, and remove any which say to do
+        // so.
+        now = std::chrono::steady_clock::now();
+        items_.erase(std::remove_if(items_.begin(), items_.end(), servicer), items_.end());
+
+        if (terminate_) {
+            // Time to go.
+            data_.acquire()->running = false;
+            return;
+        }
+
+        // Maybe we got some new items. Check if our callback says so, or if this is the wait
+        // lap, in which case we might want to commit to exiting.
+        if (has_pending_ || is_wait_lap) {
+            auto data = data_.acquire();
+            // Move from 'pending' to 'items'.
+            items_.insert(items_.end(), std::make_move_iterator(data->pending.begin()),
+                          std::make_move_iterator(data->pending.end()));
+            data->pending.clear();
+            has_pending_ = false;
+
+            if (is_wait_lap && items_.size() == 1) {
+                // We had no items, waited a bit, and still have no items. We're going to shut down.
+                // It's important to do this while holding the lock, otherwise we race with new
+                // items being added.
+                assert(data->running && "Thread should be running because we're that thread");
+                FLOG(fd_monitor, "Thread exiting");
+                data->running = false;
+                return;
+            }
+        }
+    }
+}
diff --git a/src/fd_monitor.h b/src/fd_monitor.h
new file mode 100644
index 000000000..82a5c51c0
--- /dev/null
+++ b/src/fd_monitor.h
@@ -0,0 +1,104 @@
+#ifndef FISH_FD_MONITOR_H
+#define FISH_FD_MONITOR_H
+
+#include <chrono>
+#include <cstdint>
+#include <functional>
+
+#include "common.h"
+#include "maybe.h"
+
+class fd_monitor_t;
+
+/// An item containing an fd and callback, which can be monitored to watch when it becomes readable,
+/// and invoke the callback.
+struct fd_monitor_item_t {
+    friend class fd_monitor_t;
+
+    /// The callback type for the item.
+    /// It will be invoked when either \p fd is readable, or if the timeout was hit.
+    using callback_t = std::function<void(autoclose_fd_t &fd, bool timed_out)>;
+
+    /// A sentinel value meaning no timeout.
+    static constexpr uint64_t kNoTimeout = std::numeric_limits<uint64_t>::max();
+
+    /// The fd to monitor.
+    autoclose_fd_t fd{};
+
+    /// A callback to be invoked when the fd is readable, or when we are timed out.
+    /// If we time out, then timed_out will be true.
+    /// If the fd is invalid on return from the function, then the item is removed.
+    callback_t callback{};
+
+    /// The timeout in microseconds, or kNoTimeout for none.
+    /// 0 timeouts are unsupported.
+    uint64_t timeout_usec{kNoTimeout};
+
+    /// Construct from a file, callback, and optional timeout.
+    fd_monitor_item_t(autoclose_fd_t fd, callback_t callback, uint64_t timeout_usec = kNoTimeout)
+        : fd(std::move(fd)), callback(std::move(callback)), timeout_usec(timeout_usec) {
+        assert(timeout_usec > 0 && "Invalid timeout");
+    }
+
+    fd_monitor_item_t() = default;
+
+   private:
+    // Fields and methods for the private use of fd_monitor_t.
+    using time_point_t = std::chrono::time_point<std::chrono::steady_clock>;
+
+    // The last time we were called, or the initialization point.
+    maybe_t<time_point_t> last_time{};
+
+    // \return the number of microseconds until the timeout should trigger, or kNoTimeout for none.
+    // A 0 return means we are at or past the timeout.
+    uint64_t usec_remaining(const time_point_t &now) const;
+
+    // Invoke this item's callback if its value is set in fd or has timed out.
+    // \return true to retain the item, false to remove it.
+    bool service_item(const fd_set *fds, const time_point_t &now);
+};
+
+/// A class which can monitor a set of fds, invoking a callback when any becomes readable, or when
+/// per-item-configurable timeouts are hit.
+class fd_monitor_t {
+   public:
+    using item_list_t = std::vector<fd_monitor_item_t>;
+
+    fd_monitor_t();
+    ~fd_monitor_t();
+
+    /// Add an item to monitor.
+    void add(fd_monitor_item_t &&item);
+
+   private:
+    // The background thread runner.
+    void run_in_background();
+
+    // Add a pending item, marking the thread as running.
+    // \return true if we should start the thread.
+    bool add_pending_get_start_thread(fd_monitor_item_t &&item);
+
+    // The list of items to monitor. This is only accessed on the background thread.
+    item_list_t items_{};
+
+    // Set to true by the background thread when our self-pipe becomes readable.
+    bool has_pending_{false};
+
+    // Latched to true by the background thread if our self-pipe is closed, which indicates we are
+    // in the destructor and so should terminate.
+    bool terminate_{false};
+
+    struct data_t {
+        /// Pending items.
+        item_list_t pending{};
+
+        /// Whether the thread is running.
+        bool running{false};
+    };
+    owning_lock<data_t> data_;
+
+    /// The write end of our self-pipe.
+    autoclose_fd_t notify_write_fd_{};
+};
+
+#endif
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 2c3236983..4bc6b55ec 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -49,6 +49,7 @@
 #include "event.h"
 #include "expand.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "fd_monitor.h"
 #include "function.h"
 #include "future_feature_flags.h"
 #include "highlight.h"
@@ -742,6 +743,107 @@ static int test_iothread_thread_call(std::atomic<int> *addr) {
     return after;
 }
 
+static void test_fd_monitor() {
+    say(L"Testing fd_monitor");
+
+    // Helper to make an item which counts how many times its callback is invoked.
+    struct item_maker_t {
+        std::atomic<bool> did_timeout{false};
+        std::atomic<size_t> length_read{0};
+        std::atomic<size_t> total_calls{0};
+        bool always_exit{false};
+        fd_monitor_item_t item;
+        autoclose_fd_t writer;
+
+        explicit item_maker_t(uint64_t timeout_usec) {
+            auto pipes = make_autoclose_pipes({}).acquire();
+            writer = std::move(pipes.write);
+            auto callback = [this](autoclose_fd_t &fd, bool timed_out) {
+                bool was_closed = false;
+                if (timed_out) {
+                    this->did_timeout = true;
+                } else {
+                    char buff[4096];
+                    ssize_t amt = read(fd.fd(), buff, sizeof buff);
+                    length_read += amt;
+                    was_closed = (amt == 0);
+                }
+                total_calls += 1;
+                if (always_exit || was_closed) {
+                    fd.close();
+                }
+            };
+            item = fd_monitor_item_t(std::move(pipes.read), std::move(callback), timeout_usec);
+        }
+
+        item_maker_t(const item_maker_t &) = delete;
+
+        // Write 42 bytes to our write end.
+        void write42() {
+            char buff[42] = {0};
+            (void)write_loop(writer.fd(), buff, sizeof buff);
+        }
+    };
+
+    constexpr uint64_t usec_per_msec = 1000;
+
+    // Items which will never receive data or be called back.
+    item_maker_t item_never(fd_monitor_item_t::kNoTimeout);
+    item_maker_t item_hugetimeout(100000000llu * usec_per_msec);
+
+    // Item which should get no data, and time out.
+    item_maker_t item0_timeout(16 * usec_per_msec);
+
+    // Item which should get exactly 42 bytes, then time out.
+    item_maker_t item42_timeout(16 * usec_per_msec);
+
+    // Item which should get exactly 42 bytes, and not time out.
+    item_maker_t item42_nottimeout(fd_monitor_item_t::kNoTimeout);
+
+    // Item which should get 42 bytes, then get notified it is closed.
+    item_maker_t item42_thenclose(16 * usec_per_msec);
+
+    // Item which should be called back once.
+    item_maker_t item_oneshot(16 * usec_per_msec);
+    item_oneshot.always_exit = true;
+    {
+        fd_monitor_t monitor;
+        for (auto *item : {&item_never, &item_hugetimeout, &item0_timeout, &item42_timeout,
+                           &item42_nottimeout, &item42_thenclose, &item_oneshot}) {
+            monitor.add(std::move(item->item));
+        }
+        item42_timeout.write42();
+        item42_nottimeout.write42();
+        item42_thenclose.write42();
+        item42_thenclose.writer.close();
+        item_oneshot.write42();
+        std::this_thread::sleep_for(std::chrono::milliseconds(84));
+    }
+
+    do_test(!item_never.did_timeout);
+    do_test(item_never.length_read == 0);
+
+    do_test(!item_hugetimeout.did_timeout);
+    do_test(item_hugetimeout.length_read == 0);
+
+    do_test(item0_timeout.length_read == 0);
+    do_test(item0_timeout.did_timeout);
+
+    do_test(item42_timeout.length_read == 42);
+    do_test(item42_timeout.did_timeout);
+
+    do_test(item42_nottimeout.length_read == 42);
+    do_test(!item42_nottimeout.did_timeout);
+
+    do_test(item42_thenclose.did_timeout == false);
+    do_test(item42_thenclose.length_read == 42);
+    do_test(item42_thenclose.total_calls == 2);
+
+    do_test(!item_oneshot.did_timeout);
+    do_test(item_oneshot.length_read == 42);
+    do_test(item_oneshot.total_calls == 1);
+}
+
 static void test_iothread() {
     say(L"Testing iothreads");
     std::unique_ptr<std::atomic<int>> int_ptr = make_unique<std::atomic<int>>(0);
@@ -5447,6 +5549,7 @@ int main(int argc, char **argv) {
     if (should_test_function("convert")) test_convert();
     if (should_test_function("convert_nulls")) test_convert_nulls();
     if (should_test_function("tokenizer")) test_tokenizer();
+    if (should_test_function("fd_monitor")) test_fd_monitor();
     if (should_test_function("iothread")) test_iothread();
     if (should_test_function("pthread")) test_pthread();
     if (should_test_function("parser")) test_parser();
diff --git a/src/flog.h b/src/flog.h
index 5919e6c3a..f726284c6 100644
--- a/src/flog.h
+++ b/src/flog.h
@@ -94,6 +94,7 @@ class category_list_t {
     category_t profile_history{L"profile-history", L"History performance measurements"};
 
     category_t iothread{L"iothread", L"Background IO thread events"};
+    category_t fd_monitor{L"fd-monitor", L"FD monitor events"};
 
     category_t term_support{L"term-support", L"Terminal feature detection"};
 

From a765026c4c31c49efd0f7f2f4611c5fde6fc5d9d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 4 Feb 2020 17:49:07 -0800
Subject: [PATCH 1690/1732] Adopt fd_monitor in bufferfill

This switches bufferfills from using an exclusively-owned thread, to
sharing an fd_monitor. This allows multiple bufferfills to all use the same
thread.
---
 src/io.cpp | 165 +++++++++++++++++++++++++----------------------------
 src/io.h   |   9 +--
 2 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/src/io.cpp b/src/io.cpp
index 22bf1dd7c..42fabfd46 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -15,6 +15,7 @@
 #include "common.h"
 #include "exec.h"
 #include "fallback.h"  // IWYU pragma: keep
+#include "fd_monitor.h"
 #include "iothread.h"
 #include "path.h"
 #include "redirection.h"
@@ -27,6 +28,13 @@
 /// Base open mode to pass to calls to open.
 #define OPEN_MASK 0666
 
+/// Provide the fd monitor used for background fillthread operations.
+static fd_monitor_t &fd_monitor() {
+    // Deliberately leaked to avoid shutdown dtors.
+    static fd_monitor_t *fdm = new fd_monitor_t();
+    return *fdm;
+}
+
 io_data_t::~io_data_t() = default;
 io_pipe_t::~io_pipe_t() = default;
 io_fd_t::~io_fd_t() = default;
@@ -58,94 +66,43 @@ void io_buffer_t::append_from_stream(const output_stream_t &stream) {
     buffer_.append_wide_buffer(input);
 }
 
-void io_buffer_t::run_background_fillthread(autoclose_fd_t readfd) {
-    // Here we are running the background fillthread, executing in a background thread.
-    // Our plan is:
-    // 1. poll via select() until the fd is readable.
-    // 2. Acquire the append lock.
-    // 3. read until EAGAIN (would block), appending
-    // 4. release the lock
-    // The purpose of holding the lock around the read calls is to ensure that data from background
-    // processes isn't weirdly interspersed with data directly transferred (from a builtin to a
-    // buffer).
+ssize_t io_buffer_t::read_once(int fd) {
+    assert(fd >= 0 && "Invalid fd");
+    ASSERT_IS_LOCKED(append_lock_);
+    errno = 0;
+    char buff[4096 * 4];
 
-    const int fd = readfd.fd();
-
-    // 100 msec poll rate. Note that in most cases, the write end of the pipe will be closed so
-    // select() will return; the polling is important only for weird cases like a background process
-    // launched in a command substitution.
-    const long poll_timeout_usec = 100000;
-    struct timeval tv = {};
-    tv.tv_usec = poll_timeout_usec;
-
-    bool shutdown = false;
-    while (!shutdown) {
-        bool readable = false;
-
-        // Poll if our fd is readable.
-        // Do this even if the shutdown flag is set. It's important we wait for the fd at least
-        // once. For short-lived processes, it's possible for the process to execute, produce output
-        // (fits in the pipe buffer) and be reaped before we are even scheduled. So always wait at
-        // least once on the fd. Note that doesn't mean we will wait for the full poll duration;
-        // typically what will happen is our pipe will be widowed and so this will return quickly.
-        // It's only for weird cases (e.g. a background process launched inside a command
-        // substitution) that we'll wait out the entire poll time.
-        fd_set fds;
-        FD_ZERO(&fds);
-        FD_SET(fd, &fds);
-        int ret = select(fd + 1, &fds, nullptr, nullptr, &tv);
-        // select(2) is allowed to (and does) update `tv` to indicate how much time was left, so we
-        // need to restore the desired value each time.
-        tv.tv_usec = poll_timeout_usec;
-        readable = ret > 0;
-        if (ret < 0 && errno != EINTR) {
-            // Surprising error.
-            wperror(L"select");
-            return;
-        }
-
-        // Only check the shutdown flag if we timed out.
-        // It's important that if select() indicated we were readable, that we call select() again
-        // allowing it to time out. Note the typical case is that the fd will be closed, in which
-        // case select will return immediately.
-        if (!readable) {
-            shutdown = this->shutdown_fillthread_;
-        }
-
-        if (readable || shutdown) {
-            // Now either our fd is readable, or we have set the shutdown flag.
-            // Either way acquire the lock and read until we reach EOF, or EAGAIN / EINTR.
-            scoped_lock locker(append_lock_);
-            ssize_t ret;
-            do {
-                errno = 0;
-                char buff[4096];
-                ret = read(fd, buff, sizeof buff);
-                if (ret > 0) {
-                    buffer_.append(&buff[0], &buff[ret]);
-                } else if (ret == 0) {
-                    shutdown = true;
-                } else if (ret == -1 && errno == 0) {
-                    // No specific error. We assume we just return,
-                    // since that's what we do in read_blocked.
-                    return;
-                } else if (errno != EINTR && errno != EAGAIN) {
-                    wperror(L"read");
-                    return;
-                }
-            } while (ret > 0);
-        }
+    // We want to swallow EINTR only; in particular EAGAIN needs to be returned back to the caller.
+    ssize_t ret;
+    do {
+        ret = read(fd, buff, sizeof buff);
+    } while (ret < 0 && errno == EINTR);
+    if (ret < 0 && errno != EAGAIN) {
+        wperror(L"read");
+    } else if (ret > 0) {
+        buffer_.append(&buff[0], &buff[ret]);
     }
-    assert(shutdown && "Should only exit loop if shutdown flag is set");
+    return ret;
 }
 
-void io_buffer_t::begin_background_fillthread(autoclose_fd_t fd) {
+void io_buffer_t::begin_filling(autoclose_fd_t fd) {
     ASSERT_IS_MAIN_THREAD();
     assert(!fillthread_running() && "Already have a fillthread");
 
-    // We want our background thread to own the fd but it's not easy to move into a std::function.
-    // Use a shared_ptr.
-    auto fdref = move_to_sharedptr(std::move(fd));
+    // We want to fill buffer_ by reading from fd. fd is the read end of a pipe; the write end is
+    // owned by another process, or something else writing in fish.
+    // Pass fd to an fd_monitor. It will add fd to its select() loop, and give us a callback when
+    // the fd is readable, or when our timeout is hit. The usual path is that we will get called
+    // back, read a bit from the fd, and append it to the buffer. Eventually the write end of the
+    // pipe will be closed - probably the other process exited - and fd will be widowed; read() will
+    // then return 0 and we will stop reading.
+    // In exotic circumstances the write end of the pipe will not be closed; this may happen in
+    // e.g.:
+    //   cmd ( background & ; echo hi )
+    // Here the background process will inherit the write end of the pipe and hold onto it forever.
+    // In this case, we will hit the timeout on waiting for more data and notice that the shutdown
+    // flag is set (this indicates that the command substitution is done); in this case we will read
+    // until we get EAGAIN and then give up.
 
     // Construct a promise that can go into our background thread.
     auto promise = std::make_shared<std::promise<void>>();
@@ -154,13 +111,45 @@ void io_buffer_t::begin_background_fillthread(autoclose_fd_t fd) {
     // Note this should only ever be called once.
     fillthread_waiter_ = promise->get_future();
 
+    // 100 msec poll rate. Note that in most cases, the write end of the pipe will be closed so
+    // select() will return; the polling is important only for weird cases like a background process
+    // launched in a command substitution.
+    constexpr uint64_t usec_per_msec = 1000;
+    uint64_t poll_usec = 100 * usec_per_msec;
+
     // Run our function to read until the receiver is closed.
-    // It's OK to capture 'this' by value because 'this' owns the background thread and waits for it
-    // before dtor.
-    iothread_perform_cantwait([this, promise, fdref]() {
-        this->run_background_fillthread(std::move(*fdref));
-        promise->set_value();
-    });
+    // It's OK to capture 'this' by value because 'this' waits for the promise in its dtor.
+    fd_monitor_item_t item;
+    item.fd = std::move(fd);
+    item.timeout_usec = poll_usec;
+    item.callback = [this, promise](autoclose_fd_t &fd, bool timed_out) {
+        ASSERT_IS_BACKGROUND_THREAD();
+        // Only check the shutdown flag if we timed out.
+        // It's important that if select() indicated we were readable, that we call select() again
+        // allowing it to time out. Note the typical case is that the fd will be closed, in which
+        // case select will return immediately.
+        bool done = false;
+        if (!timed_out) {
+            // select() reported us as readable; read a bit.
+            scoped_lock locker(append_lock_);
+            ssize_t ret = read_once(fd.fd());
+            done = (ret == 0 || (ret < 0 && errno != EAGAIN));
+        } else if (shutdown_fillthread_) {
+            // Here our caller asked us to shut down; read while we keep getting data.
+            // This will stop when the fd is closed or if we get EAGAIN.
+            scoped_lock locker(append_lock_);
+            ssize_t ret;
+            do {
+                ret = read_once(fd.fd());
+            } while (ret > 0);
+            done = true;
+        }
+        if (done) {
+            fd.close();
+            promise->set_value();
+        }
+    };
+    fd_monitor().add(std::move(item));
 }
 
 void io_buffer_t::complete_background_fillthread() {
@@ -191,7 +180,7 @@ shared_ptr<io_bufferfill_t> io_bufferfill_t::create(const fd_set_t &conflicts,
     }
     // Our fillthread gets the read end of the pipe; out_pipe gets the write end.
     auto buffer = std::make_shared<io_buffer_t>(buffer_limit);
-    buffer->begin_background_fillthread(std::move(pipes->read));
+    buffer->begin_filling(std::move(pipes->read));
     return std::make_shared<io_bufferfill_t>(std::move(pipes->write), buffer);
 }
 
diff --git a/src/io.h b/src/io.h
index f88e88862..951271c14 100644
--- a/src/io.h
+++ b/src/io.h
@@ -308,11 +308,12 @@ class io_buffer_t {
     /// Lock for appending.
     std::mutex append_lock_{};
 
-    /// Called in the background thread to run it.
-    void run_background_fillthread(autoclose_fd_t readfd);
+    /// Read a bit, filling the buffer. The append lock must be held.
+    /// \return positive on success, 0 if closed, -1 on error (in which case errno will be set).
+    ssize_t read_once(int fd);
 
-    /// Begin the background fillthread operation, reading from the given fd.
-    void begin_background_fillthread(autoclose_fd_t readfd);
+    /// Begin the fill operation, reading from the given fd in the background.
+    void begin_filling(autoclose_fd_t readfd);
 
     /// End the background fillthread operation.
     void complete_background_fillthread();

From 14c6a12782e890d2c53b949a654e5c28fb2be02a Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 4 Feb 2020 12:47:44 +0100
Subject: [PATCH 1691/1732] Use accessor functions for
 editable_line_t::{text,position}

This is paving the way for undo, where we want to have one central place
for modifying an editable_line_t.
---
 src/pager.cpp  |  10 +-
 src/reader.cpp | 241 +++++++++++++++++++++++++------------------------
 src/reader.h   |  27 ++++--
 3 files changed, 143 insertions(+), 135 deletions(-)

diff --git a/src/pager.cpp b/src/pager.cpp
index 4c6d4219f..c8a0622b6 100644
--- a/src/pager.cpp
+++ b/src/pager.cpp
@@ -347,7 +347,7 @@ bool pager_t::completion_info_passes_filter(const comp_t &info) const {
     // If we have no filter, everything passes.
     if (!search_field_shown || this->search_field_line.empty()) return true;
 
-    const wcstring &needle = this->search_field_line.text;
+    const wcstring &needle = this->search_field_line.text();
 
     // We do full fuzzy matching just like the completion code itself.
     const fuzzy_match_type_t limit = fuzzy_match_none;
@@ -515,7 +515,7 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
     }
 
     // Add the search field.
-    wcstring search_field_text = search_field_line.text;
+    wcstring search_field_text = search_field_line.text();
     // Append spaces to make it at least the required width.
     if (search_field_text.size() < PAGER_SEARCH_FIELD_WIDTH) {
         search_field_text.append(PAGER_SEARCH_FIELD_WIDTH - search_field_text.size(), L' ');
@@ -581,8 +581,8 @@ void pager_t::update_rendering(page_rendering_t *rendering) const {
         rendering->selected_completion_idx !=
             this->visual_selected_completion_index(rendering->rows, rendering->cols) ||
         rendering->search_field_shown != this->search_field_shown ||
-        rendering->search_field_line.text != this->search_field_line.text ||
-        rendering->search_field_line.position != this->search_field_line.position ||
+        rendering->search_field_line.text() != this->search_field_line.text() ||
+        rendering->search_field_line.position() != this->search_field_line.position() ||
         (rendering->remaining_to_disclose > 0 && this->fully_disclosed)) {
         *rendering = this->render();
     }
@@ -848,7 +848,7 @@ void pager_t::set_search_field_shown(bool flag) { this->search_field_shown = fla
 bool pager_t::is_search_field_shown() const { return this->search_field_shown; }
 
 size_t pager_t::cursor_position() const {
-    size_t result = std::wcslen(SEARCH_FIELD_PROMPT) + this->search_field_line.position;
+    size_t result = std::wcslen(SEARCH_FIELD_PROMPT) + this->search_field_line.position();
     // Clamp it to the right edge.
     if (available_term_width > 0 && result + 1 > available_term_width) {
         result = available_term_width - 1;
diff --git a/src/reader.cpp b/src/reader.cpp
index 42203746a..5cbe9fa22 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -150,8 +150,8 @@ void editable_line_t::insert_string(const wcstring &str, size_t start, size_t le
 
     start = std::min(start, string_length);      //!OCLINT(parameter reassignment)
     len = std::min(len, string_length - start);  //!OCLINT(parameter reassignment)
-    this->text.insert(this->position, str, start, len);
-    this->position += len;
+    this->text().insert(this->position(), str, start, len);
+    this->position() += len;
 }
 
 namespace {
@@ -598,7 +598,7 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
 
 /// Update the cursor position.
 void reader_data_t::update_buff_pos(editable_line_t *el, size_t buff_pos) {
-    el->position = buff_pos;
+    el->position() = buff_pos;
     if (el == &command_line && sel_active) {
         if (sel_begin_pos <= buff_pos) {
             sel_start_pos = sel_begin_pos;
@@ -615,14 +615,14 @@ void reader_data_t::update_buff_pos(editable_line_t *el, size_t buff_pos) {
 void reader_data_t::repaint() {
     editable_line_t *cmd_line = &command_line;
     // Update the indentation.
-    indents = parse_util_compute_indents(cmd_line->text);
+    indents = parse_util_compute_indents(cmd_line->text());
 
     wcstring full_line;
     if (silent) {
-        full_line = wcstring(cmd_line->text.length(), get_obfuscation_read_char());
+        full_line = wcstring(cmd_line->text().length(), get_obfuscation_read_char());
     } else {
         // Combine the command and autosuggestion into one string.
-        full_line = combine_command_and_autosuggestion(cmd_line->text, autosuggestion);
+        full_line = combine_command_and_autosuggestion(cmd_line->text(), autosuggestion);
     }
 
     size_t len = full_line.size();
@@ -650,7 +650,7 @@ void reader_data_t::repaint() {
     pager.update_rendering(&current_page_rendering);
 
     bool focused_on_pager = active_edit_line() == &pager.search_field_line;
-    size_t cursor_position = focused_on_pager ? pager.cursor_position() : cmd_line->position;
+    size_t cursor_position = focused_on_pager ? pager.cursor_position() : cmd_line->position();
 
     // Prepend the mode prompt to the left prompt.
     s_write(&screen, mode_prompt_buff + left_prompt_buff, right_prompt_buff, full_line,
@@ -662,7 +662,7 @@ void reader_data_t::repaint() {
 
 /// Internal helper function for handling killing parts of text.
 void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, int mode, int newv) {
-    const wchar_t *begin = el->text.c_str() + begin_idx;
+    const wchar_t *begin = el->text().c_str() + begin_idx;
     if (newv) {
         kill_item = wcstring(begin, length);
         kill_add(kill_item);
@@ -678,14 +678,14 @@ void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, i
         kill_replace(old, kill_item);
     }
 
-    if (el->position > begin_idx) {
+    if (el->position() > begin_idx) {
         // Move the buff position back by the number of characters we deleted, but don't go past
         // buff_pos.
-        size_t backtrack = std::min(el->position - begin_idx, length);
-        update_buff_pos(el, el->position - backtrack);
+        size_t backtrack = std::min(el->position() - begin_idx, length);
+        update_buff_pos(el, el->position() - backtrack);
     }
 
-    el->text.erase(begin_idx, length);
+    el->text().erase(begin_idx, length);
     command_line_changed(el);
 
     super_highlight_me_plenty();
@@ -815,15 +815,15 @@ bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) {
 
     if (expand_abbreviations && el == &command_line) {
         // Try expanding abbreviations.
-        size_t cursor_pos = el->position - std::min(el->position, cursor_backtrack);
+        size_t cursor_pos = el->position() - std::min(el->position(), cursor_backtrack);
 
         if (auto new_cmdline =
-                reader_expand_abbreviation_in_command(el->text, cursor_pos, vars())) {
+                reader_expand_abbreviation_in_command(el->text(), cursor_pos, vars())) {
             // We expanded an abbreviation! The cursor moves by the difference in the command line
             // lengths.
-            size_t new_buff_pos = el->position + new_cmdline->size() - el->text.size();
+            size_t new_buff_pos = el->position() + new_cmdline->size() - el->text().size();
 
-            el->text = std::move(*new_cmdline);
+            el->text() = std::move(*new_cmdline);
             update_buff_pos(el, new_buff_pos);
             command_line_changed(el);
             result = true;
@@ -1096,16 +1096,16 @@ static bool command_ends_history_search(readline_cmd_t c) {
 void reader_data_t::remove_backward() {
     editable_line_t *el = active_edit_line();
 
-    if (el->position <= 0) return;
+    if (el->position() <= 0) return;
 
     // Fake composed character sequences by continuing to delete until we delete a character of
     // width at least 1.
     int width;
     do {
-        update_buff_pos(el, el->position - 1);
-        width = fish_wcwidth(el->text.at(el->position));
-        el->text.erase(el->position, 1);
-    } while (width == 0 && el->position > 0);
+        update_buff_pos(el, el->position() - 1);
+        width = fish_wcwidth(el->text().at(el->position()));
+        el->text().erase(el->position(), 1);
+    } while (width == 0 && el->position() > 0);
     command_line_changed(el);
     suppress_autosuggestion = true;
 
@@ -1120,7 +1120,7 @@ bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
     if (str.empty()) return false;
 
     el->insert_string(str, 0, str.size());
-    update_buff_pos(el, el->position);
+    update_buff_pos(el, el->position());
     command_line_changed(el);
 
     if (el == &command_line) {
@@ -1128,7 +1128,7 @@ bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
 
         // Syntax highlight. Note we must have that buff_pos > 0 because we just added something
         // nonzero to its length.
-        assert(el->position > 0);
+        assert(el->position() > 0);
         super_highlight_me_plenty(-1);
     }
 
@@ -1261,12 +1261,12 @@ void reader_data_t::completion_insert(const wchar_t *val, size_t token_end,
     editable_line_t *el = active_edit_line();
 
     // Move the cursor to the end of the token.
-    if (el->position != token_end) {
+    if (el->position() != token_end) {
         update_buff_pos(el, token_end);  // repaint() is done later
     }
 
-    size_t cursor = el->position;
-    wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text, &cursor,
+    size_t cursor = el->position();
+    wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text(), &cursor,
                                                                  false /* not append only */);
     set_buffer_maintaining_pager(new_command_line, cursor);
 }
@@ -1343,13 +1343,13 @@ bool reader_data_t::can_autosuggest() const {
     const editable_line_t *el = active_edit_line();
     const wchar_t *whitespace = L" \t\r\n\v";
     return allow_autosuggestion && !suppress_autosuggestion && history_search.is_at_end() &&
-           el == &command_line && el->text.find_first_not_of(whitespace) != wcstring::npos;
+           el == &command_line && el->text().find_first_not_of(whitespace) != wcstring::npos;
 }
 
 // Called after an autosuggestion has been computed on a background thread
 void reader_data_t::autosuggest_completed(autosuggestion_result_t result) {
     if (!result.suggestion.empty() && can_autosuggest() &&
-        result.search_string == command_line.text &&
+        result.search_string == command_line.text() &&
         string_prefixes_string_case_insensitive(result.search_string, result.suggestion)) {
         // Autosuggestion is active and the search term has not changed, so we're good to go.
         autosuggestion = std::move(result.suggestion);
@@ -1364,7 +1364,8 @@ void reader_data_t::update_autosuggestion() {
     autosuggestion.clear();
     if (can_autosuggest()) {
         const editable_line_t *el = active_edit_line();
-        auto performer = get_autosuggestion_performer(parser(), el->text, el->position, history);
+        auto performer =
+            get_autosuggestion_performer(parser(), el->text(), el->position(), history);
         auto shared_this = this->shared_from_this();
         iothread_perform(performer, [shared_this](autosuggestion_result_t result) {
             shared_this->autosuggest_completed(std::move(result));
@@ -1382,14 +1383,14 @@ void reader_data_t::accept_autosuggestion(bool full, move_word_style_t style) {
         // Accept the autosuggestion.
         if (full) {
             // Just take the whole thing.
-            command_line.text = autosuggestion;
+            command_line.text() = autosuggestion;
         } else {
             // Accept characters according to the specified style.
             move_word_state_machine_t state(style);
             for (size_t idx = command_line.size(); idx < autosuggestion.size(); idx++) {
                 wchar_t wc = autosuggestion.at(idx);
                 if (!state.consume_char(wc)) break;
-                command_line.text.push_back(wc);
+                command_line.text().push_back(wc);
             }
         }
         update_buff_pos(&command_line, command_line.size());
@@ -1418,7 +1419,7 @@ void reader_data_t::select_completion_in_direction(selection_motion_t dir) {
 void reader_data_t::flash() {
     struct timespec pollint;
     editable_line_t *el = &command_line;
-    for (size_t i = 0; i < el->position; i++) {
+    for (size_t i = 0; i < el->position(); i++) {
         colors.at(i) = highlight_spec_t::make_background(highlight_role_t::search_match);
     }
 
@@ -1500,7 +1501,7 @@ bool reader_data_t::handle_completions(const completion_list_t &comp, size_t tok
     bool success = false;
     const editable_line_t *el = &command_line;
 
-    const wcstring tok(el->text.c_str() + token_begin, token_end - token_begin);
+    const wcstring tok(el->text().c_str() + token_begin, token_end - token_begin);
 
     // Check trivial cases.
     size_t size = comp.size();
@@ -1825,7 +1826,7 @@ static void reader_interactive_destroy() {
 }
 
 void reader_data_t::sanity_check() const {
-    if (command_line.position > command_line.size()) sanity_lose();
+    if (command_line.position() > command_line.size()) sanity_lose();
     if (colors.size() != command_line.size()) sanity_lose();
     if (indents.size() != command_line.size()) sanity_lose();
 }
@@ -1833,7 +1834,7 @@ void reader_data_t::sanity_check() const {
 /// Set the specified string as the current buffer.
 void reader_data_t::set_command_line_and_position(editable_line_t *el, const wcstring &new_str,
                                                   size_t pos) {
-    el->text = new_str;
+    el->text() = new_str;
     update_buff_pos(el, pos);
     command_line_changed(el);
     super_highlight_me_plenty();
@@ -1846,8 +1847,8 @@ void reader_data_t::replace_current_token(const wcstring &new_token) {
 
     // Find current token.
     editable_line_t *el = active_edit_line();
-    const wchar_t *buff = el->text.c_str();
-    parse_util_token_extent(buff, el->position, &begin, &end, nullptr, nullptr);
+    const wchar_t *buff = el->text().c_str();
+    parse_util_token_extent(buff, el->position(), &begin, &end, nullptr, nullptr);
 
     if (!begin || !end) return;
 
@@ -1883,14 +1884,14 @@ void reader_data_t::move_word(editable_line_t *el, bool move_right, bool erase,
                               enum move_word_style_t style, bool newv) {
     // Return if we are already at the edge.
     const size_t boundary = move_right ? el->size() : 0;
-    if (el->position == boundary) return;
+    if (el->position() == boundary) return;
 
     // When moving left, a value of 1 means the character at index 0.
     move_word_state_machine_t state(style);
-    const wchar_t *const command_line = el->text.c_str();
-    const size_t start_buff_pos = el->position;
+    const wchar_t *const command_line = el->text().c_str();
+    const size_t start_buff_pos = el->position();
 
-    size_t buff_pos = el->position;
+    size_t buff_pos = el->position();
     while (buff_pos != boundary) {
         size_t idx = (move_right ? buff_pos : buff_pos - 1);
         wchar_t c = command_line[idx];
@@ -1925,7 +1926,7 @@ void reader_data_t::set_buffer_maintaining_pager(const wcstring &b, size_t pos)
     // Callers like to pass us pointers into ourselves, so be careful! I don't know if we can use
     // operator= with a pointer to our interior, so use an intermediate.
     size_t command_line_len = b.size();
-    command_line.text = b;
+    command_line.text() = b;
     command_line_changed(&command_line);
 
     // Don't set a position past the command line length.
@@ -2015,7 +2016,7 @@ void reader_data_t::highlight_search() {
     }
     const wcstring &needle = history_search.search_string();
     const editable_line_t *el = &command_line;
-    size_t match_pos = el->text.find(needle);
+    size_t match_pos = el->text().find(needle);
     if (match_pos != wcstring::npos) {
         size_t end = match_pos + needle.size();
         for (size_t i = match_pos; i < end; i++) {
@@ -2026,7 +2027,7 @@ void reader_data_t::highlight_search() {
 
 void reader_data_t::highlight_complete(highlight_result_t result) {
     ASSERT_IS_MAIN_THREAD();
-    if (result.text == command_line.text) {
+    if (result.text == command_line.text()) {
         // The data hasn't changed, so swap in our colors. The colors may not have changed, so do
         // nothing if they have not.
         assert(result.colors.size() == command_line.size());
@@ -2066,13 +2067,13 @@ static std::function<highlight_result_t(void)> get_highlight_performer(
 void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bool no_io) {
     const editable_line_t *el = &command_line;
     assert(el != nullptr);
-    long match_highlight_pos = static_cast<long>(el->position) + match_highlight_pos_adjust;
+    long match_highlight_pos = static_cast<long>(el->position()) + match_highlight_pos_adjust;
     assert(match_highlight_pos >= 0);
 
     sanity_check();
 
     auto highlight_performer = get_highlight_performer(
-        parser(), el->text, match_highlight_pos, no_io ? highlight_shell_no_io : highlight_func);
+        parser(), el->text(), match_highlight_pos, no_io ? highlight_shell_no_io : highlight_func);
     if (no_io) {
         // Highlighting without IO, we just do it.
         highlight_complete(highlight_performer());
@@ -2088,7 +2089,7 @@ void reader_data_t::super_highlight_me_plenty(int match_highlight_pos_adjust, bo
     // Here's a hack. Check to see if our autosuggestion still applies; if so, don't recompute it.
     // Since the autosuggestion computation is asynchronous, this avoids "flashing" as you type into
     // the autosuggestion.
-    const wcstring &cmd = el->text, &suggest = autosuggestion;
+    const wcstring &cmd = el->text(), &suggest = autosuggestion;
     if (can_autosuggest() && !suggest.empty() &&
         string_prefixes_string_case_insensitive(cmd, suggest)) {
         // the autosuggestion is still reasonable, so do nothing
@@ -2297,7 +2298,7 @@ static int read_i(parser_t &parser) {
         } else if (tmp) {
             const wcstring command = tmp.acquire();
             data->update_buff_pos(&data->command_line, 0);
-            data->command_line.text.clear();
+            data->command_line.text().clear();
             data->command_line_changed(&data->command_line);
             wcstring_list_t argv(1, command);
             event_fire_generic(parser, L"fish_preexec", &argv);
@@ -2454,19 +2455,18 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         // Go to beginning of line.
         case rl::beginning_of_line: {
             editable_line_t *el = active_edit_line();
-            while (el->position > 0 && el->text.at(el->position - 1) != L'\n') {
-                update_buff_pos(el, el->position - 1);
+            while (el->position() > 0 && el->text().at(el->position() - 1) != L'\n') {
+                update_buff_pos(el, el->position() - 1);
             }
-
             reader_repaint_needed();
             break;
         }
         case rl::end_of_line: {
             editable_line_t *el = active_edit_line();
-            if (el->position < el->size()) {
-                const wchar_t *buff = el->text.c_str();
-                while (buff[el->position] && buff[el->position] != L'\n') {
-                    update_buff_pos(el, el->position + 1);
+            if (el->position() < el->size()) {
+                const wchar_t *buff = el->text().c_str();
+                while (buff[el->position()] && buff[el->position()] != L'\n') {
+                    update_buff_pos(el, el->position() + 1);
                 }
             } else {
                 accept_autosuggestion(true);
@@ -2539,23 +2539,23 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Either the user hit tab only once, or we had no visible completion list.
                 // Remove a trailing backslash. This may trigger an extra repaint, but this is
                 // rare.
-                if (is_backslashed(el->text, el->position)) {
+                if (is_backslashed(el->text(), el->position())) {
                     remove_backward();
                 }
 
                 // Get the string; we have to do this after removing any trailing backslash.
-                const wchar_t *const buff = el->text.c_str();
+                const wchar_t *const buff = el->text().c_str();
 
                 // Figure out the extent of the command substitution surrounding the cursor.
                 // This is because we only look at the current command substitution to form
                 // completions - stuff happening outside of it is not interesting.
                 const wchar_t *cmdsub_begin, *cmdsub_end;
-                parse_util_cmdsubst_extent(buff, el->position, &cmdsub_begin, &cmdsub_end);
+                parse_util_cmdsubst_extent(buff, el->position(), &cmdsub_begin, &cmdsub_end);
 
                 // Figure out the extent of the token within the command substitution. Note we
                 // pass cmdsub_begin here, not buff.
                 const wchar_t *token_begin, *token_end;
-                parse_util_token_extent(cmdsub_begin, el->position - (cmdsub_begin - buff),
+                parse_util_token_extent(cmdsub_begin, el->position() - (cmdsub_begin - buff),
                                         &token_begin, &token_end, nullptr, nullptr);
 
                 // Hack: the token may extend past the end of the command substitution, e.g. in
@@ -2573,14 +2573,14 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
                 // User-supplied completions may have changed the commandline - prevent buffer
                 // overflow.
-                if (token_begin > buff + el->text.size()) token_begin = buff + el->text.size();
-                if (token_end > buff + el->text.size()) token_end = buff + el->text.size();
+                if (token_begin > buff + el->text().size()) token_begin = buff + el->text().size();
+                if (token_end > buff + el->text().size()) token_end = buff + el->text().size();
 
                 // Munge our completions.
                 completions_sort_and_prioritize(&rls.comp);
 
                 // Record our cycle_command_line.
-                cycle_command_line = el->text;
+                cycle_command_line = el->text();
                 cycle_cursor_pos = token_end - buff;
 
                 bool cont_after_prefix_insertion = (c == rl::complete_and_search);
@@ -2611,8 +2611,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::kill_line: {
             editable_line_t *el = active_edit_line();
-            const wchar_t *buff = el->text.c_str();
-            const wchar_t *begin = &buff[el->position];
+            const wchar_t *buff = el->text().c_str();
+            const wchar_t *begin = &buff[el->position()];
             const wchar_t *end = begin;
 
             while (*end && *end != L'\n') end++;
@@ -2627,11 +2627,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::backward_kill_line: {
             editable_line_t *el = active_edit_line();
-            if (el->position <= 0) {
+            if (el->position() <= 0) {
                 break;
             }
-            const wchar_t *buff = el->text.c_str();
-            const wchar_t *end = &buff[el->position];
+            const wchar_t *buff = el->text().c_str();
+            const wchar_t *end = &buff[el->position()];
             const wchar_t *begin = end;
 
             begin--;  // make sure we delete at least one character (see issue #580)
@@ -2651,19 +2651,19 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // We match the emacs behavior here: "kills the entire line including the following
             // newline".
             editable_line_t *el = active_edit_line();
-            const wchar_t *buff = el->text.c_str();
+            const wchar_t *buff = el->text().c_str();
 
             // Back up to the character just past the previous newline, or go to the beginning
             // of the command line. Note that if the position is on a newline, visually this
             // looks like the cursor is at the end of a line. Therefore that newline is NOT the
             // beginning of a line; this justifies the -1 check.
-            size_t begin = el->position;
+            size_t begin = el->position();
             while (begin > 0 && buff[begin - 1] != L'\n') {
                 begin--;
             }
 
             // Push end forwards to just past the next newline, or just past the last char.
-            size_t end = el->position;
+            size_t end = el->position();
             while (buff[end] != L'\0') {
                 end++;
                 if (buff[end - 1] == L'\n') {
@@ -2702,8 +2702,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // Remove the current character in the character buffer and on the screen using
             // syntax highlighting, etc.
             editable_line_t *el = active_edit_line();
-            if (el->position < el->size()) {
-                update_buff_pos(el, el->position + 1);
+            if (el->position() < el->size()) {
+                update_buff_pos(el, el->position() + 1);
                 remove_backward();
             } else if (c == rl::delete_or_exit && el->empty()) {
                 reader_set_end_loop(true);
@@ -2731,19 +2731,20 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
             // Allow backslash-escaped newlines.
             bool continue_on_next_line = false;
-            if (el->position >= el->size()) {
+            if (el->position() >= el->size()) {
                 // We're at the end of the text and not in a comment (issue #1225).
                 continue_on_next_line =
-                    is_backslashed(el->text, el->position) && !text_ends_in_comment(el->text);
+                    is_backslashed(el->text(), el->position()) && !text_ends_in_comment(el->text());
             } else {
                 // Allow mid line split if the following character is whitespace (issue #613).
-                if (is_backslashed(el->text, el->position) && iswspace(el->text.at(el->position))) {
+                if (is_backslashed(el->text(), el->position()) &&
+                    iswspace(el->text().at(el->position()))) {
                     continue_on_next_line = true;
                     // Check if the end of the line is backslashed (issue #4467).
-                } else if (is_backslashed(el->text, el->size()) &&
-                           !text_ends_in_comment(el->text)) {
+                } else if (is_backslashed(el->text(), el->size()) &&
+                           !text_ends_in_comment(el->text())) {
                     // Move the cursor to the end of the line.
-                    el->position = el->size();
+                    el->set_position(el->size());
                     continue_on_next_line = true;
                 }
             }
@@ -2754,7 +2755,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
 
             // See if this command is valid.
-            int command_test_result = test_func(parser(), el->text);
+            int command_test_result = test_func(parser(), el->text());
             if (command_test_result == 0 || command_test_result == PARSER_TEST_INCOMPLETE) {
                 // This command is valid, but an abbreviation may make it invalid. If so, we
                 // will have to test again.
@@ -2762,7 +2763,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 if (abbreviation_expanded) {
                     // It's our reponsibility to rehighlight and repaint. But everything we do
                     // below triggers a repaint.
-                    command_test_result = test_func(parser(), el->text);
+                    command_test_result = test_func(parser(), el->text());
 
                     // If the command is OK, then we're going to execute it. We still want to do
                     // syntax highlighting, but a synchronous variant that performs no I/O, so
@@ -2776,8 +2777,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Finished command, execute it. Don't add items that start with a leading
                 // space.
                 const editable_line_t *el = &command_line;
-                if (history != nullptr && !el->empty() && el->text.at(0) != L' ') {
-                    history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
+                if (history != nullptr && !el->empty() && el->text().at(0) != L' ') {
+                    history->add_pending_with_file_detection(el->text(), vars.get_pwd_slash());
                 }
                 rls.finished = true;
                 update_buff_pos(&command_line, command_line.size());
@@ -2814,8 +2815,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 if (mode == reader_history_search_t::token) {
                     // Searching by token.
                     const wchar_t *begin, *end;
-                    const wchar_t *buff = el->text.c_str();
-                    parse_util_token_extent(buff, el->position, &begin, &end, nullptr, nullptr);
+                    const wchar_t *buff = el->text().c_str();
+                    parse_util_token_extent(buff, el->position(), &begin, &end, nullptr, nullptr);
                     if (begin) {
                         wcstring token(begin, end);
                         history_search.reset_to_mode(token, history,
@@ -2826,7 +2827,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                     }
                 } else {
                     // Searching by line.
-                    history_search.reset_to_mode(el->text, history, mode);
+                    history_search.reset_to_mode(el->text(), history, mode);
 
                     // Skip the autosuggestion in the history unless it was truncated.
                     const wcstring &suggest = autosuggestion;
@@ -2851,8 +2852,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
                 select_completion_in_direction(selection_motion_t::west);
-            } else if (el->position > 0) {
-                update_buff_pos(el, el->position - 1);
+            } else if (el->position() > 0) {
+                update_buff_pos(el, el->position() - 1);
                 reader_repaint_needed();
             }
             break;
@@ -2861,8 +2862,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             editable_line_t *el = active_edit_line();
             if (is_navigating_pager_contents()) {
                 select_completion_in_direction(selection_motion_t::east);
-            } else if (el->position < el->size()) {
-                update_buff_pos(el, el->position + 1);
+            } else if (el->position() < el->size()) {
+                update_buff_pos(el, el->position() + 1);
                 reader_repaint_needed();
             } else {
                 accept_autosuggestion(true);
@@ -2907,7 +2908,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             auto move_style =
                 (c == rl::forward_word) ? move_word_style_punctuation : move_word_style_whitespace;
             editable_line_t *el = active_edit_line();
-            if (el->position < el->size()) {
+            if (el->position() < el->size()) {
                 move_word(el, MOVE_DIR_RIGHT, false /* do not erase */, move_style, false);
             } else {
                 accept_autosuggestion(false, move_style);
@@ -2955,7 +2956,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             } else {
                 // Not navigating the pager contents.
                 editable_line_t *el = active_edit_line();
-                int line_old = parse_util_get_line_from_offset(el->text, el->position);
+                int line_old = parse_util_get_line_from_offset(el->text(), el->position());
                 int line_new;
 
                 if (c == rl::up_line)
@@ -2963,7 +2964,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 else
                     line_new = line_old + 1;
 
-                int line_count = parse_util_lineno(el->text.c_str(), el->size()) - 1;
+                int line_count = parse_util_lineno(el->text().c_str(), el->size()) - 1;
 
                 if (line_new >= 0 && line_new <= line_count) {
                     size_t base_pos_new;
@@ -2974,18 +2975,18 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                     size_t line_offset_old;
                     size_t total_offset_new;
 
-                    base_pos_new = parse_util_get_offset_from_line(el->text, line_new);
+                    base_pos_new = parse_util_get_offset_from_line(el->text(), line_new);
 
-                    base_pos_old = parse_util_get_offset_from_line(el->text, line_old);
+                    base_pos_old = parse_util_get_offset_from_line(el->text(), line_old);
 
                     assert(base_pos_new != (size_t)(-1) && base_pos_old != (size_t)(-1));
                     indent_old = indents.at(base_pos_old);
                     indent_new = indents.at(base_pos_new);
 
                     line_offset_old =
-                        el->position - parse_util_get_offset_from_line(el->text, line_old);
+                        el->position() - parse_util_get_offset_from_line(el->text(), line_old);
                     total_offset_new = parse_util_get_offset(
-                        el->text, line_new, line_offset_old - 4 * (indent_new - indent_old));
+                        el->text(), line_new, line_offset_old - 4 * (indent_new - indent_old));
                     update_buff_pos(el, total_offset_new);
                     reader_repaint_needed();
                 }
@@ -3009,32 +3010,32 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             }
 
             // If the cursor is at the end, transpose the last two characters of the line.
-            if (el->position == el->size()) {
-                update_buff_pos(el, el->position - 1);
+            if (el->position() == el->size()) {
+                update_buff_pos(el, el->position() - 1);
             }
 
             // Drag the character before the cursor forward over the character at the cursor,
             // moving the cursor forward as well.
-            if (el->position > 0) {
-                wcstring local_cmd = el->text;
-                std::swap(local_cmd.at(el->position), local_cmd.at(el->position - 1));
-                set_command_line_and_position(el, local_cmd, el->position + 1);
+            if (el->position() > 0) {
+                wcstring local_cmd = el->text();
+                std::swap(local_cmd.at(el->position()), local_cmd.at(el->position() - 1));
+                set_command_line_and_position(el, std::move(local_cmd), el->position() + 1);
             }
             break;
         }
         case rl::transpose_words: {
             editable_line_t *el = active_edit_line();
             size_t len = el->size();
-            const wchar_t *buff = el->text.c_str();
+            const wchar_t *buff = el->text().c_str();
             const wchar_t *tok_begin, *tok_end, *prev_begin, *prev_end;
 
             // If we are not in a token, look for one ahead.
-            size_t buff_pos = el->position;
+            size_t buff_pos = el->position();
             while (buff_pos != len && !iswalnum(buff[buff_pos])) buff_pos++;
 
             update_buff_pos(el, buff_pos);
 
-            parse_util_token_extent(buff, el->position, &tok_begin, &tok_end, &prev_begin,
+            parse_util_token_extent(buff, el->position(), &tok_begin, &tok_end, &prev_begin,
                                     &prev_end);
 
             // In case we didn't find a token at or after the cursor...
@@ -3070,10 +3071,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             bool capitalized_first = false;
 
             // We apply the operation from the current location to the end of the word.
-            size_t pos = el->position;
+            size_t pos = el->position();
             move_word(el, MOVE_DIR_RIGHT, false, move_word_style_punctuation, false);
-            for (; pos < el->position; pos++) {
-                wchar_t chr = el->text.at(pos);
+            for (; pos < el->position(); pos++) {
+                wchar_t chr = el->text().at(pos);
 
                 // We always change the case; this decides whether we go uppercase (true) or
                 // lowercase (false).
@@ -3089,7 +3090,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 else
                     chr = towlower(chr);
 
-                command_line.text.at(pos) = chr;
+                command_line.text().at(pos) = chr;
                 capitalized_first = capitalized_first || make_uppercase;
             }
             command_line_changed(el);
@@ -3099,13 +3100,13 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::begin_selection:
         case rl::end_selection: {
-            sel_start_pos = command_line.position;
+            sel_start_pos = command_line.position();
             if (c == rl::begin_selection) {
-                sel_stop_pos = command_line.position + 1;
+                sel_stop_pos = command_line.position() + 1;
                 sel_active = true;
-                sel_begin_pos = command_line.position;
+                sel_begin_pos = command_line.position();
             } else {
-                sel_stop_pos = command_line.position;
+                sel_stop_pos = command_line.position();
                 sel_active = false;
             }
 
@@ -3114,8 +3115,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         case rl::swap_selection_start_stop: {
             if (!sel_active) break;
             size_t tmp = sel_begin_pos;
-            sel_begin_pos = command_line.position;
-            sel_start_pos = command_line.position;
+            sel_begin_pos = command_line.position();
+            sel_start_pos = command_line.position();
             editable_line_t *el = active_edit_line();
             update_buff_pos(el, tmp);
             break;
@@ -3352,7 +3353,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
         outputter_t::stdoutput().set_color(rgb_color_t::reset(), rgb_color_t::reset());
     }
 
-    return rls.finished ? maybe_t<wcstring>{command_line.text} : none();
+    return rls.finished ? maybe_t<wcstring>{command_line.text()} : none();
 }
 
 bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, editable_line_t *el,
@@ -3365,7 +3366,7 @@ bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, edita
 
     switch (dir) {
         case jump_direction_t::backward: {
-            size_t tmp_pos = el->position;
+            size_t tmp_pos = el->position();
 
             while (tmp_pos--) {
                 if (el->at(tmp_pos) == target) {
@@ -3380,7 +3381,7 @@ bool reader_data_t::jump(jump_direction_t dir, jump_precision_t precision, edita
             break;
         }
         case jump_direction_t::forward: {
-            for (size_t tmp_pos = el->position + 1; tmp_pos < el->size(); tmp_pos++) {
+            for (size_t tmp_pos = el->position() + 1; tmp_pos < el->size(); tmp_pos++) {
                 if (el->at(tmp_pos) == target) {
                     if (precision == jump_precision_t::till && tmp_pos) {
                         tmp_pos--;
@@ -3453,7 +3454,7 @@ void reader_react_to_color_change() {
 const wchar_t *reader_get_buffer() {
     ASSERT_IS_MAIN_THREAD();
     reader_data_t *data = current_data_or_null();
-    return data ? data->command_line.text.c_str() : nullptr;
+    return data ? data->command_line.text().c_str() : nullptr;
 }
 
 history_t *reader_get_history() {
@@ -3481,7 +3482,7 @@ size_t reader_get_cursor_pos() {
     reader_data_t *data = current_data_or_null();
     if (!data) return static_cast<size_t>(-1);
 
-    return data->command_line.position;
+    return data->command_line.position();
 }
 
 bool reader_get_selection(size_t *start, size_t *len) {
diff --git a/src/reader.h b/src/reader.h
index a60883711..663b48f2d 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -22,27 +22,34 @@ class parser_t;
 
 /// Helper class for storing a command line.
 class editable_line_t {
-   public:
     /// The command line.
-    wcstring text;
+    wcstring text_;
     /// The current position of the cursor in the command line.
-    size_t position;
+    size_t position_;
 
-    const wcstring &get_text() const { return text; }
+   public:
+    const wcstring &text() const { return text_; }
+
+    size_t position() const { return position_; }
+    void set_position(size_t position) { position_ = position; } 
+
+    // TODO remove these overloads!
+    wcstring &text() { return text_; }
+    size_t &position() { return position_; }
 
     // Gets the length of the text.
-    size_t size() const { return text.size(); }
+    size_t size() const { return text().size(); }
 
-    bool empty() const { return text.empty(); }
+    bool empty() const { return text().empty(); }
 
     void clear() {
-        text.clear();
-        position = 0;
+        text_.clear();
+        set_position(0);
     }
 
-    wchar_t at(size_t idx) { return text.at(idx); }
+    wchar_t at(size_t idx) { return text().at(idx); }
 
-    editable_line_t() : text(), position(0) {}
+    editable_line_t() : text_(), position_(0) {}
 
     /// Inserts a substring of str given by start, len at the cursor position.
     void insert_string(const wcstring &str, size_t start = 0, size_t len = wcstring::npos);

From 5d135d5556bfaed1112c65f8724ea9497d532055 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Mon, 3 Feb 2020 08:53:41 +0100
Subject: [PATCH 1692/1732] prompts: fix pipestatus for jobs prefixed with
 "not"

6902459566b491e2debb136f43f815965910eeee was an attempt to not print
$status twice in the prompt. As a result we print $pipestatus but
not $status, which /usually/ is the same as $pipestatus[-1] --- unless
the builtin "not" is used, which inverts the $status of a job (it does
not alter $pipestatus).

As a result, the default prompt prints unexpected status codes:

	~ > not false
	~ [1]> not true
	~ > not true | true
	~ > not false | false
	~ [1|1]>

This commit reintroduces printing of $status after $pipestatus, but only
if it is different from $pipestatus[-1].
Additionally, we only print anything at all if the $status is nonzero,
to avoid confusing output on `not false | false`

	~ > not false
	~ > not true
	~ [0] 1> not true | true
	~ [0|0] 1> not false | false
	~ >

I think this is closer to users' expectations for those cases; they should
not have to think about this implementation detail of the not-statement.
---
 share/functions/__fish_print_pipestatus.fish  | 20 ++++++++++++++-----
 share/functions/fish_prompt.fish              |  3 ++-
 .../sample_prompts/classic_status.fish        |  3 ++-
 .../sample_prompts/classic_vcs.fish           |  2 +-
 .../sample_prompts/informative.fish           |  3 ++-
 .../sample_prompts/informative_vcs.fish       |  3 ++-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index c860821b4..799bb5f78 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -1,4 +1,11 @@
 function __fish_print_pipestatus --description "Print pipestatus for prompt"
+    # take $status as optional argument to maintain compatibility
+    set -l last_status
+    if set last_status (string match -r -- '^\d+$' $argv[1])
+        set -e argv[1]
+    else
+        set last_status $argv[-1] # default to $pipestatus[-1]
+    end
     set -l left_brace $argv[1]
     set -l right_brace $argv[2]
     set -l separator $argv[3]
@@ -6,13 +13,16 @@ function __fish_print_pipestatus --description "Print pipestatus for prompt"
     set -l status_color $argv[5]
     set -e argv[1 2 3 4 5]
 
-    # only output status codes if some process in the pipe failed
-    # SIGPIPE (141 = 128 + 13) is usually not a failure, see #6375.
-    if string match -qvr '^(0|141)$' $argv
+    # Only print status codes if the job failed.
+    if test $last_status -ne 0
         set -l sep (set_color normal){$brace_sep_color}{$separator}(set_color normal){$status_color}
         set -l last_pipestatus_string (string join "$sep" (__fish_pipestatus_with_signal $argv))
-        printf "%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
+        set -l last_status_string ""
+        if test $last_status -ne $argv[-1]
+            set last_status_string " "$status_color$last_status
+        end
+        printf "%s%s%s%s%s%s%s%s%s%s%s" (set_color normal )$brace_sep_color $left_brace \
             (set_color normal) $status_color $last_pipestatus_string (set_color normal) \
-            $brace_sep_color $right_brace (set_color normal)
+            $brace_sep_color $right_brace $last_status_string (set_color normal)
     end
 end
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 890c035bc..e09191ade 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -3,6 +3,7 @@
 
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
+    set -l last_status $status
     set -l normal (set_color normal)
 
     # Color the prompt differently when we're root
@@ -22,7 +23,7 @@ function fish_prompt --description 'Write out the prompt'
     end
 
     # Write pipestatus
-    set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
+    set -l prompt_status (__fish_print_pipestatus $last_status " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
     echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index fab56aef2..334d17dcc 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -4,6 +4,7 @@
 function fish_prompt --description "Write out the prompt"
     # Save our status
     set -l last_pipestatus $pipestatus
+    set -l last_status $status
 
     set -l color_cwd
     set -l suffix
@@ -21,6 +22,6 @@ function fish_prompt --description "Write out the prompt"
     end
 
     echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) \
-        (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
+        (__fish_print_pipestatus $last_status " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
         (set_color normal) "$suffix "
 end
diff --git a/share/tools/web_config/sample_prompts/classic_vcs.fish b/share/tools/web_config/sample_prompts/classic_vcs.fish
index 2feb97a70..05bcd92a5 100644
--- a/share/tools/web_config/sample_prompts/classic_vcs.fish
+++ b/share/tools/web_config/sample_prompts/classic_vcs.fish
@@ -23,7 +23,7 @@ function fish_prompt --description 'Write out the prompt'
     end
 
     # Write pipestatus
-    set -l prompt_status (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
+    set -l prompt_status (__fish_print_pipestatus $last_status " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
 
     echo -n -s (set_color $fish_color_user) "$USER" $normal @ (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal $prompt_status $suffix " "
 end
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index b07299ac3..d2b16c74d 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -4,6 +4,7 @@
 function fish_prompt --description 'Informative prompt'
     #Save the return status of the previous command
     set -l last_pipestatus $pipestatus
+    set -l last_status $status
 
     switch "$USER"
         case root toor
@@ -12,7 +13,7 @@ function fish_prompt --description 'Informative prompt'
                                                              or set_color $fish_color_cwd) \
                 (prompt_pwd) (set_color normal)
         case '*'
-            set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) \
+            set -l pipestatus_string (__fish_print_pipestatus $last_status "[" "] " "|" (set_color $fish_color_status) \
                                       (set_color --bold $fish_color_status) $last_pipestatus)
 
             printf '[%s] %s%s@%s %s%s %s%s%s \f\r> ' (date "+%H:%M:%S") (set_color brblue) \
diff --git a/share/tools/web_config/sample_prompts/informative_vcs.fish b/share/tools/web_config/sample_prompts/informative_vcs.fish
index b05bfa24e..6726dcdb3 100644
--- a/share/tools/web_config/sample_prompts/informative_vcs.fish
+++ b/share/tools/web_config/sample_prompts/informative_vcs.fish
@@ -3,6 +3,7 @@
 
 function fish_prompt --description 'Write out the prompt'
     set -l last_pipestatus $pipestatus
+    set -l last_status $status
 
     if not set -q __fish_git_prompt_show_informative_status
         set -g __fish_git_prompt_show_informative_status 1
@@ -78,7 +79,7 @@ function fish_prompt --description 'Write out the prompt'
 
     printf '%s ' (fish_vcs_prompt)
 
-    set -l pipestatus_string (__fish_print_pipestatus "[" "] " "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
+    set -l pipestatus_string (__fish_print_pipestatus $last_status "[" "] " "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus)
     echo -n $pipestatus_string
     set_color normal
 

From fb00d6638eca98324167ba915e749e4e794270cb Mon Sep 17 00:00:00 2001
From: Jason Nader <jason.nader@protonmail.com>
Date: Wed, 29 Jan 2020 12:49:51 +0900
Subject: [PATCH 1693/1732] completions/apt: Add support for filename
 completions

Plus some small fixes.
Fixes #6209
[ci skip]
---
 share/completions/apt.fish | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index 22fdd739b..fd6a1ce2c 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -3,8 +3,9 @@
 set -l all_subcmds update upgrade full-upgrade search list install show remove edit-sources purge changelog autoremove depends rdepends
 set -l pkg_subcmds install upgrade full-upgrade show search purge changelog policy depends rdepends
 set -l installed_pkg_subcmds remove
+set -l handle_file_pkg_subcmds install
 
-function __fish_apt_subcommand
+function __fish_apt_subcommand --no-scope-shadowing
     set subcommand $argv[1]
     set -e argv[1]
     complete -f -c apt -n "not __fish_seen_subcommand_from $all_subcmds" -a $subcommand $argv
@@ -16,17 +17,20 @@ function __fish_apt_option
     complete -f -c apt -n "__fish_seen_subcommand_from $subcommand" $argv
 end
 
-complete -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_packages | head -n 250)'
+complete -c apt -f
+
+complete -k -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_packages | head -n 250 | sort)'
 complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -re -- "(?:\\b|_)"(commandline -ct | string escape --style=regex) | head -n 250)' -d 'Package'
+complete -k -c apt -n "__fish_seen_subcommand_from $handle_file_pkg_subcmds" -a '(__fish_complete_suffix .deb)'
 
 # Support flags
-complete -x -f -c apt -s h -l help -d 'Display help'
-complete -x -f -c apt -s v -l version -d 'Display version and exit'
+complete -f -c apt -s h -l help -d 'Display help'
+complete -f -c apt -s v -l version -d 'Display version and exit'
 
 # General options
-complete -f -c apt -s o -l option -d 'Set a configuration option'
-complete -f -c apt -s c -l config-file -d 'Configuration file'
-complete -f -c apt -s t -d 'Target release'
+complete -x -c apt -s o -l option -d 'Set a configuration option'
+complete -r -c apt -s c -l config-file -d 'Configuration file'
+complete -x -c apt -s t -d 'Target release'
 
 # List
 __fish_apt_subcommand list -d 'List packages'
@@ -76,3 +80,5 @@ __fish_apt_subcommand depends -r -d 'List package dependencies'
 
 # Rdepends
 __fish_apt_subcommand rdepends -r -d 'List package reverse dependencies'
+
+functions -e __fish_apt_subcommand __fish_apt_option

From 5a8685b26cb0891a361460ca09769339267ebbbd Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 6 Feb 2020 12:46:00 +0800
Subject: [PATCH 1694/1732] debian packaging: bump Python requirement to 3.5+

Work on #6537.
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ef9a72cf0..04c5589b2 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: friendly interactive shell
 Package: fish-common
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: fish, python3 (>= 3.3) | python (>=2.7)
+Recommends: fish, python3 (>= 3.5)
 Suggests: xdg-utils
 Replaces: fish (<= 2.1.1.dfsg-2)
 Description: friendly interactive shell (architecture-independent files)

From 21f2628c06859ffca4d30f11d7dc52a917197f69 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Thu, 6 Feb 2020 13:15:49 +0800
Subject: [PATCH 1695/1732] fish.spec: group conditionals to correctly detect
 Fedora

Fixes test failures due to glibc-langpack-en not being installed.
---
 fish.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fish.spec.in b/fish.spec.in
index d45fb6775..fb8ee73f6 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -26,7 +26,7 @@ BuildRequires: gcc48 gcc48-c++ python-argparse
 %endif
 
 # for tests
-%if 0%{?fedora} || 0%{?rhel} && 0%{?rhel} > 7
+%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 7 )
 # Need the en_US.utf-8 locale at a minimum
 BuildRequires: glibc-langpack-en
 %endif

From 440b791b3873099934d3c5ac95201a819b413d34 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 6 Feb 2020 15:44:39 +0100
Subject: [PATCH 1696/1732] Add changelog headers for fish next-minor and add
 an entry for #6566

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a00934b77..150aca1a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,30 @@
 # fish next-minor
 
+## Notable improvements and fixes
+
+### Syntax changes and new commands
+
+### Scripting improvements
+
+### Interactive improvements
+
+#### New or improved bindings
+
+#### Improved prompts
+- The default and example prompts print the correct exit status for commands prefixed with `not` (#6566).
+
+#### Improved terminal output
+
 #### Completions
 - Added completions for
   - `wireshark`, `tshark`, and `dumpcap`
 
+### Deprecations and removed features
+
+### For distributors and developers
+
+---
+
 # fish 3.1b1 (released January 26, 2020)
 
 ## Notable improvements and fixes

From 3f6884e5a19c712047cb814227c7b314b4d46506 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Thu, 6 Feb 2020 11:55:24 -0800
Subject: [PATCH 1697/1732] Use move semantics in expand_braces

Reduces copying during expansion.
---
 src/expand.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/expand.cpp b/src/expand.cpp
index 96c84d5c0..adc7d3f16 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -460,9 +460,9 @@ static bool expand_variables(wcstring instr, completion_list_t *out, size_t last
     return true;
 }
 
-/// Perform brace expansion.
-static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags,
-                                     completion_list_t *out, parse_error_list_t *errors) {
+/// Perform brace expansion, placing the expanded strings into \p out.
+static expand_result_t expand_braces(wcstring &&instr, expand_flags_t flags, completion_list_t *out,
+                                     parse_error_list_t *errors) {
     bool syntax_error = false;
     int brace_count = 0;
 
@@ -518,7 +518,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
             }
 
             // Note: this code looks very fishy, apparently it has never worked.
-            return expand_braces(mod, expand_flag::skip_cmdsubst, out, errors);
+            return expand_braces(std::move(mod), expand_flag::skip_cmdsubst, out, errors);
         }
     }
 
@@ -528,7 +528,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
     }
 
     if (brace_begin == nullptr) {
-        append_completion(out, instr);
+        append_completion(out, std::move(instr));
         return expand_result_t::ok;
     }
 
@@ -553,7 +553,7 @@ static expand_result_t expand_braces(const wcstring &instr, expand_flags_t flags
             whole_item.append(in, length_preceding_braces);
             whole_item.append(item.begin(), item.end());
             whole_item.append(brace_end + 1);
-            expand_braces(whole_item, flags, out, errors);
+            expand_braces(std::move(whole_item), flags, out, errors);
 
             item_begin = pos + 1;
             if (pos == brace_end) break;
@@ -921,7 +921,7 @@ expand_result_t expander_t::stage_variables(wcstring input, completion_list_t *o
 }
 
 expand_result_t expander_t::stage_braces(wcstring input, completion_list_t *out) {
-    return expand_braces(input, flags, out, errors);
+    return expand_braces(std::move(input), flags, out, errors);
 }
 
 expand_result_t expander_t::stage_home_and_self(wcstring input, completion_list_t *out) {

From 43edbf4a915b3cf06160cb0bb7b07964725960ff Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 7 Feb 2020 20:43:14 +0800
Subject: [PATCH 1698/1732] config.fish: drop PATH modifications on
 Solaris-derived systems

Fixes #6556.

Although present since 2006, fish no longer relies on POSIX-compliant tools to the same degree. This
code causes a platform specific change that makes the tests fail, so remove it.
---
 share/config.fish | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/share/config.fish b/share/config.fish
index 400556832..acba33c09 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -115,19 +115,6 @@ function : -d "no-op function"
     true
 end
 
-#
-# This is a Solaris-specific test to modify the PATH so that
-# Posix-conformant tools are used by default. It is separate from the
-# other PATH code because this directory needs to be prepended, not
-# appended, since it contains POSIX-compliant replacements for various
-# system utilities.
-#
-
-if test -d /usr/xpg4/bin
-    not contains -- /usr/xpg4/bin $PATH
-    and set PATH /usr/xpg4/bin $PATH
-end
-
 # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
 function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" --on-variable fish_user_paths
     set -l local_path $PATH

From f7edfba5d7c52bb9d2e1d11c9568fb2e0ca14982 Mon Sep 17 00:00:00 2001
From: Geoff Nixon <geoff@geoffnixon.net>
Date: Fri, 31 Jan 2020 13:55:08 -0800
Subject: [PATCH 1699/1732] Avoid apropos on macOS 10.15 with man completion

Same issue occurs here, as in #6270 (and fixed in 611a658 for `__fish_describe_command.fish`). Same reason. I've just copied the same workaround and changed the function name to match.
---
 share/functions/__fish_complete_man.fish | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index 5fbe87345..edb5511bd 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -1,3 +1,20 @@
+# macOS 10.15 "Catalina" has some major issues.
+# The whatis database is non-existent, so apropos tries (and fails) to create it every time,
+# which takes about half a second.
+#
+# So we disable this entirely in that case.
+if test (uname) = Darwin
+    set -l darwin_version (uname -r | string split .)
+    # macOS 15 is Darwin 19, this is an issue at least up to 10.15.3.
+    # If this is fixed in later versions uncomment the second check.
+    if test "$darwin_version[1]" = 19 # -a "$darwin_version[2]" -le 3
+        function __fish_complete_man
+        end
+        # (remember: exit when `source`ing only exits the file, not the shell)
+        exit
+    end
+end
+
 function __fish_complete_man
     # Try to guess what section to search in. If we don't know, we
     # use [^)]*, which should match any section.

From 8a033b9f3d81411897483faf8dbaea3e210ec64f Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Tue, 4 Feb 2020 12:47:44 +0100
Subject: [PATCH 1700/1732] Add undo

Add the input function undo which is bound to `\c_` (control + / on
some terminals). Redoing the most recent chain of undos is supported,
redo is bound to `\e/` for now.

Closes #1367.
This approach should not have the issues discussed in #5897.

Every single modification to the commandline can be undone individually,
except for adjacent single-character inserts, which are coalesced,
so they can be reverted with a single undo. Coalescing is not done for
space characters, so each word can be undone separately.

When moving between history search entries, only the current history
search entry is reachable via the undo history. This allows to go back
to the original search string with a single undo, or by pressing the
escape key.
Similarly, when moving between pager entries, only the most recent
selection in the pager can be undone.
---
 CHANGELOG.md                                  |   1 +
 .../functions/fish_default_key_bindings.fish  |   2 +
 sphinx_doc_src/cmds/bind.rst                  |   2 +
 sphinx_doc_src/index.rst                      |   4 +
 src/fish_tests.cpp                            |  90 ++++-
 src/input.cpp                                 |   5 +-
 src/input_common.h                            |   2 +
 src/reader.cpp                                | 327 +++++++++++++-----
 src/reader.h                                  |  83 ++++-
 9 files changed, 414 insertions(+), 102 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 150aca1a8..4c96eefd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Interactive improvements
 
 #### New or improved bindings
+- New readline commands `undo` (Ctrl+_) and `redo` (Alt-/) can be used to revert changes to the command line or the pager search field (#6570).
 
 #### Improved prompts
 - The default and example prompts print the correct exit status for commands prefixed with `not` (#6566).
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index 73583c5a7..e161a3d7f 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -69,6 +69,8 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
     bind --preset $argv \cf forward-char
     bind --preset $argv \cb backward-char
     bind --preset $argv \ct transpose-chars
+    bind --preset $argv \c_ undo
+    bind --preset $argv \e/ redo
     bind --preset $argv \et transpose-words
     bind --preset $argv \eu upcase-word
 
diff --git a/sphinx_doc_src/cmds/bind.rst b/sphinx_doc_src/cmds/bind.rst
index dd0e590cb..3c3e65de1 100644
--- a/sphinx_doc_src/cmds/bind.rst
+++ b/sphinx_doc_src/cmds/bind.rst
@@ -172,6 +172,8 @@ The following special input functions are available:
 
 - ``up-line``, move up one line
 
+- ``undo`` and ``redo``, revert or redo the most recent edits on the command line
+
 - ``upcase-word``, make the current word uppercase
 
 - ``yank``, insert the latest entry of the killring into the buffer
diff --git a/sphinx_doc_src/index.rst b/sphinx_doc_src/index.rst
index d174cdd01..123a1e7fd 100644
--- a/sphinx_doc_src/index.rst
+++ b/sphinx_doc_src/index.rst
@@ -1440,6 +1440,10 @@ Emacs mode commands
 
 - :kbd:`Alt+t` transposes the last two words
 
+- :kbd:`Control+_` (:kbd:`Control+/` on some terminals) undoes the most recent edit of the line
+
+- :kbd:`Alt+/` reverts the most recent undo
+
 
 You can change these key bindings using the :ref:`bind <cmd-bind>` builtin.
 
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 4bc6b55ec..51a7d18f7 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -2000,46 +2000,55 @@ static void test_abbreviations() {
     if (*mresult != L"bar") err(L"Wrong abbreviation result for foo");
 
     maybe_t<wcstring> result;
-    result = reader_expand_abbreviation_in_command(L"just a command", 3, vars);
+    auto expand_abbreviation_in_command = [](const wcstring &cmdline, size_t cursor_pos,
+                                             const environment_t &vars) -> maybe_t<wcstring> {
+        if (auto edit = reader_expand_abbreviation_in_command(cmdline, cursor_pos, vars)) {
+            wcstring cmdline_expanded = cmdline;
+            apply_edit(&cmdline_expanded, *edit);
+            return cmdline_expanded;
+        }
+        return none_t();
+    };
+    result = expand_abbreviation_in_command(L"just a command", 3, vars);
     if (result) err(L"Command wrongly expanded on line %ld", (long)__LINE__);
-    result = reader_expand_abbreviation_in_command(L"gc somebranch", 0, vars);
+    result = expand_abbreviation_in_command(L"gc somebranch", 0, vars);
     if (!result) err(L"Command not expanded on line %ld", (long)__LINE__);
 
-    result = reader_expand_abbreviation_in_command(L"gc somebranch", std::wcslen(L"gc"), vars);
+    result = expand_abbreviation_in_command(L"gc somebranch", std::wcslen(L"gc"), vars);
     if (!result) err(L"gc not expanded");
     if (result != L"git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // Space separation.
-    result = reader_expand_abbreviation_in_command(L"gx somebranch", std::wcslen(L"gc"), vars);
+    result = expand_abbreviation_in_command(L"gx somebranch", std::wcslen(L"gc"), vars);
     if (!result) err(L"gx not expanded");
     if (result != L"git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
-    result = reader_expand_abbreviation_in_command(L"echo hi ; gc somebranch",
-                                                   std::wcslen(L"echo hi ; g"), vars);
+    result = expand_abbreviation_in_command(L"echo hi ; gc somebranch", std::wcslen(L"echo hi ; g"),
+                                            vars);
     if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo hi ; git checkout somebranch")
         err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
-    result = reader_expand_abbreviation_in_command(
-        L"echo (echo (echo (echo (gc ", std::wcslen(L"echo (echo (echo (echo (gc"), vars);
+    result = expand_abbreviation_in_command(L"echo (echo (echo (echo (gc ",
+                                            std::wcslen(L"echo (echo (echo (echo (gc"), vars);
     if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"echo (echo (echo (echo (git checkout ")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // If commands should be expanded.
-    result = reader_expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars);
+    result = expand_abbreviation_in_command(L"if gc", std::wcslen(L"if gc"), vars);
     if (!result) err(L"gc not expanded on line %ld", (long)__LINE__);
     if (result != L"if git checkout")
         err(L"gc incorrectly expanded on line %ld to '%ls'", (long)__LINE__, result->c_str());
 
     // Others should not be.
-    result = reader_expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars);
+    result = expand_abbreviation_in_command(L"of gc", std::wcslen(L"of gc"), vars);
     if (result) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     // Others should not be.
-    result = reader_expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"), vars);
+    result = expand_abbreviation_in_command(L"command gc", std::wcslen(L"command gc"), vars);
     if (result) err(L"gc incorrectly expanded on line %ld", (long)__LINE__);
 
     vars.pop();
@@ -3261,6 +3270,64 @@ static void test_line_iterator() {
     do_test((lines2 == wcstring_list_t{L"", L"", L"Alpha", L"Beta", L"Gamma", L"", L"Delta"}));
 }
 
+static void test_undo() {
+    say(L"Testing undo/redo setting and restoring text and cursor position.");
+
+    editable_line_t line;
+    do_test(!line.undo());  // nothing to undo
+    do_test(line.text() == L"");
+    do_test(line.position() == 0);
+    line.push_edit(edit_t(0, 0, L"a b c"));
+    do_test(line.text() == L"a b c");
+    do_test(line.position() == 5);
+    line.set_position(2);
+    line.replace_substring(2, 1, L"B");  // replacement right of cursor
+    do_test(line.text() == L"a B c");
+    line.undo();
+    do_test(line.text() == L"a b c");
+    do_test(line.position() == 2);
+    line.redo();
+    do_test(line.text() == L"a B c");
+    do_test(line.position() == 3);
+
+    do_test(!line.redo());  // nothing to redo
+
+    line.erase_substring(0, 2);  // deletion left of cursor
+    do_test(line.text() == L"B c");
+    do_test(line.position() == 1);
+    line.undo();
+    do_test(line.text() == L"a B c");
+    do_test(line.position() == 3);
+    line.redo();
+    do_test(line.text() == L"B c");
+    do_test(line.position() == 1);
+
+    line.replace_substring(0, line.size(), L"a b c");  // replacement left and right of cursor
+    do_test(line.text() == L"a b c");
+    do_test(line.position() == 5);
+
+    say(L"Testing undoing coalesced edits.");
+    line.clear();
+    line.insert_string(L"a");
+    line.insert_string(L"b");
+    line.insert_string(L"c");
+    do_test(line.undo_history.edits.size() == 1);
+    line.insert_string(L" ");
+    do_test(line.undo_history.edits.size() == 2);
+    line.undo();
+    line.undo();
+    line.redo();
+    do_test(line.text() == L"abc");
+    do_test(line.undo_history.edits.size() == 2);
+    // This removes the space insertion from the history, bu tdoes not coalesce with the first edit.
+    line.insert_string(L"d");
+    do_test(line.undo_history.edits.size() == 2);
+    line.insert_string(L"e");
+    do_test(line.text() == L"abcde");
+    line.undo();
+    do_test(line.text() == L"abc");
+}
+
 #define UVARS_PER_THREAD 8
 #define UVARS_TEST_PATH L"test/fish_uvars_test/varsfile.txt"
 
@@ -5580,6 +5647,7 @@ int main(int argc, char **argv) {
     if (should_test_function("input")) test_input();
     if (should_test_function("io")) test_fd_set();
     if (should_test_function("line_iterator")) test_line_iterator();
+    if (should_test_function("undo")) test_undo();
     if (should_test_function("universal")) test_universal();
     if (should_test_function("universal")) test_universal_output();
     if (should_test_function("universal")) test_universal_parsing();
diff --git a/src/input.cpp b/src/input.cpp
index df0322bbf..c29566dd9 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -145,7 +145,10 @@ static const input_function_metadata_t input_function_metadata[] = {
     {readline_cmd_t::func_and, L"and"},
     {readline_cmd_t::expand_abbr, L"expand-abbr"},
     {readline_cmd_t::delete_or_exit, L"delete-or-exit"},
-    {readline_cmd_t::cancel, L"cancel"}};
+    {readline_cmd_t::cancel, L"cancel"},
+    {readline_cmd_t::undo, L"undo"},
+    {readline_cmd_t::redo, L"redo"},
+};
 
 static_assert(sizeof(input_function_metadata) / sizeof(input_function_metadata[0]) ==
                   input_function_count,
diff --git a/src/input_common.h b/src/input_common.h
index 583886579..f7351f3c4 100644
--- a/src/input_common.h
+++ b/src/input_common.h
@@ -69,6 +69,8 @@ enum class readline_cmd_t {
     expand_abbr,
     delete_or_exit,
     cancel,
+    undo,
+    redo,
     repeat_jump,
     // NOTE: This one has to be last.
     reverse_repeat_jump
diff --git a/src/reader.cpp b/src/reader.cpp
index 5cbe9fa22..d5f970b91 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -144,14 +144,122 @@ operation_context_t get_bg_context(const std::shared_ptr<environment_t> &env,
     return operation_context_t{nullptr, *env, std::move(cancel_checker)};
 }
 
+bool edit_t::operator==(const edit_t &other) const {
+    return cursor_position_before_edit == other.cursor_position_before_edit &&
+           offset == other.offset && length == other.length && old == other.old &&
+           replacement == other.replacement;
+}
+
+void undo_history_t::clear() {
+    edits.clear();
+    edits_applied = 0;
+    may_coalesce = false;
+}
+
+void apply_edit(wcstring *target, const edit_t &edit) {
+    target->replace(edit.offset, edit.length, edit.replacement);
+}
+
+/// Returns the number of characters left of the cursor that are removed by the
+/// deletion in the given edit.
+static size_t chars_deleted_left_of_cursor(const edit_t &edit) {
+    if (edit.cursor_position_before_edit > edit.offset) {
+        return std::min(edit.length, edit.cursor_position_before_edit - edit.offset);
+    }
+    return 0;
+}
+
+/// Compute the position of the cursor after the given edit.
+static size_t cursor_position_after_edit(const edit_t &edit) {
+    size_t cursor = edit.cursor_position_before_edit + edit.replacement.size();
+    size_t removed = chars_deleted_left_of_cursor(edit);
+    return cursor > removed ? cursor - removed : 0;
+}
+
+/// Whether we want to append this string to the previous edit.
+static bool want_to_coalesce_insertion_of(const editable_line_t &el, const wcstring &str) {
+    // The previous edit must support coalescing.
+    if (!el.undo_history.may_coalesce) return false;
+    // Only consolidate single character inserts.
+    if (str.size() != 1) return false;
+    // Make an undo group after every space.
+    if (str.at(0) == L' ') return false;
+    assert(!el.undo_history.edits.empty());
+    const edit_t &last_edit = el.undo_history.edits.back();
+    // Don't add to the last edit if it deleted something.
+    if (last_edit.length != 0) return false;
+    // Must not have moved the cursor!
+    if (cursor_position_after_edit(last_edit) != el.position()) return false;
+    return true;
+}
+
 void editable_line_t::insert_string(const wcstring &str, size_t start, size_t len) {
     // Clamp the range to something valid.
     size_t string_length = str.size();
-
     start = std::min(start, string_length);      //!OCLINT(parameter reassignment)
     len = std::min(len, string_length - start);  //!OCLINT(parameter reassignment)
-    this->text().insert(this->position(), str, start, len);
-    this->position() += len;
+    if (want_to_coalesce_insertion_of(*this, str)) {
+        edit_t &edit = undo_history.edits.back();
+        edit.replacement.append(str);
+        apply_edit(&text_, edit_t(position(), 0, str));
+        set_position(position() + len);
+    } else {
+        push_edit(edit_t(position(), 0, str.substr(start, len)));
+    }
+    undo_history.may_coalesce = (str.size() == 1);
+}
+
+void editable_line_t::erase_substring(size_t offset, size_t length) {
+    push_edit(edit_t(offset, length, L""));
+    undo_history.may_coalesce = false;
+}
+
+void editable_line_t::replace_substring(size_t offset, size_t length, wcstring &&replacement) {
+    push_edit(edit_t(offset, length, replacement));
+    undo_history.may_coalesce = false;
+}
+
+bool editable_line_t::undo() {
+    if (undo_history.edits_applied == 0) return false;  // nothing to undo
+    const edit_t &edit = undo_history.edits.at(undo_history.edits_applied - 1);
+    undo_history.edits_applied--;
+    edit_t inverse = edit_t(edit.offset, edit.replacement.size(), L"");
+    inverse.replacement = edit.old;
+    size_t old_position = edit.cursor_position_before_edit;
+    apply_edit(&text_, std::move(inverse));
+    set_position(old_position);
+    undo_history.may_coalesce = false;
+    return true;
+}
+
+void editable_line_t::push_edit(edit_t &&edit) {
+    bool edit_does_nothing = edit.length == 0 && edit.replacement == L"";
+    if (edit_does_nothing) return;
+    if (undo_history.edits_applied != undo_history.edits.size()) {
+        // After undoing some edits, the user is making a new edit;
+        // we are about to create a new edit branch.
+        // Discard all edits that were undone because we only support
+        // linear undo/redo, they will be unreachable.
+        undo_history.edits.erase(undo_history.edits.begin() + undo_history.edits_applied,
+                                 undo_history.edits.end());
+    }
+    edit.cursor_position_before_edit = position();
+    edit.old = text_.substr(edit.offset, edit.length);
+    apply_edit(&text_, edit);
+    set_position(cursor_position_after_edit(edit));
+    assert(undo_history.edits_applied == undo_history.edits.size());
+    undo_history.edits_applied++;
+    undo_history.edits.emplace_back(edit);
+}
+
+bool editable_line_t::redo() {
+    if (undo_history.edits_applied >= undo_history.edits.size()) return false;  // nothing to redo
+    const edit_t &edit = undo_history.edits.at(undo_history.edits_applied);
+    undo_history.edits_applied++;
+    apply_edit(&text_, edit);
+    set_position(cursor_position_after_edit(edit));
+    undo_history.may_coalesce = false;  // Make a new undo group here.
+    return true;
 }
 
 namespace {
@@ -342,6 +450,10 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     std::shared_ptr<parser_t> parser_ref;
     /// String containing the whole current commandline.
     editable_line_t command_line;
+    /// Whether the most recent modification to the command line was done by either history search
+    /// or a pager selection change. When this is true and another transient change is made, the
+    /// old transient change will be removed from the undo history.
+    bool command_line_has_transient_edit = false;
     /// String containing the autosuggestion.
     wcstring autosuggestion;
     /// Current pager.
@@ -448,7 +560,7 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
     reader_data_t(std::shared_ptr<parser_t> parser, history_t *hist)
         : parser_ref(std::move(parser)), inputter(*parser_ref), history(hist) {}
 
-    void update_buff_pos(editable_line_t *el, size_t buff_pos);
+    void update_buff_pos(editable_line_t *el, maybe_t<size_t> new_pos = none_t());
     void repaint();
     void kill(editable_line_t *el, size_t begin_idx, size_t length, int mode, int newv);
     bool insert_string(editable_line_t *el, const wcstring &str);
@@ -490,11 +602,12 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
                             bool cont_after_prefix_insertion);
 
     void sanity_check() const;
-    void set_command_line_and_position(editable_line_t *el, const wcstring &new_str, size_t pos);
-    void replace_current_token(const wcstring &new_token);
+    void set_command_line_and_position(editable_line_t *el, wcstring &&new_str, size_t pos);
+    void clear_transient_edit();
+    void replace_current_token(wcstring &&new_token);
     void update_command_line_from_history_search();
-    void set_buffer_maintaining_pager(const wcstring &b, size_t pos);
-    void remove_backward();
+    void set_buffer_maintaining_pager(const wcstring &b, size_t pos, bool transient = false);
+    void delete_char(bool backward = true);
 };
 
 /// This variable is set to a signal by the signal handler when ^C is pressed.
@@ -597,8 +710,11 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
 }
 
 /// Update the cursor position.
-void reader_data_t::update_buff_pos(editable_line_t *el, size_t buff_pos) {
-    el->position() = buff_pos;
+void reader_data_t::update_buff_pos(editable_line_t *el, maybe_t<size_t> new_pos) {
+    if (new_pos) {
+        el->set_position(*new_pos);
+    }
+    size_t buff_pos = el->position();
     if (el == &command_line && sel_active) {
         if (sel_begin_pos <= buff_pos) {
             sel_start_pos = sel_begin_pos;
@@ -677,17 +793,9 @@ void reader_data_t::kill(editable_line_t *el, size_t begin_idx, size_t length, i
 
         kill_replace(old, kill_item);
     }
-
-    if (el->position() > begin_idx) {
-        // Move the buff position back by the number of characters we deleted, but don't go past
-        // buff_pos.
-        size_t backtrack = std::min(el->position() - begin_idx, length);
-        update_buff_pos(el, el->position() - backtrack);
-    }
-
-    el->text().erase(begin_idx, length);
+    el->erase_substring(begin_idx, length);
+    update_buff_pos(el);
     command_line_changed(el);
-
     super_highlight_me_plenty();
     repaint();
 }
@@ -735,15 +843,19 @@ void reader_data_t::pager_selection_changed() {
             completion_apply_to_command_line(completion->completion, completion->flags,
                                              this->cycle_command_line, &cursor_pos, false);
     }
-    set_buffer_maintaining_pager(new_cmd_line, cursor_pos);
+
+    // Only update if something changed, to avoid useless edits in the undo history.
+    if (new_cmd_line != command_line.text()) {
+        set_buffer_maintaining_pager(new_cmd_line, cursor_pos, true /* transient */);
+    }
 
     // Trigger repaint (see issue #765).
     reader_repaint_needed();
 }
 
 /// Expand abbreviations at the given cursor position. Does NOT inspect 'data'.
-maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
-                                                        const environment_t &vars) {
+maybe_t<edit_t> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
+                                                      const environment_t &vars) {
     // See if we are at "command position". Get the surrounding command substitution, and get the
     // extent of the first token.
     const wchar_t *const buff = cmdline.c_str();
@@ -791,16 +903,14 @@ maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline,
     }
 
     // Now if we found a command node, expand it.
-    maybe_t<wcstring> result{};
+    maybe_t<edit_t> result{};
     if (matching_cmd_node) {
         const wcstring token = matching_cmd_node.get_source(subcmd);
         if (auto abbreviation = expand_abbreviation(token, vars)) {
             // There was an abbreviation! Replace the token in the full command. Maintain the
             // relative position of the cursor.
-            wcstring output = cmdline;
             source_range_t r = *matching_cmd_node.source_range();
-            output.replace(subcmd_offset + r.start, r.length, *abbreviation);
-            result = std::move(output);
+            result = edit_t(subcmd_offset + r.start, r.length, std::move(*abbreviation));
         }
     }
     return result;
@@ -817,14 +927,10 @@ bool reader_data_t::expand_abbreviation_as_necessary(size_t cursor_backtrack) {
         // Try expanding abbreviations.
         size_t cursor_pos = el->position() - std::min(el->position(), cursor_backtrack);
 
-        if (auto new_cmdline =
-                reader_expand_abbreviation_in_command(el->text(), cursor_pos, vars())) {
-            // We expanded an abbreviation! The cursor moves by the difference in the command line
-            // lengths.
-            size_t new_buff_pos = el->position() + new_cmdline->size() - el->text().size();
-
-            el->text() = std::move(*new_cmdline);
-            update_buff_pos(el, new_buff_pos);
+        if (auto edit = reader_expand_abbreviation_in_command(el->text(), cursor_pos, vars())) {
+            el->push_edit(std::move(*edit));
+            update_buff_pos(el);
+            el->undo_history.may_coalesce = false;
             command_line_changed(el);
             result = true;
         }
@@ -1067,6 +1173,8 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field)
         case rl::capitalize_word:
         case rl::beginning_of_buffer:
         case rl::end_of_buffer:
+        case rl::undo:
+        case rl::redo:
             // These commands operate on the search field if that's where the focus is.
             return !focused_on_search_field;
         default:
@@ -1093,19 +1201,26 @@ static bool command_ends_history_search(readline_cmd_t c) {
 
 /// Remove the previous character in the character buffer and on the screen using syntax
 /// highlighting, etc.
-void reader_data_t::remove_backward() {
+void reader_data_t::delete_char(bool backward) {
     editable_line_t *el = active_edit_line();
 
-    if (el->position() <= 0) return;
+    size_t pos = el->position();
+    if (!backward) {
+        pos++;
+    }
+    size_t pos_end = pos;
+
+    if (el->position() == 0) return;
 
     // Fake composed character sequences by continuing to delete until we delete a character of
     // width at least 1.
     int width;
     do {
-        update_buff_pos(el, el->position() - 1);
-        width = fish_wcwidth(el->text().at(el->position()));
-        el->text().erase(el->position(), 1);
-    } while (width == 0 && el->position() > 0);
+        pos--;
+        width = fish_wcwidth(el->text().at(pos));
+    } while (width == 0 && pos > 0);
+    el->erase_substring(pos, pos_end - pos);
+    update_buff_pos(el);
     command_line_changed(el);
     suppress_autosuggestion = true;
 
@@ -1120,7 +1235,7 @@ bool reader_data_t::insert_string(editable_line_t *el, const wcstring &str) {
     if (str.empty()) return false;
 
     el->insert_string(str, 0, str.size());
-    update_buff_pos(el, el->position());
+    update_buff_pos(el);
     command_line_changed(el);
 
     if (el == &command_line) {
@@ -1383,17 +1498,20 @@ void reader_data_t::accept_autosuggestion(bool full, move_word_style_t style) {
         // Accept the autosuggestion.
         if (full) {
             // Just take the whole thing.
-            command_line.text() = autosuggestion;
+            command_line.replace_substring(0, command_line.size(), std::move(autosuggestion));
         } else {
             // Accept characters according to the specified style.
             move_word_state_machine_t state(style);
-            for (size_t idx = command_line.size(); idx < autosuggestion.size(); idx++) {
-                wchar_t wc = autosuggestion.at(idx);
+            size_t want;
+            for (want = command_line.size(); want < autosuggestion.size(); want++) {
+                wchar_t wc = autosuggestion.at(want);
                 if (!state.consume_char(wc)) break;
-                command_line.text().push_back(wc);
             }
+            size_t have = command_line.size();
+            command_line.replace_substring(command_line.size(), 0,
+                                           autosuggestion.substr(have, want - have));
         }
-        update_buff_pos(&command_line, command_line.size());
+        update_buff_pos(&command_line);
         command_line_changed(&command_line);
         super_highlight_me_plenty();
         repaint();
@@ -1832,18 +1950,30 @@ void reader_data_t::sanity_check() const {
 }
 
 /// Set the specified string as the current buffer.
-void reader_data_t::set_command_line_and_position(editable_line_t *el, const wcstring &new_str,
+void reader_data_t::set_command_line_and_position(editable_line_t *el, wcstring &&new_str,
                                                   size_t pos) {
-    el->text() = new_str;
+    el->push_edit(edit_t(0, el->size(), std::move(new_str)));
+    el->set_position(pos);
+    el->undo_history.may_coalesce = false;
     update_buff_pos(el, pos);
     command_line_changed(el);
     super_highlight_me_plenty();
     mark_repaint_needed();
 }
 
-void reader_data_t::replace_current_token(const wcstring &new_token) {
+/// Undo the transient edit und update commandline accordingly.
+void reader_data_t::clear_transient_edit() {
+    assert(command_line_has_transient_edit);
+    command_line.undo();
+    update_buff_pos(&command_line);
+    command_line_changed(&command_line);
+    super_highlight_me_plenty();
+    mark_repaint_needed();
+    command_line_has_transient_edit = false;
+}
+
+void reader_data_t::replace_current_token(wcstring &&new_token) {
     const wchar_t *begin, *end;
-    size_t new_pos;
 
     // Find current token.
     editable_line_t *el = active_edit_line();
@@ -1852,24 +1982,32 @@ void reader_data_t::replace_current_token(const wcstring &new_token) {
 
     if (!begin || !end) return;
 
-    // Make new string.
-    wcstring new_buff(buff, begin - buff);
-    new_buff.append(new_token);
-    new_buff.append(end);
-    new_pos = (begin - buff) + new_token.size();
-
-    set_command_line_and_position(el, new_buff, new_pos);
+    size_t offset = begin - buff;
+    size_t length = end - buff;
+    el->replace_substring(offset, length, std::move(new_token));
 }
 
 /// Apply the history search to the command line.
 void reader_data_t::update_command_line_from_history_search() {
     wcstring new_text = history_search.is_at_end() ? history_search.search_string()
                                                    : history_search.current_result();
-    if (history_search.by_token()) {
-        replace_current_token(new_text);
-    } else if (history_search.by_line() || history_search.by_prefix()) {
-        set_command_line_and_position(&command_line, new_text, new_text.size());
+    editable_line_t *el = active_edit_line();
+    if (command_line_has_transient_edit) {
+        el->undo();
     }
+    if (history_search.by_token()) {
+        replace_current_token(std::move(new_text));
+    } else {
+        assert((history_search.by_line() || history_search.by_prefix()) &&
+               "Unknown history search type");
+        el->replace_substring(0, el->size(), std::move(new_text));
+    }
+    command_line_has_transient_edit = true;
+    assert(el == &command_line);
+    update_buff_pos(el);
+    command_line_changed(el);
+    super_highlight_me_plenty();
+    mark_repaint_needed();
 }
 
 enum move_word_dir_t { MOVE_DIR_LEFT, MOVE_DIR_RIGHT };
@@ -1922,11 +2060,17 @@ void reader_data_t::move_word(editable_line_t *el, bool move_right, bool erase,
 }
 
 /// Sets the command line contents, without clearing the pager.
-void reader_data_t::set_buffer_maintaining_pager(const wcstring &b, size_t pos) {
+void reader_data_t::set_buffer_maintaining_pager(const wcstring &b, size_t pos, bool transient) {
     // Callers like to pass us pointers into ourselves, so be careful! I don't know if we can use
     // operator= with a pointer to our interior, so use an intermediate.
     size_t command_line_len = b.size();
-    command_line.text() = b;
+    if (transient) {
+        if (command_line_has_transient_edit) {
+            command_line.undo();
+        }
+        command_line_has_transient_edit = true;
+    }
+    command_line.replace_substring(0, command_line.size(), wcstring(b));
     command_line_changed(&command_line);
 
     // Don't set a position past the command line length.
@@ -2298,7 +2442,7 @@ static int read_i(parser_t &parser) {
         } else if (tmp) {
             const wcstring command = tmp.acquire();
             data->update_buff_pos(&data->command_line, 0);
-            data->command_line.text().clear();
+            data->command_line.clear();
             data->command_line_changed(&data->command_line);
             wcstring_list_t argv(1, command);
             event_fire_generic(parser, L"fish_preexec", &argv);
@@ -2540,7 +2684,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 // Remove a trailing backslash. This may trigger an extra repaint, but this is
                 // rare.
                 if (is_backslashed(el->text(), el->position())) {
-                    remove_backward();
+                    delete_char();
                 }
 
                 // Get the string; we have to do this after removing any trailing backslash.
@@ -2685,16 +2829,22 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
         }
         case rl::yank_pop: {
             if (rls.yank_len) {
-                for (size_t i = 0; i < rls.yank_len; i++) remove_backward();
-
+                editable_line_t *el = active_edit_line();
                 wcstring yank_str = kill_yank_rotate();
-                insert_string(active_edit_line(), yank_str);
-                rls.yank_len = yank_str.size();
+                size_t new_yank_len = yank_str.size();
+                el->replace_substring(el->position() - rls.yank_len, rls.yank_len,
+                                      std::move(yank_str));
+                update_buff_pos(el);
+                rls.yank_len = new_yank_len;
+                command_line_changed(el);
+                suppress_autosuggestion = true;
+                super_highlight_me_plenty();
+                mark_repaint_needed();
             }
             break;
         }
         case rl::backward_delete_char: {
-            remove_backward();
+            delete_char();
             break;
         }
         case rl::delete_or_exit:
@@ -2703,8 +2853,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
             // syntax highlighting, etc.
             editable_line_t *el = active_edit_line();
             if (el->position() < el->size()) {
-                update_buff_pos(el, el->position() + 1);
-                remove_backward();
+                delete_char(false /* backward */);
             } else if (c == rl::delete_or_exit && el->empty()) {
                 reader_set_end_loop(true);
             }
@@ -3059,7 +3208,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 new_buff.append(prev);
                 new_buff.append(trail);
                 // Put cursor right after the second token.
-                set_command_line_and_position(el, new_buff, tok_end - buff);
+                set_command_line_and_position(el, std::move(new_buff), tok_end - buff);
             }
             break;
         }
@@ -3072,7 +3221,9 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
 
             // We apply the operation from the current location to the end of the word.
             size_t pos = el->position();
+            size_t init_pos = pos;
             move_word(el, MOVE_DIR_RIGHT, false, move_word_style_punctuation, false);
+            wcstring replacement;
             for (; pos < el->position(); pos++) {
                 wchar_t chr = el->text().at(pos);
 
@@ -3090,9 +3241,11 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 else
                     chr = towlower(chr);
 
-                command_line.text().at(pos) = chr;
+                replacement.push_back(chr);
                 capitalized_first = capitalized_first || make_uppercase;
             }
+            el->replace_substring(init_pos, pos - init_pos, std::move(replacement));
+            update_buff_pos(el);
             command_line_changed(el);
             super_highlight_me_plenty();
             reader_repaint_needed();
@@ -3191,6 +3344,23 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
                 inputter.function_set_status(false);
             }
             break;
+        }
+        case rl::undo:
+        case rl::redo: {
+            editable_line_t *el = active_edit_line();
+            bool ok = (c == rl::undo) ? el->undo() : el->redo();
+            if (ok) {
+                if (el == &command_line) {
+                    clear_pager();
+                }
+                update_buff_pos(el);
+                command_line_changed(el);
+                super_highlight_me_plenty();
+                mark_repaint_needed();
+            } else {
+                flash();
+            }
+            break;
         }
             // Some commands should have been handled internally by input_readch().
         case rl::self_insert: {
@@ -3286,7 +3456,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
             if (readline_cmd != rl::repaint) rls.coalescing_repaints = false;
 
             if (readline_cmd == rl::cancel && is_navigating_pager_contents()) {
-                set_command_line_and_position(&command_line, cycle_command_line, cycle_cursor_pos);
+                clear_transient_edit();
             }
 
             // Clear the pager if necessary.
@@ -3301,8 +3471,8 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
                 // "cancel" means to abort the whole thing, other ending commands mean to finish the
                 // search.
                 if (readline_cmd == rl::cancel) {
-                    history_search.go_to_end();
-                    update_command_line_from_history_search();
+                    // Go back to the search string by simply undoing the history-search edit.
+                    clear_transient_edit();
                 }
                 history_search.reset();
             }
@@ -3320,6 +3490,7 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
                 // End paging upon inserting into the normal command line.
                 if (el == &command_line) {
                     clear_pager();
+                    command_line_has_transient_edit = false;
                 }
             } else {
                 // This can happen if the user presses a control char we don't recognize. No
diff --git a/src/reader.h b/src/reader.h
index 663b48f2d..c319641ba 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -20,39 +20,98 @@ class io_chain_t;
 class operation_context_t;
 class parser_t;
 
+/// An edit action that can be undone.
+struct edit_t {
+    /// When undoing the edit we use this to restore the previous cursor position.
+    size_t cursor_position_before_edit = 0;
+
+    /// The span of text that is replaced by this edit.
+    size_t offset, length;
+
+    /// The strings that are removed and added by this edit, respectively.
+    wcstring old, replacement;
+
+    explicit edit_t(size_t offset, size_t length, wcstring replacement)
+        : offset(offset), length(length), replacement(std::move(replacement)) {}
+
+    /// Used for testing.
+    bool operator==(const edit_t &other) const;
+};
+
+/// Modify a string according to the given edit.
+/// Currently exposed for testing only.
+void apply_edit(wcstring *target, const edit_t &edit);
+
+/// The history of all edits to some command line.
+struct undo_history_t {
+    /// The stack of edits that can be undone or redone atomically.
+    std::vector<edit_t> edits;
+
+    /// The position in the undo stack that corresponds to the current
+    /// state of the input line.
+    /// Invariants:
+    ///     edits_applied - 1 is the index of the next edit to undo.
+    ///     edits_applied     is the index of the next edit to redo.
+    ///
+    /// For example, if nothing was undone, edits_applied is edits.size().
+    /// If every single edit was undone, edits_applied is 0.
+    size_t edits_applied = 0;
+
+    /// Whether we allow the next edit to be grouped together with the
+    /// last one.
+    bool may_coalesce = false;
+
+    /// Empty the history.
+    void clear();
+};
+
 /// Helper class for storing a command line.
 class editable_line_t {
     /// The command line.
     wcstring text_;
     /// The current position of the cursor in the command line.
-    size_t position_;
+    size_t position_ = 0;
 
    public:
+    undo_history_t undo_history;
+
     const wcstring &text() const { return text_; }
+    /// Set the text directly without maintaining undo invariants. Use with caution.
+    void set_text_bypassing_undo_history(wcstring &&text) { text_ = text; }
 
     size_t position() const { return position_; }
-    void set_position(size_t position) { position_ = position; } 
-
-    // TODO remove these overloads!
-    wcstring &text() { return text_; }
-    size_t &position() { return position_; }
+    void set_position(size_t position) { position_ = position; }
 
     // Gets the length of the text.
     size_t size() const { return text().size(); }
 
     bool empty() const { return text().empty(); }
 
+    wchar_t at(size_t idx) { return text().at(idx); }
+
     void clear() {
-        text_.clear();
+        undo_history.clear();
+        if (empty()) return;
+        set_text_bypassing_undo_history(L"");
         set_position(0);
     }
 
-    wchar_t at(size_t idx) { return text().at(idx); }
-
-    editable_line_t() : text_(), position_(0) {}
+    /// Modify the commandline according to @edit. Most modifications to the
+    /// text should pass through this function. You can use one of the wrappers below.
+    void push_edit(edit_t &&edit);
 
+    /// Erase @length characters starting at @offset.
+    void erase_substring(size_t offset, size_t length);
+    /// Replace the text of length @length at @offset by @replacement.
+    void replace_substring(size_t offset, size_t length, wcstring &&replacement);
     /// Inserts a substring of str given by start, len at the cursor position.
     void insert_string(const wcstring &str, size_t start = 0, size_t len = wcstring::npos);
+
+    /// Undo the most recent edit that was not yet undone. Returns true on success.
+    bool undo();
+
+    /// Redo the most recent undo. Returns true on success.
+    bool redo();
 };
 
 /// Read commands from \c fd until encountering EOF.
@@ -216,8 +275,8 @@ wcstring combine_command_and_autosuggestion(const wcstring &cmdline,
 
 /// Expand abbreviations at the given cursor position. Exposed for testing purposes only.
 /// \return none if no abbreviations were expanded, otherwise the new command line.
-maybe_t<wcstring> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
-                                                        const environment_t &vars);
+maybe_t<edit_t> reader_expand_abbreviation_in_command(const wcstring &cmdline, size_t cursor_pos,
+                                                      const environment_t &vars);
 
 /// Apply a completion string. Exposed for testing only.
 wcstring completion_apply_to_command_line(const wcstring &val_str, complete_flags_t flags,

From 921fce3a51cb2a8ceca7efa021874338bc46e207 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Thu, 30 Jan 2020 21:46:22 +0100
Subject: [PATCH 1701/1732] math: Complain about unknown *function*, not
 *variable*

We removed variables from tinyexpr, so we shouldn't use that error.
---
 src/builtin_math.cpp   | 4 ++--
 src/tinyexpr.cpp       | 8 ++++----
 src/tinyexpr.h         | 2 +-
 tests/checks/math.fish | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/builtin_math.cpp b/src/builtin_math.cpp
index 6ae67677b..e6142f703 100644
--- a/src/builtin_math.cpp
+++ b/src/builtin_math.cpp
@@ -134,8 +134,8 @@ static const wchar_t *math_describe_error(te_error_t &error) {
     switch (error.type) {
         case TE_ERROR_NONE:
             DIE("Error has no position");
-        case TE_ERROR_UNKNOWN_VARIABLE:
-            return _(L"Unknown variable");
+        case TE_ERROR_UNKNOWN_FUNCTION:
+            return _(L"Unknown function");
         case TE_ERROR_MISSING_CLOSING_PAREN:
             return _(L"Missing closing parenthesis");
         case TE_ERROR_MISSING_OPENING_PAREN:
diff --git a/src/tinyexpr.cpp b/src/tinyexpr.cpp
index 035ea15b9..e134b6cb7 100644
--- a/src/tinyexpr.cpp
+++ b/src/tinyexpr.cpp
@@ -91,7 +91,7 @@ typedef struct state {
     te_error_type_t error;
 } state;
 
-/* Parses the input expression and binds variables. */
+/* Parses the input expression. */
 /* Returns NULL on error. */
 te_expr *te_compile(const char *expression, te_error_t *error);
 
@@ -234,7 +234,7 @@ void next_token(state *s) {
             s->value = strtod(s->next, const_cast<char **>(&s->next));
             s->type = TOK_NUMBER;
         } else {
-            /* Look for a variable or builtin function call. */
+            /* Look for a function call. */
             // But not when it's an "x" followed by whitespace
             // - that's the alternative multiplication operator.
             if (s->next[0] >= 'a' && s->next[0] <= 'z' &&
@@ -260,7 +260,7 @@ void next_token(state *s) {
                 } else if (s->type != TOK_ERROR || s->error == TE_ERROR_UNKNOWN) {
                     // Our error is more specific, so it takes precedence.
                     s->type = TOK_ERROR;
-                    s->error = TE_ERROR_UNKNOWN_VARIABLE;
+                    s->error = TE_ERROR_UNKNOWN_FUNCTION;
                 }
             } else {
                 /* Look for an operator or special character. */
@@ -329,7 +329,7 @@ static te_expr *expr(state *s);
 static te_expr *power(state *s);
 
 static te_expr *base(state *s) {
-    /* <base>      =    <constant> | <variable> | <function-0> {"(" ")"} | <function-1> <power> |
+    /* <base>      =    <constant> | <function-0> {"(" ")"} | <function-1> <power> |
      * <function-X> "(" <expr> {"," <expr>} ")" | "(" <list> ")" */
     te_expr *ret;
     int arity;
diff --git a/src/tinyexpr.h b/src/tinyexpr.h
index bd6e93409..fec012fd4 100644
--- a/src/tinyexpr.h
+++ b/src/tinyexpr.h
@@ -29,7 +29,7 @@
 
 typedef enum {
     TE_ERROR_NONE = 0,
-    TE_ERROR_UNKNOWN_VARIABLE = 1,
+    TE_ERROR_UNKNOWN_FUNCTION = 1,
     TE_ERROR_MISSING_CLOSING_PAREN = 2,
     TE_ERROR_MISSING_OPENING_PAREN = 3,
     TE_ERROR_TOO_FEW_ARGS = 4,
diff --git a/tests/checks/math.fish b/tests/checks/math.fish
index 381a26bed..b3cab0c4a 100644
--- a/tests/checks/math.fish
+++ b/tests/checks/math.fish
@@ -127,7 +127,7 @@ math 0x2 # Hex
 math 5 x 4
 math 2x 4
 math 2 x4 # ERROR
-# CHECKERR: math: Error: Unknown variable
+# CHECKERR: math: Error: Unknown function
 # CHECKERR: '2 x4'
 # CHECKERR:     ^
 math 0x 3

From fc884e9cf4e102495426a5e8f6f28c3f02b3abb2 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 7 Feb 2020 20:40:25 +0100
Subject: [PATCH 1702/1732] Port function.in test to littlecheck

---
 tests/checks/function.fish | 117 +++++++++++++++++++++++++++++++++++++
 tests/function.err         |  34 -----------
 tests/function.in          |  64 --------------------
 tests/function.out         |  77 ------------------------
 4 files changed, 117 insertions(+), 175 deletions(-)
 delete mode 100644 tests/function.err
 delete mode 100644 tests/function.in
 delete mode 100644 tests/function.out

diff --git a/tests/checks/function.fish b/tests/checks/function.fish
index 5d6a22be1..31a65ee2f 100644
--- a/tests/checks/function.fish
+++ b/tests/checks/function.fish
@@ -2,3 +2,120 @@
 function t --argument-names a b c
     echo t
 end
+
+set -g foo 'global foo'
+set -l foo 'local foo'
+set bar one 'two    2' \t '' 3
+set baz
+function frob -V foo -V bar -V baz
+    set --show foo bar baz
+end
+
+frob
+#CHECK: $foo: set in local scope, unexported, with 1 elements
+#CHECK: $foo[1]: length=9 value=|local foo|
+#CHECK: $foo: set in global scope, unexported, with 1 elements
+#CHECK: $foo[1]: length=10 value=|global foo|
+#CHECK: $foo: not set in universal scope
+#CHECK: 
+#CHECK: $bar: set in local scope, unexported, with 5 elements
+#CHECK: $bar[1]: length=3 value=|one|
+#CHECK: $bar[2]: length=8 value=|two    2|
+#CHECK: $bar[3]: length=1 value=|\t|
+#CHECK: $bar[4]: length=0 value=||
+#CHECK: $bar[5]: length=1 value=|3|
+#CHECK: $bar: set in global scope, unexported, with 5 elements
+#CHECK: $bar[1]: length=3 value=|one|
+#CHECK: $bar[2]: length=8 value=|two    2|
+#CHECK: $bar[3]: length=1 value=|\t|
+#CHECK: $bar[4]: length=0 value=||
+#CHECK: $bar[5]: length=1 value=|3|
+#CHECK: $bar: not set in universal scope
+#CHECK: 
+#CHECK: $baz: set in local scope, unexported, with 0 elements
+#CHECK: $baz: set in global scope, unexported, with 0 elements
+#CHECK: $baz: not set in universal scope
+
+set foo 'bad foo'
+set bar 'bad bar'
+set baz 'bad baz'
+frob
+#CHECK: $foo: set in local scope, unexported, with 1 elements
+#CHECK: $foo[1]: length=9 value=|local foo|
+#CHECK: $foo: set in global scope, unexported, with 1 elements
+#CHECK: $foo[1]: length=10 value=|global foo|
+#CHECK: $foo: not set in universal scope
+#CHECK: 
+#CHECK: $bar: set in local scope, unexported, with 5 elements
+#CHECK: $bar[1]: length=3 value=|one|
+#CHECK: $bar[2]: length=8 value=|two    2|
+#CHECK: $bar[3]: length=1 value=|\t|
+#CHECK: $bar[4]: length=0 value=||
+#CHECK: $bar[5]: length=1 value=|3|
+#CHECK: $bar: set in global scope, unexported, with 1 elements
+#CHECK: $bar[1]: length=7 value=|bad bar|
+#CHECK: $bar: not set in universal scope
+#CHECK: 
+#CHECK: $baz: set in local scope, unexported, with 0 elements
+#CHECK: $baz: set in global scope, unexported, with 1 elements
+#CHECK: $baz[1]: length=7 value=|bad baz|
+#CHECK: $baz: not set in universal scope
+#CHECK: 
+
+# This sequence of tests originally verified that functions `name2` and
+# `name4` were created. See issue #2068. That behavior is not what we want.
+# The function name must always be the first argument of the `function`
+# command. See issue #2827.
+function name1 -a arg1 arg2
+    echo hello
+end
+function -a arg1 arg2 name2 ; end
+#CHECKERR: {{.*}}checks/function.fish (line {{\d+}}): function: Illegal function name '-a'
+#CHECKERR: function -a arg1 arg2 name2 ; end
+#CHECKERR: ^
+function name3 --argument-names arg1 arg2 ; echo hello; echo goodbye; end
+function --argument-names arg1 arg2 name4 ; end
+#CHECKERR: {{.*}}checks/function.fish (line {{\d+}}): function: Illegal function name '--argument-names'
+#CHECKERR: function --argument-names arg1 arg2 name4 ; end
+#CHECKERR: ^
+function name5 abc --argument-names def ; end
+#CHECKERR: {{.*}}checks/function.fish (line {{\d+}}): function: Unexpected positional argument 'abc'
+#CHECKERR: function name5 abc --argument-names def ; end
+#CHECKERR: ^
+functions -q name1; and echo "Function name1 found"
+functions -q name2; or echo "Function name2 not found as expected"
+functions -q name3; and echo "Function name3 found"
+functions -q name4; or echo "Function name4 not found as expected"
+#CHECK: Function name1 found
+#CHECK: Function name2 not found as expected
+#CHECK: Function name3 found
+#CHECK: Function name4 not found as expected
+
+functions -c name1 name1a
+functions --copy name3 name3a
+functions -q name1a
+or echo "Function name1a not found as expected"
+functions -q name3a
+or echo "Function name3a not found as expected"
+
+# Poor man's diff because on some systems diff defaults to unified output, but that prints filenames.
+#
+set -l name1 (functions name1)
+set -l name1a (functions name1a)
+set -l name3 (functions name3)
+set -l name3a (functions name3a)
+# First line for the non-copied function is "# Defined in checks/function.fish" - skip it to work around #6575.
+test "$name1[3..-1]" = "$name1a[2..-1]"; and echo "1 = 1a"
+#CHECK: 1 = 1a
+test "$name3[3..-1]" = "$name3a[2..-1]"; and echo "3 = 3a"
+#CHECK: 3 = 3a
+
+function test; echo banana; end
+#CHECKERR: {{.*}}checks/function.fish (line {{\d+}}): function: The name 'test' is reserved,
+#CHECKERR: and can not be used as a function name
+#CHECKERR: function test; echo banana; end
+#CHECKERR: ^
+
+functions -q; or echo "False"
+#CHECK: False
+exit 0
diff --git a/tests/function.err b/tests/function.err
deleted file mode 100644
index 7257df763..000000000
--- a/tests/function.err
+++ /dev/null
@@ -1,34 +0,0 @@
-
-####################
-# Test the -V flag
-
-####################
-# Testing -V
-
-####################
-# Testing -V with changed variables
-fish: function: Illegal function name '-a'
-function -a arg1 arg2 name2 ; end
-^
-fish: function: Illegal function name '--argument-names'
-function --argument-names arg1 arg2 name4 ; end
-^
-fish: function: Unexpected positional argument 'abc'
-function name5 abc --argument-names def ; end
-^
-
-####################
-# Verify that functions can be copied. Tests against regression of issue #3601
-
-####################
-# Checking that the copied functions are identical other than the name
-
-####################
-# Checking reserved names
-fish: function: The name 'test' is reserved,
-and can not be used as a function name
-function test; echo banana; end
-^
-
-####################
-# Checking `functions -q` without arguments
diff --git a/tests/function.in b/tests/function.in
deleted file mode 100644
index a65183076..000000000
--- a/tests/function.in
+++ /dev/null
@@ -1,64 +0,0 @@
-# vim: set filetype=fish:
-#
-# Test the `function` builtin
-
-logmsg Test the -V flag
-set -g foo 'global foo'
-set -l foo 'local foo'
-set bar one 'two    2' \t '' 3
-set baz
-function frob -V foo -V bar -V baz
-    set --show foo bar baz
-end
-
-logmsg Testing -V
-frob
-
-logmsg Testing -V with changed variables
-set foo 'bad foo'
-set bar 'bad bar'
-set baz 'bad baz'
-frob
-
-# This sequence of tests originally verified that functions `name2` and
-# `name4` were created. See issue #2068. That behavior is not what we want.
-# The function name must always be the first argument of the `function`
-# command. See issue #2827.
-function name1 -a arg1 arg2 ; echo hello; end
-function -a arg1 arg2 name2 ; end
-function name3 --argument-names arg1 arg2 ; echo hello; echo goodbye; end
-function --argument-names arg1 arg2 name4 ; end
-function name5 abc --argument-names def ; end
-functions -q name1; and echo "Function name1 found"
-functions -q name2; or echo "Function name2 not found as expected"
-functions -q name3; and echo "Function name3 found"
-functions -q name4; or echo "Function name4 not found as expected"
-
-logmsg Verify that functions can be copied. Tests against regression of issue \#3601
-functions -c name1 name1a
-functions --copy name3 name3a
-functions -q name1a
-or echo "Function name1a not found as expected"
-functions -q name3a
-or echo "Function name3a not found as expected"
-
-logmsg Checking that the copied functions are identical other than the name
-# Poor man's diff because on some systems diff defaults to unified output, but that prints filenames.
-#
-set -l name1 (functions name1)
-set -l name1a (functions name1a)
-set -l name3 (functions name3)
-set -l name3a (functions name3a)
-echo $name1[1]
-echo $name1a[1]
-test "$name1[2..-1]" = "$name1a[2..-1]"; and echo "1 = 1a"
-echo $name3[1]
-echo $name3a[1]
-test "$name3[2..-1]" = "$name3a[2..-1]"; and echo "3 = 3a"
-
-logmsg Checking reserved names
-function test; echo banana; end
-
-logmsg Checking `functions -q` without arguments
-functions -q; or echo "False"
-exit 0
diff --git a/tests/function.out b/tests/function.out
deleted file mode 100644
index aec07aabf..000000000
--- a/tests/function.out
+++ /dev/null
@@ -1,77 +0,0 @@
-
-####################
-# Test the -V flag
-
-####################
-# Testing -V
-$foo: set in local scope, unexported, with 1 elements
-$foo[1]: length=9 value=|local foo|
-$foo: set in global scope, unexported, with 1 elements
-$foo[1]: length=10 value=|global foo|
-$foo: not set in universal scope
-
-$bar: set in local scope, unexported, with 5 elements
-$bar[1]: length=3 value=|one|
-$bar[2]: length=8 value=|two    2|
-$bar[3]: length=1 value=|\t|
-$bar[4]: length=0 value=||
-$bar[5]: length=1 value=|3|
-$bar: set in global scope, unexported, with 5 elements
-$bar[1]: length=3 value=|one|
-$bar[2]: length=8 value=|two    2|
-$bar[3]: length=1 value=|\t|
-$bar[4]: length=0 value=||
-$bar[5]: length=1 value=|3|
-$bar: not set in universal scope
-
-$baz: set in local scope, unexported, with 0 elements
-$baz: set in global scope, unexported, with 0 elements
-$baz: not set in universal scope
-
-
-####################
-# Testing -V with changed variables
-$foo: set in local scope, unexported, with 1 elements
-$foo[1]: length=9 value=|local foo|
-$foo: set in global scope, unexported, with 1 elements
-$foo[1]: length=10 value=|global foo|
-$foo: not set in universal scope
-
-$bar: set in local scope, unexported, with 5 elements
-$bar[1]: length=3 value=|one|
-$bar[2]: length=8 value=|two    2|
-$bar[3]: length=1 value=|\t|
-$bar[4]: length=0 value=||
-$bar[5]: length=1 value=|3|
-$bar: set in global scope, unexported, with 1 elements
-$bar[1]: length=7 value=|bad bar|
-$bar: not set in universal scope
-
-$baz: set in local scope, unexported, with 0 elements
-$baz: set in global scope, unexported, with 1 elements
-$baz[1]: length=7 value=|bad baz|
-$baz: not set in universal scope
-
-Function name1 found
-Function name2 not found as expected
-Function name3 found
-Function name4 not found as expected
-
-####################
-# Verify that functions can be copied. Tests against regression of issue #3601
-
-####################
-# Checking that the copied functions are identical other than the name
-function name1 --argument arg1 arg2
-function name1a --argument arg1 arg2
-1 = 1a
-function name3 --argument arg1 arg2
-function name3a --argument arg1 arg2
-3 = 3a
-
-####################
-# Checking reserved names
-
-####################
-# Checking `functions -q` without arguments
-False

From 15d2797ec197f5dd2822a0b926b7512720acfd96 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 7 Feb 2020 20:49:42 +0100
Subject: [PATCH 1703/1732] Port pipestatus test to littlecheck

---
 .../{pipestatus.in => checks/pipestatus.fish} | 60 +++++++++++++++----
 tests/pipestatus.err                          | 18 ------
 tests/pipestatus.out                          | 60 -------------------
 3 files changed, 49 insertions(+), 89 deletions(-)
 rename tests/{pipestatus.in => checks/pipestatus.fish} (72%)
 delete mode 100644 tests/pipestatus.err
 delete mode 100644 tests/pipestatus.out

diff --git a/tests/pipestatus.in b/tests/checks/pipestatus.fish
similarity index 72%
rename from tests/pipestatus.in
rename to tests/checks/pipestatus.fish
index d6ceea9a8..3ff8e294a 100644
--- a/tests/pipestatus.in
+++ b/tests/checks/pipestatus.fish
@@ -1,59 +1,97 @@
-logmsg "pipestatus variable - builtins only"
+#RUN: %fish %s
 
+# pipestatus variable - builtins only
 false | false | false; echo $pipestatus : $status
+#CHECK: 1 1 1 : 1
 true | true | true; echo $pipestatus : $status
+#CHECK: 0 0 0 : 0
 false | true | false; echo $pipestatus : $status
+#CHECK: 1 0 1 : 1
 true | false | true; echo $pipestatus : $status
+#CHECK: 0 1 0 : 0
 
-logmsg "pipestatus variable - no builtins"
-
+# pipestatus variable - no builtins
 command false | command false | command false; echo $pipestatus : $status
+#CHECK: 1 1 1 : 1
 command true | command true | command true; echo $pipestatus : $status
+#CHECK: 0 0 0 : 0
 command false | command true | command false; echo $pipestatus : $status
+#CHECK: 1 0 1 : 1
 command true | command false | command true; echo $pipestatus : $status
+#CHECK: 0 1 0 : 0
 
-logmsg "pipestatus variable - mixed"
-
+# pipestatus variable - mixed
 command false | command false | false; echo $pipestatus : $status
+#CHECK: 1 1 1 : 1
 command true | true | command true; echo $pipestatus : $status
+#CHECK: 0 0 0 : 0
 false | command true | command false; echo $pipestatus : $status
+#CHECK: 1 0 1 : 1
 true | false | command true; echo $pipestatus : $status
+#CHECK: 0 1 0 : 0
 sh -c 'exit 5' | sh -c 'exit 2'; echo $pipestatus : $status
+#CHECK: 5 2 : 2
 sh -c 'exit 3' | false | sh -c 'exit 6'; echo $pipestatus : $status
+#CHECK: 3 1 6 : 6
 sh -c 'exit 9' | true | sh -c 'exit 3' | false; echo $pipestatus : $status
+#CHECK: 9 0 3 1 : 1
 
-logmsg "pipestatus variable - non-pipe"
-
+# pipestatus variable - non-pipe
 true; echo $pipestatus : $status
+#CHECK: 0 : 0
 false; echo $pipestatus : $status
+#CHECK: 1 : 1
 command true; echo $pipestatus : $status
+#CHECK: 0 : 0
 command false; echo $pipestatus : $status
+#CHECK: 1 : 1
 sh -c 'exit 4'; echo $pipestatus : $status
+#CHECK: 4 : 4
 
-logmsg "pipestatus variable - negate"
-
+# pipestatus variable - negate
 ! true; echo $pipestatus : $status
+#CHECK: 0 : 1
 ! false; echo $pipestatus : $status
+#CHECK: 1 : 0
 ! false | false | false; echo $pipestatus : $status
+#CHECK: 1 1 1 : 0
 ! true | command true | true; echo $pipestatus : $status
+#CHECK: 0 0 0 : 1
 ! false | true | command false; echo $pipestatus : $status
+#CHECK: 1 0 1 : 0
 ! command true | command false | command true; echo $pipestatus : $status
+#CHECK: 0 1 0 : 1
 ! sh -c 'exit 9' | true | sh -c 'exit 3'; echo $pipestatus : $status
+#CHECK: 9 0 3 : 0
 
-logmsg "pipestatus variable - block"
-
+# pipestatus variable - block
 begin; true; end; echo $pipestatus : $status
+#CHECK: 0 : 0
 begin; false; end; echo $pipestatus : $status
+#CHECK: 1 : 1
 begin; ! true; end; echo $pipestatus : $status
+#CHECK: 0 : 1
 begin; ! false; end; echo $pipestatus : $status
+#CHECK: 1 : 0
 true | begin; true; end; echo $pipestatus : $status
+#CHECK: 0 0 : 0
 false | begin; false; end; echo $pipestatus : $status
+#CHECK: 1 1 : 1
 true | begin; ! true; end; echo $pipestatus : $status
+#CHECK: 0 1 : 1
 false | begin; ! false; end; echo $pipestatus : $status
+#CHECK: 1 0 : 0
 begin; true | false; end; echo $pipestatus : $status
+#CHECK: 0 1 : 1
 begin; false | true; end; echo $pipestatus : $status
+#CHECK: 1 0 : 0
 begin; ! true; end | false ; echo $pipestatus : $status
+#CHECK: 1 1 : 1
 begin; ! false; end | true; echo $pipestatus : $status
+#CHECK: 0 0 : 0
 begin; sh -c 'exit 3'; end | begin; sh -c 'exit 5'; end; echo $pipestatus : $status
+#CHECK: 3 5 : 5
 begin; ! sh -c 'exit 3'; end | begin; sh -c 'exit 5'; end; echo $pipestatus : $status
+#CHECK: 0 5 : 5
 begin; ! sh -c 'exit 3'; end | begin; ! sh -c 'exit 5'; end; echo $pipestatus : $status
+#CHECK: 0 0 : 0
diff --git a/tests/pipestatus.err b/tests/pipestatus.err
deleted file mode 100644
index 9ac758b4a..000000000
--- a/tests/pipestatus.err
+++ /dev/null
@@ -1,18 +0,0 @@
-
-####################
-# pipestatus variable - builtins only
-
-####################
-# pipestatus variable - no builtins
-
-####################
-# pipestatus variable - mixed
-
-####################
-# pipestatus variable - non-pipe
-
-####################
-# pipestatus variable - negate
-
-####################
-# pipestatus variable - block
diff --git a/tests/pipestatus.out b/tests/pipestatus.out
deleted file mode 100644
index bf5e7e03e..000000000
--- a/tests/pipestatus.out
+++ /dev/null
@@ -1,60 +0,0 @@
-
-####################
-# pipestatus variable - builtins only
-1 1 1 : 1
-0 0 0 : 0
-1 0 1 : 1
-0 1 0 : 0
-
-####################
-# pipestatus variable - no builtins
-1 1 1 : 1
-0 0 0 : 0
-1 0 1 : 1
-0 1 0 : 0
-
-####################
-# pipestatus variable - mixed
-1 1 1 : 1
-0 0 0 : 0
-1 0 1 : 1
-0 1 0 : 0
-5 2 : 2
-3 1 6 : 6
-9 0 3 1 : 1
-
-####################
-# pipestatus variable - non-pipe
-0 : 0
-1 : 1
-0 : 0
-1 : 1
-4 : 4
-
-####################
-# pipestatus variable - negate
-0 : 1
-1 : 0
-1 1 1 : 0
-0 0 0 : 1
-1 0 1 : 0
-0 1 0 : 1
-9 0 3 : 0
-
-####################
-# pipestatus variable - block
-0 : 0
-1 : 1
-0 : 1
-1 : 0
-0 0 : 0
-1 1 : 1
-0 1 : 1
-1 0 : 0
-0 1 : 1
-1 0 : 0
-1 1 : 1
-0 0 : 0
-3 5 : 5
-0 5 : 5
-0 0 : 0

From e40441f901ac51988a28885412b003cf83fbd583 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 7 Feb 2020 20:53:20 +0100
Subject: [PATCH 1704/1732] Port history tests to littlecheck

---
 tests/checks/history.fish | 61 +++++++++++++++++++++++++++++++++++++++
 tests/history.err         | 23 ---------------
 tests/history.in          | 44 ----------------------------
 tests/history.out         |  0
 4 files changed, 61 insertions(+), 67 deletions(-)
 create mode 100644 tests/checks/history.fish
 delete mode 100644 tests/history.err
 delete mode 100644 tests/history.in
 delete mode 100644 tests/history.out

diff --git a/tests/checks/history.fish b/tests/checks/history.fish
new file mode 100644
index 000000000..f05319bde
--- /dev/null
+++ b/tests/checks/history.fish
@@ -0,0 +1,61 @@
+#RUN: %fish %s
+# Verify that specifying unexpected options or arguments results in an error.
+
+# First using the legacy, now deprecated, long options to specify a
+# subcommand.
+
+# First with the history function.
+history --search --merge
+#CHECKERR: history: Mutually exclusive flags 'merge' and `search` seen
+history --clear --contains
+#CHECKERR: history: you cannot use any options with the clear command
+history --merge -t
+#CHECKERR: history: you cannot use any options with the merge command
+history --save xyz
+#CHECKERR: history: save expected 0 args, got 1
+
+# Now with the history builtin.
+builtin history --save --prefix
+#CHECKERR: history: you cannot use any options with the save command
+builtin history --clear --show-time
+#CHECKERR: history: you cannot use any options with the clear command
+builtin history --merge xyz
+#CHECKERR: history merge: Expected 0 args, got 1
+builtin history --clear abc def
+#CHECKERR: history clear: Expected 0 args, got 2
+
+# Now using the preferred subcommand form. Note that we support flags before
+# or after the subcommand name so test both variants.
+
+# First with the history function.
+history clear --contains
+#CHECKERR: history: you cannot use any options with the clear command
+history merge -t
+#CHECKERR: history: you cannot use any options with the merge command
+history save xyz
+#CHECKERR: history: save expected 0 args, got 1
+history --prefix clear
+#CHECKERR: history: you cannot use any options with the clear command
+history --show-time merge
+#CHECKERR: history: you cannot use any options with the merge command
+
+# Now with the history builtin.
+builtin history --search --merge
+#CHECKERR: history: Invalid combination of options,
+#CHECKERR: you cannot do both 'search' and 'merge' in the same invocation
+builtin history save --prefix
+#CHECKERR: history: you cannot use any options with the save command
+builtin history clear --show-time
+#CHECKERR: history: you cannot use any options with the clear command
+builtin history merge xyz
+#CHECKERR: history merge: Expected 0 args, got 1
+builtin history clear abc def
+#CHECKERR: history clear: Expected 0 args, got 2
+builtin history --contains save
+#CHECKERR: history: you cannot use any options with the save command
+builtin history -t merge
+#CHECKERR: history: you cannot use any options with the merge command
+
+# Now do a history command that should succeed so we exit with a zero,
+# success, status.
+builtin history save
diff --git a/tests/history.err b/tests/history.err
deleted file mode 100644
index b5bc875eb..000000000
--- a/tests/history.err
+++ /dev/null
@@ -1,23 +0,0 @@
-history: Mutually exclusive flags 'merge' and `search` seen
-history: you cannot use any options with the clear command
-history: you cannot use any options with the merge command
-history: save expected 0 args, got 1
-history: you cannot use any options with the save command
-history: you cannot use any options with the clear command
-history merge: Expected 0 args, got 1
-history clear: Expected 0 args, got 2
-
-history: you cannot use any options with the clear command
-history: you cannot use any options with the merge command
-history: save expected 0 args, got 1
-history: you cannot use any options with the clear command
-history: you cannot use any options with the merge command
-
-history: Invalid combination of options,
-you cannot do both 'search' and 'merge' in the same invocation
-history: you cannot use any options with the save command
-history: you cannot use any options with the clear command
-history merge: Expected 0 args, got 1
-history clear: Expected 0 args, got 2
-history: you cannot use any options with the save command
-history: you cannot use any options with the merge command
diff --git a/tests/history.in b/tests/history.in
deleted file mode 100644
index c3553904c..000000000
--- a/tests/history.in
+++ /dev/null
@@ -1,44 +0,0 @@
-# Verify that specifying unexpected options or arguments results in an error.
-
-# First using the legacy, now deprecated, long options to specify a
-# subcommand.
-
-# First with the history function.
-history --search --merge
-history --clear --contains
-history --merge -t
-history --save xyz
-
-# Now with the history builtin.
-builtin history --save --prefix
-builtin history --clear --show-time
-builtin history --merge xyz
-builtin history --clear abc def
-
-# Put a blank line in the stderr output to separate the above sequence from
-# the following sequence of tests.
-echo >&2
-
-# Now using the preferred subcommand form. Note that we support flags before
-# or after the subcommand name so test both variants.
-
-# First with the history function.
-history clear --contains
-history merge -t
-history save xyz
-history --prefix clear
-history --show-time merge
-echo >&2
-
-# Now with the history builtin.
-builtin history --search --merge
-builtin history save --prefix
-builtin history clear --show-time
-builtin history merge xyz
-builtin history clear abc def
-builtin history --contains save
-builtin history -t merge
-
-# Now do a history command that should succeed so we exit with a zero,
-# success, status.
-builtin history save
diff --git a/tests/history.out b/tests/history.out
deleted file mode 100644
index e69de29bb..000000000

From 12a9cb294003e8d88571586fd38831f03b8a73b6 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sat, 8 Feb 2020 08:55:02 +0100
Subject: [PATCH 1705/1732] Fix assertion failure on page up / page down

I had overlooked {beginning,end}-of-history which don't search.
---
 src/reader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/reader.cpp b/src/reader.cpp
index d5f970b91..363c2c628 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -1997,10 +1997,10 @@ void reader_data_t::update_command_line_from_history_search() {
     }
     if (history_search.by_token()) {
         replace_current_token(std::move(new_text));
-    } else {
-        assert((history_search.by_line() || history_search.by_prefix()) &&
-               "Unknown history search type");
+    } else if (history_search.by_line() || history_search.by_prefix()) {
         el->replace_substring(0, el->size(), std::move(new_text));
+    } else {
+        return;
     }
     command_line_has_transient_edit = true;
     assert(el == &command_line);

From eaf84c553d3ad4fb644369944a3d67f9e3720f13 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 7 Feb 2020 22:04:37 +0100
Subject: [PATCH 1706/1732] Port line-continuation test to littlecheck

---
 .../{line-continuation.in => checks/line-continuation.fish} | 6 ++++++
 tests/line-continuation.err                                 | 0
 tests/line-continuation.out                                 | 5 -----
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename tests/{line-continuation.in => checks/line-continuation.fish} (62%)
 delete mode 100644 tests/line-continuation.err
 delete mode 100644 tests/line-continuation.out

diff --git a/tests/line-continuation.in b/tests/checks/line-continuation.fish
similarity index 62%
rename from tests/line-continuation.in
rename to tests/checks/line-continuation.fish
index a1ac92932..22f17d6ea 100644
--- a/tests/line-continuation.in
+++ b/tests/checks/line-continuation.fish
@@ -1,11 +1,15 @@
+#RUN: %fish %s
 ech\
 o echo
+#CHECK: echo
 
 buil\
 tin echo builtin echo
+#CHECK: builtin echo
 
 true; an\
 d echo true
+#CHECK: true
 
 \i\
 \U00000066\
@@ -15,6 +19,7 @@ d echo true
 \145n\
 d\
 ;
+#CHECK: if true
 
 'if'\
  true
@@ -23,3 +28,4 @@ d\
 en\
 d\
 ";
+#CHECK: if true
diff --git a/tests/line-continuation.err b/tests/line-continuation.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/line-continuation.out b/tests/line-continuation.out
deleted file mode 100644
index 053209a56..000000000
--- a/tests/line-continuation.out
+++ /dev/null
@@ -1,5 +0,0 @@
-echo
-builtin echo
-true
-if true
-if true

From f8af262af7b86b41a1b3c4d98a8dcb533e261552 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Fri, 7 Feb 2020 22:10:55 +0100
Subject: [PATCH 1707/1732] Port some smaller tests to littlecheck

---
 .../builtinbuiltin.fish}                      |  6 ++++
 tests/{functions.in => checks/functions.fish} | 10 +++----
 tests/{psub.in => checks/psub.fish}           |  9 +++++-
 tests/{random.in => checks/random.fish}       | 17 +++++++++++
 tests/{status.in => checks/status.fish}       | 23 +++++++++++---
 tests/checks/vars_as_commands.fish            | 30 +++++++++++++++++++
 tests/checks/zero_based_array.fish            | 18 +++++++++++
 tests/functions.err                           |  0
 tests/functions.out                           |  1 -
 tests/psub.err                                |  0
 tests/psub.out                                |  7 -----
 tests/random.err                              | 16 ----------
 tests/random.out                              |  0
 tests/status.err                              | 12 --------
 tests/status.out                              | 16 ----------
 tests/test_builtinbuiltin.err                 |  2 --
 tests/test_builtinbuiltin.out                 |  3 --
 tests/vars_as_commands.err                    |  6 ----
 tests/vars_as_commands.in                     | 19 ------------
 tests/vars_as_commands.out                    |  4 ---
 tests/zero_based_array.err                    |  9 ------
 tests/zero_based_array.in                     |  8 -----
 tests/zero_based_array.out                    |  1 -
 23 files changed, 102 insertions(+), 115 deletions(-)
 rename tests/{test_builtinbuiltin.in => checks/builtinbuiltin.fish} (54%)
 rename tests/{functions.in => checks/functions.fish} (94%)
 rename tests/{psub.in => checks/psub.fish} (88%)
 rename tests/{random.in => checks/random.fish} (72%)
 rename tests/{status.in => checks/status.fish} (62%)
 create mode 100644 tests/checks/vars_as_commands.fish
 create mode 100644 tests/checks/zero_based_array.fish
 delete mode 100644 tests/functions.err
 delete mode 100644 tests/functions.out
 delete mode 100644 tests/psub.err
 delete mode 100644 tests/psub.out
 delete mode 100644 tests/random.err
 delete mode 100644 tests/random.out
 delete mode 100644 tests/status.err
 delete mode 100644 tests/status.out
 delete mode 100644 tests/test_builtinbuiltin.err
 delete mode 100644 tests/test_builtinbuiltin.out
 delete mode 100644 tests/vars_as_commands.err
 delete mode 100644 tests/vars_as_commands.in
 delete mode 100644 tests/vars_as_commands.out
 delete mode 100644 tests/zero_based_array.err
 delete mode 100644 tests/zero_based_array.in
 delete mode 100644 tests/zero_based_array.out

diff --git a/tests/test_builtinbuiltin.in b/tests/checks/builtinbuiltin.fish
similarity index 54%
rename from tests/test_builtinbuiltin.in
rename to tests/checks/builtinbuiltin.fish
index 4293a96e1..c674e1187 100644
--- a/tests/test_builtinbuiltin.in
+++ b/tests/checks/builtinbuiltin.fish
@@ -1,7 +1,13 @@
+#RUN: %fish %s
 # Tests for the "builtin" builtin/keyword.
 builtin -q string; and echo String exists
+#CHECK: String exists
 builtin -q; and echo None exists
 builtin -q string echo banana; and echo Some of these exist
+#CHECK: Some of these exist
 builtin -nq string
+#CHECKERR: builtin: Invalid combination of options,
+#CHECKERR: --query and --names are mutually exclusive
 echo $status
+#CHECK: 2
 exit 0
diff --git a/tests/functions.in b/tests/checks/functions.fish
similarity index 94%
rename from tests/functions.in
rename to tests/checks/functions.fish
index 0cd4def92..1cf336f1b 100644
--- a/tests/functions.in
+++ b/tests/checks/functions.fish
@@ -1,5 +1,4 @@
-# vim: set filetype=fish:
-#
+#RUN: %fish %s
 # Test the `functions` builtin
 
 function f1
@@ -15,10 +14,8 @@ end
 # ==========
 # Verify that `functions --details` works as expected when given the name of a
 # known function.
-set x (functions --details f1)
-if test "$x" != "stdin"
-    echo "Unexpected output for 'functions --details f1': $x" >&2
-end
+functions --details f1
+#CHECK: {{.*}}checks/functions.fish
 
 # ==========
 # Verify that `functions --details` works as expected when given the name of an
@@ -82,3 +79,4 @@ or echo "Failed to find description 2" >&2
 # so this is the best we can do.
 functions --erase ls
 type -t ls
+#CHECK: file
diff --git a/tests/psub.in b/tests/checks/psub.fish
similarity index 88%
rename from tests/psub.in
rename to tests/checks/psub.fish
index 5a615e540..bf3676c7b 100644
--- a/tests/psub.in
+++ b/tests/checks/psub.fish
@@ -1,4 +1,4 @@
-# Test psub behavior
+#RUN: %fish %s
 set -l filename (echo foo | psub --testing)
 test -f $filename
 or echo 'psub is not a regular file' >&2
@@ -21,6 +21,9 @@ rm $filename
 cat (echo foo | psub)
 cat (echo bar | psub --fifo)
 cat (echo baz | psub)
+#CHECK: foo
+#CHECK: bar
+#CHECK: baz
 
 set -l filename (echo foo | psub)
 if test -e $filename
@@ -28,6 +31,7 @@ if test -e $filename
 else
     echo 'psub file was deleted'
 end
+#CHECK: psub file was deleted
 
 # The --file flag is the default behavior.
 if count (echo foo | psub -s .cc | string match -r '\.cc$') >/dev/null
@@ -35,6 +39,7 @@ if count (echo foo | psub -s .cc | string match -r '\.cc$') >/dev/null
 else
     echo 'psub filename does not end with .cc'
 end
+#CHECK: psub filename ends with .cc
 
 # Make sure we get the same result if we explicitly ask for a temp file.
 if count (echo foo | psub -f -s .cc | string match -r '\.cc$') >/dev/null
@@ -42,6 +47,7 @@ if count (echo foo | psub -f -s .cc | string match -r '\.cc$') >/dev/null
 else
     echo 'psub filename does not end with .cc'
 end
+#CHECK: psub filename ends with .cc
 
 set -l filename (echo foo | psub -s .fish)
 if test -e (dirname $filename)
@@ -49,6 +55,7 @@ if test -e (dirname $filename)
 else
     echo 'psub directory was deleted'
 end
+#CHECK: psub directory was deleted
 
 set -l diffs (comm -3 (__fish_print_help psub | psub) (psub -hs banana | psub))
 test -z "$diffs"
diff --git a/tests/random.in b/tests/checks/random.fish
similarity index 72%
rename from tests/random.in
rename to tests/checks/random.fish
index d8e31df19..6b4e1b718 100644
--- a/tests/random.in
+++ b/tests/checks/random.fish
@@ -1,3 +1,4 @@
+#RUN: %fish %s
 set -l max 9223372036854775807
 set -l close_max 9223372036854775806
 set -l min -9223372036854775807
@@ -6,21 +7,37 @@ set -l diff_max 18446744073709551614
 
 # check failure cases
 random a
+#CHECKERR: random: Argument 'a' is not a valid integer
 random $diff_max
+#CHECKERR: random: Argument '18446744073709551614' is not a valid integer
 random -- 1 2 3 4
+#CHECKERR: random: Too many arguments
 random -- 10 -10
+#CHECKERR: random: END must be greater than START
 random -- 10 $diff_max
+#CHECKERR: random: Argument '18446744073709551614' is not a valid integer
 random -- 1 1d
 random -- 1 1c 10
+#CHECKERR: random: Argument '1d' is not a valid integer
+#CHECKERR: random: Argument '1c' is not a valid integer
 random -- 10 10
+#CHECKERR: random: END must be greater than START
 random -- 1 - 10
+#CHECKERR: random: Argument '-' is not a valid integer
 random -- 1 -1 10
+#CHECKERR: random: Argument '-1' is not a valid integer
 random -- 1 $min 10
+#CHECKERR: random: Argument '-9223372036854775807' is not a valid integer
 random -- 1 0 10
+#CHECKERR: random: STEP must be a positive integer
 random -- 1 11 10
+#CHECKERR: random: range contains only one possible value
 random -- 0 $diff_max $max
+#CHECKERR: random: range contains only one possible value
 random choice
+#CHECKERR: random: nothing to choose from
 random choic a b c
+#CHECKERR: random: Too many arguments
 
 function check_boundaries
     if not test $argv[1] -ge $argv[2] -a $argv[1] -le $argv[3] 
diff --git a/tests/status.in b/tests/checks/status.fish
similarity index 62%
rename from tests/status.in
rename to tests/checks/status.fish
index ad68a9231..96f4d9a6b 100644
--- a/tests/status.in
+++ b/tests/checks/status.fish
@@ -1,5 +1,4 @@
-# vim: set filetype=fish:
-
+#RUN: %fish %s
 status -b
 and echo '"status -b" unexpectedly returned true at top level'
 
@@ -22,36 +21,52 @@ and echo '"status is-interactive" unexpectedly returned true for a non-interacti
 
 # We should get an error message about an invalid combination of flags.
 status --is-interactive --is-login
+#CHECKERR: status: Invalid combination of options,
+#CHECKERR: you cannot do both 'is-interactive' and 'is-login' in the same invocation
 
 # We should get an error message about an unexpected arg for `status
 # is-block`.
 status -b is-interactive
+#CHECKERR: status: Invalid combination of options,
+#CHECKERR: you cannot do both 'is-block' and 'is-interactive' in the same invocation
 
 # Try to set the job control to an invalid mode.
 status job-control full1
+#CHECKERR: status: Invalid job control mode 'full1'
 status --job-control=1none
+#CHECKERR: status: Invalid job control mode '1none'
 
 # Now set it to a valid mode.
 status job-control none
 
 # Check status -u outside functions
 status current-function
+#CHECK: Not a function
 
 function test_function
     status current-function
 end
 
 test_function
+#CHECK: test_function
 eval test_function
+#CHECK: test_function
 
-logmsg Future Feature Flags
+# Future Feature Flags
 status features
+#CHECK: stderr-nocaret	off	3.0	^ no longer redirects stderr
+#CHECK: qmark-noglob	off	3.0	? no longer globs
+#CHECK: regex-easyesc	off	3.1	string replace -r needs fewer \'s
 status test-feature stderr-nocaret ; echo $status
+#CHECK: 1
 status test-feature not-a-feature ; echo $status
+#CHECK: 2
 
-logmsg 'Ensure $status isn\'t reset before a function is executed'
+# Ensure $status isn't reset before a function is executed
 function echo_last
 	echo $status
 end
 
 false; echo_last; echo $status #1
+#CHECK: 1
+#CHECK: 0
diff --git a/tests/checks/vars_as_commands.fish b/tests/checks/vars_as_commands.fish
new file mode 100644
index 000000000..55c8bb178
--- /dev/null
+++ b/tests/checks/vars_as_commands.fish
@@ -0,0 +1,30 @@
+#RUN: %fish %s
+# Test that using variables as command names work correctly.
+
+$EMPTY_VARIABLE
+#CHECKERR: {{.*}}checks/vars_as_commands.fish (line {{\d+}}): The expanded command was empty.
+#CHECKERR: $EMPTY_VARIABLE
+#CHECKERR: ^
+"$EMPTY_VARIABLE"
+#CHECKERR: {{.*}}checks/vars_as_commands.fish (line {{\d+}}): The expanded command was empty.
+#CHECKERR: "$EMPTY_VARIABLE"
+#CHECKERR: ^
+
+set CMD1 echo basic command as variable
+$CMD1
+#CHECK: basic command as variable
+
+set CMD2 echo '(' not expanded again
+$CMD2
+#CHECK: ( not expanded again
+
+# Test using variables with the builtin decorator
+builtin $CMD1
+#CHECK: basic command as variable
+
+# Test implicit cd
+set CMD3 /usr/bin
+$CMD3 && echo $PWD
+#CHECK: /usr/bin
+
+exit 0
diff --git a/tests/checks/zero_based_array.fish b/tests/checks/zero_based_array.fish
new file mode 100644
index 000000000..bb41f999b
--- /dev/null
+++ b/tests/checks/zero_based_array.fish
@@ -0,0 +1,18 @@
+#RUN: %fish %s
+echo $foo[0]
+echo $foo[ 0 ]
+echo $foo[ 00 ]
+#CHECKERR: {{.*}}checks/zero_based_array.fish (line {{\d+}}): array indices start at 1, not 0.
+#CHECKERR: echo $foo[0]
+#CHECKERR: ^
+#CHECKERR: {{.*}}checks/zero_based_array.fish (line {{\d+}}): array indices start at 1, not 0.
+#CHECKERR: echo $foo[ 0 ]
+#CHECKERR: ^
+#CHECKERR: {{.*}}checks/zero_based_array.fish (line {{\d+}}): array indices start at 1, not 0.
+#CHECKERR: echo $foo[ 00 ]
+#CHECKERR: ^
+
+# and make sure these didn't break
+set -l foo one two three
+echo $foo[001]
+#CHECK: one
diff --git a/tests/functions.err b/tests/functions.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/functions.out b/tests/functions.out
deleted file mode 100644
index f73f3093f..000000000
--- a/tests/functions.out
+++ /dev/null
@@ -1 +0,0 @@
-file
diff --git a/tests/psub.err b/tests/psub.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/psub.out b/tests/psub.out
deleted file mode 100644
index 6f9d6710c..000000000
--- a/tests/psub.out
+++ /dev/null
@@ -1,7 +0,0 @@
-foo
-bar
-baz
-psub file was deleted
-psub filename ends with .cc
-psub filename ends with .cc
-psub directory was deleted
diff --git a/tests/random.err b/tests/random.err
deleted file mode 100644
index 0a9572bdf..000000000
--- a/tests/random.err
+++ /dev/null
@@ -1,16 +0,0 @@
-random: Argument 'a' is not a valid integer
-random: Argument '18446744073709551614' is not a valid integer
-random: Too many arguments
-random: END must be greater than START
-random: Argument '18446744073709551614' is not a valid integer
-random: Argument '1d' is not a valid integer
-random: Argument '1c' is not a valid integer
-random: END must be greater than START
-random: Argument '-' is not a valid integer
-random: Argument '-1' is not a valid integer
-random: Argument '-9223372036854775807' is not a valid integer
-random: STEP must be a positive integer
-random: range contains only one possible value
-random: range contains only one possible value
-random: nothing to choose from
-random: Too many arguments
diff --git a/tests/random.out b/tests/random.out
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/status.err b/tests/status.err
deleted file mode 100644
index ad52d81c6..000000000
--- a/tests/status.err
+++ /dev/null
@@ -1,12 +0,0 @@
-status: Invalid combination of options,
-you cannot do both 'is-interactive' and 'is-login' in the same invocation
-status: Invalid combination of options,
-you cannot do both 'is-block' and 'is-interactive' in the same invocation
-status: Invalid job control mode 'full1'
-status: Invalid job control mode '1none'
-
-####################
-# Future Feature Flags
-
-####################
-# Ensure $status isn't reset before a function is executed
diff --git a/tests/status.out b/tests/status.out
deleted file mode 100644
index 4a94d8cd3..000000000
--- a/tests/status.out
+++ /dev/null
@@ -1,16 +0,0 @@
-Not a function
-test_function
-test_function
-
-####################
-# Future Feature Flags
-stderr-nocaret	off	3.0	^ no longer redirects stderr
-qmark-noglob	off	3.0	? no longer globs
-regex-easyesc	off	3.1	string replace -r needs fewer \'s
-1
-2
-
-####################
-# Ensure $status isn't reset before a function is executed
-1
-0
diff --git a/tests/test_builtinbuiltin.err b/tests/test_builtinbuiltin.err
deleted file mode 100644
index ff818897a..000000000
--- a/tests/test_builtinbuiltin.err
+++ /dev/null
@@ -1,2 +0,0 @@
-builtin: Invalid combination of options,
---query and --names are mutually exclusive
diff --git a/tests/test_builtinbuiltin.out b/tests/test_builtinbuiltin.out
deleted file mode 100644
index 11c0882b4..000000000
--- a/tests/test_builtinbuiltin.out
+++ /dev/null
@@ -1,3 +0,0 @@
-String exists
-Some of these exist
-2
diff --git a/tests/vars_as_commands.err b/tests/vars_as_commands.err
deleted file mode 100644
index c1eefbf52..000000000
--- a/tests/vars_as_commands.err
+++ /dev/null
@@ -1,6 +0,0 @@
-fish: The expanded command was empty.
-$EMPTY_VARIABLE
-^
-fish: The expanded command was empty.
-"$EMPTY_VARIABLE"
-^
diff --git a/tests/vars_as_commands.in b/tests/vars_as_commands.in
deleted file mode 100644
index 3b73c9f00..000000000
--- a/tests/vars_as_commands.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# Test that using variables as command names work correctly.
-
-$EMPTY_VARIABLE
-"$EMPTY_VARIABLE"
-
-set CMD1 echo basic command as variable
-$CMD1
-
-set CMD2 echo '(' not expanded again
-$CMD2
-
-# Test using variables with the builtin decorator
-builtin $CMD1
-
-# Test implicit cd
-set CMD3 /usr/bin
-$CMD3 && echo $PWD
-
-exit 0
diff --git a/tests/vars_as_commands.out b/tests/vars_as_commands.out
deleted file mode 100644
index 64e4976b7..000000000
--- a/tests/vars_as_commands.out
+++ /dev/null
@@ -1,4 +0,0 @@
-basic command as variable
-( not expanded again
-basic command as variable
-/usr/bin
diff --git a/tests/zero_based_array.err b/tests/zero_based_array.err
deleted file mode 100644
index 08ed84e77..000000000
--- a/tests/zero_based_array.err
+++ /dev/null
@@ -1,9 +0,0 @@
-fish: array indices start at 1, not 0.
-echo $foo[0]
-          ^
-fish: array indices start at 1, not 0.
-echo $foo[ 0 ]
-           ^
-fish: array indices start at 1, not 0.
-echo $foo[ 00 ]
-           ^
diff --git a/tests/zero_based_array.in b/tests/zero_based_array.in
deleted file mode 100644
index 4dc28ec1f..000000000
--- a/tests/zero_based_array.in
+++ /dev/null
@@ -1,8 +0,0 @@
-echo $foo[0]
-echo $foo[ 0 ]
-echo $foo[ 00 ]
-
-# and make sure these didn't break
-set -l foo one two three
-echo $foo[001]
-
diff --git a/tests/zero_based_array.out b/tests/zero_based_array.out
deleted file mode 100644
index 5626abf0f..000000000
--- a/tests/zero_based_array.out
+++ /dev/null
@@ -1 +0,0 @@
-one

From 0fab1ce8b4f7ce6823d967db5a430478f9b75dbd Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 09:38:23 +0100
Subject: [PATCH 1708/1732] Port locale test to littlecheck

---
 tests/{locale.in => checks/locale.fish} | 27 ++++++++++++++++++++++++-
 tests/locale.err                        |  0
 tests/locale.out                        | 16 ---------------
 3 files changed, 26 insertions(+), 17 deletions(-)
 rename tests/{locale.in => checks/locale.fish} (75%)
 delete mode 100644 tests/locale.err
 delete mode 100644 tests/locale.out

diff --git a/tests/locale.in b/tests/checks/locale.fish
similarity index 75%
rename from tests/locale.in
rename to tests/checks/locale.fish
index ccdd87439..b0e7a73e8 100644
--- a/tests/locale.in
+++ b/tests/checks/locale.fish
@@ -1,7 +1,18 @@
-# Test behavior related to the locale.
+#RUN: %fish %s
+# A function to display bytes, necessary because GNU and BSD implementations of `od` have different output.
+# We used to use xxd, but it's not available everywhere. See #3797.
+#
+# We use the lowest common denominator format, `-b`, because it should work in all implementations.
+# I wish we could use the `-t` flag but it isn't available in every OS we're likely to run on.
+#
+function display_bytes
+    od -b | sed -e 's/  */ /g' -e 's/  *$//'
+end
 
 # Verify that our UTF-8 locale produces the expected output.
 echo -n A\u00FCA | display_bytes
+#CHECK: 0000000 101 303 274 101
+#CHECK: 0000004
 
 # Verify that exporting a change to the C locale produces the expected output.
 # The output should include the literal byte \xFC rather than the UTF-8 sequence for \u00FC.
@@ -9,10 +20,14 @@ begin
 	set -lx LC_ALL C
 	echo -n B\u00FCB | display_bytes
 end
+#CHECK: 0000000 102 374 102
+#CHECK: 0000003
 
 # Since the previous change was localized to a block it should no
 # longer be in effect and we should be back to a UTF-8 locale.
 echo -n C\u00FCC | display_bytes
+#CHECK: 0000000 103 303 274 103
+#CHECK: 0000004
 
 # Verify that setting a non-exported locale var doesn't affect the behavior.
 # The output should include the UTF-8 sequence for \u00FC rather than that literal byte.
@@ -21,6 +36,8 @@ begin
 	set -l LC_ALL C
 	echo -n D\u00FCD | display_bytes
 end
+#CHECK: 0000000 104 303 274 104
+#CHECK: 0000004
 
 # Verify that fish can pass through non-ASCII characters in the C/POSIX
 # locale. This is to prevent regression of
@@ -40,6 +57,10 @@ end
 # second.
 echo -n X\u00FBX | display_bytes
 echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' | display_bytes
+#CHECK: 0000000 130 303 273 130
+#CHECK: 0000004
+#CHECK: 0000000 130 303 274 130
+#CHECK: 0000004
 
 # The next tests deliberately spawn another fish instance to test inheritance of env vars.
 
@@ -50,8 +71,12 @@ echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' |
 # ISO 8859-x char sets which are encompassed by the C locale. The output should
 # be "59fc59".
 env LC_ALL=C ../test/root/bin/fish -c 'echo -n Y\u00FCY' | display_bytes
+#CHECK: 0000000 131 374 131
+#CHECK: 0000003
 
 # The user can specify a wide unicode character (one requiring more than a
 # single byte). In the C/POSIX locales we substitute a question-mark for the
 # unencodable wide char. The output should be "543f54".
 env LC_ALL=C ../test/root/bin/fish -c 'echo -n T\u01FDT' | display_bytes
+#CHECK: 0000000 124 077 124
+#CHECK: 0000003
diff --git a/tests/locale.err b/tests/locale.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/locale.out b/tests/locale.out
deleted file mode 100644
index 9aa8faf19..000000000
--- a/tests/locale.out
+++ /dev/null
@@ -1,16 +0,0 @@
-0000000 101 303 274 101
-0000004
-0000000 102 374 102
-0000003
-0000000 103 303 274 103
-0000004
-0000000 104 303 274 104
-0000004
-0000000 130 303 273 130
-0000004
-0000000 130 303 274 130
-0000004
-0000000 131 374 131
-0000003
-0000000 124 077 124
-0000003

From 2fa8ae161ae46103e6d426f94a2abd9df4e68c8a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 09:44:39 +0100
Subject: [PATCH 1709/1732] Port jobs test to littlecheck

---
 tests/{jobs.in => checks/jobs.fish} | 20 ++++++++++++++++++++
 tests/jobs.err                      |  4 ----
 tests/jobs.out                      | 15 ---------------
 3 files changed, 20 insertions(+), 19 deletions(-)
 rename tests/{jobs.in => checks/jobs.fish} (66%)
 delete mode 100644 tests/jobs.err
 delete mode 100644 tests/jobs.out

diff --git a/tests/jobs.in b/tests/checks/jobs.fish
similarity index 66%
rename from tests/jobs.in
rename to tests/checks/jobs.fish
index 644010113..8026c444b 100644
--- a/tests/jobs.in
+++ b/tests/checks/jobs.fish
@@ -1,16 +1,29 @@
+#RUN: %fish %s
 jobs -q; echo $status
+#CHECK: 1
 sleep 5 &
 sleep 5 &
 jobs -c
+#CHECK: Command
+#CHECK: sleep
+#CHECK: sleep
 jobs -q; echo $status
+#CHECK: 0
 bg -23 1 2>/dev/null
 or echo bg: invalid option -23 >&2
+#CHECKERR: bg: invalid option -23
 fg 3
+#CHECKERR: fg: No suitable job: 3
 bg 3
+#CHECKERR: bg: Could not find job '3'
 sleep 1 &
 disown
 jobs -c
+#CHECK: Command
+#CHECK: sleep
+#CHECK: sleep
 disown foo
+#CHECKERR: disown: 'foo' is not a valid job specifier
 disown (jobs -p)
 or exit 0
 
@@ -34,5 +47,12 @@ sleep 2
 # Verify `jobs -l` works and returns the right status codes
 # https://github.com/fish-shell/fish-shell/issues/6104
 jobs --last --command; echo $status
+#CHECK: Command
+#CHECK: sleep
+#CHECK: sleep is done
+#CHECK: 1
 sleep 0.2 &
 jobs -lc; echo $status
+#CHECK: Command
+#CHECK: sleep
+#CHECK: 0
diff --git a/tests/jobs.err b/tests/jobs.err
deleted file mode 100644
index 58b3a14aa..000000000
--- a/tests/jobs.err
+++ /dev/null
@@ -1,4 +0,0 @@
-bg: invalid option -23
-fg: No suitable job: 3
-bg: Could not find job '3'
-disown: 'foo' is not a valid job specifier
diff --git a/tests/jobs.out b/tests/jobs.out
deleted file mode 100644
index ef07059c4..000000000
--- a/tests/jobs.out
+++ /dev/null
@@ -1,15 +0,0 @@
-1
-Command
-sleep
-sleep
-0
-Command
-sleep
-sleep
-Command
-sleep
-sleep is done
-1
-Command
-sleep
-0

From 7c2d7387d0eb6d9eeabc31f46c6a398ead2da242 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 09:48:41 +0100
Subject: [PATCH 1710/1732] Port complete_directories test to littlecheck

---
 tests/__fish_complete_directories.err  |  0
 tests/__fish_complete_directories.in   | 19 ------------------
 tests/__fish_complete_directories.out  | 16 ---------------
 tests/checks/complete_directories.fish | 27 ++++++++++++++++++++++++++
 4 files changed, 27 insertions(+), 35 deletions(-)
 delete mode 100644 tests/__fish_complete_directories.err
 delete mode 100644 tests/__fish_complete_directories.in
 delete mode 100644 tests/__fish_complete_directories.out
 create mode 100644 tests/checks/complete_directories.fish

diff --git a/tests/__fish_complete_directories.err b/tests/__fish_complete_directories.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/__fish_complete_directories.in b/tests/__fish_complete_directories.in
deleted file mode 100644
index c6769a383..000000000
--- a/tests/__fish_complete_directories.in
+++ /dev/null
@@ -1,19 +0,0 @@
-cd ..
-mkdir -p test/data/abc
-mkdir -p test/data/abcd
-touch test/data/af
-touch test/data/abcdf
-mkdir -p test/data/xy
-mkdir -p test/data/xyz
-touch test/data/xyf
-touch test/data/xyzf
-echo \# __fish_complete_directories test/z
-__fish_complete_directories test/z
-echo \# __fish_complete_directories test/d
-__fish_complete_directories test/d
-echo \# __fish_complete_directories test/data
-__fish_complete_directories test/data
-echo \# __fish_complete_directories test/data/
-__fish_complete_directories test/data/
-echo \# __fish_complete_directories test/data/abc
-__fish_complete_directories test/data/abc 'abc dirs'
diff --git a/tests/__fish_complete_directories.out b/tests/__fish_complete_directories.out
deleted file mode 100644
index b668030c4..000000000
--- a/tests/__fish_complete_directories.out
+++ /dev/null
@@ -1,16 +0,0 @@
-# __fish_complete_directories test/z
-# __fish_complete_directories test/d
-test/data/	Directory
-test/buildroot/	Directory
-test/fish_expand_test/	Directory
-# __fish_complete_directories test/data
-test/data/	Directory
-# __fish_complete_directories test/data/
-test/data/abc/	Directory
-test/data/abcd/	Directory
-test/data/fish/	Directory
-test/data/xy/	Directory
-test/data/xyz/	Directory
-# __fish_complete_directories test/data/abc
-test/data/abc/	abc dirs
-test/data/abcd/	abc dirs
diff --git a/tests/checks/complete_directories.fish b/tests/checks/complete_directories.fish
new file mode 100644
index 000000000..3db3ee8b1
--- /dev/null
+++ b/tests/checks/complete_directories.fish
@@ -0,0 +1,27 @@
+#RUN: %fish %s
+cd ..
+mkdir -p test/data/abc
+mkdir -p test/data/abcd
+touch test/data/af
+touch test/data/abcdf
+mkdir -p test/data/xy
+mkdir -p test/data/xyz
+touch test/data/xyf
+touch test/data/xyzf
+__fish_complete_directories test/z
+# No match - no output!
+__fish_complete_directories test/d
+#CHECK: test/data/	Directory
+#CHECK: test/buildroot/	Directory
+#CHECK: test/fish_expand_test/	Directory
+__fish_complete_directories test/data
+#CHECK: test/data/	Directory
+__fish_complete_directories test/data/
+#CHECK: test/data/abc/	Directory
+#CHECK: test/data/abcd/	Directory
+#CHECK: test/data/fish/	Directory
+#CHECK: test/data/xy/	Directory
+#CHECK: test/data/xyz/	Directory
+__fish_complete_directories test/data/abc 'abc dirs'
+#CHECK: test/data/abc/	abc dirs
+#CHECK: test/data/abcd/	abc dirs

From 0ddf04b6373d93efb3867177cd23769921c9f427 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 09:51:52 +0100
Subject: [PATCH 1711/1732] Port contains_opt test to littlecheck

And make it one file.
---
 tests/__fish_contains_opt.err                 |  1 -
 tests/__fish_contains_opt.in                  | 52 -------------------
 tests/__fish_contains_opt.out                 |  0
 tests/__fish_not_contain_opt.err              |  1 -
 tests/__fish_not_contain_opt.out              |  0
 .../contains_opt.fish}                        | 46 ++++++++++++++++
 6 files changed, 46 insertions(+), 54 deletions(-)
 delete mode 100644 tests/__fish_contains_opt.err
 delete mode 100644 tests/__fish_contains_opt.in
 delete mode 100644 tests/__fish_contains_opt.out
 delete mode 100644 tests/__fish_not_contain_opt.err
 delete mode 100644 tests/__fish_not_contain_opt.out
 rename tests/{__fish_not_contain_opt.in => checks/contains_opt.fish} (53%)

diff --git a/tests/__fish_contains_opt.err b/tests/__fish_contains_opt.err
deleted file mode 100644
index 2c92086df..000000000
--- a/tests/__fish_contains_opt.err
+++ /dev/null
@@ -1 +0,0 @@
-__fish_contains_opt: Unknown option -x
diff --git a/tests/__fish_contains_opt.in b/tests/__fish_contains_opt.in
deleted file mode 100644
index 38598ecee..000000000
--- a/tests/__fish_contains_opt.in
+++ /dev/null
@@ -1,52 +0,0 @@
-function commandline
-    if test $argv[1] = '-ct'
-        echo --long4\n-4
-    else if test $argv[1] = '-cpo'
-        echo cmd\n-z\n-bc\n--long1\narg1\n-d\narg2\n--long2
-    end
-end
-
-__fish_contains_opt -s z
-or echo fails to find -z
-
-__fish_contains_opt -s c
-or echo fails to find -c
-
-__fish_contains_opt -s x
-and echo should not have found -x
-
-__fish_contains_opt -s x -s z
-or echo fails to find -z
-
-__fish_contains_opt -s x -s c
-or echo fails to find -c
-
-__fish_contains_opt -s x long1
-or echo fails to find --long1
-
-__fish_contains_opt long2
-or echo fails to find --long2
-
-__fish_contains_opt long1 long2
-or echo fails to find --long1 or --long2
-
-__fish_contains_opt long3
-and echo should not have found --long3
-
-__fish_contains_opt -s 4 long4
-or echo fails to find -4
-
-__fish_contains_opt long4
-and echo should not have found --long4
-
-__fish_contains_opt arg1
-and echo should not have found --arg1
-
-__fish_contains_opt -s a
-and echo should not have found -a
-
-# This should result in message written to stderr and an error status.
-__fish_contains_opt -x w
-and '"__fish_contains_opt -x w" should not have succeeded'
-
-true
diff --git a/tests/__fish_contains_opt.out b/tests/__fish_contains_opt.out
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/__fish_not_contain_opt.err b/tests/__fish_not_contain_opt.err
deleted file mode 100644
index 40cdbcd11..000000000
--- a/tests/__fish_not_contain_opt.err
+++ /dev/null
@@ -1 +0,0 @@
-__fish_not_contain_opt: Unknown option -x
diff --git a/tests/__fish_not_contain_opt.out b/tests/__fish_not_contain_opt.out
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/__fish_not_contain_opt.in b/tests/checks/contains_opt.fish
similarity index 53%
rename from tests/__fish_not_contain_opt.in
rename to tests/checks/contains_opt.fish
index fd7ce4b5b..76cc43174 100644
--- a/tests/__fish_not_contain_opt.in
+++ b/tests/checks/contains_opt.fish
@@ -1,3 +1,4 @@
+#RUN: %fish %s
 function commandline
     if test $argv[1] = '-ct'
         echo --long4\n-4
@@ -6,6 +7,50 @@ function commandline
     end
 end
 
+__fish_contains_opt -s z
+or echo fails to find -z
+
+__fish_contains_opt -s c
+or echo fails to find -c
+
+__fish_contains_opt -s x
+and echo should not have found -x
+
+__fish_contains_opt -s x -s z
+or echo fails to find -z
+
+__fish_contains_opt -s x -s c
+or echo fails to find -c
+
+__fish_contains_opt -s x long1
+or echo fails to find --long1
+
+__fish_contains_opt long2
+or echo fails to find --long2
+
+__fish_contains_opt long1 long2
+or echo fails to find --long1 or --long2
+
+__fish_contains_opt long3
+and echo should not have found --long3
+
+__fish_contains_opt -s 4 long4
+or echo fails to find -4
+
+__fish_contains_opt long4
+and echo should not have found --long4
+
+__fish_contains_opt arg1
+and echo should not have found --arg1
+
+__fish_contains_opt -s a
+and echo should not have found -a
+
+# This should result in message written to stderr and an error status.
+__fish_contains_opt -x w
+and '"__fish_contains_opt -x w" should not have succeeded'
+#CHECKERR: __fish_contains_opt: Unknown option -x
+
 __fish_not_contain_opt -s z
 and echo should not have found -z
 
@@ -48,5 +93,6 @@ or echo should not have found -a
 # This should result in message written to stderr and an error status.
 __fish_not_contain_opt -x w
 and '"__fish_not_contain_opt -x w" should not have succeeded'
+#CHECKERR: __fish_not_contain_opt: Unknown option -x
 
 true

From 8bd97d087d82102f5f41da4bc9427a7753ccc119 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 09:58:27 +0100
Subject: [PATCH 1712/1732] Port set test to littlecheck

Just add it to set.fish. There may be some duplicated ones here, but
that's for another time.
---
 tests/checks/set.fish | 171 +++++++++++++++++++++++++++++++++++++++++-
 tests/set.err         |  29 -------
 tests/set.in          |  78 -------------------
 tests/set.out         | 134 ---------------------------------
 4 files changed, 170 insertions(+), 242 deletions(-)
 delete mode 100644 tests/set.err
 delete mode 100644 tests/set.in
 delete mode 100644 tests/set.out

diff --git a/tests/checks/set.fish b/tests/checks/set.fish
index 070fda35d..a3ac24f26 100644
--- a/tests/checks/set.fish
+++ b/tests/checks/set.fish
@@ -1,5 +1,4 @@
 # RUN: env XDG_CONFIG_HOME="$(mktemp -d)" FISH=%fish %fish %s
-
 # Environment variable tests
 
 # Test if variables can be properly set
@@ -480,4 +479,174 @@ $FISH -c 'set -S EDITOR' | string match -r -e 'global|universal'
 # CHECK: $EDITOR: set in universal scope, exported, with 2 elements
 sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'global|universal'
 
+# Verify behavior of `set --show` given an invalid var name
+set --show 'argle bargle'
+#CHECKERR: $argle bargle: invalid var name
+
+# Verify behavior of `set --show`
+set semiempty ''
+set --show semiempty
+#CHECK: $semiempty: not set in local scope
+#CHECK: $semiempty: set in global scope, unexported, with 1 elements
+#CHECK: $semiempty[1]: length=0 value=||
+#CHECK: $semiempty: not set in universal scope
+
+set -U var1 hello
+set --show var1
+#CHECK: $var1: not set in local scope
+#CHECK: $var1: not set in global scope
+#CHECK: $var1: set in universal scope, unexported, with 1 elements
+#CHECK: $var1[1]: length=5 value=|hello|
+
+set -l var1
+set -g var1 goodbye "and don't come back"
+set --show var1
+#CHECK: $var1: set in local scope, unexported, with 0 elements
+#CHECK: $var1: set in global scope, unexported, with 2 elements
+#CHECK: $var1[1]: length=7 value=|goodbye|
+#CHECK: $var1[2]: length=19 value=|and don\'t come back|
+#CHECK: $var1: set in universal scope, unexported, with 1 elements
+#CHECK: $var1[1]: length=5 value=|hello|
+
+set -g var2
+set --show _unset_var var2
+#CHECK: $_unset_var: not set in local scope
+#CHECK: $_unset_var: not set in global scope
+#CHECK: $_unset_var: not set in universal scope
+#CHECK: 
+#CHECK: $var2: not set in local scope
+#CHECK: $var2: set in global scope, unexported, with 0 elements
+#CHECK: $var2: not set in universal scope
+
+# Appending works
+set -g var3a a b c
+set -a var3a
+set -a var3a d
+set -a var3a e f
+set --show var3a
+#CHECK: $var3a: not set in local scope
+#CHECK: $var3a: set in global scope, unexported, with 6 elements
+#CHECK: $var3a[1]: length=1 value=|a|
+#CHECK: $var3a[2]: length=1 value=|b|
+#CHECK: $var3a[3]: length=1 value=|c|
+#CHECK: $var3a[4]: length=1 value=|d|
+#CHECK: $var3a[5]: length=1 value=|e|
+#CHECK: $var3a[6]: length=1 value=|f|
+#CHECK: $var3a: not set in universal scope
+set -g var3b
+set -a var3b
+set --show var3b
+#CHECK: $var3b: not set in local scope
+#CHECK: $var3b: set in global scope, unexported, with 0 elements
+#CHECK: $var3b: not set in universal scope
+set -g var3c
+set -a var3c 'one string'
+set --show var3c
+#CHECK: $var3c: not set in local scope
+#CHECK: $var3c: set in global scope, unexported, with 1 elements
+#CHECK: $var3c[1]: length=10 value=|one string|
+#CHECK: $var3c: not set in universal scope
+
+# Prepending works
+set -g var4a a b c
+set -p var4a
+set -p var4a d
+set -p var4a e f
+set --show var4a
+#CHECK: $var4a: not set in local scope
+#CHECK: $var4a: set in global scope, unexported, with 6 elements
+#CHECK: $var4a[1]: length=1 value=|e|
+#CHECK: $var4a[2]: length=1 value=|f|
+#CHECK: $var4a[3]: length=1 value=|d|
+#CHECK: $var4a[4]: length=1 value=|a|
+#CHECK: $var4a[5]: length=1 value=|b|
+#CHECK: $var4a[6]: length=1 value=|c|
+#CHECK: $var4a: not set in universal scope
+set -g var4b
+set -p var4b
+set --show var4b
+#CHECK: $var4b: not set in local scope
+#CHECK: $var4b: set in global scope, unexported, with 0 elements
+#CHECK: $var4b: not set in universal scope
+set -g var4c
+set -p var4c 'one string'
+set --show var4c
+#CHECK: $var4c: not set in local scope
+#CHECK: $var4c: set in global scope, unexported, with 1 elements
+#CHECK: $var4c[1]: length=10 value=|one string|
+#CHECK: $var4c: not set in universal scope
+
+# Appending and prepending at same time works
+set -g var5 abc def
+set -a -p var5 0 x 0
+set --show var5
+#CHECK: $var5: not set in local scope
+#CHECK: $var5: set in global scope, unexported, with 8 elements
+#CHECK: $var5[1]: length=1 value=|0|
+#CHECK: $var5[2]: length=1 value=|x|
+#CHECK: $var5[3]: length=1 value=|0|
+#CHECK: $var5[4]: length=3 value=|abc|
+#CHECK: $var5[5]: length=3 value=|def|
+#CHECK: $var5[6]: length=1 value=|0|
+#CHECK: $var5[7]: length=1 value=|x|
+#CHECK: $var5[8]: length=1 value=|0|
+#CHECK: $var5: not set in universal scope
+
+# Setting local scope when no local scope of the var uses the closest scope
+set -g var6 ghi jkl
+begin
+    set -l -a var6 mno
+    set --show var6
+end
+#CHECK: $var6: set in local scope, unexported, with 3 elements
+#CHECK: $var6[1]: length=3 value=|ghi|
+#CHECK: $var6[2]: length=3 value=|jkl|
+#CHECK: $var6[3]: length=3 value=|mno|
+#CHECK: $var6: set in global scope, unexported, with 2 elements
+#CHECK: $var6[1]: length=3 value=|ghi|
+#CHECK: $var6[2]: length=3 value=|jkl|
+#CHECK: $var6: not set in universal scope
+
+# Exporting works
+set -x TESTVAR0
+set -x TESTVAR1 a
+set -x TESTVAR2 a b
+env | grep TESTVAR | cat -v
+#CHECK: TESTVAR0=
+#CHECK: TESTVAR1=a
+#CHECK: TESTVAR2=a b
+
+# if/for/while scope
+function test_ifforwhile_scope
+    if set -l ifvar1 (true && echo val1) ; end
+    if set -l ifvar2 (echo val2 && false) ; end
+    if false ; else if set -l ifvar3 (echo val3 && false) ; end
+    while set -l whilevar1 (echo val3 ; false) ; end
+    set --show ifvar1 ifvar2 ifvar3 whilevar1
+end
+test_ifforwhile_scope
+#CHECK: $ifvar1: set in local scope, unexported, with 1 elements
+#CHECK: $ifvar1[1]: length=4 value=|val1|
+#CHECK: $ifvar1: not set in global scope
+#CHECK: $ifvar1: not set in universal scope
+#CHECK: 
+#CHECK: $ifvar2: set in local scope, unexported, with 1 elements
+#CHECK: $ifvar2[1]: length=4 value=|val2|
+#CHECK: $ifvar2: not set in global scope
+#CHECK: $ifvar2: not set in universal scope
+#CHECK: 
+#CHECK: $ifvar3: set in local scope, unexported, with 1 elements
+#CHECK: $ifvar3[1]: length=4 value=|val3|
+#CHECK: $ifvar3: not set in global scope
+#CHECK: $ifvar3: not set in universal scope
+#CHECK: 
+#CHECK: $whilevar1: set in local scope, unexported, with 1 elements
+#CHECK: $whilevar1[1]: length=4 value=|val3|
+#CHECK: $whilevar1: not set in global scope
+#CHECK: $whilevar1: not set in universal scope
+
+# $status should always be read-only, setting it makes no sense because it's immediately overwritten.
+set -g status 5
+#CHECKERR: set: Tried to change the read-only variable 'status'
+
 true
diff --git a/tests/set.err b/tests/set.err
deleted file mode 100644
index 886d00f58..000000000
--- a/tests/set.err
+++ /dev/null
@@ -1,29 +0,0 @@
-
-####################
-# Verify behavior of `set --show` given an invalid var name
-$argle bargle: invalid var name
-
-####################
-# Verify behavior of `set --show`
-
-####################
-# Appending works
-
-####################
-# Prepending works
-
-####################
-# Appending and prepending at same time works
-
-####################
-# Setting local scope when no local scope of the var uses the closest scope
-
-####################
-# Exporting works
-
-####################
-# if/for/while scope
-
-####################
-# readonly vars
-set: Tried to change the read-only variable 'status'
diff --git a/tests/set.in b/tests/set.in
deleted file mode 100644
index 12894f963..000000000
--- a/tests/set.in
+++ /dev/null
@@ -1,78 +0,0 @@
-# Test various behaviors of the `set` command.
-
-logmsg Verify behavior of `set --show` given an invalid var name
-set --show 'argle bargle'
-
-logmsg Verify behavior of `set --show`
-set semiempty ''
-set --show semiempty
-
-set -U var1 hello
-set --show var1
-
-set -l var1
-set -g var1 goodbye "and don't come back"
-set --show var1
-
-set -g var2
-set --show _unset_var var2
-
-logmsg Appending works
-set -g var3a a b c
-set -a var3a
-set -a var3a d
-set -a var3a e f
-set --show var3a
-set -g var3b
-set -a var3b
-set --show var3b
-set -g var3c
-set -a var3c 'one string'
-set --show var3c
-
-logmsg Prepending works
-set -g var4a a b c
-set -p var4a
-set -p var4a d
-set -p var4a e f
-set --show var4a
-set -g var4b
-set -p var4b
-set --show var4b
-set -g var4c
-set -p var4c 'one string'
-set --show var4c
-
-logmsg Appending and prepending at same time works
-set -g var5 abc def
-set -a -p var5 0 x 0
-set --show var5
-
-logmsg Setting local scope when no local scope of the var uses the closest scope
-set -g var6 ghi jkl
-begin
-    set -l -a var6 mno
-    set --show var6
-end
-
-logmsg Exporting works
-set -x TESTVAR0
-set -x TESTVAR1 a
-set -x TESTVAR2 a b
-env | grep TESTVAR | cat -v
-
-logmsg if/for/while scope
-function test_ifforwhile_scope
-    if set -l ifvar1 (true && echo val1) ; end
-    if set -l ifvar2 (echo val2 && false) ; end
-    if false ; else if set -l ifvar3 (echo val3 && false) ; end
-    while set -l whilevar1 (echo val3 ; false) ; end
-    set --show ifvar1 ifvar2 ifvar3 whilevar1
-end
-test_ifforwhile_scope
-
-# $status should always be read-only, setting it makes no sense because it's immediately overwritten.
-logmsg readonly vars
-set -g status 5
-
-exit 0
diff --git a/tests/set.out b/tests/set.out
deleted file mode 100644
index ade050637..000000000
--- a/tests/set.out
+++ /dev/null
@@ -1,134 +0,0 @@
-
-####################
-# Verify behavior of `set --show` given an invalid var name
-
-####################
-# Verify behavior of `set --show`
-$semiempty: not set in local scope
-$semiempty: set in global scope, unexported, with 1 elements
-$semiempty[1]: length=0 value=||
-$semiempty: not set in universal scope
-
-$var1: not set in local scope
-$var1: not set in global scope
-$var1: set in universal scope, unexported, with 1 elements
-$var1[1]: length=5 value=|hello|
-
-$var1: set in local scope, unexported, with 0 elements
-$var1: set in global scope, unexported, with 2 elements
-$var1[1]: length=7 value=|goodbye|
-$var1[2]: length=19 value=|and don\'t come back|
-$var1: set in universal scope, unexported, with 1 elements
-$var1[1]: length=5 value=|hello|
-
-$_unset_var: not set in local scope
-$_unset_var: not set in global scope
-$_unset_var: not set in universal scope
-
-$var2: not set in local scope
-$var2: set in global scope, unexported, with 0 elements
-$var2: not set in universal scope
-
-
-####################
-# Appending works
-$var3a: not set in local scope
-$var3a: set in global scope, unexported, with 6 elements
-$var3a[1]: length=1 value=|a|
-$var3a[2]: length=1 value=|b|
-$var3a[3]: length=1 value=|c|
-$var3a[4]: length=1 value=|d|
-$var3a[5]: length=1 value=|e|
-$var3a[6]: length=1 value=|f|
-$var3a: not set in universal scope
-
-$var3b: not set in local scope
-$var3b: set in global scope, unexported, with 0 elements
-$var3b: not set in universal scope
-
-$var3c: not set in local scope
-$var3c: set in global scope, unexported, with 1 elements
-$var3c[1]: length=10 value=|one string|
-$var3c: not set in universal scope
-
-
-####################
-# Prepending works
-$var4a: not set in local scope
-$var4a: set in global scope, unexported, with 6 elements
-$var4a[1]: length=1 value=|e|
-$var4a[2]: length=1 value=|f|
-$var4a[3]: length=1 value=|d|
-$var4a[4]: length=1 value=|a|
-$var4a[5]: length=1 value=|b|
-$var4a[6]: length=1 value=|c|
-$var4a: not set in universal scope
-
-$var4b: not set in local scope
-$var4b: set in global scope, unexported, with 0 elements
-$var4b: not set in universal scope
-
-$var4c: not set in local scope
-$var4c: set in global scope, unexported, with 1 elements
-$var4c[1]: length=10 value=|one string|
-$var4c: not set in universal scope
-
-
-####################
-# Appending and prepending at same time works
-$var5: not set in local scope
-$var5: set in global scope, unexported, with 8 elements
-$var5[1]: length=1 value=|0|
-$var5[2]: length=1 value=|x|
-$var5[3]: length=1 value=|0|
-$var5[4]: length=3 value=|abc|
-$var5[5]: length=3 value=|def|
-$var5[6]: length=1 value=|0|
-$var5[7]: length=1 value=|x|
-$var5[8]: length=1 value=|0|
-$var5: not set in universal scope
-
-
-####################
-# Setting local scope when no local scope of the var uses the closest scope
-$var6: set in local scope, unexported, with 3 elements
-$var6[1]: length=3 value=|ghi|
-$var6[2]: length=3 value=|jkl|
-$var6[3]: length=3 value=|mno|
-$var6: set in global scope, unexported, with 2 elements
-$var6[1]: length=3 value=|ghi|
-$var6[2]: length=3 value=|jkl|
-$var6: not set in universal scope
-
-
-####################
-# Exporting works
-TESTVAR0=
-TESTVAR1=a
-TESTVAR2=a b
-
-####################
-# if/for/while scope
-$ifvar1: set in local scope, unexported, with 1 elements
-$ifvar1[1]: length=4 value=|val1|
-$ifvar1: not set in global scope
-$ifvar1: not set in universal scope
-
-$ifvar2: set in local scope, unexported, with 1 elements
-$ifvar2[1]: length=4 value=|val2|
-$ifvar2: not set in global scope
-$ifvar2: not set in universal scope
-
-$ifvar3: set in local scope, unexported, with 1 elements
-$ifvar3[1]: length=4 value=|val3|
-$ifvar3: not set in global scope
-$ifvar3: not set in universal scope
-
-$whilevar1: set in local scope, unexported, with 1 elements
-$whilevar1[1]: length=4 value=|val3|
-$whilevar1: not set in global scope
-$whilevar1: not set in universal scope
-
-
-####################
-# readonly vars

From bf7629462a2c412cf42480b41f40de1a45e53f11 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 10:38:11 +0100
Subject: [PATCH 1713/1732] Port some small tests to littlecheck

---
 tests/checks/exec.fish      | 13 +++++++++++++
 tests/checks/expansion.fish |  6 ++++++
 tests/test2.err             |  0
 tests/test2.in              |  6 ------
 tests/test2.out             |  1 -
 tests/test_exec_fail.err    |  4 ----
 tests/test_exec_fail.in     |  6 ------
 tests/test_exec_fail.out    |  2 --
 tests/test_exec_fail.status |  1 -
 9 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 tests/checks/exec.fish
 delete mode 100644 tests/test2.err
 delete mode 100644 tests/test2.in
 delete mode 100644 tests/test2.out
 delete mode 100644 tests/test_exec_fail.err
 delete mode 100644 tests/test_exec_fail.in
 delete mode 100644 tests/test_exec_fail.out
 delete mode 100644 tests/test_exec_fail.status

diff --git a/tests/checks/exec.fish b/tests/checks/exec.fish
new file mode 100644
index 000000000..b7658f1a2
--- /dev/null
+++ b/tests/checks/exec.fish
@@ -0,0 +1,13 @@
+#RUN: %fish %s
+exec cat < nosuchfile
+#CHECKERR: warning: An error occurred while redirecting file 'nosuchfile'
+#CHECKERR: open: No such file or directory
+echo "failed: $status"
+#CHECK: failed: 1
+not exec cat < nosuchfile
+#CHECKERR: warning: An error occurred while redirecting file 'nosuchfile'
+#CHECKERR: open: No such file or directory
+echo "neg failed: $status"
+#CHECK: neg failed: 0
+exec cat < /dev/null
+echo "not reached"
diff --git a/tests/checks/expansion.fish b/tests/checks/expansion.fish
index d7b7c7805..5c2b26d04 100644
--- a/tests/checks/expansion.fish
+++ b/tests/checks/expansion.fish
@@ -11,3 +11,9 @@ printf '<%s>\n' ($fish -c 'if $f[a]; end' 2>&1)
 # CHECK: <fish: Invalid index value>
 # CHECK: <if $f[a]; end>
 # CHECK: <      ^>
+
+set a A
+set aa AA
+set aaa AAA
+echo {$aa}a{1,2,3}(for a in 1 2 3; echo $a; end)
+#CHECK: AAa11 AAa21 AAa31 AAa12 AAa22 AAa32 AAa13 AAa23 AAa33
diff --git a/tests/test2.err b/tests/test2.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/test2.in b/tests/test2.in
deleted file mode 100644
index 1aabc9204..000000000
--- a/tests/test2.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tests complex parameter expansions
-
-set a A
-set aa AA
-set aaa AAA
-echo {$aa}a{1,2,3}(for a in 1 2 3; echo $a; end)
diff --git a/tests/test2.out b/tests/test2.out
deleted file mode 100644
index e1af60632..000000000
--- a/tests/test2.out
+++ /dev/null
@@ -1 +0,0 @@
-AAa11 AAa21 AAa31 AAa12 AAa22 AAa32 AAa13 AAa23 AAa33
diff --git a/tests/test_exec_fail.err b/tests/test_exec_fail.err
deleted file mode 100644
index e2c8dd99f..000000000
--- a/tests/test_exec_fail.err
+++ /dev/null
@@ -1,4 +0,0 @@
-warning: An error occurred while redirecting file 'nosuchfile'
-open: No such file or directory
-warning: An error occurred while redirecting file 'nosuchfile'
-open: No such file or directory
diff --git a/tests/test_exec_fail.in b/tests/test_exec_fail.in
deleted file mode 100644
index 08be53ef4..000000000
--- a/tests/test_exec_fail.in
+++ /dev/null
@@ -1,6 +0,0 @@
-exec cat < nosuchfile
-echo "failed: $status"
-not exec cat < nosuchfile
-echo "neg failed: $status"
-exec cat < /dev/null
-echo "not reached"
diff --git a/tests/test_exec_fail.out b/tests/test_exec_fail.out
deleted file mode 100644
index 762ca2ce2..000000000
--- a/tests/test_exec_fail.out
+++ /dev/null
@@ -1,2 +0,0 @@
-failed: 1
-neg failed: 0
diff --git a/tests/test_exec_fail.status b/tests/test_exec_fail.status
deleted file mode 100644
index 573541ac9..000000000
--- a/tests/test_exec_fail.status
+++ /dev/null
@@ -1 +0,0 @@
-0

From e3ccc310e24da1b278d5682e50fc20004f301836 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 10:38:43 +0100
Subject: [PATCH 1714/1732] Port read test to littlecheck

This was a tad annoying because of all the messing with variables, and
because I insisted on getting it all into the existing read.fish.
---
 tests/checks/read.fish | 341 ++++++++++++++++++++++++++++++++++++++++-
 tests/read.err         |  47 ------
 tests/read.in          | 255 ------------------------------
 tests/read.out         | 134 ----------------
 4 files changed, 337 insertions(+), 440 deletions(-)
 delete mode 100644 tests/read.err
 delete mode 100644 tests/read.in
 delete mode 100644 tests/read.out

diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index 205824430..c05d8770c 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -1,14 +1,347 @@
 # RUN: %fish %s
-echo 'a | b' | read -lt a b c
+# Set term again explicitly to ensure behavior.
+set -gx TERM xterm
+# Read with no vars is not an error
+read
 
-set -l
+# Read with -a and anything other than exactly on var name is an error
+read -a
+#CHECKERR: read: Expected 1 args, got 0
+read --array v1 v2
+#CHECKERR: read: Expected 1 args, got 2
+read --list v1
+
+# Verify correct behavior of subcommands and splitting of input.
+begin
+    count (echo one\ntwo)
+    #CHECK: 2
+    set -l IFS \t
+    count (echo one\ntwo)
+    #CHECK: 2
+    set -l IFS
+    count (echo one\ntwo)
+    #CHECK: 1
+    echo [(echo -n one\ntwo)]
+    #CHECK: [one
+    #CHECK: two]
+    count (echo one\ntwo\n)
+    #CHECK: 1
+    echo [(echo -n one\ntwo\n)]
+    #CHECK: [one
+    #CHECK: two]
+    count (echo one\ntwo\n\n)
+    #CHECK: 1
+    echo [(echo -n one\ntwo\n\n)]
+    #CHECK: [one
+    #CHECK: two
+    #CHECK: ]
+end
+
+function print_vars --no-scope-shadowing
+	set -l space
+	set -l IFS \n # ensure our command substitution works right
+	for var in $argv
+		echo -n $space (count $$var) \'$$var\'
+		set space ''
+	end
+	echo
+end
+
+# Test splitting input
+echo 'hello there' | read -l one two
+print_vars one two
+#CHECK: 1 'hello' 1 'there'
+echo 'hello there' | read -l one
+print_vars one
+#CHECK: 1 'hello there'
+echo '' | read -l one
+print_vars one
+#CHECK: 1 ''
+echo '' | read -l one two
+print_vars one two
+#CHECK: 1 '' 1 ''
+echo 'test' | read -l one two three
+print_vars one two three
+#CHECK: 1 'test' 1 '' 1 ''
+echo 'foo   bar   baz' | read -l one two three
+print_vars one two three
+#CHECK: 1 'foo' 1 'bar' 1 'baz'
+echo -n 'a' | read -l one
+echo "$status $one"
+#CHECK: 0 a
+
+# Test splitting input with IFS empty
+set -l IFS
+echo 'hello' | read -l one
+print_vars one
+#CHECK: 1 'hello'
+echo 'hello' | read -l one two
+print_vars one two
+#CHECK: 1 'h' 1 'ello'
+echo 'hello' | read -l one two three
+print_vars one two three
+#CHECK: 1 'h' 1 'e' 1 'llo'
+echo '' | read -l one
+print_vars one
+#CHECK: 0
+echo 't' | read -l one two
+print_vars one two
+#CHECK: 1 't' 0
+echo 't' | read -l one two three
+print_vars one two three
+#CHECK: 1 't' 0 0
+echo ' t' | read -l one two
+print_vars one two
+#CHECK: 1 ' ' 1 't'
+set -le IFS
+
+echo 'hello there' | read -la ary
+print_vars ary
+#CHECK: 2 'hello' 'there'
+echo 'hello' | read -la ary
+print_vars ary
+#CHECK: 1 'hello'
+echo 'this is a bunch of words' | read -la ary
+print_vars ary
+#CHECK: 6 'this' 'is' 'a' 'bunch' 'of' 'words'
+echo '   one   two     three' | read -la ary
+print_vars ary
+#CHECK: 3 'one' 'two' 'three'
+echo '' | read -la ary
+print_vars ary
+#CHECK: 0
+
+set -l IFS
+echo 'hello' | read -la ary
+print_vars ary
+#CHECK: 5 'h' 'e' 'l' 'l' 'o'
+echo 'h' | read -la ary
+print_vars ary
+#CHECK: 1 'h'
+echo '' | read -la ary
+print_vars ary
+#CHECK: 0
+set -le IFS
+
+# read -n tests
+echo 'testing' | read -n 3 foo
+echo $foo
+#CHECK: tes
+echo 'test' | read -n 10 foo
+echo $foo
+#CHECK: test
+echo 'test' | read -n 0 foo
+echo $foo
+#CHECK: test
+echo 'testing' | begin; read -n 3 foo; read -n 3 bar; end
+echo $foo
+#CHECK: tes
+echo $bar
+#CHECK: tin
+echo 'test' | read -n 1 foo
+echo $foo
+#CHECK: t
+
+# read -z tests
+echo -n 'testing' | read -lz foo
+echo $foo
+#CHECK: testing
+echo -n 'test ing' | read -lz foo
+echo $foo
+#CHECK: test ing
+echo 'newline' | read -lz foo
+echo $foo
+#CHECK: newline
+#CHECK: 
+echo -n 'test ing' | read -lz foo bar
+print_vars foo bar
+#CHECK: 1 'test' 1 'ing'
+echo -ne 'test\0ing' | read -lz foo bar
+print_vars foo bar
+#CHECK: 1 'test' 1 ''
+echo -ne 'foo\nbar' | read -lz foo bar
+print_vars foo bar
+#CHECK: 1 'foo' 1 'bar'
+echo -ne 'foo\nbar\0baz\nquux' | while read -lza foo
+    print_vars foo
+end
+#CHECK: 2 'foo' 'bar'
+#CHECK: 2 'baz' 'quux'
+
+# Chunked read tests
+set -l path /tmp/fish_chunked_read_test.txt
+set -l longstr (seq 1024 | string join ',')
+echo -n $longstr > $path
+read -l longstr2 < $path
+test "$longstr" = "$longstr2"
+and echo "Chunked reads test pass"
+or echo "Chunked reads test failure: long strings don't match!"
+rm $path
+#CHECK: Chunked reads test pass
+
+# ==========
+# The following tests verify that `read` correctly handles the limit on the
+# number of bytes consumed.
+#
+set fish_read_limit 8192
+set line abcdefghijklmnopqrstuvwxyz
+
+# Ensure the `read` command terminates if asked to read too much data. The var
+# should be empty. We throw away any data we read if it exceeds the limit on
+# what we consider reasonable.
+yes $line | dd bs=1024 count=(math "1 + $fish_read_limit / 1024") 2>/dev/null | read --null x
+if test $status -ne 122
+    echo reading too much data did not terminate with failure status
+end
+# The read var should be defined but not have any elements when the read
+# aborts due to too much data.
+set -q x
+or echo reading too much data did not define the var
+set -q x[1]
+and echo reading too much data resulted in a var with unexpected data
+
+# Ensure the `read` command terminates if asked to read too much data even if
+# given an explicit limit. The var should be empty. We throw away any data we
+# read if it exceeds the limit on what we consider reasonable.
+yes $line | read --null --nchars=(math "$fish_read_limit + 1") x
+if test $status -ne 122
+    echo reading too much data did not terminate with failure status
+end
+set -q x
+or echo reading too much data with --nchars did not define the var
+set -q x[1]
+and echo reading too much data with --nchars resulted in a var with unexpected data
+
+# Now do the opposite of the previous test and confirm we can read reasonable
+# amounts of data.
+echo $line | read x
+if test $status -ne 0
+    echo the read of a reasonable amount of data failed unexpectedly
+end
+set exp_length (string length $x)
+set act_length (string length $line)
+if test $exp_length -ne $act_length
+    echo reading a reasonable amount of data failed the length test
+    echo expected length $exp_length, actual length $act_length
+end
+
+# Confirm we can read exactly up to the limit.
+yes $line | read --null --nchars $fish_read_limit x
+if test $status -ne 0
+    echo the read of the max amount of data with --nchars failed unexpectedly
+end
+if test (string length "$x") -ne $fish_read_limit
+    echo reading the max amount of data with --nchars failed the length test
+end
+
+# Same as previous test but limit the amount of data fed to `read` rather than
+# using the `--nchars` flag.
+yes $line | dd bs=1024 count=(math "$fish_read_limit / 1024") 2>/dev/null | read --null x
+if test $status -ne 0
+    echo the read of the max amount of data failed unexpectedly
+end
+if test (string length "$x") -ne $fish_read_limit
+    echo reading the max amount of data with --nchars failed the length test
+end
+
+# Confirm reading non-interactively works -- \#4206 regression
+echo abc\ndef | ../test/root/bin/fish -i -c 'read a; read b; set --show a; set --show b'
+#CHECK: $a: not set in local scope
+#CHECK: $a: set in global scope, unexported, with 1 elements
+#CHECK: $a[1]: length=3 value=|abc|
+#CHECK: $a: not set in universal scope
+#CHECK: 
+#CHECK: $b: not set in local scope
+#CHECK: $b: set in global scope, unexported, with 1 elements
+#CHECK: $b[1]: length=3 value=|def|
+#CHECK: $b: not set in universal scope
+
+# Test --delimiter (and $IFS, for now)
+echo a=b | read -l foo bar
+echo $foo
+echo $bar
+#CHECK: a=b
+
+# Delimiter =
+echo a=b | read -l -d = foo bar
+echo $foo
+#CHECK: a
+echo $bar
+#CHECK: b
+
+# Delimiter empty
+echo a=b | read -l -d '' foo bar baz
+echo $foo
+#CHECK: a
+echo $bar
+#CHECK: =
+echo $baz
+#CHECK: b
+
+# IFS empty string
+set -l IFS ''
+echo a=b | read -l foo bar baz
+echo $foo
+#CHECK: a
+echo $bar
+#CHECK: =
+echo $baz
+#CHECK: b
+
+# IFS unset
+set -e IFS
+echo a=b | read -l foo bar baz
+echo $foo
+#CHECK: a=b
+echo $bar
+#CHECK:
+echo $baz
+#CHECK:
+
+# Delimiter =
+echo a=b | read -l -d = foo bar baz
+echo $foo
+#CHECK: a
+echo $bar
+#CHECK: b
+echo $baz
+#CHECK: 
+
+# Multi-char delimiters with -d
+echo a...b...c | read -l -d "..." a b c
+echo $a
+#CHECK: a
+echo $b
+#CHECK: b
+echo $c
+#CHECK: c
+# Multi-char delimiters with IFS
+begin
+    set -l IFS "..."
+    echo a...b...c | read -l a b c
+    echo $a; echo $b; echo $c
+end
+#CHECK: a
+#CHECK: b
+#CHECK: c
+
+# At one point, whatever was read was printed _before_ banana
+echo banana (echo sausage | read)
+echo 'a | b' | read -lt a b c
+#CHECK: banana sausage
+
+echo a $a
+echo b $b
+echo c $c
 # CHECK: a a
-# CHECK: b '|'
+# CHECK: b |
 # CHECK: c b
 
 echo 'a"foo bar"b' | read -lt a b c
 
-set -l
+echo a \'$a\'
+echo b $b
+echo c $c
 # CHECK: a 'afoo barb'
 # CHECK: b
 # CHECK: c
diff --git a/tests/read.err b/tests/read.err
deleted file mode 100644
index f7f4e2a6a..000000000
--- a/tests/read.err
+++ /dev/null
@@ -1,47 +0,0 @@
-
-####################
-# Read with no vars is not an error
-
-####################
-# Read with -a and anything other than exactly on var name is an error
-read: Expected 1 args, got 0
-read: Expected 1 args, got 2
-
-####################
-# Verify correct behavior of subcommands and splitting of input.
-
-####################
-# Test splitting input
-
-####################
-# Test splitting input with IFS empty
-
-####################
-# read -n tests
-
-####################
-# read -z tests
-
-####################
-# Chunked read tests
-
-####################
-# Confirm reading non-interactively works -- #4206 regression
-
-####################
-# Test --delimiter (and $IFS, for now)
-
-####################
-# Delimiter =
-
-####################
-# Delimiter empty
-
-####################
-# IFS empty string
-
-####################
-# IFS unset
-
-####################
-# Delimiter =
diff --git a/tests/read.in b/tests/read.in
deleted file mode 100644
index c75137da5..000000000
--- a/tests/read.in
+++ /dev/null
@@ -1,255 +0,0 @@
-# vim: set filetype=fish:
-#
-# Test read builtin and IFS.
-#
-
-# Set term again explicitly to ensure behavior.
-set -gx TERM xterm
-logmsg Read with no vars is not an error
-read
-
-logmsg Read with -a and anything other than exactly on var name is an error
-read -a
-read --array v1 v2
-read --list v1
-
-logmsg Verify correct behavior of subcommands and splitting of input.
-begin
-    count (echo one\ntwo)
-    set -l IFS \t
-    count (echo one\ntwo)
-    set -l IFS
-    count (echo one\ntwo)
-    echo [(echo -n one\ntwo)]
-    count (echo one\ntwo\n)
-    echo [(echo -n one\ntwo\n)]
-    count (echo one\ntwo\n\n)
-    echo [(echo -n one\ntwo\n\n)]
-end
-
-function print_vars --no-scope-shadowing
-	set -l space
-	set -l IFS \n # ensure our command substitution works right
-	for var in $argv
-		echo -n $space (count $$var) \'$$var\'
-		set space ''
-	end
-	echo
-end
-
-logmsg Test splitting input
-echo 'hello there' | read -l one two
-print_vars one two
-echo 'hello there' | read -l one
-print_vars one
-echo '' | read -l one
-print_vars one
-echo '' | read -l one two
-print_vars one two
-echo 'test' | read -l one two three
-print_vars one two three
-echo 'foo   bar   baz' | read -l one two three
-print_vars one two three
-echo -n 'a' | read -l one
-echo "$status $one"
-
-logmsg Test splitting input with IFS empty
-set -l IFS
-echo 'hello' | read -l one
-print_vars one
-echo 'hello' | read -l one two
-print_vars one two
-echo 'hello' | read -l one two three
-print_vars one two three
-echo '' | read -l one
-print_vars one
-echo 't' | read -l one two
-print_vars one two
-echo 't' | read -l one two three
-print_vars one two three
-echo ' t' | read -l one two
-print_vars one two
-set -le IFS
-
-echo
-echo 'hello there' | read -la ary
-print_vars ary
-echo 'hello' | read -la ary
-print_vars ary
-echo 'this is a bunch of words' | read -la ary
-print_vars ary
-echo '   one   two     three' | read -la ary
-print_vars ary
-echo '' | read -la ary
-print_vars ary
-
-echo
-set -l IFS
-echo 'hello' | read -la ary
-print_vars ary
-echo 'h' | read -la ary
-print_vars ary
-echo '' | read -la ary
-print_vars ary
-set -le IFS
-
-logmsg read -n tests
-echo 'testing' | read -n 3 foo
-echo $foo
-echo 'test' | read -n 10 foo
-echo $foo
-echo 'test' | read -n 0 foo
-echo $foo
-echo 'testing' | begin; read -n 3 foo; read -n 3 bar; end
-echo $foo
-echo $bar
-echo 'test' | read -n 1 foo
-echo $foo
-
-logmsg read -z tests
-echo -n 'testing' | read -lz foo
-echo $foo
-echo -n 'test ing' | read -lz foo
-echo $foo
-echo 'newline' | read -lz foo
-echo $foo
-echo -n 'test ing' | read -lz foo bar
-print_vars foo bar
-echo -ne 'test\0ing' | read -lz foo bar
-print_vars foo bar
-echo -ne 'foo\nbar' | read -lz foo bar
-print_vars foo bar
-echo -ne 'foo\nbar\0baz\nquux' | while read -lza foo
-    print_vars foo
-end
-
-logmsg Chunked read tests
-set -l path /tmp/fish_chunked_read_test.txt
-set -l longstr (seq 1024 | string join ',')
-echo -n $longstr > $path
-read -l longstr2 < $path
-test "$longstr" = "$longstr2"
-and echo "Chunked reads test pass"
-or echo "Chunked reads test failure: long strings don't match!"
-rm $path
-
-# ==========
-# The following tests verify that `read` correctly handles the limit on the
-# number of bytes consumed.
-#
-set fish_read_limit 8192
-set line abcdefghijklmnopqrstuvwxyz
-
-# Ensure the `read` command terminates if asked to read too much data. The var
-# should be empty. We throw away any data we read if it exceeds the limit on
-# what we consider reasonable.
-yes $line | dd bs=1024 count=(math "1 + $fish_read_limit / 1024") 2>/dev/null | read --null x
-if test $status -ne 122
-    echo reading too much data did not terminate with failure status
-end
-# The read var should be defined but not have any elements when the read
-# aborts due to too much data.
-set -q x
-or echo reading too much data did not define the var
-set -q x[1]
-and echo reading too much data resulted in a var with unexpected data
-
-# Ensure the `read` command terminates if asked to read too much data even if
-# given an explicit limit. The var should be empty. We throw away any data we
-# read if it exceeds the limit on what we consider reasonable.
-yes $line | read --null --nchars=(math "$fish_read_limit + 1") x
-if test $status -ne 122
-    echo reading too much data did not terminate with failure status
-end
-set -q x
-or echo reading too much data with --nchars did not define the var
-set -q x[1]
-and echo reading too much data with --nchars resulted in a var with unexpected data
-
-# Now do the opposite of the previous test and confirm we can read reasonable
-# amounts of data.
-echo $line | read x
-if test $status -ne 0
-    echo the read of a reasonable amount of data failed unexpectedly
-end
-set exp_length (string length $x)
-set act_length (string length $line)
-if test $exp_length -ne $act_length
-    echo reading a reasonable amount of data failed the length test
-    echo expected length $exp_length, actual length $act_length
-end
-
-# Confirm we can read exactly up to the limit.
-yes $line | read --null --nchars $fish_read_limit x
-if test $status -ne 0
-    echo the read of the max amount of data with --nchars failed unexpectedly
-end
-if test (string length "$x") -ne $fish_read_limit
-    echo reading the max amount of data with --nchars failed the length test
-end
-
-# Same as previous test but limit the amount of data fed to `read` rather than
-# using the `--nchars` flag.
-yes $line | dd bs=1024 count=(math "$fish_read_limit / 1024") 2>/dev/null | read --null x
-if test $status -ne 0
-    echo the read of the max amount of data failed unexpectedly
-end
-if test (string length "$x") -ne $fish_read_limit
-    echo reading the max amount of data with --nchars failed the length test
-end
-
-logmsg Confirm reading non-interactively works -- \#4206 regression
-echo abc\ndef | ../test/root/bin/fish -i -c 'read a; read b; set --show a; set --show b'
-
-logmsg Test --delimiter '(and $IFS, for now)'
-echo a=b | read -l foo bar
-echo $foo
-echo $bar
-
-logmsg Delimiter =
-echo a=b | read -l -d = foo bar
-echo $foo
-echo $bar
-
-logmsg Delimiter empty
-echo a=b | read -l -d '' foo bar baz
-echo $foo
-echo $bar
-echo $baz
-
-logmsg IFS empty string
-set -l IFS ''
-echo a=b | read -l foo bar baz
-echo $foo
-echo $bar
-echo $baz
-
-logmsg IFS unset
-set -e IFS
-echo a=b | read -l foo bar baz
-echo $foo
-echo $bar
-echo $baz
-
-logmsg Delimiter =
-echo a=b | read -l -d = foo bar baz
-echo $foo
-echo $bar
-echo $baz
-echo
-
-echo 'Multi-char delimiters with -d'
-echo a...b...c | read -l -d "..." a b c
-echo $a
-echo $b
-echo $c
-echo 'Multi-char delimiters with IFS'
-begin
-    set IFS "..."
-    echo a...b...c | read -l a b c
-    echo $a; echo $b; echo $c
-end
-echo
-
-# At one point, whatever was read was printed _before_ banana
-echo banana (echo sausage | read)
diff --git a/tests/read.out b/tests/read.out
deleted file mode 100644
index 177985ea2..000000000
--- a/tests/read.out
+++ /dev/null
@@ -1,134 +0,0 @@
-
-####################
-# Read with no vars is not an error
-
-####################
-# Read with -a and anything other than exactly on var name is an error
-
-####################
-# Verify correct behavior of subcommands and splitting of input.
-2
-2
-1
-[one
-two]
-1
-[one
-two]
-1
-[one
-two
-]
-
-####################
-# Test splitting input
-1 'hello' 1 'there'
-1 'hello there'
-1 ''
-1 '' 1 ''
-1 'test' 1 '' 1 ''
-1 'foo' 1 'bar' 1 'baz'
-0 a
-
-####################
-# Test splitting input with IFS empty
-1 'hello'
-1 'h' 1 'ello'
-1 'h' 1 'e' 1 'llo'
-0
-1 't' 0
-1 't' 0 0
-1 ' ' 1 't'
-
-2 'hello' 'there'
-1 'hello'
-6 'this' 'is' 'a' 'bunch' 'of' 'words'
-3 'one' 'two' 'three'
-0
-
-5 'h' 'e' 'l' 'l' 'o'
-1 'h'
-0
-
-####################
-# read -n tests
-tes
-test
-test
-tes
-tin
-t
-
-####################
-# read -z tests
-testing
-test ing
-newline
-
-1 'test' 1 'ing'
-1 'test' 1 ''
-1 'foo' 1 'bar'
-2 'foo' 'bar'
-2 'baz' 'quux'
-
-####################
-# Chunked read tests
-Chunked reads test pass
-
-####################
-# Confirm reading non-interactively works -- #4206 regression
-$a: not set in local scope
-$a: set in global scope, unexported, with 1 elements
-$a[1]: length=3 value=|abc|
-$a: not set in universal scope
-
-$b: not set in local scope
-$b: set in global scope, unexported, with 1 elements
-$b[1]: length=3 value=|def|
-$b: not set in universal scope
-
-
-####################
-# Test --delimiter (and $IFS, for now)
-a=b
-
-
-####################
-# Delimiter =
-a
-b
-
-####################
-# Delimiter empty
-a
-=
-b
-
-####################
-# IFS empty string
-a
-=
-b
-
-####################
-# IFS unset
-a=b
-
-
-
-####################
-# Delimiter =
-a
-b
-
-
-Multi-char delimiters with -d
-a
-b
-c
-Multi-char delimiters with IFS
-a
-b
-c
-
-banana sausage

From 109a8b07a7a0287565fe719f9221730f33c3b870 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 10:43:40 +0100
Subject: [PATCH 1715/1732] Port "test5" to littlecheck

Put the switch-related stuff in switch.fish, and the wildcard-related
stuff in wildcard.fish.
---
 tests/checks/switch.fish   | 31 +++++++++++++++++++++++++++++++
 tests/checks/wildcard.fish | 14 ++++++++++++++
 tests/test5.err            |  3 ---
 tests/test5.in             | 37 -------------------------------------
 tests/test5.out            |  4 ----
 5 files changed, 45 insertions(+), 44 deletions(-)
 delete mode 100644 tests/test5.err
 delete mode 100644 tests/test5.in
 delete mode 100644 tests/test5.out

diff --git a/tests/checks/switch.fish b/tests/checks/switch.fish
index 6c6eb445a..4898f7d93 100644
--- a/tests/checks/switch.fish
+++ b/tests/checks/switch.fish
@@ -69,3 +69,34 @@ end
 #CHECKERR: fish: 'case' builtin not inside of switch block
 #CHECKERR:      case a
 #CHECKERR:           ^
+
+set smurf green
+
+switch $smurf;
+	case "*ee*"
+		echo Test 1 pass
+	case "*"
+		echo Test 1 fail
+end;
+#CHECK: Test 1 pass
+
+switch $smurf
+	case *ee*
+		echo Test 2 fail
+	case red green blue
+		echo Test 2 pass
+	case "*"
+		echo Test 2 fail
+end
+#CHECKERR: {{.*}}switch.fish (line {{\d+}}): No matches for wildcard '*ee*'. See `help expand`.
+#CHECKERR: case *ee*
+#CHECKERR: ^
+#CHECK: Test 2 pass
+
+switch $smurf
+	case cyan magenta yellow
+		echo Test 3 fail
+	case "*"
+		echo Test 3 pass
+end
+#CHECK: Test 3 pass
diff --git a/tests/checks/wildcard.fish b/tests/checks/wildcard.fish
index 0384c63de..a9d049157 100644
--- a/tests/checks/wildcard.fish
+++ b/tests/checks/wildcard.fish
@@ -15,3 +15,17 @@ echo $dirs/*.txt
 
 cd $oldpwd
 rm -Rf $dir
+
+
+# Verify that we can do wildcard expansion when we
+# don't have read access to some path components
+# See #2099
+set -l where ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess
+mkdir -p $where
+chmod 300 (dirname $where) # no read permissions
+mkdir -p $where
+touch $where/alpha.txt $where/beta.txt $where/delta.txt
+echo $where/*
+#CHECK: ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/alpha.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/beta.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/delta.txt
+chmod 700 (dirname $where) # so we can delete it
+rm -rf ../test/temp/fish_wildcard_permissions_test
diff --git a/tests/test5.err b/tests/test5.err
deleted file mode 100644
index f0a464ce3..000000000
--- a/tests/test5.err
+++ /dev/null
@@ -1,3 +0,0 @@
-fish: No matches for wildcard '*ee*'. See `help expand`.
-	case *ee*
-	     ^
diff --git a/tests/test5.in b/tests/test5.in
deleted file mode 100644
index 54b2b3693..000000000
--- a/tests/test5.in
+++ /dev/null
@@ -1,37 +0,0 @@
-
-set smurf green
-
-switch $smurf;
-	case "*ee*"
-		echo Test 1 pass
-	case "*"
-		echo Test 1 fail
-end;
-
-switch $smurf
-	case *ee*
-		echo Test 2 fail
-	case red green blue
-		echo Test 2 pass
-	case "*"
-		echo Test 2 fail
-end
-
-switch $smurf
-	case cyan magenta yellow
-		echo Test 3 fail
-	case "*"
-		echo Test 3 pass
-end
-
-# Verify that we can do wildcard expansion when we
-# don't have read access to some path components
-# See #2099
-set -l where ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess
-mkdir -p $where
-chmod 300 (dirname $where) # no read permissions
-mkdir -p $where
-touch $where/alpha.txt $where/beta.txt $where/delta.txt
-echo $where/*
-chmod 700 (dirname $where) # so we can delete it
-rm -rf ../test/temp/fish_wildcard_permissions_test
diff --git a/tests/test5.out b/tests/test5.out
deleted file mode 100644
index 70f1ec81b..000000000
--- a/tests/test5.out
+++ /dev/null
@@ -1,4 +0,0 @@
-Test 1 pass
-Test 2 pass
-Test 3 pass
-../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/alpha.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/beta.txt ../test/temp/fish_wildcard_permissions_test/noaccess/yesaccess/delta.txt

From 884f347be6b0d5589b6c723c59e92423f9b23d84 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 10:55:59 +0100
Subject: [PATCH 1716/1732] Port "test6" to littlecheck

It's related to `complete`, so put it in complete.fish
---
 tests/checks/complete.fish | 184 +++++++++++++++++++++++++++++++++++++
 tests/test6.err            |   3 -
 tests/test6.in             | 135 ---------------------------
 tests/test6.out            |  47 ----------
 4 files changed, 184 insertions(+), 185 deletions(-)
 delete mode 100644 tests/test6.err
 delete mode 100644 tests/test6.in
 delete mode 100644 tests/test6.out

diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 8ecb9f24f..583e5b1bc 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -168,3 +168,187 @@ complete -C'complete_test_function_desc ' | count
 
 complete -c prev-arg-variable -f
 complete -C'prev-arg-variable $HOME '
+
+# Regression test for issue #3129. In previous versions these statements would
+# cause an `assert()` to fire thus killing the shell.
+complete -c pkill -o ''
+#CHECKERR: complete: -o requires a non-empty string
+complete -c pkill -l ''
+#CHECKERR: complete: -l requires a non-empty string
+complete -c pkill -s ''
+#CHECKERR: complete: -s requires a non-empty string
+
+# Test that conditions that add or remove completions don't deadlock, etc.
+# We actually encountered some case that was effectively like this (Issue 2 in github)
+
+complete --command AAAA -l abcd --condition 'complete -c AAAA -l efgh'
+echo "AAAA:"
+complete -C'AAAA -' | sort
+#CHECK: AAAA:
+#CHECK: --abcd
+echo "AAAA:"
+complete -C'AAAA -' | sort
+#CHECK: AAAA:
+#CHECK: --abcd
+#CHECK: --efgh
+
+complete --command BBBB -l abcd --condition 'complete -e --command BBBB -l abcd'
+echo "BBBB:"
+complete -C'BBBB -'
+#CHECK: BBBB:
+#CHECK: --abcd
+echo "BBBB:"
+complete -C'BBBB -'
+#CHECK: BBBB:
+#CHECK: 
+
+# Test that erasing completions works correctly
+echo
+
+function sort
+    # GNU sort is really stupid, a non-C locale seems to make it assume --dictionary-order
+    # If I wanted --dictionary-order, I would have specified --dictionary-order!
+    env LC_ALL=C sort $argv
+end
+
+complete -c CCCC -l bar
+complete -c CCCC -l baz
+complete -c CCCC -o bar
+complete -c CCCC -o foo
+complete -c CCCC -s a
+complete -c CCCC -s b
+echo "CCCC:"
+complete -C'CCCC -' | sort
+complete -c CCCC -l bar -e
+#CHECK: CCCC:
+#CHECK: --bar
+#CHECK: --baz
+#CHECK: -a
+#CHECK: -b
+#CHECK: -bar
+#CHECK: -foo
+echo "CCCC:"
+complete -C'CCCC -' | sort
+complete -c CCCC -o foo -e
+#CHECK: CCCC:
+#CHECK: --baz
+#CHECK: -a
+#CHECK: -b
+#CHECK: -bar
+#CHECK: -foo
+echo "CCCC:"
+complete -C'CCCC -' | sort
+complete -c CCCC -s a -e
+#CHECK: CCCC:
+#CHECK: --baz
+#CHECK: -a
+#CHECK: -b
+#CHECK: -bar
+echo "CCCC:"
+complete -C'CCCC -' | sort
+complete -c CCCC -e
+#CHECK: CCCC:
+#CHECK: --baz
+#CHECK: -b
+#CHECK: -bar
+echo "CCCC:"
+complete -C'CCCC -' | sort
+#CHECK: CCCC:
+
+echo "Test that -- suppresses option completions"
+complete -c TestDoubleDash -l TestDoubleDashOption
+complete -C'TestDoubleDash -' | sort
+#CHECK: Test that -- suppresses option completions
+#CHECK: --TestDoubleDashOption
+echo "Expect no output:" (complete -C'TestDoubleDash -- -' | sort)
+#CHECK: Expect no output:
+
+# fish seems to have always handled "exclusive" options strangely
+# It seems to treat them the same as "old-style" (single-dash) long options
+echo "Testing exclusive options"
+#CHECK: Testing exclusive options
+complete -c TestExclusive -x -s Q
+complete -c TestExclusive -x -s W
+complete -c TestExclusive -s A
+echo "Expect -A -Q -W:" (complete -C'TestExclusive -' | sort | string join ' ')
+#CHECK: Expect -A -Q -W: -A -Q -W
+echo "Expect -AQ -AW:" (complete -C'TestExclusive -A' | sort | string join ' ')
+#CHECK: Expect -AQ -AW: -AQ -AW
+echo "Expect no output 1:" (complete -C'TestExclusive -Q')
+#CHECK: Expect no output 1:
+echo "Expect no output 2:" (complete -C'TestExclusive -W')
+#CHECK: Expect no output 2:
+
+# Test for optional arguments, like cp's --backup
+complete -c TestOptionalArgument -l backup -f -a 'none all simple'
+echo "Expect --backup --backup=:" (complete -C'TestOptionalArgument -' | sort | string join ' ')
+#CHECK: Expect --backup --backup=: --backup --backup=
+echo "Expect --backup=all  --backup=none  --backup=simple:" (complete -C'TestOptionalArgument --backup=' | sort | string join ' ')
+#CHECK: Expect --backup=all  --backup=none  --backup=simple: --backup=all --backup=none --backup=simple
+
+# Test that directory completions work correctly
+if begin; rm -rf test6.tmp.dir; and mkdir test6.tmp.dir; end
+    pushd test6.tmp.dir
+    set -l dir (mktemp -d XXXXXXXX)
+    if complete -C$dir | grep "^$dir/.*Directory" >/dev/null
+        echo "implicit cd complete works"
+    else
+        echo "no implicit cd complete"
+    end
+    #CHECK: implicit cd complete works
+    if complete -C"command $dir" | grep "^$dir/.*Directory" >/dev/null
+        echo "implicit cd complete incorrect after 'command'"
+    else
+        echo "no implicit cd complete after 'command'"
+    end
+    #CHECK: no implicit cd complete after 'command'
+    popd
+    if begin
+            set -l PATH $PWD/test6.tmp.dir $PATH 2>/dev/null
+            complete -C$dir | grep "^$dir/.*Directory" >/dev/null
+        end
+        echo "incorrect implicit cd from PATH"
+    else
+        echo "PATH does not cause incorrect implicit cd"
+    end
+    #CHECK: PATH does not cause incorrect implicit cd
+    rm -rf test6.tmp.dir
+else
+    echo "error: could not create temp environment" >&2
+end
+
+# Test command expansion with parened PATHs (#952)
+begin
+  set -l parened_path $PWD/'test6.tmp2.(paren).dir'
+  set -l parened_subpath $parened_path/subdir
+  if not begin
+        rm -rf $parened_path
+	    and mkdir $parened_path
+		and mkdir $parened_subpath
+	    and ln -s /bin/ls $parened_path/'__test6_(paren)_command'
+	    and ln -s /bin/ls $parened_subpath/'__test6_subdir_(paren)_command'
+      end
+    echo "error: could not create command expansion temp environment" >&2
+  end
+  
+  # Verify that we can expand commands when PATH has parens
+  set -l PATH $parened_path $PATH
+  set -l completed (complete -C__test6_ | cut -f 1 -d \t)
+  if test "$completed" = '__test6_(paren)_command'
+    echo "Command completion with parened PATHs test passed"
+  else
+    echo "Command completion with parened PATHs test failed. Expected __test6_(paren)_command, got $completed" >&2
+  end
+  #CHECK: Command completion with parened PATHs test passed
+  
+  # Verify that commands with intermediate slashes do NOT expand with respect to PATH
+  set -l completed (complete -Csubdir/__test6_subdir)
+  if test -z "$completed"
+    echo "Command completion with intermediate slashes passed"
+  else
+    echo "Command completion with intermediate slashes: should output nothing, instead got $completed" >&2
+  end
+  #CHECK: Command completion with intermediate slashes passed
+  
+  rm -rf $parened_path
+end
diff --git a/tests/test6.err b/tests/test6.err
deleted file mode 100644
index 5252a9953..000000000
--- a/tests/test6.err
+++ /dev/null
@@ -1,3 +0,0 @@
-complete: -o requires a non-empty string
-complete: -l requires a non-empty string
-complete: -s requires a non-empty string
diff --git a/tests/test6.in b/tests/test6.in
deleted file mode 100644
index b64d2048b..000000000
--- a/tests/test6.in
+++ /dev/null
@@ -1,135 +0,0 @@
-# vim: set filetype=fish:
-
-# Regression test for issue #3129. In previous versions these statements would
-# cause an `assert()` to fire thus killing the shell.
-complete -c pkill -o ''
-complete -c pkill -l ''
-complete -c pkill -s ''
-
-# Test that conditions that add or remove completions don't deadlock, etc.
-# We actually encountered some case that was effectively like this (Issue 2 in github)
-
-complete --command AAAA -l abcd --condition 'complete -c AAAA -l efgh'
-echo "AAAA:"
-complete -C'AAAA -' | sort
-echo "AAAA:"
-complete -C'AAAA -' | sort
-
-complete --command BBBB -l abcd --condition 'complete -e --command BBBB -l abcd'
-echo "BBBB:"
-complete -C'BBBB -'
-echo "BBBB:"
-complete -C'BBBB -'
-
-# Test that erasing completions works correctly
-echo
-
-function sort
-    # GNU sort is really stupid, a non-C locale seems to make it assume --dictionary-order
-    # If I wanted --dictionary-order, I would have specified --dictionary-order!
-    env LC_ALL=C sort $argv
-end
-
-complete -c CCCC -l bar
-complete -c CCCC -l baz
-complete -c CCCC -o bar
-complete -c CCCC -o foo
-complete -c CCCC -s a
-complete -c CCCC -s b
-echo "CCCC:"
-complete -C'CCCC -' | sort
-complete -c CCCC -l bar -e
-echo "CCCC:"
-complete -C'CCCC -' | sort
-complete -c CCCC -o foo -e
-echo "CCCC:"
-complete -C'CCCC -' | sort
-complete -c CCCC -s a -e
-echo "CCCC:"
-complete -C'CCCC -' | sort
-complete -c CCCC -e
-echo "CCCC:"
-complete -C'CCCC -' | sort
-
-echo "Test that -- suppresses option completions"
-complete -c TestDoubleDash -l TestDoubleDashOption
-complete -C'TestDoubleDash -' | sort
-echo "Expect no output:" (complete -C'TestDoubleDash -- -' | sort)
-
-# fish seems to have always handled "exclusive" options strangely
-# It seems to treat them the same as "old-style" (single-dash) long options
-echo "Testing exclusive options"
-complete -c TestExclusive -x -s Q
-complete -c TestExclusive -x -s W
-complete -c TestExclusive -s A
-echo "Expect -A -Q -W:" (complete -C'TestExclusive -' | sort | string join ' ')
-echo "Expect -AQ -AW:" (complete -C'TestExclusive -A' | sort | string join ' ')
-echo "Expect no output 1:" (complete -C'TestExclusive -Q')
-echo "Expect no output 2:" (complete -C'TestExclusive -W')
-
-# Test for optional arguments, like cp's --backup
-complete -c TestOptionalArgument -l backup -f -a 'none all simple'
-echo "Expect --backup --backup=:" (complete -C'TestOptionalArgument -' | sort | string join ' ')
-echo "Expect --backup=all  --backup=none  --backup=simple:" (complete -C'TestOptionalArgument --backup=' | sort | string join ' ')
-
-# Test that directory completions work correctly
-if begin; rm -rf test6.tmp.dir; and mkdir test6.tmp.dir; end
-    pushd test6.tmp.dir
-    set -l dir (mktemp -d XXXXXXXX)
-    if complete -C$dir | grep "^$dir/.*Directory" >/dev/null
-        echo "implicit cd complete works"
-    else
-        echo "no implicit cd complete"
-    end
-    if complete -C"command $dir" | grep "^$dir/.*Directory" >/dev/null
-        echo "implicit cd complete incorrect after 'command'"
-    else
-        echo "no implicit cd complete after 'command'"
-    end
-    popd
-    if begin
-            set -l PATH $PWD/test6.tmp.dir $PATH 2>/dev/null
-            complete -C$dir | grep "^$dir/.*Directory" >/dev/null
-        end
-        echo "incorrect implicit cd from PATH"
-    else
-        echo "PATH does not cause incorrect implicit cd"
-    end
-    rm -rf test6.tmp.dir
-else
-    echo "error: could not create temp environment" >&2
-end
-
-# Test command expansion with parened PATHs (#952)
-begin
-  set -l parened_path $PWD/'test6.tmp2.(paren).dir'
-  set -l parened_subpath $parened_path/subdir
-  if not begin
-        rm -rf $parened_path
-	    and mkdir $parened_path
-		and mkdir $parened_subpath
-	    and ln -s /bin/ls $parened_path/'__test6_(paren)_command'
-	    and ln -s /bin/ls $parened_subpath/'__test6_subdir_(paren)_command'
-      end
-    echo "error: could not create command expansion temp environment" >&2
-  end
-  
-  # Verify that we can expand commands when PATH has parens
-  set -l PATH $parened_path $PATH
-  set -l completed (complete -C__test6_ | cut -f 1 -d \t)
-  if test "$completed" = '__test6_(paren)_command'
-    echo "Command completion with parened PATHs test passed"
-  else
-    echo "Command completion with parened PATHs test failed. Expected __test6_(paren)_command, got $completed" >&2
-  end
-  
-  # Verify that commands with intermediate slashes do NOT expand with respect to PATH
-  set -l completed (complete -Csubdir/__test6_subdir)
-  if test -z "$completed"
-    echo "Command completion with intermediate slashes passed"
-  else
-    echo "Command completion with intermediate slashes: should output nothing, instead got $completed" >&2
-  end
-  
-  rm -rf $parened_path
-end
diff --git a/tests/test6.out b/tests/test6.out
deleted file mode 100644
index 6e21926d2..000000000
--- a/tests/test6.out
+++ /dev/null
@@ -1,47 +0,0 @@
-AAAA:
---abcd
-AAAA:
---abcd
---efgh
-BBBB:
---abcd
-BBBB:
-
-CCCC:
---bar
---baz
--a
--b
--bar
--foo
-CCCC:
---baz
--a
--b
--bar
--foo
-CCCC:
---baz
--a
--b
--bar
-CCCC:
---baz
--b
--bar
-CCCC:
-Test that -- suppresses option completions
---TestDoubleDashOption
-Expect no output:
-Testing exclusive options
-Expect -A -Q -W: -A -Q -W
-Expect -AQ -AW: -AQ -AW
-Expect no output 1:
-Expect no output 2:
-Expect --backup --backup=: --backup --backup=
-Expect --backup=all  --backup=none  --backup=simple: --backup=all --backup=none --backup=simple
-implicit cd complete works
-no implicit cd complete after 'command'
-PATH does not cause incorrect implicit cd
-Command completion with parened PATHs test passed
-Command completion with intermediate slashes passed

From e9b4f5f0ab0499fcbdfe3c9895701f7917006ba1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 11:06:36 +0100
Subject: [PATCH 1717/1732] Replace references to ".../test/root/bin/fish" in
 the checks

---
 tests/checks/locale.fish | 8 ++++----
 tests/checks/read.fish   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/checks/locale.fish b/tests/checks/locale.fish
index b0e7a73e8..55180b570 100644
--- a/tests/checks/locale.fish
+++ b/tests/checks/locale.fish
@@ -1,4 +1,4 @@
-#RUN: %fish %s
+#RUN: %fish -C "set fish %fish" %s
 # A function to display bytes, necessary because GNU and BSD implementations of `od` have different output.
 # We used to use xxd, but it's not available everywhere. See #3797.
 #
@@ -56,7 +56,7 @@ end
 # output should be "58c3bb58" for the first statement and "58c3bc58" for the
 # second.
 echo -n X\u00FBX | display_bytes
-echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' | display_bytes
+echo X\u00FCX | env LC_ALL=C $fish -c 'read foo; echo -n $foo' | display_bytes
 #CHECK: 0000000 130 303 273 130
 #CHECK: 0000004
 #CHECK: 0000000 130 303 274 130
@@ -70,13 +70,13 @@ echo X\u00FCX | env LC_ALL=C ../test/root/bin/fish -c 'read foo; echo -n $foo' |
 # few single-byte unicode chars (that are not ASCII) are generally in the
 # ISO 8859-x char sets which are encompassed by the C locale. The output should
 # be "59fc59".
-env LC_ALL=C ../test/root/bin/fish -c 'echo -n Y\u00FCY' | display_bytes
+env LC_ALL=C $fish -c 'echo -n Y\u00FCY' | display_bytes
 #CHECK: 0000000 131 374 131
 #CHECK: 0000003
 
 # The user can specify a wide unicode character (one requiring more than a
 # single byte). In the C/POSIX locales we substitute a question-mark for the
 # unencodable wide char. The output should be "543f54".
-env LC_ALL=C ../test/root/bin/fish -c 'echo -n T\u01FDT' | display_bytes
+env LC_ALL=C $fish -c 'echo -n T\u01FDT' | display_bytes
 #CHECK: 0000000 124 077 124
 #CHECK: 0000003
diff --git a/tests/checks/read.fish b/tests/checks/read.fish
index c05d8770c..32aa9f91b 100644
--- a/tests/checks/read.fish
+++ b/tests/checks/read.fish
@@ -1,4 +1,4 @@
-# RUN: %fish %s
+# RUN: %fish -C "set fish %fish" %s
 # Set term again explicitly to ensure behavior.
 set -gx TERM xterm
 # Read with no vars is not an error
@@ -245,7 +245,7 @@ if test (string length "$x") -ne $fish_read_limit
 end
 
 # Confirm reading non-interactively works -- \#4206 regression
-echo abc\ndef | ../test/root/bin/fish -i -c 'read a; read b; set --show a; set --show b'
+echo abc\ndef | $fish -i -c 'read a; read b; set --show a; set --show b'
 #CHECK: $a: not set in local scope
 #CHECK: $a: set in global scope, unexported, with 1 elements
 #CHECK: $a[1]: length=3 value=|abc|

From 849f27912e9a232902de0d6f939e6c39ad12c7b1 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 11:16:53 +0100
Subject: [PATCH 1718/1732] Port parameter_expansion test to littlecheck

Just put it in expansion.fish.
---
 tests/checks/expansion.fish   | 43 +++++++++++++++++++++++++++++++++++
 tests/parameter_expansion.err |  0
 tests/parameter_expansion.in  | 29 -----------------------
 tests/parameter_expansion.out | 14 ------------
 4 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 tests/parameter_expansion.err
 delete mode 100644 tests/parameter_expansion.in
 delete mode 100644 tests/parameter_expansion.out

diff --git a/tests/checks/expansion.fish b/tests/checks/expansion.fish
index 5c2b26d04..c9aa0bf48 100644
--- a/tests/checks/expansion.fish
+++ b/tests/checks/expansion.fish
@@ -17,3 +17,46 @@ set aa AA
 set aaa AAA
 echo {$aa}a{1,2,3}(for a in 1 2 3; echo $a; end)
 #CHECK: AAa11 AAa21 AAa31 AAa12 AAa22 AAa32 AAa13 AAa23 AAa33
+
+# basic expansion test
+echo {}
+echo {apple}
+echo {apple,orange}
+#CHECK: {}
+#CHECK: {apple}
+#CHECK: apple orange
+
+# expansion tests with spaces
+echo {apple, orange}
+echo { apple, orange, banana }
+#CHECK: apple orange
+#CHECK: apple orange banana
+
+# expansion with spaces and cartesian products
+echo \'{ hello , world }\'
+#CHECK: 'hello' 'world'
+
+# expansion with escapes
+for phrase in {good\,,   beautiful ,morning}; echo -n "$phrase "; end | string trim;
+for phrase in {goodbye\,,\ cruel\ ,world\n}; echo -n $phrase; end;
+#CHECK: good, beautiful morning
+#CHECK: goodbye, cruel world
+
+# dual expansion cartesian product
+echo { alpha, beta }\ {lambda, gamma }, |  string replace -r ',$' ''
+#CHECK: alpha lambda, beta lambda, alpha gamma, beta gamma
+
+# expansion with subshells
+for name in { (echo Meg), (echo Jo) }
+	echo $name
+end
+#CHECK: Meg
+#CHECK: Jo
+
+# subshells with expansion
+for name in (for name in {Beth, Amy}; printf "$name\n"; end); printf "$name\n"; end
+#CHECK: Beth
+#CHECK: Amy
+
+echo {{a,b}}
+#CHECK: {a} {b}
diff --git a/tests/parameter_expansion.err b/tests/parameter_expansion.err
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/parameter_expansion.in b/tests/parameter_expansion.in
deleted file mode 100644
index 31c89a690..000000000
--- a/tests/parameter_expansion.in
+++ /dev/null
@@ -1,29 +0,0 @@
-# basic expansion test
-echo {}
-echo {apple}
-echo {apple,orange}
-
-# expansion tests with spaces
-echo {apple, orange}
-echo { apple, orange, banana }
-
-# expansion with spaces and cartesian products
-echo \'{ hello , world }\'
-
-# expansion with escapes
-for phrase in {good\,,   beautiful ,morning}; echo -n "$phrase "; end | string trim;
-for phrase in {goodbye\,,\ cruel\ ,world\n}; echo -n $phrase; end;
-
-# dual expansion cartesian product
-echo { alpha, beta }\ {lambda, gamma }, |  string replace -r ',$' ''
-
-# expansion with subshells
-for name in { (echo Meg), (echo Jo) }
-	echo $name
-end
-
-# subshells with expansion
-for name in (for name in {Beth, Amy}; printf "$name\n"; end); printf "$name\n"; end
-
-echo {{a,b}}
-# vim: set ft=fish:
diff --git a/tests/parameter_expansion.out b/tests/parameter_expansion.out
deleted file mode 100644
index 4717848c7..000000000
--- a/tests/parameter_expansion.out
+++ /dev/null
@@ -1,14 +0,0 @@
-{}
-{apple}
-apple orange
-apple orange
-apple orange banana
-'hello' 'world'
-good, beautiful morning
-goodbye, cruel world
-alpha lambda, beta lambda, alpha gamma, beta gamma
-Meg
-Jo
-Beth
-Amy
-{a} {b}

From cdf6260d7043b9e51ac2bf4a31f85f58125fb571 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 12:34:43 +0100
Subject: [PATCH 1719/1732] Port fish_opt tests to littlecheck

It's a wrapper for argparse, so just put it in argparse.fish.
---
 tests/checks/argparse.fish | 78 ++++++++++++++++++++++++++++++++++++++
 tests/fish_opt.err         | 48 -----------------------
 tests/fish_opt.in          | 62 ------------------------------
 tests/fish_opt.out         | 52 -------------------------
 4 files changed, 78 insertions(+), 162 deletions(-)
 delete mode 100644 tests/fish_opt.err
 delete mode 100644 tests/fish_opt.in
 delete mode 100644 tests/fish_opt.out

diff --git a/tests/checks/argparse.fish b/tests/checks/argparse.fish
index 5c9ca8ec6..7d0a5f3dd 100644
--- a/tests/checks/argparse.fish
+++ b/tests/checks/argparse.fish
@@ -310,3 +310,81 @@ argparse -n foo q r/required= -- foo -qr
 
 argparse r/required= -- foo --required
 # CHECKERR: argparse: Expected argument for option --required
+
+### The fish_opt wrapper:
+# No args is an error
+fish_opt
+and echo unexpected status $status
+#CHECKERR: fish_opt: The --short flag is required and must be a single character
+
+# No short flag or an invalid short flag is an error
+fish_opt -l help
+and echo unexpected status $status
+#CHECKERR: fish_opt: The --short flag is required and must be a single character
+fish_opt -s help
+and echo unexpected status $status
+#CHECKERR: fish_opt: The --short flag is required and must be a single character
+
+# A required and optional arg makes no sense
+fish_opt -s h -l help -r --optional-val
+and echo unexpected status $status
+#CHECKERR: fish_opt: Mutually exclusive flags 'o/optional-val' and `r/required-val` seen
+
+# A repeated and optional arg makes no sense
+fish_opt -s h -l help --multiple-vals --optional-val
+and echo unexpected status $status
+#CHECKERR: fish_opt: Mutually exclusive flags 'multiple-vals' and `o/optional-val` seen
+
+# An unexpected arg not associated with a flag is an error
+fish_opt -s h -l help hello
+and echo unexpected status $status
+#CHECKERR: fish_opt: Expected at most 0 args, got 1
+
+# Now verify that valid combinations of options produces the correct output.
+
+# Bool, short only
+fish_opt -s h
+or echo unexpected status $status
+#CHECK: h
+
+# Bool, short and long
+fish_opt --short h --long help
+or echo unexpected status $status
+#CHECK: h/help
+
+# Bool, short and long but the short var cannot be used
+fish_opt --short h --long help --long-only
+#CHECK: h-help
+
+# Required val, short and long but the short var cannot be used
+fish_opt --short h --long help -r --long-only
+or echo unexpected status $status
+#CHECK: h-help=
+
+# Optional val, short and long valid
+fish_opt --short h -l help --optional-val
+or echo unexpected status $status
+#CHECK: h/help=?
+
+# Optional val, short and long but the short var cannot be used
+fish_opt --short h -l help --optional-val --long-only
+or echo unexpected status $status
+#CHECK: h-help=?
+
+# Repeated val, short and long valid
+fish_opt --short h -l help --multiple-vals
+or echo unexpected status $status
+#CHECK: h/help=+
+
+# Repeated val, short and long but short not valid
+fish_opt --short h -l help --multiple-vals --long-only
+or echo unexpected status $status
+#CHECK: h-help=+
+
+# Repeated val, short only
+fish_opt -s h --multiple-vals
+or echo unexpected status $status
+fish_opt -s h --multiple-vals --long-only
+or echo unexpected status $status
+#CHECK: h=+
+#CHECK: h=+
diff --git a/tests/fish_opt.err b/tests/fish_opt.err
deleted file mode 100644
index 3d14b2fe6..000000000
--- a/tests/fish_opt.err
+++ /dev/null
@@ -1,48 +0,0 @@
-
-####################
-# No args is an error
-fish_opt: The --short flag is required and must be a single character
-
-####################
-# No short flag or an invalid short flag is an error
-fish_opt: The --short flag is required and must be a single character
-fish_opt: The --short flag is required and must be a single character
-
-####################
-# A required and optional arg makes no sense
-fish_opt: Mutually exclusive flags 'o/optional-val' and `r/required-val` seen
-
-####################
-# A repeated and optional arg makes no sense
-fish_opt: Mutually exclusive flags 'multiple-vals' and `o/optional-val` seen
-
-####################
-# An unexpected arg not associated with a flag is an error
-fish_opt: Expected at most 0 args, got 1
-
-####################
-# Bool, short only
-
-####################
-# Bool, short and long
-
-####################
-# Bool, short and long but the short var cannot be used
-
-####################
-# Required val, short and long but the short var cannot be used
-
-####################
-# Optional val, short and long valid
-
-####################
-# Optional val, short and long but the short var cannot be used
-
-####################
-# Repeated val, short and long valid
-
-####################
-# Repeated val, short and long but short not valid
-
-####################
-# Repeated val, short only
diff --git a/tests/fish_opt.in b/tests/fish_opt.in
deleted file mode 100644
index b9dfb992f..000000000
--- a/tests/fish_opt.in
+++ /dev/null
@@ -1,62 +0,0 @@
-# Start by testing a bunch of error conditions.
-
-logmsg No args is an error
-fish_opt
-and echo unexpected status $status
-
-logmsg No short flag or an invalid short flag is an error
-fish_opt -l help
-and echo unexpected status $status
-fish_opt -s help
-and echo unexpected status $status
-
-logmsg A required and optional arg makes no sense
-fish_opt -s h -l help -r --optional-val
-and echo unexpected status $status
-
-logmsg A repeated and optional arg makes no sense
-fish_opt -s h -l help --multiple-vals --optional-val
-and echo unexpected status $status
-
-logmsg An unexpected arg not associated with a flag is an error
-fish_opt -s h -l help hello
-and echo unexpected status $status
-
-# Now verify that valid combinations of options produces the correct output.
-
-logmsg Bool, short only
-fish_opt -s h
-or echo unexpected status $status
-
-logmsg Bool, short and long
-fish_opt --short h --long help
-or echo unexpected status $status
-
-logmsg Bool, short and long but the short var cannot be used
-fish_opt --short h --long help --long-only
-
-logmsg Required val, short and long but the short var cannot be used
-fish_opt --short h --long help -r --long-only
-or echo unexpected status $status
-
-logmsg Optional val, short and long valid
-fish_opt --short h -l help --optional-val
-or echo unexpected status $status
-
-logmsg Optional val, short and long but the short var cannot be used
-fish_opt --short h -l help --optional-val --long-only
-or echo unexpected status $status
-
-logmsg Repeated val, short and long valid
-fish_opt --short h -l help --multiple-vals
-or echo unexpected status $status
-
-logmsg Repeated val, short and long but short not valid
-fish_opt --short h -l help --multiple-vals --long-only
-or echo unexpected status $status
-
-logmsg Repeated val, short only
-fish_opt -s h --multiple-vals
-or echo unexpected status $status
-fish_opt -s h --multiple-vals --long-only
-or echo unexpected status $status
diff --git a/tests/fish_opt.out b/tests/fish_opt.out
deleted file mode 100644
index 25442fd86..000000000
--- a/tests/fish_opt.out
+++ /dev/null
@@ -1,52 +0,0 @@
-
-####################
-# No args is an error
-
-####################
-# No short flag or an invalid short flag is an error
-
-####################
-# A required and optional arg makes no sense
-
-####################
-# A repeated and optional arg makes no sense
-
-####################
-# An unexpected arg not associated with a flag is an error
-
-####################
-# Bool, short only
-h
-
-####################
-# Bool, short and long
-h/help
-
-####################
-# Bool, short and long but the short var cannot be used
-h-help
-
-####################
-# Required val, short and long but the short var cannot be used
-h-help=
-
-####################
-# Optional val, short and long valid
-h/help=?
-
-####################
-# Optional val, short and long but the short var cannot be used
-h-help=?
-
-####################
-# Repeated val, short and long valid
-h/help=+
-
-####################
-# Repeated val, short and long but short not valid
-h-help=+
-
-####################
-# Repeated val, short only
-h=+
-h=+

From 0ddbd8d318198ae0c6d7700f367f615792a55244 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 13:30:48 +0100
Subject: [PATCH 1720/1732] Fix typo in bad options test

This had a stray `}`, which made one possible message:

    unknown option -- Z}

with a literal `}`, which broke on NetBSD, which has that
message.
---
 tests/checks/bad-option.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/checks/bad-option.fish b/tests/checks/bad-option.fish
index 6a1140944..afc09d0b0 100644
--- a/tests/checks/bad-option.fish
+++ b/tests/checks/bad-option.fish
@@ -1,2 +1,2 @@
 #RUN: %fish -Z
-#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?|unknown option -- Z}|illegal option -- Z}}
+#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?|unknown option -- Z|illegal option -- Z}}

From 6daab9c41f03ca10989d64028345d230306a1108 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 15:21:22 +0100
Subject: [PATCH 1721/1732] Port while test to littlecheck

And we're gonna add more loop stuff, so port it to a file called "loop.fish"
---
 tests/{while.in => checks/loops.fish} | 15 +++++++++++----
 tests/while.err                       |  3 ---
 tests/while.out                       | 12 ------------
 3 files changed, 11 insertions(+), 19 deletions(-)
 rename tests/{while.in => checks/loops.fish} (81%)
 delete mode 100644 tests/while.err
 delete mode 100644 tests/while.out

diff --git a/tests/while.in b/tests/checks/loops.fish
similarity index 81%
rename from tests/while.in
rename to tests/checks/loops.fish
index d183a54f6..d0adbfaa6 100644
--- a/tests/while.in
+++ b/tests/checks/loops.fish
@@ -1,4 +1,4 @@
-# vim: set ft=fish:
+#RUN: %fish %s
 
 function never_runs
 	while false
@@ -17,16 +17,17 @@ function runs_once
 	end
 end
 
-# this should return 1
+# this should return 0
 never_runs; echo "Empty Loop in Function: $status"
+#CHECK: Empty Loop in Function: 0
 
 # this should return 0
 runs_once; echo "Runs Once: $status"
+#CHECK: Runs Once: 0
 
 # this should return 2
 early_return; echo "Early Return: $status"
-
-logmsg Loops exit status handling
+#CHECK: Early Return: 2
 
 function set_status ; return $argv[1]; end
 
@@ -41,6 +42,7 @@ while begin
   end
   true
 end
+#CHECK: Condition Status: 36
 
 # The condition status IS visible in the loop body.
 set_status 55
@@ -48,6 +50,7 @@ while true
   echo "Body Status: $status"
   break
 end
+#CHECK: Body Status: 0
 
 # The status of the last command is visible in the loop condition
 set_status 13
@@ -58,6 +61,8 @@ while begin
   end
   set_status 5
 end
+#CHECK: Condition 2 Status: 13
+#CHECK: Condition 2 Status: 5
 
 # The status of the last command is visible outside the loop
 set rem 5 7 11
@@ -66,8 +71,10 @@ while [ (count $rem) -gt 0 ]
   set rem $rem[2..-1]
 end
 echo "Loop Exit Status: $status"
+#CHECK: Loop Exit Status: 11
 
 # Empty loops succeed.
 false
 while false; end
 echo "Empty Loop Status: $status"
+#CHECK: Empty Loop Status: 0
diff --git a/tests/while.err b/tests/while.err
deleted file mode 100644
index 2549f3894..000000000
--- a/tests/while.err
+++ /dev/null
@@ -1,3 +0,0 @@
-
-####################
-# Loops exit status handling
diff --git a/tests/while.out b/tests/while.out
deleted file mode 100644
index f23708aa4..000000000
--- a/tests/while.out
+++ /dev/null
@@ -1,12 +0,0 @@
-Empty Loop in Function: 0
-Runs Once: 0
-Early Return: 2
-
-####################
-# Loops exit status handling
-Condition Status: 36
-Body Status: 0
-Condition 2 Status: 13
-Condition 2 Status: 5
-Loop Exit Status: 11
-Empty Loop Status: 0

From 22edf3213f5bf9a6b95a16adbaa6e6171e7729d8 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 15:29:33 +0100
Subject: [PATCH 1722/1732] Port "test4" to littlecheck

It has to do with scoping, so call it "scoping.fish".
---
 tests/{test4.in => checks/scoping.fish} | 43 +++++++++++++++++++---
 tests/test4.err                         | 12 -------
 tests/test4.out                         | 47 -------------------------
 3 files changed, 39 insertions(+), 63 deletions(-)
 rename tests/{test4.in => checks/scoping.fish} (78%)
 delete mode 100644 tests/test4.err
 delete mode 100644 tests/test4.out

diff --git a/tests/test4.in b/tests/checks/scoping.fish
similarity index 78%
rename from tests/test4.in
rename to tests/checks/scoping.fish
index 91539e690..9bde31199 100644
--- a/tests/test4.in
+++ b/tests/checks/scoping.fish
@@ -1,4 +1,5 @@
-logmsg Test scoping rules for functions
+#RUN: %fish %s
+# Test scoping rules for functions and status
 
 set -e smurf
 
@@ -19,7 +20,9 @@ set smurf blue; unsetter; if test $smurf = blue; echo Test 2 pass; else; echo Te
 end
 
 call1
+#CHECK: Test 1 pass
 call2
+#CHECK: Test 2 pass
 
 function call3
 setter; if test $smurf = green; echo Test 3 pass; else; echo Test 3 fail; end
@@ -31,7 +34,9 @@ end
 
 set -g smurf yellow
 call3
+#CHECK: Test 3 pass
 call4
+#CHECK: Test 4 pass
 
 set -l foo 1
 set -g bar 2
@@ -44,18 +49,21 @@ if test $status -ne 0
 else
     echo Test 5 pass
 end;
+#CHECK: Test 5 pass
 
 if not set -g -q bar
     echo Test 6 fail
 else
     echo Test 6 pass
 end;
+#CHECK: Test 6 pass
 
 if not set -U -q baz
     echo Test 7 fail
 else
     echo Test 7 pass
 end;
+#CHECK: Test 7 pass
 
 set -u -l -q foo
 if test $status -ne 0
@@ -64,18 +72,21 @@ else
     echo Test 8 pass
 
 end;
+#CHECK: Test 8 pass
 
 if not set -u -g -q bar
     echo Test 9 fail
 else
     echo Test 9 pass
 end;
+#CHECK: Test 9 pass
 
 if not set -u -U -q baz
     echo Test 10 fail
 else
     echo Test 10 pass
 end;
+#CHECK: Test 10 pass
 
 set -x -l -q foo
 if test $status -eq 0
@@ -83,18 +94,21 @@ if test $status -eq 0
 else
     echo Test 11 pass
 end;
+#CHECK: Test 11 pass
 
 if set -x -g -q bar
     echo Test 12 fail
 else
     echo Test 12 pass
 end;
+#CHECK: Test 12 pass
 
 if set -x -U -q baz
     echo Test 13 fail
 else
     echo Test 13 pass
 end;
+#CHECK: Test 13 pass
 
 set -x -l foo 1
 set -x -g bar 2
@@ -106,12 +120,14 @@ if test $status -ne 0
 else
     echo Test 14 pass
 end;
+#CHECK: Test 14 pass
 
 if not set -g -q bar
     echo Test 15 fail
 else
     echo Test 15 pass
 end;
+#CHECK: Test 15 pass
 
 if not set -U -q baz
     echo Test 16 fail
@@ -119,6 +135,7 @@ else
     echo Test 16 pass
 
 end;
+#CHECK: Test 16 pass
 
 set -u -l -q foo
 if test $status -ne 1
@@ -126,12 +143,14 @@ if test $status -ne 1
 else
     echo Test 17 pass
 end;
+#CHECK: Test 17 pass
 
 if set -u -g -q bar
     echo Test 18 fail
 else
     echo Test 18 pass
 end;
+#CHECK: Test 18 pass
 
 if set -u -U -q baz
     echo Test 19 fail
@@ -139,6 +158,7 @@ else
     echo Test 19 pass
 
 end;
+#CHECK: Test 19 pass
 
 set -x -l -q foo
 if test $status -ne 0
@@ -146,39 +166,53 @@ if test $status -ne 0
 else
     echo Test 20 pass
 end;
+#CHECK: Test 20 pass
 
 if not set -x -g -q bar
     echo Test 21 fail
 else
     echo Test 21 pass
 end;
+#CHECK: Test 21 pass
 
 if not set -x -U -q baz
     echo Test 22 fail
 else
     echo Test 22 pass
 end;
+#CHECK: Test 22 pass
 
 set -U -e baz
 
-logmsg Verify subcommand statuses
+# Verify subcommand statuses
 echo (false) $status (true) $status (false) $status
+#CHECK: 1 0 1
 
-logmsg Verify that set passes through exit status, except when passed -n or -q or -e
+# Verify that set passes through exit status, except when passed -n or -q or -e
 false ; set foo bar ; echo 1 $status # passthrough
+#CHECK: 1 1
 true ; set foo bar ; echo 2 $status # passthrough
+#CHECK: 2 0
 false ; set -q foo ; echo 3 $status # no passthrough
+#CHECK: 3 0
 true ; set -q foo ; echo 4 $status  # no passthrough
+#CHECK: 4 0
 false ; set -n > /dev/null ; echo 5 $status # no passthrough
+#CHECK: 5 0
 false ; set -e foo ; echo 6 $status # no passthrough
+#CHECK: 6 0
 true ; set -e foo ; echo 7 $status # no passthrough
+#CHECK: 7 4
 false ; set -h > /dev/null ; echo 8 $status # no passthrough
+#CHECK: 8 0
 true ; set -NOT_AN_OPTION 2> /dev/null ; echo 9 $status # no passthrough
+#CHECK: 9 2
 false ; set foo (echo A; true) ; echo 10 $status $foo
+#CHECK: 10 0 A
 true ; set foo (echo B; false) ; echo 11 $status $foo
+#CHECK: 11 1 B
 true
 
-logmsg "Verify set -ql behavior (#2502)"
 function setql_check
   set -l setql_foo val
   if set -ql setql_foo
@@ -188,3 +222,4 @@ function setql_check
   end
 end
 setql_check
+#CHECK: Pass
diff --git a/tests/test4.err b/tests/test4.err
deleted file mode 100644
index c344381d6..000000000
--- a/tests/test4.err
+++ /dev/null
@@ -1,12 +0,0 @@
-
-####################
-# Test scoping rules for functions
-
-####################
-# Verify subcommand statuses
-
-####################
-# Verify that set passes through exit status, except when passed -n or -q or -e
-
-####################
-# Verify set -ql behavior (#2502)
diff --git a/tests/test4.out b/tests/test4.out
deleted file mode 100644
index a7af43eef..000000000
--- a/tests/test4.out
+++ /dev/null
@@ -1,47 +0,0 @@
-
-####################
-# Test scoping rules for functions
-Test 1 pass
-Test 2 pass
-Test 3 pass
-Test 4 pass
-Test 5 pass
-Test 6 pass
-Test 7 pass
-Test 8 pass
-Test 9 pass
-Test 10 pass
-Test 11 pass
-Test 12 pass
-Test 13 pass
-Test 14 pass
-Test 15 pass
-Test 16 pass
-Test 17 pass
-Test 18 pass
-Test 19 pass
-Test 20 pass
-Test 21 pass
-Test 22 pass
-
-####################
-# Verify subcommand statuses
-1 0 1
-
-####################
-# Verify that set passes through exit status, except when passed -n or -q or -e
-1 1
-2 0
-3 0
-4 0
-5 0
-6 0
-7 4
-8 0
-9 2
-10 0 A
-11 1 B
-
-####################
-# Verify set -ql behavior (#2502)
-Pass

From ee8ca246f80371192b6d26516aaa87f80692dbc7 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 15:37:10 +0100
Subject: [PATCH 1723/1732] Port test8 to littlecheck

This one tests a bunch of separate stuff, so we put it into a few
different files.

The main, new one is "slices.fish", which tests various index expressions.
---
 tests/checks/andor.fish  | 13 ++++++++++
 tests/checks/loops.fish  | 12 ++++++++++
 tests/checks/slices.fish | 33 ++++++++++++++++++++++++++
 tests/checks/status.fish |  4 ++++
 tests/test8.err          | 24 -------------------
 tests/test8.in           | 51 ----------------------------------------
 tests/test8.out          | 42 ---------------------------------
 7 files changed, 62 insertions(+), 117 deletions(-)
 create mode 100644 tests/checks/slices.fish
 delete mode 100644 tests/test8.err
 delete mode 100644 tests/test8.in
 delete mode 100644 tests/test8.out

diff --git a/tests/checks/andor.fish b/tests/checks/andor.fish
index 3d31dda4c..0dd7b5476 100644
--- a/tests/checks/andor.fish
+++ b/tests/checks/andor.fish
@@ -7,3 +7,16 @@ eval 'true | and'
 
 eval 'true | or'
 # CHECKERR: {{.*}}: The 'or' command can not be used in a pipeline
+
+# Verify and/or behavior with if and while
+if false ; or true ; echo "success1" ; end
+# CHECK: success1
+if false ; and false ; echo "failure1" ; end
+while false ; and false ; or true ; echo "success2"; break ; end
+# CHECK: success2
+while false; or begin ; false; or true; end; echo "success3"; break ; end
+# CHECK: success3
+if false ; else if false ; and true ; else if false ; and false ; else if false; or true; echo "success4"; end
+# CHECK: success4
+if false ; else if false ; and true ; else if false ; or false ; else if false; echo "failure 4"; end
+if false ; or true | false ; echo "failure5" ; end
diff --git a/tests/checks/loops.fish b/tests/checks/loops.fish
index d0adbfaa6..5b21ed1b7 100644
--- a/tests/checks/loops.fish
+++ b/tests/checks/loops.fish
@@ -78,3 +78,15 @@ false
 while false; end
 echo "Empty Loop Status: $status"
 #CHECK: Empty Loop Status: 0
+
+# Loop control in conditions, should have no output.
+for i in 1 2 3
+   while break; end
+   echo $i
+end
+for i in 1 2 3
+   while continue; end
+   echo $i
+end
+
+if false ; or --help ; end
diff --git a/tests/checks/slices.fish b/tests/checks/slices.fish
new file mode 100644
index 000000000..8cfe01416
--- /dev/null
+++ b/tests/checks/slices.fish
@@ -0,0 +1,33 @@
+#RUN: %fish %s
+set n 10
+set test (seq $n)
+echo $test[1..$n]      # normal range
+#CHECK: 1 2 3 4 5 6 7 8 9 10
+echo $test[$n..1]      # inverted range
+#CHECK: 10 9 8 7 6 5 4 3 2 1
+echo $test[2..5 8..6]  # several ranges
+#CHECK: 2 3 4 5 8 7 6
+echo $test[-1..-2]     # range with negative limits
+#CHECK: 10 9
+echo $test[-1..1]      # range with mixed limits
+#CHECK: 10 9 8 7 6 5 4 3 2 1
+
+set test1 $test
+set test1[-1..1] $test; echo $test1
+#CHECK: 10 9 8 7 6 5 4 3 2 1
+set test1[1..$n] $test; echo $test1
+#CHECK: 1 2 3 4 5 6 7 8 9 10
+set test1[$n..1] $test; echo $test1
+#CHECK: 10 9 8 7 6 5 4 3 2 1
+set test1[2..4 -2..-4] $test1[4..2 -4..-2]; echo $test1
+#CHECK: 10 7 8 9 6 5 2 3 4 1
+
+echo (seq 5)[-1..1]
+#CHECK: 5 4 3 2 1
+echo (seq $n)[3..5 -2..2]
+#CHECK: 3 4 5 9 8 7 6 5 4 3 2
+
+echo $test[(count $test)..1]
+#CHECK: 10 9 8 7 6 5 4 3 2 1
+echo $test[1..(count $test)]
+#CHECK: 1 2 3 4 5 6 7 8 9 10
diff --git a/tests/checks/status.fish b/tests/checks/status.fish
index 96f4d9a6b..26de571d6 100644
--- a/tests/checks/status.fish
+++ b/tests/checks/status.fish
@@ -70,3 +70,7 @@ end
 false; echo_last; echo $status #1
 #CHECK: 1
 #CHECK: 0
+
+# Verify that if swallows failure - see #1061
+if false ; end ; echo $status
+#CHECK: 0
diff --git a/tests/test8.err b/tests/test8.err
deleted file mode 100644
index 46ecfda19..000000000
--- a/tests/test8.err
+++ /dev/null
@@ -1,24 +0,0 @@
-
-####################
-# Test variable expand
-
-####################
-# Test variable set
-
-####################
-# Test using slices of command substitution
-
-####################
-# Test more
-
-####################
-# Verify that if statements swallow failure
-
-####################
-# Verify and/or behavior with if and while statements
-
-####################
-# Catch this corner case, which should produce an error
-
-####################
-# Loop control in conditions
diff --git a/tests/test8.in b/tests/test8.in
deleted file mode 100644
index 19d645b1a..000000000
--- a/tests/test8.in
+++ /dev/null
@@ -1,51 +0,0 @@
-# Test index ranges
-
-logmsg Test variable expand
-set n 10
-set test (seq $n)
-echo $test[1..$n]      # normal range
-echo $test[$n..1]      # inverted range
-echo $test[2..5 8..6]  # several ranges
-echo $test[-1..-2]     # range with negative limits
-echo $test[-1..1]      # range with mixed limits
-
-logmsg Test variable set
-set test1 $test
-set test1[-1..1] $test; echo $test1
-set test1[1..$n] $test; echo $test1
-set test1[$n..1] $test; echo $test1
-set test1[2..4 -2..-4] $test1[4..2 -4..-2]; echo $test1
-
-logmsg Test using slices of command substitution
-echo (seq 5)[-1..1]
-echo (seq $n)[3..5 -2..2]
-
-logmsg Test more
-echo $test[(count $test)..1]
-echo $test[1..(count $test)]
-
-# See issue 1061
-logmsg Verify that if statements swallow failure
-if false ; end ; echo $status
-
-logmsg Verify and/or behavior with if and while statements
-if false ; or true ; echo "success1" ; end
-if false ; and false ; echo "failure1" ; end
-while false ; and false ; or true ; echo "success2"; break ; end
-while false; or begin ; false; or true; end; echo "success3"; break ; end
-if false ; else if false ; and true ; else if false ; and false ; else if false; or true; echo "success4"; end
-if false ; else if false ; and true ; else if false ; or false ; else if false; echo "failure 4"; end
-if false ; or true | false ; echo "failure5" ; end
-
-logmsg Catch this corner case, which should produce an error
-if false ; or --help ; end
-
-logmsg Loop control in conditions
-for i in 1 2 3
-   while break; end
-   echo $i
-end
-for i in 1 2 3
-   while continue; end
-   echo $i
-end
diff --git a/tests/test8.out b/tests/test8.out
deleted file mode 100644
index 347669b16..000000000
--- a/tests/test8.out
+++ /dev/null
@@ -1,42 +0,0 @@
-
-####################
-# Test variable expand
-1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-2 3 4 5 8 7 6
-10 9
-10 9 8 7 6 5 4 3 2 1
-
-####################
-# Test variable set
-10 9 8 7 6 5 4 3 2 1
-1 2 3 4 5 6 7 8 9 10
-10 9 8 7 6 5 4 3 2 1
-10 7 8 9 6 5 2 3 4 1
-
-####################
-# Test using slices of command substitution
-5 4 3 2 1
-3 4 5 9 8 7 6 5 4 3 2
-
-####################
-# Test more
-10 9 8 7 6 5 4 3 2 1
-1 2 3 4 5 6 7 8 9 10
-
-####################
-# Verify that if statements swallow failure
-0
-
-####################
-# Verify and/or behavior with if and while statements
-success1
-success2
-success3
-success4
-
-####################
-# Catch this corner case, which should produce an error
-
-####################
-# Loop control in conditions

From 5e6c9508e93e60ce2b6f4298bdde373efc92ba7e Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 17:45:22 +0100
Subject: [PATCH 1724/1732] Port a part of test1 to littlecheck

Test1 is a grab bag of stuff, so we need to separate it.

This part is concerned with for-loops, so we move it to loops.fish
---
 tests/checks/loops.fish | 94 ++++++++++++++++++++++++++++++++++++-----
 tests/test1.err         | 18 --------
 tests/test1.in          | 43 -------------------
 tests/test1.out         | 40 ------------------
 4 files changed, 84 insertions(+), 111 deletions(-)

diff --git a/tests/checks/loops.fish b/tests/checks/loops.fish
index 5b21ed1b7..9342c463e 100644
--- a/tests/checks/loops.fish
+++ b/tests/checks/loops.fish
@@ -1,4 +1,4 @@
-#RUN: %fish %s
+#RUN: %fish -C 'set -g fish %fish' %s
 
 function never_runs
 	while false
@@ -36,11 +36,11 @@ function set_status ; return $argv[1]; end
 # loop body.
 set_status 36
 while begin
-     set -l saved $status
-     echo "Condition Status: $status"
-     set_status $saved
-  end
-  true
+    set -l saved $status
+    echo "Condition Status: $status"
+    set_status $saved
+end
+true
 end
 #CHECK: Condition Status: 36
 
@@ -81,12 +81,86 @@ echo "Empty Loop Status: $status"
 
 # Loop control in conditions, should have no output.
 for i in 1 2 3
-   while break; end
-   echo $i
+    while break; end
+    echo $i
 end
 for i in 1 2 3
-   while continue; end
-   echo $i
+    while continue; end
+    echo $i
 end
 
 if false ; or --help ; end
+
+# Make sure while loops don't run forever with no-exec (#1543)
+echo "while true; end" | $fish --no-execute
+
+# For loops with read-only vars is an error (#4342)
+for status in a b c
+    echo $status
+end
+#CHECKERR: {{.*}}loops.fish (line {{\d+}}): You cannot use read-only variable 'status' in a for loop
+#CHECKERR: for status in a b c
+#CHECKERR: ^
+
+# "That goes for non-electric ones as well (#5548)"
+for hostname in a b c
+    echo $hostname
+end
+#CHECKERR: {{.*}}loops.fish (line {{\d+}}): You cannot use read-only variable 'hostname' in a for loop
+#CHECKERR: for hostname in a b c
+#CHECKERR: ^
+
+# For loop control vars available outside the for block
+begin
+    set -l loop_var initial-value
+    for loop_var in a b c
+        # do nothing
+    end
+    set --show loop_var
+end
+
+set -g loop_var global_val
+function loop_test
+    for loop_var in a b c
+        if test $loop_var = b
+            break
+        end
+    end
+    set --show loop_var
+end
+loop_test
+set --show loop_var
+
+begin
+    set -l loop_var
+    for loop_var in aa bb cc
+    end
+    set --show loop_var
+end
+set --show loop_var
+#CHECK: $loop_var: set in local scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=1 value=|c|
+#CHECK: $loop_var: not set in global scope
+#CHECK: $loop_var: not set in universal scope
+#CHECK: 
+#CHECK: $loop_var: set in local scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=1 value=|b|
+#CHECK: $loop_var: set in global scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=10 value=|global_val|
+#CHECK: $loop_var: not set in universal scope
+#CHECK: 
+#CHECK: $loop_var: not set in local scope
+#CHECK: $loop_var: set in global scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=10 value=|global_val|
+#CHECK: $loop_var: not set in universal scope
+#CHECK: 
+#CHECK: $loop_var: set in local scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=2 value=|cc|
+#CHECK: $loop_var: set in global scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=10 value=|global_val|
+#CHECK: $loop_var: not set in universal scope
+#CHECK: 
+#CHECK: $loop_var: not set in local scope
+#CHECK: $loop_var: set in global scope, unexported, with 1 elements
+#CHECK: $loop_var[1]: length=10 value=|global_val|
+#CHECK: $loop_var: not set in universal scope
diff --git a/tests/test1.err b/tests/test1.err
index ee269e5a2..0c81bfb90 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -26,24 +26,6 @@
 ####################
 # Verify that pipes don't conflict with fd redirections
 
-####################
-# Make sure while loops don't run forever with no-exec (#1543)
-
-####################
-# For loops with read-only vars is an error (#4342)
-fish: You cannot use read-only variable 'status' in a for loop
-for status in a b c
-    ^
-
-####################
-# That goes for non-electric ones as well (#5548)
-fish: You cannot use read-only variable 'hostname' in a for loop
-for hostname in a b c
-    ^
-
-####################
-# For loop control vars available outside the for block
-
 ####################
 # Comments allowed in between lines (#1987)
 
diff --git a/tests/test1.in b/tests/test1.in
index 2d1b81009..8013c09f0 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -138,49 +138,6 @@ echo "/bin/echo pipe 10 <&10 10<&-" | source 10<&0
 echo "/bin/echo pipe 11 <&11 11<&-" | source 11<&0
 echo "/bin/echo pipe 12 <&12 12<&-" | source 12<&0
 
-logmsg "Make sure while loops don't run forever with no-exec (#1543)"
-echo "Checking for infinite loops in no-execute"
-echo "while true; end" | ../test/root/bin/fish --no-execute
-
-logmsg "For loops with read-only vars is an error (#4342)"
-for status in a b c
-  echo $status
-end
-
-logmsg "That goes for non-electric ones as well (#5548)"
-for hostname in a b c
-    echo $hostname
-end
-
-logmsg For loop control vars available outside the for block
-begin
-  set -l loop_var initial-value
-  for loop_var in a b c
-    # do nothing
-  end
-  set --show loop_var
-end
-
-set -g loop_var global_val
-function loop_test
-  for loop_var in a b c
-    if test $loop_var = b
-      break
-    end
-  end
-  set --show loop_var
-end
-loop_test
-set --show loop_var
-
-begin
-  set -l loop_var
-  for loop_var in aa bb cc
-  end
-  set --show loop_var
-end
-set --show loop_var
-
 logmsg 'Comments allowed in between lines (#1987)'
 echo before comment \
   # comment
diff --git a/tests/test1.out b/tests/test1.out
index 7e01503c8..ee2d0a047 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -75,46 +75,6 @@ pipe 10
 pipe 11
 pipe 12
 
-####################
-# Make sure while loops don't run forever with no-exec (#1543)
-Checking for infinite loops in no-execute
-
-####################
-# For loops with read-only vars is an error (#4342)
-
-####################
-# That goes for non-electric ones as well (#5548)
-
-####################
-# For loop control vars available outside the for block
-$loop_var: set in local scope, unexported, with 1 elements
-$loop_var[1]: length=1 value=|c|
-$loop_var: not set in global scope
-$loop_var: not set in universal scope
-
-$loop_var: set in local scope, unexported, with 1 elements
-$loop_var[1]: length=1 value=|b|
-$loop_var: set in global scope, unexported, with 1 elements
-$loop_var[1]: length=10 value=|global_val|
-$loop_var: not set in universal scope
-
-$loop_var: not set in local scope
-$loop_var: set in global scope, unexported, with 1 elements
-$loop_var[1]: length=10 value=|global_val|
-$loop_var: not set in universal scope
-
-$loop_var: set in local scope, unexported, with 1 elements
-$loop_var[1]: length=2 value=|cc|
-$loop_var: set in global scope, unexported, with 1 elements
-$loop_var[1]: length=10 value=|global_val|
-$loop_var: not set in universal scope
-
-$loop_var: not set in local scope
-$loop_var: set in global scope, unexported, with 1 elements
-$loop_var[1]: length=10 value=|global_val|
-$loop_var: not set in universal scope
-
-
 ####################
 # Comments allowed in between lines (#1987)
 before comment after comment

From f67a9f2ee7100c2e2644265e805cf973f9e65732 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Sat, 8 Feb 2020 17:51:48 +0100
Subject: [PATCH 1725/1732] Port another part of test1 to littlecheck

This time it's redirections
---
 tests/checks/redirect.fish | 44 ++++++++++++++++++++++++++++++++++++++
 tests/test1.err            | 12 -----------
 tests/test1.in             | 28 ------------------------
 tests/test1.out            | 28 ------------------------
 4 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/tests/checks/redirect.fish b/tests/checks/redirect.fish
index 14bc3298c..546cd11b5 100644
--- a/tests/checks/redirect.fish
+++ b/tests/checks/redirect.fish
@@ -44,3 +44,47 @@ test -f $tmpdir/file.txt && echo "File exists" || echo "File does not exist"
 #CHECK: File exists
 
 rm -Rf $tmpdir
+
+# Verify that we can turn stderr into stdout and then pipe it
+# Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'.
+begin ; echo output ; echo errput 1>&2  ; end 2>&1 | sort | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
+#CHECK: errput
+#CHECK: output
+#CHECK: errput
+#CHECK: output
+
+# Test that trailing ^ doesn't trigger redirection, see #1873
+echo caret_no_redirect 12345^
+#CHECK: caret_no_redirect 12345^
+
+# Verify that we can pipe something other than stdout
+# The first line should be printed, since we output to stdout but pipe stderr to /dev/null
+# The second line should not be printed, since we output to stderr and pipe it to /dev/null
+begin ; echo is_stdout ; end 2>| cat > /dev/null
+begin ; echo is_stderr 1>&2 ; end 2>| cat > /dev/null
+#CHECK: is_stdout
+
+# "Verify that pipes don't conflict with fd redirections"
+# This code is very similar to eval. We go over a bunch of fads
+# to make it likely that we will nominally conflict with a pipe
+# fish is supposed to detect this case and dup the pipe to something else
+echo "/bin/echo pipe 3 <&3 3<&-" | source 3<&0
+echo "/bin/echo pipe 4 <&4 4<&-" | source 4<&0
+echo "/bin/echo pipe 5 <&5 5<&-" | source 5<&0
+echo "/bin/echo pipe 6 <&6 6<&-" | source 6<&0
+echo "/bin/echo pipe 7 <&7 7<&-" | source 7<&0
+echo "/bin/echo pipe 8 <&8 8<&-" | source 8<&0
+echo "/bin/echo pipe 9 <&9 9<&-" | source 9<&0
+echo "/bin/echo pipe 10 <&10 10<&-" | source 10<&0
+echo "/bin/echo pipe 11 <&11 11<&-" | source 11<&0
+echo "/bin/echo pipe 12 <&12 12<&-" | source 12<&0
+#CHECK: pipe 3
+#CHECK: pipe 4
+#CHECK: pipe 5
+#CHECK: pipe 6
+#CHECK: pipe 7
+#CHECK: pipe 8
+#CHECK: pipe 9
+#CHECK: pipe 10
+#CHECK: pipe 11
+#CHECK: pipe 12
diff --git a/tests/test1.err b/tests/test1.err
index 0c81bfb90..849d1ddac 100644
--- a/tests/test1.err
+++ b/tests/test1.err
@@ -11,21 +11,9 @@
 ####################
 # Testing builtin status
 
-####################
-# Verify that we can turn stderr into stdout and then pipe it
-
-####################
-# Test that trailing ^ doesn't trigger redirection, see #1873
-
-####################
-# Verify that we can pipe something other than stdout
-
 ####################
 # echo tests
 
-####################
-# Verify that pipes don't conflict with fd redirections
-
 ####################
 # Comments allowed in between lines (#1987)
 
diff --git a/tests/test1.in b/tests/test1.in
index 8013c09f0..b0fc90626 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -92,19 +92,6 @@ else
 end
 echo Test 5 $sta
 
-logmsg Verify that we can turn stderr into stdout and then pipe it
-# Note that the order here has historically been unspecified - 'errput' could conceivably appear before 'output'.
-begin ; echo output ; echo errput 1>&2  ; end 2>&1 | sort | tee ../test/temp/tee_test.txt ; cat ../test/temp/tee_test.txt
-
-logmsg "Test that trailing ^ doesn't trigger redirection, see #1873"
-echo caret_no_redirect 12345^
-
-logmsg Verify that we can pipe something other than stdout
-# The first line should be printed, since we output to stdout but pipe stderr to /dev/null
-# The second line should not be printed, since we output to stderr and pipe it to /dev/null
-begin ; echo is_stdout ; end 2>| cat > /dev/null
-begin ; echo is_stderr 1>&2 ; end 2>| cat > /dev/null
-
 ####################
 logmsg echo tests
 echo 'abc\ndef'
@@ -123,21 +110,6 @@ echo -e Catch your breath
 echo -e 'abc\x21def'
 echo -e 'abc\x211def'
 
-logmsg "Verify that pipes don't conflict with fd redirections"
-# This code is very similar to eval. We go over a bunch of fads
-# to make it likely that we will nominally conflict with a pipe
-# fish is supposed to detect this case and dup the pipe to something else
-echo "/bin/echo pipe 3 <&3 3<&-" | source 3<&0
-echo "/bin/echo pipe 4 <&4 4<&-" | source 4<&0
-echo "/bin/echo pipe 5 <&5 5<&-" | source 5<&0
-echo "/bin/echo pipe 6 <&6 6<&-" | source 6<&0
-echo "/bin/echo pipe 7 <&7 7<&-" | source 7<&0
-echo "/bin/echo pipe 8 <&8 8<&-" | source 8<&0
-echo "/bin/echo pipe 9 <&9 9<&-" | source 9<&0
-echo "/bin/echo pipe 10 <&10 10<&-" | source 10<&0
-echo "/bin/echo pipe 11 <&11 11<&-" | source 11<&0
-echo "/bin/echo pipe 12 <&12 12<&-" | source 12<&0
-
 logmsg 'Comments allowed in between lines (#1987)'
 echo before comment \
   # comment
diff --git a/tests/test1.out b/tests/test1.out
index ee2d0a047..32967f783 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -28,21 +28,6 @@ Test 4 pass
 # Testing builtin status
 Test 5 pass
 
-####################
-# Verify that we can turn stderr into stdout and then pipe it
-errput
-output
-errput
-output
-
-####################
-# Test that trailing ^ doesn't trigger redirection, see #1873
-caret_no_redirect 12345^
-
-####################
-# Verify that we can pipe something other than stdout
-is_stdout
-
 ####################
 # echo tests
 abc\ndef
@@ -62,19 +47,6 @@ Catch your breath
 abc!def
 abc!1def
 
-####################
-# Verify that pipes don't conflict with fd redirections
-pipe 3
-pipe 4
-pipe 5
-pipe 6
-pipe 7
-pipe 8
-pipe 9
-pipe 10
-pipe 11
-pipe 12
-
 ####################
 # Comments allowed in between lines (#1987)
 before comment after comment

From d957f6b30253ec1475e50468620a9584f5e625f8 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 12:23:39 -0800
Subject: [PATCH 1726/1732] Centralize some calls to principal_parser()

Eventually perhaps we can get rid of the notion altogether.
---
 src/fish.cpp    | 29 +++++++++++++++--------------
 src/history.cpp |  9 ++++-----
 src/history.h   |  3 ++-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/fish.cpp b/src/fish.cpp
index 45776143f..a6520edc0 100644
--- a/src/fish.cpp
+++ b/src/fish.cpp
@@ -77,6 +77,8 @@ class fish_cmd_opts_t {
     bool is_login{false};
     /// Whether this is an interactive session.
     bool is_interactive_session{false};
+    /// Whether to enable private mode.
+    bool enable_private_mode{false};
 };
 
 /// If we are doing profiling, the filename to output to.
@@ -209,7 +211,7 @@ static struct config_paths_t determine_config_directory_paths(const char *argv0)
 }
 
 // Source the file config.fish in the given directory.
-static void source_config_in_directory(const wcstring &dir) {
+static void source_config_in_directory(parser_t &parser, const wcstring &dir) {
     // If the config.fish file doesn't exist or isn't readable silently return. Fish versions up
     // thru 2.2.0 would instead try to source the file with stderr redirected to /dev/null to deal
     // with that possibility.
@@ -228,33 +230,30 @@ static void source_config_in_directory(const wcstring &dir) {
     FLOGF(config, L"sourcing %ls", escaped_pathname.c_str());
 
     const wcstring cmd = L"builtin source " + escaped_pathname;
-    parser_t &parser = parser_t::principal_parser();
     set_is_within_fish_initialization(true);
     parser.eval(cmd, io_chain_t());
     set_is_within_fish_initialization(false);
 }
 
 /// Parse init files. exec_path is the path of fish executable as determined by argv[0].
-static int read_init(const struct config_paths_t &paths) {
-    source_config_in_directory(paths.data);
-    source_config_in_directory(paths.sysconf);
+static int read_init(parser_t &parser, const struct config_paths_t &paths) {
+    source_config_in_directory(parser, paths.data);
+    source_config_in_directory(parser, paths.sysconf);
 
     // We need to get the configuration directory before we can source the user configuration file.
     // If path_get_config returns false then we have no configuration directory and no custom config
     // to load.
     wcstring config_dir;
     if (path_get_config(config_dir)) {
-        source_config_in_directory(config_dir);
+        source_config_in_directory(parser, config_dir);
     }
 
     return 1;
 }
 
-int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
-    parser_t &parser = parser_t::principal_parser();
-
+int run_command_list(parser_t &parser, std::vector<std::string> *cmds, const io_chain_t &io) {
     for (const auto &cmd : *cmds) {
-        const wcstring cmd_wcs = str2wcstring(cmd);
+        wcstring cmd_wcs = str2wcstring(cmd);
         parser.eval(cmd_wcs, io);
     }
 
@@ -357,7 +356,7 @@ static int fish_parse_opt(int argc, char **argv, fish_cmd_opts_t *opts) {
                 break;
             }
             case 'P': {
-                start_private_mode();
+                opts->enable_private_mode = true;
                 break;
             }
             case 'v': {
@@ -447,6 +446,7 @@ int main(int argc, char **argv) {
     if (opts.is_login) mark_login();
     if (opts.no_exec) mark_no_exec();
     if (opts.is_interactive_session) set_interactive_session(session_interactivity_t::explicit_);
+    if (opts.enable_private_mode) start_private_mode(env_stack_t::globals());
 
     // Only save (and therefore restore) the fg process group if we are interactive. See issues
     // #197 and #1002.
@@ -456,6 +456,7 @@ int main(int argc, char **argv) {
 
     const struct config_paths_t paths = determine_config_directory_paths(argv[0]);
     env_init(&paths);
+
     // Set features early in case other initialization depends on them.
     // Start with the ones set in the environment, then those set on the command line (so the
     // command line takes precedence).
@@ -472,13 +473,13 @@ int main(int argc, char **argv) {
 
     parser_t &parser = parser_t::principal_parser();
 
-    if (read_init(paths)) {
+    if (read_init(parser, paths)) {
         // Stomp the exit status of any initialization commands (issue #635).
         parser.set_last_statuses(statuses_t::just(STATUS_CMD_OK));
 
         // Run post-config commands specified as arguments, if any.
         if (!opts.postconfig_cmds.empty()) {
-            res = run_command_list(&opts.postconfig_cmds, {});
+            res = run_command_list(parser, &opts.postconfig_cmds, {});
         }
 
         if (!opts.batch_cmds.empty()) {
@@ -488,7 +489,7 @@ int main(int argc, char **argv) {
                 fish_xdm_login_hack_hack_hack_hack(&opts.batch_cmds, argc - my_optind,
                                                    argv + my_optind);
             }
-            res = run_command_list(&opts.batch_cmds, {});
+            res = run_command_list(parser, &opts.batch_cmds, {});
             reader_set_end_loop(false);
         } else if (my_optind == argc) {
             // Implicitly interactive mode.
diff --git a/src/history.cpp b/src/history.cpp
index d9e1600bf..311c821d4 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1437,13 +1437,12 @@ history_t &history_t::history_with_name(const wcstring &name) {
     return *hist;
 }
 
-static std::atomic<bool> private_mode{false};
+static relaxed_atomic_bool_t private_mode{false};
 
-void start_private_mode() {
-    private_mode.store(true);
-    auto &vars = parser_t::principal_parser().vars();
+void start_private_mode(env_stack_t &vars) {
+    private_mode = true;
     vars.set_one(L"fish_history", ENV_GLOBAL, L"");
     vars.set_one(L"fish_private_mode", ENV_GLOBAL, L"1");
 }
 
-bool in_private_mode() { return private_mode.load(); }
+bool in_private_mode() { return private_mode; }
diff --git a/src/history.h b/src/history.h
index 66aa52aea..1c1e746b5 100644
--- a/src/history.h
+++ b/src/history.h
@@ -22,6 +22,7 @@
 #include "wutil.h"  // IWYU pragma: keep
 
 struct io_streams_t;
+class env_stack_t;
 class environment_t;
 
 // Fish supports multiple shells writing to history at once. Here is its strategy:
@@ -291,7 +292,7 @@ path_list_t valid_paths(const path_list_t &paths, const wcstring &working_direct
 bool all_paths_are_valid(const path_list_t &paths, const wcstring &working_directory);
 
 /// Sets private mode on. Once in private mode, it cannot be turned off.
-void start_private_mode();
+void start_private_mode(env_stack_t &vars);
 /// Queries private mode status.
 bool in_private_mode();
 

From f1f97b64763e4a251d663e62c189421d9c1bc38d Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 12:39:03 -0800
Subject: [PATCH 1727/1732] Eliminate more calls to principal_parser()

Require a parser to get a job from its pgid.
---
 src/builtin_bg.cpp   |  2 +-
 src/builtin_fg.cpp   |  4 ++--
 src/builtin_jobs.cpp |  2 +-
 src/event.cpp        |  4 ++--
 src/event.h          |  2 +-
 src/parser.cpp       | 12 ++++++------
 src/proc.cpp         |  5 -----
 src/proc.h           |  3 ---
 8 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/builtin_bg.cpp b/src/builtin_bg.cpp
index 0b3b146b1..cf645a508 100644
--- a/src/builtin_bg.cpp
+++ b/src/builtin_bg.cpp
@@ -90,7 +90,7 @@ int builtin_bg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     // Background all existing jobs that match the pids.
     // Non-existent jobs aren't an error, but information about them is useful.
     for (auto p : pids) {
-        if (job_t *j = job_t::from_pid(p)) {
+        if (job_t *j = parser.job_get_from_pid(p)) {
             retval |= send_to_bg(parser, streams, j);
         } else {
             streams.err.append_format(_(L"%ls: Could not find job '%d'\n"), cmd, p);
diff --git a/src/builtin_fg.cpp b/src/builtin_fg.cpp
index 628e76470..3dfdc2141 100644
--- a/src/builtin_fg.cpp
+++ b/src/builtin_fg.cpp
@@ -56,7 +56,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
         bool found_job = false;
         int pid = fish_wcstoi(argv[optind]);
         if (errno == 0 && pid > 0) {
-            found_job = (job_t::from_pid(pid) != nullptr);
+            found_job = (parser.job_get_from_pid(pid) != nullptr);
         }
 
         if (found_job) {
@@ -73,7 +73,7 @@ int builtin_fg(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
             streams.err.append_format(BUILTIN_ERR_NOT_NUMBER, cmd, argv[optind]);
             builtin_print_error_trailer(parser, streams.err, cmd);
         } else {
-            job = job_t::from_pid(pid);
+            job = parser.job_get_from_pid(pid);
             if (!job || !job->is_constructed() || job->is_completed()) {
                 streams.err.append_format(_(L"%ls: No suitable job: %d\n"), cmd, pid);
                 job = nullptr;
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index fe82b7704..254e40667 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -203,7 +203,7 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                                   argv[i]);
                         return STATUS_INVALID_ARGS;
                     }
-                    j = job_t::from_pid(pid);
+                    j = parser.job_get_from_pid(pid);
                 }
 
                 if (j && !j->is_completed() && j->is_constructed()) {
diff --git a/src/event.cpp b/src/event.cpp
index e20d4567e..4dd17567a 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -138,7 +138,7 @@ static int event_is_blocked(parser_t &parser, const event_t &e) {
     return event_block_list_blocks_type(parser.global_event_blocks);
 }
 
-wcstring event_get_desc(const event_t &evt) {
+wcstring event_get_desc(const parser_t &parser, const event_t &evt) {
     const event_description_t &ed = evt.desc;
     switch (ed.type) {
         case event_type_t::signal: {
@@ -155,7 +155,7 @@ wcstring event_get_desc(const event_t &evt) {
                 return format_string(_(L"exit handler for process %d"), ed.param1.pid);
             } else {
                 // In events, PGIDs are stored as negative PIDs
-                job_t *j = job_t::from_pid(-ed.param1.pid);
+                job_t *j = parser.job_get_from_pid(-ed.param1.pid);
                 if (j) {
                     return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id(),
                                          j->command_wcstr());
diff --git a/src/event.h b/src/event.h
index 13a6dd677..b9f13f1f9 100644
--- a/src/event.h
+++ b/src/event.h
@@ -118,7 +118,7 @@ void event_enqueue_signal(int signal);
 void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter);
 
 /// Returns a string describing the specified event.
-wcstring event_get_desc(const event_t &e);
+wcstring event_get_desc(const parser_t &parser, const event_t &e);
 
 /// Fire a generic event with the specified name.
 void event_fire_generic(parser_t &parser, const wchar_t *name,
diff --git a/src/parser.cpp b/src/parser.cpp
index 425ce3106..84601264e 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -340,8 +340,8 @@ operation_context_t parser_t::context() {
 }
 
 /// Append stack trace info for the block \p b to \p trace.
-static void append_block_description_to_stack_trace(const block_t &b, wcstring &trace,
-                                                    const environment_t &vars) {
+static void append_block_description_to_stack_trace(const parser_t &parser, const block_t &b,
+                                                    wcstring &trace) {
     bool print_call_site = false;
     switch (b.type()) {
         case block_type_t::function_call:
@@ -375,13 +375,13 @@ static void append_block_description_to_stack_trace(const block_t &b, wcstring &
         case block_type_t::source: {
             const wchar_t *source_dest = b.sourced_file;
             append_format(trace, _(L"from sourcing file %ls\n"),
-                          user_presentable_path(source_dest, vars).c_str());
+                          user_presentable_path(source_dest, parser.vars()).c_str());
             print_call_site = true;
             break;
         }
         case block_type_t::event: {
             assert(b.event && "Should have an event");
-            wcstring description = event_get_desc(*b.event);
+            wcstring description = event_get_desc(parser, *b.event);
             append_format(trace, _(L"in event handler: %ls\n"), description.c_str());
             print_call_site = true;
             break;
@@ -403,7 +403,7 @@ static void append_block_description_to_stack_trace(const block_t &b, wcstring &
         const wchar_t *file = b.src_filename;
         if (file) {
             append_format(trace, _(L"\tcalled on line %d of file %ls\n"), b.src_lineno,
-                          user_presentable_path(file, vars).c_str());
+                          user_presentable_path(file, parser.vars()).c_str());
         } else if (is_within_fish_initialization()) {
             append_format(trace, _(L"\tcalled during startup\n"));
         }
@@ -413,7 +413,7 @@ static void append_block_description_to_stack_trace(const block_t &b, wcstring &
 wcstring parser_t::stack_trace() const {
     wcstring trace;
     for (const auto &b : blocks()) {
-        append_block_description_to_stack_trace(b, trace, vars());
+        append_block_description_to_stack_trace(*this, b, trace);
 
         // Stop at event handler. No reason to believe that any other code is relevant.
         //
diff --git a/src/proc.cpp b/src/proc.cpp
index 1da651a4c..bc3169553 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -123,11 +123,6 @@ job_t *job_t::from_job_id(job_id_t id) {
     return parser_t::principal_parser().job_get(id);
 }
 
-job_t *job_t::from_pid(pid_t pid) {
-    ASSERT_IS_MAIN_THREAD();
-    return parser_t::principal_parser().job_get_from_pid(pid);
-}
-
 /// Return true if all processes in the job have stopped or completed.
 bool job_t::is_stopped() const {
     for (const process_ptr_t &p : processes) {
diff --git a/src/proc.h b/src/proc.h
index aea7220f7..b18ac5d52 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -517,9 +517,6 @@ class job_t {
     /// Return the job instance matching this unique job id.
     /// If id is 0 or less, return the last job used.
     static job_t *from_job_id(job_id_t id);
-
-    /// Return the job containing the process identified by the unique pid provided.
-    static job_t *from_pid(pid_t pid);
 };
 
 /// Whether this shell is attached to the keyboard at all.

From fba3c83ba56c666bc97c5899d41085f5e1517859 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 12:47:13 -0800
Subject: [PATCH 1728/1732] Eliminate yet more calls to principal_parser()

In particular, remove job_t::from_job_id
---
 src/builtin_functions.cpp |  6 +++---
 src/builtin_jobs.cpp      |  7 +++----
 src/builtin_wait.cpp      | 12 ++++++------
 src/event.cpp             |  2 +-
 src/parser.cpp            |  7 +++++++
 src/parser.h              |  1 +
 src/proc.cpp              |  5 -----
 src/proc.h                |  4 ----
 8 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 951a1d5b0..2c4377494 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -130,7 +130,7 @@ static int parse_cmd_opts(functions_cmd_opts_t &opts, int *optind,  //!OCLINT(hi
 }
 
 /// Return a definition of the specified function. Used by the functions builtin.
-static wcstring functions_def(const wcstring &name) {
+static wcstring functions_def(const parser_t &parser, const wcstring &name) {
     assert(!name.empty() && "Empty name");
     wcstring out;
     wcstring desc, def;
@@ -184,7 +184,7 @@ static wcstring functions_def(const wcstring &name) {
                 break;
             }
             case event_type_t::job_exit: {
-                const job_t *j = job_t::from_job_id(d.param1.job_id);
+                const job_t *j = parser.job_get(d.param1.job_id);
                 if (j) append_format(out, L" --on-job-exit %d", j->pgid);
                 break;
             }
@@ -435,7 +435,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 if (i != optind) streams.out.append(L"\n");
                 const wchar_t *funcname = argv[optind];
                 report_function_metadata(funcname, opts.verbose, streams, parser, true);
-                wcstring def = functions_def(funcname);
+                wcstring def = functions_def(parser, funcname);
 
                 if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
                     std::vector<highlight_spec_t> colors;
diff --git a/src/builtin_jobs.cpp b/src/builtin_jobs.cpp
index 254e40667..e9f292930 100644
--- a/src/builtin_jobs.cpp
+++ b/src/builtin_jobs.cpp
@@ -188,14 +188,13 @@ int builtin_jobs(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 const job_t *j = nullptr;
 
                 if (argv[i][0] == L'%') {
-                    int jobId = -1;
-                    jobId = fish_wcstoi(argv[i] + 1);
-                    if (errno || jobId < -1) {
+                    int job_id = fish_wcstoi(argv[i] + 1);
+                    if (errno || job_id < -1) {
                         streams.err.append_format(_(L"%ls: '%ls' is not a valid job id"), cmd,
                                                   argv[i]);
                         return STATUS_INVALID_ARGS;
                     }
-                    j = job_t::from_job_id(jobId);
+                    j = parser.job_get(job_id);
                 } else {
                     int pid = fish_wcstoi(argv[i]);
                     if (errno || pid < 0) {
diff --git a/src/builtin_wait.cpp b/src/builtin_wait.cpp
index 3d21d04f8..861c92788 100644
--- a/src/builtin_wait.cpp
+++ b/src/builtin_wait.cpp
@@ -76,9 +76,9 @@ static int wait_for_backgrounds(parser_t &parser, bool any_flag) {
     return 0;
 }
 
-static bool all_specified_jobs_finished(const std::vector<job_id_t> &ids) {
+static bool all_specified_jobs_finished(const parser_t &parser, const std::vector<job_id_t> &ids) {
     for (auto id : ids) {
-        if (job_t *j = job_t::from_job_id(id)) {
+        if (const job_t *j = parser.job_get(id)) {
             // If any specified job is not completed, return false.
             // If there are stopped jobs, they are ignored.
             if (j->is_constructed() && !j->is_completed() && !j->is_stopped()) {
@@ -89,9 +89,9 @@ static bool all_specified_jobs_finished(const std::vector<job_id_t> &ids) {
     return true;
 }
 
-static bool any_specified_jobs_finished(const std::vector<job_id_t> &ids) {
+static bool any_specified_jobs_finished(const parser_t &parser, const std::vector<job_id_t> &ids) {
     for (auto id : ids) {
-        if (job_t *j = job_t::from_job_id(id)) {
+        if (const job_t *j = parser.job_get(id)) {
             // If any specified job is completed, return true.
             if (j->is_constructed() && (j->is_completed() || j->is_stopped())) {
                 return true;
@@ -107,8 +107,8 @@ static bool any_specified_jobs_finished(const std::vector<job_id_t> &ids) {
 static int wait_for_backgrounds_specified(parser_t &parser, const std::vector<job_id_t> &ids,
                                           bool any_flag) {
     sigint_checker_t sigint;
-    while ((!any_flag && !all_specified_jobs_finished(ids)) ||
-           (any_flag && !any_specified_jobs_finished(ids))) {
+    while ((!any_flag && !all_specified_jobs_finished(parser, ids)) ||
+           (any_flag && !any_specified_jobs_finished(parser, ids))) {
         if (sigint.check()) {
             return 128 + SIGINT;
         }
diff --git a/src/event.cpp b/src/event.cpp
index 4dd17567a..28a234b80 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -168,7 +168,7 @@ wcstring event_get_desc(const parser_t &parser, const event_t &evt) {
         }
 
         case event_type_t::job_exit: {
-            job_t *j = job_t::from_job_id(ed.param1.job_id);
+            const job_t *j = parser.job_get(ed.param1.job_id);
             if (j) {
                 return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id(),
                                      j->command_wcstr());
diff --git a/src/parser.cpp b/src/parser.cpp
index 84601264e..320fa8649 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -586,6 +586,13 @@ job_t *parser_t::job_get(job_id_t id) {
     return nullptr;
 }
 
+const job_t *parser_t::job_get(job_id_t id) const {
+    for (const auto &job : job_list) {
+        if (id <= 0 || job->job_id() == id) return job.get();
+    }
+    return nullptr;
+}
+
 job_t *parser_t::job_get_from_pid(pid_t pid) const {
     pid_t pgid = getpgid(pid);
 
diff --git a/src/parser.h b/src/parser.h
index 2cb261235..425144df8 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -364,6 +364,7 @@ class parser_t : public std::enable_shared_from_this<parser_t> {
 
     /// Return the job with the specified job id. If id is 0 or less, return the last job used.
     job_t *job_get(job_id_t job_id);
+    const job_t *job_get(job_id_t job_id) const;
 
     /// Returns the job with the given pid.
     job_t *job_get_from_pid(pid_t pid) const;
diff --git a/src/proc.cpp b/src/proc.cpp
index bc3169553..30d079d4f 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -118,11 +118,6 @@ void release_job_id(job_id_t jid) {
     consumed_job_ids->erase(where);
 }
 
-job_t *job_t::from_job_id(job_id_t id) {
-    ASSERT_IS_MAIN_THREAD();
-    return parser_t::principal_parser().job_get(id);
-}
-
 /// Return true if all processes in the job have stopped or completed.
 bool job_t::is_stopped() const {
     for (const process_ptr_t &p : processes) {
diff --git a/src/proc.h b/src/proc.h
index b18ac5d52..930074984 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -513,10 +513,6 @@ class job_t {
 
     /// \returns the statuses for this job.
     statuses_t get_statuses() const;
-
-    /// Return the job instance matching this unique job id.
-    /// If id is 0 or less, return the last job used.
-    static job_t *from_job_id(job_id_t id);
 };
 
 /// Whether this shell is attached to the keyboard at all.

From ce88e8739f2640c1c3375de80218da3a13954f59 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 13:15:33 -0800
Subject: [PATCH 1729/1732] Fix some speeling and improve a comment.

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

diff --git a/src/proc.h b/src/proc.h
index 930074984..0cc0df325 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -314,8 +314,7 @@ enum class pgroup_provenance_t {
     lineage,
 };
 
-/// A struct represeting a job. A job is basically a pipeline of one or more processes and a couple
-/// of flags.
+/// A struct representing a job. A job is a pipeline of one or more processes.
 class job_t {
    public:
     /// A set of jobs properties. These are immutable: they do not change for the lifetime of the

From 91df645c62a0a09193046b71ab6bea444b57ea8c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 14:14:21 -0800
Subject: [PATCH 1730/1732] Make job_control a constant property of job_t

It no longer changes.
---
 src/exec.cpp            | 6 ------
 src/parse_execution.cpp | 2 +-
 src/proc.h              | 8 ++++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/exec.cpp b/src/exec.cpp
index 4d6914810..e5e74cad7 100644
--- a/src/exec.cpp
+++ b/src/exec.cpp
@@ -918,12 +918,6 @@ bool exec_job(parser_t &parser, const shared_ptr<job_t> &j, const job_lineage_t
     // Check to see if we should reclaim the foreground pgrp after the job finishes or stops.
     const bool reclaim_foreground_pgrp = (tcgetpgrp(STDIN_FILENO) == pgrp);
 
-    // If we are running nested inside a function or block with job control, then we need job
-    // control too.
-    if (lineage.root_has_job_control) {
-        j->mut_flags().job_control = true;
-    }
-
     // Perhaps we know our pgroup already.
     assert(j->pgid == INVALID_PID && "Should not yet have a pid.");
     switch (j->pgroup_provenance) {
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index d4594c9d4..2bdec06a2 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1273,12 +1273,12 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
     props.skip_notification =
         ld.is_subshell || ld.is_block || ld.is_event || !parser->is_interactive();
     props.from_event_handler = ld.is_event;
+    props.job_control = wants_job_control;
 
     shared_ptr<job_t> job = std::make_shared<job_t>(acquire_job_id(), props, this->lineage);
     job->tmodes = tmodes;
 
     job->mut_flags().foreground = !job_node_is_background(job_node);
-    job->mut_flags().job_control = wants_job_control;
 
     // We are about to populate a job. One possible argument to the job is a command substitution
     // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
diff --git a/src/proc.h b/src/proc.h
index 0cc0df325..7cd54db43 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -329,6 +329,9 @@ class job_t {
 
         /// Whether this job was created as part of an event handler.
         bool from_event_handler{};
+
+        /// Whether the job is under job control, i.e. has its own pgrp.
+        bool job_control{};
     };
 
    private:
@@ -443,9 +446,6 @@ class job_t {
         /// Whether the exit status should be negated. This flag can only be set by the not builtin.
         bool negate{false};
 
-        /// Whether the job is under job control, i.e. has its own pgrp.
-        bool job_control{false};
-
         /// This job is disowned, and should be removed from the active jobs list.
         bool disown_requested{false};
 
@@ -460,7 +460,7 @@ class job_t {
     flags_t &mut_flags() { return job_flags; }
 
     /// \return if we want job control.
-    bool wants_job_control() const { return flags().job_control; }
+    bool wants_job_control() const { return properties.job_control; }
 
     /// \return if this job should own the terminal when it runs.
     bool should_claim_terminal() const { return properties.wants_terminal && is_foreground(); }

From 93fc0d06d4d806cfd7a152b09cc4a96312a39525 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 16:08:26 -0800
Subject: [PATCH 1731/1732] Rename event_type_t::job_exit to
 event_type_t::caller_exit

"job_exit" events, despite their name, can only be created via
the '--on-job-exit caller' misfeature of function. Rename it to make it
clear that this event type is specifically for caller-exit.
---
 src/builtin_function.cpp  | 10 +++-------
 src/builtin_functions.cpp |  9 ++++-----
 src/event.cpp             | 23 ++++++++---------------
 src/event.h               |  4 ++--
 src/proc.cpp              |  2 +-
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index cc4bf816c..42b0a4cd0 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -100,29 +100,25 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
             }
             case 'j':
             case 'p': {
-                pid_t pid;
                 event_description_t e(event_type_t::any);
 
                 if ((opt == 'j') && (wcscasecmp(w.woptarg, L"caller") == 0)) {
                     job_id_t job_id = -1;
-
                     if (parser.libdata().is_subshell) {
                         job_id = parser.libdata().caller_job_id;
                     }
-
                     if (job_id == -1) {
                         streams.err.append_format(
                             _(L"%ls: Cannot find calling job for event handler"), cmd);
                         return STATUS_INVALID_ARGS;
                     }
-                    e.type = event_type_t::job_exit;
+                    e.type = event_type_t::caller_exit;
                     e.param1.job_id = job_id;
                 } else if ((opt == 'p') && (wcscasecmp(w.woptarg, L"%self") == 0)) {
-                    pid = getpid();
                     e.type = event_type_t::exit;
-                    e.param1.pid = pid;
+                    e.param1.pid = getpid();
                 } else {
-                    pid = fish_wcstoi(w.woptarg);
+                    pid_t pid = fish_wcstoi(w.woptarg);
                     if (errno || pid < 0) {
                         streams.err.append_format(_(L"%ls: Invalid process id '%ls'"), cmd,
                                                   w.woptarg);
diff --git a/src/builtin_functions.cpp b/src/builtin_functions.cpp
index 2c4377494..bfd840e41 100644
--- a/src/builtin_functions.cpp
+++ b/src/builtin_functions.cpp
@@ -130,7 +130,7 @@ static int parse_cmd_opts(functions_cmd_opts_t &opts, int *optind,  //!OCLINT(hi
 }
 
 /// Return a definition of the specified function. Used by the functions builtin.
-static wcstring functions_def(const parser_t &parser, const wcstring &name) {
+static wcstring functions_def(const wcstring &name) {
     assert(!name.empty() && "Empty name");
     wcstring out;
     wcstring desc, def;
@@ -183,9 +183,8 @@ static wcstring functions_def(const parser_t &parser, const wcstring &name) {
                     append_format(out, L" --on-job-exit %d", -d.param1.pid);
                 break;
             }
-            case event_type_t::job_exit: {
-                const job_t *j = parser.job_get(d.param1.job_id);
-                if (j) append_format(out, L" --on-job-exit %d", j->pgid);
+            case event_type_t::caller_exit: {
+                append_format(out, L" --on-job-exit caller");
                 break;
             }
             case event_type_t::generic: {
@@ -435,7 +434,7 @@ int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 if (i != optind) streams.out.append(L"\n");
                 const wchar_t *funcname = argv[optind];
                 report_function_metadata(funcname, opts.verbose, streams, parser, true);
-                wcstring def = functions_def(parser, funcname);
+                wcstring def = functions_def(funcname);
 
                 if (!streams.out_is_redirected && isatty(STDOUT_FILENO)) {
                     std::vector<highlight_spec_t> colors;
diff --git a/src/event.cpp b/src/event.cpp
index 28a234b80..b008d3287 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -113,7 +113,7 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
             if (classv.desc.param1.pid == EVENT_ANY_PID) return true;
             return classv.desc.param1.pid == instance.desc.param1.pid;
         }
-        case event_type_t::job_exit: {
+        case event_type_t::caller_exit: {
             return classv.desc.param1.job_id == instance.desc.param1.job_id;
         }
         case event_type_t::generic: {
@@ -167,15 +167,8 @@ wcstring event_get_desc(const parser_t &parser, const event_t &evt) {
             DIE("Unreachable");
         }
 
-        case event_type_t::job_exit: {
-            const job_t *j = parser.job_get(ed.param1.job_id);
-            if (j) {
-                return format_string(_(L"exit handler for job %d, '%ls'"), j->job_id(),
-                                     j->command_wcstr());
-            } else {
-                return format_string(_(L"exit handler for job with job id %d"), ed.param1.job_id);
-            }
-            break;
+        case event_type_t::caller_exit: {
+            return _(L"exit handler for command substitution caller");
         }
 
         case event_type_t::generic: {
@@ -349,7 +342,7 @@ struct event_type_name_t {
 static const event_type_name_t events_mapping[] = {{event_type_t::signal, L"signal"},
                                                    {event_type_t::variable, L"variable"},
                                                    {event_type_t::exit, L"exit"},
-                                                   {event_type_t::job_exit, L"job-id"},
+                                                   {event_type_t::caller_exit, L"caller-exit"},
                                                    {event_type_t::generic, L"generic"}};
 
 maybe_t<event_type_t> event_type_for_name(const wcstring &name) {
@@ -384,7 +377,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                           return d1.signal < d2.signal;
                       case event_type_t::exit:
                           return d1.param1.pid < d2.param1.pid;
-                      case event_type_t::job_exit:
+                      case event_type_t::caller_exit:
                           return d1.param1.job_id < d2.param1.job_id;
                       case event_type_t::variable:
                       case event_type_t::any:
@@ -412,9 +405,9 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                                           evt->function_name.c_str());
                 break;
             case event_type_t::exit:
-            case event_type_t::job_exit:
-                streams.out.append_format(L"%d %ls\n", evt->desc.param1,
-                                          evt->function_name.c_str());
+                break;
+            case event_type_t::caller_exit:
+                streams.out.append_format(L"caller-exit %ls\n", evt->function_name.c_str());
                 break;
             case event_type_t::variable:
             case event_type_t::generic:
diff --git a/src/event.h b/src/event.h
index b9f13f1f9..ff48b4d4d 100644
--- a/src/event.h
+++ b/src/event.h
@@ -29,8 +29,8 @@ enum class event_type_t {
     variable,
     /// An event triggered by a job or process exit.
     exit,
-    /// An event triggered by a job exit.
-    job_exit,
+    /// An event triggered by a job exit, triggering the 'caller'-style events only.
+    caller_exit,
     /// A generic event.
     generic,
 };
diff --git a/src/proc.cpp b/src/proc.cpp
index 30d079d4f..3e7963a9b 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -616,7 +616,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
                     proc_create_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0));
             }
             exit_events.push_back(
-                proc_create_event(L"JOB_EXIT", event_type_t::job_exit, j->job_id(), 0));
+                proc_create_event(L"JOB_EXIT", event_type_t::caller_exit, j->job_id(), 0));
         }
     }
 

From 6bf9ae9aeb654985384426872998707bb6851298 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 8 Feb 2020 15:43:21 -0800
Subject: [PATCH 1732/1732] Fix up --on-job-exit caller

The `function --on-job-exit caller` feature allows a command substitution
to observe when the parent job exits. This has never worked very well - in
particular it is based on job IDs, so a function that observes this will
run multiple times. Implement it properly.

Do this by having a not-recycled "internal job id".

This is only used by psub, but ensure it works properly none-the-less.
---
 src/builtin_function.cpp          | 10 ++++-----
 src/event.cpp                     |  4 ++--
 src/event.h                       |  5 +++--
 src/parse_execution.cpp           |  8 ++------
 src/parser.h                      |  4 ++--
 src/proc.cpp                      |  8 ++++++++
 src/proc.h                        | 11 +++++++++-
 tests/checks/caller-observer.fish | 34 +++++++++++++++++++++++++++++++
 8 files changed, 65 insertions(+), 19 deletions(-)
 create mode 100644 tests/checks/caller-observer.fish

diff --git a/src/builtin_function.cpp b/src/builtin_function.cpp
index 42b0a4cd0..31a22ce25 100644
--- a/src/builtin_function.cpp
+++ b/src/builtin_function.cpp
@@ -103,17 +103,15 @@ static int parse_cmd_opts(function_cmd_opts_t &opts, int *optind,  //!OCLINT(hig
                 event_description_t e(event_type_t::any);
 
                 if ((opt == 'j') && (wcscasecmp(w.woptarg, L"caller") == 0)) {
-                    job_id_t job_id = -1;
-                    if (parser.libdata().is_subshell) {
-                        job_id = parser.libdata().caller_job_id;
-                    }
-                    if (job_id == -1) {
+                    internal_job_id_t caller_id =
+                        parser.libdata().is_subshell ? parser.libdata().caller_id : 0;
+                    if (caller_id == 0) {
                         streams.err.append_format(
                             _(L"%ls: Cannot find calling job for event handler"), cmd);
                         return STATUS_INVALID_ARGS;
                     }
                     e.type = event_type_t::caller_exit;
-                    e.param1.job_id = job_id;
+                    e.param1.caller_id = caller_id;
                 } else if ((opt == 'p') && (wcscasecmp(w.woptarg, L"%self") == 0)) {
                     e.type = event_type_t::exit;
                     e.param1.pid = getpid();
diff --git a/src/event.cpp b/src/event.cpp
index b008d3287..c81472420 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -114,7 +114,7 @@ static bool handler_matches(const event_handler_t &classv, const event_t &instan
             return classv.desc.param1.pid == instance.desc.param1.pid;
         }
         case event_type_t::caller_exit: {
-            return classv.desc.param1.job_id == instance.desc.param1.job_id;
+            return classv.desc.param1.caller_id == instance.desc.param1.caller_id;
         }
         case event_type_t::generic: {
             return classv.desc.str_param1 == instance.desc.str_param1;
@@ -378,7 +378,7 @@ void event_print(io_streams_t &streams, maybe_t<event_type_t> type_filter) {
                       case event_type_t::exit:
                           return d1.param1.pid < d2.param1.pid;
                       case event_type_t::caller_exit:
-                          return d1.param1.job_id < d2.param1.job_id;
+                          return d1.param1.caller_id < d2.param1.caller_id;
                       case event_type_t::variable:
                       case event_type_t::any:
                       case event_type_t::generic:
diff --git a/src/event.h b/src/event.h
index ff48b4d4d..d584358cf 100644
--- a/src/event.h
+++ b/src/event.h
@@ -44,10 +44,11 @@ struct event_description_t {
     ///
     /// signal: Signal number for signal-type events.Use EVENT_ANY_SIGNAL to match any signal
     /// pid: Process id for process-type events. Use EVENT_ANY_PID to match any pid. (Negative
-    /// values are used for PGIDs). job_id: Job id for EVENT_JOB_ID type events
+    /// values are used for PGIDs).
+    /// caller_id: Internal job id for caller_exit type events
     union {
         int signal;
-        int job_id;
+        uint64_t caller_id;
         pid_t pid;
     } param1{};
 
diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
index 2bdec06a2..fe7c6a33a 100644
--- a/src/parse_execution.cpp
+++ b/src/parse_execution.cpp
@@ -1283,17 +1283,13 @@ end_execution_reason_t parse_execution_context_t::run_1_job(tnode_t<g::job> job_
     // We are about to populate a job. One possible argument to the job is a command substitution
     // which may be interested in the job that's populating it, via '--on-job-exit caller'. Record
     // the job ID here.
-    auto &libdata = parser->libdata();
-    const auto saved_caller_jid = libdata.caller_job_id;
-    libdata.caller_job_id = job->job_id();
+    scoped_push<internal_job_id_t> caller_id(&parser->libdata().caller_id, job->internal_job_id);
 
     // Populate the job. This may fail for reasons like command_not_found. If this fails, an error
     // will have been printed.
     end_execution_reason_t pop_result =
         this->populate_job_from_job_node(job.get(), job_node, associated_block);
-
-    assert(libdata.caller_job_id == job->job_id() && "Caller job ID unexpectedly changed");
-    parser->libdata().caller_job_id = saved_caller_jid;
+    caller_id.restore();
 
     // Store time it took to 'parse' the command.
     if (profile_item != nullptr) {
diff --git a/src/parser.h b/src/parser.h
index 425144df8..bcea710fb 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -148,9 +148,9 @@ struct library_data_t {
     /// Whether we are currently cleaning processes.
     bool is_cleaning_procs{false};
 
-    /// The job id of the job being populated.
+    /// The internal job id of the job being populated, or 0 if none.
     /// This supports the '--on-job-exit caller' feature.
-    job_id_t caller_job_id{-1};
+    internal_job_id_t caller_id{0};
 
     /// Whether we are running a subshell command.
     bool is_subshell{false};
diff --git a/src/proc.cpp b/src/proc.cpp
index 3e7963a9b..ce460b6e8 100644
--- a/src/proc.cpp
+++ b/src/proc.cpp
@@ -275,9 +275,15 @@ bool process_t::is_internal() const {
     return true;
 }
 
+static uint64_t next_internal_job_id() {
+    static std::atomic<uint64_t> s_next{};
+    return ++s_next;
+}
+
 job_t::job_t(job_id_t job_id, const properties_t &props, const job_lineage_t &lineage)
     : properties(props),
       job_id_(job_id),
+      internal_job_id(next_internal_job_id()),
       root_constructed(lineage.root_constructed ? lineage.root_constructed : this->constructed) {}
 
 job_t::~job_t() {
@@ -447,6 +453,7 @@ event_t proc_create_event(const wchar_t *msg, event_type_t type, pid_t pid, int
     event_t event{type};
     event.desc.param1.pid = pid;
 
+    event.arguments.reserve(3);
     event.arguments.push_back(msg);
     event.arguments.push_back(to_string(pid));
     event.arguments.push_back(to_string(status));
@@ -617,6 +624,7 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
             }
             exit_events.push_back(
                 proc_create_event(L"JOB_EXIT", event_type_t::caller_exit, j->job_id(), 0));
+            exit_events.back().desc.param1.caller_id = j->internal_job_id;
         }
     }
 
diff --git a/src/proc.h b/src/proc.h
index 7cd54db43..7bf5b1cda 100644
--- a/src/proc.h
+++ b/src/proc.h
@@ -269,7 +269,12 @@ class process_t {
 typedef std::unique_ptr<process_t> process_ptr_t;
 typedef std::vector<process_ptr_t> process_list_t;
 
-typedef int job_id_t;
+/// The non user-visible, never-recycled job ID.
+/// Every job has a unique positive value for this.
+using internal_job_id_t = uint64_t;
+
+/// The user-visible, optional, recycled job ID.
+using job_id_t = int;
 job_id_t acquire_job_id(void);
 void release_job_id(job_id_t jid);
 
@@ -411,8 +416,12 @@ class job_t {
     pgroup_provenance_t pgroup_provenance{};
 
     /// The id of this job.
+    /// This is user-visible, is recycled, and may be -1.
     job_id_t job_id() const { return job_id_; }
 
+    /// A non-user-visible, never-recycled job ID.
+    const internal_job_id_t internal_job_id;
+
     /// Mark this job as internal. Internal jobs' job_ids are removed from the
     /// list of jobs so that, among other things, they don't take a job_id
     /// entry.
diff --git a/tests/checks/caller-observer.fish b/tests/checks/caller-observer.fish
new file mode 100644
index 000000000..3585ed3a8
--- /dev/null
+++ b/tests/checks/caller-observer.fish
@@ -0,0 +1,34 @@
+#RUN: %fish %s
+
+# Verify the '--on-job-exit caller' misfeature.
+function make_call_observer -a type
+    function observer_$type --on-job-exit caller --inherit-variable type
+        echo "Observed exit of $type"
+    end
+end
+
+command echo "echo ran 1" (make_call_observer external)
+#CHECK: echo ran 1
+#CHECK: Observed exit of external
+
+builtin echo "echo ran 2" (make_call_observer builtin)
+#CHECK: echo ran 2
+#CHECK: Observed exit of builtin
+
+function func_echo
+    builtin echo $argv
+end
+
+func_echo "echo ran 3" (make_call_observer function)
+#CHECK: echo ran 3
+#CHECK: Observed exit of function
+
+# They should not fire again.
+# TODO: We don't even clean up the functions!
+
+command echo "echo ran 4"
+builtin echo "echo ran 5"
+func_echo "echo ran 6"
+#CHECK: echo ran 4
+#CHECK: echo ran 5
+#CHECK: echo ran 6